From fedora-extras-commits at redhat.com Mon May 1 00:16:40 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 30 Apr 2006 17:16:40 -0700 Subject: rpms/perl-Gtk2/devel perl-Gtk2.spec,1.17,1.18 Message-ID: <200605010016.k410GgDb002607@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2590 Modified Files: perl-Gtk2.spec Log Message: Requires perl(Cairo) (distro >= FC-5). Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Gtk2.spec 11 Apr 2006 18:23:10 -0000 1.17 +++ perl-Gtk2.spec 1 May 2006 00:16:40 -0000 1.18 @@ -6,7 +6,7 @@ Name: perl-Gtk2 Version: 1.121 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries @@ -16,10 +16,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 2:5.8.0 -BuildRequires: gtk2-devel, perl-Glib >= 1.120 +BuildRequires: gtk2-devel BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) -Requires: perl-Glib >= 1.120 +BuildRequires: perl(Glib) >= 1.120 +BuildRequires: perl(Cairo) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Glib) >= 1.120 +Requires: perl(Cairo) %description This module allows you to write Gtk+ graphical user interfaces in a @@ -42,6 +45,14 @@ %define __perl_provides %{_builddir}/Gtk2-%{version}/%{name}-perl.prov chmod +x %{__perl_provides} +# Requires: exclude unversioned perl(Glib) +cat <<__EOF__ > %{name}-perl.req +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v '^perl(Glib)$' +__EOF__ +%define __perl_requires %{_builddir}/Gtk2-%{version}/%{name}-perl.req +chmod +x %{__perl_requires} + %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -75,6 +86,9 @@ %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.121-2 +- Requires perl(Cairo) (distro >= FC-5). + * Tue Apr 11 2006 Jose Pedro Oliveira - 1.121-1 - Update to 1.121. From fedora-extras-commits at redhat.com Mon May 1 01:17:17 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sun, 30 Apr 2006 18:17:17 -0700 Subject: rpms/qof/FC-4 qof-gnc-date-char.patch, NONE, 1.1 qof-x86_64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 qof.spec, 1.10, 1.11 sources, 1.3, 1.4 qof-0.6.1-build.patch, 1.1, NONE qof-dependencies.patch, 1.1, NONE Message-ID: <200605010117.k411HJXT005012@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4985 Modified Files: .cvsignore qof.spec sources Added Files: qof-gnc-date-char.patch qof-x86_64.patch Removed Files: qof-0.6.1-build.patch qof-dependencies.patch Log Message: * Sync with devel. This updates to qof-0.6.4 qof-gnc-date-char.patch: --- NEW FILE qof-gnc-date-char.patch --- --- qof-0.6.4/qof/gnc-date.c.char 2006-04-30 10:08:44.000000000 -0700 +++ qof-0.6.4/qof/gnc-date.c 2006-04-30 10:09:38.000000000 -0700 @@ -1060,7 +1060,7 @@ str +=3; if ('.' == *str) str++; - if (isdigit ((unsigned char)*str) && isdigit ((unsigned char)*(str+1))) + if (isdigit ((char)*str) && isdigit ((char)*(str+1))) { int cyn; /* copy sign from hour part */ qof-x86_64.patch: --- NEW FILE qof-x86_64.patch --- Index: qof-0.6.4/qof/test/test-date.c =================================================================== --- qof-0.6.4.orig/qof/test/test-date.c +++ qof-0.6.4/qof/test/test-date.c @@ -93,8 +93,8 @@ check_conversion (const char * str, Time if ((expected_ts.tv_sec != ts.tv_sec) || (expected_ts.tv_nsec != ts.tv_nsec)) { fprintf (stderr, - "\nmis-converted \"%s\" to %lld.%09ld seconds\n" - "\twas expecting %lld.%09ld seconds\n", + "\nmis-converted \"%s\" to %" G_GUINT64_FORMAT ".%09ld seconds\n" + "\twas expecting %" G_GUINT64_FORMAT ".%09ld seconds\n", str, ts.tv_sec, ts.tv_nsec, expected_ts.tv_sec, expected_ts.tv_nsec); failure ("misconverted timespec"); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qof/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Jan 2006 18:40:10 -0000 1.3 +++ .cvsignore 1 May 2006 01:17:17 -0000 1.4 @@ -1 +1 @@ -qof-0.6.1.tar.gz +qof-0.6.4.tar.gz Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/FC-4/qof.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qof.spec 15 Jan 2006 18:40:10 -0000 1.10 +++ qof.spec 1 May 2006 01:17:17 -0000 1.11 @@ -1,14 +1,14 @@ Name: qof -Version: 0.6.1 -Release: 1%{?dist} +Version: 0.6.4 +Release: 3%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries License: GPL URL: http://qof.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: qof-0.6.1-build.patch -Patch1: qof-dependencies.patch +Patch0: qof-x86_64.patch +Patch1: qof-gnc-date-char.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -17,8 +17,6 @@ BuildRequires: intltool # qof doesn't ship with pre-built documentation BuildRequires: doxygen -# Patch1 modifies configure.in so we have to use autoconf -BuildRequires: autoconf %description QOF - The Query Object Framework is a C library that provides a query engine @@ -70,7 +68,6 @@ %patch1 -p1 %build -autoconf --force %configure --disable-static make @@ -119,6 +116,19 @@ %doc html %changelog +* Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-3 +- Fix stupid in a hurry typo. + +* Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-2 +- Patch to fix a signed/unsigned char problem on ppc. + +* Mon Apr 17 2006 Toshio Kuratomi - 0.6.4-1 +- Update to qof 0.6.4. +- Patch a small compile problem in building tests on x86_64. + +* Mon Feb 13 2006 Toshio Kuratomi - 0.6.1-2 +- Bump and rebuild for FC5. + * Sat Jan 14 2006 Toshio Kuratomi - 0.6.1-1 - Upgrade to 0.6.1. - Drop patches integrated upstream. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qof/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Jan 2006 18:40:10 -0000 1.3 +++ sources 1 May 2006 01:17:17 -0000 1.4 @@ -1 +1 @@ -2a1c4b231fb03e49d5d9237dc6698c3e qof-0.6.1.tar.gz +555787c7ea06a3412ff9119fe4127886 qof-0.6.4.tar.gz --- qof-0.6.1-build.patch DELETED --- --- qof-dependencies.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 1 04:52:56 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 30 Apr 2006 21:52:56 -0700 Subject: rpms/raidem/devel raidem.spec,1.5,1.6 Message-ID: <200605010452.k414qwvO012110@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12093 Modified Files: raidem.spec Log Message: * Mon May 1 2006 Hans de Goede 0.3.1-2 - Fix big finger typo which put the datafiles under /use/share instead of /usr/share. Index: raidem.spec =================================================================== RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- raidem.spec 29 Apr 2006 18:56:35 -0000 1.5 +++ raidem.spec 1 May 2006 04:52:55 -0000 1.6 @@ -1,6 +1,6 @@ Name: raidem Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 2d top-down shoot'em up Group: Amusements/Games License: zlib License @@ -38,9 +38,7 @@ %build # override _datadir otherwise it expects its datafile directly under /use/share -%define _datadir /usr/share/%{name} -%configure -%define _datadir /use/share +%configure --datadir=%{_datadir}/%{name} make %{?_smp_mflags} @@ -91,6 +89,10 @@ %changelog +* Mon May 1 2006 Hans de Goede 0.3.1-2 +- Fix big finger typo which put the datafiles under /use/share instead + of /usr/share. + * Sat Apr 29 2006 Hans de Goede 0.3.1-1 - New upstream release 0.3.1 - Upstream has merged most patches, dropped. From fedora-extras-commits at redhat.com Mon May 1 04:57:38 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 30 Apr 2006 21:57:38 -0700 Subject: rpms/monkey-bubble/devel monkey-bubble.spec,1.4,1.5 Message-ID: <200605010457.k414veEm012187@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/monkey-bubble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12170 Modified Files: monkey-bubble.spec Log Message: Add missing scrollkeeper BR Index: monkey-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monkey-bubble.spec 30 Apr 2006 21:58:26 -0000 1.4 +++ monkey-bubble.spec 1 May 2006 04:57:38 -0000 1.5 @@ -10,7 +10,7 @@ Patch1: monkey-bubble-0.3.2-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel librsvg2-devel gstreamer-devel gettext -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils scrollkeeper Requires(pre): GConf2 Requires(post): GConf2 scrollkeeper Requires(preun): GConf2 From fedora-extras-commits at redhat.com Mon May 1 05:00:09 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 30 Apr 2006 22:00:09 -0700 Subject: rpms/monkey-bubble/FC-5 monkey-bubble.spec,1.4,1.5 Message-ID: <200605010500.k4150BUs012306@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/monkey-bubble/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12289 Modified Files: monkey-bubble.spec Log Message: Add missing scrollkeeper BR Index: monkey-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/monkey-bubble.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monkey-bubble.spec 30 Apr 2006 22:01:31 -0000 1.4 +++ monkey-bubble.spec 1 May 2006 05:00:09 -0000 1.5 @@ -10,7 +10,7 @@ Patch1: monkey-bubble-0.3.2-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel librsvg2-devel gstreamer-devel gettext -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils scrollkeeper Requires(pre): GConf2 Requires(post): GConf2 scrollkeeper Requires(preun): GConf2 From fedora-extras-commits at redhat.com Mon May 1 05:15:52 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 30 Apr 2006 22:15:52 -0700 Subject: rpms/raidem-music/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 dilvie_-_east_of_the_sun.ogg, 1.1, NONE dilvie_-_half_baked.ogg, 1.1, NONE dilvie_-_the_dragonfly.ogg, 1.1, NONE dilvie_-_up_in_ashes.ogg, 1.1, NONE Message-ID: <200605010515.k415FskM014550@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem-music/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14531 Modified Files: .cvsignore sources Removed Files: dilvie_-_east_of_the_sun.ogg dilvie_-_half_baked.ogg dilvie_-_the_dragonfly.ogg dilvie_-_up_in_ashes.ogg Log Message: put the .ogg files in the lookaside cache instead of in CVS Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raidem-music/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Apr 2006 20:59:45 -0000 1.1 +++ .cvsignore 1 May 2006 05:15:51 -0000 1.2 @@ -0,0 +1,4 @@ +dilvie_-_east_of_the_sun.ogg +dilvie_-_half_baked.ogg +dilvie_-_the_dragonfly.ogg +dilvie_-_up_in_ashes.ogg Index: sources =================================================================== RCS file: /cvs/extras/rpms/raidem-music/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Apr 2006 20:59:45 -0000 1.1 +++ sources 1 May 2006 05:15:52 -0000 1.2 @@ -0,0 +1,4 @@ +903a2589d6457f2d3b4b0dae0d358d9f dilvie_-_east_of_the_sun.ogg +52f4b1f07ad972f30f38adeb40db2de7 dilvie_-_half_baked.ogg +413b1cebfe8bc40e6100548caaeebd51 dilvie_-_the_dragonfly.ogg +08a852b2e2402dbeadd4fae0ba23c93b dilvie_-_up_in_ashes.ogg --- dilvie_-_east_of_the_sun.ogg DELETED --- --- dilvie_-_half_baked.ogg DELETED --- --- dilvie_-_the_dragonfly.ogg DELETED --- --- dilvie_-_up_in_ashes.ogg DELETED --- From fedora-extras-commits at redhat.com Mon May 1 05:30:25 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:30:25 -0700 Subject: rpms/bogofilter - New directory Message-ID: <200605010530.k415UR1H014660@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14634/bogofilter Log Message: Directory /cvs/extras/rpms/bogofilter added to the repository From fedora-extras-commits at redhat.com Mon May 1 05:30:26 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:30:26 -0700 Subject: rpms/bogofilter/devel - New directory Message-ID: <200605010530.k415UScp014663@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14634/bogofilter/devel Log Message: Directory /cvs/extras/rpms/bogofilter/devel added to the repository From fedora-extras-commits at redhat.com Mon May 1 05:30:46 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:30:46 -0700 Subject: rpms/bogofilter Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605010530.k415Um7r014707@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14679 Added Files: Makefile import.log Log Message: Setup of module bogofilter --- NEW FILE Makefile --- # Top level Makefile for module bogofilter all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon May 1 05:30:47 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:30:47 -0700 Subject: rpms/bogofilter/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605010530.k415UnXB014710@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14679/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bogofilter --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon May 1 05:32:02 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:32:02 -0700 Subject: rpms/bogofilter/devel bogofilter.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605010532.k415W43F014783@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14745/devel Modified Files: .cvsignore sources Added Files: bogofilter.spec Log Message: auto-import bogofilter-1.0.2-1 on branch devel from bogofilter-1.0.2-1.src.rpm --- NEW FILE bogofilter.spec --- Summary: Fast anti-spam filtering by Bayesian statistical analysis Name: bogofilter Version: 1.0.2 Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://bogofilter.sourceforge.net/ Source: http://dl.sf.net/bogofilter/bogofilter-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex db4-devel gsl-devel %description Bogofilter is a Bayesian spam filter. In its normal mode of operation, it takes an email message or other text on standard input, does a statistical check against lists of "good" and "bad" words, and returns a status code indicating whether or not the message is spam. Bogofilter is designed with fast algorithms (including Berkeley DB system), coded directly in C, and tuned for speed, so it can be used for production by sites that process a lot of mail. %prep %setup -q %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %{__mv} -f %{buildroot}%{_sysconfdir}/bogofilter.cf.example %{buildroot}%{_sysconfdir}/bogofilter.cf %{__install} -d -m0755 rpm-doc/xml/ rpm-doc/html/ %{__install} -m644 doc/*.xml rpm-doc/xml/ %{__install} -m644 doc/*.html rpm-doc/html/ %{__chmod} -x contrib/* %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc AUTHORS COPYING NEWS README* RELEASE.NOTES* TODO bogofilter.cf.example %doc doc/bogofilter-SA* doc/bogofilter-tuning.HOWTO* doc/integrating* doc/programmer/ %doc rpm-doc/html/ rpm-doc/xml/ contrib %{_mandir}/man1/bogo*.1* %{_mandir}/man1/bf_*.1* %config(noreplace) %{_sysconfdir}/bogofilter.cf %{_bindir}/bogo* %{_bindir}/bf_* %changelog * Wed Apr 19 2006 Adrian Reber - 1.0.2-1 - updated to 1.0.2 * Mon Jan 02 2006 Dries Verachtert - 1.0.1-1 - 3875/dries - Updated to release 1.0.1. * Fri Dec 02 2005 Dag Wieers - 1.0.0-1 - Updated to release 1.0.0. * Tue Nov 22 2005 Dries Verachtert - 0.96.6-1 - Updated to release 0.96.6. * Mon Aug 02 2004 Dag Wieers - 0.92.4-1 - Updated to release 0.92.4. * Sat Apr 10 2004 Dag Wieers - 0.17.5-1 - Updated to release 0.17.5. * Mon Jan 26 2004 Dag Wieers - 0.16.4-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bogofilter/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 May 2006 05:30:46 -0000 1.1 +++ .cvsignore 1 May 2006 05:32:02 -0000 1.2 @@ -0,0 +1 @@ +bogofilter-1.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bogofilter/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 May 2006 05:30:46 -0000 1.1 +++ sources 1 May 2006 05:32:02 -0000 1.2 @@ -0,0 +1 @@ +a1e201e544a3d9181b44b051b46435c3 bogofilter-1.0.2.tar.gz From fedora-extras-commits at redhat.com Mon May 1 05:32:01 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:32:01 -0700 Subject: rpms/bogofilter import.log,1.1,1.2 Message-ID: <200605010532.k415W32c014778@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14745 Modified Files: import.log Log Message: auto-import bogofilter-1.0.2-1 on branch devel from bogofilter-1.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bogofilter/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 May 2006 05:30:46 -0000 1.1 +++ import.log 1 May 2006 05:32:01 -0000 1.2 @@ -0,0 +1 @@ +bogofilter-1_0_2-1:HEAD:bogofilter-1.0.2-1.src.rpm:1146461555 From fedora-extras-commits at redhat.com Mon May 1 05:51:55 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:51:55 -0700 Subject: owners owners.list,1.927,1.928 Message-ID: <200605010551.k415pvCM014877@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14860 Modified Files: owners.list Log Message: added bogofilter Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.927 retrieving revision 1.928 diff -u -r1.927 -r1.928 --- owners.list 30 Apr 2006 21:41:16 -0000 1.927 +++ owners.list 1 May 2006 05:51:55 -0000 1.928 @@ -93,6 +93,7 @@ Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|bogofilter|Fast anti-spam filtering by Bayesian statistical analysis|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|bsd-games|Collection of classic text-based games|wart at kobold.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 1 06:36:08 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 23:36:08 -0700 Subject: rpms/xlockmore/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xlockmore.spec, 1.9, 1.10 Message-ID: <200605010636.k416aBAT017294@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/xlockmore/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17273 Modified Files: .cvsignore sources xlockmore.spec Log Message: * Mon May 01 2006 Adrian Reber - 5.22-1 - updated to 5.22 - changed pam file to use include instead of pam_stack.so Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Feb 2006 20:20:07 -0000 1.7 +++ .cvsignore 1 May 2006 06:36:08 -0000 1.8 @@ -1 +1 @@ -xlockmore-5.21.tar.bz2 +xlockmore-5.22.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Feb 2006 20:20:07 -0000 1.7 +++ sources 1 May 2006 06:36:08 -0000 1.8 @@ -1 +1 @@ -eefe878d7efaa982ee53553c78534315 xlockmore-5.21.tar.bz2 +abf503b6b7af128312fa3f500e8a2121 xlockmore-5.22.tar.bz2 Index: xlockmore.spec =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/xlockmore.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xlockmore.spec 21 Feb 2006 20:20:07 -0000 1.9 +++ xlockmore.spec 1 May 2006 06:36:08 -0000 1.10 @@ -1,11 +1,11 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.21 +Version: 5.22 Release: 1%{?dist} License: BSD Group: Amusements/Graphics URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.21.tar.bz2 +Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.22.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel @@ -55,10 +55,10 @@ %{__mkdir_p} %{buildroot}%{_sysconfdir}/pam.d cat > %{buildroot}%{_sysconfdir}/pam.d/xlock << EOF #%PAM-1.0 -auth required pam_stack.so service=system-auth -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth +auth include system-auth +account include system-auth +password include system-auth +session include system-auth EOF %{__mkdir_p} %{buildroot}%{_datadir}/applications @@ -105,6 +105,10 @@ %{_bindir}/xglock %changelog +* Mon May 01 2006 Adrian Reber - 5.22-1 +- updated to 5.22 +- changed pam file to use include instead of pam_stack.so + * Tue Feb 21 2006 Adrian Reber - 5.21-1 - updated to 5.21 From fedora-extras-commits at redhat.com Mon May 1 06:54:52 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 23:54:52 -0700 Subject: rpms/xlockmore/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xlockmore.spec, 1.9, 1.10 Message-ID: <200605010654.k416ssLN017479@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/xlockmore/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17458 Modified Files: .cvsignore sources xlockmore.spec Log Message: * Mon May 01 2006 Adrian Reber - 5.22-1 - updated to 5.22 - changed pam file to use include instead of pam_stack.so Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Feb 2006 20:20:07 -0000 1.7 +++ .cvsignore 1 May 2006 06:54:52 -0000 1.8 @@ -1 +1 @@ -xlockmore-5.21.tar.bz2 +xlockmore-5.22.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Feb 2006 20:20:07 -0000 1.7 +++ sources 1 May 2006 06:54:52 -0000 1.8 @@ -1 +1 @@ -eefe878d7efaa982ee53553c78534315 xlockmore-5.21.tar.bz2 +abf503b6b7af128312fa3f500e8a2121 xlockmore-5.22.tar.bz2 Index: xlockmore.spec =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/xlockmore.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xlockmore.spec 21 Feb 2006 20:20:07 -0000 1.9 +++ xlockmore.spec 1 May 2006 06:54:52 -0000 1.10 @@ -1,11 +1,11 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.21 +Version: 5.22 Release: 1%{?dist} License: BSD Group: Amusements/Graphics URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.21.tar.bz2 +Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.22.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel @@ -55,10 +55,10 @@ %{__mkdir_p} %{buildroot}%{_sysconfdir}/pam.d cat > %{buildroot}%{_sysconfdir}/pam.d/xlock << EOF #%PAM-1.0 -auth required pam_stack.so service=system-auth -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth +auth include system-auth +account include system-auth +password include system-auth +session include system-auth EOF %{__mkdir_p} %{buildroot}%{_datadir}/applications @@ -105,6 +105,10 @@ %{_bindir}/xglock %changelog +* Mon May 01 2006 Adrian Reber - 5.22-1 +- updated to 5.22 +- changed pam file to use include instead of pam_stack.so + * Tue Feb 21 2006 Adrian Reber - 5.21-1 - updated to 5.21 From fedora-extras-commits at redhat.com Mon May 1 06:59:28 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 30 Apr 2006 23:59:28 -0700 Subject: rpms/GeoIP/devel .cvsignore, 1.2, 1.3 GeoIP.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010659.k416xU1D017579@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17558 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 1 2006 Michael Fleming 1.3.16-1 - New upstream release - Add INSTALL document to package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2006 05:44:56 -0000 1.2 +++ .cvsignore 1 May 2006 06:59:28 -0000 1.3 @@ -1 +1 @@ -GeoIP-1.3.14.tar.gz +GeoIP-1.3.16.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GeoIP.spec 18 Feb 2006 05:44:56 -0000 1.1 +++ GeoIP.spec 1 May 2006 06:59:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.3.14 -Release: 3%{?dist} +Version: 1.3.16 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: GPL @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,6 +71,10 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 1 2006 Michael Fleming 1.3.16-1 +- New upstream release +- Add INSTALL document to package. + * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages - Move .so symlinks to -devel where they should be Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2006 05:44:56 -0000 1.2 +++ sources 1 May 2006 06:59:28 -0000 1.3 @@ -1 +1 @@ -a1f6fb744d85e96a457808f9c32fd334 GeoIP-1.3.14.tar.gz +f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz From fedora-extras-commits at redhat.com Mon May 1 07:00:05 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 1 May 2006 00:00:05 -0700 Subject: rpms/jhead/devel .cvsignore, 1.6, 1.7 jhead.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200605010700.k4170797017624@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17603 Modified Files: .cvsignore jhead.spec sources Log Message: * Mon May 01 2006 Adrian Reber - 2.6-1 - updated to 2.6 - removed gcc4 patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Feb 2006 14:59:57 -0000 1.6 +++ .cvsignore 1 May 2006 07:00:04 -0000 1.7 @@ -1 +1 @@ -jhead-2.5.tar.gz +jhead-2.6.tar.gz Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jhead.spec 19 Feb 2006 14:59:57 -0000 1.13 +++ jhead.spec 1 May 2006 07:00:04 -0000 1.14 @@ -1,13 +1,12 @@ Name: jhead -Version: 2.5 +Version: 2.6 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.5.tar.gz +Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz Patch0: jhead-makefile.patch -Patch1: jhead-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -17,7 +16,6 @@ %prep %setup -q %patch0 -%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -39,6 +37,10 @@ %{_mandir}/man?/* %changelog +* Mon May 01 2006 Adrian Reber - 2.6-1 +- updated to 2.6 +- removed gcc4 patch + * Sat Feb 18 2006 Adrian Reber - 2.5-1 - updated to 2.5 - removed compiler warnings patch and added gcc4 patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Feb 2006 14:59:57 -0000 1.6 +++ sources 1 May 2006 07:00:04 -0000 1.7 @@ -1 +1 @@ -e6ea1eacd35c55dfd8dc1f6dd0abaa2d jhead-2.5.tar.gz +fa3f1d3243fab7bc3b81688a3f2eec25 jhead-2.6.tar.gz From fedora-extras-commits at redhat.com Mon May 1 07:01:50 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 1 May 2006 00:01:50 -0700 Subject: rpms/jhead/devel jhead-gcc4.patch,1.1,NONE Message-ID: <200605010701.k4171qGY019828@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19774 Removed Files: jhead-gcc4.patch Log Message: gcc4 patch is no longer required --- jhead-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 1 07:03:36 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 00:03:36 -0700 Subject: rpms/mod_geoip/devel .cvsignore, 1.2, 1.3 mod_geoip.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010703.k4173c54019903@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19882 Modified Files: .cvsignore mod_geoip.spec sources Log Message: * Mon May 1 2006 Michael Fleming 1.1.8-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 22:45:12 -0000 1.2 +++ .cvsignore 1 May 2006 07:03:36 -0000 1.3 @@ -1 +1 @@ -mod_geoip2_1.1.7.tar.gz +mod_geoip2_1.1.8.tar.gz Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/devel/mod_geoip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_geoip.spec 20 Feb 2006 22:45:12 -0000 1.1 +++ mod_geoip.spec 1 May 2006 07:03:36 -0000 1.2 @@ -1,7 +1,7 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip -Version: 1.1.7 -Release: 2%{?dist} +Version: 1.1.8 +Release: 1%{?dist} License: Apache Software License Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip @@ -46,6 +46,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Mon May 1 2006 Michael Fleming 1.1.8-1 +- New upstream release + * Sat Feb 18 2006 Michael Fleming 1.1.7-2 - Small cleanups, including a saner Requires: for httpd - Don't strip the binary Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 22:45:12 -0000 1.2 +++ sources 1 May 2006 07:03:36 -0000 1.3 @@ -1 +1 @@ -ca02b8b955d95d659037f8c633908ae9 mod_geoip2_1.1.7.tar.gz +165607221c6a95ace7d840c5aea39696 mod_geoip2_1.1.8.tar.gz From fedora-extras-commits at redhat.com Mon May 1 08:27:51 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 1 May 2006 01:27:51 -0700 Subject: rpms/jhead/FC-5 .cvsignore, 1.6, 1.7 jhead.spec, 1.13, 1.14 sources, 1.6, 1.7 jhead-gcc4.patch, 1.1, NONE Message-ID: <200605010827.k418RrFt022393@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22372 Modified Files: .cvsignore jhead.spec sources Removed Files: jhead-gcc4.patch Log Message: * Mon May 01 2006 Adrian Reber - 2.6-1 - updated to 2.6 - removed gcc4 patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Feb 2006 14:59:57 -0000 1.6 +++ .cvsignore 1 May 2006 08:27:51 -0000 1.7 @@ -1 +1 @@ -jhead-2.5.tar.gz +jhead-2.6.tar.gz Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-5/jhead.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jhead.spec 19 Feb 2006 14:59:57 -0000 1.13 +++ jhead.spec 1 May 2006 08:27:51 -0000 1.14 @@ -1,13 +1,12 @@ Name: jhead -Version: 2.5 +Version: 2.6 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.5.tar.gz +Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz Patch0: jhead-makefile.patch -Patch1: jhead-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -17,7 +16,6 @@ %prep %setup -q %patch0 -%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -39,6 +37,10 @@ %{_mandir}/man?/* %changelog +* Mon May 01 2006 Adrian Reber - 2.6-1 +- updated to 2.6 +- removed gcc4 patch + * Sat Feb 18 2006 Adrian Reber - 2.5-1 - updated to 2.5 - removed compiler warnings patch and added gcc4 patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Feb 2006 14:59:57 -0000 1.6 +++ sources 1 May 2006 08:27:51 -0000 1.7 @@ -1 +1 @@ -e6ea1eacd35c55dfd8dc1f6dd0abaa2d jhead-2.5.tar.gz +fa3f1d3243fab7bc3b81688a3f2eec25 jhead-2.6.tar.gz --- jhead-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 1 08:34:30 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:34:30 -0700 Subject: rpms/kchmviewer - New directory Message-ID: <200605010834.k418YW4R022518@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22492/kchmviewer Log Message: Directory /cvs/extras/rpms/kchmviewer added to the repository From fedora-extras-commits at redhat.com Mon May 1 08:34:30 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:34:30 -0700 Subject: rpms/kchmviewer/devel - New directory Message-ID: <200605010834.k418YWGV022521@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22492/kchmviewer/devel Log Message: Directory /cvs/extras/rpms/kchmviewer/devel added to the repository From fedora-extras-commits at redhat.com Mon May 1 08:34:48 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:34:48 -0700 Subject: rpms/kchmviewer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605010834.k418YoIZ022572@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22539 Added Files: Makefile import.log Log Message: Setup of module kchmviewer --- NEW FILE Makefile --- # Top level Makefile for module kchmviewer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 1 08:34:48 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:34:48 -0700 Subject: rpms/kchmviewer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605010834.k418YoVF022575@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22539/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kchmviewer --- NEW 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 May 1 08:35:31 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:35:31 -0700 Subject: rpms/kchmviewer/devel kchmviewer-desktop.diff, NONE, 1.1 kchmviewer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605010835.k418ZYQH022631@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22608/devel Modified Files: .cvsignore sources Added Files: kchmviewer-desktop.diff kchmviewer.spec Log Message: auto-import kchmviewer-2.0-3 on branch devel from kchmviewer-2.0-3.src.rpm kchmviewer-desktop.diff: --- NEW FILE kchmviewer-desktop.diff --- --- kio-msits/kchmviewer.desktop-orig 2006-03-13 23:08:01.000000000 +0100 +++ kio-msits/kchmviewer.desktop 2006-03-13 23:09:16.000000000 +0100 @@ -1,11 +1,11 @@ [Desktop Entry] Categories=Qt;KDE;Utility; Encoding=UTF-8 +GenericName=CHM file viewer Type=Application Exec=kchmviewer %U Icon=kchmviewer.png -Comment= -Terminal=0 +Terminal=false Name=KchmViewer Comment=A viewer of CHM (MS-Help) files MimeType=application/chm --- NEW FILE kchmviewer.spec --- Name: kchmviewer Version: 2.0 Release: 3%{?dist} Summary: CHM viewer Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ Source0: http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel BuildRequires: desktop-file-utils kdelibs-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. The main advantage of KchmViewer is extended support for non-English languages. Unlike others, KchmViewer in most cases correctly detects chm file encoding, correctly shows tables of context of Russian, Korean, Chinese and Japanese help files, and correctly searches in non-English help files (search for MBCS languages - ja/ko/ch is still in progress). - Completely safe and harmless. Does not support JavaScript in any way, optionally warns you before opening an external web page, or switching to another help file. - Shows an appropriate image for every TOC entry. - Has complete chm index support, including multiple index entries, cross-links and parent/child entries in index. - Persistent bookmarks support. Allows to store bookmarks even if "Favorites" window was not enabled for this chm file. Also stores the screen position for every bookmark. You can also edit/delete bookmarks. - For any opened chm file, stores the last opened window, search history, bookmark history, font size and so on, so when you open this file again, everything is always on the place. - Has easy and powerful search-in-page support. - Allows to increase or decrease the font size, so physically handicapped people can read texts easily. - Has standard Back/Forward/Home navigation. - Can print the opened pages on a standard printer (usually via CUPS). - Has complex search query support. You can use search queries like "lazy people" + learn -not. %prep %setup -q %patch chmod -x kio-msits/msits.* %build %configure --disable-static --with-kde --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps install -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ kio-msits/kchmviewer.desktop %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null ||: %postun update-desktop-database &> /dev/null ||: %files %defattr(-,root,root,-) %doc README COPYING ChangeLog %{_bindir}/kchmviewer %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la %{_datadir}/applnk/kchmviewer.desktop %{_datadir}/services/msits.protocol %changelog * Mon Mar 13 2006 Patrice Dumas 2.0-3 - use update-desktop-database * Mon Mar 13 2006 Patrice Dumas 2.0-2 - enable kde support * Sun Mar 12 2006 Patrice Dumas 2.0-1 - Fedora Extras submission Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 May 2006 08:34:48 -0000 1.1 +++ .cvsignore 1 May 2006 08:35:31 -0000 1.2 @@ -0,0 +1 @@ +kchmviewer-2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 May 2006 08:34:48 -0000 1.1 +++ sources 1 May 2006 08:35:31 -0000 1.2 @@ -0,0 +1 @@ +94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 08:37:50 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 01:37:50 -0700 Subject: rpms/GeoIP/FC-5 .cvsignore, 1.2, 1.3 GeoIP.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605010837.k418bq8K022699@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22678 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 1 2006 Michael Fleming 1.3.16-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2006 05:44:56 -0000 1.2 +++ .cvsignore 1 May 2006 08:37:50 -0000 1.3 @@ -1 +1 @@ -GeoIP-1.3.14.tar.gz +GeoIP-1.3.16.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GeoIP.spec 17 Mar 2006 23:31:30 -0000 1.2 +++ GeoIP.spec 1 May 2006 08:37:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.3.14 -Release: 4%{?dist} +Version: 1.3.16 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: GPL @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,6 +71,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 1 2006 Michael Fleming 1.3.16-1 +- New upstream release + * Sat Mar 18 2006 Michael Fleming 1.3.14-4 - Build for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2006 05:44:56 -0000 1.2 +++ sources 1 May 2006 08:37:50 -0000 1.3 @@ -1 +1 @@ -a1f6fb744d85e96a457808f9c32fd334 GeoIP-1.3.14.tar.gz +f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz From fedora-extras-commits at redhat.com Mon May 1 08:40:53 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 01:40:53 -0700 Subject: rpms/GeoIP/FC-4 .cvsignore, 1.2, 1.3 GeoIP.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010840.k418etAs022827@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22804 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 1 2006 Michael Fleming 1.3.16-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2006 05:44:56 -0000 1.2 +++ .cvsignore 1 May 2006 08:40:53 -0000 1.3 @@ -1 +1 @@ -GeoIP-1.3.14.tar.gz +GeoIP-1.3.16.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/GeoIP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GeoIP.spec 18 Feb 2006 05:44:56 -0000 1.1 +++ GeoIP.spec 1 May 2006 08:40:53 -0000 1.2 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.3.14 -Release: 3%{?dist} +Version: 1.3.16 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: GPL @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,6 +71,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 1 2006 Michael Fleming 1.3.16-1 +- New upstream release + * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages - Move .so symlinks to -devel where they should be Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2006 05:44:56 -0000 1.2 +++ sources 1 May 2006 08:40:53 -0000 1.3 @@ -1 +1 @@ -a1f6fb744d85e96a457808f9c32fd334 GeoIP-1.3.14.tar.gz +f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz From fedora-extras-commits at redhat.com Mon May 1 08:42:33 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 May 2006 01:42:33 -0700 Subject: rpms/amaya/FC-5 amaya.spec,1.29,1.30 Message-ID: <200605010842.k418gZTh022927@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amaya/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880/FC-5 Modified Files: amaya.spec Log Message: - forgot to update version tag... Index: amaya.spec =================================================================== RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- amaya.spec 14 Apr 2006 08:18:41 -0000 1.29 +++ amaya.spec 1 May 2006 08:42:33 -0000 1.30 @@ -1,6 +1,6 @@ Name: amaya -Version: 9.4 -Release: 4%{?dist} +Version: 9.5 +Release: 1%{?dist} Summary: W3C's browser/web authoring tool Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 1 08:42:32 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 May 2006 01:42:32 -0700 Subject: rpms/amaya/FC-4 amaya.spec,1.19,1.20 Message-ID: <200605010842.k418gYpR022925@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amaya/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880/FC-4 Modified Files: amaya.spec Log Message: - forgot to update version tag... Index: amaya.spec =================================================================== RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- amaya.spec 14 Apr 2006 08:18:40 -0000 1.19 +++ amaya.spec 1 May 2006 08:42:32 -0000 1.20 @@ -1,6 +1,6 @@ Name: amaya -Version: 9.4 -Release: 4%{?dist} +Version: 9.5 +Release: 1%{?dist} Summary: W3C's browser/web authoring tool Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 1 08:42:34 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 May 2006 01:42:34 -0700 Subject: rpms/amaya/devel amaya.spec,1.29,1.30 Message-ID: <200605010842.k418garA022931@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amaya/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880/devel Modified Files: amaya.spec Log Message: - forgot to update version tag... Index: amaya.spec =================================================================== RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- amaya.spec 14 Apr 2006 08:18:42 -0000 1.29 +++ amaya.spec 1 May 2006 08:42:34 -0000 1.30 @@ -1,6 +1,6 @@ Name: amaya -Version: 9.4 -Release: 4%{?dist} +Version: 9.5 +Release: 1%{?dist} Summary: W3C's browser/web authoring tool Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 1 09:34:06 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:34:06 -0700 Subject: rpms/mod_cband/devel .cvsignore, 1.2, 1.3 mod_cband.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010934.k419Y8vZ025353@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25332 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 1 2006 Michael Fleming 0.9.7.3-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2006 23:24:26 -0000 1.2 +++ .cvsignore 1 May 2006 09:34:06 -0000 1.3 @@ -1 +1 @@ -mod-cband-0.9.7.2.tgz +mod-cband-0.9.7.3.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/mod_cband.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_cband.spec 17 Mar 2006 23:24:26 -0000 1.1 +++ mod_cband.spec 1 May 2006 09:34:06 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.2 -Release: 3%{?dist} +Version: 0.9.7.3 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +- New upstream release + * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 - Config file set not to be replaced on upgrade - Status information URI limited to localhost by default. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2006 23:24:26 -0000 1.2 +++ sources 1 May 2006 09:34:06 -0000 1.3 @@ -1 +1 @@ -d261161ac299437a1342b12ae586cab9 mod-cband-0.9.7.2.tgz +5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 09:36:08 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:36:08 -0700 Subject: rpms/mod_cband/FC-5 mod_cband.spec,1.1,1.2 Message-ID: <200605010936.k419aA23025455@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25438 Modified Files: mod_cband.spec Log Message: * Mon May 1 2006 Michael Fleming 0.9.7.3-1 - New upstream release Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/mod_cband.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_cband.spec 17 Mar 2006 23:24:26 -0000 1.1 +++ mod_cband.spec 1 May 2006 09:36:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.2 -Release: 3%{?dist} +Version: 0.9.7.3 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +- New upstream release + * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 - Config file set not to be replaced on upgrade - Status information URI limited to localhost by default. From fedora-extras-commits at redhat.com Mon May 1 09:36:59 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:36:59 -0700 Subject: rpms/mod_cband/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605010937.k419b1A1025498@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25479 Modified Files: .cvsignore sources Log Message: Whoops, forgot sources. I'm a tool. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2006 23:24:26 -0000 1.2 +++ .cvsignore 1 May 2006 09:36:58 -0000 1.3 @@ -1 +1 @@ -mod-cband-0.9.7.2.tgz +mod-cband-0.9.7.3.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2006 23:24:26 -0000 1.2 +++ sources 1 May 2006 09:36:58 -0000 1.3 @@ -1 +1 @@ -d261161ac299437a1342b12ae586cab9 mod-cband-0.9.7.2.tgz +5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 09:42:57 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:42:57 -0700 Subject: rpms/mod_cband/FC-4 .cvsignore, 1.2, 1.3 mod_cband.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010942.k419gxSa025611@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25590 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 1 2006 Michael Fleming 0.9.7.3-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2006 23:24:26 -0000 1.2 +++ .cvsignore 1 May 2006 09:42:57 -0000 1.3 @@ -1 +1 @@ -mod-cband-0.9.7.2.tgz +mod-cband-0.9.7.3.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/mod_cband.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_cband.spec 17 Mar 2006 23:24:26 -0000 1.1 +++ mod_cband.spec 1 May 2006 09:42:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.2 -Release: 3%{?dist} +Version: 0.9.7.3 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +- New upstream release + * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 - Config file set not to be replaced on upgrade - Status information URI limited to localhost by default. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2006 23:24:26 -0000 1.2 +++ sources 1 May 2006 09:42:57 -0000 1.3 @@ -1 +1 @@ -d261161ac299437a1342b12ae586cab9 mod-cband-0.9.7.2.tgz +5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 09:55:56 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:55:56 -0700 Subject: rpms/mod_cband/devel mod_cband.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200605010955.k419twOG025699@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25680 Modified Files: mod_cband.spec sources Log Message: Bump due to bad tarball Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/mod_cband.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_cband.spec 1 May 2006 09:34:06 -0000 1.2 +++ mod_cband.spec 1 May 2006 09:55:56 -0000 1.3 @@ -1,6 +1,6 @@ Name: mod_cband Version: 0.9.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,7 +42,7 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog -* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +* Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 09:34:06 -0000 1.3 +++ sources 1 May 2006 09:55:56 -0000 1.4 @@ -1 +1 @@ -5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz +958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 10:14:33 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 03:14:33 -0700 Subject: rpms/mod_cband/FC-5 mod_cband.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200605011014.k41AEZ1u027998@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27965 Modified Files: mod_cband.spec sources Log Message: Bump for bad source tarball Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/mod_cband.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_cband.spec 1 May 2006 09:36:08 -0000 1.2 +++ mod_cband.spec 1 May 2006 10:14:33 -0000 1.3 @@ -1,6 +1,6 @@ Name: mod_cband Version: 0.9.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,7 +42,7 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog -* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +* Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 09:36:58 -0000 1.3 +++ sources 1 May 2006 10:14:33 -0000 1.4 @@ -1 +1 @@ -5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz +958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 10:16:00 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 03:16:00 -0700 Subject: rpms/mod_cband/FC-4 mod_cband.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200605011016.k41AG2IQ028076@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28057 Modified Files: mod_cband.spec sources Log Message: Bump for bad source tarball Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/mod_cband.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_cband.spec 1 May 2006 09:42:57 -0000 1.2 +++ mod_cband.spec 1 May 2006 10:16:00 -0000 1.3 @@ -1,6 +1,6 @@ Name: mod_cband Version: 0.9.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,7 +42,7 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog -* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +* Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 09:42:57 -0000 1.3 +++ sources 1 May 2006 10:16:00 -0000 1.4 @@ -1 +1 @@ -5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz +958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 10:55:44 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 03:55:44 -0700 Subject: rpms/yap/devel chr_translate.pl, NONE, 1.1 chr_translate_bootstrap1.pl, NONE, 1.1 chr_translate_bootstrap2.pl, NONE, 1.1 guard_entailment.pl, NONE, 1.1 yap.spec, 1.9, 1.10 Message-ID: <200605011055.k41AtkH2028287@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28266 Modified Files: yap.spec Added Files: chr_translate.pl chr_translate_bootstrap1.pl chr_translate_bootstrap2.pl guard_entailment.pl Log Message: new version 5.1.1 --- NEW FILE chr_translate.pl --- /* Generated by CHR bootstrap compiler From: chr_translate.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,50,58,49,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(listmap). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-use_module(guard_entailment). :-use_module(chr_compiler_options). :-use_module(chr_compiler_utility). :-include(chr_op). :-op(1150,fx,chr_type). :-op(1130,xfx,--->). :-op(1150,fx,+). :-op(1150,fx,-). :-op(1150,fx,?). set_constraint_indices(A) :- set_constraint_indices(A,1). set_constraint_indices([],A) :- B is A-1, max_constraint_index(B). set_constraint_indices([A|B],C) :- ( ( chr_pp_flag(debugable,on) ; may_trigger(A) ; is_stored(A), get_store_type(A,default) ) -> constraint_index(A,C), D is C+1, set_constraint_indices(B,D) ; set_constraint_indices(B,C) ). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), check_declared_constraints(C), ( C==[] -> insert_declarations(E,B) ; generate_show_constraint(C,F,D,G), add_constraints(F), add_rules(G), check_rules(G,F), add_occurrences(G), functional_dependency_analysis(G), set_semantics_rules(G), symmetry_analysis(G), guard_simplification, storage_analysis(F), observation_analysis(F), ai_observation_analysis(F), late_allocation(F), assume_constraint_stores(F), set_constraint_indices(F), constraints_code(F,H), validate_store_type_assumptions(F), store_management_preds(F,I), insert_declarations(E,J), chr_module_declaration(K), append_lists([J,I,H,K],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_attach_code(A,I), generate_counter_code(J), append_lists([C,D,E,F,G,H,I,J],B). insert_declarations(A,B) :- append(A,[(:-use_module(chr(chr_runtime))),(:-use_module(chr(chr_hashtable_store))),(:-use_module(library('clp/clp_events')))],B). generate_counter_code(A) :- ( chr_pp_flag(store_counter,on) -> A=[('$counter_init'(B):-nb_setval(B,0)),('$counter'(C,D):-nb_getval(C,D)),('$counter_inc'(E):-nb_getval(E,F),G is F+1,nb_setval(E,G)),(:-'$counter_init'('$insert_counter')),(:-'$counter_init'('$delete_counter')),('$insert_counter_inc':-'$counter_inc'('$insert_counter')),('$delete_counter_inc':-'$counter_inc'('$delete_counter')),(counter_stats(H,I):-'$counter'('$insert_counter',H),'$counter'('$delete_counter',I))] ; A=[] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( is_type_definition(A) -> C=G, D=H, E=I ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,E), extract_type_mode(E,B). extract_type_mode([],[]). extract_type_mode([A/B|C],[A/B|D]) :- !, extract_type_mode(C,D). extract_type_mode([A|B],[C|D]) :- functor(A,E,F), C=E/F, A=..[_|G], extract_types_and_modes(G,H,I), constraint_type(E/F,H), constraint_mode(E/F,I), extract_type_mode(B,D). extract_types_and_modes([],[],[]). extract_types_and_modes([(+A)|B],[A|C],[+|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(?A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(-A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([A|_],_,_) :- format('CHR compiler ERROR: Illegal mode/type declaration "~w". ',[A]), format(' `--> correct syntax is +type, -type or ?type. ',[]), [...8829 lines suppressed...] ; true ) ; 'depends_on_goal/2__1__0'(G,A,B,C) ). 'depends_on_goal/2__1'(A,B,C) :- allocate_constraint(true,C,depends_on_goal(A,B),[A,B]), 'depends_on_goal/2__2'(A,B,C). 'depends_on_goal/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_goal/2'(A) ; true ). ai_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,C), !, 'ai_observed/2__0__0'(C,A,B). 'ai_observed/2__0__0'([],A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__0__0'([E|F],A,B) :- ( E=suspension(_,mutable(active),_,_,_,_,C,D), C==A, D==B -> remove_constraint_internal(E,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(E) ; true ), 'ai_observed/2__0__0'(F,A,B) ; 'ai_observed/2__0__0'(F,A,B) ). ai_observed(A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__1'(A,B) :- '$via1_multi_hash_ai_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !. 'ai_observed/2__1'(A,B) :- insert_constraint_internal(_,_,C,true,ai_observed(A,B),[A,B]), '$insert_in_store_ai_observed/2'(C). ai_not_observed(A,B) :- 'ai_not_observed/2__0'(A,B,_). 'ai_not_observed/2__0'(A,B,C) :- '$via1_multi_hash_stored/3-1'(A,D), !, allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__0__0'(D,A,B,C). 'ai_not_observed/2__0__0'([],A,B,C) :- 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__0__0'([G|H],A,B,C) :- ( G=suspension(_,mutable(active),_,_,_,_,D,E,F), D==A, E==B, F=yes, '$via1_multi_hash_stored_complete/3-1'(A,L), 'chr sbag_member'(I,L), I=suspension(_,mutable(active),_,_,_,_,_,J,K), B remove_constraint_internal(G,_,M), ( M==yes -> '$delete_from_store_stored/3'(G) ; true ), remove_constraint_internal(I,_,N), ( N==yes -> '$delete_from_store_stored_complete/3'(I) ; true ), activate_constraint(P,_,C,Q), ( P==yes -> '$insert_in_store_ai_not_observed/2'(C) ; true ), O is K-1, stored(A,B,maybe), stored_complete(A,J,O), ( C=suspension(_,mutable(active),_,mutable(Q),_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'ai_not_observed/2__0__0'(H,A,B,C) ; true ) ; 'ai_not_observed/2__0__0'(H,A,B,C) ). 'ai_not_observed/2__0'(A,B,C) :- allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_not_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_ai_not_observed/2'(A) ; true ). ai_is_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !, fail. ai_is_observed(_,_). depends_on_as(A,B,C) :- 'depends_on_as/3__0'(A,B,C,_). 'depends_on_as/3__0'(A,B,C,D) :- '$via1_multi_hash_final_answer_pattern/2-1'(B,E), !, allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__0'([],A,B,C,D) :- 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__0__0'([G|I],A,B,C,D) :- ( G=suspension(_,mutable(active),_,_,_,_,E,F), E==B, '$via1_multi_hash_final_answer_pattern/2-1'(C,H) -> 'depends_on_as/3__0__1'(H,F,G,I,A,B,C,D) ; 'depends_on_as/3__0__0'(I,A,B,C,D) ). 'depends_on_as/3__0__1'([],_,_,E,A,B,C,D) :- 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__1'([J|K],F,A,G,B,C,D,E) :- ( J=suspension(_,mutable(active),_,_,_,_,H,I), J\==A, H==D, O=t(141,E,A,J), 'chr novel_production'(E,O), 'chr novel_production'(A,O), 'chr novel_production'(J,O) -> 'chr extend_history'(E,O), activate_constraint(M,_,E,N), ( M==yes -> '$insert_in_store_depends_on_as/3'(E) ; true ), ai_observation_lub(F,I,L), final_answer_pattern(B,L), ( E=suspension(_,mutable(active),_,mutable(N),_,_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ; true ) ; 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ). 'depends_on_as/3__0'(A,B,C,D) :- allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__1'(_,_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_as/3'(A) ; true ). --- NEW FILE chr_translate_bootstrap1.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap1.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate_bootstrap1,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> B=E ; check_rules(D,C), unique_analyse_optimise(D,F), check_attachments(F), set_constraint_indices(C,1), store_management_preds(C,G), constraints_code(C,F,H), append_lists([E,G,H],B) ), chr_clear. store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_attach_increment(D), generate_attr_unify_hook(E), append_lists([C,D,E],B). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), C=pragma(F,G,H,B). rule(A,B,C) :- is_rule(A,D,E), C=pragma(D,E,[],B). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). check_rules(A,B) :- check_rules(A,B,1). check_rules([],_,_). check_rules([A|B],C,D) :- check_rule(A,C,D), E is D+1, check_rules(B,C,E). check_rule(A,B,C) :- A=pragma(D,_,E,_), D=rule(F,G,_,_), append(F,G,H), check_head_constraints(H,B,A,C), check_pragmas(E,A,C). check_head_constraints([],_,_,_). check_head_constraints([A|B],C,D,E) :- functor(A,F,G), ( member(F/G,C) -> check_head_constraints(B,C,D,E) ; format('CHR compiler ERROR: Undeclared constraint ~w in head of ~@. ',[F/G,format_rule(D,E)]), format(' `--> Constraint should be on of ~w. ',[C]), fail ). check_pragmas([],_,_). check_pragmas([A|B],C,D) :- check_pragma(A,C,D), check_pragmas(B,C,D). check_pragma(A,B,C) :- var(A), !, format('CHR compiler ERROR: invalid pragma ~w in ~@. ',[A,format_rule(B,C)]), format(' `--> Pragma should not be a variable! ',[]), fail. check_pragma(passive(A),B,C) :- !, B=pragma(_,ids(D,E),_,_), [...2192 lines suppressed...] 'detach_attached/2'(K,B) ). 'attached/2__1'(A,B,C) :- B==no, 'chr via_1'(A,D), get_attr(D,chr_translate_bootstrap1,E), E=v(G,_,_,_,_,_,F), G/\32=:=32, !, 'attached/2__1__0'(F,A,B,C). 'attached/2__1__0'([],A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,G,_,_,_,_,F,_), G=mutable(active), F==A -> 'chr remove_constraint_internal'(D,H), 'detach_attached/2'(H,D), 'attached/2__1__0'(E,A,B,C) ; 'attached/2__1__0'(E,A,B,C) ). 'attached/2__1'(A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__2'(A,B,C) :- B==maybe, 'chr via_1'(A,E), get_attr(E,chr_translate_bootstrap1,F), F=v(K,_,_,_,_,_,J), K/\32=:=32, ( 'chr sbag_member'(D,J), D=suspension(_,I,_,_,_,_,G,H), I=mutable(active), G==A, H==maybe -> true ), !, ( var(C) -> true ; 'chr remove_constraint_internal'(C,L), 'detach_attached/2'(L,C) ). 'attached/2__2'(_,_,A) :- 'chr activate_constraint'(B,A,_), 'attach_attached/2'(B,A). is_attached(A) :- 'is_attached/1__0'(A,_). 'is_attached/1__0'(A,_) :- 'chr via_1'(A,C), get_attr(C,chr_translate_bootstrap1,D), D=v(I,_,_,_,_,_,H), I/\32=:=32, 'chr sbag_member'(B,H), B=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, ( F==no -> fail ; true ). 'is_attached/1__0'(_,_) :- !. chr_clear :- 'chr_clear/0__0'(_). 'chr_clear/0__0'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,D,_,_,_,_,_), E/\1=:=1, !, ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__0__0'(D,A). 'chr_clear/0__0__0'([],A) :- 'chr_clear/0__1'(A). 'chr_clear/0__0__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint/2'(E,B), 'chr_clear/0__0__0'(C,A) ; 'chr_clear/0__0__0'(C,A) ). 'chr_clear/0__0'(A) :- ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__1'(A). 'chr_clear/0__1'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,D,_,_,_,_), E/\2=:=2, !, 'chr_clear/0__1__0'(D,A). 'chr_clear/0__1__0'([],A) :- 'chr_clear/0__2'(A). 'chr_clear/0__1__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_count/1'(E,B), 'chr_clear/0__1__0'(C,A) ; 'chr_clear/0__1__0'(C,A) ). 'chr_clear/0__1'(A) :- 'chr_clear/0__2'(A). 'chr_clear/0__2'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,D,_,_,_), E/\4=:=4, !, 'chr_clear/0__2__0'(D,A). 'chr_clear/0__2__0'([],A) :- 'chr_clear/0__3'(A). 'chr_clear/0__2__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_index/2'(E,B), 'chr_clear/0__2__0'(C,A) ; 'chr_clear/0__2__0'(C,A) ). 'chr_clear/0__2'(A) :- 'chr_clear/0__3'(A). 'chr_clear/0__3'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,D,_,_), E/\8=:=8, !, 'chr_clear/0__3__0'(D,A). 'chr_clear/0__3__0'([],A) :- 'chr_clear/0__4'(A). 'chr_clear/0__3__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_max_constraint_index/1'(E,B), 'chr_clear/0__3__0'(C,A) ; 'chr_clear/0__3__0'(C,A) ). 'chr_clear/0__3'(A) :- 'chr_clear/0__4'(A). 'chr_clear/0__4'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,D,_), E/\16=:=16, !, 'chr_clear/0__4__0'(D,A). 'chr_clear/0__4__0'([],A) :- 'chr_clear/0__5'(A). 'chr_clear/0__4__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_target_module/1'(E,B), 'chr_clear/0__4__0'(C,A) ; 'chr_clear/0__4__0'(C,A) ). 'chr_clear/0__4'(A) :- 'chr_clear/0__5'(A). 'chr_clear/0__5'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,_,D), E/\32=:=32, !, 'chr_clear/0__5__0'(D,A). 'chr_clear/0__5__0'([],A) :- 'chr_clear/0__6'(A). 'chr_clear/0__5__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_attached/2'(E,B), 'chr_clear/0__5__0'(C,A) ; 'chr_clear/0__5__0'(C,A) ). 'chr_clear/0__5'(A) :- 'chr_clear/0__6'(A). 'chr_clear/0__6'(_) :- !. --- NEW FILE chr_translate_bootstrap2.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap2.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(chr_runtime). :-use_module(chr_hashtable_store). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> insert_declarations(E,B) ; add_rules(D), check_rules(D,C), add_occurrences(D), late_allocation(C), unique_analyse_optimise(D,F), check_attachments(C), assume_constraint_stores(C), set_constraint_indices(C,1), constraints_code(C,F,G), validate_store_type_assumptions(C), store_management_preds(C,H), insert_declarations(E,I), chr_module_declaration(J), append_lists([I,H,G,J],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_store_code(A,I), append_lists([C,D,E,F,G,H,I],B). insert_declarations(A,B) :- ( A=[(:-module(C,D))|E] -> B=[(:-module(C,D)),(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|E] ; B=[(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|A] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). parse_rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). parse_rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), inc_rule_count(I), C=pragma(F,G,H,B,I). rule(A,B,C) :- is_rule(A,D,E), inc_rule_count(F), C=pragma(D,E,[],B,F). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). add_rules([]). add_rules([A|B]) :- A=pragma(_,_,_,_,C), rule(C,A), add_rules(B). check_rules([],_). check_rules([A|B],C) :- [...3285 lines suppressed...] E==A -> true ), !, B=F. 'get_max_occurrence/2__0'(_,A,_) :- !, A=0. allocation_occurrence(A,B) :- 'allocation_occurrence/2__0'(A,B,_). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,N,_,_,_,_,J,K,L,M), N=mutable(active), J==A, K==B, L==E, 'chr lock'(F), 'chr lock'(M), F=pragma(_,ids(_,_),_,_,_), member(M,_), 'chr unlock'(F), 'chr unlock'(M), !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,M,_,_,_,_,J,K,L,_), M=mutable(active), J==A, K==B, L==E, 'chr lock'(F), F=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(F), !, N is B+1, allocation_occurrence(A,N). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,I,_,_,_,_,E,F,G,H), I=mutable(active), E==A, F==B, '$via1_multi_hash_passive/2-1'(G,K), 'chr sbag_member'(J,K), J=suspension(_,N,_,_,_,_,L,M), N=mutable(active), L==G, M==H, !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,C) :- insert_constraint_internal(_,_,C,chr_translate:'allocation_occurrence/2__0'(A,B,C),allocation_occurrence(A,B),[A,B]), '$insert_in_store_allocation_occurrence/2'(C). get_allocation_occurrence(A,B) :- 'get_allocation_occurrence/2__0'(A,B,_). 'get_allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_allocation_occurrence/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_allocation_occurrence/2__0'(_,_,_) :- !, fail. rule(A,B) :- 'rule/2__0'(A,B,_). 'rule/2__0'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__0__0'(D,A,B,C). 'rule/2__0__0'([],A,B,C) :- 'rule/2__1'(A,B,C). 'rule/2__0__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,O,_,_,_,_,K,L,M,N), O=mutable(active), K==F, L==G, M==A, 'chr lock'(B), 'chr lock'(N), B=pragma(_,ids(_,_),_,_,_), member(N,_), 'chr unlock'(B), 'chr unlock'(N) -> remove_constraint_internal(D,_,P), ( P==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(R,_,C,S), ( R==yes -> '$insert_in_store_rule/2'(C) ; true ), Q is G+1, allocation_occurrence(F,Q), ( C=suspension(_,T,_,U,_,_,_,_), T=mutable(active), U=mutable(S) -> 'chr update_mutable'(inactive,T), 'rule/2__0__0'(E,A,B,C) ; true ) ; 'rule/2__0__0'(E,A,B,C) ). 'rule/2__0'(A,B,C) :- allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__1'(A,B,C). 'rule/2__1'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, 'rule/2__1__0'(D,A,B,C). 'rule/2__1__0'([],A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,N,_,_,_,_,K,L,M,_), N=mutable(active), K==F, L==G, M==A, 'chr lock'(B), B=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(B) -> remove_constraint_internal(D,_,O), ( O==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(Q,_,C,R), ( Q==yes -> '$insert_in_store_rule/2'(C) ; true ), P is G+1, allocation_occurrence(F,P), ( C=suspension(_,S,_,T,_,_,_,_), S=mutable(active), T=mutable(R) -> 'chr update_mutable'(inactive,S), 'rule/2__1__0'(E,A,B,C) ; true ) ; 'rule/2__1__0'(E,A,B,C) ). 'rule/2__1'(A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_rule/2'(A) ; true ). get_rule(A,B) :- 'get_rule/2__0'(A,B,_). 'get_rule/2__0'(A,B,_) :- '$via1_multi_hash_rule/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_rule/2__0'(_,_,_) :- !, fail. --- NEW FILE guard_entailment.pl --- /* Generated by CHR bootstrap compiler From: guard_entailment.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,53,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(guard_entailment,[entails_guard/2,simplify_guards/5]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(builtins). entails_guard(A,B) :- copy_term_nat((A,B),(C,D)), term_variables(C,E), variables(E), entails_guard2(C), !, test(D), !, cleanup. entails_guard2([]). entails_guard2([A|B]) :- known(A), entails_guard2(B). simplify_guards(A,B,C,D,E) :- copy_term_nat((A,C),(F,G)), term_variables(F,H), variables(H), entails_guard2(F), !, simplify(G,I), simplified(C,I,D,B,E), !, cleanup. simplified([],[],[],A,A). simplified([A|B],[keep|C],[A|D],E,F) :- simplified(B,C,D,E,F). simplified([_|_],[fail|_],fail,A,A). simplified([A|B],[true|C],[D|E],F,G) :- builtins:binds_b(A,H), term_variables(B,I), intersect_eq(H,I,J), !, ( J=[] -> term_variables(F,K), intersect_eq(H,K,L), !, ( L=[] -> D=true, G=M ; D=true, G=(A,M) ) ; D=A, G=M ), simplified(B,C,E,F,M). simplify([],[]). simplify([A|B],[C|D]) :- ( \+try(true,A) -> C=true ; builtins:negate_b(A,E), ( \+try(true,E) -> C=fail ; C=keep ) ), known(A), simplify(B,D). try(A,B) :- ( known(A) -> true ; format(' ERROR: entailment checker: this is not supposed to happen. ',[]) ), ( test(B) -> fail ; true ). lookup([],[],_,_) :- fail. lookup([A|B],[C|D],E,F) :- ( E==A -> F=C ; lookup(B,D,E,F) ). add_args_unif([],[],true). add_args_unif([A|B],[C|D],(A=C,E)) :- add_args_unif(B,D,E). add_args_nunif([],[],fail). add_args_nunif([A|B],[C|D],(A\=C;E)) :- add_args_nunif(B,D,E). add_args_nmatch([],[],fail). add_args_nmatch([A|B],[C|D],(A\==C;E)) :- add_args_nmatch(B,D,E). all_unique_vars(A,B) :- all_unique_vars(A,B,[]). all_unique_vars([],_,_). all_unique_vars([A|B],C,D) :- var(A), \+memberchk_eq(A,C), \+memberchk_eq(A,D), all_unique_vars(B,[A|D]). :-use_module(chr(chr_runtime)). :-use_module(chr(chr_hashtable_store)). :-use_module(library('clp/clp_events')). 'attach_known/1'([],_). 'attach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\1=:=1 -> put_attr(A,guard_entailment,v(F,[C|D],E)) ; G is F\/1, put_attr(A,guard_entailment,v(G,[C],E)) ) ; put_attr(A,guard_entailment,v(1,[C],[])) ), true, 'attach_known/1'(B,C). 'detach_known/1'([],_). 'detach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\1=:=1 -> 'chr sbag_del_element'(D,C,H), ( H==[] -> G is F/\ -2, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,[],E)) ) ; put_attr(A,guard_entailment,v(F,H,E)) ) ; true ) ; true ), 'detach_known/1'(B,C). 'attach_variables/1'([],_). 'attach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\2=:=2 -> put_attr(A,guard_entailment,v(F,D,[C|E])) ; G is F\/2, put_attr(A,guard_entailment,v(G,D,[C])) ) ; put_attr(A,guard_entailment,v(2,[],[C])) ), true, 'attach_variables/1'(B,C). 'detach_variables/1'([],_). 'detach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\2=:=2 -> 'chr sbag_del_element'(E,C,H), ( H==[] -> G is F/\ -3, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,D,[])) ) ; put_attr(A,guard_entailment,v(F,D,H)) ) ; true ) ; true ), 'detach_variables/1'(B,C). '$indexed_variables'(B,A) :- B=known(_), term_variables(B,A). '$indexed_variables'(B,A) :- B=variables(_), term_variables(B,A). attach_increment([],_). [...3131 lines suppressed...] B=functor(C,_,_), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=ground(C), ground(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), number(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), float(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), integer(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), nonvar(C), !. test(A) :- nonvar(A), A=(B,C), !, test(B), known(B), test(C). test(A) :- nonvar(A), A=(B;C), !, negate_b(B,D), negate_b(C,E), ( known(E), test(B) ; known(D), test(C) ). test(A) :- 'chr global_term_ref_1'(D), get_attr(D,guard_entailment,E), E=v(G,F,_), G/\1=:=1, 'chr sbag_member'(B,F), B=suspension(_,mutable(active),_,_,_,_,C), nonvar(C), C=(H;I), !, remove_constraint_internal(B,K,L), ( L==yes -> '$delete_from_store_known/1'(B), 'detach_known/1'(K,B) ; true ), \+try(H,A), !, negate_b(H,J), known(J), \+try(I,A). test(_) :- fail. cleanup :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,C,_), D/\1=:=1, !, 'cleanup/0__0__0'(C). 'cleanup/0__0__0'([]) :- 'cleanup/0__1'. 'cleanup/0__0__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_known/1'(A), 'detach_known/1'(C,A) ; true ), 'cleanup/0__0__0'(B) ; 'cleanup/0__0__0'(B) ). cleanup :- 'cleanup/0__1'. 'cleanup/0__1' :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,_,C), D/\2=:=2, !, 'cleanup/0__1__0'(C). 'cleanup/0__1__0'([]) :- 'cleanup/0__2'. 'cleanup/0__1__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_variables/1'(A), 'detach_variables/1'(C,A) ; true ), 'cleanup/0__1__0'(B) ; 'cleanup/0__1__0'(B) ). 'cleanup/0__1' :- 'cleanup/0__2'. 'cleanup/0__2'. variables(A) :- 'variables/1__0'(A,_). 'variables/1__0'(A,B) :- 'chr global_term_ref_1'(E), get_attr(E,guard_entailment,F), F=v(H,G,_), H/\1=:=1, 'chr sbag_member'(C,G), C=suspension(_,mutable(active),_,_,_,_,D), nonvar(D), D=functor(I,J,K), ground(K), ground(J), var(I), !, remove_constraint_internal(C,N,O), ( O==yes -> '$delete_from_store_known/1'(C), 'detach_known/1'(N,C) ; true ), ( var(B) -> true ; remove_constraint_internal(B,P,Q), ( Q==yes -> '$delete_from_store_variables/1'(B), 'detach_variables/1'(P,B) ; true ) ), functor(I,J,K), I=..[_|L], append(L,A,M), variables(M). 'variables/1__0'(A,B) :- ( var(B) -> insert_constraint_internal(D,C,B,guard_entailment:'variables/1__0'(A,B),variables(A),[A]) ; activate_constraint(D,C,B,_) ), ( D==yes -> '$insert_in_store_variables/1'(B), 'attach_variables/1'(C,B) ; true ). :-multifile chr:'$chr_module'/1. chr:'$chr_module'(guard_entailment). Index: yap.spec =================================================================== RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- yap.spec 17 Feb 2006 21:42:57 -0000 1.9 +++ yap.spec 1 May 2006 10:55:44 -0000 1.10 @@ -1,12 +1,16 @@ Name: yap -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages License: Artistic/LGPL -Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.0.1.tar.gz +Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.1.1.tar.gz +Source1: guard_entailment.pl +Source2: chr_translate_bootstrap1.pl +Source3: chr_translate_bootstrap2.pl +Source4: chr_translate.pl Patch1: Yap-noni386.patch URL: http://www.ncc.up.pt/~vsc/Yap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,9 +25,29 @@ follows the Edinburgh tradition, and is largely compatible with the ISO-Prolog standard and with Quintus and SICStus Prolog. + +%package devel +Summary: C-Interface development files for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description devel +C-Interface development files for Yap. + + +%package docs +Summary: Documentation for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description docs +Documentation for Yap. + + %prep %setup -q -n Yap-%{version} %patch1 -p1 +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr %build %configure \ @@ -33,6 +57,7 @@ make %{?_smp_mflags} (cd docs; make info) + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install @@ -40,10 +65,23 @@ cp -f docs/yap.info* $RPM_BUILD_ROOT%{_infodir} cp -f LGPL/pillow/doc/pillow_doc.info $RPM_BUILD_ROOT%{_infodir} +# fix permissions and flags +chmod 0644 $RPM_BUILD_ROOT%{_datadir}/Yap/pl/* +chmod 0644 $RPM_BUILD_ROOT%{_includedir}/Yap/* +find -name '*.lgt' -exec chmod 0644 '{}' ';' +find -name '*.h' -exec chmod 0644 '{}' ';' +find -name '*.c' -exec chmod 0644 '{}' ';' + +# move examples to docdir +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv $RPM_BUILD_ROOT%{_datadir}/Yap/examples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT%{_datadir}/Yap/clpbn/examples + %post /sbin/install-info %{_infodir}/yap.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : + %postun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || : @@ -54,24 +92,38 @@ %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc README %doc changes* +%{_bindir}/yap +%{_datadir}/Yap +%{_prefix}/lib/Yap +%{_infodir}/* + + +%files devel +%defattr(-,root,root,-) +%{_prefix}/lib/libYap.a +%{_includedir}/Yap + + +%files docs +%defattr(-,root,root,-) %doc docs/*.html %doc docs/yap.pdf %doc LGPL/pillow/doc/pillow_doc_html/* %doc LGPL/pillow/doc/article.ps.gz %doc --parent Logtalk/manuals %doc --parent Logtalk/examples -%{_bindir}/yap -%{_datadir}/Yap -%{_includedir}/Yap -%{_prefix}/lib/libYap.a -%{_prefix}/lib/Yap -%{_infodir}/* + %changelog +* Mon May 1 2006 Gerard Milmeister - 5.1.1-1 +- new version 5.1.1 +- split off devel and docs packages + * Fri Feb 17 2006 Gerard Milmeister - 5.0.1-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon May 1 10:59:04 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 03:59:04 -0700 Subject: rpms/yap/devel .cvsignore,1.3,1.4 sources,1.4,1.5 Message-ID: <200605011059.k41Ax6tv028341@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28322 Modified Files: .cvsignore sources Log Message: new version 5.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yap/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Oct 2005 08:32:24 -0000 1.3 +++ .cvsignore 1 May 2006 10:59:04 -0000 1.4 @@ -1 +1 @@ -Yap-5.0.1.tar.gz +Yap-5.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yap/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Oct 2005 08:32:24 -0000 1.4 +++ sources 1 May 2006 10:59:04 -0000 1.5 @@ -1 +1 @@ -d8d1f1c5a38d501eb9db38d880668eda Yap-5.0.1.tar.gz +1f5c26642a27158c98f6c2fac56d3dad Yap-5.1.1.tar.gz From fedora-extras-commits at redhat.com Mon May 1 11:06:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 04:06:59 -0700 Subject: rpms/yap/FC-5 chr_translate.pl, NONE, 1.1 chr_translate_bootstrap1.pl, NONE, 1.1 chr_translate_bootstrap2.pl, NONE, 1.1 guard_entailment.pl, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 yap.spec, 1.9, 1.10 Message-ID: <200605011107.k41B7Yct031029@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953 Modified Files: .cvsignore sources yap.spec Added Files: chr_translate.pl chr_translate_bootstrap1.pl chr_translate_bootstrap2.pl guard_entailment.pl Log Message: new version 5.1.1 --- NEW FILE chr_translate.pl --- /* Generated by CHR bootstrap compiler From: chr_translate.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,50,58,49,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(listmap). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-use_module(guard_entailment). :-use_module(chr_compiler_options). :-use_module(chr_compiler_utility). :-include(chr_op). :-op(1150,fx,chr_type). :-op(1130,xfx,--->). :-op(1150,fx,+). :-op(1150,fx,-). :-op(1150,fx,?). set_constraint_indices(A) :- set_constraint_indices(A,1). set_constraint_indices([],A) :- B is A-1, max_constraint_index(B). set_constraint_indices([A|B],C) :- ( ( chr_pp_flag(debugable,on) ; may_trigger(A) ; is_stored(A), get_store_type(A,default) ) -> constraint_index(A,C), D is C+1, set_constraint_indices(B,D) ; set_constraint_indices(B,C) ). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), check_declared_constraints(C), ( C==[] -> insert_declarations(E,B) ; generate_show_constraint(C,F,D,G), add_constraints(F), add_rules(G), check_rules(G,F), add_occurrences(G), functional_dependency_analysis(G), set_semantics_rules(G), symmetry_analysis(G), guard_simplification, storage_analysis(F), observation_analysis(F), ai_observation_analysis(F), late_allocation(F), assume_constraint_stores(F), set_constraint_indices(F), constraints_code(F,H), validate_store_type_assumptions(F), store_management_preds(F,I), insert_declarations(E,J), chr_module_declaration(K), append_lists([J,I,H,K],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_attach_code(A,I), generate_counter_code(J), append_lists([C,D,E,F,G,H,I,J],B). insert_declarations(A,B) :- append(A,[(:-use_module(chr(chr_runtime))),(:-use_module(chr(chr_hashtable_store))),(:-use_module(library('clp/clp_events')))],B). generate_counter_code(A) :- ( chr_pp_flag(store_counter,on) -> A=[('$counter_init'(B):-nb_setval(B,0)),('$counter'(C,D):-nb_getval(C,D)),('$counter_inc'(E):-nb_getval(E,F),G is F+1,nb_setval(E,G)),(:-'$counter_init'('$insert_counter')),(:-'$counter_init'('$delete_counter')),('$insert_counter_inc':-'$counter_inc'('$insert_counter')),('$delete_counter_inc':-'$counter_inc'('$delete_counter')),(counter_stats(H,I):-'$counter'('$insert_counter',H),'$counter'('$delete_counter',I))] ; A=[] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( is_type_definition(A) -> C=G, D=H, E=I ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,E), extract_type_mode(E,B). extract_type_mode([],[]). extract_type_mode([A/B|C],[A/B|D]) :- !, extract_type_mode(C,D). extract_type_mode([A|B],[C|D]) :- functor(A,E,F), C=E/F, A=..[_|G], extract_types_and_modes(G,H,I), constraint_type(E/F,H), constraint_mode(E/F,I), extract_type_mode(B,D). extract_types_and_modes([],[],[]). extract_types_and_modes([(+A)|B],[A|C],[+|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(?A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(-A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([A|_],_,_) :- format('CHR compiler ERROR: Illegal mode/type declaration "~w". ',[A]), format(' `--> correct syntax is +type, -type or ?type. ',[]), [...8829 lines suppressed...] ; true ) ; 'depends_on_goal/2__1__0'(G,A,B,C) ). 'depends_on_goal/2__1'(A,B,C) :- allocate_constraint(true,C,depends_on_goal(A,B),[A,B]), 'depends_on_goal/2__2'(A,B,C). 'depends_on_goal/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_goal/2'(A) ; true ). ai_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,C), !, 'ai_observed/2__0__0'(C,A,B). 'ai_observed/2__0__0'([],A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__0__0'([E|F],A,B) :- ( E=suspension(_,mutable(active),_,_,_,_,C,D), C==A, D==B -> remove_constraint_internal(E,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(E) ; true ), 'ai_observed/2__0__0'(F,A,B) ; 'ai_observed/2__0__0'(F,A,B) ). ai_observed(A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__1'(A,B) :- '$via1_multi_hash_ai_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !. 'ai_observed/2__1'(A,B) :- insert_constraint_internal(_,_,C,true,ai_observed(A,B),[A,B]), '$insert_in_store_ai_observed/2'(C). ai_not_observed(A,B) :- 'ai_not_observed/2__0'(A,B,_). 'ai_not_observed/2__0'(A,B,C) :- '$via1_multi_hash_stored/3-1'(A,D), !, allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__0__0'(D,A,B,C). 'ai_not_observed/2__0__0'([],A,B,C) :- 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__0__0'([G|H],A,B,C) :- ( G=suspension(_,mutable(active),_,_,_,_,D,E,F), D==A, E==B, F=yes, '$via1_multi_hash_stored_complete/3-1'(A,L), 'chr sbag_member'(I,L), I=suspension(_,mutable(active),_,_,_,_,_,J,K), B remove_constraint_internal(G,_,M), ( M==yes -> '$delete_from_store_stored/3'(G) ; true ), remove_constraint_internal(I,_,N), ( N==yes -> '$delete_from_store_stored_complete/3'(I) ; true ), activate_constraint(P,_,C,Q), ( P==yes -> '$insert_in_store_ai_not_observed/2'(C) ; true ), O is K-1, stored(A,B,maybe), stored_complete(A,J,O), ( C=suspension(_,mutable(active),_,mutable(Q),_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'ai_not_observed/2__0__0'(H,A,B,C) ; true ) ; 'ai_not_observed/2__0__0'(H,A,B,C) ). 'ai_not_observed/2__0'(A,B,C) :- allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_not_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_ai_not_observed/2'(A) ; true ). ai_is_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !, fail. ai_is_observed(_,_). depends_on_as(A,B,C) :- 'depends_on_as/3__0'(A,B,C,_). 'depends_on_as/3__0'(A,B,C,D) :- '$via1_multi_hash_final_answer_pattern/2-1'(B,E), !, allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__0'([],A,B,C,D) :- 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__0__0'([G|I],A,B,C,D) :- ( G=suspension(_,mutable(active),_,_,_,_,E,F), E==B, '$via1_multi_hash_final_answer_pattern/2-1'(C,H) -> 'depends_on_as/3__0__1'(H,F,G,I,A,B,C,D) ; 'depends_on_as/3__0__0'(I,A,B,C,D) ). 'depends_on_as/3__0__1'([],_,_,E,A,B,C,D) :- 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__1'([J|K],F,A,G,B,C,D,E) :- ( J=suspension(_,mutable(active),_,_,_,_,H,I), J\==A, H==D, O=t(141,E,A,J), 'chr novel_production'(E,O), 'chr novel_production'(A,O), 'chr novel_production'(J,O) -> 'chr extend_history'(E,O), activate_constraint(M,_,E,N), ( M==yes -> '$insert_in_store_depends_on_as/3'(E) ; true ), ai_observation_lub(F,I,L), final_answer_pattern(B,L), ( E=suspension(_,mutable(active),_,mutable(N),_,_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ; true ) ; 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ). 'depends_on_as/3__0'(A,B,C,D) :- allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__1'(_,_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_as/3'(A) ; true ). --- NEW FILE chr_translate_bootstrap1.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap1.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate_bootstrap1,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> B=E ; check_rules(D,C), unique_analyse_optimise(D,F), check_attachments(F), set_constraint_indices(C,1), store_management_preds(C,G), constraints_code(C,F,H), append_lists([E,G,H],B) ), chr_clear. store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_attach_increment(D), generate_attr_unify_hook(E), append_lists([C,D,E],B). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), C=pragma(F,G,H,B). rule(A,B,C) :- is_rule(A,D,E), C=pragma(D,E,[],B). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). check_rules(A,B) :- check_rules(A,B,1). check_rules([],_,_). check_rules([A|B],C,D) :- check_rule(A,C,D), E is D+1, check_rules(B,C,E). check_rule(A,B,C) :- A=pragma(D,_,E,_), D=rule(F,G,_,_), append(F,G,H), check_head_constraints(H,B,A,C), check_pragmas(E,A,C). check_head_constraints([],_,_,_). check_head_constraints([A|B],C,D,E) :- functor(A,F,G), ( member(F/G,C) -> check_head_constraints(B,C,D,E) ; format('CHR compiler ERROR: Undeclared constraint ~w in head of ~@. ',[F/G,format_rule(D,E)]), format(' `--> Constraint should be on of ~w. ',[C]), fail ). check_pragmas([],_,_). check_pragmas([A|B],C,D) :- check_pragma(A,C,D), check_pragmas(B,C,D). check_pragma(A,B,C) :- var(A), !, format('CHR compiler ERROR: invalid pragma ~w in ~@. ',[A,format_rule(B,C)]), format(' `--> Pragma should not be a variable! ',[]), fail. check_pragma(passive(A),B,C) :- !, B=pragma(_,ids(D,E),_,_), [...2192 lines suppressed...] 'detach_attached/2'(K,B) ). 'attached/2__1'(A,B,C) :- B==no, 'chr via_1'(A,D), get_attr(D,chr_translate_bootstrap1,E), E=v(G,_,_,_,_,_,F), G/\32=:=32, !, 'attached/2__1__0'(F,A,B,C). 'attached/2__1__0'([],A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,G,_,_,_,_,F,_), G=mutable(active), F==A -> 'chr remove_constraint_internal'(D,H), 'detach_attached/2'(H,D), 'attached/2__1__0'(E,A,B,C) ; 'attached/2__1__0'(E,A,B,C) ). 'attached/2__1'(A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__2'(A,B,C) :- B==maybe, 'chr via_1'(A,E), get_attr(E,chr_translate_bootstrap1,F), F=v(K,_,_,_,_,_,J), K/\32=:=32, ( 'chr sbag_member'(D,J), D=suspension(_,I,_,_,_,_,G,H), I=mutable(active), G==A, H==maybe -> true ), !, ( var(C) -> true ; 'chr remove_constraint_internal'(C,L), 'detach_attached/2'(L,C) ). 'attached/2__2'(_,_,A) :- 'chr activate_constraint'(B,A,_), 'attach_attached/2'(B,A). is_attached(A) :- 'is_attached/1__0'(A,_). 'is_attached/1__0'(A,_) :- 'chr via_1'(A,C), get_attr(C,chr_translate_bootstrap1,D), D=v(I,_,_,_,_,_,H), I/\32=:=32, 'chr sbag_member'(B,H), B=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, ( F==no -> fail ; true ). 'is_attached/1__0'(_,_) :- !. chr_clear :- 'chr_clear/0__0'(_). 'chr_clear/0__0'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,D,_,_,_,_,_), E/\1=:=1, !, ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__0__0'(D,A). 'chr_clear/0__0__0'([],A) :- 'chr_clear/0__1'(A). 'chr_clear/0__0__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint/2'(E,B), 'chr_clear/0__0__0'(C,A) ; 'chr_clear/0__0__0'(C,A) ). 'chr_clear/0__0'(A) :- ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__1'(A). 'chr_clear/0__1'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,D,_,_,_,_), E/\2=:=2, !, 'chr_clear/0__1__0'(D,A). 'chr_clear/0__1__0'([],A) :- 'chr_clear/0__2'(A). 'chr_clear/0__1__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_count/1'(E,B), 'chr_clear/0__1__0'(C,A) ; 'chr_clear/0__1__0'(C,A) ). 'chr_clear/0__1'(A) :- 'chr_clear/0__2'(A). 'chr_clear/0__2'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,D,_,_,_), E/\4=:=4, !, 'chr_clear/0__2__0'(D,A). 'chr_clear/0__2__0'([],A) :- 'chr_clear/0__3'(A). 'chr_clear/0__2__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_index/2'(E,B), 'chr_clear/0__2__0'(C,A) ; 'chr_clear/0__2__0'(C,A) ). 'chr_clear/0__2'(A) :- 'chr_clear/0__3'(A). 'chr_clear/0__3'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,D,_,_), E/\8=:=8, !, 'chr_clear/0__3__0'(D,A). 'chr_clear/0__3__0'([],A) :- 'chr_clear/0__4'(A). 'chr_clear/0__3__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_max_constraint_index/1'(E,B), 'chr_clear/0__3__0'(C,A) ; 'chr_clear/0__3__0'(C,A) ). 'chr_clear/0__3'(A) :- 'chr_clear/0__4'(A). 'chr_clear/0__4'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,D,_), E/\16=:=16, !, 'chr_clear/0__4__0'(D,A). 'chr_clear/0__4__0'([],A) :- 'chr_clear/0__5'(A). 'chr_clear/0__4__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_target_module/1'(E,B), 'chr_clear/0__4__0'(C,A) ; 'chr_clear/0__4__0'(C,A) ). 'chr_clear/0__4'(A) :- 'chr_clear/0__5'(A). 'chr_clear/0__5'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,_,D), E/\32=:=32, !, 'chr_clear/0__5__0'(D,A). 'chr_clear/0__5__0'([],A) :- 'chr_clear/0__6'(A). 'chr_clear/0__5__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_attached/2'(E,B), 'chr_clear/0__5__0'(C,A) ; 'chr_clear/0__5__0'(C,A) ). 'chr_clear/0__5'(A) :- 'chr_clear/0__6'(A). 'chr_clear/0__6'(_) :- !. --- NEW FILE chr_translate_bootstrap2.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap2.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(chr_runtime). :-use_module(chr_hashtable_store). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> insert_declarations(E,B) ; add_rules(D), check_rules(D,C), add_occurrences(D), late_allocation(C), unique_analyse_optimise(D,F), check_attachments(C), assume_constraint_stores(C), set_constraint_indices(C,1), constraints_code(C,F,G), validate_store_type_assumptions(C), store_management_preds(C,H), insert_declarations(E,I), chr_module_declaration(J), append_lists([I,H,G,J],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_store_code(A,I), append_lists([C,D,E,F,G,H,I],B). insert_declarations(A,B) :- ( A=[(:-module(C,D))|E] -> B=[(:-module(C,D)),(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|E] ; B=[(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|A] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). parse_rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). parse_rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), inc_rule_count(I), C=pragma(F,G,H,B,I). rule(A,B,C) :- is_rule(A,D,E), inc_rule_count(F), C=pragma(D,E,[],B,F). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). add_rules([]). add_rules([A|B]) :- A=pragma(_,_,_,_,C), rule(C,A), add_rules(B). check_rules([],_). check_rules([A|B],C) :- [...3285 lines suppressed...] E==A -> true ), !, B=F. 'get_max_occurrence/2__0'(_,A,_) :- !, A=0. allocation_occurrence(A,B) :- 'allocation_occurrence/2__0'(A,B,_). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,N,_,_,_,_,J,K,L,M), N=mutable(active), J==A, K==B, L==E, 'chr lock'(F), 'chr lock'(M), F=pragma(_,ids(_,_),_,_,_), member(M,_), 'chr unlock'(F), 'chr unlock'(M), !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,M,_,_,_,_,J,K,L,_), M=mutable(active), J==A, K==B, L==E, 'chr lock'(F), F=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(F), !, N is B+1, allocation_occurrence(A,N). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,I,_,_,_,_,E,F,G,H), I=mutable(active), E==A, F==B, '$via1_multi_hash_passive/2-1'(G,K), 'chr sbag_member'(J,K), J=suspension(_,N,_,_,_,_,L,M), N=mutable(active), L==G, M==H, !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,C) :- insert_constraint_internal(_,_,C,chr_translate:'allocation_occurrence/2__0'(A,B,C),allocation_occurrence(A,B),[A,B]), '$insert_in_store_allocation_occurrence/2'(C). get_allocation_occurrence(A,B) :- 'get_allocation_occurrence/2__0'(A,B,_). 'get_allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_allocation_occurrence/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_allocation_occurrence/2__0'(_,_,_) :- !, fail. rule(A,B) :- 'rule/2__0'(A,B,_). 'rule/2__0'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__0__0'(D,A,B,C). 'rule/2__0__0'([],A,B,C) :- 'rule/2__1'(A,B,C). 'rule/2__0__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,O,_,_,_,_,K,L,M,N), O=mutable(active), K==F, L==G, M==A, 'chr lock'(B), 'chr lock'(N), B=pragma(_,ids(_,_),_,_,_), member(N,_), 'chr unlock'(B), 'chr unlock'(N) -> remove_constraint_internal(D,_,P), ( P==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(R,_,C,S), ( R==yes -> '$insert_in_store_rule/2'(C) ; true ), Q is G+1, allocation_occurrence(F,Q), ( C=suspension(_,T,_,U,_,_,_,_), T=mutable(active), U=mutable(S) -> 'chr update_mutable'(inactive,T), 'rule/2__0__0'(E,A,B,C) ; true ) ; 'rule/2__0__0'(E,A,B,C) ). 'rule/2__0'(A,B,C) :- allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__1'(A,B,C). 'rule/2__1'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, 'rule/2__1__0'(D,A,B,C). 'rule/2__1__0'([],A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,N,_,_,_,_,K,L,M,_), N=mutable(active), K==F, L==G, M==A, 'chr lock'(B), B=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(B) -> remove_constraint_internal(D,_,O), ( O==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(Q,_,C,R), ( Q==yes -> '$insert_in_store_rule/2'(C) ; true ), P is G+1, allocation_occurrence(F,P), ( C=suspension(_,S,_,T,_,_,_,_), S=mutable(active), T=mutable(R) -> 'chr update_mutable'(inactive,S), 'rule/2__1__0'(E,A,B,C) ; true ) ; 'rule/2__1__0'(E,A,B,C) ). 'rule/2__1'(A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_rule/2'(A) ; true ). get_rule(A,B) :- 'get_rule/2__0'(A,B,_). 'get_rule/2__0'(A,B,_) :- '$via1_multi_hash_rule/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_rule/2__0'(_,_,_) :- !, fail. --- NEW FILE guard_entailment.pl --- /* Generated by CHR bootstrap compiler From: guard_entailment.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,53,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(guard_entailment,[entails_guard/2,simplify_guards/5]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(builtins). entails_guard(A,B) :- copy_term_nat((A,B),(C,D)), term_variables(C,E), variables(E), entails_guard2(C), !, test(D), !, cleanup. entails_guard2([]). entails_guard2([A|B]) :- known(A), entails_guard2(B). simplify_guards(A,B,C,D,E) :- copy_term_nat((A,C),(F,G)), term_variables(F,H), variables(H), entails_guard2(F), !, simplify(G,I), simplified(C,I,D,B,E), !, cleanup. simplified([],[],[],A,A). simplified([A|B],[keep|C],[A|D],E,F) :- simplified(B,C,D,E,F). simplified([_|_],[fail|_],fail,A,A). simplified([A|B],[true|C],[D|E],F,G) :- builtins:binds_b(A,H), term_variables(B,I), intersect_eq(H,I,J), !, ( J=[] -> term_variables(F,K), intersect_eq(H,K,L), !, ( L=[] -> D=true, G=M ; D=true, G=(A,M) ) ; D=A, G=M ), simplified(B,C,E,F,M). simplify([],[]). simplify([A|B],[C|D]) :- ( \+try(true,A) -> C=true ; builtins:negate_b(A,E), ( \+try(true,E) -> C=fail ; C=keep ) ), known(A), simplify(B,D). try(A,B) :- ( known(A) -> true ; format(' ERROR: entailment checker: this is not supposed to happen. ',[]) ), ( test(B) -> fail ; true ). lookup([],[],_,_) :- fail. lookup([A|B],[C|D],E,F) :- ( E==A -> F=C ; lookup(B,D,E,F) ). add_args_unif([],[],true). add_args_unif([A|B],[C|D],(A=C,E)) :- add_args_unif(B,D,E). add_args_nunif([],[],fail). add_args_nunif([A|B],[C|D],(A\=C;E)) :- add_args_nunif(B,D,E). add_args_nmatch([],[],fail). add_args_nmatch([A|B],[C|D],(A\==C;E)) :- add_args_nmatch(B,D,E). all_unique_vars(A,B) :- all_unique_vars(A,B,[]). all_unique_vars([],_,_). all_unique_vars([A|B],C,D) :- var(A), \+memberchk_eq(A,C), \+memberchk_eq(A,D), all_unique_vars(B,[A|D]). :-use_module(chr(chr_runtime)). :-use_module(chr(chr_hashtable_store)). :-use_module(library('clp/clp_events')). 'attach_known/1'([],_). 'attach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\1=:=1 -> put_attr(A,guard_entailment,v(F,[C|D],E)) ; G is F\/1, put_attr(A,guard_entailment,v(G,[C],E)) ) ; put_attr(A,guard_entailment,v(1,[C],[])) ), true, 'attach_known/1'(B,C). 'detach_known/1'([],_). 'detach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\1=:=1 -> 'chr sbag_del_element'(D,C,H), ( H==[] -> G is F/\ -2, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,[],E)) ) ; put_attr(A,guard_entailment,v(F,H,E)) ) ; true ) ; true ), 'detach_known/1'(B,C). 'attach_variables/1'([],_). 'attach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\2=:=2 -> put_attr(A,guard_entailment,v(F,D,[C|E])) ; G is F\/2, put_attr(A,guard_entailment,v(G,D,[C])) ) ; put_attr(A,guard_entailment,v(2,[],[C])) ), true, 'attach_variables/1'(B,C). 'detach_variables/1'([],_). 'detach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\2=:=2 -> 'chr sbag_del_element'(E,C,H), ( H==[] -> G is F/\ -3, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,D,[])) ) ; put_attr(A,guard_entailment,v(F,D,H)) ) ; true ) ; true ), 'detach_variables/1'(B,C). '$indexed_variables'(B,A) :- B=known(_), term_variables(B,A). '$indexed_variables'(B,A) :- B=variables(_), term_variables(B,A). attach_increment([],_). [...3131 lines suppressed...] B=functor(C,_,_), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=ground(C), ground(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), number(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), float(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), integer(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), nonvar(C), !. test(A) :- nonvar(A), A=(B,C), !, test(B), known(B), test(C). test(A) :- nonvar(A), A=(B;C), !, negate_b(B,D), negate_b(C,E), ( known(E), test(B) ; known(D), test(C) ). test(A) :- 'chr global_term_ref_1'(D), get_attr(D,guard_entailment,E), E=v(G,F,_), G/\1=:=1, 'chr sbag_member'(B,F), B=suspension(_,mutable(active),_,_,_,_,C), nonvar(C), C=(H;I), !, remove_constraint_internal(B,K,L), ( L==yes -> '$delete_from_store_known/1'(B), 'detach_known/1'(K,B) ; true ), \+try(H,A), !, negate_b(H,J), known(J), \+try(I,A). test(_) :- fail. cleanup :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,C,_), D/\1=:=1, !, 'cleanup/0__0__0'(C). 'cleanup/0__0__0'([]) :- 'cleanup/0__1'. 'cleanup/0__0__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_known/1'(A), 'detach_known/1'(C,A) ; true ), 'cleanup/0__0__0'(B) ; 'cleanup/0__0__0'(B) ). cleanup :- 'cleanup/0__1'. 'cleanup/0__1' :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,_,C), D/\2=:=2, !, 'cleanup/0__1__0'(C). 'cleanup/0__1__0'([]) :- 'cleanup/0__2'. 'cleanup/0__1__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_variables/1'(A), 'detach_variables/1'(C,A) ; true ), 'cleanup/0__1__0'(B) ; 'cleanup/0__1__0'(B) ). 'cleanup/0__1' :- 'cleanup/0__2'. 'cleanup/0__2'. variables(A) :- 'variables/1__0'(A,_). 'variables/1__0'(A,B) :- 'chr global_term_ref_1'(E), get_attr(E,guard_entailment,F), F=v(H,G,_), H/\1=:=1, 'chr sbag_member'(C,G), C=suspension(_,mutable(active),_,_,_,_,D), nonvar(D), D=functor(I,J,K), ground(K), ground(J), var(I), !, remove_constraint_internal(C,N,O), ( O==yes -> '$delete_from_store_known/1'(C), 'detach_known/1'(N,C) ; true ), ( var(B) -> true ; remove_constraint_internal(B,P,Q), ( Q==yes -> '$delete_from_store_variables/1'(B), 'detach_variables/1'(P,B) ; true ) ), functor(I,J,K), I=..[_|L], append(L,A,M), variables(M). 'variables/1__0'(A,B) :- ( var(B) -> insert_constraint_internal(D,C,B,guard_entailment:'variables/1__0'(A,B),variables(A),[A]) ; activate_constraint(D,C,B,_) ), ( D==yes -> '$insert_in_store_variables/1'(B), 'attach_variables/1'(C,B) ; true ). :-multifile chr:'$chr_module'/1. chr:'$chr_module'(guard_entailment). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yap/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Oct 2005 08:32:24 -0000 1.3 +++ .cvsignore 1 May 2006 11:06:59 -0000 1.4 @@ -1 +1 @@ -Yap-5.0.1.tar.gz +Yap-5.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yap/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Oct 2005 08:32:24 -0000 1.4 +++ sources 1 May 2006 11:06:59 -0000 1.5 @@ -1 +1 @@ -d8d1f1c5a38d501eb9db38d880668eda Yap-5.0.1.tar.gz +1f5c26642a27158c98f6c2fac56d3dad Yap-5.1.1.tar.gz Index: yap.spec =================================================================== RCS file: /cvs/extras/rpms/yap/FC-5/yap.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- yap.spec 17 Feb 2006 21:42:57 -0000 1.9 +++ yap.spec 1 May 2006 11:06:59 -0000 1.10 @@ -1,12 +1,16 @@ Name: yap -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages License: Artistic/LGPL -Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.0.1.tar.gz +Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.1.1.tar.gz +Source1: guard_entailment.pl +Source2: chr_translate_bootstrap1.pl +Source3: chr_translate_bootstrap2.pl +Source4: chr_translate.pl Patch1: Yap-noni386.patch URL: http://www.ncc.up.pt/~vsc/Yap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,9 +25,29 @@ follows the Edinburgh tradition, and is largely compatible with the ISO-Prolog standard and with Quintus and SICStus Prolog. + +%package devel +Summary: C-Interface development files for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description devel +C-Interface development files for Yap. + + +%package docs +Summary: Documentation for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description docs +Documentation for Yap. + + %prep %setup -q -n Yap-%{version} %patch1 -p1 +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr %build %configure \ @@ -33,6 +57,7 @@ make %{?_smp_mflags} (cd docs; make info) + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install @@ -40,10 +65,23 @@ cp -f docs/yap.info* $RPM_BUILD_ROOT%{_infodir} cp -f LGPL/pillow/doc/pillow_doc.info $RPM_BUILD_ROOT%{_infodir} +# fix permissions and flags +chmod 0644 $RPM_BUILD_ROOT%{_datadir}/Yap/pl/* +chmod 0644 $RPM_BUILD_ROOT%{_includedir}/Yap/* +find -name '*.lgt' -exec chmod 0644 '{}' ';' +find -name '*.h' -exec chmod 0644 '{}' ';' +find -name '*.c' -exec chmod 0644 '{}' ';' + +# move examples to docdir +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv $RPM_BUILD_ROOT%{_datadir}/Yap/examples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT%{_datadir}/Yap/clpbn/examples + %post /sbin/install-info %{_infodir}/yap.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : + %postun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || : @@ -54,24 +92,38 @@ %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc README %doc changes* +%{_bindir}/yap +%{_datadir}/Yap +%{_prefix}/lib/Yap +%{_infodir}/* + + +%files devel +%defattr(-,root,root,-) +%{_prefix}/lib/libYap.a +%{_includedir}/Yap + + +%files docs +%defattr(-,root,root,-) %doc docs/*.html %doc docs/yap.pdf %doc LGPL/pillow/doc/pillow_doc_html/* %doc LGPL/pillow/doc/article.ps.gz %doc --parent Logtalk/manuals %doc --parent Logtalk/examples -%{_bindir}/yap -%{_datadir}/Yap -%{_includedir}/Yap -%{_prefix}/lib/libYap.a -%{_prefix}/lib/Yap -%{_infodir}/* + %changelog +* Mon May 1 2006 Gerard Milmeister - 5.1.1-1 +- new version 5.1.1 +- split off devel and docs packages + * Fri Feb 17 2006 Gerard Milmeister - 5.0.1-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon May 1 11:09:50 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 04:09:50 -0700 Subject: rpms/yap/FC-4 chr_translate.pl, NONE, 1.1 chr_translate_bootstrap1.pl, NONE, 1.1 chr_translate_bootstrap2.pl, NONE, 1.1 guard_entailment.pl, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 yap.spec, 1.11, 1.12 Message-ID: <200605011109.k41B9qmw031225@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31200 Modified Files: .cvsignore sources yap.spec Added Files: chr_translate.pl chr_translate_bootstrap1.pl chr_translate_bootstrap2.pl guard_entailment.pl Log Message: new version 5.1.1 --- NEW FILE chr_translate.pl --- /* Generated by CHR bootstrap compiler From: chr_translate.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,50,58,49,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(listmap). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-use_module(guard_entailment). :-use_module(chr_compiler_options). :-use_module(chr_compiler_utility). :-include(chr_op). :-op(1150,fx,chr_type). :-op(1130,xfx,--->). :-op(1150,fx,+). :-op(1150,fx,-). :-op(1150,fx,?). set_constraint_indices(A) :- set_constraint_indices(A,1). set_constraint_indices([],A) :- B is A-1, max_constraint_index(B). set_constraint_indices([A|B],C) :- ( ( chr_pp_flag(debugable,on) ; may_trigger(A) ; is_stored(A), get_store_type(A,default) ) -> constraint_index(A,C), D is C+1, set_constraint_indices(B,D) ; set_constraint_indices(B,C) ). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), check_declared_constraints(C), ( C==[] -> insert_declarations(E,B) ; generate_show_constraint(C,F,D,G), add_constraints(F), add_rules(G), check_rules(G,F), add_occurrences(G), functional_dependency_analysis(G), set_semantics_rules(G), symmetry_analysis(G), guard_simplification, storage_analysis(F), observation_analysis(F), ai_observation_analysis(F), late_allocation(F), assume_constraint_stores(F), set_constraint_indices(F), constraints_code(F,H), validate_store_type_assumptions(F), store_management_preds(F,I), insert_declarations(E,J), chr_module_declaration(K), append_lists([J,I,H,K],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_attach_code(A,I), generate_counter_code(J), append_lists([C,D,E,F,G,H,I,J],B). insert_declarations(A,B) :- append(A,[(:-use_module(chr(chr_runtime))),(:-use_module(chr(chr_hashtable_store))),(:-use_module(library('clp/clp_events')))],B). generate_counter_code(A) :- ( chr_pp_flag(store_counter,on) -> A=[('$counter_init'(B):-nb_setval(B,0)),('$counter'(C,D):-nb_getval(C,D)),('$counter_inc'(E):-nb_getval(E,F),G is F+1,nb_setval(E,G)),(:-'$counter_init'('$insert_counter')),(:-'$counter_init'('$delete_counter')),('$insert_counter_inc':-'$counter_inc'('$insert_counter')),('$delete_counter_inc':-'$counter_inc'('$delete_counter')),(counter_stats(H,I):-'$counter'('$insert_counter',H),'$counter'('$delete_counter',I))] ; A=[] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( is_type_definition(A) -> C=G, D=H, E=I ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,E), extract_type_mode(E,B). extract_type_mode([],[]). extract_type_mode([A/B|C],[A/B|D]) :- !, extract_type_mode(C,D). extract_type_mode([A|B],[C|D]) :- functor(A,E,F), C=E/F, A=..[_|G], extract_types_and_modes(G,H,I), constraint_type(E/F,H), constraint_mode(E/F,I), extract_type_mode(B,D). extract_types_and_modes([],[],[]). extract_types_and_modes([(+A)|B],[A|C],[+|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(?A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(-A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([A|_],_,_) :- format('CHR compiler ERROR: Illegal mode/type declaration "~w". ',[A]), format(' `--> correct syntax is +type, -type or ?type. ',[]), [...8829 lines suppressed...] ; true ) ; 'depends_on_goal/2__1__0'(G,A,B,C) ). 'depends_on_goal/2__1'(A,B,C) :- allocate_constraint(true,C,depends_on_goal(A,B),[A,B]), 'depends_on_goal/2__2'(A,B,C). 'depends_on_goal/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_goal/2'(A) ; true ). ai_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,C), !, 'ai_observed/2__0__0'(C,A,B). 'ai_observed/2__0__0'([],A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__0__0'([E|F],A,B) :- ( E=suspension(_,mutable(active),_,_,_,_,C,D), C==A, D==B -> remove_constraint_internal(E,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(E) ; true ), 'ai_observed/2__0__0'(F,A,B) ; 'ai_observed/2__0__0'(F,A,B) ). ai_observed(A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__1'(A,B) :- '$via1_multi_hash_ai_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !. 'ai_observed/2__1'(A,B) :- insert_constraint_internal(_,_,C,true,ai_observed(A,B),[A,B]), '$insert_in_store_ai_observed/2'(C). ai_not_observed(A,B) :- 'ai_not_observed/2__0'(A,B,_). 'ai_not_observed/2__0'(A,B,C) :- '$via1_multi_hash_stored/3-1'(A,D), !, allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__0__0'(D,A,B,C). 'ai_not_observed/2__0__0'([],A,B,C) :- 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__0__0'([G|H],A,B,C) :- ( G=suspension(_,mutable(active),_,_,_,_,D,E,F), D==A, E==B, F=yes, '$via1_multi_hash_stored_complete/3-1'(A,L), 'chr sbag_member'(I,L), I=suspension(_,mutable(active),_,_,_,_,_,J,K), B remove_constraint_internal(G,_,M), ( M==yes -> '$delete_from_store_stored/3'(G) ; true ), remove_constraint_internal(I,_,N), ( N==yes -> '$delete_from_store_stored_complete/3'(I) ; true ), activate_constraint(P,_,C,Q), ( P==yes -> '$insert_in_store_ai_not_observed/2'(C) ; true ), O is K-1, stored(A,B,maybe), stored_complete(A,J,O), ( C=suspension(_,mutable(active),_,mutable(Q),_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'ai_not_observed/2__0__0'(H,A,B,C) ; true ) ; 'ai_not_observed/2__0__0'(H,A,B,C) ). 'ai_not_observed/2__0'(A,B,C) :- allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_not_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_ai_not_observed/2'(A) ; true ). ai_is_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !, fail. ai_is_observed(_,_). depends_on_as(A,B,C) :- 'depends_on_as/3__0'(A,B,C,_). 'depends_on_as/3__0'(A,B,C,D) :- '$via1_multi_hash_final_answer_pattern/2-1'(B,E), !, allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__0'([],A,B,C,D) :- 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__0__0'([G|I],A,B,C,D) :- ( G=suspension(_,mutable(active),_,_,_,_,E,F), E==B, '$via1_multi_hash_final_answer_pattern/2-1'(C,H) -> 'depends_on_as/3__0__1'(H,F,G,I,A,B,C,D) ; 'depends_on_as/3__0__0'(I,A,B,C,D) ). 'depends_on_as/3__0__1'([],_,_,E,A,B,C,D) :- 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__1'([J|K],F,A,G,B,C,D,E) :- ( J=suspension(_,mutable(active),_,_,_,_,H,I), J\==A, H==D, O=t(141,E,A,J), 'chr novel_production'(E,O), 'chr novel_production'(A,O), 'chr novel_production'(J,O) -> 'chr extend_history'(E,O), activate_constraint(M,_,E,N), ( M==yes -> '$insert_in_store_depends_on_as/3'(E) ; true ), ai_observation_lub(F,I,L), final_answer_pattern(B,L), ( E=suspension(_,mutable(active),_,mutable(N),_,_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ; true ) ; 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ). 'depends_on_as/3__0'(A,B,C,D) :- allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__1'(_,_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_as/3'(A) ; true ). --- NEW FILE chr_translate_bootstrap1.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap1.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate_bootstrap1,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> B=E ; check_rules(D,C), unique_analyse_optimise(D,F), check_attachments(F), set_constraint_indices(C,1), store_management_preds(C,G), constraints_code(C,F,H), append_lists([E,G,H],B) ), chr_clear. store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_attach_increment(D), generate_attr_unify_hook(E), append_lists([C,D,E],B). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), C=pragma(F,G,H,B). rule(A,B,C) :- is_rule(A,D,E), C=pragma(D,E,[],B). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). check_rules(A,B) :- check_rules(A,B,1). check_rules([],_,_). check_rules([A|B],C,D) :- check_rule(A,C,D), E is D+1, check_rules(B,C,E). check_rule(A,B,C) :- A=pragma(D,_,E,_), D=rule(F,G,_,_), append(F,G,H), check_head_constraints(H,B,A,C), check_pragmas(E,A,C). check_head_constraints([],_,_,_). check_head_constraints([A|B],C,D,E) :- functor(A,F,G), ( member(F/G,C) -> check_head_constraints(B,C,D,E) ; format('CHR compiler ERROR: Undeclared constraint ~w in head of ~@. ',[F/G,format_rule(D,E)]), format(' `--> Constraint should be on of ~w. ',[C]), fail ). check_pragmas([],_,_). check_pragmas([A|B],C,D) :- check_pragma(A,C,D), check_pragmas(B,C,D). check_pragma(A,B,C) :- var(A), !, format('CHR compiler ERROR: invalid pragma ~w in ~@. ',[A,format_rule(B,C)]), format(' `--> Pragma should not be a variable! ',[]), fail. check_pragma(passive(A),B,C) :- !, B=pragma(_,ids(D,E),_,_), [...2192 lines suppressed...] 'detach_attached/2'(K,B) ). 'attached/2__1'(A,B,C) :- B==no, 'chr via_1'(A,D), get_attr(D,chr_translate_bootstrap1,E), E=v(G,_,_,_,_,_,F), G/\32=:=32, !, 'attached/2__1__0'(F,A,B,C). 'attached/2__1__0'([],A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,G,_,_,_,_,F,_), G=mutable(active), F==A -> 'chr remove_constraint_internal'(D,H), 'detach_attached/2'(H,D), 'attached/2__1__0'(E,A,B,C) ; 'attached/2__1__0'(E,A,B,C) ). 'attached/2__1'(A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__2'(A,B,C) :- B==maybe, 'chr via_1'(A,E), get_attr(E,chr_translate_bootstrap1,F), F=v(K,_,_,_,_,_,J), K/\32=:=32, ( 'chr sbag_member'(D,J), D=suspension(_,I,_,_,_,_,G,H), I=mutable(active), G==A, H==maybe -> true ), !, ( var(C) -> true ; 'chr remove_constraint_internal'(C,L), 'detach_attached/2'(L,C) ). 'attached/2__2'(_,_,A) :- 'chr activate_constraint'(B,A,_), 'attach_attached/2'(B,A). is_attached(A) :- 'is_attached/1__0'(A,_). 'is_attached/1__0'(A,_) :- 'chr via_1'(A,C), get_attr(C,chr_translate_bootstrap1,D), D=v(I,_,_,_,_,_,H), I/\32=:=32, 'chr sbag_member'(B,H), B=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, ( F==no -> fail ; true ). 'is_attached/1__0'(_,_) :- !. chr_clear :- 'chr_clear/0__0'(_). 'chr_clear/0__0'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,D,_,_,_,_,_), E/\1=:=1, !, ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__0__0'(D,A). 'chr_clear/0__0__0'([],A) :- 'chr_clear/0__1'(A). 'chr_clear/0__0__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint/2'(E,B), 'chr_clear/0__0__0'(C,A) ; 'chr_clear/0__0__0'(C,A) ). 'chr_clear/0__0'(A) :- ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__1'(A). 'chr_clear/0__1'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,D,_,_,_,_), E/\2=:=2, !, 'chr_clear/0__1__0'(D,A). 'chr_clear/0__1__0'([],A) :- 'chr_clear/0__2'(A). 'chr_clear/0__1__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_count/1'(E,B), 'chr_clear/0__1__0'(C,A) ; 'chr_clear/0__1__0'(C,A) ). 'chr_clear/0__1'(A) :- 'chr_clear/0__2'(A). 'chr_clear/0__2'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,D,_,_,_), E/\4=:=4, !, 'chr_clear/0__2__0'(D,A). 'chr_clear/0__2__0'([],A) :- 'chr_clear/0__3'(A). 'chr_clear/0__2__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_index/2'(E,B), 'chr_clear/0__2__0'(C,A) ; 'chr_clear/0__2__0'(C,A) ). 'chr_clear/0__2'(A) :- 'chr_clear/0__3'(A). 'chr_clear/0__3'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,D,_,_), E/\8=:=8, !, 'chr_clear/0__3__0'(D,A). 'chr_clear/0__3__0'([],A) :- 'chr_clear/0__4'(A). 'chr_clear/0__3__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_max_constraint_index/1'(E,B), 'chr_clear/0__3__0'(C,A) ; 'chr_clear/0__3__0'(C,A) ). 'chr_clear/0__3'(A) :- 'chr_clear/0__4'(A). 'chr_clear/0__4'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,D,_), E/\16=:=16, !, 'chr_clear/0__4__0'(D,A). 'chr_clear/0__4__0'([],A) :- 'chr_clear/0__5'(A). 'chr_clear/0__4__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_target_module/1'(E,B), 'chr_clear/0__4__0'(C,A) ; 'chr_clear/0__4__0'(C,A) ). 'chr_clear/0__4'(A) :- 'chr_clear/0__5'(A). 'chr_clear/0__5'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,_,D), E/\32=:=32, !, 'chr_clear/0__5__0'(D,A). 'chr_clear/0__5__0'([],A) :- 'chr_clear/0__6'(A). 'chr_clear/0__5__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_attached/2'(E,B), 'chr_clear/0__5__0'(C,A) ; 'chr_clear/0__5__0'(C,A) ). 'chr_clear/0__5'(A) :- 'chr_clear/0__6'(A). 'chr_clear/0__6'(_) :- !. --- NEW FILE chr_translate_bootstrap2.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap2.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(chr_runtime). :-use_module(chr_hashtable_store). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> insert_declarations(E,B) ; add_rules(D), check_rules(D,C), add_occurrences(D), late_allocation(C), unique_analyse_optimise(D,F), check_attachments(C), assume_constraint_stores(C), set_constraint_indices(C,1), constraints_code(C,F,G), validate_store_type_assumptions(C), store_management_preds(C,H), insert_declarations(E,I), chr_module_declaration(J), append_lists([I,H,G,J],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_store_code(A,I), append_lists([C,D,E,F,G,H,I],B). insert_declarations(A,B) :- ( A=[(:-module(C,D))|E] -> B=[(:-module(C,D)),(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|E] ; B=[(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|A] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). parse_rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). parse_rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), inc_rule_count(I), C=pragma(F,G,H,B,I). rule(A,B,C) :- is_rule(A,D,E), inc_rule_count(F), C=pragma(D,E,[],B,F). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). add_rules([]). add_rules([A|B]) :- A=pragma(_,_,_,_,C), rule(C,A), add_rules(B). check_rules([],_). check_rules([A|B],C) :- [...3285 lines suppressed...] E==A -> true ), !, B=F. 'get_max_occurrence/2__0'(_,A,_) :- !, A=0. allocation_occurrence(A,B) :- 'allocation_occurrence/2__0'(A,B,_). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,N,_,_,_,_,J,K,L,M), N=mutable(active), J==A, K==B, L==E, 'chr lock'(F), 'chr lock'(M), F=pragma(_,ids(_,_),_,_,_), member(M,_), 'chr unlock'(F), 'chr unlock'(M), !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,M,_,_,_,_,J,K,L,_), M=mutable(active), J==A, K==B, L==E, 'chr lock'(F), F=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(F), !, N is B+1, allocation_occurrence(A,N). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,I,_,_,_,_,E,F,G,H), I=mutable(active), E==A, F==B, '$via1_multi_hash_passive/2-1'(G,K), 'chr sbag_member'(J,K), J=suspension(_,N,_,_,_,_,L,M), N=mutable(active), L==G, M==H, !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,C) :- insert_constraint_internal(_,_,C,chr_translate:'allocation_occurrence/2__0'(A,B,C),allocation_occurrence(A,B),[A,B]), '$insert_in_store_allocation_occurrence/2'(C). get_allocation_occurrence(A,B) :- 'get_allocation_occurrence/2__0'(A,B,_). 'get_allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_allocation_occurrence/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_allocation_occurrence/2__0'(_,_,_) :- !, fail. rule(A,B) :- 'rule/2__0'(A,B,_). 'rule/2__0'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__0__0'(D,A,B,C). 'rule/2__0__0'([],A,B,C) :- 'rule/2__1'(A,B,C). 'rule/2__0__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,O,_,_,_,_,K,L,M,N), O=mutable(active), K==F, L==G, M==A, 'chr lock'(B), 'chr lock'(N), B=pragma(_,ids(_,_),_,_,_), member(N,_), 'chr unlock'(B), 'chr unlock'(N) -> remove_constraint_internal(D,_,P), ( P==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(R,_,C,S), ( R==yes -> '$insert_in_store_rule/2'(C) ; true ), Q is G+1, allocation_occurrence(F,Q), ( C=suspension(_,T,_,U,_,_,_,_), T=mutable(active), U=mutable(S) -> 'chr update_mutable'(inactive,T), 'rule/2__0__0'(E,A,B,C) ; true ) ; 'rule/2__0__0'(E,A,B,C) ). 'rule/2__0'(A,B,C) :- allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__1'(A,B,C). 'rule/2__1'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, 'rule/2__1__0'(D,A,B,C). 'rule/2__1__0'([],A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,N,_,_,_,_,K,L,M,_), N=mutable(active), K==F, L==G, M==A, 'chr lock'(B), B=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(B) -> remove_constraint_internal(D,_,O), ( O==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(Q,_,C,R), ( Q==yes -> '$insert_in_store_rule/2'(C) ; true ), P is G+1, allocation_occurrence(F,P), ( C=suspension(_,S,_,T,_,_,_,_), S=mutable(active), T=mutable(R) -> 'chr update_mutable'(inactive,S), 'rule/2__1__0'(E,A,B,C) ; true ) ; 'rule/2__1__0'(E,A,B,C) ). 'rule/2__1'(A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_rule/2'(A) ; true ). get_rule(A,B) :- 'get_rule/2__0'(A,B,_). 'get_rule/2__0'(A,B,_) :- '$via1_multi_hash_rule/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_rule/2__0'(_,_,_) :- !, fail. --- NEW FILE guard_entailment.pl --- /* Generated by CHR bootstrap compiler From: guard_entailment.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,53,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(guard_entailment,[entails_guard/2,simplify_guards/5]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(builtins). entails_guard(A,B) :- copy_term_nat((A,B),(C,D)), term_variables(C,E), variables(E), entails_guard2(C), !, test(D), !, cleanup. entails_guard2([]). entails_guard2([A|B]) :- known(A), entails_guard2(B). simplify_guards(A,B,C,D,E) :- copy_term_nat((A,C),(F,G)), term_variables(F,H), variables(H), entails_guard2(F), !, simplify(G,I), simplified(C,I,D,B,E), !, cleanup. simplified([],[],[],A,A). simplified([A|B],[keep|C],[A|D],E,F) :- simplified(B,C,D,E,F). simplified([_|_],[fail|_],fail,A,A). simplified([A|B],[true|C],[D|E],F,G) :- builtins:binds_b(A,H), term_variables(B,I), intersect_eq(H,I,J), !, ( J=[] -> term_variables(F,K), intersect_eq(H,K,L), !, ( L=[] -> D=true, G=M ; D=true, G=(A,M) ) ; D=A, G=M ), simplified(B,C,E,F,M). simplify([],[]). simplify([A|B],[C|D]) :- ( \+try(true,A) -> C=true ; builtins:negate_b(A,E), ( \+try(true,E) -> C=fail ; C=keep ) ), known(A), simplify(B,D). try(A,B) :- ( known(A) -> true ; format(' ERROR: entailment checker: this is not supposed to happen. ',[]) ), ( test(B) -> fail ; true ). lookup([],[],_,_) :- fail. lookup([A|B],[C|D],E,F) :- ( E==A -> F=C ; lookup(B,D,E,F) ). add_args_unif([],[],true). add_args_unif([A|B],[C|D],(A=C,E)) :- add_args_unif(B,D,E). add_args_nunif([],[],fail). add_args_nunif([A|B],[C|D],(A\=C;E)) :- add_args_nunif(B,D,E). add_args_nmatch([],[],fail). add_args_nmatch([A|B],[C|D],(A\==C;E)) :- add_args_nmatch(B,D,E). all_unique_vars(A,B) :- all_unique_vars(A,B,[]). all_unique_vars([],_,_). all_unique_vars([A|B],C,D) :- var(A), \+memberchk_eq(A,C), \+memberchk_eq(A,D), all_unique_vars(B,[A|D]). :-use_module(chr(chr_runtime)). :-use_module(chr(chr_hashtable_store)). :-use_module(library('clp/clp_events')). 'attach_known/1'([],_). 'attach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\1=:=1 -> put_attr(A,guard_entailment,v(F,[C|D],E)) ; G is F\/1, put_attr(A,guard_entailment,v(G,[C],E)) ) ; put_attr(A,guard_entailment,v(1,[C],[])) ), true, 'attach_known/1'(B,C). 'detach_known/1'([],_). 'detach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\1=:=1 -> 'chr sbag_del_element'(D,C,H), ( H==[] -> G is F/\ -2, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,[],E)) ) ; put_attr(A,guard_entailment,v(F,H,E)) ) ; true ) ; true ), 'detach_known/1'(B,C). 'attach_variables/1'([],_). 'attach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\2=:=2 -> put_attr(A,guard_entailment,v(F,D,[C|E])) ; G is F\/2, put_attr(A,guard_entailment,v(G,D,[C])) ) ; put_attr(A,guard_entailment,v(2,[],[C])) ), true, 'attach_variables/1'(B,C). 'detach_variables/1'([],_). 'detach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\2=:=2 -> 'chr sbag_del_element'(E,C,H), ( H==[] -> G is F/\ -3, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,D,[])) ) ; put_attr(A,guard_entailment,v(F,D,H)) ) ; true ) ; true ), 'detach_variables/1'(B,C). '$indexed_variables'(B,A) :- B=known(_), term_variables(B,A). '$indexed_variables'(B,A) :- B=variables(_), term_variables(B,A). attach_increment([],_). [...3131 lines suppressed...] B=functor(C,_,_), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=ground(C), ground(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), number(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), float(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), integer(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), nonvar(C), !. test(A) :- nonvar(A), A=(B,C), !, test(B), known(B), test(C). test(A) :- nonvar(A), A=(B;C), !, negate_b(B,D), negate_b(C,E), ( known(E), test(B) ; known(D), test(C) ). test(A) :- 'chr global_term_ref_1'(D), get_attr(D,guard_entailment,E), E=v(G,F,_), G/\1=:=1, 'chr sbag_member'(B,F), B=suspension(_,mutable(active),_,_,_,_,C), nonvar(C), C=(H;I), !, remove_constraint_internal(B,K,L), ( L==yes -> '$delete_from_store_known/1'(B), 'detach_known/1'(K,B) ; true ), \+try(H,A), !, negate_b(H,J), known(J), \+try(I,A). test(_) :- fail. cleanup :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,C,_), D/\1=:=1, !, 'cleanup/0__0__0'(C). 'cleanup/0__0__0'([]) :- 'cleanup/0__1'. 'cleanup/0__0__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_known/1'(A), 'detach_known/1'(C,A) ; true ), 'cleanup/0__0__0'(B) ; 'cleanup/0__0__0'(B) ). cleanup :- 'cleanup/0__1'. 'cleanup/0__1' :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,_,C), D/\2=:=2, !, 'cleanup/0__1__0'(C). 'cleanup/0__1__0'([]) :- 'cleanup/0__2'. 'cleanup/0__1__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_variables/1'(A), 'detach_variables/1'(C,A) ; true ), 'cleanup/0__1__0'(B) ; 'cleanup/0__1__0'(B) ). 'cleanup/0__1' :- 'cleanup/0__2'. 'cleanup/0__2'. variables(A) :- 'variables/1__0'(A,_). 'variables/1__0'(A,B) :- 'chr global_term_ref_1'(E), get_attr(E,guard_entailment,F), F=v(H,G,_), H/\1=:=1, 'chr sbag_member'(C,G), C=suspension(_,mutable(active),_,_,_,_,D), nonvar(D), D=functor(I,J,K), ground(K), ground(J), var(I), !, remove_constraint_internal(C,N,O), ( O==yes -> '$delete_from_store_known/1'(C), 'detach_known/1'(N,C) ; true ), ( var(B) -> true ; remove_constraint_internal(B,P,Q), ( Q==yes -> '$delete_from_store_variables/1'(B), 'detach_variables/1'(P,B) ; true ) ), functor(I,J,K), I=..[_|L], append(L,A,M), variables(M). 'variables/1__0'(A,B) :- ( var(B) -> insert_constraint_internal(D,C,B,guard_entailment:'variables/1__0'(A,B),variables(A),[A]) ; activate_constraint(D,C,B,_) ), ( D==yes -> '$insert_in_store_variables/1'(B), 'attach_variables/1'(C,B) ; true ). :-multifile chr:'$chr_module'/1. chr:'$chr_module'(guard_entailment). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yap/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Oct 2005 08:39:17 -0000 1.4 +++ .cvsignore 1 May 2006 11:09:50 -0000 1.5 @@ -1 +1 @@ -Yap-5.0.1.tar.gz +Yap-5.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yap/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Oct 2005 08:39:17 -0000 1.4 +++ sources 1 May 2006 11:09:50 -0000 1.5 @@ -1 +1 @@ -d8d1f1c5a38d501eb9db38d880668eda Yap-5.0.1.tar.gz +1f5c26642a27158c98f6c2fac56d3dad Yap-5.1.1.tar.gz Index: yap.spec =================================================================== RCS file: /cvs/extras/rpms/yap/FC-4/yap.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- yap.spec 25 Oct 2005 08:39:49 -0000 1.11 +++ yap.spec 1 May 2006 11:09:50 -0000 1.12 @@ -1,12 +1,16 @@ Name: yap -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages License: Artistic/LGPL -Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.0.1.tar.gz +Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.1.1.tar.gz +Source1: guard_entailment.pl +Source2: chr_translate_bootstrap1.pl +Source3: chr_translate_bootstrap2.pl +Source4: chr_translate.pl Patch1: Yap-noni386.patch URL: http://www.ncc.up.pt/~vsc/Yap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,9 +25,29 @@ follows the Edinburgh tradition, and is largely compatible with the ISO-Prolog standard and with Quintus and SICStus Prolog. + +%package devel +Summary: C-Interface development files for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description devel +C-Interface development files for Yap. + + +%package docs +Summary: Documentation for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description docs +Documentation for Yap. + + %prep %setup -q -n Yap-%{version} %patch1 -p1 +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr %build %configure \ @@ -33,6 +57,7 @@ make %{?_smp_mflags} (cd docs; make info) + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install @@ -40,10 +65,23 @@ cp -f docs/yap.info* $RPM_BUILD_ROOT%{_infodir} cp -f LGPL/pillow/doc/pillow_doc.info $RPM_BUILD_ROOT%{_infodir} +# fix permissions and flags +chmod 0644 $RPM_BUILD_ROOT%{_datadir}/Yap/pl/* +chmod 0644 $RPM_BUILD_ROOT%{_includedir}/Yap/* +find -name '*.lgt' -exec chmod 0644 '{}' ';' +find -name '*.h' -exec chmod 0644 '{}' ';' +find -name '*.c' -exec chmod 0644 '{}' ';' + +# move examples to docdir +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv $RPM_BUILD_ROOT%{_datadir}/Yap/examples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT%{_datadir}/Yap/clpbn/examples + %post /sbin/install-info %{_infodir}/yap.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : + %postun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || : @@ -54,24 +92,41 @@ %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc README %doc changes* +%{_bindir}/yap +%{_datadir}/Yap +%{_prefix}/lib/Yap +%{_infodir}/* + + +%files devel +%defattr(-,root,root,-) +%{_prefix}/lib/libYap.a +%{_includedir}/Yap + + +%files docs +%defattr(-,root,root,-) %doc docs/*.html %doc docs/yap.pdf %doc LGPL/pillow/doc/pillow_doc_html/* %doc LGPL/pillow/doc/article.ps.gz %doc --parent Logtalk/manuals %doc --parent Logtalk/examples -%{_bindir}/yap -%{_datadir}/Yap -%{_includedir}/Yap -%{_prefix}/lib/libYap.a -%{_prefix}/lib/Yap -%{_infodir}/* + %changelog +* Mon May 1 2006 Gerard Milmeister - 5.1.1-1 +- new version 5.1.1 +- split off devel and docs packages + +* Fri Feb 17 2006 Gerard Milmeister - 5.0.1-2 +- Rebuild for Fedora Extras 5 + * Tue Oct 25 2005 Gerard Milmeister - 5.0.1-1 - New Version 5.0.1 From fedora-extras-commits at redhat.com Mon May 1 11:17:40 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 1 May 2006 04:17:40 -0700 Subject: rpms/clamav/FC-5 clamav-0.88.2-guys, please-read-the-compiler-warnings-before-doing-a-release.patch, NONE, 1.1 clamav-0.88.1-strncpy.patch, 1.1, 1.2 clamav-0.88.1-guys, please-read-the-compiler-warnings-before-doing-a-release.patch, 1.1, NONE Message-ID: <200605011117.k41BHgku031499@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31449/FC-5 Modified Files: clamav-0.88.1-strncpy.patch Added Files: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch Removed Files: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch Log Message: fixed broken patches ***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1 ***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1 clamav-0.88.1-strncpy.patch: Index: clamav-0.88.1-strncpy.patch =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-5/clamav-0.88.1-strncpy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-0.88.1-strncpy.patch 30 Apr 2006 10:33:38 -0000 1.1 +++ clamav-0.88.1-strncpy.patch 1 May 2006 11:17:39 -0000 1.2 @@ -24,29 +24,3 @@ while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ { -2006-04-24 Enrico Scholz - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { ***** Not enough context to create diffstat for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE ***** Not enough context to create diff for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE From fedora-extras-commits at redhat.com Mon May 1 11:17:40 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 1 May 2006 04:17:40 -0700 Subject: rpms/clamav/FC-4 clamav-0.88.2-guys, please-read-the-compiler-warnings-before-doing-a-release.patch, 1.1, 1.2 clamav-0.88.1-strncpy.patch, 1.1, 1.2 Message-ID: <200605011117.k41BHgmt031506@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31449/FC-4 Modified Files: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch clamav-0.88.1-strncpy.patch Log Message: fixed broken patches ***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,1.2 ***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,1.2 clamav-0.88.1-strncpy.patch: Index: clamav-0.88.1-strncpy.patch =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav-0.88.1-strncpy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-0.88.1-strncpy.patch 30 Apr 2006 10:33:39 -0000 1.1 +++ clamav-0.88.1-strncpy.patch 1 May 2006 11:17:40 -0000 1.2 @@ -24,29 +24,3 @@ while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ { -2006-04-24 Enrico Scholz - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { From fedora-extras-commits at redhat.com Mon May 1 11:17:41 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 1 May 2006 04:17:41 -0700 Subject: rpms/clamav/FC-3 clamav-0.88.1-strncpy.patch,1.1,1.2 Message-ID: <200605011117.k41BHhEK031513@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31449/FC-3 Modified Files: clamav-0.88.1-strncpy.patch Log Message: fixed broken patches clamav-0.88.1-strncpy.patch: Index: clamav-0.88.1-strncpy.patch =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav-0.88.1-strncpy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-0.88.1-strncpy.patch 30 Apr 2006 10:33:39 -0000 1.1 +++ clamav-0.88.1-strncpy.patch 1 May 2006 11:17:41 -0000 1.2 @@ -24,29 +24,3 @@ while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ { -2006-04-24 Enrico Scholz - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { From fedora-extras-commits at redhat.com Mon May 1 12:05:23 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 05:05:23 -0700 Subject: rpms/pl/FC-5 pl-5.6.12-xft.patch,NONE,1.1 pl.spec,1.24,1.25 Message-ID: <200605011205.k41C5PD7001439@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1419 Modified Files: pl.spec Added Files: pl-5.6.12-xft.patch Log Message: fix for xft pl-5.6.12-xft.patch: --- NEW FILE pl-5.6.12-xft.patch --- --- pl-5.6.12/packages/xpce/src/configure.xft 2006-05-01 13:44:44.000000000 +0200 +++ pl-5.6.12/packages/xpce/src/configure 2006-05-01 13:46:45.000000000 +0200 @@ -309,7 +309,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA XFTCONFIG LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -8036,7 +8036,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8044,7 +8044,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -8071,7 +8071,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -8092,11 +8092,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -9136,56 +9136,13 @@ fi -for ac_prog in xft-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_XFTCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$XFTCONFIG"; then - ac_cv_prog_XFTCONFIG="$XFTCONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_XFTCONFIG="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -XFTCONFIG=$ac_cv_prog_XFTCONFIG -if test -n "$XFTCONFIG"; then - echo "$as_me:$LINENO: result: $XFTCONFIG" >&5 -echo "${ECHO_T}$XFTCONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$XFTCONFIG" && break -done -test -n "$XFTCONFIG" || XFTCONFIG=""false"" - -if test "$XFTCONFIG" != "false" ; then cat >>confdefs.h <<\_ACEOF #define USE_XFT 1 _ACEOF - XLIBS="$XLIBS `$XFTCONFIG --libs`" - XINCLUDES="$XINCLUDES `$XFTCONFIG --cflags`" -fi; + XLIBS="$XLIBS `pkg-config xft --libs`" + XINCLUDES="$XINCLUDES `pkg-config xft --cflags`" @@ -9927,7 +9884,6 @@ s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at EGREP@,$EGREP,;t t s, at ALLOCA@,$ALLOCA,;t t -s, at XFTCONFIG@,$XFTCONFIG,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/FC-5/pl.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pl.spec 30 Apr 2006 21:27:52 -0000 1.24 +++ pl.spec 1 May 2006 12:05:23 -0000 1.25 @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -12,6 +12,7 @@ Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch +Patch2: pl-5.6.12-xft.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel BuildRequires: readline-devel @@ -45,6 +46,7 @@ %setup -q %patch0 -p1 -b .rpath %patch1 -p1 -b .multilib +%patch2 -p1 -b .xft ( mkdir doc-install cd doc-install @@ -95,6 +97,9 @@ %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-2 +- added patch to compile with xft + * Sun Apr 30 2006 Gerard Milmeister - 5.6.12-1 - new version 5.6.12 From fedora-extras-commits at redhat.com Mon May 1 12:06:30 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 05:06:30 -0700 Subject: rpms/pl/devel pl-5.6.12-xft.patch,NONE,1.1 pl.spec,1.24,1.25 Message-ID: <200605011206.k41C6W67001508@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1488 Modified Files: pl.spec Added Files: pl-5.6.12-xft.patch Log Message: fix for xft pl-5.6.12-xft.patch: --- NEW FILE pl-5.6.12-xft.patch --- --- pl-5.6.12/packages/xpce/src/configure.xft 2006-05-01 13:44:44.000000000 +0200 +++ pl-5.6.12/packages/xpce/src/configure 2006-05-01 13:46:45.000000000 +0200 @@ -309,7 +309,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA XFTCONFIG LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -8036,7 +8036,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8044,7 +8044,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -8071,7 +8071,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -8092,11 +8092,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -9136,56 +9136,13 @@ fi -for ac_prog in xft-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_XFTCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$XFTCONFIG"; then - ac_cv_prog_XFTCONFIG="$XFTCONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_XFTCONFIG="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -XFTCONFIG=$ac_cv_prog_XFTCONFIG -if test -n "$XFTCONFIG"; then - echo "$as_me:$LINENO: result: $XFTCONFIG" >&5 -echo "${ECHO_T}$XFTCONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$XFTCONFIG" && break -done -test -n "$XFTCONFIG" || XFTCONFIG=""false"" - -if test "$XFTCONFIG" != "false" ; then cat >>confdefs.h <<\_ACEOF #define USE_XFT 1 _ACEOF - XLIBS="$XLIBS `$XFTCONFIG --libs`" - XINCLUDES="$XINCLUDES `$XFTCONFIG --cflags`" -fi; + XLIBS="$XLIBS `pkg-config xft --libs`" + XINCLUDES="$XINCLUDES `pkg-config xft --cflags`" @@ -9927,7 +9884,6 @@ s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at EGREP@,$EGREP,;t t s, at ALLOCA@,$ALLOCA,;t t -s, at XFTCONFIG@,$XFTCONFIG,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pl.spec 30 Apr 2006 21:27:53 -0000 1.24 +++ pl.spec 1 May 2006 12:06:30 -0000 1.25 @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -12,6 +12,7 @@ Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch +Patch2: pl-5.6.12-xft.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel BuildRequires: readline-devel @@ -45,6 +46,7 @@ %setup -q %patch0 -p1 -b .rpath %patch1 -p1 -b .multilib +%patch2 -p1 -b .xft ( mkdir doc-install cd doc-install @@ -95,6 +97,9 @@ %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-2 +- added patch to compile with xft + * Sun Apr 30 2006 Gerard Milmeister - 5.6.12-1 - new version 5.6.12 From fedora-extras-commits at redhat.com Mon May 1 12:47:03 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Mon, 1 May 2006 05:47:03 -0700 Subject: rpms/libvisual-plugins/devel libvisual-plugins.spec-notyet.txt, NONE, 1.1 Message-ID: <200605011247.k41Cl5A1001770@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/libvisual-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1754 Added Files: libvisual-plugins.spec-notyet.txt Log Message: Not tagging/building/etc yet. --- NEW FILE libvisual-plugins.spec-notyet.txt --- %define libv_majv 0.4 %{!?with_gst: %define with_gst 0} %if %{with_gst} %define gst_args --enable-gstreamer-plugin %else %define gst_args --disable-gstreamer-plugin %endif Name: libvisual-plugins Version: 0.4.0 Release: 1%{?dist} Summary: Plugins for use with libvisual Group: Applications/Multimedia License: GPL URL: http://libvisual.sourceforge.net/v2/ Source0: http://easynews.dl.sourceforge.net/sourceforge/libvisual/%{name}-%{version}.tar.gz Patch0: libvisual-plugins-0.2.0.mkinstalldirs.patch #Patch1: libvisual-plugins-0.2.0-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvisual-devel >= 0.4.0 #BuildRequires: xorg-x11-proto-devel #BuildRequires: libX11-devel BuildRequires: libXt-devel BuildRequires: gtk2-devel BuildRequires: alsa-lib-devel BuildRequires: esound-devel BuildRequires: pango-devel #BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %if %with_gst BuildRequires: %{_libdir}/pkgconfig/gstreamer-0.8.pc %endif %description Libvisual is an abstraction library that comes between applications and audio visualisation plugins. This package provides visualizer plugins for use with libvisual aware applications. %prep %setup -q #%%patch0 -p1 #%%patch1 -p1 %build %configure \ %{gst_args} \ --enable-extra-optimization #--disable-infinite \ #--disable-flower \ #--disable-dancingparticles \ #--disable-gltest \ #--disable-madspin \ #--disable-nebulus ## infinite disabled due to gcc 4 issue ## rest disabled because they are broken ## and cause totem to fail in a bad way make %{?_smp_mflags} %install rm -rf %buildroot make DESTDIR=%buildroot install find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name}-%{libv_majv} %clean rm -rf %buildroot %files -f %{name}-%{libv_majv}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %_libdir/libvisual-%{libv_majv}/ %_datadir/libvisual-plugins-%{libv_majv}/ %changelog * Mon May 01 2006 Michael A. Peters - 0.4.0-1 - Initial build of 0.4.0 * Fri Feb 17 2006 Michael A. Peters - 0.2.0-3 - Rebuild in devel branch * Sun Nov 20 2005 Michael A. Peters - 0.2.0-2 - configure patch (patch1) to fix detection of xlibraries/xincludes - removed sed line fix of rpath in %%prep - no longer needed with - the configure patch * Sun Nov 20 2005 Michael A. Peters - 0.2.0-1.9 - fixed it so it builds (specified x-libraries) - building OpenGL plugin * Sat Nov 19 2005 Michael A. Peters - 0.2.0-1.3 - fix BuildRequires for mock, specify x-includedir to configure * Fri Nov 18 2005 Michael A. Peters - 0.2.0-1.2 - changed the xorg-x11-devel BuildRequires to modular xorg-x11 - for fc5 - put / at end of directories owned in %%files for readability. * Sun Jun 19 2005 Michael A. Peters - 0.2.0-1.1 - remove explicit rpath from LIBTOOL options * Wed Jun 15 2005 Michael A. Peters - 0.2.0-1 - initial checkin to Extras CVS From fedora-extras-commits at redhat.com Mon May 1 13:21:46 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 06:21:46 -0700 Subject: rpms/pl/FC-5 pl.spec,1.25,1.26 Message-ID: <200605011321.k41DLmjI004049@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4032 Modified Files: pl.spec Log Message: Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/FC-5/pl.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- pl.spec 1 May 2006 12:05:23 -0000 1.25 +++ pl.spec 1 May 2006 13:21:46 -0000 1.26 @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -29,6 +29,7 @@ BuildRequires: libXpm-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel +BuildRequires: libXinerama-devel # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038 #ExcludeArch: x86_64 @@ -97,6 +98,9 @@ %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-3 +- added buildreq for libXinerama-devel + * Mon May 1 2006 Gerard Milmeister - 5.6.12-2 - added patch to compile with xft From fedora-extras-commits at redhat.com Mon May 1 13:25:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 06:25:40 -0700 Subject: rpms/pl/devel pl.spec,1.25,1.26 Message-ID: <200605011325.k41DPgGu004122@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104 Modified Files: pl.spec Log Message: Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- pl.spec 1 May 2006 12:06:30 -0000 1.25 +++ pl.spec 1 May 2006 13:25:39 -0000 1.26 @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -29,6 +29,7 @@ BuildRequires: libXpm-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel +BuildRequires: libXinerama-devel # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038 #ExcludeArch: x86_64 @@ -97,6 +98,9 @@ %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-3 +- added buildreq for libXinerama-devel + * Mon May 1 2006 Gerard Milmeister - 5.6.12-2 - added patch to compile with xft From fedora-extras-commits at redhat.com Mon May 1 14:38:29 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:29 -0700 Subject: rpms/gsview/FC-1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.1, NONE gsview.desktop, 1.2, NONE gsview.spec, 1.2, NONE Message-ID: <200605011439.k41Ed1aj006722@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-1 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 1 May 2006 14:38:29 -0000 1.3 @@ -1 +0,0 @@ -gsview-4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:19 -0000 1.2 +++ sources 1 May 2006 14:38:29 -0000 1.3 @@ -1 +0,0 @@ -35cb5e421faca49eb70c426354e41ba8 gsview-4.6.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:30 -0700 Subject: rpms/gsview/FC-2 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.1, NONE gsview.desktop, 1.2, NONE gsview.spec, 1.3, NONE Message-ID: <200605011439.k41Ed2qQ006726@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-2 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 1 May 2006 14:38:30 -0000 1.3 @@ -1 +0,0 @@ -gsview-4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:19 -0000 1.2 +++ sources 1 May 2006 14:38:30 -0000 1.3 @@ -1 +0,0 @@ -35cb5e421faca49eb70c426354e41ba8 gsview-4.6.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:31 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:31 -0700 Subject: rpms/gsview/FC-3 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.2, NONE gsview-4.7-dllversion.patch, 1.1, NONE gsview-4.7-letterpaper.patch, 1.1, NONE gsview.desktop, 1.2, NONE gsview.spec, 1.7, NONE Message-ID: <200605011439.k41Ed39V006730@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-3 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 1 May 2006 14:38:30 -0000 1.3 @@ -1 +0,0 @@ -gsview-4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Aug 2005 16:53:35 -0000 1.3 +++ sources 1 May 2006 14:38:30 -0000 1.4 @@ -1 +0,0 @@ -ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview-4.7-dllversion.patch DELETED --- --- gsview-4.7-letterpaper.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:31 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:31 -0700 Subject: rpms/gsview/FC-4 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.2, NONE gsview-4.7-dllversion.patch, 1.1, NONE gsview-4.7-letterpaper.patch, 1.1, NONE gsview.desktop, 1.2, NONE gsview.spec, 1.10, NONE Message-ID: <200605011439.k41Ed3p6006734@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-4 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 1 May 2006 14:38:31 -0000 1.3 @@ -1 +0,0 @@ -gsview-4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Aug 2005 16:50:52 -0000 1.3 +++ sources 1 May 2006 14:38:31 -0000 1.4 @@ -1 +0,0 @@ -ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview-4.7-dllversion.patch DELETED --- --- gsview-4.7-letterpaper.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:32 -0700 Subject: rpms/gsview/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.2, NONE gsview-4.7-dllversion.patch, 1.1, NONE gsview-4.7-letterpaper.patch, 1.1, NONE gsview.desktop, 1.3, NONE gsview.spec, 1.17, NONE Message-ID: <200605011439.k41Ed4TN006738@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-5 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Aug 2005 18:17:28 -0000 1.3 +++ .cvsignore 1 May 2006 14:38:32 -0000 1.4 @@ -1 +0,0 @@ -gsview-4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Aug 2005 18:17:28 -0000 1.3 +++ sources 1 May 2006 14:38:32 -0000 1.4 @@ -1 +0,0 @@ -ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview-4.7-dllversion.patch DELETED --- --- gsview-4.7-letterpaper.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:33 -0700 Subject: rpms/gsview/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.2, NONE gsview-4.7-dllversion.patch, 1.1, NONE gsview-4.7-letterpaper.patch, 1.1, NONE gsview.desktop, 1.3, NONE gsview.spec, 1.17, NONE Message-ID: <200605011439.k41Ed5sR006742@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/devel Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Aug 2005 18:17:28 -0000 1.3 +++ .cvsignore 1 May 2006 14:38:32 -0000 1.4 @@ -1 +0,0 @@ -gsview-4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Aug 2005 18:17:28 -0000 1.3 +++ sources 1 May 2006 14:38:32 -0000 1.4 @@ -1 +0,0 @@ -ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview-4.7-dllversion.patch DELETED --- --- gsview-4.7-letterpaper.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:40:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:40:25 -0700 Subject: rpms/gsview/FC-1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.3, NONE Message-ID: <200605011440.k41EeRtR006778@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6753 Removed Files: .cvsignore Makefile branch sources Log Message: gsview pruning --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 1 15:16:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 1 May 2006 08:16:56 -0700 Subject: rpms/gramps/devel .cvsignore, 1.13, 1.14 gramps.spec, 1.19, 1.20 sources, 1.13, 1.14 Message-ID: <200605011516.k41FGwCv010084@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10063 Modified Files: .cvsignore gramps.spec sources Log Message: * Mon May 1 2006 Brian Pepple - 2.0.11-3 - Update to 2.0.11. - Drop INSTALL, README & ChangeLog documentation. - Ghost .pyo files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 28 Feb 2006 18:56:34 -0000 1.13 +++ .cvsignore 1 May 2006 15:16:56 -0000 1.14 @@ -1 +1 @@ -gramps-2.0.10.tar.gz +gramps-2.0.11.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gramps.spec 11 Mar 2006 20:23:56 -0000 1.19 +++ gramps.spec 1 May 2006 15:16:56 -0000 1.20 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.10 +Version: 2.0.11 Release: 3%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,21 +111,50 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO +%doc AUTHORS COPYING COPYING-DOCS FAQ NEWS TODO %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/application-registry/%{name}.applications -%{_datadir}/%{name}/ %{_datadir}/omf/%{name}/ %{_datadir}/mime/packages/%{name}.xml %{_datadir}/mime-info/* %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/gnome/48x48/mimetypes/*.png %{_sysconfdir}/gconf/schemas/%{name}.schemas -%{_mandir}/man1/* +%{_mandir}/man1/%{name}.1.gz +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.py +%{_datadir}/%{name}/*.pyc +%{_datadir}/%{name}/*.png +%{_datadir}/%{name}/*.jpg +%{_datadir}/%{name}/*.glade +%ghost %{_datadir}/%{name}/*.pyo +%{_datadir}/%{name}/data/ +%dir %{_datadir}/%{name}/dates +%{_datadir}/%{name}/dates/*.py +%{_datadir}/%{name}/dates/*.pyc +%ghost %{_datadir}/%{name}/dates/*.pyo +%dir %{_datadir}/%{name}/docgen +%{_datadir}/%{name}/docgen/*.py +%{_datadir}/%{name}/docgen/*.pyc +%ghost %{_datadir}/%{name}/docgen/*.pyo +%{_datadir}/%{name}/example/ +%{_datadir}/%{name}/gnome/ +%dir %{_datadir}/%{name}/plugins +%{_datadir}/%{name}/plugins/*.py +%{_datadir}/%{name}/plugins/*.pyc +%{_datadir}/%{name}/plugins/*.glade +%{_datadir}/%{name}/plugins/*.xml +%{_datadir}/%{name}/plugins/*.png +%ghost %{_datadir}/%{name}/plugins/*.pyo %changelog +* Mon May 1 2006 Brian Pepple - 2.0.11-3 +- Update to 2.0.11. +- Drop INSTALL, README & ChangeLog documentation. +- Ghost .pyo files. + * Sat Mar 11 2006 Brian Pepple - 2.0.10-3 - Remove Utility category from desktop file. - Update scriptlets. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 28 Feb 2006 18:56:34 -0000 1.13 +++ sources 1 May 2006 15:16:56 -0000 1.14 @@ -1 +1 @@ -2c9c00acce995546af325087622235e5 gramps-2.0.10.tar.gz +650873c3c571a921a9c42b975ced2105 gramps-2.0.11.tar.gz From fedora-extras-commits at redhat.com Mon May 1 15:53:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 08:53:57 -0700 Subject: rpms/perl-Image-Info/devel .cvsignore, 1.5, 1.6 perl-Image-Info.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200605011553.k41Frxx3010324@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10303 Modified Files: .cvsignore perl-Image-Info.spec sources Log Message: Update to 1.21. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 21:57:23 -0000 1.5 +++ .cvsignore 1 May 2006 15:53:57 -0000 1.6 @@ -1 +1 @@ -Image-Info-1.20.tar.gz +Image-Info-1.21.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Image-Info.spec 13 Mar 2006 21:57:23 -0000 1.11 +++ perl-Image-Info.spec 1 May 2006 15:53:57 -0000 1.12 @@ -1,7 +1,7 @@ %define rgbtxt %{_datadir}/X11/rgb.txt Name: perl-Image-Info -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Image meta information extraction module for Perl @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} @@ -25,7 +24,7 @@ %prep %setup -q -n Image-Info-%{version} -chmod 644 README exifdump imgdump +chmod 644 exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -55,10 +54,13 @@ %defattr(-,root,root,-) %doc Changes README exifdump imgdump %{perl_vendorlib}/Image/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-1 +- Update to 1.21. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 - Update to 1.20. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 21:57:23 -0000 1.5 +++ sources 1 May 2006 15:53:57 -0000 1.6 @@ -1 +1 @@ -91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz +c1e07651729fe88e1da5a0fe9337836a Image-Info-1.21.tar.gz From fedora-extras-commits at redhat.com Mon May 1 15:59:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 08:59:41 -0700 Subject: rpms/perl-Image-Info/devel perl-Image-Info.spec,1.12,1.13 Message-ID: <200605011559.k41FxhNB010901@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10880 Modified Files: perl-Image-Info.spec Log Message: Bumping release due to CVS problem. Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Image-Info.spec 1 May 2006 15:53:57 -0000 1.12 +++ perl-Image-Info.spec 1 May 2006 15:59:40 -0000 1.13 @@ -2,7 +2,7 @@ Name: perl-Image-Info Version: 1.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-2 +- Bumping release due to CVS problem. + * Mon May 1 2006 Jose Pedro Oliveira - 1.21-1 - Update to 1.21. From fedora-extras-commits at redhat.com Mon May 1 16:07:48 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 09:07:48 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.1,1.2 Message-ID: <200605011607.k41G7ohs013403@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13386 Modified Files: gcompris.spec Log Message: * Mon May 1 2006 Hans de Goede 7.4-5 - Make -devel require -libs instead of -lib (oops). Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcompris.spec 30 Apr 2006 08:28:51 -0000 1.1 +++ gcompris.spec 1 May 2006 16:07:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -68,7 +68,7 @@ %package devel Summary: Development libraries and headers for gcompris-lib Group: Development/Libraries -Requires: %{name}-lib = %{version} +Requires: %{name}-libs = %{version} Requires: libgnomecanvas-devel pkgconfig %description devel @@ -475,6 +475,9 @@ %changelog +* Mon May 1 2006 Hans de Goede 7.4-5 +- Make -devel require -libs instead of -lib (oops). + * Sat Apr 29 2006 Hans de Goede 7.4-4 - Add click_on_letter.patch from CVS which fixes a few problems with the click on letter activity when the sounds are not installed From fedora-extras-commits at redhat.com Mon May 1 16:10:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 09:10:39 -0700 Subject: rpms/perl-Image-Info/FC-4 .cvsignore, 1.3, 1.4 perl-Image-Info.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605011610.k41GAfgh013496@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13459/FC-4 Modified Files: .cvsignore perl-Image-Info.spec sources Log Message: Update to 1.21. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Mar 2006 22:18:15 -0000 1.3 +++ .cvsignore 1 May 2006 16:10:39 -0000 1.4 @@ -1 +1 @@ -Image-Info-1.20.tar.gz +Image-Info-1.21.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/perl-Image-Info.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Image-Info.spec 13 Mar 2006 22:18:15 -0000 1.8 +++ perl-Image-Info.spec 1 May 2006 16:10:39 -0000 1.9 @@ -1,8 +1,8 @@ %define rgbtxt %{_prefix}/X11R6/lib/X11/rgb.txt Name: perl-Image-Info -Version: 1.20 -Release: 1%{?dist} +Version: 1.21 +Release: 2%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} @@ -25,7 +24,7 @@ %prep %setup -q -n Image-Info-%{version} -chmod 644 README exifdump imgdump +chmod 644 exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -55,10 +54,16 @@ %defattr(-,root,root,-) %doc Changes README exifdump imgdump %{perl_vendorlib}/Image/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-2 +- Bumping release due to CVS problem. + +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-1 +- Update to 1.21. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 - Update to 1.20. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Mar 2006 22:18:15 -0000 1.3 +++ sources 1 May 2006 16:10:39 -0000 1.4 @@ -1 +1 @@ -91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz +c1e07651729fe88e1da5a0fe9337836a Image-Info-1.21.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:10:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 09:10:39 -0700 Subject: rpms/perl-Image-Info/FC-5 .cvsignore, 1.5, 1.6 perl-Image-Info.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200605011610.k41GAfIH013502@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13459/FC-5 Modified Files: .cvsignore perl-Image-Info.spec sources Log Message: Update to 1.21. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 21:57:23 -0000 1.5 +++ .cvsignore 1 May 2006 16:10:39 -0000 1.6 @@ -1 +1 @@ -Image-Info-1.20.tar.gz +Image-Info-1.21.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-5/perl-Image-Info.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Image-Info.spec 13 Mar 2006 21:57:23 -0000 1.11 +++ perl-Image-Info.spec 1 May 2006 16:10:39 -0000 1.12 @@ -1,8 +1,8 @@ %define rgbtxt %{_datadir}/X11/rgb.txt Name: perl-Image-Info -Version: 1.20 -Release: 1%{?dist} +Version: 1.21 +Release: 2%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} @@ -25,7 +24,7 @@ %prep %setup -q -n Image-Info-%{version} -chmod 644 README exifdump imgdump +chmod 644 exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -55,10 +54,16 @@ %defattr(-,root,root,-) %doc Changes README exifdump imgdump %{perl_vendorlib}/Image/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-2 +- Bumping release due to CVS problem. + +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-1 +- Update to 1.21. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 - Update to 1.20. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 21:57:23 -0000 1.5 +++ sources 1 May 2006 16:10:39 -0000 1.6 @@ -1 +1 @@ -91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz +c1e07651729fe88e1da5a0fe9337836a Image-Info-1.21.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:14:25 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 09:14:25 -0700 Subject: rpms/gcompris/FC-5 gcompris.spec,1.1,1.2 Message-ID: <200605011614.k41GERmw013628@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13611 Modified Files: gcompris.spec Log Message: * Mon May 1 2006 Hans de Goede 7.4-5 - Make -devel require -libs instead of -lib (oops). Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcompris.spec 30 Apr 2006 08:28:51 -0000 1.1 +++ gcompris.spec 1 May 2006 16:14:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -68,7 +68,7 @@ %package devel Summary: Development libraries and headers for gcompris-lib Group: Development/Libraries -Requires: %{name}-lib = %{version} +Requires: %{name}-libs = %{version} Requires: libgnomecanvas-devel pkgconfig %description devel @@ -475,6 +475,9 @@ %changelog +* Mon May 1 2006 Hans de Goede 7.4-5 +- Make -devel require -libs instead of -lib (oops). + * Sat Apr 29 2006 Hans de Goede 7.4-4 - Add click_on_letter.patch from CVS which fixes a few problems with the click on letter activity when the sounds are not installed From fedora-extras-commits at redhat.com Mon May 1 16:25:19 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Mon, 1 May 2006 09:25:19 -0700 Subject: rpms/nautilus-actions/FC-4 .cvsignore, 1.3, 1.4 nautilus-actions.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605011625.k41GPLGN013828@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/nautilus-actions/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13807 Modified Files: .cvsignore nautilus-actions.spec sources Log Message: * Mon May 01 2006 Deji Akingunola - 1.2-1 - Update to version 1.2 - Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2006 22:34:26 -0000 1.3 +++ .cvsignore 1 May 2006 16:25:19 -0000 1.4 @@ -1 +1 @@ -nautilus-actions-1.0.tar.gz +nautilus-actions-1.2.tar.gz Index: nautilus-actions.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/nautilus-actions.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nautilus-actions.spec 8 Feb 2006 22:34:26 -0000 1.4 +++ nautilus-actions.spec 1 May 2006 16:25:19 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions -Version: 1.0 +Version: 1.2 Release: 1%{?dist} Group: User Interface/Desktops License: GPL @@ -30,8 +30,6 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install -cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png - rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop @@ -48,14 +46,17 @@ rm -rf %{buildroot} %pre +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || : killall -HUP gconfd-2 || : fi +fi %preun +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ @@ -64,6 +65,19 @@ gconftool-2 --recursive-unset /schemas/apps/nautilus-actions killall -HUP gconfd-2 || : fi +fi + +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) @@ -73,10 +87,14 @@ %{_bindir}/nautilus-actions-new-config %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so %{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/*/apps/nautilus-actions.* %{_datadir}/applications/fedora-nact.desktop -%{_datadir}/pixmaps/nautilus-actions-icon.png %changelog +* Mon May 01 2006 Deji Akingunola - 1.2-1 +- Update to version 1.2 +- Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors + * Wed Feb 8 2006 Deji Akingunola - 1.0-1 - New upstream version - Do away with gconf schemas installation Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2006 22:34:26 -0000 1.3 +++ sources 1 May 2006 16:25:19 -0000 1.4 @@ -1 +1 @@ -fde8d7ad832009bfd1746bf076e8a838 nautilus-actions-1.0.tar.gz +d1d4bf81c0f611610d33cfec59c5e549 nautilus-actions-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:26:44 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Mon, 1 May 2006 09:26:44 -0700 Subject: rpms/nautilus-actions/FC-5 .cvsignore, 1.3, 1.4 nautilus-actions.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605011626.k41GQkOZ013902@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/nautilus-actions/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13881 Modified Files: .cvsignore nautilus-actions.spec sources Log Message: * Mon May 01 2006 Deji Akingunola - 1.2-1 - Update to version 1.2 - Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2006 22:32:43 -0000 1.3 +++ .cvsignore 1 May 2006 16:26:44 -0000 1.4 @@ -1 +1 @@ -nautilus-actions-1.0.tar.gz +nautilus-actions-1.2.tar.gz Index: nautilus-actions.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/nautilus-actions.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nautilus-actions.spec 13 Feb 2006 21:01:42 -0000 1.4 +++ nautilus-actions.spec 1 May 2006 16:26:44 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions -Version: 1.0 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} Group: User Interface/Desktops License: GPL URL: http://www.grumz.net/node/8 @@ -30,8 +30,6 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install -cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png - rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop @@ -48,14 +46,17 @@ rm -rf %{buildroot} %pre +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || : killall -HUP gconfd-2 || : fi +fi %preun +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ @@ -64,6 +65,19 @@ gconftool-2 --recursive-unset /schemas/apps/nautilus-actions killall -HUP gconfd-2 || : fi +fi + +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) @@ -73,10 +87,14 @@ %{_bindir}/nautilus-actions-new-config %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so %{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/*/apps/nautilus-actions.* %{_datadir}/applications/fedora-nact.desktop -%{_datadir}/pixmaps/nautilus-actions-icon.png %changelog +* Mon May 01 2006 Deji Akingunola - 1.2-1 +- Update to version 1.2 +- Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors + * Mon Feb 13 2006 Deji Akingunola - 1.0-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2006 22:32:43 -0000 1.3 +++ sources 1 May 2006 16:26:44 -0000 1.4 @@ -1 +1 @@ -fde8d7ad832009bfd1746bf076e8a838 nautilus-actions-1.0.tar.gz +d1d4bf81c0f611610d33cfec59c5e549 nautilus-actions-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:27:38 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Mon, 1 May 2006 09:27:38 -0700 Subject: rpms/nautilus-actions/devel .cvsignore, 1.3, 1.4 nautilus-actions.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605011627.k41GRe9X013979@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/nautilus-actions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13958 Modified Files: .cvsignore nautilus-actions.spec sources Log Message: * Mon May 01 2006 Deji Akingunola - 1.2-1 - Update to version 1.2 - Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2006 22:32:43 -0000 1.3 +++ .cvsignore 1 May 2006 16:27:37 -0000 1.4 @@ -1 +1 @@ -nautilus-actions-1.0.tar.gz +nautilus-actions-1.2.tar.gz Index: nautilus-actions.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/devel/nautilus-actions.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nautilus-actions.spec 13 Feb 2006 21:01:42 -0000 1.4 +++ nautilus-actions.spec 1 May 2006 16:27:37 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions -Version: 1.0 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} Group: User Interface/Desktops License: GPL URL: http://www.grumz.net/node/8 @@ -30,8 +30,6 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install -cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png - rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop @@ -48,14 +46,17 @@ rm -rf %{buildroot} %pre +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || : killall -HUP gconfd-2 || : fi +fi %preun +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ @@ -64,6 +65,19 @@ gconftool-2 --recursive-unset /schemas/apps/nautilus-actions killall -HUP gconfd-2 || : fi +fi + +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) @@ -73,10 +87,14 @@ %{_bindir}/nautilus-actions-new-config %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so %{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/*/apps/nautilus-actions.* %{_datadir}/applications/fedora-nact.desktop -%{_datadir}/pixmaps/nautilus-actions-icon.png %changelog +* Mon May 01 2006 Deji Akingunola - 1.2-1 +- Update to version 1.2 +- Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors + * Mon Feb 13 2006 Deji Akingunola - 1.0-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2006 22:32:43 -0000 1.3 +++ sources 1 May 2006 16:27:37 -0000 1.4 @@ -1 +1 @@ -fde8d7ad832009bfd1746bf076e8a838 nautilus-actions-1.0.tar.gz +d1d4bf81c0f611610d33cfec59c5e549 nautilus-actions-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:29:28 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:29:28 -0700 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.8,1.9 Message-ID: <200605011629.k41GTUxi014046@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14025 Modified Files: emacs-auctex.spec Log Message: Add preview-latex functionality Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emacs-auctex.spec 20 Apr 2006 19:35:29 -0000 1.8 +++ emacs-auctex.spec 1 May 2006 16:29:28 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 3%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -34,12 +34,12 @@ %setup -q -n auctex-%{version} %build -# --with-texmf-dir overrides local docstrip configurations. -# "--disable-preview" it would be nice to get preview added but -# unfortunately its Makefile is simplistic and will need some -# effort to get it working with rpmbuild -%configure "--with-emacs" "--disable-preview" '--with-texmf-dir=%{_datadir}/texmf' +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview + +%configure --with-emacs --without-texmf-dir + make + pushd doc make auctex.info tex-ref.pdf popd @@ -47,47 +47,60 @@ %install rm -rf %{buildroot} mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}} -# mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview -#makeinstall install-contrib install-info +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview %makeinstall mkdir -p %{buildroot}%{startupdir} -echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile} -echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \ - %{buildroot}%{startupfile} -echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile} -rm -rf %{buildroot}%{_var} -rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch +cat < %{buildroot}%{startupfile} +;; This enables AUCTeX globally. +;; See (info "(auctex)Introduction") on how to disable AUCTeX. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "auctex.el" nil t t) + +;; This enables preview-latex globally. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "preview-latex.el" nil t t) +EOF -# Remove dir file that has been created by the makeinfo calls because this -# file will not been included in the rpm distribution (make RPM 4.1+ happy) -# rm -f '%{buildroot}%{_infodir}/dir' +rm -rf %{buildroot}%{_var} +#rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) -%doc RELEASE COPYING INSTALL README TODO FAQ CHANGES +%doc RELEASE COPYING README TODO FAQ CHANGES %doc doc/tex-ref.pdf %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{startupdir} -# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el %{_datadir}/emacs/site-lisp/auctex -# %{startupfile} %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-6 +- Leave .nosearch file in styles directory - this directory shouldn't be in the load-path + +* Mon May 1 2006 Jonathan Underwood - 11.82-5 +- Move installation of the preview style files out of the texmf tree for now + +* Mon Apr 24 2006 Jonathan Underwood - 11.82-4 +- Added preview-latex +- Removed INSTALL document from package (not necessary) +- Clean up generation of startup files from spec file + * Thu Apr 20 2006 Ed Hill - 11.82-3 - fix startup file per bug# 189488 From fedora-extras-commits at redhat.com Mon May 1 16:30:41 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:30:41 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.8,1.9 Message-ID: <200605011630.k41GUhPr014122@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14104 Modified Files: emacs-auctex.spec Log Message: Add preview-latex functionality Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emacs-auctex.spec 20 Apr 2006 19:35:28 -0000 1.8 +++ emacs-auctex.spec 1 May 2006 16:30:41 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 3%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -34,12 +34,12 @@ %setup -q -n auctex-%{version} %build -# --with-texmf-dir overrides local docstrip configurations. -# "--disable-preview" it would be nice to get preview added but -# unfortunately its Makefile is simplistic and will need some -# effort to get it working with rpmbuild -%configure "--with-emacs" "--disable-preview" '--with-texmf-dir=%{_datadir}/texmf' +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview + +%configure --with-emacs --without-texmf-dir + make + pushd doc make auctex.info tex-ref.pdf popd @@ -47,47 +47,60 @@ %install rm -rf %{buildroot} mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}} -# mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview -#makeinstall install-contrib install-info +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview %makeinstall mkdir -p %{buildroot}%{startupdir} -echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile} -echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \ - %{buildroot}%{startupfile} -echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile} -rm -rf %{buildroot}%{_var} -rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch +cat < %{buildroot}%{startupfile} +;; This enables AUCTeX globally. +;; See (info "(auctex)Introduction") on how to disable AUCTeX. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "auctex.el" nil t t) + +;; This enables preview-latex globally. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "preview-latex.el" nil t t) +EOF -# Remove dir file that has been created by the makeinfo calls because this -# file will not been included in the rpm distribution (make RPM 4.1+ happy) -# rm -f '%{buildroot}%{_infodir}/dir' +rm -rf %{buildroot}%{_var} +#rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) -%doc RELEASE COPYING INSTALL README TODO FAQ CHANGES +%doc RELEASE COPYING README TODO FAQ CHANGES %doc doc/tex-ref.pdf %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{startupdir} -# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el %{_datadir}/emacs/site-lisp/auctex -# %{startupfile} %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-6 +- Leave .nosearch file in styles directory - this directory shouldn't be in the load-path + +* Mon May 1 2006 Jonathan Underwood - 11.82-5 +- Move installation of the preview style files out of the texmf tree for now + +* Mon Apr 24 2006 Jonathan Underwood - 11.82-4 +- Added preview-latex +- Removed INSTALL document from package (not necessary) +- Clean up generation of startup files from spec file + * Thu Apr 20 2006 Ed Hill - 11.82-3 - fix startup file per bug# 189488 From fedora-extras-commits at redhat.com Mon May 1 16:31:27 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:31:27 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.6,1.7 Message-ID: <200605011631.k41GVTGV014184@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14167 Modified Files: emacs-auctex.spec Log Message: Add preview-latex functionality Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- emacs-auctex.spec 20 Apr 2006 19:35:27 -0000 1.6 +++ emacs-auctex.spec 1 May 2006 16:31:27 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 2%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -34,12 +34,12 @@ %setup -q -n auctex-%{version} %build -# --with-texmf-dir overrides local docstrip configurations. -# "--disable-preview" it would be nice to get preview added but -# unfortunately its Makefile is simplistic and will need some -# effort to get it working with rpmbuild -%configure "--with-emacs" "--disable-preview" '--with-texmf-dir=%{_datadir}/texmf' +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview + +%configure --with-emacs --without-texmf-dir + make + pushd doc make auctex.info tex-ref.pdf popd @@ -47,53 +47,72 @@ %install rm -rf %{buildroot} mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}} -# mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview -#makeinstall install-contrib install-info +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview %makeinstall mkdir -p %{buildroot}%{startupdir} -echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile} -echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \ - %{buildroot}%{startupfile} -echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile} -rm -rf %{buildroot}%{_var} -rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch +cat < %{buildroot}%{startupfile} +;; This enables AUCTeX globally. +;; See (info "(auctex)Introduction") on how to disable AUCTeX. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "auctex.el" nil t t) + +;; This enables preview-latex globally. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "preview-latex.el" nil t t) +EOF -# Remove dir file that has been created by the makeinfo calls because this -# file will not been included in the rpm distribution (make RPM 4.1+ happy) -# rm -f '%{buildroot}%{_infodir}/dir' +rm -rf %{buildroot}%{_var} +#rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) -%doc RELEASE COPYING INSTALL README TODO FAQ CHANGES +%doc RELEASE COPYING README TODO FAQ CHANGES %doc doc/tex-ref.pdf %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{startupdir} -# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el %{_datadir}/emacs/site-lisp/auctex -# %{startupfile} %{_datadir}/emacs/site-lisp/tex-site.el %changelog -* Thu Apr 20 2006 Ed Hill - 11.82-2 +* Mon May 1 2006 Jonathan Underwood - 11.82-6 +- Leave .nosearch file in styles directory - this directory shouldn't be in the load-path + +* Mon May 1 2006 Jonathan Underwood - 11.82-5 +- Move installation of the preview style files out of the texmf tree for now + +* Mon Apr 24 2006 Jonathan Underwood - 11.82-4 +- Added preview-latex +- Removed INSTALL document from package (not necessary) +- Clean up generation of startup files from spec file + +* Thu Apr 20 2006 Ed Hill - 11.82-3 - fix startup file per bug# 189488 +* Sun Apr 9 2006 Ed Hill - 11.82-2 +- rebuild + * Sun Apr 9 2006 Ed Hill - 11.82-1 - update to 11.82 +* Fri Sep 30 2005 Ed Hill - 11.81-2 +- fix stupid tagging mistake + * Fri Sep 30 2005 Ed Hill - 11.81-1 - update to 11.81 - disable preview for now since it needs some packaging work From fedora-extras-commits at redhat.com Mon May 1 16:34:18 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 09:34:18 -0700 Subject: rpms/raidem/FC-5 raidem-0.3.1-syslibs.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 raidem.spec, 1.3, 1.4 sources, 1.2, 1.3 raidem-0.3-loadpng.patch, 1.1, NONE raidem-0.3-no-mp3.patch, 1.1, NONE raidem-0.3-syslibs.patch, 1.1, NONE raidem-0.3-warn.patch, 1.1, NONE Message-ID: <200605011634.k41GYKDM014264@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14240 Modified Files: .cvsignore raidem.spec sources Added Files: raidem-0.3.1-syslibs.patch Removed Files: raidem-0.3-loadpng.patch raidem-0.3-no-mp3.patch raidem-0.3-syslibs.patch raidem-0.3-warn.patch Log Message: * Mon May 1 2006 Hans de Goede 0.3.1-2 - Fix big finger typo which put the datafiles under /use/share instead of /usr/share. raidem-0.3.1-syslibs.patch: --- NEW FILE raidem-0.3.1-syslibs.patch --- --- raidem-0.3.1-src/configure.ac.syslibs 2006-04-08 10:48:00.000000000 +0200 +++ raidem-0.3.1-src/configure.ac 2006-04-29 15:01:51.000000000 +0200 @@ -53,7 +53,8 @@ AC_MSG_NOTICE([===== Using lib/adime =====]) && (cd lib/adime; sh fix.sh unix --quick) && AC_MSG_NOTICE([===== Configured adime =====]), - AC_MSG_ERROR([cannot find adime]))) + AC_MSG_ERROR([cannot find adime])), + [`$alcfg --libs`]) AC_HAVE_LIBRARY([glyph-alleg], @@ -104,7 +105,7 @@ #---------------------------------------------------------------- # Optional -if ! ${alrand}; then +if [ "$alrand" != "true" ]; then AC_SUBST(NO_ALRAND, 1) fi @@ -120,7 +121,7 @@ if ${ogg}; then -AC_HAVE_LIBRARY([alogg], +PKG_CHECK_MODULES(AllegroOGG, [AllegroOGG >= 1.0.0], AC_SUBST(HAVE_ALLEGROOGG, 1), AC_CHECK_FILE([lib/allegroogg/Makefile], AC_MSG_NOTICE([===== Using lib/allegroogg =====]), --- raidem-0.3.1-src/src/map-editor/map-proc.m.syslibs 2006-01-20 03:33:33.000000000 +0100 +++ raidem-0.3.1-src/src/map-editor/map-proc.m 2006-04-29 15:01:51.000000000 +0200 @@ -4,7 +4,7 @@ #include #include #include -#include "adime/include/adime.h" +#include #include "common.h" #include "group.h" #include "gui/gui-clip.h" --- raidem-0.3.1-src/Makefile.cfg.in.syslibs 2006-04-08 07:23:28.000000000 +0200 +++ raidem-0.3.1-src/Makefile.cfg.in 2006-04-29 15:01:51.000000000 +0200 @@ -8,6 +8,7 @@ INSTALL := install alcfg := @alcfg@ ftcfg := @ftcfg@ +pkgcfg := @PKG_CONFIG@ # Install paths. prefix := @prefix@ --- raidem-0.3.1-src/Makefile.syslibs 2006-04-08 06:54:03.000000000 +0200 +++ raidem-0.3.1-src/Makefile 2006-04-29 15:13:53.000000000 +0200 @@ -4,8 +4,8 @@ include Makefile.cfg -CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \ - -fno-strict-aliasing \ +CFLAGS += -W -Wall -Wno-deprecated-declarations \ + -fno-strict-aliasing \ -Iinclude -Ilib #CFLAGS += -g3 --- raidem-0.3.1-src/misc/Makefile.all.syslibs 2006-04-08 09:12:44.000000000 +0200 +++ raidem-0.3.1-src/misc/Makefile.all 2006-04-29 15:01:51.000000000 +0200 @@ -30,7 +30,8 @@ CFLAGS += -DNO_OGG else ifdef HAVE_ALLEGROOGG -LDLIBS += -lalogg +LDLIBS += `$(pkgcfg) AllegroOGG --libs` +CFLAGS += `$(pkgcfg) AllegroOGG --cflags` else CFLAGS += -Ilib/allegroogg/include endif # HAVE_ALLEGROOGG @@ -56,11 +57,14 @@ # Glyph-Keeper ifdef HAVE_GLYPH_KEEPER LDLIBS += -lglyph-alleg +CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO else CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -Ilib/glyph-keeper/include endif # HAVE_GLYPH_KEEPER -ifndef HAVE_FREETYPE +ifdef HAVE_FREETYPE +LDLIBS += `$(ftcfg) --libs` +else CFLAGS += -Ilib/freetype/include endif Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raidem/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Mar 2006 18:43:34 -0000 1.2 +++ .cvsignore 1 May 2006 16:34:18 -0000 1.3 @@ -1 +1 @@ -raidem-0.3-src.zip +raidem-0.3.1-src.zip Index: raidem.spec =================================================================== RCS file: /cvs/extras/rpms/raidem/FC-5/raidem.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- raidem.spec 6 Apr 2006 20:28:50 -0000 1.3 +++ raidem.spec 1 May 2006 16:34:18 -0000 1.4 @@ -1,5 +1,5 @@ Name: raidem -Version: 0.3 +Version: 0.3.1 Release: 2%{?dist} Summary: 2d top-down shoot'em up Group: Amusements/Games @@ -10,13 +10,11 @@ Source0: %{name}-%{version}-src.zip Source1: raidem.png Source2: raidem.desktop -Patch0: raidem-0.3-no-mp3.patch -Patch1: raidem-0.3-syslibs.patch -Patch2: raidem-0.3-warn.patch -Patch3: raidem-0.3-loadpng.patch +Patch0: raidem-0.3.1-syslibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-objc glyph-keeper-devel freetype-devel adime-devel -BuildRequires: zziplib-devel libpng-devel desktop-file-utils +BuildRequires: zziplib-devel libpng-devel libid3tag-devel AllegroOGG-devel +BuildRequires: automake desktop-file-utils %description Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II @@ -29,30 +27,27 @@ %prep %setup -q -n %{name}-%{version}-src -%patch0 -p1 -z .no_mp3 -%patch1 -p1 -z .syslibs -%patch2 -p1 -z .warn -%patch3 -p1 -z .loadpng +%patch0 -p1 -z .syslibs # remove all included system libs, to avoid using the included system headers. mv lib/loadpng . rm -fr lib/* mv loadpng lib +aclocal +autoconf %build -make %{?_smp_mflags} lib/loadpng/libldpng.a raid \ - CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Iinclude -Ilib -D__LINUX__ -DNO_MP3 \ - -DNO_ID3TAGS -DNO_FBLEND -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \ - -DRAIDEM_DATA_DIR=\\\"%{_datadir}/%{name}/\\\"" \ - LDLIBS="-lglyph-alleg `freetype-config --libs` lib/loadpng/libldpng.a -lpng \ - -lzzip -ladime `allegro-config --libs` -lz -lpthread -lobjc" +# override _datadir otherwise it expects its datafile directly under /use/share +%configure --datadir=%{_datadir}/%{name} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -#DIY, since the Makefile uses hardcoded ( := assigned) paths. +# DIY, since the Makefile uses hardcoded ( := assigned) paths and install -s +# and install -g games, etc. Fixable but this is easier mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 755 raid $RPM_BUILD_ROOT%{_bindir}/%{name} +install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a data demos maps $RPM_BUILD_ROOT%{_datadir}/%{name} @@ -89,11 +84,20 @@ %doc ChangeLog docs/LICENCE.txt docs/README.txt docs/damages.txt %{_bindir}/%{name} %{_datadir}/%{name} -%{_datadir}/applications/fedora-raidem.desktop -%{_datadir}/icons/hicolor/48x48/apps/raidem.png +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog +* Mon May 1 2006 Hans de Goede 0.3.1-2 +- Fix big finger typo which put the datafiles under /use/share instead + of /usr/share. + +* Sat Apr 29 2006 Hans de Goede 0.3.1-1 +- New upstream release 0.3.1 +- Upstream has merged most patches, dropped. +- Upstream has added ogg support (yeah!), add ogg and id3tag support. + * Sun Apr 2 2006 Hans de Goede 0.3-2 - Add missing RPM_OPT_FLAGS to CFLAGS - Add missing -D__LINUX__ to CFLAGS with this patch2 is no longer needed Index: sources =================================================================== RCS file: /cvs/extras/rpms/raidem/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Mar 2006 18:43:34 -0000 1.2 +++ sources 1 May 2006 16:34:18 -0000 1.3 @@ -1 +1 @@ -7a8de682a0fe122e784cc192b19ece4e raidem-0.3-src.zip +5bb3fa98b43e86afa453f88a8d90bf64 raidem-0.3.1-src.zip --- raidem-0.3-loadpng.patch DELETED --- --- raidem-0.3-no-mp3.patch DELETED --- --- raidem-0.3-syslibs.patch DELETED --- --- raidem-0.3-warn.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 1 16:49:20 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:49:20 -0700 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.9,1.10 Message-ID: <200605011649.k41GnMlb014349@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14332 Modified Files: emacs-auctex.spec Log Message: Add ghostscript to Requires and BuildRequires Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- emacs-auctex.spec 1 May 2006 16:29:28 -0000 1.9 +++ emacs-auctex.spec 1 May 2006 16:49:20 -0000 1.10 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,8 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common -BuildRequires: emacs tetex tetex-dvips texinfo +Requires: emacs emacs-common ghostscript +BuildRequires: emacs tetex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +90,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-7 +- Add ghostscript to Requires and BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 16:50:22 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:50:22 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.9,1.10 Message-ID: <200605011650.k41GoOGC014416@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14399 Modified Files: emacs-auctex.spec Log Message: Add ghostscript to Requires and BuildRequires Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- emacs-auctex.spec 1 May 2006 16:30:41 -0000 1.9 +++ emacs-auctex.spec 1 May 2006 16:50:22 -0000 1.10 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,8 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common -BuildRequires: emacs tetex tetex-dvips texinfo +Requires: emacs emacs-common ghostscript +BuildRequires: emacs tetex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +90,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-7 +- Add ghostscript to Requires and BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 16:51:17 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:51:17 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.7,1.8 Message-ID: <200605011651.k41GpJKo014485@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14466 Modified Files: emacs-auctex.spec Log Message: Add ghostscript to Requires and BuildRequires Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- emacs-auctex.spec 1 May 2006 16:31:27 -0000 1.7 +++ emacs-auctex.spec 1 May 2006 16:51:17 -0000 1.8 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,8 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common -BuildRequires: emacs tetex tetex-dvips texinfo +Requires: emacs emacs-common ghostscript +BuildRequires: emacs tetex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +90,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-7 +- Add ghostscript to Requires and BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 17:10:36 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 10:10:36 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.10,1.11 Message-ID: <200605011710.k41HAc5d016785@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16768 Modified Files: emacs-auctex.spec Log Message: Added tetex-latex to BuildRequires Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- emacs-auctex.spec 1 May 2006 16:50:22 -0000 1.10 +++ emacs-auctex.spec 1 May 2006 17:10:35 -0000 1.11 @@ -14,8 +14,9 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common ghostscript -BuildRequires: emacs tetex tetex-dvips texinfo ghostscript +Requires: emacs emacs-common ghostscript +Requires: tetex tetex-latex tetex-dvips tetex-xdvi +BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -92,6 +93,7 @@ %changelog * Mon May 1 2006 Jonathan Underwood - 11.82-7 - Add ghostscript to Requires and BuildRequires +- Add tetex-latex to BuildRequires * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 17:27:18 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 10:27:18 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.11,1.12 Message-ID: <200605011727.k41HRKUs016903@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16886 Modified Files: emacs-auctex.spec Log Message: Bump release tag Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- emacs-auctex.spec 1 May 2006 17:10:35 -0000 1.11 +++ emacs-auctex.spec 1 May 2006 17:27:18 -0000 1.12 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -91,9 +91,11 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-8 +- Add tetex-latex to BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-7 - Add ghostscript to Requires and BuildRequires -- Add tetex-latex to BuildRequires * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 17:48:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 1 May 2006 10:48:50 -0700 Subject: owners owners.list,1.928,1.929 Message-ID: <200605011748.k41Hmqh3017022@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17005 Modified Files: owners.list Log Message: Take ownership of perl-XML-RSS. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.928 retrieving revision 1.929 diff -u -r1.928 -r1.929 --- owners.list 1 May 2006 05:51:55 -0000 1.928 +++ owners.list 1 May 2006 17:48:50 -0000 1.929 @@ -1200,7 +1200,7 @@ Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 1 17:57:44 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 10:57:44 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.8,1.9 Message-ID: <200605011757.k41HvkbT017063@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17046 Modified Files: emacs-auctex.spec Log Message: Bump release tag Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emacs-auctex.spec 1 May 2006 16:51:17 -0000 1.8 +++ emacs-auctex.spec 1 May 2006 17:57:44 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,9 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common ghostscript -BuildRequires: emacs tetex tetex-dvips texinfo ghostscript +Requires: emacs emacs-common ghostscript +Requires: tetex tetex-latex tetex-dvips tetex-xdvi +BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +91,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-8 +- Add tetex-latex to BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-7 - Add ghostscript to Requires and BuildRequires From fedora-extras-commits at redhat.com Mon May 1 17:58:24 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 10:58:24 -0700 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.10,1.11 Message-ID: <200605011758.k41HwQat017124@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17107 Modified Files: emacs-auctex.spec Log Message: Bump release tag Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- emacs-auctex.spec 1 May 2006 16:49:20 -0000 1.10 +++ emacs-auctex.spec 1 May 2006 17:58:23 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,9 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common ghostscript -BuildRequires: emacs tetex tetex-dvips texinfo ghostscript +Requires: emacs emacs-common ghostscript +Requires: tetex tetex-latex tetex-dvips tetex-xdvi +BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +91,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-8 +- Add tetex-latex to BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-7 - Add ghostscript to Requires and BuildRequires From fedora-extras-commits at redhat.com Mon May 1 19:57:33 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Mon, 1 May 2006 12:57:33 -0700 Subject: rpms/pan/devel pan-0.95-upstream-tree.patch, NONE, 1.1 pan.spec, 1.11, 1.12 Message-ID: <200605011957.k41JvZ8W022138@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22104 Modified Files: pan.spec Added Files: pan-0.95-upstream-tree.patch Log Message: Patch to fix tree view issue (from upstream) pan-0.95-upstream-tree.patch: --- NEW FILE pan-0.95-upstream-tree.patch --- diff -ur pan-0.95/pan/gui/group-pane.cc pan-0.95-patched/pan/gui/group-pane.cc --- pan-0.95/pan/gui/group-pane.cc 2006-04-29 14:39:01.000000000 -0700 +++ pan-0.95-patched/pan/gui/group-pane.cc 2006-05-01 12:50:59.000000000 -0700 @@ -127,20 +127,30 @@ TimeElapsed te; GtkTreeIter iter; GtkTreeIter root (root_iter); - unsigned long groups_added (0); + GtkTreeModel * model (GTK_TREE_MODEL(store)); - for (std::vector::const_iterator it(sorted_groups.begin()), end(sorted_groups.end()); it!=end; ++it) - { + // find the groups that match our criteria + typedef std::vector quark_v; + quark_v matching_groups; + if (!match) + matching_groups = sorted_groups; + else foreach_const (quark_v, sorted_groups, it) { const Quark& groupname (*it); if (!match || match->test (groupname.to_string())) - { - pan_tree_store_append (store, &iter, &root); - populate_row (store, &iter, data, *added_groups.insert(groupname).first); - ++groups_added; + matching_groups.push_back (groupname); + } + + // insert the matching groups + const unsigned long n_rows = matching_groups.size (); + if (n_rows) { + pan_tree_store_append_n (store, &iter, &root, n_rows); + foreach_const (quark_v, matching_groups, it) { + populate_row (store, &iter, data, *added_groups.insert(*it).first); + gtk_tree_model_iter_next (model, &iter); } } - return groups_added; + return n_rows; } } diff -ur pan-0.95/pan/gui/header-pane.cc pan-0.95-patched/pan/gui/header-pane.cc --- pan-0.95/pan/gui/header-pane.cc 2006-04-29 09:33:15.000000000 -0700 +++ pan-0.95-patched/pan/gui/header-pane.cc 2006-05-01 12:50:59.000000000 -0700 @@ -424,15 +424,30 @@ const Quark & parent_mid, const Data::ArticleTree * atree) { + // see if this parent has any children... typedef Data::ArticleTree::articles_t articles_t; articles_t children; atree->get_children (parent_mid, children); + if (children.empty()) + return; + // add all these children... + GtkTreeModel * model (GTK_TREE_MODEL(store)); + GtkTreeIter child, iter; + pan_tree_store_append_n (store, &iter, parent_iter, children.size()); + child = iter; // keep a handle to this first new row... foreach_const (articles_t, children, it) { - GtkTreeIter child_iter; - add_article_to_model (data, store, parent_iter, *it, &child_iter); - add_children_to_model (data, store, &child_iter, (*it)->message_id, atree); + const Article * article (*it); + char * date_str (get_evolution_style_date_string (article->time_posted)); + get_rec (GTK_TREE_MODEL(store), &iter).set_article (article); + pan_tree_store_set (store, &iter, + COL_STATE, get_article_state(data, article), + COL_DATE_STR, date_str, + -1); + g_free (date_str); + add_children_to_model (data, store, &iter, article->message_id, atree); + gtk_tree_model_iter_next (model, &iter); } } @@ -1632,11 +1647,11 @@ // siblings GtkTreeIter up = *iter; do { + tmp = up; if (gtk_tree_model_iter_next (model, &up)) { *iter = up; return true; } - tmp = up; } while (gtk_tree_model_iter_parent (model, &up, &tmp)); return false; diff -ur pan-0.95/pan/gui/pan-tree.cc pan-0.95-patched/pan/gui/pan-tree.cc --- pan-0.95/pan/gui/pan-tree.cc 2006-04-29 14:20:19.000000000 -0700 +++ pan-0.95-patched/pan/gui/pan-tree.cc 2006-05-01 12:50:59.000000000 -0700 @@ -411,13 +411,13 @@ typedef std::vector values_t; - void pan_tree_node_unset_values (PanTreeStore * tree, PanTreeStore::Node * node) + void pan_tree_node_unset_values (PanTreeStore::Node * node, int n_columns) { if (node->columns) { GValue * it = node->columns; - for (int i=0, n=tree->n_columns; icolumns); node->columns = 0; } @@ -427,13 +427,27 @@ pan_tree_finalize (GObject *object) { PanTreeStore * tree = (PanTreeStore*)object; + const int n_columns = tree->n_columns; for (std::deque::iterator it(tree->nodes->begin()), end(tree->nodes->end()); it!=end; ++it) - pan_tree_node_unset_values (tree, &*it); - - delete tree->sort_info; + pan_tree_node_unset_values (&*it, n_columns); + + // tear it all down... delete tree->column_types; - delete tree->nodes; delete tree->reuse_me; + delete tree->nodes; + delete tree->sort_info; + + // ...and salt the earth + tree->column_types = (std::vector*) 0xDEADBEEF; + tree->reuse_me = (std::deque*) 0xDEADBEEF; + tree->nodes = (std::deque*) 0xDEADBEEF; + tree->root = (PanTreeStore::Node*) 0xDEADBEEF; + tree->n_columns = 0xDEADBEEF; + tree->stamp = 0xDEADBEEF; + tree->order = (GtkSortType) 0xDEADBEEF; + tree->sort_column_id = 0xDEADBEEF; + tree->sort_info = (std::map*) 0xDEADBEEF; + (*parent_class->finalize) (object); } @@ -513,6 +527,21 @@ return node; } + + void + pan_tree_alloc_nodes (PanTreeStore * tree, int n_rows, std::vector& setme) + { + const int n_cols = tree->n_columns; + const int pos = tree->nodes->size (); + tree->nodes->resize (pos + n_rows); + setme.resize (n_rows); + for (int r=0; rnodes)[pos+r]; + node->columns = g_new0 (GValue, n_cols); + for (int c=0; ccolumns[c], (*tree->column_types)[c]); + } + } } /*** @@ -569,7 +598,6 @@ **** ***/ -#if 0 namespace { bool the_kids_are_alright (const PanTreeStore::Node * parent) @@ -585,13 +613,71 @@ return true; } } -#endif void -pan_tree_store_insert (PanTreeStore * tree, - GtkTreeIter * iter, - GtkTreeIter * parent, - gint position) +pan_tree_store_insert_n (PanTreeStore * tree, + GtkTreeIter * iter, + GtkTreeIter * parent_it, + int position, + int n_rows) +{ + g_return_if_fail (IS_PAN_TREE_STORE(tree)); + g_return_if_fail (position >= 0); + g_return_if_fail (n_rows > 0); + + // insert the rows + PanTreeStore::Node * parent_node = parent_it ? static_cast(parent_it->user_data) : tree->root; + g_assert (the_kids_are_alright (parent_node)); + std::vector new_children; + pan_tree_alloc_nodes (tree, n_rows, new_children); + const int old_size = parent_node->n_children; + position = std::min (position, old_size); + parent_node->children.insert (parent_node->children.begin()+position, new_children.begin(), new_children.end()); + parent_node->n_children += n_rows; + PanTreeStore::Node** it = &parent_node->children[position]; + for (int i=position, new_size=old_size+n_rows; ichild_index = i; + node->parent = parent_node; + } + + // set the return iter + set_iter (iter, tree->stamp, parent_node->children[position]); + + // emit some signals + GtkTreeModel * model = GTK_TREE_MODEL(tree); + GtkTreeIter walk = *iter;; + GtkTreePath * path = get_path (model, &walk); + it = &parent_node->children[position]; + for (int i=0; istamp, node); + gtk_tree_model_row_inserted (model, path, &walk); + gtk_tree_path_next (path); + } + if (!old_size && parent_node!=tree->root) { + gtk_tree_path_up (path); + gtk_tree_model_row_has_child_toggled (model, path, parent_it); + } + gtk_tree_path_free (path); + g_assert (the_kids_are_alright (parent_node)); +} + +void +pan_tree_store_append_n (PanTreeStore * tree, + GtkTreeIter * iter, + GtkTreeIter * parent_it, + int n_rows) +{ + const int position = gtk_tree_model_iter_n_children (GTK_TREE_MODEL(tree), parent_it); + pan_tree_store_insert_n (tree, iter, parent_it, position, n_rows); +} + +void +pan_tree_store_insert (PanTreeStore * tree, + GtkTreeIter * iter, + GtkTreeIter * parent, + gint position) { g_return_if_fail (IS_PAN_TREE_STORE(tree)); g_return_if_fail (position >= 0); @@ -600,7 +686,7 @@ PanTreeStore::Node * node = parent ? static_cast(parent->user_data) : tree->root; PanTreeStore::Node * child = pan_tree_alloc_node (tree); const int old_size = node->n_children; - //g_assert (the_kids_are_alright (node)); + g_assert (the_kids_are_alright (node)); if (position < old_size) { node->children.insert (node->children.begin()+position, child); ++node->n_children; @@ -608,14 +694,12 @@ PanTreeStore::Node** it = &node->children[position]; for (int i=position; ichild_index = i++; - //g_assert (the_kids_are_alright (node)); } else { child->child_index = old_size; child->parent = node; node->children.push_back (child); ++node->n_children; - //g_assert (the_kids_are_alright (node)); } // set the return iter @@ -626,13 +710,13 @@ GtkTreePath * path = get_path (model, iter); //std::cerr << LINE_ID << " emitting row inserted on " << gtk_tree_path_to_string(path) << std::endl; gtk_tree_model_row_inserted (model, path, iter); - if (node != tree->root) { + if (!old_size && (node != tree->root)) { gtk_tree_path_up (path); //std::cerr << LINE_ID << " emitting row has child toggled on " << gtk_tree_path_to_string(path) << std::endl; gtk_tree_model_row_has_child_toggled (model, path, parent); } gtk_tree_path_free (path); - //g_assert (the_kids_are_alright (node)); + g_assert (the_kids_are_alright (node)); } void @@ -816,7 +900,7 @@ UnsetNodeWalker(PanTreeStore* t): tree(t) {} virtual ~UnsetNodeWalker() {} virtual void operator()(PanTreeStore::Node* node) { - pan_tree_node_unset_values (tree, node); + pan_tree_node_unset_values (node, tree->n_columns); node->parent = 0; node->child_index = -1; //tree->reuse_me->push_back (node); @@ -837,7 +921,7 @@ // check the pre-removal state PanTreeStore::Node * node = static_cast(iter->user_data); PanTreeStore::Node * parent = node->parent; - //g_assert (the_kids_are_alright (parent)); + g_assert (the_kids_are_alright (parent)); // unthread the node const int pos = node->child_index; @@ -848,7 +932,6 @@ for (int i=pos; in_children; ++i, ++it) (*it)->child_index = i; } - //g_assert (the_kids_are_alright (parent)); // revalidate the iterator const bool iter_is_valid_now (pos < parent->n_children); @@ -874,6 +957,6 @@ UnsetNodeWalker walker (tree); node_walk (walker, node); - //g_assert (the_kids_are_alright (parent)); + g_assert (the_kids_are_alright (parent)); return iter_is_valid_now; } diff -ur pan-0.95/pan/gui/pan-tree.h pan-0.95-patched/pan/gui/pan-tree.h --- pan-0.95/pan/gui/pan-tree.h 2006-04-29 14:41:55.000000000 -0700 +++ pan-0.95-patched/pan/gui/pan-tree.h 2006-05-01 12:50:59.000000000 -0700 @@ -73,6 +73,13 @@ int child_index; // this node is its parent's Nth child (zero-based) GValue * columns; // this row's data values. This is a pointer to tree->column_types.size() GValues. Node(): parent(0), n_children(0), child_index(-1), columns(0) {} + ~Node() { + parent = (Node*) 0xDEADBEEF; + children.clear (); + n_children = 0xDEADBEEF; + child_index = 0xDEADBEEF; + columns = (GValue*) 0xDEADBEEF; // its values need to have been unset, and the array freed, before we reach the dtor + } }; int stamp; // used to verify that gtkiters came from this tree int n_columns; // number of columns in the tree @@ -91,7 +98,12 @@ GType pan_tree_store_get_type (void); PanTreeStore* pan_tree_store_new (int n_cols, ...); -// pan_tree_store_append() is the fastest of the various insertion methods +// {insert|append}_n is faster than adding one by one. +// appending is faster than prepending. + +void pan_tree_store_insert_n (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent, int pos, int n); +void pan_tree_store_append_n (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent, int n); +void pan_tree_store_append (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent); void pan_tree_store_append (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent); void pan_tree_store_insert (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent, gint position); void pan_tree_store_insert_before (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent, GtkTreeIter *sibling); Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pan.spec 30 Apr 2006 16:16:39 -0000 1.11 +++ pan.spec 1 May 2006 19:57:33 -0000 1.12 @@ -1,11 +1,12 @@ Summary: A GNOME/GTK+ news reader for X Name: pan Version: 0.95 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 +Patch0: pan-0.95-upstream-tree.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 echo "StartupNotify=true" >> pan.desktop @@ -70,6 +72,10 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Mon May 01 2006 Michael A. Peters - 1:0.95-3 +- Apply a patch from upstream for new tree implementation bug +- (Patch0) + * Sun Apr 30 2006 Michael A. Peters - 1:0.95-2 - Fix rpmlint errors on debug package From fedora-extras-commits at redhat.com Mon May 1 19:58:28 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:28 -0700 Subject: rpms/bitbake - New directory Message-ID: <200605011958.k41JwUPl022261@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22229/bitbake Log Message: Directory /cvs/extras/rpms/bitbake added to the repository From fedora-extras-commits at redhat.com Mon May 1 19:58:28 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:28 -0700 Subject: rpms/bitbake/devel - New directory Message-ID: <200605011958.k41JwUtT022262@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22229/bitbake/devel Log Message: Directory /cvs/extras/rpms/bitbake/devel added to the repository From fedora-extras-commits at redhat.com Mon May 1 19:58:46 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:46 -0700 Subject: owners owners.list,1.929,1.930 Message-ID: <200605011958.k41Jwmve022302@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22274 Modified Files: owners.list Log Message: Added bitbake Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.929 retrieving revision 1.930 diff -u -r1.929 -r1.930 --- owners.list 1 May 2006 17:48:50 -0000 1.929 +++ owners.list 1 May 2006 19:58:46 -0000 1.930 @@ -81,6 +81,7 @@ Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|bin2iso|Convert ".bin" files into ISO or WAV|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|bitbake|BitBake build tool|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 1 19:58:58 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:58 -0700 Subject: rpms/bitbake Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605011959.k41Jx046022339@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22311 Added Files: Makefile import.log Log Message: Setup of module bitbake --- NEW FILE Makefile --- # Top level Makefile for module bitbake all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 1 19:58:59 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:59 -0700 Subject: rpms/bitbake/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605011959.k41Jx1g1022342@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22311/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bitbake --- NEW 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 May 1 19:59:54 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:59:54 -0700 Subject: rpms/bitbake import.log,1.1,1.2 Message-ID: <200605011959.k41Jxu5C022421@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22387 Modified Files: import.log Log Message: auto-import bitbake-1.4.0-1 on branch devel from bitbake-1.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bitbake/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 May 2006 19:58:58 -0000 1.1 +++ import.log 1 May 2006 19:59:54 -0000 1.2 @@ -0,0 +1 @@ +bitbake-1_4_0-1:HEAD:bitbake-1.4.0-1.src.rpm:1146513582 From fedora-extras-commits at redhat.com Mon May 1 19:59:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:59:55 -0700 Subject: rpms/bitbake/devel bitbake-path.patch, NONE, 1.1 bitbake.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605012000.k41JxvWW022428@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22387/devel Modified Files: .cvsignore sources Added Files: bitbake-path.patch bitbake.spec Log Message: auto-import bitbake-1.4.0-1 on branch devel from bitbake-1.4.0-1.src.rpm bitbake-path.patch: --- NEW FILE bitbake-path.patch --- --- bitbake-1.3.3/setup.py.orig 2006-02-16 15:52:59.180203928 +0100 +++ bitbake-1.3.3/setup.py 2006-02-16 15:53:10.238522808 +0100 @@ -20,10 +20,10 @@ from distutils.core import setup import os, sys -# bbdir = os.path.join(sys.prefix, 'share', 'bitbake') -# docdir = os.path.join(sys.prefix, 'share', 'doc') -bbdir = os.path.join('bitbake') -docdir = os.path.join('doc') +bbdir = os.path.join(sys.prefix, 'share', 'bitbake') +docdir = os.path.join(sys.prefix, 'share', 'doc') +#bbdir = os.path.join('bitbake') +#docdir = os.path.join('doc') def clean_doc(type): origpath = os.path.abspath(os.curdir) --- NEW FILE bitbake.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: BitBake build tool Name: bitbake Version: 1.4.0 Release: 1%{?dist} License: GPL Group: Development/Tools Source0: ftp://ftp.berlios.de/pub/bitbake/bitbake-%{version}.tar.gz Patch0: bitbake-path.patch URL: http://developer.berlios.de/projects/bitbake/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python, xmlto, lynx BuildArch: noarch %description BitBake is a simple tool for the execution of tasks. It is derived from Portage, which is the package management system used by the Gentoo Linux distribution. It is most commonly used to build packages, and is used as the basis of the OpenEmbedded project. %prep %setup -q %patch0 -p 1 -b .path %build CFLAGS="$RPM_OPT_FLAGS" python setup.py build # Generating docs make -C doc/manual all %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} # Removing extra docs rm -rf %{buildroot}%{_docdir} %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc doc/COPYING.GPL doc/manual/xhtml/ doc/manual/txt/usermanual.txt doc/manual/pdf/usermanual.pdf %{_bindir}/bbimage %{_bindir}/bitbake %{_datadir}/bitbake/ %{python_sitelib}/bb/ %changelog * Wed Apr 26 2006 Andreas Thienemann 1.4.0-1 - Updated to 1.4.0 - Modified to conform to FC4+ .spec syntax. * Thu Apr 13 2006 Andreas Thienemann 1.3.3-2 - Cleaned up .spec. * Thu Feb 16 2006 Andreas Thienemann 1.3.3-1 - Initial spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bitbake/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 May 2006 19:58:58 -0000 1.1 +++ .cvsignore 1 May 2006 19:59:55 -0000 1.2 @@ -0,0 +1 @@ +bitbake-1.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bitbake/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 May 2006 19:58:58 -0000 1.1 +++ sources 1 May 2006 19:59:55 -0000 1.2 @@ -0,0 +1 @@ +fa962beffb66668318684baaffadaaf0 bitbake-1.4.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 20:11:41 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Mon, 1 May 2006 13:11:41 -0700 Subject: rpms/python-logilab-common/FC-5 .cvsignore, 1.6, 1.7 python-logilab-common.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605012011.k41KBhRM024840@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786/FC-5 Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.15.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:12:25 -0000 1.6 +++ .cvsignore 1 May 2006 20:11:41 -0000 1.7 @@ -1 +1 @@ -common-0.14.1.tar.gz +common-0.15.0.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-5/python-logilab-common.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-logilab-common.spec 12 Mar 2006 18:35:47 -0000 1.6 +++ python-logilab-common.spec 1 May 2006 20:11:41 -0000 1.7 @@ -1,8 +1,8 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-logilab-common -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Common libraries for Logilab projects Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.15.0-1 +- Version 0.15.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-2 - Also handle __init__.pyc and __init__.pyo Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:12:25 -0000 1.6 +++ sources 1 May 2006 20:11:41 -0000 1.7 @@ -1 +1 @@ -8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz +1cf6ae5086e1dfd81e8836ac4fa3a206 common-0.15.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 20:11:41 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Mon, 1 May 2006 13:11:41 -0700 Subject: rpms/python-logilab-common/devel .cvsignore, 1.6, 1.7 python-logilab-common.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605012011.k41KBiGI024846@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786/devel Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.15.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:12:25 -0000 1.6 +++ .cvsignore 1 May 2006 20:11:41 -0000 1.7 @@ -1 +1 @@ -common-0.14.1.tar.gz +common-0.15.0.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-logilab-common.spec 12 Mar 2006 18:35:47 -0000 1.6 +++ python-logilab-common.spec 1 May 2006 20:11:41 -0000 1.7 @@ -1,8 +1,8 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-logilab-common -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Common libraries for Logilab projects Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.15.0-1 +- Version 0.15.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-2 - Also handle __init__.pyc and __init__.pyo Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:12:25 -0000 1.6 +++ sources 1 May 2006 20:11:41 -0000 1.7 @@ -1 +1 @@ -8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz +1cf6ae5086e1dfd81e8836ac4fa3a206 common-0.15.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 20:11:40 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Mon, 1 May 2006 13:11:40 -0700 Subject: rpms/python-logilab-common/FC-4 .cvsignore, 1.6, 1.7 python-logilab-common.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605012012.k41KCC7s024851@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786/FC-4 Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.15.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:12:18 -0000 1.6 +++ .cvsignore 1 May 2006 20:11:40 -0000 1.7 @@ -1 +1 @@ -common-0.14.1.tar.gz +common-0.15.0.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/python-logilab-common.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-logilab-common.spec 12 Mar 2006 18:12:18 -0000 1.5 +++ python-logilab-common.spec 1 May 2006 20:11:40 -0000 1.6 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-logilab-common -Version: 0.14.1 +Version: 0.15.0 Release: 1%{?dist} Summary: Common libraries for Logilab projects @@ -46,6 +46,8 @@ %dir %{_python_sitelib}/logilab/common %dir %{_python_sitelib}/logilab/common/ureports %{_python_sitelib}/logilab/*.py +%{_python_sitelib}/logilab/*.pyc +%ghost %{_python_sitelib}/logilab/*.pyo %{_python_sitelib}/logilab/common/*.py %{_python_sitelib}/logilab/common/*.pyc %ghost %{_python_sitelib}/logilab/common/*.pyo @@ -55,6 +57,12 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.15.0-1 +- Version 0.15.0 + +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-2 +- Also handle __init__.pyc and __init__.pyo + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-1 - Version 0.14.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:12:18 -0000 1.6 +++ sources 1 May 2006 20:11:40 -0000 1.7 @@ -1 +1 @@ -8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz +1cf6ae5086e1dfd81e8836ac4fa3a206 common-0.15.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 20:36:26 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 13:36:26 -0700 Subject: comps comps-fe5.xml.in,1.42,1.43 Message-ID: <200605012036.k41KaSDj025021@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25004/comps Modified Files: comps-fe5.xml.in Log Message: add gcompris Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- comps-fe5.xml.in 30 Apr 2006 07:31:43 -0000 1.42 +++ comps-fe5.xml.in 1 May 2006 20:36:26 -0000 1.43 @@ -214,6 +214,7 @@ freedoom freedroid freedroidrpg + gcompris gl-117 gnofract4d gnome-sudoku From fedora-extras-commits at redhat.com Mon May 1 20:38:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 13:38:34 -0700 Subject: comps comps-fe5.xml.in,1.43,1.44 comps-fe6.xml.in,1.6,1.7 Message-ID: <200605012038.k41KcadW025055@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25036/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: move gcompris from Games to Educational Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- comps-fe5.xml.in 1 May 2006 20:36:26 -0000 1.43 +++ comps-fe5.xml.in 1 May 2006 20:38:34 -0000 1.44 @@ -214,7 +214,6 @@ freedoom freedroid freedroidrpg - gcompris gl-117 gnofract4d gnome-sudoku @@ -271,6 +270,7 @@ drgeo drgeo-doc + gcompris gperiodic stellarium tuxtype2 Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- comps-fe6.xml.in 30 Apr 2006 11:24:55 -0000 1.6 +++ comps-fe6.xml.in 1 May 2006 20:38:34 -0000 1.7 @@ -214,7 +214,6 @@ freedoom freedroid freedroidrpg - gcompris gl-117 gnofract4d gnome-sudoku @@ -271,6 +270,7 @@ drgeo drgeo-doc + gcompris gperiodic stellarium tuxtype2 From fedora-extras-commits at redhat.com Mon May 1 20:53:37 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 13:53:37 -0700 Subject: rpms/unifdef - New directory Message-ID: <200605012053.k41Krd4t025543@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25517/unifdef Log Message: Directory /cvs/extras/rpms/unifdef added to the repository From fedora-extras-commits at redhat.com Mon May 1 20:53:37 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 13:53:37 -0700 Subject: rpms/unifdef/devel - New directory Message-ID: <200605012053.k41Krds2025546@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25517/unifdef/devel Log Message: Directory /cvs/extras/rpms/unifdef/devel added to the repository From fedora-extras-commits at redhat.com Mon May 1 20:53:45 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 13:53:45 -0700 Subject: rpms/unifdef Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605012053.k41KrlUi025588@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25554 Added Files: Makefile import.log Log Message: Setup of module unifdef --- NEW FILE Makefile --- # Top level Makefile for module unifdef all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 1 20:53:46 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 13:53:46 -0700 Subject: rpms/unifdef/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605012053.k41KrmT7025591@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25554/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module unifdef --- NEW 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 May 1 21:01:31 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 14:01:31 -0700 Subject: rpms/unifdef/devel unifdef.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605012102.k41L21tG027787@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27767 Modified Files: .cvsignore sources Added Files: unifdef.spec Log Message: initial import --- NEW FILE unifdef.spec --- Summary: Unifdef tool for removing ifdef'd lines Name: unifdef Version: 1.171 Release: 3%{?dist} License: BSD Group: Development/Languages URL: http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/unifdef/ Source0: unifdef-1.171.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Unifdef is useful for removing ifdefed lines from a file while otherwise leaving the file alone. Unifdef acts on #ifdef, #ifndef, #else, and #endif lines, and it knows only enough about C and C++ to know when one of these is inactive because it is inside a comment, or a single or double quote. %prep %setup -q %build make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT install -d -m0755 $RPM_BUILD_ROOT%{_bindir} install -p -m0755 unifdef $RPM_BUILD_ROOT%{_bindir}/unifdef install -p -m0755 unifdefall.sh $RPM_BUILD_ROOT%{_bindir}/unifdefall.sh install -d -m0755 $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m0644 unifdef.1 $RPM_BUILD_ROOT%{_mandir}/man1/unifdef.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/unifdef %{_bindir}/unifdefall.sh %{_mandir}/man1/unifdef.1.gz %changelog * Wed Apr 26 2006 David Woodhouse - 1.171-2 - Change BuildRoot * Tue Apr 25 2006 David Woodhouse - 1.171-1 - Initial import from FreeBSD CVS Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/unifdef/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 May 2006 20:53:46 -0000 1.1 +++ .cvsignore 1 May 2006 21:01:29 -0000 1.2 @@ -0,0 +1 @@ +unifdef-1.171.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unifdef/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 May 2006 20:53:46 -0000 1.1 +++ sources 1 May 2006 21:01:29 -0000 1.2 @@ -0,0 +1 @@ +657e97bab7cfed217f3a7c73fba9f1cb unifdef-1.171.tar.bz2 From fedora-extras-commits at redhat.com Mon May 1 21:44:39 2006 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Mon, 1 May 2006 14:44:39 -0700 Subject: CVSROOT avail,1.28,1.29 Message-ID: <200605012144.k41Lid8E027980@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27960 Modified Files: avail Log Message: Add bressers to CVSROOT committers, because he's the leader of the Fedora Security team... Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- avail 6 Apr 2006 14:38:13 -0000 1.28 +++ avail 1 May 2006 21:44:36 -0000 1.29 @@ -13,7 +13,7 @@ # Lock down the CVSROOT directory so ACLs make sense unavail | | CVSROOT # Access to all files to policy setters -avail | notting,sopwith,wtogami,katzj,gdk,nman64 | CVSROOT +avail | notting,sopwith,wtogami,katzj,gdk,nman64,bressers | CVSROOT # trusted developers that can add modules avail | | CVSROOT/modules avail | kwade | CVSROOT/avail From fedora-extras-commits at redhat.com Mon May 1 22:33:50 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:33:50 -0700 Subject: rpms/dclib/FC-5 dclib-0.3.7-hashfix.patch, NONE, 1.1 dclib-0.3.7-keylock.patch, NONE, 1.1 dclib-0.3.7-permissions.patch, NONE, 1.1 dclib.spec, 1.7, 1.8 Message-ID: <200605012233.k41MXqOW030303@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/dclib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30277 Modified Files: dclib.spec Added Files: dclib-0.3.7-hashfix.patch dclib-0.3.7-keylock.patch dclib-0.3.7-permissions.patch Log Message: * Mon May 01 2006 Luke Macken 0.3.7-7 - dclib-0.3.7-permissions.patch make valknut use the umask instead of hardcoded permissions - dclib-0.3.7-keylock.patch fixes $Lock-parsing problem - dclib-0.3.7-hashfix.patch fixes production of wrong hashes dclib-0.3.7-hashfix.patch: --- NEW FILE dclib-0.3.7-hashfix.patch --- --- dclib/csearchindex.cpp 2005-04-06 01:21:00.397324222 +0200 +++ dclib/csearchindex.cpp 2005-04-06 01:25:34.469238109 +0200 @@ -419,10 +419,12 @@ CString s; CBase32 base32; CByteArray dst,src; - - if ( hbi < m_pHashIndex->Size() ) + struct hashbaseobject * hbo; + + if ( hbi < m_pHashBaseArray->Size() ) { - src.Append(m_pHashIndex->Data()+hbi,TIGERSIZE); + hbo = (struct hashbaseobject *)(m_pHashBaseArray->Data()+hbi); + src.Append(m_pHashIndex->Data()+hbo->m_nHashIndex,TIGERSIZE); base32.Encode( &dst, &src ); if ( dst.Size() > 0 ) { dclib-0.3.7-keylock.patch: --- NEW FILE dclib-0.3.7-keylock.patch --- --- dclib/cmessagehandler.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/cmessagehandler.cpp 2005-06-26 00:09:12.000000000 +0200 @@ -428,7 +428,7 @@ int i,i1; - i = sContent.Find(' '); + i = sContent.Find(" Pk="); if ( (msg = new CMessageLock()) != 0 ) { dclib-0.3.7-permissions.patch: --- NEW FILE dclib-0.3.7-permissions.patch --- --- dclib/core/cdir.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/core/cdir.cpp 2005-06-24 13:41:38.000000000 +0200 @@ -553,7 +553,7 @@ #ifdef WIN32 if ( _mkdir((Path()+DIRSEPARATOR+s1).Data()) != 0 ) #else - if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),S_IRUSR|S_IWUSR|S_IXUSR) != 0 ) + if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),0777) != 0 ) #endif { if ( errno != EEXIST ) --- dclib/core/filecopy.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/core/filecopy.cpp 2005-06-24 13:40:54.000000000 +0200 @@ -94,7 +94,7 @@ blen = sb.st_blksize; - while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0) + while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) < 0) { if (errno == EEXIST && unlink(to) == 0) continue; --- dclib/ctransfer.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/ctransfer.cpp 2005-06-24 13:39:08.000000000 +0200 @@ -488,7 +488,7 @@ mode |= IO_RAW | IO_WRITEONLY; - if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IROTH ) == FALSE ) + if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IWGRP|MO_IROTH|MO_IWOTH ) == FALSE ) { CallBack_SendError(strerror(errno)); perror("File open"); Index: dclib.spec =================================================================== RCS file: /cvs/extras/rpms/dclib/FC-5/dclib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dclib.spec 13 Feb 2006 21:00:26 -0000 1.7 +++ dclib.spec 1 May 2006 22:33:50 -0000 1.8 @@ -1,14 +1,17 @@ Name: dclib Version: 0.3.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Direct Connect file sharing library Group: Applications/Internet License: GPL URL: http://dcgui.berlios.de/ Source0: http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-%{version}-hashfix.patch +Patch1: %{name}-%{version}-keylock.patch +Patch2: %{name}-%{version}-permissions.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel, openssl-devel, bzip2-devel %description @@ -31,6 +34,9 @@ %prep %setup -q +%patch0 -b .hashfix +%patch1 -b .keylock +%patch2 -b .perms %build @@ -66,6 +72,14 @@ %changelog +* Mon May 01 2006 Luke Macken 0.3.7-7 +- dclib-0.3.7-permissions.patch + make valknut use the umask instead of hardcoded permissions +- dclib-0.3.7-keylock.patch + fixes $Lock-parsing problem +- dclib-0.3.7-hashfix.patch + fixes production of wrong hashes + * Mon Feb 13 2006 Luke Macken 0.3.7-6 - Rebuild for FE5 From fedora-extras-commits at redhat.com Mon May 1 22:37:21 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:37:21 -0700 Subject: rpms/dclib/FC-5 dclib.spec,1.8,1.9 Message-ID: <200605012237.k41MbNhP030441@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/dclib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30424 Modified Files: dclib.spec Log Message: nudge. Index: dclib.spec =================================================================== RCS file: /cvs/extras/rpms/dclib/FC-5/dclib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dclib.spec 1 May 2006 22:33:50 -0000 1.8 +++ dclib.spec 1 May 2006 22:37:21 -0000 1.9 @@ -1,6 +1,6 @@ Name: dclib Version: 0.3.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Direct Connect file sharing library Group: Applications/Internet @@ -72,7 +72,7 @@ %changelog -* Mon May 01 2006 Luke Macken 0.3.7-7 +* Mon May 01 2006 Luke Macken 0.3.7-8 - dclib-0.3.7-permissions.patch make valknut use the umask instead of hardcoded permissions - dclib-0.3.7-keylock.patch From fedora-extras-commits at redhat.com Mon May 1 22:38:26 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:38:26 -0700 Subject: rpms/dclib/FC-4 dclib-0.3.7-hashfix.patch, NONE, 1.1 dclib-0.3.7-keylock.patch, NONE, 1.1 dclib-0.3.7-permissions.patch, NONE, 1.1 dclib.spec, 1.2, 1.3 Message-ID: <200605012238.k41McSOE030520@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/dclib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30494 Modified Files: dclib.spec Added Files: dclib-0.3.7-hashfix.patch dclib-0.3.7-keylock.patch dclib-0.3.7-permissions.patch Log Message: * Mon May 01 2006 Luke Macken 0.3.7-8 - dclib-0.3.7-permissions.patch make valknut use the umask instead of hardcoded permissions - dclib-0.3.7-keylock.patch fixes $Lock-parsing problem - dclib-0.3.7-hashfix.patch fixes production of wrong hashes dclib-0.3.7-hashfix.patch: --- NEW FILE dclib-0.3.7-hashfix.patch --- --- dclib/csearchindex.cpp 2005-04-06 01:21:00.397324222 +0200 +++ dclib/csearchindex.cpp 2005-04-06 01:25:34.469238109 +0200 @@ -419,10 +419,12 @@ CString s; CBase32 base32; CByteArray dst,src; - - if ( hbi < m_pHashIndex->Size() ) + struct hashbaseobject * hbo; + + if ( hbi < m_pHashBaseArray->Size() ) { - src.Append(m_pHashIndex->Data()+hbi,TIGERSIZE); + hbo = (struct hashbaseobject *)(m_pHashBaseArray->Data()+hbi); + src.Append(m_pHashIndex->Data()+hbo->m_nHashIndex,TIGERSIZE); base32.Encode( &dst, &src ); if ( dst.Size() > 0 ) { dclib-0.3.7-keylock.patch: --- NEW FILE dclib-0.3.7-keylock.patch --- --- dclib/cmessagehandler.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/cmessagehandler.cpp 2005-06-26 00:09:12.000000000 +0200 @@ -428,7 +428,7 @@ int i,i1; - i = sContent.Find(' '); + i = sContent.Find(" Pk="); if ( (msg = new CMessageLock()) != 0 ) { dclib-0.3.7-permissions.patch: --- NEW FILE dclib-0.3.7-permissions.patch --- --- dclib/core/cdir.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/core/cdir.cpp 2005-06-24 13:41:38.000000000 +0200 @@ -553,7 +553,7 @@ #ifdef WIN32 if ( _mkdir((Path()+DIRSEPARATOR+s1).Data()) != 0 ) #else - if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),S_IRUSR|S_IWUSR|S_IXUSR) != 0 ) + if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),0777) != 0 ) #endif { if ( errno != EEXIST ) --- dclib/core/filecopy.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/core/filecopy.cpp 2005-06-24 13:40:54.000000000 +0200 @@ -94,7 +94,7 @@ blen = sb.st_blksize; - while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0) + while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) < 0) { if (errno == EEXIST && unlink(to) == 0) continue; --- dclib/ctransfer.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/ctransfer.cpp 2005-06-24 13:39:08.000000000 +0200 @@ -488,7 +488,7 @@ mode |= IO_RAW | IO_WRITEONLY; - if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IROTH ) == FALSE ) + if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IWGRP|MO_IROTH|MO_IWOTH ) == FALSE ) { CallBack_SendError(strerror(errno)); perror("File open"); Index: dclib.spec =================================================================== RCS file: /cvs/extras/rpms/dclib/FC-4/dclib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dclib.spec 3 Oct 2005 19:50:31 -0000 1.2 +++ dclib.spec 1 May 2006 22:38:26 -0000 1.3 @@ -1,14 +1,17 @@ Name: dclib Version: 0.3.7 -Release: 3%{?dist} +Release: 8%{?dist} Summary: Direct Connect file sharing library Group: Applications/Internet License: GPL URL: http://dcgui.berlios.de/ Source0: http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-%{version}-hashfix.patch +Patch1: %{name}-%{version}-keylock.patch +Patch2: %{name}-%{version}-permissions.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel, openssl-devel, bzip2-devel %description @@ -31,6 +34,9 @@ %prep %setup -q +%patch0 -b .hashfix +%patch1 -b .keylock +%patch2 -b .perms %build @@ -66,6 +72,23 @@ %changelog +* Mon May 01 2006 Luke Macken 0.3.7-8 +- dclib-0.3.7-permissions.patch + make valknut use the umask instead of hardcoded permissions +- dclib-0.3.7-keylock.patch + fixes $Lock-parsing problem +- dclib-0.3.7-hashfix.patch + fixes production of wrong hashes + +* Mon Feb 13 2006 Luke Macken 0.3.7-6 +- Rebuild for FE5 + +* Tue Dec 27 2005 Luke Macken 0.3.7-5 +- Rebuild + +* Thu Nov 10 2005 Luke Macken 0.3.7-4 +- Rebuild for new openssl + * Mon Oct 03 2005 Luke Macken 0.3.7-3 - Add libxml2-devel to Requires From fedora-extras-commits at redhat.com Mon May 1 22:42:21 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:42:21 -0700 Subject: rpms/valknut/FC-4 valknut-0.3.7-extra-qualification.patch, NONE, 1.1 valknut.desktop, 1.1, 1.2 valknut.spec, 1.2, 1.3 Message-ID: <200605012242.k41MgNOo030633@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/valknut/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30595/FC-4 Modified Files: valknut.desktop valknut.spec Added Files: valknut-0.3.7-extra-qualification.patch Log Message: * Sun Apr 30 2006 Luke Macken 0.3.7-8 - Execute with --disable-tray in desktop file, since it is horribly broken. * Tue Feb 28 2006 Luke Macken 0.3.7-7 - Add patch to remove extra qualification build error valknut-0.3.7-extra-qualification.patch: --- NEW FILE valknut-0.3.7-extra-qualification.patch --- --- valknut/dciconloader.h.orig 2006-02-28 13:47:46.000000000 -0500 +++ valknut/dciconloader.h 2006-02-28 13:48:02.000000000 -0500 @@ -122,7 +122,7 @@ private: /** */ - QPixmap DCIconLoader::LoadPixmap( QString file ); + QPixmap LoadPixmap( QString file ); /** */ PixmapMap m_PixmapMap; Index: valknut.desktop =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-4/valknut.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- valknut.desktop 4 Oct 2005 16:58:43 -0000 1.1 +++ valknut.desktop 1 May 2006 22:42:21 -0000 1.2 @@ -3,7 +3,7 @@ Name=Valknut Comment=Direct Connect client Icon=valknut.png -Exec=valknut +Exec=valknut --disable-tray Terminal=false Type=Application Categories=Network;Application;X-Fedora; Index: valknut.spec =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-4/valknut.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- valknut.spec 4 Oct 2005 17:13:18 -0000 1.2 +++ valknut.spec 1 May 2006 22:42:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: valknut Version: 0.3.7 -Release: 4%{?dist} +Release: 8%{?dist} Summary: Valknut is a QT Direct Connect client Group: Applications/Internet @@ -9,6 +9,7 @@ Source0: http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz Source1: valknut.desktop Source2: valknut.png +Patch0: %{name}-%{version}-extra-qualification.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dclib-devel, qt-devel, desktop-file-utils, bzip2-devel @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 %build @@ -56,6 +58,18 @@ %changelog +* Sun Apr 30 2006 Luke Macken 0.3.7-8 +- Execute with --disable-tray in desktop file, since it is horribly broken. + +* Tue Feb 28 2006 Luke Macken 0.3.7-7 +- Add patch to remove extra qualification build error + +* Wed Feb 15 2006 Luke Macken 0.3.7-6 +- Rebuild for FE5 + +* Wed Nov 09 2005 Luke Macken 0.3.7-5 +- Rebuild for new openssl + * Tue Oct 03 2005 Luke Macken 0.3.7-4 - Add openssl-devel to BuildRequires From fedora-extras-commits at redhat.com Mon May 1 22:42:22 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:42:22 -0700 Subject: rpms/valknut/FC-5 valknut.desktop,1.1,1.2 valknut.spec,1.5,1.6 Message-ID: <200605012242.k41MgOhS030638@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/valknut/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30595/FC-5 Modified Files: valknut.desktop valknut.spec Log Message: * Sun Apr 30 2006 Luke Macken 0.3.7-8 - Execute with --disable-tray in desktop file, since it is horribly broken. * Tue Feb 28 2006 Luke Macken 0.3.7-7 - Add patch to remove extra qualification build error Index: valknut.desktop =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-5/valknut.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- valknut.desktop 4 Oct 2005 16:58:43 -0000 1.1 +++ valknut.desktop 1 May 2006 22:42:21 -0000 1.2 @@ -3,7 +3,7 @@ Name=Valknut Comment=Direct Connect client Icon=valknut.png -Exec=valknut +Exec=valknut --disable-tray Terminal=false Type=Application Categories=Network;Application;X-Fedora; Index: valknut.spec =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-5/valknut.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- valknut.spec 28 Feb 2006 18:57:35 -0000 1.5 +++ valknut.spec 1 May 2006 22:42:21 -0000 1.6 @@ -1,6 +1,6 @@ Name: valknut Version: 0.3.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Valknut is a QT Direct Connect client Group: Applications/Internet @@ -58,6 +58,9 @@ %changelog +* Sun Apr 30 2006 Luke Macken 0.3.7-8 +- Execute with --disable-tray in desktop file, since it is horribly broken. + * Tue Feb 28 2006 Luke Macken 0.3.7-7 - Add patch to remove extra qualification build error From fedora-extras-commits at redhat.com Mon May 1 22:44:09 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:44:09 -0700 Subject: rpms/valknut/FC-5 valknut.spec,1.6,1.7 Message-ID: <200605012244.k41MiBYF030730@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/valknut/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30713 Modified Files: valknut.spec Log Message: bump Index: valknut.spec =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-5/valknut.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- valknut.spec 1 May 2006 22:42:21 -0000 1.6 +++ valknut.spec 1 May 2006 22:44:09 -0000 1.7 @@ -1,6 +1,6 @@ Name: valknut Version: 0.3.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Valknut is a QT Direct Connect client Group: Applications/Internet @@ -58,6 +58,9 @@ %changelog +* Mon May 01 2006 Luke Macken 0.3.7-9 +- Bump + * Sun Apr 30 2006 Luke Macken 0.3.7-8 - Execute with --disable-tray in desktop file, since it is horribly broken. From fedora-extras-commits at redhat.com Mon May 1 23:27:20 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 1 May 2006 16:27:20 -0700 Subject: rpms/gossip/devel .cvsignore, 1.6, 1.7 gossip.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200605012327.k41NRM0X000637@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv616 Modified Files: .cvsignore gossip.spec sources Log Message: * Mon May 1 2006 Brian Pepple - 0.11-3 - Update to 0.11. - Add scriptlets for gtk+ icon cache. - Add icons to files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Mar 2006 20:51:36 -0000 1.6 +++ .cvsignore 1 May 2006 23:27:20 -0000 1.7 @@ -1 +1 @@ -gossip-0.10.2.tar.bz2 +gossip-0.11.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gossip.spec 18 Mar 2006 20:51:36 -0000 1.16 +++ gossip.spec 1 May 2006 23:27:20 -0000 1.17 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: gossip -Version: 0.10.2 +Version: 0.11 Release: 3%{?dist} Summary: Gnome Jabber Client @@ -85,6 +85,10 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %preun @@ -97,6 +101,10 @@ %postun scrollkeeper-update -q || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang @@ -106,7 +114,8 @@ %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_sysconfdir}/sound/events/%{name}.soundlist %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %{_datadir}/%{name}/*.png @@ -121,6 +130,11 @@ %changelog +* Mon May 1 2006 Brian Pepple - 0.11-3 +- Update to 0.11. +- Add scriptlets for gtk+ icon cache. +- Add icons to files. + * Sat Mar 18 2006 Brian Pepple - 0.10.2-3 - Update to 0.10.2. - Add BR for iso-codes-devel & gnome-doc-utils. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Mar 2006 20:51:36 -0000 1.6 +++ sources 1 May 2006 23:27:20 -0000 1.7 @@ -1 +1 @@ -f53dbf1fa951c620dbf4b95560e51c8c gossip-0.10.2.tar.bz2 +4b2720f96df77e9c35f5eb7abbb10dab gossip-0.11.tar.bz2 From fedora-extras-commits at redhat.com Mon May 1 23:59:29 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 1 May 2006 16:59:29 -0700 Subject: rpms/bsd-games/devel bsd-games.spec,1.2,1.3 config.params,1.1,1.2 Message-ID: <200605012359.k41NxVH9000852@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828 Modified Files: bsd-games.spec config.params Log Message: Remove banner (conflict with a similar package in FE) Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bsd-games.spec 29 Apr 2006 22:58:16 -0000 1.2 +++ bsd-games.spec 1 May 2006 23:59:29 -0000 1.3 @@ -91,7 +91,6 @@ %{_bindir}/backgammon %{_bindir}/teachgammon %attr(2755,root,games) %{_bindir}/battlestar -%{_bindir}/banner %{_bindir}/boggle %{_bindir}/bcd %{_bindir}/caesar @@ -150,6 +149,9 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Mon May 1 2006 Wart 2.17-10 +- Remove banner (conflict with a similar package in FE) + * Sat Apr 29 2006 Wart 2.17-9 - Simplify files section - Remove unnecessary comment Index: config.params =================================================================== RCS file: /cvs/extras/rpms/bsd-games/devel/config.params,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.params 29 Apr 2006 15:34:43 -0000 1.1 +++ config.params 1 May 2006 23:59:29 -0000 1.2 @@ -7,7 +7,7 @@ bsd_games_cfg_non_interactive=y bsd_games_cfg_install_prefix=@DESTDIR@ -bsd_games_cfg_no_build_dirs="countmail dm factor fortune" +bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune" bsd_games_cfg_gamesdir=@bindir@ bsd_games_cfg_sbindir=@sbindir@ bsd_games_cfg_libexecdir=@libdir@ From fedora-extras-commits at redhat.com Mon May 1 23:59:38 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 1 May 2006 16:59:38 -0700 Subject: rpms/gossip/FC-5 .cvsignore, 1.6, 1.7 gossip.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200605012359.k41NxeFe000879@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv858 Modified Files: .cvsignore gossip.spec sources Log Message: * Mon May 1 2006 Brian Pepple - 0.11-2 - Update to 0.11. - Add scriptlets for gtk+ icon cache. - Add icons to files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Mar 2006 20:54:32 -0000 1.6 +++ .cvsignore 1 May 2006 23:59:38 -0000 1.7 @@ -1 +1 @@ -gossip-0.10.2.tar.bz2 +gossip-0.11.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/gossip.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gossip.spec 18 Mar 2006 20:54:32 -0000 1.16 +++ gossip.spec 1 May 2006 23:59:38 -0000 1.17 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: gossip -Version: 0.10.2 +Version: 0.11 Release: 2%{?dist} Summary: Gnome Jabber Client @@ -85,6 +85,10 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %preun @@ -97,6 +101,10 @@ %postun scrollkeeper-update -q || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang @@ -106,7 +114,8 @@ %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_sysconfdir}/sound/events/%{name}.soundlist %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %{_datadir}/%{name}/*.png @@ -121,6 +130,11 @@ %changelog +* Mon May 1 2006 Brian Pepple - 0.11-2 +- Update to 0.11. +- Add scriptlets for gtk+ icon cache. +- Add icons to files. + * Sat Mar 18 2006 Brian Pepple - 0.10.2-2 - Update to 0.10.2. - Add BR for iso-codes-devel & gnome-doc-utils. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Mar 2006 20:54:32 -0000 1.6 +++ sources 1 May 2006 23:59:38 -0000 1.7 @@ -1 +1 @@ -f53dbf1fa951c620dbf4b95560e51c8c gossip-0.10.2.tar.bz2 +4b2720f96df77e9c35f5eb7abbb10dab gossip-0.11.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 00:00:30 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 1 May 2006 17:00:30 -0700 Subject: rpms/bsd-games/devel bsd-games.spec,1.3,1.4 Message-ID: <200605020000.k4200WIr000954@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv935 Modified Files: bsd-games.spec Log Message: Forgot to bump Release tag. Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bsd-games.spec 1 May 2006 23:59:29 -0000 1.3 +++ bsd-games.spec 2 May 2006 00:00:30 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Amusements/Games URL: ftp://metalab.unc.edu/pub/Linux/games/ From fedora-extras-commits at redhat.com Tue May 2 00:12:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 1 May 2006 17:12:02 -0700 Subject: rpms/bsd-games/FC-4 bsd-games.spec,1.2,1.3 config.params,1.1,1.2 Message-ID: <200605020012.k420C41o003197@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3162/FC-4 Modified Files: bsd-games.spec config.params Log Message: Remove 'banner' due to conflict with existing FE package. Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/FC-4/bsd-games.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bsd-games.spec 29 Apr 2006 22:59:13 -0000 1.2 +++ bsd-games.spec 2 May 2006 00:12:02 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Amusements/Games URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -91,7 +91,6 @@ %{_bindir}/backgammon %{_bindir}/teachgammon %attr(2755,root,games) %{_bindir}/battlestar -%{_bindir}/banner %{_bindir}/boggle %{_bindir}/bcd %{_bindir}/caesar @@ -150,6 +149,9 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Mon May 1 2006 Wart 2.17-10 +- Remove banner (conflict with a similar package in FE) + * Sat Apr 29 2006 Wart 2.17-9 - Simplify files section - Remove unnecessary comment Index: config.params =================================================================== RCS file: /cvs/extras/rpms/bsd-games/FC-4/config.params,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.params 29 Apr 2006 15:34:43 -0000 1.1 +++ config.params 2 May 2006 00:12:02 -0000 1.2 @@ -7,7 +7,7 @@ bsd_games_cfg_non_interactive=y bsd_games_cfg_install_prefix=@DESTDIR@ -bsd_games_cfg_no_build_dirs="countmail dm factor fortune" +bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune" bsd_games_cfg_gamesdir=@bindir@ bsd_games_cfg_sbindir=@sbindir@ bsd_games_cfg_libexecdir=@libdir@ From fedora-extras-commits at redhat.com Tue May 2 00:12:03 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 1 May 2006 17:12:03 -0700 Subject: rpms/bsd-games/FC-5 bsd-games.spec,1.2,1.3 config.params,1.1,1.2 Message-ID: <200605020012.k420C5IA003202@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3162/FC-5 Modified Files: bsd-games.spec config.params Log Message: Remove 'banner' due to conflict with existing FE package. Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/FC-5/bsd-games.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bsd-games.spec 29 Apr 2006 22:59:14 -0000 1.2 +++ bsd-games.spec 2 May 2006 00:12:02 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Amusements/Games URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -91,7 +91,6 @@ %{_bindir}/backgammon %{_bindir}/teachgammon %attr(2755,root,games) %{_bindir}/battlestar -%{_bindir}/banner %{_bindir}/boggle %{_bindir}/bcd %{_bindir}/caesar @@ -150,6 +149,9 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Mon May 1 2006 Wart 2.17-10 +- Remove banner (conflict with a similar package in FE) + * Sat Apr 29 2006 Wart 2.17-9 - Simplify files section - Remove unnecessary comment Index: config.params =================================================================== RCS file: /cvs/extras/rpms/bsd-games/FC-5/config.params,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.params 29 Apr 2006 15:34:43 -0000 1.1 +++ config.params 2 May 2006 00:12:02 -0000 1.2 @@ -7,7 +7,7 @@ bsd_games_cfg_non_interactive=y bsd_games_cfg_install_prefix=@DESTDIR@ -bsd_games_cfg_no_build_dirs="countmail dm factor fortune" +bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune" bsd_games_cfg_gamesdir=@bindir@ bsd_games_cfg_sbindir=@sbindir@ bsd_games_cfg_libexecdir=@libdir@ From fedora-extras-commits at redhat.com Tue May 2 00:18:02 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 17:18:02 -0700 Subject: rpms/mod_geoip/FC-5 .cvsignore, 1.2, 1.3 mod_geoip.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605020018.k420I4wm003407@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3386 Modified Files: .cvsignore mod_geoip.spec sources Log Message: * Tue May 2 2006 Michael Fleming 1.1.8-1 - New upstream release (also fixes #189035) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 22:45:12 -0000 1.2 +++ .cvsignore 2 May 2006 00:18:02 -0000 1.3 @@ -1 +1 @@ -mod_geoip2_1.1.7.tar.gz +mod_geoip2_1.1.8.tar.gz Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-5/mod_geoip.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_geoip.spec 19 Mar 2006 01:29:53 -0000 1.2 +++ mod_geoip.spec 2 May 2006 00:18:02 -0000 1.3 @@ -1,7 +1,7 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip -Version: 1.1.7 -Release: 3%{?dist} +Version: 1.1.8 +Release: 1%{?dist} License: Apache Software License Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip @@ -46,6 +46,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Tue May 2 2006 Michael Fleming 1.1.8-1 +- New upstream release (also fixes #189035) + * Sun Mar 19 2006 Michael Fleming 1.1.7-3 - Bump for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 22:45:12 -0000 1.2 +++ sources 2 May 2006 00:18:02 -0000 1.3 @@ -1 +1 @@ -ca02b8b955d95d659037f8c633908ae9 mod_geoip2_1.1.7.tar.gz +165607221c6a95ace7d840c5aea39696 mod_geoip2_1.1.8.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:20:21 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 17:20:21 -0700 Subject: rpms/mod_geoip/FC-4 .cvsignore, 1.2, 1.3 mod_geoip.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605020020.k420KNWg003483@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3462 Modified Files: .cvsignore mod_geoip.spec sources Log Message: * Tue May 2 2006 Michael Fleming 1.1.8-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 22:45:12 -0000 1.2 +++ .cvsignore 2 May 2006 00:20:21 -0000 1.3 @@ -1 +1 @@ -mod_geoip2_1.1.7.tar.gz +mod_geoip2_1.1.8.tar.gz Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-4/mod_geoip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_geoip.spec 20 Feb 2006 22:45:12 -0000 1.1 +++ mod_geoip.spec 2 May 2006 00:20:21 -0000 1.2 @@ -1,7 +1,7 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip -Version: 1.1.7 -Release: 2%{?dist} +Version: 1.1.8 +Release: 1%{?dist} License: Apache Software License Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip @@ -46,6 +46,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Tue May 2 2006 Michael Fleming 1.1.8-1 +- New upstream release + * Sat Feb 18 2006 Michael Fleming 1.1.7-2 - Small cleanups, including a saner Requires: for httpd - Don't strip the binary Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 22:45:12 -0000 1.2 +++ sources 2 May 2006 00:20:21 -0000 1.3 @@ -1 +1 @@ -ca02b8b955d95d659037f8c633908ae9 mod_geoip2_1.1.7.tar.gz +165607221c6a95ace7d840c5aea39696 mod_geoip2_1.1.8.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:33:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:33:52 -0700 Subject: rpms/perl-Email-MIME - New directory Message-ID: <200605020033.k420Xso3003658@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3637/perl-Email-MIME Log Message: Directory /cvs/extras/rpms/perl-Email-MIME added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:33:53 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:33:53 -0700 Subject: rpms/perl-Email-MIME/devel - New directory Message-ID: <200605020034.k420Xt2s003661@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3637/perl-Email-MIME/devel Log Message: Directory /cvs/extras/rpms/perl-Email-MIME/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:34:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:34:14 -0700 Subject: rpms/perl-Email-MIME Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605020034.k420YG0o003717@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3682 Added Files: Makefile import.log Log Message: Setup of module perl-Email-MIME --- NEW FILE Makefile --- # Top level Makefile for module perl-Email-MIME all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 00:34:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:34:15 -0700 Subject: rpms/perl-Email-MIME/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605020034.k420YHKE003720@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3682/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Email-MIME --- NEW 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 May 2 00:34:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:34:43 -0700 Subject: rpms/perl-Email-MIME import.log,1.1,1.2 Message-ID: <200605020034.k420YjPN003786@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3753 Modified Files: import.log Log Message: auto-import perl-Email-MIME-1.82-2 on branch devel from perl-Email-MIME-1.82-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 00:34:14 -0000 1.1 +++ import.log 2 May 2006 00:34:43 -0000 1.2 @@ -0,0 +1 @@ +perl-Email-MIME-1_82-2:HEAD:perl-Email-MIME-1.82-2.src.rpm:1146530075 From fedora-extras-commits at redhat.com Tue May 2 00:34:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:34:44 -0700 Subject: rpms/perl-Email-MIME/devel perl-Email-MIME.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605020034.k420Ykiq003791@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3753/devel Modified Files: .cvsignore sources Added Files: perl-Email-MIME.spec Log Message: auto-import perl-Email-MIME-1.82-2 on branch devel from perl-Email-MIME-1.82-2.src.rpm --- NEW FILE perl-Email-MIME.spec --- Name: perl-Email-MIME Version: 1.82 Release: 2%{?dist} Summary: Easy MIME message parsing Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Email-MIME/ Source0: http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Email::MIME::ContentType) >= 1.0 BuildRequires: perl(Email::MIME::Encodings) >= 1.3 BuildRequires: perl(Email::Simple) >= 1.91 BuildRequires: perl(MIME::Types) >= 1.13 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Email::Simple) >= 1.91 Requires: perl(MIME::Types) >= 1.13 %description This is an extension of the Email::Simple module, to handle MIME encoded messages. It takes a message as a string, splits it up into its constituent parts, and allows you access to various parts of the message. Headers are decoded from MIME encoding. %prep %setup -q -n Email-MIME-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Email/ %{_mandir}/man3/*.3pm* %changelog * Thu Sep 8 2005 Jose Pedro Oliveira - 1.82-2 - Requires Email::Simple (rpm "use base" shortcoming). * Thu Sep 08 2005 Jose Pedro Oliveira - 1.82-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 00:34:14 -0000 1.1 +++ .cvsignore 2 May 2006 00:34:44 -0000 1.2 @@ -0,0 +1 @@ +Email-MIME-1.82.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 00:34:14 -0000 1.1 +++ sources 2 May 2006 00:34:44 -0000 1.2 @@ -0,0 +1 @@ +fe917f83f7ff5f6425e388857a7400eb Email-MIME-1.82.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:35:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:35:43 -0700 Subject: rpms/perl-Email-MIME-Modifier - New directory Message-ID: <200605020035.k420ZjlO003937@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3911/perl-Email-MIME-Modifier Log Message: Directory /cvs/extras/rpms/perl-Email-MIME-Modifier added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:35:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:35:44 -0700 Subject: rpms/perl-Email-MIME-Modifier/devel - New directory Message-ID: <200605020035.k420Zk1a003940@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3911/perl-Email-MIME-Modifier/devel Log Message: Directory /cvs/extras/rpms/perl-Email-MIME-Modifier/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:36:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:36:05 -0700 Subject: rpms/perl-Email-MIME-Modifier Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605020036.k420a7bp003989@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3961 Added Files: Makefile import.log Log Message: Setup of module perl-Email-MIME-Modifier --- NEW FILE Makefile --- # Top level Makefile for module perl-Email-MIME-Modifier all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 00:36:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:36:05 -0700 Subject: rpms/perl-Email-MIME-Modifier/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605020036.k420a7oB003992@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3961/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Email-MIME-Modifier --- NEW 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 May 2 00:36:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:36:37 -0700 Subject: rpms/perl-Email-MIME-Modifier import.log,1.1,1.2 Message-ID: <200605020036.k420adKn004061@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4026 Modified Files: import.log Log Message: auto-import perl-Email-MIME-Modifier-1.42-2 on branch devel from perl-Email-MIME-Modifier-1.42-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 00:36:05 -0000 1.1 +++ import.log 2 May 2006 00:36:37 -0000 1.2 @@ -0,0 +1 @@ +perl-Email-MIME-Modifier-1_42-2:HEAD:perl-Email-MIME-Modifier-1.42-2.src.rpm:1146530189 From fedora-extras-commits at redhat.com Tue May 2 00:36:38 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:36:38 -0700 Subject: rpms/perl-Email-MIME-Modifier/devel perl-Email-MIME-Modifier.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605020036.k420ae6x004066@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4026/devel Modified Files: .cvsignore sources Added Files: perl-Email-MIME-Modifier.spec Log Message: auto-import perl-Email-MIME-Modifier-1.42-2 on branch devel from perl-Email-MIME-Modifier-1.42-2.src.rpm --- NEW FILE perl-Email-MIME-Modifier.spec --- Name: perl-Email-MIME-Modifier Version: 1.42 Release: 2%{?dist} Summary: Modify Email::MIME Objects Easily Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Email-MIME-Modifier/ Source0: http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-Modifier-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Email::MessageID) >= 1.2 BuildRequires: perl(Email::MIME) >= 1.82 BuildRequires: perl(Email::MIME::Encodings) >= 1.3 BuildRequires: perl(Email::MIME::ContentType) >= 1.0 BuildRequires: perl(Email::Simple) >= 1.92 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Provides a number of useful methods for manipulating MIME messages. These method are declared in the "Email::MIME" namespace, and are used with "Email::MIME" objects. %prep %setup -q -n Email-MIME-Modifier-%{version} # Provides: filter perl(Email::MIME) cat <<__EOF__ > %{name}-filterprovides #!/bin/sh /usr/lib/rpm/perl.prov \$* | grep -v 'perl(Email::MIME)' __EOF__ %define __perl_provides %{_builddir}/Email-MIME-Modifier-%{version}/%{name}-filterprovides chmod +x %{__perl_provides} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Email/MIME/ %{_mandir}/man3/*.3pm* %changelog * Thu Sep 8 2005 Jose Pedro Oliveira - 1.42-2 - Filter the Email::MIME provide. * Thu Sep 08 2005 Jose Pedro Oliveira - 1.42-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 00:36:05 -0000 1.1 +++ .cvsignore 2 May 2006 00:36:38 -0000 1.2 @@ -0,0 +1 @@ +Email-MIME-Modifier-1.42.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 00:36:05 -0000 1.1 +++ sources 2 May 2006 00:36:38 -0000 1.2 @@ -0,0 +1 @@ +3acf1c19da93334be37f3f9a288acd91 Email-MIME-Modifier-1.42.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:38:54 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:38:54 -0700 Subject: owners owners.list,1.930,1.931 Message-ID: <200605020038.k420cu7n004139@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4122 Modified Files: owners.list Log Message: New packages: - #190315 : perl-Email-MIME - Easy MIME message parsing - #190316 : perl-Email-MIME-Modifier - Modify Email::MIME Objects Easily Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.930 retrieving revision 1.931 diff -u -r1.930 -r1.931 --- owners.list 1 May 2006 19:58:46 -0000 1.930 +++ owners.list 2 May 2006 00:38:53 -0000 1.931 @@ -972,8 +972,10 @@ Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-Address|RFC 2822 Address Parsing and Creation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-MessageID|Generate world unique message-ids|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Email-MIME|Easy MIME message parsing|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-MIME-ContentType|Parse a MIME Content-Type Header|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-MIME-Encodings|Unified interface to MIME encoding and decoding|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Email-MIME-Modifier|Modify Email::MIME Objects Easily|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 00:47:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:47:56 -0700 Subject: rpms/perl-HTTP-Request-Params - New directory Message-ID: <200605020047.k420lwjs004278@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4250/perl-HTTP-Request-Params Log Message: Directory /cvs/extras/rpms/perl-HTTP-Request-Params added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:47:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:47:57 -0700 Subject: rpms/perl-HTTP-Request-Params/devel - New directory Message-ID: <200605020047.k420lxq0004281@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4250/perl-HTTP-Request-Params/devel Log Message: Directory /cvs/extras/rpms/perl-HTTP-Request-Params/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:48:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:48:13 -0700 Subject: rpms/perl-HTTP-Request-Params Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605020048.k420mFXp004330@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4297 Added Files: Makefile import.log Log Message: Setup of module perl-HTTP-Request-Params --- NEW FILE Makefile --- # Top level Makefile for module perl-HTTP-Request-Params all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 00:48:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:48:14 -0700 Subject: rpms/perl-HTTP-Request-Params/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605020048.k420mGxQ004333@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4297/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTTP-Request-Params --- NEW 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 May 2 00:48:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:48:42 -0700 Subject: rpms/perl-HTTP-Request-Params/devel perl-HTTP-Request-Params.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605020048.k420miL7004399@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4361/devel Modified Files: .cvsignore sources Added Files: perl-HTTP-Request-Params.spec Log Message: auto-import perl-HTTP-Request-Params-1.01-1 on branch devel from perl-HTTP-Request-Params-1.01-1.src.rpm --- NEW FILE perl-HTTP-Request-Params.spec --- Name: perl-HTTP-Request-Params Version: 1.01 Release: 1%{?dist} Summary: Retrieve GET/POST Parameters from HTTP Requests Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTTP-Request-Params/ Source0: http://www.cpan.org/authors/id/C/CW/CWEST/HTTP-Request-Params-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::Accessor::Fast) >= 0.19 BuildRequires: perl(HTTP::Request) >= 1.40 BuildRequires: perl(Email::MIME::Modifier) >= 1.42 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Class::Accessor::Fast) >= 0.19 %description This software does all the dirty work of parsing HTTP Requests to find incoming query parameters. %prep %setup -q -n HTTP-Request-Params-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/HTTP/Request/ %{_mandir}/man3/*.3pm* %changelog * Wed Sep 07 2005 Jose Pedro Oliveira - 1.01-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Request-Params/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 00:48:13 -0000 1.1 +++ .cvsignore 2 May 2006 00:48:42 -0000 1.2 @@ -0,0 +1 @@ +HTTP-Request-Params-1.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Request-Params/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 00:48:13 -0000 1.1 +++ sources 2 May 2006 00:48:42 -0000 1.2 @@ -0,0 +1 @@ +fccd255a2992c77b5c40cb5e1e75b256 HTTP-Request-Params-1.01.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:48:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:48:41 -0700 Subject: rpms/perl-HTTP-Request-Params import.log,1.1,1.2 Message-ID: <200605020048.k420mhf8004394@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4361 Modified Files: import.log Log Message: auto-import perl-HTTP-Request-Params-1.01-1 on branch devel from perl-HTTP-Request-Params-1.01-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Request-Params/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 00:48:13 -0000 1.1 +++ import.log 2 May 2006 00:48:41 -0000 1.2 @@ -0,0 +1 @@ +perl-HTTP-Request-Params-1_01-1:HEAD:perl-HTTP-Request-Params-1.01-1.src.rpm:1146530913 From fedora-extras-commits at redhat.com Tue May 2 00:49:38 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:49:38 -0700 Subject: owners owners.list,1.931,1.932 Message-ID: <200605020049.k420neRF004453@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4436 Modified Files: owners.list Log Message: New package: perl-HTTP-Request-Params (#190318) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.931 retrieving revision 1.932 diff -u -r1.931 -r1.932 --- owners.list 2 May 2006 00:38:53 -0000 1.931 +++ owners.list 2 May 2006 00:49:38 -0000 1.932 @@ -1021,6 +1021,7 @@ Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTTP-Request-Params|Retrieve GET/POST Parameters from HTTP Requests|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 01:18:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:01 -0700 Subject: rpms/perl-HTTP-Recorder - New directory Message-ID: <200605020118.k421I3bX006860@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6839/perl-HTTP-Recorder Log Message: Directory /cvs/extras/rpms/perl-HTTP-Recorder added to the repository From fedora-extras-commits at redhat.com Tue May 2 01:18:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:02 -0700 Subject: rpms/perl-HTTP-Recorder/devel - New directory Message-ID: <200605020118.k421I4cV006863@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6839/perl-HTTP-Recorder/devel Log Message: Directory /cvs/extras/rpms/perl-HTTP-Recorder/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 01:18:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:21 -0700 Subject: rpms/perl-HTTP-Recorder Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605020118.k421INj2006919@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6890 Added Files: Makefile import.log Log Message: Setup of module perl-HTTP-Recorder --- NEW FILE Makefile --- # Top level Makefile for module perl-HTTP-Recorder all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 01:18:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:22 -0700 Subject: rpms/perl-HTTP-Recorder/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605020118.k421IOSZ006922@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6890/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTTP-Recorder --- NEW 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 May 2 01:18:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:44 -0700 Subject: owners owners.list,1.932,1.933 Message-ID: <200605020118.k421IkW0006969@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6947 Modified Files: owners.list Log Message: New package: perl-HTTP-Recorder (#190319) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.932 retrieving revision 1.933 diff -u -r1.932 -r1.933 --- owners.list 2 May 2006 00:49:38 -0000 1.932 +++ owners.list 2 May 2006 01:18:44 -0000 1.933 @@ -1021,6 +1021,7 @@ Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTTP-Recorder|Record interaction with web sites|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Request-Params|Retrieve GET/POST Parameters from HTTP Requests|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 01:18:53 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:53 -0700 Subject: rpms/perl-HTTP-Recorder import.log,1.1,1.2 Message-ID: <200605020118.k421ItSA007011@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6978 Modified Files: import.log Log Message: auto-import perl-HTTP-Recorder-0.05-1 on branch devel from perl-HTTP-Recorder-0.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Recorder/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 01:18:21 -0000 1.1 +++ import.log 2 May 2006 01:18:53 -0000 1.2 @@ -0,0 +1 @@ +perl-HTTP-Recorder-0_05-1:HEAD:perl-HTTP-Recorder-0.05-1.src.rpm:1146532725 From fedora-extras-commits at redhat.com Tue May 2 01:18:54 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:54 -0700 Subject: rpms/perl-HTTP-Recorder/devel perl-HTTP-Recorder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605020119.k421IukI007016@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6978/devel Modified Files: .cvsignore sources Added Files: perl-HTTP-Recorder.spec Log Message: auto-import perl-HTTP-Recorder-0.05-1 on branch devel from perl-HTTP-Recorder-0.05-1.src.rpm --- NEW FILE perl-HTTP-Recorder.spec --- Name: perl-HTTP-Recorder Version: 0.05 Release: 1%{?dist} Summary: Record interaction with web sites Group: Development/Libraries License: GPL URL: http://search.cpan.org/dist/HTTP-Recorder/ Source0: http://www.cpan.org/authors/id/L/LE/LEIRA/HTTP-Recorder-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(HTML::TokeParser) BuildRequires: perl(HTTP::Request::Params) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(URI::Escape) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Browser-independent recorder for recording interactions with web sites. %prep %setup -q -n HTTP-Recorder-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/HTTP/ %{_mandir}/man3/*.3pm* %changelog * Thu Sep 8 2005 Jose Pedro Oliveira - 0.05-1 - Update to 0.05. * Sun Jul 04 2004 Jose Pedro Oliveira - 0:0.02-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Recorder/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 01:18:21 -0000 1.1 +++ .cvsignore 2 May 2006 01:18:54 -0000 1.2 @@ -0,0 +1 @@ +HTTP-Recorder-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Recorder/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 01:18:21 -0000 1.1 +++ sources 2 May 2006 01:18:54 -0000 1.2 @@ -0,0 +1 @@ +a2c167d06509620921e4d417ce9354a7 HTTP-Recorder-0.05.tar.gz From fedora-extras-commits at redhat.com Tue May 2 07:51:35 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 2 May 2006 00:51:35 -0700 Subject: fedora-security/audit fc4,1.223,1.224 fc5,1.137,1.138 Message-ID: <200605020751.k427pZB3022394@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22374 Modified Files: fc4 fc5 Log Message: Updates from over the weekend Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- fc4 28 Apr 2006 07:51:39 -0000 1.223 +++ fc4 2 May 2006 07:51:32 -0000 1.224 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060427 -Up to date FC4 as of 20060427 +Up to date CVE as of CVE email 20060501 +Up to date FC4 as of 20060501 ** are items that need attention +CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] +CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423] CVE-2006-2057 ** firefox CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- fc5 28 Apr 2006 07:51:39 -0000 1.137 +++ fc5 2 May 2006 07:51:32 -0000 1.138 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060427 -Up to date FC5 as of 20060427 +Up to date CVE as of CVE email 20060501 +Up to date FC5 as of 20060501 ** are items that need attention +CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] +CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421] CVE-2006-2057 ** firefox CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] From fedora-extras-commits at redhat.com Tue May 2 08:19:13 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 2 May 2006 01:19:13 -0700 Subject: fedora-security/audit fc4,1.224,1.225 fc5,1.138,1.139 Message-ID: <200605020819.k428JD02025676@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25656 Modified Files: fc4 fc5 Log Message: Missing firefox issues Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- fc4 2 May 2006 07:51:32 -0000 1.224 +++ fc4 2 May 2006 08:19:10 -0000 1.225 @@ -10,6 +10,7 @@ CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] +CVE-2006-1993 version (firefox, 1.5 only) CVE-2006-1991 VULNERABLE (php) CVE-2006-1990 VULNERABLE (php) CVE-2006-1942 ** firefox Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- fc5 2 May 2006 07:51:32 -0000 1.138 +++ fc5 2 May 2006 08:19:10 -0000 1.139 @@ -10,6 +10,7 @@ CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] +CVE-2006-1993 VULNERABLE (firefox) #190124 CVE-2006-1991 VULNERABLE (php) CVE-2006-1990 VULNERABLE (php) CVE-2006-1942 ** firefox From fedora-extras-commits at redhat.com Tue May 2 09:52:14 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 2 May 2006 02:52:14 -0700 Subject: rpms/p7zip/devel .cvsignore, 1.5, 1.6 p7zip.spec, 1.9, 1.10 sources, 1.5, 1.6 p7zip_4.30-extraqualif.patch, 1.1, NONE Message-ID: <200605020952.k429qGip028319@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/p7zip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28264/devel Modified Files: .cvsignore p7zip.spec sources Removed Files: p7zip_4.30-extraqualif.patch Log Message: Update to 4.39 and remove all Rar-related files since their license is not acceptable for inclusion in Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p7zip/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Nov 2005 15:09:10 -0000 1.5 +++ .cvsignore 2 May 2006 09:52:14 -0000 1.6 @@ -1 +1 @@ -p7zip_4.30_src_all.tar.bz2 +p7zip_4.39_src_all-norar.tar.bz2 Index: p7zip.spec =================================================================== RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- p7zip.spec 6 Mar 2006 15:20:37 -0000 1.9 +++ p7zip.spec 2 May 2006 09:52:14 -0000 1.10 @@ -1,14 +1,19 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.30 -Release: 3%{?dist} +Version: 4.39 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ -Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 -Patch0: p7zip_4.30-extraqualif.patch +# RAR sources removed since their license is incompatible with the LGPL +#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# VERSION= +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* +# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt +# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +Source: p7zip_%{version}_src_all-norar.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++ %description p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high @@ -27,7 +32,6 @@ %prep %setup -n %{name}_%{version} -%patch0 -p1 -b .extraqualif # Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the # same directory as the binaries, and we don't want them in %{_bindir}. @@ -44,7 +48,7 @@ %build %ifarch %{ix86} ppc -%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine +%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64 makefile.machine @@ -90,6 +94,12 @@ %changelog +* Tue May 2 2006 Matthias Saou 4.39-1 +- Update to 4.39. +- Remove no longer needed gcc 4.1 patch. +- Use the gcc_4.X makefile. +- Remove RAR licensed files and RAR license itself (#190277). + * Mon Mar 6 2006 Matthias Saou 4.30-3 - FC5 rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/p7zip/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Nov 2005 15:09:10 -0000 1.5 +++ sources 2 May 2006 09:52:14 -0000 1.6 @@ -1 +1 @@ -cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 +06dc4693d44c9efecca98969256ddb6c p7zip_4.39_src_all-norar.tar.bz2 --- p7zip_4.30-extraqualif.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 09:52:07 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 2 May 2006 02:52:07 -0700 Subject: rpms/p7zip/FC-4 .cvsignore, 1.5, 1.6 p7zip.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605020952.k429qd6U028329@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/p7zip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28264/FC-4 Modified Files: .cvsignore p7zip.spec sources Log Message: Update to 4.39 and remove all Rar-related files since their license is not acceptable for inclusion in Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Nov 2005 16:33:57 -0000 1.5 +++ .cvsignore 2 May 2006 09:52:07 -0000 1.6 @@ -1 +1 @@ -p7zip_4.30_src_all.tar.bz2 +p7zip_4.39_src_all-norar.tar.bz2 Index: p7zip.spec =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-4/p7zip.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- p7zip.spec 28 Nov 2005 16:33:57 -0000 1.6 +++ p7zip.spec 2 May 2006 09:52:07 -0000 1.7 @@ -1,13 +1,19 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.30 +Version: 4.39 Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ -Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# RAR sources removed since their license is incompatible with the LGPL +#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# VERSION= +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* +# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt +# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +Source: p7zip_%{version}_src_all-norar.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++ %description p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high @@ -42,7 +48,7 @@ %build %ifarch %{ix86} ppc -%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine +%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64 makefile.machine @@ -88,6 +94,19 @@ %changelog +* Tue May 2 2006 Matthias Saou 4.39-1 +- Update to 4.39. +- Remove no longer needed gcc 4.1 patch. +- Use the gcc_4.X makefile. +- Remove RAR licensed files and RAR license itself (#190277). + +* Mon Mar 6 2006 Matthias Saou 4.30-3 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 4.30-2 +- Rebuild for new gcc/glibc. +- Include gcc 4.1 patch for extra qualification errors. + * Mon Nov 28 2005 Matthias Saou 4.30-1 - Update to 4.30. Index: sources =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Nov 2005 16:33:57 -0000 1.5 +++ sources 2 May 2006 09:52:07 -0000 1.6 @@ -1 +1 @@ -cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 +06dc4693d44c9efecca98969256ddb6c p7zip_4.39_src_all-norar.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 09:52:08 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 2 May 2006 02:52:08 -0700 Subject: rpms/p7zip/FC-5 .cvsignore, 1.5, 1.6 p7zip.spec, 1.9, 1.10 sources, 1.5, 1.6 p7zip_4.30-extraqualif.patch, 1.1, NONE Message-ID: <200605020952.k429qeOH028334@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/p7zip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28264/FC-5 Modified Files: .cvsignore p7zip.spec sources Removed Files: p7zip_4.30-extraqualif.patch Log Message: Update to 4.39 and remove all Rar-related files since their license is not acceptable for inclusion in Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Nov 2005 15:09:10 -0000 1.5 +++ .cvsignore 2 May 2006 09:52:08 -0000 1.6 @@ -1 +1 @@ -p7zip_4.30_src_all.tar.bz2 +p7zip_4.39_src_all-norar.tar.bz2 Index: p7zip.spec =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-5/p7zip.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- p7zip.spec 6 Mar 2006 15:20:37 -0000 1.9 +++ p7zip.spec 2 May 2006 09:52:08 -0000 1.10 @@ -1,14 +1,19 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.30 -Release: 3%{?dist} +Version: 4.39 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ -Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 -Patch0: p7zip_4.30-extraqualif.patch +# RAR sources removed since their license is incompatible with the LGPL +#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# VERSION= +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* +# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt +# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +Source: p7zip_%{version}_src_all-norar.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++ %description p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high @@ -27,7 +32,6 @@ %prep %setup -n %{name}_%{version} -%patch0 -p1 -b .extraqualif # Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the # same directory as the binaries, and we don't want them in %{_bindir}. @@ -44,7 +48,7 @@ %build %ifarch %{ix86} ppc -%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine +%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64 makefile.machine @@ -90,6 +94,12 @@ %changelog +* Tue May 2 2006 Matthias Saou 4.39-1 +- Update to 4.39. +- Remove no longer needed gcc 4.1 patch. +- Use the gcc_4.X makefile. +- Remove RAR licensed files and RAR license itself (#190277). + * Mon Mar 6 2006 Matthias Saou 4.30-3 - FC5 rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Nov 2005 15:09:10 -0000 1.5 +++ sources 2 May 2006 09:52:08 -0000 1.6 @@ -1 +1 @@ -cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 +06dc4693d44c9efecca98969256ddb6c p7zip_4.39_src_all-norar.tar.bz2 --- p7zip_4.30-extraqualif.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 10:34:50 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 2 May 2006 03:34:50 -0700 Subject: rpms/gtkwave/devel gtkwave.spec, 1.9, 1.10 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200605021034.k42AYq9J030810@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786 Modified Files: gtkwave.spec sources .cvsignore Log Message: * Tue May 2 2006 Paul Howarth 3.0.0-1 - update to 3.0.0 - add examples directory as %%doc - add new buildreq gperf - tweak Makefile.in edits to handle Makefiles under contrib/ - add new binaries rtlbrowse and vertex - add new manpages for rtlbrowse, vertex, and gtkwaverc - %%{_mandir} no longer needs to be created manually - configure script now accepts --libdir Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkwave.spec 7 Mar 2006 13:22:54 -0000 1.9 +++ gtkwave.spec 2 May 2006 10:34:49 -0000 1.10 @@ -1,30 +1,28 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.86 +Version: 3.0.0 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog simulation tools, as well as LXT files produced by certain Verilog simulation tools. -This package includes support for reading .ghw files as produced by ghdl. - %prep %setup -q -n gtkwave-%{version} # Honour %{optflags} and use system zlib/bzip2 library -%{__perl} -pi -e 's/^CFLAGS = -O2/CFLAGS = %{optflags}/;' \ +%{__perl} -pi -e 's/^C(FLAGS|OPT) ?= ?-O2/C\1 = %{optflags}/;' \ -e 's at -I\.\.?/libz -I\.\.?/libbz2@@;' \ - -e 's@(\.\./)?libz/libz\.a at -lz@;' \ - -e 's@(\.\./)?libbz2/libbz2\.a at -lbz2@;' \ + -e 's@(\.\./(\.\./src/)?)?libz/libz\.a at -lz@;' \ + -e 's@(\.\./(\.\./src/)?)?libbz2/libbz2\.a at -lbz2@;' \ -e 's@^([a-z0-9]+:.*) -lz( -lbz2)?@\1@;' \ - src/Makefile*.in src/*/Makefile*.in + src/Makefile*.in src/*/Makefile*.in contrib/*/Makefile*.in %{__rm} -rf src/lib{z,bz2} # Fix file permissions for sane debuginfo package @@ -35,13 +33,11 @@ # to view) and cannot be opened in a "no file" mode from a menu. %build -# This is not an autotools-generated config script, and does not accept --libdir etc. -echo 2 | ./configure +echo 2 | ./configure --libdir=%{_libdir} %{__make} %install %{__rm} -rf %{buildroot} -%{__install} -m 755 -d %{buildroot}%{_mandir}/man1 %{__make} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} \ @@ -53,17 +49,19 @@ %files %defattr(-,root,root,0755) -%doc doc/* *.TXT gtkwaverc.sample +%doc doc/* *.TXT gtkwaverc.sample examples/ %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd %{_bindir}/mvl2lxt %{_bindir}/mvl2vcd +%{_bindir}/rtlbrowse %{_bindir}/tex2vcd %{_bindir}/tla2vcd %{_bindir}/vcd2lxt %{_bindir}/vcd2lxt2 %{_bindir}/vcd2vzt +%{_bindir}/vertex %{_bindir}/vzt2vcd %{_bindir}/vztminer %{_mandir}/man1/gtkwave.1* @@ -71,15 +69,28 @@ %{_mandir}/man1/lxt2vcd.1* %{_mandir}/man1/mvl2lxt.1* %{_mandir}/man1/mvl2vcd.1* +%{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/tex2vcd.1* %{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/vcd2lxt.1* %{_mandir}/man1/vcd2lxt2.1* %{_mandir}/man1/vcd2vzt.1* +%{_mandir}/man1/vertex.1* %{_mandir}/man1/vzt2vcd.1* %{_mandir}/man1/vztminer.1* +%{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 2 2006 Paul Howarth 3.0.0-1 +- update to 3.0.0 +- add examples directory as %%doc +- add new buildreq gperf +- tweak Makefile.in edits to handle Makefiles under contrib/ +- add new binaries rtlbrowse and vertex +- add new manpages for rtlbrowse, vertex, and gtkwaverc +- %%{_mandir} no longer needs to be created manually +- configure script now accepts --libdir + * Tue Mar 7 2006 Paul Howarth 1.3.86-1 - update to 1.3.86 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 13:22:54 -0000 1.9 +++ sources 2 May 2006 10:34:49 -0000 1.10 @@ -1 +1 @@ -8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz +1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 13:22:54 -0000 1.9 +++ .cvsignore 2 May 2006 10:34:49 -0000 1.10 @@ -1 +1 @@ -gtkwave-1.3.86.tgz +gtkwave-3.0.0.tgz From fedora-extras-commits at redhat.com Tue May 2 10:47:26 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 03:47:26 -0700 Subject: rpms/unifdef/devel unifdef.spec,1.1,1.2 Message-ID: <200605021047.k42AlSk3030906@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30889 Modified Files: unifdef.spec Log Message: add changelog Index: unifdef.spec =================================================================== RCS file: /cvs/extras/rpms/unifdef/devel/unifdef.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- unifdef.spec 1 May 2006 21:01:29 -0000 1.1 +++ unifdef.spec 2 May 2006 10:47:26 -0000 1.2 @@ -41,6 +41,9 @@ %changelog +* Tue May 2 2006 David Woodhouse - 1.171-3 +- Minor specfile cleanups from review + * Wed Apr 26 2006 David Woodhouse - 1.171-2 - Change BuildRoot From fedora-extras-commits at redhat.com Tue May 2 10:53:55 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 03:53:55 -0700 Subject: rpms/exim/devel .cvsignore, 1.9, 1.10 exim.spec, 1.18, 1.19 sources, 1.9, 1.10 exim-4.61-c-before-d.patch, 1.1, NONE Message-ID: <200605021053.k42Arvlg030946@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30925 Modified Files: .cvsignore exim.spec sources Removed Files: exim-4.61-c-before-d.patch Log Message: update to 4.62 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 4 Apr 2006 20:03:39 -0000 1.9 +++ .cvsignore 2 May 2006 10:53:54 -0000 1.10 @@ -1,2 +1,2 @@ sa-exim-4.2.tar.gz -exim-4.61.tar.bz2 +exim-4.62.tar.bz2 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- exim.spec 7 Apr 2006 15:05:18 -0000 1.18 +++ exim.spec 2 May 2006 10:53:54 -0000 1.19 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.61 -Release: 2%{?dist} +Version: 4.62 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,7 +25,6 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch -Patch16: exim-4.61-c-before-d.patch Patch17: exim-4.61-ldap-deprecated.patch Requires: /etc/aliases @@ -81,7 +80,6 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre -%patch16 -p0 %patch17 -p1 -b .ldap %build @@ -291,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Fri Apr 7 2006 David Woodhouse 4.61-2 - Define LDAP_DEPRECATED to ensure ldap functions are all declared. Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 4 Apr 2006 20:03:39 -0000 1.9 +++ sources 2 May 2006 10:53:54 -0000 1.10 @@ -1,2 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -f6bbf99a6f63c0f5045a1779e7e810c4 exim-4.61.tar.bz2 +a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 --- exim-4.61-c-before-d.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 10:55:18 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 2 May 2006 03:55:18 -0700 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.8, 1.9 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200605021055.k42AtK1i031013@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30992 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkwave.spec 7 Mar 2006 13:26:07 -0000 1.8 +++ gtkwave.spec 2 May 2006 10:55:18 -0000 1.9 @@ -1,30 +1,28 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.86 +Version: 3.0.0 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog simulation tools, as well as LXT files produced by certain Verilog simulation tools. -This package includes support for reading .ghw files as produced by ghdl. - %prep %setup -q -n gtkwave-%{version} # Honour %{optflags} and use system zlib/bzip2 library -%{__perl} -pi -e 's/^CFLAGS = -O2/CFLAGS = %{optflags}/;' \ +%{__perl} -pi -e 's/^C(FLAGS|OPT) ?= ?-O2/C\1 = %{optflags}/;' \ -e 's at -I\.\.?/libz -I\.\.?/libbz2@@;' \ - -e 's@(\.\./)?libz/libz\.a at -lz@;' \ - -e 's@(\.\./)?libbz2/libbz2\.a at -lbz2@;' \ + -e 's@(\.\./(\.\./src/)?)?libz/libz\.a at -lz@;' \ + -e 's@(\.\./(\.\./src/)?)?libbz2/libbz2\.a at -lbz2@;' \ -e 's@^([a-z0-9]+:.*) -lz( -lbz2)?@\1@;' \ - src/Makefile*.in src/*/Makefile*.in + src/Makefile*.in src/*/Makefile*.in contrib/*/Makefile*.in %{__rm} -rf src/lib{z,bz2} # Fix file permissions for sane debuginfo package @@ -35,13 +33,11 @@ # to view) and cannot be opened in a "no file" mode from a menu. %build -# This is not an autotools-generated config script, and does not accept --libdir etc. -echo 2 | ./configure +echo 2 | ./configure --libdir=%{_libdir} %{__make} %install %{__rm} -rf %{buildroot} -%{__install} -m 755 -d %{buildroot}%{_mandir}/man1 %{__make} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} \ @@ -53,17 +49,19 @@ %files %defattr(-,root,root,0755) -%doc doc/* *.TXT gtkwaverc.sample +%doc doc/* *.TXT gtkwaverc.sample examples/ %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd %{_bindir}/mvl2lxt %{_bindir}/mvl2vcd +%{_bindir}/rtlbrowse %{_bindir}/tex2vcd %{_bindir}/tla2vcd %{_bindir}/vcd2lxt %{_bindir}/vcd2lxt2 %{_bindir}/vcd2vzt +%{_bindir}/vertex %{_bindir}/vzt2vcd %{_bindir}/vztminer %{_mandir}/man1/gtkwave.1* @@ -71,15 +69,28 @@ %{_mandir}/man1/lxt2vcd.1* %{_mandir}/man1/mvl2lxt.1* %{_mandir}/man1/mvl2vcd.1* +%{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/tex2vcd.1* %{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/vcd2lxt.1* %{_mandir}/man1/vcd2lxt2.1* %{_mandir}/man1/vcd2vzt.1* +%{_mandir}/man1/vertex.1* %{_mandir}/man1/vzt2vcd.1* %{_mandir}/man1/vztminer.1* +%{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 2 2006 Paul Howarth 3.0.0-1 +- update to 3.0.0 +- add examples directory as %%doc +- add new buildreq gperf +- tweak Makefile.in edits to handle Makefiles under contrib/ +- add new binaries rtlbrowse and vertex +- add new manpages for rtlbrowse, vertex, and gtkwaverc +- %%{_mandir} no longer needs to be created manually +- configure script now accepts --libdir + * Tue Mar 7 2006 Paul Howarth 1.3.86-1 - update to 1.3.86 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 13:26:07 -0000 1.9 +++ sources 2 May 2006 10:55:18 -0000 1.10 @@ -1 +1 @@ -8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz +1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 13:26:07 -0000 1.9 +++ .cvsignore 2 May 2006 10:55:18 -0000 1.10 @@ -1 +1 @@ -gtkwave-1.3.86.tgz +gtkwave-3.0.0.tgz From fedora-extras-commits at redhat.com Tue May 2 10:58:19 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 2 May 2006 03:58:19 -0700 Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.9, 1.10 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200605021058.k42AwLNT031061@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31040 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkwave.spec 7 Mar 2006 13:22:54 -0000 1.9 +++ gtkwave.spec 2 May 2006 10:58:19 -0000 1.10 @@ -1,30 +1,28 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.86 +Version: 3.0.0 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog simulation tools, as well as LXT files produced by certain Verilog simulation tools. -This package includes support for reading .ghw files as produced by ghdl. - %prep %setup -q -n gtkwave-%{version} # Honour %{optflags} and use system zlib/bzip2 library -%{__perl} -pi -e 's/^CFLAGS = -O2/CFLAGS = %{optflags}/;' \ +%{__perl} -pi -e 's/^C(FLAGS|OPT) ?= ?-O2/C\1 = %{optflags}/;' \ -e 's at -I\.\.?/libz -I\.\.?/libbz2@@;' \ - -e 's@(\.\./)?libz/libz\.a at -lz@;' \ - -e 's@(\.\./)?libbz2/libbz2\.a at -lbz2@;' \ + -e 's@(\.\./(\.\./src/)?)?libz/libz\.a at -lz@;' \ + -e 's@(\.\./(\.\./src/)?)?libbz2/libbz2\.a at -lbz2@;' \ -e 's@^([a-z0-9]+:.*) -lz( -lbz2)?@\1@;' \ - src/Makefile*.in src/*/Makefile*.in + src/Makefile*.in src/*/Makefile*.in contrib/*/Makefile*.in %{__rm} -rf src/lib{z,bz2} # Fix file permissions for sane debuginfo package @@ -35,13 +33,11 @@ # to view) and cannot be opened in a "no file" mode from a menu. %build -# This is not an autotools-generated config script, and does not accept --libdir etc. -echo 2 | ./configure +echo 2 | ./configure --libdir=%{_libdir} %{__make} %install %{__rm} -rf %{buildroot} -%{__install} -m 755 -d %{buildroot}%{_mandir}/man1 %{__make} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} \ @@ -53,17 +49,19 @@ %files %defattr(-,root,root,0755) -%doc doc/* *.TXT gtkwaverc.sample +%doc doc/* *.TXT gtkwaverc.sample examples/ %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd %{_bindir}/mvl2lxt %{_bindir}/mvl2vcd +%{_bindir}/rtlbrowse %{_bindir}/tex2vcd %{_bindir}/tla2vcd %{_bindir}/vcd2lxt %{_bindir}/vcd2lxt2 %{_bindir}/vcd2vzt +%{_bindir}/vertex %{_bindir}/vzt2vcd %{_bindir}/vztminer %{_mandir}/man1/gtkwave.1* @@ -71,15 +69,28 @@ %{_mandir}/man1/lxt2vcd.1* %{_mandir}/man1/mvl2lxt.1* %{_mandir}/man1/mvl2vcd.1* +%{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/tex2vcd.1* %{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/vcd2lxt.1* %{_mandir}/man1/vcd2lxt2.1* %{_mandir}/man1/vcd2vzt.1* +%{_mandir}/man1/vertex.1* %{_mandir}/man1/vzt2vcd.1* %{_mandir}/man1/vztminer.1* +%{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 2 2006 Paul Howarth 3.0.0-1 +- update to 3.0.0 +- add examples directory as %%doc +- add new buildreq gperf +- tweak Makefile.in edits to handle Makefiles under contrib/ +- add new binaries rtlbrowse and vertex +- add new manpages for rtlbrowse, vertex, and gtkwaverc +- %%{_mandir} no longer needs to be created manually +- configure script now accepts --libdir + * Tue Mar 7 2006 Paul Howarth 1.3.86-1 - update to 1.3.86 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 13:22:54 -0000 1.9 +++ sources 2 May 2006 10:58:19 -0000 1.10 @@ -1 +1 @@ -8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz +1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 13:22:54 -0000 1.9 +++ .cvsignore 2 May 2006 10:58:19 -0000 1.10 @@ -1 +1 @@ -gtkwave-1.3.86.tgz +gtkwave-3.0.0.tgz From fedora-extras-commits at redhat.com Tue May 2 11:12:09 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:12:09 -0700 Subject: rpms/exim/FC-5 exim.spec,1.18,1.19 sources,1.9,1.10 Message-ID: <200605021112.k42BCBAS001417@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1398 Modified Files: exim.spec sources Log Message: Update to 4.62 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- exim.spec 7 Apr 2006 15:04:50 -0000 1.18 +++ exim.spec 2 May 2006 11:12:08 -0000 1.19 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.61 -Release: 2%{?dist} +Version: 4.62 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,7 +25,6 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch -Patch16: exim-4.61-c-before-d.patch Patch17: exim-4.61-ldap-deprecated.patch Requires: /etc/aliases @@ -81,7 +80,6 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre -%patch16 -p0 %patch17 -p1 -b .ldap %build @@ -291,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Fri Apr 7 2006 David Woodhouse 4.61-2 - Define LDAP_DEPRECATED to ensure ldap functions are all declared. Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 4 Apr 2006 20:05:57 -0000 1.9 +++ sources 2 May 2006 11:12:08 -0000 1.10 @@ -1,2 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -f6bbf99a6f63c0f5045a1779e7e810c4 exim-4.61.tar.bz2 +a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 11:27:47 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Tue, 2 May 2006 04:27:47 -0700 Subject: rpms/gajim/devel .cvsignore, 1.7, 1.8 gajim.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200605021127.k42BRn4J001487@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1464 Modified Files: .cvsignore gajim.spec sources Log Message: Update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Apr 2006 14:13:45 -0000 1.7 +++ .cvsignore 2 May 2006 11:27:46 -0000 1.8 @@ -1 +1 @@ -gajim-0.10-pre2.tar.bz2 +gajim-0.10.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gajim.spec 19 Apr 2006 14:13:45 -0000 1.11 +++ gajim.spec 2 May 2006 11:27:46 -0000 1.12 @@ -1,12 +1,12 @@ Name: gajim Version: 0.10 -Release: 0.1.pre2%{?dist} +Release: 1%{?dist} Summary: Jabber client written in PyGTK Group: Applications/Internet License: GPL URL: http://gajim.org/ -Source0: http://gajim.org/downloads/gajim-%{version}-pre2.tar.bz2 +Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -80,6 +80,9 @@ %{_mandir}/man1/gajim-remote.1* %changelog +* Tue May 2 2006 Dawid Gajownik - 0.10-1 +- Update to 0.10 + * Wed Apr 19 2006 Dawid Gajownik - 0.10-0.1.pre2 - Update to 0.10-pre2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Apr 2006 14:13:45 -0000 1.7 +++ sources 2 May 2006 11:27:46 -0000 1.8 @@ -1 +1 @@ -a452d0435e730a22d83393cb97ad96d3 gajim-0.10-pre2.tar.bz2 +0d568857ea25acf8366cff43d2317757 gajim-0.10.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 11:30:00 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:30:00 -0700 Subject: rpms/exim/devel exim.spec,1.19,1.20 Message-ID: <200605021130.k42BU2Ac001607@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1589 Modified Files: exim.spec Log Message: bump release Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- exim.spec 2 May 2006 10:53:54 -0000 1.19 +++ exim.spec 2 May 2006 11:30:00 -0000 1.20 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.62 -Release: 1%{?dist} +Release: 1.1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -289,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around 'make tag' error + * Tue May 2 2006 David Woodhouse 4.62-1 - Update to 4.62 From fedora-extras-commits at redhat.com Tue May 2 11:30:19 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:30:19 -0700 Subject: rpms/exim/devel exim.spec,1.20,1.21 Message-ID: <200605021130.k42BULtT001638@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1621 Modified Files: exim.spec Log Message: be consistent Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- exim.spec 2 May 2006 11:30:00 -0000 1.20 +++ exim.spec 2 May 2006 11:30:19 -0000 1.21 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.62 -Release: 1.1%{?dist} +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons From fedora-extras-commits at redhat.com Tue May 2 11:30:43 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:30:43 -0700 Subject: rpms/exim/FC-5 exim.spec,1.19,1.20 Message-ID: <200605021130.k42BUj8s001691@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1673 Modified Files: exim.spec Log Message: bump release Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- exim.spec 2 May 2006 11:12:08 -0000 1.19 +++ exim.spec 2 May 2006 11:30:43 -0000 1.20 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.62 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -289,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around 'make tag' error + * Tue May 2 2006 David Woodhouse 4.62-1 - Update to 4.62 From fedora-extras-commits at redhat.com Tue May 2 11:32:35 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:32:35 -0700 Subject: rpms/exim/FC-4 .cvsignore, 1.7, 1.8 exim.spec, 1.12, 1.13 sources, 1.8, 1.9 exim-4.61-c-before-d.patch, 1.1, NONE Message-ID: <200605021132.k42BWbak001769@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1748 Modified Files: .cvsignore exim.spec sources Removed Files: exim-4.61-c-before-d.patch Log Message: update to 4.62 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 4 Apr 2006 20:27:21 -0000 1.7 +++ .cvsignore 2 May 2006 11:32:35 -0000 1.8 @@ -1,2 +1,2 @@ sa-exim-4.2.tar.gz -exim-4.61.tar.bz2 +exim-4.62.tar.bz2 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- exim.spec 4 Apr 2006 20:27:21 -0000 1.12 +++ exim.spec 2 May 2006 11:32:35 -0000 1.13 @@ -1,6 +1,6 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.61 +Version: 4.62 Release: 1%{?dist} License: GPL Url: http://www.exim.org/ @@ -25,7 +25,6 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch -Patch16: exim-4.61-c-before-d.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel pam-devel @@ -79,7 +78,6 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre -%patch16 -p0 %build %ifnarch s390 s390x @@ -288,6 +286,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Tue Apr 4 2006 David Woodhouse 4.61-1 - Update to 4.61 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 Apr 2006 20:27:21 -0000 1.8 +++ sources 2 May 2006 11:32:35 -0000 1.9 @@ -1,2 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -f6bbf99a6f63c0f5045a1779e7e810c4 exim-4.61.tar.bz2 +a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 --- exim-4.61-c-before-d.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 11:32:53 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:32:53 -0700 Subject: rpms/exim/FC-5 exim-4.61-c-before-d.patch,1.1,NONE Message-ID: <200605021132.k42BWtac001789@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1774 Removed Files: exim-4.61-c-before-d.patch Log Message: remove 4.61 patch --- exim-4.61-c-before-d.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 11:34:24 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Tue, 2 May 2006 04:34:24 -0700 Subject: rpms/gajim/FC-5 .cvsignore, 1.5, 1.6 gajim.spec, 1.9, 1.10 sources, 1.5, 1.6 gajim-0.9.1.modularX.patch, 1.1, NONE gajim-0.9.1.notify_crash.patch, 1.1, NONE Message-ID: <200605021134.k42BYQxv001868@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843 Modified Files: .cvsignore gajim.spec sources Removed Files: gajim-0.9.1.modularX.patch gajim-0.9.1.notify_crash.patch Log Message: Update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Jan 2006 16:11:52 -0000 1.5 +++ .cvsignore 2 May 2006 11:34:24 -0000 1.6 @@ -1 +1 @@ -gajim-0.9.1.tar.bz2 +gajim-0.10.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-5/gajim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gajim.spec 30 Mar 2006 20:51:41 -0000 1.9 +++ gajim.spec 2 May 2006 11:34:24 -0000 1.10 @@ -1,14 +1,12 @@ Name: gajim -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Jabber client written in PyGTK Group: Applications/Internet License: GPL URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -Patch0: gajim-0.9.1.modularX.patch -Patch1: gajim-0.9.1.notify_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -21,6 +19,7 @@ BuildRequires: python-devel BuildRequires: gtkspell-devel +Requires: bind-utils Requires: dbus-python #Requires: gnome-python2-gconf Requires: pygtk2-libglade @@ -35,11 +34,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -# gajim wants to handle executables; why? -sed -i -e '/MimeType/d' gajim.desktop.in %build make \ @@ -85,6 +80,16 @@ %{_mandir}/man1/gajim-remote.1* %changelog +* Tue May 2 2006 Dawid Gajownik - 0.10-1 +- Update to 0.10 + +* Wed Apr 19 2006 Dawid Gajownik - 0.10-0.1.pre2 +- Update to 0.10-pre2 + +* Thu Apr 13 2006 Dawid Gajownik - 0.10-0.1.pre1 +- Update to 0.10-pre1 +- Drop patches + * Thu Mar 30 2006 Dawid Gajownik - 0.9.1-3 - Remove Gnome dependencies - Fix crash with notify-daemon (#187274, Stefan Plewako) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Jan 2006 16:11:53 -0000 1.5 +++ sources 2 May 2006 11:34:24 -0000 1.6 @@ -1 +1 @@ -ca82dfb7ab5c51984357ea7bab0e99af gajim-0.9.1.tar.bz2 +0d568857ea25acf8366cff43d2317757 gajim-0.10.tar.bz2 --- gajim-0.9.1.modularX.patch DELETED --- --- gajim-0.9.1.notify_crash.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 11:44:22 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:44:22 -0700 Subject: rpms/exim-doc/devel .cvsignore, 1.4, 1.5 exim-doc.spec, 1.3, 1.4 sources, 1.5, 1.6 Message-ID: <200605021144.k42BiO9Y001983@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1962 Modified Files: .cvsignore exim-doc.spec sources Log Message: update to 4.62 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Apr 2006 20:40:01 -0000 1.4 +++ .cvsignore 2 May 2006 11:44:22 -0000 1.5 @@ -1,6 +1,6 @@ FAQ-html-20050415.tar.bz2 config.samples-20050415.tar.bz2 -exim-html-4.61.tar.bz2 -exim-pdf-4.61.tar.bz2 -exim-postscript-4.61.tar.bz2 -exim-texinfo-4.61.tar.bz2 +exim-html-4.62.tar.bz2 +exim-pdf-4.62.tar.bz2 +exim-postscript-4.62.tar.bz2 +exim-texinfo-4.62.tar.bz2 Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/exim-doc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- exim-doc.spec 4 Apr 2006 20:40:01 -0000 1.3 +++ exim-doc.spec 2 May 2006 11:44:22 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc -Version: 4.61 +Version: 4.62 Release: 1%{?dist} License: GPL Url: http://www.exim.org/ @@ -45,6 +45,9 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Tue Apr 4 2006 David Woodhouse 4.61-1 - Update to 4.61 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Apr 2006 20:40:01 -0000 1.5 +++ sources 2 May 2006 11:44:22 -0000 1.6 @@ -1,6 +1,6 @@ ecceef7c8d1a352caf6c2992a6f4cb69 FAQ-html-20050415.tar.bz2 4b93321938a800caa6127c48ad60a42b config.samples-20050415.tar.bz2 -77d042dad6b4ebcb757ec2b02a7761f8 exim-html-4.61.tar.bz2 -5ac27708c9aef892f199e9b769d15300 exim-pdf-4.61.tar.bz2 -84dc0c3154a432bfea2afc59c46000ce exim-postscript-4.61.tar.bz2 -f86c26fda8871c72892b3ff586677310 exim-texinfo-4.61.tar.bz2 +638b2949c48f6ebe068430ccf1332a4e exim-html-4.62.tar.bz2 +84d042c6501350fb152f631074de9152 exim-pdf-4.62.tar.bz2 +c08a1e3fe996e596ec68c3793b5435f1 exim-postscript-4.62.tar.bz2 +f6b5e7441405e485a38c9f3d96336c3a exim-texinfo-4.62.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 11:49:49 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:49:49 -0700 Subject: rpms/exim-doc/devel exim-doc.spec,1.4,1.5 Message-ID: <200605021149.k42Bnpkd002130@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2113 Modified Files: exim-doc.spec Log Message: Gr. Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/exim-doc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-doc.spec 2 May 2006 11:44:22 -0000 1.4 +++ exim-doc.spec 2 May 2006 11:49:48 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc Version: 4.62 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: Documentation @@ -45,6 +45,11 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around the fact that 'make tag' _still_ doesn't + make sure that the common directory is up to date, just like it didn't + half an hour ago. + * Tue May 2 2006 David Woodhouse 4.62-1 - Update to 4.62 From fedora-extras-commits at redhat.com Tue May 2 12:06:59 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:06:59 -0700 Subject: rpms/mtd-utils - New directory Message-ID: <200605021207.k42C71DJ004447@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4426/mtd-utils Log Message: Directory /cvs/extras/rpms/mtd-utils added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:07:00 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:00 -0700 Subject: rpms/mtd-utils/devel - New directory Message-ID: <200605021207.k42C72nV004450@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4426/mtd-utils/devel Log Message: Directory /cvs/extras/rpms/mtd-utils/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:07:13 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:13 -0700 Subject: rpms/mtd-utils Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605021207.k42C7Fv7004495@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462 Added Files: Makefile import.log Log Message: Setup of module mtd-utils --- NEW FILE Makefile --- # Top level Makefile for module mtd-utils all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue May 2 12:07:14 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:14 -0700 Subject: rpms/mtd-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605021207.k42C7GAo004498@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mtd-utils --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue May 2 12:07:40 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:40 -0700 Subject: rpms/mtd-utils import.log,1.1,1.2 Message-ID: <200605021208.k42C8CC9004548@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4513 Modified Files: import.log Log Message: auto-import mtd-utils-1.0.0-1 on branch devel from mtd-utils-1.0.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 12:07:13 -0000 1.1 +++ import.log 2 May 2006 12:07:40 -0000 1.2 @@ -0,0 +1 @@ +mtd-utils-1_0_0-1:HEAD:mtd-utils-1.0.0-1.src.rpm:1146571703 From fedora-extras-commits at redhat.com Tue May 2 12:07:41 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:41 -0700 Subject: rpms/mtd-utils/devel COPYING, NONE, 1.1 mtd-utils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605021208.k42C8DWq004552@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4513/devel Modified Files: .cvsignore sources Added Files: COPYING mtd-utils.spec Log Message: auto-import mtd-utils-1.0.0-1 on branch devel from mtd-utils-1.0.0-1.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) 19yy 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) 19yy 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 mtd-utils.spec --- Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 Release: 1 License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ Source0: ftp://ftp.infradead.org/pub/mtd-utils/%{name}-%{version}.tar.gz Source1: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel %description The mtd-utils package contains utilities related to handling MTD devices, and for dealing with FTL, NFTL JFFS2 etc. %prep %setup -q cp %{SOURCE1} . %build make CFLAGS="$RPM_OPT_FLAGS -I./include" %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} MANDIR=%{_mandir} install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_sbindir}/* %{_mandir}/*/* %doc COPYING device_table.txt %changelog * Sun Apr 30 2006 David Woodhouse - 1.0.0-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 12:07:14 -0000 1.1 +++ .cvsignore 2 May 2006 12:07:41 -0000 1.2 @@ -0,0 +1 @@ +mtd-utils-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 12:07:14 -0000 1.1 +++ sources 2 May 2006 12:07:41 -0000 1.2 @@ -0,0 +1 @@ +442bdbdb024db27dc9c89207fac16f95 mtd-utils-1.0.0.tar.gz From fedora-extras-commits at redhat.com Tue May 2 12:11:22 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:11:22 -0700 Subject: rpms/mtd-utils/devel mtd-utils.spec,1.1,1.2 Message-ID: <200605021211.k42CBOJH004604@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4587 Modified Files: mtd-utils.spec Log Message: Oops. Forgot to bump release before import Index: mtd-utils.spec =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/devel/mtd-utils.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mtd-utils.spec 2 May 2006 12:07:41 -0000 1.1 +++ mtd-utils.spec 2 May 2006 12:11:22 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 -Release: 1 +Release: 2 License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ @@ -37,6 +37,10 @@ %changelog +* Tue May 2 2006 David Woodhouse - 1.0.0-2 +- Fixes from review (include COPYING), BR zlib-devel +- Include device_table.txt + * Sun Apr 30 2006 David Woodhouse - 1.0.0-1 - Initial build. From fedora-extras-commits at redhat.com Tue May 2 12:15:55 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:15:55 -0700 Subject: rpms/exim-doc/FC-5 .cvsignore, 1.4, 1.5 exim-doc.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200605021215.k42CFvLY004668@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4647 Modified Files: .cvsignore exim-doc.spec sources Log Message: 4.62-2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Apr 2006 20:38:45 -0000 1.4 +++ .cvsignore 2 May 2006 12:15:55 -0000 1.5 @@ -1,6 +1,6 @@ FAQ-html-20050415.tar.bz2 config.samples-20050415.tar.bz2 -exim-html-4.61.tar.bz2 -exim-pdf-4.61.tar.bz2 -exim-postscript-4.61.tar.bz2 -exim-texinfo-4.61.tar.bz2 +exim-html-4.62.tar.bz2 +exim-pdf-4.62.tar.bz2 +exim-postscript-4.62.tar.bz2 +exim-texinfo-4.62.tar.bz2 Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-5/exim-doc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-doc.spec 4 Apr 2006 20:39:10 -0000 1.4 +++ exim-doc.spec 2 May 2006 12:15:55 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc -Version: 4.61 -Release: 1%{?dist} +Version: 4.62 +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: Documentation @@ -45,6 +45,14 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around the fact that 'make tag' _still_ doesn't + make sure that the common directory is up to date, just like it didn't + half an hour ago. + +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Tue Apr 4 2006 David Woodhouse 4.61-1 - Update to 4.61 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Apr 2006 20:38:45 -0000 1.5 +++ sources 2 May 2006 12:15:55 -0000 1.6 @@ -1,6 +1,6 @@ ecceef7c8d1a352caf6c2992a6f4cb69 FAQ-html-20050415.tar.bz2 4b93321938a800caa6127c48ad60a42b config.samples-20050415.tar.bz2 -77d042dad6b4ebcb757ec2b02a7761f8 exim-html-4.61.tar.bz2 -5ac27708c9aef892f199e9b769d15300 exim-pdf-4.61.tar.bz2 -84dc0c3154a432bfea2afc59c46000ce exim-postscript-4.61.tar.bz2 -f86c26fda8871c72892b3ff586677310 exim-texinfo-4.61.tar.bz2 +638b2949c48f6ebe068430ccf1332a4e exim-html-4.62.tar.bz2 +84d042c6501350fb152f631074de9152 exim-pdf-4.62.tar.bz2 +c08a1e3fe996e596ec68c3793b5435f1 exim-postscript-4.62.tar.bz2 +f6b5e7441405e485a38c9f3d96336c3a exim-texinfo-4.62.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 12:16:16 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:16:16 -0700 Subject: rpms/exim-doc/FC-4 .cvsignore, 1.3, 1.4 exim-doc.spec, 1.2, 1.3 sources, 1.4, 1.5 Message-ID: <200605021216.k42CGIJ4004726@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4705 Modified Files: .cvsignore exim-doc.spec sources Log Message: 4.62-2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Apr 2006 20:40:15 -0000 1.3 +++ .cvsignore 2 May 2006 12:16:15 -0000 1.4 @@ -1,6 +1,6 @@ FAQ-html-20050415.tar.bz2 config.samples-20050415.tar.bz2 -exim-html-4.61.tar.bz2 -exim-pdf-4.61.tar.bz2 -exim-postscript-4.61.tar.bz2 -exim-texinfo-4.61.tar.bz2 +exim-html-4.62.tar.bz2 +exim-pdf-4.62.tar.bz2 +exim-postscript-4.62.tar.bz2 +exim-texinfo-4.62.tar.bz2 Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-4/exim-doc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- exim-doc.spec 4 Apr 2006 20:40:15 -0000 1.2 +++ exim-doc.spec 2 May 2006 12:16:15 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc -Version: 4.61 -Release: 1%{?dist} +Version: 4.62 +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: Documentation @@ -45,6 +45,14 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around the fact that 'make tag' _still_ doesn't + make sure that the common directory is up to date, just like it didn't + half an hour ago. + +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Tue Apr 4 2006 David Woodhouse 4.61-1 - Update to 4.61 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Apr 2006 20:40:15 -0000 1.4 +++ sources 2 May 2006 12:16:15 -0000 1.5 @@ -1,6 +1,6 @@ ecceef7c8d1a352caf6c2992a6f4cb69 FAQ-html-20050415.tar.bz2 4b93321938a800caa6127c48ad60a42b config.samples-20050415.tar.bz2 -77d042dad6b4ebcb757ec2b02a7761f8 exim-html-4.61.tar.bz2 -5ac27708c9aef892f199e9b769d15300 exim-pdf-4.61.tar.bz2 -84dc0c3154a432bfea2afc59c46000ce exim-postscript-4.61.tar.bz2 -f86c26fda8871c72892b3ff586677310 exim-texinfo-4.61.tar.bz2 +638b2949c48f6ebe068430ccf1332a4e exim-html-4.62.tar.bz2 +84d042c6501350fb152f631074de9152 exim-pdf-4.62.tar.bz2 +c08a1e3fe996e596ec68c3793b5435f1 exim-postscript-4.62.tar.bz2 +f6b5e7441405e485a38c9f3d96336c3a exim-texinfo-4.62.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 12:37:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:37:15 -0700 Subject: rpms/perl-PPI - New directory Message-ID: <200605021237.k42CbHSD004946@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4925/perl-PPI Log Message: Directory /cvs/extras/rpms/perl-PPI added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:37:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:37:16 -0700 Subject: rpms/perl-PPI/devel - New directory Message-ID: <200605021237.k42CbIc2004949@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4925/perl-PPI/devel Log Message: Directory /cvs/extras/rpms/perl-PPI/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:37:36 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:37:36 -0700 Subject: rpms/perl-PPI Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605021237.k42CbcPr005005@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4972 Added Files: Makefile import.log Log Message: Setup of module perl-PPI --- NEW FILE Makefile --- # Top level Makefile for module perl-PPI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 12:37:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:37:37 -0700 Subject: rpms/perl-PPI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605021237.k42CbdMx005008@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4972/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-PPI --- NEW 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 May 2 12:38:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:38:07 -0700 Subject: rpms/perl-PPI import.log,1.1,1.2 Message-ID: <200605021238.k42Cc9VD005073@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040 Modified Files: import.log Log Message: auto-import perl-PPI-1.112-1 on branch devel from perl-PPI-1.112-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 12:37:36 -0000 1.1 +++ import.log 2 May 2006 12:38:07 -0000 1.2 @@ -0,0 +1 @@ +perl-PPI-1_112-1:HEAD:perl-PPI-1.112-1.src.rpm:1146573478 From fedora-extras-commits at redhat.com Tue May 2 12:38:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:38:07 -0700 Subject: rpms/perl-PPI/devel perl-PPI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605021238.k42Cc94X005078@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/devel Modified Files: .cvsignore sources Added Files: perl-PPI.spec Log Message: auto-import perl-PPI-1.112-1 on branch devel from perl-PPI-1.112-1.src.rpm --- NEW FILE perl-PPI.spec --- Name: perl-PPI Version: 1.112 Release: 1%{?dist} Summary: Parse, Analyze and Manipulate Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/PPI/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Perl core modules BuildRequires: perl(List::Util) >= 1.17 BuildRequires: perl(Storable) >= 2.14 # CPAN modules BuildRequires: perl(Clone) >= 0.17 BuildRequires: perl(IO::Scalar) >= 2.105 BuildRequires: perl(File::Remove) >= 0.22 BuildRequires: perl(List::MoreUtils) >= 0.13 BuildRequires: perl(Params::Util) >= 0.10 BuildRequires: perl(Test::ClassAPI) >= 1.02 BuildRequires: perl(Test::SubCalls) >= 0.01 BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Parse, Analyze and Manipulate Perl (without perl). %prep %setup -q -n PPI-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README inline2test.conf inline2test.tpl %{perl_vendorlib}/PPI* %{_mandir}/man3/*.3pm* %changelog * Tue Apr 25 2006 Jose Pedro Oliveira - 1.112-1 - Update to 1.112. * Sat Apr 22 2006 Jose Pedro Oliveira - 1.111-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 12:37:37 -0000 1.1 +++ .cvsignore 2 May 2006 12:38:07 -0000 1.2 @@ -0,0 +1 @@ +PPI-1.112.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 12:37:37 -0000 1.1 +++ sources 2 May 2006 12:38:07 -0000 1.2 @@ -0,0 +1 @@ +a629d953e0002813061c4308c64993f6 PPI-1.112.tar.gz From fedora-extras-commits at redhat.com Tue May 2 12:39:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:39:21 -0700 Subject: rpms/perl-File-Find-Rule-PPI/devel - New directory Message-ID: <200605021239.k42CdNcO005184@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5153/perl-File-Find-Rule-PPI/devel Log Message: Directory /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:39:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:39:21 -0700 Subject: rpms/perl-File-Find-Rule-PPI - New directory Message-ID: <200605021239.k42CdNiH005179@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5153/perl-File-Find-Rule-PPI Log Message: Directory /cvs/extras/rpms/perl-File-Find-Rule-PPI added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:39:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:39:37 -0700 Subject: rpms/perl-File-Find-Rule-PPI Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605021239.k42Cddfx005240@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5207 Added Files: Makefile import.log Log Message: Setup of module perl-File-Find-Rule-PPI --- NEW FILE Makefile --- # Top level Makefile for module perl-File-Find-Rule-PPI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 12:39:38 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:39:38 -0700 Subject: rpms/perl-File-Find-Rule-PPI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605021239.k42CdePO005243@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5207/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-File-Find-Rule-PPI --- NEW 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 May 2 12:40:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:40:12 -0700 Subject: rpms/perl-File-Find-Rule-PPI import.log,1.1,1.2 Message-ID: <200605021240.k42CeEuo005304@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5271 Modified Files: import.log Log Message: auto-import perl-File-Find-Rule-PPI-0.03-1 on branch devel from perl-File-Find-Rule-PPI-0.03-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule-PPI/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 12:39:37 -0000 1.1 +++ import.log 2 May 2006 12:40:12 -0000 1.2 @@ -0,0 +1 @@ +perl-File-Find-Rule-PPI-0_03-1:HEAD:perl-File-Find-Rule-PPI-0.03-1.src.rpm:1146573603 From fedora-extras-commits at redhat.com Tue May 2 12:40:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:40:12 -0700 Subject: rpms/perl-File-Find-Rule-PPI/devel perl-File-Find-Rule-PPI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605021240.k42CeF8m005309@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5271/devel Modified Files: .cvsignore sources Added Files: perl-File-Find-Rule-PPI.spec Log Message: auto-import perl-File-Find-Rule-PPI-0.03-1 on branch devel from perl-File-Find-Rule-PPI-0.03-1.src.rpm --- NEW FILE perl-File-Find-Rule-PPI.spec --- Name: perl-File-Find-Rule-PPI Version: 0.03 Release: 1%{?dist} Summary: Add support for PPI queries to File::Find::Rule Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/File-Find-Rule-PPI/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/File-Find-Rule-PPI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(File::Find::Rule) >= 0.20 BuildRequires: perl(Params::Util) >= 0.10 BuildRequires: perl(PPI) >= 1.000 BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description File::Find::Rule::PPI allows you to integrate PPI content queries into your File::Find::Rule searches. %prep %setup -q -n File-Find-Rule-PPI-%{version} %{__sed} -i 's|\r||' Changes %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README %{perl_vendorlib}/File/ %{_mandir}/man3/*.3pm* %changelog * Tue Apr 25 2006 Jose Pedro Oliveira - 0.03-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 12:39:38 -0000 1.1 +++ .cvsignore 2 May 2006 12:40:12 -0000 1.2 @@ -0,0 +1 @@ +File-Find-Rule-PPI-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 12:39:38 -0000 1.1 +++ sources 2 May 2006 12:40:12 -0000 1.2 @@ -0,0 +1 @@ +a63dfd3b079258f4766b6445c1614b0f File-Find-Rule-PPI-0.03.tar.gz From fedora-extras-commits at redhat.com Tue May 2 12:40:27 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:40:27 -0700 Subject: owners owners.list,1.933,1.934 Message-ID: <200605021240.k42CeTKX005354@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5206 Modified Files: owners.list Log Message: New packages: - #190310 : perl-File-Find-Rule-PPI - Add support for PPI queries to File::Find::Rule - #190308 : perl-PPI - Parse, Analyze and Manipulate Perl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.933 retrieving revision 1.934 diff -u -r1.933 -r1.934 --- owners.list 2 May 2006 01:18:44 -0000 1.933 +++ owners.list 2 May 2006 12:40:26 -0000 1.934 @@ -989,6 +989,7 @@ Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Fetch|A generic file fetching mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-Find-Rule-PPI|Add support for PPI queries to File::Find::Rule|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1118,6 +1119,7 @@ Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PBS|Perl binding for the Portable Batch System client library|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 13:16:19 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Tue, 2 May 2006 06:16:19 -0700 Subject: rpms/gjots2/devel .cvsignore, 1.2, 1.3 gjots2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605021316.k42DGLNe007748@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/gjots2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7727 Modified Files: .cvsignore gjots2.spec sources Log Message: - new menu icon (#190221) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gjots2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Apr 2006 05:58:56 -0000 1.2 +++ .cvsignore 2 May 2006 13:16:18 -0000 1.3 @@ -1 +1,2 @@ gjots2-2.3.4.tgz +gjots.png Index: gjots2.spec =================================================================== RCS file: /cvs/extras/rpms/gjots2/devel/gjots2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gjots2.spec 3 Apr 2006 05:58:56 -0000 1.1 +++ gjots2.spec 2 May 2006 13:16:18 -0000 1.2 @@ -19,7 +19,7 @@ # MA 02111-1307, USA. %define ver 2.3.4 -%define rel 4 +%define rel 5 Summary: A note jotter - Organise your ideas, notes, facts in a hierarchy Name: gjots2 @@ -27,6 +27,7 @@ Release: %{rel}%{?dist} URL: http://bhepple.freeshell.org/gjots Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz +Source1: gjots.png Patch0: gjots2-2.3.4-sitelib.patch License: GPL Group: Applications/Productivity @@ -83,8 +84,8 @@ %{__install} -m0755 bin/gjots2 bin/gjots2docbook bin/gjots2html bin/docbook2gjots %{buildroot}%{_bindir}/ %{__install} -m0644 lib/*.py %{buildroot}%{python_sitelib}/%{name}/ %{__install} -m0644 gjots.glade2 %{buildroot}%{_datadir}/%{name} -%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/%{name} -%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/pixmaps/ +%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name} +%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/ %{__install} -m0644 gjots2-hide-all.png %{buildroot}%{_datadir}/%{name} %{__install} -m0644 gjots2-merge-items.png %{buildroot}%{_datadir}/%{name} %{__install} -m0644 gjots2-new-child.png %{buildroot}%{_datadir}/%{name} @@ -130,6 +131,9 @@ %{_mandir}/man1/docbook2gjots* %changelog +* Tue May 02 2006 Radek Vok??l 2.3.4-5 +- new menu icon (#190221) + * Thu Mar 30 2006 Radek Vok??l 2.3.4-4 - BuildRequires: desktop-file-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/gjots2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Apr 2006 05:58:56 -0000 1.2 +++ sources 2 May 2006 13:16:18 -0000 1.3 @@ -1 +1,2 @@ ae05d1ea976de08dd9fc80faa04c558f gjots2-2.3.4.tgz +4ae5dfb2ae559470c06739f7e310e233 gjots.png From fedora-extras-commits at redhat.com Tue May 2 13:47:10 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:47:10 -0700 Subject: rpms/PyX - New directory Message-ID: <200605021347.k42DlCrQ008058@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8032/PyX Log Message: Directory /cvs/extras/rpms/PyX added to the repository From fedora-extras-commits at redhat.com Tue May 2 13:47:11 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:47:11 -0700 Subject: rpms/PyX/devel - New directory Message-ID: <200605021347.k42DlDki008061@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8032/PyX/devel Log Message: Directory /cvs/extras/rpms/PyX/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 13:47:51 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:47:51 -0700 Subject: rpms/PyX Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605021347.k42DlrT7008110@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8077 Added Files: Makefile import.log Log Message: Setup of module PyX --- NEW FILE Makefile --- # Top level Makefile for module PyX all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 13:47:52 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:47:52 -0700 Subject: rpms/PyX/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605021347.k42DlsXo008113@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8077/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module PyX --- NEW 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 May 2 13:49:33 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:49:33 -0700 Subject: rpms/PyX/devel PyX-0.8.1-siteconfig.patch, NONE, 1.1 PyX.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605021349.k42DnZ3O008191@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150/devel Modified Files: .cvsignore sources Added Files: PyX-0.8.1-siteconfig.patch PyX.spec Log Message: auto-import PyX-0.8.1-4 on branch devel from PyX-0.8.1-4.src.rpm PyX-0.8.1-siteconfig.patch: --- NEW FILE PyX-0.8.1-siteconfig.patch --- diff -ur PyX-0.8.1/setup.py PyX-0.8.1-patched/setup.py --- PyX-0.8.1/setup.py 2005-08-13 05:32:46.000000000 -0700 +++ PyX-0.8.1-patched/setup.py 2006-04-29 02:49:37.000000000 -0700 @@ -15,8 +15,6 @@ log = None from distutils.core import setup, Extension from distutils.util import change_root, convert_path -from distutils.command.build_py import build_py -from distutils.command.install_data import install_data from distutils.command.install_lib import install_lib import ConfigParser import sys, os @@ -81,79 +79,21 @@ # extend install commands to overwrite siteconfig.py during build and install # - -class pyx_build_py(build_py): - - def build_module(self, module, module_file, package): - if package == "pyx" and module == "siteconfig": - # generate path information as the original build_module does it - outfile = self.get_module_outfile(self.build_lib, [package], module) - outdir = os.path.dirname(outfile) - self.mkpath(outdir) - - if log: - log.info("creating proper %s" % outfile) - - # create the additional relative path parts to be inserted into the - # os.path.join methods in the original siteconfig.py - indir = os.path.dirname(module_file) - addjoinstring = ", ".join(["'..'" for d in outdir.split(os.path.sep)] + - ["'%s'" % d for d in indir.split(os.path.sep)]) - - # write a modifed version of siteconfig.py - fin = open(module_file, "r") - fout = open(outfile, "w") - for line in fin.readlines(): - fout.write(line.replace("os.path.join(os.path.dirname(__file__), ", - "os.path.join(os.path.dirname(__file__), %s, " % addjoinstring)) - fin.close() - fout.close() - else: - return build_py.build_module(self, module, module_file, package) - - -class pyx_install_data(install_data): - - def run(self): - self.siteconfiglines = [] - for dir, files in self.data_files: - # append siteconfiglines by " = " - - # get the install directory - # (the following four lines are copied from within the install_data.run loop) - dir = convert_path(dir) - if not os.path.isabs(dir): - dir = os.path.join(self.install_dir, dir) - elif self.root: - dir = change_root(self.root, dir) - - self.siteconfiglines.append("%s = '%s'\n" % (siteconfignames[files], dir)) - - install_data.run(self) - - class pyx_install_lib(install_lib): - def run(self): - # siteconfig.py depends on install_data: - self.run_command('install_data') - install_lib.run(self) - def install(self): - # first we perform the tree_copy result = install_lib.install(self) - - # siteconfiglines have been created by install_data - siteconfiglines = self.distribution.command_obj["install_data"].siteconfiglines - - # such that we can easily overwrite siteconfig.py + root = self.get_finalized_command('install').root + if root == None: + root = '' + pyx_lfsdir = pyx_sharedir = os.path.join(sys.prefix, "share", "pyx") + pyx_pyxrc = os.path.join("/", "etc", "pyxrc") outfile = os.path.join(self.install_dir, "pyx", "siteconfig.py") - if log: - log.info("creating proper %s" % outfile) f = open(outfile, "w") - f.writelines(siteconfiglines) + f.write("lfsdir = %r\n" % pyx_lfsdir) + f.write("sharedir = %r\n" % pyx_sharedir) + f.write("pyxrcdir = %r\n" % pyx_pyxrc) f.close() - return result ################################################################################ @@ -193,7 +133,5 @@ packages=["pyx", "pyx/graph", "pyx/graph/axis", "pyx/t1strip", "pyx/pykpathsea"], ext_modules=ext_modules, data_files=data_files, - cmdclass = {"build_py": pyx_build_py, - "install_data": pyx_install_data, - "install_lib": pyx_install_lib}, + cmdclass = {"install_lib": pyx_install_lib}, **addargs) --- NEW FILE PyX.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyX Version: 0.8.1 Release: 4%{?dist} Summary: Python graphics package Group: Applications/Publishing License: GPL URL: http://pyx.sourceforge.net/ Source0: http://easynews.dl.sourceforge.net/sourceforge/pyx/PyX-%{version}.tar.gz # Fedora doesn't seem to ship with the python mkhowto script needed to generate # the manual at build time. The manual here is from: # http://pyx.sourceforge.net/manual.pdf Source1: %{name}-%{version}-manual.pdf # Fix the install root in the siteconfig.py Patch0: PyX-0.8.1-siteconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2 BuildRequires: tetex-latex Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: tetex %description PyX is a Python package for the creation of PostScript and PDF files. It combines an abstraction of the PostScript drawing model with a TeX/LaTeX interface. Complex tasks like 2d and 3d plots in publication-ready quality are built out of these primitives. %prep %setup -q %patch0 -p1 %build %{__sed} -i 's?^build_t1strip=.*?build_t1strip=1?' setup.cfg # Bug #150085 excludes x86_64 - don't enable pykpathsea C module for x86_64 %ifnarch x86_64 %{__sed} -i 's?^build_pykpathsea=.*?build_pykpathsea=1?' setup.cfg %endif CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build # turn on ipc in config file %{__sed} -i 's?^texipc =.*?texipc = 1?' pyxrc pushd faq make popd pushd manual ## Nope - fedora doesn't ship with mkhowto ## Bug #177349 # ln -s /path/to/python/mkhowto . # make cp %{SOURCE1} ./manual.pdf popd %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} # Fix the non-exec with shellbang rpmlint errors for file in `find %{buildroot}%{python_sitearch}/pyx -type f -name "*.py"`; do [ ! -x ${file} ] && %{__sed} -i 's?^#!?##?' ${file} done %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE PKG-INFO README faq/pyxfaq.pdf manual/manual.pdf %doc contrib/ examples/ %config(noreplace) %{_sysconfdir}/pyxrc %{_datadir}/pyx/ %dir %{python_sitearch}/pyx %{python_sitearch}/pyx/*.py %{python_sitearch}/pyx/*.pyc %ghost %{python_sitearch}/pyx/*.pyo %dir %{python_sitearch}/pyx/graph %{python_sitearch}/pyx/graph/*.py %{python_sitearch}/pyx/graph/*.pyc %ghost %{python_sitearch}/pyx/graph/*.pyo %dir %{python_sitearch}/pyx/graph/axis %{python_sitearch}/pyx/graph/axis/*.py %{python_sitearch}/pyx/graph/axis/*.pyc %ghost %{python_sitearch}/pyx/graph/axis/*.pyo %dir %{python_sitearch}/pyx/pykpathsea %{python_sitearch}/pyx/pykpathsea/*.py %{python_sitearch}/pyx/pykpathsea/*.pyc %ghost %{python_sitearch}/pyx/pykpathsea/*.pyo %ifnarch x86_64 %{python_sitearch}/pyx/pykpathsea/*.so %endif %dir %{python_sitearch}/pyx/t1strip %{python_sitearch}/pyx/t1strip/*.py %{python_sitearch}/pyx/t1strip/*.pyc %ghost %{python_sitearch}/pyx/t1strip/*.pyo %{python_sitearch}/pyx/t1strip/*.so %changelog * Sun Apr 30 2006 Michael A. Peters - 0.8.1-4 - Fixed rpmlint errors noted in 190247#3 - Don't build pykpathsea C module for x86_64 (Bug #150085) * Sat Apr 29 2006 Michael A. Peters - 0.8.1-3 - Fixed a typo in the borrowed SuSE patch * Sat Apr 29 2006 Michael A. Peters - 0.8.1-2 - Fix improper siteconfig.py (Patch0, borrowed from SuSE) - alter default config file (turn texipc on) - BuildRequires python-devel >= 2.2 * Sat Apr 29 2006 Michael A. Peters - 0.8.1-1 - Initial packaging for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/PyX/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 13:47:52 -0000 1.1 +++ .cvsignore 2 May 2006 13:49:32 -0000 1.2 @@ -0,0 +1,2 @@ +PyX-0.8.1-manual.pdf +PyX-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/PyX/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 13:47:52 -0000 1.1 +++ sources 2 May 2006 13:49:32 -0000 1.2 @@ -0,0 +1,2 @@ +bfab7bbc4f3442c946f489133df515f0 PyX-0.8.1-manual.pdf +5e751cef8d62774a6fc659cc9a03c231 PyX-0.8.1.tar.gz From fedora-extras-commits at redhat.com Tue May 2 13:49:32 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:49:32 -0700 Subject: rpms/PyX import.log,1.1,1.2 Message-ID: <200605021349.k42DnYXr008184@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150 Modified Files: import.log Log Message: auto-import PyX-0.8.1-4 on branch devel from PyX-0.8.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/PyX/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 13:47:51 -0000 1.1 +++ import.log 2 May 2006 13:49:32 -0000 1.2 @@ -0,0 +1 @@ +PyX-0_8_1-4:HEAD:PyX-0.8.1-4.src.rpm:1146577752 From fedora-extras-commits at redhat.com Tue May 2 13:54:24 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:54:24 -0700 Subject: owners owners.list,1.934,1.935 Message-ID: <200605021354.k42DsQk6008310@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8291 Modified Files: owners.list Log Message: added PyX Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.934 retrieving revision 1.935 diff -u -r1.934 -r1.935 --- owners.list 2 May 2006 12:40:26 -0000 1.934 +++ owners.list 2 May 2006 13:54:24 -0000 1.935 @@ -1327,6 +1327,7 @@ 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|PyX|Python graphics package|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|pyzor|Pyzor collaborative spam filtering system|wtogami at redhat.com|extras-qa at fedoraproject.org| 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 Tue May 2 15:25:23 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:25:23 -0700 Subject: rpms/nagios/devel nagios.spec,1.10,1.11 Message-ID: <200605021525.k42FPP3B013196@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13167 Modified Files: nagios.spec Log Message: Added 2.2 tag for new upstream version. Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nagios.spec 21 Feb 2006 10:36:06 -0000 1.10 +++ nagios.spec 2 May 2006 15:25:23 -0000 1.11 @@ -1,5 +1,5 @@ Name: nagios -Version: 2.0 +Version: 2.2 Release: 1%{?dist} Summary: Host/service/network monitoring program @@ -76,9 +76,9 @@ %{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora %{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \ - -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora + -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora %{__sed} -e "s|resource.cfg|private/resource.cfg|" \ - -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora + -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora %{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg echo >> html/stylesheets/common.css @@ -86,7 +86,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config -%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name} +%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd %{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private @@ -145,7 +145,8 @@ %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample -%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives @@ -154,6 +155,28 @@ %{_includedir}/%{name} %changelog +* Tue May 02 2006 Mike McGrath imlinux at gmail.com> 2.2-1 +- Upstream released 2.2 +- Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd +- 2.2 -------------------------------------------------- +- Minor bug fix in availability CGI +- Bug fix with temporary file location used for retention data +- Fix for segfault that occurred in 2.1 during service flapping notifications +- 2.1 -------------------------------------------------- +- Changed freshness logic so that passive checks don't immediately go stale after program restart +- Bug fix for minor memory leak in object cleanup code +- Bug fix for flapping notifications during scheduled downtime +- Bug fix for $TOTALHOSTSDOWNUNHANDLED$ macro +- Bug fix in sample minimal.cfg file +- Bug fix in status CGI when displaying servicegroups +- Bug fixes in computation of indeterminate time and scheduled downtime in availability CGI +- Bug fix with not deleting all comments associated with a service +- Lowered max plugin output length from 348 to 332 chars to run on 64-bit systems without problems +- Minor fix to p1.pl for embedded Perl interpreter +- Minor fixes to WAP interface (statuswml CGI) +- Minor bug fix to VRML interface (statuswrl CGI) +- Minor doc updates + * Tue Feb 21 2006 Mike McGrath imlinux at gmail.com> 2.0-1 - Upstream released 2.0 (changes below) - Fix for segfault in timed event queue From fedora-extras-commits at redhat.com Tue May 2 15:27:22 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:27:22 -0700 Subject: rpms/nagios/devel .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200605021527.k42FRObC013290@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13271 Modified Files: .cvsignore sources Log Message: New source for Nagios 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Feb 2006 10:34:40 -0000 1.4 +++ .cvsignore 2 May 2006 15:27:22 -0000 1.5 @@ -1 +1 @@ -nagios-2.0.tar.gz +nagios-2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Feb 2006 10:34:40 -0000 1.4 +++ sources 2 May 2006 15:27:22 -0000 1.5 @@ -1 +1 @@ -2a30ccf68bdbebc9c6f5a06e9c09e757 nagios-2.0.tar.gz +38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz From fedora-extras-commits at redhat.com Tue May 2 15:28:03 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:28:03 -0700 Subject: rpms/nagios/devel nagios.spec,1.11,1.12 Message-ID: <200605021528.k42FS5Y3013318@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13301 Modified Files: nagios.spec Log Message: Minor change to email address in changelog - oops Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nagios.spec 2 May 2006 15:25:23 -0000 1.11 +++ nagios.spec 2 May 2006 15:28:03 -0000 1.12 @@ -155,7 +155,7 @@ %{_includedir}/%{name} %changelog -* Tue May 02 2006 Mike McGrath imlinux at gmail.com> 2.2-1 +* Tue May 02 2006 Mike McGrath 2.2-1 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd - 2.2 -------------------------------------------------- @@ -177,7 +177,7 @@ - Minor bug fix to VRML interface (statuswrl CGI) - Minor doc updates -* Tue Feb 21 2006 Mike McGrath imlinux at gmail.com> 2.0-1 +* Tue Feb 21 2006 Mike McGrath 2.0-1 - Upstream released 2.0 (changes below) - Fix for segfault in timed event queue - Removed length limitations for object vars/vals From fedora-extras-commits at redhat.com Tue May 2 15:30:36 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:30:36 -0700 Subject: rpms/nagios/devel nagios.spec,1.12,1.13 Message-ID: <200605021530.k42FUcCU013463@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13446 Modified Files: nagios.spec Log Message: Updated Nagios to release number 2 Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nagios.spec 2 May 2006 15:28:03 -0000 1.12 +++ nagios.spec 2 May 2006 15:30:35 -0000 1.13 @@ -1,6 +1,6 @@ Name: nagios Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -155,7 +155,7 @@ %{_includedir}/%{name} %changelog -* Tue May 02 2006 Mike McGrath 2.2-1 +* Tue May 02 2006 Mike McGrath 2.2-2 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd - 2.2 -------------------------------------------------- From fedora-extras-commits at redhat.com Tue May 2 15:32:28 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:32:28 -0700 Subject: rpms/nagios/devel nagios.spec,1.13,1.14 Message-ID: <200605021532.k42FWUpm013529@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13512 Modified Files: nagios.spec Log Message: Somethings changed and I missed it, I keep tetting tag errors. Trying again with a new tag. Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nagios.spec 2 May 2006 15:30:35 -0000 1.13 +++ nagios.spec 2 May 2006 15:32:28 -0000 1.14 @@ -1,6 +1,6 @@ Name: nagios Version: 2.2 -Release: 2%{?dist} +Release: 2_%{?dist} Summary: Host/service/network monitoring program Group: Applications/System From fedora-extras-commits at redhat.com Tue May 2 15:33:20 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:33:20 -0700 Subject: rpms/nagios/devel nagios.spec,1.14,1.15 Message-ID: <200605021533.k42FXMdP013555@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13537 Modified Files: nagios.spec Log Message: STupid tagging, back to release 2%{dist} Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nagios.spec 2 May 2006 15:32:28 -0000 1.14 +++ nagios.spec 2 May 2006 15:33:20 -0000 1.15 @@ -1,6 +1,6 @@ Name: nagios Version: 2.2 -Release: 2_%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System From fedora-extras-commits at redhat.com Tue May 2 15:41:18 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:41:18 -0700 Subject: rpms/nagios/devel nagios.spec,1.15,1.16 Message-ID: <200605021541.k42FfKsO013682@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13665 Modified Files: nagios.spec Log Message: Yet another release increment Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- nagios.spec 2 May 2006 15:33:20 -0000 1.15 +++ nagios.spec 2 May 2006 15:41:18 -0000 1.16 @@ -1,6 +1,6 @@ Name: nagios Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -155,7 +155,7 @@ %{_includedir}/%{name} %changelog -* Tue May 02 2006 Mike McGrath 2.2-2 +* Tue May 02 2006 Mike McGrath 2.2-3 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd - 2.2 -------------------------------------------------- From fedora-extras-commits at redhat.com Tue May 2 15:47:53 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 2 May 2006 08:47:53 -0700 Subject: rpms/proftpd/FC-5 proftpd-1.3.0-rpath.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 proftpd.init, 1.4, 1.5 proftpd.spec, 1.13, 1.14 sources, 1.7, 1.8 Message-ID: <200605021547.k42FltaS013802@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13775 Modified Files: .cvsignore proftpd.init proftpd.spec sources Added Files: proftpd-1.3.0-rpath.patch Log Message: Update to 1.3.0 final and backport all of the recent devel changes. proftpd-1.3.0-rpath.patch: --- NEW FILE proftpd-1.3.0-rpath.patch --- diff -Naupr proftpd-1.3.0.orig/configure proftpd-1.3.0/configure --- proftpd-1.3.0.orig/configure 2006-03-09 19:20:04.000000000 +0100 +++ proftpd-1.3.0.orig/configure 2006-03-09 19:20:04.000000000 +0100 @@ -19660,7 +19660,7 @@ if test "${enable_dso+set}" = set; then ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o" ac_build_addl_includes="$INCLTDL $ac_build_addl_includes" - MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)" + MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic" MAIN_LIBS="\$(LIBLTDL)" MODULE_LDFLAGS="-avoid-version -export-dynamic -module" diff -Naupr proftpd-1.3.0.orig/configure.in proftpd-1.3.0/configure.in --- proftpd-1.3.0.orig/configure.in 2006-03-09 19:12:35.000000000 +0100 +++ proftpd-1.3.0.orig/configure.in 2006-03-09 19:12:35.000000000 +0100 @@ -372,7 +372,7 @@ AC_ARG_ENABLE(dso, ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o" ac_build_addl_includes="$INCLTDL $ac_build_addl_includes" - MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)" + MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic" MAIN_LIBS="\$(LIBLTDL)" MODULE_LDFLAGS="-avoid-version -export-dynamic -module" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Mar 2006 10:34:01 -0000 1.7 +++ .cvsignore 2 May 2006 15:47:53 -0000 1.8 @@ -1 +1 @@ -proftpd-1.3.0rc4.tar.bz2 +proftpd-1.3.0.tar.bz2 Index: proftpd.init =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- proftpd.init 16 Nov 2004 18:34:32 -0000 1.4 +++ proftpd.init 2 May 2006 15:47:53 -0000 1.5 @@ -32,7 +32,7 @@ start() { echo -n $"Starting $prog: " - daemon proftpd + daemon proftpd 2>/dev/null RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- proftpd.spec 7 Mar 2006 10:34:01 -0000 1.13 +++ proftpd.spec 2 May 2006 15:47:53 -0000 1.14 @@ -1,30 +1,27 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0 -Release: 0.2.rc4%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ -Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc4.tar.bz2 +Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2 Source1: proftpd.conf Source2: proftpd.init Source3: proftpd-xinetd Source4: proftpd.logrotate Source5: welcome.msg Source6: proftpd.pam +Patch0: proftpd-1.3.0-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: pam >= 0.59, /sbin/service, /sbin/chkconfig -BuildRequires: pam-devel, perl, ncurses-devel, pkgconfig -%{!?_without_tls:Requires: openssl} -%{!?_without_tls:BuildRequires: openssl-devel, krb5-devel} -%{?_with_ldap:Requires: openldap} -%{?_with_ldap:BuildRequires: openldap-devel} -%{?_with_mysql:Requires: mysql} -%{?_with_mysql:BuildRequires: mysql-devel, zlib-devel} -%{?_with_postgresql:Requires: postgresql-libs} -%{?_with_postgresql:BuildRequires: postgresql-devel} +Requires: pam >= 0.59 +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service, /sbin/chkconfig +Requires(postun): /sbin/service +BuildRequires: pam-devel, ncurses-devel, pkgconfig +BuildRequires: openssl-devel, krb5-devel, libacl-devel +BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel Provides: ftpserver -Conflicts: wu-ftpd, anonftp, vsftpd %description ProFTPD is an enhanced FTP server with a focus toward simplicity, security, @@ -36,56 +33,74 @@ This package defaults to the standalone behaviour of ProFTPD, but all the needed scripts to have it run by xinetd instead are included. -Available rpmbuild rebuild options : ---without : tls ---with : ldap mysql postgresql ipv6 + +%package ldap +Summary: Module to add LDAP support to the ProFTPD FTP server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description ldap +Module to add LDAP support to the ProFTPD FTP server. + + +%package mysql +Summary: Module to add MySQL support to the ProFTPD FTP server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description mysql +Module to add MySQL support to the ProFTPD FTP server. + + +%package postgresql +Summary: Module to add PostgreSQL support to the ProFTPD FTP server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description postgresql +Module to add PostgreSQL support to the ProFTPD FTP server. %prep -%setup -n %{name}-%{version}rc4 +%setup +%patch0 -p1 -b .rpath %build -# Workaround for the PostgreSQL include file -%{__perl} -pi -e 's|pgsql/libpq-fe.h|libpq-fe.h|g' contrib/mod_sql_postgres.c - # Disable stripping in order to get useful debuginfo packages %{__perl} -pi -e 's|"-s"|""|g' configure -# TLS includes -OPENSSL_INC="" -if OPENSSL_CFLAGS=`pkg-config --cflags openssl`; then - for i in ${OPENSSL_CFLAGS}; do - INCPATH=`echo $i | perl -pi -e 's|-I([a-z/]*)|$1|g'` - test ! -z ${INCPATH} && OPENSSL_INC="${OPENSSL_INC}:${INCPATH}" - done -fi - %configure \ - --localstatedir="/var/run" \ - --with-includes="%{_includedir}%{!?_without_tls:${OPENSSL_INC}}%{?_with_mysql::%{_includedir}/mysql}" \ - %{?_with_ipv6:--enable-ipv6} \ - %{?_with_mysql:--with-libraries="%{_libdir}/mysql"} \ - %{?_with_postgresql:--with-libraries="%{_libdir}"} \ - --with-modules=mod_readme:mod_auth_pam%{?_with_ldap::mod_ldap}%{?_with_mysql::mod_sql:mod_sql_mysql}%{?_with_postgresql::mod_sql:mod_sql_postgres}%{!?_without_tls::mod_tls} + --libexecdir="%{_libexecdir}/proftpd" \ + --localstatedir="%{_var}/run" \ + --enable-ctrls \ + --enable-facl \ + --enable-dso \ + --enable-ipv6 \ + --with-libraries="%{_libdir}/mysql" \ + --with-includes="%{_includedir}/mysql" \ + --with-modules=mod_readme:mod_auth_pam:mod_tls \ + --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres + %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -%makeinstall rundir="%{buildroot}%{_localstatedir}/run/proftpd" \ +%{__make} install DESTDIR=%{buildroot} \ + rundir="%{_var}/run/proftpd" \ INSTALL_USER=`id -un` \ INSTALL_GROUP=`id -gn` -%{__install} -D -p -m 640 %{SOURCE1} \ +%{__install} -D -p -m 0640 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/proftpd.conf -%{__install} -D -p -m 755 %{SOURCE2} \ +%{__install} -D -p -m 0755 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd -%{__install} -D -p -m 640 %{SOURCE3} \ +%{__install} -D -p -m 0640 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd -%{__install} -D -p -m 644 %{SOURCE4} \ +%{__install} -D -p -m 0644 %{SOURCE4} \ %{buildroot}%{_sysconfdir}/logrotate.d/proftpd -%{__install} -D -p -m 644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg -%{__install} -D -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd +%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg +%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd %{__mkdir_p} %{buildroot}/var/ftp/uploads %{__mkdir_p} %{buildroot}/var/ftp/pub %{__mkdir_p} %{buildroot}/var/log/proftpd @@ -97,7 +112,7 @@ %post -if [ $1 = 1 ]; then +if [ $1 -eq 1 ]; then /sbin/chkconfig --add proftpd IFS=":"; cat /etc/passwd | \ while { read username nu nu gid nu nu nu nu; }; do \ @@ -108,12 +123,12 @@ fi %preun -if [ $1 = 0 ]; then +if [ $1 -eq 0 ]; then /sbin/service proftpd stop &>/dev/null || : /sbin/chkconfig --del proftpd /sbin/service xinetd reload &>/dev/null || : - if [ -d /var/run/proftpd ]; then - rm -rf /var/run/proftpd/* + if [ -d %{_var}/run/proftpd ]; then + rm -rf %{_var}/run/proftpd/* fi fi @@ -131,11 +146,15 @@ %config(noreplace) %{_sysconfdir}/proftpd.conf %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd %config %{_sysconfdir}/ftpusers -%config %{_sysconfdir}/pam.d/proftpd -%config %{_sysconfdir}/logrotate.d/proftpd +%config(noreplace) %{_sysconfdir}/pam.d/proftpd +%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd %{_sysconfdir}/rc.d/init.d/proftpd %{_mandir}/*/* %{_bindir}/* +%dir %{_libexecdir}/proftpd/ +%{_libexecdir}/proftpd/mod_sql.so +%exclude %{_libexecdir}/proftpd/*.a +%exclude %{_libexecdir}/proftpd/*.la %{_sbindir}/* %dir /var/ftp/ %attr(331, ftp, ftp) %dir /var/ftp/uploads/ @@ -143,8 +162,42 @@ %config(noreplace) /var/ftp/welcome.msg %attr(750, root, root) %dir /var/log/proftpd/ +%files ldap +%defattr(-, root, root, 0755) +%dir %{_libexecdir}/proftpd/ +%{_libexecdir}/proftpd/mod_ldap.so + +%files mysql +%defattr(-, root, root, 0755) +%dir %{_libexecdir}/proftpd/ +%{_libexecdir}/proftpd/mod_sql_mysql.so + +%files postgresql +%defattr(-, root, root, 0755) +%dir %{_libexecdir}/proftpd/ +%{_libexecdir}/proftpd/mod_sql_postgres.so + %changelog +* Fri Apr 28 2006 Matthias Saou 1.3.0-2 +- Mark pam.d and logrotate.d config files as noreplace. +- Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary + when DSO is enabled (#190122). + +* Fri Apr 21 2006 Matthias Saou 1.3.0-1 +- Update to 1.3.0 final. +- Remove no longer needed PostgreSQL and OpenSSL detection workarounds. +- Remove explicit conflicts on wu-ftpd, anonftp and vsftpd to let people + install more than one ftp daemon (what for? hmm...) (#189023). +- Enable LDAP, MySQL and PostgreSQL as DSOs by default, and stuff them in + new sub-packages. This won't introduce any regression since they weren't + enabled by default. +- Remove useless explicit requirements. +- Rearrange scriplets requirements. +- Enable ctrls (controls via ftpdctl) and facl (POSIX ACLs). +- Using --disable-static makes the build fail, so exclude .a files in %%files. +- Silence harmless IPv6 failure message at startup when IPv6 isn't available. + * Tue Mar 7 2006 Matthias Saou 1.3.0-0.2.rc4 - Update to 1.3.0rc4 (bugfix release). Index: sources =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Mar 2006 10:34:01 -0000 1.7 +++ sources 2 May 2006 15:47:53 -0000 1.8 @@ -1 +1 @@ -175da3e672d9f441b852259c7baee21e proftpd-1.3.0rc4.tar.bz2 +fae47d01b52e035eb6b7190e74c17722 proftpd-1.3.0.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 15:50:24 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 08:50:24 -0700 Subject: rpms/gnomesword/FC-5 gnomesword-2.1.6-svn1213-kjvot.patch, NONE, 1.1 gnomesword.spec, 1.10, 1.11 Message-ID: <200605021550.k42FoQpL013932@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gnomesword/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886/FC-5 Modified Files: gnomesword.spec Added Files: gnomesword-2.1.6-svn1213-kjvot.patch Log Message: Fixes bug 190413 gnomesword-2.1.6-svn1213-kjvot.patch: --- NEW FILE gnomesword-2.1.6-svn1213-kjvot.patch --- diff -ur gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp --- gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp 2006-04-04 10:16:30.000000000 -0700 +++ gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp 2006-05-02 08:29:36.000000000 -0700 @@ -408,7 +408,10 @@ // else if (!strcmp(tag.getName(), "milestone")&& tag.getAttribute("type")) { if(!strcmp(tag.getAttribute("type"),"x-p")) - buf += tag.getAttribute("marker"); + if( tag.getAttribute("marker")) + buf += tag.getAttribute("marker"); + else + buf += ""; else if(!strcmp(tag.getAttribute("type"), "line")) { buf += "
"; //g_message("\ntoken: %s\ntag: %s\ntype: %s",token,tag.getName(),tag.getAttribute("type")); @@ -437,7 +440,7 @@ if(u->inName) { char firstChar = *u->lastTextNode.c_str(); const char *name = u->lastTextNode.c_str(); - g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name); + //g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name); ++name; buf += firstChar; buf += ""; diff -ur gnomesword-2.1.6/src/backend/sword_main.cc gnomesword-2.1.6-patched/src/backend/sword_main.cc --- gnomesword-2.1.6/src/backend/sword_main.cc 2006-04-04 13:46:50.000000000 -0700 +++ gnomesword-2.1.6-patched/src/backend/sword_main.cc 2006-05-02 08:29:36.000000000 -0700 @@ -486,7 +486,8 @@ vkey.AutoNormalize(1); vkey = mykey; g_free(mykey); - mykey = g_convert((char*)vkey.getText(), + + mykey = g_convert((char*)vkey.getShortText(), -1, UTF_8, OLD_CODESET, diff -ur gnomesword-2.1.6/src/gnome2/main_window.c gnomesword-2.1.6-patched/src/gnome2/main_window.c --- gnomesword-2.1.6/src/gnome2/main_window.c 2006-04-12 11:17:31.000000000 -0700 +++ gnomesword-2.1.6-patched/src/gnome2/main_window.c 2006-05-02 08:29:36.000000000 -0700 @@ -806,6 +806,24 @@ settings.gs_hight); } +/* +void new_main_window(void) +{ + gchar *glade_file; + GladeXML *gxml; + + glade_file = + gui_general_user_file("main-window.glade", FALSE); + g_return_if_fail(glade_file != NULL); + g_message(glade_file); + + // ** build the widget ** + gxml = glade_xml_new(glade_file, "main-window", NULL); + + + +} + /****************************************************************************** * Name diff -ur gnomesword-2.1.6/src/gnome2/search_dialog.c gnomesword-2.1.6-patched/src/gnome2/search_dialog.c --- gnomesword-2.1.6/src/gnome2/search_dialog.c 2006-03-29 08:27:16.000000000 -0800 +++ gnomesword-2.1.6-patched/src/gnome2/search_dialog.c 2006-05-02 08:29:36.000000000 -0700 @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include #endif - + #include #include diff -ur gnomesword-2.1.6/src/main/display.cc gnomesword-2.1.6-patched/src/main/display.cc --- gnomesword-2.1.6/src/main/display.cc 2006-04-02 20:08:46.000000000 -0700 +++ gnomesword-2.1.6-patched/src/main/display.cc 2006-05-02 08:29:36.000000000 -0700 @@ -400,21 +400,20 @@ main_set_strongs_morphs_off(ops); } #endif -/* if (newparagraph && settings.versestyle) { + if (newparagraph && settings.versestyle) { newparagraph = FALSE; swbuf += paragraphMark;; } -*/ + swbuf += (const char *)imodule; buf = g_strdup_printf("%s",(const char *)imodule); if (settings.versestyle) { - /*if(g_strstr_len(buf,strlen(buf),"")|| - g_strstr_len(buf,strlen(buf),"

")) { + if(g_strstr_len(buf,strlen(buf),"")) { newparagraph = TRUE; } else { newparagraph = FALSE; - }*/ + } swbuf.append("
"); } else { swbuf.append(""); diff -ur gnomesword-2.1.6/src/main/navbar.cc gnomesword-2.1.6-patched/src/main/navbar.cc --- gnomesword-2.1.6/src/main/navbar.cc 2006-03-14 13:41:21.000000000 -0800 +++ gnomesword-2.1.6-patched/src/main/navbar.cc 2006-05-02 08:29:36.000000000 -0700 @@ -137,6 +137,7 @@ void main_navbar_fill_book_combo(NAVBAR navbar) { VerseKey key; + VerseKey key_abrev; gsize bytes_read; gsize bytes_written; GError *error = NULL; @@ -155,15 +156,16 @@ GTK_COMBO_BOX(navbar.comboboxentry_book)); gtk_list_store_clear(GTK_LIST_STORE(book_model)); if (backend->module_has_testament(navbar.module_name, 1)) { - while(i < key.BMAX[0]) { - - book = g_convert((const char *)key.books[0][i].name, + while(i < key.BMAX[0]) { + key_abrev = key.books[0][i].name; + book = g_convert((const char *)key_abrev.getBookAbbrev(), -1, UTF_8, OLD_CODESET, &bytes_read, &bytes_written, &error); + if(book == NULL) { g_print ("error: %s\n", error->message); g_error_free (error); @@ -181,9 +183,9 @@ } i = 0; if (backend->module_has_testament(navbar.module_name, 2)) { - while(i < key.BMAX[1]) { - //g_message((const char *)key.books[1][i].name); - book = g_convert((const char *)key.books[1][i].name, + while(i < key.BMAX[1]) { + key_abrev = key.books[1][i].name; + book = g_convert((const char *)key_abrev.getBookAbbrev(), -1, UTF_8, OLD_CODESET, Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/FC-5/gnomesword.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnomesword.spec 25 Apr 2006 07:43:47 -0000 1.10 +++ gnomesword.spec 2 May 2006 15:50:24 -0000 1.11 @@ -1,12 +1,13 @@ Name: gnomesword Version: 2.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text License: GPL URL: http://gnomesword.sourceforge.net/ Source0: http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz +Patch0: gnomesword-2.1.6-svn1213-kjvot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sed >= 3.95 @@ -32,6 +33,7 @@ %prep %setup -q +%patch0 -p1 %{__sed} -i 's?\r??' doc/help/C/legal.xml %{__sed} -i 's?\r??' doc/help/fr/legal.xml @@ -80,6 +82,10 @@ %changelog +* Tue May 02 2006 Michael A. Peters - 2.1.6-2 +- Fixed crash when viewing OT using KJV module (Patch0) +- Closes bug 190413 + * Tue Apr 25 2006 Michael A. Peters - 2.1.6-1 - New upstream version - removed commented out fixes for since upstream fixed 64-bit issues From fedora-extras-commits at redhat.com Tue May 2 15:50:25 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 08:50:25 -0700 Subject: rpms/gnomesword/devel gnomesword-2.1.6-svn1213-kjvot.patch, NONE, 1.1 gnomesword.spec, 1.9, 1.10 Message-ID: <200605021550.k42FoRVh013938@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gnomesword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886/devel Modified Files: gnomesword.spec Added Files: gnomesword-2.1.6-svn1213-kjvot.patch Log Message: Fixes bug 190413 gnomesword-2.1.6-svn1213-kjvot.patch: --- NEW FILE gnomesword-2.1.6-svn1213-kjvot.patch --- diff -ur gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp --- gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp 2006-04-04 10:16:30.000000000 -0700 +++ gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp 2006-05-02 08:29:36.000000000 -0700 @@ -408,7 +408,10 @@ // else if (!strcmp(tag.getName(), "milestone")&& tag.getAttribute("type")) { if(!strcmp(tag.getAttribute("type"),"x-p")) - buf += tag.getAttribute("marker"); + if( tag.getAttribute("marker")) + buf += tag.getAttribute("marker"); + else + buf += ""; else if(!strcmp(tag.getAttribute("type"), "line")) { buf += "
"; //g_message("\ntoken: %s\ntag: %s\ntype: %s",token,tag.getName(),tag.getAttribute("type")); @@ -437,7 +440,7 @@ if(u->inName) { char firstChar = *u->lastTextNode.c_str(); const char *name = u->lastTextNode.c_str(); - g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name); + //g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name); ++name; buf += firstChar; buf += ""; diff -ur gnomesword-2.1.6/src/backend/sword_main.cc gnomesword-2.1.6-patched/src/backend/sword_main.cc --- gnomesword-2.1.6/src/backend/sword_main.cc 2006-04-04 13:46:50.000000000 -0700 +++ gnomesword-2.1.6-patched/src/backend/sword_main.cc 2006-05-02 08:29:36.000000000 -0700 @@ -486,7 +486,8 @@ vkey.AutoNormalize(1); vkey = mykey; g_free(mykey); - mykey = g_convert((char*)vkey.getText(), + + mykey = g_convert((char*)vkey.getShortText(), -1, UTF_8, OLD_CODESET, diff -ur gnomesword-2.1.6/src/gnome2/main_window.c gnomesword-2.1.6-patched/src/gnome2/main_window.c --- gnomesword-2.1.6/src/gnome2/main_window.c 2006-04-12 11:17:31.000000000 -0700 +++ gnomesword-2.1.6-patched/src/gnome2/main_window.c 2006-05-02 08:29:36.000000000 -0700 @@ -806,6 +806,24 @@ settings.gs_hight); } +/* +void new_main_window(void) +{ + gchar *glade_file; + GladeXML *gxml; + + glade_file = + gui_general_user_file("main-window.glade", FALSE); + g_return_if_fail(glade_file != NULL); + g_message(glade_file); + + // ** build the widget ** + gxml = glade_xml_new(glade_file, "main-window", NULL); + + + +} + /****************************************************************************** * Name diff -ur gnomesword-2.1.6/src/gnome2/search_dialog.c gnomesword-2.1.6-patched/src/gnome2/search_dialog.c --- gnomesword-2.1.6/src/gnome2/search_dialog.c 2006-03-29 08:27:16.000000000 -0800 +++ gnomesword-2.1.6-patched/src/gnome2/search_dialog.c 2006-05-02 08:29:36.000000000 -0700 @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include #endif - + #include #include diff -ur gnomesword-2.1.6/src/main/display.cc gnomesword-2.1.6-patched/src/main/display.cc --- gnomesword-2.1.6/src/main/display.cc 2006-04-02 20:08:46.000000000 -0700 +++ gnomesword-2.1.6-patched/src/main/display.cc 2006-05-02 08:29:36.000000000 -0700 @@ -400,21 +400,20 @@ main_set_strongs_morphs_off(ops); } #endif -/* if (newparagraph && settings.versestyle) { + if (newparagraph && settings.versestyle) { newparagraph = FALSE; swbuf += paragraphMark;; } -*/ + swbuf += (const char *)imodule; buf = g_strdup_printf("%s",(const char *)imodule); if (settings.versestyle) { - /*if(g_strstr_len(buf,strlen(buf),"")|| - g_strstr_len(buf,strlen(buf),"

")) { + if(g_strstr_len(buf,strlen(buf),"")) { newparagraph = TRUE; } else { newparagraph = FALSE; - }*/ + } swbuf.append("
"); } else { swbuf.append(""); diff -ur gnomesword-2.1.6/src/main/navbar.cc gnomesword-2.1.6-patched/src/main/navbar.cc --- gnomesword-2.1.6/src/main/navbar.cc 2006-03-14 13:41:21.000000000 -0800 +++ gnomesword-2.1.6-patched/src/main/navbar.cc 2006-05-02 08:29:36.000000000 -0700 @@ -137,6 +137,7 @@ void main_navbar_fill_book_combo(NAVBAR navbar) { VerseKey key; + VerseKey key_abrev; gsize bytes_read; gsize bytes_written; GError *error = NULL; @@ -155,15 +156,16 @@ GTK_COMBO_BOX(navbar.comboboxentry_book)); gtk_list_store_clear(GTK_LIST_STORE(book_model)); if (backend->module_has_testament(navbar.module_name, 1)) { - while(i < key.BMAX[0]) { - - book = g_convert((const char *)key.books[0][i].name, + while(i < key.BMAX[0]) { + key_abrev = key.books[0][i].name; + book = g_convert((const char *)key_abrev.getBookAbbrev(), -1, UTF_8, OLD_CODESET, &bytes_read, &bytes_written, &error); + if(book == NULL) { g_print ("error: %s\n", error->message); g_error_free (error); @@ -181,9 +183,9 @@ } i = 0; if (backend->module_has_testament(navbar.module_name, 2)) { - while(i < key.BMAX[1]) { - //g_message((const char *)key.books[1][i].name); - book = g_convert((const char *)key.books[1][i].name, + while(i < key.BMAX[1]) { + key_abrev = key.books[1][i].name; + book = g_convert((const char *)key_abrev.getBookAbbrev(), -1, UTF_8, OLD_CODESET, Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnomesword.spec 25 Apr 2006 07:41:35 -0000 1.9 +++ gnomesword.spec 2 May 2006 15:50:25 -0000 1.10 @@ -1,12 +1,13 @@ Name: gnomesword Version: 2.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text License: GPL URL: http://gnomesword.sourceforge.net/ Source0: http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz +Patch0: gnomesword-2.1.6-svn1213-kjvot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sed >= 3.95 @@ -32,6 +33,7 @@ %prep %setup -q +%patch0 -p1 %{__sed} -i 's?\r??' doc/help/C/legal.xml %{__sed} -i 's?\r??' doc/help/fr/legal.xml @@ -80,6 +82,10 @@ %changelog +* Tue May 02 2006 Michael A. Peters - 2.1.6-2 +- Fixed crash when viewing OT using KJV module (Patch0) +- Closes bug 190413 + * Tue Apr 25 2006 Michael A. Peters - 2.1.6-1 - New upstream version - removed commented out fixes for since upstream fixed 64-bit issues From fedora-extras-commits at redhat.com Tue May 2 15:51:01 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 08:51:01 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3 Message-ID: <200605021551.k42Fp3Ye013975@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13870/devel Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Log Message: Fixed bug #190379 Moved options from init script to sysconfig file dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq-2.30-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:16:45 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 15:51:01 -0000 1.2 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh ---- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500 +--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-05-02 09:35:27.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 09:48:47.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,58 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,19 +19,10 @@ + dnsmasq=/usr/sbin/dnsmasq + [ -f $dnsmasq ] || exit 0 + +-# change this line if you want dnsmasq to serve an MX record for +-# the host it is running on. +-MAILHOSTNAME="" +-# change this line if you want dns to get its upstream servers from +-# somewhere other that /etc/resolv.conf +-RESOLV_CONF="" +-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from +-# a dhcpd's lease file +-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" +-DOMAIN_SUFFIX=`dnsdomainname` +- +-OPTIONS="" ++# source /etc/sysconfig/dnsmasq if it exists ++[ -f /etc/sysconfig/dnsmasq ] && . /etc/sysconfig/dnsmasq + ++# apply options from /etc/sysconfig/dnsmasq if they're set + if [ ! -z "${MAILHOSTNAME}" ]; then + OPTIONS="$OPTIONS -m $MAILHOSTNAME" + fi +@@ -72,7 +63,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? +diff -urN dnsmasq-2.30/rpm/dnsmasq.sysconfig dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig +--- dnsmasq-2.30/rpm/dnsmasq.sysconfig 1969-12-31 18:00:00.000000000 -0600 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig 2006-05-02 09:49:42.000000000 -0500 +@@ -0,0 +1,13 @@ ++# change this line if you want dnsmasq to serve an MX record for ++# the host it is running on. ++MAILHOSTNAME="" ++# change this line if you want dns to get its upstream servers from ++# somewhere other that /etc/resolv.conf ++RESOLV_CONF="" ++# change this if you want dnsmasq to cache any "hostname" or "client-hostname" ++# from a dhcpd's lease file ++# (deprecated!) ++#DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" ++DOMAIN_SUFFIX=`dnsdomainname` ++# other options? ++OPTIONS="" Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq.spec 27 Apr 2006 15:06:50 -0000 1.2 +++ dnsmasq.spec 2 May 2006 15:51:01 -0000 1.3 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -36,6 +37,7 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,13 @@ rm -rf $RPM_BUILD_ROOT # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ - $RPM_BUILD_ROOT%{_mandir}/man8 + $RPM_BUILD_ROOT%{_mandir}/man8 \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +install rpm/dnsmasq.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dnsmasq +install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -73,13 +79,20 @@ %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 -%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/dnsmasq +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 +- Moved options out of init script and into /etc/sysconfig/dnsmasq +- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 +- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball + * Thu Apr 27 2006 Patrick "Jima" Laughton 2.30-3 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request) - Split initscript & enable-dbus patches, conditionalized dbus for FC3 From fedora-extras-commits at redhat.com Tue May 2 15:51:28 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 08:51:28 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.30-dbus-config.patch,NONE,1.1 Message-ID: <200605021551.k42FpUS4014012@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13992/devel Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + From fedora-extras-commits at redhat.com Tue May 2 16:19:59 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:19:59 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.30-initscript.patch, 1.2, 1.3 dnsmasq.spec, 1.3, 1.4 Message-ID: <200605021620.k42GK14K016533@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16510/devel Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Log Message: More upstream-recommended cleanups :) dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq-2.30-initscript.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq-2.30-initscript.patch 2 May 2006 15:51:01 -0000 1.2 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:19:59 -0000 1.3 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh ---- dnsmasq-2.30/rpm/dnsmasq.rh 2006-05-02 09:35:27.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 09:48:47.000000000 -0500 +--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,7 +10,7 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid -@@ -19,19 +19,10 @@ +@@ -19,33 +19,9 @@ dnsmasq=/usr/sbin/dnsmasq [ -f $dnsmasq ] || exit 0 @@ -23,17 +23,29 @@ -# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from -# a dhcpd's lease file -DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" --DOMAIN_SUFFIX=`dnsdomainname` + DOMAIN_SUFFIX=`dnsdomainname` - -OPTIONS="" -+# source /etc/sysconfig/dnsmasq if it exists -+[ -f /etc/sysconfig/dnsmasq ] && . /etc/sysconfig/dnsmasq - -+# apply options from /etc/sysconfig/dnsmasq if they're set - if [ ! -z "${MAILHOSTNAME}" ]; then - OPTIONS="$OPTIONS -m $MAILHOSTNAME" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" fi -@@ -72,7 +63,13 @@ + + RETVAL=0 +@@ -72,7 +48,13 @@ status dnsmasq RETVAL=$? ;; @@ -48,20 +60,3 @@ $0 stop $0 start RETVAL=$? -diff -urN dnsmasq-2.30/rpm/dnsmasq.sysconfig dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig ---- dnsmasq-2.30/rpm/dnsmasq.sysconfig 1969-12-31 18:00:00.000000000 -0600 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig 2006-05-02 09:49:42.000000000 -0500 -@@ -0,0 +1,13 @@ -+# change this line if you want dnsmasq to serve an MX record for -+# the host it is running on. -+MAILHOSTNAME="" -+# change this line if you want dns to get its upstream servers from -+# somewhere other that /etc/resolv.conf -+RESOLV_CONF="" -+# change this if you want dnsmasq to cache any "hostname" or "client-hostname" -+# from a dhcpd's lease file -+# (deprecated!) -+#DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" -+DOMAIN_SUFFIX=`dnsdomainname` -+# other options? -+OPTIONS="" Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 15:51:01 -0000 1.3 +++ dnsmasq.spec 2 May 2006 16:19:59 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 4%{?dist} +Release: 4.1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -34,10 +34,10 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %if "%{dist}" != ".fc3" -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 %endif %build @@ -53,7 +53,6 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf -install rpm/dnsmasq.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dnsmasq install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -80,7 +79,6 @@ %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/dnsmasq %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq @@ -88,6 +86,11 @@ %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.1 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 - Moved options out of init script and into /etc/sysconfig/dnsmasq - Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 From fedora-extras-commits at redhat.com Tue May 2 16:28:07 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:28:07 -0700 Subject: rpms/dnsmasq/devel dnsmasq.spec,1.4,1.5 Message-ID: <200605021628.k42GS9jb016641@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16624/devel Modified Files: dnsmasq.spec Log Message: Fix stupid mistake with dnsmasq.spec Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnsmasq.spec 2 May 2006 16:19:59 -0000 1.4 +++ dnsmasq.spec 2 May 2006 16:28:07 -0000 1.5 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 4.1%{?dist} +Release: 4.2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -34,10 +34,10 @@ %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %if "%{dist}" != ".fc3" -#%patch1 -p1 -#%patch2 -p1 +%patch1 -p1 +%patch2 -p1 %endif %build @@ -86,7 +86,7 @@ %changelog -* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.1 +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) - Tweaked init script a little more From fedora-extras-commits at redhat.com Tue May 2 16:37:48 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:37:48 -0700 Subject: rpms/dnsmasq/FC-3 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.6, 1.7 Message-ID: <200605021637.k42GbpW4016765@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/FC-3 Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Fixed bug #190379 Moved options from init script to sysconfig file Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq-2.30-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:54:51 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:48 -0000 1.2 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh --- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,53 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,33 +19,9 @@ + dnsmasq=/usr/sbin/dnsmasq + [ -f $dnsmasq ] || exit 0 + +-# change this line if you want dnsmasq to serve an MX record for +-# the host it is running on. +-MAILHOSTNAME="" +-# change this line if you want dns to get its upstream servers from +-# somewhere other that /etc/resolv.conf +-RESOLV_CONF="" +-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from +-# a dhcpd's lease file +-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" + DOMAIN_SUFFIX=`dnsdomainname` +- +-OPTIONS="" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" + fi + + RETVAL=0 +@@ -72,7 +48,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dnsmasq.spec 27 Apr 2006 15:54:51 -0000 1.6 +++ dnsmasq.spec 2 May 2006 16:37:48 -0000 1.7 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4.2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -36,6 +37,7 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,12 @@ rm -rf $RPM_BUILD_ROOT # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ - $RPM_BUILD_ROOT%{_mandir}/man8 + $RPM_BUILD_ROOT%{_mandir}/man8 \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -73,13 +78,24 @@ %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 -%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 +- Moved options out of init script and into /etc/sysconfig/dnsmasq +- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 +- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball + * Thu Apr 27 2006 Patrick "Jima" Laughton 2.30-3 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request) - Split initscript & enable-dbus patches, conditionalized dbus for FC3 From fedora-extras-commits at redhat.com Tue May 2 16:37:50 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:37:50 -0700 Subject: rpms/dnsmasq/FC-5 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3 Message-ID: <200605021637.k42GbqFX016783@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/FC-5 Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Fixed bug #190379 Moved options from init script to sysconfig file Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq-2.30-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:54:52 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:50 -0000 1.2 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh --- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,53 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,33 +19,9 @@ + dnsmasq=/usr/sbin/dnsmasq + [ -f $dnsmasq ] || exit 0 + +-# change this line if you want dnsmasq to serve an MX record for +-# the host it is running on. +-MAILHOSTNAME="" +-# change this line if you want dns to get its upstream servers from +-# somewhere other that /etc/resolv.conf +-RESOLV_CONF="" +-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from +-# a dhcpd's lease file +-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" + DOMAIN_SUFFIX=`dnsdomainname` +- +-OPTIONS="" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" + fi + + RETVAL=0 +@@ -72,7 +48,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq.spec 27 Apr 2006 15:54:52 -0000 1.2 +++ dnsmasq.spec 2 May 2006 16:37:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4.2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -36,6 +37,7 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,12 @@ rm -rf $RPM_BUILD_ROOT # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ - $RPM_BUILD_ROOT%{_mandir}/man8 + $RPM_BUILD_ROOT%{_mandir}/man8 \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -73,13 +78,24 @@ %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 -%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 +- Moved options out of init script and into /etc/sysconfig/dnsmasq +- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 +- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball + * Thu Apr 27 2006 Patrick "Jima" Laughton 2.30-3 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request) - Split initscript & enable-dbus patches, conditionalized dbus for FC3 From fedora-extras-commits at redhat.com Tue May 2 16:37:49 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:37:49 -0700 Subject: rpms/dnsmasq/FC-4 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3 Message-ID: <200605021637.k42GbpQg016775@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/FC-4 Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Fixed bug #190379 Moved options from init script to sysconfig file Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq-2.30-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:54:52 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:49 -0000 1.2 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh --- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,53 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,33 +19,9 @@ + dnsmasq=/usr/sbin/dnsmasq + [ -f $dnsmasq ] || exit 0 + +-# change this line if you want dnsmasq to serve an MX record for +-# the host it is running on. +-MAILHOSTNAME="" +-# change this line if you want dns to get its upstream servers from +-# somewhere other that /etc/resolv.conf +-RESOLV_CONF="" +-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from +-# a dhcpd's lease file +-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" + DOMAIN_SUFFIX=`dnsdomainname` +- +-OPTIONS="" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" + fi + + RETVAL=0 +@@ -72,7 +48,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq.spec 27 Apr 2006 15:54:52 -0000 1.2 +++ dnsmasq.spec 2 May 2006 16:37:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4.2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -36,6 +37,7 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,12 @@ rm -rf $RPM_BUILD_ROOT # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ - $RPM_BUILD_ROOT%{_mandir}/man8 + $RPM_BUILD_ROOT%{_mandir}/man8 \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -73,13 +78,24 @@ %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 -%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 +- Moved options out of init script and into /etc/sysconfig/dnsmasq +- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 +- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball + * Thu Apr 27 2006 Patrick "Jima" Laughton 2.30-3 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request) - Split initscript & enable-dbus patches, conditionalized dbus for FC3 From fedora-extras-commits at redhat.com Tue May 2 16:48:07 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:48:07 -0700 Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.7,1.8 Message-ID: <200605021648.k42Gm9DB016936@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16919/FC-3 Modified Files: dnsmasq.spec Log Message: Don't install dbus/dnsmasq.conf on FC3 (dbus too old) Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dnsmasq.spec 2 May 2006 16:37:48 -0000 1.7 +++ dnsmasq.spec 2 May 2006 16:48:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 4.2%{?dist} +Release: 4.2%{?dist}.1 Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -53,7 +53,9 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ +%endif install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -79,13 +81,18 @@ %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2.fc3.1 +- Don't install dbus/dnsmasq.conf on FC3 (dbus too old) + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) From fedora-extras-commits at redhat.com Tue May 2 18:22:42 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 2 May 2006 11:22:42 -0700 Subject: rpms/libipoddevice/FC-5 .cvsignore, 1.2, 1.3 libipoddevice.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605021822.k42IMiAq021689@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21668 Modified Files: .cvsignore libipoddevice.spec sources Log Message: * Tue May 2 2006 Christopher Aillon 0.4.5-1 - Update to 0.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 00:42:27 -0000 1.2 +++ .cvsignore 2 May 2006 18:22:42 -0000 1.3 @@ -1 +1 @@ -libipoddevice-0.4.1.tar.gz +libipoddevice-0.4.5.tar.gz Index: libipoddevice.spec =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/FC-5/libipoddevice.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libipoddevice.spec 3 Mar 2006 00:42:27 -0000 1.1 +++ libipoddevice.spec 2 May 2006 18:22:42 -0000 1.2 @@ -2,8 +2,8 @@ %define hal_ver 0.5.2 Name: libipoddevice -Version: 0.4.1 -Release: 1 +Version: 0.4.5 +Release: 1%{?dist} Summary: Device-specific layer for the Apple iPod Group: Development/Libraries @@ -67,5 +67,8 @@ %changelog +* Tue May 2 2006 Christopher Aillon 0.4.5-1 +- Update to 0.4.5 + * Tue Feb 21 2006 Christopher Aillon 0.4.1-1 - Initial RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 00:42:27 -0000 1.2 +++ sources 2 May 2006 18:22:42 -0000 1.3 @@ -1 +1 @@ -000b3c7b82026bf052a16811ba34c515 libipoddevice-0.4.1.tar.gz +aac402761cf2eca2b16d14acf81dd2b3 libipoddevice-0.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 2 18:28:57 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 2 May 2006 11:28:57 -0700 Subject: rpms/libipoddevice/devel .cvsignore, 1.2, 1.3 libipoddevice.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605021828.k42ISxm5021776@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21755 Modified Files: .cvsignore libipoddevice.spec sources Log Message: * Tue May 2 2006 Christopher Aillon 0.4.5-1 - Update to 0.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 00:42:27 -0000 1.2 +++ .cvsignore 2 May 2006 18:28:57 -0000 1.3 @@ -1 +1 @@ -libipoddevice-0.4.1.tar.gz +libipoddevice-0.4.5.tar.gz Index: libipoddevice.spec =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/libipoddevice.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libipoddevice.spec 3 Mar 2006 00:42:27 -0000 1.1 +++ libipoddevice.spec 2 May 2006 18:28:57 -0000 1.2 @@ -2,8 +2,8 @@ %define hal_ver 0.5.2 Name: libipoddevice -Version: 0.4.1 -Release: 1 +Version: 0.4.5 +Release: 1%{?dist} Summary: Device-specific layer for the Apple iPod Group: Development/Libraries @@ -67,5 +67,8 @@ %changelog +* Tue May 2 2006 Christopher Aillon 0.4.5-1 +- Update to 0.4.5 + * Tue Feb 21 2006 Christopher Aillon 0.4.1-1 - Initial RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 00:42:27 -0000 1.2 +++ sources 2 May 2006 18:28:57 -0000 1.3 @@ -1 +1 @@ -000b3c7b82026bf052a16811ba34c515 libipoddevice-0.4.1.tar.gz +aac402761cf2eca2b16d14acf81dd2b3 libipoddevice-0.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 2 20:28:39 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 13:28:39 -0700 Subject: fedora-security/tools - New directory Message-ID: <200605022028.k42KSdRk026597@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26582/tools Log Message: Directory /cvs/fedora/fedora-security/tools added to the repository From fedora-extras-commits at redhat.com Tue May 2 20:29:34 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 13:29:34 -0700 Subject: fedora-security/tools package-release,NONE,1.1 Message-ID: <200605022029.k42KTYGL026625@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26608/tools Added Files: package-release Log Message: Initial commit of a script to query the various packages shipped in extras. ***** Error reading new file: [Errno 2] No such file or directory: 'package-release' From fedora-extras-commits at redhat.com Tue May 2 21:04:25 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 14:04:25 -0700 Subject: CVSROOT avail,1.29,1.30 Message-ID: <200605022104.k42L4PbT028991@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28967 Modified Files: avail Log Message: Add the inital members of the Fedora Security Response Team Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- avail 1 May 2006 21:44:36 -0000 1.29 +++ avail 2 May 2006 21:04:22 -0000 1.30 @@ -41,8 +41,12 @@ avail | eitch | web/html/download avail | eitch | web/html/Download +# Fedora security repository unavail | | fedora-security +# Red Hat Security Response Team avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security +# Fedora Security Response Team +avail | jkeating,ausil,tibbs,kaboom | fedora-security avail | pfrields | web/html/projects/docs avail | pfrields | web/html/participate/documentation-faq From fedora-extras-commits at redhat.com Tue May 2 21:07:43 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 14:07:43 -0700 Subject: fedora-security/audit fe4,NONE,1.1 fe5,NONE,1.1 Message-ID: <200605022107.k42L7hQ4029034@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29015 Added Files: fe4 fe5 Log Message: Add empty files for the tracking of fedora extras security issues. ***** Error reading new file: [Errno 2] No such file or directory: 'fe4' ***** Error reading new file: [Errno 2] No such file or directory: 'fe5' From fedora-extras-commits at redhat.com Tue May 2 21:27:10 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 14:27:10 -0700 Subject: CVSROOT avail,1.30,1.31 Message-ID: <200605022127.k42LRAUY029120@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100 Modified Files: avail Log Message: Restrict the Fedora Security Response Team's access to the fc4/fc5 files. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- avail 2 May 2006 21:04:22 -0000 1.30 +++ avail 2 May 2006 21:27:07 -0000 1.31 @@ -47,6 +47,8 @@ avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security # Fedora Security Response Team avail | jkeating,ausil,tibbs,kaboom | fedora-security +unavail | jkeating,ausil,tibbs,kaboom | fedora-security/audit/fc4 +unavail | jkeating,ausil,tibbs,kaboom | fedora-security/audit/fc5 avail | pfrields | web/html/projects/docs avail | pfrields | web/html/participate/documentation-faq From fedora-extras-commits at redhat.com Tue May 2 21:28:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 2 May 2006 14:28:59 -0700 Subject: owners owners.list,1.935,1.936 Message-ID: <200605022129.k42LT1NZ029160@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141 Modified Files: owners.list Log Message: Take ownership of perl-XML-DOM and perl-XML-RegExp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.935 retrieving revision 1.936 diff -u -r1.935 -r1.936 --- owners.list 2 May 2006 13:54:24 -0000 1.935 +++ owners.list 2 May 2006 21:28:58 -0000 1.936 @@ -1204,9 +1204,9 @@ Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 21:29:41 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:29:41 -0700 Subject: rpms/putty/FC-5 putty.spec,1.11,1.12 Message-ID: <200605022129.k42LThvH029229@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/putty/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-5 Modified Files: putty.spec Log Message: taking ownership of package Index: putty.spec =================================================================== RCS file: /cvs/extras/rpms/putty/FC-5/putty.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- putty.spec 26 Feb 2006 07:51:47 -0000 1.11 +++ putty.spec 2 May 2006 21:29:41 -0000 1.12 @@ -1,6 +1,6 @@ Name: putty Version: 0.58 -Release: 1 +Release: 2%{?dist} Summary: SSH, Telnet and Rlogin client License: MIT Group: Applications/Internet @@ -12,22 +12,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel desktop-file-utils sed - %description Putty is a SSH, Telnet & Rlogin client - this time for Linux. - %prep -cat< - 0.58-2 +- rebuild + * Tue Apr 19 2005 Adrian Reber - 0.58-1 - Updated to 0.58 From fedora-extras-commits at redhat.com Tue May 2 21:29:41 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:29:41 -0700 Subject: rpms/putty/devel putty.spec,1.11,1.12 Message-ID: <200605022129.k42LThTr029233@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/putty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/devel Modified Files: putty.spec Log Message: taking ownership of package Index: putty.spec =================================================================== RCS file: /cvs/extras/rpms/putty/devel/putty.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- putty.spec 26 Feb 2006 07:51:47 -0000 1.11 +++ putty.spec 2 May 2006 21:29:41 -0000 1.12 @@ -1,6 +1,6 @@ Name: putty Version: 0.58 -Release: 1 +Release: 2%{?dist} Summary: SSH, Telnet and Rlogin client License: MIT Group: Applications/Internet @@ -12,22 +12,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel desktop-file-utils sed - %description Putty is a SSH, Telnet & Rlogin client - this time for Linux. - %prep -cat< - 0.58-2 +- rebuild + * Tue Apr 19 2005 Adrian Reber - 0.58-1 - Updated to 0.58 From fedora-extras-commits at redhat.com Tue May 2 21:29:34 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:29:34 -0700 Subject: rpms/putty/FC-3 putty.spec,1.7,1.8 Message-ID: <200605022130.k42LU67J029248@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/putty/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-3 Modified Files: putty.spec Log Message: taking ownership of package Index: putty.spec =================================================================== RCS file: /cvs/extras/rpms/putty/FC-3/putty.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- putty.spec 21 Feb 2005 13:18:35 -0000 1.7 +++ putty.spec 2 May 2006 21:29:34 -0000 1.8 @@ -1,40 +1,35 @@ -Name: putty -Version: 0.57 -Release: 1 -Epoch: 0 -Summary: Putty - a SSH, Telnet & Rlogin client -License: MIT -Group: Applications/Internet -Url: http://www.chiark.greenend.org.uk/~sgtatham/putty/ -Source0: http://the.earth.li/~sgtatham/putty/latest/putty-0.57.tar.gz -Source1: putty.desktop -Source2: putty.png -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel desktop-file-utils - - -#--------------------------------------------------------------------- +Name: putty +Version: 0.58 +Release: 2%{?dist} +Summary: SSH, Telnet and Rlogin client +License: MIT +Group: Applications/Internet +URL: http://www.chiark.greenend.org.uk/~sgtatham/putty/ +Source0: http://the.earth.li/~sgtatham/putty/latest/putty-0.58.tar.gz +Source1: http://the.earth.li/~sgtatham/putty/latest/putty-0.58.tar.gz.RSA +Source2: putty.desktop +Source3: putty.png +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gtk+-devel desktop-file-utils sed %description Putty is a SSH, Telnet & Rlogin client - this time for Linux. -#--------------------------------------------------------------------- - %prep -%setup -q -#--------------------------------------------------------------------- +%setup -q %build +%{__sed} -i -e "/.*sbcsdat.c/d" manifest ./mkfiles.pl pushd unix -perl -pi -e "s,-O2,$RPM_OPT_FLAGS,g;s,/usr/local,%{_prefix},g" Makefile.gtk +%{__sed} -i -e "s/-O2 -Wall -Werror/$RPM_OPT_FLAGS/g" \ + -e "s,/usr/local,%{_prefix},g" \ + Makefile.gtk ln -s Makefile.gtk Makefile make %{?_smp_mflags} popd -#--------------------------------------------------------------------- - %install rm -rf $RPM_BUILD_ROOT pushd unix @@ -49,11 +44,9 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 644 \ --add-category X-Fedora \ - %{SOURCE1} - -install -m644 -D -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png + %{SOURCE2} -#--------------------------------------------------------------------- +install -m644 -D -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png %files %defattr(-,root,root) @@ -67,6 +60,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 03 2006 Michael J. Knox - 0.58-2 +- rebuild + +* Tue Apr 19 2005 Adrian Reber - 0.58-1 +- Updated to 0.58 + +* Tue Feb 29 2005 Adrian Reber - 0.57-2 +- fix build with gcc4 + * Mon Feb 21 2005 Adrian Reber - 0.57-1 - Updated to 0.57 From fedora-extras-commits at redhat.com Tue May 2 21:29:35 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:29:35 -0700 Subject: rpms/putty/FC-4 putty.spec,1.10,1.11 Message-ID: <200605022130.k42LU7gc029251@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/putty/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-4 Modified Files: putty.spec Log Message: taking ownership of package Index: putty.spec =================================================================== RCS file: /cvs/extras/rpms/putty/FC-4/putty.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- putty.spec 19 Apr 2005 12:22:49 -0000 1.10 +++ putty.spec 2 May 2006 21:29:35 -0000 1.11 @@ -1,6 +1,6 @@ Name: putty Version: 0.58 -Release: 1 +Release: 2%{?dist} Summary: SSH, Telnet and Rlogin client License: MIT Group: Applications/Internet @@ -12,14 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel desktop-file-utils sed - %description Putty is a SSH, Telnet & Rlogin client - this time for Linux. - %prep -%setup -q +%setup -q %build %{__sed} -i -e "/.*sbcsdat.c/d" manifest @@ -32,7 +30,6 @@ make %{?_smp_mflags} popd - %install rm -rf $RPM_BUILD_ROOT pushd unix @@ -51,7 +48,6 @@ install -m644 -D -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png - %files %defattr(-,root,root) %doc LICENCE @@ -60,12 +56,13 @@ %{_datadir}/applications/* %{_datadir}/pixmaps/putty.png - %clean rm -rf $RPM_BUILD_ROOT - %changelog +* Wed May 03 2006 Michael J. Knox - 0.58-2 +- rebuild + * Tue Apr 19 2005 Adrian Reber - 0.58-1 - Updated to 0.58 From fedora-extras-commits at redhat.com Tue May 2 21:32:02 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:32:02 -0700 Subject: owners owners.list,1.936,1.937 Message-ID: <200605022132.k42LW4UA029284@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29267 Modified Files: owners.list Log Message: taking ownership of putty Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.936 retrieving revision 1.937 diff -u -r1.936 -r1.937 --- owners.list 2 May 2006 21:28:58 -0000 1.936 +++ owners.list 2 May 2006 21:32:02 -0000 1.937 @@ -1261,7 +1261,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-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|pwgen|Automatic password generation|jbowes at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pybliographer|A framework for working with bibliographic databases|z.kota at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 2 22:52:21 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:52:21 -0700 Subject: rpms/libibverbs import.log,1.10,1.11 Message-ID: <200605022252.k42MqNAE032158@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32123 Modified Files: import.log Log Message: auto-import libibverbs-1.0.3-1 on branch devel from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 14 Mar 2006 06:18:39 -0000 1.10 +++ import.log 2 May 2006 22:52:21 -0000 1.11 @@ -7,3 +7,4 @@ libibverbs-1_0-1:FC-4:libibverbs-1.0-1.src.rpm:1142292600 libibverbs-1_0_1-1:HEAD:libibverbs-1.0.1-1.src.rpm:1142315940 libibverbs-1_0_1-1:FC-4:libibverbs-1.0.1-1.src.rpm:1142317199 +libibverbs-1_0_3-1:HEAD:libibverbs-1.0.3-1.src.rpm:1146610338 From fedora-extras-commits at redhat.com Tue May 2 22:52:22 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:52:22 -0700 Subject: rpms/libibverbs/devel .cvsignore, 1.6, 1.7 libibverbs.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605022252.k42MqOQl032164@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32123/devel Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.3-1 on branch devel from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2006 05:57:45 -0000 1.6 +++ .cvsignore 2 May 2006 22:52:22 -0000 1.7 @@ -1 +1 @@ -libibverbs-1.0.1.tar.gz +libibverbs-1.0.3.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libibverbs.spec 14 Mar 2006 05:57:45 -0000 1.5 +++ libibverbs.spec 2 May 2006 22:52:22 -0000 1.6 @@ -1,19 +1,19 @@ # $Id$ -%define ver 1.0.1 +%define ver 1.0.3 Name: libibverbs -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sysfsutils-devel +BuildRequires: %{_includedir}/sysfs/libsysfs.h %description libibverbs is a library that allows userspace processes to use @@ -27,7 +27,7 @@ %package devel Summary: Development files for the libibverbs library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} sysfsutils-devel +Requires: %{name} = %{version}-%{release} %{_includedir}/sysfs/libsysfs.h %description devel Static libraries and header files for the libibverbs verbs library. @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 14 2006 Roland Dreier - 1.0.3-1 +- New upstream release + * Mon Mar 13 2006 Roland Dreier - 1.0.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 05:57:45 -0000 1.6 +++ sources 2 May 2006 22:52:22 -0000 1.7 @@ -1 +1 @@ -641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz +344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz From fedora-extras-commits at redhat.com Tue May 2 22:54:40 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:54:40 -0700 Subject: rpms/libibverbs import.log,1.11,1.12 Message-ID: <200605022254.k42Msg4b032332@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299 Modified Files: import.log Log Message: auto-import libibverbs-1.0.3-1 on branch FC-5 from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 2 May 2006 22:52:21 -0000 1.11 +++ import.log 2 May 2006 22:54:40 -0000 1.12 @@ -8,3 +8,4 @@ libibverbs-1_0_1-1:HEAD:libibverbs-1.0.1-1.src.rpm:1142315940 libibverbs-1_0_1-1:FC-4:libibverbs-1.0.1-1.src.rpm:1142317199 libibverbs-1_0_3-1:HEAD:libibverbs-1.0.3-1.src.rpm:1146610338 +libibverbs-1_0_3-1:FC-5:libibverbs-1.0.3-1.src.rpm:1146610477 From fedora-extras-commits at redhat.com Tue May 2 22:54:40 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:54:40 -0700 Subject: rpms/libibverbs/FC-5 .cvsignore, 1.6, 1.7 libibverbs.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605022254.k42Msgvc032339@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/FC-5 Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.3-1 on branch FC-5 from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2006 05:57:45 -0000 1.6 +++ .cvsignore 2 May 2006 22:54:40 -0000 1.7 @@ -1 +1 @@ -libibverbs-1.0.1.tar.gz +libibverbs-1.0.3.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-5/libibverbs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libibverbs.spec 14 Mar 2006 05:57:45 -0000 1.5 +++ libibverbs.spec 2 May 2006 22:54:40 -0000 1.6 @@ -1,19 +1,19 @@ # $Id$ -%define ver 1.0.1 +%define ver 1.0.3 Name: libibverbs -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sysfsutils-devel +BuildRequires: %{_includedir}/sysfs/libsysfs.h %description libibverbs is a library that allows userspace processes to use @@ -27,7 +27,7 @@ %package devel Summary: Development files for the libibverbs library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} sysfsutils-devel +Requires: %{name} = %{version}-%{release} %{_includedir}/sysfs/libsysfs.h %description devel Static libraries and header files for the libibverbs verbs library. @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 14 2006 Roland Dreier - 1.0.3-1 +- New upstream release + * Mon Mar 13 2006 Roland Dreier - 1.0.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 05:57:45 -0000 1.6 +++ sources 2 May 2006 22:54:40 -0000 1.7 @@ -1 +1 @@ -641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz +344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz From fedora-extras-commits at redhat.com Tue May 2 22:55:26 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:55:26 -0700 Subject: rpms/libibverbs import.log,1.12,1.13 Message-ID: <200605022255.k42MtSKs032508@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32471 Modified Files: import.log Log Message: auto-import libibverbs-1.0.3-1 on branch FC-4 from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 2 May 2006 22:54:40 -0000 1.12 +++ import.log 2 May 2006 22:55:26 -0000 1.13 @@ -9,3 +9,4 @@ libibverbs-1_0_1-1:FC-4:libibverbs-1.0.1-1.src.rpm:1142317199 libibverbs-1_0_3-1:HEAD:libibverbs-1.0.3-1.src.rpm:1146610338 libibverbs-1_0_3-1:FC-5:libibverbs-1.0.3-1.src.rpm:1146610477 +libibverbs-1_0_3-1:FC-4:libibverbs-1.0.3-1.src.rpm:1146610524 From fedora-extras-commits at redhat.com Tue May 2 22:55:27 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:55:27 -0700 Subject: rpms/libibverbs/FC-4 .cvsignore, 1.6, 1.7 libibverbs.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605022255.k42MtTIR032514@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32471/FC-4 Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.3-1 on branch FC-4 from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2006 06:18:46 -0000 1.6 +++ .cvsignore 2 May 2006 22:55:27 -0000 1.7 @@ -1 +1 @@ -libibverbs-1.0.1.tar.gz +libibverbs-1.0.3.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libibverbs.spec 14 Mar 2006 06:18:46 -0000 1.5 +++ libibverbs.spec 2 May 2006 22:55:27 -0000 1.6 @@ -1,19 +1,19 @@ # $Id$ -%define ver 1.0.1 +%define ver 1.0.3 Name: libibverbs -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sysfsutils-devel +BuildRequires: %{_includedir}/sysfs/libsysfs.h %description libibverbs is a library that allows userspace processes to use @@ -27,7 +27,7 @@ %package devel Summary: Development files for the libibverbs library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} sysfsutils-devel +Requires: %{name} = %{version}-%{release} %{_includedir}/sysfs/libsysfs.h %description devel Static libraries and header files for the libibverbs verbs library. @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 14 2006 Roland Dreier - 1.0.3-1 +- New upstream release + * Mon Mar 13 2006 Roland Dreier - 1.0.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 06:18:46 -0000 1.6 +++ sources 2 May 2006 22:55:27 -0000 1.7 @@ -1 +1 @@ -641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz +344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz From fedora-extras-commits at redhat.com Tue May 2 23:01:13 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 16:01:13 -0700 Subject: rpms/prozilla/FC-4 prozilla.spec,1.12,1.13 Message-ID: <200605022301.k42N1n3t002353@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/prozilla/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619/FC-4 Modified Files: prozilla.spec Log Message: taking ownership. Package not sync'ed with upstream due to compiler error. Upstream has been notified. Index: prozilla.spec =================================================================== RCS file: /cvs/extras/rpms/prozilla/FC-4/prozilla.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- prozilla.spec 20 Jan 2006 10:08:02 -0000 1.12 +++ prozilla.spec 2 May 2006 23:01:13 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Advanced Linux download manager Name: prozilla Version: 1.3.7.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet @@ -27,6 +27,7 @@ fastest ping times. %prep + %setup -q %patch0 -p1 -z .buf %configure @@ -51,6 +52,9 @@ %{_mandir}/man1/proz* %changelog +* Wed May 02 2006 Michael J. Knox - 1.3.7.4-3 +- rebuild + * Fri Jan 20 2006 Hans de Goede - Fix CAN-2005-2961 / bugzilla 169791 From fedora-extras-commits at redhat.com Tue May 2 23:01:17 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 16:01:17 -0700 Subject: rpms/prozilla/devel prozilla.spec,1.13,1.14 Message-ID: <200605022301.k42N1nFc002352@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/prozilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619/devel Modified Files: prozilla.spec Log Message: taking ownership. Package not sync'ed with upstream due to compiler error. Upstream has been notified. Index: prozilla.spec =================================================================== RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- prozilla.spec 2 Mar 2006 21:31:31 -0000 1.13 +++ prozilla.spec 2 May 2006 23:01:16 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Advanced Linux download manager Name: prozilla Version: 1.3.7.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet @@ -27,12 +27,6 @@ fastest ping times. %prep -cat< - 1.3.7.4-3 +- rebuild + * Fri Jan 20 2006 Hans de Goede - Fix CAN-2005-2961 / bugzilla 169791 From fedora-extras-commits at redhat.com Tue May 2 23:01:14 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 16:01:14 -0700 Subject: rpms/prozilla/FC-5 prozilla.spec,1.13,1.14 Message-ID: <200605022301.k42N1n1F002351@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/prozilla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619/FC-5 Modified Files: prozilla.spec Log Message: taking ownership. Package not sync'ed with upstream due to compiler error. Upstream has been notified. Index: prozilla.spec =================================================================== RCS file: /cvs/extras/rpms/prozilla/FC-5/prozilla.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- prozilla.spec 2 Mar 2006 21:31:31 -0000 1.13 +++ prozilla.spec 2 May 2006 23:01:13 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Advanced Linux download manager Name: prozilla Version: 1.3.7.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet @@ -27,12 +27,6 @@ fastest ping times. %prep -cat< - 1.3.7.4-3 +- rebuild + * Fri Jan 20 2006 Hans de Goede - Fix CAN-2005-2961 / bugzilla 169791 From fedora-extras-commits at redhat.com Tue May 2 23:03:27 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 16:03:27 -0700 Subject: owners owners.list,1.937,1.938 Message-ID: <200605022303.k42N3Txi002393@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371 Modified Files: owners.list Log Message: taking ownership of prozilla Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.937 retrieving revision 1.938 diff -u -r1.937 -r1.938 --- owners.list 2 May 2006 21:32:02 -0000 1.937 +++ owners.list 2 May 2006 23:03:27 -0000 1.938 @@ -1256,7 +1256,7 @@ Fedora Extras|prboom|GPL Doom game engine|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| -Fedora Extras|prozilla|An advanced Linux download manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|prozilla|An advanced Linux download manager|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 2 23:36:33 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:36:33 -0700 Subject: rpms/oddjob import.log,1.14,1.15 Message-ID: <200605022336.k42NaZd5002761@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2728 Modified Files: import.log Log Message: auto-import oddjob-0.26-1 on branch FC-3 from oddjob-0.26-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oddjob/import.log,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import.log 11 Apr 2006 22:23:57 -0000 1.14 +++ import.log 2 May 2006 23:36:33 -0000 1.15 @@ -11,3 +11,4 @@ oddjob-0_25-6:FC-4:oddjob-0.25-6.src.rpm:1144794136 oddjob-0_25-7:FC-5:oddjob-0.25-7.src.rpm:1144794170 oddjob-0_25-8:HEAD:oddjob-0.25-8.src.rpm:1144794233 +oddjob-0_26-1:FC-3:oddjob-0.26-1.src.rpm:1146612987 From fedora-extras-commits at redhat.com Tue May 2 23:36:34 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:36:34 -0700 Subject: rpms/oddjob/FC-3 .cvsignore, 1.4, 1.5 oddjob.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605022336.k42NaaEo002767@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2728/FC-3 Modified Files: .cvsignore oddjob.spec sources Log Message: auto-import oddjob-0.26-1 on branch FC-3 from oddjob-0.26-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2006 22:18:57 -0000 1.4 +++ .cvsignore 2 May 2006 23:36:33 -0000 1.5 @@ -1 +1 @@ -oddjob-0.25-1.tar.gz +oddjob-0.26-1.tar.gz Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-3/oddjob.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- oddjob.spec 11 Apr 2006 22:21:02 -0000 1.5 +++ oddjob.spec 2 May 2006 23:36:33 -0000 1.6 @@ -1,8 +1,8 @@ %define build_sample 0 Name: oddjob -Version: 0.25 -Release: 5 +Version: 0.26 +Release: 1 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,6 +26,7 @@ Group: Development/Libraries Summary: Files for developing oddjob clients Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains header files and static libraries which aid in the @@ -143,6 +144,24 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue May 2 2006 Nalin Dahyabhai 0.26-1 +- update to 0.26-1: + - don't get confused when ACL entries for introspection show up in the + configuration before we add the handlers for them + - export $ODDJOB_CALLING_USER to helpers + +* Tue May 2 2006 Nalin Dahyabhai +- add recommended dependency on pkgconfig in the -devel subpackage + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-8 +- rebuild + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-7 +- rebuild + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-6 +- rebuild + * Tue Apr 11 2006 Nalin Dahyabhai 0.25-5 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2006 22:18:57 -0000 1.4 +++ sources 2 May 2006 23:36:33 -0000 1.5 @@ -1 +1 @@ -097d0a926874551a661f33d4c2db5169 oddjob-0.25-1.tar.gz +f564acf65081c7e83f4ab4c428715bd1 oddjob-0.26-1.tar.gz From fedora-extras-commits at redhat.com Tue May 2 23:41:09 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:41:09 -0700 Subject: rpms/oddjob import.log,1.15,1.16 Message-ID: <200605022341.k42Nffu4002899@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2864 Modified Files: import.log Log Message: auto-import oddjob-0.26-2 on branch FC-4 from oddjob-0.26-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oddjob/import.log,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- import.log 2 May 2006 23:36:33 -0000 1.15 +++ import.log 2 May 2006 23:41:09 -0000 1.16 @@ -12,3 +12,4 @@ oddjob-0_25-7:FC-5:oddjob-0.25-7.src.rpm:1144794170 oddjob-0_25-8:HEAD:oddjob-0.25-8.src.rpm:1144794233 oddjob-0_26-1:FC-3:oddjob-0.26-1.src.rpm:1146612987 +oddjob-0_26-2:FC-4:oddjob-0.26-2.src.rpm:1146613262 From fedora-extras-commits at redhat.com Tue May 2 23:41:10 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:41:10 -0700 Subject: rpms/oddjob/FC-4 .cvsignore, 1.4, 1.5 oddjob.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605022341.k42Nfggq002904@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2864/FC-4 Modified Files: .cvsignore oddjob.spec sources Log Message: auto-import oddjob-0.26-2 on branch FC-4 from oddjob-0.26-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2006 22:22:20 -0000 1.4 +++ .cvsignore 2 May 2006 23:41:09 -0000 1.5 @@ -1 +1 @@ -oddjob-0.25-1.tar.gz +oddjob-0.26-1.tar.gz Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-4/oddjob.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- oddjob.spec 11 Apr 2006 22:22:20 -0000 1.3 +++ oddjob.spec 2 May 2006 23:41:09 -0000 1.4 @@ -1,8 +1,8 @@ %define build_sample 0 Name: oddjob -Version: 0.25 -Release: 6 +Version: 0.26 +Release: 2 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,6 +26,7 @@ Group: Development/Libraries Summary: Files for developing oddjob clients Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains header files and static libraries which aid in the @@ -143,6 +144,27 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue May 2 2006 Nalin Dahyabhai 0.26-2 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1.1 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1 +- update to 0.26-1: + - don't get confused when ACL entries for introspection show up in the + configuration before we add the handlers for them + - export $ODDJOB_CALLING_USER to helpers + +* Tue May 2 2006 Nalin Dahyabhai +- add recommended dependency on pkgconfig in the -devel subpackage + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-8 +- rebuild + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-7 +- rebuild + * Tue Apr 11 2006 Nalin Dahyabhai 0.25-6 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2006 22:22:20 -0000 1.4 +++ sources 2 May 2006 23:41:09 -0000 1.5 @@ -1 +1 @@ -097d0a926874551a661f33d4c2db5169 oddjob-0.25-1.tar.gz +f564acf65081c7e83f4ab4c428715bd1 oddjob-0.26-1.tar.gz From fedora-extras-commits at redhat.com Tue May 2 23:43:11 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:43:11 -0700 Subject: rpms/oddjob/FC-5 .cvsignore, 1.4, 1.5 oddjob.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605022343.k42NhDbq003022@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2982/FC-5 Modified Files: .cvsignore oddjob.spec sources Log Message: auto-import oddjob-0.26-3 on branch FC-5 from oddjob-0.26-3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2006 22:22:54 -0000 1.4 +++ .cvsignore 2 May 2006 23:43:11 -0000 1.5 @@ -1 +1 @@ -oddjob-0.25-1.tar.gz +oddjob-0.26-1.tar.gz Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-5/oddjob.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- oddjob.spec 11 Apr 2006 22:22:54 -0000 1.3 +++ oddjob.spec 2 May 2006 23:43:11 -0000 1.4 @@ -1,8 +1,8 @@ %define build_sample 0 Name: oddjob -Version: 0.25 -Release: 7 +Version: 0.26 +Release: 3 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,6 +26,7 @@ Group: Development/Libraries Summary: Files for developing oddjob clients Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains header files and static libraries which aid in the @@ -143,6 +144,27 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue May 2 2006 Nalin Dahyabhai 0.26-3 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-2 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1.1 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1 +- update to 0.26-1: + - don't get confused when ACL entries for introspection show up in the + configuration before we add the handlers for them + - export $ODDJOB_CALLING_USER to helpers + +* Tue May 2 2006 Nalin Dahyabhai +- add recommended dependency on pkgconfig in the -devel subpackage + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-8 +- rebuild + * Tue Apr 11 2006 Nalin Dahyabhai 0.25-7 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2006 22:22:54 -0000 1.4 +++ sources 2 May 2006 23:43:11 -0000 1.5 @@ -1 +1 @@ -097d0a926874551a661f33d4c2db5169 oddjob-0.25-1.tar.gz +f564acf65081c7e83f4ab4c428715bd1 oddjob-0.26-1.tar.gz From fedora-extras-commits at redhat.com Tue May 2 23:43:10 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:43:10 -0700 Subject: rpms/oddjob import.log,1.16,1.17 Message-ID: <200605022343.k42NhC7I003015@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2982 Modified Files: import.log Log Message: auto-import oddjob-0.26-3 on branch FC-5 from oddjob-0.26-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oddjob/import.log,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- import.log 2 May 2006 23:41:09 -0000 1.16 +++ import.log 2 May 2006 23:43:10 -0000 1.17 @@ -13,3 +13,4 @@ oddjob-0_25-8:HEAD:oddjob-0.25-8.src.rpm:1144794233 oddjob-0_26-1:FC-3:oddjob-0.26-1.src.rpm:1146612987 oddjob-0_26-2:FC-4:oddjob-0.26-2.src.rpm:1146613262 +oddjob-0_26-3:FC-5:oddjob-0.26-3.src.rpm:1146613384 From fedora-extras-commits at redhat.com Tue May 2 23:44:07 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:44:07 -0700 Subject: rpms/oddjob import.log,1.17,1.18 Message-ID: <200605022344.k42Ni9J0003123@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3085 Modified Files: import.log Log Message: auto-import oddjob-0.26-4 on branch devel from oddjob-0.26-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oddjob/import.log,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- import.log 2 May 2006 23:43:10 -0000 1.17 +++ import.log 2 May 2006 23:44:07 -0000 1.18 @@ -14,3 +14,4 @@ oddjob-0_26-1:FC-3:oddjob-0.26-1.src.rpm:1146612987 oddjob-0_26-2:FC-4:oddjob-0.26-2.src.rpm:1146613262 oddjob-0_26-3:FC-5:oddjob-0.26-3.src.rpm:1146613384 +oddjob-0_26-4:HEAD:oddjob-0.26-4.src.rpm:1146613440 From fedora-extras-commits at redhat.com Tue May 2 23:44:07 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:44:07 -0700 Subject: rpms/oddjob/devel .cvsignore, 1.4, 1.5 oddjob.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605022344.k42Ni94S003129@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3085/devel Modified Files: .cvsignore oddjob.spec sources Log Message: auto-import oddjob-0.26-4 on branch devel from oddjob-0.26-4.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oddjob/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2006 22:14:54 -0000 1.4 +++ .cvsignore 2 May 2006 23:44:07 -0000 1.5 @@ -1 +1 @@ -oddjob-0.25-1.tar.gz +oddjob-0.26-1.tar.gz Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- oddjob.spec 11 Apr 2006 22:23:58 -0000 1.7 +++ oddjob.spec 2 May 2006 23:44:07 -0000 1.8 @@ -1,8 +1,8 @@ %define build_sample 0 Name: oddjob -Version: 0.25 -Release: 8 +Version: 0.26 +Release: 4 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,6 +26,7 @@ Group: Development/Libraries Summary: Files for developing oddjob clients Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains header files and static libraries which aid in the @@ -143,6 +144,27 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue May 2 2006 Nalin Dahyabhai 0.26-4 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-3 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-2 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1.1 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1 +- update to 0.26-1: + - don't get confused when ACL entries for introspection show up in the + configuration before we add the handlers for them + - export $ODDJOB_CALLING_USER to helpers + +* Tue May 2 2006 Nalin Dahyabhai +- add recommended dependency on pkgconfig in the -devel subpackage + * Tue Apr 11 2006 Nalin Dahyabhai 0.25-8 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/oddjob/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2006 22:14:54 -0000 1.4 +++ sources 2 May 2006 23:44:07 -0000 1.5 @@ -1 +1 @@ -097d0a926874551a661f33d4c2db5169 oddjob-0.25-1.tar.gz +f564acf65081c7e83f4ab4c428715bd1 oddjob-0.26-1.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:11:42 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:11:42 -0700 Subject: rpms/python-astng/devel .cvsignore, 1.5, 1.6 python-astng.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605030211.k432Binw010285@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10225/devel Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.16.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 18:15:40 -0000 1.5 +++ .cvsignore 3 May 2006 02:11:42 -0000 1.6 @@ -1 +1 @@ -astng-0.15.1.tar.gz +astng-0.16.0.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/python-astng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-astng.spec 12 Mar 2006 18:15:40 -0000 1.6 +++ python-astng.spec 3 May 2006 02:11:42 -0000 1.7 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.15.1 -Release: 1%{?dist} +Version: 0.16.0 +Release: 0%{?dist} Summary: Python Abstract Syntax Tree New Generation Group: Development/Languages @@ -53,6 +53,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.16.0-0 +- Version 0.16.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 - Version 0.15.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 18:15:40 -0000 1.5 +++ sources 3 May 2006 02:11:42 -0000 1.6 @@ -1 +1 @@ -2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz +636b57a742ad5d9cb030429eca9841e9 astng-0.16.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:11:41 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:11:41 -0700 Subject: rpms/python-astng/FC-5 .cvsignore, 1.5, 1.6 python-astng.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605030211.k432BhnQ010279@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10225/FC-5 Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.16.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 18:15:40 -0000 1.5 +++ .cvsignore 3 May 2006 02:11:41 -0000 1.6 @@ -1 +1 @@ -astng-0.15.1.tar.gz +astng-0.16.0.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-5/python-astng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-astng.spec 12 Mar 2006 18:15:40 -0000 1.6 +++ python-astng.spec 3 May 2006 02:11:41 -0000 1.7 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.15.1 -Release: 1%{?dist} +Version: 0.16.0 +Release: 0%{?dist} Summary: Python Abstract Syntax Tree New Generation Group: Development/Languages @@ -53,6 +53,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.16.0-0 +- Version 0.16.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 - Version 0.15.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 18:15:40 -0000 1.5 +++ sources 3 May 2006 02:11:41 -0000 1.6 @@ -1 +1 @@ -2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz +636b57a742ad5d9cb030429eca9841e9 astng-0.16.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:11:41 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:11:41 -0700 Subject: rpms/python-astng/FC-4 .cvsignore, 1.5, 1.6 python-astng.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605030212.k432CDGX010290@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10225/FC-4 Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.16.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 18:15:25 -0000 1.5 +++ .cvsignore 3 May 2006 02:11:40 -0000 1.6 @@ -1 +1 @@ -astng-0.15.1.tar.gz +astng-0.16.0.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/python-astng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-astng.spec 12 Mar 2006 18:15:25 -0000 1.6 +++ python-astng.spec 3 May 2006 02:11:40 -0000 1.7 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.15.1 -Release: 1%{?dist} +Version: 0.16.0 +Release: 0%{?dist} Summary: Python Abstract Syntax Tree New Generation Group: Development/Languages @@ -53,6 +53,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.16.0-0 +- Version 0.16.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 - Version 0.15.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 18:15:25 -0000 1.5 +++ sources 3 May 2006 02:11:40 -0000 1.6 @@ -1 +1 @@ -2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz +636b57a742ad5d9cb030429eca9841e9 astng-0.16.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:14:22 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:14:22 -0700 Subject: rpms/pylint/FC-4 .cvsignore, 1.6, 1.7 pylint.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605030214.k432EOIp010467@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10412/FC-4 Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:18:21 -0000 1.6 +++ .cvsignore 3 May 2006 02:14:22 -0000 1.7 @@ -1 +1 @@ -pylint-0.10.0.tar.gz +pylint-0.11.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/pylint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pylint.spec 12 Mar 2006 18:18:21 -0000 1.6 +++ pylint.spec 3 May 2006 02:14:22 -0000 1.7 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.11.0-0 +- Version 0.11.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 - Version 0.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:18:21 -0000 1.6 +++ sources 3 May 2006 02:14:22 -0000 1.7 @@ -1 +1 @@ -9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz +6c2cd68c49c5a672124c2399b248fb3b pylint-0.11.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:14:23 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:14:23 -0700 Subject: rpms/pylint/FC-5 .cvsignore, 1.6, 1.7 pylint.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605030214.k432EPPW010473@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10412/FC-5 Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:18:26 -0000 1.6 +++ .cvsignore 3 May 2006 02:14:23 -0000 1.7 @@ -1 +1 @@ -pylint-0.10.0.tar.gz +pylint-0.11.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-5/pylint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pylint.spec 12 Mar 2006 18:18:26 -0000 1.6 +++ pylint.spec 3 May 2006 02:14:23 -0000 1.7 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.11.0-0 +- Version 0.11.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 - Version 0.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:18:26 -0000 1.6 +++ sources 3 May 2006 02:14:23 -0000 1.7 @@ -1 +1 @@ -9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz +6c2cd68c49c5a672124c2399b248fb3b pylint-0.11.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:14:24 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:14:24 -0700 Subject: rpms/pylint/devel .cvsignore, 1.6, 1.7 pylint.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605030214.k432EQg7010479@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10412/devel Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:18:26 -0000 1.6 +++ .cvsignore 3 May 2006 02:14:23 -0000 1.7 @@ -1 +1 @@ -pylint-0.10.0.tar.gz +pylint-0.11.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/pylint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pylint.spec 12 Mar 2006 18:18:26 -0000 1.6 +++ pylint.spec 3 May 2006 02:14:23 -0000 1.7 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.11.0-0 +- Version 0.11.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 - Version 0.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:18:26 -0000 1.6 +++ sources 3 May 2006 02:14:23 -0000 1.7 @@ -1 +1 @@ -9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz +6c2cd68c49c5a672124c2399b248fb3b pylint-0.11.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 04:02:11 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 21:02:11 -0700 Subject: rpms/libxml++/devel .cvsignore, 1.4, 1.5 libxml++.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605030402.k4342D19015250@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/libxml++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175/devel Modified Files: .cvsignore libxml++.spec sources Log Message: Version 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxml++/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2005 04:26:50 -0000 1.4 +++ .cvsignore 3 May 2006 04:02:11 -0000 1.5 @@ -1 +1 @@ -libxml++-2.12.0.tar.bz2 +libxml++-2.14.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libxml++.spec 13 Feb 2006 19:17:55 -0000 1.12 +++ libxml++.spec 3 May 2006 04:02:11 -0000 1.13 @@ -1,6 +1,6 @@ Name: libxml++ -Version: 2.12.0 -Release: 2.1%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries @@ -78,6 +78,9 @@ %changelog +* Tue May 02 2006 Konstantin Ryabitsev - 2.14.0-1 +- Version 2.14.0 + * Mon Feb 13 2006 Konstantin Ryabitsev - 2.12.0-2.1 - FC5 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxml++/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2005 04:26:50 -0000 1.4 +++ sources 3 May 2006 04:02:11 -0000 1.5 @@ -1 +1 @@ -062653883d0ce38a3c7b4ec85b2bfe4b libxml++-2.12.0.tar.bz2 +4f5644788dfd6ba87ce7c9b6cc28890d libxml++-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 04:02:10 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 21:02:10 -0700 Subject: rpms/libxml++/FC-5 .cvsignore, 1.4, 1.5 libxml++.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605030402.k4342CQ4015246@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/libxml++/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175/FC-5 Modified Files: .cvsignore libxml++.spec sources Log Message: Version 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2005 04:26:50 -0000 1.4 +++ .cvsignore 3 May 2006 04:02:10 -0000 1.5 @@ -1 +1 @@ -libxml++-2.12.0.tar.bz2 +libxml++-2.14.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-5/libxml++.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libxml++.spec 13 Feb 2006 19:17:55 -0000 1.12 +++ libxml++.spec 3 May 2006 04:02:10 -0000 1.13 @@ -1,6 +1,6 @@ Name: libxml++ -Version: 2.12.0 -Release: 2.1%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries @@ -78,6 +78,9 @@ %changelog +* Tue May 02 2006 Konstantin Ryabitsev - 2.14.0-1 +- Version 2.14.0 + * Mon Feb 13 2006 Konstantin Ryabitsev - 2.12.0-2.1 - FC5 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2005 04:26:50 -0000 1.4 +++ sources 3 May 2006 04:02:10 -0000 1.5 @@ -1 +1 @@ -062653883d0ce38a3c7b4ec85b2bfe4b libxml++-2.12.0.tar.bz2 +4f5644788dfd6ba87ce7c9b6cc28890d libxml++-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 04:01:58 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 21:01:58 -0700 Subject: rpms/libxml++/FC-3 .cvsignore, 1.3, 1.4 libxml++.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605030402.k4342VPM015259@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/libxml++/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175/FC-3 Modified Files: .cvsignore libxml++.spec sources Log Message: Version 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Oct 2005 20:12:33 -0000 1.3 +++ .cvsignore 3 May 2006 04:01:58 -0000 1.4 @@ -1 +1 @@ -libxml++-2.12.0.tar.bz2 +libxml++-2.14.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-3/libxml++.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libxml++.spec 26 Jan 2006 15:25:33 -0000 1.6 +++ libxml++.spec 3 May 2006 04:01:58 -0000 1.7 @@ -1,6 +1,6 @@ Name: libxml++ -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries @@ -78,6 +78,12 @@ %changelog +* Tue May 02 2006 Konstantin Ryabitsev - 2.14.0-1 +- Version 2.14.0 + +* Mon Feb 13 2006 Konstantin Ryabitsev - 2.12.0-2.1 +- FC5 Rebuild + * Thu Jan 26 2006 Konstantin Ryabitsev - 2.12.0-2 - Rebuilt to address RH #178592 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Oct 2005 20:12:33 -0000 1.3 +++ sources 3 May 2006 04:01:58 -0000 1.4 @@ -1 +1 @@ -062653883d0ce38a3c7b4ec85b2bfe4b libxml++-2.12.0.tar.bz2 +4f5644788dfd6ba87ce7c9b6cc28890d libxml++-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 04:02:06 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 21:02:06 -0700 Subject: rpms/libxml++/FC-4 .cvsignore, 1.4, 1.5 libxml++.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605030402.k4342cUu015264@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/libxml++/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175/FC-4 Modified Files: .cvsignore libxml++.spec sources Log Message: Version 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2005 04:09:56 -0000 1.4 +++ .cvsignore 3 May 2006 04:02:06 -0000 1.5 @@ -1 +1 @@ -libxml++-2.12.0.tar.bz2 +libxml++-2.14.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libxml++.spec 26 Jan 2006 15:25:39 -0000 1.12 +++ libxml++.spec 3 May 2006 04:02:06 -0000 1.13 @@ -1,6 +1,6 @@ Name: libxml++ -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries @@ -78,6 +78,12 @@ %changelog +* Tue May 02 2006 Konstantin Ryabitsev - 2.14.0-1 +- Version 2.14.0 + +* Mon Feb 13 2006 Konstantin Ryabitsev - 2.12.0-2.1 +- FC5 Rebuild + * Thu Jan 26 2006 Konstantin Ryabitsev - 2.12.0-2 - Rebuilt to address RH #178592 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2005 04:09:56 -0000 1.4 +++ sources 3 May 2006 04:02:06 -0000 1.5 @@ -1 +1 @@ -062653883d0ce38a3c7b4ec85b2bfe4b libxml++-2.12.0.tar.bz2 +4f5644788dfd6ba87ce7c9b6cc28890d libxml++-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 04:04:29 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 May 2006 21:04:29 -0700 Subject: extras-buildsys ChangeLog,1.184,1.185 Message-ID: <200605030404.k4344T2t015372@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275 Modified Files: ChangeLog Log Message: 2006-05-03 Dan Williams More builder/server comm rework; - Add job status command - implement repo unlock command - fix bugs Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- ChangeLog 28 Apr 2006 03:17:34 -0000 1.184 +++ ChangeLog 3 May 2006 04:04:27 -0000 1.185 @@ -1,3 +1,10 @@ +2006-05-03 Dan Williams + + More builder/server comm rework; + - Add job status command + - implement repo unlock command + - fix bugs + 2006-04-27 Dan Williams Commit partial rework of builder<->server communcation. From fedora-extras-commits at redhat.com Wed May 3 04:04:30 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 May 2006 21:04:30 -0700 Subject: extras-buildsys/common Commands.py,1.1,1.2 HTTPServer.py,1.13,1.14 Message-ID: <200605030404.k4344UUC015386@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/common Modified Files: Commands.py HTTPServer.py Log Message: 2006-05-03 Dan Williams More builder/server comm rework; - Add job status command - implement repo unlock command - fix bugs Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Commands.py 28 Apr 2006 03:17:40 -0000 1.1 +++ Commands.py 3 May 2006 04:04:28 -0000 1.2 @@ -28,6 +28,12 @@ CMD_NAME_SLOTS = "Slots" CMD_NAME_NEW_JOB_REQ = "NewJob" CMD_NAME_NEW_JOB_ACK = "NewJobAck" +CMD_NAME_UNLOCK_REPO = "UnlockRepo" +CMD_NAME_JOB_FILES_REQ = "JobFiles" +CMD_NAME_JOB_FILES_ACK = "JobFilesAck" +CMD_NAME_BUILDING_JOBS = "BuildingJobs" +CMD_NAME_JOB_STATUS_REQ = "JobStatus" +CMD_NAME_JOB_STATUS_ACK = "JobStatusAck" class SequenceGenerator(object): @@ -119,6 +125,8 @@ cmd = PlgCommandNewJobReq._deserialize(args) elif name == CMD_NAME_NEW_JOB_ACK: cmd = PlgCommandNewJobAck._deserialize(args) + elif name == CMD_NAME_BUILDING_JOBS: + cmd = PlgCommandBuildingJobs._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't @@ -376,3 +384,138 @@ def message(self): return self._msg + +class PlgCommandUnlockRepo(PlgCommand): + def __init__(self, archjob_id, seq=0): + PlgCommand.__init__(self, CMD_NAME_UNLOCK_REPO, seq) + self._archjob_id = archjob_id + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except ValueError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + return PlgCommandUnlockRepo(archjob_id) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def __str__(self): + return "%s(seq: %d, archjob_id: %s)" % (self._name, self._seq, self._archjob_id) + + +class PlgCommandBuildingJobs(PlgCommand): + def __init__(self, seq=0): + PlgCommand.__init__(self, CMD_NAME_BUILDING_JOBS, seq) + self._jobs = [] + + def _deserialize(args): + try: + jobs = args['jobs'] + except ValueError, TypeError: + raise ValueError("No 'jobs' argument found.") + + # Basic sanity + if type(jobs) != type([]): + print "Jobs is type %s" % type(jobs) + raise ValueError("jobs wasn't a list.") + try: + for job in jobs: + archjob_id = job['archjob_id'] + status = job['status'] + except KeyError, e: + raise ValueError("Required item '%s' wasn't found in jobs item.") + + cmd = PlgCommandBuildingJobs() + for job in jobs: + cmd.add_job(job['archjob_id'], job['status']) + return cmd + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['jobs'] = self._jobs + return PlgCommand._serialize(self, args) + + def jobs(self): + return self._jobs + + def add_job(self, archjob_id, status): + self._jobs.append({'archjob_id': archjob_id, 'status': status}) + + def get_job(self, job): + return (job['archjob_id'], job['status']) + + def __str__(self): + return "%s(seq: %d, jobs: %s)" % (self._name, self._seq, self._jobs) + + +class PlgCommandJobStatus(PlgCommand): + + _need_ack = True + + def __init__(self, archjob_id, seq=0): + PlgCommand.__init__(self, CMD_NAME_JOB_STATUS_REQ, seq) + self._archjob_id = archjob_id + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except KeyError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + + return PlgCommandJobStatusReq(archjob_id) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def __str__(self): + return "%s(seq: %d, target_dict: %s, srpm_url: %s)" % (self._name, self._seq, self._archjob_id) + + +class PlgCommandJobStatusAck(PlgCommandAck): + def __init__(self, archjob_id, status, req_seq, seq=0): + PlgCommandAck.__init__(self, CMD_NAME_JOB_STATUS_ACK, req_seq, seq) + self._archjob_id = archjob_id + self._status = status + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except KeyError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + try: + status = args['status'] + except KeyError, TypeError: + raise ValueError("No 'status' argument found.") + req_seq = PlgCommandAck._deserialize_acked_seq(args) + return PlgCommandJobStatusAck(archjob_id, status, req_seq) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + args['status'] = self._status + return PlgCommandAck._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def status(self): + return self._status Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- HTTPServer.py 28 Apr 2006 03:17:40 -0000 1.13 +++ HTTPServer.py 3 May 2006 04:04:28 -0000 1.14 @@ -182,12 +182,12 @@ def stop(self): self._server.stop() t = time.time() - while not self._stopped: - try: + try: + while not self._stopped: if time.time() > t + 2: break - except KeyboardInterrupt: - pass + except KeyboardInterrupt: + pass ########################################################### From fedora-extras-commits at redhat.com Wed May 3 04:04:31 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 May 2006 21:04:31 -0700 Subject: extras-buildsys/server ArchJob.py, 1.27, 1.28 Builder.py, 1.34, 1.35 PackageJob.py, 1.45, 1.46 Message-ID: <200605030404.k4344VFs015393@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/server Modified Files: ArchJob.py Builder.py PackageJob.py Log Message: 2006-05-03 Dan Williams More builder/server comm rework; - Add job status command - implement repo unlock command - fix bugs Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ArchJob.py 20 Mar 2006 12:47:01 -0000 1.27 +++ ArchJob.py 3 May 2006 04:04:28 -0000 1.28 @@ -38,12 +38,10 @@ class ArchJob: """ Tracks a single build instance for a single arch on a builder """ - def __init__(self, builder, cfg, server, par_job, jobid, target_dict): + def __init__(self, builder, par_job, jobid, target_dict): self.par_job = par_job - self.builder = builder + self._builder = builder self._repo = par_job.repo() - self._server = server - self._use_ssl = cfg.get_bool("Builders", "use_ssl") self.jobid = jobid self._status = 'starting' self._builder_status = '' @@ -61,15 +59,6 @@ self._die_lock = threading.Lock() self._prepping = False - # SSL certificate and key filenames - if self._use_ssl: - self._certs = {} - self._certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") - self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") - else: - self._certs = None - def failure_noticed(self): return self._failure_noticed @@ -98,12 +87,15 @@ def arch(self): return self._target_dict['arch'] + def builder(self): + return self._builder + def _to_dict(self): attrdict = {} attrdict['jobid'] = self.jobid attrdict['parent_uid'] = self.par_job.uid attrdict['arch'] = self._target_dict['arch'] - addr = self.builder.address() + (ip, 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"): @@ -137,22 +129,6 @@ self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) del attrdict - def _send_repo_unlocked(self): - success = False - try: - self._server.repo_unlocked(self.jobid) - success = True - except socket.error, e: - if not CommonErrors.canIgnoreSocketError(e): - print "%s (%s/%s): [ %s ] Unknown error sending repo unlocked: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), e) - except socket.timeout, e: - print "%s (%s/%s): [ %s ] Timeout sending repo unlocked: '%s'. Trying again." % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), e) - except xmlrpclib.ProtocolError, e: - pass - return success - def _dl_files(self): files = [] success = False @@ -162,10 +138,10 @@ except socket.error, e: if not CommonErrors.canIgnoreSocketError(e): print "%s (%s/%s): [ %s ] Unknown error getting file list: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), e) + self.par_job.package, self._target_dict['arch'], self._builder.address(), e) except socket.timeout, e: print "%s (%s/%s): [ %s ] Timeout getting file list: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), e) + self.par_job.package, self._target_dict['arch'], self._builder.address(), e) except xmlrpclib.ProtocolError, e: pass return (success, files) @@ -193,10 +169,10 @@ def _status_repo_unlock(self): # Builder will be in 'downloaded' state until # it notices that the repo has been unlocked - if self._send_repo_unlocked(): - self._prepping = True - if self._builder_status != 'downloaded': - self._set_status('running') + self._builder.unlock_repo_for_job(self._uniqid) + self._prepping = True + if self._builder_status != 'downloaded': + self._set_status('running') def _status_running(self): if self._builder_status != 'prepping': @@ -279,7 +255,7 @@ dl_dict[DL_STATUS] = STATUS_INPROGRESS except FileDownloader.FileNameException, e: print "%s (%s/%s): [ %s ] Bad file name error getting %s: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), url, e) + self.par_job.package, self._target_dict['arch'], self._builder.address(), url, e) # Hard error, we don't retry this one dl_dict[DL_STATUS] = STATUS_ERROR break Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Builder.py 28 Apr 2006 03:17:41 -0000 1.34 +++ Builder.py 3 May 2006 04:04:28 -0000 1.35 @@ -181,6 +181,41 @@ builder_dict['free_slots'] = self._free_slots return builder_dict + def _handle_building_jobs(self, cmd): + building_jobs = cmd.jobs() + reported_uniqids = [] + new_cmds = [] + print "Building Jobs: %s" % building_jobs + for item in building_jobs: + (uniqid, status) = cmd.get_job(item) + try: + job = self._jobs[uniqid] + job.set_builder_job_status(status) +# reported_uniqids.append(uniqid) + except KeyError: + pass + + # We have to check jobs that weren't reported + # as 'building' by the builder, since the job + # may have finished on the builder and was + # removed from the building job list before we + # were able to know that it was done. HACK + self._prepping_jobs = False + for jobid in self._jobs.keys(): + # If the builder didn't report this job as building, + # and its not done, explicitly get its status + job = self._jobs[jobid] + if jobid not in reported_uniqids and job.get_status() != 'done': + new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) + + # Check for prepping jobs + if job.prepping(): + self._prepping_jobs = True + + del reported_uniqids + print "New Commands: %s" % new_cmds + return new_cmds + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt class BuildingJobsCheck(threading.Thread): @@ -450,6 +485,18 @@ def _init_builder(self, target_list): self._target_list = target_list + def unlock_repo_for_job(self, uniqid): + """Called by an archjob to request the sending of a RepoUnlocked + command to the builder for a particular archjob.""" + + cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + + def request_job_files(self, archjob): + pass + def _handle_new_job_ack(self, ack): """Handle a NewJobAck command by finding the original command sent to the builder, removing it from the command queue, and notifying @@ -457,16 +504,18 @@ old_cmd = None self._lock.acquire() - for old_cmd in self._cmd_queue: - if old_cmd.seq() == ack.acked_seq() and isinstance(old_cmd, Commands.PlgCommandNewJobReq): - self._cmd_queue.remove(old_cmd) + for queued_cmd in self._cmd_queue: + if queued_cmd.seq() == ack.acked_seq() and isinstance(queued_cmd, Commands.PlgCommandNewJobReq): + old_cmd = queued_cmd + self._cmd_queue.remove(queued_cmd) break self._lock.release() if old_cmd: parent = old_cmd.parent_job() - archjob = ArchJob.ArchJob(self, parent, ack.archjob_id(), old_cmd.target_dict()) - self._jobs[jobid] = archjob + archjob_id = ack.archjob_id() + archjob = ArchJob.ArchJob(self, parent, archjob_id, old_cmd.target_dict()) + self._jobs[archjob_id] = archjob parent.add_arch_job(archjob) def _dispatch_command(self, cmd): @@ -482,6 +531,13 @@ self._lock.release() elif isinstance(cmd, Commands.PlgCommandNewJobAck): self._handle_new_job_ack(cmd) + elif isinstance(cmd, Commands.PlgCommandBuildingJobs): + status_reqs = self._handle_building_jobs(cmd) + # Add any additional status requests onto our pending command queue + if len(status_reqs) > 0: + self._lock.acquire() + self._cmd_queue = self._cmd_queue + status_reqs + self._lock.release() else: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- PackageJob.py 24 Mar 2006 01:33:31 -0000 1.45 +++ PackageJob.py 3 May 2006 04:04:28 -0000 1.46 @@ -672,7 +672,7 @@ t.start() self._archjobs_lock.release() - log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, job.builder.address(), job.jobid)) + log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, job.builder().address(), job.jobid)) def remove_arch_job(self, job): """ Removes an arch job when its builder is no longer responding """ @@ -801,7 +801,7 @@ msg = "Job failed on arch %s\n" % jobarch elif job.download_failed(): msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \ - "Please contact the build system administrator." % (jobarch, job.builder.address()) + "Please contact the build system administrator." % (jobarch, job.builder().address()) elif job.internal_failure(): msg = "Job failed on arch %s: there was an internal build system failure.\n " \ "Please contact the build system administrator." % jobarch From fedora-extras-commits at redhat.com Wed May 3 04:04:30 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 May 2006 21:04:30 -0700 Subject: extras-buildsys/builder Builder.py,1.1,1.2 BuilderMock.py,1.1,1.2 Message-ID: <200605030404.k4344UPK015379@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-03 Dan Williams More builder/server comm rework; - Add job status command - implement repo unlock command - fix bugs Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/Builder.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Builder.py 28 Apr 2006 03:17:35 -0000 1.1 +++ Builder.py 3 May 2006 04:04:27 -0000 1.2 @@ -99,7 +99,7 @@ def repo_unlocked(self, uniqid): try: job = self._all_jobs[uniqid] - job.repo_unlocked() + job.unlock_repo() except KeyError: pass return 0 @@ -271,6 +271,32 @@ self._log(msg) return (uniqid, msg) + def _get_building_jobs_cmd(self): + jobs_list = [] + cmd = Commands.PlgCommandBuildingJobs(self._seq_gen.next()) + self._building_jobs_lock.acquire() + for job in self._building_jobs: + cmd.add_job(job.uniqid(), job.status()) + self._building_jobs_lock.release() + return cmd + + def _handle_unlock_repo_request(self, cmd): + uniqid = cmd.archjob_id() + self._building_jobs_lock.acquire() + for item in self._building_jobs: + if job.uniqid() == uniqid: + job.unlock_repo() + self._building_jobs_lock.release() + + def _handle_job_status_request(self, cmd): + reply = None + try: + uniqid = cmd.archjob_id() + job = self._all_jobs[uniqid] + reply = Commands.PlgCommandJobStatusAck(uniqid, job.status(), cmd.seq(), self._seq_gen.next()) + except KeyError, e: + pass + return reply class PassiveBuilder(Builder): """ @@ -405,6 +431,8 @@ cmd = Commands.PlgCommandSlots(free, max, next_seq) defcmds.append(cmd) + defcmds.append(self._get_building_jobs_cmd()) + return defcmds def _send_commands(self): @@ -438,6 +466,12 @@ (uniqid, msg) = self._start_new_job(cmd.target_dict(), cmd.srpm_url()) ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) self._queued_cmds.append(ack) + elif isinstance(cmd, Commands.PlgCommandUnlockRepo): + self._handle_unlock_repo_request(cmd) + elif isinstance(cmd, Commands.PlgCommandJobStatus): + reply = self._handle_job_status_request() + if reply: + self._queued_cmds = self._queued_cmds + reply def _process_server_response(self, response): """Process the server's response.""" Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BuilderMock.py 28 Apr 2006 03:17:35 -0000 1.1 +++ BuilderMock.py 3 May 2006 04:04:27 -0000 1.2 @@ -493,7 +493,7 @@ def files(self): return self._files - def repo_unlocked(self): + def unlock_repo(self): self._repo_locked = False def is_done_status(self): From fedora-extras-commits at redhat.com Wed May 3 05:03:43 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 2 May 2006 22:03:43 -0700 Subject: rpms/wifiroamd/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wifiroamd.spec, 1.1, 1.2 Message-ID: <200605030503.k4353jZ0017959@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17904/devel Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 17:48:58 -0000 1.2 +++ .cvsignore 3 May 2006 05:03:43 -0000 1.3 @@ -1 +1 @@ -wifiroamd-1.05.tar.gz +wifiroamd-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 17:48:58 -0000 1.2 +++ sources 3 May 2006 05:03:43 -0000 1.3 @@ -1 +1 @@ -697166fe19c150ae312276ff0eb0fe40 wifiroamd-1.05.tar.gz +197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/wifiroamd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wifiroamd.spec 21 Apr 2006 17:48:58 -0000 1.1 +++ wifiroamd.spec 3 May 2006 05:03:43 -0000 1.2 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -48,6 +48,9 @@ %{__mkdir} -p $RPM_BUILD_ROOT/etc/init.d %{__cp} wifiroamd.init $RPM_BUILD_ROOT/etc/init.d/wifiroamd +%{__mkdir} -p $RPM_BUILD_ROOT/etc/sysconfig +%{__cp} wifiroamd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/wifiroamd + %{__mkdir} -p $RPM_BUILD_ROOT/var/lib/wifiroamd/dhclient-leases %{__mkdir} -p $RPM_BUILD_ROOT/etc/cron.daily @@ -90,6 +93,7 @@ %dir /etc/wifiroamd/seen # config-default should not be user-modified. %config /etc/wifiroamd/config-defaults +%config /etc/sysconfig/wifiroamd %attr(755,root,root) /etc/wifiroamd/scripts/monitor_pinggw.d/* %attr(755,root,root) /etc/wifiroamd/scripts/reset.d/* %attr(755,root,root) /etc/wifiroamd/scripts/up.d/* @@ -103,6 +107,9 @@ %doc debian/copyright %changelog +* Wed May 3 2006 Ed Hill - 1.06-1 +- new upstream 1.06 + * Sun Mar 12 2006 Sean Reifschneider - 1.05-1 - Release of 1.05. From fedora-extras-commits at redhat.com Wed May 3 05:03:37 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 2 May 2006 22:03:37 -0700 Subject: rpms/wifiroamd/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wifiroamd.spec, 1.1, 1.2 Message-ID: <200605030504.k43549HG017966@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17904/FC-4 Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 17:48:58 -0000 1.2 +++ .cvsignore 3 May 2006 05:03:37 -0000 1.3 @@ -1 +1 @@ -wifiroamd-1.05.tar.gz +wifiroamd-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 17:48:58 -0000 1.2 +++ sources 3 May 2006 05:03:37 -0000 1.3 @@ -1 +1 @@ -697166fe19c150ae312276ff0eb0fe40 wifiroamd-1.05.tar.gz +197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/wifiroamd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wifiroamd.spec 21 Apr 2006 17:48:58 -0000 1.1 +++ wifiroamd.spec 3 May 2006 05:03:37 -0000 1.2 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -48,6 +48,9 @@ %{__mkdir} -p $RPM_BUILD_ROOT/etc/init.d %{__cp} wifiroamd.init $RPM_BUILD_ROOT/etc/init.d/wifiroamd +%{__mkdir} -p $RPM_BUILD_ROOT/etc/sysconfig +%{__cp} wifiroamd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/wifiroamd + %{__mkdir} -p $RPM_BUILD_ROOT/var/lib/wifiroamd/dhclient-leases %{__mkdir} -p $RPM_BUILD_ROOT/etc/cron.daily @@ -90,6 +93,7 @@ %dir /etc/wifiroamd/seen # config-default should not be user-modified. %config /etc/wifiroamd/config-defaults +%config /etc/sysconfig/wifiroamd %attr(755,root,root) /etc/wifiroamd/scripts/monitor_pinggw.d/* %attr(755,root,root) /etc/wifiroamd/scripts/reset.d/* %attr(755,root,root) /etc/wifiroamd/scripts/up.d/* @@ -103,6 +107,9 @@ %doc debian/copyright %changelog +* Wed May 3 2006 Ed Hill - 1.06-1 +- new upstream 1.06 + * Sun Mar 12 2006 Sean Reifschneider - 1.05-1 - Release of 1.05. From fedora-extras-commits at redhat.com Wed May 3 05:03:38 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 2 May 2006 22:03:38 -0700 Subject: rpms/wifiroamd/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wifiroamd.spec, 1.1, 1.2 Message-ID: <200605030504.k4354Alj017971@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17904/FC-5 Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 17:48:58 -0000 1.2 +++ .cvsignore 3 May 2006 05:03:37 -0000 1.3 @@ -1 +1 @@ -wifiroamd-1.05.tar.gz +wifiroamd-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 17:48:58 -0000 1.2 +++ sources 3 May 2006 05:03:37 -0000 1.3 @@ -1 +1 @@ -697166fe19c150ae312276ff0eb0fe40 wifiroamd-1.05.tar.gz +197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/wifiroamd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wifiroamd.spec 21 Apr 2006 17:48:58 -0000 1.1 +++ wifiroamd.spec 3 May 2006 05:03:37 -0000 1.2 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -48,6 +48,9 @@ %{__mkdir} -p $RPM_BUILD_ROOT/etc/init.d %{__cp} wifiroamd.init $RPM_BUILD_ROOT/etc/init.d/wifiroamd +%{__mkdir} -p $RPM_BUILD_ROOT/etc/sysconfig +%{__cp} wifiroamd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/wifiroamd + %{__mkdir} -p $RPM_BUILD_ROOT/var/lib/wifiroamd/dhclient-leases %{__mkdir} -p $RPM_BUILD_ROOT/etc/cron.daily @@ -90,6 +93,7 @@ %dir /etc/wifiroamd/seen # config-default should not be user-modified. %config /etc/wifiroamd/config-defaults +%config /etc/sysconfig/wifiroamd %attr(755,root,root) /etc/wifiroamd/scripts/monitor_pinggw.d/* %attr(755,root,root) /etc/wifiroamd/scripts/reset.d/* %attr(755,root,root) /etc/wifiroamd/scripts/up.d/* @@ -103,6 +107,9 @@ %doc debian/copyright %changelog +* Wed May 3 2006 Ed Hill - 1.06-1 +- new upstream 1.06 + * Sun Mar 12 2006 Sean Reifschneider - 1.05-1 - Release of 1.05. From fedora-extras-commits at redhat.com Wed May 3 08:47:28 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 3 May 2006 01:47:28 -0700 Subject: fedora-security/audit fc4,1.225,1.226 fc5,1.139,1.140 Message-ID: <200605030847.k438lSiF025620@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25600 Modified Files: fc4 fc5 Log Message: Yesterdays updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- fc4 2 May 2006 08:19:10 -0000 1.225 +++ fc4 3 May 2006 08:47:25 -0000 1.226 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060501 -Up to date FC4 as of 20060501 +Up to date CVE as of CVE email 20060502 +Up to date FC4 as of 20060502 ** are items that need attention @@ -101,6 +101,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) +CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- fc5 2 May 2006 08:19:10 -0000 1.139 +++ fc5 3 May 2006 08:47:25 -0000 1.140 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060501 -Up to date FC5 as of 20060501 +Up to date CVE as of CVE email 20060502 +Up to date FC5 as of 20060502 ** are items that need attention @@ -101,6 +101,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Wed May 3 08:54:28 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:54:28 -0700 Subject: rpms/fuse import.log,1.5,1.6 Message-ID: <200605030854.k438sUB3025726@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693 Modified Files: import.log Log Message: auto-import fuse-2.5.3-1 on branch devel from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Feb 2006 11:09:17 -0000 1.5 +++ import.log 3 May 2006 08:54:28 -0000 1.6 @@ -2,3 +2,4 @@ fuse-0_7_0-5:HEAD:fuse-0.7.0-5.src.rpm:1137113371 fuse-2_5_2-1:HEAD:fuse-2.5.2-1.src.rpm:1139346656 fuse-2_5_2-1:FC-4:fuse-2.5.2-1.src.rpm:1139396928 +fuse-2_5_3-1:HEAD:fuse-2.5.3-1.src.rpm:1146646447 From fedora-extras-commits at redhat.com Wed May 3 08:54:29 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:54:29 -0700 Subject: rpms/fuse/devel .cvsignore, 1.5, 1.6 fuse.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605030854.k438sVSf025732@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693/devel Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.5.3-1 on branch devel from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Feb 2006 21:11:24 -0000 1.5 +++ .cvsignore 3 May 2006 08:54:29 -0000 1.6 @@ -1 +1 @@ -fuse-2.5.2.tar.gz +fuse-2.5.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fuse.spec 30 Mar 2006 06:33:08 -0000 1.8 +++ fuse.spec 3 May 2006 08:54:29 -0000 1.9 @@ -1,6 +1,6 @@ Name: fuse -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.5.3 +Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -117,6 +117,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 2.5.3-1%{?dist} +- Update to 2.5.3 + * Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Feb 2006 21:11:24 -0000 1.5 +++ sources 3 May 2006 08:54:29 -0000 1.6 @@ -1 +1 @@ -ea565debe6c7486963bef05c45c50361 fuse-2.5.2.tar.gz +9c7e8b6606b9f158ae20b8521ba2867c fuse-2.5.3.tar.gz From fedora-extras-commits at redhat.com Wed May 3 08:56:04 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:56:04 -0700 Subject: rpms/fuse import.log,1.6,1.7 Message-ID: <200605030856.k438u6HH025826@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25793 Modified Files: import.log Log Message: auto-import fuse-2.5.3-1 on branch FC-4 from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 May 2006 08:54:28 -0000 1.6 +++ import.log 3 May 2006 08:56:04 -0000 1.7 @@ -3,3 +3,4 @@ fuse-2_5_2-1:HEAD:fuse-2.5.2-1.src.rpm:1139346656 fuse-2_5_2-1:FC-4:fuse-2.5.2-1.src.rpm:1139396928 fuse-2_5_3-1:HEAD:fuse-2.5.3-1.src.rpm:1146646447 +fuse-2_5_3-1:FC-4:fuse-2.5.3-1.src.rpm:1146646544 From fedora-extras-commits at redhat.com Wed May 3 08:56:04 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:56:04 -0700 Subject: rpms/fuse/FC-4 .cvsignore, 1.3, 1.4 fuse.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605030856.k438u6Jn025832@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25793/FC-4 Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.5.3-1 on branch FC-4 from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2006 11:09:24 -0000 1.3 +++ .cvsignore 3 May 2006 08:56:04 -0000 1.4 @@ -1 +1 @@ -fuse-2.5.2.tar.gz +fuse-2.5.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse.spec 30 Mar 2006 06:33:07 -0000 1.5 +++ fuse.spec 3 May 2006 08:56:04 -0000 1.6 @@ -1,6 +1,6 @@ Name: fuse -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.5.3 +Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -117,6 +117,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 2.5.3-1%{?dist} +- Update to 2.5.3 + * Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2006 11:09:24 -0000 1.3 +++ sources 3 May 2006 08:56:04 -0000 1.4 @@ -1 +1 @@ -ea565debe6c7486963bef05c45c50361 fuse-2.5.2.tar.gz +9c7e8b6606b9f158ae20b8521ba2867c fuse-2.5.3.tar.gz From fedora-extras-commits at redhat.com Wed May 3 08:58:06 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:58:06 -0700 Subject: rpms/fuse import.log,1.7,1.8 Message-ID: <200605030858.k438wcnR025939@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25905 Modified Files: import.log Log Message: auto-import fuse-2.5.3-1 on branch FC-5 from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 3 May 2006 08:56:04 -0000 1.7 +++ import.log 3 May 2006 08:58:06 -0000 1.8 @@ -4,3 +4,4 @@ fuse-2_5_2-1:FC-4:fuse-2.5.2-1.src.rpm:1139396928 fuse-2_5_3-1:HEAD:fuse-2.5.3-1.src.rpm:1146646447 fuse-2_5_3-1:FC-4:fuse-2.5.3-1.src.rpm:1146646544 +fuse-2_5_3-1:FC-5:fuse-2.5.3-1.src.rpm:1146646666 From fedora-extras-commits at redhat.com Wed May 3 08:58:07 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:58:07 -0700 Subject: rpms/fuse/FC-5 .cvsignore, 1.5, 1.6 fuse.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200605030858.k438wdkg025944@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25905/FC-5 Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.5.3-1 on branch FC-5 from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Feb 2006 21:11:24 -0000 1.5 +++ .cvsignore 3 May 2006 08:58:07 -0000 1.6 @@ -1 +1 @@ -fuse-2.5.2.tar.gz +fuse-2.5.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fuse.spec 30 Mar 2006 06:35:09 -0000 1.9 +++ fuse.spec 3 May 2006 08:58:07 -0000 1.10 @@ -1,6 +1,6 @@ Name: fuse -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.5.3 +Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -117,9 +117,11 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 2.5.3-1%{?dist} +- Update to 2.5.3 + * Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} - rebuild -- typo fix * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Feb 2006 21:11:24 -0000 1.5 +++ sources 3 May 2006 08:58:07 -0000 1.6 @@ -1 +1 @@ -ea565debe6c7486963bef05c45c50361 fuse-2.5.2.tar.gz +9c7e8b6606b9f158ae20b8521ba2867c fuse-2.5.3.tar.gz From fedora-extras-commits at redhat.com Wed May 3 09:09:55 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 3 May 2006 02:09:55 -0700 Subject: fedora-security/audit fc4,1.226,1.227 fc5,1.140,1.141 Message-ID: <200605030909.k4399tJU028329@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28309/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-1527 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- fc4 3 May 2006 08:47:25 -0000 1.226 +++ fc4 3 May 2006 09:09:52 -0000 1.227 @@ -101,6 +101,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) +CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- fc5 3 May 2006 08:47:25 -0000 1.140 +++ fc5 3 May 2006 09:09:52 -0000 1.141 @@ -101,6 +101,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Wed May 3 11:07:08 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 3 May 2006 04:07:08 -0700 Subject: rpms/yumex/devel sources,1.25,1.26 yumex.spec,1.26,1.27 Message-ID: <200605031107.k43B7AsR000844@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792/devel Modified Files: sources yumex.spec Log Message: Release 1.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 21 Apr 2006 08:58:34 -0000 1.25 +++ sources 3 May 2006 11:07:07 -0000 1.26 @@ -1 +1 @@ -a4d1b18e36e63b6a7605dbb76823dae8 yumex-0.99.17.tar.gz +ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- yumex.spec 21 Apr 2006 08:58:34 -0000 1.26 +++ yumex.spec 3 May 2006 11:07:07 -0000 1.27 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.17 +Version: 1.0.0 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 +- Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 - Development Release 0.99.17-1.0 * Thu Mar 30 2006 Tim Lauridsen - 0.99.16-1.0 From fedora-extras-commits at redhat.com Wed May 3 11:07:01 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 3 May 2006 04:07:01 -0700 Subject: rpms/yumex/FC-4 sources,1.13,1.14 yumex.spec,1.13,1.14 Message-ID: <200605031107.k43B7XU3000848@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792/FC-4 Modified Files: sources yumex.spec Log Message: Release 1.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Feb 2006 11:06:16 -0000 1.13 +++ sources 3 May 2006 11:07:01 -0000 1.14 @@ -1 +1 @@ -dff849b49e993777a2f13e704a5fd5bd yumex-0.44-4.tar.gz +ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- yumex.spec 8 Feb 2006 11:06:16 -0000 1.13 +++ yumex.spec 3 May 2006 11:07:01 -0000 1.14 @@ -1,14 +1,12 @@ -%define build_v 4 - Name: yumex -Version: 0.44 -Release: 4.0%{?dist} +Version: 1.0.0 +Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System License: GPL URL: http://linux.rasmil.dk/yumex -Source0: http://linux.rasmil.dk/dnl/yumex/%{name}-%{version}-%{build_v}.tar.gz +Source0: http://linux.rasmil.dk/dnl/yumex/%{name}-%{version}.tar.gz BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,7 +24,7 @@ %prep -%setup +%setup -q %build @@ -56,9 +54,9 @@ %doc COPYING ChangeLog %{_datadir}/pixmaps/yumex %{_datadir}/yumex - %{_bindir}/yumex - +/usr/lib/python?.?/site-packages/yumex +/usr/lib/python?.?/site-packages/yumgui %config(noreplace) %{_sysconfdir}/yumex.profiles.conf %config(noreplace) %{_sysconfdir}/yumex.conf %config(noreplace) %{_sysconfdir}/pam.d/yumex @@ -67,12 +65,57 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog -* Wed Feb 8 2006 Tim Lauridsen - 0.44-4.0 -- Public Release 0.44-4.0 -* Tue Feb 7 2006 Tim Lauridsen - 0.44-3.0 -- Public Release 0.44-3.0 -* Fri Dec 16 2005 Tim Lauridsen - 0.44-2.0 -- Public Release 0.44-2.0 +* Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 +- Release 1.0.0-1.0 +* Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 +- Development Release 0.99.17-1.0 +* Thu Mar 30 2006 Tim Lauridsen - 0.99.16-1.0 +- Development Release 0.99.16-1.0 +* Wed Mar 22 2006 Tim Lauridsen - 0.99.15-1.0 +- Development Release 0.99.15-1.0 +* Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 +- Development Release 0.99.14-1.0 +* Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 +- Development Release 0.99.13-1.0 +* Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 +- Development Release 0.99.12-1.0 +- Added '-q' option to %%setup +* Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 +- Development Release 0.99.11-1.0 +* Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 +- Development Release 0.99.10-1.0 +* Tue Feb 14 2006 Tim Lauridsen - 0.99.9-1.0 +- Development Release 0.99.9-1.0 +* Tue Feb 14 2006 Tim Lauridsen - 0.99.8-1.0 +- Development Release 0.99.8-1.0 +* Thu Feb 09 2006 Tim Lauridsen - 0.99.7-1.0 +- Development Release 0.99.7-1.0 +* Thu Feb 09 2006 Tim Lauridsen - 0.99.6-2.0 +- Development Release 0.99.6-2.0 +- Requires: yum from 2.5 to 2.4 +* Thu Feb 09 2006 Tim Lauridsen - 0.99.5-1.0 +- Development Release 0.99.5-1.0 +* Sun Feb 05 2006 Tim Lauridsen - 0.99.4-1.0 +- Development Release 0.99.4-1.0 +* Thu Jan 26 2006 Tim Lauridsen - 0.99.3-1.0 +- Development Release 0.99.3-1.0 +* Wed Jan 25 2006 Tim Lauridsen - 0.99.2-1.0 +- Development Release 0.99.2-1.0 +* Tue Jan 24 2006 Tim Lauridsen - 0.99.1-1.0 +- Development Release 0.99.1-1.0 +- Changed versioning from X.Y to X.Y.Z +- Remove build_v +- Removed build_v from source0 +- Added /usr/lib/python?.?/site-packages/yumex to %files +- Added /usr/lib/python?.?/site-packages/yumgui to %files +* Fri Jan 6 2006 Tim Lauridsen - 0.45-2.0 +- Development Release 0.45-2.0 +- Lot of changes, check the changelog. +* Tue Dec 20 2005 Tim Lauridsen - 0.45-1.0 +- Development Release 0.45-1.0 +- Changed to work with yum 2.5.0 +- Requires: yum >= 2.5 +- Same features as 0.44-1.0, but uses yum 2.5.0 API * Thu Dec 15 2005 Tim Lauridsen - 0.44-1.0 - Public Release 0.44-1.0 * Sun Dec 11 2005 Tim Lauridsen - 0.43-10.0 From fedora-extras-commits at redhat.com Wed May 3 11:07:02 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 3 May 2006 04:07:02 -0700 Subject: rpms/yumex/FC-5 .cvsignore, 1.20, 1.21 sources, 1.25, 1.26 yumex.spec, 1.26, 1.27 Message-ID: <200605031107.k43B7YJH000853@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792/FC-5 Modified Files: .cvsignore sources yumex.spec Log Message: Release 1.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 21 Apr 2006 08:58:34 -0000 1.20 +++ .cvsignore 3 May 2006 11:07:02 -0000 1.21 @@ -1 +1 @@ -yumex-0.99.17.tar.gz +yumex-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 21 Apr 2006 08:58:34 -0000 1.25 +++ sources 3 May 2006 11:07:02 -0000 1.26 @@ -1 +1 @@ -a4d1b18e36e63b6a7605dbb76823dae8 yumex-0.99.17.tar.gz +ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- yumex.spec 21 Apr 2006 08:58:34 -0000 1.26 +++ yumex.spec 3 May 2006 11:07:02 -0000 1.27 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.17 +Version: 1.0.0 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 +- Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 - Development Release 0.99.17-1.0 * Thu Mar 30 2006 Tim Lauridsen - 0.99.16-1.0 From fedora-extras-commits at redhat.com Wed May 3 13:47:58 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 06:47:58 -0700 Subject: rpms/fuse/devel fuse.spec,1.9,1.10 Message-ID: <200605031348.k43Dm0ej007510@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7493 Modified Files: fuse.spec Log Message: Rebuild Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fuse.spec 3 May 2006 08:54:29 -0000 1.9 +++ fuse.spec 3 May 2006 13:47:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base From fedora-extras-commits at redhat.com Wed May 3 13:57:28 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 06:57:28 -0700 Subject: rpms/fuse-encfs/devel .cvsignore, 1.3, 1.4 fuse-encfs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605031357.k43DvUVh007631@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7610 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Mar 2006 07:46:41 -0000 1.3 +++ .cvsignore 3 May 2006 13:57:28 -0000 1.4 @@ -1,2 +1,2 @@ -encfs-1.3.0-1.tgz -encfs-1.3.0-1.tgz.asc +encfs-1.3.1-1.tgz +encfs-1.3.1-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/fuse-encfs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fuse-encfs.spec 30 Mar 2006 07:46:41 -0000 1.3 +++ fuse-encfs.spec 3 May 2006 13:57:28 -0000 1.4 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -47,6 +47,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 1.3.1-1%{?dist} +- Version 1.3.1 + * Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} - Version 1.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Mar 2006 07:46:41 -0000 1.3 +++ sources 3 May 2006 13:57:28 -0000 1.4 @@ -1,2 +1,2 @@ -6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz -62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc +c93d6a22aa858db4eb3803170a82274a encfs-1.3.1-1.tgz +190ce801172ac75f03e6a577761cad0c encfs-1.3.1-1.tgz.asc From fedora-extras-commits at redhat.com Wed May 3 13:57:49 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 06:57:49 -0700 Subject: rpms/fuse-encfs/FC-4 .cvsignore, 1.3, 1.4 fuse-encfs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605031357.k43DvpBT007658@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7637 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Mar 2006 07:46:39 -0000 1.3 +++ .cvsignore 3 May 2006 13:57:49 -0000 1.4 @@ -1,2 +1,2 @@ -encfs-1.3.0-1.tgz -encfs-1.3.0-1.tgz.asc +encfs-1.3.1-1.tgz +encfs-1.3.1-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/fuse-encfs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fuse-encfs.spec 30 Mar 2006 07:46:39 -0000 1.3 +++ fuse-encfs.spec 3 May 2006 13:57:49 -0000 1.4 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -47,6 +47,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 1.3.1-1%{?dist} +- Version 1.3.1 + * Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} - Version 1.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Mar 2006 07:46:39 -0000 1.3 +++ sources 3 May 2006 13:57:49 -0000 1.4 @@ -1,2 +1,2 @@ -6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz -62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc +c93d6a22aa858db4eb3803170a82274a encfs-1.3.1-1.tgz +190ce801172ac75f03e6a577761cad0c encfs-1.3.1-1.tgz.asc From fedora-extras-commits at redhat.com Wed May 3 13:58:08 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 06:58:08 -0700 Subject: rpms/fuse-encfs/FC-5 .cvsignore, 1.3, 1.4 fuse-encfs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605031358.k43DwAr1007685@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7664 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Mar 2006 07:46:40 -0000 1.3 +++ .cvsignore 3 May 2006 13:58:08 -0000 1.4 @@ -1,2 +1,2 @@ -encfs-1.3.0-1.tgz -encfs-1.3.0-1.tgz.asc +encfs-1.3.1-1.tgz +encfs-1.3.1-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/fuse-encfs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fuse-encfs.spec 30 Mar 2006 07:46:40 -0000 1.3 +++ fuse-encfs.spec 3 May 2006 13:58:08 -0000 1.4 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -47,6 +47,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 1.3.1-1%{?dist} +- Version 1.3.1 + * Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} - Version 1.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Mar 2006 07:46:40 -0000 1.3 +++ sources 3 May 2006 13:58:08 -0000 1.4 @@ -1,2 +1,2 @@ -6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz -62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc +c93d6a22aa858db4eb3803170a82274a encfs-1.3.1-1.tgz +190ce801172ac75f03e6a577761cad0c encfs-1.3.1-1.tgz.asc From fedora-extras-commits at redhat.com Wed May 3 14:14:35 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 07:14:35 -0700 Subject: rpms/octave/FC-5 octave-2.9.5-lex.patch, NONE, 1.1 octave.spec, 1.35, 1.36 Message-ID: <200605031414.k43EEbLT010055@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10035 Modified Files: octave.spec Added Files: octave-2.9.5-lex.patch Log Message: Bug fix and spec file changes. octave-2.9.5-lex.patch: --- NEW FILE octave-2.9.5-lex.patch --- src/ChangeLog: 2006-05-02 John W. Eaton * lex.l ({CCHAR}): Exit rawcommand mode if returning '\n' token. Index: src/lex.l =================================================================== RCS file: /cvs/octave/src/lex.l,v retrieving revision 1.232 diff -u -r1.232 lex.l --- src/lex.l 24 Apr 2006 19:13:08 -0000 1.232 +++ src/lex.l 2 May 2006 23:31:14 -0000 @@ -696,7 +696,10 @@ BEGIN (INITIAL); if (nesting_level.none ()) - COUNT_TOK_AND_RETURN ('\n'); + { + lexer_flags.doing_rawcommand = false; + COUNT_TOK_AND_RETURN ('\n'); + } else if (nesting_level.is_bracket_or_brace ()) COUNT_TOK_AND_RETURN (';'); } Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- octave.spec 21 Apr 2006 17:10:12 -0000 1.35 +++ octave.spec 3 May 2006 14:14:35 -0000 1.36 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -9,6 +9,7 @@ Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 Patch0: octave-2.9.5-sparse.patch Patch1: octave-2.9.5-config.patch +Patch2: octave-2.9.5-lex.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -53,6 +54,7 @@ %setup -q %patch0 -p0 %patch1 -p0 +%patch2 -p0 %build @@ -69,7 +71,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links @@ -135,6 +136,10 @@ %changelog +* Wed May 3 2006 Quentin Spencer 2.9.5-3 +- Add patch for bug #190481 +- Manually stripping of .oct files is no longer necessary. + * Fri Apr 21 2006 Quentin Spencer 2.9.5-2 - Use updated sparse patch from development tree. From fedora-extras-commits at redhat.com Wed May 3 14:16:04 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 07:16:04 -0700 Subject: rpms/octave/devel octave-2.9.5-lex.patch, NONE, 1.1 octave.spec, 1.37, 1.38 Message-ID: <200605031416.k43EG6K2010136@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10116 Modified Files: octave.spec Added Files: octave-2.9.5-lex.patch Log Message: Bug fix and spec file changes. octave-2.9.5-lex.patch: --- NEW FILE octave-2.9.5-lex.patch --- src/ChangeLog: 2006-05-02 John W. Eaton * lex.l ({CCHAR}): Exit rawcommand mode if returning '\n' token. Index: src/lex.l =================================================================== RCS file: /cvs/octave/src/lex.l,v retrieving revision 1.232 diff -u -r1.232 lex.l --- src/lex.l 24 Apr 2006 19:13:08 -0000 1.232 +++ src/lex.l 2 May 2006 23:31:14 -0000 @@ -696,7 +696,10 @@ BEGIN (INITIAL); if (nesting_level.none ()) - COUNT_TOK_AND_RETURN ('\n'); + { + lexer_flags.doing_rawcommand = false; + COUNT_TOK_AND_RETURN ('\n'); + } else if (nesting_level.is_bracket_or_brace ()) COUNT_TOK_AND_RETURN (';'); } Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- octave.spec 19 Apr 2006 16:51:35 -0000 1.37 +++ octave.spec 3 May 2006 14:16:04 -0000 1.38 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -9,6 +9,7 @@ Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 Patch0: octave-2.9.5-sparse.patch Patch1: octave-2.9.5-config.patch +Patch2: octave-2.9.5-lex.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -53,6 +54,7 @@ %setup -q %patch0 -p0 %patch1 -p0 +%patch2 -p0 %build @@ -69,7 +71,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links @@ -135,6 +136,10 @@ %changelog +* Wed Apr 27 2006 Quentin Spencer 2.9.5-6 +- Add patch for bug #190481 +- Manual stripping of .oct files is no longer necessary. + * Wed Apr 19 2006 Quentin Spencer 2.9.5-5 - Add new patch to configure script (breaks octave-forge without it). From fedora-extras-commits at redhat.com Wed May 3 14:40:13 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 3 May 2006 07:40:13 -0700 Subject: fedora-security/audit fc4,1.227,1.228 fc5,1.141,1.142 Message-ID: <200605031440.k43EeDqC011271@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11235 Modified Files: fc4 fc5 Log Message: Update and sync with our internal tracking, make sure we mention the bz's. This is now our definitive source for FC tracking of public issues, so the sync is no longer needed. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- fc4 3 May 2006 09:09:52 -0000 1.227 +++ fc4 3 May 2006 14:40:10 -0000 1.228 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423] @@ -11,19 +12,19 @@ CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] CVE-2006-1993 version (firefox, 1.5 only) -CVE-2006-1991 VULNERABLE (php) -CVE-2006-1990 VULNERABLE (php) +CVE-2006-1991 VULNERABLE (php) #190034 +CVE-2006-1990 VULNERABLE (php) #190034 CVE-2006-1942 ** firefox -CVE-2006-1940 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1939 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1938 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1937 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1936 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1935 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1934 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1933 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1932 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1931 version (ruby, fixed 1.8.3) +CVE-2006-1940 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1939 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1938 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1937 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1936 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1935 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1934 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1933 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1932 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 VULNERABLE (kernel) CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11) @@ -83,18 +84,18 @@ CVE-2006-1724 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1723 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1721 ** cyrus-sasl +CVE-2006-1721 VULNERABLE (cyrus-sasl, fixd 2.1.21) #189815 CVE-2006-1712 version (mailman, only 2.1.7) CVE-2006-1650 ** firefox CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue CVE-2006-1608 ignore (php) safe mode isn't safe -CVE-2006-1550 backport (dia) bz#187402 [since FEDORA-2006-261] +CVE-2006-1550 backport (dia) #187402 [since FEDORA-2006-261] CVE-2006-1549 ignore (php) this is not a security issue -CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544 -CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544 -CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544 -CVE-2006-1542 VULNERABLE (python) bz#169046 +CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) #187544 +CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) #187544 +CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) #187544 +CVE-2006-1542 VULNERABLE (python) #169046 CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1531 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.0.8) @@ -102,14 +103,14 @@ CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) -CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 +CVE-2006-1526 VULNERABLE (xorg-x11) #189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423] -CVE-2006-1494 VULNERABLE (php) +CVE-2006-1494 VULNERABLE (php) #189592 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] -CVE-2006-1354 VULNERABLE (freeradius) bz#186084 +CVE-2006-1354 VULNERABLE (freeradius) #186084 CVE-2006-1343 VULNERABLE (kernel) CVE-2006-1342 version (kernel, not 2.6) not vulnerable CVE-2006-1273 ignore (firefox) This is an IE only issue @@ -121,16 +122,16 @@ CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) CVE-2006-1059 version (samba) -CVE-2006-1058 VULNERABLE (busybox) bz#187386 -CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) bz#188303 +CVE-2006-1058 VULNERABLE (busybox) #187386 +CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) #188303 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423] CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423] CVE-2006-1052 version (kernel, fixed 2.6.16) [since FEDORA-2006-423] was backport since FEDORA-2006-245 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe -CVE-2006-0996 VULNERABLE (php) bz#187511 -CVE-2006-0903 VULNERABLE (mysql) bz#183261 +CVE-2006-0996 VULNERABLE (php) #187511 +CVE-2006-0903 VULNERABLE (mysql) #183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.0.8) @@ -139,7 +140,7 @@ CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13) CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-0746 VULNERABLE (kpdf) bz#184308 +CVE-2006-0746 VULNERABLE (kpdf) #184308 CVE-2006-0745 version (xorg-x11) not fc4 CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423] CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245] @@ -147,8 +148,8 @@ CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] -CVE-2006-0591 version (postgresql, fixed 8.0.6) [since FEDORA-2005-021] -CVE-2006-0576 VULNERABLE (oprofile) +CVE-2006-0591 version (postgresql, fixed 8.0.6) #180537 [since FEDORA-2005-021] +CVE-2006-0576 VULNERABLE (oprofile) #180724 CVE-2006-0558 * kernel CVE-2006-0557 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 CVE-2006-0555 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 @@ -170,7 +171,7 @@ CVE-2006-0301 version (poppler, fixed 0.4.5) [since FEDORA-2006-103] CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] CVE-2006-0301 version (kdegraphics, fixed 3.5.2) [since FEDORA-2006-385] was backport since FEDORA-2006-105 -CVE-2006-0300 VULNERABLE (tar) bz#181773 +CVE-2006-0300 VULNERABLE (tar) #181773 CVE-2006-0299 version (thunderbird, 1.5 only) CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 version (firefox, 1.5 only) @@ -195,11 +196,11 @@ CVE-2006-0292 backport (mozilla) [since FEDORA-2006-075] CVE-2006-0292 backport (firefox) [since FEDORA-2006-076] CVE-2006-0292 VULNERABLE (thunderbird) -CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178 +CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) #178178 CVE-2006-0236 ignore (thunderbird) windows only flaw -CVE-2006-0225 backport (openssh) [since FEDORA-2006-056] -CVE-2006-0208 VULNERABLE (php) bz#178036 -CVE-2006-0207 VULNERABLE (php) bz#178044 +CVE-2006-0225 backport (openssh) #168167 [since FEDORA-2006-056] +CVE-2006-0208 VULNERABLE (php) #178036 +CVE-2006-0207 VULNERABLE (php) #178044 CVE-2006-0200 version (php, 5.1.0 5.1.1 only) CVE-2006-0197 ** xorg-x11 CVE-2006-0195 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] @@ -209,7 +210,7 @@ CVE-2006-0095 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-102 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-194] -CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) bz#187421 +CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) #187421 CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0037 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077 @@ -219,7 +220,7 @@ CVE-2005-4784 ignore (glibc) struct dirent is big enough CVE-2005-4746 version (freeradius) we don't build vulnerable bits CVE-2005-4745 version (freeradius) we don't build vulnerable bits -CVE-2005-4744 VULNERABLE (freeradius, fixed 1.0.5) bz#167677 +CVE-2005-4744 VULNERABLE (freeradius, fixed 1.0.5) #167677 CVE-2005-4720 VULNERABLE (thunderbird) CVE-2005-4720 VULNERABLE (mozilla) CVE-2005-4720 VULNERABLE (firefox) @@ -227,7 +228,7 @@ CVE-2005-4685 VULNERABLE (mozilla) CVE-2005-4685 VULNERABLE (firefox) CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream -CVE-2005-4667 backport (unzip) [since FEDORA-2006-098] bz#178961 +CVE-2005-4667 backport (unzip) [since FEDORA-2006-098] #178961 CVE-2005-4639 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] CVE-2005-4636 version (openoffice.org, fixed 2.0.1) CVE-2005-4635 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2006-013 @@ -235,8 +236,8 @@ CVE-2005-4605 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2006-013 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006] CVE-2005-4442 version (openldap) gentoo only -CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187] -CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE +CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) #176267 [since FEDORA-2005-1187] +CVE-2005-4268 blocked (cpio) #172669 by FORTIFY_SOURCE CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment CVE-2005-4154 ignore (php) don't install untrusted pear packages CVE-2005-4153 VULNERABLE (mailman) @@ -245,7 +246,7 @@ CVE-2005-4130 ignore (HelixPlayer) not verified CVE-2005-4126 ignore (HelixPlayer) not verified CVE-2005-4077 backport (curl) [since FEDORA-2005-1137] -CVE-2005-3964 VULNERABLE (openmotif) bz#174815 +CVE-2005-3964 VULNERABLE (openmotif) #174815 CVE-2005-3962 backport (perl) [since FEDORA-2005-1144] CVE-2005-3912 backport (perl) [since FEDORA-2005-1144] CVE-2005-3896 ignore (mozilla) recoverable DoS only @@ -264,7 +265,7 @@ CVE-2005-3783 version (kernel, fixed 2.6.14.2) [since FEDORA-2006-077] was backport since FEDORA-2005-1104 CVE-2005-3753 version (kernel, fixed 2.6.14) also not a vuln CVE-2005-3745 ignore (struts, fixed 1.2.8) but not through tomcat -CVE-2005-3732 VULNERABLE (ipsec-tools, fixed 0.6.3) bz#173842 +CVE-2005-3732 VULNERABLE (ipsec-tools, fixed 0.6.3) #173842 CVE-2005-3675 VULNERABLE (kernel) optack CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093] CVE-2005-3662 version (netpbm) @@ -356,7 +357,7 @@ CVE-2005-3185 blocked (wget) by FORTIFY_SOURCE CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE CVE-2005-3184 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] -CVE-2005-3183 backport (w3c-libwww) [since FEDORA-2005-952] +CVE-2005-3183 backport (w3c-libwww) #159597 [since FEDORA-2005-952] CVE-2005-3181 version (kernel, fixed 2.6.13.4 at least) [since FEDORA-2005-1067] was backport since FEDORA-2005-1013 CVE-2005-3180 version (kernel, fixed 2.6.13.4 at least) [since FEDORA-2005-1067] was backport since FEDORA-2005-1013 CVE-2005-3179 version (kernel, fixed 2.6.13.4 at least) [since FEDORA-2005-1067] was backport since FEDORA-2005-1013 @@ -372,10 +373,10 @@ CVE-2005-3089 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] CVE-2005-3088 ignore (fetchmail) fetchmailconf not shipped CVE-2005-3055 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067] -CVE-2005-3054 ignore (php) see bz#169857 +CVE-2005-3054 ignore (php) see #169857 CVE-2005-3053 version (kernel) [since FEDORA-2005-949] was backport since FEDORA-2005-820 CVE-2005-3044 version (kernel, fixed 2.6.13.2) [since FEDORA-2005-1067] was backport since FEODRA-2005-949 -CVE-2005-3011 backport (texinfo) [since FEDORA-2005-991] +CVE-2005-3011 backport (texinfo) #169585 [since FEDORA-2005-991] CVE-2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts CVE-2005-2978 version (netpbm, fixed 10.25) CVE-2005-2977 backport (pam) [since FEDORA-2005-1031] @@ -384,7 +385,7 @@ CVE-2005-2975 backport (gdk-pixbuf) [since FEDORA-2005-1085] CVE-2005-2974 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046] CVE-2005-2973 version (kernel, 2.6.14 at least) [since FEODRA-2005-1067] -CVE-2005-2970 backport (httpd) bz#171759 [since FEDORA-2006-052] +CVE-2005-2970 backport (httpd) #171759 [since FEDORA-2006-052] CVE-2005-2969 backport (openssl097a, fixed 0.9.7h) [since FEDORA-2005-986] CVE-2005-2969 backport (openssl, fixed 0.9.7h) [since FEDORA-2005-986] CVE-2005-2968 version (thunderbird) [since FEDORA-2005-963] @@ -393,7 +394,7 @@ CVE-2005-2959 ignore (sudo) not a vulnerability CVE-2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md) CVE-2005-2933 backport (libc-client) [since FEDORA-2005-1115] -CVE-2005-2933 VULNERABLE (uw-imap) bz#171345 +CVE-2005-2933 VULNERABLE (uw-imap) #171345 CVE-2005-2929 backport (lynx) [since FEDORA-2005-1079] CVE-2005-2922 version (HelixPlayer, fixed 1.0.6) [since FEDORA-2005-940] CVE-2005-2917 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] @@ -438,9 +439,9 @@ CVE-2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] CVE-2005-2693 backport (cvs) [since FEDORA-2005-790] CVE-2005-2672 backport (lm_sensors) [since FEDORA-2005-1053] -CVE-2005-2666 VULNERABLE (openssh) see bz#162681 +CVE-2005-2666 VULNERABLE (openssh) #162681 CVE-2005-2642 version (mutt, openbsd only) -CVE-2005-2641 VULNERABLE (pam_ldap) bz#166164 +CVE-2005-2641 VULNERABLE (pam_ldap) #166164 CVE-2005-2629 version (helixplayer, fixed 1.0.6) [since FEDORA-2005-940] CVE-2005-2617 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820] CVE-2005-2602 ignore (thunderbird) probably @@ -459,14 +460,14 @@ CVE-2005-2498 version (php xml_rpc, fixed 1.4.0) [since FEDORA-2005-810] CVE-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch CVE-2005-2495 backport (xorg-x11) [since FEDORA-2005-894] -CVE-2005-2494 version (kdebase, fixed after 3.4.2) [since FEDORA-2005-1152] +CVE-2005-2494 version (kdebase, fixed after 3.4.2) #166997 [since FEDORA-2005-1152] CVE-2005-2492 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906 CVE-2005-2491 ignore (python, fc4 python does not contain pcre) CVE-2005-2491 ignore (php, pcre uses system pcre) CVE-2005-2491 ignore (httpd, pcre uses system pcre) CVE-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803] CVE-2005-2490 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906 -CVE-2005-2475 VULNERABLE (unzip) bz#164928 +CVE-2005-2475 VULNERABLE (unzip) #164928 CVE-2005-2471 version (netpbm, 10.31 at least) [since FEDORA-2005-000**] was backport since FEDORA-2005-728 CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible CVE-2005-2458 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820] @@ -568,6 +569,7 @@ CVE-2005-1705 backport (gdb) [since FEDORA-2005-1033] CVE-2005-1704 backport (gdb) [since FEDORA-2005-1033] CVE-2005-1704 backport (binutils) ...eadelf-overflows.patch [since FEDORA-2005-498] +CVE-2005-1704 ** elfutils #159891 CVE-2005-1689 backport (krb5) [since FEDORA-2005-553] CVE-2005-1686 ignore (gedit, not a vulnerability) CVE-2005-1636 version (mysql, fixed 4.1.12) [since FEDORA-2005-557] @@ -682,7 +684,7 @@ CVE-2005-0760 version (ImageMagick, fixed 6.0) CVE-2005-0759 version (ImageMagick, fixed 6.0) CVE-2005-0758 version (gzip, fixed 1.3.5) -CVE-2005-0758 VULNERABLE (bzip2) by inspection bz#159819 +CVE-2005-0758 VULNERABLE (bzip2) by inspection #159819 CVE-2005-0757 version (kernel, not 2.6) CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport since GA CVE-2005-0755 version (HelixPlayer, fixed 10.0.4) @@ -752,7 +754,7 @@ CVE-2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch CVE-2005-0455 version (HelixPlayer, fixed 1.0.3) CVE-2005-0449 version (kernel, fixed 2.6.11) -CVE-2005-0448 version (perl, fixed 5.8.6) bz#173793 +CVE-2005-0448 version (perl, fixed 5.8.6) #173793 CVE-2005-0446 version (squid, fixed 2.5.STABLE9) CVE-2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020 CVE-2005-0403 version (kernel, not upstream) @@ -888,7 +890,7 @@ CVE-2004-2536 version (kernel, fixed 2.6.7) CVE-2004-2531 version (gnutls, fixed 1.0.17) CVE-2004-2502 version (iiimf, fixed 11.4-46.1) -CVE-2004-2480 ignore (squid) bz#166523, not reproducable +CVE-2004-2480 ignore (squid) #166523, not reproducable CVE-2004-2479 version (squid, fixed 2.5.STABLE8) CVE-2004-2396 version (passwd, fixed 0.69) verified in source CVE-2004-2395 version (passwd, fixed 0.69) verified in source @@ -1054,7 +1056,7 @@ CVE-2004-0956 version (mysql, fixed 4.0.20) CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6) CVE-2004-0942 version (httpd, fixed 2.0.53) -CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream bz#175414 +CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream #175414 CVE-2004-0940 version (httpd, not 2.0) CVE-2004-0938 version (freeradius, fixed 1.0.1) CVE-2004-0930 version (samba, fixed 3.0.8) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- fc5 3 May 2006 09:09:52 -0000 1.141 +++ fc5 3 May 2006 14:40:10 -0000 1.142 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421] @@ -11,19 +12,19 @@ CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-1993 VULNERABLE (firefox) #190124 -CVE-2006-1991 VULNERABLE (php) -CVE-2006-1990 VULNERABLE (php) +CVE-2006-1991 VULNERABLE (php) #190034 +CVE-2006-1990 VULNERABLE (php) #190034 CVE-2006-1942 ** firefox -CVE-2006-1940 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1939 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1938 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1937 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1936 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1935 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1934 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1933 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1932 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1931 version (ruby, fixed 1.8.3) +CVE-2006-1940 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1939 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1938 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1937 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1936 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1935 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1934 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1933 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1932 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 VULNERABLE (kernel) @@ -84,7 +85,7 @@ CVE-2006-1724 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1723 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1721 ** cyrus-sasl +CVE-2006-1721 version (cyrus-sasl, fixed 2.1.21) CVE-2006-1712 version (mailman, only 2.1.7) CVE-2006-1650 ** firefox CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon @@ -107,7 +108,7 @@ CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421] -CVE-2006-1494 VULNERABLE (php) +CVE-2006-1494 VULNERABLE (php)#189592 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 VULNERABLE (kernel) @@ -132,7 +133,7 @@ CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0996 VULNERABLE (php) bz#187511 -CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet +CVE-2006-0903 VULNERABLE (mysql) #183261 low/not upstream yet CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.5.0.2) @@ -197,7 +198,7 @@ CVE-2006-0292 version (thunderbird, fixed 1.5) CVE-2006-0292 version (firefox, fixed 1.5.1) CVE-2006-0292 backport (mozilla) mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch -CVE-2006-0254 backport (tomcat5, fixed 5.5.16) **check this** +CVE-2006-0254 backport (tomcat5, fixed 5.5.16) #178179 **check this** CVE-2006-0236 ignore (thunderbird) windows only CVE-2006-0225 version (openssh, fixed 4.3p2) CVE-2006-0208 version (php, fixed 5.1.2) @@ -214,7 +215,7 @@ CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193] CVE-2006-0052 version (mailman, fixed 2.1.6) CVE-2006-0049 version (gnupg, fixed 1.4.2.2) -CVE-2006-0040 ** VULNERABLE (gtkhtml) no upstream fix +CVE-2006-0040 ** VULNERABLE (gtkhtml) #183680 no upstream fix CVE-2006-0037 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] From fedora-extras-commits at redhat.com Wed May 3 15:42:44 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 08:42:44 -0700 Subject: rpms/octave-forge/devel octave-forge-2006.03.17-zplane.patch, NONE, 1.1 octave-forge.spec, 1.23, 1.24 Message-ID: <200605031542.k43FgksT016198@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16178 Modified Files: octave-forge.spec Added Files: octave-forge-2006.03.17-zplane.patch Log Message: Bug fix for #190481 octave-forge-2006.03.17-zplane.patch: --- NEW FILE octave-forge-2006.03.17-zplane.patch --- Index: main/signal/zplane.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/signal/zplane.m,v retrieving revision 1.4 diff -u -r1.4 zplane.m --- main/signal/zplane.m 7 Jan 2006 05:23:27 -0000 1.4 +++ main/signal/zplane.m 3 May 2006 14:27:36 -0000 @@ -83,9 +83,12 @@ catch eleo = 0; end; ##= 2.9.5 ImageMagick @@ -38,6 +39,7 @@ %patch0 -p1 # The following patch requires regenerating the configure script %patch1 -p0 +%patch2 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL @@ -73,6 +75,9 @@ %changelog +* Wed May 3 2006 Quentin Spencer 2006.03.17-4 +- Bug fix for #190481 + * Thu Apr 27 2006 Quentin Spencer 2006.03.17-3 - Add fixes for octcdf (from the author), which changes the dependency from netcdf to libnc-dap. (This requires autoconf temporarily.) From fedora-extras-commits at redhat.com Wed May 3 15:44:00 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 08:44:00 -0700 Subject: rpms/galeon/devel galeon.spec,1.15,1.16 Message-ID: <200605031544.k43Fi2mv016248@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16231 Modified Files: galeon.spec Log Message: Rebuild for mozilla 1.7.13 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- galeon.spec 1 Mar 2006 08:13:33 -0000 1.15 +++ galeon.spec 3 May 2006 15:44:00 -0000 1.16 @@ -1,13 +1,13 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -Requires: mozilla = 37:1.7.12 +Requires: mozilla = 37:1.7.13 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: gnome-desktop-devel @@ -113,6 +113,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-2 +- Rebuild for mozilla 1.7.13 + * Tue Feb 28 2006 Denis Leroy - 2.0.1-1 - Update to 2.0.1 From fedora-extras-commits at redhat.com Wed May 3 15:44:07 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 08:44:07 -0700 Subject: rpms/octave-forge/FC-5 octave-forge-2006.03.17-zplane.patch, NONE, 1.1 octave-forge.spec, 1.22, 1.23 Message-ID: <200605031544.k43Fi9We016308@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16283 Modified Files: octave-forge.spec Added Files: octave-forge-2006.03.17-zplane.patch Log Message: Fix octcdf. Bug fix for #190481 octave-forge-2006.03.17-zplane.patch: --- NEW FILE octave-forge-2006.03.17-zplane.patch --- Index: main/signal/zplane.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/signal/zplane.m,v retrieving revision 1.4 diff -u -r1.4 zplane.m --- main/signal/zplane.m 7 Jan 2006 05:23:27 -0000 1.4 +++ main/signal/zplane.m 3 May 2006 15:37:01 -0000 @@ -83,9 +83,12 @@ catch eleo = 0; end; ##= 2.9.5 ImageMagick BuildRequires: octave-devel tetex gcc-gfortran ginac-devel qhull-devel -BuildRequires: ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel +BuildRequires: ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel BuildRequires: libjpeg-devel libpng-devel ncurses-devel libtermcap-devel +BuildRequires: autoconf %description Octave-forge is a community project for collaborative development of @@ -34,11 +37,14 @@ %prep %setup -q %patch0 -p1 +# The following patch requires regenerating the configure script +%patch1 -p0 +%patch2 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL %build -export CPPFLAGS=-I%{_includedir}/netcdf-3 +./autogen.sh %configure make %{?_smp_mflags} @@ -69,6 +75,11 @@ %changelog +* Wed May 3 2006 Quentin Spencer 2006.03.17-3 +- Add fixes for octcdf (from the author), which changes the dependency + from netcdf to libnc-dap. (This requires autoconf temporarily.) +- Bug fix for #190481 + * Thu Apr 20 2006 Quentin Spencer 2006.03.17-2 - Add patch for system function so it works with octave 2.9.5. From fedora-extras-commits at redhat.com Wed May 3 15:47:34 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 08:47:34 -0700 Subject: rpms/octave-forge/FC-5 octave-forge-2006.03.17-octcdf.patch, NONE, 1.1 octave-forge.spec, 1.23, 1.24 Message-ID: <200605031547.k43Flaj5016504@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16484 Modified Files: octave-forge.spec Added Files: octave-forge-2006.03.17-octcdf.patch Log Message: Forgot to commit octcdf patch. octave-forge-2006.03.17-octcdf.patch: --- NEW FILE octave-forge-2006.03.17-octcdf.patch --- Index: main/octcdf/Makefile =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- main/octcdf/Makefile 19 Apr 2006 19:09:51 -0000 1.6 +++ main/octcdf/Makefile 28 Apr 2006 17:51:17 -0000 @@ -34,7 +34,7 @@ RM = rm -f endif -NCTARGET = ov-netcdf.oct +NCTARGET = netcdf.oct NCSOURCES = ov-netcdf.cc ov-ncfile.cc ov-ncvar.cc ov-ncatt.cc ov-ncdim.cc OBJECTS = $(patsubst %.cc,%.o,$(NCSOURCES)) Index: main/octcdf/configure.add =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/configure.add,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main/octcdf/configure.add 15 Dec 2005 22:13:52 -0000 1.2 +++ main/octcdf/configure.add 25 Apr 2006 16:35:01 -0000 1.3 @@ -11,34 +11,29 @@ OCTCDF_LIBS="$LDFLAGS" OCTCDF_CFLAGS="$CPPFLAGS" - dnl checking for opendap support + dnl first checking for opendap support - AC_MSG_CHECKING([for nc-dap]) + AC_MSG_CHECKING([for nc-dap]) - if ncdap-config --version > /dev/null 2>&1; then + if ncdap-config --version > /dev/null 2>&1; then + AC_MSG_RESULT([yes]) OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`" OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`" - HAVE_NCDAP=yes - AC_MSG_RESULT([yes]) - else - HAVE_NCDAP=no - AC_MSG_RESULT([no]) - fi - - dnl Checking if the NetCDF library exists. + HAVE_NETCDF=yes + else + AC_MSG_RESULT([no]) - AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,) + dnl if no opendap, checking if the NetCDF library exists. - if test $HAVE_NETCDF = yes ; then - OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf" - fi + AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,) - dnl if we don't have nc-dap then we have to check for netcdf.h - dnl otherwise it is already given by ncdap-config --cflags + if test $HAVE_NETCDF = yes ; then + OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf" - if test $HAVE_NCDAP = no ; then - AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no) + dnl we have the libraries, no we have also the headers? + AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no) + fi fi if test $HAVE_NETCDF = yes ; then Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- octave-forge.spec 3 May 2006 15:44:07 -0000 1.23 +++ octave-forge.spec 3 May 2006 15:47:33 -0000 1.24 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2006.03.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -75,6 +75,9 @@ %changelog +* Wed May 3 2006 Quentin Spencer 2006.03.17-4 +- Forgot to commit octcdf patch. + * Wed May 3 2006 Quentin Spencer 2006.03.17-3 - Add fixes for octcdf (from the author), which changes the dependency from netcdf to libnc-dap. (This requires autoconf temporarily.) From fedora-extras-commits at redhat.com Wed May 3 16:22:08 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 09:22:08 -0700 Subject: rpms/galeon/FC-5 galeon.spec,1.15,1.16 Message-ID: <200605031622.k43GMACr018911@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18894 Modified Files: galeon.spec Log Message: Rebuild for mozilla 1.7.13 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-5/galeon.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- galeon.spec 1 Mar 2006 08:13:33 -0000 1.15 +++ galeon.spec 3 May 2006 16:22:08 -0000 1.16 @@ -1,13 +1,13 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -Requires: mozilla = 37:1.7.12 +Requires: mozilla = 37:1.7.13 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: gnome-desktop-devel @@ -113,6 +113,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-2 +- Rebuild for mozilla 1.7.13 + * Tue Feb 28 2006 Denis Leroy - 2.0.1-1 - Update to 2.0.1 From fedora-extras-commits at redhat.com Wed May 3 16:26:28 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 3 May 2006 09:26:28 -0700 Subject: rpms/pygame/FC-4 pygame.spec,1.6,1.7 Message-ID: <200605031626.k43GQUYs019016@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pygame/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18971/pygame/FC-4 Modified Files: pygame.spec Log Message: Fix Obsolete/Provides for python-pygame-doc Index: pygame.spec =================================================================== RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pygame.spec 26 Apr 2006 15:06:45 -0000 1.6 +++ pygame.spec 3 May 2006 16:26:28 -0000 1.7 @@ -2,7 +2,7 @@ Name: pygame Version: 1.7.1 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Python modules for writing games Group: Development/Languages License: LGPL @@ -15,9 +15,9 @@ BuildRequires: SDL_ttf-devel SDL_image-devel SDL_mixer-devel Requires: python-numeric Obsoletes: python-pygame < 1.7.1 -Obsoletes: python-pygame-docs < 1.7.1 +Obsoletes: python-pygame-doc < 1.7.1 Provides: python-pygame = %{version}-%{release} -Provides: python-pygame-docs = %{version}-%{release} +Provides: python-pygame-doc = %{version}-%{release} %description Pygame is a set of Python modules designed for writing games. It is @@ -86,6 +86,12 @@ %{_includedir}/python*/%{name}/*.h %changelog +* Wed May 03 2006 Christopher Stone 1.7.1.7 +- Fix Obsolete/Provides of python-pygame-doc + +* Wed Apr 26 2006 Christopher Stone 1.7.1-6 +- Bump release for new build on devel + * Wed Apr 26 2006 Christopher Stone 1.7.1-5 - Add Obsolete/Provides tags for python-pygame-docs - Add Obsolete/Provides tags for python-pygame-devel to devel package From fedora-extras-commits at redhat.com Wed May 3 16:26:29 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 3 May 2006 09:26:29 -0700 Subject: rpms/pygame/FC-5 pygame.spec,1.6,1.7 Message-ID: <200605031626.k43GQVt0019020@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pygame/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18971/pygame/FC-5 Modified Files: pygame.spec Log Message: Fix Obsolete/Provides for python-pygame-doc Index: pygame.spec =================================================================== RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pygame.spec 26 Apr 2006 15:06:46 -0000 1.6 +++ pygame.spec 3 May 2006 16:26:29 -0000 1.7 @@ -2,7 +2,7 @@ Name: pygame Version: 1.7.1 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Python modules for writing games Group: Development/Languages License: LGPL @@ -15,9 +15,9 @@ BuildRequires: SDL_ttf-devel SDL_image-devel SDL_mixer-devel Requires: python-numeric Obsoletes: python-pygame < 1.7.1 -Obsoletes: python-pygame-docs < 1.7.1 +Obsoletes: python-pygame-doc < 1.7.1 Provides: python-pygame = %{version}-%{release} -Provides: python-pygame-docs = %{version}-%{release} +Provides: python-pygame-doc = %{version}-%{release} %description Pygame is a set of Python modules designed for writing games. It is @@ -86,6 +86,12 @@ %{_includedir}/python*/%{name}/*.h %changelog +* Wed May 03 2006 Christopher Stone 1.7.1.7 +- Fix Obsolete/Provides of python-pygame-doc + +* Wed Apr 26 2006 Christopher Stone 1.7.1-6 +- Bump release for new build on devel + * Wed Apr 26 2006 Christopher Stone 1.7.1-5 - Add Obsolete/Provides tags for python-pygame-docs - Add Obsolete/Provides tags for python-pygame-devel to devel package From fedora-extras-commits at redhat.com Wed May 3 16:26:30 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 3 May 2006 09:26:30 -0700 Subject: rpms/pygame/devel pygame.spec,1.7,1.8 Message-ID: <200605031626.k43GQW60019024@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pygame/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18971/pygame/devel Modified Files: pygame.spec Log Message: Fix Obsolete/Provides for python-pygame-doc Index: pygame.spec =================================================================== RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pygame.spec 26 Apr 2006 15:17:36 -0000 1.7 +++ pygame.spec 3 May 2006 16:26:29 -0000 1.8 @@ -2,7 +2,7 @@ Name: pygame Version: 1.7.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Python modules for writing games Group: Development/Languages License: LGPL @@ -15,9 +15,9 @@ BuildRequires: SDL_ttf-devel SDL_image-devel SDL_mixer-devel Requires: python-numeric Obsoletes: python-pygame < 1.7.1 -Obsoletes: python-pygame-docs < 1.7.1 +Obsoletes: python-pygame-doc < 1.7.1 Provides: python-pygame = %{version}-%{release} -Provides: python-pygame-docs = %{version}-%{release} +Provides: python-pygame-doc = %{version}-%{release} %description Pygame is a set of Python modules designed for writing games. It is @@ -86,6 +86,9 @@ %{_includedir}/python*/%{name}/*.h %changelog +* Wed May 03 2006 Christopher Stone 1.7.1.7 +- Fix Obsolete/Provides of python-pygame-doc + * Wed Apr 26 2006 Christopher Stone 1.7.1-6 - Bump release for new build on devel From fedora-extras-commits at redhat.com Wed May 3 17:12:37 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 3 May 2006 10:12:37 -0700 Subject: rpms/mail-notification/FC-5 mail-notification.spec,1.17,1.18 Message-ID: <200605031712.k43HCd4K021588@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21571 Modified Files: mail-notification.spec Log Message: Added patch for IMAP authentication problem from project homepage (#190137) Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-5/mail-notification.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mail-notification.spec 13 Feb 2006 17:31:56 -0000 1.17 +++ mail-notification.spec 3 May 2006 17:12:37 -0000 1.18 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -11,6 +11,7 @@ Patch0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff Patch1: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff Patch2: mail-notification-evolution.patch +Patch3: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-imapauth.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext >= 0.14.1 @@ -47,6 +48,7 @@ %patch0 -b .patch0 %patch1 -b .patch1 %patch2 -p1 -b .evolution +%patch3 -b .patch3 %build export LDFLAGS="-Wl,--export-dynamic" @@ -118,6 +120,9 @@ %changelog +* Thu Apr 27 2006 Paul Clifford 2.0-12 +- Added patch for IMAP authentication problem from project homepage (#190137) + * Mon Feb 13 2006 Thorsten Leemhuis - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed May 3 17:17:01 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 3 May 2006 10:17:01 -0700 Subject: rpms/mail-notification/FC-5 mail-notification-2.0-imapauth.diff, NONE, 1.1 Message-ID: <200605031717.k43HH3M9021665@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21647 Added Files: mail-notification-2.0-imapauth.diff Log Message: add missing file mail-notification-2.0-imapauth.diff: --- NEW FILE mail-notification-2.0-imapauth.diff --- --- src/mn-imap-mailbox.c.orig Tue Aug 9 22:01:56 2005 +++ src/mn-imap-mailbox.c Wed Jan 25 19:22:48 2006 @@ -1646,7 +1646,12 @@ */ if (mn_ascii_validate(input)) { - if (g_str_has_prefix(input, "+ ")) + if (! strcmp(input, "+")) + { + response = g_new0(MNClientSessionResponse, 1); + response->continuation = g_strdup(""); + } + else if (g_str_has_prefix(input, "+ ")) { response = g_new0(MNClientSessionResponse, 1); response->continuation = g_strdup(input + 2); From fedora-extras-commits at redhat.com Wed May 3 17:48:50 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 3 May 2006 10:48:50 -0700 Subject: rpms/banshee/devel .cvsignore, 1.5, 1.6 banshee.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200605031748.k43HmqZR021942@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21921 Modified Files: .cvsignore banshee.spec sources Log Message: * Tue May 2 2006 Christopher Aillon 0.10.10-1 - Update to 0.10.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Apr 2006 20:27:43 -0000 1.5 +++ .cvsignore 3 May 2006 17:48:50 -0000 1.6 @@ -1 +1 @@ -banshee-0.10.9.tar.gz +banshee-0.10.10.tar.gz Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- banshee.spec 16 Apr 2006 20:32:12 -0000 1.9 +++ banshee.spec 3 May 2006 17:48:50 -0000 1.10 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.9 -Release: 1.%{?dist} +Version: 0.10.10 +Release: 1%{?dist} Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -96,6 +96,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Tue May 2 2006 Christopher Aillon 0.10.10-1 +- Update to 0.10.10 + * Tue Mar 21 2006 Christopher Aillon 0.10.9-1 - Update to 0.10.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Apr 2006 20:27:43 -0000 1.5 +++ sources 3 May 2006 17:48:50 -0000 1.6 @@ -1 +1 @@ -86b67e399ea805f69a860b3e6fd4627f banshee-0.10.9.tar.gz +cb553f5bc6dc14b7afa44349d025bbdc banshee-0.10.10.tar.gz From fedora-extras-commits at redhat.com Wed May 3 18:07:11 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 3 May 2006 11:07:11 -0700 Subject: rpms/hddtemp/devel .cvsignore, 1.6, 1.7 hddtemp.db, 1.10, 1.11 hddtemp.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200605031807.k43I7DmS024252@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229 Modified Files: .cvsignore hddtemp.db hddtemp.spec sources Log Message: * Wed May 3 2006 Ville Skytt?? - 0.3-0.8.beta15 - 0.3-beta15, drive database 2006-04-26. - Specfile cleanups. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Sep 2005 18:09:14 -0000 1.6 +++ .cvsignore 3 May 2006 18:07:11 -0000 1.7 @@ -1 +1 @@ -hddtemp-0.3-beta14.tar.bz2 +hddtemp-0.3-beta15.tar.bz2 Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hddtemp.db 26 Feb 2006 15:41:47 -0000 1.10 +++ hddtemp.db 3 May 2006 18:07:11 -0000 1.11 @@ -9,7 +9,7 @@ # The following list was found at (http://www.almico.com/forumharddisks.php) # If your drive is in the list send me a mail. # -# Manufacturer Model Size Notes +# Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB @@ -42,7 +42,7 @@ ######################################## ############# ExcelStor drives ######################################## -# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" +# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" "ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)" @@ -54,88 +54,84 @@ ######################################## ############# Fujitsu drives ######################################## -"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" +"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" -"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" -"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" -"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" +"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" +"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" +"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" -"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" -"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" +"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" +"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" -"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" -"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" -"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" +"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" +"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" +"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" -"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" +"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" -"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" -"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" -"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" -"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" -"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" -"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" +"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" +"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" +"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" +"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" +"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" +"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" -"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" +"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" -"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" -"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH" +"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" +"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH" -"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" +"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" -"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" -"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" -"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" -"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" -"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" -"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" +"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" +"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" +"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" +"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" +"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" +"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" ######################################## ############# Hitachi drives ######################################## -"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" -"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" -"HITACHI_DK23CA-15" 194 C "Hitachi DK23CA-15" -"HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" -"HITACHI_DK23CA-30" 194 C "Hitachi DK23CA-30" -"HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" -"HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" -"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" -"HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" -"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" -"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" -"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" - -"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" -"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" -"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" -"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" -"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" -"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" -"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" - -"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" - -"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" -"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" -"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" -"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" - -"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" -"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" -"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" -"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" -"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" -"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" -"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" -"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" -"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" +"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" +"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" +"HITACHI_DK23CA-(15|20|30|30B|75)" 194 C "Hitachi DK23CA series" +"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" +"HITACHI_DK23EA-[2346]0" 194 C "Hitachi DK23EA series" +"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" +"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" +"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" + +"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" +"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" +"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" +"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" +"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" +"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" +"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" + +"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" + +"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" +"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" + +"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" +"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" +"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" +"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" +"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" +"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" +"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" +"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" +"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## @@ -144,60 +140,60 @@ # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. -# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" +# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" -"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" -"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" +"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" +"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report -#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" +#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" -"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" -"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" -"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" -"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" -"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" -"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" -"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" -"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" -"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" -"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" -"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" -"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" -"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" -"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" -"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" -"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" +"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" +"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" +"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" +"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" +"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" +"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" +"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" +"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" +"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" +"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" +"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" +"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" +"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" +"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" +"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" +"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## -#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" -"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" +#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" +"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" +#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D060H3" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" -"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" -"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" -"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" +"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" +"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" +"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" -"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" -"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" -"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" -"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" -"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" -"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" -"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM" -"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" -"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" +"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" +"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" +"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" +"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" +"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" +"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" +"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM" +"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" +"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" "Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM" -"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" +"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" @@ -217,126 +213,128 @@ ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature -"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" -"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)" -"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" -"SAMSUNG SW0434A" 0 C "Samsung SW0434A" -"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" -"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" -"SAMSUNG SP0822N" 194 C "Samsung SP0822N" -"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" +"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" +"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)" +"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" +"SAMSUNG SW0434A" 0 C "Samsung SW0434A" +"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" +"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" +"SAMSUNG SP0822N" 194 C "Samsung SP0822N" +"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SP2[05]14N" 194 C "Samsung SpinPoint P120 series (7200RPM, 8MB cache)" -"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" -"SAMSUNG SV0432A" 0 C "Samsung SV0432A" -"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" -#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" -#"SAMSUNG SV1204H" 194 C "Samsung 120G" -"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" -"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" +"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" +"SAMSUNG SV0432A" 0 C "Samsung SV0432A" +"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" +#"SAMSUNG SV1204H" 194 C "Samsung 120G" +"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" +"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" ######################################## ############# Seagate drives ######################################## -"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" -"ST3412A" 0 C "Seagate ST3412A" -"ST38641A" 0 C "Seagate ST38641A" -"ST310014A" 194 C "Seagate ST310014A" -"ST310210A" 0 C "Seagate ST310210A" -"ST310211A" 194 C "Seagate ST310211A" -"ST310220A" 0 C "Seagate ST310220A" +"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" +"ST3412A" 0 C "Seagate ST3412A" +"ST38641A" 0 C "Seagate ST38641A" +"ST310014A" 194 C "Seagate ST310014A" +"ST310210A" 0 C "Seagate ST310210A" +"ST310211A" 194 C "Seagate ST310211A" +"ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB -"ST313021A" 0 C "Seagate U8 ST313021A" -"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" -"ST315320A" 194 C "Seagate ST315320A" -"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" -"ST320011A" 194 C "Seagate ST320011A" -"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" -"ST320410A" 194 C "Seagate ST320410A" -"ST320413A" 194 C "Seagate ST320413A" -"ST320414A" 194 C "Seagate ST320414A" -"ST320420A" 194 C "Seagate Barracuda II ST320420A" -"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" -"ST330620A" 194 C "Seagate ST330620A" -"ST330621A" 194 C "Seagate ST330621A" -"ST330630A" 194 C "Seagate Barracuda ST330630A" -"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" -"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" -"ST340016A" 194 C "Seagate ST340016A" -"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" -"ST340823A" 194 C "Seagate U Series 5 40823" -"ST340824A" 194 C "Seagate Barracuda III" -"ST360015A" 194 C "Seagate Barracuda V ST360015A" -"ST360020A" 194 C "Seagate U Series 60020" -"ST360021A" 194 C "Seagate Barracuda IV ST360021A" -"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380012A" 194 C "Seagate ST380012A 80GB" -"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" -"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" -"ST380021A" 194 C "Seagate Barracuda IV ST380021A" -"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" -"ST380023A" 194 C "Seagate Barracuda V ST380023A" -"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" -"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" -"ST3120020A" 194 C "Seagate ST3120020A" -"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" -"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" -"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" -"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" -"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" -"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" -"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" -"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" -"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" -"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" -"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" -"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" -"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" -"ST3300831A" 194 C "Seagate 300GB ST3300831A" -"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" -"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" +"ST313021A" 0 C "Seagate U8 ST313021A" +"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" +"ST315320A" 194 C "Seagate ST315320A" +"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" +"ST320011A" 194 C "Seagate ST320011A" +"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" +"ST320410A" 194 C "Seagate ST320410A" +"ST320413A" 194 C "Seagate ST320413A" +"ST320414A" 194 C "Seagate ST320414A" +"ST320420A" 194 C "Seagate Barracuda II ST320420A" +"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" +"ST330620A" 194 C "Seagate ST330620A" +"ST330621A" 194 C "Seagate ST330621A" +"ST330630A" 194 C "Seagate Barracuda ST330630A" +"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" +"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" +"ST340016A" 194 C "Seagate ST340016A" +"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" +"ST340823A" 194 C "Seagate U Series 5 40823" +"ST340824A" 194 C "Seagate Barracuda III" +"ST360015A" 194 C "Seagate Barracuda V ST360015A" +"ST360020A" 194 C "Seagate U Series 60020" +"ST360021A" 194 C "Seagate Barracuda IV ST360021A" +"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380012A" 194 C "Seagate ST380012A 80GB" +"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" +"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" +"ST380021A" 194 C "Seagate Barracuda IV ST380021A" +"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" +"ST380023A" 194 C "Seagate Barracuda V ST380023A" +"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" +"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" +"ST3120020A" 194 C "Seagate ST3120020A" +"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" +"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" +"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" +"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" +"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" +"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" +"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" +"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" +"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" +"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" +"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" +"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" +"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" +"ST3300831A" 194 C "Seagate 300GB ST3300831A" +"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" +"ST3802110A" 194 C "Seagate Barracuda 7200.9 80 GB" +"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" "ST9100823A" 194 C "Seagate Momentus 5400.2 100GB" -"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" -"ST94019A" 194 C "Seagate ST94019A" -"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" -"ST94[08]11A" 194 C "Seagate ST94011A" -"ST960821A" 194 C "Seagate ST960821A" -"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" -"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" -"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" +"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" +"ST94019A" 194 C "Seagate ST94019A" +"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" +"ST94[08]11A" 194 C "Seagate ST94011A" +"ST960821A" 194 C "Seagate ST960821A" +"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" +"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" +"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" + ######################################## ############# TOSHIBA Laptops ######################################## -"MK4313MAT" 220 C "Toshiba MK4313MAT" -"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" -"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" -"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" -"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" - -"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" -"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" -"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" - -#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" -"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" -"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" -"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" -"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" +"MK4313MAT" 220 C "Toshiba MK4313MAT" +"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" +"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" +"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" +"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" + +"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" +"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" +"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" + +#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" +"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" +"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" +"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" -"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" -"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" -"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" -"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" +"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" +"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" +"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" +"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" -"MK4025GAS" 194 C "Toshiba MK4025GAS" +"MK4025GAS" 194 C "Toshiba MK4025GAS" ######################################## @@ -345,12 +343,12 @@ # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC AC22000L" 0 C "Western Digital Caviar AC22000" -"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" +"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Western Digital WD135BA" -"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" -"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" +"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" +"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" #"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" "WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" @@ -359,7 +357,7 @@ "WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" #"WDC WD400BB-00GFA0" 0 C "" "WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" -"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" +"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" @@ -370,7 +368,7 @@ "WDC WD400VE-75HDT1" 194 C "Western Digital Scorpio 40GB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" -"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" +"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" "WDC WD600VE-75HDT0" 194 C "Western Digital 600VE-75HDT0" "WDC WD600VE-00HDT0" 194 C "Western Digital 600VE-00HDT0" "WDC WD740GD-00FL21.0" 194 C "Western Digital SATA Raptor" @@ -383,20 +381,20 @@ "WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" "WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" "WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" -"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" +"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" "WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB" "WDC WD800JB-00JJ[AC]0" 194 C "Western Digital WD800JB" "WDC WD800JD-(00|55)(HK|JR)A0" 194 C "Western Digital SATA 80GB, 8MB Cache" "WDC WD800LB-(00|55)DNA0" 194 C "Western Digital Caviar WD800LB 80 Go ATA-100" "WDC WD800VE-07HDT0" 194 C "Western Digital 800VE-07HDT0" "WDC WD1200BB-00(FTA|GUA)0" 194 C "Western Digital Caviar EIDE 2MB Cache" -"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" -"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" -"WDC WD1200JD-00GBB0" 194 C "Western Digital WD1200JD" +"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" +"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" +"WDC WD1200JD-00(GBB|HBC)0" 194 C "Western Digital WD1200JD" "WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" "WDC WD1200SB-01KB[AC]0" 194 C "Western Digital Caviar RE (Raid Edition) 120 GB" "WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" -"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" +"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" "WDC WD2000BB-00FTA0" 194 C "Western Digital WD2000BB" "WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" "WDC WD2000JB-00GVC0" 194 C "Western Digital WD2000JB" @@ -405,9 +403,12 @@ "WDC WD2500JD-(00G|32H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" "WDC WD2500JD-40HBC0" 194 C "Western Digital WD2500JD-40HBC0" "WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" +"WDC WD2500PD-00FZB1" 194 C "Western Digital WD2500PD-00FZB1" +"WDC WD2500SD-01KCB0" 194 C "Western Digital Caviar RE 250GB 8MB" "WDC WD3000JB-00KFA0" 194 C "Western Digital WD3000JB" "WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" "WDC WD4000KD-00NAB0" 194 C "Western Digital Caviar SE16 400GB 16MB" +"WDC WD4000YR-01PLB0" 194 C "Western Digital Caviar RE2 400GB 16MB" # not sure for next # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- hddtemp.spec 26 Feb 2006 15:41:47 -0000 1.16 +++ hddtemp.spec 3 May 2006 18:07:11 -0000 1.17 @@ -1,4 +1,4 @@ -%define beta beta14 +%define beta beta15 Name: hddtemp Version: 0.3 @@ -8,7 +8,7 @@ Group: Applications/System License: GPL URL: http://www.guzu.net/linux/hddtemp.php -Source0: http://www.guzu.net/linux/%{name}-%{version}-%{beta}.tar.bz2 +Source0: http://www.guzu.net/files/%{name}-%{version}-%{beta}.tar.bz2 Source1: http://www.guzu.net/linux/hddtemp.db Source2: %{name}.init Source3: %{name}.sysconfig @@ -28,9 +28,6 @@ %prep %setup -q -n %{name}-%{version}-%{beta} -%{__perl} -pi -e \ - 's|/usr/share/misc/hddtemp\.db\b|%{_datadir}/misc/hddtemp.db|' \ - src/db.h doc/hddtemp.8 cp -p %{SOURCE2} ./hddtemp.init %{__perl} -pi -e \ 's|__ETCDIR__|%{_sysconfdir}|g ; @@ -39,27 +36,23 @@ s|__LOCKDIR__|%{_localstatedir}/lock|g' \ hddtemp.init chmod -x contribs/analyze/* +rm COPYING ; cp -p GPL-2 COPYING %build -%configure --disable-dependency-tracking \ - --with-db-path=%{_datadir}/misc/hddtemp.db +%configure --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/misc/hddtemp.db -install -Dpm 755 hddtemp.init \ - $RPM_BUILD_ROOT%{_initrddir}/hddtemp -install -Dpm 644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp +install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/misc/hddtemp.db +install -Dpm 755 hddtemp.init $RPM_BUILD_ROOT%{_initrddir}/hddtemp +install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp install -dm 755 $RPM_BUILD_ROOT%{_bindir} ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/hddtemp -install -Dpm 644 %{SOURCE4} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp +install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp install -Dpm 644 %{SOURCE5} \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/hddtemp %find_lang %{name} @@ -84,18 +77,22 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO contribs +%doc ChangeLog COPYING README TODO contribs/ %config(noreplace) %{_sysconfdir}/sysconfig/hddtemp %config(noreplace) %{_sysconfdir}/pam.d/hddtemp %config(noreplace) %{_sysconfdir}/security/console.apps/hddtemp %{_initrddir}/hddtemp %{_bindir}/hddtemp %{_sbindir}/hddtemp -%config %{_datadir}/misc/hddtemp.db +%config /usr/share/misc/hddtemp.db %{_mandir}/man8/hddtemp.8* %changelog +* Wed May 3 2006 Ville Skytt?? - 0.3-0.8.beta15 +- 0.3-beta15, drive database 2006-04-26. +- Specfile cleanups. + * Wed Feb 8 2006 Ville Skytt?? - 0.3-0.8.beta14 - Update drive database to 2006-02-07. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Sep 2005 18:09:14 -0000 1.7 +++ sources 3 May 2006 18:07:11 -0000 1.8 @@ -1 +1 @@ -bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 +8b829339e1ae9df701684ec239021bb8 hddtemp-0.3-beta15.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 18:44:06 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 11:44:06 -0700 Subject: rpms/nagios/FC-4 .cvsignore, 1.4, 1.5 nagios.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200605031844.k43Ii8Kl024414@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24393 Modified Files: .cvsignore nagios.spec sources Log Message: New source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2006 03:10:52 -0000 1.4 +++ .cvsignore 3 May 2006 18:44:06 -0000 1.5 @@ -1 +1 @@ -nagios-2.0.tar.gz +nagios-2.2.tar.gz Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nagios.spec 27 Feb 2006 03:10:52 -0000 1.9 +++ nagios.spec 3 May 2006 18:44:06 -0000 1.10 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.0 -Release: 1%{?dist} +Version: 2.2 +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -76,9 +76,9 @@ %{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora %{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \ - -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora + -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora %{__sed} -e "s|resource.cfg|private/resource.cfg|" \ - -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora + -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora %{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg echo >> html/stylesheets/common.css @@ -86,7 +86,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config -%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name} +%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd %{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private @@ -145,7 +145,8 @@ %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample -%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives @@ -154,7 +155,29 @@ %{_includedir}/%{name} %changelog -* Tue Feb 21 2006 Mike McGrath imlinux at gmail.com> 2.0-1 +* Tue May 02 2006 Mike McGrath 2.2-3 +- Upstream released 2.2 +- Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd +- 2.2 -------------------------------------------------- +- Minor bug fix in availability CGI +- Bug fix with temporary file location used for retention data +- Fix for segfault that occurred in 2.1 during service flapping notifications +- 2.1 -------------------------------------------------- +- Changed freshness logic so that passive checks don't immediately go stale after program restart +- Bug fix for minor memory leak in object cleanup code +- Bug fix for flapping notifications during scheduled downtime +- Bug fix for $TOTALHOSTSDOWNUNHANDLED$ macro +- Bug fix in sample minimal.cfg file +- Bug fix in status CGI when displaying servicegroups +- Bug fixes in computation of indeterminate time and scheduled downtime in availability CGI +- Bug fix with not deleting all comments associated with a service +- Lowered max plugin output length from 348 to 332 chars to run on 64-bit systems without problems +- Minor fix to p1.pl for embedded Perl interpreter +- Minor fixes to WAP interface (statuswml CGI) +- Minor bug fix to VRML interface (statuswrl CGI) +- Minor doc updates + +* Tue Feb 21 2006 Mike McGrath 2.0-1 - Upstream released 2.0 (changes below) - Fix for segfault in timed event queue - Removed length limitations for object vars/vals Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2006 03:10:52 -0000 1.4 +++ sources 3 May 2006 18:44:06 -0000 1.5 @@ -1 +1 @@ -2a30ccf68bdbebc9c6f5a06e9c09e757 nagios-2.0.tar.gz +38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz From fedora-extras-commits at redhat.com Wed May 3 18:47:38 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 11:47:38 -0700 Subject: rpms/galeon/FC-4 galeon.spec,1.21,1.22 Message-ID: <200605031847.k43IletB024506@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24489 Modified Files: galeon.spec Log Message: Rebuild for mozilla 1.7.13 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- galeon.spec 16 Mar 2006 19:44:20 -0000 1.21 +++ galeon.spec 3 May 2006 18:47:37 -0000 1.22 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -96,6 +96,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-3 +- Rebuild for mozilla 1.7.13 + * Thu Mar 16 2006 Denis Leroy - 2.0.1-2 - Removed x86_64 specific automake runs From fedora-extras-commits at redhat.com Wed May 3 19:23:42 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 12:23:42 -0700 Subject: rpms/galeon/FC-4 galeon.spec,1.22,1.23 Message-ID: <200605031923.k43JNisH026993@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26975 Modified Files: galeon.spec Log Message: Fixed mozilla Requires Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- galeon.spec 3 May 2006 18:47:37 -0000 1.22 +++ galeon.spec 3 May 2006 19:23:41 -0000 1.23 @@ -1,14 +1,14 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: scrollkeeper -Requires: mozilla = 37:1.7.12 +Requires: mozilla = 37:1.7.13 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 gnome-desktop-devel BuildRequires: libglade2-devel >= 2.3.1 libbonoboui-devel >= 2.1.1 @@ -96,6 +96,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-4 +- Fixed mozilla Requires + * Wed May 3 2006 Denis Leroy - 2.0.1-3 - Rebuild for mozilla 1.7.13 From fedora-extras-commits at redhat.com Wed May 3 22:01:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:01:07 -0700 Subject: rpms/erlang/devel otp-run_erl.patch,NONE,1.1 erlang.spec,1.11,1.12 Message-ID: <200605032201.k43M198M001843@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469/devel Modified Files: erlang.spec Added Files: otp-run_erl.patch Log Message: run_erl patch otp-run_erl.patch: --- NEW FILE otp-run_erl.patch --- --- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 +++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #if !defined(NO_SYSLOG) #include #endif @@ -803,6 +805,7 @@ static int open_pty_master(char **ptyslave) { int mfd; + int sfd; char *major, *minor; static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; @@ -818,6 +821,15 @@ /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ { + static char ttyname[] = " "; + if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { + close(sfd); + *ptyslave = ttyname; + return mfd; + } + } + + { /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ static char ptyname[] = "/dev/pty/mX"; --- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 +++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 @@ -241,7 +241,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o + $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- erlang.spec 13 Mar 2006 16:18:42 -0000 1.11 +++ erlang.spec 3 May 2006 22:01:07 -0000 1.12 @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.2%{?dist} +Release: 10.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -14,6 +14,7 @@ Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch Patch4: otp-glibc24.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -48,6 +49,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build @@ -101,6 +103,9 @@ %changelog +* Wed May 3 2006 Gerard Milmeister - R10B-10.3 +- added patch for run_erl by Knut-H??vard Aksnes + * Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 - new version R10B-10 From fedora-extras-commits at redhat.com Wed May 3 22:01:05 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:01:05 -0700 Subject: rpms/erlang/FC-4 otp-run_erl.patch,NONE,1.1 erlang.spec,1.7,1.8 Message-ID: <200605032201.k43M1b53001899@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469/FC-4 Modified Files: erlang.spec Added Files: otp-run_erl.patch Log Message: run_erl patch otp-run_erl.patch: --- NEW FILE otp-run_erl.patch --- --- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 +++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #if !defined(NO_SYSLOG) #include #endif @@ -803,6 +805,7 @@ static int open_pty_master(char **ptyslave) { int mfd; + int sfd; char *major, *minor; static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; @@ -818,6 +821,15 @@ /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ { + static char ttyname[] = " "; + if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { + close(sfd); + *ptyslave = ttyname; + return mfd; + } + } + + { /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ static char ptyname[] = "/dev/pty/mX"; --- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 +++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 @@ -241,7 +241,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o + $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- erlang.spec 13 Mar 2006 15:58:42 -0000 1.7 +++ erlang.spec 3 May 2006 22:01:04 -0000 1.8 @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.1%{?dist} +Release: 10.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -46,6 +47,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch5 -p1 %build @@ -99,6 +101,9 @@ %changelog +* Wed May 3 2006 Gerard Milmeister - R10B-10.3 +- added patch for run_erl by Knut-H??vard Aksnes + * Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 - new version R10B-10 From fedora-extras-commits at redhat.com Wed May 3 22:01:06 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:01:06 -0700 Subject: rpms/erlang/FC-5 otp-run_erl.patch,NONE,1.1 erlang.spec,1.11,1.12 Message-ID: <200605032201.k43M1dPR001900@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469/FC-5 Modified Files: erlang.spec Added Files: otp-run_erl.patch Log Message: run_erl patch otp-run_erl.patch: --- NEW FILE otp-run_erl.patch --- --- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 +++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #if !defined(NO_SYSLOG) #include #endif @@ -803,6 +805,7 @@ static int open_pty_master(char **ptyslave) { int mfd; + int sfd; char *major, *minor; static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; @@ -818,6 +821,15 @@ /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ { + static char ttyname[] = " "; + if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { + close(sfd); + *ptyslave = ttyname; + return mfd; + } + } + + { /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ static char ptyname[] = "/dev/pty/mX"; --- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 +++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 @@ -241,7 +241,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o + $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/erlang.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- erlang.spec 13 Mar 2006 16:18:42 -0000 1.11 +++ erlang.spec 3 May 2006 22:01:05 -0000 1.12 @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.2%{?dist} +Release: 10.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -14,6 +14,7 @@ Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch Patch4: otp-glibc24.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -48,6 +49,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build @@ -101,6 +103,9 @@ %changelog +* Wed May 3 2006 Gerard Milmeister - R10B-10.3 +- added patch for run_erl by Knut-H??vard Aksnes + * Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 - new version R10B-10 From fedora-extras-commits at redhat.com Wed May 3 22:18:09 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 3 May 2006 15:18:09 -0700 Subject: fedora-security/audit fe4,1.1,1.2 fe5,1.1,1.2 Message-ID: <200605032218.k43MI9YT002137@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2115 Modified Files: fe4 fe5 Log Message: Note a new nagios issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fe4 2 May 2006 21:07:40 -0000 1.1 +++ fe4 3 May 2006 22:18:06 -0000 1.2 @@ -1,3 +1,5 @@ # $Id$ ** are items that need attention + +CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fe5 2 May 2006 21:07:40 -0000 1.1 +++ fe5 3 May 2006 22:18:06 -0000 1.2 @@ -1,3 +1,5 @@ # $Id$ ** are items that need attention + +CVE-2006-2162 VULNERABLE (nagios) bz#190612 From fedora-extras-commits at redhat.com Wed May 3 22:36:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:36:29 -0700 Subject: rpms/gauche/FC-5 gauche-arch.patch,NONE,1.1 gauche.spec,1.2,1.3 Message-ID: <200605032236.k43MaVMQ002263@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2209/FC-5 Modified Files: gauche.spec Added Files: gauche-arch.patch Log Message: added arch patch gauche-arch.patch: --- NEW FILE gauche-arch.patch --- --- Gauche-0.8.7/ext/Makefile.ext.in.arch 2006-05-04 00:22:48.000000000 +0200 +++ Gauche-0.8.7/ext/Makefile.ext.in 2006-05-04 00:23:25.000000000 +0200 @@ -10,7 +10,7 @@ datadir = @datadir@ VPATH = $(srcdir) GAUCHE_VERSION = @GAUCHE_VERSION@ -HOST = @host@ +HOST = @target@ # These may be overridden by make invocators DESTDIR = Index: gauche.spec =================================================================== RCS file: /cvs/extras/rpms/gauche/FC-5/gauche.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gauche.spec 29 Apr 2006 09:21:55 -0000 1.2 +++ gauche.spec 3 May 2006 22:36:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: gauche Version: 0.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Scheme script interpreter with multibyte character handling Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz Patch0: gauche-jp.patch +Patch1: gauche-arch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel BuildRequires: texinfo @@ -34,6 +35,7 @@ %prep %setup -q -n Gauche-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -121,12 +123,15 @@ %changelog +* Thu May 4 2006 Gerard Milmeister - 0.8.7-5 +- added patch for consistent arch directories (gauche-arch.patch) + * Fri Apr 28 2006 Gerard Milmeister - 0.8.7-3 - added %%check - included COPYING file in %%doc * Thu Apr 27 2006 Gerard Milmeister - 0.8.7-2 -- fixes to permissions +- fixes permissions - patch to fix jp problem in texinfo file * Fri Apr 21 2006 Gerard Milmeister - 0.8.7-1 From fedora-extras-commits at redhat.com Wed May 3 22:36:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:36:29 -0700 Subject: rpms/gauche/devel gauche-arch.patch,NONE,1.1 gauche.spec,1.2,1.3 Message-ID: <200605032236.k43MaVwD002269@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2209/devel Modified Files: gauche.spec Added Files: gauche-arch.patch Log Message: added arch patch gauche-arch.patch: --- NEW FILE gauche-arch.patch --- --- Gauche-0.8.7/ext/Makefile.ext.in.arch 2006-05-04 00:22:48.000000000 +0200 +++ Gauche-0.8.7/ext/Makefile.ext.in 2006-05-04 00:23:25.000000000 +0200 @@ -10,7 +10,7 @@ datadir = @datadir@ VPATH = $(srcdir) GAUCHE_VERSION = @GAUCHE_VERSION@ -HOST = @host@ +HOST = @target@ # These may be overridden by make invocators DESTDIR = Index: gauche.spec =================================================================== RCS file: /cvs/extras/rpms/gauche/devel/gauche.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gauche.spec 29 Apr 2006 09:21:55 -0000 1.2 +++ gauche.spec 3 May 2006 22:36:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: gauche Version: 0.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Scheme script interpreter with multibyte character handling Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz Patch0: gauche-jp.patch +Patch1: gauche-arch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel BuildRequires: texinfo @@ -34,6 +35,7 @@ %prep %setup -q -n Gauche-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -121,12 +123,15 @@ %changelog +* Thu May 4 2006 Gerard Milmeister - 0.8.7-5 +- added patch for consistent arch directories (gauche-arch.patch) + * Fri Apr 28 2006 Gerard Milmeister - 0.8.7-3 - added %%check - included COPYING file in %%doc * Thu Apr 27 2006 Gerard Milmeister - 0.8.7-2 -- fixes to permissions +- fixes permissions - patch to fix jp problem in texinfo file * Fri Apr 21 2006 Gerard Milmeister - 0.8.7-1 From fedora-extras-commits at redhat.com Wed May 3 22:36:28 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:36:28 -0700 Subject: rpms/gauche/FC-4 gauche-arch.patch,NONE,1.1 gauche.spec,1.2,1.3 Message-ID: <200605032236.k43MaU2B002259@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2209/FC-4 Modified Files: gauche.spec Added Files: gauche-arch.patch Log Message: added arch patch gauche-arch.patch: --- NEW FILE gauche-arch.patch --- --- Gauche-0.8.7/ext/Makefile.ext.in.arch 2006-05-04 00:22:48.000000000 +0200 +++ Gauche-0.8.7/ext/Makefile.ext.in 2006-05-04 00:23:25.000000000 +0200 @@ -10,7 +10,7 @@ datadir = @datadir@ VPATH = $(srcdir) GAUCHE_VERSION = @GAUCHE_VERSION@ -HOST = @host@ +HOST = @target@ # These may be overridden by make invocators DESTDIR = Index: gauche.spec =================================================================== RCS file: /cvs/extras/rpms/gauche/FC-4/gauche.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gauche.spec 29 Apr 2006 09:21:55 -0000 1.2 +++ gauche.spec 3 May 2006 22:36:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: gauche Version: 0.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Scheme script interpreter with multibyte character handling Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz Patch0: gauche-jp.patch +Patch1: gauche-arch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel BuildRequires: texinfo @@ -34,6 +35,7 @@ %prep %setup -q -n Gauche-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -121,12 +123,15 @@ %changelog +* Thu May 4 2006 Gerard Milmeister - 0.8.7-5 +- added patch for consistent arch directories (gauche-arch.patch) + * Fri Apr 28 2006 Gerard Milmeister - 0.8.7-3 - added %%check - included COPYING file in %%doc * Thu Apr 27 2006 Gerard Milmeister - 0.8.7-2 -- fixes to permissions +- fixes permissions - patch to fix jp problem in texinfo file * Fri Apr 21 2006 Gerard Milmeister - 0.8.7-1 From fedora-extras-commits at redhat.com Wed May 3 23:20:41 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 16:20:41 -0700 Subject: rpms/galeon/FC-5 galeon.spec,1.16,1.17 Message-ID: <200605032320.k43NKh2w004854@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4837 Modified Files: galeon.spec Log Message: Bumping up release to be >= than that of FC4 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-5/galeon.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- galeon.spec 3 May 2006 16:22:08 -0000 1.16 +++ galeon.spec 3 May 2006 23:20:40 -0000 1.17 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -113,6 +113,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-4 +- Bumping up release to be >= that of FC-4 + * Wed May 3 2006 Denis Leroy - 2.0.1-2 - Rebuild for mozilla 1.7.13 From fedora-extras-commits at redhat.com Wed May 3 23:21:50 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 16:21:50 -0700 Subject: rpms/galeon/devel galeon.spec,1.16,1.17 Message-ID: <200605032321.k43NLqdk004935@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4918 Modified Files: galeon.spec Log Message: Bumping up release to match that of FC4 and FC5 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- galeon.spec 3 May 2006 15:44:00 -0000 1.16 +++ galeon.spec 3 May 2006 23:21:50 -0000 1.17 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -113,6 +113,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-4 +- Bumping up release to match that of FC-4 and FC-5 + * Wed May 3 2006 Denis Leroy - 2.0.1-2 - Rebuild for mozilla 1.7.13 From fedora-extras-commits at redhat.com Thu May 4 03:19:42 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:19:42 -0700 Subject: owners owners.list,1.938,1.939 Message-ID: <200605040319.k443JioO016046@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16026 Modified Files: owners.list Log Message: Added mboxgrep Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.938 retrieving revision 1.939 diff -u -r1.938 -r1.939 --- owners.list 2 May 2006 23:03:27 -0000 1.938 +++ owners.list 4 May 2006 03:19:41 -0000 1.939 @@ -731,6 +731,7 @@ Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|mboxgrep|Displays e-mail messages matching a pattern|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 4 03:22:02 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:02 -0700 Subject: rpms/mboxgrep - New directory Message-ID: <200605040322.k443M43T016137@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16116/mboxgrep Log Message: Directory /cvs/extras/rpms/mboxgrep added to the repository From fedora-extras-commits at redhat.com Thu May 4 03:22:02 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:02 -0700 Subject: rpms/mboxgrep/devel - New directory Message-ID: <200605040322.k443M4k1016140@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16116/mboxgrep/devel Log Message: Directory /cvs/extras/rpms/mboxgrep/devel added to the repository From fedora-extras-commits at redhat.com Thu May 4 03:22:21 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:21 -0700 Subject: rpms/mboxgrep Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605040322.k443MNZr016189@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16161 Added Files: Makefile import.log Log Message: Setup of module mboxgrep --- NEW FILE Makefile --- # Top level Makefile for module mboxgrep all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 4 03:22:21 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:21 -0700 Subject: rpms/mboxgrep/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605040322.k443MN78016192@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16161/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mboxgrep --- NEW 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 May 4 03:22:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:55 -0700 Subject: rpms/mboxgrep import.log,1.1,1.2 Message-ID: <200605040322.k443Mv1s016258@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16225 Modified Files: import.log Log Message: auto-import mboxgrep-0.7.9-2 on branch devel from mboxgrep-0.7.9-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mboxgrep/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 May 2006 03:22:20 -0000 1.1 +++ import.log 4 May 2006 03:22:55 -0000 1.2 @@ -0,0 +1 @@ +mboxgrep-0_7_9-2:HEAD:mboxgrep-0.7.9-2.src.rpm:1146712967 From fedora-extras-commits at redhat.com Thu May 4 03:22:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:55 -0700 Subject: rpms/mboxgrep/devel mboxgrep.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605040323.k443Mv5M016263@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16225/devel Modified Files: .cvsignore sources Added Files: mboxgrep.spec Log Message: auto-import mboxgrep-0.7.9-2 on branch devel from mboxgrep-0.7.9-2.src.rpm --- NEW FILE mboxgrep.spec --- Summary: Displays e-mail messages matching a pattern Name: mboxgrep Version: 0.7.9 Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz URL: http://www.mboxgrep.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel, bzip2-devel, pcre-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description mboxgrep is a small utility that scans a mailbox for messages matching a basic, extended, or Perl-compatible regular expression. Selected messages can be either displayed on standard output, counted, piped to a command or written to another mailbox. It supports mbox (both plain and compressed), MH, nnmh, nnml and maildir folders. %prep %setup -q %build %configure %{__make} %{?_smp_mflags} %install rm -rf %{buildroot} %makeinstall %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/mboxgrep %{_mandir}/man1/mboxgrep.1* %{_infodir}/mboxgrep.info* %changelog * Wed Mar 29 2006 Andreas Thienemann 0.7.9-2 - Cleaned up for FE * Wed May 26 2004 Andreas Thienemann 0.7.9-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mboxgrep/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 May 2006 03:22:21 -0000 1.1 +++ .cvsignore 4 May 2006 03:22:55 -0000 1.2 @@ -0,0 +1 @@ +mboxgrep-0.7.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mboxgrep/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 May 2006 03:22:21 -0000 1.1 +++ sources 4 May 2006 03:22:55 -0000 1.2 @@ -0,0 +1 @@ +4b256de164b8f094db9ccf0e6386d246 mboxgrep-0.7.9.tar.gz From fedora-extras-commits at redhat.com Thu May 4 03:32:53 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:32:53 -0700 Subject: rpms/nagios/devel nagios.spec,1.16,1.17 Message-ID: <200605040332.k443Wtv8016505@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16458/devel Modified Files: nagios.spec Log Message: - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs - Added missing links for notes_url and action_url to service column of status detail page Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- nagios.spec 2 May 2006 15:41:18 -0000 1.16 +++ nagios.spec 4 May 2006 03:32:52 -0000 1.17 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.2 -Release: 3%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -155,6 +155,11 @@ %{_includedir}/%{name} %changelog +* Wed May 03 2006 Mike McGrath 2.3-1 +- Upstream released 2.3 +- Bug fix for negative HTTP content_length header in CGIs +- Added missing links for notes_url and action_url to service column of status detail page + * Tue May 02 2006 Mike McGrath 2.2-3 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd From fedora-extras-commits at redhat.com Thu May 4 03:32:46 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:32:46 -0700 Subject: rpms/nagios/FC-4 nagios.spec,1.10,1.11 Message-ID: <200605040333.k443XISn016508@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16458/FC-4 Modified Files: nagios.spec Log Message: - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs - Added missing links for notes_url and action_url to service column of status detail page Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nagios.spec 3 May 2006 18:44:06 -0000 1.10 +++ nagios.spec 4 May 2006 03:32:46 -0000 1.11 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.2 -Release: 3%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -155,6 +155,11 @@ %{_includedir}/%{name} %changelog +* Wed May 03 2006 Mike McGrath 2.3-1 +- Upstream released 2.3 +- Bug fix for negative HTTP content_length header in CGIs +- Added missing links for notes_url and action_url to service column of status detail page + * Tue May 02 2006 Mike McGrath 2.2-3 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd From fedora-extras-commits at redhat.com Thu May 4 03:32:47 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:32:47 -0700 Subject: rpms/nagios/FC-5 nagios.spec,1.10,1.11 Message-ID: <200605040333.k443XJRt016511@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16458/FC-5 Modified Files: nagios.spec Log Message: - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs - Added missing links for notes_url and action_url to service column of status detail page Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nagios.spec 21 Feb 2006 10:36:06 -0000 1.10 +++ nagios.spec 4 May 2006 03:32:47 -0000 1.11 @@ -1,5 +1,5 @@ Name: nagios -Version: 2.0 +Version: 2.3 Release: 1%{?dist} Summary: Host/service/network monitoring program @@ -76,9 +76,9 @@ %{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora %{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \ - -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora + -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora %{__sed} -e "s|resource.cfg|private/resource.cfg|" \ - -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora + -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora %{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg echo >> html/stylesheets/common.css @@ -86,7 +86,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config -%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name} +%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd %{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private @@ -145,7 +145,8 @@ %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample -%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives @@ -154,7 +155,34 @@ %{_includedir}/%{name} %changelog -* Tue Feb 21 2006 Mike McGrath imlinux at gmail.com> 2.0-1 +* Wed May 03 2006 Mike McGrath 2.3-1 +- Upstream released 2.3 +- Bug fix for negative HTTP content_length header in CGIs +- Added missing links for notes_url and action_url to service column of status detail page + +* Tue May 02 2006 Mike McGrath 2.2-3 +- Upstream released 2.2 +- Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd +- 2.2 -------------------------------------------------- +- Minor bug fix in availability CGI +- Bug fix with temporary file location used for retention data +- Fix for segfault that occurred in 2.1 during service flapping notifications +- 2.1 -------------------------------------------------- +- Changed freshness logic so that passive checks don't immediately go stale after program restart +- Bug fix for minor memory leak in object cleanup code +- Bug fix for flapping notifications during scheduled downtime +- Bug fix for $TOTALHOSTSDOWNUNHANDLED$ macro +- Bug fix in sample minimal.cfg file +- Bug fix in status CGI when displaying servicegroups +- Bug fixes in computation of indeterminate time and scheduled downtime in availability CGI +- Bug fix with not deleting all comments associated with a service +- Lowered max plugin output length from 348 to 332 chars to run on 64-bit systems without problems +- Minor fix to p1.pl for embedded Perl interpreter +- Minor fixes to WAP interface (statuswml CGI) +- Minor bug fix to VRML interface (statuswrl CGI) +- Minor doc updates + +* Tue Feb 21 2006 Mike McGrath 2.0-1 - Upstream released 2.0 (changes below) - Fix for segfault in timed event queue - Removed length limitations for object vars/vals From fedora-extras-commits at redhat.com Thu May 4 03:35:36 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:35:36 -0700 Subject: rpms/nagios/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200605040335.k443ZcsC016547@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16528 Modified Files: .cvsignore sources Log Message: New source - 2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 May 2006 15:27:22 -0000 1.5 +++ .cvsignore 4 May 2006 03:35:36 -0000 1.6 @@ -1 +1 @@ -nagios-2.2.tar.gz +nagios-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 May 2006 15:27:22 -0000 1.5 +++ sources 4 May 2006 03:35:36 -0000 1.6 @@ -1 +1 @@ -38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz +6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz From fedora-extras-commits at redhat.com Thu May 4 03:36:31 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:36:31 -0700 Subject: rpms/nagios/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200605040336.k443aXP5016592@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558/FC-4 Modified Files: .cvsignore sources Log Message: New source - 2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 3 May 2006 18:44:06 -0000 1.5 +++ .cvsignore 4 May 2006 03:36:31 -0000 1.6 @@ -1 +1 @@ -nagios-2.2.tar.gz +nagios-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 3 May 2006 18:44:06 -0000 1.5 +++ sources 4 May 2006 03:36:31 -0000 1.6 @@ -1 +1 @@ -38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz +6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz From fedora-extras-commits at redhat.com Thu May 4 03:36:32 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:36:32 -0700 Subject: rpms/nagios/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200605040336.k443aYdF016597@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558/FC-5 Modified Files: .cvsignore sources Log Message: New source - 2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Feb 2006 10:34:40 -0000 1.4 +++ .cvsignore 4 May 2006 03:36:32 -0000 1.5 @@ -1 +1 @@ -nagios-2.0.tar.gz +nagios-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Feb 2006 10:34:40 -0000 1.4 +++ sources 4 May 2006 03:36:32 -0000 1.5 @@ -1 +1 @@ -2a30ccf68bdbebc9c6f5a06e9c09e757 nagios-2.0.tar.gz +6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz From fedora-extras-commits at redhat.com Thu May 4 04:48:44 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 3 May 2006 21:48:44 -0700 Subject: rpms/sobby/devel .cvsignore, 1.3, 1.4 sobby.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605040448.k444mk92019108@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/sobby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19087 Modified Files: .cvsignore sobby.spec sources Log Message: 0.4.0rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sobby/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2005 09:14:32 -0000 1.3 +++ .cvsignore 4 May 2006 04:48:43 -0000 1.4 @@ -1 +1 @@ -sobby-0.3.0.tar.gz +sobby-0.4.0rc1.tar.gz Index: sobby.spec =================================================================== RCS file: /cvs/extras/rpms/sobby/devel/sobby.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sobby.spec 15 Feb 2006 22:11:50 -0000 1.3 +++ sobby.spec 4 May 2006 04:48:43 -0000 1.4 @@ -1,12 +1,14 @@ +%define _rc rc1 + Name: sobby -Version: 0.3.0 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1.%{_rc}%{?dist} Summary: Standalone obby server Group: Applications/Internet License: GPL URL: http://gobby.0x539.de -Source0: http://releases.0x539.de/sobby/%{name}-%{version}.tar.gz +Source0: http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: obby-devel, glibmm24-devel @@ -16,7 +18,7 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{_rc} %build @@ -37,9 +39,14 @@ %defattr(-,root,root,-) %doc README NEWS AUTHORS COPYING ChangeLog %{_bindir}/sobby +%{_mandir}/*/* %changelog +* Mon May 04 2006 Luke Macken - 0.4.0-1.rc1 +- 0.4.0rc1 +- Add man page + * Wed Feb 15 2006 Luke Macken - 0.3.0-2 - Rebuild for FE5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sobby/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2005 09:14:32 -0000 1.3 +++ sources 4 May 2006 04:48:43 -0000 1.4 @@ -1 +1 @@ -5408fc08d610be5aac4476c6ea6277f9 sobby-0.3.0.tar.gz +43bb4cbb9949179b3ecb1cbc0b447e24 sobby-0.4.0rc1.tar.gz From fedora-extras-commits at redhat.com Thu May 4 04:57:35 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 3 May 2006 21:57:35 -0700 Subject: rpms/sobby/devel sobby.spec,1.4,1.5 Message-ID: <200605040457.k444vbUm019184@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/sobby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19166 Modified Files: sobby.spec Log Message: add libxml++-devel to BR Index: sobby.spec =================================================================== RCS file: /cvs/extras/rpms/sobby/devel/sobby.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sobby.spec 4 May 2006 04:48:43 -0000 1.4 +++ sobby.spec 4 May 2006 04:57:35 -0000 1.5 @@ -2,7 +2,7 @@ Name: sobby Version: 0.4.0 -Release: 1.%{_rc}%{?dist} +Release: 2.%{_rc}%{?dist} Summary: Standalone obby server Group: Applications/Internet @@ -11,7 +11,7 @@ Source0: http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: obby-devel, glibmm24-devel +BuildRequires: obby-devel, glibmm24-devel, libxml++-devel %description Sobby is a standalone obby server. @@ -43,6 +43,9 @@ %changelog +* Mon May 04 2006 Luke Macken - 0.4.0-2.rc1 +- Add libxml++-devel to BuildRequires + * Mon May 04 2006 Luke Macken - 0.4.0-1.rc1 - 0.4.0rc1 - Add man page From fedora-extras-commits at redhat.com Thu May 4 07:59:40 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 00:59:40 -0700 Subject: rpms/scim-tables/devel README,1.1,1.2 Message-ID: <200605040759.k447xgsk026413@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26396 Modified Files: README Log Message: update text Index: README =================================================================== RCS file: /cvs/extras/rpms/scim-tables/devel/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 7 Nov 2005 06:30:28 -0000 1.1 +++ README 4 May 2006 07:59:40 -0000 1.2 @@ -1 +1 @@ -scim-tables is in Core devel. +scim-tables is in Core since FC5. From fedora-extras-commits at redhat.com Thu May 4 08:10:53 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 01:10:53 -0700 Subject: rpms/scim-tables/FC-5 README,1.1,1.2 Message-ID: <200605040810.k448Atue028664@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26431 Modified Files: README Log Message: update text Index: README =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-5/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 7 Nov 2005 06:30:28 -0000 1.1 +++ README 4 May 2006 08:10:52 -0000 1.2 @@ -1 +1 @@ -scim-tables is in Core devel. +scim-tables is in Fedora Core 5. From fedora-extras-commits at redhat.com Thu May 4 08:13:29 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Thu, 4 May 2006 01:13:29 -0700 Subject: fedora-security/audit fc5,1.142,1.143 Message-ID: <200605040813.k448DTIP028713@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28693/audit Modified Files: fc5 Log Message: Update with FEDORA-2006-499 (kernel) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- fc5 3 May 2006 14:40:10 -0000 1.142 +++ fc5 4 May 2006 08:13:26 -0000 1.143 @@ -27,8 +27,8 @@ CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] -CVE-2006-1864 VULNERABLE (kernel) -CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11) +CVE-2006-1864 ignore (kernel) not compiled in +CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13) @@ -102,7 +102,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) +CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499] CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Thu May 4 08:13:53 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Thu, 4 May 2006 01:13:53 -0700 Subject: fedora-security/audit fc4,1.228,1.229 Message-ID: <200605040813.k448Druo028741@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28721/audit Modified Files: fc4 Log Message: Update with FEDORA-2006-500 (kernel) Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- fc4 3 May 2006 14:40:10 -0000 1.228 +++ fc4 4 May 2006 08:13:51 -0000 1.229 @@ -27,7 +27,7 @@ CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 VULNERABLE (kernel) -CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11) +CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13) @@ -102,7 +102,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) +CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-500] CVE-2006-1526 VULNERABLE (xorg-x11) #189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] From fedora-extras-commits at redhat.com Thu May 4 08:49:03 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 May 2006 01:49:03 -0700 Subject: rpms/synergy/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 synergy.spec, 1.13, 1.14 Message-ID: <200605040849.k448n6QR029029@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/devel Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Dec 2005 10:51:24 -0000 1.8 +++ .cvsignore 4 May 2006 08:49:03 -0000 1.9 @@ -1 +1 @@ -synergy-1.2.7.tar.gz +synergy-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Dec 2005 10:51:24 -0000 1.8 +++ sources 4 May 2006 08:49:03 -0000 1.9 @@ -1 +1 @@ -da9effc847d13f9725b6db043d8283a5 synergy-1.2.7.tar.gz +a6e09d6b71cb217f23069980060abf27 synergy-1.3.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- synergy.spec 6 Mar 2006 17:26:29 -0000 1.13 +++ synergy.spec 4 May 2006 08:49:03 -0000 1.14 @@ -1,14 +1,14 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.7 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, autoconf, automake +BuildRequires: autoconf, automake # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora %if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel @@ -28,7 +28,7 @@ %prep %setup %patch -p1 -b .werror -%{__autoconf} +autoreconf %build @@ -55,6 +55,10 @@ %changelog +* Thu May 4 2006 Matthias Saou 1.3.1-1 +- Update to 1.3.1. +- Run full autoreconf instead of just autoconf since 1.6 is required otherwise. + * Mon Mar 6 2006 Matthias Saou 1.2.7-2 - FC5 rebuild. From fedora-extras-commits at redhat.com Thu May 4 08:48:58 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 May 2006 01:48:58 -0700 Subject: rpms/synergy/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 synergy.spec, 1.13, 1.14 Message-ID: <200605040849.k448nUbO029049@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/FC-5 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Dec 2005 10:51:24 -0000 1.8 +++ .cvsignore 4 May 2006 08:48:58 -0000 1.9 @@ -1 +1 @@ -synergy-1.2.7.tar.gz +synergy-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Dec 2005 10:51:24 -0000 1.8 +++ sources 4 May 2006 08:48:58 -0000 1.9 @@ -1 +1 @@ -da9effc847d13f9725b6db043d8283a5 synergy-1.2.7.tar.gz +a6e09d6b71cb217f23069980060abf27 synergy-1.3.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-5/synergy.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- synergy.spec 6 Mar 2006 17:26:29 -0000 1.13 +++ synergy.spec 4 May 2006 08:48:58 -0000 1.14 @@ -1,14 +1,14 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.7 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, autoconf, automake +BuildRequires: autoconf, automake # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora %if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel @@ -28,7 +28,7 @@ %prep %setup %patch -p1 -b .werror -%{__autoconf} +autoreconf %build @@ -55,6 +55,10 @@ %changelog +* Thu May 4 2006 Matthias Saou 1.3.1-1 +- Update to 1.3.1. +- Run full autoreconf instead of just autoconf since 1.6 is required otherwise. + * Mon Mar 6 2006 Matthias Saou 1.2.7-2 - FC5 rebuild. From fedora-extras-commits at redhat.com Thu May 4 08:48:56 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 May 2006 01:48:56 -0700 Subject: rpms/synergy/FC-3 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 synergy.spec, 1.8, 1.9 Message-ID: <200605040849.k448nSg5029039@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/FC-3 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Nov 2005 13:36:42 -0000 1.7 +++ .cvsignore 4 May 2006 08:48:56 -0000 1.8 @@ -1 +1 @@ -synergy-1.2.5.tar.gz +synergy-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Nov 2005 13:36:42 -0000 1.7 +++ sources 4 May 2006 08:48:56 -0000 1.8 @@ -1 +1 @@ -cf1b981acd317c003357f4ecba42448b synergy-1.2.5.tar.gz +a6e09d6b71cb217f23069980060abf27 synergy-1.3.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/synergy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synergy.spec 7 Nov 2005 13:36:42 -0000 1.8 +++ synergy.spec 4 May 2006 08:48:56 -0000 1.9 @@ -1,14 +1,21 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.5 +Version: 1.3.1 Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ -Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz +Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, xorg-x11-devel, autoconf +BuildRequires: autoconf, automake +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel +BuildRequires: libXinerama-devel +%else +BuildRequires: xorg-x11-devel +%endif %description Synergy lets you easily share a single mouse and keyboard between @@ -21,7 +28,7 @@ %prep %setup %patch -p1 -b .werror -%{__autoconf} +autoreconf %build @@ -48,6 +55,18 @@ %changelog +* Thu May 4 2006 Matthias Saou 1.3.1-1 +- Update to 1.3.1. +- Run full autoreconf instead of just autoconf since 1.6 is required otherwise. + +* Mon Mar 6 2006 Matthias Saou 1.2.7-2 +- FC5 rebuild. + +* Tue Dec 20 2005 Matthias Saou 1.2.7-1 +- Update to 1.2.7. +- Add automake build requirement (to get aclocal). +- For %%{fedora} >= 5, buildrequire modular X packages. + * Mon Nov 7 2005 Matthias Saou 1.2.5-1 - Update to 1.2.5, -Werror patch still required. From fedora-extras-commits at redhat.com Thu May 4 08:48:57 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 May 2006 01:48:57 -0700 Subject: rpms/synergy/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 synergy.spec, 1.12, 1.13 Message-ID: <200605040849.k448nTBH029044@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/FC-4 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Dec 2005 11:23:20 -0000 1.8 +++ .cvsignore 4 May 2006 08:48:57 -0000 1.9 @@ -1 +1 @@ -synergy-1.2.7.tar.gz +synergy-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Dec 2005 11:23:20 -0000 1.8 +++ sources 4 May 2006 08:48:57 -0000 1.9 @@ -1 +1 @@ -da9effc847d13f9725b6db043d8283a5 synergy-1.2.7.tar.gz +a6e09d6b71cb217f23069980060abf27 synergy-1.3.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/synergy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- synergy.spec 21 Dec 2005 11:23:20 -0000 1.12 +++ synergy.spec 4 May 2006 08:48:57 -0000 1.13 @@ -1,6 +1,6 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.7 +Version: 1.3.1 Release: 1%{?dist} License: GPL Group: System Environment/Daemons @@ -8,8 +8,9 @@ Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, autoconf, automake -%if "%{fedora}" >= "5" +BuildRequires: autoconf, automake +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel BuildRequires: libXinerama-devel %else @@ -27,7 +28,7 @@ %prep %setup %patch -p1 -b .werror -%{__autoconf} +autoreconf %build @@ -54,6 +55,13 @@ %changelog +* Thu May 4 2006 Matthias Saou 1.3.1-1 +- Update to 1.3.1. +- Run full autoreconf instead of just autoconf since 1.6 is required otherwise. + +* Mon Mar 6 2006 Matthias Saou 1.2.7-2 +- FC5 rebuild. + * Tue Dec 20 2005 Matthias Saou 1.2.7-1 - Update to 1.2.7. - Add automake build requirement (to get aclocal). From fedora-extras-commits at redhat.com Thu May 4 09:26:58 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 02:26:58 -0700 Subject: rpms/scim-tables/FC-4 .cvsignore, 1.5, 1.6 scim-tables.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200605040927.k449R0Je031588@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567 Modified Files: .cvsignore scim-tables.spec sources Log Message: sync with Core: - obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt) * Thu Mar 2 2006 Jens Petersen - add %%indic_tables build switch * Thu Feb 9 2006 Jens Petersen - update filelist since moduledir is now api-versioned * Fri Jan 13 2006 Jens Petersen - update to 0.5.6 release - update tables-skip-ja-ko.patch - updates filelist for chinese tables Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 06:38:59 -0000 1.5 +++ .cvsignore 4 May 2006 09:26:57 -0000 1.6 @@ -1 +1 @@ -scim-tables-0.5.5.tar.gz +scim-tables-0.5.6.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- scim-tables.spec 27 Dec 2005 06:38:59 -0000 1.14 +++ scim-tables.spec 4 May 2006 09:26:57 -0000 1.15 @@ -1,8 +1,11 @@ # set to include Japanese and Korean tables %define jk_tables 0 +# set to include Indic tables +%define indic_tables 1 + Name: scim-tables -Version: 0.5.5 +Version: 0.5.6 Release: 1%{?dist} Summary: SCIM Generic Table IMEngine @@ -14,6 +17,9 @@ BuildRequires: scim-devel, gtk2-devel BuildRequires: gettext-devel +%if !%{jk_tables} +Obsoletes: scim-tables-japanese < 0.5.6, scim-tables-korean < 0.5.6 +%endif Requires: scim Patch1: tables-skip-ja-ko.patch @@ -36,6 +42,7 @@ %description arabic This package contains scim-tables files for Chinese input. +%if %{indic_tables} %package bengali Summary: SCIM tables for Bengali Group: System Environment/Libraries @@ -43,6 +50,7 @@ %description bengali This package contains scim-tables files for Bengali input. +%endif %package chinese Summary: SCIM tables for Chinese @@ -53,6 +61,7 @@ %description chinese This package contains scim-tables files for Chinese input. +%if %{indic_tables} %package gujarati Summary: SCIM tables for Gujarati Group: System Environment/Libraries @@ -68,6 +77,7 @@ %description hindi This package contains scim-tables files for Hindi input. +%endif %if %{jk_tables} %package japanese @@ -80,6 +90,7 @@ This package contains scim-tables files for Japanese. %endif +%if %{indic_tables} %package kannada Summary: SCIM tables for Kannada Group: System Environment/Libraries @@ -87,6 +98,7 @@ %description kannada This package contains scim-tables files for Kannada input. +%endif %if %{jk_tables} %package korean @@ -99,6 +111,7 @@ This package contains scim-tables files for Korean. %endif +%if %{indic_tables} %package malayalam Summary: SCIM tables for Malayalam scripts Group: System Environment/Libraries @@ -106,6 +119,7 @@ %description malayalam This package contains scim-tables files for Malayalam languages. +%endif %package nepali Summary: SCIM tables for @@ -113,8 +127,9 @@ Requires: scim-tables = %{version} %description nepali -This package contains scim-tables files for input. +This package contains scim-tables files for Nepali input. +%if %{indic_tables} %package punjabi Summary: SCIM tables for Punjabi Group: System Environment/Libraries @@ -122,6 +137,7 @@ %description punjabi This package contains scim-tables files for Punjabi input. +%endif %package russian Summary: SCIM tables for Russian @@ -131,6 +147,7 @@ %description russian This package contains scim-tables files for Russian input. +%if %{indic_tables} %package tamil Summary: SCIM tables for Tamil Group: System Environment/Libraries @@ -138,6 +155,7 @@ %description tamil This package contains scim-tables files for Tamil input. +%endif %package thai Summary: SCIM tables for Thai @@ -147,6 +165,7 @@ %description thai This package contains scim-tables files for Thai input. +%if %{indic_tables} %package telugu Summary: SCIM tables for Telugu Group: System Environment/Libraries @@ -154,6 +173,7 @@ %description telugu This package contains scim-tables files for Telugu input. +%endif %package vietnamese Summary: SCIM tables for Vietnamese @@ -192,7 +212,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.la + +%if !%{indic_tables} +rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Bengali,Gujarati,Hindi,Kannada,Malayalam,Punjabi,Tamil,Telugu}-* +%endif %find_lang %{name} @@ -210,8 +234,8 @@ %files -f %{name}.lang %defattr(-, root, root, -) %{_bindir}/scim-make-table -%{_libdir}/scim-1.0/IMEngine/table.so -%{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so +%{_libdir}/scim-1.0/*/IMEngine/table.so +%{_libdir}/scim-1.0/*/SetupUI/table-imengine-setup.so %{_datadir}/scim/icons/table.png %{_mandir}/man1/scim-make-table.1* @@ -230,6 +254,7 @@ %{_datadir}/scim/icons/Arabic.png +%if %{indic_tables} %files bengali %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -237,13 +262,14 @@ %{_datadir}/scim/tables/Bengali-probhat.bin %{_datadir}/scim/icons/Bengali-inscript.png %{_datadir}/scim/icons/Bengali-probhat.png - +%endif %files chinese %defattr(-, root, root, -) %doc tables/zh/README-*.txt %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Array30.bin +%{_datadir}/scim/tables/CNS11643.bin %{_datadir}/scim/tables/CangJie*.bin %{_datadir}/scim/tables/Cantonese.bin %{_datadir}/scim/tables/CantonHK.bin @@ -258,8 +284,9 @@ %{_datadir}/scim/tables/Wu.bin %{_datadir}/scim/tables/Wubi.bin %{_datadir}/scim/tables/Ziranma.bin -%{_datadir}/scim/tables/ZhuYin.bin +%{_datadir}/scim/tables/ZhuYin*.bin %{_datadir}/scim/icons/Array30.png +%{_datadir}/scim/icons/CNS11643.png %{_datadir}/scim/icons/CangJie*.png %{_datadir}/scim/icons/Cantonese.png %{_datadir}/scim/icons/CantonHK.png @@ -277,6 +304,7 @@ %{_datadir}/scim/icons/ZhuYin.png +%if %{indic_tables} %files gujarati %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -285,7 +313,6 @@ %{_datadir}/scim/icons/Gujarati-inscript.png %{_datadir}/scim/icons/Gujarati-phonetic.png - %files hindi %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -293,7 +320,7 @@ %{_datadir}/scim/tables/Hindi-phonetic.bin %{_datadir}/scim/icons/Hindi-inscript.png %{_datadir}/scim/icons/Hindi-phonetic.png - +%endif %if %{jk_tables} %files japanese @@ -309,6 +336,7 @@ %endif +%if %{indic_tables} %files kannada %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -316,7 +344,7 @@ %{_datadir}/scim/tables/Kannada-kgp.bin %{_datadir}/scim/icons/Kannada-inscript.png %{_datadir}/scim/icons/Kannada-kgp.png - +%endif %if %{jk_tables} %files korean @@ -330,12 +358,13 @@ %endif +%if %{indic_tables} %files malayalam %defattr(-, root, root, -) %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Malayalam-inscript.bin %{_datadir}/scim/icons/Malayalam-inscript.png - +%endif %files nepali %defattr(-, root, root, -) @@ -344,6 +373,7 @@ %{_datadir}/scim/icons/Nepali.png +%if %{indic_tables} %files punjabi %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -353,6 +383,7 @@ %{_datadir}/scim/icons/Punjabi-inscript.png %{_datadir}/scim/icons/Punjabi-jhelum.png %{_datadir}/scim/icons/Punjabi-phonetic.png +%endif %files russian @@ -362,6 +393,7 @@ %{_datadir}/scim/icons/Yawerty.png +%if %{indic_tables} %files tamil %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -369,6 +401,7 @@ %{_datadir}/scim/tables/Tamil-phonetic.bin %{_datadir}/scim/icons/Tamil-inscript.png %{_datadir}/scim/icons/Tamil-phonetic.png +%endif %files thai @@ -378,11 +411,13 @@ %{_datadir}/scim/icons/Thai.png +%if %{indic_tables} %files telugu %defattr(-, root, root, -) %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Telugu-inscript.bin %{_datadir}/scim/icons/Telugu-inscript.png +%endif %files vietnamese @@ -402,23 +437,37 @@ %changelog -* Mon Dec 26 2005 Jens Petersen - 0.5.5-1%{?dist} +* Thu May 4 2006 Jens Petersen - 0.5.6-1.fc4 +- obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt) + +* Thu Mar 2 2006 Jens Petersen +- add %%indic_tables build switch + +* Thu Feb 9 2006 Jens Petersen +- update filelist since moduledir is now api-versioned + +* Fri Jan 13 2006 Jens Petersen +- update to 0.5.6 release + - update tables-skip-ja-ko.patch + - updates filelist for chinese tables + +* Mon Dec 26 2005 Jens Petersen - 0.5.5-1.fc4 - update to 0.5.5 - update filelists -- remove the Japanese and Korean tables and subpackages with +- remove the Japanese and Korean tables and their subpackages with tables-skip-ja-ko.patch and %%{jk_tables} -* Wed Dec 1 2005 Ryo Dairiki - 0.6.0-1%{?dist} +* Wed Dec 1 2005 Ryo Dairiki - 0.5.4-1.fc4 - update to 0.5.4 -* Tue Oct 18 2005 Jens Petersen - 0.5.3-6%{?dist} +* Tue Oct 18 2005 Jens Petersen - 0.5.3-6.fc4 - update to cvs head to fix various table issues with scim-tables-cvs-20051018.patch -* Fri Oct 7 2005 Jens Petersen - 0.5.3-5%{?dist} +* Fri Oct 7 2005 Jens Petersen - 0.5.3-5.fc4 - require scim -* Thu Sep 22 2005 Jens Petersen - 0.5.3-4%{?dist} +* Thu Sep 22 2005 Jens Petersen - 0.5.3-4.fc4 - add a Thai table derived from m17n-db with a Thai icon - separate the Indic tables and the additional language tables into separate language subpackages Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 06:38:59 -0000 1.5 +++ sources 4 May 2006 09:26:57 -0000 1.6 @@ -1 +1 @@ -15da0323195dea92690d4b391665b95a scim-tables-0.5.5.tar.gz +ff8d59e8f3dedb7dd7c6d87c8fc408db scim-tables-0.5.6.tar.gz From fedora-extras-commits at redhat.com Thu May 4 09:37:00 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 02:37:00 -0700 Subject: rpms/ghc/FC-5 ghc.spec,1.13,1.14 Message-ID: <200605040937.k449b2qa031699@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31682 Modified Files: ghc.spec Log Message: sync with devel: - buildrequire libXt-devel so that the X11 package and deps get built (Garrett Mitchener, #190201) Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-5/ghc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ghc.spec 22 Apr 2006 02:13:32 -0000 1.13 +++ ghc.spec 4 May 2006 09:37:00 -0000 1.14 @@ -6,7 +6,7 @@ Name: ghc Version: 6.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -15,9 +15,11 @@ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, sed -Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel +Buildrequires: gmp-devel, readline-devel +Buildrequires: libX11-devel, libXt-devel +Buildrequires: freeglut-devel, openal-devel %if %{build_doc} -# haddock generates libraries/ docs +# haddock generates docs in libraries Buildrequires: libxslt, docbook-style-xsl, haddock %endif Prefix: %{_prefix} @@ -115,9 +117,11 @@ cat rpm-dir.files rpm-prof.files > rpm-prof-filelist %endif + %clean rm -rf $RPM_BUILD_ROOT + %post ## tweak prefix in drivers scripts if relocating if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then @@ -125,6 +129,7 @@ sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/{ghcprof,hsc2hs} fi + %post -n %{ghcver} ## tweak prefix in drivers scripts if relocating if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then @@ -133,29 +138,38 @@ sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/ghc*-%{version} ${LIBDIR}/ghc-%{version}/package.conf fi + %files %defattr(-,root,root,-) %{_bindir}/* %exclude %{_bindir}/ghc*%{version} + %files -n %{ghcver} -f rpm-base-filelist %defattr(-,root,root,-) %doc ghc/ANNOUNCE ghc/LICENSE ghc/README %{_bindir}/ghc*%{version} %config(noreplace) %{_libdir}/ghc-%{version}/package.conf + %if %{build_prof} %files -n %{ghcver}-prof -f rpm-prof-filelist %defattr(-,root,root,-) %endif + %if %{build_doc} %files doc %defattr(-,root,root,-) %{_docdir}/%{name}-%{version} %endif + %changelog +* Thu May 4 2006 Jens Petersen - 6.4.2-2.fc5 +- buildrequire libXt-devel so that the X11 package and deps get built + (Garrett Mitchener, #190201) + * Sat Apr 22 2006 Jens Petersen - 6.4.2-1.fc5 - update to 6.4.2 release - ghc-6.4.1-gcc41.patch no longer needed From fedora-extras-commits at redhat.com Thu May 4 09:41:22 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 02:41:22 -0700 Subject: rpms/scim-tables/FC-4 tables-skip-ja-ko.patch,1.1,1.2 Message-ID: <200605040941.k449fPXu031773@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31753 Modified Files: tables-skip-ja-ko.patch Log Message: remember to update tables-skip-ja-ko.patch tables-skip-ja-ko.patch: Index: tables-skip-ja-ko.patch =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/tables-skip-ja-ko.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tables-skip-ja-ko.patch 27 Dec 2005 06:42:08 -0000 1.1 +++ tables-skip-ja-ko.patch 4 May 2006 09:41:22 -0000 1.2 @@ -1,9 +1,9 @@ --- scim-tables-0.5.5/configure.ac~ 2005-12-05 15:37:12.000000000 +0900 +++ scim-tables-0.5.5/configure.ac 2005-12-26 17:02:55.000000000 +0900 @@ -126,14 +126,6 @@ - tables/zh/Wubi.txt tables/zh/Ziranma.txt tables/zh/ZhuYin.txt + tables/zh/ZhuYin-Big.txt - tables/ja/Makefile - tables/ja/HIRAGANA.txt - tables/ja/KATAKANA.txt From fedora-extras-commits at redhat.com Thu May 4 11:56:17 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 4 May 2006 04:56:17 -0700 Subject: fedora-security/audit fe4,1.2,1.3 fe5,1.2,1.3 Message-ID: <200605041156.k44BuHXN005071@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5009 Modified Files: fe4 fe5 Log Message: Note a new rt issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fe4 3 May 2006 22:18:06 -0000 1.2 +++ fe4 4 May 2006 11:56:15 -0000 1.3 @@ -2,4 +2,5 @@ ** are items that need attention +CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fe5 3 May 2006 22:18:06 -0000 1.2 +++ fe5 4 May 2006 11:56:15 -0000 1.3 @@ -2,4 +2,5 @@ ** are items that need attention +CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 From fedora-extras-commits at redhat.com Thu May 4 13:03:47 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 4 May 2006 06:03:47 -0700 Subject: rpms/liferea/devel .cvsignore, 1.26, 1.27 liferea.spec, 1.38, 1.39 sources, 1.27, 1.28 Message-ID: <200605041303.k44D3nFZ009779@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9758 Modified Files: .cvsignore liferea.spec sources Log Message: * Wed May 3 2006 Brian Pepple - 1.0.11-3 - Update to 1.0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 22 Apr 2006 14:13:13 -0000 1.26 +++ .cvsignore 4 May 2006 13:03:47 -0000 1.27 @@ -1 +1 @@ -liferea-1.0.10.tar.gz +liferea-1.0.11.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- liferea.spec 22 Apr 2006 14:13:13 -0000 1.38 +++ liferea.spec 4 May 2006 13:03:47 -0000 1.39 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.10 +Version: 1.0.11 Release: 3%{?dist} Summary: An RSS/RDF feed reader @@ -105,6 +105,9 @@ %changelog +* Wed May 3 2006 Brian Pepple - 1.0.11-3 +- Update to 1.0.11. + * Sat Apr 22 2006 Brian Pepple - 1.0.10-3 - Update to 1.0.10, - Delete origianl desktop file with desktop-file-install call. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 22 Apr 2006 14:13:13 -0000 1.27 +++ sources 4 May 2006 13:03:47 -0000 1.28 @@ -1 +1 @@ -41201991b4d7a113169ebda3e7dc54ef liferea-1.0.10.tar.gz +6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz From fedora-extras-commits at redhat.com Thu May 4 13:08:59 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 4 May 2006 06:08:59 -0700 Subject: rpms/liferea/FC-5 .cvsignore, 1.26, 1.27 liferea.spec, 1.38, 1.39 sources, 1.27, 1.28 Message-ID: <200605041309.k44D91xl009860@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9839 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu May 4 2006 Brian Pepple - 1.0.11-2 - Update to 1.0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 25 Apr 2006 14:40:30 -0000 1.26 +++ .cvsignore 4 May 2006 13:08:59 -0000 1.27 @@ -1 +1 @@ -liferea-1.0.10.tar.gz +liferea-1.0.11.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- liferea.spec 25 Apr 2006 14:40:30 -0000 1.38 +++ liferea.spec 4 May 2006 13:08:59 -0000 1.39 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.10 +Version: 1.0.11 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -105,6 +105,9 @@ %changelog +* Thu May 4 2006 Brian Pepple - 1.0.11-2 +- Update to 1.0.11. + * Sat Apr 22 2006 Brian Pepple - 1.0.10-2 - Update to 1.0.10. - Remove *.la, instead of excluding. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 25 Apr 2006 14:40:30 -0000 1.27 +++ sources 4 May 2006 13:08:59 -0000 1.28 @@ -1 +1 @@ -41201991b4d7a113169ebda3e7dc54ef liferea-1.0.10.tar.gz +6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz From fedora-extras-commits at redhat.com Thu May 4 13:13:39 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 4 May 2006 06:13:39 -0700 Subject: rpms/liferea/FC-4 .cvsignore, 1.23, 1.24 liferea.spec, 1.29, 1.30 sources, 1.24, 1.25 Message-ID: <200605041313.k44DDfBs009955@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9934 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu May 4 2006 Brian Pepple - 1.0.11-1 - Update to 1.0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 5 Apr 2006 17:50:48 -0000 1.23 +++ .cvsignore 4 May 2006 13:13:39 -0000 1.24 @@ -1 +1 @@ -liferea-1.0.9.tar.gz +liferea-1.0.11.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- liferea.spec 5 Apr 2006 18:16:50 -0000 1.29 +++ liferea.spec 4 May 2006 13:13:39 -0000 1.30 @@ -1,8 +1,8 @@ %define with_dbus 1 Name: liferea -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.11 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -102,6 +102,9 @@ %changelog +* Thu May 4 2006 Brian Pepple - 1.0.11-1 +- Update to 1.0.11. + * Wed Apr 5 2006 Brian Pepple - 1.0.9-2 - Fix typo. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 5 Apr 2006 17:50:48 -0000 1.24 +++ sources 4 May 2006 13:13:39 -0000 1.25 @@ -1 +1 @@ -60f743fcb41876ad2d02f6da88251c31 liferea-1.0.9.tar.gz +6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz From fedora-extras-commits at redhat.com Thu May 4 13:21:45 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 4 May 2006 06:21:45 -0700 Subject: rpms/gramps/FC-5 .cvsignore, 1.13, 1.14 gramps.spec, 1.19, 1.20 sources, 1.13, 1.14 Message-ID: <200605041321.k44DLl45010051@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10030 Modified Files: .cvsignore gramps.spec sources Log Message: * Mon May 1 2006 Brian Pepple - 2.0.11-2 - Update to 2.0.11. - Drop INSTALL, README & ChangeLog documentation. - Ghost .pyo files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 28 Feb 2006 18:56:34 -0000 1.13 +++ .cvsignore 4 May 2006 13:21:45 -0000 1.14 @@ -1 +1 @@ -gramps-2.0.10.tar.gz +gramps-2.0.11.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-5/gramps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gramps.spec 11 Mar 2006 20:23:56 -0000 1.19 +++ gramps.spec 4 May 2006 13:21:45 -0000 1.20 @@ -1,6 +1,6 @@ Name: gramps -Version: 2.0.10 -Release: 3%{?dist} +Version: 2.0.11 +Release: 2%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -111,21 +111,50 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO +%doc AUTHORS COPYING COPYING-DOCS FAQ NEWS TODO %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/application-registry/%{name}.applications -%{_datadir}/%{name}/ %{_datadir}/omf/%{name}/ %{_datadir}/mime/packages/%{name}.xml %{_datadir}/mime-info/* %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/gnome/48x48/mimetypes/*.png %{_sysconfdir}/gconf/schemas/%{name}.schemas -%{_mandir}/man1/* +%{_mandir}/man1/%{name}.1.gz +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.py +%{_datadir}/%{name}/*.pyc +%{_datadir}/%{name}/*.png +%{_datadir}/%{name}/*.jpg +%{_datadir}/%{name}/*.glade +%ghost %{_datadir}/%{name}/*.pyo +%{_datadir}/%{name}/data/ +%dir %{_datadir}/%{name}/dates +%{_datadir}/%{name}/dates/*.py +%{_datadir}/%{name}/dates/*.pyc +%ghost %{_datadir}/%{name}/dates/*.pyo +%dir %{_datadir}/%{name}/docgen +%{_datadir}/%{name}/docgen/*.py +%{_datadir}/%{name}/docgen/*.pyc +%ghost %{_datadir}/%{name}/docgen/*.pyo +%{_datadir}/%{name}/example/ +%{_datadir}/%{name}/gnome/ +%dir %{_datadir}/%{name}/plugins +%{_datadir}/%{name}/plugins/*.py +%{_datadir}/%{name}/plugins/*.pyc +%{_datadir}/%{name}/plugins/*.glade +%{_datadir}/%{name}/plugins/*.xml +%{_datadir}/%{name}/plugins/*.png +%ghost %{_datadir}/%{name}/plugins/*.pyo %changelog +* Mon May 1 2006 Brian Pepple - 2.0.11-2 +- Update to 2.0.11. +- Drop INSTALL, README & ChangeLog documentation. +- Ghost .pyo files. + * Sat Mar 11 2006 Brian Pepple - 2.0.10-3 - Remove Utility category from desktop file. - Update scriptlets. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 28 Feb 2006 18:56:34 -0000 1.13 +++ sources 4 May 2006 13:21:45 -0000 1.14 @@ -1 +1 @@ -2c9c00acce995546af325087622235e5 gramps-2.0.10.tar.gz +650873c3c571a921a9c42b975ced2105 gramps-2.0.11.tar.gz From fedora-extras-commits at redhat.com Thu May 4 14:32:56 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 07:32:56 -0700 Subject: rpms/glib/devel glib-1.2.10-no_undefined.patch, NONE, 1.1 glib.spec, 1.1, 1.2 Message-ID: <200605041432.k44EWwNs012860@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12838 Modified Files: glib.spec Added Files: glib-1.2.10-no_undefined.patch Log Message: * Thu May 04 2006 Rex Dieter 1:1.2.10-21 - fix undefined symbols in libgmodule,libgthread glib-1.2.10-no_undefined.patch: --- NEW FILE glib-1.2.10-no_undefined.patch --- --- glib-1.2.10/gthread/Makefile.am.no_undefined 1999-08-26 08:09:43.000000000 -0500 +++ glib-1.2.10/gthread/Makefile.am 2006-05-04 08:38:36.000000000 -0500 @@ -17,9 +17,11 @@ libgthread_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ + -no-undefined -Wl,--no-undefined \ -export-dynamic -libgthread_la_LIBADD = @G_THREAD_LIBS@ +libgthread_la_DEPENDENCIES = $(libglib) $(top_builddir)/gmodule/libgmodule.la +libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib) $(top_builddir)/gmodule/libgmodule.la noinst_PROGRAMS = testgthread -testgthread_LDADD = ../libglib.la libgthread.la +testgthread_LDADD = libgthread.la --- glib-1.2.10/gmodule/Makefile.am.no_undefined 2001-03-15 09:33:10.000000000 -0600 +++ glib-1.2.10/gmodule/Makefile.am 2006-05-04 08:33:22.000000000 -0500 @@ -27,23 +27,25 @@ @G_MODULE_LDFLAGS@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ + -no-undefined -Wl,--no-undefined \ -export-dynamic -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule_la_DEPENDENCIES = $(libglib) +libgmodule_la_LIBADD = @G_MODULE_LIBS@ $(libglib) # we should really depend on $(libglib) for libgmodule.la, but libtool has a # problem with this ;( libgplugin_a_la_SOURCES = libgplugin_a.c libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module -libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libglib) libgplugin_b_la_SOURCES = libgplugin_b.c libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module -libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib) noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ -testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ +testgmodule_LDADD = libgmodule.la @G_MODULE_LIBS@ .PHONY: files release Index: glib.spec =================================================================== RCS file: /cvs/extras/rpms/glib/devel/glib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glib.spec 24 Apr 2006 14:37:42 -0000 1.1 +++ glib.spec 4 May 2006 14:32:56 -0000 1.2 @@ -3,7 +3,7 @@ Name: glib Epoch: 1 Version: 1.2.10 -Release: 20%{?dist} +Release: 21%{?dist} License: LGPL Group: System Environment/Libraries @@ -11,10 +11,14 @@ Source: ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: automake14 autoconf213 +BuildRequires: libtool + # Suppress warnings about varargs macros for -pedantic Patch1: glib-1.2.10-isowarning.patch Patch2: glib-1.2.10-gcc34.patch Patch3: glib-1.2.10-underquoted.patch +Patch4: glib-1.2.10-no_undefined.patch %description GLib is a handy library of utility functions. This C library is @@ -36,28 +40,43 @@ %patch1 -p1 -b .isowarning %patch2 -p1 -b .gcc34 %patch3 -p1 -b .underquoted +%patch4 -p1 -b .no_undefined + +#libtoolize --copy --force +automake-1.4 +aclocal-1.4 +autoconf-2.13 +autoheader-2.13 %build +LIBTOOL=/usr/bin/libtool \ %configure --disable-static -make %{?_smp_mflags} - - -# I *know* ||: isn't needed, but this *is* a legacy pkg afterall. -%check || : -make check +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf $RPM_BUILD_ROOT -%makeinstall +#makeinstall +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool + +# libgmodule-1.2.so.0* missing eXecute bit +chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so* +## Unpackaged files +# info rm -rf $RPM_BUILD_ROOT%{_infodir} +# .la fies... die die die. rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -# libgmodule-1.2.so.0* missing eXecute bit -chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so +# despite use of --disable-static, delete static libs that get built anyway +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a + + +# I *know* ||: isn't needed, but this could end up used by legacy +%check ||: +make check LIBTOOL=/usr/bin/libtool %clean @@ -86,6 +105,9 @@ %changelog +* Thu May 04 2006 Rex Dieter 1:1.2.10-21 +- fix undefined symbols in libgmodule,libgthread + * Wed Apr 12 2006 Rex Dieter 1:1.2.10-20 - cleanup %%description - libgmodule-1.2.so.0* missing eXecute bit From fedora-extras-commits at redhat.com Thu May 4 16:04:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:04:01 -0700 Subject: rpms/gtk+ - New directory Message-ID: <200605041604.k44G43YY018268@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18247/gtk+ Log Message: Directory /cvs/extras/rpms/gtk+ added to the repository From fedora-extras-commits at redhat.com Thu May 4 16:04:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:04:01 -0700 Subject: rpms/gtk+/devel - New directory Message-ID: <200605041604.k44G43wW018269@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18247/gtk+/devel Log Message: Directory /cvs/extras/rpms/gtk+/devel added to the repository From fedora-extras-commits at redhat.com Thu May 4 16:04:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:04:13 -0700 Subject: rpms/gtk+ Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605041604.k44G4F2i018320@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18292 Added Files: Makefile import.log Log Message: Setup of module gtk+ --- NEW FILE Makefile --- # Top level Makefile for module gtk+ all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 4 16:04:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:04:13 -0700 Subject: rpms/gtk+/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605041604.k44G4FpQ018323@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18292/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtk+ --- NEW 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 May 4 16:05:39 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:05:39 -0700 Subject: rpms/gtk+/devel gtk+-1.2.10-alignment.patch, NONE, 1.1 gtk+-1.2.10-bellvolume.patch, NONE, 1.1 gtk+-1.2.10-clistfocusrow.patch, NONE, 1.1 gtk+-1.2.10-ctext.patch, NONE, 1.1 gtk+-1.2.10-deletedir.patch, NONE, 1.1 gtk+-1.2.10-dndorder.patch, NONE, 1.1 gtk+-1.2.10-encoding.patch, NONE, 1.1 gtk+-1.2.10-expose.patch, NONE, 1.1 gtk+-1.2.10-focus.patch, NONE, 1.1 gtk+-1.2.10-fontwarning.patch, NONE, 1.1 gtk+-1.2.10-gtkgdkdep.patch, NONE, 1.1 gtk+-1.2.10-kpenter.patch, NONE, 1.1 gtk+-1.2.10-libtool.patch, NONE, 1.1 gtk+-1.2.10-localecrash.patch, NONE, 1.1 gtk+-1.2.10-missingchar.patch, NONE, 1.1 gtk+-1.2.10-no_undefined.patch, NONE, 1.1 gtk+-1.2.10-pixmapref.patch, NONE, 1.1 gtk+-1.2.10-ppc64.patch, NONE, 1.1 gtk+-1.2.10-themeswitch.patch, NONE, 1.1 gtk+-1.2.10-troughpaint.patch, NONE, 1.1 gtk+-1.2.10-ukfont.patch, NONE, 1.1 gtk+-1.2.10-utf8fontset.patch, NONE, 1.1 gtk+-1.2.6-ahiguti.patch, NONE, 1.1 gtk+-1.2.8-wrap-alnum.patch, NONE, 1.1 gtk+-underquoted.patch, NONE, 1.1 gtk+.spec, NONE, 1.1 gtkrc-default, NONE, 1.1 gtkrc.ja.utf8, NONE, 1.1 gtkrc.ko.utf8, NONE, 1.1 gtkrc.zh_CN.utf8, NONE, 1.1 gtkrc.zh_TW.utf8, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605041606.k44G6BjF018627@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508/devel Modified Files: .cvsignore sources Added Files: gtk+-1.2.10-alignment.patch gtk+-1.2.10-bellvolume.patch gtk+-1.2.10-clistfocusrow.patch gtk+-1.2.10-ctext.patch gtk+-1.2.10-deletedir.patch gtk+-1.2.10-dndorder.patch gtk+-1.2.10-encoding.patch gtk+-1.2.10-expose.patch gtk+-1.2.10-focus.patch gtk+-1.2.10-fontwarning.patch gtk+-1.2.10-gtkgdkdep.patch gtk+-1.2.10-kpenter.patch gtk+-1.2.10-libtool.patch gtk+-1.2.10-localecrash.patch gtk+-1.2.10-missingchar.patch gtk+-1.2.10-no_undefined.patch gtk+-1.2.10-pixmapref.patch gtk+-1.2.10-ppc64.patch gtk+-1.2.10-themeswitch.patch gtk+-1.2.10-troughpaint.patch gtk+-1.2.10-ukfont.patch gtk+-1.2.10-utf8fontset.patch gtk+-1.2.6-ahiguti.patch gtk+-1.2.8-wrap-alnum.patch gtk+-underquoted.patch gtk+.spec gtkrc-default gtkrc.ja.utf8 gtkrc.ko.utf8 gtkrc.zh_CN.utf8 gtkrc.zh_TW.utf8 Log Message: auto-import gtk+-1.2.10-52 on branch devel from gtk+-1.2.10-52.src.rpm gtk+-1.2.10-alignment.patch: --- NEW FILE gtk+-1.2.10-alignment.patch --- --- gtk+-1.2.10/gtk/gtktypeutils.h.alignment Fri Aug 18 17:36:34 2000 +++ gtk+-1.2.10/gtk/gtktypeutils.h Tue Jul 3 21:07:40 2001 @@ -191,6 +191,13 @@ GtkTypeClass *klass; }; +#ifdef __GNUC__ +struct _GtkTypeClassDummyAlign +{ + GtkType type; + guint *signals; +}; +#endif /* __GNUC__ */ /* A GtkTypeClass defines the minimum structure requirements for * a types class. Classes returned from gtk_type_class () and @@ -203,7 +210,11 @@ * one unique identifier per class. */ GtkType type; -}; +} +#ifdef __GNUC__ +__attribute__ ((aligned (__alignof (struct _GtkTypeClassDummyAlign)))) +#endif /* __GNUC__ */ +; struct _GtkArg gtk+-1.2.10-bellvolume.patch: --- NEW FILE gtk+-1.2.10-bellvolume.patch --- --- gtk+-1.2.10/gdk/gdk.c.bellvolume Wed Jan 15 12:32:25 2003 +++ gtk+-1.2.10/gdk/gdk.c Wed Jan 15 12:32:28 2003 @@ -989,7 +989,7 @@ void gdk_beep (void) { - XBell(gdk_display, 100); + XBell(gdk_display, 0); } /* gtk+-1.2.10-clistfocusrow.patch: --- NEW FILE gtk+-1.2.10-clistfocusrow.patch --- Index: gtk/gtkclist.c =================================================================== RCS file: /cvs/gnome/gtk+/gtk/gtkclist.c,v retrieving revision 1.156.2.25 retrieving revision 1.156.2.26 diff -u -p -r1.156.2.25 -r1.156.2.26 --- gtk/gtkclist.c 1 Mar 2001 00:18:20 -0000 1.156.2.25 +++ gtk/gtkclist.c 14 Dec 2002 04:17:03 -0000 1.156.2.26 @@ -2800,10 +2800,6 @@ real_remove_row (GtkCList *clist, clist->row_list_end = g_list_previous (list); g_list_remove (list, clist_row); - /*if (clist->focus_row >=0 && - (row <= clist->focus_row || clist->focus_row >= clist->rows)) - clist->focus_row--;*/ - if (row < ROW_FROM_YPIXEL (clist, 0)) clist->voffset += clist->row_height + CELL_SPACING; @@ -4331,7 +4327,9 @@ sync_selection (GtkCList *clist, clist->focus_row += d; if (clist->focus_row == -1 && clist->rows >= 1) clist->focus_row = 0; - else if (clist->focus_row >= clist->rows) + else if (d < 0 && clist->focus_row >= clist->rows - 1) + clist->focus_row = clist->rows - 2; + else if (clist->focus_row >= clist->rows) /* Paranoia */ clist->focus_row = clist->rows - 1; } gtk+-1.2.10-ctext.patch: --- NEW FILE gtk+-1.2.10-ctext.patch --- --- gtk+-1.2.10/gdk/gdkselection.c.ctext Thu Jul 5 12:41:42 2001 +++ gtk+-1.2.10/gdk/gdkselection.c Thu Jul 5 12:45:25 2001 @@ -191,73 +191,6 @@ gdk_send_xevent (requestor, False, NoEventMask, (XEvent*) &xevent); } - -/* The output of XmbTextPropertyToTextList may include stuff not valid - * for COMPOUND_TEXT. This routine tries to correct this by: - * - * a) Canonicalizing CR LF and CR to LF - * b) Stripping out all other non-allowed control characters - * - * See the COMPOUND_TEXT spec distributed with X for explanations - * what is allowed. - */ -static gchar * -sanitize_ctext (const char *str, - gint *length) -{ - gchar *result = g_malloc (*length + 1); - gint out_length = 0; - gint i; - const guchar *ustr = (const guchar *)str; - - for (i=0; i < *length; i++) - { - guchar c = ustr[i]; - - if (c == '\r') - { - result[out_length++] = '\n'; - if (i + 1 < *length && ustr[i + 1] == '\n') - i++; - } - else if (c == 27 /* ESC */) - { - /* Check for "extended segments, which can contain arbitrary - * octets. See CTEXT spec, section 6. - */ - - if (i + 5 < *length && - ustr[i + 1] == '%' && - ustr[i + 2] == '/' && - (ustr[i + 3] >= 48 && ustr[i + 3] <= 52) && - ustr[i + 4] >= 128 && - ustr[i + 5] >= 128) - { - int extra_len = 6 + (ustr[i + 4] - 128) * 128 + ustr[i + 5] - 128; - extra_len = MAX (extra_len, *length - i); - - memcpy (result + out_length, ustr + i, extra_len); - out_length += extra_len; - i += extra_len - 1; - } - else - result[out_length++] = c; - } - else if (c == '\n' || c == '\t' || c == 27 /* ESC */ || - (c >= 32 && c <= 127) || /* GL */ - c == 155 /* CONTROL SEQUENCE INTRODUCER */ || - (c >= 160 && c <= 255)) /* GR */ - { - result[out_length++] = c; - } - } - - result[out_length] = '\0'; - *length = out_length; - - return result; -} - gint gdk_text_property_to_text_list (GdkAtom encoding, gint format, guchar *text, gint length, @@ -266,32 +199,16 @@ XTextProperty property; gint count = 0; gint res; - gchar *sanitized_text = NULL; if (!list) return 0; property.encoding = encoding; property.format = format; - - if (encoding == gdk_atom_intern ("COMPOUND_TEXT", FALSE) && format == 8) - { - gint sanitized_text_length = length; - - property.value = sanitized_text = sanitize_ctext (text, &sanitized_text_length); - property.nitems = sanitized_text_length; - } - else - { - property.value = text; - property.nitems = length; - } - + property.value = text; + property.nitems = length; res = XmbTextPropertyToTextList (GDK_DISPLAY(), &property, list, &count); - if (sanitized_text) - g_free (sanitized_text); - if (res == XNoMemory || res == XLocaleNotSupported || res == XConverterNotFound) return 0; @@ -314,8 +231,6 @@ { gint res; XTextProperty property; - gint sanitized_text_length; - gchar *sanitized_text; res = XmbTextListToTextProperty (GDK_DISPLAY(), (char **)&str, 1, XCompoundTextStyle, @@ -334,17 +249,10 @@ *encoding = property.encoding; if (format) *format = property.format; - - sanitized_text_length = property.nitems; - sanitized_text = sanitize_ctext (property.value, &sanitized_text_length); - if (ctext) - *ctext = sanitized_text; - else - g_free (sanitized_text); - + *ctext = g_strdup (property.value); if (length) - *length = sanitized_text_length; + *length = property.nitems; if (property.value) XFree (property.value); gtk+-1.2.10-deletedir.patch: --- NEW FILE gtk+-1.2.10-deletedir.patch --- --- gtk+-1.2.10/gtk/gtkfilesel.c.deletedir Thu Feb 15 23:36:19 2001 +++ gtk+-1.2.10/gtk/gtkfilesel.c Wed Apr 17 20:36:25 2002 @@ -325,7 +325,8 @@ static void gtk_file_selection_populate (GtkFileSelection *fs, gchar *rel_path, - gint try_complete); + gboolean try_complete, + gboolean reset_entry); static void gtk_file_selection_abort (GtkFileSelection *fs); static void gtk_file_selection_update_history_menu (GtkFileSelection *fs, @@ -522,7 +523,7 @@ } else { - gtk_file_selection_populate (filesel, "", FALSE); + gtk_file_selection_populate (filesel, "", FALSE, TRUE); } gtk_widget_grab_focus (filesel->selection_entry); @@ -637,7 +638,7 @@ name = last_slash + 1; } - gtk_file_selection_populate (filesel, buf, FALSE); + gtk_file_selection_populate (filesel, buf, FALSE, TRUE); if (filesel->selection_entry) gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), name); @@ -673,7 +674,7 @@ if (filesel->selection_entry) gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), pattern); - gtk_file_selection_populate (filesel, (gchar*) pattern, TRUE); + gtk_file_selection_populate (filesel, (gchar*) pattern, TRUE, TRUE); } static void @@ -806,7 +807,7 @@ g_free (full_path); gtk_widget_destroy (fs->fileop_dialog); - gtk_file_selection_populate (fs, "", FALSE); + gtk_file_selection_populate (fs, "", FALSE, FALSE); } static void @@ -903,7 +904,7 @@ g_free (full_path); gtk_widget_destroy (fs->fileop_dialog); - gtk_file_selection_populate (fs, "", FALSE); + gtk_file_selection_populate (fs, "", FALSE, TRUE); } static void @@ -1009,8 +1010,9 @@ g_free (new_filename); g_free (old_filename); + gtk_file_selection_populate (fs, "", FALSE, FALSE); + gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), file); gtk_widget_destroy (fs->fileop_dialog); - gtk_file_selection_populate (fs, "", FALSE); } static void @@ -1112,7 +1114,7 @@ text = g_strdup (text); - gtk_file_selection_populate (fs, text, TRUE); + gtk_file_selection_populate (fs, text, TRUE, TRUE); g_free (text); @@ -1124,7 +1126,6 @@ return FALSE; } - static void gtk_file_selection_history_callback (GtkWidget *widget, gpointer data) { @@ -1142,7 +1143,7 @@ if (callback_arg->menu_item == widget) { - gtk_file_selection_populate (fs, callback_arg->directory, FALSE); + gtk_file_selection_populate (fs, callback_arg->directory, FALSE, FALSE); break; } @@ -1272,7 +1273,7 @@ gpointer user_data) { GtkFileSelection *fs = NULL; - gchar *filename, *temp = NULL; + gchar *filename = NULL; g_return_if_fail (GTK_IS_CLIST (widget)); @@ -1280,39 +1281,23 @@ g_return_if_fail (fs != NULL); g_return_if_fail (GTK_IS_FILE_SELECTION (fs)); - gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &temp); - filename = g_strdup (temp); - - if (filename) - { - if (bevent) - switch (bevent->type) - { - case GDK_2BUTTON_PRESS: - gtk_file_selection_populate (fs, filename, FALSE); - break; - - default: - gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); - break; - } - else - gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); - - g_free (filename); - } + gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &filename); + + if (filename && bevent && bevent->type == GDK_2BUTTON_PRESS) + gtk_file_selection_populate (fs, filename, FALSE, FALSE); } static void gtk_file_selection_populate (GtkFileSelection *fs, gchar *rel_path, - gint try_complete) + gboolean try_complete, + gboolean reset_entry) { CompletionState *cmpl_state; PossibleCompletion* poss; gchar* filename; gint row; - gchar* rem_path = rel_path; + gchar* rem_path; gchar* sel_text; gchar* text[2]; gint did_recurse = FALSE; @@ -1323,6 +1308,8 @@ g_return_if_fail (fs != NULL); g_return_if_fail (GTK_IS_FILE_SELECTION (fs)); + + rem_path = rel_path = g_strdup (rel_path); cmpl_state = (CompletionState*) fs->cmpl_state; poss = cmpl_completion_matches (rel_path, &rem_path, cmpl_state); @@ -1422,7 +1409,7 @@ did_recurse = TRUE; - gtk_file_selection_populate (fs, dir_name, TRUE); + gtk_file_selection_populate (fs, dir_name, TRUE, TRUE); g_free (dir_name); } @@ -1441,7 +1428,7 @@ gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), rem_path); } } - else + else if (reset_entry) { if (fs->selection_entry) gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), ""); @@ -1466,8 +1453,9 @@ { gtk_file_selection_update_history_menu (fs, cmpl_reference_position (cmpl_state)); } - } + + g_free (rel_path); } static void gtk+-1.2.10-dndorder.patch: --- NEW FILE gtk+-1.2.10-dndorder.patch --- Index: gdk/gdkdnd.c =================================================================== RCS file: /cvs/gnome/gtk+/gdk/gdkdnd.c,v retrieving revision 1.25.2.7 retrieving revision 1.25.2.9 diff -u -p -r1.25.2.7 -r1.25.2.9 --- gdk/gdkdnd.c 13 Mar 2000 23:41:53 -0000 1.25.2.7 +++ gdk/gdkdnd.c 14 May 2002 22:14:15 -0000 1.25.2.9 @@ -275,12 +275,16 @@ gdk_window_cache_filter (GdkXEvent *xev, GUINT_TO_POINTER (xce->above)); if (above_node && node->prev != above_node) { + /* Put the window above (before in the list) above_node + */ cache->children = g_list_remove_link (cache->children, node); - node->next = above_node->next; - if (node->next) - node->next->prev = node; - node->prev = above_node; - above_node->next = node; + node->prev = above_node->prev; + if (node->prev) + node->prev->next = node; + else + cache->children = node; + node->next = above_node; + above_node->prev = node; } } } gtk+-1.2.10-encoding.patch: --- NEW FILE gtk+-1.2.10-encoding.patch --- --- gtk+-1.2.10/gtk/gtkrc.iso88593.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88593 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-3" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-3,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-3,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-3" + --- gtk+-1.2.10/gtk/Makefile.am.encoding Fri Feb 2 12:09:02 2001 +++ gtk+-1.2.10/gtk/Makefile.am Fri Jul 26 16:47:04 2002 @@ -374,10 +374,12 @@ gtkconfdir = $(sysconfdir)/gtk -gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \ - gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \ - gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \ - gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \ +gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \ + gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \ + gtkrc.utf8 gtkrc.iso88592 \ + gtkrc.iso88593 gtkrc.iso88595 gtkrc.iso88597 \ + gtkrc.iso88599 gtkrc.iso885913 gtkrc.iso885914 \ + gtkrc.iso885915 gtkrc.zh_CN gtkrc.zh_TW.big5 \ gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \ gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255 @@ -390,11 +392,11 @@ cd $(DESTDIR)$(gtkconfdir) && \ for i in cs hr hu pl ro sk sl sq sr ; do \ rm -f gtkrc.$$i ; \ - ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \ + ln -s gtkrc.iso88592 gtkrc.$$i ; \ done ; \ for i in bg_BG.iso88595 mk sp ru_RU.iso88595 ; do \ rm -f gtkrc.$$i ; \ - ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \ + ln -s gtkrc.iso88595 gtkrc.$$i ; \ done ; \ for i in he_IL.cp1255 he_IL.microsoftcp1255 yi ; do \ rm -f gtkrc.$$i ; \ @@ -403,12 +405,12 @@ rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \ gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi \ gtkrc.be gtkrc.bg gtkrc.mi ; \ - ln -s gtkrc.iso-8859-13 gtkrc.mi ; \ - ln -s gtkrc.iso-8859-13 gtkrc.lt ; \ - ln -s gtkrc.iso-8859-13 gtkrc.lv ; \ - ln -s gtkrc.iso-8859-14 gtkrc.cy ; \ - ln -s gtkrc.iso-8859-14 gtkrc.ga ; \ - ln -s gtkrc.iso-8859-15 gtkrc.et ; \ + ln -s gtkrc.iso885913 gtkrc.mi ; \ + ln -s gtkrc.iso885913 gtkrc.lt ; \ + ln -s gtkrc.iso885913 gtkrc.lv ; \ + ln -s gtkrc.iso885914 gtkrc.cy ; \ + ln -s gtkrc.iso885914 gtkrc.ga ; \ + ln -s gtkrc.iso885915 gtkrc.et ; \ ln -s gtkrc.ka_GE.georgianps gtkrc.ka ; \ ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 ; \ ln -s gtkrc.vi_VN.tcvn gtkrc.vi ; \ --- gtk+-1.2.10/gtk/gtkrc.c.encoding Thu Mar 15 13:41:40 2001 +++ gtk+-1.2.10/gtk/gtkrc.c Fri Jul 26 16:49:24 2002 @@ -33,6 +33,7 @@ #include #include #include +#include #include "gtkrc.h" #include "gtkbindings.h" @@ -440,7 +441,7 @@ void gtk_rc_init (void) { - static gchar *locale_suffixes[3]; + static gchar *locale_suffixes[8]; static gint n_locale_suffixes = 0; gint i, j; @@ -449,9 +450,7 @@ if (!initted) { - gint length; - - char *locale = setlocale (LC_CTYPE, NULL); + char *locale = g_strdup (setlocale (LC_CTYPE, NULL)); char *p; initted = TRUE; @@ -470,39 +469,88 @@ * We normalize the charset into a standard form, * which has all '-' and '_' characters removed, * and is lowercase. + * + * the search is done in that order: + * gtkrc.ll_cc.lowercasecodeset + * gtkrc.ll_cc.normalizedcodeset + * gtkrc.ll.lowercasecodeset + * gtkrc.ll.normalizedcodeset + * gtkrc.lowercasecodeset + * gtkrc.normalizedcodeset + * gtkrc.ll_cc + * gtkrc.ll + * */ - gchar *normalized_locale; + char *codeset = NULL; + char *normalized_codeset = NULL; + char *cc = NULL; + char *ll; p = strchr (locale, '@'); - length = p ? (p -locale) : strlen (locale); + if (p) + *p = '\0'; + codeset = nl_langinfo (CODESET); + p = strchr (locale, '.'); + if (!codeset && p) + codeset = p + 1; if (p) + *p = '\0'; + + if (codeset) { - gchar *tmp1 = g_strndup (locale, p - locale + 1); - gchar *tmp2 = _gtk_normalize_codeset (p + 1, length - (p - locale + 1)); + codeset = g_strdup (codeset); - normalized_locale = g_strconcat (tmp1, tmp2, NULL); - g_free (tmp1); - g_free (tmp2); - - locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_locale); - length = p - locale; + p = codeset; + while (*p) + { + /* tolower not used, because some locales are not + * compatible with C locale in lowercasing ascii + */ + if (*p >= 'A' && *p <= 'Z') + *p = (*p) - 'A' + 'a'; + p++; + } + + normalized_codeset = _gtk_normalize_codeset(codeset, strlen (codeset)); + if (strcmp (normalized_codeset, codeset) == 0) + { + g_free (normalized_codeset); + normalized_codeset = NULL; + } } - else - normalized_locale = g_strndup (locale, length); - p = strchr (normalized_locale, '_'); + p = strchr (locale, '_'); if (p) { - locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length); - length = p - normalized_locale; + cc = p + 1; + *p = '\0'; } - - locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length); - g_free (normalized_locale); + ll = locale; + + if (cc && codeset) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, ".", codeset, NULL); + if (cc && normalized_codeset) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, ".", normalized_codeset, NULL); + if (codeset) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, ".", codeset, NULL); + if (normalized_codeset) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, ".", normalized_codeset, NULL); + if (codeset) + locale_suffixes[n_locale_suffixes++] = g_strdup (codeset); + if (normalized_codeset) + locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_codeset); + if (cc) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, NULL); + locale_suffixes[n_locale_suffixes++] = g_strdup (ll); + + g_free (normalized_codeset); + g_free (codeset); } + + g_free (locale); } i = 0; --- gtk+-1.2.10/gtk/gtkrc.iso88599.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88599 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-9" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-9,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-9,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-9" + --- gtk+-1.2.10/gtk/gtkrc.utf8.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.utf8 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,7 @@ +style "default-text" { + fontset = "-*-helvetica-medium-r-normal--*-120-*-*-p-*-*-*" + +} + +class "GtkWidget" style "default-text" + --- gtk+-1.2.10/gtk/gtkrc.iso885913.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso885913 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,7 @@ +style "gtk-default-iso-8859-13" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-13,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-13,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-13" --- gtk+-1.2.10/gtk/gtkrc.iso885914.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso885914 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-14" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-14,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-14,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-14" + --- gtk+-1.2.10/gtk/gtkrc.iso885915.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso885915 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-15" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-15,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-15,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-15" + --- gtk+-1.2.10/gtk/gtkrc.iso88592.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88592 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,14 @@ +#$(gtkconfigdir)/gtkrc.iso-8859-2 +# +# This file defines the fontsets for iso-8859-2 encoding +# make symliks or hardlinks to gtkrc.$LANG if your language uses iso-8859-2 +# and a gtkrc.$LANG doesn't exist yet. + +style "gtk-default-iso-8859-2" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-2,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-2,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-2" + --- gtk+-1.2.10/gtk/gtkrc.iso88595.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88595 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,14 @@ +#$(gtkconfigdir)/gtkrc.iso-8859-5 +# +# This file defines the fontsets for iso-8859-5 encoding +# make symliks or hardlinks to gtkrc.$LANG if your language uses iso-8859-5 +# and a gtkrc.$LANG doesn't exist yet. + +style "gtk-default-iso-8859-5" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-5,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-5,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-5" + --- gtk+-1.2.10/gtk/gtkrc.iso88597.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88597 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-7" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-7,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-7,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-7" + gtk+-1.2.10-expose.patch: --- NEW FILE gtk+-1.2.10-expose.patch --- --- gtk+-1.2.10/gdk/gdkevents.c.expose Sun Dec 3 11:02:49 2000 +++ gtk+-1.2.10/gdk/gdkevents.c Wed Jul 11 15:54:18 2001 @@ -383,6 +383,7 @@ struct _GdkExposeInfo { Window window; + GdkWindowPrivate *toplevel_window; gboolean seen_nonmatching; }; @@ -400,10 +401,21 @@ * we'll get a whole bunch of them interspersed with * expose events. */ - if (xevent->xany.type != Expose && - xevent->xany.type != GravityNotify) + switch (xevent->xany.type) { + case Expose: + case GravityNotify: + break; + case ConfigureNotify: + if (xevent->xconfigure.window != info->toplevel_window->xwindow) + break; + if (xevent->xconfigure.width == info->toplevel_window->width && + xevent->xconfigure.height == info->toplevel_window->height) + break; + /* Fall through */ + default: info->seen_nonmatching = TRUE; + break; } if (info->seen_nonmatching || @@ -429,6 +441,7 @@ GdkEvent event; info.window = xevent->xany.window; + info.toplevel_window = (GdkWindowPrivate *) gdk_window_get_toplevel (window); info.seen_nonmatching = FALSE; rect1.x = xevent->xexpose.x; gtk+-1.2.10-focus.patch: --- NEW FILE gtk+-1.2.10-focus.patch --- --- gtk+-1.2.10/gtk/gtkwindow.c.focus Fri Mar 9 18:39:16 2001 +++ gtk+-1.2.10/gtk/gtkwindow.c Thu Jul 5 10:34:00 2001 @@ -985,7 +985,13 @@ break; case EnterNotify: case LeaveNotify: - if (xev->xcrossing.detail != NotifyInferior && + /* We only track the actual destination of keyboard events for real + * toplevels, not for embedded toplevels such as GtkPlug. The reason for + * this is that GtkPlug redirects events so the widget may effectively not + * have the focus even if it actually has the focus. + */ + if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () && + xev->xcrossing.detail != NotifyInferior && xev->xcrossing.focus && !window->window_has_focus) { window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE; gtk+-1.2.10-fontwarning.patch: --- NEW FILE gtk+-1.2.10-fontwarning.patch --- --- gtk+-1.2.10/gdk/gdkfont.c.fontwarning Fri Apr 12 17:33:55 2002 +++ gtk+-1.2.10/gdk/gdkfont.c Fri Apr 12 17:36:52 2002 @@ -27,6 +27,7 @@ #include #include #include +#include #include "gdk.h" #include "gdkprivate.h" @@ -187,9 +188,11 @@ if (g_strcasecmp (codeset, "utf-8") != 0 && g_strcasecmp (codeset, "utf8") != 0) { - g_warning ("Missing charsets in FontSet creation\n"); + g_printerr ("The font \"%s\" does not support all the required character sets for the current locale \"%s\"\n", + fontset_name, setlocale (LC_ALL, NULL)); for (i=0;istate & GDK_CONTROL_MASK) gtk_signal_emit_by_name (GTK_OBJECT (text), "activate"); else @@ -2161,6 +2162,7 @@ gtk_editable_insert_text (editable, "\t", 1, &position); break; case GDK_Return: + case GDK_KP_Enter: if (event->state & GDK_CONTROL_MASK) gtk_signal_emit_by_name (GTK_OBJECT (text), "activate"); else --- gtk+-1.2.10/gtk/gtkmenushell.c.kpenter Sat Jul 21 20:27:59 2001 +++ gtk+-1.2.10/gtk/gtkmenushell.c Sat Jul 21 20:28:05 2001 @@ -258,6 +258,11 @@ GTK_TYPE_BOOL, TRUE); gtk_binding_entry_add_signal (binding_set, + GDK_KP_Enter, 0, + "activate_current", 1, + GTK_TYPE_BOOL, + TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "activate_current", 1, GTK_TYPE_BOOL, --- gtk+-1.2.10/gtk/gtknotebook.c.kpenter Sat Jul 21 20:28:30 2001 +++ gtk+-1.2.10/gtk/gtknotebook.c Sat Jul 21 20:28:38 2001 @@ -1369,6 +1369,7 @@ gtk_notebook_switch_focus_tab (notebook, list); return TRUE; case GDK_Return: + case GDK_KP_Enter: case GDK_space: gtk_notebook_page_select (GTK_NOTEBOOK (widget)); return TRUE; gtk+-1.2.10-libtool.patch: --- NEW FILE gtk+-1.2.10-libtool.patch --- --- gtk+-1.2.10/configure.libtool Wed Jan 15 12:44:35 2003 +++ gtk+-1.2.10/configure Wed Jan 15 12:45:29 2003 @@ -1389,11 +1389,7 @@ echo "$ac_t""no" 1>&6 fi - -case "$target" in -NONE) lt_target="$host" ;; -*) lt_target="$target" ;; -esac +lt_target="$host" # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" --- gtk+-1.2.10/aclocal.m4.libtool Wed Jan 15 12:44:47 2003 +++ gtk+-1.2.10/aclocal.m4 Wed Jan 15 12:45:42 2003 @@ -56,10 +56,7 @@ AC_REQUIRE([AC_PROG_LN_S])dnl dnl -case "$target" in -NONE) lt_target="$host" ;; -*) lt_target="$target" ;; -esac +lt_target="$host" # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" --- gtk+-1.2.10/ltconfig.libtool Wed Jan 15 12:44:58 2003 +++ gtk+-1.2.10/ltconfig Wed Jan 15 12:46:15 2003 @@ -447,16 +447,16 @@ host_alias=$host fi +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. case "$host_os" in linux-gnu*) ;; linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` esac -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - case "$host_os" in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some gtk+-1.2.10-localecrash.patch: --- NEW FILE gtk+-1.2.10-localecrash.patch --- --- gtk+-1.2.10/gdk/gdkselection.c.localecrash Thu Aug 22 16:50:01 2002 +++ gtk+-1.2.10/gdk/gdkselection.c Thu Aug 22 17:50:46 2002 @@ -238,12 +238,14 @@ if (res != Success) { property.encoding = None; - property.format = None; + property.format = 8; property.value = NULL; property.nitems = 0; - } - g_assert (property.encoding == gdk_atom_intern ("COMPOUND_TEXT", FALSE) && property.format == 8); + g_warning ("Error converting string to compound text.\n" + "This might mean that your locale setting is supported\n" + "by the C library but not by Xlib."); + } if (encoding) *encoding = property.encoding; gtk+-1.2.10-missingchar.patch: --- NEW FILE gtk+-1.2.10-missingchar.patch --- --- gtk+-1.2.10/gdk/gdkfont.c.missingchar Mon Aug 13 13:37:52 2001 +++ gtk+-1.2.10/gdk/gdkfont.c Mon Aug 13 13:39:30 2001 @@ -461,7 +461,6 @@ GdkFontPrivate *private; XCharStruct *chars; gint width; - guint ch = character & 0xff; /* get rid of sign-extension */ XFontStruct *xfont; XFontSet fontset; @@ -474,21 +473,7 @@ case GDK_FONT_FONT: /* only 8 bits characters are considered here */ xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && - (xfont->max_byte1 == 0) && - (ch >= xfont->min_char_or_byte2) && - (ch <= xfont->max_char_or_byte2)) - { - chars = xfont->per_char; - if (chars) - width = chars[ch - xfont->min_char_or_byte2].width; - else - width = xfont->min_bounds.width; - } - else - { - width = XTextWidth (xfont, &character, 1); - } + width = XTextWidth (xfont, &character, 1); break; case GDK_FONT_FONTSET: fontset = (XFontSet) private->xfont; gtk+-1.2.10-no_undefined.patch: --- NEW FILE gtk+-1.2.10-no_undefined.patch --- --- gtk+-1.2.10/gtk/Makefile.am.no_undefined 2006-04-08 20:58:18.000000000 -0500 +++ gtk+-1.2.10/gtk/Makefile.am 2006-04-08 20:58:59.000000000 -0500 @@ -31,6 +31,7 @@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ + -no-undefined -Wl,--no-undefined \ @GLIB_DEPLIBS@ \ @x_ldflags@ \ @x_libs@ \ --- gtk+-1.2.10/gdk/Makefile.am.no_undefined 2000-10-21 13:20:40.000000000 -0500 +++ gtk+-1.2.10/gdk/Makefile.am 2006-04-08 20:58:18.000000000 -0500 @@ -21,6 +21,7 @@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ + -no-undefined -Wl,--no-undefined \ @GLIB_DEPLIBS@ \ @x_ldflags@ \ @x_libs@ \ gtk+-1.2.10-pixmapref.patch: --- NEW FILE gtk+-1.2.10-pixmapref.patch --- --- gtk+-1.2.10/gtk/gtkstyle.c.pixmapref Tue Feb 20 11:46:58 2001 +++ gtk+-1.2.10/gtk/gtkstyle.c Sun Aug 12 15:42:06 2001 @@ -348,8 +348,9 @@ new_style->bg[i] = style->bg[i]; new_style->text[i] = style->text[i]; new_style->base[i] = style->base[i]; - - new_style->bg_pixmap[i] = style->bg_pixmap[i]; + + if (style->bg_pixmap[i] && !(style->rc_style && style->rc_style->bg_pixmap_name[i])) + new_style->bg_pixmap[i] = gdk_pixmap_ref (style->bg_pixmap[i]); } gdk_font_unref (new_style->font); gtk+-1.2.10-ppc64.patch: --- NEW FILE gtk+-1.2.10-ppc64.patch --- --- gtk+-1.2.10/ltconfig.ppc64 2005-11-01 11:11:27.000000000 -0500 +++ gtk+-1.2.10/ltconfig 2005-11-01 11:12:42.000000000 -0500 @@ -1968,7 +1968,7 @@ shlibpath_overrides_runpath=no deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + file_magic_test_file=`echo /lib{,64}/libc.so* /lib{,64}/libc-*.so` if test -f /lib/ld.so.1; then dynamic_linker='GNU ld.so' gtk+-1.2.10-themeswitch.patch: --- NEW FILE gtk+-1.2.10-themeswitch.patch --- --- gtk+-1.2.10/gtk/gtkwindow.c.themeswitch Mon Aug 13 13:42:05 2001 +++ gtk+-1.2.10/gtk/gtkwindow.c Mon Aug 13 13:42:05 2001 @@ -859,13 +859,60 @@ GTK_OBJECT_CLASS(parent_class)->finalize (object); } + +static void +reread_rc_files () +{ + if (gtk_rc_reparse_all ()) + { + /* If the above returned true, some of our RC files are out + * of date, so we need to reset all our widgets. Our other + * toplevel windows will also get the message, but by + * then, the RC file will up to date, so we have to tell + * them now. + */ + GList *toplevels; + + toplevels = gtk_container_get_toplevels(); + while (toplevels) + { + gtk_widget_reset_rc_styles (toplevels->data); + toplevels = toplevels->next; + } + } +} + static void gtk_window_show (GtkWidget *widget) { GtkWindow *window = GTK_WINDOW (widget); GtkContainer *container = GTK_CONTAINER (window); gboolean need_resize; + GList *toplevels; + gboolean had_visible = FALSE; + /* If we have no windows shown at this point, then check for + * theme changes before showing the window. We really should + * be checking realized, not shown, but shown => realized, + * and checking in realize might cause reentrancy problems. + * + * Plus, this allows us to get the new size right before + * realizing. + */ + toplevels = gtk_container_get_toplevels (); + while (toplevels) + { + if (GTK_WIDGET_VISIBLE (toplevels->data)) + { + had_visible = TRUE; + break; + } + toplevels = toplevels->next; + } + + if (!had_visible) + reread_rc_files (); + GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE); need_resize = container->need_resize || !GTK_WIDGET_REALIZED (widget); @@ -1480,23 +1527,7 @@ } } - if (gtk_rc_reparse_all ()) - { - /* If the above returned true, some of our RC files are out - * of date, so we need to reset all our widgets. Our other - * toplevel windows will also get the message, but by - * then, the RC file will up to date, so we have to tell - * them now. - */ - GList *toplevels; - - toplevels = gtk_container_get_toplevels(); - while (toplevels) - { - gtk_widget_reset_rc_styles (toplevels->data); - toplevels = toplevels->next; - } - } + reread_rc_files (); } static gint gtk+-1.2.10-troughpaint.patch: --- NEW FILE gtk+-1.2.10-troughpaint.patch --- Index: gtk/gtkrange.c =================================================================== RCS file: /cvs/gnome/gtk+/gtk/gtkrange.c,v retrieving revision 1.26.2.3 diff -u -p -r1.26.2.3 gtkrange.c --- gtk/gtkrange.c 22 Feb 2001 20:38:14 -0000 1.26.2.3 +++ gtk/gtkrange.c 19 Jul 2002 15:41:58 -0000 @@ -829,7 +828,10 @@ gtk_range_expose (GtkWidget *widget (event->area.x + event->area.width <= widget->allocation.width - trough_border) && (event->area.y + event->area.height <= - widget->allocation.height - trough_border))) + widget->allocation.height - trough_border)) || + gtk_style_get_prop_experimental (widget->style, + "GtkRange::always_draw_trough", + 0)) gtk_range_draw_trough (range); } else if (event->window == widget->window) gtk+-1.2.10-ukfont.patch: --- NEW FILE gtk+-1.2.10-ukfont.patch --- --- gtk+-1.2.10/gtk/gtkrc.uk.ukfont Wed Apr 10 19:20:40 2002 +++ gtk+-1.2.10/gtk/gtkrc.uk Wed Apr 10 19:20:56 2002 @@ -7,10 +7,10 @@ # style "gtk-default-uk" { - fontset = "-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-*,\ + fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\ -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ - -*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-u,\ - -*-arial-medium-r-normal--14-*-*-*-*-*-koi8-u,*-r-*" + -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-u,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-u,*-r-*" } class "GtkWidget" style "gtk-default-uk" --- gtk+-1.2.10/gtk/gtkrc.ru.ukfont Thu Apr 11 10:22:15 2002 +++ gtk+-1.2.10/gtk/gtkrc.ru Mon May 8 14:49:18 2000 @@ -1,7 +1,7 @@ style "gtk-default-ru" { fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\ -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ - -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r,*-r-*" } class "GtkWidget" style "gtk-default-ru" gtk+-1.2.10-utf8fontset.patch: --- NEW FILE gtk+-1.2.10-utf8fontset.patch --- --- gtk+-1.2.10/gdk/gdkfont.c.utf8fontset Sun Apr 1 22:31:25 2001 +++ gtk+-1.2.10/gdk/gdkfont.c Tue Jul 10 11:31:54 2001 @@ -26,6 +26,7 @@ #include #include +#include #include "gdk.h" #include "gdkprivate.h" @@ -173,9 +174,24 @@ if (missing_charset_count) { gint i; - g_warning ("Missing charsets in FontSet creation\n"); - for (i=0;i Received: from localhost (IDENT:otaylor at localhost [127.0.0.1]) by fresnel.labs.redhat.com (8.9.3/8.9.3) with ESMTP id OAA00891 for ; Thu, 23 Sep 1999 14:52:41 -0400 Received: from lacrosse.redhat.com by localhost with POP3 (fetchmail-5.0.0) for otaylor at localhost (single-drop); Thu, 23 Sep 1999 14:52:42 -0400 (EDT) Received: from mail.redhat.com (mail.redhat.com [199.183.24.239]) by lacrosse.corp.redhat.com (8.9.3/8.9.3) with ESMTP id OAA19205 for ; Thu, 23 Sep 1999 14:01:27 -0400 Received: from math.sci.hokudai.ac.jp (seki.math.sci.hokudai.ac.jp [133.50.152.8]) by mail.redhat.com (8.8.7/8.8.7) with ESMTP id OAA13383 for ; Thu, 23 Sep 1999 14:01:49 -0400 Received: from heathcliff (a-higuti at hilbert.math.sci.hokudai.ac.jp [133.50.152.11]) by math.sci.hokudai.ac.jp (8.8.8/3.6W01/06/98) with SMTP id DAA23889 for ; Fri, 24 Sep 1999 03:01:10 +0900 (JST) Date: Fri, 24 Sep 1999 03:01:10 +0900 (JST) Message-Id: <199909231801.DAA23889 at math.sci.hokudai.ac.jp> From: a-higuti at math.sci.hokudai.ac.jp (Akira Higuchi) To: otaylor at redhat.com Subject: Adding more gdk_isw* macros Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Status: O Lines: 528 Xref: fresnel.labs.redhat.com prog-gtk:648 Hello Owen, I'm working on adding CJK support to gnome apps, and I need your advice. As you know, gtk+-1.2 has some support for CJK. It's sufficient for most gnome apps to be internationalized, but some problems remain. The most problem is that there is no way of doing word wrapping for CJK strings. For example, gtk-xmhtml shows Japanese text very uglily, because Japanese sentences are recognized as very long words. (a Japanese sentence contain any spaces in most cases.) The same problem is in gtk+ itself, too; Word wrapping in GtkLabel and GtkText doesn't work correctly for CJK text, because of the same reason as above. In order to fix it, we need more gdk_isw* functions than we already have in gdki18n.h. (I regret I didn't add them before gtk+-1.2 was released.) I attach herewith a patch which fixes it, but I think it's not acceptable to adding a new macro to a stable version of gtk+. (is it?) The question I want to ask you is: what's the best way of fixing the problem without adding these macros to gdki18n.h? A solution is to add these macros to each *.c files (in GtkLabel, GtkText, and gtkxmhtml etc.) rather than gtki18n.h, but it's very ugly I think. Please don't say "wait until gscript is completed" ;-( I don't want to wait for a long time. (Please let me know if I can help you with gscript BTW. I've not hacked gscript yet, because it seems to be too early to be hacked by other than you.) Thanks, Akira Higuchi ---------------- x8 ---------------- x8 ---------------- x8 ---------------- diff -ur gtk+-1.2.5-pre2/gdk/gdki18n.h gtk+-1.2.5-pre2.new/gdk/gdki18n.h --- gtk+-1.2.5-pre2/gdk/gdki18n.h Wed Jun 9 21:07:51 1999 +++ gtk+-1.2.5-pre2.new/gdk/gdki18n.h Thu Sep 23 14:59:38 1999 @@ -50,4 +50,32 @@ # define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c)) #endif +/* The following 9 macros are added in gtk+ 1.2.X. Don't use them without + * checking GTK_CHECK_VERSION. For example, + * #if GTK_CHECK_VERSION (1,2,X) + * ... code which uses gdk_iswalpha(), gdk_iswcntrl(), etc. ... + * #endif + */ +#if !defined(G_HAVE_BROKEN_WCTYPE) && (defined(G_HAVE_WCTYPE_H) || defined(G_HAVE_WCHAR_H)) && !defined(X_LOCALE) +# define gdk_iswalpha(c) iswalpha(c) +# define gdk_iswcntrl(c) iswcntrl(c) +# define gdk_iswdigit(c) iswdigit(c) +# define gdk_iswlower(c) iswlower(c) +# define gdk_iswgraph(c) iswgraph(c) +# define gdk_iswprint(c) iswprint(c) +# define gdk_iswpunct(c) iswpunct(c) +# define gdk_iswupper(c) iswupper(c) +# define gdk_iswxdigit(c) iswxdigit(c) +#else +# define gdk_iswalpha(c) ((wchar_t)(c) <= 0xFF && isalpha(c)) +# define gdk_iswcntrl(c) ((wchar_t)(c) <= 0xFF && iscntrl(c)) +# define gdk_iswdigit(c) ((wchar_t)(c) <= 0xFF && isdigit(c)) +# define gdk_iswlower(c) ((wchar_t)(c) <= 0xFF && islower(c)) +# define gdk_iswgraph(c) ((wchar_t)(c) > 0xFF || isgraph(c)) +# define gdk_iswprint(c) ((wchar_t)(c) > 0xFF || isprint(c)) +# define gdk_iswpunct(c) ((wchar_t)(c) <= 0xFF && ispunct(c)) +# define gdk_iswupper(c) ((wchar_t)(c) <= 0xFF && isupper(c)) +# define gdk_iswxdigit(c) ((wchar_t)(c) <= 0xFF && isxdigit(c)) +#endif + #endif /* __GDK_I18N_H__ */ diff -ur gtk+-1.2.5-pre2/gtk/gtkentry.c gtk+-1.2.5-pre2.new/gtk/gtkentry.c --- gtk+-1.2.5-pre2/gtk/gtkentry.c Wed Aug 18 14:23:53 1999 +++ gtk+-1.2.5-pre2.new/gtk/gtkentry.c Thu Sep 23 00:22:21 1999 @@ -1943,11 +1943,21 @@ gtk_move_backward_word (GTK_ENTRY (editable)); } +static gboolean +alnum_or_ideogram (GtkEntry *entry, guint index) +{ + GdkWChar ch; + ch = entry->text[index]; + if (entry->use_wchar) + return !(gdk_iswpunct (ch) || gdk_iswcntrl (ch) || gdk_iswspace (ch)); + else + return !(ispunct (ch) || iscntrl (ch) || isspace (ch)); +} + static void gtk_move_forward_word (GtkEntry *entry) { GtkEditable *editable; - GdkWChar *text; gint i; editable = GTK_EDITABLE (entry); @@ -1961,21 +1971,12 @@ if (entry->text && (editable->current_pos < entry->text_length)) { - text = entry->text; - i = editable->current_pos; - - if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i]))) - for (; i < entry->text_length; i++) - { - if ((entry->use_wchar) ? gdk_iswalnum (text[i]) : isalnum (text[i])) - break; - } - + for (i = editable->current_pos; i < entry->text_length; i++) + if (alnum_or_ideogram (entry, i)) + break; for (; i < entry->text_length; i++) - { - if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i]))) - break; - } + if (!alnum_or_ideogram (entry, i)) + break; editable->current_pos = i; } @@ -1985,7 +1986,6 @@ gtk_move_backward_word (GtkEntry *entry) { GtkEditable *editable; - GdkWChar *text; gint i; editable = GTK_EDITABLE (entry); @@ -1999,26 +1999,19 @@ if (entry->text && editable->current_pos > 0) { - text = entry->text; - i = editable->current_pos - 1; - if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i]))) - for (; i >= 0; i--) + for (i = editable->current_pos - 1; i >= 0; i--) + if (alnum_or_ideogram (entry, i)) + break; + for (; i >= 0; i--) + if (!alnum_or_ideogram (entry, i)) { - if ((entry->use_wchar) ? gdk_iswalnum (text[i]) : isalnum (text[i])) - break; + i++; + break; } - for (; i >= 0; i--) - { - if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i]))) - { - i++; - break; - } - } - + if (i < 0) i = 0; - + editable->current_pos = i; } } diff -ur gtk+-1.2.5-pre2/gtk/gtklabel.c gtk+-1.2.5-pre2.new/gtk/gtklabel.c --- gtk+-1.2.5-pre2/gtk/gtklabel.c Wed Jun 9 20:40:13 1999 +++ gtk+-1.2.5-pre2.new/gtk/gtklabel.c Thu Sep 23 11:29:25 1999 @@ -56,6 +56,7 @@ GtkLabelWord *next; gint uline_y; GtkLabelULine *uline; + gboolean paragraph_break; }; struct _GtkLabelULine @@ -396,6 +397,7 @@ word->beginning = NULL; word->next = NULL; word->uline = NULL; + word->paragraph_break = FALSE; return word; } @@ -441,6 +443,7 @@ if (str == label->label_wc || str[-1] == '\n') { /* Paragraph break */ + word->paragraph_break = TRUE; word->space = 0; max_line_width = MAX (line_width, max_line_width); @@ -488,6 +491,7 @@ { word = gtk_label_word_alloc (); + word->paragraph_break = TRUE; word->space = 0; word->beginning = str; word->length = 0; @@ -500,6 +504,13 @@ return MAX (line_width, max_line_width); } +static gboolean +is_ideogram (GdkWChar wc) +{ + return !(gdk_iswalnum (wc) || gdk_iswspace (wc) || + gdk_iswpunct (wc) || gdk_iswcntrl (wc)); +} + /* this needs to handle white space better. */ static gint gtk_label_split_text_wrapped (GtkLabel *label) @@ -526,6 +537,7 @@ if (str == label->label_wc || str[-1] == '\n') { /* Paragraph break */ + word->paragraph_break = TRUE; word->space = 0; max_line_width = MAX (line_width, max_line_width); @@ -546,24 +558,30 @@ else word->space = space_width * nspaces; } - else + else if (gdk_iswspace (str[-1])) { /* Regular inter-word space */ word->space = space_width; } + else + { + word->space = 0; + } word->beginning = str; word->length = 0; p = word->beginning; while (*p && !gdk_iswspace (*p)) { + if (word->length > 0 && (is_ideogram (p[-1]) || is_ideogram (*p))) + break; word->length++; p++; } word->width = gdk_text_width_wc (GTK_WIDGET (label)->style->font, str, word->length); str += word->length; - if (*str) + if (*str && gdk_iswspace (*str)) str++; line_width += word->space + word->width; @@ -600,7 +618,7 @@ width = 0; for (word = label->words; word; word = word->next) { - if (word->space == 0 + if (word->paragraph_break || (line_width && (line_width >= min_width || line_width + word->width + word->space > max_width))) @@ -716,7 +734,8 @@ GtkLabelWord *word, *line, *next_line; GtkWidget *widget; gchar *ptrn; - gint x, y, space, extra_width, add_space, baseline_skip; + gint x, y, space, num_words, extra_width, add_space, baseline_skip; + gboolean deliver_equivalently; g_return_if_fail (label->wrap); @@ -724,20 +743,24 @@ y = 0; baseline_skip = (GTK_WIDGET (label)->style->font->ascent + GTK_WIDGET (label)->style->font->descent + 1); + deliver_equivalently = FALSE; for (line = label->words; line != 0; line = next_line) { - space = 0; + space = num_words = 0; extra_width = max_line_width - line->width; for (next_line = line->next; next_line; next_line = next_line->next) { - if (next_line->space == 0) + if (next_line->paragraph_break) break; /* New paragraph */ if (next_line->space + next_line->width > extra_width) break; + if (next_line->space == 0) + deliver_equivalently = TRUE; /* An ideogram is found. */ extra_width -= next_line->space + next_line->width; space += next_line->space; + num_words++; } line->x = 0; @@ -747,14 +770,18 @@ for (word = line->next; word != next_line; word = word->next) { - if (next_line && next_line->space) + if (next_line && !next_line->paragraph_break && + label->jtype == GTK_JUSTIFY_FILL && + (deliver_equivalently ? num_words : space) > 0) { - /* Not last line of paragraph --- fill line if needed */ - if (label->jtype == GTK_JUSTIFY_FILL) { + /* Not last line of paragraph --- fill line */ + if (deliver_equivalently) + add_space = (extra_width + num_words / 2) / num_words; + else add_space = (extra_width * word->space + space / 2) / space; - extra_width -= add_space; - space -= word->space; - } + extra_width -= add_space; + space -= word->space; + num_words--; } word->x = x + word->space + add_space; @@ -925,7 +952,7 @@ for (word = label->words; word; word = word->next) { - gchar save = word->beginning[word->length]; + GdkWChar save = word->beginning[word->length]; word->beginning[word->length] = '\0'; gtk_label_paint_word (label, x, y, word, &event->area); word->beginning[word->length] = save; diff -ur gtk+-1.2.5-pre2/gtk/gtktext.c gtk+-1.2.5-pre2.new/gtk/gtktext.c --- gtk+-1.2.5-pre2/gtk/gtktext.c Sat Sep 4 08:50:38 1999 +++ gtk+-1.2.5-pre2.new/gtk/gtktext.c Thu Sep 23 00:21:40 1999 @@ -101,6 +101,13 @@ ARG_WORD_WRAP }; +typedef enum { + CHAR_CLASS_SPACE, + CHAR_CLASS_ALNUM, + CHAR_CLASS_IDEOGRAM, + CHAR_CLASS_OTHERS /* punct, cntrl */ +} CharClass; + typedef struct _TextProperty TextProperty; typedef struct _TabStopMark TabStopMark; typedef struct _PrevTabCont PrevTabCont; @@ -298,6 +305,8 @@ const GtkPropertyMark *mark, const PrevTabCont *tab_cont, PrevTabCont *next_cont); +static void find_word_wrap_position (GtkText* text, LineParams *lp); +static CharClass char_class (GtkText* text, guint index); static void recompute_geometry (GtkText* text); static void insert_expose (GtkText* text, guint old_pixels, gint nchars, guint new_line_count); static void delete_expose (GtkText* text, @@ -4084,27 +4093,21 @@ undraw_cursor (text, FALSE); - if (text->use_wchar) + while (!LAST_INDEX (text, text->cursor_mark)) { - while (!LAST_INDEX (text, text->cursor_mark) && - !gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index))) - advance_mark (&text->cursor_mark); - - while (!LAST_INDEX (text, text->cursor_mark) && - gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index))) - advance_mark (&text->cursor_mark); + CharClass cc = char_class (text, text->cursor_mark.index); + if (cc == CHAR_CLASS_ALNUM || cc == CHAR_CLASS_IDEOGRAM) + break; + advance_mark (&text->cursor_mark); } - else + while (!LAST_INDEX (text, text->cursor_mark)) { - while (!LAST_INDEX (text, text->cursor_mark) && - !isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index))) - advance_mark (&text->cursor_mark); - - while (!LAST_INDEX (text, text->cursor_mark) && - isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index))) - advance_mark (&text->cursor_mark); + CharClass cc = char_class (text, text->cursor_mark.index); + if (cc != CHAR_CLASS_ALNUM && cc != CHAR_CLASS_IDEOGRAM) + break; + advance_mark (&text->cursor_mark); } - + find_cursor (text, TRUE); draw_cursor (text, FALSE); } @@ -4116,25 +4119,19 @@ undraw_cursor (text, FALSE); - if (text->use_wchar) + while (text->cursor_mark.index > 0) { - while ((text->cursor_mark.index > 0) && - !gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1))) - decrement_mark (&text->cursor_mark); - - while ((text->cursor_mark.index > 0) && - gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1))) - decrement_mark (&text->cursor_mark); + CharClass cc = char_class (text, text->cursor_mark.index - 1); + if (cc == CHAR_CLASS_ALNUM || cc == CHAR_CLASS_IDEOGRAM) + break; + decrement_mark (&text->cursor_mark); } - else + while (text->cursor_mark.index > 0) { - while ((text->cursor_mark.index > 0) && - !isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1))) - decrement_mark (&text->cursor_mark); - - while ((text->cursor_mark.index > 0) && - isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1))) - decrement_mark (&text->cursor_mark); + CharClass cc = char_class (text, text->cursor_mark.index - 1); + if (cc != CHAR_CLASS_ALNUM && cc != CHAR_CLASS_IDEOGRAM) + break; + decrement_mark (&text->cursor_mark); } find_cursor (text, TRUE); @@ -4755,27 +4752,8 @@ GtkPropertyMark saved_mark = lp.end; guint saved_characters = lp.displayable_chars; - lp.displayable_chars += 1; - - if (text->use_wchar) - { - while (!gdk_iswspace (GTK_TEXT_INDEX (text, lp.end.index)) && - (lp.end.index > lp.start.index)) - { - decrement_mark (&lp.end); - lp.displayable_chars -= 1; - } - } - else - { - while (!isspace(GTK_TEXT_INDEX (text, lp.end.index)) && - (lp.end.index > lp.start.index)) - { - decrement_mark (&lp.end); - lp.displayable_chars -= 1; - } - } - + find_word_wrap_position (text, &lp); + /* If whole line is one word, revert to char wrapping */ if (lp.end.index == lp.start.index) { @@ -4821,6 +4799,54 @@ lp.tab_cont_next = *next_cont; return lp; +} + +static CharClass +char_class (GtkText* text, guint index) +{ + GdkWChar wc; + wc = GTK_TEXT_INDEX (text, index); + if (text->use_wchar) + { + if (gdk_iswspace (wc)) + return CHAR_CLASS_SPACE; + else if (gdk_iswalnum (wc)) + return CHAR_CLASS_ALNUM; + else if (gdk_iswpunct (wc) || gdk_iswcntrl (wc)) + return CHAR_CLASS_OTHERS; + else + return CHAR_CLASS_IDEOGRAM; + } + else + { + if (isspace (wc)) + return CHAR_CLASS_SPACE; + else if (isalnum (wc)) + return CHAR_CLASS_ALNUM; + else if (ispunct (wc) || iscntrl (wc)) + return CHAR_CLASS_OTHERS; + else + return CHAR_CLASS_IDEOGRAM; + } +} + +static void +find_word_wrap_position (GtkText* text, LineParams *lp) +{ + while (lp->end.index > lp->start.index && + char_class (text, lp->end.index) != CHAR_CLASS_SPACE && + char_class (text, lp->end.index) != CHAR_CLASS_IDEOGRAM && + char_class (text, lp->end.index - 1) != CHAR_CLASS_IDEOGRAM) + { + decrement_mark (&lp->end); + lp->displayable_chars -= 1; + } + + /* lp->end.index points the position to be cut just now. If it's not a + * space, move it to the next display line. */ + if (lp->end.index > lp->start.index && + char_class (text, lp->end.index) != CHAR_CLASS_SPACE) + decrement_mark (&lp->end); } static void ---------------- x8 ---------------- x8 ---------------- x8 ---------------- -------------------------------------- Akira Higuchi Dept. of Mathematics, Hokkaido Univ. Hokkaido, Japan Email: a-higuti at math.sci.hokudai.ac.jp gtk+-1.2.8-wrap-alnum.patch: --- NEW FILE gtk+-1.2.8-wrap-alnum.patch --- --- gtk+-1.2.8/gtk/gtklabel.c.alnum Wed Jan 24 05:56:00 2001 +++ gtk+-1.2.8/gtk/gtklabel.c Wed Jan 24 07:44:22 2001 @@ -507,8 +507,11 @@ static gboolean is_ideogram (GdkWChar wc) { - return !(gdk_iswalnum (wc) || gdk_iswspace (wc) || - gdk_iswpunct (wc) || gdk_iswcntrl (wc)); + if (gdk_iswalpha (wc) && (!gdk_iswupper (wc) && !gdk_iswlower (wc))) + return TRUE; + + return !(gdk_iswspace (wc) || gdk_iswalnum (wc) || + gdk_iswpunct (wc) || gdk_iswcntrl (wc)); } /* this needs to handle white space better. */ gtk+-underquoted.patch: --- NEW FILE gtk+-underquoted.patch --- --- gtk+-1.2.10/gtk.m4.underquoted 2004-08-15 22:20:34.253447389 +0100 +++ gtk+-1.2.10/gtk.m4 2004-08-15 22:20:47.874844660 +0100 @@ -4,7 +4,7 @@ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl -AC_DEFUN(AM_PATH_GTK, +AC_DEFUN([AM_PATH_GTK], [dnl dnl Get the cflags and libraries from the gtk-config script dnl --- NEW FILE gtk+.spec --- Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk+ Epoch: 1 Version: 1.2.10 Release: 52%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.gtk.org/ Source: ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: gtkrc-default Source2: gtk+-pofiles.tar.gz Source3: gtkrc.ja.utf8 Source4: gtkrc.ko.utf8 Source5: gtkrc.zh_CN.utf8 Source6: gtkrc.zh_TW.utf8 Patch1: gtk+-1.2.6-ahiguti.patch Patch5: gtk+-1.2.8-wrap-alnum.patch # Supress alignment warnings on ia64 Patch10: gtk+-1.2.10-alignment.patch # Improve exposure compression Patch11: gtk+-1.2.10-expose.patch # Handle focus tracking for embedded window properly Patch12: gtk+-1.2.10-focus.patch # Find gtkrc files for the current encoding better Patch13: gtk+-1.2.10-encoding.patch # Don't screw up CTEXT encoding for UTF-8 Patch14: gtk+-1.2.10-ctext.patch # Don't warn about missing fonts for UTF-8 Patch15: gtk+-1.2.10-utf8fontset.patch # Accept KP_Enter as a synonym for Return everywhere Patch16: gtk+-1.2.10-kpenter.patch # Allow theme switching to work properly when no windows are realized Patch17: gtk+-1.2.10-themeswitch.patch # Fix crash when switching themes Patch18: gtk+-1.2.10-pixmapref.patch # Fix computation of width of missing characters Patch19: gtk+-1.2.10-missingchar.patch # Fix sizes of Ukrainian fontsets Patch20: gtk+-1.2.10-ukfont.patch # Fix file selection delete-dir when changing directory problem # also, fix memory corruption problem when changing directories. Patch21: gtk+-1.2.10-deletedir.patch # Improve warning for missing fonts Patch22: gtk+-1.2.10-fontwarning.patch # Allow themes to make scrollbar trough always repaint Patch23: gtk+-1.2.10-troughpaint.patch # Fix a crash that can happen in some apps when the current # locale is not supported by XLib. Patch24: gtk+-1.2.10-localecrash.patch # Patch from CVS to fix b.g.o #56349 Patch26: gtk+-1.2.10-dndorder.patch # Patch from CVS to fix b.g.o #94812 Patch27: gtk+-1.2.10-clistfocusrow.patch # Fix GTK+ to obey X server's default bell volume Patch28: gtk+-1.2.10-bellvolume.patch # Hack up the configure scripts to deal with some obscure # breakage with ancient libtool Patch29: gtk+-1.2.10-libtool.patch # Add a dependency on libgdk to libgtk Patch30: gtk+-1.2.10-gtkgdkdep.patch Patch31: gtk+-underquoted.patch Patch32: gtk+-1.2.10-ppc64.patch # do not allow for undefined symbols in shared libraries -- Rex Patch33: gtk+-1.2.10-no_undefined.patch BuildRequires: glib-devel >= 1:%{version} BuildRequires: automake14 autoconf213 BuildRequires: libtool BuildRequires: gettext ## This can theoretically be used for legacy -- Rex %if "%{?fedora}" > "4" BuildRequires: libX11-devel libXext-devel libXi-devel libXt-devel %else BuildRequires: XFree86-devel %endif ## *very* old, deprecated Obsoletes (pun intended) -- Rex #Obsoletes: gtk ## auto-req -- Rex #Requires: glib >= 1:%{version} # The highly broken gdk-pixbuf circular dependency is # added so that when you install gtk+, you get the # dependencies you need for the Bluecurve GTK+-1.2 theme # engine that redhat-artwork installs without proper # dependencies. # ## Ack, No-way, hosay. -- Rex # Requires: gdk-pixbuf >= 0.18.0 %description The gtk+ package contains the GIMP ToolKit (GTK+), a library for creating graphical user interfaces for the X Window System. GTK+ was originally written for the GIMP (GNU Image Manipulation Program) image processing program, but is now used by several other programs as well. %package devel Summary: Development tools for GTK+ (GIMP ToolKit) applications Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: glib-devel Requires: pkgconfig ## this can theoretically be used for legacy -- Rex #if "%{?fedora}" > "4" Requires: libX11-devel, libXext-devel, libXi-devel #else #Requires: XFree86-devel #endif ## *very* old, deprecated Obsoletes (pun intended) -- Rex #Obsoletes: gtk-devel < %{epoch}:%{version} ## info files not included #Requires(post): /sbin/install-info #Requires(preun): /sbin/install-info %description devel Libraries, header files and documentation for developing GTK+ (GIMP ToolKit) applications. %prep %setup -q -a 2 %patch1 -p1 -b .ahiguti %patch5 -p1 -b .alnum %patch10 -p1 -b .alignment %patch11 -p1 -b .expose %patch12 -p1 -b .focus %patch13 -p1 -b .encoding %patch14 -p1 -b .ctext %patch15 -p1 -b .utf8fontset %patch16 -p1 -b .kpenter %patch17 -p1 -b .themeswitch %patch18 -p1 -b .pixmapref %patch19 -p1 -b .missingchar %patch20 -p1 -b .ukfont %patch21 -p1 -b .deletedir %patch22 -p1 -b .fontwarning %patch23 -p0 -b .troughpaint %patch24 -p1 -b .localecrash %patch26 -p0 -b .dndorder %patch27 -p0 -b .clistfocusrow %patch28 -p1 -b .bellvolume %patch29 -p1 -b .libtool %patch30 -p1 -b .gtkgdkdep %patch31 -p1 -b .underquoted %patch32 -p1 -b .ppc64 %patch33 -p1 -b .no_undefined #libtoolize --force automake-1.4 #aclocal-1.4 autoconf-2.13 autoheader-2.13 %build LIBTOOL=/usr/bin/libtool \ %configure \ --disable-static \ --with-xinput=xfree\ --with-native-locale make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool # # Make cleaned-up versions of examples and tutorial for installation # ./mkinstalldirs tmpdocs/tutorial install -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial for dir in examples/* ; do if [ -d $dir ] ; then ./mkinstalldirs tmpdocs/$dir for file in $dir/* ; do case $file in *pre1.2.7) ;; *) install -p -m0644 $file tmpdocs/$dir ;; esac done fi done install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT/etc/gtk/gtkrc # Install some extra gtkrc files to improve functioning of GTK+ # in UTF-8 locales for Chinese, Japanese, Korean. for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} ; do install -p -m0644 $i $RPM_BUILD_ROOT/etc/gtk/ done # We don't ship the info files rm -rf $RPM_BUILD_ROOT%{_infodir} # .la fies... die die die. rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la # despite use of --disable-static, delete static libs that get built anyway rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a %find_lang %{name} # I *know* ||: isn't needed, but this could end up used by legacy %check ||: make check LIBTOOL=/usr/bin/libtool %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_libdir}/lib*.so.* %dir %{_datadir}/themes %{_datadir}/themes/Default/ %config(noreplace) %{_sysconfdir}/gtk/ %files devel %defattr(-,root,root,-) %doc tmpdocs/tutorial/ %doc tmpdocs/examples/ %{_bindir}/gtk-config %{_datadir}/aclocal/* %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_mandir}/man1/* %changelog * Mon Apr 24 2006 Rex Dieter 1:1.2.10-52 - install -m644 gtkrc ... - utf-8 specfile - comment %%fedora > 4 constructs - own %%_datadir/themes - move %%check after %%install * Sat Apr 08 2006 Rex Dieter 1:1.2.10-51 - cleanup for Extras - drop Obsoletes: gtk (that must be *way* old) - drop gdk-pixbuf debpendancy - fix/re-enable gdkgtkdep patch - no_undefined patch * Wed Mar 01 2006 Karsten Hopp 1:1.2.10-50 - BuildRequires: libXt-devel * Fri Feb 10 2006 Jesse Keating - 1:1.2.10-49.2.1 - bump again for double-long bug on ppc(64) * Tue Feb 07 2006 Jesse Keating - 1:1.2.10-49.2 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Dec 09 2005 Jesse Keating - rebuilt * Fri Nov 18 2005 Bill Nottingham 1:1.2.10-49 - Remove references to obsolete X11R6 paths * Wed Nov 16 2005 Matthias Clasen 1:1.2.10-48 - Fix Requires of -devel * Mon Nov 7 2005 Matthias Clasen 1:1.2.10-47 - Remove .la files and static libs * Tue Nov 7 2005 Matthias Clasen 1:1.2.10-46 - Rebuilt * Tue Nov 1 2005 Matthias Clasen 1:1.2.10-45 - Switch requires to modular X * Wed Mar 2 2005 Matthias Clasen 1:1.2.10-35 - Rebuild with gcc4 * Thu Feb 17 2005 Matthias Clasen 1:1.2.10-34 - Replace Copyright tag in header. * Sun Aug 15 2004 Tim Waugh 1:1.2.10-33 - Fixed underquoted m4 definition. * Thu Jun 24 2004 Matthias Clasen - add missing buildrequires (#124159) * Tue Jun 16 2004 Matthias Clasen - rebuilt for RHEL3 U3 * Tue Jun 15 2004 Elliot Lee - rebuilt * Tue Mar 02 2004 Elliot Lee - rebuilt * Fri Feb 13 2004 Elliot Lee - rebuilt * Mon Oct 27 2003 Owen Taylor 1:1.2.10-28.1 - Cave like a cheap house of cards and add gdk-pixbuf dependency (#105613) - Add gtkrc.*.utf8 RC files for CJK (#84593) - Add a dependency on libgdk to libgtk (#106677) * Sun Jun 8 2003 Tim Powers 1:1.2.10-27.1 - build for RHEL * Wed Jun 04 2003 Elliot Lee - rebuilt * Tue Jun 3 2003 Jeff Johnson - add explicit epoch's where needed. * Thu Feb 13 2003 Elliot Lee 1.2.10-26 - Run libtoolize/auto* to get an updated libtool that recognizes ppc64 * Wed Jan 22 2003 Tim Powers - rebuilt * Wed Jan 15 2003 Owen Taylor 1.2.10-24 - Add a couple of patches from GNOME CVS, fixing a crash with CList focus row tracking, and a place where DND would get confused. - Obey the system bell volume (#74802) - Ship the pkg-config files * Mon Nov 4 2002 Tim Waugh 1.2.10-23 - Don't install files not shipped. - Fix gtk-config output for multilib archs. * Thu Aug 22 2002 Owen Taylor - Fix a crash that can happen in some apps when the current locale is not supported by XLib. (#72157) * Fri Jul 26 2002 Owen Taylor - Fix a small memory leak in the .encoding patch (Kjartan Maraas) * Fri Jul 19 2002 Alexander Larsson - Add troughpaint patch * Thu Jun 27 2002 Owen Taylor - Fix UTF-8 font specification not to pick up *-c-* fonts * Fri Jun 21 2002 Tim Powers - automated rebuild * Sun May 26 2002 Tim Powers - automated rebuild * Thu May 16 2002 Alex Larsson - Require automake 1.4 * Wed Apr 17 2002 Owen Taylor - Fix problem with incorrect directory contents when changing directories (#63726) * Mon Apr 15 2002 Havoc Pennington - merge translations * Fri Apr 12 2002 Owen Taylor - Fix filesel delete-filename-on-dir-change problem - Improve warning for missing fontset elements * Thu Apr 11 2002 Owen Taylor - Fix ukrainian font sizes, minor tweak to russian fonts (#63135) - Own /etc/gtk/ as well as the files in it (#63139) * Mon Aug 27 2001 Havoc Pennington - Add po files from sources.redhat.com * Mon Aug 13 2001 Owen Taylor - Fix problem with width computation for missing characters * Sun Aug 12 2001 Owen Taylor - Fix refcounting problem in gtk_style_copy() that might affect theme switching. (#51580) * Wed Aug 8 2001 Owen Taylor - Add fix for theme switching in nautilus sidebar tabs (and other similar situations) * Sat Jul 21 2001 Owen Taylor - Accept KP_Enter as well as Return (#21111) * Wed Jul 11 2001 Owen Taylor - Further improve exposure compression code * Tue Jul 10 2001 Owen Taylor - Omit warnings about character sets not found in fontset, if current locale is UTF-8 based. (Hack!) * Tue Jul 3 2001 Owen Taylor - Add patch for alignment warnings on ia64 - Add from Alex to vastly improve expose compression - Add patch to fix focus tracking for embedded windows - Add patch by Pablo Saratxaga to improve encoding handling - Add patch to not screw up CTEXT for UTF-8 locales * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. * Tue Apr 17 2001 Jonathan Blandford - Upped to version 1.2.10 * Thu Mar 15 2001 Havoc Pennington - translations * Fri Mar 9 2001 Owen Taylor - Fix problem with focus and no window manager running - Fix freeing NULL event when copying without a current event * Mon Mar 5 2001 Trond Eivind Glomsrod - langify * Mon Mar 05 2001 Owen Taylor - Version 1.2.9 - Patch to fix problem with menus not popping down * Thu Mar 01 2001 Owen Taylor - Version 1.2.9pre4 * Wed Feb 28 2001 Owen Taylor - Version 1.2.9pre3 * Thu Feb 15 2001 Owen Taylor - Version 1.2.9pre1 * Sat Feb 10 2001 Owen Taylor - Fix stupid mistake in last version of patch * Sat Feb 10 2001 Owen Taylor - New version of theme patch. * Wed Jan 24 2001 Matt Wilson - Japanese ideographs now show up in iswalnum, don't include it in the ideograph check (Patch5: gtk+-1.2.8-wrap-alnum.patch) * Tue Nov 21 2000 Owen Taylor - Add patch for enabling better themes * Thu Oct 19 2000 Elliot Lee - Fix bug in shm patch error handling. * Fri Aug 18 2000 Jakub Jelinek - fix GtkClist bug * Sat Aug 12 2000 Owen Taylor - Add patch to reduce shm segment usage from 6 to 1 * Fri Aug 11 2000 Jonathan Blandford - Up Epoch and release * Wed Jul 19 2000 Owen Taylor - Add BuildPreReq on glib = %{version} * Thu Jul 13 2000 Prospector - automatic rebuild * Fri Jun 9 2000 Matt Wilson - rebuilt with corrected compiler to fix ABI breakage - FHS packaging. * Thu May 25 2000 Owen Taylor - Version 1.2.8 * Fri May 12 2000 Matt Wilson - reapply gtkrc fixes for various locales * Mon May 1 2000 Matt Wilson - build package version 1.2.7 * Mon Feb 21 2000 Owen Taylor - Fix weird excess " problem that somehow turned up in /etc/gtkrc.LANG * Mon Feb 14 2000 Owen Taylor - More patches from 1.2.7 * Fri Feb 04 2000 Owen Taylor - Set the charset explicitely for the default font to avoid problems with XFree86-4.0 where the default charset is iso10646-1, not iso8859-1. - Fix problems with size requisitions for scrolled windows that was causing looping. (RH bug #7997) * Thu Feb 03 2000 Owen Taylor - Explicitely set the foreground of the tooltips to black to avoid bad interactions with themes that set a light foreground color. * Thu Feb 03 2000 Owen Taylor - Added large patch of bugfixes in stable branch of CVS * Tue Oct 12 1999 Owen Taylor - Added Akira Higuti's patch for line-wrapping in GTK+ * Thu Oct 7 1999 Owen Taylor - version 1.2.6 * Thu Sep 23 1999 Owen Taylor - version 1.2.5 - install tutorial GIFs * Wed Sep 22 1999 Owen Taylor - Upgrade to real 1.2.5pre2 - Changed name so upgrade to 1.2.5 will work :-( - Add extra gtkrc files - Add examples and English language tutorial to -devel package * Fri Sep 17 1999 Owen Taylor - Upgraded to 1.2.5pre2. (Actually, pre-pre-2) * Tue Aug 17 1999 Michael Fulbright - added threaded patch * Mon Jun 7 1999 Owen Taylor - Update for GTK+-1.2.3 - Patches that will be in GTK+-1.2.4 - Patch to keep GTK+ from coredumping on X IO errors - Patch to improve compatilibity with GTK-1.2.1 (allow event mask to be set on realized widgets) * Mon Apr 19 1999 Michael Fulbright - fixes memory leak * Mon Apr 12 1999 Owen Taylor - The important bug fixes that will be in GTK+-1.2.2 * Thu Apr 01 1999 Michael Fulbright - patches from owen to handle various gdk bugs * Sun Mar 28 1999 Michael Fulbright - added XFree86-devel requirement for gtk+-devel * Thu Mar 25 1999 Michael Fulbright - version 1.2.1 * Wed Mar 17 1999 Michael Fulbright - removed /usr/info/dir.gz file from package * Fri Feb 26 1999 Michael Fulbright - Version 1.2.0 * Thu Feb 25 1999 Michael Fulbright - version 1.2.0pre2, patched to use --sysconfdir=/etc * Mon Feb 15 1999 Michael Fulbright - patched in Owen's patch to fix Metal theme * Fri Feb 05 1999 Michael Fulbright - bumped up to 1.1.15 * Wed Feb 03 1999 Michael Fulbright - bumped up to 1.1.14 * Mon Jan 18 1999 Michael Fulbright - bumped up to 1.1.13 * Wed Jan 06 1999 Michael Fulbright - bumped up to 1.1.12 * Wed Dec 16 1998 Michael Fulbright - added Theme directory to file list - up to 1.1.7 for GNOME freeze * Sun Oct 25 1998 Shawn T. Amundson - Fixed Source: to point to v1.1 * Tue Aug 04 1998 Michael Fulbright - change %postun to %preun * Mon Jun 27 1998 Shawn T. Amundson - Changed version to 1.1.0 * Thu Jun 11 1998 Dick Porter - Removed glib, since it is its own module now * Mon Apr 13 1998 Marc Ewing - Split out glib package * Tue Apr 8 1998 Shawn T. Amundson - Changed version to 1.0.0 * Tue Apr 7 1998 Owen Taylor - Changed version to 0.99.10 * Thu Mar 19 1998 Shawn T. Amundson - Changed version to 0.99.9 - Changed gtk home page to www.gtk.org * Thu Mar 19 1998 Shawn T. Amundson - Changed version to 0.99.8 * Sun Mar 15 1998 Marc Ewing - Added aclocal and bin stuff to file list. - Added -k to the SMP make line. - Added lib/glib to file list. * Fri Mar 14 1998 Shawn T. Amundson - Changed version to 0.99.7 * Fri Mar 14 1998 Shawn T. Amundson - Updated ftp url and changed version to 0.99.6 * Thu Mar 12 1998 Marc Ewing - Reworked to integrate into gtk+ source tree - Truncated ChangeLog. Previous Authors: Trond Eivind Glomsrod Michael K. Johnson Otto Hammersmith --- NEW FILE gtkrc-default --- style "gtk-tooltips-style" { bg[NORMAL] = "#ffffc0" fg[NORMAL] = "#000000" } widget "gtk-tooltips" style "gtk-tooltips-style" style "gtk-progressbar-style" { bg[NORMAL] = "#ffffff" bg[PRELIGHT] = "#a0a0a0" } class "GtkProgressBar" style "gtk-progressbar-style" --- NEW FILE gtkrc.ja.utf8 --- style "gtk-default-ja-utf8" { fontset = "-misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0,\ -adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1,\ *-r-*" } class "GtkWidget" style "gtk-default-ja-utf8" --- NEW FILE gtkrc.ko.utf8 --- style "gtk-default-ko-utf8" { fontset = "-*-gulim*-medium-r-normal--*-120-*-*-*-*-ksc5601.1987-0,\ -*-gulim*-medium-r-normal--*-120-*-*-*-*-ksc5601.1987-0,\ -*-kodig-medium-r-normal--*-120-*-*-*-*-ksc5601.1987-0,\ -*-*-medium-r-normal--*-120-*-*-*-*-ksc5601.1987-0,\ -adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,\ *" } class "GtkWidget" style "gtk-default-ko-utf8" --- NEW FILE gtkrc.zh_CN.utf8 --- # $(gtkconfigdir)/gtkrc.zh_CN # # This file defines the fontsets for Chinese language (zh) using # the simplified chinese standard GuoBiao as in mainland China (CN) # # 1999, Pablo Saratxaga # style "gtk-default-zh-cn-utf8" { fontset = "-adobe-helvetica-medium-r-normal--16-*-*-*-*-*-iso8859-1,\ -*-*-medium-r-normal--16-*-*-*-*-*-gb2312.1980-0,*-r-*" } class "GtkWidget" style "gtk-default-zh-cn-utf8" --- NEW FILE gtkrc.zh_TW.utf8 --- # $(gtkconfigdir)/gtkrc.zh_TW # # This file defines the fontsets for Chinese language (ch) using # the traditional chinese Big5 encoding as used in Taiwan (TW) # # 1999, Pablo Saratxaga # # IMPORTANT NOTE: The name of this file *MUST* be "gtkrc.zh_TW.big5" # the lowercasing of "big5" is done on purpose, if you change it it won't work style "gtk-default-zh-tw-utf8" { fontset = "-adobe-helvetica-medium-r-normal--16-*-*-*-*-*-iso8859-1,\ -taipei-*-medium-r-normal--*-*-*-*-*-*-big5-0,\ -*-*-medium-r-normal--16-*-*-*-*-*-big5-0,*-r-*" } class "GtkWidget" style "gtk-default-zh-tw-utf8" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk+/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 May 2006 16:04:13 -0000 1.1 +++ .cvsignore 4 May 2006 16:05:38 -0000 1.2 @@ -0,0 +1,2 @@ +gtk+-1.2.10.tar.gz +gtk+-pofiles.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk+/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 May 2006 16:04:13 -0000 1.1 +++ sources 4 May 2006 16:05:38 -0000 1.2 @@ -0,0 +1,2 @@ +4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz +bd8c32890a2d6430395b0031d350b435 gtk+-pofiles.tar.gz From fedora-extras-commits at redhat.com Thu May 4 16:05:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:05:38 -0700 Subject: rpms/gtk+ import.log,1.1,1.2 Message-ID: <200605041606.k44G6Alu018623@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508 Modified Files: import.log Log Message: auto-import gtk+-1.2.10-52 on branch devel from gtk+-1.2.10-52.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtk+/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 May 2006 16:04:13 -0000 1.1 +++ import.log 4 May 2006 16:05:38 -0000 1.2 @@ -0,0 +1 @@ +gtk+-1_2_10-52:HEAD:gtk+-1.2.10-52.src.rpm:1146758734 From fedora-extras-commits at redhat.com Thu May 4 16:16:35 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 May 2006 09:16:35 -0700 Subject: rpms/cpanspec/devel cpanspec-1.65-regex.patch, NONE, 1.1 cpanspec.spec, 1.7, 1.8 Message-ID: <200605041616.k44GGbUS019218@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19191 Modified Files: cpanspec.spec Added Files: cpanspec-1.65-regex.patch Log Message: Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). cpanspec-1.65-regex.patch: --- NEW FILE cpanspec-1.65-regex.patch --- ? Build ? META.yml ? _build ? cpanspec-1.59.tar.gz ? cpanspec-1.60.tar.gz ? cpanspec-1.61.tar.gz ? cpanspec-1.62.tar.gz ? cpanspec-1.63.tar.gz ? cpanspec-1.64.tar.gz ? cpanspec-1.65.tar.gz ? tmp Index: cpanspec =================================================================== RCS file: /cvsroot/cpanspec/cpanspec/cpanspec,v retrieving revision 1.22 diff -u -r1.22 cpanspec --- cpanspec 26 Apr 2006 21:08:45 -0000 1.22 +++ cpanspec 4 May 2006 16:12:55 -0000 @@ -393,7 +393,7 @@ if ($rendered=~/NAME\s*$args{module}\s[-\s]*(\S[^\n]*)/s) { if ($1 ne "SYNOPSIS") { $summary=$1; - $summary=~s/[.\s]+//; + $summary=~s/[.\s]+$//; $summary=~s/^A\s+//i; $summary=ucfirst($summary); } Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cpanspec.spec 26 Apr 2006 21:23:42 -0000 1.7 +++ cpanspec.spec 4 May 2006 16:16:35 -0000 1.8 @@ -1,11 +1,12 @@ Name: cpanspec Version: 1.65 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz +Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -51,6 +53,9 @@ %{_mandir}/man1/* %changelog +* Thu May 04 2006 Steven Pritchard 1.65-2 +- Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). + * Wed Apr 26 2006 Steven Pritchard 1.65-1 - Update to 1.65. - cpanget requires wget. From fedora-extras-commits at redhat.com Thu May 4 16:18:40 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 4 May 2006 09:18:40 -0700 Subject: rpms/icecast/devel icecast.init,1.2,1.3 icecast.spec,1.1,1.2 Message-ID: <200605041618.k44GIgZU019571@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/icecast/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19547 Modified Files: icecast.init icecast.spec Log Message: * Thu May 04 2006 Andreas Thienemann 2.3.1-2 - Enabled Theora Streaming Index: icecast.init =================================================================== RCS file: /cvs/extras/rpms/icecast/devel/icecast.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- icecast.init 16 Feb 2006 08:48:09 -0000 1.2 +++ icecast.init 4 May 2006 16:18:39 -0000 1.3 @@ -20,7 +20,7 @@ start) # Start daemon. echo -n $"Starting icecast streaming daemon: " - daemon /usr/bin/icecast -b -c /etc/icecast.xml + daemon "/usr/bin/icecast -b -c /etc/icecast.xml > /dev/null" RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/icecast Index: icecast.spec =================================================================== RCS file: /cvs/extras/rpms/icecast/devel/icecast.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icecast.spec 16 Feb 2006 07:23:04 -0000 1.1 +++ icecast.spec 4 May 2006 16:18:39 -0000 1.2 @@ -1,7 +1,7 @@ Summary: ShoutCast compatible streaming media server Name: icecast Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL URL: http://www.icecast.org/ @@ -18,7 +18,7 @@ BuildRequires: libvorbis-devel >= 1.0, libogg-devel >= 1.0, curl-devel >= 7.10.0 BuildRequires: libxml2-devel, libxslt-devel, speex-devel # To be enabled as soon as Fedora's libtheora supports ogg_stream_init -# BuidRequires: libtheora-devel >= 1.0 +BuildRequires: libtheora-devel >= 1.0 Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig @@ -43,7 +43,8 @@ %build # theora support is to be enabled as soon as Fedora's libtheora supports # ogg_stream_init -%configure --disable-theora +# --disable-theora +%configure %{__make} %{?_smp_mflags} @@ -89,6 +90,7 @@ userdel icecast >/dev/null 2>&1 || : fi + %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS ChangeLog @@ -105,6 +107,9 @@ %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast %changelog +* Thu May 04 2006 Andreas Thienemann 2.3.1-2 +- Enabled Theora Streaming + * Fri Feb 03 2006 Andreas Thienemann 2.3.1-1 - Updated to icecast 2.3.1-1 From fedora-extras-commits at redhat.com Thu May 4 16:32:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 May 2006 09:32:39 -0700 Subject: rpms/perl-YAML/devel .cvsignore, 1.3, 1.4 perl-YAML.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200605041632.k44GWfIH021670@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21597 Modified Files: .cvsignore perl-YAML.spec sources Log Message: Update to 0.58. Small spec cleanups. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Apr 2005 07:06:47 -0000 1.3 +++ .cvsignore 4 May 2006 16:32:39 -0000 1.4 @@ -1 +1 @@ -YAML-0.39.tar.gz +YAML-0.58.tar.gz Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-YAML.spec 14 Apr 2005 07:06:47 -0000 1.7 +++ perl-YAML.spec 4 May 2006 16:32:39 -0000 1.8 @@ -1,18 +1,16 @@ Name: perl-YAML -Version: 0.39 -Release: 2 +Version: 0.58 +Release: 1%{?dist} Summary: YAML Ain't Markup Language (tm) - -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz Patch0: %{name}-testmore054.patch 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)) +BuildRequires: perl(Test::Base) >= 0.49 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The YAML.pm module implements a YAML Loader and Dumper based on the @@ -23,33 +21,30 @@ For information on the YAML syntax, please refer to the YAML specification. - %prep %setup -q -n YAML-%{version} %patch0 -p0 - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT + make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w $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 \; -%check || : -make test +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%check +make test %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc Changes README @@ -58,8 +53,11 @@ %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* - %changelog +* Thu May 04 2006 Steven Pritchard 0.58-1 +- Update to 0.58. +- Small spec cleanups. + * Thu Apr 14 2005 Ville Skytt?? - 0.39-2 - 0.39. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Apr 2005 07:06:47 -0000 1.3 +++ sources 4 May 2006 16:32:39 -0000 1.4 @@ -1 +1 @@ -b8a49f49cb0ee6d9698807fb3f606922 YAML-0.39.tar.gz +aa5ac653057914ca995dd74de8212ebc YAML-0.58.tar.gz From fedora-extras-commits at redhat.com Thu May 4 16:36:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 May 2006 09:36:13 -0700 Subject: rpms/cpanspec/FC-5 cpanspec-1.65-regex.patch, NONE, 1.1 cpanspec.spec, 1.7, 1.8 Message-ID: <200605041636.k44GaFxJ022233@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206 Modified Files: cpanspec.spec Added Files: cpanspec-1.65-regex.patch Log Message: Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). cpanspec-1.65-regex.patch: --- NEW FILE cpanspec-1.65-regex.patch --- ? Build ? META.yml ? _build ? cpanspec-1.59.tar.gz ? cpanspec-1.60.tar.gz ? cpanspec-1.61.tar.gz ? cpanspec-1.62.tar.gz ? cpanspec-1.63.tar.gz ? cpanspec-1.64.tar.gz ? cpanspec-1.65.tar.gz ? tmp Index: cpanspec =================================================================== RCS file: /cvsroot/cpanspec/cpanspec/cpanspec,v retrieving revision 1.22 diff -u -r1.22 cpanspec --- cpanspec 26 Apr 2006 21:08:45 -0000 1.22 +++ cpanspec 4 May 2006 16:12:55 -0000 @@ -393,7 +393,7 @@ if ($rendered=~/NAME\s*$args{module}\s[-\s]*(\S[^\n]*)/s) { if ($1 ne "SYNOPSIS") { $summary=$1; - $summary=~s/[.\s]+//; + $summary=~s/[.\s]+$//; $summary=~s/^A\s+//i; $summary=ucfirst($summary); } Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cpanspec.spec 26 Apr 2006 23:07:56 -0000 1.7 +++ cpanspec.spec 4 May 2006 16:36:13 -0000 1.8 @@ -1,11 +1,12 @@ Name: cpanspec Version: 1.65 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz +Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -51,6 +53,9 @@ %{_mandir}/man1/* %changelog +* Thu May 04 2006 Steven Pritchard 1.65-2 +- Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). + * Wed Apr 26 2006 Steven Pritchard 1.65-1 - Update to 1.65. - cpanget requires wget. From fedora-extras-commits at redhat.com Thu May 4 16:37:46 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 May 2006 09:37:46 -0700 Subject: rpms/cpanspec/FC-4 cpanspec-1.65-regex.patch, NONE, 1.1 cpanspec.spec, 1.7, 1.8 Message-ID: <200605041637.k44Gbm7x022516@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22486 Modified Files: cpanspec.spec Added Files: cpanspec-1.65-regex.patch Log Message: Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). cpanspec-1.65-regex.patch: --- NEW FILE cpanspec-1.65-regex.patch --- ? Build ? META.yml ? _build ? cpanspec-1.59.tar.gz ? cpanspec-1.60.tar.gz ? cpanspec-1.61.tar.gz ? cpanspec-1.62.tar.gz ? cpanspec-1.63.tar.gz ? cpanspec-1.64.tar.gz ? cpanspec-1.65.tar.gz ? tmp Index: cpanspec =================================================================== RCS file: /cvsroot/cpanspec/cpanspec/cpanspec,v retrieving revision 1.22 diff -u -r1.22 cpanspec --- cpanspec 26 Apr 2006 21:08:45 -0000 1.22 +++ cpanspec 4 May 2006 16:12:55 -0000 @@ -393,7 +393,7 @@ if ($rendered=~/NAME\s*$args{module}\s[-\s]*(\S[^\n]*)/s) { if ($1 ne "SYNOPSIS") { $summary=$1; - $summary=~s/[.\s]+//; + $summary=~s/[.\s]+$//; $summary=~s/^A\s+//i; $summary=ucfirst($summary); } Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cpanspec.spec 26 Apr 2006 23:09:00 -0000 1.7 +++ cpanspec.spec 4 May 2006 16:37:46 -0000 1.8 @@ -1,11 +1,12 @@ Name: cpanspec Version: 1.65 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz +Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -51,6 +53,9 @@ %{_mandir}/man1/* %changelog +* Thu May 04 2006 Steven Pritchard 1.65-2 +- Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). + * Wed Apr 26 2006 Steven Pritchard 1.65-1 - Update to 1.65. - cpanget requires wget. From fedora-extras-commits at redhat.com Thu May 4 16:51:11 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 4 May 2006 09:51:11 -0700 Subject: rpms/openct/devel .cvsignore, 1.6, 1.7 openct.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200605041651.k44GpDSQ024365@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24338 Modified Files: .cvsignore openct.spec sources Log Message: * Thu May 4 2006 Ville Skytt?? - 0.6.7-1 - 0.6.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Apr 2006 14:03:56 -0000 1.6 +++ .cvsignore 4 May 2006 16:51:11 -0000 1.7 @@ -1 +1 @@ -openct-0.6.7-rc4.tar.gz +openct-0.6.7.tar.gz Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- openct.spec 26 Apr 2006 14:03:56 -0000 1.11 +++ openct.spec 4 May 2006 16:51:11 -0000 1.12 @@ -2,13 +2,13 @@ Name: openct Version: 0.6.7 -Release: 0.1.rc4%{?dist} +Release: 1%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries License: LGPL URL: http://www.opensc-project.org/ -Source0: http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc4.tar.gz +Source0: http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,7 +53,7 @@ %prep -%setup -q -n %{name}-%{version}-rc4 +%setup -q sh bootstrap # avoid standard rpaths on lib64 archs sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \ @@ -155,6 +155,9 @@ %changelog +* Thu May 4 2006 Ville Skytt?? - 0.6.7-1 +- 0.6.7. + * Wed Apr 26 2006 Ville Skytt?? - 0.6.7-0.1.rc4 - 0.6.7-rc4. - Re-enable PCSC hotplug in pcsc-lite subpackage. Index: sources =================================================================== RCS file: /cvs/extras/rpms/openct/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Apr 2006 14:03:56 -0000 1.6 +++ sources 4 May 2006 16:51:11 -0000 1.7 @@ -1 +1 @@ -261d40f71696a9a2ae168ae09e18f124 openct-0.6.7-rc4.tar.gz +1b33d319f364acafbcf130d7ba34ea4c openct-0.6.7.tar.gz From fedora-extras-commits at redhat.com Thu May 4 17:05:31 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 4 May 2006 10:05:31 -0700 Subject: rpms/opensc/devel .cvsignore, 1.7, 1.8 opensc.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200605041705.k44H5XcB026838@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26817 Modified Files: .cvsignore opensc.spec sources Log Message: * Thu May 4 2006 Ville Skytt?? - 0.11.0-1 - 0.11.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 Apr 2006 19:11:33 -0000 1.7 +++ .cvsignore 4 May 2006 17:05:31 -0000 1.8 @@ -1 +1 @@ -opensc-0.11.0-rc2.tar.gz +opensc-0.11.0.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- opensc.spec 27 Apr 2006 19:11:33 -0000 1.12 +++ opensc.spec 4 May 2006 17:05:31 -0000 1.13 @@ -2,13 +2,13 @@ Name: opensc Version: 0.11.0 -Release: 0.1.rc2%{?dist} +Release: 1%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL URL: http://www.opensc-project.org/ -Source0: http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc2.tar.gz +Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -50,7 +50,7 @@ %prep -%setup -q -n %{name}-%{version}-rc2 +%setup -q sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . @@ -136,6 +136,9 @@ %changelog +* Thu May 4 2006 Ville Skytt?? - 0.11.0-1 +- 0.11.0. + * Thu Apr 27 2006 Ville Skytt?? - 0.11.0-0.1.rc2 - 0.11.0-rc2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 27 Apr 2006 19:11:33 -0000 1.7 +++ sources 4 May 2006 17:05:31 -0000 1.8 @@ -1 +1 @@ -960e33d4328bc7ee209a7a296bfc2fcc opensc-0.11.0-rc2.tar.gz +be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:44:23 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 4 May 2006 12:44:23 -0700 Subject: rpms/git/devel .cvsignore, 1.26, 1.27 git.spec, 1.14, 1.15 sources, 1.26, 1.27 Message-ID: <200605041944.k44JiPXl031967@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31945 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Apr 2006 01:22:33 -0000 1.26 +++ .cvsignore 4 May 2006 19:44:23 -0000 1.27 @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/devel/git.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git.spec 29 Apr 2006 01:22:33 -0000 1.14 +++ git.spec 4 May 2006 19:44:23 -0000 1.15 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Apr 2006 01:22:33 -0000 1.26 +++ sources 4 May 2006 19:44:23 -0000 1.27 @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:45:14 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 12:45:14 -0700 Subject: rpms/goffice/devel goffice.spec,1.9,1.10 Message-ID: <200605041945.k44JjGLi032034@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32017 Modified Files: goffice.spec Log Message: * Tue May 2 2006 Hans de Goede 0.2.1-1 - new upstream version: 0.2.1 Index: goffice.spec =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- goffice.spec 21 Mar 2006 17:52:41 -0000 1.9 +++ goffice.spec 4 May 2006 19:45:14 -0000 1.10 @@ -1,6 +1,6 @@ Name: goffice -Version: 0.2.0 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Goffice support libraries Group: System Environment/Libraries License: GPL @@ -70,6 +70,9 @@ %changelog +* Tue May 2 2006 Hans de Goede 0.2.1-1 +- new upstream version: 0.2.1 + * Tue Mar 21 2006 Hans de Goede 0.2.0-2 - rebuild for new libgsf From fedora-extras-commits at redhat.com Thu May 4 19:45:50 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 4 May 2006 12:45:50 -0700 Subject: rpms/git/FC-5 .cvsignore, 1.26, 1.27 git.spec, 1.14, 1.15 sources, 1.26, 1.27 Message-ID: <200605041945.k44JjqpG032074@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32053 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Apr 2006 01:24:12 -0000 1.26 +++ .cvsignore 4 May 2006 19:45:50 -0000 1.27 @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git.spec 29 Apr 2006 01:24:12 -0000 1.14 +++ git.spec 4 May 2006 19:45:50 -0000 1.15 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Apr 2006 01:24:12 -0000 1.26 +++ sources 4 May 2006 19:45:50 -0000 1.27 @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:46:49 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 4 May 2006 12:46:49 -0700 Subject: rpms/git/FC-4 .cvsignore, 1.26, 1.27 git.spec, 1.14, 1.15 sources, 1.26, 1.27 Message-ID: <200605041946.k44JkpYE032156@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32133 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Apr 2006 01:27:52 -0000 1.26 +++ .cvsignore 4 May 2006 19:46:49 -0000 1.27 @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git.spec 29 Apr 2006 01:27:52 -0000 1.14 +++ git.spec 4 May 2006 19:46:49 -0000 1.15 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Apr 2006 01:27:52 -0000 1.26 +++ sources 4 May 2006 19:46:49 -0000 1.27 @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:48:01 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 4 May 2006 12:48:01 -0700 Subject: rpms/git/FC-3 .cvsignore, 1.26, 1.27 git.spec, 1.14, 1.15 sources, 1.26, 1.27 Message-ID: <200605041948.k44Jm3rR032246@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32225 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Apr 2006 01:28:51 -0000 1.26 +++ .cvsignore 4 May 2006 19:48:01 -0000 1.27 @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git.spec 29 Apr 2006 01:28:51 -0000 1.14 +++ git.spec 4 May 2006 19:48:01 -0000 1.15 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Apr 2006 01:28:51 -0000 1.26 +++ sources 4 May 2006 19:48:01 -0000 1.27 @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:48:40 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 12:48:40 -0700 Subject: rpms/goffice/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200605041948.k44JmgaS032309@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32290 Modified Files: .cvsignore sources Log Message: * Tue May 2 2006 Hans de Goede 0.2.1-1 - new upstream version: 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 00:21:28 -0000 1.3 +++ .cvsignore 4 May 2006 19:48:40 -0000 1.4 @@ -1 +1 @@ -goffice-0.2.0.tar.bz2 +goffice-0.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 00:21:28 -0000 1.3 +++ sources 4 May 2006 19:48:40 -0000 1.4 @@ -1 +1 @@ -e1f60fc9822813c6c3f20296e54928bf goffice-0.2.0.tar.bz2 +73b733556db5721ddfd5c72fc6428a15 goffice-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Thu May 4 19:49:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 4 May 2006 12:49:38 -0700 Subject: extras-buildsys/utils extras-push-all,1.2,1.3 Message-ID: <200605041949.k44Jncii032376@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32355 Modified Files: extras-push-all Log Message: -f forces repodata+repoview rebuild even if no new packages were found. Index: extras-push-all =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- extras-push-all 17 Mar 2006 07:46:49 -0000 1.2 +++ extras-push-all 4 May 2006 19:49:36 -0000 1.3 @@ -14,6 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +[ "$1" = "-f" ] && force=yes || force= dists="3 4 5 development" changed= @@ -34,6 +35,7 @@ sign_move $dist || exit $? done +[ "$force" = "yes" ] && changed="$dists" for dist in $changed ; do extras-repobuild.py $dist && extras-repoview.py $dist || exit $? done From fedora-extras-commits at redhat.com Thu May 4 21:10:24 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 14:10:24 -0700 Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-64bit.patch, NONE, 1.1 libgnomedb.spec, 1.13, 1.14 Message-ID: <200605042110.k44LAQYN005046@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5024 Modified Files: libgnomedb.spec Added Files: libgnomedb-1.9.100-64bit.patch Log Message: * Thu May 4 2006 Hans de Goede 1:1.9.100-7 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) libgnomedb-1.9.100-64bit.patch: --- NEW FILE libgnomedb-1.9.100-64bit.patch --- --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c~ 2006-05-04 22:16:54.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c 2006-05-04 22:16:54.000000000 +0200 @@ -19,6 +19,7 @@ */ #include "gnome-db-handler-filesel.h" +#include "gnome-db-entry-filesel.h" #include #include #include Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libgnomedb.spec 24 Mar 2006 10:22:02 -0000 1.13 +++ libgnomedb.spec 4 May 2006 21:10:24 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.9.100 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -18,6 +18,7 @@ Patch0: libgnomedb-1.2.0-desktop.patch Patch1: libgnomedb-1.9.100-sharp.patch Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch +Patch3: libgnomedb-1.9.100-64bit.patch %description libgnomedb is a library that eases the task of writing @@ -56,6 +57,7 @@ %patch0 -p1 -b .desktop.patch %patch1 -p1 -b .sharp %patch2 -p1 -b .unknown +%patch3 -p1 -b .64bit %build @@ -155,6 +157,9 @@ %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-7 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 From fedora-extras-commits at redhat.com Thu May 4 21:11:09 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:11:09 -0700 Subject: rpms/netpanzer - New directory Message-ID: <200605042111.k44LBBSY005152@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5126/netpanzer Log Message: Directory /cvs/extras/rpms/netpanzer added to the repository From fedora-extras-commits at redhat.com Thu May 4 21:11:10 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:11:10 -0700 Subject: rpms/netpanzer/devel - New directory Message-ID: <200605042111.k44LBCsS005155@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5126/netpanzer/devel Log Message: Directory /cvs/extras/rpms/netpanzer/devel added to the repository From fedora-extras-commits at redhat.com Thu May 4 21:11:44 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:11:44 -0700 Subject: rpms/netpanzer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605042111.k44LBk8d005204@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5176 Added Files: Makefile import.log Log Message: Setup of module netpanzer --- NEW FILE Makefile --- # Top level Makefile for module netpanzer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 4 21:11:45 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:11:45 -0700 Subject: rpms/netpanzer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605042111.k44LBlx1005207@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5176/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module netpanzer --- NEW 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 May 4 21:12:25 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 14:12:25 -0700 Subject: rpms/libgnomedb/FC-5 libgnomedb-1.9.100-64bit.patch, NONE, 1.1 libgnomedb.spec, 1.13, 1.14 Message-ID: <200605042112.k44LCR1x005256@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5233 Modified Files: libgnomedb.spec Added Files: libgnomedb-1.9.100-64bit.patch Log Message: * Thu May 4 2006 Hans de Goede 1:1.9.100-7 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) libgnomedb-1.9.100-64bit.patch: --- NEW FILE libgnomedb-1.9.100-64bit.patch --- --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c~ 2006-05-04 22:16:54.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c 2006-05-04 22:16:54.000000000 +0200 @@ -19,6 +19,7 @@ */ #include "gnome-db-handler-filesel.h" +#include "gnome-db-entry-filesel.h" #include #include #include Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/FC-5/libgnomedb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libgnomedb.spec 24 Mar 2006 14:49:54 -0000 1.13 +++ libgnomedb.spec 4 May 2006 21:12:25 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.9.100 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -18,6 +18,7 @@ Patch0: libgnomedb-1.2.0-desktop.patch Patch1: libgnomedb-1.9.100-sharp.patch Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch +Patch3: libgnomedb-1.9.100-64bit.patch %description libgnomedb is a library that eases the task of writing @@ -56,6 +57,7 @@ %patch0 -p1 -b .desktop.patch %patch1 -p1 -b .sharp %patch2 -p1 -b .unknown +%patch3 -p1 -b .64bit %build @@ -155,6 +157,9 @@ %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-7 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 From fedora-extras-commits at redhat.com Thu May 4 21:12:42 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 14:12:42 -0700 Subject: rpms/libgda/devel libgda-1.9.100-64bit.patch, NONE, 1.1 libgda.spec, 1.11, 1.12 Message-ID: <200605042112.k44LCilw005324@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5304 Modified Files: libgda.spec Added Files: libgda-1.9.100-64bit.patch Log Message: * Thu May 4 2006 Hans de Goede 1:1.9.100-5 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) libgda-1.9.100-64bit.patch: --- NEW FILE libgda-1.9.100-64bit.patch --- --- libgda-1.9.100/libgda/gda-data-model-hash.c~ 2006-05-03 23:04:11.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-hash.c 2006-05-03 23:04:11.000000000 +0200 @@ -70,7 +70,7 @@ return GDA_DATA_MODEL_HASH (model)->priv->number_of_columns; } -static GdaRow * +GdaRow * gda_data_model_hash_get_row (GdaDataModelBase *model, gint row) { gint hash_entry; --- libgda-1.9.100/libgda/gda-data-model-array.c~ 2006-05-03 22:48:02.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-array.c 2006-05-03 22:48:02.000000000 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #define PARENT_TYPE GDA_TYPE_DATA_MODEL_BASE @@ -430,7 +431,7 @@ } if (! cur) { - g_set_error (error, 0, 0, _("No specified in "), node->name); + g_set_error (error, 0, 0, _("No specified in ")); clean_field_specs (fields); return NULL; } --- libgda-1.9.100/libgda/gda-data-model-hash.h~ 2006-05-03 23:03:48.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-hash.h 2006-05-03 23:03:48.000000000 +0200 @@ -60,6 +60,7 @@ gint rownum, GdaRow *row); +GdaRow *gda_data_model_hash_get_row (GdaDataModelBase *model, gint row); G_END_DECLS --- libgda-1.9.100/providers/postgres/utils.c~ 2006-05-03 23:08:57.000000000 +0200 +++ libgda-1.9.100/providers/postgres/utils.c 2006-05-03 23:08:57.000000000 +0200 @@ -289,7 +289,7 @@ break; case GDA_VALUE_TYPE_BLOB : blob = gda_postgres_blob_new (cnc); - gda_postgres_blob_set_id (GDA_POSTRES_BLOB (blob), atoi (thevalue)); + gda_postgres_blob_set_id (GDA_POSTGRES_BLOB (blob), atoi (thevalue)); gda_value_set_blob (value, blob); break; default : --- libgda-1.9.100/providers/odbc/gda-odbc-provider.c~ 2006-05-03 23:06:12.000000000 +0200 +++ libgda-1.9.100/providers/odbc/gda-odbc-provider.c 2006-05-03 23:06:12.000000000 +0200 @@ -502,7 +502,7 @@ return FALSE; } - rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (UDWORD) name ); + rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (unsigned long) name ); if ( SQL_SUCCEEDED( rc )) { return TRUE; --- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c~ 2006-05-03 22:49:54.000000000 +0200 +++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c 2006-05-03 22:49:54.000000000 +0200 @@ -882,7 +882,7 @@ { GdaDataModel *model = NULL; gchar *sql; - gchar reference = NULL; + gchar *reference = NULL; GList *reclist; /* use the SQLite PRAGMA command to get the list of FK keys for the table */ --- libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c~ 2006-05-03 22:50:39.000000000 +0200 +++ libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c 2006-05-03 22:50:39.000000000 +0200 @@ -24,6 +24,7 @@ #include #include +#include #include "gda-sqlite.h" #include "gda-sqlite-recordset.h" #include "gda-sqlite-provider.h" --- libgda-1.9.100/providers/bdb/libmain.c~ 2006-05-04 22:41:59.000000000 +0200 +++ libgda-1.9.100/providers/bdb/libmain.c 2006-05-04 22:41:59.000000000 +0200 @@ -20,6 +20,7 @@ */ #include +#include #include "gda-bdb.h" const gchar *plugin_get_name (void); Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libgda.spec 14 Feb 2006 19:25:15 -0000 1.11 +++ libgda.spec 4 May 2006 21:12:41 -0000 1.12 @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -76,6 +76,7 @@ Patch0: libgda-1.9.100-configure.patch Patch1: libgda-1.9.100-sharp.patch Patch2: libgda-1.9.100-syslibs.patch +Patch3: libgda-1.9.100-64bit.patch %description libgda is a library that eases the task of writing @@ -211,6 +212,7 @@ %patch0 -p1 -b .configure %patch1 -p1 -b .sharp %patch2 -p1 -b .syslibs +%patch3 -p1 -b .64bit %build @@ -397,6 +399,9 @@ %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-5 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-4 - Bump release and rebuild for new gcc4.1 and glibc. - Make sqlite plugin use system sqlite not build in version From fedora-extras-commits at redhat.com Thu May 4 21:13:31 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:13:31 -0700 Subject: rpms/netpanzer import.log,1.1,1.2 Message-ID: <200605042113.k44LDX58005428@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5389 Modified Files: import.log Log Message: auto-import netpanzer-0.8-3 on branch devel from netpanzer-0.8-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/netpanzer/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 May 2006 21:11:44 -0000 1.1 +++ import.log 4 May 2006 21:13:31 -0000 1.2 @@ -0,0 +1 @@ +netpanzer-0_8-3:HEAD:netpanzer-0.8-3.src.rpm:1146777576 From fedora-extras-commits at redhat.com Thu May 4 21:13:32 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:13:32 -0700 Subject: rpms/netpanzer/devel gcc-4.1-extra-qualification.patch, NONE, 1.1 netpanzer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605042113.k44LDYDL005436@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5389/devel Modified Files: .cvsignore sources Added Files: gcc-4.1-extra-qualification.patch netpanzer.spec Log Message: auto-import netpanzer-0.8-3 on branch devel from netpanzer-0.8-3.src.rpm gcc-4.1-extra-qualification.patch: --- NEW FILE gcc-4.1-extra-qualification.patch --- diff -ur netpanzer-0.8.orig/src/Lib/Network/Address.hpp netpanzer-0.8/src/Lib/Network/Address.hpp --- netpanzer-0.8.orig/src/Lib/Network/Address.hpp 2004-10-14 10:22:50.000000000 -0300 +++ netpanzer-0.8/src/Lib/Network/Address.hpp 2006-05-01 05:58:05.000000000 -0300 @@ -34,7 +34,7 @@ /** resolves a hostname or IP-Number together with a port and returns a * new Address object. */ - static Address Address::resolve(const std::string& name, uint16_t port); + static Address resolve(const std::string& name, uint16_t port); /** returns the ip address of this Address as string */ std::string getIP() const; diff -ur netpanzer-0.8.orig/src/NetPanzer/Classes/PlayerState.hpp netpanzer-0.8/src/NetPanzer/Classes/PlayerState.hpp --- netpanzer-0.8.orig/src/NetPanzer/Classes/PlayerState.hpp 2004-12-25 20:58:39.000000000 -0200 +++ netpanzer-0.8/src/NetPanzer/Classes/PlayerState.hpp 2006-05-01 05:58:36.000000000 -0300 @@ -81,8 +81,8 @@ public: PlayerUnitConfig unit_config; - PlayerState::PlayerState(); - PlayerState::PlayerState(const PlayerState& other); + PlayerState(); + PlayerState(const PlayerState& other); void operator= (const PlayerState& other); diff -ur netpanzer-0.8.orig/src/NetPanzer/Interfaces/Console.cpp netpanzer-0.8/src/NetPanzer/Interfaces/Console.cpp --- netpanzer-0.8.orig/src/NetPanzer/Interfaces/Console.cpp 2004-11-22 14:19:54.000000000 -0200 +++ netpanzer-0.8/src/NetPanzer/Interfaces/Console.cpp 2006-05-01 05:58:56.000000000 -0300 @@ -46,7 +46,7 @@ setp(buf, buf+sizeof(buf)); } - FileStampStreamBuf::~FileStampStreamBuf() + ~FileStampStreamBuf() { sync(); if(file) --- NEW FILE netpanzer.spec --- Name: netpanzer Version: 0.8 Release: 3%{?dist} Summary: An Online Multiplayer Tactical Warfare Game Group: Amusements/Games License: GPL URL: http://netpanzer.berlios.de Source0: http://download.berlios.de/netpanzer/netpanzer-%{version}.tar.bz2 Patch0: gcc-4.1-extra-qualification.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jam, physfs-devel >= 0.1.9, desktop-file-utils, doxygen BuildRequires: SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2 #Requires: SDL >= 1.2.5, SDL_mixer >= 1.2, SDL_image >= 1.2, physfs >= 0.1.9 Requires: netpanzer-data = %{version} %description netPanzer is an online multiplayer tactical warfare game designed for FAST ACTION combat. Gameplay concentrates on the core -- no resource management is needed. The game is based on quick tactical action and unit management in real-time. Battles progress quickly and constantly as destroyed players respawn with a set of new units. Players can join or leave multiplayer games at any time. %prep %setup -q %patch0 -p1 # Strip \r from RELNOTES file sed -i 's/\r//' RELNOTES %build %configure jam %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT jam install # Install desktop item rm -f $RPM_BUILD_ROOT%{_datadir}/applications/netpanzer.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/netpanzer.xpm mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/netpanzer.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ netpanzer.desktop %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README RELNOTES TODO docs/serverhowto.html docs/tipofday.txt %{_bindir}/netpanzer %{_datadir}/applications/fedora-netpanzer.desktop %{_datadir}/icons/hicolor/48x48/apps/netpanzer.png %changelog * Thu May 4 2006 Hugo Cisneiros 0.8-3 - Changed netpanzer.png to comply with freedesktop.org standards. - Added scripts to update the icon cache after installing * Mon May 1 2006 Hugo Cisneiros 0.8-2 - Changed Package's RPM Group - Fixed Changelog entries to specify versions - Stripped '\r' EOL from RELNOTES file - Added COPYING file * Mon May 1 2006 Hugo Cisneiros 0.8-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/netpanzer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 May 2006 21:11:45 -0000 1.1 +++ .cvsignore 4 May 2006 21:13:32 -0000 1.2 @@ -0,0 +1 @@ +netpanzer-0.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/netpanzer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 May 2006 21:11:45 -0000 1.1 +++ sources 4 May 2006 21:13:32 -0000 1.2 @@ -0,0 +1 @@ +c08c1b703eac533407db02510deca68e netpanzer-0.8.tar.bz2 From fedora-extras-commits at redhat.com Thu May 4 21:13:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 14:13:35 -0700 Subject: rpms/libgda/FC-5 libgda-1.9.100-64bit.patch, NONE, 1.1 libgda.spec, 1.11, 1.12 Message-ID: <200605042113.k44LDbe3005464@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5431 Modified Files: libgda.spec Added Files: libgda-1.9.100-64bit.patch Log Message: * Thu May 4 2006 Hans de Goede 1:1.9.100-5 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) libgda-1.9.100-64bit.patch: --- NEW FILE libgda-1.9.100-64bit.patch --- --- libgda-1.9.100/libgda/gda-data-model-hash.c~ 2006-05-03 23:04:11.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-hash.c 2006-05-03 23:04:11.000000000 +0200 @@ -70,7 +70,7 @@ return GDA_DATA_MODEL_HASH (model)->priv->number_of_columns; } -static GdaRow * +GdaRow * gda_data_model_hash_get_row (GdaDataModelBase *model, gint row) { gint hash_entry; --- libgda-1.9.100/libgda/gda-data-model-array.c~ 2006-05-03 22:48:02.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-array.c 2006-05-03 22:48:02.000000000 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #define PARENT_TYPE GDA_TYPE_DATA_MODEL_BASE @@ -430,7 +431,7 @@ } if (! cur) { - g_set_error (error, 0, 0, _("No specified in "), node->name); + g_set_error (error, 0, 0, _("No specified in ")); clean_field_specs (fields); return NULL; } --- libgda-1.9.100/libgda/gda-data-model-hash.h~ 2006-05-03 23:03:48.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-hash.h 2006-05-03 23:03:48.000000000 +0200 @@ -60,6 +60,7 @@ gint rownum, GdaRow *row); +GdaRow *gda_data_model_hash_get_row (GdaDataModelBase *model, gint row); G_END_DECLS --- libgda-1.9.100/providers/postgres/utils.c~ 2006-05-03 23:08:57.000000000 +0200 +++ libgda-1.9.100/providers/postgres/utils.c 2006-05-03 23:08:57.000000000 +0200 @@ -289,7 +289,7 @@ break; case GDA_VALUE_TYPE_BLOB : blob = gda_postgres_blob_new (cnc); - gda_postgres_blob_set_id (GDA_POSTRES_BLOB (blob), atoi (thevalue)); + gda_postgres_blob_set_id (GDA_POSTGRES_BLOB (blob), atoi (thevalue)); gda_value_set_blob (value, blob); break; default : --- libgda-1.9.100/providers/odbc/gda-odbc-provider.c~ 2006-05-03 23:06:12.000000000 +0200 +++ libgda-1.9.100/providers/odbc/gda-odbc-provider.c 2006-05-03 23:06:12.000000000 +0200 @@ -502,7 +502,7 @@ return FALSE; } - rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (UDWORD) name ); + rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (unsigned long) name ); if ( SQL_SUCCEEDED( rc )) { return TRUE; --- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c~ 2006-05-03 22:49:54.000000000 +0200 +++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c 2006-05-03 22:49:54.000000000 +0200 @@ -882,7 +882,7 @@ { GdaDataModel *model = NULL; gchar *sql; - gchar reference = NULL; + gchar *reference = NULL; GList *reclist; /* use the SQLite PRAGMA command to get the list of FK keys for the table */ --- libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c~ 2006-05-03 22:50:39.000000000 +0200 +++ libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c 2006-05-03 22:50:39.000000000 +0200 @@ -24,6 +24,7 @@ #include #include +#include #include "gda-sqlite.h" #include "gda-sqlite-recordset.h" #include "gda-sqlite-provider.h" --- libgda-1.9.100/providers/bdb/libmain.c~ 2006-05-04 22:41:59.000000000 +0200 +++ libgda-1.9.100/providers/bdb/libmain.c 2006-05-04 22:41:59.000000000 +0200 @@ -20,6 +20,7 @@ */ #include +#include #include "gda-bdb.h" const gchar *plugin_get_name (void); Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/FC-5/libgda.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libgda.spec 14 Feb 2006 19:25:15 -0000 1.11 +++ libgda.spec 4 May 2006 21:13:34 -0000 1.12 @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -76,6 +76,7 @@ Patch0: libgda-1.9.100-configure.patch Patch1: libgda-1.9.100-sharp.patch Patch2: libgda-1.9.100-syslibs.patch +Patch3: libgda-1.9.100-64bit.patch %description libgda is a library that eases the task of writing @@ -211,6 +212,7 @@ %patch0 -p1 -b .configure %patch1 -p1 -b .sharp %patch2 -p1 -b .syslibs +%patch3 -p1 -b .64bit %build @@ -397,6 +399,9 @@ %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-5 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-4 - Bump release and rebuild for new gcc4.1 and glibc. - Make sqlite plugin use system sqlite not build in version From fedora-extras-commits at redhat.com Thu May 4 21:46:40 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:46:40 -0700 Subject: rpms/rapidsvn - New directory Message-ID: <200605042146.k44LkgBD005720@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689/rapidsvn Log Message: Directory /cvs/extras/rpms/rapidsvn added to the repository From fedora-extras-commits at redhat.com Thu May 4 21:46:41 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:46:41 -0700 Subject: rpms/rapidsvn/devel - New directory Message-ID: <200605042146.k44LkhmA005723@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689/rapidsvn/devel Log Message: Directory /cvs/extras/rpms/rapidsvn/devel added to the repository From fedora-extras-commits at redhat.com Thu May 4 21:46:57 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:46:57 -0700 Subject: rpms/rapidsvn Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605042146.k44LkxjC005772@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5739 Added Files: Makefile import.log Log Message: Setup of module rapidsvn --- NEW FILE Makefile --- # Top level Makefile for module rapidsvn all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 4 21:46:57 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:46:57 -0700 Subject: rpms/rapidsvn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605042147.k44LkxxD005775@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5739/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rapidsvn --- NEW 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 May 4 21:48:04 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:48:04 -0700 Subject: rpms/rapidsvn import.log,1.1,1.2 Message-ID: <200605042148.k44LmaRt005849@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5812 Modified Files: import.log Log Message: auto-import rapidsvn-0.9.1-3 on branch devel from rapidsvn-0.9.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 May 2006 21:46:57 -0000 1.1 +++ import.log 4 May 2006 21:48:04 -0000 1.2 @@ -0,0 +1 @@ +rapidsvn-0_9_1-3:HEAD:rapidsvn-0.9.1-3.src.rpm:1146779276 From fedora-extras-commits at redhat.com Thu May 4 21:48:05 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:48:05 -0700 Subject: rpms/rapidsvn/devel rapidsvn-0.9.1-gcc41.patch, NONE, 1.1 rapidsvn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605042148.k44Lmbwm005851@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5812/devel Modified Files: .cvsignore sources Added Files: rapidsvn-0.9.1-gcc41.patch rapidsvn.spec Log Message: auto-import rapidsvn-0.9.1-3 on branch devel from rapidsvn-0.9.1-3.src.rpm rapidsvn-0.9.1-gcc41.patch: --- NEW FILE rapidsvn-0.9.1-gcc41.patch --- --- rapidsvn-0.9.1/src/action.hpp 2006-02-14 15:30:20.000000000 +0100 +++ rapidsvn-0.9.1-edited/src/action.hpp 2006-04-03 23:24:33.000000000 +0200 @@ -300,7 +300,7 @@ * @return temporary filename */ svn::Path - Action::GetPathAsTempFile ( + GetPathAsTempFile ( const svn::Path & path, const svn::Revision & revision = svn::Revision::HEAD); --- rapidsvn-0.9.1/src/rapidsvn_frame.hpp 2006-02-14 15:30:20.000000000 +0100 +++ rapidsvn-0.9.1-edited/src/rapidsvn_frame.hpp 2006-04-03 23:28:22.000000000 +0200 @@ -161,7 +161,7 @@ // Enable/disable action menu items bool - RapidSvnFrame::ValidateIDActionFlags (int id, unsigned int selectionActionFlags); + ValidateIDActionFlags (int id, unsigned int selectionActionFlags); void OnUpdateCommand (wxUpdateUIEvent & updateUIEvent); const svn::Targets --- rapidsvn-0.9.1/src/preferences_dlg.cpp 2006-02-14 15:30:20.000000000 +0100 +++ rapidsvn-0.9.1-edited/src/preferences_dlg.cpp 2006-04-03 23:30:23.000000000 +0200 @@ -95,7 +95,7 @@ { public: - ProgramsPanel::ProgramsPanel (wxWindow* parent, Preferences * prefs) + ProgramsPanel (wxWindow* parent, Preferences * prefs) : wxPanel (parent), m_prefs (prefs) { InitializeData (); --- NEW FILE rapidsvn.spec --- Name: rapidsvn Version: 0.9.1 Release: 3%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools License: GPL URL: http://www.rapidsvn.org/ Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz Patch0: rapidsvn-0.9.1-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: apr-devel, apr-util-devel, neon-devel BuildRequires: libtool >= 1.4.2 # For doc generation; rapidsvn needs the "dot" tool from graphviz BuildRequires: docbook-style-xsl >= 1.58.1, doxygen, libxslt >= 1.0.27 BuildRequires: graphviz BuildRequires: wxGTK-devel >= 2.4.2 BuildRequires: desktop-file-utils %description RapidSVN is a GUI front-end for the Subversion revision control system. It allows access to most of the features of Subversion through a user-friendly interface. %package -n svncpp Summary: C++ bindings for the Subversion client library Group: Development/Libraries License: LGPL BuildRequires: subversion-devel # for test framework BuildRequires: cppunit-devel Requires: subversion Requires(pre): /sbin/ldconfig Requires(post): /sbin/ldconfig %description -n svncpp svncpp is a C++ wrapper for the C Subversion client library which abstracts many parts of the C API and provides an object-oriented programming interface. %package -n svncpp-devel Summary: Development resources for the 'svncpp' library Group: Development/Libraries License: LGPL Requires: svncpp = %{version}-%{release} %description -n svncpp-devel Development resources for the 'svncpp' C++ client library for Subversion. Install this package if you need to compile an application that requires the 'svncpp' library. %prep %setup -q %patch0 -p1 %{__cat} <rapidsvn.desktop [Desktop Entry] Encoding=UTF-8 Name=RapidSVN GenericName=Subversion client Comment=Manage Subversion repositories Exec=rapidsvn Icon=rapidsvn.png Terminal=false Type=Application Categories=Application;Development;GNOME; Version=0.9.4 EOF %build %configure \ --disable-static \ --disable-no-exceptions \ --with-svn-lib=%{_libdir} \ --with-apu-config=%{_bindir}/apu-1-config \ --with-apr-config=%{_bindir}/apr-1-config \ --with-docbook-xsl-manpages=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool pushd doc/manpage iconv --from-code ISO-8859-1 --to-code UTF-8 --output rapidsvn.1.utf8 rapidsvn.1 mv rapidsvn.1.utf8 rapidsvn.1 popd %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} # Install desktop file and icon %{__install} -D -m 644 src/res/bitmaps/svn.xpm %{buildroot}%{_datadir}/pixmaps/rapidsvn.xpm %{__install} -d -m 755 %{buildroot}%{_datadir}/applications/ desktop-file-install --vendor fedora \ --add-category X-Fedora \ --dir %{buildroot}%{_datadir}/applications \ rapidsvn.desktop # Install manpage %{__install} -D -m 644 doc/manpage/rapidsvn.1 %{buildroot}%{_mandir}/man1/rapidsvn.1 # Remove libtool stuff rm -f %{buildroot}%{_libdir}/libsvncpp.{a,la} %check -n svncpp pushd src/tests/svncpp make ./svncpptest | grep OK if [ $? != 0 ]; then echo "svncpp tests failed" exit 5 fi %clean rm -rf %{buildroot} %post -n svncpp -p /sbin/ldconfig %postun -n svncpp -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS CHANGES FDL.txt GPL.txt LICENSE.txt README %{_bindir}/rapidsvn %{_datadir}/applications/fedora-rapidsvn.desktop %{_datadir}/pixmaps/rapidsvn.xpm %{_mandir}/man1/* %files -n svncpp %doc LGPL.txt %{_libdir}/libsvncpp.so.* %files -n svncpp-devel %doc LGPL.txt doc/svncpp/html %{_includedir}/svncpp/ %{_libdir}/libsvncpp.so %changelog * Wed May 03 2006 Tim Jackson 0.9.1-3 - libtool hack to fix RPATH issue * Sat Apr 29 2006 Tim Jackson 0.9.1-2 - Update list of docs inc. add GPL, LGPL docs and LICENSE.txt - Remove autoconf from BR - Fix manpage generation and add manpage to package - Add graphviz BR for correct doc generation - Add --disable-no-exceptions per README - Use --disable-static since we don't use the static libs - Spin off svncpp and svncpp-devel subpackages - svncpp has ldconfig in post/postun - Add --with-svn-lib which should fix build on x86_64 - Add %check section using package's inbuilt tests (requires cppunit) * Thu Apr 27 2006 Tim Jackson 0.9.1-1 - Initial package for Fedora Extras; based originally on an old DAG spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 May 2006 21:46:57 -0000 1.1 +++ .cvsignore 4 May 2006 21:48:05 -0000 1.2 @@ -0,0 +1 @@ +rapidsvn-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 May 2006 21:46:57 -0000 1.1 +++ sources 4 May 2006 21:48:05 -0000 1.2 @@ -0,0 +1 @@ +ba03034db35912c7b51b146cc7e6090e rapidsvn-0.9.1.tar.gz From fedora-extras-commits at redhat.com Thu May 4 21:56:09 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:56:09 -0700 Subject: owners owners.list,1.939,1.940 Message-ID: <200605042156.k44LuBC2005966@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5949 Modified Files: owners.list Log Message: Added netpanzer owner (hugo at devin.com.br) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.939 retrieving revision 1.940 diff -u -r1.939 -r1.940 --- owners.list 4 May 2006 03:19:41 -0000 1.939 +++ owners.list 4 May 2006 21:56:08 -0000 1.940 @@ -804,6 +804,7 @@ Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|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|netpanzer|An Online Multiplayer Tactical Warfare Game|hugo at devin.com.br|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|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|new|A simple template system|redhat at flyn.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 4 21:57:13 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:57:13 -0700 Subject: owners owners.list,1.940,1.941 Message-ID: <200605042157.k44LvFHB005999@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5982 Modified Files: owners.list Log Message: New package: rapidsvn (bug #190139) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.940 retrieving revision 1.941 diff -u -r1.940 -r1.941 --- owners.list 4 May 2006 21:56:08 -0000 1.940 +++ owners.list 4 May 2006 21:57:13 -0000 1.941 @@ -1361,6 +1361,7 @@ Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|rapidsvn|Graphical interface for the Subversion revision control system|rpm at timj.co.uk|extras-qa at fedoraproject.org| Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 5 02:10:41 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 May 2006 19:10:41 -0700 Subject: extras-buildsys/builder Builder.py,1.2,1.3 Message-ID: <200605050210.k452Af09018172@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128/builder Modified Files: Builder.py Log Message: Clean up a few more bugs Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/Builder.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Builder.py 3 May 2006 04:04:27 -0000 1.2 +++ Builder.py 5 May 2006 02:10:38 -0000 1.3 @@ -469,9 +469,9 @@ elif isinstance(cmd, Commands.PlgCommandUnlockRepo): self._handle_unlock_repo_request(cmd) elif isinstance(cmd, Commands.PlgCommandJobStatus): - reply = self._handle_job_status_request() + reply = self._handle_job_status_request(cmd) if reply: - self._queued_cmds = self._queued_cmds + reply + self._queued_cmds.append(reply) def _process_server_response(self, response): """Process the server's response.""" From fedora-extras-commits at redhat.com Fri May 5 02:10:42 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 May 2006 19:10:42 -0700 Subject: extras-buildsys/server Builder.py,1.35,1.36 Message-ID: <200605050210.k452AglW018182@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128/server Modified Files: Builder.py Log Message: Clean up a few more bugs Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Builder.py 3 May 2006 04:04:28 -0000 1.35 +++ Builder.py 5 May 2006 02:10:39 -0000 1.36 @@ -59,6 +59,8 @@ self._weight = weight self._type = btype self._seq_gen = Commands.SequenceGenerator() + self._lock = threading.Lock() + self._cmd_queue = [] try: type, rest = urllib.splittype(address) @@ -185,7 +187,6 @@ building_jobs = cmd.jobs() reported_uniqids = [] new_cmds = [] - print "Building Jobs: %s" % building_jobs for item in building_jobs: (uniqid, status) = cmd.get_job(item) try: @@ -213,9 +214,44 @@ self._prepping_jobs = True del reported_uniqids - print "New Commands: %s" % new_cmds return new_cmds + def _find_and_remove_cmd_for_ack(self, ack, old_cmd_type): + """Find a command in the sent command queue by sequence number + and command type. Remove the command from the command queue + and return it.""" + + old_cmd = None + self._lock.acquire() + for queued_cmd in self._cmd_queue: + if queued_cmd.seq() == ack.acked_seq() and isinstance(queued_cmd, old_cmd_type): + old_cmd = queued_cmd + self._cmd_queue.remove(queued_cmd) + break + self._lock.release() + return old_cmd + + def _handle_new_job_ack(self, ack): + """Handle a NewJobAck command by notifying the parent job + that this archjob is now in progress.""" + + old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandNewJobReq) + if old_cmd: + parent = old_cmd.parent_job() + archjob_id = ack.archjob_id() + archjob = ArchJob.ArchJob(self, parent, archjob_id, old_cmd.target_dict()) + self._jobs[archjob_id] = archjob + parent.add_arch_job(archjob) + + def _handle_job_status_ack(self, ack): + old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandJobStatus) + if old_cmd: + archjob_id = ack.archjob_id() + status = ack.status() + job = self._jobs[archjob_id] + job.set_builder_job_status(status) + + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt class BuildingJobsCheck(threading.Thread): @@ -479,8 +515,6 @@ def __init__(self, manager, cfg, address, weight, btype): Builder.__init__(self, manager, cfg, address, weight, btype) self._last_contact = 0 - self._lock = threading.Lock() - self._cmd_queue = [] def _init_builder(self, target_list): self._target_list = target_list @@ -497,27 +531,6 @@ def request_job_files(self, archjob): pass - def _handle_new_job_ack(self, ack): - """Handle a NewJobAck command by finding the original command - sent to the builder, removing it from the command queue, and notifying - the parent job that this archjob is now in progress.""" - - old_cmd = None - self._lock.acquire() - for queued_cmd in self._cmd_queue: - if queued_cmd.seq() == ack.acked_seq() and isinstance(queued_cmd, Commands.PlgCommandNewJobReq): - old_cmd = queued_cmd - self._cmd_queue.remove(queued_cmd) - break - self._lock.release() - - if old_cmd: - parent = old_cmd.parent_job() - archjob_id = ack.archjob_id() - archjob = ArchJob.ArchJob(self, parent, archjob_id, old_cmd.target_dict()) - self._jobs[archjob_id] = archjob - parent.add_arch_job(archjob) - def _dispatch_command(self, cmd): name = cmd.name() if isinstance(cmd, Commands.PlgCommandSlots): @@ -538,6 +551,8 @@ self._lock.acquire() self._cmd_queue = self._cmd_queue + status_reqs self._lock.release() + elif isinstance(cmd, Commands.PlgCommandJobStatusAck): + self._handle_job_status_ack(cmd) else: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) From fedora-extras-commits at redhat.com Fri May 5 02:10:41 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 May 2006 19:10:41 -0700 Subject: extras-buildsys/common Commands.py,1.2,1.3 Message-ID: <200605050210.k452AfjN018178@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128/common Modified Files: Commands.py Log Message: Clean up a few more bugs Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Commands.py 3 May 2006 04:04:28 -0000 1.2 +++ Commands.py 5 May 2006 02:10:39 -0000 1.3 @@ -127,6 +127,10 @@ cmd = PlgCommandNewJobAck._deserialize(args) elif name == CMD_NAME_BUILDING_JOBS: cmd = PlgCommandBuildingJobs._deserialize(args) + elif name == CMD_NAME_JOB_STATUS_REQ: + cmd = PlgCommandJobStatus._deserialize(args) + elif name == CMD_NAME_JOB_STATUS_ACK: + cmd = PlgCommandJobStatusAck._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't @@ -472,7 +476,7 @@ except KeyError, TypeError: raise ValueError("No 'archjob_id' argument found.") - return PlgCommandJobStatusReq(archjob_id) + return PlgCommandJobStatus(archjob_id) _deserialize = staticmethod(_deserialize) @@ -485,7 +489,7 @@ return self._archjob_id def __str__(self): - return "%s(seq: %d, target_dict: %s, srpm_url: %s)" % (self._name, self._seq, self._archjob_id) + return "%s(seq: %d, archjob_id: %s)" % (self._name, self._seq, self._archjob_id) class PlgCommandJobStatusAck(PlgCommandAck): From fedora-extras-commits at redhat.com Fri May 5 02:13:18 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 4 May 2006 19:13:18 -0700 Subject: fedora-security/tools package-release,1.1,1.2 Message-ID: <200605050213.k452DI68018225@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18207 Modified Files: package-release Log Message: Use fuzzy matching rather than strict matching. Index: package-release =================================================================== RCS file: /cvs/fedora/fedora-security/tools/package-release,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- package-release 2 May 2006 20:29:31 -0000 1.1 +++ package-release 5 May 2006 02:13:16 -0000 1.2 @@ -17,37 +17,55 @@ # Global variables my ($owner_file, $mirror_host, $mirror_path, @releases); -my ($distro, $package, $desc, $owner, $qa, $cc); $owner_file='http://cvs.fedora.redhat.com/viewcvs/*checkout*/owners/owners.list?root=extras'; $mirror_host='download.fedora.redhat.com'; $mirror_path='/pub/fedora/linux/extras'; @releases=qw(3 4 5 development); -my $owner_content = get($owner_file) - or die "Couldn't get $owner_file"; +sub get_owner_content { + my $match = pop; -foreach (split(/\n/, $owner_content)) { - next if /^#/; - chomp; + my ($distro, $package, $desc, $owner, $qa, $cc); - ($distro, $package, $desc, $owner, $qa, $cc) = split(/\|/, $_); + my %owner; + + my $owner_content = get($owner_file) + or die "Couldn't get $owner_file"; + + foreach (split(/\n/, $owner_content)) { + next if /^#/; + chomp; + + ($distro, $package, $desc, $owner, $qa, $cc) = split(/\|/, $_); + + next if ( $package !~ m/$match/i); + + $owner{$package} = {}; + $owner{$package}->{'product'} = $distro; + $owner{$package}->{'package'} = $package; + $owner{$package}->{'description'} = $desc; + $owner{$package}->{'owner'} = $owner; + $owner{$package}->{'qacontact'} = $qa; + $owner{$package}->{'cclist'} = $cc; + } + + return %owner; - last if $package eq $ARGV[0]; - undef $package; # If we don't undef this, we fall through } -unless ($package) { - print "Could not find package $ARGV[0] in $owner_file\n"; +my $package = $ARGV[0]; + +my %owner = get_owner_content($package); + +if (!keys(%owner)) { + print "Could not find package \"$package\" in $owner_file\n"; exit 1; } -print "Found package $package in owners.list:\n"; -print " Distro:\t$distro\n"; -print " Desc:\t\t$desc\n"; -print " Owner:\t$owner\n"; -print " CC:\t\t$cc\n"; -print " Releases and versions:\n"; +foreach (keys(%owner)) { +print "Found package $_ in owners.list:\n"; +} my $ftp = Net::FTP->new($mirror_host, Debug => 0) or die "Cannot connect to $mirror_host: $@"; @@ -56,7 +74,7 @@ foreach my $release (@releases) { - my ($f, $dir, $files, $rev, $ver); + my ($f, $dir, $files, $rev, $ver, $name); $dir = "$mirror_path/$release/SRPMS"; $release eq "development" && ($release = "dev"); @@ -66,11 +84,13 @@ foreach my $f (@$files) { chomp($f); $f =~ s/$dir\///; - next unless $f =~ /^$package-(.*)\.src\.rpm$/; - next if $1 =~ /-.*-/; + next unless $f =~ /^(.*$package.*)-([^\-]*)-([^\-]*)\.src\.rpm$/; + $name = $1; + $ver = $2; + $rev = $3; - ($ver, $rev) = $1 =~ /^([^-]+)-([^-]+)$/; - - print " $release\t$ver\t$rev\t$dir/$f\n"; + print " $release\t$name\t$ver\t$rev\t$f\n"; } } + +$ftp->quit; From fedora-extras-commits at redhat.com Fri May 5 02:17:44 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 4 May 2006 19:17:44 -0700 Subject: fedora-security/tools package-release,1.2,1.3 Message-ID: <200605050217.k452HiNj018263@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18245 Modified Files: package-release Log Message: Ignore case when searching the filelist. Index: package-release =================================================================== RCS file: /cvs/fedora/fedora-security/tools/package-release,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- package-release 5 May 2006 02:13:16 -0000 1.2 +++ package-release 5 May 2006 02:17:42 -0000 1.3 @@ -58,7 +58,7 @@ my %owner = get_owner_content($package); -if (!keys(%owner)) { +if (!keys(%owner) or $package eq '') { print "Could not find package \"$package\" in $owner_file\n"; exit 1; } @@ -84,7 +84,7 @@ foreach my $f (@$files) { chomp($f); $f =~ s/$dir\///; - next unless $f =~ /^(.*$package.*)-([^\-]*)-([^\-]*)\.src\.rpm$/; + next unless $f =~ /^(.*$package.*)-([^\-]*)-([^\-]*)\.src\.rpm$/i; $name = $1; $ver = $2; $rev = $3; From fedora-extras-commits at redhat.com Fri May 5 07:46:38 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 May 2006 00:46:38 -0700 Subject: rpms/raidem-music/FC-5 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE license.txt, 1.1, NONE raidem-music.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <200605050746.k457kehM030032@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem-music/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30017/FC-5 Removed Files: .cvsignore Makefile branch license.txt raidem-music.spec sources Log Message: remove FC-5 branch because of special noarch content handling discussed on fedora-games-list --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- license.txt DELETED --- --- raidem-music.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri May 5 07:48:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 May 2006 00:48:12 -0700 Subject: rpms/raidem-music/devel raidem-music.spec,1.1,1.2 Message-ID: <200605050748.k457mEan030069@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem-music/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30052 Modified Files: raidem-music.spec Log Message: remove %{?dist} for noarch content packages as discussed on fedora-games-list Index: raidem-music.spec =================================================================== RCS file: /cvs/extras/rpms/raidem-music/devel/raidem-music.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- raidem-music.spec 30 Apr 2006 21:22:53 -0000 1.1 +++ raidem-music.spec 5 May 2006 07:48:12 -0000 1.2 @@ -1,6 +1,6 @@ Name: raidem-music Version: 1.0 -Release: 1%{?dist} +Release: 1 Summary: Background music for the game raidem Group: Amusements/Games License: Creative Commons BY / Attribution From fedora-extras-commits at redhat.com Fri May 5 09:41:39 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 02:41:39 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.12,1.13 Message-ID: <200605050941.k459ff3O002628@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2611 Modified Files: php-eaccelerator.spec Log Message: Fix typo that probably prevented the build. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- php-eaccelerator.spec 11 Apr 2006 16:57:47 -0000 1.12 +++ php-eaccelerator.spec 5 May 2006 09:41:39 -0000 1.13 @@ -44,7 +44,7 @@ phpize %configure \ %ifarch ppc -% --with-eaccelerator-userid="%{userid}" + --with-eaccelerator-userid="%{userid}" %endif %{__make} %{?_smp_mflags} From fedora-extras-commits at redhat.com Fri May 5 09:50:00 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 02:50:00 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.13,1.14 Message-ID: <200605050950.k459o2TC002769@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2746 Modified Files: php-eaccelerator.spec Log Message: Fix api version detection macro when php or gcc aren't installed. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- php-eaccelerator.spec 5 May 2006 09:41:39 -0000 1.13 +++ php-eaccelerator.spec 5 May 2006 09:50:00 -0000 1.14 @@ -1,6 +1,7 @@ %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) -%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.2)} +%define php_includes %(php-config --includes 2>/dev/null || echo) +%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h %{php_includes} - 2>/dev/null | tail -1) +%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.3)} %define module_version 0.9.5 %define prever beta2 From fedora-extras-commits at redhat.com Fri May 5 11:41:33 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 04:41:33 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.14,1.15 Message-ID: <200605051141.k45BfZPM008149@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8132 Modified Files: php-eaccelerator.spec Log Message: Keep trying to get the API version detection to work in all possible cases. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- php-eaccelerator.spec 5 May 2006 09:50:00 -0000 1.14 +++ php-eaccelerator.spec 5 May 2006 11:41:33 -0000 1.15 @@ -1,11 +1,15 @@ -%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%define php_includes %(php-config --includes 2>/dev/null || echo) -%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h %{php_includes} - 2>/dev/null | tail -1) -%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.3)} +# Useful defaults when building in chroots on systems where PHP is unavailable +%define default_extdir %{_libdir}/php4 +%define default_apiver 20041225 +%define default_version 5.1.3 %define module_version 0.9.5 %define prever beta2 +%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) +%define php_apiver %(php -i 2>/dev/null | sed -n 's/^PHP API => //p' 2>/dev/null || echo %{default_apiver}) +%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} + # This is the apache userid, only used for sysvipc semaphores which is the # default on ppc since spinlock is not detected %define userid 48 @@ -13,7 +17,7 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 0.1.%{prever}%{?dist} +Release: 0.2.%{prever}%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ @@ -97,7 +101,12 @@ %changelog -* Tue Apr 11 2006 Matthias Saou 5.1.2_0.9.5-0.1.beta2 +* Fri May 5 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 +- Rework heavily the API version requirement detection, should work with + chroots builds where PHP isn't installed outside. +- Replace the CC way of getting the API version with php -i output. + +* Tue Apr 11 2006 Matthias Saou 5.1.x_0.9.5-0.1.beta2 - Update to 0.9.5-beta2. * Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.3 From fedora-extras-commits at redhat.com Fri May 5 12:16:09 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:16:09 -0700 Subject: rpms/kdemultimedia-extras/devel .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605051216.k45CGBZC010518@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10497 Modified Files: .cvsignore kdemultimedia-extras.spec sources Log Message: * Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 - omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) - 3.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Mar 2006 12:39:58 -0000 1.2 +++ .cvsignore 5 May 2006 12:16:08 -0000 1.3 @@ -1 +1 @@ -kdemultimedia-3.5.1-patched.tar.bz2 +kdemultimedia-3.5.2-patched.tar.bz2 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdemultimedia-extras.spec 5 Apr 2006 18:03:01 -0000 1.2 +++ kdemultimedia-extras.spec 5 May 2006 12:16:08 -0000 1.3 @@ -18,8 +18,6 @@ %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode -#define to include/build juk, undef not -%define juk juk # to make sure no nonfree bits get included BuildConflicts: akode-extras # debugging: to make sure no extras bits (accidentally) get excluded @@ -33,6 +31,7 @@ %define _with_akode --with-akode BuildRequires: akode-extras %define _with_lame --with-lame --disable-lametest +%define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -42,6 +41,9 @@ %endif %if "%{?fedora}" > "4" %define gst gstreamer08 +BuildRequires: libXxf86vm-devel +# likely only required for nonfree -- Rex +BuildRequires: libXxf86dga-devel %endif %if "%{?rhel}" > "3" %define _with_gstreamer --with-gstreamer @@ -58,28 +60,27 @@ Summary: Extras for KDE multimedia applications %endif %if "%{?nonfree}" == "1" -Name: kdemultimedia-nonfree +Name: kdemultimedia-extras-nonfree Summary: Nonfree Extras for KDE multimedia applications %endif Group: Applications/Multimedia Epoch: 6 -Version: 3.5.1 -Release: 8%{?dist}%{?kde} +Version: 3.5.2 +Release: 3%{?dist}%{?kde} License: GPL -%if "%{?nonfree}" == "1" -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 -%else +%if "%{?patched:1}" == "1" # From Core's kdemultimedia pkg -Source0: kdemultimedia-3.5.1-patched.tar.bz2 +Source0: kdemultimedia-%{version}-patched.tar.bz2 +%else +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 %endif Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} -BuildRequires: libtool %if "%{is_release}" != "1" BuildRequires: automake %endif @@ -113,6 +114,8 @@ ## kde-redhat patches # unconditinally include oggvorbis_artsplugin Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch +# exclude kfile_mpeg +Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch # akode: http://bugs.kde.org/116958 @@ -151,26 +154,27 @@ %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } -Requires: kdemultimedia >= %{epoch}:%{version} +Requires: kdemultimedia = %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) -%{?juk:* juk (libtunepimp)} +* juk (libtunepimp) * kfile-plugins: flac, mpc (taglib) %endif %if "%{?nonfree}" == "1" +Obsoletes: kdemultimedia-nonfree < %{epoch}:%{version}-%{release} # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} -%{?debug:BuildConflicts: kdemultimedia-nonfree} +%{?debug:BuildConflicts: kdemultimedia-extras-nonfree} Requires: kdemultimedia = %{epoch}:%{version} # for main akode_artsplugins bits -Requires: kdemultimedia-extras >= %{epoch}:%{version} +Requires: kdemultimedia-extras = %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: * akode_artsplugin (akode-extras), -* kfile-plugins: mp3 (taglib), +* kfile-plugins: mp3 (taglib), mpeg * krec mp3 export (lame), * mpeglib_artsplugin, * xine_artsplugin (xine-lib) @@ -204,7 +208,6 @@ DO_NOT_COMPILE="" -%{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} @@ -241,14 +244,14 @@ %endif %if "%{?extras}" == "1" -for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make %{?_smp_mflags} -C $module done %endif %if "%{?nonfree}" == "1" -for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make %{?_smp_mflags} -C $module done %endif @@ -261,17 +264,17 @@ %endif %if "%{?extras}" == "1" -for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" desktop-file-install --vendor="fedora" \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -%endif +#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -287,8 +290,8 @@ %endif %if "%{?nonfree}" == "1" -for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits @@ -359,8 +362,7 @@ %endif %if "%{?extras}" == "1" -# Since the icons come from juk -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -372,7 +374,7 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -%endif +#endif %endif %if "%{?nonfree}" == "1" @@ -413,7 +415,7 @@ %files -f extras.list %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{?juk:%dir %{_datadir}/apps/juk/} +%dir %{_datadir}/apps/juk/ %endif %if "%{?nonfree}" == "1" @@ -433,8 +435,24 @@ %changelog -* Wed Apr 05 2006 Rex Dieter 6:3.5.1-8 -- -extras: Requires: kdemultimedia >= 6:3.5.1 +* Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 +- omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) + +* Tue Mar 28 2006 Rex Dieter 6:3.5.2-2 +- -extras-nonfree: (fix) Obsoletes: kdemultimedia-nonfree + +* Mon Mar 20 2006 Rex Dieter 6:3.5.2-1 +- 3.5.2 + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-10 +- fc5: BR: libXxf86vm-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-9 +- fc5: BR: libXxf86dga-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-8 +- -extras-nonfree: rename -nonfree -> -extras-nonfree +- -extras-nonfree: drop 0.lvn from Release * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7 - kfile-plugins/mp3: -extras -> -nonfree Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Mar 2006 12:39:58 -0000 1.2 +++ sources 5 May 2006 12:16:08 -0000 1.3 @@ -1 +1 @@ -31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2 +54f9947051ee5cf50c81a5ea382943f1 kdemultimedia-3.5.2-patched.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 12:18:46 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 5 May 2006 05:18:46 -0700 Subject: rpms/scim-tables/FC-3 .cvsignore, 1.3, 1.4 scim-tables.spec, 1.10, 1.11 sources, 1.5, 1.6 tables-skip-ja-ko.patch, 1.1, 1.2 Message-ID: <200605051218.k45CInif010623@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10591 Modified Files: .cvsignore scim-tables.spec sources tables-skip-ja-ko.patch Log Message: sync with FE4: - obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt) * Thu Mar 2 2006 Jens Petersen - add %%indic_tables build switch * Thu Feb 9 2006 Jens Petersen - update filelist since moduledir is now api-versioned * Fri Jan 13 2006 Jens Petersen - update to 0.5.6 release - update tables-skip-ja-ko.patch - updates filelist for chinese tables Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Sep 2005 06:38:51 -0000 1.3 +++ .cvsignore 5 May 2006 12:18:46 -0000 1.4 @@ -1,2 +1 @@ -scim-tables-0.5.3.tar.gz -indic-icons-1.tar.gz +scim-tables-0.5.6.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-tables.spec 27 Dec 2005 06:44:56 -0000 1.10 +++ scim-tables.spec 5 May 2006 12:18:46 -0000 1.11 @@ -1,8 +1,11 @@ # set to include Japanese and Korean tables %define jk_tables 0 +# set to include Indic tables +%define indic_tables 1 + Name: scim-tables -Version: 0.5.5 +Version: 0.5.6 Release: 1%{?dist} Summary: SCIM Generic Table IMEngine @@ -14,6 +17,9 @@ BuildRequires: scim-devel, gtk2-devel BuildRequires: gettext-devel +%if !%{jk_tables} +Obsoletes: scim-tables-japanese < 0.5.6, scim-tables-korean < 0.5.6 +%endif Requires: scim Patch1: tables-skip-ja-ko.patch @@ -36,6 +42,7 @@ %description arabic This package contains scim-tables files for Chinese input. +%if %{indic_tables} %package bengali Summary: SCIM tables for Bengali Group: System Environment/Libraries @@ -43,6 +50,7 @@ %description bengali This package contains scim-tables files for Bengali input. +%endif %package chinese Summary: SCIM tables for Chinese @@ -53,6 +61,7 @@ %description chinese This package contains scim-tables files for Chinese input. +%if %{indic_tables} %package gujarati Summary: SCIM tables for Gujarati Group: System Environment/Libraries @@ -68,6 +77,7 @@ %description hindi This package contains scim-tables files for Hindi input. +%endif %if %{jk_tables} %package japanese @@ -80,6 +90,7 @@ This package contains scim-tables files for Japanese. %endif +%if %{indic_tables} %package kannada Summary: SCIM tables for Kannada Group: System Environment/Libraries @@ -87,6 +98,7 @@ %description kannada This package contains scim-tables files for Kannada input. +%endif %if %{jk_tables} %package korean @@ -99,6 +111,7 @@ This package contains scim-tables files for Korean. %endif +%if %{indic_tables} %package malayalam Summary: SCIM tables for Malayalam scripts Group: System Environment/Libraries @@ -106,6 +119,7 @@ %description malayalam This package contains scim-tables files for Malayalam languages. +%endif %package nepali Summary: SCIM tables for @@ -113,8 +127,9 @@ Requires: scim-tables = %{version} %description nepali -This package contains scim-tables files for input. +This package contains scim-tables files for Nepali input. +%if %{indic_tables} %package punjabi Summary: SCIM tables for Punjabi Group: System Environment/Libraries @@ -122,6 +137,7 @@ %description punjabi This package contains scim-tables files for Punjabi input. +%endif %package russian Summary: SCIM tables for Russian @@ -131,6 +147,7 @@ %description russian This package contains scim-tables files for Russian input. +%if %{indic_tables} %package tamil Summary: SCIM tables for Tamil Group: System Environment/Libraries @@ -138,6 +155,7 @@ %description tamil This package contains scim-tables files for Tamil input. +%endif %package thai Summary: SCIM tables for Thai @@ -147,6 +165,7 @@ %description thai This package contains scim-tables files for Thai input. +%if %{indic_tables} %package telugu Summary: SCIM tables for Telugu Group: System Environment/Libraries @@ -154,6 +173,7 @@ %description telugu This package contains scim-tables files for Telugu input. +%endif %package vietnamese Summary: SCIM tables for Vietnamese @@ -192,7 +212,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.la + +%if !%{indic_tables} +rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Bengali,Gujarati,Hindi,Kannada,Malayalam,Punjabi,Tamil,Telugu}-* +%endif %find_lang %{name} @@ -210,8 +234,8 @@ %files -f %{name}.lang %defattr(-, root, root, -) %{_bindir}/scim-make-table -%{_libdir}/scim-1.0/IMEngine/table.so -%{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so +%{_libdir}/scim-1.0/*/IMEngine/table.so +%{_libdir}/scim-1.0/*/SetupUI/table-imengine-setup.so %{_datadir}/scim/icons/table.png %{_mandir}/man1/scim-make-table.1* @@ -230,6 +254,7 @@ %{_datadir}/scim/icons/Arabic.png +%if %{indic_tables} %files bengali %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -237,13 +262,14 @@ %{_datadir}/scim/tables/Bengali-probhat.bin %{_datadir}/scim/icons/Bengali-inscript.png %{_datadir}/scim/icons/Bengali-probhat.png - +%endif %files chinese %defattr(-, root, root, -) %doc tables/zh/README-*.txt %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Array30.bin +%{_datadir}/scim/tables/CNS11643.bin %{_datadir}/scim/tables/CangJie*.bin %{_datadir}/scim/tables/Cantonese.bin %{_datadir}/scim/tables/CantonHK.bin @@ -258,8 +284,9 @@ %{_datadir}/scim/tables/Wu.bin %{_datadir}/scim/tables/Wubi.bin %{_datadir}/scim/tables/Ziranma.bin -%{_datadir}/scim/tables/ZhuYin.bin +%{_datadir}/scim/tables/ZhuYin*.bin %{_datadir}/scim/icons/Array30.png +%{_datadir}/scim/icons/CNS11643.png %{_datadir}/scim/icons/CangJie*.png %{_datadir}/scim/icons/Cantonese.png %{_datadir}/scim/icons/CantonHK.png @@ -277,6 +304,7 @@ %{_datadir}/scim/icons/ZhuYin.png +%if %{indic_tables} %files gujarati %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -285,7 +313,6 @@ %{_datadir}/scim/icons/Gujarati-inscript.png %{_datadir}/scim/icons/Gujarati-phonetic.png - %files hindi %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -293,7 +320,7 @@ %{_datadir}/scim/tables/Hindi-phonetic.bin %{_datadir}/scim/icons/Hindi-inscript.png %{_datadir}/scim/icons/Hindi-phonetic.png - +%endif %if %{jk_tables} %files japanese @@ -309,6 +336,7 @@ %endif +%if %{indic_tables} %files kannada %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -316,7 +344,7 @@ %{_datadir}/scim/tables/Kannada-kgp.bin %{_datadir}/scim/icons/Kannada-inscript.png %{_datadir}/scim/icons/Kannada-kgp.png - +%endif %if %{jk_tables} %files korean @@ -330,12 +358,13 @@ %endif +%if %{indic_tables} %files malayalam %defattr(-, root, root, -) %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Malayalam-inscript.bin %{_datadir}/scim/icons/Malayalam-inscript.png - +%endif %files nepali %defattr(-, root, root, -) @@ -344,6 +373,7 @@ %{_datadir}/scim/icons/Nepali.png +%if %{indic_tables} %files punjabi %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -353,6 +383,7 @@ %{_datadir}/scim/icons/Punjabi-inscript.png %{_datadir}/scim/icons/Punjabi-jhelum.png %{_datadir}/scim/icons/Punjabi-phonetic.png +%endif %files russian @@ -362,6 +393,7 @@ %{_datadir}/scim/icons/Yawerty.png +%if %{indic_tables} %files tamil %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -369,6 +401,7 @@ %{_datadir}/scim/tables/Tamil-phonetic.bin %{_datadir}/scim/icons/Tamil-inscript.png %{_datadir}/scim/icons/Tamil-phonetic.png +%endif %files thai @@ -378,11 +411,13 @@ %{_datadir}/scim/icons/Thai.png +%if %{indic_tables} %files telugu %defattr(-, root, root, -) %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Telugu-inscript.bin %{_datadir}/scim/icons/Telugu-inscript.png +%endif %files vietnamese @@ -402,23 +437,37 @@ %changelog -* Mon Dec 26 2005 Jens Petersen - 0.5.5-1%{?dist} +* Thu May 4 2006 Jens Petersen - 0.5.6-1.fc3 +- obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt) + +* Thu Mar 2 2006 Jens Petersen +- add %%indic_tables build switch + +* Thu Feb 9 2006 Jens Petersen +- update filelist since moduledir is now api-versioned + +* Fri Jan 13 2006 Jens Petersen +- update to 0.5.6 release + - update tables-skip-ja-ko.patch + - updates filelist for chinese tables + +* Mon Dec 26 2005 Jens Petersen - 0.5.5-1.fc3 - update to 0.5.5 - update filelists -- remove the Japanese and Korean tables and subpackages with +- remove the Japanese and Korean tables and their subpackages with tables-skip-ja-ko.patch and %%{jk_tables} -* Wed Dec 1 2005 Ryo Dairiki - 0.6.0-1%{?dist} +* Wed Dec 1 2005 Ryo Dairiki - 0.5.4-1.fc3 - update to 0.5.4 -* Tue Oct 18 2005 Jens Petersen - 0.5.3-6%{?dist} +* Tue Oct 18 2005 Jens Petersen - 0.5.3-6.fc3 - update to cvs head to fix various table issues with scim-tables-cvs-20051018.patch -* Fri Oct 7 2005 Jens Petersen - 0.5.3-5%{?dist} +* Fri Oct 7 2005 Jens Petersen - 0.5.3-5.fc3 - require scim -* Thu Sep 22 2005 Jens Petersen - 0.5.3-4%{?dist} +* Thu Sep 22 2005 Jens Petersen - 0.5.3-4.fc3 - add a Thai table derived from m17n-db with a Thai icon - separate the Indic tables and the additional language tables into separate language subpackages Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 06:44:56 -0000 1.5 +++ sources 5 May 2006 12:18:46 -0000 1.6 @@ -1 +1 @@ -15da0323195dea92690d4b391665b95a scim-tables-0.5.5.tar.gz +ff8d59e8f3dedb7dd7c6d87c8fc408db scim-tables-0.5.6.tar.gz tables-skip-ja-ko.patch: Index: tables-skip-ja-ko.patch =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/tables-skip-ja-ko.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tables-skip-ja-ko.patch 27 Dec 2005 06:44:56 -0000 1.1 +++ tables-skip-ja-ko.patch 5 May 2006 12:18:46 -0000 1.2 @@ -1,9 +1,9 @@ --- scim-tables-0.5.5/configure.ac~ 2005-12-05 15:37:12.000000000 +0900 +++ scim-tables-0.5.5/configure.ac 2005-12-26 17:02:55.000000000 +0900 @@ -126,14 +126,6 @@ - tables/zh/Wubi.txt tables/zh/Ziranma.txt tables/zh/ZhuYin.txt + tables/zh/ZhuYin-Big.txt - tables/ja/Makefile - tables/ja/HIRAGANA.txt - tables/ja/KATAKANA.txt From fedora-extras-commits at redhat.com Fri May 5 12:20:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:20:22 -0700 Subject: rpms/kdemultimedia-extras/devel kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 kdemultimedia-extras.spec, 1.3, 1.4 Message-ID: <200605051220.k45CKO9j010691@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671 Modified Files: kdemultimedia-extras.spec Added Files: kdemultimedia-3.5.2-omit_kfile_mpeg.patch Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-4 - respin for Extras kdemultimedia-3.5.2-omit_kfile_mpeg.patch: --- NEW FILE kdemultimedia-3.5.2-omit_kfile_mpeg.patch --- --- kdemultimedia-3.5.2/kfile-plugins/Makefile.am.omit_kfile_mpeg_plugin 2005-09-10 03:20:08.000000000 -0500 +++ kdemultimedia-3.5.2/kfile-plugins/Makefile.am 2006-04-02 22:01:51.000000000 -0500 @@ -18,5 +18,5 @@ KFILE_THEORA_SUBDIR=theora endif -SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \ +SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi wav sid $(KFILE_OGG_SUBDIR) \ $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR) Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdemultimedia-extras.spec 5 May 2006 12:16:08 -0000 1.3 +++ kdemultimedia-extras.spec 5 May 2006 12:20:22 -0000 1.4 @@ -67,7 +67,7 @@ Group: Applications/Multimedia Epoch: 6 Version: 3.5.2 -Release: 3%{?dist}%{?kde} +Release: 4%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" @@ -435,6 +435,9 @@ %changelog +* Fri May 05 2006 Rex Dieter 6:3.5.2-4 +- respin for Extras + * Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 - omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) From fedora-extras-commits at redhat.com Fri May 5 12:28:44 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:28:44 -0700 Subject: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec,1.4,1.5 Message-ID: <200605051228.k45CSk9n010772@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10755 Modified Files: kdemultimedia-extras.spec Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-5 - relax Requires: kdemultimedia Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kdemultimedia-extras.spec 5 May 2006 12:20:22 -0000 1.4 +++ kdemultimedia-extras.spec 5 May 2006 12:28:44 -0000 1.5 @@ -154,7 +154,7 @@ %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } -Requires: kdemultimedia = %{epoch}:%{version} +Requires: kdemultimedia >= %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) @@ -167,9 +167,9 @@ # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} %{?debug:BuildConflicts: kdemultimedia-extras-nonfree} -Requires: kdemultimedia = %{epoch}:%{version} +Requires: kdemultimedia >= %{epoch}:%{version} # for main akode_artsplugins bits -Requires: kdemultimedia-extras = %{epoch}:%{version} +Requires: kdemultimedia-extras >= %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: @@ -435,8 +435,11 @@ %changelog +* Fri May 05 2006 Rex Dieter 6:3.5.2-5 +- relax Requires: kdemultimedia + * Fri May 05 2006 Rex Dieter 6:3.5.2-4 -- respin for Extras +- respin 3.5.2 for Extras * Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 - omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) From fedora-extras-commits at redhat.com Fri May 5 12:29:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:29:06 -0700 Subject: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec,1.5,1.6 Message-ID: <200605051229.k45CT8RN010825@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10808 Modified Files: kdemultimedia-extras.spec Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-5 - relax Requires: kdemultimedia Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdemultimedia-extras.spec 5 May 2006 12:28:44 -0000 1.5 +++ kdemultimedia-extras.spec 5 May 2006 12:29:06 -0000 1.6 @@ -67,7 +67,7 @@ Group: Applications/Multimedia Epoch: 6 Version: 3.5.2 -Release: 4%{?dist}%{?kde} +Release: 5%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" From fedora-extras-commits at redhat.com Fri May 5 12:29:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:29:24 -0700 Subject: rpms/kdemultimedia-extras/FC-5 kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605051229.k45CTQ5D010884@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10860 Modified Files: .cvsignore kdemultimedia-extras.spec sources Added Files: kdemultimedia-3.5.2-omit_kfile_mpeg.patch Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-4 - respin 3.5.2 for Extras kdemultimedia-3.5.2-omit_kfile_mpeg.patch: --- NEW FILE kdemultimedia-3.5.2-omit_kfile_mpeg.patch --- --- kdemultimedia-3.5.2/kfile-plugins/Makefile.am.omit_kfile_mpeg_plugin 2005-09-10 03:20:08.000000000 -0500 +++ kdemultimedia-3.5.2/kfile-plugins/Makefile.am 2006-04-02 22:01:51.000000000 -0500 @@ -18,5 +18,5 @@ KFILE_THEORA_SUBDIR=theora endif -SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \ +SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi wav sid $(KFILE_OGG_SUBDIR) \ $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Mar 2006 12:39:58 -0000 1.2 +++ .cvsignore 5 May 2006 12:29:24 -0000 1.3 @@ -1 +1 @@ -kdemultimedia-3.5.1-patched.tar.bz2 +kdemultimedia-3.5.2-patched.tar.bz2 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdemultimedia-extras.spec 13 Apr 2006 18:43:13 -0000 1.2 +++ kdemultimedia-extras.spec 5 May 2006 12:29:24 -0000 1.3 @@ -18,8 +18,6 @@ %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode -#define to include/build juk, undef not -%define juk juk # to make sure no nonfree bits get included BuildConflicts: akode-extras # debugging: to make sure no extras bits (accidentally) get excluded @@ -33,6 +31,7 @@ %define _with_akode --with-akode BuildRequires: akode-extras %define _with_lame --with-lame --disable-lametest +%define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -42,6 +41,9 @@ %endif %if "%{?fedora}" > "4" %define gst gstreamer08 +BuildRequires: libXxf86vm-devel +# likely only required for nonfree -- Rex +BuildRequires: libXxf86dga-devel %endif %if "%{?rhel}" > "3" %define _with_gstreamer --with-gstreamer @@ -58,28 +60,27 @@ Summary: Extras for KDE multimedia applications %endif %if "%{?nonfree}" == "1" -Name: kdemultimedia-nonfree +Name: kdemultimedia-extras-nonfree Summary: Nonfree Extras for KDE multimedia applications %endif Group: Applications/Multimedia Epoch: 6 -Version: 3.5.1 -Release: 8%{?dist}%{?kde} +Version: 3.5.2 +Release: 5%{?dist}%{?kde} License: GPL -%if "%{?nonfree}" == "1" -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 -%else +%if "%{?patched:1}" == "1" # From Core's kdemultimedia pkg -Source0: kdemultimedia-3.5.1-patched.tar.bz2 +Source0: kdemultimedia-%{version}-patched.tar.bz2 +%else +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 %endif Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} -BuildRequires: libtool %if "%{is_release}" != "1" BuildRequires: automake %endif @@ -113,6 +114,8 @@ ## kde-redhat patches # unconditinally include oggvorbis_artsplugin Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch +# exclude kfile_mpeg +Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch # akode: http://bugs.kde.org/116958 @@ -151,26 +154,27 @@ %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } -Requires: kdemultimedia >= %{epoch}:%{version} +Requires: kdemultimedia >= %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) -%{?juk:* juk (libtunepimp)} +* juk (libtunepimp) * kfile-plugins: flac, mpc (taglib) %endif %if "%{?nonfree}" == "1" +Obsoletes: kdemultimedia-nonfree < %{epoch}:%{version}-%{release} # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} -%{?debug:BuildConflicts: kdemultimedia-nonfree} -Requires: kdemultimedia = %{epoch}:%{version} +%{?debug:BuildConflicts: kdemultimedia-extras-nonfree} +Requires: kdemultimedia >= %{epoch}:%{version} # for main akode_artsplugins bits Requires: kdemultimedia-extras >= %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: * akode_artsplugin (akode-extras), -* kfile-plugins: mp3 (taglib), +* kfile-plugins: mp3 (taglib), mpeg * krec mp3 export (lame), * mpeglib_artsplugin, * xine_artsplugin (xine-lib) @@ -204,7 +208,6 @@ DO_NOT_COMPILE="" -%{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} @@ -241,14 +244,14 @@ %endif %if "%{?extras}" == "1" -for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make %{?_smp_mflags} -C $module done %endif %if "%{?nonfree}" == "1" -for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make %{?_smp_mflags} -C $module done %endif @@ -261,17 +264,17 @@ %endif %if "%{?extras}" == "1" -for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" desktop-file-install --vendor="fedora" \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -%endif +#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -287,8 +290,8 @@ %endif %if "%{?nonfree}" == "1" -for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits @@ -359,8 +362,7 @@ %endif %if "%{?extras}" == "1" -# Since the icons come from juk -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -372,7 +374,7 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -%endif +#endif %endif %if "%{?nonfree}" == "1" @@ -413,7 +415,7 @@ %files -f extras.list %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{?juk:%dir %{_datadir}/apps/juk/} +%dir %{_datadir}/apps/juk/ %endif %if "%{?nonfree}" == "1" @@ -433,8 +435,30 @@ %changelog -* Wed Apr 05 2006 Rex Dieter 6:3.5.1-8 -- -extras: Requires: kdemultimedia >= 6:3.5.1 +* Fri May 05 2006 Rex Dieter 6:3.5.2-5 +- relax Requires: kdemultimedia + +* Fri May 05 2006 Rex Dieter 6:3.5.2-4 +- respin 3.5.2 for Extras + +* Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 +- omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) + +* Tue Mar 28 2006 Rex Dieter 6:3.5.2-2 +- -extras-nonfree: (fix) Obsoletes: kdemultimedia-nonfree + +* Mon Mar 20 2006 Rex Dieter 6:3.5.2-1 +- 3.5.2 + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-10 +- fc5: BR: libXxf86vm-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-9 +- fc5: BR: libXxf86dga-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-8 +- -extras-nonfree: rename -nonfree -> -extras-nonfree +- -extras-nonfree: drop 0.lvn from Release * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7 - kfile-plugins/mp3: -extras -> -nonfree Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Mar 2006 12:39:58 -0000 1.2 +++ sources 5 May 2006 12:29:24 -0000 1.3 @@ -1 +1 @@ -31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2 +54f9947051ee5cf50c81a5ea382943f1 kdemultimedia-3.5.2-patched.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 12:29:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:29:54 -0700 Subject: rpms/kdemultimedia-extras/FC-4 kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605051229.k45CTuTv010955@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10930 Modified Files: .cvsignore kdemultimedia-extras.spec sources Added Files: kdemultimedia-3.5.2-omit_kfile_mpeg.patch Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-5 - relax Requires: kdemultimedia kdemultimedia-3.5.2-omit_kfile_mpeg.patch: --- NEW FILE kdemultimedia-3.5.2-omit_kfile_mpeg.patch --- --- kdemultimedia-3.5.2/kfile-plugins/Makefile.am.omit_kfile_mpeg_plugin 2005-09-10 03:20:08.000000000 -0500 +++ kdemultimedia-3.5.2/kfile-plugins/Makefile.am 2006-04-02 22:01:51.000000000 -0500 @@ -18,5 +18,5 @@ KFILE_THEORA_SUBDIR=theora endif -SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \ +SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi wav sid $(KFILE_OGG_SUBDIR) \ $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Mar 2006 12:39:58 -0000 1.2 +++ .cvsignore 5 May 2006 12:29:54 -0000 1.3 @@ -1 +1 @@ -kdemultimedia-3.5.1-patched.tar.bz2 +kdemultimedia-3.5.2-patched.tar.bz2 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-4/kdemultimedia-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdemultimedia-extras.spec 13 Apr 2006 18:45:45 -0000 1.2 +++ kdemultimedia-extras.spec 5 May 2006 12:29:54 -0000 1.3 @@ -18,8 +18,6 @@ %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode -#define to include/build juk, undef not -%define juk juk # to make sure no nonfree bits get included BuildConflicts: akode-extras # debugging: to make sure no extras bits (accidentally) get excluded @@ -33,6 +31,7 @@ %define _with_akode --with-akode BuildRequires: akode-extras %define _with_lame --with-lame --disable-lametest +%define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -42,6 +41,9 @@ %endif %if "%{?fedora}" > "4" %define gst gstreamer08 +BuildRequires: libXxf86vm-devel +# likely only required for nonfree -- Rex +BuildRequires: libXxf86dga-devel %endif %if "%{?rhel}" > "3" %define _with_gstreamer --with-gstreamer @@ -58,28 +60,27 @@ Summary: Extras for KDE multimedia applications %endif %if "%{?nonfree}" == "1" -Name: kdemultimedia-nonfree +Name: kdemultimedia-extras-nonfree Summary: Nonfree Extras for KDE multimedia applications %endif Group: Applications/Multimedia Epoch: 6 -Version: 3.5.1 -Release: 8%{?dist}%{?kde} +Version: 3.5.2 +Release: 5%{?dist}%{?kde} License: GPL -%if "%{?nonfree}" == "1" -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 -%else +%if "%{?patched:1}" == "1" # From Core's kdemultimedia pkg -Source0: kdemultimedia-3.5.1-patched.tar.bz2 +Source0: kdemultimedia-%{version}-patched.tar.bz2 +%else +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 %endif Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} -BuildRequires: libtool %if "%{is_release}" != "1" BuildRequires: automake %endif @@ -113,6 +114,8 @@ ## kde-redhat patches # unconditinally include oggvorbis_artsplugin Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch +# exclude kfile_mpeg +Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch # akode: http://bugs.kde.org/116958 @@ -151,26 +154,27 @@ %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } -Requires: kdemultimedia >= %{epoch}:%{version} +Requires: kdemultimedia >= %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) -%{?juk:* juk (libtunepimp)} +* juk (libtunepimp) * kfile-plugins: flac, mpc (taglib) %endif %if "%{?nonfree}" == "1" +Obsoletes: kdemultimedia-nonfree < %{epoch}:%{version}-%{release} # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} -%{?debug:BuildConflicts: kdemultimedia-nonfree} -Requires: kdemultimedia = %{epoch}:%{version} +%{?debug:BuildConflicts: kdemultimedia-extras-nonfree} +Requires: kdemultimedia >= %{epoch}:%{version} # for main akode_artsplugins bits Requires: kdemultimedia-extras >= %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: * akode_artsplugin (akode-extras), -* kfile-plugins: mp3 (taglib), +* kfile-plugins: mp3 (taglib), mpeg * krec mp3 export (lame), * mpeglib_artsplugin, * xine_artsplugin (xine-lib) @@ -204,7 +208,6 @@ DO_NOT_COMPILE="" -%{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} @@ -241,14 +244,14 @@ %endif %if "%{?extras}" == "1" -for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make %{?_smp_mflags} -C $module done %endif %if "%{?nonfree}" == "1" -for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make %{?_smp_mflags} -C $module done %endif @@ -261,17 +264,17 @@ %endif %if "%{?extras}" == "1" -for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" desktop-file-install --vendor="fedora" \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -%endif +#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -287,8 +290,8 @@ %endif %if "%{?nonfree}" == "1" -for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits @@ -359,8 +362,7 @@ %endif %if "%{?extras}" == "1" -# Since the icons come from juk -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -372,7 +374,7 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -%endif +#endif %endif %if "%{?nonfree}" == "1" @@ -413,7 +415,7 @@ %files -f extras.list %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{?juk:%dir %{_datadir}/apps/juk/} +%dir %{_datadir}/apps/juk/ %endif %if "%{?nonfree}" == "1" @@ -433,8 +435,30 @@ %changelog -* Wed Apr 05 2006 Rex Dieter 6:3.5.1-8 -- -extras: Requires: kdemultimedia >= 6:3.5.1 +* Fri May 05 2006 Rex Dieter 6:3.5.2-5 +- relax Requires: kdemultimedia + +* Fri May 05 2006 Rex Dieter 6:3.5.2-4 +- respin 3.5.2 for Extras + +* Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 +- omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) + +* Tue Mar 28 2006 Rex Dieter 6:3.5.2-2 +- -extras-nonfree: (fix) Obsoletes: kdemultimedia-nonfree + +* Mon Mar 20 2006 Rex Dieter 6:3.5.2-1 +- 3.5.2 + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-10 +- fc5: BR: libXxf86vm-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-9 +- fc5: BR: libXxf86dga-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-8 +- -extras-nonfree: rename -nonfree -> -extras-nonfree +- -extras-nonfree: drop 0.lvn from Release * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7 - kfile-plugins/mp3: -extras -> -nonfree Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Mar 2006 12:39:58 -0000 1.2 +++ sources 5 May 2006 12:29:54 -0000 1.3 @@ -1 +1 @@ -31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2 +54f9947051ee5cf50c81a5ea382943f1 kdemultimedia-3.5.2-patched.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 13:14:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 06:14:30 -0700 Subject: rpms/Macaulay2/devel Macaulay2-0.9.8-64bit.patch, NONE, 1.1 Macaulay2.spec, 1.15, 1.16 Message-ID: <200605051314.k45DEWif013398@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13378 Modified Files: Macaulay2.spec Added Files: Macaulay2-0.9.8-64bit.patch Log Message: * Fri May 05 2006 Rex Dieter 0.9.8-0.4.cvs20060327 - 64bit patch (#188709) Macaulay2-0.9.8-64bit.patch: --- NEW FILE Macaulay2-0.9.8-64bit.patch --- --- M2/Macaulay2/e/linalgGB/linalgGB.cpp.64bit 2005-08-12 11:37:57.000000000 -0500 +++ M2/Macaulay2/e/linalgGB/linalgGB.cpp 2006-05-05 08:12:19.000000000 -0500 @@ -191,7 +191,7 @@ bool found = lookup->search(ce.monom, b); if (found) { - int which = reinterpret_cast(b->bag); + int which = (reinterpret_cast(b->bag)); uninterned_monomial um = H.reserve(MONOMIAL_LENGTH(ce.monom)); monomial m; monomial_quotient(ce.monom, gb[which]->f.monoms[0], um); Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Macaulay2.spec 12 Apr 2006 14:30:33 -0000 1.15 +++ Macaulay2.spec 5 May 2006 13:14:30 -0000 1.16 @@ -4,7 +4,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.8 -Release: 0.3.%{beta}%{?dist} +Release: 0.4.%{beta}%{?dist} License: GPL Group: Applications/Engineering @@ -13,7 +13,7 @@ Source: M2-0.9.8-%{beta}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # "64 bit build fails", http://bugzilla.redhat.com/bugzilla/188709 -ExcludeArch: x86_64 ppc64 +#ExcludeArch: x86_64 ppc64 Source1: Macaulay2.png Source2: Macaulay2.desktop @@ -23,6 +23,7 @@ Patch2: Macaulay2-0.9.8-cout.patch Patch3: Macaulay2-0.9.8-infodir.patch Patch4: Macaulay2-0.9.8-gcc4.patch +Patch5: Macaulay2-0.9.8-64bit.patch BuildRequires: desktop-file-utils BuildRequires: gc-devel @@ -69,6 +70,7 @@ %patch2 -p1 -b .cout %patch3 -p1 -b .infodir %patch4 -p1 -b .gcc4 +%patch5 -p1 -b .64bit %build @@ -142,6 +144,9 @@ %changelog +* Fri May 05 2006 Rex Dieter 0.9.8-0.4.cvs20060327 +- 64bit patch (#188709) + * Wed Apr 12 2006 Rex Dieter 0.9.8-0.3.cvs20060327 - omit x86_64, for now (#188709) From fedora-extras-commits at redhat.com Fri May 5 13:23:56 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 5 May 2006 06:23:56 -0700 Subject: fedora-security/audit fc4,1.229,1.230 fc5,1.143,1.144 Message-ID: <200605051323.k45DNukv013486@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13462 Modified Files: fc4 fc5 Log Message: Note the last few days worth of updates. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- fc4 4 May 2006 08:13:51 -0000 1.229 +++ fc4 5 May 2006 13:23:53 -0000 1.230 @@ -29,62 +29,62 @@ CVE-2006-1864 VULNERABLE (kernel) CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1742 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1742 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1742 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1741 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1741 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1741 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1740 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1740 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1739 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1739 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1739 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1738 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1738 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1738 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1737 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1737 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1737 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1736 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1736 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1735 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1735 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1735 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1734 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1734 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1734 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1733 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1733 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1733 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1732 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1732 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1732 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1731 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1731 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1731 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1730 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1730 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1730 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1729 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1729 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1728 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1728 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1728 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1727 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1727 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1727 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1726 version (firefox, fixed 1.5.0.2) 1.5 only CVE-2006-1726 version (thunderbird, fixed 1.5.0.2) 1.5 only CVE-2006-1725 version (firefox, fixed 1.5.0.2) 1.5 only -CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1724 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1724 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1724 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1723 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1723 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1721 VULNERABLE (cyrus-sasl, fixd 2.1.21) #189815 +CVE-2006-1721 backport (cyrus-sasl, fixd 2.1.21) #189815 [since FEDORA-2006-515] CVE-2006-1712 version (mailman, only 2.1.7) CVE-2006-1650 ** firefox CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon @@ -96,11 +96,11 @@ CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) #187544 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) #187544 CVE-2006-1542 VULNERABLE (python) #169046 -CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1531 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1531 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1530 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1529 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-500] CVE-2006-1526 VULNERABLE (xorg-x11) #189802 @@ -122,7 +122,7 @@ CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) CVE-2006-1059 version (samba) -CVE-2006-1058 VULNERABLE (busybox) #187386 +CVE-2006-1058 backport (busybox) #187386 [since FEDORA-2006-511] CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) #188303 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423] CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423] @@ -134,11 +134,11 @@ CVE-2006-0903 VULNERABLE (mysql) #183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) -CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-0749 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-0749 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-0749 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-0748 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-0748 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-0746 VULNERABLE (kpdf) #184308 CVE-2006-0745 version (xorg-x11) not fc4 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- fc5 4 May 2006 08:13:26 -0000 1.143 +++ fc5 5 May 2006 13:23:53 -0000 1.144 @@ -30,61 +30,61 @@ CVE-2006-1864 ignore (kernel) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1790 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1742 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1742 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1742 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1741 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1741 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1741 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1740 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1740 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1739 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1739 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1739 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1738 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1738 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1738 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1737 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1737 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1737 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1736 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1736 VULNERABLE (firefox, fixed 1.5.0.2) CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1735 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1735 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1734 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1734 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1734 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1733 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1733 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1733 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1732 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1732 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1732 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1731 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1731 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1731 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1730 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1730 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1730 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1729 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1729 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1728 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1728 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1728 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1727 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1727 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1727 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1726 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1726 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1725 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1726 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1726 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1725 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1724 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1724 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1724 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1723 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-1723 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1723 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1721 version (cyrus-sasl, fixed 2.1.21) CVE-2006-1712 version (mailman, only 2.1.7) CVE-2006-1650 ** firefox @@ -96,12 +96,12 @@ CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544 CVE-2006-1542 VULNERABLE (python) bz#169046 -CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1531 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-1531 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1531 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1530 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1530 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1529 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1529 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499] CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] @@ -124,7 +124,7 @@ CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189] CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259] -CVE-2006-1058 VULNERABLE (busybox) bz#187386 +CVE-2006-1058 backport (busybox) bz#187386 [since FEDORA-2006-510] CVE-2006-1057 version (gdm, fixed 2.14.1) bz#188303 [since FEDORA-2006-338] CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421] CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421] @@ -136,12 +136,12 @@ CVE-2006-0903 VULNERABLE (mysql) #183261 low/not upstream yet CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) -CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-0749 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-0749 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-0749 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-0748 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-0748 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-0748 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-0746 version (kdegraphics, fixed 3.4) CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172] CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Fri May 5 13:51:45 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 06:51:45 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.15,1.16 Message-ID: <200605051351.k45DplR5013625@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13608 Modified Files: php-eaccelerator.spec Log Message: Try to get the API version check working. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- php-eaccelerator.spec 5 May 2006 11:41:33 -0000 1.15 +++ php-eaccelerator.spec 5 May 2006 13:51:45 -0000 1.16 @@ -7,7 +7,7 @@ %define prever beta2 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) -%define php_apiver %(php -i 2>/dev/null | sed -n 's/^PHP API => //p' 2>/dev/null || echo %{default_apiver}) +%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null) | sed -n 's/^PHP API => //p' | tail -1) %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} # This is the apache userid, only used for sysvipc semaphores which is the @@ -26,7 +26,6 @@ Patch1: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: php-api = %{php_apiver} -#Requires: php = %{php_version} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel From fedora-extras-commits at redhat.com Fri May 5 13:53:17 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 5 May 2006 06:53:17 -0700 Subject: fedora-security/audit fc4,1.230,1.231 fc5,1.144,1.145 Message-ID: <200605051353.k45DrIj7013687@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13667 Modified Files: fc4 fc5 Log Message: Note the xorg update. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- fc4 5 May 2006 13:23:53 -0000 1.230 +++ fc4 5 May 2006 13:53:15 -0000 1.231 @@ -103,7 +103,7 @@ CVE-2006-1529 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-500] -CVE-2006-1526 VULNERABLE (xorg-x11) #189802 +CVE-2006-1526 backport (xorg-x11) #189802 [since FEDORA-2006-484] CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- fc5 5 May 2006 13:23:53 -0000 1.144 +++ fc5 5 May 2006 13:53:15 -0000 1.145 @@ -103,7 +103,7 @@ CVE-2006-1529 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1529 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499] -CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 +CVE-2006-1526 backport (xorg-x11) bz#189802 [since FEDORA-2006-483] CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Fri May 5 13:57:59 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 06:57:59 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.16,1.17 Message-ID: <200605051358.k45Dw1WM013746@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13729 Modified Files: php-eaccelerator.spec Log Message: Try to get the API version check working. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- php-eaccelerator.spec 5 May 2006 13:51:45 -0000 1.16 +++ php-eaccelerator.spec 5 May 2006 13:57:59 -0000 1.17 @@ -7,7 +7,7 @@ %define prever beta2 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) -%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null) | sed -n 's/^PHP API => //p' | tail -1) +%define php_apiver %(echo %{default_apiver}; (php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} # This is the apache userid, only used for sysvipc semaphores which is the From fedora-extras-commits at redhat.com Fri May 5 14:52:44 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:52:44 -0700 Subject: rpms/python-paramiko/devel .cvsignore, 1.2, 1.3 python-paramiko.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605051452.k45EqkQh016230@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16176/devel Modified Files: .cvsignore python-paramiko.spec sources Log Message: Update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Apr 2006 14:38:24 -0000 1.2 +++ .cvsignore 5 May 2006 14:52:44 -0000 1.3 @@ -1 +1 @@ -paramiko-1.5.3.zip +paramiko-1.5.4.zip Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/devel/python-paramiko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-paramiko.spec 13 Apr 2006 14:38:24 -0000 1.1 +++ python-paramiko.spec 5 May 2006 14:52:44 -0000 1.2 @@ -4,7 +4,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -54,5 +54,8 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-1 +- Update to new upstream version + * Wed Apr 12 2006 Shahms E. King 1.5.3-1 - Initial package Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2006 14:38:24 -0000 1.2 +++ sources 5 May 2006 14:52:44 -0000 1.3 @@ -1 +1 @@ -9c1389f19a331554e052a7e4e2b1471c paramiko-1.5.3.zip +a580fab7d295e7c731d0c270465d9560 paramiko-1.5.4.zip From fedora-extras-commits at redhat.com Fri May 5 14:52:38 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:52:38 -0700 Subject: rpms/python-paramiko/FC-4 python-paramiko.spec,1.1,1.2 Message-ID: <200605051453.k45ErAQr016234@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16176/FC-4 Modified Files: python-paramiko.spec Log Message: Update to new upstream version Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-4/python-paramiko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-paramiko.spec 13 Apr 2006 14:38:24 -0000 1.1 +++ python-paramiko.spec 5 May 2006 14:52:38 -0000 1.2 @@ -4,7 +4,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -54,5 +54,8 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-1 +- Update to new upstream version + * Wed Apr 12 2006 Shahms E. King 1.5.3-1 - Initial package From fedora-extras-commits at redhat.com Fri May 5 14:52:39 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:52:39 -0700 Subject: rpms/python-paramiko/FC-5 python-paramiko.spec,1.1,1.2 Message-ID: <200605051453.k45ErB6S016237@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16176/FC-5 Modified Files: python-paramiko.spec Log Message: Update to new upstream version Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-5/python-paramiko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-paramiko.spec 13 Apr 2006 14:38:24 -0000 1.1 +++ python-paramiko.spec 5 May 2006 14:52:38 -0000 1.2 @@ -4,7 +4,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -54,5 +54,8 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-1 +- Update to new upstream version + * Wed Apr 12 2006 Shahms E. King 1.5.3-1 - Initial package From fedora-extras-commits at redhat.com Fri May 5 14:55:27 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:55:27 -0700 Subject: rpms/python-psyco/devel .cvsignore, 1.3, 1.4 python-psyco.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605051455.k45EtTBv016404@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16365/devel Modified Files: .cvsignore python-psyco.spec sources Log Message: Update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-psyco/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Nov 2005 20:24:34 -0000 1.3 +++ .cvsignore 5 May 2006 14:55:27 -0000 1.4 @@ -1 +1 @@ -psyco-1.5-src.tar.gz +psyco-1.5.1-src.tar.gz Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/devel/python-psyco.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-psyco.spec 13 Feb 2006 17:47:48 -0000 1.8 +++ python-psyco.spec 5 May 2006 14:55:27 -0000 1.9 @@ -3,8 +3,8 @@ %define srcname psyco Name: python-%{srcname} -Version: 1.5 -Release: 4%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,9 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-1 +- Update to new upstream + * Mon Feb 13 2006 Shahms E. King 1.5-4 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-psyco/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 20:24:34 -0000 1.3 +++ sources 5 May 2006 14:55:27 -0000 1.4 @@ -1 +1 @@ -ff79e5daf94924fc7401d336d33edebf psyco-1.5-src.tar.gz +89e629d27acda765f01aa870230d1162 psyco-1.5.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 5 14:55:26 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:55:26 -0700 Subject: rpms/python-psyco/FC-4 python-psyco.spec,1.8,1.9 Message-ID: <200605051455.k45EtS37016398@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16365/FC-4 Modified Files: python-psyco.spec Log Message: Update to new upstream version Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-4/python-psyco.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-psyco.spec 13 Feb 2006 17:47:42 -0000 1.8 +++ python-psyco.spec 5 May 2006 14:55:26 -0000 1.9 @@ -3,8 +3,8 @@ %define srcname psyco Name: python-%{srcname} -Version: 1.5 -Release: 4%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,9 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-1 +- Update to new upstream + * Mon Feb 13 2006 Shahms E. King 1.5-4 - Rebuild for FC5 From fedora-extras-commits at redhat.com Fri May 5 14:58:07 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:58:07 -0700 Subject: rpms/python-paramiko/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605051458.k45Ew9cm016527@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16493/FC-4 Modified Files: .cvsignore sources Log Message: fix sources and cvsignore in FC-4 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Apr 2006 14:38:24 -0000 1.2 +++ .cvsignore 5 May 2006 14:58:07 -0000 1.3 @@ -1 +1 @@ -paramiko-1.5.3.zip +paramiko-1.5.4.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2006 14:38:24 -0000 1.2 +++ sources 5 May 2006 14:58:07 -0000 1.3 @@ -1 +1 @@ -9c1389f19a331554e052a7e4e2b1471c paramiko-1.5.3.zip +a580fab7d295e7c731d0c270465d9560 paramiko-1.5.4.zip From fedora-extras-commits at redhat.com Fri May 5 14:58:08 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:58:08 -0700 Subject: rpms/python-paramiko/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605051458.k45EwAKQ016532@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16493/FC-5 Modified Files: .cvsignore sources Log Message: fix sources and cvsignore in FC-4 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Apr 2006 14:38:24 -0000 1.2 +++ .cvsignore 5 May 2006 14:58:07 -0000 1.3 @@ -1 +1 @@ -paramiko-1.5.3.zip +paramiko-1.5.4.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2006 14:38:24 -0000 1.2 +++ sources 5 May 2006 14:58:07 -0000 1.3 @@ -1 +1 @@ -9c1389f19a331554e052a7e4e2b1471c paramiko-1.5.3.zip +a580fab7d295e7c731d0c270465d9560 paramiko-1.5.4.zip From fedora-extras-commits at redhat.com Fri May 5 14:58:31 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:58:31 -0700 Subject: rpms/python-psyco/FC-4 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200605051459.k45Ex3UJ016573@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16538/FC-4 Modified Files: .cvsignore sources Log Message: fix cvsignore and sources in FC-4 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Nov 2005 20:24:29 -0000 1.3 +++ .cvsignore 5 May 2006 14:58:31 -0000 1.4 @@ -1 +1 @@ -psyco-1.5-src.tar.gz +psyco-1.5.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 20:24:29 -0000 1.3 +++ sources 5 May 2006 14:58:31 -0000 1.4 @@ -1 +1 @@ -ff79e5daf94924fc7401d336d33edebf psyco-1.5-src.tar.gz +89e629d27acda765f01aa870230d1162 psyco-1.5.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 5 14:58:32 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:58:32 -0700 Subject: rpms/python-psyco/FC-5 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200605051459.k45Ex4vg016577@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16538/FC-5 Modified Files: .cvsignore sources Log Message: fix cvsignore and sources in FC-4 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Nov 2005 20:24:34 -0000 1.3 +++ .cvsignore 5 May 2006 14:58:32 -0000 1.4 @@ -1 +1 @@ -psyco-1.5-src.tar.gz +psyco-1.5.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 20:24:34 -0000 1.3 +++ sources 5 May 2006 14:58:32 -0000 1.4 @@ -1 +1 @@ -ff79e5daf94924fc7401d336d33edebf psyco-1.5-src.tar.gz +89e629d27acda765f01aa870230d1162 psyco-1.5.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 5 15:02:41 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:02:41 -0700 Subject: rpms/python-paramiko/devel python-paramiko.spec,1.2,1.3 Message-ID: <200605051502.k45F2hjQ018787@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18738/devel Modified Files: python-paramiko.spec Log Message: fix source line and rebuild Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/devel/python-paramiko.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-paramiko.spec 5 May 2006 14:52:44 -0000 1.2 +++ python-paramiko.spec 5 May 2006 15:02:40 -0000 1.3 @@ -5,7 +5,7 @@ Name: python-paramiko Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SSH2 protocol library for python Group: Development/Libraries @@ -54,6 +54,9 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.4-1 - Update to new upstream version From fedora-extras-commits at redhat.com Fri May 5 15:02:30 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:02:30 -0700 Subject: rpms/python-paramiko/FC-4 python-paramiko.spec,1.2,1.3 Message-ID: <200605051503.k45F33Gl018793@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18738/FC-4 Modified Files: python-paramiko.spec Log Message: fix source line and rebuild Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-4/python-paramiko.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-paramiko.spec 5 May 2006 14:52:38 -0000 1.2 +++ python-paramiko.spec 5 May 2006 15:02:30 -0000 1.3 @@ -5,7 +5,7 @@ Name: python-paramiko Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SSH2 protocol library for python Group: Development/Libraries @@ -54,6 +54,9 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.4-1 - Update to new upstream version From fedora-extras-commits at redhat.com Fri May 5 15:02:35 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:02:35 -0700 Subject: rpms/python-paramiko/FC-5 python-paramiko.spec,1.2,1.3 Message-ID: <200605051503.k45F3A6m018796@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18738/FC-5 Modified Files: python-paramiko.spec Log Message: fix source line and rebuild Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-5/python-paramiko.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-paramiko.spec 5 May 2006 14:52:38 -0000 1.2 +++ python-paramiko.spec 5 May 2006 15:02:35 -0000 1.3 @@ -5,7 +5,7 @@ Name: python-paramiko Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SSH2 protocol library for python Group: Development/Libraries @@ -54,6 +54,9 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.4-1 - Update to new upstream version From fedora-extras-commits at redhat.com Fri May 5 15:03:28 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:03:28 -0700 Subject: rpms/python-psyco/FC-5 python-psyco.spec,1.8,1.9 Message-ID: <200605051503.k45F3VBb018853@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/FC-5 Modified Files: python-psyco.spec Log Message: fix source line and rebuild Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-5/python-psyco.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-psyco.spec 13 Feb 2006 17:47:48 -0000 1.8 +++ python-psyco.spec 5 May 2006 15:03:26 -0000 1.9 @@ -3,8 +3,8 @@ %define srcname psyco Name: python-%{srcname} -Version: 1.5 -Release: 4%{?dist} +Version: 1.5.1 +Release: 2%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,12 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-2 +- Fix source line and rebuild + +* Fri May 05 2006 Shahms E. King 1.5.1-1 +- Update to new upstream + * Mon Feb 13 2006 Shahms E. King 1.5-4 - Rebuild for FC5 From fedora-extras-commits at redhat.com Fri May 5 15:03:29 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:03:29 -0700 Subject: rpms/python-psyco/devel python-psyco.spec,1.9,1.10 Message-ID: <200605051503.k45F3V8e018855@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/devel Modified Files: python-psyco.spec Log Message: fix source line and rebuild Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/devel/python-psyco.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-psyco.spec 5 May 2006 14:55:27 -0000 1.9 +++ python-psyco.spec 5 May 2006 15:03:29 -0000 1.10 @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,9 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.1-1 - Update to new upstream From fedora-extras-commits at redhat.com Fri May 5 15:03:21 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:03:21 -0700 Subject: rpms/python-psyco/FC-4 python-psyco.spec,1.9,1.10 Message-ID: <200605051503.k45F3tjV018961@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/FC-4 Modified Files: python-psyco.spec Log Message: fix source line and rebuild Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-4/python-psyco.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-psyco.spec 5 May 2006 14:55:26 -0000 1.9 +++ python-psyco.spec 5 May 2006 15:03:21 -0000 1.10 @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,9 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.1-1 - Update to new upstream From fedora-extras-commits at redhat.com Fri May 5 17:17:38 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 5 May 2006 10:17:38 -0700 Subject: rpms/environment-modules/FC-4 .cvsignore, 1.3, 1.4 environment-modules.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605051718.k45HIADN024256@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24193/FC-4 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Mar 2006 18:53:24 -0000 1.3 +++ .cvsignore 5 May 2006 17:17:38 -0000 1.4 @@ -1 +1 @@ -modules-3.2.1.tar.bz2 +modules-3.2.2.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/environment-modules.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- environment-modules.spec 24 Mar 2006 18:53:24 -0000 1.2 +++ environment-modules.spec 5 May 2006 17:17:38 -0000 1.3 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri May 5 2006 - Orion Poplawski - 3.2.2-1 +- Update to 3.2.2 + * Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 - Update to 3.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Mar 2006 18:53:24 -0000 1.3 +++ sources 5 May 2006 17:17:38 -0000 1.4 @@ -1 +1 @@ -fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 +c2d8ed5b09cc6de43889bb30cecb43b0 modules-3.2.2.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 17:17:39 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 5 May 2006 10:17:39 -0700 Subject: rpms/environment-modules/FC-5 .cvsignore, 1.3, 1.4 environment-modules.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605051718.k45HIBxa024261@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24193/FC-5 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Mar 2006 18:51:28 -0000 1.3 +++ .cvsignore 5 May 2006 17:17:39 -0000 1.4 @@ -1 +1 @@ -modules-3.2.1.tar.bz2 +modules-3.2.2.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/environment-modules.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- environment-modules.spec 24 Mar 2006 18:51:28 -0000 1.2 +++ environment-modules.spec 5 May 2006 17:17:39 -0000 1.3 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri May 5 2006 - Orion Poplawski - 3.2.2-1 +- Update to 3.2.2 + * Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 - Update to 3.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Mar 2006 18:51:28 -0000 1.3 +++ sources 5 May 2006 17:17:39 -0000 1.4 @@ -1 +1 @@ -fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 +c2d8ed5b09cc6de43889bb30cecb43b0 modules-3.2.2.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 17:17:40 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 5 May 2006 10:17:40 -0700 Subject: rpms/environment-modules/devel .cvsignore, 1.3, 1.4 environment-modules.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605051718.k45HICRn024266@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24193/devel Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Mar 2006 16:46:26 -0000 1.3 +++ .cvsignore 5 May 2006 17:17:40 -0000 1.4 @@ -1 +1 @@ -modules-3.2.1.tar.bz2 +modules-3.2.2.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/environment-modules.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- environment-modules.spec 24 Mar 2006 16:46:26 -0000 1.2 +++ environment-modules.spec 5 May 2006 17:17:40 -0000 1.3 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri May 5 2006 - Orion Poplawski - 3.2.2-1 +- Update to 3.2.2 + * Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 - Update to 3.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Mar 2006 16:46:26 -0000 1.3 +++ sources 5 May 2006 17:17:40 -0000 1.4 @@ -1 +1 @@ -fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 +c2d8ed5b09cc6de43889bb30cecb43b0 modules-3.2.2.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 17:50:21 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Fri, 5 May 2006 10:50:21 -0700 Subject: fedora-security/audit fe4,1.3,1.4 fe5,1.3,1.4 Message-ID: <200605051750.k45HoLiP024568@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24548 Modified Files: fe4 fe5 Log Message: Add recent clamav issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fe4 4 May 2006 11:56:15 -0000 1.3 +++ fe4 5 May 2006 17:50:19 -0000 1.4 @@ -4,3 +4,4 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 +CVE-2006-1989 version (clamav, fixed 0.88.2) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fe5 4 May 2006 11:56:15 -0000 1.3 +++ fe5 5 May 2006 17:50:19 -0000 1.4 @@ -4,3 +4,4 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 +CVE-2006-1989 version (clamav, fixed 0.88.2) From fedora-extras-commits at redhat.com Fri May 5 18:07:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 5 May 2006 11:07:18 -0700 Subject: rpms/syslog-ng/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.13, 1.14 Message-ID: <200605051807.k45I7KXO026874@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26853 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Mar 2006 16:52:52 -0000 1.5 +++ .cvsignore 5 May 2006 18:07:18 -0000 1.6 @@ -1 +1 @@ -syslog-ng-1.6.10.tar.gz +syslog-ng-1.6.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Mar 2006 16:52:52 -0000 1.5 +++ sources 5 May 2006 18:07:18 -0000 1.6 @@ -1 +1 @@ -b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz +8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- syslog-ng.spec 5 Apr 2006 20:24:10 -0000 1.13 +++ syslog-ng.spec 5 May 2006 18:07:18 -0000 1.14 @@ -12,8 +12,8 @@ %{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.10 -Release: 2%{?dist} +Version: 1.6.11 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -129,6 +129,9 @@ %changelog +* Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 +- Update to 1.6.11. + * Sun Apr 2 2006 Jose Pedro Oliveira - 1.6.10-2 - Build option to support the syslog-ng spoof-source feature (the feature spoof-source is disabled by default). From fedora-extras-commits at redhat.com Fri May 5 18:08:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 May 2006 11:08:47 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.2,1.3 Message-ID: <200605051808.k45I8nIo026944@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26927 Modified Files: gcompris.spec Log Message: * Fri May 5 2006 Hans de Goede 7.4-6 - Add missing python module Requires. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcompris.spec 1 May 2006 16:07:48 -0000 1.2 +++ gcompris.spec 5 May 2006 18:08:47 -0000 1.3 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -18,6 +18,7 @@ Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags +Requires: gnome-python2-canvas python-sqlite2 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -475,6 +476,9 @@ %changelog +* Fri May 5 2006 Hans de Goede 7.4-6 +- Add missing python module Requires. + * Mon May 1 2006 Hans de Goede 7.4-5 - Make -devel require -libs instead of -lib (oops). From fedora-extras-commits at redhat.com Fri May 5 18:11:25 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 May 2006 11:11:25 -0700 Subject: rpms/gcompris/FC-5 gcompris.spec,1.2,1.3 Message-ID: <200605051811.k45IBRxu027063@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27046 Modified Files: gcompris.spec Log Message: * Fri May 5 2006 Hans de Goede 7.4-6 - Add missing python module Requires. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcompris.spec 1 May 2006 16:14:25 -0000 1.2 +++ gcompris.spec 5 May 2006 18:11:25 -0000 1.3 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -18,6 +18,7 @@ Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags +Requires: gnome-python2-canvas python-sqlite2 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -475,6 +476,9 @@ %changelog +* Fri May 5 2006 Hans de Goede 7.4-6 +- Add missing python module Requires. + * Mon May 1 2006 Hans de Goede 7.4-5 - Make -devel require -libs instead of -lib (oops). From fedora-extras-commits at redhat.com Fri May 5 18:45:25 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:45:25 -0700 Subject: rpms/xfce4-mailwatch-plugin - New directory Message-ID: <200605051845.k45IjRa3027417@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27391/xfce4-mailwatch-plugin Log Message: Directory /cvs/extras/rpms/xfce4-mailwatch-plugin added to the repository From fedora-extras-commits at redhat.com Fri May 5 18:45:25 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:45:25 -0700 Subject: rpms/xfce4-mailwatch-plugin/devel - New directory Message-ID: <200605051845.k45IjR5t027420@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27391/xfce4-mailwatch-plugin/devel Log Message: Directory /cvs/extras/rpms/xfce4-mailwatch-plugin/devel added to the repository From fedora-extras-commits at redhat.com Fri May 5 18:45:40 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:45:40 -0700 Subject: rpms/xfce4-mailwatch-plugin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605051845.k45IjgDc027466@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27438 Added Files: Makefile import.log Log Message: Setup of module xfce4-mailwatch-plugin --- NEW FILE Makefile --- # Top level Makefile for module xfce4-mailwatch-plugin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 5 18:45:40 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:45:40 -0700 Subject: rpms/xfce4-mailwatch-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605051845.k45Ijgna027469@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27438/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-mailwatch-plugin --- NEW 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 May 5 18:46:49 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:46:49 -0700 Subject: rpms/xfce4-mailwatch-plugin import.log,1.1,1.2 Message-ID: <200605051846.k45IkpBj027554@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27519 Modified Files: import.log Log Message: auto-import xfce4-mailwatch-plugin-1.0.0-2.fc5 on branch devel from xfce4-mailwatch-plugin-1.0.0-2.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xfce4-mailwatch-plugin/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 May 2006 18:45:39 -0000 1.1 +++ import.log 5 May 2006 18:46:49 -0000 1.2 @@ -0,0 +1 @@ +xfce4-mailwatch-plugin-1_0_0-2_fc5:HEAD:xfce4-mailwatch-plugin-1.0.0-2.fc5.src.rpm:1146854801 From fedora-extras-commits at redhat.com Fri May 5 18:46:49 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:46:49 -0700 Subject: rpms/xfce4-mailwatch-plugin/devel xfce4-mailwatch-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605051846.k45IkpRM027559@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27519/devel Modified Files: .cvsignore sources Added Files: xfce4-mailwatch-plugin.spec Log Message: auto-import xfce4-mailwatch-plugin-1.0.0-2.fc5 on branch devel from xfce4-mailwatch-plugin-1.0.0-2.fc5.src.rpm --- NEW FILE xfce4-mailwatch-plugin.spec --- Name: xfce4-mailwatch-plugin Version: 1.0.0 Release: 2%{?dist} Summary: Mail Watcher plugin for the Xfce panel Group: User Interface/Desktops License: GPL URL: http://spuriousinterrupt.org/projects/mailwatch Source0: http://spuriousinterrupt.org/files/mailwatch/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel BuildRequires: gettext # only enable TLS support if a recent version of gnutls is available # install libXt for modular X %if "%fedora" > "4" BuildRequires: gnutls-devel >= 1.2.0, libXt-devel %endif Requires: xfce4-panel >= 4.2 %description Mailwatch is a plugin for the Xfce 4 panel. It is intended to replace the current (4.0, 4.2) mail checker plugin in Xfce 4.4. It supports IMAP and POP, local mailboxes in Mbox, Maildir and MH-Maildir format as well as Gmail. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libdir}/xfce4/panel-plugins/*.so %{_datadir}/icons/hicolor/48x48/apps/xfce-newmail.png %{_datadir}/icons/hicolor/48x48/apps/xfce-nomail.png %{_datadir}/icons/hicolor/scalable/apps/xfce-newmail.svg %{_datadir}/icons/hicolor/scalable/apps/xfce-nomail.svg %{_datadir}/xfce4/doc/C/xfce4-mailwatch-plugin.html %{_datadir}/xfce4/doc/C/images/mailwatch-*.png %changelog * Mon Apr 10 2006 Christoph Wickert - 1.0.0-2 - Fix description. - Fix files section. - Require xfce4-panel. * Sat Feb 18 2006 Christoph Wickert - 1.0.0-1 - Initial Fedora Extras release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-mailwatch-plugin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 May 2006 18:45:40 -0000 1.1 +++ .cvsignore 5 May 2006 18:46:49 -0000 1.2 @@ -0,0 +1 @@ +xfce4-mailwatch-plugin-1.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-mailwatch-plugin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 May 2006 18:45:40 -0000 1.1 +++ sources 5 May 2006 18:46:49 -0000 1.2 @@ -0,0 +1 @@ +e31d32b08f82e24e730831641cdd65f0 xfce4-mailwatch-plugin-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 18:47:25 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:47:25 -0700 Subject: rpms/netpanzer-data - New directory Message-ID: <200605051847.k45IlRZe027638@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27617/netpanzer-data Log Message: Directory /cvs/extras/rpms/netpanzer-data added to the repository From fedora-extras-commits at redhat.com Fri May 5 18:47:26 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:47:26 -0700 Subject: rpms/netpanzer-data/devel - New directory Message-ID: <200605051847.k45IlSeP027641@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27617/netpanzer-data/devel Log Message: Directory /cvs/extras/rpms/netpanzer-data/devel added to the repository From fedora-extras-commits at redhat.com Fri May 5 18:48:03 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:48:03 -0700 Subject: rpms/netpanzer-data Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605051848.k45Im5MG027695@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27662 Added Files: Makefile import.log Log Message: Setup of module netpanzer-data --- NEW FILE Makefile --- # Top level Makefile for module netpanzer-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 May 5 18:48:03 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:48:03 -0700 Subject: rpms/netpanzer-data/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605051848.k45Im5AM027698@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27662/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module netpanzer-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 May 5 18:59:25 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:59:25 -0700 Subject: rpms/netpanzer-data import.log,1.1,1.2 Message-ID: <200605051859.k45IxvWF028116@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28080 Modified Files: import.log Log Message: auto-import netpanzer-data-0.8-3 on branch devel from netpanzer-data-0.8-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/netpanzer-data/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 May 2006 18:48:02 -0000 1.1 +++ import.log 5 May 2006 18:59:25 -0000 1.2 @@ -0,0 +1 @@ +netpanzer-data-0_8-3:HEAD:netpanzer-data-0.8-3.src.rpm:1146855931 From fedora-extras-commits at redhat.com Fri May 5 18:59:26 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:59:26 -0700 Subject: rpms/netpanzer-data/devel netpanzer-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605051859.k45Ixw9v028120@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28080/devel Modified Files: .cvsignore sources Added Files: netpanzer-data.spec Log Message: auto-import netpanzer-data-0.8-3 on branch devel from netpanzer-data-0.8-3.src.rpm --- NEW FILE netpanzer-data.spec --- Name: netpanzer-data Version: 0.8 Release: 3 Summary: Data files for netpanzer Group: Amusements/Games License: GPL URL: http://netpanzer.berlios.de Source0: http://download.berlios.de/netpanzer/netpanzer-data-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # While contents of this packages includes only data-files, they are included # with configure script and jam (make substitute). This is really strange indeed, # but this configure searchs for these dependencies below. BuildRequires: jam, physfs-devel >= 0.1.9, doxygen BuildRequires: SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2 Requires: netpanzer = %{version} %description This package contains the graphics and sounds for netpanzer, an online multiplayer tactical warfare game designed for FAST ACTION combat. %prep %setup -q # Strip \r from RELNOTES file sed -i 's/\r//' RELNOTES %build %configure --target=i386-redhat-linux-gnu jam %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT jam install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README RELNOTES TODO %{_datadir}/netpanzer %changelog * Thu May 4 2006 Hugo Cisneiros 0.8-3 - Removed desktop-file-utils BuildReq entry * Mon May 1 2006 Hugo Cisneiros 0.8-2 - Changed Package's RPM Group - Fixed Changelog entries to specify versions - Stripped '\r' EOL from RELNOTES file * Mon May 1 2006 Hugo Cisneiros 0.8-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/netpanzer-data/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 May 2006 18:48:03 -0000 1.1 +++ .cvsignore 5 May 2006 18:59:26 -0000 1.2 @@ -0,0 +1 @@ +netpanzer-data-0.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/netpanzer-data/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 May 2006 18:48:03 -0000 1.1 +++ sources 5 May 2006 18:59:26 -0000 1.2 @@ -0,0 +1 @@ +d2dbd5a6c38a181fa3b6aa9a68c81d2f netpanzer-data-0.8.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 19:05:08 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 12:05:08 -0700 Subject: owners owners.list,1.941,1.942 Message-ID: <200605051905.k45J5AKc030384@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30365 Modified Files: owners.list Log Message: add xfce4-mailwatch-plugin Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.941 retrieving revision 1.942 diff -u -r1.941 -r1.942 --- owners.list 4 May 2006 21:57:13 -0000 1.941 +++ owners.list 5 May 2006 19:05:08 -0000 1.942 @@ -1641,6 +1641,7 @@ Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| +Fedora Extras|xfce4-mailwatch-plugin|Mail Watcher plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 5 19:13:57 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 5 May 2006 12:13:57 -0700 Subject: fedora-security/audit fe4,1.4,1.5 fe5,1.4,1.5 Message-ID: <200605051913.k45JDvsr030432@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30412 Modified Files: fe4 fe5 Log Message: Note a new openvpn issue Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fe4 5 May 2006 17:50:19 -0000 1.4 +++ fe4 5 May 2006 19:13:55 -0000 1.5 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-1989 version (clamav, fixed 0.88.2) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fe5 5 May 2006 17:50:19 -0000 1.4 +++ fe5 5 May 2006 19:13:55 -0000 1.5 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-1989 version (clamav, fixed 0.88.2) From fedora-extras-commits at redhat.com Fri May 5 19:22:51 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 12:22:51 -0700 Subject: owners owners.list,1.942,1.943 Message-ID: <200605051922.k45JMrXk030684@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30667 Modified Files: owners.list Log Message: added netpanzer-data Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.942 retrieving revision 1.943 diff -u -r1.942 -r1.943 --- owners.list 5 May 2006 19:05:08 -0000 1.942 +++ owners.list 5 May 2006 19:22:51 -0000 1.943 @@ -805,6 +805,7 @@ Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|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|netpanzer|An Online Multiplayer Tactical Warfare Game|hugo at devin.com.br|extras-qa at fedoraproject.org| +Fedora Extras|netpanzer-data|Data files for netpanzer|hugo at devin.com.br|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|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|new|A simple template system|redhat at flyn.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 5 19:54:13 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 5 May 2006 12:54:13 -0700 Subject: fedora-security/audit fc4,1.231,1.232 fc5,1.145,1.146 Message-ID: <200605051954.k45JsDu3031001@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30975 Modified Files: fc4 fc5 Log Message: Add the new mysql CVE ids. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- fc4 5 May 2006 13:53:15 -0000 1.231 +++ fc4 5 May 2006 19:54:11 -0000 1.232 @@ -108,6 +108,9 @@ CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423] +CVE-2006-1518 ignore (mysql) 5.x only +CVE-2006-1517 VULNERABLE (mysql, fixed 4.1.19) #190868 +CVE-2006-1516 VULNERABLE (mysql, fixed 4.1.19) #190866 CVE-2006-1494 VULNERABLE (php) #189592 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1354 VULNERABLE (freeradius) #186084 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- fc5 5 May 2006 13:53:15 -0000 1.145 +++ fc5 5 May 2006 19:54:11 -0000 1.146 @@ -108,6 +108,9 @@ CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421] +CVE-2006-1518 VULNERABLE (mysql, fixed 5.0.21) #190870 +CVE-2006-1517 VULNERABLE (mysql, fixed 5.0.21) #190868 +CVE-2006-1516 VULNERABLE (mysql, fixed 5.0.21) #190866 CVE-2006-1494 VULNERABLE (php)#189592 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 From fedora-extras-commits at redhat.com Fri May 5 21:31:01 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 14:31:01 -0700 Subject: rpms/netpanzer-data/FC-4 netpanzer-data.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200605052131.k45LV3Cj003505@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3486 Modified Files: sources Added Files: netpanzer-data.spec Log Message: --- NEW FILE netpanzer-data.spec --- Name: netpanzer-data Version: 0.8 Release: 3 Summary: Data files for netpanzer Group: Amusements/Games License: GPL URL: http://netpanzer.berlios.de Source0: http://download.berlios.de/netpanzer/netpanzer-data-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # While contents of this packages includes only data-files, they are included # with configure script and jam (make substitute). This is really strange indeed, # but this configure searchs for these dependencies below. BuildRequires: jam, physfs-devel >= 0.1.9, doxygen BuildRequires: SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2 Requires: netpanzer = %{version} %description This package contains the graphics and sounds for netpanzer, an online multiplayer tactical warfare game designed for FAST ACTION combat. %prep %setup -q # Strip \r from RELNOTES file sed -i 's/\r//' RELNOTES %build %configure --target=i386-redhat-linux-gnu jam %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT jam install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README RELNOTES TODO %{_datadir}/netpanzer %changelog * Thu May 4 2006 Hugo Cisneiros 0.8-3 - Removed desktop-file-utils BuildReq entry * Mon May 1 2006 Hugo Cisneiros 0.8-2 - Changed Package's RPM Group - Fixed Changelog entries to specify versions - Stripped '\r' EOL from RELNOTES file * Mon May 1 2006 Hugo Cisneiros 0.8-1 - Initial RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/netpanzer-data/FC-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 May 2006 18:48:03 -0000 1.1 +++ sources 5 May 2006 21:31:00 -0000 1.2 @@ -0,0 +1 @@ +d2dbd5a6c38a181fa3b6aa9a68c81d2f netpanzer-data-0.8.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 04:00:04 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Fri, 5 May 2006 21:00:04 -0700 Subject: rpms/stratagus/devel stratagus.spec,1.6,1.7 Message-ID: <200605060400.k46406St017719@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17691 Modified Files: stratagus.spec Log Message: Added link to page with datasets Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- stratagus.spec 30 Mar 2006 20:08:35 -0000 1.6 +++ stratagus.spec 6 May 2006 04:00:04 -0000 1.7 @@ -6,7 +6,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -34,7 +34,8 @@ includes support for playing over the internet/LAN, or playing a computer opponent. The engine is configurable and can be used to create games with a wide-range of features specific to your needs. See the -data sets page for a list of current games using the stratagus engine. +data sets page ( http://stratagus.sourceforge.net/games.shtml ) for a list +of current games using the stratagus engine. %prep %setup -q -n %{name}-040702 @@ -71,6 +72,9 @@ %changelog +* Sat May 06 2006 Peter Lemenkov 2.1-6%{?dist} +- Added link to page with datasets + * Thu Mar 30 2006 Peter Lemenkov 2.1-5%{?dist} - addition of new patch From fedora-extras-commits at redhat.com Sat May 6 06:43:16 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 5 May 2006 23:43:16 -0700 Subject: rpms/tetex-dvipost/devel tetex-dvipost.spec,1.1,1.2 Message-ID: <200605060643.k466hIOB024753@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tetex-dvipost/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24736 Modified Files: tetex-dvipost.spec Log Message: * Sat May 6 2006 Jos?? Matos - 1.1-5 - Clean up spec file Index: tetex-dvipost.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-dvipost/devel/tetex-dvipost.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-dvipost.spec 27 Apr 2006 16:18:45 -0000 1.1 +++ tetex-dvipost.spec 6 May 2006 06:43:15 -0000 1.2 @@ -1,9 +1,9 @@ %define real_name dvipost -%define texmf %{_datadir}/texmf +%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} Name: tetex-%{real_name} Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: LaTeX post filter command to support change bars and overstrike mode Group: Applications/Publishing @@ -13,11 +13,9 @@ Patch0: %{name}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tetex BuildRequires: tetex-latex +BuildRequires: /usr/bin/kpsewhich -Requires: tetex -Requires: tetex-fonts Requires: tetex-latex %description @@ -55,13 +53,16 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%{texmf}/tex/latex/misc/* +%{_texmf}/tex/latex/misc/* %doc README COPYING NOTES dvipost.html %{_mandir}/man*/* %changelog +* Sat May 6 2006 Jos?? Matos - 1.1-5 +- Clean up spec file + * Thu Apr 27 2006 Jos?? Matos - 1.1-4 - Rename package to tetex-dvipost From fedora-extras-commits at redhat.com Sat May 6 06:43:34 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 5 May 2006 23:43:34 -0700 Subject: rpms/tetex-dvipost/FC-5 tetex-dvipost.spec,1.1,1.2 Message-ID: <200605060643.k466haw9024778@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tetex-dvipost/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24761 Modified Files: tetex-dvipost.spec Log Message: * Sat May 6 2006 Jos?? Matos - 1.1-5 - Clean up spec file Index: tetex-dvipost.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-dvipost/FC-5/tetex-dvipost.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-dvipost.spec 27 Apr 2006 16:18:45 -0000 1.1 +++ tetex-dvipost.spec 6 May 2006 06:43:34 -0000 1.2 @@ -1,9 +1,9 @@ %define real_name dvipost -%define texmf %{_datadir}/texmf +%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} Name: tetex-%{real_name} Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: LaTeX post filter command to support change bars and overstrike mode Group: Applications/Publishing @@ -13,11 +13,9 @@ Patch0: %{name}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tetex BuildRequires: tetex-latex +BuildRequires: /usr/bin/kpsewhich -Requires: tetex -Requires: tetex-fonts Requires: tetex-latex %description @@ -55,13 +53,16 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%{texmf}/tex/latex/misc/* +%{_texmf}/tex/latex/misc/* %doc README COPYING NOTES dvipost.html %{_mandir}/man*/* %changelog +* Sat May 6 2006 Jos?? Matos - 1.1-5 +- Clean up spec file + * Thu Apr 27 2006 Jos?? Matos - 1.1-4 - Rename package to tetex-dvipost From fedora-extras-commits at redhat.com Sat May 6 06:51:21 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 5 May 2006 23:51:21 -0700 Subject: rpms/tetex-dvipost/FC-4 tetex-dvipost.spec,1.1,1.2 Message-ID: <200605060651.k466pN86024807@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tetex-dvipost/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24790 Modified Files: tetex-dvipost.spec Log Message: * Sat May 6 2006 Jos?? Matos - 1.1-5 - Clean up spec file Index: tetex-dvipost.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-dvipost/FC-4/tetex-dvipost.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-dvipost.spec 27 Apr 2006 16:18:45 -0000 1.1 +++ tetex-dvipost.spec 6 May 2006 06:51:21 -0000 1.2 @@ -1,9 +1,9 @@ %define real_name dvipost -%define texmf %{_datadir}/texmf +%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} Name: tetex-%{real_name} Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: LaTeX post filter command to support change bars and overstrike mode Group: Applications/Publishing @@ -13,11 +13,9 @@ Patch0: %{name}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tetex BuildRequires: tetex-latex +BuildRequires: /usr/bin/kpsewhich -Requires: tetex -Requires: tetex-fonts Requires: tetex-latex %description @@ -55,13 +53,16 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%{texmf}/tex/latex/misc/* +%{_texmf}/tex/latex/misc/* %doc README COPYING NOTES dvipost.html %{_mandir}/man*/* %changelog +* Sat May 6 2006 Jos?? Matos - 1.1-5 +- Clean up spec file + * Thu Apr 27 2006 Jos?? Matos - 1.1-4 - Rename package to tetex-dvipost From fedora-extras-commits at redhat.com Sat May 6 07:42:32 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 00:42:32 -0700 Subject: owners owners.list,1.943,1.944 Message-ID: <200605060742.k467gYEa027138@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27121/owners Modified Files: owners.list Log Message: add gnucap Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.943 retrieving revision 1.944 diff -u -r1.943 -r1.944 --- owners.list 5 May 2006 19:22:51 -0000 1.943 +++ owners.list 6 May 2006 07:42:32 -0000 1.944 @@ -398,6 +398,7 @@ Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| +Fedora Extras|gnucap|The Gnu Circuit Analysis Package|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|gnugo|Text based go program|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 6 07:49:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 00:49:41 -0700 Subject: rpms/goffice/FC-5 .cvsignore, 1.3, 1.4 goffice.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605060749.k467nhtL027228@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207 Modified Files: .cvsignore goffice.spec sources Log Message: * Tue May 2 2006 Hans de Goede 0.2.1-1 - new upstream version: 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/goffice/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 00:21:28 -0000 1.3 +++ .cvsignore 6 May 2006 07:49:41 -0000 1.4 @@ -1 +1 @@ -goffice-0.2.0.tar.bz2 +goffice-0.2.1.tar.bz2 Index: goffice.spec =================================================================== RCS file: /cvs/extras/rpms/goffice/FC-5/goffice.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- goffice.spec 17 Feb 2006 00:15:36 -0000 1.8 +++ goffice.spec 6 May 2006 07:49:41 -0000 1.9 @@ -1,5 +1,5 @@ Name: goffice -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: Goffice support libraries Group: System Environment/Libraries @@ -70,6 +70,12 @@ %changelog +* Tue May 2 2006 Hans de Goede 0.2.1-1 +- new upstream version: 0.2.1 + +* Tue Mar 21 2006 Hans de Goede 0.2.0-2 +- rebuild for new libgsf + * Thu Feb 16 2006 Hans de Goede 0.2.0-1 - New upstream version - Remove .la files from plugin dirs Index: sources =================================================================== RCS file: /cvs/extras/rpms/goffice/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 00:21:28 -0000 1.3 +++ sources 6 May 2006 07:49:41 -0000 1.4 @@ -1 +1 @@ -e1f60fc9822813c6c3f20296e54928bf goffice-0.2.0.tar.bz2 +73b733556db5721ddfd5c72fc6428a15 goffice-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 07:53:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 00:53:57 -0700 Subject: rpms/gnumeric/devel .cvsignore, 1.4, 1.5 gnumeric.spec, 1.17, 1.18 sources, 1.4, 1.5 Message-ID: <200605060753.k467rxN7027307@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27286 Modified Files: .cvsignore gnumeric.spec sources Log Message: * Tue May 2 2006 Hans de Goede 1:1.6.3-1 - new upstream version 1.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 00:25:39 -0000 1.4 +++ .cvsignore 6 May 2006 07:53:57 -0000 1.5 @@ -1 +1 @@ -gnumeric-1.6.2.tar.bz2 +gnumeric-1.6.3.tar.bz2 Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnumeric.spec 8 Apr 2006 09:18:04 -0000 1.17 +++ gnumeric.spec 6 May 2006 07:53:57 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Spreadsheet program for GNOME Name: gnumeric -Version: 1.6.2 -Release: 3%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Productivity @@ -166,6 +166,9 @@ %changelog +* Tue May 2 2006 Hans de Goede 1:1.6.3-1 +- new upstream version 1.6.3 + * Sat Apr 8 2006 Hans de Goede 1:1.6.2-3 - drop bogus mc stuff (bz 169332) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 00:25:39 -0000 1.4 +++ sources 6 May 2006 07:53:57 -0000 1.5 @@ -1 +1 @@ -ca6ecf464279297a4f3d41e7f35ebb39 gnumeric-1.6.2.tar.bz2 +78ffd75ae6abc3bb20dd04407a082a26 gnumeric-1.6.3.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 07:55:56 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 00:55:56 -0700 Subject: rpms/gnumeric/FC-5 .cvsignore, 1.4, 1.5 gnumeric.spec, 1.16, 1.17 sources, 1.4, 1.5 Message-ID: <200605060755.k467twDi027383@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27362 Modified Files: .cvsignore gnumeric.spec sources Log Message: * Tue May 2 2006 Hans de Goede 1:1.6.3-1 - new upstream version 1.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnumeric/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 00:25:39 -0000 1.4 +++ .cvsignore 6 May 2006 07:55:55 -0000 1.5 @@ -1 +1 @@ -gnumeric-1.6.2.tar.bz2 +gnumeric-1.6.3.tar.bz2 Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/FC-5/gnumeric.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnumeric.spec 8 Apr 2006 09:21:12 -0000 1.16 +++ gnumeric.spec 6 May 2006 07:55:55 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Spreadsheet program for GNOME Name: gnumeric -Version: 1.6.2 -Release: 3%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Productivity @@ -166,6 +166,9 @@ %changelog +* Tue May 2 2006 Hans de Goede 1:1.6.3-1 +- new upstream version 1.6.3 + * Sat Apr 8 2006 Hans de Goede 1:1.6.2-3 - drop bogus mc stuff (bz 169332) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnumeric/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 00:25:39 -0000 1.4 +++ sources 6 May 2006 07:55:55 -0000 1.5 @@ -1 +1 @@ -ca6ecf464279297a4f3d41e7f35ebb39 gnumeric-1.6.2.tar.bz2 +78ffd75ae6abc3bb20dd04407a082a26 gnumeric-1.6.3.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 08:31:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 01:31:58 -0700 Subject: rpms/crystal-stacker/devel crystal-stacker.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605060832.k468W0Rl029769@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/crystal-stacker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29750 Modified Files: crystal-stacker.spec sources Log Message: * Sat May 6 2006 Hans de Goede 1.5-1 - New upstream release 1.5 (final). Index: crystal-stacker.spec =================================================================== RCS file: /cvs/extras/rpms/crystal-stacker/devel/crystal-stacker.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crystal-stacker.spec 9 Apr 2006 07:30:54 -0000 1.1 +++ crystal-stacker.spec 6 May 2006 08:31:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: crystal-stacker Version: 1.5 -Release: 0.pre.2%{?dist} +Release: 1%{?dist} Summary: Falling blocks, match 3 or more of the same color crystals Group: Amusements/Games License: Freeware @@ -8,7 +8,6 @@ Source0: http://www.t3-i.com/ncdgames/cs15src.zip Source1: %{name}.desktop Source2: %{name}-theme-editor.desktop -Patch0: crystal-stacker-1.5-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel dumb-devel ImageMagick desktop-file-utils @@ -31,7 +30,6 @@ %prep %setup -q -c -%patch0 -p1 -z .fixes %{__sed} -i 's/\r//' ce/*.txt cs/*.txt @@ -123,6 +121,9 @@ %changelog +* Sat May 6 2006 Hans de Goede 1.5-1 +- New upstream release 1.5 (final). + * Fri Apr 8 2006 Hans de Goede 1.5-0.pre.2 - Updated Patch0 to not unnescesarry pause the music when selecting a new theme and using pthreads to play the music. Index: sources =================================================================== RCS file: /cvs/extras/rpms/crystal-stacker/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Apr 2006 07:30:54 -0000 1.2 +++ sources 6 May 2006 08:31:58 -0000 1.3 @@ -1 +1 @@ -d961dfdc859267b2763f4b585a732f3e cs15src.zip +c0e50b809f581807644171490afb3481 cs15src.zip From fedora-extras-commits at redhat.com Sat May 6 08:32:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 01:32:44 -0700 Subject: rpms/crystal-stacker/devel crystal-stacker-1.5-fixes.patch, 1.1, NONE Message-ID: <200605060832.k468WkbI029833@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/crystal-stacker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29818 Removed Files: crystal-stacker-1.5-fixes.patch Log Message: remove no longr used patchfile --- crystal-stacker-1.5-fixes.patch DELETED --- From fedora-extras-commits at redhat.com Sat May 6 09:03:34 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Sat, 6 May 2006 02:03:34 -0700 Subject: owners owners.list,1.944,1.945 Message-ID: <200605060903.k4693bY4032118@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32101 Modified Files: owners.list Log Message: Fix sort order. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.944 retrieving revision 1.945 diff -u -r1.944 -r1.945 --- owners.list 6 May 2006 07:42:32 -0000 1.944 +++ owners.list 6 May 2006 09:03:34 -0000 1.945 @@ -1123,12 +1123,12 @@ Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PBS|Perl binding for the Portable Batch System client library|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 6 10:10:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sat, 6 May 2006 03:10:54 -0700 Subject: rpms/gcl/FC-5 gcl.spec,1.19,1.20 Message-ID: <200605061010.k46AAuDJ002076@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045/FC-5 Modified Files: gcl.spec Log Message: Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/FC-5/gcl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gcl.spec 14 Apr 2006 09:44:15 -0000 1.19 +++ gcl.spec 6 May 2006 10:10:54 -0000 1.20 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 10%{?dist} +Release: 11%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -21,7 +21,7 @@ %description -GCL is a Common Lisp currently compliant with the CLtL1 standard. Lisp +GCL is a Common Lisp currently compliant with the ANSI standard. Lisp compilation produces native code through the intermediary of the system's C compiler, from which GCL derives efficient performance and facile portability. Currently uses TCL/Tk as GUI. @@ -34,7 +34,7 @@ %build -%configure --enable-readine --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} +%configure --enable-readline --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} perl -pi -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh makedefc makedefs perl -pi -e 's|/usr/lib/tcl|%{_datadir}/tcl|' debian/gcl.sh makedefc makedefs # %{?_smp_mflags} breaks the build @@ -97,6 +97,10 @@ %changelog +* Sat May 6 2006 Gerard Milmeister - 2.6.7-11 +- fixed summary text (CLtL1 -> ANSI) +- configure: readine -> readline + * Fri Apr 14 2006 Gerard Milmeister - 2.6.7-10 - added changes to SELinux policy From fedora-extras-commits at redhat.com Sat May 6 10:10:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sat, 6 May 2006 03:10:54 -0700 Subject: rpms/gcl/devel gcl.spec,1.18,1.19 Message-ID: <200605061010.k46AAutp002080@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045/devel Modified Files: gcl.spec Log Message: Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gcl.spec 8 Mar 2006 20:53:23 -0000 1.18 +++ gcl.spec 6 May 2006 10:10:54 -0000 1.19 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 9%{?dist} +Release: 11%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -15,13 +15,13 @@ BuildRequires: tcl-devel BuildRequires: gmp-devel BuildRequires: tetex, texinfo -Requires(post): /sbin/install-info -Requires(postun): /sbin/install-info +Requires(post): /sbin/install-info, policycoreutils +Requires(postun): /sbin/install-info, policycoreutils ExcludeArch: ppc ppc64 %description -GCL is a Common Lisp currently compliant with the CLtL1 standard. Lisp +GCL is a Common Lisp currently compliant with the ANSI standard. Lisp compilation produces native code through the intermediary of the system's C compiler, from which GCL derives efficient performance and facile portability. Currently uses TCL/Tk as GUI. @@ -34,7 +34,7 @@ %build -%configure --enable-readine --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} +%configure --enable-readline --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} perl -pi -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh makedefc makedefs perl -pi -e 's|/usr/lib/tcl|%{_datadir}/tcl|' debian/gcl.sh makedefc makedefs # %{?_smp_mflags} breaks the build @@ -72,14 +72,15 @@ %post /sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || : +/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || : +/sbin/restorecon "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2> /dev/null || : %postun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}-si.info \ - %{_infodir}/dir 2>/dev/null || : - /sbin/install-info --delete %{_infodir}/%{name}-tk.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || : + /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || : fi @@ -96,6 +97,13 @@ %changelog +* Sat May 6 2006 Gerard Milmeister - 2.6.7-11 +- fixed summary text (CLtL1 -> ANSI) +- configure: readine -> readline + +* Fri Apr 14 2006 Gerard Milmeister - 2.6.7-10 +- added changes to SELinux policy + * Wed Mar 8 2006 Gerard Milmeister - 2.6.7-7 - Patch gcl-bash.patch for configure From fedora-extras-commits at redhat.com Sat May 6 12:52:50 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 05:52:50 -0700 Subject: rpms/syslog-ng/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.12, 1.13 Message-ID: <200605061252.k46Cqq7O007532@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7511 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Mar 2006 16:52:51 -0000 1.5 +++ .cvsignore 6 May 2006 12:52:49 -0000 1.6 @@ -1 +1 @@ -syslog-ng-1.6.10.tar.gz +syslog-ng-1.6.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Mar 2006 16:52:51 -0000 1.5 +++ sources 6 May 2006 12:52:49 -0000 1.6 @@ -1 +1 @@ -b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz +8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/syslog-ng.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- syslog-ng.spec 30 Mar 2006 16:52:51 -0000 1.12 +++ syslog-ng.spec 6 May 2006 12:52:49 -0000 1.13 @@ -1,22 +1,36 @@ +# +# Rebuild option: +# +# --with spoofing enables the syslog-ng feature spoof-source +# (see README.spoof for more information) +# %define sbindir /sbin +%define libolver 0.3.18 +%define spoofing 0 + +%{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.10 +Version: 1.6.11 Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL -Url: http://www.balabit.com/products/syslog_ng/ +URL: http://www.balabit.com/products/syslog_ng/ Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz Source1: syslog.log Patch0: syslog-ng-1.6.7-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildConflicts: libol-devel < 0.3.17 -BuildRequires: flex, tcp_wrappers, which +BuildConflicts: libol-devel < %{libolver} +BuildRequires: flex, which +BuildRequires: tcp_wrappers +%if %{spoofing} +BuildRequires: libnet-devel >= 1.1 +%endif Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts @@ -42,11 +56,14 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.18/ChangeLog ChangeLog.libol +mv libol-%{libolver}/{ChangeLog,ChangeLog.libol} %build %configure \ --sbindir=%{sbindir} \ +%if %{spoofing} + --enable-spoof-source \ +%endif --enable-tcp-wrapper make %{?_smp_mflags} @@ -76,15 +93,15 @@ %post # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then - /sbin/chkconfig --add syslog-ng -# /sbin/service syslog-ng start + /sbin/chkconfig --add syslog-ng +# /sbin/service syslog-ng start fi %preun # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then - /sbin/service syslog-ng stop > /dev/null 2>&1 || : - /sbin/chkconfig --del syslog-ng + /sbin/service syslog-ng stop > /dev/null 2>&1 || : + /sbin/chkconfig --del syslog-ng fi %postun @@ -97,11 +114,10 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt -%doc doc/*.demo doc/*.sample +%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample} %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl -%doc ChangeLog.libol +%doc libol-%{libolver}/ChangeLog.libol %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -113,8 +129,16 @@ %changelog +* Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 +- Update to 1.6.11. + +* Sun Apr 2 2006 Jose Pedro Oliveira - 1.6.10-2 +- Build option to support the syslog-ng spoof-source feature + (the feature spoof-source is disabled by default). + * Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 - Update to 1.6.10. +- The postscript documentation has been dropped (upstream). * Wed Feb 15 2006 Jose Pedro Oliveira - 1.6.9-3 - Rebuild. From fedora-extras-commits at redhat.com Sat May 6 12:56:43 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 6 May 2006 05:56:43 -0700 Subject: extras-buildsys/utils extras-push-new,NONE,1.1 Message-ID: <200605061256.k46Cuheg007601@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7584 Added Files: extras-push-new Log Message: Add a extras-push-new script, which combines the scripts extras-push, extras-push-all and extras-sign-move.py and avoids some of the problems we've experienced. --- NEW FILE extras-push-new --- #!/usr/bin/python -t # -*- mode: Python; indent-tabs-mode: nil; -*- # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import fcntl import os, sys import rpmUtils import shutil import string DEBUG = False signersgid = 100581 # extras_signers group distro = 'fedora' project = 'extras' stagesdir = '/srv/rpmbuild/repodir' treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project) # Where we store mails to be sent, lockfiles. rundir = '/srv/rpmbuild/extras-push-rundir' cachedir = '/tmp/repomd-cache' compsname = 'comps.xml' project_hr = 'Fedora Extras' mail_from = 'buildsys at fedoraproject.org' mail_to = 'fedora-extras-list at redhat.com' mail_footer = """ For more information about the built packages please see the repository or the fedora Info Feed: http://fedoraproject.org/infofeed/ """ config = { 'repoview' : True, 'repoclosure' : False, 'gidcheck' : True, 'setumask' : True, 'mail' : True } alldists = [ 'development', '5', '4', '3' ] archdict = { '3' : ['x86_64', 'i386'], '4' : ['ppc','x86_64', 'i386'], '5' : ['ppc','x86_64', 'i386'], 'development' : ['ppc','x86_64','i386'], } # Note: *no* depsolving is done for these. copydict = { 'wine.i386': ['x86_64'], 'wine-arts.i386': ['x86_64'], 'wine-capi.i386': ['x86_64'], 'wine-cms.i386': ['x86_64'], 'wine-debuginfo.i386': ['x86_64'], 'wine-devel.i386': ['x86_64'], 'wine-esd.i386': ['x86_64'], 'wine-jack.i386': ['x86_64'], 'wine-ldap.i386': ['x86_64'], 'wine-nas.i386': ['x86_64'], 'wine-tools.i386': ['x86_64'], 'wine-twain.i386': ['x86_64'], # lcms for wine-cms in FE-3 and FE-4 'lcms.i386': ['x86_64'], 'lcms-debuginfo.i386': ['x86_64'], } ts = rpmUtils.transaction.initReadOnlyTransaction() def debugprint(msg): if DEBUG: print msg def run_and_check(cmd): debugprint(cmd) if DEBUG: return result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd sys.exit(result) class LockFile: def __init__(self, name): self.name = name def lock(self): if DEBUG: return self.file = open(self.name,'w') try: self.rc = fcntl.flock(self.file, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError: print 'ERROR: script locked via lockfile %s - it seems to be running already' % name sys.exit(11) def unlock(self): if DEBUG: return fcntl.flock(self.file, fcntl.LOCK_UN) self.file.close() # ==================================================================== # (previously in extras-sign-move.py) # get the path to where to look for the packages to be signed # get the list of stuff there (logs, md5sums, specs, rpms) # list the rpms and pause # sign the rpms # collect list of srpms and get package n-v-r from them # move pkgs into repo def find_files(path): """returns a dict of filetypes and paths to those files""" filedict = {} filedict['srpm'] = [] filedict['log'] = [] filedict['rpm'] = [] filedict['spec'] = [] filedict['md5sum'] = [] filedict['debuginfo'] = [] filedict['other'] = [] for root, dirs, files in os.walk(path): for file in files: # match the files to what list they should be in if file.endswith('.log'): which = 'log' elif file.endswith('.rpm'): if file.find('debuginfo') != -1: which = 'debuginfo' elif file.endswith('.src.rpm'): which = 'srpm' else: which = 'rpm' elif file.endswith('.spec'): which = 'spec' elif file.endswith('.md5sum'): which = 'md5sum' else: which = 'other' fullfile = os.path.join(root, file) filedict[which].append(fullfile) return filedict def naevr(pkg): """return nevra from the package srpm""" hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg) name = hdr['name'] ver = hdr['version'] rel = hdr['release'] arch = hdr['arch'] epoch = hdr['epoch'] if epoch is None: epoch = 0 return (name, arch, epoch, ver, rel) def sign_pkgs(filelist): """gpg sign all the rpms""" numfiles = len(filelist) if numfiles < 1: print "No packages to sign" return False while numfiles > 0: if numfiles > 256: files = filelist[:256] del filelist[:256] else: files = filelist filelist = [] foo = string.join(files) result = os.system('echo %s | xargs rpm --resign' % foo) if result != 0: return False numfiles = len(filelist) return True def sign_move(dist): runfilename = os.path.join(rundir, dist) if DEBUG: runfilename += '.DEBUG' try: rundirfile = open(runfilename,'a') except: print 'ERROR: Could not write to %s' % runfilename return 11 distdir = '%s-%s-%s' % (distro, dist, project) needsign = os.path.join(stagesdir, distdir) files = find_files(needsign) rpms = files['rpm'] + files['srpm'] + files['debuginfo'] rpms.sort() for item in rpms: print ' %s' % os.path.basename(item) destdir = os.path.join(treedir, dist) if not os.path.exists(destdir): for arch in archdict[dist]: if not DEBUG: os.makedirs(destdir + '/' + arch + '/debug') if not DEBUG: os.makedirs(destdir + '/' + 'SRPMS') rpms = files['rpm'] + files['srpm'] + files['debuginfo'] if len(rpms) == 0: print 'nothing to sign' return(4) print "Signing Packages:" if not DEBUG: result = sign_pkgs(rpms) if not result: print "Error signing packages" return(2) print "Moving Packages into Place" infolist = [] for package in files['srpm']: (n,a,e,v,r) = naevr(package) pkg_fn = os.path.basename(package) srpmloc = os.path.join(destdir, 'SRPMS', pkg_fn) debugprint('Moving %s to %s' % (package, srpmloc)) if os.path.exists(srpmloc): debugprint('%s already exists, ignoring new one' % srpmloc) if not DEBUG: os.unlink(package) else: infolist.append('%s-%s-%s' % (n,v,r)) if not DEBUG: shutil.move(package, srpmloc) # go through each package and move it to the right arch location. # if it is a noarch package, copy2 it to all arch locations and unlink it # if it is listed in copydict, copy2 it around as appropriate # if it is a debuginfo package, move it into the 'debug' dir for that arch for package in files['rpm'] + files['debuginfo']: pkg_fn = os.path.basename(package) (n,a,e,v,r) = naevr(package) copyarchs = copydict.get('%s.%s' % (n, a)) if copyarchs: for arch in copyarchs: if not arch in archdict[dist]: continue if package in files['debuginfo']: arch = '%s/debug' % arch rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint("Copying %s to %s" % (package, rpmloc)) if os.path.exists(rpmloc): debugprint('%s already exists, ignoring new one' % rpmloc) elif not DEBUG: shutil.copy2(package, rpmloc) if a == 'noarch': for arch in archdict[dist]: if package in files['debuginfo']: arch = '%s/debug' % arch rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint("Copying %s to %s" % (package, rpmloc)) if os.path.exists(rpmloc): debugprint('%s already exists, ignoring new one' % rpmloc) elif not DEBUG: shutil.copy2(package, rpmloc) if not DEBUG: os.unlink(package) continue elif a in ['i386', 'i486', 'i586', 'i686', 'athlon']: if package in files['debuginfo']: arch = 'i386/debug' else: arch = 'i386' elif a in ['x86_64', 'ia32e', 'amd64']: if package in files['debuginfo']: arch = 'x86_64/debug' else: arch = 'x86_64' elif a in ['ppc', 'ppc64', 'ppc32']: if package in files['debuginfo']: arch = 'ppc/debug' else: arch = 'ppc' else: print 'Unknown arch %s' % a continue rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint('Moving %s to %s' % (package, rpmloc)) if os.path.exists(rpmloc): debugprint('%s already exists, ignoring new one' % rpmloc) if not DEBUG: os.unlink(package) elif not DEBUG: shutil.move(package, rpmloc) # Store list of move packages, so it can be mailed later. for add in infolist: add += '\n' rundirfile.write( add ) rundirfile.close() # clean up the crap print "Cleaning Up" for file in files['log'] + files['md5sum'] + files['spec']: debugprint('removing %s' % file) if not DEBUG: os.unlink(file) # FIXME clean up empty dirs, too. return(0) # ==================================================================== import smtplib from email.MIMEText import MIMEText def email_list(pkglist, dist): """email mailing list with the new package listing""" uniqued = rpmUtils.miscutils.unique(pkglist) uniqued.sort() output = "\nPackages built and released for %s %s: %s \n\n" % (project_hr, dist, len(uniqued)) for pkg in uniqued: add = '%s\n' % (pkg) output = output + add output = output + mail_footer msg = MIMEText(output) subject = '%s %s Package Build Report' % (project_hr, dist) msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to debugprint( msg.as_string() ) if DEBUG: return s = smtplib.SMTP() s.connect() s.sendmail(mail_from, [mail_to], msg.as_string()) s.close() # ==================================================================== def getlinesfromrunfile(dist): runfilename = os.path.join(rundir, dist) if DEBUG: runfilename += '.DEBUG' pkglist = [] if os.path.isfile(runfilename): try: rundirfile = open(runfilename,'r') for line in rundirfile: pkglist.append( line.rstrip() ) rundirfile.close() except IOError: print 'ERROR: Could not open %s' % runfilename sys.exit(5) return pkglist def emptyrunfile(dist): runfilename = os.path.join(rundir, dist) if DEBUG: runfilename += '.DEBUG' if not os.path.isfile(runfilename): return try: os.remove(runfilename) except: print 'ERROR: Could not remove %s' % runfilename pass if __name__ == '__main__': if config['gidcheck']: if os.getgid() != signersgid: print 'ERROR: Change into extras_signers group!' sys.exit(13) if config['setumask']: os.umask(0002) if len(sys.argv) < 2: print 'SYNTAX: %s [dist]...' % sys.argv[0] sys.exit(22) dists = [] # the list of distribution release we want to push distdict = {} for d in sys.argv[1:]: if d == 'all': dists = alldists continue if d not in alldists: print "ERROR: No Distribution named '%s' found" % d sys.exit(1) if not distdict.has_key(d): dists.append(d) distdict[d] = True debugprint(dists) # If we are called as 'extras-sign-move.py' we simulate old # behaviour and only do: sign, move, repobuild, sync if sys.argv[0].endswith('extras-sign-move.py'): config['repoview'] = False if not os.path.exists(rundir): os.makedirs(rundir) lockfile = os.path.join(rundir,'extras-push.lock') lock = LockFile(lockfile) lock.lock() for dist in dists: result = sign_move(dist) if result and result != 4: # 4 = no packages to sign sys.exit(result) for dist in dists: # Process all dists for which we find a run-file which contains >= 1 pkg names. pkglist = getlinesfromrunfile(dist) if len(pkglist): run_and_check('extras-repobuild.py %s' % dist) if config['repoview']: run_and_check('extras-repoview.py %s' % dist) if config['repoclosure']: pass run_and_check('extras-sync') if config['mail']: for dist in dists: email_list( getlinesfromrunfile(dist), dist ) emptyrunfile(dist) lock.unlock() sys.exit(0) From fedora-extras-commits at redhat.com Sat May 6 13:09:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 06:09:13 -0700 Subject: rpms/syslog-ng/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.8, 1.9 Message-ID: <200605061309.k46D9jNC009913@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9873/FC-3 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Apr 2006 19:52:51 -0000 1.5 +++ .cvsignore 6 May 2006 13:09:13 -0000 1.6 @@ -1 +1 @@ -syslog-ng-1.6.10.tar.gz +syslog-ng-1.6.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Apr 2006 19:52:51 -0000 1.5 +++ sources 6 May 2006 13:09:13 -0000 1.6 @@ -1 +1 @@ -b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz +8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/syslog-ng.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- syslog-ng.spec 5 Apr 2006 19:52:51 -0000 1.8 +++ syslog-ng.spec 6 May 2006 13:09:13 -0000 1.9 @@ -1,22 +1,36 @@ +# +# Rebuild option: +# +# --with spoofing enables the syslog-ng feature spoof-source +# (see README.spoof for more information) +# %define sbindir /sbin +%define libolver 0.3.18 +%define spoofing 0 + +%{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.10 +Version: 1.6.11 Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL -Url: http://www.balabit.com/products/syslog_ng/ +URL: http://www.balabit.com/products/syslog_ng/ Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz Source1: syslog.log Patch0: syslog-ng-1.6.7-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildConflicts: libol-devel < 0.3.17 -BuildRequires: flex, tcp_wrappers, which +BuildConflicts: libol-devel < %{libolver} +BuildRequires: flex, which +BuildRequires: tcp_wrappers +%if %{spoofing} +BuildRequires: libnet-devel >= 1.1 +%endif Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts @@ -47,11 +61,14 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.18/ChangeLog ChangeLog.libol +mv libol-%{libolver}/{ChangeLog,ChangeLog.libol} %build %configure \ --sbindir=%{sbindir} \ +%if %{spoofing} + --enable-spoof-source \ +%endif --enable-tcp-wrapper make %{?_smp_mflags} @@ -81,15 +98,15 @@ %post # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then - /sbin/chkconfig --add syslog-ng -# /sbin/service syslog-ng start + /sbin/chkconfig --add syslog-ng +# /sbin/service syslog-ng start fi %preun # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then - /sbin/service syslog-ng stop > /dev/null 2>&1 || : - /sbin/chkconfig --del syslog-ng + /sbin/service syslog-ng stop > /dev/null 2>&1 || : + /sbin/chkconfig --del syslog-ng fi %postun @@ -102,11 +119,10 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt -%doc doc/*.demo doc/*.sample +%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample} %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl -%doc ChangeLog.libol +%doc libol-%{libolver}/ChangeLog.libol %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -118,8 +134,16 @@ %changelog +* Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 +- Update to 1.6.11. + +* Sun Apr 2 2006 Jose Pedro Oliveira - 1.6.10-2 +- Build option to support the syslog-ng spoof-source feature + (the feature spoof-source is disabled by default). + * Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 - Update to 1.6.10. +- The postscript documentation has been dropped (upstream). * Wed Nov 30 2005 Jose Pedro Oliveira - 1.6.9-1 - Build conflict statement From fedora-extras-commits at redhat.com Sat May 6 13:09:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 06:09:13 -0700 Subject: rpms/syslog-ng/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.8, 1.9 Message-ID: <200605061309.k46D9jre009918@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9873/FC-4 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Mar 2006 16:52:50 -0000 1.5 +++ .cvsignore 6 May 2006 13:09:13 -0000 1.6 @@ -1 +1 @@ -syslog-ng-1.6.10.tar.gz +syslog-ng-1.6.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Mar 2006 16:52:50 -0000 1.5 +++ sources 6 May 2006 13:09:13 -0000 1.6 @@ -1 +1 @@ -b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz +8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/syslog-ng.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- syslog-ng.spec 30 Mar 2006 16:52:50 -0000 1.8 +++ syslog-ng.spec 6 May 2006 13:09:13 -0000 1.9 @@ -1,22 +1,36 @@ +# +# Rebuild option: +# +# --with spoofing enables the syslog-ng feature spoof-source +# (see README.spoof for more information) +# %define sbindir /sbin +%define libolver 0.3.18 +%define spoofing 0 + +%{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.10 +Version: 1.6.11 Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL -Url: http://www.balabit.com/products/syslog_ng/ +URL: http://www.balabit.com/products/syslog_ng/ Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz Source1: syslog.log Patch0: syslog-ng-1.6.7-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildConflicts: libol-devel < 0.3.17 -BuildRequires: flex, tcp_wrappers, which +BuildConflicts: libol-devel < %{libolver} +BuildRequires: flex, which +BuildRequires: tcp_wrappers +%if %{spoofing} +BuildRequires: libnet-devel >= 1.1 +%endif Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts @@ -47,11 +61,14 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.18/ChangeLog ChangeLog.libol +mv libol-%{libolver}/{ChangeLog,ChangeLog.libol} %build %configure \ --sbindir=%{sbindir} \ +%if %{spoofing} + --enable-spoof-source \ +%endif --enable-tcp-wrapper make %{?_smp_mflags} @@ -81,15 +98,15 @@ %post # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then - /sbin/chkconfig --add syslog-ng -# /sbin/service syslog-ng start + /sbin/chkconfig --add syslog-ng +# /sbin/service syslog-ng start fi %preun # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then - /sbin/service syslog-ng stop > /dev/null 2>&1 || : - /sbin/chkconfig --del syslog-ng + /sbin/service syslog-ng stop > /dev/null 2>&1 || : + /sbin/chkconfig --del syslog-ng fi %postun @@ -102,11 +119,10 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt -%doc doc/*.demo doc/*.sample +%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample} %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl -%doc ChangeLog.libol +%doc libol-%{libolver}/ChangeLog.libol %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -118,8 +134,16 @@ %changelog +* Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 +- Update to 1.6.11. + +* Sun Apr 2 2006 Jose Pedro Oliveira - 1.6.10-2 +- Build option to support the syslog-ng spoof-source feature + (the feature spoof-source is disabled by default). + * Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 - Update to 1.6.10. +- The postscript documentation has been dropped (upstream). * Wed Nov 30 2005 Jose Pedro Oliveira - 1.6.9-1 - Build conflict statement From fedora-extras-commits at redhat.com Sat May 6 13:14:44 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 6 May 2006 06:14:44 -0700 Subject: extras-buildsys/utils extras-push-new,1.1,1.2 Message-ID: <200605061314.k46DEikI010020@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10002 Modified Files: extras-push-new Log Message: re-use code Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- extras-push-new 6 May 2006 12:56:40 -0000 1.1 +++ extras-push-new 6 May 2006 13:14:41 -0000 1.2 @@ -121,6 +121,39 @@ self.file.close() +def getrunfilename(dist): + runfilename = os.path.join(rundir, dist) + if DEBUG: + runfilename += '.DEBUG' + return runfilename + + +def getlinesfromrunfile(dist): + runfilename = getrunfilename(dist) + pkglist = [] + if os.path.isfile(runfilename): + try: + rundirfile = open(runfilename,'r') + for line in rundirfile: + pkglist.append( line.rstrip() ) + rundirfile.close() + except IOError: + print 'ERROR: Could not open %s' % runfilename + sys.exit(5) + return pkglist + + +def emptyrunfile(dist): + runfilename = getrunfilename(dist) + if not os.path.isfile(runfilename): + return + try: + os.remove(runfilename) + except: + print 'ERROR: Could not remove %s' % runfilename + pass + + # ==================================================================== # (previously in extras-sign-move.py) @@ -205,9 +238,7 @@ def sign_move(dist): - runfilename = os.path.join(rundir, dist) - if DEBUG: - runfilename += '.DEBUG' + runfilename = getrunfilename(dist) try: rundirfile = open(runfilename,'a') except: @@ -378,36 +409,6 @@ # ==================================================================== -def getlinesfromrunfile(dist): - runfilename = os.path.join(rundir, dist) - if DEBUG: - runfilename += '.DEBUG' - pkglist = [] - if os.path.isfile(runfilename): - try: - rundirfile = open(runfilename,'r') - for line in rundirfile: - pkglist.append( line.rstrip() ) - rundirfile.close() - except IOError: - print 'ERROR: Could not open %s' % runfilename - sys.exit(5) - return pkglist - - -def emptyrunfile(dist): - runfilename = os.path.join(rundir, dist) - if DEBUG: - runfilename += '.DEBUG' - if not os.path.isfile(runfilename): - return - try: - os.remove(runfilename) - except: - print 'ERROR: Could not remove %s' % runfilename - pass - - if __name__ == '__main__': if config['gidcheck']: if os.getgid() != signersgid: From fedora-extras-commits at redhat.com Sat May 6 14:43:09 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 6 May 2006 07:43:09 -0700 Subject: owners owners.list,1.945,1.946 Message-ID: <200605061443.k46EhB6h012485@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12468 Modified Files: owners.list Log Message: Fix typo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.945 retrieving revision 1.946 diff -u -r1.945 -r1.946 --- owners.list 6 May 2006 09:03:34 -0000 1.945 +++ owners.list 6 May 2006 14:43:08 -0000 1.946 @@ -1000,7 +1000,7 @@ Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Finanace-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Finance-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Font-TTF|Perl interface to TrueType Font files|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 6 15:26:05 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 6 May 2006 08:26:05 -0700 Subject: rpms/SOAPpy/FC-5 SOAPpy.spec,1.1,1.2 Message-ID: <200605061526.k46FQ7XI014920@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/SOAPpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874/SOAPpy/FC-5 Modified Files: SOAPpy.spec Log Message: Add Provides/Obsolete for python-SOAPpy Index: SOAPpy.spec =================================================================== RCS file: /cvs/extras/rpms/SOAPpy/FC-5/SOAPpy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SOAPpy.spec 18 Apr 2006 01:39:11 -0000 1.1 +++ SOAPpy.spec 6 May 2006 15:26:05 -0000 1.2 @@ -2,7 +2,7 @@ Name: SOAPpy Version: 0.11.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-featured SOAP library for Python Group: Development/Languages License: Python Software Foundation License @@ -13,7 +13,8 @@ BuildRequires: python-fpconst >= 0.6.0 Requires: python-fpconst >= 0.6.0 Requires: PyXML >= 0.8.3 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Obsoletes: python-SOAPpy +Provides: python-SOAPpy = %{version}-%{release} %description The goal of the SOAPpy team is to provide a full-featured SOAP library @@ -73,6 +74,9 @@ %changelog +* Sat May 06 2006 Christopher Stone 0.11.6-3 +- Add Provides/Obsolete for python-SOAPpy + * Mon Apr 17 2006 Christopher Stone 0.11.6-2 - Add docs directory to %doc - Remove PyXML BR From fedora-extras-commits at redhat.com Sat May 6 15:26:05 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 6 May 2006 08:26:05 -0700 Subject: rpms/SOAPpy/devel SOAPpy.spec,1.1,1.2 Message-ID: <200605061526.k46FQ7g8014925@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/SOAPpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874/SOAPpy/devel Modified Files: SOAPpy.spec Log Message: Add Provides/Obsolete for python-SOAPpy Index: SOAPpy.spec =================================================================== RCS file: /cvs/extras/rpms/SOAPpy/devel/SOAPpy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SOAPpy.spec 18 Apr 2006 01:39:11 -0000 1.1 +++ SOAPpy.spec 6 May 2006 15:26:05 -0000 1.2 @@ -2,7 +2,7 @@ Name: SOAPpy Version: 0.11.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-featured SOAP library for Python Group: Development/Languages License: Python Software Foundation License @@ -13,7 +13,8 @@ BuildRequires: python-fpconst >= 0.6.0 Requires: python-fpconst >= 0.6.0 Requires: PyXML >= 0.8.3 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Obsoletes: python-SOAPpy +Provides: python-SOAPpy = %{version}-%{release} %description The goal of the SOAPpy team is to provide a full-featured SOAP library @@ -73,6 +74,9 @@ %changelog +* Sat May 06 2006 Christopher Stone 0.11.6-3 +- Add Provides/Obsolete for python-SOAPpy + * Mon Apr 17 2006 Christopher Stone 0.11.6-2 - Add docs directory to %doc - Remove PyXML BR From fedora-extras-commits at redhat.com Sat May 6 15:26:04 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 6 May 2006 08:26:04 -0700 Subject: rpms/SOAPpy/FC-4 SOAPpy.spec,1.1,1.2 Message-ID: <200605061526.k46FQas7014934@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/SOAPpy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874/SOAPpy/FC-4 Modified Files: SOAPpy.spec Log Message: Add Provides/Obsolete for python-SOAPpy Index: SOAPpy.spec =================================================================== RCS file: /cvs/extras/rpms/SOAPpy/FC-4/SOAPpy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SOAPpy.spec 18 Apr 2006 01:39:11 -0000 1.1 +++ SOAPpy.spec 6 May 2006 15:26:04 -0000 1.2 @@ -2,7 +2,7 @@ Name: SOAPpy Version: 0.11.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-featured SOAP library for Python Group: Development/Languages License: Python Software Foundation License @@ -13,7 +13,8 @@ BuildRequires: python-fpconst >= 0.6.0 Requires: python-fpconst >= 0.6.0 Requires: PyXML >= 0.8.3 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Obsoletes: python-SOAPpy +Provides: python-SOAPpy = %{version}-%{release} %description The goal of the SOAPpy team is to provide a full-featured SOAP library @@ -73,6 +74,9 @@ %changelog +* Sat May 06 2006 Christopher Stone 0.11.6-3 +- Add Provides/Obsolete for python-SOAPpy + * Mon Apr 17 2006 Christopher Stone 0.11.6-2 - Add docs directory to %doc - Remove PyXML BR From fedora-extras-commits at redhat.com Sat May 6 15:31:18 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Sat, 6 May 2006 08:31:18 -0700 Subject: CVSROOT avail,1.31,1.32 Message-ID: <200605061531.k46FVI4P015003@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14985 Modified Files: avail Log Message: Add Ville Skytta to the Fedora Security Response Team Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- avail 2 May 2006 21:27:07 -0000 1.31 +++ avail 6 May 2006 15:31:16 -0000 1.32 @@ -46,9 +46,9 @@ # Red Hat Security Response Team avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security # Fedora Security Response Team -avail | jkeating,ausil,tibbs,kaboom | fedora-security -unavail | jkeating,ausil,tibbs,kaboom | fedora-security/audit/fc4 -unavail | jkeating,ausil,tibbs,kaboom | fedora-security/audit/fc5 +avail | jkeating,ausil,tibbs,kaboom,scop | fedora-security +unavail | jkeating,ausil,tibbs,kaboom,scop | fedora-security/audit/fc4 +unavail | jkeating,ausil,tibbs,kaboom,scop | fedora-security/audit/fc5 avail | pfrields | web/html/projects/docs avail | pfrields | web/html/participate/documentation-faq From fedora-extras-commits at redhat.com Sat May 6 16:11:54 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 6 May 2006 09:11:54 -0700 Subject: owners owners.list,1.946,1.947 Message-ID: <200605061611.k46GBu8f017466@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17449 Modified Files: owners.list Log Message: Change my e-mail address Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.946 retrieving revision 1.947 diff -u -r1.946 -r1.947 --- owners.list 6 May 2006 14:43:08 -0000 1.946 +++ owners.list 6 May 2006 16:11:54 -0000 1.947 @@ -1246,7 +1246,7 @@ Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| -Fedora Extras|poker-eval|Poker hand evaluator library|tkmame at retrogames.com|extras-qa at fedoraproject.org|loic at gnu.org +Fedora Extras|poker-eval|Poker hand evaluator library|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|polyxmass-bin|The GNU polyxmass software suite|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|polyxmass-common|Contains all textual/graphical data required for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|polyxmass-data|Contains configuration files describing polymer chemistry|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -1271,7 +1271,7 @@ Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pydot|Python interface to Graphviz's Dot language|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pyflowtools|Python bindings to OSU Flow-Tools library|i at stingr.net|extras-qa at fedoraproject.org| -Fedora Extras|pygame|Python modules for writing games|tkmame at retrogames.com|extras-qa at fedoraproject.org| +Fedora Extras|pygame|Python modules for writing games|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| @@ -1299,7 +1299,7 @@ Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|python-feedparser|Parse RSS and Atom feeds in Python|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-formencode|FormEncode is a validation and form generation package.|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|python-fpconst|A Python module for handling IEEE 754 floating point special values|tkmame at retrogames.com|extras-qa at fedoraproject.org| +Fedora Extras|python-fpconst|A Python module for handling IEEE 754 floating point special values|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| @@ -1449,7 +1449,7 @@ Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|snort|An intrusion detection system|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org| -Fedora Extras|SOAPpy|Full-featured SOAP library for Python|tkmame at retrogames.com|extras-qa at fedoraproject.org| +Fedora Extras|SOAPpy|Full-featured SOAP library for Python|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|sodipodi|Vector-based drawing program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|sopwith|SDL port of sopwith|adrian at lisas.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 6 17:24:01 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 6 May 2006 10:24:01 -0700 Subject: rpms/rssowl/FC-5 rssowl-swt31-SortingSelectionAdapter.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rssowl-browser.patch, 1.1, 1.2 rssowl-build0.patch, 1.1, 1.2 rssowl-build1.patch, 1.1, 1.2 rssowl-swt31.patch, 1.1, 1.2 rssowl-use-jce.patch, 1.1, 1.2 rssowl.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200605061724.k46HO3DP020465@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20377 Modified Files: .cvsignore rssowl-browser.patch rssowl-build0.patch rssowl-build1.patch rssowl-swt31.patch rssowl-use-jce.patch rssowl.spec sources Added Files: rssowl-swt31-SortingSelectionAdapter.patch Log Message: Update to rssowl 1.2.1. rssowl-swt31-SortingSelectionAdapter.patch: --- NEW FILE rssowl-swt31-SortingSelectionAdapter.patch --- --- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java.orig 2006-04-23 05:30:41.000000000 -0700 +++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java 2006-05-06 09:42:26.000000000 -0700 @@ -26,7 +26,6 @@ import net.sourceforge.rssowl.controller.NewsTable; -import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Table; @@ -42,7 +41,7 @@ * header is clicked and update it. * * @author Ludovic Kim-Xuan Galibert - * @version 1.2.1 + * @version 1.1.3 */ public class SortingSelectionAdapter extends SelectionAdapter { @@ -101,59 +100,67 @@ } /** - * Sort the News using a Sorter that is identified by the given field value. + * Handle the sorting corresponding to the header clicked * - * @param field The identifier of the Sorter to use. - * @return boolean TRUE if the sort was ascending, FALSE if descending. + * @param se the SelectionEvent */ - public boolean sort(String field) { + public void widgetSelected(SelectionEvent se) { + widgetSelected((TableColumn) se.getSource()); + } + + /** + * Handle the sorting corresponding to the header clicked + * + * @param tc The selected TableColumn + */ + public void widgetSelected(TableColumn tc) { Comparator sorter = null; boolean ascending = true; /** Sort by news title */ - if ("TABLE_HEADER_NEWSTITLE".equals(field)) { + if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) { ascending = this.titleAscending; this.titleAscending = !this.titleAscending; sorter = new TitleSorter(); } /** Sort by publish date */ - else if ("TABLE_HEADER_PUBDATE".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) { ascending = this.pudDateAscending; this.pudDateAscending = !this.pudDateAscending; sorter = new PubDateSorter(newsItems); } /** Sort by author */ - else if ("TABLE_HEADER_AUTHOR".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) { ascending = this.authorAscending; this.authorAscending = !this.authorAscending; sorter = new AuthorSorter(newsItems); } /** Sort by category */ - else if ("TABLE_HEADER_CATEGORY".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) { ascending = this.categoryAscending; this.categoryAscending = !this.categoryAscending; sorter = new CategorySorter(newsItems); } /** Sort by publisher */ - else if ("TABLE_HEADER_PUBLISHER".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) { ascending = this.publisherAscending; this.publisherAscending = !this.publisherAscending; sorter = new PublisherSorter(newsItems); } /** Sort by news feed */ - else if ("TABLE_HEADER_FEED".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_FEED")) { ascending = this.newsfeedAscending; this.newsfeedAscending = !this.newsfeedAscending; sorter = new NewsFeedSorter(newsItems); } /** Sort by news status */ - else if ("TABLE_HEADER_STATUS".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_STATUS")) { ascending = this.statusAscending; this.statusAscending = !this.statusAscending; sorter = new StatusSorter(newsItems); @@ -169,28 +176,6 @@ if (!ascending) Collections.reverse(newsItemOrder); - return ascending; - } - - /** - * Handle the sorting corresponding to the header clicked - * - * @param se the SelectionEvent - */ - public void widgetSelected(SelectionEvent se) { - widgetSelected((TableColumn) se.getSource()); - } - - /** - * Handle the sorting corresponding to the header clicked - * - * @param tc The selected TableColumn - */ - public void widgetSelected(TableColumn tc) { - - /** Sort based on the given TableColumn */ - boolean ascending = sort((String) tc.getData()); - /** Remember the width values of the columns */ int columnCount = table.getColumnCount(); int columnWidth[] = new int[columnCount]; @@ -202,41 +187,6 @@ if (table.getSelectionCount() > 0) selectedNews = table.getSelection()[0].getText(1); - /** Show a Sort Indicator inside the selected TableColumn */ - if (!tc.getData().equals("TABLE_HEADER_STATUS")) { - table.setSortColumn(tc); - - /** Reset Sort Direction */ - if (table.getSortDirection() != SWT.NONE) - table.setSortDirection(SWT.NONE); - - /** Apply the new direction */ - table.setSortDirection(ascending ? SWT.DOWN : SWT.UP); - - /** - * The Indicator requires some space, so pack the TableColumn. In order to - * avoid flashing, first set the Table to redraw = false before packing. - */ - table.setRedraw(false); - tc.pack(); - table.setRedraw(true); - - /** Restore Focus if necessary */ - if (!table.isFocusControl()) - table.setFocus(); - - /** Grant the sorted Column its preferred Width */ - int sortColumnIndex = table.indexOf(tc); - if (columnWidth[sortColumnIndex] < tc.getWidth()) - columnWidth[sortColumnIndex] = tc.getWidth(); - } - - /** Do not show the Indicator in the first, narrow Column */ - else if (table.getSortColumn() != null) { - table.setSortDirection(SWT.NONE); - table.setSortColumn(null); - } - /** Remove All tableitems */ table.removeAll(); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jan 2006 14:16:01 -0000 1.2 +++ .cvsignore 6 May 2006 17:24:01 -0000 1.3 @@ -1 +1,2 @@ rssowl_1_2_src_clean.tar.gz +rssowl_1_2_1_src.tar.gz rssowl-browser.patch: Index: rssowl-browser.patch =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-browser.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl-browser.patch 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl-browser.patch 6 May 2006 17:24:01 -0000 1.2 @@ -1,5 +1,5 @@ ---- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java~ 2005-11-06 08:06:57.000000000 -0800 -+++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java 2006-01-13 18:33:12.000000000 -0800 +--- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java.orig 2006-04-23 05:30:40.000000000 -0700 ++++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java 2006-05-06 09:54:29.000000000 -0700 @@ -36,6 +36,9 @@ import org.eclipse.swt.SWTError; import org.eclipse.swt.program.Program; @@ -10,14 +10,13 @@ import java.io.IOException; /** -@@ -267,11 +270,28 @@ +@@ -268,14 +271,31 @@ /** Try Netscape as default browser */ if (webBrowser == null) { try { - webBrowser = "netscape"; - p = Runtime.getRuntime().exec(webBrowser + " " + href); - } catch (IOException e) { -- p = null; - webBrowser = "mozilla"; + // This is kind of lame, but - oh well - it's slightly better than + // the original. @@ -30,17 +29,29 @@ + else if (webBrowser.startsWith("epiphany")) + webBrowser = "epiphany"; + if (webBrowser.startsWith("netscape")) -+ webBrowser = "netscape"; -+ else -+ webBrowser = "firefox"; ++ webBrowser = "netscape"; ++ else ++ webBrowser = "firefox"; + } catch (ConfException ce) { -+ try { -+ webBrowser = "firefox"; -+ p = Runtime.getRuntime().exec(webBrowser + " " + href); -+ } catch (IOException e) { -+ p = null; -+ webBrowser = "mozilla"; -+ } ++ try { ++ webBrowser = "firefox"; ++ p = Runtime.getRuntime().exec(webBrowser + " " + href); ++ } catch (IOException e) { ++ p = null; ++ webBrowser = "mozilla"; ++ } + } + } + +- /** Try Mozilla as default browser */ + if (p == null) { + try { + p = Runtime.getRuntime().exec(webBrowser + " " + href); +@@ -284,6 +304,7 @@ + errorMessage(); } } ++ + return p; + } rssowl-build0.patch: Index: rssowl-build0.patch =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-build0.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl-build0.patch 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl-build0.patch 6 May 2006 17:24:01 -0000 1.2 @@ -1,21 +1,16 @@ ---- src/build.xml~ 2005-11-06 08:06:57.000000000 -0800 -+++ src/build.xml 2006-01-04 05:46:08.000000000 -0800 -@@ -127,12 +127,17 @@ +--- src/build.xml.orig 2006-04-23 05:30:41.000000000 -0700 ++++ src/build.xml 2006-05-06 09:34:24.000000000 -0700 +@@ -121,7 +121,12 @@ for the special-chars of the translations. --> - -+ -+ -+ -+ - -+ srcdir="${src}"> -+ -+ - + +- ++ ++ ++ ++ ++ ++ + - - -- -- -- -- -- -- -- - -- -- -- -- - - - + +- +- +- +- +- +- +- + +- +- +- +- + + + rssowl-swt31.patch: Index: rssowl-swt31.patch =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-swt31.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl-swt31.patch 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl-swt31.patch 6 May 2006 17:24:01 -0000 1.2 @@ -1,179 +1,3 @@ ---- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java~ 2006-01-04 05:58:01.000000000 -0800 -+++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java 2005-06-14 14:15:46.000000000 -0700 -@@ -26,7 +26,6 @@ - - import net.sourceforge.rssowl.controller.NewsTable; - --import org.eclipse.swt.SWT; - import org.eclipse.swt.events.SelectionAdapter; - import org.eclipse.swt.events.SelectionEvent; - import org.eclipse.swt.widgets.Table; -@@ -42,7 +41,7 @@ - * header is clicked and update it. - * - * @author Ludovic Kim-Xuan Galibert -- * @version 1.2 -+ * @version 1.1.3 - */ - public class SortingSelectionAdapter extends SelectionAdapter { - -@@ -101,59 +100,67 @@ - } - - /** -- * Sort the News using a Sorter that is identified by the given field value. -+ * Handle the sorting corresponding to the header clicked - * -- * @param field The identifier of the Sorter to use. -- * @return boolean TRUE if the sort was ascending, FALSE if descending. -+ * @param se the SelectionEvent - */ -- public boolean sort(String field) { -+ public void widgetSelected(SelectionEvent se) { -+ widgetSelected((TableColumn) se.getSource()); -+ } -+ -+ /** -+ * Handle the sorting corresponding to the header clicked -+ * -+ * @param tc The selected TableColumn -+ */ -+ public void widgetSelected(TableColumn tc) { - Comparator sorter = null; - boolean ascending = true; - - /** Sort by news title */ -- if ("TABLE_HEADER_NEWSTITLE".equals(field)) { -+ if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) { - ascending = this.titleAscending; - this.titleAscending = !this.titleAscending; - sorter = new TitleSorter(); - } - - /** Sort by publish date */ -- else if ("TABLE_HEADER_PUBDATE".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) { - ascending = this.pudDateAscending; - this.pudDateAscending = !this.pudDateAscending; - sorter = new PubDateSorter(newsItems); - } - - /** Sort by author */ -- else if ("TABLE_HEADER_AUTHOR".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) { - ascending = this.authorAscending; - this.authorAscending = !this.authorAscending; - sorter = new AuthorSorter(newsItems); - } - - /** Sort by category */ -- else if ("TABLE_HEADER_CATEGORY".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) { - ascending = this.categoryAscending; - this.categoryAscending = !this.categoryAscending; - sorter = new CategorySorter(newsItems); - } - - /** Sort by publisher */ -- else if ("TABLE_HEADER_PUBLISHER".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) { - ascending = this.publisherAscending; - this.publisherAscending = !this.publisherAscending; - sorter = new PublisherSorter(newsItems); - } - - /** Sort by news feed */ -- else if ("TABLE_HEADER_FEED".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_FEED")) { - ascending = this.newsfeedAscending; - this.newsfeedAscending = !this.newsfeedAscending; - sorter = new NewsFeedSorter(newsItems); - } - - /** Sort by news status */ -- else if ("TABLE_HEADER_STATUS".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_STATUS")) { - ascending = this.statusAscending; - this.statusAscending = !this.statusAscending; - sorter = new StatusSorter(newsItems); -@@ -165,33 +172,11 @@ - else - Collections.sort(newsItemOrder, sorter); - -- /** Reverse if not ascending order */ -+ /** Reverse is not ascending order */ - if (!ascending) - Collections.reverse(newsItemOrder); - -- return ascending; -- } -- -- /** -- * Handle the sorting corresponding to the header clicked -- * -- * @param se the SelectionEvent -- */ -- public void widgetSelected(SelectionEvent se) { -- widgetSelected((TableColumn) se.getSource()); -- } -- -- /** -- * Handle the sorting corresponding to the header clicked -- * -- * @param tc The selected TableColumn -- */ -- public void widgetSelected(TableColumn tc) { -- -- /** Sort based on the given TableColumn */ -- boolean ascending = sort((String) tc.getData()); -- -- /** Remember the width values of the columns */ -+ /** Remember the width values of the columns before sorting */ - int columnWidth[] = new int[table.getColumnCount()]; - for (int a = 0; a < table.getColumnCount(); a++) - columnWidth[a] = table.getColumn(a).getWidth(); -@@ -201,41 +186,6 @@ - if (table.getSelectionCount() > 0) - selectedNews = table.getSelection()[0].getText(1); - -- /** Show a Sort Indicator inside the selected TableColumn */ -- if (!tc.getData().equals("TABLE_HEADER_STATUS")) { -- table.setSortColumn(tc); -- -- /** Reset Sort Direction */ -- if (table.getSortDirection() != SWT.NONE) -- table.setSortDirection(SWT.NONE); -- -- /** Apply the new direction */ -- table.setSortDirection(ascending ? SWT.DOWN : SWT.UP); -- -- /** -- * The Indicator requires some space, so pack the TableColumn. In order to -- * avoid flashing, first set the Table visible before packing the Column. -- */ -- table.setVisible(false); -- tc.pack(); -- table.setVisible(true); -- -- /** Restore Focus if necessary */ -- if (!table.isFocusControl()) -- table.setFocus(); -- -- /** Grant the sorted Column its preferred Width */ -- int sortColumnIndex = table.indexOf(tc); -- if (columnWidth[sortColumnIndex] < tc.getWidth()) -- columnWidth[sortColumnIndex] = tc.getWidth(); -- } -- -- /** Do not show the Indicator in the first, narrow Column */ -- else if (table.getSortColumn() != null) { -- table.setSortDirection(SWT.NONE); -- table.setSortColumn(null); -- } -- - /** Remove All tableitems */ - table.removeAll(); - --- src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java~ 2006-01-04 06:01:14.000000000 -0800 +++ src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java 2005-07-15 16:44:50.000000000 -0700 @@ -54,7 +54,6 @@ @@ -188,7 +12,7 @@ * Table. A selection on a newstitle will open it inside the Newstext panel. * * @author Benjamin Pasero -- * @version 1.2 +- * @version 1.2.1 + * @version 1.1.3 */ public class NewsfeedPanel { rssowl-use-jce.patch: Index: rssowl-use-jce.patch =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-use-jce.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl-use-jce.patch 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl-use-jce.patch 6 May 2006 17:24:01 -0000 1.2 @@ -1,5 +1,5 @@ ---- src/java/net/sourceforge/rssowl/util/CryptoManager.java.sav 2006-01-04 05:29:01.000000000 -0800 -+++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-01-04 05:31:00.000000000 -0800 +--- src/java/net/sourceforge/rssowl/util/CryptoManager.java.orig 2006-04-23 05:30:41.000000000 -0700 ++++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-05-06 09:27:30.000000000 -0700 @@ -24,7 +24,9 @@ package net.sourceforge.rssowl.util; @@ -11,15 +11,6 @@ import net.sourceforge.rssowl.controller.GUI; import net.sourceforge.rssowl.util.shop.StringShop; -@@ -41,7 +43,7 @@ - * - * @author Benjamin Pasero - * @version 1.2 -- */ -+*/ - public class CryptoManager { - - /** Unique key for the proxy domain (NTLM only) */ @@ -56,15 +58,28 @@ /** An instance of the CryptoManager */ private static CryptoManager instance; Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rssowl.spec 2 Apr 2006 03:59:39 -0000 1.7 +++ rssowl.spec 6 May 2006 17:24:01 -0000 1.8 @@ -1,6 +1,6 @@ %define name rssowl -%define version 1.2 -%define release 13%{?dist} +%define version 1.2.1 +%define release 1%{?dist} %define jdk java Name: %name @@ -10,15 +10,16 @@ License: CPL Group: Applications/Internet URL: http://www.rssowl.org -Source0: rssowl_1_2_src_clean.tar.gz +Source0: rssowl_1_2_1_src.tar.gz Source1: %{name}.script Source2: %{name}.desktop Patch0: %{name}-use-jce.patch Patch1: %{name}-build0.patch Patch2: %{name}-swt31.patch Patch3: %{name}-build1.patch -Patch4: %{name}-JessieX509.patch +#Patch4: %{name}-JessieX509.patch Patch5: %{name}-browser.patch +Patch6: %{name}-swt31-SortingSelectionAdapter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: jre >= 1.4.2- @@ -50,13 +51,14 @@ integrierte Browser. %prep -%setup -q -n %{name}_1_2_src_clean +%setup -q -n rssowl_1_2_1_src %patch0 -p0 %patch1 -p0 %patch2 -p0 %patch3 -p0 -%patch4 -p0 +#%patch4 -p0 %patch5 -p0 +%patch6 -p0 # This package doesn't contain any MPL licensed code. rm doc/mpl-v11.txt @@ -138,6 +140,9 @@ %{_libdir}/gcj/%{name} %changelog +* Sat May 6 2006 Anthony Green - 1.2.1-1 +- Update sources. + * Fri Mar 10 2006 Anthony Green - 1.2-13 - Fix script goof. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jan 2006 14:16:01 -0000 1.2 +++ sources 6 May 2006 17:24:01 -0000 1.3 @@ -1 +1,2 @@ d440e36983de3dba0239b4f1020f0837 rssowl_1_2_src_clean.tar.gz +be9c070343aa145807e1e708ed535a9b rssowl_1_2_1_src.tar.gz From fedora-extras-commits at redhat.com Sat May 6 17:31:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 6 May 2006 10:31:47 -0700 Subject: fedora-security/audit fe4,1.5,1.6 fe5,1.5,1.6 Message-ID: <200605061731.k46HVlDU020576@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20556 Modified Files: fe4 fe5 Log Message: Add recent awstats issues. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fe4 5 May 2006 19:13:55 -0000 1.5 +++ fe4 6 May 2006 17:31:44 -0000 1.6 @@ -2,7 +2,9 @@ ** are items that need attention +CVE-NOID VULNERABLE (awstats) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-1989 version (clamav, fixed 0.88.2) +CVE-2006-1945 VULNERABLE (awstats) bz#190921 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fe5 5 May 2006 19:13:55 -0000 1.5 +++ fe5 6 May 2006 17:31:44 -0000 1.6 @@ -2,7 +2,9 @@ ** are items that need attention +CVE-NOID VULNERABLE (awstats) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-1989 version (clamav, fixed 0.88.2) +CVE-2006-1945 VULNERABLE (awstats) bz#190922 From fedora-extras-commits at redhat.com Sat May 6 18:46:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:16 -0700 Subject: rpms/perl-Module-Info - New directory Message-ID: <200605061846.k46IkIX1023803@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23765/perl-Module-Info Log Message: Directory /cvs/extras/rpms/perl-Module-Info added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:46:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:17 -0700 Subject: rpms/perl-Module-Info/devel - New directory Message-ID: <200605061846.k46IkJUt023807@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23765/perl-Module-Info/devel Log Message: Directory /cvs/extras/rpms/perl-Module-Info/devel added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:46:46 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:46 -0700 Subject: rpms/perl-Module-Info/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605061846.k46IkmxV023902@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23866/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-Info --- NEW 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 May 6 18:46:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:17 -0700 Subject: owners owners.list,1.947,1.948 Message-ID: <200605061846.k46IknpS023905@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23763 Modified Files: owners.list Log Message: Add perl-Module-Info. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.947 retrieving revision 1.948 diff -u -r1.947 -r1.948 --- owners.list 6 May 2006 16:11:54 -0000 1.947 +++ owners.list 6 May 2006 18:46:16 -0000 1.948 @@ -1093,6 +1093,7 @@ Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Module-Info|Information about Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 6 18:46:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:45 -0700 Subject: rpms/perl-Module-Info Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605061846.k46Iklej023899@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23866 Added Files: Makefile import.log Log Message: Setup of module perl-Module-Info --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-Info all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 6 18:47:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:47:33 -0700 Subject: rpms/perl-Module-Info import.log,1.1,1.2 Message-ID: <200605061847.k46IlZ9Y023999@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23962 Modified Files: import.log Log Message: auto-import perl-Module-Info-0.30-2 on branch devel from perl-Module-Info-0.30-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 May 2006 18:46:45 -0000 1.1 +++ import.log 6 May 2006 18:47:33 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-Info-0_30-2:HEAD:perl-Module-Info-0.30-2.src.rpm:1146941237 From fedora-extras-commits at redhat.com Sat May 6 18:47:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:47:34 -0700 Subject: rpms/perl-Module-Info/devel perl-Module-Info.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605061847.k46IlaQS024005@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23962/devel Modified Files: .cvsignore sources Added Files: perl-Module-Info.spec Log Message: auto-import perl-Module-Info-0.30-2 on branch devel from perl-Module-Info-0.30-2.src.rpm --- NEW FILE perl-Module-Info.spec --- Name: perl-Module-Info Version: 0.30 Release: 2%{?dist} Summary: Information about Perl modules License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Info/ Source0: http://www.cpan.org/authors/id/M/MB/MBARBON/Module-Info-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) BuildRequires: perl(version) Requires: perl(version) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::Info gives you information about Perl modules without actually loading the module. It actually isn't specific to modules and should work on any perl code. %prep %setup -q -n Module-Info-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{_bindir}/* %{perl_vendorlib}/* %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Sat May 06 2006 Steven Pritchard 0.30-2 - Add BR: perl(Test::Pod) and perl(version). - Add Requires: perl(version). * Fri Apr 21 2006 Steven Pritchard 0.30-1 - Update to 0.30. - Use perl macro. - Drop extra find. * Fri Mar 24 2006 Steven Pritchard 0.290-1 - Specfile autogenerated by cpanspec 1.64. - Add bindir and man1 files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2006 18:46:46 -0000 1.1 +++ .cvsignore 6 May 2006 18:47:34 -0000 1.2 @@ -0,0 +1 @@ +Module-Info-0.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2006 18:46:46 -0000 1.1 +++ sources 6 May 2006 18:47:34 -0000 1.2 @@ -0,0 +1 @@ +a1e4e39cceda93dc0ab2d296b5075d76 Module-Info-0.30.tar.gz From fedora-extras-commits at redhat.com Sat May 6 18:53:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:53:05 -0700 Subject: rpms/perl-Test-Prereq - New directory Message-ID: <200605061853.k46Ir7qP024231@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24205/perl-Test-Prereq Log Message: Directory /cvs/extras/rpms/perl-Test-Prereq added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:53:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:53:06 -0700 Subject: rpms/perl-Test-Prereq/devel - New directory Message-ID: <200605061853.k46Ir82Y024234@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24205/perl-Test-Prereq/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Prereq/devel added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:53:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:53:33 -0700 Subject: rpms/perl-Test-Prereq Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605061853.k46IrZia024283@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24250 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Prereq --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Prereq all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 6 18:53:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:53:34 -0700 Subject: rpms/perl-Test-Prereq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605061853.k46Irajh024286@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24250/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Prereq --- NEW 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 May 6 18:54:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:54:21 -0700 Subject: rpms/perl-Test-Prereq import.log,1.1,1.2 Message-ID: <200605061854.k46IsNGO024349@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24316 Modified Files: import.log Log Message: auto-import perl-Test-Prereq-1.030-1 on branch devel from perl-Test-Prereq-1.030-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 May 2006 18:53:33 -0000 1.1 +++ import.log 6 May 2006 18:54:21 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Prereq-1_030-1:HEAD:perl-Test-Prereq-1.030-1.src.rpm:1146941646 From fedora-extras-commits at redhat.com Sat May 6 18:54:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:54:21 -0700 Subject: rpms/perl-Test-Prereq/devel perl-Test-Prereq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605061854.k46IsNux024354@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24316/devel Modified Files: .cvsignore sources Added Files: perl-Test-Prereq.spec Log Message: auto-import perl-Test-Prereq-1.030-1 on branch devel from perl-Test-Prereq-1.030-1.src.rpm --- NEW FILE perl-Test-Prereq.spec --- Name: perl-Test-Prereq Version: 1.030 Release: 1%{?dist} Summary: Check if Makefile.PL has the right pre-requisites License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Prereq/ Source0: http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Prereq-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Module::CoreList) BuildRequires: perl(Module::Info) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The prereq_ok() function examines the modules it finds in blib/lib/, blib/script, and the test files it finds in t/ (and test.pl). It figures out which modules they use, skips the modules that are in the Perl core, and compares the remaining list of modules to those in the PREREQ_PM section of Makefile.PL. %prep %setup -q -n Test-Prereq-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check %{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri Mar 24 2006 Steven Pritchard 1.030-1 - Specfile autogenerated by cpanspec 1.64. - Fix License. - Drop explicit Requires. - Disable tests by default (uses network). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2006 18:53:34 -0000 1.1 +++ .cvsignore 6 May 2006 18:54:21 -0000 1.2 @@ -0,0 +1 @@ +Test-Prereq-1.030.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2006 18:53:34 -0000 1.1 +++ sources 6 May 2006 18:54:21 -0000 1.2 @@ -0,0 +1 @@ +9acb4eb0737bb041e9ece8ad08e127c3 Test-Prereq-1.030.tar.gz From fedora-extras-commits at redhat.com Sat May 6 18:56:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:56:39 -0700 Subject: rpms/perl-Graphics-ColorNames - New directory Message-ID: <200605061856.k46IufkV024467@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24441/perl-Graphics-ColorNames Log Message: Directory /cvs/extras/rpms/perl-Graphics-ColorNames added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:56:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:56:39 -0700 Subject: rpms/perl-Graphics-ColorNames/devel - New directory Message-ID: <200605061856.k46IufNw024470@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24441/perl-Graphics-ColorNames/devel Log Message: Directory /cvs/extras/rpms/perl-Graphics-ColorNames/devel added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:57:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:12 -0700 Subject: rpms/perl-Graphics-ColorNames Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605061857.k46IvEv0024523@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24490 Added Files: Makefile import.log Log Message: Setup of module perl-Graphics-ColorNames --- NEW FILE Makefile --- # Top level Makefile for module perl-Graphics-ColorNames all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 6 18:57:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:13 -0700 Subject: rpms/perl-Graphics-ColorNames/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605061857.k46IvFuJ024526@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24490/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Graphics-ColorNames --- NEW 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 May 6 18:57:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:17 -0700 Subject: owners owners.list,1.948,1.949 Message-ID: <200605061857.k46IvJmi024547@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24486 Modified Files: owners.list Log Message: Add perl-Test-Prereq and perl-Graphics-ColorNames. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.948 retrieving revision 1.949 diff -u -r1.948 -r1.949 --- owners.list 6 May 2006 18:46:16 -0000 1.948 +++ owners.list 6 May 2006 18:57:16 -0000 1.949 @@ -1012,6 +1012,7 @@ Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Gnome2-Canvas|Perl interface to Gnome Canvas|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Graphics-ColorNames|Defines RGB values for common color names|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| @@ -1166,6 +1167,7 @@ Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Prereq|Check if Makefile.PL has the right pre-requisites|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-SubCalls|Track the number of times subs are called|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Tester|Ease testing test modules built with Test::Builder|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 6 18:57:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:57 -0700 Subject: rpms/perl-Graphics-ColorNames import.log,1.1,1.2 Message-ID: <200605061857.k46Ivx8a024606@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24573 Modified Files: import.log Log Message: auto-import perl-Graphics-ColorNames-1.06-1 on branch devel from perl-Graphics-ColorNames-1.06-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Graphics-ColorNames/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 May 2006 18:57:12 -0000 1.1 +++ import.log 6 May 2006 18:57:56 -0000 1.2 @@ -0,0 +1 @@ +perl-Graphics-ColorNames-1_06-1:HEAD:perl-Graphics-ColorNames-1.06-1.src.rpm:1146941863 From fedora-extras-commits at redhat.com Sat May 6 18:57:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:57 -0700 Subject: rpms/perl-Graphics-ColorNames/devel perl-Graphics-ColorNames.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605061858.k46Ivxpb024611@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24573/devel Modified Files: .cvsignore sources Added Files: perl-Graphics-ColorNames.spec Log Message: auto-import perl-Graphics-ColorNames-1.06-1 on branch devel from perl-Graphics-ColorNames-1.06-1.src.rpm --- NEW FILE perl-Graphics-ColorNames.spec --- Name: perl-Graphics-ColorNames Version: 1.06 Release: 1%{?dist} Summary: Defines RGB values for common color names License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Graphics-ColorNames/ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Graphics-ColorNames-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Module::Load) >= 0.1 BuildRequires: perl(Pod::Coverage) BuildRequires: perl(Test::Pod) >= 1 BuildRequires: perl(Test::Prereq) Requires: perl(Module::Load) >= 0.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module defines RGB values for common color names. The intention is to (1) provide a common module that authors can use with other modules to specify colors; and (2) free module authors from having to "re-invent the wheel" whenever they decide to give the users the option of specifying a color by name rather than RGB value. %prep %setup -q -n Graphics-ColorNames-%{version} perl -pi -e 's/\r//g' Changes README %build perl Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri Mar 24 2006 Steven Pritchard 1.06-1 - Specfile autogenerated by cpanspec 1.64. - Drop some explicit Requires. - Drop explicit BR: perl. - dos2unix Changes and README. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Graphics-ColorNames/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2006 18:57:12 -0000 1.1 +++ .cvsignore 6 May 2006 18:57:57 -0000 1.2 @@ -0,0 +1 @@ +Graphics-ColorNames-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Graphics-ColorNames/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2006 18:57:12 -0000 1.1 +++ sources 6 May 2006 18:57:57 -0000 1.2 @@ -0,0 +1 @@ +0551cb0b17babcbdef284d5b502731a4 Graphics-ColorNames-1.06.tar.gz From fedora-extras-commits at redhat.com Sat May 6 19:19:31 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 6 May 2006 12:19:31 -0700 Subject: rpms/pan/devel .cvsignore, 1.6, 1.7 pan.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200605061919.k46JJXt7026973@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26952 Modified Files: .cvsignore pan.spec sources Log Message: new devel update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Apr 2006 15:43:09 -0000 1.6 +++ .cvsignore 6 May 2006 19:19:31 -0000 1.7 @@ -2,3 +2,4 @@ pan-0.93.tar.bz2 pan-0.94.tar.bz2 pan-0.95.tar.bz2 +pan-0.96.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pan.spec 1 May 2006 19:57:33 -0000 1.12 +++ pan.spec 6 May 2006 19:19:31 -0000 1.13 @@ -1,12 +1,12 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.95 -Release: 3%{?dist} +Version: 0.96 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 -Patch0: pan-0.95-upstream-tree.patch +#Patch0: pan-0.95-upstream-tree.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -27,7 +27,7 @@ %prep %setup -q -%patch0 -p1 +#%%patch0 -p1 echo "StartupNotify=true" >> pan.desktop @@ -72,6 +72,9 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Sat May 06 2006 Michael A. Peters - 1:0.96-1 +- Update to 0.96 - patch1 no longer needed + * Mon May 01 2006 Michael A. Peters - 1:0.95-3 - Apply a patch from upstream for new tree implementation bug - (Patch0) Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Apr 2006 15:43:09 -0000 1.6 +++ sources 6 May 2006 19:19:31 -0000 1.7 @@ -1,2 +1,2 @@ -1013562743c330b07b84b749ed247c66 pan-0.94.tar.bz2 3a0cff7a3bc8b77ad19af4a492859804 pan-0.95.tar.bz2 +b4e355553cd502add3e599d1e867da9e pan-0.96.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 19:48:11 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 6 May 2006 12:48:11 -0700 Subject: extras-buildsys/utils extras-push-new, 1.2, 1.3 extras-sign-move.py, 1.14, 1.15 Message-ID: <200605061948.k46JmBvN027196@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27176 Modified Files: extras-push-new extras-sign-move.py Log Message: Make SMTP server configurable. Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- extras-push-new 6 May 2006 13:14:41 -0000 1.2 +++ extras-push-new 6 May 2006 19:48:09 -0000 1.3 @@ -45,6 +45,7 @@ or the fedora Info Feed: http://fedoraproject.org/infofeed/ """ +smtp_server = '' config = { 'repoview' : True, 'repoclosure' : False, @@ -402,7 +403,10 @@ if DEBUG: return s = smtplib.SMTP() - s.connect() + if smtp_server: + s.connect(smtp_server) + else: + s.connect() s.sendmail(mail_from, [mail_to], msg.as_string()) s.close() Index: extras-sign-move.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- extras-sign-move.py 24 Apr 2006 17:43:46 -0000 1.14 +++ extras-sign-move.py 6 May 2006 19:48:09 -0000 1.15 @@ -41,6 +41,7 @@ or the fedora Info Feed: http://fedoraproject.org/infofeed/ """ +smtp_server = '' stagesdir = '/srv/rpmbuild/repodir' treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project) cachedir = '/tmp/repomd-cache' @@ -142,7 +143,10 @@ msg['From'] = mail_from msg['To'] = mail_to s = smtplib.SMTP() - s.connect() + if smtp_server: + s.connect(smtp_server) + else: + s.connect() s.sendmail(mail_from, [mail_to], msg.as_string()) s.close() From fedora-extras-commits at redhat.com Sat May 6 22:42:38 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 15:42:38 -0700 Subject: rpms/gcompris/devel gcompris-7.4-xf86vidmode.patch, NONE, 1.1 gcompris.spec, 1.3, 1.4 Message-ID: <200605062242.k46Mge2P008076@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8056 Modified Files: gcompris.spec Added Files: gcompris-7.4-xf86vidmode.patch Log Message: * Sat May 6 2006 Hans de Goede 7.4-7 - Use XF86VidMode instead of Xrandr extension for resolution switching, hopefully fixing bug 190918. gcompris-7.4-xf86vidmode.patch: --- NEW FILE gcompris-7.4-xf86vidmode.patch --- --- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 +++ gcompris-7.4/configure 2006-05-07 00:25:10.000000000 +0200 @@ -1094,7 +1094,7 @@ --disable-sdltest Do not try to compile and run a test SDL program --disable-glibtest do not try to compile and run a test GLIB program --disable-rpath do not hardcode runtime library paths - --disable-xrandr Turn off xrandr + --disable-xf86vidmode Turn off xf86vidmode --enable-debug Turn on debugging messages --disable-sqlite Turn off sqlite (will disable profile) --enable-py-build-only Skip python modules tests. (Useful if you just need @@ -23630,7 +23630,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -23638,7 +23638,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -23665,7 +23665,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -23686,11 +23686,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -23769,23 +23769,23 @@ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -# Check whether --enable-xrandr or --disable-xrandr was given. -if test "${enable_xrandr+set}" = set; then - enableval="$enable_xrandr" - USE_XRANDR="$enableval" +# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. +if test "${enable_xf86vidmode+set}" = set; then + enableval="$enable_xf86vidmode" + USE_XF86VM="$enableval" else - USE_XRANDR="yes" + USE_XF86VM="yes" fi; -found_randr=no -if test "x$USE_XRANDR" == "xyes" ; then - RANDR_LIBS= - echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 -echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 -if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then +found_xf86vidmode=no +if test "x$USE_XF86VM" == "xyes" ; then + XF86VM_LIBS= + echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 +if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" +LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23799,11 +23799,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XRRSetScreenConfigAndRate (); +char XF86VidModeQueryExtension (); int main () { -XRRSetScreenConfigAndRate (); +XF86VidModeQueryExtension (); ; return 0; } @@ -23830,23 +23830,23 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no +ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 -if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then - echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 +if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then + echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 +echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23857,7 +23857,7 @@ /* end confdefs.h. */ #include -#include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -23881,38 +23881,38 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_X11_extensions_Xrandr_h=yes + ac_cv_header_X11_extensions_xf86vmode_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_Xrandr_h=no +ac_cv_header_X11_extensions_xf86vmode_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 -if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then - RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 +if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then + XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes fi fi - if test "x$found_randr" = "xno"; then - { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 -echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} + if test "x$found_xf86vidmode" = "xno"; then + { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 +echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} else cat >>confdefs.h <<_ACEOF -#define XRANDR 1 +#define XF86_VIDMODE 1 _ACEOF fi fi -LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" +LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" @@ -28651,7 +28651,7 @@ echo "SDL LIBS = found" fi -echo "XRANDR option (--enable-xrandr) = $found_randr" +echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" --- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 +++ gcompris-7.4/config.h.in 2006-05-07 00:25:10.000000000 +0200 @@ -141,5 +141,5 @@ /* Version number of package */ #undef VERSION -/* XRANDR Available */ -#undef XRANDR +/* XF86VidMode Available */ +#undef XF86_VIDMODE --- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-07 00:25:10.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } } - if(strcmp(name,"noxrandr")==0){ - if(self->cdata->noxrandr){ + if(strcmp(name,"noxf86vm")==0){ + if(self->cdata->noxf86vm){ Py_INCREF(Py_True); return Py_True; } else { --- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 +++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-07 00:29:58.000000000 +0200 @@ -33,12 +33,13 @@ #include "cursor.h" -/* For XRANDR Support */ -#ifdef XRANDR +/* For XF86_VIDMODE Support */ +#ifdef XF86_VIDMODE #include #include -#include -#include +#include +#include +#include #endif #if defined _WIN32 || defined __WIN32__ @@ -104,7 +105,7 @@ static int popt_aalias = FALSE; static int popt_difficulty_filter = FALSE; static int popt_debug = FALSE; -static int popt_noxrandr = FALSE; +static int popt_noxf86vm = FALSE; static char *popt_root_menu = NULL; static char *popt_local_activity = NULL; static int popt_administration = FALSE; @@ -139,8 +140,8 @@ N_("Print the version of " PACKAGE), NULL}, {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, N_("Use the antialiased canvas (slower)."), NULL}, - {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, - N_("Disable XRANDR (No screen resolution change)."), NULL}, + {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, + N_("Disable XF86VidMode (No screen resolution change)."), NULL}, {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, @@ -184,29 +185,19 @@ }; /* XRandr Stuff */ -#ifdef XRANDR -typedef struct +#ifdef XF86_VIDMODE +static struct { - gboolean xr_lock_updates; + int vidmode_available; + XF86VidModeModeInfo orig_mode; + int orig_viewport_x; + int orig_viewport_y; + int width; + int height; +} XF86VidModeData = { 0, { 0 }, 0, 0 }; - XRRScreenConfiguration *xr_screen_conf; - - XRRScreenSize *xr_sizes; - int xr_nsize; - SizeID xr_current_size; - - Rotation xr_rotations; - Rotation xr_current_rotation; - -} XRANDRData; - -static SizeID xr_previous_size; -static gboolean xr_previous_size_set = FALSE; -static XRANDRData *xrandr = NULL; - -static void xrandr_init ( XRANDRData *xrandr ); -static void xrandr_get_config ( XRANDRData *xrandr ); -static void xrandr_set_config( XRANDRData *xrandr ); +static void xf86_vidmode_init( void ); +static void xf86_vidmode_set_fullscreen( int state ); #endif /****************************************************************************/ @@ -441,8 +432,8 @@ gint screen_height, screen_width; GtkWidget *vbox; -#ifdef XRANDR - xrandr = g_new0 (XRANDRData, 1); +#ifdef XF86_VIDMODE + xf86_vidmode_init(); #endif gcompris_set_fullscreen(properties->fullscreen); @@ -450,10 +441,10 @@ screen_height = gdk_screen_height(); screen_width = gdk_screen_width(); -#ifdef XRANDR - if(properties->fullscreen && !properties->noxrandr) { - screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; - screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; +#ifdef XF86_VIDMODE + if(properties->fullscreen && !properties->noxf86vm) { + screen_width = XF86VidModeData.width; + screen_height = XF86VidModeData.height; } #endif @@ -811,39 +802,18 @@ */ void gcompris_set_fullscreen(gboolean state) { - - if(state) - { -#ifdef XRANDR - gint i; - /* Search the 800x600 Resolution */ - if(properties->fullscreen && !properties->noxrandr) { - - g_warning("XRANDR Is compiled in. Searching a good resolution"); - - /* Check if XRANDR is available */ - if (!properties->noxrandr) { - xrandr_get_config ( xrandr ); - xr_previous_size = (SizeID)xrandr->xr_current_size; - for (i = 0; i < xrandr->xr_nsize; i++) { - if(xrandr->xr_sizes[i].width == BOARDWIDTH && - xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) - { - xrandr->xr_current_size = (SizeID)i; - xr_previous_size_set = TRUE; - break; - } - } - } - - /* Set the Fullscreen now */ - if(xr_previous_size_set) - { - if(is_mapped) - xrandr_set_config( xrandr ); - } - } + properties->fullscreen = state; + /* We need to grab the pointer before doing the vidmode switch otherwise the + setviewport may be "canceled" by the pointer being outside the viewport */ + if(properties->fullscreen) + gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, + GDK_CURRENT_TIME); + +#ifdef XF86_VIDMODE + xf86_vidmode_set_fullscreen(properties->fullscreen); #endif + if(properties->fullscreen) + { gdk_window_set_decorations (window->window, 0); gdk_window_set_functions (window->window, 0); gtk_widget_set_uposition (window, 0, 0); @@ -851,20 +821,7 @@ } else { -#ifdef XRANDR - /* Set back the original screen size */ - if(xr_previous_size_set && !properties->noxrandr) - { - /* Need to refresh our config or xrandr api will reject us */ - if(xrandr) - { - xrandr_get_config ( xrandr ); - xrandr->xr_current_size = (SizeID)xr_previous_size; - xrandr_set_config( xrandr ); - } - } - xr_previous_size_set = FALSE; -#endif + gdk_pointer_ungrab(GDK_CURRENT_TIME); /* The hide must be done at least for KDE */ gtk_widget_hide (window); gdk_window_set_decorations (window->window, GDK_DECOR_ALL); @@ -1044,68 +1001,136 @@ g_printerr ("%s: %s\n\n", "gcompris", message); } -#ifdef XRANDR +#ifdef XF86_VIDMODE /* - * XRANDR STUFF - * ------------ + * XF86VidMode STUFF + * ----------------- */ static void -xrandr_init ( XRANDRData *data ) +xf86_vidmode_init ( void ) { - if(data==NULL) + int i,j; + XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) + &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); + + if (properties->noxf86vm) return; - - data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); - - if (data->xr_screen_conf == NULL) + + if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, + &XF86VidModeData.orig_viewport_x)) + properties->noxf86vm = TRUE; + + if (properties->noxf86vm) + g_warning("XF86VidMode not available"); + else { - g_warning("XRANDR not available"); - properties->noxrandr = TRUE; + XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; + XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; + g_warning("XF86VidMode support enabled"); } - else - g_warning("XRANDR support enabled"); - } - -static void -xrandr_get_config ( XRANDRData *data ) -{ - if(data==NULL) - return; - - xrandr_init (data); - - data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, - &data->xr_current_rotation); - - data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); - - data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, - &data->xr_current_rotation); } + static void -xrandr_set_config( XRANDRData *data ) +xf86_vidmode_set_fullscreen ( int state ) { - Status status = RRSetConfigFailed; + int i; + XF86VidModeModeLine mode; - if(data==NULL) + if (properties->noxf86vm) return; - if (data->xr_lock_updates) return; - - status = XRRSetScreenConfig (GDK_DISPLAY(), - data->xr_screen_conf, - GDK_ROOT_WINDOW(), - data->xr_current_size, - data->xr_current_rotation, - CurrentTime); - - if(status) { - g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", - (int)status); - } - return; - + if (state) + { + XF86VidModeModeInfo **modes; + int mode_count; + + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode)) + { + g_warning("XF86VidMode couldnot get current mode, not switching resolution"); + properties->fullscreen = FALSE; + return; + } + + /* Do we need to switch? */ + if ((mode.hdisplay == BOARDWIDTH) && + (mode.vdisplay == BOARDHEIGHT+BARHEIGHT)) + { + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), + GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) + g_warning("XF86VidMode couldnot change viewport"); + return; + } + + if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &mode_count, &modes)) + { + g_warning("XF86VidMode couldnot get modes not switching resolution"); + properties->fullscreen = FALSE; + return; + } + + for (i = 0; i < mode_count; i++) + { + if ((modes[i]->hdisplay == BOARDWIDTH) && + (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) + { + if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), modes[i])) + { + XF86VidModeData.width = modes[i]->hdisplay; + XF86VidModeData.height = modes[i]->vdisplay; + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), + GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) + g_warning("XF86VidMode couldnot change viewport"); + } + else + { + g_warning("XF86VidMode couldnot switch resolution"); + properties->fullscreen = FALSE; + } + break; + } + } + if (i == mode_count) + { + g_warning("XF86VidMode couldnot find a suitable resolution"); + properties->fullscreen = FALSE; + } + XFree(modes); + } + else + { + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode) || + (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || + (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) + { + if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_mode)) + { + XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; + XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; + } + else + g_warning("XF86VidMode couldnot restore original resolution"); + + } + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, + XF86VidModeData.orig_viewport_y)) + g_warning("XF86VidMode couldnot restore original viewport"); + } } #endif @@ -1185,9 +1210,9 @@ properties->fullscreen = TRUE; } - if (popt_noxrandr) + if (popt_noxf86vm) { - properties->noxrandr = TRUE; + properties->noxf86vm = TRUE; } if (popt_window) --- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/gcompris/properties.c 2006-05-07 00:25:10.000000000 +0200 @@ -160,7 +160,7 @@ tmp->fx = 1; tmp->screensize = 1; tmp->fullscreen = 1; - tmp->noxrandr = FALSE; + tmp->noxf86vm = FALSE; tmp->timer = 1; tmp->skin = "babytoy"; tmp->key = "default"; @@ -244,8 +244,8 @@ } else if(!strcmp(value.v_identifier, "fullscreen")) { if(!scan_get_int(scanner, &tmp->fullscreen)) g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "noxrandr")) { - if(!scan_get_int(scanner, &tmp->noxrandr)) + } else if(!strcmp(value.v_identifier, "noxf86vm")) { + if(!scan_get_int(scanner, &tmp->noxf86vm)) g_warning("Config file parsing error on token %s", token); } else if(!strcmp(value.v_identifier, "timer")) { if(!scan_get_int(scanner, &tmp->timer)) --- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/gcompris/properties.h 2006-05-07 00:25:10.000000000 +0200 @@ -28,7 +28,7 @@ gint music; gint fx; gint fullscreen; - gint noxrandr; + gint noxf86vm; gint screensize; gint defaultcursor; gint timer; --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 +++ gcompris-7.4/configure.in 2006-05-07 00:25:10.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV -dnl XRANDR Allow us to set the screen resolution dynamically +dnl XF86VidMode allows us to set the screen resolution dynamically AC_PATH_X -AC_ARG_ENABLE(xrandr, +AC_ARG_ENABLE(xf86vidmode, AC_HELP_STRING( - [--disable-xrandr], - [Turn off xrandr]), - USE_XRANDR="$enableval", USE_XRANDR="yes") -found_randr=no -if test "x$USE_XRANDR" == "xyes" ; then - RANDR_LIBS= - AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate, - [AC_CHECK_HEADER(X11/extensions/Xrandr.h, - RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes,, + [--disable-xf86vidmode], + [Turn off xf86vidmode]), + USE_XF86VM="$enableval", USE_XF86VM="yes") +found_xf86vidmode=no +if test "x$USE_XF86VM" == "xyes" ; then + XF86VM_LIBS= + AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, + [AC_CHECK_HEADER(X11/extensions/xf86vmode.h, + XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes,, [#include ])], , -L$x_libraries $ALL_X_LIBS ) - if test "x$found_randr" = "xno"; then - AC_MSG_NOTICE(["Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen."]) + if test "x$found_xf86vidmode" = "xno"; then + AC_MSG_NOTICE(["Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen."]) else - AC_DEFINE_UNQUOTED(XRANDR, 1, [XRANDR Available]) + AC_DEFINE_UNQUOTED(XF86_VIDMODE, 1, [XF86VidMode Available]) fi fi -LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" +LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" dnl Add the languages which your application supports here. ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" @@ -680,7 +680,7 @@ echo "SDL LIBS = found" fi -echo "XRANDR option (--enable-xrandr) = $found_randr" +echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcompris.spec 5 May 2006 18:08:47 -0000 1.3 +++ gcompris.spec 6 May 2006 22:42:38 -0000 1.4 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -12,6 +12,7 @@ Patch2: gcompris-nl.patch Patch3: gcompris-electric.patch Patch4: gcompris-click_on_letter.patch +Patch5: gcompris-7.4-xf86vidmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel @@ -220,6 +221,7 @@ %patch2 -p1 %patch3 -p1 -z .electric %patch4 -p1 -z .click_on_letter +%patch5 -p1 -z .xf86vm iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp mv tmp docs/C/gcompris.info # fix gnome.canvas deprecation warnings @@ -476,6 +478,10 @@ %changelog +* Sat May 6 2006 Hans de Goede 7.4-7 +- Use XF86VidMode instead of Xrandr extension for resolution switching, + hopefully fixing bug 190918. + * Fri May 5 2006 Hans de Goede 7.4-6 - Add missing python module Requires. From fedora-extras-commits at redhat.com Sat May 6 23:38:33 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 6 May 2006 16:38:33 -0700 Subject: extras-buildsys/utils extras-push-new,1.3,1.4 Message-ID: <200605062338.k46NcXeO010570@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10552 Modified Files: extras-push-new Log Message: remove tiny bit of superfluous code Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- extras-push-new 6 May 2006 19:48:09 -0000 1.3 +++ extras-push-new 6 May 2006 23:38:31 -0000 1.4 @@ -427,7 +427,6 @@ sys.exit(22) dists = [] # the list of distribution release we want to push - distdict = {} for d in sys.argv[1:]: if d == 'all': dists = alldists @@ -435,9 +434,8 @@ if d not in alldists: print "ERROR: No Distribution named '%s' found" % d sys.exit(1) - if not distdict.has_key(d): + if d not in dists: dists.append(d) - distdict[d] = True debugprint(dists) # If we are called as 'extras-sign-move.py' we simulate old From fedora-extras-commits at redhat.com Sat May 6 23:45:54 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:45:54 -0700 Subject: rpms/gnome-ppp - New directory Message-ID: <200605062345.k46NjuYW010665@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644/gnome-ppp Log Message: Directory /cvs/extras/rpms/gnome-ppp added to the repository From fedora-extras-commits at redhat.com Sat May 6 23:45:54 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:45:54 -0700 Subject: rpms/gnome-ppp/devel - New directory Message-ID: <200605062346.k46Njuqb010668@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644/gnome-ppp/devel Log Message: Directory /cvs/extras/rpms/gnome-ppp/devel added to the repository From fedora-extras-commits at redhat.com Sat May 6 23:46:14 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:46:14 -0700 Subject: rpms/gnome-ppp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605062346.k46NkG9w010722@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10689 Added Files: Makefile import.log Log Message: Setup of module gnome-ppp --- NEW FILE Makefile --- # Top level Makefile for module gnome-ppp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 6 23:46:14 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:46:14 -0700 Subject: rpms/gnome-ppp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605062346.k46NkGCB010725@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10689/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnome-ppp --- NEW 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 May 6 23:47:09 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:47:09 -0700 Subject: rpms/gnome-ppp import.log,1.1,1.2 Message-ID: <200605062347.k46NlflE010799@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10759 Modified Files: import.log Log Message: auto-import gnome-ppp-0.3.23-1.fc5 on branch devel from gnome-ppp-0.3.23-1.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnome-ppp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 May 2006 23:46:13 -0000 1.1 +++ import.log 6 May 2006 23:47:09 -0000 1.2 @@ -0,0 +1 @@ +gnome-ppp-0_3_23-1_fc5:HEAD:gnome-ppp-0.3.23-1.fc5.src.rpm:1146959221 From fedora-extras-commits at redhat.com Sat May 6 23:47:10 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:47:10 -0700 Subject: rpms/gnome-ppp/devel gnome-ppp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605062347.k46NlgNH010803@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10759/devel Modified Files: .cvsignore sources Added Files: gnome-ppp.spec Log Message: auto-import gnome-ppp-0.3.23-1.fc5 on branch devel from gnome-ppp-0.3.23-1.fc5.src.rpm --- NEW FILE gnome-ppp.spec --- Name: gnome-ppp Version: 0.3.23 Release: 1%{?dist} Summary: A GNOME 2 WvDial frontend Group: Applications/Communications License: GPL URL: http://www.icmreza.co.yu/blogs/vladecks/?page_id=7 Source0: http://www.icmreza.co.yu/blogs/vladecks/wp-content/projects/gnome-ppp/download/0.3/gnome-ppp-0.3.23.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libglade2-devel >= 2.4.0, gettext, desktop-file-utils Requires: wvdial %description GNOME PPP is a modem dialup tool designed to integrate nicely into GNOME 2 Desktop Environment. It is very similar to GPPP dialup utility created for GNOME 1 and KDE equivalent, KPPP. Since it is a graphical frontend for the excellent WvDial too, very little knowledge is needed to setup a dialup connection using GNOME PPP. It features ease of use, HIG dialogs, auto detection of your modem and connection monitoring. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --add-category GNOME \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/%{name} %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog * Sun Apr 16 2006 Christoph Wickert - 0.3.23-1 - Initial Fedora Extras release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-ppp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2006 23:46:14 -0000 1.1 +++ .cvsignore 6 May 2006 23:47:10 -0000 1.2 @@ -0,0 +1 @@ +gnome-ppp-0.3.23.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-ppp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2006 23:46:14 -0000 1.1 +++ sources 6 May 2006 23:47:10 -0000 1.2 @@ -0,0 +1 @@ +ec2e20fc713a01c953d759bea3df8618 gnome-ppp-0.3.23.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 23:53:10 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:53:10 -0700 Subject: owners owners.list,1.949,1.950 Message-ID: <200605062353.k46NrCOE010877@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10860 Modified Files: owners.list Log Message: add gnome-ppp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.949 retrieving revision 1.950 diff -u -r1.949 -r1.950 --- owners.list 6 May 2006 18:57:16 -0000 1.949 +++ owners.list 6 May 2006 23:53:09 -0000 1.950 @@ -385,6 +385,7 @@ Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-password-generator|Graphical secure password generator|michael at knox.net.nz|extras-qa at fedoraproject.org| +Fedora Extras|gnome-ppp|A GNOME 2 WvDial frontend|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-schedule|A GTK+ based user interface for cron and at|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-telnet|A fancy GNOME telnet client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 01:10:32 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:10:32 -0700 Subject: owners owners.list,1.950,1.951 Message-ID: <200605070110.k471AYAF016604@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16576 Modified Files: owners.list Log Message: Adding perl-CPANPLUS. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.950 retrieving revision 1.951 diff -u -r1.950 -r1.951 --- owners.list 6 May 2006 23:53:09 -0000 1.950 +++ owners.list 7 May 2006 01:10:32 -0000 1.951 @@ -943,6 +943,7 @@ Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CPAN-DistnameInfo|CPAN::DistnameInfo Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-CPANPLUS|Command-line access to the CPAN interface|steve at silug.org|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-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-DES|Crypt::DES Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 7 01:10:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:10:42 -0700 Subject: rpms/perl-CPANPLUS - New directory Message-ID: <200605070110.k471AiNm016632@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/perl-CPANPLUS Log Message: Directory /cvs/extras/rpms/perl-CPANPLUS added to the repository From fedora-extras-commits at redhat.com Sun May 7 01:10:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:10:43 -0700 Subject: rpms/perl-CPANPLUS/devel - New directory Message-ID: <200605070110.k471AjQo016635@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/perl-CPANPLUS/devel Log Message: Directory /cvs/extras/rpms/perl-CPANPLUS/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 01:11:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:11:10 -0700 Subject: rpms/perl-CPANPLUS Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605070111.k471BCWK016691@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16658 Added Files: Makefile import.log Log Message: Setup of module perl-CPANPLUS --- NEW FILE Makefile --- # Top level Makefile for module perl-CPANPLUS all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 01:11:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:11:10 -0700 Subject: rpms/perl-CPANPLUS/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605070111.k471BCrh016694@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16658/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-CPANPLUS --- NEW 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 May 7 01:12:15 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:12:15 -0700 Subject: rpms/perl-CPANPLUS import.log,1.1,1.2 Message-ID: <200605070112.k471CHTh016765@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16731 Modified Files: import.log Log Message: auto-import perl-CPANPLUS-0.061-2 on branch devel from perl-CPANPLUS-0.061-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-CPANPLUS/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 01:11:10 -0000 1.1 +++ import.log 7 May 2006 01:12:15 -0000 1.2 @@ -0,0 +1 @@ +perl-CPANPLUS-0_061-2:HEAD:perl-CPANPLUS-0.061-2.src.rpm:1146964323 From fedora-extras-commits at redhat.com Sun May 7 01:12:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:12:16 -0700 Subject: rpms/perl-CPANPLUS/devel CPANPLUS-filter-requires.sh, NONE, 1.1 perl-CPANPLUS.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605070112.k471CIJe016770@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16731/devel Modified Files: .cvsignore sources Added Files: CPANPLUS-filter-requires.sh perl-CPANPLUS.spec Log Message: auto-import perl-CPANPLUS-0.061-2 on branch devel from perl-CPANPLUS-0.061-2.src.rpm --- NEW FILE CPANPLUS-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(Your::Module::Here)$/d' --- NEW FILE perl-CPANPLUS.spec --- Name: perl-CPANPLUS Version: 0.061 Release: 2%{?dist} Summary: Command-line access to the CPAN interface License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/CPANPLUS/ Source0: http://www.cpan.org/authors/id/K/KA/KANE/CPANPLUS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Extract) >= 0.07 BuildRequires: perl(File::Fetch) >= 0.07 BuildRequires: perl(IPC::Cmd) >= 0.24 BuildRequires: perl(IPC::Run) >= 0.79 BuildRequires: perl(Locale::Maketext::Simple) BuildRequires: perl(Log::Message) BuildRequires: perl(Module::Load) >= 0.10 BuildRequires: perl(Module::Load::Conditional) >= 0.07 BuildRequires: perl(Module::Loaded) BuildRequires: perl(Module::Pluggable) >= 2.4 BuildRequires: perl(Object::Accessor) >= 0.03 BuildRequires: perl(Params::Check) >= 0.22 BuildRequires: perl(Term::UI) >= 0.05 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Source98: CPANPLUS-filter-requires.sh %global real_perl_requires %{__perl_requires} %define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires %description The CPANPLUS library is an API to the CPAN mirrors and a collection of interactive shells, commandline programs, daemons, etc, that use this API. %prep %setup -q -n CPANPLUS-%{version} sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor AUTOINSTALL=1 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check %{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) %doc ChangeLog README %{_bindir}/* %{perl_vendorlib}/* %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Sat May 06 2006 Steven Pritchard 0.061-2 - Delete zero-length files from $RPM_BUILD_ROOT. * Thu Mar 23 2006 Steven Pritchard 0.061-1 - Specfile autogenerated by cpanspec 1.62. - Removed explicit BR: perl. - Add a ton of BuildRequires. - Disabled "make test" by default (wants to install to root fs). - Add bindir and man1 files. - Add AUTOINSTALL=1 to Makefile.PL run to avoid configuring at build time. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 01:11:10 -0000 1.1 +++ .cvsignore 7 May 2006 01:12:16 -0000 1.2 @@ -0,0 +1 @@ +CPANPLUS-0.061.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 01:11:10 -0000 1.1 +++ sources 7 May 2006 01:12:16 -0000 1.2 @@ -0,0 +1 @@ +c9e9831d24d69b1f690d8b4967436899 CPANPLUS-0.061.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:05:11 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:05:11 -0700 Subject: rpms/yum-utils/FC-5 yum-utils.spec,1.4,1.5 Message-ID: <200605070205.k4725Dql019184@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19167 Modified Files: yum-utils.spec Log Message: 0.6 spec file Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/yum-utils.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yum-utils.spec 23 Feb 2006 16:59:09 -0000 1.4 +++ yum-utils.spec 7 May 2006 02:05:11 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 0.5 +Version: 0.6 Release: 1 License: GPL Group: Development/Tools @@ -45,6 +45,63 @@ This plugin sorts each repository's mirrorlist by connection speed prior to downloading packages. +%package -n yum-fedorakmod +Summary: Yum plugin to handle fedora kernel modules. +Group: System Environment/Base +Requires: yum >= 2.6.0 + +%description -n yum-fedorakmod +Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions +are installed. +kmod-foo kernel modules is described by the Fedora Extras packaging standards. + +%package -n yum-protectbase +Summary: Yum plugin to protect packages from certain repositories. +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-protectbase +This plugin allows certain repositories to be protected. Packages in the +protected repositories can't be overridden by packages in non-protected +repositories even if the non-protected repo has a later version. + +%package -n yum-versionlock +Summary: Yum plugin to lock specified packages from being updated +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-versionlock +This plugin allows certain packages specified in a file to be protected from being updated by +newer versions. + +%package -n yum-tsflags +Summary: Yum plugin to add tsflags by a commandline option +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-tsflags +This plugin allows you to specify optional transaction flags on the yum +command line + +%package -n yum-kernel-module +Summary: Yum plugin to handle kernel-module-foo type of kernel module +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-kernel-module +This plugin handle installation of kernel-module-foo type of kernel modules when new version of +kernels are installed. + + +%package -n yum-downloadonly +Summary: Yum plugin to add downloadonly command option +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-downloadonly +This plugin adds a --downloadonly flag to yum so that yum will only download +the packages and not install/update them. + %prep %setup -q @@ -53,8 +110,8 @@ make DESTDIR=$RPM_BUILD_ROOT install make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install -# only changelog plugin for now... -plugins="changelog fastestmirror" +# Plugins to install +plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ cd plugins @@ -85,6 +142,7 @@ %{_bindir}/repomanage %{_bindir}/repoquery %{_bindir}/repotrack +%{_bindir}/reposync %{_bindir}/repo-graph %{_bindir}/repo-rss %{_bindir}/yumdownloader @@ -100,14 +158,60 @@ %files -n yum-changelog %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf -/usr/lib/yum-plugins/changelog.py +/usr/lib/yum-plugins/changelog.* %files -n yum-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf -/usr/lib/yum-plugins/fastestmirror.py +/usr/lib/yum-plugins/fastestmirror.* + +%files -n yum-fedorakmod +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf +/usr/lib/yum-plugins/fedorakmod.* + +%files -n yum-protectbase +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf +/usr/lib/yum-plugins/protectbase.* + +%files -n yum-versionlock +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf +/usr/lib/yum-plugins/versionlock.* + +%files -n yum-tsflags +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf +/usr/lib/yum-plugins/tsflags.* + +%files -n yum-kernel-module +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf +/usr/lib/yum-plugins/kernel-module.* + +%files -n yum-downloadonly +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf +/usr/lib/yum-plugins/downloadonly.* %changelog +* Sat May 6 2006 Seth Vidal +- bump version number +- added yum-downloadonly plugin +- fix minor item in tsflags description + +* Sat Apr 29 2006 Seth Vidal +- add reposync + +* Fri Apr 28 2006 Tim Lauridsen +- added yum-fedorakmod plugin subpackage +- added yum-protectbase plugin subpackage. +- added yum-versionlock plugin subpackage. +- added yum-tsflags plugin subpackage. +- added yum-kernel-module plugin subpackage +- changed .py to .* in files sections for plugin subpackages to build rpms without error. + * Thu Feb 23 2006 Seth Vidal - changed some of the yum version dependencies From fedora-extras-commits at redhat.com Sun May 7 02:06:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:06:16 -0700 Subject: rpms/perl-Test-Differences - New directory Message-ID: <200605070206.k4726ISx019261@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19235/perl-Test-Differences Log Message: Directory /cvs/extras/rpms/perl-Test-Differences added to the repository From fedora-extras-commits at redhat.com Sun May 7 02:06:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:06:17 -0700 Subject: rpms/perl-Test-Differences/devel - New directory Message-ID: <200605070206.k4726JvJ019264@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19235/perl-Test-Differences/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Differences/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 02:06:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:06:33 -0700 Subject: rpms/perl-Test-Differences Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605070206.k4726ZIm019316@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19283 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Differences --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Differences all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 02:06:34 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:06:34 -0700 Subject: rpms/perl-Test-Differences/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605070206.k4726aYd019319@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19283/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Differences --- NEW 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 May 7 02:07:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:07:01 -0700 Subject: rpms/perl-Test-Differences import.log,1.1,1.2 Message-ID: <200605070207.k47273jH019391@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19355 Modified Files: import.log Log Message: auto-import perl-Test-Differences-0.47-1 on branch devel from perl-Test-Differences-0.47-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 02:06:33 -0000 1.1 +++ import.log 7 May 2006 02:07:01 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Differences-0_47-1:HEAD:perl-Test-Differences-0.47-1.src.rpm:1146967613 From fedora-extras-commits at redhat.com Sun May 7 02:07:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:07:02 -0700 Subject: rpms/perl-Test-Differences/devel perl-Test-Differences.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605070207.k47274lO019397@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19355/devel Modified Files: .cvsignore sources Added Files: perl-Test-Differences.spec Log Message: auto-import perl-Test-Differences-0.47-1 on branch devel from perl-Test-Differences-0.47-1.src.rpm --- NEW FILE perl-Test-Differences.spec --- Name: perl-Test-Differences Version: 0.47 Release: 1%{?dist} Summary: Test strings and data structures and show differences if not ok Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Differences/ Source0: http://www.cpan.org/authors/id/R/RB/RBS/Test-Differences-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Text::Diff) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description When the code you're testing returns multiple lines, records or data structures and they're just plain wrong, an equivalent to the Unix diff utility may be just what's needed. %prep %setup -q -n Test-Differences-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes eg/ %{perl_vendorlib}/Test/ %{_mandir}/man3/*.3pm* %changelog * Mon May 01 2006 Jose Pedro Oliveira - 0.47-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 02:06:33 -0000 1.1 +++ .cvsignore 7 May 2006 02:07:02 -0000 1.2 @@ -0,0 +1 @@ +Test-Differences-0.47.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 02:06:33 -0000 1.1 +++ sources 7 May 2006 02:07:02 -0000 1.2 @@ -0,0 +1 @@ +e4fa76bb11b0d1db2d4213390413f5af Test-Differences-0.47.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:07:14 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:07:14 -0700 Subject: rpms/yum-utils/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200605070207.k4727GKq019450@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19403 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Feb 2006 16:38:55 -0000 1.4 +++ .cvsignore 7 May 2006 02:07:14 -0000 1.5 @@ -1 +1,2 @@ yum-utils-0.5.tar.gz +yum-utils-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Feb 2006 16:38:55 -0000 1.4 +++ sources 7 May 2006 02:07:14 -0000 1.5 @@ -1 +1,2 @@ 8800911781a6c54becb8a3a627639356 yum-utils-0.5.tar.gz +3ac019970ed334b530dc130da97e9851 yum-utils-0.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:07:59 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:07:59 -0700 Subject: rpms/yum-utils/FC-5 yum-utils.spec,1.5,1.6 Message-ID: <200605070208.k47281oZ019483@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19465 Modified Files: yum-utils.spec Log Message: dist tag Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/yum-utils.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- yum-utils.spec 7 May 2006 02:05:11 -0000 1.5 +++ yum-utils.spec 7 May 2006 02:07:59 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 0.6 -Release: 1 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:09:00 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:09:00 -0700 Subject: rpms/yum-utils/FC-5 sources,1.5,1.6 Message-ID: <200605070209.k47292Du019549@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19530 Modified Files: sources Log Message: kill old yum-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 May 2006 02:07:14 -0000 1.5 +++ sources 7 May 2006 02:09:00 -0000 1.6 @@ -1,2 +1 @@ -8800911781a6c54becb8a3a627639356 yum-utils-0.5.tar.gz 3ac019970ed334b530dc130da97e9851 yum-utils-0.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:10:50 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:10:50 -0700 Subject: rpms/yum-utils import.log,1.2,1.3 Message-ID: <200605070210.k472AqcX019631@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19595 Modified Files: import.log Log Message: auto-import yum-utils-0.6-1.fc5 on branch devel from yum-utils-0.6-1.fc5.src.rpm yum utils 0.6 for devel Index: import.log =================================================================== RCS file: /cvs/extras/rpms/yum-utils/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 11 Jun 2005 19:28:19 -0000 1.2 +++ import.log 7 May 2006 02:10:50 -0000 1.3 @@ -1 +1,2 @@ yum-utils-0_2-2:HEAD:yum-utils-0.2-2.src.rpm:1118518174 +yum-utils-0_6-1_fc5:HEAD:yum-utils-0.6-1.fc5.src.rpm:1146968022 From fedora-extras-commits at redhat.com Sun May 7 02:10:51 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:10:51 -0700 Subject: rpms/yum-utils/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 yum-utils.spec, 1.4, 1.5 Message-ID: <200605070210.k472Ar26019638@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19595/devel Modified Files: .cvsignore sources yum-utils.spec Log Message: auto-import yum-utils-0.6-1.fc5 on branch devel from yum-utils-0.6-1.fc5.src.rpm yum utils 0.6 for devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Feb 2006 16:38:55 -0000 1.4 +++ .cvsignore 7 May 2006 02:10:50 -0000 1.5 @@ -1 +1 @@ -yum-utils-0.5.tar.gz +yum-utils-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Feb 2006 16:38:55 -0000 1.4 +++ sources 7 May 2006 02:10:50 -0000 1.5 @@ -1 +1 @@ -8800911781a6c54becb8a3a627639356 yum-utils-0.5.tar.gz +3ac019970ed334b530dc130da97e9851 yum-utils-0.6.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yum-utils.spec 23 Feb 2006 16:59:09 -0000 1.4 +++ yum-utils.spec 7 May 2006 02:10:50 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 0.5 -Release: 1 +Version: 0.6 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -45,6 +45,63 @@ This plugin sorts each repository's mirrorlist by connection speed prior to downloading packages. +%package -n yum-fedorakmod +Summary: Yum plugin to handle fedora kernel modules. +Group: System Environment/Base +Requires: yum >= 2.6.0 + +%description -n yum-fedorakmod +Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions +are installed. +kmod-foo kernel modules is described by the Fedora Extras packaging standards. + +%package -n yum-protectbase +Summary: Yum plugin to protect packages from certain repositories. +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-protectbase +This plugin allows certain repositories to be protected. Packages in the +protected repositories can't be overridden by packages in non-protected +repositories even if the non-protected repo has a later version. + +%package -n yum-versionlock +Summary: Yum plugin to lock specified packages from being updated +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-versionlock +This plugin allows certain packages specified in a file to be protected from being updated by +newer versions. + +%package -n yum-tsflags +Summary: Yum plugin to add tsflags by a commandline option +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-tsflags +This plugin allows you to specify optional transaction flags on the yum +command line + +%package -n yum-kernel-module +Summary: Yum plugin to handle kernel-module-foo type of kernel module +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-kernel-module +This plugin handle installation of kernel-module-foo type of kernel modules when new version of +kernels are installed. + + +%package -n yum-downloadonly +Summary: Yum plugin to add downloadonly command option +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-downloadonly +This plugin adds a --downloadonly flag to yum so that yum will only download +the packages and not install/update them. + %prep %setup -q @@ -53,8 +110,8 @@ make DESTDIR=$RPM_BUILD_ROOT install make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install -# only changelog plugin for now... -plugins="changelog fastestmirror" +# Plugins to install +plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ cd plugins @@ -85,6 +142,7 @@ %{_bindir}/repomanage %{_bindir}/repoquery %{_bindir}/repotrack +%{_bindir}/reposync %{_bindir}/repo-graph %{_bindir}/repo-rss %{_bindir}/yumdownloader @@ -100,14 +158,60 @@ %files -n yum-changelog %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf -/usr/lib/yum-plugins/changelog.py +/usr/lib/yum-plugins/changelog.* %files -n yum-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf -/usr/lib/yum-plugins/fastestmirror.py +/usr/lib/yum-plugins/fastestmirror.* + +%files -n yum-fedorakmod +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf +/usr/lib/yum-plugins/fedorakmod.* + +%files -n yum-protectbase +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf +/usr/lib/yum-plugins/protectbase.* + +%files -n yum-versionlock +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf +/usr/lib/yum-plugins/versionlock.* + +%files -n yum-tsflags +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf +/usr/lib/yum-plugins/tsflags.* + +%files -n yum-kernel-module +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf +/usr/lib/yum-plugins/kernel-module.* + +%files -n yum-downloadonly +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf +/usr/lib/yum-plugins/downloadonly.* %changelog +* Sat May 6 2006 Seth Vidal +- bump version number +- added yum-downloadonly plugin +- fix minor item in tsflags description + +* Sat Apr 29 2006 Seth Vidal +- add reposync + +* Fri Apr 28 2006 Tim Lauridsen +- added yum-fedorakmod plugin subpackage +- added yum-protectbase plugin subpackage. +- added yum-versionlock plugin subpackage. +- added yum-tsflags plugin subpackage. +- added yum-kernel-module plugin subpackage +- changed .py to .* in files sections for plugin subpackages to build rpms without error. + * Thu Feb 23 2006 Seth Vidal - changed some of the yum version dependencies From fedora-extras-commits at redhat.com Sun May 7 02:11:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:11:30 -0700 Subject: owners owners.list,1.951,1.952 Message-ID: <200605070211.k472BWV5019705@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19688 Modified Files: owners.list Log Message: New package: perl-Test-Differences (#190583) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.951 retrieving revision 1.952 diff -u -r1.951 -r1.952 --- owners.list 7 May 2006 01:10:32 -0000 1.951 +++ owners.list 7 May 2006 02:11:29 -0000 1.952 @@ -1159,6 +1159,7 @@ Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Differences|Test strings and data structures and show differences if not ok|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-Inline|Test::Inline Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 7 02:14:30 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:14:30 -0700 Subject: rpms/yum-utils/FC-5 yum-utils.spec,1.6,1.7 Message-ID: <200605070214.k472EWoO019873@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19856 Modified Files: yum-utils.spec Log Message: stupid me Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/yum-utils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yum-utils.spec 7 May 2006 02:07:59 -0000 1.6 +++ yum-utils.spec 7 May 2006 02:14:29 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:14:48 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:14:48 -0700 Subject: rpms/yum-utils/devel yum-utils.spec,1.5,1.6 Message-ID: <200605070214.k472Eot4019896@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19879 Modified Files: yum-utils.spec Log Message: stupid me Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- yum-utils.spec 7 May 2006 02:10:50 -0000 1.5 +++ yum-utils.spec 7 May 2006 02:14:48 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Sun May 7 06:29:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 23:29:43 -0700 Subject: rpms/gcompris/FC-5 gcompris-7.4-xf86vidmode.patch, NONE, 1.1 gcompris.spec, 1.3, 1.4 Message-ID: <200605070629.k476Tj92029446@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29426 Modified Files: gcompris.spec Added Files: gcompris-7.4-xf86vidmode.patch Log Message: * Sat May 6 2006 Hans de Goede 7.4-7 - Use XF86VidMode instead of Xrandr extension for resolution switching, hopefully fixing bug 190918. gcompris-7.4-xf86vidmode.patch: --- NEW FILE gcompris-7.4-xf86vidmode.patch --- --- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 +++ gcompris-7.4/configure 2006-05-07 00:25:10.000000000 +0200 @@ -1094,7 +1094,7 @@ --disable-sdltest Do not try to compile and run a test SDL program --disable-glibtest do not try to compile and run a test GLIB program --disable-rpath do not hardcode runtime library paths - --disable-xrandr Turn off xrandr + --disable-xf86vidmode Turn off xf86vidmode --enable-debug Turn on debugging messages --disable-sqlite Turn off sqlite (will disable profile) --enable-py-build-only Skip python modules tests. (Useful if you just need @@ -23630,7 +23630,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -23638,7 +23638,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -23665,7 +23665,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -23686,11 +23686,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -23769,23 +23769,23 @@ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -# Check whether --enable-xrandr or --disable-xrandr was given. -if test "${enable_xrandr+set}" = set; then - enableval="$enable_xrandr" - USE_XRANDR="$enableval" +# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. +if test "${enable_xf86vidmode+set}" = set; then + enableval="$enable_xf86vidmode" + USE_XF86VM="$enableval" else - USE_XRANDR="yes" + USE_XF86VM="yes" fi; -found_randr=no -if test "x$USE_XRANDR" == "xyes" ; then - RANDR_LIBS= - echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 -echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 -if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then +found_xf86vidmode=no +if test "x$USE_XF86VM" == "xyes" ; then + XF86VM_LIBS= + echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 +if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" +LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23799,11 +23799,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XRRSetScreenConfigAndRate (); +char XF86VidModeQueryExtension (); int main () { -XRRSetScreenConfigAndRate (); +XF86VidModeQueryExtension (); ; return 0; } @@ -23830,23 +23830,23 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no +ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 -if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then - echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 +if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then + echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 +echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23857,7 +23857,7 @@ /* end confdefs.h. */ #include -#include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -23881,38 +23881,38 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_X11_extensions_Xrandr_h=yes + ac_cv_header_X11_extensions_xf86vmode_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_Xrandr_h=no +ac_cv_header_X11_extensions_xf86vmode_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 -if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then - RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 +if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then + XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes fi fi - if test "x$found_randr" = "xno"; then - { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 -echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} + if test "x$found_xf86vidmode" = "xno"; then + { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 +echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} else cat >>confdefs.h <<_ACEOF -#define XRANDR 1 +#define XF86_VIDMODE 1 _ACEOF fi fi -LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" +LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" @@ -28651,7 +28651,7 @@ echo "SDL LIBS = found" fi -echo "XRANDR option (--enable-xrandr) = $found_randr" +echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" --- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 +++ gcompris-7.4/config.h.in 2006-05-07 00:25:10.000000000 +0200 @@ -141,5 +141,5 @@ /* Version number of package */ #undef VERSION -/* XRANDR Available */ -#undef XRANDR +/* XF86VidMode Available */ +#undef XF86_VIDMODE --- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-07 00:25:10.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } } - if(strcmp(name,"noxrandr")==0){ - if(self->cdata->noxrandr){ + if(strcmp(name,"noxf86vm")==0){ + if(self->cdata->noxf86vm){ Py_INCREF(Py_True); return Py_True; } else { --- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 +++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-07 00:29:58.000000000 +0200 @@ -33,12 +33,13 @@ #include "cursor.h" -/* For XRANDR Support */ -#ifdef XRANDR +/* For XF86_VIDMODE Support */ +#ifdef XF86_VIDMODE #include #include -#include -#include +#include +#include +#include #endif #if defined _WIN32 || defined __WIN32__ @@ -104,7 +105,7 @@ static int popt_aalias = FALSE; static int popt_difficulty_filter = FALSE; static int popt_debug = FALSE; -static int popt_noxrandr = FALSE; +static int popt_noxf86vm = FALSE; static char *popt_root_menu = NULL; static char *popt_local_activity = NULL; static int popt_administration = FALSE; @@ -139,8 +140,8 @@ N_("Print the version of " PACKAGE), NULL}, {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, N_("Use the antialiased canvas (slower)."), NULL}, - {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, - N_("Disable XRANDR (No screen resolution change)."), NULL}, + {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, + N_("Disable XF86VidMode (No screen resolution change)."), NULL}, {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, @@ -184,29 +185,19 @@ }; /* XRandr Stuff */ -#ifdef XRANDR -typedef struct +#ifdef XF86_VIDMODE +static struct { - gboolean xr_lock_updates; + int vidmode_available; + XF86VidModeModeInfo orig_mode; + int orig_viewport_x; + int orig_viewport_y; + int width; + int height; +} XF86VidModeData = { 0, { 0 }, 0, 0 }; - XRRScreenConfiguration *xr_screen_conf; - - XRRScreenSize *xr_sizes; - int xr_nsize; - SizeID xr_current_size; - - Rotation xr_rotations; - Rotation xr_current_rotation; - -} XRANDRData; - -static SizeID xr_previous_size; -static gboolean xr_previous_size_set = FALSE; -static XRANDRData *xrandr = NULL; - -static void xrandr_init ( XRANDRData *xrandr ); -static void xrandr_get_config ( XRANDRData *xrandr ); -static void xrandr_set_config( XRANDRData *xrandr ); +static void xf86_vidmode_init( void ); +static void xf86_vidmode_set_fullscreen( int state ); #endif /****************************************************************************/ @@ -441,8 +432,8 @@ gint screen_height, screen_width; GtkWidget *vbox; -#ifdef XRANDR - xrandr = g_new0 (XRANDRData, 1); +#ifdef XF86_VIDMODE + xf86_vidmode_init(); #endif gcompris_set_fullscreen(properties->fullscreen); @@ -450,10 +441,10 @@ screen_height = gdk_screen_height(); screen_width = gdk_screen_width(); -#ifdef XRANDR - if(properties->fullscreen && !properties->noxrandr) { - screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; - screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; +#ifdef XF86_VIDMODE + if(properties->fullscreen && !properties->noxf86vm) { + screen_width = XF86VidModeData.width; + screen_height = XF86VidModeData.height; } #endif @@ -811,39 +802,18 @@ */ void gcompris_set_fullscreen(gboolean state) { - - if(state) - { -#ifdef XRANDR - gint i; - /* Search the 800x600 Resolution */ - if(properties->fullscreen && !properties->noxrandr) { - - g_warning("XRANDR Is compiled in. Searching a good resolution"); - - /* Check if XRANDR is available */ - if (!properties->noxrandr) { - xrandr_get_config ( xrandr ); - xr_previous_size = (SizeID)xrandr->xr_current_size; - for (i = 0; i < xrandr->xr_nsize; i++) { - if(xrandr->xr_sizes[i].width == BOARDWIDTH && - xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) - { - xrandr->xr_current_size = (SizeID)i; - xr_previous_size_set = TRUE; - break; - } - } - } - - /* Set the Fullscreen now */ - if(xr_previous_size_set) - { - if(is_mapped) - xrandr_set_config( xrandr ); - } - } + properties->fullscreen = state; + /* We need to grab the pointer before doing the vidmode switch otherwise the + setviewport may be "canceled" by the pointer being outside the viewport */ + if(properties->fullscreen) + gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, + GDK_CURRENT_TIME); + +#ifdef XF86_VIDMODE + xf86_vidmode_set_fullscreen(properties->fullscreen); #endif + if(properties->fullscreen) + { gdk_window_set_decorations (window->window, 0); gdk_window_set_functions (window->window, 0); gtk_widget_set_uposition (window, 0, 0); @@ -851,20 +821,7 @@ } else { -#ifdef XRANDR - /* Set back the original screen size */ - if(xr_previous_size_set && !properties->noxrandr) - { - /* Need to refresh our config or xrandr api will reject us */ - if(xrandr) - { - xrandr_get_config ( xrandr ); - xrandr->xr_current_size = (SizeID)xr_previous_size; - xrandr_set_config( xrandr ); - } - } - xr_previous_size_set = FALSE; -#endif + gdk_pointer_ungrab(GDK_CURRENT_TIME); /* The hide must be done at least for KDE */ gtk_widget_hide (window); gdk_window_set_decorations (window->window, GDK_DECOR_ALL); @@ -1044,68 +1001,136 @@ g_printerr ("%s: %s\n\n", "gcompris", message); } -#ifdef XRANDR +#ifdef XF86_VIDMODE /* - * XRANDR STUFF - * ------------ + * XF86VidMode STUFF + * ----------------- */ static void -xrandr_init ( XRANDRData *data ) +xf86_vidmode_init ( void ) { - if(data==NULL) + int i,j; + XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) + &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); + + if (properties->noxf86vm) return; - - data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); - - if (data->xr_screen_conf == NULL) + + if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, + &XF86VidModeData.orig_viewport_x)) + properties->noxf86vm = TRUE; + + if (properties->noxf86vm) + g_warning("XF86VidMode not available"); + else { - g_warning("XRANDR not available"); - properties->noxrandr = TRUE; + XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; + XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; + g_warning("XF86VidMode support enabled"); } - else - g_warning("XRANDR support enabled"); - } - -static void -xrandr_get_config ( XRANDRData *data ) -{ - if(data==NULL) - return; - - xrandr_init (data); - - data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, - &data->xr_current_rotation); - - data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); - - data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, - &data->xr_current_rotation); } + static void -xrandr_set_config( XRANDRData *data ) +xf86_vidmode_set_fullscreen ( int state ) { - Status status = RRSetConfigFailed; + int i; + XF86VidModeModeLine mode; - if(data==NULL) + if (properties->noxf86vm) return; - if (data->xr_lock_updates) return; - - status = XRRSetScreenConfig (GDK_DISPLAY(), - data->xr_screen_conf, - GDK_ROOT_WINDOW(), - data->xr_current_size, - data->xr_current_rotation, - CurrentTime); - - if(status) { - g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", - (int)status); - } - return; - + if (state) + { + XF86VidModeModeInfo **modes; + int mode_count; + + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode)) + { + g_warning("XF86VidMode couldnot get current mode, not switching resolution"); + properties->fullscreen = FALSE; + return; + } + + /* Do we need to switch? */ + if ((mode.hdisplay == BOARDWIDTH) && + (mode.vdisplay == BOARDHEIGHT+BARHEIGHT)) + { + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), + GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) + g_warning("XF86VidMode couldnot change viewport"); + return; + } + + if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &mode_count, &modes)) + { + g_warning("XF86VidMode couldnot get modes not switching resolution"); + properties->fullscreen = FALSE; + return; + } + + for (i = 0; i < mode_count; i++) + { + if ((modes[i]->hdisplay == BOARDWIDTH) && + (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) + { + if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), modes[i])) + { + XF86VidModeData.width = modes[i]->hdisplay; + XF86VidModeData.height = modes[i]->vdisplay; + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), + GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) + g_warning("XF86VidMode couldnot change viewport"); + } + else + { + g_warning("XF86VidMode couldnot switch resolution"); + properties->fullscreen = FALSE; + } + break; + } + } + if (i == mode_count) + { + g_warning("XF86VidMode couldnot find a suitable resolution"); + properties->fullscreen = FALSE; + } + XFree(modes); + } + else + { + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode) || + (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || + (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) + { + if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_mode)) + { + XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; + XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; + } + else + g_warning("XF86VidMode couldnot restore original resolution"); + + } + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, + XF86VidModeData.orig_viewport_y)) + g_warning("XF86VidMode couldnot restore original viewport"); + } } #endif @@ -1185,9 +1210,9 @@ properties->fullscreen = TRUE; } - if (popt_noxrandr) + if (popt_noxf86vm) { - properties->noxrandr = TRUE; + properties->noxf86vm = TRUE; } if (popt_window) --- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/gcompris/properties.c 2006-05-07 00:25:10.000000000 +0200 @@ -160,7 +160,7 @@ tmp->fx = 1; tmp->screensize = 1; tmp->fullscreen = 1; - tmp->noxrandr = FALSE; + tmp->noxf86vm = FALSE; tmp->timer = 1; tmp->skin = "babytoy"; tmp->key = "default"; @@ -244,8 +244,8 @@ } else if(!strcmp(value.v_identifier, "fullscreen")) { if(!scan_get_int(scanner, &tmp->fullscreen)) g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "noxrandr")) { - if(!scan_get_int(scanner, &tmp->noxrandr)) + } else if(!strcmp(value.v_identifier, "noxf86vm")) { + if(!scan_get_int(scanner, &tmp->noxf86vm)) g_warning("Config file parsing error on token %s", token); } else if(!strcmp(value.v_identifier, "timer")) { if(!scan_get_int(scanner, &tmp->timer)) --- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/gcompris/properties.h 2006-05-07 00:25:10.000000000 +0200 @@ -28,7 +28,7 @@ gint music; gint fx; gint fullscreen; - gint noxrandr; + gint noxf86vm; gint screensize; gint defaultcursor; gint timer; --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 +++ gcompris-7.4/configure.in 2006-05-07 00:25:10.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV -dnl XRANDR Allow us to set the screen resolution dynamically +dnl XF86VidMode allows us to set the screen resolution dynamically AC_PATH_X -AC_ARG_ENABLE(xrandr, +AC_ARG_ENABLE(xf86vidmode, AC_HELP_STRING( - [--disable-xrandr], - [Turn off xrandr]), - USE_XRANDR="$enableval", USE_XRANDR="yes") -found_randr=no -if test "x$USE_XRANDR" == "xyes" ; then - RANDR_LIBS= - AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate, - [AC_CHECK_HEADER(X11/extensions/Xrandr.h, - RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes,, + [--disable-xf86vidmode], + [Turn off xf86vidmode]), + USE_XF86VM="$enableval", USE_XF86VM="yes") +found_xf86vidmode=no +if test "x$USE_XF86VM" == "xyes" ; then + XF86VM_LIBS= + AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, + [AC_CHECK_HEADER(X11/extensions/xf86vmode.h, + XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes,, [#include ])], , -L$x_libraries $ALL_X_LIBS ) - if test "x$found_randr" = "xno"; then - AC_MSG_NOTICE(["Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen."]) + if test "x$found_xf86vidmode" = "xno"; then + AC_MSG_NOTICE(["Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen."]) else - AC_DEFINE_UNQUOTED(XRANDR, 1, [XRANDR Available]) + AC_DEFINE_UNQUOTED(XF86_VIDMODE, 1, [XF86VidMode Available]) fi fi -LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" +LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" dnl Add the languages which your application supports here. ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" @@ -680,7 +680,7 @@ echo "SDL LIBS = found" fi -echo "XRANDR option (--enable-xrandr) = $found_randr" +echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcompris.spec 5 May 2006 18:11:25 -0000 1.3 +++ gcompris.spec 7 May 2006 06:29:43 -0000 1.4 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -12,6 +12,7 @@ Patch2: gcompris-nl.patch Patch3: gcompris-electric.patch Patch4: gcompris-click_on_letter.patch +Patch5: gcompris-7.4-xf86vidmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel @@ -220,6 +221,7 @@ %patch2 -p1 %patch3 -p1 -z .electric %patch4 -p1 -z .click_on_letter +%patch5 -p1 -z .xf86vm iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp mv tmp docs/C/gcompris.info # fix gnome.canvas deprecation warnings @@ -476,6 +478,10 @@ %changelog +* Sat May 6 2006 Hans de Goede 7.4-7 +- Use XF86VidMode instead of Xrandr extension for resolution switching, + hopefully fixing bug 190918. + * Fri May 5 2006 Hans de Goede 7.4-6 - Add missing python module Requires. From fedora-extras-commits at redhat.com Sun May 7 06:35:36 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 23:35:36 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.4,1.5 Message-ID: <200605070635.k476Zcw2029526@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29509 Modified Files: gcompris.spec Log Message: Change Xrandr BR to Xxf86vm BR Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gcompris.spec 6 May 2006 22:42:38 -0000 1.4 +++ gcompris.spec 7 May 2006 06:35:36 -0000 1.5 @@ -15,7 +15,8 @@ Patch5: gcompris-7.4-xf86vidmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel -Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel +Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel +Buildrequires: xorg-x11-proto-devel Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags From fedora-extras-commits at redhat.com Sun May 7 06:37:37 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 23:37:37 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.5,1.6 Message-ID: <200605070637.k476bd2v029579@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29562 Modified Files: gcompris.spec Log Message: * Sun May 7 2006 Hans de Goede 7.4-8 - Change Xrandr BR to Xxf86vm BR. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gcompris.spec 7 May 2006 06:35:36 -0000 1.5 +++ gcompris.spec 7 May 2006 06:37:37 -0000 1.6 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -479,6 +479,9 @@ %changelog +* Sun May 7 2006 Hans de Goede 7.4-8 +- Change Xrandr BR to Xxf86vm BR. + * Sat May 6 2006 Hans de Goede 7.4-7 - Use XF86VidMode instead of Xrandr extension for resolution switching, hopefully fixing bug 190918. From fedora-extras-commits at redhat.com Sun May 7 06:39:15 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 23:39:15 -0700 Subject: rpms/gcompris/FC-5 gcompris.spec,1.4,1.5 Message-ID: <200605070639.k476dHAj029649@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29632 Modified Files: gcompris.spec Log Message: * Sun May 7 2006 Hans de Goede 7.4-8 - Change Xrandr BR to Xxf86vm BR. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gcompris.spec 7 May 2006 06:29:43 -0000 1.4 +++ gcompris.spec 7 May 2006 06:39:15 -0000 1.5 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -15,7 +15,8 @@ Patch5: gcompris-7.4-xf86vidmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel -Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel +Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel +Buildrequires: xorg-x11-proto-devel Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags @@ -478,6 +479,9 @@ %changelog +* Sun May 7 2006 Hans de Goede 7.4-8 +- Change Xrandr BR to Xxf86vm BR. + * Sat May 6 2006 Hans de Goede 7.4-7 - Use XF86VidMode instead of Xrandr extension for resolution switching, hopefully fixing bug 190918. From fedora-extras-commits at redhat.com Sun May 7 08:17:09 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 01:17:09 -0700 Subject: rpms/awstats/FC-4 .cvsignore, 1.5, 1.6 awstats.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <200605070817.k478HBTx006689@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6630/FC-4 Modified Files: .cvsignore awstats.spec sources Log Message: version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Aug 2005 10:18:16 -0000 1.5 +++ .cvsignore 7 May 2006 08:17:08 -0000 1.6 @@ -1 +1 @@ -awstats-6.5.tar.gz +awstats-6.6.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- awstats.spec 11 Jan 2006 15:07:15 -0000 1.9 +++ awstats.spec 7 May 2006 08:17:08 -0000 1.10 @@ -1,18 +1,19 @@ Name: awstats -Version: 6.5 -Release: 1%{?dist} +Version: 6.6 +Release: 0.1.beta%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz -#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz +#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz +Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz +Source1: awstats.README.SELinux BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd Requires: perl -Requires(post): perl -Requires(postun): /sbin/service +Requires(post): perl, policycoreutils +Requires(postun): /sbin/service, policycoreutils %description Advanced Web Statistics is a powerful and featureful tool that generates @@ -30,18 +31,19 @@ With the default configuration, the statistics are available: http://localhost/awstats/awstats.pl + %prep %setup -q - # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* - # Fix some bad file permissions here for convenience. chmod -x tools/httpd_conf find tools/xslt -type f | xargs chmod -x - # Remove \r in conf file (file written on MS Windows) perl -pi -e 's/\r//g' tools/httpd_conf +# SELinux README +cp -a %{SOURCE1} README.SELinux + %install rm -rf $RPM_BUILD_ROOT @@ -79,7 +81,7 @@ ### Commit permanent changes to default configuration install -p -m 644 wwwroot/cgi-bin/awstats.model.conf \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf -%{__perl} -pi -e ' +perl -pi -e ' s|^LogFile=.*$|LogFile="%{_localstatedir}/log/httpd/access_log"|; s|^DirData=.*$|DirData="%{_localstatedir}/lib/awstats"|; s|^DirCgi=.*$|DirCgi="/awstats"|; @@ -90,16 +92,17 @@ s|^SaveDatabaseFilesWithPermissionsForEveryone=.*$|SaveDatabaseFilesWithPermissionsForEveryone=0|; s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|; s|^Expires=.*$|Expires=3600|; - ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf + ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf # Fix scripts -%{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ +perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf} # Apache configuration install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf -%{__perl} -pi -e 's|/usr/local|%{_datadir}|g' $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf +perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \ + $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf echo "# Additional Perl modules SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins @@ -112,6 +115,7 @@ %clean rm -rf $RPM_BUILD_ROOT + %post if [ $1 -eq 1 ]; then if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then @@ -121,11 +125,27 @@ ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || : fi fi +### SELinux support ### +# Set SELinux file_context +semanage fcontext -a -t httpd_sys_script_exec_t \ + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : +semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : +# Actually change the context +chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || : +chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || : + %postun if [ $1 -ne 0 ]; then /sbin/service httpd condrestart >/dev/null 2>&1 fi +# SELinux support +if [ $1 -eq 0 ]; then + semanage fcontext -d -t httpd_sys_script_exec_t \ + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : +fi + %files @@ -141,7 +161,7 @@ %{_datadir}/%{name}/wwwroot/cgi-bin # Different defattr to fix lots of files which should not be +x. %defattr(644,root,root,755) -%doc README.TXT docs/* +%doc README.TXT docs/* README.SELinux %{_datadir}/%{name}/lang %{_datadir}/%{name}/lib %{_datadir}/%{name}/plugins @@ -150,7 +170,19 @@ %{_datadir}/%{name}/wwwroot/icon %{_datadir}/%{name}/wwwroot/js + + %changelog +* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta +- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) + +* Sun Apr 09 2006 Aurelien Bompard 6.5-3 +- SELinux support: use semanage to label the cgi and the database files +- Only allow access from localhost by default (this app has a security history) + +* Thu Feb 23 2006 Aurelien Bompard 6.5-2 +- rebuild for FC5 + * Wed Jan 11 2006 Aurelien Bompard 6.5-1 - version 6.5 final Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Jan 2006 15:07:15 -0000 1.8 +++ sources 7 May 2006 08:17:08 -0000 1.9 @@ -1 +1 @@ -aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz +c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 08:17:09 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 01:17:09 -0700 Subject: rpms/awstats/FC-5 .cvsignore, 1.5, 1.6 awstats.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200605070817.k478HB4x006697@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6630/FC-5 Modified Files: .cvsignore awstats.spec sources Log Message: version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Aug 2005 10:18:17 -0000 1.5 +++ .cvsignore 7 May 2006 08:17:09 -0000 1.6 @@ -1 +1 @@ -awstats-6.5.tar.gz +awstats-6.6.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- awstats.spec 9 Apr 2006 15:30:30 -0000 1.11 +++ awstats.spec 7 May 2006 08:17:09 -0000 1.12 @@ -1,19 +1,19 @@ Name: awstats -Version: 6.5 -Release: 3%{?dist} +Version: 6.6 +Release: 0.1.beta%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz -#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz +#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz +Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz +Source1: awstats.README.SELinux BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd Requires: perl -Requires(post): perl -Requires(postun): /sbin/service -Requires(pre): policycoreutils +Requires(post): perl, policycoreutils +Requires(postun): /sbin/service, policycoreutils %description Advanced Web Statistics is a powerful and featureful tool that generates @@ -31,18 +31,19 @@ With the default configuration, the statistics are available: http://localhost/awstats/awstats.pl + %prep %setup -q - # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* - # Fix some bad file permissions here for convenience. chmod -x tools/httpd_conf find tools/xslt -type f | xargs chmod -x - # Remove \r in conf file (file written on MS Windows) perl -pi -e 's/\r//g' tools/httpd_conf +# SELinux README +cp -a %{SOURCE1} README.SELinux + %install rm -rf $RPM_BUILD_ROOT @@ -80,7 +81,7 @@ ### Commit permanent changes to default configuration install -p -m 644 wwwroot/cgi-bin/awstats.model.conf \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf -%{__perl} -pi -e ' +perl -pi -e ' s|^LogFile=.*$|LogFile="%{_localstatedir}/log/httpd/access_log"|; s|^DirData=.*$|DirData="%{_localstatedir}/lib/awstats"|; s|^DirCgi=.*$|DirCgi="/awstats"|; @@ -91,16 +92,17 @@ s|^SaveDatabaseFilesWithPermissionsForEveryone=.*$|SaveDatabaseFilesWithPermissionsForEveryone=0|; s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|; s|^Expires=.*$|Expires=3600|; - ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf + ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf # Fix scripts -%{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ +perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf} # Apache configuration install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf -%{__perl} -pi -e 's|/usr/local|%{_datadir}|g' $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf +perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \ + $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf echo "# Additional Perl modules SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins @@ -114,13 +116,6 @@ rm -rf $RPM_BUILD_ROOT -%pre -# Set SELinux types -semanage fcontext -a -t httpd_sys_script_exec_t \ - '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' 2>/dev/null || : - - %post if [ $1 -eq 1 ]; then if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then @@ -130,18 +125,29 @@ ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || : fi fi +### SELinux support ### +# Set SELinux file_context +semanage fcontext -a -t httpd_sys_script_exec_t \ + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : +semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : +# Actually change the context +chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || : +chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || : %postun if [ $1 -ne 0 ]; then /sbin/service httpd condrestart >/dev/null 2>&1 fi +# SELinux support if [ $1 -eq 0 ]; then semanage fcontext -d -t httpd_sys_script_exec_t \ - '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : fi + %files %defattr(-,root,root,755) # Apache configuration file @@ -155,7 +161,7 @@ %{_datadir}/%{name}/wwwroot/cgi-bin # Different defattr to fix lots of files which should not be +x. %defattr(644,root,root,755) -%doc README.TXT docs/* +%doc README.TXT docs/* README.SELinux %{_datadir}/%{name}/lang %{_datadir}/%{name}/lib %{_datadir}/%{name}/plugins @@ -164,9 +170,15 @@ %{_datadir}/%{name}/wwwroot/icon %{_datadir}/%{name}/wwwroot/js + + %changelog +* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta +- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) + * Sun Apr 09 2006 Aurelien Bompard 6.5-3 - SELinux support: use semanage to label the cgi and the database files +- Only allow access from localhost by default (this app has a security history) * Thu Feb 23 2006 Aurelien Bompard 6.5-2 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Jan 2006 15:07:29 -0000 1.8 +++ sources 7 May 2006 08:17:09 -0000 1.9 @@ -1 +1 @@ -aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz +c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 08:17:10 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 01:17:10 -0700 Subject: rpms/awstats/devel .cvsignore, 1.5, 1.6 awstats.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200605070817.k478HCTD006705@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6630/devel Modified Files: .cvsignore awstats.spec sources Log Message: version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Aug 2005 10:18:17 -0000 1.5 +++ .cvsignore 7 May 2006 08:17:10 -0000 1.6 @@ -1 +1 @@ -awstats-6.5.tar.gz +awstats-6.6.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- awstats.spec 12 Apr 2006 19:16:45 -0000 1.12 +++ awstats.spec 7 May 2006 08:17:10 -0000 1.13 @@ -1,12 +1,12 @@ Name: awstats -Version: 6.5 -Release: 3%{?dist} +Version: 6.6 +Release: 0.1.beta%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz -#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz +#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz +Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz Source1: awstats.README.SELinux BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -131,8 +131,8 @@ '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : # Actually change the context -chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin -chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats +chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || : +chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || : %postun @@ -142,7 +142,8 @@ # SELinux support if [ $1 -eq 0 ]; then semanage fcontext -d -t httpd_sys_script_exec_t \ - '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : fi @@ -172,6 +173,9 @@ %changelog +* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta +- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) + * Sun Apr 09 2006 Aurelien Bompard 6.5-3 - SELinux support: use semanage to label the cgi and the database files - Only allow access from localhost by default (this app has a security history) Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Jan 2006 15:07:29 -0000 1.8 +++ sources 7 May 2006 08:17:10 -0000 1.9 @@ -1 +1 @@ -aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz +c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 10:43:20 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 May 2006 03:43:20 -0700 Subject: rpms/spamass-milter/devel spamass-milter.spec,1.7,1.8 Message-ID: <200605071043.k47AhMQr030574@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30542 Modified Files: spamass-milter.spec Log Message: Fix race condition in "stop" clause of initscript (#190894) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/devel/spamass-milter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spamass-milter.spec 6 Apr 2006 13:10:14 -0000 1.7 +++ spamass-milter.spec 7 May 2006 10:43:19 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -92,11 +92,11 @@ stop() { echo -n $"Shutting down $desc ($prog): " + rm -f %{_localstatedir}/lock/subsys/spamass-milter killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $pidfile - [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/spamass-milter return $RETVAL } @@ -176,6 +176,9 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Sun May 7 2006 Paul Howarth - 0.3.1-2 +- Fix race condition in "stop" clause of initscript (#190894) + * Thu Apr 6 2006 Paul Howarth - 0.3.1-1 - Update to 0.3.1 From fedora-extras-commits at redhat.com Sun May 7 10:44:51 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 May 2006 03:44:51 -0700 Subject: rpms/spamass-milter/FC-5 spamass-milter.spec,1.7,1.8 Message-ID: <200605071044.k47AiraM030833@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30792 Modified Files: spamass-milter.spec Log Message: resync with devel Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-5/spamass-milter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spamass-milter.spec 6 Apr 2006 13:11:59 -0000 1.7 +++ spamass-milter.spec 7 May 2006 10:44:51 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -92,11 +92,11 @@ stop() { echo -n $"Shutting down $desc ($prog): " + rm -f %{_localstatedir}/lock/subsys/spamass-milter killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $pidfile - [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/spamass-milter return $RETVAL } @@ -176,6 +176,9 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Sun May 7 2006 Paul Howarth - 0.3.1-2 +- Fix race condition in "stop" clause of initscript (#190894) + * Thu Apr 6 2006 Paul Howarth - 0.3.1-1 - Update to 0.3.1 From fedora-extras-commits at redhat.com Sun May 7 10:45:48 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 May 2006 03:45:48 -0700 Subject: rpms/spamass-milter/FC-4 spamass-milter.spec,1.6,1.7 Message-ID: <200605071045.k47AjouG031023@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30975 Modified Files: spamass-milter.spec Log Message: resync with devel Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-4/spamass-milter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- spamass-milter.spec 6 Apr 2006 13:13:28 -0000 1.6 +++ spamass-milter.spec 7 May 2006 10:45:48 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -92,11 +92,11 @@ stop() { echo -n $"Shutting down $desc ($prog): " + rm -f %{_localstatedir}/lock/subsys/spamass-milter killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $pidfile - [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/spamass-milter return $RETVAL } @@ -176,6 +176,9 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Sun May 7 2006 Paul Howarth - 0.3.1-2 +- Fix race condition in "stop" clause of initscript (#190894) + * Thu Apr 6 2006 Paul Howarth - 0.3.1-1 - Update to 0.3.1 From fedora-extras-commits at redhat.com Sun May 7 10:46:58 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 May 2006 03:46:58 -0700 Subject: rpms/spamass-milter/FC-3 spamass-milter.spec,1.6,1.7 Message-ID: <200605071047.k47Al1Ru031235@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31196 Modified Files: spamass-milter.spec Log Message: resync with devel Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-3/spamass-milter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- spamass-milter.spec 6 Apr 2006 13:14:39 -0000 1.6 +++ spamass-milter.spec 7 May 2006 10:46:58 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -92,11 +92,11 @@ stop() { echo -n $"Shutting down $desc ($prog): " + rm -f %{_localstatedir}/lock/subsys/spamass-milter killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $pidfile - [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/spamass-milter return $RETVAL } @@ -176,6 +176,9 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Sun May 7 2006 Paul Howarth - 0.3.1-2 +- Fix race condition in "stop" clause of initscript (#190894) + * Thu Apr 6 2006 Paul Howarth - 0.3.1-1 - Update to 0.3.1 From fedora-extras-commits at redhat.com Sun May 7 10:53:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 03:53:19 -0700 Subject: owners owners.list,1.952,1.953 Message-ID: <200605071053.k47ArL57032135@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32108/owners Modified Files: owners.list Log Message: Unorphan arc Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.952 retrieving revision 1.953 diff -u -r1.952 -r1.953 --- owners.list 7 May 2006 02:11:29 -0000 1.952 +++ owners.list 7 May 2006 10:53:19 -0000 1.953 @@ -48,7 +48,7 @@ Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|arc|Arc archiver|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|archmage|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org| Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 10:56:24 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 03:56:24 -0700 Subject: rpms/arc/devel arc.spec,1.13,1.14 Message-ID: <200605071056.k47AuQND032571@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/arc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32548 Modified Files: arc.spec Log Message: * Sun May 7 2006 5.21o-2 - Unorphan, build for FC-5, devel Index: arc.spec =================================================================== RCS file: /cvs/extras/rpms/arc/devel/arc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- arc.spec 2 Mar 2006 21:28:17 -0000 1.13 +++ arc.spec 7 May 2006 10:56:24 -0000 1.14 @@ -1,9 +1,7 @@ Name: arc Version: 5.21o -Release: 1%{dist} - +Release: 2%{?dist} Summary: Arc archiver - Group: Applications/Archiving License: GPL URL: http://arc.sourceforge.net/ @@ -14,39 +12,37 @@ Arc file archiver and compressor. Long since superseded by zip/unzip but useful if you have old .arc files you need to unpack. -%prep -cat< 5.21o-2 +- Unorphan, build for FC-5, devel * Thu Oct 13 2005 5.21o-1 - 5.21o From fedora-extras-commits at redhat.com Sun May 7 10:57:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 03:57:02 -0700 Subject: rpms/arc/FC-5 arc.spec,1.13,1.14 Message-ID: <200605071057.k47Av4ft032714@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/arc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32691 Modified Files: arc.spec Log Message: * Sun May 7 2006 5.21o-2 - Unorphan, build for FC-5, devel Index: arc.spec =================================================================== RCS file: /cvs/extras/rpms/arc/FC-5/arc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- arc.spec 2 Mar 2006 21:28:17 -0000 1.13 +++ arc.spec 7 May 2006 10:57:02 -0000 1.14 @@ -1,9 +1,7 @@ Name: arc Version: 5.21o -Release: 1%{dist} - +Release: 2%{?dist} Summary: Arc archiver - Group: Applications/Archiving License: GPL URL: http://arc.sourceforge.net/ @@ -14,39 +12,37 @@ Arc file archiver and compressor. Long since superseded by zip/unzip but useful if you have old .arc files you need to unpack. -%prep -cat< 5.21o-2 +- Unorphan, build for FC-5, devel * Thu Oct 13 2005 5.21o-1 - 5.21o From fedora-extras-commits at redhat.com Sun May 7 11:16:04 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 04:16:04 -0700 Subject: rpms/pipenightdreams/devel pipenightdreams-0.10.0-quit.patch, NONE, 1.1 pipenightdreams.spec, 1.2, 1.3 Message-ID: <200605071116.k47BG65A005471@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/pipenightdreams/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444 Modified Files: pipenightdreams.spec Added Files: pipenightdreams-0.10.0-quit.patch Log Message: * Sun May 7 2006 Hans de Goede 0.10.0-3 - Add Patch3 which fixes quiting during the "try again dialog" (bz 188345) pipenightdreams-0.10.0-quit.patch: --- NEW FILE pipenightdreams-0.10.0-quit.patch --- --- pipenightdreams-0.10.0/src/pipenightdreams.cpp~ 2006-05-07 13:10:55.000000000 +0200 +++ pipenightdreams-0.10.0/src/pipenightdreams.cpp 2006-05-07 13:10:55.000000000 +0200 @@ -356,7 +356,9 @@ do{ event_manager->pumpEvents(true); event=sys->get(); - }while (event!=GO); + }while (event!=GO && event!=BACK); + if (event == BACK) + sys->put(SDLK_ESCAPE); } void PipeNightDreams::showFinal(){ Index: pipenightdreams.spec =================================================================== RCS file: /cvs/extras/rpms/pipenightdreams/devel/pipenightdreams.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pipenightdreams.spec 7 Apr 2006 15:36:56 -0000 1.2 +++ pipenightdreams.spec 7 May 2006 11:16:04 -0000 1.3 @@ -1,6 +1,6 @@ Name: pipenightdreams Version: 0.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Connect the waterpipes to create a proper pipeline Group: Amusements/Games License: GPL @@ -10,6 +10,7 @@ Patch0: pipenightdreams-0.10.0-gcc41.patch Patch1: pipenightdreams-0.10.0-datadir.patch Patch2: pipenightdreams-0.10.0-sanitize.patch +Patch3: pipenightdreams-0.10.0-quit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel desktop-file-utils @@ -26,6 +27,7 @@ %patch0 -p1 -z .gcc41 %patch1 -p1 -z .datadir %patch2 -p1 -z .sanitize +%patch3 -p1 -z .quit %build @@ -80,6 +82,9 @@ %changelog +* Sun May 7 2006 Hans de Goede 0.10.0-3 +- Add Patch3 which fixes quiting during the "try again dialog" (bz 188345) + * Fri Apr 7 2006 Hans de Goede 0.10.0-2 - Remove use of a trademarked term from %%description, manpage and docs From fedora-extras-commits at redhat.com Sun May 7 11:17:04 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 04:17:04 -0700 Subject: rpms/pipenightdreams/FC-5 pipenightdreams-0.10.0-quit.patch, NONE, 1.1 pipenightdreams.spec, 1.2, 1.3 Message-ID: <200605071117.k47BH6L1005671@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/pipenightdreams/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643 Modified Files: pipenightdreams.spec Added Files: pipenightdreams-0.10.0-quit.patch Log Message: * Sun May 7 2006 Hans de Goede 0.10.0-3 - Add Patch3 which fixes quiting during the "try again dialog" (bz 188345) pipenightdreams-0.10.0-quit.patch: --- NEW FILE pipenightdreams-0.10.0-quit.patch --- --- pipenightdreams-0.10.0/src/pipenightdreams.cpp~ 2006-05-07 13:10:55.000000000 +0200 +++ pipenightdreams-0.10.0/src/pipenightdreams.cpp 2006-05-07 13:10:55.000000000 +0200 @@ -356,7 +356,9 @@ do{ event_manager->pumpEvents(true); event=sys->get(); - }while (event!=GO); + }while (event!=GO && event!=BACK); + if (event == BACK) + sys->put(SDLK_ESCAPE); } void PipeNightDreams::showFinal(){ Index: pipenightdreams.spec =================================================================== RCS file: /cvs/extras/rpms/pipenightdreams/FC-5/pipenightdreams.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pipenightdreams.spec 9 Apr 2006 07:26:15 -0000 1.2 +++ pipenightdreams.spec 7 May 2006 11:17:04 -0000 1.3 @@ -1,6 +1,6 @@ Name: pipenightdreams Version: 0.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Connect the waterpipes to create a proper pipeline Group: Amusements/Games License: GPL @@ -10,6 +10,7 @@ Patch0: pipenightdreams-0.10.0-gcc41.patch Patch1: pipenightdreams-0.10.0-datadir.patch Patch2: pipenightdreams-0.10.0-sanitize.patch +Patch3: pipenightdreams-0.10.0-quit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel desktop-file-utils @@ -26,6 +27,7 @@ %patch0 -p1 -z .gcc41 %patch1 -p1 -z .datadir %patch2 -p1 -z .sanitize +%patch3 -p1 -z .quit %build @@ -80,6 +82,9 @@ %changelog +* Sun May 7 2006 Hans de Goede 0.10.0-3 +- Add Patch3 which fixes quiting during the "try again dialog" (bz 188345) + * Fri Apr 7 2006 Hans de Goede 0.10.0-2 - Remove use of a trademarked term from %%description, manpage and docs From fedora-extras-commits at redhat.com Sun May 7 13:35:53 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:35:53 -0700 Subject: rpms/ctapi-common - New directory Message-ID: <200605071335.k47DZtIW012406@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12380/ctapi-common Log Message: Directory /cvs/extras/rpms/ctapi-common added to the repository From fedora-extras-commits at redhat.com Sun May 7 13:35:54 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:35:54 -0700 Subject: rpms/ctapi-common/devel - New directory Message-ID: <200605071335.k47DZuLC012409@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12380/ctapi-common/devel Log Message: Directory /cvs/extras/rpms/ctapi-common/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 13:36:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:36:10 -0700 Subject: rpms/ctapi-common Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605071336.k47DaCSb012460@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427 Added Files: Makefile import.log Log Message: Setup of module ctapi-common --- NEW FILE Makefile --- # Top level Makefile for module ctapi-common all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 13:36:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:36:10 -0700 Subject: rpms/ctapi-common/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605071336.k47DaCeA012463@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ctapi-common --- NEW 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 May 7 13:36:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:36:45 -0700 Subject: rpms/ctapi-common import.log,1.1,1.2 Message-ID: <200605071336.k47Daluv012527@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12494 Modified Files: import.log Log Message: auto-import ctapi-common-1.0-2 on branch devel from ctapi-common-1.0-2.src.rpm Initial import (#190911). Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ctapi-common/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 13:36:10 -0000 1.1 +++ import.log 7 May 2006 13:36:45 -0000 1.2 @@ -0,0 +1 @@ +ctapi-common-1_0-2:HEAD:ctapi-common-1.0-2.src.rpm:1147008997 From fedora-extras-commits at redhat.com Sun May 7 13:36:46 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:36:46 -0700 Subject: rpms/ctapi-common/devel ctapi-common.LICENSE, NONE, 1.1 ctapi-common.README, NONE, 1.1 ctapi-common.spec, NONE, 1.1 Message-ID: <200605071336.k47Damcu012530@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12494/devel Added Files: ctapi-common.LICENSE ctapi-common.README ctapi-common.spec Log Message: auto-import ctapi-common-1.0-2 on branch devel from ctapi-common-1.0-2.src.rpm Initial import (#190911). --- NEW FILE ctapi-common.LICENSE --- Copyright (c) 2006 Fedora Project Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- NEW FILE ctapi-common.README --- The ctapi-common package provides common infrastructure for CT-API modules. To take advantage of this: - Install the modules into a directory listed in /etc/ld.so.conf.d/ctapi-*.conf for the target architecture. - Add a dependency on that directory in packages. --- NEW FILE ctapi-common.spec --- # Not noarch, but nothing to strip: %define debug_package %{nil} Name: ctapi-common Version: 1.0 Release: 2%{?dist} Summary: Common files and packaging infrastructure for CT-API modules Group: System Environment/Libraries License: MIT URL: http://fedoraproject.org/ Source0: %{name}.LICENSE Source1: %{name}.README BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description %{summary}. %prep %setup -c -T cp -p %{SOURCE0} LICENSE cp -p %{SOURCE1} README %build echo %{_libdir}/ctapi > ctapi.conf %install rm -rf $RPM_BUILD_ROOT install -Dpm 644 ctapi.conf \ $RPM_BUILD_ROOT/etc/ld.so.conf.d/ctapi-%{_target_cpu}.conf install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ctapi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE README # Hardcoded /etc in README -> hardcoded here. /etc/ld.so.conf.d/ctapi-%{_target_cpu}.conf %{_libdir}/ctapi/ %changelog * Sat May 6 2006 Ville Skytt?? - 1.0-2 - Encourage dir based dependency on %%{_libdir}/ctapi in packages (#190911). - Split contents of README into a separate file. - Change license to MIT, include license text. - Add URL. * Sat May 6 2006 Ville Skytt?? - 1.0-1 - First build. From fedora-extras-commits at redhat.com Sun May 7 13:47:25 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:47:25 -0700 Subject: rpms/openct/devel openct.spec,1.12,1.13 Message-ID: <200605071347.k47DlRxL012665@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12648 Modified Files: openct.spec Log Message: * Sat May 6 2006 Ville Skytt?? - 0.6.7-2 - Install CT-API module into %{_libdir}/ctapi, add dependency on it (#190903). - Update URL. Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openct.spec 4 May 2006 16:51:11 -0000 1.12 +++ openct.spec 7 May 2006 13:47:25 -0000 1.13 @@ -2,12 +2,12 @@ Name: openct Version: 0.6.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries License: LGPL -URL: http://www.opensc-project.org/ +URL: http://www.opensc-project.org/openct/ Source0: http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig @@ -17,6 +17,7 @@ BuildRequires: libusb-devel BuildRequires: libtool-ltdl-devel BuildRequires: libtool +Requires: %{_libdir}/ctapi # TODO: verify minimum udev version Requires: udev >= 062 Requires(post): /sbin/chkconfig @@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ctapi +mv $RPM_BUILD_ROOT%{_libdir}/{libopenctapi.so,ctapi} + install -Dpm 644 etc/openct.udev \ $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug @@ -134,8 +138,8 @@ %{_sbindir}/ifdhandler %{_sbindir}/ifdproxy %{_sbindir}/openct-control +%{_libdir}/ctapi/libopenctapi.so %{_libdir}/libopenct.so.* -%{_libdir}/libopenctapi.so %{_libdir}/openct/ %dir %{_localstatedir}/run/openct/ %ghost %{_localstatedir}/run/openct/status @@ -155,6 +159,10 @@ %changelog +* Sat May 6 2006 Ville Skytt?? - 0.6.7-2 +- Install CT-API module into %%{_libdir}/ctapi, add dependency on it (#190903). +- Update URL. + * Thu May 4 2006 Ville Skytt?? - 0.6.7-1 - 0.6.7. From fedora-extras-commits at redhat.com Sun May 7 13:48:14 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:48:14 -0700 Subject: rpms/openct/FC-5 .cvsignore, 1.4, 1.5 openct.spec, 1.9, 1.10 sources, 1.4, 1.5 openct-0.6.6-rpath64.patch, 1.1, NONE openct-reader.conf, 1.1, NONE openct.rules, 1.1, NONE Message-ID: <200605071348.k47DmG4V012737@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12716 Modified Files: .cvsignore openct.spec sources Removed Files: openct-0.6.6-rpath64.patch openct-reader.conf openct.rules Log Message: * Sat May 6 2006 Ville Skytt?? - 0.6.7-2 - Install CT-API module into %{_libdir}/ctapi, add dependency on it (#190903). - Update URL. * Thu May 4 2006 Ville Skytt?? - 0.6.7-1 - 0.6.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openct/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Sep 2005 07:06:13 -0000 1.4 +++ .cvsignore 7 May 2006 13:48:13 -0000 1.5 @@ -1 +1 @@ -openct-0.6.6.tar.gz +openct-0.6.7.tar.gz Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/FC-5/openct.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- openct.spec 6 Mar 2006 15:50:50 -0000 1.9 +++ openct.spec 7 May 2006 13:48:13 -0000 1.10 @@ -1,25 +1,23 @@ %define dropdir %(pkg-config libpcsclite --variable=usbdropdir) Name: openct -Version: 0.6.6 -Release: 5%{?dist} +Version: 0.6.7 +Release: 2%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries -License: BSD -URL: http://www.opensc.org/ -Source0: http://www.opensc.org/files/%{name}-%{version}.tar.gz +License: LGPL +URL: http://www.opensc-project.org/openct/ +Source0: http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig -Source3: %{name}-reader.conf -Source4: %{name}.rules -Patch0: %{name}-0.6.6-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.3.0 BuildRequires: libusb-devel BuildRequires: libtool-ltdl-devel -BuildRequires: sed +BuildRequires: libtool +Requires: %{_libdir}/ctapi # TODO: verify minimum udev version Requires: udev >= 062 Requires(post): /sbin/chkconfig @@ -57,16 +55,17 @@ %prep %setup -q -# patch0: --disable-rpath doesn't appear to do its job -%patch0 -p1 -sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf +sh bootstrap # avoid standard rpaths on lib64 archs +sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in +sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \ + etc/openct.udev %build %configure \ - --disable-dependency-tracking \ - --disable-static \ - --with-bundle-dir=%{dropdir} + --disable-dependency-tracking \ + --disable-static \ + --with-bundle-dir=%{dropdir} make %{?_smp_mflags} @@ -74,23 +73,29 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -Dpm 644 \ - %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ctapi +mv $RPM_BUILD_ROOT%{_libdir}/{libopenctapi.so,ctapi} -ln -sf %{_libdir}/openct-ifd.so \ - $RPM_BUILD_ROOT%{dropdir}/openct-ifd.bundle/Contents/*/ +install -Dpm 644 etc/openct.udev \ + $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules +install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf + install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct + install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct -install -Dpm 644 %{name}-reader.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf + +so=$(find $RPM_BUILD_ROOT%{dropdir} -name \*.so | sed "s|^$RPM_BUILD_ROOT||") +sed -i -e "s|\\(LIBPATH\\s*\\).*|\\1$so|" etc/reader.conf +install -Dpm 644 etc/reader.conf \ + $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,openct-ifd.so} %clean @@ -103,19 +108,19 @@ %preun if [ $1 -eq 0 ] ; then - %{_initrddir}/openct stop >/dev/null 2>&1 || : - /sbin/chkconfig --del openct + %{_initrddir}/openct stop >/dev/null 2>&1 || : + /sbin/chkconfig --del openct fi %postun /sbin/ldconfig if [ $1 -gt 0 ] ; then - %{_initrddir}/openct try-restart >/dev/null || : + %{_initrddir}/openct try-restart >/dev/null || : fi %post -n pcsc-lite-%{name} if [ $1 -eq 1 ] ; then - %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || : + %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || : fi %postun -n pcsc-lite-%{name} @@ -124,7 +129,7 @@ %files %defattr(-,root,root,-) -%doc ANNOUNCE NEWS TODO doc/*.html doc/*.css +%doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css %config(noreplace) %{_sysconfdir}/openct.conf %config(noreplace) %{_sysconfdir}/sysconfig/openct %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules @@ -133,8 +138,9 @@ %{_sbindir}/ifdhandler %{_sbindir}/ifdproxy %{_sbindir}/openct-control +%{_libdir}/ctapi/libopenctapi.so %{_libdir}/libopenct.so.* -%{_libdir}/libopenctapi.so +%{_libdir}/openct/ %dir %{_localstatedir}/run/openct/ %ghost %{_localstatedir}/run/openct/status %{_mandir}/man1/openct-tool.1* @@ -149,11 +155,25 @@ %files -n pcsc-lite-%{name} %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf -%{_libdir}/openct-ifd.so %{dropdir}/openct-ifd.bundle/ %changelog +* Sat May 6 2006 Ville Skytt?? - 0.6.7-2 +- Install CT-API module into %%{_libdir}/ctapi, add dependency on it (#190903). +- Update URL. + +* Thu May 4 2006 Ville Skytt?? - 0.6.7-1 +- 0.6.7. + +* Wed Apr 26 2006 Ville Skytt?? - 0.6.7-0.1.rc4 +- 0.6.7-rc4. +- Re-enable PCSC hotplug in pcsc-lite subpackage. +- Include license text. + +* Sat Apr 22 2006 Ville Skytt?? - 0.6.7-0.1.rc1 +- 0.6.7-rc1, udev rules and reader.conf included upstream. + * Mon Mar 6 2006 Ville Skytt?? - 0.6.6-5 - Rebuild with new pcsc-lite. Index: sources =================================================================== RCS file: /cvs/extras/rpms/openct/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Sep 2005 07:06:13 -0000 1.4 +++ sources 7 May 2006 13:48:13 -0000 1.5 @@ -1 +1 @@ -a9de3bef8e5e2827b8d72a2a50d0bc66 openct-0.6.6.tar.gz +1b33d319f364acafbcf130d7ba34ea4c openct-0.6.7.tar.gz --- openct-0.6.6-rpath64.patch DELETED --- --- openct-reader.conf DELETED --- --- openct.rules DELETED --- From fedora-extras-commits at redhat.com Sun May 7 13:49:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:49:24 -0700 Subject: rpms/opensc/devel opensc.spec,1.13,1.14 Message-ID: <200605071349.k47DnQ4h012776@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12759 Modified Files: opensc.spec Log Message: * Sun May 7 2006 Ville Skytt?? - 0.11.0-2 - Sync example paths in openct.conf with ctapi-common. - Update URL. Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- opensc.spec 4 May 2006 17:05:31 -0000 1.13 +++ opensc.spec 7 May 2006 13:49:24 -0000 1.14 @@ -2,12 +2,12 @@ Name: opensc Version: 0.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL -URL: http://www.opensc-project.org/ +URL: http://www.opensc-project.org/opensc/ Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,7 @@ sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . +sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in %build @@ -136,6 +137,10 @@ %changelog +* Sun May 7 2006 Ville Skytt?? - 0.11.0-2 +- Sync example paths in openct.conf with ctapi-common. +- Update URL. + * Thu May 4 2006 Ville Skytt?? - 0.11.0-1 - 0.11.0. From fedora-extras-commits at redhat.com Sun May 7 13:51:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:51:19 -0700 Subject: rpms/opensc/FC-5 .cvsignore, 1.5, 1.6 opensc.spec, 1.10, 1.11 sources, 1.5, 1.6 opensc-0.10.1-rpath64.patch, 1.1, NONE Message-ID: <200605071351.k47DpLY8012862@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12841 Modified Files: .cvsignore opensc.spec sources Removed Files: opensc-0.10.1-rpath64.patch Log Message: * Sun May 7 2006 Ville Skytt?? - 0.11.0-2 - Sync example paths in openct.conf with ctapi-common. - Update URL. * Thu May 4 2006 Ville Skytt?? - 0.11.0-1 - 0.11.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jan 2006 22:14:15 -0000 1.5 +++ .cvsignore 7 May 2006 13:51:19 -0000 1.6 @@ -1 +1 @@ -opensc-0.10.1.tar.gz +opensc-0.11.0.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/opensc.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- opensc.spec 6 Mar 2006 16:03:01 -0000 1.10 +++ opensc.spec 7 May 2006 13:51:19 -0000 1.11 @@ -1,15 +1,14 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.10.1 -Release: 3%{?dist} +Version: 0.11.0 +Release: 2%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL -URL: http://www.opensc.org/ -Source0: http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz -Patch0: %{name}-0.10.1-rpath64.patch +URL: http://www.opensc-project.org/opensc/ +Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -17,6 +16,7 @@ BuildRequires: openct-devel BuildRequires: openssl-devel >= 0.9.7a BuildRequires: libtool-ltdl-devel +BuildRequires: libtool %description OpenSC is a package for for accessing smart card devices. Basic @@ -51,10 +51,10 @@ %prep %setup -q -# patch0: --disable-rpath doesn't seem to do what it implies -%patch0 -p1 +sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . +sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in %build @@ -74,14 +74,12 @@ install -dm 755 _docs/openssh install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh cp -pR doc _docs -rm -r _docs/doc/{*.sh,*.xsl,old,Makefile*,tools} +rm -r _docs/doc/{*.sh,*.xsl,api,Makefile*,tools} find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm rm $RPM_BUILD_ROOT%{plugindir}/opensc-signer.so -mv $RPM_BUILD_ROOT%{_libdir}/opensc/opensc-signer.so \ - $RPM_BUILD_ROOT%{plugindir} -rmdir $RPM_BUILD_ROOT%{_libdir}/opensc +mv $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{plugindir} %clean @@ -103,6 +101,7 @@ %{_bindir}/netkey-tool %{_bindir}/opensc-explorer %{_bindir}/opensc-tool +%{_bindir}/piv-tool %{_bindir}/pkcs11-tool %{_bindir}/pkcs15-crypt %{_bindir}/pkcs15-init @@ -138,6 +137,19 @@ %changelog +* Sun May 7 2006 Ville Skytt?? - 0.11.0-2 +- Sync example paths in openct.conf with ctapi-common. +- Update URL. + +* Thu May 4 2006 Ville Skytt?? - 0.11.0-1 +- 0.11.0. + +* Thu Apr 27 2006 Ville Skytt?? - 0.11.0-0.1.rc2 +- 0.11.0-rc2. + +* Sat Apr 22 2006 Ville Skytt?? - 0.11.0-0.1.rc1 +- 0.11.0-rc1. + * Mon Mar 6 2006 Ville Skytt?? - 0.10.1-3 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Jan 2006 22:14:15 -0000 1.5 +++ sources 7 May 2006 13:51:19 -0000 1.6 @@ -1 +1 @@ -5549c7c339775356784837887750d232 opensc-0.10.1.tar.gz +be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz --- opensc-0.10.1-rpath64.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 7 13:59:30 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Sun, 7 May 2006 06:59:30 -0700 Subject: rpms/pitivi/devel pitivi.spec,1.2,1.3 Message-ID: <200605071359.k47DxWGI012915@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12898 Modified Files: pitivi.spec Log Message: BuildRequires: gnonlin added to spec file. Index: pitivi.spec =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/pitivi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pitivi.spec 26 Apr 2006 21:17:58 -0000 1.2 +++ pitivi.spec 7 May 2006 13:59:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: pitivi Version: 0.10.0 -Release: 1 +Release: 2 Summary: Non-linear video editor Group: Applications/Multimedia @@ -22,6 +22,7 @@ BuildRequires: pkgconfig BuildRequires: desktop-file-utils BuildRequires: gnome-python2 +BuildRequires: gnonlin %description Pitivi is an application using the GStreamer multimedia framework to @@ -75,6 +76,9 @@ %{_datadir}/applications/* %changelog +* Sun May 07 2006 W. Michael Petullo 0.10.0-2 +- BuildRequires: gnonlin because plugins are required a build time + * Wed Apr 26 2006 W. Michael Petullo 0.10.0-1 - update to 0.10.0 - remove BuildRequires: gnonlin-devel From fedora-extras-commits at redhat.com Sun May 7 15:07:16 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Sun, 7 May 2006 08:07:16 -0700 Subject: rpms/pitivi/devel pitivi.spec,1.3,1.4 Message-ID: <200605071507.k47F7IiU019761@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19743 Modified Files: pitivi.spec Log Message: BuildRequires: pygtk2-libglade Index: pitivi.spec =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/pitivi.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pitivi.spec 7 May 2006 13:59:29 -0000 1.3 +++ pitivi.spec 7 May 2006 15:07:16 -0000 1.4 @@ -1,6 +1,6 @@ Name: pitivi Version: 0.10.0 -Release: 2 +Release: 3 Summary: Non-linear video editor Group: Applications/Multimedia @@ -18,6 +18,7 @@ BuildRequires: GConf2-devel BuildRequires: gtk2-devel >= 2.8 BuildRequires: pygtk2-devel +BuildRequires: pygtk2-libglade BuildRequires: gtk-doc BuildRequires: pkgconfig BuildRequires: desktop-file-utils @@ -76,6 +77,9 @@ %{_datadir}/applications/* %changelog +* Sun May 07 2006 W. Michael Petullo 0.10.0-3 +- BuildRequires: pygtk2-libglade + * Sun May 07 2006 W. Michael Petullo 0.10.0-2 - BuildRequires: gnonlin because plugins are required a build time From fedora-extras-commits at redhat.com Sun May 7 15:38:18 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 7 May 2006 08:38:18 -0700 Subject: rpms/raptor/FC-5 .cvsignore, 1.2, 1.3 raptor.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605071538.k47FcKoW020035@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/raptor/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20010 Modified Files: .cvsignore raptor.spec sources Log Message: Update to 1.4.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raptor/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Apr 2006 00:40:34 -0000 1.2 +++ .cvsignore 7 May 2006 15:38:18 -0000 1.3 @@ -1 +1,2 @@ raptor-1.4.8.tar.gz +raptor-1.4.9.tar.gz Index: raptor.spec =================================================================== RCS file: /cvs/extras/rpms/raptor/FC-5/raptor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- raptor.spec 27 Apr 2006 00:40:34 -0000 1.1 +++ raptor.spec 7 May 2006 15:38:18 -0000 1.2 @@ -1,10 +1,10 @@ Summary: Raptor RDF Parser Toolkit for Redland Name: raptor -Version: 1.4.8 -Release: 5%{?dist} +Version: 1.4.9 +Release: 2%{?dist} License: LGPL or Apache License Version 2.0 Group: System Environment/Libraries -Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.8.tar.gz +Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.9.tar.gz Patch0: raptor-1.4.8-pkgconfig.patch Patch1: raptor-1.4.8-config.patch URL: http://www.redland.opensource.ac.uk/raptor/ @@ -52,7 +52,6 @@ %defattr(-, root, root) %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc %{_mandir}/man1/rapper.1* -%doc %{_mandir}/man3/libraptor.3* %{_libdir}/lib*.so.* %{_bindir}/rapper @@ -62,6 +61,7 @@ %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc INSTALL.html %doc %{_mandir}/man1/raptor-config.1* +%doc %{_mandir}/man3/libraptor.3* %doc %{_datadir}/gtk-doc/html/raptor %{_libdir}/lib*.so %{_libdir}/pkgconfig/raptor.pc @@ -69,6 +69,10 @@ %{_bindir}/raptor-config %changelog +* Sun May 7 2006 Anthony Green 1.4.9-2 +- Move libraptor man page to devel package. +- Update sources to 1.4.9. + * Wed Apr 26 2006 Anthony Green 1.4.8-5 - Add raptor-1.4.8-config.patch from Michael Schwendt. - Remove some Requires from the devel package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/raptor/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Apr 2006 00:40:34 -0000 1.2 +++ sources 7 May 2006 15:38:18 -0000 1.3 @@ -1 +1,2 @@ 112d8b72a37f4de8a00f840999f2d383 raptor-1.4.8.tar.gz +c2c4c5724c5f245a166d05eaf529fe4c raptor-1.4.9.tar.gz From fedora-extras-commits at redhat.com Sun May 7 15:39:41 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 7 May 2006 08:39:41 -0700 Subject: rpms/raptor/devel .cvsignore, 1.2, 1.3 raptor.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605071539.k47Fdhfm020110@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/raptor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20089 Modified Files: .cvsignore raptor.spec sources Log Message: Update to 1.4.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raptor/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Apr 2006 00:40:34 -0000 1.2 +++ .cvsignore 7 May 2006 15:39:41 -0000 1.3 @@ -1 +1,2 @@ raptor-1.4.8.tar.gz +raptor-1.4.9.tar.gz Index: raptor.spec =================================================================== RCS file: /cvs/extras/rpms/raptor/devel/raptor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- raptor.spec 27 Apr 2006 00:40:34 -0000 1.1 +++ raptor.spec 7 May 2006 15:39:41 -0000 1.2 @@ -1,10 +1,10 @@ Summary: Raptor RDF Parser Toolkit for Redland Name: raptor -Version: 1.4.8 -Release: 5%{?dist} +Version: 1.4.9 +Release: 2%{?dist} License: LGPL or Apache License Version 2.0 Group: System Environment/Libraries -Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.8.tar.gz +Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.9.tar.gz Patch0: raptor-1.4.8-pkgconfig.patch Patch1: raptor-1.4.8-config.patch URL: http://www.redland.opensource.ac.uk/raptor/ @@ -52,7 +52,6 @@ %defattr(-, root, root) %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc %{_mandir}/man1/rapper.1* -%doc %{_mandir}/man3/libraptor.3* %{_libdir}/lib*.so.* %{_bindir}/rapper @@ -62,6 +61,7 @@ %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc INSTALL.html %doc %{_mandir}/man1/raptor-config.1* +%doc %{_mandir}/man3/libraptor.3* %doc %{_datadir}/gtk-doc/html/raptor %{_libdir}/lib*.so %{_libdir}/pkgconfig/raptor.pc @@ -69,6 +69,10 @@ %{_bindir}/raptor-config %changelog +* Sun May 7 2006 Anthony Green 1.4.9-2 +- Move libraptor man page to devel package. +- Update sources to 1.4.9. + * Wed Apr 26 2006 Anthony Green 1.4.8-5 - Add raptor-1.4.8-config.patch from Michael Schwendt. - Remove some Requires from the devel package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/raptor/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Apr 2006 00:40:34 -0000 1.2 +++ sources 7 May 2006 15:39:41 -0000 1.3 @@ -1 +1,2 @@ 112d8b72a37f4de8a00f840999f2d383 raptor-1.4.8.tar.gz +c2c4c5724c5f245a166d05eaf529fe4c raptor-1.4.9.tar.gz From fedora-extras-commits at redhat.com Sun May 7 16:36:06 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 7 May 2006 09:36:06 -0700 Subject: rpms/mtd-utils/devel mtd-utils.spec,1.2,1.3 Message-ID: <200605071636.k47Ga8NR022660@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22643 Modified Files: mtd-utils.spec Log Message: Add dist tag Index: mtd-utils.spec =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/devel/mtd-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mtd-utils.spec 2 May 2006 12:11:22 -0000 1.2 +++ mtd-utils.spec 7 May 2006 16:36:06 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 -Release: 2 +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ From fedora-extras-commits at redhat.com Sun May 7 16:37:08 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 7 May 2006 09:37:08 -0700 Subject: rpms/mtd-utils/FC-4 mtd-utils.spec,1.2,1.3 Message-ID: <200605071637.k47GbA9n022757@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22740 Modified Files: mtd-utils.spec Log Message: Add dist tag Index: mtd-utils.spec =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/FC-4/mtd-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mtd-utils.spec 2 May 2006 12:11:22 -0000 1.2 +++ mtd-utils.spec 7 May 2006 16:37:08 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 -Release: 2 +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ From fedora-extras-commits at redhat.com Sun May 7 16:38:36 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 7 May 2006 09:38:36 -0700 Subject: rpms/mtd-utils/FC-5 mtd-utils.spec,1.2,1.3 Message-ID: <200605071638.k47GccUK022811@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22794 Modified Files: mtd-utils.spec Log Message: Add dist tag Index: mtd-utils.spec =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/FC-5/mtd-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mtd-utils.spec 2 May 2006 12:11:22 -0000 1.2 +++ mtd-utils.spec 7 May 2006 16:38:36 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 -Release: 2 +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ From fedora-extras-commits at redhat.com Sun May 7 16:51:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 09:51:24 -0700 Subject: rpms/hddtemp/FC-5 .cvsignore, 1.6, 1.7 hddtemp.db, 1.10, 1.11 hddtemp.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200605071651.k47GpRr2022926@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22903 Modified Files: .cvsignore hddtemp.db hddtemp.spec sources Log Message: * Wed May 3 2006 Ville Skytt?? - 0.3-0.8.beta15 - 0.3-beta15, drive database 2006-04-26. - Specfile cleanups. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Sep 2005 18:09:14 -0000 1.6 +++ .cvsignore 7 May 2006 16:51:24 -0000 1.7 @@ -1 +1 @@ -hddtemp-0.3-beta14.tar.bz2 +hddtemp-0.3-beta15.tar.bz2 Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-5/hddtemp.db,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hddtemp.db 26 Feb 2006 15:41:47 -0000 1.10 +++ hddtemp.db 7 May 2006 16:51:24 -0000 1.11 @@ -9,7 +9,7 @@ # The following list was found at (http://www.almico.com/forumharddisks.php) # If your drive is in the list send me a mail. # -# Manufacturer Model Size Notes +# Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB @@ -42,7 +42,7 @@ ######################################## ############# ExcelStor drives ######################################## -# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" +# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" "ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)" @@ -54,88 +54,84 @@ ######################################## ############# Fujitsu drives ######################################## -"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" +"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" -"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" -"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" -"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" +"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" +"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" +"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" -"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" -"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" +"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" +"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" -"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" -"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" -"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" +"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" +"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" +"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" -"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" +"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" -"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" -"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" -"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" -"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" -"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" -"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" +"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" +"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" +"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" +"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" +"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" +"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" -"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" +"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" -"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" -"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH" +"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" +"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH" -"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" +"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" -"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" -"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" -"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" -"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" -"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" -"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" +"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" +"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" +"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" +"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" +"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" +"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" ######################################## ############# Hitachi drives ######################################## -"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" -"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" -"HITACHI_DK23CA-15" 194 C "Hitachi DK23CA-15" -"HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" -"HITACHI_DK23CA-30" 194 C "Hitachi DK23CA-30" -"HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" -"HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" -"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" -"HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" -"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" -"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" -"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" - -"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" -"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" -"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" -"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" -"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" -"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" -"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" - -"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" - -"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" -"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" -"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" -"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" - -"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" -"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" -"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" -"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" -"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" -"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" -"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" -"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" -"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" +"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" +"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" +"HITACHI_DK23CA-(15|20|30|30B|75)" 194 C "Hitachi DK23CA series" +"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" +"HITACHI_DK23EA-[2346]0" 194 C "Hitachi DK23EA series" +"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" +"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" +"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" + +"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" +"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" +"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" +"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" +"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" +"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" +"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" + +"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" + +"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" +"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" + +"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" +"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" +"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" +"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" +"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" +"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" +"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" +"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" +"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## @@ -144,60 +140,60 @@ # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. -# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" +# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" -"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" -"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" +"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" +"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report -#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" +#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" -"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" -"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" -"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" -"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" -"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" -"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" -"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" -"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" -"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" -"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" -"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" -"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" -"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" -"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" -"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" -"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" +"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" +"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" +"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" +"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" +"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" +"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" +"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" +"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" +"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" +"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" +"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" +"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" +"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" +"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" +"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" +"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## -#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" -"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" +#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" +"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" +#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D060H3" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" -"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" -"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" -"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" +"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" +"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" +"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" -"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" -"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" -"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" -"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" -"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" -"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" -"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM" -"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" -"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" +"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" +"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" +"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" +"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" +"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" +"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" +"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM" +"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" +"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" "Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM" -"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" +"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" @@ -217,126 +213,128 @@ ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature -"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" -"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)" -"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" -"SAMSUNG SW0434A" 0 C "Samsung SW0434A" -"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" -"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" -"SAMSUNG SP0822N" 194 C "Samsung SP0822N" -"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" +"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" +"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)" +"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" +"SAMSUNG SW0434A" 0 C "Samsung SW0434A" +"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" +"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" +"SAMSUNG SP0822N" 194 C "Samsung SP0822N" +"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SP2[05]14N" 194 C "Samsung SpinPoint P120 series (7200RPM, 8MB cache)" -"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" -"SAMSUNG SV0432A" 0 C "Samsung SV0432A" -"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" -#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" -#"SAMSUNG SV1204H" 194 C "Samsung 120G" -"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" -"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" +"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" +"SAMSUNG SV0432A" 0 C "Samsung SV0432A" +"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" +#"SAMSUNG SV1204H" 194 C "Samsung 120G" +"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" +"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" ######################################## ############# Seagate drives ######################################## -"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" -"ST3412A" 0 C "Seagate ST3412A" -"ST38641A" 0 C "Seagate ST38641A" -"ST310014A" 194 C "Seagate ST310014A" -"ST310210A" 0 C "Seagate ST310210A" -"ST310211A" 194 C "Seagate ST310211A" -"ST310220A" 0 C "Seagate ST310220A" +"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" +"ST3412A" 0 C "Seagate ST3412A" +"ST38641A" 0 C "Seagate ST38641A" +"ST310014A" 194 C "Seagate ST310014A" +"ST310210A" 0 C "Seagate ST310210A" +"ST310211A" 194 C "Seagate ST310211A" +"ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB -"ST313021A" 0 C "Seagate U8 ST313021A" -"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" -"ST315320A" 194 C "Seagate ST315320A" -"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" -"ST320011A" 194 C "Seagate ST320011A" -"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" -"ST320410A" 194 C "Seagate ST320410A" -"ST320413A" 194 C "Seagate ST320413A" -"ST320414A" 194 C "Seagate ST320414A" -"ST320420A" 194 C "Seagate Barracuda II ST320420A" -"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" -"ST330620A" 194 C "Seagate ST330620A" -"ST330621A" 194 C "Seagate ST330621A" -"ST330630A" 194 C "Seagate Barracuda ST330630A" -"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" -"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" -"ST340016A" 194 C "Seagate ST340016A" -"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" -"ST340823A" 194 C "Seagate U Series 5 40823" -"ST340824A" 194 C "Seagate Barracuda III" -"ST360015A" 194 C "Seagate Barracuda V ST360015A" -"ST360020A" 194 C "Seagate U Series 60020" -"ST360021A" 194 C "Seagate Barracuda IV ST360021A" -"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380012A" 194 C "Seagate ST380012A 80GB" -"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" -"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" -"ST380021A" 194 C "Seagate Barracuda IV ST380021A" -"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" -"ST380023A" 194 C "Seagate Barracuda V ST380023A" -"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" -"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" -"ST3120020A" 194 C "Seagate ST3120020A" -"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" -"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" -"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" -"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" -"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" -"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" -"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" -"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" -"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" -"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" -"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" -"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" -"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" -"ST3300831A" 194 C "Seagate 300GB ST3300831A" -"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" -"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" +"ST313021A" 0 C "Seagate U8 ST313021A" +"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" +"ST315320A" 194 C "Seagate ST315320A" +"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" +"ST320011A" 194 C "Seagate ST320011A" +"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" +"ST320410A" 194 C "Seagate ST320410A" +"ST320413A" 194 C "Seagate ST320413A" +"ST320414A" 194 C "Seagate ST320414A" +"ST320420A" 194 C "Seagate Barracuda II ST320420A" +"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" +"ST330620A" 194 C "Seagate ST330620A" +"ST330621A" 194 C "Seagate ST330621A" +"ST330630A" 194 C "Seagate Barracuda ST330630A" +"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" +"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" +"ST340016A" 194 C "Seagate ST340016A" +"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" +"ST340823A" 194 C "Seagate U Series 5 40823" +"ST340824A" 194 C "Seagate Barracuda III" +"ST360015A" 194 C "Seagate Barracuda V ST360015A" +"ST360020A" 194 C "Seagate U Series 60020" +"ST360021A" 194 C "Seagate Barracuda IV ST360021A" +"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380012A" 194 C "Seagate ST380012A 80GB" +"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" +"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" +"ST380021A" 194 C "Seagate Barracuda IV ST380021A" +"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" +"ST380023A" 194 C "Seagate Barracuda V ST380023A" +"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" +"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" +"ST3120020A" 194 C "Seagate ST3120020A" +"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" +"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" +"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" +"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" +"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" +"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" +"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" +"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" +"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" +"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" +"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" +"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" +"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" +"ST3300831A" 194 C "Seagate 300GB ST3300831A" +"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" +"ST3802110A" 194 C "Seagate Barracuda 7200.9 80 GB" +"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" "ST9100823A" 194 C "Seagate Momentus 5400.2 100GB" -"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" -"ST94019A" 194 C "Seagate ST94019A" -"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" -"ST94[08]11A" 194 C "Seagate ST94011A" -"ST960821A" 194 C "Seagate ST960821A" -"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" -"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" -"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" +"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" +"ST94019A" 194 C "Seagate ST94019A" +"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" +"ST94[08]11A" 194 C "Seagate ST94011A" +"ST960821A" 194 C "Seagate ST960821A" +"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" +"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" +"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" + ######################################## ############# TOSHIBA Laptops ######################################## -"MK4313MAT" 220 C "Toshiba MK4313MAT" -"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" -"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" -"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" -"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" - -"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" -"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" -"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" - -#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" -"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" -"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" -"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" -"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" +"MK4313MAT" 220 C "Toshiba MK4313MAT" +"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" +"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" +"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" +"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" + +"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" +"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" +"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" + +#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" +"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" +"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" +"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" -"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" -"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" -"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" -"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" +"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" +"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" +"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" +"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" -"MK4025GAS" 194 C "Toshiba MK4025GAS" +"MK4025GAS" 194 C "Toshiba MK4025GAS" ######################################## @@ -345,12 +343,12 @@ # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC AC22000L" 0 C "Western Digital Caviar AC22000" -"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" +"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Western Digital WD135BA" -"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" -"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" +"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" +"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" #"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" "WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" @@ -359,7 +357,7 @@ "WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" #"WDC WD400BB-00GFA0" 0 C "" "WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" -"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" +"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" @@ -370,7 +368,7 @@ "WDC WD400VE-75HDT1" 194 C "Western Digital Scorpio 40GB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" -"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" +"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" "WDC WD600VE-75HDT0" 194 C "Western Digital 600VE-75HDT0" "WDC WD600VE-00HDT0" 194 C "Western Digital 600VE-00HDT0" "WDC WD740GD-00FL21.0" 194 C "Western Digital SATA Raptor" @@ -383,20 +381,20 @@ "WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" "WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" "WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" -"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" +"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" "WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB" "WDC WD800JB-00JJ[AC]0" 194 C "Western Digital WD800JB" "WDC WD800JD-(00|55)(HK|JR)A0" 194 C "Western Digital SATA 80GB, 8MB Cache" "WDC WD800LB-(00|55)DNA0" 194 C "Western Digital Caviar WD800LB 80 Go ATA-100" "WDC WD800VE-07HDT0" 194 C "Western Digital 800VE-07HDT0" "WDC WD1200BB-00(FTA|GUA)0" 194 C "Western Digital Caviar EIDE 2MB Cache" -"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" -"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" -"WDC WD1200JD-00GBB0" 194 C "Western Digital WD1200JD" +"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" +"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" +"WDC WD1200JD-00(GBB|HBC)0" 194 C "Western Digital WD1200JD" "WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" "WDC WD1200SB-01KB[AC]0" 194 C "Western Digital Caviar RE (Raid Edition) 120 GB" "WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" -"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" +"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" "WDC WD2000BB-00FTA0" 194 C "Western Digital WD2000BB" "WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" "WDC WD2000JB-00GVC0" 194 C "Western Digital WD2000JB" @@ -405,9 +403,12 @@ "WDC WD2500JD-(00G|32H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" "WDC WD2500JD-40HBC0" 194 C "Western Digital WD2500JD-40HBC0" "WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" +"WDC WD2500PD-00FZB1" 194 C "Western Digital WD2500PD-00FZB1" +"WDC WD2500SD-01KCB0" 194 C "Western Digital Caviar RE 250GB 8MB" "WDC WD3000JB-00KFA0" 194 C "Western Digital WD3000JB" "WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" "WDC WD4000KD-00NAB0" 194 C "Western Digital Caviar SE16 400GB 16MB" +"WDC WD4000YR-01PLB0" 194 C "Western Digital Caviar RE2 400GB 16MB" # not sure for next # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-5/hddtemp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- hddtemp.spec 26 Feb 2006 15:41:47 -0000 1.16 +++ hddtemp.spec 7 May 2006 16:51:24 -0000 1.17 @@ -1,4 +1,4 @@ -%define beta beta14 +%define beta beta15 Name: hddtemp Version: 0.3 @@ -8,7 +8,7 @@ Group: Applications/System License: GPL URL: http://www.guzu.net/linux/hddtemp.php -Source0: http://www.guzu.net/linux/%{name}-%{version}-%{beta}.tar.bz2 +Source0: http://www.guzu.net/files/%{name}-%{version}-%{beta}.tar.bz2 Source1: http://www.guzu.net/linux/hddtemp.db Source2: %{name}.init Source3: %{name}.sysconfig @@ -28,9 +28,6 @@ %prep %setup -q -n %{name}-%{version}-%{beta} -%{__perl} -pi -e \ - 's|/usr/share/misc/hddtemp\.db\b|%{_datadir}/misc/hddtemp.db|' \ - src/db.h doc/hddtemp.8 cp -p %{SOURCE2} ./hddtemp.init %{__perl} -pi -e \ 's|__ETCDIR__|%{_sysconfdir}|g ; @@ -39,27 +36,23 @@ s|__LOCKDIR__|%{_localstatedir}/lock|g' \ hddtemp.init chmod -x contribs/analyze/* +rm COPYING ; cp -p GPL-2 COPYING %build -%configure --disable-dependency-tracking \ - --with-db-path=%{_datadir}/misc/hddtemp.db +%configure --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/misc/hddtemp.db -install -Dpm 755 hddtemp.init \ - $RPM_BUILD_ROOT%{_initrddir}/hddtemp -install -Dpm 644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp +install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/misc/hddtemp.db +install -Dpm 755 hddtemp.init $RPM_BUILD_ROOT%{_initrddir}/hddtemp +install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp install -dm 755 $RPM_BUILD_ROOT%{_bindir} ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/hddtemp -install -Dpm 644 %{SOURCE4} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp +install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp install -Dpm 644 %{SOURCE5} \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/hddtemp %find_lang %{name} @@ -84,18 +77,22 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO contribs +%doc ChangeLog COPYING README TODO contribs/ %config(noreplace) %{_sysconfdir}/sysconfig/hddtemp %config(noreplace) %{_sysconfdir}/pam.d/hddtemp %config(noreplace) %{_sysconfdir}/security/console.apps/hddtemp %{_initrddir}/hddtemp %{_bindir}/hddtemp %{_sbindir}/hddtemp -%config %{_datadir}/misc/hddtemp.db +%config /usr/share/misc/hddtemp.db %{_mandir}/man8/hddtemp.8* %changelog +* Wed May 3 2006 Ville Skytt?? - 0.3-0.8.beta15 +- 0.3-beta15, drive database 2006-04-26. +- Specfile cleanups. + * Wed Feb 8 2006 Ville Skytt?? - 0.3-0.8.beta14 - Update drive database to 2006-02-07. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Sep 2005 18:09:14 -0000 1.7 +++ sources 7 May 2006 16:51:24 -0000 1.8 @@ -1 +1 @@ -bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 +8b829339e1ae9df701684ec239021bb8 hddtemp-0.3-beta15.tar.bz2 From fedora-extras-commits at redhat.com Sun May 7 17:10:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 10:10:44 -0700 Subject: rpms/perl-DBD-XBase/devel perl-DBD-XBase.spec,1.4,1.5 Message-ID: <200605071710.k47HAk4g025273@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-XBase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256 Modified Files: perl-DBD-XBase.spec Log Message: Bugzilla ticket added to the changelog. Index: perl-DBD-XBase.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/perl-DBD-XBase.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DBD-XBase.spec 22 Apr 2006 22:50:48 -0000 1.4 +++ perl-DBD-XBase.spec 7 May 2006 17:10:44 -0000 1.5 @@ -64,7 +64,7 @@ %changelog * Thu Mar 16 2006 Jose Pedro Oliveira - 0.241-4 -- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib. +- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib (#181999). * Fri Feb 17 2006 Jose Pedro Oliveira - 0.241-3 - Rebuild for FC5 (perl 5.8.8). From fedora-extras-commits at redhat.com Sun May 7 17:17:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 10:17:22 -0700 Subject: rpms/perl-DBD-XBase/FC-4 DBD-XBase-0.241-dbfdump-rename.patch, NONE, 1.1 perl-DBD-XBase.spec, 1.2, 1.3 Message-ID: <200605071717.k47HHOpQ025361@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-XBase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25321/FC-4 Modified Files: perl-DBD-XBase.spec Added Files: DBD-XBase-0.241-dbfdump-rename.patch Log Message: dbfdump renamed to dbfdump.pl in order to avoid file conflict with shapelib (#181999) DBD-XBase-0.241-dbfdump-rename.patch: --- NEW FILE DBD-XBase-0.241-dbfdump-rename.patch --- diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.PL DBD-XBase-0.241/bin/dbfdump.PL --- DBD-XBase-0.241-orig/bin/dbfdump.PL 2002-03-07 07:36:02.000000000 +0000 +++ DBD-XBase-0.241/bin/dbfdump.PL 1970-01-01 01:00:00.000000000 +0100 @@ -1,189 +0,0 @@ - -use Config; -my $filename = $0; - -$filename =~ s/\.PL$//; -open OUT,">$filename" or die "Can't create $filename: $!"; -chmod(0755, $filename); -print "Extracting $filename (with #! and variable substitution)\n"; - -print OUT <<"EOHEADER"; -$Config{'startperl'} -w - -EOHEADER - -print OUT <<'EOBODY'; - -use XBase; -use Getopt::Long; -use strict; -$^W = 1; - -my $stdin = 0; - -if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') { - $stdin = 1; pop @ARGV; -} - -my %options; -Getopt::Long::GetOptions( \%options, - 'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s', - 'nomemo', 'memofile=s', 'memosep=s', 'table', - 'SQL', - ) or exit; - -if (defined $options{'version'}) { - print "This is dbfdump version $XBase::VERSION.\n"; - exit; -} - -if ($stdin) { - push @ARGV, '-'; - $options{'nomemo'} = 1; -} - -if (@ARGV == 0 or defined $options{'help'}) { - die <<'EOF'; -Usage: dbfdump [ options ] files - where the options specify - --rs output record separator (default newline) - --fs output field separator (default colon) - --fields comma separated list of fields to print (default all) - --undef what to print for NULL values (default empty string) - --memofile specifies unstandard name of attached memo file - --memosep separator for dBase III dbt's (default \x1a\x1a) - --table output in nice table format (needs Data::ShowTable) - all having as parameter a string; and also - --nomemo do not try to read the memo (dbt/fpt) file - --info only print info about the file and fields - --version print version of the XBase library -EOF -} - -my %addopts = (); -if (defined $options{'nomemo'} or defined $options{'info'}) { - $addopts{'ignorememo'} = 1; -} - -$addopts{'memosep'} = $options{'memosep'}; -$addopts{'memofile'} = $options{'memofile'}; - -if (defined $options{'info'}) { - $addopts{'ignorebadheader'} = 1; -} - -my $file; -for $file (@ARGV) { - my $table = new XBase 'name' => $file, %addopts; - - if (not defined $table) { - print STDERR XBase->errstr; - next; - } - if (defined $options{'info'}) { - if (not defined $options{'SQL'}) { - print $table->header_info; - } else { - my $name = $file; - $name =~ s!^.*/|\.dbf$!!ig; - print "create table $name (\n"; - my @names = $table->field_names; - my %conv = qw! - C varchar - N numeric - F numeric - L boolean - M blob - D date - T time - !; - my @types = map { $conv{$_} } $table->field_types; - my @lengths = $table->field_lengths; - my @decimals = $table->field_decimals; - for (my $i = 0; $i < @names; $i++) { - print "\t$names[$i] $types[$i]"; - if ($types[$i] eq 'blob') { - $lengths[$i] = $decimals[$i] = undef; - } - if ($lengths[$i] or $decimals[$i]) { - print "($lengths[$i]"; - print ", $decimals[$i]" if $decimals[$i]; - print ")"; - } - if (defined $names[$i+1]) { - print ','; - } - print "\n"; - } - print ")\n"; - } - } else { - $table->dump_records(%options) or print STDERR $table->errstr; - } - $table->close; -} - -1; - -__END__ - -=head1 NAME - -dbfdump - Dump the record of the dbf file - -=head1 FORMAT - - dbfdump [options] files - -where options are - - --rs output record separator (default newline) - --fs output field separator (default colon) - --fields comma separated list of fields to print (default all) - --undef string to print for NULL values (default empty) - --memofile specifies unstandard name of attached memo file - --memosep separator for dBase III dbt's (default \x1a\x1a) - - --nomemo do not try to read the memo (dbt/fpt) file - --info print info about the file and fields - with additional --SQL parameter, outputs the SQL create table - --version print version of the XBase library - --table output in nice table format (only available when - Data::ShowTable is installed, overrides rs and fs) - -=head1 SYNOPSIS - - dbfdump -fields id,msg table.dbf - dbfdump -fs=' : ' table - dbfdump --nomemo file.dbf - - ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump - - -=head1 DESCRIPTION - -Dbfdump prints to standard output the content of dbf files listed. By -default, it prints all fields, separated by colons, one record on -a line. The output record and column separators can be changed by -switches on the command line. You can also ask only for some fields to -be printed. - -The content of associated memo files (dbf, fpt) is printed for memo -fields, unless you use the C<--nomemo> option. - -You can specify reading the standard input by putting dash (-) instead -of file name. - -=head1 AUTHOR - -(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz, -http://www.fi.muni.cz/~adelton/ -at Faculty of Informatics, Masaryk University in Brno, Czech Republic - -=head1 SEE ALSO - -perl(1); XBase(3) - -=cut - -EOBODY - diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.pl.PL DBD-XBase-0.241/bin/dbfdump.pl.PL --- DBD-XBase-0.241-orig/bin/dbfdump.pl.PL 1970-01-01 01:00:00.000000000 +0100 +++ DBD-XBase-0.241/bin/dbfdump.pl.PL 2006-03-16 22:17:24.000000000 +0000 @@ -0,0 +1,189 @@ + +use Config; +my $filename = $0; + +$filename =~ s/\.PL$//; +open OUT,">$filename" or die "Can't create $filename: $!"; +chmod(0755, $filename); +print "Extracting $filename (with #! and variable substitution)\n"; + +print OUT <<"EOHEADER"; +$Config{'startperl'} -w + +EOHEADER + +print OUT <<'EOBODY'; + +use XBase; +use Getopt::Long; +use strict; +$^W = 1; + +my $stdin = 0; + +if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') { + $stdin = 1; pop @ARGV; +} + +my %options; +Getopt::Long::GetOptions( \%options, + 'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s', + 'nomemo', 'memofile=s', 'memosep=s', 'table', + 'SQL', + ) or exit; + +if (defined $options{'version'}) { + print "This is dbfdump.pl version $XBase::VERSION.\n"; + exit; +} + +if ($stdin) { + push @ARGV, '-'; + $options{'nomemo'} = 1; +} + +if (@ARGV == 0 or defined $options{'help'}) { + die <<'EOF'; +Usage: dbfdump.pl [ options ] files + where the options specify + --rs output record separator (default newline) + --fs output field separator (default colon) + --fields comma separated list of fields to print (default all) + --undef what to print for NULL values (default empty string) + --memofile specifies unstandard name of attached memo file + --memosep separator for dBase III dbt's (default \x1a\x1a) + --table output in nice table format (needs Data::ShowTable) + all having as parameter a string; and also + --nomemo do not try to read the memo (dbt/fpt) file + --info only print info about the file and fields + --version print version of the XBase library +EOF +} + +my %addopts = (); +if (defined $options{'nomemo'} or defined $options{'info'}) { + $addopts{'ignorememo'} = 1; +} + +$addopts{'memosep'} = $options{'memosep'}; +$addopts{'memofile'} = $options{'memofile'}; + +if (defined $options{'info'}) { + $addopts{'ignorebadheader'} = 1; +} + +my $file; +for $file (@ARGV) { + my $table = new XBase 'name' => $file, %addopts; + + if (not defined $table) { + print STDERR XBase->errstr; + next; + } + if (defined $options{'info'}) { + if (not defined $options{'SQL'}) { + print $table->header_info; + } else { + my $name = $file; + $name =~ s!^.*/|\.dbf$!!ig; + print "create table $name (\n"; + my @names = $table->field_names; + my %conv = qw! + C varchar + N numeric + F numeric + L boolean + M blob + D date + T time + !; + my @types = map { $conv{$_} } $table->field_types; + my @lengths = $table->field_lengths; + my @decimals = $table->field_decimals; + for (my $i = 0; $i < @names; $i++) { + print "\t$names[$i] $types[$i]"; + if ($types[$i] eq 'blob') { + $lengths[$i] = $decimals[$i] = undef; + } + if ($lengths[$i] or $decimals[$i]) { + print "($lengths[$i]"; + print ", $decimals[$i]" if $decimals[$i]; + print ")"; + } + if (defined $names[$i+1]) { + print ','; + } + print "\n"; + } + print ")\n"; + } + } else { + $table->dump_records(%options) or print STDERR $table->errstr; + } + $table->close; +} + +1; + +__END__ + +=head1 NAME + +dbfdump.pl - Dump the record of the dbf file + +=head1 FORMAT + + dbfdump.pl [options] files + +where options are + + --rs output record separator (default newline) + --fs output field separator (default colon) + --fields comma separated list of fields to print (default all) + --undef string to print for NULL values (default empty) + --memofile specifies unstandard name of attached memo file + --memosep separator for dBase III dbt's (default \x1a\x1a) + + --nomemo do not try to read the memo (dbt/fpt) file + --info print info about the file and fields + with additional --SQL parameter, outputs the SQL create table + --version print version of the XBase library + --table output in nice table format (only available when + Data::ShowTable is installed, overrides rs and fs) + +=head1 SYNOPSIS + + dbfdump.pl -fields id,msg table.dbf + dbfdump.pl -fs=' : ' table + dbfdump.pl --nomemo file.dbf + + ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump.pl - + +=head1 DESCRIPTION + +Dbfdump prints to standard output the content of dbf files listed. By +default, it prints all fields, separated by colons, one record on +a line. The output record and column separators can be changed by +switches on the command line. You can also ask only for some fields to +be printed. + +The content of associated memo files (dbf, fpt) is printed for memo +fields, unless you use the C<--nomemo> option. + +You can specify reading the standard input by putting dash (-) instead +of file name. + +=head1 AUTHOR + +(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz, +http://www.fi.muni.cz/~adelton/ +at Faculty of Informatics, Masaryk University in Brno, Czech Republic + +=head1 SEE ALSO + +perl(1); XBase(3) + +=cut + +EOBODY + diff -ruN DBD-XBase-0.241-orig/Changes DBD-XBase-0.241/Changes --- DBD-XBase-0.241-orig/Changes 2003-11-21 14:13:43.000000000 +0000 +++ DBD-XBase-0.241/Changes 2006-03-16 22:09:11.000000000 +0000 @@ -136,7 +136,7 @@ 0.1551 Sat Jan 9 19:21:16 CET 2000 - dbfdump: Accepts --SQL modifier to --info, prints structure + dbfdump.pl: Accepts --SQL modifier to --info, prints structure of the table as a create table SQL. 0.155 Sun Nov 7 15:43:59 CET 1999 @@ -272,7 +272,7 @@ XBase::Memo: we now reset next_for_append to point behind the end of the file, problem pointed out by Artem Belevich. - dbfdump: option --table, --fields now handles intervals. + dbfdump.pl: option --table, --fields now handles intervals. t/2_read.t: fixed problem with order of fields in hash, patch by Andreas J. Koenig. @@ -301,7 +301,7 @@ XBase::SQL: fix of handling of double quoted strings. - dbfdump: memosep and memofile options fixed. + dbfdump.pl: memosep and memofile options fixed. t/4_dbfdump.t: avoided using cat. @@ -427,7 +427,7 @@ 0.0632 Wed May 27 12:27:04 MET DST 1998 - Added --nomemo option to dbfdump. The list of entires is made + Added --nomemo option to dbfdump.pl. The list of entires is made longer in any non-leaf page in ndx. Added check for the magic "FFFF0800" tag in dBaseIV dbt file when reading it. @@ -479,7 +479,7 @@ long selects. Method dump_records now prints directly, doesn't use get_all_records. - Added parameter --info into the script dbfdump to print the + Added parameter --info into the script dbfdump.pl to print the header info. Changed way of determining the type of the dbt file after diff -ruN DBD-XBase-0.241-orig/INSTALL DBD-XBase-0.241/INSTALL --- DBD-XBase-0.241-orig/INSTALL 2003-04-03 18:02:37.000000000 +0100 +++ DBD-XBase-0.241/INSTALL 2006-03-16 22:08:17.000000000 +0000 @@ -43,7 +43,7 @@ If you do not have make or you cannot run it (do you really want to use Perl on that machine?), just copy the content of the DBD-XBase-x.xxx/lib directory to wherever you want to have it. That -should work, even if it won't give you man pages and dbfdump/indexdump +should work, even if it won't give you man pages and dbfdump.pl/indexdump scripts. If you use a platform supported by ActiveState and run ActiveState diff -ruN DBD-XBase-0.241-orig/lib/XBase/FAQ.pod DBD-XBase-0.241/lib/XBase/FAQ.pod --- DBD-XBase-0.241-orig/lib/XBase/FAQ.pod 2002-08-16 10:38:53.000000000 +0100 +++ DBD-XBase-0.241/lib/XBase/FAQ.pod 2006-03-16 22:06:06.000000000 +0000 @@ -175,11 +175,11 @@ to your script and you will see that it's not B problem. -=item The B stops after reading I records ... +=item The B stops after reading I records ... ... why doesn't it read all I<10 x n> records? -Check if the file isn't truncated. C will tell +Check if the file isn't truncated. C will tell you the expected number of records and length of one record, like Filename: file.dbf @@ -191,7 +191,7 @@ Num fields: 40 So the expected length of the file is at least I<1313 + 65 * 1117>. If -it's shorter, you've got damaged file and B only +it's shorter, you've got damaged file and B only reads as much rows as it can find in the dbf. =item How is this B related to B? diff -ruN DBD-XBase-0.241-orig/lib/XBase.pm DBD-XBase-0.241/lib/XBase.pm --- DBD-XBase-0.241-orig/lib/XBase.pm 2003-11-21 14:17:49.000000000 +0000 +++ DBD-XBase-0.241/lib/XBase.pm 2006-03-16 22:05:32.000000000 +0000 @@ -1341,7 +1341,7 @@ $table->dump_records("fs" => " | ", "rs" => " <-+\n", "fields" => [ "id", "msg" ]);' -Also note that there is a script dbfdump(1) that does the printing. +Also note that there is a script dbfdump.pl(1) that does the printing. =head2 Errors and debugging @@ -1423,7 +1423,7 @@ =head1 SEE ALSO perl(1); XBase::FAQ(3); DBD::XBase(3) and DBI(3) for DBI interface; -dbfdump(1) +dbfdump.pl(1) =cut diff -ruN DBD-XBase-0.241-orig/Makefile.PL DBD-XBase-0.241/Makefile.PL --- DBD-XBase-0.241-orig/Makefile.PL 2003-04-03 17:37:19.000000000 +0100 +++ DBD-XBase-0.241/Makefile.PL 2006-03-16 22:20:20.000000000 +0000 @@ -41,11 +41,11 @@ 'AUTHOR' => 'Jan Pazdziora (adelton at fi.muni.cz)', 'ABSTRACT' => 'Reads and writes XBase (dbf) files, includes DBI support', ) : ()), - 'PL_FILES' => { 'bin/dbfdump.PL' => 'bin/dbfdump', + 'PL_FILES' => { 'bin/dbfdump.pl.PL' => 'bin/dbfdump.pl', 'bin/indexdump.PL' => 'bin/indexdump' }, - 'EXE_FILES' => [ 'bin/dbfdump', ' bin/indexdump' ], + 'EXE_FILES' => [ 'bin/dbfdump.pl', ' bin/indexdump' ], 'dist' => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', POSTOP => 'mv $(DISTNAME)-$(VERSION).tar.gz ../' }, - 'clean' => { FILES => 'bin/dbfdump bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '}, + 'clean' => { FILES => 'bin/dbfdump.pl bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '}, ); diff -ruN DBD-XBase-0.241-orig/MANIFEST DBD-XBase-0.241/MANIFEST --- DBD-XBase-0.241-orig/MANIFEST 2003-07-07 19:30:41.000000000 +0100 +++ DBD-XBase-0.241/MANIFEST 2006-03-16 22:20:06.000000000 +0000 @@ -4,7 +4,7 @@ Makefile.PL README ToDo -bin/dbfdump.PL +bin/dbfdump.pl.PL bin/indexdump.PL dbit/00base.t dbit/10dsnlist.t diff -ruN DBD-XBase-0.241-orig/new-XBase DBD-XBase-0.241/new-XBase --- DBD-XBase-0.241-orig/new-XBase 2001-02-06 10:44:13.000000000 +0000 +++ DBD-XBase-0.241/new-XBase 2006-03-16 22:09:55.000000000 +0000 @@ -395,7 +395,7 @@ $table->dump_records("fs" => " | ", "rs" => " <-+\n", "fields" => [ "id", "msg" ]);' -Also note that there is a command line script dbfdump(1) that does +Also note that there is a command line script dbfdump.pl(1) that does the printing. =head1 Writing the data @@ -597,7 +597,7 @@ XBase::FAQ(3); XBase::Index(3); DBD::XBase(3) and DBI(3) for DBI interface; -dbfdump(1); perl(1) +dbfdump.pl(1); perl(1) =cut diff -ruN DBD-XBase-0.241-orig/README DBD-XBase-0.241/README --- DBD-XBase-0.241-orig/README 2003-04-03 18:02:47.000000000 +0100 +++ DBD-XBase-0.241/README 2006-03-16 22:09:29.000000000 +0000 @@ -48,7 +48,7 @@ my $table = new XBase 'table.dbf'; my @data = $table->get_record(0); - The distribution also includes a dbfdump script that prints + The distribution also includes a dbfdump.pl script that prints the content of the table in readable form. @@ -75,7 +75,7 @@ native XBase engines produce data incompatible with this module. - Man pages for XBase, DBD::XBase, dbfdump, XBase::Index and + Man pages for XBase, DBD::XBase, dbfdump.pl, XBase::Index and XBase::SDBM are included, examples of little scripts can also be found in eg/ directory of the distribution. Read the DBI man page for DBI specific issues, and the XBase::FAQ page. diff -ruN DBD-XBase-0.241-orig/t/4_dbfdump.t DBD-XBase-0.241/t/4_dbfdump.t --- DBD-XBase-0.241-orig/t/4_dbfdump.t 2002-05-15 17:18:09.000000000 +0100 +++ DBD-XBase-0.241/t/4_dbfdump.t 2006-03-16 22:07:14.000000000 +0000 @@ -9,13 +9,13 @@ use ExtUtils::testlib; my $libs = join " -I", '', @INC; -my $dbfdump = "$dir/blib/script/dbfdump"; +my $dbfdump = "$dir/blib/script/dbfdump.pl"; my $expected = join '', ; my $result = ''; my $command = qq!$^X $libs $dbfdump "$dir/t/rooms.dbf"!; -print "Running dbfdump rooms.dbf: $command\n"; +print "Running dbfdump.pl rooms.dbf: $command\n"; $result = `$command`; if ($result ne $expected) @@ -23,7 +23,7 @@ print "ok 1\n"; $command = qq!$^X $libs $dbfdump -- - < "$dir/t/rooms.dbf"!; -print "Running stdin dbfdump < rooms.dbf: $command\n"; +print "Running stdin dbfdump.pl < rooms.dbf: $command\n"; $result = `$command`; if ($result ne $expected) Index: perl-DBD-XBase.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-XBase/FC-4/perl-DBD-XBase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-XBase.spec 16 Dec 2005 11:40:40 -0000 1.2 +++ perl-DBD-XBase.spec 7 May 2006 17:17:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-DBD-XBase Version: 0.241 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Perl module for reading and writing the dbf files Group: Development/Libraries @@ -8,6 +8,7 @@ URL: http://search.cpan.org/dist/DBD-XBase/ Source0: http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz Patch0: DBD-XBase-0.241-indexdump.PL.patch +Patch1: DBD-XBase-0.241-dbfdump-rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +27,7 @@ %prep %setup -q -n DBD-XBase-%{version} %patch0 -p1 +%patch1 -p1 chmod a-x eg/*table %build @@ -61,6 +63,12 @@ %changelog +* Thu Mar 16 2006 Jose Pedro Oliveira - 0.241-4 +- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib (#181999). + +* Fri Feb 17 2006 Jose Pedro Oliveira - 0.241-3 +- Rebuild for FC5 (perl 5.8.8). + * Fri Dec 16 2005 Jose Pedro Oliveira - 0.241-2 - Patch to remove the duplicate shebang line in bin/indexdump (#175895). From fedora-extras-commits at redhat.com Sun May 7 17:17:23 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 10:17:23 -0700 Subject: rpms/perl-DBD-XBase/FC-5 DBD-XBase-0.241-dbfdump-rename.patch, NONE, 1.1 perl-DBD-XBase.spec, 1.3, 1.4 Message-ID: <200605071717.k47HHP0p025367@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-XBase/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25321/FC-5 Modified Files: perl-DBD-XBase.spec Added Files: DBD-XBase-0.241-dbfdump-rename.patch Log Message: dbfdump renamed to dbfdump.pl in order to avoid file conflict with shapelib (#181999) DBD-XBase-0.241-dbfdump-rename.patch: --- NEW FILE DBD-XBase-0.241-dbfdump-rename.patch --- diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.PL DBD-XBase-0.241/bin/dbfdump.PL --- DBD-XBase-0.241-orig/bin/dbfdump.PL 2002-03-07 07:36:02.000000000 +0000 +++ DBD-XBase-0.241/bin/dbfdump.PL 1970-01-01 01:00:00.000000000 +0100 @@ -1,189 +0,0 @@ - -use Config; -my $filename = $0; - -$filename =~ s/\.PL$//; -open OUT,">$filename" or die "Can't create $filename: $!"; -chmod(0755, $filename); -print "Extracting $filename (with #! and variable substitution)\n"; - -print OUT <<"EOHEADER"; -$Config{'startperl'} -w - -EOHEADER - -print OUT <<'EOBODY'; - -use XBase; -use Getopt::Long; -use strict; -$^W = 1; - -my $stdin = 0; - -if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') { - $stdin = 1; pop @ARGV; -} - -my %options; -Getopt::Long::GetOptions( \%options, - 'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s', - 'nomemo', 'memofile=s', 'memosep=s', 'table', - 'SQL', - ) or exit; - -if (defined $options{'version'}) { - print "This is dbfdump version $XBase::VERSION.\n"; - exit; -} - -if ($stdin) { - push @ARGV, '-'; - $options{'nomemo'} = 1; -} - -if (@ARGV == 0 or defined $options{'help'}) { - die <<'EOF'; -Usage: dbfdump [ options ] files - where the options specify - --rs output record separator (default newline) - --fs output field separator (default colon) - --fields comma separated list of fields to print (default all) - --undef what to print for NULL values (default empty string) - --memofile specifies unstandard name of attached memo file - --memosep separator for dBase III dbt's (default \x1a\x1a) - --table output in nice table format (needs Data::ShowTable) - all having as parameter a string; and also - --nomemo do not try to read the memo (dbt/fpt) file - --info only print info about the file and fields - --version print version of the XBase library -EOF -} - -my %addopts = (); -if (defined $options{'nomemo'} or defined $options{'info'}) { - $addopts{'ignorememo'} = 1; -} - -$addopts{'memosep'} = $options{'memosep'}; -$addopts{'memofile'} = $options{'memofile'}; - -if (defined $options{'info'}) { - $addopts{'ignorebadheader'} = 1; -} - -my $file; -for $file (@ARGV) { - my $table = new XBase 'name' => $file, %addopts; - - if (not defined $table) { - print STDERR XBase->errstr; - next; - } - if (defined $options{'info'}) { - if (not defined $options{'SQL'}) { - print $table->header_info; - } else { - my $name = $file; - $name =~ s!^.*/|\.dbf$!!ig; - print "create table $name (\n"; - my @names = $table->field_names; - my %conv = qw! - C varchar - N numeric - F numeric - L boolean - M blob - D date - T time - !; - my @types = map { $conv{$_} } $table->field_types; - my @lengths = $table->field_lengths; - my @decimals = $table->field_decimals; - for (my $i = 0; $i < @names; $i++) { - print "\t$names[$i] $types[$i]"; - if ($types[$i] eq 'blob') { - $lengths[$i] = $decimals[$i] = undef; - } - if ($lengths[$i] or $decimals[$i]) { - print "($lengths[$i]"; - print ", $decimals[$i]" if $decimals[$i]; - print ")"; - } - if (defined $names[$i+1]) { - print ','; - } - print "\n"; - } - print ")\n"; - } - } else { - $table->dump_records(%options) or print STDERR $table->errstr; - } - $table->close; -} - -1; - -__END__ - -=head1 NAME - -dbfdump - Dump the record of the dbf file - -=head1 FORMAT - - dbfdump [options] files - -where options are - - --rs output record separator (default newline) - --fs output field separator (default colon) - --fields comma separated list of fields to print (default all) - --undef string to print for NULL values (default empty) - --memofile specifies unstandard name of attached memo file - --memosep separator for dBase III dbt's (default \x1a\x1a) - - --nomemo do not try to read the memo (dbt/fpt) file - --info print info about the file and fields - with additional --SQL parameter, outputs the SQL create table - --version print version of the XBase library - --table output in nice table format (only available when - Data::ShowTable is installed, overrides rs and fs) - -=head1 SYNOPSIS - - dbfdump -fields id,msg table.dbf - dbfdump -fs=' : ' table - dbfdump --nomemo file.dbf - - ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump - - -=head1 DESCRIPTION - -Dbfdump prints to standard output the content of dbf files listed. By -default, it prints all fields, separated by colons, one record on -a line. The output record and column separators can be changed by -switches on the command line. You can also ask only for some fields to -be printed. - -The content of associated memo files (dbf, fpt) is printed for memo -fields, unless you use the C<--nomemo> option. - -You can specify reading the standard input by putting dash (-) instead -of file name. - -=head1 AUTHOR - -(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz, -http://www.fi.muni.cz/~adelton/ -at Faculty of Informatics, Masaryk University in Brno, Czech Republic - -=head1 SEE ALSO - -perl(1); XBase(3) - -=cut - -EOBODY - diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.pl.PL DBD-XBase-0.241/bin/dbfdump.pl.PL --- DBD-XBase-0.241-orig/bin/dbfdump.pl.PL 1970-01-01 01:00:00.000000000 +0100 +++ DBD-XBase-0.241/bin/dbfdump.pl.PL 2006-03-16 22:17:24.000000000 +0000 @@ -0,0 +1,189 @@ + +use Config; +my $filename = $0; + +$filename =~ s/\.PL$//; +open OUT,">$filename" or die "Can't create $filename: $!"; +chmod(0755, $filename); +print "Extracting $filename (with #! and variable substitution)\n"; + +print OUT <<"EOHEADER"; +$Config{'startperl'} -w + +EOHEADER + +print OUT <<'EOBODY'; + +use XBase; +use Getopt::Long; +use strict; +$^W = 1; + +my $stdin = 0; + +if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') { + $stdin = 1; pop @ARGV; +} + +my %options; +Getopt::Long::GetOptions( \%options, + 'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s', + 'nomemo', 'memofile=s', 'memosep=s', 'table', + 'SQL', + ) or exit; + +if (defined $options{'version'}) { + print "This is dbfdump.pl version $XBase::VERSION.\n"; + exit; +} + +if ($stdin) { + push @ARGV, '-'; + $options{'nomemo'} = 1; +} + +if (@ARGV == 0 or defined $options{'help'}) { + die <<'EOF'; +Usage: dbfdump.pl [ options ] files + where the options specify + --rs output record separator (default newline) + --fs output field separator (default colon) + --fields comma separated list of fields to print (default all) + --undef what to print for NULL values (default empty string) + --memofile specifies unstandard name of attached memo file + --memosep separator for dBase III dbt's (default \x1a\x1a) + --table output in nice table format (needs Data::ShowTable) + all having as parameter a string; and also + --nomemo do not try to read the memo (dbt/fpt) file + --info only print info about the file and fields + --version print version of the XBase library +EOF +} + +my %addopts = (); +if (defined $options{'nomemo'} or defined $options{'info'}) { + $addopts{'ignorememo'} = 1; +} + +$addopts{'memosep'} = $options{'memosep'}; +$addopts{'memofile'} = $options{'memofile'}; + +if (defined $options{'info'}) { + $addopts{'ignorebadheader'} = 1; +} + +my $file; +for $file (@ARGV) { + my $table = new XBase 'name' => $file, %addopts; + + if (not defined $table) { + print STDERR XBase->errstr; + next; + } + if (defined $options{'info'}) { + if (not defined $options{'SQL'}) { + print $table->header_info; + } else { + my $name = $file; + $name =~ s!^.*/|\.dbf$!!ig; + print "create table $name (\n"; + my @names = $table->field_names; + my %conv = qw! + C varchar + N numeric + F numeric + L boolean + M blob + D date + T time + !; + my @types = map { $conv{$_} } $table->field_types; + my @lengths = $table->field_lengths; + my @decimals = $table->field_decimals; + for (my $i = 0; $i < @names; $i++) { + print "\t$names[$i] $types[$i]"; + if ($types[$i] eq 'blob') { + $lengths[$i] = $decimals[$i] = undef; + } + if ($lengths[$i] or $decimals[$i]) { + print "($lengths[$i]"; + print ", $decimals[$i]" if $decimals[$i]; + print ")"; + } + if (defined $names[$i+1]) { + print ','; + } + print "\n"; + } + print ")\n"; + } + } else { + $table->dump_records(%options) or print STDERR $table->errstr; + } + $table->close; +} + +1; + +__END__ + +=head1 NAME + +dbfdump.pl - Dump the record of the dbf file + +=head1 FORMAT + + dbfdump.pl [options] files + +where options are + + --rs output record separator (default newline) + --fs output field separator (default colon) + --fields comma separated list of fields to print (default all) + --undef string to print for NULL values (default empty) + --memofile specifies unstandard name of attached memo file + --memosep separator for dBase III dbt's (default \x1a\x1a) + + --nomemo do not try to read the memo (dbt/fpt) file + --info print info about the file and fields + with additional --SQL parameter, outputs the SQL create table + --version print version of the XBase library + --table output in nice table format (only available when + Data::ShowTable is installed, overrides rs and fs) + +=head1 SYNOPSIS + + dbfdump.pl -fields id,msg table.dbf + dbfdump.pl -fs=' : ' table + dbfdump.pl --nomemo file.dbf + + ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump.pl - + +=head1 DESCRIPTION + +Dbfdump prints to standard output the content of dbf files listed. By +default, it prints all fields, separated by colons, one record on +a line. The output record and column separators can be changed by +switches on the command line. You can also ask only for some fields to +be printed. + +The content of associated memo files (dbf, fpt) is printed for memo +fields, unless you use the C<--nomemo> option. + +You can specify reading the standard input by putting dash (-) instead +of file name. + +=head1 AUTHOR + +(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz, +http://www.fi.muni.cz/~adelton/ +at Faculty of Informatics, Masaryk University in Brno, Czech Republic + +=head1 SEE ALSO + +perl(1); XBase(3) + +=cut + +EOBODY + diff -ruN DBD-XBase-0.241-orig/Changes DBD-XBase-0.241/Changes --- DBD-XBase-0.241-orig/Changes 2003-11-21 14:13:43.000000000 +0000 +++ DBD-XBase-0.241/Changes 2006-03-16 22:09:11.000000000 +0000 @@ -136,7 +136,7 @@ 0.1551 Sat Jan 9 19:21:16 CET 2000 - dbfdump: Accepts --SQL modifier to --info, prints structure + dbfdump.pl: Accepts --SQL modifier to --info, prints structure of the table as a create table SQL. 0.155 Sun Nov 7 15:43:59 CET 1999 @@ -272,7 +272,7 @@ XBase::Memo: we now reset next_for_append to point behind the end of the file, problem pointed out by Artem Belevich. - dbfdump: option --table, --fields now handles intervals. + dbfdump.pl: option --table, --fields now handles intervals. t/2_read.t: fixed problem with order of fields in hash, patch by Andreas J. Koenig. @@ -301,7 +301,7 @@ XBase::SQL: fix of handling of double quoted strings. - dbfdump: memosep and memofile options fixed. + dbfdump.pl: memosep and memofile options fixed. t/4_dbfdump.t: avoided using cat. @@ -427,7 +427,7 @@ 0.0632 Wed May 27 12:27:04 MET DST 1998 - Added --nomemo option to dbfdump. The list of entires is made + Added --nomemo option to dbfdump.pl. The list of entires is made longer in any non-leaf page in ndx. Added check for the magic "FFFF0800" tag in dBaseIV dbt file when reading it. @@ -479,7 +479,7 @@ long selects. Method dump_records now prints directly, doesn't use get_all_records. - Added parameter --info into the script dbfdump to print the + Added parameter --info into the script dbfdump.pl to print the header info. Changed way of determining the type of the dbt file after diff -ruN DBD-XBase-0.241-orig/INSTALL DBD-XBase-0.241/INSTALL --- DBD-XBase-0.241-orig/INSTALL 2003-04-03 18:02:37.000000000 +0100 +++ DBD-XBase-0.241/INSTALL 2006-03-16 22:08:17.000000000 +0000 @@ -43,7 +43,7 @@ If you do not have make or you cannot run it (do you really want to use Perl on that machine?), just copy the content of the DBD-XBase-x.xxx/lib directory to wherever you want to have it. That -should work, even if it won't give you man pages and dbfdump/indexdump +should work, even if it won't give you man pages and dbfdump.pl/indexdump scripts. If you use a platform supported by ActiveState and run ActiveState diff -ruN DBD-XBase-0.241-orig/lib/XBase/FAQ.pod DBD-XBase-0.241/lib/XBase/FAQ.pod --- DBD-XBase-0.241-orig/lib/XBase/FAQ.pod 2002-08-16 10:38:53.000000000 +0100 +++ DBD-XBase-0.241/lib/XBase/FAQ.pod 2006-03-16 22:06:06.000000000 +0000 @@ -175,11 +175,11 @@ to your script and you will see that it's not B problem. -=item The B stops after reading I records ... +=item The B stops after reading I records ... ... why doesn't it read all I<10 x n> records? -Check if the file isn't truncated. C will tell +Check if the file isn't truncated. C will tell you the expected number of records and length of one record, like Filename: file.dbf @@ -191,7 +191,7 @@ Num fields: 40 So the expected length of the file is at least I<1313 + 65 * 1117>. If -it's shorter, you've got damaged file and B only +it's shorter, you've got damaged file and B only reads as much rows as it can find in the dbf. =item How is this B related to B? diff -ruN DBD-XBase-0.241-orig/lib/XBase.pm DBD-XBase-0.241/lib/XBase.pm --- DBD-XBase-0.241-orig/lib/XBase.pm 2003-11-21 14:17:49.000000000 +0000 +++ DBD-XBase-0.241/lib/XBase.pm 2006-03-16 22:05:32.000000000 +0000 @@ -1341,7 +1341,7 @@ $table->dump_records("fs" => " | ", "rs" => " <-+\n", "fields" => [ "id", "msg" ]);' -Also note that there is a script dbfdump(1) that does the printing. +Also note that there is a script dbfdump.pl(1) that does the printing. =head2 Errors and debugging @@ -1423,7 +1423,7 @@ =head1 SEE ALSO perl(1); XBase::FAQ(3); DBD::XBase(3) and DBI(3) for DBI interface; -dbfdump(1) +dbfdump.pl(1) =cut diff -ruN DBD-XBase-0.241-orig/Makefile.PL DBD-XBase-0.241/Makefile.PL --- DBD-XBase-0.241-orig/Makefile.PL 2003-04-03 17:37:19.000000000 +0100 +++ DBD-XBase-0.241/Makefile.PL 2006-03-16 22:20:20.000000000 +0000 @@ -41,11 +41,11 @@ 'AUTHOR' => 'Jan Pazdziora (adelton at fi.muni.cz)', 'ABSTRACT' => 'Reads and writes XBase (dbf) files, includes DBI support', ) : ()), - 'PL_FILES' => { 'bin/dbfdump.PL' => 'bin/dbfdump', + 'PL_FILES' => { 'bin/dbfdump.pl.PL' => 'bin/dbfdump.pl', 'bin/indexdump.PL' => 'bin/indexdump' }, - 'EXE_FILES' => [ 'bin/dbfdump', ' bin/indexdump' ], + 'EXE_FILES' => [ 'bin/dbfdump.pl', ' bin/indexdump' ], 'dist' => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', POSTOP => 'mv $(DISTNAME)-$(VERSION).tar.gz ../' }, - 'clean' => { FILES => 'bin/dbfdump bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '}, + 'clean' => { FILES => 'bin/dbfdump.pl bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '}, ); diff -ruN DBD-XBase-0.241-orig/MANIFEST DBD-XBase-0.241/MANIFEST --- DBD-XBase-0.241-orig/MANIFEST 2003-07-07 19:30:41.000000000 +0100 +++ DBD-XBase-0.241/MANIFEST 2006-03-16 22:20:06.000000000 +0000 @@ -4,7 +4,7 @@ Makefile.PL README ToDo -bin/dbfdump.PL +bin/dbfdump.pl.PL bin/indexdump.PL dbit/00base.t dbit/10dsnlist.t diff -ruN DBD-XBase-0.241-orig/new-XBase DBD-XBase-0.241/new-XBase --- DBD-XBase-0.241-orig/new-XBase 2001-02-06 10:44:13.000000000 +0000 +++ DBD-XBase-0.241/new-XBase 2006-03-16 22:09:55.000000000 +0000 @@ -395,7 +395,7 @@ $table->dump_records("fs" => " | ", "rs" => " <-+\n", "fields" => [ "id", "msg" ]);' -Also note that there is a command line script dbfdump(1) that does +Also note that there is a command line script dbfdump.pl(1) that does the printing. =head1 Writing the data @@ -597,7 +597,7 @@ XBase::FAQ(3); XBase::Index(3); DBD::XBase(3) and DBI(3) for DBI interface; -dbfdump(1); perl(1) +dbfdump.pl(1); perl(1) =cut diff -ruN DBD-XBase-0.241-orig/README DBD-XBase-0.241/README --- DBD-XBase-0.241-orig/README 2003-04-03 18:02:47.000000000 +0100 +++ DBD-XBase-0.241/README 2006-03-16 22:09:29.000000000 +0000 @@ -48,7 +48,7 @@ my $table = new XBase 'table.dbf'; my @data = $table->get_record(0); - The distribution also includes a dbfdump script that prints + The distribution also includes a dbfdump.pl script that prints the content of the table in readable form. @@ -75,7 +75,7 @@ native XBase engines produce data incompatible with this module. - Man pages for XBase, DBD::XBase, dbfdump, XBase::Index and + Man pages for XBase, DBD::XBase, dbfdump.pl, XBase::Index and XBase::SDBM are included, examples of little scripts can also be found in eg/ directory of the distribution. Read the DBI man page for DBI specific issues, and the XBase::FAQ page. diff -ruN DBD-XBase-0.241-orig/t/4_dbfdump.t DBD-XBase-0.241/t/4_dbfdump.t --- DBD-XBase-0.241-orig/t/4_dbfdump.t 2002-05-15 17:18:09.000000000 +0100 +++ DBD-XBase-0.241/t/4_dbfdump.t 2006-03-16 22:07:14.000000000 +0000 @@ -9,13 +9,13 @@ use ExtUtils::testlib; my $libs = join " -I", '', @INC; -my $dbfdump = "$dir/blib/script/dbfdump"; +my $dbfdump = "$dir/blib/script/dbfdump.pl"; my $expected = join '', ; my $result = ''; my $command = qq!$^X $libs $dbfdump "$dir/t/rooms.dbf"!; -print "Running dbfdump rooms.dbf: $command\n"; +print "Running dbfdump.pl rooms.dbf: $command\n"; $result = `$command`; if ($result ne $expected) @@ -23,7 +23,7 @@ print "ok 1\n"; $command = qq!$^X $libs $dbfdump -- - < "$dir/t/rooms.dbf"!; -print "Running stdin dbfdump < rooms.dbf: $command\n"; +print "Running stdin dbfdump.pl < rooms.dbf: $command\n"; $result = `$command`; if ($result ne $expected) Index: perl-DBD-XBase.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-XBase/FC-5/perl-DBD-XBase.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-DBD-XBase.spec 17 Feb 2006 18:33:17 -0000 1.3 +++ perl-DBD-XBase.spec 7 May 2006 17:17:23 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-DBD-XBase Version: 0.241 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module for reading and writing the dbf files Group: Development/Libraries @@ -8,6 +8,7 @@ URL: http://search.cpan.org/dist/DBD-XBase/ Source0: http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz Patch0: DBD-XBase-0.241-indexdump.PL.patch +Patch1: DBD-XBase-0.241-dbfdump-rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +27,7 @@ %prep %setup -q -n DBD-XBase-%{version} %patch0 -p1 +%patch1 -p1 chmod a-x eg/*table %build @@ -61,6 +63,9 @@ %changelog +* Thu Mar 16 2006 Jose Pedro Oliveira - 0.241-4 +- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib (#181999). + * Fri Feb 17 2006 Jose Pedro Oliveira - 0.241-3 - Rebuild for FC5 (perl 5.8.8). From fedora-extras-commits at redhat.com Sun May 7 17:40:06 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:40:06 -0700 Subject: rpms/scribes - New directory Message-ID: <200605071740.k47He86Q025606@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25580/scribes Log Message: Directory /cvs/extras/rpms/scribes added to the repository From fedora-extras-commits at redhat.com Sun May 7 17:40:07 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:40:07 -0700 Subject: rpms/scribes/devel - New directory Message-ID: <200605071740.k47He9pY025609@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25580/scribes/devel Log Message: Directory /cvs/extras/rpms/scribes/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 17:40:40 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:40:40 -0700 Subject: rpms/scribes Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605071740.k47HegRn025658@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25625 Added Files: Makefile import.log Log Message: Setup of module scribes --- NEW FILE Makefile --- # Top level Makefile for module scribes all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 17:40:41 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:40:41 -0700 Subject: rpms/scribes/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605071740.k47HeheQ025661@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25625/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scribes --- NEW 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 May 7 17:42:33 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:42:33 -0700 Subject: rpms/scribes import.log,1.1,1.2 Message-ID: <200605071742.k47HgatI025758@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25722 Modified Files: import.log Log Message: auto-import scribes-0.2.4.3-3 on branch devel from scribes-0.2.4.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scribes/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 17:40:40 -0000 1.1 +++ import.log 7 May 2006 17:42:33 -0000 1.2 @@ -0,0 +1 @@ +scribes-0_2_4_3-3:HEAD:scribes-0.2.4.3-3.src.rpm:1147023733 From fedora-extras-commits at redhat.com Sun May 7 17:42:34 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:42:34 -0700 Subject: rpms/scribes/devel scribes.spec, NONE, 1.1 setup-install-gconf-schemas.patch, NONE, 1.1 setup-no-dep-check.patch, NONE, 1.1 setup-no-manual-gconf.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605071742.k47Hga4s025769@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25722/devel Modified Files: .cvsignore sources Added Files: scribes.spec setup-install-gconf-schemas.patch setup-no-dep-check.patch setup-no-manual-gconf.patch Log Message: auto-import scribes-0.2.4.3-3 on branch devel from scribes-0.2.4.3-3.src.rpm --- NEW FILE scribes.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define python_module_name Scribes Name: scribes Version: 0.2.4.3 Release: 3%{?dist} Summary: A sleek, simple, and powerful text editor for the GNOME desktop Group: Applications/Editors License: GPL URL: http://scribes.sourceforge.net/ Source0: http://openusability.org/download.php/93/%{name}-%{version}.tar.gz Patch0: setup-no-dep-check.patch Patch1: setup-install-gconf-schemas.patch Patch2: setup-no-manual-gconf.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils Requires: gnome-python2-gtkspell >= 2.12 Requires: gnome-python2-gtksourceview >= 2.12 Requires: pygtk2 >= 2.8 Requires(pre): GConf2 Requires(post): GConf2 Requires(post): scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper %description Scribes is a simple and sleek text editor for the the GNOME desktop. It focuses on keeping the working environment free from distractions, and providing strong automation of mundane, repetitive tasks. Through this simplicity, Scribes is very powerful. Its many features include: * A dynamic templating system (called Snippets), * Automatic completion of indentifiers and bracketing, * Automatic indentation and file saving, * Bookmarks, * Drag-and-drop functionality, * Full support for Unicode (UTF-8) text (and many other encodings), * Syntax highlighting for over 30 programming languages, * Powerful GNOME integration * Translations into several different languages, ...and more are in development! In order to make use of its runtime documentation facilities, you will need to install Yelp. %prep %setup -q %patch0 -p0 %patch1 -p0 %patch2 -p0 %build %{__python} setup.py build %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||: fi %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %find_lang %{name} desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --delete-original \ %{buildroot}/%{_datadir}/applications/scribes.desktop chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/findbar.py chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py %post export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||: update-desktop-database &> /dev/null ||: %clean rm -rf %{buildroot} %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: fi %postun update-desktop-database &> /dev/null ||: %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS CHANGELOG README TODO TRANSLATORS COPYING %{_bindir}/%{name} %dir %{python_sitelib}/%{python_module_name} %{python_sitelib}/%{python_module_name}/*.py %{python_sitelib}/%{python_module_name}/*.pyc %ghost %{python_sitelib}/%{python_module_name}/*.pyo %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.svg %{_datadir}/application-registry/%{name}.application %{_datadir}/gnome/help/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/omf/%{name}/ %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog * Sat May 06 2006 Peter Gordon - 0.2.4.3-3 - Removed yelp Requires; added scrollkeeper as Requires(post) and Requires(postun) - Dropped gconfd-2 killall statements in the scriptlets (not needed in FC5+). - Thanks to Brian Pepple (Bug #189727). * Tue Apr 25 2006 Peter Gordon - 0.2.4.3-2 - Added patch to remove unnecessary gconf foo in the setup.py script. - Fix a few spacing inconsistencies in the .spec file. * Sat Apr 22 2006 Peter Gordon - 0.2.4.3-1 - Initial packaging. setup-install-gconf-schemas.patch: --- NEW FILE setup-install-gconf-schemas.patch --- --- setup.py 2006-04-22 18:29:10.000000000 -0700 +++ patched-setup.py 2006-04-22 18:35:33.000000000 -0700 @@ -82,6 +82,7 @@ license="GNU GPL v2 and above", packages=["Scribes"], data_files=[ + ("/etc/gconf/schemas", ["data/scribes.schemas"]), ("share/applications", ["data/scribes.desktop"]), ("share/application-registry", ["data/scribes.application"]), ("share/pixmaps", ["data/scribes.svg"]), setup-no-dep-check.patch: --- NEW FILE setup-no-dep-check.patch --- --- setup.py 2006-03-04 12:28:07.916137104 -0500 +++ patch.py 2006-03-26 18:54:39.614303696 -0500 @@ -42,94 +42,6 @@ from distutils.core import setup from Scribes.info import version - -def check_dependencies(): - u""" - Check for Scribes' runtime software dependencies. - - The function aborts the installation process if runtime software - dependencies are not met by the host system. - - """ - - try: - - import pygtk - pygtk.require("2.0") - import gtk - - if gtk.pygtk_version < (2, 8, 0): - - raise ImportError - - except ImportError: - - print "You need PyGTK version 2.8 or later to run Scribes." - exit(1) - - try: - - import pygtk - pygtk.require("2.0") - import gnome - - if gnome.gnome_python_version < (2, 12, 0): - - raise ImportError - - except ImportError: - - print "You need GNOME Python version 2.12 or later to run Scribes" - exit(1) - - try: - - import pygtk - pygtk.require("2.0") - import gtksourceview - - except ImportError: - - print "You need the gtksourceview module in GNOME Python Extras version" - print " 2.12 or later to run Scribes." - exit(1) - - try: - - import pygtk - pygtk.require("2.0") - import gtkspell - - except ImportError: - - print "You need the gtkspell module in GNOME Python Extras version" - print " 2.12 or later to run Scribes." - exit(1) - - # Check to see if Yelp is installed on the host system - - cmd = "which yelp" - err, out = getstatusoutput(cmd) - - if err: - - print "You need Yelp version 2.12 or later to run Scribes." - exit(1) - - # Check to see if GConf is installed on the host system - - cmd = "which gconftool-2" - err, out = getstatusoutput(cmd) - - if err: - - print "You need GConf version 2.12 or later to run Scribes." - exit(1) - - return - -check_dependencies() - # Trove classification classifiers = """ setup-no-manual-gconf.patch: --- NEW FILE setup-no-manual-gconf.patch --- --- setup.py 2006-04-25 20:55:16.000000000 -0700 +++ patch.py 2006-04-25 20:58:52.000000000 -0700 @@ -101,48 +101,3 @@ "data/scribes_editing.png", "data/scribes_status.png"]) ], scripts=["scribes"],) - - -################################################################################ -# -# GConf Installation -# -################################################################################ - -# Get gconf's default source -cmd = "gconftool-2 --get-default-source" -err, out = getstatusoutput(cmd) - -# Set up the gconf environment variable. -putenv('GCONF_CONFIG_SOURCE', out) - -# Install gconf to the default source -cmd = "gconftool-2 --makefile-install-rule data/scribes.schemas" -err, out = getstatusoutput(cmd) - -if out: - - print "installing GConf schema files" - -if err: - - print 'Error: installation of gconf schema files failed: %s' % out - -# Kill the GConf daemon -cmd = "killall gconfd-2" -err, out = getstatusoutput(cmd) - -if err: - - print "Problem shutting down gconf." - -# Start the GConf daemon -cmd = "gconftool-2 --spawn" -err, out = getstatusoutput(cmd) - -if err: - - print "Problem restarting down gconf." - -print "scribes installation complete" - Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 17:40:41 -0000 1.1 +++ .cvsignore 7 May 2006 17:42:34 -0000 1.2 @@ -0,0 +1 @@ +scribes-0.2.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 17:40:41 -0000 1.1 +++ sources 7 May 2006 17:42:34 -0000 1.2 @@ -0,0 +1 @@ +5031eaa0ef8817ea32d390fc4d26ceda scribes-0.2.4.3.tar.gz From fedora-extras-commits at redhat.com Sun May 7 17:47:05 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:47:05 -0700 Subject: owners owners.list,1.953,1.954 Message-ID: <200605071747.k47Hl7Ki025837@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25820/owners Modified Files: owners.list Log Message: Add entry for Scribes (bug #189727). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.953 retrieving revision 1.954 diff -u -r1.953 -r1.954 --- owners.list 7 May 2006 10:53:19 -0000 1.953 +++ owners.list 7 May 2006 17:47:05 -0000 1.954 @@ -1427,6 +1427,7 @@ Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|screem|A website development enviroment|michael at knox.net.nz|extras-qa at fedoraproject.org| +Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scribus-templates|This package includes additional templates for Scribus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 18:56:28 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 11:56:28 -0700 Subject: rpms/nsd/devel nsd.spec,1.6,1.7 nsd.init,1.1,1.2 Message-ID: <200605071856.k47IuUth028432@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28411 Modified Files: nsd.spec nsd.init Log Message: updated spec and init file for nsd-2.3.4 Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsd.spec 15 Dec 2005 15:48:59 -0000 1.6 +++ nsd.spec 7 May 2006 18:56:28 -0000 1.7 @@ -1,12 +1,11 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd -Version: 2.3.3 -Release: 7%{?dist} +Version: 2.3.4 +Release: 1%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz Source1: nsd.init -Patch0: nsd-2.3.3-checking.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel @@ -19,9 +18,8 @@ %prep %setup -q -%patch0 -p1 -b .checking.patch -%configure --enable-bind8-stats --enable-plugins \ +%configure --enable-bind8-stats --enable-plugins --enable-checking \ --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \ --with-user=nsd @@ -30,22 +28,16 @@ %install rm -rf %{buildroot} -# Not using their 'make install' since it uses install-sh which does not -# get the correct install path within the RPM_BUILD_ROOT -#%{__make} install -install -d 0755 %{buildroot}/%{_sysconfdir}/nsd -install -d 0755 %{buildroot}/%{_sbindir} -install -d 0755 %{buildroot}/%{_mandir}/man8 -install -d 0755 %{buildroot}/%{_initrddir} -install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name} - -install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf -install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones +%{__make} DESTDIR=%{buildroot} install +install -d 0755 %{buildroot}%{_initrddir} install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd +install -d 0700 %{buildroot}%{_localstatedir}/run/%{name} -install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir} -install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc -install -m 0644 *.8 %{buildroot}/%{_mandir}/man8 +# change .sample to normal config files +mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsdc.conf +mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsd.zones %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,6 +76,12 @@ fi %changelog +* Sun May 7 2006 Paul Wouters - 2.3.4-1 +- Upgraded to nsd-2.3.4. +- Removed manual install targets because DESTDIR is now supported +- Re-enabled --checking, checking patch no longer needed and removed. +- Work around in nsd.init for nsd failing to start when there is no ipv6 + * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsd.init 13 Dec 2005 03:51:03 -0000 1.1 +++ nsd.init 7 May 2006 18:56:28 -0000 1.2 @@ -24,9 +24,14 @@ #extra verbosity #ZONEC_VERBOSE=-v - OTHER_NSD_OPTS="" +#work around for bug in nsd-2.3.4 when no ipv6 is available +if [ ! -d /proc/sys/net/ipv6/ ] +then + OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS" +fi + # Source function library. . /etc/init.d/functions From fedora-extras-commits at redhat.com Sun May 7 18:57:40 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 11:57:40 -0700 Subject: rpms/nsd/devel sources,1.2,1.3 Message-ID: <200605071857.k47IvglA028486@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28469 Modified Files: sources Log Message: new source Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 03:51:03 -0000 1.2 +++ sources 7 May 2006 18:57:40 -0000 1.3 @@ -1 +1,2 @@ 7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz +72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:02:16 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:02:16 -0700 Subject: rpms/nsd/devel .cvsignore,1.2,1.3 Message-ID: <200605071902.k47J2nVL030713@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30692 Modified Files: .cvsignore Log Message: guess it wants cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 03:51:03 -0000 1.2 +++ .cvsignore 7 May 2006 19:02:16 -0000 1.3 @@ -1 +1,2 @@ nsd-2.3.3.tar.gz +nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:04:48 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:04:48 -0700 Subject: rpms/nsd/devel nsd.spec,1.7,1.8 Message-ID: <200605071904.k47J4o9t030845@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30828 Modified Files: nsd.spec Log Message: bump on silly 'tag exists and does not exist' error again. Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsd.spec 7 May 2006 18:56:28 -0000 1.7 +++ nsd.spec 7 May 2006 19:04:48 -0000 1.8 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz @@ -76,7 +76,7 @@ fi %changelog -* Sun May 7 2006 Paul Wouters - 2.3.4-1 +* Sun May 7 2006 Paul Wouters - 2.3.4-2 - Upgraded to nsd-2.3.4. - Removed manual install targets because DESTDIR is now supported - Re-enabled --checking, checking patch no longer needed and removed. From fedora-extras-commits at redhat.com Sun May 7 19:05:33 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:05:33 -0700 Subject: rpms/nsd/devel nsd.spec,1.8,1.9 Message-ID: <200605071905.k47J5ZGL030898@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30881 Modified Files: nsd.spec Log Message: and again Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nsd.spec 7 May 2006 19:04:48 -0000 1.8 +++ nsd.spec 7 May 2006 19:05:33 -0000 1.9 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz @@ -76,7 +76,7 @@ fi %changelog -* Sun May 7 2006 Paul Wouters - 2.3.4-2 +* Sun May 7 2006 Paul Wouters - 2.3.4-3 - Upgraded to nsd-2.3.4. - Removed manual install targets because DESTDIR is now supported - Re-enabled --checking, checking patch no longer needed and removed. From fedora-extras-commits at redhat.com Sun May 7 19:19:08 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:19:08 -0700 Subject: rpms/nsd/FC-4 nsd.init,1.1,1.2 nsd.spec,1.6,1.7 Message-ID: <200605071919.k47JJAsQ030973@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953 Modified Files: nsd.init nsd.spec Log Message: updates pulled from devel. Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsd.init 13 Dec 2005 03:51:03 -0000 1.1 +++ nsd.init 7 May 2006 19:19:07 -0000 1.2 @@ -24,9 +24,14 @@ #extra verbosity #ZONEC_VERBOSE=-v - OTHER_NSD_OPTS="" +#work around for bug in nsd-2.3.4 when no ipv6 is available +if [ ! -d /proc/sys/net/ipv6/ ] +then + OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS" +fi + # Source function library. . /etc/init.d/functions Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsd.spec 15 Dec 2005 16:30:36 -0000 1.6 +++ nsd.spec 7 May 2006 19:19:07 -0000 1.7 @@ -1,12 +1,11 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd -Version: 2.3.3 -Release: 8%{?dist} +Version: 2.3.4 +Release: 3%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz Source1: nsd.init -Patch0: nsd-2.3.3-checking.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel @@ -19,9 +18,8 @@ %prep %setup -q -%patch0 -p1 -b .checking.patch -%configure --enable-bind8-stats --enable-plugins \ +%configure --enable-bind8-stats --enable-plugins --enable-checking \ --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \ --with-user=nsd @@ -30,22 +28,16 @@ %install rm -rf %{buildroot} -# Not using their 'make install' since it uses install-sh which does not -# get the correct install path within the RPM_BUILD_ROOT -#%{__make} install -install -d 0755 %{buildroot}/%{_sysconfdir}/nsd -install -d 0755 %{buildroot}/%{_sbindir} -install -d 0755 %{buildroot}/%{_mandir}/man8 -install -d 0755 %{buildroot}/%{_initrddir} -install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name} - -install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf -install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones +%{__make} DESTDIR=%{buildroot} install +install -d 0755 %{buildroot}%{_initrddir} install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd +install -d 0700 %{buildroot}%{_localstatedir}/run/%{name} -install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir} -install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc -install -m 0644 *.8 %{buildroot}/%{_mandir}/man8 +# change .sample to normal config files +mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsdc.conf +mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsd.zones %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,6 +76,12 @@ fi %changelog +* Sun May 7 2006 Paul Wouters - 2.3.4-3 +- Upgraded to nsd-2.3.4. +- Removed manual install targets because DESTDIR is now supported +- Re-enabled --checking, checking patch no longer needed and removed. +- Work around in nsd.init for nsd failing to start when there is no ipv6 + * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Sun May 7 19:19:31 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:19:31 -0700 Subject: rpms/nsd/FC-3 nsd.init,1.1,1.2 nsd.spec,1.5,1.6 Message-ID: <200605071919.k47JJX88031002@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30983 Modified Files: nsd.init nsd.spec Log Message: updates pulled from devel Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsd.init 13 Dec 2005 03:51:03 -0000 1.1 +++ nsd.init 7 May 2006 19:19:30 -0000 1.2 @@ -24,9 +24,14 @@ #extra verbosity #ZONEC_VERBOSE=-v - OTHER_NSD_OPTS="" +#work around for bug in nsd-2.3.4 when no ipv6 is available +if [ ! -d /proc/sys/net/ipv6/ ] +then + OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS" +fi + # Source function library. . /etc/init.d/functions Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsd.spec 15 Dec 2005 16:21:52 -0000 1.5 +++ nsd.spec 7 May 2006 19:19:30 -0000 1.6 @@ -1,12 +1,11 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd -Version: 2.3.3 -Release: 7%{?dist} +Version: 2.3.4 +Release: 3%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz Source1: nsd.init -Patch0: nsd-2.3.3-checking.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel @@ -19,9 +18,8 @@ %prep %setup -q -%patch0 -p1 -b .checking.patch -%configure --enable-bind8-stats --enable-plugins \ +%configure --enable-bind8-stats --enable-plugins --enable-checking \ --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \ --with-user=nsd @@ -30,22 +28,16 @@ %install rm -rf %{buildroot} -# Not using their 'make install' since it uses install-sh which does not -# get the correct install path within the RPM_BUILD_ROOT -#%{__make} install -install -d 0755 %{buildroot}/%{_sysconfdir}/nsd -install -d 0755 %{buildroot}/%{_sbindir} -install -d 0755 %{buildroot}/%{_mandir}/man8 -install -d 0755 %{buildroot}/%{_initrddir} -install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name} - -install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf -install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones +%{__make} DESTDIR=%{buildroot} install +install -d 0755 %{buildroot}%{_initrddir} install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd +install -d 0700 %{buildroot}%{_localstatedir}/run/%{name} -install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir} -install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc -install -m 0644 *.8 %{buildroot}/%{_mandir}/man8 +# change .sample to normal config files +mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsdc.conf +mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsd.zones %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,6 +76,12 @@ fi %changelog +* Sun May 7 2006 Paul Wouters - 2.3.4-3 +- Upgraded to nsd-2.3.4. +- Removed manual install targets because DESTDIR is now supported +- Re-enabled --checking, checking patch no longer needed and removed. +- Work around in nsd.init for nsd failing to start when there is no ipv6 + * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Sun May 7 19:21:27 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:21:27 -0700 Subject: rpms/nsd/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605071921.k47JLTBw031109@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31090 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 03:51:03 -0000 1.2 +++ .cvsignore 7 May 2006 19:21:27 -0000 1.3 @@ -1 +1,2 @@ nsd-2.3.3.tar.gz +nsd-2.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 03:51:03 -0000 1.2 +++ sources 7 May 2006 19:21:27 -0000 1.3 @@ -1 +1,2 @@ 7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz +72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:21:51 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:21:51 -0700 Subject: rpms/nsd/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605071921.k47JLr7G031145@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31126 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 03:51:03 -0000 1.2 +++ .cvsignore 7 May 2006 19:21:51 -0000 1.3 @@ -1 +1,2 @@ nsd-2.3.3.tar.gz +nsd-2.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 03:51:03 -0000 1.2 +++ sources 7 May 2006 19:21:51 -0000 1.3 @@ -1 +1,2 @@ 7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz +72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:23:47 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:23:47 -0700 Subject: rpms/nsd/FC-4 sources,1.3,1.4 Message-ID: <200605071923.k47JNnLI031220@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31203 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 May 2006 19:21:27 -0000 1.3 +++ sources 7 May 2006 19:23:47 -0000 1.4 @@ -1,2 +1 @@ -7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz 72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:44:23 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 7 May 2006 12:44:23 -0700 Subject: rpms/lightning - New directory Message-ID: <200605071944.k47JiPPK032741@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32711/lightning Log Message: Directory /cvs/extras/rpms/lightning added to the repository From fedora-extras-commits at redhat.com Sun May 7 19:44:24 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 7 May 2006 12:44:24 -0700 Subject: rpms/lightning/devel - New directory Message-ID: <200605071944.k47JiQqt032744@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32711/lightning/devel Log Message: Directory /cvs/extras/rpms/lightning/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 19:44:45 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 7 May 2006 12:44:45 -0700 Subject: rpms/lightning Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605071944.k47Jil86000353@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv316 Added Files: Makefile import.log Log Message: Setup of module lightning --- NEW FILE Makefile --- # Top level Makefile for module lightning all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 19:44:46 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 7 May 2006 12:44:46 -0700 Subject: rpms/lightning/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605071944.k47JimuQ000358@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv316/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lightning --- NEW 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 May 7 20:36:57 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 13:36:57 -0700 Subject: rpms/xemacs/devel xemacs-21.5.26-maximize.patch, NONE, 1.1 xemacs.spec, 1.24, 1.25 Message-ID: <200605072036.k47Kax4n005242@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5222 Modified Files: xemacs.spec Added Files: xemacs-21.5.26-maximize.patch Log Message: * Sun May 7 2006 Ville Skytt?? - 21.5.26-5 - Apply upstream fix for window maximization problems (#111225). xemacs-21.5.26-maximize.patch: --- NEW FILE xemacs-21.5.26-maximize.patch --- Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.954 diff -u -r1.954 ChangeLog --- src/ChangeLog 6 May 2006 08:46:38 -0000 1.954 +++ src/ChangeLog 6 May 2006 17:26:00 -0000 @@ -0,0 +1,26 @@ +2006-04-30 Stephen J. Turnbull + + Move geometry management from EmacsFrameResize to x_set_frame_size. + Should fix "metacity maximization" bug. + Provide (deprecated, temporary) backward compatibility option. + + * EmacsFrame.c (EmacsFrameResize): + * frame-x.c (x_set_frame_size): + Move call of ChangeEmacsManagerSize. + Don't bogusly notify WM about size changes the WM asked for. + + * console-x.c (wedge-metacity): New builtin Boolean Lisp variable. + * console-x-impl.h (wedge_metacity): Declare C variable. + * console-x.c (vars_of_console_x): New function to initialize it. + * symsinit.h (vars_of_console_x): declare it. + * emacs.c (main_1): Call vars_of_console_x. + + * EmacsFrameP.h (struct EmacsFrame): + * EmacsManager.c (ChangeEmacsManagerSize): + * EmacsShell-sub.c (SuperClassRootGeometryManager): + * console-x-impl.h (wedge_metacity): + Various comments, some improved documentation, mostly sad comments + on the state of the art of Xt programming. + + * frame-x.c (defi): #undef it. (Random code cleanliness.) + Index: src/EmacsFrame.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrame.c,v retrieving revision 1.28 diff -u -r1.28 EmacsFrame.c --- src/EmacsFrame.c 25 Oct 2005 11:16:20 -0000 1.28 +++ src/EmacsFrame.c 6 May 2006 17:26:00 -0000 @@ -360,19 +360,32 @@ pixel_to_char_size (f, ew->core.width, ew->core.height, &columns, &rows); change_frame_size (f, rows, columns, 0); - /* Now we tell the EmacsShell that we've changed the size of the non-fixed - portion of the frame. Note that, if we the resize occurred as a result - of EmacsFrameSetCharSize(), this information will be stored twice. - This is not a big deal, as storing this information doesn't actually - do anything until the next resize. */ - if (FRAME_X_TOP_LEVEL_FRAME_P (f)) - x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); + /* The code below is just plain wrong. If the EmacsShell or EmacsManager + needs to know, they should just ask. If needed information is being + updated here, then we should set a dirty flag and have it updated on an + as-needed basis. + For now, conditionalize so people can get work done if this breaks + something. */ + if (wedge_metacity) /* cf. x_set_frame_size */ + { + /* Now we tell the EmacsShell that we've changed the size of the + non-fixed portion of the frame. Note that, if the resize occurred + as a result of EmacsFrameSetCharSize(), this information will be + stored twice. This is not a big deal, as storing this information + doesn't actually do anything until the next resize. */ + if (FRAME_X_TOP_LEVEL_FRAME_P (f)) + x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); - /* Kick the manager so that it knows we've changed size. */ - req.request_mode = 0; - XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); - EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), repl.width, - repl.height); + /* Kick the manager so that it knows we've changed size. + #### No, no, no! If this does anything at all, it will involve + changing the manager's size. That's not something that a child + widget should initialize as part of a purely informational + method!! */ + req.request_mode = 0; + XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); + EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), + repl.width, repl.height); + } } static Boolean Index: src/EmacsFrameP.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrameP.h,v retrieving revision 1.7 diff -u -r1.7 EmacsFrameP.h --- src/EmacsFrameP.h 4 May 2003 02:34:35 -0000 1.7 +++ src/EmacsFrameP.h 6 May 2006 17:26:00 -0000 @@ -65,13 +65,16 @@ Boolean iconic; /* whether this frame is iconic */ /* The rest of this is crap and should be deleted. + #### Comments that start with + are fields that actually get referred + to somewhere aside from the init function. + I guess the "crap" has mostly moved to specifiers? */ Boolean minibuffer; /* 0: normal frames with minibuffers. * 1: frames without minibuffers * 2: minibuffer only. */ Boolean unsplittable; /* frame can only have one window */ - int internal_border_width; /* internal borders */ + int internal_border_width; /* + internal borders */ int scrollbar_width; /* width of frame vertical sb's */ int scrollbar_height; /* height of frame horizontal sb's */ int top_toolbar_height; /* height of top toolbar */ @@ -82,9 +85,9 @@ int bottom_toolbar_border_width; /* ... of bottom toolbar */ int left_toolbar_border_width; /* ... of left toolbar */ int right_toolbar_border_width; /* ... of right toolbar */ - Dimension toolbar_shadow_thickness; + Dimension toolbar_shadow_thickness; /* + of shadows */ unsigned char scrollbar_placement; - int interline; /* skips between lines */ + int interline; /* + skips between lines */ XFontStruct* font; /* font */ Pixel foreground_pixel; /* foreground */ @@ -97,7 +100,7 @@ int bell_volume; /* how loud is beep */ Boolean menubar_p; /* initially show a menubar? */ - Boolean initially_unmapped; /* inhibit initial window mapping */ + Boolean initially_unmapped; /* + inhibit initial window mapping */ Boolean use_backing_store; /* backing store for menubar & ew? */ Dimension preferred_width; /* if non-zero, preferred size for */ Index: src/EmacsManager.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsManager.c,v retrieving revision 1.7 diff -u -r1.7 EmacsManager.c --- src/EmacsManager.c 22 Dec 2004 10:59:09 -0000 1.7 +++ src/EmacsManager.c 6 May 2006 17:26:00 -0000 @@ -241,6 +241,12 @@ if (height == 0) height = w->core.height; + /* #### AFAICT this gets called in two places. One is in ChangeManaged(), + above. The other is in EmacsFrameResize(). Perhaps ChangeManaged() + should initiate resize requests, but EmacsFrameResize() should not. + Unfortunately, I've tried making this conditional on whether we're + called from EmacsFrameResize() or not, but that results in an infloop + via the callback to x_layout_widgets() in Resize(). Whee! */ /* do nothing if we're already that size */ if (w->core.width != width || w->core.height != height) { Index: src/EmacsShell-sub.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsShell-sub.c,v retrieving revision 1.7 diff -u -r1.7 EmacsShell-sub.c --- src/EmacsShell-sub.c 24 Jan 2005 23:33:46 -0000 1.7 +++ src/EmacsShell-sub.c 6 May 2006 17:26:00 -0000 @@ -278,7 +278,8 @@ GenericClassExtRec *gcer; /* find the shell extension record that specifies the - root geometry manager method */ + root geometry manager method + #### We could use XtGetClassExtension here. */ for (gcer = (GenericClassExtRec *) swc->shell_class.extension; gcer; gcer = (GenericClassExtRec *) gcer->next_extension) @@ -287,6 +288,9 @@ break; } + /* #### The R11.6.4 Xt specification says if we don't find NULLQUARK here, + we should assume root_geometry_manager = XtInheritRootGeometryManager. + Is that actually callable? */ if (!gcer) ABORT (); Index: src/console-x-impl.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x-impl.h,v retrieving revision 1.5 diff -u -r1.5 console-x-impl.h --- src/console-x-impl.h 26 Nov 2005 11:46:07 -0000 1.5 +++ src/console-x-impl.h 6 May 2006 17:26:00 -0000 @@ -40,6 +40,8 @@ DECLARE_CONSOLE_TYPE (x); +extern int wedge_metacity; + struct x_device { #ifdef NEW_GC @@ -234,7 +236,8 @@ /* The maximum number of widgets that can be displayed above the text area at one time. Currently no more than 3 will ever actually be - displayed (menubar, psheet, debugger panel). */ + displayed (menubar, psheet, debugger panel). + #### Are "psheet" and "debugger panel" relevant any more? */ #define MAX_CONCURRENT_TOP_WIDGETS 8 struct x_frame @@ -243,12 +246,17 @@ struct lrecord_header header; #endif /* NEW_GC */ - /* The widget of this frame. This is an EmacsShell or an - ExternalShell. */ + /* The widget of this frame. + This is an EmacsShell or an ExternalShell. + It negotiates with the window manager or containing app on behalf of + the container widget. Should be (but isn't) invisible to Emacs. */ Widget widget; /* The parent of the EmacsFrame, the menubar, and the scrollbars. - This is an EmacsManager. */ + This is an EmacsManager. + It is responsible for managing the geometry of the frame. This is what + Emacs mostly talks to. Anything that affects its geometry will be + reflected in the Shell widget, and thus cause WM interaction. */ Widget container; /* The widget of the menubar, of whatever widget class it happens to be. */ Index: src/console-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x.c,v retrieving revision 1.16 diff -u -r1.16 console-x.c --- src/console-x.c 17 Dec 2005 19:47:02 -0000 1.16 +++ src/console-x.c 6 May 2006 17:26:00 -0000 @@ -41,6 +41,8 @@ DEFINE_CONSOLE_TYPE (x); +int wedge_metacity; /* nonzero means update WM_HINTS always */ + extern void x_has_keysym (KeySym, Lisp_Object, int); static int @@ -399,6 +401,22 @@ CONSOLE_HAS_METHOD (x, perhaps_init_unseen_key_defaults); } + +void +vars_of_console_x (void) +{ + DEFVAR_BOOL ("wedge-metacity", &wedge_metacity /* +When non-nil, frame geometry management is backward-compatible. +This is known to create inflooping window jitter in metacity, et al. +It also does not conform to Xt conventions for geometry management. +Specifically, all frame resizes, XEmacs-initiated or not, update WM_HINTS. +Furthermore, geometry changes occur in the widget resize method. + +The default is nil. This probably gives correct behavior regardless of the +window manager used. +This variable is deprecated and will be removed. +*/ ); +} void reinit_console_type_create_x (void) Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.166 diff -u -r1.166 emacs.c --- src/emacs.c 25 Apr 2006 14:02:08 -0000 1.166 +++ src/emacs.c 6 May 2006 17:26:01 -0000 @@ -2186,6 +2186,7 @@ #ifdef HAVE_BALLOON_HELP vars_of_balloon_x (); #endif + vars_of_console_x (); vars_of_device_x (); #ifdef HAVE_X_DIALOGS vars_of_dialog_x (); Index: src/frame-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v retrieving revision 1.72 diff -u -r1.72 frame-x.c --- src/frame-x.c 26 Nov 2005 11:46:08 -0000 1.72 +++ src/frame-x.c 6 May 2006 17:26:01 -0000 @@ -507,6 +507,7 @@ defi(Qtop, XtNy); #undef def +#undef defi } static Lisp_Object @@ -2307,6 +2308,17 @@ x_set_frame_size (struct frame *f, int cols, int rows) { EmacsFrameSetCharSize (FRAME_X_TEXT_WIDGET (f), cols, rows); + + if (!wedge_metacity) /* cf. EmacsFrameResize */ + { + /* Kick the manager so that it knows we've changed size. */ + XtWidgetGeometry req, repl; + req.request_mode = 0; + XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); + EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), + repl.width, repl.height); + } + #if 0 /* this is not correct. x_set_frame_size() is called from Fset_frame_size(), which may or may not have been called Index: src/symsinit.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v retrieving revision 1.57 diff -u -r1.57 symsinit.h --- src/symsinit.h 25 Apr 2006 14:02:09 -0000 1.57 +++ src/symsinit.h 6 May 2006 17:26:01 -0000 @@ -306,6 +306,7 @@ void vars_of_console_stream (void); void vars_of_console_mswindows (void); void vars_of_console_tty (void); +void vars_of_console_x (void); void vars_of_data (void); void vars_of_database (void); void vars_of_debug (void); Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xemacs.spec 23 Apr 2006 18:05:29 -0000 1.24 +++ xemacs.spec 7 May 2006 20:36:57 -0000 1.25 @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -42,6 +42,7 @@ Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch +Patch7: %{name}-21.5.26-maximize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -182,6 +183,7 @@ %endif %patch5 -p1 %patch6 -p1 +%patch7 -p0 for f in man/lispref/mule.texi man/xemacs-faq.texi ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f @@ -491,6 +493,9 @@ %changelog +* Sun May 7 2006 Ville Skytt?? - 21.5.26-5 +- Apply upstream fix for window maximization problems (#111225). + * Sun Apr 23 2006 Ville Skytt?? - 21.5.26-4 - Bring StartupWMClass in desktop entry up to date. - Fix non-MULE build. From fedora-extras-commits at redhat.com Sun May 7 21:09:37 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 7 May 2006 14:09:37 -0700 Subject: rpms/bakery/FC-5 .cvsignore, 1.2, 1.3 bakery.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605072109.k47L9dZE008338@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8316 Modified Files: .cvsignore bakery.spec sources Log Message: Update to 2.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bakery/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Mar 2006 19:13:24 -0000 1.2 +++ .cvsignore 7 May 2006 21:09:37 -0000 1.3 @@ -1 +1 @@ -bakery-2.3.17.tar.bz2 +bakery-2.4.0.tar.bz2 Index: bakery.spec =================================================================== RCS file: /cvs/extras/rpms/bakery/FC-5/bakery.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bakery.spec 5 Mar 2006 19:13:24 -0000 1.1 +++ bakery.spec 7 May 2006 21:09:37 -0000 1.2 @@ -1,5 +1,5 @@ -%define major_version 2.3 -%define minor_version 17 +%define major_version 2.4 +%define minor_version 0 %define api_version 2.4 Name: bakery @@ -13,7 +13,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/bakery/%{major_version}/bakery-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtkmm24-devel >= 2.6.0 +BuildRequires: gtkmm24-devel >= 2.8.0 BuildRequires: gconfmm26-devel >= 2.6.0 BuildRequires: libglademm24-devel >= 2.4.0 BuildRequires: libxml++-devel >= 2.8.0 @@ -90,6 +90,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun May 7 2006 Denis Leroy - 2.4.0-1 +- Update to 2.4.0 + * Sat Mar 4 2006 Denis Leroy - 2.3.17-1 - Update to 2.3.17 - Added gettext and graphviz BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bakery/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Mar 2006 19:13:24 -0000 1.2 +++ sources 7 May 2006 21:09:37 -0000 1.3 @@ -1 +1 @@ -d1e78b0f520c125b21340ac73dc6aaab bakery-2.3.17.tar.bz2 +d5ec6dfe1c9e6cf98e245ed93dc284d9 bakery-2.4.0.tar.bz2 From fedora-extras-commits at redhat.com Sun May 7 21:14:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:01 -0700 Subject: rpms/perl-Module-ScanDeps - New directory Message-ID: <200605072114.k47LE3Bp008775@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8744/perl-Module-ScanDeps Log Message: Directory /cvs/extras/rpms/perl-Module-ScanDeps added to the repository From fedora-extras-commits at redhat.com Sun May 7 21:14:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:02 -0700 Subject: rpms/perl-Module-ScanDeps/devel - New directory Message-ID: <200605072114.k47LE4vS008778@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8744/perl-Module-ScanDeps/devel Log Message: Directory /cvs/extras/rpms/perl-Module-ScanDeps/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 21:14:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:18 -0700 Subject: rpms/perl-Module-ScanDeps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605072114.k47LEKje008842@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8810 Added Files: Makefile import.log Log Message: Setup of module perl-Module-ScanDeps --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-ScanDeps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 21:14:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:19 -0700 Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605072114.k47LELa8008845@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8810/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-ScanDeps --- NEW 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 May 7 21:14:51 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:51 -0700 Subject: rpms/perl-Module-ScanDeps import.log,1.1,1.2 Message-ID: <200605072115.k47LFNar008987@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918 Modified Files: import.log Log Message: auto-import perl-Module-ScanDeps-0.59-1 on branch devel from perl-Module-ScanDeps-0.59-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 21:14:18 -0000 1.1 +++ import.log 7 May 2006 21:14:51 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-ScanDeps-0_59-1:HEAD:perl-Module-ScanDeps-0.59-1.src.rpm:1147036482 From fedora-extras-commits at redhat.com Sun May 7 21:14:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:52 -0700 Subject: rpms/perl-Module-ScanDeps/devel perl-Module-ScanDeps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605072115.k47LFOjK008993@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918/devel Modified Files: .cvsignore sources Added Files: perl-Module-ScanDeps.spec Log Message: auto-import perl-Module-ScanDeps-0.59-1 on branch devel from perl-Module-ScanDeps-0.59-1.src.rpm --- NEW FILE perl-Module-ScanDeps.spec --- Name: perl-Module-ScanDeps Version: 0.59 Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-ScanDeps/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-ScanDeps-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description An application of Module::ScanDeps is to generate executables from scripts that contains necessary modules; this module supports two such projects, PAR and App::Packer. Please see their respective documentations on CPAN for further information. %prep %setup -q -n Module-ScanDeps-%{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 AUTHORS Changes README %{_bindir}/* %{perl_vendorlib}/Module/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3pm* %changelog * Wed May 3 2006 Jose Pedro Oliveira - 0.59-1 - Update to 0.59. * Thu Mar 16 2006 Jose Pedro Oliveira - 0.57-1 - Update to 0.57. * Tue Feb 28 2006 Jose Pedro Oliveira - 0.56-1 - Update to 0.56. * Tue Jan 10 2006 Jose Pedro Oliveira - 0.53-1 - Update to 0.53. * Fri Sep 9 2005 Jose Pedro Oliveira - 0.51-1 - Update to Fedora Extras Template. * Sat Jan 08 2005 Jose Pedro Oliveira - 0:0.51-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 21:14:18 -0000 1.1 +++ .cvsignore 7 May 2006 21:14:51 -0000 1.2 @@ -0,0 +1 @@ +Module-ScanDeps-0.59.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 21:14:18 -0000 1.1 +++ sources 7 May 2006 21:14:51 -0000 1.2 @@ -0,0 +1 @@ +6e20e368ff101d8bc8f31eaa2d81c264 Module-ScanDeps-0.59.tar.gz From fedora-extras-commits at redhat.com Sun May 7 21:22:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:22:12 -0700 Subject: owners owners.list,1.954,1.955 Message-ID: <200605072122.k47LMErQ009168@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9151 Modified Files: owners.list Log Message: New package: perl-Module-ScanDeps (#190582) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.954 retrieving revision 1.955 diff -u -r1.954 -r1.955 --- owners.list 7 May 2006 17:47:05 -0000 1.954 +++ owners.list 7 May 2006 21:22:11 -0000 1.955 @@ -1103,6 +1103,7 @@ Fedora Extras|perl-Module-Locate|Locate modules in the same fashion as "require" and "use"|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Module-ScanDeps|Recursively scan Perl code for dependencies|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 7 21:25:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:25:39 -0700 Subject: rpms/perl-Module-ScanDeps/devel perl-Module-ScanDeps.spec,1.1,1.2 Message-ID: <200605072125.k47LPfnd009213@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9196 Modified Files: perl-Module-ScanDeps.spec Log Message: Source URL corrected (failed to detect the maintainer change). Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Module-ScanDeps.spec 7 May 2006 21:14:51 -0000 1.1 +++ perl-Module-ScanDeps.spec 7 May 2006 21:25:39 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-Module-ScanDeps Version: 0.59 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-ScanDeps/ -Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-ScanDeps-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/Module-ScanDeps-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -54,6 +54,9 @@ %changelog +* Sun May 7 2006 Jose Pedro Oliveira - 0.59-2 +- Source URL corrected (failed to detect the maintainer change). + * Wed May 3 2006 Jose Pedro Oliveira - 0.59-1 - Update to 0.59. From fedora-extras-commits at redhat.com Sun May 7 22:04:53 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:04:53 -0700 Subject: owners owners.list,1.955,1.956 Message-ID: <200605072204.k47M4tgf011712@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11695 Modified Files: owners.list Log Message: taking on lua Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.955 retrieving revision 1.956 diff -u -r1.955 -r1.956 --- owners.list 7 May 2006 21:22:11 -0000 1.955 +++ owners.list 7 May 2006 22:04:53 -0000 1.956 @@ -715,7 +715,7 @@ Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lrmi|Library for calling real mode BIOS routines|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|fedora at soeterbroek.com|extras-qa at fedoraproject.org| -Fedora Extras|lua|A powerful light-weight programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|lua|A powerful light-weight programming language|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 22:26:23 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:26:23 -0700 Subject: rpms/lua/devel .cvsignore, 1.2, 1.3 lua.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605072226.k47MQP5v011794@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11770 Modified Files: .cvsignore lua.spec sources Log Message: version bump and rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:49 -0000 1.2 +++ .cvsignore 7 May 2006 22:26:23 -0000 1.3 @@ -1 +1 @@ -lua-5.0.tar.gz +lua-5.1.tar.gz Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lua.spec 16 Oct 2005 18:00:53 -0000 1.11 +++ lua.spec 7 May 2006 22:26:23 -0000 1.12 @@ -1,6 +1,6 @@ Name: lua -Version: 5.0.2 -Release: 5%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -36,28 +36,22 @@ NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ %endif USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" + EXTRA_LIBS="-lm -lreadline -lncurses" \ + linux %install -rm -rf $RPM_BUILD_ROOT -%makeinstall \ - STRIP=/bin/true \ - INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} \ - INSTALL_BIN=$RPM_BUILD_ROOT%{_bindir} \ - INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \ - INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} \ - INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \ - INSTALL_EXEC="install -pm 755" \ - INSTALL_DATA="install -pm 644" - +rm -rf %{buildroot} +make install \ + INSTALL_TOP=%{buildroot}/usr \ + INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -65,11 +59,15 @@ %doc COPYRIGHT HISTORY README doc/*.html doc/*.gif %{_bindir}/lua* %{_includedir}/l*.h +%{_includedir}/l*.hpp %{_libdir}/liblua*.a %{_mandir}/man1/lua*.1* %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-1 +- version bump + * Sun Oct 16 2005 Ville Skytt?? - 5.0.2-5 - Fix -debuginfo (#165304). - Cosmetic specfile improvements. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 23:37:12 -0000 1.3 +++ sources 7 May 2006 22:26:23 -0000 1.4 @@ -1 +1 @@ -dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz +3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz From fedora-extras-commits at redhat.com Sun May 7 22:26:41 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:26:41 -0700 Subject: rpms/lua/FC-5 .cvsignore, 1.2, 1.3 lua.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605072226.k47MQha4011821@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11800 Modified Files: .cvsignore lua.spec sources Log Message: version bump and rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:49 -0000 1.2 +++ .cvsignore 7 May 2006 22:26:41 -0000 1.3 @@ -1 +1 @@ -lua-5.0.tar.gz +lua-5.1.tar.gz Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lua.spec 16 Oct 2005 18:00:53 -0000 1.11 +++ lua.spec 7 May 2006 22:26:41 -0000 1.12 @@ -1,6 +1,6 @@ Name: lua -Version: 5.0.2 -Release: 5%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -36,28 +36,22 @@ NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ %endif USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" + EXTRA_LIBS="-lm -lreadline -lncurses" \ + linux %install -rm -rf $RPM_BUILD_ROOT -%makeinstall \ - STRIP=/bin/true \ - INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} \ - INSTALL_BIN=$RPM_BUILD_ROOT%{_bindir} \ - INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \ - INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} \ - INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \ - INSTALL_EXEC="install -pm 755" \ - INSTALL_DATA="install -pm 644" - +rm -rf %{buildroot} +make install \ + INSTALL_TOP=%{buildroot}/usr \ + INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -65,11 +59,15 @@ %doc COPYRIGHT HISTORY README doc/*.html doc/*.gif %{_bindir}/lua* %{_includedir}/l*.h +%{_includedir}/l*.hpp %{_libdir}/liblua*.a %{_mandir}/man1/lua*.1* %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-1 +- version bump + * Sun Oct 16 2005 Ville Skytt?? - 5.0.2-5 - Fix -debuginfo (#165304). - Cosmetic specfile improvements. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 23:37:12 -0000 1.3 +++ sources 7 May 2006 22:26:41 -0000 1.4 @@ -1 +1 @@ -dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz +3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz From fedora-extras-commits at redhat.com Sun May 7 22:27:00 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:27:00 -0700 Subject: rpms/lua/FC-4 .cvsignore, 1.2, 1.3 lua.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605072227.k47MR2lt011848@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11827 Modified Files: .cvsignore lua.spec sources Log Message: version bump and rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:49 -0000 1.2 +++ .cvsignore 7 May 2006 22:26:59 -0000 1.3 @@ -1 +1 @@ -lua-5.0.tar.gz +lua-5.1.tar.gz Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/lua.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lua.spec 16 Oct 2005 18:00:53 -0000 1.11 +++ lua.spec 7 May 2006 22:26:59 -0000 1.12 @@ -1,6 +1,6 @@ Name: lua -Version: 5.0.2 -Release: 5%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -36,28 +36,22 @@ NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ %endif USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" + EXTRA_LIBS="-lm -lreadline -lncurses" \ + linux %install -rm -rf $RPM_BUILD_ROOT -%makeinstall \ - STRIP=/bin/true \ - INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} \ - INSTALL_BIN=$RPM_BUILD_ROOT%{_bindir} \ - INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \ - INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} \ - INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \ - INSTALL_EXEC="install -pm 755" \ - INSTALL_DATA="install -pm 644" - +rm -rf %{buildroot} +make install \ + INSTALL_TOP=%{buildroot}/usr \ + INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -65,11 +59,15 @@ %doc COPYRIGHT HISTORY README doc/*.html doc/*.gif %{_bindir}/lua* %{_includedir}/l*.h +%{_includedir}/l*.hpp %{_libdir}/liblua*.a %{_mandir}/man1/lua*.1* %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-1 +- version bump + * Sun Oct 16 2005 Ville Skytt?? - 5.0.2-5 - Fix -debuginfo (#165304). - Cosmetic specfile improvements. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 23:37:12 -0000 1.3 +++ sources 7 May 2006 22:26:59 -0000 1.4 @@ -1 +1 @@ -dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz +3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz From fedora-extras-commits at redhat.com Sun May 7 22:52:03 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:52:03 -0700 Subject: rpms/lua/FC-4 lua.spec,1.12,1.13 Message-ID: <200605072252.k47Mq5Td012129@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12082/FC-4 Modified Files: lua.spec Log Message: fixed x86_64 builds Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/lua.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lua.spec 7 May 2006 22:26:59 -0000 1.12 +++ lua.spec 7 May 2006 22:52:03 -0000 1.13 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -44,6 +44,7 @@ rm -rf %{buildroot} make install \ INSTALL_TOP=%{buildroot}/usr \ + INSTALL_LIB=%{buildroot}/%{_libdir} \ INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check @@ -65,6 +66,9 @@ %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-2 +- fixed x86_64 builds + * Mon May 08 2006 Michael J. Knox - 5.1-1 - version bump From fedora-extras-commits at redhat.com Sun May 7 22:52:04 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:52:04 -0700 Subject: rpms/lua/FC-5 lua.spec,1.12,1.13 Message-ID: <200605072252.k47Mq6ur012133@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12082/FC-5 Modified Files: lua.spec Log Message: fixed x86_64 builds Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lua.spec 7 May 2006 22:26:41 -0000 1.12 +++ lua.spec 7 May 2006 22:52:04 -0000 1.13 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -44,6 +44,7 @@ rm -rf %{buildroot} make install \ INSTALL_TOP=%{buildroot}/usr \ + INSTALL_LIB=%{buildroot}/%{_libdir} \ INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check @@ -65,6 +66,9 @@ %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-2 +- fixed x86_64 builds + * Mon May 08 2006 Michael J. Knox - 5.1-1 - version bump From fedora-extras-commits at redhat.com Sun May 7 22:52:05 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:52:05 -0700 Subject: rpms/lua/devel lua.spec,1.12,1.13 Message-ID: <200605072252.k47Mq7di012137@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12082/devel Modified Files: lua.spec Log Message: fixed x86_64 builds Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lua.spec 7 May 2006 22:26:23 -0000 1.12 +++ lua.spec 7 May 2006 22:52:05 -0000 1.13 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -44,6 +44,7 @@ rm -rf %{buildroot} make install \ INSTALL_TOP=%{buildroot}/usr \ + INSTALL_LIB=%{buildroot}/%{_libdir} \ INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check @@ -65,6 +66,9 @@ %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-2 +- fixed x86_64 builds + * Mon May 08 2006 Michael J. Knox - 5.1-1 - version bump From fedora-extras-commits at redhat.com Sun May 7 23:06:45 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 7 May 2006 16:06:45 -0700 Subject: rpms/bakery/devel .cvsignore, 1.2, 1.3 bakery.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605072306.k47N6l2T014543@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14522 Modified Files: .cvsignore bakery.spec sources Log Message: Update to 2.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Mar 2006 19:13:24 -0000 1.2 +++ .cvsignore 7 May 2006 23:06:45 -0000 1.3 @@ -1 +1 @@ -bakery-2.3.17.tar.bz2 +bakery-2.4.0.tar.bz2 Index: bakery.spec =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/bakery.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bakery.spec 5 Mar 2006 19:13:24 -0000 1.1 +++ bakery.spec 7 May 2006 23:06:45 -0000 1.2 @@ -1,5 +1,5 @@ -%define major_version 2.3 -%define minor_version 17 +%define major_version 2.4 +%define minor_version 0 %define api_version 2.4 Name: bakery @@ -13,7 +13,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/bakery/%{major_version}/bakery-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtkmm24-devel >= 2.6.0 +BuildRequires: gtkmm24-devel >= 2.8.0 BuildRequires: gconfmm26-devel >= 2.6.0 BuildRequires: libglademm24-devel >= 2.4.0 BuildRequires: libxml++-devel >= 2.8.0 @@ -90,6 +90,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun May 7 2006 Denis Leroy - 2.4.0-1 +- Update to 2.4.0 + * Sat Mar 4 2006 Denis Leroy - 2.3.17-1 - Update to 2.3.17 - Added gettext and graphviz BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Mar 2006 19:13:24 -0000 1.2 +++ sources 7 May 2006 23:06:45 -0000 1.3 @@ -1 +1 @@ -d1e78b0f520c125b21340ac73dc6aaab bakery-2.3.17.tar.bz2 +d5ec6dfe1c9e6cf98e245ed93dc284d9 bakery-2.4.0.tar.bz2 From fedora-extras-commits at redhat.com Sun May 7 23:40:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 16:40:35 -0700 Subject: rpms/awstats/FC-5 awstats-6.5-CVE-2006-1945.patch, NONE, 1.1 awstats.README.SELinux, NONE, 1.1 .cvsignore, 1.6, 1.7 awstats.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <200605072340.k47NebjP014867@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14808/FC-5 Modified Files: .cvsignore awstats.spec sources Added Files: awstats-6.5-CVE-2006-1945.patch awstats.README.SELinux Log Message: revert to version 6.5 (build failed for FC-4 and 5 anyway) and backport the fix for the vulnerability awstats-6.5-CVE-2006-1945.patch: --- NEW FILE awstats-6.5-CVE-2006-1945.patch --- diff -u -r1.860 -r1.861 --- wwwroot/cgi-bin/awstats.pl 9 Jan 2006 18:51:06 -0000 1.860 +++ wwwroot/cgi-bin/awstats.pl 22 Jan 2006 12:55:14 -0000 1.861 @@ -5542,7 +5542,7 @@ # No update but report by default when run from a browser $UpdateStats=($QueryString=~/update=1/i?1:0); - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } @@ -5591,7 +5591,7 @@ # Update with no report by default when run from command line $UpdateStats=1; - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig="$1"; } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } --- NEW FILE awstats.README.SELinux --- ========================== SELinux support in AWStats ========================== What is the problem ? --------------------- AWStats is a CGI script, and needs to be labelled correctly to be called from Apache. The files in ``/usr/share/awstats/wwwroot/cgi-bin`` need to have the ``httpd_sys_script_exec_t`` type, and the databases files in ``/var/lib/awstats`` need to have the ``httpd_sys_script_rw_t`` type. How do we solve it ? -------------------- You can change the type with the ``chcon`` command:: chcon -R -t httpd_sys_script_exec_t /usr/share/awstats/wwwroot/cgi-bin chcon -R -t httpd_sys_script_rw_t /var/lib/awstats But these modifications will be lost if the system is relabeled (you can request a relabel with the system-config-security tool). To make these changes permanent, this package sets the contexts by running the following commands:: semanage fcontext -a -t httpd_sys_script_exec_t \ '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' Please send your bug reports (if any ;) ) to https://bugzilla.redhat.com Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 May 2006 08:17:09 -0000 1.6 +++ .cvsignore 7 May 2006 23:40:34 -0000 1.7 @@ -1 +1 @@ -awstats-6.6.tar.gz +awstats-6.5.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- awstats.spec 7 May 2006 08:17:09 -0000 1.12 +++ awstats.spec 7 May 2006 23:40:34 -0000 1.13 @@ -1,13 +1,14 @@ Name: awstats -Version: 6.6 -Release: 0.1.beta%{?dist} +Version: 6.5 +Release: 4%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz -Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz +Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz +#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz Source1: awstats.README.SELinux +Patch0: awstats-6.5-CVE-2006-1945.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd @@ -34,6 +35,8 @@ %prep %setup -q +# no backup or the orig file will be installed +%patch0 -p0 # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* # Fix some bad file permissions here for convenience. @@ -49,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT ### Create cron job -%{__cat} <awstats.cron +cat <awstats.cron #!/bin/bash if [ -f %{_localstatedir}/log/httpd/access_log ] ; then @@ -173,8 +176,8 @@ %changelog -* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta -- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) +* Mon May 08 2006 Aurelien Bompard 6.5-4 +- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923) * Sun Apr 09 2006 Aurelien Bompard 6.5-3 - SELinux support: use semanage to label the cgi and the database files Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 May 2006 08:17:09 -0000 1.9 +++ sources 7 May 2006 23:40:34 -0000 1.10 @@ -1 +1 @@ -c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz +aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz From fedora-extras-commits at redhat.com Sun May 7 23:40:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 16:40:35 -0700 Subject: rpms/awstats/devel awstats.spec,1.13,1.14 Message-ID: <200605072340.k47NebZE014871@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14808/devel Modified Files: awstats.spec Log Message: revert to version 6.5 (build failed for FC-4 and 5 anyway) and backport the fix for the vulnerability Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- awstats.spec 7 May 2006 08:17:10 -0000 1.13 +++ awstats.spec 7 May 2006 23:40:35 -0000 1.14 @@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT ### Create cron job -%{__cat} <awstats.cron +cat <awstats.cron #!/bin/bash if [ -f %{_localstatedir}/log/httpd/access_log ] ; then From fedora-extras-commits at redhat.com Sun May 7 23:40:34 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 16:40:34 -0700 Subject: rpms/awstats/FC-4 awstats-6.5-CVE-2006-1945.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 awstats.spec, 1.10, 1.11 sources, 1.9, 1.10 Message-ID: <200605072341.k47Nf6Iv014876@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14808/FC-4 Modified Files: .cvsignore awstats.spec sources Added Files: awstats-6.5-CVE-2006-1945.patch Log Message: revert to version 6.5 (build failed for FC-4 and 5 anyway) and backport the fix for the vulnerability awstats-6.5-CVE-2006-1945.patch: --- NEW FILE awstats-6.5-CVE-2006-1945.patch --- diff -u -r1.860 -r1.861 --- wwwroot/cgi-bin/awstats.pl 9 Jan 2006 18:51:06 -0000 1.860 +++ wwwroot/cgi-bin/awstats.pl 22 Jan 2006 12:55:14 -0000 1.861 @@ -5542,7 +5542,7 @@ # No update but report by default when run from a browser $UpdateStats=($QueryString=~/update=1/i?1:0); - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } @@ -5591,7 +5591,7 @@ # Update with no report by default when run from command line $UpdateStats=1; - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig="$1"; } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 May 2006 08:17:08 -0000 1.6 +++ .cvsignore 7 May 2006 23:40:34 -0000 1.7 @@ -1 +1 @@ -awstats-6.6.tar.gz +awstats-6.5.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- awstats.spec 7 May 2006 08:17:08 -0000 1.10 +++ awstats.spec 7 May 2006 23:40:34 -0000 1.11 @@ -1,19 +1,19 @@ Name: awstats -Version: 6.6 -Release: 0.1.beta%{?dist} +Version: 6.5 +Release: 1%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz -Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz -Source1: awstats.README.SELinux +Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz +#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz +Patch0: awstats-6.5-CVE-2006-1945.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd Requires: perl -Requires(post): perl, policycoreutils -Requires(postun): /sbin/service, policycoreutils +Requires(post): perl +Requires(postun): /sbin/service %description Advanced Web Statistics is a powerful and featureful tool that generates @@ -31,19 +31,20 @@ With the default configuration, the statistics are available: http://localhost/awstats/awstats.pl - %prep %setup -q +# no backup or the orig file will be installed +%patch0 -p0 + # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* + # Fix some bad file permissions here for convenience. chmod -x tools/httpd_conf find tools/xslt -type f | xargs chmod -x + # Remove \r in conf file (file written on MS Windows) perl -pi -e 's/\r//g' tools/httpd_conf -# SELinux README -cp -a %{SOURCE1} README.SELinux - %install rm -rf $RPM_BUILD_ROOT @@ -81,7 +82,7 @@ ### Commit permanent changes to default configuration install -p -m 644 wwwroot/cgi-bin/awstats.model.conf \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf -perl -pi -e ' +%{__perl} -pi -e ' s|^LogFile=.*$|LogFile="%{_localstatedir}/log/httpd/access_log"|; s|^DirData=.*$|DirData="%{_localstatedir}/lib/awstats"|; s|^DirCgi=.*$|DirCgi="/awstats"|; @@ -92,17 +93,16 @@ s|^SaveDatabaseFilesWithPermissionsForEveryone=.*$|SaveDatabaseFilesWithPermissionsForEveryone=0|; s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|; s|^Expires=.*$|Expires=3600|; - ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf + ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf # Fix scripts -perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ +%{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf} # Apache configuration install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf -perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \ - $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf +%{__perl} -pi -e 's|/usr/local|%{_datadir}|g' $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf echo "# Additional Perl modules SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins @@ -115,7 +115,6 @@ %clean rm -rf $RPM_BUILD_ROOT - %post if [ $1 -eq 1 ]; then if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then @@ -125,27 +124,11 @@ ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || : fi fi -### SELinux support ### -# Set SELinux file_context -semanage fcontext -a -t httpd_sys_script_exec_t \ - '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : -# Actually change the context -chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || : -chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || : - %postun if [ $1 -ne 0 ]; then /sbin/service httpd condrestart >/dev/null 2>&1 fi -# SELinux support -if [ $1 -eq 0 ]; then - semanage fcontext -d -t httpd_sys_script_exec_t \ - '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : - semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : -fi - %files @@ -161,7 +144,7 @@ %{_datadir}/%{name}/wwwroot/cgi-bin # Different defattr to fix lots of files which should not be +x. %defattr(644,root,root,755) -%doc README.TXT docs/* README.SELinux +%doc README.TXT docs/* %{_datadir}/%{name}/lang %{_datadir}/%{name}/lib %{_datadir}/%{name}/plugins @@ -170,19 +153,7 @@ %{_datadir}/%{name}/wwwroot/icon %{_datadir}/%{name}/wwwroot/js - - %changelog -* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta -- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) - -* Sun Apr 09 2006 Aurelien Bompard 6.5-3 -- SELinux support: use semanage to label the cgi and the database files -- Only allow access from localhost by default (this app has a security history) - -* Thu Feb 23 2006 Aurelien Bompard 6.5-2 -- rebuild for FC5 - * Wed Jan 11 2006 Aurelien Bompard 6.5-1 - version 6.5 final Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 May 2006 08:17:08 -0000 1.9 +++ sources 7 May 2006 23:40:34 -0000 1.10 @@ -1 +1 @@ -c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz +aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz From fedora-extras-commits at redhat.com Sun May 7 23:49:31 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 16:49:31 -0700 Subject: rpms/nsd/FC-4 .cvsignore,1.3,1.4 Message-ID: <200605072349.k47NnXNI015026@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15005 Modified Files: .cvsignore Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 19:21:27 -0000 1.3 +++ .cvsignore 7 May 2006 23:49:31 -0000 1.4 @@ -1,2 +1 @@ -nsd-2.3.3.tar.gz nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 23:49:26 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 16:49:26 -0700 Subject: rpms/awstats/FC-4 awstats.spec,1.11,1.12 Message-ID: <200605072349.k47NnS4P015007@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14988 Modified Files: awstats.spec Log Message: bump release Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- awstats.spec 7 May 2006 23:40:34 -0000 1.11 +++ awstats.spec 7 May 2006 23:49:26 -0000 1.12 @@ -1,6 +1,6 @@ Name: awstats Version: 6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -154,6 +154,9 @@ %{_datadir}/%{name}/wwwroot/js %changelog +* Mon May 08 2006 Aurelien Bompard 6.5-2 +- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923) + * Wed Jan 11 2006 Aurelien Bompard 6.5-1 - version 6.5 final From fedora-extras-commits at redhat.com Sun May 7 23:53:35 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 7 May 2006 16:53:35 -0700 Subject: owners owners.list,1.956,1.957 Message-ID: <200605072353.k47Nrb4A015119@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15102 Modified Files: owners.list Log Message: Add raptor. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.956 retrieving revision 1.957 diff -u -r1.956 -r1.957 --- owners.list 7 May 2006 22:04:53 -0000 1.956 +++ owners.list 7 May 2006 23:53:35 -0000 1.957 @@ -1371,6 +1371,7 @@ Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|rapidsvn|Graphical interface for the Subversion revision control system|rpm at timj.co.uk|extras-qa at fedoraproject.org| +Fedora Extras|raptor|Raptor RDF Parser Toolkit for Redland|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 23:59:04 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sun, 7 May 2006 16:59:04 -0700 Subject: fedora-security/audit fe4,1.6,1.7 fe5,1.6,1.7 Message-ID: <200605072359.k47Nx4EC015186@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15164 Modified Files: fe4 fe5 Log Message: Note awstats fixes. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fe4 6 May 2006 17:31:44 -0000 1.6 +++ fe4 7 May 2006 23:59:01 -0000 1.7 @@ -7,4 +7,4 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-1989 version (clamav, fixed 0.88.2) -CVE-2006-1945 VULNERABLE (awstats) bz#190921 +CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fe5 6 May 2006 17:31:44 -0000 1.6 +++ fe5 7 May 2006 23:59:01 -0000 1.7 @@ -7,4 +7,4 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-1989 version (clamav, fixed 0.88.2) -CVE-2006-1945 VULNERABLE (awstats) bz#190922 +CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch From fedora-extras-commits at redhat.com Mon May 8 00:04:55 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sun, 7 May 2006 17:04:55 -0700 Subject: fedora-security/audit fe4,1.7,1.8 fe5,1.7,1.8 Message-ID: <200605080004.k4804twS017417@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17397 Modified Files: fe4 fe5 Log Message: Another awstats fix. Fix a typo in fe5 awstats version. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fe4 7 May 2006 23:59:01 -0000 1.7 +++ fe4 8 May 2006 00:04:52 -0000 1.8 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-NOID VULNERABLE (awstats) bz#190924 +CVE-NOID backport (awstats, fixed 6.5-2) bz#190923 awstats-6.5-CVE-2006-1945.patch CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fe5 7 May 2006 23:59:01 -0000 1.7 +++ fe5 8 May 2006 00:04:52 -0000 1.8 @@ -2,9 +2,9 @@ ** are items that need attention -CVE-NOID VULNERABLE (awstats) bz#190923 +CVE-NOID backport (awstats, fixed 6.5-4) bz#190923 awstats-6.5-CVE-2006-1945.patch CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-1989 version (clamav, fixed 0.88.2) -CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch +CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch From fedora-extras-commits at redhat.com Mon May 8 00:07:47 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:07:47 -0700 Subject: rpms/nsd/FC-4 nsd.spec,1.7,1.8 Message-ID: <200605080007.k4807nfD017443@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17426 Modified Files: nsd.spec Log Message: bump Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsd.spec 7 May 2006 19:19:07 -0000 1.7 +++ nsd.spec 8 May 2006 00:07:47 -0000 1.8 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz @@ -76,11 +76,12 @@ fi %changelog -* Sun May 7 2006 Paul Wouters - 2.3.4-3 +* Sun May 7 2006 Paul Wouters - 2.3.4-4 - Upgraded to nsd-2.3.4. - Removed manual install targets because DESTDIR is now supported - Re-enabled --checking, checking patch no longer needed and removed. - Work around in nsd.init for nsd failing to start when there is no ipv6 +- Various release bumps due to 'make tag' failures :( * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Mon May 8 00:12:01 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 7 May 2006 17:12:01 -0700 Subject: owners owners.list,1.957,1.958 Message-ID: <200605080012.k480C3hd017518@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17501 Modified Files: owners.list Log Message: own mtd-utils and unifdef Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.957 retrieving revision 1.958 diff -u -r1.957 -r1.958 --- owners.list 7 May 2006 23:53:35 -0000 1.957 +++ owners.list 8 May 2006 00:12:01 -0000 1.958 @@ -772,6 +772,7 @@ 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|mtd-utils|Utilities for dealing with MTD (flash) devices|dwmw2 at redhat.com|extras-qa at fedoraproject.org|jwboyer at jdub.homelinux.org Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org| Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org| @@ -1579,6 +1580,7 @@ Fedora Extras|uim|A multilingual input method library|tagoh at redhat.com|extras-qa at fedoraproject.org|petersen at redhat.com Fedora Extras|ularn|Roguelike game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|ulogd|The userspace logging daemon for netfilter|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|unifdef|Unifdef tool for removing ifdef'd lines|dwmw2 at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|unison|File synchronization tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|unshield|Install InstallShield applications on a Pocket PC|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 00:24:38 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:24:38 -0700 Subject: rpms/nsd/FC-3 nsd.spec,1.6,1.7 Message-ID: <200605080024.k480OeNd017568@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17551 Modified Files: nsd.spec Log Message: bump Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsd.spec 7 May 2006 19:19:30 -0000 1.6 +++ nsd.spec 8 May 2006 00:24:38 -0000 1.7 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz @@ -76,11 +76,12 @@ fi %changelog -* Sun May 7 2006 Paul Wouters - 2.3.4-3 +* Sun May 7 2006 Paul Wouters - 2.3.4-4 - Upgraded to nsd-2.3.4. - Removed manual install targets because DESTDIR is now supported - Re-enabled --checking, checking patch no longer needed and removed. - Work around in nsd.init for nsd failing to start when there is no ipv6 +- Various release bumps due to 'make tag' failures :( * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Mon May 8 00:25:45 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:25:45 -0700 Subject: rpms/nsd/FC-3 sources,1.3,1.4 Message-ID: <200605080025.k480Pl5u017599@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17582 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 May 2006 19:21:51 -0000 1.3 +++ sources 8 May 2006 00:25:45 -0000 1.4 @@ -1,2 +1 @@ -7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz 72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Mon May 8 00:26:20 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:26:20 -0700 Subject: rpms/nsd/FC-3 .cvsignore,1.3,1.4 Message-ID: <200605080026.k480QMR2017651@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17634 Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 19:21:51 -0000 1.3 +++ .cvsignore 8 May 2006 00:26:20 -0000 1.4 @@ -1,2 +1 @@ -nsd-2.3.3.tar.gz nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Mon May 8 00:27:06 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:27:06 -0700 Subject: rpms/nsd/FC-3 nsd.spec,1.7,1.8 Message-ID: <200605080027.k480R8GK017704@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17687 Modified Files: nsd.spec Log Message: bump cause of cvsignore causing make tag to fail Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsd.spec 8 May 2006 00:24:38 -0000 1.7 +++ nsd.spec 8 May 2006 00:27:06 -0000 1.8 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Mon May 8 00:55:56 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 7 May 2006 17:55:56 -0700 Subject: rpms/glibmm24/devel .cvsignore, 1.8, 1.9 glibmm.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200605080055.k480twnT017940@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17919 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to 2.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 23 Mar 2006 02:36:22 -0000 1.8 +++ .cvsignore 8 May 2006 00:55:56 -0000 1.9 @@ -1 +1 @@ -glibmm-2.10.0.tar.bz2 +glibmm-2.10.1.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- glibmm.spec 23 Mar 2006 02:36:22 -0000 1.11 +++ glibmm.spec 8 May 2006 00:55:56 -0000 1.12 @@ -1,12 +1,12 @@ Name: glibmm24 -Version: 2.10.0 +Version: 2.10.1 Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.10/glibmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -77,6 +77,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Sun May 7 2006 Denis Leroy - 2.10.1-1 +- Update to 2.10.1 + * Mon Mar 20 2006 Denis Leroy - 2.10.0-1 - Update to 2.10.0, requires newer glib Index: sources =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 Mar 2006 02:36:22 -0000 1.9 +++ sources 8 May 2006 00:55:56 -0000 1.10 @@ -1 +1 @@ -3024ad2b8f8fd4f512e1f58d087599bb glibmm-2.10.0.tar.bz2 +3af9f4f3dbec200545f1eb21a678706d glibmm-2.10.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 01:01:29 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 7 May 2006 18:01:29 -0700 Subject: rpms/abiword/FC-5 abiword-2.4.4-x86_64.patch, NONE, 1.1 abiword.spec, 1.34, 1.35 Message-ID: <200605080102.k4812128020190@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20120 Modified Files: abiword.spec Added Files: abiword-2.4.4-x86_64.patch Log Message: fix 190591 abiword-2.4.4-x86_64.patch: --- NEW FILE abiword-2.4.4-x86_64.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2005-09-27 00:23:02.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2006-05-08 01:17:00.000000000 +0200 @@ -586,7 +586,7 @@ (!m_bSave ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL) + (gchar*)NULL) ); #endif Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- abiword.spec 12 Apr 2006 23:23:38 -0000 1.34 +++ abiword.spec 8 May 2006 01:01:29 -0000 1.35 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -44,6 +44,7 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.4-docbuild.patch +Patch3: abiword-2.4.4-x86_64.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -54,6 +55,7 @@ %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop %patch2 -p1 -b .docbuild +%patch3 -p1 -b .x86_64 %build cd abi @@ -135,6 +137,9 @@ %{_datadir}/icons/*png %changelog +* Mon May 08 2006 Marc Maurer - 1:2.4.4-3.fc5 +- Fix bug 190591 - crash on x86_64 machines when saving a document + * Wed Apr 12 2006 Marc Maurer - 1:2.4.4-2.fc5 - Fix documentation generation - Fix charting support From fedora-extras-commits at redhat.com Mon May 8 01:11:25 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 7 May 2006 18:11:25 -0700 Subject: rpms/gtkmm24/devel .cvsignore, 1.6, 1.7 gtkmm.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200605080111.k481BRbb020352@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gtkmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331 Modified Files: .cvsignore gtkmm.spec sources Log Message: Update to 2.8.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Feb 2006 22:34:36 -0000 1.6 +++ .cvsignore 8 May 2006 01:11:25 -0000 1.7 @@ -1 +1 @@ -gtkmm-2.8.3.tar.bz2 +gtkmm-2.8.5.tar.bz2 Index: gtkmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkmm.spec 28 Feb 2006 22:34:36 -0000 1.11 +++ gtkmm.spec 8 May 2006 01:11:25 -0000 1.12 @@ -1,5 +1,5 @@ Name: gtkmm24 -Version: 2.8.3 +Version: 2.8.5 Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) @@ -100,6 +100,9 @@ %changelog +* Sun May 7 2006 Denis Leroy - 2.8.5-1 +- Update to 2.8.5 + * Tue Feb 28 2006 Denis Leroy - 2.8.3-1 - Update to version 2.8.3 - Added optional macro to compile static libs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Feb 2006 22:34:36 -0000 1.8 +++ sources 8 May 2006 01:11:25 -0000 1.9 @@ -1 +1 @@ -578dca71e56db17f400abd21ca8e7ce5 gtkmm-2.8.3.tar.bz2 +630040e17bb491228ae22919188abcf2 gtkmm-2.8.5.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 01:23:17 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:23:17 -0700 Subject: rpms/hping2/FC-5 hping2-bytesex.patch, NONE, 1.1 hping2.spec, 1.9, 1.10 hping2-x86_64.patch, 1.1, NONE Message-ID: <200605080123.k481NJ5I020512@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20466 Modified Files: hping2.spec Added Files: hping2-bytesex.patch Removed Files: hping2-x86_64.patch Log Message: merged 64bit patches into one. hping2-bytesex.patch: --- NEW FILE hping2-bytesex.patch --- --- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 +++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 @@ -9,6 +9,8 @@ #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-5/hping2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hping2.spec 2 Mar 2006 21:30:26 -0000 1.9 +++ hping2.spec 8 May 2006 01:23:17 -0000 1.10 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.6.rc3 +Release: 0.7.rc3 Summary: TCP/IP stack auditing and much more Group: Applications/Internet @@ -8,7 +8,7 @@ URL: http://www.hping.org/ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch -Patch1: hping2-x86_64.patch +Patch1: hping2-bytesex.patch Patch2: hping2-getifnamedebug.patch Patch3: hping2-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,16 +21,10 @@ in order to transfer files under supported protocols. %prep -cat< +- Add patch to fix build on IA64 + * Wed Feb 08 2006 Peter Vrabec - rebuilt --- hping2-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 01:23:21 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:23:21 -0700 Subject: rpms/svnmailer - New directory Message-ID: <200605080123.k481NNLn020537@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20516/svnmailer Log Message: Directory /cvs/extras/rpms/svnmailer added to the repository From fedora-extras-commits at redhat.com Mon May 8 01:23:22 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:23:22 -0700 Subject: rpms/svnmailer/devel - New directory Message-ID: <200605080123.k481NOr4020540@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20516/svnmailer/devel Log Message: Directory /cvs/extras/rpms/svnmailer/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 01:23:44 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:23:44 -0700 Subject: rpms/svnmailer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605080123.k481NkNs020594@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20561 Added Files: Makefile import.log Log Message: Setup of module svnmailer --- NEW FILE Makefile --- # Top level Makefile for module svnmailer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 01:23:45 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:23:45 -0700 Subject: rpms/svnmailer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605080123.k481Nlbi020597@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20561/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module svnmailer --- NEW 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 May 8 01:24:42 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:24:42 -0700 Subject: rpms/hping2/devel hping2-bytesex.patch, NONE, 1.1 hping2.spec, 1.9, 1.10 hping2-x86_64.patch, 1.1, NONE Message-ID: <200605080124.k481OiMb020643@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20623 Modified Files: hping2.spec Added Files: hping2-bytesex.patch Removed Files: hping2-x86_64.patch Log Message: merged 64bit patches into one hping2-bytesex.patch: --- NEW FILE hping2-bytesex.patch --- --- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 +++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 @@ -9,6 +9,8 @@ #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hping2.spec 2 Mar 2006 21:30:26 -0000 1.9 +++ hping2.spec 8 May 2006 01:24:42 -0000 1.10 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.6.rc3 +Release: 0.7.rc3 Summary: TCP/IP stack auditing and much more Group: Applications/Internet @@ -8,7 +8,7 @@ URL: http://www.hping.org/ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch -Patch1: hping2-x86_64.patch +Patch1: hping2-bytesex.patch Patch2: hping2-getifnamedebug.patch Patch3: hping2-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,16 +21,10 @@ in order to transfer files under supported protocols. %prep -cat< +- Add patch to fix build on IA64 + * Wed Feb 08 2006 Peter Vrabec - rebuilt --- hping2-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 01:27:23 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:27:23 -0700 Subject: rpms/hping2/FC-5 hping2.spec,1.10,1.11 Message-ID: <200605080127.k481RPRR020753@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20736 Modified Files: hping2.spec Log Message: bump Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-5/hping2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hping2.spec 8 May 2006 01:23:17 -0000 1.10 +++ hping2.spec 8 May 2006 01:27:23 -0000 1.11 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.7.rc3 +Release: 0.8.rc3 Summary: TCP/IP stack auditing and much more Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 8 01:33:04 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:33:04 -0700 Subject: rpms/hping2/FC-4 hping2-bytesex.patch, NONE, 1.1 hping2.spec, 1.6, 1.7 hping2-x86_64.patch, 1.1, NONE Message-ID: <200605080133.k481X700020872@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20852 Modified Files: hping2.spec Added Files: hping2-bytesex.patch Removed Files: hping2-x86_64.patch Log Message: merged 64bit patches hping2-bytesex.patch: --- NEW FILE hping2-bytesex.patch --- --- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 +++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 @@ -9,6 +9,8 @@ #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-4/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 8 May 2006 01:33:04 -0000 1.7 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.4.rc3 +Release: 0.5.rc3 Summary: TCP/IP stack auditing and much more @@ -9,7 +9,7 @@ URL: http://www.hping.org/ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch -Patch1: hping2-x86_64.patch +Patch1: hping2-bytesex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -49,6 +49,9 @@ %{_mandir}/man8/* %changelog +* Sun May 07 2006 Paul Wouters - 2.0.0-0.5.rc3 +- Add patch to fix build on IA64 + * Fri Apr 7 2005 Michael Schwendt - rebuilt --- hping2-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 01:34:35 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:34:35 -0700 Subject: rpms/svnmailer/devel svnmailer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605080134.k481Yb2L020933@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20913 Modified Files: .cvsignore sources Added Files: svnmailer.spec Log Message: * Mon May 8 2006 Michael Fleming 1.0.8-1 - Initial import into Fedora Extras - Update to new upstream version. --- NEW FILE svnmailer.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: svnmailer Version: 1.0.8 Release: 1%{?dist} Summary: Tool to post subversion repository commit information Group: Development/Tools License: Apache Software License URL: http://opensource.perlig.de/svnmailer/ Source0: http://storage.perlig.de/svnmailer/svnmailer-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel subversion >= 1.0.0 Requires: subversion >= 1.0.0 python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description Svnmailer is a tool to post subversion repository commit information by mail, news or XML (to a CIA tracker for example). %package doc Summary: Developer and API documentation for svnmailer Group: Development/Tools %description doc This package contains developer information and API documentation for the svnmailer tool %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README CHANGES CREDITS LICENSE NOTICE # Include files and dirs below %{python_sitelib} (for noarch packages) and # %{python_sitearch} (for arch-dependent packages) as appropriate, and mark # *.pyo as %ghost (do not include in package). %{_bindir}/svn-mailer %dir %{python_sitelib}/svnmailer %dir %{python_sitelib}/svnmailer/notifier %{python_sitelib}/svnmailer/*.py %{python_sitelib}/svnmailer/*.pyc %ghost %{python_sitelib}/svnmailer/*.pyo %{python_sitelib}/svnmailer/notifier/*.py %{python_sitelib}/svnmailer/notifier/*.pyc %ghost %{python_sitelib}/svnmailer/notifier/*.pyo %files doc %defattr(-,root,root,-) %doc docs/* %changelog * Mon May 8 2006 Michael Fleming 1.0.8-1 - Initial import into Fedora Extras - Update to new upstream version. * Tue Feb 28 2006 Michael Fleming 1.0.7-1 - Update to new upstream version. * Wed Feb 8 2006 Michael Fleming 1.0.6-3 - Use newer python template from fedora-rpmdevtools - Corrected license entry - Split off API / dev docs into subpackage * Tue Feb 7 2006 Michael Fleming 1.0.6-2 - Respun spec following comments from roozbeh * Sun Feb 5 2006 Michael Fleming 1.0.6-1 - Initial review package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/svnmailer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 01:23:45 -0000 1.1 +++ .cvsignore 8 May 2006 01:34:34 -0000 1.2 @@ -0,0 +1 @@ +svnmailer-1.0.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/svnmailer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 01:23:45 -0000 1.1 +++ sources 8 May 2006 01:34:34 -0000 1.2 @@ -0,0 +1 @@ +b4ea9caff6db64e7a415ac467e5e4b19 svnmailer-1.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 01:35:59 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:35:59 -0700 Subject: rpms/hping2/FC-4 hping2.spec,1.7,1.8 Message-ID: <200605080136.k481a1FA021021@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21004 Modified Files: hping2.spec Log Message: bump Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-4/hping2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hping2.spec 8 May 2006 01:33:04 -0000 1.7 +++ hping2.spec 8 May 2006 01:35:58 -0000 1.8 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.5.rc3 +Release: 0.6.rc3 Summary: TCP/IP stack auditing and much more @@ -49,7 +49,7 @@ %{_mandir}/man8/* %changelog -* Sun May 07 2006 Paul Wouters - 2.0.0-0.5.rc3 +* Sun May 07 2006 Paul Wouters - 2.0.0-0.6.rc3 - Add patch to fix build on IA64 * Fri Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Mon May 8 01:37:53 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:37:53 -0700 Subject: rpms/hping2/FC-4 hping2.spec,1.8,1.9 Message-ID: <200605080137.k481btX5021077@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21060 Modified Files: hping2.spec Log Message: Add disttag to release Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-4/hping2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hping2.spec 8 May 2006 01:35:58 -0000 1.8 +++ hping2.spec 8 May 2006 01:37:52 -0000 1.9 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.6.rc3 +Release: 0.6.rc3%{?dist} Summary: TCP/IP stack auditing and much more From fedora-extras-commits at redhat.com Mon May 8 01:38:54 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:38:54 -0700 Subject: rpms/hping2/FC-5 hping2.spec,1.11,1.12 Message-ID: <200605080138.k481cuLg021142@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21125 Modified Files: hping2.spec Log Message: Added disttag to release Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-5/hping2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- hping2.spec 8 May 2006 01:27:23 -0000 1.11 +++ hping2.spec 8 May 2006 01:38:54 -0000 1.12 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.8.rc3 +Release: 0.8.rc3%{?dist} Summary: TCP/IP stack auditing and much more Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 8 01:39:20 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:39:20 -0700 Subject: rpms/hping2/devel hping2.spec,1.10,1.11 Message-ID: <200605080139.k481dMTO021165@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21148 Modified Files: hping2.spec Log Message: added disttag to release Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hping2.spec 8 May 2006 01:24:42 -0000 1.10 +++ hping2.spec 8 May 2006 01:39:20 -0000 1.11 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.7.rc3 +Release: 0.7.rc3%{?dist} Summary: TCP/IP stack auditing and much more Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 8 01:40:33 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:40:33 -0700 Subject: rpms/hping2/FC-3 hping2-bytesex.patch, NONE, 1.1 hping2.spec, 1.4, 1.5 hping2-x86_64.patch, 1.1, NONE Message-ID: <200605080140.k481eZ1F021203@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21183 Modified Files: hping2.spec Added Files: hping2-bytesex.patch Removed Files: hping2-x86_64.patch Log Message: merge 64bit patches hping2-bytesex.patch: --- NEW FILE hping2-bytesex.patch --- --- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 +++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 @@ -9,6 +9,8 @@ #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-3/hping2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hping2.spec 13 Feb 2005 11:49:15 -0000 1.4 +++ hping2.spec 8 May 2006 01:40:33 -0000 1.5 @@ -1,15 +1,15 @@ Name: hping2 Version: 2.0.0 -Release: 0.3.rc3 -Epoch: 0 -Summary: A software to do TCP/IP stack auditing and much more +Release: 0.6.rc3%{?dist} + +Summary: TCP/IP stack auditing and much more Group: Applications/Internet License: GPL -URL: http://www.hping.org/ +URL: http://www.hping.org/ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch -Patch1: hping2-x86_64.patch +Patch1: hping2-bytesex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -43,13 +43,18 @@ %files %defattr(0644,root,root,0755) +%doc COPYING *BUGS CHANGES README TODO docs/AS-BACKDOOR docs/HPING2-HOWTO.txt +%doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt %attr(755,root,root) %{_sbindir}/* %{_mandir}/man8/* -%doc COPYING *BUGS CHANGES README TODO docs/AS-BACKDOOR docs/HPING2-HOWTO.txt -%doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt - %changelog +* Sun May 07 2006 Paul Wouters - 2.0.0-0.6.rc3 +- Add patch to fix build on IA64 + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sun Feb 13 2005 Thorsten Leemhuis - 2.0.0-0.3.rc3 - Add patch to fix build on x86_64 --- hping2-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 01:48:19 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:48:19 -0700 Subject: owners owners.list,1.958,1.959 Message-ID: <200605080148.k481mMB1021291@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21274 Modified Files: owners.list Log Message: Added svnmailer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.958 retrieving revision 1.959 diff -u -r1.958 -r1.959 --- owners.list 8 May 2006 00:12:01 -0000 1.958 +++ owners.list 8 May 2006 01:48:19 -0000 1.959 @@ -1488,6 +1488,7 @@ Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|swh-plugins|A set of audio plugins for LADSPA|green at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 03:00:25 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 7 May 2006 20:00:25 -0700 Subject: kadischi/ks_examples standard-livecd.cfg, NONE, 1.1 Makefile.am, 1.1.1.1, 1.2 minimal-livecd.cfg, 1.3, 1.4 Message-ID: <200605080300.k4830PVl023876@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/ks_examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23856/kadischi/ks_examples Modified Files: Makefile.am minimal-livecd.cfg Added Files: standard-livecd.cfg Log Message: ks_examples/ standard-livecd.cfg and minimal-livecd.cfg changes --- NEW FILE standard-livecd.cfg --- # Kickstart file automatically generated by anaconda. # File: ks.cfg_FC5-LiveCD-generic # Built by: Eugene Teo # Date: 20060507 ############################################################################### # FC5 kickstart for Kadischi (Generic) # Eugene Teo # # Feel free to make any changes to my kickstart file. Kadischi was able to # create a 641MB ISO based on this. If you make any improvements to this file, # do email me the changes so that i can learn from you too. # # Usage: # kadischi /path_to_repo /path_to_iso --kickstart=ks.cfg_FC5-LiveCD-generic # kadischi http://path_to_repo /path_to_iso --kickstart=ks.cfg_FC5-LiveCD-generic # ############################################################################### #--------------------------------------------------------------# lang en_US.UTF-8 keyboard us #timezone --utc Asia/Singapore timezone --utc GMT # Default root password: redhat rootpw --iscrypted $1$PvvvUg73$zWYeWG2HFaMCgO9B/RE6B. #--------------------------------------------------------------# install xconfig --driver "vesa" --videoram 65472 --resolution 800x600 --depth 16 --startxonboot monitor --hsync 31.5-37.9 --vsync 50-70 network --device eth0 --bootproto dhcp network --device eth1 --onboot no --bootproto dhcp network --device sit0 --onboot no --bootproto dhcp network --device tun0 --onboot no --bootproto dhcp network --device vmnet1 --onboot no --bootproto dhcp network --device vmnet8 --onboot no --bootproto dhcp firewall --enabled --port=22:tcp #selinux --disabled selinux --enforcing authconfig --enableshadow --enablemd5 #--------------------------------------------------------------# bootloader --location=none # The following is the partition information you requested # Note that any partitions you deleted are not expressed # here so unless you clear all partitions first, this is # not guaranteed to work #clearpart --linux #--------------------------------------------------------------# %packages @admin-tools @base @base-x @core @gnome-desktop @graphical-internet @office @printing @sound-and-video # korean-support # chinese-support # thai-support bsf comps-extras cracklib-dicts gnome-mime-data iso-codes rmt tzdata %post useradd redhat # Default user password: redhat usermod -p '$1$PvvvUg73$zWYeWG2HFaMCgO9B/RE6B.' redhat echo -e "[security]\nDisallowTCP=false\n\n[daemon]\nAutomaticLoginEnable=true\nAutomaticLogin=redhat\n\n[greeter]\n" > /etc/gdm/custom.conf Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/ks_examples/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile.am 21 Aug 2005 17:09:06 -0000 1.1.1.1 +++ Makefile.am 8 May 2006 03:00:23 -0000 1.2 @@ -1,5 +1,5 @@ ksdir = $(pkgdatadir)/ks_examples -ks_DATA = minimal-livecd.cfg +ks_DATA = minimal-livecd.cfg standard-livecd.cfg uninstall-hook: - rmdir $(ksdir) \ No newline at end of file + rmdir $(ksdir) Index: minimal-livecd.cfg =================================================================== RCS file: /cvs/devel/kadischi/ks_examples/minimal-livecd.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- minimal-livecd.cfg 20 Mar 2006 05:59:00 -0000 1.3 +++ minimal-livecd.cfg 8 May 2006 03:00:23 -0000 1.4 @@ -23,5 +23,45 @@ reboot %packages +# Packages to exclude for minimal package set +- atk +- bind +- bind-libs +- bind-utils +- bluez-libs +- bluez-pin +- bluez-utils +- caching-nameserver +- cairo +- cyrus-sasl-plain +- expat +- freeglut +- GConf2 +- htmlview +- irda-utils +- libglade2 +- libICE +- libIDL +- libSM +- libX11 +- libXau +- libXcursor +- libXdmcp +- libXext +- libXfixes +- libXft +- libXi +- libXinerama +- libXmu +- libXrandr +- libXrender +- libXt +- libXxf86vm +- mesa-libGL +- mesa-libGLU +- NetworkManager +- numactl +- ORBit2 +# End package set %post From fedora-extras-commits at redhat.com Mon May 8 03:56:49 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 20:56:49 -0700 Subject: rpms/perl-Class-Inspector/devel .cvsignore, 1.3, 1.4 perl-Class-Inspector.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605080356.k483updf030667@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30638 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Sep 2005 13:06:13 -0000 1.3 +++ .cvsignore 8 May 2006 03:56:49 -0000 1.4 @@ -1 +1 @@ -Class-Inspector-1.13.tar.gz +Class-Inspector-1.15.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Inspector.spec 28 Feb 2006 23:18:47 -0000 1.5 +++ perl-Class-Inspector.spec 8 May 2006 03:56:49 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.13 -Release: 2%{?dist} +Version: 1.15 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 1.15-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 1.13-2 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Sep 2005 13:06:13 -0000 1.3 +++ sources 8 May 2006 03:56:49 -0000 1.4 @@ -1 +1 @@ -ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz +b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:00:18 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:00:18 -0700 Subject: rpms/perl-Params-Util/devel .cvsignore, 1.8, 1.9 perl-Params-Util.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605080400.k4840Kw3031339@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31310 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Apr 2006 16:33:26 -0000 1.8 +++ .cvsignore 8 May 2006 04:00:18 -0000 1.9 @@ -1 +1 @@ -Params-Util-0.11.tar.gz +Params-Util-0.13.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Params-Util.spec 20 Apr 2006 16:33:26 -0000 1.8 +++ perl-Params-Util.spec 8 May 2006 04:00:18 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.11 +Version: 0.13 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 0.13-1 +- Upstream update. + * Thu Apr 20 2006 Ralf Cors??pius - 0.11-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Apr 2006 16:33:26 -0000 1.8 +++ sources 8 May 2006 04:00:18 -0000 1.9 @@ -1 +1 @@ -d3fce431cff46caa926ece63fda73946 Params-Util-0.11.tar.gz +1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:19:41 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:19:41 -0700 Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.8, 1.9 perl-Params-Util.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605080419.k484JhGt001786@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1765 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Apr 2006 01:30:48 -0000 1.8 +++ .cvsignore 8 May 2006 04:19:41 -0000 1.9 @@ -1 +1 @@ -Params-Util-0.11.tar.gz +Params-Util-0.13.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Params-Util.spec 22 Apr 2006 01:30:48 -0000 1.8 +++ perl-Params-Util.spec 8 May 2006 04:19:41 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.11 +Version: 0.13 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 0.13-1 +- Upstream update. + * Thu Apr 20 2006 Ralf Cors??pius - 0.11-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Apr 2006 01:30:48 -0000 1.8 +++ sources 8 May 2006 04:19:41 -0000 1.9 @@ -1 +1 @@ -d3fce431cff46caa926ece63fda73946 Params-Util-0.11.tar.gz +1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:20:46 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:20:46 -0700 Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.8, 1.9 perl-Params-Util.spec, 1.7, 1.8 sources, 1.8, 1.9 Message-ID: <200605080420.k484KmaL001856@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1835 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Apr 2006 01:33:15 -0000 1.8 +++ .cvsignore 8 May 2006 04:20:46 -0000 1.9 @@ -1 +1 @@ -Params-Util-0.11.tar.gz +Params-Util-0.13.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Params-Util.spec 22 Apr 2006 01:33:16 -0000 1.7 +++ perl-Params-Util.spec 8 May 2006 04:20:46 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.11 +Version: 0.13 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,9 +49,15 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 0.13-1 +- Upstream update. + * Thu Apr 20 2006 Ralf Cors??pius - 0.11-1 - Upstream update. +* Wed Mar 01 2006 Ralf Cors??pius - 0.10-2 +- Rebuild for perl-5.8.8. + * Wed Jan 18 2006 Ralf Cors??pius - 0.10-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Apr 2006 01:33:16 -0000 1.8 +++ sources 8 May 2006 04:20:46 -0000 1.9 @@ -1 +1 @@ -d3fce431cff46caa926ece63fda73946 Params-Util-0.11.tar.gz +1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:23:32 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:23:32 -0700 Subject: rpms/perl-Class-Inspector/FC-5 .cvsignore, 1.3, 1.4 perl-Class-Inspector.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605080423.k484NYsn001936@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1915 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Sep 2005 13:06:13 -0000 1.3 +++ .cvsignore 8 May 2006 04:23:32 -0000 1.4 @@ -1 +1 @@ -Class-Inspector-1.13.tar.gz +Class-Inspector-1.15.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/perl-Class-Inspector.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Inspector.spec 28 Feb 2006 23:18:47 -0000 1.5 +++ perl-Class-Inspector.spec 8 May 2006 04:23:32 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.13 -Release: 2%{?dist} +Version: 1.15 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 1.15-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 1.13-2 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Sep 2005 13:06:13 -0000 1.3 +++ sources 8 May 2006 04:23:32 -0000 1.4 @@ -1 +1 @@ -ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz +b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:25:33 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:25:33 -0700 Subject: rpms/perl-Class-Inspector/FC-4 .cvsignore, 1.3, 1.4 perl-Class-Inspector.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605080425.k484PZdP002006@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1985 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Sep 2005 13:11:46 -0000 1.3 +++ .cvsignore 8 May 2006 04:25:33 -0000 1.4 @@ -1 +1 @@ -Class-Inspector-1.13.tar.gz +Class-Inspector-1.15.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/perl-Class-Inspector.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-Inspector.spec 29 Sep 2005 13:11:46 -0000 1.4 +++ perl-Class-Inspector.spec 8 May 2006 04:25:33 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.13 +Version: 1.15 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 1.15-1 +- Upstream update. + * Thu Sep 29 2005 Ralf Corsepius - 1.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Sep 2005 13:11:46 -0000 1.3 +++ sources 8 May 2006 04:25:33 -0000 1.4 @@ -1 +1 @@ -ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz +b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:42:23 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:42:23 -0700 Subject: rpms/perl-Params-Validate/FC-4 .cvsignore, 1.4, 1.5 perl-Params-Validate.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605080442.k484gPlt002144@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2123 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: * Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Feb 2006 05:53:25 -0000 1.4 +++ .cvsignore 8 May 2006 04:42:23 -0000 1.5 @@ -1 +1 @@ -Params-Validate-0.80.tar.gz +Params-Validate-0.81.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/perl-Params-Validate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Params-Validate.spec 1 Feb 2006 05:53:25 -0000 1.4 +++ perl-Params-Validate.spec 8 May 2006 04:42:23 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.80 +Version: 0.81 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 +- Upstream update. + * Wed Feb 01 2006 Ralf Cors??pius - 0.80-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Feb 2006 05:53:25 -0000 1.4 +++ sources 8 May 2006 04:42:23 -0000 1.5 @@ -1 +1 @@ -37acde17038290becdef848f566698d6 Params-Validate-0.80.tar.gz +033d043c4764b800722b9d7442bc4530 Params-Validate-0.81.tar.gz From fedora-extras-commits at redhat.com Mon May 8 08:20:08 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 8 May 2006 01:20:08 -0700 Subject: fedora-security/audit fc4,1.232,1.233 fc5,1.146,1.147 Message-ID: <200605080820.k488K8eW011746@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11726 Modified Files: fc4 fc5 Log Message: Update for weekend, not including kernel updates from May 5 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- fc4 5 May 2006 19:54:11 -0000 1.232 +++ fc4 8 May 2006 08:20:05 -0000 1.233 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060502 -Up to date FC4 as of 20060502 +Up to date CVE as of CVE email 20060507 +Up to date FC4 as of 20060507 ** are items that need attention +CVE-2006-2224 VULNERABLE (quagga) +CVE-2006-2223 VULNERABLE (quagga) CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- fc5 5 May 2006 19:54:11 -0000 1.146 +++ fc5 8 May 2006 08:20:05 -0000 1.147 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060502 -Up to date FC5 as of 20060502 +Up to date CVE as of CVE email 20060507 +Up to date FC5 as of 20060507 ** are items that need attention +CVE-2006-2224 VULNERABLE (quagga) +CVE-2006-2223 VULNERABLE (quagga) CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 From fedora-extras-commits at redhat.com Mon May 8 08:46:21 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 8 May 2006 01:46:21 -0700 Subject: comps comps-fe5.xml, 1.5, 1.6 comps-fe5.xml.in, 1.44, 1.45 comps-fe6.xml.in, 1.7, 1.8 Message-ID: <200605080846.k488kNBi011884@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11862 Modified Files: comps-fe5.xml comps-fe5.xml.in comps-fe6.xml.in Log Message: Added svnmailer Index: comps-fe5.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- comps-fe5.xml 17 Apr 2006 17:49:10 -0000 1.5 +++ comps-fe5.xml 8 May 2006 08:46:21 -0000 1.6 @@ -56,6 +56,7 @@ quilt rpmlint splint + svnmailer tkcvs tla yap @@ -813,4 +814,4 @@ network-server - \ No newline at end of file + Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- comps-fe5.xml.in 1 May 2006 20:38:34 -0000 1.44 +++ comps-fe5.xml.in 8 May 2006 08:46:21 -0000 1.45 @@ -58,6 +58,7 @@ quilt rpmlint splint + svnmailer tkcvs tla yap Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- comps-fe6.xml.in 1 May 2006 20:38:34 -0000 1.7 +++ comps-fe6.xml.in 8 May 2006 08:46:21 -0000 1.8 @@ -58,6 +58,7 @@ quilt rpmlint splint + svnmailer tkcvs tla yap From fedora-extras-commits at redhat.com Mon May 8 09:37:01 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Mon, 8 May 2006 02:37:01 -0700 Subject: fedora-security/audit fc4,1.233,1.234 fc5,1.147,1.148 Message-ID: <200605080937.k489b1l3014313@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14293/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-1864 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- fc4 8 May 2006 08:20:05 -0000 1.233 +++ fc4 8 May 2006 09:36:59 -0000 1.234 @@ -28,7 +28,7 @@ CVE-2006-1932 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability -CVE-2006-1864 VULNERABLE (kernel) +CVE-2006-1864 VULNERABLE (kernel, fixed 2.6.16.14) CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- fc5 8 May 2006 08:20:05 -0000 1.147 +++ fc5 8 May 2006 09:36:59 -0000 1.148 @@ -29,7 +29,7 @@ CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] -CVE-2006-1864 ignore (kernel) not compiled in +CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1790 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] From fedora-extras-commits at redhat.com Mon May 8 09:50:11 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Mon, 8 May 2006 02:50:11 -0700 Subject: fedora-security/audit fc4,1.234,1.235 Message-ID: <200605080950.k489oBSe014569@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14535/audit Modified Files: fc4 Log Message: Update with FEDORA-2006-517 (kernel) Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- fc4 8 May 2006 09:36:59 -0000 1.234 +++ fc4 8 May 2006 09:50:08 -0000 1.235 @@ -28,7 +28,7 @@ CVE-2006-1932 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability -CVE-2006-1864 VULNERABLE (kernel, fixed 2.6.16.14) +CVE-2006-1864 version (kernel, fixed 2.6.16.14) [since FEDORA-2006-517] CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] From fedora-extras-commits at redhat.com Mon May 8 11:15:20 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 8 May 2006 04:15:20 -0700 Subject: rpms/abiword/FC-4 abiword-2.4.4-x86_64.patch, NONE, 1.1 abiword.spec, 1.23, 1.24 Message-ID: <200605081115.k48BFMv0020972@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20952 Modified Files: abiword.spec Added Files: abiword-2.4.4-x86_64.patch Log Message: Fix crash on x86_64 abiword-2.4.4-x86_64.patch: --- NEW FILE abiword-2.4.4-x86_64.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2005-09-27 00:23:02.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2006-05-08 01:17:00.000000000 +0200 @@ -586,7 +586,7 @@ (!m_bSave ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL) + (gchar*)NULL) ); #endif Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- abiword.spec 13 Apr 2006 11:57:11 -0000 1.23 +++ abiword.spec 8 May 2006 11:15:20 -0000 1.24 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -43,6 +43,7 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.4-docbuild.patch +Patch3: abiword-2.4.4-x86_64.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -53,6 +54,7 @@ %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop %patch2 -p1 -b .docbuild +%patch3 -p1 -b .x86_64 %build cd abi @@ -136,6 +138,9 @@ %{_datadir}/icons/*png %changelog +* Mon May 08 2006 Marc Maurer - 1:2.4.4-3.fc4 +- Fix bug 190591 - crash on x86_64 machines when saving a document + * Tue Apr 13 2006 Marc Maurer - 1:2.4.4-2.fc4 - Fix documentation generation From fedora-extras-commits at redhat.com Mon May 8 13:46:36 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 8 May 2006 06:46:36 -0700 Subject: rpms/rssowl/FC-5 rssowl.spec,1.8,1.9 Message-ID: <200605081346.k48DkcIq026140@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26123 Modified Files: rssowl.spec Log Message: Fix bugzilla 191044. Release -2. Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rssowl.spec 6 May 2006 17:24:01 -0000 1.8 +++ rssowl.spec 8 May 2006 13:46:36 -0000 1.9 @@ -1,6 +1,6 @@ %define name rssowl %define version 1.2.1 -%define release 1%{?dist} +%define release 2%{?dist} %define jdk java Name: %name @@ -110,7 +110,7 @@ %post %{_bindir}/rebuild-gcj-db -update-desktop-database %{_datadir}/application +update-desktop-database %{_datadir}/applications # update icon themes touch %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -140,6 +140,10 @@ %{_libdir}/gcj/%{name} %changelog +* Mon May 8 2006 Anthony Green - 1.2.1-2 +- Fix bugzilla #191044 - postinstall scriptlet typo error. + Thanks to Chien-Chung Yeh for the fix. + * Sat May 6 2006 Anthony Green - 1.2.1-1 - Update sources. From fedora-extras-commits at redhat.com Mon May 8 14:21:41 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 8 May 2006 07:21:41 -0700 Subject: extras-buildsys/utils extras-push-all,1.3,1.4 Message-ID: <200605081421.k48ELfV2028593@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28557 Modified Files: extras-push-all Log Message: Add sanity tests for group and gpg .rpmmacros setup. Index: extras-push-all =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- extras-push-all 4 May 2006 19:49:36 -0000 1.3 +++ extras-push-all 8 May 2006 14:21:38 -0000 1.4 @@ -14,6 +14,21 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Sanity Tests +if [ "`id -g -n`" != "extras_signers" ]; then + echo "ERROR: Your group must be extras_signers. Try \`newgrp extras_signers\' before running this again." + exit 1 +fi +if [ ! -h ~/.rpmmacros ]; then + echo "ERROR: ~/.rpmmacros must be a symbolic link." + exit 1 +fi +if [ "`readlink -f ~/.rpmmacros`" != "/srv/extras-push/.rpmmacros" ]; then + echo "ERROR: ~/.rpmmacros must be pointing at /srv/extras-push/.rpmmacros." + exit 1 +fi + +# Sign & Push [ "$1" = "-f" ] && force=yes || force= dists="3 4 5 development" changed= From fedora-extras-commits at redhat.com Mon May 8 14:24:37 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:24:37 -0700 Subject: extras-buildsys/common FileTransfer.py, NONE, 1.1 FileUploader.py, 1.1, 1.2 FileDownloader.py, 1.18, 1.19 Message-ID: <200605081424.k48EObMo028657@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28620/common Modified Files: FileUploader.py FileDownloader.py Added Files: FileTransfer.py Log Message: 2006-05-08 Dan Williams * common/FileTransfer.py - Refactor common code from FileDownload.py and FileUpload.py into FileTransfer.py * common/FileDownload.py - pylint cleanups - Refactor for FileTransfer.py - Allow multiple transfers for one FileDownloader object * common/FileUploader.py - pylint cleanups - Refactor for FileTransfer.py - Allow multiple uploads for one FileUploader object --- NEW FILE FileTransfer.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2006 Dan Williams and Red Hat, Inc. import threading import URLopener import time FT_RESULT_SUCCESS = 'success' FT_RESULT_FAILED = 'failed' FT_RESULT_CANCELED = 'canceled' class FileTransfer(threading.Thread): def __init__(self, url, certs=None): self._callback = None self._cb_data = None self._cancel = False self._tries = 5 self._opener = None if not url: raise Exception("Require a URL to download.") self._url = url if certs: if type(certs) is not type({}): raise ValueError("Certs must be a dict of certificate paths.") self._certs = certs self._opener = URLopener.PlgURLopener(self._certs, 20) threading.Thread.__init__(self) def set_tries(self, tries): if tries <= 0: raise ValueError("Tries must be larger than 0") self._tries = tries def set_callback(self, callback, cb_data): self._callback = callback self._cb_data = cb_data def cancel(self): self._cancel = True def _action(self, data=None): # Should be implemented by subclasses return (False, "_action should be implemented by subclass") def _process_one_transfer(self, data=None): """Retries a transfer for a specified number of times before failing.""" status = FT_RESULT_FAILED result = msg = None for attempt in range(1, self._tries + 1): (result, msg) = self._action(data) if result: status = FT_RESULT_SUCCESS break if self._cancel: status = FT_RESULT_CANCELED break time.sleep(5) msg = "Transfer of timed out." return (status, msg) def run(self): (status, msg) = self._process_one_transfer() if self._callback: self._callback(status, self._cb_data, msg) Index: FileUploader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileUploader.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileUploader.py 27 Mar 2006 04:12:11 -0000 1.1 +++ FileUploader.py 8 May 2006 14:24:30 -0000 1.2 @@ -23,40 +23,62 @@ import OpenSSL import CommonErrors import exceptions +import FileTransfer -class FileUploader(threading.Thread): - def __init__(self, callback, cb_data, url, data, certs=None): - self._callback = callback - self._cb_data = cb_data - self._url = url - self._data = data - self._opener = URLopener.PlgURLopener(certs, 20) - threading.Thread.__init__(self) +class FileUploader(FileTransfer.FileTransfer): + def __init__(self, url, files, filevar, cgi_vars=None, certs=None): + FileTransfer.FileTransfer.__init__(self, url, certs) + self._files = {} + + if files and type(files) == type(""): + files = [files] + if not files or type(files) is not type([]): + raise ValueError("Require a list of files to upload.") + for fpath in files: + self._files[os.path.abspath(fpath)] = (None, None) + self._filevar = filevar + + if cgi_vars: + if type(cgi_vars) is not type([]): + raise ValueError("cgi_vars must be a list of tuples") + for var in cgi_vars: + if type(var) is not type(()): + raise ValueError("cgi_vars must be a list of tuples") + self._cgi_vars = cgi_vars - def run(self): + def _action(self, cgivars=None): result = None err_msg = None - if self._url and self._data: - try: - result = self._opener.open(self._url, self._data) -# except SSL.SSLError, e: -# # Don't traceback on dropped connections or timeouts -# if CommonErrors.canIgnoreSSLError(e): -# pass - except socket.error, e: - if not CommonErrors.canIgnoreSocketError(e): - err_msg = "Socket Error: %s" % e - except IOError, e: - if not CommonErrors.canIgnoreSocketError(e): - err_msg = "IOError Error: %s" % e - - if result: - self._callback('done', self._cb_data, err_msg) - else: - self._callback('failed', self._cb_data, err_msg) - + try: + result = self._opener.open(self._url, cgivars) + except socket.error, exc: + if not CommonErrors.canIgnoreSocketError(exc): + err_msg = "Socket Error: %s" % exc + except IOError, exc: + if not CommonErrors.canIgnoreSocketError(exc): + err_msg = "IOError Error: %s" % exc + return (result, err_msg) + def run(self): + final_result = FileTransfer.FT_RESULT_SUCCESS + msg = None + for fpath in self._files.keys(): + fd = open(fpath, "r") + cgivars = [(self._filevar, fd)] + cgivars = cgivars + self._cgi_vars + (result, msg) = self._process_one_transfer(cgivars) + fd.close() + self._files[fpath] = (result, msg) + if result == FileTransfer.FT_RESULT_FAILED: + final_result = FileTransfer.FT_RESULT_FAILED + msg = "Upload of %s failed because: %s" % (fpath, msg) + break + if self._cancel: + final_result = FileTransfer.FT_RESULT_CANCELED + break + if self._callback: + self._callback(final_result, self._cb_data, msg) ########################################################### # Testing stuff @@ -64,7 +86,7 @@ import sys, time -class dlwr: +class UlCallbackData: def __init__(self, x, t): self.num = x self.tracker = t @@ -74,62 +96,57 @@ self.dl = dl -class dl_tracker: +class UlTracker: def __init__(self): self.lst = [] - def add(self, dlwr): - self.lst.append(dlwr) + def add(self, ulcbdata): + self.lst.append(ulcbdata) - def remove(self, dlwr): - self.lst.remove(dlwr) + def remove(self, ulcbdata): + self.lst.remove(ulcbdata) def num(self): return len(self.lst) -def ul_callback(status, dlwr, msg=""): - print "Finished with %d (%s: %s)" % (dlwr.num, status, msg) - dlwr.tracker.remove(dlwr) +def UploadCallback(status, ulcbdata, msg=""): + print "Finished with %d (%s: %s)" % (ulcbdata.num, status, msg) + ulcbdata.tracker.remove(ulcbdata) if __name__ == '__main__': if len(sys.argv) < 5: - print "Usage: python FileUploader.py filename key_and_cert ca_cert peer_ca_cert" + print "Usage: python FileUploader.py key_and_cert ca_cert peer_ca_cert fname1 fname2 ..." sys.exit(1) certs = {} - certs['key_and_cert'] = sys.argv[2] - certs['ca_cert'] = sys.argv[3] - certs['peer_ca_cert'] = sys.argv[4] + 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() + dlt = UlTracker() x = 0 - filename = sys.argv[1] + files = [] + for fname in sys.argv[4:]: + files.append(os.path.abspath(fname)) + while x < 100: - wr = dlwr(x, dlt) - time.sleep(0.25) + wr = UlCallbackData(x, dlt) + try: + time.sleep(0.25) + except KeyboardInterrupt: + break data = [] data.append(('jobid', x)) data.append(('arch', 'i386')) - import shutil, string - name = os.path.basename(filename) - parts = name.split(".") - ext = parts[-1] - firstpart = string.join(parts[:len(parts)-1], ".") - try: - os.makedirs("/tmp/foo") - except: - pass - newname = os.path.join("/tmp/foo", firstpart + "-%s.%s" % (x, ext)) - shutil.copyfile(filename, newname) - fd = open(newname, "r") - data.append(('filedata', fd)) - dl = FileUploader(ul_callback, wr, "https://localhost:8886/upload", data, certs) + ful = FileUploader("https://localhost:8886/upload", files, + 'filedata', data, certs) + ful.set_callback(UploadCallback, wr) dlt.add(wr) - dl.start() + ful.start() x = x + 1 while dlt.num() > 0: Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- FileDownloader.py 27 Mar 2006 04:12:11 -0000 1.18 +++ FileDownloader.py 8 May 2006 14:24:30 -0000 1.19 @@ -14,18 +14,17 @@ # # Copyright 2005 Dan Williams and Red Hat, Inc. -import threading import urllib -import string import os import socket -import URLopener -import OpenSSL import CommonErrors import exceptions +import time +import FileTransfer -class FileNameException(exceptions.Exception): pass +class FileNameException(exceptions.Exception): + pass def get_base_filename_from_url(url, legal_exts): """ Safely unquotes a URL and gets the base file name from it. @@ -65,91 +64,102 @@ # FIXME: what other validation can we do here? safe_list = ['_', '-', '.', '+'] - for c in filename: + for char in filename: # For now, legal characters are '_-.' plus alphanumeric - if c in safe_list or c.isalnum(): + if char in safe_list or char.isalnum(): pass else: - raise FileNameException("Illegal character '%s' encountered." % c) + raise FileNameException("Illegal character '%s' encountered." % char) return filename -class FileDownloader(threading.Thread): - def __init__(self, callback, cb_data, url, target_dir, legal_exts, certs): - self._callback = callback - self._cb_data = cb_data - self._url = url +class FileDownloader(FileTransfer.FileTransfer): + def __init__(self, urls, target_dir, legal_exts, certs=None): + FileTransfer.FileTransfer.__init__(self, url, certs) + + if not target_dir: + raise Exception("Require a target directory to download to.") self._target_dir = target_dir - # May fail with FileNameException, trapped elsewhere - self._filename = get_base_filename_from_url(self._url, legal_exts) - self._opener = URLopener.PlgURLopener(certs, 20) - threading.Thread.__init__(self) + if type(urls) == type(""): + urls = [urls] + if type(urls) is not type([]): + raise ValueError("urls argument must be a list of URLs.") + for url in urls: + fname = get_base_filename_from_url(url, legal_exts) + if not fname: + raise FileNameException("Bad file name from url %s" % url) + self._files[url] = fname - def run(self): + def _action(self, (url, fname)): result = None err_msg = None - if self._url and self._target_dir and self._filename: - if not os.path.exists(self._target_dir): - os.makedirs(self._target_dir) - 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 socket.error, e: - if not CommonErrors.canIgnoreSocketError(e): - err_msg = "Socket Error: %s" % e - except IOError, e: - if not CommonErrors.canIgnoreSocketError(e): - err_msg = "IOError Error: %s" % e - - if result: - self._callback('done', self._cb_data, err_msg) - else: - self._callback('failed', self._cb_data, err_msg) + if not os.path.exists(self._target_dir): + os.makedirs(self._target_dir) + target_file = os.path.join(self._target_dir, fname) + try: + result = self._opener.retrieve(url, target_file) + except socket.error, exc: + if not CommonErrors.canIgnoreSocketError(exc): + err_msg = "Socket Error: %s" % exc + except IOError, exc: + if not CommonErrors.canIgnoreSocketError(exc): + err_msg = "IOError Error: %s" % exc + return (result, err_msg) + def run(self): + final_result = FileTransfer.FT_RESULT_SUCCESS + msg = None + for url in self._files.keys(): + (result, msg) = self._process_one_transfer((url, self._files[url])) + if result == FileTransfer.FT_RESULT_FAILED: + final_result = FileTransfer.FT_RESULT_FAILED + msg = "Download of %s failed because: %s" % (url, msg) + break + if self._cancel: + final_result = FileTransfer.FT_RESULT_CANCELED + break + if self._callback: + self._callback(final_result, self._cb_data, msg) ########################################################### # Testing stuff ########################################################### -import sys, time +import sys -class dlwr: - def __init__(self, x, t): - self.num = x - self.tracker = t - self.dl = None +class DlCallbackData: + def __init__(self, num, tracker): + self.num = num + self.tracker = tracker + self.fdl = None - def set_dl(self, dl): - self.dl = dl + def set_dl(self, fdl): + self.fdl = fdl -class dl_tracker: +class DlTracker: def __init__(self): self.lst = [] - def add(self, dlwr): - self.lst.append(dlwr) + def add(self, dlcb): + self.lst.append(dlcbdata) - def remove(self, dlwr): - self.lst.remove(dlwr) + def remove(self, dlcbdata): + self.lst.remove(dlcbdata) def num(self): return len(self.lst) -def dl_callback(status, dlwr, msg=""): - print "Finished with %d (%s: %s)" % (dlwr.num, status, msg) - dlwr.tracker.remove(dlwr) +def dl_callback(status, dlcbdata, msg=""): + print "Finished with %d (%s: %s)" % (dlcbdata.num, status, msg) + dlcbdata.tracker.remove(dlcbdata) -if __name__ == '__main__': +def main(): if len(sys.argv) < 4: print "Usage: python FileDownloader.py key_and_cert ca_cert peer_ca_cert" sys.exit(1) @@ -160,19 +170,21 @@ certs['peer_ca_cert'] = sys.argv[3] print "Starting..." - dlt = dl_tracker() + dlt = DlTracker() - x = 0 - while x < 100: - wr = dlwr(x, dlt) - dstdir = os.path.join("/tmp", "client_dir", "%s" % x) + count = 0 + while count < 100: + dlcb = DlCallbackData(count, dlt) + dstdir = os.path.join("/tmp", "client_dir", "%s" % count) 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 + fdl = FileDownloader("https://localhost:8886/testfile.dat", + dstdir, ['.dat'], certs) + fdl.set_callback(dl_callback, dlcb) + dlt.add(dlcb) + fdl.start() + count = count + 1 while dlt.num() > 0: try: @@ -180,3 +192,6 @@ except KeyboardInterrupt: print "Quitting..." os._exit(0) + +if __name__ == '__main__': + main() From fedora-extras-commits at redhat.com Mon May 8 14:24:32 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:24:32 -0700 Subject: extras-buildsys ChangeLog,1.185,1.186 Message-ID: <200605081425.k48EP2Ct028660@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28620 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * common/FileTransfer.py - Refactor common code from FileDownload.py and FileUpload.py into FileTransfer.py * common/FileDownload.py - pylint cleanups - Refactor for FileTransfer.py - Allow multiple transfers for one FileDownloader object * common/FileUploader.py - pylint cleanups - Refactor for FileTransfer.py - Allow multiple uploads for one FileUploader object Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- ChangeLog 3 May 2006 04:04:27 -0000 1.185 +++ ChangeLog 8 May 2006 14:24:29 -0000 1.186 @@ -1,3 +1,19 @@ +2006-05-08 Dan Williams + + * common/FileTransfer.py + - Refactor common code from FileDownload.py and + FileUpload.py into FileTransfer.py + + * common/FileDownload.py + - pylint cleanups + - Refactor for FileTransfer.py + - Allow multiple transfers for one FileDownloader object + + * common/FileUploader.py + - pylint cleanups + - Refactor for FileTransfer.py + - Allow multiple uploads for one FileUploader object + 2006-05-03 Dan Williams More builder/server comm rework; From fedora-extras-commits at redhat.com Mon May 8 14:25:46 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:25:46 -0700 Subject: extras-buildsys ChangeLog,1.186,1.187 Message-ID: <200605081425.k48EPkKD028699@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * common/HTTPServer.py - For test code, print out received files, and put them in /tmp/server_dir rather than just in /tmp Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- ChangeLog 8 May 2006 14:24:29 -0000 1.186 +++ ChangeLog 8 May 2006 14:25:44 -0000 1.187 @@ -1,5 +1,11 @@ 2006-05-08 Dan Williams + * common/HTTPServer.py + - For test code, print out received files, and put them + in /tmp/server_dir rather than just in /tmp + +2006-05-08 Dan Williams + * common/FileTransfer.py - Refactor common code from FileDownload.py and FileUpload.py into FileTransfer.py From fedora-extras-commits at redhat.com Mon May 8 14:25:47 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:25:47 -0700 Subject: extras-buildsys/common HTTPServer.py,1.14,1.15 Message-ID: <200605081425.k48EPl5B028705@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668/common Modified Files: HTTPServer.py Log Message: 2006-05-08 Dan Williams * common/HTTPServer.py - For test code, print out received files, and put them in /tmp/server_dir rather than just in /tmp Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- HTTPServer.py 3 May 2006 04:04:28 -0000 1.14 +++ HTTPServer.py 8 May 2006 14:25:44 -0000 1.15 @@ -225,13 +225,14 @@ if jobid is not None and arch and filename and tmpfile: import shutil - dest = file("/tmp/%s" % filename, "w+b") + dest = file("/tmp/server_dir/%s" % filename, "w+b") shutil.copyfileobj(tmpfile, dest) dest.close() request_handler.send_response(200, "Success") request_handler.send_header("Content-type", "text/html") request_handler.end_headers() request_handler.wfile.write("Success!") + print "Finished with %d (%s) at %s" % (jobid, arch, filename) else: request_handler.send_error(400, "Invalid request for %s" % request_handler.path) From fedora-extras-commits at redhat.com Mon May 8 14:26:42 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:26:42 -0700 Subject: extras-buildsys/common Commands.py,1.3,1.4 Message-ID: <200605081426.k48EQgUk028749@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28715/common Modified Files: Commands.py Log Message: 2006-05-08 Dan Williams * common/Commands.py - Add JobFiles and JobFilesAck commands Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Commands.py 5 May 2006 02:10:39 -0000 1.3 +++ Commands.py 8 May 2006 14:26:34 -0000 1.4 @@ -29,11 +29,11 @@ CMD_NAME_NEW_JOB_REQ = "NewJob" CMD_NAME_NEW_JOB_ACK = "NewJobAck" CMD_NAME_UNLOCK_REPO = "UnlockRepo" -CMD_NAME_JOB_FILES_REQ = "JobFiles" -CMD_NAME_JOB_FILES_ACK = "JobFilesAck" CMD_NAME_BUILDING_JOBS = "BuildingJobs" CMD_NAME_JOB_STATUS_REQ = "JobStatus" CMD_NAME_JOB_STATUS_ACK = "JobStatusAck" +CMD_NAME_JOB_FILES_REQ = "JobFiles" +CMD_NAME_JOB_FILES_ACK = "JobFilesAck" class SequenceGenerator(object): @@ -131,6 +131,10 @@ cmd = PlgCommandJobStatus._deserialize(args) elif name == CMD_NAME_JOB_STATUS_ACK: cmd = PlgCommandJobStatusAck._deserialize(args) + elif name == CMD_NAME_JOB_FILES_REQ: + cmd = PlgCommandJobFiles._deserialize(args) + elif name == CMD_NAME_JOB_FILES_ACK: + cmd = PlgCommandJobFilesAck._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't @@ -523,3 +527,70 @@ def status(self): return self._status + + +class PlgCommandJobFiles(PlgCommand): + + _need_ack = True + + def __init__(self, archjob_id, seq=0): + PlgCommand.__init__(self, CMD_NAME_JOB_FILES_REQ, seq) + self._archjob_id = archjob_id + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except KeyError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + + return PlgCommandJobFiles(archjob_id) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def __str__(self): + return "%s(seq: %d, archjob_id: %s)" % (self._name, self._seq, self._archjob_id) + + +class PlgCommandJobFilesAck(PlgCommandAck): + def __init__(self, archjob_id, files, req_seq, seq=0): + """The files argument is a python list of output files from the job""" + PlgCommandAck.__init__(self, CMD_NAME_JOB_FILES_ACK, req_seq, seq) + self._archjob_id = archjob_id + self._files = files + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except KeyError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + try: + files = args['files'] + except KeyError, TypeError: + raise ValueError("No 'files' argument found.") + if type(files) != type([]): + raise ValueError("The 'files' argument was of the wrong type.") + + req_seq = PlgCommandAck._deserialize_acked_seq(args) + return PlgCommandJobFilesAck(archjob_id, files, req_seq) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + args['files'] = self._files + return PlgCommandAck._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def files(self): + return self._files From fedora-extras-commits at redhat.com Mon May 8 14:26:36 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:26:36 -0700 Subject: extras-buildsys ChangeLog,1.187,1.188 Message-ID: <200605081427.k48ER6FV028752@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28715 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * common/Commands.py - Add JobFiles and JobFilesAck commands Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- ChangeLog 8 May 2006 14:25:44 -0000 1.187 +++ ChangeLog 8 May 2006 14:26:33 -0000 1.188 @@ -1,8 +1,13 @@ 2006-05-08 Dan Williams + * common/Commands.py + - Add JobFiles and JobFilesAck commands + +2006-05-08 Dan Williams + * common/HTTPServer.py - For test code, print out received files, and put them - in /tmp/server_dir rather than just in /tmp + in /tmp/server_dir rather than just in 2006-05-08 Dan Williams From fedora-extras-commits at redhat.com Mon May 8 14:32:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:32:58 -0700 Subject: extras-buildsys/common Makefile,1.12,1.13 Message-ID: <200605081432.k48EWwiB028802@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28784 Modified Files: Makefile Log Message: Install FileTransfer.py Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile 28 Apr 2006 03:17:40 -0000 1.12 +++ Makefile 8 May 2006 14:32:55 -0000 1.13 @@ -17,6 +17,7 @@ DebugUtils.py \ ExecUtils.py \ FileDownloader.py \ + FileTransfer.py \ FileUploader.py \ HTTPServer.py \ SSLCommon.py \ From fedora-extras-commits at redhat.com Mon May 8 14:35:37 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Mon, 8 May 2006 07:35:37 -0700 Subject: rpms/fonttools/devel fonttools-unsigned-ranges.patch, NONE, 1.1 fonttools.spec, 1.3, 1.4 Message-ID: <200605081435.k48EZd44028838@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28816 Modified Files: fonttools.spec Added Files: fonttools-unsigned-ranges.patch Log Message: * Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs - Change specification of ulUnicodeRange1-4 to unsigned long fonttools-unsigned-ranges.patch: --- NEW FILE fonttools-unsigned-ranges.patch --- --- fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py.unsigned-ranges 2006-05-08 17:13:17.000000000 +0330 +++ fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py 2006-05-08 17:14:04.000000000 +0330 @@ -52,10 +52,10 @@ yStrikeoutPosition: h # strikeout position sFamilyClass: h # font family class and subclass panose: 10s # panose classification number - ulUnicodeRange1: l # character range - ulUnicodeRange2: l # character range - ulUnicodeRange3: l # character range - ulUnicodeRange4: l # character range + ulUnicodeRange1: L # character range + ulUnicodeRange2: L # character range + ulUnicodeRange3: L # character range + ulUnicodeRange4: L # character range achVendID: 4s # font vendor identification fsSelection: H # font selection flags fsFirstCharIndex: H # first unicode character index Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fonttools.spec 13 Feb 2006 18:01:32 -0000 1.3 +++ fonttools.spec 8 May 2006 14:35:36 -0000 1.4 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.5.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -11,6 +11,7 @@ URL: http://sourceforge.net/projects/fonttools/ Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2 Patch1: fonttools-20050315-20050624.patch +Patch2: fonttools-unsigned-ranges.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-numeric @@ -28,6 +29,7 @@ %prep %setup -q -n %{name} %patch1 -p1 -b .20050624 +%patch2 -p1 -b .unsigned-ranges %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py %{__chmod} a-x LICENSE.txt @@ -76,6 +78,9 @@ %changelog +* Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs +- Change specification of ulUnicodeRange1-4 to unsigned long + * Mon Feb 13 2006 Roozbeh Pournader - 2.0-0.5.20050624cvs - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon May 8 15:09:21 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 8 May 2006 08:09:21 -0700 Subject: rpms/abiword/FC-3 abiword-2.4.4-x86_64.patch, NONE, 1.1 abiword.spec, 1.34, 1.35 Message-ID: <200605081509.k48F9N38031278@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31256 Modified Files: abiword.spec Added Files: abiword-2.4.4-x86_64.patch Log Message: Fix 190591 abiword-2.4.4-x86_64.patch: --- NEW FILE abiword-2.4.4-x86_64.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2005-09-27 00:23:02.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2006-05-08 01:17:00.000000000 +0200 @@ -586,7 +586,7 @@ (!m_bSave ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL) + (gchar*)NULL) ); #endif Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- abiword.spec 11 Apr 2006 10:31:23 -0000 1.34 +++ abiword.spec 8 May 2006 15:09:21 -0000 1.35 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -42,6 +42,7 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.2-gsf.patch +Patch3: abiword-2.4.4-x86_64.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -52,6 +53,7 @@ %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop %patch2 -p1 -b .gsf +%patch3 -p1 -b .x86_64 %build cd abi @@ -135,6 +137,9 @@ %{_datadir}/icons/*png %changelog +* Mon May 08 2006 Marc Maurer - 1:2.4.4-2.fc3 +- Fix bug 190591 - crash on x86_64 machines when saving a document + * Tue Apr 11 2006 Marc Maurer - 1:2.4.4-1.fc3 - New upstream version - Remove the macro patch and update the desktop patch From fedora-extras-commits at redhat.com Mon May 8 15:34:35 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 08:34:35 -0700 Subject: fedora-security/audit fe4,1.8,1.9 fe5,1.8,1.9 Message-ID: <200605081534.k48FYZ2t031498@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31476 Modified Files: fe4 fe5 Log Message: add nessus candidate Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fe4 8 May 2006 00:04:52 -0000 1.8 +++ fe4 8 May 2006 15:34:32 -0000 1.9 @@ -6,5 +6,6 @@ CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 +CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fe5 8 May 2006 00:04:52 -0000 1.8 +++ fe5 8 May 2006 15:34:32 -0000 1.9 @@ -6,5 +6,6 @@ CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 +CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch From fedora-extras-commits at redhat.com Mon May 8 15:51:19 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 08:51:19 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.5, 1.6 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.3, NONE Message-ID: <200605081551.k48FpL3U031641@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31614/devel Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h --- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 +++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 @@ -169,7 +169,7 @@ /* platform independent options- uncomment to enable */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_ISC_READER */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init --- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 @@ -0,0 +1,75 @@ +#!/bin/sh +# +# Startup script for the DNS caching server +# +# chkconfig: - 99 01 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.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 + +dnsmasq=/usr/sbin/dnsmasq +[ -f $dnsmasq ] || exit 0 + +DOMAIN_SUFFIX=`dnsdomainname` +if [ ! -z "${DOMAIN_SUFFIX}" ]; then + OPTIONS="-s $DOMAIN_SUFFIX" +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting dnsmasq: " + daemon $dnsmasq $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq + ;; + stop) + if test "x`pidof dnsmasq`" != x; then + echo -n "Shutting down dnsmasq: " + killproc dnsmasq + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid + ;; + status) + status dnsmasq + RETVAL=$? + ;; + reload) + echo -n "Reloading dnsmasq: " + killproc dnsmasq -HUP + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + if test "x`/sbin/pidof dnsmasq`" != x; then + $0 stop + $0 start + RETVAL=$? + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dnsmasq.spec 2 May 2006 16:28:07 -0000 1.5 +++ dnsmasq.spec 8 May 2006 15:51:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -53,8 +51,10 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 15:51:19 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 16:00:59 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Mon, 8 May 2006 09:00:59 -0700 Subject: rpms/flumotion/FC-5 .cvsignore, 1.4, 1.5 flumotion.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605081601.k48G11QK031836@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31814 Modified Files: .cvsignore flumotion.spec sources Log Message: update spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Mar 2006 14:17:25 -0000 1.4 +++ .cvsignore 8 May 2006 16:00:59 -0000 1.5 @@ -1 +1 @@ -flumotion-0.2.0.tar.bz2 +flumotion-0.2.1.tar.bz2 Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- flumotion.spec 17 Mar 2006 21:29:04 -0000 1.6 +++ flumotion.spec 8 May 2006 16:00:59 -0000 1.7 @@ -4,8 +4,8 @@ %define gstreamer gstreamer Name: flumotion -Version: 0.2.0 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet @@ -141,7 +141,7 @@ # create a default worker config if no worker configs present # the default login will be user/test # FIXME: still need a way of specifying we really do not want a default worker -if ! test -e %{_sysconfdir}/flumotion/*/default.xml +if ! test -e %{_sysconfdir}/flumotion/workers/default.xml then cat > %{_sysconfdir}/flumotion/workers/default.xml < @@ -219,6 +219,11 @@ %{_sysconfdir}/rc.d/init.d/flumotion %changelog +* Mon May 08 2006 Thomas Vander Stichele +- 0.2.1-1 +- new upstream release +- fix post script for creating worker config + * Fri Mar 17 2006 Thomas Vander Stichele - 0.2.0-2 - require pyOpenSSL, without which the manager does not start Index: sources =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Mar 2006 14:17:25 -0000 1.4 +++ sources 8 May 2006 16:00:59 -0000 1.5 @@ -1 +1 @@ -f674eb7286fb0cef687c372a0da1ebd1 flumotion-0.2.0.tar.bz2 +56b54f35f791eca377475640725bd227 flumotion-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 16:03:39 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Mon, 8 May 2006 09:03:39 -0700 Subject: rpms/flumotion/devel flumotion.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200605081603.k48G3fT0001684@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1665 Modified Files: flumotion.spec sources Log Message: new upstream release Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/devel/flumotion.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- flumotion.spec 5 Mar 2006 14:17:25 -0000 1.4 +++ flumotion.spec 8 May 2006 16:03:39 -0000 1.5 @@ -4,7 +4,7 @@ %define gstreamer gstreamer Name: flumotion -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: Flumotion - the Fluendo Streaming Server @@ -21,6 +21,7 @@ Requires: python-twisted >= 1.3.0 Requires: pygtk2 >= 2.8.0 Requires: python-imaging +Requires: pyOpenSSL # for make-dummy-cert to work Requires(post): openssl @@ -99,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT %pre -/usr/sbin/useradd -s /sbin/nologin -r -d %{_datadir}/flumotion -M -r \ +/usr/sbin/useradd -s /sbin/nologin -r -d %{_localstatedir}/cache/flumotion -M -r \ flumotion > /dev/null 2> /dev/null || : %post @@ -140,7 +141,7 @@ # create a default worker config if no worker configs present # the default login will be user/test # FIXME: still need a way of specifying we really do not want a default worker -if ! test -e %{_sysconfdir}/flumotion/*/default.xml +if ! test -e %{_sysconfdir}/flumotion/workers/default.xml then cat > %{_sysconfdir}/flumotion/workers/default.xml < @@ -210,7 +211,6 @@ %{_datadir}/flumotion/image %{_datadir}/flumotion/make-dummy-cert %{_datadir}/flumotion/*.xsl -%dir %attr(750,flumotion,root) %{_datadir}/flumotion/.flumotion %attr(750,flumotion,root) %{_sysconfdir}/flumotion %attr(750,flumotion,root) %{_localstatedir}/run/flumotion @@ -219,6 +219,17 @@ %{_sysconfdir}/rc.d/init.d/flumotion %changelog +* Mon May 08 2006 Thomas Vander Stichele +- 0.2.1-1 +- new upstream release +- fix post script for creating worker config + +* Fri Mar 17 2006 Thomas Vander Stichele +- 0.2.0-2 +- require pyOpenSSL, without which the manager does not start +- use /var/cache/flumotion as the home dir, so that the cache can be written, + instead of using datadir + * Sun Mar 05 2006 Thomas Vander Stichele - 0.2.0-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/flumotion/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Mar 2006 14:17:25 -0000 1.4 +++ sources 8 May 2006 16:03:39 -0000 1.5 @@ -1 +1 @@ -f674eb7286fb0cef687c372a0da1ebd1 flumotion-0.2.0.tar.bz2 +56b54f35f791eca377475640725bd227 flumotion-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 16:12:28 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 8 May 2006 09:12:28 -0700 Subject: rpms/nsd/FC-5 nsd.init,1.1,1.2 Message-ID: <200605081612.k48GCUnE001843@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1826 Modified Files: nsd.init Log Message: added workaround for when no ipv6 Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-5/nsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsd.init 13 Dec 2005 03:51:03 -0000 1.1 +++ nsd.init 8 May 2006 16:12:28 -0000 1.2 @@ -24,9 +24,14 @@ #extra verbosity #ZONEC_VERBOSE=-v - OTHER_NSD_OPTS="" +#work around for bug in nsd-2.3.4 when no ipv6 is available +if [ ! -d /proc/sys/net/ipv6/ ] +then + OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS" +fi + # Source function library. . /etc/init.d/functions From fedora-extras-commits at redhat.com Mon May 8 16:13:35 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 8 May 2006 09:13:35 -0700 Subject: rpms/nsd/FC-5 nsd.spec,1.6,1.7 Message-ID: <200605081613.k48GDbiw001866@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1849 Modified Files: nsd.spec Log Message: sync with nsd-2.3.4 Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-5/nsd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsd.spec 15 Dec 2005 15:48:59 -0000 1.6 +++ nsd.spec 8 May 2006 16:13:35 -0000 1.7 @@ -1,12 +1,11 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd -Version: 2.3.3 -Release: 7%{?dist} +Version: 2.3.4 +Release: 4%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz Source1: nsd.init -Patch0: nsd-2.3.3-checking.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel @@ -19,9 +18,8 @@ %prep %setup -q -%patch0 -p1 -b .checking.patch -%configure --enable-bind8-stats --enable-plugins \ +%configure --enable-bind8-stats --enable-plugins --enable-checking \ --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \ --with-user=nsd @@ -30,22 +28,16 @@ %install rm -rf %{buildroot} -# Not using their 'make install' since it uses install-sh which does not -# get the correct install path within the RPM_BUILD_ROOT -#%{__make} install -install -d 0755 %{buildroot}/%{_sysconfdir}/nsd -install -d 0755 %{buildroot}/%{_sbindir} -install -d 0755 %{buildroot}/%{_mandir}/man8 -install -d 0755 %{buildroot}/%{_initrddir} -install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name} - -install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf -install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones +%{__make} DESTDIR=%{buildroot} install +install -d 0755 %{buildroot}%{_initrddir} install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd +install -d 0700 %{buildroot}%{_localstatedir}/run/%{name} -install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir} -install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc -install -m 0644 *.8 %{buildroot}/%{_mandir}/man8 +# change .sample to normal config files +mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsdc.conf +mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsd.zones %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,6 +76,13 @@ fi %changelog +* Sun May 7 2006 Paul Wouters - 2.3.4-4 +- Upgraded to nsd-2.3.4. +- Removed manual install targets because DESTDIR is now supported +- Re-enabled --checking, checking patch no longer needed and removed. +- Work around in nsd.init for nsd failing to start when there is no ipv6 +- Various release bumps due to 'make tag' failures :( + * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Mon May 8 16:14:27 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 8 May 2006 09:14:27 -0700 Subject: rpms/nsd/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605081614.k48GET1a001904@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1881 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 03:51:03 -0000 1.2 +++ .cvsignore 8 May 2006 16:14:26 -0000 1.3 @@ -1 +1 @@ -nsd-2.3.3.tar.gz +nsd-2.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 03:51:03 -0000 1.2 +++ sources 8 May 2006 16:14:26 -0000 1.3 @@ -1 +1 @@ -7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz +72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Mon May 8 16:23:27 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Mon, 8 May 2006 09:23:27 -0700 Subject: rpms/fonttools/FC-4 fonttools-unsigned-ranges.patch, NONE, 1.1 fonttools.spec, 1.2, 1.3 Message-ID: <200605081623.k48GNTcg002056@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2036 Modified Files: fonttools.spec Added Files: fonttools-unsigned-ranges.patch Log Message: * Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs - Change specification of ulUnicodeRange1-4 to unsigned long fonttools-unsigned-ranges.patch: --- NEW FILE fonttools-unsigned-ranges.patch --- --- fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py.unsigned-ranges 2006-05-08 17:13:17.000000000 +0330 +++ fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py 2006-05-08 17:14:04.000000000 +0330 @@ -52,10 +52,10 @@ yStrikeoutPosition: h # strikeout position sFamilyClass: h # font family class and subclass panose: 10s # panose classification number - ulUnicodeRange1: l # character range - ulUnicodeRange2: l # character range - ulUnicodeRange3: l # character range - ulUnicodeRange4: l # character range + ulUnicodeRange1: L # character range + ulUnicodeRange2: L # character range + ulUnicodeRange3: L # character range + ulUnicodeRange4: L # character range achVendID: 4s # font vendor identification fsSelection: H # font selection flags fsFirstCharIndex: H # first unicode character index Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/FC-4/fonttools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fonttools.spec 2 Feb 2006 13:13:43 -0000 1.2 +++ fonttools.spec 8 May 2006 16:23:27 -0000 1.3 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.4.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -11,6 +11,7 @@ URL: http://sourceforge.net/projects/fonttools/ Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2 Patch1: fonttools-20050315-20050624.patch +Patch2: fonttools-unsigned-ranges.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-numeric @@ -28,6 +29,7 @@ %prep %setup -q -n %{name} %patch1 -p1 -b .20050624 +%patch2 -p1 -b .unsigned-ranges %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py %{__chmod} a-x LICENSE.txt @@ -76,6 +78,12 @@ %changelog +* Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs +- Change specification of ulUnicodeRange1-4 to unsigned long + +* Mon Feb 13 2006 Roozbeh Pournader - 2.0-0.5.20050624cvs +- Rebuild for Fedora Extras 5 + * Thu Feb 02 2006 Roozbeh Pournader - 2.0-0.4.20050624cvs - Provide ttx From fedora-extras-commits at redhat.com Mon May 8 16:32:59 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Mon, 8 May 2006 09:32:59 -0700 Subject: rpms/fonttools/FC-5 fonttools-unsigned-ranges.patch, NONE, 1.1 fonttools.spec, 1.3, 1.4 Message-ID: <200605081633.k48GX19q002189@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2169 Modified Files: fonttools.spec Added Files: fonttools-unsigned-ranges.patch Log Message: * Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs - Change specification of ulUnicodeRange1-4 to unsigned long fonttools-unsigned-ranges.patch: --- NEW FILE fonttools-unsigned-ranges.patch --- --- fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py.unsigned-ranges 2006-05-08 17:13:17.000000000 +0330 +++ fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py 2006-05-08 17:14:04.000000000 +0330 @@ -52,10 +52,10 @@ yStrikeoutPosition: h # strikeout position sFamilyClass: h # font family class and subclass panose: 10s # panose classification number - ulUnicodeRange1: l # character range - ulUnicodeRange2: l # character range - ulUnicodeRange3: l # character range - ulUnicodeRange4: l # character range + ulUnicodeRange1: L # character range + ulUnicodeRange2: L # character range + ulUnicodeRange3: L # character range + ulUnicodeRange4: L # character range achVendID: 4s # font vendor identification fsSelection: H # font selection flags fsFirstCharIndex: H # first unicode character index Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/FC-5/fonttools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fonttools.spec 13 Feb 2006 18:01:32 -0000 1.3 +++ fonttools.spec 8 May 2006 16:32:59 -0000 1.4 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.5.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -11,6 +11,7 @@ URL: http://sourceforge.net/projects/fonttools/ Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2 Patch1: fonttools-20050315-20050624.patch +Patch2: fonttools-unsigned-ranges.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-numeric @@ -28,6 +29,7 @@ %prep %setup -q -n %{name} %patch1 -p1 -b .20050624 +%patch2 -p1 -b .unsigned-ranges %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py %{__chmod} a-x LICENSE.txt @@ -76,6 +78,9 @@ %changelog +* Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs +- Change specification of ulUnicodeRange1-4 to unsigned long + * Mon Feb 13 2006 Roozbeh Pournader - 2.0-0.5.20050624cvs - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon May 8 16:35:04 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 09:35:04 -0700 Subject: fedora-security/audit fe4,1.9,1.10 fe5,1.9,1.10 Message-ID: <200605081635.k48GZ4Ns002229@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2209 Modified Files: fe4 fe5 Log Message: add fixed amaya cve Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fe4 8 May 2006 15:34:32 -0000 1.9 +++ fe4 8 May 2006 16:35:02 -0000 1.10 @@ -9,3 +9,4 @@ CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch +CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fe5 8 May 2006 15:34:32 -0000 1.9 +++ fe5 8 May 2006 16:35:02 -0000 1.10 @@ -9,3 +9,4 @@ CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch +CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 From fedora-extras-commits at redhat.com Mon May 8 16:39:56 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Mon, 8 May 2006 09:39:56 -0700 Subject: mock mock.py,1.42,1.43 Message-ID: <200605081639.k48GduAu002309@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2290 Modified Files: mock.py Log Message: enable SLES9 and SLES10 build environments Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mock.py 21 Apr 2006 13:07:26 -0000 1.42 +++ mock.py 8 May 2006 16:39:53 -0000 1.43 @@ -566,8 +566,9 @@ for item in [os.path.join(self.rootdir, 'etc', 'mtab'), os.path.join(self.rootdir, 'etc', 'fstab'), os.path.join(self.rootdir, 'var', 'log', 'yum.log')]: - fo = open(item, 'w') - fo.close() + if not os.path.exists(item): + fo = open(item, 'w') + fo.close() # write in yum.conf into chroot yumconf = os.path.join(self.rootdir, 'etc', 'yum.conf') @@ -578,6 +579,13 @@ # files in /etc that need doing filedict = self.config['files'] for key in filedict: + # ensure permisssions + if os.path.exists( "%s%s" % (self.rootdir, key) ): + cmd = "chown %s.%s %s" % (self.config['chrootuser'], + self.config['chrootgroup'], "%s" % key) + self.do_chroot(cmd, fatal = True) + + # write file fn = '%s%s' % (self.rootdir, key) fo = open(fn, 'w') fo.write(filedict[key]) @@ -589,7 +597,7 @@ if not os.path.exists(self.rootdir + self.homedir): if not os.path.exists(os.path.join(self.rootdir, 'usr/sbin/useradd')): raise RootError, "Could not find useradd in chroot, maybe the install failed?" - cmd = '/usr/sbin/useradd -u %s -d %s %s' % (self.config['chrootuid'], + cmd = '/usr/sbin/useradd -m -u %s -d %s %s' % (self.config['chrootuid'], self.homedir, self.config['chrootuser']) self.do_chroot(cmd, fatal = True) @@ -604,9 +612,11 @@ for subdir in ('RPMS', 'SRPMS', 'SOURCES', 'SPECS', 'BUILD', 'originals'): cmd = "mkdir -p %s/%s" % (self.builddir, subdir) self.do_chroot(cmd, fatal = True) - cmd = "chown %s.%s %s/%s" % (self.config['chrootuser'], - self.config['chrootgroup'], self.builddir, subdir) - self.do_chroot(cmd, fatal = True) + + # change ownership so we can write to build home dir + cmd = "chown -R %s.%s %s" % (self.config['chrootuser'], + self.config['chrootgroup'], self.homedir) + self.do_chroot(cmd, fatal = True) # rpmmacros default macrofile_out = '%s%s/.rpmmacros' % (self.rootdir, self.homedir) From fedora-extras-commits at redhat.com Mon May 8 16:55:31 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 09:55:31 -0700 Subject: rpms/lightning/devel lightning.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605081655.k48GtXWA002487@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2467 Modified Files: .cvsignore sources Added Files: lightning.spec Log Message: Manual import of lightning --- NEW FILE lightning.spec --- Name: lightning Version: 1.2 Release: 3%{?dist} Summary: GNU Lightning Group: Development/Libraries License: LGPL URL: http://www.gnu.org/software/lightning/lightning.html Source0: ftp://ftp.gnu.org/pub/gnu/lightning/lightning-1.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} ppc sparc Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description GNU lightning is a library to aid in making portable programs that compiles assembly code at run time. %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/%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/lightning.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/lightning.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %{_bindir}/lightningize %{_includedir}/lightning/ %{_datadir}/aclocal/lightning.m4 %dir %{_datadir}/lightning %{_datadir}/lightning/Makefile.am %{_mandir}/man1/lightningize.1.gz %{_infodir}/lightning.info.gz %doc AUTHORS ChangeLog COPYING COPYING.DOC COPYING.LESSER NEWS README THANKS %changelog * Mon Feb 20 2006 Jochen Schmitt 1.2-3 - Remove %%{_infodir}/dir * Sun Feb 19 2006 Jochen Schmitt 1.2-2 - Fix buildRequires - rmove %%{_infodir}/dir file * Sun Dec 4 2005 Jochen Schmitt 1.2-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lightning/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 19:44:46 -0000 1.1 +++ .cvsignore 8 May 2006 16:55:31 -0000 1.2 @@ -0,0 +1 @@ +lightning-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lightning/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 19:44:46 -0000 1.1 +++ sources 8 May 2006 16:55:31 -0000 1.2 @@ -0,0 +1 @@ +dcd2c46ee4dd5d99edd9930022ad2153 lightning-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 8 16:59:40 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 09:59:40 -0700 Subject: rpms/stellarium/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 stellarium.spec, 1.16, 1.17 Message-ID: <200605081659.k48Gxgsh002592@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571 Modified Files: .cvsignore sources stellarium.spec Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Feb 2006 17:33:53 -0000 1.7 +++ .cvsignore 8 May 2006 16:59:39 -0000 1.8 @@ -1,2 +1,2 @@ -stellarium-0.7.1.tar.gz +stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Feb 2006 17:33:53 -0000 1.7 +++ sources 8 May 2006 16:59:39 -0000 1.8 @@ -1,2 +1,2 @@ -94cb47d20d31d5e0bba5d9e0189c331b stellarium-0.7.1.tar.gz +2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz 9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- stellarium.spec 14 Feb 2006 17:38:08 -0000 1.16 +++ stellarium.spec 8 May 2006 16:59:39 -0000 1.17 @@ -1,6 +1,6 @@ Name: stellarium -Version: 0.7.1 -Release: 7%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -9,7 +9,7 @@ Source0: http://dl.sf.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop Source2: http://dl.sf.net/stellarum/stellarium_user_guide-0.7.1-1.pdf -Patch0: stellarium-0.7.1-gcc41.patch +Patch1: stellarium-0.8.0-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -39,7 +39,7 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 %build %configure @@ -61,7 +61,7 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ install -m 0644 -p stellarium-2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png -rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,files_format.txt,stellarium.ico} +rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico} cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version} %find_lang %{name} @@ -83,6 +83,9 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog +* Sun May 7 2006 Jochen Schmitt 0.8.0-1 +- New upstream release + * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 - Add stellarium user guide as doc subpackage - Add gcc41 patch from Diego Petteno From fedora-extras-commits at redhat.com Mon May 8 17:05:41 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 10:05:41 -0700 Subject: rpms/dnsmasq/FC-5 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.3, 1.4 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.2, NONE Message-ID: <200605081705.k48H5hTD005016@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-5 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h --- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 +++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 @@ -169,7 +169,7 @@ /* platform independent options- uncomment to enable */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_ISC_READER */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init --- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 @@ -0,0 +1,75 @@ +#!/bin/sh +# +# Startup script for the DNS caching server +# +# chkconfig: - 99 01 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.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 + +dnsmasq=/usr/sbin/dnsmasq +[ -f $dnsmasq ] || exit 0 + +DOMAIN_SUFFIX=`dnsdomainname` +if [ ! -z "${DOMAIN_SUFFIX}" ]; then + OPTIONS="-s $DOMAIN_SUFFIX" +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting dnsmasq: " + daemon $dnsmasq $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq + ;; + stop) + if test "x`pidof dnsmasq`" != x; then + echo -n "Shutting down dnsmasq: " + killproc dnsmasq + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid + ;; + status) + status dnsmasq + RETVAL=$? + ;; + reload) + echo -n "Reloading dnsmasq: " + killproc dnsmasq -HUP + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + if test "x`/sbin/pidof dnsmasq`" != x; then + $0 stop + $0 start + RETVAL=$? + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 16:37:50 -0000 1.3 +++ dnsmasq.spec 8 May 2006 17:05:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -53,8 +51,10 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 17:05:41 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:05:41 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 10:05:41 -0700 Subject: rpms/dnsmasq/FC-4 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.3, 1.4 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.2, NONE Message-ID: <200605081705.k48H5hNP005007@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-4 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h --- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 +++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 @@ -169,7 +169,7 @@ /* platform independent options- uncomment to enable */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_ISC_READER */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init --- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 @@ -0,0 +1,75 @@ +#!/bin/sh +# +# Startup script for the DNS caching server +# +# chkconfig: - 99 01 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.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 + +dnsmasq=/usr/sbin/dnsmasq +[ -f $dnsmasq ] || exit 0 + +DOMAIN_SUFFIX=`dnsdomainname` +if [ ! -z "${DOMAIN_SUFFIX}" ]; then + OPTIONS="-s $DOMAIN_SUFFIX" +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting dnsmasq: " + daemon $dnsmasq $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq + ;; + stop) + if test "x`pidof dnsmasq`" != x; then + echo -n "Shutting down dnsmasq: " + killproc dnsmasq + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid + ;; + status) + status dnsmasq + RETVAL=$? + ;; + reload) + echo -n "Reloading dnsmasq: " + killproc dnsmasq -HUP + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + if test "x`/sbin/pidof dnsmasq`" != x; then + $0 stop + $0 start + RETVAL=$? + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 16:37:49 -0000 1.3 +++ dnsmasq.spec 8 May 2006 17:05:40 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -53,8 +51,10 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 17:05:40 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:05:42 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 10:05:42 -0700 Subject: rpms/dnsmasq/devel .cvsignore,1.2,1.3 Message-ID: <200605081705.k48H5iA0005020@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/devel Modified Files: .cvsignore Log Message: Upgrade to 2.31 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2006 16:51:25 -0000 1.2 +++ .cvsignore 8 May 2006 17:05:42 -0000 1.3 @@ -1 +1,2 @@ dnsmasq-2.30.tar.gz +dnsmasq-2.31.tar.gz From fedora-extras-commits at redhat.com Mon May 8 17:06:01 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:06:01 -0700 Subject: rpms/stellarium/FC-5 stellarium-0.8.0-gcc41.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 stellarium.spec, 1.16, 1.17 stellarium-0.7.1-gcc41.patch, 1.1, NONE Message-ID: <200605081706.k48H638O005050@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5026 Modified Files: .cvsignore sources stellarium.spec Added Files: stellarium-0.8.0-gcc41.patch Removed Files: stellarium-0.7.1-gcc41.patch Log Message: New upstream release stellarium-0.8.0-gcc41.patch: --- NEW FILE stellarium-0.8.0-gcc41.patch --- --- stellarium-0.8.0/src/s_gui.h.org 2006-05-08 17:52:41.000000000 +0200 +++ stellarium-0.8.0/src/s_gui.h 2006-05-08 17:55:02.000000000 +0200 @@ -510,7 +510,7 @@ private: callback onChangeCallback; - void ScrollBar::adjustSize(void); + void adjustSize(void); Button scrollBt; bool vertical; unsigned int scrollOffset, scrollSize; @@ -837,7 +837,7 @@ class City { public: - City::City(const string& _name = "", const string& _state = "", const string& _country = "", + City(const string& _name = "", const string& _state = "", const string& _country = "", double _longitude = 0.f, double _latitude = 0.f, float zone = 0, int _showatzoom = 0, int _altitude = 0); void addCity(const string& _name = "", const string& _state = "", const string& _country = "", double _longitude = 0.f, double _latitude = 0.f, float zone = 0, int _showatzoom = 0, int _altitude = 0); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Feb 2006 17:33:53 -0000 1.7 +++ .cvsignore 8 May 2006 17:06:01 -0000 1.8 @@ -1,2 +1,2 @@ -stellarium-0.7.1.tar.gz +stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Feb 2006 17:33:53 -0000 1.7 +++ sources 8 May 2006 17:06:01 -0000 1.8 @@ -1,2 +1,2 @@ -94cb47d20d31d5e0bba5d9e0189c331b stellarium-0.7.1.tar.gz +2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz 9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- stellarium.spec 14 Feb 2006 17:38:08 -0000 1.16 +++ stellarium.spec 8 May 2006 17:06:01 -0000 1.17 @@ -1,6 +1,6 @@ Name: stellarium -Version: 0.7.1 -Release: 7%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -9,7 +9,7 @@ Source0: http://dl.sf.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop Source2: http://dl.sf.net/stellarum/stellarium_user_guide-0.7.1-1.pdf -Patch0: stellarium-0.7.1-gcc41.patch +Patch1: stellarium-0.8.0-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -39,7 +39,7 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 %build %configure @@ -61,7 +61,7 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ install -m 0644 -p stellarium-2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png -rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,files_format.txt,stellarium.ico} +rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico} cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version} %find_lang %{name} @@ -83,6 +83,9 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog +* Sun May 7 2006 Jochen Schmitt 0.8.0-1 +- New upstream release + * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 - Add stellarium user guide as doc subpackage - Add gcc41 patch from Diego Petteno --- stellarium-0.7.1-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:05:40 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 10:05:40 -0700 Subject: rpms/dnsmasq/FC-3 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.8, 1.9 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.2, NONE Message-ID: <200605081706.k48H6CRa005083@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-3 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h --- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 +++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 @@ -169,7 +169,7 @@ /* platform independent options- uncomment to enable */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_ISC_READER */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init --- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 @@ -0,0 +1,75 @@ +#!/bin/sh +# +# Startup script for the DNS caching server +# +# chkconfig: - 99 01 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.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 + +dnsmasq=/usr/sbin/dnsmasq +[ -f $dnsmasq ] || exit 0 + +DOMAIN_SUFFIX=`dnsdomainname` +if [ ! -z "${DOMAIN_SUFFIX}" ]; then + OPTIONS="-s $DOMAIN_SUFFIX" +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting dnsmasq: " + daemon $dnsmasq $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq + ;; + stop) + if test "x`pidof dnsmasq`" != x; then + echo -n "Shutting down dnsmasq: " + killproc dnsmasq + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid + ;; + status) + status dnsmasq + RETVAL=$? + ;; + reload) + echo -n "Reloading dnsmasq: " + killproc dnsmasq -HUP + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + if test "x`/sbin/pidof dnsmasq`" != x; then + $0 stop + $0 start + RETVAL=$? + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dnsmasq.spec 2 May 2006 16:48:07 -0000 1.8 +++ dnsmasq.spec 8 May 2006 17:05:40 -0000 1.9 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist}.1 +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -56,7 +54,7 @@ %if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ %endif -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -79,7 +77,7 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf %if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf @@ -90,8 +88,10 @@ %changelog -* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2.fc3.1 -- Don't install dbus/dnsmasq.conf on FC3 (dbus too old) +* Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 17:05:40 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:12:24 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:12:24 -0700 Subject: rpms/stellarium/FC-4 stellarium.spec,1.13,1.14 Message-ID: <200605081712.k48HCQw3005171@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5154 Modified Files: stellarium.spec Log Message: New upstream release Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- stellarium.spec 14 Feb 2006 17:42:55 -0000 1.13 +++ stellarium.spec 8 May 2006 17:12:24 -0000 1.14 @@ -1,6 +1,6 @@ Name: stellarium -Version: 0.7.1 -Release: 5%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -57,7 +57,7 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ install -m 0644 -p stellarium-2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png -rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,files_format.txt,stellarium.ico} +rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico} cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version} %find_lang %{name} @@ -78,6 +78,9 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog +* Mon May 8 2006 Jochen Schmitt 0.8.0-1 +- New upstream release + * Tue Feb 14 2006 Jochen Schmitt 0.7.1-5 - Add stellarium user guide as doc subpackage From fedora-extras-commits at redhat.com Mon May 8 17:18:37 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:18:37 -0700 Subject: rpms/stellarium/FC-4 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 stellarium.spec, 1.14, 1.15 Message-ID: <200605081718.k48HIdQm005277@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5256 Modified Files: .cvsignore sources stellarium.spec Log Message: correction becouse forgetting make new-source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Feb 2006 17:42:55 -0000 1.6 +++ .cvsignore 8 May 2006 17:18:36 -0000 1.7 @@ -1,2 +1,2 @@ -stellarium-0.7.1.tar.gz +stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Feb 2006 17:42:55 -0000 1.7 +++ sources 8 May 2006 17:18:36 -0000 1.8 @@ -1,2 +1,2 @@ -94cb47d20d31d5e0bba5d9e0189c331b stellarium-0.7.1.tar.gz +2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz 9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- stellarium.spec 8 May 2006 17:12:24 -0000 1.14 +++ stellarium.spec 8 May 2006 17:18:36 -0000 1.15 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -78,7 +78,7 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog -* Mon May 8 2006 Jochen Schmitt 0.8.0-1 +* Mon May 8 2006 Jochen Schmitt 0.8.0-2 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-5 From fedora-extras-commits at redhat.com Mon May 8 17:36:13 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:36:13 -0700 Subject: rpms/stellarium/devel stellarium-0.8.0-gcc41.patch, NONE, 1.1 stellarium.spec, 1.17, 1.18 Message-ID: <200605081736.k48HaFNe005517@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5497 Modified Files: stellarium.spec Added Files: stellarium-0.8.0-gcc41.patch Log Message: Add gcc41 patch to cvs stellarium-0.8.0-gcc41.patch: --- NEW FILE stellarium-0.8.0-gcc41.patch --- --- stellarium-0.8.0/src/s_gui.h.org 2006-05-08 17:52:41.000000000 +0200 +++ stellarium-0.8.0/src/s_gui.h 2006-05-08 17:55:02.000000000 +0200 @@ -510,7 +510,7 @@ private: callback onChangeCallback; - void ScrollBar::adjustSize(void); + void adjustSize(void); Button scrollBt; bool vertical; unsigned int scrollOffset, scrollSize; @@ -837,7 +837,7 @@ class City { public: - City::City(const string& _name = "", const string& _state = "", const string& _country = "", + City(const string& _name = "", const string& _state = "", const string& _country = "", double _longitude = 0.f, double _latitude = 0.f, float zone = 0, int _showatzoom = 0, int _altitude = 0); void addCity(const string& _name = "", const string& _state = "", const string& _country = "", double _longitude = 0.f, double _latitude = 0.f, float zone = 0, int _showatzoom = 0, int _altitude = 0); Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- stellarium.spec 8 May 2006 16:59:39 -0000 1.17 +++ stellarium.spec 8 May 2006 17:36:13 -0000 1.18 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -83,7 +83,7 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog -* Sun May 7 2006 Jochen Schmitt 0.8.0-1 +* Sun May 7 2006 Jochen Schmitt 0.8.0-2 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 From fedora-extras-commits at redhat.com Mon May 8 17:36:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:36:39 -0700 Subject: rpms/perl-Module-Install/devel - New directory Message-ID: <200605081736.k48HafnA005612@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5578/perl-Module-Install/devel Log Message: Directory /cvs/extras/rpms/perl-Module-Install/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 17:36:38 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:36:38 -0700 Subject: rpms/perl-Module-Install - New directory Message-ID: <200605081736.k48HaenD005606@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5578/perl-Module-Install Log Message: Directory /cvs/extras/rpms/perl-Module-Install added to the repository From fedora-extras-commits at redhat.com Mon May 8 17:36:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:36:59 -0700 Subject: rpms/perl-Module-Install Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605081737.k48Hb1ST005662@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5634 Added Files: Makefile import.log Log Message: Setup of module perl-Module-Install --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-Install all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 17:37:00 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:37:00 -0700 Subject: rpms/perl-Module-Install/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605081737.k48Hb2T2005665@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5634/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-Install --- NEW 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 May 8 17:37:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:37:44 -0700 Subject: rpms/perl-Module-Install import.log,1.1,1.2 Message-ID: <200605081738.k48HcG0G005737@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5698 Modified Files: import.log Log Message: auto-import perl-Module-Install-0.62-2 on branch devel from perl-Module-Install-0.62-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Install/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 May 2006 17:36:59 -0000 1.1 +++ import.log 8 May 2006 17:37:44 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-Install-0_62-2:HEAD:perl-Module-Install-0.62-2.src.rpm:1147109852 From fedora-extras-commits at redhat.com Mon May 8 17:37:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:37:44 -0700 Subject: rpms/perl-Module-Install/devel perl-Module-Install.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605081738.k48HcGXI005741@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5698/devel Modified Files: .cvsignore sources Added Files: perl-Module-Install.spec Log Message: auto-import perl-Module-Install-0.62-2 on branch devel from perl-Module-Install-0.62-2.src.rpm --- NEW FILE perl-Module-Install.spec --- Name: perl-Module-Install Version: 0.62 Release: 2%{?dist} Summary: Standalone, extensible Perl module installer License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Install/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Install-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Module::CoreList) BuildRequires: perl(Module::ScanDeps) >= 0.28 BuildRequires: perl(PAR::Dist) >= 0.03 BuildRequires: perl(YAML) >= 0.35 BuildRequires: perl(Test::Pod) >= 1.14 Requires: perl(Module::Build) Requires: perl(Module::CoreList) Requires: perl(Module::ScanDeps) >= 0.28 Requires: perl(PAR::Dist) >= 0.03 Requires: perl(YAML) >= 0.35 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::Install is a package for writing installers for CPAN (or CPAN-like) distributions that are clean, simple, minimalist, act in a strictly correct manner with both the ExtUtils::MakeMaker and Module::Build build systems, and will run on any Perl installation version 5.004 or newer. %prep %setup -q -n Module-Install-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* find $RPM_BUILD_ROOT%{perl_vendorlib} -type f -perm +100 -exec chmod a-x {} \; %check make test TEST_POD=1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 08 2006 Steven Pritchard 0.62-2 - Fix Source0 URL. * Sat May 06 2006 Steven Pritchard 0.62-1 - Update to 0.62. - Drop executable bit from everything in vendor_perl to make rpmlint happy. * Thu Mar 23 2006 Steven Pritchard 0.61-1 - Specfile autogenerated by cpanspec 1.63. - Drop explicit BR: perl. - Turn on TEST_POD. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Install/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 17:37:00 -0000 1.1 +++ .cvsignore 8 May 2006 17:37:44 -0000 1.2 @@ -0,0 +1 @@ +Module-Install-0.62.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Install/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 17:37:00 -0000 1.1 +++ sources 8 May 2006 17:37:44 -0000 1.2 @@ -0,0 +1 @@ +92eda243d936f4010883825aa2dd2993 Module-Install-0.62.tar.gz From fedora-extras-commits at redhat.com Mon May 8 17:43:18 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:43:18 -0700 Subject: rpms/stellarium/FC-5 stellarium.spec,1.17,1.18 Message-ID: <200605081743.k48HhKu1005816@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5799 Modified Files: stellarium.spec Log Message: Add Fretype-devel as BuildRequires Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- stellarium.spec 8 May 2006 17:06:01 -0000 1.17 +++ stellarium.spec 8 May 2006 17:43:17 -0000 1.18 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -20,6 +20,7 @@ BuildRequires: mesa-libGLU-devel BuildRequires: ImageMagick BuildRequires: libpng-devel +BuildRequires: freetype-devel %description Stellarium is a real-time 3D photo-realistic nightsky renderer. It can @@ -83,7 +84,7 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog -* Sun May 7 2006 Jochen Schmitt 0.8.0-1 +* Sun May 7 2006 Jochen Schmitt 0.8.0-2 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 From fedora-extras-commits at redhat.com Mon May 8 17:48:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 8 May 2006 10:48:38 -0700 Subject: rpms/pcsc-tools/FC-5 .cvsignore, 1.5, 1.6 pcsc-tools.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605081748.k48Hmep8005943@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5906/FC-5 Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Mon May 8 2006 Ville Skytt?? - 1.4.5-1 - 1.4.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Mar 2006 19:21:44 -0000 1.5 +++ .cvsignore 8 May 2006 17:48:38 -0000 1.6 @@ -1 +1 @@ -pcsc-tools-1.4.4.tar.gz +pcsc-tools-1.4.5.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/pcsc-tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pcsc-tools.spec 25 Mar 2006 19:21:44 -0000 1.6 +++ pcsc-tools.spec 8 May 2006 17:48:38 -0000 1.7 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -29,7 +29,7 @@ sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c fi # cp %{SOURCE1} . -for f in Changelog smartcard_list.txt ; do +for f in Changelog README smartcard_list.txt ; do iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f done @@ -64,6 +64,9 @@ %changelog +* Mon May 8 2006 Ville Skytt?? - 1.4.5-1 +- 1.4.5. + * Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Mar 2006 19:21:44 -0000 1.5 +++ sources 8 May 2006 17:48:38 -0000 1.6 @@ -1 +1 @@ -f224de5a58f533f7b5bce1b9e9a340d7 pcsc-tools-1.4.4.tar.gz +706a6e3bcac08d62c44fb2cd1d561969 pcsc-tools-1.4.5.tar.gz From fedora-extras-commits at redhat.com Mon May 8 17:48:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 8 May 2006 10:48:39 -0700 Subject: rpms/pcsc-tools/devel .cvsignore, 1.5, 1.6 pcsc-tools.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605081748.k48Hmf7v005949@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5906/devel Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Mon May 8 2006 Ville Skytt?? - 1.4.5-1 - 1.4.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Mar 2006 19:21:52 -0000 1.5 +++ .cvsignore 8 May 2006 17:48:39 -0000 1.6 @@ -1 +1 @@ -pcsc-tools-1.4.4.tar.gz +pcsc-tools-1.4.5.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pcsc-tools.spec 25 Mar 2006 19:21:52 -0000 1.6 +++ pcsc-tools.spec 8 May 2006 17:48:39 -0000 1.7 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -29,7 +29,7 @@ sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c fi # cp %{SOURCE1} . -for f in Changelog smartcard_list.txt ; do +for f in Changelog README smartcard_list.txt ; do iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f done @@ -64,6 +64,9 @@ %changelog +* Mon May 8 2006 Ville Skytt?? - 1.4.5-1 +- 1.4.5. + * Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Mar 2006 19:21:52 -0000 1.5 +++ sources 8 May 2006 17:48:39 -0000 1.6 @@ -1 +1 @@ -f224de5a58f533f7b5bce1b9e9a340d7 pcsc-tools-1.4.4.tar.gz +706a6e3bcac08d62c44fb2cd1d561969 pcsc-tools-1.4.5.tar.gz From fedora-extras-commits at redhat.com Mon May 8 17:50:06 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 8 May 2006 10:50:06 -0700 Subject: rpms/adns/FC-5 adns-autoconf-noexpand.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 adns-DESTDIR.patch, 1.1, 1.2 adns.spec, 1.6, 1.7 sources, 1.2, 1.3 adns-1.1-parsedomain.patch, 1.1, NONE adns-1.1-semicolon.patch, 1.1, NONE Message-ID: <200605081750.k48Ho9n6006070@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/adns/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6041 Modified Files: .cvsignore adns-DESTDIR.patch adns.spec sources Added Files: adns-autoconf-noexpand.patch Removed Files: adns-1.1-parsedomain.patch adns-1.1-semicolon.patch Log Message: Upgrading to 1.2 adns-autoconf-noexpand.patch: --- NEW FILE adns-autoconf-noexpand.patch --- --- adns-1.2/settings.make.in.noexpand 2006-05-08 10:24:44.000000000 -0400 +++ adns-1.2/settings.make.in 2006-05-08 10:25:46.000000000 -0400 @@ -47,9 +47,9 @@ prefix= @prefix@ exec_prefix= @exec_prefix@ -bin_dir= $(exec_prefix)/bin -lib_dir= $(exec_prefix)/lib -include_dir= $(prefix)/include +bin_dir= @bindir@ +lib_dir= @libdir@ +include_dir= @includedir@ AC_INSTALL= @INSTALL@ ifeq ($(AC_INSTALL),./install-sh -c) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:00:46 -0000 1.2 +++ .cvsignore 8 May 2006 17:50:06 -0000 1.3 @@ -1 +1,2 @@ adns-1.1.tar.gz +adns-1.2.tar.gz adns-DESTDIR.patch: Index: adns-DESTDIR.patch =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/adns-DESTDIR.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- adns-DESTDIR.patch 8 Nov 2004 04:00:46 -0000 1.1 +++ adns-DESTDIR.patch 8 May 2006 17:50:06 -0000 1.2 @@ -1,7 +1,6 @@ -diff -Nru adns-1.0/Makefile.in adns-1.0.new/Makefile.in ---- adns-1.0/Makefile.in Sun Sep 17 16:10:57 2000 -+++ adns-1.0.new/Makefile.in Mon Nov 19 02:34:14 2001 -@@ -38,7 +38,7 @@ +--- adns-1.2/Makefile.in.destdir 2006-04-08 10:37:21.000000000 -0400 ++++ adns-1.2/Makefile.in 2006-05-08 10:11:16.000000000 -0400 +@@ -37,7 +37,7 @@ SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress all install uninstall clean distclean mostlyclean maintainer-clean distprep: @@ -10,79 +9,64 @@ $(MAKE) $@-here all-here install-here uninstall-here distprep-here: README -diff -Nru adns-1.0/client/Makefile.in adns-1.0.new/client/Makefile.in ---- adns-1.0/client/Makefile.in Sun Sep 17 02:43:10 2000 -+++ adns-1.0.new/client/Makefile.in Mon Nov 19 02:36:50 2001 -@@ -59,11 +59,12 @@ - all: $(TARGETS) - - install: $(TARG_INSTALL) -+ $(INSTALL) -d $(DESTDIR)$(bindir) - set -xe; for f in $(TARG_INSTALL); \ -- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done -+ do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done - - uninstall: -- for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done -+ for f in $(TARGETS); do rm -f $(DESTDIR)$(bindir)/$$f; done - - adnshost: $(ADH_OBJS) $(DYNAMIC_DEP) - $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) -diff -Nru adns-1.0/settings.make.in adns-1.0.new/settings.make.in ---- adns-1.0/settings.make.in Sun Sep 17 03:01:11 2000 -+++ adns-1.0.new/settings.make.in Mon Nov 19 02:36:25 2001 -@@ -47,10 +47,10 @@ - MKSHLIB_3= @MKSHLIB_3@ - - prefix= @prefix@ --exec_prefix= @exec_prefix@ --bin_dir= $(exec_prefix)/bin --lib_dir= $(exec_prefix)/lib --include_dir= $(prefix)/include -+execprefix= @execprefix@ -+bindir= @bindir@ -+libdir= @libdir@ -+includedir= @includedir@ - - AC_INSTALL= @INSTALL@ - ifeq ($(AC_INSTALL),./install-sh -c) -diff -Nru adns-1.0/src/Makefile.in adns-1.0.new/src/Makefile.in ---- adns-1.0/src/Makefile.in Sun Sep 17 02:24:24 2000 -+++ adns-1.0.new/src/Makefile.in Mon Nov 19 02:35:18 2001 -@@ -29,13 +29,14 @@ +--- adns-1.2/src/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400 ++++ adns-1.2/src/Makefile.in 2006-05-08 10:12:22.000000000 -0400 +@@ -28,14 +28,14 @@ include adns.make install: -+ $(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) +- mkdir -p $(lib_dir) $(include_dir) ++ mkdir -p $(DESTDIR)$(lib_dir) $(DESTDIR)$(include_dir) set -xe; for f in $(TARGETS); \ - do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done - $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h -+ do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done -+ $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h ++ do $(INSTALL_DATA) $$f $(DESTDIR)$(lib_dir)/$$f; done ++ $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(include_dir)/adns.h uninstall: - for f in $(TARGETS); do rm -f $(lib_dir)/$$f; done - rm -f $(include_dir)/adns.h -+ for f in $(TARGETS); do rm -f $(DESTDIR)$(libdir)/$$f; done -+ rm -f $(DESTDIR)$(includedir)/adns.h ++ for f in $(TARGETS); do rm -f $(DESTDIR)$(lib_dir)/$$f; done ++ rm -f $(DESTDIR)$(include_dir)/adns.h ALLOBJS= $(LIBOBJS) ---- adns-1.0/dynamic/Makefile.in~ Mon Nov 19 03:01:54 2001 -+++ adns-1.0/dynamic/Makefile.in Mon Nov 19 03:01:54 2001 -@@ -31,11 +31,12 @@ +--- adns-1.2/client/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400 ++++ adns-1.2/client/Makefile.in 2006-05-08 10:12:56.000000000 -0400 +@@ -58,12 +58,12 @@ + all: $(TARGETS) + + install: $(TARG_INSTALL) +- mkdir -p $(bin_dir) ++ mkdir -p $(DESTDIR)$(bin_dir) + set -xe; for f in $(TARG_INSTALL); \ +- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done ++ do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bin_dir)/$$f; done + + uninstall: +- for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done ++ for f in $(TARGETS); do rm -f $(DESTDIR)$(bin_dir)/$$f; done + + adnshost: $(ADH_OBJS) $(DYNAMIC_DEP) + $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) +--- adns-1.2/dynamic/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400 ++++ adns-1.2/dynamic/Makefile.in 2006-05-08 10:12:32.000000000 -0400 +@@ -30,13 +30,13 @@ ALLOBJS= $(addsuffix _p.o, $(basename $(LIBOBJS))) install: +- mkdir -p $(lib_dir) - $(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE) - ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) -+ $(INSTALL) -d $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE) -+ ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) +- ln -sf $(SHLIBSONAME) $(lib_dir)/$(SHLIBFORLINK) ++ mkdir -p $(DESTDIR)$(lib_dir) ++ $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBFILE) ++ ln -sf $(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBSONAME) ++ ln -sf $(SHLIBSONAME) $(DESTDIR)$(lib_dir)/$(SHLIBFORLINK) uninstall: - rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) -+ rm -f $(DESTDIR)$(libdir)/$(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) ++ rm -f $(DESTDIR)$(lib_dir)/$(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBSONAME) $(SHLIBFORLINK): ln -s $(SHLIBSONAME) $(SHLIBFORLINK) Index: adns.spec =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/adns.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- adns.spec 6 Apr 2005 22:10:47 -0000 1.6 +++ adns.spec 8 May 2006 17:50:06 -0000 1.7 @@ -1,18 +1,17 @@ Name: adns -Version: 1.1 -Release: 5 +Version: 1.2 +Release: 1 Summary: Advanced, easy to use, asynchronous-capable DNS client library Group: System Environment/Libraries License: GPL URL: http://www.chiark.greenend.org.uk/~ian/adns/ -Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-1.1.tar.gz +Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz Patch0: %{name}-DESTDIR.patch -Patch1: %{name}-ac_fix.patch -Patch2: adns-1.1-semicolon.patch -Patch3: adns-1.1-parsedomain.patch -BuildRequires: autoconf213 automake15 +Patch1: %{name}-ac_fix.patch +Patch2: %{name}-autoconf-noexpand.patch +#BuildRequires: autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -72,16 +71,13 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .semicolon -%patch3 -p1 -b .parsedomain +%patch0 -p1 -b .destdir +%patch1 -p1 -b .ac_fix +%patch2 -p1 -b .noexpand %build #aclocal #%{__autoconf} -aclocal-1.5 -autoconf-2.13 %configure --enable-dynamic make %{?_smp_mflags} @@ -112,6 +108,11 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Mon May 8 2006 Mihai Ibanescu 1.2-1 +- Updated to 1.2, some of the patches were already upstream +- Removed dependency on autoconf/automake since it builds just fine without + that + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:00:46 -0000 1.2 +++ sources 8 May 2006 17:50:06 -0000 1.3 @@ -1 +1 @@ -891956e305acf5fc83b099333bf3ffd9 adns-1.1.tar.gz +4d9ad052125ddd295ee75ea608b992b7 adns-1.2.tar.gz --- adns-1.1-parsedomain.patch DELETED --- --- adns-1.1-semicolon.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:52:23 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:52:23 -0700 Subject: owners owners.list,1.959,1.960 Message-ID: <200605081752.k48HqPi3006135@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6118 Modified Files: owners.list Log Message: Add perl-Module-Install. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.959 retrieving revision 1.960 diff -u -r1.959 -r1.960 --- owners.list 8 May 2006 01:48:19 -0000 1.959 +++ owners.list 8 May 2006 17:52:23 -0000 1.960 @@ -1098,6 +1098,7 @@ Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Info|Information about Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Module-Install|Standalone, extensible Perl module installer|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 8 17:57:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:57:39 -0700 Subject: rpms/perl-Test-Base - New directory Message-ID: <200605081757.k48Hvfl9006235@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6209/perl-Test-Base Log Message: Directory /cvs/extras/rpms/perl-Test-Base added to the repository From fedora-extras-commits at redhat.com Mon May 8 17:57:40 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:57:40 -0700 Subject: rpms/perl-Test-Base/devel - New directory Message-ID: <200605081757.k48HvgHj006238@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6209/perl-Test-Base/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Base/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 17:58:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:58:07 -0700 Subject: rpms/perl-Test-Base Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605081758.k48Hw9Hx006287@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6254 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Base --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Base all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 17:58:08 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:58:08 -0700 Subject: rpms/perl-Test-Base/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605081758.k48HwAlR006290@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6254/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Base --- NEW 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 May 8 17:58:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:58:50 -0700 Subject: rpms/perl-Test-Base import.log,1.1,1.2 Message-ID: <200605081759.k48HxMNW006354@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6320 Modified Files: import.log Log Message: auto-import perl-Test-Base-0.50-2 on branch devel from perl-Test-Base-0.50-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Base/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 May 2006 17:58:07 -0000 1.1 +++ import.log 8 May 2006 17:58:50 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Base-0_50-2:HEAD:perl-Test-Base-0.50-2.src.rpm:1147111118 From fedora-extras-commits at redhat.com Mon May 8 17:58:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:58:51 -0700 Subject: rpms/perl-Test-Base/devel perl-Test-Base.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605081759.k48HxNow006358@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6320/devel Modified Files: .cvsignore sources Added Files: perl-Test-Base.spec Log Message: auto-import perl-Test-Base-0.50-2 on branch devel from perl-Test-Base-0.50-2.src.rpm --- NEW FILE perl-Test-Base.spec --- Name: perl-Test-Base Version: 0.50 Release: 2%{?dist} Summary: Data Driven Testing Framework License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Base/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/Test-Base-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.30 BuildRequires: perl(Text::Diff) >= 0.35 BuildRequires: perl(Algorithm::Diff) >= 1.15 Requires: perl(Text::Diff) >= 0.35 Requires: perl(Algorithm::Diff) >= 1.15 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Testing is usually the ugly part of Perl module authoring. Perl gives you a standard way to run tests with Test::Harness, and basic testing primitives with Test::More. After that you are pretty much on your own to develop a testing framework and philosophy. Test::More encourages you to make your own framework by subclassing Test::Builder, but that is not trivial. %prep %setup -q -n Test-Base-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README ToDo %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 08 2006 Steven Pritchard 0.50-2 - Add explicit dependencies for Text::Diff and Algorithm::Diff. * Thu May 04 2006 Steven Pritchard 0.50-1 - Specfile autogenerated by cpanspec 1.65. - Remove explicit BR: perl and Requires: perl(Spiffy). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Base/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 17:58:07 -0000 1.1 +++ .cvsignore 8 May 2006 17:58:51 -0000 1.2 @@ -0,0 +1 @@ +Test-Base-0.50.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Base/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 17:58:07 -0000 1.1 +++ sources 8 May 2006 17:58:51 -0000 1.2 @@ -0,0 +1 @@ +1917571661a8302626a8c82eb047f941 Test-Base-0.50.tar.gz From fedora-extras-commits at redhat.com Mon May 8 18:01:08 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 11:01:08 -0700 Subject: owners owners.list,1.960,1.961 Message-ID: <200605081801.k48I1Ag6008545@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6414 Modified Files: owners.list Log Message: Add perl-Test-Base. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.960 retrieving revision 1.961 diff -u -r1.960 -r1.961 --- owners.list 8 May 2006 17:52:23 -0000 1.960 +++ owners.list 8 May 2006 18:01:07 -0000 1.961 @@ -1159,6 +1159,7 @@ Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Term-UI|Term::ReadLine UI made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Base|Data Driven Testing Framework|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 8 18:09:16 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 11:09:16 -0700 Subject: rpms/stellarium/devel stellarium.spec,1.18,1.19 Message-ID: <200605081809.k48I9I2f008705@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8687 Modified Files: stellarium.spec Log Message: ADd freetype-devel as BuildRequires Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- stellarium.spec 8 May 2006 17:36:13 -0000 1.18 +++ stellarium.spec 8 May 2006 18:09:16 -0000 1.19 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -20,6 +20,7 @@ BuildRequires: mesa-libGLU-devel BuildRequires: ImageMagick BuildRequires: libpng-devel +BuildRequires: freetype-devel %description Stellarium is a real-time 3D photo-realistic nightsky renderer. It can @@ -83,7 +84,7 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog -* Sun May 7 2006 Jochen Schmitt 0.8.0-2 +* Sun May 7 2006 Jochen Schmitt 0.8.0-3 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 From fedora-extras-commits at redhat.com Mon May 8 18:18:37 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:18:37 -0700 Subject: rpms/lasi - New directory Message-ID: <200605081818.k48IIdAg008834@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8809/lasi Log Message: Directory /cvs/extras/rpms/lasi added to the repository From fedora-extras-commits at redhat.com Mon May 8 18:18:37 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:18:37 -0700 Subject: rpms/lasi/devel - New directory Message-ID: <200605081818.k48IId9v008838@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8809/lasi/devel Log Message: Directory /cvs/extras/rpms/lasi/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 18:18:49 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:18:49 -0700 Subject: rpms/lasi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605081818.k48IIp5K008892@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8859 Added Files: Makefile import.log Log Message: Setup of module lasi --- NEW FILE Makefile --- # Top level Makefile for module lasi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 18:18:49 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:18:49 -0700 Subject: rpms/lasi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605081818.k48IIpOm008895@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8859/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lasi --- NEW 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 May 8 18:19:13 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:19:13 -0700 Subject: rpms/lasi import.log,1.1,1.2 Message-ID: <200605081819.k48IJFNq008962@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8928 Modified Files: import.log Log Message: auto-import lasi-1.0.5-2.fc5 on branch devel from lasi-1.0.5-2.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lasi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 May 2006 18:18:48 -0000 1.1 +++ import.log 8 May 2006 18:19:13 -0000 1.2 @@ -0,0 +1 @@ +lasi-1_0_5-2_fc5:HEAD:lasi-1.0.5-2.fc5.src.rpm:1147112350 From fedora-extras-commits at redhat.com Mon May 8 18:19:14 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:19:14 -0700 Subject: rpms/lasi/devel lasi-1.0.5-pc.patch, NONE, 1.1 lasi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605081819.k48IJG4V008969@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8928/devel Modified Files: .cvsignore sources Added Files: lasi-1.0.5-pc.patch lasi.spec Log Message: auto-import lasi-1.0.5-2.fc5 on branch devel from lasi-1.0.5-2.fc5.src.rpm lasi-1.0.5-pc.patch: --- NEW FILE lasi-1.0.5-pc.patch --- --- lasi-1.0.5/lasi.pc.in.libs 2006-05-08 09:58:13.000000000 -0600 +++ lasi-1.0.5/lasi.pc.in 2006-05-08 09:58:23.000000000 -0600 @@ -6,6 +6,6 @@ Name: LASi Description: Library to write UTF-8 strings to Postscript stream. Version: @VERSION@ -Libs: -L${libdir} +Libs: -L${libdir} -lLASi Cflags: -I${includedir} --- NEW FILE lasi.spec --- Name: lasi Version: 1.0.5 Release: 2%{?dist} Summary: C++ library for creating Postscript documents Group: Development/Libraries License: LGPL URL: http://www.unifont.org/lasi/ Source0: http://www.unifont.org/lasi/download/lasi-%{version}.tar.gz Patch0: lasi-1.0.5-pc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pango-devel %description LASi is a library written by Larry Siden that provides a C++ stream output interface ( with operator << ) for creating Postscript documents that can contain characters from any of the scripts and symbol blocks supported in Unicode and by Owen Taylor's Pango layout engine. The library accomodates right-to-left scripts such as Arabic and Hebrew as easily as left-to-right scripts. Indic and Indic-derived Complex Text Layout (CTL) scripts, such as Devanagari, Thai, Lao, and Tibetan are supported to the extent provided by Pango and by the OpenType fonts installed on your system. All of this is provided without need for any special configuration or layout calculation on the programmer's part. Although the capability to produce Unicode-based multilingual Postscript documents exists in large Open Source application framework libraries such as GTK+, QT, and KDE, LASi was designed for projects which require the ability to produce Postscript independent of any one application framework. %package devel Summary: Development headers and libraries for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pango-devel %description devel %{summary}. %prep %setup -q %patch -p1 -b .pc %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libLASi.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/libLASi.so.* %files devel %defattr(-,root,root,-) %doc doc examples/* %{_includedir}/LASi.h %{_libdir}/libLASi.so %{_libdir}/pkgconfig/lasi.pc %changelog * Mon May 8 2006 - Orion Poplawski - 1.0.5-2 - Disable static libs - Patch pc file to return -lLASi * Thu May 4 2006 - Orion Poplawski - 1.0.5-1 - Update to 1.0.5 - Remove unneeded patches and autotools - Move doc dir to -devel package - Make -devel package require pango-devel, included in LASi.h * Mon Apr 24 2006 - Orion Poplawski - 1.0.4-1 - Initial Fedora Extras version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lasi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 18:18:49 -0000 1.1 +++ .cvsignore 8 May 2006 18:19:14 -0000 1.2 @@ -0,0 +1 @@ +lasi-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lasi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 18:18:49 -0000 1.1 +++ sources 8 May 2006 18:19:14 -0000 1.2 @@ -0,0 +1 @@ +b9f766f0b262bd3a5365fa81aea47ed8 lasi-1.0.5.tar.gz From fedora-extras-commits at redhat.com Mon May 8 18:19:48 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:19:48 -0700 Subject: owners owners.list,1.961,1.962 Message-ID: <200605081819.k48IJoDu009022@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9005 Modified Files: owners.list Log Message: Add lasi Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.961 retrieving revision 1.962 diff -u -r1.961 -r1.962 --- owners.list 8 May 2006 18:01:07 -0000 1.961 +++ owners.list 8 May 2006 18:19:48 -0000 1.962 @@ -582,6 +582,7 @@ Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|lagan|Local, global, and multiple alignment of DNA sequences|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|lasi|C++ library for creating Postscript documents|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|lcms|Color Management System|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|lcov|LTP GCOV extension code coverage tool|roland at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 18:20:58 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 11:20:58 -0700 Subject: rpms/perl-Test-Base/devel perl-Test-Base.spec,1.1,1.2 Message-ID: <200605081821.k48IL0pv009097@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9080 Modified Files: perl-Test-Base.spec Log Message: Drop Algorithm::Diff dep and add LWP::Simple. (Suggested by jpo.) Index: perl-Test-Base.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Base/devel/perl-Test-Base.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Base.spec 8 May 2006 17:58:51 -0000 1.1 +++ perl-Test-Base.spec 8 May 2006 18:20:57 -0000 1.2 @@ -10,9 +10,8 @@ BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.30 BuildRequires: perl(Text::Diff) >= 0.35 -BuildRequires: perl(Algorithm::Diff) >= 1.15 Requires: perl(Text::Diff) >= 0.35 -Requires: perl(Algorithm::Diff) >= 1.15 +Requires: perl(LWP::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -53,7 +52,7 @@ %changelog * Mon May 08 2006 Steven Pritchard 0.50-2 -- Add explicit dependencies for Text::Diff and Algorithm::Diff. +- Add explicit dependencies for Text::Diff and LWP::Simple. * Thu May 04 2006 Steven Pritchard 0.50-1 - Specfile autogenerated by cpanspec 1.65. From fedora-extras-commits at redhat.com Mon May 8 18:26:41 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:26:41 -0700 Subject: rpms/plplot/devel plplot.spec,1.9,1.10 Message-ID: <200605081826.k48IQhdo009179@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9160 Modified Files: plplot.spec Log Message: - Update to 5.6.0 with new psttf driver - Add wxGTK support Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plplot.spec 24 Feb 2006 22:04:56 -0000 1.9 +++ plplot.spec 8 May 2006 18:26:41 -0000 1.10 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.5.3 -Release: 12%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -11,11 +11,9 @@ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch -Patch2: plplot-5.5.3-buffer.patch Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch -Patch5: plplot-5.5.3-check.patch -Patch6: plplot-5.5.3-x.patch +Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel @@ -24,9 +22,10 @@ BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 BuildRequires: perl(XML::DOM) -#Temporary until bz #176313 is fixed -BuildRequires: libXau-devel, libXdmcp-devel -#BuildRequires: libunicode-devel +BuildRequires: lasi-devel +BuildRequires: wxGTK-devel +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description PLplot is a library of functions that are useful for making scientific @@ -127,14 +126,22 @@ %description tk-devel %{summary} + +%package wxGTK +Summary: Functions for scientific plotting with wxGTK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description wxGTK +%{summary} + + %prep %setup -q %patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig %patch3 -p1 -b .orig %patch4 -p1 -b .orig -%patch5 -p1 -b .orig %patch6 -p1 -b .orig @@ -142,7 +149,8 @@ %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ - --disable-wingcc --disable-aqt --disable-pdl + --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ + --with-prebuiltdoc make @@ -155,8 +163,6 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version} find $RPM_BUILD_ROOT -name \*.la | xargs rm -#Remove non-existant PDL dependency -rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl #Permissions find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x @@ -165,7 +171,14 @@ rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || : +fi %postun -p /sbin/ldconfig @@ -214,6 +227,8 @@ %{_libdir}/plplot%{version}/driversd/ps.so %{_libdir}/plplot%{version}/driversd/pstex.rc %{_libdir}/plplot%{version}/driversd/pstex.so +%{_libdir}/plplot%{version}/driversd/psttf.rc +%{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc @@ -229,6 +244,7 @@ %{python_sitelib}/plplotcanvas.py %{python_sitelib}/plplotcanvas.pyc %{python_sitelib}/plplotcanvas.pyo +%{_infodir}/plplotdoc.info* %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz %{_mandir}/man1/plrender.1.gz @@ -264,6 +280,7 @@ %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_mandir}/man3/pl*.3* %files gnome %defattr(-,root,root,-) @@ -315,7 +332,17 @@ %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ +%files wxGTK +%defattr(-,root,root,-) +%{_libdir}/plplot%{version}/driversd/wxwidgets.rc +%{_libdir}/plplot%{version}/driversd/wxwidgets.so + + %changelog +* Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 +- Update to 5.6.0 with new psttf driver +- Add wxGTK support + * Fri Feb 24 2006 - Orion Poplawski - 5.5.3-12 - Rebuild for FC5 gcc/glibc changes From fedora-extras-commits at redhat.com Mon May 8 18:40:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 8 May 2006 11:40:47 -0700 Subject: owners owners.list,1.962,1.963 Message-ID: <200605081840.k48IenHt009586@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565 Modified Files: owners.list Log Message: +ctapi-common Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.962 retrieving revision 1.963 diff -u -r1.962 -r1.963 --- owners.list 8 May 2006 18:19:48 -0000 1.962 +++ owners.list 8 May 2006 18:40:46 -0000 1.963 @@ -170,6 +170,7 @@ Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 19:02:46 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 8 May 2006 12:02:46 -0700 Subject: fedora-security/audit fc4,1.235,1.236 fc5,1.148,1.149 Message-ID: <200605081902.k48J2nHi011949@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11928 Modified Files: fc4 fc5 Log Message: Add Quagga bugs. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- fc4 8 May 2006 09:50:08 -0000 1.235 +++ fc4 8 May 2006 19:02:36 -0000 1.236 @@ -3,8 +3,8 @@ ** are items that need attention -CVE-2006-2224 VULNERABLE (quagga) -CVE-2006-2223 VULNERABLE (quagga) +CVE-2006-2224 VULNERABLE (quagga) #191085 +CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- fc5 8 May 2006 09:36:59 -0000 1.148 +++ fc5 8 May 2006 19:02:36 -0000 1.149 @@ -3,8 +3,8 @@ ** are items that need attention -CVE-2006-2224 VULNERABLE (quagga) -CVE-2006-2223 VULNERABLE (quagga) +CVE-2006-2224 VULNERABLE (quagga) #191085 +CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 From fedora-extras-commits at redhat.com Mon May 8 19:21:15 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 12:21:15 -0700 Subject: rpms/plplot/devel plplot-5.5.3-buffer.patch, 1.1, NONE plplot-5.5.3-check.patch, 1.1, NONE Message-ID: <200605081921.k48JLHSQ012171@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12154 Removed Files: plplot-5.5.3-buffer.patch plplot-5.5.3-check.patch Log Message: Remove old patches --- plplot-5.5.3-buffer.patch DELETED --- --- plplot-5.5.3-check.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 19:21:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 12:21:59 -0700 Subject: rpms/plplot/devel plplot-5.5.3-x.patch,1.1,NONE Message-ID: <200605081922.k48JM1bn012210@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12191 Removed Files: plplot-5.5.3-x.patch Log Message: Remove old patch --- plplot-5.5.3-x.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 19:24:40 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 12:24:40 -0700 Subject: rpms/plplot/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200605081924.k48JOgT1012298@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12279 Modified Files: .cvsignore sources Log Message: 5.6.0 source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Dec 2005 23:37:42 -0000 1.5 +++ .cvsignore 8 May 2006 19:24:40 -0000 1.6 @@ -1 +1 @@ -plplot-5.5.3.tar.gz +plplot-5.6.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Dec 2005 23:37:42 -0000 1.5 +++ sources 8 May 2006 19:24:40 -0000 1.6 @@ -1 +1 @@ -6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz +0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz From fedora-extras-commits at redhat.com Mon May 8 19:25:25 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 12:25:25 -0700 Subject: rpms/plplot/devel plplot-5.6.0-x.patch,NONE,1.1 Message-ID: <200605081925.k48JPRQw012332@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12314 Added Files: plplot-5.6.0-x.patch Log Message: Updated X configure patch plplot-5.6.0-x.patch: --- NEW FILE plplot-5.6.0-x.patch --- --- plplot-5.6.0/configure.orig 2006-04-25 10:53:26.000000000 -0600 +++ plplot-5.6.0/configure 2006-04-25 10:58:30.000000000 -0600 @@ -30155,1411 +30155,10 @@ - - -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XtMalloc (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -fi - -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_nospace=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_space=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_space=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder at skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - - if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -int -main () -{ -connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != remove; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 - - if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -int -main () -{ -remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmat; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 - - if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -int -main () -{ -shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); -int -main () -{ -IceConnectionNumber (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - -if test "$have_x" != "yes"; then - enable_xwin="no" -fi - - - -if test "$enable_xwin" = yes; then - enable_xwin_TRUE= - enable_xwin_FALSE='#' -else - enable_xwin_TRUE='#' - enable_xwin_FALSE= -fi - +enable_xwin=yes +enable_xwin_TRUE= +enable_xwin_FALSE='#' +have_x=yes From fedora-extras-commits at redhat.com Mon May 8 19:32:15 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 12:32:15 -0700 Subject: fedora-security/audit fe4,1.10,1.11 fe5,1.10,1.11 Message-ID: <200605081932.k48JWFoo012449@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427 Modified Files: fe4 fe5 Log Message: several CVE-2006 additions Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fe4 8 May 2006 16:35:02 -0000 1.10 +++ fe4 8 May 2006 19:32:12 -0000 1.11 @@ -7,6 +7,16 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-2093 VULNERABLE (nessus) bz#191053 +CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) +CVE-2006-1329 version (jabberd, fixed 2.0s11) +CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-0814 ignore (lighttpd, Windows-specific problem) +CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 +CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 +CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 +CVE-2006-0042 version (libapreq2, fixed 2.0.7) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fe5 8 May 2006 16:35:02 -0000 1.10 +++ fe5 8 May 2006 19:32:12 -0000 1.11 @@ -7,6 +7,17 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-2093 VULNERABLE (nessus) bz#191053 +CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) +CVE-2006-1550 version (dia, fixed 0.95) bz#187556 +CVE-2006-1329 version (jabberd, fixed 2.0s11) +CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-0814 ignore (lighttpd, Windows-specific problem) +CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 +CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 +CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 +CVE-2006-0042 version (libapreq2, fixed 2.0.7) From fedora-extras-commits at redhat.com Mon May 8 19:36:13 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 12:36:13 -0700 Subject: fedora-security/audit fe4,1.11,1.12 fe5,1.11,1.12 Message-ID: <200605081936.k48JaDMU012511@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12491 Modified Files: fe4 fe5 Log Message: mantis CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fe4 8 May 2006 19:32:12 -0000 1.11 +++ fe4 8 May 2006 19:36:10 -0000 1.12 @@ -11,11 +11,16 @@ CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-0841 VULNERABLE (mantis) bz#191089 +CVE-2006-0840 VULNERABLE (mantis) bz#191089 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0665 VULNERABLE (mantis) bz#191089 +CVE-2006-0664 VULNERABLE (mantis) bz#191089 CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fe5 8 May 2006 19:32:12 -0000 1.11 +++ fe5 8 May 2006 19:36:10 -0000 1.12 @@ -11,12 +11,17 @@ CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-0841 version (mantis, fixed 1.0.1) +CVE-2006-0840 version (mantis, fixed 1.0.1) CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0665 version (mantis, fixed 1.0.1) +CVE-2006-0664 version (mantis, fixed 1.0.1) CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 From fedora-extras-commits at redhat.com Mon May 8 19:50:02 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 8 May 2006 12:50:02 -0700 Subject: rpms/monotone/FC-5 monotone.init,1.4,1.5 monotone.spec,1.11,1.12 Message-ID: <200605081950.k48Jo4rC012676@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12657 Modified Files: monotone.init monotone.spec Log Message: Fix service script genkey subcommand. Index: monotone.init =================================================================== RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monotone.init 11 Apr 2006 22:28:39 -0000 1.4 +++ monotone.init 8 May 2006 19:50:02 -0000 1.5 @@ -112,9 +112,10 @@ if passphrase=`random_passphrase` && { echo $passphrase; echo $passphrase; } | - runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c \ - "$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ - genkey $MONOTONE_KEYID" > /dev/null 2>&1 && + (umask 027; $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ + genkey $MONOTONE_KEYID > /dev/null 2>&1) && + /bin/chgrp ${MONOTONE_GROUP:-monotone} \ + "$MONOTONE_KEYDIR/$MONOTONE_KEYID" && cat > $tmp < - 0.26-2 +- Fix service script genkey subcommand. + * Mon Apr 10 2006 Roland McGrath - 0.26-1 - Updated for 0.25 release. - Major changes; see UPGRADE doc file for details. From fedora-extras-commits at redhat.com Mon May 8 19:50:21 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 8 May 2006 12:50:21 -0700 Subject: rpms/monotone/devel monotone.init,1.4,1.5 monotone.spec,1.11,1.12 Message-ID: <200605081950.k48JoNUs012703@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12684 Modified Files: monotone.init monotone.spec Log Message: Fix service script genkey subcommand. Index: monotone.init =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monotone.init 11 Apr 2006 21:10:32 -0000 1.4 +++ monotone.init 8 May 2006 19:50:21 -0000 1.5 @@ -112,9 +112,10 @@ if passphrase=`random_passphrase` && { echo $passphrase; echo $passphrase; } | - runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c \ - "$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ - genkey $MONOTONE_KEYID" > /dev/null 2>&1 && + (umask 027; $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ + genkey $MONOTONE_KEYID > /dev/null 2>&1) && + /bin/chgrp ${MONOTONE_GROUP:-monotone} \ + "$MONOTONE_KEYDIR/$MONOTONE_KEYID" && cat > $tmp < - 0.26-2 +- Fix service script genkey subcommand. + * Mon Apr 10 2006 Roland McGrath - 0.26-1 - Updated for 0.25 release. - Major changes; see UPGRADE doc file for details. From fedora-extras-commits at redhat.com Mon May 8 19:50:54 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 8 May 2006 12:50:54 -0700 Subject: rpms/monotone/FC-4 monotone.init,1.7,1.8 monotone.spec,1.15,1.16 Message-ID: <200605081950.k48JouaP012764@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12745 Modified Files: monotone.init monotone.spec Log Message: Fix service script genkey subcommand. Index: monotone.init =================================================================== RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.init,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- monotone.init 11 Apr 2006 22:29:29 -0000 1.7 +++ monotone.init 8 May 2006 19:50:54 -0000 1.8 @@ -112,9 +112,10 @@ if passphrase=`random_passphrase` && { echo $passphrase; echo $passphrase; } | - runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c \ - "$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ - genkey $MONOTONE_KEYID" > /dev/null 2>&1 && + (umask 027; $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ + genkey $MONOTONE_KEYID > /dev/null 2>&1) && + /bin/chgrp ${MONOTONE_GROUP:-monotone} \ + "$MONOTONE_KEYDIR/$MONOTONE_KEYID" && cat > $tmp < - 0.26-2 +- Fix service script genkey subcommand. + * Mon Apr 10 2006 Roland McGrath - 0.26-1 - Updated for 0.25 release. - Major changes; see UPGRADE doc file for details. From fedora-extras-commits at redhat.com Mon May 8 20:19:57 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 13:19:57 -0700 Subject: fedora-security/audit fe4,1.12,1.13 fe5,1.12,1.13 Message-ID: <200605082019.k48KJvro016002@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15982 Modified Files: fe4 fe5 Log Message: more CVE-2006 updates Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fe4 8 May 2006 19:36:10 -0000 1.12 +++ fe4 8 May 2006 20:19:55 -0000 1.13 @@ -8,20 +8,30 @@ CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) +CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) +CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-1079 VULNERABLE (thttpd) bz#191095 +CVE-2006-1078 VULNERABLE (thttpd) bz#191095 CVE-2006-0841 VULNERABLE (mantis) bz#191089 CVE-2006-0840 VULNERABLE (mantis) bz#191089 +CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) CVE-2006-0665 VULNERABLE (mantis) bz#191089 CVE-2006-0664 VULNERABLE (mantis) bz#191089 CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 +CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0126 version (rxvt-unicode, fixed 7.5) +CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fe5 8 May 2006 19:36:10 -0000 1.12 +++ fe5 8 May 2006 20:19:55 -0000 1.13 @@ -8,21 +8,32 @@ CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) +CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1656 version (util-vserver, fixed 0.30.210) +CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 +CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-1079 VULNERABLE (thttpd) bz#191095 +CVE-2006-1078 VULNERABLE (thttpd) bz#191095 CVE-2006-0841 version (mantis, fixed 1.0.1) CVE-2006-0840 version (mantis, fixed 1.0.1) +CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) CVE-2006-0665 version (mantis, fixed 1.0.1) CVE-2006-0664 version (mantis, fixed 1.0.1) CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 +CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0126 version (rxvt-unicode, fixed 7.5) +CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) From fedora-extras-commits at redhat.com Mon May 8 20:25:26 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 13:25:26 -0700 Subject: fedora-security/audit fe4,1.13,1.14 fe5,1.13,1.14 Message-ID: <200605082025.k48KPQgI016048@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16027 Modified Files: fe4 fe5 Log Message: add zoo CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fe4 8 May 2006 20:19:55 -0000 1.13 +++ fe4 8 May 2006 20:25:23 -0000 1.14 @@ -18,9 +18,11 @@ CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1329 version (jabberd, fixed 2.0s11) +CVE-2006-1269 patch (zoo, fixed 2.10-7) bz#183109 CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 CVE-2006-1079 VULNERABLE (thttpd) bz#191095 CVE-2006-1078 VULNERABLE (thttpd) bz#191095 +CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7) CVE-2006-0841 VULNERABLE (mantis) bz#191089 CVE-2006-0840 VULNERABLE (mantis) bz#191089 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fe5 8 May 2006 20:19:55 -0000 1.13 +++ fe5 8 May 2006 20:25:23 -0000 1.14 @@ -20,9 +20,11 @@ CVE-2006-1550 version (dia, fixed 0.95) bz#187556 CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1329 version (jabberd, fixed 2.0s11) +CVE-2006-1269 patch (zoo, fixed 2.10-7) bz#183109 CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 CVE-2006-1079 VULNERABLE (thttpd) bz#191095 CVE-2006-1078 VULNERABLE (thttpd) bz#191095 +CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7) CVE-2006-0841 version (mantis, fixed 1.0.1) CVE-2006-0840 version (mantis, fixed 1.0.1) CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 From fedora-extras-commits at redhat.com Mon May 8 21:09:11 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:09:11 -0700 Subject: rpms/pessulus - New directory Message-ID: <200605082109.k48L9D9l019825@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19804/pessulus Log Message: Directory /cvs/extras/rpms/pessulus added to the repository From fedora-extras-commits at redhat.com Mon May 8 21:09:12 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:09:12 -0700 Subject: rpms/pessulus/devel - New directory Message-ID: <200605082109.k48L9ENW019828@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19804/pessulus/devel Log Message: Directory /cvs/extras/rpms/pessulus/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 21:09:32 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:09:32 -0700 Subject: rpms/pessulus Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605082109.k48L9Y3U019877@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19849 Added Files: Makefile import.log Log Message: Setup of module pessulus --- NEW FILE Makefile --- # Top level Makefile for module pessulus all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 21:09:33 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:09:33 -0700 Subject: rpms/pessulus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605082109.k48L9Zbb019880@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19849/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pessulus --- NEW 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 May 8 21:10:11 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:10:11 -0700 Subject: rpms/pessulus import.log,1.1,1.2 Message-ID: <200605082110.k48LADhs019946@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913 Modified Files: import.log Log Message: auto-import pessulus-0.10.1-1.fc6 on branch devel from pessulus-0.10.1-1.fc6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pessulus/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 May 2006 21:09:32 -0000 1.1 +++ import.log 8 May 2006 21:10:11 -0000 1.2 @@ -0,0 +1 @@ +pessulus-0_10_1-1_fc6:HEAD:pessulus-0.10.1-1.fc6.src.rpm:1147122603 From fedora-extras-commits at redhat.com Mon May 8 21:10:12 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:10:12 -0700 Subject: rpms/pessulus/devel pessulus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605082110.k48LAEEV019951@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/devel Modified Files: .cvsignore sources Added Files: pessulus.spec Log Message: auto-import pessulus-0.10.1-1.fc6 on branch devel from pessulus-0.10.1-1.fc6.src.rpm --- NEW FILE pessulus.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pessulus Version: 0.10.1 Release: 1%{?dist} Summary: A lockdown editor for GNOME Group: Applications/System License: GPL URL: http://www.gnome.org/~vuntz/pessulus/ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, pygtk2-devel, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2 BuildRequires: gettext Requires: pygtk2, gnome-python2, gnome-python2-gconf %description Pessulus is a lockdown editor for GNOME, written in python. Pessulus enables administrators to set mandatory settings in GConf. The users can not change these settings. Use of pessulus can be useful on computers that are open to use by everyone, e.g. in an internet cafe. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{python_sitearch}/Pessulus/*.py desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS COPYING %{_bindir}/%{name} %{python_sitearch}/Pessulus/ %{_datadir}/applications/*.desktop %{_datadir}/%{name}/* %changelog * Wed May 3 2006 Damien Durand - 0.10.1 - upgrade version to 0.10.1 * Fri Apr 7 2006 Tom "spot" Callaway - 0.9-2 - fix BR - remove unnecessary Requires - use version-release in changelog entries - fix directory ownership - use python_sitearch - make python "scripts" executable * Thu Apr 6 2006 Damien Durand - 0.9-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pessulus/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 21:09:33 -0000 1.1 +++ .cvsignore 8 May 2006 21:10:12 -0000 1.2 @@ -0,0 +1 @@ +pessulus-0.10.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pessulus/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 21:09:33 -0000 1.1 +++ sources 8 May 2006 21:10:12 -0000 1.2 @@ -0,0 +1 @@ +96cf672b87dace8c21dcaf07a0015c66 pessulus-0.10.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 21:15:11 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:15:11 -0700 Subject: owners owners.list,1.963,1.964 Message-ID: <200605082115.k48LFDIO020018@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19997 Modified Files: owners.list Log Message: Add pessulus Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.963 retrieving revision 1.964 diff -u -r1.963 -r1.964 --- owners.list 8 May 2006 18:40:46 -0000 1.963 +++ owners.list 8 May 2006 21:15:10 -0000 1.964 @@ -1230,6 +1230,7 @@ Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML-Parser-Syck|Perl Wrapper for the YAML Parser Extension: libsyck|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|pessulus|A lockdown editor for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 23:43:16 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Mon, 8 May 2006 16:43:16 -0700 Subject: comps comps-fe5.xml.in,1.45,1.46 comps-fe6.xml.in,1.8,1.9 Message-ID: <200605082343.k48NhIOu025070@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25051/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: Add Scribes to the Editors group. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- comps-fe5.xml.in 8 May 2006 08:46:21 -0000 1.45 +++ comps-fe5.xml.in 8 May 2006 23:43:16 -0000 1.46 @@ -91,6 +91,7 @@ gobby jed leafpad + scribes TeXmacs Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- comps-fe6.xml.in 8 May 2006 08:46:21 -0000 1.8 +++ comps-fe6.xml.in 8 May 2006 23:43:16 -0000 1.9 @@ -91,6 +91,7 @@ gobby jed leafpad + scribes TeXmacs From fedora-extras-commits at redhat.com Tue May 9 00:59:08 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Mon, 8 May 2006 17:59:08 -0700 Subject: rpms/pan/devel pan-0.96-upstream-sort_segfault.patch, NONE, 1.1 pan-0.96-upstream-subscribed_group.patch, NONE, 1.1 pan.spec, 1.13, 1.14 Message-ID: <200605090059.k490xArR027585@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27530 Modified Files: pan.spec Added Files: pan-0.96-upstream-sort_segfault.patch pan-0.96-upstream-subscribed_group.patch Log Message: Two patches from upstream that fix some bad stuff pan-0.96-upstream-sort_segfault.patch: --- NEW FILE pan-0.96-upstream-sort_segfault.patch --- --- pan/gui/header-pane.cc.bak 2006-05-08 11:19:05.000000000 -0500 +++ pan/gui/header-pane.cc 2006-05-08 15:56:51.000000000 -0500 @@ -78,6 +78,10 @@ StringView in (view); while (!in.empty() && !isalpha(*in.str)) in.eat_chars (1); + + if (in.empty()) + return g_strdup (""); + char * casefold = g_utf8_casefold (in.str, in.len); char * ret = g_utf8_collate_key (casefold, -1); g_free (casefold); @@ -89,9 +93,8 @@ { const char * pch = (const char*) pan_tree_store_peek_value (PAN_TREE_STORE(model), iter, COL_COLLATED_AUTHOR); if (!pch) { - const Article * a (get_article (model, iter)); - const char * in = a->author.empty() ? "" : a->author.c_str(); - char * tmp = do_collate (in); + const Article * article (get_article (model, iter)); + char * tmp = do_collate (article->author.to_view()); pan_tree_store_set (PAN_TREE_STORE(model), iter, COL_COLLATED_AUTHOR, tmp, -1); g_free (tmp); pch = get_collated_author (model, iter); @@ -104,9 +107,8 @@ { const char * pch = (const char*) pan_tree_store_peek_value (PAN_TREE_STORE(model), iter, COL_COLLATED_SUBJECT); if (!pch) { - const Article * a (get_article (model, iter)); - const char * in = a->subject.empty() ? "" : a->subject.c_str(); - char * tmp = do_collate (in); + const Article * article (get_article (model, iter)); + char * tmp = do_collate (article->subject.to_view()); pan_tree_store_set (PAN_TREE_STORE(model), iter, COL_COLLATED_SUBJECT, tmp, -1); g_free (tmp); pch = get_collated_subject (model, iter); pan-0.96-upstream-subscribed_group.patch: --- NEW FILE pan-0.96-upstream-subscribed_group.patch --- --- pan/data-impl/groups.cc.old 2006-05-08 10:50:16.000000000 -0500 +++ pan/data-impl/groups.cc 2006-05-07 23:32:36.000000000 -0500 @@ -129,7 +129,7 @@ std::set_union (sub.begin(), sub.end(), tmp_sub.begin(), tmp_sub.end(), std::inserter (tmp, tmp.begin()), o); - sub.get_container().swap (tmp_sub); + sub.get_container().swap (tmp); } // unsub += tmp_unsub @@ -159,13 +159,14 @@ delete in; } - // if it's in both _sub and _unsub, remove it from _unsub. + // unsub -= sub + AlphabeticalQuarkOrdering o; std::vector tmp; tmp.reserve (_unsubscribed.size()); std::set_difference (_unsubscribed.begin(), _unsubscribed.end(), _subscribed.begin(), _subscribed.end(), - inserter (tmp, tmp.begin())); - _unsubscribed.get_container().assign (tmp.begin(), tmp.end()); + inserter (tmp, tmp.begin()), o); + _unsubscribed.get_container().swap (tmp); } void @@ -212,25 +213,37 @@ void DataImpl :: load_group_permissions (const DataIO& data_io) { - _moderated.clear (); - _nopost.clear (); + std::vector m, n; LineReader * in (data_io.read_group_permissions ()); - StringView s, group; - while (in && !in->fail() && in->getline(group)) { - if (group.len && *group.str=='#') + StringView s, line; + while (in && !in->fail() && in->getline(line)) + { + if (line.len && *line.str=='#') continue; - else if (!group.pop_last_token (s, ':')) - std::cerr << LINE_ID << " I don't understand \"" << group << '"' << std::endl; - else if (!s.len) - std::cerr << LINE_ID << " Permission for " << group << " needs to be one of 'y', 'n', or 'm'.\n"; - else if (*s.str=='m') - _moderated.insert (group); - else if (*s.str=='n') - _nopost.insert (group); - else if (*s.str!='y') - std::cerr << LINE_ID << " Permission for " << group << " needs to be one of 'y', 'n', or 'm'.\n"; - } + + else if (!line.pop_last_token (s, ':') || !s.len || (*s.str!='y' && *s.str!='n' && *s.str!='m')) { + std::cerr << LINE_ID << " Group permissions: Can't parse line `" << line << std::endl; + continue; + } + + const Quark group (line); + const char ch = *s.str; + + if (ch == 'm') + m.push_back (group); + else if (ch == 'n') + n.push_back (group); + } + + std::sort (m.begin(), m.end()); + m.erase (std::unique(m.begin(), m.end()), m.end()); + _moderated.get_container().swap (m); + + std::sort (n.begin(), n.end()); + n.erase (std::unique(n.begin(), n.end()), n.end()); + _nopost.get_container().swap (n); + delete in; } @@ -421,6 +434,7 @@ // make a groups_t of groups we didn't already have, // and merge it with _unsubscribed (i.e., groups we haven't seen before become unsubscribed) + AlphabeticalQuarkOrdering o; groups.clear (); for (const NewGroup *it=newgroups, *end=newgroups+count; it!=end; ++it) if (!_subscribed.count (it->group)) @@ -429,7 +443,7 @@ tmp.clear (); std::set_union (groups.begin(), groups.end(), _unsubscribed.begin(), _unsubscribed.end(), - std::back_inserter (tmp)); + std::back_inserter (tmp), o); tmp.erase (std::unique(tmp.begin(), tmp.end()), tmp.end()); _unsubscribed.get_container().swap (tmp); } Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pan.spec 6 May 2006 19:19:31 -0000 1.13 +++ pan.spec 9 May 2006 00:59:08 -0000 1.14 @@ -1,12 +1,13 @@ Summary: A GNOME/GTK+ news reader for X Name: pan Version: 0.96 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 -#Patch0: pan-0.95-upstream-tree.patch +Patch0: pan-0.96-upstream-sort_segfault.patch +Patch1: pan-0.96-upstream-subscribed_group.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -27,7 +28,8 @@ %prep %setup -q -#%%patch0 -p1 +%patch0 -p0 +%patch1 -p0 echo "StartupNotify=true" >> pan.desktop @@ -72,8 +74,12 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Mon May 08 2006 Michael A. Peters - 1:0.96-2 +- Two patches from upstream (pan-0.96-upstream-sort_segfault.patch +- and pan-0.96-upstream-subscribed_group.patch) + * Sat May 06 2006 Michael A. Peters - 1:0.96-1 -- Update to 0.96 - patch1 no longer needed +- Update to 0.96 - patch0 no longer needed * Mon May 01 2006 Michael A. Peters - 1:0.95-3 - Apply a patch from upstream for new tree implementation bug From fedora-extras-commits at redhat.com Tue May 9 01:06:53 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Mon, 8 May 2006 18:06:53 -0700 Subject: rpms/pan/devel pan-0.95-upstream-tree.patch,1.1,NONE Message-ID: <200605090106.k4916tLV029900@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29885 Removed Files: pan-0.95-upstream-tree.patch Log Message: This patch is in current upstream pan --- pan-0.95-upstream-tree.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 02:43:59 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 8 May 2006 19:43:59 -0700 Subject: rpms/wifiroamd/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wifiroamd.spec, 1.2, 1.3 Message-ID: <200605090244.k492i1De032576@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32521/devel Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2006 05:03:43 -0000 1.3 +++ .cvsignore 9 May 2006 02:43:59 -0000 1.4 @@ -1 +1 @@ -wifiroamd-1.06.tar.gz +wifiroamd-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2006 05:03:43 -0000 1.3 +++ sources 9 May 2006 02:43:59 -0000 1.4 @@ -1 +1 @@ -197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz +2beae3dfc34dde031292e780a6fd5331 wifiroamd-1.08.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/wifiroamd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wifiroamd.spec 3 May 2006 05:03:43 -0000 1.2 +++ wifiroamd.spec 9 May 2006 02:43:59 -0000 1.3 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.06 +Version: 1.08 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -107,6 +107,9 @@ %doc debian/copyright %changelog +* Mon May 8 2006 Ed Hill - 1.08-1 +- new upstream 1.08 + * Wed May 3 2006 Ed Hill - 1.06-1 - new upstream 1.06 From fedora-extras-commits at redhat.com Tue May 9 02:43:53 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 8 May 2006 19:43:53 -0700 Subject: rpms/wifiroamd/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wifiroamd.spec, 1.2, 1.3 Message-ID: <200605090244.k492iPYb032583@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32521/FC-4 Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2006 05:03:37 -0000 1.3 +++ .cvsignore 9 May 2006 02:43:53 -0000 1.4 @@ -1 +1 @@ -wifiroamd-1.06.tar.gz +wifiroamd-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2006 05:03:37 -0000 1.3 +++ sources 9 May 2006 02:43:53 -0000 1.4 @@ -1 +1 @@ -197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz +2beae3dfc34dde031292e780a6fd5331 wifiroamd-1.08.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/wifiroamd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wifiroamd.spec 3 May 2006 05:03:37 -0000 1.2 +++ wifiroamd.spec 9 May 2006 02:43:53 -0000 1.3 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.06 +Version: 1.08 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -107,6 +107,9 @@ %doc debian/copyright %changelog +* Mon May 8 2006 Ed Hill - 1.08-1 +- new upstream 1.08 + * Wed May 3 2006 Ed Hill - 1.06-1 - new upstream 1.06 From fedora-extras-commits at redhat.com Tue May 9 02:43:53 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 8 May 2006 19:43:53 -0700 Subject: rpms/wifiroamd/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wifiroamd.spec, 1.2, 1.3 Message-ID: <200605090244.k492iQbj032588@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32521/FC-5 Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2006 05:03:37 -0000 1.3 +++ .cvsignore 9 May 2006 02:43:53 -0000 1.4 @@ -1 +1 @@ -wifiroamd-1.06.tar.gz +wifiroamd-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2006 05:03:37 -0000 1.3 +++ sources 9 May 2006 02:43:53 -0000 1.4 @@ -1 +1 @@ -197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz +2beae3dfc34dde031292e780a6fd5331 wifiroamd-1.08.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/wifiroamd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wifiroamd.spec 3 May 2006 05:03:37 -0000 1.2 +++ wifiroamd.spec 9 May 2006 02:43:53 -0000 1.3 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.06 +Version: 1.08 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -107,6 +107,9 @@ %doc debian/copyright %changelog +* Mon May 8 2006 Ed Hill - 1.08-1 +- new upstream 1.08 + * Wed May 3 2006 Ed Hill - 1.06-1 - new upstream 1.06 From fedora-extras-commits at redhat.com Tue May 9 02:53:05 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:53:05 -0700 Subject: extras-buildsys/server PackageJob.py, 1.46, 1.47 ArchJob.py, 1.28, 1.29 Message-ID: <200605090253.k492r5BV000313@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32728/server Modified Files: PackageJob.py ArchJob.py Log Message: 2006-05-08 Dan Williams * server/PackageJob.py - (_request_one_arch_job): Use the correct fileserver port * server/ArchJob.py - (_status_repo_unlock): fix unknown variable, should be self.job * common/URLopener.py - import socket to fix an unknown type * common/FileUploader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself * common/FileTransfer.py - (__init__): don't keep track of url as each subclass needs to do this separately; Fix indentation of self._certs to make sure it gets set even if it's None * common/FileDownloader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself; in our case it's actually a list of urls. Make sure self._files is defined, and has at least one item too. * common/Commands.py - (deserialize_command_stream): don't let unknown commands into the deserialized command stream; they show up as None items in the returned list. - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands too Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- PackageJob.py 3 May 2006 04:04:28 -0000 1.46 +++ PackageJob.py 9 May 2006 02:52:58 -0000 1.47 @@ -639,11 +639,12 @@ def _request_one_arch_job(self, arch, orphaned): # Construct SPRM URL srpm_http_base = self._srpm_http_path[len(self.http_dir):] - method = "http://" + method = "http" if self._server_cfg.get_bool("Builders", "use_ssl") == True: - method = "https://" + method = "https" hostname = self._server_cfg.get_str("General", "hostname") - srpm_url = method + hostname + ":8886/" + srpm_http_base + port = self._server_cfg.get_int("Active Builders", "file_server_port") + srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base) target_dict = self._target_cfg.target_dict(arch) self.bm.builder_manager.request_arch_job(self, target_dict, srpm_url, orphaned) Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ArchJob.py 3 May 2006 04:04:28 -0000 1.28 +++ ArchJob.py 9 May 2006 02:52:58 -0000 1.29 @@ -169,7 +169,7 @@ def _status_repo_unlock(self): # Builder will be in 'downloaded' state until # it notices that the repo has been unlocked - self._builder.unlock_repo_for_job(self._uniqid) + self._builder.unlock_repo_for_job(self.jobid) self._prepping = True if self._builder_status != 'downloaded': self._set_status('running') From fedora-extras-commits at redhat.com Tue May 9 02:53:06 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:53:06 -0700 Subject: extras-buildsys/common URLopener.py, 1.2, 1.3 FileUploader.py, 1.2, 1.3 FileTransfer.py, 1.1, 1.2 FileDownloader.py, 1.19, 1.20 Commands.py, 1.4, 1.5 Message-ID: <200605090253.k492r6eJ000323@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32728/common Modified Files: URLopener.py FileUploader.py FileTransfer.py FileDownloader.py Commands.py Log Message: 2006-05-08 Dan Williams * server/PackageJob.py - (_request_one_arch_job): Use the correct fileserver port * server/ArchJob.py - (_status_repo_unlock): fix unknown variable, should be self.job * common/URLopener.py - import socket to fix an unknown type * common/FileUploader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself * common/FileTransfer.py - (__init__): don't keep track of url as each subclass needs to do this separately; Fix indentation of self._certs to make sure it gets set even if it's None * common/FileDownloader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself; in our case it's actually a list of urls. Make sure self._files is defined, and has at least one item too. * common/Commands.py - (deserialize_command_stream): don't let unknown commands into the deserialized command stream; they show up as None items in the returned list. - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands too Index: URLopener.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/URLopener.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- URLopener.py 28 Apr 2006 03:17:40 -0000 1.2 +++ URLopener.py 9 May 2006 02:53:03 -0000 1.3 @@ -26,6 +26,7 @@ import stat import httplib import shutil +import socket def get_content_type(filename): return mimetypes.guess_type(filename)[0] or 'application/octet-stream' Index: FileUploader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileUploader.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FileUploader.py 8 May 2006 14:24:30 -0000 1.2 +++ FileUploader.py 9 May 2006 02:53:03 -0000 1.3 @@ -28,8 +28,9 @@ class FileUploader(FileTransfer.FileTransfer): def __init__(self, url, files, filevar, cgi_vars=None, certs=None): - FileTransfer.FileTransfer.__init__(self, url, certs) + FileTransfer.FileTransfer.__init__(self, certs) self._files = {} + self._url = url if files and type(files) == type(""): files = [files] Index: FileTransfer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileTransfer.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileTransfer.py 8 May 2006 14:24:30 -0000 1.1 +++ FileTransfer.py 9 May 2006 02:53:03 -0000 1.2 @@ -26,20 +26,17 @@ class FileTransfer(threading.Thread): - def __init__(self, url, certs=None): + def __init__(self, certs=None): self._callback = None self._cb_data = None self._cancel = False self._tries = 5 self._opener = None - if not url: - raise Exception("Require a URL to download.") - self._url = url if certs: if type(certs) is not type({}): raise ValueError("Certs must be a dict of certificate paths.") - self._certs = certs + self._certs = certs self._opener = URLopener.PlgURLopener(self._certs, 20) Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- FileDownloader.py 8 May 2006 14:24:30 -0000 1.19 +++ FileDownloader.py 9 May 2006 02:53:03 -0000 1.20 @@ -76,12 +76,13 @@ class FileDownloader(FileTransfer.FileTransfer): def __init__(self, urls, target_dir, legal_exts, certs=None): - FileTransfer.FileTransfer.__init__(self, url, certs) + FileTransfer.FileTransfer.__init__(self, certs) if not target_dir: raise Exception("Require a target directory to download to.") self._target_dir = target_dir + self._files = {} if type(urls) == type(""): urls = [urls] if type(urls) is not type([]): @@ -92,6 +93,9 @@ raise FileNameException("Bad file name from url %s" % url) self._files[url] = fname + if len(self._files.keys()) == 0: + raise ValueError("Need at least one file to download.") + def _action(self, (url, fname)): result = None err_msg = None Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Commands.py 8 May 2006 14:26:34 -0000 1.4 +++ Commands.py 9 May 2006 02:53:03 -0000 1.5 @@ -73,7 +73,8 @@ cmds = [] for item in cmd_stream: cmd = PlgCommand.deserialize(item) - cmds.append(cmd) + if cmd: + cmds.append(cmd) return cmds @@ -135,6 +136,8 @@ cmd = PlgCommandJobFiles._deserialize(args) elif name == CMD_NAME_JOB_FILES_ACK: cmd = PlgCommandJobFilesAck._deserialize(args) + elif name == CMD_NAME_UNLOCK_REPO: + cmd = PlgCommandUnlockRepo._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't From fedora-extras-commits at redhat.com Tue May 9 02:53:00 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:53:00 -0700 Subject: extras-buildsys ChangeLog,1.188,1.189 Message-ID: <200605090253.k492rUTA000328@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32728 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * server/PackageJob.py - (_request_one_arch_job): Use the correct fileserver port * server/ArchJob.py - (_status_repo_unlock): fix unknown variable, should be self.job * common/URLopener.py - import socket to fix an unknown type * common/FileUploader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself * common/FileTransfer.py - (__init__): don't keep track of url as each subclass needs to do this separately; Fix indentation of self._certs to make sure it gets set even if it's None * common/FileDownloader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself; in our case it's actually a list of urls. Make sure self._files is defined, and has at least one item too. * common/Commands.py - (deserialize_command_stream): don't let unknown commands into the deserialized command stream; they show up as None items in the returned list. - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands too Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- ChangeLog 8 May 2006 14:26:33 -0000 1.188 +++ ChangeLog 9 May 2006 02:52:57 -0000 1.189 @@ -1,5 +1,38 @@ 2006-05-08 Dan Williams + * server/PackageJob.py + - (_request_one_arch_job): Use the correct fileserver port + + * server/ArchJob.py + - (_status_repo_unlock): fix unknown variable, should be self.job + + * common/URLopener.py + - import socket to fix an unknown type + + * common/FileUploader.py + - (__init__): don't need to pass url in as each subclass keeps + track of the url itself + + * common/FileTransfer.py + - (__init__): don't keep track of url as each subclass needs + to do this separately; Fix indentation of self._certs to make + sure it gets set even if it's None + + * common/FileDownloader.py + - (__init__): don't need to pass url in as each subclass keeps + track of the url itself; in our case it's actually a list of + urls. Make sure self._files is defined, and has at least one + item too. + + * common/Commands.py + - (deserialize_command_stream): don't let unknown commands into + the deserialized command stream; they show up as None items + in the returned list. + - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands + too + +2006-05-08 Dan Williams + * common/Commands.py - Add JobFiles and JobFilesAck commands From fedora-extras-commits at redhat.com Tue May 9 02:57:13 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:57:13 -0700 Subject: extras-buildsys ChangeLog,1.189,1.190 Message-ID: <200605090257.k492vDoG000404@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv359 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * builder/Builder.py - pylint cleanups - make SRPM downloads and uploads work * builder/BuilderMock.py - pyling cleanups - remove log() - make download and upload work * server/Builder.py - Don't send multiple UnlockRepo commands - Actually let archjobs have some processing time Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- ChangeLog 9 May 2006 02:52:57 -0000 1.189 +++ ChangeLog 9 May 2006 02:57:11 -0000 1.190 @@ -1,5 +1,20 @@ 2006-05-08 Dan Williams + * builder/Builder.py + - pylint cleanups + - make SRPM downloads and uploads work + + * builder/BuilderMock.py + - pyling cleanups + - remove log() + - make download and upload work + + * server/Builder.py + - Don't send multiple UnlockRepo commands + - Actually let archjobs have some processing time + +2006-05-08 Dan Williams + * server/PackageJob.py - (_request_one_arch_job): Use the correct fileserver port From fedora-extras-commits at redhat.com Tue May 9 02:57:14 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:57:14 -0700 Subject: extras-buildsys/server Builder.py,1.36,1.37 Message-ID: <200605090257.k492vEYj000414@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv359/server Modified Files: Builder.py Log Message: 2006-05-08 Dan Williams * builder/Builder.py - pylint cleanups - make SRPM downloads and uploads work * builder/BuilderMock.py - pyling cleanups - remove log() - make download and upload work * server/Builder.py - Don't send multiple UnlockRepo commands - Actually let archjobs have some processing time Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Builder.py 5 May 2006 02:10:39 -0000 1.36 +++ Builder.py 9 May 2006 02:57:12 -0000 1.37 @@ -192,7 +192,7 @@ try: job = self._jobs[uniqid] job.set_builder_job_status(status) -# reported_uniqids.append(uniqid) + reported_uniqids.append(uniqid) except KeyError: pass @@ -523,9 +523,16 @@ """Called by an archjob to request the sending of a RepoUnlocked command to the builder for a particular archjob.""" - cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) self._lock.acquire() - self._cmd_queue.append(cmd) + found = False + for cmd in self._cmd_queue: + if isinstance(cmd, Commands.PlgCommandUnlockRepo): + if cmd.archjob_id() == uniqid: + found = True + break + if not found: + cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) + self._cmd_queue.append(cmd) self._lock.release() def request_job_files(self, archjob): @@ -581,6 +588,12 @@ # Copy command queue self._cmd_queue = self._cmd_queue + new_cmds cmd_list = self._cmd_queue[:] + # Remove commands that don't require an ack + tmp_cmd_queue = [] + for cmd in self._cmd_queue: + if cmd.need_ack(): + tmp_cmd_queue.append(cmd) + self._cmd_queue = tmp_cmd_queue self._lock.release() return cmd_list @@ -596,13 +609,19 @@ time.sleep(self._SLEEP_INTERVAL) continue + process_jobs = True self._lock.acquire() if self._unavail_count > 2: self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") + process_jobs = False elif self._last_contact + self._REQUIRED_CONTACT_INTERVAL < time.time(): self._unavail_count = self._unavail_count + 1 self._lock.release() + if process_jobs: + for j in self._jobs.values(): + j.process() + time.sleep(self._SLEEP_INTERVAL) def _handle_builder_suspend(self, reason, msg): From fedora-extras-commits at redhat.com Tue May 9 02:57:14 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:57:14 -0700 Subject: extras-buildsys/builder Builder.py,1.3,1.4 BuilderMock.py,1.2,1.3 Message-ID: <200605090257.k492vEsn000410@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv359/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-08 Dan Williams * builder/Builder.py - pylint cleanups - make SRPM downloads and uploads work * builder/BuilderMock.py - pyling cleanups - remove log() - make download and upload work * server/Builder.py - Don't send multiple UnlockRepo commands - Actually let archjobs have some processing time 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 5 May 2006 02:10:38 -0000 1.3 +++ Builder.py 9 May 2006 02:57:11 -0000 1.4 @@ -20,20 +20,22 @@ import socket import time import threading -import sha -import exceptions +import urllib import xmlrpclib import OpenSSL from plague import Commands from plague import AuthedXMLRPCServer from plague import HTTPServer from plague import XMLRPCServerProxy +from plague import FileDownloader +from plague import FileUploader import Config import BuilderMock -class BuilderInitException(Exception): pass +class BuilderInitException(Exception): + pass def get_hostname(cfg, bind_all): cfg_hostname = cfg.get_str("Passive", "hostname") @@ -49,10 +51,10 @@ import commands max_jobs = 1 cmd = "/usr/bin/getconf _NPROCESSORS_ONLN" - (s, o) = commands.getstatusoutput(cmd) - if s == 0: + (status, output) = commands.getstatusoutput(cmd) + if status == 0: try: - max_jobs = int(o) + max_jobs = int(output) except ValueError: pass return max_jobs @@ -62,75 +64,6 @@ sys.stdout.flush() -class PassiveBuilderRequestHandler: - def __init__(self, cfg, builder): - self._builder = builder - self._all_jobs = {} # unique id => awclass instance - self._building_jobs_lock = threading.Lock() - self._building_jobs = [] - self._cfg = cfg - - def _log(self, string): - if self._cfg.get_bool("General", "debug"): - print string - - def notify_job_done(self, archjob): - self._building_jobs_lock.acquire() - if archjob in self._building_jobs: - self._building_jobs.remove(archjob) - self._building_jobs_lock.release() - - def die(self, uniqid): - try: - job = self._all_jobs[uniqid] - job.die() - except KeyError: - pass - return 0 - - def files(self, uniqid): - try: - job = self._all_jobs[uniqid] - return job.files() - except KeyError: - pass - return [] - - def repo_unlocked(self, uniqid): - try: - job = self._all_jobs[uniqid] - job.unlock_repo() - except KeyError: - pass - return 0 - - def building_jobs(self): - jobs = {} - self._building_jobs_lock.acquire() - building = 0 - for job in self._building_jobs: - jobs[job.uniqid()] = job.status() - building = building + 1 - free = self._max_jobs - building - self._building_jobs_lock.release() - return (jobs, free) - - def num_slots(self): - (free_slots, max_slots) = self._builder.slots() - return max_slots - - def job_status(self, uniqid): - try: - job = self._all_jobs[uniqid] - return job.status() - except KeyError: - pass - return '' - - def supported_targets(self): - return self._builder.supported_targets() - - class Builder(object): """ Abstract builder base object """ def __init__(self, cfg): @@ -174,13 +107,13 @@ bcs.die(jobid) # wait for the jobs to clean up before quitting - log("Waiting for running jobs to stop...") + self._log("Waiting for running jobs to stop...") while True: (building_jobs, free) = bcs.building_jobs() if len(building_jobs.keys()) == 0: break try: - log(".") + self._log(".") time.sleep(0.5) except KeyboardInterrupt: break @@ -193,12 +126,18 @@ def supported_targets(self): targets = [] - for t in self._cfg.targets(): - td = t.target_dict() - td['supported_arches'] = t.arches() - targets.append(td) + for target in self._cfg.targets(): + target_dict = target.target_dict() + target_dict['supported_arches'] = target.arches() + targets.append(target_dict) return targets + def notify_job_done(self, archjob): + self._building_jobs_lock.acquire() + if archjob in self._building_jobs: + self._building_jobs.remove(archjob) + self._building_jobs_lock.release() + def _get_target_cfg(self, target_dict): target_cfg = None @@ -239,10 +178,10 @@ uniqid = -1 msg = "Success" - (free, max) = self.slots() - if free <= 0: + (free_slots, max_slots) = self.slots() + if free_slots <= 0: msg = "Error: Tried to build '%s' on target %s when already building" \ - " maximum (%d) jobs" % (srpm_url, target_str, max) + " maximum (%d) jobs" % (srpm_url, target_str, max_slots) self._log(msg) return (uniqid, msg) @@ -263,16 +202,15 @@ filename = os.path.basename(srpm_url) msg = "%s: started %s on %s arch %s at time %d" % (uniqid, filename, target_str, target_dict['arch'], archjob.starttime()) -# job.start() - except (OSError, TypeError), err: + archjob.start() + except (OSError, TypeError), exc: msg = "Failed request for %s on %s: '%s'" % (srpm_url, - target_str, err) + target_str, exc) self._log(msg) return (uniqid, msg) def _get_building_jobs_cmd(self): - jobs_list = [] cmd = Commands.PlgCommandBuildingJobs(self._seq_gen.next()) self._building_jobs_lock.acquire() for job in self._building_jobs: @@ -283,7 +221,7 @@ def _handle_unlock_repo_request(self, cmd): uniqid = cmd.archjob_id() self._building_jobs_lock.acquire() - for item in self._building_jobs: + for job in self._building_jobs: if job.uniqid() == uniqid: job.unlock_repo() self._building_jobs_lock.release() @@ -294,10 +232,74 @@ uniqid = cmd.archjob_id() job = self._all_jobs[uniqid] reply = Commands.PlgCommandJobStatusAck(uniqid, job.status(), cmd.seq(), self._seq_gen.next()) - except KeyError, e: + except KeyError: pass return reply + +class PassiveBuilderRequestHandler: + def __init__(self, cfg, builder): + self._builder = builder + self._all_jobs = {} # unique id => awclass instance + self._building_jobs_lock = threading.Lock() + self._building_jobs = [] + self._cfg = cfg + + def _log(self, string): + if self._cfg.get_bool("General", "debug"): + print string + + def die(self, uniqid): + try: + job = self._all_jobs[uniqid] + job.die() + except KeyError: + pass + return 0 + + def files(self, uniqid): + try: + job = self._all_jobs[uniqid] + return job.files() + except KeyError: + pass + return [] + + def repo_unlocked(self, uniqid): + try: + job = self._all_jobs[uniqid] + job.unlock_repo() + except KeyError: + pass + return 0 + + def building_jobs(self): + jobs = {} + self._building_jobs_lock.acquire() + building = 0 + for job in self._building_jobs: + jobs[job.uniqid()] = job.status() + building = building + 1 + free = self._max_jobs - building + self._building_jobs_lock.release() + return (jobs, free) + + def num_slots(self): + (free_slots, max_slots) = self._builder.slots() + return max_slots + + def job_status(self, uniqid): + try: + job = self._all_jobs[uniqid] + return job.status() + except KeyError: + pass + return '' + + def supported_targets(self): + return self._builder.supported_targets() + + class PassiveBuilder(Builder): """ Passive builders initiate no communication of their own. They wait @@ -317,15 +319,15 @@ self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs) self._http_server.start() - log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) + self._log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port") try: if cfg.get_bool("SSL", "use_ssl") == True: self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) else: self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) - except socket.error, e: - if e[0] == 98: + except socket.error, exc: + if exc[0] == 98: raise BuilderInitException("Error: couldn't bind to address '%s:%s'. " \ "Is the builder already running?\n" % (hostname, xmlrpc_port)) @@ -339,6 +341,12 @@ except KeyboardInterrupt: pass + def download_srpm(self, url, target_dir, dl_callback, cb_data): + """For passive builders, the server uploads the RPM to the builder. + Therefore, we already have it. Move it from the HTTP server's upload + directory to the requested target_dir, if the SRPM exists.""" + pass + def _stop_servers(self): self._http_server.stop() self._xmlrpc_server.stop() @@ -373,8 +381,8 @@ self.response = self._server.request(cmd_stream) except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): self.failed = True - except xmlrpclib.Fault, e: - print "Builder Error (%s) in request(): server replied '%s'" % (self._address, e) + except xmlrpclib.Fault, exc: + print "Builder Error (%s) in request(): server replied '%s'" % (self._address, exc) self.failed = True self.done = True @@ -414,6 +422,30 @@ except KeyboardInterrupt: pass + def download_srpm(self, url, target_dir, dl_callback, cb_data=None): + """Download an SRPM from the build server. Only used by BuilderMock + objects.""" + downloader = FileDownloader.FileDownloader(url, target_dir, ['.src.rpm'], + self._certs) + downloader.set_callback(dl_callback, url) + downloader.start() + return downloader + + def upload_files(self, files, ul_callback, cb_data=None): + server = self._cfg.get_str("Active", "server") + (urltype, urlrest) = urllib.splittype(server) + (server, urlrest) = urllib.splithost(urlrest) + if self._cfg.get_bool("SSL", "use_ssl"): + url = "https://" + server + else: + url = "http://" + server + url = url + ":%d/upload" % self._cfg.get_int("Active", "fileserver_port") + uploader = FileUploader.FileUploader(url, files, 'filedata', None, + self._certs) + uploader.set_callback(ul_callback, cb_data) + uploader.start() + return uploader + def _get_default_commands(self): """Return a python list of serialized commands that the builder sends to the server every time it contacts the server.""" @@ -427,8 +459,8 @@ # always send free & max slots next_seq = self._seq_gen.next() - (free, max) = self.slots() - cmd = Commands.PlgCommandSlots(free, max, next_seq) + (free_slots, max_slots) = self.slots() + cmd = Commands.PlgCommandSlots(free_slots, max_slots, next_seq) defcmds.append(cmd) defcmds.append(self._get_building_jobs_cmd()) @@ -455,7 +487,7 @@ time.sleep(0.5) if req.done and not req.failed: - self.queued_cmds = [] + self._queued_cmds = [] return req.response return None @@ -474,7 +506,7 @@ self._queued_cmds.append(reply) def _process_server_response(self, response): - """Process the server's response.""" + """Process the server's response command stream.""" if not response: # Something went wrong... Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BuilderMock.py 3 May 2006 04:04:27 -0000 1.2 +++ BuilderMock.py 9 May 2006 02:57:11 -0000 1.3 @@ -20,25 +20,20 @@ import os -import socket import shutil import string import fcntl import urllib import errno import exceptions -import threading import sha import time from plague import ExecUtils from plague import FileDownloader +from plague import FileTransfer -def log(string): - sys.stdout.write(string) - sys.stdout.flush() - def get_url_for_file(cfg, file_path): """ Return a URL pointing to a particular file in our work dir """ @@ -57,9 +52,9 @@ return urllib.quote(full_url) def _generate_uniqid(target_str, srpm_url): - sum = sha.new() - sum.update('%d %s %s' % (time.time(), target_str, srpm_url)) - return sum.hexdigest() + sha_hash = sha.new() + sha_hash.update('%d %s %s' % (time.time(), target_str, srpm_url)) + return sha_hash.hexdigest() class BuilderMock(threading.Thread): @@ -68,7 +63,7 @@ def __init__(self, controller, target_cfg, buildarch, srpm_url): self._controller = controller - self.buildarch = buildarch + self._buildarch = buildarch self._starttime = time.time() self._endtime = 0 self._mockstarttime = 0 @@ -77,7 +72,7 @@ self._die = False self._repo_locked = True self._repo_wait_start = 0 - self._files = [] + self._files = {} self._childpid = 0 self._target_cfg = target_cfg self._builder_cfg = target_cfg.parent_cfg() @@ -87,7 +82,10 @@ self._mock_config = None self._done_status = '' self._mock_log = None - self.buildroot = self._target_cfg.mock_config() + self._buildroot = self._target_cfg.mock_config() + self._downloader = None + self._uploader = None + self.arch_command = "" self._work_dir = self._builder_cfg.get_str("Directories", "builder_work_dir") self._result_dir = os.path.join(self._work_dir, self._uniqid, "result") @@ -120,6 +118,11 @@ self._done_status = 'killed' self._log("Killing build process...\n") + if self._downloader: + self._downloader.cancel() + if self._uploader: + self._uploader.cancel() + # Don't try to kill a running cleanup process if self._status != 'cleanup': # Kill a running non-cleanup mock process, if any @@ -145,36 +148,16 @@ self._log("Killed.\n"); - def _log(self, string): - if string and self._log_fd: - self._log_fd.write(string) + def _log(self, msg): + if msg and self._log_fd: + self._log_fd.write(msg) self._log_fd.flush() os.fsync(self._log_fd.fileno()) if self._builder_cfg.get_bool("General", "debug"): s = "%s: " % self._uniqid - sys.stdout.write(s + string) + sys.stdout.write(s + msg) sys.stdout.flush() - def dl_callback(self, dl_status, cb_data, err_msg): - url = cb_data - if dl_status == 'done': - self._status = 'downloaded' - self._log("Retrieved %s.\n" % url) - elif dl_status == 'failed': - # If job was cancelled, just return - if self.is_done_status(): - return - - # Retry up to 5 times - self._srpm_tries = self._srpm_tries + 1 - if self._srpm_tries >= 5: - self._status = 'failed' - self._log("ERROR: Failed to retrieve %s.\n" % url) - else: - # retry the download - self._status = 'init' - self._log("ERROR: Failed to retrieve %s on attempt %d (%s). Trying again...\n" % (url, self._srpm_tries, err_msg)) - def _copy_mock_output_to_log(self): if self._mock_log and os.path.exists(self._mock_log): ml = open(self._mock_log, "r") @@ -205,9 +188,9 @@ cmd = os.path.abspath(arg_list[0]) args.append(builder_cmd) args.append("-r") - args.append(self.buildroot) + args.append(self._buildroot) args.append("--arch") - args.append(self.buildarch) + args.append(self._buildarch) args.append("--resultdir=%s" % self._result_dir) args.append("--statedir=%s" % self._state_dir) args.append("--uniqueext=%s" % self._uniqid) @@ -234,7 +217,7 @@ args.append("clean") args.append("--uniqueext=%s" % self._uniqid) args.append("-r") - args.append(self.buildroot) + args.append(self._buildroot) self._log(" %s\n" % string.join(args)) self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None) @@ -279,7 +262,7 @@ while True: try: f.seek(0, 0) - string = f.read(4) + mockstat = f.read(4) except OSError, e: if e.errno == errno.EAGAIN: try: @@ -288,12 +271,11 @@ pass continue else: - if len(string) < 4: + if len(mockstat) < 4: continue break f.close() - string = string.lower() - return string + return mockstat.lower() def _read_mock_config(self): mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log') @@ -310,17 +292,32 @@ f.close() return contents + def dl_callback(self, dl_status, cb_data, err_msg=None): + url = cb_data + if dl_status == FileTransfer.FT_RESULT_SUCCESS: + self._status = 'downloaded' + self._log("Retrieved %s.\n" % url) + elif dl_status == FileTransfer.FT_RESULT_FAILED: + # If job was cancelled, just return + if self.is_done_status(): + return + self._status = 'failed' + self._log("ERROR: Failed to retrieve %s.\n" % url) + elif dl_status == FileTransfer.FT_RESULT_CANCELED: + # Ignore cancelation + pass + self._downloader = None + def _status_init(self): self._log("Starting download of %s.\n" % self._srpm_url) self._status = 'downloading' target_dir = os.path.dirname(self._srpm_path) try: - dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url, - target_dir, ['.src.rpm'], certs) - dl_thread.start() + self._downloader = self._controller.download_srpm(self._srpm_url, + target_dir, self.dl_callback, self._srpm_url) except FileDownloader.FileNameException, e: self._status = 'failed' - self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (e, self._srpm_url)) + self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (e, self._srpm_url)) def _status_downloading(self): pass @@ -360,7 +357,7 @@ # something is wrong self._watch_mock('failed', 'failed') if self._status != 'prepping': - return + return # We need to make sure that mock has dumped the status file withing a certain # amount of time, otherwise we can't tell what it's doing @@ -400,7 +397,7 @@ if source_dir.endswith(os.path.join(self._uniqid, "source")): shutil.rmtree(source_dir, ignore_errors=True) - # Ensure child process is reaped, if any + # Ensure child process is reaped if it's still around if self._childpid: try: self._log("Waiting for child process %d to exit.\n" % self._childpid) @@ -410,9 +407,21 @@ pass self._copy_mock_output_to_log() - self._files = self._find_files() + self._uploader = self._controller.upload_files(self._files, self.ul_callback, None) + self._status = "uploading" + + def _ul_callback(self, status, cb_data, msg): + if status == FileTransfer.FT_RESULT_SUCCESS: + pass + elif status == FileTransfer.FT_RESULT_FAILED: + self._done_status = 'failed' + self._log("Job failed because files could not be uploaded: %s" % msg) self._status = self._done_status + self._uploader = None + + def _status_uploading(self): + pass def _job_done(self): self._log("-----------------------\n") @@ -437,7 +446,7 @@ Target: %s UID: %s Architecture: %s - SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self.buildarch, self._srpm_url)) + SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self._buildarch, self._srpm_url)) try: srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm']) @@ -474,13 +483,24 @@ self._log("\n") self._log("Output File List:\n") self._log("-----------------\n") - for f in files_in_dir: - file_url = get_url_for_file(self._builder_cfg, os.path.join(self._result_dir, f)) - if file_url: - file_list.append(file_url) - self._log(" Output File: %s\n" % urllib.unquote(file_url)) + log_files = [] + rpms = [] + # sort into logs first, rpms later + for fname in files_in_dir: + fpath = os.path.join(self._result_dir, fname) + if fpath.endswith(".log"): + log_files.append(fpath) else: - self._log(" Error: Couldn't get file URL for file %s\n" % f) + rpms.append(fpath) + + # Dump file list to log + file_list = log_files + rpms + i = 1 + num_files = len(file_list) + for fpath in file_list: + self._log(" File (%d of %d): %s\n" % (i, num_files, + os.path.basename(fpath))) + i = i + 1 self._log("-----------------\n") return file_list From fedora-extras-commits at redhat.com Tue May 9 02:58:20 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 19:58:20 -0700 Subject: rpms/fwrestart/devel .cvsignore, 1.3, 1.4 fwrestart.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605090258.k492wMQK000449@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv428 Modified Files: .cvsignore fwrestart.spec sources Log Message: Update to 1.04 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Nov 2005 02:37:56 -0000 1.3 +++ .cvsignore 9 May 2006 02:58:20 -0000 1.4 @@ -1 +1 @@ -fwrestart-1.03.tar.gz +fwrestart-1.04.tar.gz Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/fwrestart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwrestart.spec 15 Nov 2005 02:37:56 -0000 1.3 +++ fwrestart.spec 9 May 2006 02:58:20 -0000 1.4 @@ -1,11 +1,11 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart -Version: 1.03 +Version: 1.04 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ -Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.03.tar.gz +Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Mon May 8 2006 Kevin Fenzi - 1.04-1 +- Update to 1.04 + * Mon Nov 14 2005 Kevin Fenzi - 1.03-1.fc5 - Update to 1.03 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Nov 2005 02:37:56 -0000 1.3 +++ sources 9 May 2006 02:58:20 -0000 1.4 @@ -1 +1 @@ -ea28bcab6c3829c4e3f29f70292b3880 fwrestart-1.03.tar.gz +90fdd16491da250877911cd08a257ebe fwrestart-1.04.tar.gz From fedora-extras-commits at redhat.com Tue May 9 03:07:17 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:07:17 -0700 Subject: rpms/fwrestart/FC-5 .cvsignore, 1.3, 1.4 fwrestart.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605090307.k4937JdI002743@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2722 Modified Files: .cvsignore fwrestart.spec sources Log Message: Update to 1.04 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Nov 2005 02:37:56 -0000 1.3 +++ .cvsignore 9 May 2006 03:07:17 -0000 1.4 @@ -1 +1 @@ -fwrestart-1.03.tar.gz +fwrestart-1.04.tar.gz Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-5/fwrestart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwrestart.spec 15 Nov 2005 02:37:56 -0000 1.3 +++ fwrestart.spec 9 May 2006 03:07:17 -0000 1.4 @@ -1,11 +1,11 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart -Version: 1.03 +Version: 1.04 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ -Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.03.tar.gz +Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Mon May 8 2006 Kevin Fenzi - 1.04-1 +- Update to 1.04 + * Mon Nov 14 2005 Kevin Fenzi - 1.03-1.fc5 - Update to 1.03 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Nov 2005 02:37:56 -0000 1.3 +++ sources 9 May 2006 03:07:17 -0000 1.4 @@ -1 +1 @@ -ea28bcab6c3829c4e3f29f70292b3880 fwrestart-1.03.tar.gz +90fdd16491da250877911cd08a257ebe fwrestart-1.04.tar.gz From fedora-extras-commits at redhat.com Tue May 9 03:08:49 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:08:49 -0700 Subject: rpms/fwrestart/FC-4 .cvsignore, 1.3, 1.4 fwrestart.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605090308.k4938pH8002826@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2802 Modified Files: .cvsignore fwrestart.spec sources Log Message: Update to 1.04 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Nov 2005 02:44:32 -0000 1.3 +++ .cvsignore 9 May 2006 03:08:49 -0000 1.4 @@ -1 +1 @@ -fwrestart-1.03.tar.gz +fwrestart-1.04.tar.gz Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-4/fwrestart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwrestart.spec 15 Nov 2005 02:44:32 -0000 1.3 +++ fwrestart.spec 9 May 2006 03:08:49 -0000 1.4 @@ -1,11 +1,11 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart -Version: 1.03 +Version: 1.04 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ -Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.03.tar.gz +Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Mon May 8 2006 Kevin Fenzi - 1.04-1 +- Update to 1.04 + * Mon Nov 14 2005 Kevin Fenzi - 1.03-1.fc4 - Update to 1.03 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Nov 2005 02:44:32 -0000 1.3 +++ sources 9 May 2006 03:08:49 -0000 1.4 @@ -1 +1 @@ -ea28bcab6c3829c4e3f29f70292b3880 fwrestart-1.03.tar.gz +90fdd16491da250877911cd08a257ebe fwrestart-1.04.tar.gz From fedora-extras-commits at redhat.com Tue May 9 03:10:05 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:10:05 -0700 Subject: rpms/fwrestart/FC-3 .cvsignore, 1.3, 1.4 fwrestart.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605090310.k493A7pj002908@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2887 Modified Files: .cvsignore fwrestart.spec sources Log Message: Update to 1.04 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Nov 2005 02:45:43 -0000 1.3 +++ .cvsignore 9 May 2006 03:10:05 -0000 1.4 @@ -1 +1 @@ -fwrestart-1.03.tar.gz +fwrestart-1.04.tar.gz Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-3/fwrestart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwrestart.spec 15 Nov 2005 02:45:43 -0000 1.3 +++ fwrestart.spec 9 May 2006 03:10:05 -0000 1.4 @@ -1,11 +1,11 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart -Version: 1.03 +Version: 1.04 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ -Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.03.tar.gz +Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Mon May 8 2006 Kevin Fenzi - 1.04-1 +- Update to 1.04 + * Mon Nov 14 2005 Kevin Fenzi - 1.03-1.fc3 - Update to 1.03 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Nov 2005 02:45:43 -0000 1.3 +++ sources 9 May 2006 03:10:05 -0000 1.4 @@ -1 +1 @@ -ea28bcab6c3829c4e3f29f70292b3880 fwrestart-1.03.tar.gz +90fdd16491da250877911cd08a257ebe fwrestart-1.04.tar.gz From fedora-extras-commits at redhat.com Tue May 9 03:36:20 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:36:20 -0700 Subject: rpms/p0f/devel .cvsignore,1.3,1.4 p0f.spec,1.7,1.8 sources,1.3,1.4 Message-ID: <200605090336.k493aMqO003140@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/p0f/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3119 Modified Files: .cvsignore p0f.spec sources Log Message: Update to 2.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p0f/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Dec 2004 01:10:15 -0000 1.3 +++ .cvsignore 9 May 2006 03:36:19 -0000 1.4 @@ -1 +1 @@ -p0f-2.0.5.tgz +p0f-2.0.6.tgz Index: p0f.spec =================================================================== RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- p0f.spec 17 Feb 2006 02:03:26 -0000 1.7 +++ p0f.spec 9 May 2006 03:36:19 -0000 1.8 @@ -1,13 +1,12 @@ Name: p0f -Version: 2.0.5 -Release: 4%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Summary: Versatile passive OS fingerprinting tool Group: Applications/Internet License: GPL URL: http://lcamtuf.coredump.cx/p0f.shtml -Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.5.tgz -Patch: p0f-include.patch +Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.6.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -20,7 +19,6 @@ %prep %setup -q -n p0f -%patch %build make -f mk/Linux %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -53,6 +51,10 @@ %changelog +* Mon May 8 2006 Kevin Fenzi - 2.0.6-1 +- Upgrade to 2.0.6 +- Remove unneeded include patch (fixed upstream) + * Thu Feb 16 2006 Kevin Fenzi - 2.0.5-4.fc5 - Rebuild for fc5 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/p0f/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Dec 2004 01:10:15 -0000 1.3 +++ sources 9 May 2006 03:36:19 -0000 1.4 @@ -1 +1 @@ -78235749e8ada6ad2b16b40fe15081f6 p0f-2.0.5.tgz +d6333198027b90e05ccb3412d8f25d05 p0f-2.0.6.tgz From fedora-extras-commits at redhat.com Tue May 9 03:46:18 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:46:18 -0700 Subject: rpms/p0f/FC-5 .cvsignore,1.3,1.4 p0f.spec,1.7,1.8 sources,1.3,1.4 Message-ID: <200605090346.k493kKYk003346@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/p0f/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3325 Modified Files: .cvsignore p0f.spec sources Log Message: Update to 2.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Dec 2004 01:10:15 -0000 1.3 +++ .cvsignore 9 May 2006 03:46:18 -0000 1.4 @@ -1 +1 @@ -p0f-2.0.5.tgz +p0f-2.0.6.tgz Index: p0f.spec =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-5/p0f.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- p0f.spec 17 Feb 2006 02:03:26 -0000 1.7 +++ p0f.spec 9 May 2006 03:46:18 -0000 1.8 @@ -1,13 +1,12 @@ Name: p0f -Version: 2.0.5 -Release: 4%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Summary: Versatile passive OS fingerprinting tool Group: Applications/Internet License: GPL URL: http://lcamtuf.coredump.cx/p0f.shtml -Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.5.tgz -Patch: p0f-include.patch +Source: http://lcamtuf.coredump.cx/p0f/p0f-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -20,7 +19,6 @@ %prep %setup -q -n p0f -%patch %build make -f mk/Linux %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -53,6 +51,10 @@ %changelog +* Mon May 8 2006 Kevin Fenzi - 2.0.6-1 +- Upgrade to 2.0.6 +- Remove unneeded include patch (fixed upstream) + * Thu Feb 16 2006 Kevin Fenzi - 2.0.5-4.fc5 - Rebuild for fc5 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Dec 2004 01:10:15 -0000 1.3 +++ sources 9 May 2006 03:46:18 -0000 1.4 @@ -1 +1 @@ -78235749e8ada6ad2b16b40fe15081f6 p0f-2.0.5.tgz +d6333198027b90e05ccb3412d8f25d05 p0f-2.0.6.tgz From fedora-extras-commits at redhat.com Tue May 9 03:50:17 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:50:17 -0700 Subject: rpms/p0f/FC-4 .cvsignore,1.3,1.4 p0f.spec,1.6,1.7 sources,1.3,1.4 Message-ID: <200605090350.k493oJF5003463@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/p0f/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3442 Modified Files: .cvsignore p0f.spec sources Log Message: Update to 2.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Dec 2004 01:10:15 -0000 1.3 +++ .cvsignore 9 May 2006 03:50:17 -0000 1.4 @@ -1 +1 @@ -p0f-2.0.5.tgz +p0f-2.0.6.tgz Index: p0f.spec =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-4/p0f.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- p0f.spec 22 May 2005 22:29:25 -0000 1.6 +++ p0f.spec 9 May 2006 03:50:17 -0000 1.7 @@ -1,13 +1,12 @@ Name: p0f -Version: 2.0.5 -Release: 3 +Version: 2.0.6 +Release: 1%{?dist} Summary: Versatile passive OS fingerprinting tool Group: Applications/Internet License: GPL URL: http://lcamtuf.coredump.cx/p0f.shtml -Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.5.tgz -Patch: p0f-include.patch +Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.6.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -20,7 +19,6 @@ %prep %setup -q -n p0f -%patch %build make -f mk/Linux %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -53,6 +51,10 @@ %changelog +* Mon May 8 2006 Kevin Fenzi - 2.0.6-1 +- Upgrade to 2.0.6 +- Remove unneeded include patch (fixed upstream) + * Sun May 22 2005 Jeremy Katz - 2.0.5-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Dec 2004 01:10:15 -0000 1.3 +++ sources 9 May 2006 03:50:17 -0000 1.4 @@ -1 +1 @@ -78235749e8ada6ad2b16b40fe15081f6 p0f-2.0.5.tgz +d6333198027b90e05ccb3412d8f25d05 p0f-2.0.6.tgz From fedora-extras-commits at redhat.com Tue May 9 04:37:09 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Mon, 8 May 2006 21:37:09 -0700 Subject: owners owners.list,1.964,1.965 Message-ID: <200605090437.k494bBWL005861@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5844/owners Modified Files: owners.list Log Message: Scribes: Add upstream author to initial CC: list. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.964 retrieving revision 1.965 diff -u -r1.964 -r1.965 --- owners.list 8 May 2006 21:15:10 -0000 1.964 +++ owners.list 9 May 2006 04:37:09 -0000 1.965 @@ -1435,7 +1435,7 @@ Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|screem|A website development enviroment|michael at knox.net.nz|extras-qa at fedoraproject.org| -Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org| +Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org|mystilleef at gmail.com Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scribus-templates|This package includes additional templates for Scribus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 05:38:19 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 8 May 2006 22:38:19 -0700 Subject: rpms/Maelstrom/devel Maelstrom-3.0.6-install.patch, NONE, 1.1 Maelstrom-3.0.6-setgid.patch, NONE, 1.1 Maelstrom.desktop, NONE, 1.1 Maelstrom.spec, 1.6, 1.7 Maelstrom-3.0.5-setgid.patch, 1.1, NONE Message-ID: <200605090538.k495cLQD008409@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/Maelstrom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8385 Modified Files: Maelstrom.spec Added Files: Maelstrom-3.0.6-install.patch Maelstrom-3.0.6-setgid.patch Maelstrom.desktop Removed Files: Maelstrom-3.0.5-setgid.patch Log Message: use full source URL tweak buildroot tweak summary move out of /usr/games to /usr/share/Maelstrom move score file to /var use desktop-file-install drop gid completely on startup, rework setgid code Maelstrom-3.0.6-install.patch: --- NEW FILE Maelstrom-3.0.6-install.patch --- --- Maelstrom-3.0.6/configure.foo 2006-05-09 00:08:43.000000000 -0400 +++ Maelstrom-3.0.6/configure 2006-05-09 00:09:00.000000000 -0400 @@ -3232,7 +3232,7 @@ GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" ;; *) - GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" + GAME_INSTALLDIR="\$(datadir)/$PACKAGE" ;; esac Maelstrom-3.0.6-setgid.patch: --- NEW FILE Maelstrom-3.0.6-setgid.patch --- diff -ru Maelstrom-3.0.6/main.cpp Maelstrom-3.0.6-new/main.cpp --- Maelstrom-3.0.6/main.cpp 2002-10-19 22:53:32.000000000 -0400 +++ Maelstrom-3.0.6-new/main.cpp 2006-05-09 01:05:07.000000000 -0400 @@ -170,12 +170,21 @@ /* Command line flags */ int doprinthigh = 0; int speedtest = 0; + gid_t gid; + Uint32 video_flags = SDL_SWSURFACE; /* Normal variables */ SDL_Event event; LibPath::SetExePath(argv[0]); + GetScoreFile(); + gid = getgid(); + if (setresgid(-1,gid,gid) != 0) { + error("Could not drop privleges. -- Exiting.\n"); + exit(1); + } + #ifndef __WIN95__ /* The first thing we do is calculate our checksum */ (void) checksum(); diff -ru Maelstrom-3.0.6/scores.cpp Maelstrom-3.0.6-new/scores.cpp --- Maelstrom-3.0.6/scores.cpp 2000-09-24 13:55:39.000000000 -0400 +++ Maelstrom-3.0.6-new/scores.cpp 2006-05-09 01:26:19.000000000 -0400 @@ -4,6 +4,8 @@ */ #ifdef unix +#include +#include #include #include #endif @@ -15,22 +17,40 @@ #include "load.h" #include "dialog.h" -#define MAELSTROM_SCORES "Maelstrom-Scores" +#define MAELSTROM_SCORES "/var/games/Maelstrom-Scores" #define NUM_SCORES 10 // Do not change this! /* Everyone can write to scores file if defined to 0 */ -#define SCORES_PERMMASK 0 +#define SCORES_PERMMASK 002 #define CLR_DIALOG_WIDTH 281 #define CLR_DIALOG_HEIGHT 111 Bool gNetScores = 0; Scores hScores[NUM_SCORES]; +int gScoreFile = -1; + +void GetScoreFile(void) +{ +#ifdef unix + int omask; +#endif + int f; + +#ifdef unix + omask=umask(SCORES_PERMMASK); +#endif + f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT); + if (f == -1) + f = open(MAELSTROM_SCORES,O_RDONLY); + gScoreFile = f; +#ifdef unix + umask(omask); +#endif +} void LoadScores(void) { - LibPath path; - SDL_RWops *scores_src; int i; /* Try to load network scores, if we can */ @@ -44,50 +64,50 @@ } memset(&hScores, 0, sizeof(hScores)); - scores_src = SDL_RWFromFile(path.Path(MAELSTROM_SCORES), "rb"); - if ( scores_src != NULL ) { + if (gScoreFile != -1) { + lseek(gScoreFile,0,SEEK_SET); for ( i=0; i $RPM_BUILD_ROOT%{_datadir}/applications/net-Maelstrom.desktop << EOF -[Desktop Entry] -Name=Maelstrom -Comment=Space combat game -Exec=%{_bindir}/Maelstrom -Icon=maelstrom.png -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;Game;ArcadeGame;X-Red-Hat-Base; -EOF +desktop-file-install --vendor fedora --dir \ + $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora %{SOURCE2} # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav} @@ -56,25 +50,43 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/games +mv $RPM_BUILD_ROOT%{_datadir}/Maelstrom/*Scores $RPM_BUILD_ROOT%{_localstatedir}/lib/games + %clean rm -rf $RPM_BUILD_ROOT +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create /usr/share/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q /usr/share/icons/hicolor +fi + + %files -%defattr(-, root, games) +%defattr(-, root, root) %doc COPYING CREDITS README* Changelog Docs %attr(2755,root,games) %{_bindir}/Maelstrom -%attr(0575,root,games) %dir %{_prefix}/games/Maelstrom -%config %attr(0060,root,games) %{_prefix}/games/Maelstrom/Maelstrom-Scores -%{_prefix}/games/Maelstrom/icon* -%{_prefix}/games/Maelstrom/Images -%{_prefix}/games/Maelstrom/Maelstrom_Fonts -%{_prefix}/games/Maelstrom/Maelstrom_Sounds -%{_prefix}/games/Maelstrom/Maelstrom_Sprites -%defattr(-, root, root) -%{_datadir}/applications/net-Maelstrom.desktop +%{_datadir}/Maelstrom +%{_datadir}/applications/* %{_datadir}/icons +%config(noreplace) %attr(0664,root,games) %{_localstatedir}/lib/games/Maelstrom-Scores %changelog +* Tue May 9 2006 Bill Nottingham 3.0.6-11 +- various fixes from review: + - update the icon cache + - move out of /usr/games + - move scores to /var + - rework setuid code + - use desktop-file-install + * Mon Feb 13 2006 Bill Nottingham 3.0.6-10 - rebuild --- Maelstrom-3.0.5-setgid.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 05:52:38 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 8 May 2006 22:52:38 -0700 Subject: rpms/Maelstrom/devel Maelstrom-3.0.6-setgid.patch, 1.1, 1.2 Maelstrom.spec, 1.7, 1.8 Message-ID: <200605090552.k495qeD5008465@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/Maelstrom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8443 Modified Files: Maelstrom-3.0.6-setgid.patch Maelstrom.spec Log Message: fix setgid Maelstrom-3.0.6-setgid.patch: Index: Maelstrom-3.0.6-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom-3.0.6-setgid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Maelstrom-3.0.6-setgid.patch 9 May 2006 05:38:19 -0000 1.1 +++ Maelstrom-3.0.6-setgid.patch 9 May 2006 05:52:38 -0000 1.2 @@ -35,12 +35,12 @@ #include #include #endif -@@ -15,22 +17,40 @@ +@@ -15,22 +17,42 @@ #include "load.h" #include "dialog.h" -#define MAELSTROM_SCORES "Maelstrom-Scores" -+#define MAELSTROM_SCORES "/var/games/Maelstrom-Scores" ++#define MAELSTROM_SCORES "/var/lib/games/Maelstrom-Scores" #define NUM_SCORES 10 // Do not change this! /* Everyone can write to scores file if defined to 0 */ @@ -67,6 +67,8 @@ + f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT); + if (f == -1) + f = open(MAELSTROM_SCORES,O_RDONLY); ++ if (f == -1) ++ error("Couldn't open score file %s.\n",MAELSTROM_SCORES); + gScoreFile = f; +#ifdef unix + umask(omask); @@ -171,3 +173,16 @@ extern int ZapHighScores(void); extern int GetStartLevel(void); extern void PrintHighScores(void); +diff -ru Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp +--- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp 2006-05-09 01:42:42.000000000 -0400 ++++ Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp 2006-05-09 01:07:58.000000000 -0400 +@@ -536,6 +536,8 @@ + const int max = 32; + Uint16 ramp[256]; + ++ faded = !faded; ++ return; + for ( int j = 1; j <= max; j++ ) { + int v = faded ? j : max - j + 1; + for ( int i = 0; i < 256; i++ ) { +Binary files Maelstrom-3.0.6/screenlib/SDL_FrameBuf.o and Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.o differ Index: Maelstrom.spec =================================================================== RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Maelstrom.spec 9 May 2006 05:38:19 -0000 1.7 +++ Maelstrom.spec 9 May 2006 05:52:38 -0000 1.8 @@ -23,7 +23,7 @@ %prep %setup -q -#%patch0 -p1 -b .setgid +%patch0 -p1 -b .setgid %patch1 -p1 -b .gcc34 %patch2 -p1 -b .64bit %patch3 -p1 -b .install From fedora-extras-commits at redhat.com Tue May 9 06:04:55 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 8 May 2006 23:04:55 -0700 Subject: rpms/Maelstrom/devel Maelstrom-3.0.6-setgid.patch,1.2,1.3 Message-ID: <200605090604.k4964wEW010815@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/Maelstrom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10737 Modified Files: Maelstrom-3.0.6-setgid.patch Log Message: remove make-it-go-fast hack. Need to figure out why the fade is so slow on current X. Maelstrom-3.0.6-setgid.patch: Index: Maelstrom-3.0.6-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom-3.0.6-setgid.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Maelstrom-3.0.6-setgid.patch 9 May 2006 05:52:38 -0000 1.2 +++ Maelstrom-3.0.6-setgid.patch 9 May 2006 06:04:55 -0000 1.3 @@ -173,16 +173,3 @@ extern int ZapHighScores(void); extern int GetStartLevel(void); extern void PrintHighScores(void); -diff -ru Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp ---- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp 2006-05-09 01:42:42.000000000 -0400 -+++ Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp 2006-05-09 01:07:58.000000000 -0400 -@@ -536,6 +536,8 @@ - const int max = 32; - Uint16 ramp[256]; - -+ faded = !faded; -+ return; - for ( int j = 1; j <= max; j++ ) { - int v = faded ? j : max - j + 1; - for ( int i = 0; i < 256; i++ ) { -Binary files Maelstrom-3.0.6/screenlib/SDL_FrameBuf.o and Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.o differ From fedora-extras-commits at redhat.com Tue May 9 06:05:01 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:05:01 -0700 Subject: extras-buildsys/server ArchJob.py, 1.29, 1.30 Builder.py, 1.37, 1.38 BuilderManager.py, 1.22, 1.23 Message-ID: <200605090605.k49651Im010830@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735/server Modified Files: ArchJob.py Builder.py BuilderManager.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for * builder/BuilderMock.py - Fix name of ul_callback() * common/FileTransfer.py - Trap operational errors * server/ArchJob.py - (get_upload_dir): new function; return the directory into which result files should be written * server/Builder.py - (get_archjob): new function; return archjob object for a particular jobid - (_handle_building_jobs): correct scoping of bits that get status for certain jobs - Increase the required active builder contact interval slightly - (request): reset the unavailable count every time the builder contacts us * server/BuilderManager.py - (__init__): Enable the HTTP POST handler when there are active builders - (upload_callback): handle incoming files by writing them to the correct location based on their jobid Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ArchJob.py 9 May 2006 02:52:58 -0000 1.29 +++ ArchJob.py 9 May 2006 06:04:54 -0000 1.30 @@ -225,6 +225,12 @@ print "%s (%s/%s): Build result files - [ %s ]" % (self.par_job.uid, self.par_job.package, self._target_dict['arch'], file_string) + def get_upload_dir(self): + upload_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) + if not os.path.exists(upload_dir): + os.makedirs(upload_dir) + return upload_dir + def _status_downloading(self): # Start grabbing the next undownloaded file, but only # if we aren't already pulling one down Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- Builder.py 9 May 2006 02:57:12 -0000 1.37 +++ Builder.py 9 May 2006 06:04:54 -0000 1.38 @@ -117,6 +117,13 @@ def stop(self): self._stop = True + def get_archjob(self, archjob_id): + try: + return self._jobs[archjob_id] + except KeyError: + pass + return None + def _handle_builder_suspend(self, reason, msg): for jobid in self._jobs.keys(): job = self._jobs[jobid] @@ -196,22 +203,23 @@ except KeyError: pass - # We have to check jobs that weren't reported - # as 'building' by the builder, since the job - # may have finished on the builder and was - # removed from the building job list before we - # were able to know that it was done. HACK - self._prepping_jobs = False - for jobid in self._jobs.keys(): - # If the builder didn't report this job as building, - # and its not done, explicitly get its status - job = self._jobs[jobid] - if jobid not in reported_uniqids and job.get_status() != 'done': - new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) - - # Check for prepping jobs - if job.prepping(): - self._prepping_jobs = True + # We have to check jobs that weren't reported + # as 'building' by the builder, since the job + # may have finished on the builder and was + # removed from the building job list before we + # were able to know that it was done. HACK + self._prepping_jobs = False + for jobid in self._jobs.keys(): + # If the builder didn't report this job as building, + # and its not done, explicitly get its status + job = self._jobs[jobid] + if jobid not in reported_uniqids and job.get_status() != 'done': + print "Requesting job status for %s" % jobid + new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) + + # Check for prepping jobs + if job.prepping(): + self._prepping_jobs = True del reported_uniqids return new_cmds @@ -510,7 +518,7 @@ punching holes through it. """ - _REQUIRED_CONTACT_INTERVAL = 20 + _REQUIRED_CONTACT_INTERVAL = 25 def __init__(self, manager, cfg, address, weight, btype): Builder.__init__(self, manager, cfg, address, weight, btype) @@ -568,6 +576,8 @@ from the BuildMaster's XML-RPC server.""" self._last_contact = time.time() + self._unavail_count = 0 + print "%s: builder contact" % self._last_contact if not self._available: self._handle_builder_reactivate(cmd_list) Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- BuilderManager.py 28 Apr 2006 03:17:41 -0000 1.22 +++ BuilderManager.py 9 May 2006 06:04:54 -0000 1.23 @@ -185,8 +185,51 @@ certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._srpm_server = HTTPServer.PlgHTTPServerManager((hostname, port), http_dir, certs) - self._srpm_server.start() + self._fileserver = HTTPServer.PlgHTTPServerManager((hostname, port), http_dir, certs) + if any_active: + self._fileserver.set_POST_handler('/upload', self.upload_callback) + self._fileserver.start() + + def upload_callback(self, request_handler, fs): + # Ensure we know this builder + addr = request_handler.client_address[0] + builder = self.get_builder(addr, addr) + if not builder: + request_handler.send_error(403, "Unauthorized") + return + + # Search for filename + fslist = [fs] + if not fs.name and not fs.filename and fs.value: + fslist = fs.value + jobid = filename = tmpfile = None + for item in fslist: + if item.name == 'archjob_id': + try: + jobid = str(item.value) + except ValueError: + pass + elif item.name == 'filedata': + filename = item.filename + tmpfile = item.file + + if jobid and filename and tmpfile: + archjob = builder.get_archjob(jobid) + if archjob: + upload_dir = archjob.get_upload_dir() + import shutil, urllib + destpath = os.path.join(upload_dir, urllib.unquote(filename)) + dest = file(destpath, "w+b") + shutil.copyfileobj(tmpfile, dest) + dest.close() + request_handler.send_response(200, "Success") + request_handler.send_header("Content-type", "text/html") + request_handler.end_headers() + request_handler.wfile.write("Success!") + else: + request_handler.send_error(400, "Invalid request for archjob_id %s" % jobid) + else: + request_handler.send_error(400, "Invalid request for %s" % request_handler.path) def _print_builders(self): # Print out builder list when starting up @@ -213,7 +256,7 @@ builder.stop() if self._xmlrpc_server: self._xmlrpc_server.stop() - self._srpm_server.stop() + self._fileserver.stop() def _load_builders(self): self._builders_lock.acquire() From fedora-extras-commits at redhat.com Tue May 9 06:04:50 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:04:50 -0700 Subject: extras-buildsys ChangeLog,1.190,1.191 Message-ID: <200605090605.k4965Klu010833@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735 Modified Files: ChangeLog Log Message: 2006-05-09 Dan Williams * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for * builder/BuilderMock.py - Fix name of ul_callback() * common/FileTransfer.py - Trap operational errors * server/ArchJob.py - (get_upload_dir): new function; return the directory into which result files should be written * server/Builder.py - (get_archjob): new function; return archjob object for a particular jobid - (_handle_building_jobs): correct scoping of bits that get status for certain jobs - Increase the required active builder contact interval slightly - (request): reset the unavailable count every time the builder contacts us * server/BuilderManager.py - (__init__): Enable the HTTP POST handler when there are active builders - (upload_callback): handle incoming files by writing them to the correct location based on their jobid Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- ChangeLog 9 May 2006 02:57:11 -0000 1.190 +++ ChangeLog 9 May 2006 06:04:47 -0000 1.191 @@ -1,3 +1,35 @@ +2006-05-09 Dan Williams + + * builder/Builder.py + - (upload_files): fix extraction of server address, and pass + the jobid to the server so it knows what the result files + are for + + * builder/BuilderMock.py + - Fix name of ul_callback() + + * common/FileTransfer.py + - Trap operational errors + + * server/ArchJob.py + - (get_upload_dir): new function; return the directory into + which result files should be written + + * server/Builder.py + - (get_archjob): new function; return archjob object for a + particular jobid + - (_handle_building_jobs): correct scoping of bits that get + status for certain jobs + - Increase the required active builder contact interval slightly + - (request): reset the unavailable count every time the builder + contacts us + + * server/BuilderManager.py + - (__init__): Enable the HTTP POST handler when there are + active builders + - (upload_callback): handle incoming files by writing them + to the correct location based on their jobid + 2006-05-08 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Tue May 9 06:04:55 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:04:55 -0700 Subject: extras-buildsys/builder Builder.py,1.4,1.5 BuilderMock.py,1.3,1.4 Message-ID: <200605090605.k4965Pp1010837@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for * builder/BuilderMock.py - Fix name of ul_callback() * common/FileTransfer.py - Trap operational errors * server/ArchJob.py - (get_upload_dir): new function; return the directory into which result files should be written * server/Builder.py - (get_archjob): new function; return archjob object for a particular jobid - (_handle_building_jobs): correct scoping of bits that get status for certain jobs - Increase the required active builder contact interval slightly - (request): reset the unavailable count every time the builder contacts us * server/BuilderManager.py - (__init__): Enable the HTTP POST handler when there are active builders - (upload_callback): handle incoming files by writing them to the correct location based on their jobid 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 9 May 2006 02:57:11 -0000 1.4 +++ Builder.py 9 May 2006 06:04:48 -0000 1.5 @@ -431,16 +431,17 @@ downloader.start() return downloader - def upload_files(self, files, ul_callback, cb_data=None): + def upload_files(self, archjob_id, files, ul_callback, cb_data=None): server = self._cfg.get_str("Active", "server") (urltype, urlrest) = urllib.splittype(server) - (server, urlrest) = urllib.splithost(urlrest) + (ignore, server) = urllib.splithost(urlrest) if self._cfg.get_bool("SSL", "use_ssl"): url = "https://" + server else: url = "http://" + server url = url + ":%d/upload" % self._cfg.get_int("Active", "fileserver_port") - uploader = FileUploader.FileUploader(url, files, 'filedata', None, + data = [("archjob_id", archjob_id)] + uploader = FileUploader.FileUploader(url, files, 'filedata', data, self._certs) uploader.set_callback(ul_callback, cb_data) uploader.start() Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BuilderMock.py 9 May 2006 02:57:11 -0000 1.3 +++ BuilderMock.py 9 May 2006 06:04:48 -0000 1.4 @@ -408,10 +408,11 @@ self._copy_mock_output_to_log() self._files = self._find_files() - self._uploader = self._controller.upload_files(self._files, self.ul_callback, None) + self._uploader = self._controller.upload_files(self._uniqid, self._files, + self.ul_callback, None) self._status = "uploading" - def _ul_callback(self, status, cb_data, msg): + def ul_callback(self, status, cb_data, msg): if status == FileTransfer.FT_RESULT_SUCCESS: pass elif status == FileTransfer.FT_RESULT_FAILED: From fedora-extras-commits at redhat.com Tue May 9 06:04:56 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:04:56 -0700 Subject: extras-buildsys/common FileTransfer.py,1.2,1.3 Message-ID: <200605090605.k4965Q7O010840@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735/common Modified Files: FileTransfer.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for * builder/BuilderMock.py - Fix name of ul_callback() * common/FileTransfer.py - Trap operational errors * server/ArchJob.py - (get_upload_dir): new function; return the directory into which result files should be written * server/Builder.py - (get_archjob): new function; return archjob object for a particular jobid - (_handle_building_jobs): correct scoping of bits that get status for certain jobs - Increase the required active builder contact interval slightly - (request): reset the unavailable count every time the builder contacts us * server/BuilderManager.py - (__init__): Enable the HTTP POST handler when there are active builders - (upload_callback): handle incoming files by writing them to the correct location based on their jobid Index: FileTransfer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileTransfer.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FileTransfer.py 9 May 2006 02:53:03 -0000 1.2 +++ FileTransfer.py 9 May 2006 06:04:53 -0000 1.3 @@ -61,9 +61,13 @@ def _process_one_transfer(self, data=None): """Retries a transfer for a specified number of times before failing.""" status = FT_RESULT_FAILED - result = msg = None + result = msg = filed_msg = None for attempt in range(1, self._tries + 1): - (result, msg) = self._action(data) + try: + (result, msg) = self._action(data) + except ValueError, exc: + result = None + failed_msg = str(exc) if result: status = FT_RESULT_SUCCESS break @@ -71,7 +75,9 @@ status = FT_RESULT_CANCELED break time.sleep(5) - msg = "Transfer of timed out." + failed_msg = "Transfer timed out." + if status == FT_RESULT_FAILED: + msg = failed_msg return (status, msg) def run(self): From fedora-extras-commits at redhat.com Tue May 9 06:09:55 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:09:55 -0700 Subject: extras-buildsys/server Builder.py,1.38,1.39 Message-ID: <200605090609.k4969txL010877@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10859/server Modified Files: Builder.py Log Message: Remove debug print Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- Builder.py 9 May 2006 06:04:54 -0000 1.38 +++ Builder.py 9 May 2006 06:09:53 -0000 1.39 @@ -577,7 +577,6 @@ self._last_contact = time.time() self._unavail_count = 0 - print "%s: builder contact" % self._last_contact if not self._available: self._handle_builder_reactivate(cmd_list) From fedora-extras-commits at redhat.com Tue May 9 06:25:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 8 May 2006 23:25:19 -0700 Subject: fedora-security/audit fe4,1.14,1.15 fe5,1.14,1.15 Message-ID: <200605090625.k496PJY0010934@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10914/audit Modified Files: fe4 fe5 Log Message: awstats update/reopen, CVE-2006-2237 != CVE-2006-1945. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fe4 8 May 2006 20:25:23 -0000 1.14 +++ fe4 9 May 2006 06:25:16 -0000 1.15 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-NOID backport (awstats, fixed 6.5-2) bz#190923 awstats-6.5-CVE-2006-1945.patch +CVE-2006-2237 VULNERABLE (awstats) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fe5 8 May 2006 20:25:23 -0000 1.14 +++ fe5 9 May 2006 06:25:16 -0000 1.15 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-NOID backport (awstats, fixed 6.5-4) bz#190923 awstats-6.5-CVE-2006-1945.patch +CVE-2006-2237 VULNERABLE (awstats) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 From fedora-extras-commits at redhat.com Tue May 9 06:58:13 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:58:13 -0700 Subject: rpms/par2cmdline - New directory Message-ID: <200605090658.k496wFDO011097@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11076/par2cmdline Log Message: Directory /cvs/extras/rpms/par2cmdline added to the repository From fedora-extras-commits at redhat.com Tue May 9 06:58:14 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:58:14 -0700 Subject: rpms/par2cmdline/devel - New directory Message-ID: <200605090658.k496wGab011100@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11076/par2cmdline/devel Log Message: Directory /cvs/extras/rpms/par2cmdline/devel added to the repository From fedora-extras-commits at redhat.com Tue May 9 06:58:35 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:58:35 -0700 Subject: rpms/par2cmdline Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605090658.k496wb8Q011156@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11123 Added Files: Makefile import.log Log Message: Setup of module par2cmdline --- NEW FILE Makefile --- # Top level Makefile for module par2cmdline all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 9 06:58:36 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:58:36 -0700 Subject: rpms/par2cmdline/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605090658.k496wcQi011159@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11123/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module par2cmdline --- NEW 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 May 9 06:59:18 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:59:18 -0700 Subject: rpms/par2cmdline import.log,1.1,1.2 Message-ID: <200605090659.k496xKgN011226@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11192 Modified Files: import.log Log Message: auto-import par2cmdline-0.4-7 on branch devel from par2cmdline-0.4-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 May 2006 06:58:35 -0000 1.1 +++ import.log 9 May 2006 06:59:18 -0000 1.2 @@ -0,0 +1 @@ +par2cmdline-0_4-7:HEAD:par2cmdline-0.4-7.src.rpm:1147157953 From fedora-extras-commits at redhat.com Tue May 9 06:59:19 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:59:19 -0700 Subject: rpms/par2cmdline/devel par2cmdline-reedsolomon.cpp.patch, NONE, 1.1 par2cmdline.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605090659.k496xLFS011233@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11192/devel Modified Files: .cvsignore sources Added Files: par2cmdline-reedsolomon.cpp.patch par2cmdline.spec Log Message: auto-import par2cmdline-0.4-7 on branch devel from par2cmdline-0.4-7.src.rpm par2cmdline-reedsolomon.cpp.patch: --- NEW FILE par2cmdline-reedsolomon.cpp.patch --- diff -u -r par2cmdline-0.4.orig/reedsolomon.cpp par2cmdline-0.4/reedsolomon.cpp --- par2cmdline-0.4.orig/reedsolomon.cpp 2003-05-26 20:01:31.000000000 +0200 +++ par2cmdline-0.4/reedsolomon.cpp 2006-04-11 19:44:52.000000000 +0200 @@ -51,6 +51,7 @@ } } +template <> bool ReedSolomon::SetInput(const vector &present) { inputcount = (u32)present.size(); @@ -80,6 +81,7 @@ return true; } +template <> bool ReedSolomon::SetInput(u32 count) { inputcount = count; @@ -101,6 +103,7 @@ return true; } +template <> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) { // Look up the appropriate element in the RS matrix @@ -189,6 +192,7 @@ // Set which of the source files are present and which are missing // and compute the base values to use for the vandermonde matrix. +template <> bool ReedSolomon::SetInput(const vector &present) { inputcount = (u32)present.size(); @@ -233,6 +237,7 @@ // Record that the specified number of source files are all present // and compute the base values to use for the vandermonde matrix. +template <> bool ReedSolomon::SetInput(u32 count) { inputcount = count; @@ -267,6 +272,7 @@ return true; } +template <> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) { // Look up the appropriate element in the RS matrix --- NEW FILE par2cmdline.spec --- Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 Release: 7%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 Provides: parchive = 1.1.4.0.par2.%{version} %description par2cmdline is a program for creating and using PAR2 files to detect damage in data files and repair them if necessary. PAR2 files are usually published in binary newsgroups on Usenet; they apply the data-recovery capability concepts of RAID-like systems to the posting and recovery of multi-part archives. %prep %setup %patch0 -p1 sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build %configure make %{_smp_mflags} chmod 644 ChangeLog galois.h par1repairer.cpp par2repairer.cpp par2repairersourcefile.cpp par2repairersourcefile.h %install %makeinstall ln -sf par2 $RPM_BUILD_ROOT/%{_bindir}/par %clean rm -rf $RPM_BUILD_ROOT %check make check-TESTS %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog PORTING README ROADMAP %{_bindir}/* %changelog * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. - Add %check section * Thu Apr 27 2006 Laurent Rineau - 0.4-6 - chmod 644 several files, in %build - fix the Source: tag. - new %description - changed the buildroot to the one recommanded for Fedora Extras * Wed Apr 12 2006 Laurent Rineau - 0.4-5 - Added the dist tag. - Recode several file with sed, to remove DOS end-of-lines. - Changed the URL: tag. - Cleanup after a rpmlint pass. * Tue Apr 11 2006 Laurent Rineau - 0.4-3 - updated for Fedora Core 4 - obsolete parchive 1.1.4 - provides parchive = 1.1.4.0.par2.%{version} * Tue May 11 2004 - Thibaut Cousin - updated to version 0.4 for SUSE 9.1 * Tue Oct 21 2003 - Thibaut Cousin - first release of this package for SuSE 9.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 May 2006 06:58:36 -0000 1.1 +++ .cvsignore 9 May 2006 06:59:19 -0000 1.2 @@ -0,0 +1 @@ +par2cmdline-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 May 2006 06:58:36 -0000 1.1 +++ sources 9 May 2006 06:59:19 -0000 1.2 @@ -0,0 +1 @@ +1551b63e57e3c232254dc62073b723a9 par2cmdline-0.4.tar.gz From fedora-extras-commits at redhat.com Tue May 9 07:05:30 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Tue, 9 May 2006 00:05:30 -0700 Subject: owners owners.list,1.965,1.966 Message-ID: <200605090705.k4975W6T013512@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13495 Modified Files: owners.list Log Message: Added myself as owner of par2cmdline. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.965 retrieving revision 1.966 diff -u -r1.965 -r1.966 --- owners.list 9 May 2006 04:37:09 -0000 1.965 +++ owners.list 9 May 2006 07:05:30 -0000 1.966 @@ -872,6 +872,7 @@ Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fc_extra at normalesup.org|extras-qa at fedoraproject.org| Fedora Extras|paraview|Parallel visualization application|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 09:04:14 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 9 May 2006 02:04:14 -0700 Subject: rpms/awstats/FC-4 awstats-6.5-CVE-2006-1945.patch, 1.1, 1.2 awstats.spec, 1.12, 1.13 Message-ID: <200605090904.k4994GeS029947@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29910/FC-4 Modified Files: awstats-6.5-CVE-2006-1945.patch awstats.spec Log Message: really fix CVE-2006-1945 awstats-6.5-CVE-2006-1945.patch: Index: awstats-6.5-CVE-2006-1945.patch =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats-6.5-CVE-2006-1945.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- awstats-6.5-CVE-2006-1945.patch 7 May 2006 23:40:34 -0000 1.1 +++ awstats-6.5-CVE-2006-1945.patch 9 May 2006 09:04:14 -0000 1.2 @@ -1,16 +1,81 @@ -diff -u -r1.860 -r1.861 ---- wwwroot/cgi-bin/awstats.pl 9 Jan 2006 18:51:06 -0000 1.860 -+++ wwwroot/cgi-bin/awstats.pl 22 Jan 2006 12:55:14 -0000 1.861 -@@ -5542,7 +5542,7 @@ +--- ./wwwroot/cgi-bin/awstats.pl.CVE-2006-1945 2005-11-24 21:11:19.000000000 +0100 ++++ ./wwwroot/cgi-bin/awstats.pl 2006-05-09 10:46:34.000000000 +0200 +@@ -4430,6 +4394,7 @@ + + #------------------------------------------------------------------------------ + # Function: Clean a string of HTML tags to avoid 'Cross Site Scripting attacks' ++# and clean | char. + # Parameters: stringtoclean + # Input: None + # Output: None +@@ -4439,6 +4404,7 @@ + my $stringtoclean=shift; + $stringtoclean =~ s//>/g; ++ $stringtoclean =~ s/|//g; + return $stringtoclean; + } + +@@ -5516,6 +5483,7 @@ + 'hostfilter','hostfilterex','urlfilter','urlfilterex','refererpagesfilter','refererpagesfilterex', + 'pluginmode','filterrawlog'); + ++# Parse input parameters and sanitize them for security reasons + $QueryString=''; + # AWStats use GATEWAY_INTERFACE to known if ran as CLI or CGI. AWSTATS_DEL_GATEWAY_INTERFACE can + # be set to force AWStats to be ran as CLI even from a web page. +@@ -5534,7 +5502,7 @@ + $QueryString =~ s/&/&/g; + } + +- $QueryString = CleanFromCSSA($QueryString); ++ $QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString)); + + # Security test + if ($QueryString =~ /LogFile=([^&]+)/i) { error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); } +@@ -5542,26 +5510,26 @@ # No update but report by default when run from a browser $UpdateStats=($QueryString=~/update=1/i?1:0); - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } -+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } - if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } - if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } - if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } -@@ -5591,7 +5591,7 @@ +- if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } +- if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } +- if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } ++ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } ++ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } ++ if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } ++ if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } + # All filters +- if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can also be defined with hostfilter=filter +- if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}=&DecodeEncodedString("$1"); } # +- if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can also be defined with urlfilter=filter +- if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}=&DecodeEncodedString("$1"); } # +- if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can also be defined with refererpagesfilter=filter +- if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}=&DecodeEncodedString("$1"); } # ++ if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can also be defined with hostfilter=filter ++ if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}="$1"; } # ++ if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can also be defined with urlfilter=filter ++ if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}="$1"; } # ++ if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can also be defined with refererpagesfilter=filter ++ if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}="$1"; } # + # All output +- if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed + + # If migrate + if ($QueryString =~ /(^|-|&|&)migrate=([^&]+)/i) { +- $MigrateStats=&DecodeEncodedString("$2"); ++ $MigrateStats=&Sanitize("$2"); + $MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/; + $SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//; # SiteConfig is used to find config file + } +@@ -5591,7 +5559,7 @@ # Update with no report by default when run from command line $UpdateStats=1; @@ -19,3 +84,12 @@ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } +@@ -5625,8 +5593,6 @@ + if ($QueryString =~ /(^|&|&)databasebreak=(\w+)/i) { $DatabaseBreak=$2; } + if ($QueryString =~ /(^|&|&)updatefor=(\d+)/i) { $UpdateFor=$2; } + if ($QueryString =~ /(^|&|&)noloadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=1; } } +-#Removed for security reasons +-#if ($QueryString =~ /(^|&|&)loadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=-1; } } + if ($QueryString =~ /(^|&|&)limitflush=(\d+)/i) { $LIMITFLUSH=$2; } + # Get/Define output + if ($QueryString =~ /(^|&|&)output(=[^&]*|)(.*)(&|&)output(=[^&]*|)(&|$)/i) { error("Only 1 output option is allowed","","",1); } Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- awstats.spec 7 May 2006 23:49:26 -0000 1.12 +++ awstats.spec 9 May 2006 09:04:14 -0000 1.13 @@ -1,6 +1,6 @@ Name: awstats Version: 6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -154,6 +154,9 @@ %{_datadir}/%{name}/wwwroot/js %changelog +* Tue May 09 2006 Aurelien Bompard 6.5-3 +- really fix CVE-2006-1945... + * Mon May 08 2006 Aurelien Bompard 6.5-2 - add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923) From fedora-extras-commits at redhat.com Tue May 9 09:04:15 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 9 May 2006 02:04:15 -0700 Subject: rpms/awstats/FC-5 awstats-6.5-CVE-2006-1945.patch, 1.1, 1.2 awstats.spec, 1.13, 1.14 Message-ID: <200605090904.k4994Hta029955@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29910/FC-5 Modified Files: awstats-6.5-CVE-2006-1945.patch awstats.spec Log Message: really fix CVE-2006-1945 awstats-6.5-CVE-2006-1945.patch: Index: awstats-6.5-CVE-2006-1945.patch =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats-6.5-CVE-2006-1945.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- awstats-6.5-CVE-2006-1945.patch 7 May 2006 23:40:34 -0000 1.1 +++ awstats-6.5-CVE-2006-1945.patch 9 May 2006 09:04:15 -0000 1.2 @@ -1,16 +1,81 @@ -diff -u -r1.860 -r1.861 ---- wwwroot/cgi-bin/awstats.pl 9 Jan 2006 18:51:06 -0000 1.860 -+++ wwwroot/cgi-bin/awstats.pl 22 Jan 2006 12:55:14 -0000 1.861 -@@ -5542,7 +5542,7 @@ +--- ./wwwroot/cgi-bin/awstats.pl.CVE-2006-1945 2005-11-24 21:11:19.000000000 +0100 ++++ ./wwwroot/cgi-bin/awstats.pl 2006-05-09 10:46:34.000000000 +0200 +@@ -4430,6 +4394,7 @@ + + #------------------------------------------------------------------------------ + # Function: Clean a string of HTML tags to avoid 'Cross Site Scripting attacks' ++# and clean | char. + # Parameters: stringtoclean + # Input: None + # Output: None +@@ -4439,6 +4404,7 @@ + my $stringtoclean=shift; + $stringtoclean =~ s//>/g; ++ $stringtoclean =~ s/|//g; + return $stringtoclean; + } + +@@ -5516,6 +5483,7 @@ + 'hostfilter','hostfilterex','urlfilter','urlfilterex','refererpagesfilter','refererpagesfilterex', + 'pluginmode','filterrawlog'); + ++# Parse input parameters and sanitize them for security reasons + $QueryString=''; + # AWStats use GATEWAY_INTERFACE to known if ran as CLI or CGI. AWSTATS_DEL_GATEWAY_INTERFACE can + # be set to force AWStats to be ran as CLI even from a web page. +@@ -5534,7 +5502,7 @@ + $QueryString =~ s/&/&/g; + } + +- $QueryString = CleanFromCSSA($QueryString); ++ $QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString)); + + # Security test + if ($QueryString =~ /LogFile=([^&]+)/i) { error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); } +@@ -5542,26 +5510,26 @@ # No update but report by default when run from a browser $UpdateStats=($QueryString=~/update=1/i?1:0); - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } -+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } - if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } - if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } - if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } -@@ -5591,7 +5591,7 @@ +- if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } +- if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } +- if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } ++ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } ++ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } ++ if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } ++ if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } + # All filters +- if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can also be defined with hostfilter=filter +- if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}=&DecodeEncodedString("$1"); } # +- if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can also be defined with urlfilter=filter +- if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}=&DecodeEncodedString("$1"); } # +- if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can also be defined with refererpagesfilter=filter +- if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}=&DecodeEncodedString("$1"); } # ++ if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can also be defined with hostfilter=filter ++ if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}="$1"; } # ++ if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can also be defined with urlfilter=filter ++ if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}="$1"; } # ++ if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can also be defined with refererpagesfilter=filter ++ if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}="$1"; } # + # All output +- if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed + + # If migrate + if ($QueryString =~ /(^|-|&|&)migrate=([^&]+)/i) { +- $MigrateStats=&DecodeEncodedString("$2"); ++ $MigrateStats=&Sanitize("$2"); + $MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/; + $SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//; # SiteConfig is used to find config file + } +@@ -5591,7 +5559,7 @@ # Update with no report by default when run from command line $UpdateStats=1; @@ -19,3 +84,12 @@ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } +@@ -5625,8 +5593,6 @@ + if ($QueryString =~ /(^|&|&)databasebreak=(\w+)/i) { $DatabaseBreak=$2; } + if ($QueryString =~ /(^|&|&)updatefor=(\d+)/i) { $UpdateFor=$2; } + if ($QueryString =~ /(^|&|&)noloadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=1; } } +-#Removed for security reasons +-#if ($QueryString =~ /(^|&|&)loadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=-1; } } + if ($QueryString =~ /(^|&|&)limitflush=(\d+)/i) { $LIMITFLUSH=$2; } + # Get/Define output + if ($QueryString =~ /(^|&|&)output(=[^&]*|)(.*)(&|&)output(=[^&]*|)(&|$)/i) { error("Only 1 output option is allowed","","",1); } Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- awstats.spec 7 May 2006 23:40:34 -0000 1.13 +++ awstats.spec 9 May 2006 09:04:15 -0000 1.14 @@ -1,6 +1,6 @@ Name: awstats Version: 6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -176,6 +176,9 @@ %changelog +* Tue May 09 2006 Aurelien Bompard 6.5-5 +- really fix CVE-2006-1945... + * Mon May 08 2006 Aurelien Bompard 6.5-4 - add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923) From fedora-extras-commits at redhat.com Tue May 9 09:29:15 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:29:15 -0700 Subject: rpms/perl-Crypt-DSA/devel perl-Crypt-DSA.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605090929.k499THll030128@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Crypt-DSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30106 Modified Files: perl-Crypt-DSA.spec sources .cvsignore Log Message: Update to 0.14 Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DSA.spec 8 Feb 2006 14:23:06 -0000 1.1 +++ perl-Crypt-DSA.spec 9 May 2006 09:29:15 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA -Version: 0.13 +Version: 0.14 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -51,5 +51,8 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Tue May 9 2006 Paul Howarth 0.14-1 +- Update to 0.14 + * Mon Nov 28 2005 Paul Howarth 0.13-1 - Initial build Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2006 14:23:06 -0000 1.2 +++ sources 9 May 2006 09:29:15 -0000 1.3 @@ -1 +1 @@ -269261448ecc6b3b82a854e3b774c4ae Crypt-DSA-0.13.tar.gz +5ff5ab4be5501f5547bbe46cdc3de442 Crypt-DSA-0.14.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2006 14:23:06 -0000 1.2 +++ .cvsignore 9 May 2006 09:29:15 -0000 1.3 @@ -1 +1 @@ -Crypt-DSA-0.13.tar.gz +Crypt-DSA-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 9 09:30:51 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:30:51 -0700 Subject: rpms/perl-Crypt-DSA/FC-5 perl-Crypt-DSA.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605090930.k499UrES030212@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Crypt-DSA/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30190 Modified Files: perl-Crypt-DSA.spec sources .cvsignore Log Message: resync with devel Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-5/perl-Crypt-DSA.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DSA.spec 8 Feb 2006 14:23:06 -0000 1.1 +++ perl-Crypt-DSA.spec 9 May 2006 09:30:51 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA -Version: 0.13 +Version: 0.14 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -51,5 +51,8 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Tue May 9 2006 Paul Howarth 0.14-1 +- Update to 0.14 + * Mon Nov 28 2005 Paul Howarth 0.13-1 - Initial build Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2006 14:23:06 -0000 1.2 +++ sources 9 May 2006 09:30:51 -0000 1.3 @@ -1 +1 @@ -269261448ecc6b3b82a854e3b774c4ae Crypt-DSA-0.13.tar.gz +5ff5ab4be5501f5547bbe46cdc3de442 Crypt-DSA-0.14.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2006 14:23:06 -0000 1.2 +++ .cvsignore 9 May 2006 09:30:51 -0000 1.3 @@ -1 +1 @@ -Crypt-DSA-0.13.tar.gz +Crypt-DSA-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 9 09:32:12 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:32:12 -0700 Subject: rpms/perl-Crypt-DSA/FC-4 perl-Crypt-DSA.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605090932.k499WERq030285@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Crypt-DSA/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30264 Modified Files: perl-Crypt-DSA.spec sources .cvsignore Log Message: resync with devel Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-4/perl-Crypt-DSA.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DSA.spec 8 Feb 2006 14:23:06 -0000 1.1 +++ perl-Crypt-DSA.spec 9 May 2006 09:32:12 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA -Version: 0.13 +Version: 0.14 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -51,5 +51,8 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Tue May 9 2006 Paul Howarth 0.14-1 +- Update to 0.14 + * Mon Nov 28 2005 Paul Howarth 0.13-1 - Initial build Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2006 14:23:06 -0000 1.2 +++ sources 9 May 2006 09:32:12 -0000 1.3 @@ -1 +1 @@ -269261448ecc6b3b82a854e3b774c4ae Crypt-DSA-0.13.tar.gz +5ff5ab4be5501f5547bbe46cdc3de442 Crypt-DSA-0.14.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2006 14:23:06 -0000 1.2 +++ .cvsignore 9 May 2006 09:32:12 -0000 1.3 @@ -1 +1 @@ -Crypt-DSA-0.13.tar.gz +Crypt-DSA-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 9 09:42:19 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:42:19 -0700 Subject: rpms/gtkwave/devel gtkwave.spec, 1.10, 1.11 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 Message-ID: <200605090942.k499gLr9030430@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30409 Modified Files: gtkwave.spec sources .cvsignore Log Message: Update to 3.0.1 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkwave.spec 2 May 2006 10:34:49 -0000 1.10 +++ gtkwave.spec 9 May 2006 09:42:19 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 9 2006 Paul Howarth 3.0.1-1 +- update to 3.0.1 + * Tue May 2 2006 Paul Howarth 3.0.0-1 - update to 3.0.0 - add examples directory as %%doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 May 2006 10:34:49 -0000 1.10 +++ sources 9 May 2006 09:42:19 -0000 1.11 @@ -1 +1 @@ -1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz +4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2006 10:34:49 -0000 1.10 +++ .cvsignore 9 May 2006 09:42:19 -0000 1.11 @@ -1 +1 @@ -gtkwave-3.0.0.tgz +gtkwave-3.0.1.tgz From fedora-extras-commits at redhat.com Tue May 9 09:43:39 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:43:39 -0700 Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.10, 1.11 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 Message-ID: <200605090943.k499hf1Z030505@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkwave.spec 2 May 2006 10:58:19 -0000 1.10 +++ gtkwave.spec 9 May 2006 09:43:39 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 9 2006 Paul Howarth 3.0.1-1 +- update to 3.0.1 + * Tue May 2 2006 Paul Howarth 3.0.0-1 - update to 3.0.0 - add examples directory as %%doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 May 2006 10:58:19 -0000 1.10 +++ sources 9 May 2006 09:43:39 -0000 1.11 @@ -1 +1 @@ -1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz +4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2006 10:58:19 -0000 1.10 +++ .cvsignore 9 May 2006 09:43:39 -0000 1.11 @@ -1 +1 @@ -gtkwave-3.0.0.tgz +gtkwave-3.0.1.tgz From fedora-extras-commits at redhat.com Tue May 9 09:44:48 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:44:48 -0700 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.9, 1.10 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 Message-ID: <200605090944.k499ioUl030577@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30556 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkwave.spec 2 May 2006 10:55:18 -0000 1.9 +++ gtkwave.spec 9 May 2006 09:44:48 -0000 1.10 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 9 2006 Paul Howarth 3.0.1-1 +- update to 3.0.1 + * Tue May 2 2006 Paul Howarth 3.0.0-1 - update to 3.0.0 - add examples directory as %%doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 May 2006 10:55:18 -0000 1.10 +++ sources 9 May 2006 09:44:48 -0000 1.11 @@ -1 +1 @@ -1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz +4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2006 10:55:18 -0000 1.10 +++ .cvsignore 9 May 2006 09:44:48 -0000 1.11 @@ -1 +1 @@ -gtkwave-3.0.0.tgz +gtkwave-3.0.1.tgz From fedora-extras-commits at redhat.com Tue May 9 09:45:56 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:45:56 -0700 Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.8, 1.9 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200605090945.k499jwDA030650@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30629 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkwave.spec 7 Mar 2006 13:28:21 -0000 1.8 +++ gtkwave.spec 9 May 2006 09:45:56 -0000 1.9 @@ -1,30 +1,28 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.86 +Version: 3.0.1 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog simulation tools, as well as LXT files produced by certain Verilog simulation tools. -This package includes support for reading .ghw files as produced by ghdl. - %prep %setup -q -n gtkwave-%{version} # Honour %{optflags} and use system zlib/bzip2 library -%{__perl} -pi -e 's/^CFLAGS = -O2/CFLAGS = %{optflags}/;' \ +%{__perl} -pi -e 's/^C(FLAGS|OPT) ?= ?-O2/C\1 = %{optflags}/;' \ -e 's at -I\.\.?/libz -I\.\.?/libbz2@@;' \ - -e 's@(\.\./)?libz/libz\.a at -lz@;' \ - -e 's@(\.\./)?libbz2/libbz2\.a at -lbz2@;' \ + -e 's@(\.\./(\.\./src/)?)?libz/libz\.a at -lz@;' \ + -e 's@(\.\./(\.\./src/)?)?libbz2/libbz2\.a at -lbz2@;' \ -e 's@^([a-z0-9]+:.*) -lz( -lbz2)?@\1@;' \ - src/Makefile*.in src/*/Makefile*.in + src/Makefile*.in src/*/Makefile*.in contrib/*/Makefile*.in %{__rm} -rf src/lib{z,bz2} # Fix file permissions for sane debuginfo package @@ -35,13 +33,11 @@ # to view) and cannot be opened in a "no file" mode from a menu. %build -# This is not an autotools-generated config script, and does not accept --libdir etc. -echo 2 | ./configure +echo 2 | ./configure --libdir=%{_libdir} %{__make} %install %{__rm} -rf %{buildroot} -%{__install} -m 755 -d %{buildroot}%{_mandir}/man1 %{__make} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} \ @@ -53,17 +49,19 @@ %files %defattr(-,root,root,0755) -%doc doc/* *.TXT gtkwaverc.sample +%doc doc/* *.TXT gtkwaverc.sample examples/ %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd %{_bindir}/mvl2lxt %{_bindir}/mvl2vcd +%{_bindir}/rtlbrowse %{_bindir}/tex2vcd %{_bindir}/tla2vcd %{_bindir}/vcd2lxt %{_bindir}/vcd2lxt2 %{_bindir}/vcd2vzt +%{_bindir}/vertex %{_bindir}/vzt2vcd %{_bindir}/vztminer %{_mandir}/man1/gtkwave.1* @@ -71,15 +69,31 @@ %{_mandir}/man1/lxt2vcd.1* %{_mandir}/man1/mvl2lxt.1* %{_mandir}/man1/mvl2vcd.1* +%{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/tex2vcd.1* %{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/vcd2lxt.1* %{_mandir}/man1/vcd2lxt2.1* %{_mandir}/man1/vcd2vzt.1* +%{_mandir}/man1/vertex.1* %{_mandir}/man1/vzt2vcd.1* %{_mandir}/man1/vztminer.1* +%{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 9 2006 Paul Howarth 3.0.1-1 +- update to 3.0.1 + +* Tue May 2 2006 Paul Howarth 3.0.0-1 +- update to 3.0.0 +- add examples directory as %%doc +- add new buildreq gperf +- tweak Makefile.in edits to handle Makefiles under contrib/ +- add new binaries rtlbrowse and vertex +- add new manpages for rtlbrowse, vertex, and gtkwaverc +- %%{_mandir} no longer needs to be created manually +- configure script now accepts --libdir + * Tue Mar 7 2006 Paul Howarth 1.3.86-1 - update to 1.3.86 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 13:28:21 -0000 1.9 +++ sources 9 May 2006 09:45:56 -0000 1.10 @@ -1 +1 @@ -8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz +4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 13:28:21 -0000 1.9 +++ .cvsignore 9 May 2006 09:45:56 -0000 1.10 @@ -1 +1 @@ -gtkwave-1.3.86.tgz +gtkwave-3.0.1.tgz From fedora-extras-commits at redhat.com Tue May 9 09:50:16 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Tue, 9 May 2006 02:50:16 -0700 Subject: rpms/par2cmdline/devel par2cmdline-packed.patch, NONE, 1.1 par2cmdline.spec, 1.1, 1.2 Message-ID: <200605090950.k499oITM030756@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30735 Modified Files: par2cmdline.spec Added Files: par2cmdline-packed.patch Log Message: Added a new patch, to kill warnings, and try to fix ppc compilation error. par2cmdline-packed.patch: --- NEW FILE par2cmdline-packed.patch --- diff -ur par2cmdline-0.4-orig/letype.h par2cmdline-0.4/letype.h --- par2cmdline-0.4-orig/letype.h 2003-05-26 20:01:17.000000000 +0200 +++ par2cmdline-0.4/letype.h 2006-05-09 10:47:29.000000000 +0200 @@ -28,44 +28,15 @@ #else -class leu16 +struct leu16 { -public: - leu16(void); - - leu16(const leu16 &other); - leu16& operator=(const leu16 &other); - - leu16(const u16 &other); leu16& operator=(const u16 &other); operator u16(void) const; -protected: u16 value; }; -inline leu16::leu16(void) -{ -} - -inline leu16::leu16(const leu16 &other) -: value(other.value) -{ -} - -inline leu16& leu16::operator =(const leu16 &other) -{ - value = other.value; - return *this; -} - -inline leu16::leu16(const u16 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); -} - inline leu16& leu16::operator=(const u16 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); @@ -81,46 +52,15 @@ } -class leu32 +struct leu32 { -public: - leu32(void); - - leu32(const leu32 &other); - leu32& operator=(const leu32 &other); - - leu32(const u32 &other); leu32& operator=(const u32 &other); operator u32(void) const; -protected: u32 value; }; -inline leu32::leu32(void) -{ -} - -inline leu32::leu32(const leu32 &other) -: value(other.value) -{ -} - -inline leu32& leu32::operator =(const leu32 &other) -{ - value = other.value; - return *this; -} - -inline leu32::leu32(const u32 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); - ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); - ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); -} - inline leu32& leu32::operator=(const u32 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); @@ -140,50 +80,15 @@ } -class leu64 +struct leu64 { -public: - leu64(void); - - leu64(const leu64 &other); - leu64& operator=(const leu64 &other); - - leu64(const u64 &other); leu64& operator=(const u64 &other); operator u64(void) const; -protected: u64 value; }; -inline leu64::leu64(void) -{ -} - -inline leu64::leu64(const leu64 &other) -: value(other.value) -{ -} - -inline leu64& leu64::operator =(const leu64 &other) -{ - value = other.value; - return *this; -} - -inline leu64::leu64(const u64 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); - ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); - ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); - ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff); - ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff); - ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff); - ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff); -} - inline leu64& leu64::operator=(const u64 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); diff -ur par2cmdline-0.4-orig/md5.h par2cmdline-0.4/md5.h --- par2cmdline-0.4-orig/md5.h 2003-08-02 01:41:04.000000000 +0200 +++ par2cmdline-0.4/md5.h 2006-05-09 10:47:29.000000000 +0200 @@ -20,6 +20,13 @@ #ifndef __MD5_H__ #define __MD5_H__ +#ifdef WIN32 +#pragma pack(push, 1) +#define PACKED +#else +#define PACKED __attribute__ ((packed)) +#endif + // This file defines the MD5Hash and MD5Context objects which are used // to compute and manipulate the MD5 Hash values for a block of data. @@ -35,12 +42,11 @@ // MD5 Hash value -class MD5Hash -{ -public: - // Constructor does not initialise the value - MD5Hash(void) {}; +struct MD5Hash; +ostream& operator<<(ostream &s, const MD5Hash &hash); +struct MD5Hash +{ // Comparison operators bool operator==(const MD5Hash &other) const; bool operator!=(const MD5Hash &other) const; @@ -54,13 +60,8 @@ friend ostream& operator<<(ostream &s, const MD5Hash &hash); string print(void) const; - // Copy and assignment - MD5Hash(const MD5Hash &other); - MD5Hash& operator=(const MD5Hash &other); - -public: u8 hash[16]; // 16 byte MD5 Hash value -}; +} PACKED; // Intermediate computation state @@ -144,16 +145,9 @@ return !other.operator<(*this); } -inline MD5Hash::MD5Hash(const MD5Hash &other) -{ - memcpy(&hash, &other.hash, sizeof(hash)); -} - -inline MD5Hash& MD5Hash::operator=(const MD5Hash &other) -{ - memcpy(&hash, &other.hash, sizeof(hash)); - - return *this; -} +#ifdef WIN32 +#pragma pack(pop) +#endif +#undef PACKED #endif // __MD5_H__ Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/par2cmdline.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- par2cmdline.spec 9 May 2006 06:59:19 -0000 1.1 +++ par2cmdline.spec 9 May 2006 09:50:16 -0000 1.2 @@ -1,11 +1,12 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch +Patch1: par2cmdline-packed.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 @@ -21,6 +22,7 @@ %prep %setup %patch0 -p1 +%patch1 -p1 sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build @@ -44,6 +46,9 @@ %{_bindir}/* %changelog +* Tue May 9 2006 Laurent Rineau - 0.4-8 +- Added a new patch, to kill warnings, and try to fix ppc compilation error. + * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. - Add %check section From fedora-extras-commits at redhat.com Tue May 9 13:34:32 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Tue, 9 May 2006 06:34:32 -0700 Subject: rpms/liboil/FC-4 .cvsignore, 1.6, 1.7 liboil.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200605091334.k49DYYoA010546@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboil/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10525 Modified Files: .cvsignore liboil.spec sources Log Message: update to new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2006 09:45:55 -0000 1.6 +++ .cvsignore 9 May 2006 13:34:31 -0000 1.7 @@ -1 +1 @@ -liboil-0.3.7.tar.gz +liboil-0.3.8.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/liboil.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- liboil.spec 3 Feb 2006 09:45:55 -0000 1.11 +++ liboil.spec 9 May 2006 13:34:31 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.7 +Version: 0.3.8 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -64,6 +64,7 @@ %files %defattr(-, root, root, 0755) %doc ChangeLog +%{_bindir}/oil-bugreport %{_libdir}/*.so.* %files devel @@ -77,6 +78,10 @@ %changelog +* Mon May 08 2006 Thomas Vander Stichele +- 0.3.8-1 +- update to new upstream version + * Fri Feb 3 2006 Matthias Saou 0.3.7-1 - Update to 0.3.7. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2006 09:45:55 -0000 1.6 +++ sources 9 May 2006 13:34:31 -0000 1.7 @@ -1 +1 @@ -1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz +a402c4af2603c8fb69b365af0b8ec775 liboil-0.3.8.tar.gz From fedora-extras-commits at redhat.com Tue May 9 14:35:52 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Tue, 9 May 2006 07:35:52 -0700 Subject: rpms/adns/FC-5 adns.spec,1.7,1.8 Message-ID: <200605091435.k49EZseg013023@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/adns/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13006 Modified Files: adns.spec Log Message: More work done - added -fPIC, removed DESTDIR patch Index: adns.spec =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/adns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- adns.spec 8 May 2006 17:50:06 -0000 1.7 +++ adns.spec 9 May 2006 14:35:52 -0000 1.8 @@ -1,6 +1,6 @@ Name: adns Version: 1.2 -Release: 1 +Release: 2 Summary: Advanced, easy to use, asynchronous-capable DNS client library @@ -8,7 +8,6 @@ License: GPL URL: http://www.chiark.greenend.org.uk/~ian/adns/ Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz -Patch0: %{name}-DESTDIR.patch Patch1: %{name}-ac_fix.patch Patch2: %{name}-autoconf-noexpand.patch #BuildRequires: autoconf @@ -71,20 +70,23 @@ %prep %setup -q -%patch0 -p1 -b .destdir %patch1 -p1 -b .ac_fix %patch2 -p1 -b .noexpand %build #aclocal #%{__autoconf} +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" %configure --enable-dynamic make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -ln -sf libadns.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libadns.so +make install \ + prefix=$RPM_BUILD_ROOT/usr \ + bin_dir=$RPM_BUILD_ROOT%{_bindir} \ + include_dir=$RPM_BUILD_ROOT%{_includedir} \ + lib_dir=$RPM_BUILD_ROOT%{_libdir} %clean rm -fr $RPM_BUILD_ROOT @@ -108,6 +110,11 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Tue May 9 2006 Mihai Ibanescu 1.2-2 +- Dropped the DESTDIR patch since it was not accepted upstream. +- Added -fPIC in the compiled flags, otherwise we won't be able to link + against this library. + * Mon May 8 2006 Mihai Ibanescu 1.2-1 - Updated to 1.2, some of the patches were already upstream - Removed dependency on autoconf/automake since it builds just fine without From fedora-extras-commits at redhat.com Tue May 9 15:40:10 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 9 May 2006 08:40:10 -0700 Subject: rpms/plplot/FC-5 plplot-5.6.0-x.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 plplot.spec, 1.9, 1.10 sources, 1.5, 1.6 plplot-5.5.3-buffer.patch, 1.1, NONE plplot-5.5.3-check.patch, 1.1, NONE plplot-5.5.3-x.patch, 1.1, NONE Message-ID: <200605091540.k49FeC1r016455@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16431 Modified Files: .cvsignore plplot.spec sources Added Files: plplot-5.6.0-x.patch Removed Files: plplot-5.5.3-buffer.patch plplot-5.5.3-check.patch plplot-5.5.3-x.patch Log Message: - Update to 5.6.0 with new psttf driver - Add wxGTK support plplot-5.6.0-x.patch: --- NEW FILE plplot-5.6.0-x.patch --- --- plplot-5.6.0/configure.orig 2006-04-25 10:53:26.000000000 -0600 +++ plplot-5.6.0/configure 2006-04-25 10:58:30.000000000 -0600 @@ -30155,1411 +30155,10 @@ - - -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XtMalloc (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -fi - -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_nospace=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_space=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_space=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder at skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - - if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -int -main () -{ -connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != remove; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 - - if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -int -main () -{ -remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmat; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 - - if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -int -main () -{ -shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); -int -main () -{ -IceConnectionNumber (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - -if test "$have_x" != "yes"; then - enable_xwin="no" -fi - - - -if test "$enable_xwin" = yes; then - enable_xwin_TRUE= - enable_xwin_FALSE='#' -else - enable_xwin_TRUE='#' - enable_xwin_FALSE= -fi - +enable_xwin=yes +enable_xwin_TRUE= +enable_xwin_FALSE='#' +have_x=yes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Dec 2005 23:37:42 -0000 1.5 +++ .cvsignore 9 May 2006 15:40:10 -0000 1.6 @@ -1 +1 @@ -plplot-5.5.3.tar.gz +plplot-5.6.0.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plplot.spec 24 Feb 2006 22:04:56 -0000 1.9 +++ plplot.spec 9 May 2006 15:40:10 -0000 1.10 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.5.3 -Release: 12%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -11,11 +11,9 @@ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch -Patch2: plplot-5.5.3-buffer.patch Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch -Patch5: plplot-5.5.3-check.patch -Patch6: plplot-5.5.3-x.patch +Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel @@ -24,9 +22,10 @@ BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 BuildRequires: perl(XML::DOM) -#Temporary until bz #176313 is fixed -BuildRequires: libXau-devel, libXdmcp-devel -#BuildRequires: libunicode-devel +BuildRequires: lasi-devel +BuildRequires: wxGTK-devel +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description PLplot is a library of functions that are useful for making scientific @@ -127,14 +126,22 @@ %description tk-devel %{summary} + +%package wxGTK +Summary: Functions for scientific plotting with wxGTK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description wxGTK +%{summary} + + %prep %setup -q %patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig %patch3 -p1 -b .orig %patch4 -p1 -b .orig -%patch5 -p1 -b .orig %patch6 -p1 -b .orig @@ -142,7 +149,8 @@ %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ - --disable-wingcc --disable-aqt --disable-pdl + --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ + --with-prebuiltdoc make @@ -155,8 +163,6 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version} find $RPM_BUILD_ROOT -name \*.la | xargs rm -#Remove non-existant PDL dependency -rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl #Permissions find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x @@ -165,7 +171,14 @@ rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || : +fi %postun -p /sbin/ldconfig @@ -214,6 +227,8 @@ %{_libdir}/plplot%{version}/driversd/ps.so %{_libdir}/plplot%{version}/driversd/pstex.rc %{_libdir}/plplot%{version}/driversd/pstex.so +%{_libdir}/plplot%{version}/driversd/psttf.rc +%{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc @@ -229,6 +244,7 @@ %{python_sitelib}/plplotcanvas.py %{python_sitelib}/plplotcanvas.pyc %{python_sitelib}/plplotcanvas.pyo +%{_infodir}/plplotdoc.info* %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz %{_mandir}/man1/plrender.1.gz @@ -264,6 +280,7 @@ %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_mandir}/man3/pl*.3* %files gnome %defattr(-,root,root,-) @@ -315,7 +332,17 @@ %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ +%files wxGTK +%defattr(-,root,root,-) +%{_libdir}/plplot%{version}/driversd/wxwidgets.rc +%{_libdir}/plplot%{version}/driversd/wxwidgets.so + + %changelog +* Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 +- Update to 5.6.0 with new psttf driver +- Add wxGTK support + * Fri Feb 24 2006 - Orion Poplawski - 5.5.3-12 - Rebuild for FC5 gcc/glibc changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Dec 2005 23:37:42 -0000 1.5 +++ sources 9 May 2006 15:40:10 -0000 1.6 @@ -1 +1 @@ -6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz +0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz --- plplot-5.5.3-buffer.patch DELETED --- --- plplot-5.5.3-check.patch DELETED --- --- plplot-5.5.3-x.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 17:19:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 9 May 2006 10:19:22 -0700 Subject: rpms/perl-YAML/devel perl-YAML.spec, 1.8, 1.9 perl-YAML-testmore054.patch, 1.1, NONE Message-ID: <200605091719.k49HJOQG021440@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21419 Modified Files: perl-YAML.spec Removed Files: perl-YAML-testmore054.patch Log Message: Drop testmore patch. Catch Test::YAML module and man page in file list. Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-YAML.spec 4 May 2006 16:32:39 -0000 1.8 +++ perl-YAML.spec 9 May 2006 17:19:22 -0000 1.9 @@ -1,12 +1,11 @@ Name: perl-YAML Version: 0.58 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML Ain't Markup Language (tm) License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz -Patch0: %{name}-testmore054.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Test::Base) >= 0.49 @@ -23,7 +22,6 @@ %prep %setup -q -n YAML-%{version} -%patch0 -p0 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -50,10 +48,16 @@ %doc Changes README %{_bindir}/ysh %{perl_vendorlib}/YAML* +%{perl_vendorlib}/Test/YAML* %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* +%{_mandir}/man3/Test::YAML*.3* %changelog +* Tue May 09 2006 Steven Pritchard 0.58-2 +- Drop testmore patch. +- Catch Test::YAML module and man page in file list. + * Thu May 04 2006 Steven Pritchard 0.58-1 - Update to 0.58. - Small spec cleanups. --- perl-YAML-testmore054.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 17:48:55 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 9 May 2006 10:48:55 -0700 Subject: owners owners.list,1.966,1.967 Message-ID: <200605091748.k49HmvD8022831@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22814 Modified Files: owners.list Log Message: Maintainer change: scop -> jpo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.966 retrieving revision 1.967 diff -u -r1.966 -r1.967 --- owners.list 9 May 2006 07:05:30 -0000 1.966 +++ owners.list 9 May 2006 17:48:55 -0000 1.967 @@ -1052,7 +1052,7 @@ Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IPC-Cmd|Finding and running system commands made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 9 17:57:10 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 9 May 2006 10:57:10 -0700 Subject: rpms/plplot/FC-4 plplot-5.5.3-octave.patch, NONE, 1.1 plplot-5.5.3-x86_64.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 plplot.spec, 1.3, 1.4 sources, 1.4, 1.5 plplot-5.5.3-buffer.patch, 1.1, NONE Message-ID: <200605091757.k49HvC7e022906@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22879 Modified Files: .cvsignore plplot.spec sources Added Files: plplot-5.5.3-octave.patch plplot-5.5.3-x86_64.patch Removed Files: plplot-5.5.3-buffer.patch Log Message: - Update to 5.6.0 with new psttf driver - Add wxGTK support plplot-5.5.3-octave.patch: --- NEW FILE plplot-5.5.3-octave.patch --- --- plplot-5.5.3/bindings/octave/PLplot/figure.m.orig 2005-08-10 11:56:53.000000000 -0600 +++ plplot-5.5.3/bindings/octave/PLplot/figure.m 2005-08-10 12:00:39.000000000 -0600 @@ -49,9 +49,10 @@ if (!exist("__pl") || !struct_contains (__pl,"inited")) v = split(version ,'.'); - if (! (str2num(v(1,:)) >= 2 && - str2num(v(2,:)) >= 1 && - str2num(v(3,:)) >= 57)) + if (! ((str2num(v(1,:)) > 2) || + (str2num(v(1,:)) == 2 && str2num(v(2,:)) > 1) || + (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 1 && + str2num(v(3,:)) >= 57))) error("The PLplot-Octave scripts need an Octave version \n\ greater then or equal to 2.1.57.\n"); endif plplot-5.5.3-x86_64.patch: --- NEW FILE plplot-5.5.3-x86_64.patch --- --- plplot-5.5.3/cf/tcl.ac.orig 2005-08-10 11:46:11.000000000 -0600 +++ plplot-5.5.3/cf/tcl.ac 2005-08-10 11:46:47.000000000 -0600 @@ -78,6 +78,7 @@ $HOME/local/lib \ $HOME/lib \ /usr/local/lib \ +/usr/lib64 \ /usr/lib" incdirs=$incdirs_default Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Aug 2005 21:36:20 -0000 1.4 +++ .cvsignore 9 May 2006 17:57:10 -0000 1.5 @@ -1,4 +1 @@ -plplot-5.5.3.tar.gz -plplot-5.5.3-x86_64.patch -plplot-5.5.3-octave.patch -plplot-5.5.3-check.patch +plplot-5.6.0.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plplot.spec 11 Aug 2005 21:36:20 -0000 1.3 +++ plplot.spec 9 May 2006 17:57:10 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.5.3 -Release: 7%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -11,13 +11,10 @@ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch -Patch2: plplot-5.5.3-buffer.patch Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch -Patch5: plplot-5.5.3-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel %ifarch %{ix86} x86_64 BuildRequires: java-devel, libgcj-devel @@ -29,7 +26,10 @@ BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 BuildRequires: perl(XML::DOM) -#BuildRequires: libunicode-devel +BuildRequires: lasi-devel +BuildRequires: wxGTK-devel +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description PLplot is a library of functions that are useful for making scientific @@ -62,7 +62,7 @@ Requires: %{name} = %{version}-%{release} %description devel -%{summary} +%{summary}. %package gnome @@ -71,7 +71,7 @@ Requires: %{name} = %{version}-%{release} %description gnome -%{summary} +%{summary}. %package gnome-devel Summary: Development files for using PLplot GNOME @@ -81,7 +81,7 @@ Requires: %{name}-gnome = %{version}-%{release} %description gnome-devel -%{summary} +%{summary}. %ifarch %{ix86} x86_64 @@ -91,7 +91,7 @@ Requires: %{name} = %{version}-%{release} %description java -%{summary} +%{summary}. %package java-devel Summary: Development files for using PLplot GNOME @@ -101,7 +101,7 @@ Requires: %{name}-java = %{version}-%{release} %description java-devel -%{summary} +%{summary}. %endif @@ -111,7 +111,7 @@ Requires: %{name} = %{version}-%{release}, octave %description octave -%{summary} +%{summary}. %package tk @@ -120,7 +120,7 @@ Requires: %{name} = %{version}-%{release} %description tk -%{summary} +%{summary}. %package tk-devel Summary: Development files for using PLplot with Tk @@ -130,24 +130,32 @@ Requires: %{name}-tk = %{version}-%{release} %description tk-devel -%{summary} +%{summary}. + + +%package wxGTK +Summary: Functions for scientific plotting with wxGTK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description wxGTK +%{summary}. + %prep %setup -q %patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig %patch3 -p1 -b .orig %patch4 -p1 -b .orig -%patch5 -p1 -b .orig %build -autoconf %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ - --disable-wingcc --disable-aqt --disable-pdl %{java_config} + --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ + --with-prebuiltdoc %{java_config} make @@ -160,8 +168,6 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version} find $RPM_BUILD_ROOT -name \*.la | xargs rm -#Remove non-existant PDL dependency -rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl #Permissions find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x @@ -170,7 +176,14 @@ rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || : +fi %postun -p /sbin/ldconfig @@ -219,6 +232,8 @@ %{_libdir}/plplot%{version}/driversd/ps.so %{_libdir}/plplot%{version}/driversd/pstex.rc %{_libdir}/plplot%{version}/driversd/pstex.so +%{_libdir}/plplot%{version}/driversd/psttf.rc +%{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc @@ -228,6 +243,7 @@ %{python_sitelib}/plplot_widgetmodule.so %{python_sitelib}/plplotc.py %{python_sitelib}/plplotcanvas.py +%{_infodir}/plplotdoc.info* %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz %{_mandir}/man1/plrender.1.gz @@ -263,6 +279,7 @@ %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_mandir}/man3/pl*.3* %files gnome %defattr(-,root,root,-) @@ -316,7 +333,17 @@ %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ +%files wxGTK +%defattr(-,root,root,-) +%{_libdir}/plplot%{version}/driversd/wxwidgets.rc +%{_libdir}/plplot%{version}/driversd/wxwidgets.so + + %changelog +* Tue May 9 2006 - Orion Poplawski - 5.6.0-1 +- Update to 5.6.0 with new psttf driver +- Add wxGTK support + * Thu Aug 11 2005 - Orion Poplawski - 5.5.3-7 - Breakout java into its own sub-package, don't build on non x86 - Add patch to use new octave in devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Aug 2005 21:36:20 -0000 1.4 +++ sources 9 May 2006 17:57:10 -0000 1.5 @@ -1,4 +1 @@ -6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz -02cc9f8eb72211581aae2bd38670252f plplot-5.5.3-x86_64.patch -7970faa7d90fe1e98e19354fd607a309 plplot-5.5.3-octave.patch -22f2761b863bf1f47fb37b7d7fb9ab85 plplot-5.5.3-check.patch +0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz --- plplot-5.5.3-buffer.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 18:03:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 9 May 2006 11:03:42 -0700 Subject: rpms/perl-IO-Tty/devel .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200605091803.k49I3iEm025235@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25217 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: - Update to 1.03. - Taking maintainership. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:38 -0000 1.2 +++ .cvsignore 9 May 2006 18:03:42 -0000 1.3 @@ -1 +1 @@ -IO-Tty-1.02.tar.gz +IO-Tty-1.03.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-IO-Tty.spec 14 Feb 2006 20:37:17 -0000 1.9 +++ perl-IO-Tty.spec 9 May 2006 18:03:42 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-IO-Tty -Version: 1.02 -Release: 5%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Perl interface to pseudo tty's License: GPL or Artistic @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IO::Tty and IO::Pty provide an interface to pseudo tty's. @@ -46,10 +47,14 @@ %doc ChangeLog README %{perl_vendorarch}/auto/IO/ %{perl_vendorarch}/IO/ -%{_mandir}/man3/IO::*ty*.3* +%{_mandir}/man3/IO::*ty*.3pm* %changelog +* Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. +- Taking maintainership. + * Tue Feb 14 2006 Ville Skytt?? - 1.02-5 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:38 -0000 1.2 +++ sources 9 May 2006 18:03:42 -0000 1.3 @@ -1 +1 @@ -875a8bc6e0643f4fc892dbe113e43286 IO-Tty-1.02.tar.gz +785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz From fedora-extras-commits at redhat.com Tue May 9 18:10:38 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 9 May 2006 11:10:38 -0700 Subject: rpms/apt/devel apt.spec,1.26,1.27 default.conf,1.8,1.9 Message-ID: <200605091810.k49IAeGe025673@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25654 Modified Files: apt.spec default.conf Log Message: Prepare for splitting off config files (no tag/build yet!). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- apt.spec 25 Apr 2006 18:47:24 -0000 1.26 +++ apt.spec 9 May 2006 18:10:38 -0000 1.27 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Base URL: http://apt-rpm.laiskiainen.org/ License: GPL @@ -32,20 +32,10 @@ Source50: preserve-conf.lua Source51: upgradevirt.lua -# 100-149 for sources.list.d -Source100: fedora-core.list -Source101: fedora-extras.list -Source102: fedora-updates.list - # 150-199 for apt.conf.d -# "factory defaults" for Fedora Core + Extras +# "factory defaults" Source150: default.conf -# 200-249 for additional trusted gpg keys - -# 250-299 for vendor.list.d -Source250: fedora-vendor.list - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # TODO: verify the required minimum Python version @@ -75,6 +65,7 @@ %if 0%{!?_with_groupinstall:1} Obsoletes: %{name}-groupinstall < %{version}-%{release} %endif +Requires: apt-config %description APT-RPM is a port of Debian's apt tools for RPM based distributions. @@ -175,15 +166,8 @@ install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ -# Default source list entries -for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do - install -pm 644 $source $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d/ -done - # install config parts install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ -install -pm 644 %{SOURCE250} \ - $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list # GPG keys mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ @@ -250,12 +234,12 @@ %config(noreplace) %{_sysconfdir}/apt/rpmpriorities %config(noreplace) %{_sysconfdir}/apt/sources.list %config(noreplace) %{_sysconfdir}/apt/vendors.list -# NOTE: no noreplace on *.d because we WANT to be able to change the defaults -# without user intervention! %dir %{_sysconfdir}/apt/apt.conf.d/ -%config %{_sysconfdir}/apt/apt.conf.d/default.conf -%config %{_sysconfdir}/apt/sources.list.d/ -%config %{_sysconfdir}/apt/vendors.list.d/ +# NOTE: no noreplace because we WANT to be able to change the defaults +# without user intervention! +%config %{_sysconfdir}/apt/apt.conf.d/defaults.conf +%dir %{_sysconfdir}/apt/sources.list.d/ +%dir %{_sysconfdir}/apt/vendors.list.d/ %config(noreplace) %{_sysconfdir}/sysconfig/apt %config %{_sysconfdir}/cron.daily/apt.cron @@ -308,7 +292,10 @@ %changelog -* Tue Apr 25 2006 Axel Thimm +* Mon May 8 2006 Axel Thimm - 0.5.15lorg3-2 +- Split off configuration files from apt. + +* Tue Apr 25 2006 Axel Thimm - 0.5.15lorg3-1 - Update to 0.5.15lorg3 final. - Fix URL. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- default.conf 23 Mar 2006 06:33:58 -0000 1.8 +++ default.conf 9 May 2006 18:10:38 -0000 1.9 @@ -17,7 +17,6 @@ { AllNames "false"; } - DistroVerPkg "fedora-release"; }; RPM @@ -55,7 +54,7 @@ // Options for the downloading routines Acquire { - http::User-Agent "Fedora APT-HTTP/1.3"; + http::User-Agent "APT-HTTP/1.3"; }; Scripts From fedora-extras-commits at redhat.com Tue May 9 18:39:25 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 9 May 2006 11:39:25 -0700 Subject: rpms/perl-IO-Tty/FC-5 .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200605091839.k49IdRHS026126@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26102 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: - Update to 1.03. - Taking maintainership. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:38 -0000 1.2 +++ .cvsignore 9 May 2006 18:39:25 -0000 1.3 @@ -1 +1 @@ -IO-Tty-1.02.tar.gz +IO-Tty-1.03.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/perl-IO-Tty.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-IO-Tty.spec 14 Feb 2006 20:37:17 -0000 1.9 +++ perl-IO-Tty.spec 9 May 2006 18:39:25 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-IO-Tty -Version: 1.02 -Release: 5%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Perl interface to pseudo tty's License: GPL or Artistic @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IO::Tty and IO::Pty provide an interface to pseudo tty's. @@ -46,10 +47,14 @@ %doc ChangeLog README %{perl_vendorarch}/auto/IO/ %{perl_vendorarch}/IO/ -%{_mandir}/man3/IO::*ty*.3* +%{_mandir}/man3/IO::*ty*.3pm* %changelog +* Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. +- Taking maintainership. + * Tue Feb 14 2006 Ville Skytt?? - 1.02-5 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:38 -0000 1.2 +++ sources 9 May 2006 18:39:25 -0000 1.3 @@ -1 +1 @@ -875a8bc6e0643f4fc892dbe113e43286 IO-Tty-1.02.tar.gz +785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz From fedora-extras-commits at redhat.com Tue May 9 18:42:32 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 9 May 2006 11:42:32 -0700 Subject: rpms/perl-IO-Tty/FC-4 .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200605091842.k49IgYV5026228@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26207 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: Sync with FC-5 and devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:38 -0000 1.2 +++ .cvsignore 9 May 2006 18:42:31 -0000 1.3 @@ -1 +1 @@ -IO-Tty-1.02.tar.gz +IO-Tty-1.03.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/perl-IO-Tty.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-IO-Tty.spec 6 Apr 2005 22:12:45 -0000 1.7 +++ perl-IO-Tty.spec 9 May 2006 18:42:31 -0000 1.8 @@ -1,18 +1,16 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-IO-Tty -Version: 1.02 -Release: 3 - +Version: 1.03 +Release: 1%{?dist} Summary: Perl interface to pseudo tty's License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Tty/ -Source0: http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-1.02.tar.gz +Source0: http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IO::Tty and IO::Pty provide an interface to pseudo tty's. @@ -23,22 +21,20 @@ %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -49,13 +45,23 @@ %files %defattr(-,root,root,-) %doc ChangeLog README -%{perl_vendorarch}/auto/IO -%{perl_vendorarch}/IO -%{_mandir}/man3/*.3* +%{perl_vendorarch}/auto/IO/ +%{perl_vendorarch}/IO/ +%{_mandir}/man3/IO::*ty*.3pm* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. +- Taking maintainership. + +* Tue Feb 14 2006 Ville Skytt?? - 1.02-5 +- Rebuild. + +* Tue Jan 17 2006 Ville Skytt?? - 1.02-4 +- Rebuild, cosmetic cleanups. + +* Fri Apr 7 2005 Michael Schwendt - 1.02-3 - rebuilt * Sun Feb 1 2004 Ville Skytt?? - 0:1.02-0.fdr.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:38 -0000 1.2 +++ sources 9 May 2006 18:42:31 -0000 1.3 @@ -1 +1 @@ -875a8bc6e0643f4fc892dbe113e43286 IO-Tty-1.02.tar.gz +785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz From fedora-extras-commits at redhat.com Tue May 9 18:51:01 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Tue, 9 May 2006 11:51:01 -0700 Subject: fedora-security/audit fc4,1.236,1.237 fc5,1.149,1.150 Message-ID: <200605091851.k49Ip1dE026687@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26559/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-2271 and CVE-2006-2272 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- fc4 8 May 2006 19:02:36 -0000 1.236 +++ fc4 9 May 2006 18:50:58 -0000 1.237 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-2272 VULNERABLE (kernel) +CVE-2006-2271 VULNERABLE (kernel) CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- fc5 8 May 2006 19:02:36 -0000 1.149 +++ fc5 9 May 2006 18:50:58 -0000 1.150 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-2272 VULNERABLE (kernel) +CVE-2006-2271 VULNERABLE (kernel) CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] From fedora-extras-commits at redhat.com Tue May 9 19:10:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 9 May 2006 12:10:58 -0700 Subject: extras-buildsys/builder Builder.py,1.5,1.6 Message-ID: <200605091910.k49JAwFU029486@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29423/builder Modified Files: Builder.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - Handle the JobFiles request * common/Commands.py - Check arguments on PlgCommandJobFiles * server/ArchJob.py - pylint cleanups - Rework result files download code; archjob now requests result files from the builder, which knows how to handle builder-type specific result files operations - get_upload_dir() renamed to get_result_files_dir() * server/Builder.py - pylint cleanups - Move dispatching of common commands into the base Builder class - (_decompose_job_files_ack): new function; extract and return info from a JobFilesAck command - (_handle_job_files_ack): new function; handle a JobFilesAck in the builder-type specific manner. For Active builders, we don't have to do much since the file was uploaded to us by the builder itself * server/BuilderManager.py - (any_prepping_builders): fix usage of builder.alive() -> builder.available() * server/PackageJob.py - Small cleanup of result files bits 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 9 May 2006 06:04:48 -0000 1.5 +++ Builder.py 9 May 2006 19:10:51 -0000 1.6 @@ -447,6 +447,20 @@ uploader.start() return uploader + def _handle_job_files_request(self, cmd): + """Return a list of urls of the result files of this job.""" + archjob_id = cmd.archjob_id() + try: + job = self._all_jobs[archjob_id] + except KeyError: + return None + + # url-ify the file list + urls = [] + for fpath in job.files(): + urls.append("file:///%s" % os.path.basename(fpath)) + return Commands.PlgCommandJobFilesAck(archjob_id, urls, cmd.seq(), self._seq_gen.next()) + def _get_default_commands(self): """Return a python list of serialized commands that the builder sends to the server every time it contacts the server.""" @@ -505,6 +519,10 @@ reply = self._handle_job_status_request(cmd) if reply: self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandJobFiles): + reply = self._handle_job_files_request(cmd) + if reply: + self._queued_cmds.append(reply) def _process_server_response(self, response): """Process the server's response command stream.""" From fedora-extras-commits at redhat.com Tue May 9 19:10:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 9 May 2006 12:10:59 -0700 Subject: extras-buildsys/common Commands.py,1.5,1.6 Message-ID: <200605091911.k49JAxob029492@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29423/common Modified Files: Commands.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - Handle the JobFiles request * common/Commands.py - Check arguments on PlgCommandJobFiles * server/ArchJob.py - pylint cleanups - Rework result files download code; archjob now requests result files from the builder, which knows how to handle builder-type specific result files operations - get_upload_dir() renamed to get_result_files_dir() * server/Builder.py - pylint cleanups - Move dispatching of common commands into the base Builder class - (_decompose_job_files_ack): new function; extract and return info from a JobFilesAck command - (_handle_job_files_ack): new function; handle a JobFilesAck in the builder-type specific manner. For Active builders, we don't have to do much since the file was uploaded to us by the builder itself * server/BuilderManager.py - (any_prepping_builders): fix usage of builder.alive() -> builder.available() * server/PackageJob.py - Small cleanup of result files bits Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Commands.py 9 May 2006 02:53:03 -0000 1.5 +++ Commands.py 9 May 2006 19:10:56 -0000 1.6 @@ -567,6 +567,8 @@ """The files argument is a python list of output files from the job""" PlgCommandAck.__init__(self, CMD_NAME_JOB_FILES_ACK, req_seq, seq) self._archjob_id = archjob_id + if type(files) is not type([]): + raise ValueError("files argument must be a list of URLs.") self._files = files def _deserialize(args): From fedora-extras-commits at redhat.com Tue May 9 19:10:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 9 May 2006 12:10:59 -0700 Subject: extras-buildsys/server ArchJob.py, 1.30, 1.31 Builder.py, 1.39, 1.40 BuilderManager.py, 1.23, 1.24 PackageJob.py, 1.47, 1.48 Message-ID: <200605091910.k49JAxRn029497@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29423/server Modified Files: ArchJob.py Builder.py BuilderManager.py PackageJob.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - Handle the JobFiles request * common/Commands.py - Check arguments on PlgCommandJobFiles * server/ArchJob.py - pylint cleanups - Rework result files download code; archjob now requests result files from the builder, which knows how to handle builder-type specific result files operations - get_upload_dir() renamed to get_result_files_dir() * server/Builder.py - pylint cleanups - Move dispatching of common commands into the base Builder class - (_decompose_job_files_ack): new function; extract and return info from a JobFilesAck command - (_handle_job_files_ack): new function; handle a JobFilesAck in the builder-type specific manner. For Active builders, we don't have to do much since the file was uploaded to us by the builder itself * server/BuilderManager.py - (any_prepping_builders): fix usage of builder.alive() -> builder.available() * server/PackageJob.py - Small cleanup of result files bits Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ArchJob.py 9 May 2006 06:04:54 -0000 1.30 +++ ArchJob.py 9 May 2006 19:10:57 -0000 1.31 @@ -15,25 +15,13 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import time -import string -import xmlrpclib -import sys import socket import os import threading import urllib import OpenSSL -from plague import FileDownloader -from plague import CommonErrors +from plague import FileTransfer -DL_RETRIES = 'retries' -DL_STATUS = 'status' -DL_WAIT_TIME = 'wait_time' - -STATUS_WAITING = 'waiting' -STATUS_ERROR = 'error' -STATUS_INPROGRESS = 'in-progress' -STATUS_DONE = 'done' class ArchJob: """ Tracks a single build instance for a single arch on a builder """ @@ -50,8 +38,7 @@ self._internal_failure = False self._target_dict = target_dict self._builder_gone = False - self._download_lock = threading.Lock() - self._downloads = {} + self._result_files = {} self._starttime = time.time() self._endtime = 0 self._die = False @@ -66,12 +53,12 @@ self._failure_noticed = True def _builder_finished(self): - if self._builder_status == 'done' or self._builder_status == 'killed' or self._builder_status == 'failed' or self._builder_status == 'orphaned': + if self._builder_status in ['done', 'killed', 'failed', 'orphaned']: return True return False def builder_failed(self): - if self._builder_status == 'killed' or self._builder_status == 'failed': + if self._builder_status in ['killed', 'failed']: return True return False @@ -129,23 +116,6 @@ self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) del attrdict - def _dl_files(self): - files = [] - success = False - try: - files = self._server.files(self.jobid) - success = True - except socket.error, e: - if not CommonErrors.canIgnoreSocketError(e): - print "%s (%s/%s): [ %s ] Unknown error getting file list: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self._builder.address(), e) - except socket.timeout, e: - print "%s (%s/%s): [ %s ] Timeout getting file list: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self._builder.address(), e) - except xmlrpclib.ProtocolError, e: - pass - return (success, files) - def _is_done_status(self): if self._status == 'done': return True @@ -178,111 +148,50 @@ if self._builder_status != 'prepping': self._prepping = False - # if the builder is done, grab list of files to download if self._builder_finished(): - (success, files) = self._dl_files() - if success: - self._set_status('downloading') - for f in files: - uf = urllib.unquote(f) - dl_dict = {} - dl_dict[DL_STATUS] = STATUS_WAITING - dl_dict[DL_RETRIES] = 0 - dl_dict[DL_WAIT_TIME] = 0 - self._downloads[uf] = dl_dict - - def dl_callback(self, status, cb_data, err_msg): - url = cb_data - self._download_lock.acquire() - dl_dict = self._downloads[url] - if status == 'done': - dl_dict[DL_STATUS] = STATUS_DONE - elif status == 'failed': - # Retry the download up to 10 times, then fail it - if dl_dict[DL_RETRIES] >= 10: - dl_dict[DL_STATUS] = STATUS_ERROR - else: - print "%s (%s/%s): Failed to retrieve %s (attempt %d) (Error %s), trying again..." % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES], err_msg) - dl_dict[DL_STATUS] = STATUS_WAITING - dl_dict[DL_WAIT_TIME] = 5 # Wait a bit before trying again - dl_dict[DL_RETRIES] = dl_dict[DL_RETRIES] + 1 - self._download_lock.release() + self._set_status('downloading') + self._builder.request_job_files(self.jobid) - def _print_downloaded_files(self): + def get_result_files_dir(self): + result_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) + if not os.path.exists(result_dir): + os.makedirs(result_dir) + return result_dir + + def _print_downloaded_files(self, files): file_string = "" - ndownloads = len(self._downloads.keys()) - for url in self._downloads.keys(): - filename = os.path.basename(url) - string = "'" + filename + "'" - dl_dict = self._downloads[url] - if dl_dict[DL_STATUS] == STATUS_ERROR: + nresults = len(files.keys()) + for fname in files.keys(): + string = "'" + fname + "'" + if files[fname] == FileTransfer.FT_RESULT_FAILED: string = string + " (failed)" file_string = file_string + string - if url != self._downloads.keys()[ndownloads - 1]: + if fname != files.keys()[nresults - 1]: file_string = file_string + ", " print "%s (%s/%s): Build result files - [ %s ]" % (self.par_job.uid, self.par_job.package, self._target_dict['arch'], file_string) - def get_upload_dir(self): - upload_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) - if not os.path.exists(upload_dir): - os.makedirs(upload_dir) - return upload_dir + def download_cb(self, files): + """Called by the Builder to notify us that our job's files are available. + The files argument should be a list of _filenames_, not paths. All files + are assumed to be in the directory returned by get_result_files_dir.""" + if len(files.keys()) == 0: + self._download_failed = True + else: + for fname in files.keys(): + if files[fname] == FileTransfer.FT_RESULT_FAILED: + self._download_failed = True + self._result_files = files + self._print_downloaded_files(self._result_files) + + self._endtime = time.time() + self._set_status('done') + self.par_job.wake() def _status_downloading(self): - # Start grabbing the next undownloaded file, but only - # if we aren't already pulling one down - undownloaded = False - failed = False - self._download_lock.acquire() - for url in self._downloads.keys(): - dl_dict = self._downloads[url] - dl_status = dl_dict[DL_STATUS] - if dl_status == STATUS_WAITING: - # If the download got retried due to a previous - # download error, we may have to wait a bit - if dl_dict[DL_WAIT_TIME] > 0: - dl_dict[DL_WAIT_TIME] = dl_dict[DL_WAIT_TIME] - 1 - undownloaded = True - continue - - # Otherwise, spawn the download thread to grab the file - target_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) - if not os.path.exists(target_dir): - os.makedirs(target_dir) - - try: - dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url, - target_dir, ['.rpm', '.log'], self._certs) - dl_thread.start() - undownloaded = True - dl_dict[DL_STATUS] = STATUS_INPROGRESS - except FileDownloader.FileNameException, e: - print "%s (%s/%s): [ %s ] Bad file name error getting %s: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self._builder.address(), url, e) - # Hard error, we don't retry this one - dl_dict[DL_STATUS] = STATUS_ERROR - break - elif dl_status == STATUS_INPROGRESS: - undownloaded = True - break - elif dl_status == STATUS_ERROR: - failed = True - continue - elif dl_status == STATUS_DONE: - continue - self._download_lock.release() - - # All done downloading? - if not undownloaded: - self._print_downloaded_files() - self._endtime = time.time() - if failed: - self._download_failed = True - self._set_status('done') - self.par_job.wake() + # Wait to be notified that our files are downloaded + pass def process(self): if self._is_done_status(): @@ -323,20 +232,11 @@ return self._status def get_files(self): - """ Return a list of base filenames we got from the builder """ + """Return a list result files that we got from the builder""" files = [] - for url in self._downloads.keys(): - try: - fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) - dl_dict = self._downloads[url] - dl_status = dl_dict[DL_STATUS] - if dl_status == STATUS_DONE: - files.append(fname) - except FileDownloader.FileNameException, e: - # Just ignore the file then - print "%s (%s/%s): Illegal file name. Error: '%s', URL: %s" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], e, url) - pass + for fname in self._result_files.keys(): + if self._result_files[fname] == FileTransfer.FT_RESULT_SUCCESS: + files.append(fname) return files def builder_gone(self): Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- Builder.py 9 May 2006 06:09:53 -0000 1.39 +++ Builder.py 9 May 2006 19:10:57 -0000 1.40 @@ -17,18 +17,17 @@ import time import string import xmlrpclib -import sys import socket import os import urllib import threading from plague import Commands from plague import XMLRPCServerProxy -from plague import CommonErrors +from plague import FileDownloader +from plague import FileTransfer import OpenSSL import ArchJob import EmailUtils -import Config from plague import DebugUtils SUSPEND_NONE = 'none' @@ -214,7 +213,6 @@ # and its not done, explicitly get its status job = self._jobs[jobid] if jobid not in reported_uniqids and job.get_status() != 'done': - print "Requesting job status for %s" % jobid new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) # Check for prepping jobs @@ -252,6 +250,9 @@ parent.add_arch_job(archjob) def _handle_job_status_ack(self, ack): + """Handle a job status ack by setting telling the job object + what the builder said its status was.""" + old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandJobStatus) if old_cmd: archjob_id = ack.archjob_id() @@ -259,6 +260,51 @@ job = self._jobs[archjob_id] job.set_builder_job_status(status) + def _decompose_job_files_ack(self, ack): + """Handle a job files ack by finding the archjob it's for, then + notifying that archjob that its files are available.""" + old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandJobFiles) + if old_cmd: + archjob_id = ack.archjob_id() + files = ack.files() + job = self._jobs[archjob_id] + return (job, files) + return (None, None) + + def _dispatch_common_command(self, cmd): + """Handle commands that are common to all builder types.""" + handled = True + if isinstance(cmd, Commands.PlgCommandSlots): + self._lock.acquire() + self._free_slots = cmd.free_slots() + self._num_slots = cmd.max_slots() + self._lock.release() + elif isinstance(cmd, Commands.PlgCommandTargets): + self._lock.acquire() + self._target_list = cmd.targets() + self._lock.release() + elif isinstance(cmd, Commands.PlgCommandNewJobAck): + self._handle_new_job_ack(cmd) + elif isinstance(cmd, Commands.PlgCommandBuildingJobs): + status_reqs = self._handle_building_jobs(cmd) + # Add any additional status requests onto our pending command queue + if len(status_reqs) > 0: + self._lock.acquire() + self._cmd_queue = self._cmd_queue + status_reqs + self._lock.release() + elif isinstance(cmd, Commands.PlgCommandJobStatusAck): + self._handle_job_status_ack(cmd) + else: + handled = False + return handled + + def request_job_files(self, archjob_id): + """Construct and send a request for a job's files.""" + cmd = Commands.PlgCommandJobFiles(archjob_id, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt @@ -543,38 +589,49 @@ self._cmd_queue.append(cmd) self._lock.release() - def request_job_files(self, archjob): - pass + def _handle_job_files_ack(self, cmd): + (archjob, urls) = self._decompose_job_files_ack(cmd) + if not archjob: + return + + if not urls or not len(urls): + archjob.download_cb({}) + return + + # Basic sanity checks; whether the files exist, etc + result_files_dir = archjob.get_result_files_dir() + files = {} + for url in urls: + try: + fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) + except FileDownloader.FileNameException, exc: + print "Error in JobFilesAck for %s: %s" % (url, exc) + continue + fpath = os.path.join(result_files_dir, fname) + if os.path.exists(fpath): + files[fname] = FileTransfer.FT_RESULT_SUCCESS + else: + files[fname] = FileTransfer.FT_RESULT_FAILED + archjob.download_cb(files) def _dispatch_command(self, cmd): - name = cmd.name() - if isinstance(cmd, Commands.PlgCommandSlots): - self._lock.acquire() - self._free_slots = cmd.free_slots() - self._num_slots = cmd.max_slots() - self._lock.release() - elif isinstance(cmd, Commands.PlgCommandTargets): - self._lock.acquire() - self._target_list = cmd.targets() - self._lock.release() - elif isinstance(cmd, Commands.PlgCommandNewJobAck): - self._handle_new_job_ack(cmd) - elif isinstance(cmd, Commands.PlgCommandBuildingJobs): - status_reqs = self._handle_building_jobs(cmd) - # Add any additional status requests onto our pending command queue - if len(status_reqs) > 0: - self._lock.acquire() - self._cmd_queue = self._cmd_queue + status_reqs - self._lock.release() - elif isinstance(cmd, Commands.PlgCommandJobStatusAck): - self._handle_job_status_ack(cmd) - else: + """Dispatch one command. We let the superclass dispatch the common + commands, and handle only those that need action specific to the + Active builder type.""" + handled = self._dispatch_common_command(cmd) + if not handled: + if isinstance(cmd, Commands.PlgCommandJobFilesAck): + self._handle_job_files_ack(cmd) + handled = True + + if not handled: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) def request(self, cmd_list): """Process and respond to an active builder's request. Called from the BuildMaster's XML-RPC server.""" + # Reset unavailability counters and reactivate builder if needed self._last_contact = time.time() self._unavail_count = 0 if not self._available: @@ -594,15 +651,19 @@ new_cmds.append(cmd) self._lock.acquire() + # Copy command queue self._cmd_queue = self._cmd_queue + new_cmds cmd_list = self._cmd_queue[:] - # Remove commands that don't require an ack + + # Remove commands that don't require an ack, + # since we don't need to keep track of those tmp_cmd_queue = [] for cmd in self._cmd_queue: if cmd.need_ack(): tmp_cmd_queue.append(cmd) self._cmd_queue = tmp_cmd_queue + self._lock.release() return cmd_list Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- BuilderManager.py 9 May 2006 06:04:54 -0000 1.23 +++ BuilderManager.py 9 May 2006 19:10:57 -0000 1.24 @@ -216,7 +216,7 @@ if jobid and filename and tmpfile: archjob = builder.get_archjob(jobid) if archjob: - upload_dir = archjob.get_upload_dir() + upload_dir = archjob.get_result_files_dir() import shutil, urllib destpath = os.path.join(upload_dir, urllib.unquote(filename)) dest = file(destpath, "w+b") @@ -369,7 +369,7 @@ def any_prepping_builders(self): # query each build builder for any jobs that are in the 'prepping' state for builder in self._builders: - if builder.alive() and builder.any_prepping_jobs(): + if builder.available() and builder.any_prepping_jobs(): return True return False Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- PackageJob.py 9 May 2006 02:52:58 -0000 1.47 +++ PackageJob.py 9 May 2006 19:10:57 -0000 1.48 @@ -849,10 +849,11 @@ for job in self.archjobs.values(): if not job: continue + job_result_dir = job.get_result_files_dir() for f in job.get_files(): if not f.endswith(".rpm"): continue - src_file = os.path.join(self._result_dir, job.arch(), f) + src_file = os.path.join(job_result_dir, f) if src_file.endswith(".src.rpm"): # Keep an SRPM. We prefer built SRPMs from builders over # the original SRPM. @@ -874,16 +875,16 @@ for job in self.archjobs.values(): if not job: continue + job_result_dir = job.get_result_files_dir() for f in job.get_files(): if not f.endswith(".rpm"): continue - jobarch = job.arch() - src_file = os.path.join(self._result_dir, jobarch, f) + src_file = os.path.join(job_result_dir, f) verrel = "%s-%s" % (self.ver, self.release) if f.endswith(".src.rpm"): dst_path = os.path.join(repo_dir, self._target_str, self.name, verrel, "SRPM") else: - dst_path = os.path.join(repo_dir, self._target_str, self.name, verrel, jobarch) + dst_path = os.path.join(repo_dir, self._target_str, self.name, verrel, job.arch()) self.repofiles[src_file] = os.path.join(dst_path, f) self._event.clear() From fedora-extras-commits at redhat.com Tue May 9 19:10:53 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 9 May 2006 12:10:53 -0700 Subject: extras-buildsys ChangeLog,1.191,1.192 Message-ID: <200605091911.k49JBNIx029504@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29423 Modified Files: ChangeLog Log Message: 2006-05-09 Dan Williams * builder/Builder.py - Handle the JobFiles request * common/Commands.py - Check arguments on PlgCommandJobFiles * server/ArchJob.py - pylint cleanups - Rework result files download code; archjob now requests result files from the builder, which knows how to handle builder-type specific result files operations - get_upload_dir() renamed to get_result_files_dir() * server/Builder.py - pylint cleanups - Move dispatching of common commands into the base Builder class - (_decompose_job_files_ack): new function; extract and return info from a JobFilesAck command - (_handle_job_files_ack): new function; handle a JobFilesAck in the builder-type specific manner. For Active builders, we don't have to do much since the file was uploaded to us by the builder itself * server/BuilderManager.py - (any_prepping_builders): fix usage of builder.alive() -> builder.available() * server/PackageJob.py - Small cleanup of result files bits Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- ChangeLog 9 May 2006 06:04:47 -0000 1.191 +++ ChangeLog 9 May 2006 19:10:50 -0000 1.192 @@ -1,6 +1,36 @@ 2006-05-09 Dan Williams * builder/Builder.py + - Handle the JobFiles request + + * common/Commands.py + - Check arguments on PlgCommandJobFiles + + * server/ArchJob.py + - pylint cleanups + - Rework result files download code; archjob now requests result files + from the builder, which knows how to handle builder-type specific + result files operations + - get_upload_dir() renamed to get_result_files_dir() + + * server/Builder.py + - pylint cleanups + - Move dispatching of common commands into the base Builder class + - (_decompose_job_files_ack): new function; extract and return info + from a JobFilesAck command + - (_handle_job_files_ack): new function; handle a JobFilesAck in the + builder-type specific manner. For Active builders, we don't have + to do much since the file was uploaded to us by the builder itself + + * server/BuilderManager.py + - (any_prepping_builders): fix usage of builder.alive() -> builder.available() + + * server/PackageJob.py + - Small cleanup of result files bits + +2006-05-09 Dan Williams + + * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for From fedora-extras-commits at redhat.com Tue May 9 19:16:54 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 12:16:54 -0700 Subject: rpms/gcompris/devel gcompris-7.4-xf86vidmode.patch, 1.1, 1.2 gcompris.spec, 1.6, 1.7 Message-ID: <200605091916.k49JGuWe029587@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29565 Modified Files: gcompris-7.4-xf86vidmode.patch gcompris.spec Log Message: * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcompris-7.4-xf86vidmode.patch 6 May 2006 22:42:38 -0000 1.1 +++ gcompris-7.4-xf86vidmode.patch 9 May 2006 19:16:54 -0000 1.2 @@ -1,5 +1,5 @@ --- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-09 19:51:54.000000000 +0200 @@ -1094,7 +1094,7 @@ --disable-sdltest Do not try to compile and run a test SDL program --disable-glibtest do not try to compile and run a test GLIB program @@ -201,7 +201,7 @@ echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" --- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-09 19:51:54.000000000 +0200 @@ -141,5 +141,5 @@ /* Version number of package */ #undef VERSION @@ -210,8 +210,8 @@ -#undef XRANDR +/* XF86VidMode Available */ +#undef XF86_VIDMODE ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-09 19:51:54.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } @@ -223,8 +223,301 @@ Py_INCREF(Py_True); return Py_True; } else { +--- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-09 12:35:04.000000000 +0200 +@@ -2008,7 +2008,7 @@ + case 1: + fleur = gdk_cursor_new(get_resize_cursor(anchor)); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2031,7 +2031,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + } +@@ -2179,7 +2179,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2296,7 +2296,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + +--- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-09 12:35:04.000000000 +0200 +@@ -472,7 +472,7 @@ + gnome_canvas_item_raise_to_top(data->item); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(data->item, ++ gcompris_canvas_item_grab(data->item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -513,7 +513,7 @@ + disc_h = gdk_pixbuf_get_height(pixmap)/2; + gdk_pixbuf_unref(pixmap); + +- gnome_canvas_item_ungrab(data->item, event->button.time); ++ gcompris_canvas_item_ungrab(data->item, event->button.time); + dragging = FALSE; + + /* Search the column (x) where this item is ungrabbed */ +--- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -663,7 +663,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -710,7 +710,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-09 12:35:04.000000000 +0200 +@@ -645,7 +645,7 @@ + gnome_canvas_item_raise_to_top(data->item_text); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(data->item, ++ gcompris_canvas_item_grab(data->item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -679,7 +679,7 @@ + PieceItem *piece_dst; + gint col, line; + +- gnome_canvas_item_ungrab(data->item, event->button.time); ++ gcompris_canvas_item_ungrab(data->item, event->button.time); + dragging = FALSE; + + /* Search the column (x) where this item is ungrabbed */ +--- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-09 12:35:04.000000000 +0200 +@@ -839,7 +839,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + gnome_canvas_item_raise_to_top(item); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -909,7 +909,7 @@ + gnome_canvas_item_move(item, ofset_x, ofset_y); + } + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + + position_display(position); +--- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -1103,7 +1103,7 @@ + gnome_canvas_item_raise_to_top(shape_list_root_item); + gnome_canvas_item_raise_to_top(item); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -1143,7 +1143,7 @@ + { + Shape *targetshape = NULL; + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + + targetshape = find_closest_shape(item_x - offset_x, +@@ -1304,7 +1304,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -1341,7 +1341,7 @@ + if(dragging) + { + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + gnome_canvas_item_raise_to_top(item); + dragging = FALSE; + +--- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -578,7 +578,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -608,7 +608,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-09 12:35:04.000000000 +0200 +@@ -522,7 +522,7 @@ + gnome_canvas_item_raise_to_top(item); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -577,7 +577,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -598,7 +598,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -683,7 +683,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-09 12:35:04.000000000 +0200 +@@ -417,7 +417,7 @@ + cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + else + cursor=gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, + cursor, + event->button.time); +@@ -495,7 +495,7 @@ + dx=CLAMP(item_x-start_x,-39,39); + + if (thiscar->goal && big_x==250+OFSET_X) { +- gnome_canvas_item_ungrab(item,event->button.time); ++ gcompris_canvas_item_ungrab(item,event->button.time); + gnome_canvas_item_hide(item); + moving=FALSE; + +@@ -573,7 +573,7 @@ + dy=*ptr-y; + + gnome_canvas_item_move(item,dx,dy); +- gnome_canvas_item_ungrab(item,event->button.time); ++ gcompris_canvas_item_ungrab(item,event->button.time); + hit=0; + moving=FALSE; + } +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-09 19:51:55.000000000 +0200 +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen): ++ gtk.gdk.pointer_ungrab() + + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) + + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -221,6 +226,9 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-09 19:51:54.000000000 +0200 +@@ -159,6 +159,12 @@ + + void gcompris_confirm_stop (void); + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" --- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-07 00:29:58.000000000 +0200 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-09 20:51:10.000000000 +0200 @@ -33,12 +33,13 @@ #include "cursor.h" @@ -330,13 +623,16 @@ } #endif -@@ -811,39 +802,18 @@ +@@ -811,39 +802,11 @@ */ void gcompris_set_fullscreen(gboolean state) { - -- if(state) -- { ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { -#ifdef XRANDR - gint i; - /* Search the 800x600 Resolution */ @@ -366,22 +662,11 @@ - xrandr_set_config( xrandr ); - } - } -+ properties->fullscreen = state; -+ /* We need to grab the pointer before doing the vidmode switch otherwise the -+ setviewport may be "canceled" by the pointer being outside the viewport */ -+ if(properties->fullscreen) -+ gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME); -+ -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(properties->fullscreen); - #endif -+ if(properties->fullscreen) -+ { +-#endif gdk_window_set_decorations (window->window, 0); gdk_window_set_functions (window->window, 0); gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +821,7 @@ +@@ -851,20 +814,6 @@ } else { @@ -399,11 +684,53 @@ - } - xr_previous_size_set = FALSE; -#endif -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); /* The hide must be done at least for KDE */ gtk_widget_hide (window); gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -1044,68 +1001,136 @@ +@@ -876,6 +825,42 @@ + + } + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1029,129 @@ g_printerr ("%s: %s\n\n", "gcompris", message); } @@ -510,57 +837,49 @@ + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode)) + { -+ g_warning("XF86VidMode couldnot get current mode, not switching resolution"); -+ properties->fullscreen = FALSE; -+ return; ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; + } + + /* Do we need to switch? */ -+ if ((mode.hdisplay == BOARDWIDTH) && -+ (mode.vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) + { -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ return; -+ } ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; + -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ { -+ g_warning("XF86VidMode couldnot get modes not switching resolution"); -+ properties->fullscreen = FALSE; -+ return; -+ } -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ for (i = 0; i < mode_count; i++) + { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) + { -+ g_warning("XF86VidMode couldnot switch resolution"); -+ properties->fullscreen = FALSE; ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; + } -+ break; + } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); + } -+ if (i == mode_count) -+ { -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ properties->fullscreen = FALSE; -+ } -+ XFree(modes); ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) ++ g_warning("XF86VidMode couldnot change viewport"); + } + else + { @@ -579,6 +898,7 @@ + g_warning("XF86VidMode couldnot restore original resolution"); + + } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, @@ -588,7 +908,7 @@ } #endif -@@ -1185,9 +1210,9 @@ +@@ -1185,9 +1231,9 @@ properties->fullscreen = TRUE; } @@ -600,8 +920,8 @@ } if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-09 19:51:54.000000000 +0200 @@ -160,7 +160,7 @@ tmp->fx = 1; tmp->screensize = 1; @@ -622,8 +942,8 @@ g_warning("Config file parsing error on token %s", token); } else if(!strcmp(value.v_identifier, "timer")) { if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-09 19:51:54.000000000 +0200 @@ -28,7 +28,7 @@ gint music; gint fx; @@ -634,7 +954,7 @@ gint defaultcursor; gint timer; --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-09 19:51:54.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gcompris.spec 7 May 2006 06:37:37 -0000 1.6 +++ gcompris.spec 9 May 2006 19:16:54 -0000 1.7 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -479,6 +479,9 @@ %changelog +* Tue May 9 2006 Hans de Goede 7.4-9 +- Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. + * Sun May 7 2006 Hans de Goede 7.4-8 - Change Xrandr BR to Xxf86vm BR. From fedora-extras-commits at redhat.com Tue May 9 19:18:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 12:18:43 -0700 Subject: rpms/gcompris/FC-5 gcompris-7.4-xf86vidmode.patch, 1.1, 1.2 gcompris.spec, 1.5, 1.6 Message-ID: <200605091918.k49JIjYa029683@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29661 Modified Files: gcompris-7.4-xf86vidmode.patch gcompris.spec Log Message: * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcompris-7.4-xf86vidmode.patch 7 May 2006 06:29:43 -0000 1.1 +++ gcompris-7.4-xf86vidmode.patch 9 May 2006 19:18:43 -0000 1.2 @@ -1,5 +1,5 @@ --- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-09 19:51:54.000000000 +0200 @@ -1094,7 +1094,7 @@ --disable-sdltest Do not try to compile and run a test SDL program --disable-glibtest do not try to compile and run a test GLIB program @@ -201,7 +201,7 @@ echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" --- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-09 19:51:54.000000000 +0200 @@ -141,5 +141,5 @@ /* Version number of package */ #undef VERSION @@ -210,8 +210,8 @@ -#undef XRANDR +/* XF86VidMode Available */ +#undef XF86_VIDMODE ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-09 19:51:54.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } @@ -223,8 +223,301 @@ Py_INCREF(Py_True); return Py_True; } else { +--- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-09 12:35:04.000000000 +0200 +@@ -2008,7 +2008,7 @@ + case 1: + fleur = gdk_cursor_new(get_resize_cursor(anchor)); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2031,7 +2031,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + } +@@ -2179,7 +2179,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2296,7 +2296,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + +--- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-09 12:35:04.000000000 +0200 +@@ -472,7 +472,7 @@ + gnome_canvas_item_raise_to_top(data->item); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(data->item, ++ gcompris_canvas_item_grab(data->item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -513,7 +513,7 @@ + disc_h = gdk_pixbuf_get_height(pixmap)/2; + gdk_pixbuf_unref(pixmap); + +- gnome_canvas_item_ungrab(data->item, event->button.time); ++ gcompris_canvas_item_ungrab(data->item, event->button.time); + dragging = FALSE; + + /* Search the column (x) where this item is ungrabbed */ +--- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -663,7 +663,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -710,7 +710,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-09 12:35:04.000000000 +0200 +@@ -645,7 +645,7 @@ + gnome_canvas_item_raise_to_top(data->item_text); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(data->item, ++ gcompris_canvas_item_grab(data->item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -679,7 +679,7 @@ + PieceItem *piece_dst; + gint col, line; + +- gnome_canvas_item_ungrab(data->item, event->button.time); ++ gcompris_canvas_item_ungrab(data->item, event->button.time); + dragging = FALSE; + + /* Search the column (x) where this item is ungrabbed */ +--- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-09 12:35:04.000000000 +0200 +@@ -839,7 +839,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + gnome_canvas_item_raise_to_top(item); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -909,7 +909,7 @@ + gnome_canvas_item_move(item, ofset_x, ofset_y); + } + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + + position_display(position); +--- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -1103,7 +1103,7 @@ + gnome_canvas_item_raise_to_top(shape_list_root_item); + gnome_canvas_item_raise_to_top(item); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -1143,7 +1143,7 @@ + { + Shape *targetshape = NULL; + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + + targetshape = find_closest_shape(item_x - offset_x, +@@ -1304,7 +1304,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -1341,7 +1341,7 @@ + if(dragging) + { + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + gnome_canvas_item_raise_to_top(item); + dragging = FALSE; + +--- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -578,7 +578,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -608,7 +608,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-09 12:35:04.000000000 +0200 +@@ -522,7 +522,7 @@ + gnome_canvas_item_raise_to_top(item); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -577,7 +577,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -598,7 +598,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -683,7 +683,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-09 12:35:04.000000000 +0200 +@@ -417,7 +417,7 @@ + cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + else + cursor=gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, + cursor, + event->button.time); +@@ -495,7 +495,7 @@ + dx=CLAMP(item_x-start_x,-39,39); + + if (thiscar->goal && big_x==250+OFSET_X) { +- gnome_canvas_item_ungrab(item,event->button.time); ++ gcompris_canvas_item_ungrab(item,event->button.time); + gnome_canvas_item_hide(item); + moving=FALSE; + +@@ -573,7 +573,7 @@ + dy=*ptr-y; + + gnome_canvas_item_move(item,dx,dy); +- gnome_canvas_item_ungrab(item,event->button.time); ++ gcompris_canvas_item_ungrab(item,event->button.time); + hit=0; + moving=FALSE; + } +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-09 19:51:55.000000000 +0200 +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen): ++ gtk.gdk.pointer_ungrab() + + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) + + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -221,6 +226,9 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-09 19:51:54.000000000 +0200 +@@ -159,6 +159,12 @@ + + void gcompris_confirm_stop (void); + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" --- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-07 00:29:58.000000000 +0200 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-09 20:51:10.000000000 +0200 @@ -33,12 +33,13 @@ #include "cursor.h" @@ -330,13 +623,16 @@ } #endif -@@ -811,39 +802,18 @@ +@@ -811,39 +802,11 @@ */ void gcompris_set_fullscreen(gboolean state) { - -- if(state) -- { ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { -#ifdef XRANDR - gint i; - /* Search the 800x600 Resolution */ @@ -366,22 +662,11 @@ - xrandr_set_config( xrandr ); - } - } -+ properties->fullscreen = state; -+ /* We need to grab the pointer before doing the vidmode switch otherwise the -+ setviewport may be "canceled" by the pointer being outside the viewport */ -+ if(properties->fullscreen) -+ gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME); -+ -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(properties->fullscreen); - #endif -+ if(properties->fullscreen) -+ { +-#endif gdk_window_set_decorations (window->window, 0); gdk_window_set_functions (window->window, 0); gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +821,7 @@ +@@ -851,20 +814,6 @@ } else { @@ -399,11 +684,53 @@ - } - xr_previous_size_set = FALSE; -#endif -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); /* The hide must be done at least for KDE */ gtk_widget_hide (window); gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -1044,68 +1001,136 @@ +@@ -876,6 +825,42 @@ + + } + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1029,129 @@ g_printerr ("%s: %s\n\n", "gcompris", message); } @@ -510,57 +837,49 @@ + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode)) + { -+ g_warning("XF86VidMode couldnot get current mode, not switching resolution"); -+ properties->fullscreen = FALSE; -+ return; ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; + } + + /* Do we need to switch? */ -+ if ((mode.hdisplay == BOARDWIDTH) && -+ (mode.vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) + { -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ return; -+ } ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; + -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ { -+ g_warning("XF86VidMode couldnot get modes not switching resolution"); -+ properties->fullscreen = FALSE; -+ return; -+ } -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ for (i = 0; i < mode_count; i++) + { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) + { -+ g_warning("XF86VidMode couldnot switch resolution"); -+ properties->fullscreen = FALSE; ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; + } -+ break; + } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); + } -+ if (i == mode_count) -+ { -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ properties->fullscreen = FALSE; -+ } -+ XFree(modes); ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) ++ g_warning("XF86VidMode couldnot change viewport"); + } + else + { @@ -579,6 +898,7 @@ + g_warning("XF86VidMode couldnot restore original resolution"); + + } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, @@ -588,7 +908,7 @@ } #endif -@@ -1185,9 +1210,9 @@ +@@ -1185,9 +1231,9 @@ properties->fullscreen = TRUE; } @@ -600,8 +920,8 @@ } if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-09 19:51:54.000000000 +0200 @@ -160,7 +160,7 @@ tmp->fx = 1; tmp->screensize = 1; @@ -622,8 +942,8 @@ g_warning("Config file parsing error on token %s", token); } else if(!strcmp(value.v_identifier, "timer")) { if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-09 19:51:54.000000000 +0200 @@ -28,7 +28,7 @@ gint music; gint fx; @@ -634,7 +954,7 @@ gint defaultcursor; gint timer; --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-09 19:51:54.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gcompris.spec 7 May 2006 06:39:15 -0000 1.5 +++ gcompris.spec 9 May 2006 19:18:43 -0000 1.6 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -479,6 +479,9 @@ %changelog +* Tue May 9 2006 Hans de Goede 7.4-9 +- Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. + * Sun May 7 2006 Hans de Goede 7.4-8 - Change Xrandr BR to Xxf86vm BR. From fedora-extras-commits at redhat.com Tue May 9 19:19:16 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 9 May 2006 12:19:16 -0700 Subject: rpms/pessulus import.log,1.2,1.3 Message-ID: <200605091919.k49JJIEx029778@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29747 Modified Files: import.log Log Message: auto-import pessulus-0.10.1-1 on branch devel from pessulus-0.10.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pessulus/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 May 2006 21:10:11 -0000 1.2 +++ import.log 9 May 2006 19:19:16 -0000 1.3 @@ -1 +1,2 @@ pessulus-0_10_1-1_fc6:HEAD:pessulus-0.10.1-1.fc6.src.rpm:1147122603 +pessulus-0_10_1-1:HEAD:pessulus-0.10.1-1.src.rpm:1147202351 From fedora-extras-commits at redhat.com Tue May 9 19:19:17 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 9 May 2006 12:19:17 -0700 Subject: rpms/pessulus/devel pessulus.spec,1.1,1.2 Message-ID: <200605091919.k49JJJLm029782@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29747/devel Modified Files: pessulus.spec Log Message: auto-import pessulus-0.10.1-1 on branch devel from pessulus-0.10.1-1.src.rpm Index: pessulus.spec =================================================================== RCS file: /cvs/extras/rpms/pessulus/devel/pessulus.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pessulus.spec 8 May 2006 21:10:12 -0000 1.1 +++ pessulus.spec 9 May 2006 19:19:16 -0000 1.2 @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, pygtk2-devel, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2 +BuildRequires: gtk2-devel, pygtk2-devel >= 2.6.0, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2 BuildRequires: gettext Requires: pygtk2, gnome-python2, gnome-python2-gconf From fedora-extras-commits at redhat.com Tue May 9 19:26:20 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:26:20 -0700 Subject: rpms/gauche-gl/devel - New directory Message-ID: <200605091926.k49JQMSn030835@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786/gauche-gl/devel Log Message: Directory /cvs/extras/rpms/gauche-gl/devel added to the repository From fedora-extras-commits at redhat.com Tue May 9 19:26:19 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:26:19 -0700 Subject: rpms/gauche-gl - New directory Message-ID: <200605091926.k49JQLut030828@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786/gauche-gl Log Message: Directory /cvs/extras/rpms/gauche-gl added to the repository From fedora-extras-commits at redhat.com Tue May 9 19:26:35 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:26:35 -0700 Subject: rpms/gauche-gl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605091926.k49JQbYB030968@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30921 Added Files: Makefile import.log Log Message: Setup of module gauche-gl --- NEW FILE Makefile --- # Top level Makefile for module gauche-gl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 9 19:26:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:26:36 -0700 Subject: rpms/gauche-gl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605091926.k49JQclA030979@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30921/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gauche-gl --- NEW 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 May 9 19:27:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:27:29 -0700 Subject: rpms/gauche-gl import.log,1.1,1.2 Message-ID: <200605091927.k49JRV0w031354@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31306 Modified Files: import.log Log Message: auto-import gauche-gl-0.4.1-4.fc5 on branch devel from gauche-gl-0.4.1-4.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 May 2006 19:26:35 -0000 1.1 +++ import.log 9 May 2006 19:27:29 -0000 1.2 @@ -0,0 +1 @@ +gauche-gl-0_4_1-4_fc5:HEAD:gauche-gl-0.4.1-4.fc5.src.rpm:1147202841 From fedora-extras-commits at redhat.com Tue May 9 19:27:30 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:27:30 -0700 Subject: rpms/gauche-gl/devel Gauche-gl-fix.patch, NONE, 1.1 gauche-gl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605091927.k49JRWbP031366@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31306/devel Modified Files: .cvsignore sources Added Files: Gauche-gl-fix.patch gauche-gl.spec Log Message: auto-import gauche-gl-0.4.1-4.fc5 on branch devel from gauche-gl-0.4.1-4.fc5.src.rpm Gauche-gl-fix.patch: --- NEW FILE Gauche-gl-fix.patch --- --- Gauche-gl-0.4/src/gauche-gl.c.fix 2005-07-01 23:58:51.000000000 +0200 +++ Gauche-gl-0.4/src/gauche-gl.c 2005-07-01 23:59:01.000000000 +0200 @@ -136,11 +136,7 @@ supports GLX for the time being. */ void *Scm_GLGetProcAddress(const char *name) { -#if defined(GLX_VERSION_1_4) - if (glXGetProcAddress != NULL) { - return glXGetProcAddress(name); - } -#elif defined(GLX_ARB_get_proc_address) +#if defined(GLX_ARB_get_proc_address) if (glXGetProcAddressARB != NULL) { return glXGetProcAddressARB(name); } --- NEW FILE gauche-gl.spec --- %define gauche_version 0.8.7 Name: gauche-gl Version: 0.4.1 Release: 4%{?dist} Summary: OpenGL binding for Gauche Group: Development/Languages License: BSD URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-gl-0.4.1.tgz Patch0: Gauche-gl-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gauche-devel = %{gauche_version} BuildRequires: freeglut-devel BuildRequires: libSM-devel BuildRequires: libXext-devel BuildRequires: libXi-devel BuildRequires: libXmu-devel BuildRequires: texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description OpenGL binding for Gauche. %prep %setup -q -n Gauche-gl-%{version} %patch0 -p1 (cd src; mv gauche-gl.c.orig gauche-gl.c) %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # no japanese info docs rm -f $RPM_BUILD_ROOT%{_infodir}/gauche-gl-refj.* # make .so files executable find $RPM_BUILD_ROOT -name '*.so' -exec chmod 0755 '{}' ';' # include file not necessary rm -rf $RPM_BUILD_ROOT%{_libdir}/gauche/%{gauche_version}/include # correct end-of-line-encoding sed -i 's/\r//' examples/slbook/ogl2particle/* examples/slbook/ogl2brick/* # these are not necessary rm -f examples/glbook/run rm -f examples/slbook/ogl2particle/run.sh %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/%{name}-refe.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}-refe.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) %{_libdir}/gauche %{_datadir}/gauche %{_infodir}/gauche-gl-refe.* %doc COPYING examples %changelog * Fri May 5 2006 Gerard Milmeister - 0.4.1-4 - cleaned up Requires - removed unnecessary files * Sun Nov 6 2005 Gerard Milmeister - 0.4.1-1 - New Version 0.4.1 * Fri Jul 1 2005 Gerard Milmeister - 0.4-1 - New Version 0.4 * Wed Feb 23 2005 Gerard Milmeister - 0:0.3.1-1 - New Version 0.3.1 * Mon Nov 10 2003 Gerard Milmeister - 0:0.3-0.fdr.1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 May 2006 19:26:36 -0000 1.1 +++ .cvsignore 9 May 2006 19:27:29 -0000 1.2 @@ -0,0 +1 @@ +Gauche-gl-0.4.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 May 2006 19:26:36 -0000 1.1 +++ sources 9 May 2006 19:27:29 -0000 1.2 @@ -0,0 +1 @@ +a51b19a0f16f88ed6cd85c6e49cc6e75 Gauche-gl-0.4.1.tgz From fedora-extras-commits at redhat.com Tue May 9 19:28:49 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Tue, 9 May 2006 12:28:49 -0700 Subject: extras-buildsys/utils extras-push-all,1.4,1.5 Message-ID: <200605091928.k49JSnuH031958@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31883 Modified Files: extras-push-all Log Message: add umask to sanity tests. Index: extras-push-all =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extras-push-all 8 May 2006 14:21:38 -0000 1.4 +++ extras-push-all 9 May 2006 19:28:47 -0000 1.5 @@ -27,6 +27,10 @@ echo "ERROR: ~/.rpmmacros must be pointing at /srv/extras-push/.rpmmacros." exit 1 fi +if [ "`umask`" != "0002" ]; then + echo "ERROR: umask must be 0002." + exit 1 +fi # Sign & Push [ "$1" = "-f" ] && force=yes || force= From fedora-extras-commits at redhat.com Tue May 9 19:44:48 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 12:44:48 -0700 Subject: rpms/njam/devel njam-1.25-leveledit.patch, NONE, 1.1 njam.spec, 1.1, 1.2 Message-ID: <200605091944.k49Jiosp004049@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/njam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4020 Modified Files: njam.spec Added Files: njam-1.25-leveledit.patch Log Message: * Tue May 9 2006 Hans de Goede 1.25-3 - Add Patch2, which fixes the leveleditor to save custom made levels under $HOME/.njam-levels instead of trying to write them under /usr/share. Also teach njam to look for levels under both $HOME/.njam-levels and /usr/share (bug 188078). njam-1.25-leveledit.patch: --- NEW FILE njam-1.25-leveledit.patch --- --- njam-1.25-src/src/njamutils.h.leveledit 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njamutils.h 2006-05-09 19:40:37.000000000 +0200 @@ -25,6 +25,10 @@ void NjamSetRect(SDL_Rect& rect, int x, int y, int w=0, int h=0); SDLKey NjamGetch(bool Wait); int NjamRandom(int MaxValue); +#ifdef __linux__ +char *NjamGetHomeDir(); +int NjamCheckAndCreateDir(const char *name); +#endif typedef enum { fxBlackWhite, fxDarken } tEffect; bool SurfaceEffect(SDL_Surface *surface, SDL_Rect& r, tEffect Effect = fxBlackWhite); --- njam-1.25-src/src/njam.cpp.leveledit 2006-05-09 19:40:37.000000000 +0200 +++ njam-1.25-src/src/njam.cpp 2006-05-09 19:40:37.000000000 +0200 @@ -350,6 +350,12 @@ bool NjamEngine::Init(bool Fullscreen, bool SoftwareSurface, bool UseDGA) { #ifdef __linux__ + // Check if $HOME/.njam-levels exists and if it doesn't create it + char buf[512]; + char *home = NjamGetHomeDir(); + snprintf(buf, sizeof(buf), "%s/.njam-levels", home? home:""); + NjamCheckAndCreateDir(buf); + sprintf(linux_sdl_driver, "x11\0"); char *driver_name = getenv("SDL_VIDEODRIVER"); if (driver_name) @@ -624,7 +630,9 @@ // Load user settings from .conf file LogFile("Opening njam.conf file.\n"); +#ifndef __linux__ char *home = getenv("HOME"); +#endif std::string njamconf("njam.conf"); if (home) njamconf = std::string(home) + "/.njamconf"; --- njam-1.25-src/src/njam.h.leveledit 2006-05-09 21:06:37.000000000 +0200 +++ njam-1.25-src/src/njam.h 2006-05-09 21:07:42.000000000 +0200 @@ -98,6 +98,7 @@ struct list_item { char item_text[50]; + char item_path[512]; struct list_item *next; struct list_item *prev; }; @@ -192,7 +193,7 @@ void LevelEditor(); // level editor (njamedit.cpp) void RenderEditor(bool, int, int, int); bool EnterFileName(char *file_name); - int SelectMap(char type, char *filename = NULL); + int SelectMap(char type, char *filename = NULL, int filename_size = 0); struct list_item *SelectFromList(struct list_item *first); void Message(char *text); bool Query(char *text); --- njam-1.25-src/src/njamedit.cpp.leveledit 2005-12-13 12:56:42.000000000 +0100 +++ njam-1.25-src/src/njamedit.cpp 2006-05-09 21:06:08.000000000 +0200 @@ -41,7 +41,7 @@ { int level_type = 0; // cooperative int level_type_was = 0; - char filename[250]; + char filename[512]; filename[0] = '\0'; int x=2, y=1; @@ -90,7 +90,7 @@ if (key == SDLK_l) // select file from directory { - if (SelectMap('A', filename) > -1) + if (SelectMap('A', filename, sizeof(filename)) > -1) { int w=0; while (filename[w]) @@ -127,12 +127,20 @@ { if (EnterFileName(filename)) { - char buf[250]; + char buf[512]; char types[2][5] = { "COOP", "DUEL" }; - sprintf(buf, "levels/%s.%s\0", filename, types[level_type]); - sprintf(filename, "%s\0", buf); +#ifdef __linux__ + char *home = NjamGetHomeDir(); + snprintf(buf, sizeof(buf), + "%s/.njam-levels/%s.%s", + home? home:"", +#else + snprintf(buf, sizeof(buf), + "levels/%s.%s", +#endif + filename, types[level_type]); LogFile::LogFile("Saving maps"); - m_Maps.Save(filename); + m_Maps.Save(buf); level_type_was = level_type; changed = false; } @@ -458,51 +466,72 @@ } } //--------------------------------------------------------------------------- -int NjamEngine::SelectMap(char type, char *filename) +int NjamEngine::SelectMap(char type, char *filename, int filename_size) { struct list_item *first = NULL; - // open folder, load all entries + // open folders, load all entries DIR *dir; struct dirent *ent; + int i; + char dirname[512] = "levels"; - if ((dir = opendir("levels")) == NULL) +#ifdef __linux__ + for (i=0; i<2; i++) { - printf("Unable to open directory\n"); - return -1; - } + if (i==0) + { +#endif + if ((dir = opendir(dirname)) == NULL) + { + printf("Unable to open directory\n"); + return -1; + } +#ifdef __linux__ + } + else + { + char *home = NjamGetHomeDir(); - while ((ent = readdir(dir)) != NULL) - { - // check if last letter of name maches: - int p = 0; - while (ent->d_name[p]) - p++; + snprintf(dirname, sizeof(dirname), "%s/.njam-levels", + home? home:""); + if ((dir = opendir(dirname)) == NULL) + break; + } +#endif + while ((ent = readdir(dir)) != NULL) + { + // check if last letter of name maches: + int p = 0; + while (ent->d_name[p]) + p++; - char c = ent->d_name[p-1]; - if (c != 'P' && c != 'L') - continue; + char c = ent->d_name[p-1]; + if (c != 'P' && c != 'L') + continue; - if (type != 'A' && c != type) - continue; + if (type != 'A' && c != type) + continue; - struct list_item *new_file = new struct list_item; - new_file->next = first; - new_file->prev = NULL; - if (first) - first->prev = new_file; - first = new_file; + struct list_item *new_file = new struct list_item; + new_file->next = first; + new_file->prev = NULL; + if (first) + first->prev = new_file; + first = new_file; - // copy file name - for (int i=0; ent->d_name[i] && i<29; i++) - { - first->item_text[i] = ent->d_name[i]; - first->item_text[i+1] = '\0'; + // copy file name + snprintf(first->item_text, sizeof(first->item_text), + "%s", ent->d_name); + snprintf(first->item_path, sizeof(first->item_path), + "%s/%s", dirname, ent->d_name); } - } - if (closedir(dir) != 0) - printf("Unable to close directory\n"); + if (closedir(dir) != 0) + printf("Unable to close directory\n"); +#ifdef __linux__ + } +#endif // show and let player select if more than one levelset struct list_item *selected; @@ -514,11 +543,10 @@ int result = 0; // no levels loaded (so far) if (selected) { - char file_name[200]; - sprintf(file_name, "levels/%s\0", selected->item_text); - result = m_Maps.Load(file_name); + result = m_Maps.Load(selected->item_path); if (filename) - sprintf(filename, "%s\0", file_name); + snprintf(filename, filename_size, "%s", + selected->item_path); } while (first) // free memory --- njam-1.25-src/src/njamutils.cpp.leveledit 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njamutils.cpp 2006-05-09 19:40:37.000000000 +0200 @@ -162,3 +162,83 @@ return true; } //----------------------------------------------------------------------------- +#ifdef __linux__ +#include +#include +#include +#include +#include +#if defined(__DECC) && defined(VMS) +#include +static char *vms_to_unix_buffer = NULL; +static int convert_vms_to_unix(char *vms_dir_name) +{ + vms_to_unix_buffer = vms_dir_name; +} +#endif + +char *NjamGetHomeDir() +{ + struct passwd *pw; + + if (!(pw = getpwuid(getuid()))) + { + fprintf(stderr, "Who are you? Not found in passwd database!!\n"); + return NULL; + } + +#if defined(__DECC) && defined(VMS) + /* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix + Format. */ + decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1); + return vms_to_unix_buffer; +#else + return pw->pw_dir; +#endif +} +//----------------------------------------------------------------------------- +int NjamCheckAndCreateDir(const char *name) +{ + struct stat stat_buffer; + + if (stat(name, &stat_buffer)) + { + /* error check if it doesn't exist or something else is wrong */ + if (errno == ENOENT) + { + /* doesn't exist letts create it ;) */ +#ifdef BSD43 + if (mkdir(name, 0775)) +#else + if (mkdir(name, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH)) +#endif + { + fprintf(stderr, "Error creating dir %s", name); + perror(" "); + return -1; + } + } + else + { + /* something else went wrong yell about it */ + fprintf(stderr, "Error opening %s", name); + perror(" "); + return -1; + } + } + else + { + /* file exists check it's a dir otherwise yell about it */ +#ifdef BSD43 + if (!(S_IFDIR & stat_buffer.st_mode)) +#else + if (!S_ISDIR(stat_buffer.st_mode)) +#endif + { + fprintf(stderr,"Error %s exists but isn't a dir\n", name); + return -1; + } + } + return 0; +} +#endif Index: njam.spec =================================================================== RCS file: /cvs/extras/rpms/njam/devel/njam.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- njam.spec 29 Mar 2006 19:45:02 -0000 1.1 +++ njam.spec 9 May 2006 19:44:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: njam Version: 1.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maze-game, eat all the cookies while avoiding the badguys Group: Amusements/Games License: GPL @@ -10,6 +10,7 @@ Source2: njam.desktop Patch0: njam-1.25-drop-setgid.patch Patch1: njam-1.25-html.patch +Patch2: njam-1.25-leveledit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel SDL_net-devel BuildRequires: ImageMagick desktop-file-utils @@ -26,6 +27,7 @@ %setup -q -n %{name}-%{version}-src %patch0 -p1 -z .setgid %patch1 -p1 +%patch2 -p1 -z .leveledit %build @@ -96,6 +98,12 @@ %changelog +* Tue May 9 2006 Hans de Goede 1.25-3 +- Add Patch2, which fixes the leveleditor to save custom made levels under + $HOME/.njam-levels instead of trying to write them under /usr/share. + Also teach njam to look for levels under both $HOME/.njam-levels and + /usr/share (bug 188078). + * Tue Mar 28 2006 Hans de Goede 1.25-2 - Cleaned up description in spec and man using the cleaner description provided in bz 186813 From fedora-extras-commits at redhat.com Tue May 9 19:46:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 12:46:28 -0700 Subject: rpms/njam/FC-5 njam-1.25-leveledit.patch, NONE, 1.1 njam.spec, 1.1, 1.2 Message-ID: <200605091946.k49JkUVm004384@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/njam/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4357 Modified Files: njam.spec Added Files: njam-1.25-leveledit.patch Log Message: * Tue May 9 2006 Hans de Goede 1.25-3 - Add Patch2, which fixes the leveleditor to save custom made levels under $HOME/.njam-levels instead of trying to write them under /usr/share. Also teach njam to look for levels under both $HOME/.njam-levels and /usr/share (bug 188078). njam-1.25-leveledit.patch: --- NEW FILE njam-1.25-leveledit.patch --- --- njam-1.25-src/src/njamutils.h.leveledit 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njamutils.h 2006-05-09 19:40:37.000000000 +0200 @@ -25,6 +25,10 @@ void NjamSetRect(SDL_Rect& rect, int x, int y, int w=0, int h=0); SDLKey NjamGetch(bool Wait); int NjamRandom(int MaxValue); +#ifdef __linux__ +char *NjamGetHomeDir(); +int NjamCheckAndCreateDir(const char *name); +#endif typedef enum { fxBlackWhite, fxDarken } tEffect; bool SurfaceEffect(SDL_Surface *surface, SDL_Rect& r, tEffect Effect = fxBlackWhite); --- njam-1.25-src/src/njam.cpp.leveledit 2006-05-09 19:40:37.000000000 +0200 +++ njam-1.25-src/src/njam.cpp 2006-05-09 19:40:37.000000000 +0200 @@ -350,6 +350,12 @@ bool NjamEngine::Init(bool Fullscreen, bool SoftwareSurface, bool UseDGA) { #ifdef __linux__ + // Check if $HOME/.njam-levels exists and if it doesn't create it + char buf[512]; + char *home = NjamGetHomeDir(); + snprintf(buf, sizeof(buf), "%s/.njam-levels", home? home:""); + NjamCheckAndCreateDir(buf); + sprintf(linux_sdl_driver, "x11\0"); char *driver_name = getenv("SDL_VIDEODRIVER"); if (driver_name) @@ -624,7 +630,9 @@ // Load user settings from .conf file LogFile("Opening njam.conf file.\n"); +#ifndef __linux__ char *home = getenv("HOME"); +#endif std::string njamconf("njam.conf"); if (home) njamconf = std::string(home) + "/.njamconf"; --- njam-1.25-src/src/njam.h.leveledit 2006-05-09 21:06:37.000000000 +0200 +++ njam-1.25-src/src/njam.h 2006-05-09 21:07:42.000000000 +0200 @@ -98,6 +98,7 @@ struct list_item { char item_text[50]; + char item_path[512]; struct list_item *next; struct list_item *prev; }; @@ -192,7 +193,7 @@ void LevelEditor(); // level editor (njamedit.cpp) void RenderEditor(bool, int, int, int); bool EnterFileName(char *file_name); - int SelectMap(char type, char *filename = NULL); + int SelectMap(char type, char *filename = NULL, int filename_size = 0); struct list_item *SelectFromList(struct list_item *first); void Message(char *text); bool Query(char *text); --- njam-1.25-src/src/njamedit.cpp.leveledit 2005-12-13 12:56:42.000000000 +0100 +++ njam-1.25-src/src/njamedit.cpp 2006-05-09 21:06:08.000000000 +0200 @@ -41,7 +41,7 @@ { int level_type = 0; // cooperative int level_type_was = 0; - char filename[250]; + char filename[512]; filename[0] = '\0'; int x=2, y=1; @@ -90,7 +90,7 @@ if (key == SDLK_l) // select file from directory { - if (SelectMap('A', filename) > -1) + if (SelectMap('A', filename, sizeof(filename)) > -1) { int w=0; while (filename[w]) @@ -127,12 +127,20 @@ { if (EnterFileName(filename)) { - char buf[250]; + char buf[512]; char types[2][5] = { "COOP", "DUEL" }; - sprintf(buf, "levels/%s.%s\0", filename, types[level_type]); - sprintf(filename, "%s\0", buf); +#ifdef __linux__ + char *home = NjamGetHomeDir(); + snprintf(buf, sizeof(buf), + "%s/.njam-levels/%s.%s", + home? home:"", +#else + snprintf(buf, sizeof(buf), + "levels/%s.%s", +#endif + filename, types[level_type]); LogFile::LogFile("Saving maps"); - m_Maps.Save(filename); + m_Maps.Save(buf); level_type_was = level_type; changed = false; } @@ -458,51 +466,72 @@ } } //--------------------------------------------------------------------------- -int NjamEngine::SelectMap(char type, char *filename) +int NjamEngine::SelectMap(char type, char *filename, int filename_size) { struct list_item *first = NULL; - // open folder, load all entries + // open folders, load all entries DIR *dir; struct dirent *ent; + int i; + char dirname[512] = "levels"; - if ((dir = opendir("levels")) == NULL) +#ifdef __linux__ + for (i=0; i<2; i++) { - printf("Unable to open directory\n"); - return -1; - } + if (i==0) + { +#endif + if ((dir = opendir(dirname)) == NULL) + { + printf("Unable to open directory\n"); + return -1; + } +#ifdef __linux__ + } + else + { + char *home = NjamGetHomeDir(); - while ((ent = readdir(dir)) != NULL) - { - // check if last letter of name maches: - int p = 0; - while (ent->d_name[p]) - p++; + snprintf(dirname, sizeof(dirname), "%s/.njam-levels", + home? home:""); + if ((dir = opendir(dirname)) == NULL) + break; + } +#endif + while ((ent = readdir(dir)) != NULL) + { + // check if last letter of name maches: + int p = 0; + while (ent->d_name[p]) + p++; - char c = ent->d_name[p-1]; - if (c != 'P' && c != 'L') - continue; + char c = ent->d_name[p-1]; + if (c != 'P' && c != 'L') + continue; - if (type != 'A' && c != type) - continue; + if (type != 'A' && c != type) + continue; - struct list_item *new_file = new struct list_item; - new_file->next = first; - new_file->prev = NULL; - if (first) - first->prev = new_file; - first = new_file; + struct list_item *new_file = new struct list_item; + new_file->next = first; + new_file->prev = NULL; + if (first) + first->prev = new_file; + first = new_file; - // copy file name - for (int i=0; ent->d_name[i] && i<29; i++) - { - first->item_text[i] = ent->d_name[i]; - first->item_text[i+1] = '\0'; + // copy file name + snprintf(first->item_text, sizeof(first->item_text), + "%s", ent->d_name); + snprintf(first->item_path, sizeof(first->item_path), + "%s/%s", dirname, ent->d_name); } - } - if (closedir(dir) != 0) - printf("Unable to close directory\n"); + if (closedir(dir) != 0) + printf("Unable to close directory\n"); +#ifdef __linux__ + } +#endif // show and let player select if more than one levelset struct list_item *selected; @@ -514,11 +543,10 @@ int result = 0; // no levels loaded (so far) if (selected) { - char file_name[200]; - sprintf(file_name, "levels/%s\0", selected->item_text); - result = m_Maps.Load(file_name); + result = m_Maps.Load(selected->item_path); if (filename) - sprintf(filename, "%s\0", file_name); + snprintf(filename, filename_size, "%s", + selected->item_path); } while (first) // free memory --- njam-1.25-src/src/njamutils.cpp.leveledit 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njamutils.cpp 2006-05-09 19:40:37.000000000 +0200 @@ -162,3 +162,83 @@ return true; } //----------------------------------------------------------------------------- +#ifdef __linux__ +#include +#include +#include +#include +#include +#if defined(__DECC) && defined(VMS) +#include +static char *vms_to_unix_buffer = NULL; +static int convert_vms_to_unix(char *vms_dir_name) +{ + vms_to_unix_buffer = vms_dir_name; +} +#endif + +char *NjamGetHomeDir() +{ + struct passwd *pw; + + if (!(pw = getpwuid(getuid()))) + { + fprintf(stderr, "Who are you? Not found in passwd database!!\n"); + return NULL; + } + +#if defined(__DECC) && defined(VMS) + /* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix + Format. */ + decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1); + return vms_to_unix_buffer; +#else + return pw->pw_dir; +#endif +} +//----------------------------------------------------------------------------- +int NjamCheckAndCreateDir(const char *name) +{ + struct stat stat_buffer; + + if (stat(name, &stat_buffer)) + { + /* error check if it doesn't exist or something else is wrong */ + if (errno == ENOENT) + { + /* doesn't exist letts create it ;) */ +#ifdef BSD43 + if (mkdir(name, 0775)) +#else + if (mkdir(name, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH)) +#endif + { + fprintf(stderr, "Error creating dir %s", name); + perror(" "); + return -1; + } + } + else + { + /* something else went wrong yell about it */ + fprintf(stderr, "Error opening %s", name); + perror(" "); + return -1; + } + } + else + { + /* file exists check it's a dir otherwise yell about it */ +#ifdef BSD43 + if (!(S_IFDIR & stat_buffer.st_mode)) +#else + if (!S_ISDIR(stat_buffer.st_mode)) +#endif + { + fprintf(stderr,"Error %s exists but isn't a dir\n", name); + return -1; + } + } + return 0; +} +#endif Index: njam.spec =================================================================== RCS file: /cvs/extras/rpms/njam/FC-5/njam.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- njam.spec 29 Mar 2006 19:45:02 -0000 1.1 +++ njam.spec 9 May 2006 19:46:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: njam Version: 1.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maze-game, eat all the cookies while avoiding the badguys Group: Amusements/Games License: GPL @@ -10,6 +10,7 @@ Source2: njam.desktop Patch0: njam-1.25-drop-setgid.patch Patch1: njam-1.25-html.patch +Patch2: njam-1.25-leveledit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel SDL_net-devel BuildRequires: ImageMagick desktop-file-utils @@ -26,6 +27,7 @@ %setup -q -n %{name}-%{version}-src %patch0 -p1 -z .setgid %patch1 -p1 +%patch2 -p1 -z .leveledit %build @@ -96,6 +98,12 @@ %changelog +* Tue May 9 2006 Hans de Goede 1.25-3 +- Add Patch2, which fixes the leveleditor to save custom made levels under + $HOME/.njam-levels instead of trying to write them under /usr/share. + Also teach njam to look for levels under both $HOME/.njam-levels and + /usr/share (bug 188078). + * Tue Mar 28 2006 Hans de Goede 1.25-2 - Cleaned up description in spec and man using the cleaner description provided in bz 186813 From fedora-extras-commits at redhat.com Tue May 9 20:12:08 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 9 May 2006 13:12:08 -0700 Subject: owners owners.list,1.967,1.968 Message-ID: <200605092012.k49KCA1S010592@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558 Modified Files: owners.list Log Message: Adding Lightning to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.967 retrieving revision 1.968 diff -u -r1.967 -r1.968 --- owners.list 9 May 2006 17:48:55 -0000 1.967 +++ owners.list 9 May 2006 20:12:08 -0000 1.968 @@ -699,6 +699,7 @@ Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|lightning|GNU Lightning|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 20:17:24 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 9 May 2006 13:17:24 -0700 Subject: comps comps-fe5.xml.in,1.46,1.47 comps-fe6.xml.in,1.9,1.10 Message-ID: <200605092017.k49KHQwN011451@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11420 Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: Adding GNU Lightning Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- comps-fe5.xml.in 8 May 2006 23:43:16 -0000 1.46 +++ comps-fe5.xml.in 9 May 2006 20:17:24 -0000 1.47 @@ -43,6 +43,7 @@ ghc git highlight + lightning hugs98 lincvs lua Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- comps-fe6.xml.in 8 May 2006 23:43:16 -0000 1.9 +++ comps-fe6.xml.in 9 May 2006 20:17:24 -0000 1.10 @@ -44,6 +44,7 @@ git highlight hugs98 + lightning lincvs lua mach From fedora-extras-commits at redhat.com Tue May 9 20:44:13 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 13:44:13 -0700 Subject: rpms/gauche-gl/FC-5 gauche-gl.spec,1.1,1.2 Message-ID: <200605092044.k49KiFOw015691@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15650 Modified Files: gauche-gl.spec Log Message: Index: gauche-gl.spec =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/FC-5/gauche-gl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gauche-gl.spec 9 May 2006 19:27:29 -0000 1.1 +++ gauche-gl.spec 9 May 2006 20:44:13 -0000 1.2 @@ -2,7 +2,7 @@ Name: gauche-gl Version: 0.4.1 -Release: 4%{?dist} +Release: 5?{?dist} Summary: OpenGL binding for Gauche Group: Development/Languages From fedora-extras-commits at redhat.com Tue May 9 20:44:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 13:44:54 -0700 Subject: rpms/gauche-gl/FC-5 gauche-gl.spec,1.2,1.3 Message-ID: <200605092044.k49Kiux9015822@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15799 Modified Files: gauche-gl.spec Log Message: Index: gauche-gl.spec =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/FC-5/gauche-gl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gauche-gl.spec 9 May 2006 20:44:13 -0000 1.2 +++ gauche-gl.spec 9 May 2006 20:44:54 -0000 1.3 @@ -2,7 +2,7 @@ Name: gauche-gl Version: 0.4.1 -Release: 5?{?dist} +Release: 5%{?dist} Summary: OpenGL binding for Gauche Group: Development/Languages From fedora-extras-commits at redhat.com Tue May 9 20:46:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 13:46:33 -0700 Subject: rpms/gauche-gl/FC-4 gauche-gl.spec,1.1,1.2 Message-ID: <200605092046.k49KkZtg016142@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16118 Modified Files: gauche-gl.spec Log Message: Index: gauche-gl.spec =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/FC-4/gauche-gl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gauche-gl.spec 9 May 2006 19:27:29 -0000 1.1 +++ gauche-gl.spec 9 May 2006 20:46:32 -0000 1.2 @@ -13,10 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gauche-devel = %{gauche_version} BuildRequires: freeglut-devel -BuildRequires: libSM-devel -BuildRequires: libXext-devel -BuildRequires: libXi-devel -BuildRequires: libXmu-devel +BuildRequires: xorg-x11-devel BuildRequires: texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info From fedora-extras-commits at redhat.com Tue May 9 20:55:31 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 13:55:31 -0700 Subject: owners owners.list,1.968,1.969 Message-ID: <200605092055.k49KtXuf017607@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17581 Modified Files: owners.list Log Message: added gauche-gl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.968 retrieving revision 1.969 diff -u -r1.968 -r1.969 --- owners.list 9 May 2006 20:12:08 -0000 1.968 +++ owners.list 9 May 2006 20:55:31 -0000 1.969 @@ -319,6 +319,7 @@ Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|gauche|Scheme script interpreter with multibyte character handling|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|gauche-gl|OpenGL binding for Gauche|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 21:11:11 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 9 May 2006 14:11:11 -0700 Subject: rpms/pessulus import.log,1.3,1.4 Message-ID: <200605092111.k49LBD5l022186@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22147 Modified Files: import.log Log Message: auto-import pessulus-0.10.1-2 on branch devel from pessulus-0.10.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pessulus/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 9 May 2006 19:19:16 -0000 1.3 +++ import.log 9 May 2006 21:11:11 -0000 1.4 @@ -1,2 +1,3 @@ pessulus-0_10_1-1_fc6:HEAD:pessulus-0.10.1-1.fc6.src.rpm:1147122603 pessulus-0_10_1-1:HEAD:pessulus-0.10.1-1.src.rpm:1147202351 +pessulus-0_10_1-2:HEAD:pessulus-0.10.1-2.src.rpm:1147209067 From fedora-extras-commits at redhat.com Tue May 9 21:11:12 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 9 May 2006 14:11:12 -0700 Subject: rpms/pessulus/devel pessulus.spec,1.2,1.3 Message-ID: <200605092111.k49LBEIU022191@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22147/devel Modified Files: pessulus.spec Log Message: auto-import pessulus-0.10.1-2 on branch devel from pessulus-0.10.1-2.src.rpm Index: pessulus.spec =================================================================== RCS file: /cvs/extras/rpms/pessulus/devel/pessulus.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pessulus.spec 9 May 2006 19:19:16 -0000 1.2 +++ pessulus.spec 9 May 2006 21:11:12 -0000 1.3 @@ -2,7 +2,7 @@ Name: pessulus Version: 0.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lockdown editor for GNOME Group: Applications/System @@ -12,8 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, pygtk2-devel >= 2.6.0, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2 -BuildRequires: gettext +BuildRequires: gtk2-devel, pygtk2-devel, perl-XML-Parser,gnome-python2, pkgconfig, desktop-file-utils, GConf2, gettext Requires: pygtk2, gnome-python2, gnome-python2-gconf %description @@ -57,7 +56,10 @@ %{_datadir}/%{name}/* %changelog -* Wed May 3 2006 Damien Durand - 0.10.1 +* Wed May 9 2006 Damien Durand - 0.10.1-2 +- Fixing dependancy + +* Wed May 3 2006 Damien Durand - 0.10.1-1 - upgrade version to 0.10.1 * Fri Apr 7 2006 Tom "spot" Callaway - 0.9-2 From fedora-extras-commits at redhat.com Tue May 9 21:38:54 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:38:54 -0700 Subject: rpms/xsp - New directory Message-ID: <200605092138.k49LcuhT024513@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24492/xsp Log Message: Directory /cvs/extras/rpms/xsp added to the repository From fedora-extras-commits at redhat.com Tue May 9 21:38:55 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:38:55 -0700 Subject: rpms/xsp/devel - New directory Message-ID: <200605092139.k49LcvoE024516@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24492/xsp/devel Log Message: Directory /cvs/extras/rpms/xsp/devel added to the repository From fedora-extras-commits at redhat.com Tue May 9 21:39:21 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:39:21 -0700 Subject: rpms/xsp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605092139.k49LdNB8024576@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24543 Added Files: Makefile import.log Log Message: Setup of module xsp --- NEW FILE Makefile --- # Top level Makefile for module xsp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 9 21:39:21 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:39:21 -0700 Subject: rpms/xsp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605092139.k49LdNN1024579@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24543/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xsp --- NEW 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 May 9 21:40:12 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:40:12 -0700 Subject: rpms/xsp import.log,1.1,1.2 Message-ID: <200605092140.k49Leiur024655@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24614 Modified Files: import.log Log Message: auto-import xsp-1.1.13-3 on branch devel from xsp-1.1.13-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xsp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 May 2006 21:39:21 -0000 1.1 +++ import.log 9 May 2006 21:40:12 -0000 1.2 @@ -0,0 +1 @@ +xsp-1_1_13-3:HEAD:xsp-1.1.13-3.src.rpm:1147210802 From fedora-extras-commits at redhat.com Tue May 9 21:40:13 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:40:13 -0700 Subject: rpms/xsp/devel xsp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605092140.k49Lej6o024659@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24614/devel Modified Files: .cvsignore sources Added Files: xsp.spec Log Message: auto-import xsp-1.1.13-3 on branch devel from xsp-1.1.13-3.src.rpm --- NEW FILE xsp.spec --- %define _libdir /usr/lib Name: xsp Version: 1.1.13 Release: 3%{?dist} License: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.mono-project.com/ASP.NET#XSP Source0: http://www.go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz BuildRequires: mono-web, mono-data, mono-core Requires: mono-core Summary: A small web server that hosts ASP.NET Group: System Environment/Daemons %description XSP is a standalone web server written in C# that can be used to run ASP.NET applications as well as a set of pages, controls and web services that you can use to experience ASP.NET. %prep %setup -q %build %configure make %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-, root, root,-) %doc NEWS README COPYING %{_bindir}/* %{_libdir}/pkgconfig/xsp.pc %{_libdir}/pkgconfig/xsp-2.pc %{_libdir}/%{name}/1.0/* %{_libdir}/%{name}/2.0/* %{_libdir}/%{name}/test/* %{_mandir}/man1/* %changelog * Mon May 08 2006 Paul F. Johnson 1.1.13-3 - Fixes to the spec file - Added clean * Mon Apr 17 2006 Paul F. Johnson 1.1.13-1 - Initial import for FE - Heavily amended spec file (based on the Novell original) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 May 2006 21:39:21 -0000 1.1 +++ .cvsignore 9 May 2006 21:40:13 -0000 1.2 @@ -0,0 +1 @@ +xsp-1.1.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 May 2006 21:39:21 -0000 1.1 +++ sources 9 May 2006 21:40:13 -0000 1.2 @@ -0,0 +1 @@ +58facfdb9d13d48f9e8ad5069500081d xsp-1.1.13.tar.gz From fedora-extras-commits at redhat.com Tue May 9 21:43:51 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:43:51 -0700 Subject: owners owners.list,1.969,1.970 Message-ID: <200605092143.k49Lhrr2024774@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24757/owners Modified Files: owners.list Log Message: Added XSP (ASP.NET page server) xsp-1.1.13-3 owners/owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.969 retrieving revision 1.970 diff -u -r1.969 -r1.970 --- owners.list 9 May 2006 20:55:31 -0000 1.969 +++ owners.list 9 May 2006 21:43:51 -0000 1.970 @@ -1719,6 +1719,7 @@ Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xscorch|A Scorched Earth clone|mgarski at post.pl|extras-qa at fedoraproject.org| +Fedora Extras|xsp|ASP.NET page server|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 21:55:46 2006 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 9 May 2006 14:55:46 -0700 Subject: CVSROOT avail,1.32,1.33 Message-ID: <200605092155.k49LtklQ024904@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24886 Modified Files: avail Log Message: Stuart needs access for install guide, yum guide. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- avail 6 May 2006 15:31:16 -0000 1.32 +++ avail 9 May 2006 21:55:44 -0000 1.33 @@ -56,3 +56,4 @@ avail | pfrields,mjohnson | web/html/participate/documentation-quick-start avail | pfrields | web/html/participate/developers-guide avail | tchung | web/html/News +avail | elliss | web/html/docs From fedora-extras-commits at redhat.com Tue May 9 22:10:39 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 9 May 2006 15:10:39 -0700 Subject: comps comps-fe5.xml,1.6,1.7 Message-ID: <200605092210.k49MAfU5027245@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27226 Modified Files: comps-fe5.xml Log Message: Whitespace fixes Index: comps-fe5.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- comps-fe5.xml 8 May 2006 08:46:21 -0000 1.6 +++ comps-fe5.xml 9 May 2006 22:10:39 -0000 1.7 @@ -115,7 +115,7 @@ qalculate-gtk qalculate-kde qcad - qucs + qucs R R-gnomeGUI scalapack @@ -157,9 +157,9 @@ gtweakui istanbul lock-keys-applet - nautilus-actions - nautilus-flac-converter - nautilus-image-converter + nautilus-actions + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -267,7 +267,7 @@ true drgeo - drgeo-doc + drgeo-doc gperiodic stellarium tuxtype2 @@ -398,7 +398,7 @@ gnotime gnumeric gourmet - gramps + gramps grisbi gsview koffice-suite @@ -441,8 +441,8 @@ soundconverter soundtracker sweep - tagtool - ushare + tagtool + ushare xmms xmms-cdread xmms-flac @@ -460,9 +460,9 @@ airsnort apcupsd cfengine - cfs - crack - dkms + cfs + crack + dkms environment-modules epylog fuse @@ -471,7 +471,7 @@ ghex hercules ibmonitor - inadyn + inadyn lirc moodss moomps @@ -611,10 +611,10 @@ xffm-icons xfprint xfwm4 - xfce4-toys - xfwm4-themes + xfce4-toys + xfwm4-themes xfwm4-themes - xfcalendar + xfcalendar From fedora-extras-commits at redhat.com Tue May 9 22:13:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 9 May 2006 15:13:55 -0700 Subject: comps comps-fe6.xml,1.1,1.2 Message-ID: <200605092213.k49MDvw4027302@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27285 Modified Files: comps-fe6.xml Log Message: Whitespace fixes Index: comps-fe6.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- comps-fe6.xml 17 Apr 2006 17:49:10 -0000 1.1 +++ comps-fe6.xml 9 May 2006 22:13:55 -0000 1.2 @@ -114,7 +114,7 @@ qalculate-gtk qalculate-kde qcad - qucs + qucs R R-gnomeGUI scalapack @@ -156,9 +156,9 @@ gtweakui istanbul lock-keys-applet - nautilus-actions - nautilus-flac-converter - nautilus-image-converter + nautilus-actions + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -266,7 +266,7 @@ true drgeo - drgeo-doc + drgeo-doc gperiodic stellarium tuxtype2 @@ -397,7 +397,7 @@ gnotime gnumeric gourmet - gramps + gramps grisbi gsview koffice-suite @@ -440,8 +440,8 @@ soundconverter soundtracker sweep - tagtool - ushare + tagtool + ushare xmms xmms-cdread xmms-flac @@ -459,9 +459,9 @@ airsnort apcupsd cfengine - cfs - crack - dkms + cfs + crack + dkms environment-modules epylog fuse @@ -470,7 +470,7 @@ ghex hercules ibmonitor - inadyn + inadyn lirc moodss moomps @@ -516,7 +516,7 @@ ircd-hybrid jabberd kannel - ushare + ushare From fedora-extras-commits at redhat.com Tue May 9 22:15:42 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 9 May 2006 15:15:42 -0700 Subject: comps comps-fe5.xml.in,1.47,1.48 comps-fe6.xml.in,1.10,1.11 Message-ID: <200605092215.k49MFif8027376@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27357 Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: Whitespace fixes Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- comps-fe5.xml.in 9 May 2006 20:17:24 -0000 1.47 +++ comps-fe5.xml.in 9 May 2006 22:15:42 -0000 1.48 @@ -43,8 +43,8 @@ ghc git highlight - lightning - hugs98 + lightning + hugs98 lincvs lua mach @@ -119,7 +119,7 @@ qalculate-gtk qalculate-kde qcad - qucs + qucs R R-gnomeGUI scalapack @@ -161,9 +161,9 @@ gtweakui istanbul lock-keys-applet - nautilus-actions - nautilus-flac-converter - nautilus-image-converter + nautilus-actions + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -272,7 +272,7 @@ true drgeo - drgeo-doc + drgeo-doc gcompris gperiodic stellarium @@ -405,7 +405,7 @@ gnotime gnumeric gourmet - gramps + gramps grisbi gsview koffice-suite @@ -448,8 +448,8 @@ soundconverter soundtracker sweep - tagtool - ushare + tagtool + ushare xmms xmms-cdread xmms-flac @@ -467,9 +467,9 @@ airsnort apcupsd cfengine - cfs - crack - dkms + cfs + crack + dkms environment-modules epylog fuse @@ -478,7 +478,7 @@ ghex hercules ibmonitor - inadyn + inadyn lirc moodss moomps @@ -524,7 +524,7 @@ ircd-hybrid jabberd kannel - ushare + ushare Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- comps-fe6.xml.in 9 May 2006 20:17:24 -0000 1.10 +++ comps-fe6.xml.in 9 May 2006 22:15:42 -0000 1.11 @@ -43,8 +43,8 @@ ghc git highlight - hugs98 - lightning + hugs98 + lightning lincvs lua mach @@ -119,7 +119,7 @@ qalculate-gtk qalculate-kde qcad - qucs + qucs R R-gnomeGUI scalapack @@ -161,9 +161,9 @@ gtweakui istanbul lock-keys-applet - nautilus-actions - nautilus-flac-converter - nautilus-image-converter + nautilus-actions + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -272,7 +272,7 @@ true drgeo - drgeo-doc + drgeo-doc gcompris gperiodic stellarium @@ -405,7 +405,7 @@ gnotime gnumeric gourmet - gramps + gramps grisbi gsview koffice-suite @@ -448,8 +448,8 @@ soundconverter soundtracker sweep - tagtool - ushare + tagtool + ushare xmms xmms-cdread xmms-flac @@ -467,9 +467,9 @@ airsnort apcupsd cfengine - cfs - crack - dkms + cfs + crack + dkms environment-modules epylog fuse @@ -478,7 +478,7 @@ ghex hercules ibmonitor - inadyn + inadyn lirc moodss moomps @@ -524,7 +524,7 @@ ircd-hybrid jabberd kannel - ushare + ushare From fedora-extras-commits at redhat.com Tue May 9 23:25:13 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:25:13 -0700 Subject: rpms/nagios/devel nagios-initrd.patch, NONE, 1.1 nagios.spec, 1.17, 1.18 Message-ID: <200605092325.k49NPFc8030022@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30002 Modified Files: nagios.spec Added Files: nagios-initrd.patch Log Message: init.d patch - Bugzilla #191046 nagios-initrd.patch: --- NEW FILE nagios-initrd.patch --- --- nagios 2006-05-08 10:39:49.000000000 -0300 +++ daemon-init.in 2006-05-08 10:33:26.000000000 -0300 @@ -114,11 +114,13 @@ echo "Starting network monitor: nagios" $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + touch $NagiosVarDir/nagios.log $NagiosRetentionFile + chown $NagiosUser:$NagiosGroup $NagiosVarDir/nagios.log $NagiosRetentionFile rm -f $NagiosCommandFile touch $NagiosRunFile chown $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosBin -d $NagiosCfgFile + pidof nagios > $NagiosRunFile if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi #sleep 1 #status_nagios nagios Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- nagios.spec 4 May 2006 03:32:52 -0000 1.17 +++ nagios.spec 9 May 2006 23:25:13 -0000 1.18 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate Source2: nagios.htaccess +Patch0: nagios-initrd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p0 %build ./configure \ @@ -155,6 +157,9 @@ %{_includedir}/%{name} %changelog +* Tue May 09 2006 Mike McGrath 2.3-2 +- updates to the init script that prevented nagios from shutting down + * Wed May 03 2006 Mike McGrath 2.3-1 - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs From fedora-extras-commits at redhat.com Tue May 9 23:38:45 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:38:45 -0700 Subject: rpms/nagios/FC-4 nagios.spec,1.11,1.12 Message-ID: <200605092339.k49NdH46030163@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30131/FC-4 Modified Files: nagios.spec Log Message: bugzilla# 191046 fix Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nagios.spec 4 May 2006 03:32:46 -0000 1.11 +++ nagios.spec 9 May 2006 23:38:45 -0000 1.12 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate Source2: nagios.htaccess +Patch0: nagios-initrd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p0 %build ./configure \ @@ -155,6 +157,9 @@ %{_includedir}/%{name} %changelog +* Tue May 09 2006 Mike McGrath 2.3-2 +- updates to the init script that prevented nagios from shutting down + * Wed May 03 2006 Mike McGrath 2.3-1 - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs From fedora-extras-commits at redhat.com Tue May 9 23:38:45 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:38:45 -0700 Subject: rpms/nagios/FC-5 nagios.spec,1.11,1.12 Message-ID: <200605092339.k49NdHYw030166@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30131/FC-5 Modified Files: nagios.spec Log Message: bugzilla# 191046 fix Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nagios.spec 4 May 2006 03:32:47 -0000 1.11 +++ nagios.spec 9 May 2006 23:38:45 -0000 1.12 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate Source2: nagios.htaccess +Patch0: nagios-initrd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p0 %build ./configure \ @@ -155,6 +157,9 @@ %{_includedir}/%{name} %changelog +* Tue May 09 2006 Mike McGrath 2.3-2 +- updates to the init script that prevented nagios from shutting down + * Wed May 03 2006 Mike McGrath 2.3-1 - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs From fedora-extras-commits at redhat.com Tue May 9 23:42:17 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:42:17 -0700 Subject: rpms/nagios/FC-4 nagios-initrd.patch,NONE,1.1 Message-ID: <200605092342.k49NgJ81030292@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30260/FC-4 Added Files: nagios-initrd.patch Log Message: Forgot to add actual files for bug fix 191046 nagios-initrd.patch: --- NEW FILE nagios-initrd.patch --- --- nagios 2006-05-08 10:39:49.000000000 -0300 +++ daemon-init.in 2006-05-08 10:33:26.000000000 -0300 @@ -114,11 +114,13 @@ echo "Starting network monitor: nagios" $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + touch $NagiosVarDir/nagios.log $NagiosRetentionFile + chown $NagiosUser:$NagiosGroup $NagiosVarDir/nagios.log $NagiosRetentionFile rm -f $NagiosCommandFile touch $NagiosRunFile chown $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosBin -d $NagiosCfgFile + pidof nagios > $NagiosRunFile if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi #sleep 1 #status_nagios nagios From fedora-extras-commits at redhat.com Tue May 9 23:42:18 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:42:18 -0700 Subject: rpms/nagios/FC-5 nagios-initrd.patch,NONE,1.1 Message-ID: <200605092342.k49NgKgo030297@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30260/FC-5 Added Files: nagios-initrd.patch Log Message: Forgot to add actual files for bug fix 191046 nagios-initrd.patch: --- NEW FILE nagios-initrd.patch --- --- nagios 2006-05-08 10:39:49.000000000 -0300 +++ daemon-init.in 2006-05-08 10:33:26.000000000 -0300 @@ -114,11 +114,13 @@ echo "Starting network monitor: nagios" $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + touch $NagiosVarDir/nagios.log $NagiosRetentionFile + chown $NagiosUser:$NagiosGroup $NagiosVarDir/nagios.log $NagiosRetentionFile rm -f $NagiosCommandFile touch $NagiosRunFile chown $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosBin -d $NagiosCfgFile + pidof nagios > $NagiosRunFile if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi #sleep 1 #status_nagios nagios From fedora-extras-commits at redhat.com Tue May 9 23:59:23 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:59:23 -0700 Subject: rpms/nagios/FC-4 nagios.spec,1.12,1.13 Message-ID: <200605092359.k49NxtEs030559@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30511/FC-4 Modified Files: nagios.spec Log Message: Increment of release number Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nagios.spec 9 May 2006 23:38:45 -0000 1.12 +++ nagios.spec 9 May 2006 23:59:23 -0000 1.13 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -157,7 +157,7 @@ %{_includedir}/%{name} %changelog -* Tue May 09 2006 Mike McGrath 2.3-2 +* Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down * Wed May 03 2006 Mike McGrath 2.3-1 From fedora-extras-commits at redhat.com Tue May 9 23:59:24 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:59:24 -0700 Subject: rpms/nagios/FC-5 nagios.spec,1.12,1.13 Message-ID: <200605092359.k49NxuaU030562@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30511/FC-5 Modified Files: nagios.spec Log Message: Increment of release number Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nagios.spec 9 May 2006 23:38:45 -0000 1.12 +++ nagios.spec 9 May 2006 23:59:24 -0000 1.13 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -157,7 +157,7 @@ %{_includedir}/%{name} %changelog -* Tue May 09 2006 Mike McGrath 2.3-2 +* Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down * Wed May 03 2006 Mike McGrath 2.3-1 From fedora-extras-commits at redhat.com Tue May 9 23:59:25 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:59:25 -0700 Subject: rpms/nagios/devel nagios.spec,1.18,1.19 Message-ID: <200605092359.k49NxvYo030565@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30511/devel Modified Files: nagios.spec Log Message: Increment of release number Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nagios.spec 9 May 2006 23:25:13 -0000 1.18 +++ nagios.spec 9 May 2006 23:59:24 -0000 1.19 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -157,7 +157,7 @@ %{_includedir}/%{name} %changelog -* Tue May 09 2006 Mike McGrath 2.3-2 +* Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down * Wed May 03 2006 Mike McGrath 2.3-1 From fedora-extras-commits at redhat.com Wed May 10 03:18:48 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 9 May 2006 20:18:48 -0700 Subject: rpms/jed/devel jed-etc.patch,NONE,1.1 jed.spec,1.10,1.11 Message-ID: <200605100318.k4A3Io7E007977@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/jed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7957 Modified Files: jed.spec Added Files: jed-etc.patch Log Message: cleanups: - use make install - which fixes the built-in help - make /etc/jed.rc work (#189374) - get rid of JED_ROOT in man page (#189374) jed-etc.patch: --- NEW FILE jed-etc.patch --- --- jed-0.99-18/lib/site.sl.foo 2006-05-09 23:11:26.000000000 -0400 +++ jed-0.99-18/lib/site.sl 2006-05-09 23:13:57.000000000 -0400 @@ -3274,13 +3274,7 @@ $1 = getenv ("JED_CONF_DIR"); if ($1 == NULL) { - $1 = guess_jed_install_prefix (); - if ($1 != NULL) - { - $1 = path_concat ($1, "etc"); - if (($1 == "/usr/etc") and (0 == file_status ($1))) - $1 = "/etc"; - } + $1 = "/etc"; } if ($1 != NULL) { Index: jed.spec =================================================================== RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jed.spec 18 Apr 2006 15:25:23 -0000 1.10 +++ jed.spec 10 May 2006 03:18:48 -0000 1.11 @@ -1,18 +1,19 @@ Summary: Fast, compact editor based on the S-Lang screen library Name: jed Version: 0.99.18 -Release: 1 +Release: 2 License: GPL Group: Applications/Editors Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2 Patch1: jed-0.99.12-xkeys.patch URL: http://www.jedsoft.org/jed/ +Patch2: jed-etc.patch Patch3: jed-multilib.patch Patch4: jed-selinux.patch Prereq: /sbin/install-info Obsoletes: jed-common jed-xjed BuildPrereq: slang-devel >= 2.0, autoconf, libselinux-devel -BuildRoot: /var/tmp/jed-root +BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root %description Jed is a fast, compact editor based on the S-lang screen library. Jed @@ -28,6 +29,7 @@ %prep %setup -q -n jed-0.99-18 %patch1 -p1 -b .xkeys +%patch2 -p1 #%patch3 -p1 %patch4 -p1 -b .selinux cd autoconf @@ -42,19 +44,16 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/jed -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +make install DESTDIR=$RPM_BUILD_ROOT -cp -r lib $RPM_BUILD_ROOT%{_datadir}/jed - -cd src/objs -install -m 0755 jed $RPM_BUILD_ROOT%{_bindir} JED_ROOT=$RPM_BUILD_ROOT%{_datadir}/jed $RPM_BUILD_ROOT%{_bindir}/jed -batch -n -l preparse.sl - 0.99.18-2 +- don't do all the installation by hand +- get help files installed +- fix JED_ROOT references in man page +- make /etc/jed.rc (as specified in man page) work + * Tue Apr 18 2006 Bill Nottingham - 0.99.18-1 - update to 0.99.18 From fedora-extras-commits at redhat.com Wed May 10 04:52:01 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 21:52:01 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.7,1.8 Message-ID: <200605100452.k4A4q3v7011504@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487 Modified Files: gcompris.spec Log Message: Add a hard Requires on gcompris-libs version-release to the base package because upstream doesn't bump the soname version when the abi changes. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gcompris.spec 9 May 2006 19:16:54 -0000 1.7 +++ gcompris.spec 10 May 2006 04:52:01 -0000 1.8 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -21,6 +21,7 @@ Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags Requires: gnome-python2-canvas python-sqlite2 +Requires: %{name}-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -71,7 +72,7 @@ %package devel Summary: Development libraries and headers for gcompris-lib Group: Development/Libraries -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} Requires: libgnomecanvas-devel pkgconfig %description devel @@ -479,6 +480,10 @@ %changelog +* unreleased 2006 Hans de Goede 7.4-10 +- Add a hard Requires on gcompris-libs version-release to the base package + because upstream doesn't bump the soname version when the abi changes. + * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. From fedora-extras-commits at redhat.com Wed May 10 06:58:56 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 9 May 2006 23:58:56 -0700 Subject: rpms/yumex/devel sources,1.26,1.27 yumex.spec,1.27,1.28 Message-ID: <200605100658.k4A6wwqs016352@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300/devel Modified Files: sources yumex.spec Log Message: Release 1.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 May 2006 11:07:07 -0000 1.26 +++ sources 10 May 2006 06:58:55 -0000 1.27 @@ -1 +1 @@ -ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz +5a49b1145be3315939596fcb1849f141 yumex-1.0.1.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- yumex.spec 3 May 2006 11:07:07 -0000 1.27 +++ yumex.spec 10 May 2006 06:58:55 -0000 1.28 @@ -1,5 +1,5 @@ Name: yumex -Version: 1.0.0 +Version: 1.0.1 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 3 2006 Tim Lauridsen - 1.0.1-1.0 +- Release 1.0.1-1.0 * Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 - Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 From fedora-extras-commits at redhat.com Wed May 10 06:58:49 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 9 May 2006 23:58:49 -0700 Subject: rpms/yumex/FC-4 sources,1.14,1.15 yumex.spec,1.14,1.15 Message-ID: <200605100659.k4A6xLnA016356@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300/FC-4 Modified Files: sources yumex.spec Log Message: Release 1.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 3 May 2006 11:07:01 -0000 1.14 +++ sources 10 May 2006 06:58:49 -0000 1.15 @@ -1 +1 @@ -ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz +5a49b1145be3315939596fcb1849f141 yumex-1.0.1.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- yumex.spec 3 May 2006 11:07:01 -0000 1.14 +++ yumex.spec 10 May 2006 06:58:49 -0000 1.15 @@ -1,5 +1,5 @@ Name: yumex -Version: 1.0.0 +Version: 1.0.1 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 3 2006 Tim Lauridsen - 1.0.1-1.0 +- Release 1.0.1-1.0 * Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 - Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 From fedora-extras-commits at redhat.com Wed May 10 06:58:50 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 9 May 2006 23:58:50 -0700 Subject: rpms/yumex/FC-5 .cvsignore, 1.21, 1.22 sources, 1.26, 1.27 yumex.spec, 1.27, 1.28 Message-ID: <200605100659.k4A6xMrA016361@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300/FC-5 Modified Files: .cvsignore sources yumex.spec Log Message: Release 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 3 May 2006 11:07:02 -0000 1.21 +++ .cvsignore 10 May 2006 06:58:50 -0000 1.22 @@ -1 +1 @@ -yumex-1.0.0.tar.gz +yumex-1.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 May 2006 11:07:02 -0000 1.26 +++ sources 10 May 2006 06:58:50 -0000 1.27 @@ -1 +1 @@ -ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz +5a49b1145be3315939596fcb1849f141 yumex-1.0.1.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- yumex.spec 3 May 2006 11:07:02 -0000 1.27 +++ yumex.spec 10 May 2006 06:58:50 -0000 1.28 @@ -1,5 +1,5 @@ Name: yumex -Version: 1.0.0 +Version: 1.0.1 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 3 2006 Tim Lauridsen - 1.0.1-1.0 +- Release 1.0.1-1.0 * Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 - Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 From fedora-extras-commits at redhat.com Wed May 10 08:17:17 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 10 May 2006 01:17:17 -0700 Subject: fedora-security/audit fc4,1.237,1.238 fc5,1.150,1.151 Message-ID: <200605100817.k4A8HHTD021152@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21132/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-2274 and CVE-2006-2275 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- fc4 9 May 2006 18:50:58 -0000 1.237 +++ fc4 10 May 2006 08:17:14 -0000 1.238 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-2275 VULNERABLE (kernel) +CVE-2006-2274 VULNERABLE (kernel) CVE-2006-2272 VULNERABLE (kernel) CVE-2006-2271 VULNERABLE (kernel) CVE-2006-2224 VULNERABLE (quagga) #191085 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- fc5 9 May 2006 18:50:58 -0000 1.150 +++ fc5 10 May 2006 08:17:14 -0000 1.151 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-2275 VULNERABLE (kernel) +CVE-2006-2274 VULNERABLE (kernel) CVE-2006-2272 VULNERABLE (kernel) CVE-2006-2271 VULNERABLE (kernel) CVE-2006-2224 VULNERABLE (quagga) #191085 From fedora-extras-commits at redhat.com Wed May 10 08:18:57 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 10 May 2006 01:18:57 -0700 Subject: owners owners.list,1.970,1.971 Message-ID: <200605100819.k4A8J0pZ021187@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21170 Modified Files: owners.list Log Message: reassign scim-fcitx to qshen Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.970 retrieving revision 1.971 diff -u -r1.970 -r1.971 --- owners.list 9 May 2006 21:43:51 -0000 1.970 +++ owners.list 10 May 2006 08:18:57 -0000 1.971 @@ -1424,7 +1424,7 @@ Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|petersen at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|qshen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-input-pad|SCIM On-screen Input Pad|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scim-m17n|m17n-lib input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 10 08:20:49 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 10 May 2006 01:20:49 -0700 Subject: fedora-security/audit fc4,1.238,1.239 fc5,1.151,1.152 Message-ID: <200605100820.k4A8KnT6021213@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21193/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-2271, CVE-2006-2272, CVE-2006-2274 and CVE-2006-2275 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- fc4 10 May 2006 08:17:14 -0000 1.238 +++ fc4 10 May 2006 08:20:46 -0000 1.239 @@ -3,10 +3,10 @@ ** are items that need attention -CVE-2006-2275 VULNERABLE (kernel) -CVE-2006-2274 VULNERABLE (kernel) -CVE-2006-2272 VULNERABLE (kernel) -CVE-2006-2271 VULNERABLE (kernel) +CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2271 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- fc5 10 May 2006 08:17:14 -0000 1.151 +++ fc5 10 May 2006 08:20:46 -0000 1.152 @@ -3,10 +3,10 @@ ** are items that need attention -CVE-2006-2275 VULNERABLE (kernel) -CVE-2006-2274 VULNERABLE (kernel) -CVE-2006-2272 VULNERABLE (kernel) -CVE-2006-2271 VULNERABLE (kernel) +CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2271 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] From fedora-extras-commits at redhat.com Wed May 10 09:12:34 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 May 2006 02:12:34 -0700 Subject: rpms/gtkwave/devel gtkwave.spec, 1.11, 1.12 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Message-ID: <200605100912.k4A9Ca0I023650@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23629 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 3.0.2 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkwave.spec 9 May 2006 09:42:19 -0000 1.11 +++ gtkwave.spec 10 May 2006 09:12:33 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Wed May 10 2006 Paul Howarth 3.0.2-1 +- update to 3.0.2 + * Tue May 9 2006 Paul Howarth 3.0.1-1 - update to 3.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 May 2006 09:42:19 -0000 1.11 +++ sources 10 May 2006 09:12:33 -0000 1.12 @@ -1 +1 @@ -4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz +2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 May 2006 09:42:19 -0000 1.11 +++ .cvsignore 10 May 2006 09:12:33 -0000 1.12 @@ -1 +1 @@ -gtkwave-3.0.1.tgz +gtkwave-3.0.2.tgz From fedora-extras-commits at redhat.com Wed May 10 09:13:45 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 May 2006 02:13:45 -0700 Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.11, 1.12 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Message-ID: <200605100913.k4A9DlIF023725@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23704 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 3.0.2 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkwave.spec 9 May 2006 09:43:39 -0000 1.11 +++ gtkwave.spec 10 May 2006 09:13:45 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Wed May 10 2006 Paul Howarth 3.0.2-1 +- update to 3.0.2 + * Tue May 9 2006 Paul Howarth 3.0.1-1 - update to 3.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 May 2006 09:43:39 -0000 1.11 +++ sources 10 May 2006 09:13:45 -0000 1.12 @@ -1 +1 @@ -4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz +2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 May 2006 09:43:39 -0000 1.11 +++ .cvsignore 10 May 2006 09:13:45 -0000 1.12 @@ -1 +1 @@ -gtkwave-3.0.1.tgz +gtkwave-3.0.2.tgz From fedora-extras-commits at redhat.com Wed May 10 09:14:54 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 May 2006 02:14:54 -0700 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.10, 1.11 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Message-ID: <200605100914.k4A9EuuF023800@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23779 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 3.0.2 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkwave.spec 9 May 2006 09:44:48 -0000 1.10 +++ gtkwave.spec 10 May 2006 09:14:54 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Wed May 10 2006 Paul Howarth 3.0.2-1 +- update to 3.0.2 + * Tue May 9 2006 Paul Howarth 3.0.1-1 - update to 3.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 May 2006 09:44:48 -0000 1.11 +++ sources 10 May 2006 09:14:54 -0000 1.12 @@ -1 +1 @@ -4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz +2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 May 2006 09:44:48 -0000 1.11 +++ .cvsignore 10 May 2006 09:14:54 -0000 1.12 @@ -1 +1 @@ -gtkwave-3.0.1.tgz +gtkwave-3.0.2.tgz From fedora-extras-commits at redhat.com Wed May 10 09:16:03 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 May 2006 02:16:03 -0700 Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.9, 1.10 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 Message-ID: <200605100916.k4A9G5OM023878@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23857 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 3.0.2 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkwave.spec 9 May 2006 09:45:56 -0000 1.9 +++ gtkwave.spec 10 May 2006 09:16:03 -0000 1.10 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Wed May 10 2006 Paul Howarth 3.0.2-1 +- update to 3.0.2 + * Tue May 9 2006 Paul Howarth 3.0.1-1 - update to 3.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 9 May 2006 09:45:56 -0000 1.10 +++ sources 10 May 2006 09:16:03 -0000 1.11 @@ -1 +1 @@ -4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz +2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 9 May 2006 09:45:56 -0000 1.10 +++ .cvsignore 10 May 2006 09:16:03 -0000 1.11 @@ -1 +1 @@ -gtkwave-3.0.1.tgz +gtkwave-3.0.2.tgz From fedora-extras-commits at redhat.com Wed May 10 09:36:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 10 May 2006 02:36:50 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.17,1.18 Message-ID: <200605100936.k4A9aqef024086@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24069 Modified Files: php-eaccelerator.spec Log Message: Fix API version when defaulting. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- php-eaccelerator.spec 5 May 2006 13:57:59 -0000 1.17 +++ php-eaccelerator.spec 10 May 2006 09:36:50 -0000 1.18 @@ -7,7 +7,7 @@ %define prever beta2 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) -%define php_apiver %(echo %{default_apiver}; (php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) +%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} # This is the apache userid, only used for sysvipc semaphores which is the @@ -30,7 +30,7 @@ Conflicts: php-mmcache BuildRequires: php, php-devel # Required by phpize -BuildRequires: autoconf, automake, libtool, gcc-c++ +BuildRequires: autoconf, automake, libtool %description eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. From fedora-extras-commits at redhat.com Wed May 10 09:41:59 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 10 May 2006 02:41:59 -0700 Subject: rpms/php-eaccelerator/FC-4 .cvsignore, 1.3, 1.4 php-eaccelerator.spec, 1.7, 1.8 sources, 1.3, 1.4 eaccelerator-0.9.3-buffer-overflow.patch, 1.1, NONE Message-ID: <200605100942.k4A9g1K6024273@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24249 Modified Files: .cvsignore php-eaccelerator.spec sources Removed Files: eaccelerator-0.9.3-buffer-overflow.patch Log Message: Update to 0.9.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Jun 2005 09:01:03 -0000 1.3 +++ .cvsignore 10 May 2006 09:41:59 -0000 1.4 @@ -1 +1 @@ -eaccelerator-0.9.3.tar.gz +eaccelerator-0.9.4.tar.bz2 Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-4/php-eaccelerator.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php-eaccelerator.spec 17 Oct 2005 13:38:32 -0000 1.7 +++ php-eaccelerator.spec 10 May 2006 09:41:59 -0000 1.8 @@ -1,24 +1,23 @@ %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)} +%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.0.1)} -%define module_version 0.9.3 +%define module_version 0.9.4 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 4%{?dist} +Release: 1%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ -Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz -Patch: eaccelerator-0.9.3-buffer-overflow.patch +Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: php = %{php_version} +Requires: php >= %{php_version} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel # Required by phpize -BuildRequires: autoconf, automake, libtool, gcc-c++ +BuildRequires: autoconf, automake, libtool %description eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. @@ -28,18 +27,11 @@ %prep %setup -n eaccelerator-%{module_version} -%patch -p1 %build phpize %configure -# Set fcntl based semaphores to avoid ipc based locking issues on x86_64 -%ifarch x86_64 -%{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h -%{__perl} -pi -e 's|.*(MM_SEM_FCNTL).*|#define $1 1|g' config.h -%endif -# Compile! %{__make} %{?_smp_mflags} @@ -85,10 +77,17 @@ %doc eaccelerator.ini *.php %config(noreplace) %{_sysconfdir}/php.d/eaccelerator.ini %{php_extdir}/eaccelerator.so -%attr(0750, apache, apache) %{_localstatedir}/cache/php-eaccelerator +%attr(0750, apache, apache) %{_localstatedir}/cache/php-eaccelerator/ %changelog +* Tue Apr 11 2006 Matthias Saou 5.0.1_0.9.4-1 +- Update to 0.9.4. +- Remove no longer needed buffer overflow patch. +- Re-enable ipc based semaphores on x86_64. +- Don't switch to using PHP_API_VERSION requirement, since FC-4 PHP 5.0.1 + packages don't provide it unfortunately. + * Mon Oct 17 2005 Matthias Saou 4.x.x_0.9.3-4 - Re-add %%{?_smp_mflags}, as this was a false alarm. - Force SEM to FCNTL as the IPC version is buggy on x86_64 SMP at least. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Jun 2005 09:01:03 -0000 1.3 +++ sources 10 May 2006 09:41:59 -0000 1.4 @@ -1 +1 @@ -b17ddf953f18ee6df5c2c24ffccb37d9 eaccelerator-0.9.3.tar.gz +e9143a592b2b8e2e0f9aed2d00df03ce eaccelerator-0.9.4.tar.bz2 --- eaccelerator-0.9.3-buffer-overflow.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 10 10:03:22 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 10 May 2006 03:03:22 -0700 Subject: rpms/php-eaccelerator/FC-4 php-eaccelerator.spec,1.8,1.9 Message-ID: <200605101003.k4AA3O9G026620@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26603 Modified Files: php-eaccelerator.spec Log Message: Pass userid 48 to configure script on PPC for sysvipc semaphores. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-4/php-eaccelerator.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-eaccelerator.spec 10 May 2006 09:41:59 -0000 1.8 +++ php-eaccelerator.spec 10 May 2006 10:03:21 -0000 1.9 @@ -3,6 +3,10 @@ %define module_version 0.9.4 +# This is the apache userid, only used for sysvipc semaphores which is the +# default on ppc since spinlock is not detected +%define userid 48 + Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} @@ -31,7 +35,11 @@ %build phpize -%configure +%configure \ +%ifarch ppc + --with-eaccelerator-userid="%{userid}" +%endif + %{__make} %{?_smp_mflags} @@ -87,6 +95,7 @@ - Re-enable ipc based semaphores on x86_64. - Don't switch to using PHP_API_VERSION requirement, since FC-4 PHP 5.0.1 packages don't provide it unfortunately. +- Pass userid 48 to configure script on PPC for sysvipc semaphores. * Mon Oct 17 2005 Matthias Saou 4.x.x_0.9.3-4 - Re-add %%{?_smp_mflags}, as this was a false alarm. From fedora-extras-commits at redhat.com Wed May 10 11:29:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 10 May 2006 04:29:02 -0700 Subject: rpms/proftpd/devel proftpd.conf,1.5,1.6 proftpd.spec,1.15,1.16 Message-ID: <200605101129.k4ABT4W2029865@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29846 Modified Files: proftpd.conf proftpd.spec Log Message: Comment DSO loading in config and update TLS certs paths. Index: proftpd.conf =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- proftpd.conf 1 Aug 2005 15:17:49 -0000 1.5 +++ proftpd.conf 10 May 2006 11:29:02 -0000 1.6 @@ -77,14 +77,22 @@ # Explained at http://www.castaglia.org/proftpd/modules/mod_tls.html #TLSEngine on #TLSRequired on -#TLSRSACertificateFile /usr/share/ssl/certs/proftpd.pem -#TLSRSACertificateKeyFile /usr/share/ssl/certs/proftpd.pem +#TLSRSACertificateFile /etc/pki/tls/certs/proftpd.pem +#TLSRSACertificateKeyFile /etc/pki/tls/certs/proftpd.pem #TLSCipherSuite ALL:!ADH:!DES #TLSOptions NoCertRequest #TLSVerifyClient off ##TLSRenegotiate ctrl 3600 data 512000 required off timeout 300 #TLSLog /var/log/proftpd/tls.log +# SQL authentication Dynamic Shared Object (DSO) loading +# See README.DSO and howto/DSO.html for more details. +# +# LoadModule mod_sql.c +# LoadModule mod_sql_mysql.c +# LoadModule mod_sql_postgres.c +# + # A basic anonymous configuration, with an upload directory. # # User ftp Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- proftpd.spec 28 Apr 2006 09:23:46 -0000 1.15 +++ proftpd.spec 10 May 2006 11:29:02 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -179,6 +179,10 @@ %changelog +* Wed May 10 2006 Matthias Saou 1.3.0-3 +- Add commented section about DSO loading to the default proftpd.conf. +- Update TLS cert paths in the default proftpd.conf to /etc/pki/tls. + * Fri Apr 28 2006 Matthias Saou 1.3.0-2 - Mark pam.d and logrotate.d config files as noreplace. - Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary From fedora-extras-commits at redhat.com Wed May 10 11:53:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 04:53:21 -0700 Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.8, 1.9 perl-Config-Tiny.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200605101153.k4ABrNgP030039@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30018 Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Updated to 2.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Apr 2006 21:07:39 -0000 1.8 +++ .cvsignore 10 May 2006 11:53:21 -0000 1.9 @@ -1 +1 @@ -Config-Tiny-2.06.tar.gz +Config-Tiny-2.07.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Config-Tiny.spec 22 Apr 2006 21:07:39 -0000 1.13 +++ perl-Config-Tiny.spec 10 May 2006 11:53:21 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-Config-Tiny -Version: 2.06 +Version: 2.07 Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files @@ -54,6 +54,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 2.07-1 +- Updated to 2.07. + * Sat Apr 22 2006 Jose Pedro Oliveira - 2.06-1 - Updated to 2.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Apr 2006 21:07:39 -0000 1.8 +++ sources 10 May 2006 11:53:21 -0000 1.9 @@ -1 +1 @@ -40b5ce184ee6307b5a9ce1f588f824d6 Config-Tiny-2.06.tar.gz +19cb3091a01baed531ac2dc7d7eee629 Config-Tiny-2.07.tar.gz From fedora-extras-commits at redhat.com Wed May 10 12:00:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 05:00:04 -0700 Subject: rpms/perl-PPI/devel .cvsignore, 1.2, 1.3 perl-PPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605101200.k4AC063T030147@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30121 Modified Files: .cvsignore perl-PPI.spec sources Log Message: Update to 1.113. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 May 2006 12:38:07 -0000 1.2 +++ .cvsignore 10 May 2006 12:00:03 -0000 1.3 @@ -1 +1 @@ -PPI-1.112.tar.gz +PPI-1.113.tar.gz Index: perl-PPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/perl-PPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-PPI.spec 2 May 2006 12:38:07 -0000 1.1 +++ perl-PPI.spec 10 May 2006 12:00:03 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-PPI -Version: 1.112 +Version: 1.113 Release: 1%{?dist} Summary: Parse, Analyze and Manipulate Perl @@ -61,6 +61,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 1.113-1 +- Update to 1.113. + * Tue Apr 25 2006 Jose Pedro Oliveira - 1.112-1 - Update to 1.112. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 May 2006 12:38:07 -0000 1.2 +++ sources 10 May 2006 12:00:03 -0000 1.3 @@ -1 +1 @@ -a629d953e0002813061c4308c64993f6 PPI-1.112.tar.gz +8e06ad1a96244618fbebdd346791067c PPI-1.113.tar.gz From fedora-extras-commits at redhat.com Wed May 10 13:48:47 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 10 May 2006 06:48:47 -0700 Subject: CVSROOT avail,1.33,1.34 Message-ID: <200605101348.k4ADmlwk002630@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2612 Modified Files: avail Log Message: Add David Eisenstein to the fedora security group. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- avail 9 May 2006 21:55:44 -0000 1.33 +++ avail 10 May 2006 13:48:44 -0000 1.34 @@ -46,9 +46,9 @@ # Red Hat Security Response Team avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security # Fedora Security Response Team -avail | jkeating,ausil,tibbs,kaboom,scop | fedora-security -unavail | jkeating,ausil,tibbs,kaboom,scop | fedora-security/audit/fc4 -unavail | jkeating,ausil,tibbs,kaboom,scop | fedora-security/audit/fc5 +avail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security +unavail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security/audit/fc4 +unavail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security/audit/fc5 avail | pfrields | web/html/projects/docs avail | pfrields | web/html/participate/documentation-faq From fedora-extras-commits at redhat.com Wed May 10 14:28:14 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 10 May 2006 07:28:14 -0700 Subject: extras-buildsys ChangeLog,1.192,1.193 Message-ID: <200605101428.k4AESEqP005135@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5103 Modified Files: ChangeLog Log Message: 2006-05-10 Dan Williams * builder/Builder.py - (Builder::__init__): print out build arches on start * builder/main.py - pylint cleanups - (drop_privs): use Exceptions rather than return; and ensure that, if we aren't running as root, that we are running as who the user configured us to run as in the config file Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- ChangeLog 9 May 2006 19:10:50 -0000 1.192 +++ ChangeLog 10 May 2006 14:28:12 -0000 1.193 @@ -1,3 +1,14 @@ +2006-05-10 Dan Williams + + * builder/Builder.py + - (Builder::__init__): print out build arches on start + + * builder/main.py + - pylint cleanups + - (drop_privs): use Exceptions rather than return; and ensure that, if + we aren't running as root, that we are running as who the user + configured us to run as in the config file + 2006-05-09 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Wed May 10 14:28:15 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 10 May 2006 07:28:15 -0700 Subject: extras-buildsys/builder Builder.py,1.6,1.7 main.py,1.1,1.2 Message-ID: <200605101428.k4AESFCu005142@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5103/builder Modified Files: Builder.py main.py Log Message: 2006-05-10 Dan Williams * builder/Builder.py - (Builder::__init__): print out build arches on start * builder/main.py - pylint cleanups - (drop_privs): use Exceptions rather than return; and ensure that, if we aren't running as root, that we are running as who the user configured us to run as in the config file 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 9 May 2006 19:10:51 -0000 1.6 +++ Builder.py 10 May 2006 14:28:12 -0000 1.7 @@ -21,6 +21,7 @@ import time import threading import urllib +import string import xmlrpclib import OpenSSL from plague import Commands @@ -68,7 +69,6 @@ """ Abstract builder base object """ def __init__(self, cfg): self._cfg = cfg - self._certs = None self._max_slots = determine_max_jobs(cfg) self._seq_gen = Commands.SequenceGenerator() @@ -76,6 +76,7 @@ self._building_jobs = [] self._all_jobs = {} + self._certs = None if cfg.get_bool("SSL", "use_ssl"): hostname = get_hostname(self._cfg, False) key_file = os.path.join(cfg.get_str("SSL", "builder_key_and_cert_dir"), "%s.pem" % hostname) @@ -84,6 +85,13 @@ self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") self._certs['peer_ca_cert'] = self._certs['ca_cert'] + build_arches = [] + for target in self._cfg.targets(): + for arch in target.arches(): + if not arch in build_arches: + build_arches.append(arch) + self._log("Available architectures: [%s]" % string.join(build_arches, ", ")) + def _log(self, string): if self._cfg.get_bool("General", "debug"): log(string) @@ -319,7 +327,7 @@ self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs) self._http_server.start() - self._log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) + self._log("Binding to address '%s'\n" % hostname) xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port") try: if cfg.get_bool("SSL", "use_ssl") == True: Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/main.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- main.py 28 Apr 2006 03:17:35 -0000 1.1 +++ main.py 10 May 2006 14:28:12 -0000 1.2 @@ -37,57 +37,61 @@ def drop_privs(user): - """ - We can't and shouldn't run mock as root, so we drop privs. - We have to run the HTTP server as root though so it can chroot - to the fileserver directory. - """ - - if os.getuid() != 0: - return + """Drop privileges, since we don't need to run as a privileged + user after we've started up.""" import pwd import grp - eu = user + effective_user = user try: - uid = int(eu) + uid = int(effective_user) except ValueError: try: - pwrec = pwd.getpwnam(eu) + pwrec = pwd.getpwnam(effective_user) except KeyError: - print "Username '%s' does not exist." % eu - return -1 + raise Exception("Username '%s' does not exist." % effective_user) uid = pwrec[2] else: try: pwrec = pwd.getpwuid(uid) except KeyError: - print "User ID %d doesn't exist." % uid - return -1 + raise Exception("User ID %d doesn't exist." % uid) gid = pwrec[3] if uid == 0: - print "You cannot use the superuser as the 'builder_user' option." - return -1 + raise Exception("You cannot use the superuser as the 'builder_user' option.") + + # If we're already not running as root, ensure that who we are running as + # matches what the admin configured in the config file + cur_uid = os.getuid() + if cur_uid != 0: + if cur_uid != uid: + try: + cur_nam = pwd.getpwuid(cur_uid)[0] + except KeyError: + cur_nam = str(cur_uid) + uid_nam = pwd.getpwuid(uid)[0] + raise Exception("Attempting to run as '%s', but configured for" \ + " '%s'" % (cur_nam, uid_nam)) + # Otherwise, we're already running as the requested + # user and we don't need to do anything else + return # 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 + raise Exception("The 'mock' group doesn't exist in the groups file.") 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 + raise Exception("Error dropping group privileges. '%s'" % sys.exc_info()) os.setuid(uid) - return 0 def determine_build_arches(cfg): @@ -118,14 +122,12 @@ builder = None -def exit_handler(signum, frame): +def exit_handler(signum=0, frame=0): global builder log("Received SIGTERM, quitting...\n") builder.stop() def main(): - global builder - usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -160,21 +162,21 @@ sys.exit(1) if opts.daemon: - ret=daemonize.createDaemon() + ret = daemonize.createDaemon() if ret: log("Daemonizing failed!\n") sys.exit(2) if opts.pidfile: - f = open(opts.pidfile, 'w', 1) - f.write('%d\n' % os.getpid()) - f.flush() - f.close() + pidf = open(opts.pidfile, 'w', 1) + pidf.write('%d\n' % os.getpid()) + pidf.flush() + pidf.close() if opts.logfile: - logf=open(opts.logfile, 'a') - sys.stdout=logf - sys.stderr=logf + logf = open(opts.logfile, 'a') + sys.stdout = logf + sys.stderr = logf work_dir = cfg.get_str("Directories", "builder_work_dir") if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): @@ -182,13 +184,16 @@ os._exit(1) # Stop running as root - if drop_privs(cfg.get_str("General", "builder_user")) == -1: - builder.cleanup() + try: + drop_privs(cfg.get_str("General", "builder_user")) + except Exception, exc: + log("Couldn't drop privileges: %s\n" % exc) os._exit(1) # Set up our termination handler signal.signal(signal.SIGTERM, exit_handler) + global builder builder = Builder.Builder.new_builder(cfg, btype) # Start doing stuff From fedora-extras-commits at redhat.com Wed May 10 14:30:07 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 10 May 2006 07:30:07 -0700 Subject: extras-buildsys/server .cvsignore,1.1,1.2 Message-ID: <200605101430.k4AEU7d2005200@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5179 Modified Files: .cvsignore Log Message: Update cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jun 2005 12:53:37 -0000 1.1 +++ .cvsignore 10 May 2006 14:30:04 -0000 1.2 @@ -1,7 +1,13 @@ BuildJob.pyc BuildMaster.pyc -client_manager.pyc -CONFIG.pyc Repo.pyc UserInterface.pyc User.pyc +ArchJob.pyc +Builder.pyc +BuilderManager.pyc +Config.pyc +DBManager.pyc +EmailUtils.pyc +PackageJob.pyc + From fedora-extras-commits at redhat.com Wed May 10 14:31:08 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 10 May 2006 07:31:08 -0700 Subject: extras-buildsys/builder .cvsignore,NONE,1.1 Message-ID: <200605101431.k4AEV8NO005244@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5226 Added Files: .cvsignore Log Message: Add cvsignore --- NEW FILE .cvsignore --- Builder.pyc BuilderMock.pyc Config.pyc From fedora-extras-commits at redhat.com Wed May 10 14:40:28 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 07:40:28 -0700 Subject: rpms/htop/devel .cvsignore, 1.3, 1.4 htop.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605101440.k4AEeUnr005328@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5307 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Dec 2005 20:00:37 -0000 1.3 +++ .cvsignore 10 May 2006 14:40:27 -0000 1.4 @@ -1 +1 @@ -htop-0.6.tar.gz +htop-0.6.1.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- htop.spec 14 Feb 2006 09:58:11 -0000 1.4 +++ htop.spec 10 May 2006 14:40:27 -0000 1.5 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6 -Release: 3%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -29,6 +29,14 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor fedora \ + --add-category X-Fedora \ + --add-category Application \ + --delete-original \ + %{buildroot}%{_datadir}/applications/htop.desktop + %clean rm -rf %{buildroot} @@ -36,12 +44,17 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README TODO +%doc COPYING ChangeLog README %{_bindir}/htop +%{_datadir}/applications/*htop.desktop +%{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 +- Update to 0.6.1 + * Tue Feb 14 2006 Dawid Gajownik - 0.6-3 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Dec 2005 22:28:28 -0000 1.4 +++ sources 10 May 2006 14:40:27 -0000 1.5 @@ -1 +1 @@ -c00b1dba101569a055ed260e06a25596 htop-0.6.tar.gz +f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 10 14:42:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 07:42:23 -0700 Subject: rpms/htop/FC-5 .cvsignore, 1.3, 1.4 htop.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605101442.k4AEgPsq005409@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5388 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Dec 2005 20:00:37 -0000 1.3 +++ .cvsignore 10 May 2006 14:42:23 -0000 1.4 @@ -1 +1 @@ -htop-0.6.tar.gz +htop-0.6.1.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/htop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- htop.spec 14 Feb 2006 09:58:11 -0000 1.4 +++ htop.spec 10 May 2006 14:42:23 -0000 1.5 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6 -Release: 3%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -29,6 +29,14 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor fedora \ + --add-category X-Fedora \ + --add-category Application \ + --delete-original \ + %{buildroot}%{_datadir}/applications/htop.desktop + %clean rm -rf %{buildroot} @@ -36,12 +44,17 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README TODO +%doc COPYING ChangeLog README %{_bindir}/htop +%{_datadir}/applications/*htop.desktop +%{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 +- Update to 0.6.1 + * Tue Feb 14 2006 Dawid Gajownik - 0.6-3 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Dec 2005 22:28:28 -0000 1.4 +++ sources 10 May 2006 14:42:23 -0000 1.5 @@ -1 +1 @@ -c00b1dba101569a055ed260e06a25596 htop-0.6.tar.gz +f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 10 14:49:10 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 07:49:10 -0700 Subject: rpms/htop/FC-4 .cvsignore, 1.3, 1.4 htop.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605101449.k4AEnCCG005483@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5462 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Dec 2005 20:00:31 -0000 1.3 +++ .cvsignore 10 May 2006 14:49:10 -0000 1.4 @@ -1 +1 @@ -htop-0.6.tar.gz +htop-0.6.1.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- htop.spec 28 Dec 2005 22:28:22 -0000 1.3 +++ htop.spec 10 May 2006 14:49:10 -0000 1.4 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6 -Release: 2%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -29,6 +29,14 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor fedora \ + --add-category X-Fedora \ + --add-category Application \ + --delete-original \ + %{buildroot}%{_datadir}/applications/htop.desktop + %clean rm -rf %{buildroot} @@ -36,12 +44,17 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README TODO +%doc COPYING ChangeLog README %{_bindir}/htop +%{_datadir}/applications/*htop.desktop +%{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 +- Update to 0.6.1 + * Wed Dec 28 2005 Dawid Gajownik - 0.6-2 - Rebuild with updated tarball Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Dec 2005 22:28:22 -0000 1.4 +++ sources 10 May 2006 14:49:10 -0000 1.5 @@ -1 +1 @@ -c00b1dba101569a055ed260e06a25596 htop-0.6.tar.gz +f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 10 15:03:57 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 08:03:57 -0700 Subject: rpms/htop/devel htop.spec,1.5,1.6 Message-ID: <200605101503.k4AF3x3s007856@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7834 Modified Files: htop.spec Log Message: Add missing BR: desktop-file-utils Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- htop.spec 10 May 2006 14:40:27 -0000 1.5 +++ htop.spec 10 May 2006 15:03:57 -0000 1.6 @@ -1,6 +1,6 @@ Name: htop Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils BuildRequires: ncurses-devel %description @@ -52,6 +53,9 @@ %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 +- Add missing BR: desktop-file-utils + * Wed May 10 2006 Dawid Gajownik - 0.6.1-1 - Update to 0.6.1 From fedora-extras-commits at redhat.com Wed May 10 15:05:34 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 08:05:34 -0700 Subject: rpms/htop/FC-5 htop.spec,1.5,1.6 Message-ID: <200605101505.k4AF5aof007913@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7896 Modified Files: htop.spec Log Message: Add missing BR: desktop-file-utils Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/htop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- htop.spec 10 May 2006 14:42:23 -0000 1.5 +++ htop.spec 10 May 2006 15:05:34 -0000 1.6 @@ -1,6 +1,6 @@ Name: htop Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils BuildRequires: ncurses-devel %description @@ -52,6 +53,9 @@ %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 +- Add missing BR: desktop-file-utils + * Wed May 10 2006 Dawid Gajownik - 0.6.1-1 - Update to 0.6.1 From fedora-extras-commits at redhat.com Wed May 10 15:06:57 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 08:06:57 -0700 Subject: rpms/htop/FC-4 htop.spec,1.4,1.5 Message-ID: <200605101506.k4AF6xiO007979@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7962 Modified Files: htop.spec Log Message: Add missing BR: desktop-file-utils Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- htop.spec 10 May 2006 14:49:10 -0000 1.4 +++ htop.spec 10 May 2006 15:06:57 -0000 1.5 @@ -1,6 +1,6 @@ Name: htop Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils BuildRequires: ncurses-devel %description @@ -52,6 +53,9 @@ %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 +- Add missing BR: desktop-file-utils + * Wed May 10 2006 Dawid Gajownik - 0.6.1-1 - Update to 0.6.1 From fedora-extras-commits at redhat.com Wed May 10 15:13:10 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 10 May 2006 08:13:10 -0700 Subject: extras-buildsys/utils extras-push-new,1.4,1.5 Message-ID: <200605101513.k4AFDAvb008098@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8047 Modified Files: extras-push-new Log Message: - sync twice: before and after running repoview (which takes so long) - use splitlines() when reading the pkglist file and be more explicit about which error conditions are harmless - add option -f (=force) which re-runs repobuild/repoview for all dists - update SYNTAX help - update group check message Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extras-push-new 6 May 2006 23:38:31 -0000 1.4 +++ extras-push-new 10 May 2006 15:13:08 -0000 1.5 @@ -51,7 +51,9 @@ 'repoclosure' : False, 'gidcheck' : True, 'setumask' : True, - 'mail' : True + 'mail' : True, + 'doublesync' : True, + 'force' : False } alldists = [ 'development', '5', '4', '3' ] @@ -132,15 +134,12 @@ def getlinesfromrunfile(dist): runfilename = getrunfilename(dist) pkglist = [] - if os.path.isfile(runfilename): - try: - rundirfile = open(runfilename,'r') - for line in rundirfile: - pkglist.append( line.rstrip() ) - rundirfile.close() - except IOError: - print 'ERROR: Could not open %s' % runfilename - sys.exit(5) + try: + pkglist = file(runfilename).read().splitlines() + except IOError, (errno, strerr): + if errno != 2: # everything but file_not_found is unexpected + print 'ERROR: %s: %s' % (strerr,runfilename) + sys.exit(errno) return pkglist @@ -199,6 +198,7 @@ filedict[which].append(fullfile) return filedict + def naevr(pkg): """return nevra from the package srpm""" @@ -416,14 +416,18 @@ if __name__ == '__main__': if config['gidcheck']: if os.getgid() != signersgid: - print 'ERROR: Change into extras_signers group!' + print 'ERROR: Change into extras_signers group before running this! Use "newgrp extras_signers".' sys.exit(13) if config['setumask']: os.umask(0002) + + if '-f' in sys.argv[1:]: + sys.argv.remove('-f') + config['force'] = True if len(sys.argv) < 2: - print 'SYNTAX: %s [dist]...' % sys.argv[0] + print 'SYNTAX: %s [dist]...' % sys.argv[0] sys.exit(22) dists = [] # the list of distribution release we want to push @@ -455,15 +459,26 @@ if result and result != 4: # 4 = no packages to sign sys.exit(result) - for dist in dists: - # Process all dists for which we find a run-file which contains >= 1 pkg names. - pkglist = getlinesfromrunfile(dist) - if len(pkglist): + # Option -f re-runs repobuild/repoview for all dists, even if + # no new packages have been pushed for a dist. + changed = dists + if config['force']: + changed = alldists + + # len(getlinesfromrunfile(dist)) is the number of packages + # per dist which have been pushed. + + for dist in changed: + if config['force'] or len( getlinesfromrunfile(dist) ): run_and_check('extras-repobuild.py %s' % dist) + + if config['doublesync']: + run_and_check('extras-sync') + + for dist in changed: + if config['force'] or len( getlinesfromrunfile(dist) ): if config['repoview']: run_and_check('extras-repoview.py %s' % dist) - if config['repoclosure']: - pass run_and_check('extras-sync') From fedora-extras-commits at redhat.com Wed May 10 15:13:45 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Wed, 10 May 2006 08:13:45 -0700 Subject: rpms/par2cmdline/devel par2cmdline-Makefile.am.patch, NONE, 1.1 par2cmdline.spec, 1.2, 1.3 Message-ID: <200605101513.k4AFDl3v008162@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8102/devel Modified Files: par2cmdline.spec Added Files: par2cmdline-Makefile.am.patch Log Message: - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 par2cmdline-Makefile.am.patch: --- NEW FILE par2cmdline-Makefile.am.patch --- diff -ur par2cmdline-0.4/aclocal.m4 par2cmdline-0.4-new/aclocal.m4 --- par2cmdline-0.4/aclocal.m4 2004-04-12 18:44:05.000000000 +0200 +++ par2cmdline-0.4-new/aclocal.m4 2006-05-10 16:50:02.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,55 +11,32 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.3])]) - -# AM_AUX_DIR_EXPAND + [AM_AUTOMAKE_VERSION([1.9.6])]) -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -106,26 +83,16 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -145,30 +112,19 @@ fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) fi])]) -# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -177,7 +133,6 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -266,9 +221,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -312,26 +272,16 @@ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# 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. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -#serial 2 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -350,27 +300,21 @@ else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -396,54 +340,31 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# serial 12 -# serial 11 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -501,7 +422,6 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -510,7 +430,9 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl - +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], @@ -544,51 +466,27 @@ done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. @@ -603,26 +501,15 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Check to see how 'make' treats includes. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # AM_MAKE_INCLUDE() # ----------------- @@ -666,27 +553,16 @@ rm -f confinc confmf ]) -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -712,27 +588,16 @@ fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -753,13 +618,21 @@ # this.) AC_DEFUN([AM_PROG_MKDIR_P], [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -778,26 +651,15 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -822,28 +684,16 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# 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. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -886,25 +736,14 @@ fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -925,3 +764,99 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + Only in par2cmdline-0.4-new: autom4te.cache diff -ur par2cmdline-0.4/configure par2cmdline-0.4-new/configure --- par2cmdline-0.4/configure 2004-04-12 18:44:22.000000000 +0200 +++ par2cmdline-0.4-new/configure 2006-05-10 16:52:42.000000000 +0200 @@ -311,7 +311,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1409,7 +1409,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version="1.8" +am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1561,13 +1561,21 @@ fi if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -1711,9 +1719,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1806,6 +1811,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2503,9 +2515,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CXX_dependencies_compiler_type=$depmode break fi @@ -3417,9 +3434,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -6969,7 +6991,6 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t -s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t @@ -6978,6 +6999,9 @@ s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t s, at am__leading_dot@,$am__leading_dot,;t t +s, at AMTAR@,$AMTAR,;t t +s, at am__tar@,$am__tar,;t t +s, at am__untar@,$am__untar,;t t s, at CXX@,$CXX,;t t s, at CXXFLAGS@,$CXXFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -7630,27 +7654,21 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue diff -ur par2cmdline-0.4/Makefile.am par2cmdline-0.4-new/Makefile.am --- par2cmdline-0.4/Makefile.am 2004-04-12 18:40:40.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.am 2006-05-10 16:48:51.000000000 +0200 @@ -45,7 +45,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ diff -ur par2cmdline-0.4/Makefile.in par2cmdline-0.4-new/Makefile.in --- par2cmdline-0.4/Makefile.in 2004-04-12 18:44:18.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.in 2006-05-10 16:50:16.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(par2_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -36,6 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = par2$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -69,31 +68,9 @@ verificationpacket.$(OBJEXT) par2_OBJECTS = $(am_par2_OBJECTS) par2_LDADD = $(LDADD) -par2_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles - at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commandline.Po ./$(DEPDIR)/crc.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/creatorpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/criticalpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/datablock.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/descriptionpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/diskfile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/filechecksummer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/galois.Po ./$(DEPDIR)/mainpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/par1fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2cmdline.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creator.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creatorsourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/recoverypacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/reedsolomon.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationhashtable.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationpacket.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -173,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -227,7 +206,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ testdata.tar.gz pretest test1 test2 test3 test4 test5 test6 \ @@ -353,16 +331,14 @@ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -386,9 +362,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -467,20 +445,20 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi @@ -521,15 +499,15 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) dist-shar: distdir @@ -542,7 +520,7 @@ $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -551,13 +529,13 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -639,7 +617,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -707,12 +685,12 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am + install-exec-am install-exec-hook install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-hook uninstall-info-am install-exec-hook : Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/par2cmdline.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- par2cmdline.spec 9 May 2006 09:50:16 -0000 1.2 +++ par2cmdline.spec 10 May 2006 15:13:45 -0000 1.3 @@ -1,12 +1,13 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch Patch1: par2cmdline-packed.patch +Patch2: par2cmdline-Makefile.am.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 @@ -23,6 +24,9 @@ %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +# fix end-of-lines of several files sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build @@ -42,10 +46,14 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog PORTING README ROADMAP +%doc AUTHORS COPYING ChangeLog README %{_bindir}/* %changelog +* Wed May 10 2006 Laurent Rineau - 0.4-9 +- Remove PORTING and ROADMAP from doc files. +- Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 + * Tue May 9 2006 Laurent Rineau - 0.4-8 - Added a new patch, to kill warnings, and try to fix ppc compilation error. From fedora-extras-commits at redhat.com Wed May 10 15:13:39 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Wed, 10 May 2006 08:13:39 -0700 Subject: rpms/par2cmdline/FC-4 par2cmdline-Makefile.am.patch, NONE, 1.1 par2cmdline.spec, 1.2, 1.3 Message-ID: <200605101514.k4AFEBpf008171@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8102/FC-4 Modified Files: par2cmdline.spec Added Files: par2cmdline-Makefile.am.patch Log Message: - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 par2cmdline-Makefile.am.patch: --- NEW FILE par2cmdline-Makefile.am.patch --- diff -ur par2cmdline-0.4/aclocal.m4 par2cmdline-0.4-new/aclocal.m4 --- par2cmdline-0.4/aclocal.m4 2004-04-12 18:44:05.000000000 +0200 +++ par2cmdline-0.4-new/aclocal.m4 2006-05-10 16:50:02.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,55 +11,32 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.3])]) - -# AM_AUX_DIR_EXPAND + [AM_AUTOMAKE_VERSION([1.9.6])]) -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -106,26 +83,16 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -145,30 +112,19 @@ fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) fi])]) -# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -177,7 +133,6 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -266,9 +221,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -312,26 +272,16 @@ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# 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. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -#serial 2 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -350,27 +300,21 @@ else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -396,54 +340,31 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# serial 12 -# serial 11 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -501,7 +422,6 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -510,7 +430,9 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl - +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], @@ -544,51 +466,27 @@ done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. @@ -603,26 +501,15 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Check to see how 'make' treats includes. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # AM_MAKE_INCLUDE() # ----------------- @@ -666,27 +553,16 @@ rm -f confinc confmf ]) -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -712,27 +588,16 @@ fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -753,13 +618,21 @@ # this.) AC_DEFUN([AM_PROG_MKDIR_P], [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -778,26 +651,15 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -822,28 +684,16 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# 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. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -886,25 +736,14 @@ fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -925,3 +764,99 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + Only in par2cmdline-0.4-new: autom4te.cache diff -ur par2cmdline-0.4/configure par2cmdline-0.4-new/configure --- par2cmdline-0.4/configure 2004-04-12 18:44:22.000000000 +0200 +++ par2cmdline-0.4-new/configure 2006-05-10 16:52:42.000000000 +0200 @@ -311,7 +311,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1409,7 +1409,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version="1.8" +am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1561,13 +1561,21 @@ fi if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -1711,9 +1719,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1806,6 +1811,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2503,9 +2515,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CXX_dependencies_compiler_type=$depmode break fi @@ -3417,9 +3434,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -6969,7 +6991,6 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t -s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t @@ -6978,6 +6999,9 @@ s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t s, at am__leading_dot@,$am__leading_dot,;t t +s, at AMTAR@,$AMTAR,;t t +s, at am__tar@,$am__tar,;t t +s, at am__untar@,$am__untar,;t t s, at CXX@,$CXX,;t t s, at CXXFLAGS@,$CXXFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -7630,27 +7654,21 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue diff -ur par2cmdline-0.4/Makefile.am par2cmdline-0.4-new/Makefile.am --- par2cmdline-0.4/Makefile.am 2004-04-12 18:40:40.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.am 2006-05-10 16:48:51.000000000 +0200 @@ -45,7 +45,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ diff -ur par2cmdline-0.4/Makefile.in par2cmdline-0.4-new/Makefile.in --- par2cmdline-0.4/Makefile.in 2004-04-12 18:44:18.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.in 2006-05-10 16:50:16.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(par2_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -36,6 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = par2$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -69,31 +68,9 @@ verificationpacket.$(OBJEXT) par2_OBJECTS = $(am_par2_OBJECTS) par2_LDADD = $(LDADD) -par2_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles - at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commandline.Po ./$(DEPDIR)/crc.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/creatorpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/criticalpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/datablock.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/descriptionpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/diskfile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/filechecksummer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/galois.Po ./$(DEPDIR)/mainpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/par1fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2cmdline.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creator.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creatorsourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/recoverypacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/reedsolomon.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationhashtable.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationpacket.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -173,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -227,7 +206,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ testdata.tar.gz pretest test1 test2 test3 test4 test5 test6 \ @@ -353,16 +331,14 @@ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -386,9 +362,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -467,20 +445,20 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi @@ -521,15 +499,15 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) dist-shar: distdir @@ -542,7 +520,7 @@ $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -551,13 +529,13 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -639,7 +617,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -707,12 +685,12 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am + install-exec-am install-exec-hook install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-hook uninstall-info-am install-exec-hook : Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/FC-4/par2cmdline.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- par2cmdline.spec 9 May 2006 09:50:16 -0000 1.2 +++ par2cmdline.spec 10 May 2006 15:13:39 -0000 1.3 @@ -1,12 +1,13 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch Patch1: par2cmdline-packed.patch +Patch2: par2cmdline-Makefile.am.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 @@ -23,6 +24,9 @@ %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +# fix end-of-lines of several files sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build @@ -42,10 +46,14 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog PORTING README ROADMAP +%doc AUTHORS COPYING ChangeLog README %{_bindir}/* %changelog +* Wed May 10 2006 Laurent Rineau - 0.4-9 +- Remove PORTING and ROADMAP from doc files. +- Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 + * Tue May 9 2006 Laurent Rineau - 0.4-8 - Added a new patch, to kill warnings, and try to fix ppc compilation error. From fedora-extras-commits at redhat.com Wed May 10 15:13:39 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Wed, 10 May 2006 08:13:39 -0700 Subject: rpms/par2cmdline/FC-5 par2cmdline-Makefile.am.patch, NONE, 1.1 par2cmdline.spec, 1.2, 1.3 Message-ID: <200605101514.k4AFEBtW008174@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8102/FC-5 Modified Files: par2cmdline.spec Added Files: par2cmdline-Makefile.am.patch Log Message: - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 par2cmdline-Makefile.am.patch: --- NEW FILE par2cmdline-Makefile.am.patch --- diff -ur par2cmdline-0.4/aclocal.m4 par2cmdline-0.4-new/aclocal.m4 --- par2cmdline-0.4/aclocal.m4 2004-04-12 18:44:05.000000000 +0200 +++ par2cmdline-0.4-new/aclocal.m4 2006-05-10 16:50:02.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,55 +11,32 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.3])]) - -# AM_AUX_DIR_EXPAND + [AM_AUTOMAKE_VERSION([1.9.6])]) -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -106,26 +83,16 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -145,30 +112,19 @@ fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) fi])]) -# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -177,7 +133,6 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -266,9 +221,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -312,26 +272,16 @@ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# 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. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -#serial 2 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -350,27 +300,21 @@ else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -396,54 +340,31 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# serial 12 -# serial 11 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -501,7 +422,6 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -510,7 +430,9 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl - +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], @@ -544,51 +466,27 @@ done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. @@ -603,26 +501,15 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Check to see how 'make' treats includes. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # AM_MAKE_INCLUDE() # ----------------- @@ -666,27 +553,16 @@ rm -f confinc confmf ]) -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -712,27 +588,16 @@ fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -753,13 +618,21 @@ # this.) AC_DEFUN([AM_PROG_MKDIR_P], [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -778,26 +651,15 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -822,28 +684,16 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# 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. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -886,25 +736,14 @@ fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -925,3 +764,99 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + Only in par2cmdline-0.4-new: autom4te.cache diff -ur par2cmdline-0.4/configure par2cmdline-0.4-new/configure --- par2cmdline-0.4/configure 2004-04-12 18:44:22.000000000 +0200 +++ par2cmdline-0.4-new/configure 2006-05-10 16:52:42.000000000 +0200 @@ -311,7 +311,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1409,7 +1409,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version="1.8" +am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1561,13 +1561,21 @@ fi if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -1711,9 +1719,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1806,6 +1811,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2503,9 +2515,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CXX_dependencies_compiler_type=$depmode break fi @@ -3417,9 +3434,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -6969,7 +6991,6 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t -s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t @@ -6978,6 +6999,9 @@ s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t s, at am__leading_dot@,$am__leading_dot,;t t +s, at AMTAR@,$AMTAR,;t t +s, at am__tar@,$am__tar,;t t +s, at am__untar@,$am__untar,;t t s, at CXX@,$CXX,;t t s, at CXXFLAGS@,$CXXFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -7630,27 +7654,21 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue diff -ur par2cmdline-0.4/Makefile.am par2cmdline-0.4-new/Makefile.am --- par2cmdline-0.4/Makefile.am 2004-04-12 18:40:40.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.am 2006-05-10 16:48:51.000000000 +0200 @@ -45,7 +45,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ diff -ur par2cmdline-0.4/Makefile.in par2cmdline-0.4-new/Makefile.in --- par2cmdline-0.4/Makefile.in 2004-04-12 18:44:18.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.in 2006-05-10 16:50:16.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(par2_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -36,6 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = par2$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -69,31 +68,9 @@ verificationpacket.$(OBJEXT) par2_OBJECTS = $(am_par2_OBJECTS) par2_LDADD = $(LDADD) -par2_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles - at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commandline.Po ./$(DEPDIR)/crc.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/creatorpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/criticalpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/datablock.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/descriptionpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/diskfile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/filechecksummer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/galois.Po ./$(DEPDIR)/mainpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/par1fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2cmdline.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creator.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creatorsourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/recoverypacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/reedsolomon.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationhashtable.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationpacket.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -173,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -227,7 +206,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ testdata.tar.gz pretest test1 test2 test3 test4 test5 test6 \ @@ -353,16 +331,14 @@ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -386,9 +362,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -467,20 +445,20 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi @@ -521,15 +499,15 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) dist-shar: distdir @@ -542,7 +520,7 @@ $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -551,13 +529,13 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -639,7 +617,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -707,12 +685,12 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am + install-exec-am install-exec-hook install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-hook uninstall-info-am install-exec-hook : Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/FC-5/par2cmdline.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- par2cmdline.spec 9 May 2006 09:50:16 -0000 1.2 +++ par2cmdline.spec 10 May 2006 15:13:39 -0000 1.3 @@ -1,12 +1,13 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch Patch1: par2cmdline-packed.patch +Patch2: par2cmdline-Makefile.am.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 @@ -23,6 +24,9 @@ %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +# fix end-of-lines of several files sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build @@ -42,10 +46,14 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog PORTING README ROADMAP +%doc AUTHORS COPYING ChangeLog README %{_bindir}/* %changelog +* Wed May 10 2006 Laurent Rineau - 0.4-9 +- Remove PORTING and ROADMAP from doc files. +- Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 + * Tue May 9 2006 Laurent Rineau - 0.4-8 - Added a new patch, to kill warnings, and try to fix ppc compilation error. From fedora-extras-commits at redhat.com Wed May 10 16:59:43 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 10 May 2006 09:59:43 -0700 Subject: fedora-security/audit fc4,1.239,1.240 fc5,1.152,1.153 Message-ID: <200605101659.k4AGxhX3011587@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11565/audit Modified Files: fc4 fc5 Log Message: Add CVE-2005-4798 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- fc4 10 May 2006 08:20:46 -0000 1.239 +++ fc4 10 May 2006 16:59:41 -0000 1.240 @@ -226,6 +226,7 @@ CVE-2006-0036 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2006-0035 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 +CVE-2005-4798 version (kernel, not 2.6) CVE-2005-4784 ignore (glibc) struct dirent is big enough CVE-2005-4746 version (freeradius) we don't build vulnerable bits CVE-2005-4745 version (freeradius) we don't build vulnerable bits Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- fc5 10 May 2006 08:20:46 -0000 1.152 +++ fc5 10 May 2006 16:59:41 -0000 1.153 @@ -229,6 +229,7 @@ CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0019 version (kdelibs, fixed 3.5.1) +CVE-2005-4798 version (kernel, not 2.6) CVE-2005-4784 ignore (glibc) struct dirent is big enough CVE-2005-4746 version (freeradius) we don't build vulnerable bits CVE-2005-4745 version (freeradius) we don't build vulnerable bits From fedora-extras-commits at redhat.com Wed May 10 17:24:38 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:24:38 -0700 Subject: rpms/perl-Test-Cmd - New directory Message-ID: <200605101724.k4AHOeAW013946@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13925/perl-Test-Cmd Log Message: Directory /cvs/extras/rpms/perl-Test-Cmd added to the repository From fedora-extras-commits at redhat.com Wed May 10 17:24:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:24:39 -0700 Subject: rpms/perl-Test-Cmd/devel - New directory Message-ID: <200605101724.k4AHOfJV013949@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13925/perl-Test-Cmd/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Cmd/devel added to the repository From fedora-extras-commits at redhat.com Wed May 10 17:24:58 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:24:58 -0700 Subject: rpms/perl-Test-Cmd Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605101725.k4AHP0fE014012@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13979 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Cmd --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Cmd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed May 10 17:24:59 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:24:59 -0700 Subject: rpms/perl-Test-Cmd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605101725.k4AHP1B5014015@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13979/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Cmd --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed May 10 17:25:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:25:33 -0700 Subject: rpms/perl-Test-Cmd import.log,1.1,1.2 Message-ID: <200605101725.k4AHPZI3014076@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14043 Modified Files: import.log Log Message: auto-import perl-Test-Cmd-1.05-1 on branch devel from perl-Test-Cmd-1.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Cmd/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 May 2006 17:24:58 -0000 1.1 +++ import.log 10 May 2006 17:25:33 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Cmd-1_05-1:HEAD:perl-Test-Cmd-1.05-1.src.rpm:1147281924 From fedora-extras-commits at redhat.com Wed May 10 17:25:34 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:25:34 -0700 Subject: rpms/perl-Test-Cmd/devel perl-Test-Cmd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605101725.k4AHPaoJ014081@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14043/devel Modified Files: .cvsignore sources Added Files: perl-Test-Cmd.spec Log Message: auto-import perl-Test-Cmd-1.05-1 on branch devel from perl-Test-Cmd-1.05-1.src.rpm --- NEW FILE perl-Test-Cmd.spec --- Name: perl-Test-Cmd Version: 1.05 Release: 1%{?dist} Summary: Perl module for portable testing of commands and scripts Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Cmd/ Source0: http://www.cpan.org/authors/id/K/KN/KNIGHT/Test-Cmd-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Algorithm::DiffOld) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Algorithm::DiffOld) %description The Test::Cmd module provides a framework for portable automated testing of executable commands and scripts (in any language, not just Perl), especially commands and scripts that interace with the file system. %prep %setup -q -n Test-Cmd-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+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/*.3pm* %changelog * Mon May 01 2006 Jose Pedro Oliveira - 1.05-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Cmd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 May 2006 17:24:59 -0000 1.1 +++ .cvsignore 10 May 2006 17:25:33 -0000 1.2 @@ -0,0 +1 @@ +Test-Cmd-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Cmd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 May 2006 17:24:59 -0000 1.1 +++ sources 10 May 2006 17:25:33 -0000 1.2 @@ -0,0 +1 @@ +462ed981f09e02a5d9bdfb309425ede0 Test-Cmd-1.05.tar.gz From fedora-extras-commits at redhat.com Wed May 10 17:32:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:32:17 -0700 Subject: owners owners.list,1.971,1.972 Message-ID: <200605101732.k4AHWJED014156@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14139 Modified Files: owners.list Log Message: New package: perl-Test-Cmd (#191111) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.971 retrieving revision 1.972 diff -u -r1.971 -r1.972 --- owners.list 10 May 2006 08:18:57 -0000 1.971 +++ owners.list 10 May 2006 17:32:17 -0000 1.972 @@ -1167,6 +1167,7 @@ Fedora Extras|perl-Test-Base|Data Driven Testing Framework|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Cmd|Perl module for portable testing of commands and scripts|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Differences|Test strings and data structures and show differences if not ok|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 From fedora-extras-commits at redhat.com Wed May 10 17:53:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 10:53:14 -0700 Subject: rpms/lablgtk/FC-4 lablgtk.spec,1.12,1.13 Message-ID: <200605101753.k4AHrG5m014290@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgtk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14230/FC-4 Modified Files: lablgtk.spec Log Message: Index: lablgtk.spec =================================================================== RCS file: /cvs/extras/rpms/lablgtk/FC-4/lablgtk.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lablgtk.spec 26 Feb 2006 18:51:26 -0000 1.12 +++ lablgtk.spec 10 May 2006 17:53:14 -0000 1.13 @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.6.0 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Objective Caml interface to gtk+ @@ -80,12 +80,6 @@ rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %files %defattr(-,root,root,-) %{_bindir}/* @@ -101,6 +95,10 @@ %changelog +* Wed May 10 2006 Gerard Milmeister - 2.6.0-4 +- rebuilt for ocaml 3.09.2 +- removed unnecessary ldconfig + * Sun Feb 26 2006 Gerard Milmeister - 2.6.0-2 - Rebuild for ocaml 3.09.1 From fedora-extras-commits at redhat.com Wed May 10 17:53:15 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 10:53:15 -0700 Subject: rpms/lablgtk/FC-5 lablgtk.spec,1.14,1.15 Message-ID: <200605101753.k4AHrHYr014294@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgtk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14230/FC-5 Modified Files: lablgtk.spec Log Message: Index: lablgtk.spec =================================================================== RCS file: /cvs/extras/rpms/lablgtk/FC-5/lablgtk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lablgtk.spec 26 Feb 2006 18:56:40 -0000 1.14 +++ lablgtk.spec 10 May 2006 17:53:15 -0000 1.15 @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective Caml interface to gtk+ @@ -38,6 +38,7 @@ is not that easy if you know the dynamic typing approach taken by gtk+. + %package doc Group: System Environment/Libraries Summary: Documentation for LablGTK @@ -74,12 +75,10 @@ DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -89,12 +88,17 @@ %doc README COPYING CHANGES %doc examples + %files doc %defattr(-,root,root,-) %doc doc/html %changelog +* Wed May 10 2006 Gerard Milmeister - 2.6.0-4 +- rebuilt for ocaml 3.09.2 +- removed unnecessary ldconfig + * Sun Feb 26 2006 Gerard Milmeister - 2.6.0-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed May 10 17:53:16 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 10:53:16 -0700 Subject: rpms/lablgtk/devel lablgtk.spec,1.14,1.15 Message-ID: <200605101753.k4AHrIWw014296@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14230/devel Modified Files: lablgtk.spec Log Message: Index: lablgtk.spec =================================================================== RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lablgtk.spec 26 Feb 2006 18:56:40 -0000 1.14 +++ lablgtk.spec 10 May 2006 17:53:15 -0000 1.15 @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective Caml interface to gtk+ @@ -38,6 +38,7 @@ is not that easy if you know the dynamic typing approach taken by gtk+. + %package doc Group: System Environment/Libraries Summary: Documentation for LablGTK @@ -74,12 +75,10 @@ DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -89,12 +88,17 @@ %doc README COPYING CHANGES %doc examples + %files doc %defattr(-,root,root,-) %doc doc/html %changelog +* Wed May 10 2006 Gerard Milmeister - 2.6.0-4 +- rebuilt for ocaml 3.09.2 +- removed unnecessary ldconfig + * Sun Feb 26 2006 Gerard Milmeister - 2.6.0-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed May 10 17:53:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 10:53:14 -0700 Subject: rpms/lablgtk/FC-3 lablgtk.spec,1.7,1.8 Message-ID: <200605101753.k4AHrkl6014301@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgtk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14230/FC-3 Modified Files: lablgtk.spec Log Message: Index: lablgtk.spec =================================================================== RCS file: /cvs/extras/rpms/lablgtk/FC-3/lablgtk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lablgtk.spec 31 Dec 2005 23:49:32 -0000 1.7 +++ lablgtk.spec 10 May 2006 17:53:13 -0000 1.8 @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.6.0 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Objective Caml interface to gtk+ @@ -9,7 +9,7 @@ URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html Source: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ocaml >= 3.08, camlp4 >= 3.08 +BuildRequires: ocaml >= 3.09.1, camlp4 >= 3.09.1 # lablgtk can generate quite extensive documentation. # Probably should enable this and create a subpackage for it. BuildRequires: ocaml-ocamldoc @@ -24,7 +24,7 @@ BuildRequires: gnome-panel-devel BuildRequires: gtkspell-devel -Requires: ocaml >= 3.08 +Requires: ocaml >= 3.09.1 Requires: lablgl >= 1.02 @@ -36,6 +36,7 @@ is not that easy if you know the dynamic typing approach taken by gtk+. + %package doc Group: System Environment/Libraries Summary: Documentation for LablGTK @@ -71,12 +72,10 @@ DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -86,12 +85,17 @@ %doc README COPYING CHANGES %doc examples + %files doc %defattr(-,root,root,-) %doc doc/html %changelog +* Wed May 10 2006 Gerard Milmeister - 2.6.0-4 +- rebuilt for ocaml 3.09.2 +- removed unnecessary ldconfig + * Sun Jan 1 2006 Gerard Milmeister - 2.6.0-1 - new version 2.6.0 From fedora-extras-commits at redhat.com Wed May 10 18:09:01 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 11:09:01 -0700 Subject: rpms/lablgl/devel lablgl.spec,1.16,1.17 Message-ID: <200605101809.k4AI93Z2016781@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16719/devel Modified Files: lablgl.spec Log Message: rebuilt for ocaml 3.09.2 Index: lablgl.spec =================================================================== RCS file: /cvs/extras/rpms/lablgl/devel/lablgl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lablgl.spec 26 Feb 2006 13:11:06 -0000 1.16 +++ lablgl.spec 10 May 2006 18:09:00 -0000 1.17 @@ -1,6 +1,6 @@ Name: lablgl Version: 1.02 -Release: 6%{?dist} +Release: 7%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -31,9 +31,11 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. + %prep %setup -q + %build cat > Makefile.config < - 1.02-7 +- rebuilt for ocaml 3.09.2 + * Sun Feb 26 2006 Gerard Milmeister - 1.02-4 - Rebuild for ocaml 3.09.1 From fedora-extras-commits at redhat.com Wed May 10 18:08:53 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 11:08:53 -0700 Subject: rpms/lablgl/FC-3 lablgl.spec,1.8,1.9 Message-ID: <200605101809.k4AI9P2M016786@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16719/FC-3 Modified Files: lablgl.spec Log Message: rebuilt for ocaml 3.09.2 Index: lablgl.spec =================================================================== RCS file: /cvs/extras/rpms/lablgl/FC-3/lablgl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lablgl.spec 1 Nov 2005 15:39:10 -0000 1.8 +++ lablgl.spec 10 May 2006 18:08:53 -0000 1.9 @@ -1,6 +1,6 @@ Name: lablgl Version: 1.02 -Release: 2%{?dist} +Release: 7%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -21,9 +21,11 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. + %prep %setup -q + %build cat > Makefile.config < - 1.02-7 +- rebuilt for ocaml 3.09.2 + * Tue Nov 1 2005 Gerard Milmeister - 1.02-2 - build opt libraries From fedora-extras-commits at redhat.com Wed May 10 18:08:55 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 11:08:55 -0700 Subject: rpms/lablgl/FC-5 lablgl.spec,1.16,1.17 Message-ID: <200605101809.k4AI9Rf6016790@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16719/FC-5 Modified Files: lablgl.spec Log Message: rebuilt for ocaml 3.09.2 Index: lablgl.spec =================================================================== RCS file: /cvs/extras/rpms/lablgl/FC-5/lablgl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lablgl.spec 26 Feb 2006 13:11:06 -0000 1.16 +++ lablgl.spec 10 May 2006 18:08:55 -0000 1.17 @@ -1,6 +1,6 @@ Name: lablgl Version: 1.02 -Release: 6%{?dist} +Release: 7%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -31,9 +31,11 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. + %prep %setup -q + %build cat > Makefile.config < - 1.02-7 +- rebuilt for ocaml 3.09.2 + * Sun Feb 26 2006 Gerard Milmeister - 1.02-4 - Rebuild for ocaml 3.09.1 From fedora-extras-commits at redhat.com Wed May 10 18:08:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 11:08:54 -0700 Subject: rpms/lablgl/FC-4 lablgl.spec,1.14,1.15 Message-ID: <200605101809.k4AI9QiK016789@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16719/FC-4 Modified Files: lablgl.spec Log Message: rebuilt for ocaml 3.09.2 Index: lablgl.spec =================================================================== RCS file: /cvs/extras/rpms/lablgl/FC-4/lablgl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lablgl.spec 26 Feb 2006 12:49:41 -0000 1.14 +++ lablgl.spec 10 May 2006 18:08:54 -0000 1.15 @@ -1,6 +1,6 @@ Name: lablgl Version: 1.02 -Release: 4%{?dist} +Release: 7%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -26,9 +26,11 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. + %prep %setup -q + %build cat > Makefile.config < - 1.02-7 +- rebuilt for ocaml 3.09.2 + * Sun Feb 26 2006 Gerard Milmeister - 1.02-3 - Rebuild for ocaml 3.09.1 From fedora-extras-commits at redhat.com Wed May 10 18:40:46 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 10 May 2006 11:40:46 -0700 Subject: fedora-security/audit fe4,1.15,1.16 fe5,1.15,1.16 Message-ID: <200605101840.k4AIekj1017115@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17095 Modified Files: fe4 fe5 Log Message: add more CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fe4 9 May 2006 06:25:16 -0000 1.15 +++ fe4 10 May 2006 18:40:43 -0000 1.16 @@ -16,7 +16,9 @@ CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) +CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 +CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1269 patch (zoo, fixed 2.10-7) bz#183109 CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 @@ -34,6 +36,7 @@ CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) +CVE-2006-0106 version (wine, fixed 0.9.10) CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fe5 9 May 2006 06:25:16 -0000 1.15 +++ fe5 10 May 2006 18:40:43 -0000 1.16 @@ -18,7 +18,9 @@ CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 +CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 +CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1269 patch (zoo, fixed 2.10-7) bz#183109 CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 @@ -36,6 +38,7 @@ CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) +CVE-2006-0106 version (wine, fixed 0.9.10) CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) From fedora-extras-commits at redhat.com Wed May 10 18:53:09 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 10 May 2006 11:53:09 -0700 Subject: fedora-security/audit fe4,1.16,1.17 fe5,1.16,1.17 Message-ID: <200605101853.k4AIr9Dp017226@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17202 Modified Files: fe4 fe5 Log Message: add clamav CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fe4 10 May 2006 18:40:43 -0000 1.16 +++ fe4 10 May 2006 18:53:06 -0000 1.17 @@ -13,7 +13,10 @@ CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 +CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286 +CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) @@ -35,6 +38,7 @@ CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0162 version (clamav, fixed 0.88) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) CVE-2006-0106 version (wine, fixed 0.9.10) CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fe5 10 May 2006 18:40:43 -0000 1.16 +++ fe5 10 May 2006 18:53:06 -0000 1.17 @@ -14,7 +14,10 @@ CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 CVE-2006-1656 version (util-vserver, fixed 0.30.210) +CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 +CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286 +CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 @@ -37,6 +40,7 @@ CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0162 version (clamav, fixed 0.88) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) CVE-2006-0106 version (wine, fixed 0.9.10) CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) From fedora-extras-commits at redhat.com Wed May 10 19:14:11 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 10 May 2006 12:14:11 -0700 Subject: fedora-security/audit fe4,1.17,1.18 fe5,1.17,1.18 Message-ID: <200605101914.k4AJEBkb020509@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20488 Modified Files: fe4 fe5 Log Message: add seamonkey CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fe4 10 May 2006 18:53:06 -0000 1.17 +++ fe4 10 May 2006 19:14:08 -0000 1.18 @@ -12,6 +12,26 @@ CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1742 version (seamonkey, fixed 1.0) +CVE-2006-1741 version (seamonkey, fixed 1.0) +CVE-2006-1740 version (seamonkey, fixed 1.0) +CVE-2006-1739 version (seamonkey, fixed 1.0) +CVE-2006-1738 version (seamonkey, fixed 1.0) +CVE-2006-1737 version (seamonkey, fixed 1.0) +CVE-2006-1736 version (seamonkey, fixed 1.0) +CVE-2006-1735 version (seamonkey, fixed 1.0) +CVE-2006-1734 version (seamonkey, fixed 1.0) +CVE-2006-1733 version (seamonkey, fixed 1.0) +CVE-2006-1732 version (seamonkey, fixed 1.0) +CVE-2006-1731 version (seamonkey, fixed 1.0) +CVE-2006-1730 version (seamonkey, fixed 1.0.1) +CVE-2006-1729 version (seamonkey, fixed 1.0.1) +CVE-2006-1728 version (seamonkey, fixed 1.0.1) +CVE-2006-1727 version (seamonkey, fixed 1.0.1) +CVE-2006-1726 version (seamonkey, fixed 1.0.1) +CVE-2006-1725 version (seamonkey, fixed 1.0.1) +CVE-2006-1724 version (seamonkey, fixed 1.0.1) +CVE-2006-1723 version (seamonkey, fixed 1.0.1) CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 @@ -20,6 +40,9 @@ CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) +CVE-2006-1531 version (seamonkey, fixed 1.0.1) +CVE-2006-1530 version (seamonkey, fixed 1.0.1) +CVE-2006-1529 version (seamonkey, fixed 1.0.1) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353 CVE-2006-1329 version (jabberd, fixed 2.0s11) @@ -33,11 +56,19 @@ CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0749 version (seamonkey, fixed 1.0) +CVE-2006-0748 version (seamonkey, fixed 1.0.1) CVE-2006-0665 VULNERABLE (mantis) bz#191089 CVE-2006-0664 VULNERABLE (mantis) bz#191089 CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0299 version (seamonkey, fixed 1.0) +CVE-2006-0298 version (seamonkey, fixed 1.0) +CVE-2006-0297 version (seamonkey, fixed 1.0) +CVE-2006-0296 version (seamonkey, fixed 1.0) +CVE-2006-0295 version (seamonkey, fixed 1.0) +CVE-2006-0294 version (seamonkey, fixed 1.0) CVE-2006-0162 version (clamav, fixed 0.88) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) CVE-2006-0106 version (wine, fixed 0.9.10) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fe5 10 May 2006 18:53:06 -0000 1.17 +++ fe5 10 May 2006 19:14:08 -0000 1.18 @@ -12,6 +12,26 @@ CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1742 version (seamonkey, fixed 1.0) +CVE-2006-1741 version (seamonkey, fixed 1.0) +CVE-2006-1740 version (seamonkey, fixed 1.0) +CVE-2006-1739 version (seamonkey, fixed 1.0) +CVE-2006-1738 version (seamonkey, fixed 1.0) +CVE-2006-1737 version (seamonkey, fixed 1.0) +CVE-2006-1736 version (seamonkey, fixed 1.0) +CVE-2006-1735 version (seamonkey, fixed 1.0) +CVE-2006-1734 version (seamonkey, fixed 1.0) +CVE-2006-1733 version (seamonkey, fixed 1.0) +CVE-2006-1732 version (seamonkey, fixed 1.0) +CVE-2006-1731 version (seamonkey, fixed 1.0) +CVE-2006-1730 version (seamonkey, fixed 1.0.1) +CVE-2006-1729 version (seamonkey, fixed 1.0.1) +CVE-2006-1728 version (seamonkey, fixed 1.0.1) +CVE-2006-1727 version (seamonkey, fixed 1.0.1) +CVE-2006-1726 version (seamonkey, fixed 1.0.1) +CVE-2006-1725 version (seamonkey, fixed 1.0.1) +CVE-2006-1724 version (seamonkey, fixed 1.0.1) +CVE-2006-1723 version (seamonkey, fixed 1.0.1) CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 CVE-2006-1656 version (util-vserver, fixed 0.30.210) CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 @@ -22,6 +42,9 @@ CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) +CVE-2006-1531 version (seamonkey, fixed 1.0.1) +CVE-2006-1530 version (seamonkey, fixed 1.0.1) +CVE-2006-1529 version (seamonkey, fixed 1.0.1) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353 CVE-2006-1329 version (jabberd, fixed 2.0s11) @@ -35,11 +58,19 @@ CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0749 version (seamonkey, fixed 1.0) +CVE-2006-0748 version (seamonkey, fixed 1.0.1) CVE-2006-0665 version (mantis, fixed 1.0.1) CVE-2006-0664 version (mantis, fixed 1.0.1) CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0299 version (seamonkey, fixed 1.0) +CVE-2006-0298 version (seamonkey, fixed 1.0) +CVE-2006-0297 version (seamonkey, fixed 1.0) +CVE-2006-0296 version (seamonkey, fixed 1.0) +CVE-2006-0295 version (seamonkey, fixed 1.0) +CVE-2006-0294 version (seamonkey, fixed 1.0) CVE-2006-0162 version (clamav, fixed 0.88) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) CVE-2006-0106 version (wine, fixed 0.9.10) From fedora-extras-commits at redhat.com Wed May 10 20:15:58 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 May 2006 13:15:58 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo-20051208-aspellenc-190151.patch, NONE, 1.1 xemacs-sumo-20060510-browse-url-htmlview-84262.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xemacs-sumo.spec, 1.17, 1.18 browse-url-htmlview-84262.patch, 1.1, NONE xemacs-sumo-20051208-latin-unity-kludge.patch, 1.1, NONE xemacs-sumo-20051208-pydoc-path.patch, 1.1, NONE Message-ID: <200605102016.k4AKG0ha023317@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/FC-5 Modified Files: .cvsignore sources xemacs-sumo.spec Added Files: xemacs-sumo-20051208-aspellenc-190151.patch xemacs-sumo-20060510-browse-url-htmlview-84262.patch Removed Files: browse-url-htmlview-84262.patch xemacs-sumo-20051208-latin-unity-kludge.patch xemacs-sumo-20051208-pydoc-path.patch Log Message: * Wed May 10 2006 Ville Skytt?? - 20060510-1 - 2006-05-10; pydoc and latin-unity patches applied upstream. - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). - Drop no longer relevant obsoletes and conflicts. - Add version to xemacs-common dependency. - Fix build with XEmacs 21.5.x. - Don't ship mule-ucs for 21.5.x. - Require main package in -info. xemacs-sumo-20051208-aspellenc-190151.patch: --- NEW FILE xemacs-sumo-20051208-aspellenc-190151.patch --- --- xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el~ 2005-10-16 19:47:08.000000000 +0300 +++ xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el 2006-04-29 22:42:03.000000000 +0300 @@ -2249,6 +2249,12 @@ (expand-file-name ispell-personal-dictionary))))) (setq args (append args ispell-extra-args)) + ;; Fix encoding with aspell >= 0.60 (and blindly assume it's >= 0.60 + ;; if it looks like aspell :P) + (when (string-match "^aspell" (file-name-nondirectory ispell-program-name)) + (add-to-list + 'args (concat "--encoding=" (symbol-name (ispell-get-coding-system))))) + (if ispell-async-processp (let ((process-connection-type ispell-use-ptys-p)) (apply 'start-process xemacs-sumo-20060510-browse-url-htmlview-84262.patch: --- NEW FILE xemacs-sumo-20060510-browse-url-htmlview-84262.patch --- --- xemacs-packages/lisp/mail-lib/browse-url.el~ 2005-03-09 13:14:56.000000000 +0200 +++ xemacs-packages/lisp/mail-lib/browse-url.el 2006-05-10 20:35:52.000000000 +0300 @@ -566,7 +566,7 @@ :group 'browse-url) ;;;###autoload -(defcustom browse-url-generic-program nil +(defcustom browse-url-generic-program "htmlview" "*The name of the browser program used by `browse-url-generic'." :type '(choice string (const :tag "None" nil)) :group 'browse-url) @@ -615,12 +615,12 @@ :type 'number :group 'browse-url) -(defcustom browse-url-kde-program "kfmclient" +(defcustom browse-url-kde-program "konqueror" "*The name by which to invoke the KDE web browser." :type 'string :group 'browse-url) -(defcustom browse-url-kde-args '("openURL") +(defcustom browse-url-kde-args nil "*A list of strings defining options for `browse-url-kde-program'." :type '(repeat (string :tag "Argument")) :group 'browse-url) @@ -872,6 +872,7 @@ xterm, MMM, and then W3." (apply (cond + (browse-url-generic-program 'browse-url-generic) ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) ((executable-find browse-url-firefox-program) 'browse-url-firefox) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Feb 2006 15:16:39 -0000 1.8 +++ .cvsignore 10 May 2006 20:15:58 -0000 1.9 @@ -1,3 +1,2 @@ -xemacs-mule-sumo-2005-12-08.tar.bz2 -xemacs-sumo-2005-12-08.tar.bz2 -gnus-1.89-pkg.tar.gz +xemacs-mule-sumo-2006-05-10.tar.bz2 +xemacs-sumo-2006-05-10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Feb 2006 15:16:39 -0000 1.8 +++ sources 10 May 2006 20:15:58 -0000 1.9 @@ -1,3 +1,2 @@ -553da38bc36b4365ab98e0565a0530b8 xemacs-mule-sumo-2005-12-08.tar.bz2 -1927c40affd04ff7c10b979ef24548d0 xemacs-sumo-2005-12-08.tar.bz2 -e7707178416716eac643af29c437f619 gnus-1.89-pkg.tar.gz +62cce3c50de3b102df15e1e223b79dbd xemacs-mule-sumo-2006-05-10.tar.bz2 +242938f820b85ae27e8584de3afbcb80 xemacs-sumo-2006-05-10.tar.bz2 Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xemacs-sumo.spec 5 Mar 2006 19:20:41 -0000 1.17 +++ xemacs-sumo.spec 10 May 2006 20:15:58 -0000 1.18 @@ -1,10 +1,11 @@ -%define sumo 2005-12-08 +%define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla +%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 2 +Release: 1%{?dist} Summary: XEmacs lisp packages Group: Applications/Editors @@ -12,7 +13,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: ftp://ftp.xemacs.org/packages/gnus-1.89-pkg.tar.gz Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -22,13 +22,12 @@ Source16: Emacs.ad.zh_CN.UTF-8 Source17: Emacs.ad.zh_TW.UTF-8 Patch0: %{name}-20051208-hypb-posix.patch -Patch1: %{name}-20051208-pydoc-path.patch -Patch2: %{name}-20051208-latin-unity-kludge.patch +Patch1: %{name}-20051208-aspellenc-190151.patch Patch3: %{name}-20051208-trax.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 +Patch11: %{name}-20060510-browse-url-htmlview-84262.patch Patch12: psgml-browsers-84262.patch Patch15: avoid-catch-error-65346.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,14 +39,12 @@ BuildRequires: %{__python} BuildRequires: %{__perl} BuildRequires: java-devel -Requires: xemacs-common +Requires: xemacs-common >= %{xemver} # Fake release in this provision in order to avoid self-obsoletion (for now). Provides: apel-xemacs = 10.6-6 Provides: ruby-mode-xemacs Obsoletes: apel-xemacs < 10.6-6 Obsoletes: ruby-mode-xemacs -Obsoletes: tm -Conflicts: xemacs < 21.4.12-12 %description XEmacs is a highly customizable open source text editor and @@ -65,7 +62,6 @@ 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 @@ -75,7 +71,7 @@ %package info Summary: XEmacs packages documentation in GNU texinfo format Group: Documentation -Conflicts: xemacs-info < 21.4.12-12 +Requires: xemacs-sumo = %{version} %description info This package contains optional documentation for the XEmacs Sumo @@ -84,17 +80,12 @@ %prep %setup -q -c -a1 -tar zxf %{SOURCE2} -C xemacs-packages # get rid of csh dependency %patch0 -p0 rm xemacs-packages/lisp/hyperbole/file-newer -# find pydoc_lisp.py out-of-the-box -%patch1 -p0 -install -dm 755 xemacs-packages/etc/python-modes -mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes} -# support write-region's kludge in latin-unity -%patch2 -p0 +# adapt ispell.el to aspell >= 0.60's encoding behaviour, #190151 +%patch1 -p1 # use TrAX by default in xslt-process %patch3 -p0 # fix jlatex autodetection @@ -113,7 +104,8 @@ sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \ xemacs-packages/etc/bbdb/*.pl -chmod -c -x xemacs-packages/lisp/edit-utils/crm.el +chmod -c -x xemacs-packages/lisp/edit-utils/crm.el \ + xemacs-packages/{lisp/erc/ChangeLog.2005.upstream,man/erc/erc.texi} # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* @@ -135,11 +127,18 @@ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk +# not needed (and unusable) with >= 21.5 +if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then +%{xemacsb} -l package-admin -eval \ + "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" +rm -rf mule-packages/{etc,lisp,man}/mule-ucs +fi + %build export EMACSPACKAGEPATH=`pwd` -%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \ - -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* +%{xemacsb} -no-autoloads -l autoload -eval "(setq make-backup-files nil)" \ + -f batch-update-autoloads xemacs-packages/lisp/* mule-packages/lisp/* %{xemacsb} -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp @@ -225,6 +224,15 @@ %changelog +* Wed May 10 2006 Ville Skytt?? - 20060510-1 +- 2006-05-10; pydoc and latin-unity patches applied upstream. +- Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). +- Drop no longer relevant obsoletes and conflicts. +- Add version to xemacs-common dependency. +- Fix build with XEmacs 21.5.x. +- Don't ship mule-ucs for 21.5.x. +- Require main package in -info. + * Fri Mar 3 2006 Ville Skytt?? - 20051208-2 - Drop JDE; the full source for jde.jar doesn't seem to be available and even the included parts won't build with gcj eg. due to use of --- browse-url-htmlview-84262.patch DELETED --- --- xemacs-sumo-20051208-latin-unity-kludge.patch DELETED --- --- xemacs-sumo-20051208-pydoc-path.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 10 20:15:59 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 May 2006 13:15:59 -0700 Subject: rpms/xemacs-sumo/devel xemacs-sumo-20051208-aspellenc-190151.patch, NONE, 1.1 xemacs-sumo-20060510-browse-url-htmlview-84262.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xemacs-sumo.spec, 1.17, 1.18 browse-url-htmlview-84262.patch, 1.1, NONE xemacs-sumo-20051208-latin-unity-kludge.patch, 1.1, NONE xemacs-sumo-20051208-pydoc-path.patch, 1.1, NONE Message-ID: <200605102016.k4AKG1RH023327@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/devel Modified Files: .cvsignore sources xemacs-sumo.spec Added Files: xemacs-sumo-20051208-aspellenc-190151.patch xemacs-sumo-20060510-browse-url-htmlview-84262.patch Removed Files: browse-url-htmlview-84262.patch xemacs-sumo-20051208-latin-unity-kludge.patch xemacs-sumo-20051208-pydoc-path.patch Log Message: * Wed May 10 2006 Ville Skytt?? - 20060510-1 - 2006-05-10; pydoc and latin-unity patches applied upstream. - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). - Drop no longer relevant obsoletes and conflicts. - Add version to xemacs-common dependency. - Fix build with XEmacs 21.5.x. - Don't ship mule-ucs for 21.5.x. - Require main package in -info. xemacs-sumo-20051208-aspellenc-190151.patch: --- NEW FILE xemacs-sumo-20051208-aspellenc-190151.patch --- --- xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el~ 2005-10-16 19:47:08.000000000 +0300 +++ xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el 2006-04-29 22:42:03.000000000 +0300 @@ -2249,6 +2249,12 @@ (expand-file-name ispell-personal-dictionary))))) (setq args (append args ispell-extra-args)) + ;; Fix encoding with aspell >= 0.60 (and blindly assume it's >= 0.60 + ;; if it looks like aspell :P) + (when (string-match "^aspell" (file-name-nondirectory ispell-program-name)) + (add-to-list + 'args (concat "--encoding=" (symbol-name (ispell-get-coding-system))))) + (if ispell-async-processp (let ((process-connection-type ispell-use-ptys-p)) (apply 'start-process xemacs-sumo-20060510-browse-url-htmlview-84262.patch: --- NEW FILE xemacs-sumo-20060510-browse-url-htmlview-84262.patch --- --- xemacs-packages/lisp/mail-lib/browse-url.el~ 2005-03-09 13:14:56.000000000 +0200 +++ xemacs-packages/lisp/mail-lib/browse-url.el 2006-05-10 20:35:52.000000000 +0300 @@ -566,7 +566,7 @@ :group 'browse-url) ;;;###autoload -(defcustom browse-url-generic-program nil +(defcustom browse-url-generic-program "htmlview" "*The name of the browser program used by `browse-url-generic'." :type '(choice string (const :tag "None" nil)) :group 'browse-url) @@ -615,12 +615,12 @@ :type 'number :group 'browse-url) -(defcustom browse-url-kde-program "kfmclient" +(defcustom browse-url-kde-program "konqueror" "*The name by which to invoke the KDE web browser." :type 'string :group 'browse-url) -(defcustom browse-url-kde-args '("openURL") +(defcustom browse-url-kde-args nil "*A list of strings defining options for `browse-url-kde-program'." :type '(repeat (string :tag "Argument")) :group 'browse-url) @@ -872,6 +872,7 @@ xterm, MMM, and then W3." (apply (cond + (browse-url-generic-program 'browse-url-generic) ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) ((executable-find browse-url-firefox-program) 'browse-url-firefox) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Feb 2006 15:16:39 -0000 1.8 +++ .cvsignore 10 May 2006 20:15:59 -0000 1.9 @@ -1,3 +1,2 @@ -xemacs-mule-sumo-2005-12-08.tar.bz2 -xemacs-sumo-2005-12-08.tar.bz2 -gnus-1.89-pkg.tar.gz +xemacs-mule-sumo-2006-05-10.tar.bz2 +xemacs-sumo-2006-05-10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Feb 2006 15:16:39 -0000 1.8 +++ sources 10 May 2006 20:15:59 -0000 1.9 @@ -1,3 +1,2 @@ -553da38bc36b4365ab98e0565a0530b8 xemacs-mule-sumo-2005-12-08.tar.bz2 -1927c40affd04ff7c10b979ef24548d0 xemacs-sumo-2005-12-08.tar.bz2 -e7707178416716eac643af29c437f619 gnus-1.89-pkg.tar.gz +62cce3c50de3b102df15e1e223b79dbd xemacs-mule-sumo-2006-05-10.tar.bz2 +242938f820b85ae27e8584de3afbcb80 xemacs-sumo-2006-05-10.tar.bz2 Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xemacs-sumo.spec 5 Mar 2006 19:20:41 -0000 1.17 +++ xemacs-sumo.spec 10 May 2006 20:15:59 -0000 1.18 @@ -1,10 +1,11 @@ -%define sumo 2005-12-08 +%define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla +%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 2 +Release: 1%{?dist} Summary: XEmacs lisp packages Group: Applications/Editors @@ -12,7 +13,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: ftp://ftp.xemacs.org/packages/gnus-1.89-pkg.tar.gz Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -22,13 +22,12 @@ Source16: Emacs.ad.zh_CN.UTF-8 Source17: Emacs.ad.zh_TW.UTF-8 Patch0: %{name}-20051208-hypb-posix.patch -Patch1: %{name}-20051208-pydoc-path.patch -Patch2: %{name}-20051208-latin-unity-kludge.patch +Patch1: %{name}-20051208-aspellenc-190151.patch Patch3: %{name}-20051208-trax.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 +Patch11: %{name}-20060510-browse-url-htmlview-84262.patch Patch12: psgml-browsers-84262.patch Patch15: avoid-catch-error-65346.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,14 +39,12 @@ BuildRequires: %{__python} BuildRequires: %{__perl} BuildRequires: java-devel -Requires: xemacs-common +Requires: xemacs-common >= %{xemver} # Fake release in this provision in order to avoid self-obsoletion (for now). Provides: apel-xemacs = 10.6-6 Provides: ruby-mode-xemacs Obsoletes: apel-xemacs < 10.6-6 Obsoletes: ruby-mode-xemacs -Obsoletes: tm -Conflicts: xemacs < 21.4.12-12 %description XEmacs is a highly customizable open source text editor and @@ -65,7 +62,6 @@ 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 @@ -75,7 +71,7 @@ %package info Summary: XEmacs packages documentation in GNU texinfo format Group: Documentation -Conflicts: xemacs-info < 21.4.12-12 +Requires: xemacs-sumo = %{version} %description info This package contains optional documentation for the XEmacs Sumo @@ -84,17 +80,12 @@ %prep %setup -q -c -a1 -tar zxf %{SOURCE2} -C xemacs-packages # get rid of csh dependency %patch0 -p0 rm xemacs-packages/lisp/hyperbole/file-newer -# find pydoc_lisp.py out-of-the-box -%patch1 -p0 -install -dm 755 xemacs-packages/etc/python-modes -mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes} -# support write-region's kludge in latin-unity -%patch2 -p0 +# adapt ispell.el to aspell >= 0.60's encoding behaviour, #190151 +%patch1 -p1 # use TrAX by default in xslt-process %patch3 -p0 # fix jlatex autodetection @@ -113,7 +104,8 @@ sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \ xemacs-packages/etc/bbdb/*.pl -chmod -c -x xemacs-packages/lisp/edit-utils/crm.el +chmod -c -x xemacs-packages/lisp/edit-utils/crm.el \ + xemacs-packages/{lisp/erc/ChangeLog.2005.upstream,man/erc/erc.texi} # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* @@ -135,11 +127,18 @@ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk +# not needed (and unusable) with >= 21.5 +if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then +%{xemacsb} -l package-admin -eval \ + "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" +rm -rf mule-packages/{etc,lisp,man}/mule-ucs +fi + %build export EMACSPACKAGEPATH=`pwd` -%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \ - -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* +%{xemacsb} -no-autoloads -l autoload -eval "(setq make-backup-files nil)" \ + -f batch-update-autoloads xemacs-packages/lisp/* mule-packages/lisp/* %{xemacsb} -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp @@ -225,6 +224,15 @@ %changelog +* Wed May 10 2006 Ville Skytt?? - 20060510-1 +- 2006-05-10; pydoc and latin-unity patches applied upstream. +- Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). +- Drop no longer relevant obsoletes and conflicts. +- Add version to xemacs-common dependency. +- Fix build with XEmacs 21.5.x. +- Don't ship mule-ucs for 21.5.x. +- Require main package in -info. + * Fri Mar 3 2006 Ville Skytt?? - 20051208-2 - Drop JDE; the full source for jde.jar doesn't seem to be available and even the included parts won't build with gcj eg. due to use of --- browse-url-htmlview-84262.patch DELETED --- --- xemacs-sumo-20051208-latin-unity-kludge.patch DELETED --- --- xemacs-sumo-20051208-pydoc-path.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 10 20:53:22 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:53:22 -0700 Subject: rpms/libnfnetlink - New directory Message-ID: <200605102053.k4AKrOaH023577@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23556/libnfnetlink Log Message: Directory /cvs/extras/rpms/libnfnetlink added to the repository From fedora-extras-commits at redhat.com Wed May 10 20:53:22 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:53:22 -0700 Subject: rpms/libnfnetlink/devel - New directory Message-ID: <200605102053.k4AKrOZp023580@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23556/libnfnetlink/devel Log Message: Directory /cvs/extras/rpms/libnfnetlink/devel added to the repository From fedora-extras-commits at redhat.com Wed May 10 20:53:55 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:53:55 -0700 Subject: rpms/libnfnetlink Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605102053.k4AKrv3v023630@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23602 Added Files: Makefile import.log Log Message: Setup of module libnfnetlink --- NEW FILE Makefile --- # Top level Makefile for module libnfnetlink all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 10 20:53:55 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:53:55 -0700 Subject: rpms/libnfnetlink/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605102053.k4AKrvBT023633@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23602/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libnfnetlink --- NEW 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 May 10 20:55:16 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:55:16 -0700 Subject: rpms/libnfnetlink import.log,1.1,1.2 Message-ID: <200605102055.k4AKtIxk023705@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23671 Modified Files: import.log Log Message: auto-import libnfnetlink-0.0.14-3 on branch devel from libnfnetlink-0.0.14-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 May 2006 20:53:55 -0000 1.1 +++ import.log 10 May 2006 20:55:16 -0000 1.2 @@ -0,0 +1 @@ +libnfnetlink-0_0_14-3:HEAD:libnfnetlink-0.0.14-3.src.rpm:1147294497 From fedora-extras-commits at redhat.com Wed May 10 20:55:17 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:55:17 -0700 Subject: rpms/libnfnetlink/devel gpl.txt, NONE, 1.1 libnfnetlink.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605102055.k4AKtJil023710@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23671/devel Modified Files: .cvsignore sources Added Files: gpl.txt libnfnetlink.spec Log Message: auto-import libnfnetlink-0.0.14-3 on branch devel from libnfnetlink-0.0.14-3.src.rpm --- NEW FILE gpl.txt --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. --- NEW FILE libnfnetlink.spec --- Name: libnfnetlink Version: 0.0.14 Release: 3%{?dist} Summary: Netfilter netlink userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/libnfnetlink/files/%{name}-%{version}.tar.bz2 Source1: http://www.gnu.org/licenses/gpl.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: %description libnfnetlink is a userspace library that provides some low-level nfnetlink handling functions. It is used as a foundation for other, netfilter subsystem specific libraries such as libnfnetlink_conntrack, libnfnetlink_log and libnfnetlink_queue. %package devel Summary: Netfilter netlink userspace library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel libnfnetlink is a userspace library that provides some low-level nfnetlink handling functions. It is used as a foundation for other, netfilter subsystem specific libraries such as libnfnetlink_conntrack, libnfnetlink_log and libnfnetlink_queue. %prep %setup -q cp %{SOURCE1} LICENSE %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/libnfnetlink/*.h %changelog * Mon May 8 2006 Paul P Komkoff Jr - 0.0.14-3 - Include borrowed gpl.txt as LICENSE in %doc * Sun Mar 26 2006 Paul P Komkoff Jr - 0.0.14-1 - Preparing for submission to fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 May 2006 20:53:55 -0000 1.1 +++ .cvsignore 10 May 2006 20:55:17 -0000 1.2 @@ -0,0 +1 @@ +libnfnetlink-0.0.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 May 2006 20:53:55 -0000 1.1 +++ sources 10 May 2006 20:55:17 -0000 1.2 @@ -0,0 +1 @@ +420d312cb9754e571a0677631b4777a0 libnfnetlink-0.0.14.tar.bz2 From fedora-extras-commits at redhat.com Wed May 10 21:21:46 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 May 2006 14:21:46 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo.spec,1.18,1.19 Message-ID: <200605102121.k4ALLmFn026137@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26106/FC-5 Modified Files: xemacs-sumo.spec Log Message: Brown paper bag build fix. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xemacs-sumo.spec 10 May 2006 20:15:58 -0000 1.18 +++ xemacs-sumo.spec 10 May 2006 21:21:46 -0000 1.19 @@ -1,7 +1,7 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR) +%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox | cut -d' ' -f 1) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) @@ -128,7 +128,7 @@ rmdir mule-packages/{etc,lisp,man}/skk # not needed (and unusable) with >= 21.5 -if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then +if [ "%{xemver}" '>' "21.5." ] ; then %{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" rm -rf mule-packages/{etc,lisp,man}/mule-ucs From fedora-extras-commits at redhat.com Wed May 10 21:21:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 May 2006 14:21:47 -0700 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.18,1.19 Message-ID: <200605102121.k4ALLnnp026141@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26106/devel Modified Files: xemacs-sumo.spec Log Message: Brown paper bag build fix. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xemacs-sumo.spec 10 May 2006 20:15:59 -0000 1.18 +++ xemacs-sumo.spec 10 May 2006 21:21:46 -0000 1.19 @@ -1,7 +1,7 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR) +%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox | cut -d' ' -f 1) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) @@ -128,7 +128,7 @@ rmdir mule-packages/{etc,lisp,man}/skk # not needed (and unusable) with >= 21.5 -if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then +if [ "%{xemver}" '>' "21.5." ] ; then %{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" rm -rf mule-packages/{etc,lisp,man}/mule-ucs From fedora-extras-commits at redhat.com Wed May 10 21:41:39 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 10 May 2006 14:41:39 -0700 Subject: extras-buildsys/utils extras-push-new,1.5,1.6 Message-ID: <200605102141.k4ALfdJJ026298@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26277 Modified Files: extras-push-new Log Message: - add a safety check on whether ~/.rpmmacros might not be set up Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- extras-push-new 10 May 2006 15:13:08 -0000 1.5 +++ extras-push-new 10 May 2006 21:41:37 -0000 1.6 @@ -51,6 +51,7 @@ 'repoclosure' : False, 'gidcheck' : True, 'setumask' : True, + 'signkeycheck' : True, 'mail' : True, 'doublesync' : True, 'force' : False @@ -419,6 +420,11 @@ print 'ERROR: Change into extras_signers group before running this! Use "newgrp extras_signers".' sys.exit(13) + if config['signkeycheck']: + if 'extras at fedoraproject.org' != os.popen('rpm --eval %_gpg_name','r').read().rstrip(): + print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!' + sys.exit(13) + if config['setumask']: os.umask(0002) From fedora-extras-commits at redhat.com Wed May 10 22:33:09 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Wed, 10 May 2006 15:33:09 -0700 Subject: rpms/cfengine/devel .cvsignore, 1.11, 1.12 cfengine.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200605102233.k4AMXBG5028738@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28717 Modified Files: .cvsignore cfengine.spec sources Log Message: patch for ipv6 buffer overflow (#190822) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Apr 2006 12:50:33 -0000 1.11 +++ .cvsignore 10 May 2006 22:33:08 -0000 1.12 @@ -1,3 +1,4 @@ +cfengine-2.1.20-ipv6-overflow.patch cfengine-2.1.20.tar.gz cfenvd cfexecd Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cfengine.spec 1 Apr 2006 12:50:33 -0000 1.17 +++ cfengine.spec 10 May 2006 22:33:08 -0000 1.18 @@ -1,13 +1,14 @@ Summary: A systems administration tool for networks Name: cfengine Version: 2.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd +Patch0: cfengine-2.1.20-ipv6-overflow.patch URL: http://www.cfengine.org/ BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel Requires(post): /sbin/chkconfig, /sbin/install-info @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .ipv6-overflow %build @@ -118,6 +120,9 @@ %changelog +* Mon May 8 2006 Jeff Sheltren - 2.1.20-3 +- Patch for buffer overflow when using ipv6 addresses (#190822) + * Fri Mar 31 2006 Jeff Sheltren - 2.1.20-1 - Update to upstream 2.1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Apr 2006 12:50:33 -0000 1.11 +++ sources 10 May 2006 22:33:08 -0000 1.12 @@ -1,3 +1,4 @@ +a30e414c5b51271c4d263be8043ecb07 cfengine-2.1.20-ipv6-overflow.patch 2510349fef9ccc47d80f133d4a35322e cfengine-2.1.20.tar.gz 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd From fedora-extras-commits at redhat.com Wed May 10 22:36:34 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Wed, 10 May 2006 15:36:34 -0700 Subject: rpms/cfengine/FC-5 .cvsignore, 1.11, 1.12 cfengine.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200605102236.k4AMaanx028781@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28760 Modified Files: .cvsignore cfengine.spec sources Log Message: patch for ipv6 buffer overflow (#190822) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Apr 2006 12:43:07 -0000 1.11 +++ .cvsignore 10 May 2006 22:36:34 -0000 1.12 @@ -2,3 +2,4 @@ cfenvd cfexecd cfservd +cfengine-2.1.20-ipv6-overflow.patch Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-5/cfengine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cfengine.spec 1 Apr 2006 12:43:07 -0000 1.17 +++ cfengine.spec 10 May 2006 22:36:34 -0000 1.18 @@ -1,13 +1,14 @@ Summary: A systems administration tool for networks Name: cfengine Version: 2.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd +Patch0: cfengine-2.1.20-ipv6-overflow.patch URL: http://www.cfengine.org/ BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel Requires(post): /sbin/chkconfig, /sbin/install-info @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .ipv6-overflow %build @@ -118,6 +120,9 @@ %changelog +* Mon May 8 2006 Jeff Sheltren - 2.1.20-3 +- Patch for buffer overflow when using ipv6 addresses (#190822) + * Fri Mar 31 2006 Jeff Sheltren - 2.1.20-1 - Update to upstream 2.1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Apr 2006 12:43:07 -0000 1.11 +++ sources 10 May 2006 22:36:34 -0000 1.12 @@ -2,3 +2,4 @@ 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd +a30e414c5b51271c4d263be8043ecb07 cfengine-2.1.20-ipv6-overflow.patch From fedora-extras-commits at redhat.com Wed May 10 22:37:54 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Wed, 10 May 2006 15:37:54 -0700 Subject: rpms/cfengine/FC-4 .cvsignore, 1.11, 1.12 cfengine.spec, 1.15, 1.16 sources, 1.11, 1.12 Message-ID: <200605102237.k4AMbuQG028821@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28800 Modified Files: .cvsignore cfengine.spec sources Log Message: patch for ipv6 buffer overflow (#190822) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Apr 2006 12:47:11 -0000 1.11 +++ .cvsignore 10 May 2006 22:37:54 -0000 1.12 @@ -2,3 +2,4 @@ cfenvd cfexecd cfservd +cfengine-2.1.20-ipv6-overflow.patch Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/cfengine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cfengine.spec 1 Apr 2006 12:47:11 -0000 1.15 +++ cfengine.spec 10 May 2006 22:37:54 -0000 1.16 @@ -1,13 +1,14 @@ Summary: A systems administration tool for networks Name: cfengine Version: 2.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd +Patch0: cfengine-2.1.20-ipv6-overflow.patch URL: http://www.cfengine.org/ BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel Requires(post): /sbin/chkconfig, /sbin/install-info @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .ipv6-overflow %build @@ -118,6 +120,9 @@ %changelog +* Mon May 8 2006 Jeff Sheltren - 2.1.20-3 +- Patch for buffer overflow when using ipv6 addresses (#190822) + * Fri Mar 31 2006 Jeff Sheltren - 2.1.20-1 - Update to upstream 2.1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Apr 2006 12:47:11 -0000 1.11 +++ sources 10 May 2006 22:37:54 -0000 1.12 @@ -2,3 +2,4 @@ 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd +a30e414c5b51271c4d263be8043ecb07 cfengine-2.1.20-ipv6-overflow.patch From fedora-extras-commits at redhat.com Wed May 10 22:38:58 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Wed, 10 May 2006 15:38:58 -0700 Subject: rpms/cfengine/FC-3 .cvsignore, 1.12, 1.13 cfengine.spec, 1.14, 1.15 sources, 1.12, 1.13 Message-ID: <200605102239.k4AMd0LE028859@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28838 Modified Files: .cvsignore cfengine.spec sources Log Message: patch for ipv6 buffer overflow (#190822) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Apr 2006 12:49:00 -0000 1.12 +++ .cvsignore 10 May 2006 22:38:58 -0000 1.13 @@ -2,3 +2,4 @@ cfenvd cfexecd cfservd +cfengine-2.1.20-ipv6-overflow.patch Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cfengine.spec 1 Apr 2006 12:49:00 -0000 1.14 +++ cfengine.spec 10 May 2006 22:38:58 -0000 1.15 @@ -1,13 +1,14 @@ Summary: A systems administration tool for networks Name: cfengine Version: 2.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd +Patch0: cfengine-2.1.20-ipv6-overflow.patch URL: http://www.cfengine.org/ BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel Requires(post): /sbin/chkconfig, /sbin/install-info @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .ipv6-overflow %build @@ -118,6 +120,9 @@ %changelog +* Mon May 8 2006 Jeff Sheltren - 2.1.20-3 +- Patch for buffer overflow when using ipv6 addresses (#190822) + * Fri Mar 31 2006 Jeff Sheltren - 2.1.20-1 - Update to upstream 2.1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Apr 2006 12:49:00 -0000 1.12 +++ sources 10 May 2006 22:38:58 -0000 1.13 @@ -2,3 +2,4 @@ 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd +a30e414c5b51271c4d263be8043ecb07 cfengine-2.1.20-ipv6-overflow.patch From fedora-extras-commits at redhat.com Wed May 10 22:40:38 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 10 May 2006 15:40:38 -0700 Subject: rpms/bzr/devel .cvsignore, 1.2, 1.3 bzr-sys-etree.patch, 1.1, 1.2 bzr.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605102240.k4AMeeW9028928@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28866/devel Modified Files: .cvsignore bzr-sys-etree.patch bzr.spec sources Log Message: update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Feb 2006 19:00:25 -0000 1.2 +++ .cvsignore 10 May 2006 22:40:38 -0000 1.3 @@ -1 +1 @@ -bzr-0.7.tar.gz +bzr-0.8.tar.gz bzr-sys-etree.patch: Index: bzr-sys-etree.patch =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/bzr-sys-etree.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-sys-etree.patch 10 Feb 2006 19:00:25 -0000 1.1 +++ bzr-sys-etree.patch 10 May 2006 22:40:38 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur bzr-0.7.orig/bzrlib/xml.py bzr-0.7/bzrlib/xml.py ---- bzr-0.7.orig/bzrlib/xml.py 2006-01-23 01:33:08.000000000 -0800 -+++ bzr-0.7/bzrlib/xml.py 2006-02-10 09:37:34.000000000 -0800 +diff -ru bzr-0.8.orig/bzrlib/xml_serializer.py bzr-0.8/bzrlib/xml_serializer.py +--- bzr-0.8.orig/bzrlib/xml_serializer.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/bzrlib/xml_serializer.py 2006-05-10 15:19:46.000000000 -0700 @@ -30,9 +30,9 @@ except ImportError: mutter('WARNING: using slower ElementTree; consider installing cElementTree' @@ -14,11 +14,11 @@ from bzrlib.errors import BzrError -diff -ur bzr-0.7.orig/setup.py bzr-0.7/setup.py ---- bzr-0.7.orig/setup.py 2006-01-23 01:33:09.000000000 -0800 -+++ bzr-0.7/setup.py 2006-02-10 09:36:39.000000000 -0800 -@@ -96,7 +96,6 @@ - 'bzrlib.transport', +diff -ru bzr-0.8.orig/setup.py bzr-0.8/setup.py +--- bzr-0.8.orig/setup.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/setup.py 2006-05-10 15:20:04.000000000 -0700 +@@ -108,7 +108,6 @@ + 'bzrlib.transport.http', 'bzrlib.ui', 'bzrlib.util', - 'bzrlib.util.elementtree', Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bzr.spec 13 Feb 2006 15:59:24 -0000 1.3 +++ bzr.spec 10 May 2006 22:40:38 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.7 -Release: 3%{dist} +Version: 0.8 +Release: 1%{dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -51,6 +51,16 @@ %{python_sitelib}/bzrlib/*.pyc %ghost %{python_sitelib}/bzrlib/*.pyo +%dir %{python_sitelib}/bzrlib/doc +%{python_sitelib}/bzrlib/doc/*.py +%{python_sitelib}/bzrlib/doc/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/*.pyo + +%dir %{python_sitelib}/bzrlib/doc/api +%{python_sitelib}/bzrlib/doc/api/*.py +%{python_sitelib}/bzrlib/doc/api/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/api/*.pyo + %dir %{python_sitelib}/bzrlib/export %{python_sitelib}/bzrlib/export/*.py %{python_sitelib}/bzrlib/export/*.pyc @@ -81,15 +91,20 @@ %{python_sitelib}/bzrlib/store/*.pyc %ghost %{python_sitelib}/bzrlib/store/*.pyo -%dir %{python_sitelib}/bzrlib/tests -%{python_sitelib}/bzrlib/tests/*.py -%{python_sitelib}/bzrlib/tests/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/*.pyo - -%dir %{python_sitelib}/bzrlib/tests/blackbox -%{python_sitelib}/bzrlib/tests/blackbox/*.py -%{python_sitelib}/bzrlib/tests/blackbox/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo +%dir %{python_sitelib}/bzrlib/store/revision +%{python_sitelib}/bzrlib/store/revision/*.py +%{python_sitelib}/bzrlib/store/revision/*.pyc +%ghost %{python_sitelib}/bzrlib/store/revision/*.pyo + +%dir %{python_sitelib}/bzrlib/store/versioned +%{python_sitelib}/bzrlib/store/versioned/*.py +%{python_sitelib}/bzrlib/store/versioned/*.pyc +%ghost %{python_sitelib}/bzrlib/store/versioned/*.pyo + +%dir %{python_sitelib}/bzrlib/transport/http +%{python_sitelib}/bzrlib/transport/http/*.py +%{python_sitelib}/bzrlib/transport/http/*.pyc +%ghost %{python_sitelib}/bzrlib/transport/http/*.pyo %dir %{python_sitelib}/bzrlib/ui %{python_sitelib}/bzrlib/ui/*.py @@ -101,7 +116,56 @@ %{python_sitelib}/bzrlib/util/effbot/org/*.pyc %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo +%dir %{python_sitelib}/bzrlib/tests +%{python_sitelib}/bzrlib/tests/*.py +%{python_sitelib}/bzrlib/tests/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/blackbox +%{python_sitelib}/bzrlib/tests/blackbox/*.py +%{python_sitelib}/bzrlib/tests/blackbox/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/branch_implementations +%{python_sitelib}/bzrlib/tests/branch_implementations/*.py +%{python_sitelib}/bzrlib/tests/branch_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/branch_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/bzrdir_implementations +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.py +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interrepository_implementations +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.py +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interversionedfile_implementations +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.py +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/repository_implementations +%{python_sitelib}/bzrlib/tests/repository_implementations/*.py +%{python_sitelib}/bzrlib/tests/repository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/repository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/revisionstore_implementations +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.py +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/workingtree_implementations +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.py +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo + %changelog +* Wed May 10 2006 Shahms E. King 0.8-1 +- Update to new upstream version +- Update bzr-sys-etree.patch for changes + * Mon Feb 13 2006 Shahms E. King 0.7-3 - Add python-elementtree to BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Feb 2006 19:00:25 -0000 1.2 +++ sources 10 May 2006 22:40:38 -0000 1.3 @@ -1 +1 @@ -5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz +88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz From fedora-extras-commits at redhat.com Wed May 10 22:40:31 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 10 May 2006 15:40:31 -0700 Subject: rpms/bzr/FC-4 .cvsignore, 1.2, 1.3 bzr-sys-etree.patch, 1.1, 1.2 bzr.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605102241.k4AMf4Wh028938@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28866/FC-4 Modified Files: .cvsignore bzr-sys-etree.patch bzr.spec sources Log Message: update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Feb 2006 19:00:25 -0000 1.2 +++ .cvsignore 10 May 2006 22:40:31 -0000 1.3 @@ -1 +1 @@ -bzr-0.7.tar.gz +bzr-0.8.tar.gz bzr-sys-etree.patch: Index: bzr-sys-etree.patch =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/bzr-sys-etree.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-sys-etree.patch 10 Feb 2006 19:00:25 -0000 1.1 +++ bzr-sys-etree.patch 10 May 2006 22:40:31 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur bzr-0.7.orig/bzrlib/xml.py bzr-0.7/bzrlib/xml.py ---- bzr-0.7.orig/bzrlib/xml.py 2006-01-23 01:33:08.000000000 -0800 -+++ bzr-0.7/bzrlib/xml.py 2006-02-10 09:37:34.000000000 -0800 +diff -ru bzr-0.8.orig/bzrlib/xml_serializer.py bzr-0.8/bzrlib/xml_serializer.py +--- bzr-0.8.orig/bzrlib/xml_serializer.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/bzrlib/xml_serializer.py 2006-05-10 15:19:46.000000000 -0700 @@ -30,9 +30,9 @@ except ImportError: mutter('WARNING: using slower ElementTree; consider installing cElementTree' @@ -14,11 +14,11 @@ from bzrlib.errors import BzrError -diff -ur bzr-0.7.orig/setup.py bzr-0.7/setup.py ---- bzr-0.7.orig/setup.py 2006-01-23 01:33:09.000000000 -0800 -+++ bzr-0.7/setup.py 2006-02-10 09:36:39.000000000 -0800 -@@ -96,7 +96,6 @@ - 'bzrlib.transport', +diff -ru bzr-0.8.orig/setup.py bzr-0.8/setup.py +--- bzr-0.8.orig/setup.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/setup.py 2006-05-10 15:20:04.000000000 -0700 +@@ -108,7 +108,6 @@ + 'bzrlib.transport.http', 'bzrlib.ui', 'bzrlib.util', - 'bzrlib.util.elementtree', Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/bzr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bzr.spec 13 Feb 2006 15:59:18 -0000 1.3 +++ bzr.spec 10 May 2006 22:40:31 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.7 -Release: 3%{dist} +Version: 0.8 +Release: 1%{dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -51,6 +51,16 @@ %{python_sitelib}/bzrlib/*.pyc %ghost %{python_sitelib}/bzrlib/*.pyo +%dir %{python_sitelib}/bzrlib/doc +%{python_sitelib}/bzrlib/doc/*.py +%{python_sitelib}/bzrlib/doc/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/*.pyo + +%dir %{python_sitelib}/bzrlib/doc/api +%{python_sitelib}/bzrlib/doc/api/*.py +%{python_sitelib}/bzrlib/doc/api/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/api/*.pyo + %dir %{python_sitelib}/bzrlib/export %{python_sitelib}/bzrlib/export/*.py %{python_sitelib}/bzrlib/export/*.pyc @@ -81,15 +91,20 @@ %{python_sitelib}/bzrlib/store/*.pyc %ghost %{python_sitelib}/bzrlib/store/*.pyo -%dir %{python_sitelib}/bzrlib/tests -%{python_sitelib}/bzrlib/tests/*.py -%{python_sitelib}/bzrlib/tests/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/*.pyo - -%dir %{python_sitelib}/bzrlib/tests/blackbox -%{python_sitelib}/bzrlib/tests/blackbox/*.py -%{python_sitelib}/bzrlib/tests/blackbox/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo +%dir %{python_sitelib}/bzrlib/store/revision +%{python_sitelib}/bzrlib/store/revision/*.py +%{python_sitelib}/bzrlib/store/revision/*.pyc +%ghost %{python_sitelib}/bzrlib/store/revision/*.pyo + +%dir %{python_sitelib}/bzrlib/store/versioned +%{python_sitelib}/bzrlib/store/versioned/*.py +%{python_sitelib}/bzrlib/store/versioned/*.pyc +%ghost %{python_sitelib}/bzrlib/store/versioned/*.pyo + +%dir %{python_sitelib}/bzrlib/transport/http +%{python_sitelib}/bzrlib/transport/http/*.py +%{python_sitelib}/bzrlib/transport/http/*.pyc +%ghost %{python_sitelib}/bzrlib/transport/http/*.pyo %dir %{python_sitelib}/bzrlib/ui %{python_sitelib}/bzrlib/ui/*.py @@ -101,7 +116,56 @@ %{python_sitelib}/bzrlib/util/effbot/org/*.pyc %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo +%dir %{python_sitelib}/bzrlib/tests +%{python_sitelib}/bzrlib/tests/*.py +%{python_sitelib}/bzrlib/tests/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/blackbox +%{python_sitelib}/bzrlib/tests/blackbox/*.py +%{python_sitelib}/bzrlib/tests/blackbox/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/branch_implementations +%{python_sitelib}/bzrlib/tests/branch_implementations/*.py +%{python_sitelib}/bzrlib/tests/branch_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/branch_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/bzrdir_implementations +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.py +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interrepository_implementations +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.py +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interversionedfile_implementations +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.py +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/repository_implementations +%{python_sitelib}/bzrlib/tests/repository_implementations/*.py +%{python_sitelib}/bzrlib/tests/repository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/repository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/revisionstore_implementations +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.py +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/workingtree_implementations +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.py +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo + %changelog +* Wed May 10 2006 Shahms E. King 0.8-1 +- Update to new upstream version +- Update bzr-sys-etree.patch for changes + * Mon Feb 13 2006 Shahms E. King 0.7-3 - Add python-elementtree to BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Feb 2006 19:00:25 -0000 1.2 +++ sources 10 May 2006 22:40:31 -0000 1.3 @@ -1 +1 @@ -5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz +88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz From fedora-extras-commits at redhat.com Wed May 10 22:40:32 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 10 May 2006 15:40:32 -0700 Subject: rpms/bzr/FC-5 .cvsignore, 1.2, 1.3 bzr-sys-etree.patch, 1.1, 1.2 bzr.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605102241.k4AMf4tZ028947@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28866/FC-5 Modified Files: .cvsignore bzr-sys-etree.patch bzr.spec sources Log Message: update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Feb 2006 19:00:25 -0000 1.2 +++ .cvsignore 10 May 2006 22:40:32 -0000 1.3 @@ -1 +1 @@ -bzr-0.7.tar.gz +bzr-0.8.tar.gz bzr-sys-etree.patch: Index: bzr-sys-etree.patch =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/bzr-sys-etree.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-sys-etree.patch 10 Feb 2006 19:00:25 -0000 1.1 +++ bzr-sys-etree.patch 10 May 2006 22:40:32 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur bzr-0.7.orig/bzrlib/xml.py bzr-0.7/bzrlib/xml.py ---- bzr-0.7.orig/bzrlib/xml.py 2006-01-23 01:33:08.000000000 -0800 -+++ bzr-0.7/bzrlib/xml.py 2006-02-10 09:37:34.000000000 -0800 +diff -ru bzr-0.8.orig/bzrlib/xml_serializer.py bzr-0.8/bzrlib/xml_serializer.py +--- bzr-0.8.orig/bzrlib/xml_serializer.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/bzrlib/xml_serializer.py 2006-05-10 15:19:46.000000000 -0700 @@ -30,9 +30,9 @@ except ImportError: mutter('WARNING: using slower ElementTree; consider installing cElementTree' @@ -14,11 +14,11 @@ from bzrlib.errors import BzrError -diff -ur bzr-0.7.orig/setup.py bzr-0.7/setup.py ---- bzr-0.7.orig/setup.py 2006-01-23 01:33:09.000000000 -0800 -+++ bzr-0.7/setup.py 2006-02-10 09:36:39.000000000 -0800 -@@ -96,7 +96,6 @@ - 'bzrlib.transport', +diff -ru bzr-0.8.orig/setup.py bzr-0.8/setup.py +--- bzr-0.8.orig/setup.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/setup.py 2006-05-10 15:20:04.000000000 -0700 +@@ -108,7 +108,6 @@ + 'bzrlib.transport.http', 'bzrlib.ui', 'bzrlib.util', - 'bzrlib.util.elementtree', Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/bzr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bzr.spec 13 Feb 2006 15:59:24 -0000 1.3 +++ bzr.spec 10 May 2006 22:40:32 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.7 -Release: 3%{dist} +Version: 0.8 +Release: 1%{dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -51,6 +51,16 @@ %{python_sitelib}/bzrlib/*.pyc %ghost %{python_sitelib}/bzrlib/*.pyo +%dir %{python_sitelib}/bzrlib/doc +%{python_sitelib}/bzrlib/doc/*.py +%{python_sitelib}/bzrlib/doc/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/*.pyo + +%dir %{python_sitelib}/bzrlib/doc/api +%{python_sitelib}/bzrlib/doc/api/*.py +%{python_sitelib}/bzrlib/doc/api/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/api/*.pyo + %dir %{python_sitelib}/bzrlib/export %{python_sitelib}/bzrlib/export/*.py %{python_sitelib}/bzrlib/export/*.pyc @@ -81,15 +91,20 @@ %{python_sitelib}/bzrlib/store/*.pyc %ghost %{python_sitelib}/bzrlib/store/*.pyo -%dir %{python_sitelib}/bzrlib/tests -%{python_sitelib}/bzrlib/tests/*.py -%{python_sitelib}/bzrlib/tests/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/*.pyo - -%dir %{python_sitelib}/bzrlib/tests/blackbox -%{python_sitelib}/bzrlib/tests/blackbox/*.py -%{python_sitelib}/bzrlib/tests/blackbox/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo +%dir %{python_sitelib}/bzrlib/store/revision +%{python_sitelib}/bzrlib/store/revision/*.py +%{python_sitelib}/bzrlib/store/revision/*.pyc +%ghost %{python_sitelib}/bzrlib/store/revision/*.pyo + +%dir %{python_sitelib}/bzrlib/store/versioned +%{python_sitelib}/bzrlib/store/versioned/*.py +%{python_sitelib}/bzrlib/store/versioned/*.pyc +%ghost %{python_sitelib}/bzrlib/store/versioned/*.pyo + +%dir %{python_sitelib}/bzrlib/transport/http +%{python_sitelib}/bzrlib/transport/http/*.py +%{python_sitelib}/bzrlib/transport/http/*.pyc +%ghost %{python_sitelib}/bzrlib/transport/http/*.pyo %dir %{python_sitelib}/bzrlib/ui %{python_sitelib}/bzrlib/ui/*.py @@ -101,7 +116,56 @@ %{python_sitelib}/bzrlib/util/effbot/org/*.pyc %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo +%dir %{python_sitelib}/bzrlib/tests +%{python_sitelib}/bzrlib/tests/*.py +%{python_sitelib}/bzrlib/tests/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/blackbox +%{python_sitelib}/bzrlib/tests/blackbox/*.py +%{python_sitelib}/bzrlib/tests/blackbox/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/branch_implementations +%{python_sitelib}/bzrlib/tests/branch_implementations/*.py +%{python_sitelib}/bzrlib/tests/branch_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/branch_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/bzrdir_implementations +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.py +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interrepository_implementations +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.py +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interversionedfile_implementations +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.py +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/repository_implementations +%{python_sitelib}/bzrlib/tests/repository_implementations/*.py +%{python_sitelib}/bzrlib/tests/repository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/repository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/revisionstore_implementations +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.py +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/workingtree_implementations +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.py +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo + %changelog +* Wed May 10 2006 Shahms E. King 0.8-1 +- Update to new upstream version +- Update bzr-sys-etree.patch for changes + * Mon Feb 13 2006 Shahms E. King 0.7-3 - Add python-elementtree to BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Feb 2006 19:00:25 -0000 1.2 +++ sources 10 May 2006 22:40:32 -0000 1.3 @@ -1 +1 @@ -5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz +88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz From fedora-extras-commits at redhat.com Wed May 10 23:03:05 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 10 May 2006 16:03:05 -0700 Subject: rpms/naim/devel .cvsignore, 1.6, 1.7 naim.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200605102303.k4AN3bUS031618@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561 Modified Files: .cvsignore naim.spec sources Log Message: 0.11.8.2 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Mar 2006 01:01:43 -0000 1.6 +++ .cvsignore 10 May 2006 23:03:04 -0000 1.7 @@ -1 +1 @@ -naim-0.11.8.2-2006-02-28-2047.tar.bz2 +naim-0.11.8.2.tar.bz2 Index: naim.spec =================================================================== RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- naim.spec 17 Mar 2006 01:01:43 -0000 1.9 +++ naim.spec 10 May 2006 23:03:04 -0000 1.10 @@ -1,14 +1,12 @@ -%define snapshot 2006-02-28-2047 - Name: naim Version: 0.11.8.2 -Release: 2%{?dist} +Release: 4%{?dist} 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}-%{snapshot}.tar.bz2 +Source0: http://shell.n.ml.org/n/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -18,7 +16,7 @@ Internet Relay Chat (IRC), and The lily CMC. %prep -%setup -q -n %{name}-%{version}-%{snapshot} +%setup -q %build %configure @@ -40,6 +38,9 @@ %{_mandir}/*/* %changelog +* Wed May 10 2006 Luke Macken 0.11.8.2-4 +- 0.11.8.2 final + * Thu Mar 16 2006 Luke Macken 0.11.8.2-3 - 2006-02-28-2047 development snapshot Index: sources =================================================================== RCS file: /cvs/extras/rpms/naim/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Mar 2006 01:01:43 -0000 1.6 +++ sources 10 May 2006 23:03:04 -0000 1.7 @@ -1 +1 @@ -6e4f551a4bc784b889a0368e0aa2a0a3 naim-0.11.8.2-2006-02-28-2047.tar.bz2 +92bfbf60c4fd8f0eab4c4c6bbfe50422 naim-0.11.8.2.tar.bz2 From fedora-extras-commits at redhat.com Thu May 11 00:05:57 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 10 May 2006 17:05:57 -0700 Subject: fedora-security/audit fe4,1.18,1.19 fe5,1.18,1.19 Message-ID: <200605110005.k4B05vWA001687@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1667 Modified Files: fe4 fe5 Log Message: Add perl-Net-SSLeay issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fe4 10 May 2006 19:14:08 -0000 1.18 +++ fe4 11 May 2006 00:05:54 -0000 1.19 @@ -75,3 +75,4 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) +CVE-2005-0106 VULNERABLE (perl-Net-SSLeay) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fe5 10 May 2006 19:14:08 -0000 1.18 +++ fe5 11 May 2006 00:05:54 -0000 1.19 @@ -77,3 +77,4 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) +CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.30-3) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch From fedora-extras-commits at redhat.com Thu May 11 01:34:27 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Wed, 10 May 2006 18:34:27 -0700 Subject: krbVmodule krb5module.c,1.21,1.22 Message-ID: <200605110134.k4B1YR1r004363@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/devel/krbVmodule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346 Modified Files: krb5module.c Log Message: enable setting address information manually Index: krb5module.c =================================================================== RCS file: /cvs/devel/krbVmodule/krb5module.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- krb5module.c 5 Apr 2006 05:11:07 -0000 1.21 +++ krb5module.c 11 May 2006 01:34:25 -0000 1.22 @@ -1047,6 +1047,52 @@ } } +typedef struct addr_storage +{ + struct in_addr ip4; + struct in6_addr ip6; +} addr_storage; + +/* Convert a string representation of an address to a krb5_address */ +static int +str_to_addr(const char* address, krb5_address *krb5addr, addr_storage *as) +{ + struct in_addr ipv4addr; + struct in6_addr ipv6addr; + + /* First try ipv4, and if that fails, try ipv6 */ + if (inet_pton(AF_INET, address, &ipv4addr)) { + krb5addr->addrtype = ADDRTYPE_INET; + as->ip4 = ipv4addr; + krb5addr->length = sizeof(as->ip4.s_addr); + krb5addr->contents = (krb5_octet *) &(as->ip4.s_addr); + return 1; + } else if (inet_pton(AF_INET6, address, &ipv6addr)) { + krb5addr->addrtype = ADDRTYPE_INET6; + as->ip6 = ipv6addr; + krb5addr->length = sizeof(as->ip6.s6_addr); + krb5addr->contents = (krb5_octet *) &(as->ip6.s6_addr); + return 1; + } + + return 0; +} + +/* Convert an unsigned short port to a krb5_address */ +static int +port_to_addr(unsigned short port, krb5_address *krb5addr) +{ + /* If port == 0, don't set anything and return 0 */ + if (port > 0) { + krb5addr->addrtype = ADDRTYPE_IPPORT; + krb5addr->length = sizeof(port); + krb5addr->contents = (krb5_octet *) &port; + return 1; + } + + return 0; +} + /*********************** AuthContext **********************/ static PyObject* AuthContext_getattr(PyObject *unself __UNUSED, PyObject *args) @@ -1152,7 +1198,7 @@ krb5_context ctx = NULL; krb5_auth_context ac = NULL; krb5_error_code rc; - + if(!PyArg_ParseTuple(args, "OO!O:__setattr__", &self, &PyString_Type, &nameo, &value)) return NULL; inst = (PyInstanceObject *)self; @@ -1213,10 +1259,56 @@ if(rc) return pk_error(rc); } - else if(!strcmp(name, "addrs") - || (!strcmp(name, "context") && ctx) - || (!strcmp(name, "_ac") && ac) - ) + else if(!strcmp(name, "addrs")) + { + krb5_address localaddr, remoteaddr, localport, remoteport; + krb5_address *la = NULL, *ra = NULL, *lp = NULL, *rp = NULL; + unsigned int lport, rport; + char *laddr, *raddr; + addr_storage local_as, remote_as; + + if(!PyArg_ParseTuple(value, "zIzI", &laddr, &lport, &raddr, &rport)) + return NULL; + + if(laddr) { + if (str_to_addr(laddr, &localaddr, &local_as)) { + la = &localaddr; + } else { + PyErr_Format(PyExc_AttributeError, "invalid address: %.400s", laddr); + return NULL; + } + } + + if(raddr) { + if (str_to_addr(raddr, &remoteaddr, &remote_as)) { + ra = &remoteaddr; + } else { + PyErr_Format(PyExc_AttributeError, "invalid address: %.400s", raddr); + return NULL; + } + } + + if(lport > 65535 || rport > 65535) { + PyErr_Format(PyExc_AttributeError, "port numbers cannot be greater than 65535"); + return NULL; + } + + if (port_to_addr((unsigned short) lport, &localport)) + lp = &localport; + + if (port_to_addr((unsigned short) rport, &remoteport)) + rp = &remoteport; + + rc = krb5_auth_con_setaddrs(ctx, ac, la, ra); + if(rc) + return pk_error(rc); + + rc = krb5_auth_con_setports(ctx, ac, lp, rp); + if(rc) + return pk_error(rc); + } + else if((!strcmp(name, "context") && ctx) || + (!strcmp(name, "_ac") && ac)) { PyErr_Format(PyExc_AttributeError, "You cannot set attribute '%.400s'", name); return NULL; From fedora-extras-commits at redhat.com Thu May 11 01:37:44 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Wed, 10 May 2006 18:37:44 -0700 Subject: krbVmodule python-krbV.spec,1.3,1.4 Message-ID: <200605110137.k4B1biT1004407@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/devel/krbVmodule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4390 Modified Files: python-krbV.spec Log Message: bump release Index: python-krbV.spec =================================================================== RCS file: /cvs/devel/krbVmodule/python-krbV.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-krbV.spec 27 Apr 2006 19:52:36 -0000 1.3 +++ python-krbV.spec 11 May 2006 01:37:42 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)")} Name: python-krbV -Version: 1.0.12 -Release: 2%{?dist} +Version: 1.0.13 +Release: 1%{?dist} Summary: Python extension module for Kerberos 5 Group: Development/Languages @@ -47,6 +47,9 @@ %{python_sitelib}/krbVmodule.so %changelog +* Wed May 10 2006 Mike Bonnet - 1.0.13-1 +- AuthContext.addrs can now be set manually, rather than calling genaddrs() + * Thu Apr 27 2006 Mike Bonnet - 1.0.12-2 - configure.in: parse version number out of spec file - add URL tag From fedora-extras-commits at redhat.com Thu May 11 02:54:22 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 10 May 2006 19:54:22 -0700 Subject: fedora-security/audit fe4,1.19,1.20 Message-ID: <200605110254.k4B2sMlM007036@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018 Modified Files: fe4 Log Message: perl-Net-SSLeay bugzilla ticket. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fe4 11 May 2006 00:05:54 -0000 1.19 +++ fe4 11 May 2006 02:54:20 -0000 1.20 @@ -75,4 +75,4 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) -CVE-2005-0106 VULNERABLE (perl-Net-SSLeay) +CVE-2005-0106 VULNERABLE (perl-Net-SSLeay) bz#191351 From fedora-extras-commits at redhat.com Thu May 11 09:03:13 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 May 2006 02:03:13 -0700 Subject: extras-buildsys/utils extras-push-new, 1.6, 1.7 extras-repobuild.py, 1.14, 1.15 extras-repoview.py, 1.4, 1.5 Message-ID: <200605110903.k4B93DHn000497@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv472 Modified Files: extras-push-new extras-repobuild.py extras-repoview.py Log Message: - make run_and_check() check the range of returned error condition codes Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- extras-push-new 10 May 2006 21:41:37 -0000 1.6 +++ extras-push-new 11 May 2006 09:03:08 -0000 1.7 @@ -98,6 +98,8 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd + if result > 255: + sys.exit(1) sys.exit(result) Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- extras-repobuild.py 23 Apr 2006 13:44:36 -0000 1.14 +++ extras-repobuild.py 11 May 2006 09:03:08 -0000 1.15 @@ -51,6 +51,8 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd + if result > 255: + sys.exit(1) sys.exit(result) Index: extras-repoview.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extras-repoview.py 23 Apr 2006 13:44:36 -0000 1.4 +++ extras-repoview.py 11 May 2006 09:03:08 -0000 1.5 @@ -43,6 +43,8 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd + if result > 255: + sys.exit(1) sys.exit(result) From fedora-extras-commits at redhat.com Thu May 11 09:38:29 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 11 May 2006 02:38:29 -0700 Subject: fedora-security/audit fc4,1.240,1.241 fc5,1.153,1.154 Message-ID: <200605110938.k4B9cTfT000742@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv721 Modified Files: fc4 fc5 Log Message: Another quagga issue CVE name Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- fc4 10 May 2006 16:59:41 -0000 1.240 +++ fc4 11 May 2006 09:38:27 -0000 1.241 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060507 -Up to date FC4 as of 20060507 +Up to date CVE as of CVE email 20060510 +Up to date FC4 as of 20060510 ** are items that need attention +CVE-2006-2276 VULNERABLE (quagga) CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- fc5 10 May 2006 16:59:41 -0000 1.153 +++ fc5 11 May 2006 09:38:27 -0000 1.154 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060507 -Up to date FC5 as of 20060507 +Up to date CVE as of CVE email 20060510 +Up to date FC5 as of 20060510 ** are items that need attention +CVE-2006-2276 VULNERABLE (quagga) CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Thu May 11 10:54:14 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 May 2006 03:54:14 -0700 Subject: extras-buildsys/utils extras-push-new, 1.7, 1.8 extras-repobuild.py, 1.15, 1.16 extras-repoview.py, 1.5, 1.6 Message-ID: <200605111054.k4BAsEvV003348@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3326 Modified Files: extras-push-new extras-repobuild.py extras-repoview.py Log Message: - keep exit code in 0-127 Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- extras-push-new 11 May 2006 09:03:08 -0000 1.7 +++ extras-push-new 11 May 2006 10:54:11 -0000 1.8 @@ -98,7 +98,7 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd - if result > 255: + if result > 127: sys.exit(1) sys.exit(result) Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- extras-repobuild.py 11 May 2006 09:03:08 -0000 1.15 +++ extras-repobuild.py 11 May 2006 10:54:11 -0000 1.16 @@ -51,7 +51,7 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd - if result > 255: + if result > 127: sys.exit(1) sys.exit(result) Index: extras-repoview.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- extras-repoview.py 11 May 2006 09:03:08 -0000 1.5 +++ extras-repoview.py 11 May 2006 10:54:11 -0000 1.6 @@ -43,7 +43,7 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd - if result > 255: + if result > 127: sys.exit(1) sys.exit(result) From fedora-extras-commits at redhat.com Thu May 11 12:28:45 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Thu, 11 May 2006 05:28:45 -0700 Subject: owners owners.list,1.972,1.973 Message-ID: <200605111228.k4BCSlnr008700@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8683 Modified Files: owners.list Log Message: libnfnetlink - Netfilter netlink userspace library Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.972 retrieving revision 1.973 diff -u -r1.972 -r1.973 --- owners.list 10 May 2006 17:32:17 -0000 1.972 +++ owners.list 11 May 2006 12:28:44 -0000 1.973 @@ -648,6 +648,7 @@ Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|libnfnetlink|Netfilter netlink userspace library|i at stingr.net|extras-qa at fedoraproject.org| Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 12:52:17 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 11 May 2006 05:52:17 -0700 Subject: rpms/anjuta import.log,1.12,1.13 Message-ID: <200605111252.k4BCqJDY010010@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9976 Modified Files: import.log Log Message: auto-import anjuta-1.2.4a-2 on branch devel from anjuta-1.2.4a-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 23 Apr 2006 23:28:29 -0000 1.12 +++ import.log 11 May 2006 12:52:17 -0000 1.13 @@ -9,3 +9,4 @@ anjuta-1_2_4a-1:HEAD:anjuta-1.2.4a-1.src.rpm:1145834807 anjuta-1_2_4a-1:FC-5:anjuta-1.2.4a-1.src.rpm:1145834875 anjuta-1_2_4a-1:FC-4:anjuta-1.2.4a-1.src.rpm:1145834931 +anjuta-1_2_4a-2:HEAD:anjuta-1.2.4a-2.src.rpm:1147351927 From fedora-extras-commits at redhat.com Thu May 11 12:52:18 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 11 May 2006 05:52:18 -0700 Subject: rpms/anjuta/devel anjuta.spec,1.17,1.18 Message-ID: <200605111252.k4BCqKtM010014@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9976/devel Modified Files: anjuta.spec Log Message: auto-import anjuta-1.2.4a-2 on branch devel from anjuta-1.2.4a-2.src.rpm Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- anjuta.spec 23 Apr 2006 23:26:25 -0000 1.17 +++ anjuta.spec 11 May 2006 12:52:18 -0000 1.18 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.4a -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME IDE for C and C++ Group: Development/Tools @@ -114,6 +114,9 @@ %{_datadir}/omf/%{name} %changelog +* Thu May 11 2006 Paul F. Johnson 1.2.4a-2 +- rebuild + * Mon Apr 24 2006 Paul F. Johnson 1.2.4a-1 - Bump to newer version From fedora-extras-commits at redhat.com Thu May 11 13:19:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:19:33 -0700 Subject: rpms/childsplay - New directory Message-ID: <200605111319.k4BDJZGd014269@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14237/childsplay Log Message: Directory /cvs/extras/rpms/childsplay added to the repository From fedora-extras-commits at redhat.com Thu May 11 13:19:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:19:34 -0700 Subject: rpms/childsplay/devel - New directory Message-ID: <200605111319.k4BDJaVA014272@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14237/childsplay/devel Log Message: Directory /cvs/extras/rpms/childsplay/devel added to the repository From fedora-extras-commits at redhat.com Thu May 11 13:19:54 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:19:54 -0700 Subject: rpms/childsplay/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605111319.k4BDJu8V014345@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14304/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module childsplay --- NEW 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 May 11 13:19:53 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:19:53 -0700 Subject: rpms/childsplay Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605111319.k4BDJtrY014342@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14304 Added Files: Makefile import.log Log Message: Setup of module childsplay --- NEW FILE Makefile --- # Top level Makefile for module childsplay all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 11 13:20:40 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:20:40 -0700 Subject: rpms/childsplay import.log,1.1,1.2 Message-ID: <200605111320.k4BDKhIQ014471@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14433 Modified Files: import.log Log Message: auto-import childsplay-0.81.8-2 on branch devel from childsplay-0.81.8-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/childsplay/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 May 2006 13:19:53 -0000 1.1 +++ import.log 11 May 2006 13:20:40 -0000 1.2 @@ -0,0 +1 @@ +childsplay-0_81_8-2:HEAD:childsplay-0.81.8-2.src.rpm:1147353654 From fedora-extras-commits at redhat.com Thu May 11 13:20:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:20:41 -0700 Subject: rpms/childsplay/devel childsplay-0.81.8-assetml.patch, NONE, 1.1 childsplay-0.81.8-highscore.patch, NONE, 1.1 childsplay.desktop, NONE, 1.1 childsplay.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605111320.k4BDKh97014482@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14433/devel Modified Files: .cvsignore sources Added Files: childsplay-0.81.8-assetml.patch childsplay-0.81.8-highscore.patch childsplay.desktop childsplay.spec Log Message: auto-import childsplay-0.81.8-2 on branch devel from childsplay-0.81.8-2.src.rpm childsplay-0.81.8-assetml.patch: --- NEW FILE childsplay-0.81.8-assetml.patch --- --- childsplay-0.81.8/assetml/childsplay/memory-136x136/memory-136x136.assetml.assetml 2006-05-05 15:59:55.000000000 +0200 +++ childsplay-0.81.8/assetml/childsplay/memory-136x136/memory-136x136.assetml 2006-05-05 16:00:09.000000000 +0200 @@ -1,5 +1,5 @@ - + Apple ?????????? --- childsplay-0.81.8/pyassetml.py.assetml 2006-04-09 11:11:02.000000000 +0200 +++ childsplay-0.81.8/pyassetml.py 2006-05-05 15:58:28.000000000 +0200 @@ -164,9 +164,9 @@ rootnode = self.xml.getElementsByTagName('AssetML')[0] self.root_obj = RootNode() self.root_obj.dataset = rootnode.attributes[u'dataset'].value - path = rootnode.attributes[u'rootdir'].value[3:] #path starts with ../, loose it - #self.root_obj.rootdir = os.path.join(self.parserroot, path) - self.root_obj.rootdir = self.parserroot + path = rootnode.attributes[u'rootdir'].value + self.root_obj.rootdir = os.path.join(self.parserroot, path) + #self.root_obj.rootdir = self.parserroot self.root_obj.locale = rootnode.attributes[u'locale'].value for node in self.xmlnodes: --- childsplay-0.81.8/childsplay.py.assetml 2006-04-09 11:11:02.000000000 +0200 +++ childsplay-0.81.8/childsplay.py 2006-05-05 15:58:28.000000000 +0200 @@ -301,10 +301,10 @@ # create two assetmlSDL instances one for parsing images and one for sounds Assets_img = pyassetmlSDL.AssetmlSDL() -Assets_img.set_mldir('childsplay/childsplay-images/childsplay-images.assetml') +Assets_img.set_mldir('childsplay-images.assetml') Assets_snd = pyassetmlSDL.AssetmlSDL() -Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') +Assets_snd.set_mldir('childsplay-sounds.assetml') ############################################ ########### End toplevel code ##################### --- childsplay-0.81.8/lib/memory.py.assetml 2006-04-09 11:11:03.000000000 +0200 +++ childsplay-0.81.8/lib/memory.py 2006-05-05 15:58:28.000000000 +0200 @@ -57,9 +57,9 @@ raise MyError,text # create two assetmlSDL instances one for parsing images and one for sounds self.Assets_img = pyassetmlSDL.AssetmlSDL() - self.Assets_img.set_mldir('childsplay/memory-136x136/memory-136x136.assetml') + self.Assets_img.set_mldir('memory-136x136.assetml') self.Assets_snd = pyassetmlSDL.AssetmlSDL() - self.Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') + self.Assets_snd.set_mldir('childsplay-sounds.assetml') self.libdir = libdir # This will also used as a test if we are using other images --- childsplay-0.81.8/lib/letters.py.assetml 2006-04-09 11:11:03.000000000 +0200 +++ childsplay-0.81.8/lib/letters.py 2006-05-05 15:58:28.000000000 +0200 @@ -98,13 +98,13 @@ if DEBUG: print "ChildsplayGoodies",dir(ChildsplayGoodies) # create two assetmlSDL instances one for parsing images and one for sounds self.Assets_img = pyassetmlSDL.AssetmlSDL() - self.Assets_img.set_mldir('childsplay/childsplay-images/childsplay-images.assetml') + self.Assets_img.set_mldir('childsplay-images.assetml') Img.arrow = self.Assets_img.get_assets(('arrow.png',)) # get pictures - self.Assets_img.set_mldir('childsplay/memory-136x136/memory-136x136.assetml') + self.Assets_img.set_mldir('memory-136x136.assetml') descr_pics = self.Assets_img.get_assets(('*.png',),fullname=1)# {foo.png:foo.png object,spam.png:spam.png object} - parser = pyassetml.AssetmlParser('childsplay/memory-136x136/memory-136x136.assetml') + parser = pyassetml.AssetmlParser('memory-136x136.assetml') loc = ChildsplayGoodies.language if DEBUG: print "letters game, locale set to",loc @@ -124,7 +124,7 @@ if DEBUG: print "Found words",k self.Assets_snd = pyassetmlSDL.AssetmlSDL() - self.Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') + self.Assets_snd.set_mldir('childsplay-sounds.assetml') files = ('bummer.wav','wahoo.wav') self.Assets_snd.get_assets(files, Snd) childsplay-0.81.8-highscore.patch: --- NEW FILE childsplay-0.81.8-highscore.patch --- --- childsplay-0.81.8/CPConstants.py~ 2006-05-05 10:56:38.000000000 +0200 +++ childsplay-0.81.8/CPConstants.py 2006-05-05 10:56:38.000000000 +0200 @@ -21,7 +21,6 @@ MODULESDATADIR = BASEPATH.SHARELIBDATADIR LOCALEDIR = BASEPATH.LOCALEDIR ASSETMLROOT = BASEPATH.ASSETMLDIR -SCOREFILE = BASEPATH.SCOREFILE CHILDSPLAYRC = BASEPATH.CHILDSPLAYRC LIBDIR = BASEPATH.LIBDIR MODULES = BASEPATH.MODULESDIR @@ -43,6 +42,9 @@ except KeyError,info: print info HOMEDIR = os.path.abspath(sys.path[0]) + +# no sgid support for python, so drop the scorefile in the homedir +SCOREFILE = os.path.join(HOMEDIR, 'childsplay.score') # this is the directory tree in HOME_DIR_NAME. # Names seperated by commas are the names from which directories are created --- NEW FILE childsplay.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Childsplay GenericName=Educational games for young children Comment=Educational and at the same time be fun to play Exec=childsplay Icon=childsplay.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game; Version=0.81.8 --- NEW FILE childsplay.spec --- Name: childsplay Version: 0.81.8 Release: 2%{?dist} Summary: Suite of educational games for young children Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ Source: http://prdownloads.sourceforge.net/childsplay/%{name}-%{version}.tgz Source1: childsplay.desktop Patch0: childsplay-0.81.8-highscore.patch Patch1: childsplay-0.81.8-assetml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: desktop-file-utils Requires: pygame, childsplay_plugins >= 0.80.7 %description Childsplay is a suite of educational games for young children. It's written in Python and uses the SDL-libraries. The aim is to be educational and at the same time be fun to play. Some activities make use of language dependent voice samples, these sounds are shared with gcompris. For those you'll have to install the gcompris-sound package for the languages you intend to use. For example gcompris-sound-en . %prep %setup -q %patch0 -p1 -z .highscore # no backups otherwise the backups endup in the rpm. %patch1 -p1 # we don't use the buggy provided install rm install.py # the translation is merged into the assetml file, so don't ship it seperatly rm -r assetml/childsplay/memory-136x136/po # fixup the python scripts to call python directly and make them executable sed -i 's!/usr/bin/env python!%{_bindir}/python!' %{name}.py letters-trans.py chmod 755 %{name}.py letters-trans.py pyassetmlcreator.py # move these out of Data so our wildcard install doesn't install them mv Data/*.txt Data/chpl-icon-48*.png Data/childsplay.* . %build # INSTALL.sh is seriously borked, so DIY echo "## Automated file please do not edit" > BASEPATH.py echo "CPDIR=\"%{_datadir}/%{name}\"" >> BASEPATH.py echo "SHAREDATADIR=\"%{_datadir}/%{name}/Data\"" >> BASEPATH.py echo "RCDIR=\"%{_datadir}/%{name}/ConfigData\"" >> BASEPATH.py echo "SHARELIBDATADIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "LIBDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py %install rm -rf $RPM_BUILD_ROOT # INSTALL.sh is seriously borked, so DIY mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 cp -a *.py $RPM_BUILD_ROOT%{_datadir}/%{name} ln -s ../share/%{name}/%{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name} ln -s ../share/%{name}/letters-trans.py \ $RPM_BUILD_ROOT%{_bindir}/letters-trans cp -a Data $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name} mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \ $RPM_BUILD_ROOT%{_datadir}/assetml cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6 %find_lang %{name} # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 chpl-icon-48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-, root, root, -) %doc README* doc/GPL* doc/README* License_*.ttf.txt %{_bindir}/%{name} %{_bindir}/letters-trans %dir %{_datadir}/childsplay %{_datadir}/childsplay/*.py %{_datadir}/childsplay/*.pyc %ghost %{_datadir}/childsplay/*.pyo %{_datadir}/childsplay/Data %{_datadir}/childsplay/childsplay-images %{_datadir}/childsplay/childsplay-sounds %{_datadir}/childsplay/memory-136x136 %dir %{_datadir}/childsplay/plugins %{_datadir}/childsplay/plugins/*.py %{_datadir}/childsplay/plugins/*.pyc %ghost %{_datadir}/childsplay/plugins/*.pyo %{_datadir}/childsplay/plugins/*Data %{_datadir}/assetml %{_mandir}/man6/*.6.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog * Wed May 10 2006 Hans de Goede 0.81.8-2 - Ghost .pyo files - BR: desktop-file-utils * Fri May 5 2006 Hans de Goede 0.81.8-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 May 2006 13:19:54 -0000 1.1 +++ .cvsignore 11 May 2006 13:20:41 -0000 1.2 @@ -0,0 +1 @@ +childsplay-0.81.8.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 May 2006 13:19:54 -0000 1.1 +++ sources 11 May 2006 13:20:41 -0000 1.2 @@ -0,0 +1 @@ +2353509fda8cf7d32c8a10ebd8390370 childsplay-0.81.8.tgz From fedora-extras-commits at redhat.com Thu May 11 13:25:14 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:25:14 -0700 Subject: rpms/childsplay/devel childsplay.spec,1.1,1.2 Message-ID: <200605111325.k4BDPGAj014814@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14795 Modified Files: childsplay.spec Log Message: Fix Source0 URL Index: childsplay.spec =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay.spec 11 May 2006 13:20:41 -0000 1.1 +++ childsplay.spec 11 May 2006 13:25:14 -0000 1.2 @@ -5,7 +5,7 @@ Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ -Source: http://prdownloads.sourceforge.net/childsplay/%{name}-%{version}.tgz +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tgz Source1: childsplay.desktop Patch0: childsplay-0.81.8-highscore.patch Patch1: childsplay-0.81.8-assetml.patch From fedora-extras-commits at redhat.com Thu May 11 13:39:03 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:39:03 -0700 Subject: rpms/childsplay/devel childsplay.spec,1.2,1.3 Message-ID: <200605111339.k4BDd57x014891@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874 Modified Files: childsplay.spec Log Message: * Thu May 11 2006 Hans de Goede 0.81.8-3 - Fix not finding of initial/default childsplayrc file. Index: childsplay.spec =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- childsplay.spec 11 May 2006 13:25:14 -0000 1.2 +++ childsplay.spec 11 May 2006 13:39:03 -0000 1.3 @@ -1,6 +1,6 @@ Name: childsplay Version: 0.81.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Suite of educational games for young children Group: Amusements/Games License: GPL @@ -44,10 +44,10 @@ echo "## Automated file please do not edit" > BASEPATH.py echo "CPDIR=\"%{_datadir}/%{name}\"" >> BASEPATH.py echo "SHAREDATADIR=\"%{_datadir}/%{name}/Data\"" >> BASEPATH.py -echo "RCDIR=\"%{_datadir}/%{name}/ConfigData\"" >> BASEPATH.py echo "SHARELIBDATADIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "LIBDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py +echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py @@ -129,6 +129,9 @@ %changelog +* Thu May 11 2006 Hans de Goede 0.81.8-3 +- Fix not finding of initial/default childsplayrc file. + * Wed May 10 2006 Hans de Goede 0.81.8-2 - Ghost .pyo files - BR: desktop-file-utils From fedora-extras-commits at redhat.com Thu May 11 13:43:43 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 06:43:43 -0700 Subject: owners owners.list,1.973,1.974 Message-ID: <200605111343.k4BDhjLX014946@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14919 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.973 retrieving revision 1.974 diff -u -r1.973 -r1.974 --- owners.list 11 May 2006 12:28:44 -0000 1.973 +++ owners.list 11 May 2006 13:43:43 -0000 1.974 @@ -171,6 +171,7 @@ Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 14:06:32 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:06:32 -0700 Subject: rpms/python-clientform/devel .cvsignore, 1.2, 1.3 python-clientform.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605111406.k4BE6Y7H017363@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17342 Modified Files: .cvsignore python-clientform.spec sources Log Message: bump to 0.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Nov 2005 13:45:32 -0000 1.2 +++ .cvsignore 11 May 2006 14:06:32 -0000 1.3 @@ -1 +1 @@ -ClientForm-0.1.17.tar.gz +ClientForm-0.2.2.tar.gz Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-clientform.spec 15 Feb 2006 03:48:53 -0000 1.2 +++ python-clientform.spec 11 May 2006 14:06:32 -0000 1.3 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-clientform -Version: 0.1.17 -Release: 4%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages @@ -45,6 +45,9 @@ %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 11 2006 Luke Macken 0.2.2-1 +- Bump to 0.2.2 + * Tue Feb 14 2006 Josh Boyer 0.1.17-4 - Bump for FE5 rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Nov 2005 13:45:32 -0000 1.2 +++ sources 11 May 2006 14:06:32 -0000 1.3 @@ -1 +1 @@ -0aa01b3ebcdf800d7ec07c86c7e60b38 ClientForm-0.1.17.tar.gz +2aaff3f85450120b0d3875a221b3cc6e ClientForm-0.2.2.tar.gz From fedora-extras-commits at redhat.com Thu May 11 14:09:22 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:09:22 -0700 Subject: owners owners.list,1.974,1.975 Message-ID: <200605111409.k4BE9Oek017444@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17427 Modified Files: owners.list Log Message: own python-clientform Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.974 retrieving revision 1.975 diff -u -r1.974 -r1.975 --- owners.list 11 May 2006 13:43:43 -0000 1.974 +++ owners.list 11 May 2006 14:09:22 -0000 1.975 @@ -1307,7 +1307,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-chm|Python package for CHM files handling|pertusus at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|python-clientform|Python module for client-side HTML forms|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| +Fedora Extras|python-clientform|Python module for client-side HTML forms|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-cpio|A Python module for accessing cpio archives|ivazquez at ivazquez.net|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| From fedora-extras-commits at redhat.com Thu May 11 14:11:01 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:11:01 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.3,1.4 Message-ID: <200605111411.k4BEB3vP017467@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17450 Modified Files: python-clientform.spec Log Message: fix version in Source0 Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-clientform.spec 11 May 2006 14:06:32 -0000 1.3 +++ python-clientform.spec 11 May 2006 14:11:01 -0000 1.4 @@ -8,7 +8,7 @@ Group: Development/Languages License: BSD URL: http://wwwsearch.sourceforge.net/ClientForm/ -Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-0.1.17.tar.gz +Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From fedora-extras-commits at redhat.com Thu May 11 14:12:48 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:12:48 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.4,1.5 Message-ID: <200605111412.k4BECoXA017499@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17482 Modified Files: python-clientform.spec Log Message: bumpage Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-clientform.spec 11 May 2006 14:11:01 -0000 1.4 +++ python-clientform.spec 11 May 2006 14:12:47 -0000 1.5 @@ -45,6 +45,9 @@ %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 12 2006 Luke Macken 0.2.2-2 +- Fix version in Source0 + * Thu May 11 2006 Luke Macken 0.2.2-1 - Bump to 0.2.2 From fedora-extras-commits at redhat.com Thu May 11 14:15:45 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 11 May 2006 07:15:45 -0700 Subject: fedora-security/audit fc4,1.241,1.242 fc5,1.154,1.155 Message-ID: <200605111415.k4BEFjQi017571@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17550 Modified Files: fc4 fc5 Log Message: Note the quagga bugs. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- fc4 11 May 2006 09:38:27 -0000 1.241 +++ fc4 11 May 2006 14:15:42 -0000 1.242 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-2276 VULNERABLE (quagga) +CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- fc5 11 May 2006 09:38:27 -0000 1.154 +++ fc5 11 May 2006 14:15:42 -0000 1.155 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-2276 VULNERABLE (quagga) +CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Thu May 11 14:32:23 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:32:23 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.5,1.6 Message-ID: <200605111432.k4BEWPlm017780@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761 Modified Files: python-clientform.spec Log Message: ... one more time . Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-clientform.spec 11 May 2006 14:12:47 -0000 1.5 +++ python-clientform.spec 11 May 2006 14:32:23 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-clientform Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages From fedora-extras-commits at redhat.com Thu May 11 14:38:25 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:38:25 -0700 Subject: rpms/ctapi-cyberjack - New directory Message-ID: <200605111438.k4BEcRi7017934@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17908/ctapi-cyberjack Log Message: Directory /cvs/extras/rpms/ctapi-cyberjack added to the repository From fedora-extras-commits at redhat.com Thu May 11 14:38:26 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:38:26 -0700 Subject: rpms/ctapi-cyberjack/devel - New directory Message-ID: <200605111438.k4BEcSeC017937@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17908/ctapi-cyberjack/devel Log Message: Directory /cvs/extras/rpms/ctapi-cyberjack/devel added to the repository From fedora-extras-commits at redhat.com Thu May 11 14:38:59 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:38:59 -0700 Subject: rpms/ctapi-cyberjack Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605111439.k4BEd1Ku017981@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17953 Added Files: Makefile import.log Log Message: Setup of module ctapi-cyberjack --- NEW FILE Makefile --- # Top level Makefile for module ctapi-cyberjack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 11 14:38:59 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:38:59 -0700 Subject: rpms/ctapi-cyberjack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605111439.k4BEd1l1017984@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17953/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ctapi-cyberjack --- NEW 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 May 11 14:40:35 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:40:35 -0700 Subject: rpms/ctapi-cyberjack import.log,1.1,1.2 Message-ID: <200605111440.k4BEebA3018065@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18030 Modified Files: import.log Log Message: auto-import ctapi-cyberjack-2.0.8-13FC5 on branch devel from ctapi-cyberjack-2.0.8-13FC5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 May 2006 14:38:58 -0000 1.1 +++ import.log 11 May 2006 14:40:35 -0000 1.2 @@ -0,0 +1 @@ +ctapi-cyberjack-2_0_8-13FC5:HEAD:ctapi-cyberjack-2.0.8-13FC5.src.rpm:1147358412 From fedora-extras-commits at redhat.com Thu May 11 14:40:35 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:40:35 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec, NONE, 1.1 ctapi-cyberjack_MakefileCtAPI.patch, NONE, 1.1 ctapi-cyberjack_MakefilePCSC.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605111440.k4BEecCX018074@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18030/devel Modified Files: .cvsignore sources Added Files: ctapi-cyberjack.spec ctapi-cyberjack_MakefileCtAPI.patch ctapi-cyberjack_MakefilePCSC.patch Log Message: auto-import ctapi-cyberjack-2.0.8-13FC5 on branch devel from ctapi-cyberjack-2.0.8-13FC5.src.rpm --- NEW FILE ctapi-cyberjack.spec --- Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.8 Release: 13%{?dist} Requires: %{_libdir}/ctapi #For FC>4 BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 #For FC4 #BuildRequires: libusb-devel readline-devel URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.8/ctapi-cyberjack-2.0.8.tar.bz2 License: LGPL Group: Development/Libraries Source: %{name}-%{version}.tar.bz2 Patch0: ctapi-cyberjack_MakefileCtAPI.patch Patch1: ctapi-cyberjack_MakefilePCSC.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #for FC4 #%%define readers_dir %{_libdir}/readers #for FC>4 %define readers_dir %(pkg-config libpcsclite --variable=usbdropdir) %package devel Summary: Development files for libctapi-cyberjack Requires: %{name} = %{version} Group: Development/Libraries %package pcsc Summary: PC/SC Module Requires: pcsc-lite Group: Development/Libraries %description REINER SCT cyberJack pinpad/e-com USB user space driver This package includes the CT-API driver for the cyberJack pinpad/e-com USB chipcard reader. The kernel side driver is included in the official linux kernel starting with version 2.4.6. For more information regarding installation under Linux see the README.txt in the documentation directory, esp. regarding compatibility with host controllers. For more information about the reader, software updates and a shop see http://www.reiner-sct.com WARNING Use the tool ctsh only when you know what you are doing!!! Or you can damage your SmartCard!!! Hint When using the CT-API lib you must first stop the PC/SC daemon, when you use it. %description devel Development files for libctapi-cyberjack %description pcsc Files for the PC/SC system. %prep %setup -q -n %{name}-%{version} #fix path for the driver lib the config file sed -i "s\/usr/lib/readers/libcyberjack_ifd.so\%{readers_dir}/libcyberjack_ifd.so\1" \ etc/reader.conf #fix reader.conf for FC>4 sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf %patch0 -p1 %patch1 -p1 %build #make %{?_smp_mflags} will fail!!! make %install rm -rf $RPM_BUILD_ROOT # CT-API mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{_libdir}/ctapi/libctapi-cyberjack.so install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/cjgeldkarte install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ctsh # PC/SC mkdir -p $RPM_BUILD_ROOT%{readers_dir} install -m 755 pcsc/libcyberjack_ifd.so $RPM_BUILD_ROOT%{readers_dir}/libcyberjack_ifd.so mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d install -m 444 etc/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/cyberjack.conf %post pcsc #register PC/SC driver and restart daemon /sbin/service pcscd condrestart||: %postun pcsc #unregister PC/SC driver and restart daemon /sbin/service pcscd condrestart||: %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %doc COPYRIGHT* %doc doc/README.txt %doc doc/README.pdf %doc doc/README.html %defattr(-,root,root,-) # CT-API %{_libdir}/ctapi/libctapi-cyberjack.so %{_bindir}/cjgeldkarte %{_bindir}/ctsh %files pcsc # PC/SC %defattr(755,root,root) /%{readers_dir}/libcyberjack_ifd.so %attr(644,root,root) %config(noreplace) %{_sysconfdir}/reader.conf.d/cyberjack.conf %files devel %defattr(0644,root,root) %{_includedir}/ctapi-cyberjack/ctapi.h %changelog * Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} - rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to libcyberjack_ifd.so - fix place for the comments of /sbin/service pcscd condrestart * Wed May 10 2006 Frank B??ttner - 2.0.8-12%{?dist} - fix comments for %%post/%%postun pcsc - fix call of restart the PC/SC daemon - move to the old version of dependency for the PC/SC package - add -soname option in PS/SC driver * Tue May 9 2006 Frank B??ttner - 2.0.8-11%{?dist} - remove comments at %%post and %%postun - remove unneeded /usr/sbin/update-reader.conf call * Mon May 8 2006 Frank B??ttner - 2.0.8-10%{?dist} - fix ldconfig for the PC/SC part - fix dependency for the PC/SC package - fix build dependency for the package. * Mon May 8 2006 Frank B??ttner - 2.0.8-9%{?dist} - restart PC/SC daemon only when it run's - fix CT-API version bug so that apps can find it in the ldcache via libctapi-cyberjack.so - add comment about using CT-API and PC/SC together * Sun May 7 2006 Frank B??ttner - 2.0.8-8%{?dist} - add requirement of the ctapi dir under %{_libdir} - the CT-API lib lives now under %{_libdir}/ctapi - reenable link the ctapi driver static in the PC/SC part - run ldconfig after install/uninstall * Mon May 1 2006 Frank B??ttner - 2.0.8-7%{?dist} - fix permission of ctapi-cyberjack-2.0.8.tar.bz2 and ctapi-cyberjack.spec - fix permisson of the PC/SC config file - restart PC/SC daemon after remove the PS/SC driver * Sun Apr 30 2006 Frank B??ttner - 2.0.8-6%{?dist} - replace if statements with comments - replace german to english comments - fix the makefile for the CT-API lib - correct naming the libs CT-API and PS/SC - rename package PS/SC to pcsc - replace RPM_BUILD_ROOT - fix doc - add warning for the tool ctsh * Thu Apr 27 2006 Frank B??ttner - 2.0.8-5%{dist} - fix owner of lib's - add PC/SC fix for FC5 - restart pcscd * Thu Apr 27 2006 Frank B??ttner - 2.0.8-4%{dist} - change permisson of all lib's to 0755 - rename lib files to support more reader's - fix the path of the CT-API part and the devel file - support FC4 and FC5 * Sat Apr 15 2006 Frank B??ttner - 2.0.8-3%{dist} - remove makefile workaround * Sat Apr 15 2006 Frank B??ttner - 2.0.8-2%{dist} - remove packager - remove hardcodet Fedora Tag - rename file from ctapi-cyberjack-version to ctapi-cyberjack - modify source URL - fix clean section * Sat Apr 08 2006 Frank B??ttner - 2.0.8-1.FC4 - start for Fedora - sepperate the PC/SC part * Wed Mar 02 2005 - Harald Welte + ctapi-cyberjack-2.0.8-1 - fix double-free bug - update support email address to reflect current one - fix 'make install' target - add '-lusb' to libcyberjack_ifd (Martin Preuss) * Sun Jan 30 2005 - Harald Welte + ctapi-cyberjack-2.0.6-1 - add magic to automatically put current version number in specfile - add 0x800 e-com direct-ttyUSBx open hack - fix initialization errors (Martin Preuss) - simplified Makefile System (Martin Preuss) - Added make target "install" (Martin Preuss) - Fixed the name of the CTAPI driver loaded by "cjgeldkarte" - Fix typos in README.xml * Sun Dec 19 2004 - Harald Welte + ctapi-cyberjack-2.0.5-1 - add functionality to beep at keypress - introduce CJCTAPI_NO_KEYBEEP environment variable * Wed Nov 17 2004 - Harald Welte + ctapi-cyberjack-2.0.4-2 - add x86_64 -fPIC patch for pcsc - add x86_64 64bit data type patch * Tue Nov 16 2004 - Harald Welte + ctapi-cyberjack-2.0.4-1 - fixes: gcc-2.95 compile, cjgeldkarte-getopt, SIGSEGV / ctapiClose * Tue Nov 02 2004 - Harald Welte + ctapi-cyberjack-2.0.2-1 - fix libusb linking dependency * Wed Aug 25 2004 - Harald Welte + ctapi-cyberjack-2.0.1-1 - Bugfixes in REINER-SCT driver for pinpad_a * Fri Aug 13 2004 - Harald Welte + ctapi-cyberjack-2.0.0-0beta1 - final new usb ProductID (0x300) for pp_a - Include build of pcsc library - Include ctsh - Include static library into -devel * Wed Aug 11 2004 - Harald Welte + ctapi-cyberjack-2.0.0-0beta - Update to new major release including pinpad_a support - New dual driver shared library architecture * Tue Mar 18 2003 - Matthias Bruestle - Devices are created, when not present. * Sun May 03 2002 - Matthias Bruestle - Added ctsh. * Fri Dec 21 2001 - Matthias Bruestle - Added cjgeldkarte. * Fri Dec 14 2001 - Matthias Bruestle - Added some polish. * Sat Dec 01 2001 - Matthias Bruestle - Added PC/SC IFD handler. * Sun Aug 26 2001 - mge at suse.de - adopted package to SuSE build system * Sun Jun 03 2001 - Matthias Bruestle Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18131 Modified Files: gcompris-7.4-xf86vidmode.patch gcompris.spec Log Message: * Thu May 11 2006 Hans de Goede 7.4-10 - Add a hard Requires on gcompris-libs version-release to the base package because upstream doesn't bump the soname version when the abi changes. - Fix 2 more bugs introduced by the fix for bug 190918 (sigh, sorry). gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcompris-7.4-xf86vidmode.patch 9 May 2006 19:16:54 -0000 1.2 +++ gcompris-7.4-xf86vidmode.patch 11 May 2006 14:43:20 -0000 1.3 @@ -1,254 +1,587 @@ ---- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-09 19:51:54.000000000 +0200 -@@ -1094,7 +1094,7 @@ - --disable-sdltest Do not try to compile and run a test SDL program - --disable-glibtest do not try to compile and run a test GLIB program - --disable-rpath do not hardcode runtime library paths -- --disable-xrandr Turn off xrandr -+ --disable-xf86vidmode Turn off xf86vidmode - --enable-debug Turn on debugging messages - --disable-sqlite Turn off sqlite (will disable profile) - --enable-py-build-only Skip python modules tests. (Useful if you just need -@@ -23630,7 +23630,7 @@ - /usr/openwin/share/include' +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-11 09:42:18.000000000 +0200 +@@ -159,6 +159,12 @@ - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23638,7 +23638,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -23665,7 +23665,7 @@ - sed 's/^/| /' conftest.$ac_ext >&5 + void gcompris_confirm_stop (void); - for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -23686,11 +23686,11 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - int - main () - { --XtMalloc (0) -+XrmInitialize () - ; - return 0; - } -@@ -23769,23 +23769,23 @@ - echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 - fi ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" +--- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-11 09:42:18.000000000 +0200 +@@ -33,12 +33,13 @@ --# Check whether --enable-xrandr or --disable-xrandr was given. --if test "${enable_xrandr+set}" = set; then -- enableval="$enable_xrandr" -- USE_XRANDR="$enableval" -+# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. -+if test "${enable_xf86vidmode+set}" = set; then -+ enableval="$enable_xf86vidmode" -+ USE_XF86VM="$enableval" - else -- USE_XRANDR="yes" -+ USE_XF86VM="yes" - fi; --found_randr=no --if test "x$USE_XRANDR" == "xyes" ; then -- RANDR_LIBS= -- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 --echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 --if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then -+found_xf86vidmode=no -+if test "x$USE_XF86VM" == "xyes" ; then -+ XF86VM_LIBS= -+ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 -+if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" -+LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23799,11 +23799,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char XRRSetScreenConfigAndRate (); -+char XF86VidModeQueryExtension (); - int - main () - { --XRRSetScreenConfigAndRate (); -+XF86VidModeQueryExtension (); - ; - return 0; - } -@@ -23830,23 +23830,23 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes -+ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 + #include "cursor.h" --ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no -+ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 --echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 --if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then -- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 --echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 --if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 -+if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then -+ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 -+echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 -+if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -23857,7 +23857,7 @@ - /* end confdefs.h. */ +-/* For XRANDR Support */ +-#ifdef XRANDR ++/* For XF86_VIDMODE Support */ ++#ifdef XF86_VIDMODE + #include #include - -#include -+#include - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -23881,38 +23881,38 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_header_X11_extensions_Xrandr_h=yes -+ ac_cv_header_X11_extensions_xf86vmode_h=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_X11_extensions_Xrandr_h=no -+ac_cv_header_X11_extensions_xf86vmode_h=no - fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 --echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 --if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then -- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes -+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 -+if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then -+ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes - fi +-#include ++#include ++#include ++#include + #endif + #if defined _WIN32 || defined __WIN32__ +@@ -104,7 +105,7 @@ + static int popt_aalias = FALSE; + static int popt_difficulty_filter = FALSE; + static int popt_debug = FALSE; +-static int popt_noxrandr = FALSE; ++static int popt_noxf86vm = FALSE; + static char *popt_root_menu = NULL; + static char *popt_local_activity = NULL; + static int popt_administration = FALSE; +@@ -139,8 +140,8 @@ + N_("Print the version of " PACKAGE), NULL}, + {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, + N_("Use the antialiased canvas (slower)."), NULL}, +- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, +- N_("Disable XRANDR (No screen resolution change)."), NULL}, ++ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, ++ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, + {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, + N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, + {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, +@@ -184,29 +185,19 @@ + }; - fi + /* XRandr Stuff */ +-#ifdef XRANDR +-typedef struct ++#ifdef XF86_VIDMODE ++static struct + { +- gboolean xr_lock_updates; ++ int vidmode_available; ++ XF86VidModeModeInfo orig_mode; ++ int orig_viewport_x; ++ int orig_viewport_y; ++ int width; ++ int height; ++} XF86VidModeData = { 0, { 0 }, 0, 0 }; +- XRRScreenConfiguration *xr_screen_conf; +- +- XRRScreenSize *xr_sizes; +- int xr_nsize; +- SizeID xr_current_size; +- +- Rotation xr_rotations; +- Rotation xr_current_rotation; +- +-} XRANDRData; +- +-static SizeID xr_previous_size; +-static gboolean xr_previous_size_set = FALSE; +-static XRANDRData *xrandr = NULL; +- +-static void xrandr_init ( XRANDRData *xrandr ); +-static void xrandr_get_config ( XRANDRData *xrandr ); +-static void xrandr_set_config( XRANDRData *xrandr ); ++static void xf86_vidmode_init( void ); ++static void xf86_vidmode_set_fullscreen( int state ); + #endif -- if test "x$found_randr" = "xno"; then -- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 --echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} -+ if test "x$found_xf86vidmode" = "xno"; then -+ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 -+echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} - else + /****************************************************************************/ +@@ -441,8 +432,8 @@ + gint screen_height, screen_width; + GtkWidget *vbox; - cat >>confdefs.h <<_ACEOF --#define XRANDR 1 -+#define XF86_VIDMODE 1 - _ACEOF - - fi - fi - --LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" -+LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" +-#ifdef XRANDR +- xrandr = g_new0 (XRANDRData, 1); ++#ifdef XF86_VIDMODE ++ xf86_vidmode_init(); + #endif - ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" + gcompris_set_fullscreen(properties->fullscreen); +@@ -450,10 +441,10 @@ + screen_height = gdk_screen_height(); + screen_width = gdk_screen_width(); -@@ -28651,7 +28651,7 @@ - echo "SDL LIBS = found" - fi +-#ifdef XRANDR +- if(properties->fullscreen && !properties->noxrandr) { +- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; +- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; ++#ifdef XF86_VIDMODE ++ if(properties->fullscreen && !properties->noxf86vm) { ++ screen_width = XF86VidModeData.width; ++ screen_height = XF86VidModeData.height; + } + #endif --echo "XRANDR option (--enable-xrandr) = $found_randr" -+echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" +@@ -811,39 +802,11 @@ + */ + void gcompris_set_fullscreen(gboolean state) + { +- ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { +-#ifdef XRANDR +- gint i; +- /* Search the 800x600 Resolution */ +- if(properties->fullscreen && !properties->noxrandr) { +- +- g_warning("XRANDR Is compiled in. Searching a good resolution"); +- +- /* Check if XRANDR is available */ +- if (!properties->noxrandr) { +- xrandr_get_config ( xrandr ); +- xr_previous_size = (SizeID)xrandr->xr_current_size; +- for (i = 0; i < xrandr->xr_nsize; i++) { +- if(xrandr->xr_sizes[i].width == BOARDWIDTH && +- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) +- { +- xrandr->xr_current_size = (SizeID)i; +- xr_previous_size_set = TRUE; +- break; +- } +- } +- } +- +- /* Set the Fullscreen now */ +- if(xr_previous_size_set) +- { +- if(is_mapped) +- xrandr_set_config( xrandr ); +- } +- } +-#endif + gdk_window_set_decorations (window->window, 0); + gdk_window_set_functions (window->window, 0); + gtk_widget_set_uposition (window, 0, 0); +@@ -851,20 +814,6 @@ + } + else + { +-#ifdef XRANDR +- /* Set back the original screen size */ +- if(xr_previous_size_set && !properties->noxrandr) +- { +- /* Need to refresh our config or xrandr api will reject us */ +- if(xrandr) +- { +- xrandr_get_config ( xrandr ); +- xrandr->xr_current_size = (SizeID)xr_previous_size; +- xrandr_set_config( xrandr ); +- } +- } +- xr_previous_size_set = FALSE; +-#endif + /* The hide must be done at least for KDE */ + gtk_widget_hide (window); + gdk_window_set_decorations (window->window, GDK_DECOR_ALL); +@@ -876,6 +825,42 @@ - echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" + } ---- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-09 19:51:54.000000000 +0200 -@@ -141,5 +141,5 @@ - /* Version number of package */ - #undef VERSION ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1029,131 @@ + g_printerr ("%s: %s\n\n", "gcompris", message); + } --/* XRANDR Available */ --#undef XRANDR -+/* XF86VidMode Available */ -+#undef XF86_VIDMODE ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-09 19:51:54.000000000 +0200 -@@ -72,8 +72,8 @@ - return Py_False; - } +-#ifdef XRANDR ++#ifdef XF86_VIDMODE + /* +- * XRANDR STUFF +- * ------------ ++ * XF86VidMode STUFF ++ * ----------------- + */ + static void +-xrandr_init ( XRANDRData *data ) ++xf86_vidmode_init ( void ) + { +- if(data==NULL) ++ int i,j; ++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) ++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); ++ ++ if (properties->noxf86vm) + return; +- +- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); +- +- if (data->xr_screen_conf == NULL) ++ ++ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, ++ &XF86VidModeData.orig_viewport_x)) ++ properties->noxf86vm = TRUE; ++ ++ if (properties->noxf86vm) ++ g_warning("XF86VidMode not available"); ++ else + { +- g_warning("XRANDR not available"); +- properties->noxrandr = TRUE; ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ g_warning("XF86VidMode support enabled"); } -- if(strcmp(name,"noxrandr")==0){ -- if(self->cdata->noxrandr){ -+ if(strcmp(name,"noxf86vm")==0){ -+ if(self->cdata->noxf86vm){ - Py_INCREF(Py_True); - return Py_True; - } else { ---- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 -+++ gcompris-7.4/src/boards/draw.c 2006-05-09 12:35:04.000000000 +0200 -@@ -2008,7 +2008,7 @@ - case 1: - fleur = gdk_cursor_new(get_resize_cursor(anchor)); - -- gnome_canvas_item_grab(item, -+ gcompris_canvas_item_grab(item, - GDK_POINTER_MOTION_MASK | - GDK_BUTTON_RELEASE_MASK, - fleur, -@@ -2031,7 +2031,7 @@ - case GDK_BUTTON_RELEASE: - if(dragging) - { -- gnome_canvas_item_ungrab(item, event->button.time); -+ gcompris_canvas_item_ungrab(item, event->button.time); - dragging = FALSE; - draggingItem = NULL; - } -@@ -2179,7 +2179,7 @@ +- else +- g_warning("XRANDR support enabled"); +- } +- +-static void +-xrandr_get_config ( XRANDRData *data ) +-{ +- if(data==NULL) +- return; +- +- xrandr_init (data); +- +- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, +- &data->xr_current_rotation); +- +- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); +- +- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, +- &data->xr_current_rotation); + } - fleur = gdk_cursor_new(GDK_FLEUR); ++ + static void +-xrandr_set_config( XRANDRData *data ) ++xf86_vidmode_set_fullscreen ( int state ) + { +- Status status = RRSetConfigFailed; ++ int i; ++ XF86VidModeModeLine mode; -- gnome_canvas_item_grab(item, -+ gcompris_canvas_item_grab(item, +- if(data==NULL) ++ if (properties->noxf86vm) + return; + +- if (data->xr_lock_updates) return; +- +- status = XRRSetScreenConfig (GDK_DISPLAY(), +- data->xr_screen_conf, +- GDK_ROOT_WINDOW(), +- data->xr_current_size, +- data->xr_current_rotation, +- CurrentTime); +- +- if(status) { +- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", +- (int)status); +- } +- return; +- ++ if (state) ++ { ++ XF86VidModeModeInfo **modes; ++ int mode_count; ++ gint x,y; ++ ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode)) ++ { ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; ++ } ++ ++ /* Do we need to switch? */ ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; ++ ++ for (i = 0; i < mode_count; i++) ++ { ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; ++ } ++ } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); ++ } ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ gdk_window_get_position(window->window, &x, &y); ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), x, y)) ++ g_warning("XF86VidMode couldnot change viewport"); ++ } ++ else ++ { ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode) || ++ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || ++ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) ++ { ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot restore original resolution"); ++ ++ } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); ++ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, ++ XF86VidModeData.orig_viewport_y)) ++ g_warning("XF86VidMode couldnot restore original viewport"); ++ } + } + #endif + +@@ -1185,9 +1233,9 @@ + properties->fullscreen = TRUE; + } + +- if (popt_noxrandr) ++ if (popt_noxf86vm) + { +- properties->noxrandr = TRUE; ++ properties->noxf86vm = TRUE; + } + + if (popt_window) +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-11 09:42:18.000000000 +0200 +@@ -160,7 +160,7 @@ + tmp->fx = 1; + tmp->screensize = 1; + tmp->fullscreen = 1; +- tmp->noxrandr = FALSE; ++ tmp->noxf86vm = FALSE; + tmp->timer = 1; + tmp->skin = "babytoy"; + tmp->key = "default"; +@@ -244,8 +244,8 @@ + } else if(!strcmp(value.v_identifier, "fullscreen")) { + if(!scan_get_int(scanner, &tmp->fullscreen)) + g_warning("Config file parsing error on token %s", token); +- } else if(!strcmp(value.v_identifier, "noxrandr")) { +- if(!scan_get_int(scanner, &tmp->noxrandr)) ++ } else if(!strcmp(value.v_identifier, "noxf86vm")) { ++ if(!scan_get_int(scanner, &tmp->noxf86vm)) + g_warning("Config file parsing error on token %s", token); + } else if(!strcmp(value.v_identifier, "timer")) { + if(!scan_get_int(scanner, &tmp->timer)) +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-11 09:42:18.000000000 +0200 +@@ -28,7 +28,7 @@ + gint music; + gint fx; + gint fullscreen; +- gint noxrandr; ++ gint noxf86vm; + gint screensize; + gint defaultcursor; + gint timer; +--- gcompris-7.4/src/gcompris/board_config.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/board_config.c 2006-05-11 12:04:27.000000000 +0200 +@@ -125,6 +125,34 @@ + + } + ++#ifdef XF86_VIDMODE ++static GdkEventConfigure gcompris_last_configure_event; ++ ++static gint gcompris_conf_window_configured(GtkWindow *window, ++ GdkEventConfigure *event, gpointer param) ++{ ++ gint new_x, new_y; ++ double screen_width, screen_height; ++ /* Because we call gtk_window_move, we cause a configure event. Filter out ++ identical events to avoid looping. */ ++ if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) ++ { ++ gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( ++ gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); ++ /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ ++ screen_height -= 30; ++ new_x = ((gint)screen_width - event->width) / 2; ++ new_y = ((gint)screen_height - event->height) / 2; ++ /* printf("screen %dx%d, window %dx%d, place %dx%d\n", (int)screen_width, (int)screen_height, event->width, event->height, new_x, new_y); */ ++ gtk_window_move (conf_window, new_x, new_y); ++ memcpy(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure)); ++ } ++ ++ /* Act as if we aren't there / aren't hooked up */ ++ return FALSE; ++} ++#endif ++ + GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) + { + GtkWidget *header; +@@ -145,7 +173,18 @@ + + + /* parameters */ +- gtk_window_set_position (conf_window, ++#ifdef XF86_VIDMODE ++ if (gcompris_get_properties()->fullscreen && ++ !gcompris_get_properties()->noxf86vm) ++ { ++ memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); ++ gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); ++ gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", ++ GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); ++ } ++ else ++#endif ++ gtk_window_set_position (conf_window, + GTK_WIN_POS_CENTER_ALWAYS); + + gtk_widget_show(GTK_WIDGET(conf_window)); +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-11 09:42:22.000000000 +0200 +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen and not Prop.noxf86vm): ++ gtk.gdk.pointer_ungrab() + + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) + + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -221,6 +226,10 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen and ++ not gcompris.get_properties().noxf86vm): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-11 09:42:18.000000000 +0200 +@@ -72,8 +72,8 @@ + return Py_False; + } + } +- if(strcmp(name,"noxrandr")==0){ +- if(self->cdata->noxrandr){ ++ if(strcmp(name,"noxf86vm")==0){ ++ if(self->cdata->noxf86vm){ + Py_INCREF(Py_True); + return Py_True; + } else { +--- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-11 09:42:18.000000000 +0200 +@@ -2008,7 +2008,7 @@ + case 1: + fleur = gdk_cursor_new(get_resize_cursor(anchor)); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2031,7 +2031,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + } +@@ -2179,7 +2179,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -262,7 +595,7 @@ draggingItem = NULL; --- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-11 09:42:18.000000000 +0200 @@ -472,7 +472,7 @@ gnome_canvas_item_raise_to_top(data->item); @@ -282,7 +615,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 -+++ gcompris-7.4/src/boards/clockgame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-11 09:42:18.000000000 +0200 @@ -663,7 +663,7 @@ y = item_y; @@ -302,7 +635,7 @@ } break; --- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-11 09:42:18.000000000 +0200 @@ -645,7 +645,7 @@ gnome_canvas_item_raise_to_top(data->item_text); @@ -322,7 +655,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 -+++ gcompris-7.4/src/boards/chess.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-11 09:42:18.000000000 +0200 @@ -839,7 +839,7 @@ fleur = gdk_cursor_new(GDK_FLEUR); @@ -342,7 +675,7 @@ position_display(position); --- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 -+++ gcompris-7.4/src/boards/shapegame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-11 09:42:18.000000000 +0200 @@ -1103,7 +1103,7 @@ gnome_canvas_item_raise_to_top(shape_list_root_item); gnome_canvas_item_raise_to_top(item); @@ -380,7 +713,7 @@ dragging = FALSE; --- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 -+++ gcompris-7.4/src/boards/planegame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-11 09:42:18.000000000 +0200 @@ -578,7 +578,7 @@ y = item_y; @@ -400,7 +733,7 @@ } break; --- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 -+++ gcompris-7.4/src/boards/enumerate.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-11 09:42:18.000000000 +0200 @@ -522,7 +522,7 @@ gnome_canvas_item_raise_to_top(item); @@ -420,7 +753,7 @@ } break; --- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 -+++ gcompris-7.4/src/boards/clickgame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-11 09:42:18.000000000 +0200 @@ -598,7 +598,7 @@ y = item_y; @@ -440,7 +773,7 @@ } break; --- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 -+++ gcompris-7.4/src/boards/traffic.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-11 09:42:18.000000000 +0200 @@ -417,7 +417,7 @@ cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); else @@ -468,493 +801,220 @@ hit=0; moving=FALSE; } ---- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 -+++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-09 19:51:55.000000000 +0200 -@@ -103,6 +103,11 @@ - options.append('--nostampcontrols') - - gcompris.sound.close() -+ -+ # release pointergrab if running fullscreen, tuxpaint wants to grab the -+ # pointer itself -+ if (Prop.fullscreen): -+ gtk.gdk.pointer_ungrab() - - #self.window.set_property("accept-focus", 0) - #self.window.set_keep_below(False) -@@ -115,7 +120,7 @@ - gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) - return - -- gcompris.child_watch_add(pid, child_callback, None) -+ gcompris.child_watch_add(pid, child_callback, self) - - gcompris.bar_set(0) - gcompris.bar_hide(1) -@@ -221,6 +226,9 @@ - return default_config_dict +--- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-11 09:42:18.000000000 +0200 +@@ -1094,7 +1094,7 @@ + --disable-sdltest Do not try to compile and run a test SDL program + --disable-glibtest do not try to compile and run a test GLIB program + --disable-rpath do not hardcode runtime library paths +- --disable-xrandr Turn off xrandr ++ --disable-xf86vidmode Turn off xf86vidmode + --enable-debug Turn on debugging messages + --disable-sqlite Turn off sqlite (will disable profile) + --enable-py-build-only Skip python modules tests. (Useful if you just need +@@ -23630,7 +23630,7 @@ + /usr/openwin/share/include' - def child_callback(fd, cond, data): -+ # restore pointergrab if running fullscreen -+ if (gcompris.get_properties().fullscreen): -+ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) - #global board - #board.window.set_property("accept-focus", 1) - #board.window.set_keep_above(False) ---- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-09 19:51:54.000000000 +0200 -@@ -159,6 +159,12 @@ - - void gcompris_confirm_stop (void); + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23638,7 +23638,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -23665,7 +23665,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime); -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); -+ - /* Trace Log */ - #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" - #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" ---- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-09 20:51:10.000000000 +0200 -@@ -33,12 +33,13 @@ + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -23686,11 +23686,11 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -23769,23 +23769,23 @@ + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi - #include "cursor.h" +-# Check whether --enable-xrandr or --disable-xrandr was given. +-if test "${enable_xrandr+set}" = set; then +- enableval="$enable_xrandr" +- USE_XRANDR="$enableval" ++# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. ++if test "${enable_xf86vidmode+set}" = set; then ++ enableval="$enable_xf86vidmode" ++ USE_XF86VM="$enableval" + else +- USE_XRANDR="yes" ++ USE_XF86VM="yes" + fi; +-found_randr=no +-if test "x$USE_XRANDR" == "xyes" ; then +- RANDR_LIBS= +- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 +-echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then ++found_xf86vidmode=no ++if test "x$USE_XF86VM" == "xyes" ; then ++ XF86VM_LIBS= ++ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ++echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 ++if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" ++LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23799,11 +23799,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char XRRSetScreenConfigAndRate (); ++char XF86VidModeQueryExtension (); + int + main () + { +-XRRSetScreenConfigAndRate (); ++XF86VidModeQueryExtension (); + ; + return 0; + } +@@ -23830,23 +23830,23 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes ++ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 --/* For XRANDR Support */ --#ifdef XRANDR -+/* For XF86_VIDMODE Support */ -+#ifdef XF86_VIDMODE - #include +-ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no ++ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 +-if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then +- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +-echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +-if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 ++if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then ++ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 ++if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -23857,7 +23857,7 @@ + /* end confdefs.h. */ #include + -#include --#include -+#include -+#include -+#include - #endif ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -23881,38 +23881,38 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_header_X11_extensions_Xrandr_h=yes ++ ac_cv_header_X11_extensions_xf86vmode_h=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 - #if defined _WIN32 || defined __WIN32__ -@@ -104,7 +105,7 @@ - static int popt_aalias = FALSE; - static int popt_difficulty_filter = FALSE; - static int popt_debug = FALSE; --static int popt_noxrandr = FALSE; -+static int popt_noxf86vm = FALSE; - static char *popt_root_menu = NULL; - static char *popt_local_activity = NULL; - static int popt_administration = FALSE; -@@ -139,8 +140,8 @@ - N_("Print the version of " PACKAGE), NULL}, - {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, - N_("Use the antialiased canvas (slower)."), NULL}, -- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, -- N_("Disable XRANDR (No screen resolution change)."), NULL}, -+ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, -+ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, - {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, - N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, - {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, -@@ -184,29 +185,19 @@ - }; +-ac_cv_header_X11_extensions_Xrandr_h=no ++ac_cv_header_X11_extensions_xf86vmode_h=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +-if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then +- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes ++echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 ++if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then ++ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes + fi - /* XRandr Stuff */ --#ifdef XRANDR --typedef struct -+#ifdef XF86_VIDMODE -+static struct - { -- gboolean xr_lock_updates; -+ int vidmode_available; -+ XF86VidModeModeInfo orig_mode; -+ int orig_viewport_x; -+ int orig_viewport_y; -+ int width; -+ int height; -+} XF86VidModeData = { 0, { 0 }, 0, 0 }; -- XRRScreenConfiguration *xr_screen_conf; -- -- XRRScreenSize *xr_sizes; -- int xr_nsize; -- SizeID xr_current_size; -- -- Rotation xr_rotations; -- Rotation xr_current_rotation; -- --} XRANDRData; -- --static SizeID xr_previous_size; --static gboolean xr_previous_size_set = FALSE; --static XRANDRData *xrandr = NULL; -- --static void xrandr_init ( XRANDRData *xrandr ); --static void xrandr_get_config ( XRANDRData *xrandr ); --static void xrandr_set_config( XRANDRData *xrandr ); -+static void xf86_vidmode_init( void ); -+static void xf86_vidmode_set_fullscreen( int state ); - #endif + fi - /****************************************************************************/ -@@ -441,8 +432,8 @@ - gint screen_height, screen_width; - GtkWidget *vbox; --#ifdef XRANDR -- xrandr = g_new0 (XRANDRData, 1); -+#ifdef XF86_VIDMODE -+ xf86_vidmode_init(); - #endif +- if test "x$found_randr" = "xno"; then +- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 +-echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} ++ if test "x$found_xf86vidmode" = "xno"; then ++ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 ++echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} + else - gcompris_set_fullscreen(properties->fullscreen); -@@ -450,10 +441,10 @@ - screen_height = gdk_screen_height(); - screen_width = gdk_screen_width(); - --#ifdef XRANDR -- if(properties->fullscreen && !properties->noxrandr) { -- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; -- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; -+#ifdef XF86_VIDMODE -+ if(properties->fullscreen && !properties->noxf86vm) { -+ screen_width = XF86VidModeData.width; -+ screen_height = XF86VidModeData.height; - } - #endif - -@@ -811,39 +802,11 @@ - */ - void gcompris_set_fullscreen(gboolean state) - { -- -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(state); -+#endif - if(state) - { --#ifdef XRANDR -- gint i; -- /* Search the 800x600 Resolution */ -- if(properties->fullscreen && !properties->noxrandr) { -- -- g_warning("XRANDR Is compiled in. Searching a good resolution"); -- -- /* Check if XRANDR is available */ -- if (!properties->noxrandr) { -- xrandr_get_config ( xrandr ); -- xr_previous_size = (SizeID)xrandr->xr_current_size; -- for (i = 0; i < xrandr->xr_nsize; i++) { -- if(xrandr->xr_sizes[i].width == BOARDWIDTH && -- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) -- { -- xrandr->xr_current_size = (SizeID)i; -- xr_previous_size_set = TRUE; -- break; -- } -- } -- } -- -- /* Set the Fullscreen now */ -- if(xr_previous_size_set) -- { -- if(is_mapped) -- xrandr_set_config( xrandr ); -- } -- } --#endif - gdk_window_set_decorations (window->window, 0); - gdk_window_set_functions (window->window, 0); - gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +814,6 @@ - } - else - { --#ifdef XRANDR -- /* Set back the original screen size */ -- if(xr_previous_size_set && !properties->noxrandr) -- { -- /* Need to refresh our config or xrandr api will reject us */ -- if(xrandr) -- { -- xrandr_get_config ( xrandr ); -- xrandr->xr_current_size = (SizeID)xr_previous_size; -- xrandr_set_config( xrandr ); -- } -- } -- xr_previous_size_set = FALSE; --#endif - /* The hide must be done at least for KDE */ - gtk_widget_hide (window); - gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -876,6 +825,42 @@ - - } + cat >>confdefs.h <<_ACEOF +-#define XRANDR 1 ++#define XF86_VIDMODE 1 + _ACEOF -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime) -+{ -+ int retval; -+ -+ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); -+ if (retval != GDK_GRAB_SUCCESS) -+ return retval; -+ -+#ifdef XF86_VIDMODE -+ /* When fullscreen override mouse grab with our own which -+ confines the cursor to our fullscreen window */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, -+ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+ -+ return retval; -+} -+ -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) -+{ -+ gnome_canvas_item_ungrab(item, etime); -+#ifdef XF86_VIDMODE -+ /* When fullscreen restore the normal mouse grab which avoids -+ scrolling the virtual desktop */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+} -+ - void gcompris_exit() - { - /* Do not loopback in exit */ -@@ -1044,68 +1029,129 @@ - g_printerr ("%s: %s\n\n", "gcompris", message); - } + fi + fi --#ifdef XRANDR -+#ifdef XF86_VIDMODE - /* -- * XRANDR STUFF -- * ------------ -+ * XF86VidMode STUFF -+ * ----------------- - */ - static void --xrandr_init ( XRANDRData *data ) -+xf86_vidmode_init ( void ) - { -- if(data==NULL) -+ int i,j; -+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) -+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); -+ -+ if (properties->noxf86vm) - return; -- -- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); -- -- if (data->xr_screen_conf == NULL) -+ -+ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, -+ &XF86VidModeData.orig_viewport_x)) -+ properties->noxf86vm = TRUE; -+ -+ if (properties->noxf86vm) -+ g_warning("XF86VidMode not available"); -+ else - { -- g_warning("XRANDR not available"); -- properties->noxrandr = TRUE; -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ g_warning("XF86VidMode support enabled"); - } -- else -- g_warning("XRANDR support enabled"); -- } -- --static void --xrandr_get_config ( XRANDRData *data ) --{ -- if(data==NULL) -- return; -- -- xrandr_init (data); -- -- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, -- &data->xr_current_rotation); -- -- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); -- -- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, -- &data->xr_current_rotation); - } +-LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" ++LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" -+ - static void --xrandr_set_config( XRANDRData *data ) -+xf86_vidmode_set_fullscreen ( int state ) - { -- Status status = RRSetConfigFailed; -+ int i; -+ XF86VidModeModeLine mode; + ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" -- if(data==NULL) -+ if (properties->noxf86vm) - return; +@@ -28651,7 +28651,7 @@ + echo "SDL LIBS = found" + fi -- if (data->xr_lock_updates) return; -- -- status = XRRSetScreenConfig (GDK_DISPLAY(), -- data->xr_screen_conf, -- GDK_ROOT_WINDOW(), -- data->xr_current_size, -- data->xr_current_rotation, -- CurrentTime); -- -- if(status) { -- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", -- (int)status); -- } -- return; -- -+ if (state) -+ { -+ XF86VidModeModeInfo **modes; -+ int mode_count; -+ -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode)) -+ { -+ /* If we can't get the currentmode force setting of a new mode. */ -+ mode.hdisplay = 0; -+ } -+ -+ /* Do we need to switch? */ -+ if ((mode.hdisplay != BOARDWIDTH) || -+ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ mode_count = 0; -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot switch resolution"); -+ break; -+ } -+ } -+ if (i == mode_count) -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ if (mode_count) -+ XFree(modes); -+ } -+ /* We need to grab the pointer before setting the viewport otherwise -+ setviewport may get "canceled" by the pointer being outside the -+ current viewport. */ -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+ -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else -+ { -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode) || -+ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || -+ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) -+ { -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot restore original resolution"); -+ -+ } -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); -+ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, -+ XF86VidModeData.orig_viewport_y)) -+ g_warning("XF86VidMode couldnot restore original viewport"); -+ } - } - #endif +-echo "XRANDR option (--enable-xrandr) = $found_randr" ++echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" -@@ -1185,9 +1231,9 @@ - properties->fullscreen = TRUE; - } + echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" -- if (popt_noxrandr) -+ if (popt_noxf86vm) - { -- properties->noxrandr = TRUE; -+ properties->noxf86vm = TRUE; - } +--- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-11 09:42:18.000000000 +0200 +@@ -141,5 +141,5 @@ + /* Version number of package */ + #undef VERSION - if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-09 19:51:54.000000000 +0200 -@@ -160,7 +160,7 @@ - tmp->fx = 1; - tmp->screensize = 1; - tmp->fullscreen = 1; -- tmp->noxrandr = FALSE; -+ tmp->noxf86vm = FALSE; - tmp->timer = 1; - tmp->skin = "babytoy"; - tmp->key = "default"; -@@ -244,8 +244,8 @@ - } else if(!strcmp(value.v_identifier, "fullscreen")) { - if(!scan_get_int(scanner, &tmp->fullscreen)) - g_warning("Config file parsing error on token %s", token); -- } else if(!strcmp(value.v_identifier, "noxrandr")) { -- if(!scan_get_int(scanner, &tmp->noxrandr)) -+ } else if(!strcmp(value.v_identifier, "noxf86vm")) { -+ if(!scan_get_int(scanner, &tmp->noxf86vm)) - g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "timer")) { - if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-09 19:51:54.000000000 +0200 -@@ -28,7 +28,7 @@ - gint music; - gint fx; - gint fullscreen; -- gint noxrandr; -+ gint noxf86vm; - gint screensize; - gint defaultcursor; - gint timer; +-/* XRANDR Available */ +-#undef XRANDR ++/* XF86VidMode Available */ ++#undef XF86_VIDMODE --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-11 09:42:18.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gcompris.spec 10 May 2006 04:52:01 -0000 1.8 +++ gcompris.spec 11 May 2006 14:43:20 -0000 1.9 @@ -480,9 +480,10 @@ %changelog -* unreleased 2006 Hans de Goede 7.4-10 +* Thu May 11 2006 Hans de Goede 7.4-10 - Add a hard Requires on gcompris-libs version-release to the base package because upstream doesn't bump the soname version when the abi changes. +- Fix 2 more bugs introduced by the fix for bug 190918 (sigh, sorry). * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. From fedora-extras-commits at redhat.com Thu May 11 14:44:25 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:44:25 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.6,1.7 Message-ID: <200605111444.k4BEiR67018224@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18207 Modified Files: python-clientform.spec Log Message: add python-setuptools to buildrequires Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-clientform.spec 11 May 2006 14:32:23 -0000 1.6 +++ python-clientform.spec 11 May 2006 14:44:24 -0000 1.7 @@ -2,7 +2,7 @@ Name: python-clientform Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python, python-setuptools %description ClientForm is a Python module for handling HTML forms on the client side, @@ -45,7 +45,10 @@ %ghost %{python_sitelib}/ClientForm.pyo %changelog -* Thu May 12 2006 Luke Macken 0.2.2-2 +* Thu May 11 2006 Luke Macken 0.2.2-3 +- Add python-setuptools to BuildRequires + +* Thu May 11 2006 Luke Macken 0.2.2-2 - Fix version in Source0 * Thu May 11 2006 Luke Macken 0.2.2-1 From fedora-extras-commits at redhat.com Thu May 11 14:44:55 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 07:44:55 -0700 Subject: rpms/gcompris/FC-5 gcompris-7.4-xf86vidmode.patch, 1.2, 1.3 gcompris.spec, 1.6, 1.7 Message-ID: <200605111444.k4BEivLX018308@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18268 Modified Files: gcompris-7.4-xf86vidmode.patch gcompris.spec Log Message: * Thu May 11 2006 Hans de Goede 7.4-10 - Add a hard Requires on gcompris-libs version-release to the base package because upstream doesn't bump the soname version when the abi changes. - Fix 2 more bugs introduced by the fix for bug 190918 (sigh, sorry). gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcompris-7.4-xf86vidmode.patch 9 May 2006 19:18:43 -0000 1.2 +++ gcompris-7.4-xf86vidmode.patch 11 May 2006 14:44:54 -0000 1.3 @@ -1,254 +1,587 @@ ---- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-09 19:51:54.000000000 +0200 -@@ -1094,7 +1094,7 @@ - --disable-sdltest Do not try to compile and run a test SDL program - --disable-glibtest do not try to compile and run a test GLIB program - --disable-rpath do not hardcode runtime library paths -- --disable-xrandr Turn off xrandr -+ --disable-xf86vidmode Turn off xf86vidmode - --enable-debug Turn on debugging messages - --disable-sqlite Turn off sqlite (will disable profile) - --enable-py-build-only Skip python modules tests. (Useful if you just need -@@ -23630,7 +23630,7 @@ - /usr/openwin/share/include' +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-11 09:42:18.000000000 +0200 +@@ -159,6 +159,12 @@ - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23638,7 +23638,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -23665,7 +23665,7 @@ - sed 's/^/| /' conftest.$ac_ext >&5 + void gcompris_confirm_stop (void); - for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -23686,11 +23686,11 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - int - main () - { --XtMalloc (0) -+XrmInitialize () - ; - return 0; - } -@@ -23769,23 +23769,23 @@ - echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 - fi ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" +--- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-11 09:42:18.000000000 +0200 +@@ -33,12 +33,13 @@ --# Check whether --enable-xrandr or --disable-xrandr was given. --if test "${enable_xrandr+set}" = set; then -- enableval="$enable_xrandr" -- USE_XRANDR="$enableval" -+# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. -+if test "${enable_xf86vidmode+set}" = set; then -+ enableval="$enable_xf86vidmode" -+ USE_XF86VM="$enableval" - else -- USE_XRANDR="yes" -+ USE_XF86VM="yes" - fi; --found_randr=no --if test "x$USE_XRANDR" == "xyes" ; then -- RANDR_LIBS= -- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 --echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 --if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then -+found_xf86vidmode=no -+if test "x$USE_XF86VM" == "xyes" ; then -+ XF86VM_LIBS= -+ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 -+if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" -+LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23799,11 +23799,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char XRRSetScreenConfigAndRate (); -+char XF86VidModeQueryExtension (); - int - main () - { --XRRSetScreenConfigAndRate (); -+XF86VidModeQueryExtension (); - ; - return 0; - } -@@ -23830,23 +23830,23 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes -+ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 + #include "cursor.h" --ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no -+ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 --echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 --if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then -- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 --echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 --if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 -+if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then -+ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 -+echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 -+if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -23857,7 +23857,7 @@ - /* end confdefs.h. */ +-/* For XRANDR Support */ +-#ifdef XRANDR ++/* For XF86_VIDMODE Support */ ++#ifdef XF86_VIDMODE + #include #include - -#include -+#include - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -23881,38 +23881,38 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_header_X11_extensions_Xrandr_h=yes -+ ac_cv_header_X11_extensions_xf86vmode_h=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_X11_extensions_Xrandr_h=no -+ac_cv_header_X11_extensions_xf86vmode_h=no - fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 --echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 --if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then -- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes -+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 -+if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then -+ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes - fi +-#include ++#include ++#include ++#include + #endif + #if defined _WIN32 || defined __WIN32__ +@@ -104,7 +105,7 @@ + static int popt_aalias = FALSE; + static int popt_difficulty_filter = FALSE; + static int popt_debug = FALSE; +-static int popt_noxrandr = FALSE; ++static int popt_noxf86vm = FALSE; + static char *popt_root_menu = NULL; + static char *popt_local_activity = NULL; + static int popt_administration = FALSE; +@@ -139,8 +140,8 @@ + N_("Print the version of " PACKAGE), NULL}, + {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, + N_("Use the antialiased canvas (slower)."), NULL}, +- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, +- N_("Disable XRANDR (No screen resolution change)."), NULL}, ++ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, ++ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, + {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, + N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, + {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, +@@ -184,29 +185,19 @@ + }; - fi + /* XRandr Stuff */ +-#ifdef XRANDR +-typedef struct ++#ifdef XF86_VIDMODE ++static struct + { +- gboolean xr_lock_updates; ++ int vidmode_available; ++ XF86VidModeModeInfo orig_mode; ++ int orig_viewport_x; ++ int orig_viewport_y; ++ int width; ++ int height; ++} XF86VidModeData = { 0, { 0 }, 0, 0 }; +- XRRScreenConfiguration *xr_screen_conf; +- +- XRRScreenSize *xr_sizes; +- int xr_nsize; +- SizeID xr_current_size; +- +- Rotation xr_rotations; +- Rotation xr_current_rotation; +- +-} XRANDRData; +- +-static SizeID xr_previous_size; +-static gboolean xr_previous_size_set = FALSE; +-static XRANDRData *xrandr = NULL; +- +-static void xrandr_init ( XRANDRData *xrandr ); +-static void xrandr_get_config ( XRANDRData *xrandr ); +-static void xrandr_set_config( XRANDRData *xrandr ); ++static void xf86_vidmode_init( void ); ++static void xf86_vidmode_set_fullscreen( int state ); + #endif -- if test "x$found_randr" = "xno"; then -- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 --echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} -+ if test "x$found_xf86vidmode" = "xno"; then -+ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 -+echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} - else + /****************************************************************************/ +@@ -441,8 +432,8 @@ + gint screen_height, screen_width; + GtkWidget *vbox; - cat >>confdefs.h <<_ACEOF --#define XRANDR 1 -+#define XF86_VIDMODE 1 - _ACEOF - - fi - fi - --LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" -+LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" +-#ifdef XRANDR +- xrandr = g_new0 (XRANDRData, 1); ++#ifdef XF86_VIDMODE ++ xf86_vidmode_init(); + #endif - ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" + gcompris_set_fullscreen(properties->fullscreen); +@@ -450,10 +441,10 @@ + screen_height = gdk_screen_height(); + screen_width = gdk_screen_width(); -@@ -28651,7 +28651,7 @@ - echo "SDL LIBS = found" - fi +-#ifdef XRANDR +- if(properties->fullscreen && !properties->noxrandr) { +- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; +- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; ++#ifdef XF86_VIDMODE ++ if(properties->fullscreen && !properties->noxf86vm) { ++ screen_width = XF86VidModeData.width; ++ screen_height = XF86VidModeData.height; + } + #endif --echo "XRANDR option (--enable-xrandr) = $found_randr" -+echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" +@@ -811,39 +802,11 @@ + */ + void gcompris_set_fullscreen(gboolean state) + { +- ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { +-#ifdef XRANDR +- gint i; +- /* Search the 800x600 Resolution */ +- if(properties->fullscreen && !properties->noxrandr) { +- +- g_warning("XRANDR Is compiled in. Searching a good resolution"); +- +- /* Check if XRANDR is available */ +- if (!properties->noxrandr) { +- xrandr_get_config ( xrandr ); +- xr_previous_size = (SizeID)xrandr->xr_current_size; +- for (i = 0; i < xrandr->xr_nsize; i++) { +- if(xrandr->xr_sizes[i].width == BOARDWIDTH && +- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) +- { +- xrandr->xr_current_size = (SizeID)i; +- xr_previous_size_set = TRUE; +- break; +- } +- } +- } +- +- /* Set the Fullscreen now */ +- if(xr_previous_size_set) +- { +- if(is_mapped) +- xrandr_set_config( xrandr ); +- } +- } +-#endif + gdk_window_set_decorations (window->window, 0); + gdk_window_set_functions (window->window, 0); + gtk_widget_set_uposition (window, 0, 0); +@@ -851,20 +814,6 @@ + } + else + { +-#ifdef XRANDR +- /* Set back the original screen size */ +- if(xr_previous_size_set && !properties->noxrandr) +- { +- /* Need to refresh our config or xrandr api will reject us */ +- if(xrandr) +- { +- xrandr_get_config ( xrandr ); +- xrandr->xr_current_size = (SizeID)xr_previous_size; +- xrandr_set_config( xrandr ); +- } +- } +- xr_previous_size_set = FALSE; +-#endif + /* The hide must be done at least for KDE */ + gtk_widget_hide (window); + gdk_window_set_decorations (window->window, GDK_DECOR_ALL); +@@ -876,6 +825,42 @@ - echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" + } ---- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-09 19:51:54.000000000 +0200 -@@ -141,5 +141,5 @@ - /* Version number of package */ - #undef VERSION ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1029,131 @@ + g_printerr ("%s: %s\n\n", "gcompris", message); + } --/* XRANDR Available */ --#undef XRANDR -+/* XF86VidMode Available */ -+#undef XF86_VIDMODE ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-09 19:51:54.000000000 +0200 -@@ -72,8 +72,8 @@ - return Py_False; - } +-#ifdef XRANDR ++#ifdef XF86_VIDMODE + /* +- * XRANDR STUFF +- * ------------ ++ * XF86VidMode STUFF ++ * ----------------- + */ + static void +-xrandr_init ( XRANDRData *data ) ++xf86_vidmode_init ( void ) + { +- if(data==NULL) ++ int i,j; ++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) ++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); ++ ++ if (properties->noxf86vm) + return; +- +- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); +- +- if (data->xr_screen_conf == NULL) ++ ++ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, ++ &XF86VidModeData.orig_viewport_x)) ++ properties->noxf86vm = TRUE; ++ ++ if (properties->noxf86vm) ++ g_warning("XF86VidMode not available"); ++ else + { +- g_warning("XRANDR not available"); +- properties->noxrandr = TRUE; ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ g_warning("XF86VidMode support enabled"); } -- if(strcmp(name,"noxrandr")==0){ -- if(self->cdata->noxrandr){ -+ if(strcmp(name,"noxf86vm")==0){ -+ if(self->cdata->noxf86vm){ - Py_INCREF(Py_True); - return Py_True; - } else { ---- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 -+++ gcompris-7.4/src/boards/draw.c 2006-05-09 12:35:04.000000000 +0200 -@@ -2008,7 +2008,7 @@ - case 1: - fleur = gdk_cursor_new(get_resize_cursor(anchor)); - -- gnome_canvas_item_grab(item, -+ gcompris_canvas_item_grab(item, - GDK_POINTER_MOTION_MASK | - GDK_BUTTON_RELEASE_MASK, - fleur, -@@ -2031,7 +2031,7 @@ - case GDK_BUTTON_RELEASE: - if(dragging) - { -- gnome_canvas_item_ungrab(item, event->button.time); -+ gcompris_canvas_item_ungrab(item, event->button.time); - dragging = FALSE; - draggingItem = NULL; - } -@@ -2179,7 +2179,7 @@ +- else +- g_warning("XRANDR support enabled"); +- } +- +-static void +-xrandr_get_config ( XRANDRData *data ) +-{ +- if(data==NULL) +- return; +- +- xrandr_init (data); +- +- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, +- &data->xr_current_rotation); +- +- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); +- +- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, +- &data->xr_current_rotation); + } - fleur = gdk_cursor_new(GDK_FLEUR); ++ + static void +-xrandr_set_config( XRANDRData *data ) ++xf86_vidmode_set_fullscreen ( int state ) + { +- Status status = RRSetConfigFailed; ++ int i; ++ XF86VidModeModeLine mode; -- gnome_canvas_item_grab(item, -+ gcompris_canvas_item_grab(item, +- if(data==NULL) ++ if (properties->noxf86vm) + return; + +- if (data->xr_lock_updates) return; +- +- status = XRRSetScreenConfig (GDK_DISPLAY(), +- data->xr_screen_conf, +- GDK_ROOT_WINDOW(), +- data->xr_current_size, +- data->xr_current_rotation, +- CurrentTime); +- +- if(status) { +- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", +- (int)status); +- } +- return; +- ++ if (state) ++ { ++ XF86VidModeModeInfo **modes; ++ int mode_count; ++ gint x,y; ++ ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode)) ++ { ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; ++ } ++ ++ /* Do we need to switch? */ ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; ++ ++ for (i = 0; i < mode_count; i++) ++ { ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; ++ } ++ } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); ++ } ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ gdk_window_get_position(window->window, &x, &y); ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), x, y)) ++ g_warning("XF86VidMode couldnot change viewport"); ++ } ++ else ++ { ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode) || ++ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || ++ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) ++ { ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot restore original resolution"); ++ ++ } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); ++ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, ++ XF86VidModeData.orig_viewport_y)) ++ g_warning("XF86VidMode couldnot restore original viewport"); ++ } + } + #endif + +@@ -1185,9 +1233,9 @@ + properties->fullscreen = TRUE; + } + +- if (popt_noxrandr) ++ if (popt_noxf86vm) + { +- properties->noxrandr = TRUE; ++ properties->noxf86vm = TRUE; + } + + if (popt_window) +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-11 09:42:18.000000000 +0200 +@@ -160,7 +160,7 @@ + tmp->fx = 1; + tmp->screensize = 1; + tmp->fullscreen = 1; +- tmp->noxrandr = FALSE; ++ tmp->noxf86vm = FALSE; + tmp->timer = 1; + tmp->skin = "babytoy"; + tmp->key = "default"; +@@ -244,8 +244,8 @@ + } else if(!strcmp(value.v_identifier, "fullscreen")) { + if(!scan_get_int(scanner, &tmp->fullscreen)) + g_warning("Config file parsing error on token %s", token); +- } else if(!strcmp(value.v_identifier, "noxrandr")) { +- if(!scan_get_int(scanner, &tmp->noxrandr)) ++ } else if(!strcmp(value.v_identifier, "noxf86vm")) { ++ if(!scan_get_int(scanner, &tmp->noxf86vm)) + g_warning("Config file parsing error on token %s", token); + } else if(!strcmp(value.v_identifier, "timer")) { + if(!scan_get_int(scanner, &tmp->timer)) +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-11 09:42:18.000000000 +0200 +@@ -28,7 +28,7 @@ + gint music; + gint fx; + gint fullscreen; +- gint noxrandr; ++ gint noxf86vm; + gint screensize; + gint defaultcursor; + gint timer; +--- gcompris-7.4/src/gcompris/board_config.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/board_config.c 2006-05-11 12:04:27.000000000 +0200 +@@ -125,6 +125,34 @@ + + } + ++#ifdef XF86_VIDMODE ++static GdkEventConfigure gcompris_last_configure_event; ++ ++static gint gcompris_conf_window_configured(GtkWindow *window, ++ GdkEventConfigure *event, gpointer param) ++{ ++ gint new_x, new_y; ++ double screen_width, screen_height; ++ /* Because we call gtk_window_move, we cause a configure event. Filter out ++ identical events to avoid looping. */ ++ if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) ++ { ++ gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( ++ gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); ++ /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ ++ screen_height -= 30; ++ new_x = ((gint)screen_width - event->width) / 2; ++ new_y = ((gint)screen_height - event->height) / 2; ++ /* printf("screen %dx%d, window %dx%d, place %dx%d\n", (int)screen_width, (int)screen_height, event->width, event->height, new_x, new_y); */ ++ gtk_window_move (conf_window, new_x, new_y); ++ memcpy(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure)); ++ } ++ ++ /* Act as if we aren't there / aren't hooked up */ ++ return FALSE; ++} ++#endif ++ + GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) + { + GtkWidget *header; +@@ -145,7 +173,18 @@ + + + /* parameters */ +- gtk_window_set_position (conf_window, ++#ifdef XF86_VIDMODE ++ if (gcompris_get_properties()->fullscreen && ++ !gcompris_get_properties()->noxf86vm) ++ { ++ memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); ++ gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); ++ gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", ++ GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); ++ } ++ else ++#endif ++ gtk_window_set_position (conf_window, + GTK_WIN_POS_CENTER_ALWAYS); + + gtk_widget_show(GTK_WIDGET(conf_window)); +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-11 09:42:22.000000000 +0200 +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen and not Prop.noxf86vm): ++ gtk.gdk.pointer_ungrab() + + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) + + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -221,6 +226,10 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen and ++ not gcompris.get_properties().noxf86vm): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-11 09:42:18.000000000 +0200 +@@ -72,8 +72,8 @@ + return Py_False; + } + } +- if(strcmp(name,"noxrandr")==0){ +- if(self->cdata->noxrandr){ ++ if(strcmp(name,"noxf86vm")==0){ ++ if(self->cdata->noxf86vm){ + Py_INCREF(Py_True); + return Py_True; + } else { +--- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-11 09:42:18.000000000 +0200 +@@ -2008,7 +2008,7 @@ + case 1: + fleur = gdk_cursor_new(get_resize_cursor(anchor)); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2031,7 +2031,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + } +@@ -2179,7 +2179,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -262,7 +595,7 @@ draggingItem = NULL; --- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-11 09:42:18.000000000 +0200 @@ -472,7 +472,7 @@ gnome_canvas_item_raise_to_top(data->item); @@ -282,7 +615,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 -+++ gcompris-7.4/src/boards/clockgame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-11 09:42:18.000000000 +0200 @@ -663,7 +663,7 @@ y = item_y; @@ -302,7 +635,7 @@ } break; --- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-11 09:42:18.000000000 +0200 @@ -645,7 +645,7 @@ gnome_canvas_item_raise_to_top(data->item_text); @@ -322,7 +655,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 -+++ gcompris-7.4/src/boards/chess.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-11 09:42:18.000000000 +0200 @@ -839,7 +839,7 @@ fleur = gdk_cursor_new(GDK_FLEUR); @@ -342,7 +675,7 @@ position_display(position); --- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 -+++ gcompris-7.4/src/boards/shapegame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-11 09:42:18.000000000 +0200 @@ -1103,7 +1103,7 @@ gnome_canvas_item_raise_to_top(shape_list_root_item); gnome_canvas_item_raise_to_top(item); @@ -380,7 +713,7 @@ dragging = FALSE; --- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 -+++ gcompris-7.4/src/boards/planegame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-11 09:42:18.000000000 +0200 @@ -578,7 +578,7 @@ y = item_y; @@ -400,7 +733,7 @@ } break; --- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 -+++ gcompris-7.4/src/boards/enumerate.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-11 09:42:18.000000000 +0200 @@ -522,7 +522,7 @@ gnome_canvas_item_raise_to_top(item); @@ -420,7 +753,7 @@ } break; --- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 -+++ gcompris-7.4/src/boards/clickgame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-11 09:42:18.000000000 +0200 @@ -598,7 +598,7 @@ y = item_y; @@ -440,7 +773,7 @@ } break; --- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 -+++ gcompris-7.4/src/boards/traffic.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-11 09:42:18.000000000 +0200 @@ -417,7 +417,7 @@ cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); else @@ -468,493 +801,220 @@ hit=0; moving=FALSE; } ---- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 -+++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-09 19:51:55.000000000 +0200 -@@ -103,6 +103,11 @@ - options.append('--nostampcontrols') - - gcompris.sound.close() -+ -+ # release pointergrab if running fullscreen, tuxpaint wants to grab the -+ # pointer itself -+ if (Prop.fullscreen): -+ gtk.gdk.pointer_ungrab() - - #self.window.set_property("accept-focus", 0) - #self.window.set_keep_below(False) -@@ -115,7 +120,7 @@ - gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) - return - -- gcompris.child_watch_add(pid, child_callback, None) -+ gcompris.child_watch_add(pid, child_callback, self) - - gcompris.bar_set(0) - gcompris.bar_hide(1) -@@ -221,6 +226,9 @@ - return default_config_dict +--- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-11 09:42:18.000000000 +0200 +@@ -1094,7 +1094,7 @@ + --disable-sdltest Do not try to compile and run a test SDL program + --disable-glibtest do not try to compile and run a test GLIB program + --disable-rpath do not hardcode runtime library paths +- --disable-xrandr Turn off xrandr ++ --disable-xf86vidmode Turn off xf86vidmode + --enable-debug Turn on debugging messages + --disable-sqlite Turn off sqlite (will disable profile) + --enable-py-build-only Skip python modules tests. (Useful if you just need +@@ -23630,7 +23630,7 @@ + /usr/openwin/share/include' - def child_callback(fd, cond, data): -+ # restore pointergrab if running fullscreen -+ if (gcompris.get_properties().fullscreen): -+ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) - #global board - #board.window.set_property("accept-focus", 1) - #board.window.set_keep_above(False) ---- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-09 19:51:54.000000000 +0200 -@@ -159,6 +159,12 @@ - - void gcompris_confirm_stop (void); + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23638,7 +23638,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -23665,7 +23665,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime); -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); -+ - /* Trace Log */ - #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" - #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" ---- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-09 20:51:10.000000000 +0200 -@@ -33,12 +33,13 @@ + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -23686,11 +23686,11 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -23769,23 +23769,23 @@ + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi - #include "cursor.h" +-# Check whether --enable-xrandr or --disable-xrandr was given. +-if test "${enable_xrandr+set}" = set; then +- enableval="$enable_xrandr" +- USE_XRANDR="$enableval" ++# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. ++if test "${enable_xf86vidmode+set}" = set; then ++ enableval="$enable_xf86vidmode" ++ USE_XF86VM="$enableval" + else +- USE_XRANDR="yes" ++ USE_XF86VM="yes" + fi; +-found_randr=no +-if test "x$USE_XRANDR" == "xyes" ; then +- RANDR_LIBS= +- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 +-echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then ++found_xf86vidmode=no ++if test "x$USE_XF86VM" == "xyes" ; then ++ XF86VM_LIBS= ++ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ++echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 ++if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" ++LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23799,11 +23799,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char XRRSetScreenConfigAndRate (); ++char XF86VidModeQueryExtension (); + int + main () + { +-XRRSetScreenConfigAndRate (); ++XF86VidModeQueryExtension (); + ; + return 0; + } +@@ -23830,23 +23830,23 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes ++ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 --/* For XRANDR Support */ --#ifdef XRANDR -+/* For XF86_VIDMODE Support */ -+#ifdef XF86_VIDMODE - #include +-ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no ++ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 +-if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then +- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +-echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +-if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 ++if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then ++ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 ++if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -23857,7 +23857,7 @@ + /* end confdefs.h. */ #include + -#include --#include -+#include -+#include -+#include - #endif ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -23881,38 +23881,38 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_header_X11_extensions_Xrandr_h=yes ++ ac_cv_header_X11_extensions_xf86vmode_h=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 - #if defined _WIN32 || defined __WIN32__ -@@ -104,7 +105,7 @@ - static int popt_aalias = FALSE; - static int popt_difficulty_filter = FALSE; - static int popt_debug = FALSE; --static int popt_noxrandr = FALSE; -+static int popt_noxf86vm = FALSE; - static char *popt_root_menu = NULL; - static char *popt_local_activity = NULL; - static int popt_administration = FALSE; -@@ -139,8 +140,8 @@ - N_("Print the version of " PACKAGE), NULL}, - {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, - N_("Use the antialiased canvas (slower)."), NULL}, -- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, -- N_("Disable XRANDR (No screen resolution change)."), NULL}, -+ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, -+ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, - {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, - N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, - {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, -@@ -184,29 +185,19 @@ - }; +-ac_cv_header_X11_extensions_Xrandr_h=no ++ac_cv_header_X11_extensions_xf86vmode_h=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +-if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then +- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes ++echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 ++if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then ++ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes + fi - /* XRandr Stuff */ --#ifdef XRANDR --typedef struct -+#ifdef XF86_VIDMODE -+static struct - { -- gboolean xr_lock_updates; -+ int vidmode_available; -+ XF86VidModeModeInfo orig_mode; -+ int orig_viewport_x; -+ int orig_viewport_y; -+ int width; -+ int height; -+} XF86VidModeData = { 0, { 0 }, 0, 0 }; -- XRRScreenConfiguration *xr_screen_conf; -- -- XRRScreenSize *xr_sizes; -- int xr_nsize; -- SizeID xr_current_size; -- -- Rotation xr_rotations; -- Rotation xr_current_rotation; -- --} XRANDRData; -- --static SizeID xr_previous_size; --static gboolean xr_previous_size_set = FALSE; --static XRANDRData *xrandr = NULL; -- --static void xrandr_init ( XRANDRData *xrandr ); --static void xrandr_get_config ( XRANDRData *xrandr ); --static void xrandr_set_config( XRANDRData *xrandr ); -+static void xf86_vidmode_init( void ); -+static void xf86_vidmode_set_fullscreen( int state ); - #endif + fi - /****************************************************************************/ -@@ -441,8 +432,8 @@ - gint screen_height, screen_width; - GtkWidget *vbox; --#ifdef XRANDR -- xrandr = g_new0 (XRANDRData, 1); -+#ifdef XF86_VIDMODE -+ xf86_vidmode_init(); - #endif +- if test "x$found_randr" = "xno"; then +- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 +-echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} ++ if test "x$found_xf86vidmode" = "xno"; then ++ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 ++echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} + else - gcompris_set_fullscreen(properties->fullscreen); -@@ -450,10 +441,10 @@ - screen_height = gdk_screen_height(); - screen_width = gdk_screen_width(); - --#ifdef XRANDR -- if(properties->fullscreen && !properties->noxrandr) { -- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; -- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; -+#ifdef XF86_VIDMODE -+ if(properties->fullscreen && !properties->noxf86vm) { -+ screen_width = XF86VidModeData.width; -+ screen_height = XF86VidModeData.height; - } - #endif - -@@ -811,39 +802,11 @@ - */ - void gcompris_set_fullscreen(gboolean state) - { -- -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(state); -+#endif - if(state) - { --#ifdef XRANDR -- gint i; -- /* Search the 800x600 Resolution */ -- if(properties->fullscreen && !properties->noxrandr) { -- -- g_warning("XRANDR Is compiled in. Searching a good resolution"); -- -- /* Check if XRANDR is available */ -- if (!properties->noxrandr) { -- xrandr_get_config ( xrandr ); -- xr_previous_size = (SizeID)xrandr->xr_current_size; -- for (i = 0; i < xrandr->xr_nsize; i++) { -- if(xrandr->xr_sizes[i].width == BOARDWIDTH && -- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) -- { -- xrandr->xr_current_size = (SizeID)i; -- xr_previous_size_set = TRUE; -- break; -- } -- } -- } -- -- /* Set the Fullscreen now */ -- if(xr_previous_size_set) -- { -- if(is_mapped) -- xrandr_set_config( xrandr ); -- } -- } --#endif - gdk_window_set_decorations (window->window, 0); - gdk_window_set_functions (window->window, 0); - gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +814,6 @@ - } - else - { --#ifdef XRANDR -- /* Set back the original screen size */ -- if(xr_previous_size_set && !properties->noxrandr) -- { -- /* Need to refresh our config or xrandr api will reject us */ -- if(xrandr) -- { -- xrandr_get_config ( xrandr ); -- xrandr->xr_current_size = (SizeID)xr_previous_size; -- xrandr_set_config( xrandr ); -- } -- } -- xr_previous_size_set = FALSE; --#endif - /* The hide must be done at least for KDE */ - gtk_widget_hide (window); - gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -876,6 +825,42 @@ - - } + cat >>confdefs.h <<_ACEOF +-#define XRANDR 1 ++#define XF86_VIDMODE 1 + _ACEOF -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime) -+{ -+ int retval; -+ -+ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); -+ if (retval != GDK_GRAB_SUCCESS) -+ return retval; -+ -+#ifdef XF86_VIDMODE -+ /* When fullscreen override mouse grab with our own which -+ confines the cursor to our fullscreen window */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, -+ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+ -+ return retval; -+} -+ -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) -+{ -+ gnome_canvas_item_ungrab(item, etime); -+#ifdef XF86_VIDMODE -+ /* When fullscreen restore the normal mouse grab which avoids -+ scrolling the virtual desktop */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+} -+ - void gcompris_exit() - { - /* Do not loopback in exit */ -@@ -1044,68 +1029,129 @@ - g_printerr ("%s: %s\n\n", "gcompris", message); - } + fi + fi --#ifdef XRANDR -+#ifdef XF86_VIDMODE - /* -- * XRANDR STUFF -- * ------------ -+ * XF86VidMode STUFF -+ * ----------------- - */ - static void --xrandr_init ( XRANDRData *data ) -+xf86_vidmode_init ( void ) - { -- if(data==NULL) -+ int i,j; -+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) -+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); -+ -+ if (properties->noxf86vm) - return; -- -- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); -- -- if (data->xr_screen_conf == NULL) -+ -+ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, -+ &XF86VidModeData.orig_viewport_x)) -+ properties->noxf86vm = TRUE; -+ -+ if (properties->noxf86vm) -+ g_warning("XF86VidMode not available"); -+ else - { -- g_warning("XRANDR not available"); -- properties->noxrandr = TRUE; -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ g_warning("XF86VidMode support enabled"); - } -- else -- g_warning("XRANDR support enabled"); -- } -- --static void --xrandr_get_config ( XRANDRData *data ) --{ -- if(data==NULL) -- return; -- -- xrandr_init (data); -- -- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, -- &data->xr_current_rotation); -- -- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); -- -- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, -- &data->xr_current_rotation); - } +-LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" ++LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" -+ - static void --xrandr_set_config( XRANDRData *data ) -+xf86_vidmode_set_fullscreen ( int state ) - { -- Status status = RRSetConfigFailed; -+ int i; -+ XF86VidModeModeLine mode; + ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" -- if(data==NULL) -+ if (properties->noxf86vm) - return; +@@ -28651,7 +28651,7 @@ + echo "SDL LIBS = found" + fi -- if (data->xr_lock_updates) return; -- -- status = XRRSetScreenConfig (GDK_DISPLAY(), -- data->xr_screen_conf, -- GDK_ROOT_WINDOW(), -- data->xr_current_size, -- data->xr_current_rotation, -- CurrentTime); -- -- if(status) { -- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", -- (int)status); -- } -- return; -- -+ if (state) -+ { -+ XF86VidModeModeInfo **modes; -+ int mode_count; -+ -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode)) -+ { -+ /* If we can't get the currentmode force setting of a new mode. */ -+ mode.hdisplay = 0; -+ } -+ -+ /* Do we need to switch? */ -+ if ((mode.hdisplay != BOARDWIDTH) || -+ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ mode_count = 0; -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot switch resolution"); -+ break; -+ } -+ } -+ if (i == mode_count) -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ if (mode_count) -+ XFree(modes); -+ } -+ /* We need to grab the pointer before setting the viewport otherwise -+ setviewport may get "canceled" by the pointer being outside the -+ current viewport. */ -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+ -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else -+ { -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode) || -+ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || -+ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) -+ { -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot restore original resolution"); -+ -+ } -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); -+ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, -+ XF86VidModeData.orig_viewport_y)) -+ g_warning("XF86VidMode couldnot restore original viewport"); -+ } - } - #endif +-echo "XRANDR option (--enable-xrandr) = $found_randr" ++echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" -@@ -1185,9 +1231,9 @@ - properties->fullscreen = TRUE; - } + echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" -- if (popt_noxrandr) -+ if (popt_noxf86vm) - { -- properties->noxrandr = TRUE; -+ properties->noxf86vm = TRUE; - } +--- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-11 09:42:18.000000000 +0200 +@@ -141,5 +141,5 @@ + /* Version number of package */ + #undef VERSION - if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-09 19:51:54.000000000 +0200 -@@ -160,7 +160,7 @@ - tmp->fx = 1; - tmp->screensize = 1; - tmp->fullscreen = 1; -- tmp->noxrandr = FALSE; -+ tmp->noxf86vm = FALSE; - tmp->timer = 1; - tmp->skin = "babytoy"; - tmp->key = "default"; -@@ -244,8 +244,8 @@ - } else if(!strcmp(value.v_identifier, "fullscreen")) { - if(!scan_get_int(scanner, &tmp->fullscreen)) - g_warning("Config file parsing error on token %s", token); -- } else if(!strcmp(value.v_identifier, "noxrandr")) { -- if(!scan_get_int(scanner, &tmp->noxrandr)) -+ } else if(!strcmp(value.v_identifier, "noxf86vm")) { -+ if(!scan_get_int(scanner, &tmp->noxf86vm)) - g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "timer")) { - if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-09 19:51:54.000000000 +0200 -@@ -28,7 +28,7 @@ - gint music; - gint fx; - gint fullscreen; -- gint noxrandr; -+ gint noxf86vm; - gint screensize; - gint defaultcursor; - gint timer; +-/* XRANDR Available */ +-#undef XRANDR ++/* XF86VidMode Available */ ++#undef XF86_VIDMODE --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-11 09:42:18.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gcompris.spec 9 May 2006 19:18:43 -0000 1.6 +++ gcompris.spec 11 May 2006 14:44:54 -0000 1.7 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -21,6 +21,7 @@ Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags Requires: gnome-python2-canvas python-sqlite2 +Requires: %{name}-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -71,7 +72,7 @@ %package devel Summary: Development libraries and headers for gcompris-lib Group: Development/Libraries -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} Requires: libgnomecanvas-devel pkgconfig %description devel @@ -479,6 +480,11 @@ %changelog +* Thu May 11 2006 Hans de Goede 7.4-10 +- Add a hard Requires on gcompris-libs version-release to the base package + because upstream doesn't bump the soname version when the abi changes. +- Fix 2 more bugs introduced by the fix for bug 190918 (sigh, sorry). + * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. From fedora-extras-commits at redhat.com Thu May 11 14:44:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 07:44:59 -0700 Subject: extras-buildsys/builder Builder.py,1.7,1.8 Message-ID: <200605111444.k4BEixYU018315@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18288/builder Modified Files: Builder.py Log Message: Reformat long line 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 10 May 2006 14:28:12 -0000 1.7 +++ Builder.py 11 May 2006 14:44:56 -0000 1.8 @@ -387,7 +387,8 @@ try: cmd_stream = Commands.serialize_to_command_stream(self._cmds) self.response = self._server.request(cmd_stream) - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): + except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, + OpenSSL.SSL.Error, xmlrpclib.ProtocolError), exc: self.failed = True except xmlrpclib.Fault, exc: print "Builder Error (%s) in request(): server replied '%s'" % (self._address, exc) From fedora-extras-commits at redhat.com Thu May 11 14:45:36 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 07:45:36 -0700 Subject: extras-buildsys/client client.py,1.35,1.36 Message-ID: <200605111445.k4BEjaSW018388@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18370/client Modified Files: client.py Log Message: Fix list_builders command Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- client.py 26 Feb 2006 16:51:34 -0000 1.35 +++ client.py 11 May 2006 14:45:34 -0000 1.36 @@ -332,8 +332,8 @@ for arch in builder['arches']: string = string + arch + " " alive = 'unavailable' - if builder['alive']: - alive = 'alive' + if builder['available']: + alive = 'available' string = string + " " + alive print string print "" From fedora-extras-commits at redhat.com Thu May 11 14:46:39 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 07:46:39 -0700 Subject: extras-buildsys/server PackageJob.py,1.48,1.49 Message-ID: <200605111446.k4BEkdwW018425@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18407/server Modified Files: PackageJob.py Log Message: Only print hostname, not IP Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- PackageJob.py 9 May 2006 19:10:57 -0000 1.48 +++ PackageJob.py 11 May 2006 14:46:37 -0000 1.49 @@ -673,7 +673,9 @@ t.start() self._archjobs_lock.release() - log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, job.builder().address(), job.jobid)) + # Only want hostname, not both IP and hostname + addr = job.builder().address()[1] + log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, addr, job.jobid)) def remove_arch_job(self, job): """ Removes an arch job when its builder is no longer responding """ From fedora-extras-commits at redhat.com Thu May 11 14:57:23 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 07:57:23 -0700 Subject: rpms/libgda/devel libgda.spec,1.12,1.13 Message-ID: <200605111457.k4BEvPcF018593@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18574 Modified Files: libgda.spec Log Message: * Thu May 11 2006 Hans de Goede 1:1.9.100-6 - Move Obsoletes and Provides for plugins out of the plugins %description, so that they actually Obsolete and Provide instead of showing up in rpm -qi (bug 191213). Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgda.spec 4 May 2006 21:12:41 -0000 1.12 +++ libgda.spec 11 May 2006 14:57:23 -0000 1.13 @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -109,100 +109,100 @@ %package sqlite Summary: libgda SQLite Provider Group: System Environment/Libraries -%description sqlite -This package includes the libgda SQLite provider. Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release} Provides: gda-sqlite = %{epoch}:%{version}-%{release} +%description sqlite +This package includes the libgda SQLite provider. %if %{FREETDS} %package freetds Summary: libgda FreeTDS Provider Group: System Environment/Libraries -%description freetds -This package includes the libgda FreeTDS provider. Obsoletes: gda-freetds < %{epoch}:%{version}-%{release} Provides: gda-freetds = %{epoch}:%{version}-%{release} +%description freetds +This package includes the libgda FreeTDS provider. %endif %if %{IBMDB2} %package ibmdb2 Summary: libgda IBM DB2 Provider Group: System Environment/Libraries -%description ibmdb2 -This package includes the libgda IBM DB2 provider. Obsoletes: gda-ibmdb2 < %{epoch}:%{version}-%{release} Provides: gda-ibmdb2 = %{epoch}:%{version}-%{release} +%description ibmdb2 +This package includes the libgda IBM DB2 provider. %endif %if %{MYSQL} %package mysql Summary: libgda MySQL Provider Group: System Environment/Libraries -%description mysql -This package includes the libgda MySQL provider. Obsoletes: gda-mysql < %{epoch}:%{version}-%{release} Provides: gda-mysql = %{epoch}:%{version}-%{release} +%description mysql +This package includes the libgda MySQL provider. %endif %if %{ODBC} %package odbc Summary: libgda ODBC Provider Group: System Environment/Libraries -%description odbc -This package includes the libgda ODBC provider. Obsoletes: gda-odbc < %{epoch}:%{version}-%{release} Provides: gda-odbc = %{epoch}:%{version}-%{release} +%description odbc +This package includes the libgda ODBC provider. %endif %if %{ORACLE} %package oracle Summary: libgda Oracle Provider Group: System Environment/Libraries -%description oracle -This package includes the libgda Oracle provider. Obsoletes: gda-oracle < %{epoch}:%{version}-%{release} Provides: gda-oracle = %{epoch}:%{version}-%{release} +%description oracle +This package includes the libgda Oracle provider. %endif %if %{POSTGRES} %package postgres Summary: libgda PostgreSQL Provider Group: System Environment/Libraries -%description postgres -This package includes the libgda PostgreSQL provider. Obsoletes: gda-postgres < %{epoch}:%{version}-%{release} Provides: gda-postgres = %{epoch}:%{version}-%{release} +%description postgres +This package includes the libgda PostgreSQL provider. %endif %if %{SYBASE} %package sybase Summary: libgda Sybase Provider Group: System Environment/Libraries -%description sybase -This package includes the libgda Sybase provider. Obsoletes: gda-sybase < %{epoch}:%{version}-%{release} Provides: gda-sybase = %{epoch}:%{version}-%{release} +%description sybase +This package includes the libgda Sybase provider. %endif %if %{MDB} %package mdb Summary: libgda MDB Provider Group: System Environment/Libraries -%description mdb -This package includes the libgda MDB provider. Obsoletes: gda-mdb < %{epoch}:%{version}-%{release} Provides: gda-mdb = %{epoch}:%{version}-%{release} +%description mdb +This package includes the libgda MDB provider. %endif %if %{LDAP} %package ldap Summary: libgda LDAP Provider Group: System Environment/Libraries -%description ldap -This package includes the libgda LDAP provider. Obsoletes: gda-ldap < %{epoch}:%{version}-%{release} Provides: gda-ldap = %{epoch}:%{version}-%{release} +%description ldap +This package includes the libgda LDAP provider. %endif @@ -399,6 +399,11 @@ %changelog +* Thu May 11 2006 Hans de Goede 1:1.9.100-6 +- Move Obsoletes and Provides for plugins out of the plugins %%description, + so that they actually Obsolete and Provide instead of showing up in rpm -qi + (bug 191213). + * Thu May 4 2006 Hans de Goede 1:1.9.100-5 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) From fedora-extras-commits at redhat.com Thu May 11 14:58:55 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 07:58:55 -0700 Subject: rpms/libgda/FC-5 libgda.spec,1.12,1.13 Message-ID: <200605111458.k4BEwvxB018659@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18642 Modified Files: libgda.spec Log Message: * Thu May 11 2006 Hans de Goede 1:1.9.100-6 - Move Obsoletes and Provides for plugins out of the plugins %description, so that they actually Obsolete and Provide instead of showing up in rpm -qi (bug 191213). Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/FC-5/libgda.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgda.spec 4 May 2006 21:13:34 -0000 1.12 +++ libgda.spec 11 May 2006 14:58:54 -0000 1.13 @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -109,100 +109,100 @@ %package sqlite Summary: libgda SQLite Provider Group: System Environment/Libraries -%description sqlite -This package includes the libgda SQLite provider. Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release} Provides: gda-sqlite = %{epoch}:%{version}-%{release} +%description sqlite +This package includes the libgda SQLite provider. %if %{FREETDS} %package freetds Summary: libgda FreeTDS Provider Group: System Environment/Libraries -%description freetds -This package includes the libgda FreeTDS provider. Obsoletes: gda-freetds < %{epoch}:%{version}-%{release} Provides: gda-freetds = %{epoch}:%{version}-%{release} +%description freetds +This package includes the libgda FreeTDS provider. %endif %if %{IBMDB2} %package ibmdb2 Summary: libgda IBM DB2 Provider Group: System Environment/Libraries -%description ibmdb2 -This package includes the libgda IBM DB2 provider. Obsoletes: gda-ibmdb2 < %{epoch}:%{version}-%{release} Provides: gda-ibmdb2 = %{epoch}:%{version}-%{release} +%description ibmdb2 +This package includes the libgda IBM DB2 provider. %endif %if %{MYSQL} %package mysql Summary: libgda MySQL Provider Group: System Environment/Libraries -%description mysql -This package includes the libgda MySQL provider. Obsoletes: gda-mysql < %{epoch}:%{version}-%{release} Provides: gda-mysql = %{epoch}:%{version}-%{release} +%description mysql +This package includes the libgda MySQL provider. %endif %if %{ODBC} %package odbc Summary: libgda ODBC Provider Group: System Environment/Libraries -%description odbc -This package includes the libgda ODBC provider. Obsoletes: gda-odbc < %{epoch}:%{version}-%{release} Provides: gda-odbc = %{epoch}:%{version}-%{release} +%description odbc +This package includes the libgda ODBC provider. %endif %if %{ORACLE} %package oracle Summary: libgda Oracle Provider Group: System Environment/Libraries -%description oracle -This package includes the libgda Oracle provider. Obsoletes: gda-oracle < %{epoch}:%{version}-%{release} Provides: gda-oracle = %{epoch}:%{version}-%{release} +%description oracle +This package includes the libgda Oracle provider. %endif %if %{POSTGRES} %package postgres Summary: libgda PostgreSQL Provider Group: System Environment/Libraries -%description postgres -This package includes the libgda PostgreSQL provider. Obsoletes: gda-postgres < %{epoch}:%{version}-%{release} Provides: gda-postgres = %{epoch}:%{version}-%{release} +%description postgres +This package includes the libgda PostgreSQL provider. %endif %if %{SYBASE} %package sybase Summary: libgda Sybase Provider Group: System Environment/Libraries -%description sybase -This package includes the libgda Sybase provider. Obsoletes: gda-sybase < %{epoch}:%{version}-%{release} Provides: gda-sybase = %{epoch}:%{version}-%{release} +%description sybase +This package includes the libgda Sybase provider. %endif %if %{MDB} %package mdb Summary: libgda MDB Provider Group: System Environment/Libraries -%description mdb -This package includes the libgda MDB provider. Obsoletes: gda-mdb < %{epoch}:%{version}-%{release} Provides: gda-mdb = %{epoch}:%{version}-%{release} +%description mdb +This package includes the libgda MDB provider. %endif %if %{LDAP} %package ldap Summary: libgda LDAP Provider Group: System Environment/Libraries -%description ldap -This package includes the libgda LDAP provider. Obsoletes: gda-ldap < %{epoch}:%{version}-%{release} Provides: gda-ldap = %{epoch}:%{version}-%{release} +%description ldap +This package includes the libgda LDAP provider. %endif @@ -399,6 +399,11 @@ %changelog +* Thu May 11 2006 Hans de Goede 1:1.9.100-6 +- Move Obsoletes and Provides for plugins out of the plugins %%description, + so that they actually Obsolete and Provide instead of showing up in rpm -qi + (bug 191213). + * Thu May 4 2006 Hans de Goede 1:1.9.100-5 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) From fedora-extras-commits at redhat.com Thu May 11 15:10:01 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 08:10:01 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.7,1.8 Message-ID: <200605111510.k4BFA34G021003@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20986 Modified Files: python-clientform.spec Log Message: * Thu May 11 2006 Luke Macken 0.2.2-4 - Install with --single-version-externally-managed flag - Add a few more docs Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-clientform.spec 11 May 2006 14:44:24 -0000 1.7 +++ python-clientform.spec 11 May 2006 15:10:01 -0000 1.8 @@ -2,7 +2,7 @@ Name: python-clientform Version: 0.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages @@ -30,7 +30,8 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --single-version-externally-managed -O1 \ + --skip-build --root $RPM_BUILD_ROOT %clean @@ -39,12 +40,15 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README.txt -%{python_sitelib}/ClientForm.py -%{python_sitelib}/ClientForm.pyc +%doc COPYING.txt GeneralFAQ.html README.txt README.html examples +%{python_sitelib}/* %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 11 2006 Luke Macken 0.2.2-4 +- Install with --single-version-externally-managed flag +- Add a few more docs + * Thu May 11 2006 Luke Macken 0.2.2-3 - Add python-setuptools to BuildRequires From fedora-extras-commits at redhat.com Thu May 11 15:32:14 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 08:32:14 -0700 Subject: rpms/perl-IPC-Run/FC-4 .cvsignore, 1.3, 1.4 perl-IPC-Run.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200605111532.k4BFWGTh021290@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IPC-Run/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21237/FC-4 Modified Files: .cvsignore perl-IPC-Run.spec sources Log Message: * Thu May 11 2006 Ville Skytt?? - 0.80-1 - 0.80, fine tune build dependencies. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 17:46:46 -0000 1.3 +++ .cvsignore 11 May 2006 15:32:14 -0000 1.4 @@ -1 +1 @@ -IPC-Run-0.79.tar.gz +IPC-Run-0.80.tar.gz Index: perl-IPC-Run.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-4/perl-IPC-Run.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-IPC-Run.spec 10 Apr 2005 17:09:46 -0000 1.10 +++ perl-IPC-Run.spec 11 May 2006 15:32:14 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-IPC-Run -Version: 0.79 -Release: 2 +Version: 0.80 +Release: 1%{?dist} Summary: Perl module for interacting with child processes License: GPL or Artistic @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IO::Tty) +BuildRequires: perl(IO::Pty) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -25,6 +25,7 @@ %prep %setup -q -n IPC-Run-%{version} chmod 644 lib/IPC/*.pm lib/IPC/Run/*.pm Changes eg/* +%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' eg/run_daemon %build @@ -38,9 +39,11 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* +rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/IPC/Run/Win32*.pm +rm -f $RPM_BUILD_ROOT%{_mandir}/man3/IPC::Run::Win32*.3* -%check || : +%check # https://rt.cpan.org/NoAuth/Bug.html?id=11129 [ ! -d /dev/pts ] || IPCRUNDEBUG=2 make test @@ -53,12 +56,16 @@ %defattr(-,root,root,-) %doc Changes TODO eg/ %{perl_vendorlib}/IPC/ -%exclude %{perl_vendorlib}/IPC/Run/Win32*.pm %{_mandir}/man3/IPC::Run*.3* -%exclude %{_mandir}/man3/IPC::Run::Win32*.3* %changelog +* Thu May 11 2006 Ville Skytt?? - 0.80-1 +- 0.80, fine tune build dependencies. + +* Tue Jan 17 2006 Ville Skytt?? - 0.79-3 +- Rebuild, cosmetic cleanups. + * Sun Apr 10 2005 Ville Skytt?? - 0.79-2 - Exclude Win32 specific modules. - Include more docs. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 17:46:46 -0000 1.3 +++ sources 11 May 2006 15:32:14 -0000 1.4 @@ -1 +1 @@ -a1044306a9669b376f58315884c13392 IPC-Run-0.79.tar.gz +a867e694862afd4a3c429124618fc15e IPC-Run-0.80.tar.gz From fedora-extras-commits at redhat.com Thu May 11 15:32:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 08:32:16 -0700 Subject: rpms/perl-IPC-Run/devel .cvsignore, 1.3, 1.4 perl-IPC-Run.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605111532.k4BFWIdF021302@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IPC-Run/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21237/devel Modified Files: .cvsignore perl-IPC-Run.spec sources Log Message: * Thu May 11 2006 Ville Skytt?? - 0.80-1 - 0.80, fine tune build dependencies. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 17:46:46 -0000 1.3 +++ .cvsignore 11 May 2006 15:32:16 -0000 1.4 @@ -1 +1 @@ -IPC-Run-0.79.tar.gz +IPC-Run-0.80.tar.gz Index: perl-IPC-Run.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-IPC-Run.spec 17 Jan 2006 21:43:32 -0000 1.11 +++ perl-IPC-Run.spec 11 May 2006 15:32:16 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-IPC-Run -Version: 0.79 -Release: 3%{?dist} +Version: 0.80 +Release: 1%{?dist} Summary: Perl module for interacting with child processes License: GPL or Artistic @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IO::Tty) +BuildRequires: perl(IO::Pty) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -60,6 +60,9 @@ %changelog +* Thu May 11 2006 Ville Skytt?? - 0.80-1 +- 0.80, fine tune build dependencies. + * Tue Jan 17 2006 Ville Skytt?? - 0.79-3 - Rebuild, cosmetic cleanups. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 17:46:46 -0000 1.3 +++ sources 11 May 2006 15:32:16 -0000 1.4 @@ -1 +1 @@ -a1044306a9669b376f58315884c13392 IPC-Run-0.79.tar.gz +a867e694862afd4a3c429124618fc15e IPC-Run-0.80.tar.gz From fedora-extras-commits at redhat.com Thu May 11 15:32:15 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 08:32:15 -0700 Subject: rpms/perl-IPC-Run/FC-5 .cvsignore, 1.3, 1.4 perl-IPC-Run.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605111532.k4BFWHKm021296@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IPC-Run/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21237/FC-5 Modified Files: .cvsignore perl-IPC-Run.spec sources Log Message: * Thu May 11 2006 Ville Skytt?? - 0.80-1 - 0.80, fine tune build dependencies. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 17:46:46 -0000 1.3 +++ .cvsignore 11 May 2006 15:32:15 -0000 1.4 @@ -1 +1 @@ -IPC-Run-0.79.tar.gz +IPC-Run-0.80.tar.gz Index: perl-IPC-Run.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-5/perl-IPC-Run.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-IPC-Run.spec 17 Jan 2006 21:43:32 -0000 1.11 +++ perl-IPC-Run.spec 11 May 2006 15:32:15 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-IPC-Run -Version: 0.79 -Release: 3%{?dist} +Version: 0.80 +Release: 1%{?dist} Summary: Perl module for interacting with child processes License: GPL or Artistic @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IO::Tty) +BuildRequires: perl(IO::Pty) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -60,6 +60,9 @@ %changelog +* Thu May 11 2006 Ville Skytt?? - 0.80-1 +- 0.80, fine tune build dependencies. + * Tue Jan 17 2006 Ville Skytt?? - 0.79-3 - Rebuild, cosmetic cleanups. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 17:46:46 -0000 1.3 +++ sources 11 May 2006 15:32:15 -0000 1.4 @@ -1 +1 @@ -a1044306a9669b376f58315884c13392 IPC-Run-0.79.tar.gz +a867e694862afd4a3c429124618fc15e IPC-Run-0.80.tar.gz From fedora-extras-commits at redhat.com Thu May 11 15:43:41 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 08:43:41 -0700 Subject: extras-buildsys/builder BuilderMock.py,1.4,1.5 Message-ID: <200605111543.k4BFhfsO021855@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21835/builder Modified Files: BuilderMock.py Log Message: Remove duplicated code Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BuilderMock.py 9 May 2006 06:04:48 -0000 1.4 +++ BuilderMock.py 11 May 2006 15:43:39 -0000 1.5 @@ -174,8 +174,6 @@ self._log("Starting step 'building' with command:\n") if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) - if not os.path.exists(self._result_dir): - os.makedirs(self._result_dir) # Set up build process arguments args = [] From fedora-extras-commits at redhat.com Thu May 11 15:49:14 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 08:49:14 -0700 Subject: rpms/ctapi-cyberjack/FC-4 ctapi-cyberjack.spec,1.1,1.2 Message-ID: <200605111549.k4BFnGev021915@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/ctapi-cyberjack/FC-4 Modified Files: ctapi-cyberjack.spec Log Message: change marks to build for FC4 Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-4/ctapi-cyberjack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack.spec 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack.spec 11 May 2006 15:49:14 -0000 1.2 @@ -4,9 +4,9 @@ Release: 13%{?dist} Requires: %{_libdir}/ctapi #For FC>4 -BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 +#BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 #For FC4 -#BuildRequires: libusb-devel readline-devel +BuildRequires: libusb-devel readline-devel URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.8/ctapi-cyberjack-2.0.8.tar.bz2 License: LGPL @@ -17,9 +17,9 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #for FC4 -#%%define readers_dir %{_libdir}/readers +%define readers_dir %{_libdir}/readers #for FC>4 -%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir) +#%%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir) %package devel Summary: Development files for libctapi-cyberjack @@ -69,7 +69,7 @@ etc/reader.conf #fix reader.conf for FC>4 - sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf + #sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf %patch0 -p1 %patch1 -p1 From fedora-extras-commits at redhat.com Thu May 11 15:52:28 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 08:52:28 -0700 Subject: extras-buildsys ChangeLog,1.193,1.194 Message-ID: <200605111552.k4BFqS7b022089@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058 Modified Files: ChangeLog Log Message: 2006-05-11 Dan Williams * builder/Builder.py - Make Builder::cleanup() work again - Sleep in ActiveBuilder::stop() until the thread is actually stopped Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- ChangeLog 10 May 2006 14:28:12 -0000 1.193 +++ ChangeLog 11 May 2006 15:52:25 -0000 1.194 @@ -1,3 +1,9 @@ +2006-05-11 Dan Williams + + * builder/Builder.py + - Make Builder::cleanup() work again + - Sleep in ActiveBuilder::stop() until the thread is actually stopped + 2006-05-10 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Thu May 11 15:52:28 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 08:52:28 -0700 Subject: extras-buildsys/builder Builder.py,1.8,1.9 Message-ID: <200605111552.k4BFqSHZ022095@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058/builder Modified Files: Builder.py Log Message: 2006-05-11 Dan Williams * builder/Builder.py - Make Builder::cleanup() work again - Sleep in ActiveBuilder::stop() until the thread is actually stopped 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 11 May 2006 14:44:56 -0000 1.8 +++ Builder.py 11 May 2006 15:52:26 -0000 1.9 @@ -60,10 +60,6 @@ pass return max_jobs -def log(string): - sys.stdout.write(string + "\n") - sys.stdout.flush() - class Builder(object): """ Abstract builder base object """ @@ -92,9 +88,12 @@ build_arches.append(arch) self._log("Available architectures: [%s]" % string.join(build_arches, ", ")) - def _log(self, string): + def _log(self, msg, newline=True): if self._cfg.get_bool("General", "debug"): - log(string) + if newline: + msg = msg + "\n" + sys.stdout.write(msg) + sys.stdout.flush() def new_builder(cfg, btype): if btype == 'passive': @@ -109,19 +108,18 @@ pass def cleanup(self): - return - (building_jobs, free) = bcs.building_jobs() - for jobid in building_jobs.keys(): - bcs.die(jobid) + self._building_jobs_lock.acquire() + for job in self._building_jobs: + job.die() + self._building_jobs_lock.release() # wait for the jobs to clean up before quitting - self._log("Waiting for running jobs to stop...") + self._log("Waiting for running jobs to stop...", newline=False) while True: - (building_jobs, free) = bcs.building_jobs() - if len(building_jobs.keys()) == 0: + if len(self._building_jobs) == 0: break try: - self._log(".") + self._log(".", newline=False) time.sleep(0.5) except KeyboardInterrupt: break @@ -405,6 +403,7 @@ def __init__(self, cfg): Builder.__init__(self, cfg) self._stop = False + self._stopped = False self._last_comm = time.time() - self._SERVER_CONTACT_INTERVAL - 1 self._queued_cmds = [] self._xmlrpc_address = self._get_server_address(cfg.get_str("Active", "xmlrpc_port")) @@ -554,6 +553,12 @@ resp = self._send_commands() self._process_server_response(resp) time.sleep(1) + self._stopped = True def stop(self): self._stop = True + while not self._stopped: + try: + time.sleep(0.2) + except KeyboardInterrupt: + pass From fedora-extras-commits at redhat.com Thu May 11 16:07:42 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 May 2006 09:07:42 -0700 Subject: extras-buildsys/utils extras-repobuild.py,1.16,1.17 Message-ID: <200605111607.k4BG7gxf024498@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24480 Modified Files: extras-repobuild.py Log Message: put *debuginfo* glob in quotes Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- extras-repobuild.py 11 May 2006 10:54:11 -0000 1.16 +++ extras-repobuild.py 11 May 2006 16:07:40 -0000 1.17 @@ -71,9 +71,9 @@ print 'Creating repository metadata' if os.path.exists(compspath): - cmd = '/usr/bin/createrepo -c %s -q -g %s -x *debuginfo* %s' % (cachedir, compsname, repodir) + cmd = '/usr/bin/createrepo -c %s -q -g %s -x \'*debuginfo*\' %s' % (cachedir, compsname, repodir) else: - cmd = '/usr/bin/createrepo -c %s -q -x *debuginfo* %s' % (cachedir, repodir) + cmd = '/usr/bin/createrepo -c %s -q -x \'*debuginfo*\' %s' % (cachedir, repodir) run_and_check(cmd) From fedora-extras-commits at redhat.com Thu May 11 16:17:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 09:17:03 -0700 Subject: rpms/perl-Config-Tiny/FC-4 .cvsignore, 1.7, 1.8 perl-Config-Tiny.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200605111617.k4BGH5dG024705@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24666/FC-4 Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Update to 2.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Apr 2006 21:07:33 -0000 1.7 +++ .cvsignore 11 May 2006 16:17:03 -0000 1.8 @@ -1 +1 @@ -Config-Tiny-2.06.tar.gz +Config-Tiny-2.07.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/perl-Config-Tiny.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Config-Tiny.spec 22 Apr 2006 21:07:33 -0000 1.11 +++ perl-Config-Tiny.spec 11 May 2006 16:17:03 -0000 1.12 @@ -1,5 +1,5 @@ Name: perl-Config-Tiny -Version: 2.06 +Version: 2.07 Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files @@ -54,6 +54,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 2.07-1 +- Updated to 2.07. + * Sat Apr 22 2006 Jose Pedro Oliveira - 2.06-1 - Updated to 2.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Apr 2006 21:07:33 -0000 1.7 +++ sources 11 May 2006 16:17:03 -0000 1.8 @@ -1 +1 @@ -40b5ce184ee6307b5a9ce1f588f824d6 Config-Tiny-2.06.tar.gz +19cb3091a01baed531ac2dc7d7eee629 Config-Tiny-2.07.tar.gz From fedora-extras-commits at redhat.com Thu May 11 16:17:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 09:17:04 -0700 Subject: rpms/perl-Config-Tiny/FC-5 .cvsignore, 1.8, 1.9 perl-Config-Tiny.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200605111617.k4BGH69u024711@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24666/FC-5 Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Update to 2.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Apr 2006 21:07:34 -0000 1.8 +++ .cvsignore 11 May 2006 16:17:03 -0000 1.9 @@ -1 +1 @@ -Config-Tiny-2.06.tar.gz +Config-Tiny-2.07.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/perl-Config-Tiny.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Config-Tiny.spec 22 Apr 2006 21:07:34 -0000 1.13 +++ perl-Config-Tiny.spec 11 May 2006 16:17:03 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-Config-Tiny -Version: 2.06 +Version: 2.07 Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files @@ -54,6 +54,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 2.07-1 +- Updated to 2.07. + * Sat Apr 22 2006 Jose Pedro Oliveira - 2.06-1 - Updated to 2.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Apr 2006 21:07:34 -0000 1.8 +++ sources 11 May 2006 16:17:03 -0000 1.9 @@ -1 +1 @@ -40b5ce184ee6307b5a9ce1f588f824d6 Config-Tiny-2.06.tar.gz +19cb3091a01baed531ac2dc7d7eee629 Config-Tiny-2.07.tar.gz From fedora-extras-commits at redhat.com Thu May 11 16:19:26 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 09:19:26 -0700 Subject: rpms/perl-PPI/FC-5 .cvsignore, 1.2, 1.3 perl-PPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605111619.k4BGJSjl024828@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24807 Modified Files: .cvsignore perl-PPI.spec sources Log Message: Update to 1.113. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 May 2006 12:38:07 -0000 1.2 +++ .cvsignore 11 May 2006 16:19:26 -0000 1.3 @@ -1 +1 @@ -PPI-1.112.tar.gz +PPI-1.113.tar.gz Index: perl-PPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/FC-5/perl-PPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-PPI.spec 2 May 2006 12:38:07 -0000 1.1 +++ perl-PPI.spec 11 May 2006 16:19:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-PPI -Version: 1.112 +Version: 1.113 Release: 1%{?dist} Summary: Parse, Analyze and Manipulate Perl @@ -61,6 +61,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 1.113-1 +- Update to 1.113. + * Tue Apr 25 2006 Jose Pedro Oliveira - 1.112-1 - Update to 1.112. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 May 2006 12:38:07 -0000 1.2 +++ sources 11 May 2006 16:19:26 -0000 1.3 @@ -1 +1 @@ -a629d953e0002813061c4308c64993f6 PPI-1.112.tar.gz +8e06ad1a96244618fbebdd346791067c PPI-1.113.tar.gz From fedora-extras-commits at redhat.com Thu May 11 16:20:50 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 09:20:50 -0700 Subject: owners owners.list,1.975,1.976 Message-ID: <200605111620.k4BGKrgd024890@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24873/owners Modified Files: owners.list Log Message: add childsplay Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.975 retrieving revision 1.976 diff -u -r1.975 -r1.976 --- owners.list 11 May 2006 14:09:22 -0000 1.975 +++ owners.list 11 May 2006 16:20:50 -0000 1.976 @@ -134,6 +134,7 @@ Fedora Extras|cgoban|X board for playing go|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|childsplay|Suite of educational games for young children|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 16:34:27 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 09:34:27 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo.spec,1.19,1.20 Message-ID: <200605111634.k4BGYTmU025014@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24981/FC-5 Modified Files: xemacs-sumo.spec Log Message: Yet another try at finding out the xemacs-nox version; the previous one worked fine locally and in mach and mock, but not in the buildsys. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xemacs-sumo.spec 10 May 2006 21:21:46 -0000 1.19 +++ xemacs-sumo.spec 11 May 2006 16:34:27 -0000 1.20 @@ -1,7 +1,7 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox | cut -d' ' -f 1) +%define xemver %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) From fedora-extras-commits at redhat.com Thu May 11 16:34:28 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 09:34:28 -0700 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.19,1.20 Message-ID: <200605111634.k4BGYUDv025018@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24981/devel Modified Files: xemacs-sumo.spec Log Message: Yet another try at finding out the xemacs-nox version; the previous one worked fine locally and in mach and mock, but not in the buildsys. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xemacs-sumo.spec 10 May 2006 21:21:46 -0000 1.19 +++ xemacs-sumo.spec 11 May 2006 16:34:28 -0000 1.20 @@ -1,7 +1,7 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox | cut -d' ' -f 1) +%define xemver %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) From fedora-extras-commits at redhat.com Thu May 11 16:45:51 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 09:45:51 -0700 Subject: rpms/bzflag/devel .cvsignore, 1.4, 1.5 bzflag.spec, 1.21, 1.22 sources, 1.4, 1.5 Message-ID: <200605111645.k4BGjrwG025140@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25119 Modified Files: .cvsignore bzflag.spec sources Log Message: version 2.0.6 add disttag remove upstreamed stringdos patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Nov 2005 11:03:11 -0000 1.4 +++ .cvsignore 11 May 2006 16:45:51 -0000 1.5 @@ -1 +1 @@ -bzflag-2.0.4.20050930.tar.bz2 +bzflag-2.0.6.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bzflag.spec 17 Feb 2006 15:08:48 -0000 1.21 +++ bzflag.spec 11 May 2006 16:45:51 -0000 1.22 @@ -2,19 +2,18 @@ %define _modular_X 0%{!?_without_modular_x:1} %define desktop_vendor fedora -%define date 20050930 +#define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.4 -Release: 3 +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://bzflag.org -Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 +Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch1: bzflag-2.0.4-stringdos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %_modular_X BuildRequires: libXi-devel @@ -49,7 +48,6 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch1 -p1 -b .stringdos %build # Use PIE because bzflag/bzfs are networked server applications @@ -94,6 +92,11 @@ %{_mandir}/man*/* %changelog +* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +- version 2.0.6 +- add disttag +- remove upstreamed stringdos patch + * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Nov 2005 11:03:11 -0000 1.4 +++ sources 11 May 2006 16:45:51 -0000 1.5 @@ -1 +1 @@ -b91444c788996902b799f9b64efddd8f bzflag-2.0.4.20050930.tar.bz2 +5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 From fedora-extras-commits at redhat.com Thu May 11 16:47:15 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 09:47:15 -0700 Subject: rpms/bzflag/devel bzflag-2.0.4-stringdos.patch,1.1,NONE Message-ID: <200605111647.k4BGlH6g025208@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25192 Removed Files: bzflag-2.0.4-stringdos.patch Log Message: version 2.0.6 add disttag remove upstreamed stringdos patch --- bzflag-2.0.4-stringdos.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 11 16:49:01 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 May 2006 09:49:01 -0700 Subject: extras-buildsys/utils extras-push-new,1.8,1.9 Message-ID: <200605111649.k4BGn1EJ025320@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25302 Modified Files: extras-push-new Log Message: syncing twice is nice in theory, but since extras-repobuild.py kills repoview data, it is not so good unless we improve extras-repobuild.py to backup/reinstall repoview data Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- extras-push-new 11 May 2006 10:54:11 -0000 1.8 +++ extras-push-new 11 May 2006 16:48:59 -0000 1.9 @@ -53,7 +53,7 @@ 'setumask' : True, 'signkeycheck' : True, 'mail' : True, - 'doublesync' : True, + 'doublesync' : False, 'force' : False } From fedora-extras-commits at redhat.com Thu May 11 16:54:47 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 09:54:47 -0700 Subject: rpms/bzflag/FC-5 .cvsignore, 1.4, 1.5 bzflag.spec, 1.21, 1.22 sources, 1.4, 1.5 bzflag-2.0.4-stringdos.patch, 1.1, NONE Message-ID: <200605111654.k4BGsnC5025433@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25412 Modified Files: .cvsignore bzflag.spec sources Removed Files: bzflag-2.0.4-stringdos.patch Log Message: version 2.0.6 add disttag remove upstreamed stringdos patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Nov 2005 11:03:11 -0000 1.4 +++ .cvsignore 11 May 2006 16:54:47 -0000 1.5 @@ -1 +1 @@ -bzflag-2.0.4.20050930.tar.bz2 +bzflag-2.0.6.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bzflag.spec 17 Feb 2006 15:08:48 -0000 1.21 +++ bzflag.spec 11 May 2006 16:54:47 -0000 1.22 @@ -2,19 +2,18 @@ %define _modular_X 0%{!?_without_modular_x:1} %define desktop_vendor fedora -%define date 20050930 +#define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.4 -Release: 3 +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://bzflag.org -Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 +Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch1: bzflag-2.0.4-stringdos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %_modular_X BuildRequires: libXi-devel @@ -49,7 +48,6 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch1 -p1 -b .stringdos %build # Use PIE because bzflag/bzfs are networked server applications @@ -94,6 +92,11 @@ %{_mandir}/man*/* %changelog +* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +- version 2.0.6 +- add disttag +- remove upstreamed stringdos patch + * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Nov 2005 11:03:11 -0000 1.4 +++ sources 11 May 2006 16:54:47 -0000 1.5 @@ -1 +1 @@ -b91444c788996902b799f9b64efddd8f bzflag-2.0.4.20050930.tar.bz2 +5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 --- bzflag-2.0.4-stringdos.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 11 16:57:04 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 09:57:04 -0700 Subject: rpms/bzflag/FC-4 .cvsignore, 1.4, 1.5 bzflag.spec, 1.18, 1.19 sources, 1.4, 1.5 bzflag-2.0.4-stringdos.patch, 1.1, NONE Message-ID: <200605111657.k4BGv6tr025504@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25483 Modified Files: .cvsignore bzflag.spec sources Removed Files: bzflag-2.0.4-stringdos.patch Log Message: version 2.0.6 add disttag remove upstreamed stringdos patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Nov 2005 11:59:40 -0000 1.4 +++ .cvsignore 11 May 2006 16:57:04 -0000 1.5 @@ -1 +1 @@ -bzflag-2.0.4.20050930.tar.bz2 +bzflag-2.0.6.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bzflag.spec 28 Dec 2005 12:28:39 -0000 1.18 +++ bzflag.spec 11 May 2006 16:57:04 -0000 1.19 @@ -1,20 +1,19 @@ -# Use --with modular_x to rebuild with modular X deps -%define _modular_X 0%{?_with_modular_x:1} +# Use --without modular_X to rebuild without modular X deps +%define _modular_X 0%{!?_without_modular_x:1} %define desktop_vendor fedora -%define date 20050930 +#define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.4 -Release: 0.fc4.3 +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://bzflag.org -Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 +Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch1: bzflag-2.0.4-stringdos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %_modular_X BuildRequires: libXi-devel @@ -48,7 +47,7 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} -%patch0 -p1 -b .stringdos +%patch0 -p1 -b .lookup %build # Use PIE because bzflag/bzfs are networked server applications @@ -93,15 +92,17 @@ %{_mandir}/man*/* %changelog -* Wed Dec 28 2005 Nils Philippsen 2.0.4-0.fc4.3 -- don't crash on maliciously formed callsign, etc. strings (#176626, patch - backported from upstream CVS) +* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +- version 2.0.6 +- add disttag +- remove upstreamed stringdos patch -* Tue Nov 29 2005 Nils Philippsen 2.0.4-0.fc4.2 -- bump release to make build system build +* Fri Feb 17 2006 Nils Philippsen 2.0.4-3 +- rebuild -* Tue Nov 29 2005 Nils Philippsen 2.0.4-0.fc4.1 -- rebuild for FC4 +* Wed Dec 28 2005 Nils Philippsen 2.0.4-2 +- don't crash on maliciously formed callsign, etc. strings (#176626, patch + backported from upstream CVS) * Mon Nov 21 2005 Nils Philippsen 2.0.4-1 - version 2.0.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Nov 2005 11:59:40 -0000 1.4 +++ sources 11 May 2006 16:57:04 -0000 1.5 @@ -1 +1 @@ -b91444c788996902b799f9b64efddd8f bzflag-2.0.4.20050930.tar.bz2 +5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 --- bzflag-2.0.4-stringdos.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 11 17:33:59 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 10:33:59 -0700 Subject: rpms/bzflag/devel bzflag.spec,1.22,1.23 Message-ID: <200605111734.k4BHY1Z9027906@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27889 Modified Files: bzflag.spec Log Message: adapt %files Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- bzflag.spec 11 May 2006 16:45:51 -0000 1.22 +++ bzflag.spec 11 May 2006 17:33:59 -0000 1.23 @@ -81,11 +81,6 @@ %{_bindir}/bzadmin %{_bindir}/bzflag %{_bindir}/bzfs -%exclude %{_includedir}/bzflag/ -%dir %{_libdir}/bzflag/ -%exclude %{_libdir}/bzflag/*.a -%exclude %{_libdir}/bzflag/*.la -%{_libdir}/bzflag/*.so %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %{_datadir}/bzflag %{_datadir}/pixmaps/bzflag.xpm @@ -96,6 +91,7 @@ - version 2.0.6 - add disttag - remove upstreamed stringdos patch +- adapt %%files * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild From fedora-extras-commits at redhat.com Thu May 11 17:35:27 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 10:35:27 -0700 Subject: rpms/bzflag/FC-5 bzflag.spec,1.22,1.23 Message-ID: <200605111735.k4BHZTdW027965@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27948 Modified Files: bzflag.spec Log Message: adapt %files Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- bzflag.spec 11 May 2006 16:54:47 -0000 1.22 +++ bzflag.spec 11 May 2006 17:35:27 -0000 1.23 @@ -81,11 +81,6 @@ %{_bindir}/bzadmin %{_bindir}/bzflag %{_bindir}/bzfs -%exclude %{_includedir}/bzflag/ -%dir %{_libdir}/bzflag/ -%exclude %{_libdir}/bzflag/*.a -%exclude %{_libdir}/bzflag/*.la -%{_libdir}/bzflag/*.so %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %{_datadir}/bzflag %{_datadir}/pixmaps/bzflag.xpm @@ -96,6 +91,7 @@ - version 2.0.6 - add disttag - remove upstreamed stringdos patch +- adapt %%files * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild From fedora-extras-commits at redhat.com Thu May 11 17:36:24 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 10:36:24 -0700 Subject: rpms/bzflag/FC-4 bzflag.spec,1.19,1.20 Message-ID: <200605111736.k4BHaQaK028022@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28005 Modified Files: bzflag.spec Log Message: adapt %files Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bzflag.spec 11 May 2006 16:57:04 -0000 1.19 +++ bzflag.spec 11 May 2006 17:36:24 -0000 1.20 @@ -81,11 +81,6 @@ %{_bindir}/bzadmin %{_bindir}/bzflag %{_bindir}/bzfs -%exclude %{_includedir}/bzflag/ -%dir %{_libdir}/bzflag/ -%exclude %{_libdir}/bzflag/*.a -%exclude %{_libdir}/bzflag/*.la -%{_libdir}/bzflag/*.so %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %{_datadir}/bzflag %{_datadir}/pixmaps/bzflag.xpm @@ -96,6 +91,7 @@ - version 2.0.6 - add disttag - remove upstreamed stringdos patch +- adapt %%files * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild From fedora-extras-commits at redhat.com Thu May 11 18:06:28 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:06:28 -0700 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.17, 1.18 abcm2ps.spec, 1.18, 1.19 sources, 1.17, 1.18 Message-ID: <200605111807.k4BI700x030454@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30379/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Apr 2006 08:09:02 -0000 1.17 +++ .cvsignore 11 May 2006 18:06:28 -0000 1.18 @@ -1,2 +1,2 @@ -abcm2ps-4.12.15.tar.gz +abcm2ps-4.12.17.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- abcm2ps.spec 28 Apr 2006 08:09:02 -0000 1.18 +++ abcm2ps.spec 11 May 2006 18:06:28 -0000 1.19 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.15 +Version: 4.12.17 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.12.15.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.17.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 4.12.17-1 +- new version 4.12.17 + * Fri Apr 28 2006 Gerard Milmeister - 4.12.15-1 - new version 4.12.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Apr 2006 08:09:02 -0000 1.17 +++ sources 11 May 2006 18:06:28 -0000 1.18 @@ -1,2 +1,2 @@ -ebea415b7d1b82d054227343e027f820 abcm2ps-4.12.15.tar.gz +99040c25175e4aae58a39f42d75ed79e abcm2ps-4.12.17.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu May 11 18:06:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:06:29 -0700 Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.17, 1.18 abcm2ps.spec, 1.19, 1.20 sources, 1.17, 1.18 Message-ID: <200605111807.k4BI71hv030459@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30379/FC-5 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Apr 2006 08:09:03 -0000 1.17 +++ .cvsignore 11 May 2006 18:06:29 -0000 1.18 @@ -1,2 +1,2 @@ -abcm2ps-4.12.15.tar.gz +abcm2ps-4.12.17.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/abcm2ps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- abcm2ps.spec 28 Apr 2006 08:09:03 -0000 1.19 +++ abcm2ps.spec 11 May 2006 18:06:29 -0000 1.20 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.15 +Version: 4.12.17 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.12.15.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.17.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 4.12.17-1 +- new version 4.12.17 + * Fri Apr 28 2006 Gerard Milmeister - 4.12.15-1 - new version 4.12.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Apr 2006 08:09:03 -0000 1.17 +++ sources 11 May 2006 18:06:29 -0000 1.18 @@ -1,2 +1,2 @@ -ebea415b7d1b82d054227343e027f820 abcm2ps-4.12.15.tar.gz +99040c25175e4aae58a39f42d75ed79e abcm2ps-4.12.17.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu May 11 18:06:28 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:06:28 -0700 Subject: rpms/abcm2ps/FC-3 abcm2ps.spec,1.12,1.13 Message-ID: <200605111807.k4BI70cj030449@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30379/FC-3 Modified Files: abcm2ps.spec Log Message: new version 4.12.17 Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- abcm2ps.spec 13 Feb 2006 11:37:35 -0000 1.12 +++ abcm2ps.spec 11 May 2006 18:06:28 -0000 1.13 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.8 +Version: 4.12.17 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.12.8.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.17.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 4.12.17-1 +- new version 4.12.17 + * Mon Feb 13 2006 Gerard Milmeister - 4.12.8-1 - new version 4.12.8 From fedora-extras-commits at redhat.com Thu May 11 18:06:30 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:06:30 -0700 Subject: rpms/abcm2ps/devel .cvsignore, 1.17, 1.18 abcm2ps.spec, 1.19, 1.20 sources, 1.17, 1.18 Message-ID: <200605111807.k4BI72Wo030464@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30379/devel Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Apr 2006 08:07:24 -0000 1.17 +++ .cvsignore 11 May 2006 18:06:30 -0000 1.18 @@ -1,2 +1,2 @@ -abcm2ps-4.12.15.tar.gz +abcm2ps-4.12.17.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- abcm2ps.spec 28 Apr 2006 08:07:24 -0000 1.19 +++ abcm2ps.spec 11 May 2006 18:06:30 -0000 1.20 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.15 +Version: 4.12.17 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.12.15.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.17.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 4.12.17-1 +- new version 4.12.17 + * Fri Apr 28 2006 Gerard Milmeister - 4.12.15-1 - new version 4.12.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Apr 2006 08:07:24 -0000 1.17 +++ sources 11 May 2006 18:06:30 -0000 1.18 @@ -1,2 +1,2 @@ -ebea415b7d1b82d054227343e027f820 abcm2ps-4.12.15.tar.gz +99040c25175e4aae58a39f42d75ed79e abcm2ps-4.12.17.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu May 11 18:13:22 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:13:22 -0700 Subject: rpms/abcm2ps/FC-3 .cvsignore,1.12,1.13 sources,1.12,1.13 Message-ID: <200605111813.k4BIDOCs030654@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30635/FC-3 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 11:37:35 -0000 1.12 +++ .cvsignore 11 May 2006 18:13:22 -0000 1.13 @@ -1,2 +1,2 @@ -abcm2ps-4.12.8.tar.gz +abcm2ps-4.12.17.tar.gz abcplus_en-1.0.4.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 11:37:35 -0000 1.12 +++ sources 11 May 2006 18:13:22 -0000 1.13 @@ -1,2 +1,2 @@ -119acfaf7c93ea0a83a69d4c6ae5c9ac abcm2ps-4.12.8.tar.gz +99040c25175e4aae58a39f42d75ed79e abcm2ps-4.12.17.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu May 11 18:17:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:17:44 -0700 Subject: rpms/childsplay_plugins - New directory Message-ID: <200605111817.k4BIHkX6030734@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30707/childsplay_plugins Log Message: Directory /cvs/extras/rpms/childsplay_plugins added to the repository From fedora-extras-commits at redhat.com Thu May 11 18:17:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:17:44 -0700 Subject: rpms/childsplay_plugins/devel - New directory Message-ID: <200605111817.k4BIHk2U030737@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30707/childsplay_plugins/devel Log Message: Directory /cvs/extras/rpms/childsplay_plugins/devel added to the repository From fedora-extras-commits at redhat.com Thu May 11 18:17:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:17:57 -0700 Subject: rpms/childsplay_plugins Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605111817.k4BIHxS1030782@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754 Added Files: Makefile import.log Log Message: Setup of module childsplay_plugins --- NEW FILE Makefile --- # Top level Makefile for module childsplay_plugins all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu May 11 18:17:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:17:58 -0700 Subject: rpms/childsplay_plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605111818.k4BII0tQ030785@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module childsplay_plugins --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu May 11 18:18:46 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:18:46 -0700 Subject: rpms/childsplay_plugins import.log,1.1,1.2 Message-ID: <200605111818.k4BIImJm030859@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825 Modified Files: import.log Log Message: auto-import childsplay_plugins-0.80.7-3 on branch devel from childsplay_plugins-0.80.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 May 2006 18:17:57 -0000 1.1 +++ import.log 11 May 2006 18:18:46 -0000 1.2 @@ -0,0 +1 @@ +childsplay_plugins-0_80_7-3:HEAD:childsplay_plugins-0.80.7-3.src.rpm:1147371540 From fedora-extras-commits at redhat.com Thu May 11 18:18:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:18:47 -0700 Subject: rpms/childsplay_plugins/devel childsplay_plugins-0.80.7-alphabet-sounds.patch, NONE, 1.1 childsplay_plugins.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605111818.k4BIInZK030866@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825/devel Modified Files: .cvsignore sources Added Files: childsplay_plugins-0.80.7-alphabet-sounds.patch childsplay_plugins.spec Log Message: auto-import childsplay_plugins-0.80.7-3 on branch devel from childsplay_plugins-0.80.7-3.src.rpm childsplay_plugins-0.80.7-alphabet-sounds.patch: --- NEW FILE childsplay_plugins-0.80.7-alphabet-sounds.patch --- --- childsplay_plugins-0.80.7/lib/findsound2.py.alphabet 2006-04-09 11:12:39.000000000 +0200 +++ childsplay_plugins-0.80.7/lib/findsound2.py 2006-05-05 20:16:56.000000000 +0200 @@ -97,10 +97,10 @@ def _setup(self): """ Set all the stuff we need""" #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2]) - if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language) - self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language) + if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet') + self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet') if not os.path.exists(self.sounddir): - self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en') + self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet' img = load_image(os.path.join\ (self.libdir,'Findsound2Data','Data','soundbut.png'),1) @@ -127,7 +127,10 @@ else: fsize = 88 img = char2surf(c,fsize,(255,0,0)) - snd = os.path.join(snddir,c.lower()+'.ogg') + if c == '10': + snd = os.path.join(snddir, c.lower()+'.ogg') + else: + snd = os.path.join(snddir, 'U%04X.ogg'%ord(c.lower())) if _FSDEBUG: print "char,snd",c.lower(),snd objects.append(ImageObject(img,snd)) if _FSDEBUG: print "objects",objects --- childsplay_plugins-0.80.7/lib/packid.py.alphabet 2006-04-09 11:12:39.000000000 +0200 +++ childsplay_plugins-0.80.7/lib/packid.py 2006-05-05 20:15:26.000000000 +0200 @@ -473,7 +473,7 @@ # Look for alphabet sounds for this locale. # If all fails we fall back to the "old" wahoo sound. - alphabetdir = os.path.join(DATADIR,'AlphabetSounds',wordsloc) + alphabetdir = os.path.join('/usr/share/gcompris/boards/sounds',wordsloc,'alphabet') if not os.path.exists(alphabetdir): print >> sys.stderr, "Can't find",alphabetdir alphabetdir = None @@ -741,7 +741,7 @@ pygame.display.update(self.screen.blit(Img.pac_smile,self.packid.rect)) if self.alphabetdir: try: - char = obj.char.lower()+'.ogg' + char = 'U%04X.ogg' % ord(obj.char.lower()) pygame.time.wait(500) load_music(os.path.join(self.alphabetdir,char)).play() except Exception,info: --- NEW FILE childsplay_plugins.spec --- Name: childsplay_plugins Version: 0.80.7 Release: 3%{?dist} Summary: Plugins for childsplay (educational games for young children) Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ Source: http://download.sourceforge.net/childsplay/%{name}-%{version}.tgz Patch0: childsplay_plugins-0.80.7-alphabet-sounds.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: childsplay >= 0.81.4 %description Plugins (games) for Childsplay a suite of educational games for young children. The aim is to be educational and at the same time be fun to play. %prep %setup -q # no backups otherwise the backups endup in the rpm. %patch0 -p1 # the translation is merged into the assetml file, so don't ship it seperatly rm -r assetml/childsplay/sounds-misc/po %build # Only python code, no so nothing to build. %install rm -rf $RPM_BUILD_ROOT # INSTALL.sh is seriously borked, so DIY mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \ $RPM_BUILD_ROOT%{_datadir}/assetml %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, -) %doc README* %dir %{_datadir}/childsplay %dir %{_datadir}/childsplay/plugins %{_datadir}/childsplay/plugins/*.py %{_datadir}/childsplay/plugins/*.pyc %ghost %{_datadir}/childsplay/plugins/*.pyo %{_datadir}/childsplay/plugins/*Data %{_datadir}/childsplay/plugins/SoundMemory %{_datadir}/childsplay/Data %{_datadir}/childsplay/sounds-misc %{_datadir}/assetml/* %changelog * Thu May 11 2006 Hans de Goede 0.80.7-3 - Own /usr/share/childsplay and subdirs to guarantee correct uninstall (bz 190878). - Fix Source0 to point to the main sourceforge download instead of to the mirror selection page. * Wed May 10 2006 Hans de Goede 0.80.7-2 - Ghost .pyo files - Don't create backups for the alphabet patch, the backups end up getting installed * Fri May 5 2006 Hans de Goede 0.80.7-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 May 2006 18:17:58 -0000 1.1 +++ .cvsignore 11 May 2006 18:18:46 -0000 1.2 @@ -0,0 +1 @@ +childsplay_plugins-0.80.7.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 May 2006 18:17:58 -0000 1.1 +++ sources 11 May 2006 18:18:46 -0000 1.2 @@ -0,0 +1 @@ +d3ea05d2a1fb373d9c4836845b199a76 childsplay_plugins-0.80.7.tgz From fedora-extras-commits at redhat.com Thu May 11 18:24:53 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:24:53 -0700 Subject: owners owners.list,1.976,1.977 Message-ID: <200605111824.k4BIOt6h031013@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30996/owners Modified Files: owners.list Log Message: add childsplay_plugins Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.976 retrieving revision 1.977 diff -u -r1.976 -r1.977 --- owners.list 11 May 2006 16:20:50 -0000 1.976 +++ owners.list 11 May 2006 18:24:53 -0000 1.977 @@ -135,6 +135,7 @@ Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|childsplay|Suite of educational games for young children|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|childsplay_plugins|Plugins for childsplay (educational games for young children)|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 18:29:59 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:29:59 -0700 Subject: comps comps-fe6.xml.in,1.11,1.12 Message-ID: <200605111830.k4BIU1TF031205@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31185/comps Modified Files: comps-fe6.xml.in Log Message: add childsplay_plugins Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- comps-fe6.xml.in 9 May 2006 22:15:42 -0000 1.11 +++ comps-fe6.xml.in 11 May 2006 18:29:59 -0000 1.12 @@ -206,6 +206,7 @@ bzflag celestia cgoban + childsplay crystal-stacker crystal-stacker-themes csmash From fedora-extras-commits at redhat.com Thu May 11 19:15:36 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 12:15:36 -0700 Subject: rpms/perl-Net-SSLeay/FC-3 perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch, NONE, 1.1 perl-Net-SSLeay.spec, 1.1, 1.2 Message-ID: <200605111915.k4BJFcKC003761@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726/FC-3 Modified Files: perl-Net-SSLeay.spec Added Files: perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch Log Message: CVE-2005-0106 (#191351) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch: --- NEW FILE perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch --- --- Net_SSLeay.pm-1.25/SSLeay.pm.cve-2005-0106 2006-01-25 12:37:11.540102265 -0700 +++ Net_SSLeay.pm-1.25/SSLeay.pm 2006-01-25 12:38:16.994260984 -0700 @@ -1853,8 +1853,8 @@ my ($rn_seed_file, $seed, $egd_path) = @_; my $rnsf = defined($rn_seed_file) && -r $rn_seed_file; + $egd_path = ''; $egd_path = $ENV{'EGD_PATH'} if $ENV{'EGD_PATH'}; - $egd_path = '/tmp/entropy' unless $egd_path; RAND_seed(rand() + $$); # Stir it with time and pid @@ -1865,7 +1865,7 @@ RAND_load_file($rn_seed_file, -s _) if $rnsf; RAND_seed($seed) if $seed; RAND_seed($ENV{RND_SEED}) if $ENV{RND_SEED}; - RAND_egd($egd_path) if -S $egd_path; + RAND_egd($egd_path) if -e $egd_path && -S $egd_path; RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8) if -r $Net::SSLeay::random_device; } Index: perl-Net-SSLeay.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-3/perl-Net-SSLeay.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-SSLeay.spec 20 Dec 2004 17:25:07 -0000 1.1 +++ perl-Net-SSLeay.spec 11 May 2006 19:15:36 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-Net-SSLeay Version: 1.26 -Release: 1 +Release: 2%{?dist} Epoch: 0 Summary: Perl extension for using OpenSSL @@ -11,10 +11,12 @@ URL: http://search.cpan.org/dist/Net_SSLeay.pm/ Source0: http://www.fas.harvard.edu/~behrooz/Net_SSLeay.pm-1.26.tar.gz Patch0: %{name}-test14.patch +Patch1: perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1, openssl-devel -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1 +BuildRequires: openssl-devel +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl-Net_SSLeay = %{epoch}:%{version}-%{release} %description @@ -28,8 +30,10 @@ %prep %setup -q -n Net_SSLeay.pm-%{version} %patch0 -p0 +%patch1 -p1 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle -chmod 644 examples/* +chmod -c 644 examples/* +%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl iconv -f iso-8859-1 -t utf-8 SSLeay.pm > SSLeay.pm.utf8 mv SSLeay.pm.utf8 SSLeay.pm @@ -59,13 +63,16 @@ %files %defattr(-,root,root,-) -%doc Changes* Credits QuickRef README examples -%{perl_vendorarch}/auto/Net -%{perl_vendorarch}/Net +%doc Changes* Credits QuickRef README examples/ +%{perl_vendorarch}/auto/Net/ +%{perl_vendorarch}/Net/ %{_mandir}/man3/Net::SSLeay*.3* %changelog +* Thu May 11 2006 Jose Pedro Oliveira - 0:1.26-2 +- CVE-2005-0106 (#191351). + * Mon Dec 20 2004 Ville Skytt?? - 0:1.26-1 - Drop fedora.us release prefix and suffix. From fedora-extras-commits at redhat.com Thu May 11 19:15:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 12:15:37 -0700 Subject: rpms/perl-Net-SSLeay/FC-4 perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch, NONE, 1.1 perl-Net-SSLeay.spec, 1.4, 1.5 Message-ID: <200605111915.k4BJFdmx003767@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726/FC-4 Modified Files: perl-Net-SSLeay.spec Added Files: perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch Log Message: CVE-2005-0106 (#191351) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch: --- NEW FILE perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch --- --- Net_SSLeay.pm-1.25/SSLeay.pm.cve-2005-0106 2006-01-25 12:37:11.540102265 -0700 +++ Net_SSLeay.pm-1.25/SSLeay.pm 2006-01-25 12:38:16.994260984 -0700 @@ -1853,8 +1853,8 @@ my ($rn_seed_file, $seed, $egd_path) = @_; my $rnsf = defined($rn_seed_file) && -r $rn_seed_file; + $egd_path = ''; $egd_path = $ENV{'EGD_PATH'} if $ENV{'EGD_PATH'}; - $egd_path = '/tmp/entropy' unless $egd_path; RAND_seed(rand() + $$); # Stir it with time and pid @@ -1865,7 +1865,7 @@ RAND_load_file($rn_seed_file, -s _) if $rnsf; RAND_seed($seed) if $seed; RAND_seed($ENV{RND_SEED}) if $ENV{RND_SEED}; - RAND_egd($egd_path) if -S $egd_path; + RAND_egd($egd_path) if -e $egd_path && -S $egd_path; RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8) if -r $Net::SSLeay::random_device; } Index: perl-Net-SSLeay.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-4/perl-Net-SSLeay.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Net-SSLeay.spec 6 Apr 2005 22:13:07 -0000 1.4 +++ perl-Net-SSLeay.spec 11 May 2006 19:15:36 -0000 1.5 @@ -1,9 +1,11 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} +# +# Rebuild switch: +# --with testsuite enable test suite +# Name: perl-Net-SSLeay Version: 1.26 -Release: 2 - +Release: 3%{?dist} Summary: Perl extension for using OpenSSL Group: Development/Libraries @@ -11,10 +13,12 @@ URL: http://search.cpan.org/dist/Net_SSLeay.pm/ Source0: http://www.fas.harvard.edu/~behrooz/Net_SSLeay.pm-1.26.tar.gz Patch0: %{name}-test14.patch +Patch1: perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1, openssl-devel -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1 +BuildRequires: openssl-devel +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl-Net_SSLeay = %{version}-%{release} %description @@ -28,29 +32,32 @@ %prep %setup -q -n Net_SSLeay.pm-%{version} %patch0 -p0 +%patch1 -p1 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle -chmod 644 examples/* +chmod -c 644 examples/* +%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl iconv -f iso-8859-1 -t utf-8 SSLeay.pm > SSLeay.pm.utf8 mv SSLeay.pm.utf8 SSLeay.pm %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" +%{__perl} Makefile.PL -- INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -a \( -name .packlist -o -name ptrtstrun.pl \ - -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' -a -size 0 -exec rm -f {} ';' +rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Net/ptrtstrun.pl find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -%check || : -# make test # spawns servers, contacts external sites... +%check +# spawns servers, contacts external sites... +%{?_with_testsuite:make test} %clean @@ -59,14 +66,17 @@ %files %defattr(-,root,root,-) -%doc Changes* Credits QuickRef README examples -%{perl_vendorarch}/auto/Net -%{perl_vendorarch}/Net +%doc Changes* Credits QuickRef README examples/ +%{perl_vendorarch}/auto/Net/ +%{perl_vendorarch}/Net/ %{_mandir}/man3/Net::SSLeay*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu May 11 2006 Jose Pedro Oliveira - 1.26-3 +- CVE-2005-0106 (#191351). + +* Fri Apr 7 2005 Michael Schwendt - 1.26-2 - rebuilt * Mon Dec 20 2004 Ville Skytt?? - 0:1.26-1 From fedora-extras-commits at redhat.com Thu May 11 19:15:42 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:15:42 -0700 Subject: rpms/gpa/devel gpa-0.7.3-dt.patch, 1.1, 1.2 gpa.spec, 1.8, 1.9 gpa-keyservers.patch, 1.1, NONE gpa.desktop, 1.2, NONE Message-ID: <200605111915.k4BJFibL003793@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3771 Modified Files: gpa-0.7.3-dt.patch gpa.spec Removed Files: gpa-keyservers.patch gpa.desktop Log Message: * Thu May 11 2006 Rex Dieter 0.7.3-2 - cleanup .dt patch - update URL:, Source: tags gpa-0.7.3-dt.patch: Index: gpa-0.7.3-dt.patch =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/gpa-0.7.3-dt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpa-0.7.3-dt.patch 22 Mar 2006 16:10:20 -0000 1.1 +++ gpa-0.7.3-dt.patch 11 May 2006 19:15:41 -0000 1.2 @@ -1,8 +1,11 @@ --- gpa-0.7.3/gpa.desktop.dt 2005-10-06 10:17:35.000000000 -0500 -+++ gpa-0.7.3/gpa.desktop 2006-03-22 10:03:33.000000000 -0600 -@@ -2,7 +2,7 @@ - Name=GNU Privacy Assistant - Name[en_US.ISO8859-1]=GNU Privacy Assistant ++++ gpa-0.7.3/gpa.desktop 2006-05-11 14:07:53.000000000 -0500 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=GNU Privacy Assistant +-Name[en_US.ISO8859-1]=GNU Privacy Assistant ++Name=GPA ++Comment=GNU Privacy Assistant Exec=gpa -Icon=gpa.png +Icon=gpa Index: gpa.spec =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/gpa.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gpa.spec 22 Mar 2006 16:11:33 -0000 1.8 +++ gpa.spec 11 May 2006 19:15:42 -0000 1.9 @@ -2,12 +2,13 @@ Name: gpa Summary: Graphical user interface for GnuPG Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System -URL: http://www.gnupg.org/related_software/gpa/ +#URL: http://www.gnupg.org/related_software/gpa/ #Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz +URL: http://gpa.wald.intevation.org/ Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2 Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -15,11 +16,11 @@ Patch1: gpa-0.7.3-keyservers.patch Patch2: gpa-0.7.3-dt.patch -BuildRequires: gtk2-devel -BuildRequires: zlib-devel -BuildRequires: desktop-file-utils -BuildRequires: gpgme-devel -BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: zlib-devel +BuildRequires: desktop-file-utils +BuildRequires: gpgme-devel +BuildRequires: gettext %description GNU Privacy Assistant (GPA) is a graphical frontend for the GNU @@ -47,7 +48,7 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --vendor fedora --add-category X-Fedora \ + --vendor="fedora" --add-category="X-Fedora" \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop @@ -80,8 +81,12 @@ %changelog +* Thu May 11 2006 Rex Dieter 0.7.3-2 +- cleanup .dt patch +- update URL:, Source: tags + * Wed Mar 22 2006 Rex Dieter 0.7.3-1 -- 0.7.3 (development release) +- 0.7.3 * Mon Feb 27 2006 Rex Dieter 0.7.0-5 - follow fdo icon spec --- gpa-keyservers.patch DELETED --- --- gpa.desktop DELETED --- From fedora-extras-commits at redhat.com Thu May 11 19:21:11 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:21:11 -0700 Subject: rpms/gpa/FC-4 gpa-0.7.3-dt.patch, NONE, 1.1 gpa-0.7.3-keyservers.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gpa.spec, 1.7, 1.8 sources, 1.2, 1.3 gpa-keyservers.patch, 1.1, NONE gpa-keytable-init.patch, 1.1, NONE gpa.desktop, 1.2, NONE Message-ID: <200605111921.k4BJLDtu003996@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3969 Modified Files: .cvsignore gpa.spec sources Added Files: gpa-0.7.3-dt.patch gpa-0.7.3-keyservers.patch Removed Files: gpa-keyservers.patch gpa-keytable-init.patch gpa.desktop Log Message: * Thu May 11 2006 Rex Dieter 0.7.3-2 - cleanup .dt patch - update URL:, Source: tags gpa-0.7.3-dt.patch: --- NEW FILE gpa-0.7.3-dt.patch --- --- gpa-0.7.3/gpa.desktop.dt 2005-10-06 10:17:35.000000000 -0500 +++ gpa-0.7.3/gpa.desktop 2006-05-11 14:07:53.000000000 -0500 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=GNU Privacy Assistant -Name[en_US.ISO8859-1]=GNU Privacy Assistant +Name=GPA +Comment=GNU Privacy Assistant Exec=gpa -Icon=gpa.png +Icon=gpa Terminal=false Encoding=UTF-8 Type=Application gpa-0.7.3-keyservers.patch: --- NEW FILE gpa-0.7.3-keyservers.patch --- --- gpa-0.7.3/src/keyserver.c.pgp.mit.edu 2006-01-30 03:37:34.000000000 -0600 +++ gpa-0.7.3/src/keyserver.c 2006-03-22 09:54:31.000000000 -0600 @@ -179,6 +179,7 @@ add_server (&serverlist, "hkp://subkeys.pgp.net"); add_server (&serverlist, "ldap://keyserver.pgp.com"); + add_server (&serverlist, "hkp://pgp.mit.edu"); } return rc; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:28:52 -0000 1.2 +++ .cvsignore 11 May 2006 19:21:11 -0000 1.3 @@ -1 +1,2 @@ -gpa-0.7.0.tar.gz +gpa-0.7.3.tar.bz2 +gpa-0.7.3.tar.bz2.sig Index: gpa.spec =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-4/gpa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gpa.spec 27 Feb 2006 21:17:27 -0000 1.7 +++ gpa.spec 11 May 2006 19:21:11 -0000 1.8 @@ -1,24 +1,26 @@ -Name: gpa -Summary: Graphical user interface for GnuPG -Version: 0.7.0 -Release: 5%{?dist} - -License: GPL -Group: Applications/System -URL: http://www.gnupg.org/related_software/gpa/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-0.7.0.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source1: gpa.desktop -Patch0: gpa-keyservers.patch -Patch1: gpa-keytable-init.patch - -BuildRequires: gtk2-devel -BuildRequires: zlib-devel -BuildRequires: desktop-file-utils -BuildRequires: gpgme-devel -BuildRequires: gettext +Name: gpa +Summary: Graphical user interface for GnuPG +Version: 0.7.3 +Release: 2%{?dist} + +License: GPL +Group: Applications/System +#URL: http://www.gnupg.org/related_software/gpa/ +#Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz +URL: http://gpa.wald.intevation.org/ +Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2 +Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: gpa-0.7.3-keyservers.patch +Patch2: gpa-0.7.3-dt.patch + +BuildRequires: gtk2-devel +BuildRequires: zlib-devel +BuildRequires: desktop-file-utils +BuildRequires: gpgme-devel +BuildRequires: gettext %description GNU Privacy Assistant (GPA) is a graphical frontend for the GNU @@ -29,8 +31,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p1 +%patch1 -p1 -b .keyservers +%patch2 -p1 -b .dt %build @@ -44,12 +46,14 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE1} + --vendor="fedora" --add-category="X-Fedora" \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop -install -p -m644 -D gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +install -p -m644 -D gpa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gpa.png %find_lang %{name} @@ -77,6 +81,13 @@ %changelog +* Thu May 11 2006 Rex Dieter 0.7.3-2 +- cleanup .dt patch +- update URL:, Source: tags + +* Wed Mar 22 2006 Rex Dieter 0.7.3-1 +- 0.7.3 + * Mon Feb 27 2006 Rex Dieter 0.7.0-5 - follow fdo icon spec - drop superfluous BR: gnupg Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:28:52 -0000 1.2 +++ sources 11 May 2006 19:21:11 -0000 1.3 @@ -1 +1,2 @@ -44cb60cba64a48837588ed27f8db08b2 gpa-0.7.0.tar.gz +a3626266f9dda506445c7297c4172a65 gpa-0.7.3.tar.bz2 +68d7cafe71c21a386109878c206e4016 gpa-0.7.3.tar.bz2.sig --- gpa-keyservers.patch DELETED --- --- gpa-keytable-init.patch DELETED --- --- gpa.desktop DELETED --- From fedora-extras-commits at redhat.com Thu May 11 19:21:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:21:32 -0700 Subject: rpms/gpa/FC-5 gpa-0.7.3-dt.patch, NONE, 1.1 gpa-0.7.3-keyservers.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gpa.spec, 1.7, 1.8 sources, 1.2, 1.3 gpa-keyservers.patch, 1.1, NONE gpa-keytable-init.patch, 1.1, NONE gpa.desktop, 1.2, NONE Message-ID: <200605111921.k4BJLYpN004068@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4040 Modified Files: .cvsignore gpa.spec sources Added Files: gpa-0.7.3-dt.patch gpa-0.7.3-keyservers.patch Removed Files: gpa-keyservers.patch gpa-keytable-init.patch gpa.desktop Log Message: * Thu May 11 2006 Rex Dieter 0.7.3-2 - cleanup .dt patch - update URL:, Source: tags gpa-0.7.3-dt.patch: --- NEW FILE gpa-0.7.3-dt.patch --- --- gpa-0.7.3/gpa.desktop.dt 2005-10-06 10:17:35.000000000 -0500 +++ gpa-0.7.3/gpa.desktop 2006-05-11 14:07:53.000000000 -0500 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=GNU Privacy Assistant -Name[en_US.ISO8859-1]=GNU Privacy Assistant +Name=GPA +Comment=GNU Privacy Assistant Exec=gpa -Icon=gpa.png +Icon=gpa Terminal=false Encoding=UTF-8 Type=Application gpa-0.7.3-keyservers.patch: --- NEW FILE gpa-0.7.3-keyservers.patch --- --- gpa-0.7.3/src/keyserver.c.pgp.mit.edu 2006-01-30 03:37:34.000000000 -0600 +++ gpa-0.7.3/src/keyserver.c 2006-03-22 09:54:31.000000000 -0600 @@ -179,6 +179,7 @@ add_server (&serverlist, "hkp://subkeys.pgp.net"); add_server (&serverlist, "ldap://keyserver.pgp.com"); + add_server (&serverlist, "hkp://pgp.mit.edu"); } return rc; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:28:52 -0000 1.2 +++ .cvsignore 11 May 2006 19:21:32 -0000 1.3 @@ -1 +1,2 @@ -gpa-0.7.0.tar.gz +gpa-0.7.3.tar.bz2 +gpa-0.7.3.tar.bz2.sig Index: gpa.spec =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-5/gpa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gpa.spec 27 Feb 2006 21:01:01 -0000 1.7 +++ gpa.spec 11 May 2006 19:21:32 -0000 1.8 @@ -1,24 +1,26 @@ -Name: gpa -Summary: Graphical user interface for GnuPG -Version: 0.7.0 -Release: 5%{?dist} - -License: GPL -Group: Applications/System -URL: http://www.gnupg.org/related_software/gpa/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-0.7.0.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source1: gpa.desktop -Patch0: gpa-keyservers.patch -Patch1: gpa-keytable-init.patch - -BuildRequires: gtk2-devel -BuildRequires: zlib-devel -BuildRequires: desktop-file-utils -BuildRequires: gpgme-devel -BuildRequires: gettext +Name: gpa +Summary: Graphical user interface for GnuPG +Version: 0.7.3 +Release: 2%{?dist} + +License: GPL +Group: Applications/System +#URL: http://www.gnupg.org/related_software/gpa/ +#Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz +URL: http://gpa.wald.intevation.org/ +Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2 +Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: gpa-0.7.3-keyservers.patch +Patch2: gpa-0.7.3-dt.patch + +BuildRequires: gtk2-devel +BuildRequires: zlib-devel +BuildRequires: desktop-file-utils +BuildRequires: gpgme-devel +BuildRequires: gettext %description GNU Privacy Assistant (GPA) is a graphical frontend for the GNU @@ -29,8 +31,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p1 +%patch1 -p1 -b .keyservers +%patch2 -p1 -b .dt %build @@ -44,12 +46,14 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE1} + --vendor="fedora" --add-category="X-Fedora" \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop -install -p -m644 -D gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +install -p -m644 -D gpa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gpa.png %find_lang %{name} @@ -77,6 +81,13 @@ %changelog +* Thu May 11 2006 Rex Dieter 0.7.3-2 +- cleanup .dt patch +- update URL:, Source: tags + +* Wed Mar 22 2006 Rex Dieter 0.7.3-1 +- 0.7.3 + * Mon Feb 27 2006 Rex Dieter 0.7.0-5 - follow fdo icon spec - drop superfluous BR: gnupg Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:28:52 -0000 1.2 +++ sources 11 May 2006 19:21:32 -0000 1.3 @@ -1 +1,2 @@ -44cb60cba64a48837588ed27f8db08b2 gpa-0.7.0.tar.gz +a3626266f9dda506445c7297c4172a65 gpa-0.7.3.tar.bz2 +68d7cafe71c21a386109878c206e4016 gpa-0.7.3.tar.bz2.sig --- gpa-keyservers.patch DELETED --- --- gpa-keytable-init.patch DELETED --- --- gpa.desktop DELETED --- From fedora-extras-commits at redhat.com Thu May 11 19:34:16 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:34:16 -0700 Subject: rpms/gpgme/devel gpgme-1.1.2-config_extras.patch, NONE, 1.1 gpgme.spec, 1.15, 1.16 Message-ID: <200605111934.k4BJYIQw004191@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4170 Modified Files: gpgme.spec Added Files: gpgme-1.1.2-config_extras.patch Log Message: * Mon Mar 6 2006 Rex Dieter 1.1.2-3 - add back support for gpgme-config --thread=pthread gpgme-1.1.2-config_extras.patch: --- NEW FILE gpgme-1.1.2-config_extras.patch --- --- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras 2005-11-18 17:03:28.000000000 -0600 +++ gpgme-1.1.2/gpgme/gpgme-config.in 2006-03-06 08:50:57.000000000 -0600 @@ -16,15 +16,19 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" -gpg_error_libs="@GPG_ERROR_LIBS@" +#gpg_error_libs="@GPG_ERROR_LIBS@" # Configure thread packages. thread_modules="" @HAVE_PTH_TRUE at thread_modules="$thread_modules pth" -libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" +#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" cflags_pth="@PTH_CFLAGS@" + at HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" +#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@" +cflags_pthread="@PTHREAD_CFLAGS@" + # Configure glib. libs_glib="@GLIB_LIBS@" cflags_glib="@GLIB_CFLAGS@" Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gpgme.spec 3 Mar 2006 13:00:38 -0000 1.15 +++ gpgme.spec 11 May 2006 19:34:16 -0000 1.16 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 1%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/System @@ -11,6 +11,8 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: gpgme-1.1.2-config_extras.patch + BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 BuildRequires: libgpg-error-devel >= 0.5 @@ -41,6 +43,8 @@ %prep %setup -q +%patch1 -p1 -b .config_extras + %build %configure \ @@ -95,6 +99,12 @@ %changelog +* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +- add back support for gpgme-config --thread=pthread + +* Mon Mar 6 2006 Rex Dieter 1.1.2-2 +- drop extraneous libs from gpgme-config + * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch From fedora-extras-commits at redhat.com Thu May 11 19:35:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:35:06 -0700 Subject: rpms/gpgme/FC-5 gpgme.spec,1.15,1.16 Message-ID: <200605111935.k4BJZ82I004259@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4242 Modified Files: gpgme.spec Log Message: * Mon Mar 6 2006 Rex Dieter 1.1.2-3 - add back support for gpgme-config --thread=pthread Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-5/gpgme.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gpgme.spec 3 Mar 2006 13:00:38 -0000 1.15 +++ gpgme.spec 11 May 2006 19:35:05 -0000 1.16 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 1%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/System @@ -11,6 +11,8 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: gpgme-1.1.2-config_extras.patch + BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 BuildRequires: libgpg-error-devel >= 0.5 @@ -41,6 +43,8 @@ %prep %setup -q +%patch1 -p1 -b .config_extras + %build %configure \ @@ -95,6 +99,12 @@ %changelog +* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +- add back support for gpgme-config --thread=pthread + +* Mon Mar 6 2006 Rex Dieter 1.1.2-2 +- drop extraneous libs from gpgme-config + * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch From fedora-extras-commits at redhat.com Thu May 11 19:38:48 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:38:48 -0700 Subject: rpms/gpgme/FC-4 gpgme-1.1.2-config_extras.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gpgme.spec, 1.11, 1.12 sources, 1.4, 1.5 gpgme-1.0.2-macro.patch, 1.1, NONE gpgme-1.0.3-tests.patch, 1.1, NONE gpgme-1.1.0-tests.patch, 1.1, NONE Message-ID: <200605111938.k4BJcoss004359@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4333 Modified Files: .cvsignore gpgme.spec sources Added Files: gpgme-1.1.2-config_extras.patch Removed Files: gpgme-1.0.2-macro.patch gpgme-1.0.3-tests.patch gpgme-1.1.0-tests.patch Log Message: * Mon Mar 6 2006 Rex Dieter 1.1.2-4 - add back support for gpgme-config --thread=pthread * Mon Mar 6 2006 Rex Dieter 1.1.2-2 - drop extraneous libs from gpgme-config * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch gpgme-1.1.2-config_extras.patch: --- NEW FILE gpgme-1.1.2-config_extras.patch --- --- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras 2005-11-18 17:03:28.000000000 -0600 +++ gpgme-1.1.2/gpgme/gpgme-config.in 2006-03-06 08:50:57.000000000 -0600 @@ -16,15 +16,19 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" -gpg_error_libs="@GPG_ERROR_LIBS@" +#gpg_error_libs="@GPG_ERROR_LIBS@" # Configure thread packages. thread_modules="" @HAVE_PTH_TRUE at thread_modules="$thread_modules pth" -libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" +#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" cflags_pth="@PTH_CFLAGS@" + at HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" +#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@" +cflags_pthread="@PTHREAD_CFLAGS@" + # Configure glib. libs_glib="@GLIB_LIBS@" cflags_glib="@GLIB_CFLAGS@" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Dec 2005 13:43:53 -0000 1.4 +++ .cvsignore 11 May 2006 19:38:48 -0000 1.5 @@ -1,2 +1,2 @@ -gpgme-1.0.3.tar.bz2 -gpgme-1.0.3.tar.bz2.sig +gpgme-1.1.2.tar.bz2 +gpgme-1.1.2.tar.bz2.sig Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-4/gpgme.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gpgme.spec 6 Dec 2005 14:05:39 -0000 1.11 +++ gpgme.spec 11 May 2006 19:38:48 -0000 1.12 @@ -1,8 +1,8 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.1.2 +Release: 4%{?dist} License: LGPL Group: Applications/System @@ -11,8 +11,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gpgme-1.0.2-macro.patch -Patch1: gpgme-1.0.3-tests.patch +Patch1: gpgme-1.1.2-config_extras.patch BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 @@ -44,8 +43,7 @@ %prep %setup -q -%patch0 -p0 -b .macro -%patch1 -p1 -b .tests +%patch1 -p1 -b .config_extras %build @@ -65,7 +63,8 @@ %check || : -make check +# expect 1(+?) errors with gnupg < 1.2.4 +make check %clean @@ -100,8 +99,24 @@ %changelog -* Tue Dec 06 2005 Rex Dieter 1.0.3-2 -- tests.patch so 'make check' passes +* Mon Mar 6 2006 Rex Dieter 1.1.2-4 +- add back support for gpgme-config --thread=pthread + +* Mon Mar 6 2006 Rex Dieter 1.1.2-2 +- drop extraneous libs from gpgme-config + +* Fri Mar 3 2006 Rex Dieter 1.1.2-1 +- 1.1.2 +- drop upstreamed gpgme-1.1.0-tests.patch + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Wed Nov 30 2005 Rex Dieter - 1.1.0-3 +- (re)build against (newer) libksba/gnupg2 + +* Thu Oct 06 2005 Rex Dieter - 1.1.0-2 +- 1.1.0 * Mon Aug 8 2005 Rex Dieter - 1.0.3-1 - 1.0.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Dec 2005 13:43:53 -0000 1.4 +++ sources 11 May 2006 19:38:48 -0000 1.5 @@ -1,2 +1,2 @@ -84f85671d63164fb1d338c23010f023d gpgme-1.0.3.tar.bz2 -f91f3a341c0070aef7cec52e3cb4d770 gpgme-1.0.3.tar.bz2.sig +7c2333679035a5f37e99630a156a40ca gpgme-1.1.2.tar.bz2 +5b786d78d322ea0778eea5ae67c087b4 gpgme-1.1.2.tar.bz2.sig --- gpgme-1.0.2-macro.patch DELETED --- --- gpgme-1.0.3-tests.patch DELETED --- --- gpgme-1.1.0-tests.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 11 19:40:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:40:20 -0700 Subject: rpms/gpgme/FC-5 gpgme-1.1.2-config_extras.patch, NONE, 1.1 gpgme.spec, 1.16, 1.17 Message-ID: <200605111940.k4BJeMVR004440@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4420 Modified Files: gpgme.spec Added Files: gpgme-1.1.2-config_extras.patch Log Message: respin for missing patch gpgme-1.1.2-config_extras.patch: --- NEW FILE gpgme-1.1.2-config_extras.patch --- --- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras 2005-11-18 17:03:28.000000000 -0600 +++ gpgme-1.1.2/gpgme/gpgme-config.in 2006-03-06 08:50:57.000000000 -0600 @@ -16,15 +16,19 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" -gpg_error_libs="@GPG_ERROR_LIBS@" +#gpg_error_libs="@GPG_ERROR_LIBS@" # Configure thread packages. thread_modules="" @HAVE_PTH_TRUE at thread_modules="$thread_modules pth" -libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" +#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" cflags_pth="@PTH_CFLAGS@" + at HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" +#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@" +cflags_pthread="@PTHREAD_CFLAGS@" + # Configure glib. libs_glib="@GLIB_LIBS@" cflags_glib="@GLIB_CFLAGS@" Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-5/gpgme.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gpgme.spec 11 May 2006 19:35:05 -0000 1.16 +++ gpgme.spec 11 May 2006 19:40:20 -0000 1.17 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: Applications/System @@ -99,7 +99,7 @@ %changelog -* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +* Mon Mar 6 2006 Rex Dieter 1.1.2-4 - add back support for gpgme-config --thread=pthread * Mon Mar 6 2006 Rex Dieter 1.1.2-2 From fedora-extras-commits at redhat.com Thu May 11 20:21:20 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 11 May 2006 13:21:20 -0700 Subject: rpms/netcdf/FC-4 netcdf.spec,1.12,1.13 Message-ID: <200605112021.k4BKLqmF006927@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6880/FC-4 Modified Files: netcdf.spec Log Message: add missing BuildRequires for the g77 interface Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/FC-4/netcdf.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- netcdf.spec 22 Apr 2006 02:32:55 -0000 1.12 +++ netcdf.spec 11 May 2006 20:21:20 -0000 1.13 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +BuildRequires: compat-gcc-32-g77 %package devel Summary: Development files for netcdf-3 @@ -120,6 +121,9 @@ %changelog +* Thu May 11 2006 Ed Hill - 3.6.1-2 +- add missing BuildRequires for the g77 interface + * Fri Apr 21 2006 Ed Hill - 3.6.1-1 - update to upstream 3.6.1 From fedora-extras-commits at redhat.com Thu May 11 20:21:22 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 11 May 2006 13:21:22 -0700 Subject: rpms/netcdf/devel netcdf.spec,1.14,1.15 Message-ID: <200605112021.k4BKLs58006933@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6880/devel Modified Files: netcdf.spec Log Message: add missing BuildRequires for the g77 interface Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- netcdf.spec 22 Apr 2006 02:32:57 -0000 1.14 +++ netcdf.spec 11 May 2006 20:21:22 -0000 1.15 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +BuildRequires: compat-gcc-32-g77 %package devel Summary: Development files for netcdf-3 @@ -120,6 +121,9 @@ %changelog +* Thu May 11 2006 Ed Hill - 3.6.1-2 +- add missing BuildRequires for the g77 interface + * Fri Apr 21 2006 Ed Hill - 3.6.1-1 - update to upstream 3.6.1 From fedora-extras-commits at redhat.com Thu May 11 20:21:21 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 11 May 2006 13:21:21 -0700 Subject: rpms/netcdf/FC-5 netcdf.spec,1.14,1.15 Message-ID: <200605112021.k4BKLr4b006930@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6880/FC-5 Modified Files: netcdf.spec Log Message: add missing BuildRequires for the g77 interface Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/FC-5/netcdf.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- netcdf.spec 22 Apr 2006 02:32:56 -0000 1.14 +++ netcdf.spec 11 May 2006 20:21:21 -0000 1.15 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +BuildRequires: compat-gcc-32-g77 %package devel Summary: Development files for netcdf-3 @@ -120,6 +121,9 @@ %changelog +* Thu May 11 2006 Ed Hill - 3.6.1-2 +- add missing BuildRequires for the g77 interface + * Fri Apr 21 2006 Ed Hill - 3.6.1-1 - update to upstream 3.6.1 From fedora-extras-commits at redhat.com Thu May 11 21:19:47 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 11 May 2006 14:19:47 -0700 Subject: rpms/apt/devel apt.spec,1.27,1.28 Message-ID: <200605112119.k4BLJniJ009472@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9455 Modified Files: apt.spec Log Message: Remove bogus final s from default(s).conf (Ville) Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- apt.spec 9 May 2006 18:10:38 -0000 1.27 +++ apt.spec 11 May 2006 21:19:47 -0000 1.28 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 2%{?dist} +Release: 2.1%{?dist} Group: System Environment/Base URL: http://apt-rpm.laiskiainen.org/ License: GPL @@ -237,7 +237,7 @@ %dir %{_sysconfdir}/apt/apt.conf.d/ # NOTE: no noreplace because we WANT to be able to change the defaults # without user intervention! -%config %{_sysconfdir}/apt/apt.conf.d/defaults.conf +%config %{_sysconfdir}/apt/apt.conf.d/default.conf %dir %{_sysconfdir}/apt/sources.list.d/ %dir %{_sysconfdir}/apt/vendors.list.d/ @@ -292,6 +292,9 @@ %changelog +* Thu May 11 2006 Axel Thimm - 0.5.15lorg3-2.1 +- Remove bogus final s from default(s).conf (Ville). + * Mon May 8 2006 Axel Thimm - 0.5.15lorg3-2 - Split off configuration files from apt. From fedora-extras-commits at redhat.com Thu May 11 21:26:08 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 14:26:08 -0700 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.32,1.33 Message-ID: <200605112126.k4BLQAk2009555@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9532 Modified Files: TeXmacs.spec Log Message: rebuilt for guile 1.8 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- TeXmacs.spec 20 Mar 2006 11:32:58 -0000 1.32 +++ TeXmacs.spec 11 May 2006 21:26:08 -0000 1.33 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -153,6 +153,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 1.0.6-7 +- rebuilt for guile-1.8 + * Mon Mar 20 2006 Gerard Milmeister - 1.0.6-6 - fix problems with gcc41 (TeXmacs-gcc41.patch) From fedora-extras-commits at redhat.com Thu May 11 21:26:06 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Thu, 11 May 2006 14:26:06 -0700 Subject: rpms/torque/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torque.spec, 1.4, 1.5 Message-ID: <200605112126.k4BLQ8jI009536@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9512 Modified Files: .cvsignore sources torque.spec Log Message: * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Apr 2006 01:54:37 -0000 1.4 +++ .cvsignore 11 May 2006 21:26:06 -0000 1.5 @@ -1 +1 @@ -torque-2.1.0p0-snap.200604251602.tar.gz +torque-2.1.0p0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torque/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Apr 2006 01:54:37 -0000 1.4 +++ sources 11 May 2006 21:26:06 -0000 1.5 @@ -1 +1 @@ -e5172ea8627be8797664967cc3e66625 torque-2.1.0p0-snap.200604251602.tar.gz +4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torque.spec 26 Apr 2006 01:54:37 -0000 1.4 +++ torque.spec 11 May 2006 21:26:06 -0000 1.5 @@ -2,8 +2,8 @@ # comment out snap if building a real release %define name torque %define version 2.1.0p0 -%define snap 200604251602 -%define release 11 +#%%define snap 200604251602 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -423,6 +423,9 @@ %changelog +* Thu May 11 2006 Garrick Staples 2.1.0p0-1 +- bump to final release + * Tue Apr 25 2006 Garrick Staples 2.1.0p0-0.11.200604251602cvs - bump to fix "mem" job resources for non-serial jobs - rm.h is now installed From fedora-extras-commits at redhat.com Thu May 11 21:34:26 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 14:34:26 -0700 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.33,1.34 Message-ID: <200605112134.k4BLYSHn009717@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9700 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- TeXmacs.spec 11 May 2006 21:26:08 -0000 1.33 +++ TeXmacs.spec 11 May 2006 21:34:26 -0000 1.34 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -13,7 +13,10 @@ Patch3: TeXmacs-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript -Buildrequires: guile-devel, desktop-file-utils, tetex +Buildrequires: guile-devel +Buildrequires: gmp-devel +Buildrequires: desktop-file-utils +Buildrequires: tetex Buildrequires: freetype-devel BuildRequires: libICE-devel BuildRequires: libSM-devel @@ -153,6 +156,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 1.0.6-8 +- added buildreq for gmp-devel + * Thu May 11 2006 Gerard Milmeister - 1.0.6-7 - rebuilt for guile-1.8 From fedora-extras-commits at redhat.com Thu May 11 21:40:04 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 14:40:04 -0700 Subject: rpms/gtkterm/devel gtkterm.spec,1.8,1.9 Message-ID: <200605112140.k4BLe6f8009799@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gtkterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9782 Modified Files: gtkterm.spec Log Message: * Thu May 11 2006 Hans de Goede 0.99.5-2 - Rebuild for new vte release. Index: gtkterm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkterm.spec 31 Mar 2006 20:44:46 -0000 1.8 +++ gtkterm.spec 11 May 2006 21:40:04 -0000 1.9 @@ -1,6 +1,6 @@ Name: gtkterm Version: 0.99.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Serial port terminal Group: Applications/Communications License: GPL @@ -72,6 +72,9 @@ %changelog +* Thu May 11 2006 Hans de Goede 0.99.5-2 +- Rebuild for new vte release. + * Fri Mar 31 2006 Hans de Goede 0.99.5-1 - Taking over as new FE maintainer - Bump to new upstream 0.99.5 From fedora-extras-commits at redhat.com Thu May 11 21:58:12 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Thu, 11 May 2006 14:58:12 -0700 Subject: rpms/torque/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torque.spec, 1.4, 1.5 Message-ID: <200605112158.k4BLwE4b009961@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9940 Modified Files: .cvsignore sources torque.spec Log Message: * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Apr 2006 01:56:22 -0000 1.4 +++ .cvsignore 11 May 2006 21:58:11 -0000 1.5 @@ -1 +1 @@ -torque-2.1.0p0-snap.200604251602.tar.gz +torque-2.1.0p0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torque/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Apr 2006 01:56:22 -0000 1.4 +++ sources 11 May 2006 21:58:11 -0000 1.5 @@ -1 +1 @@ -e5172ea8627be8797664967cc3e66625 torque-2.1.0p0-snap.200604251602.tar.gz +4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torque.spec 26 Apr 2006 01:56:22 -0000 1.4 +++ torque.spec 11 May 2006 21:58:11 -0000 1.5 @@ -2,8 +2,8 @@ # comment out snap if building a real release %define name torque %define version 2.1.0p0 -%define snap 200604251602 -%define release 11 +#%%define snap 200604251602 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -423,6 +423,9 @@ %changelog +* Thu May 11 2006 Garrick Staples 2.1.0p0-1 +- bump to final release + * Tue Apr 25 2006 Garrick Staples 2.1.0p0-0.11.200604251602cvs - bump to fix "mem" job resources for non-serial jobs - rm.h is now installed From fedora-extras-commits at redhat.com Thu May 11 21:58:50 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Thu, 11 May 2006 14:58:50 -0700 Subject: rpms/torque/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torque.spec, 1.4, 1.5 Message-ID: <200605112158.k4BLwqjD010031@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10008 Modified Files: .cvsignore sources torque.spec Log Message: * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Apr 2006 01:56:49 -0000 1.4 +++ .cvsignore 11 May 2006 21:58:50 -0000 1.5 @@ -1 +1 @@ -torque-2.1.0p0-snap.200604251602.tar.gz +torque-2.1.0p0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torque/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Apr 2006 01:56:49 -0000 1.4 +++ sources 11 May 2006 21:58:50 -0000 1.5 @@ -1 +1 @@ -e5172ea8627be8797664967cc3e66625 torque-2.1.0p0-snap.200604251602.tar.gz +4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torque.spec 26 Apr 2006 01:56:49 -0000 1.4 +++ torque.spec 11 May 2006 21:58:50 -0000 1.5 @@ -2,8 +2,8 @@ # comment out snap if building a real release %define name torque %define version 2.1.0p0 -%define snap 200604251602 -%define release 11 +#%%define snap 200604251602 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -423,6 +423,9 @@ %changelog +* Thu May 11 2006 Garrick Staples 2.1.0p0-1 +- bump to final release + * Tue Apr 25 2006 Garrick Staples 2.1.0p0-0.11.200604251602cvs - bump to fix "mem" job resources for non-serial jobs - rm.h is now installed From fedora-extras-commits at redhat.com Thu May 11 21:59:12 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Thu, 11 May 2006 14:59:12 -0700 Subject: rpms/torque/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torque.spec, 1.4, 1.5 Message-ID: <200605112159.k4BLxE4s010100@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10078 Modified Files: .cvsignore sources torque.spec Log Message: * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Apr 2006 01:57:17 -0000 1.4 +++ .cvsignore 11 May 2006 21:59:12 -0000 1.5 @@ -1 +1 @@ -torque-2.1.0p0-snap.200604251602.tar.gz +torque-2.1.0p0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torque/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Apr 2006 01:57:17 -0000 1.4 +++ sources 11 May 2006 21:59:12 -0000 1.5 @@ -1 +1 @@ -e5172ea8627be8797664967cc3e66625 torque-2.1.0p0-snap.200604251602.tar.gz +4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torque.spec 26 Apr 2006 01:57:17 -0000 1.4 +++ torque.spec 11 May 2006 21:59:12 -0000 1.5 @@ -2,8 +2,8 @@ # comment out snap if building a real release %define name torque %define version 2.1.0p0 -%define snap 200604251602 -%define release 11 +#%%define snap 200604251602 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -423,6 +423,9 @@ %changelog +* Thu May 11 2006 Garrick Staples 2.1.0p0-1 +- bump to final release + * Tue Apr 25 2006 Garrick Staples 2.1.0p0-0.11.200604251602cvs - bump to fix "mem" job resources for non-serial jobs - rm.h is now installed From fedora-extras-commits at redhat.com Thu May 11 22:19:17 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 11 May 2006 15:19:17 -0700 Subject: rpms/Terminal/devel Terminal.spec,1.7,1.8 Message-ID: <200605112219.k4BMJJ9W012473@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/Terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12456 Modified Files: Terminal.spec Log Message: Rebuild against new vte version Index: Terminal.spec =================================================================== RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Terminal.spec 17 Feb 2006 03:56:47 -0000 1.7 +++ Terminal.spec 11 May 2006 22:19:17 -0000 1.8 @@ -1,7 +1,7 @@ Summary: X Terminal Emulator Name: Terminal Version: 0.2.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL URL: http://terminal.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/Terminal-0.2.4.tar.bz2 @@ -49,6 +49,9 @@ %{_libexecdir}/TerminalHelp %changelog +* Thu May 11 2006 Kevin Fenzi - 0.2.4-8 +- Rebuild against new vte version + * Thu Feb 16 2006 Kevin Fenzi - 0.2.4-7.fc5 - Add libSM-devel BuildRequires From fedora-extras-commits at redhat.com Thu May 11 22:23:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 May 2006 15:23:35 -0700 Subject: rpms/xbindkeys/devel xbindkeys.spec,1.8,1.9 Message-ID: <200605112223.k4BMNbWX012541@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/xbindkeys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12524 Modified Files: xbindkeys.spec Log Message: rebuild Index: xbindkeys.spec =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/devel/xbindkeys.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xbindkeys.spec 22 Feb 2006 08:11:25 -0000 1.8 +++ xbindkeys.spec 11 May 2006 22:23:35 -0000 1.9 @@ -1,6 +1,6 @@ Name: xbindkeys Version: 1.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Binds keys or mouse buttons to shell commands under X. License: GPL @@ -39,6 +39,9 @@ %attr(0644, root, root) %{_mandir}/man?/* %changelog +* Fri May 12 2006 Aurelien Bompard 1.7.2-5 +- rebuild + * Wed Feb 22 2006 Aurelien Bompard 1.7.2-4 - fix dependencies for modular Xorg From fedora-extras-commits at redhat.com Thu May 11 23:01:52 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:01:52 -0700 Subject: owners owners.list,1.977,1.978 Message-ID: <200605112302.k4BN2Soo014895@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14832 Modified Files: owners.list Log Message: Added cowbell, maintained by me Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.977 retrieving revision 1.978 diff -u -r1.977 -r1.978 --- owners.list 11 May 2006 18:24:53 -0000 1.977 +++ owners.list 11 May 2006 23:01:52 -0000 1.978 @@ -163,6 +163,7 @@ Fedora Extras|contacts|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|cowbell|Music Organizer|foolish at guezz.net|extras-qa at fedoraproject.org| Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|cpanspec|RPM spec file generation utility|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 23:06:50 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:06:50 -0700 Subject: rpms/cowbell - New directory Message-ID: <200605112306.k4BN6q4f015025@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14999/cowbell Log Message: Directory /cvs/extras/rpms/cowbell added to the repository From fedora-extras-commits at redhat.com Thu May 11 23:06:51 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:06:51 -0700 Subject: rpms/cowbell/devel - New directory Message-ID: <200605112306.k4BN6rVM015026@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14999/cowbell/devel Log Message: Directory /cvs/extras/rpms/cowbell/devel added to the repository From fedora-extras-commits at redhat.com Thu May 11 23:08:11 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:08:11 -0700 Subject: rpms/cowbell Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605112308.k4BN8Dsm015074@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15046 Added Files: Makefile import.log Log Message: Setup of module cowbell --- NEW FILE Makefile --- # Top level Makefile for module cowbell all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 11 23:08:12 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:08:12 -0700 Subject: rpms/cowbell/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605112308.k4BN8EPv015077@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15046/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cowbell --- NEW 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 May 11 23:09:44 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:09:44 -0700 Subject: rpms/cowbell import.log,1.1,1.2 Message-ID: <200605112309.k4BN9kFv015160@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15127 Modified Files: import.log Log Message: auto-import cowbell-0.2.7.1-2 on branch devel from cowbell-0.2.7.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cowbell/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 May 2006 23:08:11 -0000 1.1 +++ import.log 11 May 2006 23:09:44 -0000 1.2 @@ -0,0 +1 @@ +cowbell-0_2_7_1-2:HEAD:cowbell-0.2.7.1-2.src.rpm:1147388970 From fedora-extras-commits at redhat.com Thu May 11 23:09:45 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:09:45 -0700 Subject: rpms/cowbell/devel cowbell.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605112309.k4BN9lmo015165@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15127/devel Modified Files: .cvsignore sources Added Files: cowbell.spec Log Message: auto-import cowbell-0.2.7.1-2 on branch devel from cowbell-0.2.7.1-2.src.rpm --- NEW FILE cowbell.spec --- %define _libdir /usr/lib Name: cowbell Version: 0.2.7.1 Release: 2%{?dist} Summary: Music organazier Group: Applications/Multimedia License: GPL URL: http://more-cowbell.org/ Source0: http://more-cowbell.org/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2, gtk-sharp2-gapi BuildRequires: taglib-devel BuildRequires: scrollkeeper, desktop-file-utils Requires: mono-core, gtk-sharp2 Requires(post): scrollkeeper, desktop-file-utils Requires(postun): scrollkeeper, desktop-file-utils %description Cowbell is an elegant, album-based, music organizer written by Brad Taylor in C# for Gtk+. Using TagLib, it supports many audio formats including: Mp3, Ogg Vorbis and MusePack %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun scrollkeeper-update -q || : update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_bindir}/cowbell %{_libdir}/cowbell %{_datadir}/icons/hicolor/48x48/apps/cowbell.png %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/scalable/apps/cowbell.svg %changelog * Thu May 11 2006 Sindre Pedersen Bj??rdal - 0.2.7.1-2 - Add missing mono-core and gtk-sharp2 Requires - Add scriplets for gtk+ icon cache - Removed ChangeLog from %doc - Don't include static library - Remove gettext BuildRequires * Tue May 09 2006 Sindre Pedersen Bj??rdal - 0.2.7.1-1 - New release, 0.2.7.1 - Define libdir like suggested in the wiki * Mon Apr 24 2006 John Mahowald - 0.2.7-1 - 0.2.7 * Sun Apr 02 2006 Sindre Pedersen Bj??rdal - 0.2.6.1-2 - Fix x86_64 build issue by replacing %{_libdir} * Sat Apr 01 2006 Sindre Pedersen Bj??rdal - 0.2.6.1-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cowbell/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 May 2006 23:08:11 -0000 1.1 +++ .cvsignore 11 May 2006 23:09:45 -0000 1.2 @@ -0,0 +1 @@ +cowbell-0.2.7.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cowbell/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 May 2006 23:08:11 -0000 1.1 +++ sources 11 May 2006 23:09:45 -0000 1.2 @@ -0,0 +1 @@ +fcf32bcf60be2ca204519192eb26bacc cowbell-0.2.7.1.tar.gz From fedora-extras-commits at redhat.com Fri May 12 01:19:26 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 11 May 2006 18:19:26 -0700 Subject: fedora-security/audit fe4,1.20,1.21 Message-ID: <200605120119.k4C1JQQk022599@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22581 Modified Files: fe4 Log Message: Note perl-Net-SSLeay fix. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fe4 11 May 2006 02:54:20 -0000 1.20 +++ fe4 12 May 2006 01:19:23 -0000 1.21 @@ -75,4 +75,4 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) -CVE-2005-0106 VULNERABLE (perl-Net-SSLeay) bz#191351 +CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.26-3) bz#191351 From fedora-extras-commits at redhat.com Fri May 12 02:35:14 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 11 May 2006 19:35:14 -0700 Subject: rpms/perl-SOAP-Lite/FC-5 perl-SOAP-Lite.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605120235.k4C2ZGSZ025087@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25068 Modified Files: perl-SOAP-Lite.spec sources Log Message: Upstream has released a new version - also I'm the new maintainer Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-5/perl-SOAP-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SOAP-Lite.spec 26 Oct 2005 18:23:25 -0000 1.2 +++ perl-SOAP-Lite.spec 12 May 2006 02:35:14 -0000 1.3 @@ -1,73 +1,78 @@ -Name: perl-SOAP-Lite -Version: 0.60a -Release: 3%{?dist} -Summary: Provides the Simple Object Access Protocol (SOAP) - -Group: Development/Libraries -License: GPL or Artistic -URL: http://search.cpan.org/dist/SOAP-Lite/ -Source0: http://www.cpan.org/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-0.60a.tar.gz -Source1: filter-requires.sh -Patch0: SOAP-Lite-0.60a-paths.patch +Name: perl-SOAP-Lite +Version: 0.67 +Release: 2%{?dist} +Summary: Client and server side SOAP implementation +License: GPL or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/SOAP-Lite/ +Source0: http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-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)) - -%define __perl_requires %{SOURCE1} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl-XML-Parser +BuildArch: noarch + +%define bogusreqs 'perl(MQClient::MQSeries)\ +perl(MQSeries)\ +perl(MQSeries::Message)\ +perl(MQSeries::Queue)\ +perl(MQSeries::QueueManager)\ +perl(Net::Jabber)' +%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" +%define __perl_requires %{reqfilt} %description -SOAP::Lite for Perl is a collection of Perl modules which provides a simple -and lightweight interface to the Simple Object Access Protocol (SOAP) both -on client and server side. - -This version of SOAP::Lite supports a subset of the SOAP 1.1 specification -and has initial support for SOAP 1.2 specification. - +SOAP::Lite is a collection of Perl modules which provides a simple and +lightweight interface to the Simple Object Access Protocol (SOAP) both on +client and server side. %prep -%setup -q -n SOAP-Lite-0.60 # Upstream tar is inconsistent. -%patch0 -p1 - -# avoid dependencies -find examples -type f | xargs chmod 644 - +%setup -q -n SOAP-Lite-%{version} %build -# Despite the --noprompt, it prompts for a enter.... -%{__perl} Makefile.PL INSTALLDIRS=vendor --noprompt << EOL - -EOL +%{__perl} Makefile.PL --noprompt 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 -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 d -depth -exec rmdir {} 2>/dev/null ';' +#Items not yet in Extras +#find $RPM_BUILD_ROOT -type f -name JABBER* -exec rm -f {} ';' +#find $RPM_BUILD_ROOT -type f -name MQ* -exec rm -f {} ';' -%check || : -make test - +chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT +%check +make test %files %defattr(-,root,root,-) -%doc README Changes examples -%{_bindir}/* -%{perl_vendorlib}/* -%{_mandir}/man1/*.1* -%{_mandir}/man3/*.3* - +# For license text(s), see the perl package. +%doc Changes README ReleaseNotes.txt +%{_bindir}/*pl +%{perl_vendorlib}/SOAP +%{perl_vendorlib}/Apache +%{perl_vendorlib}/IO +%{perl_vendorlib}/UDDI +%{perl_vendorlib}/OldDocs +%{perl_vendorlib}/XML +%{perl_vendorlib}/XMLRPC +%{_mandir}/man3/* +%{_mandir}/man1/* %changelog +* Mon Mar 20 2006 Mike McGrath - 0.67-2 +- Removed perl requirements that do not yet exist in Extras + +* Sat Mar 18 2006 Mike McGrath - 0.67-1 +- New Owner and new spec file + * Wed Oct 26 2005 Ville Skytt?? - 0.60a-3 - Fix build, doc permissions (#169821). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Apr 2005 22:42:45 -0000 1.2 +++ sources 12 May 2006 02:35:14 -0000 1.3 @@ -1 +1 @@ -aed9f8e9c4cf180d15c6e15aedc484d7 SOAP-Lite-0.60a.tar.gz +2473030e75838e86529ca57a49f9104f SOAP-Lite-0.67.tar.gz From fedora-extras-commits at redhat.com Fri May 12 02:36:28 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 11 May 2006 19:36:28 -0700 Subject: rpms/perl-SOAP-Lite/FC-4 perl-SOAP-Lite.spec,1.2,1.3 Message-ID: <200605120236.k4C2aUna025148@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25131 Modified Files: perl-SOAP-Lite.spec Log Message: New upstream version and new maintainer. Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-4/perl-SOAP-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SOAP-Lite.spec 26 Oct 2005 18:23:20 -0000 1.2 +++ perl-SOAP-Lite.spec 12 May 2006 02:36:28 -0000 1.3 @@ -1,73 +1,78 @@ -Name: perl-SOAP-Lite -Version: 0.60a -Release: 3%{?dist} -Summary: Provides the Simple Object Access Protocol (SOAP) - -Group: Development/Libraries -License: GPL or Artistic -URL: http://search.cpan.org/dist/SOAP-Lite/ -Source0: http://www.cpan.org/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-0.60a.tar.gz -Source1: filter-requires.sh -Patch0: SOAP-Lite-0.60a-paths.patch +Name: perl-SOAP-Lite +Version: 0.67 +Release: 2%{?dist} +Summary: Client and server side SOAP implementation +License: GPL or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/SOAP-Lite/ +Source0: http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-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)) - -%define __perl_requires %{SOURCE1} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl-XML-Parser +BuildArch: noarch + +%define bogusreqs 'perl(MQClient::MQSeries)\ +perl(MQSeries)\ +perl(MQSeries::Message)\ +perl(MQSeries::Queue)\ +perl(MQSeries::QueueManager)\ +perl(Net::Jabber)' +%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" +%define __perl_requires %{reqfilt} %description -SOAP::Lite for Perl is a collection of Perl modules which provides a simple -and lightweight interface to the Simple Object Access Protocol (SOAP) both -on client and server side. - -This version of SOAP::Lite supports a subset of the SOAP 1.1 specification -and has initial support for SOAP 1.2 specification. - +SOAP::Lite is a collection of Perl modules which provides a simple and +lightweight interface to the Simple Object Access Protocol (SOAP) both on +client and server side. %prep -%setup -q -n SOAP-Lite-0.60 # Upstream tar is inconsistent. -%patch0 -p1 - -# avoid dependencies -find examples -type f | xargs chmod 644 - +%setup -q -n SOAP-Lite-%{version} %build -# Despite the --noprompt, it prompts for a enter.... -%{__perl} Makefile.PL INSTALLDIRS=vendor --noprompt << EOL - -EOL +%{__perl} Makefile.PL --noprompt 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 -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 d -depth -exec rmdir {} 2>/dev/null ';' +#Items not yet in Extras +#find $RPM_BUILD_ROOT -type f -name JABBER* -exec rm -f {} ';' +#find $RPM_BUILD_ROOT -type f -name MQ* -exec rm -f {} ';' -%check || : -make test - +chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT +%check +make test %files %defattr(-,root,root,-) -%doc README Changes examples -%{_bindir}/* -%{perl_vendorlib}/* -%{_mandir}/man1/*.1* -%{_mandir}/man3/*.3* - +# For license text(s), see the perl package. +%doc Changes README ReleaseNotes.txt +%{_bindir}/*pl +%{perl_vendorlib}/SOAP +%{perl_vendorlib}/Apache +%{perl_vendorlib}/IO +%{perl_vendorlib}/UDDI +%{perl_vendorlib}/OldDocs +%{perl_vendorlib}/XML +%{perl_vendorlib}/XMLRPC +%{_mandir}/man3/* +%{_mandir}/man1/* %changelog +* Mon Mar 20 2006 Mike McGrath - 0.67-2 +- Removed perl requirements that do not yet exist in Extras + +* Sat Mar 18 2006 Mike McGrath - 0.67-1 +- New Owner and new spec file + * Wed Oct 26 2005 Ville Skytt?? - 0.60a-3 - Fix build, doc permissions (#169821). From fedora-extras-commits at redhat.com Fri May 12 02:39:23 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 11 May 2006 19:39:23 -0700 Subject: rpms/perl-SOAP-Lite/FC-4 sources,1.2,1.3 Message-ID: <200605120239.k4C2dP6e025229@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25212 Modified Files: sources Log Message: forgot to commit sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Apr 2005 22:42:45 -0000 1.2 +++ sources 12 May 2006 02:39:23 -0000 1.3 @@ -1 +1 @@ -aed9f8e9c4cf180d15c6e15aedc484d7 SOAP-Lite-0.60a.tar.gz +2473030e75838e86529ca57a49f9104f SOAP-Lite-0.67.tar.gz From fedora-extras-commits at redhat.com Fri May 12 02:40:19 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 11 May 2006 19:40:19 -0700 Subject: rpms/perl-SOAP-Lite/FC-4 perl-SOAP-Lite.spec,1.3,1.4 Message-ID: <200605120240.k4C2eLWO025252@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25235 Modified Files: perl-SOAP-Lite.spec Log Message: Release increment Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-4/perl-SOAP-Lite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-SOAP-Lite.spec 12 May 2006 02:36:28 -0000 1.3 +++ perl-SOAP-Lite.spec 12 May 2006 02:40:19 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-SOAP-Lite Version: 0.67 -Release: 2%{?dist} +Release: 2.1%{?dist} Summary: Client and server side SOAP implementation License: GPL or Artistic Group: Development/Libraries From fedora-extras-commits at redhat.com Fri May 12 04:04:07 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 21:04:07 -0700 Subject: extras-buildsys ChangeLog,1.194,1.195 Message-ID: <200605120404.k4C447j0029965@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29934 Modified Files: ChangeLog Log Message: 2006-05-12 Dan Williams * common/Commands.py - pylint cleanups - Add the KillJob command Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- ChangeLog 11 May 2006 15:52:25 -0000 1.194 +++ ChangeLog 12 May 2006 04:04:04 -0000 1.195 @@ -1,3 +1,9 @@ +2006-05-12 Dan Williams + + * common/Commands.py + - pylint cleanups + - Add the KillJob command + 2006-05-11 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Fri May 12 04:04:07 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 21:04:07 -0700 Subject: extras-buildsys/common Commands.py,1.6,1.7 Message-ID: <200605120404.k4C447we029971@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29934/common Modified Files: Commands.py Log Message: 2006-05-12 Dan Williams * common/Commands.py - pylint cleanups - Add the KillJob command Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Commands.py 9 May 2006 19:10:56 -0000 1.6 +++ Commands.py 12 May 2006 04:04:05 -0000 1.7 @@ -34,6 +34,7 @@ CMD_NAME_JOB_STATUS_ACK = "JobStatusAck" CMD_NAME_JOB_FILES_REQ = "JobFiles" CMD_NAME_JOB_FILES_ACK = "JobFilesAck" +CMD_NAME_KILL_JOB = "KillJob" class SequenceGenerator(object): @@ -111,8 +112,8 @@ name = cmd_stream['name'] args = cmd_stream['args'] seq = cmd_stream['sequence'] - except (KeyError, TypeError), e: - print "PlgCommand deserialize error: %s" % e + except (KeyError, TypeError), exc: + print "PlgCommand deserialize error: %s" % exc return None # Create the specific command object from the command's name @@ -138,6 +139,8 @@ cmd = PlgCommandJobFilesAck._deserialize(args) elif name == CMD_NAME_UNLOCK_REPO: cmd = PlgCommandUnlockRepo._deserialize(args) + elif name == CMD_NAME_KILL_JOB: + cmd = PlgCommandKillJob._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't @@ -195,7 +198,7 @@ def _deserialize_acked_seq(args): try: acked_seq = args['acked_seq'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'acked_seq' argument found.") return acked_seq @@ -230,7 +233,7 @@ def _deserialize(args): try: reason = args['reason'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'reason' argument found.") return PlgCommandError(reason) @@ -257,11 +260,11 @@ def _deserialize(args): try: free = args['free'] - except ValueError, TypeError: + except (ValueError, TypeError): raise ValueError("No 'free' argument found.") try: maximum = args['max'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'max' argument found.") return PlgCommandSlots(free, maximum) @@ -291,7 +294,7 @@ def _deserialize(args): try: targets = args['targets'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'targets' argument found.") # Sanity checking on targets argument @@ -304,8 +307,8 @@ basearch = target['arch'] repo = target['repo'] suparch = target['supported_arches'] - except KeyError, e: - raise ValueError("Required item '%s' not found in a target." % e) + except KeyError, exc: + raise ValueError("Required item '%s' not found in a target." % exc) return PlgCommandTargets(targets) @@ -336,11 +339,11 @@ def _deserialize(args): try: target_dict = args['target_dict'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'target_dict' argument found.") try: srpm_url = args['srpm_url'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'srpm_url' argument found.") return PlgCommandNewJobReq(None, target_dict, srpm_url) @@ -376,7 +379,7 @@ try: archjob_id = args['archjob_id'] msg = args['msg'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") req_seq = PlgCommandAck._deserialize_acked_seq(args) return PlgCommandNewJobAck(archjob_id, msg, req_seq) @@ -404,7 +407,7 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except ValueError, TypeError: + except (ValueError, TypeError): raise ValueError("No 'archjob_id' argument found.") return PlgCommandUnlockRepo(archjob_id) @@ -430,7 +433,7 @@ def _deserialize(args): try: jobs = args['jobs'] - except ValueError, TypeError: + except (ValueError, TypeError): raise ValueError("No 'jobs' argument found.") # Basic sanity @@ -441,7 +444,7 @@ for job in jobs: archjob_id = job['archjob_id'] status = job['status'] - except KeyError, e: + except KeyError: raise ValueError("Required item '%s' wasn't found in jobs item.") cmd = PlgCommandBuildingJobs() @@ -480,7 +483,7 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") return PlgCommandJobStatus(archjob_id) @@ -508,11 +511,11 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") try: status = args['status'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'status' argument found.") req_seq = PlgCommandAck._deserialize_acked_seq(args) return PlgCommandJobStatusAck(archjob_id, status, req_seq) @@ -543,7 +546,7 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") return PlgCommandJobFiles(archjob_id) @@ -574,11 +577,11 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") try: files = args['files'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'files' argument found.") if type(files) != type([]): raise ValueError("The 'files' argument was of the wrong type.") @@ -599,3 +602,32 @@ def files(self): return self._files + + +class PlgCommandKillJob(PlgCommand): + def __init__(self, archjob_id, seq=0): + PlgCommand.__init__(self, CMD_NAME_KILL_JOB, seq) + self._archjob_id = archjob_id + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except (KeyError, TypeError): + raise ValueError("No 'archjob_id' argument found.") + + return PlgCommandKillJob(archjob_id) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def __str__(self): + return "%s(seq: %d, archjob_id: %s)" % (self._name, self._seq, self._archjob_id) + + From fedora-extras-commits at redhat.com Fri May 12 04:10:48 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 21:10:48 -0700 Subject: extras-buildsys ChangeLog,1.195,1.196 Message-ID: <200605120410.k4C4AmYC030041@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30010 Modified Files: ChangeLog Log Message: 2006-05-12 Dan Williams * builder/Builder.py - Handle job kill command Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- ChangeLog 12 May 2006 04:04:04 -0000 1.195 +++ ChangeLog 12 May 2006 04:10:45 -0000 1.196 @@ -1,5 +1,10 @@ 2006-05-12 Dan Williams + * builder/Builder.py + - Handle job kill command + +2006-05-12 Dan Williams + * common/Commands.py - pylint cleanups - Add the KillJob command From fedora-extras-commits at redhat.com Fri May 12 04:10:48 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 21:10:48 -0700 Subject: extras-buildsys/builder Builder.py,1.9,1.10 Message-ID: <200605120410.k4C4Am42030047@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30010/builder Modified Files: Builder.py Log Message: 2006-05-12 Dan Williams * builder/Builder.py - Handle job kill command 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 11 May 2006 15:52:26 -0000 1.9 +++ Builder.py 12 May 2006 04:10:46 -0000 1.10 @@ -242,6 +242,14 @@ pass return reply + def _handle_kill_job_command(self, cmd): + try: + uniqid = cmd.archjob_id() + job = self._all_jobs[uniqid] + job.die() + except KeyError: + pass + class PassiveBuilderRequestHandler: def __init__(self, cfg, builder): @@ -531,6 +539,8 @@ reply = self._handle_job_files_request(cmd) if reply: self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandKillJob): + self._handle_kill_job_command(cmd) def _process_server_response(self, response): """Process the server's response command stream.""" From fedora-extras-commits at redhat.com Fri May 12 08:03:35 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 12 May 2006 01:03:35 -0700 Subject: rpms/grip/devel grip.spec,1.11,1.12 Message-ID: <200605120803.k4C83bSU007109@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7092 Modified Files: grip.spec Log Message: * Fri May 12 2006 Adrian Reber - 1:3.2.0-11 - rebuilt for new vte Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- grip.spec 13 Feb 2006 21:05:19 -0000 1.11 +++ grip.spec 12 May 2006 08:03:35 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -72,6 +72,9 @@ %{_mandir}/man1/* %changelog +* Fri May 12 2006 Adrian Reber - 1:3.2.0-11 +- rebuilt for new vte + * Mon Feb 13 2006 Adrian Reber - 1:3.2.0-10 - rebuilt From fedora-extras-commits at redhat.com Fri May 12 08:26:52 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 12 May 2006 01:26:52 -0700 Subject: rpms/bzflag/FC-5 bzflag.spec,1.23,1.24 Message-ID: <200605120826.k4C8QsZG007226@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7209 Modified Files: bzflag.spec Log Message: automatically decide between modular/traditional X depending on %fedora Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- bzflag.spec 11 May 2006 17:35:27 -0000 1.23 +++ bzflag.spec 12 May 2006 08:26:51 -0000 1.24 @@ -1,5 +1,17 @@ -# Use --without modular_X to rebuild without modular X deps +# Use --with/--without modular_X to rebuild with/without modular X deps + +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 %define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif %define desktop_vendor fedora #define date 20050930 @@ -87,7 +99,10 @@ %{_mandir}/man*/* %changelog -* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +- automatically decide between modular/traditional X depending on %%fedora + +* Thu May 11 2006 Nils Philippsen - version 2.0.6 - add disttag - remove upstreamed stringdos patch From fedora-extras-commits at redhat.com Fri May 12 08:27:59 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 12 May 2006 01:27:59 -0700 Subject: rpms/bzflag/FC-4 bzflag.spec,1.20,1.21 Message-ID: <200605120828.k4C8S1tN007294@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7273 Modified Files: bzflag.spec Log Message: automatically decide between modular/traditional X depending on %fedora Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bzflag.spec 11 May 2006 17:36:24 -0000 1.20 +++ bzflag.spec 12 May 2006 08:27:59 -0000 1.21 @@ -1,5 +1,17 @@ -# Use --without modular_X to rebuild without modular X deps +# Use --with/--without modular_X to rebuild with/without modular X deps + +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 %define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif %define desktop_vendor fedora #define date 20050930 @@ -87,7 +99,10 @@ %{_mandir}/man*/* %changelog -* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +- automatically decide between modular/traditional X depending on %%fedora + +* Thu May 11 2006 Nils Philippsen - version 2.0.6 - add disttag - remove upstreamed stringdos patch From fedora-extras-commits at redhat.com Fri May 12 08:31:32 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 12 May 2006 01:31:32 -0700 Subject: rpms/bzflag/devel bzflag.spec,1.23,1.24 Message-ID: <200605120831.k4C8VYJd007376@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7359 Modified Files: bzflag.spec Log Message: automatically decide between modular/traditional X depending on %fedora Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- bzflag.spec 11 May 2006 17:33:59 -0000 1.23 +++ bzflag.spec 12 May 2006 08:31:31 -0000 1.24 @@ -1,5 +1,17 @@ -# Use --without modular_X to rebuild without modular X deps +# Use --with/--without modular_X to rebuild with/without modular X deps + +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 %define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif %define desktop_vendor fedora #define date 20050930 @@ -87,7 +99,10 @@ %{_mandir}/man*/* %changelog -* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +- automatically decide between modular/traditional X depending on %%fedora + +* Thu May 11 2006 Nils Philippsen - version 2.0.6 - add disttag - remove upstreamed stringdos patch From fedora-extras-commits at redhat.com Fri May 12 10:12:10 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Fri, 12 May 2006 03:12:10 -0700 Subject: fedora-security/audit fc4,1.242,1.243 fc5,1.155,1.156 Message-ID: <200605121012.k4CACAPq012611@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12591/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-1859 and CVE-2006-1860 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- fc4 11 May 2006 14:15:42 -0000 1.242 +++ fc4 12 May 2006 10:12:07 -0000 1.243 @@ -35,6 +35,8 @@ CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 version (kernel, fixed 2.6.16.14) [since FEDORA-2006-517] CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] +CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) +CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- fc5 11 May 2006 14:15:42 -0000 1.155 +++ fc5 12 May 2006 10:12:07 -0000 1.156 @@ -36,6 +36,8 @@ CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] +CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) +CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1790 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] From fedora-extras-commits at redhat.com Fri May 12 11:15:22 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 12 May 2006 04:15:22 -0700 Subject: rpms/ncftp/devel ncftp-3.1.9-dirlist.patch, NONE, 1.1 ncftp.spec, 1.7, 1.8 Message-ID: <200605121115.k4CBFO7F015648@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15590/devel Modified Files: ncftp.spec Added Files: ncftp-3.1.9-dirlist.patch Log Message: Fix directory listing crash (#187605). ncftp-3.1.9-dirlist.patch: --- NEW FILE ncftp-3.1.9-dirlist.patch --- diff -u -r ncftp-3.1.9/ncftp/ls.c ncftp-3.1.9.fix/ncftp/ls.c --- ncftp-3.1.9/ncftp/ls.c Sat Jan 1 15:23:38 2005 +++ ncftp-3.1.9.fix/ncftp/ls.c Wed May 10 15:39:23 2006 @@ -53,13 +53,13 @@ struct tm lt; int i; + memset(gLsMon, 0, sizeof(gLsMon)); (void) Localtime(0, <); lt.tm_mday = 15; lt.tm_hour = 12; for (i=0; i<12; i++) { lt.tm_mon = i; - (void) strftime(gLsMon[i], sizeof(gLsMon[i]), "%b", <); - gLsMon[i][sizeof(gLsMon[i]) - 1] = '\0'; + (void) strftime(gLsMon[i], sizeof(gLsMon[i]) - 1, "%b", <); } (void) strcpy(gLsMon[i], "BUG"); } /* InitLsMonths */ @@ -251,26 +251,36 @@ * old (or future) date string (i.e. "Oct 27 1996"). */ void -LsDate(char *dstr, time_t ts) +LsDate(char *dstr, size_t dsiz, time_t ts) { struct tm t; if (ts == kModTimeUnknown) { - (void) strcpy(dstr, " "); + (void) Strncpy(dstr, " ", dsiz); return; } if (Localtime(ts, &t) == NULL) { - (void) strcpy(dstr, "Jan 0 1900"); + (void) Strncpy(dstr, "Jan 0 1900", dsiz); return; } if ((ts > gNowPlus1Hr) || (ts < gNowMinus6Mon)) { - (void) sprintf(dstr, "%s %2d %4d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %4d", gLsMon[t.tm_mon], t.tm_mday, t.tm_year + 1900 ); } else { - (void) sprintf(dstr, "%s %2d %02d:%02d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %02d:%02d", gLsMon[t.tm_mon], t.tm_mday, t.tm_hour, @@ -292,7 +302,7 @@ char fTail[2]; int fType; const char *l1, *l2; - char datestr[16]; + char datestr[32]; char sizestr[32]; char plugspec[16]; char plugstr[64]; @@ -353,7 +363,7 @@ l2 = ""; } - LsDate(datestr, diritemp->mdtm); + LsDate(datestr, sizeof(datestr), diritemp->mdtm); if (diritemp->size == kSizeUnknown) { *sizestr = '\0'; diff -u -r ncftp-3.1.9/ncftp/ls.h ncftp-3.1.9.fix/ncftp/ls.h --- ncftp-3.1.9/ncftp/ls.h Tue Jan 6 15:39:45 2004 +++ ncftp-3.1.9.fix/ncftp/ls.h Wed May 10 15:38:54 2006 @@ -22,7 +22,7 @@ void InitLs(void); void FlushLsCache(void); int LsCacheLookup(const char *const); -void LsDate(char *, time_t); +void LsDate(char *, size_t, time_t); void LsL(FTPFileInfoListPtr, int, int, FILE *); void Ls1(FTPFileInfoListPtr, int, FILE *); void Ls(const char *const, int, const char *const, FILE *); Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ncftp.spec 6 Mar 2006 15:22:30 -0000 1.7 +++ ncftp.spec 12 May 2006 11:15:21 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Improved console FTP client Name: ncftp Version: 3.1.9 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet @@ -15,6 +15,7 @@ Patch6: ncftp-3.1.5-ncursesw.patch Patch7: ncftp-3.1.6-rh1.patch Patch8: ncftp-3.1.8-epsv.patch +Patch9: ncftp-3.1.9-dirlist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ncurses-devel @@ -34,6 +35,7 @@ %patch6 -p1 -b .ncursesw #patch7 -p1 -b .ask_save %patch8 -p1 -b .epsv +%patch9 -p1 -b .dirlist %build @@ -71,6 +73,10 @@ %changelog +* Fri May 12 2006 Matthias Saou 2:3.1.9-4 +- Include dirlist patch from Mike Gleason to fix bug #187605 reported by + Lauri Nurmi when using fi_FI.UTF-8 locale. + * Mon Mar 6 2006 Matthias Saou 2:3.1.9-3 - FC5 rebuild. From fedora-extras-commits at redhat.com Fri May 12 11:15:15 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 12 May 2006 04:15:15 -0700 Subject: rpms/ncftp/FC-4 ncftp-3.1.9-dirlist.patch, NONE, 1.1 ncftp.spec, 1.5, 1.6 Message-ID: <200605121115.k4CBFlPd015651@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15590/FC-4 Modified Files: ncftp.spec Added Files: ncftp-3.1.9-dirlist.patch Log Message: Fix directory listing crash (#187605). ncftp-3.1.9-dirlist.patch: --- NEW FILE ncftp-3.1.9-dirlist.patch --- diff -u -r ncftp-3.1.9/ncftp/ls.c ncftp-3.1.9.fix/ncftp/ls.c --- ncftp-3.1.9/ncftp/ls.c Sat Jan 1 15:23:38 2005 +++ ncftp-3.1.9.fix/ncftp/ls.c Wed May 10 15:39:23 2006 @@ -53,13 +53,13 @@ struct tm lt; int i; + memset(gLsMon, 0, sizeof(gLsMon)); (void) Localtime(0, <); lt.tm_mday = 15; lt.tm_hour = 12; for (i=0; i<12; i++) { lt.tm_mon = i; - (void) strftime(gLsMon[i], sizeof(gLsMon[i]), "%b", <); - gLsMon[i][sizeof(gLsMon[i]) - 1] = '\0'; + (void) strftime(gLsMon[i], sizeof(gLsMon[i]) - 1, "%b", <); } (void) strcpy(gLsMon[i], "BUG"); } /* InitLsMonths */ @@ -251,26 +251,36 @@ * old (or future) date string (i.e. "Oct 27 1996"). */ void -LsDate(char *dstr, time_t ts) +LsDate(char *dstr, size_t dsiz, time_t ts) { struct tm t; if (ts == kModTimeUnknown) { - (void) strcpy(dstr, " "); + (void) Strncpy(dstr, " ", dsiz); return; } if (Localtime(ts, &t) == NULL) { - (void) strcpy(dstr, "Jan 0 1900"); + (void) Strncpy(dstr, "Jan 0 1900", dsiz); return; } if ((ts > gNowPlus1Hr) || (ts < gNowMinus6Mon)) { - (void) sprintf(dstr, "%s %2d %4d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %4d", gLsMon[t.tm_mon], t.tm_mday, t.tm_year + 1900 ); } else { - (void) sprintf(dstr, "%s %2d %02d:%02d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %02d:%02d", gLsMon[t.tm_mon], t.tm_mday, t.tm_hour, @@ -292,7 +302,7 @@ char fTail[2]; int fType; const char *l1, *l2; - char datestr[16]; + char datestr[32]; char sizestr[32]; char plugspec[16]; char plugstr[64]; @@ -353,7 +363,7 @@ l2 = ""; } - LsDate(datestr, diritemp->mdtm); + LsDate(datestr, sizeof(datestr), diritemp->mdtm); if (diritemp->size == kSizeUnknown) { *sizestr = '\0'; diff -u -r ncftp-3.1.9/ncftp/ls.h ncftp-3.1.9.fix/ncftp/ls.h --- ncftp-3.1.9/ncftp/ls.h Tue Jan 6 15:39:45 2004 +++ ncftp-3.1.9.fix/ncftp/ls.h Wed May 10 15:38:54 2006 @@ -22,7 +22,7 @@ void InitLs(void); void FlushLsCache(void); int LsCacheLookup(const char *const); -void LsDate(char *, time_t); +void LsDate(char *, size_t, time_t); void LsL(FTPFileInfoListPtr, int, int, FILE *); void Ls1(FTPFileInfoListPtr, int, FILE *); void Ls(const char *const, int, const char *const, FILE *); Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/FC-4/ncftp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ncftp.spec 2 May 2005 18:56:41 -0000 1.5 +++ ncftp.spec 12 May 2006 11:15:15 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Improved console FTP client Name: ncftp Version: 3.1.9 -Release: 1 +Release: 4%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet @@ -15,6 +15,7 @@ Patch6: ncftp-3.1.5-ncursesw.patch Patch7: ncftp-3.1.6-rh1.patch Patch8: ncftp-3.1.8-epsv.patch +Patch9: ncftp-3.1.9-dirlist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ncurses-devel @@ -34,22 +35,23 @@ %patch6 -p1 -b .ncursesw #patch7 -p1 -b .ask_save %patch8 -p1 -b .epsv +%patch9 -p1 -b .dirlist %build %configure --enable-signals --enable-ipv6 -make STRIPFLAG="" -rm -f README.v6.ipv6 +%{__make} STRIPFLAG="" +%{__rm} -f README.v6.ipv6 %install -rm -rf %{buildroot} -mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1} +%{__rm} -rf %{buildroot} +%{__mkdir_p} %{buildroot}{%{_bindir},%{_mandir}/man1} %makeinstall BINDIR=%{buildroot}%{_bindir} %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %files @@ -71,6 +73,16 @@ %changelog +* Fri May 12 2006 Matthias Saou 2:3.1.9-4 +- Include dirlist patch from Mike Gleason to fix bug #187605 reported by + Lauri Nurmi when using fi_FI.UTF-8 locale. + +* Mon Mar 6 2006 Matthias Saou 2:3.1.9-3 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 2:3.1.9-2 +- Rebuild for new gcc/glibc. + * Thu Apr 21 2005 Matthias Saou 2:3.1.9-1 - Update to 3.1.9. - Update IPv6 KAME patch to ncftp-319-v6-20050419.diff. From fedora-extras-commits at redhat.com Fri May 12 11:15:16 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 12 May 2006 04:15:16 -0700 Subject: rpms/ncftp/FC-5 ncftp-3.1.9-dirlist.patch, NONE, 1.1 ncftp.spec, 1.7, 1.8 Message-ID: <200605121115.k4CBFmEJ015654@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15590/FC-5 Modified Files: ncftp.spec Added Files: ncftp-3.1.9-dirlist.patch Log Message: Fix directory listing crash (#187605). ncftp-3.1.9-dirlist.patch: --- NEW FILE ncftp-3.1.9-dirlist.patch --- diff -u -r ncftp-3.1.9/ncftp/ls.c ncftp-3.1.9.fix/ncftp/ls.c --- ncftp-3.1.9/ncftp/ls.c Sat Jan 1 15:23:38 2005 +++ ncftp-3.1.9.fix/ncftp/ls.c Wed May 10 15:39:23 2006 @@ -53,13 +53,13 @@ struct tm lt; int i; + memset(gLsMon, 0, sizeof(gLsMon)); (void) Localtime(0, <); lt.tm_mday = 15; lt.tm_hour = 12; for (i=0; i<12; i++) { lt.tm_mon = i; - (void) strftime(gLsMon[i], sizeof(gLsMon[i]), "%b", <); - gLsMon[i][sizeof(gLsMon[i]) - 1] = '\0'; + (void) strftime(gLsMon[i], sizeof(gLsMon[i]) - 1, "%b", <); } (void) strcpy(gLsMon[i], "BUG"); } /* InitLsMonths */ @@ -251,26 +251,36 @@ * old (or future) date string (i.e. "Oct 27 1996"). */ void -LsDate(char *dstr, time_t ts) +LsDate(char *dstr, size_t dsiz, time_t ts) { struct tm t; if (ts == kModTimeUnknown) { - (void) strcpy(dstr, " "); + (void) Strncpy(dstr, " ", dsiz); return; } if (Localtime(ts, &t) == NULL) { - (void) strcpy(dstr, "Jan 0 1900"); + (void) Strncpy(dstr, "Jan 0 1900", dsiz); return; } if ((ts > gNowPlus1Hr) || (ts < gNowMinus6Mon)) { - (void) sprintf(dstr, "%s %2d %4d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %4d", gLsMon[t.tm_mon], t.tm_mday, t.tm_year + 1900 ); } else { - (void) sprintf(dstr, "%s %2d %02d:%02d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %02d:%02d", gLsMon[t.tm_mon], t.tm_mday, t.tm_hour, @@ -292,7 +302,7 @@ char fTail[2]; int fType; const char *l1, *l2; - char datestr[16]; + char datestr[32]; char sizestr[32]; char plugspec[16]; char plugstr[64]; @@ -353,7 +363,7 @@ l2 = ""; } - LsDate(datestr, diritemp->mdtm); + LsDate(datestr, sizeof(datestr), diritemp->mdtm); if (diritemp->size == kSizeUnknown) { *sizestr = '\0'; diff -u -r ncftp-3.1.9/ncftp/ls.h ncftp-3.1.9.fix/ncftp/ls.h --- ncftp-3.1.9/ncftp/ls.h Tue Jan 6 15:39:45 2004 +++ ncftp-3.1.9.fix/ncftp/ls.h Wed May 10 15:38:54 2006 @@ -22,7 +22,7 @@ void InitLs(void); void FlushLsCache(void); int LsCacheLookup(const char *const); -void LsDate(char *, time_t); +void LsDate(char *, size_t, time_t); void LsL(FTPFileInfoListPtr, int, int, FILE *); void Ls1(FTPFileInfoListPtr, int, FILE *); void Ls(const char *const, int, const char *const, FILE *); Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/FC-5/ncftp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ncftp.spec 6 Mar 2006 15:22:30 -0000 1.7 +++ ncftp.spec 12 May 2006 11:15:16 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Improved console FTP client Name: ncftp Version: 3.1.9 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet @@ -15,6 +15,7 @@ Patch6: ncftp-3.1.5-ncursesw.patch Patch7: ncftp-3.1.6-rh1.patch Patch8: ncftp-3.1.8-epsv.patch +Patch9: ncftp-3.1.9-dirlist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ncurses-devel @@ -34,6 +35,7 @@ %patch6 -p1 -b .ncursesw #patch7 -p1 -b .ask_save %patch8 -p1 -b .epsv +%patch9 -p1 -b .dirlist %build @@ -71,6 +73,10 @@ %changelog +* Fri May 12 2006 Matthias Saou 2:3.1.9-4 +- Include dirlist patch from Mike Gleason to fix bug #187605 reported by + Lauri Nurmi when using fi_FI.UTF-8 locale. + * Mon Mar 6 2006 Matthias Saou 2:3.1.9-3 - FC5 rebuild. From fedora-extras-commits at redhat.com Fri May 12 12:54:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 05:54:15 -0700 Subject: rpms/perl-Test-SubCalls/FC-5 .cvsignore, 1.2, 1.3 perl-Test-SubCalls.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605121254.k4CCsHi3020779@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-SubCalls/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20742/FC-5 Modified Files: .cvsignore perl-Test-SubCalls.spec sources Log Message: Update to 1.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2006 15:35:17 -0000 1.2 +++ .cvsignore 12 May 2006 12:54:15 -0000 1.3 @@ -1 +1 @@ -Test-SubCalls-0.05.tar.gz +Test-SubCalls-1.06.tar.gz Index: perl-Test-SubCalls.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/FC-5/perl-Test-SubCalls.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-SubCalls.spec 25 Apr 2006 15:35:17 -0000 1.1 +++ perl-Test-SubCalls.spec 12 May 2006 12:54:15 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-SubCalls -Version: 0.05 +Version: 1.06 Release: 1%{?dist} Summary: Track the number of times subs are called @@ -55,5 +55,8 @@ %changelog +* Fri May 12 2006 Jose Pedro Oliveira - 1.06-1 +- Update to 1.06. + * Tue Apr 25 2006 Jose Pedro Oliveira - 0.05-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 15:35:17 -0000 1.2 +++ sources 12 May 2006 12:54:15 -0000 1.3 @@ -1 +1 @@ -23ae21fea8a30477aba508b4a6f785b5 Test-SubCalls-0.05.tar.gz +207801b2f5b109cfe804289f066ba896 Test-SubCalls-1.06.tar.gz From fedora-extras-commits at redhat.com Fri May 12 12:54:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 05:54:16 -0700 Subject: rpms/perl-Test-SubCalls/devel .cvsignore, 1.2, 1.3 perl-Test-SubCalls.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605121254.k4CCsImV020785@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-SubCalls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20742/devel Modified Files: .cvsignore perl-Test-SubCalls.spec sources Log Message: Update to 1.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2006 15:35:17 -0000 1.2 +++ .cvsignore 12 May 2006 12:54:16 -0000 1.3 @@ -1 +1 @@ -Test-SubCalls-0.05.tar.gz +Test-SubCalls-1.06.tar.gz Index: perl-Test-SubCalls.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/perl-Test-SubCalls.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-SubCalls.spec 25 Apr 2006 15:35:17 -0000 1.1 +++ perl-Test-SubCalls.spec 12 May 2006 12:54:16 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-SubCalls -Version: 0.05 +Version: 1.06 Release: 1%{?dist} Summary: Track the number of times subs are called @@ -55,5 +55,8 @@ %changelog +* Fri May 12 2006 Jose Pedro Oliveira - 1.06-1 +- Update to 1.06. + * Tue Apr 25 2006 Jose Pedro Oliveira - 0.05-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 15:35:17 -0000 1.2 +++ sources 12 May 2006 12:54:16 -0000 1.3 @@ -1 +1 @@ -23ae21fea8a30477aba508b4a6f785b5 Test-SubCalls-0.05.tar.gz +207801b2f5b109cfe804289f066ba896 Test-SubCalls-1.06.tar.gz From fedora-extras-commits at redhat.com Fri May 12 13:42:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 12 May 2006 06:42:21 -0700 Subject: owners owners.list,1.978,1.979 Message-ID: <200605121342.k4CDgNlq023327@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23310 Modified Files: owners.list Log Message: add gtk+ Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.978 retrieving revision 1.979 diff -u -r1.978 -r1.979 --- owners.list 11 May 2006 23:01:52 -0000 1.978 +++ owners.list 12 May 2006 13:42:21 -0000 1.979 @@ -443,6 +443,7 @@ Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org| +Fedora Extras|gtk+|The GIMP ToolKit|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 12 14:03:50 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Fri, 12 May 2006 07:03:50 -0700 Subject: rpms/par2cmdline/FC-5 par2cmdline.spec,1.3,1.4 Message-ID: <200605121403.k4CE3q7N025661@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25615/FC-5 Modified Files: par2cmdline.spec Log Message: s/%/%%/ in %changelog Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/FC-5/par2cmdline.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- par2cmdline.spec 10 May 2006 15:13:39 -0000 1.3 +++ par2cmdline.spec 12 May 2006 14:03:50 -0000 1.4 @@ -1,7 +1,7 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Laurent Rineau - 0.4-10 +- New %%changelog. Quote percent signs. + * Wed May 10 2006 Laurent Rineau - 0.4-9 - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 @@ -59,12 +62,12 @@ * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. -- Add %check section +- Add %%check section * Thu Apr 27 2006 Laurent Rineau - 0.4-6 -- chmod 644 several files, in %build +- chmod 644 several files, in %%build - fix the Source: tag. -- new %description +- new %%description - changed the buildroot to the one recommanded for Fedora Extras * Wed Apr 12 2006 Laurent Rineau - 0.4-5 @@ -76,7 +79,7 @@ * Tue Apr 11 2006 Laurent Rineau - 0.4-3 - updated for Fedora Core 4 - obsolete parchive 1.1.4 -- provides parchive = 1.1.4.0.par2.%{version} +- provides parchive = 1.1.4.0.par2.%%{version} * Tue May 11 2004 - Thibaut Cousin - updated to version 0.4 for SUSE 9.1 From fedora-extras-commits at redhat.com Fri May 12 14:03:51 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Fri, 12 May 2006 07:03:51 -0700 Subject: rpms/par2cmdline/devel par2cmdline.spec,1.3,1.4 Message-ID: <200605121403.k4CE3rHo025665@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25615/devel Modified Files: par2cmdline.spec Log Message: s/%/%%/ in %changelog Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/par2cmdline.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- par2cmdline.spec 10 May 2006 15:13:45 -0000 1.3 +++ par2cmdline.spec 12 May 2006 14:03:50 -0000 1.4 @@ -1,7 +1,7 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Laurent Rineau - 0.4-10 +- New %%changelog. Quote percent signs. + * Wed May 10 2006 Laurent Rineau - 0.4-9 - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 @@ -59,12 +62,12 @@ * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. -- Add %check section +- Add %%check section * Thu Apr 27 2006 Laurent Rineau - 0.4-6 -- chmod 644 several files, in %build +- chmod 644 several files, in %%build - fix the Source: tag. -- new %description +- new %%description - changed the buildroot to the one recommanded for Fedora Extras * Wed Apr 12 2006 Laurent Rineau - 0.4-5 @@ -76,7 +79,7 @@ * Tue Apr 11 2006 Laurent Rineau - 0.4-3 - updated for Fedora Core 4 - obsolete parchive 1.1.4 -- provides parchive = 1.1.4.0.par2.%{version} +- provides parchive = 1.1.4.0.par2.%%{version} * Tue May 11 2004 - Thibaut Cousin - updated to version 0.4 for SUSE 9.1 From fedora-extras-commits at redhat.com Fri May 12 14:03:49 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Fri, 12 May 2006 07:03:49 -0700 Subject: rpms/par2cmdline/FC-4 par2cmdline.spec,1.3,1.4 Message-ID: <200605121404.k4CE4LFA025668@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25615/FC-4 Modified Files: par2cmdline.spec Log Message: s/%/%%/ in %changelog Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/FC-4/par2cmdline.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- par2cmdline.spec 10 May 2006 15:13:39 -0000 1.3 +++ par2cmdline.spec 12 May 2006 14:03:49 -0000 1.4 @@ -1,7 +1,7 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Laurent Rineau - 0.4-10 +- New %%changelog. Quote percent signs. + * Wed May 10 2006 Laurent Rineau - 0.4-9 - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 @@ -59,12 +62,12 @@ * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. -- Add %check section +- Add %%check section * Thu Apr 27 2006 Laurent Rineau - 0.4-6 -- chmod 644 several files, in %build +- chmod 644 several files, in %%build - fix the Source: tag. -- new %description +- new %%description - changed the buildroot to the one recommanded for Fedora Extras * Wed Apr 12 2006 Laurent Rineau - 0.4-5 @@ -76,7 +79,7 @@ * Tue Apr 11 2006 Laurent Rineau - 0.4-3 - updated for Fedora Core 4 - obsolete parchive 1.1.4 -- provides parchive = 1.1.4.0.par2.%{version} +- provides parchive = 1.1.4.0.par2.%%{version} * Tue May 11 2004 - Thibaut Cousin - updated to version 0.4 for SUSE 9.1 From fedora-extras-commits at redhat.com Fri May 12 14:14:53 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 07:14:53 -0700 Subject: rpms/glpk/devel .cvsignore, 1.3, 1.4 glpk.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605121414.k4CEEthV026332@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26311 Modified Files: .cvsignore glpk.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 20:07:24 -0000 1.3 +++ .cvsignore 12 May 2006 14:14:52 -0000 1.4 @@ -1 +1 @@ -glpk-4.9.tar.gz +glpk-4.10.tar.gz Index: glpk.spec =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glpk.spec 14 Feb 2006 20:25:59 -0000 1.5 +++ glpk.spec 12 May 2006 14:14:52 -0000 1.6 @@ -1,6 +1,6 @@ Name: glpk -Version: 4.9 -Release: 2%{?dist} +Version: 4.10 +Release: 1%{?dist} Summary: GNU Linear Programming Kit Group: System Environment/Libraries @@ -86,6 +86,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Quentin Spencer 4.10-1 +- New release. + * Tue Feb 14 2006 Quentin Spencer 4.9-2 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 20:07:24 -0000 1.3 +++ sources 12 May 2006 14:14:52 -0000 1.4 @@ -1 +1 @@ -e1aecaf58adaaf155d178a95e46f8d77 glpk-4.9.tar.gz +a1ae21f2ddf2f71aa1af9385ebfd7b74 glpk-4.10.tar.gz From fedora-extras-commits at redhat.com Fri May 12 14:17:36 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 07:17:36 -0700 Subject: rpms/glpk/FC-5 .cvsignore, 1.3, 1.4 glpk.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605121417.k4CEHcLX026451@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26430 Modified Files: .cvsignore glpk.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 20:07:24 -0000 1.3 +++ .cvsignore 12 May 2006 14:17:36 -0000 1.4 @@ -1 +1 @@ -glpk-4.9.tar.gz +glpk-4.10.tar.gz Index: glpk.spec =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-5/glpk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glpk.spec 14 Feb 2006 20:25:59 -0000 1.5 +++ glpk.spec 12 May 2006 14:17:36 -0000 1.6 @@ -1,6 +1,6 @@ Name: glpk -Version: 4.9 -Release: 2%{?dist} +Version: 4.10 +Release: 1%{?dist} Summary: GNU Linear Programming Kit Group: System Environment/Libraries @@ -86,6 +86,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Quentin Spencer 4.10-1 +- New release. + * Tue Feb 14 2006 Quentin Spencer 4.9-2 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 20:07:24 -0000 1.3 +++ sources 12 May 2006 14:17:36 -0000 1.4 @@ -1 +1 @@ -e1aecaf58adaaf155d178a95e46f8d77 glpk-4.9.tar.gz +a1ae21f2ddf2f71aa1af9385ebfd7b74 glpk-4.10.tar.gz From fedora-extras-commits at redhat.com Fri May 12 14:25:49 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 07:25:49 -0700 Subject: rpms/glpk/FC-4 .cvsignore, 1.3, 1.4 glpk.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605121425.k4CEPpi7026553@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532 Modified Files: .cvsignore glpk.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 20:12:40 -0000 1.3 +++ .cvsignore 12 May 2006 14:25:49 -0000 1.4 @@ -1 +1 @@ -glpk-4.9.tar.gz +glpk-4.10.tar.gz Index: glpk.spec =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-4/glpk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glpk.spec 14 Feb 2006 20:22:44 -0000 1.5 +++ glpk.spec 12 May 2006 14:25:49 -0000 1.6 @@ -1,5 +1,5 @@ Name: glpk -Version: 4.9 +Version: 4.10 Release: 1%{?dist} Summary: GNU Linear Programming Kit @@ -86,6 +86,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Quentin Spencer 4.10-1 +- New release. + * Tue Feb 14 2006 Quentin Spencer 4.9-1 - New release. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 20:12:40 -0000 1.3 +++ sources 12 May 2006 14:25:49 -0000 1.4 @@ -1 +1 @@ -e1aecaf58adaaf155d178a95e46f8d77 glpk-4.9.tar.gz +a1ae21f2ddf2f71aa1af9385ebfd7b74 glpk-4.10.tar.gz From fedora-extras-commits at redhat.com Fri May 12 14:35:02 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 12 May 2006 07:35:02 -0700 Subject: rpms/azureus/devel azureus-MessageSlideShell-swt-3.1.patch, NONE, 1.1 azureus-nativetabs.patch, NONE, 1.1 azureus-no-update-manager-MainStatusBar.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 azureus-no-install-remove-plugins.patch, 1.1, 1.2 azureus-no-update-manager-AzureusCoreImpl.patch, 1.1, 1.2 azureus-no-update-manager-CoreUpdateChecker.patch, 1.1, 1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.1, 1.2 azureus-themed.patch, 1.2, 1.3 azureus.spec, 1.19, 1.20 sources, 1.4, 1.5 Message-ID: <200605121435.k4CEZ59k026772@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26710 Modified Files: .cvsignore azureus-no-install-remove-plugins.patch azureus-no-update-manager-AzureusCoreImpl.patch azureus-no-update-manager-CoreUpdateChecker.patch azureus-no-update-manager-UpdateMonitor.patch azureus-themed.patch azureus.spec sources Added Files: azureus-MessageSlideShell-swt-3.1.patch azureus-nativetabs.patch azureus-no-update-manager-MainStatusBar.patch Log Message: Sync with newer FC5 version. azureus-MessageSlideShell-swt-3.1.patch: --- NEW FILE azureus-MessageSlideShell-swt-3.1.patch --- --- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~ 2006-03-20 23:10:27.000000000 -0800 +++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-03-25 17:30:47.000000000 -0800 @@ -269,13 +269,7 @@ // Create shell & widgets shell = new Shell(display, SWT.ON_TOP); - if (USE_SWT32_BG_SET) { - try { - shell.setBackgroundMode(SWT.INHERIT_DEFAULT); - } catch (NoSuchMethodError e) { - // Ignore - } - } + Utils.setShellIcon(shell); shell.setText(popupParams.title); @@ -507,13 +501,6 @@ gc.dispose(); boolean bAlternateDrawing = true; - if (USE_SWT32_BG_SET) { - try { - shell.setBackgroundImage(imgBackground); - bAlternateDrawing = false; - } catch (NoSuchMethodError e) { - } - } if (bAlternateDrawing) { // Drawing of BG Image for pre SWT 3.2 azureus-nativetabs.patch: --- NEW FILE azureus-nativetabs.patch --- --- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-04-17 16:00:58.000000000 +0200 +++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-04-17 16:01:21.000000000 +0200 @@ -78,8 +78,8 @@ cLook.setLayout(layout); BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab", - true, MSG_PREFIX + "useCustomTabs"); - Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true, + false, MSG_PREFIX + "useCustomTabs"); + Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false, MSG_PREFIX + "useFancyTabs").getControl(); Control[] controls = { cFancyTab }; --- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig 2006-04-17 17:25:18.000000000 +0200 +++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-04-17 17:26:19.000000000 +0200 @@ -154,7 +154,7 @@ def.put("User Mode", new Long(0)); - def.put("useCustomTab",TRUE); + def.put("useCustomTab",FALSE); def.put("GUI Refresh",new Long(1000)); def.put("Graphics Update",new Long(4)); def.put("ReOrder Delay",new Long(0)); @@ -167,7 +167,7 @@ def.put("Use default data dir", FALSE); def.put("Default save path", "" ); - def.put("GUI_SWT_bFancyTab", TRUE); + def.put("GUI_SWT_bFancyTab", FALSE); def.put("GUI_SWT_bAlternateTablePainting", FALSE); def.put("update.start",TRUE); def.put("update.periodic",TRUE); azureus-no-update-manager-MainStatusBar.patch: --- NEW FILE azureus-no-update-manager-MainStatusBar.patch --- --- org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java.~1.1.~ 2006-03-20 23:21:17.000000000 -0800 +++ org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java 2006-03-25 18:13:47.000000000 -0800 @@ -544,8 +544,6 @@ }); statusDown.setMenu(menuDownSpeed); - addUpdateListener(); - return statusBar; } @@ -619,16 +617,6 @@ } } - private void addUpdateListener() { - azureusCore.getPluginManager().getDefaultPluginInterface() - .getUpdateManager().addListener(new UpdateManagerListener() { - public void checkInstanceCreated(UpdateCheckInstance instance) { - - new updateStatusChanger(instance); - } - }); - } - protected class updateStatusChanger { UpdateCheckInstance instance; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Feb 2006 17:00:46 -0000 1.4 +++ .cvsignore 12 May 2006 14:35:02 -0000 1.5 @@ -1,3 +1,3 @@ +azureus2-cvs-20060325.tar.gz azplugins_1.8.8.jar -azureus2-cvs-20060209.tar.gz bdcc_2.2.2.zip azureus-no-install-remove-plugins.patch: Index: azureus-no-install-remove-plugins.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-install-remove-plugins.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-install-remove-plugins.patch 9 Feb 2006 08:45:07 -0000 1.1 +++ azureus-no-install-remove-plugins.patch 12 May 2006 14:35:02 -0000 1.2 @@ -1,8 +1,8 @@ ---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.~1.58.~ 2006-01-31 14:43:47.000000000 -0500 -+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-02-09 00:05:11.000000000 -0500 +--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-03-28 04:35:35.000000000 -0800 ++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-03-28 04:41:30.000000000 -0800 @@ -347,26 +347,6 @@ - menu_plugin.setMenu(pluginMenu); - if(notMainWindow) {performOneTimeDisable(menu_plugin, true);} + menu_plugin_logViews.setMenu(pluginLogsMenu); + menu_plugin_logViews.setData("EOL", "1"); - new MenuItem(pluginMenu, SWT.SEPARATOR); - @@ -38,7 +38,7 @@ - help_checkupdate.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - mainWindow.getShell().setFocus(); -- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(); +- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true); - } - }); - } azureus-no-update-manager-AzureusCoreImpl.patch: Index: azureus-no-update-manager-AzureusCoreImpl.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-AzureusCoreImpl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-AzureusCoreImpl.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-AzureusCoreImpl.patch 12 May 2006 14:35:02 -0000 1.2 @@ -1,6 +1,6 @@ ---- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig 2006-02-09 23:23:01.000000000 -0500 -+++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java 2006-02-09 23:23:19.000000000 -0500 -@@ -391,13 +391,6 @@ +--- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig 2006-03-25 14:17:49.000000000 -0800 ++++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java 2006-03-25 15:14:01.000000000 -0800 +@@ -584,14 +584,6 @@ if (Logger.isEnabled()) Logger.log(new LogEvent(LOGID, "Stop operation completes")); @@ -11,6 +11,7 @@ - - AzureusRestarterFactory.create( this ).restart( true ); - } - }finally{ - - stopping_sem.releaseForever(); +- + try{ + ThreadGroup tg = Thread.currentThread().getThreadGroup(); + azureus-no-update-manager-CoreUpdateChecker.patch: Index: azureus-no-update-manager-CoreUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-CoreUpdateChecker.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-CoreUpdateChecker.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-CoreUpdateChecker.patch 12 May 2006 14:35:02 -0000 1.2 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-02-09 23:27:55.000000000 -0500 -+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-02-09 23:28:47.000000000 -0500 -@@ -124,8 +124,6 @@ +--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-03-25 14:18:45.000000000 -0800 ++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-03-25 17:19:32.000000000 -0800 +@@ -122,8 +122,6 @@ props.setProperty( "plugin.version", plugin_interface.getAzureusVersion()); rdf = plugin_interface.getUtilities().getResourceDownloaderFactory(); @@ -9,7 +9,7 @@ } public String -@@ -144,178 +142,9 @@ +@@ -142,155 +140,9 @@ checkForUpdate( final UpdateChecker checker ) { @@ -17,15 +17,7 @@ - String current_version = plugin_interface.getAzureusVersion(); - - log.log( "Update check starts: current = " + current_version ); -- -- boolean TESTING = false; // !!!!TODO: REMOVE THIS -- -- if ( TESTING ){ -- -- System.out.println( "CoreUpdater: !!!! Testing mode !!!!" ); -- -- } -- +- - Map decoded = VersionCheckClient.getSingleton().getVersionCheckInfo( - first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC); - @@ -61,26 +53,11 @@ - - log.log( msg ); - -- boolean latest_is_cvs = Constants.isCVSVersion( latest_version ); -- String latest_base = Constants.getBaseVersion( latest_version ); -- -- String current_base = Constants.getBaseVersion(); -- -- // currently we upgrade from, for example -- // 1) 2.0.8.4 -> 2.0.8.6 -- // 2) 2.0.8.5_CVS -> 2.0.8.6 -- // but not to a CVS version (also currently never reported as latest...) -- -- if ( latest_is_cvs && !TESTING ){ +- if ( !shouldUpdate( current_version, latest_version )){ - - return; - } -- -- if ( Constants.compareVersions( current_base, latest_base ) >= 0 && !TESTING){ - -- return; -- } -- - final String f_latest_version = latest_version; - final String f_latest_file_name = latest_file_name; - azureus-no-update-manager-UpdateMonitor.patch: Index: azureus-no-update-manager-UpdateMonitor.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-UpdateMonitor.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-UpdateMonitor.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-UpdateMonitor.patch 12 May 2006 14:35:02 -0000 1.2 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-02-09 23:25:26.000000000 -0500 -+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-02-09 23:26:30.000000000 -0500 -@@ -87,147 +87,18 @@ +--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-03-28 04:35:36.000000000 -0800 ++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-03-28 04:44:37.000000000 -0800 +@@ -88,149 +88,19 @@ { azureus_core = _azureus_core; @@ -49,12 +49,14 @@ { - boolean check_at_start = false; - boolean check_periodic = false; +- boolean bOldSWT = SWT.getVersion() < 3139; - - // no update checks for java web start - - if ( !SystemProperties.isJavaWebStartInstance()){ - -- check_at_start = COConfigurationManager.getBooleanParameter( "update.start", true ); +- // force check when SWT is really old +- check_at_start = COConfigurationManager.getBooleanParameter( "update.start", true ) || bOldSWT; - check_periodic = COConfigurationManager.getBooleanParameter( "update.periodic", true ); - } - @@ -65,7 +67,7 @@ - if ( ( check_at_start && start_of_day) || - ( check_periodic && !start_of_day )){ - -- performCheck(); // this will implicitly do usage stats +- performCheck(bOldSWT); // this will implicitly do usage stats - - }else{ - @@ -84,10 +86,11 @@ - } - }); - } ++ } public void - performCheck() + performCheck(final boolean bForce) { - if ( SystemProperties.isJavaWebStartInstance()){ - @@ -135,7 +138,7 @@ - - current_update_instance = - um.createUpdateCheckInstance( -- UpdateCheckInstance.UCI_UPDATE, +- bForce ? UpdateCheckInstance.UCI_INSTALL : UpdateCheckInstance.UCI_UPDATE, - "update.instance.update" ); - - current_update_instance.start(); azureus-themed.patch: Index: azureus-themed.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-themed.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-themed.patch 9 Feb 2006 08:45:07 -0000 1.2 +++ azureus-themed.patch 12 May 2006 14:35:02 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/ImageRepository.java~ 2006-01-25 20:28:17.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-01-25 20:28:27.000000000 -0800 -@@ -16,6 +16,8 @@ +--- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-22 17:48:33.000000000 +0200 ++++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java 2006-04-22 17:50:33.000000000 +0200 +@@ -32,6 +32,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; @@ -9,7 +9,7 @@ import java.util.*; /** -@@ -43,6 +45,25 @@ +@@ -59,6 +61,25 @@ loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash"); } @@ -22,9 +22,9 @@ + if (iconTheme == null) + iconTheme = org.gnu.gtk.IconTheme.getDefault(); + -+ return iconTheme.lookupIcon (name, 24, -+ org.gnu.gtk.IconLookupFlags.NO_SVG) -+ .getFilename(); ++ org.gnu.gtk.IconInfo icon = iconTheme.lookupIcon (name, 24, ++ org.gnu.gtk.IconLookupFlags.NO_SVG); ++ return icon != null ? icon.getFilename() : def; + } + catch (Exception ex) + { @@ -35,7 +35,7 @@ public static void loadImages(Display display) { loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32"); loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64"); -@@ -87,20 +108,44 @@ +@@ -103,20 +124,44 @@ //ToolBar Icons loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open"); @@ -92,7 +92,7 @@ //Status icons loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok"); -@@ -139,6 +184,16 @@ +@@ -157,6 +202,16 @@ Image im = getImage(name,false); if(null == im) { InputStream is = loader.getResourceAsStream(res); @@ -109,3 +109,10 @@ if(null != is) { try { if(alpha == 255) { +@@ -453,4 +508,4 @@ + + return key; + } +-} +\ Kein Zeilenumbruch am Dateiende. ++} Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- azureus.spec 14 Feb 2006 04:48:03 -0000 1.19 +++ azureus.spec 12 May 2006 14:35:02 -0000 1.20 @@ -1,49 +1,52 @@ -Name: azureus -Version: 2.4.0.0 -Release: 0.20060209cvs_1%{?dist} -Summary: A BitTorrent Client - -Group: Applications/Internet -License: GPL -URL: http://azureus.sourceforge.net +Name: azureus +Version: 2.4.0.3 +Release: 0.20060328cvs_5%{?dist} +Summary: A BitTorrent Client + +Group: Applications/Internet +License: GPL +URL: http://azureus.sourceforge.net # A cvs snapshot with the build and bouncycastle directories # removed. -Source0: azureus2-cvs-20060209.tar.gz +Source0: azureus2-cvs-20060325.tar.gz -Source1: azureus.script -Source2: Azureus.desktop -Source3: azureus.applications -Source4: azureus-License.txt -Source5: azureus-ChangeLog.txt +Source1: azureus.script +Source2: Azureus.desktop +Source3: azureus.applications +Source4: azureus-License.txt +Source5: azureus-ChangeLog.txt Source6: azplugins_1.8.8.jar Source7: bdcc_2.2.2.zip -Patch0: azureus-remove-win32-osx-platforms.patch -Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch -Patch2: azureus-cache-size.patch -Patch3: azureus-remove-manifest-classpath.patch -Patch4: azureus-ConfigSectionPlugins-swt-3.1.patch -Patch5: azureus-Messages-swt-3.1.patch -Patch6: azureus-TableView-swt-3.1.patch -Patch7: azureus-themed.patch -Patch8: azureus-rh-bugzilla-180418.patch -Patch9: azureus-no-shared-plugins.patch -Patch10: azureus-no-install-remove-plugins.patch -Patch11: azureus-no-restart.patch -Patch12: azureus-no-updates-PluginInitializer.patch -Patch13: azureus-no-updates-PluginInterfaceImpl.patch -Patch14: azureus-no-update-manager-AzureusCoreImpl.patch -Patch15: azureus-no-update-manager-CorePatchChecker.patch -Patch16: azureus-no-update-manager-CoreUpdateChecker.patch -Patch17: azureus-no-update-manager-MainWindow.patch -Patch18: azureus-no-update-manager-PluginInstallerImpl.patch -Patch19: azureus-no-update-manager-PluginUpdatePlugin.patch -Patch20: azureus-no-update-manager-SWTUpdateChecker.patch -#Patch21: azureus-no-update-manager-TableView.patch -Patch22: azureus-no-update-manager-UpdateMonitor.patch -Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch +Patch0: azureus-remove-win32-osx-platforms.patch +Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch +Patch2: azureus-cache-size.patch +Patch3: azureus-remove-manifest-classpath.patch +Patch4: azureus-ConfigSectionPlugins-swt-3.1.patch +Patch5: azureus-Messages-swt-3.1.patch +Patch6: azureus-TableView-swt-3.1.patch +Patch7: azureus-themed.patch +Patch8: azureus-rh-bugzilla-180418.patch +Patch9: azureus-no-shared-plugins.patch +Patch10: azureus-no-install-remove-plugins.patch +Patch11: azureus-no-restart.patch +Patch12: azureus-no-updates-PluginInitializer.patch +Patch13: azureus-no-updates-PluginInterfaceImpl.patch +Patch14: azureus-no-update-manager-AzureusCoreImpl.patch +Patch15: azureus-no-update-manager-CorePatchChecker.patch +Patch16: azureus-no-update-manager-CoreUpdateChecker.patch +Patch17: azureus-no-update-manager-MainWindow.patch +Patch18: azureus-no-update-manager-PluginInstallerImpl.patch +Patch19: azureus-no-update-manager-PluginUpdatePlugin.patch +Patch20: azureus-no-update-manager-SWTUpdateChecker.patch +#Patch21: azureus-no-update-manager-TableView.patch +Patch22: azureus-no-update-manager-UpdateMonitor.patch +Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch +Patch24: azureus-MessageSlideShell-swt-3.1.patch +Patch25: azureus-no-update-manager-MainStatusBar.patch +Patch26: azureus-nativetabs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,7 +77,7 @@ %patch4 -p0 %patch5 -p0 %patch6 -p0 -%patch7 -p0 +%patch7 -p1 %patch8 -p0 %patch9 -p0 %patch10 -p0 @@ -84,20 +87,23 @@ %patch14 -p0 %patch15 -p0 %patch16 -p0 -%patch17 -p0 +#%patch17 -p0 %patch18 -p0 %patch19 -p0 %patch20 -p0 #%patch21 -p0 %patch22 -p0 %patch23 -p0 +%patch24 -p0 +%patch25 -p0 +%patch26 -p1 cp %{SOURCE4} License.txt cp %{SOURCE5} ChangeLog.txt %build mkdir -p build/libs build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2 -ln -s /usr/share/java/gcj-endorsed/bcprov-131.jar build/libs +ln -s /usr/share/java/gcj-endorsed/bcprov-1.31.jar build/libs find ./ -name osx | xargs rm -r find ./ -name macosx | xargs rm -r find ./ -name [Ww]in32\* | xargs rm -r @@ -130,6 +136,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus +sed --in-place "s:/usr/lib:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins install -pm 644 plugins/azplugins/azplugins_1.8.8.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_1.8.8.jar @@ -199,6 +206,24 @@ %{_libdir}/gcj/* %changelog +* Mon Apr 24 2006 Anthony Green - 2.4.0.3-0.20060328cvs_5 +- Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and +an updated azureus-themed.patch to work around GCC PR 27271. + +* Thu Apr 06 2006 Anthony Green - 2.4.0.3-0.20060328cvs_4 +- Yet another correction to LD_LIBRARY_PATH. Bugzilla #186152. + +* Mon Apr 03 2006 Anthony Green - 2.4.0.3-0.20060328cvs_3 +- One more correction to LD_LIBRARY_PATH. Bugzilla #186152. + +* Sat Apr 01 2006 Anthony Green - 2.4.0.3-0.20060328cvs_2 +- Set LD_LIBRARY_PATH for Sun java alternative. Bugzilla #186152. +- Remove pushd/popd noise from startup script. + +* Tue Mar 28 2006 Anthony Green - 2.4.0.3-0.20060328cvs_1 +- Update sources. +- Fix bcprov jar file reference. + * Mon Feb 13 2006 Anthony Green - 2.4.0.0-0.20060207cvs_1 - Remove absolute path from azureus-no-updates-PluginInterfaceImpl.patch. Index: sources =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Feb 2006 17:00:46 -0000 1.4 +++ sources 12 May 2006 14:35:02 -0000 1.5 @@ -1,3 +1,3 @@ +a1827e2041841940c4ca16fdf240afac azureus2-cvs-20060325.tar.gz 28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar -ed4b5f0e19ad6632198731baeb48aac5 azureus2-cvs-20060209.tar.gz 0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip From fedora-extras-commits at redhat.com Fri May 12 15:41:41 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:41:41 -0700 Subject: rpms/pypoker-eval - New directory Message-ID: <200605121541.k4CFfhC3029698@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29677/pypoker-eval Log Message: Directory /cvs/extras/rpms/pypoker-eval added to the repository From fedora-extras-commits at redhat.com Fri May 12 15:41:42 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:41:42 -0700 Subject: rpms/pypoker-eval/devel - New directory Message-ID: <200605121541.k4CFfiEY029701@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29677/pypoker-eval/devel Log Message: Directory /cvs/extras/rpms/pypoker-eval/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 15:42:05 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:42:05 -0700 Subject: rpms/pypoker-eval Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605121542.k4CFg7Jw029755@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722 Added Files: Makefile import.log Log Message: Setup of module pypoker-eval --- NEW FILE Makefile --- # Top level Makefile for module pypoker-eval all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri May 12 15:42:06 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:42:06 -0700 Subject: rpms/pypoker-eval/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605121542.k4CFg877029758@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pypoker-eval --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri May 12 15:42:45 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:42:45 -0700 Subject: rpms/pypoker-eval import.log,1.1,1.2 Message-ID: <200605121543.k4CFhH50029822@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788 Modified Files: import.log Log Message: auto-import pypoker-eval-131.0-3 on branch devel from pypoker-eval-131.0-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 15:42:05 -0000 1.1 +++ import.log 12 May 2006 15:42:45 -0000 1.2 @@ -0,0 +1 @@ +pypoker-eval-131_0-3:HEAD:pypoker-eval-131.0-3.src.rpm:1147448556 From fedora-extras-commits at redhat.com Fri May 12 15:42:46 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:42:46 -0700 Subject: rpms/pypoker-eval/devel pypoker-eval.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605121543.k4CFhIWo029826@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788/devel Modified Files: .cvsignore sources Added Files: pypoker-eval.spec Log Message: auto-import pypoker-eval-131.0-3 on branch devel from pypoker-eval-131.0-3.src.rpm --- NEW FILE pypoker-eval.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pypoker-eval Version: 131.0 Release: 3%{?dist} Summary: Python interface to poker-eval Group: Development/Libraries License: GPL URL: http://pokersource.org/pypoker-eval Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRequires: python-devel BuildRequires: poker-eval-devel >= 124.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package is python adaptor for the poker-eval toolkit for writing programs which simulate or analyze poker games. %package devel Summary: Files needed for developing programs which use pypoker-eval Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains files required to build applications that use pypoker-eval. %prep %setup -q # make examples directory for devel %doc mkdir -p tmp/examples && cp test.py tmp/examples %build %configure --disable-static make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %check %{__python} test.py %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{python_sitearch}/*.so.* %{python_sitearch}/*.py %{python_sitearch}/*.pyc %ghost %{python_sitearch}/*.pyo %files devel %defattr(-,root,root,-) %doc tmp/examples %{python_sitearch}/*.so %{_libdir}/pkgconfig/%{name}.pc %exclude %{python_sitearch}/*.la %changelog * Fri May 12 2006 Christopher Stone 131.0-3 - Place unversioned .so link in -devel package * Sun Apr 23 2006 Christopher Stone 131.0-2 - Updated URL and Source0 links - Added %%check section - Include test.py in devel %%doc - Updated Summary and %%description - Removed unneeded BuildRequires and Requires * Wed Mar 29 2006 Loic Dachary - 131.0-1 - upstream sync * Sun Mar 26 2006 Christopher Stone 130.0-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 15:42:06 -0000 1.1 +++ .cvsignore 12 May 2006 15:42:46 -0000 1.2 @@ -0,0 +1 @@ +pypoker-eval-131.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 15:42:06 -0000 1.1 +++ sources 12 May 2006 15:42:46 -0000 1.2 @@ -0,0 +1 @@ +2ec8a95a5d0880e99ad4695ec113b799 pypoker-eval-131.0.tar.gz From fedora-extras-commits at redhat.com Fri May 12 15:46:37 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:46:37 -0700 Subject: owners owners.list,1.979,1.980 Message-ID: <200605121546.k4CFkdVx029896@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29879 Modified Files: owners.list Log Message: Add pypoker-eval Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.979 retrieving revision 1.980 diff -u -r1.979 -r1.980 --- owners.list 12 May 2006 13:42:21 -0000 1.979 +++ owners.list 12 May 2006 15:46:37 -0000 1.980 @@ -1298,6 +1298,7 @@ Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|pypoker-eval|Python interface to poker-eval|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 12 15:50:57 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 12 May 2006 08:50:57 -0700 Subject: fedora-security/audit fc5,1.156,1.157 Message-ID: <200605121550.k4CFov7N029945@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29924 Modified Files: fc5 Log Message: Note the firefox update. Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- fc5 12 May 2006 10:12:07 -0000 1.156 +++ fc5 12 May 2006 15:50:54 -0000 1.157 @@ -18,7 +18,7 @@ CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] -CVE-2006-1993 VULNERABLE (firefox) #190124 +CVE-2006-1993 version (firefox, fixed 1.5.0.3) #190124 [since FEDORA-2006-547] CVE-2006-1991 VULNERABLE (php) #190034 CVE-2006-1990 VULNERABLE (php) #190034 CVE-2006-1942 ** firefox From fedora-extras-commits at redhat.com Fri May 12 16:56:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:56:30 -0700 Subject: rpms/perl-Devel-Cover - New directory Message-ID: <200605121656.k4CGuWXA032546@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32520/perl-Devel-Cover Log Message: Directory /cvs/extras/rpms/perl-Devel-Cover added to the repository From fedora-extras-commits at redhat.com Fri May 12 16:56:31 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:56:31 -0700 Subject: rpms/perl-Devel-Cover/devel - New directory Message-ID: <200605121656.k4CGuX0Y032549@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32520/perl-Devel-Cover/devel Log Message: Directory /cvs/extras/rpms/perl-Devel-Cover/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 16:56:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:56:47 -0700 Subject: rpms/perl-Devel-Cover Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605121656.k4CGunfE032598@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32565 Added Files: Makefile import.log Log Message: Setup of module perl-Devel-Cover --- NEW FILE Makefile --- # Top level Makefile for module perl-Devel-Cover all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 12 16:56:48 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:56:48 -0700 Subject: rpms/perl-Devel-Cover/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605121656.k4CGuo6p032601@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32565/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Devel-Cover --- NEW 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 May 12 16:57:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:57:17 -0700 Subject: rpms/perl-Devel-Cover import.log,1.1,1.2 Message-ID: <200605121657.k4CGvnHL032663@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32629 Modified Files: import.log Log Message: auto-import perl-Devel-Cover-0.55-2 on branch devel from perl-Devel-Cover-0.55-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cover/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 16:56:47 -0000 1.1 +++ import.log 12 May 2006 16:57:17 -0000 1.2 @@ -0,0 +1 @@ +perl-Devel-Cover-0_55-2:HEAD:perl-Devel-Cover-0.55-2.src.rpm:1147453029 From fedora-extras-commits at redhat.com Fri May 12 16:57:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:57:18 -0700 Subject: rpms/perl-Devel-Cover/devel perl-Devel-Cover.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605121657.k4CGvoBl032667@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32629/devel Modified Files: .cvsignore sources Added Files: perl-Devel-Cover.spec Log Message: auto-import perl-Devel-Cover-0.55-2 on branch devel from perl-Devel-Cover-0.55-2.src.rpm --- NEW FILE perl-Devel-Cover.spec --- Name: perl-Devel-Cover Version: 0.55 Release: 2%{?dist} Summary: Code coverage metrics for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Devel-Cover/ Source0: http://www.cpan.org/authors/id/P/PJ/PJCJ/Devel-Cover-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Template) BuildRequires: perl(Pod::Coverage) BuildRequires: perl(Test::Differences) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Pod::Coverage) Requires: perl(Test::Differences) %description This module provides code coverage metrics for Perl. %prep %setup -q -n Devel-Cover-%{version} chmod -c a-x buildperl %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc BUGS CHANGES README TODO all_versions buildperl cpancover create_gold session.vim %{_bindir}/* %{perl_vendorarch}/Devel/ %{perl_vendorarch}/auto/Devel/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3pm* %changelog * Fri May 12 2006 Jose Pedro Oliveira - 0.55-2 - Removed dependencies pulled in by a documentation file (#191110). * Thu May 04 2006 Jose Pedro Oliveira - 0.55-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cover/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 16:56:48 -0000 1.1 +++ .cvsignore 12 May 2006 16:57:18 -0000 1.2 @@ -0,0 +1 @@ +Devel-Cover-0.55.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cover/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 16:56:48 -0000 1.1 +++ sources 12 May 2006 16:57:18 -0000 1.2 @@ -0,0 +1 @@ +6bb9ddcd7a9e4d87c02b8bbea7ad3c4a Devel-Cover-0.55.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:01:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 10:01:17 -0700 Subject: owners owners.list,1.980,1.981 Message-ID: <200605121701.k4CH1oGm002494@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2451 Modified Files: owners.list Log Message: New package: perl-Devel-Cover (#191110) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.980 retrieving revision 1.981 diff -u -r1.980 -r1.981 --- owners.list 12 May 2006 15:46:37 -0000 1.980 +++ owners.list 12 May 2006 17:01:17 -0000 1.981 @@ -982,6 +982,7 @@ Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DBM-Deep|A pure perl multi-level hash/array DBM|andreas at bawue.net|extras-qa at fedoraproject.org| +Fedora Extras|perl-Devel-Cover|Code coverage metrics for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 12 17:08:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 10:08:10 -0700 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.9, 1.10 perl-Module-Build.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200605121708.k4CH8CZu002604@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-serv2583 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.28. Epoch bump to make 0.28 > 0.2612. Various spec cleanups to closer match cpanspec output. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Mar 2006 02:14:33 -0000 1.9 +++ .cvsignore 12 May 2006 17:08:10 -0000 1.10 @@ -1 +1 @@ -Module-Build-0.2612.tar.gz +Module-Build-0.28.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Module-Build.spec 16 Mar 2006 01:54:11 -0000 1.15 +++ perl-Module-Build.spec 12 May 2006 17:08:10 -0000 1.16 @@ -1,26 +1,35 @@ Name: perl-Module-Build -Version: 0.2612 -Release: 2%{?dist} +Version: 0.28 +Release: 1%{?dist} +Epoch: 1 Summary: Perl module for building and installing Perl modules -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Tar) >= 1.08 -BuildRequires: perl(ExtUtils::CBuilder) >= 0.02 -BuildRequires: perl(ExtUtils::ParseXS) >= 2.02 -BuildRequires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.15 +BuildRequires: perl(ExtUtils::ParseXS) >= 1.02 +BuildRequires: perl(YAML) +BuildRequires: perl(Pod::Readme) >= 0.04 Requires: perl(Archive::Tar) >= 1.08 -Requires: perl(ExtUtils::CBuilder) >= 0.02 -Requires: perl(ExtUtils::ParseXS) >= 2.02 -Requires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +Requires: perl(ExtUtils::CBuilder) >= 0.15 +Requires: perl(ExtUtils::ParseXS) >= 1.02 +Requires: perl(Pod::Readme) >= 0.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -Perl module for building and installing Perl modules, a replacement to -ExtUtils::MakeMaker. +Module::Build is a system for building, testing, and installing Perl +modules. It is meant to be an alternative to ExtUtils::MakeMaker. +Developers may alter the behavior of the module through subclassing in a +much more straightforward way than with MakeMaker. It also does not require +a make on your system - most of the Module::Build code is pure-perl and +written in a very cross-platform way. In fact, you don't even need a shell, +so even platforms like MacOS (traditional) can use it fairly easily. Its +only prerequisites are modules that are included with perl 5.6.0, and it +works fine on perl 5.005 if you can install a few additional modules. %prep %setup -q -n Module-Build-%{version} @@ -33,14 +42,10 @@ rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 - find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check ./Build test @@ -49,13 +54,18 @@ %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{_bindir}/config_data %{perl_vendorlib}/Module %{_mandir}/man1/config_data.1* %{_mandir}/man3/Module::Build*.3* %changelog +* Fri May 12 2006 Steven Pritchard - 1:0.28-1 +- Update to 0.28. +- Epoch bump to make 0.28 > 0.2612. +- Various spec cleanups to closer match cpanspec output. + * Wed Mar 15 2006 Steven Pritchard - 0.2612-2 - Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and ExtUtils::ParseXS. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Mar 2006 02:14:33 -0000 1.9 +++ sources 12 May 2006 17:08:10 -0000 1.10 @@ -1 +1 @@ -fa1504741e9c931f75e804953c1d5417 Module-Build-0.2612.tar.gz +8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:09:07 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:09:07 -0700 Subject: rpms/perl-Authen-DigestMD5/devel - New directory Message-ID: <200605121709.k4CH9912002663@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2634/perl-Authen-DigestMD5/devel Log Message: Directory /cvs/extras/rpms/perl-Authen-DigestMD5/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 17:09:06 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:09:06 -0700 Subject: rpms/perl-Authen-DigestMD5 - New directory Message-ID: <200605121709.k4CH98wD002660@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2634/perl-Authen-DigestMD5 Log Message: Directory /cvs/extras/rpms/perl-Authen-DigestMD5 added to the repository From fedora-extras-commits at redhat.com Fri May 12 17:09:28 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:09:28 -0700 Subject: rpms/perl-Authen-DigestMD5 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605121709.k4CH9UBB002712@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2679 Added Files: Makefile import.log Log Message: Setup of module perl-Authen-DigestMD5 --- NEW FILE Makefile --- # Top level Makefile for module perl-Authen-DigestMD5 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 12 17:09:29 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:09:29 -0700 Subject: rpms/perl-Authen-DigestMD5/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605121709.k4CH9V3K002715@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2679/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Authen-DigestMD5 --- NEW 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 May 12 17:10:35 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:10:35 -0700 Subject: rpms/perl-Authen-DigestMD5 import.log,1.1,1.2 Message-ID: <200605121710.k4CHAbT8003184@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3151 Modified Files: import.log Log Message: auto-import perl-Authen-DigestMD5-0.04-1 on branch devel from perl-Authen-DigestMD5-0.04-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Authen-DigestMD5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 17:09:28 -0000 1.1 +++ import.log 12 May 2006 17:10:35 -0000 1.2 @@ -0,0 +1 @@ +perl-Authen-DigestMD5-0_04-1:HEAD:perl-Authen-DigestMD5-0.04-1.src.rpm:1147453801 From fedora-extras-commits at redhat.com Fri May 12 17:10:35 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:10:35 -0700 Subject: rpms/perl-Authen-DigestMD5/devel perl-Authen-DigestMD5.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605121710.k4CHAbdS003190@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3151/devel Modified Files: .cvsignore sources Added Files: perl-Authen-DigestMD5.spec Log Message: auto-import perl-Authen-DigestMD5-0.04-1 on branch devel from perl-Authen-DigestMD5-0.04-1.src.rpm --- NEW FILE perl-Authen-DigestMD5.spec --- Summary: SASL DIGEST-MD5 authentication (RFC2831) Name: perl-Authen-DigestMD5 Version: 0.04 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Authen-DigestMD5/ Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Authen-DigestMD5-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch %description This module supports DIGEST-MD5 SASL authentication as defined in RFC-2831. %prep %setup -q -n Authen-DigestMD5-%{version} # Fix wrong script interpreter, and set permissions to avoid extra deps %{__sed} -i -e 's,/usr/local/bin/perl,%{__perl},' digest-md5-auth.pl %{__chmod} 644 digest-md5-auth.pl # Fix character encoding %{__mv} DigestMD5.pm DigestMD5.pm.not-utf8 /usr/bin/iconv -f iso8859-1 -t utf8 -o DigestMD5.pm DigestMD5.pm.not-utf8 %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %{__rm} -rf %{buildroot} %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';' /usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* # Get rid of sample code that introduces additional dep on perl(OpenLDAP) %{__rm} -f %{buildroot}%{perl_vendorlib}/Authen/digest-md5-auth.pl %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,0755) %doc Changes README digest-md5-auth.pl %{perl_vendorlib}/Authen/ %{_mandir}/man3/Authen::DigestMD5.3pm* %changelog * Fri May 12 2006 Paul Howarth 0.04-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Authen-DigestMD5/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 17:09:28 -0000 1.1 +++ .cvsignore 12 May 2006 17:10:35 -0000 1.2 @@ -0,0 +1 @@ +Authen-DigestMD5-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Authen-DigestMD5/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 17:09:28 -0000 1.1 +++ sources 12 May 2006 17:10:35 -0000 1.2 @@ -0,0 +1 @@ +f96d3ccc55c4bf551baf59fd8cb51421 Authen-DigestMD5-0.04.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:15:33 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:15:33 -0700 Subject: owners owners.list,1.981,1.982 Message-ID: <200605121715.k4CHFZEd003311@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3294 Modified Files: owners.list Log Message: perl-Authen-DigestMD5 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.981 retrieving revision 1.982 diff -u -r1.981 -r1.982 --- owners.list 12 May 2006 17:01:17 -0000 1.981 +++ owners.list 12 May 2006 17:15:33 -0000 1.982 @@ -901,6 +901,7 @@ Fedora Extras|perl-Archive-Extract|A generic archive extracting mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Authen-DigestMD5|SASL DIGEST-MD5 authentication (RFC2831)|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-Radius|Perl Authen::Radius modules|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 12 17:32:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:32:40 -0700 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.26,1.27 Message-ID: <200605121732.k4CHWgB3003724@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3692/FC-4 Modified Files: TeXmacs.spec Log Message: new version 1.0.6.1 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- TeXmacs.spec 31 Dec 2005 18:49:34 -0000 1.26 +++ TeXmacs.spec 12 May 2006 17:32:40 -0000 1.27 @@ -1,13 +1,12 @@ Name: TeXmacs -Version: 1.0.6 +Version: 1.0.6.1 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz -Patch0: TeXmacs-maxima.patch +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-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 @@ -37,13 +36,11 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch0 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in %build %configure -perl -pi -e "s|^CXXOPTIMIZE =.*|CXXOPTIMIZE = $RPM_OPT_FLAGS|" src/common.makefile make %{?_smp_mflags} @@ -139,6 +136,9 @@ %changelog +* Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 +- new version 1.0.6.1 + * Sat Dec 31 2005 Gerard Milmeister - 1.0.6-1 - New Version 1.0.6 From fedora-extras-commits at redhat.com Fri May 12 17:32:41 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:32:41 -0700 Subject: rpms/TeXmacs/FC-5 TeXmacs-1.0.6.1-gcc41.patch, NONE, 1.1 TeXmacs.spec, 1.32, 1.33 Message-ID: <200605121732.k4CHWh1O003730@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3692/FC-5 Modified Files: TeXmacs.spec Added Files: TeXmacs-1.0.6.1-gcc41.patch Log Message: new version 1.0.6.1 TeXmacs-1.0.6.1-gcc41.patch: --- NEW FILE TeXmacs-1.0.6.1-gcc41.patch --- --- TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp.gcc41 2006-05-12 17:43:03.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp 2006-05-12 17:43:27.000000000 +0200 @@ -326,7 +326,7 @@ struct textat_box_rep: public move_box_rep { textat_box_rep (path ip, box b, SI x, SI y): move_box_rep (ip, b, x, y, false, false) {} - gr_selections textat_box_rep::graphical_select (SI x, SI y, SI dist); + gr_selections graphical_select (SI x, SI y, SI dist); operator tree () { return tree (TUPLE, "textat", (tree) bs[0]); } }; Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- TeXmacs.spec 20 Mar 2006 11:31:06 -0000 1.32 +++ TeXmacs.spec 12 May 2006 17:32:41 -0000 1.33 @@ -1,19 +1,23 @@ Name: TeXmacs -Version: 1.0.6 -Release: 6%{?dist} +Version: 1.0.6.1 +Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz -Patch0: TeXmacs-maxima.patch +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch +Patch4: TeXmacs-1.0.6.1-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tetex, tetex-fonts, ghostscript -Buildrequires: guile-devel, desktop-file-utils, tetex +Requires: tetex +Requires: tetex-fonts +Requires: ghostscript +Buildrequires: guile-devel +Buildrequires: desktop-file-utils +Buildrequires: tetex Buildrequires: freetype-devel BuildRequires: libICE-devel BuildRequires: libSM-devel @@ -49,10 +53,10 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -153,6 +157,9 @@ %changelog +* Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 +- new version 1.0.6.1 + * Mon Mar 20 2006 Gerard Milmeister - 1.0.6-6 - fix problems with gcc41 (TeXmacs-gcc41.patch) From fedora-extras-commits at redhat.com Fri May 12 17:36:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:36:59 -0700 Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.17, 1.18 TeXmacs.spec, 1.27, 1.28 sources, 1.19, 1.20 Message-ID: <200605121737.k4CHb1Ug003988@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3951/FC-4 Modified Files: .cvsignore TeXmacs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 31 Dec 2005 18:49:34 -0000 1.17 +++ .cvsignore 12 May 2006 17:36:59 -0000 1.18 @@ -1 +1 @@ -TeXmacs-1.0.6-src.tar.gz +TeXmacs-1.0.6.1-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- TeXmacs.spec 12 May 2006 17:32:40 -0000 1.27 +++ TeXmacs.spec 12 May 2006 17:36:59 -0000 1.28 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 31 Dec 2005 18:49:34 -0000 1.19 +++ sources 12 May 2006 17:36:59 -0000 1.20 @@ -1 +1 @@ -7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz +7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:36:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:36:59 -0700 Subject: rpms/TeXmacs/FC-5 .cvsignore, 1.18, 1.19 TeXmacs.spec, 1.33, 1.34 sources, 1.19, 1.20 Message-ID: <200605121737.k4CHb1Q0003994@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3951/FC-5 Modified Files: .cvsignore TeXmacs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 31 Dec 2005 18:52:17 -0000 1.18 +++ .cvsignore 12 May 2006 17:36:59 -0000 1.19 @@ -1 +1 @@ -TeXmacs-1.0.6-src.tar.gz +TeXmacs-1.0.6.1-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- TeXmacs.spec 12 May 2006 17:32:41 -0000 1.33 +++ TeXmacs.spec 12 May 2006 17:36:59 -0000 1.34 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 31 Dec 2005 18:52:17 -0000 1.19 +++ sources 12 May 2006 17:36:59 -0000 1.20 @@ -1 +1 @@ -7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz +7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:39:05 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:39:05 -0700 Subject: rpms/TeXmacs/devel TeXmacs-1.0.6.1-gcc41.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 TeXmacs.spec, 1.34, 1.35 sources, 1.19, 1.20 Message-ID: <200605121739.k4CHd8AH004111@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4087 Modified Files: .cvsignore TeXmacs.spec sources Added Files: TeXmacs-1.0.6.1-gcc41.patch Log Message: TeXmacs-1.0.6.1-gcc41.patch: --- NEW FILE TeXmacs-1.0.6.1-gcc41.patch --- --- TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp.gcc41 2006-05-12 17:43:03.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp 2006-05-12 17:43:27.000000000 +0200 @@ -326,7 +326,7 @@ struct textat_box_rep: public move_box_rep { textat_box_rep (path ip, box b, SI x, SI y): move_box_rep (ip, b, x, y, false, false) {} - gr_selections textat_box_rep::graphical_select (SI x, SI y, SI dist); + gr_selections graphical_select (SI x, SI y, SI dist); operator tree () { return tree (TUPLE, "textat", (tree) bs[0]); } }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 31 Dec 2005 18:52:17 -0000 1.18 +++ .cvsignore 12 May 2006 17:39:05 -0000 1.19 @@ -1 +1 @@ -TeXmacs-1.0.6-src.tar.gz +TeXmacs-1.0.6.1-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- TeXmacs.spec 11 May 2006 21:34:26 -0000 1.34 +++ TeXmacs.spec 12 May 2006 17:39:05 -0000 1.35 @@ -1,18 +1,20 @@ Name: TeXmacs -Version: 1.0.6 -Release: 8%{?dist} +Version: 1.0.6.1 +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.6-src.tar.gz -Patch0: TeXmacs-maxima.patch +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch +Patch4: TeXmacs-1.0.6.1-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tetex, tetex-fonts, ghostscript +Requires: tetex +Requires: tetex-fonts +Requires: ghostscript Buildrequires: guile-devel Buildrequires: gmp-devel Buildrequires: desktop-file-utils @@ -56,6 +58,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -156,6 +159,9 @@ %changelog +* Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 +- new version 1.0.6.1 + * Thu May 11 2006 Gerard Milmeister - 1.0.6-8 - added buildreq for gmp-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 31 Dec 2005 18:52:17 -0000 1.19 +++ sources 12 May 2006 17:39:05 -0000 1.20 @@ -1 +1 @@ -7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz +7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:42:38 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:42:38 -0700 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.35,1.36 Message-ID: <200605121742.k4CHge6M004202@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4184 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- TeXmacs.spec 12 May 2006 17:39:05 -0000 1.35 +++ TeXmacs.spec 12 May 2006 17:42:37 -0000 1.36 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -54,7 +54,6 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 From fedora-extras-commits at redhat.com Fri May 12 17:49:30 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 10:49:30 -0700 Subject: rpms/octave/FC-4 octave-2.9.5-config.patch, NONE, 1.1 octave-2.9.5-lex.patch, NONE, 1.1 octave-2.9.5-sparse.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave.spec, 1.28, 1.29 sources, 1.6, 1.7 octave-2.1.72-freqz.patch, 1.1, NONE Message-ID: <200605121749.k4CHnWJE004344@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4312 Modified Files: .cvsignore octave.spec sources Added Files: octave-2.9.5-config.patch octave-2.9.5-lex.patch octave-2.9.5-sparse.patch Removed Files: octave-2.1.72-freqz.patch Log Message: Upgrade to 2.9.x series (bug 190646) octave-2.9.5-config.patch: --- NEW FILE octave-2.9.5-config.patch --- --- configure.orig 2006-04-18 08:22:38.000000000 -0500 +++ configure 2006-04-18 08:30:46.000000000 -0500 @@ -3291,7 +3291,7 @@ echo "$as_me:$LINENO: result: defining localfcnfiledir to be $localfcnfiledir" >&5 echo "${ECHO_T}defining localfcnfiledir to be $localfcnfiledir" >&6 -: ${localapifcnfiledir='$(datadir)/octave/site/$(apiversion)/m'} +: ${localapifcnfiledir='$(datadir)/octave/site/$(api_version)/m'} echo "$as_me:$LINENO: result: defining localapifcnfiledir to be $localapifcnfiledir" >&5 echo "${ECHO_T}defining localapifcnfiledir to be $localapifcnfiledir" >&6 @@ -3327,7 +3327,7 @@ echo "$as_me:$LINENO: result: defining localoctfiledir to be $localoctfiledir" >&5 echo "${ECHO_T}defining localoctfiledir to be $localoctfiledir" >&6 -: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(apiversion)/$(canonical_host_type)'} +: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)'} echo "$as_me:$LINENO: result: defining localapioctfiledir to be $localapioctfiledir" >&5 echo "${ECHO_T}defining localapioctfiledir to be $localapioctfiledir" >&6 octave-2.9.5-lex.patch: --- NEW FILE octave-2.9.5-lex.patch --- src/ChangeLog: 2006-05-02 John W. Eaton * lex.l ({CCHAR}): Exit rawcommand mode if returning '\n' token. Index: src/lex.l =================================================================== RCS file: /cvs/octave/src/lex.l,v retrieving revision 1.232 diff -u -r1.232 lex.l --- src/lex.l 24 Apr 2006 19:13:08 -0000 1.232 +++ src/lex.l 2 May 2006 23:31:14 -0000 @@ -696,7 +696,10 @@ BEGIN (INITIAL); if (nesting_level.none ()) - COUNT_TOK_AND_RETURN ('\n'); + { + lexer_flags.doing_rawcommand = false; + COUNT_TOK_AND_RETURN ('\n'); + } else if (nesting_level.is_bracket_or_brace ()) COUNT_TOK_AND_RETURN (';'); } octave-2.9.5-sparse.patch: --- NEW FILE octave-2.9.5-sparse.patch --- Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseCmplxQR.h 23 Mar 2006 18:22:51 -0000 1.3 @@ -137,6 +137,23 @@ #endif }; + +// Publish externally used friend functions. + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, + const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); #endif /* Index: liboctave/SparseQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseQR.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseQR.h 23 Mar 2006 18:22:51 -0000 1.3 @@ -133,6 +133,22 @@ #endif }; + +// Publish externally used friend functions. + +extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); + #endif /* Index: liboctave/CMatrix.cc =================================================================== RCS file: /cvs/octave/liboctave/CMatrix.cc,v retrieving revision 1.114 diff -u -r1.114 CMatrix.cc --- liboctave/CMatrix.cc 2 Mar 2006 03:40:00 -0000 1.114 +++ liboctave/CMatrix.cc 24 Mar 2006 18:53:58 -0000 @@ -889,27 +889,6 @@ return retval; } -ComplexRowVector -ComplexMatrix::row (char *s) const -{ - if (! s) - { - (*current_liboctave_error_handler) ("invalid row selection"); - return ComplexRowVector (); - } - - char c = *s; - if (c == 'f' || c == 'F') - return row (static_cast(0)); - else if (c == 'l' || c == 'L') - return row (rows () - 1); - else - { - (*current_liboctave_error_handler) ("invalid row selection"); - return ComplexRowVector (); - } -} - ComplexColumnVector ComplexMatrix::column (octave_idx_type i) const { @@ -927,27 +906,6 @@ return retval; } -ComplexColumnVector -ComplexMatrix::column (char *s) const -{ - if (! s) - { - (*current_liboctave_error_handler) ("invalid column selection"); - return ComplexColumnVector (); - } - - char c = *s; - if (c == 'f' || c == 'F') - return column (static_cast(0)); - else if (c == 'l' || c == 'L') - return column (cols () - 1); - else - { - (*current_liboctave_error_handler) ("invalid column selection"); - return ComplexColumnVector (); - } -} - ComplexMatrix ComplexMatrix::inverse (void) const { Index: liboctave/CMatrix.h =================================================================== RCS file: /cvs/octave/liboctave/CMatrix.h,v retrieving revision 1.55 diff -u -r1.55 CMatrix.h --- liboctave/CMatrix.h 26 Oct 2005 15:24:08 -0000 1.55 +++ liboctave/CMatrix.h 24 Mar 2006 18:53:58 -0000 @@ -130,10 +130,8 @@ // extract row or column i. ComplexRowVector row (octave_idx_type i) const; - ComplexRowVector row (char *s) const; ComplexColumnVector column (octave_idx_type i) const; - ComplexColumnVector column (char *s) const; ComplexMatrix inverse (void) const; ComplexMatrix inverse (octave_idx_type& info) const; Index: liboctave/dMatrix.cc =================================================================== RCS file: /cvs/octave/liboctave/dMatrix.cc,v retrieving revision 1.120 diff -u -r1.120 dMatrix.cc --- liboctave/dMatrix.cc 2 Mar 2006 03:40:01 -0000 1.120 +++ liboctave/dMatrix.cc 24 Mar 2006 18:53:59 -0000 @@ -559,27 +559,6 @@ return retval; } -RowVector -Matrix::row (char *s) const -{ - if (! s) - { - (*current_liboctave_error_handler) ("invalid row selection"); - return RowVector (); - } - - char c = *s; - if (c == 'f' || c == 'F') - return row ( static_cast(0) ); - else if (c == 'l' || c == 'L') - return row (rows () - 1); - else - { - (*current_liboctave_error_handler) ("invalid row selection"); - return RowVector (); - } -} - ColumnVector Matrix::column (octave_idx_type i) const { @@ -597,27 +576,6 @@ return retval; } -ColumnVector -Matrix::column (char *s) const -{ - if (! s) - { - (*current_liboctave_error_handler) ("invalid column selection"); - return ColumnVector (); - } - - char c = *s; - if (c == 'f' || c == 'F') - return column (static_cast (0)); - else if (c == 'l' || c == 'L') - return column (cols () - 1); - else - { - (*current_liboctave_error_handler) ("invalid column selection"); - return ColumnVector (); - } -} - Matrix Matrix::inverse (void) const { Index: liboctave/dMatrix.h =================================================================== RCS file: /cvs/octave/liboctave/dMatrix.h,v retrieving revision 1.61 diff -u -r1.61 dMatrix.h --- liboctave/dMatrix.h 26 Oct 2005 15:24:08 -0000 1.61 +++ liboctave/dMatrix.h 24 Mar 2006 18:53:59 -0000 @@ -102,10 +102,8 @@ // extract row or column i. RowVector row (octave_idx_type i) const; - RowVector row (char *s) const; ColumnVector column (octave_idx_type i) const; - ColumnVector column (char *s) const; Matrix inverse (void) const; Matrix inverse (octave_idx_type& info) const; Index: liboctave/dSparse.cc =================================================================== RCS file: /cvs/octave/liboctave/dSparse.cc,v retrieving revision 1.21 diff -u -r1.21 dSparse.cc --- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 +++ liboctave/dSparse.cc 24 Mar 2006 18:54:00 -0000 @@ -4404,7 +4404,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4540,7 +4540,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4678,7 +4678,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4851,7 +4851,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5031,7 +5031,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5208,7 +5208,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5379,7 +5379,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5586,7 +5586,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), Index: src/ov-cell.cc =================================================================== RCS file: /cvs/octave/src/ov-cell.cc,v retrieving revision 1.58 diff -u -r1.58 ov-cell.cc --- src/ov-cell.cc 24 Mar 2006 16:42:44 -0000 1.58 +++ src/ov-cell.cc 24 Mar 2006 19:14:32 -0000 @@ -783,10 +783,12 @@ for (octave_idx_type i = 0; i < dv.numel (); i++) { - char s[20]; - sprintf (s, "_%d", i); + OSSTREAM buf; + buf << "_" << i << OSSTREAM_ENDS; + std::string s = OSSTREAM_STR (buf); + OSSTREAM_FREEZE (buf); - if (! add_hdf5_data(data_hid, tmp.elem (i), s, "", false, + if (! add_hdf5_data(data_hid, tmp.elem (i), s.c_str (), "", false, save_as_floats)) { H5Gclose (data_hid); Index: src/ov-list.cc =================================================================== RCS file: /cvs/octave/src/ov-list.cc,v retrieving revision 1.44 diff -u -r1.44 ov-list.cc --- src/ov-list.cc 26 Apr 2005 19:24:33 -0000 1.44 +++ src/ov-list.cc 24 Mar 2006 19:14:32 -0000 @@ -536,9 +536,13 @@ for (int i = 0; i < lst.length (); ++i) { // should we use lst.name_tags () to label the elements? - char s[20]; - sprintf (s, "_%d", i); - bool b = save_ascii_data (os, lst (i), s, infnan_warned, + + OSSTREAM buf; + buf << "_" << i << OSSTREAM_ENDS; + std::string s = OSSTREAM_STR (buf); + OSSTREAM_FREEZE (buf); + + bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned, strip_nan_and_inf, 0, 0); if (! b) @@ -607,11 +611,15 @@ for (int i = 0; i < lst.length (); i++) { // should we use lst.name_tags () to label the elements? - char s[20]; - sprintf (s, "_%d", i); + + OSSTREAM buf; + buf << "_" << i << OSSTREAM_ENDS; + std::string s = OSSTREAM_STR (buf); + OSSTREAM_FREEZE (buf); // Recurse to print sub-value. - bool b = save_binary_data (os, lst(i), s, "", 0, save_as_floats); + bool b = save_binary_data (os, lst(i), s.c_str (), "", 0, + save_as_floats); if (! b) return false; @@ -683,9 +691,13 @@ for (octave_idx_type i = 0; i < lst.length (); ++i) { // should we use lst.name_tags () to label the elements? - char s[20]; - sprintf (s, "_%d", i); - bool retval2 = add_hdf5_data (data_hid, lst (i), s, "", + + OSSTREAM buf; + buf << "_" << i << OSSTREAM_ENDS; + std::string s = OSSTREAM_STR (buf); + OSSTREAM_FREEZE (buf); + + bool retval2 = add_hdf5_data (data_hid, lst (i), s.c_str (), "", false, save_as_floats); if (! retval2) break; Index: src/DLD-FUNCTIONS/spchol.cc =================================================================== RCS file: /cvs/octave/src/DLD-FUNCTIONS/spchol.cc,v retrieving revision 1.7 diff -u -r1.7 spchol.cc --- src/DLD-FUNCTIONS/spchol.cc 22 Mar 2006 22:58:12 -0000 1.7 +++ src/DLD-FUNCTIONS/spchol.cc 24 Mar 2006 19:55:38 -0000 @@ -607,7 +607,7 @@ for (octave_idx_type k = 0 ; k < n ; k++) { // get the kth row of L and store in the columns of L - cholmod_row_subtree (A1, A2, k, Parent, R, cm) ; + CHOLMOD_NAME (row_subtree) (A1, A2, k, Parent, R, cm) ; for (octave_idx_type p = 0 ; p < Rp [1] ; p++) L.xridx (W [Ri [p]]++) = k ; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Mar 2006 14:45:31 -0000 1.6 +++ .cvsignore 12 May 2006 17:49:30 -0000 1.7 @@ -1 +1 @@ -octave-2.1.73.tar.bz2 +octave-2.9.5.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- octave.spec 23 Mar 2006 14:45:31 -0000 1.28 +++ octave.spec 12 May 2006 17:49:30 -0000 1.29 @@ -1,5 +1,5 @@ Name: octave -Version: 2.1.73 +Version: 2.9.5 Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -7,19 +7,22 @@ Group: Applications/Engineering License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 -Patch0: octave-2.1.72-freqz.patch +Patch0: octave-2.9.5-sparse.patch +Patch1: octave-2.9.5-config.patch +Patch2: octave-2.9.5-lex.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info Requires(postun): /sbin/ldconfig Requires(post): /sbin/ldconfig Requires(preun): /sbin/install-info -BuildRequires: gnuplot bison flex less tetex gcc-gfortran -BuildRequires: lapack-devel blas-devel +BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildRequires: ncurses-devel zlib-devel libtermcap-devel hdf5-devel -BuildRequires: readline-devel glibc-devel fftw-devel gperf +BuildRequires: readline-devel glibc-devel fftw-devel autoconf gperf +BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description GNU Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for @@ -50,39 +53,54 @@ %prep %setup -q %patch0 -p0 +%patch1 -p0 +%patch2 -p0 %build -%configure --enable-shared --disable-static -make %{?_smp_mflags} - +%ifarch x86_64 +%define enable64 yes +%else +%define enable64 no +%endif +export CPPFLAGS=-I%{_includedir}/glpk +%configure --enable-shared --disable-static --enable-64=%enable64 +make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}" -#empty -rm -f interpreter/octave.{ky,pg,tp} %install rm -rf $RPM_BUILD_ROOT -%makeinstall -rm -f doc/interpreter/munge-texi doc/interpreter/*.o -strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct +make install DESTDIR=$RPM_BUILD_ROOT +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R +# Remove RPM_BUILD_ROOT from ls-R files +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R + +# Clean doc directory +pushd doc + make distclean + rm -f *.in */*.in */*.cc refcard/*.tex +popd + +# Create desktop file +rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop +desktop-file-install --vendor fedora --add-category X-Fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop -# XXX Nuke unpackaged files -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/install-info --info-dir=%{_infodir}/ --section="Programming:" --entry="* Octave:(octave). Interactive language for numerical computations." %{_infodir}/octave.info.gz +/sbin/install-info --info-dir=%{_infodir} --section="Programming:" \ + --entry="* Octave:(%{name}). %{summary}." %{_infodir}/octave.info.gz %preun if [ "$1" = "0" ]; then @@ -95,8 +113,8 @@ %files %defattr(-,root,root) %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP -%doc SENDING-PATCHES THANKS -%doc doc/faq doc/liboctave doc/refcard emacs examples +%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p* +%doc doc/faq doc/interpreter/HTML doc/refcard %{_bindir}/octave %{_bindir}/octave-%{version} %config(noreplace) /etc/ld.so.conf.d/* @@ -105,9 +123,11 @@ %{_libexecdir}/octave %{_mandir}/man*/octave* %{_infodir}/octave.info* +%{_datadir}/applications/* %files devel %defattr(-,root,root) +%doc doc/liboctave %{_bindir}/mkoctfile* %{_bindir}/octave-bug* %{_bindir}/octave-config* @@ -116,6 +136,9 @@ %changelog +* Fri May 12 2006 Quentin Spencer 2.9.5-1 +- Upgrade to 2.9.x releases (in response to bug #190646). + * Thu Mar 23 2006 Quentin Spencer 2.1.73-1 - New upstream release. - Make sure /usr/libexec/octave is owned by octave. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Mar 2006 14:45:31 -0000 1.6 +++ sources 12 May 2006 17:49:30 -0000 1.7 @@ -1 +1 @@ -c356475aa06d81a10f8bf27f1a1d27a0 octave-2.1.73.tar.bz2 +09eff7b2319383778db7bb5e50619bf9 octave-2.9.5.tar.bz2 --- octave-2.1.72-freqz.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 12 18:35:06 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 11:35:06 -0700 Subject: rpms/octave-forge/FC-4 octave-forge-2006.03.17-octcdf.patch, NONE, 1.1 octave-forge-2006.03.17-zplane.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave-forge.spec, 1.23, 1.24 sources, 1.6, 1.7 Message-ID: <200605121835.k4CIZ8sQ006901@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6874 Modified Files: .cvsignore octave-forge.spec sources Added Files: octave-forge-2006.03.17-octcdf.patch octave-forge-2006.03.17-zplane.patch Log Message: Updates for compilation with octave 2.9.5. octave-forge-2006.03.17-octcdf.patch: --- NEW FILE octave-forge-2006.03.17-octcdf.patch --- Index: main/octcdf/Makefile =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- main/octcdf/Makefile 19 Apr 2006 19:09:51 -0000 1.6 +++ main/octcdf/Makefile 28 Apr 2006 17:51:17 -0000 @@ -34,7 +34,7 @@ RM = rm -f endif -NCTARGET = ov-netcdf.oct +NCTARGET = netcdf.oct NCSOURCES = ov-netcdf.cc ov-ncfile.cc ov-ncvar.cc ov-ncatt.cc ov-ncdim.cc OBJECTS = $(patsubst %.cc,%.o,$(NCSOURCES)) Index: main/octcdf/configure.add =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/configure.add,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main/octcdf/configure.add 15 Dec 2005 22:13:52 -0000 1.2 +++ main/octcdf/configure.add 25 Apr 2006 16:35:01 -0000 1.3 @@ -11,34 +11,29 @@ OCTCDF_LIBS="$LDFLAGS" OCTCDF_CFLAGS="$CPPFLAGS" - dnl checking for opendap support + dnl first checking for opendap support - AC_MSG_CHECKING([for nc-dap]) + AC_MSG_CHECKING([for nc-dap]) - if ncdap-config --version > /dev/null 2>&1; then + if ncdap-config --version > /dev/null 2>&1; then + AC_MSG_RESULT([yes]) OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`" OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`" - HAVE_NCDAP=yes - AC_MSG_RESULT([yes]) - else - HAVE_NCDAP=no - AC_MSG_RESULT([no]) - fi - - dnl Checking if the NetCDF library exists. + HAVE_NETCDF=yes + else + AC_MSG_RESULT([no]) - AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,) + dnl if no opendap, checking if the NetCDF library exists. - if test $HAVE_NETCDF = yes ; then - OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf" - fi + AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,) - dnl if we don't have nc-dap then we have to check for netcdf.h - dnl otherwise it is already given by ncdap-config --cflags + if test $HAVE_NETCDF = yes ; then + OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf" - if test $HAVE_NCDAP = no ; then - AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no) + dnl we have the libraries, no we have also the headers? + AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no) + fi fi if test $HAVE_NETCDF = yes ; then octave-forge-2006.03.17-zplane.patch: --- NEW FILE octave-forge-2006.03.17-zplane.patch --- Index: main/signal/zplane.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/signal/zplane.m,v retrieving revision 1.4 diff -u -r1.4 zplane.m --- main/signal/zplane.m 7 Jan 2006 05:23:27 -0000 1.4 +++ main/signal/zplane.m 3 May 2006 15:37:01 -0000 @@ -83,9 +83,12 @@ catch eleo = 0; end; ##= 2.1.69 ImageMagick -BuildRequires: octave-devel tetex gcc-gfortran ginac-devel -BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel pcre-devel -BuildRequires: ncurses-devel libtermcap-devel gsl-devel qhull-devel +Requires: octave >= 2.9.5 ImageMagick +BuildRequires: octave-devel tetex gcc-gfortran ginac-devel qhull-devel +BuildRequires: ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel +BuildRequires: libjpeg-devel libpng-devel ncurses-devel libtermcap-devel +BuildRequires: autoconf %description Octave-forge is a community project for collaborative development of @@ -32,9 +36,15 @@ %prep %setup -q - +%patch0 -p1 +# The following patch requires regenerating the configure script +%patch1 -p0 +%patch2 -p0 +# The sparse matrix functions are in octave 2.9.x so don't install them +touch main/sparse/NOINSTALL %build +./autogen.sh %configure make %{?_smp_mflags} @@ -65,6 +75,9 @@ %changelog +* Fri May 12 2006 Quentin Spencer 2001.03.17-3 +- Rebuild with various changes for octave-2.9.5 + * Mon Mar 27 2006 Quentin Spencer 2001.03.17-2 - Rebuild (apparently needed for new octave release, fixes bug #186964). Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Mar 2006 16:25:24 -0000 1.6 +++ sources 12 May 2006 18:35:05 -0000 1.7 @@ -1 +1,2 @@ a1e76ab52fb9894586d6a7a0dc15e603 octave-forge-2006.03.17.patched.tar.gz +c50919d0790c7873a82c2da09d419142 octave-forge-system.patch.gz From fedora-extras-commits at redhat.com Fri May 12 18:53:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 12 May 2006 11:53:24 -0700 Subject: rpms/geomview/devel .cvsignore, 1.3, 1.4 geomview.desktop, 1.2, 1.3 geomview.spec, 1.8, 1.9 sources, 1.3, 1.4 geomview.png, 1.1, NONE Message-ID: <200605121853.k4CIrQwV007044@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/geomview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7021 Modified Files: .cvsignore geomview.desktop geomview.spec sources Removed Files: geomview.png Log Message: * Fri May 12 2006 Rex Dieter 1.8.2-0.3.cvs20040221 - updated (transparent) icon (rh bug #190218) - drop deprecated BR: libGL.so.1,libGLU.so.1 bits - ExcludeArch: x86_64 (#182625) - .desktop: MimeType: application/x-geomview Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Jan 2006 14:43:54 -0000 1.3 +++ .cvsignore 12 May 2006 18:53:24 -0000 1.4 @@ -1,3 +1,4 @@ maniview-2.0.0.tar.gz orrery-0.9.3.tar.gz geomview-snapshot-2004-02-21.tar.gz +geomview.png Index: geomview.desktop =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/geomview.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geomview.desktop 3 Jan 2006 14:43:54 -0000 1.2 +++ geomview.desktop 12 May 2006 18:53:24 -0000 1.3 @@ -3,7 +3,7 @@ Comment=An interactive 3D viewing program Exec=geomview Icon=geomview -#MimeType=application/x-geomview +MimeType=application/x-geomview Type=Application Encoding=UTF-8 Categories=Application;Graphics;Scientific;Education;Math; Index: geomview.spec =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- geomview.spec 1 Mar 2006 16:45:28 -0000 1.8 +++ geomview.spec 12 May 2006 18:53:24 -0000 1.9 @@ -9,7 +9,7 @@ Name: geomview Summary: Interactive 3D viewing program Version: 1.8.2 -Release: 0.2.cvs%{cvs}%{?dist}.3 +Release: 0.3.cvs%{cvs}%{?dist} License: LGPL Url: http://www.geomview.org/ @@ -18,6 +18,8 @@ #Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# http://bugzilla.redhat.com/bugzilla/182625 +ExcludeArch: x86_64 Obsoletes: %{name}-plugins < %{version}-%{release} Provides: %{name}-plugins = %{version}-%{release} @@ -41,11 +43,7 @@ BuildRequires: openmotif-devel BuildRequires: xforms-devel ## X/GL support -%if "%{?fedora}" > "3" BuildRequires: libGL-devel libGLU-devel -%else -BuildRequires: libGL.so.1 libGLU.so.1 -%endif Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -173,12 +171,11 @@ rm -rf $RPM_BUILD_ROOT -%POST +%post /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||: -for icon_theme in hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: %preun if [ $1 -eq 0 ] ;then @@ -186,10 +183,9 @@ fi %postun -for icon_theme in hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: %files @@ -249,6 +245,12 @@ %changelog +* Fri May 12 2006 Rex Dieter 1.8.2-0.3.cvs20040221 +- updated (transparent) icon (rh bug #190218) +- drop deprecated BR: libGL.so.1,libGLU.so.1 bits +- ExcludeArch: x86_64 (#182625) +- .desktop: MimeType: application/x-geomview + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jan 2006 14:43:54 -0000 1.3 +++ sources 12 May 2006 18:53:24 -0000 1.4 @@ -1,3 +1,4 @@ 776c3acefac602c422dacd45119f3560 geomview-snapshot-2004-02-21.tar.gz 109909e66ed37c678af4286cc6e620e2 maniview-2.0.0.tar.gz 8f68b4bd7ae8b207456fbed0650a8330 orrery-0.9.3.tar.gz +f5588be3402850ed4cc9ef0dac48013a geomview.png From fedora-extras-commits at redhat.com Fri May 12 18:58:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 12 May 2006 11:58:43 -0700 Subject: rpms/gpgme/devel gpgme.spec,1.16,1.17 Message-ID: <200605121858.k4CIwjZL007114@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7097 Modified Files: gpgme.spec Log Message: respin Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gpgme.spec 11 May 2006 19:34:16 -0000 1.16 +++ gpgme.spec 12 May 2006 18:58:43 -0000 1.17 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: Applications/System @@ -99,7 +99,7 @@ %changelog -* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +* Mon Mar 6 2006 Rex Dieter 1.1.2-4 - add back support for gpgme-config --thread=pthread * Mon Mar 6 2006 Rex Dieter 1.1.2-2 From fedora-extras-commits at redhat.com Fri May 12 19:21:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:21:44 -0700 Subject: rpms/perl-Test-Portability-Files - New directory Message-ID: <200605121921.k4CJLk79009499@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9478/perl-Test-Portability-Files Log Message: Directory /cvs/extras/rpms/perl-Test-Portability-Files added to the repository From fedora-extras-commits at redhat.com Fri May 12 19:21:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:21:44 -0700 Subject: rpms/perl-Test-Portability-Files/devel - New directory Message-ID: <200605121921.k4CJLkn6009502@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9478/perl-Test-Portability-Files/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Portability-Files/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 19:22:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:22:12 -0700 Subject: rpms/perl-Test-Portability-Files Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605121922.k4CJMEmh009551@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9523 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Portability-Files --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Portability-Files all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 12 19:22:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:22:12 -0700 Subject: rpms/perl-Test-Portability-Files/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605121922.k4CJMEYc009554@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9523/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Portability-Files --- NEW 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 May 12 19:23:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:23:02 -0700 Subject: rpms/perl-Test-Portability-Files import.log,1.1,1.2 Message-ID: <200605121923.k4CJN407009624@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9589 Modified Files: import.log Log Message: auto-import perl-Test-Portability-Files-0.05-1 on branch devel from perl-Test-Portability-Files-0.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 19:22:12 -0000 1.1 +++ import.log 12 May 2006 19:23:02 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Portability-Files-0_05-1:HEAD:perl-Test-Portability-Files-0.05-1.src.rpm:1147461768 From fedora-extras-commits at redhat.com Fri May 12 19:23:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:23:03 -0700 Subject: rpms/perl-Test-Portability-Files/devel perl-Test-Portability-Files.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605121923.k4CJN5dw009629@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9589/devel Modified Files: .cvsignore sources Added Files: perl-Test-Portability-Files.spec Log Message: auto-import perl-Test-Portability-Files-0.05-1 on branch devel from perl-Test-Portability-Files-0.05-1.src.rpm --- NEW FILE perl-Test-Portability-Files.spec --- Name: perl-Test-Portability-Files Version: 0.05 Release: 1%{?dist} Summary: Check file names portability License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Portability-Files/ Source0: http://www.cpan.org/authors/id/S/SA/SAPER/Test-Portability-Files-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is used to check the portability across operating systems of the names of the files present in the distribution of a module. The tests use the advices given in "Files and Filesystems" in perlport. The author of a distribution can select which tests to execute. %prep %setup -q -n Test-Portability-Files-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE LICENSE.Artistic LICENSE.GPL README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri May 12 2006 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.66. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 19:22:12 -0000 1.1 +++ .cvsignore 12 May 2006 19:23:03 -0000 1.2 @@ -0,0 +1 @@ +Test-Portability-Files-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 19:22:12 -0000 1.1 +++ sources 12 May 2006 19:23:03 -0000 1.2 @@ -0,0 +1 @@ +2ede77af4d3b82ffb39cd28fda6857e5 Test-Portability-Files-0.05.tar.gz From fedora-extras-commits at redhat.com Fri May 12 19:24:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:24:48 -0700 Subject: owners owners.list,1.982,1.983 Message-ID: <200605121924.k4CJOocc009695@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9678 Modified Files: owners.list Log Message: Add perl-Test-Portability-Files. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.982 retrieving revision 1.983 diff -u -r1.982 -r1.983 --- owners.list 12 May 2006 17:15:33 -0000 1.982 +++ owners.list 12 May 2006 19:24:48 -0000 1.983 @@ -1188,6 +1188,7 @@ Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Portability-Files|Check file names portability|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Prereq|Check if Makefile.PL has the right pre-requisites|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-SubCalls|Track the number of times subs are called|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 12 20:18:55 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 12 May 2006 13:18:55 -0700 Subject: rpms/perl-Module-Signature/FC-5 .cvsignore, 1.7, 1.8 perl-Module-Signature.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200605122018.k4CKIv3i012389@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-Signature/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12352/FC-5 Modified Files: .cvsignore perl-Module-Signature.spec sources Log Message: * Fri May 12 2006 Ville Skytt?? - 0.54-1 - 0.54, license changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 Feb 2006 20:43:25 -0000 1.7 +++ .cvsignore 12 May 2006 20:18:54 -0000 1.8 @@ -1 +1 @@ -Module-Signature-0.53.tar.gz +Module-Signature-0.54.tar.gz Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-5/perl-Module-Signature.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Module-Signature.spec 1 Feb 2006 20:43:25 -0000 1.7 +++ perl-Module-Signature.spec 12 May 2006 20:18:54 -0000 1.8 @@ -1,17 +1,10 @@ -# Must use expand to ensure mktemp is run only once -%{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)} - -# Yep, this is a noarch package, but this is to avoid debug*.list which -# interfere with some of the signature tests. -%define debug_package %{nil} - Name: perl-Module-Signature -Version: 0.53 +Version: 0.54 Release: 1%{?dist} Summary: CPAN signature management utilities and modules Group: Development/Libraries -License: GPL or Artistic +License: MIT URL: http://search.cpan.org/dist/Module-Signature/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,12 +24,11 @@ %prep %setup -q -n Module-Signature-%{version} +%{__perl} -pi -e 's/ if want_openpgp\(\);/ if 0;/' Makefile.PL %build -mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg -PERL_AUTOINSTALL=--skipdeps \ -%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null +PERL_AUTOINSTALL=--skipdeps %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -49,12 +41,11 @@ %check -export GNUPGHOME=%{mytempdir}/_gnupg -make test %{!?_with_livetests:TEST_FILES=t/1-basic.t} +make test %clean -rm -rf $RPM_BUILD_ROOT %{mytempdir} +rm -rf $RPM_BUILD_ROOT %files @@ -66,6 +57,9 @@ %changelog +* Fri May 12 2006 Ville Skytt?? - 0.54-1 +- 0.54, license changed to MIT. + * Wed Feb 1 2006 Ville Skytt?? - 0.53-1 - 0.53. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Feb 2006 20:43:25 -0000 1.7 +++ sources 12 May 2006 20:18:54 -0000 1.8 @@ -1 +1 @@ -245d8ed867615e3f15a2a7f36b4d2f89 Module-Signature-0.53.tar.gz +f77964f0d5deb98ea7c1050a8b6a21a5 Module-Signature-0.54.tar.gz From fedora-extras-commits at redhat.com Fri May 12 20:18:55 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 12 May 2006 13:18:55 -0700 Subject: rpms/perl-Module-Signature/devel .cvsignore, 1.7, 1.8 perl-Module-Signature.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200605122019.k4CKIvXM012395@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-Signature/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12352/devel Modified Files: .cvsignore perl-Module-Signature.spec sources Log Message: * Fri May 12 2006 Ville Skytt?? - 0.54-1 - 0.54, license changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 Feb 2006 20:43:25 -0000 1.7 +++ .cvsignore 12 May 2006 20:18:55 -0000 1.8 @@ -1 +1 @@ -Module-Signature-0.53.tar.gz +Module-Signature-0.54.tar.gz Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Module-Signature.spec 1 Feb 2006 20:43:25 -0000 1.7 +++ perl-Module-Signature.spec 12 May 2006 20:18:55 -0000 1.8 @@ -1,17 +1,10 @@ -# Must use expand to ensure mktemp is run only once -%{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)} - -# Yep, this is a noarch package, but this is to avoid debug*.list which -# interfere with some of the signature tests. -%define debug_package %{nil} - Name: perl-Module-Signature -Version: 0.53 +Version: 0.54 Release: 1%{?dist} Summary: CPAN signature management utilities and modules Group: Development/Libraries -License: GPL or Artistic +License: MIT URL: http://search.cpan.org/dist/Module-Signature/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,12 +24,11 @@ %prep %setup -q -n Module-Signature-%{version} +%{__perl} -pi -e 's/ if want_openpgp\(\);/ if 0;/' Makefile.PL %build -mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg -PERL_AUTOINSTALL=--skipdeps \ -%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null +PERL_AUTOINSTALL=--skipdeps %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -49,12 +41,11 @@ %check -export GNUPGHOME=%{mytempdir}/_gnupg -make test %{!?_with_livetests:TEST_FILES=t/1-basic.t} +make test %clean -rm -rf $RPM_BUILD_ROOT %{mytempdir} +rm -rf $RPM_BUILD_ROOT %files @@ -66,6 +57,9 @@ %changelog +* Fri May 12 2006 Ville Skytt?? - 0.54-1 +- 0.54, license changed to MIT. + * Wed Feb 1 2006 Ville Skytt?? - 0.53-1 - 0.53. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Feb 2006 20:43:25 -0000 1.7 +++ sources 12 May 2006 20:18:55 -0000 1.8 @@ -1 +1 @@ -245d8ed867615e3f15a2a7f36b4d2f89 Module-Signature-0.53.tar.gz +f77964f0d5deb98ea7c1050a8b6a21a5 Module-Signature-0.54.tar.gz From fedora-extras-commits at redhat.com Fri May 12 20:23:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:03 -0700 Subject: rpms/perl-Pod-Readme - New directory Message-ID: <200605122023.k4CKN5OO012530@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12503/perl-Pod-Readme Log Message: Directory /cvs/extras/rpms/perl-Pod-Readme added to the repository From fedora-extras-commits at redhat.com Fri May 12 20:23:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:04 -0700 Subject: rpms/perl-Pod-Readme/devel - New directory Message-ID: <200605122023.k4CKN6tu012533@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12503/perl-Pod-Readme/devel Log Message: Directory /cvs/extras/rpms/perl-Pod-Readme/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 20:23:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:22 -0700 Subject: rpms/perl-Pod-Readme Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605122023.k4CKNOWj012592@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12558 Added Files: Makefile import.log Log Message: Setup of module perl-Pod-Readme --- NEW FILE Makefile --- # Top level Makefile for module perl-Pod-Readme all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 12 20:23:23 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:23 -0700 Subject: rpms/perl-Pod-Readme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605122023.k4CKNPj1012595@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12558/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Pod-Readme --- NEW 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 May 12 20:23:38 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:38 -0700 Subject: owners owners.list,1.983,1.984 Message-ID: <200605122023.k4CKNelm012629@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12607 Modified Files: owners.list Log Message: Add perl-Pod-Readme. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.983 retrieving revision 1.984 diff -u -r1.983 -r1.984 --- owners.list 12 May 2006 19:24:48 -0000 1.983 +++ owners.list 12 May 2006 20:23:38 -0000 1.984 @@ -1146,6 +1146,7 @@ Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Pod-Readme|Convert POD to README file|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 12 20:23:57 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 13:23:57 -0700 Subject: rpms/fig2ps/devel fig2ps.spec,1.3,1.4 Message-ID: <200605122023.k4CKNxV8012698@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12680 Modified Files: fig2ps.spec Log Message: Add missing dependency. Index: fig2ps.spec =================================================================== RCS file: /cvs/extras/rpms/fig2ps/devel/fig2ps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fig2ps.spec 16 Jan 2006 21:23:15 -0000 1.3 +++ fig2ps.spec 12 May 2006 20:23:57 -0000 1.4 @@ -1,6 +1,6 @@ Name: fig2ps Version: 1.3.5 -Release: 1 +Release: 2%{?dist} Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing @@ -9,7 +9,7 @@ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: tetex-latex tetex-dvips ghostscript transfig +Requires: tetex-latex tetex-dvips ghostscript gv transfig %description fig2ps is a perl script which converts xfig files to postscript or @@ -43,6 +43,10 @@ %config(noreplace) /etc/fig2ps %changelog +* Fri May 12 2006 Quentin Spencer 1.3.5-2 +- Add gv as a dependency. +- Add dist tag. + * Mon Jan 16 2006 Quentin Spencer 1.3.5-1 - New upstream release From fedora-extras-commits at redhat.com Fri May 12 20:23:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:53 -0700 Subject: rpms/perl-Pod-Readme import.log,1.1,1.2 Message-ID: <200605122024.k4CKOQIw012750@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12649 Modified Files: import.log Log Message: auto-import perl-Pod-Readme-0.081-1 on branch devel from perl-Pod-Readme-0.081-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 20:23:22 -0000 1.1 +++ import.log 12 May 2006 20:23:53 -0000 1.2 @@ -0,0 +1 @@ +perl-Pod-Readme-0_081-1:HEAD:perl-Pod-Readme-0.081-1.src.rpm:1147465426 From fedora-extras-commits at redhat.com Fri May 12 20:23:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:54 -0700 Subject: rpms/perl-Pod-Readme/devel perl-Pod-Readme.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605122024.k4CKOQpT012754@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12649/devel Modified Files: .cvsignore sources Added Files: perl-Pod-Readme.spec Log Message: auto-import perl-Pod-Readme-0.081-1 on branch devel from perl-Pod-Readme-0.081-1.src.rpm --- NEW FILE perl-Pod-Readme.spec --- Name: perl-Pod-Readme Version: 0.081 Release: 1%{?dist} Summary: Convert POD to README file License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Pod-Readme/ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Pod-Readme-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) # Core module that appears to be out of date. #BuildRequires: perl(Pod::Text) >= 3.0 Requires: perl(Test::Pod) >= 1.00 Requires: perl(Test::Pod::Coverage) Requires: perl(Test::Portability::Files) # Core module that appears to be out of date. #Requires: perl(Pod::Text) >= 3.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is a subclass of Pod::PlainText which provides additional POD markup for generating README files. %prep %setup -q -n Pod-Readme-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check DEVEL_TESTS=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{_bindir}/* %{perl_vendorlib}/* %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Fri May 12 2006 Steven Pritchard 0.081-1 - Specfile autogenerated by cpanspec 1.66. - Remove explicit perl dep. - Set DEVEL_TESTS for "Build test". - Add bindir and man1 to file list. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 20:23:23 -0000 1.1 +++ .cvsignore 12 May 2006 20:23:54 -0000 1.2 @@ -0,0 +1 @@ +Pod-Readme-0.081.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 20:23:23 -0000 1.1 +++ sources 12 May 2006 20:23:54 -0000 1.2 @@ -0,0 +1 @@ +ea05b9a09ad65fbbc1864ef3b2396e64 Pod-Readme-0.081.tar.gz From fedora-extras-commits at redhat.com Fri May 12 20:25:08 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 13:25:08 -0700 Subject: rpms/fig2ps/FC-5 fig2ps.spec,1.3,1.4 Message-ID: <200605122025.k4CKPAf5012849@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12806 Modified Files: fig2ps.spec Log Message: Add missing dependency. Index: fig2ps.spec =================================================================== RCS file: /cvs/extras/rpms/fig2ps/FC-5/fig2ps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fig2ps.spec 16 Jan 2006 21:23:15 -0000 1.3 +++ fig2ps.spec 12 May 2006 20:25:08 -0000 1.4 @@ -1,6 +1,6 @@ Name: fig2ps Version: 1.3.5 -Release: 1 +Release: 2%{?dist} Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing @@ -9,7 +9,7 @@ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: tetex-latex tetex-dvips ghostscript transfig +Requires: tetex-latex tetex-dvips ghostscript gv transfig %description fig2ps is a perl script which converts xfig files to postscript or @@ -43,6 +43,10 @@ %config(noreplace) /etc/fig2ps %changelog +* Fri May 12 2006 Quentin Spencer 1.3.5-2 +- Add gv as a dependency. +- Add dist tag. + * Mon Jan 16 2006 Quentin Spencer 1.3.5-1 - New upstream release From fedora-extras-commits at redhat.com Fri May 12 20:27:26 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 13:27:26 -0700 Subject: rpms/fig2ps/FC-4 fig2ps.spec,1.3,1.4 Message-ID: <200605122027.k4CKRSvK012941@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12924 Modified Files: fig2ps.spec Log Message: Add missing dependency. Index: fig2ps.spec =================================================================== RCS file: /cvs/extras/rpms/fig2ps/FC-4/fig2ps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fig2ps.spec 16 Jan 2006 21:26:19 -0000 1.3 +++ fig2ps.spec 12 May 2006 20:27:26 -0000 1.4 @@ -1,6 +1,6 @@ Name: fig2ps Version: 1.3.5 -Release: 1 +Release: 2%{?dist} Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing @@ -9,7 +9,7 @@ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: tetex-latex tetex-dvips ghostscript transfig +Requires: tetex-latex tetex-dvips ghostscript gv transfig %description fig2ps is a perl script which converts xfig files to postscript or @@ -43,8 +43,10 @@ %config(noreplace) /etc/fig2ps %changelog -* Mon Jan 16 2006 Quentin Spencer 1.3.5-1 +* Fri May 12 2006 Quentin Spencer 1.3.5-1 - New upstream release +- Add gv as a dependency. +- Add dist tag. * Wed Sep 21 2005 Quentin Spencer 1.3.3-2 - fix make install command From fedora-extras-commits at redhat.com Fri May 12 20:48:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 12 May 2006 13:48:10 -0700 Subject: fedora-security/audit fe4,1.21,1.22 fe5,1.19,1.20 Message-ID: <200605122048.k4CKmARW013189@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13168 Modified Files: fe4 fe5 Log Message: awstats issues fixed. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fe4 12 May 2006 01:19:23 -0000 1.21 +++ fe4 12 May 2006 20:48:08 -0000 1.22 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2237 VULNERABLE (awstats) bz#190924 +CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fe5 11 May 2006 00:05:54 -0000 1.19 +++ fe5 12 May 2006 20:48:08 -0000 1.20 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2237 VULNERABLE (awstats) bz#190923 +CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 From fedora-extras-commits at redhat.com Fri May 12 20:56:32 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 12 May 2006 13:56:32 -0700 Subject: mock mock.py,1.43,1.44 Message-ID: <200605122056.k4CKuWbm013399@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13379 Modified Files: mock.py Log Message: commit michael brown's multiple srpms on the command line patch Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- mock.py 8 May 2006 16:39:53 -0000 1.43 +++ mock.py 12 May 2006 20:56:30 -0000 1.44 @@ -810,36 +810,46 @@ else: if args[0] == 'rebuild': if len(args) > 1: - srpm = args[1] + srpms = args[1:] else: error("No package specified to rebuild command.") sys.exit(50) else: - srpm = args[0] + srpms = args[0:] - ts = rpmUtils.transaction.initReadOnlyTransaction() - try: - hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) - except rpmUtils.RpmUtilsError, e: - error("Specified srpm %s cannot be found/opened" % srpm) - sys.exit(50) - - if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: - error("Specified srpm isn't a srpm! Can't go on") - sys.exit(50) + for srpm in srpms: + ts = rpmUtils.transaction.initReadOnlyTransaction() + try: + hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) + except rpmUtils.RpmUtilsError, e: + error("Specified srpm %s cannot be found/opened" % srpm) + sys.exit(50) + if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: + error("Specified srpm isn't a srpm! Can't go on") + sys.exit(50) + + # Prep build root + my = None # if Root() fails, my will be undefined so we force it to None try: - my = None # if Root() fails, my will be undefined so we force it to None my = Root(config_opts) os.umask(0022) # set a umask- protects from paranoid whackjobs with an 002 umask - my.prep() - my.build(srpm) except Error, e: error(e) if my: my.close() sys.exit(e.resultcode) - + + for srpm in srpms: + try: + my.prep() + my.build(srpm) + except Error, e: + error(e) + if my: + my.close() + sys.exit(e.resultcode) + my.close() print "Results and/or logs in: %s" % my.resultdir From fedora-extras-commits at redhat.com Fri May 12 20:57:06 2006 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Fri, 12 May 2006 13:57:06 -0700 Subject: mock mock.py,1.44,1.45 Message-ID: <200605122057.k4CKv6sA013450@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13432 Modified Files: mock.py Log Message: added interactive "shell" command for examining chroots Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- mock.py 12 May 2006 20:56:30 -0000 1.44 +++ mock.py 12 May 2006 20:57:03 -0000 1.45 @@ -800,13 +800,28 @@ print 'Finished initializing root' elif args[0] == 'chroot': + # catch-all for executing arbitrary commands in the chroot config_opts['clean'] = config_opts['quiet'] = False - my= Root(config_opts) + my = Root(config_opts) + cmd = ' '.join(args[1:]) + my.debug("executing: %s" % cmd) my._mount() - my.do_chroot(' '.join(args[1:]), True) + my.do_chroot(cmd, True) my.close() - print 'Finished chroot command' + my.debug('finished chroot command') + elif args[0] == 'shell': + # debugging tool for interactive poking around in the chroot + config_opts['clean'] = config_opts['quiet'] = False + my = Root(config_opts) + cmd = "PS1='mock-chroot> ' %s %s /bin/bash" % (config_opts['chroot'], + my.rootdir) + my.debug("executing: %s" % cmd) + my._mount() + ret = os.system(cmd) + my.close() + my.debug("finished shell with retval %d" % ret) + else: if args[0] == 'rebuild': if len(args) > 1: From fedora-extras-commits at redhat.com Fri May 12 20:57:53 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Fri, 12 May 2006 13:57:53 -0700 Subject: rpms/mercurial/devel .cvsignore, 1.7, 1.8 mercurial.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200605122057.k4CKvtCl013499@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13476 Modified Files: .cvsignore mercurial.spec sources Log Message: Upgrading to mercurial 0.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Apr 2006 19:20:25 -0000 1.7 +++ .cvsignore 12 May 2006 20:57:53 -0000 1.8 @@ -1 +1 @@ -mercurial-0.8.1.tar.gz +mercurial-0.9.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mercurial.spec 10 Apr 2006 19:20:25 -0000 1.9 +++ mercurial.spec 12 May 2006 20:57:53 -0000 1.10 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.8.1 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -44,6 +44,9 @@ %changelog +* Fri May 12 2006 Mihai Ibanescu - 0.9-1 +- update to 0.9 + * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 19:20:25 -0000 1.7 +++ sources 12 May 2006 20:57:53 -0000 1.8 @@ -1 +1 @@ -ffa37810cf9c48608f5172a622bef2f5 mercurial-0.8.1.tar.gz +d4154d12dcbda78251750c2a18eae940 mercurial-0.9.tar.gz From fedora-extras-commits at redhat.com Fri May 12 20:58:00 2006 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Fri, 12 May 2006 13:58:00 -0700 Subject: mock/src mock-helper.c,1.7,1.8 Message-ID: <200605122058.k4CKw0e1013521@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13503 Modified Files: mock-helper.c Log Message: added PS1 to allowed environment (to display special prompt when inside chroot) Index: mock-helper.c =================================================================== RCS file: /cvs/fedora/mock/src/mock-helper.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mock-helper.c 14 Jul 2005 18:00:26 -0000 1.7 +++ mock-helper.c 12 May 2006 20:57:57 -0000 1.8 @@ -25,7 +25,7 @@ static char const * const ALLOWED_ENV[] = { "dist", - "ftp_proxy", "http_proxy", "https_proxy", "no_proxy" + "ftp_proxy", "http_proxy", "https_proxy", "no_proxy", "PS1", }; #define ALLOWED_ENV_SIZE (sizeof (ALLOWED_ENV) / sizeof (ALLOWED_ENV[0])) From fedora-extras-commits at redhat.com Fri May 12 21:01:50 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 12 May 2006 14:01:50 -0700 Subject: rpms/qof/devel qof-gnc-date-test.patch, NONE, 1.1 qof.spec, 1.15, 1.16 qof-gnc-date-char.patch, 1.1, NONE Message-ID: <200605122102.k4CL2OZ7015854@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15826 Modified Files: qof.spec Added Files: qof-gnc-date-test.patch Removed Files: qof-gnc-date-char.patch Log Message: - After talking with upstream it was decided that the supposed char problem was a problem with the test suite. New patch fixes an overflow in the tests. qof-gnc-date-test.patch: --- NEW FILE qof-gnc-date-test.patch --- --- qof-0.6.4/qof/test/test-date.c.bak 2006-05-11 20:47:02.000000000 -0700 +++ qof-0.6.4/qof/test/test-date.c 2006-05-11 23:38:01.000000000 -0700 @@ -370,7 +370,11 @@ srand(time(0)); + /* Get a random time that won't overflow a signed 32bit int durng testing */ ts = *get_random_timespec (); + while (ts.tv_sec >= ((2^31) - (10000*10800))) { + ts = *get_random_timespec(); + }; for (i = 0; i < 10000; i++) { Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- qof.spec 30 Apr 2006 17:34:54 -0000 1.15 +++ qof.spec 12 May 2006 21:01:50 -0000 1.16 @@ -1,6 +1,6 @@ Name: qof Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries @@ -8,7 +8,7 @@ URL: http://qof.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: qof-x86_64.patch -Patch1: qof-gnc-date-char.patch +Patch1: qof-gnc-date-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -116,6 +116,11 @@ %doc html %changelog +* Fri May 12 2006 Toshio Kuratomi - 0.6.4-4 +- After talking with upstream it was decided that the supposed char problem + was a problem with the test suite. New patch fixes an overflow in the + tests. + * Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-3 - Fix stupid in a hurry typo. --- qof-gnc-date-char.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 12 21:05:57 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 12 May 2006 14:05:57 -0700 Subject: rpms/abiword/FC-5 abiword-2.4.4-fontcrash.patch, NONE, 1.1 abiword.spec, 1.35, 1.36 Message-ID: <200605122105.k4CL5xbp015972@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15952 Modified Files: abiword.spec Added Files: abiword-2.4.4-fontcrash.patch Log Message: Fix 182399 abiword-2.4.4-fontcrash.patch: --- NEW FILE abiword-2.4.4-fontcrash.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp 2005-07-05 16:08:20.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp 2006-05-12 21:44:57.000000000 +0200 @@ -133,11 +133,11 @@ { DELETEP(m_pUnixToolbarIcons); + delete m_fontManager; + #if FC_MINOR > 2 FcFini(); #endif - - delete m_fontManager; } bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- abiword.spec 8 May 2006 01:01:29 -0000 1.35 +++ abiword.spec 12 May 2006 21:05:57 -0000 1.36 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -45,6 +45,7 @@ Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.4-docbuild.patch Patch3: abiword-2.4.4-x86_64.patch +Patch4: abiword-2.4.4-fontcrash.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -56,6 +57,7 @@ %patch1 -p1 -b .desktop %patch2 -p1 -b .docbuild %patch3 -p1 -b .x86_64 +%patch4 -p1 -b .fontcrash %build cd abi @@ -137,6 +139,9 @@ %{_datadir}/icons/*png %changelog +* Fri May 12 2006 Marc Maurer - 1:2.4.4-4.fc5 +- Fix bug 182399 - Abiword crashes on exit + * Mon May 08 2006 Marc Maurer - 1:2.4.4-3.fc5 - Fix bug 190591 - crash on x86_64 machines when saving a document From fedora-extras-commits at redhat.com Fri May 12 21:07:01 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Fri, 12 May 2006 14:07:01 -0700 Subject: status-report-scripts parseBZbugList,1.33,1.34 Message-ID: <200605122107.k4CL71gf016039@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16021 Modified Files: parseBZbugList Log Message: Show 25 top reviewers and highlight sponsors. Index: parseBZbugList =================================================================== RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- parseBZbugList 27 Apr 2006 15:45:48 -0000 1.33 +++ parseBZbugList 12 May 2006 21:06:59 -0000 1.34 @@ -85,6 +85,8 @@ = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel"; $main::bzid = "http://fedoraproject.org/wiki/Extras/UsefulScripts?action=AttachFile&do=get&target=bzId_pkg.txt"; +$main::members + = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt"; $main::cvsDir = "/export/scratch/extras"; $main::currel = 5; $main::firstrel = 1; @@ -123,6 +125,7 @@ my %OWN; my %OWN_DUP; my %OWN_CVS_RECENT; +my %MEMBER; my %CVS_NO_OWNER; my %DISCARD; my %FC_INTEGRATED; @@ -145,6 +148,17 @@ } close IN; } +if ($main::members ne "") { + local *IN; + open IN, "wget -nv -O - --no-check-certificate \"$main::members\"|" + or die "Failed to wget members list : $!"; + while ( ) { + s/\s+$//; + my @F = split /,/; + $MEMBER{$F[1]} = \@F; + } + close IN; +} if ($main::discarded ne "") { local *IN; open IN, "wget -nv -O - \"$main::discarded\"|" @@ -554,15 +568,34 @@ } sub displayOwnerCntWiki { - my ($a, $c, $aref) = @_; - for my $i (0 .. 9) { + my ($a, $c, $aref, $count, $mark) = @_; + if (defined $count) { + $count -= 1; + } else { + $count = 9; + } + for my $i (0 .. $count) { my $n = $$a[$i]; + my $sponsor = 0; $n =~ s/["]//g; - $n =~ s/\@/ at /; - $n =~ s/\./ dot /g; + if (defined $MEMBER{$n}) { + my $a = $MEMBER{$n}; + $n = $$a[2]; + if ($mark == 1 + && ($$a[3] eq "sponsor" || $$a[3] eq "administrator")) { + $sponsor = 1; + } + } else { + $n =~ s/\@/ at /; + $n =~ s/\./ dot /g; + } my $aa = $c->{$$a[$i]}; $aa = $$aa[$aref] if defined $aref; - print "||$n||$aa||\n"; + if ($sponsor == 1) { + print "|| $n||$aa||\n"; + } else { + print "||$n||$aa||\n"; + } } print "\n"; } @@ -728,8 +761,10 @@ print "\nWe have $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n"; print "\n=== Top 10 BZ review requests submitters ===\n"; &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT, undef); - print "\n=== Top 10 BZ review requests reviewers ===\n"; - &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, \%BZREV_CNT, undef); + print "\n=== Top 25 BZ review requests reviewers ===\n"; + print "Sponsors are highlighted in green.\n"; + &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, + \%BZREV_CNT, undef, 25, 1); print "\n\n=== Potential problems ===\n"; if ($COUNT_LIST{"missing"} > 0) { print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ", From fedora-extras-commits at redhat.com Fri May 12 21:24:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 12 May 2006 14:24:44 -0700 Subject: owners owners.list,1.984,1.985 Message-ID: <200605122124.k4CLOk2G016217@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16199/owners Modified Files: owners.list Log Message: Add raidem-music Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.984 retrieving revision 1.985 diff -u -r1.984 -r1.985 --- owners.list 12 May 2006 20:23:38 -0000 1.984 +++ owners.list 12 May 2006 21:24:44 -0000 1.985 @@ -1391,6 +1391,7 @@ Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|raidem-music|Background music for the game raidem|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|rapidsvn|Graphical interface for the Subversion revision control system|rpm at timj.co.uk|extras-qa at fedoraproject.org| Fedora Extras|raptor|Raptor RDF Parser Toolkit for Redland|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 12 21:50:30 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 12 May 2006 14:50:30 -0700 Subject: rpms/qof/FC-5 qof-gnc-date-test.patch, NONE, 1.1 qof.spec, 1.14, 1.15 qof-gnc-date-char.patch, 1.1, NONE Message-ID: <200605122150.k4CLoWBm016388@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16368 Modified Files: qof.spec Added Files: qof-gnc-date-test.patch Removed Files: qof-gnc-date-char.patch Log Message: - After talking with upstream it was decided that the supposed char problem was a problem with the test suite. New patch fixes an overflow in the tests. qof-gnc-date-test.patch: --- NEW FILE qof-gnc-date-test.patch --- --- qof-0.6.4/qof/test/test-date.c.bak 2006-05-11 20:47:02.000000000 -0700 +++ qof-0.6.4/qof/test/test-date.c 2006-05-11 23:38:01.000000000 -0700 @@ -370,7 +370,11 @@ srand(time(0)); + /* Get a random time that won't overflow a signed 32bit int durng testing */ ts = *get_random_timespec (); + while (ts.tv_sec >= ((2^31) - (10000*10800))) { + ts = *get_random_timespec(); + }; for (i = 0; i < 10000; i++) { Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/FC-5/qof.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- qof.spec 30 Apr 2006 20:02:06 -0000 1.14 +++ qof.spec 12 May 2006 21:50:30 -0000 1.15 @@ -1,6 +1,6 @@ Name: qof Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries @@ -8,7 +8,7 @@ URL: http://qof.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: qof-x86_64.patch -Patch1: qof-gnc-date-char.patch +Patch1: qof-gnc-date-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -116,6 +116,11 @@ %doc html %changelog +* Fri May 12 2006 Toshio Kuratomi - 0.6.4-4 +- After talking with upstream it was decided that the supposed char problem + was a problem with the test suite. New patch fixes an overflow in the + tests. + * Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-3 - Fix stupid in a hurry typo. --- qof-gnc-date-char.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 12 21:52:05 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 12 May 2006 14:52:05 -0700 Subject: rpms/qof/FC-4 qof-gnc-date-test.patch, NONE, 1.1 qof.spec, 1.11, 1.12 qof-gnc-date-char.patch, 1.1, NONE Message-ID: <200605122152.k4CLq7RP016532@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16511 Modified Files: qof.spec Added Files: qof-gnc-date-test.patch Removed Files: qof-gnc-date-char.patch Log Message: - After talking with upstream it was decided that the supposed char problem was a problem with the test suite. New patch fixes an overflow in the tests. qof-gnc-date-test.patch: --- NEW FILE qof-gnc-date-test.patch --- --- qof-0.6.4/qof/test/test-date.c.bak 2006-05-11 20:47:02.000000000 -0700 +++ qof-0.6.4/qof/test/test-date.c 2006-05-11 23:38:01.000000000 -0700 @@ -370,7 +370,11 @@ srand(time(0)); + /* Get a random time that won't overflow a signed 32bit int durng testing */ ts = *get_random_timespec (); + while (ts.tv_sec >= ((2^31) - (10000*10800))) { + ts = *get_random_timespec(); + }; for (i = 0; i < 10000; i++) { Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/FC-4/qof.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qof.spec 1 May 2006 01:17:17 -0000 1.11 +++ qof.spec 12 May 2006 21:52:05 -0000 1.12 @@ -1,6 +1,6 @@ Name: qof Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries @@ -8,7 +8,7 @@ URL: http://qof.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: qof-x86_64.patch -Patch1: qof-gnc-date-char.patch +Patch1: qof-gnc-date-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -116,6 +116,11 @@ %doc html %changelog +* Fri May 12 2006 Toshio Kuratomi - 0.6.4-4 +- After talking with upstream it was decided that the supposed char problem + was a problem with the test suite. New patch fixes an overflow in the + tests. + * Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-3 - Fix stupid in a hurry typo. --- qof-gnc-date-char.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 12 22:22:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 15:22:07 -0700 Subject: owners owners.list,1.985,1.986 Message-ID: <200605122222.k4CMM9Op018923@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18906 Modified Files: owners.list Log Message: removed drscheme and orphaned inti Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.985 retrieving revision 1.986 diff -u -r1.985 -r1.986 --- owners.list 12 May 2006 21:24:44 -0000 1.985 +++ owners.list 12 May 2006 22:22:07 -0000 1.986 @@ -222,7 +222,6 @@ Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|driftnet|Network image sniffer|bnocera at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| @@ -512,7 +511,7 @@ Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org| -Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 12 22:28:17 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 12 May 2006 15:28:17 -0700 Subject: rpms/python-clientform/FC-4 .cvsignore, 1.2, 1.3 python-clientform.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605122228.k4CMSJPH019020@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18983/FC-4 Modified Files: .cvsignore python-clientform.spec sources Log Message: Bump FC5 and FC4 branches to 0.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Nov 2005 13:45:32 -0000 1.2 +++ .cvsignore 12 May 2006 22:28:17 -0000 1.3 @@ -1 +1 @@ -ClientForm-0.1.17.tar.gz +ClientForm-0.2.2.tar.gz Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-4/python-clientform.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-clientform.spec 2 Nov 2005 13:45:32 -0000 1.1 +++ python-clientform.spec 12 May 2006 22:28:17 -0000 1.2 @@ -1,18 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-clientform -Version: 0.1.17 -Release: 3%{?dist} +Version: 0.2.2 +Release: 4%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages License: BSD URL: http://wwwsearch.sourceforge.net/ClientForm/ -Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-0.1.17.tar.gz +Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python, python-setuptools %description ClientForm is a Python module for handling HTML forms on the client side, @@ -30,7 +30,8 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --single-version-externally-managed -O1 \ + --skip-build --root $RPM_BUILD_ROOT %clean @@ -39,12 +40,27 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README.txt -%{python_sitelib}/ClientForm.py -%{python_sitelib}/ClientForm.pyc +%doc COPYING.txt GeneralFAQ.html README.txt README.html examples +%{python_sitelib}/* %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 11 2006 Luke Macken 0.2.2-4 +- Install with --single-version-externally-managed flag +- Add a few more docs + +* Thu May 11 2006 Luke Macken 0.2.2-3 +- Add python-setuptools to BuildRequires + +* Thu May 11 2006 Luke Macken 0.2.2-2 +- Fix version in Source0 + +* Thu May 11 2006 Luke Macken 0.2.2-1 +- Bump to 0.2.2 + +* Tue Feb 14 2006 Josh Boyer 0.1.17-4 +- Bump for FE5 rebuild + * Sun Oct 30 2005 Josh Boyer 0.1.17-3 - Fix up review comments Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Nov 2005 13:45:32 -0000 1.2 +++ sources 12 May 2006 22:28:17 -0000 1.3 @@ -1 +1 @@ -0aa01b3ebcdf800d7ec07c86c7e60b38 ClientForm-0.1.17.tar.gz +2aaff3f85450120b0d3875a221b3cc6e ClientForm-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri May 12 22:28:18 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 12 May 2006 15:28:18 -0700 Subject: rpms/python-clientform/FC-5 .cvsignore, 1.2, 1.3 python-clientform.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605122228.k4CMSKvM019026@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18983/FC-5 Modified Files: .cvsignore python-clientform.spec sources Log Message: Bump FC5 and FC4 branches to 0.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Nov 2005 13:45:32 -0000 1.2 +++ .cvsignore 12 May 2006 22:28:18 -0000 1.3 @@ -1 +1 @@ -ClientForm-0.1.17.tar.gz +ClientForm-0.2.2.tar.gz Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-5/python-clientform.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-clientform.spec 15 Feb 2006 03:48:53 -0000 1.2 +++ python-clientform.spec 12 May 2006 22:28:18 -0000 1.3 @@ -1,18 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-clientform -Version: 0.1.17 +Version: 0.2.2 Release: 4%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages License: BSD URL: http://wwwsearch.sourceforge.net/ClientForm/ -Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-0.1.17.tar.gz +Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python, python-setuptools %description ClientForm is a Python module for handling HTML forms on the client side, @@ -30,7 +30,8 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --single-version-externally-managed -O1 \ + --skip-build --root $RPM_BUILD_ROOT %clean @@ -39,12 +40,24 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README.txt -%{python_sitelib}/ClientForm.py -%{python_sitelib}/ClientForm.pyc +%doc COPYING.txt GeneralFAQ.html README.txt README.html examples +%{python_sitelib}/* %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 11 2006 Luke Macken 0.2.2-4 +- Install with --single-version-externally-managed flag +- Add a few more docs + +* Thu May 11 2006 Luke Macken 0.2.2-3 +- Add python-setuptools to BuildRequires + +* Thu May 11 2006 Luke Macken 0.2.2-2 +- Fix version in Source0 + +* Thu May 11 2006 Luke Macken 0.2.2-1 +- Bump to 0.2.2 + * Tue Feb 14 2006 Josh Boyer 0.1.17-4 - Bump for FE5 rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Nov 2005 13:45:32 -0000 1.2 +++ sources 12 May 2006 22:28:18 -0000 1.3 @@ -1 +1 @@ -0aa01b3ebcdf800d7ec07c86c7e60b38 ClientForm-0.1.17.tar.gz +2aaff3f85450120b0d3875a221b3cc6e ClientForm-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri May 12 22:56:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 15:56:04 -0700 Subject: rpms/perl-Test-Portability-Files/devel perl-Test-Portability-Files.spec, 1.1, 1.2 Message-ID: <200605122256.k4CMu69m019375@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19358 Modified Files: perl-Test-Portability-Files.spec Log Message: Use Makefile.PL temporarily to work around Module::Build breakage. Index: perl-Test-Portability-Files.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/devel/perl-Test-Portability-Files.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Portability-Files.spec 12 May 2006 19:23:03 -0000 1.1 +++ perl-Test-Portability-Files.spec 12 May 2006 22:56:04 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Portability-Files Version: 0.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Check file names portability License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/S/SA/SAPER/Test-Portability-Files-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Module::Build) +#BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,19 +21,24 @@ %setup -q -n Test-Portability-Files-%{version} %build -%{__perl} Build.PL installdirs=vendor -./Build +#%{__perl} Build.PL installdirs=vendor +%{__perl} Makefile.PL INSTALLDIRS=vendor +#./Build +make %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -./Build test +#./Build test +make test %clean rm -rf $RPM_BUILD_ROOT @@ -45,5 +50,8 @@ %{_mandir}/man3/* %changelog +* Fri May 12 2006 Steven Pritchard 0.05-2 +- Use Makefile.PL temporarily to work around Module::Build breakage. + * Fri May 12 2006 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.66. From fedora-extras-commits at redhat.com Fri May 12 23:16:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 16:16:27 -0700 Subject: rpms/perl-Pod-Readme/devel perl-Pod-Readme.spec,1.1,1.2 Message-ID: <200605122316.k4CNGTu2021762@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21745 Modified Files: perl-Pod-Readme.spec Log Message: Use Makefile.PL temporarily to work around Module::Build breakage. Index: perl-Pod-Readme.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/devel/perl-Pod-Readme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Pod-Readme.spec 12 May 2006 20:23:54 -0000 1.1 +++ perl-Pod-Readme.spec 12 May 2006 23:16:27 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Pod-Readme Version: 0.081 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert POD to README file License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Pod-Readme-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Module::Build) +#BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) @@ -29,19 +29,24 @@ %setup -q -n Pod-Readme-%{version} %build -%{__perl} Build.PL installdirs=vendor -./Build +#%{__perl} Build.PL installdirs=vendor +%{__perl} Makefile.PL INSTALLDIRS=vendor +#./Build +make %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -DEVEL_TESTS=1 ./Build test +#DEVEL_TESTS=1 ./Build test +DEVEL_TESTS=1 make test %clean rm -rf $RPM_BUILD_ROOT @@ -55,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Fri May 12 2006 Steven Pritchard 0.081-2 +- Use Makefile.PL temporarily to work around Module::Build breakage. + * Fri May 12 2006 Steven Pritchard 0.081-1 - Specfile autogenerated by cpanspec 1.66. - Remove explicit perl dep. From fedora-extras-commits at redhat.com Sat May 13 00:13:43 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 12 May 2006 17:13:43 -0700 Subject: extras-repoclosure rc-run.py,1.1,1.2 yum.repoclosure.conf,1.1,NONE Message-ID: <200605130013.k4D0DhZd024248@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229 Modified Files: rc-run.py Removed Files: yum.repoclosure.conf Log Message: create yum conffile on-the-fly Index: rc-run.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rc-run.py 30 Apr 2006 11:11:51 -0000 1.1 +++ rc-run.py 13 May 2006 00:13:40 -0000 1.2 @@ -5,6 +5,7 @@ import fcntl, os, sys import datetime, time +import tempfile allreleases = [ '3', '4', '5', 'development' ] @@ -17,14 +18,63 @@ repos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'], '4' : ['fedora-core','fedora-core-updates','fedora-extras'], '5' : ['fedora-core','fedora-core-updates','fedora-extras'], - 'development' : ['fedora-core','fedora-extras'] + 'development' : ['fedora-core-development','fedora-extras'] } +reponames = { 'fedora-core' : 'Fedora Core', + 'fedora-core-development' : 'Fedora Core Development Tree', + 'fedora-core-updates' : 'Fedora Core Released Updates', + 'fedora-extras' : 'Fedora Extras' + } + +# (%s, %s) = (release, arch) +baseurls = { 'fedora-core' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/os/', + 'fedora-core-development' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/', + 'fedora-core-updates' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/updates/%s/%s/', + 'fedora-extras' : 'file:///srv/rpmbuild/extras/tree/extras/%s/%s/' + } + targetarchs = { 'i386' : 'i686', 'x86_64' : 'x86_64', 'ppc' : 'ppc' } +def generateConfig(): + try: + (fd, conffile) = tempfile.mkstemp() + except: + conffile = tempfile.mktemp() + fd = os.open(conffile,os.O_RDWR|os.O_CREAT) + confheader = """[main] +cachedir=/var/cache/yum +debuglevel=2 +logfile=/var/log/yum.log +pkgpolicy=newest +distroverpkg=fedora-release +reposdir=/dev/null +exactarch=1 +obsoletes=1 +retries=20 + +""" + os.write(fd,confheader) + for release in allreleases: + for repo in repos[release]: + for arch in archs[release]: + reposection = """[%s-%s-%s] +name=%s %s - %s +baseurl=%s +enabled=0 + +""" % (repo, release, arch, + reponames[repo], release, arch, + baseurls[repo] % (release,arch)) + os.write(fd,reposection) + + os.close(fd) + return conffile + + def makereport(): try: os.remove(logfilename) @@ -36,7 +86,7 @@ repoid = '%s-%s-%s' % (r,release,arch) rcargs += ('-r %s ' % repoid) # -n, --newest : yum-utils 0.5 - rc = os.system('./rc-modified -q -n -c ./yum.repoclosure.conf %s >> %s' % (rcargs,logfilename)) + rc = os.system('./rc-modified -q -n -c %s %s >> %s' % (conffile,rcargs,logfilename)) if rc: return False return True @@ -77,6 +127,8 @@ sys.exit(22) releases = [release] +conffile = generateConfig() + goodlogs = [] badlogs = [] for release in releases: --- yum.repoclosure.conf DELETED --- From fedora-extras-commits at redhat.com Sat May 13 01:32:42 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:32:42 -0700 Subject: rpms/fedora-package-config-apt - New directory Message-ID: <200605130132.k4D1WioN026947@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26920/fedora-package-config-apt Log Message: Directory /cvs/extras/rpms/fedora-package-config-apt added to the repository From fedora-extras-commits at redhat.com Sat May 13 01:32:43 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:32:43 -0700 Subject: rpms/fedora-package-config-apt/devel - New directory Message-ID: <200605130132.k4D1Wj0A026951@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26920/fedora-package-config-apt/devel Log Message: Directory /cvs/extras/rpms/fedora-package-config-apt/devel added to the repository From fedora-extras-commits at redhat.com Sat May 13 01:33:02 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:33:02 -0700 Subject: rpms/fedora-package-config-apt Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605130133.k4D1X4j4027013@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26979 Added Files: Makefile import.log Log Message: Setup of module fedora-package-config-apt --- NEW FILE Makefile --- # Top level Makefile for module fedora-package-config-apt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 13 01:33:03 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:33:03 -0700 Subject: rpms/fedora-package-config-apt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605130133.k4D1X5fO027014@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26979/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fedora-package-config-apt --- NEW 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 May 13 01:34:06 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:34:06 -0700 Subject: rpms/fedora-package-config-apt import.log,1.1,1.2 Message-ID: <200605130134.k4D1Y8X8027128@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27092 Modified Files: import.log Log Message: auto-import fedora-package-config-apt-5.89-3 on branch devel from fedora-package-config-apt-5.89-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 May 2006 01:33:02 -0000 1.1 +++ import.log 13 May 2006 01:34:06 -0000 1.2 @@ -0,0 +1 @@ +fedora-package-config-apt-5_89-3:HEAD:fedora-package-config-apt-5.89-3.src.rpm:1147484035 From fedora-extras-commits at redhat.com Sat May 13 01:34:07 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:34:07 -0700 Subject: rpms/fedora-package-config-apt/devel fedora-core.list, NONE, 1.1 fedora-extras.list, NONE, 1.1 fedora-package-config-apt.spec, NONE, 1.1 fedora-updates.list, NONE, 1.1 fedora-vendor.list, NONE, 1.1 fedora.conf, NONE, 1.1 Message-ID: <200605130134.k4D1Y9JC027131@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27092/devel Added Files: fedora-core.list fedora-extras.list fedora-package-config-apt.spec fedora-updates.list fedora-vendor.list fedora.conf Log Message: auto-import fedora-package-config-apt-5.89-3 on branch devel from fedora-package-config-apt-5.89-3.src.rpm --- NEW FILE fedora-core.list --- # Fedora Core repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/os/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/debug/ # sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/source/SRPMS/ --- NEW FILE fedora-extras.list --- # Fedora Extras repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/debug/ # Sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/SRPMS/ --- NEW FILE fedora-package-config-apt.spec --- Summary: Fedora configuration files for the apt-rpm package manager Name: fedora-package-config-apt Version: 5.89 Release: 3 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ # 100-149 for sources.list.d Source100: fedora-core.list Source101: fedora-extras.list Source102: fedora-updates.list # 150-199 for apt.conf.d # additional "factory defaults" for fedora Source150: fedora.conf # 200-249 for additional trusted gpg keys # 250-299 for vendor.list.d Source250: fedora-vendor.list BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch # We need an apt that speaks repo-md Requires: apt >= 0.5.15lorg3 Provides: apt-config %description This package contains apt-rpm configuration files for Fedora (Core, Updates and Extras). %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d # install config parts install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/ # Fedora Extras fingerprint install -pm 644 %{SOURCE250} \ %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list # Default source list entries for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/ done %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) # NOTE: no noreplace because we WANT to be able to change the defaults # without user intervention! %config %{_sysconfdir}/apt/apt.conf.d/fedora.conf %config %{_sysconfdir}/apt/sources.list.d/* %config %{_sysconfdir}/apt/vendors.list.d/* %changelog * Thu May 11 2006 Axel Thimm - 5.89-3 - Apply comments from review #191040c3 (by Ville). - Fix summary and description - Config files are arch-independent, so we should become noarch - Create versioned dependency on apt (make sure it's repo-md capable) This creates a circular dependency which should not impose any issues. * Tue May 9 2006 Axel Thimm - 5.89-2 - Fix whitespace (by Panu in bug #191040c1). * Mon May 8 2006 Axel Thimm - 5.89-1 - Split off configuration files from apt. --- NEW FILE fedora-updates.list --- # Fedora Core repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/ # Debug packages #repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/debug/ # sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/SRPMS/ --- NEW FILE fedora-vendor.list --- simple-key "extras" { Fingerprint "5389DD00C5BC516812B4327282ED95041AC70CE6"; Name "Fedora Project "; } --- NEW FILE fedora.conf --- // // These are "factory defaults", DO NOT CHANGE! // APT { // Options for apt-get DistroVerPkg "fedora-release"; }; // Options for the downloading routines Acquire { http::User-Agent "Fedora APT-HTTP/1.3"; }; From fedora-extras-commits at redhat.com Sat May 13 01:35:49 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:35:49 -0700 Subject: owners owners.list,1.986,1.987 Message-ID: <200605130135.k4D1ZpuF027215@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27189 Modified Files: owners.list Log Message: Add fedora-package-config-apt Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.986 retrieving revision 1.987 diff -u -r1.986 -r1.987 --- owners.list 12 May 2006 22:22:07 -0000 1.986 +++ owners.list 13 May 2006 01:35:49 -0000 1.987 @@ -262,6 +262,7 @@ Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org| +Fedora Extras|fedora-package-config-apt|Fedora configuration files for the apt-rpm package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org| Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 13 05:10:32 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Fri, 12 May 2006 22:10:32 -0700 Subject: rpms/torque/devel torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6 Message-ID: <200605130510.k4D5AY8P004278@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4256 Modified Files: torque.spec Added Files: torque-2.1.0p0-mom_sync_jobs-fixes.patch Log Message: * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled torque-2.1.0p0-mom_sync_jobs-fixes.patch: --- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch --- Index: src/server/node_manager.c =================================================================== RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v retrieving revision 1.64 retrieving revision 1.66 diff -r1.64 -r1.66 736,738c736 < if ((pjob == NULL) || < ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) && < (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING))) --- > if (pjob == NULL) 740c738 < /* job is reported by mom but server has no record of job on node */ --- > /* job is reported by mom but server has no record of job */ 742c740 < sprintf(log_buffer,"stray job %s found on %s (substate=%d)", --- > sprintf(log_buffer,"stray job %s found on %s", 744,745c742 < np->nd_name, < (pjob != NULL) ? pjob->ji_qs.ji_substate : -1); --- > np->nd_name); 749,755d745 < if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) < { < log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); < < break; < } < 762c752,772 < strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); --- > if (conn >= 0) > { > if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) > { > log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); > > svr_disconnect(conn); > } > else > { > strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); > > if (issue_Drequest(conn,preq,release_req,0) != 0) > { > /* release_req will free preq and close connection if successful */ > free_br(preq); > > svr_disconnect(conn); > } > } > } 764,766c774 < issue_Drequest(conn,preq,release_req,0); < < /* release_req will free preq and close connection */ --- > DIS_rpp_reset(); Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torque.spec 11 May 2006 21:26:06 -0000 1.5 +++ torque.spec 13 May 2006 05:10:31 -0000 1.6 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -91,6 +91,7 @@ Source4: xpbs.png Source5: xpbsmon.png Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -119,6 +120,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p0 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -423,6 +425,9 @@ %changelog +* Fri May 12 2006 Garrick Staples 2.1.0p0-2 +- fix pbs_server segfault when mom_job_sync is enabled + * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release From fedora-extras-commits at redhat.com Sat May 13 05:13:20 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Fri, 12 May 2006 22:13:20 -0700 Subject: rpms/torque/FC-5 torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6 Message-ID: <200605130513.k4D5DMiI004366@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346 Modified Files: torque.spec Added Files: torque-2.1.0p0-mom_sync_jobs-fixes.patch Log Message: * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled torque-2.1.0p0-mom_sync_jobs-fixes.patch: --- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch --- Index: src/server/node_manager.c =================================================================== RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v retrieving revision 1.64 retrieving revision 1.66 diff -r1.64 -r1.66 736,738c736 < if ((pjob == NULL) || < ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) && < (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING))) --- > if (pjob == NULL) 740c738 < /* job is reported by mom but server has no record of job on node */ --- > /* job is reported by mom but server has no record of job */ 742c740 < sprintf(log_buffer,"stray job %s found on %s (substate=%d)", --- > sprintf(log_buffer,"stray job %s found on %s", 744,745c742 < np->nd_name, < (pjob != NULL) ? pjob->ji_qs.ji_substate : -1); --- > np->nd_name); 749,755d745 < if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) < { < log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); < < break; < } < 762c752,772 < strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); --- > if (conn >= 0) > { > if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) > { > log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); > > svr_disconnect(conn); > } > else > { > strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); > > if (issue_Drequest(conn,preq,release_req,0) != 0) > { > /* release_req will free preq and close connection if successful */ > free_br(preq); > > svr_disconnect(conn); > } > } > } 764,766c774 < issue_Drequest(conn,preq,release_req,0); < < /* release_req will free preq and close connection */ --- > DIS_rpp_reset(); Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torque.spec 11 May 2006 21:58:11 -0000 1.5 +++ torque.spec 13 May 2006 05:13:20 -0000 1.6 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -91,6 +91,7 @@ Source4: xpbs.png Source5: xpbsmon.png Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -119,6 +120,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p0 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -423,6 +425,9 @@ %changelog +* Fri May 12 2006 Garrick Staples 2.1.0p0-2 +- fix pbs_server segfault when mom_job_sync is enabled + * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release From fedora-extras-commits at redhat.com Sat May 13 05:14:04 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Fri, 12 May 2006 22:14:04 -0700 Subject: rpms/torque/FC-4 torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6 Message-ID: <200605130514.k4D5E62r004442@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4422 Modified Files: torque.spec Added Files: torque-2.1.0p0-mom_sync_jobs-fixes.patch Log Message: * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled torque-2.1.0p0-mom_sync_jobs-fixes.patch: --- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch --- Index: src/server/node_manager.c =================================================================== RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v retrieving revision 1.64 retrieving revision 1.66 diff -r1.64 -r1.66 736,738c736 < if ((pjob == NULL) || < ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) && < (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING))) --- > if (pjob == NULL) 740c738 < /* job is reported by mom but server has no record of job on node */ --- > /* job is reported by mom but server has no record of job */ 742c740 < sprintf(log_buffer,"stray job %s found on %s (substate=%d)", --- > sprintf(log_buffer,"stray job %s found on %s", 744,745c742 < np->nd_name, < (pjob != NULL) ? pjob->ji_qs.ji_substate : -1); --- > np->nd_name); 749,755d745 < if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) < { < log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); < < break; < } < 762c752,772 < strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); --- > if (conn >= 0) > { > if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) > { > log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); > > svr_disconnect(conn); > } > else > { > strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); > > if (issue_Drequest(conn,preq,release_req,0) != 0) > { > /* release_req will free preq and close connection if successful */ > free_br(preq); > > svr_disconnect(conn); > } > } > } 764,766c774 < issue_Drequest(conn,preq,release_req,0); < < /* release_req will free preq and close connection */ --- > DIS_rpp_reset(); Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torque.spec 11 May 2006 21:58:50 -0000 1.5 +++ torque.spec 13 May 2006 05:14:04 -0000 1.6 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -91,6 +91,7 @@ Source4: xpbs.png Source5: xpbsmon.png Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -119,6 +120,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p0 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -423,6 +425,9 @@ %changelog +* Fri May 12 2006 Garrick Staples 2.1.0p0-2 +- fix pbs_server segfault when mom_job_sync is enabled + * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release From fedora-extras-commits at redhat.com Sat May 13 05:14:47 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Fri, 12 May 2006 22:14:47 -0700 Subject: rpms/torque/FC-3 torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6 Message-ID: <200605130514.k4D5En9a004518@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4498 Modified Files: torque.spec Added Files: torque-2.1.0p0-mom_sync_jobs-fixes.patch Log Message: * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled torque-2.1.0p0-mom_sync_jobs-fixes.patch: --- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch --- Index: src/server/node_manager.c =================================================================== RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v retrieving revision 1.64 retrieving revision 1.66 diff -r1.64 -r1.66 736,738c736 < if ((pjob == NULL) || < ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) && < (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING))) --- > if (pjob == NULL) 740c738 < /* job is reported by mom but server has no record of job on node */ --- > /* job is reported by mom but server has no record of job */ 742c740 < sprintf(log_buffer,"stray job %s found on %s (substate=%d)", --- > sprintf(log_buffer,"stray job %s found on %s", 744,745c742 < np->nd_name, < (pjob != NULL) ? pjob->ji_qs.ji_substate : -1); --- > np->nd_name); 749,755d745 < if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) < { < log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); < < break; < } < 762c752,772 < strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); --- > if (conn >= 0) > { > if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) > { > log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); > > svr_disconnect(conn); > } > else > { > strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); > > if (issue_Drequest(conn,preq,release_req,0) != 0) > { > /* release_req will free preq and close connection if successful */ > free_br(preq); > > svr_disconnect(conn); > } > } > } 764,766c774 < issue_Drequest(conn,preq,release_req,0); < < /* release_req will free preq and close connection */ --- > DIS_rpp_reset(); Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torque.spec 11 May 2006 21:59:12 -0000 1.5 +++ torque.spec 13 May 2006 05:14:47 -0000 1.6 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -91,6 +91,7 @@ Source4: xpbs.png Source5: xpbsmon.png Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -119,6 +120,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p0 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -423,6 +425,9 @@ %changelog +* Fri May 12 2006 Garrick Staples 2.1.0p0-2 +- fix pbs_server segfault when mom_job_sync is enabled + * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release From fedora-extras-commits at redhat.com Sat May 13 07:17:40 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 13 May 2006 00:17:40 -0700 Subject: comps comps-fe5.xml.in,1.48,1.49 Message-ID: <200605130717.k4D7Hgjq009445@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9428/comps Modified Files: comps-fe5.xml.in Log Message: add childsplay Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- comps-fe5.xml.in 9 May 2006 22:15:42 -0000 1.48 +++ comps-fe5.xml.in 13 May 2006 07:17:39 -0000 1.49 @@ -206,6 +206,7 @@ bzflag celestia cgoban + childsplay crystal-stacker crystal-stacker-themes csmash From fedora-extras-commits at redhat.com Sat May 13 07:18:37 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 13 May 2006 00:18:37 -0700 Subject: comps comps-fe5.xml.in,1.49,1.50 comps-fe6.xml.in,1.12,1.13 Message-ID: <200605130718.k4D7IdfJ009476@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9457/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: move childsplay from Games to Educational Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- comps-fe5.xml.in 13 May 2006 07:17:39 -0000 1.49 +++ comps-fe5.xml.in 13 May 2006 07:18:37 -0000 1.50 @@ -206,7 +206,6 @@ bzflag celestia cgoban - childsplay crystal-stacker crystal-stacker-themes csmash @@ -272,6 +271,7 @@ false true + childsplay drgeo drgeo-doc gcompris Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- comps-fe6.xml.in 11 May 2006 18:29:59 -0000 1.12 +++ comps-fe6.xml.in 13 May 2006 07:18:37 -0000 1.13 @@ -206,7 +206,6 @@ bzflag celestia cgoban - childsplay crystal-stacker crystal-stacker-themes csmash @@ -272,6 +271,7 @@ false true + childsplay drgeo drgeo-doc gcompris From fedora-extras-commits at redhat.com Sat May 13 09:15:44 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 13 May 2006 02:15:44 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo.spec,1.20,1.21 Message-ID: <200605130915.k4D9Fkic014761@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14728/FC-5 Modified Files: xemacs-sumo.spec Log Message: *sigh* Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xemacs-sumo.spec 11 May 2006 16:34:27 -0000 1.20 +++ xemacs-sumo.spec 13 May 2006 09:15:44 -0000 1.21 @@ -1,11 +1,15 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v) +%if "%fedora" >= "6" +%define xemver 21.5 +%else +%define xemver 21.4 +%endif Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 1%{?dist} +Release: 2%{?dist} Summary: XEmacs lisp packages Group: Applications/Editors @@ -128,7 +132,7 @@ rmdir mule-packages/{etc,lisp,man}/skk # not needed (and unusable) with >= 21.5 -if [ "%{xemver}" '>' "21.5." ] ; then +if [ ! "%{xemver}" '<' "21.5" ] ; then %{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" rm -rf mule-packages/{etc,lisp,man}/mule-ucs @@ -224,6 +228,9 @@ %changelog +* Sat May 13 2006 Ville Skytt?? - 20060510-2 +- Try to work around build system quirks in finding the XEmacs version. + * Wed May 10 2006 Ville Skytt?? - 20060510-1 - 2006-05-10; pydoc and latin-unity patches applied upstream. - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). From fedora-extras-commits at redhat.com Sat May 13 09:15:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 13 May 2006 02:15:45 -0700 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.20,1.21 Message-ID: <200605130915.k4D9FlX6014767@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14728/devel Modified Files: xemacs-sumo.spec Log Message: *sigh* Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xemacs-sumo.spec 11 May 2006 16:34:28 -0000 1.20 +++ xemacs-sumo.spec 13 May 2006 09:15:45 -0000 1.21 @@ -1,11 +1,15 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v) +%if "%fedora" >= "6" +%define xemver 21.5 +%else +%define xemver 21.4 +%endif Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 1%{?dist} +Release: 2%{?dist} Summary: XEmacs lisp packages Group: Applications/Editors @@ -128,7 +132,7 @@ rmdir mule-packages/{etc,lisp,man}/skk # not needed (and unusable) with >= 21.5 -if [ "%{xemver}" '>' "21.5." ] ; then +if [ ! "%{xemver}" '<' "21.5" ] ; then %{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" rm -rf mule-packages/{etc,lisp,man}/mule-ucs @@ -224,6 +228,9 @@ %changelog +* Sat May 13 2006 Ville Skytt?? - 20060510-2 +- Try to work around build system quirks in finding the XEmacs version. + * Wed May 10 2006 Ville Skytt?? - 20060510-1 - 2006-05-10; pydoc and latin-unity patches applied upstream. - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). From fedora-extras-commits at redhat.com Sat May 13 09:43:28 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 13 May 2006 02:43:28 -0700 Subject: rpms/fedora-package-config-smart/FC-4 fedora-package-config-smart.spec, 1.3, 1.4 Message-ID: <200605130943.k4D9hUDE016061@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016/FC-4 Modified Files: fedora-package-config-smart.spec Log Message: Fix #191580 and several other syncs with the apt sibling Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/fedora-package-config-smart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-package-config-smart.spec 20 Apr 2006 14:02:46 -0000 1.3 +++ fedora-package-config-smart.spec 13 May 2006 09:43:28 -0000 1.4 @@ -1,16 +1,18 @@ -Summary: Configuration files for the smart package manager +Summary: Fedora configuration files for the smart package manager Name: fedora-package-config-smart Version: 4 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires: smart Provides: smart-config %description -This package contains configuration files for smart. +This package contains smart configuration files for Fedora (Core, +Updates and Extras). %prep %setup -q @@ -36,6 +38,9 @@ %config(noreplace) %{_sysconfdir}/smart/channels/*.channel %changelog +* Sat May 13 2006 Axel Thimm - 4-5 +- Sync with fedora-package-config-apt, see also #191580. + * Thu Apr 20 2006 Axel Thimm - 4-4 - Add virtual smart-config provides (#175630 comment 13). From fedora-extras-commits at redhat.com Sat May 13 09:43:29 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 13 May 2006 02:43:29 -0700 Subject: rpms/fedora-package-config-smart/FC-5 fedora-package-config-smart.spec, 1.2, 1.3 Message-ID: <200605130943.k4D9hV5G016063@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016/FC-5 Modified Files: fedora-package-config-smart.spec Log Message: Fix #191580 and several other syncs with the apt sibling Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-5/fedora-package-config-smart.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-package-config-smart.spec 20 Apr 2006 14:02:49 -0000 1.2 +++ fedora-package-config-smart.spec 13 May 2006 09:43:29 -0000 1.3 @@ -1,16 +1,18 @@ -Summary: Configuration files for the smart package manager +Summary: Fedora configuration files for the smart package manager Name: fedora-package-config-smart Version: 5 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires: smart Provides: smart-config %description -This package contains configuration files for smart. +This package contains smart configuration files for Fedora (Core, +Updates and Extras). %prep %setup -q @@ -36,6 +38,9 @@ %config(noreplace) %{_sysconfdir}/smart/channels/*.channel %changelog +* Sat May 13 2006 Axel Thimm - 5-6 +- Sync with fedora-package-config-apt, see also #191580. + * Thu Apr 20 2006 Axel Thimm - 5-5 - Add virtual smart-config provides (#175630 comment 13). From fedora-extras-commits at redhat.com Sat May 13 09:43:29 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 13 May 2006 02:43:29 -0700 Subject: rpms/fedora-package-config-smart/devel fedora-package-config-smart.spec, 1.2, 1.3 Message-ID: <200605130943.k4D9hVa1016067@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016/devel Modified Files: fedora-package-config-smart.spec Log Message: Fix #191580 and several other syncs with the apt sibling Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/fedora-package-config-smart.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-package-config-smart.spec 20 Apr 2006 14:03:00 -0000 1.2 +++ fedora-package-config-smart.spec 13 May 2006 09:43:29 -0000 1.3 @@ -1,16 +1,18 @@ -Summary: Configuration files for the smart package manager +Summary: Fedora configuration files for the smart package manager Name: fedora-package-config-smart Version: 5.89 -Release: 6 +Release: 7 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires: smart Provides: smart-config %description -This package contains configuration files for smart. +This package contains smart configuration files for Fedora (Core, +Updates and Extras). %prep %setup -q @@ -36,6 +38,9 @@ %config(noreplace) %{_sysconfdir}/smart/channels/*.channel %changelog +* Sat May 13 2006 Axel Thimm - 5.89-7 +- Sync with fedora-package-config-apt, see also #191580. + * Thu Apr 20 2006 Axel Thimm - 5.89-6 - Update to rawhide config. From fedora-extras-commits at redhat.com Sat May 13 10:49:19 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sat, 13 May 2006 03:49:19 -0700 Subject: rpms/abiword/FC-4 abiword-2.4.4-fontcrash.patch, NONE, 1.1 abiword.spec, 1.24, 1.25 Message-ID: <200605131049.k4DAnL3o018786@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18765 Modified Files: abiword.spec Added Files: abiword-2.4.4-fontcrash.patch Log Message: Fix crash on exit abiword-2.4.4-fontcrash.patch: --- NEW FILE abiword-2.4.4-fontcrash.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp 2005-07-05 16:08:20.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp 2006-05-12 21:44:57.000000000 +0200 @@ -133,11 +133,11 @@ { DELETEP(m_pUnixToolbarIcons); + delete m_fontManager; + #if FC_MINOR > 2 FcFini(); #endif - - delete m_fontManager; } bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- abiword.spec 8 May 2006 11:15:20 -0000 1.24 +++ abiword.spec 13 May 2006 10:49:19 -0000 1.25 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -44,6 +44,7 @@ Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.4-docbuild.patch Patch3: abiword-2.4.4-x86_64.patch +Patch4: abiword-2.4.4-fontcrash.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -55,6 +56,7 @@ %patch1 -p1 -b .desktop %patch2 -p1 -b .docbuild %patch3 -p1 -b .x86_64 +%patch4 -p1 -b .fontcrash %build cd abi @@ -138,6 +140,9 @@ %{_datadir}/icons/*png %changelog +* Sat May 13 2006 Marc Maurer - 1:2.4.4-4.fc4 +- Fix bug 182399 - Abiword crashes on exit + * Mon May 08 2006 Marc Maurer - 1:2.4.4-3.fc4 - Fix bug 190591 - crash on x86_64 machines when saving a document From fedora-extras-commits at redhat.com Sat May 13 12:38:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 13 May 2006 05:38:58 -0700 Subject: rpms/gcompris/devel gcompris-7.4-xf86vidmode.patch,1.3,1.4 Message-ID: <200605131239.k4DCd0Km024123@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24103 Modified Files: gcompris-7.4-xf86vidmode.patch Log Message: Minor patch cleanup gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcompris-7.4-xf86vidmode.patch 11 May 2006 14:43:20 -0000 1.3 +++ gcompris-7.4-xf86vidmode.patch 13 May 2006 12:38:57 -0000 1.4 @@ -1,550 +1,217 @@ ---- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-11 09:42:18.000000000 +0200 -@@ -159,6 +159,12 @@ +--- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-13 14:16:46.000000000 +0200 +@@ -1094,7 +1094,7 @@ + --disable-sdltest Do not try to compile and run a test SDL program + --disable-glibtest do not try to compile and run a test GLIB program + --disable-rpath do not hardcode runtime library paths +- --disable-xrandr Turn off xrandr ++ --disable-xf86vidmode Turn off xf86vidmode + --enable-debug Turn on debugging messages + --disable-sqlite Turn off sqlite (will disable profile) + --enable-py-build-only Skip python modules tests. (Useful if you just need +@@ -23630,7 +23630,7 @@ + /usr/openwin/share/include' - void gcompris_confirm_stop (void); + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23638,7 +23638,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -23665,7 +23665,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime); -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); -+ - /* Trace Log */ - #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" - #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" ---- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-11 09:42:18.000000000 +0200 -@@ -33,12 +33,13 @@ + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -23686,11 +23686,11 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -23769,23 +23769,23 @@ + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi - #include "cursor.h" +-# Check whether --enable-xrandr or --disable-xrandr was given. +-if test "${enable_xrandr+set}" = set; then +- enableval="$enable_xrandr" +- USE_XRANDR="$enableval" ++# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. ++if test "${enable_xf86vidmode+set}" = set; then ++ enableval="$enable_xf86vidmode" ++ USE_XF86VM="$enableval" + else +- USE_XRANDR="yes" ++ USE_XF86VM="yes" + fi; +-found_randr=no +-if test "x$USE_XRANDR" == "xyes" ; then +- RANDR_LIBS= +- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 +-echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then ++found_xf86vidmode=no ++if test "x$USE_XF86VM" == "xyes" ; then ++ XF86VM_LIBS= ++ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ++echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 ++if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" ++LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23799,11 +23799,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char XRRSetScreenConfigAndRate (); ++char XF86VidModeQueryExtension (); + int + main () + { +-XRRSetScreenConfigAndRate (); ++XF86VidModeQueryExtension (); + ; + return 0; + } +@@ -23830,23 +23830,23 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes ++ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 --/* For XRANDR Support */ --#ifdef XRANDR -+/* For XF86_VIDMODE Support */ -+#ifdef XF86_VIDMODE - #include +-ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no ++ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 +-if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then +- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +-echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +-if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 ++if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then ++ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 ++if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -23857,7 +23857,7 @@ + /* end confdefs.h. */ #include + -#include --#include -+#include -+#include -+#include - #endif ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -23881,38 +23881,38 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_header_X11_extensions_Xrandr_h=yes ++ ac_cv_header_X11_extensions_xf86vmode_h=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 - #if defined _WIN32 || defined __WIN32__ -@@ -104,7 +105,7 @@ - static int popt_aalias = FALSE; - static int popt_difficulty_filter = FALSE; - static int popt_debug = FALSE; --static int popt_noxrandr = FALSE; -+static int popt_noxf86vm = FALSE; - static char *popt_root_menu = NULL; - static char *popt_local_activity = NULL; - static int popt_administration = FALSE; -@@ -139,8 +140,8 @@ - N_("Print the version of " PACKAGE), NULL}, - {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, - N_("Use the antialiased canvas (slower)."), NULL}, -- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, -- N_("Disable XRANDR (No screen resolution change)."), NULL}, -+ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, -+ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, - {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, - N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, - {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, -@@ -184,29 +185,19 @@ - }; +-ac_cv_header_X11_extensions_Xrandr_h=no ++ac_cv_header_X11_extensions_xf86vmode_h=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +-if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then +- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes ++echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 ++if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then ++ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes + fi - /* XRandr Stuff */ --#ifdef XRANDR --typedef struct -+#ifdef XF86_VIDMODE -+static struct - { -- gboolean xr_lock_updates; -+ int vidmode_available; -+ XF86VidModeModeInfo orig_mode; -+ int orig_viewport_x; -+ int orig_viewport_y; -+ int width; -+ int height; -+} XF86VidModeData = { 0, { 0 }, 0, 0 }; -- XRRScreenConfiguration *xr_screen_conf; -- -- XRRScreenSize *xr_sizes; -- int xr_nsize; -- SizeID xr_current_size; -- -- Rotation xr_rotations; -- Rotation xr_current_rotation; -- --} XRANDRData; -- --static SizeID xr_previous_size; --static gboolean xr_previous_size_set = FALSE; --static XRANDRData *xrandr = NULL; -- --static void xrandr_init ( XRANDRData *xrandr ); --static void xrandr_get_config ( XRANDRData *xrandr ); --static void xrandr_set_config( XRANDRData *xrandr ); -+static void xf86_vidmode_init( void ); -+static void xf86_vidmode_set_fullscreen( int state ); - #endif + fi - /****************************************************************************/ -@@ -441,8 +432,8 @@ - gint screen_height, screen_width; - GtkWidget *vbox; --#ifdef XRANDR -- xrandr = g_new0 (XRANDRData, 1); -+#ifdef XF86_VIDMODE -+ xf86_vidmode_init(); - #endif +- if test "x$found_randr" = "xno"; then +- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 +-echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} ++ if test "x$found_xf86vidmode" = "xno"; then ++ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 ++echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} + else - gcompris_set_fullscreen(properties->fullscreen); -@@ -450,10 +441,10 @@ - screen_height = gdk_screen_height(); - screen_width = gdk_screen_width(); + cat >>confdefs.h <<_ACEOF +-#define XRANDR 1 ++#define XF86_VIDMODE 1 + _ACEOF --#ifdef XRANDR -- if(properties->fullscreen && !properties->noxrandr) { -- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; -- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; -+#ifdef XF86_VIDMODE -+ if(properties->fullscreen && !properties->noxf86vm) { -+ screen_width = XF86VidModeData.width; -+ screen_height = XF86VidModeData.height; - } - #endif + fi + fi -@@ -811,39 +802,11 @@ - */ - void gcompris_set_fullscreen(gboolean state) - { -- -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(state); -+#endif - if(state) - { --#ifdef XRANDR -- gint i; -- /* Search the 800x600 Resolution */ -- if(properties->fullscreen && !properties->noxrandr) { -- -- g_warning("XRANDR Is compiled in. Searching a good resolution"); -- -- /* Check if XRANDR is available */ -- if (!properties->noxrandr) { -- xrandr_get_config ( xrandr ); -- xr_previous_size = (SizeID)xrandr->xr_current_size; -- for (i = 0; i < xrandr->xr_nsize; i++) { -- if(xrandr->xr_sizes[i].width == BOARDWIDTH && -- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) -- { -- xrandr->xr_current_size = (SizeID)i; -- xr_previous_size_set = TRUE; -- break; -- } -- } -- } -- -- /* Set the Fullscreen now */ -- if(xr_previous_size_set) -- { -- if(is_mapped) -- xrandr_set_config( xrandr ); -- } -- } --#endif - gdk_window_set_decorations (window->window, 0); - gdk_window_set_functions (window->window, 0); - gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +814,6 @@ - } - else - { --#ifdef XRANDR -- /* Set back the original screen size */ -- if(xr_previous_size_set && !properties->noxrandr) -- { -- /* Need to refresh our config or xrandr api will reject us */ -- if(xrandr) -- { -- xrandr_get_config ( xrandr ); -- xrandr->xr_current_size = (SizeID)xr_previous_size; -- xrandr_set_config( xrandr ); -- } -- } -- xr_previous_size_set = FALSE; --#endif - /* The hide must be done at least for KDE */ - gtk_widget_hide (window); - gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -876,6 +825,42 @@ +-LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" ++LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" - } + ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime) -+{ -+ int retval; -+ -+ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); -+ if (retval != GDK_GRAB_SUCCESS) -+ return retval; -+ -+#ifdef XF86_VIDMODE -+ /* When fullscreen override mouse grab with our own which -+ confines the cursor to our fullscreen window */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, -+ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+ -+ return retval; -+} -+ -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) -+{ -+ gnome_canvas_item_ungrab(item, etime); -+#ifdef XF86_VIDMODE -+ /* When fullscreen restore the normal mouse grab which avoids -+ scrolling the virtual desktop */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+} -+ - void gcompris_exit() - { - /* Do not loopback in exit */ -@@ -1044,68 +1029,131 @@ - g_printerr ("%s: %s\n\n", "gcompris", message); - } +@@ -28651,7 +28651,7 @@ + echo "SDL LIBS = found" + fi --#ifdef XRANDR -+#ifdef XF86_VIDMODE - /* -- * XRANDR STUFF -- * ------------ -+ * XF86VidMode STUFF -+ * ----------------- - */ - static void --xrandr_init ( XRANDRData *data ) -+xf86_vidmode_init ( void ) - { -- if(data==NULL) -+ int i,j; -+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) -+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); -+ -+ if (properties->noxf86vm) - return; -- -- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); -- -- if (data->xr_screen_conf == NULL) -+ -+ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, -+ &XF86VidModeData.orig_viewport_x)) -+ properties->noxf86vm = TRUE; -+ -+ if (properties->noxf86vm) -+ g_warning("XF86VidMode not available"); -+ else - { -- g_warning("XRANDR not available"); -- properties->noxrandr = TRUE; -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ g_warning("XF86VidMode support enabled"); - } -- else -- g_warning("XRANDR support enabled"); -- } -- --static void --xrandr_get_config ( XRANDRData *data ) --{ -- if(data==NULL) -- return; -- -- xrandr_init (data); -- -- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, -- &data->xr_current_rotation); -- -- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); -- -- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, -- &data->xr_current_rotation); - } +-echo "XRANDR option (--enable-xrandr) = $found_randr" ++echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" -+ - static void --xrandr_set_config( XRANDRData *data ) -+xf86_vidmode_set_fullscreen ( int state ) - { -- Status status = RRSetConfigFailed; -+ int i; -+ XF86VidModeModeLine mode; + echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" -- if(data==NULL) -+ if (properties->noxf86vm) - return; +--- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-13 14:16:46.000000000 +0200 +@@ -141,5 +141,5 @@ + /* Version number of package */ + #undef VERSION -- if (data->xr_lock_updates) return; -- -- status = XRRSetScreenConfig (GDK_DISPLAY(), -- data->xr_screen_conf, -- GDK_ROOT_WINDOW(), -- data->xr_current_size, -- data->xr_current_rotation, -- CurrentTime); -- -- if(status) { -- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", -- (int)status); -- } -- return; -- -+ if (state) -+ { -+ XF86VidModeModeInfo **modes; -+ int mode_count; -+ gint x,y; -+ -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode)) -+ { -+ /* If we can't get the currentmode force setting of a new mode. */ -+ mode.hdisplay = 0; -+ } -+ -+ /* Do we need to switch? */ -+ if ((mode.hdisplay != BOARDWIDTH) || -+ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ mode_count = 0; -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot switch resolution"); -+ break; -+ } -+ } -+ if (i == mode_count) -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ if (mode_count) -+ XFree(modes); -+ } -+ /* We need to grab the pointer before setting the viewport otherwise -+ setviewport may get "canceled" by the pointer being outside the -+ current viewport. */ -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+ -+ gdk_window_get_position(window->window, &x, &y); -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), x, y)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else -+ { -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode) || -+ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || -+ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) -+ { -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot restore original resolution"); -+ -+ } -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); -+ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, -+ XF86VidModeData.orig_viewport_y)) -+ g_warning("XF86VidMode couldnot restore original viewport"); -+ } - } - #endif - -@@ -1185,9 +1233,9 @@ - properties->fullscreen = TRUE; - } - -- if (popt_noxrandr) -+ if (popt_noxf86vm) - { -- properties->noxrandr = TRUE; -+ properties->noxf86vm = TRUE; - } - - if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-11 09:42:18.000000000 +0200 -@@ -160,7 +160,7 @@ - tmp->fx = 1; - tmp->screensize = 1; - tmp->fullscreen = 1; -- tmp->noxrandr = FALSE; -+ tmp->noxf86vm = FALSE; - tmp->timer = 1; - tmp->skin = "babytoy"; - tmp->key = "default"; -@@ -244,8 +244,8 @@ - } else if(!strcmp(value.v_identifier, "fullscreen")) { - if(!scan_get_int(scanner, &tmp->fullscreen)) - g_warning("Config file parsing error on token %s", token); -- } else if(!strcmp(value.v_identifier, "noxrandr")) { -- if(!scan_get_int(scanner, &tmp->noxrandr)) -+ } else if(!strcmp(value.v_identifier, "noxf86vm")) { -+ if(!scan_get_int(scanner, &tmp->noxf86vm)) - g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "timer")) { - if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-11 09:42:17.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-11 09:42:18.000000000 +0200 -@@ -28,7 +28,7 @@ - gint music; - gint fx; - gint fullscreen; -- gint noxrandr; -+ gint noxf86vm; - gint screensize; - gint defaultcursor; - gint timer; ---- gcompris-7.4/src/gcompris/board_config.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 -+++ gcompris-7.4/src/gcompris/board_config.c 2006-05-11 12:04:27.000000000 +0200 -@@ -125,6 +125,34 @@ - - } - -+#ifdef XF86_VIDMODE -+static GdkEventConfigure gcompris_last_configure_event; -+ -+static gint gcompris_conf_window_configured(GtkWindow *window, -+ GdkEventConfigure *event, gpointer param) -+{ -+ gint new_x, new_y; -+ double screen_width, screen_height; -+ /* Because we call gtk_window_move, we cause a configure event. Filter out -+ identical events to avoid looping. */ -+ if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) -+ { -+ gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( -+ gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); -+ /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ -+ screen_height -= 30; -+ new_x = ((gint)screen_width - event->width) / 2; -+ new_y = ((gint)screen_height - event->height) / 2; -+ /* printf("screen %dx%d, window %dx%d, place %dx%d\n", (int)screen_width, (int)screen_height, event->width, event->height, new_x, new_y); */ -+ gtk_window_move (conf_window, new_x, new_y); -+ memcpy(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure)); -+ } -+ -+ /* Act as if we aren't there / aren't hooked up */ -+ return FALSE; -+} -+#endif -+ - GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) - { - GtkWidget *header; -@@ -145,7 +173,18 @@ - - - /* parameters */ -- gtk_window_set_position (conf_window, -+#ifdef XF86_VIDMODE -+ if (gcompris_get_properties()->fullscreen && -+ !gcompris_get_properties()->noxf86vm) -+ { -+ memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); -+ gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); -+ gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", -+ GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); -+ } -+ else -+#endif -+ gtk_window_set_position (conf_window, - GTK_WIN_POS_CENTER_ALWAYS); - - gtk_widget_show(GTK_WIDGET(conf_window)); ---- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 -+++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-11 09:42:22.000000000 +0200 -@@ -103,6 +103,11 @@ - options.append('--nostampcontrols') - - gcompris.sound.close() -+ -+ # release pointergrab if running fullscreen, tuxpaint wants to grab the -+ # pointer itself -+ if (Prop.fullscreen and not Prop.noxf86vm): -+ gtk.gdk.pointer_ungrab() - - #self.window.set_property("accept-focus", 0) - #self.window.set_keep_below(False) -@@ -115,7 +120,7 @@ - gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) - return - -- gcompris.child_watch_add(pid, child_callback, None) -+ gcompris.child_watch_add(pid, child_callback, self) - - gcompris.bar_set(0) - gcompris.bar_hide(1) -@@ -221,6 +226,10 @@ - return default_config_dict - - def child_callback(fd, cond, data): -+ # restore pointergrab if running fullscreen -+ if (gcompris.get_properties().fullscreen and -+ not gcompris.get_properties().noxf86vm): -+ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) - #global board - #board.window.set_property("accept-focus", 1) - #board.window.set_keep_above(False) ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-11 09:42:18.000000000 +0200 +-/* XRANDR Available */ +-#undef XRANDR ++/* XF86VidMode Available */ ++#undef XF86_VIDMODE +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-13 14:16:46.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-13 14:16:46.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } @@ -557,7 +224,7 @@ return Py_True; } else { --- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 -+++ gcompris-7.4/src/boards/draw.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-13 14:16:46.000000000 +0200 @@ -2008,7 +2008,7 @@ case 1: fleur = gdk_cursor_new(get_resize_cursor(anchor)); @@ -595,7 +262,7 @@ draggingItem = NULL; --- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-13 14:16:46.000000000 +0200 @@ -472,7 +472,7 @@ gnome_canvas_item_raise_to_top(data->item); @@ -615,7 +282,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 -+++ gcompris-7.4/src/boards/clockgame.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-13 14:16:46.000000000 +0200 @@ -663,7 +663,7 @@ y = item_y; @@ -635,7 +302,7 @@ } break; --- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-13 14:16:46.000000000 +0200 @@ -645,7 +645,7 @@ gnome_canvas_item_raise_to_top(data->item_text); @@ -655,7 +322,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 -+++ gcompris-7.4/src/boards/chess.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-13 14:16:46.000000000 +0200 @@ -839,7 +839,7 @@ fleur = gdk_cursor_new(GDK_FLEUR); @@ -675,7 +342,7 @@ position_display(position); --- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 -+++ gcompris-7.4/src/boards/shapegame.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-13 14:16:46.000000000 +0200 @@ -1103,7 +1103,7 @@ gnome_canvas_item_raise_to_top(shape_list_root_item); gnome_canvas_item_raise_to_top(item); @@ -713,7 +380,7 @@ dragging = FALSE; --- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 -+++ gcompris-7.4/src/boards/planegame.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-13 14:16:46.000000000 +0200 @@ -578,7 +578,7 @@ y = item_y; @@ -733,7 +400,7 @@ } break; --- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 -+++ gcompris-7.4/src/boards/enumerate.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-13 14:16:46.000000000 +0200 @@ -522,7 +522,7 @@ gnome_canvas_item_raise_to_top(item); @@ -753,7 +420,7 @@ } break; --- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 -+++ gcompris-7.4/src/boards/clickgame.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-13 14:16:46.000000000 +0200 @@ -598,7 +598,7 @@ y = item_y; @@ -773,7 +440,7 @@ } break; --- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 -+++ gcompris-7.4/src/boards/traffic.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-13 14:16:46.000000000 +0200 @@ -417,7 +417,7 @@ cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); else @@ -801,220 +468,579 @@ hit=0; moving=FALSE; } ---- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-11 09:42:18.000000000 +0200 -@@ -1094,7 +1094,7 @@ - --disable-sdltest Do not try to compile and run a test SDL program - --disable-glibtest do not try to compile and run a test GLIB program - --disable-rpath do not hardcode runtime library paths -- --disable-xrandr Turn off xrandr -+ --disable-xf86vidmode Turn off xf86vidmode - --enable-debug Turn on debugging messages - --disable-sqlite Turn off sqlite (will disable profile) - --enable-py-build-only Skip python modules tests. (Useful if you just need -@@ -23630,7 +23630,7 @@ - /usr/openwin/share/include' +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-13 14:16:46.000000000 +0200 +@@ -17,7 +17,7 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # + import gnome +-import gnome.canvas ++import gnomecanvas + import gcompris + import gcompris.utils + import gcompris.bonus +@@ -69,7 +69,7 @@ + self.config_dict.update(gcompris.get_board_conf()) + + self.rootitem = self.gcomprisBoard.canvas.root().add( +- gnome.canvas.CanvasGroup, ++ gnomecanvas.CanvasGroup, + x=0.0, + y=0.0 + ) +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen and not Prop.noxf86vm): ++ gtk.gdk.pointer_ungrab() - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23638,7 +23638,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -23665,7 +23665,7 @@ - sed 's/^/| /' conftest.$ac_ext >&5 + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) - for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -23686,11 +23686,11 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - int - main () - { --XtMalloc (0) -+XrmInitialize () - ; - return 0; - } -@@ -23769,23 +23769,23 @@ - echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 - fi + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -124,7 +129,7 @@ + gcompris.skin.image_to_skin("gcompris-bg.jpg")) --# Check whether --enable-xrandr or --disable-xrandr was given. --if test "${enable_xrandr+set}" = set; then -- enableval="$enable_xrandr" -- USE_XRANDR="$enableval" -+# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. -+if test "${enable_xf86vidmode+set}" = set; then -+ enableval="$enable_xf86vidmode" -+ USE_XF86VM="$enableval" - else -- USE_XRANDR="yes" -+ USE_XF86VM="yes" - fi; --found_randr=no --if test "x$USE_XRANDR" == "xyes" ; then -- RANDR_LIBS= -- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 --echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 --if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then -+found_xf86vidmode=no -+if test "x$USE_XF86VM" == "xyes" ; then -+ XF86VM_LIBS= -+ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 -+if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" -+LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23799,11 +23799,11 @@ + textItem = self.rootitem.add( +- gnome.canvas.CanvasText, ++ gnomecanvas.CanvasText, + text = _("Waiting for Tuxpaint to finish"), + x = gcompris.BOARD_WIDTH/2, + y = 185, +@@ -221,6 +226,10 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen and ++ not gcompris.get_properties().noxf86vm): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-13 14:16:46.000000000 +0200 +@@ -159,6 +159,12 @@ + + void gcompris_confirm_stop (void); + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" +--- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-13 14:20:00.000000000 +0200 +@@ -33,12 +33,12 @@ + + #include "cursor.h" + +-/* For XRANDR Support */ +-#ifdef XRANDR ++/* For XF86_VIDMODE Support */ ++#ifdef XF86_VIDMODE + #include + #include +-#include +-#include ++#include ++#include #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char XRRSetScreenConfigAndRate (); -+char XF86VidModeQueryExtension (); - int - main () + + #if defined _WIN32 || defined __WIN32__ +@@ -104,7 +104,7 @@ + static int popt_aalias = FALSE; + static int popt_difficulty_filter = FALSE; + static int popt_debug = FALSE; +-static int popt_noxrandr = FALSE; ++static int popt_noxf86vm = FALSE; + static char *popt_root_menu = NULL; + static char *popt_local_activity = NULL; + static int popt_administration = FALSE; +@@ -139,8 +139,8 @@ + N_("Print the version of " PACKAGE), NULL}, + {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, + N_("Use the antialiased canvas (slower)."), NULL}, +- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, +- N_("Disable XRANDR (No screen resolution change)."), NULL}, ++ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, ++ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, + {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, + N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, + {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, +@@ -184,29 +184,19 @@ + }; + + /* XRandr Stuff */ +-#ifdef XRANDR +-typedef struct ++#ifdef XF86_VIDMODE ++static struct { --XRRSetScreenConfigAndRate (); -+XF86VidModeQueryExtension (); - ; - return 0; - } -@@ -23830,23 +23830,23 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes -+ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 +- gboolean xr_lock_updates; ++ int vidmode_available; ++ XF86VidModeModeInfo orig_mode; ++ int orig_viewport_x; ++ int orig_viewport_y; ++ int width; ++ int height; ++} XF86VidModeData = { 0, { 0 }, 0, 0 }; --ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no -+ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 --echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 --if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then -- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 --echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 --if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 -+if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then -+ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 -+echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 -+if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -23857,7 +23857,7 @@ - /* end confdefs.h. */ - #include +- XRRScreenConfiguration *xr_screen_conf; +- +- XRRScreenSize *xr_sizes; +- int xr_nsize; +- SizeID xr_current_size; +- +- Rotation xr_rotations; +- Rotation xr_current_rotation; +- +-} XRANDRData; +- +-static SizeID xr_previous_size; +-static gboolean xr_previous_size_set = FALSE; +-static XRANDRData *xrandr = NULL; +- +-static void xrandr_init ( XRANDRData *xrandr ); +-static void xrandr_get_config ( XRANDRData *xrandr ); +-static void xrandr_set_config( XRANDRData *xrandr ); ++static void xf86_vidmode_init( void ); ++static void xf86_vidmode_set_fullscreen( int state ); + #endif --#include -+#include - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -23881,38 +23881,38 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_header_X11_extensions_Xrandr_h=yes -+ ac_cv_header_X11_extensions_xf86vmode_h=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 + /****************************************************************************/ +@@ -441,8 +431,8 @@ + gint screen_height, screen_width; + GtkWidget *vbox; --ac_cv_header_X11_extensions_Xrandr_h=no -+ac_cv_header_X11_extensions_xf86vmode_h=no - fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 --echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 --if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then -- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes -+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 -+if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then -+ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes - fi +-#ifdef XRANDR +- xrandr = g_new0 (XRANDRData, 1); ++#ifdef XF86_VIDMODE ++ xf86_vidmode_init(); + #endif + gcompris_set_fullscreen(properties->fullscreen); +@@ -450,10 +440,10 @@ + screen_height = gdk_screen_height(); + screen_width = gdk_screen_width(); - fi +-#ifdef XRANDR +- if(properties->fullscreen && !properties->noxrandr) { +- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; +- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; ++#ifdef XF86_VIDMODE ++ if(properties->fullscreen && !properties->noxf86vm) { ++ screen_width = XF86VidModeData.width; ++ screen_height = XF86VidModeData.height; + } + #endif +@@ -811,39 +801,11 @@ + */ + void gcompris_set_fullscreen(gboolean state) + { +- ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { +-#ifdef XRANDR +- gint i; +- /* Search the 800x600 Resolution */ +- if(properties->fullscreen && !properties->noxrandr) { +- +- g_warning("XRANDR Is compiled in. Searching a good resolution"); +- +- /* Check if XRANDR is available */ +- if (!properties->noxrandr) { +- xrandr_get_config ( xrandr ); +- xr_previous_size = (SizeID)xrandr->xr_current_size; +- for (i = 0; i < xrandr->xr_nsize; i++) { +- if(xrandr->xr_sizes[i].width == BOARDWIDTH && +- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) +- { +- xrandr->xr_current_size = (SizeID)i; +- xr_previous_size_set = TRUE; +- break; +- } +- } +- } +- +- /* Set the Fullscreen now */ +- if(xr_previous_size_set) +- { +- if(is_mapped) +- xrandr_set_config( xrandr ); +- } +- } +-#endif + gdk_window_set_decorations (window->window, 0); + gdk_window_set_functions (window->window, 0); + gtk_widget_set_uposition (window, 0, 0); +@@ -851,20 +813,6 @@ + } + else + { +-#ifdef XRANDR +- /* Set back the original screen size */ +- if(xr_previous_size_set && !properties->noxrandr) +- { +- /* Need to refresh our config or xrandr api will reject us */ +- if(xrandr) +- { +- xrandr_get_config ( xrandr ); +- xrandr->xr_current_size = (SizeID)xr_previous_size; +- xrandr_set_config( xrandr ); +- } +- } +- xr_previous_size_set = FALSE; +-#endif + /* The hide must be done at least for KDE */ + gtk_widget_hide (window); + gdk_window_set_decorations (window->window, GDK_DECOR_ALL); +@@ -876,6 +824,42 @@ + + } + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1028,131 @@ + g_printerr ("%s: %s\n\n", "gcompris", message); + } + +-#ifdef XRANDR ++#ifdef XF86_VIDMODE + /* +- * XRANDR STUFF +- * ------------ ++ * XF86VidMode STUFF ++ * ----------------- + */ + static void +-xrandr_init ( XRANDRData *data ) ++xf86_vidmode_init ( void ) + { +- if(data==NULL) ++ int i,j; ++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) ++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); ++ ++ if (properties->noxf86vm) + return; +- +- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); +- +- if (data->xr_screen_conf == NULL) ++ ++ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, ++ &XF86VidModeData.orig_viewport_y)) ++ properties->noxf86vm = TRUE; ++ ++ if (properties->noxf86vm) ++ g_warning("XF86VidMode not available"); ++ else + { +- g_warning("XRANDR not available"); +- properties->noxrandr = TRUE; ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ g_warning("XF86VidMode support enabled"); + } +- else +- g_warning("XRANDR support enabled"); +- } +- +-static void +-xrandr_get_config ( XRANDRData *data ) +-{ +- if(data==NULL) +- return; +- +- xrandr_init (data); +- +- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, +- &data->xr_current_rotation); +- +- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); +- +- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, +- &data->xr_current_rotation); + } -- if test "x$found_randr" = "xno"; then -- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 --echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} -+ if test "x$found_xf86vidmode" = "xno"; then -+ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 -+echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} - else ++ + static void +-xrandr_set_config( XRANDRData *data ) ++xf86_vidmode_set_fullscreen ( int state ) + { +- Status status = RRSetConfigFailed; ++ int i; ++ XF86VidModeModeLine mode; - cat >>confdefs.h <<_ACEOF --#define XRANDR 1 -+#define XF86_VIDMODE 1 - _ACEOF +- if(data==NULL) ++ if (properties->noxf86vm) + return; - fi - fi +- if (data->xr_lock_updates) return; +- +- status = XRRSetScreenConfig (GDK_DISPLAY(), +- data->xr_screen_conf, +- GDK_ROOT_WINDOW(), +- data->xr_current_size, +- data->xr_current_rotation, +- CurrentTime); +- +- if(status) { +- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", +- (int)status); +- } +- return; +- ++ if (state) ++ { ++ XF86VidModeModeInfo **modes; ++ int mode_count; ++ gint x,y; ++ ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode)) ++ { ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; ++ } ++ ++ /* Do we need to switch? */ ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; ++ ++ for (i = 0; i < mode_count; i++) ++ { ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; ++ } ++ } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); ++ } ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ gdk_window_get_position(window->window, &x, &y); ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), x, y)) ++ g_warning("XF86VidMode couldnot change viewport"); ++ } ++ else ++ { ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode) || ++ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || ++ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) ++ { ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot restore original resolution"); ++ ++ } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); ++ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, ++ XF86VidModeData.orig_viewport_y)) ++ g_warning("XF86VidMode couldnot restore original viewport"); ++ } + } + #endif --LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" -+LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" +@@ -1185,9 +1232,9 @@ + properties->fullscreen = TRUE; + } - ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" +- if (popt_noxrandr) ++ if (popt_noxf86vm) + { +- properties->noxrandr = TRUE; ++ properties->noxf86vm = TRUE; + } -@@ -28651,7 +28651,7 @@ - echo "SDL LIBS = found" - fi + if (popt_window) +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-13 14:16:46.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-13 14:16:46.000000000 +0200 +@@ -160,7 +160,7 @@ + tmp->fx = 1; + tmp->screensize = 1; + tmp->fullscreen = 1; +- tmp->noxrandr = FALSE; ++ tmp->noxf86vm = FALSE; + tmp->timer = 1; + tmp->skin = "babytoy"; + tmp->key = "default"; +@@ -244,8 +244,8 @@ + } else if(!strcmp(value.v_identifier, "fullscreen")) { + if(!scan_get_int(scanner, &tmp->fullscreen)) + g_warning("Config file parsing error on token %s", token); +- } else if(!strcmp(value.v_identifier, "noxrandr")) { +- if(!scan_get_int(scanner, &tmp->noxrandr)) ++ } else if(!strcmp(value.v_identifier, "noxf86vm")) { ++ if(!scan_get_int(scanner, &tmp->noxf86vm)) + g_warning("Config file parsing error on token %s", token); + } else if(!strcmp(value.v_identifier, "timer")) { + if(!scan_get_int(scanner, &tmp->timer)) +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-13 14:16:46.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-13 14:16:46.000000000 +0200 +@@ -28,7 +28,7 @@ + gint music; + gint fx; + gint fullscreen; +- gint noxrandr; ++ gint noxf86vm; + gint screensize; + gint defaultcursor; + gint timer; +--- gcompris-7.4/src/gcompris/board_config.c.xf86vm 2006-05-13 14:16:46.000000000 +0200 ++++ gcompris-7.4/src/gcompris/board_config.c 2006-05-13 14:16:46.000000000 +0200 +@@ -125,6 +125,34 @@ --echo "XRANDR option (--enable-xrandr) = $found_randr" -+echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" + } - echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" ++#ifdef XF86_VIDMODE ++static GdkEventConfigure gcompris_last_configure_event; ++ ++static gint gcompris_conf_window_configured(GtkWindow *window, ++ GdkEventConfigure *event, gpointer param) ++{ ++ gint new_x, new_y; ++ double screen_width, screen_height; ++ /* Because we call gtk_window_move, we cause a configure event. Filter out ++ identical events to avoid looping. */ ++ if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) ++ { ++ gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( ++ gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); ++ /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ ++ screen_height -= 30; ++ new_x = ((gint)screen_width - event->width) / 2; ++ new_y = ((gint)screen_height - event->height) / 2; ++ /* printf("screen %dx%d, window %dx%d, place %dx%d\n", (int)screen_width, (int)screen_height, event->width, event->height, new_x, new_y); */ ++ gtk_window_move (conf_window, new_x, new_y); ++ memcpy(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure)); ++ } ++ ++ /* Act as if we aren't there / aren't hooked up */ ++ return FALSE; ++} ++#endif ++ + GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) + { + GtkWidget *header; +@@ -145,7 +173,18 @@ + ---- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-11 09:42:18.000000000 +0200 -@@ -141,5 +141,5 @@ - /* Version number of package */ - #undef VERSION + /* parameters */ +- gtk_window_set_position (conf_window, ++#ifdef XF86_VIDMODE ++ if (gcompris_get_properties()->fullscreen && ++ !gcompris_get_properties()->noxf86vm) ++ { ++ memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); ++ gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); ++ gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", ++ GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); ++ } ++ else ++#endif ++ gtk_window_set_position (conf_window, + GTK_WIN_POS_CENTER_ALWAYS); --/* XRANDR Available */ --#undef XRANDR -+/* XF86VidMode Available */ -+#undef XF86_VIDMODE + gtk_widget_show(GTK_WIDGET(conf_window)); --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-13 14:16:46.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV From fedora-extras-commits at redhat.com Sat May 13 14:03:32 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 07:03:32 -0700 Subject: rpms/perl-Sub-Uplevel/FC-5 .cvsignore, 1.3, 1.4 perl-Sub-Uplevel.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605131403.k4DE3Y3G029013@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28959/FC-5 Modified Files: .cvsignore perl-Sub-Uplevel.spec sources Log Message: Update to 0.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 15:31:06 -0000 1.3 +++ .cvsignore 13 May 2006 14:03:31 -0000 1.4 @@ -1 +1 @@ -Sub-Uplevel-0.10.tar.gz +Sub-Uplevel-0.12.tar.gz Index: perl-Sub-Uplevel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/perl-Sub-Uplevel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Sub-Uplevel.spec 21 Apr 2006 15:31:06 -0000 1.8 +++ perl-Sub-Uplevel.spec 13 May 2006 14:03:31 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Sub-Uplevel -Version: 0.10 +Version: 0.12 Release: 1%{?dist} Summary: Run a perl function in an upper stack frame @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -24,20 +24,18 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -make test +./Build test %clean @@ -46,12 +44,16 @@ %files %defattr(-,root,root,-) -%doc Changes +%doc Changes README %{perl_vendorlib}/Sub/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Sat May 13 2006 Jose Pedro Oliveira - 0.12-1 +- Update to 0.12. +- Makefile.PL -> Build.PL. + * Fri Apr 21 2006 Jose Pedro Oliveira - 0.10-1 - Update to 0.10. - New upstream maintainer. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 15:31:06 -0000 1.3 +++ sources 13 May 2006 14:03:31 -0000 1.4 @@ -1 +1 @@ -1dcde4e58ee1eb623b7ee974f5d7d6da Sub-Uplevel-0.10.tar.gz +1cf578951ee9f5b02108017658e703ba Sub-Uplevel-0.12.tar.gz From fedora-extras-commits at redhat.com Sat May 13 14:03:32 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 07:03:32 -0700 Subject: rpms/perl-Sub-Uplevel/devel .cvsignore, 1.3, 1.4 perl-Sub-Uplevel.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605131403.k4DE3Yn7029019@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28959/devel Modified Files: .cvsignore perl-Sub-Uplevel.spec sources Log Message: Update to 0.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 15:15:02 -0000 1.3 +++ .cvsignore 13 May 2006 14:03:32 -0000 1.4 @@ -1 +1 @@ -Sub-Uplevel-0.10.tar.gz +Sub-Uplevel-0.12.tar.gz Index: perl-Sub-Uplevel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Sub-Uplevel.spec 21 Apr 2006 15:15:03 -0000 1.8 +++ perl-Sub-Uplevel.spec 13 May 2006 14:03:32 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Sub-Uplevel -Version: 0.10 +Version: 0.12 Release: 1%{?dist} Summary: Run a perl function in an upper stack frame @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -24,20 +24,18 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -make test +./Build test %clean @@ -46,12 +44,16 @@ %files %defattr(-,root,root,-) -%doc Changes +%doc Changes README %{perl_vendorlib}/Sub/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Sat May 13 2006 Jose Pedro Oliveira - 0.12-1 +- Update to 0.12. +- Makefile.PL -> Build.PL. + * Fri Apr 21 2006 Jose Pedro Oliveira - 0.10-1 - Update to 0.10. - New upstream maintainer. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 15:15:03 -0000 1.3 +++ sources 13 May 2006 14:03:32 -0000 1.4 @@ -1 +1 @@ -1dcde4e58ee1eb623b7ee974f5d7d6da Sub-Uplevel-0.10.tar.gz +1cf578951ee9f5b02108017658e703ba Sub-Uplevel-0.12.tar.gz From fedora-extras-commits at redhat.com Sat May 13 14:03:31 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 07:03:31 -0700 Subject: rpms/perl-Sub-Uplevel/FC-4 .cvsignore, 1.3, 1.4 perl-Sub-Uplevel.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605131404.k4DE43qX029025@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28959/FC-4 Modified Files: .cvsignore perl-Sub-Uplevel.spec sources Log Message: Update to 0.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 15:34:26 -0000 1.3 +++ .cvsignore 13 May 2006 14:03:31 -0000 1.4 @@ -1 +1 @@ -Sub-Uplevel-0.10.tar.gz +Sub-Uplevel-0.12.tar.gz Index: perl-Sub-Uplevel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/perl-Sub-Uplevel.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Sub-Uplevel.spec 21 Apr 2006 15:34:26 -0000 1.5 +++ perl-Sub-Uplevel.spec 13 May 2006 14:03:31 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Sub-Uplevel -Version: 0.10 +Version: 0.12 Release: 1%{?dist} Summary: Run a perl function in an upper stack frame @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -24,20 +24,18 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -make test +./Build test %clean @@ -46,12 +44,16 @@ %files %defattr(-,root,root,-) -%doc Changes +%doc Changes README %{perl_vendorlib}/Sub/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Sat May 13 2006 Jose Pedro Oliveira - 0.12-1 +- Update to 0.12. +- Makefile.PL -> Build.PL. + * Fri Apr 21 2006 Jose Pedro Oliveira - 0.10-1 - Update to 0.10. - New upstream maintainer. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 15:34:26 -0000 1.3 +++ sources 13 May 2006 14:03:31 -0000 1.4 @@ -1 +1 @@ -1dcde4e58ee1eb623b7ee974f5d7d6da Sub-Uplevel-0.10.tar.gz +1cf578951ee9f5b02108017658e703ba Sub-Uplevel-0.12.tar.gz From fedora-extras-commits at redhat.com Sat May 13 14:53:09 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:09 -0700 Subject: rpms/python-ctypes - New directory Message-ID: <200605131453.k4DErBCQ029412@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29386/python-ctypes Log Message: Directory /cvs/extras/rpms/python-ctypes added to the repository From fedora-extras-commits at redhat.com Sat May 13 14:53:10 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:10 -0700 Subject: rpms/python-ctypes/devel - New directory Message-ID: <200605131453.k4DErCBD029415@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29386/python-ctypes/devel Log Message: Directory /cvs/extras/rpms/python-ctypes/devel added to the repository From fedora-extras-commits at redhat.com Sat May 13 14:53:22 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:22 -0700 Subject: rpms/python-ctypes Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605131453.k4DErODI029464@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29431 Added Files: Makefile import.log Log Message: Setup of module python-ctypes --- NEW FILE Makefile --- # Top level Makefile for module python-ctypes all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 13 14:53:23 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:23 -0700 Subject: rpms/python-ctypes/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605131453.k4DErPHp029467@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29431/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-ctypes --- NEW 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 May 13 14:53:55 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:55 -0700 Subject: rpms/python-ctypes import.log,1.1,1.2 Message-ID: <200605131453.k4DErvSx029536@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503 Modified Files: import.log Log Message: auto-import python-ctypes-0.9.9.6-1 on branch devel from python-ctypes-0.9.9.6-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-ctypes/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 May 2006 14:53:22 -0000 1.1 +++ import.log 13 May 2006 14:53:55 -0000 1.2 @@ -0,0 +1 @@ +python-ctypes-0_9_9_6-1:HEAD:python-ctypes-0.9.9.6-1.src.rpm:1147532034 From fedora-extras-commits at redhat.com Sat May 13 14:53:56 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:56 -0700 Subject: rpms/python-ctypes/devel python-ctypes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605131453.k4DErwM1029541@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503/devel Modified Files: .cvsignore sources Added Files: python-ctypes.spec Log Message: auto-import python-ctypes-0.9.9.6-1 on branch devel from python-ctypes-0.9.9.6-1.src.rpm --- NEW FILE python-ctypes.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-ctypes Version: 0.9.9.6 Release: 1%{?dist} Summary: Advanced Foreign Function Interface for Python Group: Development/Languages License: MIT URL: http://starship.python.net/crew/theller/ctypes/ Source0: http://download.sourceforge.net/ctypes/ctypes-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description ctypes is an advanced ffi (Foreign Function Interface) package for Python 2.3 and higher. ctypes allows to call functions exposed from dlls/shared libraries and has extensive facilities to create, access and manipulate simple and complicated C data types in Python - in other words: wrap libraries in pure Python. It is even possible to implement C callback functions in pure Python. %prep %setup -q -n ctypes-%{version} %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT # Clean up temp and build for debuginfo %{__python} setup.py clean %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt docs # Include files and dirs below %{python_sitelib} (for noarch packages) and # %{python_sitearch} (for arch-dependent packages) as appropriate, and mark # *.pyo as %ghost (do not include in package). %{python_sitearch}/*.so %dir %{python_sitearch}/ctypes %{python_sitearch}/ctypes/*.py %{python_sitearch}/ctypes/*.pyc %ghost %{python_sitearch}/ctypes/*.pyo %dir %{python_sitearch}/ctypes/macholib %{python_sitearch}/ctypes/macholib/*.py %{python_sitearch}/ctypes/macholib/*.pyc %ghost %{python_sitearch}/ctypes/macholib/*.pyo #Don't package the test suite %exclude %{python_sitearch}/ctypes/test %changelog * Thu Apr 27 2006 Paul Nasrat - 0.9.9.6-1 - Update to latest release * Sat Jan 14 2006 Konstantin Ryabitsev - 0.9.6-1 - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-ctypes/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2006 14:53:23 -0000 1.1 +++ .cvsignore 13 May 2006 14:53:56 -0000 1.2 @@ -0,0 +1 @@ +ctypes-0.9.9.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-ctypes/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 May 2006 14:53:23 -0000 1.1 +++ sources 13 May 2006 14:53:56 -0000 1.2 @@ -0,0 +1 @@ +6c7240608d564018ef8254721fde0012 ctypes-0.9.9.6.tar.gz From fedora-extras-commits at redhat.com Sat May 13 14:56:56 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:56:56 -0700 Subject: owners owners.list,1.987,1.988 Message-ID: <200605131456.k4DEuww5029604@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29585 Modified Files: owners.list Log Message: Add python-ctypes Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.987 retrieving revision 1.988 diff -u -r1.987 -r1.988 --- owners.list 13 May 2006 01:35:49 -0000 1.987 +++ owners.list 13 May 2006 14:56:56 -0000 1.988 @@ -1319,6 +1319,7 @@ Fedora Extras|python-clientform|Python module for client-side HTML forms|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-cpio|A Python module for accessing cpio archives|ivazquez at ivazquez.net|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-ctypes| Advanced Foreign Function Interface for Python|pnasrat at redhat.com|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| From fedora-extras-commits at redhat.com Sat May 13 15:37:13 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sat, 13 May 2006 08:37:13 -0700 Subject: rpms/directfb/FC-5 .cvsignore, 1.4, 1.5 directfb.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605131537.k4DFbF5r032053@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/directfb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32032 Modified Files: .cvsignore directfb.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 00:07:23 -0000 1.4 +++ .cvsignore 13 May 2006 15:37:13 -0000 1.5 @@ -1 +1 @@ -DirectFB-0.9.24.tar.gz +DirectFB-0.9.25.1.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-5/directfb.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- directfb.spec 5 Mar 2006 13:52:07 -0000 1.10 +++ directfb.spec 13 May 2006 15:37:13 -0000 1.11 @@ -1,6 +1,6 @@ Name: directfb -Version: 0.9.24 -Release: 5%{?dist} +Version: 0.9.25.1 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -52,7 +52,7 @@ --enable-video4linux2 \ --with-gfxdrivers=\ ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\ -savage,tdfx,unichrome,sis315,r200 +savage,tdfx,unichrome,sis315 make %{?_smp_mflags} @@ -79,12 +79,17 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} -%{_datadir}/%{name}-%{version} +#%{_libdir}/directfb-%{version} +#%{_datadir}/%{name}-%{version} +# grrr, I hate it when projects do brown paper bag releases in a dirty way ... +%{_libdir}/directfb-0.9.25 +%{_datadir}/%{name}-0.9.25 %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo +%{_bindir}/dfbinput %{_bindir}/dfblayer +%{_bindir}/dfbpenmount %{_bindir}/dfbscreen %{_bindir}/dfbsummon %{_mandir}/man1/dfbg.1* @@ -107,6 +112,10 @@ %{_libdir}/libfusion.so %changelog +* Sat May 13 2006 Thomas Vander Stichele +- 0.9.25.1-1 +- new upstream version + * Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 - rebuild for fedora extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 00:02:39 -0000 1.4 +++ sources 13 May 2006 15:37:13 -0000 1.5 @@ -1 +1 @@ -1f4b56b20d4e6f5c6ceb15c1c4fd2ecd DirectFB-0.9.24.tar.gz +b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 15:39:55 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 13 May 2006 08:39:55 -0700 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.16,1.17 Message-ID: <200605131539.k4DFdvt0032128@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-serv32111 Modified Files: perl-Module-Build.spec Log Message: bump Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Module-Build.spec 12 May 2006 17:08:10 -0000 1.16 +++ perl-Module-Build.spec 13 May 2006 15:39:54 -0000 1.17 @@ -1,6 +1,6 @@ Name: perl-Module-Build Version: 0.28 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Perl module for building and installing Perl modules License: GPL or Artistic @@ -61,6 +61,9 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Sat May 13 2006 Steven Pritchard - 1:0.28-2 +- Rebuild. + * Fri May 12 2006 Steven Pritchard - 1:0.28-1 - Update to 0.28. - Epoch bump to make 0.28 > 0.2612. From fedora-extras-commits at redhat.com Sat May 13 16:36:13 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sat, 13 May 2006 09:36:13 -0700 Subject: rpms/directfb/devel .cvsignore, 1.4, 1.5 directfb.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605131636.k4DGaFuM002182@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/directfb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2161 Modified Files: .cvsignore directfb.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 00:07:23 -0000 1.4 +++ .cvsignore 13 May 2006 16:36:12 -0000 1.5 @@ -1 +1 @@ -DirectFB-0.9.24.tar.gz +DirectFB-0.9.25.1.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/directfb.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- directfb.spec 5 Mar 2006 13:52:07 -0000 1.10 +++ directfb.spec 13 May 2006 16:36:12 -0000 1.11 @@ -1,6 +1,6 @@ Name: directfb -Version: 0.9.24 -Release: 5%{?dist} +Version: 0.9.25.1 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -52,7 +52,7 @@ --enable-video4linux2 \ --with-gfxdrivers=\ ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\ -savage,tdfx,unichrome,sis315,r200 +savage,tdfx,unichrome,sis315 make %{?_smp_mflags} @@ -79,12 +79,17 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} -%{_datadir}/%{name}-%{version} +#%{_libdir}/directfb-%{version} +#%{_datadir}/%{name}-%{version} +# grrr, I hate it when projects do brown paper bag releases in a dirty way ... +%{_libdir}/directfb-0.9.25 +%{_datadir}/%{name}-0.9.25 %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo +%{_bindir}/dfbinput %{_bindir}/dfblayer +%{_bindir}/dfbpenmount %{_bindir}/dfbscreen %{_bindir}/dfbsummon %{_mandir}/man1/dfbg.1* @@ -107,6 +112,10 @@ %{_libdir}/libfusion.so %changelog +* Sat May 13 2006 Thomas Vander Stichele +- 0.9.25.1-1 +- new upstream version + * Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 - rebuild for fedora extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 00:02:39 -0000 1.4 +++ sources 13 May 2006 16:36:12 -0000 1.5 @@ -1 +1 @@ -1f4b56b20d4e6f5c6ceb15c1c4fd2ecd DirectFB-0.9.24.tar.gz +b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 17:18:05 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 13 May 2006 10:18:05 -0700 Subject: rpms/lyx/devel lyx.spec,1.33,1.34 Message-ID: <200605131718.k4DHI7Gg004715@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4698 Modified Files: lyx.spec Log Message: * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- lyx.spec 11 Apr 2006 14:40:06 -0000 1.33 +++ lyx.spec 13 May 2006 17:18:05 -0000 1.34 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -45,13 +45,15 @@ Requires(post): tetex-fonts Requires(postun): tetex-fonts +Requires: %{name}-frontend = %{version} Requires: tetex-latex Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript Requires: htmlview -Requires: %{name}-frontend = %{version} - +## Soft dependancies +# add support for lyx's Document->Change Tracking +Requires(hint): tetex-dvipost %description LyX is a modern approach to writing documents which breaks with the @@ -199,6 +201,10 @@ %changelog +* Fri Apr 28 2006 Rex Dieter 1.4.1-3 +- Requires(hint): tetex-dvipost + adds support for lyx's Document->Change Tracking + * Tue Apr 11 2006 Rex Dieter 1.4.1-2 - 1.4.1 From fedora-extras-commits at redhat.com Sat May 13 17:18:57 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 13 May 2006 10:18:57 -0700 Subject: rpms/lyx/FC-5 lyx.spec,1.32,1.33 Message-ID: <200605131719.k4DHIxF0004781@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4764 Modified Files: lyx.spec Log Message: * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- lyx.spec 11 Apr 2006 14:42:36 -0000 1.32 +++ lyx.spec 13 May 2006 17:18:57 -0000 1.33 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -45,13 +45,15 @@ Requires(post): tetex-fonts Requires(postun): tetex-fonts +Requires: %{name}-frontend = %{version} Requires: tetex-latex Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript Requires: htmlview -Requires: %{name}-frontend = %{version} - +## Soft dependancies +# add support for lyx's Document->Change Tracking +Requires(hint): tetex-dvipost %description LyX is a modern approach to writing documents which breaks with the @@ -199,6 +201,10 @@ %changelog +* Fri Apr 28 2006 Rex Dieter 1.4.1-3 +- Requires(hint): tetex-dvipost + adds support for lyx's Document->Change Tracking + * Tue Apr 11 2006 Rex Dieter 1.4.1-2 - 1.4.1 From fedora-extras-commits at redhat.com Sat May 13 17:19:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 13 May 2006 10:19:24 -0700 Subject: rpms/lyx/FC-4 lyx.spec,1.19,1.20 Message-ID: <200605131719.k4DHJQ6P004853@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4836 Modified Files: lyx.spec Log Message: * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- lyx.spec 11 Apr 2006 15:53:34 -0000 1.19 +++ lyx.spec 13 May 2006 17:19:24 -0000 1.20 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -45,13 +45,15 @@ Requires(post): tetex-fonts Requires(postun): tetex-fonts +Requires: %{name}-frontend = %{version} Requires: tetex-latex Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript Requires: htmlview -Requires: %{name}-frontend = %{version} - +## Soft dependancies +# add support for lyx's Document->Change Tracking +Requires(hint): tetex-dvipost %description LyX is a modern approach to writing documents which breaks with the @@ -199,6 +201,10 @@ %changelog +* Fri Apr 28 2006 Rex Dieter 1.4.1-3 +- Requires(hint): tetex-dvipost + adds support for lyx's Document->Change Tracking + * Tue Apr 11 2006 Rex Dieter 1.4.1-2 - 1.4.1 From fedora-extras-commits at redhat.com Sat May 13 17:35:23 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sat, 13 May 2006 10:35:23 -0700 Subject: rpms/directfb/FC-4 .cvsignore, 1.4, 1.5 directfb.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605131735.k4DHZPJh005005@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/directfb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4984 Modified Files: .cvsignore directfb.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Nov 2005 12:12:25 -0000 1.4 +++ .cvsignore 13 May 2006 17:35:23 -0000 1.5 @@ -1 +1 @@ -DirectFB-0.9.24.tar.gz +DirectFB-0.9.25.1.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-4/directfb.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- directfb.spec 25 Nov 2005 12:12:25 -0000 1.5 +++ directfb.spec 13 May 2006 17:35:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: directfb -Version: 0.9.24 -Release: 4%{?dist} +Version: 0.9.25.1 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -52,7 +52,7 @@ --enable-video4linux2 \ --with-gfxdrivers=\ ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\ -savage,tdfx,unichrome,sis315,r200 +savage,tdfx,unichrome,sis315 make %{?_smp_mflags} @@ -79,12 +79,17 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} -%{_datadir}/%{name}-%{version} +#%{_libdir}/directfb-%{version} +#%{_datadir}/%{name}-%{version} +# grrr, I hate it when projects do brown paper bag releases in a dirty way ... +%{_libdir}/directfb-0.9.25 +%{_datadir}/%{name}-0.9.25 %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo +%{_bindir}/dfbinput %{_bindir}/dfblayer +%{_bindir}/dfbpenmount %{_bindir}/dfbscreen %{_bindir}/dfbsummon %{_mandir}/man1/dfbg.1* @@ -107,6 +112,13 @@ %{_libdir}/libfusion.so %changelog +* Sat May 13 2006 Thomas Vander Stichele +- 0.9.25.1-1 +- new upstream version + +* Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 +- rebuild for fedora extras 5 + * Fri Nov 25 2005 Hans de Goede 0.9.24-4 - Merge FC-4 and devel specfiles for easier maintainance and consistence. - Incorperate improvements suggested by Ville Skytt?? in bug 162358. Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Nov 2005 12:12:25 -0000 1.4 +++ sources 13 May 2006 17:35:23 -0000 1.5 @@ -1 +1 @@ -1f4b56b20d4e6f5c6ceb15c1c4fd2ecd DirectFB-0.9.24.tar.gz +b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 17:36:34 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sat, 13 May 2006 10:36:34 -0700 Subject: rpms/directfb/FC-3 .cvsignore, 1.3, 1.4 directfb.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605131736.k4DHaaMh005084@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/directfb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5063 Modified Files: .cvsignore directfb.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Nov 2005 18:00:00 -0000 1.3 +++ .cvsignore 13 May 2006 17:36:34 -0000 1.4 @@ -1 +1 @@ -DirectFB-0.9.24.tar.gz +DirectFB-0.9.25.1.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-3/directfb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- directfb.spec 28 Nov 2005 18:00:00 -0000 1.2 +++ directfb.spec 13 May 2006 17:36:34 -0000 1.3 @@ -1,6 +1,6 @@ Name: directfb -Version: 0.9.24 -Release: 4%{?dist} +Version: 0.9.25.1 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -52,7 +52,7 @@ --enable-video4linux2 \ --with-gfxdrivers=\ ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\ -savage,tdfx,unichrome,sis315,r200 +savage,tdfx,unichrome,sis315 make %{?_smp_mflags} @@ -79,12 +79,17 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} -%{_datadir}/%{name}-%{version} +#%{_libdir}/directfb-%{version} +#%{_datadir}/%{name}-%{version} +# grrr, I hate it when projects do brown paper bag releases in a dirty way ... +%{_libdir}/directfb-0.9.25 +%{_datadir}/%{name}-0.9.25 %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo +%{_bindir}/dfbinput %{_bindir}/dfblayer +%{_bindir}/dfbpenmount %{_bindir}/dfbscreen %{_bindir}/dfbsummon %{_mandir}/man1/dfbg.1* @@ -107,6 +112,13 @@ %{_libdir}/libfusion.so %changelog +* Sat May 13 2006 Thomas Vander Stichele +- 0.9.25.1-1 +- new upstream version + +* Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 +- rebuild for fedora extras 5 + * Fri Nov 25 2005 Hans de Goede 0.9.24-4 - Merge FC-4 and devel specfiles for easier maintainance and consistence. - Incorperate improvements suggested by Ville Skytt?? in bug 162358. Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2005 18:00:00 -0000 1.3 +++ sources 13 May 2006 17:36:34 -0000 1.4 @@ -1 +1 @@ -1f4b56b20d4e6f5c6ceb15c1c4fd2ecd DirectFB-0.9.24.tar.gz +b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 21:36:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:36:35 -0700 Subject: rpms/tiger - New directory Message-ID: <200605132136.k4DLabbI015210@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15188/tiger Log Message: Directory /cvs/extras/rpms/tiger added to the repository From fedora-extras-commits at redhat.com Sat May 13 21:36:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:36:35 -0700 Subject: rpms/tiger/devel - New directory Message-ID: <200605132136.k4DLabjB015213@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15188/tiger/devel Log Message: Directory /cvs/extras/rpms/tiger/devel added to the repository From fedora-extras-commits at redhat.com Sat May 13 21:36:55 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:36:55 -0700 Subject: rpms/tiger Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605132136.k4DLavp7015269@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15236 Added Files: Makefile import.log Log Message: Setup of module tiger --- NEW FILE Makefile --- # Top level Makefile for module tiger all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 13 21:36:56 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:36:56 -0700 Subject: rpms/tiger/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605132136.k4DLawjM015272@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15236/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tiger --- NEW 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 May 13 21:38:59 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:38:59 -0700 Subject: rpms/tiger import.log,1.1,1.2 Message-ID: <200605132139.k4DLd1wj015403@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15359 Modified Files: import.log Log Message: auto-import tiger-3.2.1-4 on branch devel from tiger-3.2.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tiger/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 May 2006 21:36:55 -0000 1.1 +++ import.log 13 May 2006 21:38:58 -0000 1.2 @@ -0,0 +1 @@ +tiger-3_2_1-4:HEAD:tiger-3.2.1-4.src.rpm:1147556318 From fedora-extras-commits at redhat.com Sat May 13 21:38:59 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:38:59 -0700 Subject: rpms/tiger/devel tiger-3.2.1-autotools.patch, NONE, 1.1 tiger-3.2.1-config.patch, NONE, 1.1 tiger-3.2.1-doc.patch, NONE, 1.1 tiger-3.2.1-fixes.patch, NONE, 1.1 tiger-3.2.1-gcc4.patch, NONE, 1.1 tiger-3.2.1-scripts.patch, NONE, 1.1 tiger-3.2.1.tar.gz.sig, NONE, 1.1 tiger.README, NONE, 1.1 tiger.cron, NONE, 1.1 tiger.ignore, NONE, 1.1 tiger.ignore.server, NONE, 1.1 tiger.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605132139.k4DLd1kl015420@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15359/devel Modified Files: .cvsignore sources Added Files: tiger-3.2.1-autotools.patch tiger-3.2.1-config.patch tiger-3.2.1-doc.patch tiger-3.2.1-fixes.patch tiger-3.2.1-gcc4.patch tiger-3.2.1-scripts.patch tiger-3.2.1.tar.gz.sig tiger.README tiger.cron tiger.ignore tiger.ignore.server tiger.spec Log Message: auto-import tiger-3.2.1-4 on branch devel from tiger-3.2.1-4.src.rpm tiger-3.2.1-autotools.patch: --- NEW FILE tiger-3.2.1-autotools.patch --- --- tiger-3.2.1.orig/c/Makefile +++ tiger-3.2.1/c/Makefile @@ -1,3 +1,4 @@ +# Generated automatically from Makefile.in by configure. # Makefile for tiger binaries # # @@ -22,15 +23,17 @@ # been added later) BINLIST=getpermit snefru md5 testsuid realpath COPTS= -DNEEDGETWD +INSTALL=/usr/bin/install -c +CC=gcc all: ${BINLIST} install: all - cp ${BINLIST} ../bin/ + $(INSTALL) -m0755 ${BINLIST} ../bin/ % : %.c - gcc ${COPTS} -o $@ $< + $(CC) $(CFLAGS) ${COPTS} -o $@ $< clean: -rm -f ${BINLIST} --- tiger-3.2.1.orig/c/Makefile.in +++ tiger-3.2.1/c/Makefile.in @@ -0,0 +1,40 @@ +# Makefile for tiger binaries +# +# +# Makefile for tiger binaries - A UN*X security checking system +# Copyright (C) 2002 Javier Fernandez-Sanguino Pen~a +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 1, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# Please see the file `COPYING' for the complete copyright notice. +# + +# For some reason snefru and md5 were received wrongly +# and they could not be compiled at first (they have +# been added later) +BINLIST=getpermit snefru md5 testsuid realpath +COPTS= -DNEEDGETWD +INSTALL=@INSTALL@ +CC=@CC@ + +all: ${BINLIST} + +install: all + $(INSTALL) -m0755 ${BINLIST} ../bin/ + + +% : %.c + $(CC) $(CFLAGS) ${COPTS} -o $@ $< + +clean: + -rm -f ${BINLIST} + +distclean: clean --- tiger-3.2.1.orig/configure +++ tiger-3.2.1/configure @@ -532,6 +532,312 @@ +# Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:539: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:569: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:620: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:652: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 663 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:694: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:699: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:727: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi + +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# ./install, which can be erroneously created by make from ./install.sh. +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:789: checking for a BSD compatible install" >&5 +if test -z "$INSTALL"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_save_IFS" + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi +fi +echo "$ac_t""$INSTALL" 1>&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + test "x$prefix" != "xNONE" || prefix=/usr/local # Check whether --with-tigerhome or --without-tigerhome was given. @@ -608,6 +914,7 @@ + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -719,8 +1026,10 @@ done ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile + c/Makefile man/tiger.8 man/tigercron.8" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -754,6 +1063,11 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@CC@%$CC%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@install@%$install%g s%@tigerhome@%$tigerhome%g s%@tigerwork@%$tigerwork%g s%@tigerlog@%$tigerlog%g @@ -805,6 +1119,7 @@ cat >> $CONFIG_STATUS < $ac_file fi; done rm -f conftest.s* --- tiger-3.2.1.orig/configure.in +++ tiger-3.2.1/configure.in @@ -4,6 +4,9 @@ dnl for to make sure it's in the right directory. AC_INIT(tiger) +AC_PROG_CC +AC_PROG_INSTALL + test "x$prefix" != "xNONE" || prefix=/usr/local AC_ARG_WITH(tigerhome, [ --with-tigerhome=LOCATION Location of all Tiger files], @@ -42,6 +45,7 @@ tigerlogdir=`eval echo $tigerlog` tigerconfigdir=`eval echo $tigerconfig` tigerhomedir=`eval echo $tigerhome` +AC_SUBST(install) AC_SUBST(tigerhome) AC_SUBST(tigerwork) AC_SUBST(tigerlog) @@ -52,5 +56,6 @@ AC_SUBST(tigerconfigdir) AC_SUBST(tigerhomedir) AC_OUTPUT(Makefile + c/Makefile man/tiger.8 man/tigercron.8) --- tiger-3.2.1.orig/Makefile.in +++ tiger-3.2.1/Makefile.in @@ -21,6 +21,9 @@ mandir=@mandir@ # To avoid troubles with some systems.. SHELL = /bin/sh +# Installation program +INSTALL=@INSTALL@ +CC=@CC@ # This directory will contain the 'tiger', 'tigercron', 'tigexp' # scripts, config files, the 'scripts' subdirectory which will @@ -54,6 +57,10 @@ # TIGERCONFIG=@tigerconfig@ # +# Where do manpages go to +# +TIGERMANDIR=@mandir@ +# #------------------------------------------------------------------------ # # End of user customization... @@ -61,7 +68,7 @@ #------------------------------------------------------------------------ # -PLATFORM_SCRIPTS=$(shell find ./systems/ -type f) +PLATFORM_SCRIPTS=$$(find ./systems/ -type f) BINARIES=./tiger \ ./tigexp \ @@ -89,6 +96,8 @@ ./scripts/check_netrc \ ./scripts/check_network \ ./scripts/check_nisplus \ + ./scripts/check_ntp \ + ./scripts/check_omniback \ ./scripts/check_passwd \ ./scripts/check_passwdformat \ ./scripts/check_path \ @@ -116,11 +125,13 @@ $(PLATFORM_SCRIPTS) CONFIGFILES=./tigerrc \ - ./cronrc \ + ./cronrc MISCFILES=./initdefs \ - ./check.tbl \ ./syslist \ + ./check.d/README \ + ./util/buildbins \ + ./util/buildconf \ ./util/difflogs \ ./util/flogit \ ./util/genmsgidx \ @@ -130,19 +141,29 @@ ./util/getfs-std \ ./util/gethostinfo \ ./util/getnetgroup \ + ./util/getpermit \ + ./util/installsig \ ./util/logit \ + ./util/mkfilelst \ + ./util/mksig \ ./util/setsh \ ./util/sgrep MISCDIRS=./bin \ + ./check.d \ ./doc \ ./html \ - ./man \ ./scripts/sub \ ./systems all: + @if [ ! -d bin ]; then \ + mkdir bin; \ + fi cd c && $(MAKE) install + @if [ ! -d html ]; then \ + mkdir html; \ + fi cd util && sh doc2html ./util/genmsgidx @@ -182,6 +203,19 @@ mkdir -p $(DESTDIR)$(TIGERCONFIG); \ chmod 700 $(DESTDIR)$(TIGERCONFIG); \ fi + @echo "Creating $(TIGERMANDIR)..." + @if [ ! -d $(DESTDIR)$(TIGERMANDIR) ]; then \ + mkdir -p $(DESTDIR)$(TIGERMANDIR); \ + mkdir -p $(DESTDIR)$(TIGERMANDIR)/man8; \ + chmod 755 $(DESTDIR)$(TIGERMANDIR); \ + chmod 755 $(DESTDIR)$(TIGERMANDIR)/man8; \ + fi + +installmanpages: + @echo "Copying manpages..." + $(INSTALL) -m 0444 man/tiger.8 $(DESTDIR)$(TIGERMANDIR)/man8 + $(INSTALL) -m 0444 man/tigexp.8 $(DESTDIR)$(TIGERMANDIR)/man8 + $(INSTALL) -m 0444 man/tigercron.8 $(DESTDIR)$(TIGERMANDIR)/man8 installbinaries: @echo "Copying binaries..." @@ -198,8 +232,7 @@ installconfig: @echo "Copying configuration files..." @for file in $(CONFIGFILES); do \ - cp $$file $(DESTDIR)$(TIGERCONFIG)/$$file; \ - chmod 640 $(DESTDIR)$(TIGERCONFIG)/$$file; \ + $(INSTALL) -m 0640 $$file $(DESTDIR)$(TIGERCONFIG)/$$file; \ done @echo "Copying general configuration..." @sed -e 's%^TigerLogDir=.*$$%TigerLogDir="'$(TIGERLOGS)'"%' \ @@ -210,13 +243,13 @@ ./config >$(DESTDIR)$(TIGERHOME)/config @chmod 644 $(DESTDIR)$(TIGERHOME)/config -install: installdirs installbinaries installconfig +install: installdirs installbinaries installconfig installmanpages cd c && $(MAKE) install - @echo "Copying miscellaneus dirs..." + @echo "Copying miscellaneous dirs..." @for dir in $(MISCDIRS); do \ tar cf - $$dir | (cd $(DESTDIR)$(TIGERHOME); tar xpf -); \ done - @echo "Copying miscellaneus files..." + @echo "Copying miscellaneous files..." @for file in $(MISCFILES); do \ cp -p $$file $(DESTDIR)$(TIGERHOME)/$$file; \ done --- tiger-3.2.1.orig/install.sh +++ tiger-3.2.1/install.sh @@ -0,0 +1,312 @@ +## +## install -- Install a program, script or datafile +## Copyright (c) 1997-2004 Ralf S. Engelschall +## +## This file is part of shtool and 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 file 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, or contact Ralf S. Engelschall . +## + +str_tool="install" +str_usage="[-v|--verbose] [-t|--trace] [-d|--mkdir] [-c|--copy] [-C|--compare-copy] [-s|--strip] [-m|--mode ] [-o|--owner ] [-g|--group ] [-e|--exec ] [ ...] " +arg_spec="1+" +opt_spec="v.t.d.c.C.s.m:o:g:e+" +opt_alias="v:verbose,t:trace,d:mkdir,c:copy,C:compare-copy,s:strip,m:mode,o:owner,g:group,e:exec" +opt_v=no +opt_t=no +opt_d=no +opt_c=no +opt_C=no +opt_s=no +opt_m="0755" +opt_o="" +opt_g="" +opt_e="" + +. ./sh.common + +# special case: "shtool install -d

[...]" internally +# maps to "shtool mkdir -f -p -m 755 [...]" +if [ "$opt_d" = yes ]; then + cmd="$0 mkdir -f -p -m 755" + if [ ".$opt_o" != . ]; then + cmd="$cmd -o '$opt_o'" + fi + if [ ".$opt_g" != . ]; then + cmd="$cmd -g '$opt_g'" + fi + if [ ".$opt_v" = .yes ]; then + cmd="$cmd -v" + fi + if [ ".$opt_t" = .yes ]; then + cmd="$cmd -t" + fi + for dir in "$@"; do + eval "$cmd $dir" || shtool_exit $? + done + shtool_exit 0 +fi + +# determine source(s) and destination +argc=$# +srcs="" +while [ $# -gt 1 ]; do + srcs="$srcs $1" + shift +done +dstpath="$1" + +# type check for destination +dstisdir=0 +if [ -d $dstpath ]; then + dstpath=`echo "$dstpath" | sed -e 's:/$::'` + dstisdir=1 +fi + +# consistency check for destination +if [ $argc -gt 2 ] && [ $dstisdir = 0 ]; then + echo "$msgprefix:Error: multiple sources require destination to be directory" 1>&2 + shtool_exit 1 +fi + +# iterate over all source(s) +for src in $srcs; do + dst=$dstpath + + # if destination is a directory, append the input filename + if [ $dstisdir = 1 ]; then + dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'` + dst="$dst/$dstfile" + fi + + # check for correct arguments + if [ ".$src" = ".$dst" ]; then + echo "$msgprefix:Warning: source and destination are the same - skipped" 1>&2 + continue + fi + if [ -d "$src" ]; then + echo "$msgprefix:Warning: source \`$src' is a directory - skipped" 1>&2 + continue + fi + + # make a temp file name in the destination directory + dsttmp=`echo $dst |\ + sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;' \ + -e "s;\$;/#INST@$$#;"` + + # verbosity + if [ ".$opt_v" = .yes ]; then + echo "$src -> $dst" 1>&2 + fi + + # copy or move the file name to the temp name + # (because we might be not allowed to change the source) + if [ ".$opt_C" = .yes ]; then + opt_c=yes + fi + if [ ".$opt_c" = .yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "cp $src $dsttmp" 1>&2 + fi + cp $src $dsttmp || shtool_exit $? + else + if [ ".$opt_t" = .yes ]; then + echo "mv $src $dsttmp" 1>&2 + fi + mv $src $dsttmp || shtool_exit $? + fi + + # adjust the target file + if [ ".$opt_e" != . ]; then + sed='sed' + OIFS="$IFS"; IFS="$ASC_NL"; set -- $opt_e; IFS="$OIFS" + for e + do + sed="$sed -e '$e'" + done + cp $dsttmp $dsttmp.old + chmod u+w $dsttmp + eval "$sed <$dsttmp.old >$dsttmp" || shtool_exit $? + rm -f $dsttmp.old + fi + if [ ".$opt_s" = .yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "strip $dsttmp" 1>&2 + fi + strip $dsttmp || shtool_exit $? + fi + if [ ".$opt_o" != . ]; then + if [ ".$opt_t" = .yes ]; then + echo "chown $opt_o $dsttmp" 1>&2 + fi + chown $opt_o $dsttmp || shtool_exit $? + fi + if [ ".$opt_g" != . ]; then + if [ ".$opt_t" = .yes ]; then + echo "chgrp $opt_g $dsttmp" 1>&2 + fi + chgrp $opt_g $dsttmp || shtool_exit $? + fi + if [ ".$opt_m" != ".-" ]; then + if [ ".$opt_t" = .yes ]; then + echo "chmod $opt_m $dsttmp" 1>&2 + fi + chmod $opt_m $dsttmp || shtool_exit $? + fi + + # determine whether to do a quick install + # (has to be done _after_ the strip was already done) + quick=no + if [ ".$opt_C" = .yes ]; then + if [ -r $dst ]; then + if cmp -s $src $dst; then + quick=yes + fi + fi + fi + + # finally, install the file to the real destination + if [ $quick = yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "rm -f $dsttmp" 1>&2 + fi + rm -f $dsttmp + else + if [ ".$opt_t" = .yes ]; then + echo "rm -f $dst && mv $dsttmp $dst" 1>&2 + fi + rm -f $dst && mv $dsttmp $dst + fi +done + +shtool_exit 0 + +## +## manual page +## + +=pod + +=head1 NAME + +B - B install(1) command + +=head1 SYNOPSIS + +B +[B<-v>|B<--verbose>] +[B<-t>|B<--trace>] +[B<-d>|B<--mkdir>] +[B<-c>|B<--copy>] +[B<-C>|B<--compare-copy>] +[B<-s>|B<--strip>] +[B<-m>|B<--mode> I] +[B<-o>|B<--owner> I] +[B<-g>|B<--group> I] +[B<-e>|B<--exec> I] +I [I ...] +I + +=head1 DESCRIPTION + +This command installs a one or more Is to a given target I +providing all important options of the BSD install(1) command. +The trick is that the functionality is provided in a portable way. + +=head1 OPTIONS + +The following command line options are available. + +=over 4 + +=item B<-v>, B<--verbose> + +Display some processing information. + +=item B<-t>, B<--trace> + +Enable the output of the essential shell commands which are executed. + +=item B<-d>, B<--mkdir> + +To maximize BSD compatiblity, the BSD "B C" usage is +internally mapped to the "B C" command. + +=item B<-c>, B<--copy> + +Copy the I to the target I. Default is to move. + +=item B<-C>, B<--compare-copy> + +Same as B<-c> except if the destination file already exists and is +identical to the source file, no installation is done and the target +remains untouched. + +=item B<-s>, B<--strip> + +This option strips program executables during the installation, see +strip(1). Default is to install verbatim. + +=item B<-m>, B<--mode> I + +The file mode applied to the target, see chmod(1). Setting mode to +"C<->" skips this step and leaves the operating system default which is +usually based on umask(1). Some file modes require superuser privileges +to be set. Default is 0755. + +=item B<-o>, B<--owner> I + +The file owner name or id applied to the target, see chown(1). This +option requires superuser privileges to execute. Default is to skip this +step and leave the operating system default which is usually based on +the executing uid or the parent setuid directory. + +=item B<-g>, B<--group> I + +The file group name or id applied to the target, see chgrp(1). This +option requires superuser privileges to execute to the fullest extend, +otherwise the choice of I is limited on most operating systems. +Default is to skip this step and leave the operating system default +which is usually based on the executing gid or the parent setgid +directory. + +=item B<-e>, B<--exec> I + +This option can be used one or multiple times to apply one or more +sed(1) commands to the file contents during installation. + +=back + +=head1 EXAMPLE + + # Makefile + install: + : + shtool install -c -s -m 4755 foo $(bindir)/ + shtool install -c -m 644 foo.man $(mandir)/man1/foo.1 + shtool install -c -m 644 -e "s/@p@/$prefix/g" foo.conf $(etcdir)/ + +=head1 HISTORY + +The B B command was originally written by Ralf S. +Engelschall Erse at engelschall.comE in 1997 for B. It +was prompted by portability issues in the installation procedures of +B libraries. + +=head1 SEE ALSO + +shtool(1), umask(1), chmod(1), chown(1), chgrp(1), strip(1), sed(1). + +=cut + tiger-3.2.1-config.patch: --- NEW FILE tiger-3.2.1-config.patch --- --- ./site-sample.config 2003-09-03 14:09:14.000000000 +0200 +++ ./site-sample 2005-08-07 17:12:40.000000000 +0200 @@ -86,4 +86,4 @@ # # Define where Integrit is installed (if you use it) # -#INTEGRIT=/usr/local/bin/aide +#INTEGRIT=/usr/local/bin/integrit --- ./tigerrc-TAMU.config 2002-06-14 10:51:31.000000000 +0200 +++ ./tigerrc-TAMU 2005-08-07 17:12:40.000000000 +0200 @@ -15,6 +15,7 @@ # you don't want performed. # Tiger_Check_PASSWD=Y # Fast +Tiger_Check_PASSWD_FORMAT=N # Fast - not needed if on systems with pwck Tiger_Check_GROUP=Y # Fast Tiger_Check_ACCOUNTS=Y # Time varies on # of users Tiger_Check_RHOSTS=Y # Time varies on # of users @@ -141,6 +142,11 @@ # Tiger_Crack_Local=N # +# Who sends output from 'tigercron'? +# Default is "root@$HOSTNAME" (gets expanded by tigercron) +# +# Tiger_Mail_FROM="root@`uname -n`" +# # Who gets output from 'tigercron'? # Tiger_Mail_RCPT=root --- ./cronrc.config 2003-09-19 16:24:41.000000000 +0200 +++ ./cronrc 2005-08-07 17:12:40.000000000 +0200 @@ -28,7 +28,16 @@ # ---------------------------------------------------------------------- # Check for known intrusion signs every 8 hours # -0,8,16 * * check_known check_rootkit check_finddeleted check_logfiles check_runprocs check_rootdir check_root +0,8,16 * * check_known check_rootkit check_logfiles check_runprocs check_rootdir check_root +# [experimental] +# Check_finddeleted is very verbose and needs to be adjusted so we run +# it less often, admins that want to run it more often are suggested +# to look up how does the ignore mechanism works. In busy servers many +# false positives might appear because of normal user access. +# Some applications might generate false positives too due to the +# way they behave. Also, this script requires LSOF, so only enable +# it if you have it installed. +#1 * * check_finddeleted # ---------------------------------------------------------------------- # Make system-specific checks every day at 1 am # Notice: System specific checks can be enabled in the @@ -68,7 +77,7 @@ # ---------------------------------------------------------------------- # Check for system configuration once a month # -1 2 * check_services check_signatures check_umask check_ftpusers check_embedded check_exrc +1 2 * check_services check_umask check_ftpusers check_embedded check_exrc # # ---------------------------------------------------------------------- # Run a password cracker against the local passwords once a month --- ./tigerrc-dist.config 2003-05-05 15:14:34.000000000 +0200 +++ ./tigerrc-dist 2005-08-07 17:12:40.000000000 +0200 @@ -9,6 +9,7 @@ # TigerNoBuild=Y # C files are corrupted (ouch.) Tiger_Check_PASSWD=Y # Fast +Tiger_Check_PASSWD_FORMAT=N # Fast - not needed if on systems with pwck Tiger_Check_PASSWD_SHADOW=Y # Time varies on # of users Tiger_Check_PASSWD_NIS=N # Time varies on # of users Tiger_Check_GROUP=Y # Fast @@ -209,6 +210,11 @@ # Tiger_Crack_Local=Y # +# Who sends output from 'tigercron'? +# Default is "root@$HOSTNAME" (gets expanded by tigercron) +# +# Tiger_Mail_FROM="root@`uname -n`" +# # Who gets output from 'tigercron'? # Tiger_Mail_RCPT=root --- ./check.tbl.config 2002-06-14 10:51:31.000000000 +0200 +++ ./check.tbl 2005-08-07 17:12:40.000000000 +0200 @@ -22,4 +22,4 @@ # Add other checks that should be attempted for all systems # here. One script name per line. # -check_sendmail +#check_sendmail --- ./tigerrc.config 2003-10-07 00:18:12.000000000 +0200 +++ ./tigerrc 2005-08-07 17:13:26.000000000 +0200 @@ -7,8 +7,16 @@ # Select checks to perform. Specify 'N' (uppercase) for checks # you don't want performed. # +# Notice this does not affect which checks will be performed through +# the cron job (Tiger's cronrc file governs that, usually under +# /usr/local/etc/tiger or /etc/tiger), it only affects which +# checks will be performed when running the full security checks +# (i.e. 'tiger') +# +# TigerNoBuild=Y # C files are corrupted (ouch.) Tiger_Check_PASSWD=Y # Fast +Tiger_Check_PASSWD_FORMAT=N # Fast - not needed if on systems with pwck Tiger_Check_PASSWD_SHADOW=Y # Time varies on # of users Tiger_Check_PASSWD_NIS=N # Time varies on # of users Tiger_Check_GROUP=Y # Fast @@ -19,11 +27,11 @@ Tiger_Check_CRON=Y # Fast Tiger_Check_ANONFTP=Y # Fast Tiger_Check_EXPORTS=Y # Fast -Tiger_Check_INETD=Y # Fast +Tiger_Check_INETD=Y # Fast for inetd, Varies on xinetd Tiger_Check_SERVICES=Y # Could be faster, not bad though Tiger_Check_KNOWN=Y # Fast Tiger_Check_PERMS=Y # Could be faster, not bad though -Tiger_Check_SIGNATURES=Y # Several minutes +Tiger_Check_SIGNATURES=N # Several minutes Tiger_Check_FILESYSTEM=Y # Time varies on disk space... can be hours Tiger_Check_ROOTDIR=Y # Fast, only 2 checks Tiger_Check_ROOT_ACCESS=Y # Fast @@ -37,7 +45,7 @@ Tiger_Check_LISTENING=Y # Fast Tiger_Check_SYSTEM=Y # Depends on the specific system checks Tiger_Check_RUNPROC=N # Fast, needs to be customized per system -Tiger_Check_DELETED=Y # Depends on the number of processes on the +Tiger_Check_DELETED=N # Depends on the number of processes on the # system Tiger_Check_APACHE=N # Fast Tiger_Check_SSH=Y # Fast @@ -46,6 +54,9 @@ Tiger_Check_EXRC=N # Depends on the size of the filesystem Tiger_Check_ROOTKIT=Y # Slow if chkrootkit is available Tiger_Check_FTPUSERS=Y # Fast +Tiger_Check_OMNIBACK=N # Fast +Tiger_Check_NTP=Y # Fast + # OS specific checks # You can comment them if they are not appropiate to your system but # they will not run if you are running a different OS @@ -181,7 +192,7 @@ # What accounts are considered administrative (beyond root) # (likely to not be used by humans, and therefore have impossible passwords) # List of usernames separated by '|'... no whitespaces -Tiger_Admin_Accounts='adm|bin|daemon|games|lp|mail|news|operator|sync|sys|uucp|man|proxy|majordom|postgres|www-data|operator|irc|gnats' +Tiger_Admin_Accounts='bin|daemon|adm|lp|sync|shutdown|halt|mail|news|uucp|operator|games|gopher|ftp|nobody|dbus|vcsa|nscd|rpm|haldaemon|netdump|sshd|rpc|rpcuser|nfsnobody|mailnull|smmsp|pcap|apache|xfs|ntp|gdm|postfix|cacti|mach|mysql|named|clamav|zope|openvpn|dovecot' # # If an embedded pathname refers to an executable file, this executable # will in turn be checked. This will continue "recursively" until @@ -219,7 +230,7 @@ # Who do you allow to own system files. # List of usernames separated by '|'... no whitespace # -Tiger_Embedded_OK_Owners='root|bin|uucp|sys|daemon' +Tiger_Embedded_OK_Owners='root|bin|uucp|sys|daemon|rpm' #Tiger_Embedded_OK_Owners=root # # What groups can have write access to system files? @@ -238,7 +249,7 @@ # Who can own executables in 'root's PATH? # List of usernames separated by '|'... no whitespace # -Tiger_ROOT_PATH_OK_Owners='root|uucp|bin|news|sys|daemon' +Tiger_ROOT_PATH_OK_Owners='root|uucp|bin|news|sys|daemon|rpm' # If you are paranoid: #Tiger_ROOT_PATH_OK_Owners='root' # If you are running HP-UX @@ -253,13 +264,13 @@ # Who can own things in other users PATH? # List of usernames separated by '|'... no whitespace # -Tiger_PATH_OK_Owners='root|bin|daemon|uucp|sys|adm' +Tiger_PATH_OK_Owners=$Tiger_ROOT_PATH_OK_Owners # # What groups can have write access to executables in non-root user PATH? # List of group names separated by '|'... no whitespace. # No value means no groups should have write access. # -Tiger_PATH_OK_Group_Write= +eval Tiger_PATH_OK_Group_Write='$Tiger_ROOT_PATH_OK_Group_Write' # # Should 'tiger' wait for Crack to finish? If set to 'Y' it will wait # until it finishes. If set to 'N', it will collect the output if @@ -274,6 +285,11 @@ # Tiger_Crack_Local=Y # +# Who sends output from 'tigercron'? +# Default is "root@$HOSTNAME" (gets expanded by tigercron) +# +# Tiger_Mail_FROM="root@`uname -n`" +# # Who gets output from 'tigercron'? # Tiger_Mail_RCPT=root @@ -285,12 +301,12 @@ # # File system scan - things to look for # -Tiger_FSScan_Setuid=Y # Setuid executables -Tiger_FSScan_Setgid=Y # Setgid executables +Tiger_FSScan_Setuid=N # Setuid executables +Tiger_FSScan_Setgid=N # Setgid executables Tiger_FSScan_Devs=Y # device files Tiger_FSScan_SymLinks=Y # strange symbolic links Tiger_FSScan_ofNote=Y # weird filenames -Tiger_FSScan_WDIR=Y # world writable directories +Tiger_FSScan_WDIR=N # world writable directories Tiger_FSScan_Unowned=Y # files with undefined owners/groups # # Should we scan read-only filesystems @@ -303,7 +319,7 @@ # Note that .rhosts and .netrc need not appear here, as they will # be checked by scan_rhosts or scan_netrc. # -USERDOTFILES=".alias .kshrc .cshrc .profile .login .mailrc .exrc .emacs .forward .tcshrc .zshenv .zshrc .zlogin .zprofile .rcrc .bashrc .bash_profile .inputrc .xinitrc .fvwm2rc .Xsession .Xclients .less" +USERDOTFILES=".alias .kshrc .cshrc .profile .login .mailrc .exrc .emacs .forward .tcshrc .zshenv .zshrc .zlogin .zprofile .rcrc .bashrc .bash_profile .bash_logout .inputrc .xinitrc .fvwm2rc .Xsession .Xclients .less .kde" # # Rhost sites which are expected to be in the .rhosts files. # Anything that doesn't match will be reported. The patterns @@ -316,7 +332,8 @@ # Debian GNU/Linux: default is 999, users are generated over 1000 # Solaris: default should be 99, users are generated over 100 # HP-UX (?): default should be 499, users are generated over 500 -Tiger_Accounts_Trust=999 +# Fedora : default should be 499, users are generated over 500 +Tiger_Accounts_Trust=499 # # These SSH directive variables are used to specify "allowed" values # for the SSH Daemon. @@ -324,7 +341,7 @@ # be left blank to ignore the check. Tiger_SSH_Protocol='1|2' Tiger_SSH_RhostsAuthentication='no' -Tiger_SSH_PasswordAuthentication='no' +Tiger_SSH_PasswordAuthentication='yes|no' # # Should we give warnings on services that listen on all interfaces? # (i.e. those that have not been configured to listen only on one) @@ -353,10 +370,16 @@ # seen in the process table will generate a FAIL: # # The process list below is just an example (useful for Linux) -# change it to suit your needs -# Tiger_Running_Procs='syslogd cron atd klogd' +# change it to suit your needs. You can use either the process name +# or the full path name +Tiger_Running_Procs='syslogd crond atd klogd' +# or +# Tiger_Running_Procs='/sbin/syslogd /usr/sbin/atd /usr/sbin/crond /sbin/klogd' # # Should we optimize DPKG checks? (by not using dpkg but looking on # the file database at /var/lib/dpkg?) # Tiger_DPKG_Optimize=Y + +# Devices are not only in /dev when udev is enabled : +FS_DEVDIRS="/dev /etc/udev/devices" --- ./tigerrc-all.config 2003-10-07 00:02:56.000000000 +0200 +++ ./tigerrc-all 2005-08-07 17:12:40.000000000 +0200 @@ -9,6 +9,7 @@ # TigerNoBuild=Y # C files are corrupted (ouch.) Tiger_Check_PASSWD=Y # Fast +Tiger_Check_PASSWD_FORMAT=N # Fast - not needed if on systems with pwck Tiger_Check_PASSWD_SHADOW=Y # Time varies on # of users Tiger_Check_PASSWD_NIS=N # Time varies on # of users Tiger_Check_GROUP=Y # Fast @@ -274,6 +275,11 @@ # Tiger_Crack_Local=Y # +# Who sends output from 'tigercron'? +# Default is "root@$HOSTNAME" (gets expanded by tigercron) +# +# Tiger_Mail_FROM="root@`uname -n`" +# # Who gets output from 'tigercron'? # Tiger_Mail_RCPT=root tiger-3.2.1-doc.patch: --- NEW FILE tiger-3.2.1-doc.patch --- --- tiger-3.2.1.orig/CHANGES +++ tiger-3.2.1/CHANGES @@ -1,6 +1,15 @@ NOTE: To read changes made to the Debian package (since August 23rd 2001) see the changelog.Debian file +Changes (v 3.2.2) +(Unreleased) +---------------- +- Applied patches from Ryan Bradetich to fix Makefiles in HPUX +- Fixed bashisms in scripts +- Fixed YPCAT calls +[TODO: write more of the changes done here] + + Changes (v 3.2.1) ---------------- - New checks: --- tiger-3.2.1.orig/TODO.checks +++ tiger-3.2.1/TODO.checks @@ -0,0 +1,181 @@ +This TODO details things that need to be done to improve the current +security checks implemented in Tiger. + + +IMPROVEMENTS +------------ +- Modify the rhosts check so that it will check for shosts files too + (or create a new check_shosts file) + +- Modify check_network to include hosts.lpd in the tests + +- Add .bash_profile into check_path + +- Add more information to the messages outputed for inetd services which + might expose password information (Unix CERT configuration list item #2.4) + +- check_rootkit should also consider analysing modification times of + important system files (binaries as well as logfiles). + Mtime, atime and ctime should not be in the future and mtime/ctime + of binaries should be similar to the time the system was installed + (unless it has been patched). Similarly, logfiles should not have + similar (almost equal) ctimes. This needs to be carefully planned in + order to avoid confusion of logfile rotation vs. a log cleaner though. + +- check_patches for Solaris should generate better messages for security + and/or recommended patches (|R|S|). The check needs to be tested for + Solaris 9 too. + Also check_patches should only output information for packages installed. + +- check_known should be improved to detect for symlink attacks and + hard links in user writable directories (/tmp, /var/tmp and, in + some systems, /var/spool/mail too, the directory list might be + defined in tigerrc or extracted by parsing the file system) + + +NEW CHECKS +----------- +- Create the following (generic) scripts: + + - Check root $HOME files (might be redundant with check_path's) + - Do alias give the same as check_aliases? + - writable/executable check + word writable? (in find_files) + - Check for SAMBA configuration (checklist #20 SANS): + . encrypted passwords. + . 600 /etc/smbpasswd or /etc/samba/smbpasswd + . shares enabled/disabled + . guest access + . create mask (770) + - Check newer FTP (/etc/ftpaccess in newer Linux systems, ftpusers + is deprecated) see checklist #22 of SANS. + (DONE)- The check_inetd script should be improved to warn if echo/chargen.. + services are enabled (SANS unix checklist #3 and Linux #4) + - SANS unix checklist #18 + . Solaris /etc/system (noexec stack) + . Solaris locked accounts (#18 and #21) + . Solaris default/login + . Solaris /etc/default/kbd + - Partition checks (in Linux /etc/fstab, in Solaris /etc/vfstab), + if there is a /usr, /opt then read-only, if /var + or /tmp suggest nosuid (maybe noexec, although it's not a real + improvement). Separate partitions for /var, /usr, /tmp, /home + (boot?) so that no hard links attacks are possible. + In general user writable directories should be separated from + from system directories to avoid (hard) symlink attacks and + local DoS due to partitions being full. + In some installations /var/log or /var/spool (or /var/mail) might + make sense to be separated. + - Solaris /etc/notrouter to disable + + - Suggested by Bob Hall: + * Check if any local file systems are being exported to + 'localhost'. Also check if the local host is in a netgroups + entry in its own exports file. + * Look for (unexpected) normal files under /dev. + (Note: included in 'check_devices', done?) + * Check for user startup files that call 'umask' with weak + settings. (Should be 022 or 027.) + (Note: included in 'check_umask' using GENPASSWDSETS, done?) + * Check that '-' is not the first character in a /etc/hosts.equiv + /etc/hosts.lpd, or .rhosts files. Also check for a '+' entry in + hosts.lpd file. + (Note: included in 'check_rhosts'?) + * If a system allows it, check for an /etc/shells file and look + if the permitted shells are in the system directories. + References: + http://www.cert.org/tech_tips/usc20.html + http://www.cert.org/advisories/CA-2001-30.html + http://www.ciac.org/ciac/bulletins/b-37.shtml + http://www.nswc.navy.mil/ISSEC/Docs/Ref/GeneralInfo/unixsecurity.nrl.txt + + - Detect promiscous mode (DONE) + - Rootkits check, like chkrootkit (DONE) + Reference: + http://linux.oreillynet.com/pub/a/linux/2002/02/07/rootkits.html + +- Implement a check for configuration files for user's password policies + and other sensible configuration such as /etc/login.access, /etc/login.defs, + /etc/login.conf + +- Implement a generic script to test package management systems + (i.e. run 'rpm -Va' in RedHat, 'pkgchk' in Solaris). Most of these check: + md5sums, permissions, size, user/group ownerships... + These can be useful to detect trivial rootkits but might be redundant + when using also integrity checkers. + Note: The Debian deb_checkmd5sums only covers part of that (using + debsums), dpkg does not have a verify mode (see Debian Bug #187019) + References: + RedHat: http://www.rpm.org/max-rpm/ch-rpm-verify.html + http://www.rpm.org/max-rpm/s1-rpm-verify-what-to-verify.html + +- Convert scripts/check_network (RedHat-based) into a number of tests. + This is a script provided by Bryan Gartner from HP + It currently checks for: + - Inetd configuration files (are xinetd or inetd files writable? + are they owned by the proper user? does inetd use -l? does + xinetd have filelog or syslog?) + (Note: some checks moved to check_tcpd) + - Does /etc/securetty exist? Does it have other entries besides vc/tty? + Is ownership of the file ok? + - Is ip forwarding enabled? + - Which version of DNS/Wu-ftpd is it running? + (Note: this might not be completely feasible since the check_network + scripts connects to the server to retrieve the banner which is + something that Tiger should leave to other, remote, VA tools) + - PermitRooLogin or Rhosts in sshd? + - EXPN/VRFY support in mail host? + Necessary services: + - Is syslog running? + - Is omniback running? + Not allowed (per policy): + - Is fingerd running? + - Is identd runnig? + - Are inetd internal services running? + - Is a routing daemon enabled? + - R-commands? + - X server + - Tftpd + - NIS + - UUCP + - R-exd? + - NFS + Note: some of this is already done in check_inetd and check_xinetd so + many might be redundant. + +INTEGRATION CHECKS +------------------ +(checks related to other tools that integrate them in the Tiger framework) + +- Tripwire: the 'tripwire_run' script has not been tested thoroughly + (mainly because in Debian it is already configured to execute + regular checks standalone) + +- Crack: same for 'crack_run' (for the same reason as for tripwire + it has not been tested thoroughly yet) + +- Other integrity checkers: aide, samhain, integrit... + (Note: done for aide and integrit for the moment) + +- Other password crackers: john + +- Logcheckers: swatch, logcheck, loganalysis, snort-logcheck + Note: Tiger currently does not do any log checking (see below) + I'm not sure if Tiger should provide a new one or re-use + existing ones and include them as an 'external' program to run + through a Tiger module. The benefit of using an accepted and use + log analysis tool is that Tiger can benefit from the database of + signatures of known attacks/non-issues. The problem is that the + sysadmin has to install yet another tool (if he is not using an OS + that already includes them) and, probably, some other stuff + (usually Perl) on which the tool itself is based. + +- User analysis: sac, hostsentry (part of Abacus, but non-free) + +- Network checks: Arpwatch, Snort + +(DONE)- Other tools: chkrootkit + +--- Javier Fernandez-Sanguino Pen~a [...4962 lines suppressed...] Note: the up-to-date TODO list is maintained through Savannah's Task Manager (http://savannah.nongnu.org/pm/?group=tiger) this list is provided for the commodity of those browsing the source code @@ -43,12 +42,12 @@ the code of some checks or new checks written for them . Integrated the secaudit database manager patch provided by the Center for Information Technology, National Institutes of Health - . Integration of checks/bug fixes from TARA 3.0.3 version. NOTE: Mostly done for all checks (except for check_sendmail) Other utilities, such as buildbins changes, need to be checked. . Full documentation and user manual describing checks, policy (BS-7799) compliance and comparison with other tools and checks. + - Include tigerrc and cronrc manpages . Provide other logging mechanisms (syslog, snmp) if tools are available. . Checks for SANS's Top 10 (generic) and Top 20 (UNIX) vulnerabilities @@ -57,8 +56,9 @@ NOTE: Already included an annotated CERT list which determines which are done and which are lacking . Redhat (rpm) packages - NOTE: The spec file provided as a patched is now included but it has - not been tested (by me) to build RPM packages. + NOTE: The spec file provided as a patched is now included, I have tested + it to build RPM packages but I have not tested the RPM packages + themselves. Released: - Version 3.2 (stable): major bug fix version @@ -84,38 +84,6 @@ (such as http://lists.insecure.org/lists/bugtraq/1998/Jun/0160.html from Marc Heuse dated Fri Jun 26 1998 - 08:24:17 BST) -- Convert scripts/check_network (RedHat based) into a number of tests. - This is a script provided by Bryan Gartner from HP - It currently checks for: - - Inetd configuration files (are xinetd or inetd files writable? - are they owned by the proper user? does inetd use -l? does - xinetd have filelog or syslog?) - (Note: some checks moved to check_tcpd) - - Does /etc/securetty exist? Does it have other entries besides vc/tty? - Is ownership of the file ok? - - Is ip forwarding enabled? - - Which version of DNS/Wu-ftpd is it running? - (Note: this might not be completely feasible since the check_network - scripts connects to the server to retrieve the banner which is - something that Tiger should leave to other, remote, VA tools) - - PermitRooLogin or Rhosts in sshd? - - EXPN/VRFY support in mail host? - Necessary services: - - Is syslog running? - - Is omniback running? - Not allowed (per policy): - - Is fingerd running? - - Is identd runnig? - - Are inetd internal services running? - - Is a routing daemon enabled? - - R-commands? - - X server - - Tftpd - - NIS - - UUCP - - R-exd? - - NFS - - Update signatures using TAMU's (and maybe knowngoods.org's) signature database. See http://savannah.nongnu.org/pm/task.php?group_project_id=472&group_id=2247&func=browse @@ -123,88 +91,6 @@ - Improve support non-Linux OSs https://savannah.nongnu.org/pm/task.php?group_id=2247&group_project_id=632 -- Modified the rhosts check so that it will check for shosts files too - (or create a new check_shosts file) - -- Modify check_network to include hosts.lpd in the tests - -- Add .bash_profile into check_path - -- Create the following scripts: - - Detect promiscous mode - - Check root $HOME files (might be redundant with check_path's) - - Do alias give the same as check_aliases? - - writable/executable check + word writable? (in find_files) - - Check for SAMBA configuration (checklist #20 SANS): - . encrypted passwords. - . 600 /etc/smbpasswd or /etc/samba/smbpasswd - . shares enabled/disabled - . guest access - . create mask (770) - - Check newer FTP (/etc/ftpaccess in newer Linux systems, ftpusers - is deprecated) see checklist #22 of SANS. - - The check_inetd script should be improved to warn if echo/chargen.. - services are enabled (SANS unix checklist #3 and Linux #4) - - SANS unix checklist #18 - . Solaris /etc/system (noexec stack) - . Solaris locked accounts (#18 and #21) - . Solaris default/login - . Solaris /etc/default/kbd - - Partition checks (in Linux /etc/fstab, in Solars /etc/vfstab, - if there is a /usr, /opt then read-only, if /var - or /tmp nosuid. Separate /var,/usr,/tmp from / - - Solaris /etc/notrouter to disable - - Rootkits check, like chkrootkit - Note: partially done - Reference: - http://linux.oreillynet.com/pub/a/linux/2002/02/07/rootkits.html - - - Suggested by Bob Hall: - * Check if any local file systems are being exported to - 'localhost'. Also check if the local host is in a netgroups - entry in its own exports file. - * Look for (unexpected) normal files under /dev. - (Note: include in 'check_devices') - * Check for user startup files that call 'umask' with weak - settings. (Should be 022 or 027.) - (Note: include in 'check_umask' using GENPASSWDSETS) - * Check that '-' is not the first character in a /etc/hosts.equiv - /etc/hosts.lpd, or .rhosts files. Also check for a '+' entry in - hosts.lpd file. - (Note: include in 'check_rhosts') - * If a system allows it, check for an /etc/shells file and look - if the permitted shells are in the system directories. - References: - http://www.cert.org/tech_tips/usc20.html - http://www.cert.org/advisories/CA-2001-30.html - http://www.ciac.org/ciac/bulletins/b-37.shtml - http://www.nswc.navy.mil/ISSEC/Docs/Ref/GeneralInfo/unixsecurity.nrl.txt - - -- Possible integration with other security tools: - - Tripwire: the 'tripwire_run' script has not been tested thoroughly - (mainly because in Debian it is already configured to execute - regular checks standalone) - - Crack: same for 'crack_run' (for the same reason as for tripwire - it has not been tested thoroughly yet) - - Other integrity checkers: aide, samhain, integrit... - (Note: done for aide and integrit for the moment) - - Other password crackers: john - - Logcheckers: swatch, logcheck, loganalysis, snort-logcheck - Tiger currently does not do any log checking (see below) - I'm not sure if Tiger should provide a new one or re-use - existing ones and include them as an 'external' program to run - through a Tiger module. The benefit of using an accepted and use - log analysis tool is that Tiger can benefit from the database of - signatures of known attacks/non-issues. The problem is that the - sysadmin has to install yet another tool (if he is not using an OS - that already includes them) and, probably, some other stuff - (like Perl) on which the tool itself is based. - - - User anaylisis: sac, hostsentry (part of Abacus, but non-free) - - Network checks: Arpwatch, Snort - - Other tools: chkrootkit - - Compare checks against other tools' - Bastille/Titan: verify that each thing that they 'fix' (harden) is checked by Tiger. Provide a relationship of modules in @@ -218,8 +104,6 @@ to make simple checks than if using other monolythic tools (like CIS's, OpenBSD's or SuSE's) -- Implement logging to syslog (TARA 3.0.3 does it through logger) - - Implement IDMEF to send message on alerts. Consider the use of the XML library available at http://www.silicondefense.com/idwg/snort-idmef/ or Prelude's libprelude @@ -237,12 +121,16 @@ - IDEA http://idea-arch.sourceforge.net/ - Prelude http://www.prelude-ids.org/ -- Implement a check for configuration files for user's password policies - and other sensible configuration such as /etc/login.access, /etc/login.defs, - /etc/login.conf +(DONE)- Implement logging to syslog (TARA 3.0.3 does it through logger) + +BUGS +---- -- Add more information to the messages outputed for inetd services which - might expose password information (Unix CERT configuration list item #2.4) +- Gen_passwd_sets (all systems) sorts the passwd/shadow before joining, + if there are "similar" userfields with non-word characters (*, !) sorting + might not work as expected and the join will not show some of the users. + This needs to be fixed by sorting the userfield first and then using that + sort to sort the passwd fileS --- Javier Fernandez-Sanguino Pen~a --- tiger-3.2.1.orig/USING +++ tiger-3.2.1/USING @@ -72,7 +72,7 @@ there *is* new information. This can be helpful to make Tiger behave as a Host Intrusion Detection -System (HIDS) but it has some caveats, make sure to read README.hids +System (HIDS) but it has some caveats, make sure to read README.hostids if your intention is to use Tiger in this way. ------------------------------------------------------------------------ tiger-3.2.1-fixes.patch: --- NEW FILE tiger-3.2.1-fixes.patch --- --- ./config.fixes 2003-09-19 02:46:26.000000000 +0200 +++ ./config 2005-08-07 16:14:27.000000000 +0200 @@ -17,6 +17,16 @@ # # config (top level) - 06/14/93 # +# 06/22/2005 jfs Abort signature generation if the user does not +# have permissions to change the directories signatures are +# stored in. +# 01/21/2005 jfs Safer creation of $WORKDIR if undefined +# 08/13/2004 jfs Setup all locales as 'C' (Debian bug #270108) +# 04/28/2004 jfs Changed -f RCFILE check to -r to allow use through ssh +# as suggested by Falk Siemonsmeier: +# cat /etc/tiger/tigerrc | ssh tiger -c /dev/stdin +# 01/13/2004 jfs Added check when running with -f since on some (unconfigured) +# systems this might fail. # 08/19/2003 jfs tara -> Tiger in the usage # 08/13/2003 jfs Added some of ARSC changes including: # - support for signature generation (enhanced with also @@ -47,8 +57,8 @@ # This is important to avoid problems with commands that are # dependant on the defined language environment LANG="C" -LC_TIME="C" -export LANG LC_TIME +LC_ALL="C" +export LANG LC_ALL error_siggen() { dir=$1 @@ -70,7 +80,7 @@ if [ ! -d "$BASEDIR/systems/$OS/$REV/$ARCH/" ] then printf "Creating the directory $BASEDIR/systems/$OS/$REV/$ARCH/ where signatures will be stored..." - mkdir -p "$BASEDIR/systems/$OS/$REV/$ARCH/" + mkdir -p "$BASEDIR/systems/$OS/$REV/$ARCH/" || { echo "Cannot create directory '$BASEDIR/systems/$OS/$REV/$ARCH/'!" >&2; exit 1; } echo "...created" fi # NOTE: I'm not sure it's ok to create the directory since @@ -92,7 +102,7 @@ then printf "Generating and installing file access lists..." $BASEDIR/util/mkfilelst - mv "file_access_list.$OS-$REV-$ARCH" $BASEDIR/systems/$OS/$REV/$ARCH/file_access_list + mv "file_access_list.$OS-$REV-$ARCH" $BASEDIR/systems/$OS/$REV/$ARCH/file_access_list || { echo "Cannot move files to '$BASEDIR/systems/$OS/$REV/$ARCH/'!" >&2; exit 1; } echo "...done" else error_siggen "$PWD" "file_access_list.$OS-$REV-$ARCH" "$WORKDIR" @@ -104,13 +114,22 @@ do_usage() { echo "Tiger, version $TIGERVERSION" -echo "Usage: ./tiger [-B dir] [-d dir|@host] [-w dir] [-b dir] [-e|-E] [-GH] [-q]" +echo "Usage: ./tiger [-vthqGSH] [-B dir] [-l dir|@host] [-w dir] [-b dir] [-e|-E] [-c config] [-A arch] [-O os] [-R release]" +echo "" +echo " -v Show the Tiger version." +echo "" +echo " -t Run in test mode." +echo "" +echo " -h Show usage (this help)." +echo "" +echo " -q Supress messages to be as quiet as possible, only " +echo " security messages will be shown." echo "" echo " -B name" echo " Specify the directory where tiger is installed. If" echo " not specified, '$BASEDIR' is used." echo "" -echo " -d name" +echo " -l name" echo " Specify the name of the directory where Tiger will" echo " write the security report. This defaults to " echo " '$LOGDIR'. The filename of the report will be of " @@ -159,8 +178,16 @@ echo " same time. The checks will not be as in depth as" echo " they would be if run on the client itself." echo "" -echo " -q Supress messages to be as quiet as possible, only " -echo " security messages will be shown." +echo "Overrides for values detected by the configuration system:" +echo " -A arch" +echo " Specify an alternate architecture for tiger" +echo "" +echo " -O os" +echo " Specify an alternate operating system for tiger" +echo "" +echo " -R release" +echo " Specify an alternate operating system release " +echo " for tiger" echo "" echo "Report bugs at http://savannah.nongnu.org/projects/tiger" } @@ -203,7 +230,7 @@ fi LOGDIR=${TigerLogDir:=.} - WORKDIR=${TigerWorkDir:=${TMPDIR:=/tmp}} + WORKDIR="$TigerWorkDir" RCFILE=${TigerConfigDir:=.}/tigerrc IGNORE_FILE=${TigerConfigDir:=.}/tiger.ignore TIGERHOMEDIR="$BASEDIR" @@ -241,7 +268,6 @@ shift; done - TIGERVERSION="`/bin/cat $TIGERHOMEDIR/version.h 2>/dev/null`" [ ! -n "$TIGERVERSION" ] && TIGERVERSION="undetermined" export TIGERVERSION @@ -251,6 +277,19 @@ exit 0 } + if [ -z "$WORKDIR" ] ; then + WORKDIR=${TMPDIR:=/tmp} + ( umask 077; mkdir $WORKDIR/tiger.$$ ) || { echo "$0: Cannot create temporary directory" >&2; exit 1; } + WORKDIR="$WORKDIR/tiger.$$" + fi + # TODO: WORKDIR should be removed on exit if it is located in a temporary + # directory + if [ ! -d "$WORKDIR" ] ; then + echo "Configured working directory $WORKDIR does not exist" >&2 + exit 1 + fi + + [ "$QUIET" != "Y" ] && echo "Configuring..." set X `$BASEDIR/util/gethostinfo` unknown unknown unknown @@ -336,8 +375,8 @@ done } - [ -n "$RCFILE" -a ! -f "$RCFILE" ] && { - echo "Control file "$RCFILE" not found... exiting..." + [ -n "$RCFILE" -a ! -r "$RCFILE" ] && { + echo "Control file "$RCFILE" not defined or not readable... exiting..." exit 1 } @@ -345,7 +384,7 @@ # Preprocess the RC file, to export variables to environment # - [ -n "$RCFILE" -a -f $RCFILE ] && { + [ -n "$RCFILE" -a -r $RCFILE ] && { $GREP -v '^#' $RCFILE | $SED -e 's/^\(.*\)=/export \1; \1=/' > $WORKDIR/rcfile.$$ . $WORKDIR/rcfile.$$ @@ -357,7 +396,9 @@ then # Linux hostname has the -f option for FQDN... (jfs) # (others?) - HOSTNAME=`$GETHOSTNAME -f` + HOSTNAME=`$GETHOSTNAME -f 2>/dev/null` +# But sometimes this will fail.... (if the system is not properly setup) + [ $? -ne 0 ] && HOSTNAME=`$GETHOSTNAME` fi for file in './site-$HOSTNAME' '$BASEDIR/site-$HOSTNAME' './site' '$BASEDIR/site' @@ -388,4 +429,8 @@ . $WORKDIR/tigercmds.$$ $RM -f $WORKDIR/tigercmds.$$ } + + # set the PATH + PATH=/sbin:/usr/sbin:/bin:/usr/bin + export PATH } --- ./tigercron.in.fixes 2003-08-19 18:34:27.000000000 +0200 +++ ./tigercron.in 2005-08-07 16:14:27.000000000 +0200 @@ -248,6 +248,7 @@ done >> $WORKDIR/tigcron.diff.$$ [ ! -n "$Tiger_Mail_RCPT" ] && Tiger_Mail_RCPT="root" +[ ! -n "$Tiger_Mail_FROM" ] && Tiger_Mail_FROM="root@$HOSTNAME" length=1 if [ ! -n "$EGREP" ] ; then @@ -257,13 +258,13 @@ [ -s "$WORKDIR/tigcron.diff.$$" -a $length -gt 0 ] && { send="Y" [ "$Tiger_Cron_SendOKReports" = "N" ] && - [ -z "`grep ERR $WORKDIR/tigcron.diff.$$`" ] && + [ -z "`grep ERR $WORKDIR/tigcron.diff.$$`" ] && [ -z "`grep WARN $WORKDIR/tigcron.diff.$$`" ] && { send="N" } haveallcmds MAILER && [ "$send" = "Y" ] && { # Mail header (so it does not just say it's root - echo "From: Tiger automatic auditor at $HOSTNAME " + echo "From: \"Tiger automatic auditor at $HOSTNAME\" <$Tiger_Mail_FROM>" echo "Subject: Tiger Auditing Report for $HOSTNAME" echo cat $WORKDIR/tigcron.diff.$$ --- ./tigercron.fixes 2003-08-19 19:37:42.000000000 +0200 +++ ./tigercron 2005-08-07 16:14:27.000000000 +0200 @@ -256,6 +256,7 @@ done >> $WORKDIR/tigcron.diff.$$ [ ! -n "$Tiger_Mail_RCPT" ] && Tiger_Mail_RCPT="root" +[ ! -n "$Tiger_Mail_FROM" ] && Tiger_Mail_FROM="root@$HOSTNAME" length=1 if [ ! -n "$EGREP" ] ; then @@ -271,7 +272,8 @@ } haveallcmds MAILER && [ "$send" = "Y" ] && { # Mail header (so it does not just say it's root - echo "From: Tiger automatic auditor at $HOSTNAME " + echo "From: \"Tiger automatic auditor at $HOSTNAME\" <$Tiger_Mail_FROM>" + echo "To: $Tiger_Mail_RCPT" echo "Subject: Tiger Auditing Report for $HOSTNAME" echo cat $WORKDIR/tigcron.diff.$$ --- ./initdefs.fixes 2003-10-10 19:05:48.000000000 +0200 +++ ./initdefs 2005-08-07 16:14:27.000000000 +0200 @@ -16,6 +16,13 @@ # # initdefs - 06/14/93 # +# initdefs - 01/10/2005 - cslater - Modified ignore function so that +# filtering can also be done on msgid and level +# initdefs - 08/01/2004 - jfs - Allow removal from LOGDIR so that tiger -e +# works as expected +# initdefs - 10/15/2003 - jfs - Quoted $__File in deleted() in order +# for the check_rootkit check to work properly. +# (Debian bug #215882) # initdefs - 10/10/2003 - jfs - Improved check so that it will not # remove files created by a different user and # warn if files to be deleted do not exist @@ -117,14 +124,14 @@ do if [ -n "$LS" ] then - if [ -z "`$LS $__file 2>/dev/null`" ] + if [ -z "`$LS \"$__file\" 2>/dev/null`" ] then # echo "--ERROR-- [post001e] File \`$__file' will not be removed since it does not exist" goahead=0 fi if [ $goahead -eq 1 -a -n "$AWK" -a -n "$UUID" ] then - if [ "$UUID" != "`$LS -nl $__file | $AWK '{print $3}'`" ] + if [ "$UUID" != "`$LS -nl \"$__file\" | $AWK '{print $3}'`" ] then echo "--ERROR-- [post001e] File \`$__file' will not be removed since it has not been created by the current user (symlink attack?)." goahead=0 @@ -134,6 +141,7 @@ [ $goahead -eq 1 ] && { eval "case \"\$__file\" in $WORKDIR*) $RM -f \"\$__file\";; + $LOGDIR*) $RM -f \"\$__file\";; *) echo \"--ERROR-- [post001e] File \\\`\$__file' not removed.\";; esac" } @@ -164,7 +172,7 @@ __len=${Tiger_Output_Width:=79} # If the message should be ignore it is removed - ignore_message "$_mesg" && return + ignore_message "$_level $_msgid $_mesg" && return [ "$HTML" = "N" ] && { @@ -505,15 +513,15 @@ if [ $__script_owner -eq $UUID ]; then $__script_run else - echo "--ERROR-- [misc024w] The $__script_run script will not be run since it is owned by a user ($__script_owner) different than the one running Tiger ($UUID)" + echo "--ERROR-- [misc024e] The $__script_run script will not be run since it is owned by a user ($__script_owner) different than the one running Tiger ($UUID)" __error=1 fi else - echo "--ERROR-- [misc025w] The $__script_run will not be run since it is not executable" + echo "--ERROR-- [misc025e] The $__script_run will not be run since it is not executable" __error=1 fi else - echo "--ERROR-- [misc005w] Can't find '$script'..." + echo "--ERROR-- [misc005e] Can't find '$script'..." __error=1 fi done --- ./c/getpermit.c.fixes 2002-06-14 10:51:31.000000000 +0200 +++ ./c/getpermit.c 2005-08-07 16:14:27.000000000 +0200 @@ -3,6 +3,7 @@ #include #include #include +#include /* tiger - A UN*X security checking system Copyright (C) 1993 Douglas Lee Schales, David K. Hess, David R. Safford --- ./tiger.fixes 2003-10-07 00:20:24.000000000 +0200 +++ ./tiger 2005-08-07 16:14:27.000000000 +0200 @@ -21,6 +21,11 @@ # all the checks configured for your system in the tigerrc configuration # file. # +# 05/14/2005 jfs Patch from Nicolas Fran??ois which fixes aide output handling +# 01/25/2005 cslater Added separate config variable for +# check_passwdformat. +# 01/15/2003 jfs Check should use INETDCONF (and not INETDFILE). +# (Temporary fix: defined it if undefined) # 09/03/2003 jfs Included check_ssh to the checks # 08/19/2003 jfs check_cron is now check_crontabs # 08/15/2003 jfs Integrated ARSC log to syslog mechanism but modified @@ -43,7 +48,7 @@ echo "Tiger UN*X security checking system" echo " Developed by Texas A&M University, 1994" echo " Updated by the Advanced Research Corporation, 1999-2002" -echo " Further updated by Javier Fernandez-Sanguino, 2001-2003" +echo " Further updated by Javier Fernandez-Sanguino, 2001-2005" echo " Covered by the GNU General Public License (GPL)" echo TigerInstallDir="." @@ -195,7 +200,7 @@ run_script find_files >> $logtmp else echo "`$TIMECMD`> Starting file systems scans in background..." - $SCRIPTDIR/find_files > $WORKDIR/fsscan.log$$ & + $SCRIPTDIR/find_files > $WORKDIR/fsscan.log$$ 2>/dev/null & fspid=$! fi } @@ -243,6 +248,9 @@ [ "$Tiger_Check_PASSWD" != 'N' ] && { echo "`$TIMECMD`> Checking password files..." run_script check_passwd >> $logtmp +} + +[ "$Tiger_Check_PASSWD_FORMAT" != 'N' ] && { echo "`$TIMECMD`> Checking password format..." run_script check_passwdformat >> $logtmp } @@ -301,10 +309,21 @@ } [ "$Tiger_Check_INETD" != 'N' ] && { - echo "`$TIMECMD`> Checking 'inetd' configuration..." - run_script check_inetd >> $logtmp - echo "`$TIMECMD`> Checking 'tcpd' configuration..." - run_script check_tcpd >> $logtmp + # Temporary definition until all the config files (and gen_inetd + # scripts) are updated. + [ -z "$INETDCONF" ] && INETDCONF="/etc/inetd.conf" + [ -z "$XINETDCONF" ] && XINETDCONF="/etc/xinetd.conf" + + [ -n "$INETDCONF" ] && [ -f "$INETDCONF" ] && { + echo "`$TIMECMD`> Checking 'inetd' configuration..." + run_script check_inetd >> $logtmp + echo "`$TIMECMD`> Checking 'tcpd' configuration..." + run_script check_tcpd >> $logtmp + } + [ -n "$XINETDCONF" ] && [ -f "$XINETDCONF" ] && { + echo "`$TIMECMD`> Checking 'xinetd' configuration..." + run_script check_xinetd >> $logtmp + } } [ "$Tiger_Check_SERVICES" != 'N' ] && { @@ -427,6 +446,16 @@ run_script check_ftpusers >> $logtmp } +[ "$Tiger_Check_OMNIBACK" != 'N' ] && { + echo "`$TIMECMD`> Checking omniback configuration..." + run_script check_omniback >> $logtmp +} + +[ "$Tiger_Check_NTP" != 'N' ] && { + echo "`$TIMECMD`> Checking NTP configuration..." + run_script check_ntp >> $logtmp +} + # # When not doing checks of all setuid executables, we can do # embedded checks while the file system scans are running. @@ -480,8 +509,8 @@ [ -n "$aidepid" ] && { echo "`$TIMECMD`> Waiting for Aide to finish..." wait $aidepid - $CAT $tripout >> $logtmp - delete $tripout + $CAT $aideout >> $logtmp + delete $aideout } 2>/dev/null #echo "`$TIMECMD`> Security report completed for ${HOSTNAME}." --- ./util/getfs-nfs.fixes 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getfs-nfs 2005-08-07 16:14:27.000000000 +0200 @@ -58,7 +58,3 @@ done # exit 0 -# -exit 0 -# -exit 0 --- ./util/getfs-amd.fixes 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getfs-amd 2005-08-07 16:14:48.000000000 +0200 @@ -63,7 +63,7 @@ $SORT > $WORKDIR/gfsa2.$$ if [ -s $WORKDIR/gfsa2.$$ ]; then - $JOIN -a1 -j 1 -o 1.2 1.3 2.2 $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ | + $JOIN -a1 -j 1 -o "1.2 1.3 2.2" $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ | while read user dir location do echo $user $dir ${location:=$HOSTNAME} @@ -79,7 +79,3 @@ $RM -f $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ # exit 0 -# -exit 0 -# -exit 0 --- ./util/getfs-std.fixes 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getfs-std 2005-08-07 16:14:27.000000000 +0200 @@ -20,6 +20,8 @@ #----------------------------------------------------------------------------- # +[ -z "$SED" ] && SED=`which sed` + haveallof() { retval=0 @@ -44,7 +46,3 @@ # exit 0 -# -exit 0 -# -exit 0 --- ./util/getfs-automount.fixes 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getfs-automount 2005-08-07 16:15:17.000000000 +0200 @@ -62,7 +62,7 @@ $SORT > $WORKDIR/gfsa2.$$ if [ -s $WORKDIR/gfsa2.$$ ]; then - $JOIN -a1 -j 1 -o 1.2 1.3 2.2 $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ | + $JOIN -a1 -j 1 -o "1.2 1.3 2.2" $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ | while read user dir location do if [ ! -n "$location" ]; then @@ -86,7 +86,3 @@ $RM -f $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ # exit 0 -# -exit 0 -# -exit 0 --- ./config.in.fixes 2003-08-19 18:34:00.000000000 +0200 +++ ./config.in 2005-08-07 16:14:27.000000000 +0200 @@ -24,6 +24,7 @@ # 04/15/2003 jfs Modified to support -B to work in the local dir # 04/21/2003 jfs Modified to only use hostname -f for Linux _and_ # moved hostname check after RCFILE parsing! +# 08/13/2004 jfs Setup all locales as 'C' (Debian bug #270108) # #----------------------------------------------------------------------------- # @@ -38,8 +39,8 @@ # This is important to avoid problems with commands that are # dependant on the defined language environment LANG="C" -LC_TIME="C" -export LANG LC_TIME +LC_ALL="C" +export LANG LC_ALL checkfile() { @@ -79,7 +80,7 @@ fi LOGDIR=${TigerLogDir:=.} - WORKDIR=${TigerWorkDir:=${TMPDIR:=/tmp/}} + WORKDIR="$TigerWorkDir" RCFILE=${TigerConfigDir:=.}/tigerrc IGNORE_FILE=${TigerConfigDir:=.}/tiger.ignore TIGERHOMEDIR="$BASEDIR" @@ -124,6 +125,19 @@ exit 0 } + if [ -z "$WORKDIR" ] ; then + WORKDIR=${TMPDIR:=/tmp} + ( umask 077; mkdir $WORKDIR/tiger.$$ ) || { echo "$0: Cannot create temporary directory" >&2; exit 1; } + WORKDIR="$WORKDIR/tiger.$$" + fi + # TODO: WORKDIR should be removed on exit if it is located in a temporary + # directory + if [ ! -d "$WORKDIR" ] ; then + echo "Configured working directory $WORKDIR does not exist" >&2 + exit 1 + fi + + echo "Configuring..." set X `$BASEDIR/util/gethostinfo` unknown unknown unknown tiger-3.2.1-gcc4.patch: --- NEW FILE tiger-3.2.1-gcc4.patch --- --- ./c/realpath.c.gcc4 2005-08-06 23:54:13.000000000 +0200 +++ ./c/realpath.c 2005-08-07 00:04:17.000000000 +0200 @@ -55,8 +55,8 @@ #endif #ifdef __STDC__ -extern char *getwd(char * const); -extern int readlink(char * const, char * const, const size_t); +//extern char *getwd(char * const); +//extern int readlink(char * const, char * const, const size_t); extern char *my_realpath(const char *, char [], int); extern char *_realpath(char [], int); #else @@ -109,7 +109,7 @@ int linkcount = 0; if(path[0] != '/'){ - getwd(buffer); + getwd(buffer, sizeof(buffer)); prevslash = buffer+strlen(buffer); strcpy(prevslash,"/"); strcpy(prevslash+1,path); tiger-3.2.1-scripts.patch: --- NEW FILE tiger-3.2.1-scripts.patch --- --- ./scripts/sub/check_devs.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_devs 2006-05-01 10:21:40.000000000 +0200 @@ -69,7 +69,7 @@ eval $greps | $GREP -v '^'/hw> $WORKDIR/dev.list.$$ [ -s $WORKDIR/dev.list.$$ ] && { - message WARN fsys006a "" "Unexpected device files found:" + message ALERT fsys006a "" "Unexpected device files found:" $SORT $WORKDIR/dev.list.$$ | while read file do --- ./scripts/sub/check_names.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_names 2006-05-01 10:21:40.000000000 +0200 @@ -53,10 +53,10 @@ file="`$BASENAME \"$pathname\"`" case "$file" in .FSP*) - echo "--WARN-- [fsys009w] FSP server control file found:" + message WARN fsys009w "" "FSP server control file found:" $LS $LSGROUP -ld "$pathname";; *) - echo "--ALERT-- [fsys005a] Unusual filename \`$file' found:" + message ALERT fsys005a "" "Unusual filename \`$file' found:" $LS $LSGROUP -ld "$pathname";; esac done --- ./scripts/sub/check_suid.scripts 2002-10-28 17:22:46.000000000 +0100 +++ ./scripts/sub/check_suid 2006-05-01 10:21:40.000000000 +0200 @@ -18,6 +18,10 @@ # sub/check_suid - 06/14/93 # #----------------------------------------------------------------------------- +# TODO +# - Consider fixing the Tiger_Admin_Accounts check so that it takes into +# account Tiger_Accounts_Trust too +#----------------------------------------------------------------------------- # This script is not runnable directly. # inputfile="$1" @@ -65,6 +69,18 @@ $LS $LSGROUP -ld "$file" } + getpermit "$file" 2>/dev/null | + while read _file owner group ur uw ux gr gw gx or ow ox suid sgid stk + do + eval "case \"$owner\" in + \"$Tiger_Admin_Accounts\"|root) + ;; + *) + message FAIL fsys0012w \"\" \"File $file is not owned by an administrative user.\" + $LS $LSGROUP -ld \"$file\" + esac" + done + case "$file" in *xterm) { message WARN misc013w "" "$file: see CERT Advisory CA-93:17 about a security hole in xterm (does not apply to HP-UX)." @@ -162,7 +178,7 @@ haveallcmds LS AWK && { [ -s $WORKDIR/suid.list.$$ ] && { - message INFO fsys004i "" 'The following setuid programs are non-standard:' + message ALERT fsys004a "" 'The following setuid programs are non-standard:' while read file do $LS $LSGROUP -ld "$file" --- ./scripts/sub/check_wdir.scripts 2002-10-28 17:22:46.000000000 +0100 +++ ./scripts/sub/check_wdir 2006-05-01 10:21:40.000000000 +0200 @@ -78,7 +78,7 @@ eval $greps > $WORKDIR/wdir.tmp.$$ [ -s $WORKDIR/wdir.tmp.$$ ] && { - echo "--INFO-- [fsys008i] The following directories are world writable:" + message FAIL fsys008f "" 'The following directories are world writable:' $SORT $WORKDIR/wdir.tmp.$$ } --- ./scripts/sub/check_sgid.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_sgid 2006-05-01 10:21:40.000000000 +0200 @@ -89,7 +89,7 @@ haveallcmds LS AWK && { [ -s $WORKDIR/sgid.list.$$ ] && { - message INFO fsys011i "" 'The following setgid programs are non-standard:' + message ALERT fsys011a "" 'The following setgid programs are non-standard:' while read file do $LS $LSGROUP -ld "$file" --- ./scripts/sub/check_embed.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_embed 2006-05-01 10:21:40.000000000 +0200 @@ -184,7 +184,7 @@ } done 2>/dev/null | $SORT -u | - $JOIN -o 1.2 2.1 2.2 - $oldfile | + $JOIN -o "1.2 2.1 2.2" - $oldfile | $AWK '{ if($3 != "") printf("%s %s->%s\n", $1, $2, $3); @@ -222,14 +222,14 @@ fi done | $SORT -u | - $JOIN -o 2.1 2.2 - $WORKDIR/scr.$$ + $JOIN -o "2.1 2.2" - $WORKDIR/scr.$$ > $oldfile [ -s $newfile ] && { $SORT -u $newfile $record > $record.new $SORT -u $newfile | - $JOIN -o 2.1 2.2 - $WORKDIR/scr.$$ | + $JOIN -o "2.1 2.2" - $WORKDIR/scr.$$ | $SORT -u > $oldfile } @@ -282,9 +282,5 @@ done delete $newfile $oldfile $record $WORKDIR/tmp1.$$ -# -exit 0 -# -exit 0 -# + exit 0 --- ./scripts/sub/check_links.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_links 2006-05-01 10:23:12.000000000 +0200 @@ -49,17 +49,17 @@ haveallfiles WORKDIR || exit 1 $REALPATH < $file | -$SORT +1 > $WORKDIR/link.tmp.$$ +$SORT -k 1 > $WORKDIR/link.tmp.$$ $GREP -v '^#' $FILE_ACL | $SORT | -$JOIN -j2 2 -o 2.1 2.2 1.1 - $WORKDIR/link.tmp.$$ | +$JOIN -2 2 -o "2.1 2.2 1.1" - $WORKDIR/link.tmp.$$ | while read file realfile facl do $LS -ld $LSGROUP "$file" | { read p l owner group s a b c f [ "$owner" != 'root' -a "$owner" != 'bin' ] && { - echo "--INFO-- [fsys007i] Symbolic link \`$file' points to \`$realfile'." + message INFO fsys007i "" "Symbolic link \`$file' points to \`$realfile'." } } done --- ./scripts/check_ftpusers.scripts 2003-10-07 00:24:00.000000000 +0200 +++ ./scripts/check_ftpusers 2006-05-01 10:21:40.000000000 +0200 @@ -20,6 +20,8 @@ # Analyses the system's /etc/ftpusers and determines if the administrative # users are in that file. # +# 03/31/2005 jfs Allow FTPUSERS to be customised (some OS have it +# in alternate locations) # 10/01/2003 jfs Removed passwd files if not used any longer. # # 07/25/2002 jfs Added a sanity check for password files. @@ -90,9 +92,13 @@ Tiger_Accounts_Trust = 999 export Tiger_Accounts_Trust } +FTPUSERS=/etc/ftpusers +if [ "$OS" = "SunOS" -a ! -e "$FTPUSERS" ] ; then + FTPUSERS=/etc/ftpd/ftpusers +fi # Do this only if ftpusers exists -if [ -f /etc/ftpusers ]; then +if [ -f "$FTPUSERS" ]; then if [ -n "$Tiger_PasswdFiles" ]; then [ -f $Tiger_PasswdFiles ] && $CAT "$Tiger_PasswdFiles" > $WORKDIR/pass.list.$$ @@ -111,14 +117,14 @@ # user=`echo $line | $AWK -F: '($3 <= $Tiger_Accounts_Trust) { print $1 }'` # Note: root is removed since it is checked for in check_root - [ -n "$user" -a "$user" != "root" ] && [ -z "`$GREP \"^$user\" /etc/ftpusers`" ] && - message FAIL netw018f "" "Administrative user $user allowed access in /etc/ftpusers" + [ -n "$user" -a "$user" != "root" ] && [ -z "`$GREP \"^$user\" $FTPUSERS`" ] && + message FAIL netw018f "" "Administrative user $user allowed access in $FTPUSERS" done [ ! -n "$Tiger_PasswdFiles" ] && delete $passwd_set $passwd_set.src done else - message FAIL netw020f "" "There is no /etc/ftpusers file." + message FAIL netw020f "" "There is no $FTPUSERS file." fi --- ./scripts/check_printcap.scripts 2003-05-01 19:47:06.000000000 +0200 +++ ./scripts/check_printcap 2006-05-01 10:21:40.000000000 +0200 @@ -19,6 +19,9 @@ # [...11883 lines suppressed...] - $RM -f $WORKDIR/p.$$ + $RM $WORKDIR/u.$$ + $RM $WORKDIR/p.$$ + $RM $WORKDIR/s.$$ else - echo "--FAIL-- [run001e] The file /etc/shadow is available but not readable by the user running Tiger." + echo "--ERROR-- [run001e] The file /etc/shadow is available but not readable by the user running Tiger." fi else @@ -135,20 +168,40 @@ echo "--WARN-- [miscxxxx] The '+' key in the /etc/passwd file should only be used in nsswitch 'compat' mode." } - [ "$source" = compat ] && [ -n "$YP" ] && { - $YPCAT passwd > $WORKDIR/nis_passwd.$$ + [ "$source" = "compat" ] && [ -n "$YPCAT" ] && { + $YPCAT passwd > $WORKDIR/nis_passwd.$$ 2>/dev/null + if [ $? -eq 0 ] ; then echo "NIS" > $WORKDIR/nis_passwd.$$.src echo $WORKDIR/nis_passwd.$$ >> $outfile + else + # Ypcat has not succeeded, remove the temporary file + $RM $WORKDIR/nis_passwd.$$ + fi } ;; - nis) [ "$local" != 1 ] && { - $YPCAT passwd > $WORKDIR/nis_passwd.$$ + nis) [ "$local" != 1 ] && [ -n "$YPCAT" ] && { + $YPCAT passwd > $WORKDIR/nis_passwd.$$ 2>/dev/null + $YPCAT passwd > $WORKDIR/nis_passwd.$$ 2>/dev/null + if [ $? -eq 0 ] ; then echo "NIS" > $WORKDIR/nis_passwd.$$.src echo $WORKDIR/nis_passwd.$$ >> $outfile + else + # Ypcat has not succeeded, remove the temporary file + $RM $WORKDIR/nis_passwd.$$ + fi } ;; -# This is from SunOS, what do to do for Linux? + ldap) [ "$local" != 1 ] && [ -n "$GETENT" ] && { + $GETENT passwd > $WORKDIR/ldap_passwd.$$ 2>/dev/null + if [ $? -eq 0 ] ; then + echo $WORKDIR/ldap_passwd.$$ >> $outfile + else + $RM $WORKDIR/ldap_passwd.$$ + fi + } + ;; +# This is from SunOS, what should we do here for Linux? (if anything) # nisplus) [ "$local" != 1 ] && { # $NISCAT passwd.org_dir > $WORKDIR/nisplus_passwd.$$ # echo "NIS+" > $WORKDIR/nisplus_passwd.$$.src @@ -161,4 +214,4 @@ done - +exit 0 --- ./systems/default/gendlclients.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gendlclients 2006-05-01 10:21:41.000000000 +0200 @@ -16,6 +16,8 @@ # Please see the file `COPYING' for the complete copyright notice. # # default/gendlclients - MM/DD/YY +# 05/02/2004 jfs Try to avoid eval problems if handling variables with +# special characters (such as space) # #----------------------------------------------------------------------------- # @@ -49,5 +51,5 @@ $SORT -u | while read client server filesys do - eval "case $server in $HOSTNAMESLIST) echo $client $filesys;; esac" + eval "case \"$server\" in $HOSTNAMESLIST) echo \"$client $filesys\";; esac" done --- ./systems/default/gen_bootparam_sets.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_bootparam_sets 2006-05-01 10:21:41.000000000 +0200 @@ -41,7 +41,7 @@ echo "$WORKDIR/etc_bootparams.$$" } -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT bootparams > $WORKDIR/nis_bootparams.$$ echo "NIS" > $WORKDIR/nis_bootparams.$$.src echo "$WORKDIR/nis_bootparams.$$" --- ./systems/default/gen_services.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_services 2006-05-01 10:21:41.000000000 +0200 @@ -28,7 +28,7 @@ echo "/etc/services" > $WORKDIR/etc_services.$$.src echo $WORKDIR/etc_services.$$ -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT services > $WORKDIR/nis_services.$$ echo "NIS" > $WORKDIR/nis_services.$$.src echo $WORKDIR/nis_services.$$ --- ./systems/default/gen_alias_sets.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_alias_sets 2006-05-01 10:21:41.000000000 +0200 @@ -53,7 +53,7 @@ echo $WORKDIR/etc_aliases.$$ } -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT -k aliases | $SED -e 's/ /:/' | $SORT | --- ./systems/default/check_ndd.scripts 2003-08-09 12:32:45.000000000 +0200 +++ ./systems/default/check_ndd 2006-05-01 10:21:41.000000000 +0200 @@ -23,6 +23,8 @@ # # 07/11/2003 rbradetich at uswest.net - Initial version. # +# 05/02/2004 jfs Try to avoid eval problems if handling variables with +# special characters (such as space) # 08/09/2003 jfs - Placed in the generic default directory for Unix systems # so that systems can run them using 'check' # @@ -87,7 +89,7 @@ do ([ -z "$dev" ] || [[ $dev = \#* ]]) && continue val=`$NDD -get $dev $parm 2>/dev/null` - eval "case $val in + eval "case \"$val\" in $good) ;; *) --- ./systems/default/gen_group_sets.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_group_sets 2006-05-01 10:21:41.000000000 +0200 @@ -31,7 +31,7 @@ echo "/etc/group" > $WORKDIR/etc_group.$$.src echo $WORKDIR/etc_group.$$ -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT group | $SORT | $COMM -23 - $WORKDIR/etc_group.$$ > $WORKDIR/nis_group.$$ --- ./systems/default/gen_passwd_sets.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_passwd_sets 2006-05-01 10:21:41.000000000 +0200 @@ -17,9 +17,23 @@ # # default/gen_passwd_sets - 06/14/93 # +# 11/18/2003 - jfs - Check if YPCAT is available before calling it. Also +# sanity checks for other commands. +# #----------------------------------------------------------------------------- # +[ ! -n "$SORT" ] && SORT=`which sort` +[ ! -n "$GREP" ] && GREP=`which grep` +[ ! -n "$AWK" ] && AWK=`which awk` +[ ! -n "$JOIN" ] && JOIN=`which join` +[ ! -n "$CAT" ] && CAT=`which cat` +[ ! -n "$RM" ] && RM=`which rm` +[ ! -n "$SED" ] && SED=`which sed` +[ ! -n "$YPCAT" ] && YPCAT=`which ypcat` +[ ! -n "$NISCAT" ] && NISCAT=`which niscat` +[ ! -n "$WORKDIR" ] && WORKDIR=/tmp + local=0 for parm do @@ -34,7 +48,7 @@ echo "/etc/passwd" > $WORKDIR/etc_passwd.$$.src echo $WORKDIR/etc_passwd.$$ >> $outfile -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT passwd > $WORKDIR/nis_passwd.$$ echo "NIS" > $WORKDIR/nis_passwd.$$.src echo $WORKDIR/nis_passwd.$$ >> $outfile --- ./util/getnetgroup.scripts 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getnetgroup 2006-05-01 10:21:41.000000000 +0200 @@ -25,7 +25,7 @@ done } -[ "$YP" = "" ] && { +[ "$YPCAT" = "" ] && { echo "$targets" exit 0 } --- ./util/buildconf.scripts 2003-08-15 00:20:41.000000000 +0200 +++ ./util/buildconf 2006-05-01 10:21:41.000000000 +0200 @@ -126,7 +126,6 @@ GETFS mount GETHOSTNAME hostname GREP grep -GROUPC groups GROUPSS groups HEAD head ID id --- NEW FILE tiger-3.2.1.tar.gz.sig --- ?? --- NEW FILE tiger.README --- Tiger for Fedora ---------------- PLEASE NOTE: Some of the checks do not apply completely to Fedora systems or Fedora's defaults are somewhat different. This might lead to somethings being reported as a security issue when they really aren't (known in the security field as 'false positives') In some cases this might be Tiger's problem (of it being an old UNIX auditing program) or it might be Fedora's. If you feel a security report is not appropriate to your system discuss it in the fedora-extras-list at redhat.com mailing list. If you really think it's a BUG of Tiger, then send a bug-report for the package at https://bugzilla.redhat.com. Please make sure you look at current (open) bugs there. This package is in its first versions, and there is a lot of room for improvement, so please report what you find inappropriate. Configuration ------------- First of all make sure to read, understand and customize /etc/tiger/tigerrc and /etc/tiger/cronrc to adapt to your local security policy, as the warning on installation says "You cannot expect to tiger to work fully to your needs without adapting it". Bugs regarding false positives which can be fixed by the proper configuration and/or use of templates (see below) will be set to "wishlist", even if the bug submitter thinks they are "serious". Using Templates --------------- Tiger in Fedora can compare against "templates" when running through a cron job. That is, you can take a given log from a previous run (at /var/log/tiger) rename it with a ".template" instead of a ".[number]" and place it under /etc/tiger/templates. Tiger checks will compare against it. That way Tiger will only report issues when they changed from the template (if configured in /etc/tiger/tigerrc). Another (less secure) method is to have Tiger only report changes from previous runs, please note that in this setup problems will only be reported *once* in cron jobs, regardless of importance. This is the default behavior, that is, this will work just after installation. KNOWN ISSUES ------------ (these are *not* BUGS) - shells on default users. It should check if the services are enabled (i.e. the user is useful here). TODO ---- - Possible new checks: . check all files and see if they are of the same user/group as their root dir . look for files with no uid in /etc/passwd and gid in /etc/group - Warn about updates with "yum check-update" - Use rpm -V to check which files have changed TESTING ------- . Check for files not in /usr/local and /home not owned by any package (easy with rpm -qf) (Note: Currently looks only in binary paths /bin /usr/bin... not in all the filesystem) Debian-specific adaptations made by Javier Fernandez-Sanguino Pe?a Imported and adapted for Fedora by Aurelien Bompard --- NEW FILE tiger.cron --- # # Regular cron jobs for the tiger package # 0 * * * * root test -x /usr/sbin/tigercron && /usr/sbin/tigercron -q --- NEW FILE tiger.ignore --- # Fedora uses a "mail" group to allow some access to /var/spool/mail. Login ID mail's home directory \(/var/spool/mail\) has group `mail' write access. # Fedora uses a "gdm" group to allow GDM to write ti /var/gdm Login ID gdm's home directory \(/var/gdm\) has group `gdm' write access. # nfsnobody is not a real user account, thus it does not have shell init file in its homedir Login ID nfsnobody may be missing a shell initialization file /var/lib/nfs/.nologinrc. # Standard perm in Fedora: 664 Log file /var/log/wtmp permission should be 644 /var/log/wtmp should not have group write. # Standard perm in Fedora: 600 Log file /var/log/btmp permission should be 660 # Standard perm in Fedora: 664 Log file /var/run/utmp permission should be 644 # Does not exist in Fedora Log file /var/log/loginlog does not exist # Standard perm in Fedora: 600 Log file /var/log/messages permission should be 640 # Does not exist by default in Fedora Root crontab does not exist # Standard service ports in Fedora The port for service fsp is also assigned to service ftp. The port for service whois is also assigned to service nicname. The port for service www is also assigned to service http. The port for service snmp-trap is also assigned to service snmptrap. The port for service z3950 is also assigned to service z39.50. The port for service ulistserv is also assigned to service ulistproc. The port for service route is also assigned to service router. The port for service font-service is also assigned to service xfs. The port for service kerberos4 is also assigned to service kerberos-iv. The port for service krb_prop is also assigned to service krb5_prop. The port for service ssmtp is also assigned to service smtps. The port for service rmtcfg is also assigned to service bvcontrol. The port for service zebrasrv is also assigned to service hpstgmgr. The port for service zebra is also assigned to service discp-client. The port for service ripd is also assigned to service discp-server. The port for service ripngd is also assigned to service servicemeter. The port for service ospfd is also assigned to service nsc-ccs. The port for service bgpd is also assigned to service nsc-posa. The port for service ospf6d is also assigned to service netmon. The port for service kpasswd is also assigned to service rxe. The port for service kx is also assigned to service dsatp. The port for service moira_db is also assigned to service entomb. The port for service moira_update is also assigned to service multiling-http. The port for service predict is also assigned to service eoss. The port for service xtelw is also assigned to service pdps. The port for service ndtp is also assigned to service search. The port for service afmbackup is also assigned to service zarkov. The port for service pcrd is also assigned to service esri_sde. The port for service mrtd is also assigned to service hyperscsi-port. The port for service bgpsim is also assigned to service v5ua. The port for service sane is also assigned to service sane-port. The port for service omniorb is also assigned to service radan-http. # Set in /etc/bashrc There are no umask entries in /etc/profile # Set in /etc/csh/cshrc There are no umask entries in /etc/csh.login # Standard perm in Fedora: 4666 /dev/log has world permissions # Standard perm in Fedora: 644 /dev/rtc has world permissions # Standard perm in Fedora: 666 /dev/ptmx has world permissions # Normal in Fedora The directory /dev/snd resides in a device directory. # Standard perm in Fedora: 644 /etc/xinetd.conf permissions are not 600. # Standard perm in Fedora: 644 /etc/xinetd.d/.* permissions are not 600. # Normal in Fedora Group root\(0\) has got the following members: root # Normal in Fedora Group bin\(1\) has got the following members: root,bin,daemon # Normal in Fedora Group daemon\(2\) has got the following members: root,bin,daemon # Normal in Fedora Login halt has a group id of 0 which should be reserved for root # Normal in Fedora Login operator has a group id of 0 which should be reserved for root # Normal in Fedora Login shutdown has a group id of 0 which should be reserved for root # Normal in Fedora Login sync has a group id of 0 which should be reserved for root --- NEW FILE tiger.ignore.server --- # Mysql database server Program mysqld \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /var/log/mysql/mysql\.err\.[[:digit:]]+ \(deleted\) Program mysqld \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /tmp/.* \(deleted\) and is a a server listening on port\(s\) mysql # Apache web server Server /usr/sbin/apache \(pid [[:digit:]]+\) is using deleted files Program apache \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /tmp/session_mm_apache0.sem \(deleted\) The parent process of server /usr/sbin/apache \(pid [[:digit:]]+\) is using deleted files # Cupds printer daemon Server /usr/sbin/cupsd \(pid [[:digit:]]+\) is using deleted files Program cupsd \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /var/log/cupsd/error_log\..* \(deleted\) #Mailman list manager Program python \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /var/log/mailman/.* \(deleted\) # Squid proxy Server \(squid\) .* \(pid [[:digit:]]+\) is using deleted files # SSH users accessing remotely with X11 forwarding 'on' The process `sshd' is listening on socket 6[[:digit:]]+ (TCP on loopback interface) is run by .* --- NEW FILE tiger.spec --- Name: tiger Version: 3.2.1 Release: 4%{?dist} Summary: Security auditing on UNIX systems Group: Applications/System License: GPL URL: http://www.nongnu.org/tiger/ Source0: http://savannah.nongnu.org/download/tiger/tiger-3.2.1.tar.gz Source1: http://savannah.nongnu.org/download/tiger/tiger-3.2.1.tar.gz.sig Source2: tiger.cron Source3: tiger.ignore Source4: tiger.ignore.server Source5: tiger.README Patch0: tiger-3.2.1-autotools.patch # Default configuration Patch1: tiger-3.2.1-config.patch # Mainly typos Patch2: tiger-3.2.1-doc.patch # Fixes in the checking scripts and additional scripts Patch3: tiger-3.2.1-scripts.patch # Various fixes Patch4: tiger-3.2.1-fixes.patch # Fix for one small C program Patch5: tiger-3.2.1-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, recode Requires: bash, vixie-cron %description TIGER, or the "tiger" scripts, is a set of Bourne shell scripts, C programs and data files which are used to perform a security audit of UNIX systems. It is designed to hopefully be easy to use, easy to understand and easy to enhance. %prep %setup -q -n tiger %patch0 -p1 -b .autotools %patch1 -p1 -b .config # No backup, or the files will be copied in the buildroot #%patch2 -p1 -b .doc #%patch3 -p1 -b .scripts %patch2 -p1 %patch3 -p1 %patch4 -p1 -b .fixes %patch5 -p1 -b .gcc4 find . -name "*.rpmorig" | xargs rm -f find . -name "*.orig" | xargs rm -f find . -name "*.old" | xargs rm -f recode ISO-8859-1..UTF-8 man/tiger.8.in install -p -m 644 %{SOURCE5} README.Fedora # Remove CVS dirs find . -type d -name CVS | xargs rm -rf %build autoconf %configure \ --with-tigerhome=%{_libdir}/tiger \ --with-tigerwork=%{_localstatedir}/run/tiger/work \ --with-tigerlog=%{_localstatedir}/log/tiger \ --with-tigerbin=%{_sbindir} \ --with-tigerconfig=%{_sysconfdir}/tiger make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tiger/templates install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/tiger install -p -m 600 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tiger/tiger.ignore install -p -m 644 version.h $RPM_BUILD_ROOT%{_libdir}/tiger for system in AIX HPUX IRIX NeXT SunOS UNICOS UNICOSMK Tru64 MacOSX; do rm -rf $RPM_BUILD_ROOT%{_libdir}/tiger/systems/${system}; done ln -s %{_sbindir}/tigexp $RPM_BUILD_ROOT%{_libdir}/tiger/tigexp mkdir examples cp -p cronrc tigerrc tigerrc-all tigerrc-dist tigerrc-TAMU \ site-sample site-saturn %{SOURCE4} examples chmod 644 examples/* # Perm fixes chmod +x $RPM_BUILD_ROOT%{_libdir}/tiger/systems/Linux/2/check_* # Documentation (in %%doc) rm -rf $RPM_BUILD_ROOT%{_libdir}/tiger/html %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc USING BUGS.EXTERN DESCRIPTION CREDITS README README.1st README.hostids %doc README.ignore README.linux README.signatures README.sources %doc README.time README.unsupported README.writemodules TODO README.Fedora %doc COPYING examples html %{_mandir}/man*/* %{_sbindir}/* %{_libdir}/tiger %{_localstatedir}/run/tiger %{_localstatedir}/log/tiger %config(noreplace) %{_sysconfdir}/tiger %config %{_sysconfdir}/cron.d/tiger %changelog * Sat May 13 2006 Aurelien Bompard 3.2.1-4 - include the COPYING file - put HTML doc in %%doc - drop useless logos - fix %%description - remove CVS dirs in %%prep - Thanks to Hans de Goede in bug 165311 * Sat Apr 22 2006 Aurelien Bompard 3.2.1-3 - don't backup some patches, or the files will be copied in the buildroot - set conf files to noreplace - fix manpage encoding * Sun Apr 02 2006 Aurelien Bompard 3.2.1-2 - fix arguments for "sort" and "tail" in patch3 * Sat Aug 06 2005 Aurelien Bompard 3.2.1-1 - initial package, importing Debian's fixes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tiger/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2006 21:36:56 -0000 1.1 +++ .cvsignore 13 May 2006 21:38:59 -0000 1.2 @@ -0,0 +1 @@ +tiger-3.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tiger/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 May 2006 21:36:56 -0000 1.1 +++ sources 13 May 2006 21:38:59 -0000 1.2 @@ -0,0 +1 @@ +7c4d6dc7c56b3b6f8fa349eca7f8e41d tiger-3.2.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 21:45:59 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:45:59 -0700 Subject: owners owners.list,1.988,1.989 Message-ID: <200605132146.k4DLk1G8015497@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15478 Modified Files: owners.list Log Message: add tiger (bug 165311) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.988 retrieving revision 1.989 diff -u -r1.988 -r1.989 --- owners.list 13 May 2006 14:56:56 -0000 1.988 +++ owners.list 13 May 2006 21:45:59 -0000 1.989 @@ -1566,6 +1566,7 @@ Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|tiger|Security auditing tool for UNIX systems|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|tile|Modernized widgets for Tk|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com From fedora-extras-commits at redhat.com Sat May 13 22:35:55 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 13 May 2006 15:35:55 -0700 Subject: rpms/poker-eval/devel poker-eval.spec,1.7,1.8 Message-ID: <200605132235.k4DMZvMi017933@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17916 Modified Files: poker-eval.spec Log Message: New upstream release Index: poker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- poker-eval.spec 23 Apr 2006 19:59:53 -0000 1.7 +++ poker-eval.spec 13 May 2006 22:35:55 -0000 1.8 @@ -1,11 +1,11 @@ Name: poker-eval -Version: 130.0 -Release: 5%{?dist} +Version: 131.0 +Release: 1%{?dist} Summary: Poker hand evaluator library Group: Development/Libraries License: GPL -URL: http://pokersource.org/poker-eval/ -Source0: http://download.gna.org/pokersource/%{name}-%{version}.tar.gz +URL: http://pokersource.org/poker-eval +Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,9 +24,6 @@ %prep %setup -q -# rpmlint fix -chmod -x examples/five_card_hands.c - # use examples/ directory for devel package %doc section mkdir -p tmp/examples && cp examples/*.c tmp/examples rm -f tmp/examples/getopt_w32.c @@ -62,6 +59,10 @@ %exclude %{_libdir}/*.la %changelog +* Sat May 13 2006 Christopher Stone 131.0-1 +- upstream sync +- Remove rpmlint fix since it's no longer needed + * Sun Apr 23 2006 Christopher Stone 130.0-5 - Update URL to new permanent URL From fedora-extras-commits at redhat.com Sun May 14 02:20:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 19:20:03 -0700 Subject: rpms/perl-Test-Differences/FC-5 perl-Test-Differences.spec,1.1,1.2 Message-ID: <200605140220.k4E2K5CR027619@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570/FC-5 Modified Files: perl-Test-Differences.spec Log Message: Bumping release due to repodata inconsistency. Index: perl-Test-Differences.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/FC-5/perl-Test-Differences.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Differences.spec 7 May 2006 02:07:02 -0000 1.1 +++ perl-Test-Differences.spec 14 May 2006 02:20:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Differences Version: 0.47 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test strings and data structures and show differences if not ok Group: Development/Libraries @@ -52,5 +52,8 @@ %changelog +* Sun May 14 2006 Jose Pedro Oliveira - 0.47-2 +- Bumping release (repodata checksum inconsistency for previous release). + * Mon May 01 2006 Jose Pedro Oliveira - 0.47-1 - First build. From fedora-extras-commits at redhat.com Sun May 14 02:20:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 19:20:04 -0700 Subject: rpms/perl-Test-Differences/devel perl-Test-Differences.spec, 1.1, 1.2 Message-ID: <200605140220.k4E2K6p3027623@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570/devel Modified Files: perl-Test-Differences.spec Log Message: Bumping release due to repodata inconsistency. Index: perl-Test-Differences.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/devel/perl-Test-Differences.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Differences.spec 7 May 2006 02:07:02 -0000 1.1 +++ perl-Test-Differences.spec 14 May 2006 02:20:04 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Differences Version: 0.47 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test strings and data structures and show differences if not ok Group: Development/Libraries @@ -52,5 +52,8 @@ %changelog +* Sun May 14 2006 Jose Pedro Oliveira - 0.47-2 +- Bumping release (repodata checksum inconsistency for previous release). + * Mon May 01 2006 Jose Pedro Oliveira - 0.47-1 - First build. From fedora-extras-commits at redhat.com Sun May 14 02:20:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 19:20:02 -0700 Subject: rpms/perl-Test-Differences/FC-4 perl-Test-Differences.spec,1.1,1.2 Message-ID: <200605140220.k4E2KYI5027631@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570/FC-4 Modified Files: perl-Test-Differences.spec Log Message: Bumping release due to repodata inconsistency. Index: perl-Test-Differences.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/FC-4/perl-Test-Differences.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Differences.spec 7 May 2006 02:07:02 -0000 1.1 +++ perl-Test-Differences.spec 14 May 2006 02:20:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Differences Version: 0.47 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test strings and data structures and show differences if not ok Group: Development/Libraries @@ -52,5 +52,8 @@ %changelog +* Sun May 14 2006 Jose Pedro Oliveira - 0.47-2 +- Bumping release (repodata checksum inconsistency for previous release). + * Mon May 01 2006 Jose Pedro Oliveira - 0.47-1 - First build. From fedora-extras-commits at redhat.com Sun May 14 03:28:31 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:28:31 -0700 Subject: rpms/liblrdf - New directory Message-ID: <200605140328.k4E3SXOV030211@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30185/liblrdf Log Message: Directory /cvs/extras/rpms/liblrdf added to the repository From fedora-extras-commits at redhat.com Sun May 14 03:28:32 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:28:32 -0700 Subject: rpms/liblrdf/devel - New directory Message-ID: <200605140328.k4E3SYRM030214@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30185/liblrdf/devel Log Message: Directory /cvs/extras/rpms/liblrdf/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 03:28:54 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:28:54 -0700 Subject: rpms/liblrdf Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605140328.k4E3Su6O030258@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30230 Added Files: Makefile import.log Log Message: Setup of module liblrdf --- NEW FILE Makefile --- # Top level Makefile for module liblrdf all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 14 03:28:55 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:28:55 -0700 Subject: rpms/liblrdf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605140329.k4E3SvNv030261@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30230/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module liblrdf --- NEW 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 May 14 03:29:58 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:29:58 -0700 Subject: rpms/liblrdf import.log,1.1,1.2 Message-ID: <200605140330.k4E3U0D8030347@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30311 Modified Files: import.log Log Message: auto-import liblrdf-0.4.0-6 on branch devel from liblrdf-0.4.0-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liblrdf/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 03:28:54 -0000 1.1 +++ import.log 14 May 2006 03:29:58 -0000 1.2 @@ -0,0 +1 @@ +liblrdf-0_4_0-6:HEAD:liblrdf-0.4.0-6.src.rpm:1147577404 From fedora-extras-commits at redhat.com Sun May 14 03:29:59 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:29:59 -0700 Subject: rpms/liblrdf/devel liblrdf-README.fedora, NONE, 1.1 liblrdf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605140330.k4E3U1s9030353@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30311/devel Modified Files: .cvsignore sources Added Files: liblrdf-README.fedora liblrdf.spec Log Message: auto-import liblrdf-0.4.0-6 on branch devel from liblrdf-0.4.0-6.src.rpm --- NEW FILE liblrdf-README.fedora --- See the liblrdf SRPM for example source code. --- NEW FILE liblrdf.spec --- Summary: Library for manipulating RDF files describing LADSPA plugins Name: liblrdf Version: 0.4.0 Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://lrdf.sourceforge.net/ Source0: http://download.sourceforge.net/lrdf/liblrdf-0.4.0.tar.gz Source1: liblrdf-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, ladspa-devel, raptor-devel %description liblrdf is a library to make it easy to manipulate RDF files describing LADSPA plugins. %package devel Summary: Library for manipulating RDF files describing LADSPA plugins Group: Development/Libraries Requires: liblrdf = %{version}-%{release} Requires: raptor-devel %description devel This is a library to make it easy to manipulate RDF files describing LADSPA plugins. This package includes the development tools. %prep %setup -q cp %{SOURCE1} README.fedora %build %configure --disable-static %install rm -rf $RPM_BUILD_ROOT %makeinstall %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL NEWS README README.fedora %{_libdir}/liblrdf.so.* %exclude %{_datadir}/ladspa/rdf/ladspa.rdfs %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/liblrdf.so %exclude %{_libdir}/liblrdf.la %{_libdir}/pkgconfig/* %changelog * Sat May 13 2006 Anthony Green 0.4.0-6 - Exclude ladspa.rdfs. - Don't use %{__rm} or %{__make} macros. - Standardize on $RPM_BUILD_ROOT from %{buildroot}. * Mon Apr 24 2006 Anthony Green 0.4.0-5 - Clean up BuildRequires based on raptor mods. * Sun Apr 23 2006 Anthony Green 0.4.0-4 - Remove examples dir. Add README.fedora. - Configure with --disable-static. * Sun Apr 23 2006 Anthony Green 0.4.0-3 - Update URLs. - Remove gcc-c++ from BuildRequires. * Tue Apr 18 2006 Anthony Green 0.4.0-2 - Minor tweaks. Build for Fedora Extras. * Wed Dec 22 2004 Fernando Lopez-Lezcano 0.4.0-1 - updated to 0.4.0 * Fri Dec 16 2004 Fernando Lopez-Lezcano - spec file tweaks * Thu Apr 15 2004 Fernando Lopez-Lezcano 0.3.7-1 - updated to 0.3.7, added proper build requirements * Wed Feb 18 2004 Fernando Lopez-Lezcano 0.3.5-1 - updated to 0.3.5 * Wed Feb 4 2004 Fernando Lopez-Lezcano 0.3.4-1 - updated to 0.3.4 * Fri Nov 7 2003 Fernando Lopez-Lezcano 0.3.2-1 - updated to 0.3.2 * Tue May 6 2003 Fernando Lopez-Lezcano 0.3.1-1 - updated to 0.3.1 * Thu Mar 6 2003 Fernando Lopez-Lezcano 0.2.4-1 - added ldconfig, pkgconfig file to devel file list * Wed Feb 19 2003 Fernando Lopez-Lezcano 0.2.3-2 - added raptor-devel dependency to liblrdf-devel * Fri Feb 14 2003 Fernando Lopez-Lezcano 0.2.3-1 - updated to 0.2.3 * Wed Feb 11 2003 Fernando Lopez-Lezcano 0.2.2-1 - updated to 0.2.2 * Mon Jan 13 2003 Fernando Lopez-Lezcano 0.2.1-1 - updated to 0.2.1 * Thu Jan 9 2003 Fernando Lopez-Lezcano 0.1.3-1 - Initial build, fix missing symbolic links to the shared library Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liblrdf/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 03:28:55 -0000 1.1 +++ .cvsignore 14 May 2006 03:29:59 -0000 1.2 @@ -0,0 +1 @@ +liblrdf-0.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/liblrdf/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 03:28:55 -0000 1.1 +++ sources 14 May 2006 03:29:59 -0000 1.2 @@ -0,0 +1 @@ +327a5674f671c4b360c6353800226877 liblrdf-0.4.0.tar.gz From fedora-extras-commits at redhat.com Sun May 14 03:34:47 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:34:47 -0700 Subject: owners owners.list,1.989,1.990 Message-ID: <200605140334.k4E3Ynrk030456@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30439 Modified Files: owners.list Log Message: Add liblrdf. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.989 retrieving revision 1.990 diff -u -r1.989 -r1.990 --- owners.list 13 May 2006 21:45:59 -0000 1.989 +++ owners.list 14 May 2006 03:34:46 -0000 1.990 @@ -642,6 +642,7 @@ Fedora Extras|libkexif|Allow Kipi plugins to extract EXIF information|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libkipi|Common plugin infrastructure for KDE image applications|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|liblrdf|Library for manipulating RDF files describing LADSPA plugins|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 14 04:12:20 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 13 May 2006 21:12:20 -0700 Subject: rpms/pan/devel pan-0.97-crash-on-shutdown.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 pan.spec, 1.14, 1.15 sources, 1.7, 1.8 pan-0.96-upstream-sort_segfault.patch, 1.1, NONE pan-0.96-upstream-subscribed_group.patch, 1.1, NONE Message-ID: <200605140412.k4E4CMFA000323@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32763 Modified Files: .cvsignore pan.spec sources Added Files: pan-0.97-crash-on-shutdown.patch Removed Files: pan-0.96-upstream-sort_segfault.patch pan-0.96-upstream-subscribed_group.patch Log Message: Update to 0.97 development snapshot pan-0.97-crash-on-shutdown.patch: --- NEW FILE pan-0.97-crash-on-shutdown.patch --- --- pan/gui/pan.cc.bak 2006-05-13 22:29:33.000000000 -0500 +++ pan/gui/pan.cc 2006-05-13 22:29:39.000000000 -0500 @@ -44,6 +44,12 @@ gtk_main_quit (); } + gboolean delete_event_cb (GtkWidget *w, GdkEvent *e, gpointer user_data) + { + gtk_main_quit (); + return true; + } + struct DataAndQueue { Data * data; @@ -219,6 +225,7 @@ GtkWidget * w (pane->root()); gtk_widget_show_all (w); g_signal_connect (G_OBJECT(w), "destroy", G_CALLBACK(destroy_cb), 0); + g_signal_connect (G_OBJECT(w), "delete-event", G_CALLBACK(delete_event_cb), 0); gtk_main (); } else { GMainLoop * main_loop = g_main_loop_new (NULL, false); @@ -236,6 +243,7 @@ gtk_window_set_resizable (GTK_WINDOW(window), true); gtk_window_set_icon (GTK_WINDOW(window), pixbuf); g_signal_connect (G_OBJECT(window), "destroy", G_CALLBACK(destroy_cb), 0); + g_signal_connect (G_OBJECT(window), "delete-event", G_CALLBACK(delete_event_cb), 0); g_object_unref (pixbuf); run_pan_in_window (cache, data, queue, prefs, GTK_WINDOW(window)); } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 May 2006 19:19:31 -0000 1.7 +++ .cvsignore 14 May 2006 04:12:20 -0000 1.8 @@ -3,3 +3,4 @@ pan-0.94.tar.bz2 pan-0.95.tar.bz2 pan-0.96.tar.bz2 +pan-0.97.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- pan.spec 9 May 2006 00:59:08 -0000 1.14 +++ pan.spec 14 May 2006 04:12:20 -0000 1.15 @@ -1,13 +1,12 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.96 -Release: 2%{?dist} +Version: 0.97 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 -Patch0: pan-0.96-upstream-sort_segfault.patch -Patch1: pan-0.96-upstream-subscribed_group.patch +Patch0: pan-0.97-crash-on-shutdown.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -29,7 +28,6 @@ %prep %setup -q %patch0 -p0 -%patch1 -p0 echo "StartupNotify=true" >> pan.desktop @@ -74,6 +72,10 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Sat May 13 2006 Michael A. Peters - 1:0.97-1 +- Update to 0.97 (previous patches no longer needed) +- Patch pan-0.97-crash-on-shutdown.patch from upstream added + * Mon May 08 2006 Michael A. Peters - 1:0.96-2 - Two patches from upstream (pan-0.96-upstream-sort_segfault.patch - and pan-0.96-upstream-subscribed_group.patch) Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 6 May 2006 19:19:31 -0000 1.7 +++ sources 14 May 2006 04:12:20 -0000 1.8 @@ -1,2 +1,2 @@ -3a0cff7a3bc8b77ad19af4a492859804 pan-0.95.tar.bz2 b4e355553cd502add3e599d1e867da9e pan-0.96.tar.bz2 +32dd572f582b1bfd708d4eb755c215e4 pan-0.97.tar.bz2 --- pan-0.96-upstream-sort_segfault.patch DELETED --- --- pan-0.96-upstream-subscribed_group.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 14 04:48:19 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:48:19 -0700 Subject: mock/etc defaults.cfg,NONE,1.1 Message-ID: <200605140448.k4E4mJ3L000489@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv456/etc Added Files: defaults.cfg Log Message: check in global defaults patch from Andreas Thienemann --- NEW FILE defaults.cfg --- # mock defaults # # Define default values here. # These values are overwritten in the /etc/mock/CHROOT.cfg files. # # Example: # # config_opts['foo'] = bar From fedora-extras-commits at redhat.com Sun May 14 04:48:14 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:48:14 -0700 Subject: mock mock.py,1.45,1.46 Message-ID: <200605140448.k4E4miAs000492@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv456 Modified Files: mock.py Log Message: check in global defaults patch from Andreas Thienemann Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mock.py 12 May 2006 20:57:03 -0000 1.45 +++ mock.py 14 May 2006 04:48:11 -0000 1.46 @@ -735,6 +735,14 @@ if options.configdir: config_path = options.configdir + # Read in the default values which can be overwritten + # with the more specific config being loaded below. + cfg = os.path.join(config_path, 'defaults.cfg') + if os.path.exists(cfg): + execfile(cfg) + else: + pass # not finding the defaults.cfg file is no error + # read in the config file by chroot name if options.chroot.endswith('.cfg'): cfg = '%s/%s' % (config_path, options.chroot) From fedora-extras-commits at redhat.com Sun May 14 04:49:59 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:49:59 -0700 Subject: mock mock.py,1.46,1.47 Message-ID: <200605140449.k4E4nxZ3000516@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv498 Modified Files: mock.py Log Message: commit Hans Ulrich Niedermann and Andreas Thienemann patch for the crack-y more buildreq feature. Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mock.py 14 May 2006 04:48:11 -0000 1.46 +++ mock.py 14 May 2006 04:49:57 -0000 1.47 @@ -289,7 +289,7 @@ hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) # get text buildreqs - buildreqs = self._text_requires_from_hdr(hdr) + buildreqs = self._text_requires_from_hdr(hdr, srpm) arg_string = "" for item in buildreqs: @@ -495,7 +495,7 @@ return (ret, output) - def _text_requires_from_hdr(self, hdr): + def _text_requires_from_hdr(self, hdr, srpm): """take a header and hand back a unique'd list of the requires as strings""" @@ -513,6 +513,23 @@ req = rpmUtils.miscutils.formatRequire(n, v, f) reqlist.append(req) + # Extract SRPM name components - still not nice, shouldn't this + # be somewhere in the "hdr" parameter? + fname = os.path.split(str(srpm))[1] + name, ver, rel, epoch, arch = rpmUtils.miscutils.splitFilename(fname) + + # Add the 'more_buildreqs' for this SRPM (if defined) + for this_srpm in ['-'.join([name,ver,rel]), + '-'.join([name,ver]), + '-'.join([name]),]: + if self.config['more_buildreqs'].has_key(this_srpm): + more_reqs = self.config['more_buildreqs'][this_srpm] + if type(more_reqs) in (type(u''), type(''),): + more_reqs = [more_reqs] # be nice if we get a string + for req in more_reqs: + reqlist.append(req) + break + return rpmUtils.miscutils.unique(reqlist) def _prep_install(self): @@ -722,6 +739,7 @@ """ % config_opts['chroothome'] + config_opts['more_buildreqs'] = {} config_opts['files']['/etc/resolv.conf'] = "nameserver 192.168.1.1\n" config_opts['files']['/etc/hosts'] = "127.0.0.1 localhost localhost.localdomain\n" From fedora-extras-commits at redhat.com Sun May 14 04:53:41 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:53:41 -0700 Subject: mock mock.py,1.47,1.48 Message-ID: <200605140453.k4E4rfGU000574@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv543 Modified Files: mock.py Log Message: make prep install command configurable and set default in defaults.cfg Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- mock.py 14 May 2006 04:49:57 -0000 1.47 +++ mock.py 14 May 2006 04:53:38 -0000 1.48 @@ -209,7 +209,7 @@ self._prep_install() if self.config['clean']: - cmd = 'install %s' % self.config['chroot_dep_package'] + cmd = '%s' % self.config['chroot_setup_cmd'] else: cmd = 'update' @@ -721,7 +721,7 @@ config_opts['mknod'] = '/usr/sbin/mock-helper mknod' config_opts['yum'] = '/usr/sbin/mock-helper yum' config_opts['runuser'] = '/sbin/runuser' - config_opts['chroot_dep_package'] = 'buildsys-build' + config_opts['chroot_setup_cmd'] = 'install buildsys-build' config_opts['chrootuser'] = 'mockbuild' config_opts['chrootgroup'] = 'mockbuild' config_opts['chrootuid'] = 500 From fedora-extras-commits at redhat.com Sun May 14 04:53:41 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:53:41 -0700 Subject: mock/etc defaults.cfg,1.1,1.2 Message-ID: <200605140453.k4E4rfqX000580@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv543/etc Modified Files: defaults.cfg Log Message: make prep install command configurable and set default in defaults.cfg Index: defaults.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/defaults.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- defaults.cfg 14 May 2006 04:48:12 -0000 1.1 +++ defaults.cfg 14 May 2006 04:53:39 -0000 1.2 @@ -6,3 +6,5 @@ # Example: # # config_opts['foo'] = bar +config_opts['chroot_setup_cmd'] = 'install buildsys-build' +#config_opts['chroot_setup_cmd'] = 'groupinstall build build-minimal build-base' From fedora-extras-commits at redhat.com Sun May 14 05:43:08 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 13 May 2006 22:43:08 -0700 Subject: extras-buildsys ChangeLog,1.196,1.197 Message-ID: <200605140543.k4E5h8oM003029@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2964 Modified Files: ChangeLog Log Message: 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning PackageJob object, and only one is spawned for the lifetime of the PackageJob for each architecture (previously one was spawned for each individual build job on the builder). Archjob UIDs are generated on the server now rather than the builder. * Correctly handle builders going away before they've had a chance to notify the server that they have started an archjob. Previously, these jobs would just be lost. This is the real reason for the rework of the archjob handling above. * On the builder, don't use die() to end jobs that have failed; do it properly and upload files to the server if we weren't killed * Deal with active builders whose hostnames can't be resolved when the server starts * Kill any existing jobs on builders when the server starts up * Consolidate and simplify logging functions in PackageJob * More pylint-induced cleanups Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- ChangeLog 12 May 2006 04:10:45 -0000 1.196 +++ ChangeLog 14 May 2006 05:43:05 -0000 1.197 @@ -1,3 +1,28 @@ +2006-05-14 Dan Williams + + * Rework archjob handling. They are now processed from the owning + PackageJob object, and only one is spawned for the lifetime of the + PackageJob for each architecture (previously one was spawned for each + individual build job on the builder). Archjob UIDs are generated on + the server now rather than the builder. + + * Correctly handle builders going away before they've had a chance to + notify the server that they have started an archjob. Previously, these + jobs would just be lost. This is the real reason for the rework of the + archjob handling above. + + * On the builder, don't use die() to end jobs that have failed; do it + properly and upload files to the server if we weren't killed + + * Deal with active builders whose hostnames can't be resolved when + the server starts + + * Kill any existing jobs on builders when the server starts up + + * Consolidate and simplify logging functions in PackageJob + + * More pylint-induced cleanups + 2006-05-12 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Sun May 14 05:43:09 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 13 May 2006 22:43:09 -0700 Subject: extras-buildsys/common Commands.py,1.7,1.8 Message-ID: <200605140543.k4E5h9Uu003043@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2964/common Modified Files: Commands.py Log Message: 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning PackageJob object, and only one is spawned for the lifetime of the PackageJob for each architecture (previously one was spawned for each individual build job on the builder). Archjob UIDs are generated on the server now rather than the builder. * Correctly handle builders going away before they've had a chance to notify the server that they have started an archjob. Previously, these jobs would just be lost. This is the real reason for the rework of the archjob handling above. * On the builder, don't use die() to end jobs that have failed; do it properly and upload files to the server if we weren't killed * Deal with active builders whose hostnames can't be resolved when the server starts * Kill any existing jobs on builders when the server starts up * Consolidate and simplify logging functions in PackageJob * More pylint-induced cleanups Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Commands.py 12 May 2006 04:04:05 -0000 1.7 +++ Commands.py 14 May 2006 05:43:06 -0000 1.8 @@ -330,11 +330,19 @@ _need_ack = True - def __init__(self, parent_job, target_dict, srpm_url, seq=0): + def __init__(self, archjob, target_dict=None, srpm_url=None, archjob_id=None, seq=0): PlgCommand.__init__(self, CMD_NAME_NEW_JOB_REQ, seq) - self._parent_job = parent_job # doesn't get serialized - self._target_dict = target_dict - self._srpm_url = srpm_url + self._archjob = archjob # doesn't get serialized + if archjob: + self._target_dict = archjob.target_dict() + self._srpm_url = archjob.srpm_url() + self._archjob_id = archjob.archjob_id() + else: + if not target_dict or not srpm_url or not archjob_id: + raise Exception("Need a target_dict, an srpm_url, and an archjob_id.") + self._target_dict = target_dict + self._srpm_url = srpm_url + self._archjob_id = archjob_id def _deserialize(args): try: @@ -345,8 +353,12 @@ srpm_url = args['srpm_url'] except (KeyError, TypeError): raise ValueError("No 'srpm_url' argument found.") + try: + archjob_id = args['archjob_id'] + except (KeyError, TypeError): + raise ValueError("No 'archjob_id' argument found.") - return PlgCommandNewJobReq(None, target_dict, srpm_url) + return PlgCommandNewJobReq(None, target_dict, srpm_url, archjob_id) _deserialize = staticmethod(_deserialize) @@ -354,10 +366,11 @@ args = {} args['target_dict'] = self._target_dict args['srpm_url'] = self._srpm_url + args['archjob_id'] = self._archjob_id return PlgCommand._serialize(self, args) - def parent_job(self): - return self._parent_job + def archjob(self): + return self._archjob def target_dict(self): return self._target_dict @@ -365,8 +378,12 @@ def srpm_url(self): return self._srpm_url + def archjob_id(self): + return self._archjob_id + def __str__(self): - return "%s(seq: %d, target_dict: %s, srpm_url: %s)" % (self._name, self._seq, self._target_dict, self._srpm_url) + return "%s(seq: %d, target_dict: %s, srpm_url: %s, archjob_id: %s)" % (self._name, + self._seq, self._target_dict, self._srpm_url, self._archjob_id) class PlgCommandNewJobAck(PlgCommandAck): From fedora-extras-commits at redhat.com Sun May 14 05:43:09 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 13 May 2006 22:43:09 -0700 Subject: extras-buildsys/server ArchJob.py, 1.31, 1.32 BuildMaster.py, 1.40, 1.41 Builder.py, 1.40, 1.41 BuilderManager.py, 1.24, 1.25 PackageJob.py, 1.49, 1.50 main.py, 1.21, 1.22 Message-ID: <200605140543.k4E5h91W003049@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2964/server Modified Files: ArchJob.py BuildMaster.py Builder.py BuilderManager.py PackageJob.py main.py Log Message: 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning PackageJob object, and only one is spawned for the lifetime of the PackageJob for each architecture (previously one was spawned for each individual build job on the builder). Archjob UIDs are generated on the server now rather than the builder. * Correctly handle builders going away before they've had a chance to notify the server that they have started an archjob. Previously, these jobs would just be lost. This is the real reason for the rework of the archjob handling above. * On the builder, don't use die() to end jobs that have failed; do it properly and upload files to the server if we weren't killed * Deal with active builders whose hostnames can't be resolved when the server starts * Kill any existing jobs on builders when the server starts up * Consolidate and simplify logging functions in PackageJob * More pylint-induced cleanups Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ArchJob.py 9 May 2006 19:10:57 -0000 1.31 +++ ArchJob.py 14 May 2006 05:43:07 -0000 1.32 @@ -15,36 +15,80 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import time -import socket import os import threading import urllib -import OpenSSL from plague import FileTransfer +import sha +def _generate_uniqid(parent_jobid, start_time, target_dict, srpm_url): + distro = target_dict['distro'] + repo = target_dict['repo'] + target = target_dict['target'] + arch = target_dict['arch'] + hash_string = "%d%d%s%s%s%s%s" % (parent_jobid, start_time, distro, + target, arch, repo, srpm_url) + sha_hash = sha.new() + sha_hash.update(hash_string) + return sha_hash.hexdigest() + + +AJ_STATUS_QUEUED = 'queued' +AJ_STATUS_WAITING = 'waiting' +AJ_STATUS_REPO_WAIT = 'repo_wait' +AJ_STATUS_REPO_UNLOCK = 'repo_unlock' +AJ_STATUS_RUNNING = 'running' +AJ_STATUS_DOWNLOADING = 'downloading' +AJ_STATUS_DONE = 'done' + class ArchJob: """ Tracks a single build instance for a single arch on a builder """ - def __init__(self, builder, par_job, jobid, target_dict): - self.par_job = par_job - self._builder = builder - self._repo = par_job.repo() - self.jobid = jobid - self._status = 'starting' + def __init__(self, parent, target_dict, srpm_url): + self._parent = parent + self._builder = None + self._repo = parent.repo() + self._starttime = time.time() + self._endtime = 0 + self._id = _generate_uniqid(parent.uid, self._starttime, target_dict, + srpm_url) + self._status = AJ_STATUS_QUEUED self._builder_status = '' self._failure_noticed = False self._download_failed = False self._internal_failure = False self._target_dict = target_dict - self._builder_gone = False + self._srpm_url = srpm_url self._result_files = {} - self._starttime = time.time() - self._endtime = 0 self._die = False self._die_user_requested = False self._die_lock = threading.Lock() self._prepping = False + self._orphaned = False + + def builder_suspend_cb(self, builder, reason, msg): + self.unclaim(builder) + if not self._is_done_status(): + self._parent.log(self.arch(), "Builder disappeared. Requeuing arch...") + + def set_builder_status(self, builder, builder_status): + if builder != self._builder: + return + + # The job has just started on the builder + if self._builder_status == '': + addr = builder.address() + self._parent.log(self.arch(), "%s - UID is %s" % (addr, self._id)) + # Notify our parent PackageJob that we've started + self._parent.archjob_started_cb(self) + + oldstatus = self._builder_status + self._builder_status = builder_status + if oldstatus != self._builder_status: + attrdict = self._to_dict() + self._parent.bm.queue_archjob_status_update(self._id, attrdict) + del attrdict def failure_noticed(self): return self._failure_noticed @@ -74,86 +118,115 @@ def arch(self): return self._target_dict['arch'] + def target_dict(self): + return self._target_dict + + def srpm_url(self): + return self._srpm_url + + def archjob_id(self): + return self._id + def builder(self): return self._builder + def orphaned(self): + return self._orphaned + + def claim(self, builder): + """Called by the Builder via the BuilderManager when the builder + agrees to build this archjob.""" + if self._status != AJ_STATUS_QUEUED: + return + self._set_status(AJ_STATUS_WAITING) + self._builder = builder + builder.add_suspend_listener(self) + + def unclaim(self, builder): + builder.remove_suspend_listener(self) + self._builder = None + if not self._is_done_status(): + self._orphaned = True + self._builder_status = '' + # Mark ourselves as available for building again + self._set_status(AJ_STATUS_QUEUED) + def _to_dict(self): attrdict = {} - attrdict['jobid'] = self.jobid - attrdict['parent_uid'] = self.par_job.uid + attrdict['jobid'] = self._id + attrdict['parent_uid'] = self._parent.uid attrdict['arch'] = self._target_dict['arch'] - (ip, 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 + if self._builder: + name = self._builder.address() + # for some reason, splithost doesn't like the protocol + # method, you have to give it a string starting with "//" + if name.startswith("http"): + idx = name.find('//') + name = name[idx:] + host_port, path = urllib.splithost(name) + host, port = urllib.splitport(host_port) + attrdict['builder_addr'] = host + else: + attrdict['builder_addr'] = "" attrdict['status'] = self._status attrdict['builder_status'] = self._builder_status attrdict['starttime'] = self._starttime attrdict['endtime'] = self._endtime return attrdict - def set_builder_job_status(self, builder_status): - oldstatus = self._builder_status - self._builder_status = builder_status - if oldstatus != self._builder_status: - attrdict = self._to_dict() - self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) - del attrdict - - if builder_status == 'killed' or builder_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) + self._parent.bm.queue_archjob_status_update(self._id, attrdict) del attrdict def _is_done_status(self): - if self._status == 'done': + if self._status == AJ_STATUS_DONE: return True return False - def _status_starting(self): + def _set_done(self): + self._builder.remove_suspend_listener(self) + self._set_status(AJ_STATUS_DONE) + + def _status_queued(self): + pass + + def _status_waiting(self): # 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': - self._set_status('repo_wait') + self._set_status(AJ_STATUS_REPO_WAIT) self._repo.request_unlock(self) def _status_repo_wait(self): pass def repo_unlocked_callback(self): - if self._status == 'repo_wait': - self._set_status('repo_unlock') + if self._status == AJ_STATUS_REPO_WAIT: + self._set_status(AJ_STATUS_REPO_UNLOCK) def _status_repo_unlock(self): # Builder will be in 'downloaded' state until # it notices that the repo has been unlocked - self._builder.unlock_repo_for_job(self.jobid) self._prepping = True + self._builder.unlock_repo_for_job(self._id) if self._builder_status != 'downloaded': - self._set_status('running') + self._set_status(AJ_STATUS_RUNNING) def _status_running(self): if self._builder_status != 'prepping': self._prepping = False if self._builder_finished(): - self._set_status('downloading') - self._builder.request_job_files(self.jobid) + self._set_status(AJ_STATUS_DOWNLOADING) + self._builder.request_job_files(self._id) def get_result_files_dir(self): - result_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) + result_dir = os.path.join(self._parent.get_stage_dir(), self._target_dict['arch']) if not os.path.exists(result_dir): os.makedirs(result_dir) return result_dir @@ -169,13 +242,16 @@ if fname != files.keys()[nresults - 1]: file_string = file_string + ", " - print "%s (%s/%s): Build result files - [ %s ]" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], file_string) + print "%s (%s/%s): Build result files - [ %s ]" % (self._parent.uid, + self._parent.package, self._target_dict['arch'], file_string) def download_cb(self, files): """Called by the Builder to notify us that our job's files are available. The files argument should be a list of _filenames_, not paths. All files are assumed to be in the directory returned by get_result_files_dir.""" + if self._is_done_status(): + return + if len(files.keys()) == 0: self._download_failed = True else: @@ -186,13 +262,21 @@ self._print_downloaded_files(self._result_files) self._endtime = time.time() - self._set_status('done') - self.par_job.wake() + self._set_done() def _status_downloading(self): # Wait to be notified that our files are downloaded pass + def _handle_death(self, user_requested): + self._builder.request_kill_for_job(self._id) + if self._status == AJ_STATUS_REPO_WAIT: + self._repo.cancel_unlock_request(self) + self._set_done() + if user_requested: + print "%s (%s/%s): %s - killed." % (self._parent.uid, self._parent.package, + self._target_dict['arch'], self._id) + def process(self): if self._is_done_status(): return @@ -203,32 +287,23 @@ user_requested = self._die_user_requested self._die_lock.release() if should_die: - try: - self._server.die(self.jobid) - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error): - pass - if self._status == 'repo_wait': - self._repo.cancel_unlock_request(self) - self._set_status('done') - if user_requested: - print "%s (%s/%s): %s - killed." % (self.par_job.uid, self.par_job.package, - self._target_dict['arch'], self.jobid) + self._handle_death(user_requested) return status_func = None try: status_func = getattr(self, "_status_%s" % self._status) except AttributeError: - print "%s (%s/%s): %s - internal archjob inconsistency. Unknown status '%s'." % (self.par_job.uid, self.par_job.package, - self._target_dict['arch'], self.jobid, self._status) - self._set_status('done') + print "%s (%s/%s): %s - internal archjob inconsistency. Unknown status '%s'." % (self._parent.uid, + self._parent.package, self._target_dict['arch'], self._id, self._status) + self._set_done() self._internal_failure = True return # Do the actual work for this status status_func() - def get_status(self): + def status(self): return self._status def get_files(self): @@ -239,21 +314,17 @@ files.append(fname) return files - def builder_gone(self): - if self._status != 'done': - self._builder_status = 'orphaned' - self._set_status('done') - self.par_job.remove_arch_job(self) - def die(self, user_requested=False): # Can be called from other threads - if self._status == 'running' or self._status == 'repo_wait' or self._status == 'starting' or self._status == 'repo_unlock': - self._die_lock.acquire() - self._die = True - self._die_user_requested = user_requested - self._die_lock.release() - if user_requested: - print "%s (%s/%s): %s - kill requested by parent job" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.jobid) + if self._is_done_status(): + return + + self._die_lock.acquire() + self._die = True + self._die_user_requested = user_requested + self._die_lock.release() + if user_requested: + print "%s (%s/%s): %s - kill requested by parent job" % (self._parent.uid, + self._parent.package, self._target_dict['arch'], self._id) Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- BuildMaster.py 28 Apr 2006 03:17:41 -0000 1.40 +++ BuildMaster.py 14 May 2006 05:43:07 -0000 1.41 @@ -18,9 +18,7 @@ import time import PackageJob -import DBManager import threading -import os import Repo import copy import Config @@ -144,7 +142,7 @@ for repo in self._repos.values(): repo.stop() - def create_job_request(self, email, package, source, target_dict, buildreq, time): + def create_job_request(self, email, package, source, target_dict, buildreq, ctime): req = {} req['email'] = email req['package'] = package @@ -152,7 +150,7 @@ req['target_target'] = target_dict['target'] req['target_repo'] = target_dict['repo'] req['buildreq'] = buildreq - req['time'] = time + req['time'] = ctime req['source'] = source req['uid_avail'] = False req['uid'] = -1 @@ -226,8 +224,8 @@ # Update job end time try: self._cursor.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (job.endtime, uid)) - except StandardError, e: - print "DB Error: could not access jobs database. Reason: '%s'" % e + except StandardError, exc: + print "DB Error: could not access jobs database. Reason: '%s'" % exc self._dbcx.commit() print "%s (%s): Job finished." % (uid, job.package) @@ -253,8 +251,8 @@ sql = 'UPDATE jobs SET ' + sql + ' WHERE uid=%d' % uid try: self._cursor.execute(sql) - except StandardError, e: - print "DB Error: could not access jobs database. Reason: '%s'" % e + except StandardError, exc: + print "DB Error: could not access jobs database. Reason: '%s'" % exc self._dbcx.commit() def _write_archjob_status_to_db(self, uid, attrdict): @@ -266,15 +264,15 @@ "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 StandardError, e: - print "DB Error: could not access jobs database. Reason: '%s'" % e + except StandardError, exc: + print "DB Error: could not access jobs database. Reason: '%s'" % exc else: try: self._cursor.execute("UPDATE archjobs SET status='%s', builder_status='%s', endtime=%d " \ "WHERE jobid='%s' AND parent_uid=%d" % (attrdict['status'], attrdict['builder_status'], attrdict['endtime'], uid, attrdict['parent_uid'])) - except StandardError, e: - print "DB Error: could not access jobs database. Reason: '%s'" % e + except StandardError, exc: + print "DB Error: could not access jobs database. Reason: '%s'" % exc self._dbcx.commit() def _save_job_status(self): Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- Builder.py 9 May 2006 19:10:57 -0000 1.40 +++ Builder.py 14 May 2006 05:43:07 -0000 1.41 @@ -15,7 +15,6 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import time -import string import xmlrpclib import socket import os @@ -60,19 +59,27 @@ self._seq_gen = Commands.SequenceGenerator() self._lock = threading.Lock() self._cmd_queue = [] + self._suspend_listeners = [] + self._status_listeners = [] + self._ip = None + + uri, rest = urllib.splittype(address) + host, ignore = urllib.splithost(rest) + self._host, port = urllib.splitport(host) - try: - type, rest = urllib.splittype(address) - host, ignore = urllib.splithost(rest) - host, port = urllib.splitport(host) - self._ip = socket.gethostbyname(host) - except Exception, e: - print "Builder Error(%s): couldn't lookup builder's IP address." % address - raise Exception(e) + self._get_ip() threading.Thread.__init__(self) self.setName("Builder: %s" % address) + def _get_ip(self): + try: + self._ip = socket.gethostbyname(self._host) + return True + except Exception: + pass + return False + def _match_target_dict(self, td1, td2): if td1['distro'] == td2['distro']: if td1['target'] == td2['target']: @@ -81,24 +88,28 @@ return False def arches(self, target_dict): - for td in self._target_list: - if self._match_target_dict(td, target_dict): + for tdict in self._target_list: + if self._match_target_dict(tdict, target_dict): arches = [] - for arch in td['supported_arches']: + for arch in tdict['supported_arches']: if not arch in arches: arches.append(arch) return arches return None - def can_build_for_target(self, target_dict): + def can_build_arch_job(self, archjob): + target_dict = archjob.target_dict() for td in self._target_list: if self._match_target_dict(td, target_dict): - if target_dict['arch'] in td['supported_arches']: + if archjob.arch() in td['supported_arches']: return True return False def address(self): - return (self._ip, self._address) + return self._address + + def ip(self): + return self._ip def available(self): """ Is the builder responding to requests? """ @@ -123,17 +134,32 @@ pass return None + def add_suspend_listener(self, listener): + listeners = self._suspend_listeners[:] + if listener not in listeners: + self._suspend_listeners.append(listener) + + def remove_suspend_listener(self, listener): + if listener in self._suspend_listeners: + self._suspend_listeners.remove(listener) + + def _notify_suspend_listeners(self, reason, msg): + # Must copy the list since it can be modified from + # the listener during our iteration of it + listeners = self._suspend_listeners[:] + for listener in listeners: + listener.builder_suspend_cb(self, reason, msg) + del listeners + def _handle_builder_suspend(self, reason, msg): - for jobid in self._jobs.keys(): - job = self._jobs[jobid] - job.builder_gone() - del self._jobs[jobid] - self._jobs = {} self._available = False self._suspend_reason = reason self._unavail_count = 0 self._prepping_jobs = False self._when_died = time.time() + self._jobs = {} + + self._notify_suspend_listeners(reason, msg) # Notify admins print "Suspending builder '%s'. Reason: %s - %s." % (self._address, reason, msg) @@ -178,8 +204,8 @@ builder_dict['address'] = host arches = [] - for td in self._target_list: - for arch in td['supported_arches']: + for tdict in self._target_list: + for arch in tdict['supported_arches']: if not arch in arches: arches.append(arch) builder_dict['arches'] = arches @@ -197,7 +223,7 @@ (uniqid, status) = cmd.get_job(item) try: job = self._jobs[uniqid] - job.set_builder_job_status(status) + job.set_builder_status(self, status) reported_uniqids.append(uniqid) except KeyError: pass @@ -208,11 +234,10 @@ # removed from the building job list before we # were able to know that it was done. HACK self._prepping_jobs = False - for jobid in self._jobs.keys(): + for jobid, job in self._jobs.items(): # If the builder didn't report this job as building, # and its not done, explicitly get its status - job = self._jobs[jobid] - if jobid not in reported_uniqids and job.get_status() != 'done': + if jobid not in reported_uniqids and job.status() != 'done': new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) # Check for prepping jobs @@ -243,11 +268,15 @@ old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandNewJobReq) if old_cmd: - parent = old_cmd.parent_job() - archjob_id = ack.archjob_id() - archjob = ArchJob.ArchJob(self, parent, archjob_id, old_cmd.target_dict()) - self._jobs[archjob_id] = archjob - parent.add_arch_job(archjob) + archjob = old_cmd.archjob() + archjob_id = archjob.archjob_id() + ack_archjob_id = ack.archjob_id() + if archjob_id != ack_archjob_id: + print "Builder Error (%s): returned archjob_id (%s) " \ + "doesn't match expected (%s)." % (self._address, ack_archjob_id, archjob_id) + archjob.unclaim(self) + else: + self._jobs[archjob_id] = archjob def _handle_job_status_ack(self, ack): """Handle a job status ack by setting telling the job object @@ -258,7 +287,7 @@ archjob_id = ack.archjob_id() status = ack.status() job = self._jobs[archjob_id] - job.set_builder_job_status(status) + job.set_builder_status(self, status) def _decompose_job_files_ack(self, ack): """Handle a job files ack by finding the archjob it's for, then @@ -305,6 +334,28 @@ self._cmd_queue.append(cmd) self._lock.release() + def request_kill_for_job(self, uniqid): + cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + + def unlock_repo_for_job(self, uniqid): + """Called by an archjob to request the sending of a RepoUnlocked + command to the builder for a particular archjob.""" + + self._lock.acquire() + found = False + for cmd in self._cmd_queue: + if isinstance(cmd, Commands.PlgCommandUnlockRepo): + if cmd.archjob_id() == uniqid: + found = True + break + if not found: + cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) + self._cmd_queue.append(cmd) + self._lock.release() + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt @@ -326,8 +377,8 @@ (jobs, free_slots) = self._server.building_jobs() except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): self.failed = True - except xmlrpclib.Fault, e: - print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self._address, e) + except xmlrpclib.Fault, exc: + print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self._address, exc) self.failed = True self.jobs = jobs self.free_slots = free_slots @@ -374,14 +425,13 @@ alive = True except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): alive = False - except xmlrpclib.Fault, e: - print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, e) + except xmlrpclib.Fault, exc: + print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, exc) alive = False return (alive, target_list) def _init_builder(self, target_list): self._target_list = target_list - # Kill any jobs currently running on the builder jobs = self._building_jobs() for jobid in jobs.keys(): @@ -398,8 +448,8 @@ num_slots = self._server.num_slots() except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): pass - except xmlrpclib.Fault, e: - print "Builder Error (%s) in _get_num_slots(): builder replied '%s'" % (self._address, e) + except xmlrpclib.Fault, exc: + print "Builder Error (%s) in _get_num_slots(): builder replied '%s'" % (self._address, exc) return num_slots def _building_jobs(self): @@ -444,26 +494,29 @@ self._ping_timeout = 0 self._init_builder(target_list) - def start_job(self, par_job, target_dict, srpm_url): + def start_job(self, req): if not self.available(): raise RuntimeError - if not self.can_build_for_target(target_dict): + if not self.can_build_request(req): raise RuntimeError self._server_lock.acquire() try: # Builder will return jobid of 0 if it can't start the job for some reason - jobid = self._server.start_new_job(target_dict, srpm_url) + srpm_url = req.srpm_url() + target_dict = req.target_dict() + jobid = self._server.start_new_job(target_dict, req.srpm_url()) except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, \ - OpenSSL.SSL.Error, xmlrpclib.ProtocolError, xmlrpclib.Fault), e: - error_class = str(e.__class__) - error_string = str(e) + OpenSSL.SSL.Error, xmlrpclib.ProtocolError, xmlrpclib.Fault), exc: + error_class = str(exc.__class__) + error_string = str(exc) jobarch = target_dict['arch'] - print "%s (%s/%s): %s exception '%s' starting job on %s" % (par_job.uid, \ - par_job.package, jobarch, error_class, error_string, \ + parent = req.parent() + print "%s (%s/%s): %s exception '%s' starting job on %s" % (parent.uid, \ + parent.package, jobarch, error_class, error_string, \ self._address) # Check for hard errors, for which we suspend the builder - if string.find(error_string, "OSError") >= 0 and string.find(error_string, "Errno") >= 0: + if error_string.find("OSError") >= 0 and error_string.find("Errno") >= 0: self._handle_builder_suspend(SUSPEND_HARD_ERROR, error_string) time.sleep(0.5) jobid = 0 @@ -472,7 +525,7 @@ self._server_lock.release() raise RuntimeError - job = ArchJob.ArchJob(self, self._server_cfg, self._server, par_job, jobid, target_dict) + job = ArchJob.ArchJob(self, self._server_cfg, self._server, parent, jobid, target_dict) self._jobs[jobid] = job self._update_building_jobs() self._server_lock.release() @@ -488,7 +541,7 @@ try: job = self._jobs[jobid] status = jobs[jobid] - job.set_builder_job_status(status) + job.set_builder_status(self, status) builder_jobs.append(jobid) except KeyError: pass @@ -503,10 +556,10 @@ # If the builder didn't report this job as building, # and its not done, explicitly grab its status job = self._jobs[jobid] - if jobid not in builder_jobs and job.get_status() != 'done': + if jobid not in builder_jobs and job.status() != 'done': status = self._get_builder_job_status(jobid) if status: - job.set_builder_job_status(status) + job.set_builder_status(self, status) # Check for prepping jobs if job.prepping(): @@ -573,22 +626,6 @@ def _init_builder(self, target_list): self._target_list = target_list - def unlock_repo_for_job(self, uniqid): - """Called by an archjob to request the sending of a RepoUnlocked - command to the builder for a particular archjob.""" - - self._lock.acquire() - found = False - for cmd in self._cmd_queue: - if isinstance(cmd, Commands.PlgCommandUnlockRepo): - if cmd.archjob_id() == uniqid: - found = True - break - if not found: - cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) - self._cmd_queue.append(cmd) - self._lock.release() - def _handle_job_files_ack(self, cmd): (archjob, urls) = self._decompose_job_files_ack(cmd) if not archjob: @@ -644,10 +681,10 @@ # Grab some work for the builder if any is available new_cmds = [] if self._free_slots > 0: - req = self._manager.claim_arch_job(self) - if req: + archjob = self._manager.claim_arch_job(self) + if archjob: next_seq = self._seq_gen.next() - cmd = Commands.PlgCommandNewJobReq(req['parent'], req['target_dict'], req['srpm_url'], next_seq) + cmd = Commands.PlgCommandNewJobReq(archjob, seq=next_seq) new_cmds.append(cmd) self._lock.acquire() @@ -667,6 +704,11 @@ self._lock.release() return cmd_list + def ip(self): + if not self._ip: + self._get_ip() + return Builder.ip(self) + _SLEEP_INTERVAL = 10 def run(self): """Main builder loop. Since the builder contacts us, @@ -675,28 +717,24 @@ DebugUtils.registerThreadName(self) while not self._stop: - if not self._available: - time.sleep(self._SLEEP_INTERVAL) - continue - - process_jobs = True - self._lock.acquire() - if self._unavail_count > 2: - self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") - process_jobs = False - elif self._last_contact + self._REQUIRED_CONTACT_INTERVAL < time.time(): - self._unavail_count = self._unavail_count + 1 - self._lock.release() - - if process_jobs: - for j in self._jobs.values(): - j.process() + if self._available: + self._lock.acquire() + if self._unavail_count > 2: + self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") + elif self._last_contact + self._REQUIRED_CONTACT_INTERVAL < time.time(): + self._unavail_count = self._unavail_count + 1 + self._lock.release() time.sleep(self._SLEEP_INTERVAL) def _handle_builder_suspend(self, reason, msg): Builder._handle_builder_suspend(self, reason, msg) self._last_contact = 0 + self._ip = None + + # Clear out the command queue; we start clean when the + # builder contacts us again + self._cmd_queue = [] def _handle_builder_reactivate(self, cmd_list): # Grab an updated target list from the command stream when @@ -705,6 +743,14 @@ for cmd in cmd_list: if isinstance(cmd, Commands.PlgCommandTargets): target_list = cmd.targets() + elif isinstance(cmd, Commands.PlgCommandBuildingJobs): + # Tell the builder to kill all jobs it might be building + # right now. Think server restart here. + for item in cmd.jobs(): + (uniqid, status) = cmd.get_job(item) + cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) + self._cmd_queue.append(cmd) + if not target_list: target_list = self._target_list Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- BuilderManager.py 9 May 2006 19:10:57 -0000 1.24 +++ BuilderManager.py 14 May 2006 05:43:07 -0000 1.25 @@ -15,34 +15,31 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import time -import string -import xmlrpclib -import sys import socket import os import threading import Builder -import EmailUtils -import Config -import time from plague import DebugUtils from plague import AuthedXMLRPCServer from plague import HTTPServer from plague import Commands +import ArchJob class AddrCache(object): + _ENTRY_EXPIRE_TIME = 3600 + def __init__(self): self._cache = {} def get(self, name): # Expire cache entry if one exists and is old - time = ip = None + ip = None try: - (time, ip) = self._cache[name] - if time < time.time() - (60 * 60): + (itime, ip) = self._cache[name] + if itime < time.time() - self._ENTRY_EXPIRE_TIME: del self._cache[name] - time = ip = None + itime = ip = None except KeyError: pass @@ -127,14 +124,18 @@ hostname = cfg.get_str("General", "hostname") port = cfg.get_int("Active Builders", "xmlrpc_server_port") - if cfg.get_bool("Builders", "use_ssl") == True: - certs = {} - certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") - certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._server = AuthedSSLBuilderServer((hostname, port), certs, self._bm) - else: - self._server = AuthedBuilderServer((hostname, port), self._bm) + try: + if cfg.get_bool("Builders", "use_ssl") == True: + certs = {} + certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") + certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") + certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") + self._server = AuthedSSLBuilderServer((hostname, port), certs, self._bm) + else: + self._server = AuthedBuilderServer((hostname, port), self._bm) + except socket.gaierror, exc: + raise socket.gaierror(exc[0], "Couldn't bind to address %s:%d (%s)" % (hostname, + port, exc[1])) self._dispatcher = BuilderDispatcher() self._server.register_instance(self._dispatcher) @@ -145,10 +146,10 @@ def stop(self): self._server.stop() - t = time.time() + tm = time.time() while not self._stopped: try: - if time.time() > t + 2: + if time.time() > tm + 2: break except KeyboardInterrupt: pass @@ -163,7 +164,6 @@ self._builders = [] any_active = self._load_builders() - self._print_builders() self._queue_lock = threading.Lock() self._queue = [] @@ -190,10 +190,12 @@ self._fileserver.set_POST_handler('/upload', self.upload_callback) self._fileserver.start() + self._print_builders() + def upload_callback(self, request_handler, fs): # Ensure we know this builder - addr = request_handler.client_address[0] - builder = self.get_builder(addr, addr) + ip = request_handler.client_address[0] + builder = self.get_builder(ip, ip) if not builder: request_handler.send_error(403, "Unauthorized") return @@ -236,7 +238,7 @@ print "\nAuthorized Builders:" print "-" * 90 for builder in self._builders: - (ip, addr) = builder.address() + addr = builder.address() string = " " + addr string = string + " " * (40 - len(addr)) builder_dict = builder.to_dict() @@ -269,7 +271,7 @@ # If the address is already in our _builders list, skip it skip = False for builder in self._builders: - (ip, addr) = builder.address() + addr = builder.address() if address == addr: skip = True break @@ -301,21 +303,23 @@ return builder_list def get_builder(self, cert_ip, con_ip): + """Return the Builder object, if any, that matches the specified + IP address. Performs basic checking on the address too.""" self._builders_lock.acquire() - builder = None + ret_builder = None # Ensure builder's certificate (if SSL) and # the remote address of its connection are the same if cert_ip == con_ip: # Find matching builder in our authorized builders list - for b in self._builders: - (ip, addr) = b.address() - if cert_ip == ip: - builder = b + for builder in self._builders: + ip = builder.ip() + if ip and cert_ip == ip: + ret_builder = builder break self._builders_lock.release() - return builder + return ret_builder def _builder_cmp_func(self, builder1, builder2): # If both builders have at least one free slot, sort on @@ -341,29 +345,36 @@ return 1 def claim_arch_job(self, builder): + """Called by a Builder instance to find a job for the builder to build.""" archjob = None self._queue_lock.acquire() - for req in self._queue: - if builder.can_build_for_target(req['target_dict']): - self._queue.remove(req) - archjob = req + + # First pass: look for orphaned jobs + for job in self._queue: + if job.status() != ArchJob.AJ_STATUS_QUEUED: + continue + if job.orphaned() and builder.can_build_arch_job(job): + job.claim(builder) + archjob = job break + + # Second pass: just pick any job + if not archjob: + for job in self._queue: + if job.status() != ArchJob.AJ_STATUS_QUEUED: + continue + if builder.can_build_arch_job(job): + job.claim(builder) + archjob = job + break + self._queue_lock.release() return archjob - def request_arch_job(self, par_job, target_dict, srpm_url, orphaned): - req = {} - req['parent'] = par_job - req['target_dict'] = target_dict - req['srpm_url'] = srpm_url - req['time_queued'] = time.time() - + def request_arch_job(self, archjob): + """Called by the PackageJob instance to queue new arch-specific build jobs.""" self._queue_lock.acquire() - if orphaned: - # insert orphaned requests at the front of the queue - self._queue.insert(0, req) - else: - self._queue.append(req) + self._queue.append(archjob) self._queue_lock.release() def any_prepping_builders(self): @@ -373,4 +384,3 @@ return True return False - Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- PackageJob.py 11 May 2006 14:46:37 -0000 1.49 +++ PackageJob.py 14 May 2006 05:43:07 -0000 1.50 @@ -27,9 +27,6 @@ import copy import string import EmailUtils -import xmlrpclib -import socket -import BuilderManager import ArchJob from plague import ArchUtils from plague import DebugUtils @@ -47,9 +44,6 @@ if DEBUG: print stuff -def log(stuff=''): - print stuff - class PrepError(exceptions.Exception): pass class DepError(exceptions.Exception): pass @@ -72,6 +66,7 @@ "build" stage. This class provides the actual running thread. """ def __init__(self, pkg_job, start_stage, end_stage): + self._stop = False self._pkg_job = pkg_job if not end_stage: end_stage = 'aaaaa' @@ -82,9 +77,11 @@ def run(self): DebugUtils.registerThreadName(self) - while not self._pkg_job.is_done() and not self._pkg_job.cur_stage() == self._end_stage: + while not self._stop and not self._pkg_job.is_done() and not self._pkg_job.cur_stage() == self._end_stage: self._pkg_job.process() + def stop(self): + self._stop = True def is_package_job_stage_valid(stage): """ Validate a job stage """ @@ -118,9 +115,9 @@ def make_job_log_url(base_url, target_str, uid, name, ver, release): if target_str and uid and name and ver and release: if base_url.endswith('/'): - slash='' + slash = '' else: - slash='/' + slash = '/' return "%s%s%s/%s-%s-%s-%s/" % (base_url, slash, target_str, uid, name, ver, release) return None @@ -158,9 +155,10 @@ self._depsolve_dir = None self._last_depsolve_error = None self._depsolve_first_try = False + self._checkout_tmpdir = None self.repofiles = {} - self.archjobs = {} + self._archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() self._killer = None @@ -175,6 +173,12 @@ pjc = PackageJobController(self, first_stage, 'waiting') pjc.start() + def log(self, arch=None, msg=None): + archstring = "" + if arch: + archstring = "/%s" % arch + print "%s (%s%s): %s" % (self.uid, self.package, archstring, msg) + def cur_stage(self): return self._curstage @@ -374,7 +378,7 @@ for line in lines: if line.find('..........') == -1 and len(line) > 0: output_lines.append(line) - o = string.join(output_lines, '\n') + o = string.join(output_lines, ('\n')) msg = "Error: could not make srpm for %s - output was:\n\n%s" % (self._source, o) raise PrepError(msg) @@ -413,11 +417,11 @@ self.epoch = '0' self.ver = hdr['version'] self.release = hdr['release'] - (self.archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr) + (self._archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr) del hdr del ts - if len(self.archjobs) == 0: + if len(self._archjobs) == 0: msg = """Package %s does not build on any architectures this build system supports. Package: %s Build System: %s @@ -426,7 +430,7 @@ if self._server_cfg.get_bool("General", "depsolve_jobs"): self._set_cur_stage('depsolve_wait') - log("%s (%s): Requesting depsolve..." % (self.uid, self.package)) + self.log(msg="Requesting depsolve...") self._repo.request_depsolve(self, first_try=True) return True # sleep until the Repo wakes us up for depsolve else: @@ -445,9 +449,9 @@ config_lines = [] job_yum_dir = os.path.join(self._depsolve_dir, arch) for line in config_opts['yum.conf'].split('\n'): - if string.find(line, "cachedir=") >= 0: + if line.find("cachedir=") >= 0: line = "cachedir=cache" - elif string.find(line, "logfile=") >= 0: + elif line.find("logfile=") >= 0: line = "logfile=yum.log" config_lines.append(line+'\n') del config_opts @@ -483,8 +487,8 @@ base.log = Logger(threshold=threshold, file_object=sys.stdout) try: base.doRepoSetup() - except yum.Errors.RepoError, e: - raise DepError(str(e)) + except yum.Errors.RepoError, exc: + raise DepError(str(exc)) archlist = ['src', 'noarch'] if ArchUtils.supported_arches.has_key(arch): @@ -495,27 +499,27 @@ ts = rpmUtils.transaction.initReadOnlyTransaction() try: srpm = yum.packages.YumLocalPackage(ts, self._srpm_path) - except yum.Errors.MiscError, e: + except yum.Errors.MiscError, exc: del ts - raise DepError(str(e)) + raise DepError(str(exc)) del ts try: base.doSackSetup(archlist) - except yum.Errors.RepoError, e: - raise DepError(str(e)) + except yum.Errors.RepoError, exc: + raise DepError(str(exc)) for dep in srpm.requiresList(): if dep.startswith("rpmlib("): continue try: pkg = base.returnPackageByDep(dep) - except repomd.mdErrors.PackageSackError, e: - raise DepError(str(e)) - except yum.Errors.YumBaseError, e: - raise DepError(str(e)) - except DepError, e: - self._last_depsolve_error = str(e) - print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(e)) + except repomd.mdErrors.PackageSackError, exc: + raise DepError(str(exc)) + except yum.Errors.YumBaseError, exc: + raise DepError(str(exc)) + except DepError, exc: + self._last_depsolve_error = str(exc) + print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(exc)) success = False if base: @@ -530,8 +534,8 @@ self.wake() def _stage_depsolve(self): - """ Depsolve all arches, only if all pass do we proceed """ - """ to queue up the actual archjobs for building """ + """Depsolve all arches, only if all pass do we proceed + to queue up the actual archjobs for building.""" # If the job's waited more than 8 hours for deps to be # solved, kill the job and make some human figure it out @@ -551,18 +555,18 @@ self._archjobs_lock.acquire() unsolved_deps = False - archlist = self.archjobs.keys() + archlist = self._archjobs.keys() # noarch jobs are a bit special here. Since we don't know # what arch they will actually build on, we have to make # sure all arches the target supports will work - if len(self.archjobs.keys()) == 1 and self.archjobs.keys()[0] == 'noarch': + if len(self._archjobs.keys()) == 1 and self._archjobs.keys()[0] == 'noarch': archlist = self._target_cfg.basearches() for arch in self._target_cfg.optarches(): if arch not in archlist: archlist.append(arch) - log("%s (%s): Starting depsolve for arches: %s." % (self.uid, self.package, archlist)) + self.log(msg="Starting depsolve for arches: %s." % archlist) failed_arch = None for arch in archlist: @@ -588,10 +592,10 @@ # Go to sleep until the repo changes self._set_cur_stage('depsolve_wait') self._repo.request_depsolve(self, first_try=False) - log("%s (%s): Finished depsolve (unsuccessful), trying again later." % (self.uid, self.package)) + self.log(msg="Finished depsolve (unsuccessful), trying again later.") return True - log("%s (%s): Finished depsolve (successful), requesting archjobs." % (self.uid, self.package)) + self.log(msg="Finished depsolve (successful), requesting archjobs.") # Success, all deps are solved. Kill the depsolve dir shutil.rmtree(self._depsolve_dir, ignore_errors=True) @@ -603,7 +607,7 @@ # Make some directories we need work_dir = self._server_cfg.get_str("Directories", "server_work_dir") self._result_dir = self._make_stage_dir(work_dir) - for arch in self.archjobs.keys(): + for arch in self._archjobs.keys(): thisdir = os.path.join(self._result_dir, arch) if not os.path.exists(thisdir): os.makedirs(thisdir) @@ -620,7 +624,7 @@ # Queue up archjobs self._set_cur_stage('waiting') - self._request_arch_jobs() + self._create_arch_jobs() return False def _stage_depsolve_wait(self): @@ -636,58 +640,34 @@ os.makedirs(stage_dir) return stage_dir - def _request_one_arch_job(self, arch, orphaned): - # Construct SPRM URL - srpm_http_base = self._srpm_http_path[len(self.http_dir):] - method = "http" - if self._server_cfg.get_bool("Builders", "use_ssl") == True: - method = "https" - hostname = self._server_cfg.get_str("General", "hostname") - port = self._server_cfg.get_int("Active Builders", "file_server_port") - srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base) - target_dict = self._target_cfg.target_dict(arch) - self.bm.builder_manager.request_arch_job(self, target_dict, srpm_url, orphaned) - - def _request_arch_jobs(self): - # Queue requests for build jobs + def _create_arch_jobs(self): self._archjobs_lock.acquire() - for arch in self.archjobs.keys(): - if self.archjobs[arch]: - continue - self._request_one_arch_job(arch, False) + for arch in self._archjobs.keys(): + # Construct the SRPM URL + srpm_http_base = self._srpm_http_path[len(self.http_dir):] + method = "http" + if self._server_cfg.get_bool("Builders", "use_ssl") == True: + method = "https" + hostname = self._server_cfg.get_str("General", "hostname") + port = self._server_cfg.get_int("Active Builders", "file_server_port") + srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base) + + # Create and queue the archjob + target_dict = self._target_cfg.target_dict(arch) + archjob = ArchJob.ArchJob(self, target_dict, srpm_url) + self._archjobs[arch] = archjob + self.bm.builder_manager.request_arch_job(archjob) 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() - jobarch = job.arch() - if self.archjobs[jobarch] != None: - log("%s (%s/%s): Already have archjob for this arch (%s). New job UID is %s." % (self.uid, \ - self.package, jobarch, self.archjobs[jobarch].jobid, job.jobid)) - self.archjobs[jobarch] = job - + def archjob_started_cb(self, archjob): # 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() - # Only want hostname, not both IP and hostname - addr = job.builder().address()[1] - log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, addr, job.jobid)) - - def remove_arch_job(self, job): - """ Removes an arch job when its builder is no longer responding """ - self._archjobs_lock.acquire() - jobarch = job.arch() - log("%s (%s/%s): Builder disappeared. Requeuing arch..." % (self.uid, self.package, jobarch)) - self.archjobs[jobarch] = None - self._request_one_arch_job(jobarch, True) - self._archjobs_lock.release() - def is_done(self): - if self._curstage == 'needsign' or self._curstage == 'failed' or self._curstage == 'finished': + if self._curstage in ['needsign', 'failed', 'finished']: return True return False @@ -695,8 +675,7 @@ self._killer = username self._die = True - log("%s (%s): Job kill request from %s" % (self.uid, self.package, username)) - self._archjobs_lock.acquire() + self.log(msg="Job kill request from %s" % username) if self._curstage == 'waiting': # In 'waiting' stage, we have no controller thread. So to get # the job killed immediately, we have to start one @@ -705,14 +684,14 @@ else: # Otherwise, wake up the existing controller thread self.wake() - self._archjobs_lock.release() def _handle_death(self): - resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self._target_str, self._killer) + result_start = "%s (%s): " % (self.uid, self.name) + resultstring = "Build on target %s was killed by %s." % (self._target_str, self._killer) self._result = 'killed' self._set_cur_stage('finished', resultstring) - self.email_result(self.username, resultstring) - log(resultstring) + self.email_result(self.username, result_start + resultstring) + self.log(msg=resultstring) # Kill any building jobs self._kill_all_archjobs(True) @@ -726,19 +705,14 @@ def _kill_all_archjobs(self, user_requested=False): self._archjobs_lock.acquire() - for job in self.archjobs.values(): - if job: - job.die(user_requested) - self.archjobs = {} + for job in self._archjobs.values(): + job.die(user_requested) self._archjobs_lock.release() def wake(self): self._event.set() def process(self): - if self.is_done(): - return - if self._die: self._handle_death() return @@ -750,24 +724,24 @@ while not self._event.isSet(): self._event.wait() self._event.clear() - except PrepError, e: + except PrepError, exc: if self.use_cvs == True: shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) - msg = str(e) + msg = str(exc) subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str) self.email_result(self.username, resultstring=msg, subject=subj) self._stage_failed(msg) - except DepError, e: - msg = str(e) + except DepError, exc: + msg = str(exc) subj = 'Dependencies Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str) self.email_result(self.username, resultstring=msg, subject=subj) self._stage_failed(msg) - except BuildError, e: + except BuildError, exc: subj = 'Build Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str) base_url = self._server_cfg.get_str("UI", "log_url") log_url = make_job_log_url(base_url, self._target_str, 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 Build logs may be found at %s\n\n" % (exc.msg, log_url) + logtail = self._get_log_tail(exc.arch) msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail) self.email_result(self.username, resultstring=msg, subject=subj) @@ -776,44 +750,46 @@ if self._target_cfg.testing() == False: # Kill remaining jobs on other arches self._kill_all_archjobs(False) - self._stage_failed(e.msg) + self._stage_failed(exc.msg) def _stage_building(self): - # Count failed and completed jobs completed_jobs = 0 failed_jobs = 0 self._archjobs_lock.acquire() - for job in self.archjobs.values(): - if not job: - continue - if job.get_status() is 'done': - completed_jobs = completed_jobs + 1 - - if job.builder_failed() or job.download_failed() or job.internal_failure(): - failed_jobs = failed_jobs + 1 + for job in self._archjobs.values(): + # If the archjob is running, give it some time + if job.status() is not ArchJob.AJ_STATUS_DONE: + job.process() - # Normal jobs will just stop when a single archjob fails, but - # testing targets don't kill the build when one fails. However, - # even for testing targets, we still want to notify the user if - # a particular arch fails. - if not job.failure_noticed(): - job.set_failure_noticed() - jobarch = job.arch() - msg = "Job failed." - if job.builder_failed(): - msg = "Job failed on arch %s\n" % jobarch - elif job.download_failed(): - msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \ - "Please contact the build system administrator." % (jobarch, job.builder().address()) - elif job.internal_failure(): - msg = "Job failed on arch %s: there was an internal build system failure.\n " \ - "Please contact the build system administrator." % jobarch - self._archjobs_lock.release() - raise BuildError(msg, jobarch) + # If the archjob is still running, go to next archjob + if job.status() is not ArchJob.AJ_STATUS_DONE: + continue + completed_jobs = completed_jobs + 1 + if job.builder_failed() or job.download_failed() or job.internal_failure(): + failed_jobs = failed_jobs + 1 + + # Normal jobs will just stop when a single archjob fails, but + # testing targets don't kill the build when one fails. However, + # even for testing targets, we still want to notify the user if + # a particular arch fails. + if not job.failure_noticed(): + job.set_failure_noticed() + jobarch = job.arch() + msg = "Job failed." + if job.builder_failed(): + msg = "Job failed on arch %s\n" % jobarch + elif job.download_failed(): + msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \ + "Please contact the build system administrator." % (jobarch, job.builder().address()) + elif job.internal_failure(): + msg = "Job failed on arch %s: there was an internal build system failure.\n " \ + "Please contact the build system administrator." % jobarch + self._archjobs_lock.release() + raise BuildError(msg, jobarch) self._archjobs_lock.release() - if completed_jobs == len(self.archjobs): + if completed_jobs == len(self._archjobs): # Testing targets don't contribute packages to the repo if self._target_cfg.testing() == True: if failed_jobs > 0: @@ -824,7 +800,8 @@ self._set_cur_stage('add_to_repo') return False # Don't want to wait - return True + time.sleep(5) + return False def get_stage_dir(self): return self._result_dir @@ -848,9 +825,7 @@ srpm_file = os.path.join(self._result_dir, os.path.basename(self._srpm_http_path)) # Delete any RPMs in the arch dirs - for job in self.archjobs.values(): - if not job: - continue + for job in self._archjobs.values(): job_result_dir = job.get_result_files_dir() for f in job.get_files(): if not f.endswith(".rpm"): @@ -874,9 +849,7 @@ # Create a list of files that the repo should copy to # the repo dir repo_dir = self._server_cfg.get_str("Directories", "repo_dir") - for job in self.archjobs.values(): - if not job: - continue + for job in self._archjobs.values(): job_result_dir = job.get_result_files_dir() for f in job.get_files(): if not f.endswith(".rpm"): Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- main.py 28 Apr 2006 03:17:41 -0000 1.21 +++ main.py 14 May 2006 05:43:07 -0000 1.22 @@ -91,7 +91,7 @@ ret=daemonize.createDaemon() if ret: print "Daemonizing failed!" - sys.exit(2) + os._exit(2) if opts.pidfile: open(opts.pidfile, 'w').write('%d\n' % os.getpid()) @@ -107,7 +107,7 @@ cfg.load_target_configs() if len(cfg.targets()) == 0: print "You need at least one target to do anything useful." - sys.exit(3) + os._exit(3) hostname = cfg.get_str("General", "hostname") @@ -125,7 +125,11 @@ dbm = DBManager.DBManager(cfg) # Create the BuildMaster thread - builder_manager = BuilderManager.BuilderManager(cfg) + try: + builder_manager = BuilderManager.BuilderManager(cfg) + except Exception, exc: + print "Couldn't create BuilderManager: %s" % exc + os._exit(4) bm = BuildMaster.BuildMaster(builder_manager, dbm, cfg) bm.start() @@ -143,10 +147,10 @@ else: ui = UserInterfaceNoAuth(builder_manager, bm, dbm, cfg) bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port)) - except socket.error, e: - if e[0] == 98: # Address already in use + except socket.error, exc: + if exc[0] == 98: # Address already in use print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, port) - os._exit(1) + os._exit(4) bm_server.register_instance(ui) # Create dummy thread just to register main thread's name From fedora-extras-commits at redhat.com Sun May 14 05:43:08 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 13 May 2006 22:43:08 -0700 Subject: extras-buildsys/builder Builder.py, 1.10, 1.11 BuilderMock.py, 1.5, 1.6 main.py, 1.2, 1.3 Message-ID: <200605140543.k4E5h8YT003036@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2964/builder Modified Files: Builder.py BuilderMock.py main.py Log Message: 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning PackageJob object, and only one is spawned for the lifetime of the PackageJob for each architecture (previously one was spawned for each individual build job on the builder). Archjob UIDs are generated on the server now rather than the builder. * Correctly handle builders going away before they've had a chance to notify the server that they have started an archjob. Previously, these jobs would just be lost. This is the real reason for the rework of the archjob handling above. * On the builder, don't use die() to end jobs that have failed; do it properly and upload files to the server if we weren't killed * Deal with active builders whose hostnames can't be resolved when the server starts * Kill any existing jobs on builders when the server starts up * Consolidate and simplify logging functions in PackageJob * More pylint-induced cleanups 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 12 May 2006 04:10:46 -0000 1.10 +++ Builder.py 14 May 2006 05:43:06 -0000 1.11 @@ -46,7 +46,7 @@ return '' return socket.gethostname() -def determine_max_jobs(cfg): +def determine_max_jobs(): """ Simple max job calculator based on number of CPUs """ import commands @@ -65,7 +65,7 @@ """ Abstract builder base object """ def __init__(self, cfg): self._cfg = cfg - self._max_slots = determine_max_jobs(cfg) + self._max_slots = determine_max_jobs() self._seq_gen = Commands.SequenceGenerator() self._building_jobs_lock = threading.Lock() @@ -162,7 +162,7 @@ return target_cfg - def _new_job_for_arch(self, target_cfg, buildarch, srpm_url): + def _new_job_for_arch(self, target_cfg, buildarch, srpm_url, uniqid): """Creates a new mock build job given a particular build architecture.""" if buildarch != 'noarch' and not BuilderMock.BuilderClassDict.has_key(buildarch): @@ -177,30 +177,31 @@ builder_class = BuilderMock.BuilderClassDict[buildarch] # We'll throw a TypeError here if there's no available builder_class for this arch - return builder_class(self, target_cfg, buildarch, srpm_url) + return builder_class(self, target_cfg, buildarch, srpm_url, uniqid) - def _start_new_job(self, target_dict, srpm_url): + def _start_new_job(self, cmd): + target_dict = cmd.target_dict() + srpm_url = cmd.srpm_url() + uniqid = cmd.archjob_id() target_str = Config.make_target_string(target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo']) - uniqid = -1 msg = "Success" (free_slots, max_slots) = self.slots() if free_slots <= 0: msg = "Error: Tried to build '%s' on target %s when already building" \ " maximum (%d) jobs" % (srpm_url, target_str, max_slots) self._log(msg) - return (uniqid, msg) + return (-1, msg) target_cfg = self._get_target_cfg(target_dict) if not target_cfg: msg = "Error: Tried to build '%s' on target %s which isn't supported" % (srpm_url, target_str) self._log(msg) - return (uniqid, msg) + return (-1, msg) archjob = None try: - archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], srpm_url) - uniqid = archjob.uniqid() + archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], srpm_url, uniqid) self._all_jobs[uniqid] = archjob self._building_jobs_lock.acquire() self._building_jobs.append(archjob) @@ -259,9 +260,9 @@ self._building_jobs = [] self._cfg = cfg - def _log(self, string): + def _log(self, msg): if self._cfg.get_bool("General", "debug"): - print string + print msg def die(self, uniqid): try: @@ -526,7 +527,7 @@ """Process a single command from the server.""" if isinstance(cmd, Commands.PlgCommandNewJobReq): - (uniqid, msg) = self._start_new_job(cmd.target_dict(), cmd.srpm_url()) + (uniqid, msg) = self._start_new_job(cmd) ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) self._queued_cmds.append(ack) elif isinstance(cmd, Commands.PlgCommandUnlockRepo): Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BuilderMock.py 11 May 2006 15:43:39 -0000 1.5 +++ BuilderMock.py 14 May 2006 05:43:06 -0000 1.6 @@ -26,8 +26,8 @@ import urllib import errno import exceptions -import sha import time +import Builder from plague import ExecUtils from plague import FileDownloader @@ -47,27 +47,22 @@ method = "https://" else: method = "http://" - hostname = get_hostname(cfg, False) + hostname = Builder.get_hostname(cfg, False) full_url = "%s%s:%s/%s" % (method, hostname, port, file_part) return urllib.quote(full_url) -def _generate_uniqid(target_str, srpm_url): - sha_hash = sha.new() - sha_hash.update('%d %s %s' % (time.time(), target_str, srpm_url)) - return sha_hash.hexdigest() - class BuilderMock(threading.Thread): """puts things together for an arch - baseclass for handling builds for other arches""" - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self._controller = controller self._buildarch = buildarch self._starttime = time.time() self._endtime = 0 self._mockstarttime = 0 - self._uniqid = _generate_uniqid(str(target_cfg), srpm_url) + self._uniqid = uniqid self._status = 'init' self._die = False self._repo_locked = True @@ -131,14 +126,14 @@ try: # Kill all members of the child's process group os.kill(child_pgroup, 9) - except OSError, e: - self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e)) + except OSError, exc: + self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, exc)) else: # Ensure child process is reaped self._log("Waiting for mock process %d to exit...\n" % self._childpid) try: (pid, status) = os.waitpid(self._childpid, 0) - except OSError, e: + except OSError: pass self._log("Mock process %d exited.\n" % self._childpid) self._childpid = 0 @@ -261,8 +256,8 @@ try: f.seek(0, 0) mockstat = f.read(4) - except OSError, e: - if e.errno == errno.EAGAIN: + except OSError, exc: + if exc.errno == errno.EAGAIN: try: time.sleep(0.25) except KeyboardInterrupt: @@ -299,8 +294,9 @@ # If job was cancelled, just return if self.is_done_status(): return - self._status = 'failed' + self._done_status = 'failed' self._log("ERROR: Failed to retrieve %s.\n" % url) + self._post_cleanup() elif dl_status == FileTransfer.FT_RESULT_CANCELED: # Ignore cancelation pass @@ -313,10 +309,11 @@ try: self._downloader = self._controller.download_srpm(self._srpm_url, target_dir, self.dl_callback, self._srpm_url) - except FileDownloader.FileNameException, e: - self._status = 'failed' - self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (e, self._srpm_url)) - + except FileDownloader.FileNameException, exc: + self._done_status = 'failed' + self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (exc, self._srpm_url)) + self._post_cleanup() + def _status_downloading(self): pass @@ -334,8 +331,9 @@ # Kill a job in 'downloaded' state after 30 minutes because # it's likely orphaned if time.time() > (self._repo_wait_start + (60 * 30)): + self._done_status = 'failed' self._log("Job waited too long for repo to unlock. Killing it...\n") - self.die() + self._post_cleanup() def _watch_mock(self, good_exit, bad_exit): (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG) @@ -364,8 +362,9 @@ # something is wrong if mock takes more than 15s to write the status file if time.time() > self._mockstarttime + 15: self._mockstarttime = 0 + self._done_status = 'failed' self._log("ERROR: Timed out waiting for the mock status file! %s\n" % mockstatusfile) - self.die() + self._post_cleanup() else: if not self._mock_config and self._mock_is_prepping(): self._mock_config = self._read_mock_config() @@ -400,15 +399,23 @@ try: self._log("Waiting for child process %d to exit.\n" % self._childpid) (pid, status) = os.waitpid(self._childpid, 0) - except OSError, e: + except OSError: self._childpid = 0 pass - self._copy_mock_output_to_log() - self._files = self._find_files() - self._uploader = self._controller.upload_files(self._uniqid, self._files, - self.ul_callback, None) - self._status = "uploading" + if self._done_status is not 'killed': + self._copy_mock_output_to_log() + + self._post_cleanup() + + def _post_cleanup(self): + if self._done_status is not 'killed': + self._files = self._find_files() + self._uploader = self._controller.upload_files(self._uniqid, self._files, + self.ul_callback, None) + self._status = "uploading" + else: + self._status = self._done_status def ul_callback(self, status, cb_data, msg): if status == FileTransfer.FT_RESULT_SUCCESS: @@ -450,9 +457,10 @@ try: srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm']) self._srpm_path = os.path.join(self._work_dir, self._uniqid, "source", srpm_filename) - except FileDownloader.FileNameException, e: - self._log("ERROR: SRPM file name was invalid. Message: '%s'\n" % e) - self._status = 'failed' + except FileDownloader.FileNameException, exc: + self._done_status = 'failed' + self._log("ERROR: SRPM file name was invalid. Message: '%s'\n" % exc) + self._post_cleanup() # Main build job work loop while not self.is_done_status(): @@ -463,8 +471,9 @@ try: func = getattr(self, "_status_%s" % self._status) except AttributeError: + self._done_status = 'failed' self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'.\n" % self._status) - self._status = 'failed' + self._post_cleanup() else: func() time.sleep(3) @@ -524,34 +533,34 @@ class InvalidTargetError(exceptions.Exception): pass class i386Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '/usr/bin/setarch i686' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class x86_64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class PPCArch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '/usr/bin/setarch ppc32' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class PPC64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class SparcArch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '/usr/bin/sparc32' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class Sparc64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '/usr/bin/sparc64' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) BuilderClassDict = { Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/main.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main.py 10 May 2006 14:28:12 -0000 1.2 +++ main.py 14 May 2006 05:43:06 -0000 1.3 @@ -202,7 +202,10 @@ log("Shutting down...\n") builder.stop() builder.cleanup() - time.sleep(2) + try: + time.sleep(2) + except KeyboardInterrupt: + pass log(" done.\n"); sys.stdout.flush() From fedora-extras-commits at redhat.com Sun May 14 06:04:16 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 13 May 2006 23:04:16 -0700 Subject: rpms/mftrace/devel .cvsignore, 1.2, 1.3 mftrace.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605140604.k4E64IXQ006341@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6316 Modified Files: .cvsignore mftrace.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Apr 2006 00:39:02 -0000 1.2 +++ .cvsignore 14 May 2006 06:04:16 -0000 1.3 @@ -1 +1 @@ -mftrace-1.1.19.tar.gz +mftrace-1.2.4.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/mftrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mftrace.spec 26 Apr 2006 00:47:34 -0000 1.2 +++ mftrace.spec 14 May 2006 06:04:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.1.19 -Release: 3%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -46,10 +46,12 @@ %{_bindir}/* %{_mandir}/man1/%{name}* %{_datadir}/%{name} -%ghost %{_datadir}/%{name}/*.pyo %changelog +* Sat May 13 2006 Quentin Spencer 1.2.4-1 +- New upstream release. + * Tue Apr 25 2006 Quentin Spencer 1.1.19-3 - Update description Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Apr 2006 00:39:02 -0000 1.2 +++ sources 14 May 2006 06:04:16 -0000 1.3 @@ -1 +1 @@ -89d5f70cdfad6ed7be146dd1b548cec1 mftrace-1.1.19.tar.gz +8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz From fedora-extras-commits at redhat.com Sun May 14 06:12:39 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 13 May 2006 23:12:39 -0700 Subject: rpms/mftrace/FC-5 .cvsignore, 1.2, 1.3 mftrace.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605140612.k4E6Cf3e007261@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7236 Modified Files: .cvsignore mftrace.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Apr 2006 00:39:02 -0000 1.2 +++ .cvsignore 14 May 2006 06:12:39 -0000 1.3 @@ -1 +1 @@ -mftrace-1.1.19.tar.gz +mftrace-1.2.4.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/mftrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mftrace.spec 26 Apr 2006 00:47:34 -0000 1.2 +++ mftrace.spec 14 May 2006 06:12:39 -0000 1.3 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.1.19 -Release: 3%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -46,10 +46,12 @@ %{_bindir}/* %{_mandir}/man1/%{name}* %{_datadir}/%{name} -%ghost %{_datadir}/%{name}/*.pyo %changelog +* Sat May 13 2006 Quentin Spencer 1.2.4-1 +- New upstream release. + * Tue Apr 25 2006 Quentin Spencer 1.1.19-3 - Update description Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Apr 2006 00:39:02 -0000 1.2 +++ sources 14 May 2006 06:12:39 -0000 1.3 @@ -1 +1 @@ -89d5f70cdfad6ed7be146dd1b548cec1 mftrace-1.1.19.tar.gz +8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz From fedora-extras-commits at redhat.com Sun May 14 06:26:22 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 13 May 2006 23:26:22 -0700 Subject: rpms/mftrace/FC-4 .cvsignore, 1.2, 1.3 mftrace.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605140626.k4E6QOqr008721@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8696 Modified Files: .cvsignore mftrace.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Apr 2006 00:39:02 -0000 1.2 +++ .cvsignore 14 May 2006 06:26:22 -0000 1.3 @@ -1 +1 @@ -mftrace-1.1.19.tar.gz +mftrace-1.2.4.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-4/mftrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mftrace.spec 26 Apr 2006 00:47:34 -0000 1.2 +++ mftrace.spec 14 May 2006 06:26:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.1.19 -Release: 3%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -46,10 +46,12 @@ %{_bindir}/* %{_mandir}/man1/%{name}* %{_datadir}/%{name} -%ghost %{_datadir}/%{name}/*.pyo %changelog +* Sat May 13 2006 Quentin Spencer 1.2.4-1 +- New upstream release. + * Tue Apr 25 2006 Quentin Spencer 1.1.19-3 - Update description Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Apr 2006 00:39:02 -0000 1.2 +++ sources 14 May 2006 06:26:22 -0000 1.3 @@ -1 +1 @@ -89d5f70cdfad6ed7be146dd1b548cec1 mftrace-1.1.19.tar.gz +8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz From fedora-extras-commits at redhat.com Sun May 14 07:42:07 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:42:07 -0700 Subject: rpms/libnetfilter_conntrack - New directory Message-ID: <200605140742.k4E7g9dr012093@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12072/libnetfilter_conntrack Log Message: Directory /cvs/extras/rpms/libnetfilter_conntrack added to the repository From fedora-extras-commits at redhat.com Sun May 14 07:42:08 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:42:08 -0700 Subject: rpms/libnetfilter_conntrack/devel - New directory Message-ID: <200605140742.k4E7gAj2012096@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12072/libnetfilter_conntrack/devel Log Message: Directory /cvs/extras/rpms/libnetfilter_conntrack/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 07:42:50 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:42:50 -0700 Subject: rpms/libnetfilter_conntrack Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605140742.k4E7gqt6012154@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12121 Added Files: Makefile import.log Log Message: Setup of module libnetfilter_conntrack --- NEW FILE Makefile --- # Top level Makefile for module libnetfilter_conntrack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 14 07:42:50 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:42:50 -0700 Subject: rpms/libnetfilter_conntrack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605140742.k4E7gqMd012157@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12121/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libnetfilter_conntrack --- NEW 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 May 14 07:44:05 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:44:05 -0700 Subject: rpms/libnetfilter_conntrack import.log,1.1,1.2 Message-ID: <200605140744.k4E7i7fd012220@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12187 Modified Files: import.log Log Message: auto-import libnetfilter_conntrack-0.0.30-2 on branch devel from libnetfilter_conntrack-0.0.30-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 07:42:49 -0000 1.1 +++ import.log 14 May 2006 07:44:05 -0000 1.2 @@ -0,0 +1 @@ +libnetfilter_conntrack-0_0_30-2:HEAD:libnetfilter_conntrack-0.0.30-2.src.rpm:1147592629 From fedora-extras-commits at redhat.com Sun May 14 07:44:05 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:44:05 -0700 Subject: rpms/libnetfilter_conntrack/devel libnetfilter_conntrack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605140744.k4E7i73U012225@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12187/devel Modified Files: .cvsignore sources Added Files: libnetfilter_conntrack.spec Log Message: auto-import libnetfilter_conntrack-0.0.30-2 on branch devel from libnetfilter_conntrack-0.0.30-2.src.rpm --- NEW FILE libnetfilter_conntrack.spec --- Name: libnetfilter_conntrack Version: 0.0.30 Release: 2%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/libnetfilter_conntrack/files/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel %description libnetfilter_conntrack is a userspace library providing a programming interface (API) to the in-kernel connection tracking state table. %package devel Summary: Netfilter conntrack userspace library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel libnetfilter_conntrack is a userspace library providing a programming interface (API) to the in-kernel connection tracking state table. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/*.so.* %{_libdir}/libnetfilter_conntrack/*.so %{_bindir}/ctnl_test %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/libnetfilter_conntrack/*.h %changelog * Mon May 8 2006 Paul P Komkoff Jr - 0.0.30-2 - Include COPYING in %doc * Sun Mar 26 2006 Paul P Komkoff Jr - 0.0.30-1 - Preparing for submission to fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 07:42:50 -0000 1.1 +++ .cvsignore 14 May 2006 07:44:05 -0000 1.2 @@ -0,0 +1 @@ +libnetfilter_conntrack-0.0.30.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 07:42:50 -0000 1.1 +++ sources 14 May 2006 07:44:05 -0000 1.2 @@ -0,0 +1 @@ +e07f3d159a869900fbf23f5df12aaf3e libnetfilter_conntrack-0.0.30.tar.bz2 From fedora-extras-commits at redhat.com Sun May 14 10:20:38 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 03:20:38 -0700 Subject: owners owners.list,1.990,1.991 Message-ID: <200605141020.k4EAKeXV019642@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443 Modified Files: owners.list Log Message: libnetfilter_conntrack - Netfilter conntrack userspace library Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.990 retrieving revision 1.991 diff -u -r1.990 -r1.991 --- owners.list 14 May 2006 03:34:46 -0000 1.990 +++ owners.list 14 May 2006 10:20:38 -0000 1.991 @@ -654,6 +654,7 @@ Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|libnetfilter_conntrack|Netfilter conntrack userspace library|i at stingr.net|extras-qa at fedoraproject.org| Fedora Extras|libnfnetlink|Netfilter netlink userspace library|i at stingr.net|extras-qa at fedoraproject.org| Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 14 15:56:36 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 14 May 2006 08:56:36 -0700 Subject: rpms/xsp import.log,1.2,1.3 Message-ID: <200605141557.k4EFv8Wl032138@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32104 Modified Files: import.log Log Message: auto-import xsp-1.1.15-1 on branch devel from xsp-1.1.15-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xsp/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 9 May 2006 21:40:12 -0000 1.2 +++ import.log 14 May 2006 15:56:35 -0000 1.3 @@ -1 +1,2 @@ xsp-1_1_13-3:HEAD:xsp-1.1.13-3.src.rpm:1147210802 +xsp-1_1_15-1:HEAD:xsp-1.1.15-1.src.rpm:1147622162 From fedora-extras-commits at redhat.com Sun May 14 15:56:37 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 14 May 2006 08:56:37 -0700 Subject: rpms/xsp/devel .cvsignore,1.2,1.3 sources,1.2,1.3 xsp.spec,1.1,1.2 Message-ID: <200605141557.k4EFv9MF032143@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32104/devel Modified Files: .cvsignore sources xsp.spec Log Message: auto-import xsp-1.1.15-1 on branch devel from xsp-1.1.15-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 May 2006 21:40:13 -0000 1.2 +++ .cvsignore 14 May 2006 15:56:37 -0000 1.3 @@ -1 +1 @@ -xsp-1.1.13.tar.gz +xsp-1.1.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 May 2006 21:40:13 -0000 1.2 +++ sources 14 May 2006 15:56:37 -0000 1.3 @@ -1 +1 @@ -58facfdb9d13d48f9e8ad5069500081d xsp-1.1.13.tar.gz +2becc73f015bb5f1740427d982930e6f xsp-1.1.15.tar.gz Index: xsp.spec =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/xsp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsp.spec 9 May 2006 21:40:13 -0000 1.1 +++ xsp.spec 14 May 2006 15:56:37 -0000 1.2 @@ -1,8 +1,8 @@ %define _libdir /usr/lib Name: xsp -Version: 1.1.13 -Release: 3%{?dist} +Version: 1.1.15 +Release: 1%{?dist} License: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.mono-project.com/ASP.NET#XSP @@ -38,12 +38,16 @@ %{_bindir}/* %{_libdir}/pkgconfig/xsp.pc %{_libdir}/pkgconfig/xsp-2.pc -%{_libdir}/%{name}/1.0/* -%{_libdir}/%{name}/2.0/* -%{_libdir}/%{name}/test/* +%{_libdir}/%{name}/ %{_mandir}/man1/* %changelog +* Sun May 14 2006 Paul F. Johnson 1.1.15-1 +- bump to new version + +* Sun May 14 2006 Paul F. Johnson 1.1.13-4 +- minor alteration to the spec file + * Mon May 08 2006 Paul F. Johnson 1.1.13-3 - Fixes to the spec file - Added clean From fedora-extras-commits at redhat.com Sun May 14 16:10:37 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 May 2006 09:10:37 -0700 Subject: extras-buildsys/www builders.psp,1.11,1.12 Message-ID: <200605141610.k4EGAblC002080@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2062 Modified Files: builders.psp Log Message: Fixup for recent builder changes. Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- builders.psp 31 Oct 2005 17:39:47 -0000 1.11 +++ builders.psp 14 May 2006 16:10:35 -0000 1.12 @@ -46,7 +46,7 @@ # endfor unavail_color = '' - if builder['alive'] == False: + if builder['available'] == False: unavail_color = 'color="#ff4444"' slots_text = "unavailable" else: From fedora-extras-commits at redhat.com Sun May 14 16:12:03 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:03 -0700 Subject: rpms/vorbisgain - New directory Message-ID: <200605141612.k4EGC51G002163@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2137/vorbisgain Log Message: Directory /cvs/extras/rpms/vorbisgain added to the repository From fedora-extras-commits at redhat.com Sun May 14 16:12:04 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:04 -0700 Subject: rpms/vorbisgain/devel - New directory Message-ID: <200605141612.k4EGC6GZ002166@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2137/vorbisgain/devel Log Message: Directory /cvs/extras/rpms/vorbisgain/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 16:12:23 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:23 -0700 Subject: rpms/vorbisgain Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605141612.k4EGCPuS002215@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2187 Added Files: Makefile import.log Log Message: Setup of module vorbisgain --- NEW FILE Makefile --- # Top level Makefile for module vorbisgain all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 14 16:12:24 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:24 -0700 Subject: rpms/vorbisgain/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605141612.k4EGCQPF002218@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2187/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module vorbisgain --- NEW 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 May 14 16:13:09 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 May 2006 09:13:09 -0700 Subject: extras-buildsys/builder Builder.py,1.11,1.12 Message-ID: <200605141613.k4EGD9rY002306@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2288/builder Modified Files: Builder.py Log Message: Fix errors in passive builder code (patch from Andreas Thienemann ) 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 14 May 2006 05:43:06 -0000 1.11 +++ Builder.py 14 May 2006 16:13:06 -0000 1.12 @@ -330,14 +330,15 @@ # Start up the HTTP server thread which the build server # pulls completed RPMs from hostname = get_hostname(self._cfg, True) - port = cfg.get_int("Passive", "fileserver_port") + port = self._cfg.get_int("Passive", "fileserver_port") + work_dir = self._cfg.get_str("Directories", "builder_work_dir") self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs) self._http_server.start() self._log("Binding to address '%s'\n" % hostname) - xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port") + xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") try: - if cfg.get_bool("SSL", "use_ssl") == True: + if self._cfg.get_bool("SSL", "use_ssl") == True: self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) else: self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) @@ -346,7 +347,7 @@ raise BuilderInitException("Error: couldn't bind to address '%s:%s'. " \ "Is the builder already running?\n" % (hostname, xmlrpc_port)) - brh = PassiveBuilderRequestHandler(cfg, self) + brh = PassiveBuilderRequestHandler(self._cfg, self) self._xmlrpc_server.register_instance(brh) def work(self): From fedora-extras-commits at redhat.com Sun May 14 16:12:54 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:54 -0700 Subject: rpms/vorbisgain import.log,1.1,1.2 Message-ID: <200605141613.k4EGDQoM002309@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2251 Modified Files: import.log Log Message: auto-import vorbisgain-0.34-1.fc5 on branch devel from vorbisgain-0.34-1.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/vorbisgain/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 16:12:23 -0000 1.1 +++ import.log 14 May 2006 16:12:54 -0000 1.2 @@ -0,0 +1 @@ +vorbisgain-0_34-1_fc5:HEAD:vorbisgain-0.34-1.fc5.src.rpm:1147623166 From fedora-extras-commits at redhat.com Sun May 14 16:12:55 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:55 -0700 Subject: rpms/vorbisgain/devel vorbisgain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605141613.k4EGDRCP002313@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2251/devel Modified Files: .cvsignore sources Added Files: vorbisgain.spec Log Message: auto-import vorbisgain-0.34-1.fc5 on branch devel from vorbisgain-0.34-1.fc5.src.rpm --- NEW FILE vorbisgain.spec --- Name: vorbisgain Version: 0.34 Release: 1%{?dist} Summary: Adds tags to Ogg Vorbis files to adjust the volume Group: Applications/Multimedia License: LGPL URL: http://sjeng.org/vorbisgain.html Source0: http://sjeng.org/ftp/vorbis/vorbisgain-0.34.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libvorbis-devel libogg-devel %description VorbisGain is a utility that uses a psychoacoustic method to correct the volume of an Ogg Vorbis file to a predefined standardized loudness. It needs player support to work. Non-supporting players will play back the files without problems, but you'll miss out on the benefits. Nowadays most good players such as ogg123, xmms and mplayer are already compatible. %prep %setup -q %build chmod 755 configure %configure --enable-recursive make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %_bindir/* %doc NEWS README %_mandir/man1/* %changelog * Sat May 13 2006 Noa Resare 0.34-1 - Initial spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vorbisgain/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 16:12:23 -0000 1.1 +++ .cvsignore 14 May 2006 16:12:55 -0000 1.2 @@ -0,0 +1 @@ +vorbisgain-0.34.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/vorbisgain/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 16:12:23 -0000 1.1 +++ sources 14 May 2006 16:12:55 -0000 1.2 @@ -0,0 +1 @@ +ee62352b74c610bb3eeddda038819fc8 vorbisgain-0.34.zip From fedora-extras-commits at redhat.com Sun May 14 16:16:21 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:16:21 -0700 Subject: owners owners.list,1.991,1.992 Message-ID: <200605141616.k4EGGNV5002443@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2424 Modified Files: owners.list Log Message: added noa at resare.com as contact for vorbiscomment Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.991 retrieving revision 1.992 diff -u -r1.991 -r1.992 --- owners.list 14 May 2006 10:20:38 -0000 1.991 +++ owners.list 14 May 2006 16:16:21 -0000 1.992 @@ -1625,6 +1625,7 @@ Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|vorbisgain|Adds tags to Ogg Vorbis files to adjust the volume|noa at resare.com|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-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 14 17:35:26 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 14 May 2006 10:35:26 -0700 Subject: rpms/pure-ftpd/devel pure-ftpd.README.SELinux, NONE, 1.1 pure-ftpd.pureftpd.te, NONE, 1.1 pure-ftpd.init, 1.3, 1.4 pure-ftpd.spec, 1.8, 1.9 Message-ID: <200605141735.k4EHZSo9006259@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/pure-ftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6236 Modified Files: pure-ftpd.init pure-ftpd.spec Added Files: pure-ftpd.README.SELinux pure-ftpd.pureftpd.te Log Message: - add SELinux support - prevent the init script from displaying the config on startup --- NEW FILE pure-ftpd.README.SELinux --- ============================= SELinux support for Pure-FTPd ============================= With this package, Pure-FTPd is now protected in the same way VSFTPd and ProFTPd are in Fedora. Read Access ----------- To allow files to be accessed by Pure-FTPd, you need either : - to place them in /var/ftp - to label them with the public_content_t. To do that, you can use:: chcon -t public_content_t file_to_publish Write Access ------------ If you wish to grant write access, you have to use the public_content_rw_t type, for example with this command:: chcon -t public_content_rw_t file_to_publish and you have to turn on the allow_ftpd_anon_write boolean using system-config-securitylevel, or using the following command:: setsebool -P allow_ftpd_anon_write 1 Access to home directories -------------------------- If you want to publish files in a user's home directory, you have to turn on the ftp_home_dir boolean, using system-config-securitylevel, or using the following command:: setsebool -P ftp_home_dir 1 --- NEW FILE pure-ftpd.pureftpd.te --- policy_module(pureftpd, 1.0) require { type ftpd_t; }; # Read /var/run/utmp init_read_utmp(ftpd_t) init_dontaudit_write_utmp(ftpd_t) ### Allow connect to mysql # Network connect corenet_tcp_connect_mysqld_port(ftpd_t) # Socket file connect mysql_stream_connect(ftpd_t); mysql_rw_db_sockets(ftpd_t) ### Allow connect to postgresql # Network connect corenet_tcp_connect_postgresql_port(ftpd_t) # Socket file connect postgresql_stream_connect(ftpd_t) # Allow connect to ldap sysnet_use_ldap(ftpd_t) Index: pure-ftpd.init =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pure-ftpd.init 13 Nov 2005 17:41:27 -0000 1.3 +++ pure-ftpd.init 14 May 2006 17:35:26 -0000 1.4 @@ -30,7 +30,7 @@ start() { echo -n $"Starting $prog: " - daemon $pure_launch_script $pure_config --daemonize + daemon "$pure_launch_script $pure_config --daemonize > /dev/null" RETVAL=$? [ $RETVAL = 0 ] && touch /var/lock/subsys/pure-ftpd echo Index: pure-ftpd.spec =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pure-ftpd.spec 9 Apr 2006 15:39:18 -0000 1.8 +++ pure-ftpd.spec 14 May 2006 17:35:26 -0000 1.9 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -12,6 +12,8 @@ Source3: pure-ftpd.xinetd Source4: pure-ftpd.pure-ftpwho.pam Source5: pure-ftpd.pure-ftpwho.consoleapp +Source6: pure-ftpd.README.SELinux +Source7: pure-ftpd.pureftpd.te Patch0: pure-ftpd-1.0.21-config.patch Patch1: pure-ftpd-1.0.20-libdir.patch Provides: ftpserver @@ -21,6 +23,7 @@ %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} +BuildRequires: selinux-policy Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -45,10 +48,28 @@ --without tls disable SSL/TLS +%package selinux +Summary: SELinux support for Pure-FTPD +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(post): policycoreutils, initscripts, %{name} +Requires(preun): policycoreutils, initscripts, %{name} +Requires(postun): policycoreutils + +%description selinux +This package adds SELinux enforcement to Pure-FTPD. Install it if you want +Pure-FTPd to be protected in the same way other FTP servers are in Fedora +(e.g. VSFTPd and ProFTPd) + + + %prep %setup -q %patch0 -p0 -b .config %patch1 -p0 -b .libdir +cp -p %{SOURCE6} README.SELinux +mkdir selinux +cp -p %{SOURCE7} selinux/pureftpd.te %build @@ -83,6 +104,7 @@ make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -135,13 +157,22 @@ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho +# SELinux support +cd selinux +echo "%{_sbindir}/pure-ftpd system_u:object_r:ftpd_exec_t:s0" > pureftpd.fc +echo '%{_localstatedir}/log/pureftpd.log system_u:object_r:xferlog_t:s0' >> pureftpd.fc +touch pureftpd.if +make -f %{_datadir}/selinux/devel/Makefile +install -p -m 644 -D pureftpd.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/pureftpd.pp + + %clean rm -rf $RPM_BUILD_ROOT %post -if [ "$1" -le "1" ]; then +if [ "$1" -le "1" ]; then # fist install /sbin/chkconfig --add pure-ftpd fi @@ -151,12 +182,35 @@ /sbin/chkconfig --del pure-ftpd fi -%postun +%postun if [ "$1" -ge "1" ]; then /sbin/service pure-ftpd condrestart > /dev/null 2>&1 fi +%post selinux +if [ "$1" -le "1" ]; then # Fist install + semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || : + fixfiles -R pure-ftpd restore + /sbin/service pure-ftpd condrestart > /dev/null 2>&1 +fi + +%preun selinux +if [ "$1" -lt "1" ]; then # Final removal + semodule -r pureftpd 2>/dev/null || : + fixfiles -R pure-ftpd restore + /sbin/service pure-ftpd condrestart > /dev/null 2>&1 +fi + +%postun selinux +if [ "$1" -ge "1" ]; then # Upgrade + # Replaces the module if it is already loaded + semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || : + # no need to restart the daemon +fi + + + %files %defattr(-, root, root, -) %doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README @@ -177,7 +231,17 @@ %dir /var/ftp/ +%files selinux +%defattr(-, root, root, -) +%doc README.SELinux +%{_datadir}/selinux/packages/%{name}/pureftpd.pp + + %changelog +* Sun May 14 2006 Aurelien Bompard 1.0.21-4 +- add SELinux support +- prevent the init script from displaying the config on startup + * Sun Apr 09 2006 Aurelien Bompard 1.0.21-3 - fix mysql socket location (bug 188426) From fedora-extras-commits at redhat.com Sun May 14 17:38:55 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 14 May 2006 10:38:55 -0700 Subject: rpms/pure-ftpd/FC-5 pure-ftpd.README.SELinux, NONE, 1.1 pure-ftpd.pureftpd.te, NONE, 1.1 pure-ftpd.init, 1.3, 1.4 pure-ftpd.spec, 1.8, 1.9 Message-ID: <200605141738.k4EHcvNb006348@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/pure-ftpd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6327/FC-5 Modified Files: pure-ftpd.init pure-ftpd.spec Added Files: pure-ftpd.README.SELinux pure-ftpd.pureftpd.te Log Message: - add SELinux support - prevent the init script from displaying the config on startup --- NEW FILE pure-ftpd.README.SELinux --- ============================= SELinux support for Pure-FTPd ============================= With this package, Pure-FTPd is now protected in the same way VSFTPd and ProFTPd are in Fedora. Read Access ----------- To allow files to be accessed by Pure-FTPd, you need either : - to place them in /var/ftp - to label them with the public_content_t. To do that, you can use:: chcon -t public_content_t file_to_publish Write Access ------------ If you wish to grant write access, you have to use the public_content_rw_t type, for example with this command:: chcon -t public_content_rw_t file_to_publish and you have to turn on the allow_ftpd_anon_write boolean using system-config-securitylevel, or using the following command:: setsebool -P allow_ftpd_anon_write 1 Access to home directories -------------------------- If you want to publish files in a user's home directory, you have to turn on the ftp_home_dir boolean, using system-config-securitylevel, or using the following command:: setsebool -P ftp_home_dir 1 --- NEW FILE pure-ftpd.pureftpd.te --- policy_module(pureftpd, 1.0) require { type ftpd_t; }; # Read /var/run/utmp init_read_utmp(ftpd_t) init_dontaudit_write_utmp(ftpd_t) ### Allow connect to mysql # Network connect corenet_tcp_connect_mysqld_port(ftpd_t) # Socket file connect mysql_stream_connect(ftpd_t); mysql_rw_db_sockets(ftpd_t) ### Allow connect to postgresql # Network connect corenet_tcp_connect_postgresql_port(ftpd_t) # Socket file connect postgresql_stream_connect(ftpd_t) # Allow connect to ldap sysnet_use_ldap(ftpd_t) Index: pure-ftpd.init =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pure-ftpd.init 13 Nov 2005 17:41:27 -0000 1.3 +++ pure-ftpd.init 14 May 2006 17:38:54 -0000 1.4 @@ -30,7 +30,7 @@ start() { echo -n $"Starting $prog: " - daemon $pure_launch_script $pure_config --daemonize + daemon "$pure_launch_script $pure_config --daemonize > /dev/null" RETVAL=$? [ $RETVAL = 0 ] && touch /var/lock/subsys/pure-ftpd echo Index: pure-ftpd.spec =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pure-ftpd.spec 9 Apr 2006 15:39:17 -0000 1.8 +++ pure-ftpd.spec 14 May 2006 17:38:54 -0000 1.9 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -12,6 +12,8 @@ Source3: pure-ftpd.xinetd Source4: pure-ftpd.pure-ftpwho.pam Source5: pure-ftpd.pure-ftpwho.consoleapp +Source6: pure-ftpd.README.SELinux +Source7: pure-ftpd.pureftpd.te Patch0: pure-ftpd-1.0.21-config.patch Patch1: pure-ftpd-1.0.20-libdir.patch Provides: ftpserver @@ -21,6 +23,7 @@ %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} +BuildRequires: selinux-policy Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -45,10 +48,28 @@ --without tls disable SSL/TLS +%package selinux +Summary: SELinux support for Pure-FTPD +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(post): policycoreutils, initscripts, %{name} +Requires(preun): policycoreutils, initscripts, %{name} +Requires(postun): policycoreutils + +%description selinux +This package adds SELinux enforcement to Pure-FTPD. Install it if you want +Pure-FTPd to be protected in the same way other FTP servers are in Fedora +(e.g. VSFTPd and ProFTPd) + + + %prep %setup -q %patch0 -p0 -b .config %patch1 -p0 -b .libdir +cp -p %{SOURCE6} README.SELinux +mkdir selinux +cp -p %{SOURCE7} selinux/pureftpd.te %build @@ -83,6 +104,7 @@ make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -135,13 +157,22 @@ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho +# SELinux support +cd selinux +echo "%{_sbindir}/pure-ftpd system_u:object_r:ftpd_exec_t:s0" > pureftpd.fc +echo '%{_localstatedir}/log/pureftpd.log system_u:object_r:xferlog_t:s0' >> pureftpd.fc +touch pureftpd.if +make -f %{_datadir}/selinux/devel/Makefile +install -p -m 644 -D pureftpd.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/pureftpd.pp + + %clean rm -rf $RPM_BUILD_ROOT %post -if [ "$1" -le "1" ]; then +if [ "$1" -le "1" ]; then # fist install /sbin/chkconfig --add pure-ftpd fi @@ -151,12 +182,35 @@ /sbin/chkconfig --del pure-ftpd fi -%postun +%postun if [ "$1" -ge "1" ]; then /sbin/service pure-ftpd condrestart > /dev/null 2>&1 fi +%post selinux +if [ "$1" -le "1" ]; then # Fist install + semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || : + fixfiles -R pure-ftpd restore + /sbin/service pure-ftpd condrestart > /dev/null 2>&1 +fi + +%preun selinux +if [ "$1" -lt "1" ]; then # Final removal + semodule -r pureftpd 2>/dev/null || : + fixfiles -R pure-ftpd restore + /sbin/service pure-ftpd condrestart > /dev/null 2>&1 +fi + +%postun selinux +if [ "$1" -ge "1" ]; then # Upgrade + # Replaces the module if it is already loaded + semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || : + # no need to restart the daemon +fi + + + %files %defattr(-, root, root, -) %doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README @@ -177,7 +231,17 @@ %dir /var/ftp/ +%files selinux +%defattr(-, root, root, -) +%doc README.SELinux +%{_datadir}/selinux/packages/%{name}/pureftpd.pp + + %changelog +* Sun May 14 2006 Aurelien Bompard 1.0.21-4 +- add SELinux support +- prevent the init script from displaying the config on startup + * Sun Apr 09 2006 Aurelien Bompard 1.0.21-3 - fix mysql socket location (bug 188426) From fedora-extras-commits at redhat.com Sun May 14 18:12:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 14 May 2006 11:12:47 -0700 Subject: rpms/pure-ftpd/FC-5 pure-ftpd.spec,1.9,1.10 Message-ID: <200605141812.k4EICnAt008788@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/pure-ftpd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8757/FC-5 Modified Files: pure-ftpd.spec Log Message: add missing BuildRequires Index: pure-ftpd.spec =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pure-ftpd.spec 14 May 2006 17:38:54 -0000 1.9 +++ pure-ftpd.spec 14 May 2006 18:12:47 -0000 1.10 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -23,7 +23,7 @@ %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} -BuildRequires: selinux-policy +BuildRequires: selinux-policy, selinux-policy-targeted, checkpolicy Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -238,6 +238,9 @@ %changelog +* Sun May 14 2006 Aurelien Bompard 1.0.21-5 +- add missing BuildRequires + * Sun May 14 2006 Aurelien Bompard 1.0.21-4 - add SELinux support - prevent the init script from displaying the config on startup From fedora-extras-commits at redhat.com Sun May 14 18:12:48 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 14 May 2006 11:12:48 -0700 Subject: rpms/pure-ftpd/devel pure-ftpd.spec,1.9,1.10 Message-ID: <200605141812.k4EICohN008792@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/pure-ftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8757/devel Modified Files: pure-ftpd.spec Log Message: add missing BuildRequires Index: pure-ftpd.spec =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pure-ftpd.spec 14 May 2006 17:35:26 -0000 1.9 +++ pure-ftpd.spec 14 May 2006 18:12:48 -0000 1.10 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -23,7 +23,7 @@ %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} -BuildRequires: selinux-policy +BuildRequires: selinux-policy, selinux-policy-targeted, checkpolicy Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -238,6 +238,9 @@ %changelog +* Sun May 14 2006 Aurelien Bompard 1.0.21-5 +- add missing BuildRequires + * Sun May 14 2006 Aurelien Bompard 1.0.21-4 - add SELinux support - prevent the init script from displaying the config on startup From fedora-extras-commits at redhat.com Sun May 14 21:08:11 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:11 -0700 Subject: rpms/python-mechanize - New directory Message-ID: <200605142108.k4EL8D0v016330@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304a/python-mechanize Log Message: Directory /cvs/extras/rpms/python-mechanize added to the repository From fedora-extras-commits at redhat.com Sun May 14 21:08:20 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:20 -0700 Subject: rpms/python-mechanize/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605142108.k4EL8M2m016385@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16349/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-mechanize --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun May 14 21:08:11 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:11 -0700 Subject: rpms/python-mechanize/devel - New directory Message-ID: <200605142108.k4EL8DLL016333@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304a/python-mechanize/devel Log Message: Directory /cvs/extras/rpms/python-mechanize/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 21:08:19 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:19 -0700 Subject: rpms/python-mechanize Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605142108.k4EL8M8r016382@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16349 Added Files: Makefile import.log Log Message: Setup of module python-mechanize --- NEW FILE Makefile --- # Top level Makefile for module python-mechanize all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun May 14 21:08:37 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:37 -0700 Subject: rpms/python-mechanize import.log,1.1,1.2 Message-ID: <200605142108.k4EL8dCJ016448@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16415 Modified Files: import.log Log Message: auto-import python-mechanize-0.1.1a-2 on branch devel from python-mechanize-0.1.1a-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-mechanize/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 21:08:19 -0000 1.1 +++ import.log 14 May 2006 21:08:37 -0000 1.2 @@ -0,0 +1 @@ +python-mechanize-0_1_1a-2:HEAD:python-mechanize-0.1.1a-2.src.rpm:1147641113 From fedora-extras-commits at redhat.com Sun May 14 21:08:38 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:38 -0700 Subject: rpms/python-mechanize/devel python-mechanize.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605142108.k4EL8eW6016453@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16415/devel Modified Files: .cvsignore sources Added Files: python-mechanize.spec Log Message: auto-import python-mechanize-0.1.1a-2 on branch devel from python-mechanize-0.1.1a-2.src.rpm --- NEW FILE python-mechanize.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-mechanize Version: 0.1.1a Release: 2%{?dist} Summary: Stateful programmatic web browsing Group: System Environment/Libraries License: BSD URL: http://wwwsearch.sourceforge.net/mechanize Source0: http://wwwsearch.sourceforge.net/mechanize/src/mechanize-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools Requires: python-clientform Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description Stateful programmatic web browsing, after Andy Lester's Perl module WWW::Mechanize. The library is layered: mechanize.Browser (stateful web browser), mechanize.UserAgent (configurable URL opener), plus urllib2 handlers. Features include: ftp:, http: and file: URL schemes, browser history, high-level hyperlink and HTML form support, HTTP cookies, HTTP-EQUIV and Refresh, Referer [sic] header, robots.txt, redirections, proxies, and Basic and Digest HTTP authentication. mechanize's response objects are (lazily-) .seek()able and still work after .close(). Much of the code originally derived from Perl code by Gisle Aas (libwww-perl), Johnny Lee (MSIE Cookie support) and last but not least Andy Lester (WWW::Mechanize). urllib2 was written by Jeremy Hylton. %prep %setup -q -n mechanize-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --single-version-externally-managed \ -O1 --root=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING.txt README.txt README.html GeneralFAQ.html doc.html examples %{python_sitelib}/* %changelog * Sun May 14 2006 Luke Macken - 0.1.1a-2 - Add python-abi Requires - Remove noarch * Thu May 11 2006 Luke Macken - 0.1.1a-1 - Packaged for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-mechanize/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 21:08:20 -0000 1.1 +++ .cvsignore 14 May 2006 21:08:38 -0000 1.2 @@ -0,0 +1 @@ +mechanize-0.1.1a.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-mechanize/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 21:08:20 -0000 1.1 +++ sources 14 May 2006 21:08:38 -0000 1.2 @@ -0,0 +1 @@ +23259f64e065a5c49b8fea233fe31f0c mechanize-0.1.1a.tar.gz From fedora-extras-commits at redhat.com Sun May 14 21:11:00 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:11:00 -0700 Subject: owners owners.list,1.992,1.993 Message-ID: <200605142111.k4ELB2iT016550@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16533 Modified Files: owners.list Log Message: Add python-mechanize Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.992 retrieving revision 1.993 diff -u -r1.992 -r1.993 --- owners.list 14 May 2006 16:16:21 -0000 1.992 +++ owners.list 14 May 2006 21:11:00 -0000 1.993 @@ -1341,6 +1341,7 @@ Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-lxml|ElementTree-like Python bindings for libxml2 and libxslt|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org| +Fedora Extras|python-mechanize|Stateful programmatic web browsing|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-myghty|A Python-based templating system derived from HTML::Mason|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-nltk|Python-based Natural Language Toolkit|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|python-nose|A discovery-based unittest extension for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 14 21:18:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 14 May 2006 14:18:44 -0700 Subject: rpms/childsplay_plugins/devel childsplay_plugins-0.80.8-assetml.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 childsplay_plugins.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605142118.k4ELIkqU016655@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16631 Modified Files: .cvsignore childsplay_plugins.spec sources Added Files: childsplay_plugins-0.80.8-assetml.patch Log Message: * Sun May 14 2006 Hans de Goede 0.80.8-1 - New upstream release 0.80.8 - Fix a SoundMemory crash (Patch1, bz 191643), thanks Chien-Chung Yeh. childsplay_plugins-0.80.8-assetml.patch: --- NEW FILE childsplay_plugins-0.80.8-assetml.patch --- --- childsplay_plugins-0.80.8/lib/soundmemory.py.00 2006-04-09 17:12:39.000000000 +0800 +++ childsplay_plugins-0.80.8/lib/soundmemory.py 2006-05-14 20:25:09.000000000 +0800 @@ -136,9 +136,9 @@ class Game: raise MyError,text # create two assetmlSDL instances one for parsing memory sounds and one for CP sounds self.Assets_snd = pyassetmlSDL.AssetmlSDL() - self.Assets_snd.set_mldir('childsplay/sounds-misc/sounds-misc.assetml') + self.Assets_snd.set_mldir('sounds-misc.assetml') self.Assets_cpsnd = pyassetmlSDL.AssetmlSDL() - self.Assets_cpsnd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') + self.Assets_cpsnd.set_mldir('childsplay-sounds.assetml') # number of items y, number of items y, x offset, y offset self.gamelevels = [(2,3,200,100),(2,4,180,100),(3,4,180,60),(4,6,50,20)] Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 May 2006 18:18:46 -0000 1.2 +++ .cvsignore 14 May 2006 21:18:44 -0000 1.3 @@ -1 +1 @@ -childsplay_plugins-0.80.7.tgz +childsplay_plugins-0.80.8.tgz Index: childsplay_plugins.spec =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay_plugins.spec 11 May 2006 18:18:46 -0000 1.1 +++ childsplay_plugins.spec 14 May 2006 21:18:44 -0000 1.2 @@ -1,12 +1,13 @@ Name: childsplay_plugins -Version: 0.80.7 -Release: 3%{?dist} +Version: 0.80.8 +Release: 1%{?dist} Summary: Plugins for childsplay (educational games for young children) Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ Source: http://download.sourceforge.net/childsplay/%{name}-%{version}.tgz Patch0: childsplay_plugins-0.80.7-alphabet-sounds.patch +Patch1: childsplay_plugins-0.80.8-assetml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: childsplay >= 0.81.4 @@ -20,6 +21,7 @@ %setup -q # no backups otherwise the backups endup in the rpm. %patch0 -p1 +%patch1 -p1 # the translation is merged into the assetml file, so don't ship it seperatly rm -r assetml/childsplay/sounds-misc/po @@ -60,6 +62,10 @@ %{_datadir}/assetml/* %changelog +* Sun May 14 2006 Hans de Goede 0.80.8-1 +- New upstream release 0.80.8 +- Fix a SoundMemory crash (Patch1, bz 191643), thanks Chien-Chung Yeh. + * Thu May 11 2006 Hans de Goede 0.80.7-3 - Own /usr/share/childsplay and subdirs to guarantee correct uninstall (bz 190878). Index: sources =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 May 2006 18:18:46 -0000 1.2 +++ sources 14 May 2006 21:18:44 -0000 1.3 @@ -1 +1 @@ -d3ea05d2a1fb373d9c4836845b199a76 childsplay_plugins-0.80.7.tgz +0758183302dfe1fe2bb5103f9442bac9 childsplay_plugins-0.80.8.tgz From fedora-extras-commits at redhat.com Sun May 14 21:19:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 14 May 2006 14:19:43 -0700 Subject: rpms/childsplay_plugins/FC-5 childsplay_plugins-0.80.8-assetml.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 childsplay_plugins.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605142119.k4ELJji6016763@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736 Modified Files: .cvsignore childsplay_plugins.spec sources Added Files: childsplay_plugins-0.80.8-assetml.patch Log Message: * Sun May 14 2006 Hans de Goede 0.80.8-1 - New upstream release 0.80.8 - Fix a SoundMemory crash (Patch1, bz 191643), thanks Chien-Chung Yeh. childsplay_plugins-0.80.8-assetml.patch: --- NEW FILE childsplay_plugins-0.80.8-assetml.patch --- --- childsplay_plugins-0.80.8/lib/soundmemory.py.00 2006-04-09 17:12:39.000000000 +0800 +++ childsplay_plugins-0.80.8/lib/soundmemory.py 2006-05-14 20:25:09.000000000 +0800 @@ -136,9 +136,9 @@ class Game: raise MyError,text # create two assetmlSDL instances one for parsing memory sounds and one for CP sounds self.Assets_snd = pyassetmlSDL.AssetmlSDL() - self.Assets_snd.set_mldir('childsplay/sounds-misc/sounds-misc.assetml') + self.Assets_snd.set_mldir('sounds-misc.assetml') self.Assets_cpsnd = pyassetmlSDL.AssetmlSDL() - self.Assets_cpsnd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') + self.Assets_cpsnd.set_mldir('childsplay-sounds.assetml') # number of items y, number of items y, x offset, y offset self.gamelevels = [(2,3,200,100),(2,4,180,100),(3,4,180,60),(4,6,50,20)] Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 May 2006 18:18:46 -0000 1.2 +++ .cvsignore 14 May 2006 21:19:42 -0000 1.3 @@ -1 +1 @@ -childsplay_plugins-0.80.7.tgz +childsplay_plugins-0.80.8.tgz Index: childsplay_plugins.spec =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/childsplay_plugins.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay_plugins.spec 11 May 2006 18:18:46 -0000 1.1 +++ childsplay_plugins.spec 14 May 2006 21:19:42 -0000 1.2 @@ -1,12 +1,13 @@ Name: childsplay_plugins -Version: 0.80.7 -Release: 3%{?dist} +Version: 0.80.8 +Release: 1%{?dist} Summary: Plugins for childsplay (educational games for young children) Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ Source: http://download.sourceforge.net/childsplay/%{name}-%{version}.tgz Patch0: childsplay_plugins-0.80.7-alphabet-sounds.patch +Patch1: childsplay_plugins-0.80.8-assetml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: childsplay >= 0.81.4 @@ -20,6 +21,7 @@ %setup -q # no backups otherwise the backups endup in the rpm. %patch0 -p1 +%patch1 -p1 # the translation is merged into the assetml file, so don't ship it seperatly rm -r assetml/childsplay/sounds-misc/po @@ -60,6 +62,10 @@ %{_datadir}/assetml/* %changelog +* Sun May 14 2006 Hans de Goede 0.80.8-1 +- New upstream release 0.80.8 +- Fix a SoundMemory crash (Patch1, bz 191643), thanks Chien-Chung Yeh. + * Thu May 11 2006 Hans de Goede 0.80.7-3 - Own /usr/share/childsplay and subdirs to guarantee correct uninstall (bz 190878). Index: sources =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 May 2006 18:18:46 -0000 1.2 +++ sources 14 May 2006 21:19:42 -0000 1.3 @@ -1 +1 @@ -d3ea05d2a1fb373d9c4836845b199a76 childsplay_plugins-0.80.7.tgz +0758183302dfe1fe2bb5103f9442bac9 childsplay_plugins-0.80.8.tgz From fedora-extras-commits at redhat.com Sun May 14 21:20:05 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:20:05 -0700 Subject: rpms/liblo - New directory Message-ID: <200605142120.k4ELK7tF016832@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16811/liblo Log Message: Directory /cvs/extras/rpms/liblo added to the repository From fedora-extras-commits at redhat.com Sun May 14 21:20:06 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:20:06 -0700 Subject: rpms/liblo/devel - New directory Message-ID: <200605142120.k4ELK8j2016835@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16811/liblo/devel Log Message: Directory /cvs/extras/rpms/liblo/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 21:20:29 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:20:29 -0700 Subject: rpms/liblo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605142120.k4ELKV7A016891@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16857 Added Files: Makefile import.log Log Message: Setup of module liblo --- NEW FILE Makefile --- # Top level Makefile for module liblo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 14 21:20:29 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:20:29 -0700 Subject: rpms/liblo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605142120.k4ELKV9F016894@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16857/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module liblo --- NEW 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 May 14 21:21:19 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:21:19 -0700 Subject: rpms/liblo import.log,1.1,1.2 Message-ID: <200605142121.k4ELLLJG016955@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16922 Modified Files: import.log Log Message: auto-import liblo-0.23-4 on branch devel from liblo-0.23-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liblo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 21:20:28 -0000 1.1 +++ import.log 14 May 2006 21:21:19 -0000 1.2 @@ -0,0 +1 @@ +liblo-0_23-4:HEAD:liblo-0.23-4.src.rpm:1147641688 From fedora-extras-commits at redhat.com Sun May 14 21:21:19 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:21:19 -0700 Subject: rpms/liblo/devel liblo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605142121.k4ELLLxp016960@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16922/devel Modified Files: .cvsignore sources Added Files: liblo.spec Log Message: auto-import liblo-0.23-4 on branch devel from liblo-0.23-4.src.rpm --- NEW FILE liblo.spec --- Summary: Open Sound Control library Name: liblo Version: 0.23 Release: 4%{?dist} License: GPL Group: System Environment/Libraries URL: http://liblo.sourceforge.net Source0: http://www.ecs.soton.ac.uk/~njh/liblo/liblo-0.23.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen %description liblo is an implementation of the Open Sound Control protocol for POSIX systems developed by Steve Harris. %package devel Summary: Libraries, includes, etc to develop liblo applications Group: Development/Libraries Requires: liblo = %{version}-%{release} %description devel Libraries, include files, etc you can use to develop liblo based Open Sound Control applications. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install # install man pages by hand mkdir -p %{buildroot}%{_mandir}/man3/ install -m 0664 doc/man/man3/*.3 %{buildroot}%{_mandir}/man3/ %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL README %doc doc/html doc/latex %{_libdir}/liblo.so.* %files devel %defattr(-,root,root) %exclude %{_libdir}/liblo.la %{_libdir}/liblo.so %{_includedir}/lo %{_libdir}/pkgconfig/liblo.pc %{_mandir}/man3/* %changelog * Sat Apr 29 2006 Anthony Green 0.23-4 - Stop using command macros like __rm, __make, __mkdir and __install. * Tue Apr 25 2006 Anthony Green 0.23-3 - Don't install empty NEWS file. * Sat Apr 22 2006 Anthony Green 0.23-2 - Minor spec file improvements. * Tue Apr 18 2006 Anthony Green 0.23-1 - Update to 0.23. Build for Fedora Extras. * Wed Mar 2 2005 Fernando Lopez-Lezcano 0.22-1 - updated to 0.22 * Wed Mar 2 2005 Fernando Lopez-Lezcano 0.18-1 - updated to 0.18 * Wed Feb 23 2005 Fernando Lopez-Lezcano 0.17-1 - updated to 0.17 * Mon Jan 24 2005 Fernando Lopez-Lezcano 0.16-1 - updated to 0.16 * Tue Dec 21 2004 Fernando Lopez-Lezcano - spec file cleanup * Wed Nov 24 2004 Fernando Lopez-Lezcano 0.15-1 - updated to 0.15, exclude .la file, .a file no longer created by default build * Thu Aug 19 2004 Fernando Lopez-Lezcano 0.9-1 - updated to 0.9 * Mon Aug 9 2004 Fernando Lopez-Lezcano 0.8-1 - updated to 0.8 * Thu Apr 15 2004 Fernando Lopez-Lezcano 0.5-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liblo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 21:20:29 -0000 1.1 +++ .cvsignore 14 May 2006 21:21:19 -0000 1.2 @@ -0,0 +1 @@ +liblo-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/liblo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 21:20:29 -0000 1.1 +++ sources 14 May 2006 21:21:19 -0000 1.2 @@ -0,0 +1 @@ +e14c9f4fae7ed8d9622d126f6fb9c1d7 liblo-0.23.tar.gz From fedora-extras-commits at redhat.com Sun May 14 21:27:29 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:27:29 -0700 Subject: owners owners.list,1.993,1.994 Message-ID: <200605142127.k4ELRV5A017068@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17051 Modified Files: owners.list Log Message: Add liblo. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.993 retrieving revision 1.994 diff -u -r1.993 -r1.994 --- owners.list 14 May 2006 21:11:00 -0000 1.993 +++ owners.list 14 May 2006 21:27:29 -0000 1.994 @@ -642,6 +642,7 @@ Fedora Extras|libkexif|Allow Kipi plugins to extract EXIF information|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libkipi|Common plugin infrastructure for KDE image applications|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|liblo|Open Sound Control library|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|liblrdf|Library for manipulating RDF files describing LADSPA plugins|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 00:58:06 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Sun, 14 May 2006 17:58:06 -0700 Subject: rpms/shorewall/FC-5 .cvsignore, 1.13, 1.14 shorewall.spec, 1.19, 1.20 sources, 1.13, 1.14 Message-ID: <200605150058.k4F0w8ku024627@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24606 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 31 Mar 2006 15:28:48 -0000 1.13 +++ .cvsignore 15 May 2006 00:58:05 -0000 1.14 @@ -1 +1 @@ -shorewall-3.0.6.tar.bz2 +shorewall-3.0.7.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/shorewall.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- shorewall.spec 31 Mar 2006 15:28:48 -0000 1.19 +++ shorewall.spec 15 May 2006 00:58:05 -0000 1.20 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -7,7 +7,7 @@ Group: Applications/System License: GPL URL: http://www.shorewall.net/ -Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2 +Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-3.0.7/shorewall-3.0.7.tar.bz2 Patch0: shorewall-3.0.3-init.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -80,6 +80,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Sun May 14 2006 Robert Marcano - 3.0.7-1 +- Update to upstream 3.0.7 + * Fri Mar 31 2006 Robert Marcano - 3.0.6-1 - Update to upstream 3.0.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 31 Mar 2006 15:28:48 -0000 1.13 +++ sources 15 May 2006 00:58:05 -0000 1.14 @@ -1 +1 @@ -6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 +e2fccdbea4bb33507d0d3c236b6eaaeb shorewall-3.0.7.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 01:03:01 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Sun, 14 May 2006 18:03:01 -0700 Subject: rpms/shorewall/devel .cvsignore, 1.14, 1.15 shorewall.spec, 1.20, 1.21 sources, 1.14, 1.15 Message-ID: <200605150103.k4F134m7026916@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26892 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.0-Beta7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 14 Apr 2006 04:26:17 -0000 1.14 +++ .cvsignore 15 May 2006 01:03:01 -0000 1.15 @@ -1 +1 @@ -shorewall-3.2.0-Beta4.tar.bz2 +shorewall-3.2.0-Beta7.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- shorewall.spec 14 Apr 2006 04:26:17 -0000 1.20 +++ shorewall.spec 15 May 2006 01:03:01 -0000 1.21 @@ -1,4 +1,4 @@ -%define beta_release Beta4 +%define beta_release Beta7 Name: shorewall Version: 3.2.0 @@ -9,8 +9,8 @@ Group: Applications/System License: GPL URL: http://www.shorewall.net/ -#Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2 -Source: http://www.shorewall.net/pub/shorewall/development/3.2/shorewall-%{version}-%{beta_release}/shorewall-%{version}-%{beta_release}.tar.bz2 +#Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-3.2.0/shorewall-3.2.0.tar.bz2 +Source: http://www.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-Beta7/shorewall-3.2.0-Beta7.tar.bz2 Patch0: shorewall-3.0.3-init.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -86,6 +86,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Sun May 14 2006 Robert Marcano - 3.2.0-0.1.Beta7 +- Update to upstream 3.2.0-Beta7 + * Fri Apr 14 2006 Robert Marcano - 3.2.0-0.1.Beta4 - Update to upstream 3.2.0-Beta4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 14 Apr 2006 04:26:17 -0000 1.14 +++ sources 15 May 2006 01:03:01 -0000 1.15 @@ -1 +1 @@ -37984d2c8e6f4ee220fca99ab1c451e4 shorewall-3.2.0-Beta4.tar.bz2 +7841e555192ff32562d6d97b488eec53 shorewall-3.2.0-Beta7.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 01:11:06 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Sun, 14 May 2006 18:11:06 -0700 Subject: rpms/shorewall/FC-4 .cvsignore, 1.7, 1.8 shorewall.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200605150111.k4F1B8BA027049@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27027 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 31 Mar 2006 15:28:48 -0000 1.7 +++ .cvsignore 15 May 2006 01:11:06 -0000 1.8 @@ -1 +1 @@ -shorewall-3.0.6.tar.bz2 +shorewall-3.0.7.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- shorewall.spec 31 Mar 2006 15:28:48 -0000 1.14 +++ shorewall.spec 15 May 2006 01:11:06 -0000 1.15 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -7,7 +7,7 @@ Group: Applications/System License: GPL URL: http://www.shorewall.net/ -Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2 +Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-3.0.7/shorewall-3.0.7.tar.bz2 Patch0: shorewall-3.0.3-init.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -80,6 +80,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Sun May 14 2006 Robert Marcano - 3.0.7-1 +- Update to upstream 3.0.7 + * Fri Mar 31 2006 Robert Marcano - 3.0.6-1 - Update to upstream 3.0.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 31 Mar 2006 15:28:48 -0000 1.7 +++ sources 15 May 2006 01:11:06 -0000 1.8 @@ -1 +1 @@ -6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 +e2fccdbea4bb33507d0d3c236b6eaaeb shorewall-3.0.7.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 01:26:11 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 18:26:11 -0700 Subject: rpms/darcs/devel .cvsignore, 1.5, 1.6 darcs.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605150126.k4F1QDNY027171@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27150 Modified Files: .cvsignore darcs.spec sources Log Message: - update to 1.0.7 - fix typo of propagate in description (#189651) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Mar 2006 09:25:22 -0000 1.5 +++ .cvsignore 15 May 2006 01:26:11 -0000 1.6 @@ -1 +1 @@ -darcs-1.0.6.tar.gz +darcs-1.0.7.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- darcs.spec 2 Mar 2006 09:25:22 -0000 1.8 +++ darcs.spec 15 May 2006 01:26:11 -0000 1.9 @@ -1,5 +1,5 @@ Name: darcs -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} Summary: David's advanced revision control system @@ -18,7 +18,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -35,7 +35,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -84,6 +84,10 @@ %changelog +* Sun May 14 2006 Jens Petersen - 1.0.7-1 +- update to 1.0.7 +- fix typo of propagate in description (#189651) + * Thu Mar 2 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 - darcs-createrepo is gone Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2006 09:25:22 -0000 1.5 +++ sources 15 May 2006 01:26:11 -0000 1.6 @@ -1 +1 @@ -8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz +5fe4e4e7b049c095995b9a57ea6aeece darcs-1.0.7.tar.gz From fedora-extras-commits at redhat.com Mon May 15 03:17:58 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:17:58 -0700 Subject: rpms/gtk2hs - New directory Message-ID: <200605150318.k4F3I0AS032192@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32166/gtk2hs Log Message: Directory /cvs/extras/rpms/gtk2hs added to the repository From fedora-extras-commits at redhat.com Mon May 15 03:17:58 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:17:58 -0700 Subject: rpms/gtk2hs/devel - New directory Message-ID: <200605150318.k4F3I03r032195@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32166/gtk2hs/devel Log Message: Directory /cvs/extras/rpms/gtk2hs/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 03:18:12 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:18:12 -0700 Subject: rpms/gtk2hs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605150318.k4F3IFXQ032244@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32211 Added Files: Makefile import.log Log Message: Setup of module gtk2hs --- NEW FILE Makefile --- # Top level Makefile for module gtk2hs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 03:18:13 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:18:13 -0700 Subject: rpms/gtk2hs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605150318.k4F3IFTb032247@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32211/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtk2hs --- NEW 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 May 15 03:18:55 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:18:55 -0700 Subject: rpms/gtk2hs/devel gtk2hs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605150319.k4F3JRXO032315@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32275/devel Modified Files: .cvsignore sources Added Files: gtk2hs.spec Log Message: auto-import gtk2hs-0.9.10-1 on branch devel from gtk2hs-0.9.10-1.src.rpm --- NEW FILE gtk2hs.spec --- %define ghc_version 6.4.2 %define ghcver ghc642 %define mozver 37:1.7.13 %define build_mozembed 1 %define build_cairo 1 Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs Version: 0.9.10 Release: 1%{?dist} License: LGPL Group: Development/Libraries Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz URL: http://gtk2hs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc = %{ghc_version} BuildRequires: haddock BuildRequires: gtk2-devel BuildRequires: gtksourceview-devel BuildRequires: libglade2-devel BuildRequires: GConf2-devel %if %{build_mozembed} BuildRequires: mozilla-devel = %{mozver} %endif %if %{build_cairo} BuildRequires: cairo-devel %endif %description A Gtk+ binding for the functional language Haskell featuring automatic memory management, unicode support, and wide coverage of Gtk+ 2 widgets. %package -n ghc-%{name} Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Group: Development/Libraries Requires: ghc = %{ghc_version} Requires: %{ghcver}-%{name} = %{version}-%{release} %description -n ghc-%{name} A Gtk+ binding for the functional language Haskell featuring automatic memory management, unicode support, and wide coverage of Gtk+ 2 widgets. %package -n %{ghcver}-%{name} Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Group: Development/Libraries Requires: %{ghcver} Requires: gtk2-devel Requires: GConf2-devel Requires: libglade2-devel Requires: gtksourceview-devel PreReq: %{_bindir}/ghc-pkg-%{ghc_version} %description -n %{ghcver}-%{name} A Gtk+ binding for the functional language Haskell featuring automatic memory management, unicode support, and wide coverage of Gtk+ 2 widgets. This package also includes the bindings for cairo, gconf, glade, glib, and sourceview, and the mogul wrapper library. The libraries are compiled for ghc-%{ghc_version}. %package doc Summary: Haskell Gtk+ GUI library documentation Group: Development/Libraries %description doc A Gtk+ binding for the functional language Haskell featuring automatic memory management, unicode support, and wide coverage of Gtk+ 2 widgets. This package contains the gtk2hs documentation. %if %{build_mozembed} %package -n %{ghcver}-%{name}-mozembed Summary: Haskell binding for gtkembedmoz Group: Development/Libraries Requires: %{ghcver} Requires: %{ghcver}-%{name} = %{version}-%{release} Requires: mozilla-devel = %{mozver} PreReq: %{_bindir}/ghc-pkg-%{ghc_version} %description -n %{ghcver}-%{name}-mozembed A Haskell binding of GtkEmbedMoz for gtk2hs. %endif # the debuginfo subpackage is currently empty anyway, so don't generate it %define debug_package %{nil} %define __spec_install_post /usr/lib/rpm/brp-compress %define ghclibdir %{_libdir}/ghc/%{ghc_version} %define gtk2hsdir %{ghclibdir}/%{name} %prep %setup -q -n %{name}-%{version} %build %configure \ --with-hc=ghc-%{ghc_version} \ --prefix=%{_prefix} \ --libdir=%{ghclibdir} \ --enable-packager-mode \ --enable-docs \ --enable-libglade \ --enable-gconf \ --enable-sourceview \ %if %{build_mozembed} --enable-mozilla \ %endif %if %{build_cairo} --enable-cairo %endif LANG=C make all %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install # make ghost files for i in gconf glade glib gtk mogul sourceview \ %if %{build_cairo} cairo \ %endif %if %{build_mozembed} mozembed \ %endif ; do touch %{buildroot}%{gtk2hsdir}/HS${i}.o done # remove installed docdir files rm -rf %{buildroot}%{_defaultdocdir}/%{name} %clean rm -rf %{buildroot} %define ghcpkg_inst() ghc-pkg-%{ghc_version} update --auto-ghci-libs %{gtk2hsdir}/%{1}.package.conf &>/dev/null %define ghcpkg_uninst() ghc-pkg-%{ghc_version} unregister %{1} &>/dev/null || : %post -n %{ghcver}-%{name} for i in glib \ %if %{build_cairo} cairo \ %endif gtk \ mogul \ gconf \ glade \ sourceview \ ; do %{ghcpkg_inst $i} done %if %{build_mozembed} %post -n %{ghcver}-%{name}-mozembed %{ghcpkg_inst mozembed} %endif %preun -n %{ghcver}-%{name} if [ "$1" = 0 ]; then for i in \ gconf \ glade \ sourceview \ mogul \ gtk \ %if %{build_cairo} cairo \ %endif glib \ ; do %{ghcpkg_uninst $i} done fi %if %{build_mozembed} %preun -n %{ghcver}-%{name}-mozembed if [ "$1" = 0 ]; then %{ghcpkg_uninst mozembed} fi %endif %files -n ghc-%{name} %defattr(-,root,root) %files -n %{ghcver}-%{name} %defattr(-,root,root) %doc AUTHORS COPYING.LIB %dir %{_libdir}/ghc %dir %{ghclibdir} %dir %{gtk2hsdir} %{gtk2hsdir}/gtk.package.conf %{gtk2hsdir}/libHSgtk.a %ghost %{gtk2hsdir}/HSgtk.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/gtk %if %{build_cairo} %{gtk2hsdir}/cairo.package.conf %{gtk2hsdir}/libHScairo.a %ghost %{gtk2hsdir}/HScairo.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/cairo %endif %{gtk2hsdir}/gconf.package.conf %{gtk2hsdir}/libHSgconf.a %ghost %{gtk2hsdir}/HSgconf.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/gconf %{gtk2hsdir}/glade.package.conf %{gtk2hsdir}/libHSglade.a %ghost %{gtk2hsdir}/HSglade.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/glade %{gtk2hsdir}/glib.package.conf %{gtk2hsdir}/libHSglib.a %ghost %{gtk2hsdir}/HSglib.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/glib %dir %{gtk2hsdir}/include %{gtk2hsdir}/include/gtk2hs-config.h %{gtk2hsdir}/mogul.package.conf %{gtk2hsdir}/libHSmogul.a %ghost %{gtk2hsdir}/HSmogul.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/mogul %{gtk2hsdir}/sourceview.package.conf %{gtk2hsdir}/libHSsourceview.a %ghost %{gtk2hsdir}/HSsourceview.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/sourceview %files doc %defattr(-,root,root) %doc docs/reference %doc ChangeLog TODO demo %if %{build_mozembed} %files -n %{ghcver}-%{name}-mozembed %{gtk2hsdir}/mozembed.package.conf %{gtk2hsdir}/libHSmozembed.a %ghost %{gtk2hsdir}/HSmozembed.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/mozembed %endif %changelog * Mon May 15 2006 Jens Petersen - 0.9.10-1 - rework packaging to keep all the ghc packages together except mozembed - update mozilla version to 1.7.13 * Mon May 1 2006 G??rard Milmeister - spec file cleanup - ghost the .o files generated at install time - move the docs to a versioned dir and include the demos - make all subpackages own %%{_libdir}/ghc * Tue Apr 25 2006 Jens Petersen - use module names for the subpackages - subpackage mogul - own the include dir * Sat Apr 22 2006 Jens Petersen - initial packaging for Fedora Extras - define ghcpkg_inst and ghcpkg_uninst for post and preun scripts and silence ghc-pkg - own include/ * Wed Oct 26 2005 Jens Petersen - 0.9.9.7-0 - rc * Wed Sep 21 2005 Jens Petersen - 0.9.9-2 - build with ghc-6.4.1 * Sat Jul 30 2005 Jens Petersen - 0.9.8-3 - drop old conflicts * Tue Jul 5 2005 Jens Petersen - 0.9.8-2 - use %%configure to configure for arch to avoid gclosure ghci-6.4 linking problems on i386 * Wed Jun 22 2005 Jens Petersen - 0.9.8-1 - update to 0.9.8 - use new --enable-packager-mode and --enable-* configure options * Thu Jun 9 2005 Jens Petersen - 0.9.7.91 - update to rc1 - add build_mozembed macro and use it * Mon May 9 2005 Jens Petersen - 0.9.7-2 - add gtk2hs-0.9.7-ghc64.patch and build with ghc-6.4 (Duncan Coutts) - .pkg files are now .cabal files * Tue Jan 18 2005 Duncan Coutts - cleanup requirements, summaries, descriptions, and configure invocation - update preun scripts * Thu Aug 19 2004 Jens Petersen - use suffix -ghc621 instead of -ghc6.2.1 and conflict with old packages - buildrequire ghc-doc and gtk2hs-doc-ghc621 requires ghc-doc - move docs and demo files to %{_defaultdocdir}/gtk2hs * Mon Aug 16 2004 Jens Petersen - update to 0.9.6 * Thu Jul 22 2004 Jens Petersen - split sourceview and glade into separate subpackages - require -devel packages rather than lib pkg for gtk2, gtksourceview, and libglade2 * Wed Mar 24 2004 Jens Petersen - enable gtksourceview and glade configure options - use mkdir -p instead of mkdirhier - update file locations in %%post and %%preun scripts - buildrequire libglade2-devel * Tue Nov 11 2003 Jens Petersen - use %%c2hs instead of "--with c2hs" to configure c2hs program - clean demo to avoid binary files in docs dir * Mon Nov 3 2003 Jens Petersen - add sourceview package to %%post and %%preun - install gtksourceview haskell.lang language-spec * Thu Jul 31 2003 Jens Petersen - build with ghc-6.0.1 - put demo dir in docs dir rather than individual source files * Thu Jul 10 2003 Jens Petersen - build with ghc-6.0 - name ghc subpackage "ghc%%{ghc_version}" * Wed Jun 18 2003 Jens Petersen - require and buildrequire %{_bindir}/ghc-%%{ghc_version} * Wed May 21 2003 Jens Petersen - add -g option to ghc-pkg -u so that ghci object gets generated - delete them when uninstalling - build and include mogul documentation * Thu May 15 2003 Jens Petersen - use new DESTDIR make variable, so no longer need to fix config files in post - remove buildroot before install - build and include gtk docs * Fri Jan 10 2003 Jens Petersen - made into .spec.in file - let configure set the version - update description - introduce --with-c2hs rpmbuild option - use perl to remove buildroot traces from package conf files - simplify ghc-pkg update commands * Tue Dec 17 2002 Jens Petersen - latest cvs with ghc 5.04.2 * Thu Sep 26 2002 Jens Petersen - build with ghc-5.04.1 * Fri Aug 2 2002 Jens Petersen - only include demo source in doc dir * Fri Jul 26 2002 Jens Petersen - build with ghc-5.04 - cvs update * Wed Jul 10 2002 Jens Petersen - my current branch * Wed May 1 2002 Jens Petersen - patch TreeViewColumn.chs to make it usable * Tue Apr 23 2002 Jens Petersen - 0.9.0 - update gtk2 and mogul ghc-pkg entries on upgrade * Fri Apr 12 2002 Jens Petersen - adapt for gtk2hs - fix mk files for buildroot install - post and postun scriptlets for pkg config * Tue Mar 12 2002 Manuel Chakravarty - require a specific Haskell compiler (namely, the one for which the packages was compiled) * Sat Feb 17 2001 Manuel Chakravarty - derived from C->Haskell's .spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 03:18:13 -0000 1.1 +++ .cvsignore 15 May 2006 03:18:55 -0000 1.2 @@ -0,0 +1 @@ +gtk2hs-0.9.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 03:18:13 -0000 1.1 +++ sources 15 May 2006 03:18:55 -0000 1.2 @@ -0,0 +1 @@ +13d300e07153f37ba5893ac336b078bc gtk2hs-0.9.10.tar.gz From fedora-extras-commits at redhat.com Mon May 15 03:18:54 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:18:54 -0700 Subject: rpms/gtk2hs import.log,1.1,1.2 Message-ID: <200605150319.k4F3JQcC032311@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32275 Modified Files: import.log Log Message: auto-import gtk2hs-0.9.10-1 on branch devel from gtk2hs-0.9.10-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 03:18:12 -0000 1.1 +++ import.log 15 May 2006 03:18:54 -0000 1.2 @@ -0,0 +1 @@ +gtk2hs-0_9_10-1:HEAD:gtk2hs-0.9.10-1.src.rpm:1147663127 From fedora-extras-commits at redhat.com Mon May 15 05:15:52 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 22:15:52 -0700 Subject: owners owners.list,1.994,1.995 Message-ID: <200605150515.k4F5FsNc004785@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4768 Modified Files: owners.list Log Message: add gtk2hs Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.994 retrieving revision 1.995 diff -u -r1.994 -r1.995 --- owners.list 14 May 2006 21:27:29 -0000 1.994 +++ owners.list 15 May 2006 05:15:51 -0000 1.995 @@ -449,6 +449,7 @@ Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| +Fedora Extras|gtk2hs|A Haskell binding of the Gtk+ toolkit|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 06:00:31 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:00:31 -0700 Subject: rpms/hspell/FC-5 hspell.spec,1.3,1.4 Message-ID: <200605150600.k4F60X9O005001@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4984 Modified Files: hspell.spec Log Message: bump to upcoming hspell v1.0 Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/hspell.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hspell.spec 28 Feb 2006 18:30:56 -0000 1.3 +++ hspell.spec 15 May 2006 06:00:31 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell -Version: 0.9 -Release: 7%{?dist} +Version: 1.0 +Release: 1%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -18,21 +18,20 @@ morphological analizer (-l), that prints all known meanings of a Hebrew string. -Note: it is a fully working Hebrew spellchecker, not a toy release. On typical -documents it should recognize the majority of correct words. However, users -of this release must take into account that it still will not recognize *all* -the correct words; The dictionary is still admittedly not complete, and this -situation will continue to improve in the next releases. On the other hand, -barring bugs Hspell should not recognize incorrect words - extreme attention -has been given to the correctness and consistency of the dictionary. +On typical documents Hspell recognizes the majority of correct words. However, +users must take into account that it still will not recognize *all* the correct +words; The dictionary is still not complete, and this situation will continue +to improve in the next releases. On the other hand, barring bugs Hspell should +not recognize incorrect words - extreme attention has been given to the +correctness and consistency of the dictionary. %description -l he -Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ?????? -??????? ???????? ????. ?? ???? ?????, ???? ??? ????? ???? ????? - ????? ?????? -???? ???? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ???? *??* ????? -?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(. ??? ??, -Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ?? ????????? -???????? ?? ?????? ?????? ?????. +Hspell ?????? ?????????? ????????, ?????????? (??????????????) ???????? ????????-spell - ???????? ?????????? ???? ???????????? +?????????????? ???????????????? ????????. ?????????? ???????????? ???????? ??????????, ???????? ?????? ?????????? ???????? ?????????? - ???? +?????????? ???????????? ?????????? ???????????? ?????? ?????????????? ??????????????. ???????????? ???????? ????-?????? ???????????? ???????? +*????* ???????? ???????????? ?????????? ????-???? ???????? ?????????????? ???????????? ?????????? ?????? ?????????? )"???????? ??????"(. +?????? ????, Hspell ???????? (-l) ???????? ?????????????????? ???????? (????-???? ???? ??????) ?????? ?????????? ???? ???? +?????????????????? ???????????????? ???? ???????????? ???????????? ??????????. %package devel Summary: Library and include files for Hspell, the hebrew spell checker @@ -43,7 +42,7 @@ Library and include files for applications that want to use Hspell. %description -l he devel -?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell. +???????????? ???????????? ?????????? ???????? ?????????????? ???????????? ???????????? ??-Hspell. %prep %setup -q @@ -75,6 +74,9 @@ %{_mandir}/man3/hspell.3* %changelog +* Sun May 15 2006 Dan Kenigsberg 1.0-1 +- new upstream release. +- Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 - Rebuild for Fedora Extras 5 * Mon Sep 26 2005 Dan Kenigsberg 0.9-6 From fedora-extras-commits at redhat.com Mon May 15 06:03:32 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:03:32 -0700 Subject: rpms/hspell/FC-4 hspell.spec,1.2,1.3 Message-ID: <200605150603.k4F63Yw0007294@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7277/FC-4 Modified Files: hspell.spec Log Message: hspell v1.0 Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hspell.spec 27 Sep 2005 16:34:38 -0000 1.2 +++ hspell.spec 15 May 2006 06:03:31 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell -Version: 0.9 -Release: 6.fc4 +Version: 1.0 +Release: 1%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -18,21 +18,20 @@ morphological analizer (-l), that prints all known meanings of a Hebrew string. -Note: it is a fully working Hebrew spellchecker, not a toy release. On typical -documents it should recognize the majority of correct words. However, users -of this release must take into account that it still will not recognize *all* -the correct words; The dictionary is still admittedly not complete, and this -situation will continue to improve in the next releases. On the other hand, -barring bugs Hspell should not recognize incorrect words - extreme attention -has been given to the correctness and consistency of the dictionary. +On typical documents Hspell recognizes the majority of correct words. However, +users must take into account that it still will not recognize *all* the correct +words; The dictionary is still not complete, and this situation will continue +to improve in the next releases. On the other hand, barring bugs Hspell should +not recognize incorrect words - extreme attention has been given to the +correctness and consistency of the dictionary. %description -l he -Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ?????? -??????? ???????? ????. ?? ???? ?????, ???? ??? ????? ???? ????? - ????? ?????? -???? ???? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ???? *??* ????? -?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(. ??? ??, -Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ?? ????????? -???????? ?? ?????? ?????? ?????. +Hspell ?????? ?????????? ????????, ?????????? (??????????????) ???????? ????????-spell - ???????? ?????????? ???? ???????????? +?????????????? ???????????????? ????????. ?????????? ???????????? ???????? ??????????, ???????? ?????? ?????????? ???????? ?????????? - ???? +?????????? ???????????? ?????????? ???????????? ?????? ?????????????? ??????????????. ???????????? ???????? ????-?????? ???????????? ???????? +*????* ???????? ???????????? ?????????? ????-???? ???????? ?????????????? ???????????? ?????????? ?????? ?????????? )"???????? ??????"(. +?????? ????, Hspell ???????? (-l) ???????? ?????????????????? ???????? (????-???? ???? ??????) ?????? ?????????? ???? ???? +?????????????????? ???????????????? ???? ???????????? ???????????? ??????????. %package devel Summary: Library and include files for Hspell, the hebrew spell checker @@ -43,7 +42,7 @@ Library and include files for applications that want to use Hspell. %description -l he devel -?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell. +???????????? ???????????? ?????????? ???????? ?????????????? ???????????? ???????????? ??-Hspell. %prep %setup -q @@ -75,7 +74,12 @@ %{_mandir}/man3/hspell.3* %changelog -* Mon Sep 26 2005 Dan Kenigsberg 0.9-6.fc4 +* Sun May 15 2006 Dan Kenigsberg 1.0-1 +- new upstream release. +- Hebrew description converted to utf8. +* Tue Feb 28 2006 Dan Kenigsberg 0.9-7 +- Rebuild for Fedora Extras 5 +* Mon Sep 26 2005 Dan Kenigsberg 0.9-6 - Add the text of the GPL to the binary package. It seems that I'll do anything to make my sponsor Tom happy. * Thu Sep 23 2005 Dan Kenigsberg 0.9-5 From fedora-extras-commits at redhat.com Mon May 15 06:06:17 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:06:17 -0700 Subject: rpms/hspell/devel hspell.spec,1.3,1.4 Message-ID: <200605150606.k4F66JOt007358@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7339 Modified Files: hspell.spec Log Message: hspell v1.0 Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/hspell.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hspell.spec 28 Feb 2006 18:30:56 -0000 1.3 +++ hspell.spec 15 May 2006 06:06:17 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell -Version: 0.9 -Release: 7%{?dist} +Version: 1.0 +Release: 1%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -18,21 +18,20 @@ morphological analizer (-l), that prints all known meanings of a Hebrew string. -Note: it is a fully working Hebrew spellchecker, not a toy release. On typical -documents it should recognize the majority of correct words. However, users -of this release must take into account that it still will not recognize *all* -the correct words; The dictionary is still admittedly not complete, and this -situation will continue to improve in the next releases. On the other hand, -barring bugs Hspell should not recognize incorrect words - extreme attention -has been given to the correctness and consistency of the dictionary. +On typical documents Hspell recognizes the majority of correct words. However, +users must take into account that it still will not recognize *all* the correct +words; The dictionary is still not complete, and this situation will continue +to improve in the next releases. On the other hand, barring bugs Hspell should +not recognize incorrect words - extreme attention has been given to the +correctness and consistency of the dictionary. %description -l he -Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ?????? -??????? ???????? ????. ?? ???? ?????, ???? ??? ????? ???? ????? - ????? ?????? -???? ???? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ???? *??* ????? -?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(. ??? ??, -Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ?? ????????? -???????? ?? ?????? ?????? ?????. +Hspell ?????? ?????????? ????????, ?????????? (??????????????) ???????? ????????-spell - ???????? ?????????? ???? ???????????? +?????????????? ???????????????? ????????. ?????????? ???????????? ???????? ??????????, ???????? ?????? ?????????? ???????? ?????????? - ???? +?????????? ???????????? ?????????? ???????????? ?????? ?????????????? ??????????????. ???????????? ???????? ????-?????? ???????????? ???????? +*????* ???????? ???????????? ?????????? ????-???? ???????? ?????????????? ???????????? ?????????? ?????? ?????????? )"???????? ??????"(. +?????? ????, Hspell ???????? (-l) ???????? ?????????????????? ???????? (????-???? ???? ??????) ?????? ?????????? ???? ???? +?????????????????? ???????????????? ???? ???????????? ???????????? ??????????. %package devel Summary: Library and include files for Hspell, the hebrew spell checker @@ -43,7 +42,7 @@ Library and include files for applications that want to use Hspell. %description -l he devel -?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell. +???????????? ???????????? ?????????? ???????? ?????????????? ???????????? ???????????? ??-Hspell. %prep %setup -q @@ -75,6 +74,9 @@ %{_mandir}/man3/hspell.3* %changelog +* Sun May 15 2006 Dan Kenigsberg 1.0-1 +- new upstream release. +- Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 - Rebuild for Fedora Extras 5 * Mon Sep 26 2005 Dan Kenigsberg 0.9-6 From fedora-extras-commits at redhat.com Mon May 15 06:28:20 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:28:20 -0700 Subject: rpms/hspell/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605150628.k4F6SMNG007469@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7450 Modified Files: .cvsignore sources Log Message: new tarball uploaded Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:18:54 -0000 1.2 +++ .cvsignore 15 May 2006 06:28:20 -0000 1.3 @@ -1 +1 @@ -hspell-0.9.tar.gz +hspell-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:18:54 -0000 1.2 +++ sources 15 May 2006 06:28:20 -0000 1.3 @@ -1 +1 @@ -6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz +3e12fa383c2cfd430918d115f33f9841 hspell-1.0.tar.gz From fedora-extras-commits at redhat.com Mon May 15 06:30:30 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:30:30 -0700 Subject: rpms/hspell/FC-4 hspell.spec,1.3,1.4 Message-ID: <200605150630.k4F6UWJa007548@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7521 Modified Files: hspell.spec Log Message: force another build. previously I forgot to upload the new tarball Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hspell.spec 15 May 2006 06:03:31 -0000 1.3 +++ hspell.spec 15 May 2006 06:30:30 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -74,7 +74,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Sun May 15 2006 Dan Kenigsberg 1.0-1 +* Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 From fedora-extras-commits at redhat.com Mon May 15 06:32:07 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:32:07 -0700 Subject: rpms/hspell/FC-4 hspell.spec,1.4,1.5 Message-ID: <200605150632.k4F6W9Uq007609@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7588 Modified Files: hspell.spec Log Message: I probably should have tried the cvs in a sandbox... Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hspell.spec 15 May 2006 06:30:30 -0000 1.4 +++ hspell.spec 15 May 2006 06:32:07 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -74,7 +74,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Sun May 15 2006 Dan Kenigsberg 1.0-2 +* Sun May 15 2006 Dan Kenigsberg 1.0-3 - new upstream release. - Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 From fedora-extras-commits at redhat.com Mon May 15 06:54:43 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:54:43 -0700 Subject: rpms/hspell/FC-5 .cvsignore, 1.2, 1.3 hspell.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200605150654.k4F6sj4I007726@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7705 Modified Files: .cvsignore hspell.spec sources Log Message: force rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:18:54 -0000 1.2 +++ .cvsignore 15 May 2006 06:54:42 -0000 1.3 @@ -1 +1 @@ -hspell-0.9.tar.gz +hspell-1.0.tar.gz Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/hspell.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hspell.spec 15 May 2006 06:00:31 -0000 1.4 +++ hspell.spec 15 May 2006 06:54:42 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -74,7 +74,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Sun May 15 2006 Dan Kenigsberg 1.0-1 +* Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:18:54 -0000 1.2 +++ sources 15 May 2006 06:54:42 -0000 1.3 @@ -1 +1 @@ -6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz +3e12fa383c2cfd430918d115f33f9841 hspell-1.0.tar.gz From fedora-extras-commits at redhat.com Mon May 15 07:00:50 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 15 May 2006 00:00:50 -0700 Subject: rpms/bzflag/devel bzflag.spec,1.24,1.25 Message-ID: <200605150700.k4F70qfu007853@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7813 Modified Files: bzflag.spec Log Message: delete blank line Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- bzflag.spec 12 May 2006 08:31:31 -0000 1.24 +++ bzflag.spec 15 May 2006 07:00:50 -0000 1.25 @@ -1,5 +1,4 @@ # Use --with/--without modular_X to rebuild with/without modular X deps - %if 0%{?fedora} %if 0%{?fedora} < 5 # default to non-modular X on FC < 5 From fedora-extras-commits at redhat.com Mon May 15 07:00:49 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 15 May 2006 00:00:49 -0700 Subject: rpms/hspell/devel .cvsignore, 1.2, 1.3 hspell.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200605150700.k4F70p9W007849@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7809 Modified Files: .cvsignore hspell.spec sources Log Message: rebuild hspell v1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:18:54 -0000 1.2 +++ .cvsignore 15 May 2006 07:00:49 -0000 1.3 @@ -1 +1,2 @@ hspell-0.9.tar.gz +hspell-1.0.tar.gz Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/hspell.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hspell.spec 15 May 2006 06:06:17 -0000 1.4 +++ hspell.spec 15 May 2006 07:00:49 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -74,7 +74,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Sun May 15 2006 Dan Kenigsberg 1.0-1 +* Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:18:54 -0000 1.2 +++ sources 15 May 2006 07:00:49 -0000 1.3 @@ -1 +1,2 @@ 6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz +3e12fa383c2cfd430918d115f33f9841 hspell-1.0.tar.gz From fedora-extras-commits at redhat.com Mon May 15 07:05:57 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 15 May 2006 00:05:57 -0700 Subject: rpms/aspell-he/FC-5 .cvsignore, 1.2, 1.3 aspell-he.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605150705.k4F75xN8010176@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/aspell-he/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10155 Modified Files: .cvsignore aspell-he.spec sources Log Message: for hspell v1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aspell-he/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2006 22:08:10 -0000 1.2 +++ .cvsignore 15 May 2006 07:05:57 -0000 1.3 @@ -1 +1,2 @@ aspell6-he-0.9-0.tar.bz2 +aspell6-he-1.0-0.tar.bz2 Index: aspell-he.spec =================================================================== RCS file: /cvs/extras/rpms/aspell-he/FC-5/aspell-he.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aspell-he.spec 23 Apr 2006 22:08:10 -0000 1.1 +++ aspell-he.spec 15 May 2006 07:05:57 -0000 1.2 @@ -2,8 +2,8 @@ %define langrelease 0 Summary: Hebrew dictionary for Aspell Name: aspell-%{lang} -Version: 0.9 -Release: 2%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -52,6 +52,8 @@ %{_libdir}/aspell-0.60/* %changelog +* Mon May 15 2006 Dan Kenigsberg 1.0-1 +- new Hspell version. * Sun Apr 23 2006 Dan Kenigsberg 0.9-2 - Cleaned the spec file according to Bug 189157. - Added a comment explaining why the rpmlint gives Errors for this package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/aspell-he/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2006 22:08:10 -0000 1.2 +++ sources 15 May 2006 07:05:57 -0000 1.3 @@ -1 +1,2 @@ f453989e1df364af9479e893c16ac9d8 aspell6-he-0.9-0.tar.bz2 +71791e0299787391d2ace1c850b5b434 aspell6-he-1.0-0.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 07:08:23 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 15 May 2006 00:08:23 -0700 Subject: rpms/aspell-he/devel .cvsignore, 1.2, 1.3 aspell-he.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605150708.k4F78PSM010273@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/aspell-he/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10252 Modified Files: .cvsignore aspell-he.spec sources Log Message: for hspell v1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aspell-he/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2006 22:08:10 -0000 1.2 +++ .cvsignore 15 May 2006 07:08:23 -0000 1.3 @@ -1 +1,2 @@ aspell6-he-0.9-0.tar.bz2 +aspell6-he-1.0-0.tar.bz2 Index: aspell-he.spec =================================================================== RCS file: /cvs/extras/rpms/aspell-he/devel/aspell-he.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aspell-he.spec 23 Apr 2006 22:08:10 -0000 1.1 +++ aspell-he.spec 15 May 2006 07:08:23 -0000 1.2 @@ -2,8 +2,8 @@ %define langrelease 0 Summary: Hebrew dictionary for Aspell Name: aspell-%{lang} -Version: 0.9 -Release: 2%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -52,6 +52,8 @@ %{_libdir}/aspell-0.60/* %changelog +* Mon May 15 2006 Dan Kenigsberg 1.0-1 +- new Hspell version. * Sun Apr 23 2006 Dan Kenigsberg 0.9-2 - Cleaned the spec file according to Bug 189157. - Added a comment explaining why the rpmlint gives Errors for this package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/aspell-he/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2006 22:08:10 -0000 1.2 +++ sources 15 May 2006 07:08:23 -0000 1.3 @@ -1 +1,2 @@ f453989e1df364af9479e893c16ac9d8 aspell6-he-0.9-0.tar.bz2 +71791e0299787391d2ace1c850b5b434 aspell6-he-1.0-0.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 07:22:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 00:22:54 -0700 Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 sylpheed-claws.spec, 1.41, 1.42 Message-ID: <200605150722.k4F7Mu9Y010431@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/FC-5 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 21 Apr 2006 22:38:25 -0000 1.17 +++ .cvsignore 15 May 2006 07:22:54 -0000 1.18 @@ -1 +1 @@ -sylpheed-claws-2.1.1.tar.bz2 +sylpheed-claws-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 21 Apr 2006 22:38:25 -0000 1.18 +++ sources 15 May 2006 07:22:54 -0000 1.19 @@ -1 +1 @@ -8d7b1d01c4f236a5e7d3e139bf43cd5a sylpheed-claws-2.1.1.tar.bz2 +4a047d028327c0e7b3ef0b058bd62d91 sylpheed-claws-2.2.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sylpheed-claws.spec 21 Apr 2006 22:38:25 -0000 1.41 +++ sylpheed-claws.spec 15 May 2006 07:22:54 -0000 1.42 @@ -1,11 +1,11 @@ Name: sylpheed-claws -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.2.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -155,6 +155,10 @@ %{_libdir}/sylpheed-claws/plugins/pgp*.so %changelog +* Mon May 08 2006 Andreas Bierfert +2.2.0-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 2.1.1-1 - split plugins from main package to ease requirements (#189113) From fedora-extras-commits at redhat.com Mon May 15 07:22:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 00:22:53 -0700 Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 sylpheed-claws.spec, 1.34, 1.35 Message-ID: <200605150723.k4F7MtYN010427@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-serv10371/FC-4 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 21 Apr 2006 22:38:24 -0000 1.14 +++ .cvsignore 15 May 2006 07:22:53 -0000 1.15 @@ -1 +1 @@ -sylpheed-claws-2.1.1.tar.bz2 +sylpheed-claws-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 21 Apr 2006 22:38:24 -0000 1.15 +++ sources 15 May 2006 07:22:53 -0000 1.16 @@ -1 +1 @@ -8d7b1d01c4f236a5e7d3e139bf43cd5a sylpheed-claws-2.1.1.tar.bz2 +4a047d028327c0e7b3ef0b058bd62d91 sylpheed-claws-2.2.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sylpheed-claws.spec 22 Apr 2006 00:05:09 -0000 1.34 +++ sylpheed-claws.spec 15 May 2006 07:22:53 -0000 1.35 @@ -1,13 +1,13 @@ %define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi ) Name: sylpheed-claws -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.2.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -163,6 +163,9 @@ %{_libdir}/sylpheed-claws/plugins/pgp*.so %changelog +* Mon May 15 2006 Andreas Bierfert +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert - split plugins from main package to ease requirements (#189113) - version upgrade (#183357) From fedora-extras-commits at redhat.com Mon May 15 07:22:55 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 00:22:55 -0700 Subject: rpms/sylpheed-claws/devel .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 sylpheed-claws.spec, 1.41, 1.42 Message-ID: <200605150723.k4F7MvNE010438@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/devel Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 21 Apr 2006 22:38:25 -0000 1.17 +++ .cvsignore 15 May 2006 07:22:54 -0000 1.18 @@ -1 +1 @@ -sylpheed-claws-2.1.1.tar.bz2 +sylpheed-claws-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 21 Apr 2006 22:38:25 -0000 1.18 +++ sources 15 May 2006 07:22:55 -0000 1.19 @@ -1 +1 @@ -8d7b1d01c4f236a5e7d3e139bf43cd5a sylpheed-claws-2.1.1.tar.bz2 +4a047d028327c0e7b3ef0b058bd62d91 sylpheed-claws-2.2.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sylpheed-claws.spec 21 Apr 2006 22:38:25 -0000 1.41 +++ sylpheed-claws.spec 15 May 2006 07:22:55 -0000 1.42 @@ -1,11 +1,11 @@ Name: sylpheed-claws -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.2.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -155,6 +155,10 @@ %{_libdir}/sylpheed-claws/plugins/pgp*.so %changelog +* Mon May 08 2006 Andreas Bierfert +2.2.0-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 2.1.1-1 - split plugins from main package to ease requirements (#189113) From fedora-extras-commits at redhat.com Mon May 15 07:26:08 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:26:08 -0700 Subject: rpms/adplug - New directory Message-ID: <200605150726.k4F7QAtr010522@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501/adplug Log Message: Directory /cvs/extras/rpms/adplug added to the repository From fedora-extras-commits at redhat.com Mon May 15 07:26:08 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:26:08 -0700 Subject: rpms/adplug/devel - New directory Message-ID: <200605150726.k4F7QAvW010525@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501/adplug/devel Log Message: Directory /cvs/extras/rpms/adplug/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 07:26:29 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:26:29 -0700 Subject: rpms/adplug Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605150726.k4F7QV78010576@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10548 Added Files: Makefile import.log Log Message: Setup of module adplug --- NEW FILE Makefile --- # Top level Makefile for module adplug all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 07:26:29 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:26:29 -0700 Subject: rpms/adplug/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605150726.k4F7QVpK010579@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10548/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module adplug --- NEW 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 May 15 07:29:04 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:29:04 -0700 Subject: rpms/adplug import.log,1.1,1.2 Message-ID: <200605150729.k4F7T61i010662@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10628 Modified Files: import.log Log Message: auto-import adplug-2.0-2 on branch devel from adplug-2.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/adplug/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 07:26:28 -0000 1.1 +++ import.log 15 May 2006 07:29:04 -0000 1.2 @@ -0,0 +1 @@ +adplug-2_0-2:HEAD:adplug-2.0-2.src.rpm:1147678133 From fedora-extras-commits at redhat.com Mon May 15 07:29:05 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:29:05 -0700 Subject: rpms/adplug/devel adplug-1.5.1-texinfo.patch, NONE, 1.1 adplug.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605150729.k4F7T7qm010669@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10628/devel Modified Files: .cvsignore sources Added Files: adplug-1.5.1-texinfo.patch adplug.spec Log Message: auto-import adplug-2.0-2 on branch devel from adplug-2.0-2.src.rpm adplug-1.5.1-texinfo.patch: --- NEW FILE adplug-1.5.1-texinfo.patch --- diff -ur adplug-1.5.1.orig/doc/libadplug.texi adplug-1.5.1/doc/libadplug.texi --- adplug-1.5.1.orig/doc/libadplug.texi 2006-01-01 23:49:53.000000000 +0100 +++ adplug-1.5.1/doc/libadplug.texi 2006-01-01 23:50:04.000000000 +0100 @@ -1,7 +1,6 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @setfilename libadplug.info - at include version.texi @settitle AdPlug Core Library @value{VERSION} Manual @c %**end of header --- NEW FILE adplug.spec --- # SPEC file for AdPlug, primary target is the Fedora Extras # RPM repository. Name: adplug Version: 2.0 Release: 2%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplug.db Patch0: adplug-1.5.1-texinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig BuildRequires: texinfo # This is to resolve the endless disputes of the shared data for this # package. Whenever _sharedstatedir contains something acceptable to # Fedora that can be used instead. %define shareddata %{_localstatedir}/lib %description AdPlug is a free software, cross-platform, hardware independent AdLib sound player library, mainly written in C++ and released under the LGPL. AdPlug plays sound data, originally created for the AdLib (OPL2) audio board, directly from its original format on top of an OPL2 emulator or by using the real hardware. No OPL chip is required for playback. It supports various audio formats from MS-DOS AdLib trackers. %package devel Summary: Development files for AdPlug Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: libbinio-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description devel This package contains development files for the AdPlug AdLib (OPL2) emulator. %prep %setup -q # This removes the version.texi dependency %patch0 -p1 %build %configure --disable-static --sharedstatedir=%{shareddata} --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name} install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{shareddata}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel /sbin/install-info %{_infodir}/libadplug.info.gz %{_infodir}/dir || : %preun devel if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/libadplug.info.gz %{_infodir}/dir || : fi %files %defattr(-, root, root) %{_libdir}/*.so.* %dir %{shareddata}/%{name}/ %config(noreplace) %{shareddata}/%{name}/adplug.db %{_bindir}/adplugdb %{_mandir}/man1/adplugdb.1* %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO %files devel %defattr(-, root, root) %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_infodir}/*.gz %changelog * Mon May 15 2006 Linus Walleij 2.0-2 - Tell package to avoid rpath, import to FE after review by John Mahowald. * Sat May 6 2006 Linus Walleij 2.0-1 - Upstream release the stuff they've been working on for some time now! * Thu Apr 6 2006 Linus Walleij 1.5.1-8.20060323cvs - Realize that /var/adplug/adplug.db is a real nice place to keep the database actually. And it is obviously OK to create and own directories under /var/lib as opposed to /var. * Thu Mar 31 2006 Linus Walleij 1.5.1-7.20060323cvs - Patching to move database from /var/adplug to just /var since FHS does not like creation of directories under /var. * Thu Mar 23 2006 Linus Walleij 1.5.1-6.20060323cvs - Hardcoding the place to store adplugdb since the dispute regarding its location never seem to resolve. /var/adplug should be acceptable for this package atleast. Also getting a bugfix from CVS. * Sat Mar 4 2006 Linus Walleij 1.5.1-5.20060228cvs - Include adplug.db too, everyone will want it anyway * Tue Feb 28 2006 Linus Walleij 1.5.1-4.20060228cvs - Pushed upstream to move adplugdb to sharedstatedir /usr/com * Sun Jan 15 2006 Linus Walleij 1.5.1-3.20060101cvs - Fixed scriptlet problems under non-shell environments. - Make adplug-devel require libbinio-devel. * Sun Jan 09 2006 Linus Walleij 1.5.1-2.20060101cvs - Did a clean-up rollercoaster ride. * Sun Jan 01 2006 Linus Walleij 1.5.1-1.20060101cvs - We need the CVS version to get going (fixes were initialized in upstream by ourselves so we should eat our own dogfood). * Tue Oct 11 2005 Linus Walleij 1.5.1-1 - First try at an AdPlug RPM. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adplug/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 07:26:29 -0000 1.1 +++ .cvsignore 15 May 2006 07:29:04 -0000 1.2 @@ -0,0 +1,2 @@ +adplug-2.0.tar.bz2 +adplug.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/adplug/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 07:26:29 -0000 1.1 +++ sources 15 May 2006 07:29:04 -0000 1.2 @@ -0,0 +1,2 @@ +48c1bb7c8618c45596d79767dec2e962 adplug-2.0.tar.bz2 +5cbd3df5537700f28c350dbe08695c28 adplug.db From fedora-extras-commits at redhat.com Mon May 15 08:13:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 01:13:53 -0700 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wine-docs.spec, 1.12, 1.13 Message-ID: <200605150814.k4F8EP9F013290@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13216/FC-3 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Apr 2006 22:10:08 -0000 1.9 +++ .cvsignore 15 May 2006 08:13:53 -0000 1.10 @@ -1 +1 @@ -wine-docs-0.9.12.tar.bz2 +wine-docs-0.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Apr 2006 22:10:08 -0000 1.9 +++ sources 15 May 2006 08:13:53 -0000 1.10 @@ -1 +1 @@ -cc53497878f78681e85219eff2bf67ae wine-docs-0.9.12.tar.bz2 +e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- wine-docs.spec 16 Apr 2006 22:10:08 -0000 1.12 +++ wine-docs.spec 15 May 2006 08:13:53 -0000 1.13 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Fri Apr 14 2006 Andreas Bierfert 0.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Mon May 15 08:13:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 01:13:53 -0700 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wine-docs.spec, 1.13, 1.14 Message-ID: <200605150814.k4F8EPoB013295@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13216/FC-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Apr 2006 22:10:09 -0000 1.9 +++ .cvsignore 15 May 2006 08:13:53 -0000 1.10 @@ -1 +1 @@ -wine-docs-0.9.12.tar.bz2 +wine-docs-0.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Apr 2006 22:10:09 -0000 1.9 +++ sources 15 May 2006 08:13:53 -0000 1.10 @@ -1 +1 @@ -cc53497878f78681e85219eff2bf67ae wine-docs-0.9.12.tar.bz2 +e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wine-docs.spec 16 Apr 2006 22:10:09 -0000 1.13 +++ wine-docs.spec 15 May 2006 08:13:53 -0000 1.14 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.12 +Version: 0.9.13 Release: 0.1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -46,6 +46,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-0.1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-0.1 - version upgrade From fedora-extras-commits at redhat.com Mon May 15 08:13:59 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 01:13:59 -0700 Subject: rpms/wine-docs/FC-5 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wine-docs.spec, 1.9, 1.10 Message-ID: <200605150814.k4F8EVeX013300@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13216/FC-5 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Apr 2006 22:10:10 -0000 1.9 +++ .cvsignore 15 May 2006 08:13:59 -0000 1.10 @@ -1 +1 @@ -wine-docs-0.9.12.tar.bz2 +wine-docs-0.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Apr 2006 22:10:10 -0000 1.9 +++ sources 15 May 2006 08:13:59 -0000 1.10 @@ -1 +1 @@ -cc53497878f78681e85219eff2bf67ae wine-docs-0.9.12.tar.bz2 +e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-docs.spec 16 Apr 2006 22:10:10 -0000 1.9 +++ wine-docs.spec 15 May 2006 08:13:59 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Fri Apr 14 2006 Andreas Bierfert 0.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Mon May 15 08:14:00 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 01:14:00 -0700 Subject: rpms/wine-docs/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wine-docs.spec, 1.9, 1.10 Message-ID: <200605150814.k4F8EWCu013305@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13216/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Apr 2006 22:10:10 -0000 1.9 +++ .cvsignore 15 May 2006 08:13:59 -0000 1.10 @@ -1 +1 @@ -wine-docs-0.9.12.tar.bz2 +wine-docs-0.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Apr 2006 22:10:10 -0000 1.9 +++ sources 15 May 2006 08:13:59 -0000 1.10 @@ -1 +1 @@ -cc53497878f78681e85219eff2bf67ae wine-docs-0.9.12.tar.bz2 +e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-docs.spec 16 Apr 2006 22:10:10 -0000 1.9 +++ wine-docs.spec 15 May 2006 08:13:59 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Fri Apr 14 2006 Andreas Bierfert 0.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Mon May 15 09:40:15 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 15 May 2006 02:40:15 -0700 Subject: rpms/spamass-milter/devel spamass-milter.spec,1.8,1.9 Message-ID: <200605150940.k4F9eHkL015919@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15902 Modified Files: spamass-milter.spec Log Message: Use upstream default settings (#191602) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/devel/spamass-milter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- spamass-milter.spec 7 May 2006 10:43:19 -0000 1.8 +++ spamass-milter.spec 15 May 2006 09:40:15 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -68,7 +68,7 @@ ### Default variables SOCKET="%{_localstatedir}/run/spamass-milter/spamass-milter.sock" -EXTRA_FLAGS="-m -r 15" +EXTRA_FLAGS="" SYSCONFIG="%{_sysconfdir}/sysconfig/spamass-milter" ### Read configuration @@ -176,6 +176,15 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Mon May 15 2006 Paul Howarth - 0.3.1-3 +- Use upstream default settings (#191602) + This change re-enables by default Subject/Content-Type header modification + (which may have a performance impact for large messages) and disables by + default the rejection of emails with a spam score of 15 or more. To re-enable + these options, uncomment the line: + EXTRA_FLAGS="-m -r 15" + in %{_sysconfdir}/sysconfig/spamass-milter + * Sun May 7 2006 Paul Howarth - 0.3.1-2 - Fix race condition in "stop" clause of initscript (#190894) From fedora-extras-commits at redhat.com Mon May 15 09:41:16 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 15 May 2006 02:41:16 -0700 Subject: rpms/spamass-milter/FC-5 spamass-milter.spec,1.8,1.9 Message-ID: <200605150941.k4F9fIgE015993@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15973 Modified Files: spamass-milter.spec Log Message: Use upstream default settings (#191602) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-5/spamass-milter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- spamass-milter.spec 7 May 2006 10:44:51 -0000 1.8 +++ spamass-milter.spec 15 May 2006 09:41:16 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -68,7 +68,7 @@ ### Default variables SOCKET="%{_localstatedir}/run/spamass-milter/spamass-milter.sock" -EXTRA_FLAGS="-m -r 15" +EXTRA_FLAGS="" SYSCONFIG="%{_sysconfdir}/sysconfig/spamass-milter" ### Read configuration @@ -176,6 +176,15 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Mon May 15 2006 Paul Howarth - 0.3.1-3 +- Use upstream default settings (#191602) + This change re-enables by default Subject/Content-Type header modification + (which may have a performance impact for large messages) and disables by + default the rejection of emails with a spam score of 15 or more. To re-enable + these options, uncomment the line: + EXTRA_FLAGS="-m -r 15" + in %{_sysconfdir}/sysconfig/spamass-milter + * Sun May 7 2006 Paul Howarth - 0.3.1-2 - Fix race condition in "stop" clause of initscript (#190894) From fedora-extras-commits at redhat.com Mon May 15 09:41:57 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 15 May 2006 02:41:57 -0700 Subject: rpms/spamass-milter/FC-4 spamass-milter.spec,1.7,1.8 Message-ID: <200605150942.k4F9g0G6016057@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16040 Modified Files: spamass-milter.spec Log Message: Use upstream default settings (#191602) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-4/spamass-milter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spamass-milter.spec 7 May 2006 10:45:48 -0000 1.7 +++ spamass-milter.spec 15 May 2006 09:41:57 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -68,7 +68,7 @@ ### Default variables SOCKET="%{_localstatedir}/run/spamass-milter/spamass-milter.sock" -EXTRA_FLAGS="-m -r 15" +EXTRA_FLAGS="" SYSCONFIG="%{_sysconfdir}/sysconfig/spamass-milter" ### Read configuration @@ -176,6 +176,15 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Mon May 15 2006 Paul Howarth - 0.3.1-3 +- Use upstream default settings (#191602) + This change re-enables by default Subject/Content-Type header modification + (which may have a performance impact for large messages) and disables by + default the rejection of emails with a spam score of 15 or more. To re-enable + these options, uncomment the line: + EXTRA_FLAGS="-m -r 15" + in %{_sysconfdir}/sysconfig/spamass-milter + * Sun May 7 2006 Paul Howarth - 0.3.1-2 - Fix race condition in "stop" clause of initscript (#190894) From fedora-extras-commits at redhat.com Mon May 15 09:42:40 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 15 May 2006 02:42:40 -0700 Subject: rpms/spamass-milter/FC-3 spamass-milter.spec,1.7,1.8 Message-ID: <200605150942.k4F9gg97016119@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16101 Modified Files: spamass-milter.spec Log Message: Use upstream default settings (#191602) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-3/spamass-milter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spamass-milter.spec 7 May 2006 10:46:58 -0000 1.7 +++ spamass-milter.spec 15 May 2006 09:42:40 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -68,7 +68,7 @@ ### Default variables SOCKET="%{_localstatedir}/run/spamass-milter/spamass-milter.sock" -EXTRA_FLAGS="-m -r 15" +EXTRA_FLAGS="" SYSCONFIG="%{_sysconfdir}/sysconfig/spamass-milter" ### Read configuration @@ -176,6 +176,15 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Mon May 15 2006 Paul Howarth - 0.3.1-3 +- Use upstream default settings (#191602) + This change re-enables by default Subject/Content-Type header modification + (which may have a performance impact for large messages) and disables by + default the rejection of emails with a spam score of 15 or more. To re-enable + these options, uncomment the line: + EXTRA_FLAGS="-m -r 15" + in %{_sysconfdir}/sysconfig/spamass-milter + * Sun May 7 2006 Paul Howarth - 0.3.1-2 - Fix race condition in "stop" clause of initscript (#190894) From fedora-extras-commits at redhat.com Mon May 15 10:46:54 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:46:54 -0700 Subject: rpms/gnome-telnet/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE gnome-telnet-2.5-default-font.patch, 1.1, NONE gnome-telnet.spec, 1.7, NONE sources, 1.2, NONE Message-ID: <200605151046.k4FAkugG019098@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gnome-telnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065/gnome-telnet/devel Added Files: dead.package Removed Files: .cvsignore Makefile gnome-telnet-2.5-default-font.patch gnome-telnet.spec sources Log Message: add a file 'dead.package' for these retired packages --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- gnome-telnet-2.5-default-font.patch DELETED --- --- gnome-telnet.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:46:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:46:53 -0700 Subject: rpms/elmo/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE elmo.spec, 1.8, NONE sources, 1.2, NONE Message-ID: <200605151046.k4FAktA6019094@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/elmo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065/elmo/devel Added Files: dead.package Removed Files: .cvsignore Makefile elmo.spec sources Log Message: add a file 'dead.package' for these retired packages --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- elmo.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:47:00 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:47:00 -0700 Subject: rpms/rpmproc/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE rpmproc-unique-script.patch, 1.1, NONE rpmproc-upload-dirs.patch, 1.1, NONE rpmproc.spec, 1.5, NONE sources, 1.2, NONE Message-ID: <200605151047.k4FAl2sW019130@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/rpmproc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065/rpmproc/devel Added Files: dead.package Removed Files: .cvsignore Makefile rpmproc-unique-script.patch rpmproc-upload-dirs.patch rpmproc.spec sources Log Message: add a file 'dead.package' for these retired packages --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- rpmproc-unique-script.patch DELETED --- --- rpmproc-upload-dirs.patch DELETED --- --- rpmproc.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:47:00 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:47:00 -0700 Subject: rpms/sodipodi/devel dead.package,NONE,1.1 Message-ID: <200605151047.k4FAl2WE019133@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sodipodi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065/sodipodi/devel Added Files: dead.package Log Message: add a file 'dead.package' for these retired packages --- NEW FILE dead.package --- From fedora-extras-commits at redhat.com Mon May 15 10:54:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:32 -0700 Subject: rpms/configure-thinkpad/devel dead.package, NONE, 1.1 .cvsignore, 1.6, NONE Makefile, 1.2, NONE configure-thinkpad-desktop.patch, 1.1, NONE configure-thinkpad.spec, 1.10, NONE sources, 1.6, NONE Message-ID: <200605151054.k4FAsYda019385@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/configure-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/configure-thinkpad/devel Added Files: dead.package Removed Files: .cvsignore Makefile configure-thinkpad-desktop.patch configure-thinkpad.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- configure-thinkpad-desktop.patch DELETED --- --- configure-thinkpad.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:32 -0700 Subject: rpms/cvsup/devel dead.package, NONE, 1.1 .cvsignore, 1.4, NONE Makefile, 1.2, NONE cvsup-contrib.patch, 1.1, NONE cvsup-gcc4.patch, 1.1, NONE cvsup-no-rpath.diff, 1.1, NONE cvsup-ppc.patch, 1.1, NONE cvsup.spec, 1.10, NONE cvsupd.conf, 1.1, NONE cvsupd.logrotate, 1.1, NONE cvsupd.rc, 1.1, NONE ezm3-1.2-PPC-setjmp-bootstrap.patch, 1.1, NONE ezm3-1.2-PPC-setjmp.patch, 1.1, NONE ezm3-1.2-ppc-jmpbufsize.patch, 1.1, NONE sources, 1.4, NONE Message-ID: <200605151054.k4FAsYLo019398@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/cvsup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/cvsup/devel Added Files: dead.package Removed Files: .cvsignore Makefile cvsup-contrib.patch cvsup-gcc4.patch cvsup-no-rpath.diff cvsup-ppc.patch cvsup.spec cvsupd.conf cvsupd.logrotate cvsupd.rc ezm3-1.2-PPC-setjmp-bootstrap.patch ezm3-1.2-PPC-setjmp.patch ezm3-1.2-ppc-jmpbufsize.patch sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- cvsup-contrib.patch DELETED --- --- cvsup-gcc4.patch DELETED --- --- cvsup-no-rpath.diff DELETED --- --- cvsup-ppc.patch DELETED --- --- cvsup.spec DELETED --- --- cvsupd.conf DELETED --- --- cvsupd.logrotate DELETED --- --- cvsupd.rc DELETED --- --- ezm3-1.2-PPC-setjmp-bootstrap.patch DELETED --- --- ezm3-1.2-PPC-setjmp.patch DELETED --- --- ezm3-1.2-ppc-jmpbufsize.patch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:34 -0700 Subject: rpms/gktools/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE gktools.spec, 1.6, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsabM019411@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gktools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/gktools/devel Added Files: dead.package Removed Files: .cvsignore Makefile gktools.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- gktools.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:34 -0700 Subject: rpms/gnofract4d/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE gnofract4d.spec, 1.7, NONE sources, 1.3, NONE Message-ID: <200605151054.k4FAsaD2019414@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/gnofract4d/devel Added Files: dead.package Removed Files: .cvsignore Makefile gnofract4d.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- gnofract4d.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:31 -0700 Subject: rpms/cksfv/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE cksfv-1.3-print.c.patch, 1.1, NONE cksfv.spec, 1.9, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsXrF019368@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/cksfv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/cksfv/devel Added Files: dead.package Removed Files: .cvsignore Makefile cksfv-1.3-print.c.patch cksfv.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- cksfv-1.3-print.c.patch DELETED --- --- cksfv.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:33 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:33 -0700 Subject: rpms/diag-ether/devel dead.package,NONE,1.1 Message-ID: <200605151054.k4FAsZNn019408@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/diag-ether/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/diag-ether/devel Added Files: dead.package Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- From fedora-extras-commits at redhat.com Mon May 15 10:54:41 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:41 -0700 Subject: rpms/inti/devel dead.package,NONE,1.1 Message-ID: <200605151054.k4FAshMt019483@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/inti/devel Added Files: dead.package Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- From fedora-extras-commits at redhat.com Mon May 15 10:54:41 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:41 -0700 Subject: rpms/ks3switch/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE ks3switch-desktop.patch, 1.2, NONE ks3switch-exec.patch, 1.1, NONE ks3switch.spec, 1.3, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAshf2019488@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/ks3switch/devel Added Files: dead.package Removed Files: .cvsignore Makefile ks3switch-desktop.patch ks3switch-exec.patch ks3switch.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- ks3switch-desktop.patch DELETED --- --- ks3switch-exec.patch DELETED --- --- ks3switch.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:43 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:43 -0700 Subject: rpms/manedit/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE manedit-0.5.11-bzip2.patch, 1.1, NONE manedit-0.5.11-gcc4.patch, 1.1, NONE manedit-0.5.11-multilib.patch, 1.1, NONE manedit-0.5.11-nostrip.patch, 1.1, NONE manedit.desktop, 1.1, NONE manedit.spec, 1.12, NONE sources, 1.3, NONE Message-ID: <200605151054.k4FAsjxS019492@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/manedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/manedit/devel Added Files: dead.package Removed Files: .cvsignore Makefile manedit-0.5.11-bzip2.patch manedit-0.5.11-gcc4.patch manedit-0.5.11-multilib.patch manedit-0.5.11-nostrip.patch manedit.desktop manedit.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- manedit-0.5.11-bzip2.patch DELETED --- --- manedit-0.5.11-gcc4.patch DELETED --- --- manedit-0.5.11-multilib.patch DELETED --- --- manedit-0.5.11-nostrip.patch DELETED --- --- manedit.desktop DELETED --- --- manedit.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:48 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:48 -0700 Subject: rpms/mknbi/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE mknbi-1.4.4-gcc4.patch, 1.1, NONE mknbi-1.4.4-makefile-optflags.patch, 1.1, NONE mknbi.spec, 1.10, NONE sources, 1.3, NONE Message-ID: <200605151054.k4FAsoYf019538@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mknbi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/mknbi/devel Added Files: dead.package Removed Files: .cvsignore Makefile mknbi-1.4.4-gcc4.patch mknbi-1.4.4-makefile-optflags.patch mknbi.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- mknbi-1.4.4-gcc4.patch DELETED --- --- mknbi-1.4.4-makefile-optflags.patch DELETED --- --- mknbi.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:40 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:40 -0700 Subject: rpms/htb-util/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE htb-util-0.2.4pre1-FC2.patch, 1.1, NONE htb-util-0.2.4pre1-init.d.patch, 1.1, NONE htb-util.spec, 1.6, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsgvY019471@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/htb-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/htb-util/devel Added Files: dead.package Removed Files: .cvsignore Makefile htb-util-0.2.4pre1-FC2.patch htb-util-0.2.4pre1-init.d.patch htb-util.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- htb-util-0.2.4pre1-FC2.patch DELETED --- --- htb-util-0.2.4pre1-init.d.patch DELETED --- --- htb-util.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:42 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:42 -0700 Subject: rpms/libzvt/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE libzvt.spec, 1.8, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsicW019491@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libzvt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/libzvt/devel Added Files: dead.package Removed Files: .cvsignore Makefile libzvt.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- libzvt.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:50 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:50 -0700 Subject: rpms/netdiag/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE etherwake.8, 1.1, NONE netdiag-2.4-multi-line-string.patch, 1.1, NONE netdiag-2.4-weak-declarations.patch, 1.1, NONE netdiag.spec, 1.10, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsqEK019542@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netdiag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/netdiag/devel Added Files: dead.package Removed Files: .cvsignore Makefile etherwake.8 netdiag-2.4-multi-line-string.patch netdiag-2.4-weak-declarations.patch netdiag.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- etherwake.8 DELETED --- --- netdiag-2.4-multi-line-string.patch DELETED --- --- netdiag-2.4-weak-declarations.patch DELETED --- --- netdiag.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:49 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:49 -0700 Subject: rpms/nabi/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE nabi.spec, 1.4, NONE sources, 1.2, NONE themeRemoval.sh, 1.1, NONE xinput.d-nabi, 1.1, NONE Message-ID: <200605151054.k4FAspbX019541@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nabi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/nabi/devel Added Files: dead.package Removed Files: .cvsignore Makefile nabi.spec sources themeRemoval.sh xinput.d-nabi Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- nabi.spec DELETED --- --- sources DELETED --- --- themeRemoval.sh DELETED --- --- xinput.d-nabi DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:55 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:55 -0700 Subject: rpms/nget/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE nget.spec, 1.8, NONE sources, 1.3, NONE Message-ID: <200605151054.k4FAsvsv019573@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/nget/devel Added Files: dead.package Removed Files: .cvsignore Makefile nget.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- nget.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:03 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:03 -0700 Subject: rpms/perl-Net-SCP/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE perl-Net-SCP.spec, 1.7, NONE sources, 1.2, NONE Message-ID: <200605151055.k4FAt5nK019637@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Net-SCP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/perl-Net-SCP/devel Added Files: dead.package Removed Files: .cvsignore Makefile perl-Net-SCP.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- perl-Net-SCP.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:56 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:56 -0700 Subject: rpms/parchive/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE parchive.spec, 1.9, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAswEB019576@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/parchive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/parchive/devel Added Files: dead.package Removed Files: .cvsignore Makefile parchive.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- parchive.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:02 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:02 -0700 Subject: rpms/perl-Chart/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.1, NONE perl-Chart.spec, 1.4, NONE sources, 1.3, NONE Message-ID: <200605151055.k4FAt4Ta019633@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/perl-Chart/devel Added Files: dead.package Removed Files: .cvsignore Makefile perl-Chart.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- perl-Chart.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:04 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:04 -0700 Subject: rpms/perl-Net-SSH/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE perl-Net-SSH.spec, 1.8, NONE sources, 1.3, NONE Message-ID: <200605151055.k4FAt68n019640@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Net-SSH/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/perl-Net-SSH/devel Added Files: dead.package Removed Files: .cvsignore Makefile perl-Net-SSH.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- perl-Net-SSH.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:09 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:09 -0700 Subject: rpms/s3switch/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE s3switch-lrmi.patch, 1.1, NONE s3switch-thinkpad-t23.patch, 1.2, NONE s3switch-virgegx2.patch, 1.1, NONE s3switch.consoleapp, 1.1, NONE s3switch.pam, 1.1, NONE s3switch.spec, 1.8, NONE sources, 1.3, NONE Message-ID: <200605151055.k4FAtBCP019669@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/s3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/s3switch/devel Added Files: dead.package Removed Files: .cvsignore Makefile s3switch-lrmi.patch s3switch-thinkpad-t23.patch s3switch-virgegx2.patch s3switch.consoleapp s3switch.pam s3switch.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- s3switch-lrmi.patch DELETED --- --- s3switch-thinkpad-t23.patch DELETED --- --- s3switch-virgegx2.patch DELETED --- --- s3switch.consoleapp DELETED --- --- s3switch.pam DELETED --- --- s3switch.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:10 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:10 -0700 Subject: rpms/sirius/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE sirius.spec, 1.10, NONE sources, 1.3, NONE Message-ID: <200605151055.k4FAtCq4019672@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sirius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/sirius/devel Added Files: dead.package Removed Files: .cvsignore Makefile sirius.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sirius.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:16 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:16 -0700 Subject: rpms/tdl/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE sources, 1.3, NONE tdl.spec, 1.10, NONE Message-ID: <200605151055.k4FAtIAt019727@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tdl/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tdl.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tdl.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:16 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:16 -0700 Subject: rpms/tetex-arabtex/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources, 1.2, NONE tetex-arabtex.spec, 1.7, NONE Message-ID: <200605151055.k4FAtIXa019732@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-arabtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tetex-arabtex/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tetex-arabtex.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tetex-arabtex.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:17 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:17 -0700 Subject: rpms/tetex-armtex/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources, 1.2, NONE tetex-armtex.spec, 1.5, NONE Message-ID: <200605151055.k4FAtJRp019735@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-armtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tetex-armtex/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tetex-armtex.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tetex-armtex.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:02 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:02 -0700 Subject: rpms/perl-Net-Netmask/devel dead.package, NONE, 1.1 .cvsignore, 1.4, NONE Makefile, 1.2, NONE perl-Net-Netmask.spec, 1.8, NONE sources, 1.4, NONE Message-ID: <200605151055.k4FAt4BG019636@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Net-Netmask/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/perl-Net-Netmask/devel Added Files: dead.package Removed Files: .cvsignore Makefile perl-Net-Netmask.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- perl-Net-Netmask.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:18 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:18 -0700 Subject: rpms/tetex-font-tipa/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources, 1.2, NONE tetex-font-tipa.spec, 1.8, NONE Message-ID: <200605151055.k4FAtKdW019738@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-font-tipa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tetex-font-tipa/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tetex-font-tipa.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tetex-font-tipa.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:24 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:24 -0700 Subject: rpms/thinkpad-kmod/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.1, NONE kmodtool, 1.5, NONE sources, 1.3, NONE thinkpad-kmod-5.9-build.patch, 1.1, NONE thinkpad-kmod.spec, 1.8, NONE Message-ID: <200605151055.k4FAtQeN019803@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/thinkpad-kmod/devel Added Files: dead.package Removed Files: .cvsignore Makefile kmodtool sources thinkpad-kmod-5.9-build.patch thinkpad-kmod.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- kmodtool DELETED --- --- sources DELETED --- --- thinkpad-kmod-5.9-build.patch DELETED --- --- thinkpad-kmod.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:25 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:25 -0700 Subject: rpms/thinkpad-kmod-common/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.1, NONE sources, 1.3, NONE thinkpad-kmod-common-console.perms, 1.1, NONE thinkpad-kmod-common.modules, 1.1, NONE thinkpad-kmod-common.spec, 1.3, NONE Message-ID: <200605151055.k4FAtRnD019810@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/thinkpad-kmod-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/thinkpad-kmod-common/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources thinkpad-kmod-common-console.perms thinkpad-kmod-common.modules thinkpad-kmod-common.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- thinkpad-kmod-common-console.perms DELETED --- --- thinkpad-kmod-common.modules DELETED --- --- thinkpad-kmod-common.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:25 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:25 -0700 Subject: rpms/tpb/devel dead.package, NONE, 1.1 .cvsignore, 1.4, NONE Makefile, 1.2, NONE sources, 1.4, NONE tpb-defaultconfig.patch, 1.4, NONE tpb.spec, 1.11, NONE Message-ID: <200605151055.k4FAtRIk019813@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tpb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tpb/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tpb-defaultconfig.patch tpb.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tpb-defaultconfig.patch DELETED --- --- tpb.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:26 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:26 -0700 Subject: rpms/tpctl/devel dead.package, NONE, 1.1 .cvsignore, 1.6, NONE Makefile, 1.2, NONE sources, 1.6, NONE tpctl-optflags.patch, 1.2, NONE tpctl-rpm.patch, 1.2, NONE tpctl.apmiser.init, 1.2, NONE tpctl.spec, 1.9, NONE Message-ID: <200605151055.k4FAtSfo019814@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tpctl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tpctl/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tpctl-optflags.patch tpctl-rpm.patch tpctl.apmiser.init tpctl.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tpctl-optflags.patch DELETED --- --- tpctl-rpm.patch DELETED --- --- tpctl.apmiser.init DELETED --- --- tpctl.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:24 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:24 -0700 Subject: rpms/tetex-lgrind/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE lgrind-3.67-buffersize.patch, 1.1, NONE lgrind-3.67-options.patch, 1.1, NONE lgrind-3.67-parsevartab.patch, 1.1, NONE sources, 1.2, NONE tetex-lgrind.spec, 1.14, NONE Message-ID: <200605151055.k4FAtQaF019793@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-lgrind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tetex-lgrind/devel Added Files: dead.package Removed Files: .cvsignore Makefile lgrind-3.67-buffersize.patch lgrind-3.67-options.patch lgrind-3.67-parsevartab.patch sources tetex-lgrind.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- lgrind-3.67-buffersize.patch DELETED --- --- lgrind-3.67-options.patch DELETED --- --- lgrind-3.67-parsevartab.patch DELETED --- --- sources DELETED --- --- tetex-lgrind.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:32 -0700 Subject: rpms/tripwire/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Latest-Changes, 1.2, NONE License-Issues, 1.2, NONE Makefile, 1.2, NONE README.RPM.in, 1.1, NONE pipedmailmessage.patch, 1.1, NONE sources, 1.2, NONE tripwire-2.3.0-50-rfc822.patch, 1.1, NONE tripwire-2.3.1-gcc3.new.patch, 1.1, NONE tripwire-mkstemp.patch, 1.1, NONE tripwire-setup-keyfiles.in, 1.1, NONE tripwire-siggen-man8.patch, 1.1, NONE tripwire.cron.in, 1.1, NONE tripwire.gif, 1.1, NONE tripwire.spec, 1.6, NONE tripwire.txt, 1.1, NONE tw-20030919.patch, 1.1, NONE twcfg.txt.in, 1.1, NONE twpol.txt.in, 1.2, NONE Message-ID: <200605151055.k4FAtYaG019871@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tripwire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tripwire/devel Added Files: dead.package Removed Files: .cvsignore Latest-Changes License-Issues Makefile README.RPM.in pipedmailmessage.patch sources tripwire-2.3.0-50-rfc822.patch tripwire-2.3.1-gcc3.new.patch tripwire-mkstemp.patch tripwire-setup-keyfiles.in tripwire-siggen-man8.patch tripwire.cron.in tripwire.gif tripwire.spec tripwire.txt tw-20030919.patch twcfg.txt.in twpol.txt.in Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Latest-Changes DELETED --- --- License-Issues DELETED --- --- Makefile DELETED --- --- README.RPM.in DELETED --- --- pipedmailmessage.patch DELETED --- --- sources DELETED --- --- tripwire-2.3.0-50-rfc822.patch DELETED --- --- tripwire-2.3.1-gcc3.new.patch DELETED --- --- tripwire-mkstemp.patch DELETED --- --- tripwire-setup-keyfiles.in DELETED --- --- tripwire-siggen-man8.patch DELETED --- --- tripwire.cron.in DELETED --- --- tripwire.spec DELETED --- --- tripwire.txt DELETED --- --- tw-20030919.patch DELETED --- --- twcfg.txt.in DELETED --- --- twpol.txt.in DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:33 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:33 -0700 Subject: rpms/wbxml2/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources, 1.2, NONE wbxml2-0.9.0-am_cflags.patch, 1.1, NONE wbxml2.spec, 1.7, NONE Message-ID: <200605151055.k4FAtZnh019876@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wbxml2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/wbxml2/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources wbxml2-0.9.0-am_cflags.patch wbxml2.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- wbxml2-0.9.0-am_cflags.patch DELETED --- --- wbxml2.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:34 -0700 Subject: rpms/whowatch/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE sources, 1.3, NONE whowatch-debian-patches.patch, 1.1, NONE whowatch-gcc4.patch, 1.1, NONE whowatch.spec, 1.9, NONE Message-ID: <200605151055.k4FAtakZ019879@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/whowatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/whowatch/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources whowatch-debian-patches.patch whowatch-gcc4.patch whowatch.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- whowatch-debian-patches.patch DELETED --- --- whowatch-gcc4.patch DELETED --- --- whowatch.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:34 -0700 Subject: rpms/xtide/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE sources, 1.3, NONE xtide-2.8.for_x86_64.patch, 1.1, NONE xtide.desktop, 1.1, NONE xtide.spec, 1.10, NONE Message-ID: <200605151055.k4FAtaGB019882@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/xtide/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources xtide-2.8.for_x86_64.patch xtide.desktop xtide.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- xtide-2.8.for_x86_64.patch DELETED --- --- xtide.desktop DELETED --- --- xtide.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 11:55:04 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 15 May 2006 04:55:04 -0700 Subject: fedora-security/audit fc4,1.243,1.244 fc5,1.157,1.158 Message-ID: <200605151155.k4FBt4dg022786@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22766 Modified Files: fc4 fc5 Log Message: Catch up a few days, squirrelmail Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- fc4 12 May 2006 10:12:07 -0000 1.243 +++ fc4 15 May 2006 11:55:01 -0000 1.244 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060510 -Up to date FC4 as of 20060510 +Up to date CVE as of CVE email 20060514 +Up to date FC4 as of 20060514 ** are items that need attention +CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) @@ -328,7 +329,7 @@ CVE-2005-3356 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2005-3353 backport (php) [since FEDORA-2005-1062] CVE-2005-3352 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052] -CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066] +CVE-2005-3351 version (spamassassin, fixed 3.0.5) [since FEDORA-2006-545] was backport since FEDORA-2005-1066 CVE-2005-3350 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046] CVE-2005-3322 version (squid, not upstream) SUSE only CVE-2005-3319 ignore (mod_php) no security consequence Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- fc5 12 May 2006 15:50:54 -0000 1.157 +++ fc5 15 May 2006 11:55:01 -0000 1.158 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060510 -Up to date FC5 as of 20060510 +Up to date CVE as of CVE email 20060514 +Up to date FC5 as of 20060514 ** are items that need attention +CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Mon May 15 12:18:48 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:18:48 -0700 Subject: rpms/GeoIP/devel .cvsignore, 1.3, 1.4 GeoIP.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605151218.k4FCIoSi025120@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25099 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.3.17-1 - New upstream release (minor fixes) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 06:59:28 -0000 1.3 +++ .cvsignore 15 May 2006 12:18:48 -0000 1.4 @@ -1 +1 @@ -GeoIP-1.3.16.tar.gz +GeoIP-1.3.17.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GeoIP.spec 1 May 2006 06:59:28 -0000 1.2 +++ GeoIP.spec 15 May 2006 12:18:48 -0000 1.3 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.3.16 +Version: 1.3.17 Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries @@ -71,6 +71,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 15 2006 Michael Fleming 1.3.17-1 +- New upstream release (minor fixes) + * Mon May 1 2006 Michael Fleming 1.3.16-1 - New upstream release - Add INSTALL document to package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 06:59:28 -0000 1.3 +++ sources 15 May 2006 12:18:48 -0000 1.4 @@ -1 +1 @@ -f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz +36ee129b4dce5990cea1cfda122dae93 GeoIP-1.3.17.tar.gz From fedora-extras-commits at redhat.com Mon May 15 12:31:04 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:31:04 -0700 Subject: rpms/mod_security/devel .cvsignore, 1.5, 1.6 mod_security.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200605151231.k4FCV6dV025240@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25217 Modified Files: .cvsignore mod_security.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Apr 2006 10:42:57 -0000 1.5 +++ .cvsignore 15 May 2006 12:31:04 -0000 1.6 @@ -1 +1 @@ -modsecurity-apache_1.9.3.tar.gz +modsecurity-apache_1.9.4.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_security.spec 11 Apr 2006 10:42:57 -0000 1.13 +++ mod_security.spec 15 May 2006 12:31:04 -0000 1.14 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,6 +40,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %changelog +* Mon May 15 2006 Michael Fleming 1.9.4-1 +- New upstream release + * Tue Apr 11 2006 Michael Fleming 1.9.3-1 - New upstream release - Trivial spec tweaks Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Apr 2006 10:42:57 -0000 1.6 +++ sources 15 May 2006 12:31:04 -0000 1.7 @@ -1 +1 @@ -cd5585488e2499c4218a4b13419c3065 modsecurity-apache_1.9.3.tar.gz +74d2317781bab619cd7b6b376b978107 modsecurity-apache_1.9.4.tar.gz From fedora-extras-commits at redhat.com Mon May 15 12:33:59 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:33:59 -0700 Subject: rpms/mod_security/FC-5 .cvsignore, 1.5, 1.6 mod_security.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200605151234.k4FCY15k025316@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25295 Modified Files: .cvsignore mod_security.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Apr 2006 11:00:32 -0000 1.5 +++ .cvsignore 15 May 2006 12:33:59 -0000 1.6 @@ -1 +1 @@ -modsecurity-apache_1.9.3.tar.gz +modsecurity-apache_1.9.4.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-5/mod_security.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_security.spec 11 Apr 2006 11:00:32 -0000 1.14 +++ mod_security.spec 15 May 2006 12:33:59 -0000 1.15 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,12 +40,12 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %changelog -* Tue Apr 11 2006 Michael Fleming 1.9.3-1 +* Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release -- Trivial spec tweaks -* Sat Mar 18 2006 Michael Fleming 1.9.2-4 -- Bump for FC5 final +* Tue Apr 11 2006 Michael Fleming 1.9.3-1 +- New upstream release +- Trivial spec tweaks * Wed Mar 1 2006 Michael Fleming 1.9.2-3 - Bump for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Apr 2006 11:00:32 -0000 1.6 +++ sources 15 May 2006 12:33:59 -0000 1.7 @@ -1 +1 @@ -cd5585488e2499c4218a4b13419c3065 modsecurity-apache_1.9.3.tar.gz +74d2317781bab619cd7b6b376b978107 modsecurity-apache_1.9.4.tar.gz From fedora-extras-commits at redhat.com Mon May 15 12:35:58 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:35:58 -0700 Subject: rpms/mod_security/FC-4 .cvsignore, 1.6, 1.7 mod_security.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200605151236.k4FCa0ep025387@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-serv25366 Modified Files: .cvsignore mod_security.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 11 Apr 2006 11:03:43 -0000 1.6 +++ .cvsignore 15 May 2006 12:35:57 -0000 1.7 @@ -1 +1 @@ -modsecurity-apache_1.9.3.tar.gz +modsecurity-apache_1.9.4.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_security.spec 11 Apr 2006 11:03:43 -0000 1.7 +++ mod_security.spec 15 May 2006 12:35:57 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,10 +40,19 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %changelog +* Mon May 15 2006 Michael Fleming 1.9.4-1 +- New upstream release + * Tue Apr 11 2006 Michael Fleming 1.9.3-1 - New upstream release - Trivial spec tweaks +* Wed Mar 1 2006 Michael Fleming 1.9.2-3 +- Bump for FC5 + +* Fri Feb 10 2006 Michael Fleming 1.9.2-2 +- Bump for newer gcc/glibc + * Wed Jan 18 2006 Michael Fleming 1.9.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Apr 2006 11:03:43 -0000 1.6 +++ sources 15 May 2006 12:35:57 -0000 1.7 @@ -1 +1 @@ -cd5585488e2499c4218a4b13419c3065 modsecurity-apache_1.9.3.tar.gz +74d2317781bab619cd7b6b376b978107 modsecurity-apache_1.9.4.tar.gz From fedora-extras-commits at redhat.com Mon May 15 12:37:22 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:37:22 -0700 Subject: rpms/mod_security/FC-3 .cvsignore, 1.5, 1.6 mod_security.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200605151237.k4FCbO3I025458@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25437 Modified Files: .cvsignore mod_security.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Apr 2006 12:16:30 -0000 1.5 +++ .cvsignore 15 May 2006 12:37:22 -0000 1.6 @@ -1 +1 @@ -modsecurity-apache_1.9.3.tar.gz +modsecurity-apache_1.9.4.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mod_security.spec 15 Apr 2006 12:22:31 -0000 1.11 +++ mod_security.spec 15 May 2006 12:37:22 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9.3 -Release: 2%{?dist} +Version: 1.9.4 +Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ Group: System Environment/Daemons @@ -40,6 +40,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %changelog +* Mon May 15 2006 Michael Fleming 1.9.4-1 +- New upstream release + * Sat Apr 15 2006 Michael Fleming 1.9.3-2 - New upstream release - Minor spec tweaks. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Apr 2006 12:16:30 -0000 1.6 +++ sources 15 May 2006 12:37:22 -0000 1.7 @@ -1 +1 @@ -cd5585488e2499c4218a4b13419c3065 modsecurity-apache_1.9.3.tar.gz +74d2317781bab619cd7b6b376b978107 modsecurity-apache_1.9.4.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:09:50 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 15 May 2006 06:09:50 -0700 Subject: rpms/phpldapadmin/devel .cvsignore, 1.6, 1.7 phpldapadmin.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200605151309.k4FD9qnW028557@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28534 Modified Files: .cvsignore phpldapadmin.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2006 12:12:16 -0000 1.6 +++ .cvsignore 15 May 2006 13:09:49 -0000 1.7 @@ -1 +1 @@ -phpldapadmin-0.9.8.2.tar.gz +phpldapadmin-0.9.8.3.tar.gz Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phpldapadmin.spec 14 Mar 2006 12:12:16 -0000 1.10 +++ phpldapadmin.spec 15 May 2006 13:09:49 -0000 1.11 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.2 +Version: 0.9.8.3 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Mon May 15 2006 Dmitry Butskoy - 0.9.8.3-1 +- update to 0.9.8.3 + * Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 - update to 0.9.8.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Mar 2006 12:12:16 -0000 1.7 +++ sources 15 May 2006 13:09:49 -0000 1.8 @@ -1 +1 @@ -a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz +1bb495a36cee3582dc0957880118d3ec phpldapadmin-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:10:57 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 15 May 2006 06:10:57 -0700 Subject: rpms/phpldapadmin/FC-5 phpldapadmin.spec,1.10,1.11 sources,1.7,1.8 Message-ID: <200605151310.k4FDAxPm028620@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28601 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-5/phpldapadmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phpldapadmin.spec 14 Mar 2006 12:12:16 -0000 1.10 +++ phpldapadmin.spec 15 May 2006 13:10:56 -0000 1.11 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.2 +Version: 0.9.8.3 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Mon May 15 2006 Dmitry Butskoy - 0.9.8.3-1 +- update to 0.9.8.3 + * Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 - update to 0.9.8.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Mar 2006 12:12:16 -0000 1.7 +++ sources 15 May 2006 13:10:56 -0000 1.8 @@ -1 +1 @@ -a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz +1bb495a36cee3582dc0957880118d3ec phpldapadmin-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:11:23 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 15 May 2006 06:11:23 -0700 Subject: rpms/phpldapadmin/FC-4 phpldapadmin.spec,1.11,1.12 sources,1.6,1.7 Message-ID: <200605151311.k4FDBPFV028674@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28655 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- phpldapadmin.spec 14 Mar 2006 12:27:01 -0000 1.11 +++ phpldapadmin.spec 15 May 2006 13:11:23 -0000 1.12 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.2 +Version: 0.9.8.3 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Mon May 15 2006 Dmitry Butskoy - 0.9.8.3-1 +- update to 0.9.8.3 + * Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 - update to 0.9.8.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 12:27:01 -0000 1.6 +++ sources 15 May 2006 13:11:23 -0000 1.7 @@ -1 +1 @@ -a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz +1bb495a36cee3582dc0957880118d3ec phpldapadmin-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:11:52 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 15 May 2006 06:11:52 -0700 Subject: rpms/phpldapadmin/FC-3 phpldapadmin.spec,1.10,1.11 sources,1.6,1.7 Message-ID: <200605151311.k4FDBsZf028732@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28713 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phpldapadmin.spec 14 Mar 2006 12:28:04 -0000 1.10 +++ phpldapadmin.spec 15 May 2006 13:11:52 -0000 1.11 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.2 +Version: 0.9.8.3 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Mon May 15 2006 Dmitry Butskoy - 0.9.8.3-1 +- update to 0.9.8.3 + * Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 - update to 0.9.8.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 12:28:04 -0000 1.6 +++ sources 15 May 2006 13:11:52 -0000 1.7 @@ -1 +1 @@ -a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz +1bb495a36cee3582dc0957880118d3ec phpldapadmin-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:57:41 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 06:57:41 -0700 Subject: rpms/python-adns/devel adns-python-srv.patch, NONE, 1.1 python-adns.spec, 1.7, 1.8 Message-ID: <200605151357.k4FDvhLF029155@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/python-adns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29135 Modified Files: python-adns.spec Added Files: adns-python-srv.patch Log Message: Adding patch for SRV RRs adns-python-srv.patch: --- NEW FILE adns-python-srv.patch --- --- adns-python-1.1.0/adnsmodule.c.orig 2006-05-08 16:23:21.000000000 -0400 +++ adns-python-1.1.0/adnsmodule.c 2006-05-09 11:35:15.000000000 -0400 @@ -88,9 +88,10 @@ }; static _constant_class adns_rr[] = { - { "typemask", adns__rrt_typemask }, + { "typemask", adns_rrt_typemask }, { "deref", adns__qtf_deref }, { "mail822", adns__qtf_mail822 }, + { "unknown", adns_r_unknown }, { "none", adns_r_none }, { "A", adns_r_a }, { "NSraw", adns_r_ns_raw }, @@ -106,6 +107,8 @@ { "TXT", adns_r_txt }, { "RPraw", adns_r_rp_raw }, { "RP", adns_r_rp }, + { "SRVraw", adns_r_srv_raw }, + { "SRV", adns_r_srv }, { "ADDR", adns_r_addr }, { NULL, 0 } }; @@ -176,6 +179,17 @@ addrs); return o; } + +static PyObject * +interpret_srv( + adns_rr_srvraw *srvrr + ) +{ + PyObject *o; + o = Py_BuildValue("iiis", srvrr->priority, srvrr->weight, srvrr->port, + srvrr->host); + return o; +} static PyObject * interpret_answer( @@ -184,7 +198,7 @@ { PyObject *o, *rrs; int i; - adns_rrtype t = answer->type & adns__rrt_typemask; + adns_rrtype t = answer->type & adns_rrt_typemask; adns_rrtype td = answer->type & adns__qtf_deref; rrs = PyTuple_New(answer->nrrs); @@ -273,6 +287,9 @@ a = Py_BuildValue("ss", v->array[0], v->array[1]); } break; + case adns_r_srv_raw: + a = interpret_srv((answer->rrs.srvraw+i)); + break; default: a = Py_None; Py_INCREF(a); Index: python-adns.spec =================================================================== RCS file: /cvs/extras/rpms/python-adns/devel/python-adns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-adns.spec 13 Apr 2005 01:25:11 -0000 1.7 +++ python-adns.spec 15 May 2006 13:57:41 -0000 1.8 @@ -4,16 +4,17 @@ Name: python-adns Version: 1.1.0 -Release: 1 +Release: 2 Summary: Python interface for the GNU adns library Group: Development/Languages License: GPL URL: http://dustman.net/andy/python/adns-python Source0: http://dustman.net/andy/python/adns-python/1.1.0/adns-python-1.1.0.tar.gz +Patch0: adns-python-srv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, adns-devel +BuildRequires: python-devel, adns-devel >= 1.2 Requires: python >= %{pyver}, python < %{pynext} %description @@ -22,6 +23,7 @@ %prep %setup -q -n %{srcname}-%{version} +%patch0 -p1 -b .srv %build env CFLAGS="$RPM_OPT_FLAGS" python setup.py build @@ -41,6 +43,11 @@ %ghost %{_libdir}/python%{pyver}/site-packages/*.pyo %changelog +* Tue May 9 2006 Mihai Ibanescu 1.1.0-2 +- added patch to make it compile with adns >= 1.2 (adns__rrt_typemask was + renamed to adns_rrt_typemask). The patch also adds support for SRV records + (adns 1.2 has that, just need them exposed in the bindings). + * Wed Apr 13 2005 Colin Charles - 1.1.0-1 - new upstream 1.1.0 release From fedora-extras-commits at redhat.com Mon May 15 13:59:37 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 06:59:37 -0700 Subject: rpms/python-adns/devel python-adns.spec,1.8,1.9 Message-ID: <200605151359.k4FDxdjw029285@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/python-adns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29268 Modified Files: python-adns.spec Log Message: Added dist to release Index: python-adns.spec =================================================================== RCS file: /cvs/extras/rpms/python-adns/devel/python-adns.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-adns.spec 15 May 2006 13:57:41 -0000 1.8 +++ python-adns.spec 15 May 2006 13:59:36 -0000 1.9 @@ -4,7 +4,7 @@ Name: python-adns Version: 1.1.0 -Release: 2 +Release: 3%{?dist} Summary: Python interface for the GNU adns library Group: Development/Languages @@ -43,7 +43,7 @@ %ghost %{_libdir}/python%{pyver}/site-packages/*.pyo %changelog -* Tue May 9 2006 Mihai Ibanescu 1.1.0-2 +* Tue May 9 2006 Mihai Ibanescu 1.1.0-3 - added patch to make it compile with adns >= 1.2 (adns__rrt_typemask was renamed to adns_rrt_typemask). The patch also adds support for SRV records (adns 1.2 has that, just need them exposed in the bindings). From fedora-extras-commits at redhat.com Mon May 15 14:00:30 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 07:00:30 -0700 Subject: rpms/python-adns/FC-5 adns-python-srv.patch, NONE, 1.1 python-adns.spec, 1.7, 1.8 Message-ID: <200605151400.k4FE0WKV029363@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/python-adns/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29343 Modified Files: python-adns.spec Added Files: adns-python-srv.patch Log Message: Building for FC-5 adns-python-srv.patch: --- NEW FILE adns-python-srv.patch --- --- adns-python-1.1.0/adnsmodule.c.orig 2006-05-08 16:23:21.000000000 -0400 +++ adns-python-1.1.0/adnsmodule.c 2006-05-09 11:35:15.000000000 -0400 @@ -88,9 +88,10 @@ }; static _constant_class adns_rr[] = { - { "typemask", adns__rrt_typemask }, + { "typemask", adns_rrt_typemask }, { "deref", adns__qtf_deref }, { "mail822", adns__qtf_mail822 }, + { "unknown", adns_r_unknown }, { "none", adns_r_none }, { "A", adns_r_a }, { "NSraw", adns_r_ns_raw }, @@ -106,6 +107,8 @@ { "TXT", adns_r_txt }, { "RPraw", adns_r_rp_raw }, { "RP", adns_r_rp }, + { "SRVraw", adns_r_srv_raw }, + { "SRV", adns_r_srv }, { "ADDR", adns_r_addr }, { NULL, 0 } }; @@ -176,6 +179,17 @@ addrs); return o; } + +static PyObject * +interpret_srv( + adns_rr_srvraw *srvrr + ) +{ + PyObject *o; + o = Py_BuildValue("iiis", srvrr->priority, srvrr->weight, srvrr->port, + srvrr->host); + return o; +} static PyObject * interpret_answer( @@ -184,7 +198,7 @@ { PyObject *o, *rrs; int i; - adns_rrtype t = answer->type & adns__rrt_typemask; + adns_rrtype t = answer->type & adns_rrt_typemask; adns_rrtype td = answer->type & adns__qtf_deref; rrs = PyTuple_New(answer->nrrs); @@ -273,6 +287,9 @@ a = Py_BuildValue("ss", v->array[0], v->array[1]); } break; + case adns_r_srv_raw: + a = interpret_srv((answer->rrs.srvraw+i)); + break; default: a = Py_None; Py_INCREF(a); Index: python-adns.spec =================================================================== RCS file: /cvs/extras/rpms/python-adns/FC-5/python-adns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-adns.spec 13 Apr 2005 01:25:11 -0000 1.7 +++ python-adns.spec 15 May 2006 14:00:30 -0000 1.8 @@ -4,16 +4,17 @@ Name: python-adns Version: 1.1.0 -Release: 1 +Release: 3%{?dist} Summary: Python interface for the GNU adns library Group: Development/Languages License: GPL URL: http://dustman.net/andy/python/adns-python Source0: http://dustman.net/andy/python/adns-python/1.1.0/adns-python-1.1.0.tar.gz +Patch0: adns-python-srv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, adns-devel +BuildRequires: python-devel, adns-devel >= 1.2 Requires: python >= %{pyver}, python < %{pynext} %description @@ -22,6 +23,7 @@ %prep %setup -q -n %{srcname}-%{version} +%patch0 -p1 -b .srv %build env CFLAGS="$RPM_OPT_FLAGS" python setup.py build @@ -41,6 +43,11 @@ %ghost %{_libdir}/python%{pyver}/site-packages/*.pyo %changelog +* Tue May 9 2006 Mihai Ibanescu 1.1.0-3 +- added patch to make it compile with adns >= 1.2 (adns__rrt_typemask was + renamed to adns_rrt_typemask). The patch also adds support for SRV records + (adns 1.2 has that, just need them exposed in the bindings). + * Wed Apr 13 2005 Colin Charles - 1.1.0-1 - new upstream 1.1.0 release From fedora-extras-commits at redhat.com Mon May 15 14:13:05 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 07:13:05 -0700 Subject: rpms/adns/devel adns-autoconf-noexpand.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 adns.spec, 1.6, 1.7 adns-1.1-parsedomain.patch, 1.1, NONE adns-1.1-semicolon.patch, 1.1, NONE Message-ID: <200605151413.k4FED7HB031711@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/adns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31689 Modified Files: .cvsignore adns.spec Added Files: adns-autoconf-noexpand.patch Removed Files: adns-1.1-parsedomain.patch adns-1.1-semicolon.patch Log Message: Upgraded to 1.2 adns-autoconf-noexpand.patch: --- NEW FILE adns-autoconf-noexpand.patch --- --- adns-1.2/settings.make.in.noexpand 2006-05-08 10:24:44.000000000 -0400 +++ adns-1.2/settings.make.in 2006-05-08 10:25:46.000000000 -0400 @@ -47,9 +47,9 @@ prefix= @prefix@ exec_prefix= @exec_prefix@ -bin_dir= $(exec_prefix)/bin -lib_dir= $(exec_prefix)/lib -include_dir= $(prefix)/include +bin_dir= @bindir@ +lib_dir= @libdir@ +include_dir= @includedir@ AC_INSTALL= @INSTALL@ ifeq ($(AC_INSTALL),./install-sh -c) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adns/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:00:46 -0000 1.2 +++ .cvsignore 15 May 2006 14:13:05 -0000 1.3 @@ -1 +1,2 @@ adns-1.1.tar.gz +adns-1.2.tar.gz Index: adns.spec =================================================================== RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- adns.spec 6 Apr 2005 22:10:47 -0000 1.6 +++ adns.spec 15 May 2006 14:13:05 -0000 1.7 @@ -1,18 +1,16 @@ Name: adns -Version: 1.1 -Release: 5 +Version: 1.2 +Release: 2%{?dist} Summary: Advanced, easy to use, asynchronous-capable DNS client library Group: System Environment/Libraries License: GPL URL: http://www.chiark.greenend.org.uk/~ian/adns/ -Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-1.1.tar.gz -Patch0: %{name}-DESTDIR.patch -Patch1: %{name}-ac_fix.patch -Patch2: adns-1.1-semicolon.patch -Patch3: adns-1.1-parsedomain.patch -BuildRequires: autoconf213 automake15 +Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz +Patch1: %{name}-ac_fix.patch +Patch2: %{name}-autoconf-noexpand.patch +#BuildRequires: autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -72,23 +70,23 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .semicolon -%patch3 -p1 -b .parsedomain +%patch1 -p1 -b .ac_fix +%patch2 -p1 -b .noexpand %build #aclocal #%{__autoconf} -aclocal-1.5 -autoconf-2.13 +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" %configure --enable-dynamic make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -ln -sf libadns.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libadns.so +make install \ + prefix=$RPM_BUILD_ROOT/usr \ + bin_dir=$RPM_BUILD_ROOT%{_bindir} \ + include_dir=$RPM_BUILD_ROOT%{_includedir} \ + lib_dir=$RPM_BUILD_ROOT%{_libdir} %clean rm -fr $RPM_BUILD_ROOT @@ -112,6 +110,16 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Tue May 9 2006 Mihai Ibanescu 1.2-2 +- Dropped the DESTDIR patch since it was not accepted upstream. +- Added -fPIC in the compiled flags, otherwise we won't be able to link + against this library. + +* Mon May 8 2006 Mihai Ibanescu 1.2-1 +- Updated to 1.2, some of the patches were already upstream +- Removed dependency on autoconf/automake since it builds just fine without + that + * Fri Apr 7 2005 Michael Schwendt - rebuilt --- adns-1.1-parsedomain.patch DELETED --- --- adns-1.1-semicolon.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 15 14:15:22 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 07:15:22 -0700 Subject: rpms/adns/devel adns.spec,1.7,1.8 sources,1.2,1.3 Message-ID: <200605151415.k4FEFOdR031805@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/adns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31786 Modified Files: adns.spec sources Log Message: grr, forgot to update the sources file Index: adns.spec =================================================================== RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- adns.spec 15 May 2006 14:13:05 -0000 1.7 +++ adns.spec 15 May 2006 14:15:22 -0000 1.8 @@ -1,6 +1,6 @@ Name: adns Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced, easy to use, asynchronous-capable DNS client library @@ -110,6 +110,9 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Mon May 15 2006 Mihai Ibanescu 1.2-3 +- Rebuilt in the devel branch + * Tue May 9 2006 Mihai Ibanescu 1.2-2 - Dropped the DESTDIR patch since it was not accepted upstream. - Added -fPIC in the compiled flags, otherwise we won't be able to link Index: sources =================================================================== RCS file: /cvs/extras/rpms/adns/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:00:46 -0000 1.2 +++ sources 15 May 2006 14:15:22 -0000 1.3 @@ -1 +1 @@ -891956e305acf5fc83b099333bf3ffd9 adns-1.1.tar.gz +4d9ad052125ddd295ee75ea608b992b7 adns-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 15 15:03:46 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 May 2006 08:03:46 -0700 Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.5, 1.6 NetworkManager-vpnc.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200605151503.k4FF3mFG001810@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1789 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Mon May 15 2006 Dan Williams 0.6.2-1 - New release for NM 0.6.2 compat Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Mar 2006 21:34:47 -0000 1.5 +++ .cvsignore 15 May 2006 15:03:46 -0000 1.6 @@ -2,3 +2,4 @@ NetworkManager-vpnc-0.3.tar.gz NetworkManager-vpnc-0.5.0.tar.gz NetworkManager-vpnc-0.6.0.tar.gz +NetworkManager-vpnc-0.6.2.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- NetworkManager-vpnc.spec 21 Apr 2006 14:34:17 -0000 1.9 +++ NetworkManager-vpnc.spec 15 May 2006 15:03:46 -0000 1.10 @@ -1,4 +1,4 @@ -%define nm_version 0.6.0 +%define nm_version 0.6.2 %define dbus_version 0.60 %define gtk2_version 2.6.0 %define vpnc_version 0.3.3-3 @@ -6,8 +6,8 @@ Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.6.0 -Release: 3%{?dist} +Version: 0.6.2 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -53,7 +53,7 @@ rm -f %{buildroot}%{_libdir}/lib*.la rm -f %{buildroot}%{_libdir}/lib*.a -#%find_lang %{name} +%find_lang %{name} %clean rm -rf %{buildroot} @@ -72,8 +72,7 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor fi -#%files -f %{name}.lang -%files +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README @@ -88,6 +87,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Mon May 15 2006 Dan Williams 0.6.2-1 +- New release for NM 0.6.2 compat + * Fri Apr 21 2006 Dan Williams 0.6.0-3 - Add dist tag to RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Mar 2006 21:34:47 -0000 1.5 +++ sources 15 May 2006 15:03:46 -0000 1.6 @@ -1 +1 @@ -ca50e94e775243965b5df36a26c45d42 NetworkManager-vpnc-0.6.0.tar.gz +638045ff8bb5b587a59e579bd036cc1a NetworkManager-vpnc-0.6.2.tar.gz From fedora-extras-commits at redhat.com Mon May 15 15:04:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 May 2006 08:04:58 -0700 Subject: rpms/NetworkManager-vpnc/FC-5 NetworkManager-vpnc.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605151505.k4FF50VD001878@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1859 Modified Files: NetworkManager-vpnc.spec sources Log Message: * Mon May 15 2006 Dan Williams 0.6.2-1 - New release for NM 0.6.2 compat Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-5/NetworkManager-vpnc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- NetworkManager-vpnc.spec 21 Apr 2006 14:33:19 -0000 1.8 +++ NetworkManager-vpnc.spec 15 May 2006 15:04:58 -0000 1.9 @@ -1,4 +1,4 @@ -%define nm_version 0.6.0 +%define nm_version 0.6.2 %define dbus_version 0.60 %define gtk2_version 2.6.0 %define vpnc_version 0.3.3-3 @@ -6,8 +6,8 @@ Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.6.0 -Release: 3%{?dist} +Version: 0.6.2 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -53,7 +53,7 @@ rm -f %{buildroot}%{_libdir}/lib*.la rm -f %{buildroot}%{_libdir}/lib*.a -#%find_lang %{name} +%find_lang %{name} %clean rm -rf %{buildroot} @@ -72,8 +72,7 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor fi -#%files -f %{name}.lang -%files +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README @@ -88,6 +87,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Mon May 15 2006 Dan Williams 0.6.2-1 +- New release for NM 0.6.2 compat + * Fri Apr 21 2006 Dan Williams 0.6.0-3 - Add dist tag to RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Mar 2006 21:34:47 -0000 1.5 +++ sources 15 May 2006 15:04:58 -0000 1.6 @@ -1 +1 @@ -ca50e94e775243965b5df36a26c45d42 NetworkManager-vpnc-0.6.0.tar.gz +638045ff8bb5b587a59e579bd036cc1a NetworkManager-vpnc-0.6.2.tar.gz From fedora-extras-commits at redhat.com Mon May 15 15:11:11 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 08:11:11 -0700 Subject: rpms/duplicity/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE duplicity.spec, 1.6, NONE sources, 1.2, NONE Message-ID: <200605151511.k4FFBD0m002023@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/duplicity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1993/duplicity/devel Added Files: dead.package Removed Files: .cvsignore Makefile duplicity.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- duplicity.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 15:11:12 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 08:11:12 -0700 Subject: rpms/ots/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE ots-0.2.0-nodocs.patch, 1.1, NONE ots-0.4.2-gcc4.patch, 1.1, NONE ots.spec, 1.4, NONE sources, 1.2, NONE Message-ID: <200605151511.k4FFBE2C002026@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1993/ots/devel Added Files: dead.package Removed Files: .cvsignore Makefile ots-0.2.0-nodocs.patch ots-0.4.2-gcc4.patch ots.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- ots-0.2.0-nodocs.patch DELETED --- --- ots-0.4.2-gcc4.patch DELETED --- --- ots.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 15:31:07 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 15 May 2006 08:31:07 -0700 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.16,1.17 Message-ID: <200605151531.k4FFV9n2002142@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2125 Modified Files: python-matplotlib.spec Log Message: Rebuild for new numpy Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-matplotlib.spec 16 Mar 2006 16:29:16 -0000 1.16 +++ python-matplotlib.spec 15 May 2006 15:31:06 -0000 1.17 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.87.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -90,6 +90,9 @@ %{python_sitearch}/matplotlib/backends/_tkagg.so %changelog +* Mon May 15 2006 Orion Poplawski 0.87.2-2 +- Rebuild for new numpy + * Tue Mar 7 2006 Orion Poplawski 0.87.2-1 - Update to 0.87.2 From fedora-extras-commits at redhat.com Mon May 15 15:32:00 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 15 May 2006 08:32:00 -0700 Subject: rpms/python-matplotlib/FC-5 python-matplotlib.spec,1.16,1.17 Message-ID: <200605151532.k4FFW2Js002209@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192 Modified Files: python-matplotlib.spec Log Message: Rebuild for new numpy Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-5/python-matplotlib.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-matplotlib.spec 16 Mar 2006 16:29:16 -0000 1.16 +++ python-matplotlib.spec 15 May 2006 15:32:00 -0000 1.17 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.87.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -90,6 +90,9 @@ %{python_sitearch}/matplotlib/backends/_tkagg.so %changelog +* Mon May 15 2006 Orion Poplawski 0.87.2-2 +- Rebuild for new numpy + * Tue Mar 7 2006 Orion Poplawski 0.87.2-1 - Update to 0.87.2 @@ -110,7 +113,7 @@ * Thu Dec 22 2005 Orion Poplawski 0.85-2 - Rebuild -* Sun Nov 20 2005 Orion Poplawski 0.85-1 + Sun Nov 20 2005 Orion Poplawski 0.85-1 - New upstream version 0.85 * Mon Sep 19 2005 Orion Poplawski 0.84-1 From fedora-extras-commits at redhat.com Mon May 15 15:46:48 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:46:48 -0700 Subject: rpms/gprolog - New directory Message-ID: <200605151546.k4FFkol5002373@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2347/gprolog Log Message: Directory /cvs/extras/rpms/gprolog added to the repository From fedora-extras-commits at redhat.com Mon May 15 15:46:48 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:46:48 -0700 Subject: rpms/gprolog/devel - New directory Message-ID: <200605151546.k4FFkowp002376@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2347/gprolog/devel Log Message: Directory /cvs/extras/rpms/gprolog/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 15:47:10 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:47:10 -0700 Subject: rpms/gprolog Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151547.k4FFlCOf002425@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2392 Added Files: Makefile import.log Log Message: Setup of module gprolog --- NEW FILE Makefile --- # Top level Makefile for module gprolog all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 15:47:10 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:47:10 -0700 Subject: rpms/gprolog/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151547.k4FFlCnr002428@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2392/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gprolog --- NEW 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 May 15 15:48:38 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:48:38 -0700 Subject: rpms/gprolog/devel gprolog-1.2.19-gcc4.patch, NONE, 1.1 gprolog-1.2.19-noexecstack.patch, NONE, 1.1 gprolog-1.2.19-test.patch, NONE, 1.1 gprolog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151548.k4FFme1b002518@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2471/devel Modified Files: .cvsignore sources Added Files: gprolog-1.2.19-gcc4.patch gprolog-1.2.19-noexecstack.patch gprolog-1.2.19-test.patch gprolog.spec Log Message: auto-import gprolog-1.2.19-5 on branch devel from gprolog-1.2.19-5.src.rpm gprolog-1.2.19-gcc4.patch: --- NEW FILE gprolog-1.2.19-gcc4.patch --- --- gprolog-1.2.19.orig/src/BipsFD/fd_bool_c.c 2005-06-14 03:40:09.000000000 +1200 +++ gprolog-1.2.19/src/BipsFD/fd_bool_c.c 2006-01-23 09:46:19.000000000 +1300 @@ -201,6 +201,8 @@ static void Fd_Bool_Initializer(void) { + SET_OBJ_CHAIN_STOP; + bool_tbl[NOT] = Functor_Arity(Create_Atom("#\\"), 1); bool_tbl[EQUIV] = Functor_Arity(Create_Atom("#<=>"), 2); --- gprolog-1.2.19.orig/src/BipsFD/math_supp.c 2005-06-14 03:40:10.000000000 +1200 +++ gprolog-1.2.19/src/BipsFD/math_supp.c 2006-01-23 09:46:39.000000000 +1300 @@ -206,6 +206,8 @@ static void Math_Supp_Initializer(void) { + SET_OBJ_CHAIN_STOP; + arith_tbl[PLUS_1] = Functor_Arity(ATOM_CHAR('+'), 1); arith_tbl[PLUS_2] = Functor_Arity(ATOM_CHAR('+'), 2); arith_tbl[MINUS_1] = Functor_Arity(ATOM_CHAR('-'), 1); --- gprolog-1.2.19.orig/src/BipsPl/all_solut_c.c 2005-06-14 03:40:10.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/all_solut_c.c 2006-01-23 09:47:09.000000000 +1300 @@ -123,6 +123,8 @@ static void All_Solut_Initializer(void) { + SET_OBJ_CHAIN_STOP; + exist_2 = Functor_Arity(ATOM_CHAR('^'), 2); } --- gprolog-1.2.19.orig/src/BipsPl/arith_inl_c.c 2005-06-14 03:40:10.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/arith_inl_c.c 2006-01-23 09:47:20.000000000 +1300 @@ -99,6 +99,8 @@ static void Arith_Initializer(void) { + SET_OBJ_CHAIN_STOP; + ArithInf arith_info; arith_tbl = Hash_Alloc_Table(START_ARITH_TBL_SIZE, sizeof(ArithInf)); --- gprolog-1.2.19.orig/src/BipsPl/bc_supp.c 2005-06-14 03:40:10.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/bc_supp.c 2006-01-23 09:47:35.000000000 +1300 @@ -283,6 +283,8 @@ static void Byte_Code_Initializer(void) { + SET_OBJ_CHAIN_STOP; + BCWord *p = op_tbl; Op_In_Tbl("get_variable", GET_X_VARIABLE); --- gprolog-1.2.19.orig/src/BipsPl/debugger_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/debugger_c.c 2006-01-23 09:47:53.000000000 +1300 @@ -164,6 +164,8 @@ static void Debug_Initializer(void) { + SET_OBJ_CHAIN_STOP; + New_Object(My_System_Directives, NULL); } --- gprolog-1.2.19.orig/src/BipsPl/dynam_supp.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/dynam_supp.c 2006-01-23 09:20:39.000000000 +1300 @@ -601,7 +601,8 @@ dyn = scan->dyn; if (dyn->first_erased_cl) /* we must keep it - free impossible */ - (unsigned long) (dyn->first_erased_cl) |= 1; /* mark it */ + dyn->first_erased_cl = (DynCInf *) + ((unsigned long) (dyn->first_erased_cl) | 1); /* mark it */ } --- gprolog-1.2.19.orig/src/BipsPl/error_supp.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/error_supp.c 2006-01-23 09:48:04.000000000 +1300 @@ -117,6 +117,8 @@ static void Error_Supp_Initializer(void) { + SET_OBJ_CHAIN_STOP; + type_atom = Create_Atom("atom"); type_atomic = Create_Atom("atomic"); type_byte = Create_Atom("byte"); --- gprolog-1.2.19.orig/src/BipsPl/expand_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/expand_c.c 2006-01-23 09:48:16.000000000 +1300 @@ -92,6 +92,8 @@ static void Expand_Initializer(void) { + SET_OBJ_CHAIN_STOP; + int atom_dcg; atom_dcg = Create_Atom("-->"); --- gprolog-1.2.19.orig/src/BipsPl/flag_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/flag_c.c 2006-01-23 09:48:33.000000000 +1300 @@ -77,7 +77,6 @@ static int atom_on; static int atom_off; -static int atom_error; static int atom_warning; static int atom_fail; @@ -118,6 +117,8 @@ static void Flag_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_flag_tbl[FLAG_BOUNDED] = Create_Atom("bounded"); atom_flag_tbl[FLAG_MAX_INTEGER] = Create_Atom("max_integer"); atom_flag_tbl[FLAG_MIN_INTEGER] = Create_Atom("min_integer"); --- gprolog-1.2.19.orig/src/BipsPl/foreign_supp.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/foreign_supp.c 2006-01-23 09:48:42.000000000 +1300 @@ -98,6 +98,8 @@ static void Foreign_Initializer(void) { + SET_OBJ_CHAIN_STOP; + goal_H = H; H = H + MAX_ARITY + 1; --- gprolog-1.2.19.orig/src/BipsPl/g_var_inl_c.c 2005-06-16 05:04:06.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/g_var_inl_c.c 2006-01-23 09:49:06.000000000 +1300 @@ -167,6 +167,8 @@ static void G_Var_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_g_array = Create_Atom("g_array"); atom_g_array_auto = Create_Atom("g_array_auto"); atom_g_array_extend = Create_Atom("g_array_extend"); --- gprolog-1.2.19.orig/src/BipsPl/oper_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/oper_c.c 2006-01-23 09:49:19.000000000 +1300 @@ -86,6 +86,8 @@ static void Oper_Initializer(void) { + SET_OBJ_CHAIN_STOP; + char *a[7] = { "fx", "fy", "xf", "yf", "xfx", "xfy", "yfx" }; int i; --- gprolog-1.2.19.orig/src/BipsPl/os_interf_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/os_interf_c.c 2006-01-23 09:49:33.000000000 +1300 @@ -94,8 +94,6 @@ static int atom_dt; -static int atom_read; -static int atom_write; static int atom_execute; static int atom_search; @@ -138,6 +136,8 @@ static void Os_Interf_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_dt = Create_Atom("dt"); atom_read = Create_Atom("read"); --- gprolog-1.2.19.orig/src/BipsPl/parse_supp.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/parse_supp.c 2006-01-23 09:49:53.000000000 +1300 @@ -124,6 +124,8 @@ static void Parse_Supp_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_var = Create_Atom("var"); atom_string = Create_Atom("string"); atom_punct = Create_Atom("punct"); --- gprolog-1.2.19.orig/src/BipsPl/pretty_c.c 2005-06-14 03:40:12.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/pretty_c.c 2006-01-23 09:50:07.000000000 +1300 @@ -112,6 +112,8 @@ static void Pretty_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_clause = Create_Atom(":-"); atom_dcg = Create_Atom("-->"); atom_if = Create_Atom("->"); --- gprolog-1.2.19.orig/src/BipsPl/sockets_c.c 2005-06-14 03:40:12.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/sockets_c.c 2006-01-23 09:50:20.000000000 +1300 @@ -100,6 +100,8 @@ static void Socket_Initializer(void) { + SET_OBJ_CHAIN_STOP; + #ifdef _WIN32 WORD versReqstd = MAKEWORD( 2, 2); // Current Winsock 2 DLL's WSADATA wsaData; --- gprolog-1.2.19.orig/src/BipsPl/sort_c.c 2005-06-14 03:40:12.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/sort_c.c 2006-01-23 09:50:31.000000000 +1300 @@ -68,6 +68,8 @@ static void Sort_Initializer(void) { + SET_OBJ_CHAIN_STOP; + minus_2 = Functor_Arity(ATOM_CHAR('-'), 2); } --- gprolog-1.2.19.orig/src/BipsPl/write_supp.c 2005-06-14 03:40:12.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/write_supp.c 2006-01-23 09:50:54.000000000 +1300 @@ -143,6 +143,8 @@ static void Write_Supp_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_dots = Create_Atom("..."); curly_brackets_1 = Functor_Arity(atom_curly_brackets, 1); --- gprolog-1.2.19.orig/src/EngineFD/fd_inst.h 2005-06-14 03:40:14.000000000 +1200 +++ gprolog-1.2.19/src/EngineFD/fd_inst.h 2006-01-23 09:52:35.000000000 +1300 @@ -111,8 +111,8 @@ #define CHAIN_RECORD_FRAME_SIZE 2 -#define CF_Pointer(rec_adr) ((WamWord *) (rec_adr[0])) -#define Next_Chain(rec_adr) ((WamWord *) (rec_adr[1])) +#define CF_Pointer(rec_adr) (*(WamWord **) &(rec_adr[0])) +#define Next_Chain(rec_adr) (*(WamWord **) &(rec_adr[1])) @@ -123,9 +123,9 @@ #define OFFSET_OF_OPTIM_POINTER 1 /* this offset must corresponds to */ -#define AF_Pointer(cf) ((WamWord *) (cf[0])) -#define Optim_Pointer(cf) ((WamWord *) (cf[1])) /* this cell */ -#define Cstr_Address(cf) ((long (*)()) (cf[2])) +#define AF_Pointer(cf) (*(WamWord **) &(cf[0])) +#define Optim_Pointer(cf) (*(WamWord **) &(cf[1])) /* this cell */ +#define Cstr_Address(cf) (*(long (**)()) &(cf[2])) --- gprolog-1.2.19.orig/src/EnginePl/obj_chain.c 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/obj_chain.c 2006-01-23 09:40:36.000000000 +1300 @@ -24,6 +24,8 @@ /* $Id: gprolog-1.2.19-gcc4.patch,v 1.1 2006/03/21 08:28:26 keri Exp $ */ +#define OBJ_CHAIN 1 + #include #include "obj_chain.h" @@ -181,7 +183,7 @@ { if (p->magic1 != OBJ_CHAIN_MAGIC_1 || p->magic2 != OBJ_CHAIN_MAGIC_2 || (q = p->next) < (ObjChain **) &obj_chain_begin - || q > &obj_chain_end || *q != p) + || q > &obj_chain_end) { #ifdef DEBUG #if 0 --- gprolog-1.2.19.orig/src/EnginePl/obj_chain.h 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/obj_chain.h 2006-01-23 09:31:49.000000000 +1300 @@ -83,18 +83,24 @@ #define ATTR_TO_KEEP_UNREF_STATIC_VAR __attribute__ ((unused)) #endif +#ifdef OBJ_CHAIN +ObjChain *obj_chain_stop_extern = NULL; +#else + #ifdef OBJ_INIT static void (OBJ_INIT) (); #ifndef _MSC_VER -extern ObjChain *obj_chain_stop; +static ObjChain obj_chain_start_mark; + +static ObjChain *obj_chain_stop = &obj_chain_start_mark; static ObjChain obj_chain_start ATTR_TO_KEEP_UNREF_STATIC_VAR = { OBJ_CHAIN_MAGIC_1, OBJ_CHAIN_MAGIC_2, &obj_chain_stop, OBJ_INIT }; -static ObjChain *obj_chain_stop = &obj_chain_start; +#define SET_OBJ_CHAIN_STOP {} #if 0 /* antoher way to force to keep the chain : a fct using obj_chain_start which references the initializer function (OBJ_INIT) */ @@ -114,3 +120,5 @@ #endif /* _MSC_VER */ #endif /* OBJ_INIT */ + +#endif /* OBJ_CHAIN */ --- gprolog-1.2.19.orig/src/EnginePl/test_oc_defs.h 2005-06-14 03:13:43.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/test_oc_defs.h 2006-01-23 09:45:21.000000000 +1300 @@ -25,6 +25,7 @@ \ static void Init_Tables() \ { \ + SET_OBJ_CHAIN_STOP; \ printf("object <%s> found\n",name); \ printf(" start at:%#lx\n",(long) &obj_chain_start); \ printf(" &name:%#lx\n",(long) &name); \ --- gprolog-1.2.19.orig/src/EnginePl/wam_inst.h 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/wam_inst.h 2006-01-23 09:16:11.000000000 +1300 @@ -67,10 +67,10 @@ #define ENVIR_STATIC_SIZE 3 -#define CPE(e) ((WamCont) (e[-1])) -#define BCIE(e) ((WamWord) (e[-2])) -#define EE(e) ((WamWord *) (e[-3])) -#define Y(e, y) ((WamWord) (e[-4 - (y)])) +#define CPE(e) (*(WamCont *) &(e[-1])) +#define BCIE(e) (*(WamWord *) &(e[-2])) +#define EE(e) (*(WamWord **) &(e[-3])) +#define Y(e, y) (*(WamWord *) &(e[-4 - (y)])) #define ENVIR_NAMES {"CPE", "BCIE", "EE"} @@ -81,15 +81,15 @@ #define CHOICE_STATIC_SIZE 8 -#define ALTB(b) ((CodePtr) (b[-1])) -#define CPB(b) ((WamCont) (b[-2])) -#define BCIB(b) ((WamWord) (b[-3])) -#define EB(b) ((WamWord *) (b[-4])) -#define BB(b) ((WamWord *) (b[-5])) -#define HB(b) ((WamWord *) (b[-6])) -#define TRB(b) ((WamWord *) (b[-7])) -#define CSB(b) ((WamWord *) (b[-8])) -#define AB(b, a) ((WamWord) (b[-9 - (a)])) +#define ALTB(b) (*(CodePtr *) &(b[-1])) +#define CPB(b) (*(WamCont *) &(b[-2])) +#define BCIB(b) (*(WamWord *) &(b[-3])) +#define EB(b) (*(WamWord **) &(b[-4])) +#define BB(b) (*(WamWord **) &(b[-5])) +#define HB(b) (*(WamWord **) &(b[-6])) +#define TRB(b) (*(WamWord **) &(b[-7])) +#define CSB(b) (*(WamWord **) &(b[-8])) +#define AB(b, a) (*(WamWord *) &(b[-9 - (a)])) #define CHOICE_NAMES {"ALTB", "CPB", "BCIB", "EB", "BB", \ "HB", "TRB", "CSB"} gprolog-1.2.19-noexecstack.patch: --- NEW FILE gprolog-1.2.19-noexecstack.patch --- --- gprolog-1.2.19.orig/src/Ma2Asm/ix86_any.c 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/Ma2Asm/ix86_any.c 2006-03-05 09:26:21.000000000 +1300 @@ -164,6 +164,9 @@ void Asm_Stop(void) { + Label_Printf("#ifdef __ELF__"); + Label_Printf(".section .note.GNU-stack,\"\", at progbits"); + Label_Printf("#endif"); } --- gprolog-1.2.19.orig/src/Ma2Asm/powerpc_any.c 2005-06-14 03:40:22.000000000 +1200 +++ gprolog-1.2.19/src/Ma2Asm/powerpc_any.c 2006-03-05 09:40:34.000000000 +1300 @@ -161,6 +161,9 @@ void Asm_Stop(void) { + Label_Printf("#ifdef __ELF__"); + Label_Printf(".section .note.GNU-stack,\"\", at progbits"); + Label_Printf("#endif"); } gprolog-1.2.19-test.patch: --- NEW FILE gprolog-1.2.19-test.patch --- --- gprolog-1.2.19.orig/src/Makefile.in 2005-06-14 03:13:45.000000000 +1200 +++ gprolog-1.2.19/src/Makefile.in 2006-01-23 11:52:07.000000000 +1300 @@ -145,7 +145,8 @@ # --- CHECKS --- # check: - @echo "No checks implemented (yet)." + (cd EnginePl; $(MAKE) test_oc) || exit 1 + . ./SETVARS; (cd Ma2Asm; $(MAKE) check) || exit 1 # --- CLEAN --- # --- gprolog-1.2.19.orig/src/EnginePl/Makefile.in 2005-06-14 03:13:43.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/Makefile.in 2006-01-23 15:37:43.000000000 +1300 @@ -134,6 +134,7 @@ $(CC) @CC_EXE_NAME_OPT at test_oc@EXE_SUFFIX@ obj_begin1 at OBJ_SUFFIX@ \ $(TEST_OC_OBJS) obj_chain1 at OBJ_SUFFIX@ test_oc at OBJ_SUFFIX@ \ obj_end1 at OBJ_SUFFIX@ + ./test_oc || exit 1 clean-test_oc: rm -f obj_begin1 at OBJ_SUFFIX@ obj_chain1 at OBJ_SUFFIX@ obj_end1 at OBJ_SUFFIX@ \ --- gprolog-1.2.19.orig/src/Ma2Asm/Makefile.in 2005-06-14 03:13:45.000000000 +1200 +++ gprolog-1.2.19/src/Ma2Asm/Makefile.in 2006-01-23 13:21:58.000000000 +1300 @@ -46,19 +46,17 @@ FC=-DFAST check at OBJ_SUFFIX@: check.c - if [ "$$FC" = "Y" ]; then FCFLAGS='-DFAST'; fi; \ - $(GPLC) -C "$(CFLAGS) $$FCFLAGS" -c check.c + $(GPLC) -C "$(CFLAGS)" -c check.c check_ma at ASM_SUFFIX@: check_ma.ma ma2asm at EXE_SUFFIX@ - if [ "$$FC" = "Y" ]; then cp check_ma.ma tmp.ma; \ - else sed -e 's/ fast / /' check_ma.ma >tmp.ma; fi; \ - $(GPLC) -S --comment tmp.ma -o check_ma at ASM_SUFFIX@ + $(GPLC) -S --comment check_ma.ma -o check_ma at ASM_SUFFIX@ check_ma at OBJ_SUFFIX@: check_ma at ASM_SUFFIX@ $(GPLC) -c check_ma at ASM_SUFFIX@ check at EXE_SUFFIX@: $(CHECK_OBJS) $(CC) $(CFLAGS) @CC_EXE_NAME_OPT at check@EXE_SUFFIX@ $(CHECK_OBJS) + ./check || exit 1 clean-check: rm -f check at OBJ_SUFFIX@ check_ma at ASM_SUFFIX@ check_ma at OBJ_SUFFIX@ check at EXE_SUFFIX@ --- gprolog-1.2.19.orig/src/Ma2Asm/check.c 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/Ma2Asm/check.c 2006-01-23 21:20:11.000000000 +1300 @@ -30,24 +30,11 @@ #define IF_NO_FD_FILE #include "engine_pl.h" -#ifndef FAST /* see Makefile */ - -#ifdef FC_USED_TO_COMPILE_CORE -#warning NO FC +#ifndef FC_USED_TO_COMPILE_CORE #undef FC #define FC #endif -#elif !defined(FC_USED_TO_COMPILE_CORE) - -#error FAST defined but cannot compile for FC - -#else - -#warning WITH FC - -#endif - /*---------------------------------* * Constants * *---------------------------------*/ @@ -272,7 +259,7 @@ -void +void FC Allocate(int x) /* only to update the register for E */ { } @@ -398,7 +385,7 @@ void FC test_call_c1(void); -void +void FC test_call_c1(void) { x++; @@ -456,7 +443,7 @@ void FC test_arg_int1(int a, int b, int c, int d); -void +void FC test_arg_int1(int a, int b, int c, int d) { if (a != 12 || b != -1 || c != 4095 || d != 123456789) @@ -480,7 +467,7 @@ void FC test_arg_double1(double a, double b, double c); -void +void FC test_arg_double1(double a, double b, double c) { if (a != 12.456 || b != -1.3e-102 || c != -3.141593) @@ -504,7 +491,7 @@ void FC test_arg_string1(char *a, char *b); -void +void FC test_arg_string1(char *a, char *b) { #ifdef DEBUG @@ -533,7 +520,7 @@ void FC test_arg_mem_l1(long a, long b, long *c, long d, long e, long *f); -void +void FC test_arg_mem_l1(long a, long b, long *c, long d, long e, long *f) { if (a != 128 || b != 12345 || c != (long *) test_arg_mem_l @@ -560,7 +547,7 @@ void FC test_arg_x1(WamWord a, WamWord *b, WamWord c, WamWord *d); -void +void FC test_arg_x1(WamWord a, WamWord *b, WamWord c, WamWord *d) { if (a != 123987 || b != &X(0) || c != 987654321 || d != &X(128)) @@ -586,7 +573,7 @@ void FC test_arg_y1(WamWord a, WamWord *b, WamWord c, WamWord *d); -void +void FC test_arg_y1(WamWord a, WamWord *b, WamWord c, WamWord *d) { if (a != 1928374 || b != &Y(E, 0) || c != 456789 || d != &Y(E, 6)) @@ -613,7 +600,7 @@ void FC test_arg_fl_array1(long a, long b, long *c, long *d); -void +void FC test_arg_fl_array1(long a, long b, long *c, long *d) { #ifdef DEBUG @@ -645,7 +632,7 @@ void FC test_arg_fd_array1(double a, double b, double *c, double *d); -void +void FC test_arg_fd_array1(double a, double b, double *c, double *d) { if (a != 1.2e30 || b != -1.234567 || c != foreign_double @@ -684,7 +671,7 @@ WamWord k, WamWord *l, WamWord m, WamWord *n, double o); -void +void FC test_call_c_lot_args1(WamWord n0, WamWord n1, WamWord n2, WamWord n3, WamWord n4, WamWord n5, void (*a) (), long b, int c, int d, double e, char *f, @@ -716,7 +703,7 @@ long FC test_jump_ret1(long addr); -long +long FC test_jump_ret1(long addr) { #ifdef DEBUG @@ -733,7 +720,7 @@ void FC test_jump_ret2(void); -void +void FC test_jump_ret2(void) { #ifdef DEBUG @@ -762,7 +749,7 @@ int FC test_fail_ret1(void); -int +int FC test_fail_ret1(void) { x++; @@ -816,7 +803,7 @@ long FC test_move_ret_x1(void); -long +long FC test_move_ret_x1(void) { x++; @@ -843,7 +830,7 @@ long FC test_move_ret_y1(void); -long +long FC test_move_ret_y1(void) { x++; @@ -870,7 +857,7 @@ long FC test_move_ret_fl1(void); -long +long FC test_move_ret_fl1(void) { x++; @@ -897,7 +884,7 @@ double FC test_move_ret_fd1(void); -double +double FC test_move_ret_fd1(void) { x++; @@ -922,7 +909,7 @@ long FC test_switch_ret1(void); -long +long FC test_switch_ret1(void) { return swt[i]; @@ -931,7 +918,7 @@ void FC test_switch_ret2(int k); -void +void FC test_switch_ret2(int k) { if (k != i) @@ -968,13 +955,13 @@ Fd_Init_Engine(void) { } -int +int FC Create_Atom(char *name) { return 1; } -PredInf * +PredInf * FC Lookup_Pred(int func, int arity) { return NULL; @@ -985,7 +972,7 @@ { } AtomInf atom_tbl[1]; -void +void FC Create_Choice_Point(CodePtr codep_alt, int arity) { } --- NEW FILE gprolog.spec --- Name: gprolog Version: 1.2.19 Release: 5%{?dist} Summary: GNU Prolog is a free Prolog compiler Group: Development/Languages License: GPL URL: http://gprolog.inria.fr Source: ftp://ftp.inria.fr/INRIA/Projects/contraintes/gprolog/unstable/gprolog-1.2.19.tar.gz # the patches comming from the gentoo project. Patch1: gprolog-1.2.19-gcc4.patch Patch2: gprolog-1.2.19-noexecstack.patch Patch3: gprolog-1.2.19-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD) developed by Daniel Diaz (http://loco.inria.fr/~diaz). GNU Prolog is a very efficient native compiler producing (small) stand-alone executables. GNU-Prolog also offers a classical top-level+debugger. GNU Prolog conforms to the ISO standard for Prolog but also includes a lot of extensions (global variables, DCG, sockets, OS interface,...). GNU Prolog also includes a powerful constraint solver over finite domains with many predefined constraints+heuristics. %package examples Summary: Examples for GNU Prolog Group: Development/Languages Requires: %{name} = %{version}-%{release} %description examples Examples for GNU Prolog. %package docs Summary: Documentation for GNU Prolog Group: Documentation Requires: %{name} = %{version}-%{release} %description docs Documentation for GNU Prolog. %prep %setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 %build cd src # gprolog only acccept -O0 and don't like -fomit-frame-pointer CFLG="$(echo $RPM_OPT_FLAGS | sed -e "s/\-O2/-O0/" | \ sed -e "s/\-fomit-frame-pointer//")" # sed -i -e "s:TXT_FILES = @TXT_FILES@:TXT_FILES=:" Makefile.in ./configure \ --with-install-dir=$RPM_BUILD_ROOT%{_libdir}/gprolog-%{version} \ --without-links-dir --without-examples-dir \ --disable-fast-call --with-doc-dir=dist-doc \ --with-c-flags="$CFLG" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT cd src ( make install mkdir $RPM_BUILD_ROOT%{_bindir} cd $RPM_BUILD_ROOT%{_libdir}/gprolog-%{version}/bin for i in *; do ln -s ../lib/gprolog-%{version}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i done ) rm -f dist-doc/*.{chm,dvi,ps} rm -f dist-doc/compil-scheme.pdf rm -f dist-doc/debug-box.pdf for file in ChangeLog COPYING NEWS VERSION do rm -f $RPM_BUILD_ROOT%{_libdir}/gprolog-%{version}/$file done cd ../ExamplesPl rm -rf BINPROLOG CIAO SICSTUS rm -rf SWI WAMCC XSB YAP %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING ChangeLog NEWS PROBLEMS VERSION %{_bindir}/* %{_libdir}/gprolog-%{version} %files examples %defattr(-,root,root,-) %doc ExamplesC ExamplesFD ExamplesPl %files docs %defattr(-,root,root,-) %doc src/dist-doc/* %changelog * Mon May 15 2006 Jochen Schmitt 1.2.19-5 - Remove compil-scheme.pdf and debug-box.pdf from the docs package * Wed Apr 19 2006 Jochen Schmitt 1.2.19-3 - Delete unnecessaries files from ExamplesPI * Thu Mar 30 2006 Jochen Schmitt 1.2.19-2 - Remove sed-command - Correct typo about usable compiler options - Add comment about the source of the patches * Wed Mar 29 2006 Jochen Schmitt 1.2.19-1 - Initial RPM package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gprolog/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 15:47:10 -0000 1.1 +++ .cvsignore 15 May 2006 15:48:38 -0000 1.2 @@ -0,0 +1 @@ +gprolog-1.2.19.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gprolog/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 15:47:10 -0000 1.1 +++ sources 15 May 2006 15:48:38 -0000 1.2 @@ -0,0 +1 @@ +f884e48b48a73c0785f2e6441bf5b4d7 gprolog-1.2.19.tar.gz From fedora-extras-commits at redhat.com Mon May 15 15:48:37 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:48:37 -0700 Subject: rpms/gprolog import.log,1.1,1.2 Message-ID: <200605151548.k4FFmduq002507@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2471 Modified Files: import.log Log Message: auto-import gprolog-1.2.19-5 on branch devel from gprolog-1.2.19-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gprolog/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 15:47:09 -0000 1.1 +++ import.log 15 May 2006 15:48:37 -0000 1.2 @@ -0,0 +1 @@ +gprolog-1_2_19-5:HEAD:gprolog-1.2.19-5.src.rpm:1147708114 From fedora-extras-commits at redhat.com Mon May 15 15:57:33 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:57:33 -0700 Subject: owners owners.list,1.995,1.996 Message-ID: <200605151557.k4FFvZ2Q002694@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2675 Modified Files: owners.list Log Message: Add grplog Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.995 retrieving revision 1.996 diff -u -r1.995 -r1.996 --- owners.list 15 May 2006 05:15:51 -0000 1.995 +++ owners.list 15 May 2006 15:57:33 -0000 1.996 @@ -423,6 +423,7 @@ Fedora Extras|gphpedit|A PHP source editor for GNOME 2|rpm at timj.co.uk|extras-qa at fedoraproject.org| Fedora Extras|gpp|Gnome Photo Printer|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|gprolog|GNU Prolog Compiler|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|gpsd|Service daemon for mediating access to a GPS|matt at truch.net|extras-qa at fedoraproject.org| Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 16:00:49 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 09:00:49 -0700 Subject: comps comps-fe5.xml.in,1.50,1.51 comps-fe6.xml.in,1.13,1.14 Message-ID: <200605151600.k4FG0pU5002738@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2719 Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: Add gprolog Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- comps-fe5.xml.in 13 May 2006 07:18:37 -0000 1.50 +++ comps-fe5.xml.in 15 May 2006 16:00:49 -0000 1.51 @@ -42,6 +42,7 @@ gforth ghc git + gprolog highlight lightning hugs98 Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- comps-fe6.xml.in 13 May 2006 07:18:37 -0000 1.13 +++ comps-fe6.xml.in 15 May 2006 16:00:49 -0000 1.14 @@ -42,6 +42,7 @@ gforth ghc git + gprolog highlight hugs98 lightning From fedora-extras-commits at redhat.com Mon May 15 16:14:15 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 15 May 2006 09:14:15 -0700 Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.9,1.10 Message-ID: <200605151614.k4FGEHUc005063@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5037/FC-3 Modified Files: dnsmasq.spec Log Message: Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dnsmasq.spec 8 May 2006 17:05:40 -0000 1.9 +++ dnsmasq.spec 15 May 2006 16:14:15 -0000 1.10 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.31 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -11,7 +11,7 @@ Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" BuildRequires: dbus-devel %endif @@ -34,7 +34,7 @@ %prep %setup -q %patch0 -p1 -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif @@ -51,7 +51,7 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ %endif install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq @@ -79,7 +79,7 @@ %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %endif %{_initrddir}/dnsmasq @@ -88,6 +88,9 @@ %changelog +* Mon May 15 2006 Patrick "Jima" Laughton 2.31-1.fc3.1 +- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux + * Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 - Removed dbus config patch (now provided upstream) - Patched in init script (no longer provided upstream) From fedora-extras-commits at redhat.com Mon May 15 16:45:36 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Mon, 15 May 2006 09:45:36 -0700 Subject: rpms/dejavu-fonts/devel .cvsignore, 1.13, 1.14 dejavu-fonts.spec, 1.20, 1.21 sources, 1.13, 1.14 Message-ID: <200605151645.k4FGjcBF005352@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.6.0-1.fc6 on branch devel from dejavu-fonts-2.6.0-1.fc6.src.rpm 2.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 23 Apr 2006 17:11:24 -0000 1.13 +++ .cvsignore 15 May 2006 16:45:36 -0000 1.14 @@ -1 +1 @@ -dejavu-sfd-2.5.tar.gz +dejavu-sfd-2.6.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- dejavu-fonts.spec 23 Apr 2006 17:11:24 -0000 1.20 +++ dejavu-fonts.spec 15 May 2006 16:45:36 -0000 1.21 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion 2.5 +%define archiveversion 2.6 %define fontdir %{_datadir}/fonts/%{name} %define xsldir %{_datadir}/xml/%{name} @@ -9,7 +9,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.5.0 +Version: 2.6.0 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -161,6 +161,9 @@ %changelog +* Mon May 15 2006 Nicolas Mailhot - 2.6.0-1 +- 2.6.0 + * Sun Apr 23 2006 Nicolas Mailhot - 2.5.0-1 - 2.5.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 23 Apr 2006 17:11:25 -0000 1.13 +++ sources 15 May 2006 16:45:36 -0000 1.14 @@ -1 +1 @@ -402d2f846caa83c8067e281b3c5fa8c0 dejavu-sfd-2.5.tar.gz +aae0e562be59e57e791cd1a7273bfb8c dejavu-sfd-2.6.tar.gz From fedora-extras-commits at redhat.com Mon May 15 16:45:35 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Mon, 15 May 2006 09:45:35 -0700 Subject: rpms/dejavu-fonts import.log,1.49,1.50 Message-ID: <200605151645.k4FGjbtg005342@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.6.0-1.fc6 on branch devel from dejavu-fonts-2.6.0-1.fc6.src.rpm 2.6.0 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- import.log 23 Apr 2006 18:18:43 -0000 1.49 +++ import.log 15 May 2006 16:45:35 -0000 1.50 @@ -46,3 +46,4 @@ dejavu-fonts-2_5_0-1_fc5:FC-5:dejavu-fonts-2.5.0-1.fc5.src.rpm:1145812342 dejavu-fonts-2_5_0-1_fc4:FC-4:dejavu-fonts-2.5.0-1.fc4.src.rpm:1145812549 dejavu-fonts-2_5_0-2_fc5:FC-5:dejavu-fonts-2.5.0-2.fc5.src.rpm:1145816306 +dejavu-fonts-2_6_0-1_fc6:HEAD:dejavu-fonts-2.6.0-1.fc6.src.rpm:1147711519 From fedora-extras-commits at redhat.com Mon May 15 16:49:49 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:49:49 -0700 Subject: rpms/perl-CSS-Tiny - New directory Message-ID: <200605151649.k4FGnphS005468@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5447/perl-CSS-Tiny Log Message: Directory /cvs/extras/rpms/perl-CSS-Tiny added to the repository From fedora-extras-commits at redhat.com Mon May 15 16:49:50 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:49:50 -0700 Subject: rpms/perl-CSS-Tiny/devel - New directory Message-ID: <200605151649.k4FGnqW4005471@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5447/perl-CSS-Tiny/devel Log Message: Directory /cvs/extras/rpms/perl-CSS-Tiny/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 16:50:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:50:13 -0700 Subject: rpms/perl-CSS-Tiny Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151650.k4FGoFSp005520@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5492 Added Files: Makefile import.log Log Message: Setup of module perl-CSS-Tiny --- NEW FILE Makefile --- # Top level Makefile for module perl-CSS-Tiny all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 16:50:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:50:14 -0700 Subject: rpms/perl-CSS-Tiny/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151650.k4FGoGfH005523@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5492/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-CSS-Tiny --- NEW 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 May 15 16:50:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:50:56 -0700 Subject: rpms/perl-CSS-Tiny import.log,1.1,1.2 Message-ID: <200605151651.k4FGpSuq005590@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556 Modified Files: import.log Log Message: auto-import perl-CSS-Tiny-1.11-1 on branch devel from perl-CSS-Tiny-1.11-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-CSS-Tiny/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 16:50:13 -0000 1.1 +++ import.log 15 May 2006 16:50:56 -0000 1.2 @@ -0,0 +1 @@ +perl-CSS-Tiny-1_11-1:HEAD:perl-CSS-Tiny-1.11-1.src.rpm:1147711845 From fedora-extras-commits at redhat.com Mon May 15 16:50:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:50:57 -0700 Subject: rpms/perl-CSS-Tiny/devel perl-CSS-Tiny.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151651.k4FGpTEf005596@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556/devel Modified Files: .cvsignore sources Added Files: perl-CSS-Tiny.spec Log Message: auto-import perl-CSS-Tiny-1.11-1 on branch devel from perl-CSS-Tiny-1.11-1.src.rpm --- NEW FILE perl-CSS-Tiny.spec --- Name: perl-CSS-Tiny Version: 1.11 Release: 1%{?dist} Summary: Read/Write .css files with as little code as possible Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/CSS-Tiny/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/CSS-Tiny-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Clone) BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Clone) %description CSS::Tiny is a perl class to read and write .css stylesheets with as little code as possible, reducing load time and memory overhead. %prep %setup -q -n CSS-Tiny-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README test.css %{perl_vendorlib}/CSS/ %{_mandir}/man3/*.3pm* %changelog * Sat May 13 2006 Jose Pedro Oliveira - 1.11-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-CSS-Tiny/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 16:50:14 -0000 1.1 +++ .cvsignore 15 May 2006 16:50:57 -0000 1.2 @@ -0,0 +1 @@ +CSS-Tiny-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-CSS-Tiny/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 16:50:14 -0000 1.1 +++ sources 15 May 2006 16:50:57 -0000 1.2 @@ -0,0 +1 @@ +66fac70597a4e6628f1875037d1d2a94 CSS-Tiny-1.11.tar.gz From fedora-extras-commits at redhat.com Mon May 15 16:52:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:52:56 -0700 Subject: rpms/perl-PPI-HTML - New directory Message-ID: <200605151652.k4FGqwEs005697@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5671/perl-PPI-HTML Log Message: Directory /cvs/extras/rpms/perl-PPI-HTML added to the repository From fedora-extras-commits at redhat.com Mon May 15 16:52:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:52:56 -0700 Subject: rpms/perl-PPI-HTML/devel - New directory Message-ID: <200605151652.k4FGqwnb005700@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5671/perl-PPI-HTML/devel Log Message: Directory /cvs/extras/rpms/perl-PPI-HTML/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 16:53:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:53:12 -0700 Subject: rpms/perl-PPI-HTML Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151653.k4FGrEGq005750@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5716 Added Files: Makefile import.log Log Message: Setup of module perl-PPI-HTML --- NEW FILE Makefile --- # Top level Makefile for module perl-PPI-HTML all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 16:53:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:53:13 -0700 Subject: rpms/perl-PPI-HTML/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151653.k4FGrFY4005754@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5716/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-PPI-HTML --- NEW 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 May 15 16:53:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:53:42 -0700 Subject: rpms/perl-PPI-HTML import.log,1.1,1.2 Message-ID: <200605151653.k4FGri3o005815@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5782 Modified Files: import.log Log Message: auto-import perl-PPI-HTML-1.07-1 on branch devel from perl-PPI-HTML-1.07-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-PPI-HTML/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 16:53:12 -0000 1.1 +++ import.log 15 May 2006 16:53:42 -0000 1.2 @@ -0,0 +1 @@ +perl-PPI-HTML-1_07-1:HEAD:perl-PPI-HTML-1.07-1.src.rpm:1147712014 From fedora-extras-commits at redhat.com Mon May 15 16:53:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:53:43 -0700 Subject: rpms/perl-PPI-HTML/devel perl-PPI-HTML.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151653.k4FGrjM3005820@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5782/devel Modified Files: .cvsignore sources Added Files: perl-PPI-HTML.spec Log Message: auto-import perl-PPI-HTML-1.07-1 on branch devel from perl-PPI-HTML-1.07-1.src.rpm --- NEW FILE perl-PPI-HTML.spec --- Name: perl-PPI-HTML Version: 1.07 Release: 1%{?dist} Summary: Generate syntax-hightlighted HTML for Perl using PPI Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/PPI-HTML/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-HTML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(CSS::Tiny) BuildRequires: perl(Params::Util) => 0.05 BuildRequires: perl(PPI) BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description PPI::HTML converts Perl documents into syntax highlighted HTML pages. %prep %setup -q -n PPI-HTML-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README %{_bindir}/* %{perl_vendorlib}/PPI/ %{_mandir}/man3/*.3pm* %changelog * Sat May 13 2006 Jose Pedro Oliveira - 1.07-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PPI-HTML/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 16:53:13 -0000 1.1 +++ .cvsignore 15 May 2006 16:53:43 -0000 1.2 @@ -0,0 +1 @@ +PPI-HTML-1.07.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PPI-HTML/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 16:53:13 -0000 1.1 +++ sources 15 May 2006 16:53:43 -0000 1.2 @@ -0,0 +1 @@ +c2858d87c0e12ab87845606957bcd122 PPI-HTML-1.07.tar.gz From fedora-extras-commits at redhat.com Mon May 15 16:58:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:58:03 -0700 Subject: owners owners.list,1.996,1.997 Message-ID: <200605151658.k4FGw5os005928@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5911 Modified Files: owners.list Log Message: New packages: perl-CSS-Tiny (#191619), perl-PPI-HTML (#191620) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.996 retrieving revision 1.997 diff -u -r1.996 -r1.997 --- owners.list 15 May 2006 15:57:33 -0000 1.996 +++ owners.list 15 May 2006 16:58:03 -0000 1.997 @@ -972,6 +972,7 @@ Fedora Extras|perl-Crypt-Random|Cryptographically Secure, True Random Number Generator|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-RSA|RSA public-key cryptosystem|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-CSS-Tiny|Read/Write .css files with as little code as possible|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Curses|Perl bindings for ncurses|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1155,6 +1156,7 @@ Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-PPI-HTML|Generate syntax-hightlighted HTML for Perl using PPI|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 15 17:10:37 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 15 May 2006 10:10:37 -0700 Subject: fedora-security/audit fc4,1.244,1.245 fc5,1.158,1.159 Message-ID: <200605151710.k4FHAbWB008346@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8326 Modified Files: fc4 fc5 Log Message: Note a new vnc issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- fc4 15 May 2006 11:55:01 -0000 1.244 +++ fc4 15 May 2006 17:10:35 -0000 1.245 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- fc5 15 May 2006 11:55:01 -0000 1.158 +++ fc5 15 May 2006 17:10:35 -0000 1.159 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Mon May 15 17:14:25 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:14:25 -0700 Subject: rpms/swaks - New directory Message-ID: <200605151714.k4FHER1D008462@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8441/swaks Log Message: Directory /cvs/extras/rpms/swaks added to the repository From fedora-extras-commits at redhat.com Mon May 15 17:14:26 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:14:26 -0700 Subject: rpms/swaks/devel - New directory Message-ID: <200605151714.k4FHESxj008468@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8441/swaks/devel Log Message: Directory /cvs/extras/rpms/swaks/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 17:14:38 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:14:38 -0700 Subject: rpms/swaks Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151714.k4FHEebf008545@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8517 Added Files: Makefile import.log Log Message: Setup of module swaks --- NEW FILE Makefile --- # Top level Makefile for module swaks all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 17:14:38 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:14:38 -0700 Subject: rpms/swaks/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151714.k4FHEeYJ008548@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8517/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module swaks --- NEW 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 May 15 17:15:01 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:15:01 -0700 Subject: rpms/swaks import.log,1.1,1.2 Message-ID: <200605151715.k4FHF31G008623@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8584 Modified Files: import.log Log Message: auto-import swaks-20050709.1-5 on branch devel from swaks-20050709.1-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/swaks/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 17:14:38 -0000 1.1 +++ import.log 15 May 2006 17:15:00 -0000 1.2 @@ -0,0 +1 @@ +swaks-20050709_1-5:HEAD:swaks-20050709.1-5.src.rpm:1147713294 From fedora-extras-commits at redhat.com Mon May 15 17:15:01 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:15:01 -0700 Subject: rpms/swaks/devel swaks.20050709.1,NONE,1.1 swaks.spec,NONE,1.1 Message-ID: <200605151715.k4FHF3Ci008626@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8584/devel Added Files: swaks.20050709.1 swaks.spec Log Message: auto-import swaks-20050709.1-5 on branch devel from swaks-20050709.1-5.src.rpm --- NEW FILE swaks.20050709.1 --- #!/usr/bin/perl use strict; use IO::Socket; use Sys::Hostname; use Getopt::Long; use Time::Local; my($p_name) = $0 =~ m|/?([^/]+)$|; my $p_version = "20050709.1"; my $p_usage = "Usage: $p_name [--help|--version] (see --help for details)"; my $p_cp = < 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 EOM ext_usage(); # before we do anything else, check for --help my %O = (); my $user = get_username(); my $hostname = get_hostname(); $| = 1; Getopt::Long::Configure("bundling_override"); GetOptions( 'l|input-file=s' => \$O{option_file}, # (l)ocation of input data 'f|from:s' => \$O{mail_from}, # envelope-(f)rom address 't|to:s' => \$O{mail_to}, # envelope-(t)o address 'h|helo|ehlo:s' => \$O{mail_helo}, # (h)elo string 's|server:s' => \$O{mail_server}, # (s)erver to use 'p|port:i' => \$O{mail_port}, # (p)ort to use 'd|data:s' => \$O{mail_data}, # (d)ata portion ('\n' for newlines) 'timeout:s' => \$O{timeout}, # timeout for each trans (def 30s) 'g' => \$O{data_on_stdin}, # (g)et data on stdin 'm' => \$O{emulate_mail}, # emulate (M)ail command 'q|quit|quit-after=s' => \$O{quit_after}, # (q)uit after 'n|suppress-data' => \$O{supress_data}, # do (n)ot print data portion 'a|auth:s' => \$O{auth}, # force auth, exit if not supported 'au|auth-user:s' => \$O{auth_user}, # user for auth 'ap|auth-password:s' => \$O{auth_pass}, # pass for auth 'am|auth-map=s' => \$O{auth_map}, # auth type map 'ahp|auth-hide-password' => \$O{auth_hidepw}, # hide passwords when possible 'apt|auth-plaintext' => \$O{auth_showpt}, # translate base64 strings 'ao|auth-optional:s' => \$O{auth_optional}, # auth optional (ignore failure) 'support' => \$O{get_support}, # report capabilties 'li|local-interface:s' => \$O{lint}, # local interface to use 'tls' => \$O{tls}, # use TLS 'tlso|tls-optional' => \$O{tls_optional}, # use tls if available 'tlsc|tls-on-connect' => \$O{tls_on_connect}, # use tls if available 'S|silent+' => \$O{silent}, # suppress output to varying degrees 'nsf|no-strip-from' => \$O{no_strip_from}, # Don't strip From_ line from DATA 'nth|no-hints' => \$O{no_hints}, # Don't show transaction hints 'hr|hide-receive' => \$O{hide_receive}, # Don't show reception lines 'hs|hide-send' => \$O{hide_send}, # Don't show sending lines 'stl|show-time-lapse:s' => \$O{show_time_lapse}, # print lapse for send/recv 'ndf|no-data-fixup' => \$O{no_data_fixup}, # don't touch the data 'pipe:s' => \$O{pipe_cmd}, # command to communicate with 'socket:s' => \$O{socket}, # unix doain socket to talk to 'dump' => \$O{dump_args} # build options and dump ) || exit(1); load_modules({ 'Basic AUTH' => ['MIME::Base64'], 'AUTH CRAM-MD5' => ['Digest::MD5'], 'AUTH NTLM' => ['Authen::NTLM'], 'AUTH DIGEST-MD5' => ['Authen::DigestMD5'], 'MX lookups' => ['Net::DNS'], 'High resolution timing' => ['Time::HiRes'], 'TLS' => ['Net::SSLeay'], }, \%G::modules); exit(0) if ($O{get_support}); # --support means report capabilities only # We need to fix things up a bit and set a couple of global options my $opts = process_args(\%O); if ($G::dump_args) { print "type = $G::link{type}\n"; print "server = $G::link{server}\n"; print "socket = $G::link{socket}\n"; print "process = $G::link{process}\n"; print "from = $opts->{from}\n"; print "to = $opts->{to}\n"; print "helo = $opts->{helo}\n"; print "port = $G::link{port}\n"; print "tls = "; if ($G::tls) { print "starttls (", $G::tls_optional ? 'optional' : 'required', ")\n"; } elsif ($G::tls_on_connect) { print "on connect (required)\n"; } else { print "no\n"; } print "auth = "; if ($opts->{a_type}) { print $G::auth_optional ? 'optional' : 'yes', " type='$opts->{a_type}' ", "user='$opts->{a_user}' pass='$opts->{a_pass}'\n"; } else { print "no\n"; } print "quit after = $G::quit_after\n"; print "local int = $G::link{lint}\n"; print "timeout = $G::link{timeout}\n"; print "data = <<.\n$opts->{data}\n"; exit(0); } # we're going to abstract away the actual connection layer from the mail # process, so move the act of connecting into its own sub. The sub will # set info in global hash %G::link # XXX instead of passing raw data, have processs_opts create a link_data # XXX hash that we can pass verbatim here open_link(); sendmail($opts->{from}, $opts->{to}, $opts->{helo}, $opts->{data}, $opts->{a_user}, $opts->{a_pass}, $opts->{a_type}); teardown_link(); exit(0); sub teardown_link { if ($G::link{type} eq 'socket-inet' || $G::link{type} eq 'socket-unix') { # XXX need anything special for tls teardown? close($G::link{sock}); print_transaction(11, "Connection closed by foreign host."); } elsif ($G::link{type} eq 'pipe') { delete($SIG{PIPE}); $SIG{CHLD} = 'IGNORE'; close($G::link{sock}{wr}); close($G::link{sock}{re}); print_transaction(11, "Connection closed with child process."); } } sub open_link { if ($G::link{type} eq 'socket-inet') { print_transaction(11, "Trying $G::link{server}:$G::link{port}..."); $@ = ""; $G::link{sock} = IO::Socket::INET->new(PeerAddr => $G::link{server}, PeerPort => $G::link{port}, Proto => 'tcp', Timeout => $G::link{timeout}, LocalAddr => $G::link{lint}); if ($@) { print_transaction(12, "Error connecting $G::link{lint} " . "to $G::link{server}:$G::link{port}:\n\t$@"); exit(2); } print_transaction(11, "Connected to $G::link{server}."); } elsif ($G::link{type} eq 'socket-unix') { print_transaction(11, "Trying $G::link{sockfile}..."); $@ = ""; $G::link{sock} = IO::Socket::UNIX->new(Peer => $G::link{sockfile}, Timeout => $G::link{timeout}, Type => SOCK_STREAM); if ($@) { print_transaction(12, "Error connecting to $G::link{sockfile}:\n\t$@"); exit(2); } print_transaction(11, "Connected to $G::link{sockfile}."); } elsif ($G::link{type} eq 'pipe') { $SIG{PIPE} = sub { print_transaction(12, "Child process went away unexpectedly, exiting"); exit(4); }; $SIG{CHLD} = sub { print_transaction(12, "Problem with child process, exiting"); exit(5); }; print_transaction(11, "Trying pipe to $G::link{process}..."); if (!try_load("IPC::Open3")) { print_transaction(12, "Couldn't load IPC::Open3 for pipe, exiting"); exit(2); } eval{ open3($G::link{sock}{wr},$G::link{sock}{re}, 0, $G::link{process}); }; if ($@) { # =~ /open3/) { print_transaction(12, "Error connecting to $G::link{process}:\n\t$@"); exit(2); } print_transaction(11, "Connected to $G::link{process}."); } else { print_transaction(12, "Unknown or unimplemented connection type " . "$G::link{type}"); exit(3); } } sub sendmail { my $from = shift; # envelope-from my $to = shift; # envelope-to my $helo = shift; # who am I? my $data = shift; # body of message (content after DATA command) my $a_user = shift; # what user to auth with? my $a_pass = shift; # what pass to auth with my $a_type = shift; # what kind of auth (this must be set to to attempt) my $ehlo = {}; # If server is esmtp, save advertised features here # start up tls if -tlsc specified if ($G::tls_on_connect) { if (start_tls()) { print_transaction(11, "TLS started w/ cipher $G::link{tls}{cipher}"); } else { print_transaction(12, "TLS startup failed ($G::link{tls}{res})"); exit(29); } } # read the server's 220 banner do_smtp_gen(undef, '220') || do_smtp_quit(1, 21); # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'connect'); # Send a HELO string do_smtp_helo($helo, $ehlo) || do_smtp_quit(1, 22); # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'first-helo'); # handle TLS here if user has requested it if ($G::tls) { do_smtp_quit(1, 29) if (!do_smtp_tls($ehlo) && !$G::tls_optional); } # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'tls'); if ($G::link{tls}{active} && $ehlo->{STARTTLS}) { # According to RFC3207, we need to forget state info and re-EHLO here $ehlo = {}; do_smtp_helo($helo, $ehlo) || do_smtp_quit(1, 32); } # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'helo'); # handle auth here if user has requested it if ($a_type) { do_smtp_quit(1, 28) if (!do_smtp_auth($ehlo, $a_type, $a_user, $a_pass) && !$G::auth_optional); } # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'auth'); # send MAIL do_smtp_gen("MAIL FROM:<$from>", '250') || do_smtp_quit(1, 23); # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'mail'); # send RCPT my $num_accepted = 0; foreach my $r (split(/,/, $to)) { $num_accepted++ if (do_smtp_rcpt($r)); } do_smtp_quit(1, 24) if (!$num_accepted); # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'rcpt'); # send DATA do_smtp_gen('DATA', '354') || do_smtp_quit(1, 25); # send the actual data do_smtp_gen($data, '250', undef, $O{supress_data}) || do_smtp_quit(1, 26); # send QUIT do_smtp_quit(0) || do_smtp_quit(1, 27); } sub start_tls { my %t = (); # This is a convenience var to access $G::link{tls}{...} $G::link{tls} = \%t; Net::SSLeay::load_error_strings(); Net::SSLeay::SSLeay_add_ssl_algorithms(); Net::SSLeay::randomize(); $t{con} = Net::SSLeay::CTX_new() || return(0); Net::SSLeay::CTX_set_options($t{con}, &Net::SSLeay::OP_ALL); # error check $t{ssl} = Net::SSLeay::new($t{con}) || return(0); Net::SSLeay::set_fd($t{ssl}, fileno($G::link{sock})); # error check? $t{active} = Net::SSLeay::connect($t{ssl}) == 1 ? 1 : 0; $t{res} = Net::SSLeay::ERR_error_string(Net::SSLeay::ERR_get_error()) if (!$t{active}); $t{cipher} = Net::SSLeay::get_cipher($t{ssl}); return($t{active}); } sub print_transaction { my $c = shift; # transaction flag my $m = shift; # message to print my $b = shift; # be brief in what we print my $o = \*STDOUT; my $f; return if (($O{hide_send} && int($c/10) == 2) || ($O{hide_receive} && int($c/10) == 3)); # global option silent controls what we echo to the terminal # 0 - print everything # 1 - don't show anything until you hit an error, then show everything # received after that (done by setting option to 0 on first error) # 2 - don't show anything but errors # >=3 - don't print anything if ($O{silent} > 0) { return if ($O{silent} >= 3); return if ($O{silent} == 2 && $c%2 != 0); if ($O{silent} == 1) { if ($c%2 != 0) { return(); } else { $O{silent} = 0; } } } # 1x is program messages # 2x is smtp send # 3x is smtp recv # x = 1 is info/normal # x = 2 is error # program info if ($c == 11) { $f = '==='; } # program error elsif ($c == 12) { $f = '***'; $o = \*STDERR; } # smtp send info elsif ($c == 21) { $f = $G::link{tls}{active} ? ' ~>' : ' ->'; } # smtp send error elsif ($c == 22) { $f = $G::link{tls}{active} ? '*~>' : '**>'; } # smtp recv info elsif ($c == 31) { $f = $G::link{tls}{active} ? '<~ ' : '<- '; } # smtp recv error elsif ($c == 32) { $f = $G::link{tls}{active} ? '<~*' : '<**'; } # something went unexpectedly else { $c = '???'; } $f .= ' '; $f = '' if ($O{no_hints} && int($c/10) != 1); if ($b) { # split to tmp list to prevent -w gripe my @t = split(/\n/ms, $m); $m = scalar(@t) . " lines sent"; } $m =~ s/\n/\n$f/msg; print $o "$f$m\n"; } sub do_smtp_quit { my $exit = shift; my $err = shift; $SIG{CHLD} = 'IGNORE'; # XXX kludge. there's a chicken and egg problem here my $r = do_smtp_gen('QUIT', '221'); if ($exit) { teardown_link(); exit $err; } return($r); } sub do_smtp_tls { my $e = shift; # ehlo config hash if (!$e->{STARTTLS}) { print_transaction(12, "STARTTLS not supported"); return $G::tls_optional ? 1 : 0; } elsif (!do_smtp_gen("STARTTLS", '220')) { return $G::tls_optional ? 1 : 0; } elsif (!start_tls()) { print_transaction(12, "TLS startup failed ($G::link{tls}{res})"); return $G::tls_optional ? 1 : 0; } print_transaction(11, "TLS started w/ cipher $G::link{tls}{cipher}"); return(1); } sub do_smtp_auth { my $e = shift; # ehlo config hash my $at = shift; # auth type my $au = shift; # auth user my $ap = shift; # auth password # the auth_optional stuff is handled higher up, so tell the truth about # failing here if (($at ne 'ANY' && !$e->{AUTH}{$at}) || !$e->{AUTH}) { print_transaction(12, "$at authentication not supported"); return(0); } if ($G::modules{"Digest::MD5"}) { foreach my $type (@{$G::auth_map_t{'CRAM-MD5'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_cram($au, $ap, $type)); } } } if ($G::modules{"Authen::DigestMD5"}) { foreach my $type (@{$G::auth_map_t{'DIGEST-MD5'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_digest($au, $ap, $type)); } } } if ($G::modules{"Authen::NTLM"}) { foreach my $type (@{$G::auth_map_t{'NTLM'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_ntlm($au, $ap, $type)); } } } foreach my $type (@{$G::auth_map_t{'PLAIN'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_plain($au, $ap, $type)); } } foreach my $type (@{$G::auth_map_t{'LOGIN'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_login($au, $ap, $type)); } } print_transaction(12, "No authentication type succeeded"); return(0); } sub do_smtp_auth_ntlm { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth type (since NTLM might be SPA or MSN) my $r = ''; # will store smtp response my $domain; ($u,$domain) = split(/%/, $u); my $auth_string = "AUTH $as"; do_smtp_gen($auth_string, '334') || return(0); my $d = decode_base64(Authen::NTLM::ntlm()); $auth_string = encode_base64("$d", ''); do_smtp_gen($auth_string, '334', \$r, '', $G::auth_showpt ? "$d" : '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $r =~ s/^....//; # maybe something a little better here? Authen::NTLM::ntlm_domain($domain); Authen::NTLM::ntlm_user($u); Authen::NTLM::ntlm_password($p); $d = decode_base64(Authen::NTLM::ntlm($r)); $auth_string = encode_base64("$d", ''); do_smtp_gen($auth_string, '235', \$r, '', $G::auth_showpt ? "$d" : '') || return(0); return(1); } sub do_smtp_auth_digest { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth string my $r = ''; # will store smtp response my $auth_string = "AUTH $as"; do_smtp_gen($auth_string, '334', \$r, '', '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $r =~ s/^....//; # maybe something a little better here? $r = decode_base64($r); my $req = Authen::DigestMD5::Request->new($r); my $res = Authen::DigestMD5::Response->new(); $res->got_request($req); # XXX using link{server} here is probably a bug, but I don;t know what else # XXX to use yet on a non-inet-socket connection $res->set('username' => $u, 'realm' => '', 'digest-uri' => "smtp/$G::link{server}"); $res->add_digest(password => $p); my $d = $res->output(); $auth_string = encode_base64("$d", ''); do_smtp_gen($auth_string, '334', \$r, '', $G::auth_showpt ? "$d" : '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $r =~ s/^....//; # maybe something a little better here? $r = decode_base64($r); $req->input($r); return(0) if (!$req->auth_ok); do_smtp_gen("", '235', undef, '', $G::auth_showpt ? "" : '') || return(0); return(1); } sub do_smtp_auth_cram { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth string my $r = ''; # will store smtp response my $auth_string = "AUTH $as"; do_smtp_gen($auth_string, '334', \$r, '', '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $r =~ s/^....//; # maybe something a little better here? my $d = get_digest($p, $r); $auth_string = encode_base64("$u $d", ''); do_smtp_gen($auth_string, '235', undef, '', $G::auth_showpt ? "$u $d" : '') || return(0); return(1); } sub do_smtp_auth_login { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth string my $z = ''; my $auth_string = "AUTH $as"; do_smtp_gen($auth_string, '334', undef, '', '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $auth_string = encode_base64($u, ''); $z = $u if ($G::auth_showpt); do_smtp_gen($auth_string, '334', undef, '', $z, $G::auth_showpt ? \&unencode_smtp : '') || return(0); $auth_string = encode_base64($p, ''); $z = $p if ($G::auth_showpt); do_smtp_gen($auth_string, '235', undef, '', $z) || return(0); return(1); } sub do_smtp_auth_plain { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth string my $auth_string = "AUTH $as " . encode_base64("\0$u\0$p", ''); my $z = ''; if ($G::auth_showpt) { $z = "AUTH $as \\0$u\\0$p"; } return(do_smtp_gen($auth_string, '235', undef, '', $z)); } sub do_smtp_helo { my $h = shift; # helo string to use my $e = shift; # this is a hashref that will be populated w/ server options my $r = ''; # this'll be populated by do_smtp_gen if (do_smtp_gen("EHLO $h", '250', \$r)) { # $ehlo is designed to hold the advertised options, but I'm not sure how # to store them all - for instance, SIZE is a simple key/value pair, but # AUTH lends itself more towards a multilevel hash. What I'm going to do # is come here and add each key in the way that makes most sense in each # case. I only need auth for now. # XXX I don't think I'm handling AUTH=LOGIN right. I think it just means # LOGIN and the = is not important - something to check if it's a problem. foreach my $l (split(/\n/, $r)) { $l =~ s/^....//; if ($l =~ /^AUTH(.*)$/) { map { $e->{AUTH}{$_} = 1 } (split(' ', $1)); } elsif ($l =~ /^STARTTLS$/) { $e->{STARTTLS} = 1; } } return(1); } elsif (do_smtp_gen("HELO $h", '250')) { return(1); } return(0); } sub do_smtp_rcpt { my $m = shift; # string of comma separated recipients my $f = 0; # The number of failures we've experienced my @a = split(/,/, $m); foreach my $addr (@a) { $f++ if (!do_smtp_gen("RCPT TO:<$addr>", '250')); } # if at least one addr succeeded, we can proceed, else we stop here return $f == scalar(@a) ? 0 : 1; } sub do_smtp_gen { my $m = shift; # string to send my $e = shift; # String we're expecting to get back my $p = shift; # this is a scalar ref, assign the server return string to it my $b = shift; # be brief in the data we send my $x = shift; # if this is populated, print this instead of $m my $c = shift; # if this is a code ref, call it on the return value b4 print my $r = ''; # This'll be the return value from transact() my $time; print_transaction(21, $x ? $x : $m, $b) if (defined($m)); if ($G::show_time_lapse) { if ($G::show_time_hires) { $time = [Time::HiRes::gettimeofday()] } else { $time = time() if ($G::show_time_lapse); } } $r = transact($m, ''); $$p = $r; if ($G::show_time_lapse) { if ($G::show_time_hires) { $time = sprintf("%0.03f", Time::HiRes::tv_interval($time, [Time::HiRes::gettimeofday()])); } else { $time = time() - $time; } print_transaction(11, "response in ${time}s"); } $r = &$c($r) if (ref($c) eq 'CODE'); if ($r !~ /^$e /m) { print_transaction(32, $r); return(0); } else { print_transaction(31, $r); return(1); } } sub transact { my $send = shift; # This is the string to send my $buff = shift; # we will store and manipulate the return value here. my $s = $G::link{sock}; # This is my IO::Socket object my($wr,$re) = ($s->{wr},$s->{re}) if ($G::link{type} eq 'pipe'); eval { local $SIG{'ALRM'} = sub { $buff = "Timeout ($G::link{timeout} secs) waiting for server response"; die; }; if (defined($send)) { if ($G::link{tls}{active}) { my $res = Net::SSLeay::write($G::link{tls}{ssl}, "$send\r\n"); } else { if ($G::link{type} eq 'pipe') { print $wr $send, "\r\n"; } else { print $s $send, "\r\n"; } } } alarm($G::link{timeout}); if ($buff) { $buff = ''; } else { # The 'do' allows for multi-line responses if ($G::link{tls}{active}) { do { $buff .= Net::SSLeay::read($G::link{tls}{ssl}); } while ($buff !~ /^\d\d\d /m); } else { do { if ($G::link{type} eq 'pipe') { $buff .= <$re>; } else { $buff .= <$s>; } } while ($buff !~ /^\d\d\d /m); } $buff =~ s/\r//msg; chomp($buff); } alarm(0); }; return($buff); } sub unencode_smtp { my $t = shift; my @t = split(' ', $t); return("$t[0] " . decode_base64($t[1])); } sub process_file { my $f = shift; my $h = shift; if (! -e "$f") { print_transaction(12, "File $f does not exist, skipping"); return; } elsif (! -f "$f") { print_transaction(12, "File $f is not a file, skipping"); return; } elsif (!open(I, "<$f")) { print_transaction(12, "Couldn't open $f, skipping... ($!)"); return; } while () { chomp; next if (/^#?\s*$/); # skip blank lines and those that start w/ '#' my($key,$value) = split(' ', $_, 2); $h->{uc($key)} = $value; } return; } sub interact { my($prompt) = shift; my($regexp) = shift; my($continue) = shift; my($response) = ''; do { print "$prompt"; chomp($response = ); } while ($regexp ne 'SKIP' && $response !~ /$regexp/); return($response); } sub get_hostname { # in some cases hostname returns value but gethostbyname doesn't. my $h = hostname(); return("") if (!$h); my $l = (gethostbyname($h))[0]; return($l || $h); } sub get_server { my $addr = shift; my $pref = -1; my $server = "localhost"; if ($addr =~ /\@\[(\d+\.\d+\.\d+\.\d+)\]$/) { # handle automatic routing of domain literals (user@[1.2.3.4]) return($1); } elsif ($addr =~ /\@\#(\d+)$/) { # handle automatic routing of decimal domain literals (user@#16909060) $addr = $1; return(($addr/(2**24))%(2**8) . '.' . ($addr/(2**16))%(2**8) . '.' .($addr/(2**8))%(2**8) . '.' . ($addr/(2**0))%(2**8)); } if (!$G::modules{"Net::DNS"}) { print_transaction(12, "MX requirement Net::DNS not installed, using $server as mail server"); return($server); } my $res = new Net::DNS::Resolver; return($server) if ($addr !~ /\@/); $addr =~ s/^.*\@([^\@]*)$/$1/; return($server) if (!$addr); $server = $addr; my @mx = mx($res, $addr); foreach my $rr (@mx) { if ($rr->preference < $pref || $pref == -1) { $pref = $rr->preference; $server = $rr->exchange; } } return($server); } sub try_load { my $mod = shift; eval("use $mod"); return $@ ? 0 : 1; } sub get_digest { my $secr = shift; my $chal = shift; my $retr = ''; my $ipad = chr(0x36); my $opad = chr(0x5c); my($isec, $osec) = undef; if ($chal !~ /^ 64) { $secr = Digest::MD5::md5($secr); } else { $secr .= chr(0) x (64 - length($secr)); } foreach my $char (split(//, $secr)) { $isec .= $char ^ $ipad; $osec .= $char ^ $opad; } map { $retr .= sprintf("%02x", ord($_)) } split(//,Digest::MD5::md5($osec.Digest::MD5::md5($isec . $chal))); return($retr); } sub load_modules { my $s = shift; my $l = shift; foreach my $act (keys %$s) { my @failed = (); foreach my $m (@{$s->{$act}}) { if (try_load($m)) { $l->{$m}++; } else { push(@failed, $m); } } if ($O{get_support}) { if (scalar(@failed) > 0) { print_transaction(12, "$act not available: requires " . join(', ', @failed)); } else { print_transaction(11, "$act supported"); } } } } sub time_to_seconds { my $t = shift || 30; if ($t !~ /^(\d+)([hms])?/i) { return(30); # error condition - just use default value } else { my $r = $1; my $u = lc($2); if ($u eq 'h') { return($r * 3600); } elsif ($u eq 'm') { return($r * 60); } else { return($r); } } } # A couple of global options are set in here, they will be in the G:: namespace sub process_args { my $o = shift; # This is the args we got from command line my %n = (); # This is the hash we will return w/ the fixed-up args my $fconf = {}; # Hold config info from -l file if specified # load the $fconf hash if user has specified a -l file process_file($o->{option_file}, $fconf) if ($o->{option_file}); $G::dump_args = 1 if ($o->{dump_args}); # set global option of -q option if ($o->{quit_after}) { $G::quit_after = lc($o->{quit_after}); if ($G::quit_after eq 'ehlo') { $G::quit_after = 'helo'; } elsif ($G::quit_after eq 'first-ehlo') { $G::quit_after = 'first-helo'; } elsif ($G::quit_after eq 'starttls') { $G::quit_after = 'tls'; } elsif ($G::quit_after eq 'from') { $G::quit_after = 'mail'; } elsif ($G::quit_after eq 'to') { $G::quit_after = 'rcpt'; } elsif ($G::quit_after ne 'connect' && $G::quit_after ne 'first-helo' && $G::quit_after ne 'tls' && $G::quit_after ne 'helo' && $G::quit_after ne 'auth' && $G::quit_after ne 'mail' && $G::quit_after ne 'rcpt') { print_transaction(12, "Unknown quit value $G::quit_after, exiting"); exit(1); } # only rcpt _requires_ a to address $G::server_only = 1 if ($G::quit_after ne 'rcpt'); } else { $G::quit_after = ''; } # set global flag for -stl flag $G::show_time_lapse = time() if (defined($o->{show_time_lapse})); $G::show_time_hires = 1 if ($G::modules{'Time::HiRes'} && $o->{show_time_lapse} !~ /^i/i); if ($o->{emulate_mail}) { # set up for -m option $n{to} = shift if (!defined($o->{mail_to})); $o->{mail_data} = ''; # define it here so we get it on stdin later } # pipe command, if one is specified $G::link{process} = $o->{pipe_cmd} || interact("Pipe: ", '^.+$') if (defined($o->{pipe_cmd})); $G::link{process} ||= $fconf->{PIPE} || ""; if ($G::link{process}) { $G::link{type} = 'pipe'; } else { delete($G::link{process}); } # socket file, if one is specified $G::link{sockfile} = $o->{socket} || interact("Socket File: ", '^.+$') if (defined($o->{socket})); $G::link{sockfile} ||= $fconf->{SOCKET} || ""; if ($G::link{sockfile}) { $G::link{type} = 'socket-unix'; } else { delete($G::link{sockfile}); } # SMTP mail from $n{from} = $o->{mail_from} || interact("From: ", '^.*$') if (defined($o->{mail_from})); $n{from} ||= $fconf->{FROM} || ($hostname ? "$user\@$hostname" : interact("From: ", '^.*$')); $n{from} = '' if ($n{from} eq '<>'); # SMTP helo/ehlo $n{helo} = $o->{mail_helo} || interact("Helo: ", '^.*$') if (defined($o->{mail_helo})); $n{helo} ||= $fconf->{HELO} || ($hostname ? $hostname : interact("Helo: ", '^.*$')); # SMTP server and rcpt to are interdependant, so they are handled together $G::link{server} = $o->{mail_server} || interact("Server: ", '^.*$') if (defined($o->{mail_server})); $G::link{server} ||= $fconf->{SERVER}; $n{to} = $o->{mail_to} || interact("To: ", '^.*$') if (defined($o->{mail_to})); $n{to} ||= $fconf->{TO}; $n{to} = interact("To: ", '^.*$') if (!$n{to} && !($G::server_only && $G::link{server})); if (!$G::link{type}) { $G::link{server} = get_server($n{to}) if (!$G::link{server}); $G::link{type} = "socket-inet"; } # local interface to connect from $G::link{lint} = $o->{lint} || interact("Interface: ", '^.*$') if (defined($o->{lint})); $G::link{lint} ||= $fconf->{INTERFACE} || '0.0.0.0'; # SMTP timeout $o->{timeout} = '0s' if ($o->{timeout} eq '0'); # used 'eq' on purpose $G::link{timeout} = $o->{timeout} || interact("Timeout: ", '^\d+[hHmMsS]?$') if (defined($o->{timeout})); $G::link{timeout} ||= $fconf->{TIMEOUT} || '30s'; $G::link{timeout} = time_to_seconds($G::link{timeout}); # SMTP DATA # a '-' arg to -d is the same as setting -g if ($o->{mail_data} eq '-') { undef($o->{mail_data}); $o->{data_on_stdin} = 1; } if (defined($o->{mail_data}) && !defined($o->{data_on_stdin})) { if (defined($o->{emulate_mail})) { $n{data} = "Subject: " . interact("Subject: ", 'SKIP') . "\n\n"; do { $n{data} .= interact('', 'SKIP') . "\n"; } while ($n{data} !~ /\n\.\n$/ms); $n{data} =~ s/\n\.\n$//ms; } else { $n{data} = $o->{mail_data} || interact("Data: ", '^.*$'); } } $n{data} ||= $fconf->{DATA} || 'Date: %D\nTo: %T\nFrom: %F\nSubject: test %D\n' ."X-Mailer: swaks v$p_version jetmore.org/john/code/#swaks".'\n\n' .'This is a test mailing\n'; # The -g option trumps all other methods of getting the data $n{data} = join('', ) if ($o->{data_on_stdin}); if (!$o->{no_data_fixup}) { $n{data} =~ s/\\n/\r\n/g; $n{data} =~ s/%F/$n{from}/g; $n{data} =~ s/%T/$n{to}/g; $n{data} =~ s/%D/get_date_string()/eg; $n{data} =~ s/^From [^\n]*\n// if (!$O{no_strip_from}); $n{data} =~ s/\r?\n\.\r?\n?$//s; # If there was a trailing dot, remove it $n{data} =~ s/\n\./\n../g; # quote any other leading dots # translate line endings - run twice to get consecutive \n correctly $n{data} =~ s/([^\r])\n/$1\r\n/gs; $n{data} =~ s/([^\r])\n/$1\r\n/gs; # this identical call not a bug $n{data} .= "\r\n."; # add a trailing dot } # Handle TLS options $G::tls_optional = 1 if (defined($o->{tls_optional})); $G::tls = 1 if (defined($o->{tls}) || $G::tls_optional); $G::tls_on_connect = 1 if (defined($o->{tls_on_connect})); $G::link{tls}{active} = 0; if ($G::tls || $G::tls_on_connect) { if (!$G::modules{'Net::SSLeay'}) { if ($G::tls_optional) { $G::tls = undef; # so we won't try it later print_transaction(12, 'TLS requirement Net::SSLeay not installed, skipping optional TLS'); } else { print_transaction(12, 'TLS requirement Net::SSLeay not installed, exiting'); exit(10); } } } # SMTP port $G::link{port} = $o->{mail_port} || interact("Port: ", '^\d+$') if (defined($o->{mail_port})); $G::link{port} ||= $fconf->{PORT} || ($G::tls_on_connect ? 465 : 25); # Handle AUTH options $G::auth_optional = 1 if (defined($o->{auth_optional})); $o->{auth} = uc($o->{auth}) if ($o->{auth}); $o->{auth} = uc($o->{auth_optional}) if ($o->{auth_optional} && !$o->{auth}); $o->{auth} = 'ANY' if (!$o->{auth} && (defined($o->{auth_user}) || defined($o->{auth_pass}) || $G::auth_optional)); $o->{auth} = 'ANY' if (defined($o->{auth}) && !$o->{auth}); if ($o->{auth}) { foreach (split(/\s+,\s+/, $o->{auth_map}),"PLAIN=PLAIN","LOGIN=LOGIN", "CRAM-MD5=CRAM-MD5","DIGEST-MD5=DIGEST-MD5","NTLM=NTLM", "SPA=NTLM","MSN=NTLM") { my($alias,$type) = split(/=/, uc($_), 2); $G::auth_map_f{$alias} = $type; $G::auth_map_t{$type} ||= []; push(@{$G::auth_map_t{$type}}, $alias); } if (!$G::modules{"MIME::Base64"}) { if ($G::auth_optional) { $n{a_type} = ''; # So we won't attempt it later print_transaction(12, 'AUTH requirement MIME::Base64 not installed, skipping optional AUTH'); } else { print_transaction(12, 'AUTH requirement MIME::Base64 not installed, exiting'); exit(10); } } elsif (!$G::modules{"Digest::MD5"} && $G::auth_map_f{$o->{auth}} eq 'CRAM-MD5') { if ($G::auth_optional) { $n{a_type} = ''; # So we won't attempt it later print_transaction(12, 'AUTH:CRAM-MD5 requirement Digest::MD5 not installed, ' . 'skipping optional AUTH:CRAM-MD5'); } else { print_transaction(12, 'AUTH:CRAM-MD5 requirement Digest::MD5 not installed, exiting'); exit(10); } } elsif (!$G::modules{"Authen::NTLM"} && $G::auth_map_f{$o->{auth}} eq 'NTLM') { if ($G::auth_optional) { $n{a_type} = ''; # So we won't attempt it later print_transaction(12, 'AUTH:NTLM requirement Authen::NTLM not installed, ' . 'skipping optional AUTH:NTLM'); } else { print_transaction(12, 'AUTH:NTLM requirement Authen::NTLM not installed, exiting'); exit(10); } } elsif (!$G::modules{"Authen::DIGEST-MD5"} && $G::auth_map_f{$o->{auth}} eq 'DIGEST-MD5') { if ($G::auth_optional) { $n{a_type} = ''; # So we won't attempt it later print_transaction(12, 'AUTH:DIGEST-MD5 requirement Authen::DigestMD5 not installed, ' . 'skipping optional AUTH:DIGEST-MD5'); } else { print_transaction(12, 'AUTH:DIGEST-MD5 requirement Authen::DigestMD5 not installed, ' . 'exiting'); exit(10); } } else { $n{a_user} = $o->{auth_user} if (defined($o->{auth_user})); $n{a_user} ||= $fconf->{USER}; $n{a_user} ||= interact("Username: ", 'SKIP'); $n{a_user} = '' if ($n{a_user} eq '<>'); $n{a_pass} = $o->{auth_pass} if (defined($o->{auth_pass})); $n{a_pass} ||= $fconf->{PASS}; $n{a_pass} ||= interact("Password: ", 'SKIP'); $n{a_pass} = '' if ($n{a_pass} eq '<>'); $n{a_type} = $o->{auth}; $G::auth_showpt = 1 if (defined($o->{auth_showpt})); # This option is designed to hide passwords - turn echo off when # supplying at PW prompt, star out the PW strings in AUTH transactions. # Not implementing right now - the echo might be a portability issue, # and starring out is hard because the smtp transaction is abstracted # beyond where this is easy to do. Maybe sometime in the future #$G::auth_hidepw = 1 if (defined($o->{auth_hidepw})); } } return(\%n); } sub get_username { if ($^O eq 'MSWin32') { require Win32; return Win32::LoginName(); } return getpwuid($<); } sub get_date_string { return($G::date_string) if (length($G::date_string) > 0); my @l = localtime(); my @g = gmtime(); $G::date_string = sprintf("%s, %02d %s %d %02d:%02d:%02d %+05d", (qw(Sun Mon Tue Wed Thu Fri Sat))[$l[6]], $l[3], (qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec))[$l[4]], $l[5]+1900, $l[2], $l[1], $l[0], (timelocal(@l) - timelocal(@g))/36 ); } sub ext_usage { if ($ARGV[0] =~ /^--help$/i) { require Config; $ENV{PATH} .= ":" unless $ENV{PATH} eq ""; $ENV{PATH} = "$ENV{PATH}$Config::Config{'installscript'}"; $< = $> = 1 if ($> == 0 || $< == 0); exec("perldoc", $0) || exit(1); # make parser happy %Config::Config = (); } elsif ($ARGV[0] =~ /^--version$/i) { print "$p_name version $p_version\n\n$p_cp\n"; } else { return; } exit(0); } __END__ =head1 NAME swaks - SMTP transaction tester =head1 USAGE swaks [--help|--version] | (see description of options below) =head1 OPTIONS =over 4 =item --pipe This option takes as its argument a program and the program's arguments. If this option is present, swaks opens a pipe to the program and enters an SMTP transaction over that pipe rather than connecting to a remote server. Some MTAs have testing modes using stdin/stdout. This option allows you to tie into those options. For example, if you implemented DNSBL checking with exim and you wanted to make sure it was working, you could run 'swaks --pipe "exim -bh 127.0.0.2"'. =item --socket This option takes as its argument a unix domain socket file. If this option is present, swaks enters an SMTP transaction over over the unix domains socket rather than over an internet domain socket. I think this option has uses when combined with a (yet unwritten) LMTP mode, but to be honest at this point I just implemented it because I could. =item -l, --input-file Argument to -l must be a path to a file containing TOKEN->VALUE pairs. The TOKEN and VALUE must be separated by whitespace. These tokens set values which would otherwise be set by command line arguments. See the description of the corresponding command line argument for details of each token. Valid tokens are FROM (-f), TO (-t), SERVER (-s), DATA (-d), HELO (-h), PORT (-p), INTERFACE (-li), and TIMEOUT (-to). =item -t, --to Use argument as "RCPT TO" address, or prompt user if no argument specified. Overridden by -l token TO. Multiple recipients can be specified by supplying as one comma-delimited argument. There is no default for this option. If no to addess is specified with -t or TO token, user will be prompted for To: address on STDIN. =item -f, --from Use argument as "MAIL FROM" address, or prompt user if no argument specified. Overridden by -l token FROM. If no from address is specified, default is user at host, where user is the best guess at user currently running program, and host is best guess at DNS hostname of local host. The string <> can be supplied to mean the null sender. =item -s, --server Use argument as mail server to which to connect, or prompt user if no argument specified. Overridden by -l token SERVER. If unspecified, swaks tries to determine primary MX of destination address. If Net::DNS module is not available, tries to connect to A record for recipient's domain. =item -p, --port Use argument as port to connect to on server, or prompt user if no argument is specified. Overridden by -l token PORT. If unspecified, swaks will try to connect to port 25. =item -h, --helo, --ehlo Use argument as argument to SMTP EHLO/HELO command, or prompt use if no argument is specified. Overridden by -l token HELO. If unspecified, swaks uses best guess at DNS hostname of local host. =item -d, --data Use argument as DATA portion of SMTP transaction, or prompt user if no argument specified. Overridden by -l token DATA. This string should be on one single line, with a literal \n representing where line breaks should be placed. Leading dots will be quoted. Closing dot is not required but is allowed. Very basic token parsing is done. %F is replaced with the value that will be used for "MAIL FROM", %T is replaced with "RCPT TO" values, and %D is replaced with a timestamp. Default value for this option is "Date: %D\nTo: %T\nFrom: %F\nSubject: test %D\nX-Mailer: swaks v$p_version jetmore.org/john/code/#swaks\n\nThis is a test mailing\n". =item --timeout Use argument as the SMTP transaction timeout, or prompt user if no argument given. Overridden by the -l token TIMEOUT. Argument can either be a pure digit, which will be interpretted as seconds, or can have a specifier s or m (5s = 5 seconds, 3m = 180 seconds). As a special case, 0 means don't timeout the transactions. Default value is 30s. =item -li, --local-interface Use argument as the local interface for the SMTP connection, or prompt user if no argument given. Overridden by the -l token INTERFACE. Argument can be an IP or a hostname. Default action is to let OS choose local interface. =item -g If specified, swaks will read the DATA value for the mail from STDIN. If there is a From_ line in the email, it will be removed (but see -nsf option). Useful for delivering real message (stored in files) instead of using example messages. =item -nsf, --no-strip-from Don't strip the From_ line from the DATA portion, if present. =item -n, --suppress-data If this option is specified, swaks summarizes the DATA portion of the SMTP transaction instead of printing every line. =item -q, --quit-after The argument to this option is used as an indicator of where to quit the SMTP transaction. It can be thought of as "quit after", with valid arguments CONNECT, FISRT-HELO, TLS, HELO, AUTH, MAIL, and RCPT. In a non-STARTTLS session, FIRST-HELO and HELO behave the same way. In a STARTTLS session, FIRST-HELO quits after the first HELO sent, while HELO quits after the second HELO is sent. =item -m Emulate Mail command. Least used option in swaks. =item --support Cause swaks to print its capabilities and exit. Certain features require non-standard perl modules. This options evaluates whether these modules are present and lets you know which functionality is present. =item -S, --silent Cause swaks to be silent. "-S" causes swaks to print no output until an error occurs, after which all output is shown. "-S -S" causes swaks to only show error conditions. "-S -S -S" shows no output. =item -tls Require connection to use STARTTLS. Exit if TLS not available for any reason (not advertised, negotiations failed, etc). =item -tlso, --tls-optional Attempt to use STARTTLS if possible, continue t/ normal transaction if TLS unavailable. =item -tlsc, --tls-on-connect Initiate a TLS connection immediately on connection. Use to test smtps/ssmtp servers. If this options is specified, the default port changes from 25 to 465, though this can still be overridden with the -p option. =item -a, --auth Require authentication. If Authentication fails or is unavailable, stop transaction. -a can take an argument specifying which type of authentication to use. swaks currently supports PLAIN, LOGIN, and CRAM-MD5. If no argument is given any available authentication type is used. If neither password (-ap) or username (-au) is supplied on command line, swaks will prompt on STDIN. SPA (NTLM/MSN) authentication is now supported. Tested as a client against Exim and Stalker's CommuniGate, but implementation may be incomplete. Authen::NTLM is currently required. Note that CPAN hosts two different Authen::NTLM modules. Current implementation requires Mark Bush's implementation (Authen/NTLM-1.02.tar.gz). Plan to reimplement directly at some point to avoid confusion. DIGEST-MD5 is now supported. Tested as a client only against Stalker's Communigate, so implementation may be incomplete. Requires Authen::DigestMD5 module. =item -ao, --auth-optional Same as -a, but if authentication is unavailable or fails, attempts to continue transaction. =item -au, --auth-user Supply the username for authentication. The string <> can be supplied to mean an empty username. For SPA authentication, a "domain" can be specified after the regular username with a % seperator. For instance, if "-ap user at example.com%NTDOM" is passed, "user at example.com" is the username and "NTDOM" is the domain. NOTE: I don't actually have access to a mail server where the domain isn't ignored, so this may be implemented incorrectly. =item -ap, --auth-password Supply the password for authentication. The string <> can be supplied to mean an empty password. =item -am --auth-map Provides a way to map alternate names onto base authentication types. Useful for any sites that use alternate names for common types. This functionality is actually used internally to map types SPA and MSN onto the base type NTLM. The command line argument to simulate this would be "--auth-map SPA=NTLM,MSN=NTLM". The base types supported are LOGIN, PLAIN, CRAM-MD5, DIGEST-MD5, and NTLM. SPA and MSN are mapped on to NTLM automatically. =item -apt, --auth-plaintext Instead of showing AUTH strings literally (in base64), translate them to plaintext before printing on screen. =item -nth, --no-hints Don't show transaction hints. (Useful in conjunction with -hr to create copy/paste-able transactions =item -hr, --hide-receive Don't display reception lines =item -hs, --hide-send Don't display sending lines =item -stl, --show-time-lapse Display time lapse between send/receive pairs. If 'i' is provided as argument or the Time::HiRes module is unavailable the time lapse will be integer only, otherwise it will be to the thousandth of a second. =item --help This screen. =item --version Version info. =back =head1 EXAMPLES =over 4 =item swaks prompt user for to address and send a default email. =item cat mailfile | swaks -g -n -t user at example.com -tlso -a -au user -ap password send the contents of "mailfile" to user at example.com, using TLS if available, requiring authentication, using user/password as authentication information. =back =head1 COMMENTS This program was written because I was testing a new MTA on an alternate port. I did so much testing that using interactive telnet grew tiresome. Over the next several years this program was fleshed out and every single option was added as a direct need of some testing I was doing as the mail admin of a medium sized ISP, with the exception of TLS support which was added on a whim. As such, all options are reasonably well thought out and fairly well tested (though TLS could use more testing). =head1 REQUIRES =over 4 =item IO::Socket, Sys::Hostname, Getop::Long, Time::Local These modules are all required for the program to run at all. This shouldn't be an issue as I believe these are all core modules. =item Net::DNS This module is required to look up MX records for domains. If unavailable the -s option can be used to statically route the message. =item Net::SSLeay This module is required for TLS sessions. STARTTLS will not be supported if module is unavailable. =item MIME::Base64 This module is required for all SMTP AUTH transactions. If it is unavailable no AUTH methods will be supported. =item Digest::MD5 This module is required for CRAM-MD5 authentication. =item Authen::NTLM This module is required for SPA/MSN/NTLM authentication. Note that there are two modules using the Authen::NTLM namespace on CPAN. The Mark Bush implementation (Authen/NTLM-1.02.tar.gz) is the version required here. =item Authen::DigestMD5 This module is required for DIGEST-MD5 authentication. =item Time::HiRes This module is required for high resolution timing. If unavailable only integer timing is available. =back =head1 PORTABILITY =over 4 =item Operating Systems This program was primarily intended for use on unix-like operating systems, and it should work on any reasonable version thereof. It has been developed and tested on Solaris, Linux, and Mac OS X and is feature complete on all of these. This program is known to demonstrate basic functionality on Windows using ActiveState's Perl. It has not been fully tested. Known to work are basic SMTP functionality and the LOGIN, PLAIN, and CRAM-MD5 auth types. Unknown is any TLS functionality and the NTLM/SPA and Digest-MD5 auth types. Because this program should work anywhere Perl works, I would appreciate knowing about any new operating systems you've thoroughly used swaks on as well as any problems encountered on a new OS. =item Mail Servers This program was almost exclusively developed against Exim mail servers. It was been used casually by the author, though not thoroughly tested, with sendmail, smail, and Communigate. Because all functionality in swaks is based off of known standards it should work with any fairly modern mail server. If a problem is found, please alert the author at the address below. =back =head1 EXIT CODES =over 4 =item 0 no errors occurred =item 1 error parsing command line options =item 2 error connecting to remote server =item 3 unknown connection type =item 4 while running with connection type of "pipe", fatal problem writing to or reading from the child process =item 5 while running with connection type of "pipe", child process died unexpectedly. This can mean that the program specified with --pipe doesn't exist. =item 10 error in prerequisites (needed module not available) =item 21 error reading initial banner from server =item 22 error in HELO transaction =item 23 error in MAIL transaction =item 24 no RCPTs accepted =item 25 server returned error to DATA request =item 26 server did not accept mail following data =item 27 server returned error after normal-session quit request =item 28 error in AUTH transaction =item 29 error in TLS transaction =item 32 error in EHLO following TLS negotiation =back =head1 CONTACT =over 4 =item proj-swaks at jetmore.net =back =cut --- NEW FILE swaks.spec --- Name: swaks Version: 20050709.1 Release: 5%{?dist} Summary: Command-line SMTP transaction tester Group: Applications/Internet License: GPL URL: http://www.jetmore.org/john/code/#swaks Source0: http://www.jetmore.org/john/code/swaks.%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(Authen:DigestMD5) Requires: perl(Net::DNS) Requires: perl(Net::SSLeay) Requires: perl(Time::HiRes) %description Swiss Army Knife SMTP: A command line SMTP tester. Swaks can test various aspects of your SMTP server, including TLS and AUTH. %prep %build %install rm -rf $RPM_BUILD_ROOT install -D -p -m 0755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/swaks mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 /usr/bin/pod2man %{SOURCE0} > $RPM_BUILD_ROOT%{_mandir}/man1/swaks.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/swaks %{_mandir}/man1/* %changelog * Mon May 15 2006 Jason L Tibbitts III - 20050709.1-5 - Add Authen::DigestMD5 requirement now that it's in Extras. * Wed Mar 29 2006 Jason L Tibbitts III - 20050709.1-4 - Cleanups from package review * Sun Feb 12 2006 Jason L Tibbitts III - 20050709.1-3 - Use versioned source file URL * Sat Jan 28 2006 Jason L Tibbitts III - 20050709.1-2 - Change group. * Sat Jan 28 2006 Jason L Tibbitts III - 20050709.1-1 - Initial attempt From fedora-extras-commits at redhat.com Mon May 15 17:26:52 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 May 2006 10:26:52 -0700 Subject: extras-buildsys/builder Builder.py, 1.12, 1.13 BuilderMock.py, 1.6, 1.7 Config.py, 1.3, 1.4 Message-ID: <200605151726.k4FHQqTK008781@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8745/builder Modified Files: Builder.py BuilderMock.py Config.py Log Message: 2006-05-15 Dan Williams * builder/Builder.py builder/BuilderMock.py - (untested) Make passive builders work on the builder side 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 14 May 2006 16:13:06 -0000 1.12 +++ Builder.py 15 May 2006 17:26:45 -0000 1.13 @@ -24,12 +24,15 @@ import string import xmlrpclib import OpenSSL +import shutil from plague import Commands -from plague import AuthedXMLRPCServer +from plague.AuthedXMLRPCServer import AuthedSSLXMLRPCServer +from plague.AuthedXMLRPCServer import AuthedXMLRPCServer from plague import HTTPServer from plague import XMLRPCServerProxy from plague import FileDownloader from plague import FileUploader +from plague import FileTransfer import Config import BuilderMock @@ -38,15 +41,17 @@ class BuilderInitException(Exception): pass -def get_hostname(cfg, bind_all): - cfg_hostname = cfg.get_str("Passive", "hostname") +def get_hostname(cfg, bind_all=False): + """Get the builder's hostname, optionally returning a hostname + suitable for binding to all active interfaces.""" + cfg_hostname = cfg.get_str("General", "hostname") if cfg_hostname and len(cfg_hostname): return cfg_hostname elif bind_all: return '' return socket.gethostname() -def determine_max_jobs(): +def _determine_max_jobs(): """ Simple max job calculator based on number of CPUs """ import commands @@ -61,25 +66,51 @@ return max_jobs +def prefix_url(url, use_ssl): + """Convenience function to add correct URL method + for the security method we're using.""" + if use_ssl: + return "https://" + url + return "http://" + url + + class Builder(object): """ Abstract builder base object """ def __init__(self, cfg): self._cfg = cfg - self._max_slots = determine_max_jobs() + self._max_slots = _determine_max_jobs() self._seq_gen = Commands.SequenceGenerator() + self._queued_cmds = [] + + self._stop = False + self._stopped = False self._building_jobs_lock = threading.Lock() self._building_jobs = [] self._all_jobs = {} + # Decompose hostname to just get the hostname + name = cfg.get_str("General", "server") + slash_idx = name.find("//") + if slash_idx > 0: + name = name[slash_idx + 2:] + slash_idx = name.find("/") + if slash_idx > 0: + name = name[:slash_idx] + self._server_hostname = name + + self._server_ip = None + self._get_server_ip() + self._certs = None - if cfg.get_bool("SSL", "use_ssl"): - hostname = get_hostname(self._cfg, False) - key_file = os.path.join(cfg.get_str("SSL", "builder_key_and_cert_dir"), "%s.pem" % hostname) + self._use_ssl = cfg.get_bool("SSL", "use_ssl") + if self._use_ssl: self._certs = {} - self._certs['key_and_cert'] = key_file + hostname = get_hostname(self._cfg) + builder_cert = cfg.get_str("SSL", "builder_key_and_cert_dir") + self._certs['key_and_cert'] = os.path.join(builder_cert, "%s.pem" % hostname) self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._certs['peer_ca_cert'] = self._certs['ca_cert'] + self._certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") build_arches = [] for target in self._cfg.targets(): @@ -88,6 +119,14 @@ build_arches.append(arch) self._log("Available architectures: [%s]" % string.join(build_arches, ", ")) + def _get_server_ip(self): + try: + self._server_ip = socket.gethostbyname(self._server_hostname) + return True + except Exception: + pass + return False + def _log(self, msg, newline=True): if self._cfg.get_bool("General", "debug"): if newline: @@ -96,6 +135,7 @@ sys.stdout.flush() def new_builder(cfg, btype): + """Create and return a new builder object of the requested type.""" if btype == 'passive': return PassiveBuilder(cfg) elif btype == 'active': @@ -104,10 +144,19 @@ return None new_builder = staticmethod(new_builder) - def stop(self): - pass + def work(self): + """Builder work loop, starts the builder object's thread + and sleeps until it's done.""" + self.start() + try: + while not self._stop: + time.sleep(60) + except KeyboardInterrupt: + pass def cleanup(self): + """Clean up the builder by killing all running jobs and waiting + for them to complete.""" self._building_jobs_lock.acquire() for job in self._building_jobs: job.die() @@ -162,6 +211,58 @@ return target_cfg + def _get_default_commands(self): + """Return a python list of serialized commands that the builder + sends to the server every time it contacts the server.""" + + defcmds = [] + + # always send a target list + next_seq = self._seq_gen.next() + cmd = Commands.PlgCommandTargets(self.supported_targets(), next_seq) + defcmds.append(cmd) + + # always send free & max slots + next_seq = self._seq_gen.next() + (free_slots, max_slots) = self.slots() + cmd = Commands.PlgCommandSlots(free_slots, max_slots, next_seq) + defcmds.append(cmd) + + defcmds.append(self._get_building_jobs_cmd()) + + return defcmds + + def _dispatch_server_command(self, cmd): + """Process a single command from the server.""" + + if isinstance(cmd, Commands.PlgCommandNewJobReq): + (uniqid, msg) = self._start_new_job(cmd) + ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) + self._queued_cmds.append(ack) + elif isinstance(cmd, Commands.PlgCommandUnlockRepo): + self._handle_unlock_repo_request(cmd) + elif isinstance(cmd, Commands.PlgCommandJobStatus): + reply = self._handle_job_status_request(cmd) + if reply: + self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandJobFiles): + reply = self._handle_job_files_request(cmd) + if reply: + self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandKillJob): + self._handle_kill_job_command(cmd) + + def _process_server_commands(self, cmd_list): + """Process the server's command stream.""" + + if not cmd_list: + # Something went wrong... + return + + cmds = Commands.deserialize_command_stream(cmd_list) + for cmd in cmds: + self._dispatch_server_command(cmd) + def _new_job_for_arch(self, target_cfg, buildarch, srpm_url, uniqid): """Creates a new mock build job given a particular build architecture.""" @@ -252,130 +353,184 @@ pass -class PassiveBuilderRequestHandler: - def __init__(self, cfg, builder): - self._builder = builder - self._all_jobs = {} # unique id => awclass instance - self._building_jobs_lock = threading.Lock() - self._building_jobs = [] - self._cfg = cfg - - def _log(self, msg): - if self._cfg.get_bool("General", "debug"): - print msg - - def die(self, uniqid): - try: - job = self._all_jobs[uniqid] - job.die() - except KeyError: - pass - return 0 - - def files(self, uniqid): - try: - job = self._all_jobs[uniqid] - return job.files() - except KeyError: - pass - return [] - - def repo_unlocked(self, uniqid): - try: - job = self._all_jobs[uniqid] - job.unlock_repo() - except KeyError: - pass - return 0 - - def building_jobs(self): - jobs = {} - self._building_jobs_lock.acquire() - building = 0 - for job in self._building_jobs: - jobs[job.uniqid()] = job.status() - building = building + 1 - free = self._max_jobs - building - self._building_jobs_lock.release() - return (jobs, free) - - def num_slots(self): - (free_slots, max_slots) = self._builder.slots() - return max_slots - - def job_status(self, uniqid): - try: - job = self._all_jobs[uniqid] - return job.status() - except KeyError: - pass - return '' - - def supported_targets(self): - return self._builder.supported_targets() - - -class PassiveBuilder(Builder): +class PassiveBuilder(Builder, threading.Thread): """ Passive builders initiate no communication of their own. They wait for the build server to contact them, and therefore may not be used behind a firewall without holes being punched through it. + + The class structure here is somewhat convoluted, since PassiveBuilder + is actually an XML-RPC request handler as well as a subclass of Builder. + It's still it's own thread for housekeeping purposes, but most of it's + functions get called from a thread spawned by the XML-RPC server to handle + requests. """ def __init__(self, cfg): Builder.__init__(self, cfg) self._http_server = None self._xmlrpc_server = None + self._work_dir = os.path.abspath(cfg.get_str("Directories", "builder_work_dir")) + threading.Thread.__init__(self) - def _start_servers(self): - # Start up the HTTP server thread which the build server - # pulls completed RPMs from - hostname = get_hostname(self._cfg, True) - port = self._cfg.get_int("Passive", "fileserver_port") - work_dir = self._cfg.get_str("Directories", "builder_work_dir") - self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs) - self._http_server.start() + self._init_servers() + def _init_servers(self): + """Startup HTTP and XML-RPC servers which the build server uses + to talk to us.""" + hostname = get_hostname(self._cfg, bind_all=True) self._log("Binding to address '%s'\n" % hostname) + + port = self._cfg.get_int("Passive", "fileserver_port") + self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), + self._work_dir, self._certs) + self._http_server.set_POST_handler('/upload', self.upload_callback) + xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") try: - if self._cfg.get_bool("SSL", "use_ssl") == True: - self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) + if self._use_ssl: + self._xmlrpc_server = AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) else: - self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) + self._xmlrpc_server = AuthedXMLRPCServer((hostname, xmlrpc_port), None) except socket.error, exc: if exc[0] == 98: raise BuilderInitException("Error: couldn't bind to address '%s:%s'. " \ "Is the builder already running?\n" % (hostname, xmlrpc_port)) - brh = PassiveBuilderRequestHandler(self._cfg, self) - self._xmlrpc_server.register_instance(brh) + self._xmlrpc_server.register_instance(self) - def work(self): - self._start_servers() - try: - self._xmlrpc_server.serve_forever() - except KeyboardInterrupt: - pass + def _get_workdir_for_job(self, archjob_id): + return os.path.join(self._work_dir, archjob_id) - def download_srpm(self, url, target_dir, dl_callback, cb_data): - """For passive builders, the server uploads the RPM to the builder. - Therefore, we already have it. Move it from the HTTP server's upload - directory to the requested target_dir, if the SRPM exists.""" - pass + def upload_callback(self, request_handler, fs): + """Handle SRPM uploads from the server.""" + # Ensure we know the server + if not self._server_ip: + self._get_server_ip() + ip = request_handler.client_address[0] + if not self._server_ip or self._server_ip != ip: + request_handler.send_error(403, "Unauthorized") + return + + # Search for filename + fslist = [fs] + if not fs.name and not fs.filename and fs.value: + fslist = fs.value + jobid = filename = tmpfile = None + for item in fslist: + if item.name == 'archjob_id': + try: + jobid = urllib.unquote(str(item.value)) + # Ensure archjob_id is only as long as a sha1 hash + if len(jobid) is not 40: + jobid = None + except ValueError: + pass + elif item.name == 'filedata': + filename = item.filename + tmpfile = item.file + + if jobid and filename and tmpfile: + upload_dir = os.path.join(self._get_workdir_for_job(jobid), "source") + destpath = os.path.join(upload_dir, urllib.unquote(filename)) + dest = file(destpath, "w+b") + shutil.copyfileobj(tmpfile, dest) + dest.close() + request_handler.send_response(200, "Success") + request_handler.send_header("Content-type", "text/html") + request_handler.end_headers() + request_handler.wfile.write("Success!") + else: + request_handler.send_error(400, "Invalid request for %s" % request_handler.path) - def _stop_servers(self): + def run(self): + """Main builder loop. Sit around and serve requests.""" + self._http_server.start() + # We sit in serve_forever() until stopped + # FIXME: how do we stop this? server_close() doesn't seem to + self._xmlrpc_server.serve_forever() + self._stopped = True + + def stop(self): + """Tear down HTTP and XML-RPC servers and cleanup their resources.""" self._http_server.stop() self._xmlrpc_server.stop() - try: - time.sleep(1) - except KeyboardInterrupt: - pass self._xmlrpc_server.server_close() + # FIXME: server_close() doesn't seem to stop the serve_forever() + return - def stop(self): - Builder.stop(self) - self._stop_servers() + while not self._stopped: + try: + time.sleep(0.2) + except KeyboardInterrupt: + pass + + ################################################################### + # Code below called by XML-RPC request handler from request thread + ################################################################### + + def request(self, cmd_list): + """Main XML-RPC handler, called by the build server. Dispatches + the build server's requests and returns our response.""" + cmds = Commands.deserialize_command_stream(cmd_list) + self._process_server_commands(cmds) + cmds_for_server = self._get_default_commands() + cmds_for_server = cmds_for_server + self._queued_cmds + self._queued_cmds = [] + cmd_stream = Commands.serialize_to_command_stream(cmds_for_server) + return cmd_stream + + def download_srpm(self, archjob_id, url, target_dir, dl_callback, cb_data=None): + """For passive builders, the server uploads the RPM to the builder. + Therefore, we already have it. Move it from the HTTP server's upload + directory to the requested target_dir, if the SRPM exists.""" + + filename = os.path.basename(urllib.unquote(url)) + source_dir = os.path.join(self._get_workdir_for_job(archjob_id), "source") + target_file = os.path.join(target_dir, filename) + + result = FileTransfer.FT_RESULT_FAILED + msg = "Failed" + + # Usually the upload dir will be the same as the archjob's target dir, + # but if it's not, copy the file over + if source_dir != target_dir: + try: + shutil.move(os.path.join(source_dir, filename), target_file) + result = FileTransfer.FT_RESULT_SUCCESS + except IOError, exc: + msg = str(exc) + elif os.access(target_file, os.R_OK): + # Otherwise make sure the files where the archjob wants it + result = FileTransfer.FT_RESULT_SUCCESS + + if result == FileTransfer.FT_RESULT_SUCCESS: + msg = "Success" + dl_callback(result, cb_data, msg) + return None + + def upload_files(self, archjob_id, files, ul_callback, cb_data=None): + """For passive builders, the build server retrieves the result + files from the builder. So we pretty much do nothing here, since + the work_dir is already the HTTP download dir.""" + work_dir = self._get_workdir_for_job(archjob_id) + result = FileTransfer.FT_RESULT_FAILED + msg = "Failed" + for fpath in files: + if fpath.startswith(work_dir): + continue + last_part = fpath[len(work_dir):] + new_path = os.path.join(work_dir, last_part) + try: + shutil.move(fpath, new_path) + result = FileTransfer.FT_RESULT_SUCCESS + except IOError, exc: + msg = str(exc) + break + if result == FileTransfer.FT_RESULT_SUCCESS: + msg = "Success" + ul_callback(result, cb_data, msg) + return None # HACK: This class is a hack to work around SSL hanging issues, @@ -412,35 +567,16 @@ def __init__(self, cfg): Builder.__init__(self, cfg) - self._stop = False - self._stopped = False self._last_comm = time.time() - self._SERVER_CONTACT_INTERVAL - 1 - self._queued_cmds = [] self._xmlrpc_address = self._get_server_address(cfg.get_str("Active", "xmlrpc_port")) self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._xmlrpc_address, self._certs, timeout=20) threading.Thread.__init__(self) def _get_server_address(self, port): - addr = self._cfg.get_str("Active", "server") - if addr.startswith("http://"): - addr = addr[7:] - elif addr.startswith("https://"): - addr = addr[8:] - if self._cfg.get_bool("SSL", "use_ssl"): - addr = "https://" + addr - else: - addr = "http://" + addr + addr = prefix_url(self._server_hostname, self._use_ssl) return addr + ":" + port - def work(self): - self.start() - try: - while not self._stop: - time.sleep(60) - except KeyboardInterrupt: - pass - - def download_srpm(self, url, target_dir, dl_callback, cb_data=None): + def download_srpm(self, archjob_id, url, target_dir, dl_callback, cb_data=None): """Download an SRPM from the build server. Only used by BuilderMock objects.""" downloader = FileDownloader.FileDownloader(url, target_dir, ['.src.rpm'], @@ -450,14 +586,9 @@ return downloader def upload_files(self, archjob_id, files, ul_callback, cb_data=None): - server = self._cfg.get_str("Active", "server") - (urltype, urlrest) = urllib.splittype(server) - (ignore, server) = urllib.splithost(urlrest) - if self._cfg.get_bool("SSL", "use_ssl"): - url = "https://" + server - else: - url = "http://" + server - url = url + ":%d/upload" % self._cfg.get_int("Active", "fileserver_port") + port = self._cfg.get_int("Active", "fileserver_port") + url = "%s:%d/upload" % (self._server_hostname, port) + url = prefix_url(url, self._use_ssl) data = [("archjob_id", archjob_id)] uploader = FileUploader.FileUploader(url, files, 'filedata', data, self._certs) @@ -479,27 +610,6 @@ urls.append("file:///%s" % os.path.basename(fpath)) return Commands.PlgCommandJobFilesAck(archjob_id, urls, cmd.seq(), self._seq_gen.next()) - def _get_default_commands(self): - """Return a python list of serialized commands that the builder - sends to the server every time it contacts the server.""" - - defcmds = [] - - # always send a target list - next_seq = self._seq_gen.next() - cmd = Commands.PlgCommandTargets(self.supported_targets(), next_seq) - defcmds.append(cmd) - - # always send free & max slots - next_seq = self._seq_gen.next() - (free_slots, max_slots) = self.slots() - cmd = Commands.PlgCommandSlots(free_slots, max_slots, next_seq) - defcmds.append(cmd) - - defcmds.append(self._get_building_jobs_cmd()) - - return defcmds - def _send_commands(self): """Send default commands, and any commands that we've queued up since the last time we sent commands to the server.""" @@ -524,37 +634,6 @@ return req.response return None - def _dispatch_server_command(self, cmd): - """Process a single command from the server.""" - - if isinstance(cmd, Commands.PlgCommandNewJobReq): - (uniqid, msg) = self._start_new_job(cmd) - ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) - self._queued_cmds.append(ack) - elif isinstance(cmd, Commands.PlgCommandUnlockRepo): - self._handle_unlock_repo_request(cmd) - elif isinstance(cmd, Commands.PlgCommandJobStatus): - reply = self._handle_job_status_request(cmd) - if reply: - self._queued_cmds.append(reply) - elif isinstance(cmd, Commands.PlgCommandJobFiles): - reply = self._handle_job_files_request(cmd) - if reply: - self._queued_cmds.append(reply) - elif isinstance(cmd, Commands.PlgCommandKillJob): - self._handle_kill_job_command(cmd) - - def _process_server_response(self, response): - """Process the server's response command stream.""" - - if not response: - # Something went wrong... - return - - cmds = Commands.deserialize_command_stream(response) - for cmd in cmds: - self._dispatch_server_command(cmd) - def run(self): """Main builder loop, send commands to and receive commands from the server every so often.""" @@ -563,7 +642,7 @@ if self._last_comm < time.time() - self._SERVER_CONTACT_INTERVAL: self._last_comm = time.time() resp = self._send_commands() - self._process_server_response(resp) + self._process_server_commands(resp) time.sleep(1) self._stopped = True Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- BuilderMock.py 14 May 2006 05:43:06 -0000 1.6 +++ BuilderMock.py 15 May 2006 17:26:45 -0000 1.7 @@ -27,7 +27,9 @@ import errno import exceptions import time + import Builder +import Config from plague import ExecUtils from plague import FileDownloader @@ -43,12 +45,9 @@ return None file_part = file_path[len(work_dir) + 1:] port = "%s" % cfg.get_int("Network", "fileserver_port") - if cfg.get_bool("SSL", "use_ssl"): - method = "https://" - else: - method = "http://" - hostname = Builder.get_hostname(cfg, False) - full_url = "%s%s:%s/%s" % (method, hostname, port, file_part) + hostname = Builder.get_hostname(cfg) + full_url = "%s:%s/%s" % (hostname, port, file_part) + full_url = Builder.prefix_url(full_url, cfg.get_bool("SSL", "use_ssl")) return urllib.quote(full_url) @@ -82,7 +81,12 @@ self._uploader = None self.arch_command = "" - self._work_dir = self._builder_cfg.get_str("Directories", "builder_work_dir") + self._work_dir = os.path.abspath(self._builder_cfg.get_str("Directories", "builder_work_dir")) + + self._source_dir = os.path.join(self._work_dir, self._uniqid, "source") + if not os.path.exists(self._source_dir): + os.makedirs(self._source_dir) + self._result_dir = os.path.join(self._work_dir, self._uniqid, "result") if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) @@ -286,29 +290,27 @@ return contents def dl_callback(self, dl_status, cb_data, err_msg=None): - url = cb_data - if dl_status == FileTransfer.FT_RESULT_SUCCESS: - self._status = 'downloaded' - self._log("Retrieved %s.\n" % url) - elif dl_status == FileTransfer.FT_RESULT_FAILED: - # If job was cancelled, just return - if self.is_done_status(): - return - self._done_status = 'failed' - self._log("ERROR: Failed to retrieve %s.\n" % url) - self._post_cleanup() - elif dl_status == FileTransfer.FT_RESULT_CANCELED: - # Ignore cancelation - pass + if not self.is_done_status(): + url = cb_data + if dl_status == FileTransfer.FT_RESULT_SUCCESS: + self._status = 'downloaded' + self._log("Retrieved %s.\n" % url) + elif dl_status == FileTransfer.FT_RESULT_FAILED: + self._done_status = 'failed' + self._log("ERROR: Failed to retrieve '%s' because: %s\n" % (url, err_msg)) + self._post_cleanup() + elif dl_status == FileTransfer.FT_RESULT_CANCELED: + # Ignore cancelation + pass self._downloader = None def _status_init(self): self._log("Starting download of %s.\n" % self._srpm_url) self._status = 'downloading' - target_dir = os.path.dirname(self._srpm_path) try: - self._downloader = self._controller.download_srpm(self._srpm_url, - target_dir, self.dl_callback, self._srpm_url) + target_dir = os.path.dirname(self._srpm_path) + self._downloader = self._controller.download_srpm(self._uniqid, + self._srpm_url, target_dir, self.dl_callback, self._srpm_url) except FileDownloader.FileNameException, exc: self._done_status = 'failed' self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (exc, self._srpm_url)) @@ -410,10 +412,10 @@ def _post_cleanup(self): if self._done_status is not 'killed': + self._status = "uploading" self._files = self._find_files() self._uploader = self._controller.upload_files(self._uniqid, self._files, self.ul_callback, None) - self._status = "uploading" else: self._status = self._done_status @@ -445,18 +447,18 @@ def run(self): # Print out a nice message at the start of the job - target_dict = self._target_cfg.target_dict() - target_str = "%s-%s-%s-%s" % (target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo']) + target_str = Config.make_target_string_from_dict(self._target_cfg.target_dict()) + time_str = time.asctime(time.localtime(self._starttime)) self._log("""Starting job: Time: %s Target: %s UID: %s Architecture: %s - SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self._buildarch, self._srpm_url)) + SRPM: %s\n\n""" % (time_str, target_str, self._uniqid, self._buildarch, self._srpm_url)) try: srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm']) - self._srpm_path = os.path.join(self._work_dir, self._uniqid, "source", srpm_filename) + self._srpm_path = os.path.join(self._source_dir, srpm_filename) except FileDownloader.FileNameException, exc: self._done_status = 'failed' self._log("ERROR: SRPM file name was invalid. Message: '%s'\n" % exc) 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 28 Apr 2006 03:17:35 -0000 1.3 +++ Config.py 15 May 2006 17:26:45 -0000 1.4 @@ -25,6 +25,8 @@ def make_target_string(distro, target, arch, repo): return "%s-%s-%s-%s" % (distro, target, arch, repo) +def make_target_string_from_dict(target_dict): + return make_target_string(target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo']) class BuilderConfig(BaseConfig.BaseConfig): def __init__(self, filename): @@ -82,18 +84,18 @@ self.set_option("General", "builder_cmd", "/usr/bin/mock") self.set_option("General", "builder_user", "plague-builder") self.set_option("General", "comm_type", "active") + self.set_option("General", "hostname", "localhost") + self.set_option("General", "server", "") self.add_section("Directories") self.set_option("Directories", "builder_work_dir", "/tmp/builder_work") self.set_option("Directories", "target_configs_dir", "/etc/plague/builder/targets") self.add_section("Active") - self.set_option("Active", "server", "") self.set_option("Active", "xmlrpc_port", "8886") self.set_option("Active", "fileserver_port", "8887") self.add_section("Passive") - self.set_option("Passive", "hostname", "") self.set_option("Passive", "xmlrpc_port", "8888") self.set_option("Passive", "fileserver_port", "8889") From fedora-extras-commits at redhat.com Mon May 15 17:26:47 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 May 2006 10:26:47 -0700 Subject: extras-buildsys ChangeLog,1.197,1.198 Message-ID: <200605151727.k4FHRH87008786@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8745 Modified Files: ChangeLog Log Message: 2006-05-15 Dan Williams * builder/Builder.py builder/BuilderMock.py - (untested) Make passive builders work on the builder side Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- ChangeLog 14 May 2006 05:43:05 -0000 1.197 +++ ChangeLog 15 May 2006 17:26:44 -0000 1.198 @@ -1,3 +1,9 @@ +2006-05-15 Dan Williams + + * builder/Builder.py + builder/BuilderMock.py + - (untested) Make passive builders work on the builder side + 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning From fedora-extras-commits at redhat.com Mon May 15 18:14:26 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 15 May 2006 11:14:26 -0700 Subject: fedora-security/audit fc4,1.245,1.246 fc5,1.159,1.160 Message-ID: <200605151814.k4FIEQSa011256@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11230 Modified Files: fc4 fc5 Log Message: Note some freetype issues. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- fc4 15 May 2006 17:10:35 -0000 1.245 +++ fc4 15 May 2006 18:14:23 -0000 1.246 @@ -37,6 +37,7 @@ CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 version (kernel, fixed 2.6.16.14) [since FEDORA-2006-517] CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] +CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] @@ -154,6 +155,7 @@ CVE-2006-0748 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-0748 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8) +CVE-2006-0747 VULNERABLE (freetype, fixed 2.2.1) #183677 CVE-2006-0746 VULNERABLE (kpdf) #184308 CVE-2006-0745 version (xorg-x11) not fc4 CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- fc5 15 May 2006 17:10:35 -0000 1.159 +++ fc5 15 May 2006 18:14:23 -0000 1.160 @@ -38,6 +38,7 @@ CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] +CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] @@ -156,6 +157,7 @@ CVE-2006-0748 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-0748 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-0748 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-0747 VULNERABLE (freetype, fixed 2.2.1) #183677 CVE-2006-0746 version (kdegraphics, fixed 3.4) CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172] CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Mon May 15 18:48:39 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:48:39 -0700 Subject: rpms/xarchon - New directory Message-ID: <200605151848.k4FImf7R011567@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541/xarchon Log Message: Directory /cvs/extras/rpms/xarchon added to the repository From fedora-extras-commits at redhat.com Mon May 15 18:48:39 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:48:39 -0700 Subject: rpms/xarchon/devel - New directory Message-ID: <200605151848.k4FImfMZ011570@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541/xarchon/devel Log Message: Directory /cvs/extras/rpms/xarchon/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 18:48:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:48:58 -0700 Subject: rpms/xarchon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151849.k4FIn00K011626@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11590/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xarchon --- NEW 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 May 15 18:48:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:48:58 -0700 Subject: rpms/xarchon Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151849.k4FIn04g011623@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11590 Added Files: Makefile import.log Log Message: Setup of module xarchon --- NEW FILE Makefile --- # Top level Makefile for module xarchon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 18:49:42 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:49:42 -0700 Subject: rpms/xarchon import.log,1.1,1.2 Message-ID: <200605151850.k4FIoEJr011724@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11678 Modified Files: import.log Log Message: auto-import xarchon-0.50-2 on branch devel from xarchon-0.50-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xarchon/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 18:48:57 -0000 1.1 +++ import.log 15 May 2006 18:49:42 -0000 1.2 @@ -0,0 +1 @@ +xarchon-0_50-2:HEAD:xarchon-0.50-2.src.rpm:1147718998 From fedora-extras-commits at redhat.com Mon May 15 18:49:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:49:43 -0700 Subject: rpms/xarchon/devel xarchon-0.50-extraqual.patch, NONE, 1.1 xarchon-destdir.patch, NONE, 1.1 xarchon-fonts.patch, NONE, 1.1 xarchon.desktop, NONE, 1.1 xarchon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151850.k4FIoFt8011728@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11678/devel Modified Files: .cvsignore sources Added Files: xarchon-0.50-extraqual.patch xarchon-destdir.patch xarchon-fonts.patch xarchon.desktop xarchon.spec Log Message: auto-import xarchon-0.50-2 on branch devel from xarchon-0.50-2.src.rpm xarchon-0.50-extraqual.patch: --- NEW FILE xarchon-0.50-extraqual.patch --- --- src/Xarchon_Genetic.hpp~ 1999-10-09 20:00:56.000000000 +0300 +++ src/Xarchon_Genetic.hpp 2006-03-14 23:46:15.000000000 +0200 @@ -82,8 +82,8 @@ Xarchon_Genetic_Generation *gg; public: Xarchon_Evolution(char *test,char *pop,int num); - Genetic_Population *Xarchon_Evolution::Operate(Genetic_Population *p); - Genetic_Population *Xarchon_Evolution::Operate(void); + Genetic_Population *Operate(Genetic_Population *p); + Genetic_Population *Operate(void); virtual ~Xarchon_Evolution(void); }; xarchon-destdir.patch: --- NEW FILE xarchon-destdir.patch --- --- data/Makefile.am~ 1999-10-16 01:33:45.000000000 +0300 +++ data/Makefile.am 2003-09-14 14:32:25.000000000 +0300 @@ -7,8 +7,8 @@ echo "--> Installing theme '$$theme'"; \ THEME_DIRS=`find $$theme -type d`; \ for p in $$THEME_DIRS; do \ - echo "mkdir $(pkgdatadir)/$$p"; \ - mkdir $(pkgdatadir)/$$p; \ + echo "mkdir $(DESTDIR)$(pkgdatadir)/$$p"; \ + mkdir $(DESTDIR)$(pkgdatadir)/$$p; \ done; \ THEME_FILES=`find $$theme -type f`; \ for p in $$THEME_FILES; do \ --- data/Makefile.in~ 1999-12-03 19:12:06.000000000 +0200 +++ data/Makefile.in 2003-09-14 14:43:46.000000000 +0300 @@ -210,8 +210,8 @@ echo "--> Installing theme '$$theme'"; \ THEME_DIRS=`find $$theme -type d`; \ for p in $$THEME_DIRS; do \ - echo "mkdir $(pkgdatadir)/$$p"; \ - mkdir $(pkgdatadir)/$$p; \ + echo "mkdir $(DESTDIR)$(pkgdatadir)/$$p"; \ + mkdir $(DESTDIR)$(pkgdatadir)/$$p; \ done; \ THEME_FILES=`find $$theme -type f`; \ for p in $$THEME_FILES; do \ xarchon-fonts.patch: --- NEW FILE xarchon-fonts.patch --- --- xarchon-0.50/src/board.c.orig 2002-09-26 08:28:46.000000000 -0400 +++ xarchon-0.50/src/board.c 2002-09-26 08:29:02.000000000 -0400 @@ -27,7 +27,7 @@ #define FLOOR_DARK 0 /* steppings for light and dark */ #define FLOOR_LIGHT 7 /* outside luminance cycle */ -#define FONT_NAME "-misc-fixed-medium-*-normal-*-15-0-*-*-*-*-iso8859-1" +#define FONT_NAME "-misc-fixed-medium-*-normal-*-*-*-*-*-*-*-iso8859-1" #define V_CELL_YSIZE 40 /* revive cell height */ --- xarchon-0.50/src/field.c.orig 2002-09-26 08:22:45.000000000 -0400 +++ xarchon-0.50/src/field.c 2002-09-26 08:23:11.000000000 -0400 @@ -20,7 +20,7 @@ /* defines */ /*--------------------------------------------------------------------------*/ -#define FONT_NAME "-misc-fixed-medium-*-normal-*-40-0-*-*-*-*-iso8859-1" +#define FONT_NAME "-misc-fixed-medium-*-normal-*-*-*-*-*-*-*-iso8859-1" #define NUM_ROCKS 12 #define ROCK_DELAY 2 /* rocks delay time in frames */ --- NEW FILE xarchon.desktop --- [Desktop Entry] Name=XArchon Comment=Arcade board game Exec=xarchon Icon=xarchon Terminal=false Type=Application Encoding=UTF-8 Categories=Application;Game;ArcadeGame;BoardGame; --- NEW FILE xarchon.spec --- Name: xarchon Version: 0.50 Release: 2%{?dist} Summary: Arcade board game Group: Amusements/Games License: GPL URL: http://xarchon.seul.org/ Source0: http://xarchon.seul.org/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: %{name}-fonts.patch Patch1: %{name}-destdir.patch Patch2: http://ftp.debian.org/debian/pool/main/x/%{name}/%{name}_0.50-9.diff.gz Patch3: %{name}-0.50-extraqual.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel esound-devel libXpm-devel BuildRequires: desktop-file-utils ImageMagick %description XArchon is a chess with a twist board game. It is modelled after the golden oldie Archon game created by Freefall Associates. %prep %setup -q %patch0 -p1 %patch1 -p0 %patch2 -p1 %patch3 -p0 %build %configure make %{?_smp_mflags} convert data/icon.xpm %{name}.png %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_mandir}/man6/%{name}.6.gz %changelog * Sat May 13 2006 Hans de Goede 0.50-2 - consistent use of %%{name} (everywhere). - Add BR: libXPM-devel - Drop NEWS from %%doc as it contains no relevant information. * Thu May 11 2006 Hans de Goede 0.50-1 - Pick xarchon up from Ville and submit it for Review as Ville doens't have the time for this. * Tue Mar 14 2006 Ville Skytt?? - 0.50-0.2 - Fix build with gcc >= 3.4 (partially from Debian). - Install icon to %%{_datadir}/icons/hicolor. * Sat May 28 2005 Ville Skytt?? - 0.50-0.1 - Rebuild for FC4. * Sun Sep 14 2003 Ville Skytt?? - 0:0.50-0.fdr.3 - Install data into %%{_datadir}/games/xarchon. - Remove #---- section markers. * Sun Jun 1 2003 Ville Skytt?? - 0:0.50-0.fdr.2 - Spec cleanups. * Sat Mar 22 2003 Ville Skytt?? - 0:0.50-0.fdr.1 - Update to current Fedora guidelines. * Fri Feb 7 2003 Ville Skytt?? - 0.50-1.fedora.1 - First Fedora release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xarchon/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 18:48:58 -0000 1.1 +++ .cvsignore 15 May 2006 18:49:42 -0000 1.2 @@ -0,0 +1,2 @@ +xarchon-0.50.tar.gz +xarchon_0.50-9.diff.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xarchon/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 18:48:58 -0000 1.1 +++ sources 15 May 2006 18:49:42 -0000 1.2 @@ -0,0 +1,2 @@ +491dea5b4e61ed13cd988d1c184a8ef0 xarchon-0.50.tar.gz +903d8e4a90d24ac006d654e5a224076a xarchon_0.50-9.diff.gz From fedora-extras-commits at redhat.com Mon May 15 19:00:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 12:00:19 -0700 Subject: owners owners.list,1.997,1.998 Message-ID: <200605151900.k4FJ0LAK011925@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908/owners Modified Files: owners.list Log Message: add xarchon Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.997 retrieving revision 1.998 diff -u -r1.997 -r1.998 --- owners.list 15 May 2006 16:58:03 -0000 1.997 +++ owners.list 15 May 2006 19:00:18 -0000 1.998 @@ -1662,6 +1662,7 @@ Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org| Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org| Fedora Extras|x3270|An X Window System based IBM 3278/3279 terminal emulator|karsten at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|xarchon|Arcade board game|j.w.r.degoede at hhs.nl|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|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 19:03:05 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 12:03:05 -0700 Subject: comps comps-fe6.xml.in,1.14,1.15 Message-ID: <200605151903.k4FJ37vh014175@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14154/comps Modified Files: comps-fe6.xml.in Log Message: add xarchon Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- comps-fe6.xml.in 15 May 2006 16:00:49 -0000 1.14 +++ comps-fe6.xml.in 15 May 2006 19:03:04 -0000 1.15 @@ -257,6 +257,7 @@ viruskiller wesnoth worminator + xarchon xboard xpilot-ng xplanet From fedora-extras-commits at redhat.com Mon May 15 19:22:06 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:22:06 -0700 Subject: rpms/gauche-gtk - New directory Message-ID: <200605151922.k4FJM8bv014376@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14350/gauche-gtk Log Message: Directory /cvs/extras/rpms/gauche-gtk added to the repository From fedora-extras-commits at redhat.com Mon May 15 19:22:06 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:22:06 -0700 Subject: rpms/gauche-gtk/devel - New directory Message-ID: <200605151922.k4FJM800014379@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14350/gauche-gtk/devel Log Message: Directory /cvs/extras/rpms/gauche-gtk/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 19:22:34 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:22:34 -0700 Subject: rpms/gauche-gtk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151922.k4FJMaeW014428@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14395 Added Files: Makefile import.log Log Message: Setup of module gauche-gtk --- NEW FILE Makefile --- # Top level Makefile for module gauche-gtk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 19:22:34 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:22:34 -0700 Subject: rpms/gauche-gtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151922.k4FJMaKx014431@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14395/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gauche-gtk --- NEW 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 May 15 19:23:41 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:23:41 -0700 Subject: rpms/gauche-gtk import.log,1.1,1.2 Message-ID: <200605151924.k4FJODdc014515@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14473 Modified Files: import.log Log Message: auto-import gauche-gtk-0.4.1-7 on branch devel from gauche-gtk-0.4.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gauche-gtk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 19:22:34 -0000 1.1 +++ import.log 15 May 2006 19:23:40 -0000 1.2 @@ -0,0 +1 @@ +gauche-gtk-0_4_1-7:HEAD:gauche-gtk-0.4.1-7.src.rpm:1147721011 From fedora-extras-commits at redhat.com Mon May 15 19:23:41 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:23:41 -0700 Subject: rpms/gauche-gtk/devel Gauche-gtk-gtk28.patch, NONE, 1.1 gauche-gtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151924.k4FJODT0014519@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14473/devel Modified Files: .cvsignore sources Added Files: Gauche-gtk-gtk28.patch gauche-gtk.spec Log Message: auto-import gauche-gtk-0.4.1-7 on branch devel from gauche-gtk-0.4.1-7.src.rpm Gauche-gtk-gtk28.patch: --- NEW FILE Gauche-gtk-gtk28.patch --- --- Gauche-gtk-0.4.1/src/gtktexttag.stub.gtk28 2006-03-24 19:57:53.000000000 +0100 +++ Gauche-gtk-0.4.1/src/gtktexttag.stub 2006-03-24 19:58:05.000000000 +0100 @@ -36,7 +36,6 @@ (language-set :type ) (pad1 :type ) (pad2 :type ) - (pad3 :type ) ) (allocator (c "Scm_GtkObjectAllocate")) ) --- Gauche-gtk-0.4.1/src/gtktoolbar.stub.gtk28 2006-03-24 19:58:22.000000000 +0100 +++ Gauche-gtk-0.4.1/src/gtktoolbar.stub 2006-03-24 19:59:09.000000000 +0100 @@ -51,8 +51,6 @@ (tooltips :type ) (button-maxw :type ) (button-maxh :type ) - (style-set-connection :type ) - (icon-size-connection :type ) (style-set :type ) (icon-size-set :type ) ) --- NEW FILE gauche-gtk.spec --- %define gauche_version 0.8.7 Name: gauche-gtk Version: 0.4.1 Release: 7%{?dist} Summary: Gauche extension module to use GTK Group: Development/Languages License: BSD URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-gtk-0.4.1.tgz Patch0: Gauche-gtk-gtk28.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gauche-devel = %{gauche_version} BuildRequires: gtk2-devel BuildRequires: gtkglext-devel BuildRequires: libX11-devel BuildRequires: libXt-devel BuildRequires: libICE-devel Requires: gauche = %{gauche_version} Requires: gauche-gl %description Gauche extension module to use GTK. %prep %setup -q -n Gauche-gtk-%{version} %patch0 -p1 %build CFLAGS="`pkg-config --cflags freetype2` -fPIC" %configure --enable-gtkgl --enable-glgd --enable-glgd-pango make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT`gauche-config --syslibdir` mkdir -p $RPM_BUILD_ROOT`gauche-config --sysarchdir` make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.so' -exec chmod 0755 '{}' ';' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_libdir}/gauche %{_datadir}/gauche %doc COPYING README VERSION examples %changelog * Fri May 5 2006 Gerard Milmeister - 0.4.1-7 - Added include flags for freetype - Added -fPIC flag * Wed Feb 23 2005 Gerard Milmeister - 0:0.4.1-1 - New Version 0.4.1 * Fri Mar 19 2004 Gerard Milmeister - 0:0.4-0.fdr.1 - New Version 0.4 * Fri Mar 19 2004 Gerard Milmeister - 0:0.3.2-0.fdr.1 - New Version 0.3.2 * Mon Nov 10 2003 Gerard Milmeister - 0:0.3.1-0.fdr.1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gauche-gtk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 19:22:34 -0000 1.1 +++ .cvsignore 15 May 2006 19:23:41 -0000 1.2 @@ -0,0 +1 @@ +Gauche-gtk-0.4.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gauche-gtk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 19:22:34 -0000 1.1 +++ sources 15 May 2006 19:23:41 -0000 1.2 @@ -0,0 +1 @@ +18356efab446b9524be8371a3b852a6a Gauche-gtk-0.4.1.tgz From fedora-extras-commits at redhat.com Mon May 15 19:28:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:28:14 -0700 Subject: owners owners.list,1.998,1.999 Message-ID: <200605151928.k4FJSGYk014653@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14636 Modified Files: owners.list Log Message: added gauche-gtk Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.998 retrieving revision 1.999 diff -u -r1.998 -r1.999 --- owners.list 15 May 2006 19:00:18 -0000 1.998 +++ owners.list 15 May 2006 19:28:14 -0000 1.999 @@ -324,6 +324,7 @@ Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|gauche|Scheme script interpreter with multibyte character handling|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gauche-gl|OpenGL binding for Gauche|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|gauche-gtk|Gauche extension module to use GTK|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 19:31:03 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 15 May 2006 12:31:03 -0700 Subject: fedora-security/audit fc4,1.246,1.247 fc5,1.160,1.161 Message-ID: <200605151931.k4FJV4GY014702@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14682 Modified Files: fc4 fc5 Log Message: Note a new CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- fc4 15 May 2006 18:14:23 -0000 1.246 +++ fc4 15 May 2006 19:31:01 -0000 1.247 @@ -4,6 +4,7 @@ ** are items that need attention CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 +CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- fc5 15 May 2006 18:14:23 -0000 1.160 +++ fc5 15 May 2006 19:31:01 -0000 1.161 @@ -4,6 +4,7 @@ ** are items that need attention CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 +CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Mon May 15 19:48:29 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:29 -0700 Subject: rpms/lirc-kmod-common/FC-5 lirc-kmod-common.spec,1.1,1.2 Message-ID: <200605151948.k4FJmVtL016892@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod-common/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/lirc-kmod-common/FC-5 Modified Files: lirc-kmod-common.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: lirc-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod-common/FC-5/lirc-kmod-common.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lirc-kmod-common.spec 26 Jan 2006 22:29:32 -0000 1.1 +++ lirc-kmod-common.spec 15 May 2006 19:48:28 -0000 1.2 @@ -4,7 +4,7 @@ Name: %{kmod_name}-kmod-common Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Common files for LIRC kernel modules Group: System Environment/Kernel @@ -14,7 +14,7 @@ BuildArch: noarch Requires: lirc = %{version} -Requires: kmod-%{kmod_name} = %{version} +Requires: %{kmod_name}-kmod >= %{version} Requires: udev %description @@ -39,6 +39,9 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 0.8.0-3 +- Require *-kmod >= instead of kmod-* = to fix upgrade problems. + * Wed Dec 28 2005 Ville Skytt?? - 0.8.0-2 - Remove kmod-config(lirc) provision. From fedora-extras-commits at redhat.com Mon May 15 19:48:28 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:28 -0700 Subject: rpms/lirc-kmod/devel kmodtool,1.5,1.6 lirc-kmod.spec,1.7,1.8 Message-ID: <200605151948.k4FJmUu4016888@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/lirc-kmod/devel Modified Files: kmodtool lirc-kmod.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kmodtool 27 Apr 2006 16:47:45 -0000 1.5 +++ kmodtool 15 May 2006 19:48:28 -0000 1.6 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.7" +myver="0.10.9" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-modules = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lirc-kmod.spec 27 Apr 2006 16:47:45 -0000 1.7 +++ lirc-kmod.spec 15 May 2006 19:48:28 -0000 1.8 @@ -5,7 +5,7 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2096_FC5} +%{?kversion: %define kversion 2.6.16-1.2111_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 6.%(echo %{kverrel} | tr - _) +Release: 7.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,10 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 0.8.0-7 +- Require version >= of lirc-kmod-common. +- Provide lirc-kmod instead of kmod-lirc to fix upgrade problems. + * Thu Apr 27 2006 Ville Skytt?? - 0.8.0-6 - Provide "kernel-modules" instead of "kernel-module" to match yum's config. - s/%%{kver}/%%{kversion}/ for consistency with other vars. From fedora-extras-commits at redhat.com Mon May 15 19:48:29 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:29 -0700 Subject: rpms/lirc-kmod-common/devel lirc-kmod-common.spec,1.1,1.2 Message-ID: <200605151948.k4FJmVJj016896@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/lirc-kmod-common/devel Modified Files: lirc-kmod-common.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: lirc-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod-common/devel/lirc-kmod-common.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lirc-kmod-common.spec 26 Jan 2006 22:29:32 -0000 1.1 +++ lirc-kmod-common.spec 15 May 2006 19:48:29 -0000 1.2 @@ -4,7 +4,7 @@ Name: %{kmod_name}-kmod-common Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Common files for LIRC kernel modules Group: System Environment/Kernel @@ -14,7 +14,7 @@ BuildArch: noarch Requires: lirc = %{version} -Requires: kmod-%{kmod_name} = %{version} +Requires: %{kmod_name}-kmod >= %{version} Requires: udev %description @@ -39,6 +39,9 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 0.8.0-3 +- Require *-kmod >= instead of kmod-* = to fix upgrade problems. + * Wed Dec 28 2005 Ville Skytt?? - 0.8.0-2 - Remove kmod-config(lirc) provision. From fedora-extras-commits at redhat.com Mon May 15 19:48:21 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:21 -0700 Subject: rpms/thinkpad-kmod/FC-5 kmodtool, 1.4, 1.5 thinkpad-kmod.spec, 1.8, 1.9 Message-ID: <200605151948.k4FJmrkm016907@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/thinkpad-kmod/FC-5 Modified Files: kmodtool thinkpad-kmod.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/kmodtool,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kmodtool 27 Apr 2006 16:45:40 -0000 1.4 +++ kmodtool 15 May 2006 19:48:21 -0000 1.5 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.7" +myver="0.10.9" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-modules = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thinkpad-kmod.spec 27 Apr 2006 16:45:40 -0000 1.8 +++ thinkpad-kmod.spec 15 May 2006 19:48:21 -0000 1.9 @@ -3,7 +3,7 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2096_FC5} +%{?kversion: %define kversion 2.6.16-1.2111_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -19,7 +19,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 5.%(echo %{kverrel} | tr - _) +Release: 6.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -65,6 +65,10 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 5.9-6 +- Require version >= of thinkpad-kmod-common. +- Provide thinkpad-kmod instead of kmod-thinkpad to fix upgrade problems. + * Thu Apr 27 2006 Ville Skytt?? - 5.9-5 - Provide "kernel-modules" instead of "kernel-module" to match yum's config. - s/%%{kver}/%%{kversion}/ for consistency with other vars. From fedora-extras-commits at redhat.com Mon May 15 19:48:22 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:22 -0700 Subject: rpms/thinkpad-kmod-common/FC-5 thinkpad-kmod-common.spec,1.3,1.4 Message-ID: <200605151948.k4FJmsEI016910@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod-common/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/thinkpad-kmod-common/FC-5 Modified Files: thinkpad-kmod-common.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: thinkpad-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/FC-5/thinkpad-kmod-common.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thinkpad-kmod-common.spec 13 Mar 2006 21:20:41 -0000 1.3 +++ thinkpad-kmod-common.spec 15 May 2006 19:48:21 -0000 1.4 @@ -3,7 +3,7 @@ Name: %{kmod_name}-kmod-common Version: 5.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common files for supplemental ThinkPad?? kernel modules License: GPL @@ -13,7 +13,7 @@ Source1: %{name}-console.perms Source2: %{name}.modules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: kmod-%{kmod_name} = %{version} +Requires: %{kmod_name}-kmod >= %{version} Requires: pam >= 0.79-8 Requires: initscripts >= 8.08-1 @@ -56,6 +56,9 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 5.9-2 +- Require *-kmod >= instead of kmod-* = to fix upgrade problems. + * Sat Feb 25 2006 Ville Skytt?? - 5.9-1 - 5.9. From fedora-extras-commits at redhat.com Mon May 15 19:48:22 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:22 -0700 Subject: rpms/lirc-kmod/FC-5 kmodtool,1.4,1.5 lirc-kmod.spec,1.7,1.8 Message-ID: <200605151948.k4FJmsJA016914@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/lirc-kmod/FC-5 Modified Files: kmodtool lirc-kmod.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/kmodtool,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kmodtool 27 Apr 2006 16:47:45 -0000 1.4 +++ kmodtool 15 May 2006 19:48:22 -0000 1.5 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.7" +myver="0.10.9" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-modules = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lirc-kmod.spec 27 Apr 2006 16:47:45 -0000 1.7 +++ lirc-kmod.spec 15 May 2006 19:48:22 -0000 1.8 @@ -5,7 +5,7 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2096_FC5} +%{?kversion: %define kversion 2.6.16-1.2111_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 6.%(echo %{kverrel} | tr - _) +Release: 7.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,10 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 0.8.0-7 +- Require version >= of lirc-kmod-common. +- Provide lirc-kmod instead of kmod-lirc to fix upgrade problems. + * Thu Apr 27 2006 Ville Skytt?? - 0.8.0-6 - Provide "kernel-modules" instead of "kernel-module" to match yum's config. - s/%%{kver}/%%{kversion}/ for consistency with other vars. From fedora-extras-commits at redhat.com Mon May 15 20:26:36 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 15 May 2006 13:26:36 -0700 Subject: owners owners.list,1.999,1.1000 Message-ID: <200605152026.k4FKQcdZ019584@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19567 Modified Files: owners.list Log Message: new owner of pork: Ryan McCabe Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.999 retrieving revision 1.1000 diff -u -r1.999 -r1.1000 --- owners.list 15 May 2006 19:28:14 -0000 1.999 +++ owners.list 15 May 2006 20:26:36 -0000 1.1000 @@ -1287,7 +1287,7 @@ Fedora Extras|polyxmass-data|Contains configuration files describing polymer chemistry|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|polyxmass-doc|Documentation for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|pop-before-smtp|Watch log for POP/IMAP auth, notify MTA to allow relay|wtogami at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|pork|Console based AIM client that looks like ircII|lmacken at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|pork|Console based AIM client that looks like ircII|rmccabe at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|portaudio|Free, cross platform, open-source, audio I/O library|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|powermanga|Arcade 2D shoot-them-up game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ppracer|3D racing game featuring Tux|nphilipp at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 20:36:49 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 13:36:49 -0700 Subject: extras-buildsys/utils extras-repobuild.py,1.17,1.18 Message-ID: <200605152036.k4FKandI019744@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19726 Modified Files: extras-repobuild.py Log Message: "grep -v" stuff we don't want to repomanage (kmods for now) while waiting for https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=604 Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- extras-repobuild.py 11 May 2006 16:07:40 -0000 1.17 +++ extras-repobuild.py 15 May 2006 20:36:46 -0000 1.18 @@ -35,6 +35,12 @@ '5':['ppc','x86_64', 'i386'], 'development':['ppc','x86_64','i386'], } +# packages to exclude from being repomanaged: dist => shell quoted path regexp +keepdict = {'3': "'/\([^/]\+-\)\?kmod-'", + '4': "'/\([^/]\+-\)\?kmod-'", + '5': "'/\([^/]\+-\)\?kmod-'", + 'development': "'/\([^/]\+-\)\?kmod-'", + } ts = rpmUtils.transaction.initReadOnlyTransaction() @@ -56,7 +62,7 @@ sys.exit(result) -def do_repo_stuff(repodir, keep=2): +def do_repo_stuff(repodir, keep=2, nomanage=None): compspath = os.path.join(repodir, compsname) rpdata = os.path.join(repodir, 'repodata') debugprint('removing tree %s' % rpdata) @@ -66,7 +72,11 @@ print 'processing: %s' % repodir print 'Cleaning up older packages (keeping %d latest)' % (keep) - cmd = '/usr/bin/repomanage -c -k%d -o %s | xargs rm -f' % (keep, repodir) + repomanage = '/usr/bin/repomanage -c -k%d -o %s' % (keep, repodir) + if nomanage: + cmd = '%s | grep -v %s | xargs rm -f' % (repomanage, nomanage) + else: + cmd = '%s | xargs rm -f' % repomanage run_and_check(cmd) print 'Creating repository metadata' @@ -102,12 +112,12 @@ print "Making Repository Metadata" - do_repo_stuff(os.path.join(destdir, 'SRPMS'), keep) + do_repo_stuff(os.path.join(destdir, 'SRPMS'), keep, keepdict.get(dist)) # arch repo creation for arch in archdict[dist]: repodir = os.path.join(destdir, arch) - do_repo_stuff(repodir, keep) + do_repo_stuff(repodir, keep, keepdict.get(dist)) if __name__ == '__main__': me = os.getcwd() From fedora-extras-commits at redhat.com Mon May 15 20:40:39 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 15 May 2006 13:40:39 -0700 Subject: owners owners.list,1.1000,1.1001 Message-ID: <200605152040.k4FKefu5019783@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19766 Modified Files: owners.list Log Message: Take over orphan tpb, xosd, and lrmi Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1000 retrieving revision 1.1001 diff -u -r1.1000 -r1.1001 --- owners.list 15 May 2006 20:26:36 -0000 1.1000 +++ owners.list 15 May 2006 20:40:39 -0000 1.1001 @@ -729,7 +729,7 @@ Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|lrmi|Library for calling real mode BIOS routines|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|lrmi|Library for calling real mode BIOS routines|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|fedora at soeterbroek.com|extras-qa at fedoraproject.org| Fedora Extras|lua|A powerful light-weight programming language|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org| @@ -1593,7 +1593,7 @@ Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|torque|Tera-scale Open-source Resource and QUEue manager|garrick at usc.edu|extras-qa at fedoraproject.org| Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|tpb|IBM ThinkPad button support utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|tpb|IBM ThinkPad button support utility|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|tpctl|IBM ThinkPad configuration tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org| Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| @@ -1740,7 +1740,7 @@ Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|xosd|On-screen display library for X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|xosd|On-screen display library for X|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|xpilot-ng|Space arcade game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 21:22:07 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 14:22:07 -0700 Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.93,1.94 Message-ID: <200605152122.k4FLM720022450@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22432 Modified Files: fedora-rpmdevtools.spec Log Message: 1.6. Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- fedora-rpmdevtools.spec 2 Apr 2006 22:08:11 -0000 1.93 +++ fedora-rpmdevtools.spec 15 May 2006 21:22:05 -0000 1.94 @@ -3,7 +3,7 @@ %define spectool_version 1.0.7 Name: fedora-rpmdevtools -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Fedora RPM Development Tools @@ -127,7 +127,7 @@ %changelog -* Mon Apr 3 2006 Ville Skytt?? +* Tue May 16 2006 Ville Skytt?? - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). * Sun Feb 26 2006 Ville Skytt?? - 1.5-1 From fedora-extras-commits at redhat.com Mon May 15 21:28:34 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 14:28:34 -0700 Subject: rpms/fedora-rpmdevtools/FC-4 .cvsignore, 1.12, 1.13 fedora-rpmdevtools.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <200605152128.k4FLSa5g022549@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-serv22496/FC-4 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: * Tue May 16 2006 Ville Skytt?? - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Feb 2006 16:09:18 -0000 1.12 +++ .cvsignore 15 May 2006 21:28:34 -0000 1.13 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.5.tar.bz2 spectool-1.0.7.tar.bz2 +fedora-rpmdevtools-1.6.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/fedora-rpmdevtools.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fedora-rpmdevtools.spec 26 Feb 2006 16:09:18 -0000 1.15 +++ fedora-rpmdevtools.spec 15 May 2006 21:28:34 -0000 1.16 @@ -3,7 +3,7 @@ %define spectool_version 1.0.7 Name: fedora-rpmdevtools -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Fedora RPM Development Tools @@ -127,6 +127,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 1.6-1 +- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). + * Sun Feb 26 2006 Ville Skytt?? - 1.5-1 - Improve diffarchive and extract error messages. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Feb 2006 16:09:18 -0000 1.12 +++ sources 15 May 2006 21:28:34 -0000 1.13 @@ -1,2 +1,2 @@ -8b9e391f9da90a78ccb62db05e961bc3 fedora-rpmdevtools-1.5.tar.bz2 e2b1668f39c085807cae5a770c252dd5 spectool-1.0.7.tar.bz2 +519d4a9be78b7bcccbfa7a4390c735ed fedora-rpmdevtools-1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 21:28:35 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 14:28:35 -0700 Subject: rpms/fedora-rpmdevtools/FC-5 .cvsignore, 1.12, 1.13 fedora-rpmdevtools.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <200605152128.k4FLSbEa022555@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22496/FC-5 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: * Tue May 16 2006 Ville Skytt?? - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Feb 2006 16:09:25 -0000 1.12 +++ .cvsignore 15 May 2006 21:28:35 -0000 1.13 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.5.tar.bz2 spectool-1.0.7.tar.bz2 +fedora-rpmdevtools-1.6.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-5/fedora-rpmdevtools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fedora-rpmdevtools.spec 26 Feb 2006 16:09:25 -0000 1.16 +++ fedora-rpmdevtools.spec 15 May 2006 21:28:35 -0000 1.17 @@ -3,7 +3,7 @@ %define spectool_version 1.0.7 Name: fedora-rpmdevtools -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Fedora RPM Development Tools @@ -127,6 +127,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 1.6-1 +- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). + * Sun Feb 26 2006 Ville Skytt?? - 1.5-1 - Improve diffarchive and extract error messages. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Feb 2006 16:09:25 -0000 1.12 +++ sources 15 May 2006 21:28:35 -0000 1.13 @@ -1,2 +1,2 @@ -8b9e391f9da90a78ccb62db05e961bc3 fedora-rpmdevtools-1.5.tar.bz2 e2b1668f39c085807cae5a770c252dd5 spectool-1.0.7.tar.bz2 +519d4a9be78b7bcccbfa7a4390c735ed fedora-rpmdevtools-1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 21:28:36 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 14:28:36 -0700 Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.12, 1.13 fedora-rpmdevtools.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <200605152128.k4FLScwZ022561@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22496/devel Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: * Tue May 16 2006 Ville Skytt?? - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Feb 2006 16:09:25 -0000 1.12 +++ .cvsignore 15 May 2006 21:28:36 -0000 1.13 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.5.tar.bz2 spectool-1.0.7.tar.bz2 +fedora-rpmdevtools-1.6.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fedora-rpmdevtools.spec 26 Feb 2006 16:09:25 -0000 1.16 +++ fedora-rpmdevtools.spec 15 May 2006 21:28:36 -0000 1.17 @@ -3,7 +3,7 @@ %define spectool_version 1.0.7 Name: fedora-rpmdevtools -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Fedora RPM Development Tools @@ -127,6 +127,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 1.6-1 +- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). + * Sun Feb 26 2006 Ville Skytt?? - 1.5-1 - Improve diffarchive and extract error messages. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Feb 2006 16:09:25 -0000 1.12 +++ sources 15 May 2006 21:28:36 -0000 1.13 @@ -1,2 +1,2 @@ -8b9e391f9da90a78ccb62db05e961bc3 fedora-rpmdevtools-1.5.tar.bz2 e2b1668f39c085807cae5a770c252dd5 spectool-1.0.7.tar.bz2 +519d4a9be78b7bcccbfa7a4390c735ed fedora-rpmdevtools-1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 21:33:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 14:33:07 -0700 Subject: rpms/gauche-gtk/FC-4 gauche-gtk.spec,1.1,1.2 Message-ID: <200605152133.k4FLX93b022742@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22720 Modified Files: gauche-gtk.spec Log Message: Index: gauche-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/gauche-gtk/FC-4/gauche-gtk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gauche-gtk.spec 15 May 2006 19:23:41 -0000 1.1 +++ gauche-gtk.spec 15 May 2006 21:33:07 -0000 1.2 @@ -2,7 +2,7 @@ Name: gauche-gtk Version: 0.4.1 -Release: 7%{?dist} +Release: 7%{?dist}.1 Summary: Gauche extension module to use GTK Group: Development/Languages @@ -14,9 +14,7 @@ BuildRequires: gauche-devel = %{gauche_version} BuildRequires: gtk2-devel BuildRequires: gtkglext-devel -BuildRequires: libX11-devel -BuildRequires: libXt-devel -BuildRequires: libICE-devel +BuildRequires: xorg-x11-devel Requires: gauche = %{gauche_version} Requires: gauche-gl From fedora-extras-commits at redhat.com Mon May 15 21:33:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 14:33:22 -0700 Subject: rpms/perl-Test-Portability-Files/FC-5 perl-Test-Portability-Files.spec, 1.2, 1.3 Message-ID: <200605152133.k4FLXOP8022833@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22813 Modified Files: perl-Test-Portability-Files.spec Log Message: Roll back to 0.05-1. Index: perl-Test-Portability-Files.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/FC-5/perl-Test-Portability-Files.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-Portability-Files.spec 12 May 2006 22:56:04 -0000 1.2 +++ perl-Test-Portability-Files.spec 15 May 2006 21:33:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-Portability-Files Version: 0.05 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Check file names portability License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/S/SA/SAPER/Test-Portability-Files-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,24 +21,19 @@ %setup -q -n Test-Portability-Files-%{version} %build -#%{__perl} Build.PL installdirs=vendor -%{__perl} Makefile.PL INSTALLDIRS=vendor -#./Build -make +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -#./Build test -make test +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -50,8 +45,5 @@ %{_mandir}/man3/* %changelog -* Fri May 12 2006 Steven Pritchard 0.05-2 -- Use Makefile.PL temporarily to work around Module::Build breakage. - * Fri May 12 2006 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.66. From fedora-extras-commits at redhat.com Mon May 15 21:34:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 14:34:22 -0700 Subject: rpms/perl-Test-Portability-Files/FC-4 perl-Test-Portability-Files.spec, 1.2, 1.3 Message-ID: <200605152134.k4FLYO67023044@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23019 Modified Files: perl-Test-Portability-Files.spec Log Message: Roll back to 0.05-1. Index: perl-Test-Portability-Files.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/FC-4/perl-Test-Portability-Files.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-Portability-Files.spec 12 May 2006 22:56:04 -0000 1.2 +++ perl-Test-Portability-Files.spec 15 May 2006 21:34:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-Portability-Files Version: 0.05 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Check file names portability License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/S/SA/SAPER/Test-Portability-Files-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,24 +21,19 @@ %setup -q -n Test-Portability-Files-%{version} %build -#%{__perl} Build.PL installdirs=vendor -%{__perl} Makefile.PL INSTALLDIRS=vendor -#./Build -make +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -#./Build test -make test +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -50,8 +45,5 @@ %{_mandir}/man3/* %changelog -* Fri May 12 2006 Steven Pritchard 0.05-2 -- Use Makefile.PL temporarily to work around Module::Build breakage. - * Fri May 12 2006 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.66. From fedora-extras-commits at redhat.com Mon May 15 21:51:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 14:51:39 -0700 Subject: rpms/perl-Pod-Readme/FC-5 perl-Pod-Readme.spec,1.2,1.3 Message-ID: <200605152151.k4FLpfZk023565@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23548 Modified Files: perl-Pod-Readme.spec Log Message: Roll back to 0.081-1. Index: perl-Pod-Readme.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/FC-5/perl-Pod-Readme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Pod-Readme.spec 12 May 2006 23:16:27 -0000 1.2 +++ perl-Pod-Readme.spec 15 May 2006 21:51:39 -0000 1.3 @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Pod-Readme-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) @@ -29,24 +29,19 @@ %setup -q -n Pod-Readme-%{version} %build -#%{__perl} Build.PL installdirs=vendor -%{__perl} Makefile.PL INSTALLDIRS=vendor -#./Build -make +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -#DEVEL_TESTS=1 ./Build test -DEVEL_TESTS=1 make test +DEVEL_TESTS=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -60,9 +55,6 @@ %{_mandir}/man3/* %changelog -* Fri May 12 2006 Steven Pritchard 0.081-2 -- Use Makefile.PL temporarily to work around Module::Build breakage. - * Fri May 12 2006 Steven Pritchard 0.081-1 - Specfile autogenerated by cpanspec 1.66. - Remove explicit perl dep. From fedora-extras-commits at redhat.com Mon May 15 21:52:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 14:52:24 -0700 Subject: rpms/perl-Pod-Readme/FC-4 perl-Pod-Readme.spec,1.2,1.3 Message-ID: <200605152152.k4FLqQJB023631@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23614 Modified Files: perl-Pod-Readme.spec Log Message: Roll back to 0.081-1. Index: perl-Pod-Readme.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/FC-4/perl-Pod-Readme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Pod-Readme.spec 12 May 2006 23:16:27 -0000 1.2 +++ perl-Pod-Readme.spec 15 May 2006 21:52:24 -0000 1.3 @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Pod-Readme-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) @@ -29,24 +29,19 @@ %setup -q -n Pod-Readme-%{version} %build -#%{__perl} Build.PL installdirs=vendor -%{__perl} Makefile.PL INSTALLDIRS=vendor -#./Build -make +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -#DEVEL_TESTS=1 ./Build test -DEVEL_TESTS=1 make test +DEVEL_TESTS=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -60,9 +55,6 @@ %{_mandir}/man3/* %changelog -* Fri May 12 2006 Steven Pritchard 0.081-2 -- Use Makefile.PL temporarily to work around Module::Build breakage. - * Fri May 12 2006 Steven Pritchard 0.081-1 - Specfile autogenerated by cpanspec 1.66. - Remove explicit perl dep. From fedora-extras-commits at redhat.com Mon May 15 22:31:10 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 15 May 2006 15:31:10 -0700 Subject: rpms/rogue/devel rogue-5.4-setgid.patch,1.1,1.2 rogue.spec,1.4,1.5 Message-ID: <200605152231.k4FMVCNZ026311@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26285 Modified Files: rogue-5.4-setgid.patch rogue.spec Log Message: More improved setgid handling. rogue-5.4-setgid.patch: Index: rogue-5.4-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue-5.4-setgid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue-5.4-setgid.patch 11 Apr 2006 01:50:23 -0000 1.1 +++ rogue-5.4-setgid.patch 15 May 2006 22:31:10 -0000 1.2 @@ -1,4 +1,4 @@ -diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c +diff -Naur rogue/extern.c rogue.new/extern.c --- rogue/extern.c 2006-01-03 16:17:29.000000000 -0800 +++ rogue.new/extern.c 2006-03-30 13:24:12.000000000 -0800 @@ -111,7 +111,7 @@ @@ -10,7 +10,7 @@ int food_left; /* Amount of food in hero's stomach */ int lastscore = -1; /* Score before this turn */ int no_command = 0; /* Number of turns asleep */ -diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h +diff -Naur rogue/extern.h rogue.new/extern.h --- rogue/extern.h 2006-03-19 11:22:14.000000000 -0800 +++ rogue.new/extern.h 2006-03-30 13:24:22.000000000 -0800 @@ -50,7 +50,7 @@ @@ -22,7 +22,7 @@ #ifdef TIOCGLTC extern struct ltchars ltc; -diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c +diff -Naur rogue/mach_dep.c rogue.new/mach_dep.c --- rogue/mach_dep.c 2006-01-30 08:36:21.000000000 -0800 +++ rogue.new/mach_dep.c 2006-04-01 19:26:15.000000000 -0800 @@ -45,7 +45,9 @@ @@ -87,7 +87,7 @@ md_normaluser(); } -diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c +diff -Naur rogue/main.c rogue.new/main.c --- rogue/main.c 2006-01-29 16:11:32.000000000 -0800 +++ rogue.new/main.c 2006-03-30 13:40:16.000000000 -0800 @@ -24,6 +24,13 @@ @@ -112,9 +112,9 @@ if (argc == 2) if (strcmp(argv[1], "-s") == 0) { -diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c +diff -Naur rogue/mdport.c rogue.new/mdport.c --- rogue/mdport.c 2006-01-29 18:24:39.000000000 -0800 -+++ rogue.new/mdport.c 2006-04-01 19:26:16.000000000 -0800 ++++ rogue.new/mdport.c 2006-04-11 19:26:43.000000000 -0700 @@ -193,8 +193,17 @@ md_normaluser() { @@ -135,49 +135,54 @@ #endif } -@@ -397,22 +406,31 @@ - char * - md_getroguedir() - { -- static char path[1024]; -+ static char path[PATH_MAX]; - char *end,*home; - - if ( (home = getenv("ROGUEHOME")) != NULL) - { - if (*home) - { -- strncpy(path, home, PATH_MAX - 20); -- -- end = &path[strlen(path)-1]; -- -- while( (end >= path) && ((*end == '/') || (*end == '\\'))) -- *end-- = '\0'; -- -- if (directory_exists(path)) -- return(path); -+ if (strlen(home) > PATH_MAX-20) { +@@ -397,22 +406,35 @@ + char * + md_getroguedir() + { +- static char path[1024]; ++ static char path[PATH_MAX]; + char *end,*home; + +- if ( (home = getenv("ROGUEHOME")) != NULL) ++ /* Disable the use of ROGUEHOME to prevent users from ++ * maliciously overwriting save files from other setgid games. ++ */ ++ if ( (home = getenv("ROGUEHOME")) != NULL && 0) + { + if (*home) + { +- strncpy(path, home, PATH_MAX - 20); +- +- end = &path[strlen(path)-1]; +- +- while( (end >= path) && ((*end == '/') || (*end == '\\'))) +- *end-- = '\0'; +- +- if (directory_exists(path)) +- return(path); ++ /* The magic number 20 is used to guarantee that the save/lock ++ * filenames (which are much shorter than 20 characters) can ++ * be appended to this buffer. ++ */ ++ if (strlen(home) >= PATH_MAX-20) { + fprintf(stderr, "ROGUEHOME path is too long. Ignoring.\n"); + } else { -+ strncpy(path, home, PATH_MAX-20); -+ /* Ensure that we have a terminating NULL character. -+ */ -+ path[PATH_MAX-1] = (char)NULL; -+ -+ end = &path[strlen(path)-1]; -+ ++ strcpy(path, home); ++ ++ end = &path[strlen(path)-1]; ++ + /* Strip off any trailing path separators from the path. + */ -+ while( (end >= path) && ((*end == '/') || (*end == '\\'))) -+ *end-- = '\0'; -+ -+ if (directory_exists(path)) -+ return(path); ++ while( (end >= path) && ((*end == '/') || (*end == '\\'))) ++ *end-- = '\0'; ++ ++ if (directory_exists(path)) ++ return(path); + } - } - } - -diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c + } + } + +diff -Naur rogue/rip.c rogue.new/rip.c --- rogue/rip.c 2006-01-03 16:17:29.000000000 -0800 +++ rogue.new/rip.c 2006-03-30 13:32:17.000000000 -0800 @@ -60,7 +60,6 @@ @@ -239,7 +244,7 @@ } /* -diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c +diff -Naur rogue/save.c rogue.new/save.c --- rogue/save.c 2006-01-30 08:05:35.000000000 -0800 +++ rogue.new/save.c 2006-03-30 13:33:45.000000000 -0800 @@ -335,7 +335,40 @@ @@ -302,7 +307,7 @@ sscanf(scoreline, " %u %hu %u %hu %hu %lx \n", &top_ten[i].sc_uid, &top_ten[i].sc_score, &top_ten[i].sc_flags, &top_ten[i].sc_monster, -diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c +diff -Naur rogue/state.c rogue.new/state.c --- rogue/state.c 2006-01-03 16:17:29.000000000 -0800 +++ rogue.new/state.c 2006-03-30 13:09:46.000000000 -0800 @@ -2138,7 +2138,8 @@ Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rogue.spec 11 Apr 2006 01:50:23 -0000 1.4 +++ rogue.spec 15 May 2006 22:31:10 -0000 1.5 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -78,6 +78,9 @@ %changelog +* Mon May 15 2006 Wart 5.4.2-5 +- Better setuid/setgid handling (again) (BZ #187392) + * Thu Mar 30 2006 Wart 5.4.2-4 - Better setuid/setgid handling (BZ #187392) - Resize desktop icon to match directory name From fedora-extras-commits at redhat.com Mon May 15 22:49:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 15 May 2006 15:49:02 -0700 Subject: rpms/rogue/devel rogue-5.4-setgid.patch,1.2,1.3 Message-ID: <200605152249.k4FMn5wV026726@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26705 Modified Files: rogue-5.4-setgid.patch Log Message: Fix patch to apply cleanly. rogue-5.4-setgid.patch: Index: rogue-5.4-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue-5.4-setgid.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rogue-5.4-setgid.patch 15 May 2006 22:31:10 -0000 1.2 +++ rogue-5.4-setgid.patch 15 May 2006 22:49:02 -0000 1.3 @@ -1,6 +1,6 @@ diff -Naur rogue/extern.c rogue.new/extern.c --- rogue/extern.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/extern.c 2006-03-30 13:24:12.000000000 -0800 ++++ rogue.new/extern.c 2006-05-15 15:43:43.000000000 -0700 @@ -111,7 +111,7 @@ }; @@ -11,8 +11,8 @@ int lastscore = -1; /* Score before this turn */ int no_command = 0; /* Number of turns asleep */ diff -Naur rogue/extern.h rogue.new/extern.h ---- rogue/extern.h 2006-03-19 11:22:14.000000000 -0800 -+++ rogue.new/extern.h 2006-03-30 13:24:22.000000000 -0800 +--- rogue/extern.h 2006-05-15 15:43:15.000000000 -0700 ++++ rogue.new/extern.h 2006-05-15 15:43:43.000000000 -0700 @@ -50,7 +50,7 @@ extern char fruit[], orig_dsusp, prbuf[], whoami[]; @@ -24,7 +24,7 @@ extern struct ltchars ltc; diff -Naur rogue/mach_dep.c rogue.new/mach_dep.c --- rogue/mach_dep.c 2006-01-30 08:36:21.000000000 -0800 -+++ rogue.new/mach_dep.c 2006-04-01 19:26:15.000000000 -0800 ++++ rogue.new/mach_dep.c 2006-05-15 15:43:43.000000000 -0700 @@ -45,7 +45,9 @@ #include #include @@ -89,7 +89,7 @@ diff -Naur rogue/main.c rogue.new/main.c --- rogue/main.c 2006-01-29 16:11:32.000000000 -0800 -+++ rogue.new/main.c 2006-03-30 13:40:16.000000000 -0800 ++++ rogue.new/main.c 2006-05-15 15:43:43.000000000 -0700 @@ -24,6 +24,13 @@ char *env; int lowtime; @@ -114,7 +114,7 @@ { diff -Naur rogue/mdport.c rogue.new/mdport.c --- rogue/mdport.c 2006-01-29 18:24:39.000000000 -0800 -+++ rogue.new/mdport.c 2006-04-11 19:26:43.000000000 -0700 ++++ rogue.new/mdport.c 2006-05-15 15:45:21.000000000 -0700 @@ -193,8 +193,17 @@ md_normaluser() { @@ -136,30 +136,30 @@ } @@ -397,22 +406,35 @@ - char * - md_getroguedir() - { -- static char path[1024]; -+ static char path[PATH_MAX]; - char *end,*home; - -- if ( (home = getenv("ROGUEHOME")) != NULL) + char * + md_getroguedir() + { +- static char path[1024]; ++ static char path[PATH_MAX]; + char *end,*home; + +- if ( (home = getenv("ROGUEHOME")) != NULL) + /* Disable the use of ROGUEHOME to prevent users from + * maliciously overwriting save files from other setgid games. + */ + if ( (home = getenv("ROGUEHOME")) != NULL && 0) - { - if (*home) - { -- strncpy(path, home, PATH_MAX - 20); -- -- end = &path[strlen(path)-1]; -- -- while( (end >= path) && ((*end == '/') || (*end == '\\'))) -- *end-- = '\0'; -- -- if (directory_exists(path)) -- return(path); + { + if (*home) + { +- strncpy(path, home, PATH_MAX - 20); +- +- end = &path[strlen(path)-1]; +- +- while( (end >= path) && ((*end == '/') || (*end == '\\'))) +- *end-- = '\0'; +- +- if (directory_exists(path)) +- return(path); + /* The magic number 20 is used to guarantee that the save/lock + * filenames (which are much shorter than 20 characters) can + * be appended to this buffer. @@ -179,12 +179,12 @@ + if (directory_exists(path)) + return(path); + } - } - } - + } + } + diff -Naur rogue/rip.c rogue.new/rip.c --- rogue/rip.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/rip.c 2006-03-30 13:32:17.000000000 -0800 ++++ rogue.new/rip.c 2006-05-15 15:43:43.000000000 -0700 @@ -60,7 +60,6 @@ int i; SCORE *sc2; @@ -246,7 +246,7 @@ /* diff -Naur rogue/save.c rogue.new/save.c --- rogue/save.c 2006-01-30 08:05:35.000000000 -0800 -+++ rogue.new/save.c 2006-03-30 13:33:45.000000000 -0800 ++++ rogue.new/save.c 2006-05-15 15:43:43.000000000 -0700 @@ -335,7 +335,40 @@ /* @@ -309,7 +309,7 @@ &top_ten[i].sc_flags, &top_ten[i].sc_monster, diff -Naur rogue/state.c rogue.new/state.c --- rogue/state.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/state.c 2006-03-30 13:09:46.000000000 -0800 ++++ rogue.new/state.c 2006-05-15 15:43:43.000000000 -0700 @@ -2138,7 +2138,8 @@ rs_write_int(savef, no_food); rs_write_ints(savef,a_class,MAXARMORS); From fedora-extras-commits at redhat.com Mon May 15 23:08:15 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Mon, 15 May 2006 16:08:15 -0700 Subject: rpms/torque/devel README-localhost,NONE,1.1 torque.spec,1.6,1.7 Message-ID: <200605152308.k4FN8HZn029102@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29084 Modified Files: torque.spec Added Files: README-localhost Log Message: * Mon May 15 2006 Garrick Staples 2.1.0p0-3 - get rid of the annoying "localhost only" package --- NEW FILE README-localhost --- To setup a basic single-node localhost-only batch system, install the torque-server, torque-mom, and torque-scheduler packages, and do something like this: /sbin/chkconfig pbs_mom on /sbin/chkconfig pbs_server on /sbin/chkconfig pbs_sched on /bin/hostname --long > %{torquehomedir}/server_priv/nodes /bin/hostname --long > %{torquehomedir}/server_name service pbs_server start qmgr -c "s s scheduling=true" qmgr -c "c q batch queue_type=execution" qmgr -c "s q batch started=true" qmgr -c "s q batch enabled=true" qmgr -c "s q batch resources_default.nodes=1" qmgr -c "s q batch resources_default.walltime=3600" qmgr -c "s s default_queue=batch" service pbs_mom restart service pbs_sched restart Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- torque.spec 13 May 2006 05:10:31 -0000 1.6 +++ torque.spec 15 May 2006 23:08:15 -0000 1.7 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 2 +%define release 3 # The following options are supported: # --with server_name=hostname @@ -90,6 +90,7 @@ Source3: xpbsmon.desktop Source4: xpbs.png Source5: xpbsmon.png +Source6: README-localhost Patch1: torque-2.1.0-remove-rpath.path Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) @@ -99,6 +100,7 @@ Provides: pbs BuildRequires: desktop-file-utils Conflicts: pbspro, openpbs, openpbs-oscar +Obsoletes: torque-localhost %if %use_tcl BuildRequires: tcl-devel @@ -122,7 +124,7 @@ %patch1 -p1 %patch2 -p0 -%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . +%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} . %build @@ -194,7 +196,7 @@ %files %defattr(-, root, root) -%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt +%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost %config(noreplace) %{torquehomedir}/pbs_environment %config(noreplace) %{torquehomedir}/server_name %{torquehomedir}/aux @@ -350,45 +352,6 @@ %endif -%package localhost -Group: Applications/System -Summary: Installs and configures a minimal localhost-only batch queue system -Requires(post): %{name}-mom %{name}-server %{name}-client %{name}-scheduler - -%description localhost -%shared_description -This package installs and configures a minimal localhost-only batch queue -system. - -%files localhost -%defattr(-, root, root) -%pre localhost -if [ -f %{torquehomedir}/server_priv/serverdb ];then - echo "This package wipes out the existing server configuration. Remove" 1>&2 - echo "%{torquehomedir}/server_priv/serverdb if you really want this." 1>&2 - exit 1 -fi -%post localhost -/sbin/chkconfig pbs_mom on -/sbin/chkconfig pbs_server on -/sbin/chkconfig pbs_sched on -/bin/hostname --long > %{torquehomedir}/server_priv/nodes -/bin/hostname --long > %{torquehomedir}/server_name -/bin/hostname --long > %{torquehomedir}/mom_priv/config -pbs_server -t create -qmgr -c "s s scheduling=true" -qmgr -c "c q batch queue_type=execution" -qmgr -c "s q batch started=true" -qmgr -c "s q batch enabled=true" -qmgr -c "s q batch resources_default.nodes=1" -qmgr -c "s q batch resources_default.walltime=3600" -qmgr -c "s s default_queue=batch" -%{_initrddir}/pbs_mom restart -%{_initrddir}/pbs_sched restart -%{_initrddir}/pbs_server restart -qmgr -c "s n `/bin/hostname --long` state=free" -e - - %package -n lib%{name} Summary: Run-time libs for programs which will use the %{name} library Group: Development/Libraries @@ -425,6 +388,9 @@ %changelog +* Mon May 15 2006 Garrick Staples 2.1.0p0-3 +- get rid of the annoying "localhost only" package + * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled From fedora-extras-commits at redhat.com Mon May 15 23:29:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 16:29:10 -0700 Subject: rpms/perl-Module-Build/FC-5 .cvsignore, 1.9, 1.10 perl-Module-Build.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200605152329.k4FNTDeu029308@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29287 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Mar 2006 02:14:33 -0000 1.9 +++ .cvsignore 15 May 2006 23:29:10 -0000 1.10 @@ -1 +1 @@ -Module-Build-0.2612.tar.gz +Module-Build-0.28.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/perl-Module-Build.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Module-Build.spec 16 Mar 2006 01:54:11 -0000 1.15 +++ perl-Module-Build.spec 15 May 2006 23:29:10 -0000 1.16 @@ -1,26 +1,35 @@ Name: perl-Module-Build -Version: 0.2612 +Version: 0.28 Release: 2%{?dist} +Epoch: 1 Summary: Perl module for building and installing Perl modules -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Tar) >= 1.08 -BuildRequires: perl(ExtUtils::CBuilder) >= 0.02 -BuildRequires: perl(ExtUtils::ParseXS) >= 2.02 -BuildRequires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.15 +BuildRequires: perl(ExtUtils::ParseXS) >= 1.02 +BuildRequires: perl(YAML) +BuildRequires: perl(Pod::Readme) >= 0.04 Requires: perl(Archive::Tar) >= 1.08 -Requires: perl(ExtUtils::CBuilder) >= 0.02 -Requires: perl(ExtUtils::ParseXS) >= 2.02 -Requires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +Requires: perl(ExtUtils::CBuilder) >= 0.15 +Requires: perl(ExtUtils::ParseXS) >= 1.02 +Requires: perl(Pod::Readme) >= 0.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -Perl module for building and installing Perl modules, a replacement to -ExtUtils::MakeMaker. +Module::Build is a system for building, testing, and installing Perl +modules. It is meant to be an alternative to ExtUtils::MakeMaker. +Developers may alter the behavior of the module through subclassing in a +much more straightforward way than with MakeMaker. It also does not require +a make on your system - most of the Module::Build code is pure-perl and +written in a very cross-platform way. In fact, you don't even need a shell, +so even platforms like MacOS (traditional) can use it fairly easily. Its +only prerequisites are modules that are included with perl 5.6.0, and it +works fine on perl 5.005 if you can install a few additional modules. %prep %setup -q -n Module-Build-%{version} @@ -33,14 +42,10 @@ rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 - find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check ./Build test @@ -49,13 +54,21 @@ %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{_bindir}/config_data %{perl_vendorlib}/Module %{_mandir}/man1/config_data.1* %{_mandir}/man3/Module::Build*.3* %changelog +* Sat May 13 2006 Steven Pritchard - 1:0.28-2 +- Rebuild. + +* Fri May 12 2006 Steven Pritchard - 1:0.28-1 +- Update to 0.28. +- Epoch bump to make 0.28 > 0.2612. +- Various spec cleanups to closer match cpanspec output. + * Wed Mar 15 2006 Steven Pritchard - 0.2612-2 - Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and ExtUtils::ParseXS. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Mar 2006 02:14:33 -0000 1.9 +++ sources 15 May 2006 23:29:10 -0000 1.10 @@ -1 +1 @@ -fa1504741e9c931f75e804953c1d5417 Module-Build-0.2612.tar.gz +8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz From fedora-extras-commits at redhat.com Mon May 15 23:50:04 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 15 May 2006 16:50:04 -0700 Subject: rpms/gtk2hs/FC-4 gtk2hs.spec,1.1,1.2 Message-ID: <200605152350.k4FNo6fO029919@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29898 Modified Files: gtk2hs.spec Log Message: turn off cairo Index: gtk2hs.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/FC-4/gtk2hs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk2hs.spec 15 May 2006 03:18:55 -0000 1.1 +++ gtk2hs.spec 15 May 2006 23:50:04 -0000 1.2 @@ -3,7 +3,7 @@ %define mozver 37:1.7.13 %define build_mozembed 1 -%define build_cairo 1 +%define build_cairo 0 Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs From fedora-extras-commits at redhat.com Tue May 16 00:23:18 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 17:23:18 -0700 Subject: extras-repoclosure rc-report.py,1.1,1.2 Message-ID: <200605160023.k4G0NIEZ000676@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv657 Modified Files: rc-report.py Log Message: Include reports for packages with owners missing in owners.list Index: rc-report.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rc-report.py 30 Apr 2006 11:11:51 -0000 1.1 +++ rc-report.py 16 May 2006 00:23:15 -0000 1.2 @@ -268,10 +268,9 @@ ownedby = owners.GetOwner(name) if ownedby == '': + ownedby = 'UNKNOWN OWNER' x = 'ERROR: %s not in owners.list\nERROR: source rpm is %s' % ( name, srcrpm ) - summail += x + '\n' - inbody = False - continue + summail += x + '\n\n' # name EVR.arch summary.append ( ' '.join( ['\t', w[1], ' ', w[3], repoid] ) ) repoids[repoid] = 1 @@ -323,7 +322,7 @@ mailtext = 'This is an automated mail created by an experimental script.\nYour following packages in the repository contain broken dependencies:\n\n' mailtext += body - if domail: + if domail and toaddr != 'UNKNOWN OWNER': mailsplit( srv, fromaddr, toaddr, replytoaddr, subject, mailtext ) if len(oldproblems): From fedora-extras-commits at redhat.com Tue May 16 01:18:09 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 15 May 2006 18:18:09 -0700 Subject: rpms/darcs/FC-5 .cvsignore, 1.5, 1.6 darcs.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200605160118.k4G1IBqn003359@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3337 Modified Files: .cvsignore darcs.spec sources Log Message: - update to 1.0.7 - fix typo of propagate in description (#189651) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Mar 2006 09:25:22 -0000 1.5 +++ .cvsignore 16 May 2006 01:18:09 -0000 1.6 @@ -1 +1 @@ -darcs-1.0.6.tar.gz +darcs-1.0.7.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/darcs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- darcs.spec 22 Mar 2006 07:23:38 -0000 1.10 +++ darcs.spec 16 May 2006 01:18:09 -0000 1.11 @@ -1,6 +1,6 @@ Name: darcs -Version: 1.0.6 -Release: 2%{?dist} +Version: 1.0.7 +Release: 1%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -18,7 +18,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -35,7 +35,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -84,6 +84,10 @@ %changelog +* Sun May 14 2006 Jens Petersen - 1.0.7-1 +- update to 1.0.7 +- fix typo of propagate in description (#189651) + * Wed Mar 22 2006 Jens Petersen - 1.0.6-2 - build with rebuilt ghc Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2006 09:25:22 -0000 1.5 +++ sources 16 May 2006 01:18:09 -0000 1.6 @@ -1 +1 @@ -8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz +5fe4e4e7b049c095995b9a57ea6aeece darcs-1.0.7.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:39:08 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 15 May 2006 18:39:08 -0700 Subject: rpms/darcs/FC-4 .cvsignore, 1.4, 1.5 darcs.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605160139.k4G1dAis003477@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3456 Modified Files: .cvsignore darcs.spec sources Log Message: - update to 1.0.7 - fix typo of propagate in description (#189651) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Mar 2006 08:14:51 -0000 1.4 +++ .cvsignore 16 May 2006 01:39:08 -0000 1.5 @@ -1 +1 @@ -darcs-1.0.6.tar.gz +darcs-1.0.7.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- darcs.spec 22 Mar 2006 08:14:51 -0000 1.8 +++ darcs.spec 16 May 2006 01:39:08 -0000 1.9 @@ -1,5 +1,5 @@ Name: darcs -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} Summary: David's advanced revision control system @@ -18,7 +18,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -35,7 +35,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -84,6 +84,10 @@ %changelog +* Sun May 14 2006 Jens Petersen - 1.0.7-1 +- update to 1.0.7 +- fix typo of propagate in description (#189651) + * Wed Mar 22 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 - darcs-createrepo is gone Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 08:14:51 -0000 1.5 +++ sources 16 May 2006 01:39:08 -0000 1.6 @@ -1 +1 @@ -8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz +5fe4e4e7b049c095995b9a57ea6aeece darcs-1.0.7.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:50:03 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:50:03 -0700 Subject: rpms/nagios/FC-4 sources,1.6,1.7 Message-ID: <200605160150.k4G1o5uH003602@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3556/FC-4 Modified Files: sources Log Message: Added new upstream source nagios-2.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 May 2006 03:36:31 -0000 1.6 +++ sources 16 May 2006 01:50:02 -0000 1.7 @@ -1 +1 @@ -6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz +22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:50:03 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:50:03 -0700 Subject: rpms/nagios/FC-5 sources,1.5,1.6 Message-ID: <200605160150.k4G1o506003606@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3556/FC-5 Modified Files: sources Log Message: Added new upstream source nagios-2.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 May 2006 03:36:32 -0000 1.5 +++ sources 16 May 2006 01:50:03 -0000 1.6 @@ -1 +1 @@ -6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz +22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:50:04 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:50:04 -0700 Subject: rpms/nagios/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200605160150.k4G1o64F003611@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3556/devel Modified Files: .cvsignore sources Log Message: Added new upstream source nagios-2.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 May 2006 03:35:36 -0000 1.6 +++ .cvsignore 16 May 2006 01:50:04 -0000 1.7 @@ -1 +1 @@ -nagios-2.3.tar.gz +nagios-2.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 May 2006 03:35:36 -0000 1.6 +++ sources 16 May 2006 01:50:04 -0000 1.7 @@ -1 +1 @@ -6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz +22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:51:12 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:51:12 -0700 Subject: rpms/nagios/devel nagios.spec,1.19,1.20 Message-ID: <200605160151.k4G1pEhH003669@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3617/devel Modified Files: nagios.spec Log Message: Updates for new upstream version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nagios.spec 9 May 2006 23:59:24 -0000 1.19 +++ nagios.spec 16 May 2006 01:51:12 -0000 1.20 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.3 -Release: 3%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -117,8 +117,10 @@ %{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || : %preun -/sbin/service nagios stop > /dev/null 2>&1 || : -/sbin/chkconfig --del %{name} || : +if [ $1 = 0 ]; then + /sbin/service nagios stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : +fi %post /sbin/chkconfig --add %{name} || : @@ -157,6 +159,10 @@ %{_includedir}/%{name} %changelog +* Mon May 15 2006 Mike McGrath 2.3.1-1 +- Bug fix for HTTP content_length header integer overflow in CGIs +- Updates no longer remove Nagios from starting up on reboot + * Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down From fedora-extras-commits at redhat.com Tue May 16 01:51:06 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:51:06 -0700 Subject: rpms/nagios/FC-4 nagios.spec,1.13,1.14 Message-ID: <200605160151.k4G1pcLZ003674@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3617/FC-4 Modified Files: nagios.spec Log Message: Updates for new upstream version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nagios.spec 9 May 2006 23:59:23 -0000 1.13 +++ nagios.spec 16 May 2006 01:51:06 -0000 1.14 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.3 -Release: 3%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -117,8 +117,10 @@ %{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || : %preun -/sbin/service nagios stop > /dev/null 2>&1 || : -/sbin/chkconfig --del %{name} || : +if [ $1 = 0 ]; then + /sbin/service nagios stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : +fi %post /sbin/chkconfig --add %{name} || : @@ -157,6 +159,10 @@ %{_includedir}/%{name} %changelog +* Mon May 15 2006 Mike McGrath 2.3.1-1 +- Bug fix for HTTP content_length header integer overflow in CGIs +- Updates no longer remove Nagios from starting up on reboot + * Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down From fedora-extras-commits at redhat.com Tue May 16 01:51:07 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:51:07 -0700 Subject: rpms/nagios/FC-5 nagios.spec,1.13,1.14 Message-ID: <200605160151.k4G1pdIL003677@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3617/FC-5 Modified Files: nagios.spec Log Message: Updates for new upstream version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nagios.spec 9 May 2006 23:59:24 -0000 1.13 +++ nagios.spec 16 May 2006 01:51:07 -0000 1.14 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.3 -Release: 3%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -117,8 +117,10 @@ %{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || : %preun -/sbin/service nagios stop > /dev/null 2>&1 || : -/sbin/chkconfig --del %{name} || : +if [ $1 = 0 ]; then + /sbin/service nagios stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : +fi %post /sbin/chkconfig --add %{name} || : @@ -157,6 +159,10 @@ %{_includedir}/%{name} %changelog +* Mon May 15 2006 Mike McGrath 2.3.1-1 +- Bug fix for HTTP content_length header integer overflow in CGIs +- Updates no longer remove Nagios from starting up on reboot + * Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down From fedora-extras-commits at redhat.com Tue May 16 02:01:43 2006 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Mon, 15 May 2006 19:01:43 -0700 Subject: owners owners.list,1.1001,1.1002 Message-ID: <200605160202.k4G22ID9006070@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6052 Modified Files: owners.list Log Message: my new email address Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1001 retrieving revision 1.1002 diff -u -r1.1001 -r1.1002 --- owners.list 15 May 2006 20:40:39 -0000 1.1001 +++ owners.list 16 May 2006 02:01:43 -0000 1.1002 @@ -769,7 +769,7 @@ Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|mm|Shared memory allocation library|andreas at bawue.net|extras-qa at fedoraproject.org| -Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org| +Fedora Extras|mmv|Move/copy/append/link multiple files|zing at fastmail.fm|extras-qa at fedoraproject.org| Fedora Extras|MochiKit|A lightweight JavaScript library|ivazquez at ivazquez.net|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| @@ -1243,7 +1243,7 @@ Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|zing at fastmail.fm|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1489,7 +1489,7 @@ Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|snort|An intrusion detection system|dennis at ausil.us|extras-qa at fedoraproject.org| -Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org| +Fedora Extras|snownews|A RSS/RDF news aggregator|zing at fastmail.fm|extras-qa at fedoraproject.org| Fedora Extras|SOAPpy|Full-featured SOAP library for Python|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|sodipodi|Vector-based drawing program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 02:41:34 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 19:41:34 -0700 Subject: owners owners.list,1.1002,1.1003 Message-ID: <200605160241.k4G2famI008154@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8125 Modified Files: owners.list Log Message: Add swaks. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1002 retrieving revision 1.1003 diff -u -r1.1002 -r1.1003 --- owners.list 16 May 2006 02:01:43 -0000 1.1002 +++ owners.list 16 May 2006 02:41:34 -0000 1.1003 @@ -1520,6 +1520,7 @@ Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| +Fedora Extras|swaks|Command-line SMTP transaction tester|tibbs at math.uh.edu|extras-qa at fedoraproject.org| Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|swh-plugins|A set of audio plugins for LADSPA|green at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 04:15:50 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Mon, 15 May 2006 21:15:50 -0700 Subject: mock mock.py,1.48,1.49 Message-ID: <200605160415.k4G4FoUF018744@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18684 Modified Files: mock.py Log Message: applied tab-fix and a slimming of main patches from Michael E. Brown. Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- mock.py 14 May 2006 04:53:38 -0000 1.48 +++ mock.py 16 May 2006 04:15:48 -0000 1.49 @@ -630,7 +630,7 @@ cmd = "mkdir -p %s/%s" % (self.builddir, subdir) self.do_chroot(cmd, fatal = True) - # change ownership so we can write to build home dir + # change ownership so we can write to build home dir cmd = "chown -R %s.%s %s" % (self.config['chrootuser'], self.config['chrootgroup'], self.homedir) self.do_chroot(cmd, fatal = True) @@ -687,32 +687,8 @@ default=False, help="quiet down output") return parser.parse_args() - -def main(): - # before we go on, make sure the user is a member of the 'mock' group. - member = False - for item in os.getgroups(): - try: - grptup = grp.getgrgid(item) - except KeyError, e: - continue - if grptup[0] == 'mock': - member = True - - if not member: - print "You need to be a member of the mock group for this to work" - sys.exit(1) - # and make sure they're not root - if os.geteuid() == 0: - error("Don't try to run mock as root!") - sys.exit(1) - - # config path - config_path='/etc/mock' - - # defaults - config_opts = {} +def setup_default_config_opts(config_opts): 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' @@ -742,6 +718,119 @@ config_opts['more_buildreqs'] = {} config_opts['files']['/etc/resolv.conf'] = "nameserver 192.168.1.1\n" config_opts['files']['/etc/hosts'] = "127.0.0.1 localhost localhost.localdomain\n" + +def set_config_opts_per_cmdline(config_opts, options): + # do some other options and stuff + if options.arch: + config_opts['target_arch'] = options.arch + + if options.dirty: + config_opts['clean'] = False + else: + config_opts['clean'] = True + + config_opts['debug'] = options.debug + config_opts['quiet'] = options.quiet + + if options.resultdir: + config_opts['resultdir'] = options.resultdir + + if options.statedir: + config_opts['statedir'] = options.statedir + + if options.uniqueext: + config_opts['unique-ext'] = options.uniqueext + +def do_clean(config_opts, init=0): + my = None + try: + my = Root(config_opts) + if init: my.prep() + except Error, e: + print e + if my: + my.close() + sys.exit(100) + + my.close() + if init: + print 'Finished initializing root' + else: + print 'Finished cleaning root' + +def do_run_cmd(config_opts, cmd, raw_chroot=0): + my = Root(config_opts) + my.debug("executing: %s" % cmd) + my._mount() + if raw_chroot: + cmd = '%s %s %s' % (config_opts['chroot'], my.rootdir, cmd) + os.system(cmd) + else: + my.do_chroot(cmd, True) + my.close() + my.debug('finished chroot command') + +def ensure_filetype_srpm(srpms): + for srpm in srpms: + ts = rpmUtils.transaction.initReadOnlyTransaction() + try: + hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) + except rpmUtils.RpmUtilsError, e: + error("Specified srpm %s cannot be found/opened" % srpm) + sys.exit(50) + + if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: + error("Specified srpm isn't a srpm! Can't go on") + sys.exit(50) + +def do_rebuild(config_opts, srpms): + # Prep build root + my = None # if Root() fails, my will be undefined so we force it to None + try: + my = Root(config_opts) + os.umask(0022) # set a umask- protects from paranoid whackjobs with an 002 umask + except Error, e: + error(e) + if my: + my.close() + sys.exit(e.resultcode) + + for srpm in srpms: + try: + my.prep() + my.build(srpm) + except Error, e: + error(e) + if my: + my.close() + sys.exit(e.resultcode) + + my.close() + print "Results and/or logs in: %s" % my.resultdir + +def main(): + # before we go on, make sure the user is a member of the 'mock' group. + member = False + for item in os.getgroups(): + try: + grptup = grp.getgrgid(item) + except KeyError, e: + continue + if grptup[0] == 'mock': + member = True + + if not member: + print "You need to be a member of the mock group for this to work" + sys.exit(1) + + # and make sure they're not root + if os.geteuid() == 0: + error("Don't try to run mock as root!") + sys.exit(1) + + # defaults + config_opts = {} + setup_default_config_opts(config_opts) # cli option parsing (options, args) = command_parse() @@ -750,6 +839,8 @@ error("No srpm or command specified - nothing to do") sys.exit(50) + # config path -- can be overridden on cmdline + config_path='/etc/mock' if options.configdir: config_path = options.configdir @@ -773,80 +864,29 @@ error("Could not find config file %s for chroot %s" % (cfg, options.chroot)) sys.exit(1) - # do some other options and stuff - if options.arch: - config_opts['target_arch'] = options.arch - - if options.dirty: - config_opts['clean'] = False - else: - config_opts['clean'] = True - - config_opts['debug'] = options.debug - config_opts['quiet'] = options.quiet - - if options.resultdir: - config_opts['resultdir'] = options.resultdir - - if options.statedir: - config_opts['statedir'] = options.statedir - - if options.uniqueext: - config_opts['unique-ext'] = options.uniqueext - + # cmdline options override config options + set_config_opts_per_cmdline(config_opts, options) # do whatever we're here to do if args[0] == 'clean': # unset a --no-clean config_opts['clean'] = True - try: - my = None - my = Root(config_opts) - except Error, e: - print e - if my: - my.close() - sys.exit(100) - - my.close() - print 'Finished cleaning root' + do_clean(config_opts, init=0) elif args[0] == 'init': - try: - my = None - my = Root(config_opts) - my.prep() - except Error, e: - print e - if my: - my.close() - sys.exit(100) - - my.close() - print 'Finished initializing root' + do_clean(config_opts, init=1) elif args[0] == 'chroot': # catch-all for executing arbitrary commands in the chroot config_opts['clean'] = config_opts['quiet'] = False - my = Root(config_opts) cmd = ' '.join(args[1:]) - my.debug("executing: %s" % cmd) - my._mount() - my.do_chroot(cmd, True) - my.close() - my.debug('finished chroot command') + do_run_cmd(config_opts, cmd, raw_chroot=0) elif args[0] == 'shell': # debugging tool for interactive poking around in the chroot config_opts['clean'] = config_opts['quiet'] = False - my = Root(config_opts) - cmd = "PS1='mock-chroot> ' %s %s /bin/bash" % (config_opts['chroot'], - my.rootdir) - my.debug("executing: %s" % cmd) - my._mount() - ret = os.system(cmd) - my.close() - my.debug("finished shell with retval %d" % ret) + os.environ['PS1'] = "mock-chroot> " + do_run_cmd(config_opts, "/bin/bash", raw_chroot=1) else: if args[0] == 'rebuild': @@ -858,42 +898,10 @@ else: srpms = args[0:] - for srpm in srpms: - ts = rpmUtils.transaction.initReadOnlyTransaction() - try: - hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) - except rpmUtils.RpmUtilsError, e: - error("Specified srpm %s cannot be found/opened" % srpm) - sys.exit(50) - - if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: - error("Specified srpm isn't a srpm! Can't go on") - sys.exit(50) - - # Prep build root - my = None # if Root() fails, my will be undefined so we force it to None - try: - my = Root(config_opts) - os.umask(0022) # set a umask- protects from paranoid whackjobs with an 002 umask - except Error, e: - error(e) - if my: - my.close() - sys.exit(e.resultcode) - - for srpm in srpms: - try: - my.prep() - my.build(srpm) - except Error, e: - error(e) - if my: - my.close() - sys.exit(e.resultcode) - - my.close() - print "Results and/or logs in: %s" % my.resultdir + # exit here if everything isn't kosher + ensure_filetype_srpm(srpms) + do_rebuild(config_opts, srpms) if __name__ == '__main__': main() From fedora-extras-commits at redhat.com Tue May 16 07:08:35 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Tue, 16 May 2006 00:08:35 -0700 Subject: owners owners.list,1.1003,1.1004 Message-ID: <200605160708.k4G78b4Y003725@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3706 Modified Files: owners.list Log Message: Added adplug. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1003 retrieving revision 1.1004 diff -u -r1.1003 -r1.1004 --- owners.list 16 May 2006 02:41:34 -0000 1.1003 +++ owners.list 16 May 2006 07:08:34 -0000 1.1004 @@ -20,6 +20,7 @@ Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|adime|Allegro Dialogs Made Easy|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|adplug|AdLib OPL sound emulation library|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 07:53:21 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Tue, 16 May 2006 00:53:21 -0700 Subject: rpms/git/devel .cvsignore, 1.27, 1.28 git.spec, 1.15, 1.16 sources, 1.27, 1.28 Message-ID: <200605160753.k4G7rNSR003873@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3852 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 19:44:23 -0000 1.27 +++ .cvsignore 16 May 2006 07:53:21 -0000 1.28 @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/devel/git.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git.spec 4 May 2006 19:44:23 -0000 1.15 +++ git.spec 16 May 2006 07:53:21 -0000 1.16 @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 May 2006 19:44:23 -0000 1.27 +++ sources 16 May 2006 07:53:21 -0000 1.28 @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 08:11:59 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Tue, 16 May 2006 01:11:59 -0700 Subject: rpms/git/FC-5 .cvsignore, 1.27, 1.28 git.spec, 1.15, 1.16 sources, 1.27, 1.28 Message-ID: <200605160812.k4G8C13Z006238@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6217 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 19:45:50 -0000 1.27 +++ .cvsignore 16 May 2006 08:11:58 -0000 1.28 @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git.spec 4 May 2006 19:45:50 -0000 1.15 +++ git.spec 16 May 2006 08:11:58 -0000 1.16 @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 May 2006 19:45:50 -0000 1.27 +++ sources 16 May 2006 08:11:58 -0000 1.28 @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 08:12:44 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Tue, 16 May 2006 01:12:44 -0700 Subject: rpms/git/FC-4 .cvsignore, 1.27, 1.28 git.spec, 1.15, 1.16 sources, 1.27, 1.28 Message-ID: <200605160812.k4G8CknX006314@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6293 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 19:46:49 -0000 1.27 +++ .cvsignore 16 May 2006 08:12:44 -0000 1.28 @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git.spec 4 May 2006 19:46:49 -0000 1.15 +++ git.spec 16 May 2006 08:12:44 -0000 1.16 @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 May 2006 19:46:49 -0000 1.27 +++ sources 16 May 2006 08:12:44 -0000 1.28 @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 08:13:29 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Tue, 16 May 2006 01:13:29 -0700 Subject: rpms/git/FC-3 .cvsignore, 1.27, 1.28 git.spec, 1.15, 1.16 sources, 1.27, 1.28 Message-ID: <200605160813.k4G8DVGb006393@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6371 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 19:48:01 -0000 1.27 +++ .cvsignore 16 May 2006 08:13:29 -0000 1.28 @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git.spec 4 May 2006 19:48:01 -0000 1.15 +++ git.spec 16 May 2006 08:13:29 -0000 1.16 @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 May 2006 19:48:01 -0000 1.27 +++ sources 16 May 2006 08:13:29 -0000 1.28 @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 08:15:55 2006 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Tue, 16 May 2006 01:15:55 -0700 Subject: devel/x3270 x3270.spec,1.18,1.19 Message-ID: <200605160815.k4G8FvpW006464@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/x3270 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6447 Modified Files: x3270.spec Log Message: - rebuild Index: x3270.spec =================================================================== RCS file: /cvs/extras/devel/x3270/x3270.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- x3270.spec 17 Feb 2006 17:07:20 -0000 1.18 +++ x3270.spec 16 May 2006 08:15:55 -0000 1.19 @@ -5,7 +5,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 3.3.4p6 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: Applications/Internet URL: http://www.geocities.com/SiliconValley/Peaks/7814 @@ -203,7 +203,10 @@ %{_mandir}/man1/c3270* %changelog -* Fri Feb 17 2006 Karsten Hopp 3.3.4p6-5%{?dist} +* Tue May 16 2006 Karsten Hopp 3.3.4p6-6 +- rebuild + +* Fri Feb 17 2006 Karsten Hopp 3.3.4p6-5 - rebuild * Mon Dec 19 2005 Karsten Hopp 3.3.4p6-4 From fedora-extras-commits at redhat.com Tue May 16 08:37:39 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 16 May 2006 01:37:39 -0700 Subject: fedora-security/audit fc4,1.247,1.248 fc5,1.161,1.162 Message-ID: <200605160837.k4G8bdD8006639@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6619 Modified Files: fc4 fc5 Log Message: Cups move to new upstream changes many entries Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- fc4 15 May 2006 19:31:01 -0000 1.247 +++ fc4 16 May 2006 08:37:37 -0000 1.248 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060514 -Up to date FC4 as of 20060514 +Up to date CVE as of CVE email 20060515 +Up to date FC4 as of 20060515 ** are items that need attention Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- fc5 15 May 2006 19:31:01 -0000 1.161 +++ fc5 16 May 2006 08:37:37 -0000 1.162 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060514 -Up to date FC5 as of 20060514 +Up to date CVE as of CVE email 20060515 +Up to date FC5 as of 20060515 ** are items that need attention @@ -299,27 +299,27 @@ CVE-2005-3628 version (kdegraphics, fixed 3.5.1) CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch -CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3628 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3627 version (poppler, fixed 0.4.4) CVE-2005-3627 version (kdegraphics, fixed 3.5.1) CVE-2005-3627 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3627 backport (tetex) -CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3627 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3626 version (poppler, fixed 0.4.4) CVE-2005-3626 version (kdegraphics, fixed 3.5.1) CVE-2005-3626 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3626 backport (tetex) -CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3626 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3625 version (poppler, fixed 0.4.4) CVE-2005-3625 version (kdegraphics, fixed 3.5.1) CVE-2005-3625 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3625 backport (tetex) -CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3625 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3624 version (poppler, fixed 0.4.4) CVE-2005-3624 version (kdegraphics, fixed 3.5.1) CVE-2005-3624 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3624 backport (tetex) -CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3624 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3623 version (kernel, fixed 2.6.14.5) CVE-2005-3582 version (ImageMagick) gentoo only CVE-2005-3573 version (mailman, fixed 2.1.7) @@ -361,17 +361,17 @@ CVE-2005-3193 version (kdegraphics, fixed 3.5.1) CVE-2005-3193 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch -CVE-2005-3193 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3193 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3192 version (poppler, fixed 0.4.4) CVE-2005-3192 version (kdegraphics, fixed 3.5.1) CVE-2005-3192 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch -CVE-2005-3192 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3192 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3191 version (poppler, fixed 0.4.4) CVE-2005-3191 version (kdegraphics, fixed 3.5.1) CVE-2005-3191 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch -CVE-2005-3191 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3191 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3186 version (gtk2, fixed 2.8.7 at least) CVE-2005-3186 backport (gdk-pixbuf) CVE-2005-3185 version (wget, fixed 1.10.2 at least) @@ -545,7 +545,7 @@ CVE-2005-2099 version (kernel, fixed 2.6.12.5) CVE-2005-2098 version (kernel, fixed 2.6.12.5) CVE-2005-2097 version (xpdf, fixed 3.0.1) -CVE-2005-2097 backport (cups) cups-CAN-2005-2097.patch +CVE-2005-2097 version (cups) [since FEDORA-2006-252] was backport since GA CVE-2005-2096 version (rpm, fixed 4.4.2) CVE-2005-2096 backport (zlib, fixed 1.2.2.4) CVE-2005-2095 version (squirrelmail, fixed 1.4.5) @@ -1100,7 +1100,7 @@ CVE-2004-0888 version (xpdf, fixed 3.0.1) CVE-2004-0888 version (tetex, fixed 3.0) CVE-2004-0888 version (kpdegraphics, not 3.4) -CVE-2004-0888 backport (cups) cups-CAN-2004-0888.patch +CVE-2004-0888 version (cups) [since FEDORA-2006-252] was backport since GA CVE-2004-0887 version (kernel, fixed 2.6.10) CVE-2004-0886 version (libtiff, fixed 3.7.1 at least) CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109) From fedora-extras-commits at redhat.com Tue May 16 10:57:22 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 16 May 2006 03:57:22 -0700 Subject: rpms/pan/devel pan-0.97-tree-expanders.patch, NONE, 1.1 pan.spec, 1.15, 1.16 Message-ID: <200605161057.k4GAvO5p011678@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11658 Modified Files: pan.spec Added Files: pan-0.97-tree-expanders.patch Log Message: patch from upstream pan-0.97-tree-expanders.patch: --- NEW FILE pan-0.97-tree-expanders.patch --- diff -u pan/gui-bak/group-pane.cc pan/gui/group-pane.cc --- pan/gui-bak/group-pane.cc 2006-05-15 14:22:21.000000000 -0500 +++ pan/gui/group-pane.cc 2006-05-15 14:22:41.000000000 -0500 @@ -251,13 +251,56 @@ g_idle_add (on_row_activated_idle, pane_g); } +namespace +{ + bool row_collapsed_or_expanded (false); + + void row_collapsed_or_expanded_cb (GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path, gpointer unused) + { + row_collapsed_or_expanded = true; + } + + struct Blah + { + GtkTreeView * view; + GtkTreePath * path; + GtkTreeViewColumn * col; + }; + + gboolean maybe_activate_on_idle_idle (gpointer blah_gpointer) + { + Blah * blah = (Blah*) blah_gpointer; + if (!row_collapsed_or_expanded) + gtk_tree_view_row_activated (blah->view, blah->path, blah->col); + gtk_tree_path_free (blah->path); + g_free (blah); + return false; + } + + /** + * There doesn't seem to be any way to see if a mouse click in a tree view + * happened on the expander or elsewhere in a row, so when deciding whether or + * not to activate a row on single click, let's wait and see if a row expands or + * collapses. + */ + void maybe_activate_on_idle (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *col) + { + row_collapsed_or_expanded = false; + Blah * blah = (Blah*) g_new (Blah, 1); + blah->view = view; + blah->path = path; + blah->col = col; + g_idle_add (maybe_activate_on_idle_idle, blah); + } +} + gboolean GroupPane :: on_button_pressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata) { GroupPane * pane (static_cast(userdata)); // single click with the right mouse button? - if (event->type == GDK_BUTTON_PRESS && event->button == 3) + if (event->type == GDK_BUTTON_PRESS && event->button == 3) { GtkTreeSelection * selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); GtkTreePath * path; @@ -271,20 +314,21 @@ do_popup_menu (treeview, event, userdata); return true; } - else if (pane->_prefs.get_flag("single-click-activates-group", true) - && event->type == GDK_BUTTON_PRESS - && event->button == 1) + else if (pane->_prefs.get_flag("single-click-activates-group",true) + && (event->type == GDK_BUTTON_RELEASE) + && (event->button == 1) + && (event->send_event == false) + && (event->window == gtk_tree_view_get_bin_window (GTK_TREE_VIEW(treeview))) + && !(event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK))) { GtkTreePath * path; GtkTreeViewColumn * col; + gint cell_x(0), cell_y(0); if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview), - (gint) event->x, + (gint) event->x, (gint) event->y, - &path, &col, NULL, NULL)) - { - gtk_tree_view_row_activated (GTK_TREE_VIEW(treeview), path, col); - gtk_tree_path_free(path); - } + &path, &col, &cell_x, &cell_y)) + maybe_activate_on_idle (GTK_TREE_VIEW(treeview), path, col); } return false; @@ -704,7 +748,10 @@ gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(_tree_view), true); #endif + g_signal_connect (_tree_view, "row_collapsed", G_CALLBACK(row_collapsed_or_expanded_cb), 0); + g_signal_connect (_tree_view, "row_expanded", G_CALLBACK(row_collapsed_or_expanded_cb), 0); g_signal_connect (_tree_view, "button-press-event", G_CALLBACK(on_button_pressed), this); + g_signal_connect (_tree_view, "button-release-event", G_CALLBACK(on_button_pressed), this); g_signal_connect (_tree_view, "popup-menu", G_CALLBACK(on_popup_menu), this); g_signal_connect (_tree_view, "row-activated", G_CALLBACK(on_row_activated), this); g_object_unref (G_OBJECT(_tree_store)); diff -u pan/gui-bak/header-pane.cc pan/gui/header-pane.cc --- pan/gui-bak/header-pane.cc 2006-05-15 14:22:22.000000000 -0500 +++ pan/gui/header-pane.cc 2006-05-15 14:27:50.000000000 -0500 @@ -1013,7 +1013,48 @@ return true; } } +namespace +{ + bool row_collapsed_or_expanded (false); + + void row_collapsed_or_expanded_cb (GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path, gpointer unused) + { + row_collapsed_or_expanded = true; + } + + struct Blah + { + GtkTreeView * view; + GtkTreePath * path; + GtkTreeViewColumn * col; + }; + gboolean maybe_activate_on_idle_idle (gpointer blah_gpointer) + { + Blah * blah = (Blah*) blah_gpointer; + if (!row_collapsed_or_expanded) + gtk_tree_view_row_activated (blah->view, blah->path, blah->col); + gtk_tree_path_free (blah->path); + g_free (blah); + return false; + } + + /** + * There doesn't seem to be any way to see if a mouse click in a tree view + * happened on the expander or elsewhere in a row, so when deciding whether or + * not to activate a row on single click, let's wait and see if a row expands or + * collapses. + */ + void maybe_activate_on_idle (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *col) + { + row_collapsed_or_expanded = false; + Blah * blah = (Blah*) g_new (Blah, 1); + blah->view = view; + blah->path = path; + blah->col = col; + g_idle_add (maybe_activate_on_idle_idle, blah); + } +} gboolean HeaderPane :: on_button_pressed (GtkWidget * treeview, GdkEventButton *event, gpointer userdata) @@ -1044,6 +1085,7 @@ && (event->type == GDK_BUTTON_RELEASE) && (event->button == 1) && (event->window == gtk_tree_view_get_bin_window (GTK_TREE_VIEW(treeview))) + && (event->send_event == false) && !(event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK))) { GtkTreePath * path; @@ -1053,14 +1095,7 @@ (gint) event->x, (gint) event->y, &path, &col, &cell_x, &cell_y)) - { - // get the cell area to make sure they didn't click on an expander. - // GdkRectangle rect; - // gtk_tree_view_get_cell_area (GTK_TREE_VIEW(treeview), path, col, &rect); - // if (rect.x<=cell_x && cell_x<(rect.x+rect.width) && rect.y<=cell_y && cell_y<(rect.y+rect.height)) - gtk_tree_view_row_activated (GTK_TREE_VIEW(treeview), path, col); - gtk_tree_path_free(path); - } + maybe_activate_on_idle (GTK_TREE_VIEW(treeview), path, col); } return false; @@ -1602,6 +1637,8 @@ g_signal_connect (_tree_view, "button-release-event", G_CALLBACK(on_button_pressed), this); g_signal_connect (_tree_view, "button-press-event", G_CALLBACK(on_button_pressed), this); + g_signal_connect (_tree_view, "row-collapsed", G_CALLBACK(row_collapsed_or_expanded_cb), NULL); + g_signal_connect (_tree_view, "row-expanded", G_CALLBACK(row_collapsed_or_expanded_cb), NULL); g_signal_connect (_tree_view, "popup-menu", G_CALLBACK(on_popup_menu), this); g_signal_connect (_tree_view, "row-activated", G_CALLBACK(on_row_activated), this); GtkWidget * scroll = gtk_scrolled_window_new (0, 0); Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pan.spec 14 May 2006 04:12:20 -0000 1.15 +++ pan.spec 16 May 2006 10:57:22 -0000 1.16 @@ -1,12 +1,13 @@ Summary: A GNOME/GTK+ news reader for X Name: pan Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 Patch0: pan-0.97-crash-on-shutdown.patch +Patch1: pan-0.97-tree-expanders.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -28,6 +29,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p0 echo "StartupNotify=true" >> pan.desktop @@ -72,6 +74,9 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Tue May 16 2006 Michael A. Peters - 1:0.97-2 +- Added pan-0.97-tree-expanders.patch from upstream + * Sat May 13 2006 Michael A. Peters - 1:0.97-1 - Update to 0.97 (previous patches no longer needed) - Patch pan-0.97-crash-on-shutdown.patch from upstream added From fedora-extras-commits at redhat.com Tue May 16 10:57:59 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 16 May 2006 03:57:59 -0700 Subject: rpms/bzflag/devel .cvsignore, 1.5, 1.6 bzflag.spec, 1.25, 1.26 sources, 1.5, 1.6 Message-ID: <200605161058.k4GAw1JB011747@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11724 Modified Files: .cvsignore bzflag.spec sources Log Message: version 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 May 2006 16:45:51 -0000 1.5 +++ .cvsignore 16 May 2006 10:57:59 -0000 1.6 @@ -1 +1 @@ -bzflag-2.0.6.tar.bz2 +bzflag-2.0.8.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- bzflag.spec 15 May 2006 07:00:50 -0000 1.25 +++ bzflag.spec 16 May 2006 10:57:59 -0000 1.26 @@ -1,4 +1,7 @@ +#### options: # Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: %if 0%{?fedora} %if 0%{?fedora} < 5 # default to non-modular X on FC < 5 @@ -17,7 +20,7 @@ Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.6 +Version: 2.0.8 Release: 1%{?dist} License: GPL Group: Amusements/Games @@ -98,7 +101,10 @@ %{_mandir}/man*/* %changelog -* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +* Tue May 16 2006 Nils Philippsen 2.0.8-1 +- version 2.0.8 + +* Fri May 12 2006 Nils Philippsen 2.0.6-1 - automatically decide between modular/traditional X depending on %%fedora * Thu May 11 2006 Nils Philippsen Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 May 2006 16:45:51 -0000 1.5 +++ sources 16 May 2006 10:57:59 -0000 1.6 @@ -1 +1 @@ -5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 +7963cc1de7144e76a9426b6f23d7c2c8 bzflag-2.0.8.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 10:59:20 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 16 May 2006 03:59:20 -0700 Subject: rpms/bzflag/FC-5 .cvsignore, 1.5, 1.6 bzflag.spec, 1.24, 1.25 sources, 1.5, 1.6 Message-ID: <200605161059.k4GAxMWO011821@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11798 Modified Files: .cvsignore bzflag.spec sources Log Message: version 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 May 2006 16:54:47 -0000 1.5 +++ .cvsignore 16 May 2006 10:59:20 -0000 1.6 @@ -1 +1 @@ -bzflag-2.0.6.tar.bz2 +bzflag-2.0.8.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- bzflag.spec 12 May 2006 08:26:51 -0000 1.24 +++ bzflag.spec 16 May 2006 10:59:20 -0000 1.25 @@ -1,5 +1,7 @@ +#### options: # Use --with/--without modular_X to rebuild with/without modular X deps +#### default options: %if 0%{?fedora} %if 0%{?fedora} < 5 # default to non-modular X on FC < 5 @@ -18,7 +20,7 @@ Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.6 +Version: 2.0.8 Release: 1%{?dist} License: GPL Group: Amusements/Games @@ -99,7 +101,10 @@ %{_mandir}/man*/* %changelog -* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +* Tue May 16 2006 Nils Philippsen 2.0.8-1 +- version 2.0.8 + +* Fri May 12 2006 Nils Philippsen 2.0.6-1 - automatically decide between modular/traditional X depending on %%fedora * Thu May 11 2006 Nils Philippsen Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 May 2006 16:54:47 -0000 1.5 +++ sources 16 May 2006 10:59:20 -0000 1.6 @@ -1 +1 @@ -5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 +7963cc1de7144e76a9426b6f23d7c2c8 bzflag-2.0.8.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 10:59:50 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 16 May 2006 03:59:50 -0700 Subject: rpms/bzflag/FC-4 .cvsignore, 1.5, 1.6 bzflag.spec, 1.21, 1.22 sources, 1.5, 1.6 Message-ID: <200605161059.k4GAxqNL011886@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11865 Modified Files: .cvsignore bzflag.spec sources Log Message: version 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 May 2006 16:57:04 -0000 1.5 +++ .cvsignore 16 May 2006 10:59:50 -0000 1.6 @@ -1 +1 @@ -bzflag-2.0.6.tar.bz2 +bzflag-2.0.8.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bzflag.spec 12 May 2006 08:27:59 -0000 1.21 +++ bzflag.spec 16 May 2006 10:59:50 -0000 1.22 @@ -1,5 +1,7 @@ +#### options: # Use --with/--without modular_X to rebuild with/without modular X deps +#### default options: %if 0%{?fedora} %if 0%{?fedora} < 5 # default to non-modular X on FC < 5 @@ -18,7 +20,7 @@ Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.6 +Version: 2.0.8 Release: 1%{?dist} License: GPL Group: Amusements/Games @@ -99,7 +101,10 @@ %{_mandir}/man*/* %changelog -* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +* Tue May 16 2006 Nils Philippsen 2.0.8-1 +- version 2.0.8 + +* Fri May 12 2006 Nils Philippsen 2.0.6-1 - automatically decide between modular/traditional X depending on %%fedora * Thu May 11 2006 Nils Philippsen Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 May 2006 16:57:04 -0000 1.5 +++ sources 16 May 2006 10:59:50 -0000 1.6 @@ -1 +1 @@ -5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 +7963cc1de7144e76a9426b6f23d7c2c8 bzflag-2.0.8.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 14:03:32 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 16 May 2006 07:03:32 -0700 Subject: rpms/kchmviewer/devel kchmviewer.spec,1.1,1.2 Message-ID: <200605161403.k4GE3YRI022125@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22108 Modified Files: kchmviewer.spec Log Message: * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kchmviewer.spec 1 May 2006 08:35:31 -0000 1.1 +++ kchmviewer.spec 16 May 2006 14:03:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: kchmviewer Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: CHM viewer Group: Applications/Publishing @@ -64,7 +64,8 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - kio-msits/kchmviewer.desktop + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop %clean @@ -84,10 +85,12 @@ %{_datadir}/pixmaps/* %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la -%{_datadir}/applnk/kchmviewer.desktop %{_datadir}/services/msits.protocol %changelog +* Tue May 16 2006 Patrice Dumas 2.0-4 +- remove the old menu entry file from /usr/share/applnk/ + * Mon Mar 13 2006 Patrice Dumas 2.0-3 - use update-desktop-database From fedora-extras-commits at redhat.com Tue May 16 15:09:12 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 16 May 2006 08:09:12 -0700 Subject: rpms/stellarium/FC-4 stellarium.spec,1.15,1.16 Message-ID: <200605161509.k4GF9EfG025733@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25716 Modified Files: stellarium.spec Log Message: bump release caused by demaged binary RPM Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- stellarium.spec 8 May 2006 17:18:36 -0000 1.15 +++ stellarium.spec 16 May 2006 15:09:11 -0000 1.16 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -78,6 +78,9 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog +* Tue May 16 2006 Jochen Schmitt 0.8.0-3 +- Rebuilt + * Mon May 8 2006 Jochen Schmitt 0.8.0-2 - New upstream release From fedora-extras-commits at redhat.com Tue May 16 15:41:59 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:41:59 -0700 Subject: rpms/gaim-gaym - New directory Message-ID: <200605161542.k4GFg1Ax026268@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26242/gaim-gaym Log Message: Directory /cvs/extras/rpms/gaim-gaym added to the repository From fedora-extras-commits at redhat.com Tue May 16 15:41:59 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:41:59 -0700 Subject: rpms/gaim-gaym/devel - New directory Message-ID: <200605161542.k4GFg1Ni026271@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26242/gaim-gaym/devel Log Message: Directory /cvs/extras/rpms/gaim-gaym/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 15:42:13 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:42:13 -0700 Subject: rpms/gaim-gaym Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161542.k4GFgFFo026322@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26287 Added Files: Makefile import.log Log Message: Setup of module gaim-gaym --- NEW FILE Makefile --- # Top level Makefile for module gaim-gaym all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 15:42:13 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:42:13 -0700 Subject: rpms/gaim-gaym/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161542.k4GFgFPd026325@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26287/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gaim-gaym --- NEW 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 May 16 15:43:15 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:43:15 -0700 Subject: rpms/gaim-gaym import.log,1.1,1.2 Message-ID: <200605161543.k4GFhlrH026396@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26360 Modified Files: import.log Log Message: auto-import gaim-gaym-0.96-2.fc5 on branch devel from gaim-gaym-0.96-2.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 15:42:12 -0000 1.1 +++ import.log 16 May 2006 15:43:15 -0000 1.2 @@ -0,0 +1 @@ +gaim-gaym-0_96-2_fc5:HEAD:gaim-gaym-0.96-2.fc5.src.rpm:1147794192 From fedora-extras-commits at redhat.com Tue May 16 15:43:16 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:43:16 -0700 Subject: rpms/gaim-gaym/devel gaim-gaym.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161543.k4GFhmXT026400@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26360/devel Modified Files: .cvsignore sources Added Files: gaim-gaym.spec Log Message: auto-import gaim-gaym-0.96-2.fc5 on branch devel from gaim-gaym-0.96-2.fc5.src.rpm --- NEW FILE gaim-gaym.spec --- # $Id$ # make sure we require the correct versions of gaim %define gaim_min 1:%(pkg-config --modversion gaim | awk -F- '{ print $1 }') %define gaim_max 1:2.0.0 Name: gaim-gaym Version: 0.96 Release: 2%{?dist} Summary: A gay.com protocol plugin for gaim Group: Applications/Internet License: GPL URL: http://groups.yahoo.com/group/gaymplugin/ Source0: http://download.berlios.de/qrc/qrc-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim < %{gaim_max}, gtk2-devel Requires: gaim >= %{gaim_min}, gaim < %{gaim_max} %description This package provides a protocol plugin for the popular instant messaging program, gaim. If you want to be able to chat on gay.com via gaim, install this package. This package will work with gaim versions greater than or equal to %{gaim_min} and less than %{gaim_max}. %prep %setup -q -n qrc-%{version} %build %configure --enable-display_options make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) # AUTHORS and NEWS left out, as they're empty in this version # README.svn and README.mingw pertain to devel & win32 issues %doc ChangeLog COPYING INSTALL README TODO %{_libdir}/gaim/*.so %{_datadir}/pixmaps/gaim/gaym %{_datadir}/pixmaps/gaim/status/default/* %exclude %{_libdir}/gaim/*.la %changelog * Mon May 8 2006 Chris Weyl 0.96-2 - dropped explicit requires: gtk2 * Sat May 6 2006 Chris Weyl 0.96-1 - new spec file from f-e template Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 15:42:13 -0000 1.1 +++ .cvsignore 16 May 2006 15:43:16 -0000 1.2 @@ -0,0 +1 @@ +qrc-0.96.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 15:42:13 -0000 1.1 +++ sources 16 May 2006 15:43:16 -0000 1.2 @@ -0,0 +1 @@ +f846fdc07c2e38e74f8e27c58cdde37a qrc-0.96.tgz From fedora-extras-commits at redhat.com Tue May 16 15:44:45 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:44:45 -0700 Subject: extras-buildsys/common SSLCommon.py,1.13,1.14 Message-ID: <200605161544.k4GFijgw026452@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26434/common Modified Files: SSLCommon.py Log Message: Remove unused import Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- SSLCommon.py 12 Mar 2006 05:44:24 -0000 1.13 +++ SSLCommon.py 16 May 2006 15:44:42 -0000 1.14 @@ -15,7 +15,6 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import os, sys -import CommonErrors from OpenSSL import SSL import SSLConnection import httplib From fedora-extras-commits at redhat.com Tue May 16 15:47:21 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:47:21 -0700 Subject: extras-buildsys/common XMLRPCServerProxy.py,1.9,1.10 Message-ID: <200605161547.k4GFlLk1026562@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26503/common Modified Files: XMLRPCServerProxy.py Log Message: 2006-05-16 Dan Williams * common/XMLRPCServerProxy.py - Add cancellation ability to requests Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- XMLRPCServerProxy.py 15 Feb 2006 17:07:07 -0000 1.9 +++ XMLRPCServerProxy.py 16 May 2006 15:47:13 -0000 1.10 @@ -28,6 +28,7 @@ def __init__(self, ssl_context, timeout=None): self.ssl_ctx=ssl_context self._timeout = timeout + self._https = None def make_connection(self, host): # Handle username and password. @@ -37,17 +38,44 @@ # Yay for Python 2.2 pass _host, _port = urllib.splitport(host) - return SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout) + self._https = SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout) + return self._https + + def close(self): + if self._https: + self._https.close() + self._https = None + + +class Plg_ClosableTransport(xmlrpclib.Transport): + """Override make_connection so we can close it.""" + def __init__(self): + self._http = None + + def make_connection(self, host): + # create a HTTP connection object from a host descriptor + import httplib + host, extra_headers, x509 = self.get_host_info(host) + self._http = httplib.HTTP(host) + return self._http + + def close(self): + if self._http: + self._http.close() + self._http = None class PlgXMLRPCServerProxy(xmlrpclib.ServerProxy): def __init__(self, uri, certs, timeout=None): if certs and len(certs) > 0: self.ctx = SSLCommon.CreateSSLContext(certs) - xmlrpclib.ServerProxy.__init__(self, uri, PlgSSL_Transport(ssl_context=self.ctx, timeout=timeout)) + self._transport = PlgSSL_Transport(ssl_context=self.ctx, timeout=timeout) else: - xmlrpclib.ServerProxy.__init__(self, uri) + self._transport = Plg_ClosableTransport() + xmlrpclib.ServerProxy.__init__(self, uri, transport=self._transport) + def cancel(self): + self._transport.close() ########################################################### From fedora-extras-commits at redhat.com Tue May 16 15:47:15 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:47:15 -0700 Subject: extras-buildsys ChangeLog,1.198,1.199 Message-ID: <200605161547.k4GFlkY9026565@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26503 Modified Files: ChangeLog Log Message: 2006-05-16 Dan Williams * common/XMLRPCServerProxy.py - Add cancellation ability to requests Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- ChangeLog 15 May 2006 17:26:44 -0000 1.198 +++ ChangeLog 16 May 2006 15:47:13 -0000 1.199 @@ -1,3 +1,8 @@ +2006-05-16 Dan Williams + + * common/XMLRPCServerProxy.py + - Add cancellation ability to requests + 2006-05-15 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Tue May 16 15:48:29 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:48:29 -0700 Subject: extras-buildsys/builder main.py,1.3,1.4 Message-ID: <200605161548.k4GFmTp6026589@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26571/builder Modified Files: main.py Log Message: Catch exceptions creating builder objects Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/main.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- main.py 14 May 2006 05:43:06 -0000 1.3 +++ main.py 16 May 2006 15:48:26 -0000 1.4 @@ -20,6 +20,7 @@ import time import sys import signal +import socket from plague import ArchUtils from plague import daemonize from optparse import OptionParser @@ -194,7 +195,11 @@ signal.signal(signal.SIGTERM, exit_handler) global builder - builder = Builder.Builder.new_builder(cfg, btype) + try: + builder = Builder.Builder.new_builder(cfg, btype) + except socket.error, exc: + print exc[1] + os._exit(1) # Start doing stuff builder.work() From fedora-extras-commits at redhat.com Tue May 16 15:49:33 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:49:33 -0700 Subject: owners owners.list,1.1004,1.1005 Message-ID: <200605161549.k4GFnZAX026614@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597 Modified Files: owners.list Log Message: Added entry for package gaim-gaym Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1004 retrieving revision 1.1005 diff -u -r1.1004 -r1.1005 --- owners.list 16 May 2006 07:08:34 -0000 1.1004 +++ owners.list 16 May 2006 15:49:33 -0000 1.1005 @@ -316,6 +316,7 @@ Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|gaim-gaym|gay.com protocol plugin for GAIM|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org| Fedora Extras|gaim-guifications|Guifications plugin for GAIM|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xtdnet.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 15:49:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:49:58 -0700 Subject: extras-buildsys/builder Builder.py, 1.13, 1.14 BuilderMock.py, 1.7, 1.8 Message-ID: <200605161549.k4GFnwah026675@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26625/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-16 Dan Williams * Make passive builders work somewhat more; there are still some bugs in command processing though. 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 15 May 2006 17:26:45 -0000 1.13 +++ Builder.py 16 May 2006 15:49:50 -0000 1.14 @@ -235,7 +235,9 @@ def _dispatch_server_command(self, cmd): """Process a single command from the server.""" - if isinstance(cmd, Commands.PlgCommandNewJobReq): + if isinstance(cmd, Commands.PlgCommandKillJob): + self._handle_kill_job_command(cmd) + elif isinstance(cmd, Commands.PlgCommandNewJobReq): (uniqid, msg) = self._start_new_job(cmd) ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) self._queued_cmds.append(ack) @@ -249,8 +251,6 @@ reply = self._handle_job_files_request(cmd) if reply: self._queued_cmds.append(reply) - elif isinstance(cmd, Commands.PlgCommandKillJob): - self._handle_kill_job_command(cmd) def _process_server_commands(self, cmd_list): """Process the server's command stream.""" @@ -347,8 +347,12 @@ def _handle_kill_job_command(self, cmd): try: uniqid = cmd.archjob_id() - job = self._all_jobs[uniqid] - job.die() + archjob = self._all_jobs[uniqid] + archjob.die() + self._building_jobs_lock.acquire() + if archjob in self._building_jobs: + self._building_jobs.remove(archjob) + self._building_jobs_lock.release() except KeyError: pass @@ -378,14 +382,18 @@ """Startup HTTP and XML-RPC servers which the build server uses to talk to us.""" hostname = get_hostname(self._cfg, bind_all=True) - self._log("Binding to address '%s'\n" % hostname) + xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") + + self._log("Binding to address '%s:%d'\n" % (hostname, xmlrpc_port)) port = self._cfg.get_int("Passive", "fileserver_port") - self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), - self._work_dir, self._certs) + try: + self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), + self._work_dir, self._certs) + except socket.error, exc: + raise socket.error(exc[0], "Couldn't create server for %s:%s: '%s'" % (hostname, port, exc[1])) self._http_server.set_POST_handler('/upload', self.upload_callback) - xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") try: if self._use_ssl: self._xmlrpc_server = AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) @@ -471,8 +479,7 @@ def request(self, cmd_list): """Main XML-RPC handler, called by the build server. Dispatches the build server's requests and returns our response.""" - cmds = Commands.deserialize_command_stream(cmd_list) - self._process_server_commands(cmds) + self._process_server_commands(cmd_list) cmds_for_server = self._get_default_commands() cmds_for_server = cmds_for_server + self._queued_cmds self._queued_cmds = [] @@ -532,6 +539,27 @@ ul_callback(result, cb_data, msg) return None + def _handle_job_files_request(self, cmd): + """Return a list of urls of the result files of this job.""" + archjob_id = cmd.archjob_id() + try: + job = self._all_jobs[archjob_id] + except KeyError: + return None + + # url-ify the file list + urls = [] + work_dir = self._get_workdir_for_job(job.uniqid()) + port = "%s" % self._cfg.get_int("Network", "fileserver_port") + host = prefix_url(get_hostname(self._cfg)) + for fpath in job.files(): + if not fpath.startswith(work_dir): + return None + file_part = urllib.quote(fpath[len(work_dir) + 1:]) + full_url = "%s:%s/%s" % (host, port, file_part) + urls.append(full_url) + return Commands.PlgCommandJobFilesAck(archjob_id, urls, cmd.seq(), self._seq_gen.next()) + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- BuilderMock.py 15 May 2006 17:26:45 -0000 1.7 +++ BuilderMock.py 16 May 2006 15:49:50 -0000 1.8 @@ -36,21 +36,6 @@ from plague import FileTransfer -def get_url_for_file(cfg, file_path): - """ Return a URL pointing to a particular file in our work dir """ - - # Ensure the file we're turning into a URL lives in our builder work dir - work_dir = cfg.get_str("Directories", "builder_work_dir") - if not file_path.startswith(work_dir): - return None - file_part = file_path[len(work_dir) + 1:] - port = "%s" % cfg.get_int("Network", "fileserver_port") - hostname = Builder.get_hostname(cfg) - full_url = "%s:%s/%s" % (hostname, port, file_part) - full_url = Builder.prefix_url(full_url, cfg.get_bool("SSL", "use_ssl")) - return urllib.quote(full_url) - - class BuilderMock(threading.Thread): """puts things together for an arch - baseclass for handling builds for other arches""" From fedora-extras-commits at redhat.com Tue May 16 15:49:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:49:59 -0700 Subject: extras-buildsys/server Builder.py, 1.41, 1.42 BuilderManager.py, 1.25, 1.26 Message-ID: <200605161550.k4GFnxpK026681@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26625/server Modified Files: Builder.py BuilderManager.py Log Message: 2006-05-16 Dan Williams * Make passive builders work somewhat more; there are still some bugs in command processing though. Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Builder.py 14 May 2006 05:43:07 -0000 1.41 +++ Builder.py 16 May 2006 15:49:56 -0000 1.42 @@ -62,6 +62,7 @@ self._suspend_listeners = [] self._status_listeners = [] self._ip = None + self._last_contact = 0 uri, rest = urllib.splittype(address) host, ignore = urllib.splithost(rest) @@ -359,31 +360,37 @@ # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt -class BuildingJobsCheck(threading.Thread): - def __init__(self, server, address): - self._server = server +class PassiveBuilderRequest(threading.Thread): + def __init__(self, address, certs, cmds): self._address = address - + self._certs = certs + self._cmds = cmds self.done = False - self.failed = False - + self.failed = True + self.response = None + self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, self._certs, timeout=20) threading.Thread.__init__(self) def run(self): - self.setName("BuildingJobsCheck: %s" % self._address) - jobs = {} - free_slots = 0 + self.setName("PassiveBuilderRequest: %s" % self._address) try: - (jobs, free_slots) = self._server.building_jobs() - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): - self.failed = True - except xmlrpclib.Fault, exc: - print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self._address, exc) - self.failed = True - self.jobs = jobs - self.free_slots = free_slots + cmd_stream = Commands.serialize_to_command_stream(self._cmds) + self.response = self._server.request(cmd_stream) + self.failed = False + except (socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, + xmlrpclib.ProtocolError, xmlrpclib.Fault), exc: + print "PassiveBuilder(%s) Error in request(): '%s'" % (self._address, exc) + except socket.error, exc: + if exc[0] != 111: + print "PassiveBuilder(%s) Error in request(): '%s'" % (self._address, exc) self.done = True + def close(self): + try: + self._server.close() + except: + pass + class PassiveBuilder(Builder): """ Passive builders are ones that do not initiate connections. They @@ -391,223 +398,165 @@ a firewall without having holes punched through it. """ - _BUILDER_PING_INTERVAL = 60 * 5 # In seconds + # How often we try to contact unavailable builders + _BUILDER_UNAVAIL_PING_INTERVAL = 300 # 5 minutes (in seconds) - def __init__(self, manager, cfg, address, weight, btype): - Builder.__init__(self, manager, cfg, address, weight, btype) + # How often we try to contact available builders + _BUILDER_AVAIL_PING_INTERVAL = 20 - self._ping_timeout = 0 - self._cur_ping_interval = self._BUILDER_PING_INTERVAL - self._ping_now = False + def __init__(self, manager, cfg, address, weight): + Builder.__init__(self, manager, cfg, address, weight, TYPE_PASSIVE) + # Builder will get pinged immediately since self._last_contact == 0 + self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL - certs = None + self._certs = None if self._server_cfg.get_bool("Builders", "use_ssl"): - certs = {} - certs['key_and_cert'] = self._server_cfg.get_str("SSL", "server_key_and_cert") - certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") - certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") - - self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20) - self._server_lock = threading.Lock() - - (self._available, target_list) = self._ping_builder() - if self._available: - self._init_builder(target_list) - else: - # Treat the builder as timed out and ping it periodically - self._ping_timeout = time.time() - self._suspend_reason = SUSPEND_TIMEOUT - - def _ping_builder(self): - target_list = [] - try: - target_list = self._server.supported_targets() - alive = True - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): - alive = False - except xmlrpclib.Fault, exc: - print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, exc) - alive = False - return (alive, target_list) - - def _init_builder(self, target_list): - self._target_list = target_list - # Kill any jobs currently running on the builder - jobs = self._building_jobs() - for jobid in jobs.keys(): - try: - self._server.die(jobid) - except: - pass - - self._num_slots = self._get_num_slots() + self._certs = {} + self._certs['key_and_cert'] = self._server_cfg.get_str("SSL", "server_key_and_cert") + self._certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + self._certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + + def _send_commands(self): + """Send queued commands to the builder, and then get it's list + of reply commands.""" - def _get_num_slots(self): - num_slots = self._num_slots - try: - num_slots = self._server.num_slots() - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): - pass - except xmlrpclib.Fault, exc: - print "Builder Error (%s) in _get_num_slots(): builder replied '%s'" % (self._address, exc) - return num_slots + # Grab some work for the builder if any is available + new_cmds = [] + if self._free_slots > 0: + archjob = self._manager.claim_arch_job(self) + if archjob: + next_seq = self._seq_gen.next() + cmd = Commands.PlgCommandNewJobReq(archjob, seq=next_seq) + new_cmds.append(cmd) - def _building_jobs(self): - bjc = BuildingJobsCheck(self._server, self._address) + # Copy command queue + self._lock.acquire() + self._cmd_queue = self._cmd_queue + new_cmds + cmd_list = self._cmd_queue + # FIXME: deal with keeping ack-requiring cmds around + self._cmd_queue = [] + self._lock.release() + # The actual XML-RPC request runs in a different thread because SSL + # calls sometimes hang + req = PassiveBuilderRequest(self._address, self._certs, cmd_list) curtime = time.time() - bjc.start() + req.start() - # Give the check 10s, otherwise screw it - while time.time() - curtime < 10: - if bjc.done: + # Give the request 10s, otherwise forget about it + while time.time() < curtime + 10: + if req.done: break time.sleep(0.5) - if bjc.done: - if not bjc.failed: - self._unavail_count = 0 - self._available = True - self._free_slots = bjc.free_slots - return bjc.jobs - else: - # Error of some kind - self._unavail_count = self._unavail_count + 1 + # If the request isn't done yet, force-close it to + # minimize chances of the commands getting through + # to the builder + if not req.done: + req.cancel() + + response = None + if req.failed: + # Put all the commands back at the front of the queue + self._lock.acquire() + self._cmd_queue = cmd_list + self._cmd_queue + self._lock.release() else: - self._unavail_count = self._unavail_count + 1 - - return {} - - def ping_asap(self): - # Reduce the ping interval to ping the builder right away - self._cur_ping_interval = 0 - self._ping_now = True + response = req.response + return response - def _handle_builder_suspend(self, reason, msg): - Builder._handle_builder_suspend(self, reason, msg) - # Reset current ping interval to default - self._cur_ping_interval = self._BUILDER_PING_INTERVAL - self._ping_timeout = time.time() - - def _handle_builder_reactivate(self): - Builder._handle_builder_reactivate(self) - self._ping_timeout = 0 - self._init_builder(target_list) + def _dispatch_command(self, cmd, first_contact): + """Dispatch one command. We let the superclass dispatch the common + commands, and handle only those that need action specific to the + Passive builder type.""" - def start_job(self, req): - if not self.available(): - raise RuntimeError - if not self.can_build_request(req): - raise RuntimeError + # The first time we contact the builder, we need to tell it to kill + # all jobs that are building on it. So don't let the superclass + # handle the first BuildingJobs command we get + handled = False + if first_contact and isinstance(cmd, Commands.PlgCommandBuildingJobs): + # Tell the builder to kill all jobs it might be building + # right now. Think server restart here. + for item in cmd.jobs(): + (uniqid, status) = cmd.get_job(item) + cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) + self._cmd_queue.append(cmd) + handled = True - self._server_lock.acquire() - try: - # Builder will return jobid of 0 if it can't start the job for some reason - srpm_url = req.srpm_url() - target_dict = req.target_dict() - jobid = self._server.start_new_job(target_dict, req.srpm_url()) - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, \ - OpenSSL.SSL.Error, xmlrpclib.ProtocolError, xmlrpclib.Fault), exc: - error_class = str(exc.__class__) - error_string = str(exc) - jobarch = target_dict['arch'] - parent = req.parent() - print "%s (%s/%s): %s exception '%s' starting job on %s" % (parent.uid, \ - parent.package, jobarch, error_class, error_string, \ - self._address) - # Check for hard errors, for which we suspend the builder - if error_string.find("OSError") >= 0 and error_string.find("Errno") >= 0: - self._handle_builder_suspend(SUSPEND_HARD_ERROR, error_string) - time.sleep(0.5) - jobid = 0 + # Let the superclass handle what's left + if not handled: + handled = self._dispatch_common_command(cmd) - if jobid == 0: - self._server_lock.release() - raise RuntimeError - - job = ArchJob.ArchJob(self, self._server_cfg, self._server, parent, jobid, target_dict) - self._jobs[jobid] = job - self._update_building_jobs() - self._server_lock.release() - return job - - def _update_building_jobs(self): - jobs = self._building_jobs() - - # Update status for all jobs on this builder - if self._unavail_count == 0: - builder_jobs = [] - for jobid in jobs.keys(): - try: - job = self._jobs[jobid] - status = jobs[jobid] - job.set_builder_status(self, status) - builder_jobs.append(jobid) - except KeyError: - pass - - # We have to check jobs that weren't reported - # as 'building' by the builder, since the job - # may have finished on the builder and was - # removed from the building job list before we - # were able to know that it was done. HACK - self._prepping_jobs = False - for jobid in self._jobs.keys(): - # If the builder didn't report this job as building, - # and its not done, explicitly grab its status - job = self._jobs[jobid] - if jobid not in builder_jobs and job.status() != 'done': - status = self._get_builder_job_status(jobid) - if status: - job.set_builder_status(self, status) - - # Check for prepping jobs - if job.prepping(): - self._prepping_jobs = True - - def _get_builder_job_status(self, jobid): - """ Get the status of one job on the builder """ - status = None - try: - status = self._server.job_status(jobid) - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error): - pass - except (xmlrpclib.Fault, xmlrpclib.ProtocolError): - pass - return status + # The we handle what the superclass didn't + if not handled: + if isinstance(cmd, Commands.PlgCommandJobFilesAck): + self._handle_job_files_ack(cmd) + handled = True + elif isinstance(cmd, Commands.PlgCommandTargets): + if not self._target_list: + self._target_list = cmd.targets() + + if not handled: + print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) + _SLEEP_INTERVAL = 5 def run(self): + """foobar""" DebugUtils.registerThreadName(self) while not self._stop: - self._server_lock.acquire() - - if self._available: - self._update_building_jobs() + if self._last_contact < time.time() - self._ping_interval: + # Ensure the builder's IP is up-to-date + self._get_ip() + + # Try to talk to the builder + print "builder contact" + cmd_list = self._send_commands() + if cmd_list: + # Builder is alive + first_contact = False + if not self._available: + self._handle_builder_reactivate() + first_contact = True + self._unavail_count = 0 - if self._unavail_count > 2: - # Kill all jobs on the client if it went away - self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") + # process builder's response + cmds = Commands.deserialize_command_stream(cmd_list) + for cmd in cmds: + self._dispatch_command(cmd, first_contact) else: - # Update status of all archjobs on this builder - for j in self._jobs.values(): - j.process() - elif not self._available and (self._suspend_reason == SUSPEND_TIMEOUT or self._ping_now): - # Ping the builder every so often to see if it responds again - if time.time() > (self._ping_timeout + self._cur_ping_interval): - (alive, target_list) = self._ping_builder() - if alive: - self._handle_builder_reactivate() - else: - # Wait and ping again - self._ping_timeout = time.time() + # Builder didn't respond + self._lock.acquire() + self._unavail_count = self._unavail_count + 1 + if self._available and self._unavail_count > 2: + self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") + self._lock.release() + self._last_contact = time.time() - # Reset current ping interval to default - self._cur_ping_interval = self._BUILDER_PING_INTERVAL - self._ping_now = False + time.sleep(self._SLEEP_INTERVAL) - self._server_lock.release() + def _handle_builder_suspend(self, reason, msg): + Builder._handle_builder_suspend(self, reason, msg) + self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL + self._ip = None + self._target_list = None + # Set free slots to zero so we don't send the + # builder a job on first contact + self._free_slots = 0 - time.sleep(20) + # Clear out the command queue; we start clean + self._cmd_queue = [] + + def _handle_builder_reactivate(self): + mail = True + if self._suspend_reason == SUSPEND_NONE: + # Don't send mail saying the builder has been reactivated if + # this is the first time the builder has contacted us + mail = False + + self._ping_interval = self._BUILDER_AVAIL_PING_INTERVAL + self._lock.acquire() + Builder._handle_builder_reactivate(self, mail=mail) + self._lock.release() class ActiveBuilder(Builder): @@ -619,9 +568,8 @@ _REQUIRED_CONTACT_INTERVAL = 25 - def __init__(self, manager, cfg, address, weight, btype): - Builder.__init__(self, manager, cfg, address, weight, btype) - self._last_contact = 0 + def __init__(self, manager, cfg, address, weight): + Builder.__init__(self, manager, cfg, address, weight, TYPE_ACTIVE) def _init_builder(self, target_list): self._target_list = target_list Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- BuilderManager.py 14 May 2006 05:43:07 -0000 1.25 +++ BuilderManager.py 16 May 2006 15:49:56 -0000 1.26 @@ -280,9 +280,9 @@ # Add the builder to our build list if btype == Builder.TYPE_ACTIVE: - builder = Builder.ActiveBuilder(self, self._cfg, address, weight, btype) + builder = Builder.ActiveBuilder(self, self._cfg, address, weight) else: - builder = Builder.PassiveBuilder(self, self._cfg, address, weight, btype) + builder = Builder.PassiveBuilder(self, self._cfg, address, weight) builder.start() self._builders.append(builder) self._builders_lock.release() From fedora-extras-commits at redhat.com Tue May 16 15:49:52 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:49:52 -0700 Subject: extras-buildsys ChangeLog,1.199,1.200 Message-ID: <200605161550.k4GFoMlL026690@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26625 Modified Files: ChangeLog Log Message: 2006-05-16 Dan Williams * Make passive builders work somewhat more; there are still some bugs in command processing though. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- ChangeLog 16 May 2006 15:47:13 -0000 1.199 +++ ChangeLog 16 May 2006 15:49:50 -0000 1.200 @@ -1,5 +1,10 @@ 2006-05-16 Dan Williams + * Make passive builders work somewhat more; there are still some bugs + in command processing though. + +2006-05-16 Dan Williams + * common/XMLRPCServerProxy.py - Add cancellation ability to requests From fedora-extras-commits at redhat.com Tue May 16 15:51:33 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Tue, 16 May 2006 08:51:33 -0700 Subject: rpms/vorbisgain/FC-5 vorbisgain.spec,1.1,1.2 Message-ID: <200605161551.k4GFpZ8E026740@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26723 Modified Files: vorbisgain.spec Log Message: bumped version to satisfy the build system Index: vorbisgain.spec =================================================================== RCS file: /cvs/extras/rpms/vorbisgain/FC-5/vorbisgain.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vorbisgain.spec 14 May 2006 16:12:55 -0000 1.1 +++ vorbisgain.spec 16 May 2006 15:51:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: vorbisgain Version: 0.34 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Adds tags to Ogg Vorbis files to adjust the volume Group: Applications/Multimedia @@ -43,5 +43,8 @@ %_mandir/man1/* %changelog +* Tue May 16 2006 Noa Resare 0.34-2 +- bumped release to make the wonderful build system happy + * Sat May 13 2006 Noa Resare 0.34-1 - Initial spec From fedora-extras-commits at redhat.com Tue May 16 15:52:34 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 May 2006 08:52:34 -0700 Subject: rpms/php-pecl-pdo/devel .cvsignore, 1.3, NONE Makefile, 1.1, NONE php-pecl-pdo.spec, 1.4, NONE sources, 1.3, NONE Message-ID: <200605161552.k4GFqaM9026841@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-pdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719/php-pecl-pdo/devel Removed Files: .cvsignore Makefile php-pecl-pdo.spec sources Log Message: Remove php-pecl-pdo and php-pecl-pdo-sqlite devel branches since they have been included as part of PHP since 5.1.x (see bug #181863). --- .cvsignore DELETED --- --- Makefile DELETED --- --- php-pecl-pdo.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue May 16 15:52:34 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 May 2006 08:52:34 -0700 Subject: rpms/php-pecl-pdo-sqlite/devel .cvsignore, 1.2, NONE Makefile, 1.1, NONE php-pecl-pdo-sqlite.spec, 1.4, NONE sources, 1.2, NONE Message-ID: <200605161552.k4GFqa41026845@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-pdo-sqlite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719/php-pecl-pdo-sqlite/devel Removed Files: .cvsignore Makefile php-pecl-pdo-sqlite.spec sources Log Message: Remove php-pecl-pdo and php-pecl-pdo-sqlite devel branches since they have been included as part of PHP since 5.1.x (see bug #181863). --- .cvsignore DELETED --- --- Makefile DELETED --- --- php-pecl-pdo-sqlite.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue May 16 16:14:24 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:14:24 -0700 Subject: rpms/gtklp - New directory Message-ID: <200605161614.k4GGEQXv029510@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29484/gtklp Log Message: Directory /cvs/extras/rpms/gtklp added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:14:25 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:14:25 -0700 Subject: rpms/gtklp/devel - New directory Message-ID: <200605161614.k4GGERlZ029513@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29484/gtklp/devel Log Message: Directory /cvs/extras/rpms/gtklp/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:14:46 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:14:46 -0700 Subject: rpms/gtklp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161614.k4GGEmv2029563@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29530 Added Files: Makefile import.log Log Message: Setup of module gtklp --- NEW FILE Makefile --- # Top level Makefile for module gtklp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 16:14:47 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:14:47 -0700 Subject: rpms/gtklp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161614.k4GGEnQU029566@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29530/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtklp --- NEW 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 May 16 16:16:11 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:16:11 -0700 Subject: rpms/gtklp import.log,1.1,1.2 Message-ID: <200605161616.k4GGGhbN029715@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640 Modified Files: import.log Log Message: auto-import gtklp-1.2.1-2 on branch devel from gtklp-1.2.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtklp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 16:14:46 -0000 1.1 +++ import.log 16 May 2006 16:16:11 -0000 1.2 @@ -0,0 +1 @@ +gtklp-1_2_1-2:HEAD:gtklp-1.2.1-2.src.rpm:1147796160 From fedora-extras-commits at redhat.com Tue May 16 16:16:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:16:12 -0700 Subject: rpms/gtklp/devel gtklp.png, NONE, 1.1 gtklp.spec, NONE, 1.1 gtklpq.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161616.k4GGGirn029719@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640/devel Modified Files: .cvsignore sources Added Files: gtklp.png gtklp.spec gtklpq.png Log Message: auto-import gtklp-1.2.1-2 on branch devel from gtklp-1.2.1-2.src.rpm --- NEW FILE gtklp.spec --- Name: gtklp Version: 1.2.1 Release: 2%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.1.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-devel BuildRequires: gtk2-devel BuildRequires: desktop-file-utils BuildRequires: gnutls-devel Requires: cups %description GtkLP for CUPS is a frontend for the lpr that comes with CUPS. It is written to make it easy to use nearly all the options from CUPS without knowing them by name. For print-admins, there is also an pretty simple queue tool implemented. %prep %setup -q %build %configure make %{_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications # remove some incorrect locales rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/cz rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/chs rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/cht %find_lang %{name} cat > gtklp.desktop < gtklpq.desktop < - 1.2.1-2 - cleaned up buildrequires - added %%{_smp_mflags} * Tue Mar 14 2006 Gerard Milmeister - 1.2.1-1 - new version 1.2.1 * Mon Feb 20 2006 Gerard Milmeister - 1.2.0-1 - new version 1.2.0 * Sun Dec 18 2005 Gerard Milmeister - 1.1.0-1 - New Version 1.1.0 * Mon Jun 20 2005 Gerard Milmeister - 1.0f-1 - New Version 1.0f * Sun Mar 13 2005 Gerard Milmeister - 1.0c-1 - New Version 1.0c * Wed Nov 17 2004 Gerard Milmeister - 0:1.0-0.fdr.1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 16:14:47 -0000 1.1 +++ .cvsignore 16 May 2006 16:16:12 -0000 1.2 @@ -0,0 +1 @@ +gtklp-1.2.1.src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 16:14:47 -0000 1.1 +++ sources 16 May 2006 16:16:12 -0000 1.2 @@ -0,0 +1 @@ +374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz From fedora-extras-commits at redhat.com Tue May 16 16:19:51 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 09:19:51 -0700 Subject: rpms/gaim-gaym/FC-5 gaim-gaym.spec,1.1,1.2 Message-ID: <200605161619.k4GGJrrO029984@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29967 Modified Files: gaim-gaym.spec Log Message: Bump rel Index: gaim-gaym.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/FC-5/gaim-gaym.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gaim-gaym.spec 16 May 2006 15:43:16 -0000 1.1 +++ gaim-gaym.spec 16 May 2006 16:19:50 -0000 1.2 @@ -6,7 +6,7 @@ Name: gaim-gaym Version: 0.96 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A gay.com protocol plugin for gaim Group: Applications/Internet @@ -56,6 +56,9 @@ %changelog +* Tue May 16 2006 Chris Weyl 0.96-3 +- bump release for proper cvs taggage + * Mon May 8 2006 Chris Weyl 0.96-2 - dropped explicit requires: gtk2 From fedora-extras-commits at redhat.com Tue May 16 16:26:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 16 May 2006 09:26:25 -0700 Subject: rpms/lyx/devel lyx.spec,1.34,1.35 Message-ID: <200605161626.k4GGQRJI030075@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30058 Modified Files: lyx.spec Log Message: * Tue May 16 2006 Rex Dieter 1.4.1-4 - add generic app icon (rh #191944) Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- lyx.spec 13 May 2006 17:18:05 -0000 1.34 +++ lyx.spec 16 May 2006 16:26:25 -0000 1.35 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -142,21 +142,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "X-Fedora" \ - %{SOURCE21} %{SOURCE22} +# .desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category="X-Fedora" --vendor="fedora" \ + %{SOURCE21} %{SOURCE22} + +# generic/hicolor icon +install -p -D -m644 lib/images/lyx.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm %find_lang %{name} || touch %{name}.lang %post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: @@ -183,6 +191,7 @@ %{_bindir}/lyxclient %{_bindir}/tex2lyx %{_mandir}/man1/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ %{_datadir}/texmf/tex/latex/lyx/ %verify(not md5 size mtime) %{_datadir}/lyx/*.lst @@ -201,6 +210,9 @@ %changelog +* Tue May 16 2006 Rex Dieter 1.4.1-4 +- add generic app icon (rh #191944) + * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking From fedora-extras-commits at redhat.com Tue May 16 16:39:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 16 May 2006 09:39:14 -0700 Subject: rpms/kchmviewer/FC-4 kchmviewer.spec,1.1,1.2 Message-ID: <200605161639.k4GGdkZV030215@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30183/FC-4 Modified Files: kchmviewer.spec Log Message: * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-4/kchmviewer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kchmviewer.spec 1 May 2006 08:35:31 -0000 1.1 +++ kchmviewer.spec 16 May 2006 16:39:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: kchmviewer Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: CHM viewer Group: Applications/Publishing @@ -64,7 +64,8 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - kio-msits/kchmviewer.desktop + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop %clean @@ -84,10 +85,12 @@ %{_datadir}/pixmaps/* %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la -%{_datadir}/applnk/kchmviewer.desktop %{_datadir}/services/msits.protocol %changelog +* Tue May 16 2006 Patrice Dumas 2.0-4 +- remove the old menu entry file from /usr/share/applnk/ + * Mon Mar 13 2006 Patrice Dumas 2.0-3 - use update-desktop-database From fedora-extras-commits at redhat.com Tue May 16 16:39:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 16 May 2006 09:39:14 -0700 Subject: rpms/kchmviewer/FC-5 kchmviewer.spec,1.1,1.2 Message-ID: <200605161639.k4GGdkS9030218@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30183/FC-5 Modified Files: kchmviewer.spec Log Message: * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-5/kchmviewer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kchmviewer.spec 1 May 2006 08:35:31 -0000 1.1 +++ kchmviewer.spec 16 May 2006 16:39:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: kchmviewer Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: CHM viewer Group: Applications/Publishing @@ -64,7 +64,8 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - kio-msits/kchmviewer.desktop + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop %clean @@ -84,10 +85,12 @@ %{_datadir}/pixmaps/* %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la -%{_datadir}/applnk/kchmviewer.desktop %{_datadir}/services/msits.protocol %changelog +* Tue May 16 2006 Patrice Dumas 2.0-4 +- remove the old menu entry file from /usr/share/applnk/ + * Mon Mar 13 2006 Patrice Dumas 2.0-3 - use update-desktop-database From fedora-extras-commits at redhat.com Tue May 16 16:41:25 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:41:25 -0700 Subject: rpms/crossfire-client Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161641.k4GGfRoG030351@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30318 Added Files: Makefile import.log Log Message: Setup of module crossfire-client --- NEW FILE Makefile --- # Top level Makefile for module crossfire-client all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 16:41:25 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:41:25 -0700 Subject: rpms/crossfire-client/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161641.k4GGfRYF030354@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30318/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module crossfire-client --- NEW 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 May 16 16:42:03 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:42:03 -0700 Subject: rpms/crossfire-client/devel crossfire-client.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161642.k4GGg5kY030429@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30387/devel Modified Files: .cvsignore sources Added Files: crossfire-client.spec Log Message: auto-import crossfire-client-1.9.0-2 on branch devel from crossfire-client-1.9.0-2.src.rpm --- NEW FILE crossfire-client.spec --- Name: crossfire-client Version: 1.9.0 Release: 2 Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPL URL: http://crossfire.real-time.com Source0: http://dl.sourceforge.net/crossfire/%{name}-%{version}.tar.gz BuildRequires: SDL-devel SDL_image-devel BuildRequires: gtk+-devel gtk2-devel libpng-devel BuildRequires: desktop-file-utils # Disabled sound for Fedora until it's working again #BuildRequires: alsa-lib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Crossfire is a graphical role-playing adventure game with characteristics reminiscent of rogue, nethack, omega, and gauntlet. It has multiplayer capability and presently runs under X11. Client for playing the new client/server based version of Crossfire. This package allows you to connect to crossfire servers around the world. You do not need install the crossfire program in order to use this package. %prep %setup -q %build chmod 755 configure # Disable sound for Fedora until it's working again. %configure --datadir=%{_datadir}/crossfire \ --disable-sound \ --disable-dmalloc make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps %makeinstall mandir=$RPM_BUILD_ROOT%{_mandir} install -m 644 pixmaps/16x16.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/crossfire-client.png install -m 644 pixmaps/32x32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/crossfire-client.png install -m 644 pixmaps/48x48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/crossfire-client.png install -m 644 pixmaps/16x16.png \ $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps/crossfire-client.png install -m 644 pixmaps/32x32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/apps/crossfire-client.png install -m 644 pixmaps/48x48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps/crossfire-client.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Game \ --add-category Application \ gtk/crossfire-client.desktop %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %{_bindir}/cfclient %{_bindir}/gcfclient %{_bindir}/gcfclient2 # Sound support is too broken to use in Fedora right now. #%{_bindir}/cfsndserv #%{_bindir}/cfsndserv_alsa9 %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/locolor/16x16/apps/%{name}.png %{_datadir}/icons/locolor/32x32/apps/%{name}.png %{_datadir}/icons/locolor/48x48/apps/%{name}.png %{_mandir}/man6/gcfclient.6* %{_mandir}/man6/cfclient.6* %doc ChangeLog COPYING License NOTES README TODO %changelog * Thu Mar 9 2006 Wart 1.9.0-2 - Initial spec file following Fedora Extras conventions Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 16:41:25 -0000 1.1 +++ .cvsignore 16 May 2006 16:42:03 -0000 1.2 @@ -0,0 +1 @@ +crossfire-client-1.9.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 16:41:25 -0000 1.1 +++ sources 16 May 2006 16:42:03 -0000 1.2 @@ -0,0 +1 @@ +62a9ac007700d1d811fa097fe6790f7a crossfire-client-1.9.0.tar.gz From fedora-extras-commits at redhat.com Tue May 16 16:44:04 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:44:04 -0700 Subject: rpms/crossfire-maps/devel - New directory Message-ID: <200605161644.k4GGi67W030578@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30549/crossfire-maps/devel Log Message: Directory /cvs/extras/rpms/crossfire-maps/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:44:04 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:44:04 -0700 Subject: rpms/crossfire-maps - New directory Message-ID: <200605161644.k4GGi6Kw030575@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30549/crossfire-maps Log Message: Directory /cvs/extras/rpms/crossfire-maps added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:44:13 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:44:13 -0700 Subject: rpms/crossfire-maps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161644.k4GGiFQb030627@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30594 Added Files: Makefile import.log Log Message: Setup of module crossfire-maps --- NEW FILE Makefile --- # Top level Makefile for module crossfire-maps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 16:44:13 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:44:13 -0700 Subject: rpms/crossfire-maps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161644.k4GGiFwZ030630@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30594/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module crossfire-maps --- NEW 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 May 16 16:45:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:45:14 -0700 Subject: owners owners.list,1.1005,1.1006 Message-ID: <200605161645.k4GGjGbD030677@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30660 Modified Files: owners.list Log Message: added gtklp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1005 retrieving revision 1.1006 diff -u -r1.1005 -r1.1006 --- owners.list 16 May 2006 15:49:33 -0000 1.1005 +++ owners.list 16 May 2006 16:45:14 -0000 1.1006 @@ -458,6 +458,7 @@ Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|gtkhtml36|GtkHTML 3.6 Compatibility Library|mpeters at mac.com|extras-qa at fedoraproject.org| +Fedora Extras|gtklp|A GTK frontend to CUPS|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 16:53:46 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:53:46 -0700 Subject: rpms/crossfire-maps import.log,1.1,1.2 Message-ID: <200605161653.k4GGrmln030781@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30748 Modified Files: import.log Log Message: auto-import crossfire-maps-1.9.0-1 on branch devel from crossfire-maps-1.9.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 16:44:13 -0000 1.1 +++ import.log 16 May 2006 16:53:46 -0000 1.2 @@ -0,0 +1 @@ +crossfire-maps-1_9_0-1:HEAD:crossfire-maps-1.9.0-1.src.rpm:1147798422 From fedora-extras-commits at redhat.com Tue May 16 16:53:47 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:53:47 -0700 Subject: rpms/crossfire-maps/devel crossfire-maps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161653.k4GGrneN030786@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30748/devel Modified Files: .cvsignore sources Added Files: crossfire-maps.spec Log Message: auto-import crossfire-maps-1.9.0-1 on branch devel from crossfire-maps-1.9.0-1.src.rpm --- NEW FILE crossfire-maps.spec --- Name: crossfire-maps Version: 1.9.0 Release: 1%{?dist} Summary: Map files for the crossfire server Group: Amusements/Games License: GPL URL: http://crossfire.real-time.com Source0: http://dl.sourceforge.net/crossfire/crossfire-%{version}-1.maps.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description Map files for the crossfire server. %package devel Summary: Development tools for writing crossfire maps Group: Development/Libraries Requires: %{name} = %{version} %description devel Development tools for writing crossfire maps. %prep %setup -q -c -n %{name}-%{version} chmod -x maps/python/IPO/README chmod -x maps/python/IPO/*.py chmod -x maps/scorn/misc/beginners2 chmod -x maps/styles/monsterstyles/sylvan/* chmod -x maps/planes/* chmod -x maps/unlinked/casino/* chmod -x maps/pup_land/s_f/* chmod -x maps/pup_land/ancient/castle/* chmod -x maps/pup_land/ancient/volcano/* chmod -x maps/pup_land/ancient/mountain/* chmod -x maps/pup_land/lone_town/cave/* chmod -x maps/templates/keep/*.tpl chmod -x maps/templates/guild/bigchest %{__sed} -i 's/\r//' maps/templates/keep/keep1.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep2.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep3.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep_b.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep_roof.tpl rm -f maps/:! %build # Nothing to build! %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire cp -a maps $RPM_BUILD_ROOT%{_datadir}/crossfire/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_datadir}/crossfire/maps %exclude %{_datadir}/crossfire/maps/Info %exclude %{_datadir}/crossfire/maps/templates %files devel %defattr(-,root,root,-) %{_datadir}/crossfire/maps/Info %{_datadir}/crossfire/maps/templates %changelog * Thu Mar 9 2006 Wart 1.9.0-1 - Initial spec file following Fedora Extras conventions Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 16:44:13 -0000 1.1 +++ .cvsignore 16 May 2006 16:53:47 -0000 1.2 @@ -0,0 +1 @@ +crossfire-1.9.0-1.maps.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 16:44:13 -0000 1.1 +++ sources 16 May 2006 16:53:47 -0000 1.2 @@ -0,0 +1 @@ +265c4dfdbdedaa2c565ea831f5f74a0c crossfire-1.9.0-1.maps.tar.gz From fedora-extras-commits at redhat.com Tue May 16 16:56:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 16 May 2006 09:56:21 -0700 Subject: rpms/lyx/FC-5 lyx.spec,1.33,1.34 Message-ID: <200605161656.k4GGuNlJ030843@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30826 Modified Files: lyx.spec Log Message: * Tue May 16 2006 Rex Dieter 1.4.1-4 - add generic app icon (rh #191944) Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- lyx.spec 13 May 2006 17:18:57 -0000 1.33 +++ lyx.spec 16 May 2006 16:56:20 -0000 1.34 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -142,21 +142,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "X-Fedora" \ - %{SOURCE21} %{SOURCE22} +# .desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category="X-Fedora" --vendor="fedora" \ + %{SOURCE21} %{SOURCE22} + +# generic/hicolor icon +install -p -D -m644 lib/images/lyx.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm %find_lang %{name} || touch %{name}.lang %post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: @@ -183,6 +191,7 @@ %{_bindir}/lyxclient %{_bindir}/tex2lyx %{_mandir}/man1/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ %{_datadir}/texmf/tex/latex/lyx/ %verify(not md5 size mtime) %{_datadir}/lyx/*.lst @@ -201,6 +210,9 @@ %changelog +* Tue May 16 2006 Rex Dieter 1.4.1-4 +- add generic app icon (rh #191944) + * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking From fedora-extras-commits at redhat.com Tue May 16 16:56:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 16 May 2006 09:56:36 -0700 Subject: rpms/lyx/FC-4 lyx.spec,1.20,1.21 Message-ID: <200605161656.k4GGuclB030906@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30887 Modified Files: lyx.spec Log Message: * Tue May 16 2006 Rex Dieter 1.4.1-4 - add generic app icon (rh #191944) Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- lyx.spec 13 May 2006 17:19:24 -0000 1.20 +++ lyx.spec 16 May 2006 16:56:36 -0000 1.21 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -142,21 +142,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "X-Fedora" \ - %{SOURCE21} %{SOURCE22} +# .desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category="X-Fedora" --vendor="fedora" \ + %{SOURCE21} %{SOURCE22} + +# generic/hicolor icon +install -p -D -m644 lib/images/lyx.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm %find_lang %{name} || touch %{name}.lang %post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: @@ -183,6 +191,7 @@ %{_bindir}/lyxclient %{_bindir}/tex2lyx %{_mandir}/man1/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ %{_datadir}/texmf/tex/latex/lyx/ %verify(not md5 size mtime) %{_datadir}/lyx/*.lst @@ -201,6 +210,9 @@ %changelog +* Tue May 16 2006 Rex Dieter 1.4.1-4 +- add generic app icon (rh #191944) + * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking From fedora-extras-commits at redhat.com Tue May 16 17:20:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 10:20:42 -0700 Subject: owners owners.list,1.1006,1.1007 Message-ID: <200605161720.k4GHKihe000858@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv841 Modified Files: owners.list Log Message: Added crossfire-client and crossfire-maps Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1006 retrieving revision 1.1007 diff -u -r1.1006 -r1.1007 --- owners.list 16 May 2006 16:45:14 -0000 1.1006 +++ owners.list 16 May 2006 17:20:42 -0000 1.1007 @@ -170,6 +170,8 @@ Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| +Fedora Extras|crossfire-client|Crossfire game client|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|crossfire-maps|Crossfire game server maps|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 16:42:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:42:02 -0700 Subject: rpms/crossfire-client import.log,1.1,1.2 Message-ID: <200605161642.k4GGg4xq030423@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30387 Modified Files: import.log Log Message: auto-import crossfire-client-1.9.0-2 on branch devel from crossfire-client-1.9.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 16:41:25 -0000 1.1 +++ import.log 16 May 2006 16:42:02 -0000 1.2 @@ -0,0 +1 @@ +crossfire-client-1_9_0-2:HEAD:crossfire-client-1.9.0-2.src.rpm:1147797718 From fedora-extras-commits at redhat.com Tue May 16 16:41:11 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:41:11 -0700 Subject: rpms/crossfire-client - New directory Message-ID: <200605161641.k4GGfDqk030297@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/crossfire-client Log Message: Directory /cvs/extras/rpms/crossfire-client added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:41:11 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:41:11 -0700 Subject: rpms/crossfire-client/devel - New directory Message-ID: <200605161641.k4GGfD8w030300@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/crossfire-client/devel Log Message: Directory /cvs/extras/rpms/crossfire-client/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 17:47:48 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:47:48 -0700 Subject: rpms/libgalago - New directory Message-ID: <200605161747.k4GHloli001065@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1039/libgalago Log Message: Directory /cvs/extras/rpms/libgalago added to the repository From fedora-extras-commits at redhat.com Tue May 16 17:47:49 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:47:49 -0700 Subject: rpms/libgalago/devel - New directory Message-ID: <200605161747.k4GHlpZE001068@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1039/libgalago/devel Log Message: Directory /cvs/extras/rpms/libgalago/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 17:47:57 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:47:57 -0700 Subject: rpms/libgalago Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161747.k4GHlxle001117@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1084 Added Files: Makefile import.log Log Message: Setup of module libgalago --- NEW FILE Makefile --- # Top level Makefile for module libgalago all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 17:47:57 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:47:57 -0700 Subject: rpms/libgalago/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161748.k4GHlxv2001120@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1084/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libgalago --- NEW 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 May 16 17:48:25 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:48:25 -0700 Subject: rpms/libgalago import.log,1.1,1.2 Message-ID: <200605161748.k4GHmR0B001181@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148 Modified Files: import.log Log Message: auto-import libgalago-0.5.0-1 on branch devel from libgalago-0.5.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libgalago/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 17:47:57 -0000 1.1 +++ import.log 16 May 2006 17:48:25 -0000 1.2 @@ -0,0 +1 @@ +libgalago-0_5_0-1:HEAD:libgalago-0.5.0-1.src.rpm:1147801701 From fedora-extras-commits at redhat.com Tue May 16 17:48:26 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:48:26 -0700 Subject: rpms/libgalago/devel libgalago.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161748.k4GHmSlR001186@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148/devel Modified Files: .cvsignore sources Added Files: libgalago.spec Log Message: auto-import libgalago-0.5.0-1 on branch devel from libgalago-0.5.0-1.src.rpm --- NEW FILE libgalago.spec --- Name: libgalago Version: 0.5.0 Release: 1%{?dist} Summary: Galago presence library Group: System Environment/Libraries License: LGPL URL: http://www.galago-project.org/ Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: dbus-glib BuildRequires: check-devel %description Galago is a D-BUS-based desktop presence framework used to provide account, person, and presence information for users on IM services and other communication networks for use in other desktop applications, such as e-mail clients or address books. %package devel Summary: Development libraries and headers for libgalago Group: Development/Libraries Requires: dbus-devel Requires: dbus-glib Requires: %{name} = %{version}-%{release} %description devel Libararies and header file for developing against libgalago. %prep %setup -q %build %configure --enable-static=no make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_datadir}/autopackage/skeletons/@galago.info/%{name}/skeleton.1 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog %{_libdir}/%{name}.so.* %files devel %defattr(-,root,root,-) %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/%{name}/ %changelog * Fri Apr 21 2006 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 17:47:57 -0000 1.1 +++ .cvsignore 16 May 2006 17:48:26 -0000 1.2 @@ -0,0 +1 @@ +libgalago-0.5.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 17:47:57 -0000 1.1 +++ sources 16 May 2006 17:48:26 -0000 1.2 @@ -0,0 +1 @@ +3e6fbc2f27c957cb50f08ceeb574cb5e libgalago-0.5.0.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 17:50:58 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:50:58 -0700 Subject: owners owners.list,1.1007,1.1008 Message-ID: <200605161751.k4GHp0oI001254@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237 Modified Files: owners.list Log Message: Add libgalago Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1007 retrieving revision 1.1008 diff -u -r1.1007 -r1.1008 --- owners.list 16 May 2006 17:20:42 -0000 1.1007 +++ owners.list 16 May 2006 17:50:57 -0000 1.1008 @@ -631,6 +631,7 @@ Fedora Extras|libeXosip2|A library that hides the complexity of using the SIP protocol|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libfwbuilder|Firewall Builder API|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| +Fedora Extras|libgalago|Galago presence library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 18:08:00 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 16 May 2006 11:08:00 -0700 Subject: fedora-security/audit fc4,1.248,1.249 fc5,1.162,1.163 Message-ID: <200605161808.k4GI80Ah003608@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3588 Modified Files: fc4 fc5 Log Message: Note the vnc and php updates. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- fc4 16 May 2006 08:37:37 -0000 1.248 +++ fc4 16 May 2006 18:07:57 -0000 1.249 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 +CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 @@ -125,6 +125,7 @@ CVE-2006-1517 VULNERABLE (mysql, fixed 4.1.19) #190868 CVE-2006-1516 VULNERABLE (mysql, fixed 4.1.19) #190866 CVE-2006-1494 VULNERABLE (php) #189592 +CVE-2006-1490 VULNERABLE (php, fixed 5.1.4) CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1354 VULNERABLE (freeradius) #186084 CVE-2006-1343 VULNERABLE (kernel) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- fc5 16 May 2006 08:37:37 -0000 1.162 +++ fc5 16 May 2006 18:07:57 -0000 1.163 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 +CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 @@ -125,6 +125,7 @@ CVE-2006-1517 VULNERABLE (mysql, fixed 5.0.21) #190868 CVE-2006-1516 VULNERABLE (mysql, fixed 5.0.21) #190866 CVE-2006-1494 VULNERABLE (php)#189592 +CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289] CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 VULNERABLE (kernel) @@ -148,7 +149,7 @@ CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe -CVE-2006-0996 VULNERABLE (php) bz#187511 +CVE-2006-0996 version (php, fixed 5.1.4) bz#187511 [since FEDORA-2006-289] CVE-2006-0903 VULNERABLE (mysql) #183261 low/not upstream yet CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) From fedora-extras-commits at redhat.com Tue May 16 18:30:55 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 11:30:55 -0700 Subject: rpms/rogue/devel rogue.spec,1.5,1.6 Message-ID: <200605161830.k4GIUvRv003709@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3690 Modified Files: rogue.spec Log Message: Add empty initial scoreboard file. Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rogue.spec 15 May 2006 22:31:10 -0000 1.5 +++ rogue.spec 16 May 2006 18:30:55 -0000 1.6 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -49,6 +49,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ +touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr + %clean rm -rf $RPM_BUILD_ROOT @@ -73,11 +75,15 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/rogue.png %dir %attr(0775,games,games) %{_var}/games/roguelike +%config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog +* Tue May 16 2006 Wart 5.4.2-6 +- Added empty initial scoreboard file. + * Mon May 15 2006 Wart 5.4.2-5 - Better setuid/setgid handling (again) (BZ #187392) From fedora-extras-commits at redhat.com Tue May 16 18:46:32 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 11:46:32 -0700 Subject: rpms/contact-lookup-applet/devel .cvsignore, 1.7, 1.8 contact-lookup-applet.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200605161846.k4GIkYlB003985@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-serv3964 Modified Files: .cvsignore contact-lookup-applet.spec sources Log Message: * Tue May 16 2006 Brian Pepple - 0.14-3 - Update to 0.14. - Drop BR on gettext. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Jul 2005 22:06:58 -0000 1.7 +++ .cvsignore 16 May 2006 18:46:32 -0000 1.8 @@ -1 +1 @@ -contact-lookup-applet-0.13.tar.gz +contact-lookup-applet-0.14.tar.gz Index: contact-lookup-applet.spec =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- contact-lookup-applet.spec 16 Feb 2006 16:19:48 -0000 1.17 +++ contact-lookup-applet.spec 16 May 2006 18:46:32 -0000 1.18 @@ -1,6 +1,6 @@ Name: contact-lookup-applet -Version: 0.13 -Release: 9%{?dist} +Version: 0.14 +Release: 3%{?dist} Summary: Contact Lookup Applet Group: Applications/Communications @@ -11,28 +11,33 @@ BuildRequires: gnome-panel-devel >= 2.9.4 BuildRequires: evolution-data-server-devel >= 1.2.0 -BuildRequires: gettext + %description This applet allows you to search your Evolution 2 address book for people. To use, simply add it to your panel (Add to Panel -> Accessories -> Address book Lookup), type a name into the field, and hit [return] or Search. + %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 AUTHORS COPYING ChangeLog NEWS README TODO @@ -42,7 +47,12 @@ %{_datadir}/lookup-applet/*.xml %{_datadir}/lookup-applet/%{name}.glade + %changelog +* Tue May 16 2006 Brian Pepple - 0.14-3 +- Update to 0.14. +- Drop BR on gettext. + * Thu Feb 16 2006 Brian Pepple - 0.13-9 - Drop unnecessary BR (libgnomeui-devel). Index: sources =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Jul 2005 22:06:58 -0000 1.7 +++ sources 16 May 2006 18:46:32 -0000 1.8 @@ -1 +1 @@ -8b4b4dbc2778b571e05e583e614ae5a7 contact-lookup-applet-0.13.tar.gz +53b7d3a55ce7f50dae06f2c896cb1677 contact-lookup-applet-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 16 18:47:50 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 May 2006 11:47:50 -0700 Subject: owners owners.list,1.1008,1.1009 Message-ID: <200605161847.k4GIlqDd004097@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4031 Modified Files: owners.list Log Message: bugzilla.redhat.com/186283 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1008 retrieving revision 1.1009 diff -u -r1.1008 -r1.1009 --- owners.list 16 May 2006 17:50:57 -0000 1.1008 +++ owners.list 16 May 2006 18:47:50 -0000 1.1009 @@ -1757,7 +1757,7 @@ Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|yadex|A DOOM level editor|wart at kobold.org|extras-qa at fedoraproject.org| -Fedora Extras|yakuake|A Quake-like terminal application|dreadyman at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|yakuake|A Quake-like terminal application|extras-orphan at fedoraproject.org|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| Fedora Extras|ytalk|A chat program for multiple users|imlinux at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 18:49:05 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 11:49:05 -0700 Subject: rpms/contact-lookup-applet/FC-5 .cvsignore, 1.7, 1.8 contact-lookup-applet.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200605161849.k4GIn74f004192@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/contact-lookup-applet/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167 Modified Files: .cvsignore contact-lookup-applet.spec sources Log Message: * Tue May 16 2006 Brian Pepple - 0.14-2 - Update to 0.14. - Drop BR on gettext. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Jul 2005 22:06:58 -0000 1.7 +++ .cvsignore 16 May 2006 18:49:05 -0000 1.8 @@ -1 +1 @@ -contact-lookup-applet-0.13.tar.gz +contact-lookup-applet-0.14.tar.gz Index: contact-lookup-applet.spec =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-5/contact-lookup-applet.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- contact-lookup-applet.spec 16 Feb 2006 16:19:48 -0000 1.17 +++ contact-lookup-applet.spec 16 May 2006 18:49:05 -0000 1.18 @@ -1,6 +1,6 @@ Name: contact-lookup-applet -Version: 0.13 -Release: 9%{?dist} +Version: 0.14 +Release: 2%{?dist} Summary: Contact Lookup Applet Group: Applications/Communications @@ -11,28 +11,33 @@ BuildRequires: gnome-panel-devel >= 2.9.4 BuildRequires: evolution-data-server-devel >= 1.2.0 -BuildRequires: gettext + %description This applet allows you to search your Evolution 2 address book for people. To use, simply add it to your panel (Add to Panel -> Accessories -> Address book Lookup), type a name into the field, and hit [return] or Search. + %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 AUTHORS COPYING ChangeLog NEWS README TODO @@ -42,7 +47,12 @@ %{_datadir}/lookup-applet/*.xml %{_datadir}/lookup-applet/%{name}.glade + %changelog +* Tue May 16 2006 Brian Pepple - 0.14-2 +- Update to 0.14. +- Drop BR on gettext. + * Thu Feb 16 2006 Brian Pepple - 0.13-9 - Drop unnecessary BR (libgnomeui-devel). Index: sources =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Jul 2005 22:06:58 -0000 1.7 +++ sources 16 May 2006 18:49:05 -0000 1.8 @@ -1 +1 @@ -8b4b4dbc2778b571e05e583e614ae5a7 contact-lookup-applet-0.13.tar.gz +53b7d3a55ce7f50dae06f2c896cb1677 contact-lookup-applet-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 16 18:49:35 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 16 May 2006 11:49:35 -0700 Subject: fedora-security/audit fc4,1.249,1.250 fc5,1.163,1.164 Message-ID: <200605161849.k4GInZqP004269@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4241 Modified Files: fc4 fc5 Log Message: Add some missed CVE ids. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- fc4 16 May 2006 18:07:57 -0000 1.249 +++ fc4 16 May 2006 18:49:32 -0000 1.250 @@ -14,7 +14,7 @@ CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] -CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] +CVE-2006-2073 VULNERABLE (bind) CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423] CVE-2006-2057 ** firefox @@ -165,6 +165,7 @@ CVE-2006-0741 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) +CVE-2006-0670 VULNERABLE (bluez-hcidump) CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] CVE-2006-0591 version (postgresql, fixed 8.0.6) #180537 [since FEDORA-2005-021] CVE-2006-0576 VULNERABLE (oprofile) #180724 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- fc5 16 May 2006 18:07:57 -0000 1.163 +++ fc5 16 May 2006 18:49:32 -0000 1.164 @@ -14,7 +14,7 @@ CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] -CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] +CVE-2006-2073 VULNERABLE (bind) CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421] CVE-2006-2057 ** firefox @@ -167,6 +167,7 @@ CVE-2006-0741 version (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 ignore (postgresql) we don't build --enable-cassert +CVE-2006-0670 VULNERABLE (bluez-hcidump) CVE-2006-0645 version (gnutls, fixed 1.2.10) CVE-2006-0591 version (postgresql, fixed 8.0.6) CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch From fedora-extras-commits at redhat.com Tue May 16 18:54:23 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:54:23 -0700 Subject: rpms/perl-Expect/devel - New directory Message-ID: <200605161854.k4GIsPMP004379@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/perl-Expect/devel Log Message: Directory /cvs/extras/rpms/perl-Expect/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 18:54:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:54:22 -0700 Subject: rpms/perl-Expect - New directory Message-ID: <200605161854.k4GIsOMr004375@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/perl-Expect Log Message: Directory /cvs/extras/rpms/perl-Expect added to the repository From fedora-extras-commits at redhat.com Tue May 16 18:54:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:54:41 -0700 Subject: rpms/perl-Expect Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161854.k4GIshCd004427@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397 Added Files: Makefile import.log Log Message: Setup of module perl-Expect --- NEW FILE Makefile --- # Top level Makefile for module perl-Expect all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 18:54:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:54:41 -0700 Subject: rpms/perl-Expect/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161854.k4GIsh9J004430@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Expect --- NEW 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 May 16 18:55:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:55:21 -0700 Subject: rpms/perl-Expect import.log,1.1,1.2 Message-ID: <200605161855.k4GItNMP004496@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4463 Modified Files: import.log Log Message: auto-import perl-Expect-1.16-2 on branch devel from perl-Expect-1.16-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 18:54:41 -0000 1.1 +++ import.log 16 May 2006 18:55:21 -0000 1.2 @@ -0,0 +1 @@ +perl-Expect-1_16-2:HEAD:perl-Expect-1.16-2.src.rpm:1147805711 From fedora-extras-commits at redhat.com Tue May 16 18:55:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:55:22 -0700 Subject: rpms/perl-Expect/devel perl-Expect.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161855.k4GItOAJ004501@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4463/devel Modified Files: .cvsignore sources Added Files: perl-Expect.spec Log Message: auto-import perl-Expect-1.16-2 on branch devel from perl-Expect-1.16-2.src.rpm --- NEW FILE perl-Expect.spec --- Name: perl-Expect Version: 1.16 Release: 2%{?dist} Summary: Expect for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Expect/ Source0: http://www.cpan.org/authors/id/R/RG/RGIERSIG/Expect-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(IO::Pty) >= 1.03 BuildRequires: perl(IO::Tty) >= 1.03 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides Expect-like functionality to Perl. Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, tip, etc. %prep %setup -q -n Expect-%{version} %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' examples/kibitz/kibitz tutorial/[2-6].* chmod a-x examples/kibitz/kibitz tutorial/[2-6].* %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README examples/ tutorial/ %{perl_vendorlib}/Expect.* %{_mandir}/man3/*.3pm* %changelog * Tue May 16 2006 Jose Pedro Oliveira - 1.16-2 - Description improved as suggested in #191622. * Mon May 08 2006 Jose Pedro Oliveira - 1.16-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 18:54:41 -0000 1.1 +++ .cvsignore 16 May 2006 18:55:21 -0000 1.2 @@ -0,0 +1 @@ +Expect-1.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 18:54:41 -0000 1.1 +++ sources 16 May 2006 18:55:21 -0000 1.2 @@ -0,0 +1 @@ +f5f0ea179c6f19d9f08e22c6a0072292 Expect-1.16.tar.gz From fedora-extras-commits at redhat.com Tue May 16 19:04:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 12:04:04 -0700 Subject: owners owners.list,1.1009,1.1010 Message-ID: <200605161904.k4GJ469o006873@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6856 Modified Files: owners.list Log Message: New package: perl-Expect (#191622) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1009 retrieving revision 1.1010 diff -u -r1.1009 -r1.1010 --- owners.list 16 May 2006 18:47:50 -0000 1.1009 +++ owners.list 16 May 2006 19:04:03 -0000 1.1010 @@ -1012,6 +1012,7 @@ Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Expect|Expect for Perl|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-AutoInstall|Automatic install of dependencies via CPAN|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-CBuilder|Compile and link C code for Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 16 19:09:50 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:09:50 -0700 Subject: rpms/ccache/FC-5 ccache.spec,1.11,1.12 Message-ID: <200605161910.k4GJAMsw006945@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ccache/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913/FC-5 Modified Files: ccache.spec Log Message: * Tue May 16 2006 Ville Skytt?? - 2.4-5 - Add auto-symlink support for g++-libstdc++-so_7. Index: ccache.spec =================================================================== RCS file: /cvs/extras/rpms/ccache/FC-5/ccache.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ccache.spec 18 Feb 2006 11:43:08 -0000 1.11 +++ ccache.spec 16 May 2006 19:09:50 -0000 1.12 @@ -1,9 +1,9 @@ -%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 -%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++ +%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 +%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, libstdc++so7-devel Name: ccache Version: 2.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C/C++ compiler cache Group: Development/Tools @@ -83,6 +83,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 2.4-5 +- Add auto-symlink support for g++-libstdc++-so_7. + * Sat Nov 26 2005 Ville Skytt?? - 2.4-4 - Drop "bin" from compiler symlink path. - Make profile.d snippets non-executable (#35714). From fedora-extras-commits at redhat.com Tue May 16 19:09:50 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:09:50 -0700 Subject: rpms/ccache/devel ccache.spec,1.11,1.12 Message-ID: <200605161910.k4GJANQf006948@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ccache/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913/devel Modified Files: ccache.spec Log Message: * Tue May 16 2006 Ville Skytt?? - 2.4-5 - Add auto-symlink support for g++-libstdc++-so_7. Index: ccache.spec =================================================================== RCS file: /cvs/extras/rpms/ccache/devel/ccache.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ccache.spec 18 Feb 2006 11:43:08 -0000 1.11 +++ ccache.spec 16 May 2006 19:09:50 -0000 1.12 @@ -1,9 +1,9 @@ -%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 -%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++ +%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 +%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, libstdc++so7-devel Name: ccache Version: 2.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C/C++ compiler cache Group: Development/Tools @@ -83,6 +83,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 2.4-5 +- Add auto-symlink support for g++-libstdc++-so_7. + * Sat Nov 26 2005 Ville Skytt?? - 2.4-4 - Drop "bin" from compiler symlink path. - Make profile.d snippets non-executable (#35714). From fedora-extras-commits at redhat.com Tue May 16 19:16:36 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:16:36 -0700 Subject: rpms/xemacs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xemacs.spec, 1.25, 1.26 xemacs-21.5.25-find-paths-pkgdir.patch, 1.1, NONE xemacs-21.5.26-maximize.patch, 1.1, NONE Message-ID: <200605161916.k4GJGchv007106@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7084 Modified Files: .cvsignore sources xemacs.spec Removed Files: xemacs-21.5.25-find-paths-pkgdir.patch xemacs-21.5.26-maximize.patch Log Message: * Tue May 16 2006 Ville Skytt?? - 21.5.27-1 - 21.5.27, maximize patch included upstream. - Drop no longer needed find-paths patch. - Fix alternatives setup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Apr 2006 16:27:53 -0000 1.5 +++ .cvsignore 16 May 2006 19:16:36 -0000 1.6 @@ -1 +1 @@ -xemacs-21.5.26.tar.gz +xemacs-21.5.27.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Apr 2006 16:27:53 -0000 1.5 +++ sources 16 May 2006 19:16:36 -0000 1.6 @@ -1 +1 @@ -e0cd4521e8857a16f6cd675bb4c1039b xemacs-21.5.26.tar.gz +c415348d58eb18a9f4ed57d97e2acc62 xemacs-21.5.27.tar.gz Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xemacs.spec 7 May 2006 20:36:57 -0000 1.25 +++ xemacs.spec 16 May 2006 19:16:36 -0000 1.26 @@ -19,8 +19,8 @@ %define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') Name: xemacs -Version: 21.5.26 -Release: 5%{?dist} +Version: 21.5.27 +Release: 1%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -35,14 +35,11 @@ Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch -# TODO: patch2 still needed with --with-system-packages??? -Patch2: %{name}-21.5.25-find-paths-pkgdir.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch -Patch7: %{name}-21.5.26-maximize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -175,15 +172,14 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch0 -p1 %patch1 -p1 -%patch2 -p1 -sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el lisp/setup-paths.el %patch3 -p1 %ifarch ia64 %patch4 -p1 %endif %patch5 -p1 %patch6 -p1 -%patch7 -p0 + +sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el for f in man/lispref/mule.texi man/xemacs-faq.texi ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f @@ -386,9 +382,12 @@ %{_bindir}/xemacs-%{xver} 80 || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : +# bugfix for 21.5.26, to be removed later +%{_sbindir}/alternatives --remove xemacs \ + %{_bindir}/xemacs-21.5-b26 &>/dev/null || : %postun -[ $1 -ne 0 ] || \ +[ -e %{_bindir}/xemacs-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : @@ -398,9 +397,12 @@ rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-nox-%{xver} 40 || : +# bugfix for 21.5.26, to be removed later +%{_sbindir}/alternatives --remove xemacs \ + %{_bindir}/xemacs-nox-21.5-b26 &>/dev/null || : %postun nox -[ $1 -ne 0 ] || \ +[ -e %{_bindir}/xemacs-nox-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : %post common @@ -493,6 +495,11 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 21.5.27-1 +- 21.5.27, maximize patch included upstream. +- Drop no longer needed find-paths patch. +- Fix alternatives setup. + * Sun May 7 2006 Ville Skytt?? - 21.5.26-5 - Apply upstream fix for window maximization problems (#111225). --- xemacs-21.5.25-find-paths-pkgdir.patch DELETED --- --- xemacs-21.5.26-maximize.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 16 19:25:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:25:39 -0700 Subject: rpms/upx/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 upx.spec, 1.8, 1.9 upx-nostrip.patch, 1.1, NONE upx-optflags.patch, 1.1, NONE Message-ID: <200605161925.k4GJPg6d007265@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/upx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7244 Modified Files: .cvsignore sources upx.spec Removed Files: upx-nostrip.patch upx-optflags.patch Log Message: * Tue May 16 2006 Ville Skytt?? - 2.00-1 - 2.00. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/upx/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:30:12 -0000 1.2 +++ .cvsignore 16 May 2006 19:25:39 -0000 1.3 @@ -1 +1 @@ -upx-1.25-src.tar.gz +upx-2.00-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/upx/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:30:12 -0000 1.2 +++ sources 16 May 2006 19:25:39 -0000 1.3 @@ -1 +1 @@ -6f20a62999a46a1864652454b3c8a5d8 upx-1.25-src.tar.gz +ce412e9ef82f4474531d66ce7e5a7950 upx-2.00-src.tar.gz Index: upx.spec =================================================================== RCS file: /cvs/extras/rpms/upx/devel/upx.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- upx.spec 15 Feb 2006 21:03:23 -0000 1.8 +++ upx.spec 16 May 2006 19:25:39 -0000 1.9 @@ -1,14 +1,12 @@ Name: upx -Version: 1.25 -Release: 5%{?dist} +Version: 2.00 +Release: 1%{?dist} Summary: Ultimate Packer for eXecutables Group: Applications/Archiving License: GPL URL: http://upx.sourceforge.net/ Source0: http://upx.sourceforge.net/download/%{name}-%{version}-src.tar.gz -Patch0: %{name}-optflags.patch -Patch1: %{name}-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ucl-devel >= 1.01 @@ -22,19 +20,14 @@ %prep -%setup -q -%patch0 -p0 -%patch1 -p0 +%setup -q -n %{name}-%{version}-src +sed -i -e 's/ -O2 / /' -e 's/ -Werror//' src/Makefile %build +export CXXFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} -C src CXX=%{__cxx} UCLDIR=%{_prefix} exeext= make -C doc -make %{?_smp_mflags} -C src \ - target=linux \ - CXX=%{__cxx} \ - CCARCH= \ - UCLDIR=%{_prefix} \ - STUBEDIT_EXE=: %install @@ -49,13 +42,15 @@ %files %defattr(-,root,root,-) -%doc BUGS COPYING LICENSE NEWS PROJECTS README THANKS -%doc doc/loader.txt doc/upx.html +%doc BUGS COPYING LICENSE NEWS PROJECTS README README.1ST THANKS TODO doc/*.txt %{_bindir}/upx %{_mandir}/man1/upx.1* %changelog +* Tue May 16 2006 Ville Skytt?? - 2.00-1 +- 2.00. + * Wed Feb 15 2006 Ville Skytt?? - 1.25-5 - Rebuild. --- upx-nostrip.patch DELETED --- --- upx-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 16 19:31:25 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 16 May 2006 12:31:25 -0700 Subject: rpms/php-Smarty/devel .cvsignore, 1.2, 1.3 php-Smarty.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605161931.k4GJVRTW007370@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/php-Smarty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7349 Modified Files: .cvsignore php-Smarty.spec sources Log Message: Update to 2.6.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Nov 2005 16:45:09 -0000 1.2 +++ .cvsignore 16 May 2006 19:31:25 -0000 1.3 @@ -1 +1 @@ -Smarty-2.6.10.tar.gz +Smarty-2.6.13.tar.gz Index: php-Smarty.spec =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/php-Smarty.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-Smarty.spec 1 Nov 2005 16:45:09 -0000 1.1 +++ php-Smarty.spec 16 May 2006 19:31:25 -0000 1.2 @@ -1,7 +1,7 @@ Name: php-Smarty Summary: Template/Presentation Framework for PHP -Version: 2.6.10 -Release: 2%{?dist} +Version: 2.6.13 +Release: 1%{?dist} Source0: http://smarty.php.net/distributions/Smarty-%{version}.tar.gz License: LGPL @@ -25,11 +25,9 @@ %prep %setup -q -n Smarty-%{version} + %build -# fix dir perms -#find . -type d | xargs chmod 755 -# fix file perms -#find . -type f | xargs chmod 644 + %install rm -rf $RPM_BUILD_ROOT @@ -40,16 +38,22 @@ install -d $RPM_BUILD_ROOT%{_var}/www/icons install -m644 misc/smarty_icon.gif $RPM_BUILD_ROOT%{_var}/www/icons/ + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %doc BUGS ChangeLog COPYING.lib demo FAQ NEWS QUICK_START README RELEASE_NOTES TODO %{_datadir}/Smarty/ %{_var}/www/icons/* + %changelog +* Tue May 16 2006 Orion Poplawski 2.6.13-1 +- Update to 2.6.13 + * Tue Nov 1 2005 Orion Poplawski 2.6.10-2 - Fix Source0 URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Nov 2005 16:45:09 -0000 1.2 +++ sources 16 May 2006 19:31:25 -0000 1.3 @@ -1 +1 @@ -0c31105a157547bafcff8c13bb64c6a3 Smarty-2.6.10.tar.gz +2ca9bf476cf0920b9d4fee69633f6f65 Smarty-2.6.13.tar.gz From fedora-extras-commits at redhat.com Tue May 16 19:32:56 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 16 May 2006 12:32:56 -0700 Subject: rpms/php-Smarty/FC-5 .cvsignore, 1.2, 1.3 php-Smarty.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605161932.k4GJWwdC007441@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/php-Smarty/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7420 Modified Files: .cvsignore php-Smarty.spec sources Log Message: Update to 2.6.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Nov 2005 16:45:09 -0000 1.2 +++ .cvsignore 16 May 2006 19:32:56 -0000 1.3 @@ -1 +1 @@ -Smarty-2.6.10.tar.gz +Smarty-2.6.13.tar.gz Index: php-Smarty.spec =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-5/php-Smarty.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-Smarty.spec 1 Nov 2005 16:45:09 -0000 1.1 +++ php-Smarty.spec 16 May 2006 19:32:56 -0000 1.2 @@ -1,7 +1,7 @@ Name: php-Smarty Summary: Template/Presentation Framework for PHP -Version: 2.6.10 -Release: 2%{?dist} +Version: 2.6.13 +Release: 1%{?dist} Source0: http://smarty.php.net/distributions/Smarty-%{version}.tar.gz License: LGPL @@ -25,11 +25,9 @@ %prep %setup -q -n Smarty-%{version} + %build -# fix dir perms -#find . -type d | xargs chmod 755 -# fix file perms -#find . -type f | xargs chmod 644 + %install rm -rf $RPM_BUILD_ROOT @@ -40,16 +38,22 @@ install -d $RPM_BUILD_ROOT%{_var}/www/icons install -m644 misc/smarty_icon.gif $RPM_BUILD_ROOT%{_var}/www/icons/ + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %doc BUGS ChangeLog COPYING.lib demo FAQ NEWS QUICK_START README RELEASE_NOTES TODO %{_datadir}/Smarty/ %{_var}/www/icons/* + %changelog +* Tue May 16 2006 Orion Poplawski 2.6.13-1 +- Update to 2.6.13 + * Tue Nov 1 2005 Orion Poplawski 2.6.10-2 - Fix Source0 URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Nov 2005 16:45:09 -0000 1.2 +++ sources 16 May 2006 19:32:56 -0000 1.3 @@ -1 +1 @@ -0c31105a157547bafcff8c13bb64c6a3 Smarty-2.6.10.tar.gz +2ca9bf476cf0920b9d4fee69633f6f65 Smarty-2.6.13.tar.gz From fedora-extras-commits at redhat.com Tue May 16 19:33:36 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 16 May 2006 12:33:36 -0700 Subject: rpms/php-Smarty/FC-4 .cvsignore, 1.2, 1.3 php-Smarty.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605161933.k4GJXcbh007512@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/php-Smarty/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7491 Modified Files: .cvsignore php-Smarty.spec sources Log Message: Update to 2.6.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Nov 2005 16:45:09 -0000 1.2 +++ .cvsignore 16 May 2006 19:33:36 -0000 1.3 @@ -1 +1 @@ -Smarty-2.6.10.tar.gz +Smarty-2.6.13.tar.gz Index: php-Smarty.spec =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-4/php-Smarty.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-Smarty.spec 1 Nov 2005 16:45:09 -0000 1.1 +++ php-Smarty.spec 16 May 2006 19:33:36 -0000 1.2 @@ -1,7 +1,7 @@ Name: php-Smarty Summary: Template/Presentation Framework for PHP -Version: 2.6.10 -Release: 2%{?dist} +Version: 2.6.13 +Release: 1%{?dist} Source0: http://smarty.php.net/distributions/Smarty-%{version}.tar.gz License: LGPL @@ -25,11 +25,9 @@ %prep %setup -q -n Smarty-%{version} + %build -# fix dir perms -#find . -type d | xargs chmod 755 -# fix file perms -#find . -type f | xargs chmod 644 + %install rm -rf $RPM_BUILD_ROOT @@ -40,16 +38,22 @@ install -d $RPM_BUILD_ROOT%{_var}/www/icons install -m644 misc/smarty_icon.gif $RPM_BUILD_ROOT%{_var}/www/icons/ + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %doc BUGS ChangeLog COPYING.lib demo FAQ NEWS QUICK_START README RELEASE_NOTES TODO %{_datadir}/Smarty/ %{_var}/www/icons/* + %changelog +* Tue May 16 2006 Orion Poplawski 2.6.13-1 +- Update to 2.6.13 + * Tue Nov 1 2005 Orion Poplawski 2.6.10-2 - Fix Source0 URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Nov 2005 16:45:09 -0000 1.2 +++ sources 16 May 2006 19:33:36 -0000 1.3 @@ -1 +1 @@ -0c31105a157547bafcff8c13bb64c6a3 Smarty-2.6.10.tar.gz +2ca9bf476cf0920b9d4fee69633f6f65 Smarty-2.6.13.tar.gz From fedora-extras-commits at redhat.com Tue May 16 19:45:41 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:45:41 -0700 Subject: rpms/upx/devel upx.spec,1.9,1.10 Message-ID: <200605161945.k4GJjhRp007631@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/upx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7614 Modified Files: upx.spec Log Message: * Tue May 16 2006 Ville Skytt?? - 2.00-2 - BR: zlib-devel. Index: upx.spec =================================================================== RCS file: /cvs/extras/rpms/upx/devel/upx.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- upx.spec 16 May 2006 19:25:39 -0000 1.9 +++ upx.spec 16 May 2006 19:45:41 -0000 1.10 @@ -1,6 +1,6 @@ Name: upx Version: 2.00 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ultimate Packer for eXecutables Group: Applications/Archiving @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ucl-devel >= 1.01 +BuildRequires: zlib-devel BuildRequires: perl %description @@ -48,6 +49,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 2.00-2 +- BR: zlib-devel. + * Tue May 16 2006 Ville Skytt?? - 2.00-1 - 2.00. From fedora-extras-commits at redhat.com Tue May 16 20:38:54 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 16 May 2006 13:38:54 -0700 Subject: fedora-security/audit fc4,1.250,1.251 fc5,1.164,1.165 Message-ID: <200605162038.k4GKcsu5010208@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10187 Modified Files: fc4 fc5 Log Message: Note a new dovecot CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- fc4 16 May 2006 18:49:32 -0000 1.250 +++ fc4 16 May 2006 20:38:52 -0000 1.251 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- fc5 16 May 2006 18:49:32 -0000 1.164 +++ fc5 16 May 2006 20:38:52 -0000 1.165 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox From fedora-extras-commits at redhat.com Tue May 16 20:51:56 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 13:51:56 -0700 Subject: rpms/wine/devel .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 wine.spec, 1.25, 1.26 Message-ID: <200605162051.k4GKpwGc010384@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10310/devel Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 19 Apr 2006 22:20:07 -0000 1.14 +++ .cvsignore 16 May 2006 20:51:56 -0000 1.15 @@ -1 +1 @@ -wine-0.9.12-fe.tar.bz2 +wine-0.9.13-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Apr 2006 22:20:07 -0000 1.15 +++ sources 16 May 2006 20:51:56 -0000 1.16 @@ -1 +1 @@ -1751147723999f1efd73d1aaba910360 wine-0.9.12-fe.tar.bz2 +985f671f503684d2c95a9e4cb74ad453 wine-0.9.13-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- wine.spec 19 Apr 2006 22:20:07 -0000 1.25 +++ wine.spec 16 May 2006 20:51:56 -0000 1.26 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -11,7 +11,7 @@ # special fedora tarball without winemp3 stuff Patch0: wine-prefixfonts.patch Patch1: wine-rpath.patch -Source0: wine-0.9.12-fe.tar.bz2 +Source0: wine-0.9.13-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -394,6 +394,7 @@ %{_libdir}/wine/eject.exe.so %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so +%{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so %{_libdir}/wine/iccvid.dll.so @@ -416,7 +417,7 @@ %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so %{_libdir}/wine/mciseq.dll.so -%{_libdir}/wine/mciwave.drv.so +%{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so @@ -424,9 +425,10 @@ %{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so +%{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm.dll16 -%{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so +%{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so %{_libdir}/wine/msftedit.dll.so @@ -478,6 +480,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -651,6 +654,10 @@ %{_libdir}/wine/*.def %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-1 - fix rpath issues (#187429,#188905) From fedora-extras-commits at redhat.com Tue May 16 20:51:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 13:51:49 -0700 Subject: rpms/wine/FC-3 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 wine.spec, 1.19, 1.20 Message-ID: <200605162052.k4GKqLr6010394@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10310/FC-3 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 19 Apr 2006 22:20:05 -0000 1.12 +++ .cvsignore 16 May 2006 20:51:49 -0000 1.13 @@ -1 +1 @@ -wine-0.9.12-fe.tar.bz2 +wine-0.9.13-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 19 Apr 2006 22:20:05 -0000 1.13 +++ sources 16 May 2006 20:51:49 -0000 1.14 @@ -1 +1 @@ -1751147723999f1efd73d1aaba910360 wine-0.9.12-fe.tar.bz2 +985f671f503684d2c95a9e4cb74ad453 wine-0.9.13-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- wine.spec 19 Apr 2006 22:20:05 -0000 1.19 +++ wine.spec 16 May 2006 20:51:49 -0000 1.20 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.12-fe.tar.bz2 +Source0: wine-0.9.13-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -381,6 +381,7 @@ %{_libdir}/wine/eject.exe.so %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so +%{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so %{_libdir}/wine/iccvid.dll.so @@ -403,7 +404,7 @@ %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so %{_libdir}/wine/mciseq.dll.so -%{_libdir}/wine/mciwave.drv.so +%{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so @@ -411,8 +412,9 @@ %{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so +%{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm.dll16 -%{_libdir}/wine/msacm.drv.so +%{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so @@ -465,6 +467,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -638,6 +641,10 @@ %{_libdir}/wine/*.def %changelog +* Tue May 16 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-1 - fix rpath issues (#187429,#188905) From fedora-extras-commits at redhat.com Tue May 16 20:51:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 13:51:50 -0700 Subject: rpms/wine/FC-4 .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 wine.spec, 1.21, 1.22 Message-ID: <200605162052.k4GKqMGs010399@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10310/FC-4 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 19 Apr 2006 22:20:06 -0000 1.13 +++ .cvsignore 16 May 2006 20:51:50 -0000 1.14 @@ -1 +1 @@ -wine-0.9.12-fe.tar.bz2 +wine-0.9.13-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 19 Apr 2006 22:20:06 -0000 1.14 +++ sources 16 May 2006 20:51:50 -0000 1.15 @@ -1 +1 @@ -1751147723999f1efd73d1aaba910360 wine-0.9.12-fe.tar.bz2 +985f671f503684d2c95a9e4cb74ad453 wine-0.9.13-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine.spec 19 Apr 2006 22:20:06 -0000 1.21 +++ wine.spec 16 May 2006 20:51:50 -0000 1.22 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.12-fe.tar.bz2 +Source0: wine-0.9.13-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -381,6 +381,7 @@ %{_libdir}/wine/eject.exe.so %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so +%{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so %{_libdir}/wine/iccvid.dll.so @@ -403,7 +404,7 @@ %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so %{_libdir}/wine/mciseq.dll.so -%{_libdir}/wine/mciwave.drv.so +%{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so @@ -411,8 +412,9 @@ %{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so +%{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm.dll16 -%{_libdir}/wine/msacm.drv.so +%{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so @@ -465,6 +467,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -638,6 +641,10 @@ %{_libdir}/wine/*.def %changelog +* Tue May 16 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-1 - fix rpath issues (#187429,#188905) From fedora-extras-commits at redhat.com Tue May 16 20:51:51 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 13:51:51 -0700 Subject: rpms/wine/FC-5 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 wine.spec, 1.25, 1.26 Message-ID: <200605162052.k4GKqNL2010404@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10310/FC-5 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 19 Apr 2006 22:20:06 -0000 1.14 +++ .cvsignore 16 May 2006 20:51:51 -0000 1.15 @@ -1 +1 @@ -wine-0.9.12-fe.tar.bz2 +wine-0.9.13-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Apr 2006 22:20:06 -0000 1.15 +++ sources 16 May 2006 20:51:51 -0000 1.16 @@ -1 +1 @@ -1751147723999f1efd73d1aaba910360 wine-0.9.12-fe.tar.bz2 +985f671f503684d2c95a9e4cb74ad453 wine-0.9.13-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- wine.spec 19 Apr 2006 22:20:06 -0000 1.25 +++ wine.spec 16 May 2006 20:51:51 -0000 1.26 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -11,7 +11,7 @@ # special fedora tarball without winemp3 stuff Patch0: wine-prefixfonts.patch Patch1: wine-rpath.patch -Source0: wine-0.9.12-fe.tar.bz2 +Source0: wine-0.9.13-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -394,6 +394,7 @@ %{_libdir}/wine/eject.exe.so %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so +%{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so %{_libdir}/wine/iccvid.dll.so @@ -416,7 +417,7 @@ %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so %{_libdir}/wine/mciseq.dll.so -%{_libdir}/wine/mciwave.drv.so +%{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so @@ -424,9 +425,10 @@ %{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so +%{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm.dll16 -%{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so +%{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so %{_libdir}/wine/msftedit.dll.so @@ -478,6 +480,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -651,6 +654,10 @@ %{_libdir}/wine/*.def %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-1 - fix rpath issues (#187429,#188905) From fedora-extras-commits at redhat.com Tue May 16 21:19:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 14:19:47 -0700 Subject: rpms/pcsc-perl/FC-5 .cvsignore, 1.3, 1.4 pcsc-perl.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605162119.k4GLJnvh013070@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13033/FC-5 Modified Files: .cvsignore pcsc-perl.spec sources Log Message: * Wed May 17 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Mar 2006 15:43:20 -0000 1.3 +++ .cvsignore 16 May 2006 21:19:47 -0000 1.4 @@ -1 +1 @@ -pcsc-perl-1.4.1.tar.gz +pcsc-perl-1.4.3.tar.gz Index: pcsc-perl.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/FC-5/pcsc-perl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pcsc-perl.spec 6 Mar 2006 15:43:20 -0000 1.8 +++ pcsc-perl.spec 16 May 2006 21:19:47 -0000 1.9 @@ -2,7 +2,7 @@ %define pcsclib %{_libdir}/libpcsclite.so.1 Name: pcsc-perl -Version: 1.4.1 +Version: 1.4.3 Release: 1%{?dist} Summary: Perl interface to the PC/SC smart card library @@ -60,6 +60,9 @@ %changelog +* Wed May 17 2006 Ville Skytt?? - 1.4.3-1 +- 1.4.3. + * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-1 - 1.4.1. - Don't hardcode required pcsc-lite-libs version, use shared lib file instead. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 15:43:20 -0000 1.3 +++ sources 16 May 2006 21:19:47 -0000 1.4 @@ -1 +1 @@ -0a432f4fd6414aa3122b53a091b47064 pcsc-perl-1.4.1.tar.gz +d248e412270b7e4f0a2a40bd010955f9 pcsc-perl-1.4.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 21:19:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 14:19:47 -0700 Subject: rpms/pcsc-perl/devel .cvsignore, 1.3, 1.4 pcsc-perl.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605162119.k4GLJnIO013076@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13033/devel Modified Files: .cvsignore pcsc-perl.spec sources Log Message: * Wed May 17 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Mar 2006 15:43:20 -0000 1.3 +++ .cvsignore 16 May 2006 21:19:47 -0000 1.4 @@ -1 +1 @@ -pcsc-perl-1.4.1.tar.gz +pcsc-perl-1.4.3.tar.gz Index: pcsc-perl.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pcsc-perl.spec 6 Mar 2006 15:43:20 -0000 1.8 +++ pcsc-perl.spec 16 May 2006 21:19:47 -0000 1.9 @@ -2,7 +2,7 @@ %define pcsclib %{_libdir}/libpcsclite.so.1 Name: pcsc-perl -Version: 1.4.1 +Version: 1.4.3 Release: 1%{?dist} Summary: Perl interface to the PC/SC smart card library @@ -60,6 +60,9 @@ %changelog +* Wed May 17 2006 Ville Skytt?? - 1.4.3-1 +- 1.4.3. + * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-1 - 1.4.1. - Don't hardcode required pcsc-lite-libs version, use shared lib file instead. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 15:43:20 -0000 1.3 +++ sources 16 May 2006 21:19:47 -0000 1.4 @@ -1 +1 @@ -0a432f4fd6414aa3122b53a091b47064 pcsc-perl-1.4.1.tar.gz +d248e412270b7e4f0a2a40bd010955f9 pcsc-perl-1.4.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 21:59:21 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 14:59:21 -0700 Subject: rpms/conntrack - New directory Message-ID: <200605162159.k4GLxNXd013348@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322/conntrack Log Message: Directory /cvs/extras/rpms/conntrack added to the repository From fedora-extras-commits at redhat.com Tue May 16 21:59:22 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 14:59:22 -0700 Subject: rpms/conntrack/devel - New directory Message-ID: <200605162159.k4GLxO6k013351@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322/conntrack/devel Log Message: Directory /cvs/extras/rpms/conntrack/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 21:59:46 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 14:59:46 -0700 Subject: rpms/conntrack Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605162159.k4GLxmGR013395@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367 Added Files: Makefile import.log Log Message: Setup of module conntrack --- NEW FILE Makefile --- # Top level Makefile for module conntrack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 21:59:46 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 14:59:46 -0700 Subject: rpms/conntrack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605162159.k4GLxmAT013398@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module conntrack --- NEW 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 May 16 22:00:52 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 15:00:52 -0700 Subject: rpms/conntrack import.log,1.1,1.2 Message-ID: <200605162200.k4GM0sJX013472@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13439 Modified Files: import.log Log Message: auto-import conntrack-1.0-0.1.beta1 on branch devel from conntrack-1.0-0.1.beta1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/conntrack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 21:59:45 -0000 1.1 +++ import.log 16 May 2006 22:00:52 -0000 1.2 @@ -0,0 +1 @@ +conntrack-1_0-0_1_beta1:HEAD:conntrack-1.0-0.1.beta1.src.rpm:1147816837 From fedora-extras-commits at redhat.com Tue May 16 22:00:52 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 15:00:52 -0700 Subject: rpms/conntrack/devel conntrack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605162201.k4GM0s3j013477@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13439/devel Modified Files: .cvsignore sources Added Files: conntrack.spec Log Message: auto-import conntrack-1.0-0.1.beta1 on branch devel from conntrack-1.0-0.1.beta1.src.rpm --- NEW FILE conntrack.spec --- Name: conntrack Version: 1.0 Release: 0.1.beta1%{?dist} Summary: Tool to manipulate netfilter connection tracking table Group: System Environment/Base License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/conntrack/files/conntrack-1.00beta1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel libnetfilter_conntrack-devel %description conntrack is used to search, list, inspect and maintain the netfilter connection tracking subsystem of the Linux kernel. Using conntrack , you can dump a list of all (or a filtered selection of) currently tracked connections, delete connections from the state table, and even add new ones. In addition, you can also monitor connection tracking events, e.g. show an event message (one line) per newly established connection. %prep %setup -q -n conntrack-1.00beta1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING AUTHORS %{_libdir}/conntrack/*.so %{_sbindir}/conntrack %{_mandir}/man8/* %changelog * Mon May 15 2006 Paul P Komkoff Jr - 1.0-0.1.beta1 - Preparing for submission to fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/conntrack/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 21:59:46 -0000 1.1 +++ .cvsignore 16 May 2006 22:00:52 -0000 1.2 @@ -0,0 +1 @@ +conntrack-1.00beta1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/conntrack/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 21:59:46 -0000 1.1 +++ sources 16 May 2006 22:00:52 -0000 1.2 @@ -0,0 +1 @@ +7491f914a9ebce180df88cbef0d994b3 conntrack-1.00beta1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 23:03:13 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 16:03:13 -0700 Subject: rpms/TeXmacs/devel TeXmacs-1.0.6.1-guile18.patch, NONE, 1.1 TeXmacs.spec, 1.36, 1.37 Message-ID: <200605162303.k4GN3j6W018275@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206 Modified Files: TeXmacs.spec Added Files: TeXmacs-1.0.6.1-guile18.patch Log Message: TeXmacs-1.0.6.1-guile18.patch: --- NEW FILE TeXmacs-1.0.6.1-guile18.patch --- --- TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.hpp.guile18 2006-05-16 21:16:49.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.hpp 2006-05-16 22:11:06.000000000 +0200 @@ -32,7 +32,6 @@ SCM path_to_scm (path p); SCM url_to_scm (url u); SCM scheme_tree_to_scm (scheme_tree t); -bool scm_to_bool (SCM obj); int scm_to_int (SCM obj); string scm_to_string (SCM obj); string scm_to_symbol (SCM obj); --- TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.cpp.guile18 2006-05-16 21:37:04.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.cpp 2006-05-16 22:58:35.000000000 +0200 @@ -110,11 +110,6 @@ return scm_bool2scm (flag); } -bool -scm_to_bool (SCM flag) { - return scm_scm2bool (flag); -} - /****************************************************************************** * Integers ******************************************************************************/ @@ -144,11 +139,6 @@ return scm_double2scm (i); } -static double -scm_to_double (SCM i) { - return scm_scm2double (i); -} - /****************************************************************************** * Strings ******************************************************************************/ @@ -246,7 +236,7 @@ SCM tree_smob; SCM_NEWCELL (tree_smob); SCM_SETCDR (tree_smob, (SCM) ((void*) (new tree (t)))); - SCM_SETCAR (tree_smob, tree_tag); + SCM_SETCAR (tree_smob, (SCM)tree_tag); return tree_smob; } @@ -434,7 +424,7 @@ SCM observer_smob; SCM_NEWCELL (observer_smob); SCM_SETCDR (observer_smob, (SCM) ((void*) (new observer (o)))); - SCM_SETCAR (observer_smob, observer_tag); + SCM_SETCAR (observer_smob, (SCM)observer_tag); return observer_smob; } @@ -485,7 +475,7 @@ SCM display_smob; SCM_NEWCELL (display_smob); SCM_SETCDR (display_smob, (SCM) ((void*) (new display (dis)))); - SCM_SETCAR (display_smob, display_tag); + SCM_SETCAR (display_smob, (SCM) display_tag); return display_smob; } @@ -541,7 +531,7 @@ SCM widget_smob; SCM_NEWCELL (widget_smob); SCM_SETCDR (widget_smob, (SCM) ((void*) (new widget (wid)))); - SCM_SETCAR (widget_smob, widget_tag); + SCM_SETCAR (widget_smob, (SCM) widget_tag); return widget_smob; } @@ -593,7 +583,7 @@ SCM make_widget_smob; SCM_NEWCELL (make_widget_smob); SCM_SETCDR (make_widget_smob, (SCM) ((void*) (new make_widget (mw)))); - SCM_SETCAR (make_widget_smob, make_widget_tag); + SCM_SETCAR (make_widget_smob, (SCM) make_widget_tag); return make_widget_smob; } @@ -645,7 +635,7 @@ SCM command_smob; SCM_NEWCELL (command_smob); SCM_SETCDR (command_smob, (SCM) ((void*) (new command (cmd)))); - SCM_SETCAR (command_smob, command_tag); + SCM_SETCAR (command_smob, (SCM) command_tag); return command_smob; } @@ -701,7 +691,7 @@ SCM url_smob; SCM_NEWCELL (url_smob); SCM_SETCDR (url_smob, (SCM) ((void*) (new url (u)))); - SCM_SETCAR (url_smob, url_tag); + SCM_SETCAR (url_smob, (SCM) url_tag); return url_smob; } --- TeXmacs-1.0.6.1-src/src/Guile/guile.hpp.guile18 2006-05-16 20:52:03.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Guile/guile.hpp 2006-05-16 22:09:58.000000000 +0200 @@ -21,8 +21,6 @@ #ifdef GUILE_A #define scm_is_bool gh_boolean_p #define scm_is_int SCM_INUMP -#define scm_is_string gh_string_p -#define scm_is_symbol gh_symbol_p #define scm_is_null gh_null_p #define scm_is_pair gh_pair_p #define scm_is_list gh_list_p @@ -51,12 +49,7 @@ #endif #ifdef GUILE_B -#define scm_is_bool(x) SCM_NFALSEP(scm_boolean_p(x)) #define scm_is_int SCM_INUMP -#define scm_is_string(x) SCM_NFALSEP(scm_string_p(x)) -#define scm_is_symbol(x) SCM_NFALSEP(scm_symbol_p(x)) -#define scm_is_null(x) SCM_NFALSEP(scm_null_p(x)) -#define scm_is_pair(x) SCM_NFALSEP(scm_pair_p(x)) #define scm_is_list(x) SCM_NFALSEP(scm_list_p(x)) #define scm_bool2scm SCM_BOOL Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- TeXmacs.spec 12 May 2006 17:42:37 -0000 1.36 +++ TeXmacs.spec 16 May 2006 23:03:10 -0000 1.37 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -11,6 +11,7 @@ Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch Patch4: TeXmacs-1.0.6.1-gcc41.patch +Patch5: TeXmacs-1.0.6.1-guile18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex Requires: tetex-fonts @@ -29,6 +30,7 @@ BuildRequires: libXmu-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel +BuildRequires: libtool-ltdl-devel Requires: fig2ps Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils @@ -58,6 +60,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -70,9 +73,8 @@ rm -fr $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install export GUILE_DATA_PATH=`guile-config info pkgdatadir` -export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d | grep ice-9` +export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d -name ice-9` cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs -chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/* chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info @@ -158,6 +160,11 @@ %changelog +* Tue May 16 2006 Gerard Milmeister - 1.0.6.1-4 +- added patch for new guile-1.8 +- added buildreq for libtool-ltdl-devel +- fixed command to find ice-9 directory + * Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 - new version 1.0.6.1 From fedora-extras-commits at redhat.com Tue May 16 23:16:49 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 16 May 2006 16:16:49 -0700 Subject: owners owners.list,1.1010,1.1011 Message-ID: <200605162316.k4GNGpLb018386@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18369 Modified Files: owners.list Log Message: add kchmviewer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1010 retrieving revision 1.1011 diff -u -r1.1010 -r1.1011 --- owners.list 16 May 2006 19:04:03 -0000 1.1010 +++ owners.list 16 May 2006 23:16:49 -0000 1.1011 @@ -560,6 +560,7 @@ Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org| +Fedora Extras|kchmviewer|CHM viewer|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|kdemultimedia-extras|Extras for KDE multimedia applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 17 01:11:50 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 16 May 2006 18:11:50 -0700 Subject: rpms/darcs/devel darcs.spec,1.9,1.10 Message-ID: <200605170111.k4H1Bqej023705@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23684 Modified Files: darcs.spec Log Message: disable "make check" for now since it chokes in buildsystem Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- darcs.spec 15 May 2006 01:26:11 -0000 1.9 +++ darcs.spec 17 May 2006 01:11:49 -0000 1.10 @@ -54,7 +54,7 @@ %build %configure --libexecdir=%{_localstatedir}/www make all -make check +#make check %install @@ -87,6 +87,7 @@ * Sun May 14 2006 Jens Petersen - 1.0.7-1 - update to 1.0.7 - fix typo of propagate in description (#189651) +- disable "make check" for now since it chokes in buildsystem * Thu Mar 2 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 From fedora-extras-commits at redhat.com Wed May 17 03:26:32 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:26:32 -0700 Subject: rpms/crossfire - New directory Message-ID: <200605170326.k4H3QY9s028665@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644/crossfire Log Message: Directory /cvs/extras/rpms/crossfire added to the repository From fedora-extras-commits at redhat.com Wed May 17 03:26:32 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:26:32 -0700 Subject: rpms/crossfire/devel - New directory Message-ID: <200605170326.k4H3QYn9028668@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644/crossfire/devel Log Message: Directory /cvs/extras/rpms/crossfire/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 03:26:46 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:26:46 -0700 Subject: rpms/crossfire/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605170326.k4H3QmAP028728@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28692/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module crossfire --- NEW 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 May 17 03:26:46 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:26:46 -0700 Subject: rpms/crossfire Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605170326.k4H3Qmog028725@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28692 Added Files: Makefile import.log Log Message: Setup of module crossfire --- NEW FILE Makefile --- # Top level Makefile for module crossfire all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 17 03:30:30 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:30:30 -0700 Subject: rpms/crossfire import.log,1.1,1.2 Message-ID: <200605170331.k4H3V2w3028836@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28796 Modified Files: import.log Log Message: auto-import crossfire-1.9.0-4 on branch devel from crossfire-1.9.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/crossfire/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 03:26:45 -0000 1.1 +++ import.log 17 May 2006 03:30:30 -0000 1.2 @@ -0,0 +1 @@ +crossfire-1_9_0-4:HEAD:crossfire-1.9.0-4.src.rpm:1147836626 From fedora-extras-commits at redhat.com Wed May 17 03:30:31 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:30:31 -0700 Subject: rpms/crossfire/devel crossfire-1.9.0-plugin-io.patch, NONE, 1.1 crossfire.init, NONE, 1.1 crossfire.logrotate, NONE, 1.1 crossfire.spec, NONE, 1.1 crossfire.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605170331.k4H3V3SU028840@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28796/devel Modified Files: .cvsignore sources Added Files: crossfire-1.9.0-plugin-io.patch crossfire.init crossfire.logrotate crossfire.spec crossfire.sysconfig Log Message: auto-import crossfire-1.9.0-4 on branch devel from crossfire-1.9.0-4.src.rpm crossfire-1.9.0-plugin-io.patch: --- NEW FILE crossfire-1.9.0-plugin-io.patch --- --- plugins/cfpython/cfpython.c 2006-01-30 21:44:56.000000000 -0800 +++ plugins/cfpython/cfpython.c.new 2006-05-16 15:59:29.000000000 -0700 @@ -673,7 +673,7 @@ scriptfile = fopen(context->script, "r"); if (scriptfile == NULL) { if (!silent) - printf( "cfpython - The Script file %s can't be opened\n", context->script); + LOG(llevError, "cfpython - The Script file %s can't be opened\n", context->script); return 0; } pushContext(context); @@ -705,7 +705,7 @@ PyObject *m, *d; int i; gethook = gethooksptr; - printf("CFPython 2.0a init\n"); + LOG(llevDebug, "CFPython 2.0a init\n"); Py_Initialize(); Crossfire_ObjectType.tp_new = PyType_GenericNew; @@ -795,7 +795,7 @@ rv = 0; if (current_command < 0) { - printf("Illegal call of runPluginCommand, call find_plugin_command first.\n"); + LOG(llevError, "Illegal call of runPluginCommand, call find_plugin_command first.\n"); return 1; } snprintf(buf, sizeof(buf), "%s.py", cf_get_maps_directory(CustomCommand[current_command].script)); @@ -831,7 +831,7 @@ int rtype = 0; FILE* scriptfile; - printf("CFPython 2.0a post init\n"); + LOG(llevDebug, "CFPython 2.0a post init\n"); registerGlobalEvent = gethook(&rtype, hooktype, "cfapi_system_register_global_event"); unregisterGlobalEvent = gethook(&rtype, hooktype, "cfapi_system_unregister_global_event"); systemDirectory = gethook(&rtype, hooktype, "cfapi_system_directory"); @@ -890,7 +890,7 @@ strcpy(context->options, ""); switch(context->event_code) { case EVENT_CRASH: - printf( "Unimplemented for now\n"); + LOG(llevDebug, "Unimplemented for now\n"); break; case EVENT_BORN: op = va_arg(args, object*); @@ -1044,7 +1044,7 @@ CF_PLUGIN int closePlugin() { - printf("CFPython 2.0a closing\n"); + LOG(llevDebug, "CFPython 2.0a closing\n"); Py_Finalize(); return 0; } --- plugins/cfpython/cfpython_map.c 2006-02-14 23:24:11.000000000 -0800 +++ plugins/cfpython/cfpython_map.c.new 2006-05-16 15:59:40.000000000 -0700 @@ -176,7 +176,7 @@ /* make sure the map is swapped in */ if (map->map->in_memory != MAP_IN_MEMORY) { - printf("MAP AIN'T READY !\n"); + LOG(llevError, "MAP AIN'T READY !\n"); } mflags = cf_map_get_flags(map->map, &(map->map), (sint16)x, (sint16)y, &nx, &ny); --- NEW FILE crossfire.init --- #!/bin/sh # # crossfire This shell script takes care of starting and stopping # the crossfire game server. # # chkconfig: - 15 85 # description: The crossfire server supports playing networked \ # multi-player games. # processname: crossfire # config: /etc/sysconfig/crossfire # pidfile: /var/run/crossfire.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/bin/crossfire" prog=$(basename $exec) pidfile=/var/run/$prog.pid [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { echo -n $"Starting Crossfire game server: " if [ -n "`/sbin/pidof $prog`" ]; then echo -n $"$prog already running" failure echo return 1 fi daemon --user crossfire $exec $CROSSFIRE_OPTIONS -detach -log /var/log/crossfire/crossfire.log retval=$? if [ $retval -eq 0 ]; then success touch $lockfile pidofproc $prog > $pidfile else failure fi echo return $retval } stop() { echo -n $"Stopping Crossfire 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 --- NEW FILE crossfire.logrotate --- /var/log/crossfire/crossfire.log { copytruncate notifempty missingok } --- NEW FILE crossfire.spec --- Name: crossfire Version: 1.9.0 Release: 4%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games License: GPL URL: http://crossfire.real-time.com Source0: http://dl.sourceforge.net/crossfire/%{name}-%{version}.tar.gz Source1: http://dl.sourceforge.net/crossfire/%{name}-%{version}.arch.tar.gz Source2: crossfire.init Source3: crossfire.sysconfig Source4: crossfire.logrotate Patch0: crossfire-1.9.0-plugin-io.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: crossfire-maps # BuildRequires necessary for the map editor BuildRequires: python-devel %if "%fedora" <= "4" BuildRequires: xorg-x11-devel %else BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXaw-devel %endif Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service Requires(pre): fedora-usermgmt Requires(postun): fedora-usermgmt %description Crossfire is a highly graphical role-playing adventure game with characteristics reminiscent of rogue, nethack, omega, and gauntlet. It has multiplayer capability and presently runs under X11. This package contains the server for hosting crossfire games over a public or private network. %package doc Summary: Documentation files for Crossfire Group: Documentation # Don't require the base package. The docs can be used without the # base package, and in fact include docs for both the client and # server packages. %description doc Documentation files for the crossfire game. %package devel Summary: Development files for writing crossfire plugins Group: Development/Libraries Requires: %{name} = %{version} %description devel Development files for writing crossfire plugins. %package plugins Summary: Plugin modules for the crossfire game server Group: Amusements/Games Requires: %{name} = %{version} %description plugins Plugin modules for the crossfire game server. %package client-images Summary: Image cache for crossfire clients Group: Amusements/Games # crossfire-client provides a directory needed by the images. # No version dependency for the client since the images are pretty # ignorant of the client version. Requires: crossfire-client %description client-images Image files that can be used with the crossfire clients so that they don't have to be downloaded from the server. %prep %setup -q %setup -q -a 1 %patch0 mv arch/ lib/ %{__sed} -i 's#\r##' utils/player_dl.pl.in # Don't use a hardcoded /tmp directory for building the image archive %{__sed} -i "s#^\$TMPDIR=.*#\$TMPDIR=\"`pwd`\";#" lib/adm/collect_images.pl # Don't map stdio streams to / %{__sed} -i 's# (void) open ("/", O_RDONLY);# (void) open ("/var/log/crossfire/crossfire.log", O_RDONLY);#' server/daemon.c %build # Change the localstatedir so that the variable data files are # put in /var/games/crossfire instead of /var/crossfire. This is # in agreement with the FHS. %configure --localstatedir=%{_var}/games --disable-static make %{?_smp_mflags} # This will create a tarball of the images for the client. cd lib && adm/collect_images.pl -archive %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Install the client images mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}-client tar xf %{name}-images.tar -C $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}-client # Nuke the installation instructions for the image archive. rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}-client/README install -pD -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/crossfire # Move some rarely-used binaries out of /usr/bin and into a # tools directory. mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # This utility restarts crossfire at periodic intervals. mv $RPM_BUILD_ROOT%{_bindir}/crossloop.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # This submits core files to the developers. mv $RPM_BUILD_ROOT%{_bindir}/crossloop.web $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # Allows players to download their player files from a web # server. This feature relies on a properly configured web server # which is not handled by this rpm release. mv $RPM_BUILD_ROOT%{_bindir}/player_dl.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # Binary for running a crossfire metaserver. Requires interaction with # a web server, so we disable this for now. rm $RPM_BUILD_ROOT%{_libdir}/%{name}/metaserver.pl # I have no idea what this is for. mv $RPM_BUILD_ROOT%{_libdir}/%{name}/mktable.script $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # This is not needed anymore based on comments at the top of # the file itself. rm $RPM_BUILD_ROOT%{_libdir}/%{name}/add_throw.perl # /usr/bin is a better place for the standalone random map generator mv $RPM_BUILD_ROOT%{_libdir}/%{name}/random_map $RPM_BUILD_ROOT%{_bindir}/cross_random_map rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la # Create the log directory mkdir -p $RPM_BUILD_ROOT%{_var}/log/%{name} install -p -D -m 644 %{SOURCE3} \ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name} install -p -D -m 644 %{SOURCE4} \ $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name} %pre user_uid=`id -u crossfire 2>/dev/null` if [ x"$user_uid" = x ] ; then %{_sbindir}/fedora-useradd 27 -r -s /sbin/nologin \ -d %{_datadir}/%{name} -M -c 'Crossfire Server' \ crossfire >/dev/null || : fi %post /sbin/chkconfig --add crossfire %preun if [ "$1" = "0" ]; then /sbin/service crossfire stop > /dev/null 2>&1 /sbin/chkconfig --del crossfire fi %postun if [ "$1" -ge "1" ]; then /sbin/service crossfire restart >/dev/null 2>&1 fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/crossedit %{_bindir}/crossfire %{_bindir}/crossloop %{_bindir}/cross_random_map %{_datadir}/%{name} %exclude %{_datadir}/%{name}/%{name}-client %dir %{_libdir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/ban_file %config(noreplace) %{_sysconfdir}/%{name}/dm_file %config(noreplace) %{_sysconfdir}/%{name}/exp_table %config(noreplace) %{_sysconfdir}/%{name}/forbid %config(noreplace) %{_sysconfdir}/%{name}/motd %config(noreplace) %{_sysconfdir}/%{name}/news %config(noreplace) %{_sysconfdir}/%{name}/rules %config(noreplace) %{_sysconfdir}/%{name}/settings %attr(-,crossfire,root) %{_var}/games/%{name} %attr(-,crossfire,root) %{_var}/log/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man6/* %{_initrddir}/%{name} %doc README NEWS DEVELOPERS AUTHORS COPYING %files doc %defattr(-,root,root,-) %doc doc/*.doc doc/*.ps doc/SurvivalGuide %doc doc/PlayerStats doc/RunTimeCommands doc/spellcasters_guide_to_runes %files devel %defattr(-,root,root,-) %{_bindir}/crossfire-config %doc doc/plugins %files plugins %defattr(-,root,root,-) %{_libdir}/%{name}/plugins %files client-images %defattr(-,root,root,-) %{_datadir}/%{name}/%{name}-client %changelog * Tue May 16 2006 Wart 1.9.0-4 - Added -doc subpackage - Own /etc/crossfire - Add crossfire-client dependency for crossfire-client-images * Tue May 16 2006 Wart 1.9.0-3 - Added patch to fix missing stdout problem with python plugin. * Mon May 15 2006 Wart 1.9.0-2 - Generate the -client-images subpackage here instead of relying on upstream's missing -client-images tarball. * Thu Mar 9 2006 Wart 1.9.0-1 - Initial spec file following Fedora Extras conventions --- NEW FILE crossfire.sysconfig --- # # crossfire(6) options. Pick a custom port here if needed, for example. # # The default options for crossfire are usually just fine. Read # the crossfire(6) manpage to see what you can set here. CROSSFIRE_OPTIONS="" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 03:26:46 -0000 1.1 +++ .cvsignore 17 May 2006 03:30:31 -0000 1.2 @@ -0,0 +1,2 @@ +crossfire-1.9.0.arch.tar.gz +crossfire-1.9.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 03:26:46 -0000 1.1 +++ sources 17 May 2006 03:30:31 -0000 1.2 @@ -0,0 +1,2 @@ +7685cc806a02a3f14336095de6066128 crossfire-1.9.0.arch.tar.gz +43240af83a4414d2dcc19fff3af31a63 crossfire-1.9.0.tar.gz From fedora-extras-commits at redhat.com Wed May 17 03:35:07 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:35:07 -0700 Subject: owners owners.list,1.1011,1.1012 Message-ID: <200605170335.k4H3Z9ZW028900@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28883 Modified Files: owners.list Log Message: Added crossfire Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1011 retrieving revision 1.1012 diff -u -r1.1011 -r1.1012 --- owners.list 16 May 2006 23:16:49 -0000 1.1011 +++ owners.list 17 May 2006 03:35:07 -0000 1.1012 @@ -170,6 +170,7 @@ Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| +Fedora Extras|crossfire|Crossfire game server|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|crossfire-client|Crossfire game client|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|crossfire-maps|Crossfire game server maps|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 17 05:27:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 22:27:47 -0700 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.35,1.36 Message-ID: <200605170527.k4H5RniO001346@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-serv1313 Modified Files: sylpheed-claws.spec Log Message: - version Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sylpheed-claws.spec 15 May 2006 07:22:53 -0000 1.35 +++ sylpheed-claws.spec 17 May 2006 05:27:47 -0000 1.36 @@ -164,6 +164,7 @@ %changelog * Mon May 15 2006 Andreas Bierfert +2.2.0-1 - version upgrade * Sat Apr 22 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Wed May 17 06:46:29 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:46:29 -0700 Subject: rpms/nessus-libraries/FC-4 .cvsignore, 1.2, 1.3 nessus-libraries.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605170646.k4H6kVC4003973@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3920/FC-4 Modified Files: .cvsignore nessus-libraries.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Mar 2006 08:47:02 -0000 1.2 +++ .cvsignore 17 May 2006 06:46:29 -0000 1.3 @@ -1 +1 @@ -nessus-libraries-2.2.6.tar.gz +nessus-libraries-2.2.7.tar.gz Index: nessus-libraries.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-4/nessus-libraries.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-libraries.spec 14 Mar 2006 08:47:02 -0000 1.1 +++ nessus-libraries.spec 17 May 2006 06:46:29 -0000 1.2 @@ -1,12 +1,12 @@ Name: nessus-libraries -Version: 2.2.6 -Release: 2%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Support libraries for nessus Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-libraries-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-libraries-2.2.7.tar.gz Patch0: nessus-libraries-config.patch Patch1: nessus-libraries-2.2.4.Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,10 @@ %{_bindir}/nessus-config %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - include patch for localstatedir Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Mar 2006 08:47:02 -0000 1.2 +++ sources 17 May 2006 06:46:29 -0000 1.3 @@ -1 +1 @@ -ac027cd2dfa149a44a6dbb748eb93ce9 nessus-libraries-2.2.6.tar.gz +740d9f2d97c495a52663a15a0fe5e6cd nessus-libraries-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:46:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:46:30 -0700 Subject: rpms/nessus-libraries/devel .cvsignore, 1.2, 1.3 nessus-libraries.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605170646.k4H6kWT8003985@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3920/devel Modified Files: .cvsignore nessus-libraries.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Mar 2006 08:47:02 -0000 1.2 +++ .cvsignore 17 May 2006 06:46:30 -0000 1.3 @@ -1 +1 @@ -nessus-libraries-2.2.6.tar.gz +nessus-libraries-2.2.7.tar.gz Index: nessus-libraries.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/nessus-libraries.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-libraries.spec 14 Mar 2006 08:47:02 -0000 1.1 +++ nessus-libraries.spec 17 May 2006 06:46:30 -0000 1.2 @@ -1,12 +1,12 @@ Name: nessus-libraries -Version: 2.2.6 -Release: 2%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Support libraries for nessus Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-libraries-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-libraries-2.2.7.tar.gz Patch0: nessus-libraries-config.patch Patch1: nessus-libraries-2.2.4.Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,10 @@ %{_bindir}/nessus-config %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - include patch for localstatedir Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Mar 2006 08:47:02 -0000 1.2 +++ sources 17 May 2006 06:46:30 -0000 1.3 @@ -1 +1 @@ -ac027cd2dfa149a44a6dbb748eb93ce9 nessus-libraries-2.2.6.tar.gz +740d9f2d97c495a52663a15a0fe5e6cd nessus-libraries-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:46:29 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:46:29 -0700 Subject: rpms/nessus-libraries/FC-5 .cvsignore, 1.2, 1.3 nessus-libraries.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605170646.k4H6kWFZ003979@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3920/FC-5 Modified Files: .cvsignore nessus-libraries.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Mar 2006 08:47:02 -0000 1.2 +++ .cvsignore 17 May 2006 06:46:29 -0000 1.3 @@ -1 +1 @@ -nessus-libraries-2.2.6.tar.gz +nessus-libraries-2.2.7.tar.gz Index: nessus-libraries.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-5/nessus-libraries.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-libraries.spec 14 Mar 2006 08:47:02 -0000 1.1 +++ nessus-libraries.spec 17 May 2006 06:46:29 -0000 1.2 @@ -1,12 +1,12 @@ Name: nessus-libraries -Version: 2.2.6 -Release: 2%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Support libraries for nessus Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-libraries-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-libraries-2.2.7.tar.gz Patch0: nessus-libraries-config.patch Patch1: nessus-libraries-2.2.4.Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,10 @@ %{_bindir}/nessus-config %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - include patch for localstatedir Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Mar 2006 08:47:02 -0000 1.2 +++ sources 17 May 2006 06:46:29 -0000 1.3 @@ -1 +1 @@ -ac027cd2dfa149a44a6dbb748eb93ce9 nessus-libraries-2.2.6.tar.gz +740d9f2d97c495a52663a15a0fe5e6cd nessus-libraries-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:48:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:48:32 -0700 Subject: rpms/libnasl/devel libnasl-CVE-2006-2093.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libnasl.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605170648.k4H6mYl4004173@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4109/devel Modified Files: .cvsignore libnasl.spec sources Added Files: libnasl-CVE-2006-2093.patch Log Message: - version upgrade - CVE-2006-2093 patch libnasl-CVE-2006-2093.patch: --- NEW FILE libnasl-CVE-2006-2093.patch --- --- nasl/nasl_text_utils.c.orig 2006-05-17 07:48:57.000000000 +0200 +++ nasl/nasl_text_utils.c 2006-05-17 07:52:08.000000000 +0200 @@ -964,7 +964,15 @@ sep = get_str_local_var_by_name(lexic, "sep"); if (sep != NULL) + { sep_len = get_var_size_by_name(lexic, "sep"); + if(sep_len == 0) + { + nasl_perror(lexic, "split: invalid 'sep' argument value\n"); + return NULL; + } + } + keep = get_int_local_var_by_name(lexic, "keep", 1); retc = alloc_tree_cell(0, NULL); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Mar 2006 08:54:36 -0000 1.2 +++ .cvsignore 17 May 2006 06:48:31 -0000 1.3 @@ -1 +1 @@ -libnasl-2.2.6.tar.gz +libnasl-2.2.7.tar.gz Index: libnasl.spec =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/libnasl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnasl.spec 18 Mar 2006 08:57:45 -0000 1.2 +++ libnasl.spec 17 May 2006 06:48:31 -0000 1.3 @@ -1,14 +1,15 @@ Name: libnasl -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/libnasl-2.2.7.tar.gz Patch0: libnasl-config.patch Patch1: libnasl-2.2.4.pki.patch +Patch2: libnasl-CVE-2006-2093.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison @@ -44,6 +45,7 @@ %setup -q -n %{name} %patch0 %patch1 -p1 +%patch2 %build %configure --enable-shared --disable-static --with-pic @@ -82,6 +84,11 @@ %{_mandir}/man1/nasl-config.1* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade +- add CVE-2006-2093 patch + * Sat Mar 18 2006 Andreas Bierfert 2.2.6-3 - fix BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Mar 2006 08:54:36 -0000 1.2 +++ sources 17 May 2006 06:48:31 -0000 1.3 @@ -1 +1 @@ -06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz +37f6f0db022dad1e218371909de3e8af libnasl-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:48:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:48:25 -0700 Subject: rpms/libnasl/FC-4 libnasl-CVE-2006-2093.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libnasl.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605170648.k4H6mvnC004178@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4109/FC-4 Modified Files: .cvsignore libnasl.spec sources Added Files: libnasl-CVE-2006-2093.patch Log Message: - version upgrade - CVE-2006-2093 patch libnasl-CVE-2006-2093.patch: --- NEW FILE libnasl-CVE-2006-2093.patch --- --- nasl/nasl_text_utils.c.orig 2006-05-17 07:48:57.000000000 +0200 +++ nasl/nasl_text_utils.c 2006-05-17 07:52:08.000000000 +0200 @@ -964,7 +964,15 @@ sep = get_str_local_var_by_name(lexic, "sep"); if (sep != NULL) + { sep_len = get_var_size_by_name(lexic, "sep"); + if(sep_len == 0) + { + nasl_perror(lexic, "split: invalid 'sep' argument value\n"); + return NULL; + } + } + keep = get_int_local_var_by_name(lexic, "keep", 1); retc = alloc_tree_cell(0, NULL); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Mar 2006 08:54:36 -0000 1.2 +++ .cvsignore 17 May 2006 06:48:25 -0000 1.3 @@ -1 +1 @@ -libnasl-2.2.6.tar.gz +libnasl-2.2.7.tar.gz Index: libnasl.spec =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-4/libnasl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnasl.spec 18 Mar 2006 08:57:45 -0000 1.2 +++ libnasl.spec 17 May 2006 06:48:25 -0000 1.3 @@ -1,14 +1,15 @@ Name: libnasl -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/libnasl-2.2.7.tar.gz Patch0: libnasl-config.patch Patch1: libnasl-2.2.4.pki.patch +Patch2: libnasl-CVE-2006-2093.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison @@ -44,6 +45,7 @@ %setup -q -n %{name} %patch0 %patch1 -p1 +%patch2 %build %configure --enable-shared --disable-static --with-pic @@ -82,6 +84,11 @@ %{_mandir}/man1/nasl-config.1* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade +- add CVE-2006-2093 patch + * Sat Mar 18 2006 Andreas Bierfert 2.2.6-3 - fix BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Mar 2006 08:54:36 -0000 1.2 +++ sources 17 May 2006 06:48:25 -0000 1.3 @@ -1 +1 @@ -06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz +37f6f0db022dad1e218371909de3e8af libnasl-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:48:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:48:26 -0700 Subject: rpms/libnasl/FC-5 libnasl-CVE-2006-2093.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libnasl.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605170648.k4H6mwKO004183@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4109/FC-5 Modified Files: .cvsignore libnasl.spec sources Added Files: libnasl-CVE-2006-2093.patch Log Message: - version upgrade - CVE-2006-2093 patch libnasl-CVE-2006-2093.patch: --- NEW FILE libnasl-CVE-2006-2093.patch --- --- nasl/nasl_text_utils.c.orig 2006-05-17 07:48:57.000000000 +0200 +++ nasl/nasl_text_utils.c 2006-05-17 07:52:08.000000000 +0200 @@ -964,7 +964,15 @@ sep = get_str_local_var_by_name(lexic, "sep"); if (sep != NULL) + { sep_len = get_var_size_by_name(lexic, "sep"); + if(sep_len == 0) + { + nasl_perror(lexic, "split: invalid 'sep' argument value\n"); + return NULL; + } + } + keep = get_int_local_var_by_name(lexic, "keep", 1); retc = alloc_tree_cell(0, NULL); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Mar 2006 08:54:36 -0000 1.2 +++ .cvsignore 17 May 2006 06:48:26 -0000 1.3 @@ -1 +1 @@ -libnasl-2.2.6.tar.gz +libnasl-2.2.7.tar.gz Index: libnasl.spec =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-5/libnasl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnasl.spec 18 Mar 2006 08:57:45 -0000 1.2 +++ libnasl.spec 17 May 2006 06:48:26 -0000 1.3 @@ -1,14 +1,15 @@ Name: libnasl -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/libnasl-2.2.7.tar.gz Patch0: libnasl-config.patch Patch1: libnasl-2.2.4.pki.patch +Patch2: libnasl-CVE-2006-2093.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison @@ -44,6 +45,7 @@ %setup -q -n %{name} %patch0 %patch1 -p1 +%patch2 %build %configure --enable-shared --disable-static --with-pic @@ -82,6 +84,11 @@ %{_mandir}/man1/nasl-config.1* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade +- add CVE-2006-2093 patch + * Sat Mar 18 2006 Andreas Bierfert 2.2.6-3 - fix BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Mar 2006 08:54:36 -0000 1.2 +++ sources 17 May 2006 06:48:26 -0000 1.3 @@ -1 +1 @@ -06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz +37f6f0db022dad1e218371909de3e8af libnasl-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 07:01:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 May 2006 00:01:08 -0700 Subject: rpms/nessus-core/FC-4 nessus-core-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nessus-core.spec, 1.1, 1.2 sources, 1.2, 1.3 nessus-core-2.2.4.Makefile.patch, 1.1, NONE Message-ID: <200605170701.k4H71eRg006627@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4351/FC-4 Modified Files: .cvsignore nessus-core.spec sources Added Files: nessus-core-Makefile.patch Removed Files: nessus-core-2.2.4.Makefile.patch Log Message: - version upgrade nessus-core-Makefile.patch: --- NEW FILE nessus-core-Makefile.patch --- --- nessus-core/Makefile.orig 2006-05-17 08:35:04.000000000 +0200 +++ nessus-core/Makefile 2006-05-17 08:36:27.000000000 +0200 @@ -34,11 +34,11 @@ test -d $(DESTDIR)${localstatedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir} test -d $(DESTDIR)${NESSUSD_STATEDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/users || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/users - test -d $(DESTDIR)${NESSUSD_STATEDIR}/logs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/logs + test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} - $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${NESSUSD_STATEDIR}/ + $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${sysconfdir}/nessus $(INSTALL) -c -m 0444 include/config.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/ntcompat.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2006 06:21:26 -0000 1.2 +++ .cvsignore 17 May 2006 07:01:08 -0000 1.3 @@ -1 +1 @@ -nessus-core-2.2.6.tar.gz +nessus-core-2.2.7.tar.gz Index: nessus-core.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-4/nessus-core.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-core.spec 7 Apr 2006 06:21:26 -0000 1.1 +++ nessus-core.spec 17 May 2006 07:01:08 -0000 1.2 @@ -1,19 +1,19 @@ Name: nessus-core -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Network vulnerability scanner Group: Applications/System License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-core-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-core-2.2.7.tar.gz Source1: nessusd.init Source2: nessusd.log Source3: nessus.desktop # force nessus into fedora dir structure # and use system gd # Thanks to Dawid Gajownik for providing these patches =) -Patch0: nessus-core-2.2.4.Makefile.patch +Patch0: nessus-core-Makefile.patch Patch1: nessus-core-2.2.4.config.h.in.patch Patch2: nessus-core-2.2.4.configure.in.patch Patch3: nessus-core-2.2.4.configure.patch @@ -218,6 +218,10 @@ %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Mon Apr 03 2006 Andreas Bierfert 2.2.6-3 - fix description Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2006 06:21:26 -0000 1.2 +++ sources 17 May 2006 07:01:08 -0000 1.3 @@ -1 +1 @@ -616dd7727b90df1ac978b5e736c0a960 nessus-core-2.2.6.tar.gz +2dd8c116b435d3ec698d3caed0b48859 nessus-core-2.2.7.tar.gz --- nessus-core-2.2.4.Makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 17 07:01:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 May 2006 00:01:09 -0700 Subject: rpms/nessus-core/FC-5 nessus-core-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nessus-core.spec, 1.1, 1.2 sources, 1.2, 1.3 nessus-core-2.2.4.Makefile.patch, 1.1, NONE Message-ID: <200605170701.k4H71hFM006630@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-core/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4351/FC-5 Modified Files: .cvsignore nessus-core.spec sources Added Files: nessus-core-Makefile.patch Removed Files: nessus-core-2.2.4.Makefile.patch Log Message: - version upgrade nessus-core-Makefile.patch: --- NEW FILE nessus-core-Makefile.patch --- --- nessus-core/Makefile.orig 2006-05-17 08:35:04.000000000 +0200 +++ nessus-core/Makefile 2006-05-17 08:36:27.000000000 +0200 @@ -34,11 +34,11 @@ test -d $(DESTDIR)${localstatedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir} test -d $(DESTDIR)${NESSUSD_STATEDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/users || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/users - test -d $(DESTDIR)${NESSUSD_STATEDIR}/logs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/logs + test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} - $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${NESSUSD_STATEDIR}/ + $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${sysconfdir}/nessus $(INSTALL) -c -m 0444 include/config.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/ntcompat.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2006 06:21:26 -0000 1.2 +++ .cvsignore 17 May 2006 07:01:09 -0000 1.3 @@ -1 +1 @@ -nessus-core-2.2.6.tar.gz +nessus-core-2.2.7.tar.gz Index: nessus-core.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-5/nessus-core.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-core.spec 7 Apr 2006 06:21:26 -0000 1.1 +++ nessus-core.spec 17 May 2006 07:01:09 -0000 1.2 @@ -1,19 +1,19 @@ Name: nessus-core -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Network vulnerability scanner Group: Applications/System License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-core-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-core-2.2.7.tar.gz Source1: nessusd.init Source2: nessusd.log Source3: nessus.desktop # force nessus into fedora dir structure # and use system gd # Thanks to Dawid Gajownik for providing these patches =) -Patch0: nessus-core-2.2.4.Makefile.patch +Patch0: nessus-core-Makefile.patch Patch1: nessus-core-2.2.4.config.h.in.patch Patch2: nessus-core-2.2.4.configure.in.patch Patch3: nessus-core-2.2.4.configure.patch @@ -218,6 +218,10 @@ %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Mon Apr 03 2006 Andreas Bierfert 2.2.6-3 - fix description Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2006 06:21:26 -0000 1.2 +++ sources 17 May 2006 07:01:09 -0000 1.3 @@ -1 +1 @@ -616dd7727b90df1ac978b5e736c0a960 nessus-core-2.2.6.tar.gz +2dd8c116b435d3ec698d3caed0b48859 nessus-core-2.2.7.tar.gz --- nessus-core-2.2.4.Makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 17 07:01:14 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 May 2006 00:01:14 -0700 Subject: rpms/nessus-core/devel nessus-core-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nessus-core.spec, 1.1, 1.2 sources, 1.2, 1.3 nessus-core-2.2.4.Makefile.patch, 1.1, NONE Message-ID: <200605170701.k4H71k7J006633@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4351/devel Modified Files: .cvsignore nessus-core.spec sources Added Files: nessus-core-Makefile.patch Removed Files: nessus-core-2.2.4.Makefile.patch Log Message: - version upgrade nessus-core-Makefile.patch: --- NEW FILE nessus-core-Makefile.patch --- --- nessus-core/Makefile.orig 2006-05-17 08:35:04.000000000 +0200 +++ nessus-core/Makefile 2006-05-17 08:36:27.000000000 +0200 @@ -34,11 +34,11 @@ test -d $(DESTDIR)${localstatedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir} test -d $(DESTDIR)${NESSUSD_STATEDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/users || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/users - test -d $(DESTDIR)${NESSUSD_STATEDIR}/logs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/logs + test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} - $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${NESSUSD_STATEDIR}/ + $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${sysconfdir}/nessus $(INSTALL) -c -m 0444 include/config.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/ntcompat.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-core/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2006 06:21:26 -0000 1.2 +++ .cvsignore 17 May 2006 07:01:13 -0000 1.3 @@ -1 +1 @@ -nessus-core-2.2.6.tar.gz +nessus-core-2.2.7.tar.gz Index: nessus-core.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-core/devel/nessus-core.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-core.spec 7 Apr 2006 06:21:26 -0000 1.1 +++ nessus-core.spec 17 May 2006 07:01:13 -0000 1.2 @@ -1,19 +1,19 @@ Name: nessus-core -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Network vulnerability scanner Group: Applications/System License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-core-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-core-2.2.7.tar.gz Source1: nessusd.init Source2: nessusd.log Source3: nessus.desktop # force nessus into fedora dir structure # and use system gd # Thanks to Dawid Gajownik for providing these patches =) -Patch0: nessus-core-2.2.4.Makefile.patch +Patch0: nessus-core-Makefile.patch Patch1: nessus-core-2.2.4.config.h.in.patch Patch2: nessus-core-2.2.4.configure.in.patch Patch3: nessus-core-2.2.4.configure.patch @@ -218,6 +218,10 @@ %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Mon Apr 03 2006 Andreas Bierfert 2.2.6-3 - fix description Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-core/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2006 06:21:26 -0000 1.2 +++ sources 17 May 2006 07:01:13 -0000 1.3 @@ -1 +1 @@ -616dd7727b90df1ac978b5e736c0a960 nessus-core-2.2.6.tar.gz +2dd8c116b435d3ec698d3caed0b48859 nessus-core-2.2.7.tar.gz --- nessus-core-2.2.4.Makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 17 07:46:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 May 2006 00:46:27 -0700 Subject: rpms/nessus-core/FC-4 nessus-core.spec,1.2,1.3 Message-ID: <200605170746.k4H7kT8d007076@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7059 Modified Files: nessus-core.spec Log Message: - fix BR for FC4 Index: nessus-core.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-4/nessus-core.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nessus-core.spec 17 May 2006 07:01:08 -0000 1.2 +++ nessus-core.spec 17 May 2006 07:46:27 -0000 1.3 @@ -30,7 +30,7 @@ BuildRequires: libnasl-devel BuildRequires: gtk2-devel BuildRequires: glib2-devel -BuildRequires: libICE-devel +BuildRequires: xorg-x11-devel BuildRequires: gd-devel BuildRequires: tcp_wrappers BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Wed May 17 08:20:35 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 17 May 2006 01:20:35 -0700 Subject: fedora-security/audit fc5,1.165,1.166 Message-ID: <200605170820.k4H8KZgl009511@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9493 Modified Files: fc5 Log Message: The php update fixed some extra things too. Jorton confirmed: Bug(s): 187231 187511 187891 189592 190034 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- fc5 16 May 2006 20:38:52 -0000 1.165 +++ fc5 17 May 2006 08:20:33 -0000 1.166 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060515 -Up to date FC5 as of 20060515 +Up to date CVE as of CVE email 20060516 +Up to date FC5 as of 20060516 ** are items that need attention @@ -23,8 +23,8 @@ CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-1993 version (firefox, fixed 1.5.0.3) #190124 [since FEDORA-2006-547] -CVE-2006-1991 VULNERABLE (php) #190034 -CVE-2006-1990 VULNERABLE (php) #190034 +CVE-2006-1991 version (php) #190034 [since FEDORA-2006-289] +CVE-2006-1990 version (php) #190034 [since FEDORA-2006-289] CVE-2006-1942 ** firefox CVE-2006-1940 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] CVE-2006-1939 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] @@ -40,7 +40,7 @@ CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] -CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 +CVE-2006-1861 VULNERABLE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] @@ -125,7 +125,7 @@ CVE-2006-1518 VULNERABLE (mysql, fixed 5.0.21) #190870 CVE-2006-1517 VULNERABLE (mysql, fixed 5.0.21) #190868 CVE-2006-1516 VULNERABLE (mysql, fixed 5.0.21) #190866 -CVE-2006-1494 VULNERABLE (php)#189592 +CVE-2006-1494 version (php) #189592 [since FEDORA-2006-289] CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289] CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 @@ -218,7 +218,7 @@ CVE-2006-0292 version (thunderbird, fixed 1.5) CVE-2006-0292 version (firefox, fixed 1.5.1) CVE-2006-0292 backport (mozilla) mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch -CVE-2006-0254 backport (tomcat5, fixed 5.5.16) #178179 **check this** +CVE-2006-0254 backport (tomcat5, fixed 5.5.16) #178179 **check this CVE-2006-0236 ignore (thunderbird) windows only CVE-2006-0225 version (openssh, fixed 4.3p2) CVE-2006-0208 version (php, fixed 5.1.2) @@ -235,7 +235,7 @@ CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193] CVE-2006-0052 version (mailman, fixed 2.1.6) CVE-2006-0049 version (gnupg, fixed 1.4.2.2) -CVE-2006-0040 ** VULNERABLE (gtkhtml) #183680 no upstream fix +CVE-2006-0040 VULNERABLE (gtkhtml) #183680 no upstream fix CVE-2006-0037 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] From fedora-extras-commits at redhat.com Wed May 17 09:58:56 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 17 May 2006 02:58:56 -0700 Subject: extras-buildsys/utils extras-push-new,1.9,1.10 Message-ID: <200605170958.k4H9wuET012163@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12145 Modified Files: extras-push-new Log Message: fix rather harmless typo in exit condition Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- extras-push-new 11 May 2006 16:48:59 -0000 1.9 +++ extras-push-new 17 May 2006 09:58:53 -0000 1.10 @@ -116,7 +116,7 @@ try: self.rc = fcntl.flock(self.file, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError: - print 'ERROR: script locked via lockfile %s - it seems to be running already' % name + print 'ERROR: script locked via lockfile %s - it seems to be running already' % self.name sys.exit(11) From fedora-extras-commits at redhat.com Wed May 17 13:02:53 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 17 May 2006 06:02:53 -0700 Subject: rpms/cernlib/devel cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib.spec, 1.30, 1.31 cernlib_2005.05.09.dfsg-5.diff, 1.1, NONE Message-ID: <200605171303.k4HD3Qm5022288@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22230 Modified Files: 112-remove-nonexistent-prototypes-from-gen.h.dpatch 805-expunge-missing-mathlib-kernlib-symbols.dpatch cernlib.spec Added Files: cernlib_2005.05.09.dfsg-6.diff Removed Files: cernlib_2005.05.09.dfsg-5.diff Log Message: * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 cernlib_2005.05.09.dfsg-6.diff: --- NEW FILE cernlib_2005.05.09.dfsg-6.diff --- --- cernlib-2005.05.09.dfsg.orig/debian/control +++ cernlib-2005.05.09.dfsg/debian/control @@ -0,0 +1,896 @@ +Source: cernlib +Maintainer: Kevin B. McCarty +Standards-Version: 3.7.2 +Priority: optional +Section: science +Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin + +Package: cernlib-base +Architecture: all +Section: devel +Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev +Description: script to determine Cernlib library dependencies + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This package includes the "cernlib" script that lists the command-line + options needed for linking against Cernlib libraries. The script has + been rewritten from the upstream version to calculate + dependencies recursively. Also included are a README.Debian with a summary + of changes made to Cernlib to fit it into Debian packaging practices, + and a contributed set of Autoconf macros to test for Cernlib libraries. + +Package: cernlib-core-dev +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit +Description: Cernlib development headers, tools, and static libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the header files and static libraries likely to be + wanted by developers using the Cern libraries who are not interested + specifically in high energy physics. It also provides the Cernlib + development tools DZedit and KUIPC. Cernlib analysis programs may be + obtained by installing the cernlib-core metapackage. + +Package: cernlib-core +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos +Description: Cernlib main libraries and programs + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the libraries and analysis tools (e.g. PAW) likely + to be wanted by most users of the Cern libraries who are not interested + specifically in high energy physics. You cannot do program development by + installing only this metapackage; development libraries and tools may + be obtained by installing the cernlib-core-dev metapackage or individual + lib*-dev packages. + +Package: cernlib-extras +Architecture: all +Priority: extra +Section: science +Depends: cernlib-base (= ${Source-Version}), pawserv, zftp +Description: miscellaneous Cernlib programs unlikely to be used by many + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides a few additional Cernlib programs not included + in any other Cernlib metapackage. Very few people are likely to be + interested in them; currently they include zftp, pawserv and zserv. + Notice that the latter two programs run as daemons through inetd and may + reduce your system's security! + . + Installing this package along with the "cernlib" metapackage will supply + a complete set of all Cernlib programs and libraries included in Debian. + +Package: cernlib-montecarlo +Architecture: all +Section: science +Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev +Recommends: libisajet758-2-dev +Description: Cernlib Monte Carlo libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides various Monte Carlo libraries included in Cernlib + (both shared and static). Likely only physicists will be interested in + these packages. Note that the Geant 3.21 program is not included, but it may + be obtained by also installing the geant321 Debian package. + . + Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are + not available within Debian due to licensing issues; see the README.Debian + file in the montecarlo-base package for information on obtaining them. + . + Additionally, the Isajet library is not available on the m68k architecture + due to a compiler flaw. + +Package: cernlib +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev +Description: almost complete set of Debian Cernlib packages + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides almost all of the programs and libraries contained + in Cernlib. Most people will likely want only a subset of these. A few + extra Cernlib programs, not of interest to many people, may be obtained via + the cernlib-extras metapackage. + +Package: dzedit +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libpacklib1-dev +Description: Cernlib's ZEBRA documentation editor + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system + developed at CERN. ZEBRA, part of the Packlib library, permits a developer to + create complex data structures in the FORTRAN 77 language; the DZDOC system + allows the developer to generate and maintain documentation of ZEBRA data + structures. + +Package: geant321-data +Architecture: all +Section: science +Depends: cernlib-base +Description: [Physics] Data for Geant 3.21 detector simulator + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes data files for use by Geant. + +Package: geant321-doc +Architecture: all +Section: doc +Depends: cernlib-base +Description: [Physics] Documentation for Geant 3.21 + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes some documentation about Geant. + +Package: geant321 +Architecture: all +Section: science +Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77 +Suggests: kxterm, geant321-doc +Description: [Physics] Particle detector description and simulation tool + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes gxint, the script used to perform this linking step. + +Package: kuipc +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, cernlib-base +Recommends: libpacklib1-dev +Suggests: libpacklib1-lesstif-dev +Description: Cernlib's Kit for a User Interface Package (KUIP) compiler + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify + the writing of a program's user interface code. It takes as + input a Command Definition File (CDF) that describes the + commands to be understood by the program, and outputs C or FORTRAN code that + makes the appropriate function calls to set up the user interface. This + code can then be compiled and linked with the rest of the program. Since + the generated code uses KUIP routines, the program must also be linked + against the Packlib library that contains them. + . + KUIPC is no longer actively developed, so aside from its use in the build + process of Cernlib, it is of mainly historical interest. + +Package: kxterm +Architecture: any +Section: science +Depends: ${shlibs:Depends}, cernlib-base +Description: Cernlib's KUIP terminal emulator + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KXterm is a terminal emulator which combines the best features from + the (now defunct) Apollo DM pads (like: input and transcript [...21456 lines suppressed...] +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ./pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, C??? hai" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd" + +#. Type: select +#. Description +#: ./pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po +++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-05-26 16:05-0300\n" +"Last-Translator: Andr? Lu?s Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a serem executados a partir do inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos " +"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv " +"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP " +"do CERN). Esses servidores s?o executados a partir do inetd; voc? " +"pode habilitar cada um deles separadamente ou ambos. A menos que voc? " +"possua necessidades bastante especializadas, voc? provavelmente ir? " +"desejar habilitar somente o pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po +++ cernlib-2005.05.09.dfsg/debian/po/sv.po @@ -0,0 +1,53 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib 2005.05.09-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-10-06 23:50+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, B?da" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servrar som ska k?ras fr?n inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att " +"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem " +"att logga in med CERN's ZFTP-protokoll). Dessa servrar k?rs fr?n inetd; du m?ste " +"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott " +"om pawserv aktiveras." + --- cernlib-2005.05.09.dfsg.orig/debian/po/es.po +++ cernlib-2005.05.09.dfsg/debian/po/es.po @@ -0,0 +1,55 @@ +# cernlib po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the cernlib package. +# +# Changes: +# - Initial translation +# C??sar G??mez Mart??n +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentaci??n de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducci??n de Debian al espa??ol +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducci??n en +# http://www.debian.org/intl/spanish/notas +# +# - La gu??a de traducci??n de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-09-01 17:49+0100\n" +"Last-Translator: C??sar G??mez Mart??n \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a ejecutar desde inetd" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol). These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv." +msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++) y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv." + Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 112-remove-nonexistent-prototypes-from-gen.h.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch 17 May 2006 13:02:50 -0000 1.2 @@ -68,19 +68,6 @@ PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT) #define FREQ(A2) CCALLSFFUN1(FREQ,freq,FLOAT,A2) -@@ -255,10 +255,10 @@ - - PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE) - #define DFRSIN(A2) CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2) -- -+/* - PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV) - #define FUN(A2,A3) CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3) -- -+*/ - PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT) - #define G116F1(A2) CCALLSFFUN1(G116F1,g116f1,FLOAT,A2) - @@ -270,10 +270,10 @@ PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT) Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 805-expunge-missing-mathlib-kernlib-symbols.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch 17 May 2006 13:02:50 -0000 1.2 @@ -5,9 +5,9 @@ ## DP: Remove some unreferenced symbols from mathlib and kernlib. @DPATCH@ -diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile ---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2005-06-13 11:20:33.838151240 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:37.545106161 -0400 ++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:48.094863874 -0400 @@ -1,6 +1,8 @@ #ifndef CERNLIB_VAXVMS @@ -18,9 +18,9 @@ readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\ tmproi.F toslat.F unlinkf.F -diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:12:24.894703741 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:16:54.864966246 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:38.432917462 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:48.095863661 -0400 @@ -2,20 +2,22 @@ #include "pilot.h" @@ -50,25 +50,29 @@ #if defined(CERNLIB_DOUBLE) SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\ -diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 2005-06-13 11:19:42.456136998 -0400 -@@ -1,9 +1,12 @@ --SRCS_F= addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\ -- bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\ -- dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\ -- grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ -- newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ -- quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ -+/* Some files deleted from the below list since they depend upon the -+ lepto63 library, which cannot be included in Debian for licensing reasons. */ -+ -+SRCS_F= addbnd.F bfgs.F bndtst.F bounds.F bucmve.F \ @@\ -+ delbnd.F delete.F dvcopy.F dvdot.F \ @@\ -+ dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F \ @@\ -+ ldlsol.F modchl.F mxstep.F \ @@\ -+ newptq.F nmdchl.F nodaud.F orthvc.F quad.F \ @@\ -+ quasi.F ranums.F rlen.F settol.F shrnk.F \ @@\ - treaud.F tredmp.F tstext.F usrint.F usrtrm.F +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile 2006-05-09 17:00:05.429179570 -0400 +@@ -4,7 +4,7 @@ + grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ + newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ + quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ +- treaud.F tredmp.F tstext.F usrint.F usrtrm.F ++ treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F FORTRANSAVEOPTION = FortranSaveFlags + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F 1969-12-31 19:00:00.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F 2006-05-09 17:01:10.196413696 -0400 +@@ -0,0 +1,10 @@ ++C----------------------------------------------------------------------- ++ FUNCTION DFUN(ND,X) ++C----------------------------------------------------------------------- ++C DUMMY FUNCTION ++C----------------------------------------------------------------------- ++ DOUBLE PRECISION DFUN, X(ND) ++ WRITE (6,10) ++ 10 FORMAT(/10X,'DFUN CALLED BUT NOT LINKED') ++ STOP ++ END Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- cernlib.spec 13 Apr 2006 22:53:56 -0000 1.30 +++ cernlib.spec 17 May 2006 13:02:50 -0000 1.31 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 19%{?dist} +Release: 20%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -28,6 +28,7 @@ %endif # for patchy build scripts BuildRequires: tcsh +BuildRequires: gawk # there are missing f2c intrinsics in gfortran so gfortran cannot be used to # build the cernlib BuildRequires: /usr/bin/g77 @@ -81,7 +82,7 @@ Source201: cernlib-deadpool.txt # debian patchset -Patch0: cernlib_2005.05.09.dfsg-5.diff +Patch0: cernlib_2005.05.09.dfsg-6.diff # change file to directory to DATADIR Patch1100: cernlib-enforce-FHS.diff Patch1: 001-fix-missing-fluka.dpatch @@ -744,7 +745,6 @@ %doc cernlib.README copyright %doc debian/debhelper/geant321.README.debian %doc debian/debhelper/libpdflib804-2-dev.README.debian -%doc debian/debhelper/libmathlib2.README.debian %doc debian/debhelper/montecarlo-base.README.debian # the utils and devel are separated to have the possibility to install @@ -830,6 +830,9 @@ %changelog +* Wed May 17 2006 Patrice Dumas - 2005-20 +- use new debian patchset. Fix 191631 + * Tue Apr 13 2006 Patrice Dumas - 2005-19 - add a patch to yexpand, to avoid using $HOME. --- cernlib_2005.05.09.dfsg-5.diff DELETED --- From fedora-extras-commits at redhat.com Wed May 17 13:23:00 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 17 May 2006 06:23:00 -0700 Subject: fedora-security/audit fe4,1.22,1.23 fe5,1.20,1.21 Message-ID: <200605171323.k4HDN0hf022384@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22364 Modified Files: fe4 fe5 Log Message: Note a new clamav CVE id. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fe4 12 May 2006 20:48:08 -0000 1.22 +++ fe4 17 May 2006 13:22:57 -0000 1.23 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2427 VULNERABLE (clamav) bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fe5 12 May 2006 20:48:08 -0000 1.20 +++ fe5 17 May 2006 13:22:57 -0000 1.21 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2427 VULNERABLE (clamav) bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 From fedora-extras-commits at redhat.com Wed May 17 13:23:45 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 17 May 2006 06:23:45 -0700 Subject: rpms/swaks/devel swaks.spec,1.1,1.2 Message-ID: <200605171323.k4HDNlGb022416@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22399 Modified Files: swaks.spec Log Message: * Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 - Correct Authen:DigestMD5 typo. Index: swaks.spec =================================================================== RCS file: /cvs/extras/rpms/swaks/devel/swaks.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- swaks.spec 15 May 2006 17:15:01 -0000 1.1 +++ swaks.spec 17 May 2006 13:23:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: swaks Version: 20050709.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command-line SMTP transaction tester Group: Applications/Internet @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(Authen:DigestMD5) +Requires: perl(Authen::DigestMD5) Requires: perl(Net::DNS) Requires: perl(Net::SSLeay) Requires: perl(Time::HiRes) @@ -40,6 +40,9 @@ %{_mandir}/man1/* %changelog +* Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 +- Correct Authen:DigestMD5 typo. + * Mon May 15 2006 Jason L Tibbitts III - 20050709.1-5 - Add Authen::DigestMD5 requirement now that it's in Extras. From fedora-extras-commits at redhat.com Wed May 17 13:30:20 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 17 May 2006 06:30:20 -0700 Subject: rpms/swaks/FC-5 swaks.spec,1.1,1.2 Message-ID: <200605171330.k4HDUMxx022507@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22490 Modified Files: swaks.spec Log Message: * Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 - Correct Authen:DigestMD5 typo. Index: swaks.spec =================================================================== RCS file: /cvs/extras/rpms/swaks/FC-5/swaks.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- swaks.spec 15 May 2006 17:15:01 -0000 1.1 +++ swaks.spec 17 May 2006 13:30:19 -0000 1.2 @@ -1,6 +1,6 @@ Name: swaks Version: 20050709.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command-line SMTP transaction tester Group: Applications/Internet @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(Authen:DigestMD5) +Requires: perl(Authen::DigestMD5) Requires: perl(Net::DNS) Requires: perl(Net::SSLeay) Requires: perl(Time::HiRes) @@ -40,6 +40,9 @@ %{_mandir}/man1/* %changelog +* Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 +- Correct Authen:DigestMD5 typo. + * Mon May 15 2006 Jason L Tibbitts III - 20050709.1-5 - Add Authen::DigestMD5 requirement now that it's in Extras. From fedora-extras-commits at redhat.com Wed May 17 13:33:05 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 17 May 2006 06:33:05 -0700 Subject: rpms/swaks/FC-4 swaks.spec,1.1,1.2 Message-ID: <200605171333.k4HDX7xB022581@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22564 Modified Files: swaks.spec Log Message: * Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 - Correct Authen:DigestMD5 typo. Index: swaks.spec =================================================================== RCS file: /cvs/extras/rpms/swaks/FC-4/swaks.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- swaks.spec 15 May 2006 17:15:01 -0000 1.1 +++ swaks.spec 17 May 2006 13:33:04 -0000 1.2 @@ -1,6 +1,6 @@ Name: swaks Version: 20050709.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command-line SMTP transaction tester Group: Applications/Internet @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(Authen:DigestMD5) +Requires: perl(Authen::DigestMD5) Requires: perl(Net::DNS) Requires: perl(Net::SSLeay) Requires: perl(Time::HiRes) @@ -40,6 +40,9 @@ %{_mandir}/man1/* %changelog +* Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 +- Correct Authen:DigestMD5 typo. + * Mon May 15 2006 Jason L Tibbitts III - 20050709.1-5 - Add Authen::DigestMD5 requirement now that it's in Extras. From fedora-extras-commits at redhat.com Wed May 17 13:41:14 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 17 May 2006 06:41:14 -0700 Subject: extras-repoclosure rc-run.py,1.2,1.3 Message-ID: <200605171341.k4HDfECj022716@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22698 Modified Files: rc-run.py Log Message: make it possible that one job interrupts a running job gracefully Index: rc-run.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rc-run.py 13 May 2006 00:13:40 -0000 1.2 +++ rc-run.py 17 May 2006 13:41:11 -0000 1.3 @@ -7,6 +7,9 @@ import datetime, time import tempfile +workdir = '/srv/rpmbuild/extras-repoclosure' +breakfile = 'rc-run.breakfile' + allreleases = [ '3', '4', '5', 'development' ] archs = { '3' : ['i386','x86_64'], @@ -75,24 +78,43 @@ return conffile +def checkbreakfile(): + # If the breakfile exists, we terminate prematurely, so another job + # can take over (= clumsy restart without killing metadata processing). + f = os.path.join(workdir,breakfile) + if not os.path.exists(f): + return + try: + os.remove(f) + except: + print 'ERROR: Removing breakfile %s failed!' % f + pass + sys.exit(1) + + def makereport(): try: os.remove(logfilename) except: pass for arch in archs[release]: + print '%s (%s)' % (release,arch) rcargs = ('-a %s ' % targetarchs[arch]) for r in repos[release]: repoid = '%s-%s-%s' % (r,release,arch) rcargs += ('-r %s ' % repoid) # -n, --newest : yum-utils 0.5 rc = os.system('./rc-modified -q -n -c %s %s >> %s' % (conffile,rcargs,logfilename)) + checkbreakfile() if rc: return False return True # Main. +cwd = os.getcwd() +os.chdir(workdir) + # Delete old log files. import glob now = time.time() @@ -106,12 +128,16 @@ today = datetime.date.today() releases = [] -f = open('rc-run.lockfile','w') +lockfilename = 'rc-run.lockfile' +f = open(lockfilename,'w') try: - rc = fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB) + print "Trying to acquire lock file:", + sys.stdout.flush() + rc = fcntl.flock(f, fcntl.LOCK_EX) f.write( ('%s' % today) ) -except IOError: - print 'ERROR: script locked via lockfile - it seems to be running already' + print "OK" +except IOError (errno, strerr): + print 'ERROR: %s: %s' % (strerr,lockfilename) sys.exit(11) if sys.argv[0].endswith('rc-run-all.py'): # process all releases @@ -149,4 +175,5 @@ fcntl.flock(f, fcntl.LOCK_UN) f.close() +os.chdir(cwd) sys.exit(0) From fedora-extras-commits at redhat.com Wed May 17 14:00:38 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 17 May 2006 07:00:38 -0700 Subject: extras-buildsys/server Repo.py,1.23,1.24 Message-ID: <200605171400.k4HE0c1p022806@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22788 Modified Files: Repo.py Log Message: Fix debuginfo rpm glob (Patch from Michael Schwendt ) Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Repo.py 24 Mar 2006 01:34:48 -0000 1.23 +++ Repo.py 17 May 2006 14:00:35 -0000 1.24 @@ -225,7 +225,7 @@ 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)) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*-debuginfo-*" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: print "Repo Error (%s): createrepo failed with exit status %d! Output: '%s'" % (self._target_cfg.target_string(), s, o) From fedora-extras-commits at redhat.com Wed May 17 14:02:00 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 17 May 2006 07:02:00 -0700 Subject: extras-buildsys/server Repo.py,1.16.2.3,1.16.2.4 Message-ID: <200605171402.k4HE20ZL025044@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25028/server Modified Files: Tag: STABLE_0_4 Repo.py Log Message: Fix debuginfo rpm glob (Patch from Michael Schwendt ) Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.16.2.3 retrieving revision 1.16.2.4 diff -u -r1.16.2.3 -r1.16.2.4 --- Repo.py 29 Nov 2005 06:36:44 -0000 1.16.2.3 +++ Repo.py 17 May 2006 14:01:46 -0000 1.16.2.4 @@ -118,7 +118,7 @@ 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)) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*-debuginfo-*" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: print "Error: createrepo failed with exit status %d! Output: '%s'" % (s, o) From fedora-extras-commits at redhat.com Wed May 17 14:29:29 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:29:29 -0700 Subject: rpms/perl-Expect-Simple - New directory Message-ID: <200605171429.k4HETV9h025287@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25261/perl-Expect-Simple Log Message: Directory /cvs/extras/rpms/perl-Expect-Simple added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:29:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:29:30 -0700 Subject: rpms/perl-Expect-Simple/devel - New directory Message-ID: <200605171429.k4HETW32025290@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25261/perl-Expect-Simple/devel Log Message: Directory /cvs/extras/rpms/perl-Expect-Simple/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:29:46 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:29:46 -0700 Subject: rpms/perl-Expect-Simple Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605171429.k4HETmLl025336@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25306 Added Files: Makefile import.log Log Message: Setup of module perl-Expect-Simple --- NEW FILE Makefile --- # Top level Makefile for module perl-Expect-Simple all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed May 17 14:29:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:29:47 -0700 Subject: rpms/perl-Expect-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605171429.k4HETnfH025340@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25306/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Expect-Simple --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed May 17 14:30:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:30:19 -0700 Subject: rpms/perl-Expect-Simple import.log,1.1,1.2 Message-ID: <200605171430.k4HEULj1025419@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25384 Modified Files: import.log Log Message: auto-import perl-Expect-Simple-0.02-1 on branch devel from perl-Expect-Simple-0.02-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Expect-Simple/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 14:29:46 -0000 1.1 +++ import.log 17 May 2006 14:30:18 -0000 1.2 @@ -0,0 +1 @@ +perl-Expect-Simple-0_02-1:HEAD:perl-Expect-Simple-0.02-1.src.rpm:1147876210 From fedora-extras-commits at redhat.com Wed May 17 14:30:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:30:19 -0700 Subject: rpms/perl-Expect-Simple/devel perl-Expect-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605171430.k4HEULO4025424@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25384/devel Modified Files: .cvsignore sources Added Files: perl-Expect-Simple.spec Log Message: auto-import perl-Expect-Simple-0.02-1 on branch devel from perl-Expect-Simple-0.02-1.src.rpm --- NEW FILE perl-Expect-Simple.spec --- Name: perl-Expect-Simple Version: 0.02 Release: 1%{?dist} Summary: Wrapper around the Expect module Group: Development/Libraries License: GPL URL: http://search.cpan.org/dist/Expect-Simple/ Source0: http://www.cpan.org/authors/id/D/DJ/DJERIUS/Expect-Simple-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Expect) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Expect::Simple is a wrapper around the Expect module which should suffice for simple applications. It hides most of the Expect machinery; the Expect object is available for tweaking if need be. %prep %setup -q -n Expect-Simple-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE README %{perl_vendorlib}/Expect/ %{_mandir}/man3/*.3pm* %changelog * Wed May 10 2006 Jose Pedro Oliveira - 0.02-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Expect-Simple/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 14:29:46 -0000 1.1 +++ .cvsignore 17 May 2006 14:30:19 -0000 1.2 @@ -0,0 +1 @@ +Expect-Simple-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Expect-Simple/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 14:29:46 -0000 1.1 +++ sources 17 May 2006 14:30:19 -0000 1.2 @@ -0,0 +1 @@ +23c72fa4461f07522eb8c8511bad5d43 Expect-Simple-0.02.tar.gz From fedora-extras-commits at redhat.com Wed May 17 14:31:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:19 -0700 Subject: rpms/perl-Test-Expect - New directory Message-ID: <200605171431.k4HEVLUh025539@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25513/perl-Test-Expect Log Message: Directory /cvs/extras/rpms/perl-Test-Expect added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:31:20 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:20 -0700 Subject: rpms/perl-Test-Expect/devel - New directory Message-ID: <200605171431.k4HEVMRt025542@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25513/perl-Test-Expect/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Expect/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:31:36 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:36 -0700 Subject: rpms/perl-Test-Expect Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605171431.k4HEVcnp025588@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25558 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Expect --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Expect all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 17 14:31:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:37 -0700 Subject: rpms/perl-Test-Expect/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605171431.k4HEVdTG025591@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25558/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Expect --- NEW 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 May 17 14:31:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:47 -0700 Subject: owners owners.list,1.1012,1.1013 Message-ID: <200605171431.k4HEVnOp025627@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25606 Modified Files: owners.list Log Message: New packages: perl-Expect-Simple (#191623) and perl-Text-Expect (#191624) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1012 retrieving revision 1.1013 diff -u -r1.1012 -r1.1013 --- owners.list 17 May 2006 03:35:07 -0000 1.1012 +++ owners.list 17 May 2006 14:31:47 -0000 1.1013 @@ -1015,6 +1015,7 @@ Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Expect|Expect for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Expect-Simple|Wrapper around the Expect 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-AutoInstall|Automatic install of dependencies via CPAN|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-CBuilder|Compile and link C code for Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1197,6 +1198,7 @@ Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Differences|Test strings and data structures and show differences if not ok|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-Expect|Automated driving and testing of terminal-based programs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Inline|Test::Inline Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Manifest|Test case module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed May 17 14:32:08 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:32:08 -0700 Subject: rpms/perl-Test-Expect import.log,1.1,1.2 Message-ID: <200605171432.k4HEWARY025684@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25651 Modified Files: import.log Log Message: auto-import perl-Test-Expect-0.30-1 on branch devel from perl-Test-Expect-0.30-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Expect/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 14:31:36 -0000 1.1 +++ import.log 17 May 2006 14:32:08 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Expect-0_30-1:HEAD:perl-Test-Expect-0.30-1.src.rpm:1147876320 From fedora-extras-commits at redhat.com Wed May 17 14:32:09 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:32:09 -0700 Subject: rpms/perl-Test-Expect/devel perl-Test-Expect.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605171432.k4HEWBM2025690@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25651/devel Modified Files: .cvsignore sources Added Files: perl-Test-Expect.spec Log Message: auto-import perl-Test-Expect-0.30-1 on branch devel from perl-Test-Expect-0.30-1.src.rpm --- NEW FILE perl-Test-Expect.spec --- Name: perl-Test-Expect Version: 0.30 Release: 1%{?dist} Summary: Automated driving and testing of terminal-based programs Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Expect/ Source0: http://www.cpan.org/authors/id/L/LB/LBROCARD/Test-Expect-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Class::Accessor::Chained::Fast) BuildRequires: perl(Expect::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Test::Expect is a module for automated driving and testing of terminal-based programs. It is handy for testing interactive programs which have a prompt, and is based on the same concepts as the Tcl Expect tool. As in Expect::Simple, the Expect object is made available for tweaking. Test::Expect is intended for use in a test script. %prep %setup -q -n Test-Expect-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/Test/ %{_mandir}/man3/*.3pm* %changelog * Wed May 10 2006 Jose Pedro Oliveira - 0.30-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Expect/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 14:31:36 -0000 1.1 +++ .cvsignore 17 May 2006 14:32:08 -0000 1.2 @@ -0,0 +1 @@ +Test-Expect-0.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Expect/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 14:31:36 -0000 1.1 +++ sources 17 May 2006 14:32:08 -0000 1.2 @@ -0,0 +1 @@ +b22cb4575d910bb2d36e506a958da300 Test-Expect-0.30.tar.gz From fedora-extras-commits at redhat.com Wed May 17 14:44:35 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:44:35 -0700 Subject: rpms/goupil/devel - New directory Message-ID: <200605171444.k4HEibeR025890@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25861/goupil/devel Log Message: Directory /cvs/extras/rpms/goupil/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:44:35 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:44:35 -0700 Subject: rpms/goupil - New directory Message-ID: <200605171444.k4HEibDF025887@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25861/goupil Log Message: Directory /cvs/extras/rpms/goupil added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:44:52 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:44:52 -0700 Subject: rpms/goupil/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605171444.k4HEiskY025944@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25908/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module goupil --- NEW 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 May 17 14:44:51 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:44:51 -0700 Subject: rpms/goupil Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605171444.k4HEirKW025941@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25908 Added Files: Makefile import.log Log Message: Setup of module goupil --- NEW FILE Makefile --- # Top level Makefile for module goupil all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 17 14:45:53 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:45:53 -0700 Subject: rpms/goupil import.log,1.1,1.2 Message-ID: <200605171445.k4HEjtPX026007@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25974 Modified Files: import.log Log Message: auto-import goupil-0.1.0-1 on branch devel from goupil-0.1.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/goupil/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 14:44:51 -0000 1.1 +++ import.log 17 May 2006 14:45:53 -0000 1.2 @@ -0,0 +1 @@ +goupil-0_1_0-1:HEAD:goupil-0.1.0-1.src.rpm:1147877173 From fedora-extras-commits at redhat.com Wed May 17 14:45:54 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:45:54 -0700 Subject: rpms/goupil/devel goupil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605171445.k4HEju8x026012@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25974/devel Modified Files: .cvsignore sources Added Files: goupil.spec Log Message: auto-import goupil-0.1.0-1 on branch devel from goupil-0.1.0-1.src.rpm --- NEW FILE goupil.spec --- Name: goupil Version: 0.1.0 Release: 1%{?dist} Summary: An association membership management tool for the GNOME environment Group: Applications/Databases License: GPL URL: http://goupil.tuxfamily.org/ Source0: http://goupil.tuxfamily.org/downloads/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, evolution-data-server-devel, gtkmm24-devel, libglademm24-devel, gnome-vfsmm26-devel, sqlite-devel %description Goupil is A GNOME desktop application to manages your association or foundation memberships. Goupil helps you manage the memberships of your associations. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYRIGHT INSTALL NEWS README %{_bindir}/%{name} %{_libdir}/* %{_datadir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png %{_includedir}/* %changelog * Sun Apr 14 2006 Damien Durand - 0.1.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/goupil/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 14:44:52 -0000 1.1 +++ .cvsignore 17 May 2006 14:45:54 -0000 1.2 @@ -0,0 +1 @@ +goupil-0.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/goupil/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 14:44:52 -0000 1.1 +++ sources 17 May 2006 14:45:54 -0000 1.2 @@ -0,0 +1 @@ +38f338340731b729cde6e8a0afc9ea71 goupil-0.1.0.tar.gz From fedora-extras-commits at redhat.com Wed May 17 14:49:36 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:49:36 -0700 Subject: owners owners.list,1.1013,1.1014 Message-ID: <200605171449.k4HEncTU026075@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058 Modified Files: owners.list Log Message: Add goupil Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1013 retrieving revision 1.1014 diff -u -r1.1013 -r1.1014 --- owners.list 17 May 2006 14:31:47 -0000 1.1013 +++ owners.list 17 May 2006 14:49:36 -0000 1.1014 @@ -420,6 +420,7 @@ Fedora Extras|goffice|Goffice support libraries|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gonvert|Units conversion utility|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|goupil|An association membership management tool for the GNOME environment|splinux at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|gpa|Graphical user interface for GnuPG|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 17 15:12:38 2006 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Wed, 17 May 2006 08:12:38 -0700 Subject: mock mock.py,1.49,1.50 Message-ID: <200605171512.k4HFCc8j028457@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28439 Modified Files: mock.py Log Message: Michael E. Brown's patch for getting PS1 down to chroot shell Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- mock.py 16 May 2006 04:15:48 -0000 1.49 +++ mock.py 17 May 2006 15:12:36 -0000 1.50 @@ -758,12 +758,12 @@ else: print 'Finished cleaning root' -def do_run_cmd(config_opts, cmd, raw_chroot=0): +def do_run_cmd(config_opts, cmd, env='', raw_chroot=0): my = Root(config_opts) my.debug("executing: %s" % cmd) my._mount() if raw_chroot: - cmd = '%s %s %s' % (config_opts['chroot'], my.rootdir, cmd) + cmd = '%s %s %s %s' % (env, config_opts['chroot'], my.rootdir, cmd) os.system(cmd) else: my.do_chroot(cmd, True) @@ -885,8 +885,7 @@ elif args[0] == 'shell': # debugging tool for interactive poking around in the chroot config_opts['clean'] = config_opts['quiet'] = False - os.environ['PS1'] = "mock-chroot> " - do_run_cmd(config_opts, "/bin/bash", raw_chroot=1) + do_run_cmd(config_opts, "/bin/bash", env='PS1="mock-chroot> "', raw_chroot=1) else: if args[0] == 'rebuild': From fedora-extras-commits at redhat.com Wed May 17 15:14:46 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 17 May 2006 08:14:46 -0700 Subject: fedora-security/audit fc4,1.251,1.252 fc5,1.166,1.167 Message-ID: <200605171514.k4HFEkaJ028488@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28468 Modified Files: fc4 fc5 Log Message: Note an openobex issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- fc4 16 May 2006 20:38:52 -0000 1.251 +++ fc4 17 May 2006 15:14:44 -0000 1.252 @@ -5,6 +5,7 @@ CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] +CVE-2006-2366 VULNERABLE (openobex) #192087 CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- fc5 17 May 2006 08:20:33 -0000 1.166 +++ fc5 17 May 2006 15:14:44 -0000 1.167 @@ -5,6 +5,7 @@ CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] +CVE-2006-2366 VULNERABLE (openobex) #192087 CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 From fedora-extras-commits at redhat.com Wed May 17 15:26:45 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 17 May 2006 08:26:45 -0700 Subject: comps comps-fe6.xml,1.2,1.3 Message-ID: <200605171526.k4HFQlsf028568@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28546 Modified Files: comps-fe6.xml Log Message: Added crossfire client Index: comps-fe6.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- comps-fe6.xml 9 May 2006 22:13:55 -0000 1.2 +++ comps-fe6.xml 17 May 2006 15:26:45 -0000 1.3 @@ -200,6 +200,7 @@ bzflag celestia cgoban + crossfire-client crystal-stacker crystal-stacker-themes csmash @@ -813,4 +814,4 @@ network-server - \ No newline at end of file + From fedora-extras-commits at redhat.com Wed May 17 15:35:10 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 17 May 2006 08:35:10 -0700 Subject: rpms/cernlib/FC-5 211-fix-comis-on-ia64-alpha.dpatch, NONE, 1.1 319-work-around-imake-segfaults.dpatch, NONE, 1.1 cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 patchy-case.patch, NONE, 1.1 patchy-fcasplit.patch, NONE, 1.1 patchy-insecure_tmp_use.diff, NONE, 1.1 patchy-p4comp.patch, NONE, 1.1 patchy-perror.patch, NONE, 1.1 patchy-rceta.patch, NONE, 1.1 patchy-unpack-rceta, NONE, 1.1 patchy-yexpand.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 307-use-canonical-cfortran.dpatch, 1.2, 1.3 800-implement-shared-library-rules-in-Imake.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib-gfortran.diff, 1.1, 1.2 cernlib.spec, 1.19, 1.20 paw.README, 1.3, 1.4 sources, 1.3, 1.4 211-fix-comis-on-ia64.dpatch, 1.1, NONE cernlib_2005.05.09.dfsg-3.diff, 1.1, NONE Message-ID: <200605171535.k4HFZCHw028719@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28654 Modified Files: .cvsignore 112-remove-nonexistent-prototypes-from-gen.h.dpatch 307-use-canonical-cfortran.dpatch 800-implement-shared-library-rules-in-Imake.dpatch 805-expunge-missing-mathlib-kernlib-symbols.dpatch cernlib-gfortran.diff cernlib.spec paw.README sources Added Files: 211-fix-comis-on-ia64-alpha.dpatch 319-work-around-imake-segfaults.dpatch cernlib_2005.05.09.dfsg-6.diff patchy-case.patch patchy-fcasplit.patch patchy-insecure_tmp_use.diff patchy-p4comp.patch patchy-perror.patch patchy-rceta.patch patchy-unpack-rceta patchy-yexpand.diff Removed Files: 211-fix-comis-on-ia64.dpatch cernlib_2005.05.09.dfsg-3.diff Log Message: sync with devel branch --- NEW FILE 211-fix-comis-on-ia64-alpha.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 211-fix-comis-on-ia64-alpha.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Further patch building on Harald Vogt's amd64 patch attempting to ## DP: fix PAW on Itanium/Alpha Linux. This does not yet work completely... @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:45.236828642 -0500 @@ -39,12 +39,45 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *nn; { int i,n; char *a,*b; n=*nn; a=*ja; b=*jb; +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *nn; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:51:18.796348318 -0500 @@ -74,6 +74,24 @@ /* printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else double (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:51:05.440199025 -0500 @@ -67,6 +67,24 @@ /* printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else int (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:50:47.519024096 -0500 @@ -89,6 +89,24 @@ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; double r; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else float (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:45.236828642 -0500 @@ -42,6 +42,27 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *na, *nb; @@ -56,6 +77,18 @@ { a=*jb; b=*ja; la=*nb; lb=*na; k=-1; } +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *na, *nb; --- NEW FILE 319-work-around-imake-segfaults.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 319-work-around-imake-segfaults.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: If at first Imake doesn't succeed, try, try again. ## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.) @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules --- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:35:09.050384887 -0500 +++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:38:18.693611381 -0500 @@ -1296,7 +1296,11 @@ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - imakeflags -f $< + imakeflags -f $< || \ @@\ + $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + imakeflags -f $< || exit 1 #endif /* BuildMakefileTarget */ @@ -2127,7 +2131,11 @@ ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ - -DPackageName=$(PACKAGE_NAME); \ @@\ + -DPackageName=$(PACKAGE_NAME) || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) || exit 1; \ @@\ fi; \ @@\ $(MAKE) $(MFLAGS) Makefiles; \ @@\ cd $$newtop; \ @@\ @@ -2322,7 +2330,12 @@ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - -f $$imakefile; \ @@\ + -f $$imakefile || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + -f $$imakefile || exit 1; \ @@\ fi; \ @@\ fi; #endif cernlib_2005.05.09.dfsg-6.diff: --- NEW FILE cernlib_2005.05.09.dfsg-6.diff --- --- cernlib-2005.05.09.dfsg.orig/debian/control +++ cernlib-2005.05.09.dfsg/debian/control @@ -0,0 +1,896 @@ +Source: cernlib +Maintainer: Kevin B. McCarty +Standards-Version: 3.7.2 +Priority: optional +Section: science +Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin + +Package: cernlib-base +Architecture: all +Section: devel +Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev +Description: script to determine Cernlib library dependencies + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This package includes the "cernlib" script that lists the command-line + options needed for linking against Cernlib libraries. The script has + been rewritten from the upstream version to calculate + dependencies recursively. Also included are a README.Debian with a summary + of changes made to Cernlib to fit it into Debian packaging practices, + and a contributed set of Autoconf macros to test for Cernlib libraries. + +Package: cernlib-core-dev +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit +Description: Cernlib development headers, tools, and static libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the header files and static libraries likely to be + wanted by developers using the Cern libraries who are not interested + specifically in high energy physics. It also provides the Cernlib + development tools DZedit and KUIPC. Cernlib analysis programs may be + obtained by installing the cernlib-core metapackage. + +Package: cernlib-core +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos +Description: Cernlib main libraries and programs + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the libraries and analysis tools (e.g. PAW) likely + to be wanted by most users of the Cern libraries who are not interested + specifically in high energy physics. You cannot do program development by + installing only this metapackage; development libraries and tools may + be obtained by installing the cernlib-core-dev metapackage or individual + lib*-dev packages. + +Package: cernlib-extras +Architecture: all +Priority: extra +Section: science +Depends: cernlib-base (= ${Source-Version}), pawserv, zftp +Description: miscellaneous Cernlib programs unlikely to be used by many + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides a few additional Cernlib programs not included + in any other Cernlib metapackage. Very few people are likely to be + interested in them; currently they include zftp, pawserv and zserv. + Notice that the latter two programs run as daemons through inetd and may + reduce your system's security! + . + Installing this package along with the "cernlib" metapackage will supply + a complete set of all Cernlib programs and libraries included in Debian. + +Package: cernlib-montecarlo +Architecture: all +Section: science +Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev +Recommends: libisajet758-2-dev +Description: Cernlib Monte Carlo libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides various Monte Carlo libraries included in Cernlib + (both shared and static). Likely only physicists will be interested in + these packages. Note that the Geant 3.21 program is not included, but it may + be obtained by also installing the geant321 Debian package. + . + Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are + not available within Debian due to licensing issues; see the README.Debian + file in the montecarlo-base package for information on obtaining them. + . + Additionally, the Isajet library is not available on the m68k architecture + due to a compiler flaw. + +Package: cernlib +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev +Description: almost complete set of Debian Cernlib packages + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides almost all of the programs and libraries contained + in Cernlib. Most people will likely want only a subset of these. A few + extra Cernlib programs, not of interest to many people, may be obtained via + the cernlib-extras metapackage. + +Package: dzedit +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libpacklib1-dev +Description: Cernlib's ZEBRA documentation editor + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system + developed at CERN. ZEBRA, part of the Packlib library, permits a developer to + create complex data structures in the FORTRAN 77 language; the DZDOC system + allows the developer to generate and maintain documentation of ZEBRA data + structures. + +Package: geant321-data +Architecture: all +Section: science +Depends: cernlib-base +Description: [Physics] Data for Geant 3.21 detector simulator + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes data files for use by Geant. + +Package: geant321-doc +Architecture: all +Section: doc +Depends: cernlib-base +Description: [Physics] Documentation for Geant 3.21 + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes some documentation about Geant. + +Package: geant321 +Architecture: all +Section: science +Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77 +Suggests: kxterm, geant321-doc +Description: [Physics] Particle detector description and simulation tool + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes gxint, the script used to perform this linking step. + +Package: kuipc +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, cernlib-base +Recommends: libpacklib1-dev +Suggests: libpacklib1-lesstif-dev +Description: Cernlib's Kit for a User Interface Package (KUIP) compiler + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify + the writing of a program's user interface code. It takes as + input a Command Definition File (CDF) that describes the + commands to be understood by the program, and outputs C or FORTRAN code that + makes the appropriate function calls to set up the user interface. This + code can then be compiled and linked with the rest of the program. Since + the generated code uses KUIP routines, the program must also be linked + against the Packlib library that contains them. + . + KUIPC is no longer actively developed, so aside from its use in the build + process of Cernlib, it is of mainly historical interest. + +Package: kxterm +Architecture: any +Section: science +Depends: ${shlibs:Depends}, cernlib-base +Description: Cernlib's KUIP terminal emulator + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KXterm is a terminal emulator which combines the best features from + the (now defunct) Apollo DM pads (like: input and transcript [...21456 lines suppressed...] +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ./pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, C??? hai" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd" + +#. Type: select +#. Description +#: ./pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po +++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-05-26 16:05-0300\n" +"Last-Translator: Andr? Lu?s Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a serem executados a partir do inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos " +"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv " +"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP " +"do CERN). Esses servidores s?o executados a partir do inetd; voc? " +"pode habilitar cada um deles separadamente ou ambos. A menos que voc? " +"possua necessidades bastante especializadas, voc? provavelmente ir? " +"desejar habilitar somente o pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po +++ cernlib-2005.05.09.dfsg/debian/po/sv.po @@ -0,0 +1,53 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib 2005.05.09-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-10-06 23:50+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, B?da" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servrar som ska k?ras fr?n inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att " +"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem " +"att logga in med CERN's ZFTP-protokoll). Dessa servrar k?rs fr?n inetd; du m?ste " +"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott " +"om pawserv aktiveras." + --- cernlib-2005.05.09.dfsg.orig/debian/po/es.po +++ cernlib-2005.05.09.dfsg/debian/po/es.po @@ -0,0 +1,55 @@ +# cernlib po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the cernlib package. +# +# Changes: +# - Initial translation +# C??sar G??mez Mart??n +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentaci??n de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducci??n de Debian al espa??ol +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducci??n en +# http://www.debian.org/intl/spanish/notas +# +# - La gu??a de traducci??n de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-09-01 17:49+0100\n" +"Last-Translator: C??sar G??mez Mart??n \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a ejecutar desde inetd" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol). These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv." +msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++) y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv." + patchy-case.patch: --- NEW FILE patchy-case.patch --- --- 2004.orig/src/patchy/Imakefile 2006-04-13 11:15:58.000000000 +0200 +++ 2004/src/patchy/Imakefile 2006-04-13 11:27:07.000000000 +0200 @@ -54,7 +54,7 @@ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile ypatchy - p5lib p5lib TTY .go - fcasplit p5lib.f + ./fcasplit p5lib.f RemoveFile(p5lib.f) cat p5lib.libmake >> p5lib.mkfca $(MAKE) -f p5lib.mkfca $@ @@ -79,8 +79,8 @@ @ ln -s $< $@ %.f: $(LDIR)%.cra $(LDIR)patchy.car - ypatchy - $@ $< TTY .go - + ypatchy - :$@ :$< TTY .go + .f.o: $(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $< @@ -92,9 +92,9 @@ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \ ysearch yshift ytobcd ytobin ytoceta -P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)) +P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)) -$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)): +$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)): cd $(dir $@); \ @@\ if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\ ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\ patchy-fcasplit.patch: --- NEW FILE patchy-fcasplit.patch --- --- patchy/fcasplit.f.orig 2006-04-10 01:06:32.000000000 +0200 +++ patchy/fcasplit.f 2006-04-10 01:16:05.000000000 +0200 @@ -23,7 +23,7 @@ PARAMETER (CHIDA = ';DECK I' ) PARAMETER (CHOVER= 'UNKNOWN') - PARAMETER (CHPOF = '-c -O2 -Nx800 -Nc200') + PARAMETER (CHPOF = '-c -O2') PARAMETER (CHPOC = '-c -O2 -posix') PARAMETER (CHPOA = ' ') patchy-insecure_tmp_use.diff: --- NEW FILE patchy-insecure_tmp_use.diff --- diff -u patchy-orig/yindex patchy/yindex --- patchy-orig/yindex 2006-04-11 10:33:39.000000000 +0200 +++ patchy/yindex 2006-04-11 10:44:10.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: yindex-orig diff -u patchy-orig/ylist patchy/ylist --- patchy-orig/ylist 2006-04-11 10:33:48.000000000 +0200 +++ patchy/ylist 2006-04-11 10:40:17.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: ylist-orig patchy-p4comp.patch: --- NEW FILE patchy-p4comp.patch --- --- patchy/p4comp.fca.orig 2006-04-08 12:46:17.000000000 +0200 +++ patchy/p4comp.fca 2006-04-08 12:47:34.000000000 +0200 @@ -11458,7 +11458,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 12 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 12 CONTINUE NWTK = KDNWT NCH = 80 @@ -12383,7 +12383,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 13 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 13 CONTINUE NWTK = KDNWT NCHCCT = 80 @@ -14260,7 +14260,7 @@ C-------------- END CDE -------------- C DIMENSION MM(10), ITP(9) A8M DIMENSION MM(6), ITP(9) -A8M - PARAMETER ( NBLANK = '20202000'X ) + PARAMETER ( NBLANK = X'20202000' ) IT = ITP(1) JARTPX = 0 @@ -14430,7 +14430,7 @@ 24 JLOW = JCH - MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X) + MV(JCH) = AND (MV(JCH), X'FFFFFFDF') 49 CONTINUE JCCLOW = MAX (JCCLOW,JLOW) @@ -14465,8 +14465,8 @@ - DATA ACTION/'HOLD ','RESUME','EOF ','REWIND','ATTACH','DETACH' - +, 'EOFREW','CLOSE ' / + DATA ACTION/6HHOLD ,6HRESUME,6HEOF ,6HREWIND,6HATTACH,6HDETACH + +, 6HEOFREW,6HCLOSE / C------ CODE BITS IN IOTALL, IOTOFF, IOTON, IOTYP @@ -14801,7 +14801,7 @@ DO 31 JC=1,NCD J = J+1 DO 19 JJ=1,KDNWT1 - IF (AND(MV(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(MV(J),X'FF000000').EQ.0) GO TO 31 19 J = J+1 31 CONTINUE @@ -14825,7 +14825,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -14855,7 +14855,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -17316,6 +17316,8 @@ /*> ROUTINE ABEND CERN PROGLIB# Z035 ABEND .VERSION KERNFOR 4.31 911111 */ +#include + void abend_() { exit(7); @@ -17430,7 +17432,7 @@ char *fname; int *lgname; { - char *malloc(); + void *malloc(); char *ptalc, *pttext; int fchput(); int nalc; @@ -17664,7 +17666,7 @@ char *ftext; int lgtext; { - char *malloc(); + void *malloc(); char *ptalc, *ptuse; char *utext; int nalc; patchy-perror.patch: --- NEW FILE patchy-perror.patch --- --- 2005/src/patchy/patchy.car.orig 1996-07-15 13:46:22.000000000 +0200 +++ 2005/src/patchy/patchy.car 2006-04-09 02:18:17.000000000 +0200 @@ -3708,7 +3708,7 @@ 38 WRITE (IQTYPE,9038) CHLIFI(1:NN) +SELF, IF=QS_UNIX. - IF (LUNOLD.NE.0) CALL PERRORF (' System msg') + IF (LUNOLD.NE.0) CALL PERROR (' System msg') +SELF. IF (NQINIT.EQ.0) THEN IF (IQPRNT.NE.IQTYPE) WRITE (IQPRNT,9038) CHLIFI(1:NN) @@ -4399,7 +4399,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF (' Perror has') + CALL PERROR (' Perror has') +SELF. CALL P_KILL (MSG) END @@ -4446,7 +4446,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF ('Perror has') + CALL PERROR ('Perror has') +SELF. CALL P_FATAL (MSG) END @@ -15112,7 +15112,7 @@ +DECK, SEGVIOL, T=JOIN, IF=QDIAG, IF=QS_UNIX. SUBROUTINE SEGVIOL - CALL PERRORF ('perrorf has') + CALL PERROR ('perror has') CALL P_KILL ('SEGVIOL reached') END patchy-rceta.patch: --- NEW FILE patchy-rceta.patch --- --- patchy/rceta.sh.orig 1995-05-04 21:23:45.000000000 +0200 +++ patchy/rceta.sh 2006-04-08 12:20:26.000000000 +0200 @@ -225,8 +225,8 @@ RETURN END \\ - fort77 -o rceta rceta.f - rceta <<\\ + f77 -g -O2 -o rceta rceta.f + ./rceta <<\\ CODE INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX CODE CARD 1 IN HOLLERITH FOR CETA VALUES 1 - 47 CODE CARD 2 IN HOLLERITH FOR CETA VALUES 65 - 90 --- NEW FILE patchy-unpack-rceta --- #! /bin/bash set -e cd . file=patchy script=rceta.sh archive=$file.tar.gz echo "Unpacking from $archive" tar xzf $archive echo "patching script" sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script pushd $file ./$script popd echo "Repacking $archive" tar czf $archive $file exit 0 patchy-yexpand.diff: --- NEW FILE patchy-yexpand.diff --- --- 2004.orig/src/patchy/yexpand.script 2006-04-14 00:29:48.000000000 +0200 +++ 2004/src/patchy/yexpand.script 2006-04-14 00:35:13.000000000 +0200 @@ -26,8 +26,8 @@ # CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT - tfile="$HOME/$tfile.yexp" - echo "#!/bin/sh" >$tfile + tfile="./$tfile.yexp" + echo "#! /bin/sh" >$tfile echo " cat <>$tfile cat <$ifile >>$tfile cc=$? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Nov 2005 22:01:01 -0000 1.3 +++ .cvsignore 17 May 2006 15:35:10 -0000 1.4 @@ -13,3 +13,4 @@ src_graflib.tar.gz src_packlib.tar.gz xsneut95.dat +patchy.tar.gz Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 112-remove-nonexistent-prototypes-from-gen.h.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch 17 May 2006 15:35:10 -0000 1.2 @@ -68,19 +68,6 @@ PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT) #define FREQ(A2) CCALLSFFUN1(FREQ,freq,FLOAT,A2) -@@ -255,10 +255,10 @@ - - PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE) - #define DFRSIN(A2) CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2) -- -+/* - PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV) - #define FUN(A2,A3) CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3) -- -+*/ - PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT) - #define G116F1(A2) CCALLSFFUN1(G116F1,g116f1,FLOAT,A2) - @@ -270,10 +270,10 @@ PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT) Index: 307-use-canonical-cfortran.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/307-use-canonical-cfortran.dpatch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 307-use-canonical-cfortran.dpatch 14 Dec 2005 16:52:26 -0000 1.2 +++ 307-use-canonical-cfortran.dpatch 17 May 2006 15:35:10 -0000 1.3 @@ -7,8 +7,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 17:17:09.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 12:17:09.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-27 11:33:41.183131708 -0500 @@ -195,13 +195,13 @@ HP9000> f77 -c cfortex.f HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest @@ -79,24 +79,25 @@ - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA (E.G. TAPE, DISK, COMPUTER, PAPER.) diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 17:05:51.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 13:05:51.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-19 08:29:41.000000000 -0500 @@ -1,4 +1,4 @@ -/* cfortran.h 4.4_cernlib2002 */ +/* cfortran.h 4.4 */ /* http://www-zeus.desy.de/~burow/cfortran/ */ /* Burkhard Burow burow at desy.de 1990 - 2002. */ -@@ -11,6 +11,35 @@ +@@ -11,6 +11,38 @@ MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE. */ +/* The following modifications were made by the authors of CFITSIO or by me. -+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)". ++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY. + * PDW = Peter Wilson + * DM = Doug Mink -+ * LEB = ?? -+ * -- Kevin McCarty, for Debian (11/29/2003) */ ++ * LEB = Lee E Brotzman ++ * MR = Martin Reinecke ++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */ + +/******* + Modifications: @@ -118,12 +119,14 @@ + Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN + returning "double" in C. This was one of the items on + Burkhard's TODO list. (KMCCARTY) ++ Dec 2005: Modifications to support 8-byte integers. (MR) ++ USE AT YOUR OWN RISK! + *******/ + /* Avoid symbols already used by compilers and system *.h: __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c -@@ -75,7 +104,8 @@ +@@ -75,7 +107,8 @@ /* Remainder of cfortran.h depends on the Fortran compiler. */ @@ -133,7 +136,7 @@ #define f2cFortran #endif -@@ -90,6 +120,27 @@ +@@ -90,6 +123,27 @@ Support f2c or f77 with gcc, vcc with f2c. f77 with vcc works, missing link magic for f77 I/O.*/ #endif @@ -161,7 +164,7 @@ #if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */ #define hpuxFortran /* Should also allow hp9000s7/800 use.*/ #endif -@@ -131,6 +182,7 @@ +@@ -131,6 +185,7 @@ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ @@ -169,7 +172,7 @@ - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \ - VAX VMS CC 3.1 and FORTRAN 5.4. \ -@@ -151,7 +203,8 @@ +@@ -151,7 +206,8 @@ - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran \ - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ - Absoft Pro Fortran: Use #define AbsoftProFortran \ @@ -179,7 +182,7 @@ /* Compiler must throw us out at this point! */ #endif #endif -@@ -164,7 +217,8 @@ +@@ -164,7 +220,8 @@ /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ @@ -189,7 +192,7 @@ #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else -@@ -268,7 +322,8 @@ +@@ -268,7 +325,8 @@ #endif #ifndef apolloFortran @@ -199,7 +202,7 @@ #define CF_NULL_PROTO #else /* HP doesn't understand #elif. */ /* Without ANSI prototyping, Apollo promotes float functions to double. */ -@@ -512,7 +567,7 @@ +@@ -512,7 +570,7 @@ *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO) ), \ (F).dsc$a_a0 = ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length ,(F)) @@ -208,8 +211,14 @@ #define _NUM_ELEMS -1 #define _NUM_ELEM_ARG -2 #define NUM_ELEMS(A) A,_NUM_ELEMS -@@ -540,7 +595,8 @@ +@@ -538,9 +596,14 @@ + if (i==(unsigned)num_term) break; + else strv += elem_len-i; } ++if (0) { /* to prevent not used warnings in gcc (added by ROOT) */ ++ c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0); ++ vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0); ++} return (int)num; } -#endif @@ -218,7 +227,53 @@ /*-------------------------------------------------------------------------*/ /* UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS */ -@@ -1451,7 +1507,12 @@ +@@ -1318,6 +1381,7 @@ + #define INTVVVVVVV_cfTYPE int + #define LOGICALVVVVVVV_cfTYPE int + #define LONGVVVVVVV_cfTYPE long ++#define LONGLONGVVVVVVV_cfTYPE long long /* added by MR December 2005 */ + #define SHORTVVVVVVV_cfTYPE short + #define PBYTE_cfTYPE INTEGER_BYTE + #define PDOUBLE_cfTYPE DOUBLE_PRECISION +@@ -1325,6 +1389,7 @@ + #define PINT_cfTYPE int + #define PLOGICAL_cfTYPE int + #define PLONG_cfTYPE long ++#define PLONGLONG_cfTYPE long long /* added by MR December 2005 */ + #define PSHORT_cfTYPE short + + #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A) +@@ -1342,6 +1407,7 @@ + #define INT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LOGICAL_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) ++#define LONGLONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define PBYTE_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0) +@@ -1349,6 +1415,7 @@ + #define PINT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLOGICAL_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) ++#define PLONGLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define PSHORT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define BYTEV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define BYTEVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) +@@ -1392,6 +1459,13 @@ + #define LONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) ++#define LONGLONGV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORTV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define SHORTVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) + #define SHORTVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) +@@ -1451,7 +1525,12 @@ #define BYTE_cfPU(A) CFextern INTEGER_BYTE FCALLSC_QUALIFIER A #define DOUBLE_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -231,7 +286,80 @@ #else #define FLOAT_cfPU(A) CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A #endif -@@ -2088,7 +2149,12 @@ +@@ -1589,6 +1668,7 @@ + #define INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E) + #define LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1632,6 +1712,13 @@ + #define LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1645,6 +1732,7 @@ + #define PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E) + #define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E) + #define PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E) +@@ -1957,6 +2045,7 @@ + #define INT_cfT(M,I,A,B,D) *A + #define LOGICAL_cfT(M,I,A,B,D) F2CLOGICAL(*A) + #define LONG_cfT(M,I,A,B,D) *A ++#define LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */ + #define SHORT_cfT(M,I,A,B,D) *A + #define BYTEV_cfT(M,I,A,B,D) A + #define DOUBLEV_cfT(M,I,A,B,D) A +@@ -1964,6 +2053,7 @@ + #define INTV_cfT(M,I,A,B,D) A + #define LOGICALV_cfT(M,I,A,B,D) A + #define LONGV_cfT(M,I,A,B,D) A ++#define LONGLONGV_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define SHORTV_cfT(M,I,A,B,D) A + #define BYTEVV_cfT(M,I,A,B,D) (void *)A /* We have to cast to void *,*/ + #define BYTEVVV_cfT(M,I,A,B,D) (void *)A /* since we don't know the */ +@@ -2001,6 +2091,12 @@ + #define LONGVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVVV_cfT(M,I,A,B,D) (void *)A ++#define LONGLONGVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ + #define SHORTVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVVV_cfT(M,I,A,B,D) (void *)A +@@ -2013,6 +2109,7 @@ + #define PINT_cfT(M,I,A,B,D) A + #define PLOGICAL_cfT(M,I,A,B,D) ((*A=F2CLOGICAL(*A)),A) + #define PLONG_cfT(M,I,A,B,D) A ++#define PLONGLONG_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define PSHORT_cfT(M,I,A,B,D) A + #define PVOID_cfT(M,I,A,B,D) A + #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) +@@ -2083,12 +2180,18 @@ + #define INT_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LOGICAL_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LONG_cfFZ(UN,LN) long FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#define LONGLONG_cfFZ(UN,LN) long long FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */ + #define SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define VOID_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)( #ifndef __CF__KnR /* The void is req'd by the Apollo, to make this an ANSI function declaration. The Apollo promotes K&R float functions to double. */ @@ -245,7 +373,7 @@ #ifdef vmsFortran #define STRING_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS #else -@@ -2104,7 +2170,12 @@ +@@ -2104,7 +2207,12 @@ #endif #else #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -258,7 +386,7 @@ #else #define FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)( #endif -@@ -2118,7 +2189,12 @@ +@@ -2118,13 +2226,19 @@ #define BYTE_cfF(UN,LN) BYTE_cfFZ(UN,LN) #define DOUBLE_cfF(UN,LN) DOUBLE_cfFZ(UN,LN) #ifndef __CF_KnR @@ -271,3 +399,18 @@ #else #define FLOAT_cfF(UN,LN) FLOAT_cfFZ(UN,LN) #endif + #define INT_cfF(UN,LN) INT_cfFZ(UN,LN) + #define LOGICAL_cfF(UN,LN) LOGICAL_cfFZ(UN,LN) + #define LONG_cfF(UN,LN) LONG_cfFZ(UN,LN) ++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */ + #define SHORT_cfF(UN,LN) SHORT_cfFZ(UN,LN) + #define VOID_cfF(UN,LN) VOID_cfFZ(UN,LN) + #define STRING_cfF(UN,LN) STRING_cfFZ(UN,LN), +@@ -2187,6 +2301,7 @@ + #define LOGICAL_cfI return C2FLOGICAL(A0); + #endif + #define LONG_cfI return A0; ++#define LONGLONG_cfI return A0; /* added by MR December 2005 */ + #define SHORT_cfI return A0; + #define STRING_cfI return ; + #define VOID_cfI return ; Index: 800-implement-shared-library-rules-in-Imake.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/800-implement-shared-library-rules-in-Imake.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 800-implement-shared-library-rules-in-Imake.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 800-implement-shared-library-rules-in-Imake.dpatch 17 May 2006 15:35:10 -0000 1.2 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules ---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2005-11-29 17:07:32.035570303 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2005-11-29 17:07:40.003888782 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:42:00.576902424 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:42:08.484202137 -0500 @@ -904,6 +904,8 @@ * InstallSharedLibrary - generate rules to install the indicated sharable * Library @@ -27,7 +27,7 @@ /* * InstallLinkKitLibrary - rule to install Link Kit library. -@@ -1963,6 +1966,15 @@ +@@ -1967,6 +1970,15 @@ #endif /* InstallSubdirs */ /* @@ -43,7 +43,7 @@ * InstallBinSubdirs - generate rules to recursively install programs and * scripts */ -@@ -2341,9 +2353,12 @@ +@@ -2354,9 +2366,12 @@ */ #ifndef DefinePackageLibrary #define DefinePackageLibrary(locallib) \ @@ -57,8 +57,8 @@ override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB) @@\ @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules ---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 10:51:01.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2005-11-29 17:09:29.336812562 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 06:51:01.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -227,7 +227,7 @@ RanLibrary($@) #endif @@ -120,8 +120,8 @@ #ifndef SharedLibraryBuild #define SharedLibraryBuild(libname,version) @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules ---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 15:26:45.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2005-11-29 17:07:40.004888571 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 10:26:45.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -43,6 +43,9 @@ #ifndef PositionIndependentCplusplusFlags #define PositionIndependentCplusplusFlags -fPIC Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 805-expunge-missing-mathlib-kernlib-symbols.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch 17 May 2006 15:35:10 -0000 1.2 @@ -5,9 +5,9 @@ ## DP: Remove some unreferenced symbols from mathlib and kernlib. @DPATCH@ -diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile ---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2005-06-13 11:20:33.838151240 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:37.545106161 -0400 ++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:48.094863874 -0400 @@ -1,6 +1,8 @@ #ifndef CERNLIB_VAXVMS @@ -18,9 +18,9 @@ readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\ tmproi.F toslat.F unlinkf.F -diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:12:24.894703741 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:16:54.864966246 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:38.432917462 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:48.095863661 -0400 @@ -2,20 +2,22 @@ #include "pilot.h" @@ -50,25 +50,29 @@ #if defined(CERNLIB_DOUBLE) SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\ -diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 2005-06-13 11:19:42.456136998 -0400 -@@ -1,9 +1,12 @@ --SRCS_F= addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\ -- bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\ -- dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\ -- grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ -- newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ -- quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ -+/* Some files deleted from the below list since they depend upon the -+ lepto63 library, which cannot be included in Debian for licensing reasons. */ -+ -+SRCS_F= addbnd.F bfgs.F bndtst.F bounds.F bucmve.F \ @@\ -+ delbnd.F delete.F dvcopy.F dvdot.F \ @@\ -+ dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F \ @@\ -+ ldlsol.F modchl.F mxstep.F \ @@\ -+ newptq.F nmdchl.F nodaud.F orthvc.F quad.F \ @@\ -+ quasi.F ranums.F rlen.F settol.F shrnk.F \ @@\ - treaud.F tredmp.F tstext.F usrint.F usrtrm.F +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile 2006-05-09 17:00:05.429179570 -0400 +@@ -4,7 +4,7 @@ + grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ + newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ + quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ +- treaud.F tredmp.F tstext.F usrint.F usrtrm.F ++ treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F FORTRANSAVEOPTION = FortranSaveFlags + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F 1969-12-31 19:00:00.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F 2006-05-09 17:01:10.196413696 -0400 +@@ -0,0 +1,10 @@ ++C----------------------------------------------------------------------- ++ FUNCTION DFUN(ND,X) ++C----------------------------------------------------------------------- ++C DUMMY FUNCTION ++C----------------------------------------------------------------------- ++ DOUBLE PRECISION DFUN, X(ND) ++ WRITE (6,10) ++ 10 FORMAT(/10X,'DFUN CALLED BUT NOT LINKED') ++ STOP ++ END cernlib-gfortran.diff: Index: cernlib-gfortran.diff =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/cernlib-gfortran.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cernlib-gfortran.diff 16 Nov 2005 23:34:07 -0000 1.1 +++ cernlib-gfortran.diff 17 May 2006 15:35:10 -0000 1.2 @@ -1,6 +1,6 @@ ---- src/config/linux.cf.old 2005-06-16 21:11:15.000000000 +0200 -+++ src/config/linux.cf 2005-06-16 21:09:23.000000000 +0200 -@@ -216,7 +216,7 @@ +--- 2005/src/config/linux.cf-old 2006-03-15 11:32:47.000000000 +0100 ++++ 2005/src/config/linux.cf 2006-03-15 11:33:52.000000000 +0100 +@@ -478,7 +478,7 @@ variable=value @@\ endif @@\ @@ -9,16 +9,20 @@ /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */ /* Adapted to CERN style GF. 20-Sep-96 */ -@@ -227,10 +227,10 @@ - # define OptimizedCDebugFlags -O1 -fomit-frame-pointer +@@ -498,14 +498,13 @@ + #endif #define f2cFortran YES --#define FortranCmd g77 -+#define FortranCmd gfortran +-#define FortranCmd g77 -g ++#define FortranCmd gfortran -g #define XargsCmd xargs #define FortranSaveFlags /* */ /* Everything static !? */ --#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex -+#define DefaultFCOptions -fno-second-underscore - #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC - - # endif + #define OptimisedFortranFlags OptimizedCDebugFlags -funroll-loops + /* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */ + #ifndef DefaultFCOptions +-# define DefaultFCOptions -fno-automatic -fno-second-underscore \ +- -fugly-complex ++# define DefaultFCOptions -fno-automatic -fno-second-underscore + #endif + #define CernlibSystem CernlibDefaultDefines CernlibMachineDefines \ + CernlibLocalDefines Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/cernlib.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cernlib.spec 16 Feb 2006 22:00:29 -0000 1.19 +++ cernlib.spec 17 May 2006 15:35:10 -0000 1.20 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 13%{?dist} +Release: 20%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -12,19 +12,27 @@ #BuildRequires: gcc-g77 #Requires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel # fedora core -# fc 3 -#BuildRequires: xorg-x11-devel lapack blas openmotif-devel -# fc 4 -#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel -# fc devel -BuildRequires: imake lapack-devel blas-devel openmotif-devel +BuildRequires: openmotif-devel +%if "%fedora" <= "3" +BuildRequires: lapack blas +%else +BuildRequires: lapack-devel blas-devel +%endif + +%if "%fedora" <= "4" +BuildRequires: xorg-x11-devel +%else +BuildRequires: imake # workaround #173530 BuildRequires: libXau-devel +%endif +# for patchy build scripts +BuildRequires: tcsh +BuildRequires: gawk # there are missing f2c intrinsics in gfortran so gfortran cannot be used to # build the cernlib BuildRequires: /usr/bin/g77 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: x86_64 # these sources are different from the upstream sources as files with # GPL incompatible licences are removed. You can use cernlib-remove-deadpool @@ -45,11 +53,18 @@ Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz Source11: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_phtools.tar.gz Source12: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_scripts.tar.gz -# actually patchy isn't built, for the reason stated in -# see http://borex.princeton.edu/~kmccarty/faq.html#36 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat +# The patchy version 4 sources +Source17: patchy.tar.gz +# this is modified with regard with what Mattias gave me. Indeed the file +# containing some other files (p4inceta) was in fortran unformatted format, +# I believe it is what caused a segfault of rceta on the ppc platform. +# I have recreated the patchy.tar.gz from Mattias tarball by running +# sh patchy-unpack-rceta +Source203: patchy-unpack-rceta + # Shell scripts that go in /etc/profile.d Source100: cernlib.sh.in Source105: cernlib.csh.in @@ -67,7 +82,7 @@ Source201: cernlib-deadpool.txt # debian patchset -Patch0: cernlib_2005.05.09.dfsg-3.diff +Patch0: cernlib_2005.05.09.dfsg-6.diff # change file to directory to DATADIR Patch1100: cernlib-enforce-FHS.diff Patch1: 001-fix-missing-fluka.dpatch @@ -108,7 +123,7 @@ Patch210: 210-improve-cfortran-header-files.dpatch # split in newer debian patchset Patch2110: 211-fix-comis-on-amd64.dpatch -Patch2111: 211-fix-comis-on-ia64.dpatch +Patch2111: 211-fix-comis-on-ia64-alpha.dpatch Patch300: 300-skip-duplicate-lenocc.dpatch # Use another approach, see cernlib-enforce-FHS # Patch33: 301-datafiles-comply-with-FHS.dpatch @@ -135,6 +150,8 @@ Patch314: 314-permit-using-regcomp-for-re_comp.dpatch Patch315: 315-fixes-for-MacOSX.dpatch Patch318: 318-additional-gcc-3.4-fixes.dpatch +# certainly not needed, but who knows? +Patch319: 319-work-around-imake-segfaults.dpatch Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch Patch701: 701-patch-hbook-comis-Imakefiles.dpatch @@ -149,8 +166,8 @@ Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch Patch802: 802-create-shared-libraries.dpatch # in the original cernlib kxterm is built with the C compiler, which cause -# a failure if compiled with de cernlib debian script as -lg2c isn't found. -# It is corrected by +# a failure if compiled with the cernlib debian script as -lg2c isn't found. +# It is corrected in Patch803: 803-link-binaries-dynamically.dpatch # 803 depends on # 208-fix-redundant-packlib-dependencies.dpatch @@ -190,6 +207,20 @@ Patch1205: cernlib-gfortran.diff Patch1207: cernlib-v107z0_X_before_string.diff +# patchy 4 +# not applied as it has allready been done by the sed one-liner in +# patchy-unpack-rceta +Patch1500: patchy-rceta.patch + +Patch1501: patchy-insecure_tmp_use.diff +Patch1502: patchy-fcasplit.patch +Patch1503: patchy-p4comp.patch + +# patchy 5 (included in cernlib) +Patch1504: patchy-case.patch +Patch1505: patchy-perror.patch +Patch1506: patchy-yexpand.diff + %description CERN program library is a large collection of general purpose libraries and modules maintained and offered on the CERN. Most of these programs @@ -203,9 +234,17 @@ %package devel Summary: General purpose CERN library static libraries and headers -Requires: lapack-devel blas-devel openmotif-devel +Requires: openmotif-devel +%if "%fedora" <= "3" +Requires: lapack blas +%else +Requires: lapack-devel blas-devel +%endif + +%if "%fedora" > "4" # workaround #173530 Requires: libXau-devel +%endif Requires: %{name} = %{version}-%{release} Group: Development/Libraries @@ -279,6 +318,13 @@ According to the responsible of the cernlib debian package, some of these utilities may have security flaws. +%package -n patchy +Group: Applications/Archiving +Summary: The patchy utilities + +%description -n patchy +Utilities for extracting sources from patchy cards and cradles. + %prep %setup -c @@ -295,6 +341,24 @@ %setup -T -D -a 12 %setup -T -D -a 14 %setup -T -D -a 15 +%setup -T -D -a 17 + +# patch patchy 4 installer fortran generator script +# avtually it is unusefull, because the unpacking has been done +# offline, see comment above. +#%patch -P 1500 + +%patch -P 1501 + +# unpack the patchy version 4 sources is done offline, +# see comment above +#pushd patchy +# ./rceta.sh +#popd + +%patch -P 1502 +%patch -P 1503 + %patch -p1 cd %{version} @@ -355,6 +419,7 @@ cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/ %patch -P 318 -p1 +%patch -P 319 -p1 # move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch) mv src/packlib/kernlib src/kernlib @@ -458,13 +523,16 @@ %patch -P 805 -p1 %patch -P 806 -p1 +%patch -P 1504 -p1 +%patch -P 1505 -p1 +%patch -P 1506 -p1 %patch -P 1200 %patch -P 1201 %patch -P 1203 %patch -P 1204 # use gfortran -#%patch -P 1205 +#%patch -P 1205 -p1 # workaround gfortran bug %patch -P 1207 @@ -518,7 +586,8 @@ # substitude the right defaults in the scripts sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \ - src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script + src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \ + ../patchy/ylist ../patchy/yindex # substitute version in gxint with the right version # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f @@ -528,6 +597,9 @@ sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \ src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F +# substitute bindir in ylist and yindex to conform to FHS +sed -i -e 's:\$CERN/patchy/\$PATCHY_VERSION/bin:%{_bindir}:' ../patchy/ylist ../patchy/yindex + # Create the build directory structure mkdir -p build bin lib shlib @@ -546,6 +618,16 @@ cp %{SOURCE104} bin/ chmod a+x bin/mkdirhier +PATHSAVE=$PATH +# Build patchy version 4 +pushd ../patchy +# export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" + export PATH=".:..:$PATH" + p4boot.sh 0 +popd +find ../patchy -name y* -a -perm -755 -exec install {} bin ';' +export PATH=$PATHSAVE + # Create the top level Makefile with imake cd $CERN_ROOT/build @@ -556,6 +638,7 @@ # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin make %{?_smp_mflags} bin/kuipc +make patchy/Makefile make scripts/Makefile cd scripts make install.bin @@ -576,6 +659,13 @@ cd $CERN_ROOT/build/packlib make %{?_smp_mflags} install.bin +# Build npatchy +# The build of patchy is completly messed up on ppc +%ifnarch ppc +cd $CERN_ROOT/build/patchy +make %{?_smp_mflags} install.bin +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -610,7 +700,6 @@ # to preserve symlinks (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) -#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -) rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier @@ -656,7 +745,6 @@ %doc cernlib.README copyright %doc debian/debhelper/geant321.README.debian %doc debian/debhelper/libpdflib804-2-dev.README.debian -%doc debian/debhelper/libmathlib2.README.debian %doc debian/debhelper/montecarlo-base.README.debian # the utils and devel are separated to have the possibility to install @@ -711,7 +799,57 @@ %{_bindir}/zftp %doc debian/debhelper/zftp.README.debian +%files -n patchy +%defattr(-,root,root,-) +%ifnarch ppc +%{_bindir}/fcasplit +%{_bindir}/nycheck +%{_bindir}/nydiff +%{_bindir}/nyindex +%{_bindir}/nylist +%{_bindir}/nymerge +%{_bindir}/nypatchy +%{_bindir}/nyshell +%{_bindir}/nysynopt +%{_bindir}/nytidy +%{_bindir}/yexpand +%endif +%{_bindir}/ycompar +%{_bindir}/yedit +%{_bindir}/yfrceta +%{_bindir}/yindex +%{_bindir}/yindexb +%{_bindir}/ylist +%{_bindir}/ylistb +%{_bindir}/ypatchy +%{_bindir}/ysearch +%{_bindir}/yshift +%{_bindir}/ytobcd +%{_bindir}/ytobin +%{_bindir}/ytoceta + + %changelog +* Wed May 17 2006 Patrice Dumas - 2005-20 +- use new debian patchset. Fix 191631 + +* Tue Apr 13 2006 Patrice Dumas - 2005-19 +- add a patch to yexpand, to avoid using $HOME. + +* Tue Apr 13 2006 Patrice Dumas - 2005-17 +- npatchy don't build on ppc. + +* Wed Apr 12 2006 Patrice Dumas - 2005-16 +- unpack patchy offline because the files are within an unformatted + fortran file which won't be right on all the arches. + +* Tue Apr 11 2006 Patrice Dumas - 2005-15.1 +- add conditionals in spec to have only one for all fedora versions. + +* Tue Apr 11 2006 Patrice Dumas - 2005-14 +- add patchy version 4 and build cernlib patchy. From Mattias Ellert. +- update to newer debian patchset + * Thu Feb 16 2006 Patrice Dumas - 2005-13 - rebuild for fc5 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/paw.README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- paw.README 14 Dec 2005 16:52:26 -0000 1.3 +++ paw.README 17 May 2006 15:35:10 -0000 1.4 @@ -41,6 +41,11 @@ to the beginning of them. +5) Shared libs + +PAW is linked dynamically, therefore the pawlib used is selected by the +/etc/ld.so.conf or $LD_LIBRARY_PATH settings. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by Index: sources =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Nov 2005 22:01:01 -0000 1.3 +++ sources 17 May 2006 15:35:10 -0000 1.4 @@ -13,3 +13,4 @@ 67228b011eac13b44499c50219e21545 src_graflib.tar.gz 4fdcdc9f819ebbb9c6d3a04f339cdcf8 src_packlib.tar.gz eecb52159458ead0ee6b0d00b90aab66 xsneut95.dat +b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz --- 211-fix-comis-on-ia64.dpatch DELETED --- --- cernlib_2005.05.09.dfsg-3.diff DELETED --- From fedora-extras-commits at redhat.com Wed May 17 16:25:57 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Wed, 17 May 2006 09:25:57 -0700 Subject: rpms/gnotime/devel gnotime.spec,1.16,1.17 Message-ID: <200605171625.k4HGPxH5031292@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/gnotime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31253 Modified Files: gnotime.spec Log Message: - Remove the libXt fake BR: as it shouldn't be needed on FC5+. - Attempt rebuild for new guile. Index: gnotime.spec =================================================================== RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnotime.spec 13 Feb 2006 20:23:42 -0000 1.16 +++ gnotime.spec 17 May 2006 16:25:57 -0000 1.17 @@ -1,6 +1,6 @@ Name: gnotime Version: 2.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tracks and reports time spent Group: Applications/Productivity @@ -16,9 +16,6 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: qof-devel >= 0.6.0 -# libxt-devel is required to work around autoconf brokenness. Remove when fixed -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176379 -BuildRequires: libXt-devel # Patch0 modifies configure.in so we need autoconf BuildRequires: autoconf # To get rid of rpath, we need to use a fedora libtool @@ -111,6 +108,10 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Fri May 12 2006 Toshio Kuratomi - 2.2.2-5 +- Remove the libXt fake BR: as it shouldn't be needed on FC5+. +- Attempt rebuild for new guile. + * Mon Feb 13 2006 Toshio Kuratomi - 2.2.2-4 - Bump and rebuild for FC5. From fedora-extras-commits at redhat.com Wed May 17 17:19:25 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:19:25 -0700 Subject: rpms/scrip - New directory Message-ID: <200605171719.k4HHJRac004118@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4095/scrip Log Message: Directory /cvs/extras/rpms/scrip added to the repository From fedora-extras-commits at redhat.com Wed May 17 17:19:26 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:19:26 -0700 Subject: rpms/scrip/devel - New directory Message-ID: <200605171719.k4HHJSbx004121@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4095/scrip/devel Log Message: Directory /cvs/extras/rpms/scrip/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 17:19:39 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:19:39 -0700 Subject: rpms/scrip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605171719.k4HHJfmt004181@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4145/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scrip --- NEW 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 May 17 17:19:38 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:19:38 -0700 Subject: rpms/scrip Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605171719.k4HHJerR004178@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4145 Added Files: Makefile import.log Log Message: Setup of module scrip --- NEW FILE Makefile --- # Top level Makefile for module scrip all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 17 17:20:01 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:20:01 -0700 Subject: rpms/scrip import.log,1.1,1.2 Message-ID: <200605171720.k4HHKXpx004265@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4215 Modified Files: import.log Log Message: auto-import scrip-1.4-4 on branch devel from scrip-1.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scrip/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 17:19:38 -0000 1.1 +++ import.log 17 May 2006 17:20:01 -0000 1.2 @@ -0,0 +1 @@ +scrip-1_4-4:HEAD:scrip-1.4-4.src.rpm:1147886357 From fedora-extras-commits at redhat.com Wed May 17 17:20:02 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:20:02 -0700 Subject: rpms/scrip/devel copyright.html, NONE, 1.1 scrip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605171720.k4HHKYTk004269@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4215/devel Modified Files: .cvsignore sources Added Files: copyright.html scrip.spec Log Message: auto-import scrip-1.4-4 on branch devel from scrip-1.4-4.src.rpm --- NEW FILE copyright.html --- SCRIP Copyright

COPYRIGHT NOTICE

Copyright © 1997, 1998 the Regents of the University of California.

This software and ancillary information (herein called SOFTWARE) called SCRIP is made available under the terms described here. The SOFTWARE has been approved for release with associated LA-CC Number 98-45. Unless otherwise indicated, this SOFTWARE has been authored by an employee or employees of the University of California, operator of Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with the United States Department of Energy. The United States Government has rights to use, reproduce, and distribute this SOFTWARE. The public may copy, distribute, prepare derivative works and publicly display this SOFTWARE without charge, provided that this Notice and any statement of authorship are reproduced on all copies. Neither the Government nor the University makes any warranty, express or implied, or assumes any liability or responsibility for the use of this SOFTWARE. If SOFTWARE is modified to produce derivative works, such modified SOFTWARE should be clearly marked, so as not to confuse it with the version available from Los Alamos National Laboratory. --- NEW FILE scrip.spec --- Name: scrip Version: 1.4 Release: 4%{?dist} Summary: Spherical Coordinate Remapping and Interpolation Package (SCRIP) Group: Applications/Engineering License: BSD URL: http://climate.lanl.gov/Software/SCRIP/index.htm Source0: http://climate.lanl.gov/Software/SCRIP/scrip1.4.tar.gz Source1: http://climate.lanl.gov/Software/SCRIP/copyright.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: netcdf-devel %description SCRIP is a software package which computes addresses and weights for remapping and interpolating fields between grids in spherical coordinates. It was written originally for remapping fields to other grids in a coupled climate model, but is sufficiently general that it can be used in other applications as well. The package should work for any grid on the surface of a sphere. %prep %setup -q -n SCRIP cd ${RPM_BUILD_DIR}/SCRIP %{__cp} %SOURCE1 . %build cd source %{__make} COMPILE=gfortran FLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/netcdf-3" LIB="-L%{_libdir}/netcdf-3 -lnetcdf" %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_bindir} %{__cp} scrip ${RPM_BUILD_ROOT}%{_bindir} %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc copyright.html doc/SCRIPusers.pdf %{_bindir}/* %changelog * Wed May 17 2006 Ed Hill - 1.4-4 - make should respect rpm flags (thanks to Patrice Dumas) * Tue May 16 2006 Ed Hill - 1.4-3 - add netcdf-devel buildrequires * Tue May 16 2006 Ed Hill - 1.4-2 - remove redundant source and add netcdf-devel BR * Mon May 15 2006 Ed Hill - 1.4-1 - initial package creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scrip/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 17:19:39 -0000 1.1 +++ .cvsignore 17 May 2006 17:20:01 -0000 1.2 @@ -0,0 +1 @@ +scrip1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scrip/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 17:19:39 -0000 1.1 +++ sources 17 May 2006 17:20:01 -0000 1.2 @@ -0,0 +1 @@ +c2aec0bed18318e5eaea393a0a426481 scrip1.4.tar.gz From fedora-extras-commits at redhat.com Wed May 17 17:47:02 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 17 May 2006 10:47:02 -0700 Subject: rpms/libgalago/devel libgalago.spec,1.1,1.2 Message-ID: <200605171747.k4HHl4Yb004583@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4565 Modified Files: libgalago.spec Log Message: * Wed May 17 2006 Brian Pepple - 0.5.0-2 - Bump. Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgalago.spec 16 May 2006 17:48:26 -0000 1.1 +++ libgalago.spec 17 May 2006 17:47:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: libgalago Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Galago presence library Group: System Environment/Libraries @@ -76,6 +76,9 @@ %changelog +* Wed May 17 2006 Brian Pepple - 0.5.0-2 +- Bump. + * Fri Apr 21 2006 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec. From fedora-extras-commits at redhat.com Wed May 17 18:14:20 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 17 May 2006 11:14:20 -0700 Subject: fedora-security/audit fe4,1.23,1.24 fe5,1.21,1.22 Message-ID: <200605171814.k4HIEKtJ007035@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4740 Modified Files: fe4 fe5 Log Message: Note a graphvis old CVE id. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fe4 17 May 2006 13:22:57 -0000 1.23 +++ fe4 17 May 2006 18:14:18 -0000 1.24 @@ -76,4 +76,5 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) +CVE-2005-4803 version (graphviz, fixed 2.2.1) CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.26-3) bz#191351 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fe5 17 May 2006 13:22:57 -0000 1.21 +++ fe5 17 May 2006 18:14:18 -0000 1.22 @@ -78,4 +78,5 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) +CVE-2005-4803 version (graphviz, fixed 2.2.1) CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.30-3) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch From fedora-extras-commits at redhat.com Wed May 17 19:02:45 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 17 May 2006 12:02:45 -0700 Subject: rpms/cernlib/FC-4 211-fix-comis-on-ia64-alpha.dpatch, NONE, 1.1 319-work-around-imake-segfaults.dpatch, NONE, 1.1 cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 patchy-case.patch, NONE, 1.1 patchy-fcasplit.patch, NONE, 1.1 patchy-insecure_tmp_use.diff, NONE, 1.1 patchy-p4comp.patch, NONE, 1.1 patchy-perror.patch, NONE, 1.1 patchy-rceta.patch, NONE, 1.1 patchy-unpack-rceta, NONE, 1.1 patchy-yexpand.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 307-use-canonical-cfortran.dpatch, 1.2, 1.3 800-implement-shared-library-rules-in-Imake.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib-gfortran.diff, 1.1, 1.2 cernlib.spec, 1.23, 1.24 paw.README, 1.3, 1.4 sources, 1.5, 1.6 211-fix-comis-on-ia64.dpatch, 1.1, NONE cernlib_2005.05.09.dfsg-3.diff, 1.1, NONE Message-ID: <200605171903.k4HJ3GmR009765@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9678 Modified Files: .cvsignore 112-remove-nonexistent-prototypes-from-gen.h.dpatch 307-use-canonical-cfortran.dpatch 800-implement-shared-library-rules-in-Imake.dpatch 805-expunge-missing-mathlib-kernlib-symbols.dpatch cernlib-gfortran.diff cernlib.spec paw.README sources Added Files: 211-fix-comis-on-ia64-alpha.dpatch 319-work-around-imake-segfaults.dpatch cernlib_2005.05.09.dfsg-6.diff patchy-case.patch patchy-fcasplit.patch patchy-insecure_tmp_use.diff patchy-p4comp.patch patchy-perror.patch patchy-rceta.patch patchy-unpack-rceta patchy-yexpand.diff Removed Files: 211-fix-comis-on-ia64.dpatch cernlib_2005.05.09.dfsg-3.diff Log Message: sync with devel branch --- NEW FILE 211-fix-comis-on-ia64-alpha.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 211-fix-comis-on-ia64-alpha.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Further patch building on Harald Vogt's amd64 patch attempting to ## DP: fix PAW on Itanium/Alpha Linux. This does not yet work completely... @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:45.236828642 -0500 @@ -39,12 +39,45 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *nn; { int i,n; char *a,*b; n=*nn; a=*ja; b=*jb; +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *nn; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:51:18.796348318 -0500 @@ -74,6 +74,24 @@ /* printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else double (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:51:05.440199025 -0500 @@ -67,6 +67,24 @@ /* printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else int (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:50:47.519024096 -0500 @@ -89,6 +89,24 @@ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; double r; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else float (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:45.236828642 -0500 @@ -42,6 +42,27 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *na, *nb; @@ -56,6 +77,18 @@ { a=*jb; b=*ja; la=*nb; lb=*na; k=-1; } +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *na, *nb; --- NEW FILE 319-work-around-imake-segfaults.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 319-work-around-imake-segfaults.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: If at first Imake doesn't succeed, try, try again. ## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.) @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules --- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:35:09.050384887 -0500 +++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:38:18.693611381 -0500 @@ -1296,7 +1296,11 @@ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - imakeflags -f $< + imakeflags -f $< || \ @@\ + $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + imakeflags -f $< || exit 1 #endif /* BuildMakefileTarget */ @@ -2127,7 +2131,11 @@ ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ - -DPackageName=$(PACKAGE_NAME); \ @@\ + -DPackageName=$(PACKAGE_NAME) || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) || exit 1; \ @@\ fi; \ @@\ $(MAKE) $(MFLAGS) Makefiles; \ @@\ cd $$newtop; \ @@\ @@ -2322,7 +2330,12 @@ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - -f $$imakefile; \ @@\ + -f $$imakefile || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + -f $$imakefile || exit 1; \ @@\ fi; \ @@\ fi; #endif cernlib_2005.05.09.dfsg-6.diff: --- NEW FILE cernlib_2005.05.09.dfsg-6.diff --- --- cernlib-2005.05.09.dfsg.orig/debian/control +++ cernlib-2005.05.09.dfsg/debian/control @@ -0,0 +1,896 @@ +Source: cernlib +Maintainer: Kevin B. McCarty +Standards-Version: 3.7.2 +Priority: optional +Section: science +Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin + +Package: cernlib-base +Architecture: all +Section: devel +Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev +Description: script to determine Cernlib library dependencies + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This package includes the "cernlib" script that lists the command-line + options needed for linking against Cernlib libraries. The script has + been rewritten from the upstream version to calculate + dependencies recursively. Also included are a README.Debian with a summary + of changes made to Cernlib to fit it into Debian packaging practices, + and a contributed set of Autoconf macros to test for Cernlib libraries. + +Package: cernlib-core-dev +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit +Description: Cernlib development headers, tools, and static libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the header files and static libraries likely to be + wanted by developers using the Cern libraries who are not interested + specifically in high energy physics. It also provides the Cernlib + development tools DZedit and KUIPC. Cernlib analysis programs may be + obtained by installing the cernlib-core metapackage. + +Package: cernlib-core +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos +Description: Cernlib main libraries and programs + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the libraries and analysis tools (e.g. PAW) likely + to be wanted by most users of the Cern libraries who are not interested + specifically in high energy physics. You cannot do program development by + installing only this metapackage; development libraries and tools may + be obtained by installing the cernlib-core-dev metapackage or individual + lib*-dev packages. + +Package: cernlib-extras +Architecture: all +Priority: extra +Section: science +Depends: cernlib-base (= ${Source-Version}), pawserv, zftp +Description: miscellaneous Cernlib programs unlikely to be used by many + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides a few additional Cernlib programs not included + in any other Cernlib metapackage. Very few people are likely to be + interested in them; currently they include zftp, pawserv and zserv. + Notice that the latter two programs run as daemons through inetd and may + reduce your system's security! + . + Installing this package along with the "cernlib" metapackage will supply + a complete set of all Cernlib programs and libraries included in Debian. + +Package: cernlib-montecarlo +Architecture: all +Section: science +Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev +Recommends: libisajet758-2-dev +Description: Cernlib Monte Carlo libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides various Monte Carlo libraries included in Cernlib + (both shared and static). Likely only physicists will be interested in + these packages. Note that the Geant 3.21 program is not included, but it may + be obtained by also installing the geant321 Debian package. + . + Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are + not available within Debian due to licensing issues; see the README.Debian + file in the montecarlo-base package for information on obtaining them. + . + Additionally, the Isajet library is not available on the m68k architecture + due to a compiler flaw. + +Package: cernlib +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev +Description: almost complete set of Debian Cernlib packages + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides almost all of the programs and libraries contained + in Cernlib. Most people will likely want only a subset of these. A few + extra Cernlib programs, not of interest to many people, may be obtained via + the cernlib-extras metapackage. + +Package: dzedit +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libpacklib1-dev +Description: Cernlib's ZEBRA documentation editor + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system + developed at CERN. ZEBRA, part of the Packlib library, permits a developer to + create complex data structures in the FORTRAN 77 language; the DZDOC system + allows the developer to generate and maintain documentation of ZEBRA data + structures. + +Package: geant321-data +Architecture: all +Section: science +Depends: cernlib-base +Description: [Physics] Data for Geant 3.21 detector simulator + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes data files for use by Geant. + +Package: geant321-doc +Architecture: all +Section: doc +Depends: cernlib-base +Description: [Physics] Documentation for Geant 3.21 + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes some documentation about Geant. + +Package: geant321 +Architecture: all +Section: science +Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77 +Suggests: kxterm, geant321-doc +Description: [Physics] Particle detector description and simulation tool + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes gxint, the script used to perform this linking step. + +Package: kuipc +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, cernlib-base +Recommends: libpacklib1-dev +Suggests: libpacklib1-lesstif-dev +Description: Cernlib's Kit for a User Interface Package (KUIP) compiler + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify + the writing of a program's user interface code. It takes as + input a Command Definition File (CDF) that describes the + commands to be understood by the program, and outputs C or FORTRAN code that + makes the appropriate function calls to set up the user interface. This + code can then be compiled and linked with the rest of the program. Since + the generated code uses KUIP routines, the program must also be linked + against the Packlib library that contains them. + . + KUIPC is no longer actively developed, so aside from its use in the build + process of Cernlib, it is of mainly historical interest. + +Package: kxterm +Architecture: any +Section: science +Depends: ${shlibs:Depends}, cernlib-base +Description: Cernlib's KUIP terminal emulator + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KXterm is a terminal emulator which combines the best features from + the (now defunct) Apollo DM pads (like: input and transcript [...21456 lines suppressed...] +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ./pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, C??? hai" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd" + +#. Type: select +#. Description +#: ./pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po +++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-05-26 16:05-0300\n" +"Last-Translator: Andr? Lu?s Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a serem executados a partir do inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos " +"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv " +"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP " +"do CERN). Esses servidores s?o executados a partir do inetd; voc? " +"pode habilitar cada um deles separadamente ou ambos. A menos que voc? " +"possua necessidades bastante especializadas, voc? provavelmente ir? " +"desejar habilitar somente o pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po +++ cernlib-2005.05.09.dfsg/debian/po/sv.po @@ -0,0 +1,53 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib 2005.05.09-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-10-06 23:50+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, B?da" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servrar som ska k?ras fr?n inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att " +"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem " +"att logga in med CERN's ZFTP-protokoll). Dessa servrar k?rs fr?n inetd; du m?ste " +"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott " +"om pawserv aktiveras." + --- cernlib-2005.05.09.dfsg.orig/debian/po/es.po +++ cernlib-2005.05.09.dfsg/debian/po/es.po @@ -0,0 +1,55 @@ +# cernlib po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the cernlib package. +# +# Changes: +# - Initial translation +# C??sar G??mez Mart??n +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentaci??n de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducci??n de Debian al espa??ol +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducci??n en +# http://www.debian.org/intl/spanish/notas +# +# - La gu??a de traducci??n de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-09-01 17:49+0100\n" +"Last-Translator: C??sar G??mez Mart??n \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a ejecutar desde inetd" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol). These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv." +msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++) y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv." + patchy-case.patch: --- NEW FILE patchy-case.patch --- --- 2004.orig/src/patchy/Imakefile 2006-04-13 11:15:58.000000000 +0200 +++ 2004/src/patchy/Imakefile 2006-04-13 11:27:07.000000000 +0200 @@ -54,7 +54,7 @@ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile ypatchy - p5lib p5lib TTY .go - fcasplit p5lib.f + ./fcasplit p5lib.f RemoveFile(p5lib.f) cat p5lib.libmake >> p5lib.mkfca $(MAKE) -f p5lib.mkfca $@ @@ -79,8 +79,8 @@ @ ln -s $< $@ %.f: $(LDIR)%.cra $(LDIR)patchy.car - ypatchy - $@ $< TTY .go - + ypatchy - :$@ :$< TTY .go + .f.o: $(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $< @@ -92,9 +92,9 @@ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \ ysearch yshift ytobcd ytobin ytoceta -P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)) +P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)) -$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)): +$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)): cd $(dir $@); \ @@\ if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\ ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\ patchy-fcasplit.patch: --- NEW FILE patchy-fcasplit.patch --- --- patchy/fcasplit.f.orig 2006-04-10 01:06:32.000000000 +0200 +++ patchy/fcasplit.f 2006-04-10 01:16:05.000000000 +0200 @@ -23,7 +23,7 @@ PARAMETER (CHIDA = ';DECK I' ) PARAMETER (CHOVER= 'UNKNOWN') - PARAMETER (CHPOF = '-c -O2 -Nx800 -Nc200') + PARAMETER (CHPOF = '-c -O2') PARAMETER (CHPOC = '-c -O2 -posix') PARAMETER (CHPOA = ' ') patchy-insecure_tmp_use.diff: --- NEW FILE patchy-insecure_tmp_use.diff --- diff -u patchy-orig/yindex patchy/yindex --- patchy-orig/yindex 2006-04-11 10:33:39.000000000 +0200 +++ patchy/yindex 2006-04-11 10:44:10.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: yindex-orig diff -u patchy-orig/ylist patchy/ylist --- patchy-orig/ylist 2006-04-11 10:33:48.000000000 +0200 +++ patchy/ylist 2006-04-11 10:40:17.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: ylist-orig patchy-p4comp.patch: --- NEW FILE patchy-p4comp.patch --- --- patchy/p4comp.fca.orig 2006-04-08 12:46:17.000000000 +0200 +++ patchy/p4comp.fca 2006-04-08 12:47:34.000000000 +0200 @@ -11458,7 +11458,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 12 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 12 CONTINUE NWTK = KDNWT NCH = 80 @@ -12383,7 +12383,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 13 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 13 CONTINUE NWTK = KDNWT NCHCCT = 80 @@ -14260,7 +14260,7 @@ C-------------- END CDE -------------- C DIMENSION MM(10), ITP(9) A8M DIMENSION MM(6), ITP(9) -A8M - PARAMETER ( NBLANK = '20202000'X ) + PARAMETER ( NBLANK = X'20202000' ) IT = ITP(1) JARTPX = 0 @@ -14430,7 +14430,7 @@ 24 JLOW = JCH - MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X) + MV(JCH) = AND (MV(JCH), X'FFFFFFDF') 49 CONTINUE JCCLOW = MAX (JCCLOW,JLOW) @@ -14465,8 +14465,8 @@ - DATA ACTION/'HOLD ','RESUME','EOF ','REWIND','ATTACH','DETACH' - +, 'EOFREW','CLOSE ' / + DATA ACTION/6HHOLD ,6HRESUME,6HEOF ,6HREWIND,6HATTACH,6HDETACH + +, 6HEOFREW,6HCLOSE / C------ CODE BITS IN IOTALL, IOTOFF, IOTON, IOTYP @@ -14801,7 +14801,7 @@ DO 31 JC=1,NCD J = J+1 DO 19 JJ=1,KDNWT1 - IF (AND(MV(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(MV(J),X'FF000000').EQ.0) GO TO 31 19 J = J+1 31 CONTINUE @@ -14825,7 +14825,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -14855,7 +14855,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -17316,6 +17316,8 @@ /*> ROUTINE ABEND CERN PROGLIB# Z035 ABEND .VERSION KERNFOR 4.31 911111 */ +#include + void abend_() { exit(7); @@ -17430,7 +17432,7 @@ char *fname; int *lgname; { - char *malloc(); + void *malloc(); char *ptalc, *pttext; int fchput(); int nalc; @@ -17664,7 +17666,7 @@ char *ftext; int lgtext; { - char *malloc(); + void *malloc(); char *ptalc, *ptuse; char *utext; int nalc; patchy-perror.patch: --- NEW FILE patchy-perror.patch --- --- 2005/src/patchy/patchy.car.orig 1996-07-15 13:46:22.000000000 +0200 +++ 2005/src/patchy/patchy.car 2006-04-09 02:18:17.000000000 +0200 @@ -3708,7 +3708,7 @@ 38 WRITE (IQTYPE,9038) CHLIFI(1:NN) +SELF, IF=QS_UNIX. - IF (LUNOLD.NE.0) CALL PERRORF (' System msg') + IF (LUNOLD.NE.0) CALL PERROR (' System msg') +SELF. IF (NQINIT.EQ.0) THEN IF (IQPRNT.NE.IQTYPE) WRITE (IQPRNT,9038) CHLIFI(1:NN) @@ -4399,7 +4399,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF (' Perror has') + CALL PERROR (' Perror has') +SELF. CALL P_KILL (MSG) END @@ -4446,7 +4446,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF ('Perror has') + CALL PERROR ('Perror has') +SELF. CALL P_FATAL (MSG) END @@ -15112,7 +15112,7 @@ +DECK, SEGVIOL, T=JOIN, IF=QDIAG, IF=QS_UNIX. SUBROUTINE SEGVIOL - CALL PERRORF ('perrorf has') + CALL PERROR ('perror has') CALL P_KILL ('SEGVIOL reached') END patchy-rceta.patch: --- NEW FILE patchy-rceta.patch --- --- patchy/rceta.sh.orig 1995-05-04 21:23:45.000000000 +0200 +++ patchy/rceta.sh 2006-04-08 12:20:26.000000000 +0200 @@ -225,8 +225,8 @@ RETURN END \\ - fort77 -o rceta rceta.f - rceta <<\\ + f77 -g -O2 -o rceta rceta.f + ./rceta <<\\ CODE INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX CODE CARD 1 IN HOLLERITH FOR CETA VALUES 1 - 47 CODE CARD 2 IN HOLLERITH FOR CETA VALUES 65 - 90 --- NEW FILE patchy-unpack-rceta --- #! /bin/bash set -e cd . file=patchy script=rceta.sh archive=$file.tar.gz echo "Unpacking from $archive" tar xzf $archive echo "patching script" sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script pushd $file ./$script popd echo "Repacking $archive" tar czf $archive $file exit 0 patchy-yexpand.diff: --- NEW FILE patchy-yexpand.diff --- --- 2004.orig/src/patchy/yexpand.script 2006-04-14 00:29:48.000000000 +0200 +++ 2004/src/patchy/yexpand.script 2006-04-14 00:35:13.000000000 +0200 @@ -26,8 +26,8 @@ # CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT - tfile="$HOME/$tfile.yexp" - echo "#!/bin/sh" >$tfile + tfile="./$tfile.yexp" + echo "#! /bin/sh" >$tfile echo " cat <>$tfile cat <$ifile >>$tfile cc=$? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Nov 2005 10:43:24 -0000 1.4 +++ .cvsignore 17 May 2006 19:02:42 -0000 1.5 @@ -13,3 +13,4 @@ src_graflib.tar.gz src_packlib.tar.gz xsneut95.dat +patchy.tar.gz Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 112-remove-nonexistent-prototypes-from-gen.h.dpatch 9 Dec 2005 16:09:19 -0000 1.1 +++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch 17 May 2006 19:02:42 -0000 1.2 @@ -68,19 +68,6 @@ PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT) #define FREQ(A2) CCALLSFFUN1(FREQ,freq,FLOAT,A2) -@@ -255,10 +255,10 @@ - - PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE) - #define DFRSIN(A2) CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2) -- -+/* - PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV) - #define FUN(A2,A3) CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3) -- -+*/ - PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT) - #define G116F1(A2) CCALLSFFUN1(G116F1,g116f1,FLOAT,A2) - @@ -270,10 +270,10 @@ PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT) Index: 307-use-canonical-cfortran.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/307-use-canonical-cfortran.dpatch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 307-use-canonical-cfortran.dpatch 14 Dec 2005 16:15:57 -0000 1.2 +++ 307-use-canonical-cfortran.dpatch 17 May 2006 19:02:42 -0000 1.3 @@ -7,8 +7,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 17:17:09.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 12:17:09.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-27 11:33:41.183131708 -0500 @@ -195,13 +195,13 @@ HP9000> f77 -c cfortex.f HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest @@ -79,24 +79,25 @@ - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA (E.G. TAPE, DISK, COMPUTER, PAPER.) diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 17:05:51.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 13:05:51.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-19 08:29:41.000000000 -0500 @@ -1,4 +1,4 @@ -/* cfortran.h 4.4_cernlib2002 */ +/* cfortran.h 4.4 */ /* http://www-zeus.desy.de/~burow/cfortran/ */ /* Burkhard Burow burow at desy.de 1990 - 2002. */ -@@ -11,6 +11,35 @@ +@@ -11,6 +11,38 @@ MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE. */ +/* The following modifications were made by the authors of CFITSIO or by me. -+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)". ++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY. + * PDW = Peter Wilson + * DM = Doug Mink -+ * LEB = ?? -+ * -- Kevin McCarty, for Debian (11/29/2003) */ ++ * LEB = Lee E Brotzman ++ * MR = Martin Reinecke ++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */ + +/******* + Modifications: @@ -118,12 +119,14 @@ + Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN + returning "double" in C. This was one of the items on + Burkhard's TODO list. (KMCCARTY) ++ Dec 2005: Modifications to support 8-byte integers. (MR) ++ USE AT YOUR OWN RISK! + *******/ + /* Avoid symbols already used by compilers and system *.h: __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c -@@ -75,7 +104,8 @@ +@@ -75,7 +107,8 @@ /* Remainder of cfortran.h depends on the Fortran compiler. */ @@ -133,7 +136,7 @@ #define f2cFortran #endif -@@ -90,6 +120,27 @@ +@@ -90,6 +123,27 @@ Support f2c or f77 with gcc, vcc with f2c. f77 with vcc works, missing link magic for f77 I/O.*/ #endif @@ -161,7 +164,7 @@ #if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */ #define hpuxFortran /* Should also allow hp9000s7/800 use.*/ #endif -@@ -131,6 +182,7 @@ +@@ -131,6 +185,7 @@ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ @@ -169,7 +172,7 @@ - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \ - VAX VMS CC 3.1 and FORTRAN 5.4. \ -@@ -151,7 +203,8 @@ +@@ -151,7 +206,8 @@ - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran \ - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ - Absoft Pro Fortran: Use #define AbsoftProFortran \ @@ -179,7 +182,7 @@ /* Compiler must throw us out at this point! */ #endif #endif -@@ -164,7 +217,8 @@ +@@ -164,7 +220,8 @@ /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ @@ -189,7 +192,7 @@ #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else -@@ -268,7 +322,8 @@ +@@ -268,7 +325,8 @@ #endif #ifndef apolloFortran @@ -199,7 +202,7 @@ #define CF_NULL_PROTO #else /* HP doesn't understand #elif. */ /* Without ANSI prototyping, Apollo promotes float functions to double. */ -@@ -512,7 +567,7 @@ +@@ -512,7 +570,7 @@ *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO) ), \ (F).dsc$a_a0 = ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length ,(F)) @@ -208,8 +211,14 @@ #define _NUM_ELEMS -1 #define _NUM_ELEM_ARG -2 #define NUM_ELEMS(A) A,_NUM_ELEMS -@@ -540,7 +595,8 @@ +@@ -538,9 +596,14 @@ + if (i==(unsigned)num_term) break; + else strv += elem_len-i; } ++if (0) { /* to prevent not used warnings in gcc (added by ROOT) */ ++ c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0); ++ vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0); ++} return (int)num; } -#endif @@ -218,7 +227,53 @@ /*-------------------------------------------------------------------------*/ /* UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS */ -@@ -1451,7 +1507,12 @@ +@@ -1318,6 +1381,7 @@ + #define INTVVVVVVV_cfTYPE int + #define LOGICALVVVVVVV_cfTYPE int + #define LONGVVVVVVV_cfTYPE long ++#define LONGLONGVVVVVVV_cfTYPE long long /* added by MR December 2005 */ + #define SHORTVVVVVVV_cfTYPE short + #define PBYTE_cfTYPE INTEGER_BYTE + #define PDOUBLE_cfTYPE DOUBLE_PRECISION +@@ -1325,6 +1389,7 @@ + #define PINT_cfTYPE int + #define PLOGICAL_cfTYPE int + #define PLONG_cfTYPE long ++#define PLONGLONG_cfTYPE long long /* added by MR December 2005 */ + #define PSHORT_cfTYPE short + + #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A) +@@ -1342,6 +1407,7 @@ + #define INT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LOGICAL_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) ++#define LONGLONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define PBYTE_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0) +@@ -1349,6 +1415,7 @@ + #define PINT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLOGICAL_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) ++#define PLONGLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define PSHORT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define BYTEV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define BYTEVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) +@@ -1392,6 +1459,13 @@ + #define LONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) ++#define LONGLONGV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORTV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define SHORTVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) + #define SHORTVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) +@@ -1451,7 +1525,12 @@ #define BYTE_cfPU(A) CFextern INTEGER_BYTE FCALLSC_QUALIFIER A #define DOUBLE_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -231,7 +286,80 @@ #else #define FLOAT_cfPU(A) CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A #endif -@@ -2088,7 +2149,12 @@ +@@ -1589,6 +1668,7 @@ + #define INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E) + #define LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1632,6 +1712,13 @@ + #define LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1645,6 +1732,7 @@ + #define PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E) + #define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E) + #define PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E) +@@ -1957,6 +2045,7 @@ + #define INT_cfT(M,I,A,B,D) *A + #define LOGICAL_cfT(M,I,A,B,D) F2CLOGICAL(*A) + #define LONG_cfT(M,I,A,B,D) *A ++#define LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */ + #define SHORT_cfT(M,I,A,B,D) *A + #define BYTEV_cfT(M,I,A,B,D) A + #define DOUBLEV_cfT(M,I,A,B,D) A +@@ -1964,6 +2053,7 @@ + #define INTV_cfT(M,I,A,B,D) A + #define LOGICALV_cfT(M,I,A,B,D) A + #define LONGV_cfT(M,I,A,B,D) A ++#define LONGLONGV_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define SHORTV_cfT(M,I,A,B,D) A + #define BYTEVV_cfT(M,I,A,B,D) (void *)A /* We have to cast to void *,*/ + #define BYTEVVV_cfT(M,I,A,B,D) (void *)A /* since we don't know the */ +@@ -2001,6 +2091,12 @@ + #define LONGVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVVV_cfT(M,I,A,B,D) (void *)A ++#define LONGLONGVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ + #define SHORTVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVVV_cfT(M,I,A,B,D) (void *)A +@@ -2013,6 +2109,7 @@ + #define PINT_cfT(M,I,A,B,D) A + #define PLOGICAL_cfT(M,I,A,B,D) ((*A=F2CLOGICAL(*A)),A) + #define PLONG_cfT(M,I,A,B,D) A ++#define PLONGLONG_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define PSHORT_cfT(M,I,A,B,D) A + #define PVOID_cfT(M,I,A,B,D) A + #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) +@@ -2083,12 +2180,18 @@ + #define INT_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LOGICAL_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LONG_cfFZ(UN,LN) long FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#define LONGLONG_cfFZ(UN,LN) long long FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */ + #define SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define VOID_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)( #ifndef __CF__KnR /* The void is req'd by the Apollo, to make this an ANSI function declaration. The Apollo promotes K&R float functions to double. */ @@ -245,7 +373,7 @@ #ifdef vmsFortran #define STRING_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS #else -@@ -2104,7 +2170,12 @@ +@@ -2104,7 +2207,12 @@ #endif #else #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -258,7 +386,7 @@ #else #define FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)( #endif -@@ -2118,7 +2189,12 @@ +@@ -2118,13 +2226,19 @@ #define BYTE_cfF(UN,LN) BYTE_cfFZ(UN,LN) #define DOUBLE_cfF(UN,LN) DOUBLE_cfFZ(UN,LN) #ifndef __CF_KnR @@ -271,3 +399,18 @@ #else #define FLOAT_cfF(UN,LN) FLOAT_cfFZ(UN,LN) #endif + #define INT_cfF(UN,LN) INT_cfFZ(UN,LN) + #define LOGICAL_cfF(UN,LN) LOGICAL_cfFZ(UN,LN) + #define LONG_cfF(UN,LN) LONG_cfFZ(UN,LN) ++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */ + #define SHORT_cfF(UN,LN) SHORT_cfFZ(UN,LN) + #define VOID_cfF(UN,LN) VOID_cfFZ(UN,LN) + #define STRING_cfF(UN,LN) STRING_cfFZ(UN,LN), +@@ -2187,6 +2301,7 @@ + #define LOGICAL_cfI return C2FLOGICAL(A0); + #endif + #define LONG_cfI return A0; ++#define LONGLONG_cfI return A0; /* added by MR December 2005 */ + #define SHORT_cfI return A0; + #define STRING_cfI return ; + #define VOID_cfI return ; Index: 800-implement-shared-library-rules-in-Imake.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/800-implement-shared-library-rules-in-Imake.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 800-implement-shared-library-rules-in-Imake.dpatch 9 Dec 2005 16:09:19 -0000 1.1 +++ 800-implement-shared-library-rules-in-Imake.dpatch 17 May 2006 19:02:42 -0000 1.2 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules ---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2005-11-29 17:07:32.035570303 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2005-11-29 17:07:40.003888782 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:42:00.576902424 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:42:08.484202137 -0500 @@ -904,6 +904,8 @@ * InstallSharedLibrary - generate rules to install the indicated sharable * Library @@ -27,7 +27,7 @@ /* * InstallLinkKitLibrary - rule to install Link Kit library. -@@ -1963,6 +1966,15 @@ +@@ -1967,6 +1970,15 @@ #endif /* InstallSubdirs */ /* @@ -43,7 +43,7 @@ * InstallBinSubdirs - generate rules to recursively install programs and * scripts */ -@@ -2341,9 +2353,12 @@ +@@ -2354,9 +2366,12 @@ */ #ifndef DefinePackageLibrary #define DefinePackageLibrary(locallib) \ @@ -57,8 +57,8 @@ override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB) @@\ @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules ---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 10:51:01.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2005-11-29 17:09:29.336812562 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 06:51:01.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -227,7 +227,7 @@ RanLibrary($@) #endif @@ -120,8 +120,8 @@ #ifndef SharedLibraryBuild #define SharedLibraryBuild(libname,version) @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules ---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 15:26:45.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2005-11-29 17:07:40.004888571 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 10:26:45.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -43,6 +43,9 @@ #ifndef PositionIndependentCplusplusFlags #define PositionIndependentCplusplusFlags -fPIC Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 805-expunge-missing-mathlib-kernlib-symbols.dpatch 9 Dec 2005 16:09:19 -0000 1.1 +++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch 17 May 2006 19:02:42 -0000 1.2 @@ -5,9 +5,9 @@ ## DP: Remove some unreferenced symbols from mathlib and kernlib. @DPATCH@ -diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile ---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2005-06-13 11:20:33.838151240 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:37.545106161 -0400 ++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:48.094863874 -0400 @@ -1,6 +1,8 @@ #ifndef CERNLIB_VAXVMS @@ -18,9 +18,9 @@ readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\ tmproi.F toslat.F unlinkf.F -diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:12:24.894703741 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:16:54.864966246 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:38.432917462 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:48.095863661 -0400 @@ -2,20 +2,22 @@ #include "pilot.h" @@ -50,25 +50,29 @@ #if defined(CERNLIB_DOUBLE) SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\ -diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 2005-06-13 11:19:42.456136998 -0400 -@@ -1,9 +1,12 @@ --SRCS_F= addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\ -- bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\ -- dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\ -- grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ -- newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ -- quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ -+/* Some files deleted from the below list since they depend upon the -+ lepto63 library, which cannot be included in Debian for licensing reasons. */ -+ -+SRCS_F= addbnd.F bfgs.F bndtst.F bounds.F bucmve.F \ @@\ -+ delbnd.F delete.F dvcopy.F dvdot.F \ @@\ -+ dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F \ @@\ -+ ldlsol.F modchl.F mxstep.F \ @@\ -+ newptq.F nmdchl.F nodaud.F orthvc.F quad.F \ @@\ -+ quasi.F ranums.F rlen.F settol.F shrnk.F \ @@\ - treaud.F tredmp.F tstext.F usrint.F usrtrm.F +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile 2006-05-09 17:00:05.429179570 -0400 +@@ -4,7 +4,7 @@ + grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ + newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ + quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ +- treaud.F tredmp.F tstext.F usrint.F usrtrm.F ++ treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F FORTRANSAVEOPTION = FortranSaveFlags + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F 1969-12-31 19:00:00.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F 2006-05-09 17:01:10.196413696 -0400 +@@ -0,0 +1,10 @@ ++C----------------------------------------------------------------------- ++ FUNCTION DFUN(ND,X) ++C----------------------------------------------------------------------- ++C DUMMY FUNCTION ++C----------------------------------------------------------------------- ++ DOUBLE PRECISION DFUN, X(ND) ++ WRITE (6,10) ++ 10 FORMAT(/10X,'DFUN CALLED BUT NOT LINKED') ++ STOP ++ END cernlib-gfortran.diff: Index: cernlib-gfortran.diff =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-gfortran.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cernlib-gfortran.diff 16 Nov 2005 23:34:07 -0000 1.1 +++ cernlib-gfortran.diff 17 May 2006 19:02:42 -0000 1.2 @@ -1,6 +1,6 @@ ---- src/config/linux.cf.old 2005-06-16 21:11:15.000000000 +0200 -+++ src/config/linux.cf 2005-06-16 21:09:23.000000000 +0200 -@@ -216,7 +216,7 @@ +--- 2005/src/config/linux.cf-old 2006-03-15 11:32:47.000000000 +0100 ++++ 2005/src/config/linux.cf 2006-03-15 11:33:52.000000000 +0100 +@@ -478,7 +478,7 @@ variable=value @@\ endif @@\ @@ -9,16 +9,20 @@ /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */ /* Adapted to CERN style GF. 20-Sep-96 */ -@@ -227,10 +227,10 @@ - # define OptimizedCDebugFlags -O1 -fomit-frame-pointer +@@ -498,14 +498,13 @@ + #endif #define f2cFortran YES --#define FortranCmd g77 -+#define FortranCmd gfortran +-#define FortranCmd g77 -g ++#define FortranCmd gfortran -g #define XargsCmd xargs #define FortranSaveFlags /* */ /* Everything static !? */ --#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex -+#define DefaultFCOptions -fno-second-underscore - #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC - - # endif + #define OptimisedFortranFlags OptimizedCDebugFlags -funroll-loops + /* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */ + #ifndef DefaultFCOptions +-# define DefaultFCOptions -fno-automatic -fno-second-underscore \ +- -fugly-complex ++# define DefaultFCOptions -fno-automatic -fno-second-underscore + #endif + #define CernlibSystem CernlibDefaultDefines CernlibMachineDefines \ + CernlibLocalDefines Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cernlib.spec 16 Feb 2006 21:56:41 -0000 1.23 +++ cernlib.spec 17 May 2006 19:02:42 -0000 1.24 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 12%{?dist} +Release: 20%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -12,18 +12,27 @@ #BuildRequires: gcc-g77 #Requires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel # fedora core -# fc 3 -#BuildRequires: xorg-x11-devel lapack blas openmotif-devel -# fc 4 -BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel -# fc devel -#BuildRequires: imake lapack-devel blas-devel openmotif-devel +BuildRequires: openmotif-devel +%if "%fedora" <= "3" +BuildRequires: lapack blas +%else +BuildRequires: lapack-devel blas-devel +%endif + +%if "%fedora" <= "4" +BuildRequires: xorg-x11-devel +%else +BuildRequires: imake +# workaround #173530 +BuildRequires: libXau-devel +%endif +# for patchy build scripts +BuildRequires: tcsh +BuildRequires: gawk # there are missing f2c intrinsics in gfortran so gfortran cannot be used to # build the cernlib BuildRequires: /usr/bin/g77 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# f771 segfaults on x86_64 -ExcludeArch: x86_64 # these sources are different from the upstream sources as files with # GPL incompatible licences are removed. You can use cernlib-remove-deadpool @@ -44,11 +53,18 @@ Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz Source11: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_phtools.tar.gz Source12: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_scripts.tar.gz -# actually patchy isn't built, for the reason stated in -# see http://borex.princeton.edu/~kmccarty/faq.html#36 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat +# The patchy version 4 sources +Source17: patchy.tar.gz +# this is modified with regard with what Mattias gave me. Indeed the file +# containing some other files (p4inceta) was in fortran unformatted format, +# I believe it is what caused a segfault of rceta on the ppc platform. +# I have recreated the patchy.tar.gz from Mattias tarball by running +# sh patchy-unpack-rceta +Source203: patchy-unpack-rceta + # Shell scripts that go in /etc/profile.d Source100: cernlib.sh.in Source105: cernlib.csh.in @@ -66,7 +82,7 @@ Source201: cernlib-deadpool.txt # debian patchset -Patch0: cernlib_2005.05.09.dfsg-3.diff +Patch0: cernlib_2005.05.09.dfsg-6.diff # change file to directory to DATADIR Patch1100: cernlib-enforce-FHS.diff Patch1: 001-fix-missing-fluka.dpatch @@ -107,7 +123,7 @@ Patch210: 210-improve-cfortran-header-files.dpatch # split in newer debian patchset Patch2110: 211-fix-comis-on-amd64.dpatch -Patch2111: 211-fix-comis-on-ia64.dpatch +Patch2111: 211-fix-comis-on-ia64-alpha.dpatch Patch300: 300-skip-duplicate-lenocc.dpatch # Use another approach, see cernlib-enforce-FHS # Patch33: 301-datafiles-comply-with-FHS.dpatch @@ -134,6 +150,8 @@ Patch314: 314-permit-using-regcomp-for-re_comp.dpatch Patch315: 315-fixes-for-MacOSX.dpatch Patch318: 318-additional-gcc-3.4-fixes.dpatch +# certainly not needed, but who knows? +Patch319: 319-work-around-imake-segfaults.dpatch Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch Patch701: 701-patch-hbook-comis-Imakefiles.dpatch @@ -148,8 +166,8 @@ Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch Patch802: 802-create-shared-libraries.dpatch # in the original cernlib kxterm is built with the C compiler, which cause -# a failure if compiled with de cernlib debian script as -lg2c isn't found. -# It is corrected by +# a failure if compiled with the cernlib debian script as -lg2c isn't found. +# It is corrected in Patch803: 803-link-binaries-dynamically.dpatch # 803 depends on # 208-fix-redundant-packlib-dependencies.dpatch @@ -189,6 +207,20 @@ Patch1205: cernlib-gfortran.diff Patch1207: cernlib-v107z0_X_before_string.diff +# patchy 4 +# not applied as it has allready been done by the sed one-liner in +# patchy-unpack-rceta +Patch1500: patchy-rceta.patch + +Patch1501: patchy-insecure_tmp_use.diff +Patch1502: patchy-fcasplit.patch +Patch1503: patchy-p4comp.patch + +# patchy 5 (included in cernlib) +Patch1504: patchy-case.patch +Patch1505: patchy-perror.patch +Patch1506: patchy-yexpand.diff + %description CERN program library is a large collection of general purpose libraries and modules maintained and offered on the CERN. Most of these programs @@ -202,7 +234,17 @@ %package devel Summary: General purpose CERN library static libraries and headers -Requires: lapack-devel blas-devel openmotif-devel +Requires: openmotif-devel +%if "%fedora" <= "3" +Requires: lapack blas +%else +Requires: lapack-devel blas-devel +%endif + +%if "%fedora" > "4" +# workaround #173530 +Requires: libXau-devel +%endif Requires: %{name} = %{version}-%{release} Group: Development/Libraries @@ -276,6 +318,13 @@ According to the responsible of the cernlib debian package, some of these utilities may have security flaws. +%package -n patchy +Group: Applications/Archiving +Summary: The patchy utilities + +%description -n patchy +Utilities for extracting sources from patchy cards and cradles. + %prep %setup -c @@ -292,6 +341,24 @@ %setup -T -D -a 12 %setup -T -D -a 14 %setup -T -D -a 15 +%setup -T -D -a 17 + +# patch patchy 4 installer fortran generator script +# avtually it is unusefull, because the unpacking has been done +# offline, see comment above. +#%patch -P 1500 + +%patch -P 1501 + +# unpack the patchy version 4 sources is done offline, +# see comment above +#pushd patchy +# ./rceta.sh +#popd + +%patch -P 1502 +%patch -P 1503 + %patch -p1 cd %{version} @@ -352,6 +419,7 @@ cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/ %patch -P 318 -p1 +%patch -P 319 -p1 # move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch) mv src/packlib/kernlib src/kernlib @@ -455,13 +523,16 @@ %patch -P 805 -p1 %patch -P 806 -p1 +%patch -P 1504 -p1 +%patch -P 1505 -p1 +%patch -P 1506 -p1 %patch -P 1200 %patch -P 1201 %patch -P 1203 %patch -P 1204 # use gfortran -#%patch -P 1205 +#%patch -P 1205 -p1 # workaround gfortran bug %patch -P 1207 @@ -515,7 +586,8 @@ # substitude the right defaults in the scripts sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \ - src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script + src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \ + ../patchy/ylist ../patchy/yindex # substitute version in gxint with the right version # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f @@ -525,6 +597,9 @@ sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \ src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F +# substitute bindir in ylist and yindex to conform to FHS +sed -i -e 's:\$CERN/patchy/\$PATCHY_VERSION/bin:%{_bindir}:' ../patchy/ylist ../patchy/yindex + # Create the build directory structure mkdir -p build bin lib shlib @@ -543,6 +618,16 @@ cp %{SOURCE104} bin/ chmod a+x bin/mkdirhier +PATHSAVE=$PATH +# Build patchy version 4 +pushd ../patchy +# export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" + export PATH=".:..:$PATH" + p4boot.sh 0 +popd +find ../patchy -name y* -a -perm -755 -exec install {} bin ';' +export PATH=$PATHSAVE + # Create the top level Makefile with imake cd $CERN_ROOT/build @@ -553,6 +638,7 @@ # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin make %{?_smp_mflags} bin/kuipc +make patchy/Makefile make scripts/Makefile cd scripts make install.bin @@ -573,6 +659,13 @@ cd $CERN_ROOT/build/packlib make %{?_smp_mflags} install.bin +# Build npatchy +# The build of patchy is completly messed up on ppc +%ifnarch ppc +cd $CERN_ROOT/build/patchy +make %{?_smp_mflags} install.bin +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -607,7 +700,6 @@ # to preserve symlinks (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) -#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -) rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier @@ -653,7 +745,6 @@ %doc cernlib.README copyright %doc debian/debhelper/geant321.README.debian %doc debian/debhelper/libpdflib804-2-dev.README.debian -%doc debian/debhelper/libmathlib2.README.debian %doc debian/debhelper/montecarlo-base.README.debian # the utils and devel are separated to have the possibility to install @@ -708,9 +799,62 @@ %{_bindir}/zftp %doc debian/debhelper/zftp.README.debian +%files -n patchy +%defattr(-,root,root,-) +%ifnarch ppc +%{_bindir}/fcasplit +%{_bindir}/nycheck +%{_bindir}/nydiff +%{_bindir}/nyindex +%{_bindir}/nylist +%{_bindir}/nymerge +%{_bindir}/nypatchy +%{_bindir}/nyshell +%{_bindir}/nysynopt +%{_bindir}/nytidy +%{_bindir}/yexpand +%endif +%{_bindir}/ycompar +%{_bindir}/yedit +%{_bindir}/yfrceta +%{_bindir}/yindex +%{_bindir}/yindexb +%{_bindir}/ylist +%{_bindir}/ylistb +%{_bindir}/ypatchy +%{_bindir}/ysearch +%{_bindir}/yshift +%{_bindir}/ytobcd +%{_bindir}/ytobin +%{_bindir}/ytoceta + + %changelog -* Thu Feb 16 2006 Patrice Dumas - 2005-12 -- new cernlib.m4 +* Wed May 17 2006 Patrice Dumas - 2005-20 +- use new debian patchset. Fix 191631 + +* Tue Apr 13 2006 Patrice Dumas - 2005-19 +- add a patch to yexpand, to avoid using $HOME. + +* Tue Apr 13 2006 Patrice Dumas - 2005-17 +- npatchy don't build on ppc. + +* Wed Apr 12 2006 Patrice Dumas - 2005-16 +- unpack patchy offline because the files are within an unformatted + fortran file which won't be right on all the arches. + +* Tue Apr 11 2006 Patrice Dumas - 2005-15.1 +- add conditionals in spec to have only one for all fedora versions. + +* Tue Apr 11 2006 Patrice Dumas - 2005-14 +- add patchy version 4 and build cernlib patchy. From Mattias Ellert. +- update to newer debian patchset + +* Thu Feb 16 2006 Patrice Dumas - 2005-13 +- rebuild for fc5 + +* Tue Jan 17 2006 Patrice Dumas - 2005-12.1 +- attempt a rebuild against newer openmotif * Tue Dec 20 2005 Patrice Dumas - 2005-11.4 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11 @@ -719,35 +863,29 @@ * Tue Dec 20 2005 Patrice Dumas - 2005-10 - add file in /etc/ld.so.conf.d required for dynamic linking -* Wed Dec 14 2005 Patrice Dumas - 2005-9.2 +* Wed Dec 14 2005 Patrice Dumas - 2005-9.1 - use new debian patchset -* Fri Dec 9 2005 Patrice Dumas - 2005-8.3 +* Fri Dec 9 2005 Patrice Dumas - 2005-8.1 - use new debian patchset - enable 64 bit fixes patch + +* Fri Dec 2 2005 Patrice Dumas - 2005-7 +- use updated beta debian patchset - remove the BSD in the licence because there is no library nor binary under a BSD licence and someone could get the idea that there is some dual BSD/GPL licenced binaries or libraries. The LGPL is kept because of cfortran + +* Tue Nov 29 2005 Patrice Dumas - 2005-6.1 - update with newer debian patchset for cernlib, fix licence issues +- don't use the include.tar.gz source, instead get include files from + the source files - build shared libraries - simplify the scripts modifications +- add BuildRequires: libXau-devel to workaround #173530 -* Fri Nov 25 2005 Patrice Dumas - 2005-4.8 -- use debian patches of the cernlib 2005 patchset for the files removal -- move kernlib out of packlib -- don't use includes.tar.gz, but instead get the include files from the - sources - -* Mon Nov 21 2005 Patrice Dumas - 2005-4.7 -- add debian patch for MacOSX that could have fixed the PPC build -- add associated patch for use of regcomp instead of regcmp -- add a patch that comment out the CERNLIB_SHIFT define for ppc - and allows to use motif -- exclude x86_64 as f771 segfaults on that target -- modify or remove debian patchs that requires the new imake rules - -* Tue Nov 15 2005 Patrice Dumas - 2005-4.1 +* Tue Nov 15 2005 Patrice Dumas - 2005-4 - add a .csh file - correct defaults in cernlib scripts Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/paw.README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- paw.README 14 Dec 2005 16:15:57 -0000 1.3 +++ paw.README 17 May 2006 19:02:42 -0000 1.4 @@ -41,6 +41,11 @@ to the beginning of them. +5) Shared libs + +PAW is linked dynamically, therefore the pawlib used is selected by the +/etc/ld.so.conf or $LD_LIBRARY_PATH settings. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by Index: sources =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Dec 2005 16:09:19 -0000 1.5 +++ sources 17 May 2006 19:02:42 -0000 1.6 @@ -13,3 +13,4 @@ 67228b011eac13b44499c50219e21545 src_graflib.tar.gz 4fdcdc9f819ebbb9c6d3a04f339cdcf8 src_packlib.tar.gz eecb52159458ead0ee6b0d00b90aab66 xsneut95.dat +b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz --- 211-fix-comis-on-ia64.dpatch DELETED --- --- cernlib_2005.05.09.dfsg-3.diff DELETED --- From fedora-extras-commits at redhat.com Wed May 17 19:10:23 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 17 May 2006 12:10:23 -0700 Subject: kadischi/livecd_generator install-boot.sh, 1.4, 1.5 livecd-mkinitrd.sh, 1.8, 1.9 Message-ID: <200605171910.k4HJANuJ009900@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9869/kadischi/livecd_generator Modified Files: install-boot.sh livecd-mkinitrd.sh Log Message: FC4-compatibility and optional bootsplash modification Index: install-boot.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- install-boot.sh 30 Mar 2006 05:46:06 -0000 1.4 +++ install-boot.sh 17 May 2006 19:10:21 -0000 1.5 @@ -9,6 +9,23 @@ . /etc/kadischi/kadischi.conf +nobootsplash() { + cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ +default linux +prompt 1 +timeout 600 +label linux + kernel vmlinuz + append initrd=initrd.img quiet $kernel_params +label debug + kernel vmlinuz + append initrd=initrd.img INITRD_DBG=x +_EOF_ + + exit 0 + +} + if [ -x $sysdir/usr/bin/rhgb ]; then kernel_params="$kernel_params rhgb" fi @@ -18,7 +35,12 @@ cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/ if [ ! $kernel_is_xen ]; then -cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/ + if [ -d $INSTALLDIR/bootsplash ]; then + cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/ + else + echo "Nothing found for bootsplashing." + nobootsplash + fi cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ default linux prompt 1 @@ -39,7 +61,12 @@ append - _EOF_ else -cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/ + if [ -d $INSTALLDIR/bootsplash ]; then + cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/ + else + echo "Nothing found for bootsplashing." + nobootsplash + fi cp $sysdir/boot/xen.gz-$kernel_version_proper $csysdir/boot/isolinux/xen.gz cp /usr/lib/syslinux/mboot.c32 $csysdir/boot/isolinux/ cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- livecd-mkinitrd.sh 11 Apr 2006 08:26:22 -0000 1.8 +++ livecd-mkinitrd.sh 17 May 2006 19:10:21 -0000 1.9 @@ -253,7 +253,11 @@ inst $rootdir/sbin/MAKEDEV "$MNTIMAGE/sbin/MAKEDEV" fi -inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist" +if [ -f $rootdir/etc/modprobe.conf.dist ]; then + inst $rootdir/etc/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.conf.dist" +else + inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist" +fi inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep" MODULES=$(findmodules drivers/parport drivers/block/loop.ko fs/squashfs) From fedora-extras-commits at redhat.com Wed May 17 19:10:24 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 17 May 2006 12:10:24 -0700 Subject: kadischi/post_install_scripts 01prelink.sh,1.2,1.3 Message-ID: <200605171910.k4HJAOrj009906@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9869/kadischi/post_install_scripts Modified Files: 01prelink.sh Log Message: FC4-compatibility and optional bootsplash modification Index: 01prelink.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/01prelink.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 01prelink.sh 30 Mar 2006 05:46:06 -0000 1.2 +++ 01prelink.sh 17 May 2006 19:10:22 -0000 1.3 @@ -8,9 +8,9 @@ if [ -f $CHROOTDIR/etc/prelink.conf ]; then echo "Prelinking.. " - chroot $CHROOTDIR /bin/mount -t proc /proc /proc || exit 1 + chroot $CHROOTDIR /bin/mount -t proc /proc /proc || sleep 1 chroot $CHROOTDIR /usr/sbin/prelink --all >/dev/null 2>&1 - chroot $CHROOTDIR /bin/umount /proc || exit 1 + chroot $CHROOTDIR /bin/umount /proc || sleep 1 exit 0 else echo "No prelink.conf found.. won't prelink." From fedora-extras-commits at redhat.com Wed May 17 19:14:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 May 2006 12:14:33 -0700 Subject: rpms/perl-YAML/devel perl-YAML-testmore054.patch, 1.2, 1.3 perl-YAML.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200605171914.k4HJEZUN009971@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9947 Modified Files: perl-YAML.spec sources Added Files: perl-YAML-testmore054.patch Log Message: Revert to 0.39 temporarily. perl-YAML-testmore054.patch: Index: perl-YAML-testmore054.patch =================================================================== RCS file: perl-YAML-testmore054.patch diff -N perl-YAML-testmore054.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ perl-YAML-testmore054.patch 17 May 2006 19:14:32 -0000 1.3 @@ -0,0 +1,15 @@ +--- t/20load.t~ 2005-03-31 05:18:43.000000000 +0300 ++++ t/20load.t 2005-04-13 17:35:47.000000000 +0300 +@@ -1,7 +1,11 @@ + use lib 'lib', 't'; + use TestChunks; + plan tests => number_of_tests; +-test_load; ++SKIP: { ++ Test::More::skip "This test hangs with Test::More < 0.54", number_of_tests ++ unless $Test::More::VERSION && $Test::More::VERSION >= 0.54; ++ test_load; ++}; + + __DATA__ + === Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-YAML.spec 9 May 2006 17:19:22 -0000 1.9 +++ perl-YAML.spec 17 May 2006 19:14:32 -0000 1.10 @@ -1,15 +1,18 @@ Name: perl-YAML -Version: 0.58 +Version: 0.39 Release: 2%{?dist} Summary: YAML Ain't Markup Language (tm) -License: GPL or Artistic + Group: Development/Libraries +License: GPL or Artistic URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz +Patch0: %{name}-testmore054.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildArch: noarch -BuildRequires: perl(Test::Base) >= 0.49 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The YAML.pm module implements a YAML Loader and Dumper based on the @@ -20,48 +23,43 @@ For information on the YAML syntax, please refer to the YAML specification. + %prep %setup -q -n YAML-%{version} +%patch0 -p0 + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; - -chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check +%check || : make test + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc Changes README %{_bindir}/ysh %{perl_vendorlib}/YAML* -%{perl_vendorlib}/Test/YAML* %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* -%{_mandir}/man3/Test::YAML*.3* -%changelog -* Tue May 09 2006 Steven Pritchard 0.58-2 -- Drop testmore patch. -- Catch Test::YAML module and man page in file list. - -* Thu May 04 2006 Steven Pritchard 0.58-1 -- Update to 0.58. -- Small spec cleanups. +%changelog * Thu Apr 14 2005 Ville Skytt?? - 0.39-2 - 0.39. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 May 2006 16:32:39 -0000 1.4 +++ sources 17 May 2006 19:14:32 -0000 1.5 @@ -1 +1 @@ -aa5ac653057914ca995dd74de8212ebc YAML-0.58.tar.gz +b8a49f49cb0ee6d9698807fb3f606922 YAML-0.39.tar.gz From fedora-extras-commits at redhat.com Wed May 17 19:24:11 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 12:24:11 -0700 Subject: rpms/scrip/devel scrip.spec,1.1,1.2 Message-ID: <200605171924.k4HJODlV010138@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10121 Modified Files: scrip.spec Log Message: fix license name Index: scrip.spec =================================================================== RCS file: /cvs/extras/rpms/scrip/devel/scrip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scrip.spec 17 May 2006 17:20:01 -0000 1.1 +++ scrip.spec 17 May 2006 19:24:10 -0000 1.2 @@ -1,10 +1,12 @@ Name: scrip Version: 1.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Spherical Coordinate Remapping and Interpolation Package (SCRIP) Group: Applications/Engineering -License: BSD +# The license is very similar to BSD with one exception: modified +# sources cannot be redistributed using the "SCRIP" name. +License: SCRIP License URL: http://climate.lanl.gov/Software/SCRIP/index.htm Source0: http://climate.lanl.gov/Software/SCRIP/scrip1.4.tar.gz Source1: http://climate.lanl.gov/Software/SCRIP/copyright.html @@ -40,10 +42,13 @@ %files %defattr(-,root,root,-) -%doc copyright.html doc/SCRIPusers.pdf +%doc copyright.html doc/SCRIPusers.pdf bugs %{_bindir}/* %changelog +* Wed May 17 2006 Ed Hill - 1.4-5 +- fix license name + * Wed May 17 2006 Ed Hill - 1.4-4 - make should respect rpm flags (thanks to Patrice Dumas) From fedora-extras-commits at redhat.com Wed May 17 19:33:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 May 2006 12:33:47 -0700 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.17,1.18 Message-ID: <200605171933.k4HJXnex010247@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-serv10230 Modified Files: perl-Module-Build.spec Log Message: Call this version 0.2800 to avoid an epoch bump. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Module-Build.spec 13 May 2006 15:39:54 -0000 1.17 +++ perl-Module-Build.spec 17 May 2006 19:33:47 -0000 1.18 @@ -1,12 +1,13 @@ +%define module_version 0.28 + Name: perl-Module-Build -Version: 0.28 -Release: 2%{?dist} -Epoch: 1 +Version: 0.2800 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{module_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Tar) >= 1.08 @@ -32,7 +33,7 @@ works fine on perl 5.005 if you can install a few additional modules. %prep -%setup -q -n Module-Build-%{version} +%setup -q -n Module-Build-%{module_version} %build %{__perl} Build.PL installdirs=vendor @@ -61,12 +62,8 @@ %{_mandir}/man3/Module::Build*.3* %changelog -* Sat May 13 2006 Steven Pritchard - 1:0.28-2 -- Rebuild. - -* Fri May 12 2006 Steven Pritchard - 1:0.28-1 -- Update to 0.28. -- Epoch bump to make 0.28 > 0.2612. +* Wed May 17 2006 Steven Pritchard 0.2800-1 +- Update to 0.28, but call it 0.2800 to avoid an epoch bump. - Various spec cleanups to closer match cpanspec output. * Wed Mar 15 2006 Steven Pritchard - 0.2612-2 From fedora-extras-commits at redhat.com Wed May 17 21:00:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 17 May 2006 14:00:14 -0700 Subject: rpms/cernlib/FC-3 211-fix-comis-on-ia64-alpha.dpatch, NONE, 1.1 319-work-around-imake-segfaults.dpatch, NONE, 1.1 cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 patchy-case.patch, NONE, 1.1 patchy-fcasplit.patch, NONE, 1.1 patchy-insecure_tmp_use.diff, NONE, 1.1 patchy-p4comp.patch, NONE, 1.1 patchy-perror.patch, NONE, 1.1 patchy-rceta.patch, NONE, 1.1 patchy-unpack-rceta, NONE, 1.1 patchy-yexpand.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 307-use-canonical-cfortran.dpatch, 1.2, 1.3 800-implement-shared-library-rules-in-Imake.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib-gfortran.diff, 1.1, 1.2 cernlib.m4, 1.2, 1.3 cernlib.spec, 1.17, 1.18 paw.README, 1.3, 1.4 sources, 1.4, 1.5 211-fix-comis-on-ia64.dpatch, 1.1, NONE cernlib_2005.05.09.dfsg-3.diff, 1.1, NONE Message-ID: <200605172100.k4HL0GAR014619@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14547 Modified Files: .cvsignore 112-remove-nonexistent-prototypes-from-gen.h.dpatch 307-use-canonical-cfortran.dpatch 800-implement-shared-library-rules-in-Imake.dpatch 805-expunge-missing-mathlib-kernlib-symbols.dpatch cernlib-gfortran.diff cernlib.m4 cernlib.spec paw.README sources Added Files: 211-fix-comis-on-ia64-alpha.dpatch 319-work-around-imake-segfaults.dpatch cernlib_2005.05.09.dfsg-6.diff patchy-case.patch patchy-fcasplit.patch patchy-insecure_tmp_use.diff patchy-p4comp.patch patchy-perror.patch patchy-rceta.patch patchy-unpack-rceta patchy-yexpand.diff Removed Files: 211-fix-comis-on-ia64.dpatch cernlib_2005.05.09.dfsg-3.diff Log Message: sync with devel branch --- NEW FILE 211-fix-comis-on-ia64-alpha.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 211-fix-comis-on-ia64-alpha.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Further patch building on Harald Vogt's amd64 patch attempting to ## DP: fix PAW on Itanium/Alpha Linux. This does not yet work completely... @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:45.236828642 -0500 @@ -39,12 +39,45 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *nn; { int i,n; char *a,*b; n=*nn; a=*ja; b=*jb; +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *nn; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:51:18.796348318 -0500 @@ -74,6 +74,24 @@ /* printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else double (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:51:05.440199025 -0500 @@ -67,6 +67,24 @@ /* printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else int (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:50:47.519024096 -0500 @@ -89,6 +89,24 @@ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; double r; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else float (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:45.236828642 -0500 @@ -42,6 +42,27 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *na, *nb; @@ -56,6 +77,18 @@ { a=*jb; b=*ja; la=*nb; lb=*na; k=-1; } +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *na, *nb; --- NEW FILE 319-work-around-imake-segfaults.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 319-work-around-imake-segfaults.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: If at first Imake doesn't succeed, try, try again. ## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.) @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules --- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:35:09.050384887 -0500 +++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:38:18.693611381 -0500 @@ -1296,7 +1296,11 @@ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - imakeflags -f $< + imakeflags -f $< || \ @@\ + $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + imakeflags -f $< || exit 1 #endif /* BuildMakefileTarget */ @@ -2127,7 +2131,11 @@ ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ - -DPackageName=$(PACKAGE_NAME); \ @@\ + -DPackageName=$(PACKAGE_NAME) || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) || exit 1; \ @@\ fi; \ @@\ $(MAKE) $(MFLAGS) Makefiles; \ @@\ cd $$newtop; \ @@\ @@ -2322,7 +2330,12 @@ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - -f $$imakefile; \ @@\ + -f $$imakefile || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + -f $$imakefile || exit 1; \ @@\ fi; \ @@\ fi; #endif cernlib_2005.05.09.dfsg-6.diff: --- NEW FILE cernlib_2005.05.09.dfsg-6.diff --- --- cernlib-2005.05.09.dfsg.orig/debian/control +++ cernlib-2005.05.09.dfsg/debian/control @@ -0,0 +1,896 @@ +Source: cernlib +Maintainer: Kevin B. McCarty +Standards-Version: 3.7.2 +Priority: optional +Section: science +Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin + +Package: cernlib-base +Architecture: all +Section: devel +Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev +Description: script to determine Cernlib library dependencies + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This package includes the "cernlib" script that lists the command-line + options needed for linking against Cernlib libraries. The script has + been rewritten from the upstream version to calculate + dependencies recursively. Also included are a README.Debian with a summary + of changes made to Cernlib to fit it into Debian packaging practices, + and a contributed set of Autoconf macros to test for Cernlib libraries. + +Package: cernlib-core-dev +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit +Description: Cernlib development headers, tools, and static libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the header files and static libraries likely to be + wanted by developers using the Cern libraries who are not interested + specifically in high energy physics. It also provides the Cernlib + development tools DZedit and KUIPC. Cernlib analysis programs may be + obtained by installing the cernlib-core metapackage. + +Package: cernlib-core +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos +Description: Cernlib main libraries and programs + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the libraries and analysis tools (e.g. PAW) likely + to be wanted by most users of the Cern libraries who are not interested + specifically in high energy physics. You cannot do program development by + installing only this metapackage; development libraries and tools may + be obtained by installing the cernlib-core-dev metapackage or individual + lib*-dev packages. + +Package: cernlib-extras +Architecture: all +Priority: extra +Section: science +Depends: cernlib-base (= ${Source-Version}), pawserv, zftp +Description: miscellaneous Cernlib programs unlikely to be used by many + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides a few additional Cernlib programs not included + in any other Cernlib metapackage. Very few people are likely to be + interested in them; currently they include zftp, pawserv and zserv. + Notice that the latter two programs run as daemons through inetd and may + reduce your system's security! + . + Installing this package along with the "cernlib" metapackage will supply + a complete set of all Cernlib programs and libraries included in Debian. + +Package: cernlib-montecarlo +Architecture: all +Section: science +Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev +Recommends: libisajet758-2-dev +Description: Cernlib Monte Carlo libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides various Monte Carlo libraries included in Cernlib + (both shared and static). Likely only physicists will be interested in + these packages. Note that the Geant 3.21 program is not included, but it may + be obtained by also installing the geant321 Debian package. + . + Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are + not available within Debian due to licensing issues; see the README.Debian + file in the montecarlo-base package for information on obtaining them. + . + Additionally, the Isajet library is not available on the m68k architecture + due to a compiler flaw. + +Package: cernlib +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev +Description: almost complete set of Debian Cernlib packages + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides almost all of the programs and libraries contained + in Cernlib. Most people will likely want only a subset of these. A few + extra Cernlib programs, not of interest to many people, may be obtained via + the cernlib-extras metapackage. + +Package: dzedit +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libpacklib1-dev +Description: Cernlib's ZEBRA documentation editor + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system + developed at CERN. ZEBRA, part of the Packlib library, permits a developer to + create complex data structures in the FORTRAN 77 language; the DZDOC system + allows the developer to generate and maintain documentation of ZEBRA data + structures. + +Package: geant321-data +Architecture: all +Section: science +Depends: cernlib-base +Description: [Physics] Data for Geant 3.21 detector simulator + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes data files for use by Geant. + +Package: geant321-doc +Architecture: all +Section: doc +Depends: cernlib-base +Description: [Physics] Documentation for Geant 3.21 + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes some documentation about Geant. + +Package: geant321 +Architecture: all +Section: science +Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77 +Suggests: kxterm, geant321-doc +Description: [Physics] Particle detector description and simulation tool + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes gxint, the script used to perform this linking step. + +Package: kuipc +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, cernlib-base +Recommends: libpacklib1-dev +Suggests: libpacklib1-lesstif-dev +Description: Cernlib's Kit for a User Interface Package (KUIP) compiler + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify + the writing of a program's user interface code. It takes as + input a Command Definition File (CDF) that describes the + commands to be understood by the program, and outputs C or FORTRAN code that + makes the appropriate function calls to set up the user interface. This + code can then be compiled and linked with the rest of the program. Since + the generated code uses KUIP routines, the program must also be linked + against the Packlib library that contains them. + . + KUIPC is no longer actively developed, so aside from its use in the build + process of Cernlib, it is of mainly historical interest. + +Package: kxterm +Architecture: any +Section: science +Depends: ${shlibs:Depends}, cernlib-base +Description: Cernlib's KUIP terminal emulator + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KXterm is a terminal emulator which combines the best features from + the (now defunct) Apollo DM pads (like: input and transcript [...21456 lines suppressed...] +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ./pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, C??? hai" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd" + +#. Type: select +#. Description +#: ./pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po +++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-05-26 16:05-0300\n" +"Last-Translator: Andr? Lu?s Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a serem executados a partir do inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos " +"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv " +"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP " +"do CERN). Esses servidores s?o executados a partir do inetd; voc? " +"pode habilitar cada um deles separadamente ou ambos. A menos que voc? " +"possua necessidades bastante especializadas, voc? provavelmente ir? " +"desejar habilitar somente o pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po +++ cernlib-2005.05.09.dfsg/debian/po/sv.po @@ -0,0 +1,53 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib 2005.05.09-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-10-06 23:50+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, B?da" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servrar som ska k?ras fr?n inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att " +"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem " +"att logga in med CERN's ZFTP-protokoll). Dessa servrar k?rs fr?n inetd; du m?ste " +"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott " +"om pawserv aktiveras." + --- cernlib-2005.05.09.dfsg.orig/debian/po/es.po +++ cernlib-2005.05.09.dfsg/debian/po/es.po @@ -0,0 +1,55 @@ +# cernlib po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the cernlib package. +# +# Changes: +# - Initial translation +# C??sar G??mez Mart??n +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentaci??n de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducci??n de Debian al espa??ol +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducci??n en +# http://www.debian.org/intl/spanish/notas +# +# - La gu??a de traducci??n de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-09-01 17:49+0100\n" +"Last-Translator: C??sar G??mez Mart??n \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a ejecutar desde inetd" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol). These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv." +msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++) y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv." + patchy-case.patch: --- NEW FILE patchy-case.patch --- --- 2004.orig/src/patchy/Imakefile 2006-04-13 11:15:58.000000000 +0200 +++ 2004/src/patchy/Imakefile 2006-04-13 11:27:07.000000000 +0200 @@ -54,7 +54,7 @@ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile ypatchy - p5lib p5lib TTY .go - fcasplit p5lib.f + ./fcasplit p5lib.f RemoveFile(p5lib.f) cat p5lib.libmake >> p5lib.mkfca $(MAKE) -f p5lib.mkfca $@ @@ -79,8 +79,8 @@ @ ln -s $< $@ %.f: $(LDIR)%.cra $(LDIR)patchy.car - ypatchy - $@ $< TTY .go - + ypatchy - :$@ :$< TTY .go + .f.o: $(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $< @@ -92,9 +92,9 @@ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \ ysearch yshift ytobcd ytobin ytoceta -P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)) +P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)) -$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)): +$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)): cd $(dir $@); \ @@\ if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\ ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\ patchy-fcasplit.patch: --- NEW FILE patchy-fcasplit.patch --- --- patchy/fcasplit.f.orig 2006-04-10 01:06:32.000000000 +0200 +++ patchy/fcasplit.f 2006-04-10 01:16:05.000000000 +0200 @@ -23,7 +23,7 @@ PARAMETER (CHIDA = ';DECK I' ) PARAMETER (CHOVER= 'UNKNOWN') - PARAMETER (CHPOF = '-c -O2 -Nx800 -Nc200') + PARAMETER (CHPOF = '-c -O2') PARAMETER (CHPOC = '-c -O2 -posix') PARAMETER (CHPOA = ' ') patchy-insecure_tmp_use.diff: --- NEW FILE patchy-insecure_tmp_use.diff --- diff -u patchy-orig/yindex patchy/yindex --- patchy-orig/yindex 2006-04-11 10:33:39.000000000 +0200 +++ patchy/yindex 2006-04-11 10:44:10.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: yindex-orig diff -u patchy-orig/ylist patchy/ylist --- patchy-orig/ylist 2006-04-11 10:33:48.000000000 +0200 +++ patchy/ylist 2006-04-11 10:40:17.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: ylist-orig patchy-p4comp.patch: --- NEW FILE patchy-p4comp.patch --- --- patchy/p4comp.fca.orig 2006-04-08 12:46:17.000000000 +0200 +++ patchy/p4comp.fca 2006-04-08 12:47:34.000000000 +0200 @@ -11458,7 +11458,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 12 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 12 CONTINUE NWTK = KDNWT NCH = 80 @@ -12383,7 +12383,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 13 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 13 CONTINUE NWTK = KDNWT NCHCCT = 80 @@ -14260,7 +14260,7 @@ C-------------- END CDE -------------- C DIMENSION MM(10), ITP(9) A8M DIMENSION MM(6), ITP(9) -A8M - PARAMETER ( NBLANK = '20202000'X ) + PARAMETER ( NBLANK = X'20202000' ) IT = ITP(1) JARTPX = 0 @@ -14430,7 +14430,7 @@ 24 JLOW = JCH - MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X) + MV(JCH) = AND (MV(JCH), X'FFFFFFDF') 49 CONTINUE JCCLOW = MAX (JCCLOW,JLOW) @@ -14465,8 +14465,8 @@ - DATA ACTION/'HOLD ','RESUME','EOF ','REWIND','ATTACH','DETACH' - +, 'EOFREW','CLOSE ' / + DATA ACTION/6HHOLD ,6HRESUME,6HEOF ,6HREWIND,6HATTACH,6HDETACH + +, 6HEOFREW,6HCLOSE / C------ CODE BITS IN IOTALL, IOTOFF, IOTON, IOTYP @@ -14801,7 +14801,7 @@ DO 31 JC=1,NCD J = J+1 DO 19 JJ=1,KDNWT1 - IF (AND(MV(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(MV(J),X'FF000000').EQ.0) GO TO 31 19 J = J+1 31 CONTINUE @@ -14825,7 +14825,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -14855,7 +14855,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -17316,6 +17316,8 @@ /*> ROUTINE ABEND CERN PROGLIB# Z035 ABEND .VERSION KERNFOR 4.31 911111 */ +#include + void abend_() { exit(7); @@ -17430,7 +17432,7 @@ char *fname; int *lgname; { - char *malloc(); + void *malloc(); char *ptalc, *pttext; int fchput(); int nalc; @@ -17664,7 +17666,7 @@ char *ftext; int lgtext; { - char *malloc(); + void *malloc(); char *ptalc, *ptuse; char *utext; int nalc; patchy-perror.patch: --- NEW FILE patchy-perror.patch --- --- 2005/src/patchy/patchy.car.orig 1996-07-15 13:46:22.000000000 +0200 +++ 2005/src/patchy/patchy.car 2006-04-09 02:18:17.000000000 +0200 @@ -3708,7 +3708,7 @@ 38 WRITE (IQTYPE,9038) CHLIFI(1:NN) +SELF, IF=QS_UNIX. - IF (LUNOLD.NE.0) CALL PERRORF (' System msg') + IF (LUNOLD.NE.0) CALL PERROR (' System msg') +SELF. IF (NQINIT.EQ.0) THEN IF (IQPRNT.NE.IQTYPE) WRITE (IQPRNT,9038) CHLIFI(1:NN) @@ -4399,7 +4399,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF (' Perror has') + CALL PERROR (' Perror has') +SELF. CALL P_KILL (MSG) END @@ -4446,7 +4446,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF ('Perror has') + CALL PERROR ('Perror has') +SELF. CALL P_FATAL (MSG) END @@ -15112,7 +15112,7 @@ +DECK, SEGVIOL, T=JOIN, IF=QDIAG, IF=QS_UNIX. SUBROUTINE SEGVIOL - CALL PERRORF ('perrorf has') + CALL PERROR ('perror has') CALL P_KILL ('SEGVIOL reached') END patchy-rceta.patch: --- NEW FILE patchy-rceta.patch --- --- patchy/rceta.sh.orig 1995-05-04 21:23:45.000000000 +0200 +++ patchy/rceta.sh 2006-04-08 12:20:26.000000000 +0200 @@ -225,8 +225,8 @@ RETURN END \\ - fort77 -o rceta rceta.f - rceta <<\\ + f77 -g -O2 -o rceta rceta.f + ./rceta <<\\ CODE INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX CODE CARD 1 IN HOLLERITH FOR CETA VALUES 1 - 47 CODE CARD 2 IN HOLLERITH FOR CETA VALUES 65 - 90 --- NEW FILE patchy-unpack-rceta --- #! /bin/bash set -e cd . file=patchy script=rceta.sh archive=$file.tar.gz echo "Unpacking from $archive" tar xzf $archive echo "patching script" sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script pushd $file ./$script popd echo "Repacking $archive" tar czf $archive $file exit 0 patchy-yexpand.diff: --- NEW FILE patchy-yexpand.diff --- --- 2004.orig/src/patchy/yexpand.script 2006-04-14 00:29:48.000000000 +0200 +++ 2004/src/patchy/yexpand.script 2006-04-14 00:35:13.000000000 +0200 @@ -26,8 +26,8 @@ # CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT - tfile="$HOME/$tfile.yexp" - echo "#!/bin/sh" >$tfile + tfile="./$tfile.yexp" + echo "#! /bin/sh" >$tfile echo " cat <>$tfile cat <$ifile >>$tfile cc=$? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Dec 2005 15:57:06 -0000 1.3 +++ .cvsignore 17 May 2006 21:00:13 -0000 1.4 @@ -13,3 +13,4 @@ src_graflib.tar.gz src_packlib.tar.gz xsneut95.dat +patchy.tar.gz Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 112-remove-nonexistent-prototypes-from-gen.h.dpatch 9 Dec 2005 15:57:06 -0000 1.1 +++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch 17 May 2006 21:00:13 -0000 1.2 @@ -68,19 +68,6 @@ PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT) #define FREQ(A2) CCALLSFFUN1(FREQ,freq,FLOAT,A2) -@@ -255,10 +255,10 @@ - - PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE) - #define DFRSIN(A2) CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2) -- -+/* - PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV) - #define FUN(A2,A3) CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3) -- -+*/ - PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT) - #define G116F1(A2) CCALLSFFUN1(G116F1,g116f1,FLOAT,A2) - @@ -270,10 +270,10 @@ PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT) Index: 307-use-canonical-cfortran.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/307-use-canonical-cfortran.dpatch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 307-use-canonical-cfortran.dpatch 15 Dec 2005 12:07:03 -0000 1.2 +++ 307-use-canonical-cfortran.dpatch 17 May 2006 21:00:13 -0000 1.3 @@ -7,8 +7,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 17:17:09.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 12:17:09.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-27 11:33:41.183131708 -0500 @@ -195,13 +195,13 @@ HP9000> f77 -c cfortex.f HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest @@ -79,24 +79,25 @@ - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA (E.G. TAPE, DISK, COMPUTER, PAPER.) diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 17:05:51.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 13:05:51.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-19 08:29:41.000000000 -0500 @@ -1,4 +1,4 @@ -/* cfortran.h 4.4_cernlib2002 */ +/* cfortran.h 4.4 */ /* http://www-zeus.desy.de/~burow/cfortran/ */ /* Burkhard Burow burow at desy.de 1990 - 2002. */ -@@ -11,6 +11,35 @@ +@@ -11,6 +11,38 @@ MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE. */ +/* The following modifications were made by the authors of CFITSIO or by me. -+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)". ++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY. + * PDW = Peter Wilson + * DM = Doug Mink -+ * LEB = ?? -+ * -- Kevin McCarty, for Debian (11/29/2003) */ ++ * LEB = Lee E Brotzman ++ * MR = Martin Reinecke ++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */ + +/******* + Modifications: @@ -118,12 +119,14 @@ + Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN + returning "double" in C. This was one of the items on + Burkhard's TODO list. (KMCCARTY) ++ Dec 2005: Modifications to support 8-byte integers. (MR) ++ USE AT YOUR OWN RISK! + *******/ + /* Avoid symbols already used by compilers and system *.h: __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c -@@ -75,7 +104,8 @@ +@@ -75,7 +107,8 @@ /* Remainder of cfortran.h depends on the Fortran compiler. */ @@ -133,7 +136,7 @@ #define f2cFortran #endif -@@ -90,6 +120,27 @@ +@@ -90,6 +123,27 @@ Support f2c or f77 with gcc, vcc with f2c. f77 with vcc works, missing link magic for f77 I/O.*/ #endif @@ -161,7 +164,7 @@ #if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */ #define hpuxFortran /* Should also allow hp9000s7/800 use.*/ #endif -@@ -131,6 +182,7 @@ +@@ -131,6 +185,7 @@ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ @@ -169,7 +172,7 @@ - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \ - VAX VMS CC 3.1 and FORTRAN 5.4. \ -@@ -151,7 +203,8 @@ +@@ -151,7 +206,8 @@ - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran \ - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ - Absoft Pro Fortran: Use #define AbsoftProFortran \ @@ -179,7 +182,7 @@ /* Compiler must throw us out at this point! */ #endif #endif -@@ -164,7 +217,8 @@ +@@ -164,7 +220,8 @@ /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ @@ -189,7 +192,7 @@ #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else -@@ -268,7 +322,8 @@ +@@ -268,7 +325,8 @@ #endif #ifndef apolloFortran @@ -199,7 +202,7 @@ #define CF_NULL_PROTO #else /* HP doesn't understand #elif. */ /* Without ANSI prototyping, Apollo promotes float functions to double. */ -@@ -512,7 +567,7 @@ +@@ -512,7 +570,7 @@ *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO) ), \ (F).dsc$a_a0 = ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length ,(F)) @@ -208,8 +211,14 @@ #define _NUM_ELEMS -1 #define _NUM_ELEM_ARG -2 #define NUM_ELEMS(A) A,_NUM_ELEMS -@@ -540,7 +595,8 @@ +@@ -538,9 +596,14 @@ + if (i==(unsigned)num_term) break; + else strv += elem_len-i; } ++if (0) { /* to prevent not used warnings in gcc (added by ROOT) */ ++ c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0); ++ vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0); ++} return (int)num; } -#endif @@ -218,7 +227,53 @@ /*-------------------------------------------------------------------------*/ /* UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS */ -@@ -1451,7 +1507,12 @@ +@@ -1318,6 +1381,7 @@ + #define INTVVVVVVV_cfTYPE int + #define LOGICALVVVVVVV_cfTYPE int + #define LONGVVVVVVV_cfTYPE long ++#define LONGLONGVVVVVVV_cfTYPE long long /* added by MR December 2005 */ + #define SHORTVVVVVVV_cfTYPE short + #define PBYTE_cfTYPE INTEGER_BYTE + #define PDOUBLE_cfTYPE DOUBLE_PRECISION +@@ -1325,6 +1389,7 @@ + #define PINT_cfTYPE int + #define PLOGICAL_cfTYPE int + #define PLONG_cfTYPE long ++#define PLONGLONG_cfTYPE long long /* added by MR December 2005 */ + #define PSHORT_cfTYPE short + + #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A) +@@ -1342,6 +1407,7 @@ + #define INT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LOGICAL_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) ++#define LONGLONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define PBYTE_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0) +@@ -1349,6 +1415,7 @@ + #define PINT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLOGICAL_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) ++#define PLONGLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define PSHORT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define BYTEV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define BYTEVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) +@@ -1392,6 +1459,13 @@ + #define LONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) ++#define LONGLONGV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORTV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define SHORTVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) + #define SHORTVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) +@@ -1451,7 +1525,12 @@ #define BYTE_cfPU(A) CFextern INTEGER_BYTE FCALLSC_QUALIFIER A #define DOUBLE_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -231,7 +286,80 @@ #else #define FLOAT_cfPU(A) CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A #endif -@@ -2088,7 +2149,12 @@ +@@ -1589,6 +1668,7 @@ + #define INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E) + #define LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1632,6 +1712,13 @@ + #define LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1645,6 +1732,7 @@ + #define PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E) + #define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E) + #define PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E) +@@ -1957,6 +2045,7 @@ + #define INT_cfT(M,I,A,B,D) *A + #define LOGICAL_cfT(M,I,A,B,D) F2CLOGICAL(*A) + #define LONG_cfT(M,I,A,B,D) *A ++#define LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */ + #define SHORT_cfT(M,I,A,B,D) *A + #define BYTEV_cfT(M,I,A,B,D) A + #define DOUBLEV_cfT(M,I,A,B,D) A +@@ -1964,6 +2053,7 @@ + #define INTV_cfT(M,I,A,B,D) A + #define LOGICALV_cfT(M,I,A,B,D) A + #define LONGV_cfT(M,I,A,B,D) A ++#define LONGLONGV_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define SHORTV_cfT(M,I,A,B,D) A + #define BYTEVV_cfT(M,I,A,B,D) (void *)A /* We have to cast to void *,*/ + #define BYTEVVV_cfT(M,I,A,B,D) (void *)A /* since we don't know the */ +@@ -2001,6 +2091,12 @@ + #define LONGVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVVV_cfT(M,I,A,B,D) (void *)A ++#define LONGLONGVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ + #define SHORTVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVVV_cfT(M,I,A,B,D) (void *)A +@@ -2013,6 +2109,7 @@ + #define PINT_cfT(M,I,A,B,D) A + #define PLOGICAL_cfT(M,I,A,B,D) ((*A=F2CLOGICAL(*A)),A) + #define PLONG_cfT(M,I,A,B,D) A ++#define PLONGLONG_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define PSHORT_cfT(M,I,A,B,D) A + #define PVOID_cfT(M,I,A,B,D) A + #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) +@@ -2083,12 +2180,18 @@ + #define INT_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LOGICAL_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LONG_cfFZ(UN,LN) long FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#define LONGLONG_cfFZ(UN,LN) long long FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */ + #define SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define VOID_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)( #ifndef __CF__KnR /* The void is req'd by the Apollo, to make this an ANSI function declaration. The Apollo promotes K&R float functions to double. */ @@ -245,7 +373,7 @@ #ifdef vmsFortran #define STRING_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS #else -@@ -2104,7 +2170,12 @@ +@@ -2104,7 +2207,12 @@ #endif #else #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -258,7 +386,7 @@ #else #define FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)( #endif -@@ -2118,7 +2189,12 @@ +@@ -2118,13 +2226,19 @@ #define BYTE_cfF(UN,LN) BYTE_cfFZ(UN,LN) #define DOUBLE_cfF(UN,LN) DOUBLE_cfFZ(UN,LN) #ifndef __CF_KnR @@ -271,3 +399,18 @@ #else #define FLOAT_cfF(UN,LN) FLOAT_cfFZ(UN,LN) #endif + #define INT_cfF(UN,LN) INT_cfFZ(UN,LN) + #define LOGICAL_cfF(UN,LN) LOGICAL_cfFZ(UN,LN) + #define LONG_cfF(UN,LN) LONG_cfFZ(UN,LN) ++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */ + #define SHORT_cfF(UN,LN) SHORT_cfFZ(UN,LN) + #define VOID_cfF(UN,LN) VOID_cfFZ(UN,LN) + #define STRING_cfF(UN,LN) STRING_cfFZ(UN,LN), +@@ -2187,6 +2301,7 @@ + #define LOGICAL_cfI return C2FLOGICAL(A0); + #endif + #define LONG_cfI return A0; ++#define LONGLONG_cfI return A0; /* added by MR December 2005 */ + #define SHORT_cfI return A0; + #define STRING_cfI return ; + #define VOID_cfI return ; Index: 800-implement-shared-library-rules-in-Imake.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/800-implement-shared-library-rules-in-Imake.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 800-implement-shared-library-rules-in-Imake.dpatch 9 Dec 2005 15:57:06 -0000 1.1 +++ 800-implement-shared-library-rules-in-Imake.dpatch 17 May 2006 21:00:13 -0000 1.2 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules ---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2005-11-29 17:07:32.035570303 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2005-11-29 17:07:40.003888782 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:42:00.576902424 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:42:08.484202137 -0500 @@ -904,6 +904,8 @@ * InstallSharedLibrary - generate rules to install the indicated sharable * Library @@ -27,7 +27,7 @@ /* * InstallLinkKitLibrary - rule to install Link Kit library. -@@ -1963,6 +1966,15 @@ +@@ -1967,6 +1970,15 @@ #endif /* InstallSubdirs */ /* @@ -43,7 +43,7 @@ * InstallBinSubdirs - generate rules to recursively install programs and * scripts */ -@@ -2341,9 +2353,12 @@ +@@ -2354,9 +2366,12 @@ */ #ifndef DefinePackageLibrary #define DefinePackageLibrary(locallib) \ @@ -57,8 +57,8 @@ override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB) @@\ @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules ---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 10:51:01.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2005-11-29 17:09:29.336812562 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 06:51:01.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -227,7 +227,7 @@ RanLibrary($@) #endif @@ -120,8 +120,8 @@ #ifndef SharedLibraryBuild #define SharedLibraryBuild(libname,version) @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules ---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 15:26:45.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2005-11-29 17:07:40.004888571 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 10:26:45.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -43,6 +43,9 @@ #ifndef PositionIndependentCplusplusFlags #define PositionIndependentCplusplusFlags -fPIC Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 805-expunge-missing-mathlib-kernlib-symbols.dpatch 9 Dec 2005 15:57:06 -0000 1.1 +++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch 17 May 2006 21:00:13 -0000 1.2 @@ -5,9 +5,9 @@ ## DP: Remove some unreferenced symbols from mathlib and kernlib. @DPATCH@ -diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile ---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2005-06-13 11:20:33.838151240 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:37.545106161 -0400 ++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:48.094863874 -0400 @@ -1,6 +1,8 @@ #ifndef CERNLIB_VAXVMS @@ -18,9 +18,9 @@ readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\ tmproi.F toslat.F unlinkf.F -diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:12:24.894703741 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:16:54.864966246 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:38.432917462 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:48.095863661 -0400 @@ -2,20 +2,22 @@ #include "pilot.h" @@ -50,25 +50,29 @@ #if defined(CERNLIB_DOUBLE) SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\ -diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 2005-06-13 11:19:42.456136998 -0400 -@@ -1,9 +1,12 @@ --SRCS_F= addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\ -- bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\ -- dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\ -- grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ -- newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ -- quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ -+/* Some files deleted from the below list since they depend upon the -+ lepto63 library, which cannot be included in Debian for licensing reasons. */ -+ -+SRCS_F= addbnd.F bfgs.F bndtst.F bounds.F bucmve.F \ @@\ -+ delbnd.F delete.F dvcopy.F dvdot.F \ @@\ -+ dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F \ @@\ -+ ldlsol.F modchl.F mxstep.F \ @@\ -+ newptq.F nmdchl.F nodaud.F orthvc.F quad.F \ @@\ -+ quasi.F ranums.F rlen.F settol.F shrnk.F \ @@\ - treaud.F tredmp.F tstext.F usrint.F usrtrm.F +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile 2006-05-09 17:00:05.429179570 -0400 +@@ -4,7 +4,7 @@ + grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ + newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ + quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ +- treaud.F tredmp.F tstext.F usrint.F usrtrm.F ++ treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F FORTRANSAVEOPTION = FortranSaveFlags + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F 1969-12-31 19:00:00.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F 2006-05-09 17:01:10.196413696 -0400 +@@ -0,0 +1,10 @@ ++C----------------------------------------------------------------------- ++ FUNCTION DFUN(ND,X) ++C----------------------------------------------------------------------- ++C DUMMY FUNCTION ++C----------------------------------------------------------------------- ++ DOUBLE PRECISION DFUN, X(ND) ++ WRITE (6,10) ++ 10 FORMAT(/10X,'DFUN CALLED BUT NOT LINKED') ++ STOP ++ END cernlib-gfortran.diff: Index: cernlib-gfortran.diff =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib-gfortran.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cernlib-gfortran.diff 16 Nov 2005 23:34:07 -0000 1.1 +++ cernlib-gfortran.diff 17 May 2006 21:00:13 -0000 1.2 @@ -1,6 +1,6 @@ ---- src/config/linux.cf.old 2005-06-16 21:11:15.000000000 +0200 -+++ src/config/linux.cf 2005-06-16 21:09:23.000000000 +0200 -@@ -216,7 +216,7 @@ +--- 2005/src/config/linux.cf-old 2006-03-15 11:32:47.000000000 +0100 ++++ 2005/src/config/linux.cf 2006-03-15 11:33:52.000000000 +0100 +@@ -478,7 +478,7 @@ variable=value @@\ endif @@\ @@ -9,16 +9,20 @@ /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */ /* Adapted to CERN style GF. 20-Sep-96 */ -@@ -227,10 +227,10 @@ - # define OptimizedCDebugFlags -O1 -fomit-frame-pointer +@@ -498,14 +498,13 @@ + #endif #define f2cFortran YES --#define FortranCmd g77 -+#define FortranCmd gfortran +-#define FortranCmd g77 -g ++#define FortranCmd gfortran -g #define XargsCmd xargs #define FortranSaveFlags /* */ /* Everything static !? */ --#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex -+#define DefaultFCOptions -fno-second-underscore - #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC - - # endif + #define OptimisedFortranFlags OptimizedCDebugFlags -funroll-loops + /* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */ + #ifndef DefaultFCOptions +-# define DefaultFCOptions -fno-automatic -fno-second-underscore \ +- -fugly-complex ++# define DefaultFCOptions -fno-automatic -fno-second-underscore + #endif + #define CernlibSystem CernlibDefaultDefines CernlibMachineDefines \ + CernlibLocalDefines Index: cernlib.m4 =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cernlib.m4 15 Dec 2005 12:07:03 -0000 1.2 +++ cernlib.m4 17 May 2006 21:00:13 -0000 1.3 @@ -16,7 +16,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl A basic axample of the macro usage: +dnl A basic example of the macro usage: dnl dnl AC_LIB_CERNLIB(kernlib,CLTOU, dnl [ @@ -33,15 +33,15 @@ dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is dnl assumed that a static linking using the information reported by that dnl script is wanted. -dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the -dnl location of the static library. +dnl - otherwise if the environment variable CERNLIB exists it is assumed to +dnl be the location of the static library. dnl - otherwise if the environment variable CERN_ROOT exists it is assumed dnl that CERN_ROOT/lib is the location of the static library. dnl - otherwise a simple linking is performed. dnl dnl If a dynamic linking is selected: -dnl - if the binary program 'cernlib' is in the path it is assumed that it is the -dnl debian script and it is called with -dy. +dnl - if the binary program 'cernlib' is in the path it is assumed that it +dnl is the debian script and it is called with -dy. dnl - otherwise a simple linking is performed. dnl dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND], @@ -57,7 +57,9 @@ # AC_CERNLIB check for cernlib location and whether it should be # statically linked or not. AC_DEFUN([AC_CERNLIB], [ +CERNLIB_PATH= CERNLIB_LIB_PATH= +CERNLIB_BIN_PATH= CERNLIB_STATIC=yes AC_ARG_WITH(static_cernlib, [ --with-static-cernlib link statically with the cernlib], @@ -65,16 +67,25 @@ AC_ARG_WITH(cernlib, [ --with-cernlib cernlib location], -[ CERNLIB_LIB_PATH=$withval ]) +[ CERNLIB_PATH=$withval + CERNLIB_LIB_PATH=$CERNLIB_PATH/lib + CERNLIB_BIN_PATH=$CERNLIB_PATH/bin +]) +CERNLIB_BIN= if test "z$CERNLIB_STATIC" != "zno"; then CERNLIB_STATIC=yes - if test "z$CERNLIB_LIB_PATH" = z; then + if test "z$CERNLIB_PATH" = z; then AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no) if test $CERNLIB_BIN = no; then AC_PATH_PROG(CERNLIB_BIN, cernlib, no) fi + else + AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no, [$CERNLIB_BIN_PATH:$PATH]) + if test $CERNLIB_BIN = no; then + AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH]) + fi if test $CERNLIB_BIN = no; then if test "z$CERNLIB" != z -a -d "$CERNLIB"; then CERNLIB_LIB_PATH=$CERNLIB @@ -86,8 +97,10 @@ fi fi else - AC_PATH_PROG(CERNLIB_BIN, cernlib, no) - if test "z$CERNLIB_LIB_PATH" != z; then + if test "z$CERNLIB_PATH" = z; then + AC_PATH_PROG(CERNLIB_BIN, cernlib, no) + else + AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH]) LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH" fi fi Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cernlib.spec 22 Dec 2005 09:38:53 -0000 1.17 +++ cernlib.spec 17 May 2006 21:00:13 -0000 1.18 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 11%{?dist}.4 +Release: 20%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -12,15 +12,25 @@ #BuildRequires: gcc-g77 #Requires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel # fedora core -# fc 3 -BuildRequires: xorg-x11-devel lapack blas openmotif-devel -# fc 4 -#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel -# fc devel -#BuildRequires: imake lapack-devel blas-devel openmotif-devel +BuildRequires: openmotif-devel +%if "%fedora" <= "3" +BuildRequires: lapack blas +%else +BuildRequires: lapack-devel blas-devel +%endif + +%if "%fedora" <= "4" +BuildRequires: xorg-x11-devel +%else +BuildRequires: imake +# workaround #173530 +BuildRequires: libXau-devel +%endif +# for patchy build scripts +BuildRequires: tcsh +BuildRequires: gawk # there are missing f2c intrinsics in gfortran so gfortran cannot be used to # build the cernlib -#BuildRequires: imake lapack-devel blas-devel openmotif-devel BuildRequires: /usr/bin/g77 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,11 +53,18 @@ Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz Source11: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_phtools.tar.gz Source12: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_scripts.tar.gz -# actually patchy isn't built, for the reason stated in -# see http://borex.princeton.edu/~kmccarty/faq.html#36 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat +# The patchy version 4 sources +Source17: patchy.tar.gz +# this is modified with regard with what Mattias gave me. Indeed the file +# containing some other files (p4inceta) was in fortran unformatted format, +# I believe it is what caused a segfault of rceta on the ppc platform. +# I have recreated the patchy.tar.gz from Mattias tarball by running +# sh patchy-unpack-rceta +Source203: patchy-unpack-rceta + # Shell scripts that go in /etc/profile.d Source100: cernlib.sh.in Source105: cernlib.csh.in @@ -65,7 +82,7 @@ Source201: cernlib-deadpool.txt # debian patchset -Patch0: cernlib_2005.05.09.dfsg-3.diff +Patch0: cernlib_2005.05.09.dfsg-6.diff # change file to directory to DATADIR Patch1100: cernlib-enforce-FHS.diff Patch1: 001-fix-missing-fluka.dpatch @@ -106,7 +123,7 @@ Patch210: 210-improve-cfortran-header-files.dpatch # split in newer debian patchset Patch2110: 211-fix-comis-on-amd64.dpatch -Patch2111: 211-fix-comis-on-ia64.dpatch +Patch2111: 211-fix-comis-on-ia64-alpha.dpatch Patch300: 300-skip-duplicate-lenocc.dpatch # Use another approach, see cernlib-enforce-FHS # Patch33: 301-datafiles-comply-with-FHS.dpatch @@ -133,6 +150,8 @@ Patch314: 314-permit-using-regcomp-for-re_comp.dpatch Patch315: 315-fixes-for-MacOSX.dpatch Patch318: 318-additional-gcc-3.4-fixes.dpatch +# certainly not needed, but who knows? +Patch319: 319-work-around-imake-segfaults.dpatch Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch Patch701: 701-patch-hbook-comis-Imakefiles.dpatch @@ -147,8 +166,8 @@ Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch Patch802: 802-create-shared-libraries.dpatch # in the original cernlib kxterm is built with the C compiler, which cause -# a failure if compiled with de cernlib debian script as -lg2c isn't found. -# It is corrected by +# a failure if compiled with the cernlib debian script as -lg2c isn't found. +# It is corrected in Patch803: 803-link-binaries-dynamically.dpatch # 803 depends on # 208-fix-redundant-packlib-dependencies.dpatch @@ -188,6 +207,20 @@ Patch1205: cernlib-gfortran.diff Patch1207: cernlib-v107z0_X_before_string.diff +# patchy 4 +# not applied as it has allready been done by the sed one-liner in +# patchy-unpack-rceta +Patch1500: patchy-rceta.patch + +Patch1501: patchy-insecure_tmp_use.diff +Patch1502: patchy-fcasplit.patch +Patch1503: patchy-p4comp.patch + +# patchy 5 (included in cernlib) +Patch1504: patchy-case.patch +Patch1505: patchy-perror.patch +Patch1506: patchy-yexpand.diff + %description CERN program library is a large collection of general purpose libraries and modules maintained and offered on the CERN. Most of these programs @@ -201,7 +234,17 @@ %package devel Summary: General purpose CERN library static libraries and headers -Requires: lapack blas openmotif-devel +Requires: openmotif-devel +%if "%fedora" <= "3" +Requires: lapack blas +%else +Requires: lapack-devel blas-devel +%endif + +%if "%fedora" > "4" +# workaround #173530 +Requires: libXau-devel +%endif Requires: %{name} = %{version}-%{release} Group: Development/Libraries @@ -275,6 +318,13 @@ According to the responsible of the cernlib debian package, some of these utilities may have security flaws. +%package -n patchy +Group: Applications/Archiving +Summary: The patchy utilities + +%description -n patchy +Utilities for extracting sources from patchy cards and cradles. + %prep %setup -c @@ -291,6 +341,24 @@ %setup -T -D -a 12 %setup -T -D -a 14 %setup -T -D -a 15 +%setup -T -D -a 17 + +# patch patchy 4 installer fortran generator script +# avtually it is unusefull, because the unpacking has been done +# offline, see comment above. +#%patch -P 1500 + +%patch -P 1501 + +# unpack the patchy version 4 sources is done offline, +# see comment above +#pushd patchy +# ./rceta.sh +#popd + +%patch -P 1502 +%patch -P 1503 + %patch -p1 cd %{version} @@ -351,6 +419,7 @@ cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/ %patch -P 318 -p1 +%patch -P 319 -p1 # move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch) mv src/packlib/kernlib src/kernlib @@ -454,13 +523,16 @@ %patch -P 805 -p1 %patch -P 806 -p1 +%patch -P 1504 -p1 +%patch -P 1505 -p1 +%patch -P 1506 -p1 %patch -P 1200 %patch -P 1201 %patch -P 1203 %patch -P 1204 # use gfortran -#%patch -P 1205 +#%patch -P 1205 -p1 # workaround gfortran bug %patch -P 1207 @@ -514,7 +586,8 @@ # substitude the right defaults in the scripts sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \ - src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script + src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \ + ../patchy/ylist ../patchy/yindex # substitute version in gxint with the right version # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f @@ -524,6 +597,9 @@ sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \ src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F +# substitute bindir in ylist and yindex to conform to FHS +sed -i -e 's:\$CERN/patchy/\$PATCHY_VERSION/bin:%{_bindir}:' ../patchy/ylist ../patchy/yindex + # Create the build directory structure mkdir -p build bin lib shlib @@ -542,6 +618,16 @@ cp %{SOURCE104} bin/ chmod a+x bin/mkdirhier +PATHSAVE=$PATH +# Build patchy version 4 +pushd ../patchy +# export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" + export PATH=".:..:$PATH" + p4boot.sh 0 +popd +find ../patchy -name y* -a -perm -755 -exec install {} bin ';' +export PATH=$PATHSAVE + # Create the top level Makefile with imake cd $CERN_ROOT/build @@ -552,6 +638,7 @@ # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin make %{?_smp_mflags} bin/kuipc +make patchy/Makefile make scripts/Makefile cd scripts make install.bin @@ -572,6 +659,13 @@ cd $CERN_ROOT/build/packlib make %{?_smp_mflags} install.bin +# Build npatchy +# The build of patchy is completly messed up on ppc +%ifnarch ppc +cd $CERN_ROOT/build/patchy +make %{?_smp_mflags} install.bin +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -606,7 +700,6 @@ # to preserve symlinks (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) -#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -) rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier @@ -652,7 +745,6 @@ %doc cernlib.README copyright %doc debian/debhelper/geant321.README.debian %doc debian/debhelper/libpdflib804-2-dev.README.debian -%doc debian/debhelper/libmathlib2.README.debian %doc debian/debhelper/montecarlo-base.README.debian # the utils and devel are separated to have the possibility to install @@ -707,7 +799,63 @@ %{_bindir}/zftp %doc debian/debhelper/zftp.README.debian +%files -n patchy +%defattr(-,root,root,-) +%ifnarch ppc +%{_bindir}/fcasplit +%{_bindir}/nycheck +%{_bindir}/nydiff +%{_bindir}/nyindex +%{_bindir}/nylist +%{_bindir}/nymerge +%{_bindir}/nypatchy +%{_bindir}/nyshell +%{_bindir}/nysynopt +%{_bindir}/nytidy +%{_bindir}/yexpand +%endif +%{_bindir}/ycompar +%{_bindir}/yedit +%{_bindir}/yfrceta +%{_bindir}/yindex +%{_bindir}/yindexb +%{_bindir}/ylist +%{_bindir}/ylistb +%{_bindir}/ypatchy +%{_bindir}/ysearch +%{_bindir}/yshift +%{_bindir}/ytobcd +%{_bindir}/ytobin +%{_bindir}/ytoceta + + %changelog +* Wed May 17 2006 Patrice Dumas - 2005-20 +- use new debian patchset. Fix 191631 + +* Tue Apr 13 2006 Patrice Dumas - 2005-19 +- add a patch to yexpand, to avoid using $HOME. + +* Tue Apr 13 2006 Patrice Dumas - 2005-17 +- npatchy don't build on ppc. + +* Wed Apr 12 2006 Patrice Dumas - 2005-16 +- unpack patchy offline because the files are within an unformatted + fortran file which won't be right on all the arches. + +* Tue Apr 11 2006 Patrice Dumas - 2005-15.1 +- add conditionals in spec to have only one for all fedora versions. + +* Tue Apr 11 2006 Patrice Dumas - 2005-14 +- add patchy version 4 and build cernlib patchy. From Mattias Ellert. +- update to newer debian patchset + +* Thu Feb 16 2006 Patrice Dumas - 2005-13 +- rebuild for fc5 + +* Tue Jan 17 2006 Patrice Dumas - 2005-12.1 +- attempt a rebuild against newer openmotif + * Tue Dec 20 2005 Patrice Dumas - 2005-11.4 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11 - fix gxint @@ -715,24 +863,27 @@ * Tue Dec 20 2005 Patrice Dumas - 2005-10 - add file in /etc/ld.so.conf.d required for dynamic linking -* Wed Dec 14 2005 Patrice Dumas - 2005-9 +* Wed Dec 14 2005 Patrice Dumas - 2005-9.1 - use new debian patchset -* Fri Dec 9 2005 Patrice Dumas - 2005-8.4 -- update with newer debian patchset for cernlib, fix licence issues +* Fri Dec 9 2005 Patrice Dumas - 2005-8.1 +- use new debian patchset - enable 64 bit fixes patch + +* Fri Dec 2 2005 Patrice Dumas - 2005-7 +- use updated beta debian patchset - remove the BSD in the licence because there is no library nor binary under a BSD licence and someone could get the idea that there is some dual BSD/GPL licenced binaries or libraries. The LGPL is kept because of cfortran + +* Tue Nov 29 2005 Patrice Dumas - 2005-6.1 +- update with newer debian patchset for cernlib, fix licence issues - don't use the include.tar.gz source, instead get include files from the source files - build shared libraries - simplify the scripts modifications - -* Thu Nov 17 2005 Patrice Dumas - 2005-4.2 -- on fc-3 there is no lapack-devel and blas-devel, but instead blas - and lapack +- add BuildRequires: libXau-devel to workaround #173530 * Tue Nov 15 2005 Patrice Dumas - 2005-4 - add a .csh file Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- paw.README 15 Dec 2005 12:07:04 -0000 1.3 +++ paw.README 17 May 2006 21:00:13 -0000 1.4 @@ -41,6 +41,11 @@ to the beginning of them. +5) Shared libs + +PAW is linked dynamically, therefore the pawlib used is selected by the +/etc/ld.so.conf or $LD_LIBRARY_PATH settings. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by Index: sources =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Dec 2005 15:57:06 -0000 1.4 +++ sources 17 May 2006 21:00:13 -0000 1.5 @@ -13,3 +13,4 @@ 67228b011eac13b44499c50219e21545 src_graflib.tar.gz 4fdcdc9f819ebbb9c6d3a04f339cdcf8 src_packlib.tar.gz eecb52159458ead0ee6b0d00b90aab66 xsneut95.dat +b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz --- 211-fix-comis-on-ia64.dpatch DELETED --- --- cernlib_2005.05.09.dfsg-3.diff DELETED --- From fedora-extras-commits at redhat.com Wed May 17 21:49:03 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Wed, 17 May 2006 14:49:03 -0700 Subject: rpms/php-pear-DB/devel php-pear-DB.spec,1.2,1.3 Message-ID: <200605172149.k4HLn5wJ017586@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/php-pear-DB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17569 Modified Files: php-pear-DB.spec Log Message: Moved package XML file to %{peardir}/.pkgxml (see bug #190252) Removed some -fs on rm's to avoid masking possible errors Abstracted package XML directory Index: php-pear-DB.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-DB/devel/php-pear-DB.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-DB.spec 10 Feb 2006 14:32:55 -0000 1.2 +++ php-pear-DB.spec 17 May 2006 21:49:03 -0000 1.3 @@ -1,9 +1,10 @@ %define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear) +%define xmldir %{peardir}/.pkgxml Summary: PEAR: Database Abstraction Layer Name: php-pear-DB Version: 1.7.6 -Release: 4 +Release: 5 License: The PHP License Group: Development/Libraries Source0: http://pear.php.net/get/DB-%{version}.tgz @@ -54,27 +55,28 @@ pear -c pearrc install --nodeps -R %{buildroot} %{SOURCE0} # Clean up unnecessary files -rm -f pearrc -rm -f %{buildroot}%{peardir}/.filemap -rm -f %{buildroot}%{peardir}/.lock +rm pearrc +rm %{buildroot}%{peardir}/.filemap +rm %{buildroot}%{peardir}/.lock rm -rf %{buildroot}%{peardir}/.registry rm -rf %{buildroot}%{peardir}/.channels -rm -rf %{buildroot}%{peardir}/.depdb* +rm %{buildroot}%{peardir}/.depdb +rm %{buildroot}%{peardir}/.depdblock # Sort out documentation mv %{buildroot}/docs/DB/* . rm -rf %{buildroot}/docs # Install XML package description -mkdir -p %{buildroot}%{_libdir}/php/pear +mkdir -p %{buildroot}%{xmldir} tar -xzf %{SOURCE0} package.xml -cp -p package.xml %{buildroot}%{_libdir}/php/pear/DB.xml +cp -p package.xml %{buildroot}%{xmldir}/DB.xml %clean rm -rf %{buildroot} %post -pear install --nodeps --soft --force --register-only %{_libdir}/php/pear/DB.xml >/dev/null +pear install --nodeps --soft --force --register-only %{xmldir}/DB.xml >/dev/null %postun if [ "$1" -eq "0" ]; then @@ -84,12 +86,17 @@ %files %defattr(-,root,root) %doc doc/IDEAS doc/MAINTAINERS doc/STATUS doc/TESTERS -%{_libdir}/php/pear/DB.xml +%{xmldir}/DB.xml %{peardir}/tests/DB %{peardir}/DB.php %{peardir}/DB %changelog +* Wed May 17 2006 Tim Jackson 1.7.6-5 +- Moved package XML file to %{peardir}/.pkgxml (see bug #190252) +- Abstracted package XML directory +- Removed some "-f"s on rm's to avoid masking possible errors + * Tue Jan 24 2006 Tim Jackson 1.7.6-4 - Move package XML file to _libdir/php/pear rather than _var/lib/pear From fedora-extras-commits at redhat.com Thu May 18 00:16:45 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 17 May 2006 17:16:45 -0700 Subject: rpms/net6/devel .cvsignore, 1.6, 1.7 net6.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200605180016.k4I0GlC9024937@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/net6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24916 Modified Files: .cvsignore net6.spec sources Log Message: 1.3.0rc2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/net6/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Apr 2006 19:14:52 -0000 1.6 +++ .cvsignore 18 May 2006 00:16:45 -0000 1.7 @@ -1 +1 @@ -net6-1.3.0rc1.tar.gz +net6-1.3.0rc2.tar.gz Index: net6.spec =================================================================== RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- net6.spec 15 Apr 2006 21:18:51 -0000 1.9 +++ net6.spec 18 May 2006 00:16:45 -0000 1.10 @@ -1,8 +1,8 @@ -%define _rc rc1 +%define _rc rc2 Name: net6 Version: 1.3.0 -Release: 2.rc1%{?dist} +Release: 2.%{_rc}%{?dist} Summary: A TCP protocol abstraction for library C++ Group: Development/Libraries @@ -73,6 +73,9 @@ %changelog +* Wed May 17 2006 Luke Macken - 1.3.0-3.rc2 +- 1.3.0rc2 + * Sat Apr 15 2006 Luke Macken - 1.3.0-2.rc1 - Add gnutls-devel to BuildRequires for -devel package Index: sources =================================================================== RCS file: /cvs/extras/rpms/net6/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Apr 2006 19:14:52 -0000 1.6 +++ sources 18 May 2006 00:16:45 -0000 1.7 @@ -1 +1 @@ -45511815c3be246cda11a2234cc4fa7b net6-1.3.0rc1.tar.gz +072ff64096fbe43e16763f33e4dd8d32 net6-1.3.0rc2.tar.gz From fedora-extras-commits at redhat.com Thu May 18 00:20:53 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 17 May 2006 17:20:53 -0700 Subject: rpms/python-mechanize/devel python-mechanize.spec,1.1,1.2 Message-ID: <200605180020.k4I0KtBL025045@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25028 Modified Files: python-mechanize.spec Log Message: add BuildArch: noarch back (bug #192155) Index: python-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/python-mechanize/devel/python-mechanize.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-mechanize.spec 14 May 2006 21:08:38 -0000 1.1 +++ python-mechanize.spec 18 May 2006 00:20:53 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-mechanize Version: 0.1.1a -Release: 2%{?dist} +Release: 3%{?dist} Summary: Stateful programmatic web browsing Group: System Environment/Libraries @@ -10,6 +10,7 @@ URL: http://wwwsearch.sourceforge.net/mechanize Source0: http://wwwsearch.sourceforge.net/mechanize/src/mechanize-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: python-setuptools Requires: python-clientform @@ -60,6 +61,9 @@ %changelog +* Wed May 17 2006 Luke Macken - 0.1.1a-3 +- Add BuildArch: noarch (bug #192155) + * Sun May 14 2006 Luke Macken - 0.1.1a-2 - Add python-abi Requires - Remove noarch From fedora-extras-commits at redhat.com Thu May 18 00:29:06 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:29:06 -0700 Subject: rpms/dvb-apps/devel .cvsignore, 1.3, 1.4 dvb-apps-optflags.patch, 1.1, 1.2 dvb-apps.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605180029.k4I0T8fb025144@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25118 Modified Files: .cvsignore dvb-apps-optflags.patch dvb-apps.spec sources Log Message: 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jul 2005 16:24:42 -0000 1.3 +++ .cvsignore 18 May 2006 00:29:06 -0000 1.4 @@ -1,2 +1,2 @@ -linuxtv-dvb-apps-1.1.0.tar.bz2 +linuxtv-dvb-apps-1.1.1.tar.bz2 COPYING dvb-apps-optflags.patch: Index: dvb-apps-optflags.patch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps-optflags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvb-apps-optflags.patch 17 Jul 2005 16:16:42 -0000 1.1 +++ dvb-apps-optflags.patch 18 May 2006 00:29:06 -0000 1.2 @@ -67,14 +67,13 @@ 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 @@ +@@ -1,5 +1,5 @@ CC = gcc --CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib -+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib +-CFLAGS = -MD -g -Wall -O2 -I../../include ++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include 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 Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dvb-apps.spec 21 Feb 2006 19:40:39 -0000 1.3 +++ dvb-apps.spec 18 May 2006 00:29:06 -0000 1.4 @@ -1,6 +1,6 @@ Name: dvb-apps -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel -BuildRequires: glibc-kernheaders >= 2.4-9.1.94 +BuildRequires: kernel-headers >= 2.6.16 %description %{summary}. @@ -73,6 +73,10 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-1 +- Update to dvb-apps 1.1.1 (add ATSC functionality) +- Fix kernel-headers BR + * Tue Feb 21 2006 Ville Skytt?? - 1.1.0-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jul 2005 16:24:42 -0000 1.3 +++ sources 18 May 2006 00:29:06 -0000 1.4 @@ -1,2 +1,2 @@ -987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 +de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2 eb723b61539feef013de476e68b5c50a COPYING From fedora-extras-commits at redhat.com Thu May 18 00:30:24 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:30:24 -0700 Subject: rpms/dvb-apps/FC-5 dvb-apps-optflags.patch, 1.1, 1.2 dvb-apps.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605180030.k4I0UQUa025225@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25201 Modified Files: dvb-apps-optflags.patch dvb-apps.spec sources Log Message: 1.1.1 dvb-apps-optflags.patch: Index: dvb-apps-optflags.patch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/dvb-apps-optflags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvb-apps-optflags.patch 17 Jul 2005 16:16:42 -0000 1.1 +++ dvb-apps-optflags.patch 18 May 2006 00:30:24 -0000 1.2 @@ -67,14 +67,13 @@ 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 @@ +@@ -1,5 +1,5 @@ CC = gcc --CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib -+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib +-CFLAGS = -MD -g -Wall -O2 -I../../include ++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include 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 Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/dvb-apps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dvb-apps.spec 21 Feb 2006 19:40:39 -0000 1.3 +++ dvb-apps.spec 18 May 2006 00:30:24 -0000 1.4 @@ -1,6 +1,6 @@ Name: dvb-apps -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel -BuildRequires: glibc-kernheaders >= 2.4-9.1.94 +BuildRequires: kernel-headers >= 2.6.16 %description %{summary}. @@ -73,6 +73,10 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-1 +- Update to dvb-apps 1.1.1 (add ATSC functionality) +- Fix kernel-headers BR + * Tue Feb 21 2006 Ville Skytt?? - 1.1.0-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jul 2005 16:24:42 -0000 1.3 +++ sources 18 May 2006 00:30:24 -0000 1.4 @@ -1,2 +1,2 @@ -987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 +de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2 eb723b61539feef013de476e68b5c50a COPYING From fedora-extras-commits at redhat.com Thu May 18 00:35:22 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:35:22 -0700 Subject: rpms/dvb-apps/FC-5 dvb-apps.spec,1.4,1.5 Message-ID: <200605180035.k4I0ZO9W025309@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25292 Modified Files: dvb-apps.spec Log Message: can't require kernel-headers in FC5 Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/dvb-apps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dvb-apps.spec 18 May 2006 00:30:24 -0000 1.4 +++ dvb-apps.spec 18 May 2006 00:35:22 -0000 1.5 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel -BuildRequires: kernel-headers >= 2.6.16 %description %{summary}. @@ -73,6 +72,9 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-2 +- Remove kernel-headers BR + * Thu May 18 2006 David Woodhouse - 1.1.1-1 - Update to dvb-apps 1.1.1 (add ATSC functionality) - Fix kernel-headers BR From fedora-extras-commits at redhat.com Thu May 18 00:37:23 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:37:23 -0700 Subject: rpms/dvb-apps/FC-4 branch, 1.1, 1.2 dvb-apps-optflags.patch, 1.1, 1.2 dvb-apps.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605180037.k4I0bPsP025381@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25355 Modified Files: branch dvb-apps-optflags.patch dvb-apps.spec sources Log Message: 1.1.1 Index: branch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/branch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branch 17 Jul 2005 21:29:15 -0000 1.1 +++ branch 18 May 2006 00:37:23 -0000 1.2 @@ -1 +1 @@ -FC-4 +FC-5 dvb-apps-optflags.patch: Index: dvb-apps-optflags.patch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/dvb-apps-optflags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvb-apps-optflags.patch 17 Jul 2005 16:16:42 -0000 1.1 +++ dvb-apps-optflags.patch 18 May 2006 00:37:23 -0000 1.2 @@ -67,14 +67,13 @@ 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 @@ +@@ -1,5 +1,5 @@ CC = gcc --CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib -+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib +-CFLAGS = -MD -g -Wall -O2 -I../../include ++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include 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 Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/dvb-apps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dvb-apps.spec 17 Jul 2005 16:24:42 -0000 1.2 +++ dvb-apps.spec 18 May 2006 00:37:23 -0000 1.3 @@ -1,6 +1,6 @@ Name: dvb-apps -Version: 1.1.0 -Release: 1%{?dist} +Version: 1.1.1 +Release: 2%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel -BuildRequires: glibc-kernheaders >= 2.4-9.1.94 %description %{summary}. @@ -73,6 +72,16 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-2 +- Remove kernel-headers BR + +* Thu May 18 2006 David Woodhouse - 1.1.1-1 +- Update to dvb-apps 1.1.1 (add ATSC functionality) +- Fix kernel-headers BR + +* Tue Feb 21 2006 Ville Skytt?? - 1.1.0-2 +- Rebuild. + * Sun Jul 17 2005 Ville Skytt?? - 1.1.0-1 - Include a copy of the GPL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jul 2005 16:24:42 -0000 1.3 +++ sources 18 May 2006 00:37:23 -0000 1.4 @@ -1,2 +1,2 @@ -987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 +de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2 eb723b61539feef013de476e68b5c50a COPYING From fedora-extras-commits at redhat.com Thu May 18 00:38:45 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:38:45 -0700 Subject: rpms/dvb-apps/FC-4 branch,1.2,1.3 Message-ID: <200605180038.k4I0cl3E025460@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25443 Modified Files: branch Log Message: oops Index: branch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/branch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- branch 18 May 2006 00:37:23 -0000 1.2 +++ branch 18 May 2006 00:38:45 -0000 1.3 @@ -1 +1 @@ -FC-5 +FC-4 From fedora-extras-commits at redhat.com Thu May 18 00:40:30 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:40:30 -0700 Subject: rpms/dvb-apps/devel dvb-apps.spec,1.4,1.5 Message-ID: <200605180040.k4I0eWRP025512@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25495 Modified Files: dvb-apps.spec Log Message: rebuild Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dvb-apps.spec 18 May 2006 00:29:06 -0000 1.4 +++ dvb-apps.spec 18 May 2006 00:40:30 -0000 1.5 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -73,6 +73,9 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-2 +- Rebuild (to unfix kernel-headers on older distros) + * Thu May 18 2006 David Woodhouse - 1.1.1-1 - Update to dvb-apps 1.1.1 (add ATSC functionality) - Fix kernel-headers BR From fedora-extras-commits at redhat.com Thu May 18 00:44:40 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:44:40 -0700 Subject: rpms/unifdef/devel Makefile, 1.1, NONE sources, 1.2, NONE unifdef.spec, 1.2, NONE Message-ID: <200605180044.k4I0ignd025603@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25588 Removed Files: Makefile sources unifdef.spec Log Message: Remove devel branch --- Makefile DELETED --- --- sources DELETED --- --- unifdef.spec DELETED --- From fedora-extras-commits at redhat.com Thu May 18 00:45:10 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:45:10 -0700 Subject: rpms/unifdef/devel .cvsignore,1.2,NONE Message-ID: <200605180045.k4I0jCUl025633@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25618 Removed Files: .cvsignore Log Message: Remove devel branch --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Thu May 18 01:15:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 18:15:43 -0700 Subject: rpms/perl-File-Find-Rule-PPI/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE perl-File-Find-Rule-PPI.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <200605180115.k4I1Fj8l028029@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28012 Removed Files: .cvsignore Makefile branch perl-File-Find-Rule-PPI.spec sources Log Message: Removal of FC-4 branch (requested by mistake) --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- perl-File-Find-Rule-PPI.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu May 18 01:17:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 18:17:13 -0700 Subject: rpms/perl-PPI/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE perl-PPI.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <200605180117.k4I1HFd1028080@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28063 Removed Files: .cvsignore Makefile branch perl-PPI.spec sources Log Message: Removal of FC-4 branch (requested by mistake) --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- perl-PPI.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu May 18 06:59:13 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 17 May 2006 23:59:13 -0700 Subject: rpms/rafkill - New directory Message-ID: <200605180659.k4I6xFrG008053@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8027/rafkill Log Message: Directory /cvs/extras/rpms/rafkill added to the repository From fedora-extras-commits at redhat.com Thu May 18 06:59:14 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 17 May 2006 23:59:14 -0700 Subject: rpms/rafkill/devel - New directory Message-ID: <200605180659.k4I6xGYJ008056@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8027/rafkill/devel Log Message: Directory /cvs/extras/rpms/rafkill/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 06:59:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 17 May 2006 23:59:28 -0700 Subject: rpms/rafkill Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605180659.k4I6xUjt008102@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8074 Added Files: Makefile import.log Log Message: Setup of module rafkill --- NEW FILE Makefile --- # Top level Makefile for module rafkill all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 06:59:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 17 May 2006 23:59:28 -0700 Subject: rpms/rafkill/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605180659.k4I6xU9V008105@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8074/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rafkill --- NEW 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 May 18 07:01:06 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:01:06 -0700 Subject: rpms/rafkill import.log,1.1,1.2 Message-ID: <200605180701.k4I718Qn010398@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10154 Modified Files: import.log Log Message: auto-import rafkill-1.2.1-1 on branch devel from rafkill-1.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rafkill/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 06:59:28 -0000 1.1 +++ import.log 18 May 2006 07:01:06 -0000 1.2 @@ -0,0 +1 @@ +rafkill-1_2_1-1:HEAD:rafkill-1.2.1-1.src.rpm:1147935683 From fedora-extras-commits at redhat.com Thu May 18 07:01:07 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:01:07 -0700 Subject: rpms/rafkill/devel COPYING, NONE, 1.1 license-confirmation.txt, NONE, 1.1 rafkill-1.2.1-debian.patch, NONE, 1.1 rafkill-1.2.1-options.patch, NONE, 1.1 rafkill.6, NONE, 1.1 rafkill.desktop, NONE, 1.1 rafkill.png, NONE, 1.1 rafkill.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605180701.k4I719eI010409@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10154/devel Modified Files: .cvsignore sources Added Files: COPYING license-confirmation.txt rafkill-1.2.1-debian.patch rafkill-1.2.1-options.patch rafkill.6 rafkill.desktop rafkill.png rafkill.spec Log Message: auto-import rafkill-1.2.1-1 on branch devel from rafkill-1.2.1-1.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 license-confirmation.txt --- Rafkill is licensed under the GPL, however the latest upstream package comes without any license info. The previous verison 1.2.0 did include a GPL license notice and so does the CVS tree. To make really sure rafkill is still licensed under the GPL I asked the Author to confirm this, and it still is. The mail exchange confirming this is below: Message-ID: <446649EA.60605 at hhs.nl> Date: Sat, 13 May 2006 23:04:42 +0200 From: Hans de Goede User-Agent: Thunderbird 1.5.0.2 (X11/20060420) MIME-Version: 1.0 To: Jon Rafkind Subject: Re: Raptor References: <4423D4EE.1050301 at hhs.nl> <4423F583.3090705 at ccs.neu.edu> <442A35E8.2050303 at hhs.nl> <4456012C.9040605 at ccs.neu.edu> <445631A2.3000203 at hhs.nl> <445E96C4.4000807 at ccs.neu.edu> In-Reply-To: <445E96C4.4000807 at ccs.neu.edu> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, I'm in the process of packaging rafkill and now I noticed that there with 1.2.1 there no longer is COPYING file in the tarbal. Rafkill is still licensed under the GPL, correct? Could you please include the full text of the GPL in your next release? Thanks, Hans Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 47284811 for j.w.r.degoede at hhs.nl; Sun, 14 May 2006 00:56:53 +0200 Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) (envelope-from ) id 1Ff32Y-0005JV-KX for j.w.r.degoede at hhs.nl; Sun, 14 May 2006 00:56:53 +0200 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.1.0 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.62) (envelope-from ) id 1Ff32Y-0005JS-H7 for j.w.r.degoede at hhs.nl; Sun, 14 May 2006 00:56:50 +0200 Received: from [129.10.116.51] (port=51410 helo=amber.ccs.neu.edu) by koko.hhs.nl with esmtp (Exim 4.62) (envelope-from ) id 1Ff32Y-0005JN-6z for j.w.r.degoede at hhs.nl; Sun, 14 May 2006 00:56:50 +0200 Received: from amber.ccs.neu.edu ([129.10.116.51] helo=[127.0.0.1]) by amber.ccs.neu.edu with esmtp (Exim 4.50) id 1Ff32W-0005Lz-Gn for j.w.r.degoede at hhs.nl; Sat, 13 May 2006 18:56:48 -0400 Message-ID: <44666431.1040207 at ccs.neu.edu> Date: Sat, 13 May 2006 18:56:49 -0400 From: Jon Rafkind User-Agent: Mozilla Thunderbird 1.0.7 (X11/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Hans de Goede Subject: Re: Raptor References: <4423D4EE.1050301 at hhs.nl> <4423F583.3090705 at ccs.neu.edu> <442A35E8.2050303 at hhs.nl> <4456012C.9040605 at ccs.neu.edu> <445631A2.3000203 at hhs.nl> <445E96C4.4000807 at ccs.neu.edu> <446649EA.60605 at hhs.nl> In-Reply-To: <446649EA.60605 at hhs.nl> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 14052006 #181931, status: clean Yes, rafklll is still under the GPL. I must have forgot to include the COPYING file in my tarball script. Im sure you have added one for now. Thanks for pointing it out. Hans de Goede wrote: >Hi, > >I'm in the process of packaging rafkill and now I noticed that there >with 1.2.1 there no longer is COPYING file in the tarbal. > >Rafkill is still licensed under the GPL, correct? Could you please >include the full text of the GPL in your next release? > >Thanks, > >Hans > > > > rafkill-1.2.1-debian.patch: --- NEW FILE rafkill-1.2.1-debian.patch --- diff -ur rafkill-1.2.1.orig/README rafkill-1.2.1/README --- rafkill-1.2.1.orig/README 2006-05-07 18:08:46.000000000 +0200 +++ rafkill-1.2.1/README 2006-05-14 23:42:25.000000000 +0200 @@ -15,7 +15,7 @@ In the game you can change whether to show a background and the speed of the game. Getting rid of the background should significantly increase the fps if less than desired rate. -Changing the speed of the game to much may cuase the game to crash, so please be wary. +Changing the speed of the game too much may cause the game to crash, so please be wary. HOW TO PLAY: @@ -27,7 +27,7 @@ Your job is to shoot the enemies! How simple! Killing enemies gives you money( score ). If you kill a group of enemies, -which you can kind of tell becuase they move in the same pattern and are +which you can kind of tell because they move in the same pattern and are close to each other, you might get a handy coin which gives you more score! There are other powerups, so look for them too. The score lets you buy more weapons and hull parts. There are 5 weapon groups and a few weapons in each diff -ur rafkill-1.2.1.orig/src/defs.cpp rafkill-1.2.1/src/defs.cpp --- rafkill-1.2.1.orig/src/defs.cpp 2006-05-06 22:50:35.000000000 +0200 +++ rafkill-1.2.1/src/defs.cpp 2006-05-14 23:40:10.000000000 +0200 @@ -234,7 +234,7 @@ if ( g1 > 255 ) g1 = 255; if ( b1 > 255 ) b1 = 255; - printf("C1 = %d. C2 = %d. New color = %d\n", c1, c2, makecol(r1,g1,b1) ); + /* printf("C1 = %d. C2 = %d. New color = %d\n", c1, c2, makecol(r1,g1,b1) ); */ return makecol(r1,g1,b1); diff -ur rafkill-1.2.1.orig/src/rfield.cpp rafkill-1.2.1/src/rfield.cpp --- rafkill-1.2.1.orig/src/rfield.cpp 2006-05-02 05:14:19.000000000 +0200 +++ rafkill-1.2.1/src/rfield.cpp 2006-05-14 23:40:48.000000000 +0200 @@ -91,7 +91,7 @@ //**// RField_Name::RField_Name( Font * f_font, char * name, bool selectable, bool perm, int return_val, RMenu * who, int number, int sound ): RField( selectable, perm, return_val, who, number, sound ) { - handle = name; + handle = strdup( name ); field_font = f_font; } rafkill-1.2.1-options.patch: --- NEW FILE rafkill-1.2.1-options.patch --- diff -ur rafkill-1.2.1.orig/src/bitmap.cpp rafkill-1.2.1/src/bitmap.cpp --- rafkill-1.2.1.orig/src/bitmap.cpp 2006-05-07 18:05:38.000000000 +0200 +++ rafkill-1.2.1/src/bitmap.cpp 2006-05-15 20:50:47.000000000 +0200 @@ -22,7 +22,7 @@ const int Bitmap::MODE_TRANS = 0; const int Bitmap::MODE_SOLID = 1; -Bitmap * Bitmap::Screen; +Bitmap * Bitmap::Screen = NULL; Bitmap::Bitmap(): error( false ){ @@ -475,11 +475,19 @@ } int Bitmap::setGfxModeFullscreen( int x, int y ){ - return ::set_gfx_mode( GFX_AUTODETECT_FULLSCREEN, x, y, 0, 0 ); + int ret = ::set_gfx_mode( GFX_AUTODETECT_FULLSCREEN, x, y, 0, 0 ); + if (Bitmap::Screen) + delete Bitmap::Screen; + Bitmap::Screen = new Bitmap( screen ); + return ret; } int Bitmap::setGfxModeWindowed( int x, int y ){ - return ::set_gfx_mode( GFX_AUTODETECT_WINDOWED, x, y, 0, 0 ); + int ret = ::set_gfx_mode( GFX_AUTODETECT_WINDOWED, x, y, 0, 0 ); + if (Bitmap::Screen) + delete Bitmap::Screen; + Bitmap::Screen = new Bitmap( screen ); + return ret; } int Bitmap::makeColor( int r, int g, int b ){ diff -ur rafkill-1.2.1.orig/src/drawer.h rafkill-1.2.1/src/drawer.h --- rafkill-1.2.1.orig/src/drawer.h 2006-04-30 04:26:39.000000000 +0200 +++ rafkill-1.2.1/src/drawer.h 2006-05-15 20:52:23.000000000 +0200 @@ -32,6 +32,10 @@ drawTrans = false; } + inline void setDrawLand(bool value){ + draw_land = value; + } + ~Drawer(); protected: diff -ur rafkill-1.2.1.orig/src/init.cpp rafkill-1.2.1/src/init.cpp --- rafkill-1.2.1.orig/src/init.cpp 2006-05-02 05:04:14.000000000 +0200 +++ rafkill-1.2.1/src/init.cpp 2006-05-15 20:50:47.000000000 +0200 @@ -9,7 +9,7 @@ END_OF_FUNCTION( inc_speed_counter ); -void init( int mode, int GAME_SPEED ) { +void init( int window_mode, int GAME_SPEED ) { allegro_init(); srand( time( NULL ) ); @@ -23,25 +23,12 @@ } */ - int gfx = GFX_AUTODETECT_WINDOWED; - switch ( mode ){ - case 0 : { - gfx = GFX_AUTODETECT_FULLSCREEN; - break; - } - case 1 : { - gfx = GFX_AUTODETECT_WINDOWED; - break; - } - } - set_color_depth( 16 ); - if ( set_gfx_mode( gfx, GRAPHICS_X, GRAPHICS_Y, 0, 0 ) != 0 ){ - if ( set_gfx_mode( GFX_AUTODETECT, GRAPHICS_X, GRAPHICS_Y, 0, 0 ) != 0 ) { - allegro_message( "Could not initialize a graphics mode.. bailing" ); - exit( 1 ); - } - } + if (window_mode) + Bitmap::setGfxModeWindowed( GRAPHICS_X, GRAPHICS_Y ); + else + Bitmap::setGfxModeFullscreen( GRAPHICS_X, GRAPHICS_Y ); + // text_mode( -1 ); reserve_voices (8, -1); set_volume_per_voice( 0 ); @@ -59,8 +46,4 @@ Util::sound_vol = 1.0; //max volume to begin with // music_vol = 0.50; dumb_resampling_quality = get_config_int( "sound", "dumb_resampling_quality", 1 ); - - /* set up global screen variable */ - Bitmap::Screen = new Bitmap( screen ); } - diff -ur rafkill-1.2.1.orig/src/raptor.cpp rafkill-1.2.1/src/raptor.cpp --- rafkill-1.2.1.orig/src/raptor.cpp 2006-05-07 06:20:00.000000000 +0200 +++ rafkill-1.2.1/src/raptor.cpp 2006-05-15 20:56:20.000000000 +0200 @@ -45,8 +45,7 @@ static const int INC_RATE = 10; static const int DEC_RATE = 11; static const int INIT_HELP = 12; -static const int INIT_SCREEN_FULL = 13; -static const int INIT_SCREEN_WINDOW = 14; +static const int INIT_SCREEN = 13; static const int SOUND_INC = 15; static const int SOUND_DEC = 16; static const int MUSIC_INC = 17; @@ -54,6 +53,8 @@ static const int DIFFICULT_MENU = 1000; static Font * normalFont = NULL; +static int window_mode = 0; +static bool dl = true; extern void init( int GFX, int GAME_SPEED ); @@ -257,7 +258,7 @@ // destroy_bitmap( sell_screen ); } -int intro_screen( int & frames, int window_mode, bool & dl, SpaceObject ** player, DATAFILE * sound ){ +static int intro_screen( int & frames, SpaceObject ** player, DATAFILE * sound ){ //RGB * crap = new RGB[256]; // char * file_name_pcx = Util::data_file( "logosmoot.pcx" ); @@ -314,11 +315,10 @@ option_menu.addTitle( strdup("Options"), normalFont ); char * numnum = int2str( frames ); // option_menu.addMenu( append("Frame rate ",numnum), normalFont, true,244,&frame_menu,select_smp); - //if ( window_mode == GFX_AUTODETECT ) - // option_menu->addMenu( strdup("Windowed"),Util::raptor_font,true,INIT_SCREEN,option_menu,select_smp); - //else option_menu->addMenu( strdup("Fullscreen"),Util::raptor_font,true,INIT_SCREEN,option_menu,select_smp); - option_menu.addMenu( strdup("Windowed"), normalFont, true,INIT_SCREEN_WINDOW,&option_menu,select_smp); - option_menu.addMenu( strdup("Fullscreen"), normalFont, true,INIT_SCREEN_FULL,&option_menu,select_smp); + if ( window_mode ) + option_menu.addMenu( strdup("Fullscreen off"), normalFont, true,INIT_SCREEN,&option_menu,select_smp); + else + option_menu.addMenu( strdup("Fullscreen on"), normalFont, true,INIT_SCREEN,&option_menu,select_smp); if ( dl ) option_menu.addMenu( strdup("Background on"), normalFont, true,INIT_BACK,&option_menu,select_smp); else option_menu.addMenu( strdup("Background off"), normalFont, true,INIT_BACK,&option_menu,select_smp); @@ -447,38 +447,21 @@ do_credits(); break; } - /* - case INIT_SCREEN : { - if ( window_mode == GFX_AUTODETECT_FULLSCREEN ) - window_mode = GFX_AUTODETECT_WINDOWED; - else window_mode = GFX_AUTODETECT_FULLSCREEN; - if ( window_mode == GFX_AUTODETECT_WINDOWED ) - option_menu->replace( 3, strdup("Windowed"), Util::raptor_font,true, INIT_SCREEN, option_menu, select_smp ); - else option_menu->replace( 3, strdup("Fullscreen"), Util::raptor_font,true, INIT_SCREEN, option_menu, select_smp ); - printf("Setting gfx mode to %d - Status ",window_mode); - int cap = set_gfx_mode( window_mode, GRAPHICS_X, GRAPHICS_Y, 0, 0 ); - printf("%d\n",cap ); - if ( cap == -1 ) { - printf("Allegro error: %s\n", allegro_error ); - set_gfx_mode(GFX_AUTODETECT,GRAPHICS_X,GRAPHICS_Y,0,0); - option_menu->replace(3,strdup("Error with gfx set"), Util::raptor_font,false, INIT_SCREEN, option_menu, select_smp ); - } - - break; - } - */ - case INIT_SCREEN_FULL : { - Bitmap::setGfxModeFullscreen( GRAPHICS_X, GRAPHICS_Y ); - break; - } - case INIT_SCREEN_WINDOW : { - Bitmap::setGfxModeWindowed( GRAPHICS_X, GRAPHICS_Y ); + case INIT_SCREEN : { + window_mode = !window_mode; + if ( window_mode ) { + Bitmap::setGfxModeWindowed( GRAPHICS_X, GRAPHICS_Y ); + option_menu.replace(2, strdup("Fullscreen off"), normalFont, true,INIT_SCREEN,&option_menu,select_smp); + } else { + Bitmap::setGfxModeFullscreen( GRAPHICS_X, GRAPHICS_Y ); + option_menu.replace(2, strdup("Fullscreen on"), normalFont, true,INIT_SCREEN,&option_menu,select_smp); + } break; } case INIT_BACK : { if ( dl ) dl = false;else dl=true; - if ( dl ) option_menu.replace( 5, strdup("Background ON"), &menuFont, true, INIT_BACK, &option_menu, select_smp ); else - option_menu.replace( 5, strdup("Background off"), &menuFont, true, INIT_BACK, &option_menu, select_smp ); + if ( dl ) option_menu.replace( 3, strdup("Background on"), &menuFont, true, INIT_BACK, &option_menu, select_smp ); else + option_menu.replace( 3, strdup("Background off"), &menuFont, true, INIT_BACK, &option_menu, select_smp ); break; } @@ -708,6 +691,7 @@ Drawer draw; Logic logic; LevelCreator level( file_level, player ); + draw.setDrawLand(dl); /* stop loading screen */ endLoadingScreen(); @@ -851,8 +835,6 @@ //******************************MAIN************************** int rafkill( int argc, char ** argv ) { - int window = 0; - bool dl = true; int gameSpeed = 40; printf("raptor -h for help screen\n"); @@ -862,7 +844,7 @@ return 0; } if ( strcmp( argv[q], "-w" ) == 0 ){ - window = 1; + window_mode = 1; } else if ( strcmp( argv[q], "-l" ) == 0 ){ dl = false; } else if ( strlen( argv[q] ) > 2 ){ @@ -877,8 +859,8 @@ } cout << "Running game at " << gameSpeed << endl; - cout << "Using mode " << window << endl; - init( window, gameSpeed ); + cout << "Using mode " << window_mode << endl; + init( window_mode, gameSpeed ); cout << "OS " << Util::getOS() << endl; Util::loadGlobals(); @@ -914,7 +896,7 @@ bool quit; // int real_level = 1; int geti; - while ( (geti = intro_screen( gameSpeed, window, dl, &player, Util::global_snd ) ) != INIT_QUIT ) { + while ( (geti = intro_screen( gameSpeed, &player, Util::global_snd ) ) != INIT_QUIT ) { quit = geti == INIT_QUIT; while ( ! quit ) { --- NEW FILE rafkill.6 --- .\" 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 RAFKILL 6 "24 April 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 Rafkill \- a vertical shoot'em-up .SH SYNOPSIS .B rafkill [ -l ] [ -w ] [ -g ] [ -h ] .SH DESCRIPTION .B Rafkill is a clone of Raptor: Call of the Shadows, a classic shoot'em-up game. You have a bird's eye view of the playing field, which is an alien world, and your job is to destroy the enemies that are flying towards you shooting bullets. The score lets you buy life, shield, better weapons or even new spaceships. Killing enemies gives you money, or score. If you kill a group of enemies, you might get a handy coin which gives you more score. There are other powerups, so look for them too. The score lets you buy more weapons and hull parts. There are 5 weapon groups and a few weapons in each group, but you can only have one weapon per group except for the accessory weapons in which you can have up to 3 weapons. Once you buy 3, you cannot buy any more. There are 3 hulls, which have each higher life and shield than the previous one and gives you access to a new set of weapons. Buying a new hull does not throw away your weapons, but it does throw away your accessory weapons. .SH OPTIONS .TP \fB\-l\fR run the game without displaying the background .TP \fB\-w\fR run the game in windowed mode instead of full screen .TP \fB\-g\fR run the game at a different speed (default is 40) .TP \fB\-h, \-help, \-\-help\fR display help message and exit .SH KEYS .TP .B Left, Right, Up, Down move the ship across the screen .TP .B Space or Enter fire the main weapon .TP .B Alt switch between alternate weapons .TP .B Esc return to the game menu .BR .SH AUTHOR Rafkill was written by Jon Rafkind . This manual page was written by Sam Hocevar , for the Debian GNU/Linux system (but may be used by others). --- NEW FILE rafkill.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Rafkill Comment=Top-down shooter with powerups Exec=rafkill Icon=rafkill.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; --- NEW FILE rafkill.spec --- Name: rafkill Version: 1.2.1 Release: 1%{?dist} Summary: Top-down shooter with powerups Group: Amusements/Games License: GPL URL: http://raptorv2.sourceforge.net/ Source0: http://download.sourceforge.net/raptorv2/%{name}-%{version}.tar.gz Source1: rafkill.desktop Source2: rafkill.6 Source3: COPYING Source4: license-confirmation.txt Source5: rafkill.png Patch0: rafkill-1.2.1-debian.patch Patch1: rafkill-1.2.1-options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel dumb-devel scons desktop-file-utils %description Rafkill is a vertical scrolling shoot-em up game. You can collect powerups during gameplay and you can goto the store with your spaceship and buy powerups or even a complete new ship with the points you've earned sofar. %prep %setup -q %patch0 -p1 -z .debian %patch1 -p1 -z .options cp %{SOURCE3} %{SOURCE4} . # sigh hack hack hack FLAGS="" for i in $RPM_OPT_FLAGS; do FLAGS="$FLAGS '$i'," done FLAGS="$FLAGS '-DINSTALL_DIR=\\\\\\\\\"%{_datadir}\\\\\\\\\"'" %{__sed} -i "s!flags = .*!flags = [ $FLAGS ];!" SConstruct %build export CCFLAGS="$RPM_OPT_FLAGS" scons prefix=%{_datadir} %install rm -rf $RPM_BUILD_ROOT #scons won't install into a buildroot, only into the real root so DIY mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} $RPM_BUILD_ROOT%{_bindir} install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} cp -a data music $RPM_BUILD_ROOT%{_datadir}/%{name} rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*/.sconsign rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/*.h # manpage courtesy of Debian mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 %{SOURCE5} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc README COPYING license-confirmation.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog * Sat May 13 2006 Hans de Goede 1.2.1-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rafkill/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 06:59:28 -0000 1.1 +++ .cvsignore 18 May 2006 07:01:07 -0000 1.2 @@ -0,0 +1 @@ +rafkill-1.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/rafkill/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 06:59:28 -0000 1.1 +++ sources 18 May 2006 07:01:07 -0000 1.2 @@ -0,0 +1 @@ +e27a24d5a0c2e92ba13815d8d6638a6b rafkill-1.2.1.tar.gz From fedora-extras-commits at redhat.com Thu May 18 07:03:46 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:03:46 -0700 Subject: owners owners.list,1.1014,1.1015 Message-ID: <200605180703.k4I73mf6010615@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10582/owners Modified Files: owners.list Log Message: add rafkill Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1014 retrieving revision 1.1015 diff -u -r1.1014 -r1.1015 --- owners.list 17 May 2006 14:49:36 -0000 1.1014 +++ owners.list 18 May 2006 07:03:46 -0000 1.1015 @@ -1412,6 +1412,7 @@ Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| +Fedora Extras|rafkill|Top-down shooter with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|raidem-music|Background music for the game raidem|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|rapidsvn|Graphical interface for the Subversion revision control system|rpm at timj.co.uk|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 07:03:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:03:47 -0700 Subject: comps comps-fe6.xml.in,1.15,1.16 Message-ID: <200605180703.k4I73nwK010619@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10582/comps Modified Files: comps-fe6.xml.in Log Message: add rafkill Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- comps-fe6.xml.in 15 May 2006 19:03:04 -0000 1.15 +++ comps-fe6.xml.in 18 May 2006 07:03:47 -0000 1.16 @@ -241,6 +241,7 @@ ppracer qascade qqo + rafkill raidem rocksndiamonds rogue From fedora-extras-commits at redhat.com Thu May 18 07:05:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:05:33 -0700 Subject: comps comps-fe5.xml.in,1.51,1.52 Message-ID: <200605180705.k4I75ZMM010692@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10675/comps Modified Files: comps-fe5.xml.in Log Message: add xarchon Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- comps-fe5.xml.in 15 May 2006 16:00:49 -0000 1.51 +++ comps-fe5.xml.in 18 May 2006 07:05:33 -0000 1.52 @@ -257,6 +257,7 @@ viruskiller wesnoth worminator + xarchon xboard xpilot-ng xplanet From fedora-extras-commits at redhat.com Thu May 18 07:17:46 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:17:46 -0700 Subject: rpms/utrac/devel utrac.spec,1.2,1.3 Message-ID: <200605180717.k4I7Hmnf010749@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10732 Modified Files: utrac.spec Log Message: Honor Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/devel/utrac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- utrac.spec 8 Nov 2005 08:58:09 -0000 1.2 +++ utrac.spec 18 May 2006 07:17:46 -0000 1.3 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -53,6 +53,8 @@ %patch0 %patch1 -p1 %patch2 +%{__sed} -i -e 's/^\(CFLAGS.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile +%{__sed} -i -e '/^\s*strip /d' Makefile %build make %{?_smp_mflags} @@ -91,6 +93,10 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-6 + - Honor $RPM_OPT_FLAGS flags. + Contribution of Ville Skytt?? . + * Tue Nov 8 2005 Alain Portal 0.3.0-5 - Patch to change prefix. Fix #172601 From fedora-extras-commits at redhat.com Thu May 18 07:26:48 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:26:48 -0700 Subject: rpms/utrac/FC-3 utrac.spec,1.2,1.3 Message-ID: <200605180726.k4I7Qo3X010857@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10840 Modified Files: utrac.spec Log Message: Honor Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/FC-3/utrac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- utrac.spec 8 Nov 2005 12:02:35 -0000 1.2 +++ utrac.spec 18 May 2006 07:26:48 -0000 1.3 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -53,6 +53,8 @@ %patch0 %patch1 -p1 %patch2 +%{__sed} -i -e 's/^\(CFLAGS.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile +%{__sed} -i -e '/^\s*strip /d' Makefile %build make %{?_smp_mflags} @@ -91,6 +93,10 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-6 + - Honor $RPM_OPT_FLAGS flags. + Contribution of Ville Skytt?? . + * Tue Nov 8 2005 Alain Portal 0.3.0-5 - Patch to change prefix. Fix #172601 From fedora-extras-commits at redhat.com Thu May 18 07:28:10 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:28:10 -0700 Subject: rpms/utrac/FC-4 utrac.spec,1.2,1.3 Message-ID: <200605180728.k4I7SCgf010910@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10893 Modified Files: utrac.spec Log Message: Honor Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/FC-4/utrac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- utrac.spec 8 Nov 2005 12:04:42 -0000 1.2 +++ utrac.spec 18 May 2006 07:28:10 -0000 1.3 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -53,6 +53,8 @@ %patch0 %patch1 -p1 %patch2 +%{__sed} -i -e 's/^\(CFLAGS.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile +%{__sed} -i -e '/^\s*strip /d' Makefile %build make %{?_smp_mflags} @@ -91,6 +93,10 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-6 + - Honor $RPM_OPT_FLAGS flags. + Contribution of Ville Skytt?? . + * Tue Nov 8 2005 Alain Portal 0.3.0-5 - Patch to change prefix. Fix #172601 From fedora-extras-commits at redhat.com Thu May 18 07:28:39 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:28:39 -0700 Subject: rpms/utrac/FC-5 utrac.spec,1.2,1.3 Message-ID: <200605180728.k4I7SfHJ010971@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10954 Modified Files: utrac.spec Log Message: Honor Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/FC-5/utrac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- utrac.spec 8 Nov 2005 08:58:09 -0000 1.2 +++ utrac.spec 18 May 2006 07:28:39 -0000 1.3 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -53,6 +53,8 @@ %patch0 %patch1 -p1 %patch2 +%{__sed} -i -e 's/^\(CFLAGS.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile +%{__sed} -i -e '/^\s*strip /d' Makefile %build make %{?_smp_mflags} @@ -91,6 +93,10 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-6 + - Honor $RPM_OPT_FLAGS flags. + Contribution of Ville Skytt?? . + * Tue Nov 8 2005 Alain Portal 0.3.0-5 - Patch to change prefix. Fix #172601 From fedora-extras-commits at redhat.com Thu May 18 07:59:45 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:59:45 -0700 Subject: rpms/utrac/FC-3 utrac.spec,1.3,1.4 Message-ID: <200605180759.k4I7xln6011400@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11383 Modified Files: utrac.spec Log Message: Increase release to fix a cvs error. Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/FC-3/utrac.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- utrac.spec 18 May 2006 07:26:48 -0000 1.3 +++ utrac.spec 18 May 2006 07:59:45 -0000 1.4 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -93,6 +93,9 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-7 + - Increase release to fix a cvs error. + * Thu May 18 2006 Alain Portal 0.3.0-6 - Honor $RPM_OPT_FLAGS flags. Contribution of Ville Skytt?? . From fedora-extras-commits at redhat.com Thu May 18 09:04:20 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:04:20 -0700 Subject: rpms/perl-Net-SNMP - New directory Message-ID: <200605180904.k4I94M3F016188@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16167/perl-Net-SNMP Log Message: Directory /cvs/extras/rpms/perl-Net-SNMP added to the repository From fedora-extras-commits at redhat.com Thu May 18 09:04:20 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:04:20 -0700 Subject: rpms/perl-Net-SNMP/devel - New directory Message-ID: <200605180904.k4I94MK2016191@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16167/perl-Net-SNMP/devel Log Message: Directory /cvs/extras/rpms/perl-Net-SNMP/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 09:04:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:04:42 -0700 Subject: rpms/perl-Net-SNMP Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605180904.k4I94isE016245@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212 Added Files: Makefile import.log Log Message: Setup of module perl-Net-SNMP --- NEW FILE Makefile --- # Top level Makefile for module perl-Net-SNMP all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 09:04:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:04:42 -0700 Subject: rpms/perl-Net-SNMP/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605180904.k4I94itL016248@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Net-SNMP --- NEW 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 May 18 09:05:11 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:05:11 -0700 Subject: rpms/perl-Net-SNMP import.log,1.1,1.2 Message-ID: <200605180905.k4I95DK4016309@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16276 Modified Files: import.log Log Message: auto-import perl-Net-SNMP-5.2.0-1 on branch devel from perl-Net-SNMP-5.2.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SNMP/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 09:04:41 -0000 1.1 +++ import.log 18 May 2006 09:05:11 -0000 1.2 @@ -0,0 +1 @@ +perl-Net-SNMP-5_2_0-1:HEAD:perl-Net-SNMP-5.2.0-1.src.rpm:1147943103 From fedora-extras-commits at redhat.com Thu May 18 09:07:37 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 18 May 2006 02:07:37 -0700 Subject: rpms/GeoIP/FC-5 .cvsignore, 1.3, 1.4 GeoIP.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605180907.k4I97dan016395@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16374 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.3.17-1 - New upstream release (minor fixes) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 08:37:50 -0000 1.3 +++ .cvsignore 18 May 2006 09:07:37 -0000 1.4 @@ -1 +1 @@ -GeoIP-1.3.16.tar.gz +GeoIP-1.3.17.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- GeoIP.spec 1 May 2006 08:37:50 -0000 1.3 +++ GeoIP.spec 18 May 2006 09:07:37 -0000 1.4 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.3.16 +Version: 1.3.17 Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO INSTALL +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,11 +71,12 @@ %{_libdir}/libGeoIPUpdate.so %changelog -* Mon May 1 2006 Michael Fleming 1.3.16-1 -- New upstream release +* Mon May 15 2006 Michael Fleming 1.3.17-1 +- New upstream release (minor fixes) -* Sat Mar 18 2006 Michael Fleming 1.3.14-4 -- Build for FC5 +* Mon May 1 2006 Michael Fleming 1.3.16-1 +- New upstream release +- Add INSTALL document to package. * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 08:37:50 -0000 1.3 +++ sources 18 May 2006 09:07:37 -0000 1.4 @@ -1 +1 @@ -f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz +36ee129b4dce5990cea1cfda122dae93 GeoIP-1.3.17.tar.gz From fedora-extras-commits at redhat.com Thu May 18 09:07:46 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:07:46 -0700 Subject: owners owners.list,1.1015,1.1016 Message-ID: <200605180907.k4I97mOW016420@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16401 Modified Files: owners.list Log Message: New package: perl-Net-SNMP (#191628) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1015 retrieving revision 1.1016 diff -u -r1.1015 -r1.1016 --- owners.list 18 May 2006 07:03:46 -0000 1.1015 +++ owners.list 18 May 2006 09:07:46 -0000 1.1016 @@ -1146,6 +1146,7 @@ Fedora Extras|perl-Net-Patricia|Patricia Trie perl module for fast IP address lookups|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-SNMP|Object oriented interface to SNMP|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH-Perl|SSH (Secure Shell) client|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu May 18 09:08:36 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 18 May 2006 02:08:36 -0700 Subject: rpms/GeoIP/FC-4 .cvsignore, 1.3, 1.4 GeoIP.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605180908.k4I98cOd016493@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16472 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.3.17-1 - New upstream release (minor fixes) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 08:40:53 -0000 1.3 +++ .cvsignore 18 May 2006 09:08:36 -0000 1.4 @@ -1 +1 @@ -GeoIP-1.3.16.tar.gz +GeoIP-1.3.17.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/GeoIP.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GeoIP.spec 1 May 2006 08:40:53 -0000 1.2 +++ GeoIP.spec 18 May 2006 09:08:36 -0000 1.3 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.3.16 +Version: 1.3.17 Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO INSTALL +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,8 +71,12 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 15 2006 Michael Fleming 1.3.17-1 +- New upstream release (minor fixes) + * Mon May 1 2006 Michael Fleming 1.3.16-1 -- New upstream release +- New upstream release +- Add INSTALL document to package. * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 08:40:53 -0000 1.3 +++ sources 18 May 2006 09:08:36 -0000 1.4 @@ -1 +1 @@ -f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz +36ee129b4dce5990cea1cfda122dae93 GeoIP-1.3.17.tar.gz From fedora-extras-commits at redhat.com Thu May 18 09:22:51 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 18 May 2006 02:22:51 -0700 Subject: rpms/darcs/FC-5 darcs.spec,1.11,1.12 Message-ID: <200605180922.k4I9MrsV016663@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16646 Modified Files: darcs.spec Log Message: disable "make check" for now since it chokes in buildsystem Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/darcs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- darcs.spec 16 May 2006 01:18:09 -0000 1.11 +++ darcs.spec 18 May 2006 09:22:51 -0000 1.12 @@ -54,7 +54,7 @@ %build %configure --libexecdir=%{_localstatedir}/www make all -make check +#make check %install @@ -87,9 +87,7 @@ * Sun May 14 2006 Jens Petersen - 1.0.7-1 - update to 1.0.7 - fix typo of propagate in description (#189651) - -* Wed Mar 22 2006 Jens Petersen - 1.0.6-2 -- build with rebuilt ghc +- disable "make check" for now since it chokes in buildsystem * Thu Mar 2 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 From fedora-extras-commits at redhat.com Thu May 18 09:05:11 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:05:11 -0700 Subject: rpms/perl-Net-SNMP/devel perl-Net-SNMP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605180905.k4I95DLD016314@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16276/devel Modified Files: .cvsignore sources Added Files: perl-Net-SNMP.spec Log Message: auto-import perl-Net-SNMP-5.2.0-1 on branch devel from perl-Net-SNMP-5.2.0-1.src.rpm --- NEW FILE perl-Net-SNMP.spec --- Name: perl-Net-SNMP Version: 5.2.0 Release: 1%{?dist} Summary: Object oriented interface to SNMP Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Net-SNMP/ Source0: http://www.cpan.org/authors/id/D/DT/DTOWN/Net-SNMP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Crypt::DES) BuildRequires: perl(Digest::HMAC) BuildRequires: perl(Digest::SHA1) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) #Requires: perl(Crypt::Rijndael) #Requires: perl(Socket6) %description The Net::SNMP module implements an object oriented interface to the Simple Network Management Protocol. Perl applications can use the module to retrieve or update information on a remote host using the SNMP protocol. The module supports SNMP version-1, SNMP version-2c (Community-Based SNMPv2), and SNMP version-3. The Net::SNMP module assumes that the user has a basic understanding of the Simple Network Management Protocol and related network management concepts. %prep %setup -q -n Net-SNMP-%{version} %{__perl} -pi -e 's|^#!\s+/usr/local/bin/perl|#!%{__perl}|' examples/*.pl chmod -c a-x examples/*.pl # Requirements: exclude perl(Socket6) cat <<__EOF__ > %{name}-perlreq #!/bin/sh /usr/lib/rpm/perl.req \$* | grep -v '^perl(Socket6)' __EOF__ %define __perl_requires %{_builddir}/Net-SNMP-%{version}/%{name}-perlreq chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -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 examples/ %{_bindir}/* %{perl_vendorlib}/Net/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3pm* %changelog * Sat May 13 2006 Jose Pedro Oliveira - 5.2.0-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SNMP/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 09:04:42 -0000 1.1 +++ .cvsignore 18 May 2006 09:05:11 -0000 1.2 @@ -0,0 +1 @@ +Net-SNMP-5.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SNMP/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 09:04:42 -0000 1.1 +++ sources 18 May 2006 09:05:11 -0000 1.2 @@ -0,0 +1 @@ +0e717723f843ab22a93248833f3ebff7 Net-SNMP-5.2.0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 10:00:18 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 18 May 2006 03:00:18 -0700 Subject: fedora-security/audit fc4,1.252,1.253 fc5,1.167,1.168 Message-ID: <200605181000.k4IA0IdB016802@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16782 Modified Files: fc4 fc5 Log Message: Deal with mysql Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- fc4 17 May 2006 15:14:44 -0000 1.252 +++ fc4 18 May 2006 10:00:15 -0000 1.253 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060515 -Up to date FC4 as of 20060515 +Up to date CVE as of CVE email 20060517 +Up to date FC4 as of 20060517 ** are items that need attention @@ -124,8 +124,8 @@ CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423] CVE-2006-1518 ignore (mysql) 5.x only -CVE-2006-1517 VULNERABLE (mysql, fixed 4.1.19) #190868 -CVE-2006-1516 VULNERABLE (mysql, fixed 4.1.19) #190866 +CVE-2006-1517 version (mysql, fixed 4.1.19) #190868 [since FEDORA-2006-554] +CVE-2006-1516 version (mysql, fixed 4.1.19) #190866 [since FEDORA-2006-554] CVE-2006-1494 VULNERABLE (php) #189592 CVE-2006-1490 VULNERABLE (php, fixed 5.1.4) CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] @@ -150,7 +150,7 @@ CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0996 VULNERABLE (php) #187511 -CVE-2006-0903 VULNERABLE (mysql) #183261 +CVE-2006-0903 version (mysql, fixed 4.1.19) #183261 [since FEDORA-2006-554] CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0749 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- fc5 17 May 2006 15:14:44 -0000 1.167 +++ fc5 18 May 2006 10:00:15 -0000 1.168 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060516 -Up to date FC5 as of 20060516 +Up to date CVE as of CVE email 20060517 +Up to date FC5 as of 20060517 ** are items that need attention @@ -123,9 +123,9 @@ CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421] -CVE-2006-1518 VULNERABLE (mysql, fixed 5.0.21) #190870 -CVE-2006-1517 VULNERABLE (mysql, fixed 5.0.21) #190868 -CVE-2006-1516 VULNERABLE (mysql, fixed 5.0.21) #190866 +CVE-2006-1518 version (mysql, fixed 5.0.21) #190870 [since FEDORA-2006-553] +CVE-2006-1517 version (mysql, fixed 5.0.21) #190870 [since FEDORA-2006-553] +CVE-2006-1516 version (mysql, fixed 5.0.21) #190870 [since FEDORA-2006-553] CVE-2006-1494 version (php) #189592 [since FEDORA-2006-289] CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289] CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] @@ -152,7 +152,7 @@ CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0996 version (php, fixed 5.1.4) bz#187511 [since FEDORA-2006-289] -CVE-2006-0903 VULNERABLE (mysql) #183261 low/not upstream yet +CVE-2006-0903 version (mysql, 4.1.19) #183261 [since FEDORA-2006-553] CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) CVE-2006-0749 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] From fedora-extras-commits at redhat.com Thu May 18 10:31:09 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 03:31:09 -0700 Subject: owners owners.list,1.1016,1.1017 Message-ID: <200605181031.k4IAVBgQ019181@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19162 Modified Files: owners.list Log Message: add qt4 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1016 retrieving revision 1.1017 diff -u -r1.1016 -r1.1017 --- owners.list 18 May 2006 09:07:46 -0000 1.1016 +++ owners.list 18 May 2006 10:31:09 -0000 1.1017 @@ -1400,6 +1400,7 @@ Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|qscintilla|A Scintilla port to Qt|icon at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|qt4|Qt is a GUI software toolkit|than at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|quadkonsole|Embeds Konsole kparts in a grid layout|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 10:46:45 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 03:46:45 -0700 Subject: rpms/kchmviewer/devel kchmviewer-2.5-iconstorage.h.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kchmviewer.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605181046.k4IAkmqd019274@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19250 Modified Files: .cvsignore kchmviewer.spec sources Added Files: kchmviewer-2.5-iconstorage.h.patch Log Message: * Thu May 18 2006 Patrice Dumas 2.5-1 - update to 2.5 - patch from Jose Pedro Oliveira (jpo) kchmviewer-2.5-iconstorage.h.patch: --- NEW FILE kchmviewer-2.5-iconstorage.h.patch --- diff -ruN kchmviewer-2.5-orig/src/iconstorage.h kchmviewer-2.5/src/iconstorage.h --- kchmviewer-2.5-orig/src/iconstorage.h 2006-04-02 03:09:14.000000000 +0100 +++ kchmviewer-2.5/src/iconstorage.h 2006-05-18 01:05:57.000000000 +0100 @@ -57,7 +57,7 @@ const QPixmap * getBookIconPixmap (unsigned int id); const QPixmap * getToolbarPixmap (pixmap_index_t pix); const QPixmap * getApplicationIcon(); - const QPixmap * KCHMIconStorage::getCloseWindowIcon(); + const QPixmap * getCloseWindowIcon(); private: const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 May 2006 08:35:31 -0000 1.2 +++ .cvsignore 18 May 2006 10:46:45 -0000 1.3 @@ -1 +1 @@ -kchmviewer-2.0.tar.gz +kchmviewer-2.5.tar.gz Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kchmviewer.spec 16 May 2006 14:03:31 -0000 1.2 +++ kchmviewer.spec 18 May 2006 10:46:45 -0000 1.3 @@ -1,14 +1,15 @@ Name: kchmviewer -Version: 2.0 -Release: 4%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: CHM viewer Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ -Source0: http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff +Patch1: kchmviewer-2.5-iconstorage.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel @@ -48,6 +49,7 @@ %prep %setup -q %patch +%patch1 -p1 chmod -x kio-msits/msits.* @@ -86,8 +88,13 @@ %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la %{_datadir}/services/msits.protocol +%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %changelog +* Thu May 18 2006 Patrice Dumas 2.5-1 +- update to 2.5 +- patch from Jose Pedro Oliveira (jpo) + * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 May 2006 08:35:31 -0000 1.2 +++ sources 18 May 2006 10:46:45 -0000 1.3 @@ -1 +1 @@ -94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz +31aa10f89b92ec5323fef7c26b1e1eed kchmviewer-2.5.tar.gz From fedora-extras-commits at redhat.com Thu May 18 11:10:14 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 18 May 2006 04:10:14 -0700 Subject: rpms/darcs/FC-4 darcs.spec,1.9,1.10 Message-ID: <200605181110.k4IBAGrQ022090@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059 Modified Files: darcs.spec Log Message: disable "make check" for now since it chokes in buildsystem Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- darcs.spec 16 May 2006 01:39:08 -0000 1.9 +++ darcs.spec 18 May 2006 11:10:13 -0000 1.10 @@ -54,7 +54,7 @@ %build %configure --libexecdir=%{_localstatedir}/www make all -make check +#make check %install @@ -87,6 +87,7 @@ * Sun May 14 2006 Jens Petersen - 1.0.7-1 - update to 1.0.7 - fix typo of propagate in description (#189651) +- disable "make check" for now since it chokes in buildsystem * Wed Mar 22 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 From fedora-extras-commits at redhat.com Thu May 18 11:24:57 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 04:24:57 -0700 Subject: rpms/kchmviewer/FC-4 kchmviewer-2.5-iconstorage.h.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kchmviewer.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605181124.k4IBOxSg022327@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22286/FC-4 Modified Files: .cvsignore kchmviewer.spec sources Added Files: kchmviewer-2.5-iconstorage.h.patch Log Message: * Thu May 18 2006 Patrice Dumas 2.5-1 - update to 2.5 - patch from Jose Pedro Oliveira (jpo) kchmviewer-2.5-iconstorage.h.patch: --- NEW FILE kchmviewer-2.5-iconstorage.h.patch --- diff -ruN kchmviewer-2.5-orig/src/iconstorage.h kchmviewer-2.5/src/iconstorage.h --- kchmviewer-2.5-orig/src/iconstorage.h 2006-04-02 03:09:14.000000000 +0100 +++ kchmviewer-2.5/src/iconstorage.h 2006-05-18 01:05:57.000000000 +0100 @@ -57,7 +57,7 @@ const QPixmap * getBookIconPixmap (unsigned int id); const QPixmap * getToolbarPixmap (pixmap_index_t pix); const QPixmap * getApplicationIcon(); - const QPixmap * KCHMIconStorage::getCloseWindowIcon(); + const QPixmap * getCloseWindowIcon(); private: const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 May 2006 08:35:31 -0000 1.2 +++ .cvsignore 18 May 2006 11:24:57 -0000 1.3 @@ -1 +1 @@ -kchmviewer-2.0.tar.gz +kchmviewer-2.5.tar.gz Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-4/kchmviewer.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kchmviewer.spec 16 May 2006 16:39:14 -0000 1.2 +++ kchmviewer.spec 18 May 2006 11:24:57 -0000 1.3 @@ -1,14 +1,15 @@ Name: kchmviewer -Version: 2.0 -Release: 4%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: CHM viewer Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ -Source0: http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff +Patch1: kchmviewer-2.5-iconstorage.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel @@ -48,6 +49,7 @@ %prep %setup -q %patch +%patch1 -p1 chmod -x kio-msits/msits.* @@ -86,8 +88,13 @@ %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la %{_datadir}/services/msits.protocol +%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %changelog +* Thu May 18 2006 Patrice Dumas 2.5-1 +- update to 2.5 +- patch from Jose Pedro Oliveira (jpo) + * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 May 2006 08:35:31 -0000 1.2 +++ sources 18 May 2006 11:24:57 -0000 1.3 @@ -1 +1 @@ -94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz +31aa10f89b92ec5323fef7c26b1e1eed kchmviewer-2.5.tar.gz From fedora-extras-commits at redhat.com Thu May 18 11:24:58 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 04:24:58 -0700 Subject: rpms/kchmviewer/FC-5 kchmviewer-2.5-iconstorage.h.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kchmviewer.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605181125.k4IBP0mW022335@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22286/FC-5 Modified Files: .cvsignore kchmviewer.spec sources Added Files: kchmviewer-2.5-iconstorage.h.patch Log Message: * Thu May 18 2006 Patrice Dumas 2.5-1 - update to 2.5 - patch from Jose Pedro Oliveira (jpo) kchmviewer-2.5-iconstorage.h.patch: --- NEW FILE kchmviewer-2.5-iconstorage.h.patch --- diff -ruN kchmviewer-2.5-orig/src/iconstorage.h kchmviewer-2.5/src/iconstorage.h --- kchmviewer-2.5-orig/src/iconstorage.h 2006-04-02 03:09:14.000000000 +0100 +++ kchmviewer-2.5/src/iconstorage.h 2006-05-18 01:05:57.000000000 +0100 @@ -57,7 +57,7 @@ const QPixmap * getBookIconPixmap (unsigned int id); const QPixmap * getToolbarPixmap (pixmap_index_t pix); const QPixmap * getApplicationIcon(); - const QPixmap * KCHMIconStorage::getCloseWindowIcon(); + const QPixmap * getCloseWindowIcon(); private: const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 May 2006 08:35:31 -0000 1.2 +++ .cvsignore 18 May 2006 11:24:57 -0000 1.3 @@ -1 +1 @@ -kchmviewer-2.0.tar.gz +kchmviewer-2.5.tar.gz Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-5/kchmviewer.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kchmviewer.spec 16 May 2006 16:39:14 -0000 1.2 +++ kchmviewer.spec 18 May 2006 11:24:57 -0000 1.3 @@ -1,14 +1,15 @@ Name: kchmviewer -Version: 2.0 -Release: 4%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: CHM viewer Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ -Source0: http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff +Patch1: kchmviewer-2.5-iconstorage.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel @@ -48,6 +49,7 @@ %prep %setup -q %patch +%patch1 -p1 chmod -x kio-msits/msits.* @@ -86,8 +88,13 @@ %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la %{_datadir}/services/msits.protocol +%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %changelog +* Thu May 18 2006 Patrice Dumas 2.5-1 +- update to 2.5 +- patch from Jose Pedro Oliveira (jpo) + * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 May 2006 08:35:31 -0000 1.2 +++ sources 18 May 2006 11:24:57 -0000 1.3 @@ -1 +1 @@ -94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz +31aa10f89b92ec5323fef7c26b1e1eed kchmviewer-2.5.tar.gz From fedora-extras-commits at redhat.com Thu May 18 11:31:21 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:31:21 -0700 Subject: rpms/qt4 - New directory Message-ID: <200605181131.k4IBVNeZ022514@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22488/qt4 Log Message: Directory /cvs/extras/rpms/qt4 added to the repository From fedora-extras-commits at redhat.com Thu May 18 11:31:21 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:31:21 -0700 Subject: rpms/qt4/devel - New directory Message-ID: <200605181131.k4IBVNaS022517@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22488/qt4/devel Log Message: Directory /cvs/extras/rpms/qt4/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 11:31:40 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:31:40 -0700 Subject: rpms/qt4 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605181131.k4IBVg0A022566@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533 Added Files: Makefile import.log Log Message: Setup of module qt4 --- NEW FILE Makefile --- # Top level Makefile for module qt4 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 11:31:41 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:31:41 -0700 Subject: rpms/qt4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605181131.k4IBVhqj022569@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qt4 --- NEW 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 May 18 11:33:28 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:33:28 -0700 Subject: rpms/qt4 import.log,1.1,1.2 Message-ID: <200605181133.k4IBXUL8022647@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22613 Modified Files: import.log Log Message: auto-import qt4-4.1.2-1 on branch devel from qt4-4.1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qt4/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 11:31:40 -0000 1.1 +++ import.log 18 May 2006 11:33:28 -0000 1.2 @@ -0,0 +1 @@ +qt4-4_1_2-1:HEAD:qt4-4.1.2-1.src.rpm:1147952000 From fedora-extras-commits at redhat.com Thu May 18 11:33:28 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:33:28 -0700 Subject: rpms/qt4/devel qt4.spec, NONE, 1.1 qtrc, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605181133.k4IBXU1t022652@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22613/devel Modified Files: .cvsignore sources Added Files: qt4.spec qtrc Log Message: auto-import qt4-4.1.2-1 on branch devel from qt4-4.1.2-1.src.rpm --- NEW FILE qt4.spec --- %define smp 1 %define modular_x 1 %define desktop_file 1 %define redhat_artwork 1 %define desktop_file_utils_version 0.2.93 %define ver 4.1.2 %define qt_dirname qt-4.1 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/qt-devel-%{ver} # build Motif extention %define motif_extention 0 # install manuals %define installman 0 # buildmysql: Build MySQL plugins %define buildmysql 1 # buildpsql: Build Postgres plugins %define buildpsql 1 # buildodbc: Build ODBC plugins %define buildodbc 1 # buildodbc: Build sqlite plugins %define buildsqlite 1 # visibility %define enable_hidden_visibility 0 %define debug 0 %define sover %{ver} Summary: The shared library for the Qt GUI toolkit. Name: qt4 Version: %{ver} Release: 1 Epoch: 1 License: GPL/QPL Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Url: http://www.troll.no Source: ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz Source1: qtrc Prefix: %{qtdir} Prereq: /sbin/ldconfig Prereq: fileutils Requires: fontconfig >= 2.0 Requires: /etc/ld.so.conf.d BuildRequires: gcc-c++ BuildRequires: libstdc++-devel BuildRequires: libmng-devel BuildRequires: glibc-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: libungif-devel BuildRequires: perl BuildRequires: sed BuildRequires: findutils BuildRequires: cups-devel BuildRequires: tar %if %{modular_x} BuildRequires: freetype-devel BuildRequires: fontconfig-devel BuildRequires: libXrender-devel BuildRequires: libXrandr-devel BuildRequires: libXcursor-devel BuildRequires: libXinerama-devel BuildRequires: libXft-devel BuildRequires: libXext-devel BuildRequires: libX11-devel BuildRequires: libSM-devel BuildRequires: libICE-devel %else BuildRequires: xorg-x11-devel %endif %if %{motif_extention} BuildRequires: openmotif-devel >= 2.2.2 %endif %if %{desktop_file} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %endif %if %{buildmysql} BuildRequires: mysql-devel %endif %if %{buildpsql} BuildRequires: postgresql-devel %endif %if %{buildodbc} BuildRequires: unixODBC-devel %endif %if %{buildsqlite} BuildRequires: sqlite-devel %endif BuildRequires: fontconfig-devel >= 2.0 %package config Summary: Grapical configuration tool for programs using Qt Group: User Interface/Desktops Requires: %{name} = %{epoch}:%{version}-%{release} %package devel Summary: Development files for the Qt GUI toolkit. Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %if %{modular_x} Requires: freetype-devel Requires: fontconfig-devel Requires: libXrender-devel Requires: libXrandr-devel Requires: libXcursor-devel Requires: libXinerama-devel Requires: libXft-devel Requires: libXext-devel Requires: libX11-devel Requires: libSM-devel Requires: libICE-devel %else Requires: xorg-x11-devel %endif Requires: libpng-devel Requires: libjpeg-devel Requires: libmng-devel %package devel-docs Summary: Documentation for the Qt GUI toolkit. Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %package Xt Summary: An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %package styles Summary: Extra styles for the Qt GUI toolkit. Group: User Interface/Desktops Requires: %{name} = %{epoch}:%{version}-%{release} %if %{buildodbc} %package ODBC Summary: ODBC drivers for Qt's SQL classes. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %endif %if %{buildmysql} %package MySQL Summary: MySQL drivers for Qt's SQL classes. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %endif %if %{buildpsql} %package PostgreSQL Summary: PostgreSQL drivers for Qt's SQL classes. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %endif %if %{buildsqlite} %package SQLite Summary: SQLite drivers for Qt's SQL classes. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %endif %package static Summary: Version of the Qt GUI toolkit for static linking Group: Development/Libraries Requires: %{name}-devel = %{epoch}:%{version}-%{release} %package designer Summary: Interface designer (IDE) for the Qt toolkit Group: Development/Tools Requires: %{name}-devel = %{epoch}:%{version}-%{release} %description Qt is a GUI software toolkit which simplifies the task of writing and maintaining GUI (Graphical User Interface) applications for the X Window System. Qt is written in C++ and is fully object-oriented. This package contains the shared library needed to run qt applications, as well as the README files for qt. %description config Qt is a GUI software toolkit which simplifies the task of writing and maintaining GUI (Graphical User Interface) applications for the X Window System. Qt is written in C++ and is fully object-oriented. This package contains a grapical configuration tool for programs using Qt. %description devel The qt-devel package contains the files necessary to develop applications using the Qt GUI toolkit: the header files, the Qt meta object compiler. Install qt-devel if you want to develop GUI applications using the Qt toolkit. %description devel-docs The qt-devel-docs package contains the man pages, the HTML documentation and example programs. Install qt-devel-docs if you want to develop GUI applications using the Qt toolkit. %description Xt An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit. %description static Version of the Qt library for static linking %description styles Extra styles (themes) for the Qt GUI toolkit. %if %{buildodbc} %description ODBC ODBC driver for Qt's SQL classes (QSQL) %endif %if %{buildmysql} %description MySQL MySQL driver for Qt's SQL classes (QSQL) %endif %if %{buildpsql} %description PostgreSQL PostgreSQL driver for Qt's SQL classes (QSQL) %endif %if %{buildsqlite} %description SQLite SQLite driver for Qt's SQL classes (QSQL) %endif %description designer The qt-designer package contains an User Interface designer tool for the Qt toolkit. %prep %setup -q -n qt-x11-opensource-src-%{version} %build export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" export QTDEST=%{qtdir} %if %{smp} export SMP_MFLAGS="%{?_smp_mflags}" %endif # set correct FLAGS perl -pi -e "s|-O2|$INCLUDES $RPM_OPT_FLAGS|g" mkspecs/*/qmake.conf # set correct lib path if [ "%{_lib}" == "lib64" ] ; then perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test fi # build shared, threaded (default) libraries echo yes | ./configure -v \ -no-rpath \ -prefix $QTDEST \ -docdir %{qt_docdir} \ -examplesdir %{qt_docdir}/examples \ -demosdir %{qt_docdir}/demos \ %if %{_lib} == lib64 -platform linux-g++-64 \ %else -platform linux-g++ \ %endif %if %{debug} -debug \ %else -release \ %endif -shared \ -largefile \ -qt-gif \ -system-zlib \ -system-libpng \ -system-libjpeg \ %if %{buildmysql} -plugin-sql-mysql \ -I%{_includedir}/mysql \ -L%{_libdir}/mysql \ %endif %if %{buildpsql} -plugin-sql-psql \ %endif %if %{buildodbc} -plugin-sql-odbc \ %endif %if %{buildsqlite} -plugin-sql-sqlite \ %endif -stl \ -cups \ -sm \ -xinerama \ -xrender \ -xkb \ -fontconfig make $SMP_MFLAGS sub-src make $SMP_MFLAGS sub-tools %install rm -rf %{buildroot} export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" export QTDEST=%{qtdir} make install INSTALL_ROOT=%{buildroot} mkdir -p %{buildroot}%{_libdir}/pkgconfig pushd %{buildroot}%{_libdir}/pkgconfig ln -sf ../%{qt_dirname}/lib/*.pc . popd # install man pages %if %{installman} mkdir -p %{buildroot}%{_mandir} cp -fR doc/man/* %{buildroot}%{_mandir}/ %endif # clean up make -C examples clean # Make sure the examples can be built outside the source tree. # Our binaries fulfill all requirements, so... perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` # don't include Makefiles of qt examples/tutorials find examples -name "Makefile" | xargs rm -f find examples -name "*.obj" | xargs rm -rf find examples -name "*.moc" | xargs rm -rf find tutorial -name "Makefile" | xargs rm -f for a in */*/Makefile ; do sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 mv -v ${a}.2 $a done mkdir -p %{buildroot}/etc/profile.d cat > %{buildroot}/etc/profile.d/%{name}.sh < %{buildroot}/etc/profile.d/%{name}.csh <%{buildroot}%{_datadir}/applications/%{name}-designer.desktop <%{buildroot}%{_datadir}/applnk/Development/designer4.desktop <%{buildroot}%{qtdir}/etc/settings/qtrc <<"EOF" [General] libraryPath=%{_libdir}/kde4/plugins style=Highcolor [KDE] contrast=7 EOF %endif # remove broken links rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* rm -f %{buildroot}%{qtdir}/lib/*.la mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE* README* changes* OPENSOURCE-NOTICE.TXT %dir %{qtdir} %dir %{qtdir}/bin %dir %{qtdir}/lib %dir %{qtdir}/plugins /etc/ld.so.conf.d/* %if ! %{redhat_artwork} %{qtdir}/etc/settings/qtrc %endif %{qtdir}/lib/lib*.so.* %{qtdir}/plugins/imageformats %{qtdir}/plugins/codecs %{qtdir}/plugins/accessible %{qtdir}/plugins/arthurplugin %{qtdir}/plugins/inputmethods %{qtdir}/translations %files config %defattr(-,root,root,-) %{qtdir}/bin/qtconfig %if 0 %{_bindir}/qtconfig* %endif %files devel %defattr(-,root,root,-) %attr(0755,root,root) %config /etc/profile.d/* %{qtdir}/bin/* %exclude %{qtdir}/bin/designer %exclude %{qtdir}/bin/qtconfig %{qtdir}/include %{qtdir}/mkspecs %{qtdir}/lib/*.so %{qtdir}/lib/*.a %{qtdir}/lib/*.prl %{qtdir}/phrasebooks %if 0 %{_bindir}/* %exclude %{_bindir}/designer %exclude %{_bindir}/qtconfig %endif %{_libdir}/pkgconfig/* %{qtdir}/lib/*.pc %{qtdir}/q3porting.xml %files devel-docs %defattr(-,root,root,-) %doc %{qt_docdir} %if %{installman} %{_mandir}/*/* %endif %if %{buildodbc} %files ODBC %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc* %endif %if %{buildpsql} %files PostgreSQL %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql* %endif %if %{buildmysql} %files MySQL %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql* %endif %if %{buildsqlite} %files SQLite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite* %endif %files designer %defattr(-,root,root,-) %if 0 %{_bindir}/designer* %endif %{qtdir}/plugins/designer %{qtdir}/bin/designer %if %{desktop_file} %{_datadir}/applications/*.desktop %else %{_datadir}/applnk/Development/* %endif %changelog * Fri May 12 2006 Than Ngo 1:4.1.2-1 - update to 4.1.2 - add subpackage qt-devel-docs * Mon Feb 27 2006 Than Ngo 1:4.1.1-0.1 - update to 4.1.1 * Tue Dec 20 2005 Than Ngo 1:4.1.0-0.1 - update to 4.1.0 * Fri Sep 09 2005 Than Ngo 1:4.0.1-0.1 - update to 4.0.1 * Mon Aug 22 2005 Than Ngo 1:3.3.4-22 - apply upstream patch to fix kmail folder selector #166430 * Mon Aug 15 2005 Than Ngo 1:3.3.4-21 - fix gcc4 build problem * Wed Aug 10 2005 Than Ngo 1:3.3.4-20 - apply missing patches * Wed Aug 10 2005 Than Ngo 1:3.3.4-19 - apply patch to fix wrong K menu width, #165510 * Mon Aug 01 2005 Than Ngo 1:3.3.4-18 - add visibility patch * Wed Jul 20 2005 Than Ngo 1:3.3.4-17 - fix German translation of the Qt Assistent #161558 * Mon Jun 27 2005 Than Ngo 1:3.3.4-16 - apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504 * Tue May 24 2005 Than Ngo 1:3.3.4-15 - add better fix for #156977, thanks to trolltech - apply patch to fix keyReleaseEvent problem #156572 * Wed May 18 2005 Than Ngo 1:3.3.4-14 - apply patch to use ecvt, fcvt (thanks to Jakub) - fix a bug in printing of postscript #156977 * Wed May 18 2005 Than Ngo 1:3.3.4-13 - rebuild * Thu Apr 14 2005 Than Ngo 1:3.3.4-12 - fix bad symlink #154086 * Wed Apr 13 2005 Than Ngo 1:3.3.4-11 - remove bad symlink #154086 - built with PostgresSQL 8.0.2 * Wed Mar 23 2005 Than Ngo 1:3.3.4-10 - add GtkStyle patch from Peter Backlund #141125 * Fri Mar 04 2005 Than Ngo 1:3.3.4-9 - fix buildkey issue with gcc-4 * Fri Mar 04 2005 Than Ngo 1:3.3.4-8 - rebuilt against gcc-4.0.0-0.31 * Tue Mar 01 2005 Than Ngo 1:3.3.4-7 - fix build problem with gcc4 * Mon Feb 28 2005 Than Ngo 1:3.3.4-6 - rebuilt against gcc-4 * Tue Feb 22 2005 Than Ngo 1:3.3.4-5 - fix application crash when input methode not available (bug #140658) - remove .moc/.obj - add qt-copy patch to fix KDE #80072 * Fri Feb 11 2005 Than Ngo 1:3.3.4-4 - update qt-x11-immodule-unified patch * Thu Feb 10 2005 Than Ngo 1:3.3.4-3 - fix rpm file conflict * Wed Feb 02 2005 Than Ngo 1:3.3.4-2 - remove useless doc files #143949 - fix build problem if installman is disable #146311 - add missing html/examples/tutorial symlinks * Fri Jan 28 2005 Than Ngo 1:3.3.4-1 - update to 3.3.4 - adapt many patches to qt-3.3.4 - drop qt-x11-free-3.3.0-freetype, qt-x11-free-3.3.3-qmake, qt-x11-free-3.3.1-lib64 qt-x11-free-3.3.3-qimage, which are included in new upstream * Tue Nov 30 2004 Than Ngo 1:3.3.3-16 - add sql macro * Mon Nov 29 2004 Than Ngo 1:3.3.3-15 - convert qdial.3qt to UTF-8 bug #140946 * Tue Nov 23 2004 Than Ngo 1:3.3.3-14 - add missing lupdate and lrelease #140230 * Fri Nov 19 2004 Than Ngo 1:3.3.3-13 - apply patch to fix qinputcontext * Thu Nov 11 2004 Than Ngo 1:3.3.3-12 - link against MySQL 3 - fix rpm conflict * Wed Nov 10 2004 Than Ngo 1:3.3.3-11 - apply patch to fix fullscreen problem - remove html documents duplicate #135696 * Tue Nov 02 2004 Than Ngo 1:3.3.3-10 - rebuilt * Tue Nov 02 2004 Than Ngo 1:3.3.3-9 - remove unused patch - set XIMInputStyle=On The Spot - require xorg-x11-devel instead XFree86-devel * Thu Oct 14 2004 Than Ngo 1:3.3.3-8 - don't compress examples/tutorial * Thu Oct 07 2004 Than Ngo 1:3.3.3-7 - fix build problem without qt immodule #134918 * Tue Sep 28 2004 Than Ngo 1:3.3.3-6 - fix font problem, bz #133578 * Tue Sep 14 2004 Than Ngo 1:3.3.3-4 - update new immodule patch - fix multilib problem #132516 * Wed Aug 18 2004 Than Ngo 1:3.3.3-3 - add patch to fix dlopen issue (#126422) - add image handling fix * Thu Aug 12 2004 Than Ngo 1:3.3.3-2 - fix qmake broken link (#129723) * Wed Aug 11 2004 Than Ngo 1:3.3.3-1 - update to 3.3.3 release * Thu Jul 01 2004 Than Ngo 1:3.3.2-10 - add immodule for Qt * Tue Jun 29 2004 Than Ngo 1:3.3.2-9 - add sub package config, allow multi lib installation (#126643) * Thu Jun 24 2004 Than Ngo 1:3.3.2-8 - add fontconfig fix for qfontdatabase, #123868 - fix some buildrequires problem, #125289 - fix dangling symlink, #125351 - get rid of backup files * Tue Jun 15 2004 Elliot Lee 1:3.3.2-7 - rebuilt * Tue May 25 2004 Than Ngo 1:3.3.2-5 - add missing qembed tool #124052, #124052 - get rid of unused trigger - add qt.conf in ld.so.conf.d -> don't change ld.so.conf #124080 * Wed May 12 2004 Than Ngo 1:3.3.2-4 - backport some qt patches, Symbol font works again * Mon May 10 2004 Than Ngo 1:3.3.2-3 - fixed annoying warning * Tue May 04 2004 Than Ngo 1:3.3.2-2 - fix broken symlink at qt document, bug #121652 * Thu Apr 29 2004 Than Ngo 3.3.2-1 - update to 3.3.2 * Thu Apr 22 2004 Than Ngo 3.3.1-1 - add cvs backport - fix lib64 issue, #121052 - fix CJK font display, bug #121017, #120542, thanks to Leon Ho - compress tutorial/examples * Fri Mar 26 2004 Than Ngo 3.3.1-0.8 - fixed symlinks issue, #117572 * Thu Mar 25 2004 Than Ngo 3.3.1-0.7 - add Trolltech patch, fix dpi setting issue * Tue Mar 23 2004 Than Ngo 3.3.1-0.6 - add 0034-qclipboard_recursion_fix.patch from CVS, #118368 - add better qt-x11-free-3.3.1-fontdatabase.patch * Sun Mar 07 2004 Than Ngo 1:3.3.1-0.5 - disable smpflags * Fri Mar 05 2004 Than Ngo 1:3.3.1-0.4 - fix font alias * Thu Mar 04 2004 Than Ngo 1:3.3.1-0.3 - add fontdatabase fix from Trolltech * Thu Mar 04 2004 Than Ngo 1:3.3.1-0.2 - fix wrong symlink #117451 * Tue Mar 02 2004 Elliot Lee - rebuilt * Mon Mar 01 2004 Than Ngo 3.3.1-0.1 - update to 3.3.1 * Mon Feb 23 2004 Than Ngo 3.3.0-0.4 - add fix for building with freetype 2.1.7 or newer * Tue Feb 17 2004 Than Ngo 3.3.0-0.3 - enable IPv6 support - use dlopen, instead of linking with OpenGL libraries directly - don't install backup files * Thu Feb 05 2004 Than Ngo 1:3.3.0-0.2 - fix fontdatabase - don't use strip in install script - fix qt default setting * Wed Feb 04 2004 Than Ngo 1:3.3.0-0.1 - 3.3.0 * Fri Jan 30 2004 Than Ngo 1:3.2.3-0.4 - add mouse patch from CVS, bug #114647 * Tue Jan 20 2004 Than Ngo 1:3.2.3-0.3 - rebuild * Tue Dec 2 2003 Than Ngo 1:3.2.3-0.2 - Added missing prl files, (report from trolltech) - Fixed description - include requires XFree86-devel on qt-devel * Fri Nov 14 2003 Than Ngo 1:3.2.3-0.1 - 3.2.3 release * Thu Oct 30 2003 Than Ngo 1:3.2.2-0.4 - fix encoding problem * Sat Oct 18 2003 Than Ngo 1:3.2.2-0.3 - fix encoding problem * Fri Oct 17 2003 Than Ngo 1:3.2.2-0.2 - add font alias patch file, thanks to Leon Ho - clean up monospace.patch from Leon Ho - remove some unneeded patch files * Thu Oct 16 2003 Than Ngo 1:3.2.2-0.1 - 3.2.2 release - remove a patch file, which is included in 3.2.2 * Tue Oct 14 2003 Than Ngo 1:3.2.1-1.3 - remove some unneeded patch files - don't load XLFDs if XFT2 is used * Mon Sep 08 2003 Than Ngo 1:3.2.1-1.2 - fixed rpm file list * Tue Sep 02 2003 Than Ngo 1:3.2.1-1.1 - fix for the khtml form lineedit bug from CVS * Wed Aug 27 2003 Than Ngo 1:3.2.1-1 - 3.2.1 release * Wed Jul 23 2003 Than Ngo 1:3.2.0-1 - 3.2.0 release * Mon Jun 23 2003 Than Ngo 3.2.0b2-0.1 - 3.2.0b2 - add missing templates for designer * Wed Jun 18 2003 Than Ngo 3.2.0b1-0.2 - clean up specfile * Wed Jun 18 2003 Than Ngo 3.2.0b1-0.1 - 3.2.0b1 * Tue Jun 17 2003 Than Ngo 3.1.2-12 - rebuilt * Tue Jun 17 2003 Than Ngo 3.1.2-10 - add missing translations * Wed Jun 11 2003 Elliot Lee - rebuilt * Wed Jun 04 2003 Elliot Lee - rebuilt * Mon May 19 2003 Than Ngo 3.1.2-7 - add some patches from KDE CVS qt-copy, thanks to Alexei Podtelezhnikov * Mon May 5 2003 Than Ngo 3.1.2-5.1 - set correct permission config scripts * Tue Apr 29 2003 Than Ngo 3.1.2-4 - fix typo bug in font loader * Wed Apr 9 2003 Than Ngo 3.1.2-2 - add xrandr extension * Mon Mar 3 2003 Than Ngo 3.1.2-1 - 3.1.2 release * Mon Feb 17 2003 Elliot Lee 3.1.1-7 - ppc64 support * Wed Jan 29 2003 Than Ngo 3.1.1-6 - add missing Categories section in qt designer #82920 * Wed Jan 22 2003 Tim Powers - rebuilt * Mon Dec 30 2002 Florian La Roche - Change qmlined.h to not include an attic header that is also not shipped with Red Hat Linux. This also fixes building unixODBC, that includes this header (apparently also without needing it). * Thu Dec 19 2002 Than Ngo 3.1.1-3 - add monospace patch file from Leon Ho (bug #79949) - add small patch file from Sysoltsev Slawa (bug #79731) * Tue Dec 17 2002 Than Ngo 3.1.1-2 - don't require XFree86, it's not needed * Tue Dec 17 2002 Than Ngo 3.1.1-1 - update to 3.1.1 * Thu Nov 28 2002 Than Ngo 3.1.0-1.3 - don't write Date into created moc files * Mon Nov 18 2002 Than Ngo 3.1.0-1.2 - add missing libs - remove workaround for ppc * Sun Nov 17 2002 Than Ngo 3.1.0-1.1 - adjust qfontdatabase_x11 for 3.1.0 - fix lib64 issue - add workaround to build on ppc * Wed Nov 13 2002 Than Ngo 3.1.0-1 - update to 3.1.0 - adjust some patch files for 3.1.0 - clean up specfile - remove some Xft2 patch files, which are now in 3.1.0 - add qwidget_x11.cpp.diff from Trolltech - install qt in %%{_libdir}/qt-3.1 (bug #77706) - don't use rpath - enable large file support - use system Xinerama - remove unneeded cups patch file - fix to build against new XFree86 * Tue Nov 5 2002 Than Ngo 3.0.5-19 - examples misconfigured (bug #76083) - don't include pkg-config (bug #74621) - fix build problem with new XFree86 * Tue Sep 17 2002 Than Ngo 3.0.5-18 - Fixed binaries symlinks * Mon Sep 9 2002 Than Ngo 3.0.5-17hammer - clean up spec file for 64bit machine * Thu Aug 29 2002 Than Ngo 3.0.5-17 - Fixed rpath issue (bug #69692, #69575) - Removed dlopen patch - Added monospace alias patch from Leon Ho (bug #72811) - Added man pages * Sun Aug 25 2002 Than Ngo 3.0.5-16 - Added missing catagory in qt designer - Added small gb18030 patch file from Leon Ho * Thu Aug 22 2002 Bernhard Rosenkraenzer 3.0.5-15 - Prereq fileutils (#71500) * Tue Aug 20 2002 Bernhard Rosenkraenzer 3.0.5-14 - Don't link to libstdc++, it isn't used - Work around s390 compiler bug (fpic/fPIC coexistance) - Do away with the "Feature Bluecurve already defined" warning message - Remove qmake cache files from the package * Wed Aug 14 2002 Than Ngo 3.0.5-13 - Added fix to use VT100 graphic characters (bug #71364) - Added fontdatabase fix from llch at redhat.com (bug #68353) * Mon Aug 12 2002 Bernhard Rosenkraenzer [not built] - Fix default qtrc * Mon Aug 12 2002 Bernhard Rosenkraenzer 3.0.5-12 - Fix CJK Printing (#71123) * Sun Aug 11 2002 Bernhard Rosenkraenzer 3.0.5-11 - Move qtconfig from qt-devel to qt, it's generally useful - Use -fno-use-cxa-atexit - Some tweaks to allow building Qt/Embedded with the same spec file - Apply the GB18030 patch even if xft2 isn't set * Fri Aug 9 2002 Than Ngo 3.0.5-10 - Added XIM patch from llch at redhat.com (bug #70411) * Sun Aug 4 2002 Than Ngo 3.0.5-9 - add a missing patch file (closelock/openlock) * Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-8 - Define QT_INSTALL_PREFIX in qmake * Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-7 - Find correct location of qmake mkspecs even if QTDIR isn't set * Thu Jul 25 2002 Than Ngo 3.0.5-6 - Check file descriptor before closelock * Thu Jul 25 2002 Than Ngo 3.0.5-5 - Fixed a bug in openlock * Wed Jul 24 2002 Than Ngo 3.0.5-4 - Tiny tweaks to qt3 patch * Tue Jul 23 2002 Owen Taylor - Tiny fix to qt3.diff to not add '0' as a test character (#68964) * Mon Jul 22 2002 Tim Powers 3.0.5-2 - rebuild using gcc-3.2-0.1 * Mon Jul 22 2002 Than Ngo 3.0.5-1 - 3.0.5 - Fixed dependencies issue * Thu Jul 18 2002 Than Ngo 3.0.4-12 - Added qt-clipfix from Harald Hoyer (bug #67648) * Tue Jul 16 2002 Than Ngo 3.0.4-11 - get rid of qt resource, it's now in redhat-artworks - add some define to build for 7.3 * Thu Jul 11 2002 Than Ngo 3.0.4-10 - add missing Buildprequires desktop-file-utils - add patches for GB18030 (llch at redhat.com) bug #68430 * Tue Jul 09 2002 Than Ngo 3.0.4-9 - add new desktop file for qt designer * Fri Jul 5 2002 Jakub Jelinek 3.0.4-8 - compile libXinerama.a with -fpic in Qt until XFree86 is fixed - make %%xft2 work even if old Xft headers aren't installed * Fri Jun 21 2002 Tim Powers - automated rebuild * Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-6 - Re-enable Xft2 now that fontconfig is fixed - Require a version of fontconfig that works - Use -fPIC rather than -fpic on alpha * Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-5 - Revert to Xft1 for now, Xft2 is too unstable - Exclude alpha for now to work around binutils bugs * Tue Jun 11 2002 Bernhard Rosenkraenzer 3.0.4-4 - Add (and fix up) fontconfig patch * Mon Jun 3 2002 Bernhard Rosenkraenzer 3.0.4-3 - Remove the glweak patch, it isn't needed after dropping XFree86 3.x * Thu May 23 2002 Tim Powers - automated rebuild * Sun May 5 2002 Bernhard Rosenkraenzer 3.0.4-1 - 3.0.4 - Make SQL plugins optional (buildtime) - Register with pkgconfig * Thu May 02 2002 Than Ngo 3.0.3-12 - qtdir /usr/lib/qt3 - build against gcc-3.1-0.26 - add qt-3.0.3-glweak.patch * Wed Apr 17 2002 Bernhard Rosenkraenzer 3.0.3-11 - qt3-gcc2.96 should be in qt, not qt-devel * Mon Apr 15 2002 Bernhard Rosenkraenzer 3.0.3-10 - Tweaks to allow parallel installations of Qt 3.x (gcc 2.96) and Qt 3.x (gcc 3.1) - Fix up debug spewage at Qt designer startup * Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-9 - Spec file fixes * Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-8 - Get rid of non-threaded version, dlopen()'ing threaded code (like plugins) from non-threaded code is dangerous - Add some fixes from qt-copy, fixing the ksplash crash some people have noticed on a first login - Add translation fixes from CVS - Patch example .pro files to build outside the Qt source tree (#63023) - Fix various bugs * Thu Apr 04 2002 Leon Ho 3.0.3-7 - fixes for CJK - qpsprinter - fixes for CJK - gb18030 * Fri Mar 29 2002 Bernhard Rosenkraenzer 3.0.3-6 - Make sure it builds with both gcc 2.96 and 3.1 * Wed Mar 28 2002 Leon Ho 3.0.3-5 - fixes for CJK - qpsprinter * Wed Mar 27 2002 Bernhard Rosenkraenzer 3.0.3-4 - Add CJK patches * Tue Mar 26 2002 Than Ngo 3.0.3-3 - fix loading kde styles * Tue Mar 19 2002 Bernhard Rosenkraenzer 3.0.3-1 - Update to 3.0.3 final * Thu Mar 14 2002 Bernhard Rosenkraenzer 3.0.3-0.cvs20020314.1 - Update to 3.0.3-pre, required for KDE3 - force -fPIC usage - Remove conflict with qt2 < 2.3.2-1, the new qt2 2.3.1 is fixed and qt 2.3.2 is broken - Ship the qmake config files (so qmake works for building any 3rd party stuff, e.g. aethera) * Wed Mar 6 2002 Bernhard Rosenkraenzer 3.0.2-2 - Add some fixes from KDE's qt-copy CVS - Pluginize image formats * Mon Feb 25 2002 Bernhard Rosenkraenzer 3.0.2-1 - 3.0.2 final * Tue Feb 19 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.3 - Add GB18030 codec patch, #60034 - Force-build jpeg support, fixing #59775 and #59795 * Sat Jan 26 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.2 - Build with CUPS support * Fri Jan 18 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.1 - Fix up /usr/bin/moc links, they should point to qt3 * Mon Jan 14 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020114.1 - Build styles directly into the main library for now, there's too much broken code out there depending on this ATM. * Wed Jan 9 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020109.1 - Stop excluding alpha, gcc has been fixed * Tue Jan 8 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020108.1 - Add fixes from CVS; this fixes the "Alt + F1, arrow up, arrow up doesn't work in KDE" bug * Mon Dec 17 2001 Bernhard Rosenkraenzer 3.0.1-2 - Fix up settings search path - Add default qtrc allowing to use KDE 3.x Qt plugins - Make sure QLibrary uses RTLD_GLOBAL when dlopen()ing libraries * Thu Dec 13 2001 Bernhard Rosenkraenzer 3.1.0-1 - Work around gcc bug #57467 * Wed Dec 12 2001 Bernhard Rosenkraenzer - 3.0.1 final * Mon Dec 10 2001 Bernhard Rosenkraenzer 3.0.1-0.cvs20011210.1 - Update to current (needed by KDE 3.x) - Rebuild with current libstdc++ - Temporarily disable building on alpha - Fix build with PostgreSQL 7.2 * Mon Nov 26 2001 Bernhard Rosenkraenzer 3.0.0-5 - Fix up glweak * Mon Nov 5 2001 Bernhard Rosenkraenzer 3.0.0-4 - Give designer, uic, moc, etc. their real names - the qt2 versions have been renamed in qt2-2.3.2-1. Conflict with qt2 < 2.3.2-1. * Thu Oct 25 2001 Bernhard Rosenkraenzer 3.0.0-3 - Add symlink /usr/lib/qt-3.0.0 -> /usr/lib/qt3 and set QTDIR to the symlink, allowing to update to 3.0.1 without breaking rpath'ed binaries * Tue Oct 16 2001 Bernhard Rosenkraenzer 3.0.0-1 - 3.0.0 final - fix some minor specfile bugs - Modularize some more (image format plugins) - Build codecs * Tue Sep 18 2001 Bernhard Rosenkraenzer 3.0.0-0.beta5.1 - beta5 - Share more code between qt-x11 and qt-embedded builds * Wed Aug 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta4.1 - beta4 - build the Motif style directly into Qt rather than as a plugin - Qt should always have at least one style... - replace the designer3 symlink with a shell script that sets QTDIR correctly before launching designer - Add desktop file for designer * Mon Aug 6 2001 Tim Powers 3.0.0-0.beta3.4 - explicitly include qm2ts, qmake, qtconfig in the devel package file list to avoid dangling symlinks * Thu Aug 2 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.3 - Try yet another workaround for buildsystem breakages * Tue Jul 31 2001 Bernhard Rosenkraenzer - Add another ugly workaround for build system problems, this should finally get rid of the dangling symlinks * Tue Jul 31 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.2 - Rephrase parts of the spec file, hopefully pleasing the build system * Sun Jul 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.1 - beta3 - Fix dangling symlinks * Sun Jun 24 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.2 - Fix up QSQL Postgres classes for Postgres 7.1.x - Fix various bugs: - QtMultilineEdit and QtTableView should actually compile - Link libqsqlpsql with libpq - Don't link the base library with libmysqlclient, linking the MySQL module with it is sufficient - Add missing const qualifier - move the SQL drivers to separate packages to avoid dependencies - build and install designer plugins - converting glade files to Qt is fun. ;) - handle RPM_OPT_FLAGS * Tue May 22 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.1 - 3.0 beta 1 * Wed May 16 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010516.1 - Update, remove conflicts with Qt 2.x * Mon May 14 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010514.1 - Initial build of 3.0 branch * Fri Apr 27 2001 Bernhard Rosenkraenzer 2.3.0-6 - Fix crashes on ia64, Patch from Bill Nottingham - Allow building qt-nox * Fri Apr 20 2001 Bernhard Rosenkraenzer 2.3.0-5 - Make sure uic and designer use the libqui from the source tree, not a previously installed one. Linking uic-x11 against libqui-embedded is definitely not a feature. ;) - The qclipboard fix is needed for qt-x11 only, don't apply it if we're building qt-embedded * Sat Apr 14 2001 Bernhard Rosenkraenzer - Handle LPRng specific constructs in printcap, Bug #35937 * Sun Mar 25 2001 Florian La Roche - add qfont patch from Trolltech * Tue Mar 13 2001 Harald Hoyer - added patch for '@euro' language settings * Tue Mar 6 2001 Bernhard Rosenkraenzer - 2.3.0 final - BuildRequires XFree86-devel >= 4.0.2 (#30486) * Mon Feb 26 2001 Than Ngo - fix check_env function, so that qt does not crash if QT_XFT is not set - fix symlinks * Mon Feb 26 2001 Bernhard Rosenkraenzer - 2.3.0b1 - Add a patch to qpsprinter that handles TrueType fonts even if they come from xfs * Tue Feb 13 2001 Preston Brown - japanese input and clipboard fixes applied. Changes have been sent upstream by patch authors. * Fri Feb 9 2001 Bernhard Rosenkraenzer - Rebuild with new Mesa to get rid of pthreads linkage - Add Xft fix from KDE CVS * Wed Feb 7 2001 Bernhard Rosenkraenzer - Add printing bugfix patch from Trolltech * Sat Feb 3 2001 Bernhard Rosenkraenzer - 2.2.4 - Qt Embedded: Add QVfb and VNC support * Tue Jan 16 2001 Bernhard Rosenkraenzer - Don't segfault when running Qt/Embedded applications as root - Improve the Qt/Embedded sparc patch so we don't need the specfile hacks anymore - Fix a bug in QPrintDialog (causing KDE Bug #18608) * Thu Jan 11 2001 Bernhard Rosenkraenzer - bzip2 source to save space - Qt/Embedded 2.2.3 - Fix qte build on sparc * Wed Dec 20 2000 Bernhard Rosenkraenzer - Run ldconfig in %%post and %%postun for qt-Xt * Sun Dec 17 2000 Bernhard Rosenkraenzer - Build with the Xrender extension (Patch from Keith Packard ) * Wed Dec 13 2000 Bernhard Rosenkraenzer - 2.2.3 * Tue Dec 12 2000 Bernhard Rosenkraenzer - Rebuild to fix permissions on doc dir - Don't exclude ia64 anymore * Fri Nov 17 2000 Bernhard Rosenkraenzer - Fix up uic (Patch from trolltech) * Wed Nov 15 2000 Bernhard Rosenkraenzer - Build qt-embedded changes to base: fix build, fix ISO C99 compliance, fix 64bit support * Mon Nov 13 2000 Bernhard Rosenkraenzer - 2.2.2 * Tue Oct 24 2000 Than Ngo - call ldconfig for updating (Bug #19687) - added patch from Trolltech, thanks to Rainer * Wed Oct 18 2000 Bernhard Rosenkraenzer - Add missing msg2qm, msgmerge, qconfig tools (Bug #18997), introduced by broken Makefiles in base - fix up %%install so it works both with old-style and new-style fileutils (fileutils <= 4.0z don't know about -L) * Fri Oct 13 2000 Bernhard Rosenkraenzer - Disable exception handling; this speeds up KDE 2.x and reduces its memory footprint by 20 MB. * Tue Oct 10 2000 Bernhard Rosenkraenzer - dereference symlinks in include * Sun Oct 8 2000 Bernhard Rosenkraenzer - fix -devel - update to the new version of 2.2.1 on trolltech.com; the initial tarball contained broken docs * Thu Oct 5 2000 Bernhard Rosenkraenzer - 2.2.1 * Mon Sep 25 2000 Bernhard Rosenkraenzer - Add missing uic * Thu Sep 21 2000 Bernhard Rosenkraenzer - Move Qt designer to a different source RPM to get rid of a circular dependency (kdelibs2->qt, qt->kdelibs2) - Enable MNG support - Don't compile (just include) examples and tutorials - move the static libraries to a separate package (qt-static). They're HUGE, and most people won't ever need them. - clean up spec file - fix up dependencies (-devel requires base, -static requires devel, Xt requires base) - add BuildRequires line * Tue Sep 12 2000 Than Ngo - update release 2.2.0 - changed copyright to GPL - added missing static libraries - made symbolic link for designer to load the help files correct - made designer and designer-kde2 as sub packages - added missing templates for designer - remove jakub patch, since the release 2.2.0 already contains this patch. - fixed qt again to compile with gcc-2.96 - use make -j for building * Wed Aug 23 2000 Bernhard Rosenkraenzer - Work around compiler bugs (Patch from Jakub) - Use relative symlinks (Bug #16750) * Mon Aug 21 2000 Bernhard Rosenkraenzer - beta2 * Mon Aug 14 2000 Bernhard Rosenkraenzer - new qt-copy from KDE2 CVS * Wed Aug 9 2000 Bernhard Rosenkraenzer - official beta 1 * Thu Aug 3 2000 Than Ngo - rebuilt against the libpng-1.0.8 * Thu Jul 27 2000 Bernhard Rosenkraenzer - rebuild (so we have it on all arches) * Tue Jul 25 2000 Bernhard Rosenkraenzer - move man pages to a more reasonable place (this fixes Bug #14126) - exclude ia64 for now (compiler problems!!!) * Mon Jul 24 2000 Harald Hoyer - modified connect patch to fit qt 2.2.0 beta. * Thu Jul 20 2000 Bernhard Rosenkraenzer - update to current qt-copy; this is now a qt 2.2.0 beta. * Mon Jul 17 2000 Bernhard Rosenkraenzer - update to current qt-copy in kde CVS, required * Wed Jul 12 2000 Prospector - automatic rebuild * Sun Jul 11 2000 Harald Hoyer - made patch smaller and binary compatible when recompiled with 6.2 - modified connect and moc to cope with the new g++ class layout * Sun Jul 09 2000 Than Ngo - rebuilt qt with gcc-2.96-34 * Fri Jul 07 2000 Than Ngo - rebuilt qt with c++ 2.96 * Mon Jul 3 2000 Bernhard Rosenkraenzer - Fix dependancies * Sun Jul 2 2000 Bernhard Rosenkraenzer - Use egcs++ for now ** FIXME * Wed Jun 28 2000 Preston Brown - fix up qt.sh * Sun Jun 25 2000 Bernhard Rosenkraenzer - Build in jpeg and threading support - Fix a bug in clipboard pasting code * Wed Jun 07 2000 Preston Brown - fix qt.{sh,csh} - use new rpm macro paths - package man pages * Fri Jun 2 2000 Bill Nottingham - build without optimization on ia64 * Mon May 29 2000 Bernhard Rosenkraenzer - 2.1.1 * Thu May 18 2000 Florian La Roche - recompile with correct libstdc++ * Thu Apr 13 2000 Bernhard Rosenkraenzer - 2.1.0 final * Wed Apr 5 2000 Bernhard Rosenkraenzer - beta4 - depend on libGL.so.1 rather than Mesa - XFree86 4.0 provides that lib, too * Wed Mar 22 2000 Bernhard Rosenkraenzer - beta3 * Tue Mar 7 2000 Bernhard Rosenkraenzer - beta2 - fix compilation of the NSPlugin add-on * Fri Mar 3 2000 Bill Nottingham - fix %postun script * Fri Feb 18 2000 Bernhard Rosenkr?nzer - beta1 - get rid of qt-ImageIO, the functionality is now in the main Qt library - remove qt-Network, the functionality is now in the main Qt library - add changes-2.1.0 to %doc * Thu Feb 17 2000 Preston Brown - no refcount check on postun script, we want it to happen even on upgrades * Thu Feb 10 2000 Bernhard Rosenkraenzer - new snapshot, should fix QWhatsThisButton - remove executable permissions from *.pro files * Mon Feb 07 2000 Preston Brown - strip binaries in examples, tutorial * Mon Jan 31 2000 Bernhard Rosenkraenzer - new snapshot - should fix the hotkey bug - Fix up the Makefiles so it compiles * Tue Jan 18 2000 Bernhard Rosenkraenzer - new snapshot - we need those QVariant fixes * Thu Jan 13 2000 Bernhard Rosenkraenzer - switch from glxMesa to Mesa for the GL addon * Wed Jan 5 2000 Bernhard Rosenkr?nzer - Fix up dependencies - new snapshot * Mon Jan 3 2000 Ngo Than - new snapshot for Red Hat Linux 6.2 - increase version number * Mon Dec 20 1999 Bernhard Rosenkraenzer - new snapshot - handle RPM_OPT_FLAGS * Mon Dec 13 1999 Bernhard Rosenkraenzer - new snapshot - -GL requires libGL.so.1 instead of Mesa (might as well be glxMesa or some commercial OpenGL) - -GL BuildPrereqs /usr/X11R6/include/GL/gl.h instead of Mesa-devel (might as well be glxMesa or some commercial OpenGL) * Sun Dec 05 1999 Bernhard Rosenkraenzer - update to current RSYNC version - remove compilation patch - it finally works out of the box * Wed Oct 27 1999 Bernhard Rosenkraenzer - update to current CVS snapshot - build extensions - add patch to fix QNetwork compilation * Sun Oct 24 1999 Bernhard Rosenkraenzer - current CVS snapshot - fix compilation with gcc 2.95.x - use install -c rather than just install to make BSD install happy * Mon Oct 11 1999 Bernhard Rosenkraenzer - 2.1.0 snapshot (for KDE2) - Fix typo in spec * Thu Sep 23 1999 Preston Brown - don't ship tutorial or example binaries * Tue Sep 21 1999 Preston Brown - substitution in tutorial and examples so that dependencies are correct and they can be successfully rebuilt. - switched to completely using QTDIR. trying to coexist with links into /usr/{include,lib} and still compile with qt 1.x is very hard for configure scripts to cope with. * Thu Aug 19 1999 Preston Brown - implemented QTDIR compatibility. * Tue Jul 20 1999 Preston Brown - qt 2.0.1 packaged. * Wed Jul 14 1999 Preston Brown - Qt 2.00 packaged. - examples, html documentation, tutorial moved to /usr/doc * Sat Apr 17 1999 Preston Brown - static library supplied in dev package. * Wed Apr 07 1999 Preston Brown - turn on internal GIF reading support * Tue Apr 06 1999 Preston Brown - strip binaries * Mon Mar 15 1999 Preston Brown - upgrade to qt 1.44. * Wed Feb 24 1999 Preston Brown - Injected new description and group. * Tue Jan 19 1999 Preston Brown - moved includes to /usr/include/qt * Mon Jan 04 1999 Preston Brown - made setup phase silent. * Fri Dec 04 1998 Preston Brown - upgraded to qt 1.42, released today. * Tue Dec 01 1998 Preston Brown - took Arnts RPM and made some minor changes for Red Hat. --- NEW FILE qtrc --- [3.3] libraryPath=/usr/lib/qt-3.3/plugins:/usr/lib/kde3/plugins [General] XIMInputStyle=On The Spot cursorFlashTime=1000 doubleClickInterval=400 embedFonts=true enableXft=true font=Sans,10,-1,5,48,0,0,0,0,0 fontPath=\0 globalStrut=0^e0^e resolveSymlinks=true style=Bluecurve useRtlExtensions=false useXft=true wheelScrollLines=3 [KDE] contrast=7 kdeAddedLibraryPaths=~/.kde/lib/kde3/plugins/^e/usr/lib/kde3/plugins/^e [KWinPalette] activeBackground=#dcdcdc activeBlend=#c8c8c8 activeForeground=#ffffff activeTitleBtnBg=#dcdcdc frame=#dcdcdc inactiveBackground=#dcdcdc inactiveBlend=#c8c8c8 inactiveForeground=#6e6e6e inactiveFrame=#dcdcdc inactiveTitleBtnBg=#dcdcdc [Palette] active=#000000^e#e6f0f9^e#ffffff^e#f2f7fc^e#73787c^e#9aa0a6^e#000000^e#ffffff^e#000000^e#ffffff^e#eeeaee^e#000000^e#547098^e#ffffff^e#0000ff^e#ff00ff^e disabled=#808080^e#e6f0f9^e#ffffff^e#ffffff^e#73787c^e#9aa0a6^e#808080^e#ffffff^e#808080^e#ffffff^e#eeeaee^e#000000^e#547098^e#808080^e#0000ff^e#ff00ff^e inactive=#000000^e#e6f0f9^e#ffffff^e#ffffff^e#73787c^e#9aa0a6^e#000000^e#ffffff^e#000000^e#ffffff^e#eeeaee^e#000000^e#547098^e#ffffff^e#0000ff^e#ff00ff^e Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 11:31:41 -0000 1.1 +++ .cvsignore 18 May 2006 11:33:28 -0000 1.2 @@ -0,0 +1 @@ +qt-x11-opensource-src-4.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 11:31:41 -0000 1.1 +++ sources 18 May 2006 11:33:28 -0000 1.2 @@ -0,0 +1 @@ +18bca010d09b98e94210710047baca0a qt-x11-opensource-src-4.1.2.tar.gz From fedora-extras-commits at redhat.com Thu May 18 11:45:51 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 18 May 2006 04:45:51 -0700 Subject: fedora-security/audit fe4,1.24,1.25 fe5,1.22,1.23 Message-ID: <200605181145.k4IBjpfD022773@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22753 Modified Files: fe4 fe5 Log Message: Our clamav maintainer says this isn't an issue. I agree. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fe4 17 May 2006 18:14:18 -0000 1.24 +++ fe4 18 May 2006 11:45:48 -0000 1.25 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2427 VULNERABLE (clamav) bz#192076 +CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fe5 17 May 2006 18:14:18 -0000 1.22 +++ fe5 18 May 2006 11:45:48 -0000 1.23 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2427 VULNERABLE (clamav) bz#192076 +CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 From fedora-extras-commits at redhat.com Thu May 18 12:41:47 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 18 May 2006 05:41:47 -0700 Subject: fedora-security/audit fe4,1.25,1.26 Message-ID: <200605181241.k4ICfl2o025292@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25274 Modified Files: fe4 Log Message: Note a kphone CVE id. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- fe4 18 May 2006 11:45:48 -0000 1.25 +++ fe4 18 May 2006 12:41:44 -0000 1.26 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2442 VULNERABLE (kphone) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn From fedora-extras-commits at redhat.com Thu May 18 12:48:52 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 18 May 2006 05:48:52 -0700 Subject: rpms/tin/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tin.spec, 1.10, 1.11 Message-ID: <200605181248.k4ICmsVW025353@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/tin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25332 Modified Files: .cvsignore sources tin.spec Log Message: * Sun Mar 13 2006 Adrian Reber - 1.8.1-1 - updated to 1.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tin/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 05:27:38 -0000 1.4 +++ .cvsignore 18 May 2006 12:48:52 -0000 1.5 @@ -1 +1,2 @@ -tin-1.6.2.tar.bz2 +tin-1.8.1.tar.bz2 +tin-1.8.1.tar.bz2.sign Index: sources =================================================================== RCS file: /cvs/extras/rpms/tin/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:27:38 -0000 1.4 +++ sources 18 May 2006 12:48:52 -0000 1.5 @@ -1 +1,2 @@ -3ab61ba7c7d3b7a3596ba199c570c4e4 tin-1.6.2.tar.bz2 +efeecdf72683213d9e705c28de87ea2e tin-1.8.1.tar.bz2 +4f7dd48ddd79d79203dc0094f692999f tin-1.8.1.tar.bz2.sign Index: tin.spec =================================================================== RCS file: /cvs/extras/rpms/tin/FC-4/tin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tin.spec 22 May 2005 23:43:22 -0000 1.10 +++ tin.spec 18 May 2006 12:48:52 -0000 1.11 @@ -1,12 +1,12 @@ Name: tin -Version: 1.6.2 -Release: 4 - +Version: 1.8.1 +Release: 1%{?dist} Summary: Basic Internet news reader Group: Applications/Internet License: Distributable URL: http://www.tin.org/ -Source: ftp://ftp.tin.org/pub/news/clients/tin/v1.6/tin-1.6.2.tar.bz2 +Source0: ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2 +Source1: ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2.sign BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel @@ -78,6 +78,7 @@ %{_bindir}/metamutt %{_bindir}/opt-case.pl %{_bindir}/w2r.pl +%{_bindir}/tinews.pl %{_mandir}/man1/* %{_mandir}/man5/* /usr/share/locale/*/*/* @@ -85,6 +86,9 @@ %changelog +* Sun Mar 13 2006 Adrian Reber - 1.8.1-1 +- updated to 1.8.1 + * Sun May 22 2005 Jeremy Katz - 1.6.2-4 - rebuild on all arches From fedora-extras-commits at redhat.com Thu May 18 13:45:28 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 06:45:28 -0700 Subject: rpms/docbook2X/devel .cvsignore, 1.3, 1.4 docbook2X.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605181345.k4IDjUMu027873@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/docbook2X/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27852 Modified Files: .cvsignore docbook2X.spec sources Log Message: * Thu May 18 2006 Patrice Dumas - 0.8.7-1 - update to 0.8.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook2X/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Apr 2006 17:41:01 -0000 1.3 +++ .cvsignore 18 May 2006 13:45:28 -0000 1.4 @@ -1 +1 @@ -docbook2X-0.8.6.tar.gz +docbook2X-0.8.7.tar.gz Index: docbook2X.spec =================================================================== RCS file: /cvs/extras/rpms/docbook2X/devel/docbook2X.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook2X.spec 10 Apr 2006 17:41:01 -0000 1.3 +++ docbook2X.spec 18 May 2006 13:45:28 -0000 1.4 @@ -1,12 +1,12 @@ Name: docbook2X -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text License: BSD URL: http://docbook2x.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz # modify Makefile.in to replace make install_perl by make install_vendor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %changelog +* Thu May 18 2006 Patrice Dumas - 0.8.7-1 +- update to 0.8.7 + * Fri Feb 17 2006 Patrice Dumas - 0.8.6-1 - update to 0.8.6 - drop patch as SGMLSpl.pm is included in the scripts, not distributed Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook2X/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Apr 2006 17:41:01 -0000 1.3 +++ sources 18 May 2006 13:45:28 -0000 1.4 @@ -1 +1 @@ -fd5efad56674cfb22ea4831845c3c937 docbook2X-0.8.6.tar.gz +bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz From fedora-extras-commits at redhat.com Thu May 18 14:03:00 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 07:03:00 -0700 Subject: rpms/docbook2X/FC-3 .cvsignore, 1.3, 1.4 docbook2X.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605181403.k4IE3XTZ030291@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/docbook2X/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-3 Modified Files: .cvsignore docbook2X.spec sources Log Message: * Thu May 18 2006 Patrice Dumas - 0.8.7-1 - update to 0.8.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Apr 2006 18:04:38 -0000 1.3 +++ .cvsignore 18 May 2006 14:03:00 -0000 1.4 @@ -1 +1 @@ -docbook2X-0.8.6.tar.gz +docbook2X-0.8.7.tar.gz Index: docbook2X.spec =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-3/docbook2X.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook2X.spec 10 Apr 2006 18:04:38 -0000 1.3 +++ docbook2X.spec 18 May 2006 14:03:00 -0000 1.4 @@ -1,12 +1,12 @@ Name: docbook2X -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text License: BSD URL: http://docbook2x.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz # modify Makefile.in to replace make install_perl by make install_vendor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %changelog +* Thu May 18 2006 Patrice Dumas - 0.8.7-1 +- update to 0.8.7 + * Fri Feb 17 2006 Patrice Dumas - 0.8.6-1 - update to 0.8.6 - drop patch as SGMLSpl.pm is included in the scripts, not distributed Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Apr 2006 18:04:38 -0000 1.3 +++ sources 18 May 2006 14:03:00 -0000 1.4 @@ -1 +1 @@ -fd5efad56674cfb22ea4831845c3c937 docbook2X-0.8.6.tar.gz +bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz From fedora-extras-commits at redhat.com Thu May 18 14:03:04 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 07:03:04 -0700 Subject: rpms/docbook2X/FC-4 .cvsignore, 1.3, 1.4 docbook2X.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605181403.k4IE3a3x030296@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/docbook2X/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-4 Modified Files: .cvsignore docbook2X.spec sources Log Message: * Thu May 18 2006 Patrice Dumas - 0.8.7-1 - update to 0.8.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Apr 2006 18:04:39 -0000 1.3 +++ .cvsignore 18 May 2006 14:03:04 -0000 1.4 @@ -1 +1 @@ -docbook2X-0.8.6.tar.gz +docbook2X-0.8.7.tar.gz Index: docbook2X.spec =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-4/docbook2X.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook2X.spec 10 Apr 2006 18:04:39 -0000 1.3 +++ docbook2X.spec 18 May 2006 14:03:04 -0000 1.4 @@ -1,12 +1,12 @@ Name: docbook2X -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text License: BSD URL: http://docbook2x.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz # modify Makefile.in to replace make install_perl by make install_vendor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %changelog +* Thu May 18 2006 Patrice Dumas - 0.8.7-1 +- update to 0.8.7 + * Fri Feb 17 2006 Patrice Dumas - 0.8.6-1 - update to 0.8.6 - drop patch as SGMLSpl.pm is included in the scripts, not distributed Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Apr 2006 18:04:39 -0000 1.3 +++ sources 18 May 2006 14:03:04 -0000 1.4 @@ -1 +1 @@ -fd5efad56674cfb22ea4831845c3c937 docbook2X-0.8.6.tar.gz +bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz From fedora-extras-commits at redhat.com Thu May 18 14:03:08 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 07:03:08 -0700 Subject: rpms/docbook2X/FC-5 .cvsignore, 1.3, 1.4 docbook2X.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605181403.k4IE3eQH030301@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/docbook2X/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-5 Modified Files: .cvsignore docbook2X.spec sources Log Message: * Thu May 18 2006 Patrice Dumas - 0.8.7-1 - update to 0.8.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Apr 2006 18:04:40 -0000 1.3 +++ .cvsignore 18 May 2006 14:03:07 -0000 1.4 @@ -1 +1 @@ -docbook2X-0.8.6.tar.gz +docbook2X-0.8.7.tar.gz Index: docbook2X.spec =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-5/docbook2X.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook2X.spec 10 Apr 2006 18:04:40 -0000 1.3 +++ docbook2X.spec 18 May 2006 14:03:07 -0000 1.4 @@ -1,12 +1,12 @@ Name: docbook2X -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text License: BSD URL: http://docbook2x.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz # modify Makefile.in to replace make install_perl by make install_vendor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %changelog +* Thu May 18 2006 Patrice Dumas - 0.8.7-1 +- update to 0.8.7 + * Fri Feb 17 2006 Patrice Dumas - 0.8.6-1 - update to 0.8.6 - drop patch as SGMLSpl.pm is included in the scripts, not distributed Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Apr 2006 18:04:40 -0000 1.3 +++ sources 18 May 2006 14:03:07 -0000 1.4 @@ -1 +1 @@ -fd5efad56674cfb22ea4831845c3c937 docbook2X-0.8.6.tar.gz +bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz From fedora-extras-commits at redhat.com Thu May 18 15:11:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 18 May 2006 08:11:17 -0700 Subject: comps comps-fe6.xml.in,1.16,1.17 Message-ID: <200605181511.k4IFBJCJ000507@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv490 Modified Files: comps-fe6.xml.in Log Message: Added crossfire-client Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- comps-fe6.xml.in 18 May 2006 07:03:47 -0000 1.16 +++ comps-fe6.xml.in 18 May 2006 15:11:17 -0000 1.17 @@ -207,6 +207,7 @@ bzflag celestia cgoban + crossfire-client crystal-stacker crystal-stacker-themes csmash From fedora-extras-commits at redhat.com Thu May 18 17:22:40 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:22:40 -0700 Subject: rpms/exiv2 - New directory Message-ID: <200605181722.k4IHMgR8005648@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5622/exiv2 Log Message: Directory /cvs/extras/rpms/exiv2 added to the repository From fedora-extras-commits at redhat.com Thu May 18 17:22:40 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:22:40 -0700 Subject: rpms/exiv2/devel - New directory Message-ID: <200605181722.k4IHMgEv005651@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5622/exiv2/devel Log Message: Directory /cvs/extras/rpms/exiv2/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 17:22:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:22:54 -0700 Subject: rpms/exiv2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605181722.k4IHMuJP005695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5667 Added Files: Makefile import.log Log Message: Setup of module exiv2 --- NEW FILE Makefile --- # Top level Makefile for module exiv2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 17:22:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:22:54 -0700 Subject: rpms/exiv2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605181722.k4IHMucD005698@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5667/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module exiv2 --- NEW 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 May 18 17:23:17 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:23:17 -0700 Subject: rpms/exiv2 import.log,1.1,1.2 Message-ID: <200605181723.k4IHNJww005776@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5741 Modified Files: import.log Log Message: auto-import exiv2-0.9.1-3 on branch devel from exiv2-0.9.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/exiv2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 17:22:53 -0000 1.1 +++ import.log 18 May 2006 17:23:17 -0000 1.2 @@ -0,0 +1 @@ +exiv2-0_9_1-3:HEAD:exiv2-0.9.1-3.src.rpm:1147972994 From fedora-extras-commits at redhat.com Thu May 18 17:23:18 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:23:18 -0700 Subject: rpms/exiv2/devel exiv2-0.9.1-deps.patch, NONE, 1.1 exiv2-0.9.1-no_rpath.patch, NONE, 1.1 exiv2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605181723.k4IHNKJj005785@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5741/devel Modified Files: .cvsignore sources Added Files: exiv2-0.9.1-deps.patch exiv2-0.9.1-no_rpath.patch exiv2.spec Log Message: auto-import exiv2-0.9.1-3 on branch devel from exiv2-0.9.1-3.src.rpm exiv2-0.9.1-deps.patch: --- NEW FILE exiv2-0.9.1-deps.patch --- --- exiv2-0.9.1/src/Makefile.deps 2006-01-20 02:45:59.000000000 -0600 +++ exiv2-0.9.1/src/Makefile 2006-05-18 09:10:11.000000000 -0500 @@ -156,6 +156,10 @@ @$(LIBTOOL) --mode=compile $(COMPILE.cc) -o $@ $< @$(MAKEDEPEND) @$(POSTDEPEND) +# The dependancies here are wrong. It generates .lo output, +# so things are rebuilt *every* time 'make' is called. +# Let's try a quick-n-dirty hack -- Rex + touch $@ $(COBJ): %.o: %.c @$(LIBTOOL) --mode=compile $(COMPILE.c) -o $@ $< exiv2-0.9.1-no_rpath.patch: --- NEW FILE exiv2-0.9.1-no_rpath.patch --- --- exiv2-0.9.1/src/Makefile.no_rpath 2006-05-18 08:41:02.000000000 -0500 +++ exiv2-0.9.1/src/Makefile 2006-05-18 09:10:11.000000000 -0500 @@ -148,7 +148,7 @@ # Compilation shortcuts COMPILE.cc = $(CXX) $(CXXFLAGS) $(CXXDEFS) $(CXXINCS) -c COMPILE.c = $(CC) $(CFLAGS) $(DEFS) $(INCS) -c -LINK.cc = $(CXX) $(CXXFLAGS) $(LDLIBS) $(LDFLAGS) -rpath $(libdir) +LINK.cc = $(CXX) $(CXXFLAGS) $(LDLIBS) $(LDFLAGS) #-rpath $(libdir) # ****************************************************************************** # Rules @@ -203,7 +203,7 @@ bin: lib $(BINARY) $(EXIV2BIN) $(MCBIN) path-test lib: $(OBJ) - $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -rpath $(libdir) -release $(EXIV2_VERSION) + $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -release $(EXIV2_VERSION) -rpath $(libdir) @touch lib path-test: path-test.o utils.o --- NEW FILE exiv2.spec --- Summary: Exif and Iptc metadata manipulation library and tools Name: exiv2 Version: 0.9.1 Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://home.arcor.de/ahuggel/exiv2/ Source: http://home.arcor.de/ahuggel/exiv2/exiv2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: exiv2-0.9.1-no_rpath.patch Patch2: exiv2-0.9.1-deps.patch %description Exiv2 comprises of a C++ library and a command line utility to access image metadata. Exiv2 supports full read and write access to the Exif and Iptc metadata, Exif MakerNote support, extract and delete methods for Exif thumbnails, classes to access Ifd and so on. The command line utility allows you to: * print the Exif metadata of Jpeg images as summary info, interpreted values, or the plain data for each tag * print the Iptc metadata of Jpeg images * print the Jpeg comment of Jpeg images * set, add and delete Exif and Iptc metadata of Jpeg images * adjust the Exif timestamp (that's how it all started...) * rename Exif image files according to the Exif timestamp * extract, insert and delete Exif metadata (including thumbnails), Iptc metadata and Jpeg comments %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel %{summary}. %prep %setup -q %patch1 -p1 -b .no_rpath %patch2 -p1 -b .deps %build %configure --disable-static make -C src %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make -C src install DESTDIR=$RPM_BUILD_ROOT # Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la # set eXecute bit on installed lib chmod a+x $RPM_BUILD_ROOT%{_libdir}/libexiv2-*.so %clean rm -rf $FPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/exiv2 %{_libdir}/libexiv2-*.so %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %doc doc/html %{_bindir}/exiv2-config %{_includedir}/exiv2/ %{_libdir}/libexiv2.so %changelog * Wed May 17 2006 Rex Dieter 0.9.1-3 - cleanup %%description - set eXecute bit on installed lib. - no_rpath patch - deps patch (items get (re)compiled on *every* call to 'make') * Wed May 17 2006 Rex Dieter 0.9.1-2 - %%post/%%postun: /sbin/ldconfig * Tue May 16 2006 Rex Dieter 0.9.1-1 - first try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exiv2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 17:22:54 -0000 1.1 +++ .cvsignore 18 May 2006 17:23:18 -0000 1.2 @@ -0,0 +1 @@ +exiv2-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/exiv2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 17:22:54 -0000 1.1 +++ sources 18 May 2006 17:23:18 -0000 1.2 @@ -0,0 +1 @@ +4c6593751368f5e9235d85e0d4058e67 exiv2-0.9.1.tar.gz From fedora-extras-commits at redhat.com Thu May 18 17:28:02 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:28:02 -0700 Subject: owners owners.list,1.1017,1.1018 Message-ID: <200605181728.k4IHS49b005848@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5831 Modified Files: owners.list Log Message: +exiv2 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1017 retrieving revision 1.1018 diff -u -r1.1017 -r1.1018 --- owners.list 18 May 2006 10:31:09 -0000 1.1017 +++ owners.list 18 May 2006 17:28:01 -0000 1.1018 @@ -259,6 +259,7 @@ Fedora Extras|evas|A hardware-accelerated canvas API|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|exiv2|Exif and Iptc metadata manipulation library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|ez-ipupdate|Client for Dynamic DNS Services|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|f2py|Fortran to Python interface generator|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 17:31:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:31:36 -0700 Subject: rpms/exiv2/devel exiv2.spec,1.1,1.2 Message-ID: <200605181731.k4IHVcHa005890@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873 Modified Files: exiv2.spec Log Message: touchup Summary Index: exiv2.spec =================================================================== RCS file: /cvs/extras/rpms/exiv2/devel/exiv2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- exiv2.spec 18 May 2006 17:23:18 -0000 1.1 +++ exiv2.spec 18 May 2006 17:31:35 -0000 1.2 @@ -1,5 +1,5 @@ -Summary: Exif and Iptc metadata manipulation library and tools +Summary: Exif and Iptc metadata manipulation library Name: exiv2 Version: 0.9.1 Release: 3%{?dist} @@ -14,7 +14,6 @@ Patch2: exiv2-0.9.1-deps.patch - %description Exiv2 comprises of a C++ library and a command line utility to access image metadata. Exiv2 supports full read and write access to the Exif and Iptc From fedora-extras-commits at redhat.com Thu May 18 18:28:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 11:28:30 -0700 Subject: rpms/perl-GDGraph/devel .cvsignore, 1.5, 1.6 perl-GDGraph.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605181828.k4IISW4b008537@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GDGraph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8516 Modified Files: .cvsignore perl-GDGraph.spec sources Log Message: Update to 1.4308. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2006 19:41:16 -0000 1.5 +++ .cvsignore 18 May 2006 18:28:29 -0000 1.6 @@ -1 +1 @@ -GDGraph-1.4307.tar.gz +GDGraph-1.4308.tar.gz Index: perl-GDGraph.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/perl-GDGraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-GDGraph.spec 20 Feb 2006 19:41:16 -0000 1.8 +++ perl-GDGraph.spec 18 May 2006 18:28:29 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-GDGraph -Version: 1.4307 +Version: 1.4308 Release: 1%{?dist} Summary: Graph generation package for Perl @@ -22,7 +22,7 @@ %setup -q -n GDGraph-%{version} %{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl %{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl -chmod a-x CHANGES README +chmod -c a-x CHANGES README Graph/bars.pm %build @@ -51,10 +51,13 @@ %defattr(-,root,root,-) %doc CHANGES README samples/ %{perl_vendorlib}/GD/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Thu May 18 2006 Jose Pedro Oliveira - 1.4308-1 +- Update to 1.4308. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.4307-1 - Update to 1.4307. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Feb 2006 19:41:16 -0000 1.5 +++ sources 18 May 2006 18:28:29 -0000 1.6 @@ -1 +1 @@ -ac5d4aa5db492ac5a0af08a57c4db2c9 GDGraph-1.4307.tar.gz +fcdd34d5e09ae917b5d264887734b3b1 GDGraph-1.4308.tar.gz From fedora-extras-commits at redhat.com Thu May 18 18:31:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 11:31:14 -0700 Subject: rpms/perl-GDGraph/FC-4 .cvsignore, 1.5, 1.6 perl-GDGraph.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605181831.k4IIVkOa008705@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GDGraph/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8659/FC-4 Modified Files: .cvsignore perl-GDGraph.spec sources Log Message: Update to 1.4308. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2006 19:41:10 -0000 1.5 +++ .cvsignore 18 May 2006 18:31:14 -0000 1.6 @@ -1 +1 @@ -GDGraph-1.4307.tar.gz +GDGraph-1.4308.tar.gz Index: perl-GDGraph.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/perl-GDGraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-GDGraph.spec 20 Feb 2006 19:41:10 -0000 1.8 +++ perl-GDGraph.spec 18 May 2006 18:31:14 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-GDGraph -Version: 1.4307 +Version: 1.4308 Release: 1%{?dist} Summary: Graph generation package for Perl @@ -22,7 +22,7 @@ %setup -q -n GDGraph-%{version} %{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl %{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl -chmod a-x CHANGES README +chmod -c a-x CHANGES README Graph/bars.pm %build @@ -51,10 +51,13 @@ %defattr(-,root,root,-) %doc CHANGES README samples/ %{perl_vendorlib}/GD/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Thu May 18 2006 Jose Pedro Oliveira - 1.4308-1 +- Update to 1.4308. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.4307-1 - Update to 1.4307. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Feb 2006 19:41:10 -0000 1.5 +++ sources 18 May 2006 18:31:14 -0000 1.6 @@ -1 +1 @@ -ac5d4aa5db492ac5a0af08a57c4db2c9 GDGraph-1.4307.tar.gz +fcdd34d5e09ae917b5d264887734b3b1 GDGraph-1.4308.tar.gz From fedora-extras-commits at redhat.com Thu May 18 18:31:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 11:31:15 -0700 Subject: rpms/perl-GDGraph/FC-5 .cvsignore, 1.5, 1.6 perl-GDGraph.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605181831.k4IIVlN2008710@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GDGraph/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8659/FC-5 Modified Files: .cvsignore perl-GDGraph.spec sources Log Message: Update to 1.4308. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2006 19:41:16 -0000 1.5 +++ .cvsignore 18 May 2006 18:31:15 -0000 1.6 @@ -1 +1 @@ -GDGraph-1.4307.tar.gz +GDGraph-1.4308.tar.gz Index: perl-GDGraph.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-5/perl-GDGraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-GDGraph.spec 20 Feb 2006 19:41:16 -0000 1.8 +++ perl-GDGraph.spec 18 May 2006 18:31:15 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-GDGraph -Version: 1.4307 +Version: 1.4308 Release: 1%{?dist} Summary: Graph generation package for Perl @@ -22,7 +22,7 @@ %setup -q -n GDGraph-%{version} %{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl %{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl -chmod a-x CHANGES README +chmod -c a-x CHANGES README Graph/bars.pm %build @@ -51,10 +51,13 @@ %defattr(-,root,root,-) %doc CHANGES README samples/ %{perl_vendorlib}/GD/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Thu May 18 2006 Jose Pedro Oliveira - 1.4308-1 +- Update to 1.4308. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.4307-1 - Update to 1.4307. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Feb 2006 19:41:16 -0000 1.5 +++ sources 18 May 2006 18:31:15 -0000 1.6 @@ -1 +1 @@ -ac5d4aa5db492ac5a0af08a57c4db2c9 GDGraph-1.4307.tar.gz +fcdd34d5e09ae917b5d264887734b3b1 GDGraph-1.4308.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:00:49 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 18 May 2006 12:00:49 -0700 Subject: fedora-security/audit fc4,1.253,1.254 fc5,1.168,1.169 Message-ID: <200605181900.k4IJ0nEj009002@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8972 Modified Files: fc4 fc5 Log Message: Note a new ImageMagick issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- fc4 18 May 2006 10:00:15 -0000 1.253 +++ fc4 18 May 2006 19:00:46 -0000 1.254 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] CVE-2006-2366 VULNERABLE (openobex) #192087 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- fc5 18 May 2006 10:00:15 -0000 1.168 +++ fc5 18 May 2006 19:00:46 -0000 1.169 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] CVE-2006-2366 VULNERABLE (openobex) #192087 From fedora-extras-commits at redhat.com Thu May 18 19:33:27 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:33:27 -0700 Subject: rpms/galago-daemon - New directory Message-ID: <200605181933.k4IJXTaM012350@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/galago-daemon Log Message: Directory /cvs/extras/rpms/galago-daemon added to the repository From fedora-extras-commits at redhat.com Thu May 18 19:33:27 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:33:27 -0700 Subject: rpms/galago-daemon/devel - New directory Message-ID: <200605181933.k4IJXTns012353@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/galago-daemon/devel Log Message: Directory /cvs/extras/rpms/galago-daemon/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 19:33:55 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:33:55 -0700 Subject: rpms/galago-daemon Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605181933.k4IJXvoh012404@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375 Added Files: Makefile import.log Log Message: Setup of module galago-daemon --- NEW FILE Makefile --- # Top level Makefile for module galago-daemon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 19:33:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:33:56 -0700 Subject: rpms/galago-daemon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605181933.k4IJXwXG012408@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module galago-daemon --- NEW 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 May 18 19:35:03 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:35:03 -0700 Subject: rpms/galago-daemon import.log,1.1,1.2 Message-ID: <200605181935.k4IJZ5aG012478@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443 Modified Files: import.log Log Message: auto-import galago-daemon-0.5.0-2 on branch devel from galago-daemon-0.5.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 19:33:55 -0000 1.1 +++ import.log 18 May 2006 19:35:03 -0000 1.2 @@ -0,0 +1 @@ +galago-daemon-0_5_0-2:HEAD:galago-daemon-0.5.0-2.src.rpm:1147980887 From fedora-extras-commits at redhat.com Thu May 18 19:35:03 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:35:03 -0700 Subject: rpms/galago-daemon/devel galago-daemon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605181935.k4IJZ6ix012483@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443/devel Modified Files: .cvsignore sources Added Files: galago-daemon.spec Log Message: auto-import galago-daemon-0.5.0-2 on branch devel from galago-daemon-0.5.0-2.src.rpm --- NEW FILE galago-daemon.spec --- Name: galago-daemon Version: 0.5.0 Release: 2%{?dist} Summary: Galago presence daemon Group: System Environment/Daemons License: GPL URL: http://galago.sourceforge.net/ Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgalago-devel BuildRequires: check-devel %description The Galago presence daemon, which is the center of all presence transactions for Galago. This service is automatically launched by D-BUS when needed. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING ChangeLog NEWS %{_datadir}/dbus-1/services/*.service %config %{_sysconfdir}/dbus-1/system.d/%{name}.conf %{_libexecdir}/%{name} %changelog * Thu May 18 2006 Brian Pepple - 0.5.0-2 - Mark file as %%config. * Fri Apr 21 2006 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 19:33:56 -0000 1.1 +++ .cvsignore 18 May 2006 19:35:03 -0000 1.2 @@ -0,0 +1 @@ +galago-daemon-0.5.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 19:33:56 -0000 1.1 +++ sources 18 May 2006 19:35:03 -0000 1.2 @@ -0,0 +1 @@ +bc74c3ac8c18f4c1a44e43504c59a08f galago-daemon-0.5.0.tar.bz2 From fedora-extras-commits at redhat.com Thu May 18 19:35:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 18 May 2006 12:35:59 -0700 Subject: rpms/cpanspec/devel .cvsignore, 1.8, 1.9 cpanspec.spec, 1.8, 1.9 sources, 1.8, 1.9 cpanspec-1.65-regex.patch, 1.1, NONE Message-ID: <200605181936.k4IJa1O8012551@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12530 Modified Files: .cvsignore cpanspec.spec sources Removed Files: cpanspec-1.65-regex.patch Log Message: Update to 1.66. Drop regex patch. cpanspec now uses repoquery. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Apr 2006 21:23:42 -0000 1.8 +++ .cvsignore 18 May 2006 19:35:59 -0000 1.9 @@ -1 +1 @@ -cpanspec-1.65.tar.gz +cpanspec-1.66.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cpanspec.spec 4 May 2006 16:16:35 -0000 1.8 +++ cpanspec.spec 18 May 2006 19:35:59 -0000 1.9 @@ -1,17 +1,17 @@ Name: cpanspec -Version: 1.65 -Release: 2%{?dist} +Version: 1.66 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz -Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: /usr/bin/wget +Requires: /usr/bin/repoquery %description cpanspec generates spec files for Perl modules from CPAN for Fedora @@ -23,7 +23,6 @@ %prep %setup -q -%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -53,6 +52,11 @@ %{_mandir}/man1/* %changelog +* Thu May 18 2006 Steven Pritchard 1.66-1 +- Update to 1.66. +- Drop regex patch. +- cpanspec now uses repoquery. + * Thu May 04 2006 Steven Pritchard 1.65-2 - Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Apr 2006 21:23:42 -0000 1.8 +++ sources 18 May 2006 19:35:59 -0000 1.9 @@ -1 +1 @@ -cf3704304f5a4cb80f97881b72c2a6d3 cpanspec-1.65.tar.gz +fa269fb9c648edccaba4f16e4ec46d97 cpanspec-1.66.tar.gz --- cpanspec-1.65-regex.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 18 19:36:13 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:36:13 -0700 Subject: rpms/erlang/FC-5 .cvsignore, 1.5, 1.6 erlang.spec, 1.12, 1.13 otp-links.patch, 1.1, 1.2 sources, 1.5, 1.6 Message-ID: <200605181936.k4IJaG5r012592@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12564 Modified Files: .cvsignore erlang.spec otp-links.patch sources Log Message: new version R11B-0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 15:58:48 -0000 1.5 +++ .cvsignore 18 May 2006 19:36:13 -0000 1.6 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-10.tar.gz -otp_doc_man_R10B-10.tar.gz -otp_src_R10B-10.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/erlang.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- erlang.spec 3 May 2006 22:01:05 -0000 1.12 +++ erlang.spec 18 May 2006 19:36:13 -0000 1.13 @@ -1,19 +1,18 @@ Name: erlang -Version: R10B -Release: 10.3%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-glibc24.patch Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,13 +42,12 @@ %prep -%setup -q -n otp_src_R10B-10 -%patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -103,6 +101,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Wed May 3 2006 Gerard Milmeister - R10B-10.3 - added patch for run_erl by Knut-H??vard Aksnes otp-links.patch: Index: otp-links.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/otp-links.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-links.patch 18 May 2006 19:36:13 -0000 1.2 @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 15:58:48 -0000 1.5 +++ sources 18 May 2006 19:36:13 -0000 1.6 @@ -1,3 +1,3 @@ -d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz -207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz -c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:37:38 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:37:38 -0700 Subject: owners owners.list,1.1018,1.1019 Message-ID: <200605181937.k4IJbelE012735@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12718 Modified Files: owners.list Log Message: Add galago-daemon Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1018 retrieving revision 1.1019 diff -u -r1.1018 -r1.1019 --- owners.list 18 May 2006 17:28:01 -0000 1.1018 +++ owners.list 18 May 2006 19:37:38 -0000 1.1019 @@ -325,6 +325,7 @@ 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|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|galago-daemon|Galago presence daemon|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|galculator|GTK 2 based scientific calculator|tmraz at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 19:41:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:41:36 -0700 Subject: rpms/erlang/FC-4 .cvsignore, 1.5, 1.6 erlang.spec, 1.8, 1.9 otp-links.patch, 1.1, 1.2 sources, 1.5, 1.6 Message-ID: <200605181941.k4IJfcgo012823@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12797 Modified Files: .cvsignore erlang.spec otp-links.patch sources Log Message: new version R11B-0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 08:56:45 -0000 1.5 +++ .cvsignore 18 May 2006 19:41:35 -0000 1.6 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-10.tar.gz -otp_doc_man_R10B-10.tar.gz -otp_src_R10B-10.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- erlang.spec 3 May 2006 22:01:04 -0000 1.8 +++ erlang.spec 18 May 2006 19:41:36 -0000 1.9 @@ -1,15 +1,15 @@ Name: erlang -Version: R10B -Release: 10.3%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch @@ -42,12 +42,12 @@ %prep -%setup -q -n otp_src_R10B-10 -%patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch5 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -101,6 +101,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Wed May 3 2006 Gerard Milmeister - R10B-10.3 - added patch for run_erl by Knut-H??vard Aksnes otp-links.patch: Index: otp-links.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/otp-links.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-links.patch 18 May 2006 19:41:36 -0000 1.2 @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 08:56:45 -0000 1.5 +++ sources 18 May 2006 19:41:36 -0000 1.6 @@ -1,3 +1,3 @@ -d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz -207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz -c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:42:51 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:42:51 -0700 Subject: rpms/erlang/devel .cvsignore, 1.5, 1.6 erlang.spec, 1.12, 1.13 otp-links.patch, 1.1, 1.2 sources, 1.5, 1.6 Message-ID: <200605181942.k4IJgr33012956@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12930 Modified Files: .cvsignore erlang.spec otp-links.patch sources Log Message: new version R11B-0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 15:58:48 -0000 1.5 +++ .cvsignore 18 May 2006 19:42:50 -0000 1.6 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-10.tar.gz -otp_doc_man_R10B-10.tar.gz -otp_src_R10B-10.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- erlang.spec 3 May 2006 22:01:07 -0000 1.12 +++ erlang.spec 18 May 2006 19:42:50 -0000 1.13 @@ -1,19 +1,18 @@ Name: erlang -Version: R10B -Release: 10.3%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-glibc24.patch Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,13 +42,12 @@ %prep -%setup -q -n otp_src_R10B-10 -%patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -103,6 +101,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Wed May 3 2006 Gerard Milmeister - R10B-10.3 - added patch for run_erl by Knut-H??vard Aksnes otp-links.patch: Index: otp-links.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/otp-links.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-links.patch 18 May 2006 19:42:50 -0000 1.2 @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 15:58:48 -0000 1.5 +++ sources 18 May 2006 19:42:50 -0000 1.6 @@ -1,3 +1,3 @@ -d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz -207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz -c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:44:51 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:44:51 -0700 Subject: rpms/kphotoalbum - New directory Message-ID: <200605181944.k4IJirSg013099@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13077/kphotoalbum Log Message: Directory /cvs/extras/rpms/kphotoalbum added to the repository From fedora-extras-commits at redhat.com Thu May 18 19:44:51 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:44:51 -0700 Subject: rpms/kphotoalbum/devel - New directory Message-ID: <200605181944.k4IJir5D013103@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13077/kphotoalbum/devel Log Message: Directory /cvs/extras/rpms/kphotoalbum/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 19:45:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:45:03 -0700 Subject: rpms/kphotoalbum/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605181945.k4IJj5EL013165@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13128/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kphotoalbum --- NEW 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 May 18 19:45:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:45:03 -0700 Subject: rpms/kphotoalbum Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605181945.k4IJj5hd013162@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13128 Added Files: Makefile import.log Log Message: Setup of module kphotoalbum --- NEW FILE Makefile --- # Top level Makefile for module kphotoalbum all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 19:44:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:44:42 -0700 Subject: rpms/erlang/FC-3 otp-run_erl.patch, NONE, 1.1 otp-sslrpath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 erlang.spec, 1.4, 1.5 otp-links.patch, 1.1, 1.2 sources, 1.3, 1.4 Message-ID: <200605181945.k4IJjE4J013185@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13024 Modified Files: .cvsignore erlang.spec otp-links.patch sources Added Files: otp-run_erl.patch otp-sslrpath.patch Log Message: new version R11B-0 otp-run_erl.patch: --- NEW FILE otp-run_erl.patch --- --- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 +++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #if !defined(NO_SYSLOG) #include #endif @@ -803,6 +805,7 @@ static int open_pty_master(char **ptyslave) { int mfd; + int sfd; char *major, *minor; static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; @@ -818,6 +821,15 @@ /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ { + static char ttyname[] = " "; + if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { + close(sfd); + *ptyslave = ttyname; + return mfd; + } + } + + { /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ static char ptyname[] = "/dev/pty/mX"; --- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 +++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 @@ -241,7 +241,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o + $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c otp-sslrpath.patch: --- NEW FILE otp-sslrpath.patch --- --- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 +++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 @@ -95,7 +95,7 @@ endif endif -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ +CC_R_FLAG= ifeq ($(findstring @,$(CC_R_FLAG)),@) # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; # we try our best here instead... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Oct 2005 22:34:14 -0000 1.3 +++ .cvsignore 18 May 2006 19:44:42 -0000 1.4 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-8.tar.gz -otp_doc_man_R10B-8.tar.gz -otp_src_R10B-8.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-3/erlang.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- erlang.spec 29 Oct 2005 22:34:15 -0000 1.4 +++ erlang.spec 18 May 2006 19:44:42 -0000 1.5 @@ -1,21 +1,28 @@ Name: erlang -Version: R10B -Release: 8.2%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-8.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-8.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-8.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch +Patch3: otp-sslrpath.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, openssl-devel, flex, unixODBC-devel -BuildRequires: tcl-devel, tk-devel + +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: unixODBC-devel +BuildRequires: tcl-devel +BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel +BuildRequires: flex Requires: tk @@ -35,10 +42,12 @@ %prep -%setup -q -n otp_src_R10B-8 -%patch -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -88,10 +97,13 @@ %post -%{_libdir}/erlang/Install -minimal %{_libdir}/erlang > /dev/null +%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Sat Oct 29 2005 Gerard Milmeister - R10B-8.2 - updated rpath patch otp-links.patch: Index: otp-links.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-3/otp-links.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-links.patch 18 May 2006 19:44:42 -0000 1.2 @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Oct 2005 22:34:15 -0000 1.3 +++ sources 18 May 2006 19:44:42 -0000 1.4 @@ -1,3 +1,3 @@ -d4d3f448c311cd3fc3a44e06e4145bcb otp_doc_html_R10B-8.tar.gz -c0760f24ae789fda248e978430aefe38 otp_doc_man_R10B-8.tar.gz -75cd5ad53b66baad9ebc802b8a1f6043 otp_src_R10B-8.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:45:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:45:43 -0700 Subject: rpms/kphotoalbum import.log,1.1,1.2 Message-ID: <200605181946.k4IJkGjK013287@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249 Modified Files: import.log Log Message: auto-import kphotoalbum-2.2-1 on branch devel from kphotoalbum-2.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kphotoalbum/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 19:45:02 -0000 1.1 +++ import.log 18 May 2006 19:45:43 -0000 1.2 @@ -0,0 +1 @@ +kphotoalbum-2_2-1:HEAD:kphotoalbum-2.2-1.src.rpm:1147981540 From fedora-extras-commits at redhat.com Thu May 18 19:45:44 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:45:44 -0700 Subject: rpms/kphotoalbum/devel kphotoalbum.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605181946.k4IJkGYJ013291@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/devel Modified Files: .cvsignore sources Added Files: kphotoalbum.spec Log Message: auto-import kphotoalbum-2.2-1 on branch devel from kphotoalbum-2.2-1.src.rpm --- NEW FILE kphotoalbum.spec --- Summary: KDE Photo Album Name: kphotoalbum Version: 2.2 Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.kphotoalbum.org/ Source: http://www.kphotoalbum.org/download/kphotoalbum-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: kimdaba < %{version} BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libkipi-devel BuildRequires: qt-devel BuildRequires: kdelibs-devel BuildRequires: exiv2-devel ## Optional, not strictly required. #Requires(hint): kipi-plugins %description A photo almbum tool. focuses on three key points: * It must be easy to describe a number of images at a time. * It must be easy to search for images. * It must be easy to browse and View the images. Can (optionally) use kipi-plugins %prep %setup -q -n %{name}-%{version}%{?beta} %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-rpath \ --disable-gcc-hidden-visibility \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependancy-tracking --disable-final make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category "X-Fedora" --vendor="" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do if [ -d $lang_dir ]; then lang=$(basename $lang_dir) echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang # replace absolute symlinks with relative ones pushd $lang_dir for i in *; do [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common done popd fi done fi %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files -f %{name}.lang %defattr(-,root,root) %doc ChangeLog COPYING README TODO %{_bindir}/* %{_datadir}/apps/kphotoalbum/ %{_datadir}/applications/kde/*.desktop %config %{_datadir}/config/*rc %{_datadir}/icons/hicolor/*/*/* %{_datadir}/mimelnk/*/*.desktop %changelog * Tue May 16 2006 Rex Dieter 2.2-1 - renamed kphotoalbum * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 2.1-6 - relative symlinks - simplify configure * Sat Oct 22 2005 Rex Dieter 2.1-4 - --add-category Application * Sat Oct 22 2005 Rex Dieter 2.1-3 - %%doc: COPYING - Req(post,postun): update-desktop-database - gtk-update-icon-cache - remove unused crud (kde-redhat bits) - Group: Applications/Multimedia - drop %%{?debug_package} conditionals * Sat Oct 22 2005 Rex Dieter 2.1-2 - icon/mime spec * Tue May 3 2005 Rex Dieter 2.1-1 - real-deal 2.1 release (including -i18n bits) * Mon May 2 2005 Rex Dieter 2.1-0 - 2.1 (pre) release * Mon Nov 15 2004 Rex Dieter 2.0-0.fdr.1 - 2.0 * Fri Feb 27 2004 Rex Dieter 0:1.1-0.fdr.0 - first try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kphotoalbum/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 19:45:03 -0000 1.1 +++ .cvsignore 18 May 2006 19:45:44 -0000 1.2 @@ -0,0 +1 @@ +kphotoalbum-2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kphotoalbum/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 19:45:03 -0000 1.1 +++ sources 18 May 2006 19:45:44 -0000 1.2 @@ -0,0 +1 @@ +0584b3d5f54d8a2e19cd7bc40967c026 kphotoalbum-2.2.tar.bz2 From fedora-extras-commits at redhat.com Thu May 18 19:46:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 18 May 2006 12:46:28 -0700 Subject: rpms/cpanspec/FC-5 .cvsignore, 1.8, 1.9 cpanspec.spec, 1.8, 1.9 sources, 1.8, 1.9 cpanspec-1.65-regex.patch, 1.1, NONE Message-ID: <200605181946.k4IJkUBF013340@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13286 Modified Files: .cvsignore cpanspec.spec sources Removed Files: cpanspec-1.65-regex.patch Log Message: Update to 1.66. Drop regex patch. cpanspec now uses repoquery. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Apr 2006 23:07:56 -0000 1.8 +++ .cvsignore 18 May 2006 19:46:28 -0000 1.9 @@ -1 +1 @@ -cpanspec-1.65.tar.gz +cpanspec-1.66.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cpanspec.spec 4 May 2006 16:36:13 -0000 1.8 +++ cpanspec.spec 18 May 2006 19:46:28 -0000 1.9 @@ -1,17 +1,17 @@ Name: cpanspec -Version: 1.65 -Release: 2%{?dist} +Version: 1.66 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz -Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: /usr/bin/wget +Requires: /usr/bin/repoquery %description cpanspec generates spec files for Perl modules from CPAN for Fedora @@ -23,7 +23,6 @@ %prep %setup -q -%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -53,6 +52,11 @@ %{_mandir}/man1/* %changelog +* Thu May 18 2006 Steven Pritchard 1.66-1 +- Update to 1.66. +- Drop regex patch. +- cpanspec now uses repoquery. + * Thu May 04 2006 Steven Pritchard 1.65-2 - Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Apr 2006 23:07:56 -0000 1.8 +++ sources 18 May 2006 19:46:28 -0000 1.9 @@ -1 +1 @@ -cf3704304f5a4cb80f97881b72c2a6d3 cpanspec-1.65.tar.gz +fa269fb9c648edccaba4f16e4ec46d97 cpanspec-1.66.tar.gz --- cpanspec-1.65-regex.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 18 19:48:00 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 18 May 2006 12:48:00 -0700 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.8, 1.9 cpanspec.spec, 1.8, 1.9 sources, 1.8, 1.9 cpanspec-1.65-regex.patch, 1.1, NONE Message-ID: <200605181948.k4IJm25O013432@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13411 Modified Files: .cvsignore cpanspec.spec sources Removed Files: cpanspec-1.65-regex.patch Log Message: Update to 1.66. Drop regex patch. cpanspec now uses repoquery. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Apr 2006 23:09:00 -0000 1.8 +++ .cvsignore 18 May 2006 19:47:59 -0000 1.9 @@ -1 +1 @@ -cpanspec-1.65.tar.gz +cpanspec-1.66.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cpanspec.spec 4 May 2006 16:37:46 -0000 1.8 +++ cpanspec.spec 18 May 2006 19:47:59 -0000 1.9 @@ -1,17 +1,17 @@ Name: cpanspec -Version: 1.65 -Release: 2%{?dist} +Version: 1.66 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz -Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: /usr/bin/wget +Requires: /usr/bin/repoquery %description cpanspec generates spec files for Perl modules from CPAN for Fedora @@ -23,7 +23,6 @@ %prep %setup -q -%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -53,6 +52,11 @@ %{_mandir}/man1/* %changelog +* Thu May 18 2006 Steven Pritchard 1.66-1 +- Update to 1.66. +- Drop regex patch. +- cpanspec now uses repoquery. + * Thu May 04 2006 Steven Pritchard 1.65-2 - Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Apr 2006 23:09:00 -0000 1.8 +++ sources 18 May 2006 19:47:59 -0000 1.9 @@ -1 +1 @@ -cf3704304f5a4cb80f97881b72c2a6d3 cpanspec-1.65.tar.gz +fa269fb9c648edccaba4f16e4ec46d97 cpanspec-1.66.tar.gz --- cpanspec-1.65-regex.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 18 19:48:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:48:33 -0700 Subject: rpms/kphotoalbum/devel kphotoalbum.spec,1.1,1.2 Message-ID: <200605181948.k4IJmZnR013503@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13486 Modified Files: kphotoalbum.spec Log Message: * Thu May 18 2006 Rex Dieter 2.2-2 - (temporarily) add Provides: kimdaba = %version Index: kphotoalbum.spec =================================================================== RCS file: /cvs/extras/rpms/kphotoalbum/devel/kphotoalbum.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kphotoalbum.spec 18 May 2006 19:45:44 -0000 1.1 +++ kphotoalbum.spec 18 May 2006 19:48:33 -0000 1.2 @@ -2,7 +2,7 @@ Summary: KDE Photo Album Name: kphotoalbum Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: kimdaba < %{version} +Provides: kimdaba = %{version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -107,6 +108,9 @@ %changelog +* Thu May 18 2006 Rex Dieter 2.2-2 +- (temporarily) add Provides: kimdaba = %%version + * Tue May 16 2006 Rex Dieter 2.2-1 - renamed kphotoalbum From fedora-extras-commits at redhat.com Thu May 18 19:48:38 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:48:38 -0700 Subject: rpms/erlang-esdl/FC-5 esdl-refc.patch, NONE, 1.1 erlang-esdl.spec, 1.2, 1.3 Message-ID: <200605181948.k4IJmew8013563@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang-esdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13538 Modified Files: erlang-esdl.spec Added Files: esdl-refc.patch Log Message: rebuilt esdl-refc.patch: --- NEW FILE esdl-refc.patch --- --- esdl-0.95.0630/c_src/esdl_driver.c.refc 2006-05-18 21:31:41.000000000 +0200 +++ esdl-0.95.0630/c_src/esdl_driver.c 2006-05-18 21:33:02.000000000 +0200 @@ -224,7 +224,7 @@ return sdl_getbuff(sd, size); } else { ErlDrvBinary* bin = (ErlDrvBinary *) sd->temp_bin; - bin->refc++; + driver_binary_inc_refc(bin); sd->buff = bin; sd->len = size; return bin->orig_bytes; @@ -253,7 +253,7 @@ sd->bin[i].base = ev->iov[1].iov_base; sd->bin[i].size = ev->iov[1].iov_len; bin = ev->binv[1]; - bin->refc++; /* Otherwise it could get deallocated */ + driver_binary_inc_refc(bin); sd->bin[i].bin = bin; sd->next_bin++; } Index: erlang-esdl.spec =================================================================== RCS file: /cvs/extras/rpms/erlang-esdl/FC-5/erlang-esdl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- erlang-esdl.spec 25 Apr 2006 21:34:08 -0000 1.2 +++ erlang-esdl.spec 18 May 2006 19:48:38 -0000 1.3 @@ -1,12 +1,13 @@ Name: erlang-esdl Version: 0.95.0630 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Erlang OpenGL/SDL api and utilities Group: Development/Libraries License: Distributable URL: http://esdl.sourceforge.net Source: http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz +Patch0: esdl-refc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: libGL-devel @@ -32,6 +33,7 @@ %prep %setup -q -n esdl-%{version} +%patch0 -p1 -b .refc perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile find . -name '*.c' -or -name '*.h' | xargs chmod 0644 @@ -76,6 +78,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.95.0630-6 +- rebuilt for erlang R11B-0 + * Tue Apr 25 2006 Gerard Milmeister - 0.95.0630-4 - removed c_src directory From fedora-extras-commits at redhat.com Thu May 18 19:50:23 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:50:23 -0700 Subject: owners owners.list,1.1019,1.1020 Message-ID: <200605181950.k4IJoPe6013700@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13679 Modified Files: owners.list Log Message: +kphotoalbum Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1019 retrieving revision 1.1020 diff -u -r1.1019 -r1.1020 --- owners.list 18 May 2006 19:37:38 -0000 1.1019 +++ owners.list 18 May 2006 19:50:23 -0000 1.1020 @@ -586,6 +586,7 @@ 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|dennis at ausil.us|extras-qa at fedoraproject.org| +Fedora Extras|kphotoalbum|KDE Photo Album|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org| Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 20:14:15 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 18 May 2006 13:14:15 -0700 Subject: rpms/xfce4-appfinder/devel xfce4-appfinder-4.2.3-infocrash.patch, NONE, 1.1 xfce4-appfinder.spec, 1.6, 1.7 Message-ID: <200605182014.k4IKEHF9016683@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-appfinder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16663 Modified Files: xfce4-appfinder.spec Added Files: xfce4-appfinder-4.2.3-infocrash.patch Log Message: Add patch to fix crash in information selection (fixes #192195) xfce4-appfinder-4.2.3-infocrash.patch: --- NEW FILE xfce4-appfinder-4.2.3-infocrash.patch --- diff -ruN xfce4-appfinder-4.2.3.orig/src/callbacks.c xfce4-appfinder-4.2.3/src/callbacks.c --- xfce4-appfinder-4.2.3.orig/src/callbacks.c 2005-11-05 18:04:23.000000000 +0100 +++ xfce4-appfinder-4.2.3/src/callbacks.c 2006-05-18 12:05:05.000000000 +0200 @@ -266,7 +266,7 @@ xfce_desktop_entry_get_string (dentry, _("Comment"), TRUE, &comment); if (!comment) { - comment = _("N/A"); + comment = g_strdup( _("N/A") ); } dlg->comment = gtk_label_new(NULL); @@ -280,7 +280,7 @@ xfce_desktop_entry_get_string (dentry, "Categories", TRUE, &cats); if (!cats) { - cats = _("N/A"); + cats = g_strdup( _("N/A") ); } else { @@ -300,7 +300,7 @@ xfce_desktop_entry_get_string (dentry, "Exec", TRUE, &exec); if (!exec) { - exec = _("N/A"); + exec = g_strdup( _("N/A") ); } dlg->exec = gtk_label_new(NULL); gtk_label_set_markup (GTK_LABEL(dlg->exec), g_strconcat(_("Command: "), exec, NULL)); Index: xfce4-appfinder.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce4-appfinder.spec 17 Feb 2006 00:24:16 -0000 1.6 +++ xfce4-appfinder.spec 18 May 2006 20:14:15 -0000 1.7 @@ -1,10 +1,11 @@ Summary: Appfinder for the Xfce4 Desktop Environment Name: xfce4-appfinder Version: 4.2.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-appfinder-4.2.3.tar.gz +Patch0: xfce4-appfinder-4.2.3-infocrash.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libxfcegui4 >= 4.2.3 @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p1 -b .infocrash %build %configure @@ -42,6 +44,9 @@ %{_datadir}/xfce4/doc/he %changelog +* Thu May 18 2006 Kevin Fenzi - 4.2.3-3 +- Add patch to fix crash in information selection (fixes #192195) + * Thu Feb 16 2006 Kevin Fenzi - 4.2.3-2.fc5 - Rebuild for fc5 From fedora-extras-commits at redhat.com Thu May 18 20:20:22 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 18 May 2006 13:20:22 -0700 Subject: owners owners.list,1.1020,1.1021 Message-ID: <200605182020.k4IKKOCG016782@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16765/owners Modified Files: owners.list Log Message: add scrip Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1020 retrieving revision 1.1021 diff -u -r1.1020 -r1.1021 --- owners.list 18 May 2006 19:50:23 -0000 1.1020 +++ owners.list 18 May 2006 20:20:22 -0000 1.1021 @@ -1482,6 +1482,7 @@ Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org|mystilleef at gmail.com Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scribus-templates|This package includes additional templates for Scribus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|scrip|Spherical Coordinate Remapping and Interpolation Package|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 20:40:11 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 18 May 2006 13:40:11 -0700 Subject: rpms/xfce4-appfinder/FC-5 xfce4-appfinder-4.2.3-infocrash.patch, NONE, 1.1 xfce4-appfinder.spec, 1.6, 1.7 Message-ID: <200605182040.k4IKeDHe017082@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-appfinder/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17062 Modified Files: xfce4-appfinder.spec Added Files: xfce4-appfinder-4.2.3-infocrash.patch Log Message: Add patch to fix crash in information selection (fixes #192195) xfce4-appfinder-4.2.3-infocrash.patch: --- NEW FILE xfce4-appfinder-4.2.3-infocrash.patch --- diff -ruN xfce4-appfinder-4.2.3.orig/src/callbacks.c xfce4-appfinder-4.2.3/src/callbacks.c --- xfce4-appfinder-4.2.3.orig/src/callbacks.c 2005-11-05 18:04:23.000000000 +0100 +++ xfce4-appfinder-4.2.3/src/callbacks.c 2006-05-18 12:05:05.000000000 +0200 @@ -266,7 +266,7 @@ xfce_desktop_entry_get_string (dentry, _("Comment"), TRUE, &comment); if (!comment) { - comment = _("N/A"); + comment = g_strdup( _("N/A") ); } dlg->comment = gtk_label_new(NULL); @@ -280,7 +280,7 @@ xfce_desktop_entry_get_string (dentry, "Categories", TRUE, &cats); if (!cats) { - cats = _("N/A"); + cats = g_strdup( _("N/A") ); } else { @@ -300,7 +300,7 @@ xfce_desktop_entry_get_string (dentry, "Exec", TRUE, &exec); if (!exec) { - exec = _("N/A"); + exec = g_strdup( _("N/A") ); } dlg->exec = gtk_label_new(NULL); gtk_label_set_markup (GTK_LABEL(dlg->exec), g_strconcat(_("Command: "), exec, NULL)); Index: xfce4-appfinder.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-5/xfce4-appfinder.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce4-appfinder.spec 17 Feb 2006 00:24:16 -0000 1.6 +++ xfce4-appfinder.spec 18 May 2006 20:40:11 -0000 1.7 @@ -1,10 +1,11 @@ Summary: Appfinder for the Xfce4 Desktop Environment Name: xfce4-appfinder Version: 4.2.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-appfinder-4.2.3.tar.gz +Patch0: xfce4-appfinder-4.2.3-infocrash.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libxfcegui4 >= 4.2.3 @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p1 -b .infocrash %build %configure @@ -42,6 +44,9 @@ %{_datadir}/xfce4/doc/he %changelog +* Thu May 18 2006 Kevin Fenzi - 4.2.3-3 +- Add patch to fix crash in information selection (fixes #192195) + * Thu Feb 16 2006 Kevin Fenzi - 4.2.3-2.fc5 - Rebuild for fc5 From fedora-extras-commits at redhat.com Thu May 18 20:42:42 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 18 May 2006 13:42:42 -0700 Subject: rpms/drgeo import.log,1.10,1.11 Message-ID: <200605182042.k4IKgi62017204@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/drgeo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17173 Modified Files: import.log Log Message: auto-import drgeo-1.1.0-8 on branch devel from drgeo-1.1.0-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/drgeo/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 14 Feb 2006 21:45:59 -0000 1.10 +++ import.log 18 May 2006 20:42:42 -0000 1.11 @@ -7,3 +7,4 @@ drgeo-1_1_0-4:FC-4:drgeo-1.1.0-4.src.rpm:1131042012 drgeo-1_1_0-6:HEAD:drgeo-1.1.0-6.src.rpm:1139600901 drgeo-1_1_0-7:HEAD:drgeo-1.1.0-7.src.rpm:1139953549 +drgeo-1_1_0-8:HEAD:drgeo-1.1.0-8.src.rpm:1147984990 From fedora-extras-commits at redhat.com Thu May 18 20:42:43 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 18 May 2006 13:42:43 -0700 Subject: rpms/drgeo/devel drgeo.spec,1.6,1.7 Message-ID: <200605182042.k4IKgjp7017208@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/drgeo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17173/devel Modified Files: drgeo.spec Log Message: auto-import drgeo-1.1.0-8 on branch devel from drgeo-1.1.0-8.src.rpm Index: drgeo.spec =================================================================== RCS file: /cvs/extras/rpms/drgeo/devel/drgeo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- drgeo.spec 14 Feb 2006 21:46:05 -0000 1.6 +++ drgeo.spec 18 May 2006 20:42:43 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Interactive educational geometry software Name: drgeo Version: 1.1.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Engineering URL: http://www.ofset.org/drgeo @@ -61,6 +61,9 @@ %{_datadir}/applications/fedora-drgeo.desktop %changelog +* Tue May 18 2006 Eric Tanguy - 1.1.0-8 +- Rebuild for devel + * Tue Feb 14 2006 Eric Tanguy - 1.1.0-7 - Rebuild for FC5 From fedora-extras-commits at redhat.com Thu May 18 20:56:23 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 May 2006 13:56:23 -0700 Subject: rpms/dvb-apps/devel dvb-apps.spec,1.5,1.6 Message-ID: <200605182056.k4IKuPH6017513@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17496 Modified Files: dvb-apps.spec Log Message: * Thu May 18 2006 Ville Skytt?? - 1.1.1-4 - Include ATSC initial tuning data files. Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dvb-apps.spec 18 May 2006 00:40:30 -0000 1.5 +++ dvb-apps.spec 18 May 2006 20:56:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -34,6 +34,7 @@ cd .. rm -rf include install -pm 644 %{SOURCE2} COPYING +sed -i -e 's/\r//' util/scan/atsc/us-NY-TWC-NYC %build @@ -55,7 +56,7 @@ 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} +cp -pR scan/dvb-? scan/atsc $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 .. @@ -73,6 +74,9 @@ %changelog +* Thu May 18 2006 Ville Skytt?? - 1.1.1-4 +- Include ATSC initial tuning data files. + * Thu May 18 2006 David Woodhouse - 1.1.1-2 - Rebuild (to unfix kernel-headers on older distros) From fedora-extras-commits at redhat.com Thu May 18 20:58:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 May 2006 13:58:10 -0700 Subject: rpms/dvb-apps/FC-4 dvb-apps.spec,1.3,1.4 Message-ID: <200605182058.k4IKwgc8017570@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17538/FC-4 Modified Files: dvb-apps.spec Log Message: * Thu May 18 2006 Ville Skytt?? - 1.1.1-3 - Reintroduce versioned glibc-kernheaders BR for explicitness. - Include ATSC initial tuning data files. Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/dvb-apps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dvb-apps.spec 18 May 2006 00:37:23 -0000 1.3 +++ dvb-apps.spec 18 May 2006 20:58:10 -0000 1.4 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel +BuildRequires: glibc-kernheaders >= 2.4-9.1.94 %description %{summary}. @@ -33,6 +34,7 @@ cd .. rm -rf include install -pm 644 %{SOURCE2} COPYING +sed -i -e 's/\r//' util/scan/atsc/us-NY-TWC-NYC %build @@ -54,7 +56,7 @@ 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} +cp -pR scan/dvb-? scan/atsc $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 .. @@ -72,6 +74,10 @@ %changelog +* Thu May 18 2006 Ville Skytt?? - 1.1.1-3 +- Reintroduce versioned glibc-kernheaders BR for explicitness. +- Include ATSC initial tuning data files. + * Thu May 18 2006 David Woodhouse - 1.1.1-2 - Remove kernel-headers BR From fedora-extras-commits at redhat.com Thu May 18 20:58:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 May 2006 13:58:10 -0700 Subject: rpms/dvb-apps/FC-5 dvb-apps.spec,1.5,1.6 Message-ID: <200605182058.k4IKwg9g017573@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17538/FC-5 Modified Files: dvb-apps.spec Log Message: * Thu May 18 2006 Ville Skytt?? - 1.1.1-3 - Reintroduce versioned glibc-kernheaders BR for explicitness. - Include ATSC initial tuning data files. Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/dvb-apps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dvb-apps.spec 18 May 2006 00:35:22 -0000 1.5 +++ dvb-apps.spec 18 May 2006 20:58:10 -0000 1.6 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel +BuildRequires: glibc-kernheaders >= 2.4-9.1.94 %description %{summary}. @@ -33,6 +34,7 @@ cd .. rm -rf include install -pm 644 %{SOURCE2} COPYING +sed -i -e 's/\r//' util/scan/atsc/us-NY-TWC-NYC %build @@ -54,7 +56,7 @@ 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} +cp -pR scan/dvb-? scan/atsc $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 .. @@ -72,6 +74,10 @@ %changelog +* Thu May 18 2006 Ville Skytt?? - 1.1.1-3 +- Reintroduce versioned glibc-kernheaders BR for explicitness. +- Include ATSC initial tuning data files. + * Thu May 18 2006 David Woodhouse - 1.1.1-2 - Remove kernel-headers BR From fedora-extras-commits at redhat.com Thu May 18 21:19:38 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:19:38 -0700 Subject: rpms/erlang-esdl/devel esdl-refc.patch, NONE, 1.1 erlang-esdl.spec, 1.1, 1.2 Message-ID: <200605182119.k4ILJel5020042@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang-esdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19989/devel Modified Files: erlang-esdl.spec Added Files: esdl-refc.patch Log Message: rebuilt esdl-refc.patch: --- NEW FILE esdl-refc.patch --- --- esdl-0.95.0630/c_src/esdl_driver.c.refc 2006-05-18 21:31:41.000000000 +0200 +++ esdl-0.95.0630/c_src/esdl_driver.c 2006-05-18 21:33:02.000000000 +0200 @@ -224,7 +224,7 @@ return sdl_getbuff(sd, size); } else { ErlDrvBinary* bin = (ErlDrvBinary *) sd->temp_bin; - bin->refc++; + driver_binary_inc_refc(bin); sd->buff = bin; sd->len = size; return bin->orig_bytes; @@ -253,7 +253,7 @@ sd->bin[i].base = ev->iov[1].iov_base; sd->bin[i].size = ev->iov[1].iov_len; bin = ev->binv[1]; - bin->refc++; /* Otherwise it could get deallocated */ + driver_binary_inc_refc(bin); sd->bin[i].bin = bin; sd->next_bin++; } Index: erlang-esdl.spec =================================================================== RCS file: /cvs/extras/rpms/erlang-esdl/devel/erlang-esdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- erlang-esdl.spec 25 Apr 2006 16:54:12 -0000 1.1 +++ erlang-esdl.spec 18 May 2006 21:19:38 -0000 1.2 @@ -1,18 +1,19 @@ Name: erlang-esdl Version: 0.95.0630 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Erlang OpenGL/SDL api and utilities Group: Development/Libraries License: Distributable URL: http://esdl.sourceforge.net Source: http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz +Patch0: esdl-refc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel -BuildRequires: erlang -Requires: erlang +BuildRequires: erlang >= R11B +Requires: erlang >= R11B Provides: esdl = %{version}-%{release} @@ -32,6 +33,7 @@ %prep %setup -q -n esdl-%{version} +%patch0 -p1 -b .refc perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile find . -name '*.c' -or -name '*.h' | xargs chmod 0644 @@ -76,6 +78,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.95.0630-6 +- rebuilt for erlang R11B-0 + * Tue Apr 25 2006 Gerard Milmeister - 0.95.0630-4 - removed c_src directory From fedora-extras-commits at redhat.com Thu May 18 21:19:32 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:19:32 -0700 Subject: rpms/erlang-esdl/FC-4 esdl-refc.patch, NONE, 1.1 erlang-esdl.spec, 1.1, 1.2 Message-ID: <200605182120.k4ILK4KE020047@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang-esdl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19989/FC-4 Modified Files: erlang-esdl.spec Added Files: esdl-refc.patch Log Message: rebuilt esdl-refc.patch: --- NEW FILE esdl-refc.patch --- --- esdl-0.95.0630/c_src/esdl_driver.c.refc 2006-05-18 21:31:41.000000000 +0200 +++ esdl-0.95.0630/c_src/esdl_driver.c 2006-05-18 21:33:02.000000000 +0200 @@ -224,7 +224,7 @@ return sdl_getbuff(sd, size); } else { ErlDrvBinary* bin = (ErlDrvBinary *) sd->temp_bin; - bin->refc++; + driver_binary_inc_refc(bin); sd->buff = bin; sd->len = size; return bin->orig_bytes; @@ -253,7 +253,7 @@ sd->bin[i].base = ev->iov[1].iov_base; sd->bin[i].size = ev->iov[1].iov_len; bin = ev->binv[1]; - bin->refc++; /* Otherwise it could get deallocated */ + driver_binary_inc_refc(bin); sd->bin[i].bin = bin; sd->next_bin++; } Index: erlang-esdl.spec =================================================================== RCS file: /cvs/extras/rpms/erlang-esdl/FC-4/erlang-esdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- erlang-esdl.spec 25 Apr 2006 16:54:12 -0000 1.1 +++ erlang-esdl.spec 18 May 2006 21:19:32 -0000 1.2 @@ -1,18 +1,19 @@ Name: erlang-esdl Version: 0.95.0630 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Erlang OpenGL/SDL api and utilities Group: Development/Libraries License: Distributable URL: http://esdl.sourceforge.net Source: http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz +Patch0: esdl-refc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel -BuildRequires: erlang -Requires: erlang +BuildRequires: erlang >= R11B +Requires: erlang >= R11B Provides: esdl = %{version}-%{release} @@ -32,6 +33,7 @@ %prep %setup -q -n esdl-%{version} +%patch0 -p1 -b .refc perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile find . -name '*.c' -or -name '*.h' | xargs chmod 0644 @@ -76,6 +78,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.95.0630-6 +- rebuilt for erlang R11B-0 + * Tue Apr 25 2006 Gerard Milmeister - 0.95.0630-4 - removed c_src directory From fedora-extras-commits at redhat.com Thu May 18 21:19:32 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:19:32 -0700 Subject: rpms/erlang-esdl/FC-5 erlang-esdl.spec,1.3,1.4 Message-ID: <200605182120.k4ILK4vx020050@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang-esdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19989/FC-5 Modified Files: erlang-esdl.spec Log Message: rebuilt Index: erlang-esdl.spec =================================================================== RCS file: /cvs/extras/rpms/erlang-esdl/FC-5/erlang-esdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- erlang-esdl.spec 18 May 2006 19:48:38 -0000 1.3 +++ erlang-esdl.spec 18 May 2006 21:19:32 -0000 1.4 @@ -12,8 +12,8 @@ BuildRequires: SDL-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel -BuildRequires: erlang -Requires: erlang +BuildRequires: erlang >= R11B +Requires: erlang >= R11B Provides: esdl = %{version}-%{release} From fedora-extras-commits at redhat.com Thu May 18 21:30:34 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:30:34 -0700 Subject: rpms/wings/FC-4 wings.spec,1.1,1.2 Message-ID: <200605182130.k4ILUa3s020263@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218/FC-4 Modified Files: wings.spec Log Message: rebuilt Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/FC-4/wings.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wings.spec 28 Apr 2006 08:03:26 -0000 1.1 +++ wings.spec 18 May 2006 21:30:34 -0000 1.2 @@ -1,6 +1,6 @@ Name: wings Version: 0.98.32b -Release: 5%{?dist} +Release: 7%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -108,6 +108,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.98.32b-7 +- rebuilt for erlang R11B + * Thu Apr 27 2006 Gerard Milmeister - 0.98.32b-5 - split off docs package From fedora-extras-commits at redhat.com Thu May 18 21:30:35 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:30:35 -0700 Subject: rpms/wings/FC-5 wings.spec,1.2,1.3 Message-ID: <200605182130.k4ILUbWd020267@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218/FC-5 Modified Files: wings.spec Log Message: rebuilt Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/FC-5/wings.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wings.spec 28 Apr 2006 19:05:19 -0000 1.2 +++ wings.spec 18 May 2006 21:30:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: wings Version: 0.98.32b -Release: 6%{?dist} +Release: 7%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -108,6 +108,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.98.32b-7 +- rebuilt for erlang R11B + * Thu Apr 27 2006 Gerard Milmeister - 0.98.32b-5 - split off docs package From fedora-extras-commits at redhat.com Thu May 18 21:30:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:30:36 -0700 Subject: rpms/wings/devel wings.spec,1.1,1.2 Message-ID: <200605182130.k4ILUcUH020271@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218/devel Modified Files: wings.spec Log Message: rebuilt Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/devel/wings.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wings.spec 28 Apr 2006 08:03:26 -0000 1.1 +++ wings.spec 18 May 2006 21:30:36 -0000 1.2 @@ -1,6 +1,6 @@ Name: wings Version: 0.98.32b -Release: 5%{?dist} +Release: 7%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -108,6 +108,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.98.32b-7 +- rebuilt for erlang R11B + * Thu Apr 27 2006 Gerard Milmeister - 0.98.32b-5 - split off docs package From fedora-extras-commits at redhat.com Thu May 18 22:33:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 18 May 2006 15:33:05 -0700 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.18,1.19 Message-ID: <200605182233.k4IMX7MB022924@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-serv22907 Modified Files: perl-Module-Build.spec Log Message: Take input from /dev/zero during "Build test" to avoid test failure. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Module-Build.spec 17 May 2006 19:33:47 -0000 1.18 +++ perl-Module-Build.spec 18 May 2006 22:33:05 -0000 1.19 @@ -2,7 +2,7 @@ Name: perl-Module-Build Version: 0.2800 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,7 +48,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -./Build test +# 0.28 builds fail in the build system due +# to no stdin in t/extend, so we cheat. +./Build test < /dev/zero %clean rm -rf $RPM_BUILD_ROOT @@ -62,6 +64,9 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Thu May 18 2006 Steven Pritchard 0.2800-2 +- Take input from /dev/zero during "Build test" to avoid test failure. + * Wed May 17 2006 Steven Pritchard 0.2800-1 - Update to 0.28, but call it 0.2800 to avoid an epoch bump. - Various spec cleanups to closer match cpanspec output. From fedora-extras-commits at redhat.com Thu May 18 22:49:38 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Thu, 18 May 2006 15:49:38 -0700 Subject: fedora-security/audit fe4,1.26,1.27 fe5,1.23,1.24 Message-ID: <200605182249.k4IMncw8023032@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23010 Modified Files: fe4 fe5 Log Message: libnasl fix for nessus pushed Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- fe4 18 May 2006 12:41:44 -0000 1.26 +++ fe4 18 May 2006 22:49:36 -0000 1.27 @@ -8,7 +8,7 @@ CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 -CVE-2006-2093 VULNERABLE (nessus) bz#191053 +CVE-2006-2093 version (nessus, fixed 2.2.7) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) CVE-2006-1989 version (clamav, fixed 0.88.2) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fe5 18 May 2006 11:45:48 -0000 1.23 +++ fe5 18 May 2006 22:49:36 -0000 1.24 @@ -7,7 +7,7 @@ CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 -CVE-2006-2093 VULNERABLE (nessus) bz#191053 +CVE-2006-2093 version (nessus, fixed 2.2.7) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) CVE-2006-1989 version (clamav, fixed 0.88.2) From fedora-extras-commits at redhat.com Thu May 18 22:59:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 18 May 2006 15:59:39 -0700 Subject: rpms/wine/FC-5 wine.spec,1.26,1.27 Message-ID: <200605182259.k4IMxfOv023115@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23098 Modified Files: wine.spec Log Message: - enable hal/dbus support Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- wine.spec 16 May 2006 20:51:51 -0000 1.26 +++ wine.spec 18 May 2006 22:59:38 -0000 1.27 @@ -2,7 +2,7 @@ Name: wine Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -52,12 +52,13 @@ BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: libXxf86dga-devel libXxf86vm-devel BuildRequires: libXrandr-devel libXrender-devel libXext-devel - BuildRequires: fontconfig-devel BuildRequires: giflib-devel BuildRequires: cups-devel BuildRequires: libXmu-devel BuildRequires: libXi-devel +# dbus/hal >= FC5 +BuildRequires: dbus-devel hal-devel Requires: %{_bindir}/xmessage @@ -654,6 +655,10 @@ %{_libdir}/wine/*.def %changelog +* Fri May 19 2006 Andreas Bierfert +0.9.13-2 +- enable dbus/hal support + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Fri May 19 00:18:46 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 May 2006 17:18:46 -0700 Subject: extras-buildsys/utils extras-push-new,1.10,1.11 Message-ID: <200605190018.k4J0IkCL027978@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27960 Modified Files: extras-push-new Log Message: - Add code which prunes old unwanted builds from the needsign queue prior to pushing. - Turn DEBUG on again, although I'm confident this works. Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- extras-push-new 17 May 2006 09:58:53 -0000 1.10 +++ extras-push-new 19 May 2006 00:18:43 -0000 1.11 @@ -15,13 +15,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import fcntl +import fcntl, fnmatch import os, sys import rpmUtils import shutil import string -DEBUG = False +DEBUG = True signersgid = 100581 # extras_signers group @@ -47,15 +47,15 @@ """ smtp_server = '' -config = { 'repoview' : True, - 'repoclosure' : False, - 'gidcheck' : True, - 'setumask' : True, - 'signkeycheck' : True, - 'mail' : True, - 'doublesync' : False, - 'force' : False - } +class opts: + repoview = True + repoclosure = False + gidcheck = True + setumask = True + signkeycheck = True + mail = True + doublesync = False + force = False alldists = [ 'development', '5', '4', '3' ] @@ -158,6 +158,69 @@ # ==================================================================== + +def find_srcrpms(rootpath): + """returns a list of source rpm path names in given tree""" + srcrpms = [] + if not os.path.isdir(rootpath): + return srcrpms + for root, dirs, files in os.walk(rootpath): + for f in fnmatch.filter(files,'*.src.rpm'): + srcrpms.append(os.path.join(root,f)) + return srcrpms + + +def prune_needsign_tree(repodir): + # The root dir contains a directory for every pushed package "name". + pkgnames = os.listdir(repodir) + try: + pkgnames.remove('repodata') + except: + pass + + for name in pkgnames: + pkgroot = os.path.join(repodir,name) + if not os.path.isdir(pkgroot): + continue + # Every version-release is stored in an own sub-dir. + pkgreldirs = os.listdir(pkgroot) + debugprint( '%s releases for %s: %s' % (len(pkgreldirs),name,' '.join(pkgreldirs)) ) + if len(pkgreldirs) < 2: # only one release + continue + # We assume this release to be the newest. + relroot = os.path.join(pkgroot,pkgreldirs[0]) + # There can be only one src.rpm in this dir, since relroot + # and src.rpm filename are unique (due to NVR). + srcrpms = find_srcrpms(relroot) + # Currently, directories can be empty though, unless we clean up + # the repodir regularly. + if not len(srcrpms): + continue + srcrpm = srcrpms[0] + (n,a,e,v,r) = naevr(srcrpm) + # Now compare with the other releases. + for vr in pkgreldirs[1:]: + nextrelroot = os.path.join(pkgroot,vr) + nextsrcrpms = find_srcrpms(nextrelroot) + if not len(nextsrcrpms): + continue + nextsrcrpm = nextsrcrpms[0] + (nextn,nexta,nexte,nextv,nextr) = naevr(nextsrcrpm) + # 1 means: e,v,r is higher than nexte,nextv,nextr + if rpmUtils.miscutils.compareEVR((e,v,r),(nexte,nextv,nextr)) == 1: + debugprint('Removing: %s' % nextrelroot) + if not DEBUG: + shutil.rmtree(nextrelroot) + else: + debugprint('Removing: %s' % relroot) + if not DEBUG: + shutil.rmtree(relroot) + # Make this the next newest package for ongoing comparison. + relroot = nextrelroot + (n,a,e,v,r) = (nextn,nexta,nexte,nextv,nextr) + + +# ==================================================================== # (previously in extras-sign-move.py) # get the path to where to look for the packages to be signed @@ -251,6 +314,7 @@ distdir = '%s-%s-%s' % (distro, dist, project) needsign = os.path.join(stagesdir, distdir) + #prune_needsign_tree(needsign) files = find_files(needsign) rpms = files['rpm'] + files['srpm'] + files['debuginfo'] rpms.sort() @@ -417,22 +481,22 @@ # ==================================================================== if __name__ == '__main__': - if config['gidcheck']: + if opts.gidcheck: if os.getgid() != signersgid: print 'ERROR: Change into extras_signers group before running this! Use "newgrp extras_signers".' sys.exit(13) - if config['signkeycheck']: + if opts.signkeycheck: if 'extras at fedoraproject.org' != os.popen('rpm --eval %_gpg_name','r').read().rstrip(): print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!' sys.exit(13) - if config['setumask']: + if opts.setumask: os.umask(0002) if '-f' in sys.argv[1:]: sys.argv.remove('-f') - config['force'] = True + opts.force = True if len(sys.argv) < 2: print 'SYNTAX: %s [dist]...' % sys.argv[0] @@ -453,7 +517,7 @@ # If we are called as 'extras-sign-move.py' we simulate old # behaviour and only do: sign, move, repobuild, sync if sys.argv[0].endswith('extras-sign-move.py'): - config['repoview'] = False + opts.repoview = False if not os.path.exists(rundir): os.makedirs(rundir) @@ -470,27 +534,27 @@ # Option -f re-runs repobuild/repoview for all dists, even if # no new packages have been pushed for a dist. changed = dists - if config['force']: + if opts.force: changed = alldists # len(getlinesfromrunfile(dist)) is the number of packages # per dist which have been pushed. for dist in changed: - if config['force'] or len( getlinesfromrunfile(dist) ): + if opts.force or len( getlinesfromrunfile(dist) ): run_and_check('extras-repobuild.py %s' % dist) - if config['doublesync']: + if opts.doublesync: run_and_check('extras-sync') for dist in changed: - if config['force'] or len( getlinesfromrunfile(dist) ): - if config['repoview']: + if opts.force or len( getlinesfromrunfile(dist) ): + if opts.repoview: run_and_check('extras-repoview.py %s' % dist) run_and_check('extras-sync') - if config['mail']: + if opts.mail: for dist in dists: email_list( getlinesfromrunfile(dist), dist ) emptyrunfile(dist) From fedora-extras-commits at redhat.com Fri May 19 00:20:59 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 May 2006 17:20:59 -0700 Subject: extras-buildsys/utils extras-push-new,1.11,1.12 Message-ID: <200605190020.k4J0KxWZ028008@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27990 Modified Files: extras-push-new Log Message: enable prune feature Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- extras-push-new 19 May 2006 00:18:43 -0000 1.11 +++ extras-push-new 19 May 2006 00:20:57 -0000 1.12 @@ -314,7 +314,7 @@ distdir = '%s-%s-%s' % (distro, dist, project) needsign = os.path.join(stagesdir, distdir) - #prune_needsign_tree(needsign) + prune_needsign_tree(needsign) files = find_files(needsign) rpms = files['rpm'] + files['srpm'] + files['debuginfo'] rpms.sort() From fedora-extras-commits at redhat.com Fri May 19 01:01:16 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Thu, 18 May 2006 18:01:16 -0700 Subject: kadischi kadischi.spec,1.4,1.5 Message-ID: <200605190101.k4J11GeW030411@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30375/kadischi Modified Files: kadischi.spec Log Message: Bump version in spec for FC4 compatibility and new ks cfg files Index: kadischi.spec =================================================================== RCS file: /cvs/devel/kadischi/kadischi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kadischi.spec 13 Apr 2006 09:45:45 -0000 1.4 +++ kadischi.spec 19 May 2006 01:01:14 -0000 1.5 @@ -2,7 +2,7 @@ Name: kadischi Version: 0.1 -Release: 8.%{alphatag} +Release: 9.%{alphatag} Summary: LiveCD generation utility Group: Applications/System @@ -59,6 +59,7 @@ %{_datadir}/%{name}/initrd/find-live-cd %{_datadir}/%{name}/initrd/livecd-linuxrc %{_datadir}/%{name}/ks_examples/minimal-livecd.cfg +%{_datadir}/%{name}/ks_examples/standard-livecd.cfg %{_datadir}/%{name}/patches/*.patch %{_datadir}/%{name}/install/readonly-root %{_datadir}/%{name}/install/rc.readonly-livecd @@ -77,6 +78,11 @@ %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo %changelog +* Thu May 18 2006 +- Support FC4 target installations +- Added standard-livecd.cfg + + * Tue Apr 11 2006 Jasper Hartline - Handle UP and SMP kernels on SMP and UP hosts - Drop filesystem option and use SquashFS exclusively From fedora-extras-commits at redhat.com Fri May 19 03:02:45 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:02:45 -0700 Subject: rpms/liblo/FC-5 liblo.spec,1.1,1.2 Message-ID: <200605190303.k4J33H4w002946@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2896 Modified Files: liblo.spec Log Message: Don't install INSTALL file. Index: liblo.spec =================================================================== RCS file: /cvs/extras/rpms/liblo/FC-5/liblo.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblo.spec 14 May 2006 21:21:19 -0000 1.1 +++ liblo.spec 19 May 2006 03:02:44 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Open Sound Control library Name: liblo Version: 0.23 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: System Environment/Libraries URL: http://liblo.sourceforge.net @@ -47,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL README +%doc AUTHORS ChangeLog COPYING README %doc doc/html doc/latex %{_libdir}/liblo.so.* @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Thu May 18 2006 Anthony Green 0.23-5 +- Don't install generic INSTALL documentation. + * Sat Apr 29 2006 Anthony Green 0.23-4 - Stop using command macros like __rm, __make, __mkdir and __install. From fedora-extras-commits at redhat.com Fri May 19 03:03:53 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:03:53 -0700 Subject: rpms/liblo/FC-5 liblo.spec,1.2,1.3 Message-ID: <200605190303.k4J33tco003012@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2995 Modified Files: liblo.spec Log Message: Update rev to -6. Index: liblo.spec =================================================================== RCS file: /cvs/extras/rpms/liblo/FC-5/liblo.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liblo.spec 19 May 2006 03:02:44 -0000 1.2 +++ liblo.spec 19 May 2006 03:03:53 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Open Sound Control library Name: liblo Version: 0.23 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://liblo.sourceforge.net @@ -60,7 +60,7 @@ %{_mandir}/man3/* %changelog -* Thu May 18 2006 Anthony Green 0.23-5 +* Thu May 18 2006 Anthony Green 0.23-6 - Don't install generic INSTALL documentation. * Sat Apr 29 2006 Anthony Green 0.23-4 From fedora-extras-commits at redhat.com Fri May 19 03:07:10 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Thu, 18 May 2006 20:07:10 -0700 Subject: rpms/gnonlin/devel .cvsignore, 1.3, 1.4 gnonlin.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605190307.k4J37CFf003083@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/gnonlin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3060 Modified Files: .cvsignore gnonlin.spec sources Log Message: Updated gnonlin to 0.10.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Apr 2006 02:47:27 -0000 1.3 +++ .cvsignore 19 May 2006 03:07:10 -0000 1.4 @@ -1 +1 @@ -gnonlin-0.10.3.tar.gz +gnonlin-0.10.4.tar.gz Index: gnonlin.spec =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnonlin.spec 26 Apr 2006 21:16:38 -0000 1.6 +++ gnonlin.spec 19 May 2006 03:07:10 -0000 1.7 @@ -2,8 +2,8 @@ %define gst_plugins_base_req 0.10.2 Name: gnonlin -Version: 0.10.3 -Release: 2 +Version: 0.10.4 +Release: 1 Summary: GStreamer extension library for non-linear editing Group: System Environment/Libraries @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gstreamer-devel >= %{gst_req} gstreamer-plugins-base-devel >= %{gst_plugins_base_req} +Obsoletes: gnonlin-devel %description Gnonlin is a library built on top of GStreamer (http://gstreamer.net) @@ -41,6 +42,10 @@ %{_libdir}/gstreamer-0.10/libgnl* %changelog +* Thu May 18 2006 W. Michael Petullo 0.10.4-1 +- updated package to 0.10.4 +- add Obsoletes: gnonlin-devel + * Wed Apr 26 2006 W. Michael Petullo 0.10.3-2 - simplified install - require gstreamer-plugins-base-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Apr 2006 02:47:27 -0000 1.3 +++ sources 19 May 2006 03:07:10 -0000 1.4 @@ -1 +1 @@ -4fa1cebf048243e47cd590d4afed6dc6 gnonlin-0.10.3.tar.gz +7346b4d42b2980e88c191c44deff7d8c gnonlin-0.10.4.tar.gz From fedora-extras-commits at redhat.com Fri May 19 03:07:25 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:07:25 -0700 Subject: rpms/liblo/devel liblo.spec,1.1,1.2 Message-ID: <200605190307.k4J37Rsv003112@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3089 Modified Files: liblo.spec Log Message: Don't install INSTALL. Rev to -6. Index: liblo.spec =================================================================== RCS file: /cvs/extras/rpms/liblo/devel/liblo.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblo.spec 14 May 2006 21:21:19 -0000 1.1 +++ liblo.spec 19 May 2006 03:07:25 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Open Sound Control library Name: liblo Version: 0.23 -Release: 4%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://liblo.sourceforge.net @@ -47,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL README +%doc AUTHORS ChangeLog COPYING README %doc doc/html doc/latex %{_libdir}/liblo.so.* @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Thu May 18 2006 Anthony Green 0.23-6 +- Don't install generic INSTALL documentation. + * Sat Apr 29 2006 Anthony Green 0.23-4 - Stop using command macros like __rm, __make, __mkdir and __install. From fedora-extras-commits at redhat.com Fri May 19 03:10:33 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:10:33 -0700 Subject: rpms/liblrdf/FC-5 liblrdf.spec,1.1,1.2 Message-ID: <200605190310.k4J3AZTm003257@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3232 Modified Files: liblrdf.spec Log Message: Don't install INSTALL. Index: liblrdf.spec =================================================================== RCS file: /cvs/extras/rpms/liblrdf/FC-5/liblrdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblrdf.spec 14 May 2006 03:29:59 -0000 1.1 +++ liblrdf.spec 19 May 2006 03:10:33 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Library for manipulating RDF files describing LADSPA plugins Name: liblrdf Version: 0.4.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Libraries URL: http://lrdf.sourceforge.net/ @@ -44,7 +44,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README README.fedora +%doc AUTHORS ChangeLog COPYING NEWS README README.fedora %{_libdir}/liblrdf.so.* %exclude %{_datadir}/ladspa/rdf/ladspa.rdfs @@ -56,6 +56,9 @@ %{_libdir}/pkgconfig/* %changelog +* Thu May 18 2006 Anthony Green 0.4.0-7 +- Don't install generic INSTALL documentation. + * Sat May 13 2006 Anthony Green 0.4.0-6 - Exclude ladspa.rdfs. - Don't use %{__rm} or %{__make} macros. From fedora-extras-commits at redhat.com Fri May 19 03:11:23 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:11:23 -0700 Subject: rpms/liblrdf/devel liblrdf.spec,1.1,1.2 Message-ID: <200605190311.k4J3BPZx003332@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3311 Modified Files: liblrdf.spec Log Message: Don't install INSTALL. Index: liblrdf.spec =================================================================== RCS file: /cvs/extras/rpms/liblrdf/devel/liblrdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblrdf.spec 14 May 2006 03:29:59 -0000 1.1 +++ liblrdf.spec 19 May 2006 03:11:23 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Library for manipulating RDF files describing LADSPA plugins Name: liblrdf Version: 0.4.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Libraries URL: http://lrdf.sourceforge.net/ @@ -44,7 +44,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README README.fedora +%doc AUTHORS ChangeLog COPYING NEWS README README.fedora %{_libdir}/liblrdf.so.* %exclude %{_datadir}/ladspa/rdf/ladspa.rdfs @@ -56,6 +56,9 @@ %{_libdir}/pkgconfig/* %changelog +* Thu May 18 2006 Anthony Green 0.4.0-7 +- Don't install generic INSTALL documentation. + * Sat May 13 2006 Anthony Green 0.4.0-6 - Exclude ladspa.rdfs. - Don't use %{__rm} or %{__make} macros. From fedora-extras-commits at redhat.com Fri May 19 04:36:21 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:36:21 -0700 Subject: rpms/kphone/FC-5 kphone-perms.patch,NONE,1.1 kphone.spec,1.24,1.25 Message-ID: <200605190436.k4J4aNR6005831@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5808 Modified Files: kphone.spec Added Files: kphone-perms.patch Log Message: apply patch for CVE-2006-2442 kphone-perms.patch: --- NEW FILE kphone-perms.patch --- --- kphone-orig/kphone/kphone.cpp 2005-06-21 06:14:49.000000000 -0500 +++ kphone/kphone/kphone.cpp 2006-05-18 23:27:09.000000000 -0500 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -32,6 +35,8 @@ userPrefix = "_" + prefix + "_"; } QSettings settings; + + umask(077); Sip::setLocalAddress( settings.readEntry( "/kphone/dissipate_addr", Sip::getLocalAddress() ) ); QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-5/kphone.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- kphone.spec 15 Feb 2006 01:48:41 -0000 1.24 +++ kphone.spec 19 May 2006 04:36:21 -0000 1.25 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -14,6 +14,7 @@ Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch Patch5: kphone-4.2-configure.patch +Patch6: kphone-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -31,6 +32,7 @@ %patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 %patch5 -p1 -b .configure +%patch6 -p1 -b .perms %build unset QTDIR || : ; . /etc/profile.d/qt.sh From fedora-extras-commits at redhat.com Fri May 19 04:39:15 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:39:15 -0700 Subject: rpms/kphone/FC-3 kphone-perms.patch,NONE,1.1 kphone.spec,1.15,1.16 Message-ID: <200605190439.k4J4dHGB005907@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5887 Modified Files: kphone.spec Added Files: kphone-perms.patch Log Message: patch for CVE-2006-2442 kphone-perms.patch: --- NEW FILE kphone-perms.patch --- --- kphone-orig/kphone/kphone.cpp 2005-06-21 06:14:49.000000000 -0500 +++ kphone/kphone/kphone.cpp 2006-05-18 23:27:09.000000000 -0500 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -32,6 +35,8 @@ userPrefix = "_" + prefix + "_"; } QSettings settings; + + umask(077); Sip::setLocalAddress( settings.readEntry( "/kphone/dissipate_addr", Sip::getLocalAddress() ) ); QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kphone.spec 5 Feb 2006 21:34:36 -0000 1.15 +++ kphone.spec 19 May 2006 04:39:15 -0000 1.16 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 6%{?dist} +Release: 9%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -14,6 +14,7 @@ Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch Patch5: kphone-4.2-configure.patch +Patch6: kphone-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -31,11 +32,12 @@ %patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 %patch5 -p1 -b .configure +%patch6 -p1 -b .perms %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure +%configure make %{?_smp_mflags} %install @@ -64,6 +66,12 @@ %{_datadir}/pixmaps/*.png %changelog +* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +- disable srtp we dont have the deps was testing + +* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +- rebuild for fc5 + * Sun Feb 05 2006 Dennis Gilmore 4.2-6 - patch configure so we use standard CFLAGS - reapply STUN patch From fedora-extras-commits at redhat.com Fri May 19 04:40:03 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:40:03 -0700 Subject: rpms/kphone/FC-4 kphone-perms.patch,NONE,1.1 kphone.spec,1.19,1.20 Message-ID: <200605190440.k4J4e5aR005978@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5956 Modified Files: kphone.spec Added Files: kphone-perms.patch Log Message: Apply patch for CVE-2006-2442 kphone-perms.patch: --- NEW FILE kphone-perms.patch --- --- kphone-orig/kphone/kphone.cpp 2005-06-21 06:14:49.000000000 -0500 +++ kphone/kphone/kphone.cpp 2006-05-18 23:27:09.000000000 -0500 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -32,6 +35,8 @@ userPrefix = "_" + prefix + "_"; } QSettings settings; + + umask(077); Sip::setLocalAddress( settings.readEntry( "/kphone/dissipate_addr", Sip::getLocalAddress() ) ); QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- kphone.spec 5 Feb 2006 21:36:44 -0000 1.19 +++ kphone.spec 19 May 2006 04:40:03 -0000 1.20 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 6%{?dist} +Release: 9%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -14,6 +14,7 @@ Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch Patch5: kphone-4.2-configure.patch +Patch6: kphone-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -31,11 +32,12 @@ %patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 %patch5 -p1 -b .configure +%patch6 -p1 -b .perms %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure +%configure make %{?_smp_mflags} %install @@ -64,6 +66,12 @@ %{_datadir}/pixmaps/*.png %changelog +* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +- disable srtp we dont have the deps was testing + +* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +- rebuild for fc5 + * Sun Feb 05 2006 Dennis Gilmore 4.2-6 - patch configure so we use standard CFLAGS - reapply STUN patch From fedora-extras-commits at redhat.com Fri May 19 04:40:42 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:40:42 -0700 Subject: rpms/kphone/devel kphone-perms.patch, NONE, 1.1 kphone.spec, 1.24, 1.25 Message-ID: <200605190440.k4J4eiCn006049@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6027 Modified Files: kphone.spec Added Files: kphone-perms.patch Log Message: apply patch for CVE-2006-2442 kphone-perms.patch: --- NEW FILE kphone-perms.patch --- --- kphone-orig/kphone/kphone.cpp 2005-06-21 06:14:49.000000000 -0500 +++ kphone/kphone/kphone.cpp 2006-05-18 23:27:09.000000000 -0500 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -32,6 +35,8 @@ userPrefix = "_" + prefix + "_"; } QSettings settings; + + umask(077); Sip::setLocalAddress( settings.readEntry( "/kphone/dissipate_addr", Sip::getLocalAddress() ) ); QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- kphone.spec 15 Feb 2006 01:48:41 -0000 1.24 +++ kphone.spec 19 May 2006 04:40:42 -0000 1.25 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -14,6 +14,7 @@ Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch Patch5: kphone-4.2-configure.patch +Patch6: kphone-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -31,6 +32,7 @@ %patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 %patch5 -p1 -b .configure +%patch6 -p1 -b .perms %build unset QTDIR || : ; . /etc/profile.d/qt.sh From fedora-extras-commits at redhat.com Fri May 19 04:53:35 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:53:35 -0700 Subject: fedora-security/audit fe4,1.27,1.28 fe5,1.24,1.25 Message-ID: <200605190453.k4J4rZXa006171@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6151 Modified Files: fe4 fe5 Log Message: Fix of CVE-2006-2442 Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- fe4 18 May 2006 22:49:36 -0000 1.27 +++ fe4 19 May 2006 04:53:33 -0000 1.28 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2442 VULNERABLE (kphone) bz#192202 +CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fe5 18 May 2006 22:49:36 -0000 1.24 +++ fe5 19 May 2006 04:53:33 -0000 1.25 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn From fedora-extras-commits at redhat.com Fri May 19 05:13:44 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 18 May 2006 22:13:44 -0700 Subject: rpms/obby/devel .cvsignore, 1.5, 1.6 obby.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200605190513.k4J5Dk2Q008512@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/obby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8490 Modified Files: .cvsignore obby.spec sources Log Message: 0.4.0rc2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/obby/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Apr 2006 20:00:23 -0000 1.5 +++ .cvsignore 19 May 2006 05:13:44 -0000 1.6 @@ -1 +1 @@ -obby-0.4.0rc1.tar.gz +obby-0.4.0rc2.tar.gz Index: obby.spec =================================================================== RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- obby.spec 15 Apr 2006 20:00:23 -0000 1.15 +++ obby.spec 19 May 2006 05:13:44 -0000 1.16 @@ -1,8 +1,8 @@ -%define _rc rc1 +%define _rc rc2 Name: obby Version: 0.4.0 -Release: 1.%{_rc}%{?dist} +Release: 2.%{_rc}%{?dist} Summary: A library which provides synced document buffers Group: Development/Libraries @@ -67,6 +67,9 @@ %changelog +* Fri May 19 2006 Luke Macken - 0.4.0-2.rc2 +- 0.4.0rc2 + * Sat Apr 15 2006 Luke Macken - 0.4.0-1.rc1 - 0.4.0rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/obby/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Apr 2006 20:00:23 -0000 1.5 +++ sources 19 May 2006 05:13:44 -0000 1.6 @@ -1 +1 @@ -cd7d8755a7854ad8d29c6d2b0457fa8f obby-0.4.0rc1.tar.gz +5dbc7054ee31eca614d44761aeddee49 obby-0.4.0rc2.tar.gz From fedora-extras-commits at redhat.com Fri May 19 05:16:13 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:16:13 -0700 Subject: rpms/kphone/devel kphone.spec,1.25,1.26 Message-ID: <200605190516.k4J5GFhX008579@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8562 Modified Files: kphone.spec Log Message: fill in changelog Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- kphone.spec 19 May 2006 04:40:42 -0000 1.25 +++ kphone.spec 19 May 2006 05:16:13 -0000 1.26 @@ -66,7 +66,13 @@ %{_datadir}/pixmaps/*.png %changelog -* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +* Thu May 19 2006 Dennis Gilmore 4.2-10 +- Fill in changelog :( + +* Thu May 19 2006 Dennis Gilmore 4.2-9 +- CVE-2006-2442 + +* Tue Feb 14 2006 Dennis Gilmore 4.2-8 - disable srtp we dont have the deps was testing * Tue Feb 14 2006 Dennis Gilmore 4.2-7 From fedora-extras-commits at redhat.com Fri May 19 05:17:15 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:17:15 -0700 Subject: rpms/kphone/devel kphone.spec,1.26,1.27 Message-ID: <200605190517.k4J5HHvK008638@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8621 Modified Files: kphone.spec Log Message: fill in changelog :( Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- kphone.spec 19 May 2006 05:16:13 -0000 1.26 +++ kphone.spec 19 May 2006 05:17:14 -0000 1.27 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications From fedora-extras-commits at redhat.com Fri May 19 05:19:52 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:19:52 -0700 Subject: rpms/kphone/FC-3 kphone.spec,1.16,1.17 Message-ID: <200605190519.k4J5JsLv008720@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8703 Modified Files: kphone.spec Log Message: update changelog :( Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kphone.spec 19 May 2006 04:39:15 -0000 1.16 +++ kphone.spec 19 May 2006 05:19:52 -0000 1.17 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -66,7 +66,13 @@ %{_datadir}/pixmaps/*.png %changelog -* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +* Thu May 19 2006 Dennis Gilmore 4.2-10 +- Fill in changelog :( + +* Thu May 19 2006 Dennis Gilmore 4.2-9 +- CVE-2006-2442 + +* Tue Feb 14 2006 Dennis Gilmore 4.2-8 - disable srtp we dont have the deps was testing * Tue Feb 14 2006 Dennis Gilmore 4.2-7 From fedora-extras-commits at redhat.com Fri May 19 05:20:30 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:20:30 -0700 Subject: rpms/kphone/FC-4 kphone.spec,1.20,1.21 Message-ID: <200605190520.k4J5KW8b008783@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8764 Modified Files: kphone.spec Log Message: update changelog :( bad me Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- kphone.spec 19 May 2006 04:40:03 -0000 1.20 +++ kphone.spec 19 May 2006 05:20:30 -0000 1.21 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -66,7 +66,13 @@ %{_datadir}/pixmaps/*.png %changelog -* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +* Thu May 19 2006 Dennis Gilmore 4.2-10 +- Fill in changelog :( + +* Thu May 19 2006 Dennis Gilmore 4.2-9 +- CVE-2006-2442 + +* Tue Feb 14 2006 Dennis Gilmore 4.2-8 - disable srtp we dont have the deps was testing * Tue Feb 14 2006 Dennis Gilmore 4.2-7 From fedora-extras-commits at redhat.com Fri May 19 05:20:59 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:20:59 -0700 Subject: rpms/kphone/FC-5 kphone.spec,1.25,1.26 Message-ID: <200605190521.k4J5L1Lk008846@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8829 Modified Files: kphone.spec Log Message: update changelog Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-5/kphone.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- kphone.spec 19 May 2006 04:36:21 -0000 1.25 +++ kphone.spec 19 May 2006 05:20:59 -0000 1.26 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -66,7 +66,13 @@ %{_datadir}/pixmaps/*.png %changelog -* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +* Thu May 19 2006 Dennis Gilmore 4.2-10 +- Fill in changelog :( + +* Thu May 19 2006 Dennis Gilmore 4.2-9 +- CVE-2006-2442 + +* Tue Feb 14 2006 Dennis Gilmore 4.2-8 - disable srtp we dont have the deps was testing * Tue Feb 14 2006 Dennis Gilmore 4.2-7 From fedora-extras-commits at redhat.com Fri May 19 07:10:07 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 May 2006 00:10:07 -0700 Subject: rpms/wine/devel wine.spec,1.26,1.27 Message-ID: <200605190710.k4J7A9dF013673@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652 Modified Files: wine.spec Log Message: - enable hal/dbus support Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- wine.spec 16 May 2006 20:51:56 -0000 1.26 +++ wine.spec 19 May 2006 07:10:07 -0000 1.27 @@ -2,7 +2,7 @@ Name: wine Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -52,12 +52,13 @@ BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: libXxf86dga-devel libXxf86vm-devel BuildRequires: libXrandr-devel libXrender-devel libXext-devel - BuildRequires: fontconfig-devel BuildRequires: giflib-devel BuildRequires: cups-devel BuildRequires: libXmu-devel BuildRequires: libXi-devel +# dbus/hal >= FC5 +BuildRequires: dbus-devel hal-devel Requires: %{_bindir}/xmessage @@ -654,6 +655,10 @@ %{_libdir}/wine/*.def %changelog +* Fri May 19 2006 Andreas Bierfert +0.9.13-2 +- enable dbus/hal support + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Fri May 19 10:16:31 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 19 May 2006 03:16:31 -0700 Subject: rpms/paps/devel .cvsignore, 1.7, 1.8 paps.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200605191016.k4JAGXBi022216@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22194 Modified Files: .cvsignore paps.spec sources Log Message: * Fri May 19 2006 Akira TAGOH - 0.6.6-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Apr 2006 08:38:31 -0000 1.7 +++ .cvsignore 19 May 2006 10:16:31 -0000 1.8 @@ -7,3 +7,4 @@ paps-0.6.2.tar.gz paps-0.6.3.tar.gz paps-0.6.5.tar.gz +paps-0.6.6.tar.gz Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- paps.spec 17 Apr 2006 08:38:31 -0000 1.9 +++ paps.spec 19 May 2006 10:16:31 -0000 1.10 @@ -1,5 +1,5 @@ Name: paps -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} License: LGPL @@ -47,6 +47,9 @@ %changelog +* Fri May 19 2006 Akira TAGOH - 0.6.6-1 +- New upstream release. + * Mon Apr 17 2006 Akira TAGOH - 0.6.5-1 - New upstream release. - paps-0.6.3-fix-pagesize.patch: removed. it has been merged in upstream. Index: sources =================================================================== RCS file: /cvs/extras/rpms/paps/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Apr 2006 08:38:31 -0000 1.7 +++ sources 19 May 2006 10:16:31 -0000 1.8 @@ -1 +1 @@ -5bb91f6358218f5cbba520376f3e3c1e paps-0.6.5.tar.gz +cc0975e70fe1e704e16f2fb08c71cee2 paps-0.6.6.tar.gz From fedora-extras-commits at redhat.com Fri May 19 11:01:52 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Fri, 19 May 2006 04:01:52 -0700 Subject: rpms/libapreq2/devel .cvsignore, 1.8, 1.9 libapreq2.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200605191102.k4JB2POj025453@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310 Modified Files: .cvsignore libapreq2.spec sources Log Message: Bump up to 2.08-RC1 for Rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Feb 2006 21:11:26 -0000 1.8 +++ .cvsignore 19 May 2006 11:01:52 -0000 1.9 @@ -1 +1 @@ -libapreq2-2.07.tar.gz +libapreq2-2.08-RC1.tar.gz Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libapreq2.spec 28 Feb 2006 18:38:07 -0000 1.10 +++ libapreq2.spec 19 May 2006 11:01:52 -0000 1.11 @@ -1,15 +1,14 @@ %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}} Name: libapreq2 -Version: 2.07 -Release: 1.1%{?dist} +Version: 2.08 +Release: 0.rc1.1%{?dist} Summary: Apache HTTP 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}.tar.gz -Source0: http://people.apache.org/~joes/libapreq2-2.07.tar.gz +Source0: http://people.apache.org/~pgollucci/apreq2/libapreq2-2.08-RC1.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-build.patch Patch1: %{name}-2.07-rc3-ldflags.patch @@ -62,7 +61,6 @@ #!/bin/sh %{__perl_provides} $* \ | grep -v 'perl(APR::\(Request\(::\(Apache2\|CGI\|Error\)\)\?\))$' \ -| grep -v 'perl(Apache2::\(Cookie\|Request\|Upload\))$' EOF %define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl-prov chmod +x %{__perl_provides} @@ -147,22 +145,24 @@ %defattr(-,root,root,-) %doc glue/perl/README %{perl_vendorarch}/auto/APR/ -%{perl_vendorarch}/Apache2/ %{perl_vendorarch}/APR/ %{_mandir}/man3/A*::*.3* %changelog -* Wed Mar 01 2006 Bojan Smojver - 2.07-1.1 +* Fri May 19 2006 Bojan Smojver - 2.08-0.rc1.1 +- bump up to 2.08-RC1 for Rawhide + +* Wed Mar 01 2006 Bojan Smojver - 2.07-1.1 - rebuild -* Mon Feb 13 2006 Bojan Smojver - 2.07-1 +* Mon Feb 13 2006 Bojan Smojver - 2.07-1 - bump up to 2.07 -* Fri Feb 03 2006 Bojan Smojver - 2.07-0.2.rc4 +* Fri Feb 03 2006 Bojan Smojver - 2.07-0.2.rc4 - re-tag for rebuild -* Fri Feb 03 2006 Bojan Smojver - 2.07-0.1.rc4 +* Fri Feb 03 2006 Bojan Smojver - 2.07-0.1.rc4 - bump up to 2.07-rc4 * Sat Dec 10 2005 Ville Skytt?? - 2.07-0.2.rc3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Feb 2006 21:11:26 -0000 1.8 +++ sources 19 May 2006 11:01:52 -0000 1.9 @@ -1 +1 @@ -6f2e5e4a14e8b190dead0fe91fc13080 libapreq2-2.07.tar.gz +4604dcb53dc913a4484d4d263c0105f5 libapreq2-2.08-RC1.tar.gz From fedora-extras-commits at redhat.com Fri May 19 11:23:04 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 May 2006 04:23:04 -0700 Subject: extras-buildsys/utils extras-push-new,1.12,1.13 Message-ID: <200605191123.k4JBN4gM026335@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26254 Modified Files: extras-push-new Log Message: - turn off DEBUG - use errno at least in some places - remove the extras-sign-move.py alias feature, since repobuild kills repoview (with the currently used createrepo) Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- extras-push-new 19 May 2006 00:20:57 -0000 1.12 +++ extras-push-new 19 May 2006 11:23:01 -0000 1.13 @@ -15,13 +15,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +import errno import fcntl, fnmatch import os, sys import rpmUtils import shutil import string -DEBUG = True +DEBUG = False signersgid = 100581 # extras_signers group @@ -33,8 +34,8 @@ # Where we store mails to be sent, lockfiles. rundir = '/srv/rpmbuild/extras-push-rundir' -cachedir = '/tmp/repomd-cache' -compsname = 'comps.xml' +cachedir = '/tmp/repomd-cache' # UNUSED: copied from extras-sign-move.py +compsname = 'comps.xml' # UNUSED: copied from extras-sign-move.py project_hr = 'Fedora Extras' mail_from = 'buildsys at fedoraproject.org' @@ -42,7 +43,7 @@ mail_footer = """ For more information about the built packages please see the repository -or the fedora Info Feed: http://fedoraproject.org/infofeed/ +or the Fedora Info Feed: http://fedoraproject.org/infofeed/ """ smtp_server = '' @@ -117,7 +118,7 @@ self.rc = fcntl.flock(self.file, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError: print 'ERROR: script locked via lockfile %s - it seems to be running already' % self.name - sys.exit(11) + sys.exit(errno.EAGAIN) def unlock(self): @@ -148,7 +149,7 @@ def emptyrunfile(dist): runfilename = getrunfilename(dist) - if not os.path.isfile(runfilename): + if not os.path.exists(runfilename): return try: os.remove(runfilename) @@ -484,12 +485,12 @@ if opts.gidcheck: if os.getgid() != signersgid: print 'ERROR: Change into extras_signers group before running this! Use "newgrp extras_signers".' - sys.exit(13) + sys.exit(errno.EPERM) if opts.signkeycheck: if 'extras at fedoraproject.org' != os.popen('rpm --eval %_gpg_name','r').read().rstrip(): print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!' - sys.exit(13) + sys.exit(errno.EPERM) if opts.setumask: os.umask(0002) @@ -500,7 +501,7 @@ if len(sys.argv) < 2: print 'SYNTAX: %s [dist]...' % sys.argv[0] - sys.exit(22) + sys.exit(errno.EINVAL) dists = [] # the list of distribution release we want to push for d in sys.argv[1:]: @@ -514,11 +515,6 @@ dists.append(d) debugprint(dists) - # If we are called as 'extras-sign-move.py' we simulate old - # behaviour and only do: sign, move, repobuild, sync - if sys.argv[0].endswith('extras-sign-move.py'): - opts.repoview = False - if not os.path.exists(rundir): os.makedirs(rundir) From fedora-extras-commits at redhat.com Fri May 19 12:31:56 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Fri, 19 May 2006 05:31:56 -0700 Subject: status-report-scripts parseBZbugList,1.34,1.35 Message-ID: <200605191231.k4JCVuTA029616@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29598 Modified Files: parseBZbugList Log Message: Colorize 25 top submitters. Fix an off by 1 bug. Change some wording. Index: parseBZbugList =================================================================== RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- parseBZbugList 12 May 2006 21:06:59 -0000 1.34 +++ parseBZbugList 19 May 2006 12:31:53 -0000 1.35 @@ -759,8 +759,10 @@ print "\n\n== About FE-ACCEPT packages ==\n"; print "\n\n=== Package count ===\n"; print "\nWe have $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n"; - print "\n=== Top 10 BZ review requests submitters ===\n"; - &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT, undef); + print "\n=== Top 25 BZ review requests submitters ===\n"; + print "Sponsors are highlighted in green.\n"; + &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, + \%BZOWN_CNT, undef, 25, 1); print "\n=== Top 25 BZ review requests reviewers ===\n"; print "Sponsors are highlighted in green.\n"; &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, @@ -776,7 +778,7 @@ "find the package in the owners file:\n"; &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ, 5); } - if ($COUNT_LIST{"acceptOpenInactive"} >= 0) { + if ($COUNT_LIST{"acceptOpenInactive"} > 0) { print "\n\n=== Inactivity notice ===\n"; print "\nWe have $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks\n"; &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ, 5); @@ -801,7 +803,7 @@ print STDERR " - $COUNT_LIST{'missingOwner'} accepted, closed package reviews not in owners\n"; } - if ($COUNT_LIST{"acceptOpenInactive"} >= 0) { + if ($COUNT_LIST{"acceptOpenInactive"} > 0) { print STDERR " - $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks;\n"; } @@ -836,7 +838,7 @@ } $BUG_LIST{"acceptOpenInDevel"} = \@BL; $BUG_LIST{"acceptOpenInactive"} = \@LATE; - $COUNT_LIST{"acceptOpenInactive"} = $#LATE; + $COUNT_LIST{"acceptOpenInactive"} = $#LATE + 1; } sub countOpen { @@ -1085,8 +1087,8 @@ print join("\n", @A), "}}}\n"; } if ($COUNT_LIST{'CVSinCore'} > 0) { - print "\n=== Packages appearing in Core but still present in CVS devel ===\n"; - print "\nWe have $COUNT_LIST{'CVSinCore'} packages in CVS devel which appear to have moved to Core: {{{\n"; + print "\n=== Packages appearing in Core and also present in CVS devel ===\n"; + print "\nWe have $COUNT_LIST{'CVSinCore'} packages in CVS devel which appear to have moved to/from Core: {{{\n"; my $a = $PKG_LIST{"CVSinCore"}; print join("\n", @$a), "}}}\n"; } From fedora-extras-commits at redhat.com Fri May 19 13:14:15 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 19 May 2006 06:14:15 -0700 Subject: rpms/tinyerp/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.5, 1.6 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.16, 1.17 tinyerp-server-pidlog.patch, 1.1, NONE Message-ID: <200605191314.k4JDEHjm032086@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32051 Modified Files: .cvsignore sources tinyerp-client.patch tinyerp-server.patch tinyerp.desktop tinyerp.spec Removed Files: tinyerp-server-pidlog.patch Log Message: - updated to upstream version 3.3.0 - updated the client and server patches - removed the pidlog patch as it was integrated upstream - unified the spec file for FC < 5 and FC >= 5 - used a new icon in the desktop file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 13:56:00 -0000 1.6 +++ .cvsignore 19 May 2006 13:14:15 -0000 1.7 @@ -1,2 +1,2 @@ -tinyerp-client-3.2.1.tgz -tinyerp-server-3.2.1.tgz +tinyerp-client-3.3.0.tar.gz +tinyerp-server-3.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 13:56:00 -0000 1.6 +++ sources 19 May 2006 13:14:15 -0000 1.7 @@ -1,2 +1,2 @@ -5e588d39d139f6b66c9f66e59e089d4c tinyerp-client-3.2.1.tgz -4acbbd8e8fac798ea3e9da08e076b465 tinyerp-server-3.2.1.tgz +93364c3aae7c64dd71ced12133a16574 tinyerp-client-3.3.0.tar.gz +ece14c707f91f2b5b4b46906899e6d9d tinyerp-server-3.3.0.tar.gz tinyerp-client.patch: Index: tinyerp-client.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-client.patch 30 Jan 2006 13:56:00 -0000 1.4 +++ tinyerp-client.patch 19 May 2006 13:14:15 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py ---- client.orig/bin/tinyerp-client.py 2006-01-27 11:50:28.000000000 +0100 -+++ client/bin/tinyerp-client.py 2006-01-30 14:22:52.000000000 +0100 +diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py +--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py 2006-05-18 18:06:39.000000000 +0200 ++++ tinyerp-client-3.3.0/bin/tinyerp-client.py 2006-05-19 13:15:25.000000000 +0200 @@ -73,14 +73,13 @@ import pango @@ -20,15 +20,3 @@ import options -diff -Nru client.orig/setup.py client/setup.py ---- client.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ client/setup.py 2006-01-30 14:22:58.000000000 +0100 -@@ -18,7 +18,7 @@ - opj = os.path.join - - name = 'tinyerp-client' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyerp-server.patch 18 Mar 2006 14:09:22 -0000 1.5 +++ tinyerp-server.patch 19 May 2006 13:14:15 -0000 1.6 @@ -1,23 +1,27 @@ -diff -Nru server.orig/setup.py server/setup.py ---- server.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ server/setup.py 2006-01-30 14:23:25.000000000 +0100 -@@ -21,14 +21,16 @@ - opj = os.path.join +diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py +--- tinyerp-server-3.3.0.orig/setup.py 2006-05-19 10:56:54.000000000 +0200 ++++ tinyerp-server-3.3.0/setup.py 2006-05-19 13:21:04.000000000 +0200 +@@ -28,11 +28,18 @@ - name = 'tinyerp-server' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] - --included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter', -+included_addons = ['account', 'audittrail', 'base', 'base_partner_relation', -+ 'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter', - 'marketing', 'mrp', -- 'network', 'product', 'project', 'purchase', 'sale', -+ 'network', 'product', 'product_electronic', 'product_expiry', -+ 'project', 'purchase', 'sale', 'scrum', - 'stock', 'subscription'] + included_addons = [ + 'account', 'account_followup', 'airport', 'audittrail', +- 'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale', +- 'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce', +- 'product','product_electronic', 'product_expiry', 'product_extended', +- 'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum', +- 'stock', 'subscription', 'travel', ++ 'base','base_partner_relation', ++ 'crm', 'custom', ++ 'delivery', ++ 'edi', 'esale', ++ 'hr', 'hr_timesheet', 'hr_timesheet_project', ++ 'letter', ++ 'marketing', 'mrp', ++ 'network', ++ 'oscommerce', ++ 'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase', ++ 'sale', 'sandwich', 'scrum', 'stock', 'subscription', ++ 'travel', + 'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',] required_modules = [('psycopg', 'PostgreSQL module'), Index: tinyerp.desktop =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp.desktop 20 Nov 2005 18:25:32 -0000 1.2 +++ tinyerp.desktop 19 May 2006 13:14:15 -0000 1.3 @@ -4,7 +4,7 @@ GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client -Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png +Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png StartupNotify=true Terminal=false Type=Application Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tinyerp.spec 18 Mar 2006 14:09:22 -0000 1.16 +++ tinyerp.spec 19 May 2006 13:14:15 -0000 1.17 @@ -1,15 +1,33 @@ +#### options: +# Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 +%define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif + %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: tinyerp -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org -Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz -Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz +Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz +Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop Source3: tinyerp-server.conf Source4: tinyerp-server @@ -19,11 +37,16 @@ BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python, pydot BuildRequires: desktop-file-utils +%if %_modular_X BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base +%define _xvfb /usr/bin/Xvfb +%else +BuildRequires: xorg-x11-Xvfb +%define _xvfb /usr/X11R6/bin/Xvfb +%endif Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch -Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -51,22 +74,20 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 -%patch2 %build -cd client -mv bin/po/cz.po bin/po/cs.po -/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT -cd client -/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client @@ -79,7 +100,7 @@ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client -for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do +for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/tinyerp-client/$i $i done @@ -139,6 +160,12 @@ %changelog +* Fri May 19 2006 Dan Horak 3.3.0-1 +- update to upstream tinyerp 3.3.0 +- the pidlog patch was integrated into upstream +- unified the specfile for FC < 5 and FC >=5 +- used new icon in the desktop file + * Sat Mar 18 2006 Dan Horak 3.2.1-3 - new config file with only default values (#184505) - added a patch for handling the pid and log file in the server (#184502) --- tinyerp-server-pidlog.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 13:27:30 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 19 May 2006 06:27:30 -0700 Subject: rpms/tinyerp/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.5, 1.6 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.16, 1.17 tinyerp-server-pidlog.patch, 1.1, NONE Message-ID: <200605191327.k4JDRWvN032240@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32207 Modified Files: .cvsignore sources tinyerp-client.patch tinyerp-server.patch tinyerp.desktop tinyerp.spec Removed Files: tinyerp-server-pidlog.patch Log Message: - updated to upstream version 3.3.0 - updated the client and server patches - removed the pidlog patch as it was integrated upstream - unified the spec file for FC < 5 and FC >= 5 - used a new icon in the desktop file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 13:56:00 -0000 1.6 +++ .cvsignore 19 May 2006 13:27:30 -0000 1.7 @@ -1,2 +1,2 @@ -tinyerp-client-3.2.1.tgz -tinyerp-server-3.2.1.tgz +tinyerp-client-3.3.0.tar.gz +tinyerp-server-3.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 13:56:00 -0000 1.6 +++ sources 19 May 2006 13:27:30 -0000 1.7 @@ -1,2 +1,2 @@ -5e588d39d139f6b66c9f66e59e089d4c tinyerp-client-3.2.1.tgz -4acbbd8e8fac798ea3e9da08e076b465 tinyerp-server-3.2.1.tgz +93364c3aae7c64dd71ced12133a16574 tinyerp-client-3.3.0.tar.gz +ece14c707f91f2b5b4b46906899e6d9d tinyerp-server-3.3.0.tar.gz tinyerp-client.patch: Index: tinyerp-client.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-client.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-client.patch 30 Jan 2006 13:56:00 -0000 1.4 +++ tinyerp-client.patch 19 May 2006 13:27:30 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py ---- client.orig/bin/tinyerp-client.py 2006-01-27 11:50:28.000000000 +0100 -+++ client/bin/tinyerp-client.py 2006-01-30 14:22:52.000000000 +0100 +diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py +--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py 2006-05-18 18:06:39.000000000 +0200 ++++ tinyerp-client-3.3.0/bin/tinyerp-client.py 2006-05-19 13:15:25.000000000 +0200 @@ -73,14 +73,13 @@ import pango @@ -20,15 +20,3 @@ import options -diff -Nru client.orig/setup.py client/setup.py ---- client.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ client/setup.py 2006-01-30 14:22:58.000000000 +0100 -@@ -18,7 +18,7 @@ - opj = os.path.join - - name = 'tinyerp-client' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyerp-server.patch 18 Mar 2006 14:43:35 -0000 1.5 +++ tinyerp-server.patch 19 May 2006 13:27:30 -0000 1.6 @@ -1,23 +1,27 @@ -diff -Nru server.orig/setup.py server/setup.py ---- server.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ server/setup.py 2006-01-30 14:23:25.000000000 +0100 -@@ -21,14 +21,16 @@ - opj = os.path.join +diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py +--- tinyerp-server-3.3.0.orig/setup.py 2006-05-19 10:56:54.000000000 +0200 ++++ tinyerp-server-3.3.0/setup.py 2006-05-19 13:21:04.000000000 +0200 +@@ -28,11 +28,18 @@ - name = 'tinyerp-server' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] - --included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter', -+included_addons = ['account', 'audittrail', 'base', 'base_partner_relation', -+ 'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter', - 'marketing', 'mrp', -- 'network', 'product', 'project', 'purchase', 'sale', -+ 'network', 'product', 'product_electronic', 'product_expiry', -+ 'project', 'purchase', 'sale', 'scrum', - 'stock', 'subscription'] + included_addons = [ + 'account', 'account_followup', 'airport', 'audittrail', +- 'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale', +- 'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce', +- 'product','product_electronic', 'product_expiry', 'product_extended', +- 'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum', +- 'stock', 'subscription', 'travel', ++ 'base','base_partner_relation', ++ 'crm', 'custom', ++ 'delivery', ++ 'edi', 'esale', ++ 'hr', 'hr_timesheet', 'hr_timesheet_project', ++ 'letter', ++ 'marketing', 'mrp', ++ 'network', ++ 'oscommerce', ++ 'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase', ++ 'sale', 'sandwich', 'scrum', 'stock', 'subscription', ++ 'travel', + 'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',] required_modules = [('psycopg', 'PostgreSQL module'), Index: tinyerp.desktop =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp.desktop 20 Nov 2005 18:25:32 -0000 1.2 +++ tinyerp.desktop 19 May 2006 13:27:30 -0000 1.3 @@ -4,7 +4,7 @@ GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client -Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png +Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png StartupNotify=true Terminal=false Type=Application Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tinyerp.spec 18 Mar 2006 14:43:35 -0000 1.16 +++ tinyerp.spec 19 May 2006 13:27:30 -0000 1.17 @@ -1,15 +1,33 @@ +#### options: +# Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 +%define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif + %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: tinyerp -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org -Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz -Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz +Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz +Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop Source3: tinyerp-server.conf Source4: tinyerp-server @@ -19,11 +37,16 @@ BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python, pydot BuildRequires: desktop-file-utils +%if %_modular_X BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base +%define _xvfb /usr/bin/Xvfb +%else +BuildRequires: xorg-x11-Xvfb +%define _xvfb /usr/X11R6/bin/Xvfb +%endif Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch -Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -51,22 +74,20 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 -%patch2 %build -cd client -mv bin/po/cz.po bin/po/cs.po -/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT -cd client -/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client @@ -79,7 +100,7 @@ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client -for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do +for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/tinyerp-client/$i $i done @@ -139,6 +160,12 @@ %changelog +* Fri May 19 2006 Dan Horak 3.3.0-1 +- update to upstream tinyerp 3.3.0 +- the pidlog patch was integrated into upstream +- unified the specfile for FC < 5 and FC >=5 +- used new icon in the desktop file + * Sat Mar 18 2006 Dan Horak 3.2.1-3 - new config file with only default values (#184505) - added a patch for handling the pid and log file in the server (#184502) --- tinyerp-server-pidlog.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 13:28:37 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 19 May 2006 06:28:37 -0700 Subject: rpms/tinyerp/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.6, 1.7 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.14, 1.15 tinyerp-server-pidlog.patch, 1.1, NONE Message-ID: <200605191328.k4JDSdOc032319@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32285 Modified Files: .cvsignore sources tinyerp-client.patch tinyerp-server.patch tinyerp.desktop tinyerp.spec Removed Files: tinyerp-server-pidlog.patch Log Message: - updated to upstream version 3.3.0 - updated the client and server patches - removed the pidlog patch as it was integrated upstream - unified the spec file for FC < 5 and FC >= 5 - used a new icon in the desktop file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 13:52:51 -0000 1.6 +++ .cvsignore 19 May 2006 13:28:37 -0000 1.7 @@ -1,2 +1,2 @@ -tinyerp-client-3.2.1.tgz -tinyerp-server-3.2.1.tgz +tinyerp-client-3.3.0.tar.gz +tinyerp-server-3.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 13:52:51 -0000 1.6 +++ sources 19 May 2006 13:28:37 -0000 1.7 @@ -1,2 +1,2 @@ -5e588d39d139f6b66c9f66e59e089d4c tinyerp-client-3.2.1.tgz -4acbbd8e8fac798ea3e9da08e076b465 tinyerp-server-3.2.1.tgz +93364c3aae7c64dd71ced12133a16574 tinyerp-client-3.3.0.tar.gz +ece14c707f91f2b5b4b46906899e6d9d tinyerp-server-3.3.0.tar.gz tinyerp-client.patch: Index: tinyerp-client.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-client.patch 30 Jan 2006 13:52:51 -0000 1.4 +++ tinyerp-client.patch 19 May 2006 13:28:37 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py ---- client.orig/bin/tinyerp-client.py 2006-01-27 11:50:28.000000000 +0100 -+++ client/bin/tinyerp-client.py 2006-01-30 14:22:52.000000000 +0100 +diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py +--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py 2006-05-18 18:06:39.000000000 +0200 ++++ tinyerp-client-3.3.0/bin/tinyerp-client.py 2006-05-19 13:15:25.000000000 +0200 @@ -73,14 +73,13 @@ import pango @@ -20,15 +20,3 @@ import options -diff -Nru client.orig/setup.py client/setup.py ---- client.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ client/setup.py 2006-01-30 14:22:58.000000000 +0100 -@@ -18,7 +18,7 @@ - opj = os.path.join - - name = 'tinyerp-client' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tinyerp-server.patch 18 Mar 2006 14:41:46 -0000 1.6 +++ tinyerp-server.patch 19 May 2006 13:28:37 -0000 1.7 @@ -1,23 +1,27 @@ -diff -Nru server.orig/setup.py server/setup.py ---- server.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ server/setup.py 2006-01-30 14:23:25.000000000 +0100 -@@ -21,14 +21,16 @@ - opj = os.path.join +diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py +--- tinyerp-server-3.3.0.orig/setup.py 2006-05-19 10:56:54.000000000 +0200 ++++ tinyerp-server-3.3.0/setup.py 2006-05-19 13:21:04.000000000 +0200 +@@ -28,11 +28,18 @@ - name = 'tinyerp-server' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] - --included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter', -+included_addons = ['account', 'audittrail', 'base', 'base_partner_relation', -+ 'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter', - 'marketing', 'mrp', -- 'network', 'product', 'project', 'purchase', 'sale', -+ 'network', 'product', 'product_electronic', 'product_expiry', -+ 'project', 'purchase', 'sale', 'scrum', - 'stock', 'subscription'] + included_addons = [ + 'account', 'account_followup', 'airport', 'audittrail', +- 'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale', +- 'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce', +- 'product','product_electronic', 'product_expiry', 'product_extended', +- 'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum', +- 'stock', 'subscription', 'travel', ++ 'base','base_partner_relation', ++ 'crm', 'custom', ++ 'delivery', ++ 'edi', 'esale', ++ 'hr', 'hr_timesheet', 'hr_timesheet_project', ++ 'letter', ++ 'marketing', 'mrp', ++ 'network', ++ 'oscommerce', ++ 'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase', ++ 'sale', 'sandwich', 'scrum', 'stock', 'subscription', ++ 'travel', + 'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',] required_modules = [('psycopg', 'PostgreSQL module'), Index: tinyerp.desktop =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp.desktop 20 Nov 2005 18:40:53 -0000 1.2 +++ tinyerp.desktop 19 May 2006 13:28:37 -0000 1.3 @@ -4,7 +4,7 @@ GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client -Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png +Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png StartupNotify=true Terminal=false Type=Application Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- tinyerp.spec 18 Mar 2006 14:41:46 -0000 1.14 +++ tinyerp.spec 19 May 2006 13:28:37 -0000 1.15 @@ -1,15 +1,33 @@ +#### options: +# Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 +%define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif + %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: tinyerp -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org -Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz -Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz +Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz +Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop Source3: tinyerp-server.conf Source4: tinyerp-server @@ -18,11 +36,17 @@ BuildArch: noarch BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python, pydot -BuildRequires: desktop-file-utils, xorg-x11-Xvfb +BuildRequires: desktop-file-utils +%if %_modular_X +BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base +%define _xvfb /usr/bin/Xvfb +%else +BuildRequires: xorg-x11-Xvfb +%define _xvfb /usr/X11R6/bin/Xvfb +%endif Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch -Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -50,23 +74,20 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 -%patch2 %build -cd client -# fix filename for the czech translation -mv bin/po/cz.po bin/po/cs.po -/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT -cd client -/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client @@ -79,7 +100,7 @@ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client -for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do +for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/tinyerp-client/$i $i done @@ -139,20 +160,35 @@ %changelog -* Sat Mar 18 2006 Dan Horak 3.2.1-2 +* Fri May 19 2006 Dan Horak 3.3.0-1 +- update to upstream tinyerp 3.3.0 +- the pidlog patch was integrated into upstream +- unified the specfile for FC < 5 and FC >=5 +- used new icon in the desktop file + +* Sat Mar 18 2006 Dan Horak 3.2.1-3 - new config file with only default values (#184505) - added a patch for handling the pid and log file in the server (#184502) +* Tue Feb 14 2006 Dan Horak 3.2.1-2 +- rebuild for Fedora Extras 5 + * Mon Jan 30 2006 Dan Horak 3.2.1-1 - update to upstream tinyerp 3.2.1 - fixed filename for the czech translation +* Wed Jan 25 2006 Dan Horak 3.2.0-2 +- add updated server patch + * Wed Jan 25 2006 Dan Horak 3.2.0-1 - update to upstream tinyerp 3.2.0 - fixed status function in the init.d script - fixed using localization for the client - include all distributed addons +* Wed Jan 4 2006 Dan Horak 3.1.1-6 +- added new Xorg dependencies + * Sun Dec 18 2005 Dan Horak 3.1.1-5 - added Requires(postun) to the -server package (Ville Skytt??) - improved startup script, suggested by Enrico Scholz --- tinyerp-server-pidlog.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 13:30:01 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 19 May 2006 06:30:01 -0700 Subject: rpms/tinyerp/FC-3 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.6, 1.7 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.12, 1.13 tinyerp-server-pidlog.patch, 1.1, NONE Message-ID: <200605191330.k4JDU3Dj032409@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32369 Modified Files: .cvsignore sources tinyerp-client.patch tinyerp-server.patch tinyerp.desktop tinyerp.spec Removed Files: tinyerp-server-pidlog.patch Log Message: - updated to upstream version 3.3.0 - updated the client and server patches - removed the pidlog patch as it was integrated upstream - unified the spec file for FC < 5 and FC >= 5 - used a new icon in the desktop file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 13:42:31 -0000 1.6 +++ .cvsignore 19 May 2006 13:30:01 -0000 1.7 @@ -1,2 +1,2 @@ -tinyerp-client-3.2.1.tgz -tinyerp-server-3.2.1.tgz +tinyerp-client-3.3.0.tar.gz +tinyerp-server-3.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 13:42:31 -0000 1.6 +++ sources 19 May 2006 13:30:01 -0000 1.7 @@ -1,2 +1,2 @@ -5e588d39d139f6b66c9f66e59e089d4c tinyerp-client-3.2.1.tgz -4acbbd8e8fac798ea3e9da08e076b465 tinyerp-server-3.2.1.tgz +93364c3aae7c64dd71ced12133a16574 tinyerp-client-3.3.0.tar.gz +ece14c707f91f2b5b4b46906899e6d9d tinyerp-server-3.3.0.tar.gz tinyerp-client.patch: Index: tinyerp-client.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-client.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-client.patch 30 Jan 2006 13:42:31 -0000 1.4 +++ tinyerp-client.patch 19 May 2006 13:30:01 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py ---- client.orig/bin/tinyerp-client.py 2006-01-27 11:50:28.000000000 +0100 -+++ client/bin/tinyerp-client.py 2006-01-30 14:22:52.000000000 +0100 +diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py +--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py 2006-05-18 18:06:39.000000000 +0200 ++++ tinyerp-client-3.3.0/bin/tinyerp-client.py 2006-05-19 13:15:25.000000000 +0200 @@ -73,14 +73,13 @@ import pango @@ -20,15 +20,3 @@ import options -diff -Nru client.orig/setup.py client/setup.py ---- client.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ client/setup.py 2006-01-30 14:22:58.000000000 +0100 -@@ -18,7 +18,7 @@ - opj = os.path.join - - name = 'tinyerp-client' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tinyerp-server.patch 18 Mar 2006 14:39:57 -0000 1.6 +++ tinyerp-server.patch 19 May 2006 13:30:01 -0000 1.7 @@ -1,23 +1,27 @@ -diff -Nru server.orig/setup.py server/setup.py ---- server.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ server/setup.py 2006-01-30 14:23:25.000000000 +0100 -@@ -21,14 +21,16 @@ - opj = os.path.join +diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py +--- tinyerp-server-3.3.0.orig/setup.py 2006-05-19 10:56:54.000000000 +0200 ++++ tinyerp-server-3.3.0/setup.py 2006-05-19 13:21:04.000000000 +0200 +@@ -28,11 +28,18 @@ - name = 'tinyerp-server' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] - --included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter', -+included_addons = ['account', 'audittrail', 'base', 'base_partner_relation', -+ 'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter', - 'marketing', 'mrp', -- 'network', 'product', 'project', 'purchase', 'sale', -+ 'network', 'product', 'product_electronic', 'product_expiry', -+ 'project', 'purchase', 'sale', 'scrum', - 'stock', 'subscription'] + included_addons = [ + 'account', 'account_followup', 'airport', 'audittrail', +- 'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale', +- 'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce', +- 'product','product_electronic', 'product_expiry', 'product_extended', +- 'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum', +- 'stock', 'subscription', 'travel', ++ 'base','base_partner_relation', ++ 'crm', 'custom', ++ 'delivery', ++ 'edi', 'esale', ++ 'hr', 'hr_timesheet', 'hr_timesheet_project', ++ 'letter', ++ 'marketing', 'mrp', ++ 'network', ++ 'oscommerce', ++ 'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase', ++ 'sale', 'sandwich', 'scrum', 'stock', 'subscription', ++ 'travel', + 'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',] required_modules = [('psycopg', 'PostgreSQL module'), Index: tinyerp.desktop =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp.desktop 27 Nov 2005 09:26:58 -0000 1.2 +++ tinyerp.desktop 19 May 2006 13:30:01 -0000 1.3 @@ -4,7 +4,7 @@ GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client -Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png +Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png StartupNotify=true Terminal=false Type=Application Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- tinyerp.spec 18 Mar 2006 14:39:57 -0000 1.12 +++ tinyerp.spec 19 May 2006 13:30:01 -0000 1.13 @@ -1,15 +1,33 @@ +#### options: +# Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 +%define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif + %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: tinyerp -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org -Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz -Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz +Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz +Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop Source3: tinyerp-server.conf Source4: tinyerp-server @@ -18,11 +36,17 @@ BuildArch: noarch BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python, pydot -BuildRequires: desktop-file-utils, xorg-x11-Xvfb +BuildRequires: desktop-file-utils +%if %_modular_X +BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base +%define _xvfb /usr/bin/Xvfb +%else +BuildRequires: xorg-x11-Xvfb +%define _xvfb /usr/X11R6/bin/Xvfb +%endif Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch -Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -50,23 +74,20 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 -%patch2 %build -cd client -# fix filename for the czech translation -mv bin/po/cz.po bin/po/cs.po -/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT -cd client -/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client @@ -79,7 +100,7 @@ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client -for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do +for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/tinyerp-client/$i $i done @@ -139,20 +160,35 @@ %changelog -* Sat Mar 18 2006 Dan Horak 3.2.1-2 +* Fri May 19 2006 Dan Horak 3.3.0-1 +- update to upstream tinyerp 3.3.0 +- the pidlog patch was integrated into upstream +- unified the specfile for FC < 5 and FC >=5 +- used new icon in the desktop file + +* Sat Mar 18 2006 Dan Horak 3.2.1-3 - new config file with only default values (#184505) - added a patch for handling the pid and log file in the server (#184502) +* Tue Feb 14 2006 Dan Horak 3.2.1-2 +- rebuild for Fedora Extras 5 + * Mon Jan 30 2006 Dan Horak 3.2.1-1 - update to upstream tinyerp 3.2.1 - fixed filename for the czech translation +* Wed Jan 25 2006 Dan Horak 3.2.0-2 +- add updated server patch + * Wed Jan 25 2006 Dan Horak 3.2.0-1 - update to upstream tinyerp 3.2.0 - fixed status function in the init.d script - fixed using localization for the client - include all distributed addons +* Wed Jan 4 2006 Dan Horak 3.1.1-6 +- added new Xorg dependencies + * Sun Dec 18 2005 Dan Horak 3.1.1-5 - added Requires(postun) to the -server package (Ville Skytt??) - improved startup script, suggested by Enrico Scholz --- tinyerp-server-pidlog.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 13:51:39 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 19 May 2006 06:51:39 -0700 Subject: rpms/mercurial/FC-5 mercurial.spec,1.9,1.10 sources,1.7,1.8 Message-ID: <200605191351.k4JDpfTw032562@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32543 Modified Files: mercurial.spec sources Log Message: * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-5/mercurial.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mercurial.spec 10 Apr 2006 19:20:57 -0000 1.9 +++ mercurial.spec 19 May 2006 13:51:39 -0000 1.10 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.8.1 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -44,6 +44,9 @@ %changelog +* Fri May 12 2006 Mihai Ibanescu - 0.9-1 +- update to 0.9 + * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 19:20:57 -0000 1.7 +++ sources 19 May 2006 13:51:39 -0000 1.8 @@ -1 +1 @@ -ffa37810cf9c48608f5172a622bef2f5 mercurial-0.8.1.tar.gz +d4154d12dcbda78251750c2a18eae940 mercurial-0.9.tar.gz From fedora-extras-commits at redhat.com Fri May 19 13:56:44 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 19 May 2006 06:56:44 -0700 Subject: rpms/mercurial/FC-4 mercurial.spec,1.6,1.7 sources,1.7,1.8 Message-ID: <200605191356.k4JDukGV032644@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32625 Modified Files: mercurial.spec sources Log Message: * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mercurial.spec 10 Apr 2006 19:21:11 -0000 1.6 +++ mercurial.spec 19 May 2006 13:56:44 -0000 1.7 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.8.1 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -44,6 +44,9 @@ %changelog +* Fri May 12 2006 Mihai Ibanescu - 0.9-1 +- update to 0.9 + * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 19:21:11 -0000 1.7 +++ sources 19 May 2006 13:56:44 -0000 1.8 @@ -1 +1 @@ -ffa37810cf9c48608f5172a622bef2f5 mercurial-0.8.1.tar.gz +d4154d12dcbda78251750c2a18eae940 mercurial-0.9.tar.gz From fedora-extras-commits at redhat.com Fri May 19 14:00:02 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:00:02 -0700 Subject: rpms/isic - New directory Message-ID: <200605191400.k4JE04ib000301@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32736/isic Log Message: Directory /cvs/extras/rpms/isic added to the repository From fedora-extras-commits at redhat.com Fri May 19 14:00:02 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:00:02 -0700 Subject: rpms/isic/devel - New directory Message-ID: <200605191400.k4JE04jn000306@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32736/isic/devel Log Message: Directory /cvs/extras/rpms/isic/devel added to the repository From fedora-extras-commits at redhat.com Fri May 19 14:00:51 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:00:51 -0700 Subject: rpms/isic Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605191400.k4JE0r25000375@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv342 Added Files: Makefile import.log Log Message: Setup of module isic --- NEW FILE Makefile --- # Top level Makefile for module isic all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 19 14:00:51 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:00:51 -0700 Subject: rpms/isic/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605191400.k4JE0rSH000378@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv342/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module isic --- NEW 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 May 19 14:02:13 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:02:13 -0700 Subject: rpms/isic import.log,1.1,1.2 Message-ID: <200605191402.k4JE2kHV002696@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2656 Modified Files: import.log Log Message: auto-import isic-0.06-2 on branch devel from isic-0.06-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/isic/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 May 2006 14:00:50 -0000 1.1 +++ import.log 19 May 2006 14:02:13 -0000 1.2 @@ -0,0 +1 @@ +isic-0_06-2:HEAD:isic-0.06-2.src.rpm:1148047311 From fedora-extras-commits at redhat.com Fri May 19 14:02:17 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:02:17 -0700 Subject: rpms/isic/devel isic-0.06-gcc4.patch, NONE, 1.1 isic-0.06-make.patch, NONE, 1.1 isic.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605191402.k4JE2oEO002698@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2656/devel Modified Files: .cvsignore sources Added Files: isic-0.06-gcc4.patch isic-0.06-make.patch isic.spec Log Message: auto-import isic-0.06-2 on branch devel from isic-0.06-2.src.rpm isic-0.06-gcc4.patch: --- NEW FILE isic-0.06-gcc4.patch --- diff -urNad isic-0.06~/icmpsic.c isic-0.06/icmpsic.c --- isic-0.06~/icmpsic.c 2004-11-06 21:11:11.000000000 +0100 +++ isic-0.06/icmpsic.c 2005-10-18 00:29:41.000000000 +0200 @@ -265,7 +265,7 @@ payload = (short int *)((u_char *) icmp + 4); for(cx = 0; cx <= (payload_s >> 1); cx+=1) - (u_short) payload[cx] = rand() & 0xffff; + payload[cx] = rand() & 0xffff; if ( rand() <= (RAND_MAX * ICMPCksm) ) diff -urNad isic-0.06~/isic.c isic-0.06/isic.c --- isic-0.06~/isic.c 2004-11-06 21:11:14.000000000 +0100 +++ isic-0.06/isic.c 2005-10-18 00:29:41.000000000 +0200 @@ -229,8 +229,8 @@ payload = (short int *)(buf + IP_H); for(cx = 0; cx <= (payload_s >> 1); cx+=1) - (u_int16_t) payload[cx] = rand() & 0xffff; - (u_int16_t) payload[payload_s] = rand() & 0xffff; + payload[cx] = rand() & 0xffff; + payload[payload_s] = rand() & 0xffff; if ( printout ) { printf("%s ->", diff -urNad isic-0.06~/tcpsic.c isic-0.06/tcpsic.c --- isic-0.06~/tcpsic.c 2004-11-06 21:11:16.000000000 +0100 +++ isic-0.06/tcpsic.c 2005-10-18 00:29:41.000000000 +0200 @@ -317,7 +317,7 @@ payload = (short int *)((u_char *) tcp + 20); for(cx = 0; cx <= (payload_s >> 1); cx+=1) - (u_int16_t) payload[cx] = rand() & 0xffff; + payload[cx] = rand() & 0xffff; if ( rand() <= (RAND_MAX * TCPCksm) ) libnet_do_checksum(l, (u_int8_t *)buf, IPPROTO_TCP, (tcp->th_off << 2) diff -urNad isic-0.06~/udpsic.c isic-0.06/udpsic.c --- isic-0.06~/udpsic.c 2004-11-06 21:11:20.000000000 +0100 +++ isic-0.06/udpsic.c 2005-10-18 00:29:41.000000000 +0200 @@ -292,7 +292,7 @@ payload = (short int *)((u_char *) udp + UDP_H); for(cx = 0; cx <= (payload_s >> 1); cx+=1) - (u_int16_t) payload[cx] = rand() & 0xffff; + payload[cx] = rand() & 0xffff; if ( printout ) { printf("%s,%i ->", isic-0.06-make.patch: --- NEW FILE isic-0.06-make.patch --- --- Makefile.in.orig 2006-05-18 14:43:37.000000000 -0400 +++ Makefile.in 2006-05-18 14:48:07.000000000 -0400 @@ -2,7 +2,7 @@ # To build for Trinux, add '-static' to LDFLAGS # and 'strip *sic' after they compile -PREFIX ?= /usr/local +PREFIX ?= @prefix@ CC = @CC@ DEFS = @DEFS@ `libnet-config --defines` @@ -48,5 +48,5 @@ tar -czvf isic-$(VERSION).tgz isic-$(VERSION)/* ) install: $(BINS) - $(INSTALL) -m 0755 -d ${PREFIX}/bin - $(INSTALL) -m 0755 -c $(BINS) ${PREFIX}/bin + $(INSTALL) -m 0755 -d $(DESTDIR)${PREFIX}/bin + $(INSTALL) -m 0755 -c $(BINS) $(DESTDIR)${PREFIX}/bin --- NEW FILE isic.spec --- Name: isic Version: 0.06 Release: 2%{?dist} Summary: IP Stack Integrity Checker Group: Applications/Internet License: BSD Url: http://www.packetfactory.net/projects/ISIC/ Source0: http://www.packetfactory.net/projects/ISIC/%{name}-%{version}.tgz Patch1: isic-0.06-gcc4.patch Patch2: isic-0.06-make.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libnet >= 1.1.0 BuildRequires: libnet-devel >= 1.1.0 %description ISIC is a suite of utilities to exercise the stability of an IP Stack and its component stacks (TCP, UDP, ICMP et. al.) It generates piles of pseudo random packets of the target protocol. The packets be given tendancies to conform to. Ie 50% of the packets generated can have IP Options. 25% of the packets can be IP fragments... But the percentages are arbitrary and most of the packet fields have a configurable tendancy. The packets are then sent against the target machine to either penetrate its firewall rules or find bugs in the IP stack. ISIC also contains a utility generate raw ether frames to examine hardware implementations. %prep %setup -q %patch1 -p1 -b .gcc4 %patch2 -p0 -b .make chmod 644 wrapper.sh %build %configure --prefix=/usr --libdir=/usr/%{_lib} --mandir=/usr/share/man make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/esic %{_bindir}/icmpsic %{_bindir}/isic %{_bindir}/tcpsic %{_bindir}/udpsic %doc README ChangeLog INSTALL wrapper.sh %changelog * Thu May 18 2006 Jarod Wilson 0.06-2 - make wrapper.sh chmod 644 * Thu May 18 2006 Jarod Wilson 0.06-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/isic/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 May 2006 14:00:51 -0000 1.1 +++ .cvsignore 19 May 2006 14:02:17 -0000 1.2 @@ -0,0 +1 @@ +isic-0.06.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/isic/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 May 2006 14:00:51 -0000 1.1 +++ sources 19 May 2006 14:02:17 -0000 1.2 @@ -0,0 +1 @@ +289304088b6bd34008449ec20b3af423 isic-0.06.tgz From fedora-extras-commits at redhat.com Fri May 19 14:12:07 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:12:07 -0700 Subject: owners owners.list,1.1021,1.1022 Message-ID: <200605191412.k4JECAR3002815@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796 Modified Files: owners.list Log Message: Add isic to list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1021 retrieving revision 1.1022 diff -u -r1.1021 -r1.1022 --- owners.list 18 May 2006 20:20:22 -0000 1.1021 +++ owners.list 19 May 2006 14:12:07 -0000 1.1022 @@ -535,6 +535,7 @@ Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|ircd-hybrid|Internet Relay Chat Server|eric.tanguy at univ-nantes.fr|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|isic|IP Stack Integrity Checker|jwilson at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|istanbul|Desktop Session Recorder|jspaleta at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|itcl|Object oriented extension to Tcl|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|itext|A Free Java-PDF library|green at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 19 15:44:02 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 19 May 2006 08:44:02 -0700 Subject: rpms/galago-daemon/devel galago-daemon.spec,1.1,1.2 Message-ID: <200605191544.k4JFi4lK005499@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5480 Modified Files: galago-daemon.spec Log Message: * Fri May 19 2006 Brian Pepple - 0.5.0-3 - Bump. Index: galago-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/devel/galago-daemon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- galago-daemon.spec 18 May 2006 19:35:03 -0000 1.1 +++ galago-daemon.spec 19 May 2006 15:44:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: galago-daemon Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Galago presence daemon Group: System Environment/Daemons @@ -45,6 +45,9 @@ %changelog +* Fri May 19 2006 Brian Pepple - 0.5.0-3 +- Bump. + * Thu May 18 2006 Brian Pepple - 0.5.0-2 - Mark file as %%config. From fedora-extras-commits at redhat.com Fri May 19 16:11:10 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Fri, 19 May 2006 09:11:10 -0700 Subject: owners owners.list,1.1022,1.1023 Message-ID: <200605191611.k4JGBCkr007970@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7953 Modified Files: owners.list Log Message: Changed my email address (also done in bugzilla) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1022 retrieving revision 1.1023 diff -u -r1.1022 -r1.1023 --- owners.list 19 May 2006 14:12:07 -0000 1.1022 +++ owners.list 19 May 2006 16:11:10 -0000 1.1023 @@ -159,7 +159,7 @@ Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org| -Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org| +Fedora Extras|conserver|Serial console server daemon/client|jima at beer.tclug.org|extras-qa at fedoraproject.org| Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|contacts|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org| @@ -216,7 +216,7 @@ Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com -Fedora Extras|dnsmasq|A lightweight DHCP/caching DNS server|jima at auroralinux.org|extras-qa at fedoraproject.org| +Fedora Extras|dnsmasq|A lightweight DHCP/caching DNS server|jima at beer.tclug.org|extras-qa at fedoraproject.org| Fedora Extras|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|doctorj|Java source code analyzer|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org| @@ -1649,7 +1649,7 @@ Fedora Extras|uw-imap|UW Server daemons for IMAP and POP network mail protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at auroralinux.org|extras-qa at fedoraproject.org| +Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at beer.tclug.org|extras-qa at fedoraproject.org| Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 19 16:12:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 19 May 2006 09:12:42 -0700 Subject: rpms/rogue/FC-5 rogue-5.4-setgid.patch,1.1,1.2 rogue.spec,1.4,1.5 Message-ID: <200605191613.k4JGDEK6008024@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7976/FC-5 Modified Files: rogue-5.4-setgid.patch rogue.spec Log Message: - Added empty initial scoreboard file. - Better setuid/setgid handling (BZ #187392) rogue-5.4-setgid.patch: Index: rogue-5.4-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/rogue/FC-5/rogue-5.4-setgid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue-5.4-setgid.patch 11 Apr 2006 02:04:46 -0000 1.1 +++ rogue-5.4-setgid.patch 19 May 2006 16:12:41 -0000 1.2 @@ -1,6 +1,6 @@ -diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c +diff -Naur rogue/extern.c rogue.new/extern.c --- rogue/extern.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/extern.c 2006-03-30 13:24:12.000000000 -0800 ++++ rogue.new/extern.c 2006-05-15 15:43:43.000000000 -0700 @@ -111,7 +111,7 @@ }; @@ -10,9 +10,9 @@ int food_left; /* Amount of food in hero's stomach */ int lastscore = -1; /* Score before this turn */ int no_command = 0; /* Number of turns asleep */ -diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h ---- rogue/extern.h 2006-03-19 11:22:14.000000000 -0800 -+++ rogue.new/extern.h 2006-03-30 13:24:22.000000000 -0800 +diff -Naur rogue/extern.h rogue.new/extern.h +--- rogue/extern.h 2006-05-15 15:43:15.000000000 -0700 ++++ rogue.new/extern.h 2006-05-15 15:43:43.000000000 -0700 @@ -50,7 +50,7 @@ extern char fruit[], orig_dsusp, prbuf[], whoami[]; @@ -22,9 +22,9 @@ #ifdef TIOCGLTC extern struct ltchars ltc; -diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c +diff -Naur rogue/mach_dep.c rogue.new/mach_dep.c --- rogue/mach_dep.c 2006-01-30 08:36:21.000000000 -0800 -+++ rogue.new/mach_dep.c 2006-04-01 19:26:15.000000000 -0800 ++++ rogue.new/mach_dep.c 2006-05-15 15:43:43.000000000 -0700 @@ -45,7 +45,9 @@ #include #include @@ -87,9 +87,9 @@ md_normaluser(); } -diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c +diff -Naur rogue/main.c rogue.new/main.c --- rogue/main.c 2006-01-29 16:11:32.000000000 -0800 -+++ rogue.new/main.c 2006-03-30 13:40:16.000000000 -0800 ++++ rogue.new/main.c 2006-05-15 15:43:43.000000000 -0700 @@ -24,6 +24,13 @@ char *env; int lowtime; @@ -112,9 +112,9 @@ if (argc == 2) if (strcmp(argv[1], "-s") == 0) { -diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c +diff -Naur rogue/mdport.c rogue.new/mdport.c --- rogue/mdport.c 2006-01-29 18:24:39.000000000 -0800 -+++ rogue.new/mdport.c 2006-04-01 19:26:16.000000000 -0800 ++++ rogue.new/mdport.c 2006-05-15 15:45:21.000000000 -0700 @@ -193,8 +193,17 @@ md_normaluser() { @@ -135,7 +135,7 @@ #endif } -@@ -397,22 +406,31 @@ +@@ -397,22 +406,35 @@ char * md_getroguedir() { @@ -143,7 +143,11 @@ + static char path[PATH_MAX]; char *end,*home; - if ( (home = getenv("ROGUEHOME")) != NULL) +- if ( (home = getenv("ROGUEHOME")) != NULL) ++ /* Disable the use of ROGUEHOME to prevent users from ++ * maliciously overwriting save files from other setgid games. ++ */ ++ if ( (home = getenv("ROGUEHOME")) != NULL && 0) { if (*home) { @@ -156,30 +160,31 @@ - - if (directory_exists(path)) - return(path); -+ if (strlen(home) > PATH_MAX-20) { ++ /* The magic number 20 is used to guarantee that the save/lock ++ * filenames (which are much shorter than 20 characters) can ++ * be appended to this buffer. ++ */ ++ if (strlen(home) >= PATH_MAX-20) { + fprintf(stderr, "ROGUEHOME path is too long. Ignoring.\n"); + } else { -+ strncpy(path, home, PATH_MAX-20); -+ /* Ensure that we have a terminating NULL character. -+ */ -+ path[PATH_MAX-1] = (char)NULL; -+ -+ end = &path[strlen(path)-1]; -+ ++ strcpy(path, home); ++ ++ end = &path[strlen(path)-1]; ++ + /* Strip off any trailing path separators from the path. + */ -+ while( (end >= path) && ((*end == '/') || (*end == '\\'))) -+ *end-- = '\0'; -+ -+ if (directory_exists(path)) -+ return(path); ++ while( (end >= path) && ((*end == '/') || (*end == '\\'))) ++ *end-- = '\0'; ++ ++ if (directory_exists(path)) ++ return(path); + } } } -diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c +diff -Naur rogue/rip.c rogue.new/rip.c --- rogue/rip.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/rip.c 2006-03-30 13:32:17.000000000 -0800 ++++ rogue.new/rip.c 2006-05-15 15:43:43.000000000 -0700 @@ -60,7 +60,6 @@ int i; SCORE *sc2; @@ -239,9 +244,9 @@ } /* -diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c +diff -Naur rogue/save.c rogue.new/save.c --- rogue/save.c 2006-01-30 08:05:35.000000000 -0800 -+++ rogue.new/save.c 2006-03-30 13:33:45.000000000 -0800 ++++ rogue.new/save.c 2006-05-15 15:43:43.000000000 -0700 @@ -335,7 +335,40 @@ /* @@ -302,9 +307,9 @@ sscanf(scoreline, " %u %hu %u %hu %hu %lx \n", &top_ten[i].sc_uid, &top_ten[i].sc_score, &top_ten[i].sc_flags, &top_ten[i].sc_monster, -diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c +diff -Naur rogue/state.c rogue.new/state.c --- rogue/state.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/state.c 2006-03-30 13:09:46.000000000 -0800 ++++ rogue.new/state.c 2006-05-15 15:43:43.000000000 -0700 @@ -2138,7 +2138,8 @@ rs_write_int(savef, no_food); rs_write_ints(savef,a_class,MAXARMORS); Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/FC-5/rogue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rogue.spec 11 Apr 2006 02:02:20 -0000 1.4 +++ rogue.spec 19 May 2006 16:12:41 -0000 1.5 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -49,6 +49,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ +touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr + %clean rm -rf $RPM_BUILD_ROOT @@ -73,11 +75,16 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/rogue.png %dir %attr(0775,games,games) %{_var}/games/roguelike +%config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog +* Fri May 19 2006 Wart 5.4.2-5 +- Added empty initial scoreboard file. +- Better setuid/setgid handling (again) (BZ #187392) + * Thu Mar 30 2006 Wart 5.4.2-4 - Better setuid/setgid handling (BZ #187392) - Resize desktop icon to match directory name From fedora-extras-commits at redhat.com Fri May 19 16:12:41 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 19 May 2006 09:12:41 -0700 Subject: rpms/rogue/FC-4 rogue-5.4-setgid.patch,1.1,1.2 rogue.spec,1.4,1.5 Message-ID: <200605191613.k4JGDDnb008020@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7976/FC-4 Modified Files: rogue-5.4-setgid.patch rogue.spec Log Message: - Added empty initial scoreboard file. - Better setuid/setgid handling (BZ #187392) rogue-5.4-setgid.patch: Index: rogue-5.4-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/rogue/FC-4/rogue-5.4-setgid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue-5.4-setgid.patch 11 Apr 2006 02:05:19 -0000 1.1 +++ rogue-5.4-setgid.patch 19 May 2006 16:12:41 -0000 1.2 @@ -1,6 +1,6 @@ -diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c +diff -Naur rogue/extern.c rogue.new/extern.c --- rogue/extern.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/extern.c 2006-03-30 13:24:12.000000000 -0800 ++++ rogue.new/extern.c 2006-05-15 15:43:43.000000000 -0700 @@ -111,7 +111,7 @@ }; @@ -10,9 +10,9 @@ int food_left; /* Amount of food in hero's stomach */ int lastscore = -1; /* Score before this turn */ int no_command = 0; /* Number of turns asleep */ -diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h ---- rogue/extern.h 2006-03-19 11:22:14.000000000 -0800 -+++ rogue.new/extern.h 2006-03-30 13:24:22.000000000 -0800 +diff -Naur rogue/extern.h rogue.new/extern.h +--- rogue/extern.h 2006-05-15 15:43:15.000000000 -0700 ++++ rogue.new/extern.h 2006-05-15 15:43:43.000000000 -0700 @@ -50,7 +50,7 @@ extern char fruit[], orig_dsusp, prbuf[], whoami[]; @@ -22,9 +22,9 @@ #ifdef TIOCGLTC extern struct ltchars ltc; -diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c +diff -Naur rogue/mach_dep.c rogue.new/mach_dep.c --- rogue/mach_dep.c 2006-01-30 08:36:21.000000000 -0800 -+++ rogue.new/mach_dep.c 2006-04-01 19:26:15.000000000 -0800 ++++ rogue.new/mach_dep.c 2006-05-15 15:43:43.000000000 -0700 @@ -45,7 +45,9 @@ #include #include @@ -87,9 +87,9 @@ md_normaluser(); } -diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c +diff -Naur rogue/main.c rogue.new/main.c --- rogue/main.c 2006-01-29 16:11:32.000000000 -0800 -+++ rogue.new/main.c 2006-03-30 13:40:16.000000000 -0800 ++++ rogue.new/main.c 2006-05-15 15:43:43.000000000 -0700 @@ -24,6 +24,13 @@ char *env; int lowtime; @@ -112,9 +112,9 @@ if (argc == 2) if (strcmp(argv[1], "-s") == 0) { -diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c +diff -Naur rogue/mdport.c rogue.new/mdport.c --- rogue/mdport.c 2006-01-29 18:24:39.000000000 -0800 -+++ rogue.new/mdport.c 2006-04-01 19:26:16.000000000 -0800 ++++ rogue.new/mdport.c 2006-05-15 15:45:21.000000000 -0700 @@ -193,8 +193,17 @@ md_normaluser() { @@ -135,7 +135,7 @@ #endif } -@@ -397,22 +406,31 @@ +@@ -397,22 +406,35 @@ char * md_getroguedir() { @@ -143,7 +143,11 @@ + static char path[PATH_MAX]; char *end,*home; - if ( (home = getenv("ROGUEHOME")) != NULL) +- if ( (home = getenv("ROGUEHOME")) != NULL) ++ /* Disable the use of ROGUEHOME to prevent users from ++ * maliciously overwriting save files from other setgid games. ++ */ ++ if ( (home = getenv("ROGUEHOME")) != NULL && 0) { if (*home) { @@ -156,30 +160,31 @@ - - if (directory_exists(path)) - return(path); -+ if (strlen(home) > PATH_MAX-20) { ++ /* The magic number 20 is used to guarantee that the save/lock ++ * filenames (which are much shorter than 20 characters) can ++ * be appended to this buffer. ++ */ ++ if (strlen(home) >= PATH_MAX-20) { + fprintf(stderr, "ROGUEHOME path is too long. Ignoring.\n"); + } else { -+ strncpy(path, home, PATH_MAX-20); -+ /* Ensure that we have a terminating NULL character. -+ */ -+ path[PATH_MAX-1] = (char)NULL; -+ -+ end = &path[strlen(path)-1]; -+ ++ strcpy(path, home); ++ ++ end = &path[strlen(path)-1]; ++ + /* Strip off any trailing path separators from the path. + */ -+ while( (end >= path) && ((*end == '/') || (*end == '\\'))) -+ *end-- = '\0'; -+ -+ if (directory_exists(path)) -+ return(path); ++ while( (end >= path) && ((*end == '/') || (*end == '\\'))) ++ *end-- = '\0'; ++ ++ if (directory_exists(path)) ++ return(path); + } } } -diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c +diff -Naur rogue/rip.c rogue.new/rip.c --- rogue/rip.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/rip.c 2006-03-30 13:32:17.000000000 -0800 ++++ rogue.new/rip.c 2006-05-15 15:43:43.000000000 -0700 @@ -60,7 +60,6 @@ int i; SCORE *sc2; @@ -239,9 +244,9 @@ } /* -diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c +diff -Naur rogue/save.c rogue.new/save.c --- rogue/save.c 2006-01-30 08:05:35.000000000 -0800 -+++ rogue.new/save.c 2006-03-30 13:33:45.000000000 -0800 ++++ rogue.new/save.c 2006-05-15 15:43:43.000000000 -0700 @@ -335,7 +335,40 @@ /* @@ -302,9 +307,9 @@ sscanf(scoreline, " %u %hu %u %hu %hu %lx \n", &top_ten[i].sc_uid, &top_ten[i].sc_score, &top_ten[i].sc_flags, &top_ten[i].sc_monster, -diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c +diff -Naur rogue/state.c rogue.new/state.c --- rogue/state.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/state.c 2006-03-30 13:09:46.000000000 -0800 ++++ rogue.new/state.c 2006-05-15 15:43:43.000000000 -0700 @@ -2138,7 +2138,8 @@ rs_write_int(savef, no_food); rs_write_ints(savef,a_class,MAXARMORS); Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/FC-4/rogue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rogue.spec 11 Apr 2006 02:05:19 -0000 1.4 +++ rogue.spec 19 May 2006 16:12:41 -0000 1.5 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -49,6 +49,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ +touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr + %clean rm -rf $RPM_BUILD_ROOT @@ -73,11 +75,16 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/rogue.png %dir %attr(0775,games,games) %{_var}/games/roguelike +%config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog +* Fri May 19 2006 Wart 5.4.2-5 +- Added empty initial scoreboard file. +- Better setuid/setgid handling (again) (BZ #187392) + * Thu Mar 30 2006 Wart 5.4.2-4 - Better setuid/setgid handling (BZ #187392) - Resize desktop icon to match directory name From fedora-extras-commits at redhat.com Fri May 19 17:14:19 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 10:14:19 -0700 Subject: owners owners.list,1.1023,1.1024 Message-ID: <200605191714.k4JHEJCk010756@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10733 Modified Files: owners.list Log Message: Warren Togami takes ownership of perl-Net-Netmask in order to revive pop-before-smtp. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1023 retrieving revision 1.1024 diff -u -r1.1023 -r1.1024 --- owners.list 19 May 2006 16:11:10 -0000 1.1023 +++ owners.list 19 May 2006 17:14:19 -0000 1.1024 @@ -1146,7 +1146,7 @@ Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Patricia|Patricia Trie perl module for fast IP address lookups|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 19 18:54:17 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 19 May 2006 11:54:17 -0700 Subject: rpms/python-kid/devel .cvsignore, 1.8, 1.9 python-kid.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605191854.k4JIsJWC025397@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25342/devel Modified Files: .cvsignore python-kid.spec sources Log Message: Version 0.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 18:15:09 -0000 1.8 +++ .cvsignore 19 May 2006 18:54:17 -0000 1.9 @@ -1 +1 @@ -kid-0.9.tar.gz +kid-0.9.1.tar.gz Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/python-kid.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-kid.spec 29 Mar 2006 04:03:12 -0000 1.8 +++ python-kid.spec 19 May 2006 18:54:17 -0000 1.9 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-kid -Version: 0.9 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -12,9 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-setuptools -BuildRequires: python-elementtree -Requires: python-elementtree, python-setuptools +BuildRequires: python-setuptools, python-docutils, python-elementtree +Requires: python-elementtree %description @@ -29,6 +28,10 @@ %build %{__python} setup.py build +pushd doc +sed -i -e 's|rst2html\.py|rst2html|' makefile +make +popd %install @@ -36,8 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test -# Do not rely on egg requires -- we'll do a better job -rm -f $RPM_BUILD_ROOT%{python_sitelib}/kid*egg-info/requires.txt + %clean rm -rf $RPM_BUILD_ROOT @@ -45,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc COPYING HISTORY README doc/*.txt doc/*.css doc/html test +%doc COPYING HISTORY README doc/*.txt doc/*.css doc/*.html test %dir %{python_sitelib}/kid %{python_sitelib}/kid/*.py %{python_sitelib}/kid/*.pyc @@ -55,9 +57,8 @@ %changelog -* Tue Mar 28 2006 Konstantin Ryabitsev - 0.9-2 -- Require python-setuptools -- Do not rely on python egg requires.txt (#186296) +* Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 +- Version 0.9.1 * Mon Feb 27 2006 Konstantin Ryabitsev - 0.9-1 - Version 0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 18:15:09 -0000 1.8 +++ sources 19 May 2006 18:54:17 -0000 1.9 @@ -1 +1 @@ -b9dcbebc61f65f7da0d5906b3bbc2b6e kid-0.9.tar.gz +7a8ccde54f4e1bfe78220dfb8e04f2ba kid-0.9.1.tar.gz From fedora-extras-commits at redhat.com Fri May 19 18:54:10 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 19 May 2006 11:54:10 -0700 Subject: rpms/python-kid/FC-4 .cvsignore, 1.8, 1.9 python-kid.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605191854.k4JIsgRt025423@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25342/FC-4 Modified Files: .cvsignore python-kid.spec sources Log Message: Version 0.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 18:15:03 -0000 1.8 +++ .cvsignore 19 May 2006 18:54:10 -0000 1.9 @@ -1 +1 @@ -kid-0.9.tar.gz +kid-0.9.1.tar.gz Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/python-kid.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-kid.spec 29 Mar 2006 04:03:11 -0000 1.8 +++ python-kid.spec 19 May 2006 18:54:10 -0000 1.9 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-kid -Version: 0.9 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -12,9 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-setuptools -BuildRequires: python-elementtree -Requires: python-elementtree, python-setuptools +BuildRequires: python-setuptools, python-docutils, python-elementtree +Requires: python-elementtree %description @@ -29,6 +28,10 @@ %build %{__python} setup.py build +pushd doc +sed -i -e 's|rst2html\.py|rst2html|' makefile +make +popd %install @@ -36,8 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test -# Do not rely on egg requires -- we'll do a better job -rm -f $RPM_BUILD_ROOT%{python_sitelib}/kid*egg-info/requires.txt + %clean rm -rf $RPM_BUILD_ROOT @@ -45,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc COPYING HISTORY README doc/*.txt doc/*.css doc/html test +%doc COPYING HISTORY README doc/*.txt doc/*.css doc/*.html test %dir %{python_sitelib}/kid %{python_sitelib}/kid/*.py %{python_sitelib}/kid/*.pyc @@ -55,9 +57,8 @@ %changelog -* Tue Mar 28 2006 Konstantin Ryabitsev - 0.9-2 -- Require python-setuptools -- Do not rely on python egg requires.txt (#186296) +* Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 +- Version 0.9.1 * Mon Feb 27 2006 Konstantin Ryabitsev - 0.9-1 - Version 0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 18:15:03 -0000 1.8 +++ sources 19 May 2006 18:54:10 -0000 1.9 @@ -1 +1 @@ -b9dcbebc61f65f7da0d5906b3bbc2b6e kid-0.9.tar.gz +7a8ccde54f4e1bfe78220dfb8e04f2ba kid-0.9.1.tar.gz From fedora-extras-commits at redhat.com Fri May 19 18:54:11 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 19 May 2006 11:54:11 -0700 Subject: rpms/python-kid/FC-5 .cvsignore, 1.8, 1.9 python-kid.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605191854.k4JIshRK025428@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25342/FC-5 Modified Files: .cvsignore python-kid.spec sources Log Message: Version 0.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 18:15:09 -0000 1.8 +++ .cvsignore 19 May 2006 18:54:11 -0000 1.9 @@ -1 +1 @@ -kid-0.9.tar.gz +kid-0.9.1.tar.gz Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/python-kid.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-kid.spec 29 Mar 2006 04:03:12 -0000 1.8 +++ python-kid.spec 19 May 2006 18:54:11 -0000 1.9 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-kid -Version: 0.9 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -12,9 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-setuptools -BuildRequires: python-elementtree -Requires: python-elementtree, python-setuptools +BuildRequires: python-setuptools, python-docutils, python-elementtree +Requires: python-elementtree %description @@ -29,6 +28,10 @@ %build %{__python} setup.py build +pushd doc +sed -i -e 's|rst2html\.py|rst2html|' makefile +make +popd %install @@ -36,8 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test -# Do not rely on egg requires -- we'll do a better job -rm -f $RPM_BUILD_ROOT%{python_sitelib}/kid*egg-info/requires.txt + %clean rm -rf $RPM_BUILD_ROOT @@ -45,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc COPYING HISTORY README doc/*.txt doc/*.css doc/html test +%doc COPYING HISTORY README doc/*.txt doc/*.css doc/*.html test %dir %{python_sitelib}/kid %{python_sitelib}/kid/*.py %{python_sitelib}/kid/*.pyc @@ -55,9 +57,8 @@ %changelog -* Tue Mar 28 2006 Konstantin Ryabitsev - 0.9-2 -- Require python-setuptools -- Do not rely on python egg requires.txt (#186296) +* Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 +- Version 0.9.1 * Mon Feb 27 2006 Konstantin Ryabitsev - 0.9-1 - Version 0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 18:15:09 -0000 1.8 +++ sources 19 May 2006 18:54:11 -0000 1.9 @@ -1 +1 @@ -b9dcbebc61f65f7da0d5906b3bbc2b6e kid-0.9.tar.gz +7a8ccde54f4e1bfe78220dfb8e04f2ba kid-0.9.1.tar.gz From fedora-extras-commits at redhat.com Fri May 19 18:56:14 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 11:56:14 -0700 Subject: rpms/perl-Net-Netmask/devel .cvsignore, 1.5, 1.6 Makefile, 1.3, 1.4 perl-Net-Netmask.spec, 1.9, 1.10 sources, 1.5, 1.6 dead.package, 1.1, NONE Message-ID: <200605191856.k4JIuEvM025525@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Net-Netmask/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504 Added Files: .cvsignore Makefile perl-Net-Netmask.spec sources Removed Files: dead.package Log Message: rebuild perl-Net-Netmask for FE6 Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 19 May 2006 18:56:14 -0000 1.6 @@ -0,0 +1 @@ +Net-Netmask-1.9012.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 19 May 2006 18:56:14 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: perl-Net-Netmask +# $Id$ +NAME := perl-Net-Netmask +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: perl-Net-Netmask.spec =================================================================== RCS file: perl-Net-Netmask.spec diff -N perl-Net-Netmask.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ perl-Net-Netmask.spec 19 May 2006 18:56:14 -0000 1.10 @@ -0,0 +1,76 @@ +Name: perl-Net-Netmask +Version: 1.9012 +Release: 2%{?dist} +Summary: Perl module for manipulation and lookup of IP network blocks + +Group: Development/Libraries +License: Artistic +URL: http://search.cpan.org/dist/Net-Netmask/ +Source0: http://www.cpan.org/authors/id/M/MU/MUIR/modules/Net-Netmask-%{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 +Net::Netmask parses and understands IPv4 CIDR blocks. It's built with +an object-oriented interface. Nearly all functions are methods that +operate on a Net::Netmask object. + + +%prep +%setup -q -n Net-Netmask-%{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}/Net/ +%{_mandir}/man3/*.3* + + +%changelog +* Fri May 20 2005 Ville Skytt?? - 1.9012-2 +- 1.9012, use canonical CPAN URL in Source0. + +* Fri Apr 7 2005 Michael Schwendt - 1.9011-2 +- rebuilt + +* Sun Aug 15 2004 Ville Skytt?? - 0:1.9011-1 +- Update to 1.9011. +- Bring up to date with current fedora.us Perl spec template. + +* Sun Feb 8 2004 Ville Skytt?? - 0:1.9007-0.fdr.2 +- Reduce directory ownership bloat. +- Run tests in the %%check section. + +* Sat Feb 07 2004 Warren Togami - 0:1.9007-0.fdr.1 +- upgrade to 1.9007 + +* Thu Nov 13 2003 Ville Skytt?? - 0:1.9004-0.fdr.2 +- Specfile rewrite. + +* Fri Sep 19 2003 Warren Togami - 1.9004-0.fdr.1 +- Specfile autogenerated. Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 19 May 2006 18:56:14 -0000 1.6 @@ -0,0 +1 @@ +3d81d214e0203863dbc170029f2d3502 Net-Netmask-1.9012.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Fri May 19 19:07:44 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 19 May 2006 12:07:44 -0700 Subject: rpms/wmx/FC-5 wmx.spec,1.4,1.5 Message-ID: <200605191907.k4JJ7kli028057@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/wmx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28008/FC-5 Modified Files: wmx.spec Log Message: Don't strip binary during install to preserve debuginfo (bugzilla #192435) Index: wmx.spec =================================================================== RCS file: /cvs/extras/rpms/wmx/FC-5/wmx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wmx.spec 17 Feb 2006 02:06:46 -0000 1.4 +++ wmx.spec 19 May 2006 19:07:44 -0000 1.5 @@ -1,6 +1,6 @@ Name: wmx Version: 6pl1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A really simple window manager for X License: BSD Group: User Interface/X @@ -35,7 +35,7 @@ %install %{__rm} -rf %{buildroot} -%{__install} -s -D -m 0755 wmx %{buildroot}%{_bindir}/wmx +%{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name} %{__install} -m 0755 wmx-defaults/* %{buildroot}%{_datadir}/%{name} %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup @@ -53,6 +53,9 @@ %{_sysconfdir}/X11/xinit/Xclients.d/* %changelog +* Fri May 19 2006 Gabriel Somlo 6pl1-8 +- Don't strip binary during install to preserve debuginfo (bugzilla #192435) + * Thu Feb 16 2006 Ignacio Vazquez-Abrams - Fixed 64-bit build From fedora-extras-commits at redhat.com Fri May 19 19:07:43 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 19 May 2006 12:07:43 -0700 Subject: rpms/wmx/FC-4 wmx.spec,1.3,1.4 Message-ID: <200605191907.k4JJ7j2W028055@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/wmx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28008/FC-4 Modified Files: wmx.spec Log Message: Don't strip binary during install to preserve debuginfo (bugzilla #192435) Index: wmx.spec =================================================================== RCS file: /cvs/extras/rpms/wmx/FC-4/wmx.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wmx.spec 17 Feb 2006 02:05:44 -0000 1.3 +++ wmx.spec 19 May 2006 19:07:43 -0000 1.4 @@ -1,6 +1,6 @@ Name: wmx Version: 6pl1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A really simple window manager for X License: BSD Group: User Interface/X @@ -35,7 +35,7 @@ %install %{__rm} -rf %{buildroot} -%{__install} -s -D -m 0755 wmx %{buildroot}%{_bindir}/wmx +%{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name} %{__install} -m 0755 wmx-defaults/* %{buildroot}%{_datadir}/%{name} %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup @@ -53,6 +53,9 @@ %{_sysconfdir}/X11/xinit/Xclients.d/* %changelog +* Fri May 19 2006 Gabriel Somlo 6pl1-8 +- Don't strip binary during install to preserve debuginfo (bugzilla #192435) + * Thu Feb 16 2006 Ignacio Vazquez-Abrams - Fixed 64-bit build From fedora-extras-commits at redhat.com Fri May 19 19:07:45 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 19 May 2006 12:07:45 -0700 Subject: rpms/wmx/devel wmx.spec,1.4,1.5 Message-ID: <200605191907.k4JJ7lqv028061@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/wmx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28008/devel Modified Files: wmx.spec Log Message: Don't strip binary during install to preserve debuginfo (bugzilla #192435) Index: wmx.spec =================================================================== RCS file: /cvs/extras/rpms/wmx/devel/wmx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wmx.spec 17 Feb 2006 02:06:46 -0000 1.4 +++ wmx.spec 19 May 2006 19:07:44 -0000 1.5 @@ -1,6 +1,6 @@ Name: wmx Version: 6pl1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A really simple window manager for X License: BSD Group: User Interface/X @@ -35,7 +35,7 @@ %install %{__rm} -rf %{buildroot} -%{__install} -s -D -m 0755 wmx %{buildroot}%{_bindir}/wmx +%{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name} %{__install} -m 0755 wmx-defaults/* %{buildroot}%{_datadir}/%{name} %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup @@ -53,6 +53,9 @@ %{_sysconfdir}/X11/xinit/Xclients.d/* %changelog +* Fri May 19 2006 Gabriel Somlo 6pl1-8 +- Don't strip binary during install to preserve debuginfo (bugzilla #192435) + * Thu Feb 16 2006 Ignacio Vazquez-Abrams - Fixed 64-bit build From fedora-extras-commits at redhat.com Fri May 19 19:33:21 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 19 May 2006 12:33:21 -0700 Subject: rpms/tpb/devel Makefile, 1.3, 1.4 sources, 1.5, 1.6 tpb-defaultconfig.patch, 1.5, 1.6 tpb.spec, 1.12, 1.13 Message-ID: <200605191933.k4JJXNPg028820@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tpb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28794 Added Files: Makefile sources tpb-defaultconfig.patch tpb.spec Log Message: Bring back from Attic and build for devel Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 19 May 2006 19:33:21 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: tpb +# $Id$ +NAME := tpb +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 19 May 2006 19:33:21 -0000 1.6 @@ -0,0 +1,2 @@ +563b544fbedcc1763130a0bca1ad63b6 tpb-0.6.4.tar.gz +96965b2e52a40f18a377d482f83eedab tpb-0.6.4.tar.gz.sig tpb-defaultconfig.patch: Index: tpb-defaultconfig.patch =================================================================== RCS file: tpb-defaultconfig.patch diff -N tpb-defaultconfig.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tpb-defaultconfig.patch 19 May 2006 19:33:21 -0000 1.6 @@ -0,0 +1,57 @@ +--- doc/tpbrc.orig 2004-08-18 16:57:32.000000000 +0300 ++++ doc/tpbrc 2005-05-16 01:09:41.000000000 +0300 +@@ -27,19 +27,19 @@ + # String with command and options that should be executed when Home button is + # pressed (only available on A and S series). By default no command is executed. + # +-#HOME /usr/bin/mozilla ++#HOME /usr/bin/htmlview + + ## SEARCH + # String with command and options that should be executed when Search button is + # pressed (only available on A and S series). By default no command is executed. + # +-#SEARCH /usr/bin/mozilla http://www.google.com ++#SEARCH /usr/bin/htmlview http://www.google.com + + ## MAIL + # String with command and options that should be executed when Mail button is + # pressed(only available on A and S series). By default no command is executed. + # +-#MAIL /usr/bin/X11/xterm -T mutt -geometry 140x40 -e mutt ++#MAIL /usr/bin/evolution + + ## WIRELESS + # String with command and options that should be executed when Wireless button is +@@ -181,13 +181,13 @@ + # Defines the font for the on-screen display. You may use "xfontsel" to choose + # one. Default is the default font of the xosd library. + # +-#OSDFONT -*-lucidatypewriter-*-*-*-*-*-240-*-*-*-*-*-* ++OSDFONT -*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-* + + ## OSDCOLOR + # Defines the color of the on-screen display. You may use "xcolors" to choose + # one. Default is BLUE. + # +-#OSDCOLOR Blue ++OSDCOLOR Green + + ## OSDTIMEOUT + # Defines how long (in seconds) the on-screen display is shown after the last +@@ -225,13 +225,13 @@ + ## OSDVERTICAL + # Defines the offset from the top or bottom of the screen in pixels. Default is 25. + # +-#OSDVERTICAL 25 ++OSDVERTICAL 60 + + ## OSDHORIZONTAL + # Defines the offset from the left or right of the screen in pixels. Only + # supported by xosd 2.0.0 and above. Default is 25. + # +-#OSDHORIZONTAL 25 ++OSDHORIZONTAL 60 + + ## OSDPOS + # Defines where the osd is shown. Possible values are top, middle and bottom. Index: tpb.spec =================================================================== RCS file: tpb.spec diff -N tpb.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tpb.spec 19 May 2006 19:33:21 -0000 1.13 @@ -0,0 +1,173 @@ +Name: tpb +Version: 0.6.4 +Release: 4%{?dist} +Summary: ThinkPad button support utility + +Group: System Environment/Base +License: GPL +URL: http://www.nongnu.org/tpb/ +Source0: http://savannah.nongnu.org/download/tpb/%{name}-%{version}.tar.gz +Source1: http://savannah.nongnu.org/download/tpb/%{name}-%{version}.tar.gz.sig +Patch0: %{name}-defaultconfig.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +ExclusiveArch: %{ix86} +BuildRequires: xosd-devel >= 2.0.0 +BuildRequires: libX11-devel +BuildRequires: libXt-devel +BuildRequires: gettext +Requires: udev >= 050-6 +Requires: MAKEDEV +Requires: xorg-x11-xinit + +%description +With TPB it is possible to bind a program to the ThinkPad, Mail, Home +and Search buttons. TPB can also run a callback program on each state +change with the changed state and the new state as options. So it is +possible to trigger several actions on different events. TPB has a +on-screen display (OSD) to show volume, mute, brightness and some +other information. Furthermore TPB supports a software mixer, as the +R series ThinkPads have no hardware mixer to change the volume. + + +%prep +%setup -q +%patch0 -p0 + +# Start tpb at X startup: +cat < %{name}.xinit +#!/bin/sh +%{_bindir}/tpb -d +EOF + +# For the initial MAKEDEV at post-install time, and possibly later: +cat < %{name}.makedev +# Custom permissions for nvram for use with tpb(1). +c 664 root root 10 144 1 1 nvram +EOF + +# To get the /dev entry created at boot: +cat < %{name}.nodes +# /dev/nvram, needed by tpb(1), needs to be created manually. +nvram +EOF + +# Permissions fixup: +cat < %{name}.rules +# Custom permissions for nvram for use with tpb(1). +KERNEL=="nvram", MODE="0664" +EOF + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +install -Dm 755 %{name}.xinit \ + $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh +install -Dpm 644 %{name}.rules \ + $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-%{name}.rules +install -Dpm 644 %{name}.nodes \ + $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/90-%{name}.nodes +install -Dpm 644 %{name}.makedev \ + $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/zz_%{name} +%find_lang %{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +/sbin/MAKEDEV nvram >/dev/null || : + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc ChangeLog COPYING CREDITS README doc/callback_example.sh doc/nvram.txt +%{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh +%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules +%config(noreplace) %{_sysconfdir}/udev/makedev.d/*-%{name}.nodes +%config(noreplace) %{_sysconfdir}/makedev.d/*%{name} +%config(noreplace) %{_sysconfdir}/tpbrc +%{_bindir}/tpb +%{_mandir}/man1/tpb.1* + + +%changelog +* Fri May 19 2006 Kevin Fenzi - 0.6.4-4 +- Bring back from Attic and build for devel + +* Sun Mar 12 2006 Ville Skytt?? - 0.6.4-3 +- Rebuild. + +* Thu Nov 17 2005 Ville Skytt?? - 0.6.4-2 +- Adapt to modular X packaging. + +* Thu Oct 20 2005 Ville Skytt?? - 0.6.4-1 +- 0.6.4. + +* Mon May 16 2005 Ville Skytt?? - 0.6.3-4 +- Adapt to work with FC4's udev configuration. +- Improve default OSD placement. + +* Thu Mar 24 2005 Colin Charles - 0:0.6.3-3 +- add ExclusiveArch x86 only + +* Wed Feb 9 2005 Ville Skytt?? - 0:0.6.3-2 +- Add udev-awareness to /dev/nvram handling (#147306, Matthew Saltzman). +- Change default OSD font to "luxi sans", "sans" doesn't work early enough. + +* Tue Aug 24 2004 Ville Skytt?? - 0:0.6.3-0.fdr.1 +- Update to 0.6.3. +- Further small improvements to default config. + +* Wed Jun 2 2004 Ville Skytt?? - 0:0.6.2-0.fdr.2 +- Rename xinit scriptlet to tpb.sh (bug 1227, bugzilla.redhat.com/122869). + +* Wed May 19 2004 Ville Skytt?? - 0:0.6.2-0.fdr.1 +- Update to 0.6.2. +- Improve default configuration. +- Remove LD_ASSUME_KERNEL hack. + +* Mon Jan 19 2004 Ville Skytt?? - 0:0.6.1-0.fdr.1 +- Update to 0.6.1. + +* Mon Nov 24 2003 Ville Skytt?? - 0:0.6.0-0.fdr.3 +- Don't use MAKEDEV to create /dev/nvram. + +* Wed Oct 22 2003 Ville Skytt?? - 0:0.6.0-0.fdr.2 +- Add LD_ASSUME_KERNEL=2.4.1 workaround to xinit script. + http://savannah.nongnu.org/bugs/?func=detailbug&bug_id=3260&group_id=2320 + +* Mon Aug 11 2003 Ville Skytt?? - 0:0.6.0-0.fdr.1 +- Update to 0.6.0. + +* Tue May 27 2003 Ville Skytt?? - 0:0.5.1-0.fdr.4 +- Make /dev/nvram readable again (#296). + +* Sun May 18 2003 Ville Skytt?? - 0:0.5.1-0.fdr.3 +- Use MAKEDEV for creating the nvram device node and own it. +- Mark xinit file as config to make rpmlint happy. +- %%{buildroot} -> $RPM_BUILD_ROOT. +- Make the build honor $RPM_OPT_FLAGS. + +* Sat Apr 19 2003 Ville Skytt?? - 0:0.5.1-0.fdr.2 +- Don't require tpctl (#177). + +* Fri Apr 11 2003 Ville Skytt?? - 0:0.5.1-0.fdr.1 +- Update to 0.5.1. + +* Sun Apr 6 2003 Ville Skytt?? - 0:0.5.0-0.fdr.1 +- Update to 0.5.0. +- Save .spec in UTF-8. + +* Sun Mar 30 2003 Ville Skytt?? - 0:0.4.2-0.fdr.1 +- Rebuild according to Fedora RC3 guidelines. + +* Sat Feb 8 2003 Ville Skytt?? - 0.4.2-1.fedora.1 +- First Fedora release. From fedora-extras-commits at redhat.com Fri May 19 19:34:33 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 19 May 2006 12:34:33 -0700 Subject: rpms/tpb/devel dead.package,1.1,NONE Message-ID: <200605191934.k4JJYZ9j028859@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tpb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28844 Removed Files: dead.package Log Message: Bring back from Attic and build for devel --- dead.package DELETED --- From fedora-extras-commits at redhat.com Fri May 19 19:37:42 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 12:37:42 -0700 Subject: rpms/pop-before-smtp/devel .cvsignore, 1.2, 1.3 pop-before-smtp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605191937.k4JJbgoM028999@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28976 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: - update to 1.41 - remove perl cut which wasn't working anyway due to a typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 +++ .cvsignore 19 May 2006 19:37:42 -0000 1.3 @@ -1 +1 @@ -pop-before-smtp-1.36.tar.gz +pop-before-smtp-1.41.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/pop-before-smtp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pop-before-smtp.spec 6 Apr 2005 22:13:29 -0000 1.2 +++ pop-before-smtp.spec 19 May 2006 19:37:42 -0000 1.3 @@ -1,9 +1,9 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.36 -Release: 2 +Version: 1.41 +Release: 1%{?dist} -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons @@ -23,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.36 +%setup -q -n pop-before-smtp-1.41 %build echo Nothing to build... @@ -35,7 +35,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null -perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp @@ -62,6 +61,10 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Mon May 8 2006 Warren Togami 1.41-1 +- update to 1.41 +- remove perl cut which wasn't working anyway due to a typo + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 07:23:24 -0000 1.2 +++ sources 19 May 2006 19:37:42 -0000 1.3 @@ -1 +1 @@ -f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz +59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:38:37 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 12:38:37 -0700 Subject: rpms/pop-before-smtp/FC-5 .cvsignore, 1.2, 1.3 pop-before-smtp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605191938.k4JJcbL5029144@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29117 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: - update to 1.41 - remove perl cut which wasn't working anyway due to a typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 +++ .cvsignore 19 May 2006 19:38:37 -0000 1.3 @@ -1 +1 @@ -pop-before-smtp-1.36.tar.gz +pop-before-smtp-1.41.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-5/pop-before-smtp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pop-before-smtp.spec 6 Apr 2005 22:13:29 -0000 1.2 +++ pop-before-smtp.spec 19 May 2006 19:38:37 -0000 1.3 @@ -1,9 +1,9 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.36 -Release: 2 +Version: 1.41 +Release: 1%{?dist} -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons @@ -23,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.36 +%setup -q -n pop-before-smtp-1.41 %build echo Nothing to build... @@ -35,7 +35,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null -perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp @@ -62,6 +61,10 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Mon May 8 2006 Warren Togami 1.41-1 +- update to 1.41 +- remove perl cut which wasn't working anyway due to a typo + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 07:23:24 -0000 1.2 +++ sources 19 May 2006 19:38:37 -0000 1.3 @@ -1 +1 @@ -f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz +59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:40:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:40:14 -0700 Subject: rpms/perl-Socket6 - New directory Message-ID: <200605191940.k4JJeG25029407@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29380/perl-Socket6 Log Message: Directory /cvs/extras/rpms/perl-Socket6 added to the repository From fedora-extras-commits at redhat.com Fri May 19 19:40:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:40:14 -0700 Subject: rpms/perl-Socket6/devel - New directory Message-ID: <200605191940.k4JJeGF9029410@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29380/perl-Socket6/devel Log Message: Directory /cvs/extras/rpms/perl-Socket6/devel added to the repository From fedora-extras-commits at redhat.com Fri May 19 19:40:10 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 12:40:10 -0700 Subject: rpms/pop-before-smtp/FC-4 .cvsignore, 1.2, 1.3 pop-before-smtp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605191940.k4JJeARl029359@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29326 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: - update to 1.41 - remove perl cut which wasn't working anyway due to a typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 +++ .cvsignore 19 May 2006 19:40:10 -0000 1.3 @@ -1 +1 @@ -pop-before-smtp-1.36.tar.gz +pop-before-smtp-1.41.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-4/pop-before-smtp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pop-before-smtp.spec 6 Apr 2005 22:13:29 -0000 1.2 +++ pop-before-smtp.spec 19 May 2006 19:40:10 -0000 1.3 @@ -1,9 +1,9 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.36 -Release: 2 +Version: 1.41 +Release: 1%{?dist} -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons @@ -23,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.36 +%setup -q -n pop-before-smtp-1.41 %build echo Nothing to build... @@ -35,7 +35,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null -perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp @@ -62,6 +61,10 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Mon May 8 2006 Warren Togami 1.41-1 +- update to 1.41 +- remove perl cut which wasn't working anyway due to a typo + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 07:23:24 -0000 1.2 +++ sources 19 May 2006 19:40:10 -0000 1.3 @@ -1 +1 @@ -f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz +59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:40:31 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:40:31 -0700 Subject: rpms/perl-Socket6 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605191940.k4JJeXdQ029528@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29477 Added Files: Makefile import.log Log Message: Setup of module perl-Socket6 --- NEW FILE Makefile --- # Top level Makefile for module perl-Socket6 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 19 19:40:32 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:40:32 -0700 Subject: rpms/perl-Socket6/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605191940.k4JJeYcY029531@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29477/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Socket6 --- NEW 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 May 19 19:41:00 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:41:00 -0700 Subject: rpms/perl-Socket6 import.log,1.1,1.2 Message-ID: <200605191941.k4JJf2Ok029640@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29589 Modified Files: import.log Log Message: auto-import perl-Socket6-0.19-2 on branch devel from perl-Socket6-0.19-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Socket6/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 May 2006 19:40:31 -0000 1.1 +++ import.log 19 May 2006 19:41:00 -0000 1.2 @@ -0,0 +1 @@ +perl-Socket6-0_19-2:HEAD:perl-Socket6-0.19-2.src.rpm:1148067651 From fedora-extras-commits at redhat.com Fri May 19 19:41:05 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 12:41:05 -0700 Subject: rpms/pop-before-smtp/FC-3 .cvsignore, 1.2, 1.3 pop-before-smtp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605191941.k4JJf5Yd029654@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29615 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: - update to 1.41 - remove perl cut which wasn't working anyway due to a typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 +++ .cvsignore 19 May 2006 19:41:05 -0000 1.3 @@ -1 +1 @@ -pop-before-smtp-1.36.tar.gz +pop-before-smtp-1.41.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-3/pop-before-smtp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pop-before-smtp.spec 7 Jan 2005 07:23:24 -0000 1.1 +++ pop-before-smtp.spec 19 May 2006 19:41:05 -0000 1.2 @@ -1,8 +1,9 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.36 -Release: 1 -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz +Version: 1.41 +Release: 1%{?dist} + +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons @@ -22,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.36 +%setup -q -n pop-before-smtp-1.41 %build echo Nothing to build... @@ -34,7 +35,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null -perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp @@ -61,6 +61,13 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Mon May 8 2006 Warren Togami 1.41-1 +- update to 1.41 +- remove perl cut which wasn't working anyway due to a typo + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Thu Jan 06 2005 Warren Togami 1.36-1 - 1.36 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 07:23:24 -0000 1.2 +++ sources 19 May 2006 19:41:05 -0000 1.3 @@ -1 +1 @@ -f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz +59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:41:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:41:01 -0700 Subject: rpms/perl-Socket6/devel perl-Socket6.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605191941.k4JJf3kr029645@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29589/devel Modified Files: .cvsignore sources Added Files: perl-Socket6.spec Log Message: auto-import perl-Socket6-0.19-2 on branch devel from perl-Socket6-0.19-2.src.rpm --- NEW FILE perl-Socket6.spec --- Name: perl-Socket6 Version: 0.19 Release: 2%{?dist} Summary: IPv6 related part of the C socket.h defines and structure manipulators Group: Development/Libraries License: BSD URL: http://search.cpan.org/dist/Socket6/ Source0: http://www.cpan.org/authors/id/U/UM/UMEMOTO/Socket6-%{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 supports getaddrinfo() and getnameinfo() to intend to enable protocol independent programing. If your environment supports IPv6, IPv6 related defines such as AF_INET6 are included. %prep %setup -q -n Socket6-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorarch}/Socket6* %{perl_vendorarch}/auto/Socket6/ %changelog * Thu May 18 2006 Jose Pedro Oliveira - 0.19-2 - License: BSD (http://www.opensource.org/licenses/bsd-license.php). * Sat May 13 2006 Jose Pedro Oliveira - 0.19-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Socket6/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 May 2006 19:40:31 -0000 1.1 +++ .cvsignore 19 May 2006 19:41:00 -0000 1.2 @@ -0,0 +1 @@ +Socket6-0.19.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Socket6/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 May 2006 19:40:31 -0000 1.1 +++ sources 19 May 2006 19:41:00 -0000 1.2 @@ -0,0 +1 @@ +35e4bb7e09ca3154a44bcaa8959780a2 Socket6-0.19.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:46:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:46:13 -0700 Subject: owners owners.list,1.1024,1.1025 Message-ID: <200605191946.k4JJkFps029849@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29832 Modified Files: owners.list Log Message: New package: perl-Socket6 (#192164) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1024 retrieving revision 1.1025 diff -u -r1.1024 -r1.1025 --- owners.list 19 May 2006 17:14:19 -0000 1.1024 +++ owners.list 19 May 2006 19:46:13 -0000 1.1025 @@ -1182,6 +1182,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-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Socket6|IPv6 related part of the C socket.h defines and structure manipulators|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spiffy|Framework for doing object oriented (OO) programming in Perl|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 19 20:45:29 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 19 May 2006 13:45:29 -0700 Subject: rpms/celestia/devel celestia.spec,1.15,1.16 Message-ID: <200605192045.k4JKjVc1032413@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/celestia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32396 Modified Files: celestia.spec Log Message: Include accidentally dropped 3ds models. Index: celestia.spec =================================================================== RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- celestia.spec 7 Apr 2006 23:40:43 -0000 1.15 +++ celestia.spec 19 May 2006 20:45:29 -0000 1.16 @@ -1,6 +1,6 @@ Name: celestia Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenGL real-time visual space simulation Group: Amusements/Graphics License: GPL @@ -59,6 +59,8 @@ ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ #rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual +install -p -m 644 -D models/*.3ds $RPM_BUILD_ROOT%{_datadir}/%{name}/models/ + rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop desktop-file-install \ @@ -100,6 +102,9 @@ %changelog +* Fri May 19 2006 Steven Pritchard 1.4.1-2 +- Include accidentally dropped 3ds models. + * Tue Mar 28 2006 Steven Pritchard 1.4.1-1 - Update to 1.4.1 - Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of From fedora-extras-commits at redhat.com Fri May 19 20:49:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 19 May 2006 13:49:47 -0700 Subject: rpms/celestia/FC-5 celestia.spec,1.15,1.16 Message-ID: <200605192049.k4JKnnMd032503@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/celestia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32486 Modified Files: celestia.spec Log Message: Include accidentally dropped 3ds models. Index: celestia.spec =================================================================== RCS file: /cvs/extras/rpms/celestia/FC-5/celestia.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- celestia.spec 8 Apr 2006 01:03:06 -0000 1.15 +++ celestia.spec 19 May 2006 20:49:47 -0000 1.16 @@ -1,6 +1,6 @@ Name: celestia Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenGL real-time visual space simulation Group: Amusements/Graphics License: GPL @@ -59,6 +59,8 @@ ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ #rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual +install -p -m 644 -D models/*.3ds $RPM_BUILD_ROOT%{_datadir}/%{name}/models/ + rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop desktop-file-install \ @@ -100,6 +102,9 @@ %changelog +* Fri May 19 2006 Steven Pritchard 1.4.1-2 +- Include accidentally dropped 3ds models. + * Tue Mar 28 2006 Steven Pritchard 1.4.1-1 - Update to 1.4.1 - Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of From fedora-extras-commits at redhat.com Fri May 19 20:57:30 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Fri, 19 May 2006 13:57:30 -0700 Subject: rpms/spicctrl/devel spicctrl.spec,1.2,1.3 Message-ID: <200605192057.k4JKvW6t032617@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/spicctrl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32600 Modified Files: spicctrl.spec Log Message: * Sat May 20 2006 Roozbeh Pournader 1.9-4 - Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct man page permissions (Ville Skytt??) Index: spicctrl.spec =================================================================== RCS file: /cvs/extras/rpms/spicctrl/devel/spicctrl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- spicctrl.spec 14 Feb 2006 10:05:40 -0000 1.2 +++ spicctrl.spec 19 May 2006 20:57:30 -0000 1.3 @@ -1,6 +1,6 @@ Name: spicctrl Version: 1.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Sony Vaio laptop SPIC control program Group: Applications/System @@ -19,6 +19,7 @@ %prep %setup -q +%{__sed} -i 's/ -O2 / $(RPM_OPT_FLAGS) /' Makefile %build @@ -29,8 +30,8 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install spicctrl $RPM_BUILD_ROOT%{_sbindir} -install spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m755 spicctrl $RPM_BUILD_ROOT%{_sbindir} +install -p -m644 spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean @@ -55,10 +56,15 @@ %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE +%{_sbindir}/spicctrl %{_mandir}/man1/spicctrl.1.gz -%attr(0755,root,root) /usr/sbin/spicctrl + %changelog +* Sat May 20 2006 Roozbeh Pournader 1.9-4 +- Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct + man page permissions (Ville Skytt??) + * Tue Feb 14 2006 Roozbeh Pournader 1.9-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Fri May 19 21:04:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 19 May 2006 14:04:47 -0700 Subject: rpms/amarok/FC-5 .cvsignore, 1.21, 1.22 amarok.spec, 1.47, 1.48 sources, 1.21, 1.22 Message-ID: <200605192105.k4JL5Jv1002564@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2520/FC-5 Modified Files: .cvsignore amarok.spec sources Log Message: update to 1.4 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 14 Apr 2006 07:29:14 -0000 1.21 +++ .cvsignore 19 May 2006 21:04:47 -0000 1.22 @@ -1 +1 @@ -amarok-1.4-beta3c.tar.bz2 +amarok-1.4.0a.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- amarok.spec 14 Apr 2006 08:30:44 -0000 1.47 +++ amarok.spec 19 May 2006 21:04:47 -0000 1.48 @@ -1,15 +1,14 @@ Name: amarok Summary: Media player for KDE -Version: 1.4 -Release: 0.12.beta3%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2 -Patch0: amarok-1.4beta1-gst10.patch -Patch1: amarok-1.4-gstreamer.patch -Patch2: amarok-1.4-engines-cfg.patch +Source0: http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2 +#Patch1: amarok-1.4-gstreamer.patch +#Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -26,7 +25,8 @@ #BuildRequires: akode-devel BuildRequires: libifp-devel, libusb-devel %if "%fedora" >= "5" -BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel +# gstreamer disabled in version 1.4 final (not ready yet) +#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel BuildRequires: libgpod-devel %else BuildRequires: gstreamer-plugins-devel >= 0.8.4 @@ -35,6 +35,9 @@ BuildRequires: HelixPlayer %endif +# Lyrics scripts +Requires: ruby + Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -69,11 +72,11 @@ %prep -%setup -q -n %{name}-%{version}-beta3c +%setup -q # Make Gstreamer a sufficient engine as well (only engine available on x86_64) -%patch1 -p1 -b .gstreamer +#%patch1 -p1 -b .gstreamer # Gstreamer default sink should be autoaudiosink -%patch2 -p1 -b .engines-cfg +#%patch2 -p1 -b .engines-cfg %build @@ -168,24 +171,26 @@ %{_datadir}/applications/kde/*.desktop %{_datadir}/services/amarok_void-engine_plugin.desktop %{_datadir}/services/amarok_ifp-mediadevice.desktop -%{_datadir}/services/amarok_vfat-mediadevice.desktop -%{_datadir}/services/amarok_ipod-mediadevice.desktop %{_datadir}/servicetypes/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop %{_libdir}/kde3/libamarok_void-engine_plugin.* %{_libdir}/kde3/libamarok_ifp-mediadevice.* -%{_libdir}/kde3/libamarok_vfat-mediadevice.* -%{_libdir}/kde3/libamarok_ipod-mediadevice.* %{_libdir}/kde3/konqsidebar_universalamarok.* %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg -# Gstreamer engine +# IPod support +%{_datadir}/services/amarok_ipod-mediadevice.desktop +%{_libdir}/kde3/libamarok_ipod-mediadevice.* +# VFAT device support +%{_datadir}/services/amarok_generic-mediadevice.desktop +%{_libdir}/kde3/libamarok_generic-mediadevice.* +# Gstreamer engine - disabled in 1.4 final %if "%fedora" >= "5" -%{_datadir}/services/amarok_gst10engine_plugin.desktop -%{_libdir}/kde3/libamarok_gst10engine_plugin.* +#%{_datadir}/services/amarok_gst10engine_plugin.desktop +#%{_libdir}/kde3/libamarok_gst10engine_plugin.* %else %{_datadir}/services/amarok_gstengine_plugin.desktop %{_libdir}/kde3/libamarok_gstengine_plugin.* @@ -200,6 +205,7 @@ %endif + %files visualisation %defattr(-,root,root) %{_bindir}/amarok_libvisual @@ -208,6 +214,12 @@ %changelog +* Mon May 15 2006 Aurelien Bompard 1.4-1 +- version 1.4 final + +* Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 +- rc1 + * Fri Apr 14 2006 Aurelien Bompard 1.4-0.12.beta3 - add patch to make Gstreamer sufficient to build (only engine available on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 14 Apr 2006 07:29:14 -0000 1.21 +++ sources 19 May 2006 21:04:47 -0000 1.22 @@ -1 +1 @@ -b92433b46005f0b2fc31e0ce0bf4cb3a amarok-1.4-beta3c.tar.bz2 +3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 From fedora-extras-commits at redhat.com Fri May 19 21:04:48 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 19 May 2006 14:04:48 -0700 Subject: rpms/amarok/devel .cvsignore, 1.21, 1.22 amarok.spec, 1.46, 1.47 sources, 1.21, 1.22 Message-ID: <200605192105.k4JL5K9Z002569@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2520/devel Modified Files: .cvsignore amarok.spec sources Log Message: update to 1.4 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 14 Apr 2006 07:29:15 -0000 1.21 +++ .cvsignore 19 May 2006 21:04:47 -0000 1.22 @@ -1 +1 @@ -amarok-1.4-beta3c.tar.bz2 +amarok-1.4.0a.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- amarok.spec 14 Apr 2006 08:30:45 -0000 1.46 +++ amarok.spec 19 May 2006 21:04:47 -0000 1.47 @@ -1,15 +1,14 @@ Name: amarok Summary: Media player for KDE -Version: 1.4 -Release: 0.12.beta3%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2 -Patch0: amarok-1.4beta1-gst10.patch -Patch1: amarok-1.4-gstreamer.patch -Patch2: amarok-1.4-engines-cfg.patch +Source0: http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2 +#Patch1: amarok-1.4-gstreamer.patch +#Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -26,7 +25,8 @@ #BuildRequires: akode-devel BuildRequires: libifp-devel, libusb-devel %if "%fedora" >= "5" -BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel +# gstreamer disabled in version 1.4 final (not ready yet) +#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel BuildRequires: libgpod-devel %else BuildRequires: gstreamer-plugins-devel >= 0.8.4 @@ -35,6 +35,9 @@ BuildRequires: HelixPlayer %endif +# Lyrics scripts +Requires: ruby + Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -69,11 +72,11 @@ %prep -%setup -q -n %{name}-%{version}-beta3c +%setup -q # Make Gstreamer a sufficient engine as well (only engine available on x86_64) -%patch1 -p1 -b .gstreamer +#%patch1 -p1 -b .gstreamer # Gstreamer default sink should be autoaudiosink -%patch2 -p1 -b .engines-cfg +#%patch2 -p1 -b .engines-cfg %build @@ -168,24 +171,26 @@ %{_datadir}/applications/kde/*.desktop %{_datadir}/services/amarok_void-engine_plugin.desktop %{_datadir}/services/amarok_ifp-mediadevice.desktop -%{_datadir}/services/amarok_vfat-mediadevice.desktop -%{_datadir}/services/amarok_ipod-mediadevice.desktop %{_datadir}/servicetypes/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop %{_libdir}/kde3/libamarok_void-engine_plugin.* %{_libdir}/kde3/libamarok_ifp-mediadevice.* -%{_libdir}/kde3/libamarok_vfat-mediadevice.* -%{_libdir}/kde3/libamarok_ipod-mediadevice.* %{_libdir}/kde3/konqsidebar_universalamarok.* %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg -# Gstreamer engine +# IPod support +%{_datadir}/services/amarok_ipod-mediadevice.desktop +%{_libdir}/kde3/libamarok_ipod-mediadevice.* +# VFAT device support +%{_datadir}/services/amarok_generic-mediadevice.desktop +%{_libdir}/kde3/libamarok_generic-mediadevice.* +# Gstreamer engine - disabled in 1.4 final %if "%fedora" >= "5" -%{_datadir}/services/amarok_gst10engine_plugin.desktop -%{_libdir}/kde3/libamarok_gst10engine_plugin.* +#%{_datadir}/services/amarok_gst10engine_plugin.desktop +#%{_libdir}/kde3/libamarok_gst10engine_plugin.* %else %{_datadir}/services/amarok_gstengine_plugin.desktop %{_libdir}/kde3/libamarok_gstengine_plugin.* @@ -200,6 +205,7 @@ %endif + %files visualisation %defattr(-,root,root) %{_bindir}/amarok_libvisual @@ -208,6 +214,12 @@ %changelog +* Mon May 15 2006 Aurelien Bompard 1.4-1 +- version 1.4 final + +* Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 +- rc1 + * Fri Apr 14 2006 Aurelien Bompard 1.4-0.12.beta3 - add patch to make Gstreamer sufficient to build (only engine available on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 14 Apr 2006 07:29:15 -0000 1.21 +++ sources 19 May 2006 21:04:47 -0000 1.22 @@ -1 +1 @@ -b92433b46005f0b2fc31e0ce0bf4cb3a amarok-1.4-beta3c.tar.bz2 +3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 From fedora-extras-commits at redhat.com Fri May 19 22:50:20 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 May 2006 15:50:20 -0700 Subject: extras-repoclosure rc-modified, 1.1, 1.2 repoclosure.patch, 1.1, 1.2 rc-run.py, 1.3, 1.4 Message-ID: <200605192250.k4JMoKOU005423@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5394 Modified Files: rc-modified repoclosure.patch rc-run.py Log Message: - add -d/--cachedir option to modified repoclosure Index: rc-modified =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rc-modified 30 Apr 2006 11:11:51 -0000 1.1 +++ rc-modified 19 May 2006 22:50:18 -0000 1.2 @@ -43,6 +43,8 @@ help="specify repo ids to query, can be specified multiple times (default is all enabled)") parser.add_option("-t", "--tempcache", default=False, action="store_true", help="Use a temp dir for storing/accessing yum-cache") + parser.add_option("-d", "--cachedir", default='', + help="specify a custom directory for storing/accessing yum-cache") parser.add_option("-q", "--quiet", default=0, action="store_true", help="quiet (no output to stderr)") parser.add_option("-n", "--newest", default=0, action="store_true", @@ -147,8 +149,11 @@ else: repo.enable() - if os.geteuid() != 0 or opts.tempcache: - cachedir = getCacheDir() + if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '': + if opts.cachedir != '': + cachedir = opts.cachedir + else: + cachedir = getCacheDir() if cachedir is None: print "Error: Could not make cachedir, exiting" sys.exit(50) repoclosure.patch: Index: repoclosure.patch =================================================================== RCS file: /cvs/fedora/extras-repoclosure/repoclosure.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- repoclosure.patch 30 Apr 2006 11:11:51 -0000 1.1 +++ repoclosure.patch 19 May 2006 22:50:18 -0000 1.2 @@ -1,8 +1,15 @@ -Against yum-utils-0.5: - ---- /usr/bin/repoclosure 2006-02-23 18:06:16.000000000 +0100 -+++ rc-modified 2006-04-30 13:02:35.000000000 +0200 -@@ -88,7 +88,10 @@ +--- /usr/bin/repoclosure 2006-05-07 04:20:57.000000000 +0200 ++++ rc-modified 2006-05-20 00:43:58.000000000 +0200 +@@ -43,6 +43,8 @@ + help="specify repo ids to query, can be specified multiple times (default is all enabled)") + parser.add_option("-t", "--tempcache", default=False, action="store_true", + help="Use a temp dir for storing/accessing yum-cache") ++ parser.add_option("-d", "--cachedir", default='', ++ help="specify a custom directory for storing/accessing yum-cache") + parser.add_option("-q", "--quiet", default=0, action="store_true", + help="quiet (no output to stderr)") + parser.add_option("-n", "--newest", default=0, action="store_true", +@@ -88,7 +90,10 @@ unresolved = {} resolved = {} if newest: @@ -14,7 +21,21 @@ else: pkgs = self.pkgSack -@@ -167,7 +170,11 @@ +@@ -144,8 +149,11 @@ + else: + repo.enable() + +- if os.geteuid() != 0 or opts.tempcache: +- cachedir = getCacheDir() ++ if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '': ++ if opts.cachedir != '': ++ cachedir = opts.cachedir ++ else: ++ cachedir = getCacheDir() + if cachedir is None: + print "Error: Could not make cachedir, exiting" + sys.exit(50) +@@ -167,7 +175,11 @@ baddeps = my.getBrokenDeps(opts.newest) if opts.newest: @@ -27,7 +48,7 @@ else: num = len(my.pkgSack) -@@ -182,7 +189,8 @@ +@@ -182,7 +194,8 @@ pkgs = baddeps.keys() pkgs.sort() for pkg in pkgs: @@ -37,7 +58,7 @@ for (n, f, v) in baddeps[pkg]: req = '%s' % n if f: -@@ -192,6 +200,7 @@ +@@ -192,6 +205,7 @@ req = '%s %s' % (req, v) print ' %s' % req Index: rc-run.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rc-run.py 17 May 2006 13:41:11 -0000 1.3 +++ rc-run.py 19 May 2006 22:50:18 -0000 1.4 @@ -8,6 +8,8 @@ import tempfile workdir = '/srv/rpmbuild/extras-repoclosure' +cachedir = '/var/tmp/extras-repoclosure-mdcache' +#cachedir = '/srv/rpmbuild/extras-repoclosure/mdcache' breakfile = 'rc-run.breakfile' allreleases = [ '3', '4', '5', 'development' ] @@ -104,7 +106,8 @@ repoid = '%s-%s-%s' % (r,release,arch) rcargs += ('-r %s ' % repoid) # -n, --newest : yum-utils 0.5 - rc = os.system('./rc-modified -q -n -c %s %s >> %s' % (conffile,rcargs,logfilename)) + # -d : modified version only + rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename)) checkbreakfile() if rc: return False From fedora-extras-commits at redhat.com Fri May 19 22:53:14 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 May 2006 15:53:14 -0700 Subject: extras-repoclosure repoclosure.patch,1.2,1.3 rc-modified,1.2,1.3 Message-ID: <200605192253.k4JMrEj1005456@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433 Modified Files: repoclosure.patch rc-modified Log Message: safer indentation repoclosure.patch: Index: repoclosure.patch =================================================================== RCS file: /cvs/fedora/extras-repoclosure/repoclosure.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repoclosure.patch 19 May 2006 22:50:18 -0000 1.2 +++ repoclosure.patch 19 May 2006 22:53:12 -0000 1.3 @@ -1,5 +1,5 @@ --- /usr/bin/repoclosure 2006-05-07 04:20:57.000000000 +0200 -+++ rc-modified 2006-05-20 00:43:58.000000000 +0200 ++++ rc-modified 2006-05-20 00:53:04.000000000 +0200 @@ -43,6 +43,8 @@ help="specify repo ids to query, can be specified multiple times (default is all enabled)") parser.add_option("-t", "--tempcache", default=False, action="store_true", @@ -21,20 +21,26 @@ else: pkgs = self.pkgSack -@@ -144,8 +149,11 @@ +@@ -144,11 +149,14 @@ else: repo.enable() - if os.geteuid() != 0 or opts.tempcache: - cachedir = getCacheDir() +- if cachedir is None: +- print "Error: Could not make cachedir, exiting" +- sys.exit(50) + if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '': + if opts.cachedir != '': + cachedir = opts.cachedir + else: + cachedir = getCacheDir() - if cachedir is None: - print "Error: Could not make cachedir, exiting" - sys.exit(50) ++ if cachedir is None: ++ print "Error: Could not make cachedir, exiting" ++ sys.exit(50) + + my.repos.setCacheDir(cachedir) + @@ -167,7 +175,11 @@ baddeps = my.getBrokenDeps(opts.newest) Index: rc-modified =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rc-modified 19 May 2006 22:50:18 -0000 1.2 +++ rc-modified 19 May 2006 22:53:12 -0000 1.3 @@ -154,9 +154,9 @@ cachedir = opts.cachedir else: cachedir = getCacheDir() - if cachedir is None: - print "Error: Could not make cachedir, exiting" - sys.exit(50) + if cachedir is None: + print "Error: Could not make cachedir, exiting" + sys.exit(50) my.repos.setCacheDir(cachedir) From fedora-extras-commits at redhat.com Fri May 19 23:34:15 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 16:34:15 -0700 Subject: rpms/rsnapshot import.log,1.5,1.6 Message-ID: <200605192334.k4JNYHVS008002@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968 Modified Files: import.log Log Message: auto-import rsnapshot-1.2.3-2 on branch devel from rsnapshot-1.2.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 12 Apr 2005 13:11:37 -0000 1.5 +++ import.log 19 May 2006 23:34:15 -0000 1.6 @@ -2,3 +2,4 @@ rsnapshot-1_2_1-1:HEAD:rsnapshot-1.2.1-1.src.rpm:1113303958 rsnapshot-1_2_1-2:HEAD:rsnapshot-1.2.1-2.src.rpm:1113306763 rsnapshot-1_2_1-3:HEAD:rsnapshot-1.2.1-3.src.rpm:1113311399 +rsnapshot-1_2_3-2:HEAD:rsnapshot-1.2.3-2.src.rpm:1148081651 From fedora-extras-commits at redhat.com Fri May 19 23:34:16 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 16:34:16 -0700 Subject: rpms/rsnapshot/devel rsnapshot.conf.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rsnapshot.spec, 1.5, 1.6 sources, 1.3, 1.4 rsnapshot.patch, 1.1, NONE Message-ID: <200605192334.k4JNYINV008010@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968/devel Modified Files: .cvsignore rsnapshot.spec sources Added Files: rsnapshot.conf.patch Removed Files: rsnapshot.patch Log Message: auto-import rsnapshot-1.2.3-2 on branch devel from rsnapshot-1.2.3-2.src.rpm rsnapshot.conf.patch: --- NEW FILE rsnapshot.conf.patch --- --- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 +++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 @@ -40,7 +40,7 @@ # # See the README file or the man page for more details. # -#@CMD_CP@ + at CMD_CP@ # uncomment this to use the rm program instead of the built-in perl routine. @CMD_RM@ @@ -55,7 +55,7 @@ @CMD_LOGGER@ # Uncomment this to specify a path to "du" for disk usage checks. -#@CMD_DU@ + at CMD_DU@ ######################################### # BACKUP INTERVALS # @@ -94,7 +94,7 @@ # If you enable this, data will be written to the file you specify. The # amount of data written is controlled by the "loglevel" parameter. -#logfile /var/log/rsnapshot +logfile /var/log/rsnapshot # The include and exclude parameters, if enabled, simply get passed directly # to rsync. If you have multiple include/exclude patterns, put each one on a @@ -138,7 +138,7 @@ # If you enable this, make sure the lockfile directory is not world # writable. Otherwise anyone can prevent the program from running. # -#lockfile /var/run/rsnapshot.pid +lockfile /var/run/rsnapshot.pid # If enabled, rsnapshot will move the oldest directory for each interval # to [interval_name].delete, then it will delete that directory as a Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Apr 2005 11:07:19 -0000 1.3 +++ .cvsignore 19 May 2006 23:34:16 -0000 1.4 @@ -1 +1 @@ -rsnapshot-1.2.1.tar.gz +rsnapshot-1.2.3.tar.gz Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rsnapshot.spec 12 Apr 2005 14:15:38 -0000 1.5 +++ rsnapshot.spec 19 May 2006 23:34:16 -0000 1.6 @@ -1,88 +1,134 @@ +# +# Specfile for rsnapshot +# + Name: rsnapshot +Version: 1.2.3 +Release: 2 Summary: Local and remote filesystem snapshot utility -Version: 1.2.1 -Release: 3 -License: GPL + Group: Applications/System -Url: http://www.rsnapshot.org -Source0: http://www.rsnapshot.org/downloads/rsnapshot-1.2.1.tar.gz -Patch0: rsnapshot.patch -BuildArch: noarch +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildrequires: perl, openssh-clients -Requires: perl, openssh-clients, rsync, coreutils, util-linux -AutoReqProv: no + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ %description -This is a remote backup program that uses rsync -to take backup snapshots of filesystems. -It uses hard links to save space on disk. +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ %prep -%setup -q -%{__perl} -pi.orig -e 's|/usr/local|/usr|g' rsnapshot.1 -%{__perl} -pi.orig -e 's|/usr/local|/usr|g' README +%setup -q %patch +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + %build -%configure \ - --with-rsync=%{_bindir}/rsync \ - --with-ssh=%{_bindir}/ssh \ - --with-logger=%{_bindir}/logger \ - --with-du=%{_bindir}/du - -%install -rm -rf %{buildroot} -install -d %{buildroot}/%{_bindir} -install -p -m 755 rsnapshot %{buildroot}/%{_bindir}/rsnapshot - -install -d %{buildroot}/%{_mandir}/man1 -install -p -m 644 rsnapshot.1 %{buildroot}/%{_mandir}/man1/ - -install -d %{buildroot}/%{_sysconfdir} -install -p -m 644 rsnapshot.conf.default %{buildroot}/%{_sysconfdir}/rsnapshot.conf.default -install -p -m 600 rsnapshot.conf.default %{buildroot}/%{_sysconfdir}/rsnapshot.conf +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ %post -# -# upgrade rsnapshot config file -# -RSNAPSHOT_CONFIG_VERSION=`%{_bindir}/rsnapshot check-config-version` -if test $? != 0; then - echo "Error upgrading %{_sysconfdir}/rsnapshot.conf" -fi - -if test "$RSNAPSHOT_CONFIG_VERSION" = "1.2"; then - # already latest version - exit 0 -fi - -if test "$RSNAPSHOT_CONFIG_VERSION" = "unknown"; then - %{_bindir}/rsnapshot upgrade-config-file - RETVAL=$? - exit $RETVAL -fi -echo "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" -exit 1 +%define logmsg logger -t %{name}/rpm +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ %clean -rm -rf %{buildroot} + +rm -rf $RPM_BUILD_ROOT + +################################################################################ %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README TODO -%config %{_sysconfdir}/rsnapshot.conf.default +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ %config(noreplace) %{_sysconfdir}/rsnapshot.conf -%{_bindir}/rsnapshot -%{_mandir}/man1/rsnapshot.1* +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ %changelog -* Tue Apr 12 2005 Gavin Henry -- Cleaned up a lot and reimported to Fedora Extras + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines * Sun Jan 29 2005 Nathan Rosenquist - Added upgrade script Index: sources =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Apr 2005 11:07:19 -0000 1.3 +++ sources 19 May 2006 23:34:16 -0000 1.4 @@ -1 +1 @@ -b126ae490889e5514f4a5d14a1128897 rsnapshot-1.2.1.tar.gz +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz --- rsnapshot.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 23:36:07 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 16:36:07 -0700 Subject: owners owners.list,1.1025,1.1026 Message-ID: <200605192336.k4JNa9iB008072@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8055 Modified Files: owners.list Log Message: claiming ownershop of the rsnapshot package (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191603) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1025 retrieving revision 1.1026 diff -u -r1.1025 -r1.1026 --- owners.list 19 May 2006 19:46:13 -0000 1.1025 +++ owners.list 19 May 2006 23:36:07 -0000 1.1026 @@ -1447,7 +1447,7 @@ Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|lists at forevermore.net|extras-qa at fedoraproject.org| Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 00:07:09 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:09 -0700 Subject: rpms/orpie/devel - New directory Message-ID: <200605200007.k4K07Boe010512@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10483/orpie/devel Log Message: Directory /cvs/extras/rpms/orpie/devel added to the repository From fedora-extras-commits at redhat.com Sat May 20 00:07:08 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:08 -0700 Subject: rpms/orpie - New directory Message-ID: <200605200007.k4K07Aka010509@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10483/orpie Log Message: Directory /cvs/extras/rpms/orpie added to the repository From fedora-extras-commits at redhat.com Sat May 20 00:07:17 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:17 -0700 Subject: rpms/orpie/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605200007.k4K07JFP010564@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10528/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module orpie --- NEW 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 May 20 00:07:17 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:17 -0700 Subject: rpms/orpie Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605200007.k4K07JGp010561@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10528 Added Files: Makefile import.log Log Message: Setup of module orpie --- NEW FILE Makefile --- # Top level Makefile for module orpie all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 20 00:07:37 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:37 -0700 Subject: rpms/orpie import.log,1.1,1.2 Message-ID: <200605200007.k4K07dH5010625@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10592 Modified Files: import.log Log Message: auto-import orpie-1.4.3-3 on branch devel from orpie-1.4.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/orpie/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 May 2006 00:07:17 -0000 1.1 +++ import.log 20 May 2006 00:07:37 -0000 1.2 @@ -0,0 +1 @@ +orpie-1_4_3-3:HEAD:orpie-1.4.3-3.src.rpm:1148083653 From fedora-extras-commits at redhat.com Sat May 20 00:07:38 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:38 -0700 Subject: rpms/orpie/devel orpie.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605200007.k4K07eff010630@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10592/devel Modified Files: .cvsignore sources Added Files: orpie.spec Log Message: auto-import orpie-1.4.3-3 on branch devel from orpie-1.4.3-3.src.rpm --- NEW FILE orpie.spec --- # # Specfile for Orpie, a curses-based RPN calculator # Name: orpie Version: 1.4.3 Release: 3 Summary: A fullscreen console-based RPN calculator application Group: Applications/Engineering License: GPL URL: http://www.eecs.umich.edu/~pelzlpj/orpie/ ################################################################################ Source: http://www.eecs.umich.edu/~pelzlpj/orpie/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ################################################################################ BuildRequires: camlp4 BuildRequires: gsl-devel BuildRequires: ncurses-devel Requires: ocaml >= 3.07 Requires: gsl >= 1.4 Requires: camlp4 ################################################################################ %description Orpie is a fullscreen console-based RPN calculator that uses the curses library. Its operation is similar to that of modern HP calculators, but data entry has been optimized for efficiency on a PC keyboard. Its features include extensive scientific calculator functionality, command completion, and a visible interactive stack. ################################################################################ %prep %setup -q # Replace static lib paths with %{_lib} so we build properly on x86_64 # systems, where the libs are actually in lib64. sed -i -e 's#/lib/#/%{_lib}/#' configure sed -i -e 's#/lib'\''#/%{_lib}'\''#' configure ################################################################################ %build %configure make %{?_smp_mflags} ################################################################################ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ################################################################################ %clean rm -rf $RPM_BUILD_ROOT ################################################################################ %files %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/orpierc %doc doc/manual.html doc/manual.pdf doc/manual.tex.in doc/TODO README COPYING ChangeLog %{_bindir}/* %{_mandir}/man[^3]/* ################################################################################ %changelog * Sun May 14 2006 Chris Petersen 1.4.3-3 - Fix a few dependencies as suggested during the fedora review process * Thu May 11 2006 Chris Petersen 1.4.3-1 - Update spec to match fedora guidelines * Mon Aug 2 2004 Chris Petersen - Minor changes to spec format for better consistency and readability * Tue Jun 15 2004 Chris Petersen - Update RPM for 1.2rc1, and include orpie-curses-keys man info * Tue Apr 6 2004 Chris Petersen - Built initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/orpie/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 May 2006 00:07:17 -0000 1.1 +++ .cvsignore 20 May 2006 00:07:38 -0000 1.2 @@ -0,0 +1 @@ +orpie-1.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/orpie/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 May 2006 00:07:17 -0000 1.1 +++ sources 20 May 2006 00:07:38 -0000 1.2 @@ -0,0 +1 @@ +1c9d87cf3f8d982a9a3662d48e13de55 orpie-1.4.3.tar.gz From fedora-extras-commits at redhat.com Sat May 20 00:11:38 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:11:38 -0700 Subject: owners owners.list,1.1026,1.1027 Message-ID: <200605200011.k4K0BeC8010698@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10681 Modified Files: owners.list Log Message: add orpie calculator: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191452 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1026 retrieving revision 1.1027 diff -u -r1.1026 -r1.1027 --- owners.list 19 May 2006 23:36:07 -0000 1.1026 +++ owners.list 20 May 2006 00:11:38 -0000 1.1027 @@ -884,6 +884,7 @@ Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|orpie|A fullscreen console-based RPN calculator|lists at forevermore.net|extras-qa at fedoraproject.org| Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|otrs|The Open Ticket Request System|imlinux at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 00:14:40 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:14:40 -0700 Subject: rpms/orpie/devel orpie.spec,1.1,1.2 Message-ID: <200605200014.k4K0Eghb010738@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10721 Modified Files: orpie.spec Log Message: Change the summary to remove a redundant word Index: orpie.spec =================================================================== RCS file: /cvs/extras/rpms/orpie/devel/orpie.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- orpie.spec 20 May 2006 00:07:38 -0000 1.1 +++ orpie.spec 20 May 2006 00:14:40 -0000 1.2 @@ -4,8 +4,8 @@ Name: orpie Version: 1.4.3 -Release: 3 -Summary: A fullscreen console-based RPN calculator application +Release: 4 +Summary: A fullscreen console-based RPN calculator Group: Applications/Engineering License: GPL @@ -81,6 +81,9 @@ %changelog +* Fri May 19 2006 Chris Petersen 1.4.3-4 +- Change the summary to remove a redundant word + * Sun May 14 2006 Chris Petersen 1.4.3-3 - Fix a few dependencies as suggested during the fedora review process From fedora-extras-commits at redhat.com Sat May 20 04:36:34 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 19 May 2006 21:36:34 -0700 Subject: rpms/scim-skk/FC-5 scim-skk.spec,1.11,1.12 Message-ID: <200605200436.k4K4aaGN023845@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23827 Modified Files: scim-skk.spec Log Message: Update the specfile against libstdc++so7 0:4.2.0-0.3.20060428.fc5.1 Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-5/scim-skk.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim-skk.spec 13 Feb 2006 06:31:14 -0000 1.11 +++ scim-skk.spec 20 May 2006 04:36:33 -0000 1.12 @@ -2,7 +2,7 @@ Name: scim-skk Version: 0.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SCIM IMEngine module for skk Group: System Environment/Libraries @@ -62,6 +62,9 @@ %changelog +* Sat Mar 20 2006 Ryo Dairiki - 0.5.2-4 +- rebuild against libstdc++so7 (0:4.2.0-0.3.20060428.fc5.1) + * Mon Feb 13 2006 Jens Petersen - 0.5.2-3 - build conditionally with libstdc++so7 preview library (#166041) - add with_libstdc_preview switch and tweak libtool to link against it From fedora-extras-commits at redhat.com Sat May 20 04:52:55 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Fri, 19 May 2006 21:52:55 -0700 Subject: rpms/ytalk/FC-5 ytalk.spec,1.2,1.3 Message-ID: <200605200453.k4K4rRja023958@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908/FC-5 Modified Files: ytalk.spec Log Message: Changed %build to allow rpmbuild remove debug info instead of doing it manually. Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/FC-5/ytalk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ytalk.spec 21 Feb 2006 10:28:13 -0000 1.2 +++ ytalk.spec 20 May 2006 04:52:55 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -22,13 +22,13 @@ %build %configure -make +make %{?_smp_mflags} %install -%makeinstall-strip - +#%makeinstall +make install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -38,6 +38,9 @@ %config(noreplace) /etc/ytalkrc %changelog +* Fri May 19 2006 Mike McGrath 3.3.0-4 +- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} + * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 - Upstream maintainer changed (from http://www.metawire.org/) From fedora-extras-commits at redhat.com Sat May 20 04:52:55 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Fri, 19 May 2006 21:52:55 -0700 Subject: rpms/ytalk/FC-4 ytalk.spec,1.2,1.3 Message-ID: <200605200453.k4K4rRou023955@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908/FC-4 Modified Files: ytalk.spec Log Message: Changed %build to allow rpmbuild remove debug info instead of doing it manually. Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/FC-4/ytalk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ytalk.spec 21 Feb 2006 10:28:07 -0000 1.2 +++ ytalk.spec 20 May 2006 04:52:54 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -22,13 +22,13 @@ %build %configure -make +make %{?_smp_mflags} %install -%makeinstall-strip - +#%makeinstall +make install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -38,6 +38,9 @@ %config(noreplace) /etc/ytalkrc %changelog +* Fri May 19 2006 Mike McGrath 3.3.0-4 +- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} + * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 - Upstream maintainer changed (from http://www.metawire.org/) From fedora-extras-commits at redhat.com Sat May 20 04:52:56 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Fri, 19 May 2006 21:52:56 -0700 Subject: rpms/ytalk/devel ytalk.spec,1.2,1.3 Message-ID: <200605200453.k4K4rSGa023961@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908/devel Modified Files: ytalk.spec Log Message: Changed %build to allow rpmbuild remove debug info instead of doing it manually. Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ytalk.spec 21 Feb 2006 10:28:13 -0000 1.2 +++ ytalk.spec 20 May 2006 04:52:56 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -22,13 +22,13 @@ %build %configure -make +make %{?_smp_mflags} %install -%makeinstall-strip - +#%makeinstall +make install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -38,6 +38,9 @@ %config(noreplace) /etc/ytalkrc %changelog +* Fri May 19 2006 Mike McGrath 3.3.0-4 +- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} + * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 - Upstream maintainer changed (from http://www.metawire.org/) From fedora-extras-commits at redhat.com Sat May 20 05:07:33 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:07:33 -0700 Subject: extras-buildsys/server main.py,1.22,1.23 Message-ID: <200605200507.k4K57XHI026426@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26404/server Modified Files: main.py Log Message: Don't hang on Ctrl+C Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- main.py 14 May 2006 05:43:07 -0000 1.22 +++ main.py 20 May 2006 05:07:30 -0000 1.23 @@ -180,7 +180,10 @@ if opts.pidfile: os.unlink(opts.pidfile) - time.sleep(2) + try: + time.sleep(2) + except KeyboardInterrupt: + pass print "Done." os._exit(0) From fedora-extras-commits at redhat.com Sat May 20 05:07:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:07:59 -0700 Subject: extras-buildsys/builder BuilderMock.py,1.8,1.9 Message-ID: <200605200507.k4K57xK1026450@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26432/builder Modified Files: BuilderMock.py Log Message: Cosmetic newline Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- BuilderMock.py 16 May 2006 15:49:50 -0000 1.8 +++ BuilderMock.py 20 May 2006 05:07:56 -0000 1.9 @@ -409,7 +409,7 @@ pass elif status == FileTransfer.FT_RESULT_FAILED: self._done_status = 'failed' - self._log("Job failed because files could not be uploaded: %s" % msg) + self._log("Job failed because files could not be uploaded: %s\n" % msg) self._status = self._done_status self._uploader = None From fedora-extras-commits at redhat.com Sat May 20 05:10:10 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:10:10 -0700 Subject: extras-buildsys/builder Builder.py,1.14,1.15 Message-ID: <200605200510.k4K5AAqG026515@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26467/builder Modified Files: Builder.py Log Message: 2006-05-20 Dan Williams * server/Builder.py builder/Builder.py - Make passive builders work more - Consolidate some code into base Builder object in the server - Don't hang a job if it fails before we've had a chance to contact the builder after starting it 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 16 May 2006 15:49:50 -0000 1.14 +++ Builder.py 20 May 2006 05:10:02 -0000 1.15 @@ -66,14 +66,6 @@ return max_jobs -def prefix_url(url, use_ssl): - """Convenience function to add correct URL method - for the security method we're using.""" - if use_ssl: - return "https://" + url - return "http://" + url - - class Builder(object): """ Abstract builder base object """ def __init__(self, cfg): @@ -134,6 +126,13 @@ sys.stdout.write(msg) sys.stdout.flush() + def _prefix_url(self, url): + """Convenience function to add correct URL method + for the security method we're using.""" + if self._use_ssl: + return "https://" + url + return "http://" + url + def new_builder(cfg, btype): """Create and return a new builder object of the requested type.""" if btype == 'passive': @@ -374,6 +373,7 @@ self._http_server = None self._xmlrpc_server = None self._work_dir = os.path.abspath(cfg.get_str("Directories", "builder_work_dir")) + self._fileserver_port = self._cfg.get_int("Passive", "fileserver_port") threading.Thread.__init__(self) self._init_servers() @@ -386,12 +386,12 @@ self._log("Binding to address '%s:%d'\n" % (hostname, xmlrpc_port)) - port = self._cfg.get_int("Passive", "fileserver_port") try: - self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), + self._http_server = HTTPServer.PlgHTTPServerManager((hostname, self._fileserver_port), self._work_dir, self._certs) except socket.error, exc: - raise socket.error(exc[0], "Couldn't create server for %s:%s: '%s'" % (hostname, port, exc[1])) + raise socket.error(exc[0], "Couldn't create server for %s:%s: '%s'" % (hostname, + self._fileserver_port, exc[1])) self._http_server.set_POST_handler('/upload', self.upload_callback) try: @@ -549,14 +549,12 @@ # url-ify the file list urls = [] - work_dir = self._get_workdir_for_job(job.uniqid()) - port = "%s" % self._cfg.get_int("Network", "fileserver_port") - host = prefix_url(get_hostname(self._cfg)) + host = self._prefix_url(get_hostname(self._cfg)) for fpath in job.files(): - if not fpath.startswith(work_dir): + if not fpath.startswith(self._work_dir): return None - file_part = urllib.quote(fpath[len(work_dir) + 1:]) - full_url = "%s:%s/%s" % (host, port, file_part) + file_part = urllib.quote(fpath[len(self._work_dir) + 1:]) + full_url = "%s:%d/%s" % (host, self._fileserver_port, file_part) urls.append(full_url) return Commands.PlgCommandJobFilesAck(archjob_id, urls, cmd.seq(), self._seq_gen.next()) @@ -601,7 +599,7 @@ threading.Thread.__init__(self) def _get_server_address(self, port): - addr = prefix_url(self._server_hostname, self._use_ssl) + addr = self._prefix_url(self._server_hostname) return addr + ":" + port def download_srpm(self, archjob_id, url, target_dir, dl_callback, cb_data=None): @@ -616,7 +614,7 @@ def upload_files(self, archjob_id, files, ul_callback, cb_data=None): port = self._cfg.get_int("Active", "fileserver_port") url = "%s:%d/upload" % (self._server_hostname, port) - url = prefix_url(url, self._use_ssl) + url = self._prefix_url(url) data = [("archjob_id", archjob_id)] uploader = FileUploader.FileUploader(url, files, 'filedata', data, self._certs) From fedora-extras-commits at redhat.com Sat May 20 05:10:10 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:10:10 -0700 Subject: extras-buildsys/server ArchJob.py,1.32,1.33 Builder.py,1.42,1.43 Message-ID: <200605200510.k4K5ABVB026524@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26467/server Modified Files: ArchJob.py Builder.py Log Message: 2006-05-20 Dan Williams * server/Builder.py builder/Builder.py - Make passive builders work more - Consolidate some code into base Builder object in the server - Don't hang a job if it fails before we've had a chance to contact the builder after starting it Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ArchJob.py 14 May 2006 05:43:07 -0000 1.32 +++ ArchJob.py 20 May 2006 05:10:08 -0000 1.33 @@ -191,6 +191,10 @@ self._builder.remove_suspend_listener(self) self._set_status(AJ_STATUS_DONE) + def _handle_builder_finished(self): + self._set_status(AJ_STATUS_DOWNLOADING) + self._builder.request_job_files(self._id) + def _status_queued(self): pass @@ -201,7 +205,10 @@ if self._builder_status == 'downloaded': self._set_status(AJ_STATUS_REPO_WAIT) self._repo.request_unlock(self) - + + if self._builder_finished(): + self._handle_builder_finished() + def _status_repo_wait(self): pass @@ -217,13 +224,15 @@ if self._builder_status != 'downloaded': self._set_status(AJ_STATUS_RUNNING) + if self._builder_finished(): + self._handle_builder_finished() + def _status_running(self): if self._builder_status != 'prepping': self._prepping = False if self._builder_finished(): - self._set_status(AJ_STATUS_DOWNLOADING) - self._builder.request_job_files(self._id) + self._handle_builder_finished() def get_result_files_dir(self): result_dir = os.path.join(self._parent.get_stage_dir(), self._target_dict['arch']) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- Builder.py 16 May 2006 15:49:56 -0000 1.42 +++ Builder.py 20 May 2006 05:10:08 -0000 1.43 @@ -59,6 +59,7 @@ self._seq_gen = Commands.SequenceGenerator() self._lock = threading.Lock() self._cmd_queue = [] + self._ack_pending_list = [] self._suspend_listeners = [] self._status_listeners = [] self._ip = None @@ -159,6 +160,10 @@ self._prepping_jobs = False self._when_died = time.time() self._jobs = {} + self._cmd_queue = [] + self._ack_pending_list = [] + self._free_slots = 0 + self._ip = None self._notify_suspend_listeners(reason, msg) @@ -255,10 +260,10 @@ old_cmd = None self._lock.acquire() - for queued_cmd in self._cmd_queue: - if queued_cmd.seq() == ack.acked_seq() and isinstance(queued_cmd, old_cmd_type): - old_cmd = queued_cmd - self._cmd_queue.remove(queued_cmd) + for cmd in self._ack_pending_list[:]: + if cmd.seq() == ack.acked_seq() and isinstance(cmd, old_cmd_type): + old_cmd = cmd + self._ack_pending_list.remove(cmd) break self._lock.release() return old_cmd @@ -416,6 +421,46 @@ self._certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") self._certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + def _download_cb(self, result, (archjob, urls), msg): + """Notify archjob of the result of its download request.""" + if result == FileTransfer.FT_RESULT_FAILED: + print "Builder Error (%s): result files download failed for %s (%s). " \ + " '%s'" % (self._address, archjob.archjob_id(), archjob.arch(), msg) + + files = {} + result_files_dir = archjob.get_result_files_dir() + for url in urls: + try: + fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) + except FileDownloader.FileNameException, exc: + print "Error in JobFilesAck for %s: %s" % (url, exc) + continue + if result == FileTransfer.FT_RESULT_SUCCESS: + fpath = os.path.join(result_files_dir, fname) + if os.path.exists(fpath): + files[fname] = FileTransfer.FT_RESULT_SUCCESS + else: + files[fname] = FileTransfer.FT_RESULT_FAILED + else: + files[fname] = FileTransfer.FT_RESULT_FAILED + archjob.download_cb(files) + + def _handle_job_files_ack(self, cmd): + (archjob, urls) = self._decompose_job_files_ack(cmd) + if not archjob: + return + + if not urls or not len(urls): + archjob.download_cb({}) + return + + # Basic sanity checks; whether the files exist, etc + result_files_dir = archjob.get_result_files_dir() + downloader = FileDownloader.FileDownloader(urls, result_files_dir, + ['.rpm', '.log'], self._certs) + downloader.set_callback(self._download_cb, (archjob, urls)) + downloader.start() + def _send_commands(self): """Send queued commands to the builder, and then get it's list of reply commands.""" @@ -432,13 +477,15 @@ # Copy command queue self._lock.acquire() self._cmd_queue = self._cmd_queue + new_cmds - cmd_list = self._cmd_queue - # FIXME: deal with keeping ack-requiring cmds around + cmd_list = self._cmd_queue[:] + for cmd in self._cmd_queue: + if cmd.need_ack(): + self._ack_pending_list.append(cmd) self._cmd_queue = [] self._lock.release() # The actual XML-RPC request runs in a different thread because SSL - # calls sometimes hang + # calls sometimes hang req = PassiveBuilderRequest(self._address, self._certs, cmd_list) curtime = time.time() req.start() @@ -509,7 +556,6 @@ self._get_ip() # Try to talk to the builder - print "builder contact" cmd_list = self._send_commands() if cmd_list: # Builder is alive @@ -537,14 +583,7 @@ def _handle_builder_suspend(self, reason, msg): Builder._handle_builder_suspend(self, reason, msg) self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL - self._ip = None self._target_list = None - # Set free slots to zero so we don't send the - # builder a job on first contact - self._free_slots = 0 - - # Clear out the command queue; we start clean - self._cmd_queue = [] def _handle_builder_reactivate(self): mail = True @@ -571,9 +610,6 @@ def __init__(self, manager, cfg, address, weight): Builder.__init__(self, manager, cfg, address, weight, TYPE_ACTIVE) - def _init_builder(self, target_list): - self._target_list = target_list - def _handle_job_files_ack(self, cmd): (archjob, urls) = self._decompose_job_files_ack(cmd) if not archjob: @@ -641,13 +677,11 @@ self._cmd_queue = self._cmd_queue + new_cmds cmd_list = self._cmd_queue[:] - # Remove commands that don't require an ack, - # since we don't need to keep track of those - tmp_cmd_queue = [] + # Keep around commands that need an ack for cmd in self._cmd_queue: if cmd.need_ack(): - tmp_cmd_queue.append(cmd) - self._cmd_queue = tmp_cmd_queue + self._ack_pending_list.append(cmd) + self._cmd_queue = [] self._lock.release() return cmd_list @@ -678,11 +712,6 @@ def _handle_builder_suspend(self, reason, msg): Builder._handle_builder_suspend(self, reason, msg) self._last_contact = 0 - self._ip = None - - # Clear out the command queue; we start clean when the - # builder contacts us again - self._cmd_queue = [] def _handle_builder_reactivate(self, cmd_list): # Grab an updated target list from the command stream when @@ -710,5 +739,5 @@ self._lock.acquire() Builder._handle_builder_reactivate(self, mail=mail) - self._init_builder(target_list) + self._target_list = target_list self._lock.release() From fedora-extras-commits at redhat.com Sat May 20 05:10:04 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:10:04 -0700 Subject: extras-buildsys ChangeLog,1.200,1.201 Message-ID: <200605200510.k4K5AYd8026532@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26467 Modified Files: ChangeLog Log Message: 2006-05-20 Dan Williams * server/Builder.py builder/Builder.py - Make passive builders work more - Consolidate some code into base Builder object in the server - Don't hang a job if it fails before we've had a chance to contact the builder after starting it Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- ChangeLog 16 May 2006 15:49:50 -0000 1.200 +++ ChangeLog 20 May 2006 05:10:02 -0000 1.201 @@ -1,3 +1,12 @@ +2006-05-20 Dan Williams + + * server/Builder.py + builder/Builder.py + - Make passive builders work more + - Consolidate some code into base Builder object in the server + - Don't hang a job if it fails before we've had a chance to contact + the builder after starting it + 2006-05-16 Dan Williams * Make passive builders work somewhat more; there are still some bugs From fedora-extras-commits at redhat.com Sat May 20 06:03:40 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 19 May 2006 23:03:40 -0700 Subject: rpms/scim-tomoe/FC-5 scim-tomoe.spec,1.9,1.10 Message-ID: <200605200603.k4K63ggD028942@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28925 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-5/scim-tomoe.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-tomoe.spec 1 Mar 2006 14:41:15 -0000 1.9 +++ scim-tomoe.spec 20 May 2006 06:03:40 -0000 1.10 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -64,6 +64,9 @@ %changelog +* Sat May 20 2006 Ryo Dairiki - 0.2-4 +- rebuild against new libstdc++so7 + * Wed Mar 1 2006 Ryo Dairiki - 0.2-3 - update to 0.2 From fedora-extras-commits at redhat.com Sat May 20 06:05:11 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 19 May 2006 23:05:11 -0700 Subject: rpms/scim-tomoe/FC-5 scim-tomoe.spec,1.10,1.11 Message-ID: <200605200605.k4K65DOx029007@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28990 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-5/scim-tomoe.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-tomoe.spec 20 May 2006 06:03:40 -0000 1.10 +++ scim-tomoe.spec 20 May 2006 06:05:11 -0000 1.11 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -64,7 +64,7 @@ %changelog -* Sat May 20 2006 Ryo Dairiki - 0.2-4 +* Sat May 20 2006 Ryo Dairiki - 0.2-5 - rebuild against new libstdc++so7 * Wed Mar 1 2006 Ryo Dairiki - 0.2-3 From fedora-extras-commits at redhat.com Sat May 20 06:37:54 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:37:54 -0700 Subject: rpms/lilypond - New directory Message-ID: <200605200637.k4K6buSQ029196@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29170/lilypond Log Message: Directory /cvs/extras/rpms/lilypond added to the repository From fedora-extras-commits at redhat.com Sat May 20 06:37:55 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:37:55 -0700 Subject: rpms/lilypond/devel - New directory Message-ID: <200605200637.k4K6bvcI029199@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29170/lilypond/devel Log Message: Directory /cvs/extras/rpms/lilypond/devel added to the repository From fedora-extras-commits at redhat.com Sat May 20 06:38:04 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:38:04 -0700 Subject: rpms/lilypond Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605200638.k4K6c6tt029248@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29215 Added Files: Makefile import.log Log Message: Setup of module lilypond --- NEW FILE Makefile --- # Top level Makefile for module lilypond all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 20 06:38:05 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:38:05 -0700 Subject: rpms/lilypond/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605200638.k4K6c71O029251@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29215/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lilypond --- NEW 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 May 20 06:40:15 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:40:15 -0700 Subject: rpms/lilypond import.log,1.1,1.2 Message-ID: <200605200640.k4K6eHa4029318@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29285 Modified Files: import.log Log Message: auto-import lilypond-2.8.3-1 on branch devel from lilypond-2.8.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lilypond/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 May 2006 06:38:04 -0000 1.1 +++ import.log 20 May 2006 06:40:15 -0000 1.2 @@ -0,0 +1 @@ +lilypond-2_8_3-1:HEAD:lilypond-2.8.3-1.src.rpm:1148107220 From fedora-extras-commits at redhat.com Sat May 20 06:40:16 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:40:16 -0700 Subject: rpms/lilypond/devel lilypond.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605200640.k4K6eInd029323@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29285/devel Modified Files: .cvsignore sources Added Files: lilypond.spec Log Message: auto-import lilypond-2.8.3-1 on branch devel from lilypond-2.8.3-1.src.rpm --- NEW FILE lilypond.spec --- Name: lilypond Version: 2.8.3 Release: 1%{?dist} Summary: A typesetting system for music notation Group: Applications/Publishing License: GPL URL: http://www.lilypond.org Source0: http://www.lilypond.org/download/v2.8/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ghostscript >= 8.15 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Buildrequires: t1utils bison flex mftrace ImageMagick BuildRequires: gettext python-devel tetex BuildRequires: texinfo >= 4.7 BuildRequires: guile-devel >= 1.6.4 BuildRequires: ghostscript >= 8.15 BuildRequires: pango-devel >= 1.6.0 %description LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. %prep %setup -q %build %configure --without-kpathsea --disable-checking \ --with-ncsb-dir=%{_datadir}/fonts/default/Type1 make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT package_infodir=%{_infodir} \ vimdir=%{_datadir}/vim/vim70e chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/python/midi.so # Symlink lilypond-init.el in emacs' site-start.d directory pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir site-start.d ln -s ../lilypond-init.el site-start.d popd # Change encoding to UTF8 pushd $RPM_BUILD_ROOT%{_infodir} iconv -f iso-8859-1 -t utf-8 music-glossary.info > music-glossary.info.utf8 mv music-glossary.info.utf8 music-glossary.info popd rm -f $RPM_BUILD_ROOT%{_infodir}/dir %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz %preun /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS.txt COPYING DEDICATION HACKING INSTALL.txt %doc NEWS.txt README.txt ROADMAP THANKS VERSION %{_bindir}/* %{_libdir}/lilypond %{_datadir}/lilypond %{_datadir}/emacs/site-lisp %{_datadir}/vim/vim* %{_infodir}/*.gz %{_mandir}/man1/* %{_datadir}/omf/lilypond %ghost %{_datadir}/lilypond/%{version}/python/*.pyo %changelog * Sat May 20 2006 Quentin Spencer 2.8.3-1 - New upstream, remove patch. - Put docs in separate SRPM. * Mon May 15 2006 Quentin Spencer 2.8.2-3 - Fixes to dependencies, encoding of info files. - Add docs as separate tarball (building them fails without ghostscript 8.50). * Mon May 15 2006 Quentin Spencer 2.8.2-2 - Patch to fix segfault in fontconfig. * Sat May 13 2006 Quentin Spencer 2.8.2-1 - New release. * Tue May 2 2006 Quentin Spencer 2.8.1-4 - Add missing BuildRequires. - Specify location of NCSB fonts to configure script. - Disable parallel build. * Tue Apr 25 2006 Quentin Spencer 2.8.1-3 - Make .so file executable. * Tue Apr 25 2006 Quentin Spencer 2.8.1-2 - Use gettext. * Mon Apr 10 2006 Quentin Spencer 2.8.1-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 May 2006 06:38:05 -0000 1.1 +++ .cvsignore 20 May 2006 06:40:16 -0000 1.2 @@ -0,0 +1 @@ +lilypond-2.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 May 2006 06:38:05 -0000 1.1 +++ sources 20 May 2006 06:40:16 -0000 1.2 @@ -0,0 +1 @@ +3ca497670b1ff372f85a371ef3b8cd91 lilypond-2.8.3.tar.gz From fedora-extras-commits at redhat.com Sat May 20 06:52:50 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:52:50 -0700 Subject: rpms/mftrace/devel mftrace.spec,1.3,1.4 Message-ID: <200605200652.k4K6qq6g029450@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29433 Modified Files: mftrace.spec Log Message: Make sure are used Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/mftrace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mftrace.spec 14 May 2006 06:04:16 -0000 1.3 +++ mftrace.spec 20 May 2006 06:52:50 -0000 1.4 @@ -1,6 +1,6 @@ Name: mftrace Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -24,6 +24,7 @@ %prep %setup -q +sed -i -e "s/-Wall -O2/$RPM_OPT_FLAGS/" GNUmakefile.in %build @@ -49,6 +50,9 @@ %changelog +* Sat May 20 2006 Quentin Spencer 1.2.4-2 +- Make sure $RPM_OPT_FLAGS are used + * Sat May 13 2006 Quentin Spencer 1.2.4-1 - New upstream release. From fedora-extras-commits at redhat.com Sat May 20 06:54:39 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:54:39 -0700 Subject: rpms/mftrace/FC-5 mftrace.spec,1.3,1.4 Message-ID: <200605200654.k4K6sfh7029528@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29511 Modified Files: mftrace.spec Log Message: Make sure are used Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/mftrace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mftrace.spec 14 May 2006 06:12:39 -0000 1.3 +++ mftrace.spec 20 May 2006 06:54:39 -0000 1.4 @@ -1,6 +1,6 @@ Name: mftrace Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -24,6 +24,7 @@ %prep %setup -q +sed -i -e "s/-Wall -O2/$RPM_OPT_FLAGS/" GNUmakefile.in %build @@ -49,6 +50,9 @@ %changelog +* Sat May 20 2006 Quentin Spencer 1.2.4-2 +- Make sure $RPM_OPT_FLAGS are used + * Sat May 13 2006 Quentin Spencer 1.2.4-1 - New upstream release. From fedora-extras-commits at redhat.com Sat May 20 06:55:50 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:55:50 -0700 Subject: rpms/mftrace/FC-4 mftrace.spec,1.3,1.4 Message-ID: <200605200655.k4K6tqmH029604@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29587 Modified Files: mftrace.spec Log Message: Make sure are used Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-4/mftrace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mftrace.spec 14 May 2006 06:26:22 -0000 1.3 +++ mftrace.spec 20 May 2006 06:55:50 -0000 1.4 @@ -1,6 +1,6 @@ Name: mftrace Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -24,6 +24,7 @@ %prep %setup -q +sed -i -e "s/-Wall -O2/$RPM_OPT_FLAGS/" GNUmakefile.in %build @@ -49,6 +50,9 @@ %changelog +* Sat May 20 2006 Quentin Spencer 1.2.4-2 +- Make sure $RPM_OPT_FLAGS are used + * Sat May 13 2006 Quentin Spencer 1.2.4-1 - New upstream release. From fedora-extras-commits at redhat.com Sat May 20 07:02:33 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 00:02:33 -0700 Subject: owners owners.list,1.1027,1.1028 Message-ID: <200605200703.k4K737qG031927@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31907 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1027 retrieving revision 1.1028 diff -u -r1.1027 -r1.1028 --- owners.list 20 May 2006 00:11:38 -0000 1.1027 +++ owners.list 20 May 2006 07:02:33 -0000 1.1028 @@ -727,6 +727,7 @@ Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lightning|GNU Lightning|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|lilypond|A typesetting system for music notation|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 07:38:03 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 20 May 2006 00:38:03 -0700 Subject: rpms/libkexif/FC-5 .cvsignore, 1.4, 1.5 libkexif.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605200738.k4K7c6Od032218@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkexif/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32181/FC-5 Modified Files: .cvsignore libkexif.spec sources Log Message: update to 0.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkexif/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Oct 2005 07:14:10 -0000 1.4 +++ .cvsignore 20 May 2006 07:38:03 -0000 1.5 @@ -1 +1 @@ -libkexif-0.2.2.tar.bz2 +libkexif-0.2.3.tar.bz2 Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/FC-5/libkexif.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libkexif.spec 21 Feb 2006 17:26:19 -0000 1.12 +++ libkexif.spec 20 May 2006 07:38:03 -0000 1.13 @@ -1,13 +1,13 @@ Name: libkexif -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: Allow Kipi plugins to extract EXIF information Group: System Environment/Libraries License: GPL URL: http://extragear.kde.org/apps/kipi -Source0: http://dl.sf.net/digikam/libkexif-0.2.2.tar.bz2 +Source0: http://dl.sf.net/kipi/libkexif-0.2.3.tar.bz2 Patch0: libkexif-0.2.1-qcombobox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ %changelog +* Sat May 20 2006 Aurelien Bompard 0.2.3-1 +- version 0.2.3 + * Tue Feb 21 2006 Aurelien Bompard 0.2.2-4 - rebuild for fc5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkexif/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Oct 2005 07:14:10 -0000 1.4 +++ sources 20 May 2006 07:38:03 -0000 1.5 @@ -1 +1 @@ -3adf724e84da04fa0ee6f92ac9516468 libkexif-0.2.2.tar.bz2 +5d25cd7bf9f05dfa0611d32129980f97 libkexif-0.2.3.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 07:38:04 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 20 May 2006 00:38:04 -0700 Subject: rpms/libkexif/devel .cvsignore, 1.4, 1.5 libkexif.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605200738.k4K7c6wC032224@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkexif/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32181/devel Modified Files: .cvsignore libkexif.spec sources Log Message: update to 0.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Oct 2005 07:14:10 -0000 1.4 +++ .cvsignore 20 May 2006 07:38:04 -0000 1.5 @@ -1 +1 @@ -libkexif-0.2.2.tar.bz2 +libkexif-0.2.3.tar.bz2 Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libkexif.spec 21 Feb 2006 17:26:19 -0000 1.12 +++ libkexif.spec 20 May 2006 07:38:04 -0000 1.13 @@ -1,13 +1,13 @@ Name: libkexif -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: Allow Kipi plugins to extract EXIF information Group: System Environment/Libraries License: GPL URL: http://extragear.kde.org/apps/kipi -Source0: http://dl.sf.net/digikam/libkexif-0.2.2.tar.bz2 +Source0: http://dl.sf.net/kipi/libkexif-0.2.3.tar.bz2 Patch0: libkexif-0.2.1-qcombobox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ %changelog +* Sat May 20 2006 Aurelien Bompard 0.2.3-1 +- version 0.2.3 + * Tue Feb 21 2006 Aurelien Bompard 0.2.2-4 - rebuild for fc5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Oct 2005 07:14:10 -0000 1.4 +++ sources 20 May 2006 07:38:04 -0000 1.5 @@ -1 +1 @@ -3adf724e84da04fa0ee6f92ac9516468 libkexif-0.2.2.tar.bz2 +5d25cd7bf9f05dfa0611d32129980f97 libkexif-0.2.3.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 07:43:45 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 20 May 2006 00:43:45 -0700 Subject: rpms/libkipi/FC-5 .cvsignore, 1.4, 1.5 libkipi.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605200743.k4K7hlfB032371@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkipi/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32334/FC-5 Modified Files: .cvsignore libkipi.spec sources Log Message: update to 0.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkipi/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Oct 2005 07:15:56 -0000 1.4 +++ .cvsignore 20 May 2006 07:43:45 -0000 1.5 @@ -1 +1 @@ -libkipi-0.1.2.tar.bz2 +libkipi-0.1.4.tar.bz2 Index: libkipi.spec =================================================================== RCS file: /cvs/extras/rpms/libkipi/FC-5/libkipi.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libkipi.spec 22 Feb 2006 15:17:54 -0000 1.10 +++ libkipi.spec 20 May 2006 07:43:45 -0000 1.11 @@ -1,12 +1,12 @@ Name: libkipi -Version: 0.1.2 -Release: 5%{?dist} +Version: 0.1.4 +Release: 1%{?dist} Summary: Common plugin infrastructure for KDE image applications Group: System Environment/Libraries License: LGPL URL: http://extragear.kde.org/apps/kipi -Source0: http://dl.sf.net/digikam/libkipi-0.1.2.tar.bz2 +Source0: http://dl.sf.net/kipi/libkipi-0.1.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:3.0 @@ -83,6 +83,9 @@ %changelog +* Sat May 20 2006 Aurelien Bompard 0.1.4-1 +- version 0.1.4 + * Wed Feb 22 2006 Aurelien Bompard 0.1.2-5 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkipi/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Oct 2005 07:15:56 -0000 1.4 +++ sources 20 May 2006 07:43:45 -0000 1.5 @@ -1 +1 @@ -2fc68328b1331039861fca6f9354d635 libkipi-0.1.2.tar.bz2 +2d8b8da064b85b0e53a98b4a7510392e libkipi-0.1.4.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 07:43:46 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 20 May 2006 00:43:46 -0700 Subject: rpms/libkipi/devel .cvsignore, 1.4, 1.5 libkipi.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605200743.k4K7hmZt032377@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkipi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32334/devel Modified Files: .cvsignore libkipi.spec sources Log Message: update to 0.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Oct 2005 07:15:56 -0000 1.4 +++ .cvsignore 20 May 2006 07:43:46 -0000 1.5 @@ -1 +1 @@ -libkipi-0.1.2.tar.bz2 +libkipi-0.1.4.tar.bz2 Index: libkipi.spec =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/libkipi.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libkipi.spec 22 Feb 2006 15:17:54 -0000 1.10 +++ libkipi.spec 20 May 2006 07:43:46 -0000 1.11 @@ -1,12 +1,12 @@ Name: libkipi -Version: 0.1.2 -Release: 5%{?dist} +Version: 0.1.4 +Release: 1%{?dist} Summary: Common plugin infrastructure for KDE image applications Group: System Environment/Libraries License: LGPL URL: http://extragear.kde.org/apps/kipi -Source0: http://dl.sf.net/digikam/libkipi-0.1.2.tar.bz2 +Source0: http://dl.sf.net/kipi/libkipi-0.1.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:3.0 @@ -83,6 +83,9 @@ %changelog +* Sat May 20 2006 Aurelien Bompard 0.1.4-1 +- version 0.1.4 + * Wed Feb 22 2006 Aurelien Bompard 0.1.2-5 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Oct 2005 07:15:56 -0000 1.4 +++ sources 20 May 2006 07:43:46 -0000 1.5 @@ -1 +1 @@ -2fc68328b1331039861fca6f9354d635 libkipi-0.1.2.tar.bz2 +2d8b8da064b85b0e53a98b4a7510392e libkipi-0.1.4.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 09:44:13 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 02:44:13 -0700 Subject: fedora-security/audit fe5,1.25,1.26 Message-ID: <200605200944.k4K9iDlG004920@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4900 Modified Files: fe5 Log Message: CVE-2006-2480: dia Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- fe5 19 May 2006 04:53:33 -0000 1.25 +++ fe5 20 May 2006 09:44:10 -0000 1.26 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2480 VULNERABLE (dia) bz#192535 CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 From fedora-extras-commits at redhat.com Sat May 20 09:55:20 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 02:55:20 -0700 Subject: fedora-security/audit fe4,1.28,1.29 fe5,1.26,1.27 Message-ID: <200605200955.k4K9tK9C005040@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5020 Modified Files: fe4 fe5 Log Message: Note CVE-2006-2162, CVE-2006-2489 nagios version fixes. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- fe4 19 May 2006 04:53:33 -0000 1.28 +++ fe4 20 May 2006 09:55:18 -0000 1.29 @@ -2,12 +2,13 @@ ** are items that need attention +CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 -CVE-2006-2162 VULNERABLE (nagios) bz#190614 +CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190614 CVE-2006-2093 version (nessus, fixed 2.2.7) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- fe5 20 May 2006 09:44:10 -0000 1.26 +++ fe5 20 May 2006 09:55:18 -0000 1.27 @@ -2,13 +2,14 @@ ** are items that need attention +CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2480 VULNERABLE (dia) bz#192535 CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 -CVE-2006-2162 VULNERABLE (nagios) bz#190612 +CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612 CVE-2006-2093 version (nessus, fixed 2.2.7) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) From fedora-extras-commits at redhat.com Sat May 20 10:53:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 03:53:23 -0700 Subject: rpms/htop/devel .cvsignore, 1.4, 1.5 htop.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605201053.k4KArPNO007536@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7515 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 May 2006 14:40:27 -0000 1.4 +++ .cvsignore 20 May 2006 10:53:23 -0000 1.5 @@ -1 +1 @@ -htop-0.6.1.tar.gz +htop-0.6.2.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- htop.spec 10 May 2006 15:03:57 -0000 1.6 +++ htop.spec 20 May 2006 10:53:23 -0000 1.7 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -22,7 +22,8 @@ %build -%configure +%configure \ + --disable-dependency-tracking make %{?_smp_mflags} @@ -53,6 +54,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 +- Update to 0.6.2 + * Wed May 10 2006 Dawid Gajownik - 0.6.1-2 - Add missing BR: desktop-file-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 May 2006 14:40:27 -0000 1.5 +++ sources 20 May 2006 10:53:23 -0000 1.6 @@ -1 +1 @@ -f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz +995e76b7fd18c05fb7fb5ef10a2166ca htop-0.6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 10:54:53 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 03:54:53 -0700 Subject: rpms/htop/FC-5 .cvsignore, 1.4, 1.5 htop.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605201054.k4KAstRr007614@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7593 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 May 2006 14:42:23 -0000 1.4 +++ .cvsignore 20 May 2006 10:54:53 -0000 1.5 @@ -1 +1 @@ -htop-0.6.1.tar.gz +htop-0.6.2.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/htop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- htop.spec 10 May 2006 15:05:34 -0000 1.6 +++ htop.spec 20 May 2006 10:54:53 -0000 1.7 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -22,7 +22,8 @@ %build -%configure +%configure \ + --disable-dependency-tracking make %{?_smp_mflags} @@ -53,6 +54,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 +- Update to 0.6.2 + * Wed May 10 2006 Dawid Gajownik - 0.6.1-2 - Add missing BR: desktop-file-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 May 2006 14:42:23 -0000 1.5 +++ sources 20 May 2006 10:54:53 -0000 1.6 @@ -1 +1 @@ -f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz +995e76b7fd18c05fb7fb5ef10a2166ca htop-0.6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 10:56:53 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 03:56:53 -0700 Subject: rpms/htop/FC-4 .cvsignore, 1.4, 1.5 htop.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200605201056.k4KAut6F007695@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7674 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 May 2006 14:49:10 -0000 1.4 +++ .cvsignore 20 May 2006 10:56:53 -0000 1.5 @@ -1 +1 @@ -htop-0.6.1.tar.gz +htop-0.6.2.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- htop.spec 10 May 2006 15:06:57 -0000 1.5 +++ htop.spec 20 May 2006 10:56:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -22,7 +22,8 @@ %build -%configure +%configure \ + --disable-dependency-tracking make %{?_smp_mflags} @@ -53,6 +54,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 +- Update to 0.6.2 + * Wed May 10 2006 Dawid Gajownik - 0.6.1-2 - Add missing BR: desktop-file-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 May 2006 14:49:10 -0000 1.5 +++ sources 20 May 2006 10:56:53 -0000 1.6 @@ -1 +1 @@ -f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz +995e76b7fd18c05fb7fb5ef10a2166ca htop-0.6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 11:10:47 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sat, 20 May 2006 04:10:47 -0700 Subject: rpms/bmp-flac2/devel .cvsignore, 1.3, 1.4 bmp-flac2.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605201110.k4KBAndb010455@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/bmp-flac2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10434 Modified Files: .cvsignore bmp-flac2.spec sources Log Message: Update to 008 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2005 16:07:07 -0000 1.3 +++ .cvsignore 20 May 2006 11:10:47 -0000 1.4 @@ -1 +1 @@ -bmp-flac2-007.tar.gz +bmp-flac2-008.tar.gz Index: bmp-flac2.spec =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/bmp-flac2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bmp-flac2.spec 21 Feb 2006 15:17:33 -0000 1.3 +++ bmp-flac2.spec 20 May 2006 11:10:47 -0000 1.4 @@ -1,8 +1,8 @@ %define bmp_input_plugin_dir %(pkg-config --variable=input_plugin_dir bmp 2>/dev/null || echo %{_libdir}/bmp/Input) Name: bmp-flac2 -Version: 007 -Release: 2%{?dist} +Version: 008 +Release: 1%{?dist} Summary: Plugin to enable FLAC playback in the Beep Media Player Group: Applications/Multimedia @@ -56,6 +56,9 @@ %changelog +* Sat Mar 20 2006 Ralf Ertzinger 008-1.fc6 +- Update to 008 + * Tue Feb 21 2006 Ralf Ertzinger 007-2.fc5 - Bump and rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2005 16:07:07 -0000 1.3 +++ sources 20 May 2006 11:10:47 -0000 1.4 @@ -1 +1 @@ -c40c01602ded3690a6c853e5cbe8fda3 bmp-flac2-007.tar.gz +9e71943104e23231e834964f1c6c979f bmp-flac2-008.tar.gz From fedora-extras-commits at redhat.com Sat May 20 12:20:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 20 May 2006 05:20:57 -0700 Subject: rpms/dia/devel dia-0.95-CVE-2006-2480.patch, NONE, 1.1 dia.spec, 1.9, 1.10 Message-ID: <200605201220.k4KCKxku013081@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13061 Modified Files: dia.spec Added Files: dia-0.95-CVE-2006-2480.patch Log Message: * Sat May 20 2006 Hans de Goede 1:0.95-2 - Fix CVE-2006-2480 (bz 192535, 192538). dia-0.95-CVE-2006-2480.patch: --- NEW FILE dia-0.95-CVE-2006-2480.patch --- --- lib/message.c +++ lib/message.c @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dia.spec 25 Apr 2006 20:15:35 -0000 1.9 +++ dia.spec 20 May 2006 12:20:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -10,6 +10,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch +Patch4: dia-0.95-CVE-2006-2480.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -28,6 +29,7 @@ %patch1 -p1 -b .dtd %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons +%patch4 -p0 -b .cve-2006-2480 %build @@ -97,6 +99,9 @@ %changelog +* Sat May 20 2006 Hans de Goede 1:0.95-2 +- Fix CVE-2006-2480 (bz 192535, 192538). + * Tue Apr 25 2006 Hans de Goede 1:0.95-1 - New upstream version 0.95 (final) - Cleanup spec even more, correctly install the desktop file and icons, From fedora-extras-commits at redhat.com Sat May 20 12:23:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 20 May 2006 05:23:43 -0700 Subject: rpms/dia/FC-5 dia-0.95-CVE-2006-2480.patch, NONE, 1.1 dia.spec, 1.10, 1.11 Message-ID: <200605201223.k4KCNjXK013166@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13146 Modified Files: dia.spec Added Files: dia-0.95-CVE-2006-2480.patch Log Message: * Sat May 20 2006 Hans de Goede 1:0.95-2 - Fix CVE-2006-2480 (bz 192535, 192538). dia-0.95-CVE-2006-2480.patch: --- NEW FILE dia-0.95-CVE-2006-2480.patch --- --- lib/message.c +++ lib/message.c @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dia.spec 25 Apr 2006 20:18:06 -0000 1.10 +++ dia.spec 20 May 2006 12:23:43 -0000 1.11 @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -10,6 +10,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch +Patch4: dia-0.95-CVE-2006-2480.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -28,6 +29,7 @@ %patch1 -p1 -b .dtd %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons +%patch4 -p0 -b .cve-2006-2480 %build @@ -97,6 +99,9 @@ %changelog +* Sat May 20 2006 Hans de Goede 1:0.95-2 +- Fix CVE-2006-2480 (bz 192535, 192538). + * Tue Apr 25 2006 Hans de Goede 1:0.95-1 - New upstream version 0.95 (final) - Cleanup spec even more, correctly install the desktop file and icons, From fedora-extras-commits at redhat.com Sat May 20 12:33:06 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sat, 20 May 2006 05:33:06 -0700 Subject: rpms/bmp-flac2/devel .cvsignore, 1.4, 1.5 bmp-flac2.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605201233.k4KCX8QI013262@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/bmp-flac2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13241 Modified Files: .cvsignore bmp-flac2.spec sources Log Message: Update to 009 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 May 2006 11:10:47 -0000 1.4 +++ .cvsignore 20 May 2006 12:33:06 -0000 1.5 @@ -1 +1 @@ -bmp-flac2-008.tar.gz +bmp-flac2-009.tar.gz Index: bmp-flac2.spec =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/bmp-flac2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bmp-flac2.spec 20 May 2006 11:10:47 -0000 1.4 +++ bmp-flac2.spec 20 May 2006 12:33:06 -0000 1.5 @@ -1,7 +1,7 @@ %define bmp_input_plugin_dir %(pkg-config --variable=input_plugin_dir bmp 2>/dev/null || echo %{_libdir}/bmp/Input) Name: bmp-flac2 -Version: 008 +Version: 009 Release: 1%{?dist} Summary: Plugin to enable FLAC playback in the Beep Media Player @@ -56,8 +56,8 @@ %changelog -* Sat Mar 20 2006 Ralf Ertzinger 008-1.fc6 -- Update to 008 +* Sat Mar 20 2006 Ralf Ertzinger 009-1.fc6 +- Update to 009 * Tue Feb 21 2006 Ralf Ertzinger 007-2.fc5 - Bump and rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 May 2006 11:10:47 -0000 1.4 +++ sources 20 May 2006 12:33:06 -0000 1.5 @@ -1 +1 @@ -9e71943104e23231e834964f1c6c979f bmp-flac2-008.tar.gz +4e1793a0748f64e34ca70e9ce551c8d3 bmp-flac2-009.tar.gz From fedora-extras-commits at redhat.com Sat May 20 12:40:00 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Sat, 20 May 2006 05:40:00 -0700 Subject: fedora-security/audit fc4,1.254,1.255 Message-ID: <200605201240.k4KCe0Ym013363@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13345 Modified Files: fc4 Log Message: Note the dia issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- fc4 18 May 2006 19:00:46 -0000 1.254 +++ fc4 20 May 2006 12:39:57 -0000 1.255 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2480 VULNERABLE (dia) #192538 CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] From fedora-extras-commits at redhat.com Sat May 20 12:49:27 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sat, 20 May 2006 05:49:27 -0700 Subject: rpms/bmp-flac2/FC-5 .cvsignore, 1.3, 1.4 bmp-flac2.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605201249.k4KCnTMd013419@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/bmp-flac2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13398 Modified Files: .cvsignore bmp-flac2.spec sources Log Message: Update to 009 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2005 16:07:07 -0000 1.3 +++ .cvsignore 20 May 2006 12:49:27 -0000 1.4 @@ -1 +1 @@ -bmp-flac2-007.tar.gz +bmp-flac2-009.tar.gz Index: bmp-flac2.spec =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/FC-5/bmp-flac2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bmp-flac2.spec 21 Feb 2006 15:17:33 -0000 1.3 +++ bmp-flac2.spec 20 May 2006 12:49:27 -0000 1.4 @@ -1,8 +1,8 @@ %define bmp_input_plugin_dir %(pkg-config --variable=input_plugin_dir bmp 2>/dev/null || echo %{_libdir}/bmp/Input) Name: bmp-flac2 -Version: 007 -Release: 2%{?dist} +Version: 009 +Release: 1%{?dist} Summary: Plugin to enable FLAC playback in the Beep Media Player Group: Applications/Multimedia @@ -56,6 +56,9 @@ %changelog +* Sat Mar 20 2006 Ralf Ertzinger 009-1.fc5 +- Update to 009 + * Tue Feb 21 2006 Ralf Ertzinger 007-2.fc5 - Bump and rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2005 16:07:07 -0000 1.3 +++ sources 20 May 2006 12:49:27 -0000 1.4 @@ -1 +1 @@ -c40c01602ded3690a6c853e5cbe8fda3 bmp-flac2-007.tar.gz +4e1793a0748f64e34ca70e9ce551c8d3 bmp-flac2-009.tar.gz From fedora-extras-commits at redhat.com Sat May 20 14:28:37 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Sat, 20 May 2006 07:28:37 -0700 Subject: fedora-security/audit fc4,1.255,1.256 fc5,1.169,1.170 Message-ID: <200605201428.k4KESb08019283@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19263 Modified Files: fc4 fc5 Log Message: Missing updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- fc4 20 May 2006 12:39:57 -0000 1.255 +++ fc4 20 May 2006 14:28:34 -0000 1.256 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060517 -Up to date FC4 as of 20060517 +Up to date CVE as of CVE email 20060519 +Up to date FC4 as of 20060519 ** are items that need attention +CVE-2006-2493 ** freetype CVE-2006-2480 VULNERABLE (dia) #192538 CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only @@ -45,6 +46,8 @@ CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) +CVE-2006-1856 ** (kernel) +CVE-2006-1855 ** (kernel, fixed 2.6.11.12) CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] @@ -119,6 +122,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1529 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) +CVE-2006-1528 ** (kernel, fixed 2.6.13) CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-500] CVE-2006-1526 backport (xorg-x11) #189802 [since FEDORA-2006-484] CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] @@ -236,6 +240,7 @@ CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) #187421 CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) +CVE-2006-0039 ** kernel CVE-2006-0037 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2006-0036 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2006-0035 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-077 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- fc5 18 May 2006 19:00:46 -0000 1.169 +++ fc5 20 May 2006 14:28:34 -0000 1.170 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060517 -Up to date FC5 as of 20060517 +Up to date CVE as of CVE email 20060519 +Up to date FC5 as of 20060519 ** are items that need attention +CVE-2006-2493 ** freetype CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] @@ -45,6 +46,8 @@ CVE-2006-1861 VULNERABLE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) +CVE-2006-1856 ** (kernel) +CVE-2006-1855 ** (kernel, fixed 2.6.11.12) CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1790 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] @@ -118,6 +121,7 @@ CVE-2006-1530 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1529 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1529 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1528 ** (kernel, fixed 2.6.13) CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499] CVE-2006-1526 backport (xorg-x11) bz#189802 [since FEDORA-2006-483] CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] @@ -238,6 +242,7 @@ CVE-2006-0052 version (mailman, fixed 2.1.6) CVE-2006-0049 version (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) #183680 no upstream fix +CVE-2006-0039 ** kernel CVE-2006-0037 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] From fedora-extras-commits at redhat.com Sat May 20 14:34:30 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 May 2006 07:34:30 -0700 Subject: extras-buildsys/utils extras-push-new,1.13,1.14 Message-ID: <200605201434.k4KEYUUC019344@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19326 Modified Files: extras-push-new Log Message: only rename list "dists" to "diststopush" as the initial naming was unfortunate Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- extras-push-new 19 May 2006 11:23:01 -0000 1.13 +++ extras-push-new 20 May 2006 14:34:28 -0000 1.14 @@ -503,17 +503,17 @@ print 'SYNTAX: %s [dist]...' % sys.argv[0] sys.exit(errno.EINVAL) - dists = [] # the list of distribution release we want to push + diststopush = [] for d in sys.argv[1:]: if d == 'all': - dists = alldists + diststopush = alldists continue if d not in alldists: print "ERROR: No Distribution named '%s' found" % d sys.exit(1) - if d not in dists: - dists.append(d) - debugprint(dists) + if d not in diststopush: + diststopush.append(d) + debugprint(diststopush) if not os.path.exists(rundir): os.makedirs(rundir) @@ -522,14 +522,14 @@ lock = LockFile(lockfile) lock.lock() - for dist in dists: + for dist in diststopush: result = sign_move(dist) if result and result != 4: # 4 = no packages to sign sys.exit(result) # Option -f re-runs repobuild/repoview for all dists, even if # no new packages have been pushed for a dist. - changed = dists + changed = diststopush if opts.force: changed = alldists @@ -551,7 +551,7 @@ run_and_check('extras-sync') if opts.mail: - for dist in dists: + for dist in diststopush: email_list( getlinesfromrunfile(dist), dist ) emptyrunfile(dist) From fedora-extras-commits at redhat.com Sat May 20 14:37:54 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 07:37:54 -0700 Subject: rpms/yakuake/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yakuake.spec, 1.1, 1.2 Message-ID: <200605201437.k4KEbuTG019382@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19361 Modified Files: .cvsignore sources yakuake.spec Log Message: - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options - Include translations Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yakuake/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Nov 2005 17:57:05 -0000 1.2 +++ .cvsignore 20 May 2006 14:37:53 -0000 1.3 @@ -1 +1 @@ -yakuake-2.7.3.tar.bz2 +29153-yakuake-2.7.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yakuake/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Nov 2005 17:57:05 -0000 1.2 +++ sources 20 May 2006 14:37:53 -0000 1.3 @@ -1 +1 @@ -98576f75c94f75756ef4acb18ef93a5e yakuake-2.7.3.tar.bz2 +6905f9a6d448c7bfc818cd2d7c88cab4 29153-yakuake-2.7.5.tar.bz2 Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yakuake.spec 10 Nov 2005 17:57:05 -0000 1.1 +++ yakuake.spec 20 May 2006 14:37:53 -0000 1.2 @@ -1,15 +1,17 @@ Name: yakuake -Version: 2.7.3 -Release: 4 +Version: 2.7.5 +Release: 1 Summary: Terminal emulator for KDE Group: User Interface/Desktops License: GPL -URL: http://yakuake.uv.ro/ -Source0: http://download.softpedia.com/linux/yakuake-%{version}.tar.bz2 +URL: http://extragear.kde.org/apps/yakuake/ +Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs-devel %description Yakuake is a "Quake console" like terminal emulator for KDE. @@ -20,26 +22,32 @@ %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure --disable-rpath --disable-debug +%configure \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-final make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Utility \ --add-category KDE \ --add-category Qt \ --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/yakuake.desktop -chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/apps/yakuake/default/install.sh + %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop +chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh + +%find_lang %{name} %post @@ -57,19 +65,25 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog TODO %{_bindir}/yakuake -%{_datadir}/applications/fedora-yakuake.desktop -%{_datadir}/apps/yakuake +%{_datadir}/applications/*yakuake.desktop +%{_datadir}/apps/yakuake/ %{_datadir}/icons/hicolor/16x16/apps/yakuake.png %{_datadir}/icons/hicolor/32x32/apps/yakuake.png -%doc AUTHORS COPYING + %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-1 +- Update to 2.7.5 +- Add `--disable-dependency-tracking' and `--enable-final' options +- Include translations + * Mon Oct 24 2005 Mickael - initial release From fedora-extras-commits at redhat.com Sat May 20 14:40:31 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 07:40:31 -0700 Subject: owners owners.list,1.1028,1.1029 Message-ID: <200605201440.k4KEeY2T019418@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19399 Modified Files: owners.list Log Message: Taking over yakuake :) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1028 retrieving revision 1.1029 diff -u -r1.1028 -r1.1029 --- owners.list 20 May 2006 07:02:33 -0000 1.1028 +++ owners.list 20 May 2006 14:40:31 -0000 1.1029 @@ -1774,7 +1774,7 @@ Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|yadex|A DOOM level editor|wart at kobold.org|extras-qa at fedoraproject.org| -Fedora Extras|yakuake|A Quake-like terminal application|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|yakuake|A Quake-like terminal application|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ytalk|A chat program for multiple users|imlinux at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 15:19:32 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 20 May 2006 08:19:32 -0700 Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.13, 1.14 dejavu-fonts.spec, 1.20, 1.21 sources, 1.13, 1.14 Message-ID: <200605201519.k4KFJYbL022002@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21963/FC-5 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.6.0-1.fc5 on branch FC-5 from dejavu-fonts-2.6.0-1.fc5.src.rpm 2.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 23 Apr 2006 17:12:44 -0000 1.13 +++ .cvsignore 20 May 2006 15:19:32 -0000 1.14 @@ -1 +1 @@ -dejavu-sfd-2.5.tar.gz +dejavu-sfd-2.6.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- dejavu-fonts.spec 23 Apr 2006 18:18:44 -0000 1.20 +++ dejavu-fonts.spec 20 May 2006 15:19:32 -0000 1.21 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion 2.5 +%define archiveversion 2.6 %define fontdir %{_datadir}/fonts/%{name} %define xsldir %{_datadir}/xml/%{name} @@ -9,8 +9,8 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.5.0 -Release: 2%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions @@ -161,6 +161,9 @@ %changelog +* Mon May 15 2006 Nicolas Mailhot - 2.6.0-1 +- 2.6.0 + * Sun Apr 23 2006 Nicolas Mailhot - 2.5.0-1 - 2.5.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 23 Apr 2006 17:12:44 -0000 1.13 +++ sources 20 May 2006 15:19:32 -0000 1.14 @@ -1 +1 @@ -402d2f846caa83c8067e281b3c5fa8c0 dejavu-sfd-2.5.tar.gz +aae0e562be59e57e791cd1a7273bfb8c dejavu-sfd-2.6.tar.gz From fedora-extras-commits at redhat.com Sat May 20 15:19:31 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 20 May 2006 08:19:31 -0700 Subject: rpms/dejavu-fonts import.log,1.50,1.51 Message-ID: <200605201519.k4KFJXU1021996@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21963 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.6.0-1.fc5 on branch FC-5 from dejavu-fonts-2.6.0-1.fc5.src.rpm 2.6.0 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- import.log 15 May 2006 16:45:35 -0000 1.50 +++ import.log 20 May 2006 15:19:31 -0000 1.51 @@ -47,3 +47,4 @@ dejavu-fonts-2_5_0-1_fc4:FC-4:dejavu-fonts-2.5.0-1.fc4.src.rpm:1145812549 dejavu-fonts-2_5_0-2_fc5:FC-5:dejavu-fonts-2.5.0-2.fc5.src.rpm:1145816306 dejavu-fonts-2_6_0-1_fc6:HEAD:dejavu-fonts-2.6.0-1.fc6.src.rpm:1147711519 +dejavu-fonts-2_6_0-1_fc5:FC-5:dejavu-fonts-2.6.0-1.fc5.src.rpm:1148138354 From fedora-extras-commits at redhat.com Sat May 20 15:29:58 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 20 May 2006 08:29:58 -0700 Subject: rpms/dejavu-fonts import.log,1.51,1.52 Message-ID: <200605201530.k4KFU0ps022157@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22124 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.6.0-1.fc4 on branch FC-4 from dejavu-fonts-2.6.0-1.fc4.src.rpm 2.6.0 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- import.log 20 May 2006 15:19:31 -0000 1.51 +++ import.log 20 May 2006 15:29:58 -0000 1.52 @@ -48,3 +48,4 @@ dejavu-fonts-2_5_0-2_fc5:FC-5:dejavu-fonts-2.5.0-2.fc5.src.rpm:1145816306 dejavu-fonts-2_6_0-1_fc6:HEAD:dejavu-fonts-2.6.0-1.fc6.src.rpm:1147711519 dejavu-fonts-2_6_0-1_fc5:FC-5:dejavu-fonts-2.6.0-1.fc5.src.rpm:1148138354 +dejavu-fonts-2_6_0-1_fc4:FC-4:dejavu-fonts-2.6.0-1.fc4.src.rpm:1148138984 From fedora-extras-commits at redhat.com Sat May 20 15:29:59 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 20 May 2006 08:29:59 -0700 Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.13, 1.14 dejavu-fonts.spec, 1.14, 1.15 sources, 1.13, 1.14 Message-ID: <200605201530.k4KFU1IN022164@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-serv22124/FC-4 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.6.0-1.fc4 on branch FC-4 from dejavu-fonts-2.6.0-1.fc4.src.rpm 2.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 23 Apr 2006 17:16:06 -0000 1.13 +++ .cvsignore 20 May 2006 15:29:59 -0000 1.14 @@ -1 +1 @@ -dejavu-sfd-2.5.tar.gz +dejavu-sfd-2.6.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dejavu-fonts.spec 23 Apr 2006 17:16:06 -0000 1.14 +++ dejavu-fonts.spec 20 May 2006 15:29:59 -0000 1.15 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion 2.5 +%define archiveversion 2.6 %define fontdir %{_datadir}/fonts/%{name} # Let the perl Maintainer worry about Unicode.org data files (updates, licensing) @@ -8,7 +8,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.5.0 +Version: 2.6.0 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -127,6 +127,9 @@ %changelog +* Sat May 20 2006 Nicolas Mailhot - 2.6.0-1 +- 2.6.0 + * Sun Apr 23 2006 Nicolas Mailhot - 2.5.0-1 - 2.5.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 23 Apr 2006 17:16:06 -0000 1.13 +++ sources 20 May 2006 15:29:59 -0000 1.14 @@ -1 +1 @@ -402d2f846caa83c8067e281b3c5fa8c0 dejavu-sfd-2.5.tar.gz +aae0e562be59e57e791cd1a7273bfb8c dejavu-sfd-2.6.tar.gz From fedora-extras-commits at redhat.com Sat May 20 15:32:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 08:32:02 -0700 Subject: rpms/perl-Module-Build/FC-5 perl-Module-Build.spec,1.16,1.17 Message-ID: <200605201532.k4KFW4Rj022232@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22215 Modified Files: perl-Module-Build.spec Log Message: Sync with devel. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/perl-Module-Build.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Module-Build.spec 15 May 2006 23:29:10 -0000 1.16 +++ perl-Module-Build.spec 20 May 2006 15:32:02 -0000 1.17 @@ -1,12 +1,13 @@ +%define module_version 0.28 + Name: perl-Module-Build -Version: 0.28 +Version: 0.2800 Release: 2%{?dist} -Epoch: 1 Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{module_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Tar) >= 1.08 @@ -32,7 +33,7 @@ works fine on perl 5.005 if you can install a few additional modules. %prep -%setup -q -n Module-Build-%{version} +%setup -q -n Module-Build-%{module_version} %build %{__perl} Build.PL installdirs=vendor @@ -47,7 +48,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -./Build test +# 0.28 builds fail in the build system due +# to no stdin in t/extend, so we cheat. +./Build test < /dev/zero %clean rm -rf $RPM_BUILD_ROOT @@ -61,12 +64,11 @@ %{_mandir}/man3/Module::Build*.3* %changelog -* Sat May 13 2006 Steven Pritchard - 1:0.28-2 -- Rebuild. +* Thu May 18 2006 Steven Pritchard 0.2800-2 +- Take input from /dev/zero during "Build test" to avoid test failure. -* Fri May 12 2006 Steven Pritchard - 1:0.28-1 -- Update to 0.28. -- Epoch bump to make 0.28 > 0.2612. +* Wed May 17 2006 Steven Pritchard 0.2800-1 +- Update to 0.28, but call it 0.2800 to avoid an epoch bump. - Various spec cleanups to closer match cpanspec output. * Wed Mar 15 2006 Steven Pritchard - 0.2612-2 From fedora-extras-commits at redhat.com Sat May 20 15:34:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 08:34:28 -0700 Subject: rpms/qtparted/devel qtparted.spec,1.13,1.14 Message-ID: <200605201534.k4KFYUOO022300@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/qtparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22283 Modified Files: qtparted.spec Log Message: Rebuild. Index: qtparted.spec =================================================================== RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- qtparted.spec 15 Apr 2006 23:09:05 -0000 1.13 +++ qtparted.spec 20 May 2006 15:34:28 -0000 1.14 @@ -2,7 +2,7 @@ Name: qtparted Version: 0.4.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Partition Magic clone written in C++ using the Qt toolkit Group: Applications/System @@ -107,6 +107,9 @@ %changelog +* Sat May 20 2006 Steven Pritchard - 0.4.5-6 +- Rebuild. + * Fri Apr 14 2006 Steven Pritchard - 0.4.5-5 - Rebuild. From fedora-extras-commits at redhat.com Sat May 20 16:15:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 09:15:23 -0700 Subject: rpms/yakuake/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yakuake.spec, 1.1, 1.2 Message-ID: <200605201615.k4KGFPG7024827@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24783 Modified Files: .cvsignore sources yakuake.spec Log Message: - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options - Include translations Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Nov 2005 17:57:05 -0000 1.2 +++ .cvsignore 20 May 2006 16:15:22 -0000 1.3 @@ -1 +1 @@ -yakuake-2.7.3.tar.bz2 +29153-yakuake-2.7.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Nov 2005 17:57:05 -0000 1.2 +++ sources 20 May 2006 16:15:22 -0000 1.3 @@ -1 +1 @@ -98576f75c94f75756ef4acb18ef93a5e yakuake-2.7.3.tar.bz2 +6905f9a6d448c7bfc818cd2d7c88cab4 29153-yakuake-2.7.5.tar.bz2 Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/yakuake.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yakuake.spec 10 Nov 2005 17:57:05 -0000 1.1 +++ yakuake.spec 20 May 2006 16:15:22 -0000 1.2 @@ -1,15 +1,17 @@ Name: yakuake -Version: 2.7.3 -Release: 4 +Version: 2.7.5 +Release: 1 Summary: Terminal emulator for KDE Group: User Interface/Desktops License: GPL -URL: http://yakuake.uv.ro/ -Source0: http://download.softpedia.com/linux/yakuake-%{version}.tar.bz2 +URL: http://extragear.kde.org/apps/yakuake/ +Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs-devel %description Yakuake is a "Quake console" like terminal emulator for KDE. @@ -20,26 +22,32 @@ %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure --disable-rpath --disable-debug +%configure \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-final make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Utility \ --add-category KDE \ --add-category Qt \ --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/yakuake.desktop -chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/apps/yakuake/default/install.sh + %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop +chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh + +%find_lang %{name} %post @@ -57,19 +65,25 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog TODO %{_bindir}/yakuake -%{_datadir}/applications/fedora-yakuake.desktop -%{_datadir}/apps/yakuake +%{_datadir}/applications/*yakuake.desktop +%{_datadir}/apps/yakuake/ %{_datadir}/icons/hicolor/16x16/apps/yakuake.png %{_datadir}/icons/hicolor/32x32/apps/yakuake.png -%doc AUTHORS COPYING + %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-1 +- Update to 2.7.5 +- Add `--disable-dependency-tracking' and `--enable-final' options +- Include translations + * Mon Oct 24 2005 Mickael - initial release From fedora-extras-commits at redhat.com Sat May 20 16:33:12 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 09:33:12 -0700 Subject: rpms/yakuake/FC-5 yakuake.spec,1.2,1.3 Message-ID: <200605201633.k4KGXEVE024976@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24959 Modified Files: yakuake.spec Log Message: Add dist tag Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/yakuake.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yakuake.spec 20 May 2006 16:15:22 -0000 1.2 +++ yakuake.spec 20 May 2006 16:33:12 -0000 1.3 @@ -1,6 +1,6 @@ Name: yakuake Version: 2.7.5 -Release: 1 +Release: 2%{?dist} Summary: Terminal emulator for KDE Group: User Interface/Desktops @@ -79,6 +79,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-2 +- Add dist tag + * Sat May 20 2006 Dawid Gajownik - 2.7.5-1 - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options From fedora-extras-commits at redhat.com Sat May 20 16:34:45 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 09:34:45 -0700 Subject: rpms/yakuake/devel yakuake.spec,1.2,1.3 Message-ID: <200605201634.k4KGYl07025048@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25031 Modified Files: yakuake.spec Log Message: Add dist tag Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yakuake.spec 20 May 2006 14:37:53 -0000 1.2 +++ yakuake.spec 20 May 2006 16:34:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: yakuake Version: 2.7.5 -Release: 1 +Release: 2%{?dist} Summary: Terminal emulator for KDE Group: User Interface/Desktops @@ -79,6 +79,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-2 +- Add dist tag + * Sat May 20 2006 Dawid Gajownik - 2.7.5-1 - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options From fedora-extras-commits at redhat.com Sat May 20 16:36:34 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 09:36:34 -0700 Subject: rpms/yakuake/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yakuake.spec, 1.2, 1.3 Message-ID: <200605201636.k4KGaaL6025128@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25106 Modified Files: .cvsignore sources yakuake.spec Log Message: Add dist tag Update to 2.7.5 Add `--disable-dependency-tracking' and `--enable-final' options Include translations Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Nov 2005 17:57:05 -0000 1.2 +++ .cvsignore 20 May 2006 16:36:34 -0000 1.3 @@ -1 +1 @@ -yakuake-2.7.3.tar.bz2 +29153-yakuake-2.7.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Nov 2005 17:57:05 -0000 1.2 +++ sources 20 May 2006 16:36:34 -0000 1.3 @@ -1 +1 @@ -98576f75c94f75756ef4acb18ef93a5e yakuake-2.7.3.tar.bz2 +6905f9a6d448c7bfc818cd2d7c88cab4 29153-yakuake-2.7.5.tar.bz2 Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-4/yakuake.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yakuake.spec 11 Nov 2005 00:08:36 -0000 1.2 +++ yakuake.spec 20 May 2006 16:36:34 -0000 1.3 @@ -1,15 +1,17 @@ Name: yakuake -Version: 2.7.3 -Release: 4%{?dist} +Version: 2.7.5 +Release: 2%{?dist} Summary: Terminal emulator for KDE Group: User Interface/Desktops License: GPL -URL: http://yakuake.uv.ro/ -Source0: http://download.softpedia.com/linux/yakuake-%{version}.tar.bz2 +URL: http://extragear.kde.org/apps/yakuake/ +Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs-devel %description Yakuake is a "Quake console" like terminal emulator for KDE. @@ -20,26 +22,32 @@ %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure --disable-rpath --disable-debug +%configure \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-final make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Utility \ --add-category KDE \ --add-category Qt \ --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/yakuake.desktop -chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/apps/yakuake/default/install.sh + %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop +chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh + +%find_lang %{name} %post @@ -57,19 +65,28 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog TODO %{_bindir}/yakuake -%{_datadir}/applications/fedora-yakuake.desktop -%{_datadir}/apps/yakuake +%{_datadir}/applications/*yakuake.desktop +%{_datadir}/apps/yakuake/ %{_datadir}/icons/hicolor/16x16/apps/yakuake.png %{_datadir}/icons/hicolor/32x32/apps/yakuake.png -%doc AUTHORS COPYING + %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-2 +- Add dist tag + +* Sat May 20 2006 Dawid Gajownik - 2.7.5-1 +- Update to 2.7.5 +- Add `--disable-dependency-tracking' and `--enable-final' options +- Include translations + * Mon Oct 24 2005 Mickael - initial release From fedora-extras-commits at redhat.com Sat May 20 16:36:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 09:36:43 -0700 Subject: rpms/celestia/FC-4 celestia.spec,1.10,1.11 Message-ID: <200605201636.k4KGaj2p025155@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/celestia/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25134 Modified Files: celestia.spec Log Message: Include accidentally dropped 3ds models. Index: celestia.spec =================================================================== RCS file: /cvs/extras/rpms/celestia/FC-4/celestia.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- celestia.spec 9 Apr 2006 01:39:12 -0000 1.10 +++ celestia.spec 20 May 2006 16:36:43 -0000 1.11 @@ -1,6 +1,6 @@ Name: celestia Version: 1.4.1 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: OpenGL real-time visual space simulation Group: Amusements/Graphics License: GPL @@ -57,6 +57,8 @@ ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ #rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual +install -p -m 644 -D models/*.3ds $RPM_BUILD_ROOT%{_datadir}/%{name}/models/ + rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop desktop-file-install \ @@ -98,6 +100,9 @@ %changelog +* Fri May 19 2006 Steven Pritchard 1.4.1-0.2 +- Include accidentally dropped 3ds models. + * Sat Apr 08 2006 Steven Pritchard 1.4.1-0.1 - Sync with devel branch (mostly) From fedora-extras-commits at redhat.com Sat May 20 16:46:19 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 20 May 2006 09:46:19 -0700 Subject: rpms/xchat-gnome/devel xchat-gnome.spec, 1.23, 1.24 xchat-gnome-libnotify.patch, 1.2, NONE Message-ID: <200605201646.k4KGkLWr025331@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25314 Modified Files: xchat-gnome.spec Removed Files: xchat-gnome-libnotify.patch Log Message: * Sat May 20 2006 Brian Pepple - 0.11-3 - Drop patch for libnotify. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xchat-gnome.spec 5 Apr 2006 04:38:31 -0000 1.23 +++ xchat-gnome.spec 20 May 2006 16:46:19 -0000 1.24 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -11,7 +11,6 @@ URL: http://%{name}.navi.cx/ Source0: http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-config.patch -Patch2: %{name}-libnotify.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -53,7 +52,6 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .config -%patch2 -p1 -b .libnotify %build @@ -143,6 +141,9 @@ %changelog +* Sat May 20 2006 Brian Pepple - 0.11-3 +- Drop patch for libnotify. + * Tue Apr 4 2006 Brian Pepple - 0.11-2 - Update to 0.11 - Drop screensaver patch. --- xchat-gnome-libnotify.patch DELETED --- From fedora-extras-commits at redhat.com Sat May 20 16:55:17 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 20 May 2006 09:55:17 -0700 Subject: rpms/apt/devel .cvsignore, 1.10, 1.11 apt.spec, 1.28, 1.29 default.conf, 1.9, 1.10 sources, 1.10, 1.11 Message-ID: <200605201655.k4KGtJu7025489@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/apt/devel Modified Files: .cvsignore apt.spec default.conf sources Log Message: Upgrade apt to latest rc, move some config bits from apt to f-p-c-a. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 25 Apr 2006 18:47:24 -0000 1.10 +++ .cvsignore 20 May 2006 16:55:17 -0000 1.11 @@ -1 +1 @@ -apt-0.5.15lorg3.tar.bz2 +apt-0.5.15lorg3.1-rc2.tar.bz2 Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- apt.spec 11 May 2006 21:19:47 -0000 1.28 +++ apt.spec 20 May 2006 16:55:17 -0000 1.29 @@ -5,13 +5,14 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt -Version: 0.5.15lorg3 -Release: 2.1%{?dist} +Version: 0.5.15lorg3.1 +Release: 3_rc2%{?dist} Group: System Environment/Base URL: http://apt-rpm.laiskiainen.org/ License: GPL -Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2 +#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2 +Source0: http://apt-rpm.org/testing/%{name}-%{version}-rc2.tar.bz2 # user editable template configs Source1: apt.conf @@ -23,13 +24,7 @@ Source5: rpmpriorities Source19: comps2prio.xsl -# nightly updater scripts & config -Source20: apt.init -Source21: apt.cron -Source22: apt.sysconfig - # Sources 50-99 are for Lua-scripts not in contrib/ -Source50: preserve-conf.lua Source51: upgradevirt.lua # 150-199 for apt.conf.d @@ -114,7 +109,7 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}-rc2 # fix docs to reference correct paths perl -pi -e \ @@ -178,7 +173,7 @@ # Lua scripts mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts -for script in %{SOURCE50} %{SOURCE51} ; do +for script in %{SOURCE51} ; do install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts done @@ -189,9 +184,9 @@ touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo # Nightly updater scripts & default config -install -Dpm 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt -install -Dpm 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron -install -Dpm 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt +install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt +install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron +install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt # GPG checker from contrib install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts @@ -262,7 +257,6 @@ %dir %{_datadir}/apt/scripts/ %{_datadir}/apt/scripts/gpg-check.lua %{_datadir}/apt/scripts/gpg-import.lua -%{_datadir}/apt/scripts/preserve-conf.lua %{_datadir}/apt/scripts/upgradevirt.lua %{_localstatedir}/cache/apt/ %{_localstatedir}/lib/apt/ @@ -292,6 +286,11 @@ %changelog +* Sat May 20 2006 Axel Thimm +- Update to 0.5.15lorg3.1-rc2. +- Move some FC specific config bits to fedora-package-config-apt. +- Remove some sources that can be found in upstream now. + * Thu May 11 2006 Axel Thimm - 0.5.15lorg3-2.1 - Remove bogus final s from default(s).conf (Ville). Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- default.conf 9 May 2006 18:10:38 -0000 1.9 +++ default.conf 20 May 2006 16:55:17 -0000 1.10 @@ -9,43 +9,12 @@ // Options for apt-get Get { - Download-Only "false"; - Show-Upgraded "true"; Show-Versions "true"; - }; - Cache - { - AllNames "false"; - } + } }; RPM { - // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades) - Order "true"; - // Completely ignore GnuPG signature packages (introduced in rpm 4.1) - Ignore { "gpg-pubkey"; }; - // Allow multiple kernel and kernel-related packages to be installed - Allow-Duplicated { - "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$"; - "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; - "^kmod-.+$"; - "^gpg-pubkey$"; - }; - // XXX: not used currently - //Allow-Duplicated-Upgrade { - // "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$"; - // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; - // "^kmod-.+$"; - // "^gpg-pubkey$"; - //}; - // "Upgrade" allow-duplicated packages as well - Upgrade-Virtual "true"; - // Enable source rebuilds - Source - { - Build-Command "rpmbuild --rebuild"; - }; // Always check GPG keys and automatically import new ones GPG-Check "true"; GPG-Import "true"; Index: sources =================================================================== RCS file: /cvs/extras/rpms/apt/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 25 Apr 2006 18:47:24 -0000 1.10 +++ sources 20 May 2006 16:55:17 -0000 1.11 @@ -1 +1 @@ -167cfdf8dea5eb1a9873a53ff546bf6a apt-0.5.15lorg3.tar.bz2 +8194eb59fb5fc0fe2680ab4272a3dc04 apt-0.5.15lorg3.1-rc2.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 16:55:18 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 20 May 2006 09:55:18 -0700 Subject: rpms/fedora-package-config-apt/devel fedora-package-config-apt.spec, 1.1, 1.2 fedora.conf, 1.1, 1.2 Message-ID: <200605201655.k4KGtKdS025494@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/fedora-package-config-apt/devel Modified Files: fedora-package-config-apt.spec fedora.conf Log Message: Upgrade apt to latest rc, move some config bits from apt to f-p-c-a. Index: fedora-package-config-apt.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora-package-config-apt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-package-config-apt.spec 13 May 2006 01:34:07 -0000 1.1 +++ fedora-package-config-apt.spec 20 May 2006 16:55:18 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Fedora configuration files for the apt-rpm package manager Name: fedora-package-config-apt Version: 5.89 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ @@ -62,6 +62,9 @@ %changelog +* Sat May 20 2006 Axel Thimm +- Move some FC specific config bits from apt. + * Thu May 11 2006 Axel Thimm - 5.89-3 - Apply comments from review #191040c3 (by Ville). - Fix summary and description Index: fedora.conf =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora.conf 13 May 2006 01:34:07 -0000 1.1 +++ fedora.conf 20 May 2006 16:55:18 -0000 1.2 @@ -13,3 +13,24 @@ { http::User-Agent "Fedora APT-HTTP/1.3"; }; + +RPM +{ + // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades) + Order "true"; + // Allow multiple kernel and kernel-related packages to be installed + Allow-Duplicated { + "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$"; + "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; + "^kmod-.+$"; + }; + // XXX: not used currently + //Allow-Duplicated-Upgrade { + // "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$"; + // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; + // "^kmod-.+$"; + // "^gpg-pubkey$"; + //}; + // "Upgrade" allow-duplicated packages as well + Upgrade-Virtual "true"; +} From fedora-extras-commits at redhat.com Sat May 20 17:01:01 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 20 May 2006 10:01:01 -0700 Subject: rpms/gossip/devel gossip.spec,1.17,1.18 Message-ID: <200605201701.k4KH137M027438@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25617 Modified Files: gossip.spec Log Message: * Sat May 20 2006 Brian Pepple - 0.11-4 - Build with libnotify support. Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gossip.spec 1 May 2006 23:27:20 -0000 1.17 +++ gossip.spec 20 May 2006 17:01:01 -0000 1.18 @@ -2,7 +2,7 @@ Name: gossip Version: 0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -17,6 +17,7 @@ BuildRequires: libXScrnSaver-devel BuildRequires: libXt-devel BuildRequires: xorg-x11-proto-devel +BuildRequires: libnotify-devel BuildRequires: desktop-file-utils BuildRequires: aspell-devel BuildRequires: gettext @@ -130,6 +131,9 @@ %changelog +* Sat May 20 2006 Brian Pepple - 0.11-4 +- Build with libnotify support. + * Mon May 1 2006 Brian Pepple - 0.11-3 - Update to 0.11. - Add scriptlets for gtk+ icon cache. From fedora-extras-commits at redhat.com Sat May 20 17:09:21 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 20 May 2006 10:09:21 -0700 Subject: rpms/synaptic/devel synaptic.spec,1.16,1.17 Message-ID: <200605201709.k4KH9NhW027988@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27971 Modified Files: synaptic.spec Log Message: synaptic meets repomd. Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- synaptic.spec 14 Dec 2005 17:51:18 -0000 1.16 +++ synaptic.spec 20 May 2006 17:09:21 -0000 1.17 @@ -3,19 +3,24 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz Patch0: synaptic-0.57-desktop.patch Patch1: synaptic-0.57-firefox.patch +# Patches from apt-rpm maintainer for gcc 4.1 support, repomd support +# and progress meter fixes +Patch2: http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch +Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch +Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 +BuildRequires: apt-devel >= 0.5.15lorg3.1, rpm-devel >= 4.0 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser @@ -31,6 +36,9 @@ %setup -q %patch0 -p1 -b .dt %patch1 -p1 -b .firefox +%patch2 -p1 -b .gcc41 +%patch3 -p1 -b .repomd +%patch4 -p1 -b .showprog %build %configure --disable-dependency-tracking @@ -99,6 +107,10 @@ %{_mandir}/man8/%{name}.8* %changelog +* Sat May 20 2006 Axel Thimm - 0.57.2-4 +- Add repomd support, gcc 4.1 build support, progress meter fixes (all + from apt-rpm upstream). + * Wed Dec 14 2005 Deji Akingunola - 0.57.2-3 - Rebuild for new openssl and apt in devel. From fedora-extras-commits at redhat.com Sat May 20 17:12:45 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 20 May 2006 10:12:45 -0700 Subject: rpms/synaptic/devel synaptic-0.57.2-gcc41.patch, NONE, 1.1 synaptic-0.57.2-repomd-1.patch, NONE, 1.1 synaptic-0.57.2-showprog.patch, NONE, 1.1 Message-ID: <200605201712.k4KHClKo028064@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28023 Added Files: synaptic-0.57.2-gcc41.patch synaptic-0.57.2-repomd-1.patch synaptic-0.57.2-showprog.patch Log Message: synaptic meets repomd part II. Now with patches, too. synaptic-0.57.2-gcc41.patch: --- NEW FILE synaptic-0.57.2-gcc41.patch --- --- synaptic-0.57.2/common/rcdscanner.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rcdscanner.h 2006-05-09 18:16:56.000000000 +0300 @@ -48,6 +48,7 @@ }; virtual void update(string text, int current) = 0; + virtual ~RCDScanProgress() {}; }; class RCDScanner { --- synaptic-0.57.2/common/rinstallprogress.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rinstallprogress.h 2006-05-09 18:16:56.000000000 +0300 @@ -63,6 +63,7 @@ RInstallProgress():_donePackagesTotal(0), _numPackagesTotal(0),_updateFinished(false) {}; + virtual ~RInstallProgress() {}; }; --- synaptic-0.57.2/common/indexcopy.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/indexcopy.h 2006-05-09 18:19:00.000000000 +0300 @@ -39,6 +39,7 @@ public: bool CopyPackages(string CDROM, string Name, vector &List); + virtual ~IndexCopy() {}; }; class PackageCopy:public IndexCopy { @@ -54,6 +55,7 @@ }; public: + virtual ~PackageCopy() {}; }; class SourceCopy:public IndexCopy { @@ -69,6 +71,7 @@ }; public: + virtual ~SourceCopy() {}; }; #endif --- synaptic-0.57.2/common/rpackagelister.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual void notifyChange(RPackage *pkg) = 0; virtual void notifyPreFilteredChange() = 0; virtual void notifyPostFilteredChange() = 0; + virtual ~RPackageObserver() {}; }; class RCacheObserver { @@ -71,6 +72,7 @@ virtual void notifyCacheOpen() = 0; virtual void notifyCachePreChange() = 0; virtual void notifyCachePostChange() = 0; + virtual ~RCacheObserver() {}; }; // base sort class --- synaptic-0.57.2/common/rpackagefilter.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagefilter.h 2006-05-09 18:16:56.000000000 +0300 @@ -130,7 +130,7 @@ bool and_mode; // patterns are applied in "AND" mode if true, "OR" if false inline bool filterName(Pattern pat, RPackage *pkg); - inline bool RPatternPackageFilter::filterVersion(Pattern pat, RPackage *pkg); + inline bool filterVersion(Pattern pat, RPackage *pkg); inline bool filterDescription(Pattern pat, RPackage *pkg); inline bool filterMaintainer(Pattern pat, RPackage *pkg); inline bool filterDepends(Pattern pat, RPackage *pkg, --- synaptic-0.57.2/common/rpackage.cc.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackage.cc 2006-05-09 18:16:56.000000000 +0300 @@ -848,7 +848,6 @@ void RPackage::setPinned(bool flag) { - FILE *out; struct stat stat_buf; string File =RStateDir() + "/preferences"; @@ -945,8 +944,8 @@ } } - return true; #endif + return true; } // format: first version, second archives --- synaptic-0.57.2/common/rpackagelister.cc.gcc41 2005-06-14 20:37:18.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.cc 2006-05-09 18:16:56.000000000 +0300 @@ -607,7 +607,7 @@ bool _ascent; RPackageStatus _status; public: - supportedSortFunc::supportedSortFunc(bool ascent, RPackageStatus &s) + supportedSortFunc(bool ascent, RPackageStatus &s) : _ascent(ascent), _status(s) {}; bool operator() (RPackage *x, RPackage *y) { if(_ascent) --- synaptic-0.57.2/common/ruserdialog.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/ruserdialog.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual bool showErrors(); + virtual ~RUserDialog() {}; }; #endif synaptic-0.57.2-repomd-1.patch: --- NEW FILE synaptic-0.57.2-repomd-1.patch --- --- synaptic-0.57.2/common/rsources.cc.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.cc 2006-05-09 20:38:03.000000000 +0300 @@ -352,8 +352,13 @@ Type |= RpmDir; else if (S == "rpm-src-dir") Type |= RpmSrcDir; + else if (S == "repomd") + Type |= Repomd; + else if (S == "repomd-src") + Type |= RepomdSrc; else return false; + cout << S << " settype " << (Type | Repomd) << endl; return true; } @@ -371,6 +376,11 @@ return "rpm-dir"; else if ((Type & RpmSrcDir) != 0) return "rpm-src-dir"; + else if ((Type & Repomd) != 0) + return "repomd"; + else if ((Type & RepomdSrc) != 0) + return "repomd-src"; + cout << "type " << (Type & Repomd) << endl; return "unknown"; } @@ -382,6 +392,7 @@ return false; S = SubstVar(S, "$(ARCH)", _config->Find("APT::Architecture")); + S = SubstVar(S, "$(VERSION)", _config->Find("APT::DistroVersion")); URI = S; // append a / to the end if one is not already there @@ -522,6 +533,10 @@ os << "RpmDir"; if ((rec.Type & SourcesList::RpmSrcDir) != 0) os << "RpmSrcDir"; + if ((rec.Type & SourcesList::Repomd) != 0) + os << "Repomd"; + if ((rec.Type & SourcesList::RepomdSrc) != 0) + os << "RepomdSrc"; os << endl; os << "SourceFile: " << rec.SourceFile << endl; os << "VendorID: " << rec.VendorID << endl; --- synaptic-0.57.2/common/rsources.h.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.h 2006-05-09 20:39:23.000000000 +0300 @@ -41,11 +41,13 @@ Disabled = 1 << 4, Comment = 1 << 5, RpmDir = 1 << 6, - RpmSrcDir = 1 << 7 + RpmSrcDir = 1 << 7, + Repomd = 1 << 8, + RepomdSrc = 1 << 9 }; struct SourceRecord { - unsigned char Type; + unsigned int Type; string VendorID; string URI; string Dist; --- synaptic-0.57.2/gtk/rgrepositorywin.cc.repomd 2005-05-20 21:24:35.000000000 +0300 +++ synaptic-0.57.2/gtk/rgrepositorywin.cc 2006-05-09 18:17:15.000000000 +0300 @@ -39,6 +39,8 @@ ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC, ITEM_TYPE_DEB, ITEM_TYPE_DEBSRC }; @@ -48,7 +50,9 @@ ITEM_TYPE_RPM, ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, - ITEM_TYPE_RPMSRCDIR + ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC }; #endif @@ -235,6 +239,16 @@ gtk_menu_append(GTK_MENU(_optTypeMenu), item); gtk_widget_show(item); gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_RPMSRCDIR); + + item = gtk_menu_item_new_with_label("repomd"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMD); + + item = gtk_menu_item_new_with_label("repomd-src"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMDSRC); #else item = gtk_menu_item_new_with_label(_("Binary (deb)")); gtk_menu_append(GTK_MENU(_optTypeMenu), item); @@ -512,6 +526,12 @@ case ITEM_TYPE_RPMSRCDIR: rec->Type |= SourcesList::RpmSrcDir; break; + case ITEM_TYPE_REPOMD: + rec->Type |= SourcesList::Repomd; + break; + case ITEM_TYPE_REPOMDSRC: + rec->Type |= SourcesList::RepomdSrc; + break; default: _userDialog->error(_("Unknown source type")); return; @@ -642,6 +662,10 @@ id = ITEM_TYPE_RPMDIR; else if (rec->Type & SourcesList::RpmSrcDir) id = ITEM_TYPE_RPMSRCDIR; + else if (rec->Type & SourcesList::Repomd) + id = ITEM_TYPE_REPOMD; + else if (rec->Type & SourcesList::RepomdSrc) + id = ITEM_TYPE_REPOMDSRC; gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optType), id); gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optVendor), synaptic-0.57.2-showprog.patch: --- NEW FILE synaptic-0.57.2-showprog.patch --- --- synaptic-0.57.2/gtk/rgfetchprogress.cc.showprog 2006-05-09 19:14:11.000000000 +0300 +++ synaptic-0.57.2/gtk/rgfetchprogress.cc 2006-05-09 19:13:35.000000000 +0300 @@ -337,6 +337,7 @@ //cout << "RGFetchProgress::Start()" << endl; pkgAcquireStatus::Start(); _cancelled = false; + show(); RGFlushInterface(); } From fedora-extras-commits at redhat.com Sat May 20 17:12:45 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Sat, 20 May 2006 10:12:45 -0700 Subject: owners owners.list,1.1029,1.1030 Message-ID: <200605201712.k4KHClEh028057@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28022 Modified Files: owners.list Log Message: Fix my email address. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1029 retrieving revision 1.1030 diff -u -r1.1029 -r1.1030 --- owners.list 20 May 2006 14:40:31 -0000 1.1029 +++ owners.list 20 May 2006 17:12:45 -0000 1.1030 @@ -901,7 +901,7 @@ Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fc_extra at normalesup.org|extras-qa at fedoraproject.org| +Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org| Fedora Extras|paraview|Parallel visualization application|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 17:20:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 10:20:19 -0700 Subject: rpms/xmms-alarm/FC-5 xmms-alarm-0.3.7-optflags.patch, NONE, 1.1 xmms-alarm.spec, 1.10, 1.11 Message-ID: <200605201720.k4KHKLSc028158@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms-alarm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28123/FC-5 Modified Files: xmms-alarm.spec Added Files: xmms-alarm-0.3.7-optflags.patch Log Message: * Sat May 20 2006 Ville Skytt?? - 0.3.7-4 - Honor $RPM_OPT_FLAGS. xmms-alarm-0.3.7-optflags.patch: --- NEW FILE xmms-alarm-0.3.7-optflags.patch --- --- xmms-alarm-0.3.7/configure.ac~ 2005-03-26 22:28:54.000000000 +0200 +++ xmms-alarm-0.3.7/configure.ac 2006-05-20 20:07:59.000000000 +0300 @@ -13,3 +13,3 @@ -CFLAGS="-I../include" +CFLAGS="$CFLAGS -I../include" --- xmms-alarm-0.3.7/configure~ 2005-04-09 02:27:29.000000000 +0300 +++ xmms-alarm-0.3.7/configure 2006-05-20 20:07:49.000000000 +0300 @@ -19071,3 +19071,3 @@ -CFLAGS="-I../include" +CFLAGS="$CFLAGS -I../include" Index: xmms-alarm.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-alarm/FC-5/xmms-alarm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xmms-alarm.spec 13 Apr 2006 13:28:47 -0000 1.10 +++ xmms-alarm.spec 20 May 2006 17:20:18 -0000 1.11 @@ -2,13 +2,14 @@ Name: xmms-alarm Version: 0.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plugin for using XMMS as an alarm clock License: GPL Group: Applications/Multimedia URL: http://www.snika.uklinux.net/?p=xmms-alarm Source: http://www.snika.uklinux.net/xmms-alarm/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.3.7-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmms-devel @@ -22,6 +23,8 @@ %prep %setup -q +%patch0 -p1 +touch -r aclocal.m4 configure.ac %build @@ -46,6 +49,9 @@ %changelog +* Sat May 20 2006 Ville Skytt?? - 0.3.7-4 +- Honor $RPM_OPT_FLAGS. + * Thu Apr 6 2006 Ville Skytt?? - 0.3.7-3 - Add dependency on the main xmms package. From fedora-extras-commits at redhat.com Sat May 20 17:20:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 10:20:19 -0700 Subject: rpms/xmms-alarm/devel xmms-alarm-0.3.7-optflags.patch, NONE, 1.1 xmms-alarm.spec, 1.10, 1.11 Message-ID: <200605201720.k4KHKLJ6028164@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms-alarm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28123/devel Modified Files: xmms-alarm.spec Added Files: xmms-alarm-0.3.7-optflags.patch Log Message: * Sat May 20 2006 Ville Skytt?? - 0.3.7-4 - Honor $RPM_OPT_FLAGS. xmms-alarm-0.3.7-optflags.patch: --- NEW FILE xmms-alarm-0.3.7-optflags.patch --- --- xmms-alarm-0.3.7/configure.ac~ 2005-03-26 22:28:54.000000000 +0200 +++ xmms-alarm-0.3.7/configure.ac 2006-05-20 20:07:59.000000000 +0300 @@ -13,3 +13,3 @@ -CFLAGS="-I../include" +CFLAGS="$CFLAGS -I../include" --- xmms-alarm-0.3.7/configure~ 2005-04-09 02:27:29.000000000 +0300 +++ xmms-alarm-0.3.7/configure 2006-05-20 20:07:49.000000000 +0300 @@ -19071,3 +19071,3 @@ -CFLAGS="-I../include" +CFLAGS="$CFLAGS -I../include" Index: xmms-alarm.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-alarm/devel/xmms-alarm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xmms-alarm.spec 6 Apr 2006 20:59:14 -0000 1.10 +++ xmms-alarm.spec 20 May 2006 17:20:19 -0000 1.11 @@ -2,13 +2,14 @@ Name: xmms-alarm Version: 0.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plugin for using XMMS as an alarm clock License: GPL Group: Applications/Multimedia URL: http://www.snika.uklinux.net/?p=xmms-alarm Source: http://www.snika.uklinux.net/xmms-alarm/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.3.7-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmms-devel @@ -22,6 +23,8 @@ %prep %setup -q +%patch0 -p1 +touch -r aclocal.m4 configure.ac %build @@ -46,6 +49,9 @@ %changelog +* Sat May 20 2006 Ville Skytt?? - 0.3.7-4 +- Honor $RPM_OPT_FLAGS. + * Thu Apr 6 2006 Ville Skytt?? - 0.3.7-3 - Add dependency on the main xmms package. From fedora-extras-commits at redhat.com Sat May 20 17:58:22 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sat, 20 May 2006 10:58:22 -0700 Subject: rpms/hspell/devel sources,1.3,1.4 Message-ID: <200605201758.k4KHwOL7028458@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28440 Modified Files: sources Log Message: no need for the 0.9 tarball Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 May 2006 07:00:49 -0000 1.3 +++ sources 20 May 2006 17:58:22 -0000 1.4 @@ -1,2 +1 @@ -6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz 3e12fa383c2cfd430918d115f33f9841 hspell-1.0.tar.gz From fedora-extras-commits at redhat.com Sat May 20 18:07:07 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sat, 20 May 2006 11:07:07 -0700 Subject: rpms/hspell/devel hspell.spec,1.5,1.6 Message-ID: <200605201807.k4KI79hS030802@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30785 Modified Files: hspell.spec Log Message: do not strip binary package, create a useful debuginfo Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/hspell.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hspell.spec 15 May 2006 07:00:49 -0000 1.5 +++ hspell.spec 20 May 2006 18:07:07 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -46,6 +46,7 @@ %prep %setup -q +sed -i -e '/^\s\+strip\s/d' Makefile.in %build %configure --enable-fatverb --enable-linginfo @@ -74,6 +75,8 @@ %{_mandir}/man3/hspell.3* %changelog +* Sat May 20 2006 Dan Kenigsberg 1.0-3 +- do not strip the binary, create useful defuginfo package (Bug #192437). * Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. From fedora-extras-commits at redhat.com Sat May 20 19:07:50 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sat, 20 May 2006 12:07:50 -0700 Subject: rpms/hspell/FC-4 hspell.spec,1.5,1.6 Message-ID: <200605201907.k4KJ7qD7000993@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv974 Modified Files: hspell.spec Log Message: create a useful debbuginfo package Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hspell.spec 15 May 2006 06:32:07 -0000 1.5 +++ hspell.spec 20 May 2006 19:07:50 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -46,6 +46,7 @@ %prep %setup -q +sed -i -e '/^\s\+strip\s/d' Makefile.in %build %configure --enable-fatverb --enable-linginfo @@ -74,6 +75,8 @@ %{_mandir}/man3/hspell.3* %changelog +* Sat May 20 2006 Dan Kenigsberg 1.0-4 +- do not strip the binary, create useful defuginfo package. * Sun May 15 2006 Dan Kenigsberg 1.0-3 - new upstream release. - Hebrew description converted to utf8. From fedora-extras-commits at redhat.com Sat May 20 19:12:15 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sat, 20 May 2006 12:12:15 -0700 Subject: rpms/hspell/FC-5 hspell.spec,1.5,1.6 Message-ID: <200605201912.k4KJCH9E001087@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1066 Modified Files: hspell.spec Log Message: create a useful debuginfo package Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/hspell.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hspell.spec 15 May 2006 06:54:42 -0000 1.5 +++ hspell.spec 20 May 2006 19:12:15 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -46,6 +46,7 @@ %prep %setup -q +sed -i -e '/^\s\+strip\s/d' Makefile.in %build %configure --enable-fatverb --enable-linginfo @@ -74,6 +75,8 @@ %{_mandir}/man3/hspell.3* %changelog +* Sat May 20 2006 Dan Kenigsberg 1.0-3 +- do not strip the binary, create useful defuginfo package (Bug #192437). * Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. From fedora-extras-commits at redhat.com Sat May 20 19:58:27 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 12:58:27 -0700 Subject: rpms/lilypond-doc - New directory Message-ID: <200605201958.k4KJwTaw001349@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1328/lilypond-doc Log Message: Directory /cvs/extras/rpms/lilypond-doc added to the repository From fedora-extras-commits at redhat.com Sat May 20 19:58:27 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 12:58:27 -0700 Subject: rpms/lilypond-doc/devel - New directory Message-ID: <200605201958.k4KJwTOp001352@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1328/lilypond-doc/devel Log Message: Directory /cvs/extras/rpms/lilypond-doc/devel added to the repository From fedora-extras-commits at redhat.com Sat May 20 19:58:38 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 12:58:38 -0700 Subject: rpms/lilypond-doc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605201958.k4KJwekc001409@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lilypond-doc --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat May 20 19:58:38 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 12:58:38 -0700 Subject: rpms/lilypond-doc Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605201958.k4KJweN1001406@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373 Added Files: Makefile import.log Log Message: Setup of module lilypond-doc --- NEW FILE Makefile --- # Top level Makefile for module lilypond-doc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat May 20 20:04:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 13:04:03 -0700 Subject: rpms/perl-Module-Build/FC-4 .cvsignore, 1.8, 1.9 perl-Module-Build.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200605202004.k4KK45FG003785@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3764 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 10 Jan 2006 21:14:21 -0000 1.8 +++ .cvsignore 20 May 2006 20:04:03 -0000 1.9 @@ -1 +1 @@ -Module-Build-0.2611.tar.gz +Module-Build-0.28.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/perl-Module-Build.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Module-Build.spec 10 Jan 2006 21:14:21 -0000 1.12 +++ perl-Module-Build.spec 20 May 2006 20:04:03 -0000 1.13 @@ -1,23 +1,39 @@ +%define module_version 0.28 + Name: perl-Module-Build -Version: 0.2611 +Version: 0.2800 Release: 2%{?dist} Summary: Perl module for building and installing Perl modules -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{module_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 -Requires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 +BuildRequires: perl(Archive::Tar) >= 1.08 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.15 +BuildRequires: perl(ExtUtils::ParseXS) >= 1.02 +BuildRequires: perl(YAML) +BuildRequires: perl(Pod::Readme) >= 0.04 +Requires: perl(Archive::Tar) >= 1.08 +Requires: perl(ExtUtils::CBuilder) >= 0.15 +Requires: perl(ExtUtils::ParseXS) >= 1.02 +Requires: perl(Pod::Readme) >= 0.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -Perl module for building and installing Perl modules, a replacement to -ExtUtils::MakeMaker. +Module::Build is a system for building, testing, and installing Perl +modules. It is meant to be an alternative to ExtUtils::MakeMaker. +Developers may alter the behavior of the module through subclassing in a +much more straightforward way than with MakeMaker. It also does not require +a make on your system - most of the Module::Build code is pure-perl and +written in a very cross-platform way. In fact, you don't even need a shell, +so even platforms like MacOS (traditional) can use it fairly easily. Its +only prerequisites are modules that are included with perl 5.6.0, and it +works fine on perl 5.005 if you can install a few additional modules. %prep -%setup -q -n Module-Build-%{version} +%setup -q -n Module-Build-%{module_version} %build %{__perl} Build.PL installdirs=vendor @@ -27,29 +43,41 @@ rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 - find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check -./Build test +# 0.28 builds fail in the build system due +# to no stdin in t/extend, so we cheat. +./Build test < /dev/zero %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{_bindir}/config_data %{perl_vendorlib}/Module %{_mandir}/man1/config_data.1* %{_mandir}/man3/Module::Build*.3* %changelog +* Thu May 18 2006 Steven Pritchard 0.2800-2 +- Take input from /dev/zero during "Build test" to avoid test failure. + +* Wed May 17 2006 Steven Pritchard 0.2800-1 +- Update to 0.28, but call it 0.2800 to avoid an epoch bump. +- Various spec cleanups to closer match cpanspec output. + +* Wed Mar 15 2006 Steven Pritchard - 0.2612-2 +- Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and + ExtUtils::ParseXS. + +* Sat Mar 11 2006 Steven Pritchard - 0.2612-1 +- Update to 0.2612. + * Mon Sep 05 2005 Steven Pritchard - 0.2611-2 - Minor spec cleanup. - Add COPYING and Artistic. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 10 Jan 2006 21:14:21 -0000 1.8 +++ sources 20 May 2006 20:04:03 -0000 1.9 @@ -1 +1 @@ -d0fa9a7917ed43d1c1f8b707e86b6061 Module-Build-0.2611.tar.gz +8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:14:19 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 13:14:19 -0700 Subject: rpms/lilypond-doc import.log,1.1,1.2 Message-ID: <200605202014.k4KKELx2003931@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3898 Modified Files: import.log Log Message: auto-import lilypond-doc-2.8.3-1 on branch devel from lilypond-doc-2.8.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lilypond-doc/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 May 2006 19:58:38 -0000 1.1 +++ import.log 20 May 2006 20:14:19 -0000 1.2 @@ -0,0 +1 @@ +lilypond-doc-2_8_3-1:HEAD:lilypond-doc-2.8.3-1.src.rpm:1148156063 From fedora-extras-commits at redhat.com Sat May 20 20:14:20 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 13:14:20 -0700 Subject: rpms/lilypond-doc/devel lilypond-doc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605202014.k4KKEMOT003936@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3898/devel Modified Files: .cvsignore sources Added Files: lilypond-doc.spec Log Message: auto-import lilypond-doc-2.8.3-1 on branch devel from lilypond-doc-2.8.3-1.src.rpm --- NEW FILE lilypond-doc.spec --- Name: lilypond-doc Version: 2.8.3 Release: 1%{?dist} Summary: HTML documentation for LilyPond Group: Applications/Publishing License: GPL URL: http://www.lilypond.org Source0: http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-1.documentation.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. This package contains the HTML documentation for LilyPond. %prep %setup -q -c %build # Remove empty files rm -f input/mutopia/E.Satie/petite-ouverture-a-danser.png rm -f input/mutopia/J.S.Bach/wtk1-fugue2.png rm -f input/mutopia/W.A.Mozart/mozart-hrn-3.png %install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc *.html input Documentation %changelog * Fri May 19 2006 Quentin Spencer 2.8.3-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond-doc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 May 2006 19:58:38 -0000 1.1 +++ .cvsignore 20 May 2006 20:14:20 -0000 1.2 @@ -0,0 +1 @@ +lilypond-2.8.3-1.documentation.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond-doc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 May 2006 19:58:38 -0000 1.1 +++ sources 20 May 2006 20:14:20 -0000 1.2 @@ -0,0 +1 @@ +45622b94aba72994277d6a0d4fcf706c lilypond-2.8.3-1.documentation.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 20:18:34 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 13:18:34 -0700 Subject: owners owners.list,1.1030,1.1031 Message-ID: <200605202018.k4KKIaOU004064@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4046 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1030 retrieving revision 1.1031 diff -u -r1.1030 -r1.1031 --- owners.list 20 May 2006 17:12:45 -0000 1.1030 +++ owners.list 20 May 2006 20:18:34 -0000 1.1031 @@ -728,6 +728,7 @@ Fedora Extras|lightning|GNU Lightning|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lilypond|A typesetting system for music notation|qspencer at ieee.org|extras-qa at fedoraproject.org| +Fedora Extras|lilypond-doc|HTML documentation for LilyPond|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 20:20:38 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 20 May 2006 13:20:38 -0700 Subject: rpms/python-kid/devel python-kid.spec,1.9,1.10 Message-ID: <200605202020.k4KKKe23004129@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4081/devel Modified Files: python-kid.spec Log Message: Update project URL Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/python-kid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-kid.spec 19 May 2006 18:54:17 -0000 1.9 +++ python-kid.spec 20 May 2006 20:20:38 -0000 1.10 @@ -2,12 +2,12 @@ Name: python-kid Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing License: MIT -URL: http://www.lesscode.org/projects/kid +URL: http://kid.lesscode.org/trac/ Source0: http://lesscode.org/dist/kid/kid-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -57,6 +57,9 @@ %changelog +* Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 +- Update project URL + * Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 - Version 0.9.1 From fedora-extras-commits at redhat.com Sat May 20 20:20:31 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 20 May 2006 13:20:31 -0700 Subject: rpms/python-kid/FC-4 python-kid.spec,1.9,1.10 Message-ID: <200605202021.k4KKL3HR004135@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4081/FC-4 Modified Files: python-kid.spec Log Message: Update project URL Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/python-kid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-kid.spec 19 May 2006 18:54:10 -0000 1.9 +++ python-kid.spec 20 May 2006 20:20:31 -0000 1.10 @@ -2,12 +2,12 @@ Name: python-kid Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing License: MIT -URL: http://www.lesscode.org/projects/kid +URL: http://kid.lesscode.org/trac/ Source0: http://lesscode.org/dist/kid/kid-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -57,6 +57,9 @@ %changelog +* Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 +- Update project URL + * Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 - Version 0.9.1 From fedora-extras-commits at redhat.com Sat May 20 20:20:32 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 20 May 2006 13:20:32 -0700 Subject: rpms/python-kid/FC-5 python-kid.spec,1.9,1.10 Message-ID: <200605202021.k4KKL4fT004138@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4081/FC-5 Modified Files: python-kid.spec Log Message: Update project URL Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/python-kid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-kid.spec 19 May 2006 18:54:11 -0000 1.9 +++ python-kid.spec 20 May 2006 20:20:32 -0000 1.10 @@ -2,12 +2,12 @@ Name: python-kid Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing License: MIT -URL: http://www.lesscode.org/projects/kid +URL: http://kid.lesscode.org/trac/ Source0: http://lesscode.org/dist/kid/kid-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -57,6 +57,9 @@ %changelog +* Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 +- Update project URL + * Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 - Version 0.9.1 From fedora-extras-commits at redhat.com Sat May 20 20:27:15 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:27:15 -0700 Subject: rpms/ots/devel .cvsignore, 1.3, 1.4 Makefile, 1.2, 1.3 ots.spec, 1.5, 1.6 sources, 1.3, 1.4 dead.package, 1.1, NONE Message-ID: <200605202027.k4KKRHqq004354@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298/devel Added Files: .cvsignore Makefile ots.spec sources Removed Files: dead.package Log Message: taking ownership of ots, importing back into devel Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 20 May 2006 20:27:15 -0000 1.4 @@ -0,0 +1 @@ +ots-0.4.2.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 20 May 2006 20:27:15 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: ots +# $Id$ +NAME := ots +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: ots.spec =================================================================== RCS file: ots.spec diff -N ots.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ots.spec 20 May 2006 20:27:15 -0000 1.6 @@ -0,0 +1,133 @@ +Name: ots +Summary: A text summarizer +Version: 0.4.2 +Release: 8%{?dist} +License: GPL +URL: http://libots.sourceforge.net/ +Group: System Environment/Libraries +Source0: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz +Patch0: ots-0.4.2-gcc4.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: glib2 >= 2.0 +BuildRequires: glib2-devel >= 2.0, libxml2-devel >= 2.4.23, pkgconfig >= 0.8 + +%description +The open text summarizer is an open source tool for summarizing texts. +The program reads a text and decides which sentences are important and +which are not. + +%package devel +Summary: Libraries and include files for developing with libots. +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: pkgconfig >= 0.8, glib2 >= 2.0, glib2-devel >= 2.0 + +%description devel +This package provides the necessary development libraries and include +files to allow you to develop with libots. + +%prep +%setup -q +%patch0 -p1 -b .gcc4 + +%build + +%configure --disable-gtk-doc \ + --with-html-dir=%{buildroot}%{_datadir}/gtk-doc/html/ots +make + +%install +rm -rf %{buildroot} +%makeinstall +# Currently, ots generates empty API docs. +rm -rf %{buildroot}/%{_datadir}/gtk-doc +rm -f %{buildroot}%{_libdir}/*.la + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) +%doc AUTHORS COPYING ChangeLog NEWS README TODO +%{_bindir}/ots +%{_libdir}/*.so.* +%{_mandir}/*/* +%{_datadir}/ots + +%files devel +%defattr(-,root,root) +%{_libdir}/*.a +%{_libdir}/*.so +%{_includedir}/libots-1 +%{_libdir}/pkgconfig/*.pc + +%changelog +* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +- rebuild and spec tidy + +* Sun May 22 2005 Jeremy Katz - 0.4.2-7 +- rebuild on all arches + +* Wed Mar 16 2005 Toshio Kuratomi - 0.4.2-5 +- Reenable man page. +- Disable rebuilding documentation via configure switch instead of an automake + requiring patch. +- Remove the API documentation for now as it is just a placeholder. + +* Wed Mar 2 2005 Caolan McNamara - 0.4.2-4 +- rebuild with gcc4 +- small lvalue assign patch + +* Wed Feb 09 2005 Caolan McNamara - 0.4.2-3 +- rebuilt + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Thu Feb 19 2004 Jeremy Katz - 0.4.2-1 +- 0.4.2 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Nov 28 2003 Jeremy Katz +- add some buildrequires (#111158) + +* Mon Sep 15 2003 Jeremy Katz 0.4.1-1 +- 0.4.1 + +* Mon Aug 4 2003 Jeremy Katz 0.4.0-1 +- 0.4.0 + +* Tue Jul 22 2003 Jeremy Katz 0.3.0-1 +- update to 0.3.0 + +* Sat Jul 12 2003 Jeremy Katz 0.2.0-2 +- forcibly disable gtk-doc (openjade is busted on s390) + +* Mon Jul 7 2003 Jeremy Katz 0.2.0-1 +- update to 0.2.0 +- ldconfig in %%post/%%postun +- libtoolize +- clean up spec file a little, build gtk-doc +- fix libtool versioning + +* Thu Jun 05 2003 Rui Miguel Silva Seabra +- fix spec +- disable gtk-doc (it's not building in RH 9, + maybe it's broken for some reason) + +* Fri May 02 2003 Rui Miguel Silva Seabra +- define a longer description from the README file +- explicitly set file permissions + +* Wed Apr 30 2003 Dom Lachowicz +- created this thing Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 20 May 2006 20:27:15 -0000 1.4 @@ -0,0 +1 @@ +bb02a56a3bf2d5ebf9ffd064992d0ae4 ots-0.4.2.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat May 20 20:27:09 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:27:09 -0700 Subject: rpms/ots/FC-4 ots.spec,1.4,1.5 Message-ID: <200605202027.k4KKRfmD004360@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298/FC-4 Modified Files: ots.spec Log Message: taking ownership of ots, importing back into devel Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/FC-4/ots.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ots.spec 9 Jun 2005 01:50:26 -0000 1.4 +++ ots.spec 20 May 2006 20:27:09 -0000 1.5 @@ -1,16 +1,16 @@ -Name: ots -Summary: A text summarizer -Version: 0.4.2 -Release: 6.1 -License: GPL -Group: System Environment/Libraries -Source: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz -Patch1: ots-0.4.2-gcc4.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pkgconfig >= 0.8 -Requires: glib2 >= 2.0 -BuildRequires: glib2-devel >= 2.0 -BuildRequires: libxml2-devel >= 2.4.23 +Name: ots +Summary: A text summarizer +Version: 0.4.2 +Release: 8%{?dist} +License: GPL +URL: http://libots.sourceforge.net/ +Group: System Environment/Libraries +Source0: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz +Patch0: ots-0.4.2-gcc4.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: glib2 >= 2.0 +BuildRequires: glib2-devel >= 2.0, libxml2-devel >= 2.4.23, pkgconfig >= 0.8 %description The open text summarizer is an open source tool for summarizing texts. @@ -18,13 +18,10 @@ which are not. %package devel -Summary: Libraries and include files for developing with libots. -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: pkgconfig >= 0.8 -Requires: glib2 >= 2.0 -Requires: glib2-devel >= 2.0 - +Summary: Libraries and include files for developing with libots. +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: pkgconfig >= 0.8, glib2 >= 2.0, glib2-devel >= 2.0 %description devel This package provides the necessary development libraries and include @@ -32,23 +29,23 @@ %prep %setup -q -%patch1 -p1 -b .gcc4 +%patch0 -p1 -b .gcc4 %build %configure --disable-gtk-doc \ - --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/ots + --with-html-dir=%{buildroot}%{_datadir}/gtk-doc/html/ots make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %makeinstall # Currently, ots generates empty API docs. -rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -rf %{buildroot}/%{_datadir}/gtk-doc +rm -f %{buildroot}%{_libdir}/*.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -70,7 +67,10 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun May 22 2005 Jeremy Katz - 0.4.2-6.1 +* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +- rebuild and spec tidy + +* Sun May 22 2005 Jeremy Katz - 0.4.2-7 - rebuild on all arches * Wed Mar 16 2005 Toshio Kuratomi - 0.4.2-5 From fedora-extras-commits at redhat.com Sat May 20 20:27:10 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:27:10 -0700 Subject: rpms/ots/FC-5 ots.spec,1.4,1.5 Message-ID: <200605202027.k4KKRgml004363@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298/FC-5 Modified Files: ots.spec Log Message: taking ownership of ots, importing back into devel Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/FC-5/ots.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ots.spec 9 Jun 2005 01:35:54 -0000 1.4 +++ ots.spec 20 May 2006 20:27:09 -0000 1.5 @@ -1,16 +1,16 @@ -Name: ots -Summary: A text summarizer -Version: 0.4.2 -Release: 7 -License: GPL -Group: System Environment/Libraries -Source: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz -Patch1: ots-0.4.2-gcc4.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pkgconfig >= 0.8 -Requires: glib2 >= 2.0 -BuildRequires: glib2-devel >= 2.0 -BuildRequires: libxml2-devel >= 2.4.23 +Name: ots +Summary: A text summarizer +Version: 0.4.2 +Release: 8%{?dist} +License: GPL +URL: http://libots.sourceforge.net/ +Group: System Environment/Libraries +Source0: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz +Patch0: ots-0.4.2-gcc4.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: glib2 >= 2.0 +BuildRequires: glib2-devel >= 2.0, libxml2-devel >= 2.4.23, pkgconfig >= 0.8 %description The open text summarizer is an open source tool for summarizing texts. @@ -18,13 +18,10 @@ which are not. %package devel -Summary: Libraries and include files for developing with libots. -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: pkgconfig >= 0.8 -Requires: glib2 >= 2.0 -Requires: glib2-devel >= 2.0 - +Summary: Libraries and include files for developing with libots. +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: pkgconfig >= 0.8, glib2 >= 2.0, glib2-devel >= 2.0 %description devel This package provides the necessary development libraries and include @@ -32,23 +29,23 @@ %prep %setup -q -%patch1 -p1 -b .gcc4 +%patch0 -p1 -b .gcc4 %build %configure --disable-gtk-doc \ - --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/ots + --with-html-dir=%{buildroot}%{_datadir}/gtk-doc/html/ots make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %makeinstall # Currently, ots generates empty API docs. -rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -rf %{buildroot}/%{_datadir}/gtk-doc +rm -f %{buildroot}%{_libdir}/*.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -70,6 +67,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +- rebuild and spec tidy + * Sun May 22 2005 Jeremy Katz - 0.4.2-7 - rebuild on all arches From fedora-extras-commits at redhat.com Sat May 20 20:30:34 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:30:34 -0700 Subject: rpms/ots/devel ots-0.4.2-gcc4.patch,1.2,1.3 Message-ID: <200605202030.k4KKUaDT004454@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4434 Added Files: ots-0.4.2-gcc4.patch Log Message: include gcc4 patch ots-0.4.2-gcc4.patch: Index: ots-0.4.2-gcc4.patch =================================================================== RCS file: ots-0.4.2-gcc4.patch diff -N ots-0.4.2-gcc4.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ots-0.4.2-gcc4.patch 20 May 2006 20:30:34 -0000 1.3 @@ -0,0 +1,11 @@ +--- ots-0.4.2/src/article.c.orig 2005-03-02 19:42:19.479330826 +0000 ++++ ots-0.4.2/src/article.c 2005-03-02 19:42:43.967625287 +0000 +@@ -35,7 +35,7 @@ + ots_new_sentence (void) + { + OtsSentence *aLine = g_new0 (OtsSentence, 1); +- (GList *) aLine->words = NULL; ++ aLine->words = NULL; + aLine->wc = 0; + aLine->selected = 0; + aLine->score = 0; From fedora-extras-commits at redhat.com Sat May 20 20:31:24 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:31:24 -0700 Subject: rpms/ots/FC-4 ots.spec,1.5,1.6 Message-ID: <200605202031.k4KKVuip004511@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/FC-4 Modified Files: ots.spec Log Message: release bump Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/FC-4/ots.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ots.spec 20 May 2006 20:27:09 -0000 1.5 +++ ots.spec 20 May 2006 20:31:23 -0000 1.6 @@ -1,7 +1,7 @@ Name: ots Summary: A text summarizer Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL URL: http://libots.sourceforge.net/ Group: System Environment/Libraries @@ -67,7 +67,7 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +* Sun May 21 2006 Michael J. Knox - 0.4.2-9 - rebuild and spec tidy * Sun May 22 2005 Jeremy Katz - 0.4.2-7 From fedora-extras-commits at redhat.com Sat May 20 20:31:24 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:31:24 -0700 Subject: rpms/ots/FC-5 ots.spec,1.5,1.6 Message-ID: <200605202031.k4KKVuTn004514@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/FC-5 Modified Files: ots.spec Log Message: release bump Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/FC-5/ots.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ots.spec 20 May 2006 20:27:09 -0000 1.5 +++ ots.spec 20 May 2006 20:31:24 -0000 1.6 @@ -1,7 +1,7 @@ Name: ots Summary: A text summarizer Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL URL: http://libots.sourceforge.net/ Group: System Environment/Libraries @@ -67,7 +67,7 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +* Sun May 21 2006 Michael J. Knox - 0.4.2-9 - rebuild and spec tidy * Sun May 22 2005 Jeremy Katz - 0.4.2-7 From fedora-extras-commits at redhat.com Sat May 20 20:31:25 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:31:25 -0700 Subject: rpms/ots/devel ots.spec,1.6,1.7 Message-ID: <200605202031.k4KKVv14004517@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/devel Modified Files: ots.spec Log Message: release bump Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/devel/ots.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ots.spec 20 May 2006 20:27:15 -0000 1.6 +++ ots.spec 20 May 2006 20:31:25 -0000 1.7 @@ -1,7 +1,7 @@ Name: ots Summary: A text summarizer Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL URL: http://libots.sourceforge.net/ Group: System Environment/Libraries @@ -67,7 +67,7 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +* Sun May 21 2006 Michael J. Knox - 0.4.2-9 - rebuild and spec tidy * Sun May 22 2005 Jeremy Katz - 0.4.2-7 From fedora-extras-commits at redhat.com Sat May 20 20:34:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 13:34:05 -0700 Subject: rpms/perl-YAML/devel perl-YAML.spec,1.10,1.11 sources,1.5,1.6 Message-ID: <200605202034.k4KKY7mE004658@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4639 Modified Files: perl-YAML.spec sources Log Message: Go back to 0.58. Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-YAML.spec 17 May 2006 19:14:32 -0000 1.10 +++ perl-YAML.spec 20 May 2006 20:34:05 -0000 1.11 @@ -1,18 +1,15 @@ Name: perl-YAML -Version: 0.39 +Version: 0.58 Release: 2%{?dist} Summary: YAML Ain't Markup Language (tm) - -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz -Patch0: %{name}-testmore054.patch 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)) +BuildRequires: perl(Test::Base) >= 0.49 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The YAML.pm module implements a YAML Loader and Dumper based on the @@ -23,43 +20,48 @@ For information on the YAML syntax, please refer to the YAML specification. - %prep %setup -q -n YAML-%{version} -%patch0 -p0 - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT + make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w $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 \; -%check || : -make test +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%check +make test %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc Changes README %{_bindir}/ysh %{perl_vendorlib}/YAML* +%{perl_vendorlib}/Test/YAML* %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* - +%{_mandir}/man3/Test::YAML*.3* %changelog +* Tue May 09 2006 Steven Pritchard 0.58-2 +- Drop testmore patch. +- Catch Test::YAML module and man page in file list. + +* Thu May 04 2006 Steven Pritchard 0.58-1 +- Update to 0.58. +- Small spec cleanups. + * Thu Apr 14 2005 Ville Skytt?? - 0.39-2 - 0.39. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 May 2006 19:14:32 -0000 1.5 +++ sources 20 May 2006 20:34:05 -0000 1.6 @@ -1 +1 @@ -b8a49f49cb0ee6d9698807fb3f606922 YAML-0.39.tar.gz +aa5ac653057914ca995dd74de8212ebc YAML-0.58.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:35:36 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 13:35:36 -0700 Subject: rpms/perl-YAML/devel perl-YAML.spec,1.11,1.12 Message-ID: <200605202035.k4KKZc0x004715@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4696 Modified Files: perl-YAML.spec Log Message: Rebuild. Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-YAML.spec 20 May 2006 20:34:05 -0000 1.11 +++ perl-YAML.spec 20 May 2006 20:35:35 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-YAML Version: 0.58 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML Ain't Markup Language (tm) License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/Test::YAML*.3* %changelog +* Sat May 20 2006 Steven Pritchard 0.58-3 +- Rebuild. + * Tue May 09 2006 Steven Pritchard 0.58-2 - Drop testmore patch. - Catch Test::YAML module and man page in file list. From fedora-extras-commits at redhat.com Sat May 20 20:38:00 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:38:00 -0700 Subject: rpms/duplicity/devel .cvsignore, 1.3, 1.4 Makefile, 1.3, 1.4 duplicity.spec, 1.7, 1.8 sources, 1.3, 1.4 dead.package, 1.1, NONE Message-ID: <200605202038.k4KKc2AK004838@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/duplicity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/devel Added Files: .cvsignore Makefile duplicity.spec sources Removed Files: dead.package Log Message: taking ownership and updated package Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 20 May 2006 20:38:00 -0000 1.4 @@ -0,0 +1 @@ +duplicity-0.4.2.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 20 May 2006 20:38:00 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: duplicity +# $Id$ +NAME := duplicity +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: duplicity.spec =================================================================== RCS file: duplicity.spec diff -N duplicity.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ duplicity.spec 20 May 2006 20:38:00 -0000 1.8 @@ -0,0 +1,69 @@ +%define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],') +%define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),') + +Version: 0.4.2 +Summary: Untrusted/encrypted backup using rsync algorithm +Name: duplicity +Release: 1%{?dist} +URL: http://www.nongnu.org/duplicity/ +Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz +License: GPL +Group: Applications/Archiving +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 +BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 + +%description +Duplicity incrementally backs up files and directory by encrypting +tar-format volumes with GnuPG and uploading them to a remote (or +local) file server. In theory many remote backends are possible; +right now local, ssh/scp, ftp, and rsync backends are written. +Because duplicity uses librsync, the incremental archives are space +efficient and only record the parts of files that have changed since +the last backup. Currently duplicity supports deleted files, full +unix permissions, directories, symbolic links, fifos, etc., but not +hard links. + +%prep +%setup -q + +%build +python setup.py build + +%install +python setup.py install --root $RPM_BUILD_ROOT +# Produce .pyo files for %ghost directive later +python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity'")' + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc CHANGELOG COPYING README +%{_bindir}/rdiffdir +%{_bindir}/duplicity +%{_mandir}/man1/duplicity* +%{_mandir}/man1/rdiffdir* +%dir %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity +%{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.py +%{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.so +%{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyc +%ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyo + +%changelog +* Tue May 16 2006 Michael J. Knox - 0.4.2-1 +- verion bump + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Sun Oct 05 2003 Ben Escoto - 0:0.4.1-0.fdr.3 +- More hints from Fedora QA (ville.skytta at iki.fi) + +* Sat Aug 09 2003 Ben Escoto - 0:0.4.1-0.fdr.2 +- Repackaging for Fedora + +* Sun Aug 30 2002 Ben Escoto +- Initial RPM Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 20 May 2006 20:38:00 -0000 1.4 @@ -0,0 +1 @@ +a9fd4094f23bb36c82cc1dc2816a5b7d duplicity-0.4.2.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat May 20 20:37:54 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:37:54 -0700 Subject: rpms/duplicity/FC-4 .cvsignore, 1.2, 1.3 duplicity.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200605202038.k4KKcQI1004843@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/duplicity/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/FC-4 Modified Files: .cvsignore duplicity.spec sources Log Message: taking ownership and updated package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:14:50 -0000 1.2 +++ .cvsignore 20 May 2006 20:37:54 -0000 1.3 @@ -1 +1 @@ -duplicity-0.4.1.tar.gz +duplicity-0.4.2.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-4/duplicity.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- duplicity.spec 6 Apr 2005 22:11:36 -0000 1.6 +++ duplicity.spec 20 May 2006 20:37:54 -0000 1.7 @@ -1,18 +1,18 @@ %define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],') %define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),') -Version: 0.4.1 -Summary: Untrusted/encrypted backup using rsync algorithm -Name: duplicity -Release: 4 - -URL: http://www.nongnu.org/duplicity/ -Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz -License: GPL -Group: Applications/Archiving -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 -BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 +Version: 0.4.2 +Summary: Untrusted/encrypted backup using rsync algorithm +Name: duplicity +Release: 1%{?dist} +URL: http://www.nongnu.org/duplicity/ +Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz +License: GPL +Group: Applications/Archiving +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 +BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 %description Duplicity incrementally backs up files and directory by encrypting @@ -41,6 +41,7 @@ %files %defattr(-,root,root) +%doc CHANGELOG COPYING README %{_bindir}/rdiffdir %{_bindir}/duplicity %{_mandir}/man1/duplicity* @@ -50,9 +51,11 @@ %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.so %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyc %ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyo -%doc CHANGELOG COPYING README %changelog +* Tue May 16 2006 Michael J. Knox - 0.4.2-1 +- verion bump + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:14:50 -0000 1.2 +++ sources 20 May 2006 20:37:54 -0000 1.3 @@ -1 +1 @@ -c91933a10f97057b899ba97673ad8a63 duplicity-0.4.1.tar.gz +a9fd4094f23bb36c82cc1dc2816a5b7d duplicity-0.4.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:37:54 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:37:54 -0700 Subject: rpms/duplicity/FC-5 .cvsignore, 1.2, 1.3 duplicity.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200605202038.k4KKcQgN004848@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/duplicity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/FC-5 Modified Files: .cvsignore duplicity.spec sources Log Message: taking ownership and updated package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:14:50 -0000 1.2 +++ .cvsignore 20 May 2006 20:37:54 -0000 1.3 @@ -1 +1 @@ -duplicity-0.4.1.tar.gz +duplicity-0.4.2.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-5/duplicity.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- duplicity.spec 6 Apr 2005 22:11:36 -0000 1.6 +++ duplicity.spec 20 May 2006 20:37:54 -0000 1.7 @@ -1,18 +1,18 @@ %define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],') %define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),') -Version: 0.4.1 -Summary: Untrusted/encrypted backup using rsync algorithm -Name: duplicity -Release: 4 - -URL: http://www.nongnu.org/duplicity/ -Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz -License: GPL -Group: Applications/Archiving -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 -BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 +Version: 0.4.2 +Summary: Untrusted/encrypted backup using rsync algorithm +Name: duplicity +Release: 1%{?dist} +URL: http://www.nongnu.org/duplicity/ +Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz +License: GPL +Group: Applications/Archiving +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 +BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 %description Duplicity incrementally backs up files and directory by encrypting @@ -41,6 +41,7 @@ %files %defattr(-,root,root) +%doc CHANGELOG COPYING README %{_bindir}/rdiffdir %{_bindir}/duplicity %{_mandir}/man1/duplicity* @@ -50,9 +51,11 @@ %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.so %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyc %ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyo -%doc CHANGELOG COPYING README %changelog +* Tue May 16 2006 Michael J. Knox - 0.4.2-1 +- verion bump + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:14:50 -0000 1.2 +++ sources 20 May 2006 20:37:54 -0000 1.3 @@ -1 +1 @@ -c91933a10f97057b899ba97673ad8a63 duplicity-0.4.1.tar.gz +a9fd4094f23bb36c82cc1dc2816a5b7d duplicity-0.4.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:49:08 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:49:08 -0700 Subject: rpms/gnofract4d/devel .cvsignore, 1.4, 1.5 Makefile, 1.3, 1.4 gnofract4d.spec, 1.8, 1.9 sources, 1.4, 1.5 dead.package, 1.1, NONE Message-ID: <200605202049.k4KKnAwb005107@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/devel Added Files: .cvsignore Makefile gnofract4d.spec sources Removed Files: dead.package Log Message: taking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bump Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 20 May 2006 20:49:08 -0000 1.5 @@ -0,0 +1 @@ +gnofract4d-2.14.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 20 May 2006 20:49:08 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: gnofract4d +# $Id$ +NAME := gnofract4d +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: gnofract4d.spec =================================================================== RCS file: gnofract4d.spec diff -N gnofract4d.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnofract4d.spec 20 May 2006 20:49:08 -0000 1.9 @@ -0,0 +1,105 @@ +Name: gnofract4d +Version: 2.14 +Release: 1%{?dist} +Summary: Gnofract 4D is a Gnome-based program to draw fractals +Group: Amusements/Graphics +License: GPL +URL: http://gnofract4d.sourceforge.net/ +Source0: http//dl.sf.net/gnofract4d/gnofract4d-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: scrollkeeper, python, gcc-c++, pkgconfig +BuildRequires: gtk2-devel, python-devel +BuildRequires: desktop-file-utils, GConf2-devel + +Requires(post): scrollkeeper + +%description +Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from +other fractal programs (and makes it "4D") is the way that it treats the +Mandelbrot and Julia sets as different views of the same four-dimensional +fractal object. This allows you to generate images which are a cross between +the two sets and explore their inter-relationships. + +%prep + +%setup -q +%ifarch x86_64 + sed -i 's|/usr/lib/|%{_libdir}/|g' setup.cfg +%endif + +%build +python setup.py build + +%install +%{__rm} -rf %{buildroot} +python setup.py install --root="%{buildroot}" + +%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/ +desktop-file-install --vendor fedora \ + --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + %{buildroot}%{_datadir}/gnofract4d/gnofract4d.desktop + +%post +scrollkeeper-update -q || : + +%postun +scrollkeeper-update -q || : + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-, root, root, 0755) +%doc COPYING README +%doc %{_datadir}/gnome/help/gnofract4d/ +%{_bindir}/gnofract4d +%dir %{_datadir}/maps/ +%{_datadir}/maps/gnofract4d/ +%{_datadir}/mime/packages/gnofract4d-mime.xml +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/gnofract4d/ +%{_datadir}/pixmaps/gnofract4d-logo.png +%{_prefix}/lib/gnofract4d-%{version}/ +%{_datadir}/formulas/gnofract4d/ + +%changelog +* Wed May 17 2006 Michael J. Knox - 2.14-1 +- version bump and spec clean + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Sun Feb 13 2005 Throsten Leemhuis 0:2.6-2 +- "sed -i s|/usr/lib/|%%{_libdir}|g setup.cfg" on x86_64 + +* Tue Feb 01 2005 Panu Matilainen 0:2.6-1 +- update to 2.6 +- drop epoch 0 and fedora.us release tag +- run update-desktop-database on post+postun + +* Sun Oct 03 2004 Panu Matilainen 0:2.1-0.fdr.1 +- update to 2.1 + +* Tue Jul 06 2004 Panu Matilainen 0:2.0-0.fdr.1 +- update to 2.0 +- quite a few dependency changes because of switch to python etc + +* Mon May 31 2004 Panu Matilainen 0:1.9-0.fdr.3 +- fix build against newer gtk (gtk-buildfix patch) + +* Tue Dec 23 2003 Panu Matilainen 0:1.9-0.fdr.2 +- address issues in #1114 +- huh, this requires g++ to run... + +* Mon Dec 15 2003 Panu Matilainen 0:1.9-0.fdr.1 +- update to 1.9 +- drop patch (no longer needed to build) +- add translations now that there is one + + +* Sun Dec 07 2003 Panu Matilainen 0:1.8-0.fdr.1 +- Initial Fedora packaging. Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 20 May 2006 20:49:08 -0000 1.5 @@ -0,0 +1 @@ +34170bb139eb30dfd7d1c1bc647d2578 gnofract4d-2.14.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat May 20 20:49:07 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:49:07 -0700 Subject: rpms/gnofract4d/FC-4 .cvsignore, 1.3, 1.4 gnofract4d.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605202049.k4KKn9A7005094@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/FC-4 Modified Files: .cvsignore gnofract4d.spec sources Log Message: taking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bump Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 22:41:14 -0000 1.3 +++ .cvsignore 20 May 2006 20:49:07 -0000 1.4 @@ -1 +1 @@ -gnofract4d-2.6.tar.gz +gnofract4d-2.14.tar.gz Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-4/gnofract4d.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnofract4d.spec 6 Apr 2005 22:11:38 -0000 1.6 +++ gnofract4d.spec 20 May 2006 20:49:07 -0000 1.7 @@ -1,20 +1,19 @@ Name: gnofract4d -Version: 2.6 -Release: 3 - -Summary: Gnofract 4D is a Gnome-based program to draw fractals. - +Version: 2.14 +Release: 1%{?dist} +Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL URL: http://gnofract4d.sourceforge.net/ Source0: http//dl.sf.net/gnofract4d/gnofract4d-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: scrollkeeper, python, gcc-c++, pkgconfig +BuildRequires: gtk2-devel, python-devel +BuildRequires: desktop-file-utils, GConf2-devel + Requires(post): scrollkeeper -Requires(postun): scrollkeeper -# This *really* requires gcc at runtime! -Requires: gcc -BuildRequires: desktop-file-utils, python-devel -BuildRequires: scrollkeeper, libgnomeui-devel %description Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from @@ -24,6 +23,7 @@ the two sets and explore their inter-relationships. %prep + %setup -q %ifarch x86_64 sed -i 's|/usr/lib/|%{_libdir}/|g' setup.cfg @@ -33,47 +33,43 @@ python setup.py build %install -rm -rf $RPM_BUILD_ROOT -#sed -i "s/Terminal=0/Terminal=false/" %{name}.desktop -python setup.py install -O1 --root=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' - - -desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --vendor fedora \ - --add-category X-Fedora \ - --add-category Graphics \ - --add-category Application \ - --delete-original \ - $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Graphics/gnofract4d.desktop -rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome/apps - -%clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} +python setup.py install --root="%{buildroot}" +%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/ +desktop-file-install --vendor fedora \ + --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + %{buildroot}%{_datadir}/gnofract4d/gnofract4d.desktop %post -/usr/bin/scrollkeeper-update 2> /dev/null -/usr/bin/update-desktop-database %{_datadir}/applications +scrollkeeper-update -q || : %postun -/usr/bin/scrollkeeper-update 2> /dev/null -/usr/bin/update-desktop-database %{_datadir}/applications +scrollkeeper-update -q || : + +%clean +%{__rm} -rf %{buildroot} %files -%defattr(-,root,root,-) -%doc COPYING -%{_bindir}/* -%{_libdir}/%{name}-%{version} -%{_datadir}/maps -%{_datadir}/formulas -%{_datadir}/gnome/help/%{name} -%{_datadir}/pixmaps/%{name} -%{_datadir}/applications/* +%defattr(-, root, root, 0755) +%doc COPYING README +%doc %{_datadir}/gnome/help/gnofract4d/ +%{_bindir}/gnofract4d +%dir %{_datadir}/maps/ +%{_datadir}/maps/gnofract4d/ +%{_datadir}/mime/packages/gnofract4d-mime.xml +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/gnofract4d/ +%{_datadir}/pixmaps/gnofract4d-logo.png +%{_prefix}/lib/gnofract4d-%{version}/ +%{_datadir}/formulas/gnofract4d/ %changelog +* Wed May 17 2006 Michael J. Knox - 2.14-1 +- version bump and spec clean + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 22:41:14 -0000 1.3 +++ sources 20 May 2006 20:49:07 -0000 1.4 @@ -1 +1 @@ -4fb185f967003ecd6c752cbd2b89961f gnofract4d-2.6.tar.gz +34170bb139eb30dfd7d1c1bc647d2578 gnofract4d-2.14.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:49:07 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:49:07 -0700 Subject: rpms/gnofract4d/FC-5 .cvsignore, 1.3, 1.4 gnofract4d.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200605202049.k4KKn9md005100@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/FC-5 Modified Files: .cvsignore gnofract4d.spec sources Log Message: taking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bump Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 22:41:14 -0000 1.3 +++ .cvsignore 20 May 2006 20:49:07 -0000 1.4 @@ -1 +1 @@ -gnofract4d-2.6.tar.gz +gnofract4d-2.14.tar.gz Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-5/gnofract4d.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnofract4d.spec 4 Mar 2006 13:26:48 -0000 1.7 +++ gnofract4d.spec 20 May 2006 20:49:07 -0000 1.8 @@ -1,20 +1,19 @@ Name: gnofract4d -Version: 2.6 -Release: 3 - -Summary: Gnofract 4D is a Gnome-based program to draw fractals. - +Version: 2.14 +Release: 1%{?dist} +Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL URL: http://gnofract4d.sourceforge.net/ Source0: http//dl.sf.net/gnofract4d/gnofract4d-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: scrollkeeper, python, gcc-c++, pkgconfig +BuildRequires: gtk2-devel, python-devel +BuildRequires: desktop-file-utils, GConf2-devel + Requires(post): scrollkeeper -Requires(postun): scrollkeeper -# This *really* requires gcc at runtime! -Requires: gcc -BuildRequires: desktop-file-utils, python-devel -BuildRequires: scrollkeeper, libgnomeui-devel %description Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from @@ -24,12 +23,6 @@ the two sets and explore their inter-relationships. %prep -cat< /dev/null -/usr/bin/update-desktop-database %{_datadir}/applications +scrollkeeper-update -q || : %postun -/usr/bin/scrollkeeper-update 2> /dev/null -/usr/bin/update-desktop-database %{_datadir}/applications +scrollkeeper-update -q || : + +%clean +%{__rm} -rf %{buildroot} %files -%defattr(-,root,root,-) -%doc COPYING -%{_bindir}/* -%{_libdir}/%{name}-%{version} -%{_datadir}/maps -%{_datadir}/formulas -%{_datadir}/gnome/help/%{name} -%{_datadir}/pixmaps/%{name} -%{_datadir}/applications/* +%defattr(-, root, root, 0755) +%doc COPYING README +%doc %{_datadir}/gnome/help/gnofract4d/ +%{_bindir}/gnofract4d +%dir %{_datadir}/maps/ +%{_datadir}/maps/gnofract4d/ +%{_datadir}/mime/packages/gnofract4d-mime.xml +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/gnofract4d/ +%{_datadir}/pixmaps/gnofract4d-logo.png +%{_prefix}/lib/gnofract4d-%{version}/ +%{_datadir}/formulas/gnofract4d/ %changelog +* Wed May 17 2006 Michael J. Knox - 2.14-1 +- version bump and spec clean + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 22:41:14 -0000 1.3 +++ sources 20 May 2006 20:49:07 -0000 1.4 @@ -1 +1 @@ -4fb185f967003ecd6c752cbd2b89961f gnofract4d-2.6.tar.gz +34170bb139eb30dfd7d1c1bc647d2578 gnofract4d-2.14.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:58:14 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:58:14 -0700 Subject: rpms/gnofract4d/FC-4 gnofract4d.spec,1.7,1.8 Message-ID: <200605202058.k4KKwG1X005287@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5242/FC-4 Modified Files: gnofract4d.spec Log Message: fixed files list for x86_64 Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-4/gnofract4d.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnofract4d.spec 20 May 2006 20:49:07 -0000 1.7 +++ gnofract4d.spec 20 May 2006 20:58:14 -0000 1.8 @@ -1,6 +1,6 @@ Name: gnofract4d Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL @@ -63,10 +63,13 @@ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/gnofract4d/ %{_datadir}/pixmaps/gnofract4d-logo.png -%{_prefix}/lib/gnofract4d-%{version}/ +%{_libdir}/gnofract4d-%{version}/ %{_datadir}/formulas/gnofract4d/ %changelog +* Sun May 21 2006 Michael J. Knox - 2.14-2 +- fixed files list for x86_64 builds + * Wed May 17 2006 Michael J. Knox - 2.14-1 - version bump and spec clean From fedora-extras-commits at redhat.com Sat May 20 20:58:15 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:58:15 -0700 Subject: rpms/gnofract4d/FC-5 gnofract4d.spec,1.8,1.9 Message-ID: <200605202058.k4KKwHn7005291@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5242/FC-5 Modified Files: gnofract4d.spec Log Message: fixed files list for x86_64 Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-5/gnofract4d.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnofract4d.spec 20 May 2006 20:49:07 -0000 1.8 +++ gnofract4d.spec 20 May 2006 20:58:15 -0000 1.9 @@ -1,6 +1,6 @@ Name: gnofract4d Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL @@ -63,10 +63,13 @@ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/gnofract4d/ %{_datadir}/pixmaps/gnofract4d-logo.png -%{_prefix}/lib/gnofract4d-%{version}/ +%{_libdir}/gnofract4d-%{version}/ %{_datadir}/formulas/gnofract4d/ %changelog +* Sun May 21 2006 Michael J. Knox - 2.14-2 +- fixed files list for x86_64 builds + * Wed May 17 2006 Michael J. Knox - 2.14-1 - version bump and spec clean From fedora-extras-commits at redhat.com Sat May 20 20:58:16 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:58:16 -0700 Subject: rpms/gnofract4d/devel gnofract4d.spec,1.9,1.10 Message-ID: <200605202058.k4KKwIif005295@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5242/devel Modified Files: gnofract4d.spec Log Message: fixed files list for x86_64 Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/devel/gnofract4d.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnofract4d.spec 20 May 2006 20:49:08 -0000 1.9 +++ gnofract4d.spec 20 May 2006 20:58:16 -0000 1.10 @@ -1,6 +1,6 @@ Name: gnofract4d Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL @@ -63,10 +63,13 @@ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/gnofract4d/ %{_datadir}/pixmaps/gnofract4d-logo.png -%{_prefix}/lib/gnofract4d-%{version}/ +%{_libdir}/gnofract4d-%{version}/ %{_datadir}/formulas/gnofract4d/ %changelog +* Sun May 21 2006 Michael J. Knox - 2.14-2 +- fixed files list for x86_64 builds + * Wed May 17 2006 Michael J. Knox - 2.14-1 - version bump and spec clean From fedora-extras-commits at redhat.com Sat May 20 21:16:51 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:16:51 -0700 Subject: rpms/perl-PadWalker - New directory Message-ID: <200605202116.k4KLGrh4007803@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7777/perl-PadWalker Log Message: Directory /cvs/extras/rpms/perl-PadWalker added to the repository From fedora-extras-commits at redhat.com Sat May 20 21:16:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:16:52 -0700 Subject: rpms/perl-PadWalker/devel - New directory Message-ID: <200605202116.k4KLGs2M007806@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7777/perl-PadWalker/devel Log Message: Directory /cvs/extras/rpms/perl-PadWalker/devel added to the repository From fedora-extras-commits at redhat.com Sat May 20 21:17:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:17:07 -0700 Subject: rpms/perl-PadWalker Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605202117.k4KLH91F007855@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7822 Added Files: Makefile import.log Log Message: Setup of module perl-PadWalker --- NEW FILE Makefile --- # Top level Makefile for module perl-PadWalker all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 20 21:17:08 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:17:08 -0700 Subject: rpms/perl-PadWalker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605202117.k4KLHA31007858@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7822/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-PadWalker --- NEW 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 May 20 21:17:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:17:41 -0700 Subject: rpms/perl-PadWalker import.log,1.1,1.2 Message-ID: <200605202117.k4KLHh80007920@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7887 Modified Files: import.log Log Message: auto-import perl-PadWalker-1.0-1 on branch devel from perl-PadWalker-1.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-PadWalker/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 May 2006 21:17:07 -0000 1.1 +++ import.log 20 May 2006 21:17:40 -0000 1.2 @@ -0,0 +1 @@ +perl-PadWalker-1_0-1:HEAD:perl-PadWalker-1.0-1.src.rpm:1148159852 From fedora-extras-commits at redhat.com Sat May 20 21:17:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:17:41 -0700 Subject: rpms/perl-PadWalker/devel perl-PadWalker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605202117.k4KLHhxf007925@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7887/devel Modified Files: .cvsignore sources Added Files: perl-PadWalker.spec Log Message: auto-import perl-PadWalker-1.0-1 on branch devel from perl-PadWalker-1.0-1.src.rpm --- NEW FILE perl-PadWalker.spec --- Name: perl-PadWalker Version: 1.0 Release: 1%{?dist} Summary: Play with other peoples' lexical variables Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/PadWalker/ Source0: http://www.cpan.org/authors/id/R/RO/ROBIN/PadWalker-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description PadWalker is a module which allows you to inspect (and even change!) lexical variables in any subroutine which called you. It will only show those variables which are in scope at the point of the call. %prep %setup -q -n PadWalker-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/PadWalker* %{perl_vendorarch}/auto/PadWalker/ %{_mandir}/man3/*.3pm* %changelog * Fri May 19 2006 Jose Pedro Oliveira - 1.0-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PadWalker/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 May 2006 21:17:08 -0000 1.1 +++ .cvsignore 20 May 2006 21:17:41 -0000 1.2 @@ -0,0 +1 @@ +PadWalker-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PadWalker/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 May 2006 21:17:08 -0000 1.1 +++ sources 20 May 2006 21:17:41 -0000 1.2 @@ -0,0 +1 @@ +05d684ce2f17ef4f058ec2e912b5f95c PadWalker-1.0.tar.gz From fedora-extras-commits at redhat.com Sat May 20 21:21:09 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:21:09 -0700 Subject: owners owners.list,1.1031,1.1032 Message-ID: <200605202121.k4KLLB8h008032@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8015 Modified Files: owners.list Log Message: New package: perl-PadWalker (#192475) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1031 retrieving revision 1.1032 diff -u -r1.1031 -r1.1032 --- owners.list 20 May 2006 20:18:34 -0000 1.1031 +++ owners.list 20 May 2006 21:21:09 -0000 1.1032 @@ -1160,6 +1160,7 @@ Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Object-Accessor|Perl module that allows per object accessors|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-PadWalker|Play with other peoples' lexical variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 20 21:29:53 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 14:29:53 -0700 Subject: owners owners.list,1.1032,1.1033 Message-ID: <200605202129.k4KLTt2b008083@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8063 Modified Files: owners.list Log Message: taking ownership of ots, duplicity and gnofract4d Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1032 retrieving revision 1.1033 diff -u -r1.1032 -r1.1033 --- owners.list 20 May 2006 21:21:09 -0000 1.1032 +++ owners.list 20 May 2006 21:29:53 -0000 1.1033 @@ -228,7 +228,7 @@ Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -386,7 +386,7 @@ Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gnochm|CHM file viewer|pertusus at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|gnokii|Mobile phone management program|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-music|A GNOME panel applet to control various music players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| @@ -890,7 +890,7 @@ Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|otrs|The Open Ticket Request System|imlinux at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|ots|A text summarizer|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|overgod|Another Asteroid like game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|p0f|Versatile passive OS fingerprinting tool|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 21 01:46:00 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 20 May 2006 18:46:00 -0700 Subject: rpms/ytalk/devel ytalk.spec,1.3,1.4 Message-ID: <200605210146.k4L1k3XP018236@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18186/devel Modified Files: ytalk.spec Log Message: Removed macros from change log Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ytalk.spec 20 May 2006 04:52:56 -0000 1.3 +++ ytalk.spec 21 May 2006 01:46:00 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -38,8 +38,11 @@ %config(noreplace) /etc/ytalkrc %changelog +* Sat May 20 2006 Mike McGrath 3.3.0-5 +- Removed macros from 3.3.0-4 changelog + * Fri May 19 2006 Mike McGrath 3.3.0-4 -- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} +- Changed makeinstall-strip to make install DESTDIR={buildroot} * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 From fedora-extras-commits at redhat.com Sun May 21 01:45:55 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 20 May 2006 18:45:55 -0700 Subject: rpms/ytalk/FC-5 ytalk.spec,1.3,1.4 Message-ID: <200605210146.k4L1kRfJ018242@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18186/FC-5 Modified Files: ytalk.spec Log Message: Removed macros from change log Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/FC-5/ytalk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ytalk.spec 20 May 2006 04:52:55 -0000 1.3 +++ ytalk.spec 21 May 2006 01:45:55 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -38,8 +38,11 @@ %config(noreplace) /etc/ytalkrc %changelog +* Sat May 20 2006 Mike McGrath 3.3.0-5 +- Removed macros from 3.3.0-4 changelog + * Fri May 19 2006 Mike McGrath 3.3.0-4 -- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} +- Changed makeinstall-strip to make install DESTDIR={buildroot} * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 From fedora-extras-commits at redhat.com Sun May 21 01:45:54 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 20 May 2006 18:45:54 -0700 Subject: rpms/ytalk/FC-4 ytalk.spec,1.3,1.4 Message-ID: <200605210146.k4L1kQJJ018239@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18186/FC-4 Modified Files: ytalk.spec Log Message: Removed macros from change log Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/FC-4/ytalk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ytalk.spec 20 May 2006 04:52:54 -0000 1.3 +++ ytalk.spec 21 May 2006 01:45:53 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -38,8 +38,11 @@ %config(noreplace) /etc/ytalkrc %changelog +* Sat May 20 2006 Mike McGrath 3.3.0-5 +- Removed macros from 3.3.0-4 changelog + * Fri May 19 2006 Mike McGrath 3.3.0-4 -- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} +- Changed makeinstall-strip to make install DESTDIR={buildroot} * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 From fedora-extras-commits at redhat.com Sun May 21 03:41:15 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 20:41:15 -0700 Subject: rpms/rsnapshot/FC-4 Makefile, 1.1, NONE rsnapshot.patch, 1.1, NONE rsnapshot.spec, 1.5, NONE sources, 1.3, NONE Message-ID: <200605210341.k4L3fHMu023304@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23276/FC-4 Removed Files: Makefile rsnapshot.patch rsnapshot.spec sources Log Message: remove old package info from fc4/5 branches in preparation for pushing devel stuff out --- Makefile DELETED --- --- rsnapshot.patch DELETED --- --- rsnapshot.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sun May 21 03:41:16 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 20:41:16 -0700 Subject: rpms/rsnapshot/FC-5 Makefile, 1.1, NONE rsnapshot.patch, 1.1, NONE rsnapshot.spec, 1.5, NONE sources, 1.3, NONE Message-ID: <200605210341.k4L3fInW023307@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23276/FC-5 Removed Files: Makefile rsnapshot.patch rsnapshot.spec sources Log Message: remove old package info from fc4/5 branches in preparation for pushing devel stuff out --- Makefile DELETED --- --- rsnapshot.patch DELETED --- --- rsnapshot.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sun May 21 03:43:07 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 20:43:07 -0700 Subject: rpms/rsnapshot/FC-4 Makefile, 1.2, 1.3 rsnapshot-1.2.3.tar.gz, NONE, 1.1 rsnapshot.conf.patch, NONE, 1.1 rsnapshot.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605210343.k4L3h9Hl023372@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23328/FC-4 Added Files: Makefile rsnapshot-1.2.3.tar.gz rsnapshot.conf.patch rsnapshot.spec sources Log Message: Copied data from devel to branch directories Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 21 May 2006 03:43:07 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rsnapshot +# $Id$ +NAME := rsnapshot +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) --- NEW FILE rsnapshot-1.2.3.tar.gz --- ? AZ?e????? %??Ir7u??K ?h4????DE?LM????}?}???7????????O?/}__{??????g/?}????????`???T?&B???q??~?=?.?/?I*?_??%??C???r?????????k???? ???n?? ???????G??{??m??;?c?N????D????$nJmi<sW???d????k?fi????q??W???C?_??x????o?_???76^?????t??????G??JV?A?J?Nn?+}??|??????u??D?V2????4????? ?i /????`Dn^#??R??? ?@h???????|?????u?d????Y??D?y_G???R?~???B??G?? ?????? ?"P"?= '???PYZN??v_?????? ]??,?w????????8}p"????????x???#?#????????????*?OX?8?`<????q???B?]#9v!?H??r? ??A??????????8?(V?4 Y,????.??L;h#?D? ?[%?`?p?X??}x?PN??>?m??????x????C????g??????? ?&??h?34????i9??DBS0???? ????CgB5?|?K?Rb?[H??.???[ui~?? ?y??qK/?v???????g ??C???????????????????1??r 7?R????n?o?I7d??C?ZG>????J.?\?k?$?_.??/??????Eq:_U???,???8?5?v?1 ??V'???%????|?????V?+? ?]*n??????Z?a?U?z???.>mP?%???0???Lah0?3'??????K????'??????)???'???(??;??r? +}???NA???x??Y???AH?????/a???9??qk??-a????O??g?.?k?e@???l??? ?,?M? ??0S|?tx?'cN???,[ ?B???]?(Z??v?u??#?,?3?.??Wj+e??fZ???u.Z???/??? ??=i9??16?1s??g?B7Dt??"?,????Z ~???U ?????6k???T?l0??6mqN[L 7?,j$ m?b a=?x?????tN_+L?&?L?136-??c???P:o[?S0?9?re????A???Y???H???????T?????"?????'?`???s???????MJ??j?? ????W??PU(#???G?C????? $}? ?n?3U f??+?OB?n?M*?U????h??? q?&????u?i8w?n??Z????,u??'Ot???T?????f??????/f???@? E)?9?4?? ????u,I_?KF3?q;?h?rj???`H????&?o???????????IH?2:???wv? ??ZNk?,i1KQ-?&)??|3 ?????tj??5?@?3m?\=uKk9??Eb??????>?'?De????a???}???B???Q?>????Mre&?y??????$?b?(L?? a+?,G???? ??= ???O????+94$??D????N?p7k? @?Q?^ ? ??L)?$_?X?]????'pA?*%?*??nt??W ?????K l?\b?z?l??}j????}??\b??h?? x????M: ?-?????H??p?s?N)?????i6J??y?^?:&?2?#'I?So???j??dE(ia6?}P?6w? ????_ ?lA?A?h ?Tn???????????s?o%?7V]??{]?)??.?????????Cs)Q????? ?????? p1??@8 at G34I??';,?A?e?5?%?????dG4?< ??e}?-??????????????u?k?f7NN?6?? }~????{R?()?M ????$???Z?A???G2????^?UH|?3?I?????p\?9 ?0?u*F??_7r? ?~| ;??^?.???? ?m?4???3@???Hc?8p???????J;??|??+??M?e??z G?hN?*???p?iG<mA?9?i.??????H?At-?@?_)/@?????o????????. ?i?e$^l??6|#??g??>??f??FG??;? ?X?q?'n?4+}]?o??>?*???5w?m?*E7??jo(???p????+????BJi??? ?????XBz??????e?W????~8`CB??6?6x??$?G9xyN??]?0p?H???#;8??N???q]?aa(Ij????oS?o??0????U6?d~_{!???????.???7?????^??v+gB` ????uj[?q??&?Ur?n??M2?x?????R?(?v{????????~]???.?????VW??oe??Ut??7???????????(n?7E? ?2??wo??q???????? L?d?w?????9?&????F?, o???%C9?M?)'???#!J????b???'72?O???>?q????x?E'?b.x6??'>?J?SpJ???VB?Q????s? ??t???W>]~7?:]?^???t?p??%#??????[?.??????<2????].??????P???????%?rkw!?rA?*YY J?????{??C6Vimw??^/XZg??E???1?2|?F????????????j???I?=??w?pw?u??r?t;?[????s??/??n??s???)???????^?`s?'????+?????M????#?* I??e??z??$8?.S?8???P?Jt3*?????D??????\??5O{???0h??/??c?^Z?c??????!???? ??i??????V?@?? &?????X??????????vJ?????D?v???F???/??W?C?n???t\h? ?u????ia??Z?Q:?????L\I ?SP7?????M? ???? ,??=E?!N2?? A??????`?Ta???P86pX?:????a???E<_L0F???`x??P ?RuA3???Q?!?g:?bF????=??U??q!?/Z?B??Ok;p*?[??&?L[???=?(???+?z?*X???Xlc? +-E?S????n??n+?C?;BlZ?0?x?tUk??2?E0?Cu?q??`???r6+iD?????????R????N? 1????|J9"??Z?l???/?Dj?uc?(??'? ??5K????*S??LL???(7X???$b ?A?u,X??Xs??|!X????JQ???gw?M5aS???;{?H???iyW???o?ItiXQ??????/????Q?m7? *?f?????B\??d?jK? 1*sA???a?h??c????M?4?g?e???6??6?d?u V????m,?????4????M???@???(???R?h???vR???Le???????oY???]?x??O??{????c~??I?e???ud????g??US?8????? ????_?L??p????l??e??D??Y6 ??Z ????w?v??AbGEwj???1?&??i?$?&????"????????]}N&??????n/??~x7Y????iNu ??Y???s3?$???"^o???~<;8?????,??>'???(??tt?1r%!_x??3M|?`?(?y??E?? w?Y|?V?=?=Z5?X:???????~o???6s???3D?? ???[ ??4??));g+??i??$/????]?!?r???U?I?8?>J'9??g?J??iW -Kc6??M????F?? ?????FU2????2?? ??????=yL?r??s??-? ???7?' ??? >@????AY9?>vU7A?u?"5???_??q???????!?h??P??f!(?}?5J???u???_O??r????.?W?????? ?}????m??# l?X???Z?~??????D?????????n?,?`???J???9%?O `??NM???dj???4R????(M???Y-P?$?y????^6l1(?!??n?7+?>qo ?5| 8??(Y??'?J?4-?p??vvw??Z??@b+4??![0??.h?l9??7??3??z????R?u$?1EZn???c&???????.?t?L?(?$}!?{??w????/?j?wA? ?_8{??S?z_? ?q?V????????q+`??x>?Hq?c??Tb?????N?9J|N??;?(???g??h\??? ???Y???|?????????Qi???w???MD)0???A??+???? ????????Bm???J??4?X??????y/m??7[gv?l^?/7!???? O  @?FM???^R;)??9?%c/D?j!c?????d?????@g??2?Va'?#f? ????,?.Oo|??E??????Ki?0??D[]k4? d?JT???0^&?????,??????,?+????N??X???~?????\~?????0?t?|??V Q??Z???W??2?{??=?J9??AR???"rC? '????????^)?:?{k?????_6]_? ???gI??5? &??CQ?w??Q??? ??B???yi!??jD?2R?'Hf?u?@=B????iusE?'?C???&9??3???[?{\??nX????EP???A???+??=*Z?i??????~Zh?`????.?`?????????r???+?I?????7??j?tb?\6?"C+?4W??wu?F/??gh??&?b2???h?6q?3J? 9t?L?&?bZ? ??Hab?6;?,$?u?hl&?rF`? k??V??)?? gRL?q=??WBS at r}??/??????????\E?hd???j?o????O???????yV<^ ??{??EM4?? ?????^5????L?d%?YG&?h?@?!?FVw~>nP?Y???e??U?j?????}?U?4?$_?:TM?5??????-??I????-?L+?]???7JWQ?*???7???fC5??r????R`?7?C??@?????O??????? ^?-T_? ?F?l?$]???cF?r?PbP??d????5??+?6M ??~?????T?=~??0LEf?D?,T????A??????_?;-??WR?6?"?R???V??? O/?? ? ?HN?4s??[Rg?A9??6mH %??"??j??-L{??t?8?3 ?k?$?kM@U???~? q??y7i??T??H???42??R???s+?n? ??R>??a? ???H~?U????[t??.?+???????:???{???{??????????c?O;Go?E??P?j??,;?5l?????d?????@I9R??0?Rv?~?BS/??i??:%?|?b????vV)@???????h??8?? ?o?1B?m??????B Q?d????????:?J+ZJ.h?>$y? ??yfT-k(F??T>????p?V?{?s????????1????"??????????]WV??)P????i?????[??*???j^??/?KM?,:]??\D?h?%YkG???j?"??_ at dvd?~BgA ??B?+?x?)EQ?( ?HgUkt??iV??*?Gt???Z??)???8?y?,?R??"??_?Kg p?8E*? ???{S?1J???_????T1?L?v?????Z8?_?S?T??????? ?6d???????????{?K?~??|??2;??'??d}s??S???\*u????;_??'???n?????F??gB???#&?es? i%?z?h5?d?4j2(??*??X?l.?/:?,>'Csr???? W(??? W??A??ou???w r;?\)Dyp???????.????(???eR?X????a?l???\?6w?iA>????A????_?{?4???V_???7"?DEMyM+?S?nh??????Ii???? 0-??e?Wz?l?G3??0-P??'?~????R?b?3Pv?xV???0??vG??O???7???Vo????e???]?M?????3 ?o`??3?????ap??,??3?h?????r??B??%?Rn?6?,?????t??!?l??????d?PbWA+??|?RX?V4?????Z???G,?^5??H?-?py?????fp??.+???@U????<4m6mfe%?&] ????=j???O{??-c?????M5?/??i?n??n ??U??,nE5????/??D X?????>???~??^?6???Y?,AX?t??c?~c?s?? ??:?w??|-????= ?n??VkH ???s?2[?L??? ?? c?????T?s?????`P}8?Y??c7???>x:????G$?1T?Ne???Y??????m???????'?x^ ?sved*`h~&?z??t$??F??( .?\16{?A?"??????-u??????9U?x??.???z?\?E?~???????}x?* ??\???!?=B??d????f?PDNt?NO ???]e?)?P? w???/?i?#?ti0_r?HF?4w??%????@L ?u?Vn??N+a??0??S$,?G?Rr ?????-$3 ????9T$?)??;????]?_?xh?ux3????????????? ?5L??=6f^?0????h?T?+???j?8?Sb???> ?? |yU9???i??c???LL??P ?J?;z?=<4|??w??)??iW??(,??t??!<@????'>\??h?M???J?v??????EY??4??u/l.?Z#s@??9?$Tz???:?{2`V?? E?P?(Iu?? ?|?n???-b??\ B6-?28?=]????,X??a1Q?B?$}??????f?PO????(e-??B 7?u????6?1???#CSEJ]}?A~??7?????????@k-|@_?? kx,?B??????E??o_=C.??i????D?@?Cy??$?PF?)_@??Xmq??{U~?n??v9 ?4|??u????????*???Xf??R????? ??`Nz?l?i^?Jc????n??T?a?T&?!--???w??o???< =?$??Gh.-*??R?S$a?FLb???P?^}?-???8?;??O?pk???L???$x\'?z? ??',p:??????(i?F?????3???N???(7'?(??vU6p????"??_?:?}?PMB??]p?*^??X???] (?~???E? ~*???2?n=?[?C??n??y ?x??x?7??VZh????G??B?xA???4]Ga??_?????u,g>?&3?7?????r??99?????{????r??????d>?Z%??_?p?:???_A??????m 2???????*U??~Fk6l??B???V??U???T?????#? ??S?P????C6???DP.T [?m|??? ??-?Gm5??/~??? ?Y?5{??(??{I?? ?k????*M???XQ???&??1??i}???8??????h?/>?? ?a???L??!e????g?????????????E???gk?i?cg2??D??????'??????Gie?;??Tx?j?b???S?j%????s?M??????pr1M?g~=??|?? ???3|?Y?b?UwvL+??=???`d??.??????B????????7? ????'??j?zs?fRdS??E?? ??y[?g?Le?9??~3^??r?K??I??t\#? ?????S????????P??j?T???F????SZ%?????{7<}?L??????*?3????e?K??mp?????A?81?@??;?Po??? ?t?3??m?s? ??&??}???E?P?%???[(E?*?SH???VH F??m@??J?? w J?Mg^l??.9??jo???Z?n??1?ZZ??ee??G?mMOE???5I}M?q??????P??u?j'?#?S?-zZ?W?n??????au??3$'??]tA5P?k?+??HA??Ym?))??h?????1?????? ^s?p??G? ?"/j?d???????/?Wd??$B?? ;????F?_?l????Q???w 1?????????q? ?*??7?-? #}?J?[~in\??0?]???V'?vs?_??a49?KJ9?? ??M~??{?e?J???q?$??{????l/?)?sj?-8??8_???i?#?Pa?]@?A????t??,?/????#?"p?@]????)?{a.??a?G S\X at f???#??5wrf??y71#?"???????????! @?f???t????n?9?8?hQ+8??M?.?????89???%:4??1-9$?6?$?????^??V)??[VD??^?a????.B?8??6OA?H?P????1y??U??.0? y? ??0???1]V?R`???mP??&?H@?eQM?M?U/?YKg??P?6'd??_??????2?? .?1TB?"??U=??qc@??????????Q0??x(?V????vw??s-???z?9!IC$~f??a???W %??/X?q??|D??????????< ???< 7??,?`g??????s????*??( 6??,M????t8?f?t????lkb~??%??M>0?p?C????J1??j??&D|?9??6????(HK?``?y`?9???j9$?s????????t?|?TPE!??yAZ ?Mi???]C??k???3??p??B?w?? "? ?&??d???????????% ??? c?(?uL\ &??? ??f????!?????DN>a?O?;?5}m?N#OF? M?ED?????????!??? ?????????f???;?H#!?t?H????G????Z?l??.?r?%??0??S?? ?s$?{FA??86??z?O?~?i2?B2^???D? ju?*??b& >$?????/?)??:???@?EI??????????uD\?mNC??4???4????wdw?b'@b???0@|??< ???????H4??5??t29J?G?Y??,!3?b2?D? ??5yV???.?az? ??*????%$??o?????98?&2????????JyI?g??????Q?Gs?0&??t,FJ??0n?D????b?d??d???J|Gb?H????R??8?+???csA???w???K))???????az y????????,Hy??i???7$????J????????/????????:u?y??^?PV??????|'D?dtb$?????f?d????Juo?:?? 4?? L???1*?R? ?,???Dq f????c?1%??2H>???XC?i*??O?Y?6? "?m??P ?? \????????: ???? ???H?v}??rfR?6a&?????X??!q(??U???Rs?]? !????m???b??9?????L?Z?v??T?3'r?N???M?&g#e b ????(b?%?~?z?.? O????J??8m'&?*y???Y??_??b?.# ???9?o????8??H??????? 9??%S?? ?? ?R?f?????wU?6?q@??? b?Y?????i??????j?P???'???i??dl6?B?g?e Mi??`n?!??x?r>?+????j????}??k?Z?sz-?????9?????q?`hg?}??4??????4??*????3????i?(???>????"y??`?MK?C???Iu\B?,4,??????b???????????????]????~??t_|o~?j???/??,??u???XS?S??oS??H??B???? e????|w??)9v?}L?CNeK>?????*^?x?z???????????%]CC ???y???e??*_?604Ls\???g?)????2?? ???v=L?????Yw?Q8l?8??g6\F??@???$??F?0>`???,:?FN?"??f?/??a???B????6Z#D??.??? ?O????? ??(\??!8???]?o?????v????(???9?i??pk???gOI??0????SS??8??n?1?o????9????W;G{?^/~?o?[?G;??v???w???n'?? ??? ?c??[??????=~??mc ?@"?]??3??kf?zR??T>??1???????Hg?>? ??B??!?F???Z??Q? ?????3??????????4\?#\??6c9@??~)M3M {?'?p{????.??K@?????Z at C;??3>? -???????V+??HfQ??i:?"?aPe0???~?*?? ?!???????M8?b'?k??O @S???e?Z???????? n?VB??Hb?]?K???3o?$c????B??^?.s??A?C p??#s?L? b:?X4=J?????6?-?c?#/N???w?>?i????^KG?????+?,4H/??????PK??????|??2B???v?????L[???Coy?O???> %??????????[;?*??` ?bra?q?s2?:T&??&?aJ???sp??8>?|???v:????1 (?,??2L/q?.!?56??h??$?Q??.???:??%4?~?H??/??4?I??0?? ?? S?F???GsF???s?f? ?D????YX?????G2?;;?????MLx? ?^i???|??????fN^??Av#k???99???hJ??4??? f:;>????e??l?S?3?i?o?:?n???[m?g?DkL??H??N%??C???)???_M G???l?e??]s.?02???@t"????d????????8?c???I????h???/?\????7:O???^[?\[?:???y????????? 3?W)?!?^?????%?q???~A??U??? ?GN???n( T?a???} ??????D?????#|?{?>?}r??t??NG?? G6L?pp????YC??u???B^ n?a>?z???[$???????I ???{????v[???Fx?g?-?S????yo?????A???z??F?-?0?#???f???K??/?A?????Cf>??/???.Ew?????/?}????9t??:2?LH~I?? /?d.A.-K????&mw??V j???{*P,q?J?.???5??????3r/?????X???J#p??W?^kZ?B?G? r??K 5=?%H?T=ZV?f??? ???.*?C? ?A?;`??? ^d?? ??#?,?;u?0>$g,?????Y???id???^?????p^H?1?o?????g2??Ry?\3?8?H?iD E?k?l-?? ???V??&99?????H?=q ?_?gI?H*????n6?0c? ???`4T?&??C???W???Z??9??Mi?????~?>??df???q2??l_?M????L6??(+T}?D??xR??????"???B?b?E????9???????\??f??? ?!???E?6????5????\?{?#=??g?_[s?)4?????+=??????3???3%???B8?F?g?W~dF??(f???zo???Kc?"3?>??l?????t?|;q???????T? }??f?^??????0D 32??+xM ?A? ?L? ???Tb??\4?i??`d????e1????+2??????`?? ??????{;xS ?=Z ?A? ?M??@D?F???/!$?}??$p?B%N?????????Xi??!???"???R??[????)???]q????P??- ?????)??[???V?N?hGA???????lOco)??Kx4?CD??0??a?????M?}?Fy ?.???\9D?l?W???>>?h?A6EER??_A%g??r A?!?#????RCi?????P??!1?*??z??FO?????????+??W???? Zd??E?a???\?7??[?j}R%?dV??\W ?,??? ^?)?v????????N??,NK?f??-D??F???????Kk??R??(?L??k??Ayv? gi[????$Q???DN?&?????`?KQ8??NC^Dz?4L???????L/?s!?&?3????%????-?xz???v??4??.o}?4??Fn??????h?d)?????_=?e?D??(A??????f??CA?TZ?????n ?3aS_????d ?F,\N?k?|?R??????+???5b??zah97X??e????^I???????w?????*???d?eV???ZFV?IV.RU|N?=g43W?7S????" G?GT?Z???2t?????(????Q]??h??-,i+?f3?????Er?o?pR= r5k???|???X???H????4???g.????e at h_Ku?1"???^??'6?[+Nb*??x???[??g Y?x?+?w}a???c?`[?? J?????x?G ?ln???? A?Ak?Lk^c?? ?n OH???H??VAmp7k$]???)?;?q ???? ??:kk?x?%3?7 ???se#N2??3????J?? 5"?C???N???G?l[Z?E/\SZ;??lO9E+P\?F?qR8?-a??? ???dj6?DL?tk??3K?V???+??;D?S??Z???hPH????$w]?A?,??FI?AuK? ??????i3$I?zj?? Aa?? ????d?j? Hd??a-????q?????6 ????????????FF&???80?j^?I?????.s?( ??? ??g?K&??]??[?????,????e?O?!A?:k???egd???W(?D???l?k? j?j*??U???o?bD-?k????,G??*?????dZ? ?l?^??Cs???SB?2???????fFh??R??4'?{p???????N?????v2??4???? '??H?n??F*????x??B%V?Y 73?1???d?*$UR??d???5)???? @?o??G????.R?xV??y??????s?:'??"?W?????^?s2????O????3r??1???o:??????Y?P?v?ez?%~??P??? ???oS?I/???????(`y}??hi??? ??t>?t??C? ?+??a????n??? ?F???[LCo???o??[/vvw?:??W;G{?^O;x?H?n????????w?[?????????????sF\?)? ??`?;PWX?? ?B? ????????:????xU?Q???S0?~??fNFO\?L?uZd?q?k?P? ??o?????????MEW ??$??S u?>At??7?Z?????_???7}?vp7?A??f?fw?~4isQU?????i???? ?/W??H???????#???]?????X+ ??o?u???OT?????|???????^?X|??~??Y????????y???????^?pk7>x?bwg;6????u#~ $/????????m???QTR?7~??????Q?d5#??n?|???C??pDq??6?a=3?R?*?5 ??m?n?-PD???*?Z??=?3??\u???o??^?){n??RiI\?9%??Z?????X< ?9a??R1!}???rF^\??.? r?C%r????2dB???? v/a??c??5?h0?>E8c -?nv?Jc 3?`??J??0&i??? ?u???CT???7bfrA??? C;??8??6G???#S?R9eO??=???????6,Y,??E????S H6?2?-???W????P?Tc7c??(??1!4?xu????j?b, B?.??? %????t?x^?]Q,??7??a?$D?B????$*?:????jH????d??J? ?O&?(?BQd??K?$ ?\{B??2?C?2?hT???J"?J?_BQ?????]?????x? ?3 ???9~?4M%??b??4|?PGf??_?Z?Aq?:|??n???????????Af?Q rCv?D$??`?-r?]? 6???3??Q???.????I?4&D???8?U?????????}w3??Ik?!??,z??z?????A5G? ?%(?>? ? ???h$?^?6H?-?1[????_??V??a???Bk??????0j? c???Q??%|?*?4?H?E?S??l?`??6?????/?????q?????7???y???K??h???!???A[??GK$??%j?O}M?Q??=qp cT??VD?`?r9N?k??BtG???k?? A???9??5 ???4???0F?????+? U7????]3?_s ?F??????[???Ly? B?w???u? Y,?s??)??$???N???9?nlB?oO.?'??Km?A??(@????&?*RY?i?|{?=|????^???{/w??b/~??j??_???w^????????;?v?Q????.9V5????+?B??1H~@%?<=!9z?? ???3 h?\?dK?'????j?Pf`??E?W?u???hb???#W????[?????UI??T`?S??E?h???7?i?JA???%?|?N? ????B???!<~6L?Z?YKrB?9??4??(?b???y??j ?zGCs4??w7?(AI>p:C ??5??\?t,?IB?$?? ?LB???B(?? ??#??|??B????Hc???????mH???Q??=y%?du? ??X??? &????????@/?*j?dj%"h???8??2???t k??xq-?c?W =???,?H;,3 ;9<????Wpv&?? ??#?y??]h?|`?M?C???B]7??d?e?'?'?-w??S???R??]?3 ?W???????W??^|6??%o3 8???*!0????Rc???ZM?(g[?EN.K? ?aOT?(#Q?|???"? ?'Q\ ??Of??$?2,+2??%?D'v q^q+W????Y??`???#?KN(??gK??gnn6;?K?W Ih???k29k?????F??f??94L?0??dEp?D?;|??7???6T%????`????{j?$?? ? ?Z???v*???9/l]#?($?5M??? "@ZM??L??Qz)a?b0??????????-^????&h????K??bI?m!9???K?}?????D?*??ONQ?x=??a?eA???p:?`???i-%S????Y????aa??Y????3K?y?????d,X??\2Y?x^Wi???i ?M ??-??P??=?G???H?[? ???????X?|??Z{?P^? B4??` ???{?=h^?????D]~????B",u%b???p?% ?)??M????NN? ????j??me??QBU3???m?D?%???90???)? Ws?R??z=6???????}?t??4??Q???? ?%[/z??F????????$??$??Y??Kw*???]=? ?!??`?w@ ?DemG??=???/??p????????z??Jsx?????"?5ur??&x/?#|?!???r{f0??ng??U??*I??B???? @?3 ???????t*VD???kA+?r????)~???A??5-y????????l?-??Os?+?-?????YX*??2???p???B??.1K???M>m; ???3??l10 P ?????X???g???@|#Y? ,x??!?H???WX??~????M?? ?,}?sD^ ?6?q?L?Go??`?G?l? ???a??????P,[?tem?R?^??w?w??_??????v??'>??|xbk?+?E?q"?I?G??8b??Z??*Gd?Y?9???b;p[B????????{=?q???`=???C00mM?????R?mH??d:?!?H? }0???]X??1,???JC?W[c????2?z???r?A???"?? ?EL??-??????? ?Q?b?P 5? ???2?w+??????[?3???G?#???????>c&??L?????k? ?$?2>k?P?*??0?????QRY?~9?????B?,FK????T???;??,WZ*IDm?q??2??% ?nztz?6?Z=M~?,LH? WE??????PQi??%??E)? ?]K?.???;????N??#??a(;Y????? WyQjD?1??n?e:1s?r?~??d??"Ka at r?r?RY??e??e?????:p????U?y8a}O??l?Ue? ??I??q+uk??R[???[???????N?????t?NO?o?????:N?cOgS?????d?Z??Oxkdn7T???!?:?5?????F???? ????"}J%?J??jh?^?Z L?u*p?\???????z??~???S?q/c?b????,??t ??t???'HWR??C?q 1?i??? E? Q4?}?2??R&??`?@??!7??A??P????f? ??????.P3t8???????3$W ??(\?=?q!?c??) ??? ?h?cG???N6?4? ??NvV?0 X??B?????;F???"??>6??u?C?y????y1%?1F?|?k%??Y6???????P#? ?@\?J?R?1>%?r|?$p?B??Fj??9?:?>P?J??'???6$??????ba???=Q2e??(?IO#??E?*??u at w?????]?+?Bm???Ewp}??=?x????+????!O??p`S 1v??I??-|?i\?_f\E?ik???`?p?????^?5'VQ??,?J???L????>????j3?nJ?X???[,VR?RlM???????[?_r???????r%8?????OO?~?JT{ey??4h???5ch?????|K? ?j?SQ?l?W? {???>??????E??.Z? ??-q????[?????;q????7???9!???;?O?Y???Hx????mnJ?K????$, }Nc????u9? ??,?2???b?????? ??K.???????x??u{???Y??}@?t??????7????CN???????}??J?4???????~?{???~????]??@???G??h"&????x?w?u???????????o?3???sh??????e???E??#Q7?u???*??7???@N?A????9? ?s???9?T=f????u{c???%Ovsc,V:\?^?UYy)??*-b??.3mnl<}?~???\Wh?{K??)|?????@Z??P?J?`{?????a?2?e???/??e3?? ?G?0?Vy??[b?G?????&z-?e?????c???)L*?h??c????F-?_????,7?}???r ???(?d?c????2?vdZ?? u1?l?\???E[A?N?)???????v?)Y?? ?J?V???????%?)? ??|J(??kB[????6? ???Ht)Q%c????S?.????5???O????~??????????b????G?O?????????w??????D|g]? J?-qo?p?Y.?|??pa?????k?%X???#^?q?bH???t?~???J4^?_{?e3???MR/?b (M???|?R18b?? W?^??l:p^????????Vf?S??I????!M??? >J?D?T??K??*??s?m?ni??]?]3j???)I?Z?? ? ?E??DV?O???U-???k2N?U ????U?k!E??"??K-??M?1??p'?!?????om?;?ZBk??$ak?G?vI?Z#?'??lFE???? ??/R???2n? u?.????6????E7v?l#???w?f??j!9??`LqCl?R?????<????+@%?B}rG??pM???t????Or?&f???5?~X?F??{Yd????)????O???? ??Z?H>Q\A r????yy??????)??? IP??????II? L?6??H???????2??)u,X??[g2??????V4+??dE?&???R.6Ff??OVs??-o?K.|??9?'????MO V??A{U??5D???? ?=????JD?m?;9^n3X?QG/?CP?(?H???0?#????;????p?G?????g/j5n3j?k? gY?|Ly??(@K?9&????I$"gc??p??0????/h?H?_?_1J??:?|G?e?6???q1Hh-i?d ?????????????{/????????????0GH?D;????oxsO???Z??????Y? ???X1??d p??\??&?d??g12X?9V?!V"'??\????z?s2?ve?<]?7?-<6r?T????y?ha??? C (?#???Q]??x~,?F?o`?X%?y+??h????=?=??b????G???'~u?f?Si?*?w\???l{ ??B*q??????????K H???1%??9L????:q(??}??GK????4k#????c{N?e????;?;*n?4Y7A^??+??s?/-X>?Ql????8?my???????LHt?w9?}?[?t[?u??????V;????mLX?Z2Q1?%G?S?=?ViR?r?%&??h?k?q?F(??[j??@???????=??(??2?i?oD]\t???Q??(?$J?)`???H#??V??QJ??t???3yv?k?[z\x++??|?????.?l??s??????-:????_??c??;??e??????y?????????????/Dt\6_??????8f?"O???2nT.??>?d?C}e??^?&EzhQ "?;?D)k??s???l'?D?u"?P???8h ?D?Nt?*z????m??3? -?J???m???J???5???T=??TA???w? ????+?5???4??#?? ???)7?P?s???Sl7?|h? ?B????Y?l?6+??????9???]??/??T4EH?????t???o?9*?b?e:??A?C???=?[?=??@?H???gS*???C`????LI??\:|?l?*8HH???Gt?_)??9?o$???R ?^x??m???'Q?5??~[????? ??n?4???2l0B?F??G?A6?RD.,#LB-??? ?/? ?Q?~??=n]??a????R????H?F';?}<,????#gqw??O??:????4*?1????[`? ?)?Q??????N?IK$???,Mi?P?-? ???6,?, =V???[??OT e?H??b R?????G???/j?ShF?bwzq?J"P?X?(?"??A_ G?????????C2+?7????| ?-???o7???#???G?;?'??#??????? ??4^o?T?????L????A ?=???A??????7????vV7T??~z?A???I?^??F!P??y&2I?J?v.??$????2?dy|?1S??? ???# ?(_?? y8;??@-1??t{ I???9I?'??^UF??<g???r|???n??=???2??-?s??????s???s????[???w????y???|k?? -??8???6M62?G???A??I?2'??R?,?&aX???? ????B?\????f?????????$??n?j????~L9?v?_`?z~??D??(????*?1?8?C?????????d??????/X`n?os???j???|?H?c?y??Q &r???'??s?? ???h?b?&T?U?Q??M+ ?????2^v2???U#?s?F 0?-??Cd+:??AV/??F$9EQ+?? ??N??E)P??M??0?tI\?d?d?_5???S?Y9???.?f?T?O?? ???'?W?????\Z`??BQ?}s[;W??r?0e?o#?>???A:???6XI?N???~D&D?E??=?jTs?w????3???E????N?.`&??wA3??UY????F??Q???La????>T???!:?92s ?<9=tI=?-????????Q??jk?=s????????y?c$????3??z????J??Q=6??>OD??6?G5tE?cl??d?? ???$)N u?i??1?8????R?????"?????[M9I??fOS ?\4?V?VofUoe??s??s>?j;s??E5?F???Zi??? u?x????????P??l?Sh-?A??? T??0^????????0o.P??? ???;Fh$+?$?????? V?x??S????: ?-???7?|? U<,1???s?/1f??4?G????Zy?????,?F?wZr???`????Y?l?>?3l-S ??? Mw???,a?e?p$?L?D??g(a?&w?C5u?i?*?????=??+??\ ?N??? u?Js?Dw?^?&kA????e??J?F?MU?2?[`6q}??1P3?w?a????+??-?X??.s?aD?????*?H K????n????j????n??r??????@:(G?b?????????%YZ?7???D8??},\????wi?; t?6?3??g1??wo)???[z?????????6?04?Vw%/?VO47D?l5??j?~??X?(?Kf???Z9???)? ?#&"]H?P?G??????.?U?h???D????4???4?'o??K????K?6@??????w :Y??r??%??%-Y??3??-? hw @?Bj^???n; &~?? E?)E?? {??s??Q?e ?????-??J?_5??Q?i:?a?????F!)SE[77??of????rgK?*O?DoY??????wF ~??M??Y????:????????R??8ye??d?/YY??z???|?r0c???? ??????E????_k??????=?)sq?*XyZ5???j??????% ?,? ?g??c???r??QrYya5??i???"??v ??F5???E%?AT?b?E??{?)iX???J ?/5??05%?di???X?NpV\??M$3???[N??.??? ?F????J&????\#~???he?/???J? ??\?$????>lm?! Yjy???*^v?\S?x}???????c$%?????c?" ????tR???[ec?%sT??S??=u????*?-}j????>,f| T?k?(???,???}P???-v+?v???? ?iN?yud??iE? :~R^?R?v?j?*?H l?wi??????s?+n?K? ??????Y?? ???3?>?o[n?`?s8 z?Ue????/???&?W??bT?x????????g??:|????????{?M*???[????l??????o????6???X??A?Tt3?h ??jc-N4mv? ?f?????RV??v?X??2{???2g?m????&???????~iB?????t???v??????[???]??}??????? ?Q`#?' ?P%GgQ?9??&??:2????K)???I??( 54?iJ?,vS??.????|?eb?&??l?? ????qw????v?m?? ?vE ?????AW???b4]I|(??} J?l??x??z(?C??????U?b$?:??-!#m+_sM>?/T?`R???~???????TZ??0+??????????ru???m5?=?N???di?J??,V?g??U?%??????*S ?RCk0 :?Q?R?+?&?gw%!???$?N???Ih???>???NVr??Y?{Q???t? %}??N?????y????(?Y??49 /u?c??#??=da?,?? ?s????B? S?=E??Qv???^?;{n? ?v?e 8(???6??0??T@??)??r/?%???8 D?i?"b#A??w??`'??Bf?o@?x?[?OfY????B7?&?~|p?a???Lgx8?GQ?:????b???g???A?;>?/~??O???#?or9?`G??lp ???,??????5??????-X??k?j?#??>? ?? /-??6??????}?P<{?3??D?E8W|3?B?]#?Eo??b??Z-?<v??2-?_@ &?>?E???????d?9 ?????>f.??V?X.?????H$??n?3??????h:?j?????d?s3?0??=<_?mn?5??????h??*????G?s? ??!?D???????{??3??/?????c???????I?i??O???? N)?S????a?????U????Y??R??L0W>`U??!.M????D?x?="?U?d?R>?? ~?V???$?,?d??yX|?/?Q? 2????,L?-}k ?h'???r?#M??????u??m?7????TA?t??s?s??0uQ?nY?H?Q?a????M}wIm?hd??{?????????pN??[? ???o????l@???9Nb????)c? 9?`?[~?Z?v3??????^?LU??8=?+??CW?W?; n`9r?????6-{?%#????7&}?>5@?)??m?Z?E??? ?|}???BF??jxmo????BF]???^?? ?Y?7?{}??8D??%??"??2??pn??0 4?iB%U????T?H*Bv?CD?K$?}??KM?? >?$?8?d??e?? Wr+????!2e?d??c?ln?*;& X6YD>??63??????? ??????Qy??ZY3t??X???G??/????OVW??????????????O????h}?????l???U?y??hZ?Y?????3?sX???x?+??)? ????????c?L{?^? ?`?*g?(?? ?V+??'??? M0;??????V? ??mx??%?????/????X?BiY?? ?WM`?9??=7???l???kTyj???YsPU??F???J `\??U??2^#??8@???Q)V?????Y?Z????O0? ?[????R?zV????P?S ry?h N??????????O?~???????@?: ?P?/???2?V??~??p?b?qRWSS?j at 4qQ?????????zP8?c}k?c?????vj?5?df?@?g???o?C?P???+????; ?M?dmx3F???`??d??"7??7??????P?!??EA??_???H?t??cx????9w.??i_???D?-?62??????C?????????jOv????;?E?PowX?D?????0? Y?q?e???!DU?s? 7????[yf?? ???@?#?s?jj?*KvH??-??B{{?31??o??Y???}?5L_? ?l('??W.? 0;?7?}W=??w$???4????3??B3??&1??"ClH>_P??7? ??? W????TR+??X-?,?:????G?G?tjT? ??7?,^2?(??^?????R??S?`???2vt?@?Z???3 ?9? ?-????F??h????? {=?N?E??y*??B??Z?SP?Ji??v^??e??? ?W??mK?>???????5??Y?g??x\?/?E??=O???[eU??B_?0?Zy;'????!??u? @vF???>?_ ?? ??F ??.*??f??m??5?r)w?L?7???L? ?U[{J=??{????1??Xi???:IH_??????p\???Mi}?????7??v?_YE?X?'????`SM?R?gpj?[F)???g?n?k?k????K???)?1O?!? ~??S ???8FH#?K??Rm?#?>??Kz? ???? ?M????|? _a??|?!u??? 4uy<???V{W??,o-?H?N??? ???Ul??h???-?????!z{??Q?d,?K????ec?????I=????_)E?`Q+Z????W,0?? ??e??^lL???? ???j????????Y+7??j????z??$Hg???5 i???'qC?5????Li?JQ??Q5_???/??^e?-?Z ???QT?a? oj?| )??O????2s???z6?j?? ????@\&?l??z?w???>???h?u??????whc???8u???^tb?i?&?\$????)??Y11?-?_?+??j???>?? ?O?A???*?????~R?(?9?????@J>?G???????s?9?Iio???l |ta2???&^6??9???$S??O???? ???l??]T???m???{!\L?gZ?=?Vz2k"%???????/?? D????'e?;j^???????????????Z?Z ?O?A???0?? ??Q???/??y?O??? ?K??JLxu??3?n??z????????F??kQ?}? ;?KpP9?TZ??9?????????}??b I"???m+iN???????[??A)??f?0?pX??$???O:? *???|?+X?M& /?x??CF???P$[????J???sA???P????as6 ?Lk??1?????Hc????{??? ????`=?????? ??"{U?FfJ?9?!P;2?m51?????X?{?a?P3vF?s9?"??`X??`!??4O4?*.??h c??.p:ub??e???e-??;,?r?NRf?A[? ?c??H??3^??L??c?kr???g* XI|????L???N??W???5???}>?pvQtf??/A?;???d?uQ=5???@?? -???0??G3A???&?"eQ??w????|???????\.?NU? ?RD??A?\??b?n??S?71 #i ???? ???Q?E??` ?? +???U\??M?L?!??o??Q?X.(m???R????s??????5Q9?%^VE?????v??]??lk,] \?Q???????HN?D???W8????m?CZ???????EoP?j?h????A?? ?j???`?=????m-???8????)???????H `???z?02,?!?q??HT?{U$?8?W?6G??g?~UJ??O???T?????? ???#@?????4??v??K0X?p(?????????k5?|o??n???h+??J-??y?????,6c)?"2`?` ???~??N????m?x(??i????2|?????a.??????I?????t? 1,?????^?"?Q??V????Y?????a?T????3?fEE???+??N?pT?tGv.?~?!t??#?T????\????E$a?@????9???,y?C??????+?+Wd??A??P??? 4??5G?R??9g?R????lqK?? ??\EN??,M????Y}?9?????????m?6_R??Hu.??D????cV?jg$?v=UO??r???}W?zU??R?ZU*O?*j?B?????%X?9b?S???I??^???2??g?w"?,??I??X???? nj?q?w?zFv??/?V?s???F???r??l??TF?#?&?e??????A?E:o???#?%?Rs?#K(m??a??S?s??z??NZ2?y5??d??j???3??A?????+?6?m?Jv??v?l? ?X??Cj??W"?r?r,:9>?#iM?xhR j=???~??#0K??.+?J??9?j^X???%??x?1@%??|?eu>?y?p??R>` S?????ii????d?Y??P=?,????B???1?????e??n\v?Y??CG??z<??[tie_l ??[??7??T=?g??g??6????[??!w?????????B0?_???)?????l>????<0+P??G????Qb/???"??'????{?{_?? I?????????;v?N= ?P`*q???????0????y?;d{@?h??B ?????'????c'y?6???????X??2'?????.??@?.?]l+???S4?tb????c?(?(?~?????A????;??C????g5???? *?????`?#6?8V4???|`t?|????]??@O???LT?(????(V7??$Q ????J'??V#?g?lE2?????@I0????X9??????????????????B(< ??~7w:8?? X?.??q:G?o C????K??t??4 l`&?????v?lL(J???3pE(pV5h?=??y?! ?#??V^1???Q?M??????"??}?(Ghm @]D ?P ?@7nB?QFi??KA??R?????????g a??? ?on???gi?*????g}??D?$a,?1??<"G0 ^??#???=V E?;%+?z'?~??~?q?DtP???r ??+?9??V???W??$L?:-?ly??mJpSY?(?m?[ \?KJd??.?WWLM?>0?Tt???????????r?w?"hK$I?????p|/?@|??iv??9-?Y??i?oq???? v?go????????M,????E'??3?5\???6^7???$`?/= ???^&?? ^?? {??o????p ??????Z??H????=:{??6???i?????K?>]??????+?????n6?[[G??=?????????1}?{Y?5??D??>??1???o=;?!V]?V-w?*??t??[????????mz?????h?$???%Ik??P?F??_ ????sHx??? ???]??J???j????.???|?????{????5?n`|??????????? 3????eIDK0V?%?x??r???JtQJw?P H t??7*?????? ????(?" ??W?:?C`????????5uh&o?ri? y????`???*S??q?g????i??K=???:? k?w??d????r?B??b???i9%??-?1 ?v 4??X) ???/wv?^0jU?j4??B?;xs,??K???:)?_????"?]o?E)?~?p??l?o?H??bq??EU?S???[?R?..zx? ?????X}6xv?????????-^7??}??m/???g??????GXf?AW_F;?g???????wh?Je???c??Q???F??7z?\?? ?@3M?r??f?C????k-?9?M??la????_????????+?Y**????`?Y?Pc?|Q???????\???f<}??M?]g*?? ??g?g?wU???z???$??]?xK?@?????C8?7??? ??_?????B??????u?e#)?"?I?2h????????!??c??E% ?=?\??7!8^w.???$?a}????fT??hn-???c:!?Q??^a=J??H?.??v}?~?? ?????F?S???@?lXH)4G???)?dYD??2 ?YP????r?X?}??"????.{?[???[??N?^*+ J"+???D?d??;?#???K?r???J rn?-M?p(;+%?? f??D??1???? Ca????V???Q???z????K?G?)?oU?Gw?{- ?:????( ??`0R?"~???y6??I=?_??????????;?'yFS????X$B???Hu???Z?{B? ci?D=???H??XU?????I=?_?c? ?7?y?e?? ?[a7??}?j???????$??y?3?\??w????? F????y?Cp?b?? m?!EubCj????A7?= ??,c??????E#???N??+4?,???qc??|? C???? ???=???3????~??H"G6m?tv??????1??EV??? ~??y??L|???9???L????P??FrF???9K?? Z?????eJSE???M????2{?AsL??n%6??`??????`x?>????aq4???H2TQ?D??bLkX???BzD?^??]l??i:?"g??i?^?ES???>???(?"H??^Y??Us?2M1????q?Q??#([??&!?u?6??7???[x???{??q? G 8h??No `?????+????W?d@??k"?q?(?MR9????))???????WVFNH?{q??h????????tn??Yo:???H'??9RV?M?|?|it??NM?K9~??????t;?0?h^???????<?w?32X?b??KD?@?8 ?a Nt&??n?S??N??[?q[???=???,???2T ?I?[??f?q?l?u?y?9??Hg0/?;?P:??????)|??:??. ???}?????t???;/6??i?p??9?????a???????`?\?_Uf-?/f??Wl}s?`???F????????I?o{????>:?X!_?E??;?/??z????M??M??????G???M?A???????y???F?4N???[?????7?????NNN?'?+???????y1?{??{???4~?q-v??|9??;_? P? & -?MN\?9F`??????7(?X???I?2{???QWa&2?E?[?cR???Y???@?=??? L?? ?R?X(??l8a?? ?????J???lI?iX!???U ??K0?(????7?? ? [?0QD?6???k?qN?N?v???P?????6?7J???.0%?F??YE?GM???x? ?M?????)??]u??????9c????????s?,??GwDtr| ?r?????>O ?3;Nt??J?q{d????at?????j??L????N??%I???????V?2?@?????k???}c}?IB??9?`??+????d???n7?????????^ o?:? {j(N>u?G?>??A??z??t#??lo??Cz Fp?H5???(?[?????????? ???@??_(5????l??%9s# e?????????`py???????n???I'v?`?B??aP?.??E2???;?$?? ?EH??/??{3??????tu??*?L6 ?Y_???|'2^S???E???V???[?x.U??w???;v ?a?Q???_?l?>8n6~m?pm????62???9}>? ?Q:?V??jqk???=??R?h?s???T??K?<5???K???? ???+RbkX}4????xt??m????????[ ?2??~?????`?z????_?????:?XVf??{???'?F?????x???)c????/ &???8????Q?%{"qo?m??N???? Fs8D?R?????mU?[?x?lmq????? ?$?hU???!???_`|?KV?? ??( ?0p?FmX?%1C??=zz? F?V? ?=?? ?:? Y]_n???z??7?OS?"X?p??@?^?7???V?$????}`??1??2??J??4?-??Df?9??W%?r???W?????R?8?9; w?nA???????????3??}?B??i?????*U ???~????yx?9?>*??}???[>8?>?????mt???????????.??5?_??1? ?W?????[??2?????a?9?Qz??????k?^? J?+??Y???n?9M???#??f?[Z]Y~?^?Q"?,U???>f????deZ%??Gn??c)S?Z???R???? Z~???9?=q?Qm???????kZ?????z*O7_H?) ?rO????R????m??r[?*?}]?U????}??)K??6},?QyR?^?L????? ?w????1!bC+??X??&?O8?x???/;?Tw?n???x?e???[8Nw?z?G? (p?t??Je??s??????I[?$?at?~??5????9~??ZE?3z????????^??????????:j????????{y???.??;?z???????h4?ps{???W??8????N??D??c%??c????? '?|?????????>)??"????iy????????OtbyZ??F?+s?ql+?pqd d?G?f???4K4&?F??-'???O????2? nf??DS??n?VyW?V??+)??????a7(N?J=@?????8?R ?|?,?l????r?vb??}???$?:S.??G)???c8????m????j????Z?h??:?P?6GL?????M?\?{??%Y?L??????5h??,^???9?4 W??X/?^??c?P???10?.l?c?*P??%? ?< ?????Z???????a4???j3??kn??V?a?!?A????L|,??+?{?`????Q;v????????Ji??9??????uk?r????[???>5u??a? ?????p#??R???P???y?Zv??C???????VA)?`>????????????-?\]_3? d?? 4T??;}o ???U????W???? ???"?LV?? ?*??)??????K`??R??tF?&? ?#??r?4??q??8?v?#X??oRZ>R????R?kD?? ?????? ?%? Wg?#?f?????;Db??N???\2???P?'?m?w???q???????Z?? I?je???gV~Y?8?W71IIX??9 i?]???t??????n??z?pd?Kx?}??p/ ????Dl????]???20 4?U???Xir?@? ?? ?RfN?~??)x}X>Q?????-#?\7/?????%?@?H??????<;^??c??V??:h??2??e??6?????? Fd??N?\,??????\.?'?76????u/2?? Y?#?|?s? ??G??[Y??N??}???M???B??2????u";?K?????Z??2 ?I?qpr???b ??? ??&??;??8-7??b_>&?i??R?]3???#?P?!0h?A:Q,>"?? ???T????| ???XN?? ?G4@{??+ ??*&???&??nJ?@?O?????-?= ?????5-rw0\??R?NK9Z ?2?Q?5Ox????;?N R?w7??'?a?vrI k;???u????Y?*U?Pj??E????Jy? 4?Fv;-?.U??f?*?A?;Rvh?o??U??[}????=??/??.~??O?q?:h8:?X%q???????^\?U;&??i?$?`j????????^>?(~9?`?$.f??$???????A???????A??Jj1??????g??]G'}??$E??f??GW?nbJ?$e??????,)??H??EJ=/???????`BB????4???????uy?BSf??????g ?|k|Zsjr^??0???8?>??>^??~??*??????a??}X???M\?P:??Iy???D??????yF?7??!%U?0`(???8??????`r??P??~?uI\?9JZ"j@??qaR????p???R2??%+???????H???'T9v?LA???????0??&?^?`??n6????M?"?GK??|???^aD! ??m??0?"?????x?*?A?)??k????3?H?"?u@^???o??rI?Q??M????So??W?z?++?RL????de?*??????:bZ??k???????&?x{??~??f??P???????O r?M????N1 0V!?/?\"?1?JQBo?pt??????.?e???i?h?g??N~p$?n????W'x???????DH??J?-??????A???!????o??y?w???}???B,JZ?j8?N0???TD%?y6???|0?IFxr?G?a?U????????o?????:?n?+Z/?ze??ZY{)? @?U?Ia`??a?c"?r????{?1%?D?d?R$ r??S??u??(?} ?>?6?zd???;D????????X~??hBt??Ix????:??5E?-?D5???????)y??b.???V*+?????4 ??3B?@?w&???(\%?`[X????-????5j |?DM?Y?[b_9???E?"??xr??????W IK{~??/??wx?I??*1?z?????"????Z?;^X??V7?O???;? ??*?c?p?k???????????89?>*?????L??p6??G??P?}??eS???????z?? ? ?? ?haG ????U?????y#???????????9xQC?o7???.????v,??AE??1?????>???Qy??ZY???????????G??/?b?BP??:A?H[?X??J?x????05???? ???v@t_?pES??????%?56?&?~0?????;??? ?|?w?Y.Y?h?(TD?-@????0=p??J?rx2D ??f??????0?g ???????l;t??????RPh6??????U??L??F<?5?Q\AhHpn:?. ? U'???Z??p?#?h?jh/'?d??y?"0s???"???{?D?? `?c/e??m?n?J??:?Y?v ??{????u??8*n??w?_?)j????QH?g?O?70~?????8M??4i?Y.r3DB??0?:vIV?`\?t{?? j*???`M?+???Wc\W??Y?6???wzpx ?w??????[h???3?ww??Lfs?`??? ~ 3Eh?U?.)???+???^?9?a~s????RA?-?TK6,??,?x?>???v?????x??C???????q?k?O????`?? ??t*^R>????_S?????F????m???0??*&LA??;?# _? {??K? Fm?[?h????77w1??? ??U???vE;?f? ?`5?. N??p??kh??$????k??I??(7+{8??V?*?u ??V?I??'2G???~??|???uW(???:??`??gE?m'?? f???9?p???9??? yG?i?J??J?\-+0t#?????Ipp-??????H}R??????I?cB1 ????}`ow???Q???????????{??/l*n?'? ????'k?????5?A??????M&;???.#?B9???!??????Y?8?.??"??d7?H?c????&?+?8?? c ????^??|??I??Gy?.Wt? @ot?p61?9?????%B ?HrL#????j?tP?VB:?6b+ (??"???5is??-q?????/???G?qZ?B[?j: ?8g??? ??3?'?*???T?7??q????y$?Sp?joi(7w"Q(.???")B???1??!??6;?kV???i????V?1?G?W?r{??|p+.?o??????75??????P!?9K?h???:Sys?????`B??9t?Y???dN???IJ????2??u?@??ez%?,?\1qlH????y,???;?i?b??9?E??^o4A??a????L?a?'? ?9?=?(??????z7s??fb?>s?2+YJ?ZX?V?N??W?f- "???e?ql?Z?? +b??.{ ??-?i\????\??????? ?x??:s?+j??+&???? ???S?z????\?Y???P1?? >?o????fE????x8?2(G~?????.9IM?h???u??k??#j?ra ?????!???6#???Kw(v?? ?3]?)>???? .??????i+???J???T?^??? ????e??u6Q3?????c??S???\???]Y}??of?????t?????U??Lj???2qB]???>?????.??y???a%1???Nd???? Y???E??Vt?????N????A??0?u???? ?%>????H?I?a???=?Vy?rD??ZN:????????*#?Oky?%?|?????????/#-?????\?`?} ?q? ???s???3?`??RD?(??Oc!n??Y)???? ???s??l?Ox >E4???ELz1{?; ??8???????u????03_?r?ED???a???9jk?|????????uR??P???\?????V??\?mS?L??)?}????O+>f??h??b?<"D??4?g??>? ????#A?}Gdq??2k?e?J ?^s????&%6?4?g???*??L????[?,V???q8??JW???M_Q?M?=N???(??&D6?F?~????W'????E*M9?X?????i ?yO{"??????F|O??Q?_6??????Nz?????9?:?????????T?sffFS??~3????z3CD7?f??E5? ?\?+???'!F?Ec??M\??????q???? ??u??C???1u&g???r;,?J??]4 ?? MN ?hdH0?t?Me?hXb????????0?+?6??T?1??BgH?C?? hA?%? ?l?9Z?w????( ???O?w?x G!?R?z?@?0 | ?^??,??/???/~?`?k{]?,?????I? {L=?lmKK@???^0cH??4B???-?i???' tQ,??F"R?D?*?g{? K???Ku??)5?j??p?,???o5???F?S??vl??{"Kf$g`??J[h ???<x?>?9??/?Z;????G?:~?M??@??h??D? ?S=? ???????tE?????? ???y"4?`???E/??&)X?????????????'?r????\YJSH??k&???A??@m-US??? &?????? ??# 3??p??p4?G???>???????1K P? ???1???q????w&?!?LKlVG??>????????1V.eB???!K?????x?8???$@Y/N?T???I5 ?]??n?y??P;?[Qh,r? "A?H`?\H?3?????.)Da?????Pz!I0o?g????`^`? Y?>??^Y\|@?P???/???T?!?????H3??ax? +#???3?eU?J?HS5A???VD?X????/????}M?o?*??#??^?q???Td??? d" ?J????S?G????W????\?}8?4???A]?l?a????Y?6??%?????<|s????/[GG['?>??)K?g??? \fw??_B????^??????wr?{|???-?z??do????#???????]4F??"???t)?5??`A????B???+I[????????W7w"s? m?b?`?v??2.?????T???? ?e???N|d??????ar?= 1?$n@?S?r6?/? ?X???tn?? $??Kj?u????yym>??~??pE???N/:?@?+?(?Nf??(?i|?8?A?X(? ???mF??E?????y(2??`?)?0?4?????H?`\??!????SU???z_?z??????????^?n??=z?????/?{??R???Wa^?m9?>@???; \??Q?xp:?GqE 6?????????f?*R??&???tjn?][????h???Hj???'3?>??`4??7??D?B?vn?L?,?????4RE??4? O?R8M@? ??WX???KG~?Cb)9????] ???!??GL??uS?9T?G??? ?7 ?{& n=?8L n=&u?[??R#Lo?????D?> C5x??X?N,H&93?????h??% ????E>x??uE???H6???P?|[VU??????M?`?!??I?Z??I??+^fm??c???y????????&> ANF???????"?D?C?h???=cp?= I?????6?d?N???gT??U?????S???/v???73%?E?+?i????g?I??? >??a;(3?fI?v??6a!???J??????~?Z????}????m?`???3i????Gd:??L?????-?U?c?C?ZA????dD?=?.????(?B???ox ?Y|*?}o????????S/???%Y?????Hj? ][??:???)!&niw?Wd1m???c?"K??7??Q??1?b$? ?x` ??B?? E?R Yd?????D??7???C?!?C?Z???????M??_????@???b ???F??\T???4H4???H????.?q q?Zt??'?C? ?D?8?b 6???? ??.?*>???????!??[ bKR?E?GV?? =?????i???????N??????F?????????)?W?q??~3???V??{??.???????'??]m?M/\#??}? G at c??? ?????:?MX?PtX0?6???? /??o??1ZC????1?>'Q???d?Y?^\\T?? ?^?^??????a\?>??~/??M???z?J????????????#??;??G???x??? ?/??1???1ar???'#?_?H46?O?r ?Ga??`i????}z?Z?*??VU4E??- 0_l?6?h??u?X &?<:-???7??P?}6AK8bc?\? ?M|????????,M?]M????D?D??u???SU[??:?(n?? ?x??(%|???n??vS?+_\&?Z?07 GWCt??|]???????f??!O?]?/6?+5?????????=`?~ }0T?0??8A????G?????m':?~H??g?$???????????????U?;?q?????Z?????????sB?H??+Ts?`gk?|E ? hWa?vi??U?b??????????S???eR???????]y?k?????Kf?guMz????et5N?r????"1da??9c???s?/<?R?y??_?s???1=V??o???d??~?O??R?-0? :e????s??????????g? ?????r?5??Oy?? ?/J?^???e?D??$}?????ec ????St?uK"2T?7???wP?????>?_$?????]=nI??TjB%E]??M{?4???????7?#? ???m???B??(??2`%?[D??x? &??T?Tv?kpHA????1)Z??2??d?s?0 z???O?T??f4?????=????*)c?}????/??^? U?f0 `?????bg?lZ????7??gZ{g???Gl??^?]???L?j???p?{???????F??Z??+?ZA?e|?h)??:?}???NcfMXv?7??`?0??2? ???`?/??+d?hKg?@|T?&S?? "?O?.q??1^E?%?(??????>i'x???69l???36?*?6F&????n"6Y*????y???]??nSco???*???j5???@????[j?????tT?eT?'???????>???lI??????-VH ?V? rsnapshot.conf.patch: --- NEW FILE rsnapshot.conf.patch --- --- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 +++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 @@ -40,7 +40,7 @@ # # See the README file or the man page for more details. # -#@CMD_CP@ + at CMD_CP@ # uncomment this to use the rm program instead of the built-in perl routine. @CMD_RM@ @@ -55,7 +55,7 @@ @CMD_LOGGER@ # Uncomment this to specify a path to "du" for disk usage checks. -#@CMD_DU@ + at CMD_DU@ ######################################### # BACKUP INTERVALS # @@ -94,7 +94,7 @@ # If you enable this, data will be written to the file you specify. The # amount of data written is controlled by the "loglevel" parameter. -#logfile /var/log/rsnapshot +logfile /var/log/rsnapshot # The include and exclude parameters, if enabled, simply get passed directly # to rsync. If you have multiple include/exclude patterns, put each one on a @@ -138,7 +138,7 @@ # If you enable this, make sure the lockfile directory is not world # writable. Otherwise anyone can prevent the program from running. # -#lockfile /var/run/rsnapshot.pid +lockfile /var/run/rsnapshot.pid # If enabled, rsnapshot will move the oldest directory for each interval # to [interval_name].delete, then it will delete that directory as a Index: rsnapshot.spec =================================================================== RCS file: rsnapshot.spec diff -N rsnapshot.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.spec 21 May 2006 03:43:07 -0000 1.7 @@ -0,0 +1,161 @@ +# +# Specfile for rsnapshot +# + +Name: rsnapshot +Version: 1.2.3 +Release: 2 +Summary: Local and remote filesystem snapshot utility + +Group: Applications/System +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ + +%description +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ + +%prep + +%setup -q + +%patch + +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + +%build +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ + +%post + +%define logmsg logger -t %{name}/rpm + +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ + +%clean + +rm -rf $RPM_BUILD_ROOT + +################################################################################ + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ +%config(noreplace) %{_sysconfdir}/rsnapshot.conf +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ + +%changelog + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines + +* Sun Jan 29 2005 Nathan Rosenquist +- Added upgrade script + +* Sat Jan 22 2005 Nathan Rosenquist +- Added --with-du option + +* Thu Jan 15 2004 Nathan Rosenquist +- Added "AutoReqProv: no" for SuSE compatibility + +* Fri Dec 26 2003 Nathan Rosenquist +- Added util-linux dependency, and --with-logger= option + +* Fri Dec 19 2003 Nathan Rosenquist +- now fully support autoconf + +* Tue Dec 16 2003 Nathan Rosenquist +- changed rsnapshot.conf to rsnapshot.conf.default from the source tree + +* Wed Nov 05 2003 Nathan Rosenquist +- Removed fileutils dependency, added verification info + +* Tue Nov 04 2003 Nathan Rosenquist +- fixed anonymous rsync error + +* Thu Oct 30 2003 Nathan Rosenquist +- update to 1.0.3 + +* Tue Oct 28 2003 Carl Wilhelm Soderstrom +- created spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 21 May 2006 03:43:07 -0000 1.5 @@ -0,0 +1 @@ +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz From fedora-extras-commits at redhat.com Sun May 21 03:43:08 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 20:43:08 -0700 Subject: rpms/rsnapshot/FC-5 Makefile, 1.2, 1.3 rsnapshot-1.2.3.tar.gz, NONE, 1.1 rsnapshot.conf.patch, NONE, 1.1 rsnapshot.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605210343.k4L3hAKP023380@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23328/FC-5 Added Files: Makefile rsnapshot-1.2.3.tar.gz rsnapshot.conf.patch rsnapshot.spec sources Log Message: Copied data from devel to branch directories Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 21 May 2006 03:43:08 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rsnapshot +# $Id$ +NAME := rsnapshot +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) --- NEW FILE rsnapshot-1.2.3.tar.gz --- ? AZ?e????? %??Ir7u??K ?h4????DE?LM????}?}???7????????O?/}__{??????g/?}????????`???T?&B???q??~?=?.?/?I*?_??%??C???r?????????k???? ???n?? ???????G??{??m??;?c?N????D????$nJmi<sW???d????k?fi????q??W???C?_??x????o?_???76^?????t??????G??JV?A?J?Nn?+}??|??????u??D?V2????4????? ?i /????`Dn^#??R??? ?@h???????|?????u?d????Y??D?y_G???R?~???B??G?? ?????? ?"P"?= '???PYZN??v_?????? ]??,?w????????8}p"????????x???#?#????????????*?OX?8?`<????q???B?]#9v!?H??r? ??A??????????8?(V?4 Y,????.??L;h#?D? ?[%?`?p?X??}x?PN??>?m??????x????C????g??????? ?&??h?34????i9??DBS0???? ????CgB5?|?K?Rb?[H??.???[ui~?? ?y??qK/?v???????g ??C???????????????????1??r 7?R????n?o?I7d??C?ZG>????J.?\?k?$?_.??/??????Eq:_U???,???8?5?v?1 ??V'???%????|?????V?+? ?]*n??????Z?a?U?z???.>mP?%???0???Lah0?3'??????K????'??????)???'???(??;??r? +}???NA???x??Y???AH?????/a???9??qk??-a????O??g?.?k?e@???l??? ?,?M? ??0S|?tx?'cN???,[ ?B???]?(Z??v?u??#?,?3?.??Wj+e??fZ???u.Z???/??? ??=i9??16?1s??g?B7Dt??"?,????Z ~???U ?????6k???T?l0??6mqN[L 7?,j$ m?b a=?x?????tN_+L?&?L?136-??c???P:o[?S0?9?re????A???Y???H???????T?????"?????'?`???s???????MJ??j?? ????W??PU(#???G?C????? $}? ?n?3U f??+?OB?n?M*?U????h??? q?&????u?i8w?n??Z????,u??'Ot???T?????f??????/f???@? E)?9?4?? ????u,I_?KF3?q;?h?rj???`H????&?o???????????IH?2:???wv? ??ZNk?,i1KQ-?&)??|3 ?????tj??5?@?3m?\=uKk9??Eb??????>?'?De????a???}???B???Q?>????Mre&?y??????$?b?(L?? a+?,G???? ??= ???O????+94$??D????N?p7k? @?Q?^ ? ??L)?$_?X?]????'pA?*%?*??nt??W ?????K l?\b?z?l??}j????}??\b??h?? x????M: ?-?????H??p?s?N)?????i6J??y?^?:&?2?#'I?So???j??dE(ia6?}P?6w? ????_ ?lA?A?h ?Tn???????????s?o%?7V]??{]?)??.?????????Cs)Q????? ?????? p1??@8 at G34I??';,?A?e?5?%?????dG4?< ??e}?-??????????????u?k?f7NN?6?? }~????{R?()?M ????$???Z?A???G2????^?UH|?3?I?????p\?9 ?0?u*F??_7r? ?~| ;??^?.???? ?m?4???3@???Hc?8p???????J;??|??+??M?e??z G?hN?*???p?iG<mA?9?i.??????H?At-?@?_)/@?????o????????. ?i?e$^l??6|#??g??>??f??FG??;? ?X?q?'n?4+}]?o??>?*???5w?m?*E7??jo(???p????+????BJi??? ?????XBz??????e?W????~8`CB??6?6x??$?G9xyN??]?0p?H???#;8??N???q]?aa(Ij????oS?o??0????U6?d~_{!???????.???7?????^??v+gB` ????uj[?q??&?Ur?n??M2?x?????R?(?v{????????~]???.?????VW??oe??Ut??7???????????(n?7E? ?2??wo??q???????? L?d?w?????9?&????F?, o???%C9?M?)'???#!J????b???'72?O???>?q????x?E'?b.x6??'>?J?SpJ???VB?Q????s? ??t???W>]~7?:]?^???t?p??%#??????[?.??????<2????].??????P???????%?rkw!?rA?*YY J?????{??C6Vimw??^/XZg??E???1?2|?F????????????j???I?=??w?pw?u??r?t;?[????s??/??n??s???)???????^?`s?'????+?????M????#?* I??e??z??$8?.S?8???P?Jt3*?????D??????\??5O{???0h??/??c?^Z?c??????!???? ??i??????V?@?? &?????X??????????vJ?????D?v???F???/??W?C?n???t\h? ?u????ia??Z?Q:?????L\I ?SP7?????M? ???? ,??=E?!N2?? A??????`?Ta???P86pX?:????a???E<_L0F???`x??P ?RuA3???Q?!?g:?bF????=??U??q!?/Z?B??Ok;p*?[??&?L[???=?(???+?z?*X???Xlc? +-E?S????n??n+?C?;BlZ?0?x?tUk??2?E0?Cu?q??`???r6+iD?????????R????N? 1????|J9"??Z?l???/?Dj?uc?(??'? ??5K????*S??LL???(7X???$b ?A?u,X??Xs??|!X????JQ???gw?M5aS???;{?H???iyW???o?ItiXQ??????/????Q?m7? *?f?????B\??d?jK? 1*sA???a?h??c????M?4?g?e???6??6?d?u V????m,?????4????M???@???(???R?h???vR???Le???????oY???]?x??O??{????c~??I?e???ud????g??US?8????? ????_?L??p????l??e??D??Y6 ??Z ????w?v??AbGEwj???1?&??i?$?&????"????????]}N&??????n/??~x7Y????iNu ??Y???s3?$???"^o???~<;8?????,??>'???(??tt?1r%!_x??3M|?`?(?y??E?? w?Y|?V?=?=Z5?X:???????~o???6s???3D?? ???[ ??4??));g+??i??$/????]?!?r???U?I?8?>J'9??g?J??iW -Kc6??M????F?? ?????FU2????2?? ??????=yL?r??s??-? ???7?' ??? >@????AY9?>vU7A?u?"5???_??q???????!?h??P??f!(?}?5J???u???_O??r????.?W?????? ?}????m??# l?X???Z?~??????D?????????n?,?`???J???9%?O `??NM???dj???4R????(M???Y-P?$?y????^6l1(?!??n?7+?>qo ?5| 8??(Y??'?J?4-?p??vvw??Z??@b+4??![0??.h?l9??7??3??z????R?u$?1EZn???c&???????.?t?L?(?$}!?{??w????/?j?wA? ?_8{??S?z_? ?q?V????????q+`??x>?Hq?c??Tb?????N?9J|N??;?(???g??h\??? ???Y???|?????????Qi???w???MD)0???A??+???? ????????Bm???J??4?X??????y/m??7[gv?l^?/7!???? O  @?FM???^R;)??9?%c/D?j!c?????d?????@g??2?Va'?#f? ????,?.Oo|??E??????Ki?0??D[]k4? d?JT???0^&?????,??????,?+????N??X???~?????\~?????0?t?|??V Q??Z???W??2?{??=?J9??AR???"rC? '????????^)?:?{k?????_6]_? ???gI??5? &??CQ?w??Q??? ??B???yi!??jD?2R?'Hf?u?@=B????iusE?'?C???&9??3???[?{\??nX????EP???A???+??=*Z?i??????~Zh?`????.?`?????????r???+?I?????7??j?tb?\6?"C+?4W??wu?F/??gh??&?b2???h?6q?3J? 9t?L?&?bZ? ??Hab?6;?,$?u?hl&?rF`? k??V??)?? gRL?q=??WBS at r}??/??????????\E?hd???j?o????O???????yV<^ ??{??EM4?? ?????^5????L?d%?YG&?h?@?!?FVw~>nP?Y???e??U?j?????}?U?4?$_?:TM?5??????-??I????-?L+?]???7JWQ?*???7???fC5??r????R`?7?C??@?????O??????? ^?-T_? ?F?l?$]???cF?r?PbP??d????5??+?6M ??~?????T?=~??0LEf?D?,T????A??????_?;-??WR?6?"?R???V??? O/?? ? ?HN?4s??[Rg?A9??6mH %??"??j??-L{??t?8?3 ?k?$?kM@U???~? q??y7i??T??H???42??R???s+?n? ??R>??a? ???H~?U????[t??.?+???????:???{???{??????????c?O;Go?E??P?j??,;?5l?????d?????@I9R??0?Rv?~?BS/??i??:%?|?b????vV)@???????h??8?? ?o?1B?m??????B Q?d????????:?J+ZJ.h?>$y? ??yfT-k(F??T>????p?V?{?s????????1????"??????????]WV??)P????i?????[??*???j^??/?KM?,:]??\D?h?%YkG???j?"??_ at dvd?~BgA ??B?+?x?)EQ?( ?HgUkt??iV??*?Gt???Z??)???8?y?,?R??"??_?Kg p?8E*? ???{S?1J???_????T1?L?v?????Z8?_?S?T??????? ?6d???????????{?K?~??|??2;??'??d}s??S???\*u????;_??'???n?????F??gB???#&?es? i%?z?h5?d?4j2(??*??X?l.?/:?,>'Csr???? W(??? W??A??ou???w r;?\)Dyp???????.????(???eR?X????a?l???\?6w?iA>????A????_?{?4???V_???7"?DEMyM+?S?nh??????Ii???? 0-??e?Wz?l?G3??0-P??'?~????R?b?3Pv?xV???0??vG??O???7???Vo????e???]?M?????3 ?o`??3?????ap??,??3?h?????r??B??%?Rn?6?,?????t??!?l??????d?PbWA+??|?RX?V4?????Z???G,?^5??H?-?py?????fp??.+???@U????<4m6mfe%?&] ????=j???O{??-c?????M5?/??i?n??n ??U??,nE5????/??D X?????>???~??^?6???Y?,AX?t??c?~c?s?? ??:?w??|-????= ?n??VkH ???s?2[?L??? ?? c?????T?s?????`P}8?Y??c7???>x:????G$?1T?Ne???Y??????m???????'?x^ ?sved*`h~&?z??t$??F??( .?\16{?A?"??????-u??????9U?x??.???z?\?E?~???????}x?* ??\???!?=B??d????f?PDNt?NO ???]e?)?P? w???/?i?#?ti0_r?HF?4w??%????@L ?u?Vn??N+a??0??S$,?G?Rr ?????-$3 ????9T$?)??;????]?_?xh?ux3????????????? ?5L??=6f^?0????h?T?+???j?8?Sb???> ?? |yU9???i??c???LL??P ?J?;z?=<4|??w??)??iW??(,??t??!<@????'>\??h?M???J?v??????EY??4??u/l.?Z#s@??9?$Tz???:?{2`V?? E?P?(Iu?? ?|?n???-b??\ B6-?28?=]????,X??a1Q?B?$}??????f?PO????(e-??B 7?u????6?1???#CSEJ]}?A~??7?????????@k-|@_?? kx,?B??????E??o_=C.??i????D?@?Cy??$?PF?)_@??Xmq??{U~?n??v9 ?4|??u????????*???Xf??R????? ??`Nz?l?i^?Jc????n??T?a?T&?!--???w??o???< =?$??Gh.-*??R?S$a?FLb???P?^}?-???8?;??O?pk???L???$x\'?z? ??',p:??????(i?F?????3???N???(7'?(??vU6p????"??_?:?}?PMB??]p?*^??X???] (?~???E? ~*???2?n=?[?C??n??y ?x??x?7??VZh????G??B?xA???4]Ga??_?????u,g>?&3?7?????r??99?????{????r??????d>?Z%??_?p?:???_A??????m 2???????*U??~Fk6l??B???V??U???T?????#? ??S?P????C6???DP.T [?m|??? ??-?Gm5??/~??? ?Y?5{??(??{I?? ?k????*M???XQ???&??1??i}???8??????h?/>?? ?a???L??!e????g?????????????E???gk?i?cg2??D??????'??????Gie?;??Tx?j?b???S?j%????s?M??????pr1M?g~=??|?? ???3|?Y?b?UwvL+??=???`d??.??????B????????7? ????'??j?zs?fRdS??E?? ??y[?g?Le?9??~3^??r?K??I??t\#? ?????S????????P??j?T???F????SZ%?????{7<}?L??????*?3????e?K??mp?????A?81?@??;?Po??? ?t?3??m?s? ??&??}???E?P?%???[(E?*?SH???VH F??m@??J?? w J?Mg^l??.9??jo???Z?n??1?ZZ??ee??G?mMOE???5I}M?q??????P??u?j'?#?S?-zZ?W?n??????au??3$'??]tA5P?k?+??HA??Ym?))??h?????1?????? ^s?p??G? ?"/j?d???????/?Wd??$B?? ;????F?_?l????Q???w 1?????????q? ?*??7?-? #}?J?[~in\??0?]???V'?vs?_??a49?KJ9?? ??M~??{?e?J???q?$??{????l/?)?sj?-8??8_???i?#?Pa?]@?A????t??,?/????#?"p?@]????)?{a.??a?G S\X at f???#??5wrf??y71#?"???????????! @?f???t????n?9?8?hQ+8??M?.?????89???%:4??1-9$?6?$?????^??V)??[VD??^?a????.B?8??6OA?H?P????1y??U??.0? y? ??0???1]V?R`???mP??&?H@?eQM?M?U/?YKg??P?6'd??_??????2?? .?1TB?"??U=??qc@??????????Q0??x(?V????vw??s-???z?9!IC$~f??a???W %??/X?q??|D??????????< ???< 7??,?`g??????s????*??( 6??,M????t8?f?t????lkb~??%??M>0?p?C????J1??j??&D|?9??6????(HK?``?y`?9???j9$?s????????t?|?TPE!??yAZ ?Mi???]C??k???3??p??B?w?? "? ?&??d???????????% ??? c?(?uL\ &??? ??f????!?????DN>a?O?;?5}m?N#OF? M?ED?????????!??? ?????????f???;?H#!?t?H????G????Z?l??.?r?%??0??S?? ?s$?{FA??86??z?O?~?i2?B2^???D? ju?*??b& >$?????/?)??:???@?EI??????????uD\?mNC??4???4????wdw?b'@b???0@|??< ???????H4??5??t29J?G?Y??,!3?b2?D? ??5yV???.?az? ??*????%$??o?????98?&2????????JyI?g??????Q?Gs?0&??t,FJ??0n?D????b?d??d???J|Gb?H????R??8?+???csA???w???K))???????az y????????,Hy??i???7$????J????????/????????:u?y??^?PV??????|'D?dtb$?????f?d????Juo?:?? 4?? L???1*?R? ?,???Dq f????c?1%??2H>???XC?i*??O?Y?6? "?m??P ?? \????????: ???? ???H?v}??rfR?6a&?????X??!q(??U???Rs?]? !????m???b??9?????L?Z?v??T?3'r?N???M?&g#e b ????(b?%?~?z?.? O????J??8m'&?*y???Y??_??b?.# ???9?o????8??H??????? 9??%S?? ?? ?R?f?????wU?6?q@??? b?Y?????i??????j?P???'???i??dl6?B?g?e Mi??`n?!??x?r>?+????j????}??k?Z?sz-?????9?????q?`hg?}??4??????4??*????3????i?(???>????"y??`?MK?C???Iu\B?,4,??????b???????????????]????~??t_|o~?j???/??,??u???XS?S??oS??H??B???? e????|w??)9v?}L?CNeK>?????*^?x?z???????????%]CC ???y???e??*_?604Ls\???g?)????2?? ???v=L?????Yw?Q8l?8??g6\F??@???$??F?0>`???,:?FN?"??f?/??a???B????6Z#D??.??? ?O????? ??(\??!8???]?o?????v????(???9?i??pk???gOI??0????SS??8??n?1?o????9????W;G{?^/~?o?[?G;??v???w???n'?? ??? ?c??[??????=~??mc ?@"?]??3??kf?zR??T>??1???????Hg?>? ??B??!?F???Z??Q? ?????3??????????4\?#\??6c9@??~)M3M {?'?p{????.??K@?????Z at C;??3>? -???????V+??HfQ??i:?"?aPe0???~?*?? ?!???????M8?b'?k??O @S???e?Z???????? n?VB??Hb?]?K???3o?$c????B??^?.s??A?C p??#s?L? b:?X4=J?????6?-?c?#/N???w?>?i????^KG?????+?,4H/??????PK??????|??2B???v?????L[???Coy?O???> %??????????[;?*??` ?bra?q?s2?:T&??&?aJ???sp??8>?|???v:????1 (?,??2L/q?.!?56??h??$?Q??.???:??%4?~?H??/??4?I??0?? ?? S?F???GsF???s?f? ?D????YX?????G2?;;?????MLx? ?^i???|??????fN^??Av#k???99???hJ??4??? f:;>????e??l?S?3?i?o?:?n???[m?g?DkL??H??N%??C???)???_M G???l?e??]s.?02???@t"????d????????8?c???I????h???/?\????7:O???^[?\[?:???y????????? 3?W)?!?^?????%?q???~A??U??? ?GN???n( T?a???} ??????D?????#|?{?>?}r??t??NG?? G6L?pp????YC??u???B^ n?a>?z???[$???????I ???{????v[???Fx?g?-?S????yo?????A???z??F?-?0?#???f???K??/?A?????Cf>??/???.Ew?????/?}????9t??:2?LH~I?? /?d.A.-K????&mw??V j???{*P,q?J?.???5??????3r/?????X???J#p??W?^kZ?B?G? r??K 5=?%H?T=ZV?f??? ???.*?C? ?A?;`??? ^d?? ??#?,?;u?0>$g,?????Y???id???^?????p^H?1?o?????g2??Ry?\3?8?H?iD E?k?l-?? ???V??&99?????H?=q ?_?gI?H*????n6?0c? ???`4T?&??C???W???Z??9??Mi?????~?>??df???q2??l_?M????L6??(+T}?D??xR??????"???B?b?E????9???????\??f??? ?!???E?6????5????\?{?#=??g?_[s?)4?????+=??????3???3%???B8?F?g?W~dF??(f???zo???Kc?"3?>??l?????t?|;q???????T? }??f?^??????0D 32??+xM ?A? ?L? ???Tb??\4?i??`d????e1????+2??????`?? ??????{;xS ?=Z ?A? ?M??@D?F???/!$?}??$p?B%N?????????Xi??!???"???R??[????)???]q????P??- ?????)??[???V?N?hGA???????lOco)??Kx4?CD??0??a?????M?}?Fy ?.???\9D?l?W???>>?h?A6EER??_A%g??r A?!?#????RCi?????P??!1?*??z??FO?????????+??W???? Zd??E?a???\?7??[?j}R%?dV??\W ?,??? ^?)?v????????N??,NK?f??-D??F???????Kk??R??(?L??k??Ayv? gi[????$Q???DN?&?????`?KQ8??NC^Dz?4L???????L/?s!?&?3????%????-?xz???v??4??.o}?4??Fn??????h?d)?????_=?e?D??(A??????f??CA?TZ?????n ?3aS_????d ?F,\N?k?|?R??????+???5b??zah97X??e????^I???????w?????*???d?eV???ZFV?IV.RU|N?=g43W?7S????" G?GT?Z???2t?????(????Q]??h??-,i+?f3?????Er?o?pR= r5k???|???X???H????4???g.????e at h_Ku?1"???^??'6?[+Nb*??x???[??g Y?x?+?w}a???c?`[?? J?????x?G ?ln???? A?Ak?Lk^c?? ?n OH???H??VAmp7k$]???)?;?q ???? ??:kk?x?%3?7 ???se#N2??3????J?? 5"?C???N???G?l[Z?E/\SZ;??lO9E+P\?F?qR8?-a??? ???dj6?DL?tk??3K?V???+??;D?S??Z???hPH????$w]?A?,??FI?AuK? ??????i3$I?zj?? Aa?? ????d?j? Hd??a-????q?????6 ????????????FF&???80?j^?I?????.s?( ??? ??g?K&??]??[?????,????e?O?!A?:k???egd???W(?D???l?k? j?j*??U???o?bD-?k????,G??*?????dZ? ?l?^??Cs???SB?2???????fFh??R??4'?{p???????N?????v2??4???? '??H?n??F*????x??B%V?Y 73?1???d?*$UR??d???5)???? @?o??G????.R?xV??y??????s?:'??"?W?????^?s2????O????3r??1???o:??????Y?P?v?ez?%~??P??? ???oS?I/???????(`y}??hi??? ??t>?t??C? ?+??a????n??? ?F???[LCo???o??[/vvw?:??W;G{?^O;x?H?n????????w?[?????????????sF\?)? ??`?;PWX?? ?B? ????????:????xU?Q???S0?~??fNFO\?L?uZd?q?k?P? ??o?????????MEW ??$??S u?>At??7?Z?????_???7}?vp7?A??f?fw?~4isQU?????i???? ?/W??H???????#???]?????X+ ??o?u???OT?????|???????^?X|??~??Y????????y???????^?pk7>x?bwg;6????u#~ $/????????m???QTR?7~??????Q?d5#??n?|???C??pDq??6?a=3?R?*?5 ??m?n?-PD???*?Z??=?3??\u???o??^?){n??RiI\?9%??Z?????X< ?9a??R1!}???rF^\??.? r?C%r????2dB???? v/a??c??5?h0?>E8c -?nv?Jc 3?`??J??0&i??? ?u???CT???7bfrA??? C;??8??6G???#S?R9eO??=???????6,Y,??E????S H6?2?-???W????P?Tc7c??(??1!4?xu????j?b, B?.??? %????t?x^?]Q,??7??a?$D?B????$*?:????jH????d??J? ?O&?(?BQd??K?$ ?\{B??2?C?2?hT???J"?J?_BQ?????]?????x? ?3 ???9~?4M%??b??4|?PGf??_?Z?Aq?:|??n???????????Af?Q rCv?D$??`?-r?]? 6???3??Q???.????I?4&D???8?U?????????}w3??Ik?!??,z??z?????A5G? ?%(?>? ? ???h$?^?6H?-?1[????_??V??a???Bk??????0j? c???Q??%|?*?4?H?E?S??l?`??6?????/?????q?????7???y???K??h???!???A[??GK$??%j?O}M?Q??=qp cT??VD?`?r9N?k??BtG???k?? A???9??5 ???4???0F?????+? U7????]3?_s ?F??????[???Ly? B?w???u? Y,?s??)??$???N???9?nlB?oO.?'??Km?A??(@????&?*RY?i?|{?=|????^???{/w??b/~??j??_???w^????????;?v?Q????.9V5????+?B??1H~@%?<=!9z?? ???3 h?\?dK?'????j?Pf`??E?W?u???hb???#W????[?????UI??T`?S??E?h???7?i?JA???%?|?N? ????B???!<~6L?Z?YKrB?9??4??(?b???y??j ?zGCs4??w7?(AI>p:C ??5??\?t,?IB?$?? ?LB???B(?? ??#??|??B????Hc???????mH???Q??=y%?du? ??X??? &????????@/?*j?dj%"h???8??2???t k??xq-?c?W =???,?H;,3 ;9<????Wpv&?? ??#?y??]h?|`?M?C???B]7??d?e?'?'?-w??S???R??]?3 ?W???????W??^|6??%o3 8???*!0????Rc???ZM?(g[?EN.K? ?aOT?(#Q?|???"? ?'Q\ ??Of??$?2,+2??%?D'v q^q+W????Y??`???#?KN(??gK??gnn6;?K?W Ih???k29k?????F??f??94L?0??dEp?D?;|??7???6T%????`????{j?$?? ? ?Z???v*???9/l]#?($?5M??? "@ZM??L??Qz)a?b0??????????-^????&h????K??bI?m!9???K?}?????D?*??ONQ?x=??a?eA???p:?`???i-%S????Y????aa??Y????3K?y?????d,X??\2Y?x^Wi???i ?M ??-??P??=?G???H?[? ???????X?|??Z{?P^? B4??` ???{?=h^?????D]~????B",u%b???p?% ?)??M????NN? ????j??me??QBU3???m?D?%???90???)? Ws?R??z=6???????}?t??4??Q???? ?%[/z??F????????$??$??Y??Kw*???]=? ?!??`?w@ ?DemG??=???/??p????????z??Jsx?????"?5ur??&x/?#|?!???r{f0??ng??U??*I??B???? @?3 ???????t*VD???kA+?r????)~???A??5-y????????l?-??Os?+?-?????YX*??2???p???B??.1K???M>m; ???3??l10 P ?????X???g???@|#Y? ,x??!?H???WX??~????M?? ?,}?sD^ ?6?q?L?Go??`?G?l? ???a??????P,[?tem?R?^??w?w??_??????v??'>??|xbk?+?E?q"?I?G??8b??Z??*Gd?Y?9???b;p[B????????{=?q???`=???C00mM?????R?mH??d:?!?H? }0???]X??1,???JC?W[c????2?z???r?A???"?? ?EL??-??????? ?Q?b?P 5? ???2?w+??????[?3???G?#???????>c&??L?????k? ?$?2>k?P?*??0?????QRY?~9?????B?,FK????T???;??,WZ*IDm?q??2??% ?nztz?6?Z=M~?,LH? WE??????PQi??%??E)? ?]K?.???;????N??#??a(;Y????? WyQjD?1??n?e:1s?r?~??d??"Ka at r?r?RY??e??e?????:p????U?y8a}O??l?Ue? ??I??q+uk??R[???[???????N?????t?NO?o?????:N?cOgS?????d?Z??Oxkdn7T???!?:?5?????F???? ????"}J%?J??jh?^?Z L?u*p?\???????z??~???S?q/c?b????,??t ??t???'HWR??C?q 1?i??? E? Q4?}?2??R&??`?@??!7??A??P????f? ??????.P3t8???????3$W ??(\?=?q!?c??) ??? ?h?cG???N6?4? ??NvV?0 X??B?????;F???"??>6??u?C?y????y1%?1F?|?k%??Y6???????P#? ?@\?J?R?1>%?r|?$p?B??Fj??9?:?>P?J??'???6$??????ba???=Q2e??(?IO#??E?*??u at w?????]?+?Bm???Ewp}??=?x????+????!O??p`S 1v??I??-|?i\?_f\E?ik???`?p?????^?5'VQ??,?J???L????>????j3?nJ?X???[,VR?RlM???????[?_r???????r%8?????OO?~?JT{ey??4h???5ch?????|K? ?j?SQ?l?W? {???>??????E??.Z? ??-q????[?????;q????7???9!???;?O?Y???Hx????mnJ?K????$, }Nc????u9? ??,?2???b?????? ??K.???????x??u{???Y??}@?t??????7????CN???????}??J?4???????~?{???~????]??@???G??h"&????x?w?u???????????o?3???sh??????e???E??#Q7?u???*??7???@N?A????9? ?s???9?T=f????u{c???%Ovsc,V:\?^?UYy)??*-b??.3mnl<}?~???\Wh?{K??)|?????@Z??P?J?`{?????a?2?e???/??e3?? ?G?0?Vy??[b?G?????&z-?e?????c???)L*?h??c????F-?_????,7?}???r ???(?d?c????2?vdZ?? u1?l?\???E[A?N?)???????v?)Y?? ?J?V???????%?)? ??|J(??kB[????6? ???Ht)Q%c????S?.????5???O????~??????????b????G?O?????????w??????D|g]? J?-qo?p?Y.?|??pa?????k?%X???#^?q?bH???t?~???J4^?_{?e3???MR/?b (M???|?R18b?? W?^??l:p^????????Vf?S??I????!M??? >J?D?T??K??*??s?m?ni??]?]3j???)I?Z?? ? ?E??DV?O???U-???k2N?U ????U?k!E??"??K-??M?1??p'?!?????om?;?ZBk??$ak?G?vI?Z#?'??lFE???? ??/R???2n? u?.????6????E7v?l#???w?f??j!9??`LqCl?R?????<????+@%?B}rG??pM???t????Or?&f???5?~X?F??{Yd????)????O???? ??Z?H>Q\A r????yy??????)??? IP??????II? L?6??H???????2??)u,X??[g2??????V4+??dE?&???R.6Ff??OVs??-o?K.|??9?'????MO V??A{U??5D???? ?=????JD?m?;9^n3X?QG/?CP?(?H???0?#????;????p?G?????g/j5n3j?k? gY?|Ly??(@K?9&????I$"gc??p??0????/h?H?_?_1J??:?|G?e?6???q1Hh-i?d ?????????????{/????????????0GH?D;????oxsO???Z??????Y? ???X1??d p??\??&?d??g12X?9V?!V"'??\????z?s2?ve?<]?7?-<6r?T????y?ha??? C (?#???Q]??x~,?F?o`?X%?y+??h????=?=??b????G???'~u?f?Si?*?w\???l{ ??B*q??????????K H???1%??9L????:q(??}??GK????4k#????c{N?e????;?;*n?4Y7A^??+??s?/-X>?Ql????8?my???????LHt?w9?}?[?t[?u??????V;????mLX?Z2Q1?%G?S?=?ViR?r?%&??h?k?q?F(??[j??@???????=??(??2?i?oD]\t???Q??(?$J?)`???H#??V??QJ??t???3yv?k?[z\x++??|?????.?l??s??????-:????_??c??;??e??????y?????????????/Dt\6_??????8f?"O???2nT.??>?d?C}e??^?&EzhQ "?;?D)k??s???l'?D?u"?P???8h ?D?Nt?*z????m??3? -?J???m???J???5???T=??TA???w? ????+?5???4??#?? ???)7?P?s???Sl7?|h? ?B????Y?l?6+??????9???]??/??T4EH?????t???o?9*?b?e:??A?C???=?[?=??@?H???gS*???C`????LI??\:|?l?*8HH???Gt?_)??9?o$???R ?^x??m???'Q?5??~[????? ??n?4???2l0B?F??G?A6?RD.,#LB-??? ?/? ?Q?~??=n]??a????R????H?F';?}<,????#gqw??O??:????4*?1????[`? ?)?Q??????N?IK$???,Mi?P?-? ???6,?, =V???[??OT e?H??b R?????G???/j?ShF?bwzq?J"P?X?(?"??A_ G?????????C2+?7????| ?-???o7???#???G?;?'??#??????? ??4^o?T?????L????A ?=???A??????7????vV7T??~z?A???I?^??F!P??y&2I?J?v.??$????2?dy|?1S??? ???# ?(_?? y8;??@-1??t{ I???9I?'??^UF??<g???r|???n??=???2??-?s??????s???s????[???w????y???|k?? -??8???6M62?G???A??I?2'??R?,?&aX???? ????B?\????f?????????$??n?j????~L9?v?_`?z~??D??(????*?1?8?C?????????d??????/X`n?os???j???|?H?c?y??Q &r???'??s?? ???h?b?&T?U?Q??M+ ?????2^v2???U#?s?F 0?-??Cd+:??AV/??F$9EQ+?? ??N??E)P??M??0?tI\?d?d?_5???S?Y9???.?f?T?O?? ???'?W?????\Z`??BQ?}s[;W??r?0e?o#?>???A:???6XI?N???~D&D?E??=?jTs?w????3???E????N?.`&??wA3??UY????F??Q???La????>T???!:?92s ?<9=tI=?-????????Q??jk?=s????????y?c$????3??z????J??Q=6??>OD??6?G5tE?cl??d?? ???$)N u?i??1?8????R?????"?????[M9I??fOS ?\4?V?VofUoe??s??s>?j;s??E5?F???Zi??? u?x????????P??l?Sh-?A??? T??0^????????0o.P??? ???;Fh$+?$?????? V?x??S????: ?-???7?|? U<,1???s?/1f??4?G????Zy?????,?F?wZr???`????Y?l?>?3l-S ??? Mw???,a?e?p$?L?D??g(a?&w?C5u?i?*?????=??+??\ ?N??? u?Js?Dw?^?&kA????e??J?F?MU?2?[`6q}??1P3?w?a????+??-?X??.s?aD?????*?H K????n????j????n??r??????@:(G?b?????????%YZ?7???D8??},\????wi?; t?6?3??g1??wo)???[z?????????6?04?Vw%/?VO47D?l5??j?~??X?(?Kf???Z9???)? ?#&"]H?P?G??????.?U?h???D????4???4?'o??K????K?6@??????w :Y??r??%??%-Y??3??-? hw @?Bj^???n; &~?? E?)E?? {??s??Q?e ?????-??J?_5??Q?i:?a?????F!)SE[77??of????rgK?*O?DoY??????wF ~??M??Y????:????????R??8ye??d?/YY??z???|?r0c???? ??????E????_k??????=?)sq?*XyZ5???j??????% ?,? ?g??c???r??QrYya5??i???"??v ??F5???E%?AT?b?E??{?)iX???J ?/5??05%?di???X?NpV\??M$3???[N??.??? ?F????J&????\#~???he?/???J? ??\?$????>lm?! Yjy???*^v?\S?x}???????c$%?????c?" ????tR???[ec?%sT??S??=u????*?-}j????>,f| T?k?(???,???}P???-v+?v???? ?iN?yud??iE? :~R^?R?v?j?*?H l?wi??????s?+n?K? ??????Y?? ???3?>?o[n?`?s8 z?Ue????/???&?W??bT?x????????g??:|????????{?M*???[????l??????o????6???X??A?Tt3?h ??jc-N4mv? ?f?????RV??v?X??2{???2g?m????&???????~iB?????t???v??????[???]??}??????? ?Q`#?' ?P%GgQ?9??&??:2????K)???I??( 54?iJ?,vS??.????|?eb?&??l?? ????qw????v?m?? ?vE ?????AW???b4]I|(??} J?l??x??z(?C??????U?b$?:??-!#m+_sM>?/T?`R???~???????TZ??0+??????????ru???m5?=?N???di?J??,V?g??U?%??????*S ?RCk0 :?Q?R?+?&?gw%!???$?N???Ih???>???NVr??Y?{Q???t? %}??N?????y????(?Y??49 /u?c??#??=da?,?? ?s????B? S?=E??Qv???^?;{n? ?v?e 8(???6??0??T@??)??r/?%???8 D?i?"b#A??w??`'??Bf?o@?x?[?OfY????B7?&?~|p?a???Lgx8?GQ?:????b???g???A?;>?/~??O???#?or9?`G??lp ???,??????5??????-X??k?j?#??>? ?? /-??6??????}?P<{?3??D?E8W|3?B?]#?Eo??b??Z-?<v??2-?_@ &?>?E???????d?9 ?????>f.??V?X.?????H$??n?3??????h:?j?????d?s3?0??=<_?mn?5??????h??*????G?s? ??!?D???????{??3??/?????c???????I?i??O???? N)?S????a?????U????Y??R??L0W>`U??!.M????D?x?="?U?d?R>?? ~?V???$?,?d??yX|?/?Q? 2????,L?-}k ?h'???r?#M??????u??m?7????TA?t??s?s??0uQ?nY?H?Q?a????M}wIm?hd??{?????????pN??[? ???o????l@???9Nb????)c? 9?`?[~?Z?v3??????^?LU??8=?+??CW?W?; n`9r?????6-{?%#????7&}?>5@?)??m?Z?E??? ?|}???BF??jxmo????BF]???^?? ?Y?7?{}??8D??%??"??2??pn??0 4?iB%U????T?H*Bv?CD?K$?}??KM?? >?$?8?d??e?? Wr+????!2e?d??c?ln?*;& X6YD>??63??????? ??????Qy??ZY3t??X???G??/????OVW??????????????O????h}?????l???U?y??hZ?Y?????3?sX???x?+??)? ????????c?L{?^? ?`?*g?(?? ?V+??'??? M0;??????V? ??mx??%?????/????X?BiY?? ?WM`?9??=7???l???kTyj???YsPU??F???J `\??U??2^#??8@???Q)V?????Y?Z????O0? ?[????R?zV????P?S ry?h N??????????O?~???????@?: ?P?/???2?V??~??p?b?qRWSS?j at 4qQ?????????zP8?c}k?c?????vj?5?df?@?g???o?C?P???+????; ?M?dmx3F???`??d??"7??7??????P?!??EA??_???H?t??cx????9w.??i_???D?-?62??????C?????????jOv????;?E?PowX?D?????0? Y?q?e???!DU?s? 7????[yf?? ???@?#?s?jj?*KvH??-??B{{?31??o??Y???}?5L_? ?l('??W.? 0;?7?}W=??w$???4????3??B3??&1??"ClH>_P??7? ??? W????TR+??X-?,?:????G?G?tjT? ??7?,^2?(??^?????R??S?`???2vt?@?Z???3 ?9? ?-????F??h????? {=?N?E??y*??B??Z?SP?Ji??v^??e??? ?W??mK?>???????5??Y?g??x\?/?E??=O???[eU??B_?0?Zy;'????!??u? @vF???>?_ ?? ??F ??.*??f??m??5?r)w?L?7???L? ?U[{J=??{????1??Xi???:IH_??????p\???Mi}?????7??v?_YE?X?'????`SM?R?gpj?[F)???g?n?k?k????K???)?1O?!? ~??S ???8FH#?K??Rm?#?>??Kz? ???? ?M????|? _a??|?!u??? 4uy<???V{W??,o-?H?N??? ???Ul??h???-?????!z{??Q?d,?K????ec?????I=????_)E?`Q+Z????W,0?? ??e??^lL???? ???j????????Y+7??j????z??$Hg???5 i???'qC?5????Li?JQ??Q5_???/??^e?-?Z ???QT?a? oj?| )??O????2s???z6?j?? ????@\&?l??z?w???>???h?u??????whc???8u???^tb?i?&?\$????)??Y11?-?_?+??j???>?? ?O?A???*?????~R?(?9?????@J>?G???????s?9?Iio???l |ta2???&^6??9???$S??O???? ???l??]T???m???{!\L?gZ?=?Vz2k"%???????/?? D????'e?;j^???????????????Z?Z ?O?A???0?? ??Q???/??y?O??? ?K??JLxu??3?n??z????????F??kQ?}? ;?KpP9?TZ??9?????????}??b I"???m+iN???????[??A)??f?0?pX??$???O:? *???|?+X?M& /?x??CF???P$[????J???sA???P????as6 ?Lk??1?????Hc????{??? ????`=?????? ??"{U?FfJ?9?!P;2?m51?????X?{?a?P3vF?s9?"??`X??`!??4O4?*.??h c??.p:ub??e???e-??;,?r?NRf?A[? ?c??H??3^??L??c?kr???g* XI|????L???N??W???5???}>?pvQtf??/A?;???d?uQ=5???@?? -???0??G3A???&?"eQ??w????|???????\.?NU? ?RD??A?\??b?n??S?71 #i ???? ???Q?E??` ?? +???U\??M?L?!??o??Q?X.(m???R????s??????5Q9?%^VE?????v??]??lk,] \?Q???????HN?D???W8????m?CZ???????EoP?j?h????A?? ?j???`?=????m-???8????)???????H `???z?02,?!?q??HT?{U$?8?W?6G??g?~UJ??O???T?????? ???#@?????4??v??K0X?p(?????????k5?|o??n???h+??J-??y?????,6c)?"2`?` ???~??N????m?x(??i????2|?????a.??????I?????t? 1,?????^?"?Q??V????Y?????a?T????3?fEE???+??N?pT?tGv.?~?!t??#?T????\????E$a?@????9???,y?C??????+?+Wd??A??P??? 4??5G?R??9g?R????lqK?? ??\EN??,M????Y}?9?????????m?6_R??Hu.??D????cV?jg$?v=UO??r???}W?zU??R?ZU*O?*j?B?????%X?9b?S???I??^???2??g?w"?,??I??X???? nj?q?w?zFv??/?V?s???F???r??l??TF?#?&?e??????A?E:o???#?%?Rs?#K(m??a??S?s??z??NZ2?y5??d??j???3??A?????+?6?m?Jv??v?l? ?X??Cj??W"?r?r,:9>?#iM?xhR j=???~??#0K??.+?J??9?j^X???%??x?1@%??|?eu>?y?p??R>` S?????ii????d?Y??P=?,????B???1?????e??n\v?Y??CG??z<??[tie_l ??[??7??T=?g??g??6????[??!w?????????B0?_???)?????l>????<0+P??G????Qb/???"??'????{?{_?? I?????????;v?N= ?P`*q???????0????y?;d{@?h??B ?????'????c'y?6???????X??2'?????.??@?.?]l+???S4?tb????c?(?(?~?????A????;??C????g5???? *?????`?#6?8V4???|`t?|????]??@O???LT?(????(V7??$Q ????J'??V#?g?lE2?????@I0????X9??????????????????B(< ??~7w:8?? X?.??q:G?o C????K??t??4 l`&?????v?lL(J???3pE(pV5h?=??y?! ?#??V^1???Q?M??????"??}?(Ghm @]D ?P ?@7nB?QFi??KA??R?????????g a??? ?on???gi?*????g}??D?$a,?1??<"G0 ^??#???=V E?;%+?z'?~??~?q?DtP???r ??+?9??V???W??$L?:-?ly??mJpSY?(?m?[ \?KJd??.?WWLM?>0?Tt???????????r?w?"hK$I?????p|/?@|??iv??9-?Y??i?oq???? v?go????????M,????E'??3?5\???6^7???$`?/= ???^&?? ^?? {??o????p ??????Z??H????=:{??6???i?????K?>]??????+?????n6?[[G??=?????????1}?{Y?5??D??>??1???o=;?!V]?V-w?*??t??[????????mz?????h?$???%Ik??P?F??_ ????sHx??? ???]??J???j????.???|?????{????5?n`|??????????? 3????eIDK0V?%?x??r???JtQJw?P H t??7*?????? ????(?" ??W?:?C`????????5uh&o?ri? y????`???*S??q?g????i??K=???:? k?w??d????r?B??b???i9%??-?1 ?v 4??X) ???/wv?^0jU?j4??B?;xs,??K???:)?_????"?]o?E)?~?p??l?o?H??bq??EU?S???[?R?..zx? ?????X}6xv?????????-^7??}??m/???g??????GXf?AW_F;?g???????wh?Je???c??Q???F??7z?\?? ?@3M?r??f?C????k-?9?M??la????_????????+?Y**????`?Y?Pc?|Q???????\???f<}??M?]g*?? ??g?g?wU???z???$??]?xK?@?????C8?7??? ??_?????B??????u?e#)?"?I?2h????????!??c??E% ?=?\??7!8^w.???$?a}????fT??hn-???c:!?Q??^a=J??H?.??v}?~?? ?????F?S???@?lXH)4G???)?dYD??2 ?YP????r?X?}??"????.{?[???[??N?^*+ J"+???D?d??;?#???K?r???J rn?-M?p(;+%?? f??D??1???? Ca????V???Q???z????K?G?)?oU?Gw?{- ?:????( ??`0R?"~???y6??I=?_??????????;?'yFS????X$B???Hu???Z?{B? ci?D=???H??XU?????I=?_?c? ?7?y?e?? ?[a7??}?j???????$??y?3?\??w????? F????y?Cp?b?? m?!EubCj????A7?= ??,c??????E#???N??+4?,???qc??|? C???? ???=???3????~??H"G6m?tv??????1??EV??? ~??y??L|???9???L????P??FrF???9K?? Z?????eJSE???M????2{?AsL??n%6??`??????`x?>????aq4???H2TQ?D??bLkX???BzD?^??]l??i:?"g??i?^?ES???>???(?"H??^Y??Us?2M1????q?Q??#([??&!?u?6??7???[x???{??q? G 8h??No `?????+????W?d@??k"?q?(?MR9????))???????WVFNH?{q??h????????tn??Yo:???H'??9RV?M?|?|it??NM?K9~??????t;?0?h^???????<?w?32X?b??KD?@?8 ?a Nt&??n?S??N??[?q[???=???,???2T ?I?[??f?q?l?u?y?9??Hg0/?;?P:??????)|??:??. ???}?????t???;/6??i?p??9?????a???????`?\?_Uf-?/f??Wl}s?`???F????????I?o{????>:?X!_?E??;?/??z????M??M??????G???M?A???????y???F?4N???[?????7?????NNN?'?+???????y1?{??{???4~?q-v??|9??;_? P? & -?MN\?9F`??????7(?X???I?2{???QWa&2?E?[?cR???Y???@?=??? L?? ?R?X(??l8a?? ?????J???lI?iX!???U ??K0?(????7?? ? [?0QD?6???k?qN?N?v???P?????6?7J???.0%?F??YE?GM???x? ?M?????)??]u??????9c????????s?,??GwDtr| ?r?????>O ?3;Nt??J?q{d????at?????j??L????N??%I???????V?2?@?????k???}c}?IB??9?`??+????d???n7?????????^ o?:? {j(N>u?G?>??A??z??t#??lo??Cz Fp?H5???(?[?????????? ???@??_(5????l??%9s# e?????????`py???????n???I'v?`?B??aP?.??E2???;?$?? ?EH??/??{3??????tu??*?L6 ?Y_???|'2^S???E???V???[?x.U??w???;v ?a?Q???_?l?>8n6~m?pm????62???9}>? ?Q:?V??jqk???=??R?h?s???T??K?<5???K???? ???+RbkX}4????xt??m????????[ ?2??~?????`?z????_?????:?XVf??{???'?F?????x???)c????/ &???8????Q?%{"qo?m??N???? Fs8D?R?????mU?[?x?lmq????? ?$?hU???!???_`|?KV?? ??( ?0p?FmX?%1C??=zz? F?V? ?=?? ?:? Y]_n???z??7?OS?"X?p??@?^?7???V?$????}`??1??2??J??4?-??Df?9??W%?r???W?????R?8?9; w?nA???????????3??}?B??i?????*U ???~????yx?9?>*??}???[>8?>?????mt???????????.??5?_??1? ?W?????[??2?????a?9?Qz??????k?^? J?+??Y???n?9M???#??f?[Z]Y~?^?Q"?,U???>f????deZ%??Gn??c)S?Z???R???? Z~???9?=q?Qm???????kZ?????z*O7_H?) ?rO????R????m??r[?*?}]?U????}??)K??6},?QyR?^?L????? ?w????1!bC+??X??&?O8?x???/;?Tw?n???x?e???[8Nw?z?G? (p?t??Je??s??????I[?$?at?~??5????9~??ZE?3z????????^??????????:j????????{y???.??;?z???????h4?ps{???W??8????N??D??c%??c????? '?|?????????>)??"????iy????????OtbyZ??F?+s?ql+?pqd d?G?f???4K4&?F??-'???O????2? nf??DS??n?VyW?V??+)??????a7(N?J=@?????8?R ?|?,?l????r?vb??}???$?:S.??G)???c8????m????j????Z?h??:?P?6GL?????M?\?{??%Y?L??????5h??,^???9?4 W??X/?^??c?P???10?.l?c?*P??%? ?< ?????Z???????a4???j3??kn??V?a?!?A????L|,??+?{?`????Q;v????????Ji??9??????uk?r????[???>5u??a? ?????p#??R???P???y?Zv??C???????VA)?`>????????????-?\]_3? d?? 4T??;}o ???U????W???? ???"?LV?? ?*??)??????K`??R??tF?&? ?#??r?4??q??8?v?#X??oRZ>R????R?kD?? ?????? ?%? Wg?#?f?????;Db??N???\2???P?'?m?w???q???????Z?? I?je???gV~Y?8?W71IIX??9 i?]???t??????n??z?pd?Kx?}??p/ ????Dl????]???20 4?U???Xir?@? ?? ?RfN?~??)x}X>Q?????-#?\7/?????%?@?H??????<;^??c??V??:h??2??e??6?????? Fd??N?\,??????\.?'?76????u/2?? Y?#?|?s? ??G??[Y??N??}???M???B??2????u";?K?????Z??2 ?I?qpr???b ??? ??&??;??8-7??b_>&?i??R?]3???#?P?!0h?A:Q,>"?? ???T????| ???XN?? ?G4@{??+ ??*&???&??nJ?@?O?????-?= ?????5-rw0\??R?NK9Z ?2?Q?5Ox????;?N R?w7??'?a?vrI k;???u????Y?*U?Pj??E????Jy? 4?Fv;-?.U??f?*?A?;Rvh?o??U??[}????=??/??.~??O?q?:h8:?X%q???????^\?U;&??i?$?`j????????^>?(~9?`?$.f??$???????A???????A??Jj1??????g??]G'}??$E??f??GW?nbJ?$e??????,)??H??EJ=/???????`BB????4???????uy?BSf??????g ?|k|Zsjr^??0???8?>??>^??~??*??????a??}X???M\?P:??Iy???D??????yF?7??!%U?0`(???8??????`r??P??~?uI\?9JZ"j@??qaR????p???R2??%+???????H???'T9v?LA???????0??&?^?`??n6????M?"?GK??|???^aD! ??m??0?"?????x?*?A?)??k????3?H?"?u@^???o??rI?Q??M????So??W?z?++?RL????de?*??????:bZ??k???????&?x{??~??f??P???????O r?M????N1 0V!?/?\"?1?JQBo?pt??????.?e???i?h?g??N~p$?n????W'x???????DH??J?-??????A???!????o??y?w???}???B,JZ?j8?N0???TD%?y6???|0?IFxr?G?a?U????????o?????:?n?+Z/?ze??ZY{)? @?U?Ia`??a?c"?r????{?1%?D?d?R$ r??S??u??(?} ?>?6?zd???;D????????X~??hBt??Ix????:??5E?-?D5???????)y??b.???V*+?????4 ??3B?@?w&???(\%?`[X????-????5j |?DM?Y?[b_9???E?"??xr??????W IK{~??/??wx?I??*1?z?????"????Z?;^X??V7?O???;? ??*?c?p?k???????????89?>*?????L??p6??G??P?}??eS???????z?? ? ?? ?haG ????U?????y#???????????9xQC?o7???.????v,??AE??1?????>???Qy??ZY???????????G??/?b?BP??:A?H[?X??J?x????05???? ???v@t_?pES??????%?56?&?~0?????;??? ?|?w?Y.Y?h?(TD?-@????0=p??J?rx2D ??f??????0?g ???????l;t??????RPh6??????U??L??F<?5?Q\AhHpn:?. ? U'???Z??p?#?h?jh/'?d??y?"0s???"???{?D?? `?c/e??m?n?J??:?Y?v ??{????u??8*n??w?_?)j????QH?g?O?70~?????8M??4i?Y.r3DB??0?:vIV?`\?t{?? j*???`M?+???Wc\W??Y?6???wzpx ?w??????[h???3?ww??Lfs?`??? ~ 3Eh?U?.)???+???^?9?a~s????RA?-?TK6,??,?x?>???v?????x??C???????q?k?O????`?? ??t*^R>????_S?????F????m???0??*&LA??;?# _? {??K? Fm?[?h????77w1??? ??U???vE;?f? ?`5?. N??p??kh??$????k??I??(7+{8??V?*?u ??V?I??'2G???~??|???uW(???:??`??gE?m'?? f???9?p???9??? yG?i?J??J?\-+0t#?????Ipp-??????H}R??????I?cB1 ????}`ow???Q???????????{??/l*n?'? ????'k?????5?A??????M&;???.#?B9???!??????Y?8?.??"??d7?H?c????&?+?8?? c ????^??|??I??Gy?.Wt? @ot?p61?9?????%B ?HrL#????j?tP?VB:?6b+ (??"???5is??-q?????/???G?qZ?B[?j: ?8g??? ??3?'?*???T?7??q????y$?Sp?joi(7w"Q(.???")B???1??!??6;?kV???i????V?1?G?W?r{??|p+.?o??????75??????P!?9K?h???:Sys?????`B??9t?Y???dN???IJ????2??u?@??ez%?,?\1qlH????y,???;?i?b??9?E??^o4A??a????L?a?'? ?9?=?(??????z7s??fb?>s?2+YJ?ZX?V?N??W?f- "???e?ql?Z?? +b??.{ ??-?i\????\??????? ?x??:s?+j??+&???? ???S?z????\?Y???P1?? >?o????fE????x8?2(G~?????.9IM?h???u??k??#j?ra ?????!???6#???Kw(v?? ?3]?)>???? .??????i+???J???T?^??? ????e??u6Q3?????c??S???\???]Y}??of?????t?????U??Lj???2qB]???>?????.??y???a%1???Nd???? Y???E??Vt?????N????A??0?u???? ?%>????H?I?a???=?Vy?rD??ZN:????????*#?Oky?%?|?????????/#-?????\?`?} ?q? ???s???3?`??RD?(??Oc!n??Y)???? ???s??l?Ox >E4???ELz1{?; ??8???????u????03_?r?ED???a???9jk?|????????uR??P???\?????V??\?mS?L??)?}????O+>f??h??b?<"D??4?g??>? ????#A?}Gdq??2k?e?J ?^s????&%6?4?g???*??L????[?,V???q8??JW???M_Q?M?=N???(??&D6?F?~????W'????E*M9?X?????i ?yO{"??????F|O??Q?_6??????Nz?????9?:?????????T?sffFS??~3????z3CD7?f??E5? ?\?+???'!F?Ec??M\??????q???? ??u??C???1u&g???r;,?J??]4 ?? MN ?hdH0?t?Me?hXb????????0?+?6??T?1??BgH?C?? hA?%? ?l?9Z?w????( ???O?w?x G!?R?z?@?0 | ?^??,??/???/~?`?k{]?,?????I? {L=?lmKK@???^0cH??4B???-?i???' tQ,??F"R?D?*?g{? K???Ku??)5?j??p?,???o5???F?S??vl??{"Kf$g`??J[h ???<x?>?9??/?Z;????G?:~?M??@??h??D? ?S=? ???????tE?????? ???y"4?`???E/??&)X?????????????'?r????\YJSH??k&???A??@m-US??? &?????? ??# 3??p??p4?G???>???????1K P? ???1???q????w&?!?LKlVG??>????????1V.eB???!K?????x?8???$@Y/N?T???I5 ?]??n?y??P;?[Qh,r? "A?H`?\H?3?????.)Da?????Pz!I0o?g????`^`? Y?>??^Y\|@?P???/???T?!?????H3??ax? +#???3?eU?J?HS5A???VD?X????/????}M?o?*??#??^?q???Td??? d" ?J????S?G????W????\?}8?4???A]?l?a????Y?6??%?????<|s????/[GG['?>??)K?g??? \fw??_B????^??????wr?{|???-?z??do????#???????]4F??"???t)?5??`A????B???+I[????????W7w"s? m?b?`?v??2.?????T???? ?e???N|d??????ar?= 1?$n@?S?r6?/? ?X???tn?? $??Kj?u????yym>??~??pE???N/:?@?+?(?Nf??(?i|?8?A?X(? ???mF??E?????y(2??`?)?0?4?????H?`\??!????SU???z_?z??????????^?n??=z?????/?{??R???Wa^?m9?>@???; \??Q?xp:?GqE 6?????????f?*R??&???tjn?][????h???Hj???'3?>??`4??7??D?B?vn?L?,?????4RE??4? O?R8M@? ??WX???KG~?Cb)9????] ???!??GL??uS?9T?G??? ?7 ?{& n=?8L n=&u?[??R#Lo?????D?> C5x??X?N,H&93?????h??% ????E>x??uE???H6???P?|[VU??????M?`?!??I?Z??I??+^fm??c???y????????&> ANF???????"?D?C?h???=cp?= I?????6?d?N???gT??U?????S???/v???73%?E?+?i????g?I??? >??a;(3?fI?v??6a!???J??????~?Z????}????m?`???3i????Gd:??L?????-?U?c?C?ZA????dD?=?.????(?B???ox ?Y|*?}o????????S/???%Y?????Hj? ][??:???)!&niw?Wd1m???c?"K??7??Q??1?b$? ?x` ??B?? E?R Yd?????D??7???C?!?C?Z???????M??_????@???b ???F??\T???4H4???H????.?q q?Zt??'?C? ?D?8?b 6???? ??.?*>???????!??[ bKR?E?GV?? =?????i???????N??????F?????????)?W?q??~3???V??{??.???????'??]m?M/\#??}? G at c??? ?????:?MX?PtX0?6???? /??o??1ZC????1?>'Q???d?Y?^\\T?? ?^?^??????a\?>??~/??M???z?J????????????#??;??G???x??? ?/??1???1ar???'#?_?H46?O?r ?Ga??`i????}z?Z?*??VU4E??- 0_l?6?h??u?X &?<:-???7??P?}6AK8bc?\? ?M|????????,M?]M????D?D??u???SU[??:?(n?? ?x??(%|???n??vS?+_\&?Z?07 GWCt??|]???????f??!O?]?/6?+5?????????=`?~ }0T?0??8A????G?????m':?~H??g?$???????????????U?;?q?????Z?????????sB?H??+Ts?`gk?|E ? hWa?vi??U?b??????????S???eR???????]y?k?????Kf?guMz????et5N?r????"1da??9c???s?/<?R?y??_?s???1=V??o???d??~?O??R?-0? :e????s??????????g? ?????r?5??Oy?? ?/J?^???e?D??$}?????ec ????St?uK"2T?7???wP?????>?_$?????]=nI??TjB%E]??M{?4???????7?#? ???m???B??(??2`%?[D??x? &??T?Tv?kpHA????1)Z??2??d?s?0 z???O?T??f4?????=????*)c?}????/??^? U?f0 `?????bg?lZ????7??gZ{g???Gl??^?]???L?j???p?{???????F??Z??+?ZA?e|?h)??:?}???NcfMXv?7??`?0??2? ???`?/??+d?hKg?@|T?&S?? "?O?.q??1^E?%?(??????>i'x???69l???36?*?6F&????n"6Y*????y???]??nSco???*???j5???@????[j?????tT?eT?'???????>???lI??????-VH ?V? rsnapshot.conf.patch: --- NEW FILE rsnapshot.conf.patch --- --- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 +++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 @@ -40,7 +40,7 @@ # # See the README file or the man page for more details. # -#@CMD_CP@ + at CMD_CP@ # uncomment this to use the rm program instead of the built-in perl routine. @CMD_RM@ @@ -55,7 +55,7 @@ @CMD_LOGGER@ # Uncomment this to specify a path to "du" for disk usage checks. -#@CMD_DU@ + at CMD_DU@ ######################################### # BACKUP INTERVALS # @@ -94,7 +94,7 @@ # If you enable this, data will be written to the file you specify. The # amount of data written is controlled by the "loglevel" parameter. -#logfile /var/log/rsnapshot +logfile /var/log/rsnapshot # The include and exclude parameters, if enabled, simply get passed directly # to rsync. If you have multiple include/exclude patterns, put each one on a @@ -138,7 +138,7 @@ # If you enable this, make sure the lockfile directory is not world # writable. Otherwise anyone can prevent the program from running. # -#lockfile /var/run/rsnapshot.pid +lockfile /var/run/rsnapshot.pid # If enabled, rsnapshot will move the oldest directory for each interval # to [interval_name].delete, then it will delete that directory as a Index: rsnapshot.spec =================================================================== RCS file: rsnapshot.spec diff -N rsnapshot.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.spec 21 May 2006 03:43:08 -0000 1.7 @@ -0,0 +1,161 @@ +# +# Specfile for rsnapshot +# + +Name: rsnapshot +Version: 1.2.3 +Release: 2 +Summary: Local and remote filesystem snapshot utility + +Group: Applications/System +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ + +%description +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ + +%prep + +%setup -q + +%patch + +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + +%build +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ + +%post + +%define logmsg logger -t %{name}/rpm + +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ + +%clean + +rm -rf $RPM_BUILD_ROOT + +################################################################################ + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ +%config(noreplace) %{_sysconfdir}/rsnapshot.conf +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ + +%changelog + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines + +* Sun Jan 29 2005 Nathan Rosenquist +- Added upgrade script + +* Sat Jan 22 2005 Nathan Rosenquist +- Added --with-du option + +* Thu Jan 15 2004 Nathan Rosenquist +- Added "AutoReqProv: no" for SuSE compatibility + +* Fri Dec 26 2003 Nathan Rosenquist +- Added util-linux dependency, and --with-logger= option + +* Fri Dec 19 2003 Nathan Rosenquist +- now fully support autoconf + +* Tue Dec 16 2003 Nathan Rosenquist +- changed rsnapshot.conf to rsnapshot.conf.default from the source tree + +* Wed Nov 05 2003 Nathan Rosenquist +- Removed fileutils dependency, added verification info + +* Tue Nov 04 2003 Nathan Rosenquist +- fixed anonymous rsync error + +* Thu Oct 30 2003 Nathan Rosenquist +- update to 1.0.3 + +* Tue Oct 28 2003 Carl Wilhelm Soderstrom +- created spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 21 May 2006 03:43:08 -0000 1.5 @@ -0,0 +1 @@ +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz From fedora-extras-commits at redhat.com Sun May 21 04:06:36 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:06:36 -0700 Subject: rpms/rsnapshot/FC-4 Makefile, 1.3, NONE rsnapshot-1.2.3.tar.gz, 1.1, NONE rsnapshot.conf.patch, 1.1, NONE rsnapshot.spec, 1.7, NONE sources, 1.5, NONE Message-ID: <200605210406.k4L46ctE025819@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25791/FC-4 Removed Files: Makefile rsnapshot-1.2.3.tar.gz rsnapshot.conf.patch rsnapshot.spec sources Log Message: back out of previous commits -- still learning this stuff --- Makefile DELETED --- --- rsnapshot-1.2.3.tar.gz DELETED --- --- rsnapshot.conf.patch DELETED --- --- rsnapshot.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sun May 21 04:06:37 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:06:37 -0700 Subject: rpms/rsnapshot/FC-5 Makefile, 1.3, NONE rsnapshot-1.2.3.tar.gz, 1.1, NONE rsnapshot.conf.patch, 1.1, NONE rsnapshot.spec, 1.7, NONE sources, 1.5, NONE Message-ID: <200605210406.k4L46d58025822@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25791/FC-5 Removed Files: Makefile rsnapshot-1.2.3.tar.gz rsnapshot.conf.patch rsnapshot.spec sources Log Message: back out of previous commits -- still learning this stuff --- Makefile DELETED --- --- rsnapshot-1.2.3.tar.gz DELETED --- --- rsnapshot.conf.patch DELETED --- --- rsnapshot.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sun May 21 04:14:28 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:14:28 -0700 Subject: rpms/rsnapshot/FC-5 Makefile, 1.4, 1.5 rsnapshot.conf.patch, 1.2, 1.3 rsnapshot.spec, 1.8, 1.9 sources, 1.6, 1.7 .cvsignore, 1.3, 1.4 Message-ID: <200605210414.k4L4EVuS025964@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25936 Modified Files: .cvsignore Added Files: Makefile rsnapshot.conf.patch rsnapshot.spec sources Log Message: second try to get 1.2.3 and an actual file put into fc5 Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 21 May 2006 04:14:28 -0000 1.5 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rsnapshot +# $Id$ +NAME := rsnapshot +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) rsnapshot.conf.patch: Index: rsnapshot.conf.patch =================================================================== RCS file: rsnapshot.conf.patch diff -N rsnapshot.conf.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.conf.patch 21 May 2006 04:14:28 -0000 1.3 @@ -0,0 +1,38 @@ +--- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 ++++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 +@@ -40,7 +40,7 @@ + # + # See the README file or the man page for more details. + # +-#@CMD_CP@ ++ at CMD_CP@ + + # uncomment this to use the rm program instead of the built-in perl routine. + @CMD_RM@ +@@ -55,7 +55,7 @@ + @CMD_LOGGER@ + + # Uncomment this to specify a path to "du" for disk usage checks. +-#@CMD_DU@ ++ at CMD_DU@ + + ######################################### + # BACKUP INTERVALS # +@@ -94,7 +94,7 @@ + + # If you enable this, data will be written to the file you specify. The + # amount of data written is controlled by the "loglevel" parameter. +-#logfile /var/log/rsnapshot ++logfile /var/log/rsnapshot + + # The include and exclude parameters, if enabled, simply get passed directly + # to rsync. If you have multiple include/exclude patterns, put each one on a +@@ -138,7 +138,7 @@ + # If you enable this, make sure the lockfile directory is not world + # writable. Otherwise anyone can prevent the program from running. + # +-#lockfile /var/run/rsnapshot.pid ++lockfile /var/run/rsnapshot.pid + + # If enabled, rsnapshot will move the oldest directory for each interval + # to [interval_name].delete, then it will delete that directory as a Index: rsnapshot.spec =================================================================== RCS file: rsnapshot.spec diff -N rsnapshot.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.spec 21 May 2006 04:14:28 -0000 1.9 @@ -0,0 +1,161 @@ +# +# Specfile for rsnapshot +# + +Name: rsnapshot +Version: 1.2.3 +Release: 2 +Summary: Local and remote filesystem snapshot utility + +Group: Applications/System +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ + +%description +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ + +%prep + +%setup -q + +%patch + +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + +%build +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ + +%post + +%define logmsg logger -t %{name}/rpm + +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ + +%clean + +rm -rf $RPM_BUILD_ROOT + +################################################################################ + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ +%config(noreplace) %{_sysconfdir}/rsnapshot.conf +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ + +%changelog + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines + +* Sun Jan 29 2005 Nathan Rosenquist +- Added upgrade script + +* Sat Jan 22 2005 Nathan Rosenquist +- Added --with-du option + +* Thu Jan 15 2004 Nathan Rosenquist +- Added "AutoReqProv: no" for SuSE compatibility + +* Fri Dec 26 2003 Nathan Rosenquist +- Added util-linux dependency, and --with-logger= option + +* Fri Dec 19 2003 Nathan Rosenquist +- now fully support autoconf + +* Tue Dec 16 2003 Nathan Rosenquist +- changed rsnapshot.conf to rsnapshot.conf.default from the source tree + +* Wed Nov 05 2003 Nathan Rosenquist +- Removed fileutils dependency, added verification info + +* Tue Nov 04 2003 Nathan Rosenquist +- fixed anonymous rsync error + +* Thu Oct 30 2003 Nathan Rosenquist +- update to 1.0.3 + +* Tue Oct 28 2003 Carl Wilhelm Soderstrom +- created spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 21 May 2006 04:14:28 -0000 1.7 @@ -0,0 +1 @@ +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Apr 2005 11:07:19 -0000 1.3 +++ .cvsignore 21 May 2006 04:14:28 -0000 1.4 @@ -1 +1 @@ -rsnapshot-1.2.1.tar.gz +rsnapshot-1.2.3.tar.gz From fedora-extras-commits at redhat.com Sun May 21 04:20:15 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:20:15 -0700 Subject: rpms/rsnapshot/devel rsnapshot.spec,1.6,1.7 Message-ID: <200605210420.k4L4KHZD026034@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26017 Modified Files: rsnapshot.spec Log Message: add %{?dist} macro Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rsnapshot.spec 19 May 2006 23:34:16 -0000 1.6 +++ rsnapshot.spec 21 May 2006 04:20:15 -0000 1.7 @@ -4,7 +4,7 @@ Name: rsnapshot Version: 1.2.3 -Release: 2 +Release: 2%{?dist} Summary: Local and remote filesystem snapshot utility Group: Applications/System From fedora-extras-commits at redhat.com Sun May 21 04:21:38 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:21:38 -0700 Subject: rpms/rsnapshot/FC-5 rsnapshot.spec,1.9,1.10 Message-ID: <200605210421.k4L4LeHs026100@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26083 Modified Files: rsnapshot.spec Log Message: add %{?dist} macro Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/FC-5/rsnapshot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rsnapshot.spec 21 May 2006 04:14:28 -0000 1.9 +++ rsnapshot.spec 21 May 2006 04:21:38 -0000 1.10 @@ -4,7 +4,7 @@ Name: rsnapshot Version: 1.2.3 -Release: 2 +Release: 2%{?dist} Summary: Local and remote filesystem snapshot utility Group: Applications/System From fedora-extras-commits at redhat.com Sun May 21 04:26:27 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:26:27 -0700 Subject: rpms/rsnapshot/FC-4 Makefile, 1.4, 1.5 rsnapshot.conf.patch, 1.2, 1.3 rsnapshot.spec, 1.8, 1.9 sources, 1.6, 1.7 .cvsignore, 1.3, 1.4 Message-ID: <200605210426.k4L4QTN6026197@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26169 Modified Files: .cvsignore Added Files: Makefile rsnapshot.conf.patch rsnapshot.spec sources Log Message: second try to get 1.2.3 and an actual file put into fc4 Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 21 May 2006 04:26:27 -0000 1.5 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rsnapshot +# $Id$ +NAME := rsnapshot +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) rsnapshot.conf.patch: Index: rsnapshot.conf.patch =================================================================== RCS file: rsnapshot.conf.patch diff -N rsnapshot.conf.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.conf.patch 21 May 2006 04:26:27 -0000 1.3 @@ -0,0 +1,38 @@ +--- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 ++++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 +@@ -40,7 +40,7 @@ + # + # See the README file or the man page for more details. + # +-#@CMD_CP@ ++ at CMD_CP@ + + # uncomment this to use the rm program instead of the built-in perl routine. + @CMD_RM@ +@@ -55,7 +55,7 @@ + @CMD_LOGGER@ + + # Uncomment this to specify a path to "du" for disk usage checks. +-#@CMD_DU@ ++ at CMD_DU@ + + ######################################### + # BACKUP INTERVALS # +@@ -94,7 +94,7 @@ + + # If you enable this, data will be written to the file you specify. The + # amount of data written is controlled by the "loglevel" parameter. +-#logfile /var/log/rsnapshot ++logfile /var/log/rsnapshot + + # The include and exclude parameters, if enabled, simply get passed directly + # to rsync. If you have multiple include/exclude patterns, put each one on a +@@ -138,7 +138,7 @@ + # If you enable this, make sure the lockfile directory is not world + # writable. Otherwise anyone can prevent the program from running. + # +-#lockfile /var/run/rsnapshot.pid ++lockfile /var/run/rsnapshot.pid + + # If enabled, rsnapshot will move the oldest directory for each interval + # to [interval_name].delete, then it will delete that directory as a Index: rsnapshot.spec =================================================================== RCS file: rsnapshot.spec diff -N rsnapshot.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.spec 21 May 2006 04:26:27 -0000 1.9 @@ -0,0 +1,161 @@ +# +# Specfile for rsnapshot +# + +Name: rsnapshot +Version: 1.2.3 +Release: 2%{?dist} +Summary: Local and remote filesystem snapshot utility + +Group: Applications/System +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ + +%description +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ + +%prep + +%setup -q + +%patch + +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + +%build +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ + +%post + +%define logmsg logger -t %{name}/rpm + +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ + +%clean + +rm -rf $RPM_BUILD_ROOT + +################################################################################ + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ +%config(noreplace) %{_sysconfdir}/rsnapshot.conf +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ + +%changelog + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines + +* Sun Jan 29 2005 Nathan Rosenquist +- Added upgrade script + +* Sat Jan 22 2005 Nathan Rosenquist +- Added --with-du option + +* Thu Jan 15 2004 Nathan Rosenquist +- Added "AutoReqProv: no" for SuSE compatibility + +* Fri Dec 26 2003 Nathan Rosenquist +- Added util-linux dependency, and --with-logger= option + +* Fri Dec 19 2003 Nathan Rosenquist +- now fully support autoconf + +* Tue Dec 16 2003 Nathan Rosenquist +- changed rsnapshot.conf to rsnapshot.conf.default from the source tree + +* Wed Nov 05 2003 Nathan Rosenquist +- Removed fileutils dependency, added verification info + +* Tue Nov 04 2003 Nathan Rosenquist +- fixed anonymous rsync error + +* Thu Oct 30 2003 Nathan Rosenquist +- update to 1.0.3 + +* Tue Oct 28 2003 Carl Wilhelm Soderstrom +- created spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 21 May 2006 04:26:27 -0000 1.7 @@ -0,0 +1 @@ +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Apr 2005 11:07:19 -0000 1.3 +++ .cvsignore 21 May 2006 04:26:27 -0000 1.4 @@ -1 +1 @@ -rsnapshot-1.2.1.tar.gz +rsnapshot-1.2.3.tar.gz From fedora-extras-commits at redhat.com Sun May 21 04:30:22 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:30:22 -0700 Subject: rpms/orpie/devel orpie.spec,1.2,1.3 Message-ID: <200605210430.k4L4UO9E026284@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26267 Modified Files: orpie.spec Log Message: add %{?dist} to release tag Index: orpie.spec =================================================================== RCS file: /cvs/extras/rpms/orpie/devel/orpie.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- orpie.spec 20 May 2006 00:14:40 -0000 1.2 +++ orpie.spec 21 May 2006 04:30:22 -0000 1.3 @@ -4,7 +4,7 @@ Name: orpie Version: 1.4.3 -Release: 4 +Release: 4%{?dist} Summary: A fullscreen console-based RPN calculator Group: Applications/Engineering From fedora-extras-commits at redhat.com Sun May 21 05:36:26 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 20 May 2006 22:36:26 -0700 Subject: rpms/MochiKit/devel .cvsignore, 1.2, 1.3 MochiKit.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605210536.k4L5aSWA029030@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/MochiKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29009 Modified Files: .cvsignore MochiKit.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/MochiKit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Feb 2006 02:51:34 -0000 1.2 +++ .cvsignore 21 May 2006 05:36:26 -0000 1.3 @@ -1 +1 @@ -MochiKit-1.2.zip +MochiKit-1.3.1.zip Index: MochiKit.spec =================================================================== RCS file: /cvs/extras/rpms/MochiKit/devel/MochiKit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MochiKit.spec 15 Feb 2006 02:51:34 -0000 1.1 +++ MochiKit.spec 21 May 2006 05:36:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: MochiKit -Version: 1.2 +Version: 1.3.1 Release: 1%{?dist} Summary: A lightweight JavaScript library @@ -41,5 +41,8 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %changelog +* Sun May 21 2006 Ignacio Vazquez-Abrams 1.3.1-1 +- Upstream update + * Sun Feb 12 2006 Ignacio Vazquez-Abrams 1.2-1 - Initial RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/MochiKit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Feb 2006 02:51:34 -0000 1.2 +++ sources 21 May 2006 05:36:26 -0000 1.3 @@ -1 +1 @@ -1a22e956ea2cabe04bad99878986b952 MochiKit-1.2.zip +4b744fb425a6dcf3f9e0a3bc8d1ebc7c MochiKit-1.3.1.zip From fedora-extras-commits at redhat.com Sun May 21 05:41:15 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:41:15 -0700 Subject: rpms/perl-Class-Inspector/devel .cvsignore, 1.4, 1.5 perl-Class-Inspector.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605210541.k4L5fH09029114@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29093 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 21 2006 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 May 2006 03:56:49 -0000 1.4 +++ .cvsignore 21 May 2006 05:41:15 -0000 1.5 @@ -1 +1 @@ -Class-Inspector-1.15.tar.gz +Class-Inspector-1.16.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-Inspector.spec 8 May 2006 03:56:49 -0000 1.6 +++ perl-Class-Inspector.spec 21 May 2006 05:41:15 -0000 1.7 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.15 +Version: 1.16 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 21 2006 Ralf Cors??pius - 1.16-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2006 03:56:49 -0000 1.4 +++ sources 21 May 2006 05:41:15 -0000 1.5 @@ -1 +1 @@ -b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz +46eeeeb5a5df0da03f4e53229f7ed360 Class-Inspector-1.16.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:42:37 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:42:37 -0700 Subject: rpms/perl-Class-Inspector/FC-5 .cvsignore, 1.4, 1.5 perl-Class-Inspector.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605210542.k4L5gdHv029186@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29165 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 21 2006 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 May 2006 04:23:32 -0000 1.4 +++ .cvsignore 21 May 2006 05:42:36 -0000 1.5 @@ -1 +1 @@ -Class-Inspector-1.15.tar.gz +Class-Inspector-1.16.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/perl-Class-Inspector.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-Inspector.spec 8 May 2006 04:23:32 -0000 1.6 +++ perl-Class-Inspector.spec 21 May 2006 05:42:36 -0000 1.7 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.15 +Version: 1.16 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 21 2006 Ralf Cors??pius - 1.16-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2006 04:23:32 -0000 1.4 +++ sources 21 May 2006 05:42:36 -0000 1.5 @@ -1 +1 @@ -b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz +46eeeeb5a5df0da03f4e53229f7ed360 Class-Inspector-1.16.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:45:59 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:45:59 -0700 Subject: rpms/perl-Class-Inspector/FC-4 .cvsignore, 1.4, 1.5 perl-Class-Inspector.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605210546.k4L5k1m5029265@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29244 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 21 2006 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 May 2006 04:25:33 -0000 1.4 +++ .cvsignore 21 May 2006 05:45:59 -0000 1.5 @@ -1 +1 @@ -Class-Inspector-1.15.tar.gz +Class-Inspector-1.16.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/perl-Class-Inspector.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Inspector.spec 8 May 2006 04:25:33 -0000 1.5 +++ perl-Class-Inspector.spec 21 May 2006 05:45:59 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.15 +Version: 1.16 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 21 2006 Ralf Cors??pius - 1.16-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2006 04:25:33 -0000 1.4 +++ sources 21 May 2006 05:45:59 -0000 1.5 @@ -1 +1 @@ -b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz +46eeeeb5a5df0da03f4e53229f7ed360 Class-Inspector-1.16.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:53:04 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:53:04 -0700 Subject: rpms/perl-File-Find-Rule/devel .cvsignore, 1.2, 1.3 perl-File-Find-Rule.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605210553.k4L5r6hJ029353@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29331 Modified Files: .cvsignore perl-File-Find-Rule.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.29-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 +++ .cvsignore 21 May 2006 05:53:03 -0000 1.3 @@ -1 +1 @@ -File-Find-Rule-0.28.tar.gz +File-Find-Rule-0.29.tar.gz Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/perl-File-Find-Rule.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Find-Rule.spec 28 Feb 2006 22:36:27 -0000 1.3 +++ perl-File-Find-Rule.spec 21 May 2006 05:53:03 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule -Version: 0.28 -Release: 4%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.29-1 +- Upstream update. + * Tue Feb 28 2006 Ralf Cors??pius - 0.28-4 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Aug 2005 16:37:06 -0000 1.2 +++ sources 21 May 2006 05:53:03 -0000 1.3 @@ -1 +1 @@ -b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz +3342f3ead4f9470d391a3e3a90f9f5ce File-Find-Rule-0.29.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:55:01 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:55:01 -0700 Subject: rpms/perl-File-Find-Rule/FC-5 .cvsignore, 1.2, 1.3 perl-File-Find-Rule.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605210555.k4L5t3dr029385@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29364 Modified Files: .cvsignore perl-File-Find-Rule.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.29-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 +++ .cvsignore 21 May 2006 05:55:00 -0000 1.3 @@ -1 +1 @@ -File-Find-Rule-0.28.tar.gz +File-Find-Rule-0.29.tar.gz Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-5/perl-File-Find-Rule.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Find-Rule.spec 28 Feb 2006 22:36:27 -0000 1.3 +++ perl-File-Find-Rule.spec 21 May 2006 05:55:00 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule -Version: 0.28 -Release: 4%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.29-1 +- Upstream update. + * Tue Feb 28 2006 Ralf Cors??pius - 0.28-4 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Aug 2005 16:37:06 -0000 1.2 +++ sources 21 May 2006 05:55:00 -0000 1.3 @@ -1 +1 @@ -b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz +3342f3ead4f9470d391a3e3a90f9f5ce File-Find-Rule-0.29.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:58:37 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:58:37 -0700 Subject: rpms/perl-File-Find-Rule/FC-4 .cvsignore, 1.2, 1.3 perl-File-Find-Rule.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605210558.k4L5wdw0029498@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29477 Modified Files: .cvsignore perl-File-Find-Rule.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.29-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 +++ .cvsignore 21 May 2006 05:58:36 -0000 1.3 @@ -1 +1 @@ -File-Find-Rule-0.28.tar.gz +File-Find-Rule-0.29.tar.gz Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-4/perl-File-Find-Rule.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-Find-Rule.spec 16 Aug 2005 16:41:28 -0000 1.2 +++ perl-File-Find-Rule.spec 21 May 2006 05:58:36 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule -Version: 0.28 -Release: 3%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.29-1 +- Upstream update. + * Tue Aug 16 2005 Ralf Corsepius - 0.28-3 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Aug 2005 16:37:06 -0000 1.2 +++ sources 21 May 2006 05:58:36 -0000 1.3 @@ -1 +1 @@ -b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz +3342f3ead4f9470d391a3e3a90f9f5ce File-Find-Rule-0.29.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:00:22 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 23:00:22 -0700 Subject: rpms/perl-File-Find-Rule/FC-3 .cvsignore, 1.2, 1.3 perl-File-Find-Rule.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605210600.k4L60OML029581@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29559 Modified Files: .cvsignore perl-File-Find-Rule.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.29-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 +++ .cvsignore 21 May 2006 06:00:22 -0000 1.3 @@ -1 +1 @@ -File-Find-Rule-0.28.tar.gz +File-Find-Rule-0.29.tar.gz Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-3/perl-File-Find-Rule.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-Find-Rule.spec 16 Aug 2005 16:41:28 -0000 1.2 +++ perl-File-Find-Rule.spec 21 May 2006 06:00:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule -Version: 0.28 -Release: 3%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.29-1 +- Upstream update. + * Tue Aug 16 2005 Ralf Corsepius - 0.28-3 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Aug 2005 16:37:06 -0000 1.2 +++ sources 21 May 2006 06:00:22 -0000 1.3 @@ -1 +1 @@ -b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz +3342f3ead4f9470d391a3e3a90f9f5ce File-Find-Rule-0.29.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:14:05 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 23:14:05 -0700 Subject: rpms/perl-Params-Util/devel .cvsignore, 1.9, 1.10 perl-Params-Util.spec, 1.9, 1.10 sources, 1.9, 1.10 Message-ID: <200605210614.k4L6E7K7031931@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31910 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.14-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 May 2006 04:00:18 -0000 1.9 +++ .cvsignore 21 May 2006 06:14:05 -0000 1.10 @@ -1 +1 @@ -Params-Util-0.13.tar.gz +Params-Util-0.14.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Params-Util.spec 8 May 2006 04:00:18 -0000 1.9 +++ perl-Params-Util.spec 21 May 2006 06:14:05 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.14-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 May 2006 04:00:18 -0000 1.9 +++ sources 21 May 2006 06:14:05 -0000 1.10 @@ -1 +1 @@ -1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz +683689462ebfa30609fb5641a2658a21 Params-Util-0.14.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:17:06 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 23:17:06 -0700 Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.9, 1.10 perl-Params-Util.spec, 1.9, 1.10 sources, 1.9, 1.10 Message-ID: <200605210617.k4L6H8Ke032016@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31995 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.14-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 May 2006 04:19:41 -0000 1.9 +++ .cvsignore 21 May 2006 06:17:06 -0000 1.10 @@ -1 +1 @@ -Params-Util-0.13.tar.gz +Params-Util-0.14.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Params-Util.spec 8 May 2006 04:19:41 -0000 1.9 +++ perl-Params-Util.spec 21 May 2006 06:17:06 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.14-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 May 2006 04:19:41 -0000 1.9 +++ sources 21 May 2006 06:17:06 -0000 1.10 @@ -1 +1 @@ -1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz +683689462ebfa30609fb5641a2658a21 Params-Util-0.14.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:19:07 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 23:19:07 -0700 Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.9, 1.10 perl-Params-Util.spec, 1.8, 1.9 sources, 1.9, 1.10 Message-ID: <200605210619.k4L6J9QN032097@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32074 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.14-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 May 2006 04:20:46 -0000 1.9 +++ .cvsignore 21 May 2006 06:19:07 -0000 1.10 @@ -1 +1 @@ -Params-Util-0.13.tar.gz +Params-Util-0.14.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Params-Util.spec 8 May 2006 04:20:46 -0000 1.8 +++ perl-Params-Util.spec 21 May 2006 06:19:07 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.14-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 May 2006 04:20:46 -0000 1.9 +++ sources 21 May 2006 06:19:07 -0000 1.10 @@ -1 +1 @@ -1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz +683689462ebfa30609fb5641a2658a21 Params-Util-0.14.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:38:56 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 23:38:56 -0700 Subject: fedora-security/audit fe4,1.29,1.30 fe5,1.27,1.28 Message-ID: <200605210638.k4L6cuhV032235@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32215 Modified Files: fe4 fe5 Log Message: Note CVE-2006-1695 (fbida, fixed). Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- fe4 20 May 2006 09:55:18 -0000 1.29 +++ fe4 21 May 2006 06:38:53 -0000 1.30 @@ -36,6 +36,7 @@ CVE-2006-1724 version (seamonkey, fixed 1.0.1) CVE-2006-1723 version (seamonkey, fixed 1.0.1) CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1695 patch (fbida, fixed 2.03-6) bz#189721 CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- fe5 20 May 2006 09:55:18 -0000 1.27 +++ fe5 21 May 2006 06:38:53 -0000 1.28 @@ -37,6 +37,7 @@ CVE-2006-1724 version (seamonkey, fixed 1.0.1) CVE-2006-1723 version (seamonkey, fixed 1.0.1) CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1695 patch (fbida, fixed 2.03-11) bz#189721 CVE-2006-1656 version (util-vserver, fixed 0.30.210) CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 From fedora-extras-commits at redhat.com Sun May 21 07:54:44 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 21 May 2006 00:54:44 -0700 Subject: rpms/sylpheed-claws-plugins/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sylpheed-claws-plugins.spec, 1.12, 1.13 sylpheed-claws-plugins-smime.patch, 1.1, NONE Message-ID: <200605210754.k4L7skrZ002278@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2241/FC-5 Modified Files: .cvsignore sources sylpheed-claws-plugins.spec Removed Files: sylpheed-claws-plugins-smime.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Apr 2006 00:34:35 -0000 1.5 +++ .cvsignore 21 May 2006 07:54:44 -0000 1.6 @@ -1 +1 @@ -sylpheed-claws-extra-plugins-2.1.0.tar.bz2 +sylpheed-claws-extra-plugins-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Apr 2006 00:34:35 -0000 1.5 +++ sources 21 May 2006 07:54:44 -0000 1.6 @@ -1 +1 @@ -c15f7bd52ebed8c9c9163c8a8e593c5d sylpheed-claws-extra-plugins-2.1.0.tar.bz2 +118a3f23dc9b7898518cf515b2e6dc19 sylpheed-claws-extra-plugins-2.2.0.tar.bz2 Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sylpheed-claws-plugins.spec 22 Apr 2006 01:17:50 -0000 1.12 +++ sylpheed-claws-plugins.spec 21 May 2006 07:54:44 -0000 1.13 @@ -1,5 +1,5 @@ Name: sylpheed-claws-plugins -Version: 2.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: Additional plugins for sylpheed-claws @@ -7,7 +7,7 @@ License: GPL URL: http://claws.sylpheed.org Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2 -Patch0: sylpheed-claws-plugins-smime.patch +#Patch0: sylpheed-claws-plugins-smime.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sylpheed-claws-devel >= %{version} @@ -183,83 +183,81 @@ %prep %setup -q -n sylpheed-claws-extra-plugins-%{version} -%patch0 %build - #acpi_notifier -cd acpi_notifier-1.0 +cd acpi_notifier-1.0.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #att_remover -cd ../att_remover-1.0 +cd ../att_remover-1.0.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} # cachesaver -cd ../cachesaver-0.7 +cd ../cachesaver-0.8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #etpan-privacy -cd ../etpan-privacy-0.13 +cd ../etpan-privacy-0.14 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.12 +cd ../fetchinfo-plugin-0.4.13 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #gtkhtml2-viewer -cd ../gtkhtml2_viewer-0.8 +cd ../gtkhtml2_viewer-0.10 %configure --disable-static --disable-dependency-tracking --disable-rpath %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool #maildir -cd ../maildir-0.20 +cd ../maildir-0.22 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #mailmbox -cd ../mailmbox-1.11 +cd ../mailmbox-1.12 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #newmail -cd ../newmail-0.0.3 +cd ../newmail-0.0.4 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #notification-plugin -cd ../notification_plugin-0.1 +cd ../notification_plugin-0.1.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #perl -cd ../perl_plugin-0.9 +cd ../perl_plugin-0.9.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #rssyl -cd ../rssyl-0.4cvs6 +cd ../rssyl-0.4cvs8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool #smime -cd ../smime-0.5 +cd ../smime-0.5.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #synce -cd ../synce_plugin-0.6 +cd ../synce_plugin-0.6.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #vcalendar -cd ../vcalendar-1.71 +cd ../vcalendar-1.78 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -267,64 +265,79 @@ rm -rf $RPM_BUILD_ROOT # acpi_notifier -cd acpi_notifier-1.0 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd acpi_notifier-1.0.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + # att_remover -cd ../att_remover-1.0 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../att_remover-1.0.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + # cachesaver -cd ../cachesaver-0.7 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../cachesaver-0.8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #etpan-privacy -cd ../etpan-privacy-0.13 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../etpan-privacy-0.14 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.12 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../fetchinfo-plugin-0.4.13 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #gtkhtml2-viewer -cd ../gtkhtml2_viewer-0.8 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../gtkhtml2_viewer-0.10 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #maildir -cd ../maildir-0.20 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../maildir-0.22 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #mailmbox -cd ../mailmbox-1.11 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../mailmbox-1.12 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #newmail -cd ../newmail-0.0.3 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../newmail-0.0.4 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #notification-plugin -cd ../notification_plugin-0.1 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../notification_plugin-0.1.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #perl -cd ../perl_plugin-0.9 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../perl_plugin-0.9.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #rssyl -cd ../rssyl-0.4cvs6 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../rssyl-0.4cvs8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #smime -cd ../smime-0.5 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../smime-0.5.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #synce -cd ../synce_plugin-0.6 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../synce_plugin-0.6.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #vcalendar -cd ../vcalendar-1.71 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../vcalendar-1.78 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -337,11 +350,11 @@ %files acpi-notifier %defattr(-,root,root,-) -%doc acpi_notifier-1.0/ChangeLog -%doc acpi_notifier-1.0/COPYING -%doc acpi_notifier-1.0/NEWS -%doc acpi_notifier-1.0/AUTHORS -%doc acpi_notifier-1.0/README +%doc acpi_notifier-1.0.1/ChangeLog +%doc acpi_notifier-1.0.1/COPYING +%doc acpi_notifier-1.0.1/NEWS +%doc acpi_notifier-1.0.1/AUTHORS +%doc acpi_notifier-1.0.1/README %{_libdir}/sylpheed-claws/plugins/acpi_notifier* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo @@ -356,93 +369,94 @@ %files att-remover %defattr(-,root,root,-) -%doc att_remover-1.0/AUTHORS -%doc att_remover-1.0/ChangeLog -%doc att_remover-1.0/COPYING -%doc att_remover-1.0/NEWS -%doc att_remover-1.0/README +%doc att_remover-1.0.1/AUTHORS +%doc att_remover-1.0.1/ChangeLog +%doc att_remover-1.0.1/COPYING +%doc att_remover-1.0.1/NEWS +%doc att_remover-1.0.1/README %{_libdir}/sylpheed-claws/plugins/att_remover* %files cachesaver %defattr(-,root,root,-) -%doc cachesaver-0.7/AUTHORS -%doc cachesaver-0.7/ChangeLog -%doc cachesaver-0.7/COPYING +%doc cachesaver-0.8/AUTHORS +%doc cachesaver-0.8/ChangeLog +%doc cachesaver-0.8/COPYING %{_libdir}/sylpheed-claws/plugins/cachesaver* %files etpan-privacy %defattr(-,root,root,-) -%doc etpan-privacy-0.13/AUTHORS -%doc etpan-privacy-0.13/ChangeLog -%doc etpan-privacy-0.13/COPYING -%doc etpan-privacy-0.13/README +%doc etpan-privacy-0.14/AUTHORS +%doc etpan-privacy-0.14/ChangeLog +%doc etpan-privacy-0.14/COPYING +%doc etpan-privacy-0.14/README %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so %files fetchinfo %defattr(-,root,root,-) -%doc fetchinfo-plugin-0.4.12/ChangeLog -%doc fetchinfo-plugin-0.4.12/COPYING -%doc fetchinfo-plugin-0.4.12/README +%doc fetchinfo-plugin-0.4.13/ChangeLog +%doc fetchinfo-plugin-0.4.13/COPYING +%doc fetchinfo-plugin-0.4.13/README %{_libdir}/sylpheed-claws/plugins/fetchinfo* %files gtkhtml2-viewer %defattr(-,root,root,-) -%doc gtkhtml2_viewer-0.8/AUTHORS -%doc gtkhtml2_viewer-0.8/COPYING +%doc gtkhtml2_viewer-0.10/AUTHORS +%doc gtkhtml2_viewer-0.10/COPYING %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer* %lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo %files maildir %defattr(-,root,root,-) -%doc maildir-0.20/AUTHORS -%doc maildir-0.20/ChangeLog -%doc maildir-0.20/COPYING -%doc maildir-0.20/README -%doc maildir-0.20/doc/README.xml +%doc maildir-0.22/AUTHORS +%doc maildir-0.22/ChangeLog +%doc maildir-0.22/COPYING +%doc maildir-0.22/README +%doc maildir-0.22/doc/README.xml %{_libdir}/sylpheed-claws/plugins/maildir* %files mailmbox %defattr(-,root,root,-) -%doc mailmbox-1.11/AUTHORS -%doc mailmbox-1.11/ChangeLog -%doc mailmbox-1.11/COPYING -%doc mailmbox-1.11/README +%doc mailmbox-1.12/AUTHORS +%doc mailmbox-1.12/ChangeLog +%doc mailmbox-1.12/COPYING +%doc mailmbox-1.12/README %{_libdir}/sylpheed-claws/plugins/mailmbox* %files newmail %defattr(-,root,root,-) -%doc newmail-0.0.3/AUTHORS -%doc newmail-0.0.3/ChangeLog -%doc newmail-0.0.3/COPYING -%doc newmail-0.0.3/NEWS -%doc newmail-0.0.3/README +%doc newmail-0.0.4/AUTHORS +%doc newmail-0.0.4/ChangeLog +%doc newmail-0.0.4/COPYING +%doc newmail-0.0.4/NEWS +%doc newmail-0.0.4/README %{_libdir}/sylpheed-claws/plugins/newmail.so %files notification %defattr(-,root,root,-) -%doc notification_plugin-0.1/AUTHORS -%doc notification_plugin-0.1/ChangeLog -%doc notification_plugin-0.1/COPYING -%doc notification_plugin-0.1/README +%doc notification_plugin-0.1.2/AUTHORS +%doc notification_plugin-0.1.2/ChangeLog +%doc notification_plugin-0.1.2/COPYING +%doc notification_plugin-0.1.2/README %{_libdir}/sylpheed-claws/plugins/notification_plugin.so %files perl %defattr(-,root,root,-) -%doc perl_plugin-0.9/AUTHORS -%doc perl_plugin-0.9/ChangeLog -%doc perl_plugin-0.9/COPYING -%doc perl_plugin-0.9/README -%doc perl_plugin-0.9/sc_perl.pod +%doc perl_plugin-0.9.2/AUTHORS +%doc perl_plugin-0.9.2/ChangeLog +%doc perl_plugin-0.9.2/COPYING +%doc perl_plugin-0.9.2/README +%doc perl_plugin-0.9.2/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so %files rssyl %defattr(-,root,root,-) -%doc rssyl-0.4cvs6/AUTHORS -%doc rssyl-0.4cvs6/ChangeLog -%doc rssyl-0.4cvs6/COPYING -%doc rssyl-0.4cvs6/TODO +%doc rssyl-0.4cvs8/AUTHORS +%doc rssyl-0.4cvs8/ChangeLog +%doc rssyl-0.4cvs8/COPYING +%doc rssyl-0.4cvs8/TODO %{_libdir}/sylpheed-claws/plugins/rssyl* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo @@ -450,6 +464,7 @@ %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/rssyl.mo %lang(it) %{_datadir}/locale/it/LC_MESSAGES/rssyl.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/rssyl.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/rssyl.mo %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/rssyl.mo %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/rssyl.mo %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo @@ -457,25 +472,25 @@ %files smime %defattr(-,root,root,-) -%doc smime-0.5/ChangeLog -%doc smime-0.5/COPYING -%doc smime-0.5/NEWS +%doc smime-0.5.2/ChangeLog +%doc smime-0.5.2/COPYING +%doc smime-0.5.2/NEWS %{_libdir}/sylpheed-claws/plugins/smime.so %files synce %defattr(-,root,root,-) -%doc synce_plugin-0.6/AUTHORS -%doc synce_plugin-0.6/ChangeLog -%doc synce_plugin-0.6/COPYING -%doc synce_plugin-0.6/README +%doc synce_plugin-0.6.1/AUTHORS +%doc synce_plugin-0.6.1/ChangeLog +%doc synce_plugin-0.6.1/COPYING +%doc synce_plugin-0.6.1/README %{_libdir}/sylpheed-claws/plugins/synce* %files vcalendar %defattr(-,root,root,-) -%doc vcalendar-1.71/AUTHORS -%doc vcalendar-1.71/ChangeLog -%doc vcalendar-1.71/COPYING -%doc vcalendar-1.71/README +%doc vcalendar-1.78/AUTHORS +%doc vcalendar-1.78/ChangeLog +%doc vcalendar-1.78/COPYING +%doc vcalendar-1.78/README %{_libdir}/sylpheed-claws/plugins/vcalendar* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo @@ -483,12 +498,17 @@ %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/vcalendar.mo %lang(it) %{_datadir}/locale/it/LC_MESSAGES/vcalendar.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/vcalendar.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/vcalendar.mo %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/vcalendar.mo %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/vcalendar.mo %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/vcalendar.mo %exclude %{_includedir}/ical.h %changelog +* Tue May 16 2006 Andreas Bierfert +2.2.0-1 +- version upgrade + * Sat Apr 08 2006 Andreas Bierfert 2.1.0-1 - version upgrade --- sylpheed-claws-plugins-smime.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 21 07:54:45 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 21 May 2006 00:54:45 -0700 Subject: rpms/sylpheed-claws-plugins/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sylpheed-claws-plugins.spec, 1.12, 1.13 sylpheed-claws-plugins-smime.patch, 1.1, NONE Message-ID: <200605210754.k4L7slC9002284@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2241/devel Modified Files: .cvsignore sources sylpheed-claws-plugins.spec Removed Files: sylpheed-claws-plugins-smime.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Apr 2006 00:34:35 -0000 1.5 +++ .cvsignore 21 May 2006 07:54:44 -0000 1.6 @@ -1 +1 @@ -sylpheed-claws-extra-plugins-2.1.0.tar.bz2 +sylpheed-claws-extra-plugins-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Apr 2006 00:34:35 -0000 1.5 +++ sources 21 May 2006 07:54:44 -0000 1.6 @@ -1 +1 @@ -c15f7bd52ebed8c9c9163c8a8e593c5d sylpheed-claws-extra-plugins-2.1.0.tar.bz2 +118a3f23dc9b7898518cf515b2e6dc19 sylpheed-claws-extra-plugins-2.2.0.tar.bz2 Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sylpheed-claws-plugins.spec 22 Apr 2006 01:17:51 -0000 1.12 +++ sylpheed-claws-plugins.spec 21 May 2006 07:54:44 -0000 1.13 @@ -1,5 +1,5 @@ Name: sylpheed-claws-plugins -Version: 2.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: Additional plugins for sylpheed-claws @@ -7,7 +7,7 @@ License: GPL URL: http://claws.sylpheed.org Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2 -Patch0: sylpheed-claws-plugins-smime.patch +#Patch0: sylpheed-claws-plugins-smime.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sylpheed-claws-devel >= %{version} @@ -183,83 +183,81 @@ %prep %setup -q -n sylpheed-claws-extra-plugins-%{version} -%patch0 %build - #acpi_notifier -cd acpi_notifier-1.0 +cd acpi_notifier-1.0.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #att_remover -cd ../att_remover-1.0 +cd ../att_remover-1.0.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} # cachesaver -cd ../cachesaver-0.7 +cd ../cachesaver-0.8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #etpan-privacy -cd ../etpan-privacy-0.13 +cd ../etpan-privacy-0.14 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.12 +cd ../fetchinfo-plugin-0.4.13 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #gtkhtml2-viewer -cd ../gtkhtml2_viewer-0.8 +cd ../gtkhtml2_viewer-0.10 %configure --disable-static --disable-dependency-tracking --disable-rpath %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool #maildir -cd ../maildir-0.20 +cd ../maildir-0.22 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #mailmbox -cd ../mailmbox-1.11 +cd ../mailmbox-1.12 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #newmail -cd ../newmail-0.0.3 +cd ../newmail-0.0.4 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #notification-plugin -cd ../notification_plugin-0.1 +cd ../notification_plugin-0.1.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #perl -cd ../perl_plugin-0.9 +cd ../perl_plugin-0.9.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #rssyl -cd ../rssyl-0.4cvs6 +cd ../rssyl-0.4cvs8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool #smime -cd ../smime-0.5 +cd ../smime-0.5.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #synce -cd ../synce_plugin-0.6 +cd ../synce_plugin-0.6.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #vcalendar -cd ../vcalendar-1.71 +cd ../vcalendar-1.78 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -267,64 +265,79 @@ rm -rf $RPM_BUILD_ROOT # acpi_notifier -cd acpi_notifier-1.0 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd acpi_notifier-1.0.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + # att_remover -cd ../att_remover-1.0 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../att_remover-1.0.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + # cachesaver -cd ../cachesaver-0.7 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../cachesaver-0.8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #etpan-privacy -cd ../etpan-privacy-0.13 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../etpan-privacy-0.14 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.12 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../fetchinfo-plugin-0.4.13 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #gtkhtml2-viewer -cd ../gtkhtml2_viewer-0.8 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../gtkhtml2_viewer-0.10 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #maildir -cd ../maildir-0.20 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../maildir-0.22 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #mailmbox -cd ../mailmbox-1.11 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../mailmbox-1.12 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #newmail -cd ../newmail-0.0.3 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../newmail-0.0.4 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #notification-plugin -cd ../notification_plugin-0.1 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../notification_plugin-0.1.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #perl -cd ../perl_plugin-0.9 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../perl_plugin-0.9.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #rssyl -cd ../rssyl-0.4cvs6 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../rssyl-0.4cvs8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #smime -cd ../smime-0.5 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../smime-0.5.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #synce -cd ../synce_plugin-0.6 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../synce_plugin-0.6.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #vcalendar -cd ../vcalendar-1.71 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../vcalendar-1.78 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -337,11 +350,11 @@ %files acpi-notifier %defattr(-,root,root,-) -%doc acpi_notifier-1.0/ChangeLog -%doc acpi_notifier-1.0/COPYING -%doc acpi_notifier-1.0/NEWS -%doc acpi_notifier-1.0/AUTHORS -%doc acpi_notifier-1.0/README +%doc acpi_notifier-1.0.1/ChangeLog +%doc acpi_notifier-1.0.1/COPYING +%doc acpi_notifier-1.0.1/NEWS +%doc acpi_notifier-1.0.1/AUTHORS +%doc acpi_notifier-1.0.1/README %{_libdir}/sylpheed-claws/plugins/acpi_notifier* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo @@ -356,93 +369,94 @@ %files att-remover %defattr(-,root,root,-) -%doc att_remover-1.0/AUTHORS -%doc att_remover-1.0/ChangeLog -%doc att_remover-1.0/COPYING -%doc att_remover-1.0/NEWS -%doc att_remover-1.0/README +%doc att_remover-1.0.1/AUTHORS +%doc att_remover-1.0.1/ChangeLog +%doc att_remover-1.0.1/COPYING +%doc att_remover-1.0.1/NEWS +%doc att_remover-1.0.1/README %{_libdir}/sylpheed-claws/plugins/att_remover* %files cachesaver %defattr(-,root,root,-) -%doc cachesaver-0.7/AUTHORS -%doc cachesaver-0.7/ChangeLog -%doc cachesaver-0.7/COPYING +%doc cachesaver-0.8/AUTHORS +%doc cachesaver-0.8/ChangeLog +%doc cachesaver-0.8/COPYING %{_libdir}/sylpheed-claws/plugins/cachesaver* %files etpan-privacy %defattr(-,root,root,-) -%doc etpan-privacy-0.13/AUTHORS -%doc etpan-privacy-0.13/ChangeLog -%doc etpan-privacy-0.13/COPYING -%doc etpan-privacy-0.13/README +%doc etpan-privacy-0.14/AUTHORS +%doc etpan-privacy-0.14/ChangeLog +%doc etpan-privacy-0.14/COPYING +%doc etpan-privacy-0.14/README %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so %files fetchinfo %defattr(-,root,root,-) -%doc fetchinfo-plugin-0.4.12/ChangeLog -%doc fetchinfo-plugin-0.4.12/COPYING -%doc fetchinfo-plugin-0.4.12/README +%doc fetchinfo-plugin-0.4.13/ChangeLog +%doc fetchinfo-plugin-0.4.13/COPYING +%doc fetchinfo-plugin-0.4.13/README %{_libdir}/sylpheed-claws/plugins/fetchinfo* %files gtkhtml2-viewer %defattr(-,root,root,-) -%doc gtkhtml2_viewer-0.8/AUTHORS -%doc gtkhtml2_viewer-0.8/COPYING +%doc gtkhtml2_viewer-0.10/AUTHORS +%doc gtkhtml2_viewer-0.10/COPYING %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer* %lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo %files maildir %defattr(-,root,root,-) -%doc maildir-0.20/AUTHORS -%doc maildir-0.20/ChangeLog -%doc maildir-0.20/COPYING -%doc maildir-0.20/README -%doc maildir-0.20/doc/README.xml +%doc maildir-0.22/AUTHORS +%doc maildir-0.22/ChangeLog +%doc maildir-0.22/COPYING +%doc maildir-0.22/README +%doc maildir-0.22/doc/README.xml %{_libdir}/sylpheed-claws/plugins/maildir* %files mailmbox %defattr(-,root,root,-) -%doc mailmbox-1.11/AUTHORS -%doc mailmbox-1.11/ChangeLog -%doc mailmbox-1.11/COPYING -%doc mailmbox-1.11/README +%doc mailmbox-1.12/AUTHORS +%doc mailmbox-1.12/ChangeLog +%doc mailmbox-1.12/COPYING +%doc mailmbox-1.12/README %{_libdir}/sylpheed-claws/plugins/mailmbox* %files newmail %defattr(-,root,root,-) -%doc newmail-0.0.3/AUTHORS -%doc newmail-0.0.3/ChangeLog -%doc newmail-0.0.3/COPYING -%doc newmail-0.0.3/NEWS -%doc newmail-0.0.3/README +%doc newmail-0.0.4/AUTHORS +%doc newmail-0.0.4/ChangeLog +%doc newmail-0.0.4/COPYING +%doc newmail-0.0.4/NEWS +%doc newmail-0.0.4/README %{_libdir}/sylpheed-claws/plugins/newmail.so %files notification %defattr(-,root,root,-) -%doc notification_plugin-0.1/AUTHORS -%doc notification_plugin-0.1/ChangeLog -%doc notification_plugin-0.1/COPYING -%doc notification_plugin-0.1/README +%doc notification_plugin-0.1.2/AUTHORS +%doc notification_plugin-0.1.2/ChangeLog +%doc notification_plugin-0.1.2/COPYING +%doc notification_plugin-0.1.2/README %{_libdir}/sylpheed-claws/plugins/notification_plugin.so %files perl %defattr(-,root,root,-) -%doc perl_plugin-0.9/AUTHORS -%doc perl_plugin-0.9/ChangeLog -%doc perl_plugin-0.9/COPYING -%doc perl_plugin-0.9/README -%doc perl_plugin-0.9/sc_perl.pod +%doc perl_plugin-0.9.2/AUTHORS +%doc perl_plugin-0.9.2/ChangeLog +%doc perl_plugin-0.9.2/COPYING +%doc perl_plugin-0.9.2/README +%doc perl_plugin-0.9.2/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so %files rssyl %defattr(-,root,root,-) -%doc rssyl-0.4cvs6/AUTHORS -%doc rssyl-0.4cvs6/ChangeLog -%doc rssyl-0.4cvs6/COPYING -%doc rssyl-0.4cvs6/TODO +%doc rssyl-0.4cvs8/AUTHORS +%doc rssyl-0.4cvs8/ChangeLog +%doc rssyl-0.4cvs8/COPYING +%doc rssyl-0.4cvs8/TODO %{_libdir}/sylpheed-claws/plugins/rssyl* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo @@ -450,6 +464,7 @@ %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/rssyl.mo %lang(it) %{_datadir}/locale/it/LC_MESSAGES/rssyl.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/rssyl.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/rssyl.mo %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/rssyl.mo %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/rssyl.mo %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo @@ -457,25 +472,25 @@ %files smime %defattr(-,root,root,-) -%doc smime-0.5/ChangeLog -%doc smime-0.5/COPYING -%doc smime-0.5/NEWS +%doc smime-0.5.2/ChangeLog +%doc smime-0.5.2/COPYING +%doc smime-0.5.2/NEWS %{_libdir}/sylpheed-claws/plugins/smime.so %files synce %defattr(-,root,root,-) -%doc synce_plugin-0.6/AUTHORS -%doc synce_plugin-0.6/ChangeLog -%doc synce_plugin-0.6/COPYING -%doc synce_plugin-0.6/README +%doc synce_plugin-0.6.1/AUTHORS +%doc synce_plugin-0.6.1/ChangeLog +%doc synce_plugin-0.6.1/COPYING +%doc synce_plugin-0.6.1/README %{_libdir}/sylpheed-claws/plugins/synce* %files vcalendar %defattr(-,root,root,-) -%doc vcalendar-1.71/AUTHORS -%doc vcalendar-1.71/ChangeLog -%doc vcalendar-1.71/COPYING -%doc vcalendar-1.71/README +%doc vcalendar-1.78/AUTHORS +%doc vcalendar-1.78/ChangeLog +%doc vcalendar-1.78/COPYING +%doc vcalendar-1.78/README %{_libdir}/sylpheed-claws/plugins/vcalendar* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo @@ -483,12 +498,17 @@ %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/vcalendar.mo %lang(it) %{_datadir}/locale/it/LC_MESSAGES/vcalendar.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/vcalendar.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/vcalendar.mo %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/vcalendar.mo %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/vcalendar.mo %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/vcalendar.mo %exclude %{_includedir}/ical.h %changelog +* Tue May 16 2006 Andreas Bierfert +2.2.0-1 +- version upgrade + * Sat Apr 08 2006 Andreas Bierfert 2.1.0-1 - version upgrade --- sylpheed-claws-plugins-smime.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 21 08:48:32 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 May 2006 01:48:32 -0700 Subject: rpms/perl-Params-Validate/devel .cvsignore, 1.5, 1.6 perl-Params-Validate.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605210848.k4L8mY66004807@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4786 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.82-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Apr 2006 07:23:28 -0000 1.5 +++ .cvsignore 21 May 2006 08:48:32 -0000 1.6 @@ -1 +1 @@ -Params-Validate-0.81.tar.gz +Params-Validate-0.82.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Params-Validate.spec 4 Apr 2006 07:23:28 -0000 1.6 +++ perl-Params-Validate.spec 21 May 2006 08:48:32 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.81 +Version: 0.82 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.82-1 +- Upstream update. + * Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Apr 2006 07:23:28 -0000 1.5 +++ sources 21 May 2006 08:48:32 -0000 1.6 @@ -1 +1 @@ -033d043c4764b800722b9d7442bc4530 Params-Validate-0.81.tar.gz +f83a21a6674890f243d2c43f98fe236c Params-Validate-0.82.tar.gz From fedora-extras-commits at redhat.com Sun May 21 08:54:19 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 May 2006 01:54:19 -0700 Subject: rpms/perl-Params-Validate/FC-5 .cvsignore, 1.5, 1.6 perl-Params-Validate.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605210854.k4L8sLXu005288@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5267 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.82-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Apr 2006 17:13:10 -0000 1.5 +++ .cvsignore 21 May 2006 08:54:19 -0000 1.6 @@ -1 +1 @@ -Params-Validate-0.81.tar.gz +Params-Validate-0.82.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/perl-Params-Validate.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Params-Validate.spec 20 Apr 2006 17:13:10 -0000 1.6 +++ perl-Params-Validate.spec 21 May 2006 08:54:19 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.81 +Version: 0.82 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.82-1 +- Upstream update. + * Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Apr 2006 17:13:10 -0000 1.5 +++ sources 21 May 2006 08:54:19 -0000 1.6 @@ -1 +1 @@ -033d043c4764b800722b9d7442bc4530 Params-Validate-0.81.tar.gz +f83a21a6674890f243d2c43f98fe236c Params-Validate-0.82.tar.gz From fedora-extras-commits at redhat.com Sun May 21 08:56:21 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 May 2006 01:56:21 -0700 Subject: rpms/perl-Params-Validate/FC-4 .cvsignore, 1.5, 1.6 perl-Params-Validate.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200605210856.k4L8uNO9005363@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5342 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.82-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 May 2006 04:42:23 -0000 1.5 +++ .cvsignore 21 May 2006 08:56:21 -0000 1.6 @@ -1 +1 @@ -Params-Validate-0.81.tar.gz +Params-Validate-0.82.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/perl-Params-Validate.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Params-Validate.spec 8 May 2006 04:42:23 -0000 1.5 +++ perl-Params-Validate.spec 21 May 2006 08:56:21 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.81 +Version: 0.82 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.82-1 +- Upstream update. + * Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 May 2006 04:42:23 -0000 1.5 +++ sources 21 May 2006 08:56:21 -0000 1.6 @@ -1 +1 @@ -033d043c4764b800722b9d7442bc4530 Params-Validate-0.81.tar.gz +f83a21a6674890f243d2c43f98fe236c Params-Validate-0.82.tar.gz From fedora-extras-commits at redhat.com Sun May 21 11:05:29 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sun, 21 May 2006 04:05:29 -0700 Subject: rpms/acpitool/devel .cvsignore, 1.3, 1.4 acpitool.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605211105.k4LB5Vk5012782@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpitool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12761 Modified Files: .cvsignore acpitool.spec sources Log Message: * Thu Feb 16 2006 Patrice Dumas - 0.4.5-1 - update to 0.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/acpitool/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Feb 2006 20:50:40 -0000 1.3 +++ .cvsignore 21 May 2006 11:05:29 -0000 1.4 @@ -1 +1 @@ -acpitool-0.4.4.tar.gz +acpitool-0.4.5.tar.gz Index: acpitool.spec =================================================================== RCS file: /cvs/extras/rpms/acpitool/devel/acpitool.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acpitool.spec 16 Feb 2006 20:57:03 -0000 1.5 +++ acpitool.spec 21 May 2006 11:05:29 -0000 1.6 @@ -1,6 +1,6 @@ Name: acpitool -Version: 0.4.4 -Release: 1%{?dist}.1 +Version: 0.4.5 +Release: 1%{?dist} Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz Summary: A command line ACPI client for Linux @@ -38,6 +38,9 @@ %{_mandir}/man1/acpitool* %changelog +* Thu Feb 16 2006 Patrice Dumas - 0.4.5-1 +- update to 0.4.5 + * Thu Feb 16 2006 Patrice Dumas - 0.4.4-1.1 - new version - remove now unneeded patch @@ -51,4 +54,3 @@ * Tue Aug 24 2004 Robert Ambrose - Created .spec file. - Index: sources =================================================================== RCS file: /cvs/extras/rpms/acpitool/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Feb 2006 20:50:40 -0000 1.3 +++ sources 21 May 2006 11:05:29 -0000 1.4 @@ -1 +1 @@ -7e487ac3118f316876e9b441dec4e3ad acpitool-0.4.4.tar.gz +34647d800617cfa506c0db086c0d6195 acpitool-0.4.5.tar.gz From fedora-extras-commits at redhat.com Sun May 21 11:19:48 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:19:48 -0700 Subject: rpms/gtkglextmm - New directory Message-ID: <200605211119.k4LBJoZ1013343@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13315/gtkglextmm Log Message: Directory /cvs/extras/rpms/gtkglextmm added to the repository From fedora-extras-commits at redhat.com Sun May 21 11:19:49 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:19:49 -0700 Subject: rpms/gtkglextmm/devel - New directory Message-ID: <200605211119.k4LBJpVK013346@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13315/gtkglextmm/devel Log Message: Directory /cvs/extras/rpms/gtkglextmm/devel added to the repository From fedora-extras-commits at redhat.com Sun May 21 11:20:11 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:20:11 -0700 Subject: rpms/gtkglextmm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605211120.k4LBKDXd013393@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13365 Added Files: Makefile import.log Log Message: Setup of module gtkglextmm --- NEW FILE Makefile --- # Top level Makefile for module gtkglextmm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 21 11:20:12 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:20:12 -0700 Subject: rpms/gtkglextmm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605211120.k4LBKECw013396@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13365/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtkglextmm --- NEW 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 May 21 11:20:52 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:20:52 -0700 Subject: rpms/gtkglextmm import.log,1.1,1.2 Message-ID: <200605211121.k4LBLONc013473@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13439 Modified Files: import.log Log Message: auto-import gtkglextmm-1.2.0-2 on branch devel from gtkglextmm-1.2.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 May 2006 11:20:11 -0000 1.1 +++ import.log 21 May 2006 11:20:52 -0000 1.2 @@ -0,0 +1 @@ +gtkglextmm-1_2_0-2:HEAD:gtkglextmm-1.2.0-2.src.rpm:1148210462 From fedora-extras-commits at redhat.com Sun May 21 11:20:53 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:20:53 -0700 Subject: rpms/gtkglextmm/devel gtkglextmm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605211121.k4LBLP3k013478@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13439/devel Modified Files: .cvsignore sources Added Files: gtkglextmm.spec Log Message: auto-import gtkglextmm-1.2.0-2 on branch devel from gtkglextmm-1.2.0-2.src.rpm --- NEW FILE gtkglextmm.spec --- %define gtkglext_major 1.0 %define gtkglextmm_major 1.2 %define gtkmm_major 2.4 Summary: C++ wrapper for GtkGlExt Name: gtkglextmm Version: 1.2.0 Release: 2 License: LGPL Group: System Environment/Libraries URL: http://gtkglext.sourceforge.net Source0: http://dl.sourceforge.net/sourceforge/gtkglext/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkglext-devel >= %{gtkglext_major} BuildRequires: gtkmm24-devel >= %{gtkmm_major} Requires(postun): /sbin/ldconfig Requires(post): /sbin/ldconfig %description gtkglextmm is a C++ wrapper for GtkGlExt, an OpenGL extension to GTK+. %package devel Summary: Development tools for gtkglextmm Group: Development/Libraries Requires: %{name} = %{version} Requires: gtkmm24-devel Requires: gtkglext-devel %description devel The gtkglextmm-devel package contains the header files, static libraries, and developer docs for gtkglextmm. %prep %setup -q -n gtkglextmm-%{version} %build %configure --disable-static %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT make install %clean %{__rm} -rf $RPM_BUILD_ROOT %post /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog README TODO AUTHORS COPYING.LIB COPYING NEWS %{_libdir}/libgtkglextmm-x11-*so.* %{_libdir}/libgdkglextmm-x11-*so.* %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/%{name}-%{gtkglextmm_major} %{_libdir}/lib*la %{_libdir}/lib*so %{_libdir}/pkgconfig/* %{_datadir}/aclocal/* %doc %{_datadir}/doc/%{name}-%{gtkglextmm_major}/html/* %changelog * Fri May 17 2006 Gilles Gagniard 1.2.0-2 - Removed unnecessary dependencies * Fri May 12 2006 Gilles Gagniard 1.2.0-1 - First version of the package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 21 May 2006 11:20:12 -0000 1.1 +++ .cvsignore 21 May 2006 11:20:52 -0000 1.2 @@ -0,0 +1 @@ +gtkglextmm-1.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 21 May 2006 11:20:12 -0000 1.1 +++ sources 21 May 2006 11:20:52 -0000 1.2 @@ -0,0 +1 @@ +27c05f4d45c5fd07b6fb0f044add3056 gtkglextmm-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Sun May 21 11:26:13 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:26:13 -0700 Subject: owners owners.list,1.1033,1.1034 Message-ID: <200605211126.k4LBQFdV013299@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13282 Modified Files: owners.list Log Message: adding gtkglextmm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1033 retrieving revision 1.1034 diff -u -r1.1033 -r1.1034 --- owners.list 20 May 2006 21:29:53 -0000 1.1033 +++ owners.list 21 May 2006 11:26:13 -0000 1.1034 @@ -463,6 +463,7 @@ Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| +Fedora Extras|gtkglextmm|C++ binding for gtkglext|gilles.gagniard at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gtkhtml36|GtkHTML 3.6 Compatibility Library|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|gtklp|A GTK frontend to CUPS|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 21 12:42:42 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 21 May 2006 05:42:42 -0700 Subject: kadischi/livecd_generator movefiles.py,1.2,1.3 Message-ID: <200605211242.k4LCggx9015922@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15905/kadischi/livecd_generator Modified Files: movefiles.py Log Message: Keep udev directory and modprobe.conf during movefiles Index: movefiles.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/movefiles.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- movefiles.py 31 Mar 2006 21:03:36 -0000 1.2 +++ movefiles.py 21 May 2006 12:42:39 -0000 1.3 @@ -45,6 +45,8 @@ '/etc/fstab', '/etc/mtab', '/etc/makedev.d', + '/etc/udev', + '/etc/modprobe.conf', ] rootdir = sys.argv[1] From fedora-extras-commits at redhat.com Sun May 21 13:17:46 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 21 May 2006 06:17:46 -0700 Subject: rpms/amarok/FC-5 .cvsignore, 1.22, 1.23 amarok-1.4-gstreamer.patch, 1.1, 1.2 amarok.spec, 1.48, 1.49 sources, 1.22, 1.23 amarok-1.3.6-libtunepimp040.patch, 1.1, NONE amarok-1.4beta1-gst10.patch, 1.2, NONE Message-ID: <200605211318.k4LDIIpl018413@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/FC-5 Modified Files: .cvsignore amarok-1.4-gstreamer.patch amarok.spec sources Removed Files: amarok-1.3.6-libtunepimp040.patch amarok-1.4beta1-gst10.patch Log Message: version 1.4 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 19 May 2006 21:04:47 -0000 1.22 +++ .cvsignore 21 May 2006 13:17:46 -0000 1.23 @@ -1 +1,2 @@ amarok-1.4.0a.tar.bz2 +gst10-1.4beta3.tar.gz amarok-1.4-gstreamer.patch: Index: amarok-1.4-gstreamer.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok-1.4-gstreamer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4-gstreamer.patch 14 Apr 2006 08:30:44 -0000 1.1 +++ amarok-1.4-gstreamer.patch 21 May 2006 13:17:46 -0000 1.2 @@ -1,6 +1,222 @@ ---- ./configure.gstreamer 2006-04-09 23:08:39.000000000 +0200 -+++ ./configure 2006-04-14 10:23:09.000000000 +0200 -@@ -37922,7 +37922,7 @@ +--- ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop.gstreamer 2006-05-21 14:31:55.000000000 +0200 ++++ ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop 2006-05-21 14:32:05.000000000 +0200 +@@ -74,6 +74,6 @@ + X-KDE-amaroK-email=markey at web.de + X-KDE-amaroK-rank=254 + X-KDE-amaroK-version=1 +-X-KDE-amaroK-framework-version=20 ++X-KDE-amaroK-framework-version=23 + + +--- ./amarok/src/engine/Makefile.in.gstreamer 2006-05-14 22:05:27.000000000 +0200 ++++ ./amarok/src/engine/Makefile.in 2006-05-21 14:12:47.000000000 +0200 +@@ -365,9 +365,6 @@ + + + +-#if with_gst10 +-# GST10_ENGINE_SUBDIR = gst10 +-#endif + @with_nmm_TRUE at NMM_ENGINE_SUBDIR = nmm + + @with_xine_TRUE at XINE_ENGINE_SUBDIR = xine +@@ -388,7 +385,8 @@ + void \ + $(XINE_ENGINE_SUBDIR) \ + $(NMM_ENGINE_SUBDIR) \ +- $(HELIX_ENGINE_SUBDIR) ++ $(HELIX_ENGINE_SUBDIR) \ ++ gst10 + + subdir = amarok/src/engine + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +--- ./configure.gstreamer 2006-05-14 22:04:55.000000000 +0200 ++++ ./configure 2006-05-21 14:11:29.000000000 +0200 +@@ -32730,41 +32730,148 @@ + # BEGIN GSTREAMER-0.10 CHECK + ############################################################################### + +-#AC_ARG_WITH(gstreamer10, +-# AC_HELP_STRING([--with-gstreamer10],[build amaroK with GStreamer 0.10-engine]), +-# [build_gstreamer10=$withval], +-# [build_gstreamer10=no] +-#) +-# +-#if test "$build_gstreamer10" != "no"; then +-# if test "$PKGCONFIGFOUND" = "yes" ; then +-# # check for GStreamer +-# dnl Now we're ready to ask for gstreamer libs and cflags +-# dnl And we can also ask for the right version of gstreamer +-# have_gst10=no +-# +-# GST10_MAJORMINOR=0.10 +-# GST10_REQ=0.10.0 +-# +-# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR, +-# have_gst10=yes,have_gst10=no) +-# +-# dnl Give error if we don't have gstreamer +-# if test "x$have_gst10" = "xno"; then +-# LIB_GST10="" +-# CFLAGS_GST10="" +-# else +-# LIB_GST10=$GST10_LIBS +-# CFLAGS_GST10=$GST10_CFLAGS +-# AC_SUBST(LIB_GST10) +-# AC_SUBST(CFLAGS_GST10) +-# AC_SUBST(GST10_MAJORMINOR) +-# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10]) +-# fi +-# fi +-#fi +-# +-#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes]) ++# Check whether --with-gstreamer10 or --without-gstreamer10 was given. ++if test "${with_gstreamer10+set}" = set; then ++ withval="$with_gstreamer10" ++ build_gstreamer10=$withval ++else ++ build_gstreamer10=no ++ ++fi; ++ ++if test "$build_gstreamer10" != "no"; then ++ if test "$PKGCONFIGFOUND" = "yes" ; then ++ # check for GStreamer ++ have_gst10=no ++ ++ GST10_MAJORMINOR=0.10 ++ GST10_REQ=0.10.0 ++ ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++ ++if test -n "$PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo "$as_me:$LINENO: checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" >&5 ++echo $ECHO_N "checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR... $ECHO_C" >&6 ++ ++ if $PKG_CONFIG --exists "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" ; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ succeeded=yes ++ ++ echo "$as_me:$LINENO: checking GST10_CFLAGS" >&5 ++echo $ECHO_N "checking GST10_CFLAGS... $ECHO_C" >&6 ++ GST10_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ echo "$as_me:$LINENO: result: $GST10_CFLAGS" >&5 ++echo "${ECHO_T}$GST10_CFLAGS" >&6 ++ ++ echo "$as_me:$LINENO: checking GST10_LIBS" >&5 ++echo $ECHO_N "checking GST10_LIBS... $ECHO_C" >&6 ++ GST10_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ echo "$as_me:$LINENO: result: $GST10_LIBS" >&5 ++echo "${ECHO_T}$GST10_LIBS" >&6 ++ else ++ GST10_CFLAGS="" ++ GST10_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ GST10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ have_gst10=yes ++ else ++ have_gst10=no ++ fi ++ ++ ++ if test "x$have_gst10" = "xno"; then ++ LIB_GST10="" ++ CFLAGS_GST10="" ++ else ++ LIB_GST10=$GST10_LIBS ++ CFLAGS_GST10=$GST10_CFLAGS ++ ++ ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_GSTREAMER10 1 ++_ACEOF ++ ++ fi ++ fi ++fi ++ ++ ++ ++if test x$have_gst10 = xyes; then ++ with_gst10_TRUE= ++ with_gst10_FALSE='#' ++else ++ with_gst10_TRUE='#' ++ with_gst10_FALSE= ++fi ++ + + ############################################################################### + # END GSTREAMER-0.10 CHECK +@@ -37885,7 +37992,7 @@ # BEGIN DO_NOT_COMPILE CHECK ############################################################################### @@ -9,7 +225,44 @@ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" no_engine=yes -@@ -40316,7 +40316,7 @@ +@@ -38007,6 +38114,12 @@ + ac_config_files="$ac_config_files amarok/src/engine/void/Makefile" + + ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/config/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/equalizer/Makefile" + + ac_config_files="$ac_config_files amarok/src/images/Makefile" + +@@ -38913,6 +39026,9 @@ + "amarok/src/engine/nmm/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;; + "amarok/src/engine/void/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;; + "amarok/src/engine/xine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;; ++ "amarok/src/engine/gst10/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/Makefile" ;; ++ "amarok/src/engine/gst10/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/config/Makefile" ;; ++ "amarok/src/engine/gst10/equalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/equalizer/Makefile" ;; + "amarok/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;; + "amarok/src/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;; + "amarok/src/konquisidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;; +@@ -39314,6 +39430,13 @@ + s, at taglib_includes@,$taglib_includes,;t t + s, at taglib_libs@,$taglib_libs,;t t + s, at RUBY@,$RUBY,;t t ++s, at GST10_CFLAGS@,$GST10_CFLAGS,;t t ++s, at GST10_LIBS@,$GST10_LIBS,;t t ++s, at LIB_GST10@,$LIB_GST10,;t t ++s, at CFLAGS_GST10@,$CFLAGS_GST10,;t t ++s, at GST10_MAJORMINOR@,$GST10_MAJORMINOR,;t t ++s, at with_gst10_TRUE@,$with_gst10_TRUE,;t t ++s, at with_gst10_FALSE@,$with_gst10_FALSE,;t t + s, at XINE_CONFIG@,$XINE_CONFIG,;t t + s, at with_xine_TRUE@,$with_xine_TRUE,;t t + s, at with_xine_FALSE@,$with_xine_FALSE,;t t +@@ -40259,7 +40382,7 @@ echo " ==================================" echo " =" echo " = No suitable multimedia framework was detected. You need to install at least" @@ -18,3 +271,29 @@ echo " =" fi +@@ -40290,9 +40413,9 @@ + # echo " = - aKode-engine" + # fi + +-# if test x$have_gst10 != xyes; then +-# echo " = - GStreamer0.10-engine" +-# fi ++ if test x$have_gst10 != xyes; then ++ echo " = - GStreamer0.10-engine" ++ fi + + if test x$build_xine != xyes; then + echo " = - xine-engine" +@@ -40359,9 +40482,9 @@ + # echo " = + aKode-engine" + # fi + +-# if test x$have_gst10 = xyes; then +-# echo " = + GStreamer0.10-engine" +-# fi ++ if test x$have_gst10 = xyes; then ++ echo " = + GStreamer0.10-engine" ++ fi + + if test x$build_xine = xyes; then + echo " = + xine-engine" Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- amarok.spec 19 May 2006 21:04:47 -0000 1.48 +++ amarok.spec 21 May 2006 13:17:46 -0000 1.49 @@ -7,8 +7,10 @@ License: GPL Url: http://amarok.kde.org Source0: http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2 -#Patch1: amarok-1.4-gstreamer.patch -#Patch2: amarok-1.4-engines-cfg.patch +# Bring back the gstreamer engine from 1.4 beta3 +Source1: gst10-1.4beta3.tar.gz +Patch1: amarok-1.4-gstreamer.patch +Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -22,15 +24,15 @@ BuildRequires: libtunepimp-devel >= 0.4.0 BuildRequires: kdebase-devel BuildRequires: alsa-lib-devel -#BuildRequires: akode-devel BuildRequires: libifp-devel, libusb-devel -%if "%fedora" >= "5" -# gstreamer disabled in version 1.4 final (not ready yet) -#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel BuildRequires: libgpod-devel -%else -BuildRequires: gstreamer-plugins-devel >= 0.8.4 +# Akode engine +#BuildRequires: akode-devel +# Gstreamer engine +%ifarch ppc64 x86_64 s390 s390x ia64 +BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel %endif +# Helix engine %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif @@ -63,6 +65,8 @@ Summary: Visualisation plugins for Amarok Group: Applications/Multimedia Requires: %{name} = %{version} +# RPM CVS supports "Suggests": +#Requires(hint): libvisual-plugins %description visualisation Amarok can use visualisation plugins from different origins. @@ -72,11 +76,15 @@ %prep -%setup -q -# Make Gstreamer a sufficient engine as well (only engine available on x86_64) -#%patch1 -p1 -b .gstreamer +%setup -q -a 1 +%ifarch ppc64 x86_64 s390 s390x ia64 +# Bring Gstreamer back and make it a sufficient engine +# (only engine available if Helix in unavailable) +mv gst10 amarok/src/engine/ +%patch1 -p1 -b .gstreamer # Gstreamer default sink should be autoaudiosink -#%patch2 -p1 -b .engines-cfg +%patch2 -p1 -b .engines-cfg +%endif %build @@ -169,12 +177,8 @@ %exclude %{_datadir}/apps/%{name}/images/xine_logo.png %{_datadir}/icons/hicolor/*/* %{_datadir}/applications/kde/*.desktop -%{_datadir}/services/amarok_void-engine_plugin.desktop -%{_datadir}/services/amarok_ifp-mediadevice.desktop %{_datadir}/servicetypes/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop -%{_libdir}/kde3/libamarok_void-engine_plugin.* -%{_libdir}/kde3/libamarok_ifp-mediadevice.* %{_libdir}/kde3/konqsidebar_universalamarok.* %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop @@ -187,13 +191,16 @@ # VFAT device support %{_datadir}/services/amarok_generic-mediadevice.desktop %{_libdir}/kde3/libamarok_generic-mediadevice.* -# Gstreamer engine - disabled in 1.4 final -%if "%fedora" >= "5" -#%{_datadir}/services/amarok_gst10engine_plugin.desktop -#%{_libdir}/kde3/libamarok_gst10engine_plugin.* -%else -%{_datadir}/services/amarok_gstengine_plugin.desktop -%{_libdir}/kde3/libamarok_gstengine_plugin.* +# iRiver device support +%{_datadir}/services/amarok_ifp-mediadevice.desktop +%{_libdir}/kde3/libamarok_ifp-mediadevice.* +# Void engine (noop) +%{_datadir}/services/amarok_void-engine_plugin.desktop +%{_libdir}/kde3/libamarok_void-engine_plugin.* +# Gstreamer engine +%ifarch ppc64 x86_64 s390 s390x ia64 +%{_datadir}/services/amarok_gst10engine_plugin.desktop +%{_libdir}/kde3/libamarok_gst10engine_plugin.* %endif # Akode engine - disabled in beta3 #%{_datadir}/services/amarok_aKode-engine.desktop @@ -216,6 +223,8 @@ %changelog * Mon May 15 2006 Aurelien Bompard 1.4-1 - version 1.4 final +- gstreamer engine has been disabled, bring it back in SOURCE1 + where Helix is unavailable (only engine available) * Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 - rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 May 2006 21:04:47 -0000 1.22 +++ sources 21 May 2006 13:17:46 -0000 1.23 @@ -1 +1,2 @@ 3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 +78f329116089047704f32158e204ef4f gst10-1.4beta3.tar.gz --- amarok-1.3.6-libtunepimp040.patch DELETED --- --- amarok-1.4beta1-gst10.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 21 13:17:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 21 May 2006 06:17:47 -0700 Subject: rpms/amarok/devel .cvsignore, 1.22, 1.23 amarok-1.4-gstreamer.patch, 1.1, 1.2 amarok.spec, 1.47, 1.48 sources, 1.22, 1.23 amarok-1.3.6-libtunepimp040.patch, 1.1, NONE amarok-1.4beta1-gst10.patch, 1.2, NONE Message-ID: <200605211318.k4LDIJT5018422@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/devel Modified Files: .cvsignore amarok-1.4-gstreamer.patch amarok.spec sources Removed Files: amarok-1.3.6-libtunepimp040.patch amarok-1.4beta1-gst10.patch Log Message: version 1.4 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 19 May 2006 21:04:47 -0000 1.22 +++ .cvsignore 21 May 2006 13:17:47 -0000 1.23 @@ -1 +1,2 @@ amarok-1.4.0a.tar.bz2 +gst10-1.4beta3.tar.gz amarok-1.4-gstreamer.patch: Index: amarok-1.4-gstreamer.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.4-gstreamer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4-gstreamer.patch 14 Apr 2006 08:30:45 -0000 1.1 +++ amarok-1.4-gstreamer.patch 21 May 2006 13:17:47 -0000 1.2 @@ -1,6 +1,222 @@ ---- ./configure.gstreamer 2006-04-09 23:08:39.000000000 +0200 -+++ ./configure 2006-04-14 10:23:09.000000000 +0200 -@@ -37922,7 +37922,7 @@ +--- ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop.gstreamer 2006-05-21 14:31:55.000000000 +0200 ++++ ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop 2006-05-21 14:32:05.000000000 +0200 +@@ -74,6 +74,6 @@ + X-KDE-amaroK-email=markey at web.de + X-KDE-amaroK-rank=254 + X-KDE-amaroK-version=1 +-X-KDE-amaroK-framework-version=20 ++X-KDE-amaroK-framework-version=23 + + +--- ./amarok/src/engine/Makefile.in.gstreamer 2006-05-14 22:05:27.000000000 +0200 ++++ ./amarok/src/engine/Makefile.in 2006-05-21 14:12:47.000000000 +0200 +@@ -365,9 +365,6 @@ + + + +-#if with_gst10 +-# GST10_ENGINE_SUBDIR = gst10 +-#endif + @with_nmm_TRUE at NMM_ENGINE_SUBDIR = nmm + + @with_xine_TRUE at XINE_ENGINE_SUBDIR = xine +@@ -388,7 +385,8 @@ + void \ + $(XINE_ENGINE_SUBDIR) \ + $(NMM_ENGINE_SUBDIR) \ +- $(HELIX_ENGINE_SUBDIR) ++ $(HELIX_ENGINE_SUBDIR) \ ++ gst10 + + subdir = amarok/src/engine + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +--- ./configure.gstreamer 2006-05-14 22:04:55.000000000 +0200 ++++ ./configure 2006-05-21 14:11:29.000000000 +0200 +@@ -32730,41 +32730,148 @@ + # BEGIN GSTREAMER-0.10 CHECK + ############################################################################### + +-#AC_ARG_WITH(gstreamer10, +-# AC_HELP_STRING([--with-gstreamer10],[build amaroK with GStreamer 0.10-engine]), +-# [build_gstreamer10=$withval], +-# [build_gstreamer10=no] +-#) +-# +-#if test "$build_gstreamer10" != "no"; then +-# if test "$PKGCONFIGFOUND" = "yes" ; then +-# # check for GStreamer +-# dnl Now we're ready to ask for gstreamer libs and cflags +-# dnl And we can also ask for the right version of gstreamer +-# have_gst10=no +-# +-# GST10_MAJORMINOR=0.10 +-# GST10_REQ=0.10.0 +-# +-# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR, +-# have_gst10=yes,have_gst10=no) +-# +-# dnl Give error if we don't have gstreamer +-# if test "x$have_gst10" = "xno"; then +-# LIB_GST10="" +-# CFLAGS_GST10="" +-# else +-# LIB_GST10=$GST10_LIBS +-# CFLAGS_GST10=$GST10_CFLAGS +-# AC_SUBST(LIB_GST10) +-# AC_SUBST(CFLAGS_GST10) +-# AC_SUBST(GST10_MAJORMINOR) +-# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10]) +-# fi +-# fi +-#fi +-# +-#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes]) ++# Check whether --with-gstreamer10 or --without-gstreamer10 was given. ++if test "${with_gstreamer10+set}" = set; then ++ withval="$with_gstreamer10" ++ build_gstreamer10=$withval ++else ++ build_gstreamer10=no ++ ++fi; ++ ++if test "$build_gstreamer10" != "no"; then ++ if test "$PKGCONFIGFOUND" = "yes" ; then ++ # check for GStreamer ++ have_gst10=no ++ ++ GST10_MAJORMINOR=0.10 ++ GST10_REQ=0.10.0 ++ ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++ ++if test -n "$PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo "$as_me:$LINENO: checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" >&5 ++echo $ECHO_N "checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR... $ECHO_C" >&6 ++ ++ if $PKG_CONFIG --exists "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" ; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ succeeded=yes ++ ++ echo "$as_me:$LINENO: checking GST10_CFLAGS" >&5 ++echo $ECHO_N "checking GST10_CFLAGS... $ECHO_C" >&6 ++ GST10_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ echo "$as_me:$LINENO: result: $GST10_CFLAGS" >&5 ++echo "${ECHO_T}$GST10_CFLAGS" >&6 ++ ++ echo "$as_me:$LINENO: checking GST10_LIBS" >&5 ++echo $ECHO_N "checking GST10_LIBS... $ECHO_C" >&6 ++ GST10_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ echo "$as_me:$LINENO: result: $GST10_LIBS" >&5 ++echo "${ECHO_T}$GST10_LIBS" >&6 ++ else ++ GST10_CFLAGS="" ++ GST10_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ GST10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ have_gst10=yes ++ else ++ have_gst10=no ++ fi ++ ++ ++ if test "x$have_gst10" = "xno"; then ++ LIB_GST10="" ++ CFLAGS_GST10="" ++ else ++ LIB_GST10=$GST10_LIBS ++ CFLAGS_GST10=$GST10_CFLAGS ++ ++ ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_GSTREAMER10 1 ++_ACEOF ++ ++ fi ++ fi ++fi ++ ++ ++ ++if test x$have_gst10 = xyes; then ++ with_gst10_TRUE= ++ with_gst10_FALSE='#' ++else ++ with_gst10_TRUE='#' ++ with_gst10_FALSE= ++fi ++ + + ############################################################################### + # END GSTREAMER-0.10 CHECK +@@ -37885,7 +37992,7 @@ # BEGIN DO_NOT_COMPILE CHECK ############################################################################### @@ -9,7 +225,44 @@ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" no_engine=yes -@@ -40316,7 +40316,7 @@ +@@ -38007,6 +38114,12 @@ + ac_config_files="$ac_config_files amarok/src/engine/void/Makefile" + + ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/config/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/equalizer/Makefile" + + ac_config_files="$ac_config_files amarok/src/images/Makefile" + +@@ -38913,6 +39026,9 @@ + "amarok/src/engine/nmm/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;; + "amarok/src/engine/void/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;; + "amarok/src/engine/xine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;; ++ "amarok/src/engine/gst10/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/Makefile" ;; ++ "amarok/src/engine/gst10/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/config/Makefile" ;; ++ "amarok/src/engine/gst10/equalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/equalizer/Makefile" ;; + "amarok/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;; + "amarok/src/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;; + "amarok/src/konquisidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;; +@@ -39314,6 +39430,13 @@ + s, at taglib_includes@,$taglib_includes,;t t + s, at taglib_libs@,$taglib_libs,;t t + s, at RUBY@,$RUBY,;t t ++s, at GST10_CFLAGS@,$GST10_CFLAGS,;t t ++s, at GST10_LIBS@,$GST10_LIBS,;t t ++s, at LIB_GST10@,$LIB_GST10,;t t ++s, at CFLAGS_GST10@,$CFLAGS_GST10,;t t ++s, at GST10_MAJORMINOR@,$GST10_MAJORMINOR,;t t ++s, at with_gst10_TRUE@,$with_gst10_TRUE,;t t ++s, at with_gst10_FALSE@,$with_gst10_FALSE,;t t + s, at XINE_CONFIG@,$XINE_CONFIG,;t t + s, at with_xine_TRUE@,$with_xine_TRUE,;t t + s, at with_xine_FALSE@,$with_xine_FALSE,;t t +@@ -40259,7 +40382,7 @@ echo " ==================================" echo " =" echo " = No suitable multimedia framework was detected. You need to install at least" @@ -18,3 +271,29 @@ echo " =" fi +@@ -40290,9 +40413,9 @@ + # echo " = - aKode-engine" + # fi + +-# if test x$have_gst10 != xyes; then +-# echo " = - GStreamer0.10-engine" +-# fi ++ if test x$have_gst10 != xyes; then ++ echo " = - GStreamer0.10-engine" ++ fi + + if test x$build_xine != xyes; then + echo " = - xine-engine" +@@ -40359,9 +40482,9 @@ + # echo " = + aKode-engine" + # fi + +-# if test x$have_gst10 = xyes; then +-# echo " = + GStreamer0.10-engine" +-# fi ++ if test x$have_gst10 = xyes; then ++ echo " = + GStreamer0.10-engine" ++ fi + + if test x$build_xine = xyes; then + echo " = + xine-engine" Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- amarok.spec 19 May 2006 21:04:47 -0000 1.47 +++ amarok.spec 21 May 2006 13:17:47 -0000 1.48 @@ -7,8 +7,10 @@ License: GPL Url: http://amarok.kde.org Source0: http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2 -#Patch1: amarok-1.4-gstreamer.patch -#Patch2: amarok-1.4-engines-cfg.patch +# Bring back the gstreamer engine from 1.4 beta3 +Source1: gst10-1.4beta3.tar.gz +Patch1: amarok-1.4-gstreamer.patch +Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -22,15 +24,15 @@ BuildRequires: libtunepimp-devel >= 0.4.0 BuildRequires: kdebase-devel BuildRequires: alsa-lib-devel -#BuildRequires: akode-devel BuildRequires: libifp-devel, libusb-devel -%if "%fedora" >= "5" -# gstreamer disabled in version 1.4 final (not ready yet) -#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel BuildRequires: libgpod-devel -%else -BuildRequires: gstreamer-plugins-devel >= 0.8.4 +# Akode engine +#BuildRequires: akode-devel +# Gstreamer engine +%ifarch ppc64 x86_64 s390 s390x ia64 +BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel %endif +# Helix engine %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif @@ -63,6 +65,8 @@ Summary: Visualisation plugins for Amarok Group: Applications/Multimedia Requires: %{name} = %{version} +# RPM CVS supports "Suggests": +#Requires(hint): libvisual-plugins %description visualisation Amarok can use visualisation plugins from different origins. @@ -72,11 +76,15 @@ %prep -%setup -q -# Make Gstreamer a sufficient engine as well (only engine available on x86_64) -#%patch1 -p1 -b .gstreamer +%setup -q -a 1 +%ifarch ppc64 x86_64 s390 s390x ia64 +# Bring Gstreamer back and make it a sufficient engine +# (only engine available if Helix in unavailable) +mv gst10 amarok/src/engine/ +%patch1 -p1 -b .gstreamer # Gstreamer default sink should be autoaudiosink -#%patch2 -p1 -b .engines-cfg +%patch2 -p1 -b .engines-cfg +%endif %build @@ -169,12 +177,8 @@ %exclude %{_datadir}/apps/%{name}/images/xine_logo.png %{_datadir}/icons/hicolor/*/* %{_datadir}/applications/kde/*.desktop -%{_datadir}/services/amarok_void-engine_plugin.desktop -%{_datadir}/services/amarok_ifp-mediadevice.desktop %{_datadir}/servicetypes/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop -%{_libdir}/kde3/libamarok_void-engine_plugin.* -%{_libdir}/kde3/libamarok_ifp-mediadevice.* %{_libdir}/kde3/konqsidebar_universalamarok.* %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop @@ -187,13 +191,16 @@ # VFAT device support %{_datadir}/services/amarok_generic-mediadevice.desktop %{_libdir}/kde3/libamarok_generic-mediadevice.* -# Gstreamer engine - disabled in 1.4 final -%if "%fedora" >= "5" -#%{_datadir}/services/amarok_gst10engine_plugin.desktop -#%{_libdir}/kde3/libamarok_gst10engine_plugin.* -%else -%{_datadir}/services/amarok_gstengine_plugin.desktop -%{_libdir}/kde3/libamarok_gstengine_plugin.* +# iRiver device support +%{_datadir}/services/amarok_ifp-mediadevice.desktop +%{_libdir}/kde3/libamarok_ifp-mediadevice.* +# Void engine (noop) +%{_datadir}/services/amarok_void-engine_plugin.desktop +%{_libdir}/kde3/libamarok_void-engine_plugin.* +# Gstreamer engine +%ifarch ppc64 x86_64 s390 s390x ia64 +%{_datadir}/services/amarok_gst10engine_plugin.desktop +%{_libdir}/kde3/libamarok_gst10engine_plugin.* %endif # Akode engine - disabled in beta3 #%{_datadir}/services/amarok_aKode-engine.desktop @@ -216,6 +223,8 @@ %changelog * Mon May 15 2006 Aurelien Bompard 1.4-1 - version 1.4 final +- gstreamer engine has been disabled, bring it back in SOURCE1 + where Helix is unavailable (only engine available) * Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 - rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 May 2006 21:04:47 -0000 1.22 +++ sources 21 May 2006 13:17:47 -0000 1.23 @@ -1 +1,2 @@ 3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 +78f329116089047704f32158e204ef4f gst10-1.4beta3.tar.gz --- amarok-1.3.6-libtunepimp040.patch DELETED --- --- amarok-1.4beta1-gst10.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 21 13:19:33 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 21 May 2006 06:19:33 -0700 Subject: kmodtool - New directory Message-ID: <200605211319.k4LDJXbh018480@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/fedora/kmodtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18437/kmodtool Log Message: Directory /cvs/fedora/kmodtool added to the repository From fedora-extras-commits at redhat.com Sun May 21 13:21:03 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 21 May 2006 06:21:03 -0700 Subject: rpms/amarok/FC-5 amarok.spec,1.49,1.50 Message-ID: <200605211321.k4LDLZWK018582@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18545/FC-5 Modified Files: amarok.spec Log Message: forgot to bump release Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- amarok.spec 21 May 2006 13:17:46 -0000 1.49 +++ amarok.spec 21 May 2006 13:21:03 -0000 1.50 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL @@ -221,11 +221,13 @@ %changelog -* Mon May 15 2006 Aurelien Bompard 1.4-1 -- version 1.4 final +* Sun May 21 2006 Aurelien Bompard 1.4.0-2 - gstreamer engine has been disabled, bring it back in SOURCE1 where Helix is unavailable (only engine available) +* Mon May 15 2006 Aurelien Bompard 1.4-1 +- version 1.4 final + * Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 - rc1 From fedora-extras-commits at redhat.com Sun May 21 13:21:03 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 21 May 2006 06:21:03 -0700 Subject: rpms/amarok/devel amarok.spec,1.48,1.49 Message-ID: <200605211321.k4LDLZH9018585@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18545/devel Modified Files: amarok.spec Log Message: forgot to bump release Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- amarok.spec 21 May 2006 13:17:47 -0000 1.48 +++ amarok.spec 21 May 2006 13:21:03 -0000 1.49 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL @@ -221,11 +221,13 @@ %changelog -* Mon May 15 2006 Aurelien Bompard 1.4-1 -- version 1.4 final +* Sun May 21 2006 Aurelien Bompard 1.4.0-2 - gstreamer engine has been disabled, bring it back in SOURCE1 where Helix is unavailable (only engine available) +* Mon May 15 2006 Aurelien Bompard 1.4-1 +- version 1.4 final + * Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 - rc1 From fedora-extras-commits at redhat.com Sun May 21 13:22:29 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 21 May 2006 06:22:29 -0700 Subject: kmodtool kmodtool,NONE,1.1 Message-ID: <200605211322.k4LDMTae018613@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/fedora/kmodtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18596 Added Files: kmodtool Log Message: add the oldest kmodtool from lirc-kmod (1.1) --- NEW FILE kmodtool --- #!/bin/bash # kmodtool - Helper script for building kernel module RPMs # Copyright (c) 2003-2006 Ville Skytt?? , # Thorsten Leemhuis # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to # the following conditions: # # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" myver="0.10.3" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)' kmod_name= kver= verrel= variant= get_verrel () { verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" } print_verrel () { get_verrel $@ || return $? echo "${verrel}" } get_variant () { variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' } print_variant () { get_variant $@ || return $? echo "${variant}" } get_rpmtemplate () { local variant="${1}" local dashvariant="${variant:+-${variant}}" cat < /dev/null || : %postun -n kmod-${kmod_name}${dashvariant} /sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || : %files -n kmod-${kmod_name}${dashvariant} %defattr(644,root,root,755) /lib/modules/${verrel}${variant}/extra/${kmod_name}/ EOF } print_rpmtemplate () { kmod_name="${1}" shift kver="${1}" get_verrel "${1}" shift if [ -z "${kmod_name}" ] ; then echo "Please provide the kmodule-name as first parameter." >&2 exit 2 elif [ -z "${kver}" ] ; then echo "Please provide the kver as second parameter." >&2 exit 2 elif [ -z "${verrel}" ] ; then echo "Couldn't find out the verrel." >&2 exit 2 fi for variant in "$@" ; do get_rpmtemplate "${variant}" done } usage () { cat < $urishort has been marked as a thumbnail page."; $response->header(refresh => '5; url=javascript:window.close()'); - } elsif ($cmd eq ${Static::PROXY_SINGLE_THUMB} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_SINGLE_THUMB} ) { $thumbs->{$urishort} = 1; $content .= "$urishort (thumbnail) can now be accessed once."; $response->header(refresh => "1; $uri"); - } elsif ($cmd eq ${Static::PROXY_UNMARK_THUMB} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_THUMB} ) { delete $thumbs->{$urishort}; $content .= "$urishort has been removed from the thumbnail list."; - } elsif ($cmd eq ${Static::PROXY_MARK_PICTURE} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_PICTURE} ) { $pics->{$urishort} = 0; $content .= "$urishort has been marked as a picture page."; $response->header(refresh => '5; url=javascript:window.close()'); - } elsif ($cmd eq ${Static::PROXY_SINGLE_PICTURE} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_SINGLE_PICTURE} ) { $pics->{$urishort} = 1; $content .= "$urishort (picture) can now be accessed once."; $response->header(refresh => "1; $uri"); - } elsif ($cmd eq ${Static::PROXY_UNMARK_PICTURE} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_PICTURE} ) { delete $pics->{$urishort}; $content .= "$urishort has been removed from the picture list."; - } elsif ($cmd eq ${Static::PROXY_MARK_DOWNLOAD} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_DOWNLOAD} ) { $pics->{$urishort} = 0; $content .= "$urishort has been marked as a picture page.
"; if (exists $downs->{$urishort}) { @@ -246,59 +246,59 @@ } $response->header(refresh => '5; url=javascript:window.close()'); - } elsif ($cmd eq ${Static::PROXY_UNMARK_DOWNLOAD} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_DOWNLOAD} ) { delete $downs->{$urishort}; $content .= "$urishort has been removed from the download list"; - } elsif ($cmd eq ${Static::PROXY_MARK_DOWNLOAD} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_DOWNLOAD} ) { $content .= '

p0rn-proxy main menu

"; + "
  • list thumbnail pages
    • " . + "
  • list picture pages
    • " . + "
  • list download pages
    • " . + "
    p0rn-proxy ${P0rn::Static::VERSION}/$CVSVERSION"; - } elsif ($cmd eq ${Static::PROXY_LIST_THUMB} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_THUMB} ) { $content .= '

    thumbnail pages

    '; foreach my $u (sort keys %{$thumbs}) { - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } - } elsif ($cmd eq ${Static::PROXY_LIST_PICTURE} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_PICTURE} ) { $content .= '

    picture pages

    '; foreach my $u (sort keys %{$pics}) { - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } - } elsif ($cmd eq ${Static::PROXY_LIST_DOWNLOAD} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_DOWNLOAD} ) { $content .= '

    download pages

    '; $content .= '

    queued

    '; foreach my $u (sort keys %{$downs}) { next unless $downs->{$u} == 0; - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } $content .= '

    running

    '; foreach my $u (sort keys %{$downs}) { next unless $downs->{$u} == 1; - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } $content .= '

    finished

    '; foreach my $u (sort keys %{$downs}) { next unless $downs->{$u} == 2; - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } - } elsif ($cmd eq ${Static::PROXY_GET_VERSION} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_GET_VERSION} ) { - $content .= "\nVERSION: ${Static::VERSION}/$CVSVERSION\n"; + $content .= "\nVERSION: ${P0rn::Static::VERSION}/$CVSVERSION\n"; } else { $content .= "unknown command $cmd: ".$request->uri().''; @@ -342,8 +342,8 @@ my $content = << "EOF"; thumbnail page $urishort is considered a thumbnail page and thus not displayed.
    [ -access once -| access always +access once +| access always ] EOF ; @@ -360,8 +360,8 @@ my $content = << "EOF"; already seen $urishort is considered an already seen picture page and thus not displayed.
    [ -access once -| access always +access once +| access always ] EOF ; @@ -389,10 +389,10 @@ my $content = $response->content(); my $linkline = '

    ' . - '[ th: mark as thumbnail page ' . - '| ad: proxy admin ' . - '| pi: mark as picture page ' . - '| do: mark as picture page and download ' . + '[ th: mark as thumbnail page ' . + '| ad: proxy admin ' . + '| pi: mark as picture page ' . + '| do: mark as picture page and download ' . ']

    '; $content =~ s/]*)>/$linkline/i; @@ -438,7 +438,7 @@ ######[ Main program ] # -print "this is p0rn-proxy ${Static::VERSION}/${CVSVERSION}\n"; +print "this is p0rn-proxy ${P0rn::Static::VERSION}/${CVSVERSION}\n"; # define configuration options my $config = AppConfig->new( { CASE => 1 } ); @@ -486,7 +486,7 @@ # create UserAgent $ua = LWP::UserAgent->new; -$ua->agent("p0rn-proxy ${Static::VERSION}/${CVSVERSION}"); +$ua->agent("p0rn-proxy ${P0rn::Static::VERSION}/${CVSVERSION}"); if ( defined $config->proxy() and $config->proxy() ne "" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 May 2006 20:23:46 -0000 1.1 +++ .cvsignore 22 May 2006 20:24:28 -0000 1.2 @@ -0,0 +1 @@ +p0rn-comfort-0.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 May 2006 20:23:46 -0000 1.1 +++ sources 22 May 2006 20:24:28 -0000 1.2 @@ -0,0 +1 @@ +08be31c527f7577765c4721d1bdf02f7 p0rn-comfort-0.0.4.tar.gz From fedora-extras-commits at redhat.com Mon May 22 21:08:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 14:08:22 -0700 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.10, 1.11 perl-Module-Build.spec, 1.19, 1.20 sources, 1.10, 1.11 Message-ID: <200605222108.k4ML8Paq022306@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-serv22285 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2801. Drop the /dev/zero hack. (Upstream fixed this problem.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 12 May 2006 17:08:10 -0000 1.10 +++ .cvsignore 22 May 2006 21:08:22 -0000 1.11 @@ -1 +1 @@ -Module-Build-0.28.tar.gz +Module-Build-0.2801.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- perl-Module-Build.spec 18 May 2006 22:33:05 -0000 1.19 +++ perl-Module-Build.spec 22 May 2006 21:08:22 -0000 1.20 @@ -1,8 +1,8 @@ -%define module_version 0.28 +%define module_version 0.2801 Name: perl-Module-Build -Version: 0.2800 -Release: 2%{?dist} +Version: 0.2801 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,9 +48,7 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -# 0.28 builds fail in the build system due -# to no stdin in t/extend, so we cheat. -./Build test < /dev/zero +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +62,10 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Mon May 22 2006 Steven Pritchard 0.2801-1 +- Update to 0.2801. +- Drop the /dev/zero hack. (Upstream fixed this problem.) + * Thu May 18 2006 Steven Pritchard 0.2800-2 - Take input from /dev/zero during "Build test" to avoid test failure. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 12 May 2006 17:08:10 -0000 1.10 +++ sources 22 May 2006 21:08:22 -0000 1.11 @@ -1 +1 @@ -8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz +fa10e5b53bc41e3948df56d4d115764d Module-Build-0.2801.tar.gz From fedora-extras-commits at redhat.com Mon May 22 21:25:54 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:25:54 -0700 Subject: rpms/emacs-common-muse - New directory Message-ID: <200605222125.k4MLPuGu022461@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22440/emacs-common-muse Log Message: Directory /cvs/extras/rpms/emacs-common-muse added to the repository From fedora-extras-commits at redhat.com Mon May 22 21:25:55 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:25:55 -0700 Subject: rpms/emacs-common-muse/devel - New directory Message-ID: <200605222125.k4MLPvMb022464@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22440/emacs-common-muse/devel Log Message: Directory /cvs/extras/rpms/emacs-common-muse/devel added to the repository From fedora-extras-commits at redhat.com Mon May 22 21:26:13 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:26:13 -0700 Subject: rpms/emacs-common-muse Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605222126.k4MLQFNQ022518@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22485 Added Files: Makefile import.log Log Message: Setup of module emacs-common-muse --- NEW FILE Makefile --- # Top level Makefile for module emacs-common-muse all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon May 22 21:26:13 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:26:13 -0700 Subject: rpms/emacs-common-muse/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605222126.k4MLQFxO022521@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22485/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module emacs-common-muse --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon May 22 21:26:50 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:26:50 -0700 Subject: rpms/emacs-common-muse import.log,1.1,1.2 Message-ID: <200605222126.k4MLQqZK022585@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22550 Modified Files: import.log Log Message: auto-import emacs-common-muse-3.02.6b-5 on branch devel from emacs-common-muse-3.02.6b-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 May 2006 21:26:12 -0000 1.1 +++ import.log 22 May 2006 21:26:50 -0000 1.2 @@ -0,0 +1 @@ +emacs-common-muse-3_02_6b-5:HEAD:emacs-common-muse-3.02.6b-5.src.rpm:1148333202 From fedora-extras-commits at redhat.com Mon May 22 21:26:50 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:26:50 -0700 Subject: rpms/emacs-common-muse/devel emacs-common-muse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605222126.k4MLQqAe022590@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22550/devel Modified Files: .cvsignore sources Added Files: emacs-common-muse.spec Log Message: auto-import emacs-common-muse-3.02.6b-5 on branch devel from emacs-common-muse-3.02.6b-5.src.rpm --- NEW FILE emacs-common-muse.spec --- %define pkg muse %define xemacs 0 %define emacs_sitelisp %{_datadir}/emacs/site-lisp %define emacs_ver 21.4 %if %{xemacs} %define xemacs_sitelisp %{_datadir}/xemacs/xemacs-packages/lisp %define xemacs_ver 21.4.18 %endif Name: emacs-common-muse Version: 3.02.6b Release: 5%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL URL: http://www.mwolson.org/projects/MuseMode.html BuildArch: noarch Source0: http://download.gna.org/muse-el/%{pkg}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs >= %{emacs_ver}, texinfo Requires: /sbin/install-info Obsoletes: muse = 3.02.6b %if %{xemacs} BuildRequires: xemacs >= %{xemacs_ver} %endif %description Muse is an authoring and publishing environment for (X)Emacs. It simplifies the process of writings documents and publishing them to various output formats. Muse uses a very simple Wiki-like format as input. Muse consists of two main parts: an enhanced text-mode for authoring documents and navigating within Muse projects, and a set of publishing styles for generating different kinds of output. This package contains the files common to both the Emacs and XEmacs installations of Muse. You need to install either (or both) of emacs-%{pkg} and xemacs-%{pkg} to use Muse. %package -n emacs-%{pkg} Summary: Compiled Muse lisp files for Emacs Group: Applications/Editors Requires: %{name} = %{version} Requires: emacs >= %{emacs_ver} Requires: tetex-latex %description -n emacs-%{pkg} This package contains the files required to use Muse with Emacs. %package -n emacs-%{pkg}-el Summary: Muse lisp source files for Emacs Group: Applications/Editors Requires: %{name} = %{version} Requires: emacs-%{pkg} = %{version} %description -n emacs-%{pkg}-el This package contains the source lisp files for Muse for Emacs. %if %{xemacs} %package -n xemacs-%{pkg} Summary: Compiled Muse lisp files for XEmacs Group: Applications/Editors Requires: %{name} = %{version} Requires: xemacs >= %{xemacs_ver} Requires: tetex-latex %description -n xemacs-%{pkg} This package contains the files required to use Muse with XEmacs. %package -n xemacs-%{pkg}-el Summary: Muse lisp source files for XEmacs Group: Applications/Editors Requires: %{name} = %{version} Requires: xemacs-%{pkg} = %{version} %description -n xemacs-%{pkg}-el This package contains the source lisp files for Muse for XEmacs. %endif %prep %setup -q -n %{pkg}-%{version} %build #Note that %{_smp_mflags} causes make to hang sometimes here. make all muse.html %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_infodir} make install \ PREFIX=%{buildroot}/%{_usr} \ INFODIR=%{buildroot}/%{_infodir} \ INSTALLINFO="/sbin/install-info --infodir=%{buildroot}/%{_infodir}" # Create startup file. mkdir -p %{buildroot}/%{emacs_sitelisp}/site-start.d cat > muse-init.el << EOF ;; Load muse-mode (require 'muse-mode) ;; Load publishing styles (require 'muse-html) (require 'muse-latex) (require 'muse-texinfo) (require 'muse-docbook) (require 'muse-wiki) (require 'muse-journal) EOF cp muse-init.el %{buildroot}/%{emacs_sitelisp}/site-start.d/ # Xemacs files %if %{xemacs} make clean make lisp EMACS=xemacs SITEFLAG=-no-site-file make install-bin ELISPDIR=%{buildroot}/%{xemacs_sitelisp}/%{pkg} mkdir -p %{buildroot}/%{xemacs_sitelisp}/site-start.d cp muse-init.el %{buildroot}/%{xemacs_sitelisp}/site-start.d/ %endif # Remove info dir creating by make install rm -f %{buildroot}/usr/share/info/dir %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) %doc README NEWS AUTHORS ChangeLog ChangeLog.2004 ChangeLog.main examples muse.html %doc %{_infodir}/* %files -n emacs-%{pkg} %defattr(-,root,root,-) %{emacs_sitelisp}/%{pkg}/*.elc %dir %{emacs_sitelisp}/%{pkg} %{emacs_sitelisp}/site-start.d/muse-init.el %files -n emacs-%{pkg}-el %defattr(-,root,root,-) %{emacs_sitelisp}/%{pkg}/*.el %if %{xemacs} %files -n xemacs-%{pkg} %defattr(-,root,root,-) %{xemacs_sitelisp}/%{pkg}/*.elc %dir %{xemacs_sitelisp}/%{pkg} %{xemacs_sitelisp}/site-start.d/muse-init.el %files -n xemacs-%{pkg}-el %defattr(-,root,root,-) %{xemacs_sitelisp}/%{pkg}/*.el %endif %changelog * Mon May 22 2006 Jonathan G. Underwood - 3.02.6b-5 - Rename package to emacs-common-muse * Sun Apr 23 2006 Jonathan Underwood - 3.02.6b-4 - Update to version 3.02.6b * Sun Mar 5 2006 Jonathan Underwood - 3.02.6a-3 - Added BuildRequires: texinfo - Remove info dir from buildroot (created by make install) * Fri Feb 10 2006 Jonathan Underwood - 3.02.6a-1 - Initial package build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 May 2006 21:26:13 -0000 1.1 +++ .cvsignore 22 May 2006 21:26:50 -0000 1.2 @@ -0,0 +1 @@ +muse-3.02.6b.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 May 2006 21:26:13 -0000 1.1 +++ sources 22 May 2006 21:26:50 -0000 1.2 @@ -0,0 +1 @@ +98fd1e6f5e6211f375561705854d4809 muse-3.02.6b.tar.gz From fedora-extras-commits at redhat.com Mon May 22 21:28:56 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:28:56 -0700 Subject: owners owners.list,1.1045,1.1046 Message-ID: <200605222128.k4MLSwr1022645@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22628 Modified Files: owners.list Log Message: Removed entry for package: muse Added entry for package: emacs-common-muse Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1045 retrieving revision 1.1046 diff -u -r1.1045 -r1.1046 --- owners.list 22 May 2006 20:21:39 -0000 1.1045 +++ owners.list 22 May 2006 21:28:56 -0000 1.1046 @@ -243,6 +243,7 @@ Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org| +Fedora Extras|emacs-common-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|embryo|A C like scripting language|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org| @@ -808,7 +809,6 @@ Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org| Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org| -Fedora Extras|muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|musicbox|A simple one-file-at-a-time audio tag editor|splinux at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|nabi|Simple Hangul X Input Method|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 22 22:08:06 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 15:08:06 -0700 Subject: rpms/emacs-common-muse/FC-5 emacs-common-muse.spec,1.1,1.2 Message-ID: <200605222208.k4MM88JS025275@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256 Modified Files: emacs-common-muse.spec Log Message: Add XEmacs build Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-5/emacs-common-muse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-common-muse.spec 22 May 2006 21:26:50 -0000 1.1 +++ emacs-common-muse.spec 22 May 2006 22:08:06 -0000 1.2 @@ -1,5 +1,5 @@ %define pkg muse -%define xemacs 0 +%define xemacs 1 %define emacs_sitelisp %{_datadir}/emacs/site-lisp %define emacs_ver 21.4 From fedora-extras-commits at redhat.com Mon May 22 22:10:30 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 15:10:30 -0700 Subject: rpms/emacs-common-muse/FC-5 emacs-common-muse.spec,1.2,1.3 Message-ID: <200605222210.k4MMAWpg025343@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25326 Modified Files: emacs-common-muse.spec Log Message: Release tag bump Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-5/emacs-common-muse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emacs-common-muse.spec 22 May 2006 22:08:06 -0000 1.2 +++ emacs-common-muse.spec 22 May 2006 22:10:30 -0000 1.3 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.6b -Release: 5%{?dist} +Release: 6%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL From fedora-extras-commits at redhat.com Mon May 22 22:11:47 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 15:11:47 -0700 Subject: rpms/emacs-common-muse/FC-4 emacs-common-muse.spec,1.1,1.2 Message-ID: <200605222211.k4MMBnLR025414@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25389 Modified Files: emacs-common-muse.spec Log Message: Add XEmacs package build Bump release tag Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-4/emacs-common-muse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-common-muse.spec 22 May 2006 21:26:50 -0000 1.1 +++ emacs-common-muse.spec 22 May 2006 22:11:47 -0000 1.2 @@ -1,5 +1,5 @@ %define pkg muse -%define xemacs 0 +%define xemacs 1 %define emacs_sitelisp %{_datadir}/emacs/site-lisp %define emacs_ver 21.4 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.6b -Release: 5%{?dist} +Release: 6%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL From fedora-extras-commits at redhat.com Mon May 22 22:12:40 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 15:12:40 -0700 Subject: rpms/emacs-common-muse/devel emacs-common-muse.spec,1.1,1.2 Message-ID: <200605222212.k4MMCgi4025483@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25466 Modified Files: emacs-common-muse.spec Log Message: Bump release tag Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/devel/emacs-common-muse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-common-muse.spec 22 May 2006 21:26:50 -0000 1.1 +++ emacs-common-muse.spec 22 May 2006 22:12:39 -0000 1.2 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.6b -Release: 5%{?dist} +Release: 6%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL From fedora-extras-commits at redhat.com Mon May 22 22:55:25 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Mon, 22 May 2006 15:55:25 -0700 Subject: rpms/apt/devel apt.spec,1.30,1.31 Message-ID: <200605222255.k4MMtR4H025774@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25727/devel Modified Files: apt.spec Log Message: Fix broken upgrade paths (thanks to Ville). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- apt.spec 22 May 2006 18:48:12 -0000 1.30 +++ apt.spec 22 May 2006 22:55:25 -0000 1.31 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ License: GPL @@ -36,7 +36,7 @@ # TODO: verify the required minimum Python version BuildRequires: python-devel >= 2.2 BuildRequires: libxml2-devel -BuildRequires: rpm-devel +BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: libstdc++-devel From fedora-extras-commits at redhat.com Mon May 22 22:55:19 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Mon, 22 May 2006 15:55:19 -0700 Subject: rpms/apt/FC-4 apt.spec,1.19,1.20 Message-ID: <200605222255.k4MMtpbb025782@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25727/FC-4 Modified Files: apt.spec Log Message: Fix broken upgrade paths (thanks to Ville). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/FC-4/apt.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apt.spec 22 May 2006 20:10:48 -0000 1.19 +++ apt.spec 22 May 2006 22:55:19 -0000 1.20 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3.1 -Release: 4.1%{?dist} +Release: 5%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ License: GPL From fedora-extras-commits at redhat.com Mon May 22 22:55:19 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Mon, 22 May 2006 15:55:19 -0700 Subject: rpms/apt/FC-5 apt.spec,1.19,1.20 Message-ID: <200605222255.k4MMtpQM025785@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25727/FC-5 Modified Files: apt.spec Log Message: Fix broken upgrade paths (thanks to Ville). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/FC-5/apt.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apt.spec 22 May 2006 18:48:06 -0000 1.19 +++ apt.spec 22 May 2006 22:55:19 -0000 1.20 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ License: GPL @@ -36,7 +36,7 @@ # TODO: verify the required minimum Python version BuildRequires: python-devel >= 2.2 BuildRequires: libxml2-devel -BuildRequires: rpm-devel +BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: libstdc++-devel From fedora-extras-commits at redhat.com Tue May 23 02:03:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:03:44 -0700 Subject: rpms/perl-IO-Null - New directory Message-ID: <200605230203.k4N23kHA003396@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3360/perl-IO-Null Log Message: Directory /cvs/extras/rpms/perl-IO-Null added to the repository From fedora-extras-commits at redhat.com Tue May 23 02:03:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:03:45 -0700 Subject: rpms/perl-IO-Null/devel - New directory Message-ID: <200605230203.k4N23lZi003399@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3360/perl-IO-Null/devel Log Message: Directory /cvs/extras/rpms/perl-IO-Null/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 02:04:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:04:02 -0700 Subject: rpms/perl-IO-Null Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605230204.k4N244XT003443@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3415 Added Files: Makefile import.log Log Message: Setup of module perl-IO-Null --- NEW FILE Makefile --- # Top level Makefile for module perl-IO-Null all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 23 02:04:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:04:03 -0700 Subject: rpms/perl-IO-Null/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605230204.k4N245d3003446@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3415/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-IO-Null --- NEW 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 May 23 02:04:38 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:04:38 -0700 Subject: rpms/perl-IO-Null/devel perl-IO-Null.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605230204.k4N24eRE003514@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3479/devel Modified Files: .cvsignore sources Added Files: perl-IO-Null.spec Log Message: auto-import perl-IO-Null-1.01-1 on branch devel from perl-IO-Null-1.01-1.src.rpm --- NEW FILE perl-IO-Null.spec --- Name: perl-IO-Null Version: 1.01 Release: 1%{?dist} Summary: Class for null filehandles License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Null/ Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/IO-Null-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IO::Null is a class for null filehandles. Calling a constructor of this class always succeeds, returning a new null filehandle. Writing to any object of this class is always a no-operation, and returns true. Reading from any object of this class is always no-operation, and returns empty-string or empty-list, as appropriate. %prep %setup -q -n IO-Null-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Mar 09 2006 Steven Pritchard 1.01-1 - Specfile autogenerated. - Improve description and Summary. - Fix License. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Null/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 02:04:03 -0000 1.1 +++ .cvsignore 23 May 2006 02:04:38 -0000 1.2 @@ -0,0 +1 @@ +IO-Null-1.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Null/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 02:04:03 -0000 1.1 +++ sources 23 May 2006 02:04:38 -0000 1.2 @@ -0,0 +1 @@ +54d6084398f8b4e7062660b9ccc835a8 IO-Null-1.01.tar.gz From fedora-extras-commits at redhat.com Tue May 23 02:04:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:04:37 -0700 Subject: rpms/perl-IO-Null import.log,1.1,1.2 Message-ID: <200605230205.k4N259eE003525@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3479 Modified Files: import.log Log Message: auto-import perl-IO-Null-1.01-1 on branch devel from perl-IO-Null-1.01-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Null/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 02:04:02 -0000 1.1 +++ import.log 23 May 2006 02:04:36 -0000 1.2 @@ -0,0 +1 @@ +perl-IO-Null-1_01-1:HEAD:perl-IO-Null-1.01-1.src.rpm:1148349868 From fedora-extras-commits at redhat.com Tue May 23 02:08:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:08:50 -0700 Subject: owners owners.list,1.1046,1.1047 Message-ID: <200605230208.k4N28qtn003591@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3570 Modified Files: owners.list Log Message: Add perl-IO-Null. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1046 retrieving revision 1.1047 diff -u -r1.1046 -r1.1047 --- owners.list 22 May 2006 21:28:56 -0000 1.1046 +++ owners.list 23 May 2006 02:08:50 -0000 1.1047 @@ -1086,6 +1086,7 @@ Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Interface|Perl extension for accessing network card configuration information|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-Null|Class for null filehandles|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 23 02:12:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:12:10 -0700 Subject: rpms/perl-Module-Build/FC-5 .cvsignore, 1.10, 1.11 perl-Module-Build.spec, 1.17, 1.18 sources, 1.10, 1.11 Message-ID: <200605230212.k4N2CCWb003667@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3645 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2801. Drop the /dev/zero hack. (Upstream fixed this problem.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 23:29:10 -0000 1.10 +++ .cvsignore 23 May 2006 02:12:10 -0000 1.11 @@ -1 +1 @@ -Module-Build-0.28.tar.gz +Module-Build-0.2801.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/perl-Module-Build.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Module-Build.spec 20 May 2006 15:32:02 -0000 1.17 +++ perl-Module-Build.spec 23 May 2006 02:12:10 -0000 1.18 @@ -1,8 +1,8 @@ -%define module_version 0.28 +%define module_version 0.2801 Name: perl-Module-Build -Version: 0.2800 -Release: 2%{?dist} +Version: 0.2801 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,9 +48,7 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -# 0.28 builds fail in the build system due -# to no stdin in t/extend, so we cheat. -./Build test < /dev/zero +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +62,10 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Mon May 22 2006 Steven Pritchard 0.2801-1 +- Update to 0.2801. +- Drop the /dev/zero hack. (Upstream fixed this problem.) + * Thu May 18 2006 Steven Pritchard 0.2800-2 - Take input from /dev/zero during "Build test" to avoid test failure. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 23:29:10 -0000 1.10 +++ sources 23 May 2006 02:12:10 -0000 1.11 @@ -1 +1 @@ -8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz +fa10e5b53bc41e3948df56d4d115764d Module-Build-0.2801.tar.gz From fedora-extras-commits at redhat.com Tue May 23 02:13:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:13:06 -0700 Subject: rpms/perl-Module-Build/FC-4 .cvsignore, 1.9, 1.10 perl-Module-Build.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200605230213.k4N2D8u6003744@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3723 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2801. Drop the /dev/zero hack. (Upstream fixed this problem.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 May 2006 20:04:03 -0000 1.9 +++ .cvsignore 23 May 2006 02:13:05 -0000 1.10 @@ -1 +1 @@ -Module-Build-0.28.tar.gz +Module-Build-0.2801.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/perl-Module-Build.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Module-Build.spec 20 May 2006 20:04:03 -0000 1.13 +++ perl-Module-Build.spec 23 May 2006 02:13:05 -0000 1.14 @@ -1,8 +1,8 @@ -%define module_version 0.28 +%define module_version 0.2801 Name: perl-Module-Build -Version: 0.2800 -Release: 2%{?dist} +Version: 0.2801 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,9 +48,7 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -# 0.28 builds fail in the build system due -# to no stdin in t/extend, so we cheat. -./Build test < /dev/zero +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +62,10 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Mon May 22 2006 Steven Pritchard 0.2801-1 +- Update to 0.2801. +- Drop the /dev/zero hack. (Upstream fixed this problem.) + * Thu May 18 2006 Steven Pritchard 0.2800-2 - Take input from /dev/zero during "Build test" to avoid test failure. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 May 2006 20:04:03 -0000 1.9 +++ sources 23 May 2006 02:13:05 -0000 1.10 @@ -1 +1 @@ -8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz +fa10e5b53bc41e3948df56d4d115764d Module-Build-0.2801.tar.gz From fedora-extras-commits at redhat.com Tue May 23 04:37:24 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Mon, 22 May 2006 21:37:24 -0700 Subject: rpms/libapreq2/devel .cvsignore, 1.9, 1.10 libapreq2.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200605230437.k4N4bQhv008898@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8877 Modified Files: .cvsignore libapreq2.spec sources Log Message: Bump up to libapreq2 2.08-RC2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 19 May 2006 11:01:52 -0000 1.9 +++ .cvsignore 23 May 2006 04:37:23 -0000 1.10 @@ -1 +1 @@ -libapreq2-2.08-RC1.tar.gz +libapreq2-2.08-RC2.tar.gz Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libapreq2.spec 19 May 2006 11:01:52 -0000 1.11 +++ libapreq2.spec 23 May 2006 04:37:23 -0000 1.12 @@ -2,13 +2,13 @@ Name: libapreq2 Version: 2.08 -Release: 0.rc1.1%{?dist} +Release: 0.rc2.1%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries License: Apache Software License URL: http://httpd.apache.org/apreq/ -Source0: http://people.apache.org/~pgollucci/apreq2/libapreq2-2.08-RC1.tar.gz +Source0: http://people.apache.org/~pgollucci/apreq2/libapreq2-2.08-RC2.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-build.patch Patch1: %{name}-2.07-rc3-ldflags.patch @@ -61,6 +61,7 @@ #!/bin/sh %{__perl_provides} $* \ | grep -v 'perl(APR::\(Request\(::\(Apache2\|CGI\|Error\)\)\?\))$' \ +| grep -v 'perl(Apache2::\(Cookie\|Request\|Upload\))$' EOF %define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl-prov chmod +x %{__perl_provides} @@ -146,10 +147,15 @@ %doc glue/perl/README %{perl_vendorarch}/auto/APR/ %{perl_vendorarch}/APR/ +%{perl_vendorarch}/Apache2/ %{_mandir}/man3/A*::*.3* %changelog +* Tue May 23 2006 Bojan Smojver - 2.08-0.rc2.1 +- bump up to 2.08-RC2 for Rawhide +- revert back some changes to spec file made for 2.08-RC1 + * Fri May 19 2006 Bojan Smojver - 2.08-0.rc1.1 - bump up to 2.08-RC1 for Rawhide Index: sources =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 May 2006 11:01:52 -0000 1.9 +++ sources 23 May 2006 04:37:23 -0000 1.10 @@ -1 +1 @@ -4604dcb53dc913a4484d4d263c0105f5 libapreq2-2.08-RC1.tar.gz +628be7e43c3ead0aa6f2356717c4632f libapreq2-2.08-RC2.tar.gz From fedora-extras-commits at redhat.com Tue May 23 07:48:17 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Tue, 23 May 2006 00:48:17 -0700 Subject: fedora-security/audit fc4,1.258,1.259 fc5,1.172,1.173 Message-ID: <200605230748.k4N7mHmY016576@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16550/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-2444 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- fc4 22 May 2006 14:54:41 -0000 1.258 +++ fc4 23 May 2006 07:48:14 -0000 1.259 @@ -5,6 +5,7 @@ CVE-2006-2493 ** freetype CVE-2006-2480 VULNERABLE (dia) #192538 +CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- fc5 22 May 2006 14:54:41 -0000 1.172 +++ fc5 23 May 2006 07:48:14 -0000 1.173 @@ -4,6 +4,7 @@ ** are items that need attention CVE-2006-2493 ** freetype +CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] From fedora-extras-commits at redhat.com Tue May 23 08:08:22 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Tue, 23 May 2006 01:08:22 -0700 Subject: fedora-security/audit fc4,1.259,1.260 fc5,1.173,1.174 Message-ID: <200605230808.k4N88Mpa018984@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18962/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-1242 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- fc4 23 May 2006 07:48:14 -0000 1.259 +++ fc4 23 May 2006 08:08:20 -0000 1.260 @@ -143,7 +143,7 @@ CVE-2006-1342 version (kernel, not 2.6) not vulnerable CVE-2006-1273 ignore (firefox) This is an IE only issue CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues -CVE-2006-1242 VULNERABLE (kernel) +CVE-2006-1242 version (kernel, fixed 2.6.16.1) [since FEDORA-2006-245] CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- fc5 23 May 2006 07:48:14 -0000 1.173 +++ fc5 23 May 2006 08:08:20 -0000 1.174 @@ -144,7 +144,7 @@ CVE-2006-1296 version (beagle, fixed 0.2.4) bz#185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188 CVE-2006-1273 ignore (firefox) this issue only affects IE CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues -CVE-2006-1242 VULNERABLE (kernel) +CVE-2006-1242 version (kernel, fixed 2.6.16.1) [since FEDORA-2006-233] CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability From fedora-extras-commits at redhat.com Tue May 23 09:07:32 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:07:32 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.18,1.19 Message-ID: <200605230907.k4N97Yhc021580@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21563 Modified Files: php-eaccelerator.spec Log Message: Rebuild against PHP 5.1.4. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- php-eaccelerator.spec 10 May 2006 09:36:50 -0000 1.18 +++ php-eaccelerator.spec 23 May 2006 09:07:32 -0000 1.19 @@ -1,7 +1,7 @@ # Useful defaults when building in chroots on systems where PHP is unavailable %define default_extdir %{_libdir}/php4 %define default_apiver 20041225 -%define default_version 5.1.3 +%define default_version 5.1.4 %define module_version 0.9.5 %define prever beta2 @@ -100,6 +100,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 +- Rebuild against PHP 5.1.4. + * Fri May 5 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 - Rework heavily the API version requirement detection, should work with chroots builds where PHP isn't installed outside. From fedora-extras-commits at redhat.com Tue May 23 09:12:27 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:12:27 -0700 Subject: rpms/php-eaccelerator/FC-5 eaccelerator-0.9.5-beta2-64bit_cast_warning.patch, NONE, 1.1 eaccelerator-0.9.5-beta2-compile.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 php-eaccelerator.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200605230912.k4N9CTH7021691@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656 Modified Files: .cvsignore php-eaccelerator.spec sources Added Files: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch eaccelerator-0.9.5-beta2-compile.patch Log Message: Backport all development changes : Update to 0.9.5beta2, include patches and enhance the versions detection in the spec file. eaccelerator-0.9.5-beta2-64bit_cast_warning.patch: --- NEW FILE eaccelerator-0.9.5-beta2-64bit_cast_warning.patch --- Index: opcodes.h =================================================================== --- opcodes.h (revision 202) +++ opcodes.h (working copy) @@ -85,7 +85,7 @@ #define OPS_STD EXT_STD | OP1_STD | OP2_STD | RES_STD #ifdef ZEND_ENGINE_2 -# define VAR_NUM(var) ((unsigned int)(((temp_variable *)(var))-((temp_variable *)NULL))) +# define VAR_NUM(var) ((unsigned int)(((temp_variable *)((intptr_t) var))-((temp_variable *)NULL))) # define VAR_VAL(var) ((unsigned int)((var)*sizeof(temp_variable))) #else # define VAR_NUM(var) ((unsigned int)(var)) Index: loader.c =================================================================== --- loader.c (revision 202) +++ loader.c (working copy) @@ -86,7 +86,7 @@ zend_bailout(); } #ifdef ZEND_ENGINE_2 - return (unsigned int)(((temp_variable*)NULL) + var); + return (unsigned int)((intptr_t) ((temp_variable*)NULL) + var); #else return var; #endif eaccelerator-0.9.5-beta2-compile.patch: --- NEW FILE eaccelerator-0.9.5-beta2-compile.patch --- Index: optimize.c =================================================================== --- optimize.c (revision 199) +++ optimize.c (working copy) @@ -1499,23 +1499,26 @@ if (!EAG(encoder) || (name_len == sizeof("false")-1 && strcmp(name,"false") == 0) || (name_len == sizeof("true")-1 && strcmp(name,"true") == 0)) { - zend_constant *c; + union { + zend_constant *v; + void *ptr; + } c; int retval; char *lookup_name = do_alloca(name_len+1); memcpy(lookup_name, name, name_len); lookup_name[name_len] = '\0'; - if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) { - *result = c; + if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, &c.ptr)==SUCCESS) { + *result = c.v; retval=1; } else { zend_str_tolower(lookup_name, name_len); - if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) { - if ((c->flags & CONST_CS) && (memcmp(c->name, name, name_len)!=0)) { + if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, &c.ptr)==SUCCESS) { + if ((c.v->flags & CONST_CS) && (memcmp(c.v->name, name, name_len)!=0)) { retval=0; } else { - *result = c; + *result = c.v; retval=1; } } else { @@ -2543,52 +2546,49 @@ #endif IS_DEFINED(op->op1)) { zend_op *x = DEFINED_OP(op->op1); - if ((x->opcode == ZEND_FETCH_W || x->opcode == ZEND_FETCH_RW) && - x->op1.op_type == IS_CONST && - x->op1.u.constant.type == IS_STRING) { + if ((x->opcode == ZEND_FETCH_W || x->opcode == ZEND_FETCH_RW) && + x->op1.op_type == IS_CONST && x->op1.u.constant.type == IS_STRING) { + union { + zend_op *v; + void *ptr; + } op_copy; char *s = emalloc(x->op1.u.constant.value.str.len+2); + op_copy.v = op; memcpy(s,x->op1.u.constant.value.str.val,x->op1.u.constant.value.str.len); s[x->op1.u.constant.value.str.len] = (char)FETCH_TYPE(x); s[x->op1.u.constant.value.str.len+1] = '\0'; - zend_hash_update(&assigns, - s, x->op1.u.constant.value.str.len+2, - (void**)&op, sizeof(void*), NULL); + zend_hash_update(&assigns, s, x->op1.u.constant.value.str.len+2, &op_copy.ptr, + sizeof(void*), NULL); efree(s); } } - } else if ((op->opcode == ZEND_FETCH_R || - op->opcode == ZEND_FETCH_IS) && - !global[VAR_NUM(op->result.u.var)] && - op->op1.op_type == IS_CONST && - op->op1.u.constant.type == IS_STRING) { - zend_op *x; + } else if ((op->opcode == ZEND_FETCH_R || op->opcode == ZEND_FETCH_IS) && + !global[VAR_NUM(op->result.u.var)] && op->op1.op_type == IS_CONST && + op->op1.u.constant.type == IS_STRING) { + union { + zend_op *v; + void *ptr; + } x; char *s = emalloc(op->op1.u.constant.value.str.len+2); memcpy(s,op->op1.u.constant.value.str.val,op->op1.u.constant.value.str.len); s[op->op1.u.constant.value.str.len] = (char)FETCH_TYPE(op); s[op->op1.u.constant.value.str.len+1] = '\0'; - if (zend_hash_find(&assigns, - s, op->op1.u.constant.value.str.len+2, - (void**)&x) == SUCCESS) { - x = *(zend_op**)x; -/* - if (x->opcode == ZEND_ASSIGN && x->op2.op_type == IS_CONST) { - zend_printf("possible const propogation in %s:%s (%s,%u:%u)
    \n",op_array->filename, op_array->function_name, op->op1.u.constant.value.str.val, x-op_array->opcodes, op-op_array->opcodes); - } -*/ - memcpy(&x->result, &op->result, sizeof(op->result)); - x->result.u.EA.type = 0; - SET_DEFINED(x); - zend_hash_del(&assigns, - s, op->op1.u.constant.value.str.len+2); + if (zend_hash_find(&assigns, s, op->op1.u.constant.value.str.len+2, + &x.ptr) == SUCCESS) { + x.v = *(zend_op**)x.v; + memcpy(&x.v->result, &op->result, sizeof(op->result)); + x.v->result.u.EA.type = 0; + SET_DEFINED(x.v); + zend_hash_del(&assigns, s, op->op1.u.constant.value.str.len+2); STR_FREE(op->op1.u.constant.value.str.val); SET_TO_NOP(op); } efree(s); } else if (op->opcode == ZEND_FETCH_DIM_R && - op->extended_value != ZEND_FETCH_ADD_LOCK && - op->op1.op_type == IS_VAR && - IS_DEFINED(op->op1)) { + op->extended_value != ZEND_FETCH_ADD_LOCK && + op->op1.op_type == IS_VAR && + IS_DEFINED(op->op1)) { zend_op *x = DEFINED_OP(op->op1); while ((x->opcode == ZEND_ASSIGN_REF || x->opcode == ZEND_ASSIGN || @@ -2609,32 +2609,35 @@ IS_DEFINED(x->op1)) { x = DEFINED_OP(x->op1); } - if ((x->opcode == ZEND_FETCH_R || - x->opcode == ZEND_FETCH_W || - x->opcode == ZEND_FETCH_RW) && - x->op1.op_type == IS_CONST && - x->op1.u.constant.type == IS_STRING) { - zend_op *y; + if ((x->opcode == ZEND_FETCH_R || x->opcode == ZEND_FETCH_W || + x->opcode == ZEND_FETCH_RW) && x->op1.op_type == IS_CONST && + x->op1.u.constant.type == IS_STRING) { + union { + zend_op *v; + void *ptr; + } y; + union { + zend_op *v; + void *ptr; + } op_copy; char *s = emalloc(x->op1.u.constant.value.str.len+2); + op_copy.v = op; memcpy(s,x->op1.u.constant.value.str.val,x->op1.u.constant.value.str.len); s[x->op1.u.constant.value.str.len] = (char)FETCH_TYPE(x); s[x->op1.u.constant.value.str.len+1] = '\0'; - if (zend_hash_find(&fetch_dim, - s, x->op1.u.constant.value.str.len+2, - (void**)&y) == SUCCESS) { - y = *(zend_op**)y; - y->extended_value = ZEND_FETCH_ADD_LOCK; - zend_hash_update(&fetch_dim, - s, x->op1.u.constant.value.str.len+2, - (void**)&op, sizeof(void*), NULL); + if (zend_hash_find(&fetch_dim, s, x->op1.u.constant.value.str.len+2, + &y.ptr) == SUCCESS) { + y.v = *(zend_op**)y.v; + y.v->extended_value = ZEND_FETCH_ADD_LOCK; + zend_hash_update(&fetch_dim, s, x->op1.u.constant.value.str.len+2, + &op_copy.ptr, sizeof(void*), NULL); SET_UNDEFINED(x->result); STR_FREE(x->op1.u.constant.value.str.val); SET_TO_NOP(x); - memcpy(&op->op1,&y->op1,sizeof(op->op1)); + memcpy(&op->op1, &y.v->op1, sizeof(op->op1)); } else { - zend_hash_update(&fetch_dim, - s, x->op1.u.constant.value.str.len+2, - (void**)&op, sizeof(void*), NULL); + zend_hash_update(&fetch_dim, s, x->op1.u.constant.value.str.len+2, + &op_copy.ptr, sizeof(void*), NULL); } efree(s); } @@ -3170,7 +3173,9 @@ void reassign_registers(zend_op_array *op_array, BB* p, char *global) { zend_uint i; zend_uint n = 0; +#ifndef ZEND_ENGINE_2 int uses_globals = 0; +#endif int* assigned = do_alloca(op_array->T * sizeof(int)); char* reg_pool = do_alloca(op_array->T * sizeof(char)); char* used = do_alloca(op_array->T * sizeof(char)); Index: Makefile.in =================================================================== --- Makefile.in (revision 199) +++ Makefile.in (working copy) @@ -2,6 +2,6 @@ LTLIBRARY_SOURCES = eaccelerator.c optimize.c encoder.c loader.c opcodes.c content.c mm.c session.c shm.c debug.c cache.c ea_restore.c ea_store.c ea_info.c ea_dasm.c LTLIBRARY_SHARED_NAME = eaccelerator.la -EXTRA_CFLAGS = -O2 +EXTRA_CFLAGS = -O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables include $(top_srcdir)/build/dynlib.mk Index: loader.c =================================================================== --- loader.c (revision 199) +++ loader.c (working copy) @@ -212,6 +212,7 @@ } } +#ifndef ZEND_ENGINE_2 static unsigned char* decode_pstr(char** p, unsigned int* l) { unsigned char c = decode(p, l); if (c == 0) { @@ -229,6 +230,7 @@ return str; } } +#endif static double decode_double(char** p, unsigned int* l) { unsigned char sign; @@ -250,7 +252,6 @@ typedef void* (*decode_bucket_t)(void* to, char**, unsigned int* TSRMLS_DC); #define decode_zval_hash(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr, p, l TSRMLS_CC) -#define decode_zval_hash_noref(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr_noref, p, l TSRMLS_CC) static HashTable* decode_hash(HashTable* to, int size, decode_bucket_t decode_bucket, char**p, unsigned int* l TSRMLS_DC); static zval* decode_zval_ptr(zval* to, char** p, unsigned int* l TSRMLS_DC); @@ -315,6 +316,8 @@ return to; } +#ifndef ZEND_ENGINE_2 +#define decode_zval_hash_noref(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr_noref, p, l TSRMLS_CC) static zval* decode_zval_ptr_noref(zval* to, char** p, unsigned int* l TSRMLS_DC) { if (to == NULL) { ALLOC_ZVAL(to); @@ -324,6 +327,7 @@ to->refcount = 1; return to; } +#endif static void decode_znode(znode* to, unsigned int vars_count, char** p, unsigned int* l TSRMLS_DC) { to->op_type = decode(p, l); @@ -615,14 +619,19 @@ to->scope = EAG(class_entry); to->fn_flags = decode32(p, l); scope_name = decode_lstr((unsigned int*)&scope_name_len, p, l); - if (to->scope == NULL && scope_name != NULL) { - if (zend_hash_find(CG(class_table), (void *)scope_name, - scope_name_len, (void **)&to->scope) == SUCCESS) { - to->scope = *(zend_class_entry**)to->scope; - } else { - to->scope = NULL; - } - } + if (to->scope == NULL && scope_name != NULL) { + union { + zend_class_entry *v; + void *ptr; + } scope; + scope.v = to->scope; + if (zend_hash_find(CG(class_table), (void *)scope_name, + scope_name_len, &scope.ptr) == SUCCESS) { + to->scope = *(zend_class_entry**)to->scope; + } else { + to->scope = NULL; + } + } #endif if (to->type == ZEND_INTERNAL_FUNCTION) { return to; Index: mm.c =================================================================== --- mm.c (revision 199) +++ mm.c (working copy) @@ -157,6 +157,7 @@ #undef MM_SHM_CAN_ATTACH +#if defined(MM_SEM_POSIX) || defined(MM_SEM_FCNTL) || defined(MM_SEM_FLOCK) || defined(MM_SEM_WIN32) || defined(MM_SHM_MMAP_POSIX) || defined(MM_SHM_MMAP_FILE) static int strxcat(char* dst, const char* src, int size) { int dst_len = strlen(dst); int src_len = strlen(src); @@ -169,6 +170,7 @@ return 0; } } +#endif #if defined(MM_SEM_SPINLOCK) @@ -191,9 +193,11 @@ spinlock_t spinlock; } mm_mutex; +/* not used static int mm_attach_lock(const char* key, mm_mutex* lock) { return 1; } +*/ static int mm_init_lock(const char* key, mm_mutex* lock) { spinlock_init(&lock->spinlock); Index: ea_restore.c =================================================================== --- ea_restore.c (revision 199) +++ ea_restore.c (working copy) @@ -465,7 +465,10 @@ zend_op_array *restore_op_array(zend_op_array * to, eaccelerator_op_array * from TSRMLS_DC) { - zend_function *function; + union { + zend_function *v; + void *ptr; + } function; #ifdef ZEND_ENGINE_2 int fname_len = 0; char *fname_lc = NULL; @@ -529,8 +532,13 @@ * am I right here ? ;-( */ if (from->scope_name != NULL) { + union { + zend_class_entry *v; + void *ptr; + } scope; char *from_scope_lc = zend_str_tolower_dup(from->scope_name, from->scope_name_len); - if (zend_hash_find (CG(class_table), (void *) from_scope_lc, from->scope_name_len + 1, (void **) &to->scope) != SUCCESS) { + scope.v = to->scope; + if (zend_hash_find (CG(class_table), (void *) from_scope_lc, from->scope_name_len + 1, &scope.ptr) != SUCCESS) { DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] can't find '%s' in class_table. use EAG(class_entry).\n", getpid(), from->scope_name)); to->scope = EAG(class_entry); @@ -548,11 +556,11 @@ for (p = EAG(class_entry)->parent; p; p = p->parent) { DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] checking parent '%s' have '%s'\n", getpid(), p->name, fname_lc)); - if (zend_hash_find(&p->function_table, fname_lc, fname_len + 1, (void **) &function) == SUCCESS) { + if (zend_hash_find(&p->function_table, fname_lc, fname_len + 1, &function.ptr) == SUCCESS) { DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] '%s' has '%s' of scope '%s'\n", - getpid(), p->name, fname_lc, function->common.scope->name)); - to->scope = function->common.scope; + getpid(), p->name, fname_lc, function.v->common.scope->name)); + to->scope = function.v->common.scope; break; } } @@ -582,10 +590,10 @@ #else to->function_name, strlen(to->function_name) + 1, #endif - (void **) &function) == SUCCESS && function->type == ZEND_INTERNAL_FUNCTION) { + &function.ptr) == SUCCESS && function.v->type == ZEND_INTERNAL_FUNCTION) { DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] found in function table\n", getpid())); - ((zend_internal_function *) (to))->handler = ((zend_internal_function *) function)->handler; + ((zend_internal_function *) (to))->handler = ((zend_internal_function *) function.v)->handler; } else { /* FIXME. I don't know how to fix handler. * TODO: must solve this somehow, to avoid returning damaged structure... @@ -805,7 +813,6 @@ eaccelerator_class_entry * from TSRMLS_DC) { zend_class_entry *old; - zend_function *f = NULL; DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] restore_class_entry: %s\n", getpid(), from->name ? from->name : "(top)")); Index: ea_dasm.c =================================================================== --- ea_dasm.c (revision 199) +++ ea_dasm.c (working copy) @@ -269,7 +269,7 @@ } else if (opline->extended_value == ZEND_ISEMPTY) { snprintf(buf, sizeof(buf), "ZEND_ISEMPTY"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } #ifdef ZEND_ENGINE_2 } else if ((op->ops & EXT_MASK) == EXT_ASSIGN) { @@ -278,7 +278,7 @@ } else if (opline->extended_value == ZEND_ASSIGN_DIM) { snprintf(buf, sizeof(buf), "ZEND_ASSIGN_DIM"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } #ifndef ZEND_ENGINE_2_1 } else if (opline->opcode == ZEND_UNSET_DIM_OBJ) { @@ -287,14 +287,14 @@ } else if (opline->extended_value == ZEND_UNSET_OBJ) { snprintf(buf, sizeof(buf), "ZEND_UNSET_OBJ"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } #endif #endif } else if (opline->extended_value != 0) { snprintf(buf, sizeof(buf), "%ld", opline->extended_value); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } add_assoc_string(el, "extended_value", buf, 1); @@ -314,7 +314,7 @@ snprintf(buf, sizeof(buf), "$class%u", VAR_NUM(opline->op1.u.var)); } else if ((op->ops & OP1_MASK) == OP1_UCLASS) { if (opline->op1.op_type == IS_UNUSED) { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } else { snprintf(buf, sizeof(buf), "$class%u", VAR_NUM(opline->op1.u.var)); } @@ -328,6 +328,7 @@ if (offset >= op_array->last_brk_cont) { goto brk_failed; } + jmp_to = &op_array->brk_cont_array[offset]; offset = jmp_to->parent; } while (--level > 0); snprintf(buf, sizeof(buf), "opline(%d)", jmp_to->brk); @@ -367,7 +368,7 @@ } else if (opline->op1.op_type == IS_VAR) { snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->op1.u.var)); } else if (opline->op1.op_type == IS_UNUSED) { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } else { snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->op1.op_type); } @@ -415,7 +416,7 @@ } else if (opline->op2.u.constant.value.lval == ZEND_REQUIRE_ONCE) { snprintf(buf, sizeof(buf), "ZEND_REQUIRE_ONCE"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } } else if ((op->ops & OP2_MASK) == OP2_ARG) { snprintf(buf, sizeof(buf), "arg(%u)", opline->op2.u.opline_num); @@ -425,7 +426,7 @@ } else if (opline->op2.u.constant.value.lval == ZEND_ISEMPTY) { snprintf(buf, sizeof(buf), "ZEND_ISEMPTY"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } } else { if (opline->op2.op_type == IS_CONST) { @@ -436,7 +437,7 @@ } else if (opline->op2.op_type == IS_VAR) { snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->op2.u.var)); } else if (opline->op2.op_type == IS_UNUSED) { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } else { snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->op2.op_type); } @@ -466,7 +467,7 @@ snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->result.u.var)); } } else if (opline->result.op_type == IS_UNUSED) { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } else { snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->result.op_type); } @@ -485,7 +486,7 @@ } break; case RES_UNUSED: - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; break; default: snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->result.op_type); Index: ea_store.c =================================================================== --- ea_store.c (revision 199) +++ ea_store.c (working copy) @@ -85,11 +85,14 @@ #endif } + /* Calculate the size of a point to a class entry */ +/* not used static void calc_class_entry_ptr(zend_class_entry ** from TSRMLS_DC) { calc_class_entry(*from TSRMLS_CC); } +*/ #endif /* Calculate the size of an HashTable */ @@ -780,31 +783,37 @@ { zend_class_entry *from = from_ce; zend_class_entry *parent = from->parent; - zend_property_info *pinfo, *cinfo = NULL; - zval **pprop = NULL; - zval **cprop = p->pData; + union { + zend_property_info *v; + void *ptr; + } pinfo, cinfo; + union { + zval **v; + void *ptr; + } pprop, cprop; char *mname, *cname = NULL; + cprop.v = p->pData; /* Check if this is a parent class. If so, copy unconditionally */ if (parent) { /* unpack the \0classname\0membername\0 style property name to seperate vars */ zend_unmangle_property_name(p->arKey, &cname, &mname); /* lookup the member's info in parent and child */ - if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, (void**)&pinfo) == SUCCESS) && - (zend_hash_find(&from->properties_info, mname, strlen(mname)+1, (void**)&cinfo) == SUCCESS)) { + if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, &pinfo.ptr) == SUCCESS) && + (zend_hash_find(&from->properties_info, mname, strlen(mname)+1, &cinfo.ptr) == SUCCESS)) { /* don't copy this static property if protected in parent and static public in child. inheritance will handle this properly on restore */ - if(cinfo->flags & ZEND_ACC_STATIC && (pinfo->flags & ZEND_ACC_PROTECTED && cinfo->flags & ZEND_ACC_PUBLIC)) { + if(cinfo.v->flags & ZEND_ACC_STATIC && (pinfo.v->flags & ZEND_ACC_PROTECTED && cinfo.v->flags & ZEND_ACC_PUBLIC)) { return ZEND_HASH_APPLY_REMOVE; } /* If the static member points to the same value in parent and child, remove for proper inheritance during restore */ # ifdef ZEND_ENGINE_2_1 - if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) { + if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) { # else - if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) { + if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) { # endif - if(*pprop == *cprop) { + if(*pprop.v == *cprop.v) { return ZEND_HASH_APPLY_REMOVE; } } Index: cache.c =================================================================== --- cache.c (revision 199) +++ cache.c (working copy) @@ -278,7 +278,8 @@ q->next = q; hdr.crc32 = eaccelerator_crc32((const char *) q, q->size); if (write(f, &hdr, sizeof(hdr)) == sizeof(hdr)) { - write(f, q, q->size); + ssize_t result = 0; + result = write(f, q, q->size); EACCELERATOR_FLOCK(f, LOCK_UN); close(f); ret = 1; @@ -596,7 +597,7 @@ { unsigned int i, xlen; zval *list; - char *xkey; + char *xkey = ""; mm_user_cache_entry *p; time_t t = time(0); Index: content.c =================================================================== --- content.c (revision 199) +++ content.c (working copy) @@ -121,16 +121,19 @@ static int eaccelerator_is_not_modified(zval* return_value TSRMLS_DC) { char etag[256]; - zval **server_vars, **match; + union { + zval **v; + void *ptr; + } server_vars, match; if (!SG(headers_sent)) { sprintf(etag,"ETag: eaccelerator-%u",eaccelerator_crc32(Z_STRVAL_P(return_value),Z_STRLEN_P(return_value))); sapi_add_header(etag, strlen(etag), 1); - if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && - Z_TYPE_PP(server_vars) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_IF_NONE_MATCH", sizeof("HTTP_IF_NONE_MATCH"), (void **) &match)==SUCCESS && - Z_TYPE_PP(match) == IS_STRING) { - if (strcmp(etag+6,Z_STRVAL_PP(match)) == 0 && + if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS && + Z_TYPE_PP(server_vars.v) == IS_ARRAY && + zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_IF_NONE_MATCH", sizeof("HTTP_IF_NONE_MATCH"), &match.ptr)==SUCCESS && + Z_TYPE_PP(match.v) == IS_STRING) { + if (strcmp(etag+6,Z_STRVAL_PP(match.v)) == 0 && sapi_add_header("HTTP/1.0 304", sizeof("HTTP/1.0 304") - 1, 1) == SUCCESS && sapi_add_header("Status: 304 Not Modified", sizeof("Status: 304 Not Modified") - 1, 1) == SUCCESS) { zval_dtor(return_value); @@ -183,17 +186,19 @@ static int eaccelerator_get_page(const char* key, int key_len, zval* return_value TSRMLS_DC) { int ret = 0; zval cache_array; - zval **headers; - zval **content; + union { + zval **v; + void *ptr; + } headers, content; if (eaccelerator_get(key, key_len, &cache_array, eaccelerator_content_cache_place TSRMLS_CC)) { if (Z_TYPE(cache_array) == IS_ARRAY) { - if (zend_hash_find(Z_ARRVAL(cache_array),"content",sizeof("content"),(void**)&content) == SUCCESS && - Z_TYPE_PP(content) == IS_STRING) { - if (zend_hash_find(Z_ARRVAL(cache_array),"headers",sizeof("headers"),(void**)&headers) == SUCCESS && - Z_TYPE_PP(headers) == IS_ARRAY) { - zend_hash_apply(Z_ARRVAL_PP(headers), (apply_func_t)eaccelerator_send_header TSRMLS_CC); + if (zend_hash_find(Z_ARRVAL(cache_array),"content",sizeof("content"),&content.ptr) == SUCCESS && + Z_TYPE_PP(content.v) == IS_STRING) { + if (zend_hash_find(Z_ARRVAL(cache_array),"headers",sizeof("headers"),&headers.ptr) == SUCCESS && + Z_TYPE_PP(headers.v) == IS_ARRAY) { + zend_hash_apply(Z_ARRVAL_PP(headers.v), (apply_func_t)eaccelerator_send_header TSRMLS_CC); } - memcpy(return_value,*content, sizeof(zval)); + memcpy(return_value,*content.v, sizeof(zval)); zval_copy_ctor(return_value); ret = 1; } @@ -204,15 +209,18 @@ } static void eaccelerator_compress(char* key, int key_len, zval* return_value, time_t ttl TSRMLS_DC) { - zval **server_vars, **encoding; + union { + zval **v; + void *ptr; + } server_vars, encoding; if (EAG(compression_enabled) && EAG(compress_content) && !SG(headers_sent) && - zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && - Z_TYPE_PP(server_vars) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &encoding)==SUCCESS && - Z_TYPE_PP(encoding) == IS_STRING && + zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS && + Z_TYPE_PP(server_vars.v) == IS_ARRAY && + zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), &encoding.ptr)==SUCCESS && + Z_TYPE_PP(encoding.v) == IS_STRING && Z_TYPE_P(return_value) == IS_STRING && Z_STRLEN_P(return_value) >= EACCELERATOR_COMPRESS_MIN) { char* zkey = NULL; @@ -234,7 +242,7 @@ p = p->next; } - if (strstr(Z_STRVAL_PP(encoding),"x-gzip")) { + if (strstr(Z_STRVAL_PP(encoding.v),"x-gzip")) { zkey_len = sizeof("gzip_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"gzip_",sizeof("gzip_")-1); @@ -243,7 +251,7 @@ enc = "Content-Encoding: x-gzip"; params[0] = return_value; gzip = 1; - } else if (strstr(Z_STRVAL_PP(encoding),"gzip")) { + } else if (strstr(Z_STRVAL_PP(encoding.v),"gzip")) { zkey_len = sizeof("gzip_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"gzip_",sizeof("gzip_")-1); @@ -252,7 +260,7 @@ enc = "Content-Encoding: gzip"; params[0] = return_value; gzip = 1; - } else if (strstr(Z_STRVAL_PP(encoding),"deflate")) { + } else if (strstr(Z_STRVAL_PP(encoding.v),"deflate")) { zkey_len = sizeof("deflate_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"deflate_",sizeof("deflate_")-1); @@ -379,7 +387,10 @@ char* key; int key_len; long ttl = 0; - zval **server_vars, **encoding; + union { + zval **v; + void *ptr; + } server_vars, encoding; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &key, &key_len, &ttl) == FAILURE) { @@ -394,26 +405,26 @@ if (EAG(compression_enabled) && EAG(compress_content) && !SG(headers_sent) && - zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && - Z_TYPE_PP(server_vars) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &encoding)==SUCCESS && - Z_TYPE_PP(encoding) == IS_STRING) { + zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS && + Z_TYPE_PP(server_vars.v) == IS_ARRAY && + zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), &encoding.ptr)==SUCCESS && + Z_TYPE_PP(encoding.v) == IS_STRING) { char* zkey = NULL; char* enc = NULL; int zkey_len = 0; - if (strstr(Z_STRVAL_PP(encoding),"x-gzip")) { + if (strstr(Z_STRVAL_PP(encoding.v),"x-gzip")) { zkey_len = sizeof("gzip_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"gzip_",sizeof("gzip_")-1); memcpy(zkey+sizeof("gzip_")-1,key,key_len+1); enc = "Content-Encoding: x-gzip"; - } else if (strstr(Z_STRVAL_PP(encoding),"gzip")) { + } else if (strstr(Z_STRVAL_PP(encoding.v),"gzip")) { zkey_len = sizeof("gzip_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"gzip_",sizeof("gzip_")-1); memcpy(zkey+sizeof("gzip_")-1,key,key_len+1); enc = "Content-Encoding: gzip"; - } else if (strstr(Z_STRVAL_PP(encoding),"deflate")) { + } else if (strstr(Z_STRVAL_PP(encoding.v),"deflate")) { zkey_len = sizeof("deflate_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"deflate_",sizeof("deflate_")-1); Index: encoder.c =================================================================== --- encoder.c (revision 199) +++ encoder.c (working copy) @@ -249,26 +249,27 @@ } allow = 1; } else if (allow && ch == '_') { + size_t result = 0; label[0] = ch = fgetc(yyin); if (ch == EOF) {break;} if (ch == '_') { label[1] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,1,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,1,1,yyout); break;} if (IEQ('f')) { label[2] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,2,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,2,1,yyout); break;} if (IEQ('i')) { label[3] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,3,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,3,1,yyout); break;} if (IEQ('l')) { label[4] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,4,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,4,1,yyout); break;} if (IEQ('e')) { label[5] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,5,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,5,1,yyout); break;} if (ch == '_') { label[6] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,6,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,6,1,yyout); break;} if (ch == '_') { ch = fgetc(yyin); repeat = 1; @@ -277,40 +278,40 @@ (ch >= '0' && ch <= '9') || (ch >= '\x7f' && ch <= '\xff') || ch == '_') { - fwrite(label,7,1,yyout); + result = fwrite(label,7,1,yyout); } else { fputs("eaccelerator_loader_file()",yyout); } } else { - fwrite(label,7,1,yyout); + result = fwrite(label,7,1,yyout); } } else { - fwrite(label,6,1,yyout); + result = fwrite(label,6,1,yyout); } } else { - fwrite(label,5,1,yyout); + result = fwrite(label,5,1,yyout); } } else { - fwrite(label,4,1,yyout); + result = fwrite(label,4,1,yyout); } } else { - fwrite(label,3,1,yyout); + result = fwrite(label,3,1,yyout); } } else if (IEQ('l')) { label[2] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,2,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,2,1,yyout); break;} if (IEQ('i')) { label[3] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,3,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,3,1,yyout); break;} if (IEQ('n')) { label[4] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,4,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,4,1,yyout); break;} if (IEQ('e')) { label[5] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,5,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,5,1,yyout); break;} if (ch == '_') { label[6] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,6,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,6,1,yyout); break;} if (ch == '_') { ch = fgetc(yyin); repeat = 1; @@ -319,30 +320,30 @@ (ch >= '0' && ch <= '9') || (ch >= '\x7f' && ch <= '\xff') || ch == '_') { - fwrite(label,7,1,yyout); + result = fwrite(label,7,1,yyout); } else { fputs("eaccelerator_loader_line()",yyout); } } else { - fwrite(label,7,1,yyout); + result = fwrite(label,7,1,yyout); } } else { - fwrite(label,6,1,yyout); + result = fwrite(label,6,1,yyout); } } else { - fwrite(label,5,1,yyout); + result = fwrite(label,5,1,yyout); } } else { - fwrite(label,4,1,yyout); + result = fwrite(label,4,1,yyout); } } else { - fwrite(label,3,1,yyout); + result = fwrite(label,3,1,yyout); } } else { - fwrite(label,2,1,yyout); + result = fwrite(label,2,1,yyout); } } else { - fwrite(label,1,1,yyout); + result = fwrite(label,1,1,yyout); } allow = 0; } else if ((ch >= 'a' && ch <= 'z') || @@ -694,9 +695,11 @@ static void encode_class_entry(zend_class_entry* from); +/* not used static void encode_class_entry_ptr(zend_class_entry** from) { encode_class_entry(*from); } +*/ #endif static void encode_hash(HashTable* from, encode_bucket_t encode_bucket) { @@ -718,6 +721,7 @@ } } +/* not used #ifdef ZEND_ENGINE_2 #define encode_zval_hash_ex(from,p) encode_hash_ex(from, p, (encode_bucket_t)encode_zval_ptr) @@ -744,6 +748,7 @@ } } #endif +*/ static void encode_op(zend_op_array* from, zend_op* opline, unsigned int ops) { encode(opline->opcode); @@ -1182,11 +1187,12 @@ } if (prefix != NULL) { + size_t result = 0; prefix->type = IS_STRING; prefix->value.str.len = pos; prefix->value.str.val = emalloc(pos+1); rewind(src_fp); - fread(prefix->value.str.val, pos, 1, src_fp); + result = fread(prefix->value.str.val, pos, 1, src_fp); prefix->value.str.val[prefix->value.str.len] = '\000'; } } @@ -1203,9 +1209,10 @@ FILE *tmp_fp = tmpfile(); if (tmp_fp) { + size_t result = 0; if (pre_content_len > 0) { - fwrite(pre_content, pre_content_len, 1, tmp_fp); + result = fwrite(pre_content, pre_content_len, 1, tmp_fp); } #ifndef WITHOUT_FILE_FILTER filter_file(src_fp, tmp_fp TSRMLS_CC); @@ -1219,7 +1226,7 @@ #endif if (post_content_len > 0) { - fwrite(post_content, post_content_len, 1, tmp_fp); + result = fwrite(post_content, post_content_len, 1, tmp_fp); } rewind(tmp_fp); fclose(src_fp); Index: eaccelerator.c =================================================================== --- eaccelerator.c (revision 199) +++ eaccelerator.c (working copy) @@ -349,6 +349,7 @@ (v3 & 0xff); } +/* This function isn't used. So disable it for now static void decode_version(char *version, int v) { int t = (v & 0x000f00) >> 8; char c; @@ -363,7 +364,8 @@ (v & 0x0ff000) >> 12, c, (v & 0x0000ff)); -} +} +*/ #ifdef EACCELERATOR_USE_INODE static int eaccelerator_inode_key(char* s, dev_t dev, ino_t ino TSRMLS_DC) { @@ -1033,6 +1035,7 @@ return ok; } +#ifndef EACCELERATOR_USE_INODE static char* eaccelerator_realpath(const char* name, char* realname TSRMLS_DC) { /* ???TODO it is possibe to cache name->realname mapping to avoid lstat() calls */ #if ZEND_MODULE_API_NO >= 20001222 @@ -1041,6 +1044,7 @@ return V_REALPATH(name, realname); #endif } +#endif static int eaccelerator_stat(zend_file_handle *file_handle, char* realname, struct stat* buf TSRMLS_DC) { @@ -1226,7 +1230,9 @@ int nreloads; time_t compile_time; int stat_result = 0; +#ifdef DEBUG struct timeval tv_start; +#endif #ifdef EACCELERATOR_USE_INODE realname[0] = '\000'; @@ -2095,21 +2101,28 @@ /* Storing Host Name */ EAG(hostname)[0] = '\000'; { - zval **server_vars, **hostname; + union { + zval **v; + void *ptr; + } server_vars; + union { + zval **v; + void *ptr; + } hostname; - if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && - Z_TYPE_PP(server_vars) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(server_vars), "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &hostname)==SUCCESS && - Z_TYPE_PP(hostname) == IS_STRING && - Z_STRLEN_PP(hostname) > 0) + if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS && + Z_TYPE_PP(server_vars.v) == IS_ARRAY && + zend_hash_find(Z_ARRVAL_PP(server_vars.v), "SERVER_NAME", sizeof("SERVER_NAME"), &hostname.ptr)==SUCCESS && + Z_TYPE_PP(hostname.v) == IS_STRING && + Z_STRLEN_PP(hostname.v) > 0) { - if (sizeof(EAG(hostname)) > Z_STRLEN_PP(hostname)) + if (sizeof(EAG(hostname)) > Z_STRLEN_PP(hostname.v)) { - memcpy(EAG(hostname),Z_STRVAL_PP(hostname),Z_STRLEN_PP(hostname)+1); + memcpy(EAG(hostname),Z_STRVAL_PP(hostname.v),Z_STRLEN_PP(hostname.v)+1); } else { - memcpy(EAG(hostname),Z_STRVAL_PP(hostname),sizeof(EAG(hostname))-1); + memcpy(EAG(hostname),Z_STRVAL_PP(hostname.v),sizeof(EAG(hostname))-1); EAG(hostname)[sizeof(EAG(hostname))-1] = '\000'; } } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Mar 2006 11:05:06 -0000 1.5 +++ .cvsignore 23 May 2006 09:12:27 -0000 1.6 @@ -1 +1 @@ -eaccelerator-svn200603090012.tar.gz +eaccelerator-0.9.5-beta2.tar.bz2 Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/php-eaccelerator.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- php-eaccelerator.spec 14 Mar 2006 12:08:27 -0000 1.10 +++ php-eaccelerator.spec 23 May 2006 09:12:27 -0000 1.11 @@ -1,8 +1,14 @@ -%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.4.1)} - -%define module_version 0.9.3 -%define prever svn200603090012 +# Useful defaults when building in chroots on systems where PHP is unavailable +%define default_extdir %{_libdir}/php4 +%define default_apiver 20041225 +%define default_version 5.1.4 + +%define module_version 0.9.5 +%define prever beta2 + +%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) +%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) +%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} # This is the apache userid, only used for sysvipc semaphores which is the # default on ppc since spinlock is not detected @@ -11,19 +17,20 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 0.3%{?dist} +Release: 0.2.%{prever}%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ -#Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz -Source: http://snapshots.eaccelerator.net/eaccelerator-%{prever}.tar.gz +Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2 +Patch0: eaccelerator-0.9.5-beta2-compile.patch +Patch1: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: php = %{php_version} +Requires: php-api = %{php_apiver} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel # Required by phpize -BuildRequires: autoconf, automake, libtool, gcc-c++ +BuildRequires: autoconf, automake, libtool %description eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. @@ -32,8 +39,9 @@ %prep -#setup -n eaccelerator-%{module_version} -%setup -n eaccelerator-%{prever} +%setup -n eaccelerator-%{module_version}-%{prever} +%patch0 -p0 +%patch1 -p0 %build @@ -42,12 +50,7 @@ %ifarch ppc --with-eaccelerator-userid="%{userid}" %endif -# Set fcntl based semaphores to avoid ipc based locking issues on x86_64 -%ifarch x86_64 -%{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h -%{__perl} -pi -e 's|.*(MM_SEM_FCNTL).*|#define $1 1|g' config.h -%endif -# Compile! + %{__make} %{?_smp_mflags} @@ -97,6 +100,17 @@ %changelog +* Tue May 23 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 +- Rebuild against PHP 5.1.4. + +* Fri May 5 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 +- Rework heavily the API version requirement detection, should work with + chroots builds where PHP isn't installed outside. +- Replace the CC way of getting the API version with php -i output. + +* Tue Apr 11 2006 Matthias Saou 5.1.x_0.9.5-0.1.beta2 +- Update to 0.9.5-beta2. + * Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.3 - Pass userid 48 to configure script on PPC for sysvipc semaphores. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Mar 2006 11:05:06 -0000 1.5 +++ sources 23 May 2006 09:12:27 -0000 1.6 @@ -1 +1 @@ -762cb56c56190186e5e9a46b2fd2798d eaccelerator-svn200603090012.tar.gz +2516b680ce372765d24e7b64003f1e64 eaccelerator-0.9.5-beta2.tar.bz2 From fedora-extras-commits at redhat.com Tue May 23 09:27:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:27:02 -0700 Subject: rpms/xvattr/FC-4 xvattr.spec,1.7,1.8 Message-ID: <200605230927.k4N9R4bL021824@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xvattr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21779/FC-4 Modified Files: xvattr.spec Log Message: Fix CFLAGS so that our optflags get used too (Ville, #192611). Index: xvattr.spec =================================================================== RCS file: /cvs/extras/rpms/xvattr/FC-4/xvattr.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xvattr.spec 22 May 2005 23:58:28 -0000 1.7 +++ xvattr.spec 23 May 2006 09:27:02 -0000 1.8 @@ -1,17 +1,19 @@ -# $Id$ -# Upstream: Bj?rn Englund - Summary: Utility for getting and setting Xv attributes Name: xvattr Version: 1.3 -Release: 7 - +Release: 10%{?dist} License: GPL Group: User Interface/X URL: http://www.dtek.chalmers.se/groups/dvd/ Source: http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: XFree86-devel, gtk+-devel +BuildRequires: gtk+-devel +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel, libXv-devel +%else +BuildRequires: xorg-x11-devel +%endif %description This program is used for getting and setting Xv attributes such as @@ -20,6 +22,8 @@ %prep %setup +# Append GTK CFLAGS to CFLAGS instead of overwriting CFLAGS (optflags get used) +%{__perl} -pi -e 's|^CFLAGS = (.*)|CFLAGS += $1|g' Makefile* %build @@ -44,6 +48,15 @@ %changelog +* Tue May 23 2006 Matthias Saou 1.3-10 +- Fix CFLAGS so that our optflags get used too (Ville, #192611). + +* Mon Mar 6 2006 Matthias Saou 1.3-9 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 1.3-8 +- Rebuild for new gcc/glibc and modular X. + * Sun May 22 2005 Jeremy Katz - 1.3-7 - rebuild on all arches From fedora-extras-commits at redhat.com Tue May 23 09:27:03 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:27:03 -0700 Subject: rpms/xvattr/FC-5 xvattr.spec,1.9,1.10 Message-ID: <200605230927.k4N9R5rK021828@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xvattr/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21779/FC-5 Modified Files: xvattr.spec Log Message: Fix CFLAGS so that our optflags get used too (Ville, #192611). Index: xvattr.spec =================================================================== RCS file: /cvs/extras/rpms/xvattr/FC-5/xvattr.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xvattr.spec 6 Mar 2006 17:24:49 -0000 1.9 +++ xvattr.spec 23 May 2006 09:27:03 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Utility for getting and setting Xv attributes Name: xvattr Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: User Interface/X URL: http://www.dtek.chalmers.se/groups/dvd/ @@ -22,6 +22,8 @@ %prep %setup +# Append GTK CFLAGS to CFLAGS instead of overwriting CFLAGS (optflags get used) +%{__perl} -pi -e 's|^CFLAGS = (.*)|CFLAGS += $1|g' Makefile* %build @@ -46,6 +48,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 1.3-10 +- Fix CFLAGS so that our optflags get used too (Ville, #192611). + * Mon Mar 6 2006 Matthias Saou 1.3-9 - FC5 rebuild. From fedora-extras-commits at redhat.com Tue May 23 09:27:04 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:27:04 -0700 Subject: rpms/xvattr/devel xvattr.spec,1.9,1.10 Message-ID: <200605230927.k4N9R6cN021832@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xvattr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21779/devel Modified Files: xvattr.spec Log Message: Fix CFLAGS so that our optflags get used too (Ville, #192611). Index: xvattr.spec =================================================================== RCS file: /cvs/extras/rpms/xvattr/devel/xvattr.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xvattr.spec 6 Mar 2006 17:24:49 -0000 1.9 +++ xvattr.spec 23 May 2006 09:27:04 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Utility for getting and setting Xv attributes Name: xvattr Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: User Interface/X URL: http://www.dtek.chalmers.se/groups/dvd/ @@ -22,6 +22,8 @@ %prep %setup +# Append GTK CFLAGS to CFLAGS instead of overwriting CFLAGS (optflags get used) +%{__perl} -pi -e 's|^CFLAGS = (.*)|CFLAGS += $1|g' Makefile* %build @@ -46,6 +48,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 1.3-10 +- Fix CFLAGS so that our optflags get used too (Ville, #192611). + * Mon Mar 6 2006 Matthias Saou 1.3-9 - FC5 rebuild. From fedora-extras-commits at redhat.com Tue May 23 10:44:00 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Tue, 23 May 2006 03:44:00 -0700 Subject: kadischi kadischi.spec,1.6,1.7 Message-ID: <200605231044.k4NAi0Cg024534@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/kadischi Modified Files: kadischi.spec Log Message: Fixed wording in description Index: kadischi.spec =================================================================== RCS file: /cvs/devel/kadischi/kadischi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kadischi.spec 22 May 2006 05:36:37 -0000 1.6 +++ kadischi.spec 23 May 2006 10:43:58 -0000 1.7 @@ -17,8 +17,9 @@ %description Kadischi is a LiveCD generation tool for Fedora Core systems. -Live media made with Kadischi can be written to a CD or DVD -and run without any prior installation of Fedora Core. +A Live ISO9660 compliant image file made with Kadischi can +be written to a CD or DVD and run without any prior installation +of Fedora Core. %prep %setup -q -n %{name} From fedora-extras-commits at redhat.com Tue May 23 10:44:53 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 03:44:53 -0700 Subject: rpms/linux_logo/FC-4 linux_logo-4.13-debug.patch, NONE, 1.1 linux_logo.spec, 1.10, 1.11 linux_logo-4.12-debug.patch, 1.1, NONE Message-ID: <200605231045.k4NAjPHZ024604@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/linux_logo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/FC-4 Modified Files: linux_logo.spec Added Files: linux_logo-4.13-debug.patch Removed Files: linux_logo-4.12-debug.patch Log Message: Update the debug patch to remove stripping of the binaries (Ville, #192442). linux_logo-4.13-debug.patch: --- NEW FILE linux_logo-4.13-debug.patch --- diff -Naupr linux_logo-4.13.orig/Makefile linux_logo-4.13/Makefile --- linux_logo-4.13.orig/Makefile 2006-01-11 18:29:57.000000000 +0100 +++ linux_logo-4.13/Makefile 2006-05-23 11:32:55.000000000 +0200 @@ -59,12 +59,10 @@ clean: linux_logo: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(L_OPTS) - @strip linux_logo linux_logo_shared: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo-dyn linux_logo.o vmw_string.o -L./$(LIBSYSINFO) -lsysinfo - @strip linux_logo-dyn ./$(LIBSYSINFO)/libsysinfo.a: cd $(LIBSYSINFO) && $(MAKE) @@ -88,7 +86,7 @@ linux_logo.o: linux_logo.c defaults.h lo $(CC) $(C_OPTS) -c linux_logo.c install: linux_logo - /usr/bin/install -s -m 755 $(PROGNAME) $(INSTALL_BINPATH) + /usr/bin/install -m 755 $(PROGNAME) $(INSTALL_BINPATH) /usr/bin/install -m 644 $(PROGNAME).1.gz $(INSTALL_MANPATH)/man1 cd po && $(MAKE) install Index: linux_logo.spec =================================================================== RCS file: /cvs/extras/rpms/linux_logo/FC-4/linux_logo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux_logo.spec 9 Feb 2006 15:42:56 -0000 1.10 +++ linux_logo.spec 23 May 2006 10:44:53 -0000 1.11 @@ -1,12 +1,12 @@ Summary: The linux logo - a colorful console penguin logo Name: linux_logo Version: 4.13 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.deater.net/weave/vmwprod/linux_logo/ Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz -Patch: linux_logo-4.12-debug.patch +Patch: linux_logo-4.13-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gettext @@ -52,6 +52,12 @@ %changelog +* Tue May 23 2006 Matthias Saou 4.13-3 +- Update the debug patch to remove stripping of the binaries (Ville, #192442). + +* Mon Mar 6 2006 Matthias Saou 4.13-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 4.13-1 - Update to 4.13. --- linux_logo-4.12-debug.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 10:44:54 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 03:44:54 -0700 Subject: rpms/linux_logo/FC-5 linux_logo-4.13-debug.patch, NONE, 1.1 linux_logo.spec, 1.11, 1.12 linux_logo-4.12-debug.patch, 1.1, NONE Message-ID: <200605231045.k4NAjQUJ024607@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/linux_logo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/FC-5 Modified Files: linux_logo.spec Added Files: linux_logo-4.13-debug.patch Removed Files: linux_logo-4.12-debug.patch Log Message: Update the debug patch to remove stripping of the binaries (Ville, #192442). linux_logo-4.13-debug.patch: --- NEW FILE linux_logo-4.13-debug.patch --- diff -Naupr linux_logo-4.13.orig/Makefile linux_logo-4.13/Makefile --- linux_logo-4.13.orig/Makefile 2006-01-11 18:29:57.000000000 +0100 +++ linux_logo-4.13/Makefile 2006-05-23 11:32:55.000000000 +0200 @@ -59,12 +59,10 @@ clean: linux_logo: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(L_OPTS) - @strip linux_logo linux_logo_shared: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo-dyn linux_logo.o vmw_string.o -L./$(LIBSYSINFO) -lsysinfo - @strip linux_logo-dyn ./$(LIBSYSINFO)/libsysinfo.a: cd $(LIBSYSINFO) && $(MAKE) @@ -88,7 +86,7 @@ linux_logo.o: linux_logo.c defaults.h lo $(CC) $(C_OPTS) -c linux_logo.c install: linux_logo - /usr/bin/install -s -m 755 $(PROGNAME) $(INSTALL_BINPATH) + /usr/bin/install -m 755 $(PROGNAME) $(INSTALL_BINPATH) /usr/bin/install -m 644 $(PROGNAME).1.gz $(INSTALL_MANPATH)/man1 cd po && $(MAKE) install Index: linux_logo.spec =================================================================== RCS file: /cvs/extras/rpms/linux_logo/FC-5/linux_logo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux_logo.spec 6 Mar 2006 15:25:08 -0000 1.11 +++ linux_logo.spec 23 May 2006 10:44:54 -0000 1.12 @@ -1,12 +1,12 @@ Summary: The linux logo - a colorful console penguin logo Name: linux_logo Version: 4.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.deater.net/weave/vmwprod/linux_logo/ Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz -Patch: linux_logo-4.12-debug.patch +Patch: linux_logo-4.13-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gettext @@ -52,6 +52,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 4.13-3 +- Update the debug patch to remove stripping of the binaries (Ville, #192442). + * Mon Mar 6 2006 Matthias Saou 4.13-2 - FC5 rebuild. --- linux_logo-4.12-debug.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 10:44:54 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 03:44:54 -0700 Subject: rpms/linux_logo/devel linux_logo-4.13-debug.patch, NONE, 1.1 linux_logo.spec, 1.11, 1.12 linux_logo-4.12-debug.patch, 1.1, NONE Message-ID: <200605231045.k4NAjRs9024609@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/linux_logo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/devel Modified Files: linux_logo.spec Added Files: linux_logo-4.13-debug.patch Removed Files: linux_logo-4.12-debug.patch Log Message: Update the debug patch to remove stripping of the binaries (Ville, #192442). linux_logo-4.13-debug.patch: --- NEW FILE linux_logo-4.13-debug.patch --- diff -Naupr linux_logo-4.13.orig/Makefile linux_logo-4.13/Makefile --- linux_logo-4.13.orig/Makefile 2006-01-11 18:29:57.000000000 +0100 +++ linux_logo-4.13/Makefile 2006-05-23 11:32:55.000000000 +0200 @@ -59,12 +59,10 @@ clean: linux_logo: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(L_OPTS) - @strip linux_logo linux_logo_shared: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo-dyn linux_logo.o vmw_string.o -L./$(LIBSYSINFO) -lsysinfo - @strip linux_logo-dyn ./$(LIBSYSINFO)/libsysinfo.a: cd $(LIBSYSINFO) && $(MAKE) @@ -88,7 +86,7 @@ linux_logo.o: linux_logo.c defaults.h lo $(CC) $(C_OPTS) -c linux_logo.c install: linux_logo - /usr/bin/install -s -m 755 $(PROGNAME) $(INSTALL_BINPATH) + /usr/bin/install -m 755 $(PROGNAME) $(INSTALL_BINPATH) /usr/bin/install -m 644 $(PROGNAME).1.gz $(INSTALL_MANPATH)/man1 cd po && $(MAKE) install Index: linux_logo.spec =================================================================== RCS file: /cvs/extras/rpms/linux_logo/devel/linux_logo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux_logo.spec 6 Mar 2006 15:25:08 -0000 1.11 +++ linux_logo.spec 23 May 2006 10:44:54 -0000 1.12 @@ -1,12 +1,12 @@ Summary: The linux logo - a colorful console penguin logo Name: linux_logo Version: 4.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.deater.net/weave/vmwprod/linux_logo/ Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz -Patch: linux_logo-4.12-debug.patch +Patch: linux_logo-4.13-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gettext @@ -52,6 +52,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 4.13-3 +- Update the debug patch to remove stripping of the binaries (Ville, #192442). + * Mon Mar 6 2006 Matthias Saou 4.13-2 - FC5 rebuild. --- linux_logo-4.12-debug.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 11:22:11 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 23 May 2006 04:22:11 -0700 Subject: rpms/dia/devel dia-0.95-formatstring.patch, NONE, 1.1 dia.spec, 1.10, 1.11 dia-0.95-CVE-2006-2480.patch, 1.1, NONE Message-ID: <200605231122.k4NBMDp8027830@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27810 Modified Files: dia.spec Added Files: dia-0.95-formatstring.patch Removed Files: dia-0.95-CVE-2006-2480.patch Log Message: * Tue May 23 2006 Hans de Goede 1:0.95-3 - Fix CVE-2006-2453. dia-0.95-formatstring.patch: --- NEW FILE dia-0.95-formatstring.patch --- Only in dia-0.95/app: .#filedlg.c diff -ur dia-0.95.orig/app/app_procs.c dia-0.95/app/app_procs.c --- dia-0.95.orig/app/app_procs.c 2006-02-27 22:29:02.000000000 +0100 +++ dia-0.95/app/app_procs.c 2006-05-22 22:22:37.000000000 +0200 @@ -1175,7 +1175,7 @@ # endif if (!g_option_context_parse (context, &argc, &argv, &error)) { if (error) { /* IMO !error here is a bug upstream, triggered with --gdk-debug=updates */ - g_print (error->message); + g_print ("%s", error->message); g_error_free (error); } else { g_print ("Invalid option?"); @@ -1273,22 +1273,22 @@ g_print(_("The original author of Dia was:\n\n")); for (i = 0; i < NUMBER_OF_ORIG_AUTHORS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nThe current maintainers of Dia are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS; i < NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nOther authors are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i < nauthors; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nDia is documented by:\n\n")); for (i = 0; i < ndocumentors; i++) { - g_print(documentors[i]); g_print("\n"); + g_print("%s\n", documentors[i]); } exit(0); Only in dia-0.95/app: app_procs.c~ diff -ur dia-0.95.orig/app/display.c dia-0.95/app/display.c --- dia-0.95.orig/app/display.c 2006-03-20 22:24:26.000000000 +0100 +++ dia-0.95/app/display.c 2006-05-23 09:39:40.000000000 +0200 @@ -1119,7 +1119,6 @@ Diagram *dia; GtkWidget *dialog, *button; gchar *fname; - gchar *msg; g_return_if_fail(ddisp != NULL); @@ -1134,10 +1133,6 @@ fname = dia->filename; if (!fname) fname = _(""); - msg = g_strdup_printf ( - _("The diagram '%s'\n" - "has not been saved. Save changes now?"), - fname); dialog = gtk_message_dialog_new(GTK_WINDOW (ddisp->shell), GTK_DIALOG_MODAL, @@ -1145,8 +1140,9 @@ GTK_BUTTONS_NONE, /* no standard buttons */ _("Closing diagram without saving"), NULL); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), msg); - g_free (msg); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The diagram '%s'\n" + "has not been saved. Save changes now?"), fname); gtk_window_set_title (GTK_WINDOW(dialog), _("Close Diagram")); button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); Only in dia-0.95/app: display.c~ diff -ur dia-0.95.orig/app/filedlg.c dia-0.95/app/filedlg.c --- dia-0.95.orig/app/filedlg.c 2006-02-05 14:42:09.000000000 +0100 +++ dia-0.95/app/filedlg.c 2006-05-23 09:41:29.000000000 +0200 @@ -299,7 +299,6 @@ if (stat(filename, &stat_struct) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; char *utf8filename = NULL; if (!g_utf8_validate(filename, -1, NULL)) { utf8filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL); @@ -310,16 +309,15 @@ } if (utf8filename == NULL) utf8filename = g_strdup(filename); - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), utf8filename); - g_free(utf8filename); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("File already exists")); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), buffer); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), utf8filename); + g_free(utf8filename); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) { @@ -552,17 +550,15 @@ if (stat(filename, &statbuf) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), dia_message_filename(filename)); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("File already exists")); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), buffer); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), dia_message_filename(filename)); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) { Only in dia-0.95/app: filedlg.c~ diff -ur dia-0.95.orig/app/interface.c dia-0.95/app/interface.c --- dia-0.95.orig/app/interface.c 2006-05-22 22:23:52.000000000 +0200 +++ dia-0.95/app/interface.c 2006-05-22 21:59:00.000000000 +0200 @@ -914,7 +914,7 @@ { Sheet *sheet = get_sheet_by_name(string); if (sheet == NULL) { - message_warning(g_strdup_printf(_("No sheet named %s"), string)); + message_warning(_("No sheet named %s"), string); } else { persistence_set_string("last-sheet-selected", string); fill_sheet_wbox(sheet); Only in dia-0.95/app: interface.c~ diff -ur dia-0.95.orig/app/load_save.c dia-0.95/app/load_save.c --- dia-0.95.orig/app/load_save.c 2006-02-11 23:48:06.000000000 +0100 +++ dia-0.95/app/load_save.c 2006-05-22 21:57:39.000000000 +0200 @@ -200,7 +200,7 @@ g_hash_table_foreach(unknown_hash, GHFuncUnknownObjects, unknown_str); - message_error(unknown_str->str); + message_error("%s", unknown_str->str); } g_hash_table_destroy(unknown_hash); g_string_free(unknown_str, TRUE); Only in dia-0.95/app: load_save.c~ diff -ur dia-0.95.orig/app/sheets.c dia-0.95/app/sheets.c --- dia-0.95.orig/app/sheets.c 2006-02-26 10:52:32.000000000 +0100 +++ dia-0.95/app/sheets.c 2006-05-22 21:56:44.000000000 +0200 @@ -340,7 +340,7 @@ gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap, mask, 1.0); gdk_pixbuf_unref(pixbuf); } else { - message_warning (error->message); + message_warning ("%s", error->message); g_error_free (error); *pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, Only in dia-0.95/app: sheets.c~ diff -ur dia-0.95.orig/lib/dia_image.c dia-0.95/lib/dia_image.c --- dia-0.95.orig/lib/dia_image.c 2005-11-03 23:22:03.000000000 +0100 +++ dia-0.95/lib/dia_image.c 2006-05-22 22:06:26.000000000 +0200 @@ -92,7 +92,7 @@ * only if there is something else wrong while loading it. */ if (g_file_test(filename, G_FILE_TEST_EXISTS)) - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); return NULL; } Only in dia-0.95/lib: dia_image.c~ diff -ur dia-0.95.orig/lib/message.c dia-0.95/lib/message.c --- dia-0.95.orig/lib/message.c 2006-05-22 22:24:18.000000000 +0200 +++ dia-0.95/lib/message.c 2006-05-22 21:55:02.000000000 +0200 @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; Only in dia-0.95: log diff -ur dia-0.95.orig/plug-ins/python/diamodule.c dia-0.95/plug-ins/python/diamodule.c --- dia-0.95.orig/plug-ins/python/diamodule.c 2005-08-29 07:17:51.000000000 +0200 +++ dia-0.95/plug-ins/python/diamodule.c 2006-05-22 22:04:37.000000000 +0200 @@ -393,11 +393,11 @@ return NULL; if (0 == type) - message_notice (text); + message_notice ("%s", text); else if (1 == type) - message_warning (text); + message_warning ("%s", text); else - message_error (text); + message_error ("%s", text); Py_INCREF(Py_None); return Py_None; Only in dia-0.95/plug-ins/python: diamodule.c~ diff -ur dia-0.95.orig/plug-ins/python/pydia-error.c dia-0.95/plug-ins/python/pydia-error.c --- dia-0.95.orig/plug-ins/python/pydia-error.c 2005-09-13 22:19:27.000000000 +0200 +++ dia-0.95/plug-ins/python/pydia-error.c 2006-05-22 22:04:02.000000000 +0200 @@ -46,7 +46,7 @@ PyFile_WriteObject (v, ef, 0); PyTraceBack_Print(tb, ef); if (((PyDiaError*)ef)->str && popup) - message_error (((PyDiaError*)ef)->str->str); + message_error ("%s", ((PyDiaError*)ef)->str->str); g_free (sLoc); Py_DECREF (ef); Py_XDECREF(exc); Only in dia-0.95/plug-ins/python: pydia-error.c~ diff -ur dia-0.95.orig/plug-ins/wmf/wmf.cpp dia-0.95/plug-ins/wmf/wmf.cpp --- dia-0.95.orig/plug-ins/wmf/wmf.cpp 2006-02-20 22:12:02.000000000 +0100 +++ dia-0.95/plug-ins/wmf/wmf.cpp 2006-05-22 22:23:00.000000000 +0200 @@ -223,7 +223,7 @@ va_end (args); //fprintf(renderer->file, string); - g_print(string); + g_print("%s", string); g_free(string); } Only in dia-0.95/plug-ins/wmf: wmf.cpp~ Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dia.spec 20 May 2006 12:20:57 -0000 1.10 +++ dia.spec 23 May 2006 11:22:11 -0000 1.11 @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -10,7 +10,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch -Patch4: dia-0.95-CVE-2006-2480.patch +Patch4: dia-0.95-formatstring.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -29,7 +29,7 @@ %patch1 -p1 -b .dtd %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons -%patch4 -p0 -b .cve-2006-2480 +%patch4 -p1 -b .formatstring %build @@ -99,6 +99,9 @@ %changelog +* Tue May 23 2006 Hans de Goede 1:0.95-3 +- Fix CVE-2006-2453. + * Sat May 20 2006 Hans de Goede 1:0.95-2 - Fix CVE-2006-2480 (bz 192535, 192538). --- dia-0.95-CVE-2006-2480.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 11:24:36 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 23 May 2006 04:24:36 -0700 Subject: rpms/dia/FC-5 dia-0.95-formatstring.patch, NONE, 1.1 dia.spec, 1.11, 1.12 dia-0.95-CVE-2006-2480.patch, 1.1, NONE Message-ID: <200605231124.k4NBOdBG027916@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27896 Modified Files: dia.spec Added Files: dia-0.95-formatstring.patch Removed Files: dia-0.95-CVE-2006-2480.patch Log Message: * Tue May 23 2006 Hans de Goede 1:0.95-3 - Fix CVE-2006-2453. dia-0.95-formatstring.patch: --- NEW FILE dia-0.95-formatstring.patch --- Only in dia-0.95/app: .#filedlg.c diff -ur dia-0.95.orig/app/app_procs.c dia-0.95/app/app_procs.c --- dia-0.95.orig/app/app_procs.c 2006-02-27 22:29:02.000000000 +0100 +++ dia-0.95/app/app_procs.c 2006-05-22 22:22:37.000000000 +0200 @@ -1175,7 +1175,7 @@ # endif if (!g_option_context_parse (context, &argc, &argv, &error)) { if (error) { /* IMO !error here is a bug upstream, triggered with --gdk-debug=updates */ - g_print (error->message); + g_print ("%s", error->message); g_error_free (error); } else { g_print ("Invalid option?"); @@ -1273,22 +1273,22 @@ g_print(_("The original author of Dia was:\n\n")); for (i = 0; i < NUMBER_OF_ORIG_AUTHORS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nThe current maintainers of Dia are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS; i < NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nOther authors are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i < nauthors; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nDia is documented by:\n\n")); for (i = 0; i < ndocumentors; i++) { - g_print(documentors[i]); g_print("\n"); + g_print("%s\n", documentors[i]); } exit(0); Only in dia-0.95/app: app_procs.c~ diff -ur dia-0.95.orig/app/display.c dia-0.95/app/display.c --- dia-0.95.orig/app/display.c 2006-03-20 22:24:26.000000000 +0100 +++ dia-0.95/app/display.c 2006-05-23 09:39:40.000000000 +0200 @@ -1119,7 +1119,6 @@ Diagram *dia; GtkWidget *dialog, *button; gchar *fname; - gchar *msg; g_return_if_fail(ddisp != NULL); @@ -1134,10 +1133,6 @@ fname = dia->filename; if (!fname) fname = _(""); - msg = g_strdup_printf ( - _("The diagram '%s'\n" - "has not been saved. Save changes now?"), - fname); dialog = gtk_message_dialog_new(GTK_WINDOW (ddisp->shell), GTK_DIALOG_MODAL, @@ -1145,8 +1140,9 @@ GTK_BUTTONS_NONE, /* no standard buttons */ _("Closing diagram without saving"), NULL); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), msg); - g_free (msg); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The diagram '%s'\n" + "has not been saved. Save changes now?"), fname); gtk_window_set_title (GTK_WINDOW(dialog), _("Close Diagram")); button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); Only in dia-0.95/app: display.c~ diff -ur dia-0.95.orig/app/filedlg.c dia-0.95/app/filedlg.c --- dia-0.95.orig/app/filedlg.c 2006-02-05 14:42:09.000000000 +0100 +++ dia-0.95/app/filedlg.c 2006-05-23 09:41:29.000000000 +0200 @@ -299,7 +299,6 @@ if (stat(filename, &stat_struct) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; char *utf8filename = NULL; if (!g_utf8_validate(filename, -1, NULL)) { utf8filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL); @@ -310,16 +309,15 @@ } if (utf8filename == NULL) utf8filename = g_strdup(filename); - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), utf8filename); - g_free(utf8filename); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("File already exists")); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), buffer); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), utf8filename); + g_free(utf8filename); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) { @@ -552,17 +550,15 @@ if (stat(filename, &statbuf) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), dia_message_filename(filename)); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("File already exists")); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), buffer); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), dia_message_filename(filename)); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) { Only in dia-0.95/app: filedlg.c~ diff -ur dia-0.95.orig/app/interface.c dia-0.95/app/interface.c --- dia-0.95.orig/app/interface.c 2006-05-22 22:23:52.000000000 +0200 +++ dia-0.95/app/interface.c 2006-05-22 21:59:00.000000000 +0200 @@ -914,7 +914,7 @@ { Sheet *sheet = get_sheet_by_name(string); if (sheet == NULL) { - message_warning(g_strdup_printf(_("No sheet named %s"), string)); + message_warning(_("No sheet named %s"), string); } else { persistence_set_string("last-sheet-selected", string); fill_sheet_wbox(sheet); Only in dia-0.95/app: interface.c~ diff -ur dia-0.95.orig/app/load_save.c dia-0.95/app/load_save.c --- dia-0.95.orig/app/load_save.c 2006-02-11 23:48:06.000000000 +0100 +++ dia-0.95/app/load_save.c 2006-05-22 21:57:39.000000000 +0200 @@ -200,7 +200,7 @@ g_hash_table_foreach(unknown_hash, GHFuncUnknownObjects, unknown_str); - message_error(unknown_str->str); + message_error("%s", unknown_str->str); } g_hash_table_destroy(unknown_hash); g_string_free(unknown_str, TRUE); Only in dia-0.95/app: load_save.c~ diff -ur dia-0.95.orig/app/sheets.c dia-0.95/app/sheets.c --- dia-0.95.orig/app/sheets.c 2006-02-26 10:52:32.000000000 +0100 +++ dia-0.95/app/sheets.c 2006-05-22 21:56:44.000000000 +0200 @@ -340,7 +340,7 @@ gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap, mask, 1.0); gdk_pixbuf_unref(pixbuf); } else { - message_warning (error->message); + message_warning ("%s", error->message); g_error_free (error); *pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, Only in dia-0.95/app: sheets.c~ diff -ur dia-0.95.orig/lib/dia_image.c dia-0.95/lib/dia_image.c --- dia-0.95.orig/lib/dia_image.c 2005-11-03 23:22:03.000000000 +0100 +++ dia-0.95/lib/dia_image.c 2006-05-22 22:06:26.000000000 +0200 @@ -92,7 +92,7 @@ * only if there is something else wrong while loading it. */ if (g_file_test(filename, G_FILE_TEST_EXISTS)) - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); return NULL; } Only in dia-0.95/lib: dia_image.c~ diff -ur dia-0.95.orig/lib/message.c dia-0.95/lib/message.c --- dia-0.95.orig/lib/message.c 2006-05-22 22:24:18.000000000 +0200 +++ dia-0.95/lib/message.c 2006-05-22 21:55:02.000000000 +0200 @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; Only in dia-0.95: log diff -ur dia-0.95.orig/plug-ins/python/diamodule.c dia-0.95/plug-ins/python/diamodule.c --- dia-0.95.orig/plug-ins/python/diamodule.c 2005-08-29 07:17:51.000000000 +0200 +++ dia-0.95/plug-ins/python/diamodule.c 2006-05-22 22:04:37.000000000 +0200 @@ -393,11 +393,11 @@ return NULL; if (0 == type) - message_notice (text); + message_notice ("%s", text); else if (1 == type) - message_warning (text); + message_warning ("%s", text); else - message_error (text); + message_error ("%s", text); Py_INCREF(Py_None); return Py_None; Only in dia-0.95/plug-ins/python: diamodule.c~ diff -ur dia-0.95.orig/plug-ins/python/pydia-error.c dia-0.95/plug-ins/python/pydia-error.c --- dia-0.95.orig/plug-ins/python/pydia-error.c 2005-09-13 22:19:27.000000000 +0200 +++ dia-0.95/plug-ins/python/pydia-error.c 2006-05-22 22:04:02.000000000 +0200 @@ -46,7 +46,7 @@ PyFile_WriteObject (v, ef, 0); PyTraceBack_Print(tb, ef); if (((PyDiaError*)ef)->str && popup) - message_error (((PyDiaError*)ef)->str->str); + message_error ("%s", ((PyDiaError*)ef)->str->str); g_free (sLoc); Py_DECREF (ef); Py_XDECREF(exc); Only in dia-0.95/plug-ins/python: pydia-error.c~ diff -ur dia-0.95.orig/plug-ins/wmf/wmf.cpp dia-0.95/plug-ins/wmf/wmf.cpp --- dia-0.95.orig/plug-ins/wmf/wmf.cpp 2006-02-20 22:12:02.000000000 +0100 +++ dia-0.95/plug-ins/wmf/wmf.cpp 2006-05-22 22:23:00.000000000 +0200 @@ -223,7 +223,7 @@ va_end (args); //fprintf(renderer->file, string); - g_print(string); + g_print("%s", string); g_free(string); } Only in dia-0.95/plug-ins/wmf: wmf.cpp~ Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dia.spec 20 May 2006 12:23:43 -0000 1.11 +++ dia.spec 23 May 2006 11:24:36 -0000 1.12 @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -10,7 +10,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch -Patch4: dia-0.95-CVE-2006-2480.patch +Patch4: dia-0.95-formatstring.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -29,7 +29,7 @@ %patch1 -p1 -b .dtd %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons -%patch4 -p0 -b .cve-2006-2480 +%patch4 -p1 -b .formatstring %build @@ -99,6 +99,9 @@ %changelog +* Tue May 23 2006 Hans de Goede 1:0.95-3 +- Fix CVE-2006-2453. + * Sat May 20 2006 Hans de Goede 1:0.95-2 - Fix CVE-2006-2480 (bz 192535, 192538). --- dia-0.95-CVE-2006-2480.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 13:30:24 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 23 May 2006 06:30:24 -0700 Subject: rpms/p0rn-comfort/FC-4 p0rn-comfort.spec, 1.1, 1.2 p0rn-modules.patch, 1.1, 1.2 Message-ID: <200605231330.k4NDUQGj002881@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/p0rn-comfort/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2826/FC-4 Modified Files: p0rn-comfort.spec p0rn-modules.patch Log Message: * Tue May 23 2006 Andreas Thienemann 0.0.4-3 - Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary Index: p0rn-comfort.spec =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/FC-4/p0rn-comfort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-comfort.spec 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-comfort.spec 23 May 2006 13:30:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: p0rn-comfort Version: 0.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support programs for browsing image-gallery sites License: GPL Group: Applications/Internet @@ -13,7 +13,6 @@ BuildArch: noarch Requires: lynx, wget, mmv Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Provides: perl(P0rn::DB), perl(P0rn::Static) %description p0rn-comfort consists of several support programs for browsing @@ -71,6 +70,9 @@ %changelog +* Tue May 23 2006 Andreas Thienemann 0.0.4-3 +- Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary + * Sun May 21 2006 Andreas Thienemann 0.0.4-2 - Modified p0rn-proxy to actually access P0rn::Static - Install some binaries into %%{_libexecdir} p0rn-modules.patch: Index: p0rn-modules.patch =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/FC-4/p0rn-modules.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-modules.patch 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-modules.patch 23 May 2006 13:30:24 -0000 1.2 @@ -1,20 +1,22 @@ -# This Patch fixes the Package-Name and adds a -# better path for the p0rn Database ---- p0rn-comfort-0.0.4/P0rn/Static.pm.orig 2006-04-28 01:22:36.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-04-28 01:23:48.000000000 +0200 +--- p0rn-comfort-0.0.4/P0rn/Static.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-05-23 15:26:30.000000000 +0200 @@ -7,7 +7,7 @@ use strict; -package Static; -+package P0rn; ++package P0rn::Static; our $PROXY_ADMIN = 'admin'; our $PROXY_CTRL_BASE = 'http://www.cgarbs.de/PROXYCONTROL'; ---- p0rn-comfort-0.0.4/P0rn/DB.pm.orig 2006-04-28 01:22:32.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-04-28 01:22:56.000000000 +0200 -@@ -7,7 +7,7 @@ +--- p0rn-comfort-0.0.4/P0rn/DB.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-05-23 15:27:02.000000000 +0200 +@@ -5,9 +5,11 @@ + # 2004 (C) by Christian Garbs + # Licensed under GNU GPL. See COPYING for details. ++package P0rn::DB; ++ use DBM::Deep; -my $dblocation = './p0rn.db'; From fedora-extras-commits at redhat.com Tue May 23 13:30:25 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 23 May 2006 06:30:25 -0700 Subject: rpms/p0rn-comfort/devel p0rn-comfort.spec, 1.1, 1.2 p0rn-modules.patch, 1.1, 1.2 Message-ID: <200605231330.k4NDUSZi002898@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/p0rn-comfort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2826/devel Modified Files: p0rn-comfort.spec p0rn-modules.patch Log Message: * Tue May 23 2006 Andreas Thienemann 0.0.4-3 - Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary Index: p0rn-comfort.spec =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/devel/p0rn-comfort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-comfort.spec 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-comfort.spec 23 May 2006 13:30:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: p0rn-comfort Version: 0.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support programs for browsing image-gallery sites License: GPL Group: Applications/Internet @@ -13,7 +13,6 @@ BuildArch: noarch Requires: lynx, wget, mmv Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Provides: perl(P0rn::DB), perl(P0rn::Static) %description p0rn-comfort consists of several support programs for browsing @@ -71,6 +70,9 @@ %changelog +* Tue May 23 2006 Andreas Thienemann 0.0.4-3 +- Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary + * Sun May 21 2006 Andreas Thienemann 0.0.4-2 - Modified p0rn-proxy to actually access P0rn::Static - Install some binaries into %%{_libexecdir} p0rn-modules.patch: Index: p0rn-modules.patch =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/devel/p0rn-modules.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-modules.patch 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-modules.patch 23 May 2006 13:30:25 -0000 1.2 @@ -1,20 +1,22 @@ -# This Patch fixes the Package-Name and adds a -# better path for the p0rn Database ---- p0rn-comfort-0.0.4/P0rn/Static.pm.orig 2006-04-28 01:22:36.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-04-28 01:23:48.000000000 +0200 +--- p0rn-comfort-0.0.4/P0rn/Static.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-05-23 15:26:30.000000000 +0200 @@ -7,7 +7,7 @@ use strict; -package Static; -+package P0rn; ++package P0rn::Static; our $PROXY_ADMIN = 'admin'; our $PROXY_CTRL_BASE = 'http://www.cgarbs.de/PROXYCONTROL'; ---- p0rn-comfort-0.0.4/P0rn/DB.pm.orig 2006-04-28 01:22:32.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-04-28 01:22:56.000000000 +0200 -@@ -7,7 +7,7 @@ +--- p0rn-comfort-0.0.4/P0rn/DB.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-05-23 15:27:02.000000000 +0200 +@@ -5,9 +5,11 @@ + # 2004 (C) by Christian Garbs + # Licensed under GNU GPL. See COPYING for details. ++package P0rn::DB; ++ use DBM::Deep; -my $dblocation = './p0rn.db'; From fedora-extras-commits at redhat.com Tue May 23 13:30:25 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 23 May 2006 06:30:25 -0700 Subject: rpms/p0rn-comfort/FC-5 p0rn-comfort.spec, 1.1, 1.2 p0rn-modules.patch, 1.1, 1.2 Message-ID: <200605231330.k4NDURsO002890@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/p0rn-comfort/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2826/FC-5 Modified Files: p0rn-comfort.spec p0rn-modules.patch Log Message: * Tue May 23 2006 Andreas Thienemann 0.0.4-3 - Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary Index: p0rn-comfort.spec =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/FC-5/p0rn-comfort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-comfort.spec 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-comfort.spec 23 May 2006 13:30:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: p0rn-comfort Version: 0.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support programs for browsing image-gallery sites License: GPL Group: Applications/Internet @@ -13,7 +13,6 @@ BuildArch: noarch Requires: lynx, wget, mmv Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Provides: perl(P0rn::DB), perl(P0rn::Static) %description p0rn-comfort consists of several support programs for browsing @@ -71,6 +70,9 @@ %changelog +* Tue May 23 2006 Andreas Thienemann 0.0.4-3 +- Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary + * Sun May 21 2006 Andreas Thienemann 0.0.4-2 - Modified p0rn-proxy to actually access P0rn::Static - Install some binaries into %%{_libexecdir} p0rn-modules.patch: Index: p0rn-modules.patch =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/FC-5/p0rn-modules.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-modules.patch 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-modules.patch 23 May 2006 13:30:25 -0000 1.2 @@ -1,20 +1,22 @@ -# This Patch fixes the Package-Name and adds a -# better path for the p0rn Database ---- p0rn-comfort-0.0.4/P0rn/Static.pm.orig 2006-04-28 01:22:36.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-04-28 01:23:48.000000000 +0200 +--- p0rn-comfort-0.0.4/P0rn/Static.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-05-23 15:26:30.000000000 +0200 @@ -7,7 +7,7 @@ use strict; -package Static; -+package P0rn; ++package P0rn::Static; our $PROXY_ADMIN = 'admin'; our $PROXY_CTRL_BASE = 'http://www.cgarbs.de/PROXYCONTROL'; ---- p0rn-comfort-0.0.4/P0rn/DB.pm.orig 2006-04-28 01:22:32.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-04-28 01:22:56.000000000 +0200 -@@ -7,7 +7,7 @@ +--- p0rn-comfort-0.0.4/P0rn/DB.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-05-23 15:27:02.000000000 +0200 +@@ -5,9 +5,11 @@ + # 2004 (C) by Christian Garbs + # Licensed under GNU GPL. See COPYING for details. ++package P0rn::DB; ++ use DBM::Deep; -my $dblocation = './p0rn.db'; From fedora-extras-commits at redhat.com Tue May 23 13:39:36 2006 From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg)) Date: Tue, 23 May 2006 06:39:36 -0700 Subject: rpms/pbzip2/devel pbzip2.spec,1.4,1.5 Message-ID: <200605231339.k4NDdchb003288@cvs-int.fedora.redhat.com> Author: jeffg Update of /cvs/extras/rpms/pbzip2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3271/pbzip2/devel Modified Files: pbzip2.spec Log Message: Updated to use $RPM_OPT_FLAGS Index: pbzip2.spec =================================================================== RCS file: /cvs/extras/rpms/pbzip2/devel/pbzip2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pbzip2.spec 28 Feb 2006 17:24:17 -0000 1.4 +++ pbzip2.spec 23 May 2006 13:39:35 -0000 1.5 @@ -1,6 +1,6 @@ Name: pbzip2 Version: 0.9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parallel implementation of bzip2 URL: http://www.compression.ca/pbzip2/ License: BSD @@ -19,6 +19,7 @@ %prep %setup -q +sed -i -e 's/ -O3 / %{optflags} /' Makefile %build @@ -43,6 +44,9 @@ %changelog +* Tue May 23 2006 Jeff Gilchrist - 0.9.6-3 +- Added support for $RPM_OPT_FLAGS thanks to Ville Skytta + * Tue Feb 28 2006 Jeff Gilchrist - 0.9.6-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Tue May 23 13:41:14 2006 From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg)) Date: Tue, 23 May 2006 06:41:14 -0700 Subject: rpms/pbzip2/FC-5 pbzip2.spec,1.4,1.5 Message-ID: <200605231341.k4NDfGDl003369@cvs-int.fedora.redhat.com> Author: jeffg Update of /cvs/extras/rpms/pbzip2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3344/pbzip2/FC-5 Modified Files: pbzip2.spec Log Message: Updated to support $RPM_OPT_FLAGS Index: pbzip2.spec =================================================================== RCS file: /cvs/extras/rpms/pbzip2/FC-5/pbzip2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pbzip2.spec 28 Feb 2006 17:24:17 -0000 1.4 +++ pbzip2.spec 23 May 2006 13:41:14 -0000 1.5 @@ -1,6 +1,6 @@ Name: pbzip2 Version: 0.9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parallel implementation of bzip2 URL: http://www.compression.ca/pbzip2/ License: BSD @@ -19,6 +19,7 @@ %prep %setup -q +sed -i -e 's/ -O3 / %{optflags} /' Makefile %build @@ -43,6 +44,9 @@ %changelog +* Tue May 23 2006 Jeff Gilchrist - 0.9.6-3 +- Added support for $RPM_OPT_FLAGS thanks to Ville Skytta + * Tue Feb 28 2006 Jeff Gilchrist - 0.9.6-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Tue May 23 14:29:07 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 23 May 2006 07:29:07 -0700 Subject: fedora-security/audit fc4,1.260,1.261 fe5,1.29,1.30 Message-ID: <200605231429.k4NET7pH005895@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873 Modified Files: fc4 fe5 Log Message: Note a new dia CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- fc4 23 May 2006 08:08:20 -0000 1.260 +++ fc4 23 May 2006 14:29:04 -0000 1.261 @@ -5,6 +5,7 @@ CVE-2006-2493 ** freetype CVE-2006-2480 VULNERABLE (dia) #192538 +CVE-2006-2453 VULNERABLE (dia) #192538 CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- fe5 22 May 2006 19:57:33 -0000 1.29 +++ fe5 23 May 2006 14:29:04 -0000 1.30 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2453 VULNERABLE (dia) bz#192830 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2480 patch (dia, fixed 0.95-2) bz#192535 CVE-2006-2442 patch (kphone, fixed 4.2-9) bz#192202 From fedora-extras-commits at redhat.com Tue May 23 14:36:19 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Tue, 23 May 2006 07:36:19 -0700 Subject: fedora-security/audit fc4,1.261,1.262 fc5,1.174,1.175 Message-ID: <200605231436.k4NEaJI9006148@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6128/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-0558 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- fc4 23 May 2006 14:29:04 -0000 1.261 +++ fc4 23 May 2006 14:36:17 -0000 1.262 @@ -181,7 +181,7 @@ CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] CVE-2006-0591 version (postgresql, fixed 8.0.6) #180537 [since FEDORA-2005-021] CVE-2006-0576 VULNERABLE (oprofile) #180724 -CVE-2006-0558 * kernel +CVE-2006-0558 version (kernel, ** fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-0557 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 CVE-2006-0555 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 CVE-2006-0554 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- fc5 23 May 2006 08:08:20 -0000 1.174 +++ fc5 23 May 2006 14:36:17 -0000 1.175 @@ -181,7 +181,7 @@ CVE-2006-0645 version (gnutls, fixed 1.2.10) CVE-2006-0591 version (postgresql, fixed 8.0.6) CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch -CVE-2006-0558 * kernel +CVE-2006-0558 version (kernel, ** fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-0557 version (kernel, fixed 2.6.15.6) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0555 version (kernel, fixed 2.6.16) patch-2.6.16-rc6-git3 [since FEDORA-2006-233] CVE-2006-0554 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233] From fedora-extras-commits at redhat.com Tue May 23 14:55:29 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:55:29 -0700 Subject: rpms/bzrtools - New directory Message-ID: <200605231455.k4NEtVME006324@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6303/bzrtools Log Message: Directory /cvs/extras/rpms/bzrtools added to the repository From fedora-extras-commits at redhat.com Tue May 23 14:55:29 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:55:29 -0700 Subject: rpms/bzrtools/devel - New directory Message-ID: <200605231455.k4NEtVZl006327@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6303/bzrtools/devel Log Message: Directory /cvs/extras/rpms/bzrtools/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 14:55:43 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:55:43 -0700 Subject: rpms/bzrtools Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605231455.k4NEtjrJ006376@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6348 Added Files: Makefile import.log Log Message: Setup of module bzrtools --- NEW FILE Makefile --- # Top level Makefile for module bzrtools all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 23 14:55:43 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:55:43 -0700 Subject: rpms/bzrtools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605231455.k4NEtjts006379@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6348/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bzrtools --- NEW 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 May 23 14:56:03 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:56:03 -0700 Subject: rpms/bzrtools import.log,1.1,1.2 Message-ID: <200605231456.k4NEuZml006447@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413 Modified Files: import.log Log Message: auto-import bzrtools-0.8.1-3 on branch devel from bzrtools-0.8.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bzrtools/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 14:55:42 -0000 1.1 +++ import.log 23 May 2006 14:56:03 -0000 1.2 @@ -0,0 +1 @@ +bzrtools-0_8_1-3:HEAD:bzrtools-0.8.1-3.src.rpm:1148396160 From fedora-extras-commits at redhat.com Tue May 23 14:56:04 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:56:04 -0700 Subject: rpms/bzrtools/devel bzrtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605231456.k4NEuaF8006451@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413/devel Modified Files: .cvsignore sources Added Files: bzrtools.spec Log Message: auto-import bzrtools-0.8.1-3 on branch devel from bzrtools-0.8.1-3.src.rpm --- NEW FILE bzrtools.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzrtools Version: 0.8.1 Release: 3%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools License: GPL URL: http://bazaar-vcs.org/BzrTools Source0: http://panoramicfeedback.com/opensource/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: bzr = 0.8 %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included plugins are: * push - uses rsync to push local changes to a remote server * annotate - prints a file annotated with the revision next to each line * baz-import - (Requres PyBaz) import an arch archive losslessly into bzr * shelve/unshelve - allows you to undo some changes, commit, and restore * clean-tree - remove unknown, ignored-junk, or unversioned files from the tree * graph-ancestry - use dot to produce banch ancestry graphs * shell - a bzr command interpreter with command completion * patch - apply a patch to your tree from a file or URL %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT # remove shebangs from all files as none should be executable scripts sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README NEWS COPYING %dir %{python_sitelib}/bzrlib/plugins/bzrtools %{python_sitelib}/bzrlib/plugins/bzrtools/*.py %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc %ghost %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog * Tue May 16 2006 Shahms E. King 0.8.1-3 - BuildRequires python, rather than python-devel * Mon May 15 2006 Shahms E. King 0.8.1-2 - Fix rpmlint non-executable-script errors * Fri May 12 2006 Shahms E. King 0.8.1-1 - Add COPYING to %doc - Update to new upstream version - Require bzr 0.8 * Wed May 10 2006 Shahms E. King 0.8-1 - Update to new upstream version * Fri Apr 14 2006 Shahms E. King 0.7-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 14:55:43 -0000 1.1 +++ .cvsignore 23 May 2006 14:56:04 -0000 1.2 @@ -0,0 +1 @@ +bzrtools-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 14:55:43 -0000 1.1 +++ sources 23 May 2006 14:56:04 -0000 1.2 @@ -0,0 +1 @@ +d1b913b55d5249d3ff007c756042b0df bzrtools-0.8.1.tar.gz From fedora-extras-commits at redhat.com Tue May 23 14:57:21 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:21 -0700 Subject: rpms/python-sqlalchemy - New directory Message-ID: <200605231457.k4NEvNxJ006552@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/python-sqlalchemy Log Message: Directory /cvs/extras/rpms/python-sqlalchemy added to the repository From fedora-extras-commits at redhat.com Tue May 23 14:57:21 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:21 -0700 Subject: rpms/python-sqlalchemy/devel - New directory Message-ID: <200605231457.k4NEvNBa006555@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/python-sqlalchemy/devel Log Message: Directory /cvs/extras/rpms/python-sqlalchemy/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 14:57:33 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:33 -0700 Subject: rpms/python-sqlalchemy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605231457.k4NEvZ3F006609@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6576 Added Files: Makefile import.log Log Message: Setup of module python-sqlalchemy --- NEW FILE Makefile --- # Top level Makefile for module python-sqlalchemy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 23 14:57:33 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:33 -0700 Subject: rpms/python-sqlalchemy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605231457.k4NEvZ43006612@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6576/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-sqlalchemy --- NEW 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 May 23 14:57:50 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:50 -0700 Subject: rpms/python-sqlalchemy import.log,1.1,1.2 Message-ID: <200605231457.k4NEvqQg006676@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6643 Modified Files: import.log Log Message: auto-import python-sqlalchemy-0.1.7-1 on branch devel from python-sqlalchemy-0.1.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 14:57:32 -0000 1.1 +++ import.log 23 May 2006 14:57:50 -0000 1.2 @@ -0,0 +1 @@ +python-sqlalchemy-0_1_7-1:HEAD:python-sqlalchemy-0.1.7-1.src.rpm:1148396267 From fedora-extras-commits at redhat.com Tue May 23 14:57:51 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:51 -0700 Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605231457.k4NEvrBa006681@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6643/devel Modified Files: .cvsignore sources Added Files: python-sqlalchemy.spec Log Message: auto-import python-sqlalchemy-0.1.7-1 on branch devel from python-sqlalchemy-0.1.7-1.src.rpm --- NEW FILE python-sqlalchemy.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} %define srcname SQLAlchemy Name: python-sqlalchemy Version: 0.1.7 Release: 1%{?dist} Summary: Modular and flexible ORM library for python Group: Development/Libraries License: MIT URL: http://www.sqlalchemy.org/ Source0: http://download.sourceforge.net/sqlalchemy/%{srcname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python python-setuptools Requires: python-abi = %{pyver} %description SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible, high-level interface to SQL databases. Database and domain concepts are decoupled, allowing both sides maximum flexibility and power. SQLAlchemy provides a powerful mapping layer that can work as automatically or as manually as you choose, determining relationships based on foreign keys or letting you define the join conditions explicitly, to bridge the gap between database and domain. %prep %setup -q -n %{srcname}-%{version} %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed # remove unnecessary scripts for building documentation rm -rf doc/build %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE PKG-INFO doc examples %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info %dir %{python_sitelib}/sqlalchemy %{python_sitelib}/sqlalchemy/*.py %{python_sitelib}/sqlalchemy/*.pyc %ghost %{python_sitelib}/sqlalchemy/*.pyo %dir %{python_sitelib}/sqlalchemy/databases %{python_sitelib}/sqlalchemy/databases/*.py %{python_sitelib}/sqlalchemy/databases/*.pyc %ghost %{python_sitelib}/sqlalchemy/databases/*.pyo %dir %{python_sitelib}/sqlalchemy/ext %{python_sitelib}/sqlalchemy/ext/*.py %{python_sitelib}/sqlalchemy/ext/*.pyc %ghost %{python_sitelib}/sqlalchemy/ext/*.pyo %dir %{python_sitelib}/sqlalchemy/mapping %{python_sitelib}/sqlalchemy/mapping/*.py %{python_sitelib}/sqlalchemy/mapping/*.pyc %ghost %{python_sitelib}/sqlalchemy/mapping/*.pyo %dir %{python_sitelib}/sqlalchemy/mods %{python_sitelib}/sqlalchemy/mods/*.py %{python_sitelib}/sqlalchemy/mods/*.pyc %ghost %{python_sitelib}/sqlalchemy/mods/*.pyo %changelog * Tue May 16 2006 Shahms E. King 0.1.7-1 - Update to new upstream version - Point URL to direct link, not sourceforge redirect - Remove unnecessary document build scripts * Fri Apr 14 2006 Shahms E. King 0.1.6-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 14:57:33 -0000 1.1 +++ .cvsignore 23 May 2006 14:57:51 -0000 1.2 @@ -0,0 +1 @@ +SQLAlchemy-0.1.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 14:57:33 -0000 1.1 +++ sources 23 May 2006 14:57:51 -0000 1.2 @@ -0,0 +1 @@ +1c9c0124ad057c9fbcf8c4e16ecae960 SQLAlchemy-0.1.7.tar.gz From fedora-extras-commits at redhat.com Tue May 23 15:06:22 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 23 May 2006 08:06:22 -0700 Subject: extras-buildsys/common Commands.py,1.8,1.9 Message-ID: <200605231506.k4NF6M7p009068@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9032/common Modified Files: Commands.py Log Message: 2006-05-23 Dan Williams * common/Commands.py - Add a "JobSPRM" command for notifying builders that the job SRPM is available. Passive builders need to upload the SRPM so we have to split the srpm out of the NewJob command to give the server time to upload to a passive builder. Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Commands.py 14 May 2006 05:43:06 -0000 1.8 +++ Commands.py 23 May 2006 15:06:14 -0000 1.9 @@ -28,6 +28,7 @@ CMD_NAME_SLOTS = "Slots" CMD_NAME_NEW_JOB_REQ = "NewJob" CMD_NAME_NEW_JOB_ACK = "NewJobAck" +CMD_NAME_JOB_SRPM = "JobSRPM" CMD_NAME_UNLOCK_REPO = "UnlockRepo" CMD_NAME_BUILDING_JOBS = "BuildingJobs" CMD_NAME_JOB_STATUS_REQ = "JobStatus" @@ -127,6 +128,8 @@ cmd = PlgCommandNewJobReq._deserialize(args) elif name == CMD_NAME_NEW_JOB_ACK: cmd = PlgCommandNewJobAck._deserialize(args) + elif name == CMD_NAME_JOB_SRPM: + cmd = PlgCommandJobSRPM._deserialize(args) elif name == CMD_NAME_BUILDING_JOBS: cmd = PlgCommandBuildingJobs._deserialize(args) elif name == CMD_NAME_JOB_STATUS_REQ: @@ -416,6 +419,41 @@ return self._msg +class PlgCommandJobSRPM(PlgCommand): + def __init__(self, archjob_id, srpm_url, seq=0): + PlgCommand.__init__(self, CMD_NAME_JOB_SRPM, seq) + self._archjob_id = archjob_id + self._srpm_url = srpm_url + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except (ValueError, TypeError): + raise ValueError("No 'archjob_id' argument found.") + try: + srpm_url = args['srpm_url'] + except (ValueError, TypeError): + raise ValueError("No 'srpm_url' argument found.") + return PlgCommandJobSRPM(archjob_id, srpm_url) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + args['srpm_url'] = self._srpm_url + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def srpm_url(self): + return self._srpm_url + + def __str__(self): + return "%s(seq: %d, archjob_id: %s, srpm_url: %s)" % (self._name, self._seq, self._archjob_id, self._srpm_url) + + class PlgCommandUnlockRepo(PlgCommand): def __init__(self, archjob_id, seq=0): PlgCommand.__init__(self, CMD_NAME_UNLOCK_REPO, seq) From fedora-extras-commits at redhat.com Tue May 23 15:06:16 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 23 May 2006 08:06:16 -0700 Subject: extras-buildsys ChangeLog,1.201,1.202 Message-ID: <200605231506.k4NF6kV2009076@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9032 Modified Files: ChangeLog Log Message: 2006-05-23 Dan Williams * common/Commands.py - Add a "JobSPRM" command for notifying builders that the job SRPM is available. Passive builders need to upload the SRPM so we have to split the srpm out of the NewJob command to give the server time to upload to a passive builder. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- ChangeLog 20 May 2006 05:10:02 -0000 1.201 +++ ChangeLog 23 May 2006 15:06:14 -0000 1.202 @@ -1,3 +1,11 @@ +2006-05-23 Dan Williams + + * common/Commands.py + - Add a "JobSPRM" command for notifying builders that the job SRPM is + available. Passive builders need to upload the SRPM so we have to + split the srpm out of the NewJob command to give the server time to + upload to a passive builder. + 2006-05-20 Dan Williams * server/Builder.py From fedora-extras-commits at redhat.com Tue May 23 15:07:04 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 08:07:04 -0700 Subject: owners owners.list,1.1047,1.1048 Message-ID: <200605231507.k4NF765g009103@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9086 Modified Files: owners.list Log Message: add python-sqlalchemy and bzrtools Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1047 retrieving revision 1.1048 diff -u -r1.1047 -r1.1048 --- owners.list 23 May 2006 02:08:50 -0000 1.1047 +++ owners.list 23 May 2006 15:07:04 -0000 1.1048 @@ -109,6 +109,7 @@ Fedora Extras|byzanz|A desktop recorder|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|bzr|A friendly distributed version control system|shahms at shahms.com|extras-qa at fedoraproject.org| +Fedora Extras|bzrtools|A collection of utilities and plugins for Bazaar-NG|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org| @@ -1388,6 +1389,7 @@ Fedora Extras|python-setuptools|Download, build, install, upgrade, and uninstall Python packages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org| +Fedora Extras|python-sqlalchemy|Modular and flexible ORM library for python|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|python-sqlite2|DB-API 2.0 interface for SQLite 3.x|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 23 15:22:37 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 08:22:37 -0700 Subject: rpms/bzr/FC-4 .cvsignore,1.3,1.4 bzr.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200605231522.k4NFMdeh009271@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9216/FC-4 Modified Files: .cvsignore bzr.spec sources Log Message: Update to new upstream version 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2006 22:40:31 -0000 1.3 +++ .cvsignore 23 May 2006 15:22:37 -0000 1.4 @@ -1 +1 @@ -bzr-0.8.tar.gz +bzr-0.8.2.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/bzr.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bzr.spec 10 May 2006 22:40:31 -0000 1.4 +++ bzr.spec 23 May 2006 15:22:37 -0000 1.5 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.8 -Release: 1%{dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -71,6 +71,11 @@ %{python_sitelib}/bzrlib/plugins/*.pyc %ghost %{python_sitelib}/bzrlib/plugins/*.pyo +%dir %{python_sitelib}/bzrlib/plugins/launchpad +%{python_sitelib}/bzrlib/plugins/launchpad/*.py +%{python_sitelib}/bzrlib/plugins/launchpad/*.pyc +%ghost %{python_sitelib}/bzrlib/plugins/launchpad/*.pyo + %dir %{python_sitelib}/bzrlib/util %{python_sitelib}/bzrlib/util/*.py %{python_sitelib}/bzrlib/util/*.pyc @@ -162,6 +167,10 @@ %ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo %changelog +* Tue May 23 2006 Shahms E. King 0.8.2-1 +- Update to new upstream version +- Fix dist tag + * Wed May 10 2006 Shahms E. King 0.8-1 - Update to new upstream version - Update bzr-sys-etree.patch for changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 May 2006 22:40:31 -0000 1.3 +++ sources 23 May 2006 15:22:37 -0000 1.4 @@ -1 +1 @@ -88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz +9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz From fedora-extras-commits at redhat.com Tue May 23 15:22:38 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 08:22:38 -0700 Subject: rpms/bzr/devel .cvsignore,1.3,1.4 bzr.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200605231522.k4NFMe1K009283@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9216/devel Modified Files: .cvsignore bzr.spec sources Log Message: Update to new upstream version 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2006 22:40:38 -0000 1.3 +++ .cvsignore 23 May 2006 15:22:38 -0000 1.4 @@ -1 +1 @@ -bzr-0.8.tar.gz +bzr-0.8.2.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bzr.spec 10 May 2006 22:40:38 -0000 1.4 +++ bzr.spec 23 May 2006 15:22:38 -0000 1.5 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.8 -Release: 1%{dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -71,6 +71,11 @@ %{python_sitelib}/bzrlib/plugins/*.pyc %ghost %{python_sitelib}/bzrlib/plugins/*.pyo +%dir %{python_sitelib}/bzrlib/plugins/launchpad +%{python_sitelib}/bzrlib/plugins/launchpad/*.py +%{python_sitelib}/bzrlib/plugins/launchpad/*.pyc +%ghost %{python_sitelib}/bzrlib/plugins/launchpad/*.pyo + %dir %{python_sitelib}/bzrlib/util %{python_sitelib}/bzrlib/util/*.py %{python_sitelib}/bzrlib/util/*.pyc @@ -162,6 +167,10 @@ %ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo %changelog +* Tue May 23 2006 Shahms E. King 0.8.2-1 +- Update to new upstream version +- Fix dist tag + * Wed May 10 2006 Shahms E. King 0.8-1 - Update to new upstream version - Update bzr-sys-etree.patch for changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 May 2006 22:40:38 -0000 1.3 +++ sources 23 May 2006 15:22:38 -0000 1.4 @@ -1 +1 @@ -88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz +9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz From fedora-extras-commits at redhat.com Tue May 23 15:22:38 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 08:22:38 -0700 Subject: rpms/bzr/FC-5 .cvsignore,1.3,1.4 bzr.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200605231522.k4NFMeMm009277@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9216/FC-5 Modified Files: .cvsignore bzr.spec sources Log Message: Update to new upstream version 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2006 22:40:32 -0000 1.3 +++ .cvsignore 23 May 2006 15:22:38 -0000 1.4 @@ -1 +1 @@ -bzr-0.8.tar.gz +bzr-0.8.2.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/bzr.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bzr.spec 10 May 2006 22:40:32 -0000 1.4 +++ bzr.spec 23 May 2006 15:22:38 -0000 1.5 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.8 -Release: 1%{dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -71,6 +71,11 @@ %{python_sitelib}/bzrlib/plugins/*.pyc %ghost %{python_sitelib}/bzrlib/plugins/*.pyo +%dir %{python_sitelib}/bzrlib/plugins/launchpad +%{python_sitelib}/bzrlib/plugins/launchpad/*.py +%{python_sitelib}/bzrlib/plugins/launchpad/*.pyc +%ghost %{python_sitelib}/bzrlib/plugins/launchpad/*.pyo + %dir %{python_sitelib}/bzrlib/util %{python_sitelib}/bzrlib/util/*.py %{python_sitelib}/bzrlib/util/*.pyc @@ -162,6 +167,10 @@ %ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo %changelog +* Tue May 23 2006 Shahms E. King 0.8.2-1 +- Update to new upstream version +- Fix dist tag + * Wed May 10 2006 Shahms E. King 0.8-1 - Update to new upstream version - Update bzr-sys-etree.patch for changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 May 2006 22:40:32 -0000 1.3 +++ sources 23 May 2006 15:22:38 -0000 1.4 @@ -1 +1 @@ -88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz +9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz From fedora-extras-commits at redhat.com Tue May 23 15:59:39 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 23 May 2006 08:59:39 -0700 Subject: rpms/pan/devel .cvsignore, 1.8, 1.9 pan.spec, 1.16, 1.17 sources, 1.8, 1.9 pan-0.97-crash-on-shutdown.patch, 1.1, NONE pan-0.97-tree-expanders.patch, 1.1, NONE Message-ID: <200605231559.k4NFxfvx009694@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9673 Modified Files: .cvsignore pan.spec sources Removed Files: pan-0.97-crash-on-shutdown.patch pan-0.97-tree-expanders.patch Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 May 2006 04:12:20 -0000 1.8 +++ .cvsignore 23 May 2006 15:59:38 -0000 1.9 @@ -1,6 +1 @@ -pan-0.14.2.91.tar.bz2 -pan-0.93.tar.bz2 -pan-0.94.tar.bz2 -pan-0.95.tar.bz2 -pan-0.96.tar.bz2 -pan-0.97.tar.bz2 +pan-0.98.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- pan.spec 16 May 2006 10:57:22 -0000 1.16 +++ pan.spec 23 May 2006 15:59:38 -0000 1.17 @@ -1,13 +1,11 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.97 -Release: 2%{?dist} +Version: 0.98 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 -Patch0: pan-0.97-crash-on-shutdown.patch -Patch1: pan-0.97-tree-expanders.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -28,8 +26,6 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 echo "StartupNotify=true" >> pan.desktop @@ -74,6 +70,10 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Tue May 23 2006 Michael A. Peters - 1:0.98-1 +- Update to 0.98 +- previous patches not needed + * Tue May 16 2006 Michael A. Peters - 1:0.97-2 - Added pan-0.97-tree-expanders.patch from upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 May 2006 04:12:20 -0000 1.8 +++ sources 23 May 2006 15:59:38 -0000 1.9 @@ -1,2 +1 @@ -b4e355553cd502add3e599d1e867da9e pan-0.96.tar.bz2 -32dd572f582b1bfd708d4eb755c215e4 pan-0.97.tar.bz2 +004dd79036b726e666cadcfd080fd515 pan-0.98.tar.bz2 --- pan-0.97-crash-on-shutdown.patch DELETED --- --- pan-0.97-tree-expanders.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 17:00:12 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 23 May 2006 10:00:12 -0700 Subject: extras-buildsys/utils extras-push-new,1.14,1.15 Message-ID: <200605231700.k4NH0COf012337@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12317 Modified Files: extras-push-new Log Message: combine build reports into a single mail Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- extras-push-new 20 May 2006 14:34:28 -0000 1.14 +++ extras-push-new 23 May 2006 17:00:09 -0000 1.15 @@ -58,7 +58,7 @@ doublesync = False force = False -alldists = [ 'development', '5', '4', '3' ] +alldists = [ '5', '4', '3', 'development' ] # also the order in build reports archdict = { '3' : ['x86_64', 'i386'], '4' : ['ppc','x86_64', 'i386'], @@ -450,34 +450,40 @@ import smtplib from email.MIMEText import MIMEText -def email_list(pkglist, dist): +def email_list(distlist): """email mailing list with the new package listing""" - uniqued = rpmUtils.miscutils.unique(pkglist) - uniqued.sort() + body = '' + for dist in alldists: # we do this for sorting the dists + if not dist in distlist: + continue + uniqued = rpmUtils.miscutils.unique( getlinesfromrunfile(dist) ) + uniqued.sort() - output = "\nPackages built and released for %s %s: %s \n\n" % (project_hr, dist, len(uniqued)) - for pkg in uniqued: - add = '%s\n' % (pkg) - output = output + add + body += "\nPackages built and released for %s %s: %s \n\n" % (project_hr, dist, len(uniqued)) + for pkg in uniqued: + add = ' %s\n' % (pkg) + body += add + body += '\n' + body += mail_footer - output = output + mail_footer - msg = MIMEText(output) + msg = MIMEText(body) subject = '%s %s Package Build Report' % (project_hr, dist) msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to debugprint( msg.as_string() ) - if DEBUG: - return - s = smtplib.SMTP() - if smtp_server: - s.connect(smtp_server) - else: - s.connect() - s.sendmail(mail_from, [mail_to], msg.as_string()) - s.close() - + if not DEBUG: + s = smtplib.SMTP() + if smtp_server: + s.connect(smtp_server) + else: + s.connect() + s.sendmail(mail_from, [mail_to], msg.as_string()) + s.close() + + for dist in distlist: + emptyrunfile(dist) # ==================================================================== @@ -551,9 +557,7 @@ run_and_check('extras-sync') if opts.mail: - for dist in diststopush: - email_list( getlinesfromrunfile(dist), dist ) - emptyrunfile(dist) + email_list( diststopush ) lock.unlock() sys.exit(0) From fedora-extras-commits at redhat.com Tue May 23 17:06:49 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 23 May 2006 10:06:49 -0700 Subject: extras-buildsys/utils extras-push-new,1.15,1.16 Message-ID: <200605231706.k4NH6nWu014678@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14660 Modified Files: extras-push-new Log Message: combined/shortened mail subject for build report Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- extras-push-new 23 May 2006 17:00:09 -0000 1.15 +++ extras-push-new 23 May 2006 17:06:47 -0000 1.16 @@ -468,7 +468,7 @@ body += mail_footer msg = MIMEText(body) - subject = '%s %s Package Build Report' % (project_hr, dist) + subject = '%s Package Build Report' % (project_hr) msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to From fedora-extras-commits at redhat.com Tue May 23 19:25:26 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 23 May 2006 12:25:26 -0700 Subject: rpms/xmms/devel xmms-1.2.10-joycrash.patch, NONE, 1.1 xmms.spec, 1.20, 1.21 Message-ID: <200605231925.k4NJPSgR030185@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30156 Modified Files: xmms.spec Added Files: xmms-1.2.10-joycrash.patch Log Message: * Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 - Apply upstream fix for joystick plugin crashes. xmms-1.2.10-joycrash.patch: --- NEW FILE xmms-1.2.10-joycrash.patch --- =================================================================== RCS file: /cvs/xmms/General/joystick/joy.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- xmms/General/joystick/joy.c 2001/02/04 18:00:11 1.8 +++ xmms/General/joystick/joy.c 2004/07/17 21:54:55 1.9 @@ -177,8 +177,11 @@ static void init(void) /* ---------------------------------------------------------------------- */ static void cleanup(void) { - keep_going = FALSE; - pthread_join(joyapp_thread, NULL); + if (keep_going) + { + keep_going = FALSE; + pthread_join(joyapp_thread, NULL); + } if (joy_fd1 > 0) close(joy_fd1); if (joy_fd2 > 0) Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xmms.spec 6 Apr 2006 20:43:57 -0000 1.20 +++ xmms.spec 23 May 2006 19:25:25 -0000 1.21 @@ -4,7 +4,7 @@ Name: xmms Version: 1.2.10 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 1 Summary: The X MultiMedia System, a media player @@ -19,6 +19,8 @@ Source1: xmms.req Source2: xmms.xpm Source3: rh_mp3.c +# http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9 +Patch0: %{name}-1.2.10-joycrash.patch Patch1: %{name}-1.2.6-audio.patch Patch2: %{name}-1.2.6-lazy.patch Patch3: %{name}-1.2.8-default-skin.patch @@ -76,6 +78,8 @@ %prep %setup -q +# Fix joystick plugin crashes +%patch0 -p1 -b .joycrash # Set default output plugin to ALSA %patch1 -p1 -b .audio # Use RTLD_LAZY, not RTLD_NOW @@ -183,6 +187,9 @@ %changelog +* Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 +- Apply upstream fix for joystick plugin crashes. + * Thu Apr 6 2006 Ville Skytt?? - 1:1.2.10-23 - Split library and plugins to xmms-libs (#184606). - ALSA is ubiquitous, don't filter dependencies to it. From fedora-extras-commits at redhat.com Tue May 23 20:12:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 23 May 2006 13:12:03 -0700 Subject: rpms/lyx/devel lyx-1.4.1-defaults.patch, NONE, 1.1 lyxrc.defaults.custom, NONE, 1.1 lyx.spec, 1.36, 1.37 lyx-1.4.0-boost.patch, 1.3, NONE Message-ID: <200605232012.k4NKC5vQ008178@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150 Modified Files: lyx.spec Added Files: lyx-1.4.1-defaults.patch lyxrc.defaults.custom Removed Files: lyx-1.4.0-boost.patch Log Message: * Tue May 23 2006 Rex Dieter 1.4.1-6 - set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) screen_font_roman "Serif" screen_font_sans "Sans" screen_font_typewriter "Monospace" screen_zoom 100 serverpipe "~/.lyx/pipe" lyx-1.4.1-defaults.patch: --- NEW FILE lyx-1.4.1-defaults.patch --- --- lyx-1.4.1/lib/configure.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure 2006-05-23 14:21:08.000000000 -0500 @@ -2027,3 +2027,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- lyx-1.4.1/lib/configure.m4.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure.m4 2006-05-23 14:20:55.000000000 -0500 @@ -727,3 +727,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- NEW FILE lyxrc.defaults.custom --- # -*- text -*- # file lyxrc.example # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. # author Lars Gullik Bj?nnes # author Jean-Marc Lasgouttes # author Jos? Matos # author Asger Alstrup Nielsen # author Ed Scott # author Lior Silberman # author Dekel Tsur # Full author contact details are available in file CREDITS. # The file lyxrc.example is a template to write your own lyxrc file. # If you copy/rename it to lyxrc in the current directory, it will # give global options for all LyX users. It is also possible to copy # this file to $HOME/.lyx/lyxrc so that the configuration applies to a # particular user. # # Several of these settings have defaults that are auto-detected when you use # the menu option Options->Reconfigure. You can see their value by looking at # the file $HOME/.lyx/lyxrc.defaults. Any setting in this file will override # the defaults. # # BIND SECTION ########################################################### # # Before defining your own key-bindings, select one of the available default # binding sets. These are resource files (like this one) that define a # large set of (keyboard) bindings. These files live in bind directory of # the LyX system directory and have in general the .bind suffix. # Currently, you can choose from the following flavors: # # cua.bind for Windows-, Mac- and Motif-like bindings # emacs.bind for Emacs-like bindings. # # The \bind_file command looks in the LyX bind directory for a file # of the given name, but a full path can also be given. If you have # a bind file in your ~/.lyx/bind/ directory, it will be preferred # over a system wide bind file. Default is `cua'. #\bind_file cua #\bind_file emacs # Based on the default, you can now change part or all of it with the # \bind command. For example, when you want the delete key to do the # backspace action, uncomment the following line: #\bind "Delete" "delete-backward" # However, if you're not at all happy with the default bindings, # the most logical thing to do would be to use one of the system # wide bind files as a template and place your own version in # ~/.lyx/bind/mine_is_best.bind and change the above \bind_file # to this instead: #\bind_file mine_is_best # By default, LyX takes over the handling of the dead keys (or accent # keys) that may be defined for your keyboard. While this allows you # to enter characters that would not be normally available, some # people dislike the different behaviour. You can use raw dead keys by # just uncommenting the next line #\override_x_deadkeys false # Tip: Use "lyx -dbg 4" to survey how LyX interprets your keybindings. # # MISC SECTION ########################################################### # # Set this to false if you don't want the startup banner. # Default is true. #\show_banner true # Set to false if you don't want the current selection to be replaced # automatically by what you type. Default is true. #\auto_region_delete false # This is the time interval between auto-saves (in seconds). # 0 means no auto-save, default is 300 for five minutes. #\autosave 600 # LyX asks for a second confirmation to exit if you exit with changed # documents that you don't want to save. You can turn this confirmation off # (LyX will still ask to save changed documents) with the following line. # We recommend to keep the confirmation, though. #\exit_confirmation false # This sets the behaviour if you want to be asked for a filename when # creating a new document or wait until you save it and be asked then. # The default for now is ask on save. # \new_ask_filename false # LyX continously displays names of last command executed, along with a list # of defined short-cuts for it in the minibuffer. # It requires some horsepower to function, so you can turn it off, if LyX # seems slow to you, by uncommenting this line: #\display_shortcuts false # \view_dvi_paper_option allows to specify a paper option to the dvi # viewer. By default LyX specifies the paper size of the document to # the dvi viewer via the command line option -paper size, where size # is one of "us","letter","a3","a4" and so on. The command # \view_dvi_paper_option allows the user to overwrite the name of the # command line flag, i.e. replace -paper with something else. If # specified and left empty, i.e. \view_dvi_paper_option "", LyX does # not append the -paper option to the dvi command at all. This case is # especially useful when viewing your documents on Windows with yap, # because yap does not allow a command line option for the paper size. #\view_dvi_paper_option "" # LyX assumes that the default papersize should be usletter. If this is not # true for your site, use the next line to specify usletter, legal, # executive, a3, a4, a5, or b5 as the default papersize. #\default_papersize "a4" # Define which program to use to run "chktex". # You should include options that turn different warnings on and off. # Default is "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38" # Check the ChkTeX documentation for info on what the flags mean. # Example: use this to ignore warnings about using "\ldots" instead of "..." #\chktex_command "chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38" # Keyboard Mapping. Use this to set the correct mapping file for your # keyboard, that is if you need one. You'll need one if you for instance # want to type German documents on an American keyboard. In that case, # uncomment these three lines: #\kbmap true #\kbmap_primary german #\kbmap_secondary american # The following keyboards are supported: american, czech, francais, # french, german, german-2, magyar, magyar-2, portuges, romanian, # slovak, slovene, transilvanian, turkish and turkish-f. Check # the lib/kbd directory if you want to write support for your language. # If you do, please submit it to lyx-devel at lists.lyx.org. # The Pause button is defined to be a three-way switch between primary # keyboard, secondary keyboard, and no keyboard mapping with the # following command. It is useful if you want to write in a language # not directly supported by your keyboard and you have defined a # custom keyboard mapping above. #\bind "Pause" "keymap-toggle" # This starts the lyxserver. The pipes get an additional extension # '.in' and '.out'. Only for advanced users. \serverpipe "~/.lyx/pipe" # Default format string for the date-insert command # # This accepts the normal strftime formats; see man strftime for full # details of the format. # #\date_insert_format "%A, %e. %B %Y" # Maximum number of words in the initialization string for a new label. # If it is set to 0, then the init. string will only contain the prefix # (e.g. "sec:"). If it is set to -1, the init. string will be empty. # This feature is disabled in 1.1.6. # #\label_init_length 0 # # SCREEN & FONTS SECTION ################################################# # # DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes # wrong, you can override the setting here: #\screen_dpi 100 # The zoom percentage for screen fonts. # A setting of 100% will make the fonts roughly the same size as on paper. # However, since a screen is wider than a piece of paper, the default setting # is 150%. \screen_zoom 100 # The wheel movement factor (for mice with wheels or five button mice) # Default is 100, about a page down. A value of 10 give me about a line and # a half #\wheel_jump 10 # LyX normally doesn't update the cursor position if you move the scrollbar. # If you scroll the cursor off the screen and then start typing LyX will # move you back to where the cursor was. If you'd prefer to always have the # cursor on screen, bounded by the topmost and bottommost visible lines # -- much like XEmacs for example -- then uncomment the next line. #\cursor_follows_scrollbar true # The screen fonts used to display the text while editing # The defaults are: \screen_font_roman "Serif" \screen_font_sans "Sans" \screen_font_typewriter "Monospace" # For some, this font looks better: #\screen_font_roman "-*-utopia" # Allow the use of scalable screen fonts? Default is true. # If you choose "false", LyX will use the closest existing size for a match. # Use this if the scalable fonts look bad and you have many fixed size fonts. #\screen_font_scalable false # Tip: Run lyx as "lyx -dbg 512" to learn which fonts are used. # The norm for the screen fonts. The default is iso8859-1, which is # the same as what LaTeX calls latin1. #\screen_font_encoding iso8859-2 # The norm for the popup fonts. The default is an empty string, which # causes to use the screen fonts norm (defined by \screen_font_encoding). #\popup_font_encoding iso8859-2 # The normal font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_font_name "-*-helvetica-medium-r" # The bold font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_bold_font "-*-helvetica-bold-r" # The font sizes used for calculating the scaling of the screen fonts. # You should only have to change these if the fonts on your screen look bad, # in which case you can fine tune the font selection size by size. LyX selects # font size according to this table, the monitor DPI setting and the current # zoom setting. # The format is: #\screen_font_sizes tiny smallest smaller small normal large larger largest huge huger # # This is the default in LyX (exactly what LaTeX does): #\screen_font_sizes 5.0 7.0 8.0 9.0 10.0 12.0 14.4 17.28 20.74 24.88 # To change the colors for footnotes: #\set_color footnote green # for mathed you may also want to change the coloring of lines and brackets: #\set_color math yellow #\set_color mathlines yellow # # UI SECTION ######################################################## # # Choose your UI (user interface) definition here. The .ui files are in the # directory "lib/ui" and contains the definition of the menu and the toolbar. #\ui_file "default" # # PRINTER SECTION ######################################################## # # The default printer to print on. If none is specified, LyX will use # the environment variable PRINTER. If that fails, the default is empty. #\printer "" # If you have setup (as we recommend you to do) your print program # (e.g. dvips) to take advantage of the particularities of the various # printers you have access to, then you should set the following to # true. Then LyX will pass the name of the destination printer to your # print command. # The default is false, because we have unfortunately to cope with # people who refuse to take the time to configure their system. # Note that you will probably have to change \print_spool_command below. #\print_adapt_output true # If you don't use dvips, you may specify your favorite print program # here. See other options at the end of this section to adapt LyX to # your print program. #\print_command dvips # Extra options to pass to printing program after everything # else, but before the filename of the DVI file to be printed. #\print_extra_options "" # When set, this printer option automatically prints to a file # and then calls a separate print spooling program on that file # with the given name and arguments. # This is set by default to 'lp' or 'lpr', depending on what your # system uses. # Set this to "" if you have set up dvips so that it sends # output to the right printer (remember to also use \print_adapt_output). #\print_spool_command "" # If you specify a printer name in the print dialog, # the following argument is prepended along with the printer name # after the spool command. The default is autodetected, along with # \print_spool_command determination. #\print_spool_printerprefix "" # Other print related options # The following options are only of interest to people who do not # use dvips as print command. You may safely skip to the end of this # section otherwise. # These specify the options to pass to the printer program to select the # corresponding features. These default to the options used for the dvips # program. Look at the man page for your favorite print program to learn # which options to use. # Normally you don't need to change this unless you use something other # than dvips. #\print_evenpage_flag -B #\print_oddpage_flag -A #\print_reverse_flag -r #\print_landscape_flag "-t landscape" #\print_pagerange_flag -pp #\print_copies_flag -c #\print_collcopies_flag -C #\print_paper_flag -t #\print_paper_dimension_flag -T # Option to pass to the print program to print on a specific printer. #\print_to_printer -P # Option to pass to the print program to print to a file. #\print_to_file -o # Extension of printer program output file. Usually .ps #\print_file_extension .ps # Sample configuration to use with dvilj4 for a HP Laserjet IV (or # better) printer [provided by Reuben Thomas ]: #\print_command dvilj4 #\print_extra_options -q #\print_evenpage_flag "-D2 -r" #\print_oddpage_flag -D1 #\print_reverse_flag -r #\print_landscape_flag -l #\print_pagerange_flag -p #\print_to_file -e #\print_file_extension .lj #\print_copies_flag -c #\print_collcopies_flag -c #\print_adapt_output false # # EXPORT SECTION ######################################################## # # The \converter command defines a converter between two formats. # LyX uses the defined converters for generating output in various formats, # or for importing. # The converter command has 4 arguments: The source format, the target format, # the command, and additional flags. # For example, the following defines a DVI->Postscript converter: #\converter dvi ps "dvips -o $$o $$i" "" # The variable name $$i is replaced with the name of the source file, # and $$o is replaced with the name of the target file. # The flags argument is a list of comma separated flags. # Known flags are # - * : copy the previously defined flags # - latex : The converter is latex or its derivatives (pdflatex). # - originaldir : The converter must be invoked in the directory of the lyx # file and not in the temporary directory. This is needed for tex->html # converters in order to be able to read the eps files. # - needaux : The converted uses the .aux file, so we need to call latex # before running the converter. # - resultdir=dir : The converter put all the files in dir. # Using "resultdir" is same as "resultdir=$$b". # Note: When exporting, the whole directory will be moved from the temporary # directory to the target directory. # - resultfile=file : Name of main file in the result directory, for example # "index.html" or "$$b.html" # If "resultfile" is omitted, the name of this file is assumed to be # "index.format" # - parselog=filtername : filtername is a name of a filter command that takes # the converter error log (from stderr), and converts it to a fake latex .log # file. # For example: #\converter latex html "latex2html -split 0 $$i" # "originaldir,needaux,resultdir" # # For literate programming, use something like #\converter literate latex "noweave -delay -index $$i >$$o" # "parselog=listerrors g" #\converter literate program "build-script $$i" # "originaldir,parselog=listerrors g" # The format command is used to define file formats. It has 4 arguments: # the format name, the extension, and "pretty name" and menu shortcut. # For example #\Format latex tex LaTeX L # The \viewer command is used to define viewers for new formats, # or to change the already defined viewers. # For example, to use xdvi as the viewer to dvi files use #\viewer dvi "xdvi" # It can get more involved. Expert users might prefer something like: #\viewer dvi "xdvi -s 2 -expert -geometry 1014x720+0+0 -keep -margins 1.5" # # TEX SECTION ########################################################### # # The font encoding used for the LaTeX2e fontenc package. # T1 is highly recommended for non-English languages. LyX uses T1 as a # default if you have the ec fonts installed on your system. #\font_encoding T1 # Choose "default" if T1 doesn't work for you for some reason: #\font_encoding default # # FILE SECTION ########################################################## # # The default path for your documents. # Default is $HOME #\document_path ~/Documents/ # The file where the last-files information should be stored. # Default is ~/.lyx/lastfiles #\lastfiles ~/.lyx_lastfiles # Maximal number of lastfiles. Up to nine can appear in the file menu. # Default is four. #\num_lastfiles 9 # Flag telling whether the lastfiles should be checked for existence. # Files that does not exist are left out of the lastfiles entries. # Default is true. If you use slow or removable media, such as networks # or floppy disks, you can speed up the starting time of LyX by disabling # this feature. #\check_lastfiles false # The path that LyX will set when offering you to choose a template. # Default is (System LyX dir)/templates #\template_path ~/.lyx/templates # The path that LyX will use to put temporary TeX outputs. # Default is /tmp/ # containing # If you set it, it will be /directory/ # (unless set to /tmp). #\tempdir_path /usr/tmp # If you set this flag, LyX will always use a temporary directory # to put TeX outputs into. It is enabled by default. # This directory is deleted when you quit LyX. # You might want to avoid using a temporary directory in several # cases: # - LaTeX cannot find some files it needs; # - you have a large number of include files, and you get messages # saying that some LaTeX buffers overflow. # Note that, even if tell LyX not to use a temporary directory, there # will be cases where it will be forced to: this happens for example # when typesetting a file in a read-only directory (documentation). #\use_tempdir false # This is the maximum line length of an exported ASCII file (LaTeX, # SGML or plain text). Default is 75. #\ascii_linelen 80 # Set to false if you don't want LyX to create backup files. # Default is true. #\make_backup true # The path for storing backup files. If it is the empty string, LyX will # store the backup file in the same directory of the original file. # Default is "". #\backupdir_path "~/Desktop/Trash/" # # ASCII EXPORT SECTION ################################################### # # The following entry can be used to define an external program to # render tables in the ASCII output. If you specify "none", a simple # internal routine is used. The default is auto-detected. # The following line will use groff and output using latin-1 encoding # (here $$FName is the input file and the output goes to stdout): #\ascii_roff_command "groff -t -Tlatin1 $$FName" # # SPELLCHECKER SECTION #################################################### # # What command runs the spellchecker? Default is "ispell" if it is # installed, "none" otherwise. # If you have aspell (http://metalab.unc.edu/kevina/aspell/) # installed and configured, you might want to uncomment the line below. #\spell_command aspell # Consider run-together words, such as "notthe" for "not the", as legal # words? Default is false. #\accept_compound true # Specify an alternate language. The default is to use the language of # document. Uncomment both to enable. #\use_alt_language true #\alternate_language dansk # Specify additional chars that can be part of a word. #\use_escape_chars true #\escape_chars "??????" # Specify an alternate personal dictionary file. If the file name does not # begin with "/", $HOME is prefixed. The default is to search for a personal # dictionary in both the current directory and $HOME, creating one in $HOME # if none is found. The preferred name is constructed by appending ".ispell_" # to the base name of the hash file. For example, if you use the English # dictionary, your personal dictionary would be named ".ispell_english". #\use_personal_dictionary true #\personal_dictionary .ispell_dansk # Specify whether to pass the -T input encoding option to ispell (only if the # language is different than "default".) Enable this if you can't spellcheck # words with international letters in them. There have been reports that this # does not work with all dictionaries, so this is disabled by default. #\use_input_encoding true # # LANGUAGE SUPPORT SECTION #################################################### # # Set to true to enable support of right-to-left languages (e.g. Hebrew, # Arabic). Default is false. #\rtl true # The latex command for loading the language package. # Default is \usepackage{babel}. #\language_package "\usepackage{omega}" # The latex command for changing the from the language of the document # to another language. $$lang is substituted by the name of the second # language. Default is \selectlanguage{$$lang}. #\language_command_begin "\begin{otherlanguage}{$$lang}" # The latex command for changing back the language to the language of # the document. Default is \selectlanguage{$$lang}. #\language_command_end "\end{otherlanguage}" # Set to false if a language switching command is needed at the beginning of # the document. Default is true. #\language_auto_begin false # Set to false if a language switching command is needed at the end of # the document. Default is true. #\language_auto_end false # Set mark_foreign_language to "false" to disable the highlighting of words # with a foreign language to the language of the documet. # Default is "true" #\mark_foreign_language false # It is possible to bind keys for changing the language inside a document. # For example, the following command will cause F12 to switch between French # and English in a French document, and in a document of other language it will # switch between that language and French. #\bind "F12" "language french" # # HEBREW SUPPORT SECTION #################################################### # # To enable the Hebrew support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary hebrew #\converter tex dvi elatex "" #\converter tex pdf pdfelatex "" #\font_encoding default # You also need to bind a key for switching between Hebrew and English. # For example, #\bind "F12" "language hebrew" # You might want ot disable the foreign language marking: #\mark_foreign_language false # Finally, you need to select iso8859-8 font encoding, and select screen fonts # (below are the default fonts. You need to replace them by Hebrew fonts) #\screen_font_encoding iso8859-8 #\screen_font_roman "-*-times" #\screen_font_sans "-*-helvetica" #\screen_font_typewriter "-*-courier" #\screen_font_popup "-*-helvetica-medium-r" #\screen_font_menu "-*-helvetica-bold-r" # # ARABIC SUPPORT SECTION #################################################### # # To enable the Arabic support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary arabic # You also need to bind a key for switching between Arabic and English. # For example, #\bind "F12" "language arabic" # If you use arabtex, uncomment the following lines #\language_auto_begin false #\language_auto_end false #\language_command_begin "\begin{arabtext}" #\language_command_end "\end{arabtext}" #\language_package "\usepackage{arabtex,iso88596}\setcode{iso8859-6}" # Finally, you need to select iso8859-6.8x font encoding, # and select screen fonts. # iso8859-6.8x fonts can be found at # http://www.langbox.com/AraMosaic/mozilla/fontXFE/ #\screen_font_encoding iso8859-6.8x #\screen_font_encoding_menu iso8859-1 #\screen_font_roman "-*-naskhi" Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- lyx.spec 22 May 2006 18:58:42 -0000 1.36 +++ lyx.spec 23 May 2006 20:12:03 -0000 1.37 @@ -2,18 +2,18 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.4.0-helpers.patch -Patch2: lyx-1.4.0-boost.patch +Patch2: lyx-1.4.1-defaults.patch +Source1: lyxrc.defaults.custom # app-wrapper for various frontends Source10: lyx.sh # .desktop files @@ -53,8 +53,10 @@ Requires: htmlview ## Soft dependancies # add support for lyx's Document->Change Tracking +%if "%{?fedora}" > "3" Requires(hint): tetex-dvipost Requires(hint): tetex-preview +%endif %description LyX is a modern approach to writing documents which breaks with the @@ -96,7 +98,7 @@ %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%{?_without_included_boost:%patch2 -p1 -b .boost} +%patch2 -p1 -b .defaults %build @@ -117,7 +119,6 @@ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ - %{?_without_included_boost} \ --without-warnings --disable-dependency-tracking \ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks @@ -135,6 +136,7 @@ install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms # misc/extras +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults.custom install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ # Set up the lyx-specific class files where TeX can see them @@ -194,10 +196,11 @@ %{_mandir}/man1/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ -%{_datadir}/texmf/tex/latex/lyx/ +%config(noreplace) %{_datadir}/lyx/lyxrc.defaults.custom %verify(not md5 size mtime) %{_datadir}/lyx/*.lst %verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults %verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx +%{_datadir}/texmf/tex/latex/lyx/ %files qt %defattr(-,root,root,-) @@ -211,6 +214,14 @@ %changelog +* Tue May 23 2006 Rex Dieter 1.4.1-6 +- set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) + screen_font_roman "Serif" + screen_font_sans "Sans" + screen_font_typewriter "Monospace" + screen_zoom 100 + serverpipe "~/.lyx/pipe" + * Mon May 22 2006 Rex Dieter 1.4.1-5 - Requires(hint): tetex-preview --- lyx-1.4.0-boost.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 21:07:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:07 -0700 Subject: rpms/perl-Data-Structure-Util - New directory Message-ID: <200605232107.k4NL79mE016709@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16685/perl-Data-Structure-Util Log Message: Directory /cvs/extras/rpms/perl-Data-Structure-Util added to the repository From fedora-extras-commits at redhat.com Tue May 23 21:07:08 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:08 -0700 Subject: rpms/perl-Data-Structure-Util/devel - New directory Message-ID: <200605232107.k4NL7APj016713@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16685/perl-Data-Structure-Util/devel Log Message: Directory /cvs/extras/rpms/perl-Data-Structure-Util/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 21:07:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:28 -0700 Subject: rpms/perl-Data-Structure-Util Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605232107.k4NL7Ugc016788@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16755 Added Files: Makefile import.log Log Message: Setup of module perl-Data-Structure-Util --- NEW FILE Makefile --- # Top level Makefile for module perl-Data-Structure-Util all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue May 23 21:07:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:28 -0700 Subject: rpms/perl-Data-Structure-Util/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605232107.k4NL7U7U016792@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16755/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Data-Structure-Util --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue May 23 21:07:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:53 -0700 Subject: owners owners.list,1.1048,1.1049 Message-ID: <200605232107.k4NL7tsw016870@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16840 Modified Files: owners.list Log Message: Add perl-Data-Structure-Util. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1048 retrieving revision 1.1049 diff -u -r1.1048 -r1.1049 --- owners.list 23 May 2006 15:07:04 -0000 1.1048 +++ owners.list 23 May 2006 21:07:53 -0000 1.1049 @@ -997,6 +997,7 @@ Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Data-Structure-Util|Change nature of data within a structure|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Pcalc|Gregorian calendar date calculations|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 23 21:07:58 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:58 -0700 Subject: rpms/perl-Data-Structure-Util import.log,1.1,1.2 Message-ID: <200605232108.k4NL8UAa016944@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16877 Modified Files: import.log Log Message: auto-import perl-Data-Structure-Util-0.11-1 on branch devel from perl-Data-Structure-Util-0.11-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Structure-Util/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 21:07:28 -0000 1.1 +++ import.log 23 May 2006 21:07:58 -0000 1.2 @@ -0,0 +1 @@ +perl-Data-Structure-Util-0_11-1:HEAD:perl-Data-Structure-Util-0.11-1.src.rpm:1148418470 From fedora-extras-commits at redhat.com Tue May 23 21:07:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:59 -0700 Subject: rpms/perl-Data-Structure-Util/devel perl-Data-Structure-Util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605232108.k4NL8VtH016949@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16877/devel Modified Files: .cvsignore sources Added Files: perl-Data-Structure-Util.spec Log Message: auto-import perl-Data-Structure-Util-0.11-1 on branch devel from perl-Data-Structure-Util-0.11-1.src.rpm --- NEW FILE perl-Data-Structure-Util.spec --- Name: perl-Data-Structure-Util Version: 0.11 Release: 1%{?dist} Summary: Change nature of data within a structure License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-Structure-Util/ Source0: http://www.cpan.org/authors/id/P/PD/PDENIS/Data-Structure-Util-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Clone) BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) BuildRequires: perl(File::Find::Rule) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Data::Structure::Util is a toolbox to manipulate the data inside a data structure. It can process an entire tree and perform the operation requested on each appropriate element. %prep %setup -q -n Data-Structure-Util-%{version} chmod 644 CHANGES README bin/packages.pl %build %{__perl} Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS" ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 rm -f $RPM_BUILD_ROOT%{_bindir}/packages.pl \ $RPM_BUILD_ROOT%{_mandir}/man1/packages.pl* find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README bin/packages.pl %{perl_vendorarch}/auto/* %{perl_vendorarch}/Data* %{_mandir}/man3/* %changelog * Sat May 20 2006 Steven Pritchard 0.11-1 - Specfile autogenerated by cpanspec 1.66. - Drop explicit BR: perl. - BR: File::Find::Rule (for tests). - Add packages.pl to doc list and fix the permissions for the docs. - Drop NINJA non-doc. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Structure-Util/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 21:07:28 -0000 1.1 +++ .cvsignore 23 May 2006 21:07:59 -0000 1.2 @@ -0,0 +1 @@ +Data-Structure-Util-0.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Structure-Util/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 21:07:28 -0000 1.1 +++ sources 23 May 2006 21:07:59 -0000 1.2 @@ -0,0 +1 @@ +3cbec998cd7c55b1244b3f782569b552 Data-Structure-Util-0.11.tar.gz From fedora-extras-commits at redhat.com Tue May 23 21:11:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:16 -0700 Subject: rpms/perl-File-Type - New directory Message-ID: <200605232111.k4NLBIAI017294@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17270/perl-File-Type Log Message: Directory /cvs/extras/rpms/perl-File-Type added to the repository From fedora-extras-commits at redhat.com Tue May 23 21:11:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:17 -0700 Subject: rpms/perl-File-Type/devel - New directory Message-ID: <200605232111.k4NLBJfS017297@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17270/perl-File-Type/devel Log Message: Directory /cvs/extras/rpms/perl-File-Type/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 21:11:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:34 -0700 Subject: rpms/perl-File-Type Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605232111.k4NLBaEl017370@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17334 Added Files: Makefile import.log Log Message: Setup of module perl-File-Type --- NEW FILE Makefile --- # Top level Makefile for module perl-File-Type all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue May 23 21:11:35 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:35 -0700 Subject: rpms/perl-File-Type/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605232111.k4NLBbHn017374@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17334/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-File-Type --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue May 23 21:11:09 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:09 -0700 Subject: owners owners.list,1.1049,1.1050 Message-ID: <200605232111.k4NLBfcp017386@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17224 Modified Files: owners.list Log Message: Add perl-File-Type. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1049 retrieving revision 1.1050 diff -u -r1.1049 -r1.1050 --- owners.list 23 May 2006 21:07:53 -0000 1.1049 +++ owners.list 23 May 2006 21:11:09 -0000 1.1050 @@ -1044,6 +1044,7 @@ Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-Type|Determine file type using magic|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Finance-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 23 21:11:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:59 -0700 Subject: rpms/perl-File-Type import.log,1.1,1.2 Message-ID: <200605232112.k4NLC1dh017462@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17425 Modified Files: import.log Log Message: auto-import perl-File-Type-0.22-2 on branch devel from perl-File-Type-0.22-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-File-Type/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 21:11:34 -0000 1.1 +++ import.log 23 May 2006 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +perl-File-Type-0_22-2:HEAD:perl-File-Type-0.22-2.src.rpm:1148418713 From fedora-extras-commits at redhat.com Tue May 23 21:12:00 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:12:00 -0700 Subject: rpms/perl-File-Type/devel perl-File-Type.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605232112.k4NLC2Mt017467@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17425/devel Modified Files: .cvsignore sources Added Files: perl-File-Type.spec Log Message: auto-import perl-File-Type-0.22-2 on branch devel from perl-File-Type-0.22-2.src.rpm --- NEW FILE perl-File-Type.spec --- Name: perl-File-Type Version: 0.22 Release: 2%{?dist} Summary: Determine file type using magic License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/File-Type/ Source0: http://www.cpan.org/authors/id/P/PM/PMISON/File-Type-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file. %prep %setup -q -n File-Type-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 22 2006 Steven Pritchard 0.22-2 - Drop NINJA file. * Sat May 20 2006 Steven Pritchard 0.22-1 - Specfile autogenerated by cpanspec 1.66. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Type/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 21:11:35 -0000 1.1 +++ .cvsignore 23 May 2006 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +File-Type-0.22.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Type/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 21:11:35 -0000 1.1 +++ sources 23 May 2006 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +4be3b0b7000b325c60351fcc8a04815d File-Type-0.22.tar.gz From fedora-extras-commits at redhat.com Tue May 23 21:59:09 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 23 May 2006 14:59:09 -0700 Subject: rpms/python-kid/FC-4 python-kid.spec,1.10,1.11 Message-ID: <200605232159.k4NLxfZJ018243@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18194/FC-4 Modified Files: python-kid.spec Log Message: Fix "requires elementtree" regression (I hate .eggs) Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/python-kid.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-kid.spec 20 May 2006 20:20:31 -0000 1.10 +++ python-kid.spec 23 May 2006 21:59:09 -0000 1.11 @@ -2,7 +2,7 @@ Name: python-kid Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -39,6 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt %clean @@ -57,6 +58,9 @@ %changelog +* Tue May 23 2006 Konstantin Ryabitsev - 0.9.1-3 +- Fix 'elementtree requried' regression + * Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 - Update project URL From fedora-extras-commits at redhat.com Tue May 23 21:59:09 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 23 May 2006 14:59:09 -0700 Subject: rpms/python-kid/FC-5 python-kid.spec,1.10,1.11 Message-ID: <200605232159.k4NLxf87018246@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18194/FC-5 Modified Files: python-kid.spec Log Message: Fix "requires elementtree" regression (I hate .eggs) Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/python-kid.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-kid.spec 20 May 2006 20:20:32 -0000 1.10 +++ python-kid.spec 23 May 2006 21:59:09 -0000 1.11 @@ -2,7 +2,7 @@ Name: python-kid Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -39,6 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt %clean @@ -57,6 +58,9 @@ %changelog +* Tue May 23 2006 Konstantin Ryabitsev - 0.9.1-3 +- Fix 'elementtree requried' regression + * Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 - Update project URL From fedora-extras-commits at redhat.com Tue May 23 21:59:10 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 23 May 2006 14:59:10 -0700 Subject: rpms/python-kid/devel python-kid.spec,1.10,1.11 Message-ID: <200605232159.k4NLxg0d018249@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18194/devel Modified Files: python-kid.spec Log Message: Fix "requires elementtree" regression (I hate .eggs) Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/python-kid.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-kid.spec 20 May 2006 20:20:38 -0000 1.10 +++ python-kid.spec 23 May 2006 21:59:10 -0000 1.11 @@ -2,7 +2,7 @@ Name: python-kid Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -39,6 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt %clean @@ -57,6 +58,9 @@ %changelog +* Tue May 23 2006 Konstantin Ryabitsev - 0.9.1-3 +- Fix 'elementtree requried' regression + * Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 - Update project URL From fedora-extras-commits at redhat.com Wed May 24 02:14:03 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 19:14:03 -0700 Subject: rpms/lineakd/devel lineakd.spec,1.2,1.3 Message-ID: <200605240214.k4O2E5qJ023978@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineakd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23961 Modified Files: lineakd.spec Log Message: Add some Requires to the -devel package so plugins don't need to each BuildRequire them Index: lineakd.spec =================================================================== RCS file: /cvs/extras/rpms/lineakd/devel/lineakd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lineakd.spec 22 May 2006 06:53:54 -0000 1.2 +++ lineakd.spec 24 May 2006 02:14:02 -0000 1.3 @@ -4,7 +4,7 @@ Name: lineakd Version: 0.8.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Linux support for Easy Access and Multimedia keyboards Group: User Interface/Desktops @@ -41,6 +41,8 @@ Group: Development/Libraries Summary: Development files for lineakd Requires: %{name} = %{version}-%{release} +Requires: libX11-devel +Requires: libXext-devel %description devel This package contains the header files and libraries for developing plugins @@ -118,6 +120,9 @@ %changelog +* Tue May 23 2006 Chris Petersen 0.8.4-5 +- Add some Requires to the -devel package so plugins don't need to each BuildRequire them + * Sun May 21 2006 Chris Petersen 0.8.4-4 - Add ppc_fix.patch to make this build properly on ppc arch - Make %{_sbindir}/* conditional on the buildarch From fedora-extras-commits at redhat.com Wed May 24 04:22:12 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:22:12 -0700 Subject: rpms/gnubiff - New directory Message-ID: <200605240422.k4O4MERp029066@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29040/gnubiff Log Message: Directory /cvs/extras/rpms/gnubiff added to the repository From fedora-extras-commits at redhat.com Wed May 24 04:22:13 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:22:13 -0700 Subject: rpms/gnubiff/devel - New directory Message-ID: <200605240422.k4O4MFU0029069@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29040/gnubiff/devel Log Message: Directory /cvs/extras/rpms/gnubiff/devel added to the repository From fedora-extras-commits at redhat.com Wed May 24 04:22:35 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:22:35 -0700 Subject: rpms/gnubiff Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605240422.k4O4Mbmb029113@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29085 Added Files: Makefile import.log Log Message: Setup of module gnubiff --- NEW FILE Makefile --- # Top level Makefile for module gnubiff all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 24 04:22:36 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:22:36 -0700 Subject: rpms/gnubiff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605240422.k4O4Mch5029116@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29085/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnubiff --- NEW 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 May 24 04:23:47 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:23:47 -0700 Subject: rpms/gnubiff import.log,1.1,1.2 Message-ID: <200605240423.k4O4Nn2X029192@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29158 Modified Files: import.log Log Message: auto-import gnubiff-2.2.1-2.fc6 on branch devel from gnubiff-2.2.1-2.fc6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnubiff/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 May 2006 04:22:35 -0000 1.1 +++ import.log 24 May 2006 04:23:47 -0000 1.2 @@ -0,0 +1 @@ +gnubiff-2_2_1-2_fc6:HEAD:gnubiff-2.2.1-2.fc6.src.rpm:1148444627 From fedora-extras-commits at redhat.com Wed May 24 04:23:47 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:23:47 -0700 Subject: rpms/gnubiff/devel gnubiff.desktop, NONE, 1.1 gnubiff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605240423.k4O4NoEt029197@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29158/devel Modified Files: .cvsignore sources Added Files: gnubiff.desktop gnubiff.spec Log Message: auto-import gnubiff-2.2.1-2.fc6 on branch devel from gnubiff-2.2.1-2.fc6.src.rpm --- NEW FILE gnubiff.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Gnubiff GenericName=A mail notification program Comment=Check your emails Exec=gnubiff Icon=gnubiff.png Terminal=false Type=Application Categories=Application;Network; Version=2.2.1 --- NEW FILE gnubiff.spec --- Name: gnubiff Version: 2.2.1 Release: 2%{?dist} Summary: A mail notification program Group: Applications/Internet License: GPL URL: http://gnubiff.sourceforge.net/ Source0: http://belnet.dl.sourceforge.net/sourceforge/gnubiff/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gamin-devel, libglade2-devel, desktop-file-utils, gnome-panel-devel, openssl-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description Gnubiff is a mail notification program that periodically checks for mail and displays headers when new mail has arrived %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%{_datadir}/info/dir desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} %find_lang %{name} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README THANKS TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_infodir}/*.info.gz %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png %{_datadir}/gnome-2.0/ui %{_libdir}/bonobo/servers %{_mandir}/man1/* %changelog * Wed Apr 24 2006 Damien Durand - 2.2.1-2 - Remove --prefix='pkg-config libpanelapplet-2.0 openssl --variable=prefix - Remove ABOUT-NLS & Changelog in %file section - Fixing %{_datadir}/info to {_infodir} * Tue Apr 23 2006 Damien Durand - 2.2.1-1 - Upgrade to 2.2.1 - Add --prefix='pkg-config libpanelapplet-2.0 openssl --variable=prefix in %configure section - Add gnome-panel-devel, openssl-devel in BuildRequires * Sun Apr 21 2006 Damien Durand - 2.2.0-2 - Add gettext-devel, remove gtk-devel in BuildRequires - Add %{_datadir}/info/*.info.gz in files section - Add %post and %preun sections * Wed Apr 19 2006 Damien Durand - 2.2.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnubiff/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 May 2006 04:22:36 -0000 1.1 +++ .cvsignore 24 May 2006 04:23:47 -0000 1.2 @@ -0,0 +1 @@ +gnubiff-2.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnubiff/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 May 2006 04:22:36 -0000 1.1 +++ sources 24 May 2006 04:23:47 -0000 1.2 @@ -0,0 +1 @@ +8d2ef679f42e7a593dc88b750d0cca4c gnubiff-2.2.1.tar.gz From fedora-extras-commits at redhat.com Wed May 24 04:27:10 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:27:10 -0700 Subject: owners owners.list,1.1050,1.1051 Message-ID: <200605240427.k4O4RCD5029255@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29238 Modified Files: owners.list Log Message: Add gnubiff Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1050 retrieving revision 1.1051 diff -u -r1.1050 -r1.1051 --- owners.list 23 May 2006 21:11:09 -0000 1.1050 +++ owners.list 24 May 2006 04:27:10 -0000 1.1051 @@ -415,6 +415,7 @@ Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| +Fedora Extras|gnubiff|A mail notification program|splinux at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnucap|The Gnu Circuit Analysis Package|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|gnugo|Text based go program|michel.salim at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 24 05:39:21 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:21 -0700 Subject: rpms/lineak-defaultplugin - New directory Message-ID: <200605240539.k4O5dNF6031834@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31808/lineak-defaultplugin Log Message: Directory /cvs/extras/rpms/lineak-defaultplugin added to the repository From fedora-extras-commits at redhat.com Wed May 24 05:39:21 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:21 -0700 Subject: rpms/lineak-defaultplugin/devel - New directory Message-ID: <200605240539.k4O5dNcF031837@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31808/lineak-defaultplugin/devel Log Message: Directory /cvs/extras/rpms/lineak-defaultplugin/devel added to the repository From fedora-extras-commits at redhat.com Wed May 24 05:39:29 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:29 -0700 Subject: rpms/lineak-defaultplugin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605240539.k4O5dVmR031886@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31853 Added Files: Makefile import.log Log Message: Setup of module lineak-defaultplugin --- NEW FILE Makefile --- # Top level Makefile for module lineak-defaultplugin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 24 05:39:30 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:30 -0700 Subject: rpms/lineak-defaultplugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605240539.k4O5dWD3031889@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31853/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lineak-defaultplugin --- NEW 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 May 24 05:39:57 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:57 -0700 Subject: rpms/lineak-defaultplugin import.log,1.1,1.2 Message-ID: <200605240540.k4O5eTLP031957@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31917 Modified Files: import.log Log Message: auto-import lineak-defaultplugin-0.8.4-5 on branch devel from lineak-defaultplugin-0.8.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lineak-defaultplugin/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 May 2006 05:39:29 -0000 1.1 +++ import.log 24 May 2006 05:39:57 -0000 1.2 @@ -0,0 +1 @@ +lineak-defaultplugin-0_8_4-5:HEAD:lineak-defaultplugin-0.8.4-5.src.rpm:1148449194 From fedora-extras-commits at redhat.com Wed May 24 05:39:57 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:57 -0700 Subject: rpms/lineak-defaultplugin/devel lineak-defaultplugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605240540.k4O5eT0o031961@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31917/devel Modified Files: .cvsignore sources Added Files: lineak-defaultplugin.spec Log Message: auto-import lineak-defaultplugin-0.8.4-5 on branch devel from lineak-defaultplugin-0.8.4-5.src.rpm --- NEW FILE lineak-defaultplugin.spec --- # # Specfile for lineak_defaultplugin, default actions for lineakd # Name: lineak-defaultplugin Version: 0.8.4 Release: 5%{?dist} Summary: This is the default plugin for the lineakd keyboard daemon Group: User Interface/Desktops License: GPL URL: http://lineak.sourceforge.net ################################################################################ Source: http://dl.sourceforge.net/lineak/lineak_defaultplugin-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ################################################################################ BuildRequires: lineakd-devel = %{version} BuildRequires: libXtst-devel BuildRequires: libXt-devel BuildRequires: libxkbfile-devel Requires: lineakd = %{version} Obsoletes: lineak_defaultplugin <= %{version} Provides: lineak_defaultplugin = %{version} ################################################################################ %description This plugin contains the default lineakd macros, including EAK_MUTE, EAK_VOLUP, EAK_VOLDOWN, EAK_EJECT, EAK_MEDIADETECT and others. ################################################################################ %prep %setup -q -n lineak_defaultplugin-%{version} ################################################################################ %build %configure --with-lineak-plugindir=%{_libdir}/lineakd/plugins make %{?_smp_mflags} ################################################################################ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Remove the libtool archive files rm -f $RPM_BUILD_ROOT/%{_libdir}/lineakd/plugins/*.la ################################################################################ %clean rm -rf $RPM_BUILD_ROOT ################################################################################ %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %config(noreplace) %{_sysconfdir}/* %{_libdir}/lineakd/plugins/* %{_mandir}/man[^3]/* ################################################################################ %changelog * Tue May 23 2006 Chris Petersen 0.8.4-5 - Add BuildRequires: libxkbfile-devel * Tue May 23 2006 Chris Petersen 0.8.4-4 - Add a couple of BuildRequires * Mon May 22 2006 Chris Petersen 0.8.4-3 - Rename package with - instead of _, despite upstream use of _ - Add Obsoletes and Provides for the underscore version of the name * Fri May 20 2006 Chris Petersen 0.8.4-2 - Fix download link to point to direct download * Thu May 11 2006 Chris Petersen 0.8.4-1 - Update spec to match fedora guidelines * Mon Mar 14 2005 Chris Petersen - Change lineakd required version from >= to = * Wed Sep 15 2004 Chris Petersen - Rework how files are picked, and add paths to allow the makeinstall macro to work * Tue Mar 9 2004 Chris Petersen - Updated spec file to a better template Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lineak-defaultplugin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 May 2006 05:39:30 -0000 1.1 +++ .cvsignore 24 May 2006 05:39:57 -0000 1.2 @@ -0,0 +1 @@ +lineak_defaultplugin-0.8.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lineak-defaultplugin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 May 2006 05:39:30 -0000 1.1 +++ sources 24 May 2006 05:39:57 -0000 1.2 @@ -0,0 +1 @@ +336b4fa5aa40b1166c2aa5418740357b lineak_defaultplugin-0.8.4.tar.gz From fedora-extras-commits at redhat.com Wed May 24 05:41:39 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:41:39 -0700 Subject: owners owners.list,1.1051,1.1052 Message-ID: <200605240541.k4O5ffq6032044@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32027 Modified Files: owners.list Log Message: add lineak-defaultplugin: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191605 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1051 retrieving revision 1.1052 diff -u -r1.1051 -r1.1052 --- owners.list 24 May 2006 04:27:10 -0000 1.1051 +++ owners.list 24 May 2006 05:41:39 -0000 1.1052 @@ -734,6 +734,7 @@ Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|lineakd|Linux support for Easy Access and Multimedia keyboards|lists at forevermore.net|extras-qa at fedoraproject.org| +Fedora Extras|lineak-defaultplugin|This is the default plugin for the lineakd keyboard daemon|lists at forevermore.net|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 24 07:13:02 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 24 May 2006 00:13:02 -0700 Subject: rpms/gtkglextmm/devel gtkglextmm.spec,1.1,1.2 Message-ID: <200605240713.k4O7D4eV009267@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9246 Modified Files: gtkglextmm.spec Log Message: * Wed May 24 2006 Ralf Cors??pius 1.2.0-3 - Increment Release, add %{?dist}. Index: gtkglextmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/devel/gtkglextmm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkglextmm.spec 21 May 2006 11:20:52 -0000 1.1 +++ gtkglextmm.spec 24 May 2006 07:13:01 -0000 1.2 @@ -5,7 +5,7 @@ Summary: C++ wrapper for GtkGlExt Name: gtkglextmm Version: 1.2.0 -Release: 2 +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://gtkglext.sourceforge.net @@ -70,6 +70,9 @@ %doc %{_datadir}/doc/%{name}-%{gtkglextmm_major}/html/* %changelog +* Wed May 24 2006 Ralf Cors??pius 1.2.0-3 +- Increment Release, add %%{?dist}. + * Fri May 17 2006 Gilles Gagniard 1.2.0-2 - Removed unnecessary dependencies * Fri May 12 2006 Gilles Gagniard 1.2.0-1 From fedora-extras-commits at redhat.com Wed May 24 07:13:54 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 24 May 2006 00:13:54 -0700 Subject: rpms/gtkglextmm/FC-5 gtkglextmm.spec,1.1,1.2 Message-ID: <200605240713.k4O7Duhs009376@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglextmm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9358 Modified Files: gtkglextmm.spec Log Message: * Wed May 24 2006 Ralf Cors??pius 1.2.0-3 - Increment Release, add %{?dist}. Index: gtkglextmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/FC-5/gtkglextmm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkglextmm.spec 21 May 2006 11:20:52 -0000 1.1 +++ gtkglextmm.spec 24 May 2006 07:13:54 -0000 1.2 @@ -5,7 +5,7 @@ Summary: C++ wrapper for GtkGlExt Name: gtkglextmm Version: 1.2.0 -Release: 2 +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://gtkglext.sourceforge.net @@ -70,6 +70,9 @@ %doc %{_datadir}/doc/%{name}-%{gtkglextmm_major}/html/* %changelog +* Wed May 24 2006 Ralf Cors??pius 1.2.0-3 +- Increment Release, add %%{?dist}. + * Fri May 17 2006 Gilles Gagniard 1.2.0-2 - Removed unnecessary dependencies * Fri May 12 2006 Gilles Gagniard 1.2.0-1 From fedora-extras-commits at redhat.com Wed May 24 08:05:48 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 24 May 2006 01:05:48 -0700 Subject: rpms/nedit/devel nedit.spec,1.6,1.7 Message-ID: <200605240805.k4O85oB6014818@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14789/nedit/devel Modified Files: nedit.spec Log Message: - don't strip binaries so that we have usable debuginfo nedit package (#192607) Index: nedit.spec =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nedit.spec 5 Mar 2006 10:09:07 -0000 1.6 +++ nedit.spec 24 May 2006 08:05:48 -0000 1.7 @@ -5,7 +5,7 @@ Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -49,7 +49,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_bindir} install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 mv source/nc source/nedit-client -install -s -m 755 source/nedit source/nedit-client $RPM_BUILD_ROOT%{_bindir} +install -m 755 source/nedit source/nedit-client $RPM_BUILD_ROOT%{_bindir} install -m 644 doc/nedit.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit.1x mv doc/nc.man doc/nedit-client.man install -m 644 doc/nedit-client.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit-client.1x @@ -82,6 +82,10 @@ %endif %changelog +* Wed May 24 2006 Jindrich Novy 5.5-8 +- don't strip binaries so that we have usable debuginfo + nedit package (#192607) + * Sun Mar 5 2006 Jindrich Novy 5.5-7 - rebuild From fedora-extras-commits at redhat.com Wed May 24 09:04:46 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 24 May 2006 02:04:46 -0700 Subject: fedora-security/audit fc4,1.262,1.263 fc5,1.175,1.176 Message-ID: <200605240904.k4O94kDY020760@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20728 Modified Files: fc4 fc5 Log Message: Updates from last few days Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- fc4 23 May 2006 14:36:17 -0000 1.262 +++ fc4 24 May 2006 09:04:44 -0000 1.263 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060519 -Up to date FC4 as of 20060519 +Up to date CVE as of CVE email 20060523 +Up to date FC4 as of 20060523 ** are items that need attention @@ -13,6 +13,8 @@ CVE-2006-2366 VULNERABLE (openobex) #192087 CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox +CVE-2006-2314 version (postgresql, fixed 8.0.8) [since FEODRA-2006-579] +CVE-2006-2313 version (postgresql, fixed 8.0.8) [since FEODRA-2006-579] CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 version (kernel, fixed 2.6.16.15) [since FEDORA-2006-573] CVE-2006-2274 version (kernel, fixed 2.6.16.15) [since FEDORA-2006-573] @@ -1599,6 +1601,7 @@ older, happened to deal with at same time: +CVE-2002-2211 **bind CVE-2002-2210 ignore (openoffice) binary install only (not rpm install) CVE-2002-2204 ignore (rpm) by design CVE-2002-2196 version (samba, fixed 2.2.5) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- fc5 23 May 2006 14:36:17 -0000 1.175 +++ fc5 24 May 2006 09:04:44 -0000 1.176 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060519 -Up to date FC5 as of 20060519 +Up to date CVE as of CVE email 20060523 +Up to date FC5 as of 20060523 ** are items that need attention @@ -11,6 +11,8 @@ CVE-2006-2366 VULNERABLE (openobex) #192087 CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox +CVE-2006-2314 version (postgresql, fixed 8.1.4) [since FEODRA-2006-578] +CVE-2006-2313 version (postgresql, fixed 8.1.4) [since FEODRA-2006-578] CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 version (kernel, fixed 2.6.16.15) [since FEDORA-2006-572] CVE-2006-2274 version (kernel, fixed 2.6.16.15) [since FEDORA-2006-572] @@ -1593,6 +1595,7 @@ older, happened to deal with at same time: +CVE-2002-2211 **bind CVE-2002-2210 ignore (openoffice) binary install only (not rpm install) CVE-2002-2204 ignore (rpm) by design CVE-2002-2196 version (samba, fixed 2.2.5) From fedora-extras-commits at redhat.com Wed May 24 10:17:56 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 24 May 2006 03:17:56 -0700 Subject: rpms/w3m-el/devel w3m-el.spec,1.3,1.4 Message-ID: <200605241017.k4OAHwSe026107@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/w3m-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26090 Modified Files: w3m-el.spec Log Message: * Wed May 24 2006 Akira TAGOH - 1.4.2-3 - packaged as noarch. (#192610) Index: w3m-el.spec =================================================================== RCS file: /cvs/extras/rpms/w3m-el/devel/w3m-el.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- w3m-el.spec 2 Mar 2006 07:46:14 -0000 1.3 +++ w3m-el.spec 24 May 2006 10:17:56 -0000 1.4 @@ -2,9 +2,10 @@ Name: w3m-el Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildPreReq: emacs BuildPreReq: xemacs >= %{xemacsver}, flim-xemacs @@ -132,6 +133,9 @@ %{_infodir}/* %changelog +* Wed May 24 2006 Akira TAGOH - 1.4.2-3 +- packaged as noarch. (#192610) + * Thu Mar 2 2006 Akira TAGOH - 1.4.2-2 - rebuilt From fedora-extras-commits at redhat.com Wed May 24 10:41:00 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 24 May 2006 03:41:00 -0700 Subject: rpms/amarok/devel amarok.spec,1.51,1.52 Message-ID: <200605241041.k4OAf2h1026204@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26169/devel Modified Files: amarok.spec Log Message: require the helix engine on archs where it is the only available engine, see bug 192802 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- amarok.spec 21 May 2006 17:14:03 -0000 1.51 +++ amarok.spec 24 May 2006 10:41:00 -0000 1.52 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Multimedia License: GPL @@ -32,13 +32,17 @@ %ifarch ppc64 x86_64 s390 s390x ia64 BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel %endif -# Helix engine +# Helix engine on archs where it is available %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif # Lyrics scripts Requires: ruby +# Only engine available except on these archs, where it's gstreamer +%ifnarch ppc64 x86_64 s390 s390x ia64 +Requires: HelixPlayer +%endif Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -224,6 +228,9 @@ %changelog +* Wed May 24 2006 Aurelien Bompard 1.4.0-5 +- Require HelixPlayer on archs where it is the only engine available + * Sun May 21 2006 Aurelien Bompard 1.4.0-4 - really fix building gst engine on x86_64 From fedora-extras-commits at redhat.com Wed May 24 10:40:59 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 24 May 2006 03:40:59 -0700 Subject: rpms/amarok/FC-5 amarok.spec,1.51,1.52 Message-ID: <200605241041.k4OAf168026200@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26169/FC-5 Modified Files: amarok.spec Log Message: require the helix engine on archs where it is the only available engine, see bug 192802 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- amarok.spec 21 May 2006 17:14:02 -0000 1.51 +++ amarok.spec 24 May 2006 10:40:59 -0000 1.52 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Multimedia License: GPL @@ -32,13 +32,17 @@ %ifarch ppc64 x86_64 s390 s390x ia64 BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel %endif -# Helix engine +# Helix engine on archs where it is available %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif # Lyrics scripts Requires: ruby +# Only engine available except on these archs, where it's gstreamer +%ifnarch ppc64 x86_64 s390 s390x ia64 +Requires: HelixPlayer +%endif Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -224,6 +228,9 @@ %changelog +* Wed May 24 2006 Aurelien Bompard 1.4.0-5 +- Require HelixPlayer on archs where it is the only engine available + * Sun May 21 2006 Aurelien Bompard 1.4.0-4 - really fix building gst engine on x86_64 From fedora-extras-commits at redhat.com Wed May 24 12:14:59 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 05:14:59 -0700 Subject: rpms/lyx/devel lyx.spec,1.37,1.38 lyxrc.defaults.custom,1.1,1.2 Message-ID: <200605241215.k4OCF1Rg001052@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1033 Modified Files: lyx.spec lyxrc.defaults.custom Log Message: * Wed May 24 2006 Rex Dieter 1.4.1-7 - use serverpipe "~/.lyx/lyxpipe" instead, that was the old default and what pybibliographer expects. Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- lyx.spec 23 May 2006 20:12:03 -0000 1.37 +++ lyx.spec 24 May 2006 12:14:59 -0000 1.38 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Publishing @@ -214,6 +214,10 @@ %changelog +* Wed May 24 2006 Rex Dieter 1.4.1-7 +- use serverpipe "~/.lyx/lyxpipe" instead, that was the old default + and what pybibliographer expects. + * Tue May 23 2006 Rex Dieter 1.4.1-6 - set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) screen_font_roman "Serif" Index: lyxrc.defaults.custom =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyxrc.defaults.custom,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lyxrc.defaults.custom 23 May 2006 20:12:03 -0000 1.1 +++ lyxrc.defaults.custom 24 May 2006 12:14:59 -0000 1.2 @@ -147,7 +147,7 @@ # This starts the lyxserver. The pipes get an additional extension # '.in' and '.out'. Only for advanced users. -\serverpipe "~/.lyx/pipe" +\serverpipe "~/.lyx/lyxpipe" # Default format string for the date-insert command # From fedora-extras-commits at redhat.com Wed May 24 12:38:36 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 24 May 2006 05:38:36 -0700 Subject: rpms/conserver/devel conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3 Message-ID: <200605241238.k4OCccK9001257@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/conserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237/devel Modified Files: conserver.spec Added Files: conserver-8.1.14-oldkrb.patch Log Message: Fixing bug 192910 conserver-8.1.14-oldkrb.patch: --- NEW FILE conserver-8.1.14-oldkrb.patch --- diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure --- conserver-8.1.14/configure 2006-04-07 09:38:24.000000000 -0500 +++ conserver-8.1.14-nate/configure 2006-04-26 14:25:07.000000000 -0500 @@ -5847,6 +5847,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in --- conserver-8.1.14/configure.in 2006-04-07 09:30:22.000000000 -0500 +++ conserver-8.1.14-nate/configure.in 2006-04-26 14:24:53.000000000 -0500 @@ -456,6 +456,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" Index: conserver.spec =================================================================== RCS file: /cvs/extras/rpms/conserver/devel/conserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conserver.spec 26 Apr 2006 16:07:30 -0000 1.2 +++ conserver.spec 24 May 2006 12:38:36 -0000 1.3 @@ -1,14 +1,15 @@ Name: conserver Version: 8.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: Distributable URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch -Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch +Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch2: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, openssl-devel, tcp_wrappers @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -41,8 +43,7 @@ %{__mv} $f $f.orig %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f -%configure --with-uds \ - --with-libwrap \ +%configure --with-libwrap \ --with-openssl \ --with-pam @@ -114,6 +115,10 @@ %{_mandir}/man1/console.1.gz %changelog +* Wed May 24 2006 Patrick "Jima" Laughton 8.1.14-3 +- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910) +- Fix from Nate Straz: krb detection + * Wed Apr 26 2006 Patrick "Jima" Laughton 8.1.14-2 - Split 'console' out to -client subpackage, as suggested by Nate Straz From fedora-extras-commits at redhat.com Wed May 24 12:51:24 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 24 May 2006 05:51:24 -0700 Subject: rpms/conserver/FC-4 conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3 Message-ID: <200605241251.k4OCputO001432@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/conserver/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373/FC-4 Modified Files: conserver.spec Added Files: conserver-8.1.14-oldkrb.patch Log Message: Fixing bug 192910 conserver-8.1.14-oldkrb.patch: --- NEW FILE conserver-8.1.14-oldkrb.patch --- diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure --- conserver-8.1.14/configure 2006-04-07 09:38:24.000000000 -0500 +++ conserver-8.1.14-nate/configure 2006-04-26 14:25:07.000000000 -0500 @@ -5847,6 +5847,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in --- conserver-8.1.14/configure.in 2006-04-07 09:30:22.000000000 -0500 +++ conserver-8.1.14-nate/configure.in 2006-04-26 14:24:53.000000000 -0500 @@ -456,6 +456,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" Index: conserver.spec =================================================================== RCS file: /cvs/extras/rpms/conserver/FC-4/conserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conserver.spec 26 Apr 2006 16:07:23 -0000 1.2 +++ conserver.spec 24 May 2006 12:51:24 -0000 1.3 @@ -1,14 +1,15 @@ Name: conserver Version: 8.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: Distributable URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch -Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch +Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch2: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, openssl-devel, tcp_wrappers @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -41,8 +43,7 @@ %{__mv} $f $f.orig %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f -%configure --with-uds \ - --with-libwrap \ +%configure --with-libwrap \ --with-openssl \ --with-pam @@ -114,6 +115,10 @@ %{_mandir}/man1/console.1.gz %changelog +* Wed May 24 2006 Patrick "Jima" Laughton 8.1.14-3 +- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910) +- Fix from Nate Straz: krb detection + * Wed Apr 26 2006 Patrick "Jima" Laughton 8.1.14-2 - Split 'console' out to -client subpackage, as suggested by Nate Straz From fedora-extras-commits at redhat.com Wed May 24 12:51:25 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 24 May 2006 05:51:25 -0700 Subject: rpms/conserver/FC-5 conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3 Message-ID: <200605241251.k4OCpvUw001435@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/conserver/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373/FC-5 Modified Files: conserver.spec Added Files: conserver-8.1.14-oldkrb.patch Log Message: Fixing bug 192910 conserver-8.1.14-oldkrb.patch: --- NEW FILE conserver-8.1.14-oldkrb.patch --- diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure --- conserver-8.1.14/configure 2006-04-07 09:38:24.000000000 -0500 +++ conserver-8.1.14-nate/configure 2006-04-26 14:25:07.000000000 -0500 @@ -5847,6 +5847,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in --- conserver-8.1.14/configure.in 2006-04-07 09:30:22.000000000 -0500 +++ conserver-8.1.14-nate/configure.in 2006-04-26 14:24:53.000000000 -0500 @@ -456,6 +456,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" Index: conserver.spec =================================================================== RCS file: /cvs/extras/rpms/conserver/FC-5/conserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conserver.spec 26 Apr 2006 16:07:29 -0000 1.2 +++ conserver.spec 24 May 2006 12:51:25 -0000 1.3 @@ -1,14 +1,15 @@ Name: conserver Version: 8.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: Distributable URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch -Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch +Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch2: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, openssl-devel, tcp_wrappers @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -41,8 +43,7 @@ %{__mv} $f $f.orig %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f -%configure --with-uds \ - --with-libwrap \ +%configure --with-libwrap \ --with-openssl \ --with-pam @@ -114,6 +115,10 @@ %{_mandir}/man1/console.1.gz %changelog +* Wed May 24 2006 Patrick "Jima" Laughton 8.1.14-3 +- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910) +- Fix from Nate Straz: krb detection + * Wed Apr 26 2006 Patrick "Jima" Laughton 8.1.14-2 - Split 'console' out to -client subpackage, as suggested by Nate Straz From fedora-extras-commits at redhat.com Wed May 24 12:51:24 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 24 May 2006 05:51:24 -0700 Subject: rpms/conserver/FC-3 conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3 Message-ID: <200605241251.k4OCpue8001429@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/conserver/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373/FC-3 Modified Files: conserver.spec Added Files: conserver-8.1.14-oldkrb.patch Log Message: Fixing bug 192910 conserver-8.1.14-oldkrb.patch: --- NEW FILE conserver-8.1.14-oldkrb.patch --- diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure --- conserver-8.1.14/configure 2006-04-07 09:38:24.000000000 -0500 +++ conserver-8.1.14-nate/configure 2006-04-26 14:25:07.000000000 -0500 @@ -5847,6 +5847,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in --- conserver-8.1.14/configure.in 2006-04-07 09:30:22.000000000 -0500 +++ conserver-8.1.14-nate/configure.in 2006-04-26 14:24:53.000000000 -0500 @@ -456,6 +456,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" Index: conserver.spec =================================================================== RCS file: /cvs/extras/rpms/conserver/FC-3/conserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conserver.spec 26 Apr 2006 16:07:23 -0000 1.2 +++ conserver.spec 24 May 2006 12:51:23 -0000 1.3 @@ -1,14 +1,15 @@ Name: conserver Version: 8.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: Distributable URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch -Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch +Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch2: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, openssl-devel, tcp_wrappers @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -41,8 +43,7 @@ %{__mv} $f $f.orig %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f -%configure --with-uds \ - --with-libwrap \ +%configure --with-libwrap \ --with-openssl \ --with-pam @@ -114,6 +115,10 @@ %{_mandir}/man1/console.1.gz %changelog +* Wed May 24 2006 Patrick "Jima" Laughton 8.1.14-3 +- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910) +- Fix from Nate Straz: krb detection + * Wed Apr 26 2006 Patrick "Jima" Laughton 8.1.14-2 - Split 'console' out to -client subpackage, as suggested by Nate Straz From fedora-extras-commits at redhat.com Wed May 24 13:17:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 06:17:44 -0700 Subject: rpms/perl-Devel-Cycle/FC-5 .cvsignore, 1.4, 1.5 perl-Devel-Cycle.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605241317.k4ODHkIc004003@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cycle/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3966/FC-5 Modified Files: .cvsignore perl-Devel-Cycle.spec sources Log Message: Update to 1.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 May 2006 16:00:41 -0000 1.4 +++ .cvsignore 24 May 2006 13:17:44 -0000 1.5 @@ -1 +1 @@ -Devel-Cycle-1.05.tar.gz +Devel-Cycle-1.07.tar.gz Index: perl-Devel-Cycle.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/FC-5/perl-Devel-Cycle.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Devel-Cycle.spec 22 May 2006 16:00:41 -0000 1.7 +++ perl-Devel-Cycle.spec 24 May 2006 13:17:44 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Devel-Cycle -Version: 1.05 +Version: 1.07 Release: 1%{?dist} Summary: Find memory cycles in objects @@ -10,9 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(PadWalker) +BuildRequires: perl(PadWalker) >= 1.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(PadWalker) +Requires: perl(PadWalker) >= 1.0 %description This is a simple developer's tool for finding circular references in objects @@ -53,6 +53,10 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 1.07-1 +- Update to 1.07. +- Requirement version: perl(PadWalker) >= 1.0. + * Mon May 22 2006 Jose Pedro Oliveira - 1.05-1 - Update to 1.05. - New requirement: perl(PadWalker). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 May 2006 16:00:41 -0000 1.4 +++ sources 24 May 2006 13:17:44 -0000 1.5 @@ -1 +1 @@ -8e0ea5f779dc0fcab229f0ff4e1982eb Devel-Cycle-1.05.tar.gz +7d8a1e0ca88f8a66bb1344a217d21f1c Devel-Cycle-1.07.tar.gz From fedora-extras-commits at redhat.com Wed May 24 13:17:45 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 06:17:45 -0700 Subject: rpms/perl-Devel-Cycle/devel .cvsignore, 1.4, 1.5 perl-Devel-Cycle.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605241317.k4ODHlWe004009@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cycle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3966/devel Modified Files: .cvsignore perl-Devel-Cycle.spec sources Log Message: Update to 1.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 May 2006 15:48:53 -0000 1.4 +++ .cvsignore 24 May 2006 13:17:45 -0000 1.5 @@ -1 +1 @@ -Devel-Cycle-1.05.tar.gz +Devel-Cycle-1.07.tar.gz Index: perl-Devel-Cycle.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/perl-Devel-Cycle.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Devel-Cycle.spec 22 May 2006 15:48:53 -0000 1.7 +++ perl-Devel-Cycle.spec 24 May 2006 13:17:45 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Devel-Cycle -Version: 1.05 +Version: 1.07 Release: 1%{?dist} Summary: Find memory cycles in objects @@ -10,9 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(PadWalker) +BuildRequires: perl(PadWalker) >= 1.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(PadWalker) +Requires: perl(PadWalker) >= 1.0 %description This is a simple developer's tool for finding circular references in objects @@ -53,6 +53,10 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 1.07-1 +- Update to 1.07. +- Requirement version: perl(PadWalker) >= 1.0. + * Mon May 22 2006 Jose Pedro Oliveira - 1.05-1 - Update to 1.05. - New requirement: perl(PadWalker). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 May 2006 15:48:53 -0000 1.4 +++ sources 24 May 2006 13:17:45 -0000 1.5 @@ -1 +1 @@ -8e0ea5f779dc0fcab229f0ff4e1982eb Devel-Cycle-1.05.tar.gz +7d8a1e0ca88f8a66bb1344a217d21f1c Devel-Cycle-1.07.tar.gz From fedora-extras-commits at redhat.com Wed May 24 13:58:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 06:58:28 -0700 Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.13,1.14 Message-ID: <200605241358.k4ODwU26004189@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kipi-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4172 Modified Files: kipi-plugins.spec Log Message: * Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 - Requires(hint): dcraw Index: kipi-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kipi-plugins.spec 22 May 2006 14:54:49 -0000 1.13 +++ kipi-plugins.spec 24 May 2006 13:58:27 -0000 1.14 @@ -4,7 +4,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.0 -Release: 0.8.%{beta}%{?dist} +Release: 0.9.%{beta}%{?dist} License: LGPL Group: Applications/Multimedia @@ -38,8 +38,8 @@ #Requires(hint): kdebase # cdarchiver plugin #Requires(hint): k3b -# rawconverter plugin (not yet available from Fedora Extras) -#Requires(hint): dcraw +# rawconverter plugin +Requires(hint): dcraw # mjpeg plugin #Requires(hint): mjpegtools >= 1.6.0 @@ -151,6 +151,9 @@ %changelog +* Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 +- Requires(hint): dcraw + * Mon May 22 2006 Rex Dieter 0.1.0-0.8.rc2 - 0.1.0-rc2 - BR: ImageMagick-c++-devel, libtiff-devel, libxslt-devel From fedora-extras-commits at redhat.com Wed May 24 13:59:02 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 06:59:02 -0700 Subject: rpms/kipi-plugins/FC-5 kipi-plugins.spec,1.13,1.14 Message-ID: <200605241359.k4ODx4hj004256@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kipi-plugins/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4239 Modified Files: kipi-plugins.spec Log Message: * Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 - Requires(hint): dcraw Index: kipi-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/kipi-plugins/FC-5/kipi-plugins.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kipi-plugins.spec 22 May 2006 15:19:22 -0000 1.13 +++ kipi-plugins.spec 24 May 2006 13:59:02 -0000 1.14 @@ -4,7 +4,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.0 -Release: 0.8.%{beta}%{?dist} +Release: 0.9.%{beta}%{?dist} License: LGPL Group: Applications/Multimedia @@ -38,8 +38,8 @@ #Requires(hint): kdebase # cdarchiver plugin #Requires(hint): k3b -# rawconverter plugin (not yet available from Fedora Extras) -#Requires(hint): dcraw +# rawconverter plugin +Requires(hint): dcraw # mjpeg plugin #Requires(hint): mjpegtools >= 1.6.0 @@ -151,6 +151,9 @@ %changelog +* Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 +- Requires(hint): dcraw + * Mon May 22 2006 Rex Dieter 0.1.0-0.8.rc2 - 0.1.0-rc2 - BR: ImageMagick-c++-devel, libtiff-devel, libxslt-devel From fedora-extras-commits at redhat.com Wed May 24 13:59:17 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 06:59:17 -0700 Subject: rpms/kipi-plugins/FC-4 kipi-plugins.spec,1.10,1.11 Message-ID: <200605241359.k4ODxJC6004317@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kipi-plugins/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4300 Modified Files: kipi-plugins.spec Log Message: * Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 - Requires(hint): dcraw Index: kipi-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/kipi-plugins/FC-4/kipi-plugins.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kipi-plugins.spec 22 May 2006 15:19:39 -0000 1.10 +++ kipi-plugins.spec 24 May 2006 13:59:17 -0000 1.11 @@ -4,7 +4,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.0 -Release: 0.8.%{beta}%{?dist} +Release: 0.9.%{beta}%{?dist} License: LGPL Group: Applications/Multimedia @@ -38,8 +38,8 @@ #Requires(hint): kdebase # cdarchiver plugin #Requires(hint): k3b -# rawconverter plugin (not yet available from Fedora Extras) -#Requires(hint): dcraw +# rawconverter plugin +Requires(hint): dcraw # mjpeg plugin #Requires(hint): mjpegtools >= 1.6.0 @@ -151,6 +151,9 @@ %changelog +* Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 +- Requires(hint): dcraw + * Mon May 22 2006 Rex Dieter 0.1.0-0.8.rc2 - 0.1.0-rc2 - BR: ImageMagick-c++-devel, libtiff-devel, libxslt-devel From fedora-extras-commits at redhat.com Wed May 24 14:00:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:00:24 -0700 Subject: rpms/lyx/FC-5 lyx-1.4.1-defaults.patch, NONE, 1.1 lyxrc.defaults.custom, NONE, 1.1 .cvsignore, 1.11, 1.12 lyx.spec, 1.35, 1.36 lyx-1.4.0-boost.patch, 1.3, NONE Message-ID: <200605241400.k4OE0QWX004400@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4377 Modified Files: .cvsignore lyx.spec Added Files: lyx-1.4.1-defaults.patch lyxrc.defaults.custom Removed Files: lyx-1.4.0-boost.patch Log Message: * Wed May 24 2006 Rex Dieter 1.4.1-7 - use serverpipe "~/.lyx/lyxpipe" instead, that was the old default and what pybibliographer expects. * Tue May 23 2006 Rex Dieter 1.4.1-6 - set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) screen_font_roman "Serif" screen_font_sans "Sans" screen_font_typewriter "Monospace" screen_zoom 100 serverpipe "~/.lyx/pipe" lyx-1.4.1-defaults.patch: --- NEW FILE lyx-1.4.1-defaults.patch --- --- lyx-1.4.1/lib/configure.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure 2006-05-23 14:21:08.000000000 -0500 @@ -2027,3 +2027,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- lyx-1.4.1/lib/configure.m4.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure.m4 2006-05-23 14:20:55.000000000 -0500 @@ -727,3 +727,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- NEW FILE lyxrc.defaults.custom --- # -*- text -*- # file lyxrc.example # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. # author Lars Gullik Bj?nnes # author Jean-Marc Lasgouttes # author Jos? Matos # author Asger Alstrup Nielsen # author Ed Scott # author Lior Silberman # author Dekel Tsur # Full author contact details are available in file CREDITS. # The file lyxrc.example is a template to write your own lyxrc file. # If you copy/rename it to lyxrc in the current directory, it will # give global options for all LyX users. It is also possible to copy # this file to $HOME/.lyx/lyxrc so that the configuration applies to a # particular user. # # Several of these settings have defaults that are auto-detected when you use # the menu option Options->Reconfigure. You can see their value by looking at # the file $HOME/.lyx/lyxrc.defaults. Any setting in this file will override # the defaults. # # BIND SECTION ########################################################### # # Before defining your own key-bindings, select one of the available default # binding sets. These are resource files (like this one) that define a # large set of (keyboard) bindings. These files live in bind directory of # the LyX system directory and have in general the .bind suffix. # Currently, you can choose from the following flavors: # # cua.bind for Windows-, Mac- and Motif-like bindings # emacs.bind for Emacs-like bindings. # # The \bind_file command looks in the LyX bind directory for a file # of the given name, but a full path can also be given. If you have # a bind file in your ~/.lyx/bind/ directory, it will be preferred # over a system wide bind file. Default is `cua'. #\bind_file cua #\bind_file emacs # Based on the default, you can now change part or all of it with the # \bind command. For example, when you want the delete key to do the # backspace action, uncomment the following line: #\bind "Delete" "delete-backward" # However, if you're not at all happy with the default bindings, # the most logical thing to do would be to use one of the system # wide bind files as a template and place your own version in # ~/.lyx/bind/mine_is_best.bind and change the above \bind_file # to this instead: #\bind_file mine_is_best # By default, LyX takes over the handling of the dead keys (or accent # keys) that may be defined for your keyboard. While this allows you # to enter characters that would not be normally available, some # people dislike the different behaviour. You can use raw dead keys by # just uncommenting the next line #\override_x_deadkeys false # Tip: Use "lyx -dbg 4" to survey how LyX interprets your keybindings. # # MISC SECTION ########################################################### # # Set this to false if you don't want the startup banner. # Default is true. #\show_banner true # Set to false if you don't want the current selection to be replaced # automatically by what you type. Default is true. #\auto_region_delete false # This is the time interval between auto-saves (in seconds). # 0 means no auto-save, default is 300 for five minutes. #\autosave 600 # LyX asks for a second confirmation to exit if you exit with changed # documents that you don't want to save. You can turn this confirmation off # (LyX will still ask to save changed documents) with the following line. # We recommend to keep the confirmation, though. #\exit_confirmation false # This sets the behaviour if you want to be asked for a filename when # creating a new document or wait until you save it and be asked then. # The default for now is ask on save. # \new_ask_filename false # LyX continously displays names of last command executed, along with a list # of defined short-cuts for it in the minibuffer. # It requires some horsepower to function, so you can turn it off, if LyX # seems slow to you, by uncommenting this line: #\display_shortcuts false # \view_dvi_paper_option allows to specify a paper option to the dvi # viewer. By default LyX specifies the paper size of the document to # the dvi viewer via the command line option -paper size, where size # is one of "us","letter","a3","a4" and so on. The command # \view_dvi_paper_option allows the user to overwrite the name of the # command line flag, i.e. replace -paper with something else. If # specified and left empty, i.e. \view_dvi_paper_option "", LyX does # not append the -paper option to the dvi command at all. This case is # especially useful when viewing your documents on Windows with yap, # because yap does not allow a command line option for the paper size. #\view_dvi_paper_option "" # LyX assumes that the default papersize should be usletter. If this is not # true for your site, use the next line to specify usletter, legal, # executive, a3, a4, a5, or b5 as the default papersize. #\default_papersize "a4" # Define which program to use to run "chktex". # You should include options that turn different warnings on and off. # Default is "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38" # Check the ChkTeX documentation for info on what the flags mean. # Example: use this to ignore warnings about using "\ldots" instead of "..." #\chktex_command "chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38" # Keyboard Mapping. Use this to set the correct mapping file for your # keyboard, that is if you need one. You'll need one if you for instance # want to type German documents on an American keyboard. In that case, # uncomment these three lines: #\kbmap true #\kbmap_primary german #\kbmap_secondary american # The following keyboards are supported: american, czech, francais, # french, german, german-2, magyar, magyar-2, portuges, romanian, # slovak, slovene, transilvanian, turkish and turkish-f. Check # the lib/kbd directory if you want to write support for your language. # If you do, please submit it to lyx-devel at lists.lyx.org. # The Pause button is defined to be a three-way switch between primary # keyboard, secondary keyboard, and no keyboard mapping with the # following command. It is useful if you want to write in a language # not directly supported by your keyboard and you have defined a # custom keyboard mapping above. #\bind "Pause" "keymap-toggle" # This starts the lyxserver. The pipes get an additional extension # '.in' and '.out'. Only for advanced users. \serverpipe "~/.lyx/lyxpipe" # Default format string for the date-insert command # # This accepts the normal strftime formats; see man strftime for full # details of the format. # #\date_insert_format "%A, %e. %B %Y" # Maximum number of words in the initialization string for a new label. # If it is set to 0, then the init. string will only contain the prefix # (e.g. "sec:"). If it is set to -1, the init. string will be empty. # This feature is disabled in 1.1.6. # #\label_init_length 0 # # SCREEN & FONTS SECTION ################################################# # # DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes # wrong, you can override the setting here: #\screen_dpi 100 # The zoom percentage for screen fonts. # A setting of 100% will make the fonts roughly the same size as on paper. # However, since a screen is wider than a piece of paper, the default setting # is 150%. \screen_zoom 100 # The wheel movement factor (for mice with wheels or five button mice) # Default is 100, about a page down. A value of 10 give me about a line and # a half #\wheel_jump 10 # LyX normally doesn't update the cursor position if you move the scrollbar. # If you scroll the cursor off the screen and then start typing LyX will # move you back to where the cursor was. If you'd prefer to always have the # cursor on screen, bounded by the topmost and bottommost visible lines # -- much like XEmacs for example -- then uncomment the next line. #\cursor_follows_scrollbar true # The screen fonts used to display the text while editing # The defaults are: \screen_font_roman "Serif" \screen_font_sans "Sans" \screen_font_typewriter "Monospace" # For some, this font looks better: #\screen_font_roman "-*-utopia" # Allow the use of scalable screen fonts? Default is true. # If you choose "false", LyX will use the closest existing size for a match. # Use this if the scalable fonts look bad and you have many fixed size fonts. #\screen_font_scalable false # Tip: Run lyx as "lyx -dbg 512" to learn which fonts are used. # The norm for the screen fonts. The default is iso8859-1, which is # the same as what LaTeX calls latin1. #\screen_font_encoding iso8859-2 # The norm for the popup fonts. The default is an empty string, which # causes to use the screen fonts norm (defined by \screen_font_encoding). #\popup_font_encoding iso8859-2 # The normal font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_font_name "-*-helvetica-medium-r" # The bold font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_bold_font "-*-helvetica-bold-r" # The font sizes used for calculating the scaling of the screen fonts. # You should only have to change these if the fonts on your screen look bad, # in which case you can fine tune the font selection size by size. LyX selects # font size according to this table, the monitor DPI setting and the current # zoom setting. # The format is: #\screen_font_sizes tiny smallest smaller small normal large larger largest huge huger # # This is the default in LyX (exactly what LaTeX does): #\screen_font_sizes 5.0 7.0 8.0 9.0 10.0 12.0 14.4 17.28 20.74 24.88 # To change the colors for footnotes: #\set_color footnote green # for mathed you may also want to change the coloring of lines and brackets: #\set_color math yellow #\set_color mathlines yellow # # UI SECTION ######################################################## # # Choose your UI (user interface) definition here. The .ui files are in the # directory "lib/ui" and contains the definition of the menu and the toolbar. #\ui_file "default" # # PRINTER SECTION ######################################################## # # The default printer to print on. If none is specified, LyX will use # the environment variable PRINTER. If that fails, the default is empty. #\printer "" # If you have setup (as we recommend you to do) your print program # (e.g. dvips) to take advantage of the particularities of the various # printers you have access to, then you should set the following to # true. Then LyX will pass the name of the destination printer to your # print command. # The default is false, because we have unfortunately to cope with # people who refuse to take the time to configure their system. # Note that you will probably have to change \print_spool_command below. #\print_adapt_output true # If you don't use dvips, you may specify your favorite print program # here. See other options at the end of this section to adapt LyX to # your print program. #\print_command dvips # Extra options to pass to printing program after everything # else, but before the filename of the DVI file to be printed. #\print_extra_options "" # When set, this printer option automatically prints to a file # and then calls a separate print spooling program on that file # with the given name and arguments. # This is set by default to 'lp' or 'lpr', depending on what your # system uses. # Set this to "" if you have set up dvips so that it sends # output to the right printer (remember to also use \print_adapt_output). #\print_spool_command "" # If you specify a printer name in the print dialog, # the following argument is prepended along with the printer name # after the spool command. The default is autodetected, along with # \print_spool_command determination. #\print_spool_printerprefix "" # Other print related options # The following options are only of interest to people who do not # use dvips as print command. You may safely skip to the end of this # section otherwise. # These specify the options to pass to the printer program to select the # corresponding features. These default to the options used for the dvips # program. Look at the man page for your favorite print program to learn # which options to use. # Normally you don't need to change this unless you use something other # than dvips. #\print_evenpage_flag -B #\print_oddpage_flag -A #\print_reverse_flag -r #\print_landscape_flag "-t landscape" #\print_pagerange_flag -pp #\print_copies_flag -c #\print_collcopies_flag -C #\print_paper_flag -t #\print_paper_dimension_flag -T # Option to pass to the print program to print on a specific printer. #\print_to_printer -P # Option to pass to the print program to print to a file. #\print_to_file -o # Extension of printer program output file. Usually .ps #\print_file_extension .ps # Sample configuration to use with dvilj4 for a HP Laserjet IV (or # better) printer [provided by Reuben Thomas ]: #\print_command dvilj4 #\print_extra_options -q #\print_evenpage_flag "-D2 -r" #\print_oddpage_flag -D1 #\print_reverse_flag -r #\print_landscape_flag -l #\print_pagerange_flag -p #\print_to_file -e #\print_file_extension .lj #\print_copies_flag -c #\print_collcopies_flag -c #\print_adapt_output false # # EXPORT SECTION ######################################################## # # The \converter command defines a converter between two formats. # LyX uses the defined converters for generating output in various formats, # or for importing. # The converter command has 4 arguments: The source format, the target format, # the command, and additional flags. # For example, the following defines a DVI->Postscript converter: #\converter dvi ps "dvips -o $$o $$i" "" # The variable name $$i is replaced with the name of the source file, # and $$o is replaced with the name of the target file. # The flags argument is a list of comma separated flags. # Known flags are # - * : copy the previously defined flags # - latex : The converter is latex or its derivatives (pdflatex). # - originaldir : The converter must be invoked in the directory of the lyx # file and not in the temporary directory. This is needed for tex->html # converters in order to be able to read the eps files. # - needaux : The converted uses the .aux file, so we need to call latex # before running the converter. # - resultdir=dir : The converter put all the files in dir. # Using "resultdir" is same as "resultdir=$$b". # Note: When exporting, the whole directory will be moved from the temporary # directory to the target directory. # - resultfile=file : Name of main file in the result directory, for example # "index.html" or "$$b.html" # If "resultfile" is omitted, the name of this file is assumed to be # "index.format" # - parselog=filtername : filtername is a name of a filter command that takes # the converter error log (from stderr), and converts it to a fake latex .log # file. # For example: #\converter latex html "latex2html -split 0 $$i" # "originaldir,needaux,resultdir" # # For literate programming, use something like #\converter literate latex "noweave -delay -index $$i >$$o" # "parselog=listerrors g" #\converter literate program "build-script $$i" # "originaldir,parselog=listerrors g" # The format command is used to define file formats. It has 4 arguments: # the format name, the extension, and "pretty name" and menu shortcut. # For example #\Format latex tex LaTeX L # The \viewer command is used to define viewers for new formats, # or to change the already defined viewers. # For example, to use xdvi as the viewer to dvi files use #\viewer dvi "xdvi" # It can get more involved. Expert users might prefer something like: #\viewer dvi "xdvi -s 2 -expert -geometry 1014x720+0+0 -keep -margins 1.5" # # TEX SECTION ########################################################### # # The font encoding used for the LaTeX2e fontenc package. # T1 is highly recommended for non-English languages. LyX uses T1 as a # default if you have the ec fonts installed on your system. #\font_encoding T1 # Choose "default" if T1 doesn't work for you for some reason: #\font_encoding default # # FILE SECTION ########################################################## # # The default path for your documents. # Default is $HOME #\document_path ~/Documents/ # The file where the last-files information should be stored. # Default is ~/.lyx/lastfiles #\lastfiles ~/.lyx_lastfiles # Maximal number of lastfiles. Up to nine can appear in the file menu. # Default is four. #\num_lastfiles 9 # Flag telling whether the lastfiles should be checked for existence. # Files that does not exist are left out of the lastfiles entries. # Default is true. If you use slow or removable media, such as networks # or floppy disks, you can speed up the starting time of LyX by disabling # this feature. #\check_lastfiles false # The path that LyX will set when offering you to choose a template. # Default is (System LyX dir)/templates #\template_path ~/.lyx/templates # The path that LyX will use to put temporary TeX outputs. # Default is /tmp/ # containing # If you set it, it will be /directory/ # (unless set to /tmp). #\tempdir_path /usr/tmp # If you set this flag, LyX will always use a temporary directory # to put TeX outputs into. It is enabled by default. # This directory is deleted when you quit LyX. # You might want to avoid using a temporary directory in several # cases: # - LaTeX cannot find some files it needs; # - you have a large number of include files, and you get messages # saying that some LaTeX buffers overflow. # Note that, even if tell LyX not to use a temporary directory, there # will be cases where it will be forced to: this happens for example # when typesetting a file in a read-only directory (documentation). #\use_tempdir false # This is the maximum line length of an exported ASCII file (LaTeX, # SGML or plain text). Default is 75. #\ascii_linelen 80 # Set to false if you don't want LyX to create backup files. # Default is true. #\make_backup true # The path for storing backup files. If it is the empty string, LyX will # store the backup file in the same directory of the original file. # Default is "". #\backupdir_path "~/Desktop/Trash/" # # ASCII EXPORT SECTION ################################################### # # The following entry can be used to define an external program to # render tables in the ASCII output. If you specify "none", a simple # internal routine is used. The default is auto-detected. # The following line will use groff and output using latin-1 encoding # (here $$FName is the input file and the output goes to stdout): #\ascii_roff_command "groff -t -Tlatin1 $$FName" # # SPELLCHECKER SECTION #################################################### # # What command runs the spellchecker? Default is "ispell" if it is # installed, "none" otherwise. # If you have aspell (http://metalab.unc.edu/kevina/aspell/) # installed and configured, you might want to uncomment the line below. #\spell_command aspell # Consider run-together words, such as "notthe" for "not the", as legal # words? Default is false. #\accept_compound true # Specify an alternate language. The default is to use the language of # document. Uncomment both to enable. #\use_alt_language true #\alternate_language dansk # Specify additional chars that can be part of a word. #\use_escape_chars true #\escape_chars "??????" # Specify an alternate personal dictionary file. If the file name does not # begin with "/", $HOME is prefixed. The default is to search for a personal # dictionary in both the current directory and $HOME, creating one in $HOME # if none is found. The preferred name is constructed by appending ".ispell_" # to the base name of the hash file. For example, if you use the English # dictionary, your personal dictionary would be named ".ispell_english". #\use_personal_dictionary true #\personal_dictionary .ispell_dansk # Specify whether to pass the -T input encoding option to ispell (only if the # language is different than "default".) Enable this if you can't spellcheck # words with international letters in them. There have been reports that this # does not work with all dictionaries, so this is disabled by default. #\use_input_encoding true # # LANGUAGE SUPPORT SECTION #################################################### # # Set to true to enable support of right-to-left languages (e.g. Hebrew, # Arabic). Default is false. #\rtl true # The latex command for loading the language package. # Default is \usepackage{babel}. #\language_package "\usepackage{omega}" # The latex command for changing the from the language of the document # to another language. $$lang is substituted by the name of the second # language. Default is \selectlanguage{$$lang}. #\language_command_begin "\begin{otherlanguage}{$$lang}" # The latex command for changing back the language to the language of # the document. Default is \selectlanguage{$$lang}. #\language_command_end "\end{otherlanguage}" # Set to false if a language switching command is needed at the beginning of # the document. Default is true. #\language_auto_begin false # Set to false if a language switching command is needed at the end of # the document. Default is true. #\language_auto_end false # Set mark_foreign_language to "false" to disable the highlighting of words # with a foreign language to the language of the documet. # Default is "true" #\mark_foreign_language false # It is possible to bind keys for changing the language inside a document. # For example, the following command will cause F12 to switch between French # and English in a French document, and in a document of other language it will # switch between that language and French. #\bind "F12" "language french" # # HEBREW SUPPORT SECTION #################################################### # # To enable the Hebrew support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary hebrew #\converter tex dvi elatex "" #\converter tex pdf pdfelatex "" #\font_encoding default # You also need to bind a key for switching between Hebrew and English. # For example, #\bind "F12" "language hebrew" # You might want ot disable the foreign language marking: #\mark_foreign_language false # Finally, you need to select iso8859-8 font encoding, and select screen fonts # (below are the default fonts. You need to replace them by Hebrew fonts) #\screen_font_encoding iso8859-8 #\screen_font_roman "-*-times" #\screen_font_sans "-*-helvetica" #\screen_font_typewriter "-*-courier" #\screen_font_popup "-*-helvetica-medium-r" #\screen_font_menu "-*-helvetica-bold-r" # # ARABIC SUPPORT SECTION #################################################### # # To enable the Arabic support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary arabic # You also need to bind a key for switching between Arabic and English. # For example, #\bind "F12" "language arabic" # If you use arabtex, uncomment the following lines #\language_auto_begin false #\language_auto_end false #\language_command_begin "\begin{arabtext}" #\language_command_end "\end{arabtext}" #\language_package "\usepackage{arabtex,iso88596}\setcode{iso8859-6}" # Finally, you need to select iso8859-6.8x font encoding, # and select screen fonts. # iso8859-6.8x fonts can be found at # http://www.langbox.com/AraMosaic/mozilla/fontXFE/ #\screen_font_encoding iso8859-6.8x #\screen_font_encoding_menu iso8859-1 #\screen_font_roman "-*-naskhi" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 11 Apr 2006 14:42:36 -0000 1.11 +++ .cvsignore 24 May 2006 14:00:24 -0000 1.12 @@ -1,2 +1,3 @@ +clog beamer.layout lyx-1.4.1.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- lyx.spec 22 May 2006 18:59:26 -0000 1.35 +++ lyx.spec 24 May 2006 14:00:24 -0000 1.36 @@ -2,18 +2,18 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.4.0-helpers.patch -Patch2: lyx-1.4.0-boost.patch +Patch2: lyx-1.4.1-defaults.patch +Source1: lyxrc.defaults.custom # app-wrapper for various frontends Source10: lyx.sh # .desktop files @@ -39,7 +39,6 @@ BuildRequires: zlib-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0} # For texhash Requires(post): tetex-fonts @@ -52,9 +51,11 @@ Requires: ghostscript Requires: htmlview ## Soft dependancies -# add support for lyx's Document->Change Tracking +%if "%{?fedora}" > "3" +# dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost Requires(hint): tetex-preview +%endif %description LyX is a modern approach to writing documents which breaks with the @@ -96,7 +97,7 @@ %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%{?_without_included_boost:%patch2 -p1 -b .boost} +%patch2 -p1 -b .defaults %build @@ -117,7 +118,6 @@ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ - %{?_without_included_boost} \ --without-warnings --disable-dependency-tracking \ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks @@ -135,6 +135,7 @@ install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms # misc/extras +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults.custom install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ # Set up the lyx-specific class files where TeX can see them @@ -194,10 +195,11 @@ %{_mandir}/man1/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ -%{_datadir}/texmf/tex/latex/lyx/ +%config(noreplace) %{_datadir}/lyx/lyxrc.defaults.custom %verify(not md5 size mtime) %{_datadir}/lyx/*.lst %verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults %verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx +%{_datadir}/texmf/tex/latex/lyx/ %files qt %defattr(-,root,root,-) @@ -211,6 +213,18 @@ %changelog +* Wed May 24 2006 Rex Dieter 1.4.1-7 +- use serverpipe "~/.lyx/lyxpipe" instead, that was the old default + and what pybibliographer expects. + +* Tue May 23 2006 Rex Dieter 1.4.1-6 +- set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) + screen_font_roman "Serif" + screen_font_sans "Sans" + screen_font_typewriter "Monospace" + screen_zoom 100 + serverpipe "~/.lyx/pipe" + * Mon May 22 2006 Rex Dieter 1.4.1-5 - Requires(hint): tetex-preview --- lyx-1.4.0-boost.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:01:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:01:28 -0700 Subject: rpms/lyx/FC-4 lyx-1.4.1-defaults.patch, NONE, 1.1 lyxrc.defaults.custom, NONE, 1.1 .cvsignore, 1.5, 1.6 lyx.spec, 1.22, 1.23 lyx-1.4.0-boost.patch, 1.1, NONE Message-ID: <200605241402.k4OE21JN006717@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6684 Modified Files: .cvsignore lyx.spec Added Files: lyx-1.4.1-defaults.patch lyxrc.defaults.custom Removed Files: lyx-1.4.0-boost.patch Log Message: * Wed May 24 2006 Rex Dieter 1.4.1-7 - use serverpipe "~/.lyx/lyxpipe" instead, that was the old default and what pybibliographer expects. * Tue May 23 2006 Rex Dieter 1.4.1-6 - set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) screen_font_roman "Serif" screen_font_sans "Sans" screen_font_typewriter "Monospace" screen_zoom 100 serverpipe "~/.lyx/pipe" lyx-1.4.1-defaults.patch: --- NEW FILE lyx-1.4.1-defaults.patch --- --- lyx-1.4.1/lib/configure.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure 2006-05-23 14:21:08.000000000 -0500 @@ -2027,3 +2027,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- lyx-1.4.1/lib/configure.m4.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure.m4 2006-05-23 14:20:55.000000000 -0500 @@ -727,3 +727,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- NEW FILE lyxrc.defaults.custom --- # -*- text -*- # file lyxrc.example # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. # author Lars Gullik Bj?nnes # author Jean-Marc Lasgouttes # author Jos? Matos # author Asger Alstrup Nielsen # author Ed Scott # author Lior Silberman # author Dekel Tsur # Full author contact details are available in file CREDITS. # The file lyxrc.example is a template to write your own lyxrc file. # If you copy/rename it to lyxrc in the current directory, it will # give global options for all LyX users. It is also possible to copy # this file to $HOME/.lyx/lyxrc so that the configuration applies to a # particular user. # # Several of these settings have defaults that are auto-detected when you use # the menu option Options->Reconfigure. You can see their value by looking at # the file $HOME/.lyx/lyxrc.defaults. Any setting in this file will override # the defaults. # # BIND SECTION ########################################################### # # Before defining your own key-bindings, select one of the available default # binding sets. These are resource files (like this one) that define a # large set of (keyboard) bindings. These files live in bind directory of # the LyX system directory and have in general the .bind suffix. # Currently, you can choose from the following flavors: # # cua.bind for Windows-, Mac- and Motif-like bindings # emacs.bind for Emacs-like bindings. # # The \bind_file command looks in the LyX bind directory for a file # of the given name, but a full path can also be given. If you have # a bind file in your ~/.lyx/bind/ directory, it will be preferred # over a system wide bind file. Default is `cua'. #\bind_file cua #\bind_file emacs # Based on the default, you can now change part or all of it with the # \bind command. For example, when you want the delete key to do the # backspace action, uncomment the following line: #\bind "Delete" "delete-backward" # However, if you're not at all happy with the default bindings, # the most logical thing to do would be to use one of the system # wide bind files as a template and place your own version in # ~/.lyx/bind/mine_is_best.bind and change the above \bind_file # to this instead: #\bind_file mine_is_best # By default, LyX takes over the handling of the dead keys (or accent # keys) that may be defined for your keyboard. While this allows you # to enter characters that would not be normally available, some # people dislike the different behaviour. You can use raw dead keys by # just uncommenting the next line #\override_x_deadkeys false # Tip: Use "lyx -dbg 4" to survey how LyX interprets your keybindings. # # MISC SECTION ########################################################### # # Set this to false if you don't want the startup banner. # Default is true. #\show_banner true # Set to false if you don't want the current selection to be replaced # automatically by what you type. Default is true. #\auto_region_delete false # This is the time interval between auto-saves (in seconds). # 0 means no auto-save, default is 300 for five minutes. #\autosave 600 # LyX asks for a second confirmation to exit if you exit with changed # documents that you don't want to save. You can turn this confirmation off # (LyX will still ask to save changed documents) with the following line. # We recommend to keep the confirmation, though. #\exit_confirmation false # This sets the behaviour if you want to be asked for a filename when # creating a new document or wait until you save it and be asked then. # The default for now is ask on save. # \new_ask_filename false # LyX continously displays names of last command executed, along with a list # of defined short-cuts for it in the minibuffer. # It requires some horsepower to function, so you can turn it off, if LyX # seems slow to you, by uncommenting this line: #\display_shortcuts false # \view_dvi_paper_option allows to specify a paper option to the dvi # viewer. By default LyX specifies the paper size of the document to # the dvi viewer via the command line option -paper size, where size # is one of "us","letter","a3","a4" and so on. The command # \view_dvi_paper_option allows the user to overwrite the name of the # command line flag, i.e. replace -paper with something else. If # specified and left empty, i.e. \view_dvi_paper_option "", LyX does # not append the -paper option to the dvi command at all. This case is # especially useful when viewing your documents on Windows with yap, # because yap does not allow a command line option for the paper size. #\view_dvi_paper_option "" # LyX assumes that the default papersize should be usletter. If this is not # true for your site, use the next line to specify usletter, legal, # executive, a3, a4, a5, or b5 as the default papersize. #\default_papersize "a4" # Define which program to use to run "chktex". # You should include options that turn different warnings on and off. # Default is "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38" # Check the ChkTeX documentation for info on what the flags mean. # Example: use this to ignore warnings about using "\ldots" instead of "..." #\chktex_command "chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38" # Keyboard Mapping. Use this to set the correct mapping file for your # keyboard, that is if you need one. You'll need one if you for instance # want to type German documents on an American keyboard. In that case, # uncomment these three lines: #\kbmap true #\kbmap_primary german #\kbmap_secondary american # The following keyboards are supported: american, czech, francais, # french, german, german-2, magyar, magyar-2, portuges, romanian, # slovak, slovene, transilvanian, turkish and turkish-f. Check # the lib/kbd directory if you want to write support for your language. # If you do, please submit it to lyx-devel at lists.lyx.org. # The Pause button is defined to be a three-way switch between primary # keyboard, secondary keyboard, and no keyboard mapping with the # following command. It is useful if you want to write in a language # not directly supported by your keyboard and you have defined a # custom keyboard mapping above. #\bind "Pause" "keymap-toggle" # This starts the lyxserver. The pipes get an additional extension # '.in' and '.out'. Only for advanced users. \serverpipe "~/.lyx/lyxpipe" # Default format string for the date-insert command # # This accepts the normal strftime formats; see man strftime for full # details of the format. # #\date_insert_format "%A, %e. %B %Y" # Maximum number of words in the initialization string for a new label. # If it is set to 0, then the init. string will only contain the prefix # (e.g. "sec:"). If it is set to -1, the init. string will be empty. # This feature is disabled in 1.1.6. # #\label_init_length 0 # # SCREEN & FONTS SECTION ################################################# # # DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes # wrong, you can override the setting here: #\screen_dpi 100 # The zoom percentage for screen fonts. # A setting of 100% will make the fonts roughly the same size as on paper. # However, since a screen is wider than a piece of paper, the default setting # is 150%. \screen_zoom 100 # The wheel movement factor (for mice with wheels or five button mice) # Default is 100, about a page down. A value of 10 give me about a line and # a half #\wheel_jump 10 # LyX normally doesn't update the cursor position if you move the scrollbar. # If you scroll the cursor off the screen and then start typing LyX will # move you back to where the cursor was. If you'd prefer to always have the # cursor on screen, bounded by the topmost and bottommost visible lines # -- much like XEmacs for example -- then uncomment the next line. #\cursor_follows_scrollbar true # The screen fonts used to display the text while editing # The defaults are: \screen_font_roman "Serif" \screen_font_sans "Sans" \screen_font_typewriter "Monospace" # For some, this font looks better: #\screen_font_roman "-*-utopia" # Allow the use of scalable screen fonts? Default is true. # If you choose "false", LyX will use the closest existing size for a match. # Use this if the scalable fonts look bad and you have many fixed size fonts. #\screen_font_scalable false # Tip: Run lyx as "lyx -dbg 512" to learn which fonts are used. # The norm for the screen fonts. The default is iso8859-1, which is # the same as what LaTeX calls latin1. #\screen_font_encoding iso8859-2 # The norm for the popup fonts. The default is an empty string, which # causes to use the screen fonts norm (defined by \screen_font_encoding). #\popup_font_encoding iso8859-2 # The normal font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_font_name "-*-helvetica-medium-r" # The bold font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_bold_font "-*-helvetica-bold-r" # The font sizes used for calculating the scaling of the screen fonts. # You should only have to change these if the fonts on your screen look bad, # in which case you can fine tune the font selection size by size. LyX selects # font size according to this table, the monitor DPI setting and the current # zoom setting. # The format is: #\screen_font_sizes tiny smallest smaller small normal large larger largest huge huger # # This is the default in LyX (exactly what LaTeX does): #\screen_font_sizes 5.0 7.0 8.0 9.0 10.0 12.0 14.4 17.28 20.74 24.88 # To change the colors for footnotes: #\set_color footnote green # for mathed you may also want to change the coloring of lines and brackets: #\set_color math yellow #\set_color mathlines yellow # # UI SECTION ######################################################## # # Choose your UI (user interface) definition here. The .ui files are in the # directory "lib/ui" and contains the definition of the menu and the toolbar. #\ui_file "default" # # PRINTER SECTION ######################################################## # # The default printer to print on. If none is specified, LyX will use # the environment variable PRINTER. If that fails, the default is empty. #\printer "" # If you have setup (as we recommend you to do) your print program # (e.g. dvips) to take advantage of the particularities of the various # printers you have access to, then you should set the following to # true. Then LyX will pass the name of the destination printer to your # print command. # The default is false, because we have unfortunately to cope with # people who refuse to take the time to configure their system. # Note that you will probably have to change \print_spool_command below. #\print_adapt_output true # If you don't use dvips, you may specify your favorite print program # here. See other options at the end of this section to adapt LyX to # your print program. #\print_command dvips # Extra options to pass to printing program after everything # else, but before the filename of the DVI file to be printed. #\print_extra_options "" # When set, this printer option automatically prints to a file # and then calls a separate print spooling program on that file # with the given name and arguments. # This is set by default to 'lp' or 'lpr', depending on what your # system uses. # Set this to "" if you have set up dvips so that it sends # output to the right printer (remember to also use \print_adapt_output). #\print_spool_command "" # If you specify a printer name in the print dialog, # the following argument is prepended along with the printer name # after the spool command. The default is autodetected, along with # \print_spool_command determination. #\print_spool_printerprefix "" # Other print related options # The following options are only of interest to people who do not # use dvips as print command. You may safely skip to the end of this # section otherwise. # These specify the options to pass to the printer program to select the # corresponding features. These default to the options used for the dvips # program. Look at the man page for your favorite print program to learn # which options to use. # Normally you don't need to change this unless you use something other # than dvips. #\print_evenpage_flag -B #\print_oddpage_flag -A #\print_reverse_flag -r #\print_landscape_flag "-t landscape" #\print_pagerange_flag -pp #\print_copies_flag -c #\print_collcopies_flag -C #\print_paper_flag -t #\print_paper_dimension_flag -T # Option to pass to the print program to print on a specific printer. #\print_to_printer -P # Option to pass to the print program to print to a file. #\print_to_file -o # Extension of printer program output file. Usually .ps #\print_file_extension .ps # Sample configuration to use with dvilj4 for a HP Laserjet IV (or # better) printer [provided by Reuben Thomas ]: #\print_command dvilj4 #\print_extra_options -q #\print_evenpage_flag "-D2 -r" #\print_oddpage_flag -D1 #\print_reverse_flag -r #\print_landscape_flag -l #\print_pagerange_flag -p #\print_to_file -e #\print_file_extension .lj #\print_copies_flag -c #\print_collcopies_flag -c #\print_adapt_output false # # EXPORT SECTION ######################################################## # # The \converter command defines a converter between two formats. # LyX uses the defined converters for generating output in various formats, # or for importing. # The converter command has 4 arguments: The source format, the target format, # the command, and additional flags. # For example, the following defines a DVI->Postscript converter: #\converter dvi ps "dvips -o $$o $$i" "" # The variable name $$i is replaced with the name of the source file, # and $$o is replaced with the name of the target file. # The flags argument is a list of comma separated flags. # Known flags are # - * : copy the previously defined flags # - latex : The converter is latex or its derivatives (pdflatex). # - originaldir : The converter must be invoked in the directory of the lyx # file and not in the temporary directory. This is needed for tex->html # converters in order to be able to read the eps files. # - needaux : The converted uses the .aux file, so we need to call latex # before running the converter. # - resultdir=dir : The converter put all the files in dir. # Using "resultdir" is same as "resultdir=$$b". # Note: When exporting, the whole directory will be moved from the temporary # directory to the target directory. # - resultfile=file : Name of main file in the result directory, for example # "index.html" or "$$b.html" # If "resultfile" is omitted, the name of this file is assumed to be # "index.format" # - parselog=filtername : filtername is a name of a filter command that takes # the converter error log (from stderr), and converts it to a fake latex .log # file. # For example: #\converter latex html "latex2html -split 0 $$i" # "originaldir,needaux,resultdir" # # For literate programming, use something like #\converter literate latex "noweave -delay -index $$i >$$o" # "parselog=listerrors g" #\converter literate program "build-script $$i" # "originaldir,parselog=listerrors g" # The format command is used to define file formats. It has 4 arguments: # the format name, the extension, and "pretty name" and menu shortcut. # For example #\Format latex tex LaTeX L # The \viewer command is used to define viewers for new formats, # or to change the already defined viewers. # For example, to use xdvi as the viewer to dvi files use #\viewer dvi "xdvi" # It can get more involved. Expert users might prefer something like: #\viewer dvi "xdvi -s 2 -expert -geometry 1014x720+0+0 -keep -margins 1.5" # # TEX SECTION ########################################################### # # The font encoding used for the LaTeX2e fontenc package. # T1 is highly recommended for non-English languages. LyX uses T1 as a # default if you have the ec fonts installed on your system. #\font_encoding T1 # Choose "default" if T1 doesn't work for you for some reason: #\font_encoding default # # FILE SECTION ########################################################## # # The default path for your documents. # Default is $HOME #\document_path ~/Documents/ # The file where the last-files information should be stored. # Default is ~/.lyx/lastfiles #\lastfiles ~/.lyx_lastfiles # Maximal number of lastfiles. Up to nine can appear in the file menu. # Default is four. #\num_lastfiles 9 # Flag telling whether the lastfiles should be checked for existence. # Files that does not exist are left out of the lastfiles entries. # Default is true. If you use slow or removable media, such as networks # or floppy disks, you can speed up the starting time of LyX by disabling # this feature. #\check_lastfiles false # The path that LyX will set when offering you to choose a template. # Default is (System LyX dir)/templates #\template_path ~/.lyx/templates # The path that LyX will use to put temporary TeX outputs. # Default is /tmp/ # containing # If you set it, it will be /directory/ # (unless set to /tmp). #\tempdir_path /usr/tmp # If you set this flag, LyX will always use a temporary directory # to put TeX outputs into. It is enabled by default. # This directory is deleted when you quit LyX. # You might want to avoid using a temporary directory in several # cases: # - LaTeX cannot find some files it needs; # - you have a large number of include files, and you get messages # saying that some LaTeX buffers overflow. # Note that, even if tell LyX not to use a temporary directory, there # will be cases where it will be forced to: this happens for example # when typesetting a file in a read-only directory (documentation). #\use_tempdir false # This is the maximum line length of an exported ASCII file (LaTeX, # SGML or plain text). Default is 75. #\ascii_linelen 80 # Set to false if you don't want LyX to create backup files. # Default is true. #\make_backup true # The path for storing backup files. If it is the empty string, LyX will # store the backup file in the same directory of the original file. # Default is "". #\backupdir_path "~/Desktop/Trash/" # # ASCII EXPORT SECTION ################################################### # # The following entry can be used to define an external program to # render tables in the ASCII output. If you specify "none", a simple # internal routine is used. The default is auto-detected. # The following line will use groff and output using latin-1 encoding # (here $$FName is the input file and the output goes to stdout): #\ascii_roff_command "groff -t -Tlatin1 $$FName" # # SPELLCHECKER SECTION #################################################### # # What command runs the spellchecker? Default is "ispell" if it is # installed, "none" otherwise. # If you have aspell (http://metalab.unc.edu/kevina/aspell/) # installed and configured, you might want to uncomment the line below. #\spell_command aspell # Consider run-together words, such as "notthe" for "not the", as legal # words? Default is false. #\accept_compound true # Specify an alternate language. The default is to use the language of # document. Uncomment both to enable. #\use_alt_language true #\alternate_language dansk # Specify additional chars that can be part of a word. #\use_escape_chars true #\escape_chars "??????" # Specify an alternate personal dictionary file. If the file name does not # begin with "/", $HOME is prefixed. The default is to search for a personal # dictionary in both the current directory and $HOME, creating one in $HOME # if none is found. The preferred name is constructed by appending ".ispell_" # to the base name of the hash file. For example, if you use the English # dictionary, your personal dictionary would be named ".ispell_english". #\use_personal_dictionary true #\personal_dictionary .ispell_dansk # Specify whether to pass the -T input encoding option to ispell (only if the # language is different than "default".) Enable this if you can't spellcheck # words with international letters in them. There have been reports that this # does not work with all dictionaries, so this is disabled by default. #\use_input_encoding true # # LANGUAGE SUPPORT SECTION #################################################### # # Set to true to enable support of right-to-left languages (e.g. Hebrew, # Arabic). Default is false. #\rtl true # The latex command for loading the language package. # Default is \usepackage{babel}. #\language_package "\usepackage{omega}" # The latex command for changing the from the language of the document # to another language. $$lang is substituted by the name of the second # language. Default is \selectlanguage{$$lang}. #\language_command_begin "\begin{otherlanguage}{$$lang}" # The latex command for changing back the language to the language of # the document. Default is \selectlanguage{$$lang}. #\language_command_end "\end{otherlanguage}" # Set to false if a language switching command is needed at the beginning of # the document. Default is true. #\language_auto_begin false # Set to false if a language switching command is needed at the end of # the document. Default is true. #\language_auto_end false # Set mark_foreign_language to "false" to disable the highlighting of words # with a foreign language to the language of the documet. # Default is "true" #\mark_foreign_language false # It is possible to bind keys for changing the language inside a document. # For example, the following command will cause F12 to switch between French # and English in a French document, and in a document of other language it will # switch between that language and French. #\bind "F12" "language french" # # HEBREW SUPPORT SECTION #################################################### # # To enable the Hebrew support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary hebrew #\converter tex dvi elatex "" #\converter tex pdf pdfelatex "" #\font_encoding default # You also need to bind a key for switching between Hebrew and English. # For example, #\bind "F12" "language hebrew" # You might want ot disable the foreign language marking: #\mark_foreign_language false # Finally, you need to select iso8859-8 font encoding, and select screen fonts # (below are the default fonts. You need to replace them by Hebrew fonts) #\screen_font_encoding iso8859-8 #\screen_font_roman "-*-times" #\screen_font_sans "-*-helvetica" #\screen_font_typewriter "-*-courier" #\screen_font_popup "-*-helvetica-medium-r" #\screen_font_menu "-*-helvetica-bold-r" # # ARABIC SUPPORT SECTION #################################################### # # To enable the Arabic support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary arabic # You also need to bind a key for switching between Arabic and English. # For example, #\bind "F12" "language arabic" # If you use arabtex, uncomment the following lines #\language_auto_begin false #\language_auto_end false #\language_command_begin "\begin{arabtext}" #\language_command_end "\end{arabtext}" #\language_package "\usepackage{arabtex,iso88596}\setcode{iso8859-6}" # Finally, you need to select iso8859-6.8x font encoding, # and select screen fonts. # iso8859-6.8x fonts can be found at # http://www.langbox.com/AraMosaic/mozilla/fontXFE/ #\screen_font_encoding iso8859-6.8x #\screen_font_encoding_menu iso8859-1 #\screen_font_roman "-*-naskhi" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Apr 2006 15:53:34 -0000 1.5 +++ .cvsignore 24 May 2006 14:01:28 -0000 1.6 @@ -1,2 +1,3 @@ +clog beamer.layout lyx-1.4.1.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- lyx.spec 22 May 2006 19:01:27 -0000 1.22 +++ lyx.spec 24 May 2006 14:01:28 -0000 1.23 @@ -2,18 +2,18 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.4.0-helpers.patch -Patch2: lyx-1.4.0-boost.patch +Patch2: lyx-1.4.1-defaults.patch +Source1: lyxrc.defaults.custom # app-wrapper for various frontends Source10: lyx.sh # .desktop files @@ -39,7 +39,6 @@ BuildRequires: zlib-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0} # For texhash Requires(post): tetex-fonts @@ -52,9 +51,11 @@ Requires: ghostscript Requires: htmlview ## Soft dependancies -# add support for lyx's Document->Change Tracking +%if "%{?fedora}" > "3" +# dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost Requires(hint): tetex-preview +%endif %description LyX is a modern approach to writing documents which breaks with the @@ -96,7 +97,7 @@ %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%{?_without_included_boost:%patch2 -p1 -b .boost} +%patch2 -p1 -b .defaults %build @@ -117,7 +118,6 @@ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ - %{?_without_included_boost} \ --without-warnings --disable-dependency-tracking \ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks @@ -135,6 +135,7 @@ install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms # misc/extras +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults.custom install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ # Set up the lyx-specific class files where TeX can see them @@ -194,10 +195,11 @@ %{_mandir}/man1/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ -%{_datadir}/texmf/tex/latex/lyx/ +%config(noreplace) %{_datadir}/lyx/lyxrc.defaults.custom %verify(not md5 size mtime) %{_datadir}/lyx/*.lst %verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults %verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx +%{_datadir}/texmf/tex/latex/lyx/ %files qt %defattr(-,root,root,-) @@ -211,6 +213,18 @@ %changelog +* Wed May 24 2006 Rex Dieter 1.4.1-7 +- use serverpipe "~/.lyx/lyxpipe" instead, that was the old default + and what pybibliographer expects. + +* Tue May 23 2006 Rex Dieter 1.4.1-6 +- set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) + screen_font_roman "Serif" + screen_font_sans "Sans" + screen_font_typewriter "Monospace" + screen_zoom 100 + serverpipe "~/.lyx/pipe" + * Mon May 22 2006 Rex Dieter 1.4.1-5 - Requires(hint): tetex-preview --- lyx-1.4.0-boost.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:04:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:04:22 -0700 Subject: rpms/qt4 - New directory Message-ID: <200605241404.k4OE4OpN006869@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6847/qt4 Log Message: Directory /cvs/extras/rpms/qt4 added to the repository From fedora-extras-commits at redhat.com Wed May 24 14:04:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:04:22 -0700 Subject: rpms/qt4/devel - New directory Message-ID: <200605241404.k4OE4ODD006872@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6847/qt4/devel Log Message: Directory /cvs/extras/rpms/qt4/devel added to the repository From fedora-extras-commits at redhat.com Wed May 24 14:04:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:04:36 -0700 Subject: rpms/qt4 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605241404.k4OE4cqr006928@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6895 Added Files: Makefile import.log Log Message: Setup of module qt4 --- NEW FILE Makefile --- # Top level Makefile for module qt4 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 24 14:04:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:04:36 -0700 Subject: rpms/qt4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605241404.k4OE4cRd006931@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6895/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qt4 --- NEW 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 May 24 14:06:14 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:06:14 -0700 Subject: rpms/qt4 import.log,1.1,1.2 Message-ID: <200605241406.k4OE6kYm007040@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997 Modified Files: import.log Log Message: auto-import qt4-4.1.3-3 on branch devel from qt4-4.1.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qt4/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 May 2006 14:04:36 -0000 1.1 +++ import.log 24 May 2006 14:06:14 -0000 1.2 @@ -0,0 +1 @@ +qt4-4_1_3-3:HEAD:qt4-4.1.3-3.src.rpm:1148479570 From fedora-extras-commits at redhat.com Wed May 24 14:06:14 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:06:14 -0700 Subject: rpms/qt4/devel assistant.desktop, NONE, 1.1 designer.desktop, NONE, 1.1 linguist.desktop, NONE, 1.1 qt-x11-opensource-src-4.1.2-assistant4.patch, NONE, 1.1 qt4-wrapper.sh, NONE, 1.1 qt4.spec, NONE, 1.1 qtconfig.desktop, NONE, 1.1 qtdemo.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605241406.k4OE6k4H007044@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/devel Modified Files: .cvsignore sources Added Files: assistant.desktop designer.desktop linguist.desktop qt-x11-opensource-src-4.1.2-assistant4.patch qt4-wrapper.sh qt4.spec qtconfig.desktop qtdemo.desktop Log Message: auto-import qt4-4.1.3-3 on branch devel from qt4-4.1.3-3.src.rpm --- NEW FILE assistant.desktop --- [Desktop Entry] Name=Qt4 Assistant Comment=Add translations to Qt4 applications Exec=assistant4 Icon=assistant Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; --- NEW FILE designer.desktop --- [Desktop Entry] Name=Qt4 Designer GenericName=Interface Designer Comment=Design GUIs for Qt4 applications Exec=designer4 Icon=designer MimeType=application/x-designer; Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; --- NEW FILE linguist.desktop --- [Desktop Entry] Name=Qt4 Linguist Comment=Add translations to Qt4 applications Exec=linguist4 Icon=linguist MimeType=application/x-linguist; Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; qt-x11-opensource-src-4.1.2-assistant4.patch: --- NEW FILE qt-x11-opensource-src-4.1.2-assistant4.patch --- --- qt-x11-opensource-src-4.1.2/tools/assistant/lib/qassistantclient.cpp.assistant4 2006-03-20 07:04:38.000000000 -0600 +++ qt-x11-opensource-src-4.1.2/tools/assistant/lib/qassistantclient.cpp 2006-05-15 10:41:41.000000000 -0500 @@ -166,7 +166,7 @@ : QObject( parent ), host ( "localhost" ) { if ( path.isEmpty() ) - assistantCommand = "assistant"; + assistantCommand = "assistant4"; else { QFileInfo fi( path ); if ( fi.isDir() ) --- NEW FILE qt4-wrapper.sh --- #!/bin/sh if [ -z "$QT4DIR" ] ; then QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`" if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then PATH=${QT4DIR}/bin:${PATH} fi export QT4DIR PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} --- NEW FILE qt4.spec --- # Currently under review for Fedora Extras at # http://bugzilla.redhat.com/bugzilla/188180 Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 Release: 3%{?dist} License: GPL/QPL Group: System Environment/Libraries Url: http://www.trolltech.com/products/qt/ Source0: ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # search for assistant4 instead of (qt3's) assistant in $PATH Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch Source10: qt4-wrapper.sh Source20: assistant.desktop Source21: designer.desktop Source22: linguist.desktop Source23: qtdemo.desktop Source24: qtconfig.desktop ## Optional bits # Build mysql plugins %define mysql 1 # Build postgresql plugins %define psql 1 # Build ODBC plugins %define odbc 1 # Build sqlite plugins %define sqlite 1 %define qt_dirname qt4 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/%{name}-doc-%{version} Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d BuildRequires: desktop-file-utils BuildRequires: libmng-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: libungif-devel BuildRequires: findutils BuildRequires: cups-devel BuildRequires: tar BuildRequires: freetype-devel BuildRequires: fontconfig-devel %define x_deps xorg-x11-devel libGL-devel libGLU-devel %if "%{?fedora}" > "4" %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel %endif BuildRequires: %{x_deps} %if %{mysql} # mysql-devel < 4 build fails, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") %global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql") %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g") %endif %if %{psql} BuildRequires: postgresql-devel %endif %if %{odbc} BuildRequires: unixODBC-devel %endif %if %{sqlite} BuildRequires: sqlite-devel %endif %description Qt is a GUI software toolkit which simplifies the task of writing and maintaining GUI (Graphical User Interface) applications for the X Window System. %package config Summary: Grapical configuration tool for programs using Qt Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} %description config %{summary}. %package devel Summary: Development files for the Qt GUI toolkit Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{x_deps} Requires: libpng-devel Requires: libjpeg-devel Requires: pkgconfig Obsoletes: %{name}-designer < %{version}-%{release} Provides: %{name}-designer = %{version}-%{release} %description devel This package contains the files necessary to develop applications using the Qt GUI toolkit. Includes: Qt Linguist %package doc Summary: API documentation, demos and example programs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Provides: %{name}-assistant = %{version}_%{release} # For docs -> doc rename, temporary, since it was a short-lived subpkg Obsoletes: %{name}-docs < %{version}-%{release} Provides: %{name}-docs = %{version}-%{release} %description doc %{summary}. Includes: Qt Assistant, Qt Demo %package odbc Summary: ODBC driver for Qt's SQL classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-ODBC < %{version}-%{release} Provides: %{name}-ODBC = %{version}-%{release} %description odbc %{summary}. %package mysql Summary: MySQL driver for Qt's SQL classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-MySQL < %{version}-%{release} Provides: %{name}-MySQL = %{version}-%{release} %description mysql %{summary}. %package postgresql Summary: PostgreSQL driver for Qt's SQL classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-PostgreSQL < %{version}-%{release} Provides: %{name}-PostgreSQL = %{version}-%{release} %description postgresql %{summary}. %package sqlite Summary: SQLite driver for Qt's SQL classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-SQLite < %{version}-%{release} Provides: %{name}-SQLite = %{version}-%{release} %description sqlite %{summary}. %prep %setup -q -n qt-x11-opensource-src-%{version} %patch1 -p1 -b .assistant4 %build export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` # use $RPM_OPT_FLAGS for our platform %if "%{_lib}" == "lib64" %define platform linux-g++-64 %else %define platform linux-g++ %endif sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf # set correct lib path if [ "%{_lib}" == "lib64" ] ; then sed -i -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test sed -i -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test fi # build shared, threaded (default) libraries echo yes | ./configure -v \ -no-rpath \ -prefix %{qtdir} \ -libdir %{qtdir}/%{_lib} \ -docdir %{qt_docdir} \ -platform %{platform} \ -release \ -shared \ -no-exceptions \ -largefile \ -qt-gif \ -system-zlib \ -system-libpng \ -system-libjpeg \ %if %{mysql} -plugin-sql-mysql \ %{?mysql_include} \ %{?mysql_ldflags} \ %endif %if %{psql} -plugin-sql-psql \ %endif %if %{odbc} -plugin-sql-odbc \ %endif %if %{sqlite} -plugin-sql-sqlite \ %endif -cups \ -sm \ -stl \ -xcursor \ -xinerama \ -xshape \ -xrandr \ -xrender \ -xkb \ -fontconfig \ -tablet make %{?_smp_mflags} %install rm -rf %{buildroot} export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" make install INSTALL_ROOT=%{buildroot} ## pkg-config # strip extraneous dirs/libraries -- Rex # safe ones for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl done # not-so-safe, but we can try -- Rex for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl done sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ pushd %{buildroot}%{_libdir}/pkgconfig for i in ../%{qt_dirname}/%{_lib}/*.pc ; do [ -f "$i" ] && ln -s $i . done popd # -doc make symbolic link to qt_docdir rm -rf %{buildroot}%{qtdir}/doc ln -s ../../share/doc/%{name}-doc-%{version} %{buildroot}%{qtdir}/doc # put LICENSE.* files in %%qtdir, some apps' configure scripts expect to find them here install -p -m644 LICENSE.* %{buildroot}%{qtdir}/ # Make symlinks in %%_bindir mkdir -p %{buildroot}%{_bindir} pushd %{buildroot}%{qtdir}/bin for i in *; do case "$i" in qt3to4|uic3|rcc) LINK=$i ;; qtconfig) LINK=qt4config ;; qtdemo) LINK=qt4demo ;; *) LINK=${i}4 ;; esac # ln -s ../%{_lib}/%{qt_dirname}/bin/$i %{buildroot}%{_bindir}/${LINK} # or use qt4-wrapper.sh [ "$i" != "$LINK" ] && ln -s $i %{buildroot}%{qtdir}/bin/${LINK} install -p -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK} done popd # Add desktop file(s) desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ --vendor="%{name}" \ --add-category="X-Fedora" \ --remove-key=MapNotify \ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} # .la files, die, die, die. rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README* changes* OPENSOURCE-NOTICE.TXT %{qtdir}/LICENSE.* /etc/ld.so.conf.d/* %dir %{qtdir} %dir %{qtdir}/%{_lib}/ %{qtdir}/%{_lib}/lib*.so.* %dir %{qtdir}/plugins/ %{qtdir}/plugins/imageformats/ %{qtdir}/plugins/accessible/ %{qtdir}/plugins/inputmethods/ %{qtdir}/translations/ %files config %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/bin/ %{qtdir}/bin/qt*config* %{_bindir}/qt*config* %{_datadir}/applications/*qtconfig*.desktop %files devel %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/bin/ %{qtdir}/bin/lrelease* %{qtdir}/bin/lupdate* %{qtdir}/bin/moc* %{qtdir}/bin/qm2ts* %{qtdir}/bin/qmake* %{qtdir}/bin/qt3to4 %{qtdir}/bin/rcc* %{qtdir}/bin/uic* %{_bindir}/lrelease* %{_bindir}/lupdate* %{_bindir}/moc* %{_bindir}/qm2ts* %{_bindir}/qmake* %{_bindir}/qt3to4 %{_bindir}/rcc* %{_bindir}/uic* %{qtdir}/include/ %{qtdir}/mkspecs/ %dir %{qtdir}/%{_lib} %{qtdir}/%{_lib}/*.so %{qtdir}/%{_lib}/*.a %{qtdir}/%{_lib}/*.prl %{qtdir}/phrasebooks/ %{qtdir}/%{_lib}/*.pc %{_libdir}/pkgconfig/*.pc %{qtdir}/q3porting.xml # Qt designer %{_bindir}/designer* %{qtdir}/bin/designer* %dir %{qtdir}/plugins %{qtdir}/plugins/designer/ %{_datadir}/applications/*designer*.desktop # Qt Linguist %{qtdir}/bin/linguist* %{_bindir}/linguist* %{_datadir}/applications/*linguist*.desktop %files doc %defattr(-,root,root,-) %dir %{qt_docdir}/ %{qt_docdir}/html %dir %{qtdir} %dir %{qtdir}/bin/ %{qtdir}/doc %{qtdir}/demos/ %{qtdir}/examples/ # Qt Assistant %{qtdir}/bin/assistant* %{_bindir}/assistant* %{_datadir}/applications/*assistant*.desktop # Qt Demo %{qtdir}/bin/qt*demo* %{_bindir}/qt*demo* %{_datadir}/applications/*qtdemo*.desktop %if %{odbc} %files odbc %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/plugins %dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlodbc* %endif %if %{psql} %files postgresql %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/plugins %dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlpsql* %endif %if %{mysql} %files mysql %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/plugins %dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlmysql* %endif %if %{sqlite} %files sqlite %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/plugins %dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlite* %endif %changelog * Sun May 21 2006 Rex Dieter 4.1.3-3 - fix %%mysql_libs macro * Sat May 20 2006 Rex Dieter 4.1.3-2 - -mysql: use mysql_config for setting cflags/ldflags. - -mysql: BR: mysql-devel > 4.0 * Sat May 20 2006 Laurent Rineau - Fix the last reference to %{qtdir}/lib: use %{_lib} instead of "lib". - Fix the ownership of subpackages: they need to own parents of directories they install files in. * Fri May 19 2006 Rex Dieter 4.1.3-1 - 4.1.3 - %%qtdir/lib/*.pc -> %%qtdir/%%_lib/*.pc (hopefully, the last hardcoded reference to %%qtdir/lib) * Fri May 19 2006 Rex Dieter 4.1.2-20 - fix some unowned dirs - try harder to purge %%builddir from .pc,.prl files - -docdir %%_docdir/%%name-doc-%%version, since we use %%doc macro in main pkg - -doc: own %%qt_docdir - use qt4-wrapper.sh to ensure launch of qt4 versions of apps that (may) overlap with those from qt3 - use %%qtdir/%%_lib in ld.so.conf.d/*.conf files too * Tue May 16 2006 Rex Dieter 4.1.2-19 - drop libQtAssistantClient,libQtUiTools shlib patches * Tue May 16 2006 Rex Dieter 4.1.2-18 - %%_bindir symlinks: qtconfig4 -> qt4config, qtdemo4 -> qt4demo - -libdir %%qtdir/%%_lib, simplifies %%_lib != lib case - -docdir %%_docdir/%%name-%%version - build shared versions of libQtAssistantClient,libQtUiTools too - strip extraneous -L paths, libs from *.prl files too * Tue May 16 2006 Rex Dieter 4.1.2-17 - .desktop: Qt -> Qt4, and Comment= (where missing) - -devel: include -designer here, Obsoletes/Provides: %%name-designer. It's small, simplifies things... one less subpkg to worry about. - -doc: include %%qtdir/doc symlink here - -docdir %%_docdir/%%name-doc-%%version * Mon May 15 2006 Rex Dieter 4.1.2-16 - set/use RPM_OPT_FLAGS only for our platform - (really) don't give %%_bindir symlink for qt3to4 another "4" suffix - don't add 4 suffix to uic3, rcc (they don't conflict with qt(3)-devel) - -devel: add linguist.desktop - -doc: move assistant here, Provides: %%{name}-assistant, add assistant.desktop - -doc: add qtdemo.desktop - -doc: Requires qt4 (instead of qt4-devel) - assistant4.patch: search for assistant4 instead of (qt3's) assistant in $PATH - -qtconfig: add qtconfig.desktop - updated %%sumaries to mention where (some) tools are, including assistant, linguist, qtdemo * Mon May 15 2006 Laurent Rineau - 4.1.2-15 - Rename -docs to -doc. - Files in the -doc subpackage are no longer in %%doc. - Move qtdemo to the subpackage -doc. - Fix symlinks in %%{_bindir}. - Only modify mkspecs/linux-g++*/qmake.conf, instead of all mkspecs/*/qmake.conf. * Sun May 14 2006 Rex Dieter 4.1.2-14 - remove MapNotify from .desktop file(s). - install -m644 LICENSE.* - -docs: don't mark examples as %doc - drop unused %%debug macro * Sat May 13 2006 Rex Dieter 4.1.2-13 - include unpackaged pkgconfig files * Sat May 13 2006 Rex Dieter 4.1.2-12 - fix typos so it actually builds. * Sat May 13 2006 Rex Dieter 4.1.2-11 - drop optional ld.so.conf.d usage, make mandatory - make %%_bindir symlinks to all %%qtdir/bin stuff (even qt3to4) - pkgconfig files: hardlinks -> relative symlinks, strip -L%{_libdir}/mysql and -L%%{_builddir}/qt-x11-opensource-src-%%version/lib - cleanup/simplify Summary/%%description entries - $RPM_BUILD_ROOT -> %%buildroot, $RPM_BUILD_DIR -> %%_builddir * Sat May 13 2006 Rex Dieter 4.1.2-10 - cleanup/simplify license bits, include LICENSE.QPL - drop unused -styles/-Xt subpkg reference - drop unused motif extention bits - drop initialpreference from .deskstop files * Fri May 12 2006 Rex Dieter 4.1.2-9 - drop reference to non-existent config.test/unix/checkavail * Fri May 12 2006 Rex Dieter 4.1.2-8 - simplify build* macros - lower-case all subpkgs (ie, -MySQL -> -mysql ) - drop BR: perl, sed * Thu May 11 2006 Rex Dieter 4.1.2-7 - rework %%post/%%postun, mostly to placate rpmlint - drop Prefix: - drop use of qt4.(sh|csh), they're empty atm anyway - use Source'd designer.desktop (instead of inline cat/echo) - symlinks to %%_bindir: qmake4, designer4, qtconfig4 - drop qtrc, qt4 doesn't use it. - -docs subpkg for API html docs, demos, examples. - BR: libXcursor-devel libXi-devel (fc5+) * Thu Apr 27 2006 Rex Dieter 4.1.2-6 - devel: Requires: pkgconfig * Sat Apr 15 2006 Simon Perreault 4.1.2-5 - Disable C++ exceptions. * Mon Apr 10 2006 Rex Dieter 4.1.2-4 - qt4.(sh|csh): place-holders only, don't define QTDIR (and QTLIB) as that (potentially) conflicts with qt-3.x. * Thu Apr 06 2006 Rex Dieter 4.1.2-2 - -devel: Drop (artificial) Conflicts: qt-devel - fix %%ld_so_conf_d usage - %%qtdir/%%_lib symlink * Wed Apr 05 2006 Rex Dieter 4.1.2-1 - drop Epoch - cleanup (a lot!) * Tue Dec 20 2005 Than Ngo 1:4.1.0-0.1 - update to 4.1.0 * Fri Sep 09 2005 Than Ngo 1:4.0.1-0.1 - update to 4.0.1 --- NEW FILE qtconfig.desktop --- [Desktop Entry] Name=Qt4 Config Comment=Configure Qt4 behavior, styles, fonts Exec=qt4config Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; --- NEW FILE qtdemo.desktop --- [Desktop Entry] Name=Qt4 Demo Comment=Show Qt4 demos and programming examples Exec=qt4demo Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 May 2006 14:04:36 -0000 1.1 +++ .cvsignore 24 May 2006 14:06:14 -0000 1.2 @@ -0,0 +1 @@ +qt-x11-opensource-src-4.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 May 2006 14:04:36 -0000 1.1 +++ sources 24 May 2006 14:06:14 -0000 1.2 @@ -0,0 +1 @@ +c6fc6934bfca458dde6e6370a2ed0101 qt-x11-opensource-src-4.1.3.tar.gz From fedora-extras-commits at redhat.com Wed May 24 14:18:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:18:21 -0700 Subject: owners owners.list,1.1052,1.1053 Message-ID: <200605241418.k4OEINGO007142@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7125 Modified Files: owners.list Log Message: take over qt4 from than. (: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1052 retrieving revision 1.1053 diff -u -r1.1052 -r1.1053 --- owners.list 24 May 2006 05:41:39 -0000 1.1052 +++ owners.list 24 May 2006 14:18:21 -0000 1.1053 @@ -1419,7 +1419,7 @@ Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|qscintilla|A Scintilla port to Qt|icon at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|qt4|Qt is a GUI software toolkit|than at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|quadkonsole|Embeds Konsole kparts in a grid layout|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 24 14:19:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:19:33 -0700 Subject: rpms/uuid - New directory Message-ID: <200605241419.k4OEJZW1007217@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7191/uuid Log Message: Directory /cvs/extras/rpms/uuid added to the repository From fedora-extras-commits at redhat.com Wed May 24 14:19:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:19:34 -0700 Subject: rpms/uuid/devel - New directory Message-ID: <200605241419.k4OEJagl007220@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7191/uuid/devel Log Message: Directory /cvs/extras/rpms/uuid/devel added to the repository From fedora-extras-commits at redhat.com Wed May 24 14:19:46 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:19:46 -0700 Subject: rpms/uuid Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605241419.k4OEJm5K007269@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7236 Added Files: Makefile import.log Log Message: Setup of module uuid --- NEW FILE Makefile --- # Top level Makefile for module uuid all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 24 14:19:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:19:47 -0700 Subject: rpms/uuid/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605241419.k4OEJnjQ007272@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7236/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module uuid --- NEW 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 May 24 14:20:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:20:21 -0700 Subject: rpms/uuid import.log,1.1,1.2 Message-ID: <200605241420.k4OEKNYu007333@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7300 Modified Files: import.log Log Message: auto-import uuid-1.4.2-4 on branch devel from uuid-1.4.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/uuid/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 May 2006 14:19:46 -0000 1.1 +++ import.log 24 May 2006 14:20:21 -0000 1.2 @@ -0,0 +1 @@ +uuid-1_4_2-4:HEAD:uuid-1.4.2-4.src.rpm:1148480414 From fedora-extras-commits at redhat.com Wed May 24 14:20:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:20:21 -0700 Subject: rpms/uuid/devel uuid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605241420.k4OEKNoU007338@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7300/devel Modified Files: .cvsignore sources Added Files: uuid.spec Log Message: auto-import uuid-1.4.2-4 on branch devel from uuid-1.4.2-4.src.rpm --- NEW FILE uuid.spec --- Name: uuid Version: 1.4.2 Release: 4%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries URL: http://www.ossp.org/pkg/lib/uuid/ Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /usr/bin/libtool %description OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. %package devel Summary: Development support for Universally Unique Identifier library Group: Development/Libraries Requires: %{_libdir}/pkgconfig Requires: %{name} = %{version}-%{release} %description devel Development headers and libraries for OSSP uuid. %package c++ Summary: C++ support for Universally Unique Identifier library Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description c++ C++ libraries for OSSP uuid. %package c++-devel Summary: C++ development support for Universally Unique Identifier library Group: Development/Libraries Requires: %{name}-c++ = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} %description c++-devel C++ development headers and libraries for OSSP uuid. %package perl Summary: Perl support for Universally Unique Identifier library Group: Development/Libraries Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name} = %{version}-%{release} %description perl Perl OSSP uuid modules, which includes a Data::UUID replacement. %package php Summary: PHP support for Universally Unique Identifier library Group: Development/Libraries BuildRequires: /usr/bin/phpize Requires: %{_libdir}/php/modules Requires: %{name} = %{version}-%{release} %description php PHP OSSP uuid module. %package pgsql Summary: PostgreSQL support for Universally Unique Identifier library Group: Development/Libraries BuildRequires: /usr/bin/pg_config Requires: %{_libdir}/pgsql Requires: %{_datadir}/pgsql Requires: %{name} = %{version}-%{release} %description pgsql PostgreSQL OSSP uuid module. %package dce Summary: DCE support for Universally Unique Identifier library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description dce DCE OSSP uuid library. %package dce-devel Summary: DCE development support for Universally Unique Identifier library Group: Development/Libraries Requires: %{name}-dce = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} %description dce-devel DCE development headers and libraries for OSSP uuid. %prep %setup -q %build # Build the library. %configure \ --disable-static \ --without-perl \ --without-php \ --with-dce \ --with-cxx \ --with-pgsql make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} # Build the Perl module. pushd perl %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" COMPAT=1 %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} popd # Build the PHP module. pushd php phpize CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs" %configure --enable-uuid sed -i -e '/^LDFLAGS =/s/-Wl,-rpath,[^[:space:]]*//' Makefile make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} popd %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/*.a chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.* # Install the Perl modules. pushd perl make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name '*.bs' -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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* popd # Install the PHP module. pushd php make install INSTALL_ROOT=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a popd %check make check pushd perl LD_LIBRARY_PATH=../.libs make test popd pushd php LD_LIBRARY_PATH=../.libs make test popd %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %post c++ -p /sbin/ldconfig %post dce -p /sbin/ldconfig %postun -p /sbin/ldconfig %postun c++ -p /sbin/ldconfig %postun dce -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS %{_bindir}/uuid %{_libdir}/libuuid.so.* %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %{_bindir}/uuid-config %{_includedir}/uuid.h %{_libdir}/libuuid.so %{_libdir}/pkgconfig/uuid.pc %{_mandir}/man3/uuid.3* %files c++ %defattr(-,root,root,-) %{_libdir}/libuuid++.so.* %files c++-devel %defattr(-,root,root,-) %{_includedir}/uuid++.hh %{_libdir}/libuuid++.so %{_mandir}/man3/uuid++.3* %files perl %defattr(-,root,root,-) %{perl_vendorarch}/auto/* %{perl_vendorarch}/Data* %{perl_vendorarch}/OSSP* %{_mandir}/man3/Data::UUID.3* %{_mandir}/man3/OSSP::uuid.3* %files php %defattr(-,root,root,-) %{_libdir}/php/modules/* %files pgsql %defattr(-,root,root,-) %{_libdir}/pgsql/* %{_datadir}/pgsql/* %files dce %defattr(-,root,root,-) %{_libdir}/libuuid_dce.so.* %files dce-devel %defattr(-,root,root,-) %{_includedir}/uuid_dce.h %{_libdir}/libuuid_dce.so %changelog * Wed May 24 2006 Steven Pritchard 1.4.2-4 - Remove static php module. * Tue May 23 2006 Steven Pritchard 1.4.2-3 - Force use of system libtool. - Make libs executable. * Tue May 23 2006 Steven Pritchard 1.4.2-2 - License is MIT(-ish). * Fri May 19 2006 Steven Pritchard 1.4.2-1 - Initial packaging attempt. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uuid/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 May 2006 14:19:47 -0000 1.1 +++ .cvsignore 24 May 2006 14:20:21 -0000 1.2 @@ -0,0 +1 @@ +uuid-1.4.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uuid/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 May 2006 14:19:47 -0000 1.1 +++ sources 24 May 2006 14:20:21 -0000 1.2 @@ -0,0 +1 @@ +fdfe93bc134dfb73814456c3b444dda1 uuid-1.4.2.tar.gz From fedora-extras-commits at redhat.com Wed May 24 14:23:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:23:59 -0700 Subject: owners owners.list,1.1053,1.1054 Message-ID: <200605241424.k4OEO1G5007484@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7455 Modified Files: owners.list Log Message: Add uuid. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1053 retrieving revision 1.1054 diff -u -r1.1053 -r1.1054 --- owners.list 24 May 2006 14:18:21 -0000 1.1053 +++ owners.list 24 May 2006 14:23:59 -0000 1.1054 @@ -1662,6 +1662,7 @@ Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|wtogami at redhat.com Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|uudeview|Applications for uuencoding, uudecoding, ..|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|uuid|Universally Unique Identifier library|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|uw-imap|UW Server daemons for IMAP and POP network mail protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 24 14:24:42 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:24:42 -0700 Subject: rpms/gsview Makefile,1.1,NONE import.log,1.7,NONE Message-ID: <200605241424.k4OEOios007528@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7513/gsview Removed Files: Makefile import.log Log Message: remove remaining remnants from cvs --- Makefile DELETED --- --- import.log DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:25:35 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 24 May 2006 07:25:35 -0700 Subject: rpms/bzrtools/FC-5 bzrtools.spec,1.1,1.2 Message-ID: <200605241425.k4OEPbcD007632@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561/FC-5 Modified Files: bzrtools.spec Log Message: Fix bzr requires Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-5/bzrtools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzrtools.spec 23 May 2006 14:56:04 -0000 1.1 +++ bzrtools.spec 24 May 2006 14:25:35 -0000 1.2 @@ -2,7 +2,7 @@ Name: bzrtools Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: bzr = 0.8 +Requires: bzr >= 0.8 %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included @@ -57,6 +57,9 @@ %ghost %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog +* Wed May 24 2006 Shahms E. King 0.8.1-4 +- Require bzr >= 0.8, rather than only 0.8 + * Tue May 16 2006 Shahms E. King 0.8.1-3 - BuildRequires python, rather than python-devel From fedora-extras-commits at redhat.com Wed May 24 14:25:36 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 24 May 2006 07:25:36 -0700 Subject: rpms/bzrtools/devel bzrtools.spec,1.1,1.2 Message-ID: <200605241425.k4OEPcsL007637@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561/devel Modified Files: bzrtools.spec Log Message: Fix bzr requires Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzrtools.spec 23 May 2006 14:56:04 -0000 1.1 +++ bzrtools.spec 24 May 2006 14:25:36 -0000 1.2 @@ -2,7 +2,7 @@ Name: bzrtools Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: bzr = 0.8 +Requires: bzr >= 0.8 %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included @@ -57,6 +57,9 @@ %ghost %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog +* Wed May 24 2006 Shahms E. King 0.8.1-4 +- Require bzr >= 0.8, rather than only 0.8 + * Tue May 16 2006 Shahms E. King 0.8.1-3 - BuildRequires python, rather than python-devel From fedora-extras-commits at redhat.com Wed May 24 14:25:34 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 24 May 2006 07:25:34 -0700 Subject: rpms/bzrtools/FC-4 bzrtools.spec,1.1,1.2 Message-ID: <200605241425.k4OEPaCd007627@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561/FC-4 Modified Files: bzrtools.spec Log Message: Fix bzr requires Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-4/bzrtools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzrtools.spec 23 May 2006 14:56:04 -0000 1.1 +++ bzrtools.spec 24 May 2006 14:25:34 -0000 1.2 @@ -2,7 +2,7 @@ Name: bzrtools Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: bzr = 0.8 +Requires: bzr >= 0.8 %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included @@ -57,6 +57,9 @@ %ghost %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog +* Wed May 24 2006 Shahms E. King 0.8.1-4 +- Require bzr >= 0.8, rather than only 0.8 + * Tue May 16 2006 Shahms E. King 0.8.1-3 - BuildRequires python, rather than python-devel From fedora-extras-commits at redhat.com Wed May 24 14:26:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:20 -0700 Subject: rpms/gsview/devel .cvsignore, 1.4, NONE Makefile, 1.2, NONE sources, 1.4, NONE Message-ID: <200605241426.k4OEQMKU007855@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/devel Removed Files: .cvsignore Makefile sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:26:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:27 -0700 Subject: rpms/gsview/FC-4 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.4, NONE Message-ID: <200605241426.k4OEQTGr007918@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/FC-4 Removed Files: .cvsignore Makefile branch sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:26:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:21 -0700 Subject: rpms/gsview/FC-2 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.3, NONE Message-ID: <200605241426.k4OEQNBr007859@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/FC-2 Removed Files: .cvsignore Makefile branch sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:26:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:28 -0700 Subject: rpms/gsview/FC-5 .cvsignore, 1.4, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.4, NONE Message-ID: <200605241426.k4OEQUK1007922@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/FC-5 Removed Files: .cvsignore Makefile branch sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:26:26 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:26 -0700 Subject: rpms/gsview/FC-3 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.4, NONE Message-ID: <200605241426.k4OEQS8v007914@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/FC-3 Removed Files: .cvsignore Makefile branch sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:45:14 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:45:14 -0700 Subject: rpms/qt4/devel qt4.spec,1.1,1.2 Message-ID: <200605241445.k4OEjGqJ008229@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8212 Modified Files: qt4.spec Log Message: * Wed May 24 2006 Rex Dieter 4.1.3-4 - move (most) %dir ownership (back) to main pkg Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4.spec 24 May 2006 14:06:14 -0000 1.1 +++ qt4.spec 24 May 2006 14:45:14 -0000 1.2 @@ -1,11 +1,8 @@ -# Currently under review for Fedora Extras at -# http://bugzilla.redhat.com/bugzilla/188180 - Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -60,7 +57,7 @@ BuildRequires: %{x_deps} %if %{mysql} -# mysql-devel < 4 build fails, not sure why... yet. -- Rex +# mysql-devel < 4 build fails on 4.1.3+, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") @@ -321,26 +318,24 @@ %{qtdir}/LICENSE.* /etc/ld.so.conf.d/* %dir %{qtdir} +%dir %{qtdir}/bin/ %dir %{qtdir}/%{_lib}/ %{qtdir}/%{_lib}/lib*.so.* %dir %{qtdir}/plugins/ -%{qtdir}/plugins/imageformats/ %{qtdir}/plugins/accessible/ +%{qtdir}/plugins/imageformats/ %{qtdir}/plugins/inputmethods/ +%dir %{qtdir}/plugins/sqldrivers/ %{qtdir}/translations/ %files config %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/bin/ %{qtdir}/bin/qt*config* %{_bindir}/qt*config* %{_datadir}/applications/*qtconfig*.desktop %files devel %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/bin/ %{qtdir}/bin/lrelease* %{qtdir}/bin/lupdate* %{qtdir}/bin/moc* @@ -360,9 +355,10 @@ %{qtdir}/include/ %{qtdir}/mkspecs/ %dir %{qtdir}/%{_lib} -%{qtdir}/%{_lib}/*.so -%{qtdir}/%{_lib}/*.a -%{qtdir}/%{_lib}/*.prl +%{qtdir}/%{_lib}/lib*.so +# 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a +%{qtdir}/%{_lib}/lib*.a +%{qtdir}/%{_lib}/lib*.prl %{qtdir}/phrasebooks/ %{qtdir}/%{_lib}/*.pc %{_libdir}/pkgconfig/*.pc @@ -382,8 +378,6 @@ %defattr(-,root,root,-) %dir %{qt_docdir}/ %{qt_docdir}/html -%dir %{qtdir} -%dir %{qtdir}/bin/ %{qtdir}/doc %{qtdir}/demos/ %{qtdir}/examples/ @@ -399,41 +393,32 @@ %if %{odbc} %files odbc %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlodbc* %endif %if %{psql} %files postgresql %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlpsql* %endif %if %{mysql} %files mysql %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlmysql* %endif %if %{sqlite} %files sqlite %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlite* %endif %changelog +* Wed May 24 2006 Rex Dieter 4.1.3-4 +- move (most) %%dir ownership (back) to main pkg + * Sun May 21 2006 Rex Dieter 4.1.3-3 - fix %%mysql_libs macro From fedora-extras-commits at redhat.com Wed May 24 15:15:22 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 24 May 2006 08:15:22 -0700 Subject: mock mock.py,1.50,1.51 Message-ID: <200605241515.k4OFFMjc010700@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10669 Modified Files: mock.py Log Message: check in Michael Brown's lovely autocache creation patch. Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- mock.py 17 May 2006 15:12:36 -0000 1.50 +++ mock.py 24 May 2006 15:15:19 -0000 1.51 @@ -24,6 +24,8 @@ import shutil import types import grp +import stat +import time from exceptions import Exception from optparse import OptionParser @@ -112,6 +114,8 @@ self.rootdir = os.path.join(self.basedir, 'root') self.homedir = self.config['chroothome'] self.builddir = os.path.join(self.homedir, 'build') + self.cache_file = os.path.join(self.config['basedir'], + self.config['cache_topdir'], self.config['root'] + self.config['cache_ext']) if not self.config.has_key('resultdir'): self.resultdir = os.path.join(self.basedir, 'result') else: @@ -202,20 +206,50 @@ self.log(curstate) else: return self._state + + def unpack(self): + self.state('unpack cache') + cmd = '%s %s %s' % (self.config['unpack_cmd'], self.basedir, self.cache_file) + self.do(cmd) + + def pack(self): + self.state('create cache') + self._ensure_dir(os.path.join(self.config['basedir'], self.config['cache_topdir'])) + cmd = '%s %s %s root' % (self.config['pack_cmd'], self.basedir, self.cache_file) + self.do(cmd) def prep(self): self.state("prep") self.log("This may take a while") - - self._prep_install() - if self.config['clean']: - cmd = '%s' % self.config['chroot_setup_cmd'] - else: - cmd = 'update' + create_cache=0 + if self.config['use_cache']: + cache_exists = os.path.exists( self.cache_file ) + if cache_exists: + cache_mtime = os.stat(self.cache_file)[stat.ST_MTIME] + cache_age_days = (time.time() - cache_mtime) / (60 * 60 * 24) + if cache_age_days > self.config['max_cache_age_days']: + self.config["rebuild_cache"] = True + + if cache_exists and not self.config['rebuild_cache']: + if self.config['clean']: + self.unpack() + cmd = 'update' + else: + cmd = '%s' % self.config['chroot_setup_cmd'] + create_cache = 1 + else: + if self.config['clean']: + cmd = '%s' % self.config['chroot_setup_cmd'] + else: + cmd = 'update' + + self._prep_install() self.yum(cmd) self._prep_build() - + + if create_cache: + self.pack() def yum(self, cmd): """use yum to install packages/package groups into the chroot""" @@ -588,6 +622,10 @@ fo.close() # write in yum.conf into chroot + if os.path.exists( os.path.join(self.rootdir, 'etc', 'yum.conf')): + cmd = "chown %s.%s /etc/yum.conf" % (self.config['chrootuid'], + self.config['chrootgid']) + self.do_chroot(cmd, fatal = True) yumconf = os.path.join(self.rootdir, 'etc', 'yum.conf') yumconf_fo = open(yumconf, 'w') yumconf_content = self.config['yum.conf'] @@ -598,8 +636,8 @@ for key in filedict: # ensure permisssions if os.path.exists( "%s%s" % (self.rootdir, key) ): - cmd = "chown %s.%s %s" % (self.config['chrootuser'], - self.config['chrootgroup'], "%s" % key) + cmd = "chown %s.%s %s" % (self.config['chrootuid'], + self.config['chrootgid'], "%s" % key) self.do_chroot(cmd, fatal = True) # write file @@ -609,11 +647,39 @@ fo.close() def _make_our_user(self): + if not os.path.exists(os.path.join(self.rootdir, 'usr/sbin/useradd')): + raise RootError, "Could not find useradd in chroot, maybe the install failed?" # should check if the user exists first # make the buildusers/groups + need_add_user = 0 if not os.path.exists(self.rootdir + self.homedir): - if not os.path.exists(os.path.join(self.rootdir, 'usr/sbin/useradd')): - raise RootError, "Could not find useradd in chroot, maybe the install failed?" + need_add_user = 1 + else: + # check for the following conditions: + # -- using cache and current user is different from original cache creator + # -- using --no-clean and current user is different from original creator + curruid = self.config['chrootuid'] + chrootuid = None + passwd = os.path.join(self.rootdir, 'etc', 'passwd') + + # find UID used to set up buildroot + fd = open( passwd, "r" ) + while 1: + line = fd.readline() + if line == "": break + if line.startswith(self.config["chrootuser"]): + chrootuid = int(line.split(":")[2]) + + # do fixups if they are different + # if uid is different, assume we need to fix gid also + if chrootuid is not None and curruid != chrootuid: + need_add_user = 1 + self.do_chroot('/usr/sbin/userdel -r %s' % self.config["chrootuser"], fatal = False) + self.do_chroot('/usr/sbin/groupdel %s' % self.config["chrootgroup"], fatal = False) + self.do_chroot('chown -R %s.%s %s' % (self.config["chrootuid"], self.config["chrootgid"], self.config["chroothome"]), fatal = False) + # may need a few other chown here if there are other files that have to be edited + + if need_add_user: cmd = '/usr/sbin/useradd -m -u %s -d %s %s' % (self.config['chrootuid'], self.homedir, self.config['chrootuser']) self.do_chroot(cmd, fatal = True) @@ -669,8 +735,8 @@ parser.add_option("-r", action="store", type="string", dest="chroot", help="chroot name/config file name default: %default", default='default') - parser.add_option("--no-clean", action ="store_true", dest="dirty", - help="do not clean chroot before building") + parser.add_option("--no-clean", action ="store_false", dest="clean", + help="do not clean chroot before building", default=True) parser.add_option("--arch", action ="store", dest="arch", default=None, help="target build arch") parser.add_option("--debug", action ="store_true", dest="debug", @@ -685,6 +751,10 @@ help="Change where config files are found") parser.add_option("--quiet", action ="store_true", dest="quiet", default=False, help="quiet down output") + parser.add_option("--autocache", action ="store_true", dest="use_cache", + default=False, help="Turn on build-root caching") + parser.add_option("--rebuildcache", action ="store_true", dest="rebuild_cache", + default=False, help="Force rebuild of build-root cache") return parser.parse_args() @@ -719,18 +789,27 @@ config_opts['files']['/etc/resolv.conf'] = "nameserver 192.168.1.1\n" config_opts['files']['/etc/hosts'] = "127.0.0.1 localhost localhost.localdomain\n" + # caching-related config options + config_opts['rebuild_cache'] = False + config_opts['use_cache'] = False + config_opts['pack_cmd'] = "/usr/sbin/mock-helper pack" + config_opts['unpack_cmd'] = "/usr/sbin/mock-helper unpack" + config_opts['cache_ext'] = ".tar.gz" + config_opts['cache_topdir'] = "root-cache" + config_opts['max_cache_age_days'] = 15 + def set_config_opts_per_cmdline(config_opts, options): # do some other options and stuff if options.arch: config_opts['target_arch'] = options.arch - if options.dirty: - config_opts['clean'] = False - else: - config_opts['clean'] = True - + config_opts['clean'] = options.clean config_opts['debug'] = options.debug config_opts['quiet'] = options.quiet + config_opts['use_cache'] = options.use_cache + config_opts['rebuild_cache'] = options.rebuild_cache + if config_opts['rebuild_cache']: + config_opts['use_cache'] = True if options.resultdir: config_opts['resultdir'] = options.resultdir From fedora-extras-commits at redhat.com Wed May 24 15:15:22 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 24 May 2006 08:15:22 -0700 Subject: mock/src mock-helper.c,1.8,1.9 Message-ID: <200605241515.k4OFFMLS010706@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10669/src Modified Files: mock-helper.c Log Message: check in Michael Brown's lovely autocache creation patch. Index: mock-helper.c =================================================================== RCS file: /cvs/fedora/mock/src/mock-helper.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mock-helper.c 12 May 2006 20:57:57 -0000 1.8 +++ mock-helper.c 24 May 2006 15:15:20 -0000 1.9 @@ -14,6 +14,8 @@ #include #include #include +#include +#include #ifdef USE_SELINUX #include @@ -341,6 +343,84 @@ do_command ("/bin/mknod", &(argv[1]), 0); } +void +do_unpack(int argc, char *argv[]) +{ + char *new_argv[5]; + + if (argc < 4) + error ("not enough arguments"); + + check_dir_allowed (rootsdir, argv[2]); + + if (chdir(argv[2]) != 0) + error ("could not change dir"); + + new_argv[0] = "tar"; + new_argv[1] = "--same-owner"; + + /* select compression */ + if (strstr(argv[3], ".bz2")) + new_argv[2] = "-jxpf"; + else if (strstr(argv[3], ".gz")) + new_argv[2] = "-zxpf"; + else + new_argv[2] = "-xpf"; + + new_argv[3] = argv[3]; + new_argv[4] = NULL; + + do_command("/bin/tar", new_argv, 0); +} + + +void +do_pack(int argc, char *argv[]) +{ + char *new_argv[6]; + char *cache_dir = 0; + char *argv_copy = 0; + struct group *gr = 0; + + if (argc < 5) + error ("not enough arguments"); + + check_dir_allowed (rootsdir, argv[2]); + + if (chdir(argv[2]) != 0) + error ("could not change dir"); + + /* create root-cache dir with appropriate perms */ + gr = getgrnam("mock"); + argv_copy = strdup(argv[3]); + cache_dir = dirname(argv_copy); + + check_dir_allowed (rootsdir, cache_dir); + + mkdir(cache_dir, 0750); + if (gr) + chown(cache_dir, 0, gr->gr_gid); + free(argv_copy); + argv_copy = 0; + + new_argv[0] = "tar"; + new_argv[1] = "--one-file-system"; + + /* select compression */ + if (strstr(argv[3], ".bz2")) + new_argv[2] = "-jlcf"; + else if (strstr(argv[3], ".gz")) + new_argv[2] = "-zlcf"; + else + new_argv[2] = "-clf"; + + new_argv[3] = argv[3]; + new_argv[4] = argv[4]; + new_argv[5] = NULL; + + do_command("/bin/tar", new_argv, 0); +} + int main (int argc, char *argv[]) { @@ -363,6 +443,10 @@ do_mknod (argc, argv); else if (strncmp ("yum", argv[1], 3) == 0) do_yum (argc, argv); + else if (strncmp ("unpack", argv[1], 6) == 0) + do_unpack (argc, argv); + else if (strncmp ("pack", argv[1], 4) == 0) + do_pack (argc, argv); else { error ("Command %s not recognized !\n", argv[1]); From fedora-extras-commits at redhat.com Wed May 24 16:57:44 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 24 May 2006 09:57:44 -0700 Subject: fedora-security/audit fe4,1.30,1.31 fe5,1.30,1.31 Message-ID: <200605241657.k4OGviA1013611@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13591 Modified Files: fe4 fe5 Log Message: Add netpanzer issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- fe4 21 May 2006 06:38:53 -0000 1.30 +++ fe4 24 May 2006 16:57:42 -0000 1.31 @@ -2,6 +2,7 @@ ** are items that need attention +none VULNERABLE (netpanzer) bz#192983 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- fe5 23 May 2006 14:29:04 -0000 1.30 +++ fe5 24 May 2006 16:57:42 -0000 1.31 @@ -2,6 +2,7 @@ ** are items that need attention +none VULNERABLE (netpanzer) bz#192983 CVE-2006-2453 VULNERABLE (dia) bz#192830 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2480 patch (dia, fixed 0.95-2) bz#192535 From fedora-extras-commits at redhat.com Wed May 24 17:21:29 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 24 May 2006 10:21:29 -0700 Subject: fedora-security/audit fe4,1.31,1.32 fe5,1.31,1.32 Message-ID: <200605241721.k4OHLTLN016162@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16142 Modified Files: fe4 fe5 Log Message: Add another netpanzer issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fe4 24 May 2006 16:57:42 -0000 1.31 +++ fe4 24 May 2006 17:21:26 -0000 1.32 @@ -81,4 +81,5 @@ CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) CVE-2005-4803 version (graphviz, fixed 2.2.1) +CVE-2005-2295 VULNERABLE (netpanzer) bz#192990 CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.26-3) bz#191351 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fe5 24 May 2006 16:57:42 -0000 1.31 +++ fe5 24 May 2006 17:21:26 -0000 1.32 @@ -85,4 +85,5 @@ CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) CVE-2005-4803 version (graphviz, fixed 2.2.1) +CVE-2005-2295 VULNERABLE (netpanzer) bz#192990 CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.30-3) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch From fedora-extras-commits at redhat.com Wed May 24 17:56:51 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 24 May 2006 10:56:51 -0700 Subject: kmodtool kmodtool,1.6,1.7 Message-ID: <200605241756.k4OHupgs016883@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/kmodtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16825 Modified Files: kmodtool Log Message: Recognize PAE (FC6) and largesmp (RHEL4) kernels. sed gave me a headache, so this change also gets rid of it and uses bash's (>= 2.x required) parameter expansion instead. Additionally, get_variant() is now implemented using get_verrel()'s results so things should stay better in sync. Index: kmodtool =================================================================== RCS file: /cvs/fedora/kmodtool/kmodtool,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kmodtool 21 May 2006 13:24:48 -0000 1.6 +++ kmodtool 24 May 2006 17:56:49 -0000 1.7 @@ -23,9 +23,11 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +shopt -s extglob + myprog="kmodtool" -myver="0.10.9" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' +myver="0.10.10" +knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)) kmod_name= kver= verrel= @@ -33,24 +35,27 @@ get_verrel () { - verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" + verrel=${1:-$(uname -r)} + verrel=${verrel%%$knownvariants} } print_verrel () { - get_verrel $@ || return $? + get_verrel $@ echo "${verrel}" } get_variant () { - variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" - [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' + get_verrel $@ + variant=${1:-$(uname -r)} + variant=${variant##$verrel} + variant=${variant:-'""'} } print_variant () { - get_variant $@ || return $? + get_variant $@ echo "${variant}" } From fedora-extras-commits at redhat.com Wed May 24 18:35:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 11:35:52 -0700 Subject: rpms/qt4/FC-5 .cvsignore,1.2,1.3 Message-ID: <200605241835.k4OIZsjd019738@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19721 Modified Files: .cvsignore Log Message: +clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2006 14:06:14 -0000 1.2 +++ .cvsignore 24 May 2006 18:35:52 -0000 1.3 @@ -1 +1,2 @@ +clog qt-x11-opensource-src-4.1.3.tar.gz From fedora-extras-commits at redhat.com Wed May 24 18:36:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 11:36:20 -0700 Subject: rpms/qt4/FC-5 qt4.spec,1.2,1.3 Message-ID: <200605241836.k4OIaM5G019799@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777 Modified Files: qt4.spec Log Message: micro respin Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt4.spec 24 May 2006 14:45:14 -0000 1.2 +++ qt4.spec 24 May 2006 18:36:20 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 4%{?dist} +Release: 4%{?dist}.1 License: GPL/QPL Group: System Environment/Libraries From fedora-extras-commits at redhat.com Wed May 24 18:36:48 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 11:36:48 -0700 Subject: rpms/qt4/FC-4 .cvsignore,1.2,1.3 Message-ID: <200605241836.k4OIaoSf019862@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19845 Modified Files: .cvsignore Log Message: +clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2006 14:06:14 -0000 1.2 +++ .cvsignore 24 May 2006 18:36:48 -0000 1.3 @@ -1 +1,2 @@ +clog qt-x11-opensource-src-4.1.3.tar.gz From fedora-extras-commits at redhat.com Wed May 24 18:47:59 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 11:47:59 -0700 Subject: rpms/multitail/devel .cvsignore, 1.6, 1.7 multitail.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605241848.k4OIm1EJ020007@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19986 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 4.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Apr 2006 20:36:14 -0000 1.6 +++ .cvsignore 24 May 2006 18:47:59 -0000 1.7 @@ -1 +1 @@ -multitail-4.0.3.tgz +multitail-4.0.4.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- multitail.spec 19 Apr 2006 20:36:14 -0000 1.5 +++ multitail.spec 24 May 2006 18:47:59 -0000 1.6 @@ -1,5 +1,5 @@ Name: multitail -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -17,7 +17,7 @@ matching the wildcard has a more recent modification date, it will automatically switch to that file. That way you can, for example, monitor a complete directory of files. Merging of 2 or even more -logfiles is possible. +logfiles is possible. It can also use colors while displaying the logfiles (through regular expressions), for faster recognition of what is important and what not. Multitail can also filter lines (again with regular expressions) and @@ -56,6 +56,9 @@ %changelog +* Wed May 24 2006 Folkert van Heuesden - 4.0.4-1 +- Updated to release 4.0.4. + * Wed Apr 19 2006 Folkert van Heuesden - 4.0.3-1 - Updated to release 4.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Apr 2006 20:36:14 -0000 1.6 +++ sources 24 May 2006 18:47:59 -0000 1.7 @@ -1 +1 @@ -b6017e19aa7cf7e2b4fddd75a596a1a7 multitail-4.0.3.tgz +86d675d8da0bac430f5800cbf0cbdd46 multitail-4.0.4.tgz From fedora-extras-commits at redhat.com Wed May 24 19:26:56 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 24 May 2006 12:26:56 -0700 Subject: devel/xboard xboard-4.2.7-nostrip.patch, NONE, 1.1 xboard.spec, 1.5, 1.6 Message-ID: <200605241926.k4OJQwcY022689@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/xboard In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22666 Modified Files: xboard.spec Added Files: xboard-4.2.7-nostrip.patch Log Message: fix debuginfo xboard-4.2.7-nostrip.patch: --- NEW FILE xboard-4.2.7-nostrip.patch --- --- xboard-4.2.7/Makefile.in.orig 2006-05-24 09:52:45.000000000 -0400 +++ xboard-4.2.7/Makefile.in 2006-05-24 09:53:08.000000000 -0400 @@ -63,8 +63,8 @@ all: default pseudosource info FAQ html dvi ps install: installdirs default - $(INSTALL_PROGRAM) -s xboard $(bindir)/xboard - $(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm + $(INSTALL_PROGRAM) xboard $(bindir)/xboard + $(INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm $(INSTALL_PROGRAM) cmail $(bindir)/cmail $(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext) Index: xboard.spec =================================================================== RCS file: /cvs/extras/devel/xboard/xboard.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xboard.spec 15 Feb 2006 15:31:34 -0000 1.5 +++ xboard.spec 24 May 2006 19:26:56 -0000 1.6 @@ -1,13 +1,14 @@ Summary: An X Window System graphical chessboard Name: xboard Version: 4.2.7 -Release: 12%{?dist} +Release: 13%{?dist} Group: Amusements/Games URL: http://www.tim-mann.org/xboard.html Source: ftp://ftp.gnu.org/pub/gnu/xboard/xboard-%{version}.tar.gz Source1: chess.png Source2: xboard.desktop Patch1: xboard-4.2.4-rh1.patch +Patch2: xboard-4.2.7-nostrip.patch Requires: chessprogram License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,6 +30,7 @@ %prep %setup -q %patch1 -p1 -b .rh1 +%patch2 -p1 -b .nostrip %build %configure @@ -79,6 +81,9 @@ %{_datadir}/applications/* %changelog +* Wed May 24 2006 Chris Ricker 4.2.7-13 +- correct debuginfo package generation (bz#192608) + * Wed Feb 15 2006 Chris Ricker 4.2.7-12 - Update for modular X From fedora-extras-commits at redhat.com Wed May 24 19:38:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:38:01 -0700 Subject: rpms/perl-Module-ScanDeps/FC-4 .cvsignore, 1.2, 1.3 perl-Module-ScanDeps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605241938.k4OJc3qA022917@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22864/FC-4 Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Update to 0.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 May 2006 21:14:51 -0000 1.2 +++ .cvsignore 24 May 2006 19:38:01 -0000 1.3 @@ -1 +1 @@ -Module-ScanDeps-0.59.tar.gz +Module-ScanDeps-0.60.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-4/perl-Module-ScanDeps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-ScanDeps.spec 7 May 2006 21:25:39 -0000 1.2 +++ perl-Module-ScanDeps.spec 24 May 2006 19:38:01 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Module-ScanDeps -Version: 0.59 -Release: 2%{?dist} +Version: 0.60 +Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 0.60-1 +- Update to 0.60. + * Sun May 7 2006 Jose Pedro Oliveira - 0.59-2 - Source URL corrected (failed to detect the maintainer change). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 May 2006 21:14:51 -0000 1.2 +++ sources 24 May 2006 19:38:01 -0000 1.3 @@ -1 +1 @@ -6e20e368ff101d8bc8f31eaa2d81c264 Module-ScanDeps-0.59.tar.gz +fb809a3a2964a880a584e3e10ce3a4bb Module-ScanDeps-0.60.tar.gz From fedora-extras-commits at redhat.com Wed May 24 19:38:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:38:02 -0700 Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.2, 1.3 perl-Module-ScanDeps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605241938.k4OJc40a022923@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22864/FC-5 Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Update to 0.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 May 2006 21:14:51 -0000 1.2 +++ .cvsignore 24 May 2006 19:38:02 -0000 1.3 @@ -1 +1 @@ -Module-ScanDeps-0.59.tar.gz +Module-ScanDeps-0.60.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/perl-Module-ScanDeps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-ScanDeps.spec 7 May 2006 21:25:39 -0000 1.2 +++ perl-Module-ScanDeps.spec 24 May 2006 19:38:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Module-ScanDeps -Version: 0.59 -Release: 2%{?dist} +Version: 0.60 +Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 0.60-1 +- Update to 0.60. + * Sun May 7 2006 Jose Pedro Oliveira - 0.59-2 - Source URL corrected (failed to detect the maintainer change). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 May 2006 21:14:51 -0000 1.2 +++ sources 24 May 2006 19:38:02 -0000 1.3 @@ -1 +1 @@ -6e20e368ff101d8bc8f31eaa2d81c264 Module-ScanDeps-0.59.tar.gz +fb809a3a2964a880a584e3e10ce3a4bb Module-ScanDeps-0.60.tar.gz From fedora-extras-commits at redhat.com Wed May 24 19:38:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:38:03 -0700 Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.2, 1.3 perl-Module-ScanDeps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605241938.k4OJc5PB022929@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22864/devel Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Update to 0.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 May 2006 21:14:51 -0000 1.2 +++ .cvsignore 24 May 2006 19:38:02 -0000 1.3 @@ -1 +1 @@ -Module-ScanDeps-0.59.tar.gz +Module-ScanDeps-0.60.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-ScanDeps.spec 7 May 2006 21:25:39 -0000 1.2 +++ perl-Module-ScanDeps.spec 24 May 2006 19:38:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Module-ScanDeps -Version: 0.59 -Release: 2%{?dist} +Version: 0.60 +Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 0.60-1 +- Update to 0.60. + * Sun May 7 2006 Jose Pedro Oliveira - 0.59-2 - Source URL corrected (failed to detect the maintainer change). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 May 2006 21:14:51 -0000 1.2 +++ sources 24 May 2006 19:38:02 -0000 1.3 @@ -1 +1 @@ -6e20e368ff101d8bc8f31eaa2d81c264 Module-ScanDeps-0.59.tar.gz +fb809a3a2964a880a584e3e10ce3a4bb Module-ScanDeps-0.60.tar.gz From fedora-extras-commits at redhat.com Wed May 24 19:52:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:52:01 -0700 Subject: rpms/multitail/FC-4 .cvsignore, 1.5, 1.6 multitail.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200605241952.k4OJq3dW023216@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23179/FC-4 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 4.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Apr 2006 20:49:21 -0000 1.5 +++ .cvsignore 24 May 2006 19:52:00 -0000 1.6 @@ -1 +1 @@ -multitail-4.0.3.tgz +multitail-4.0.4.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/multitail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- multitail.spec 19 Apr 2006 20:49:21 -0000 1.4 +++ multitail.spec 24 May 2006 19:52:00 -0000 1.5 @@ -1,5 +1,5 @@ Name: multitail -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -17,7 +17,7 @@ matching the wildcard has a more recent modification date, it will automatically switch to that file. That way you can, for example, monitor a complete directory of files. Merging of 2 or even more -logfiles is possible. +logfiles is possible. It can also use colors while displaying the logfiles (through regular expressions), for faster recognition of what is important and what not. Multitail can also filter lines (again with regular expressions) and @@ -56,6 +56,9 @@ %changelog +* Wed May 24 2006 Folkert van Heuesden - 4.0.4-1 +- Updated to release 4.0.4. + * Wed Apr 19 2006 Folkert van Heuesden - 4.0.3-1 - Updated to release 4.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Apr 2006 20:49:21 -0000 1.5 +++ sources 24 May 2006 19:52:00 -0000 1.6 @@ -1 +1 @@ -b6017e19aa7cf7e2b4fddd75a596a1a7 multitail-4.0.3.tgz +86d675d8da0bac430f5800cbf0cbdd46 multitail-4.0.4.tgz From fedora-extras-commits at redhat.com Wed May 24 19:52:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:52:01 -0700 Subject: rpms/multitail/FC-5 .cvsignore, 1.5, 1.6 multitail.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200605241952.k4OJq34c023222@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23179/FC-5 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 4.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Apr 2006 20:49:21 -0000 1.5 +++ .cvsignore 24 May 2006 19:52:01 -0000 1.6 @@ -1 +1 @@ -multitail-4.0.3.tgz +multitail-4.0.4.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/multitail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- multitail.spec 19 Apr 2006 20:49:21 -0000 1.4 +++ multitail.spec 24 May 2006 19:52:01 -0000 1.5 @@ -1,5 +1,5 @@ Name: multitail -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -17,7 +17,7 @@ matching the wildcard has a more recent modification date, it will automatically switch to that file. That way you can, for example, monitor a complete directory of files. Merging of 2 or even more -logfiles is possible. +logfiles is possible. It can also use colors while displaying the logfiles (through regular expressions), for faster recognition of what is important and what not. Multitail can also filter lines (again with regular expressions) and @@ -56,6 +56,9 @@ %changelog +* Wed May 24 2006 Folkert van Heuesden - 4.0.4-1 +- Updated to release 4.0.4. + * Wed Apr 19 2006 Folkert van Heuesden - 4.0.3-1 - Updated to release 4.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Apr 2006 20:49:21 -0000 1.5 +++ sources 24 May 2006 19:52:01 -0000 1.6 @@ -1 +1 @@ -b6017e19aa7cf7e2b4fddd75a596a1a7 multitail-4.0.3.tgz +86d675d8da0bac430f5800cbf0cbdd46 multitail-4.0.4.tgz From fedora-extras-commits at redhat.com Wed May 24 19:54:49 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 24 May 2006 12:54:49 -0700 Subject: fedora-release fedora-development.repo,1.6,1.7 Message-ID: <200605241954.k4OJsnY1023354@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23336 Modified Files: fedora-development.repo Log Message: Point to the new layout. Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedora-development.repo 29 Mar 2006 23:31:22 -0000 1.6 +++ fedora-development.repo 24 May 2006 19:54:47 -0000 1.7 @@ -25,7 +25,7 @@ [development] name=Fedora Core - Development -#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/os/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide enabled=1 gpgcheck=0 @@ -39,7 +39,7 @@ [development-source] name=Fedora Core - Development - Source -#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide-source enabled=0 gpgcheck=0 From fedora-extras-commits at redhat.com Wed May 24 19:58:55 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 24 May 2006 12:58:55 -0700 Subject: fedora-release fedora-release.spec,1.23,1.24 Message-ID: <200605241958.k4OJwtof023413@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393 Modified Files: fedora-release.spec Log Message: Remove duplicate web files. Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fedora-release.spec 9 Mar 2006 20:54:31 -0000 1.23 +++ fedora-release.spec 24 May 2006 19:58:53 -0000 1.24 @@ -111,7 +111,6 @@ %dir /etc/yum.repos.d %config(noreplace) /etc/sysconfig/rhn/sources %config(noreplace) /etc/yum.repos.d/* -%doc R* stylesheet-images figs *.css %doc eula.txt GPL %doc about %config %attr(0644,root,root) /etc/issue From fedora-extras-commits at redhat.com Wed May 24 20:29:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 24 May 2006 13:29:31 -0700 Subject: extras-buildsys/utils extras-push-new,1.16,1.17 Message-ID: <200605242029.k4OKTVjW026026@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26008 Modified Files: extras-push-new Log Message: insert date in mail subject line Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- extras-push-new 23 May 2006 17:06:47 -0000 1.16 +++ extras-push-new 24 May 2006 20:29:29 -0000 1.17 @@ -447,6 +447,7 @@ # ==================================================================== +import datetime import smtplib from email.MIMEText import MIMEText @@ -468,7 +469,7 @@ body += mail_footer msg = MIMEText(body) - subject = '%s Package Build Report' % (project_hr) + subject = '%s Package Build Report %s' % (project_hr,datetime.date.today()) msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to From fedora-extras-commits at redhat.com Wed May 24 20:40:55 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 13:40:55 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.10,1.11 Message-ID: <200605242040.k4OKevcl026248@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26185 Modified Files: emacs-auctex.spec Log Message: Revert change which created tetex-preview subpackage Main package both Provides and Obsolotes tetex-preview See bug 192960 Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- emacs-auctex.spec 21 May 2006 23:02:49 -0000 1.10 +++ emacs-auctex.spec 24 May 2006 20:40:55 -0000 1.11 @@ -1,83 +1,47 @@ -%define startupdir %{_datadir}/emacs/site-lisp/site-start.d/ -%define startupfile %{startupdir}/auctex-init.el +%define startupdir %{_datadir}/emacs/site-lisp/site-start.d/ +%define startupfile %{startupdir}/auctex-init.el -%define textree %{_datadir}/texmf/tex/ -%define previewdir %{textree}/latex/preview/ - -Summary: Enhanced TeX modes for Emacsen -Name: emacs-auctex -Version: 11.82 -Release: 10%{?dist} -License: GPL -Group: Applications/Editors -URL: http://www.gnu.org/software/auctex/ -Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: auctex -Provides: auctex -Conflicts: emacspeak < 18 -Requires: emacs emacs-common ghostscript -Requires: tetex-preview = %{version} -Requires: /sbin/install-info -BuildRequires: emacs tetex-latex texinfo ghostscript +Summary: Enhanced TeX modes for Emacsen +Name: emacs-auctex +Version: 11.82 +Release: 11%{?dist} +License: GPL +Group: Applications/Editors +URL: http://www.gnu.org/software/auctex/ +Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: auctex +Conflicts: emacspeak < 18 +Provides: auctex +Requires: emacs emacs-common ghostscript +Requires: tetex tetex-latex tetex-dvips tetex-xdvi +BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript + +# To deal with nasty bug 192960, don't export tetex-latex sub-package, and: +Obsolotes: tetex-preview +Provides: tetex-preview %description -AUCTeX is an extensible package that supports writing and formatting TeX files -for most variants of Emacs. +AUCTeX is an extensible package that supports writing and formatting +TeX files for most variants of Emacs. -AUCTeX supports many different TeX macro packages, including AMS-TeX, LaTeX, -Texinfo and basic support for ConTeXt. Documentation can be found under -/usr/share/doc, e.g. the reference card (tex-ref.pdf) and the FAQ. The AUCTeX -manual is available in Emacs info (C-h i d m AUCTeX RET). On the AUCTeX home -page, we provide manuals in various formats. - -AUCTeX includes preview-latex support which makes LaTeX a tightly integrated -component of your editing workflow by visualizing selected source chunks (such -as single formulas or graphics) directly as images in the source buffer. +AUCTeX supports many different TeX macro packages, including AMS-TeX, +LaTeX, Texinfo and basic support for ConTeXt. Documentation can be +found under /usr/share/doc, e.g. the reference card (tex-ref.pdf) and +the FAQ. The AUCTeX manual is available in Emacs info (C-h i d m +AUCTeX RET). On the AUCTeX home page, we provide manuals in various +formats. This package is for GNU Emacs. -%package el -Summary: Elisp source files for %{name} -Group: Applications/Editors -Requires: %{name} = %{version} - -%description el -This package contains the source Elisp files for AUCTeX for Emacs. - -%package -n tetex-preview -Summary: Preview style files for LaTeX -Group: Applications/Publishing -Requires: tetex-latex tetex-fonts ghostscript - -%description -n tetex-preview -The preview package for LaTeX allows for the processing of selected parts of a -LaTeX input file. This package extracts indicated pieces from a source file -(typically displayed equations, figures and graphics) and typesets with their -base point at the (1in,1in) magic location, shipping out the individual pieces -on separate pages without any page markup. You can produce either DVI or PDF -files, and options exist that will set the page size separately for each page. -In that manner, further processing (as with Ghostscript or dvipng) will be able -to work in a single pass. - -The main purpose of this package is the extraction of certain environments (most -notably displayed formulas) from La TeX sources as graphics. This works with DVI -files postprocessed by either Dvips and Ghostscript or dvipng, but it also works -when you are using PDFTeX for generating PDF files (usually also postprocessed -by Ghostscript). - -The tetex-preview package is generated from the AUCTeX package for Emacs. - %prep %setup -q -n auctex-%{version} %build -mkdir -p %{buildroot}%{previewdir} +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview -%configure --with-emacs \ - --with-texmf-dir=%{buildroot}%{textree} \ - --with-tex-dir=%{buildroot}%{previewdir} +%configure --with-emacs --without-texmf-dir make @@ -87,11 +51,11 @@ %install rm -rf %{buildroot} +mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}} +%makeinstall mkdir -p %{buildroot}%{startupdir} -%makeinstall -# Startup file. cat < %{buildroot}%{startupfile} ;; This enables AUCTeX globally. ;; See (info "(auctex)Introduction") on how to disable AUCTeX. @@ -118,12 +82,6 @@ /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : fi -%post -n tetex-preview -/usr/bin/texhash > /dev/null 2>&1 || : - -%postun -n tetex-preview -/usr/bin/texhash > /dev/null 2>&1 || : - %files %defattr(-,root,root,-) %doc RELEASE COPYING README TODO FAQ CHANGES @@ -131,24 +89,14 @@ %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{startupdir} -%{_datadir}/emacs/site-lisp/auctex/*.elc -%{_datadir}/emacs/site-lisp/auctex/style/*.elc -%{_datadir}/emacs/site-lisp/auctex/.nosearch -%{_datadir}/emacs/site-lisp/auctex/style/.nosearch -%{_datadir}/emacs/site-lisp/auctex/images +%{_datadir}/emacs/site-lisp/auctex %{_datadir}/emacs/site-lisp/tex-site.el -%files -n tetex-preview -%defattr(-,root,root,-) -%{previewdir} -%{textree}/doc/latex/styles/preview.dvi - -%files el -%defattr(-,root,root,-) -%{_datadir}/emacs/site-lisp/auctex/*.el -%{_datadir}/emacs/site-lisp/auctex/style/*.el - %changelog +* Wed May 24 2006 Jonathan G. Underwood - 11.82-11 +- Revert change to create tetex-preview subpackage +- Main package obsolotes and Provides tetex-preview + * Thu May 18 2006 Jonathan Underwood - 11.82-9 - Split out tetex-preview subpackage - Split out source elisp files From fedora-extras-commits at redhat.com Wed May 24 20:43:30 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 13:43:30 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.11,1.12 Message-ID: <200605242043.k4OKhWws026321@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26301 Modified Files: emacs-auctex.spec Log Message: Correct spelling mistake "Obsolotes" Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- emacs-auctex.spec 24 May 2006 20:40:55 -0000 1.11 +++ emacs-auctex.spec 24 May 2006 20:43:30 -0000 1.12 @@ -19,7 +19,7 @@ BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript # To deal with nasty bug 192960, don't export tetex-latex sub-package, and: -Obsolotes: tetex-preview +Obsoletes: tetex-preview Provides: tetex-preview %description From fedora-extras-commits at redhat.com Wed May 24 21:00:36 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 14:00:36 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.14,1.15 Message-ID: <200605242100.k4OL0cg2026618@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597 Modified Files: emacs-auctex.spec Log Message: Clean up whitespace for Ed. Bump version number. Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- emacs-auctex.spec 21 May 2006 22:50:41 -0000 1.14 +++ emacs-auctex.spec 24 May 2006 21:00:36 -0000 1.15 @@ -4,23 +4,23 @@ %define textree %{_datadir}/texmf/tex/ %define previewdir %{textree}/latex/preview/ -Summary: Enhanced TeX modes for Emacsen -Name: emacs-auctex -Version: 11.82 -Release: 10%{?dist} -License: GPL -Group: Applications/Editors -URL: http://www.gnu.org/software/auctex/ -Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: auctex -Provides: auctex -Conflicts: emacspeak < 18 -Requires: emacs emacs-common ghostscript -Requires: tetex-preview = %{version} -Requires: /sbin/install-info -BuildRequires: emacs tetex-latex texinfo ghostscript +Summary: Enhanced TeX modes for Emacsen +Name: emacs-auctex +Version: 11.82 +Release: 11%{?dist} +License: GPL +Group: Applications/Editors +URL: http://www.gnu.org/software/auctex/ +Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: auctex +Provides: auctex +Conflicts: emacspeak < 18 +Requires: emacs emacs-common ghostscript +Requires: tetex-preview = %{version} +Requires: /sbin/install-info +BuildRequires: emacs tetex-latex texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting TeX files @@ -149,6 +149,9 @@ %{_datadir}/emacs/site-lisp/auctex/style/*.el %changelog +* Wed May 24 2006 Jonathan Underwood - 11.82-11 +- Fix up whitespace for Ed. Bump version number. + * Thu May 18 2006 Jonathan Underwood - 11.82-9 - Split out tetex-preview subpackage - Split out source elisp files From fedora-extras-commits at redhat.com Wed May 24 21:02:30 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 14:02:30 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.15,1.16 Message-ID: <200605242103.k4OL33j7028954@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28927 Modified Files: emacs-auctex.spec Log Message: Bump version number. Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- emacs-auctex.spec 24 May 2006 21:00:36 -0000 1.15 +++ emacs-auctex.spec 24 May 2006 21:02:30 -0000 1.16 @@ -7,7 +7,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -149,6 +149,9 @@ %{_datadir}/emacs/site-lisp/auctex/style/*.el %changelog +* Wed May 24 2006 Jonathan Underwood - 11.82-12 +- Bump version number. + * Wed May 24 2006 Jonathan Underwood - 11.82-11 - Fix up whitespace for Ed. Bump version number. From fedora-extras-commits at redhat.com Wed May 24 21:04:15 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 14:04:15 -0700 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.12,1.13 Message-ID: <200605242104.k4OL4HbP029052@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29033 Modified Files: emacs-auctex.spec Log Message: Bump version number. Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- emacs-auctex.spec 21 May 2006 23:04:36 -0000 1.12 +++ emacs-auctex.spec 24 May 2006 21:04:15 -0000 1.13 @@ -4,23 +4,23 @@ %define textree %{_datadir}/texmf/tex/ %define previewdir %{textree}/latex/preview/ -Summary: Enhanced TeX modes for Emacsen -Name: emacs-auctex -Version: 11.82 -Release: 10%{?dist} -License: GPL -Group: Applications/Editors -URL: http://www.gnu.org/software/auctex/ -Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: auctex -Provides: auctex -Conflicts: emacspeak < 18 -Requires: emacs emacs-common ghostscript -Requires: tetex-preview = %{version} -Requires: /sbin/install-info -BuildRequires: emacs tetex-latex texinfo ghostscript +Summary: Enhanced TeX modes for Emacsen +Name: emacs-auctex +Version: 11.82 +Release: 12%{?dist} +License: GPL +Group: Applications/Editors +URL: http://www.gnu.org/software/auctex/ +Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: auctex +Provides: auctex +Conflicts: emacspeak < 18 +Requires: emacs emacs-common ghostscript +Requires: tetex-preview = %{version} +Requires: /sbin/install-info +BuildRequires: emacs tetex-latex texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting TeX files @@ -149,6 +149,12 @@ %{_datadir}/emacs/site-lisp/auctex/style/*.el %changelog +* Wed May 24 2006 Jonathan Underwood - 11.82-12 +- Bump version number. + +* Wed May 24 2006 Jonathan Underwood - 11.82-11 +- Fix up whitespace for Ed. Bump version number. + * Thu May 18 2006 Jonathan Underwood - 11.82-9 - Split out tetex-preview subpackage - Split out source elisp files From fedora-extras-commits at redhat.com Wed May 24 21:11:47 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 24 May 2006 14:11:47 -0700 Subject: rpms/cernlib/devel cernlib.spec,1.31,1.32 paw.README,1.4,1.5 Message-ID: <200605242111.k4OLBn1u029196@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29177 Modified Files: cernlib.spec paw.README Log Message: * Wed May 24 2006 Patrice Dumas - 2005-21 - compile paw statically against the cernlib (paw binaries dynamically compiled against the cernlib are still shiped). Fix 192866 Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- cernlib.spec 17 May 2006 13:02:50 -0000 1.31 +++ cernlib.spec 24 May 2006 21:11:47 -0000 1.32 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 20%{?dist} +Release: 21%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -651,9 +651,17 @@ make install.shlib chmod a+x ../shlib/*.so.* -# Build paw +# Build dynamic paw cd $CERN_ROOT/build/pawlib make %{?_smp_mflags} install.bin +cd $CERN_ROOT/ +mv bin/pawX11 bin/pawX11.dynamic +mv bin/paw++ bin/paw++.dynamic +# Build static paw +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \ + `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11 +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \ + `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++ # Build packlib cd $CERN_ROOT/build/packlib @@ -768,6 +776,8 @@ %{_bindir}/paw++ %{_bindir}/paw %{_bindir}/pawX11 +%{_bindir}/pawX11.dynamic +%{_bindir}/paw++.dynamic %dir %{_libdir}/cernlib/%{version}/bin %{_libdir}/cernlib/%{version}/bin/pawX11 %doc paw.README @@ -830,6 +840,10 @@ %changelog +* Wed May 24 2006 Patrice Dumas - 2005-21 +- compile paw statically against the cernlib (paw binaries dynamically + compiled against the cernlib are still shiped). Fix 192866 + * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/paw.README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- paw.README 11 Apr 2006 22:45:34 -0000 1.4 +++ paw.README 24 May 2006 21:11:47 -0000 1.5 @@ -41,11 +41,20 @@ to the beginning of them. -5) Shared libs +5) Shared and static libs -PAW is linked dynamically, therefore the pawlib used is selected by the +There are 2 sets of binaries installed. In one set the binaries are +statically linked with the cernlib (but still dynamically linked with +the other libraries), these are the binaries used in the default case +(pawX11 and paw++). + +The other binaries are compiled dynamically (pawX11.dynamic and +paw++.dynamic), therefore the pawlib used is selected by the /etc/ld.so.conf or $LD_LIBRARY_PATH settings. +The statically compiled one are used in the default case because +dynamically linked one fail on some 64 bit architectures. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by From fedora-extras-commits at redhat.com Wed May 24 21:38:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:38:51 -0700 Subject: rpms/perl-Test-Prereq/devel .cvsignore, 1.2, 1.3 perl-Test-Prereq.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605242138.k4OLcrqb029923@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29900 Modified Files: .cvsignore perl-Test-Prereq.spec sources Log Message: Update to 1.031. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2006 18:54:21 -0000 1.2 +++ .cvsignore 24 May 2006 21:38:51 -0000 1.3 @@ -1 +1 @@ -Test-Prereq-1.030.tar.gz +Test-Prereq-1.031.tar.gz Index: perl-Test-Prereq.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/perl-Test-Prereq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Prereq.spec 6 May 2006 18:54:21 -0000 1.1 +++ perl-Test-Prereq.spec 24 May 2006 21:38:51 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-Prereq -Version: 1.030 +Version: 1.031 Release: 1%{?dist} Summary: Check if Makefile.PL has the right pre-requisites License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 1.031-1 +- Update to 1.031. + * Fri Mar 24 2006 Steven Pritchard 1.030-1 - Specfile autogenerated by cpanspec 1.64. - Fix License. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2006 18:54:21 -0000 1.2 +++ sources 24 May 2006 21:38:51 -0000 1.3 @@ -1 +1 @@ -9acb4eb0737bb041e9ece8ad08e127c3 Test-Prereq-1.030.tar.gz +b628554b4483b01231f9d82c2a5157a8 Test-Prereq-1.031.tar.gz From fedora-extras-commits at redhat.com Wed May 24 21:40:32 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:40:32 -0700 Subject: rpms/perl-Test-Prereq/FC-5 .cvsignore, 1.2, 1.3 perl-Test-Prereq.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605242140.k4OLeYO1030082@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30059 Modified Files: .cvsignore perl-Test-Prereq.spec sources Log Message: Update to 1.031. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2006 18:54:21 -0000 1.2 +++ .cvsignore 24 May 2006 21:40:32 -0000 1.3 @@ -1 +1 @@ -Test-Prereq-1.030.tar.gz +Test-Prereq-1.031.tar.gz Index: perl-Test-Prereq.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-5/perl-Test-Prereq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Prereq.spec 6 May 2006 18:54:21 -0000 1.1 +++ perl-Test-Prereq.spec 24 May 2006 21:40:32 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-Prereq -Version: 1.030 +Version: 1.031 Release: 1%{?dist} Summary: Check if Makefile.PL has the right pre-requisites License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 1.031-1 +- Update to 1.031. + * Fri Mar 24 2006 Steven Pritchard 1.030-1 - Specfile autogenerated by cpanspec 1.64. - Fix License. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2006 18:54:21 -0000 1.2 +++ sources 24 May 2006 21:40:32 -0000 1.3 @@ -1 +1 @@ -9acb4eb0737bb041e9ece8ad08e127c3 Test-Prereq-1.030.tar.gz +b628554b4483b01231f9d82c2a5157a8 Test-Prereq-1.031.tar.gz From fedora-extras-commits at redhat.com Wed May 24 21:41:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:41:24 -0700 Subject: rpms/perl-Test-Prereq/FC-4 .cvsignore, 1.2, 1.3 perl-Test-Prereq.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605242141.k4OLfQmf030201@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30177 Modified Files: .cvsignore perl-Test-Prereq.spec sources Log Message: Update to 1.031. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2006 18:54:21 -0000 1.2 +++ .cvsignore 24 May 2006 21:41:24 -0000 1.3 @@ -1 +1 @@ -Test-Prereq-1.030.tar.gz +Test-Prereq-1.031.tar.gz Index: perl-Test-Prereq.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-4/perl-Test-Prereq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Prereq.spec 6 May 2006 18:54:21 -0000 1.1 +++ perl-Test-Prereq.spec 24 May 2006 21:41:24 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-Prereq -Version: 1.030 +Version: 1.031 Release: 1%{?dist} Summary: Check if Makefile.PL has the right pre-requisites License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 1.031-1 +- Update to 1.031. + * Fri Mar 24 2006 Steven Pritchard 1.030-1 - Specfile autogenerated by cpanspec 1.64. - Fix License. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2006 18:54:21 -0000 1.2 +++ sources 24 May 2006 21:41:24 -0000 1.3 @@ -1 +1 @@ -9acb4eb0737bb041e9ece8ad08e127c3 Test-Prereq-1.030.tar.gz +b628554b4483b01231f9d82c2a5157a8 Test-Prereq-1.031.tar.gz From fedora-extras-commits at redhat.com Wed May 24 21:52:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:52:43 -0700 Subject: rpms/perl-Module-Info/FC-4 perl-Module-Info.spec,1.1,1.2 Message-ID: <200605242152.k4OLqjem030529@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484/FC-4 Modified Files: perl-Module-Info.spec Log Message: Rebuild. Index: perl-Module-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/FC-4/perl-Module-Info.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Module-Info.spec 6 May 2006 18:47:34 -0000 1.1 +++ perl-Module-Info.spec 24 May 2006 21:52:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Module-Info Version: 0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Information about Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.30-3 +- Rebuild. + * Sat May 06 2006 Steven Pritchard 0.30-2 - Add BR: perl(Test::Pod) and perl(version). - Add Requires: perl(version). From fedora-extras-commits at redhat.com Wed May 24 21:52:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:52:43 -0700 Subject: rpms/perl-Module-Info/FC-5 perl-Module-Info.spec,1.1,1.2 Message-ID: <200605242152.k4OLqjWF030533@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484/FC-5 Modified Files: perl-Module-Info.spec Log Message: Rebuild. Index: perl-Module-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/FC-5/perl-Module-Info.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Module-Info.spec 6 May 2006 18:47:34 -0000 1.1 +++ perl-Module-Info.spec 24 May 2006 21:52:43 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Module-Info Version: 0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Information about Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.30-3 +- Rebuild. + * Sat May 06 2006 Steven Pritchard 0.30-2 - Add BR: perl(Test::Pod) and perl(version). - Add Requires: perl(version). From fedora-extras-commits at redhat.com Wed May 24 21:52:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:52:44 -0700 Subject: rpms/perl-Module-Info/devel perl-Module-Info.spec,1.1,1.2 Message-ID: <200605242152.k4OLqkQC030537@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484/devel Modified Files: perl-Module-Info.spec Log Message: Rebuild. Index: perl-Module-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/devel/perl-Module-Info.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Module-Info.spec 6 May 2006 18:47:34 -0000 1.1 +++ perl-Module-Info.spec 24 May 2006 21:52:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Module-Info Version: 0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Information about Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.30-3 +- Rebuild. + * Sat May 06 2006 Steven Pritchard 0.30-2 - Add BR: perl(Test::Pod) and perl(version). - Add Requires: perl(version). From fedora-extras-commits at redhat.com Wed May 24 21:55:41 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:55:41 -0700 Subject: rpms/perl-Apache-Session/devel .cvsignore, 1.3, 1.4 perl-Apache-Session.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605242155.k4OLthAX030702@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Apache-Session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30681 Modified Files: .cvsignore perl-Apache-Session.spec sources Log Message: Update to 1.81. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Apr 2006 15:54:10 -0000 1.3 +++ .cvsignore 24 May 2006 21:55:41 -0000 1.4 @@ -1 +1 @@ -Apache-Session-1.80.tar.gz +Apache-Session-1.81.tar.gz Index: perl-Apache-Session.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/perl-Apache-Session.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Apache-Session.spec 11 Apr 2006 15:54:10 -0000 1.2 +++ perl-Apache-Session.spec 24 May 2006 21:55:41 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Apache-Session -Version: 1.80 +Version: 1.81 Release: 1%{?dist} Summary: Persistence framework for session data License: Artistic @@ -52,6 +52,9 @@ %{_mandir}/man3/Apache* %changelog +* Wed May 24 2006 Steven Pritchard 1.81-1 +- Update to 1.81. + * Tue Apr 11 2006 Steven Pritchard 1.80-1 - Update to 1.80. - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Apr 2006 15:54:10 -0000 1.3 +++ sources 24 May 2006 21:55:41 -0000 1.4 @@ -1 +1 @@ -fbb26cc28250127efc24b9e745b934f3 Apache-Session-1.80.tar.gz +942788df6c5e743333cae5816551f203 Apache-Session-1.81.tar.gz From fedora-extras-commits at redhat.com Wed May 24 22:05:42 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 24 May 2006 15:05:42 -0700 Subject: rpms/cernlib/FC-5 211-fix-comis-on-amd64.dpatch, 1.1, 1.2 cernlib.spec, 1.20, 1.21 paw.README, 1.4, 1.5 Message-ID: <200605242205.k4OM5iF5000636@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv615 Modified Files: 211-fix-comis-on-amd64.dpatch cernlib.spec paw.README Log Message: * Wed May 24 2006 Patrice Dumas - 2005-21 - compile paw statically against the cernlib (paw binaries dynamically compiled against the cernlib are still shiped). Fix 192866 Index: 211-fix-comis-on-amd64.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/211-fix-comis-on-amd64.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 211-fix-comis-on-amd64.dpatch 14 Dec 2005 16:52:26 -0000 1.1 +++ 211-fix-comis-on-amd64.dpatch 24 May 2006 22:05:42 -0000 1.2 @@ -396,8 +396,8 @@ ITMPLEN=CSTMPD(CHPATH, 256) - CHF77 ='g77 -c' - CHCC ='cc -c' -+ CHF77 ='g77 -c -fPIC' -+ CHCC ='cc -c -fPIC' ++ CHF77 ='g77 -g -c -fPIC' ++ CHCC ='cc -g -c -fPIC' #endif #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL)) ITMPLEN=CSTMPD(CHPATH, 256) Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/cernlib.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cernlib.spec 17 May 2006 15:35:10 -0000 1.20 +++ cernlib.spec 24 May 2006 22:05:42 -0000 1.21 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 20%{?dist} +Release: 21%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -651,9 +651,17 @@ make install.shlib chmod a+x ../shlib/*.so.* -# Build paw +# Build dynamic paw cd $CERN_ROOT/build/pawlib make %{?_smp_mflags} install.bin +cd $CERN_ROOT/ +mv bin/pawX11 bin/pawX11.dynamic +mv bin/paw++ bin/paw++.dynamic +# Build static paw +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \ + `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11 +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \ + `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++ # Build packlib cd $CERN_ROOT/build/packlib @@ -768,6 +776,8 @@ %{_bindir}/paw++ %{_bindir}/paw %{_bindir}/pawX11 +%{_bindir}/pawX11.dynamic +%{_bindir}/paw++.dynamic %dir %{_libdir}/cernlib/%{version}/bin %{_libdir}/cernlib/%{version}/bin/pawX11 %doc paw.README @@ -830,6 +840,10 @@ %changelog +* Wed May 24 2006 Patrice Dumas - 2005-21 +- compile paw statically against the cernlib (paw binaries dynamically + compiled against the cernlib are still shiped). Fix 192866 + * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/paw.README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- paw.README 17 May 2006 15:35:10 -0000 1.4 +++ paw.README 24 May 2006 22:05:42 -0000 1.5 @@ -41,11 +41,20 @@ to the beginning of them. -5) Shared libs +5) Shared and static libs -PAW is linked dynamically, therefore the pawlib used is selected by the +There are 2 sets of binaries installed. In one set the binaries are +statically linked with the cernlib (but still dynamically linked with +the other libraries), these are the binaries used in the default case +(pawX11 and paw++). + +The other binaries are compiled dynamically (pawX11.dynamic and +paw++.dynamic), therefore the pawlib used is selected by the /etc/ld.so.conf or $LD_LIBRARY_PATH settings. +The statically compiled one are used in the default case because +dynamically linked one fail on some 64 bit architectures. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by From fedora-extras-commits at redhat.com Wed May 24 23:25:05 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 24 May 2006 16:25:05 -0700 Subject: fedora-security/audit fe4,1.32,1.33 fe5,1.32,1.33 Message-ID: <200605242325.k4ONP5YI003625@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3603 Modified Files: fe4 fe5 Log Message: Note a new netpanzer CVE id. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fe4 24 May 2006 17:21:26 -0000 1.32 +++ fe4 24 May 2006 23:25:02 -0000 1.33 @@ -2,7 +2,7 @@ ** are items that need attention -none VULNERABLE (netpanzer) bz#192983 +CVE-2006-2575 VULNERABLE (netpanzer) bz#192983 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fe5 24 May 2006 17:21:26 -0000 1.32 +++ fe5 24 May 2006 23:25:02 -0000 1.33 @@ -2,7 +2,7 @@ ** are items that need attention -none VULNERABLE (netpanzer) bz#192983 +CVE-2006-2575 VULNERABLE (netpanzer) bz#192983 CVE-2006-2453 VULNERABLE (dia) bz#192830 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2480 patch (dia, fixed 0.95-2) bz#192535 From fedora-extras-commits at redhat.com Wed May 24 23:34:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 16:34:42 -0700 Subject: rpms/perl-DateTime/devel .cvsignore, 1.5, 1.6 perl-DateTime.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200605242334.k4ONYiL5003733@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-DateTime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3711 Modified Files: .cvsignore perl-DateTime.spec sources Log Message: Update DateTime to 0.31. Update DateTime::TimeZone to 0.46. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Feb 2006 16:49:48 -0000 1.5 +++ .cvsignore 24 May 2006 23:34:41 -0000 1.6 @@ -1,3 +1,3 @@ -DateTime-0.30.tar.gz +DateTime-0.31.tar.gz DateTime-Locale-0.22.tar.gz -DateTime-TimeZone-0.42.tar.gz +DateTime-TimeZone-0.46.tar.gz Index: perl-DateTime.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/perl-DateTime.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime.spec 27 Feb 2006 16:49:48 -0000 1.4 +++ perl-DateTime.spec 24 May 2006 23:34:41 -0000 1.5 @@ -1,9 +1,9 @@ -%define DTTimeZone_version 0.42 +%define DTTimeZone_version 0.46 %define DTLocale_version 0.22 Name: perl-DateTime -Version: 0.30 -Release: 3%{?dist} +Version: 0.31 +Release: 1%{?dist} Epoch: 1 Summary: DateTime Perl module License: GPL or Artistic @@ -126,6 +126,10 @@ %{perl_vendorarch}/DateTime*.pm %changelog +* Wed May 24 2006 Steven Pritchard 1:0.31-1 +- Update DateTime to 0.31. +- Update DateTime::TimeZone to 0.46. + * Mon Feb 27 2006 Steven Pritchard 1:0.30-3 - Bump Epoch (argh, 0.2901 > 0.30 to rpm) - Update DateTime::TimeZone to 0.42 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Feb 2006 16:49:48 -0000 1.5 +++ sources 24 May 2006 23:34:41 -0000 1.6 @@ -1,3 +1,3 @@ -18cf4a7cece737e0a153c6585320730f DateTime-0.30.tar.gz +f5142045e7e68c02a310405e994f8233 DateTime-0.31.tar.gz bcf9fa78efa8d00fad1293b9d860ce75 DateTime-Locale-0.22.tar.gz -08979eba66aee3b7db2317729ea0787e DateTime-TimeZone-0.42.tar.gz +fe52d18c393d3e7841be0aba972e4e43 DateTime-TimeZone-0.46.tar.gz From fedora-extras-commits at redhat.com Thu May 25 00:17:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 17:17:53 -0700 Subject: rpms/perl-IO-All/devel .cvsignore, 1.2, 1.3 perl-IO-All.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605250017.k4P0Hth9006371@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6350 Modified Files: .cvsignore perl-IO-All.spec sources Log Message: Update to 0.35. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 01:22:22 -0000 1.2 +++ .cvsignore 25 May 2006 00:17:53 -0000 1.3 @@ -1 +1 @@ -IO-All-0.33.tar.gz +IO-All-0.35.tar.gz Index: perl-IO-All.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/perl-IO-All.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-IO-All.spec 10 Mar 2006 22:36:04 -0000 1.2 +++ perl-IO-All.spec 25 May 2006 00:17:53 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-IO-All -Version: 0.33 -Release: 3%{?dist} +Version: 0.35 +Release: 1%{?dist} Summary: IO::All Perl module License: GPL or Artistic Group: Development/Libraries @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.35-1 +- Update to 0.35. + * Fri Mar 10 2006 Steven Pritchard 0.33-3 - Change dep filter. - Various cleanups to match current cpanspec. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 01:22:22 -0000 1.2 +++ sources 25 May 2006 00:17:53 -0000 1.3 @@ -1 +1 @@ -7e9e83dc8ec4404d79ee73af08f6421f IO-All-0.33.tar.gz +feea9663b97eb78abac4d956dde72f08 IO-All-0.35.tar.gz From fedora-extras-commits at redhat.com Thu May 25 00:34:15 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 17:34:15 -0700 Subject: rpms/perl-Locale-Maketext-Simple/devel .cvsignore, 1.3, 1.4 perl-Locale-Maketext-Simple.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605250034.k4P0YHoF006601@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6579 Modified Files: .cvsignore perl-Locale-Maketext-Simple.spec sources Log Message: Update to 0.16. License has changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 20:16:46 -0000 1.3 +++ .cvsignore 25 May 2006 00:34:15 -0000 1.4 @@ -1 +1 @@ -Locale-Maketext-Simple-0.13.tar.gz +Locale-Maketext-Simple-0.16.tar.gz Index: perl-Locale-Maketext-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/perl-Locale-Maketext-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Locale-Maketext-Simple.spec 21 Apr 2006 20:16:46 -0000 1.2 +++ perl-Locale-Maketext-Simple.spec 25 May 2006 00:34:15 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Locale-Maketext-Simple -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Simple interface to Locale::Maketext::Lexicon -License: GPL or Artistic +License: MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Simple/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Simple-%{version}.tar.gz @@ -47,6 +47,10 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.16-1 +- Update to 0.16. +- License has changed to MIT. + * Fri Apr 21 2006 Steven Pritchard 0.13-1 - Update to 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 20:16:46 -0000 1.3 +++ sources 25 May 2006 00:34:15 -0000 1.4 @@ -1 +1 @@ -bedbbbd4ca43a1c053f11abfc1e6b2e1 Locale-Maketext-Simple-0.13.tar.gz +d6dd0e79802f30d0eef723ec23021f60 Locale-Maketext-Simple-0.16.tar.gz From fedora-extras-commits at redhat.com Thu May 25 00:47:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 17:47:52 -0700 Subject: rpms/perl-Locale-Maketext-Simple/FC-5 .cvsignore, 1.3, 1.4 perl-Locale-Maketext-Simple.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605250047.k4P0ls1Q006777@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6754 Modified Files: .cvsignore perl-Locale-Maketext-Simple.spec sources Log Message: Update to 0.16. License has changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 20:18:13 -0000 1.3 +++ .cvsignore 25 May 2006 00:47:52 -0000 1.4 @@ -1 +1 @@ -Locale-Maketext-Simple-0.13.tar.gz +Locale-Maketext-Simple-0.16.tar.gz Index: perl-Locale-Maketext-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/perl-Locale-Maketext-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Locale-Maketext-Simple.spec 21 Apr 2006 20:18:13 -0000 1.2 +++ perl-Locale-Maketext-Simple.spec 25 May 2006 00:47:52 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Locale-Maketext-Simple -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Simple interface to Locale::Maketext::Lexicon -License: GPL or Artistic +License: MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Simple/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Simple-%{version}.tar.gz @@ -47,6 +47,10 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.16-1 +- Update to 0.16. +- License has changed to MIT. + * Fri Apr 21 2006 Steven Pritchard 0.13-1 - Update to 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 20:18:13 -0000 1.3 +++ sources 25 May 2006 00:47:52 -0000 1.4 @@ -1 +1 @@ -bedbbbd4ca43a1c053f11abfc1e6b2e1 Locale-Maketext-Simple-0.13.tar.gz +d6dd0e79802f30d0eef723ec23021f60 Locale-Maketext-Simple-0.16.tar.gz From fedora-extras-commits at redhat.com Thu May 25 00:49:40 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 17:49:40 -0700 Subject: rpms/perl-Locale-Maketext-Simple/FC-4 .cvsignore, 1.3, 1.4 perl-Locale-Maketext-Simple.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605250049.k4P0ngQg006850@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6828 Modified Files: .cvsignore perl-Locale-Maketext-Simple.spec sources Log Message: Update to 0.16. License has changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 20:18:44 -0000 1.3 +++ .cvsignore 25 May 2006 00:49:40 -0000 1.4 @@ -1 +1 @@ -Locale-Maketext-Simple-0.13.tar.gz +Locale-Maketext-Simple-0.16.tar.gz Index: perl-Locale-Maketext-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/perl-Locale-Maketext-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Locale-Maketext-Simple.spec 21 Apr 2006 20:18:44 -0000 1.2 +++ perl-Locale-Maketext-Simple.spec 25 May 2006 00:49:40 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Locale-Maketext-Simple -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Simple interface to Locale::Maketext::Lexicon -License: GPL or Artistic +License: MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Simple/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Simple-%{version}.tar.gz @@ -47,6 +47,10 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.16-1 +- Update to 0.16. +- License has changed to MIT. + * Fri Apr 21 2006 Steven Pritchard 0.13-1 - Update to 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 20:18:44 -0000 1.3 +++ sources 25 May 2006 00:49:40 -0000 1.4 @@ -1 +1 @@ -bedbbbd4ca43a1c053f11abfc1e6b2e1 Locale-Maketext-Simple-0.13.tar.gz +d6dd0e79802f30d0eef723ec23021f60 Locale-Maketext-Simple-0.16.tar.gz From fedora-extras-commits at redhat.com Thu May 25 01:01:03 2006 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Wed, 24 May 2006 18:01:03 -0700 Subject: CVSROOT avail,1.34,1.35 Message-ID: <200605250101.k4P113cG008847@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7001 Modified Files: avail Log Message: Now Eitch can publish translations himself, hoorah. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- avail 10 May 2006 13:48:44 -0000 1.34 +++ avail 25 May 2006 01:01:01 -0000 1.35 @@ -56,4 +56,4 @@ avail | pfrields,mjohnson | web/html/participate/documentation-quick-start avail | pfrields | web/html/participate/developers-guide avail | tchung | web/html/News -avail | elliss | web/html/docs +avail | elliss,eitch | web/html/docs From fedora-extras-commits at redhat.com Thu May 25 07:22:41 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Thu, 25 May 2006 00:22:41 -0700 Subject: rpms/rsnapshot/devel .cvsignore, 1.4, 1.5 rsnapshot.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605250722.k4P7Mh6X025912@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25891 Modified Files: .cvsignore rsnapshot.spec sources Log Message: new rsnapshot version: 1.2.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2006 23:34:16 -0000 1.4 +++ .cvsignore 25 May 2006 07:22:41 -0000 1.5 @@ -1 +1 @@ -rsnapshot-1.2.3.tar.gz +rsnapshot-1.2.9.tar.gz Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rsnapshot.spec 21 May 2006 04:20:15 -0000 1.7 +++ rsnapshot.spec 25 May 2006 07:22:41 -0000 1.8 @@ -3,8 +3,8 @@ # Name: rsnapshot -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.2.9 +Release: 1%{?dist} Summary: Local and remote filesystem snapshot utility Group: Applications/System @@ -71,6 +71,9 @@ # Rename the installed .default config file to a usable name mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf +# Change the perms on the utils/ files so rpm doesn't pick up their dependencies +find utils/ -type f -print0 | xargs -r0 chmod 644 + ################################################################################ %post @@ -117,6 +120,9 @@ %changelog +* Sat May 21 2006 Chris Petersen 1.2.9-1 +- Preliminary build for 1.2.9 + * Wed May 17 2006 Chris Petersen 1.2.3-2 - Add rsync and openssh-clients build requirements because the configure script checks for them. - Remove perl requirement because it's detected by rpm. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2006 23:34:16 -0000 1.4 +++ sources 25 May 2006 07:22:41 -0000 1.5 @@ -1 +1 @@ -b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz +68632bc6cdd9c149e0fdeb9e246622d3 rsnapshot-1.2.9.tar.gz From fedora-extras-commits at redhat.com Thu May 25 07:49:13 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 25 May 2006 00:49:13 -0700 Subject: rpms/paps/devel paps-0.6.6-encoding.patch, NONE, 1.1 paps-0.6.6-segfault.patch, NONE, 1.1 paps.spec, 1.10, 1.11 Message-ID: <200605250749.k4P7nFJA026150@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26127 Modified Files: paps.spec Added Files: paps-0.6.6-encoding.patch paps-0.6.6-segfault.patch Log Message: * Thu May 25 2006 Akira TAGOH - 0.6.6-2 - paps-0.6.6-encoding.patch: support --encoding option to be able to convert the input file to UTF-8. - paps-0.6.6-segfault.patch: fixed a possible segfault issue when reading is failed. paps-0.6.6-encoding.patch: --- NEW FILE paps-0.6.6-encoding.patch --- diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c --- paps-0.6.6.orig/src/paps.c 2006-05-25 13:23:07.000000000 +0900 +++ paps-0.6.6/src/paps.c 2006-05-25 14:55:03.000000000 +0900 @@ -105,7 +105,8 @@ /* Information passed in user data when drawing outlines */ GList *split_paragraphs_into_lines (GList *paragraphs); -static char *read_file (FILE *file); +static char *read_file (FILE *file, + GIConv *handle); static GList *split_text_into_paragraphs (PangoContext *pango_context, page_layout_t *page_layout, int paint_width, @@ -188,7 +189,7 @@ gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE, do_draw_header = FALSE; int num_columns = 1, font_scale = 12; int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36; - char *font_family = "Monospace"; + char *font_family = "Monospace", *encoding = NULL; GOptionContext *ctxt = g_option_context_new("[text file]"); GOptionEntry entries[] = { {"landscape", 0, 0, G_OPTION_ARG_NONE, &do_landscape, "Landscape output. (Default: portrait)", NULL}, @@ -205,6 +206,7 @@ {"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"}, {"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"}, {"header", 0, 0, G_OPTION_ARG_NONE, &do_draw_header, "Draw page header for each page.", NULL}, + {"encoding", 0, 0, G_OPTION_ARG_STRING, &encoding, "Assume the documentation encoding.", "ENCODING"}, {NULL} }; GError *error = NULL; @@ -228,6 +230,7 @@ gchar *paps_header = NULL; gchar *header_font_desc = "Monospace Bold 12"; int header_sep = 20; + GIConv *cvh = NULL; /* Prerequisite when using glib. */ g_type_init(); @@ -339,7 +342,21 @@ page_layout.filename = filename_in; page_layout.header_font_desc = header_font_desc; - text = read_file(IN); + if (encoding != NULL) + { + cvh = g_iconv_open ("UTF-8", encoding); + if (cvh == NULL) + { + fprintf(stderr, "%s: Invalid encoding: %s\n", g_get_prgname (), encoding); + exit(-1); + } + } + + text = read_file(IN, cvh); + + if (encoding != NULL && cvh != NULL) + g_iconv_close(cvh); + paragraphs = split_text_into_paragraphs(pango_context, &page_layout, page_layout.column_width * page_layout.pt_to_pixel, @@ -373,7 +390,8 @@ /* Read an entire file into a string */ static char * -read_file (FILE *file) +read_file (FILE *file, + GIConv *handle) { GString *inbuf; char *text; @@ -382,7 +400,9 @@ inbuf = g_string_new (NULL); while (1) { - char *bp = fgets (buffer, BUFSIZE-1, file); + char *ib, *ob, obuffer[BUFSIZE * 6], *bp = fgets (buffer, BUFSIZE-1, file); + gsize iblen, oblen; + if (ferror (file)) { fprintf(stderr, "%s: Error reading file.\n", g_get_prgname ()); @@ -392,7 +412,19 @@ else if (bp == NULL) break; - g_string_append (inbuf, buffer); + if (handle != NULL) + { + ib = bp; + iblen = strlen (ib); + ob = bp = obuffer; + oblen = BUFSIZE * 6 - 1; + if (g_iconv (handle, &ib, &iblen, &ob, &oblen) == -1) + { + fprintf (stderr, "%s: Error while converting strings.\n", g_get_prgname ()); + return NULL; + } + } + g_string_append (inbuf, bp); } fclose (file); paps-0.6.6-segfault.patch: --- NEW FILE paps-0.6.6-segfault.patch --- diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c --- paps-0.6.6.orig/src/paps.c 2006-05-25 15:12:02.000000000 +0900 +++ paps-0.6.6/src/paps.c 2006-05-25 15:15:58.000000000 +0900 @@ -453,7 +453,7 @@ GList *result = NULL; char *last_para = text; - while (*p) + while (p != NULL && *p) { wc = g_utf8_get_char (p); next = g_utf8_next_char (p); Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- paps.spec 19 May 2006 10:16:31 -0000 1.10 +++ paps.spec 25 May 2006 07:49:13 -0000 1.11 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -9,6 +9,8 @@ BuildRequires: pango-devel Patch0: paps-makefile.patch Patch2: paps-0.6.3-formfeed.patch +Patch3: paps-0.6.6-encoding.patch +Patch4: paps-0.6.6-segfault.patch Summary: Plain Text to PostScript converter Group: Applications/Publishing @@ -20,6 +22,8 @@ %setup -q %patch0 -p1 -b .makefile %patch2 -p1 -b .formfeed +%patch3 -p1 -b .encoding +%patch4 -p1 -b .segfault aclocal automake autoconf @@ -47,6 +51,12 @@ %changelog +* Thu May 25 2006 Akira TAGOH - 0.6.6-2 +- paps-0.6.6-encoding.patch: support --encoding option to be able to convert + the input file to UTF-8. +- paps-0.6.6-segfault.patch: fixed a possible segfault issue when reading is + failed. + * Fri May 19 2006 Akira TAGOH - 0.6.6-1 - New upstream release. From fedora-extras-commits at redhat.com Thu May 25 07:52:53 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 25 May 2006 00:52:53 -0700 Subject: rpms/w3m-el/devel w3m-el.spec,1.4,1.5 Message-ID: <200605250752.k4P7qtZP026550@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/w3m-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26525 Modified Files: w3m-el.spec Log Message: * Thu May 25 2006 Akira TAGOH - 1.4.2-4 - rebuilt to be correct dist tag. Index: w3m-el.spec =================================================================== RCS file: /cvs/extras/rpms/w3m-el/devel/w3m-el.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- w3m-el.spec 24 May 2006 10:17:56 -0000 1.4 +++ w3m-el.spec 25 May 2006 07:52:52 -0000 1.5 @@ -2,7 +2,7 @@ Name: w3m-el Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ BuildArch: noarch @@ -133,6 +133,9 @@ %{_infodir}/* %changelog +* Thu May 25 2006 Akira TAGOH - 1.4.2-4 +- rebuilt to be correct dist tag. + * Wed May 24 2006 Akira TAGOH - 1.4.2-3 - packaged as noarch. (#192610) From fedora-extras-commits at redhat.com Thu May 25 09:09:57 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 25 May 2006 02:09:57 -0700 Subject: rpms/cernlib/FC-3 211-fix-comis-on-amd64.dpatch, 1.1, 1.2 cernlib.spec, 1.18, 1.19 paw.README, 1.4, 1.5 Message-ID: <200605250909.k4P99xYw001928@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1891/FC-3 Modified Files: 211-fix-comis-on-amd64.dpatch cernlib.spec paw.README Log Message: * Wed May 24 2006 Patrice Dumas - 2005-21 - compile paw statically against the cernlib (paw binaries dynamically compiled against the cernlib are still shiped). Fix 192866 Index: 211-fix-comis-on-amd64.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/211-fix-comis-on-amd64.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 211-fix-comis-on-amd64.dpatch 15 Dec 2005 12:07:03 -0000 1.1 +++ 211-fix-comis-on-amd64.dpatch 25 May 2006 09:09:57 -0000 1.2 @@ -396,8 +396,8 @@ ITMPLEN=CSTMPD(CHPATH, 256) - CHF77 ='g77 -c' - CHCC ='cc -c' -+ CHF77 ='g77 -c -fPIC' -+ CHCC ='cc -c -fPIC' ++ CHF77 ='g77 -g -c -fPIC' ++ CHCC ='cc -g -c -fPIC' #endif #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL)) ITMPLEN=CSTMPD(CHPATH, 256) Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- cernlib.spec 17 May 2006 21:00:13 -0000 1.18 +++ cernlib.spec 25 May 2006 09:09:57 -0000 1.19 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 20%{?dist} +Release: 21%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -651,9 +651,17 @@ make install.shlib chmod a+x ../shlib/*.so.* -# Build paw +# Build dynamic paw cd $CERN_ROOT/build/pawlib make %{?_smp_mflags} install.bin +cd $CERN_ROOT/ +mv bin/pawX11 bin/pawX11.dynamic +mv bin/paw++ bin/paw++.dynamic +# Build static paw +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \ + `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11 +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \ + `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++ # Build packlib cd $CERN_ROOT/build/packlib @@ -768,6 +776,8 @@ %{_bindir}/paw++ %{_bindir}/paw %{_bindir}/pawX11 +%{_bindir}/pawX11.dynamic +%{_bindir}/paw++.dynamic %dir %{_libdir}/cernlib/%{version}/bin %{_libdir}/cernlib/%{version}/bin/pawX11 %doc paw.README @@ -830,6 +840,10 @@ %changelog +* Wed May 24 2006 Patrice Dumas - 2005-21 +- compile paw statically against the cernlib (paw binaries dynamically + compiled against the cernlib are still shiped). Fix 192866 + * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- paw.README 17 May 2006 21:00:13 -0000 1.4 +++ paw.README 25 May 2006 09:09:57 -0000 1.5 @@ -41,11 +41,20 @@ to the beginning of them. -5) Shared libs +5) Shared and static libs -PAW is linked dynamically, therefore the pawlib used is selected by the +There are 2 sets of binaries installed. In one set the binaries are +statically linked with the cernlib (but still dynamically linked with +the other libraries), these are the binaries used in the default case +(pawX11 and paw++). + +The other binaries are compiled dynamically (pawX11.dynamic and +paw++.dynamic), therefore the pawlib used is selected by the /etc/ld.so.conf or $LD_LIBRARY_PATH settings. +The statically compiled one are used in the default case because +dynamically linked one fail on some 64 bit architectures. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by From fedora-extras-commits at redhat.com Thu May 25 09:09:57 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 25 May 2006 02:09:57 -0700 Subject: rpms/cernlib/FC-4 211-fix-comis-on-amd64.dpatch, 1.1, 1.2 cernlib.spec, 1.24, 1.25 paw.README, 1.4, 1.5 Message-ID: <200605250910.k4P99x7e001934@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1891/FC-4 Modified Files: 211-fix-comis-on-amd64.dpatch cernlib.spec paw.README Log Message: * Wed May 24 2006 Patrice Dumas - 2005-21 - compile paw statically against the cernlib (paw binaries dynamically compiled against the cernlib are still shiped). Fix 192866 Index: 211-fix-comis-on-amd64.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/211-fix-comis-on-amd64.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 211-fix-comis-on-amd64.dpatch 14 Dec 2005 16:15:57 -0000 1.1 +++ 211-fix-comis-on-amd64.dpatch 25 May 2006 09:09:57 -0000 1.2 @@ -396,8 +396,8 @@ ITMPLEN=CSTMPD(CHPATH, 256) - CHF77 ='g77 -c' - CHCC ='cc -c' -+ CHF77 ='g77 -c -fPIC' -+ CHCC ='cc -c -fPIC' ++ CHF77 ='g77 -g -c -fPIC' ++ CHCC ='cc -g -c -fPIC' #endif #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL)) ITMPLEN=CSTMPD(CHPATH, 256) Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- cernlib.spec 17 May 2006 19:02:42 -0000 1.24 +++ cernlib.spec 25 May 2006 09:09:57 -0000 1.25 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 20%{?dist} +Release: 21%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -651,9 +651,17 @@ make install.shlib chmod a+x ../shlib/*.so.* -# Build paw +# Build dynamic paw cd $CERN_ROOT/build/pawlib make %{?_smp_mflags} install.bin +cd $CERN_ROOT/ +mv bin/pawX11 bin/pawX11.dynamic +mv bin/paw++ bin/paw++.dynamic +# Build static paw +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \ + `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11 +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \ + `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++ # Build packlib cd $CERN_ROOT/build/packlib @@ -768,6 +776,8 @@ %{_bindir}/paw++ %{_bindir}/paw %{_bindir}/pawX11 +%{_bindir}/pawX11.dynamic +%{_bindir}/paw++.dynamic %dir %{_libdir}/cernlib/%{version}/bin %{_libdir}/cernlib/%{version}/bin/pawX11 %doc paw.README @@ -830,6 +840,10 @@ %changelog +* Wed May 24 2006 Patrice Dumas - 2005-21 +- compile paw statically against the cernlib (paw binaries dynamically + compiled against the cernlib are still shiped). Fix 192866 + * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/paw.README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- paw.README 17 May 2006 19:02:42 -0000 1.4 +++ paw.README 25 May 2006 09:09:57 -0000 1.5 @@ -41,11 +41,20 @@ to the beginning of them. -5) Shared libs +5) Shared and static libs -PAW is linked dynamically, therefore the pawlib used is selected by the +There are 2 sets of binaries installed. In one set the binaries are +statically linked with the cernlib (but still dynamically linked with +the other libraries), these are the binaries used in the default case +(pawX11 and paw++). + +The other binaries are compiled dynamically (pawX11.dynamic and +paw++.dynamic), therefore the pawlib used is selected by the /etc/ld.so.conf or $LD_LIBRARY_PATH settings. +The statically compiled one are used in the default case because +dynamically linked one fail on some 64 bit architectures. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by From fedora-extras-commits at redhat.com Thu May 25 10:21:45 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 25 May 2006 03:21:45 -0700 Subject: fedora-security/audit fc4,1.263,1.264 fc5,1.176,1.177 Message-ID: <200605251021.k4PALjOt004693@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4673 Modified Files: fc4 fc5 Log Message: CVE updates and FC releases yesterday Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- fc4 24 May 2006 09:04:44 -0000 1.263 +++ fc4 25 May 2006 10:21:42 -0000 1.264 @@ -1,13 +1,13 @@ -Up to date CVE as of CVE email 20060523 -Up to date FC4 as of 20060523 +Up to date CVE as of CVE email 20060524 +Up to date FC4 as of 20060524 ** are items that need attention CVE-2006-2493 ** freetype -CVE-2006-2480 VULNERABLE (dia) #192538 -CVE-2006-2453 VULNERABLE (dia) #192538 +CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] +CVE-2006-2453 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) -CVE-2006-2440 VULNERABLE (ImageMagick) #192279 +CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-587] CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] CVE-2006-2366 VULNERABLE (openobex) #192087 @@ -47,7 +47,8 @@ CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 version (kernel, fixed 2.6.16.14) [since FEDORA-2006-517] CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] -CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 +CVE-2006-1862 ** kernel +CVE-2006-1861 VULNERABLE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 version (kernel, fixed 2.6.16.16) [since FEDORA-2006-573] CVE-2006-1859 version (kernel, fixed 2.6.16.16) [since FEDORA-2006-573] CVE-2006-1858 version (kernel, fixed 2.6.16.17) [since FEDORA-2006-573] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- fc5 24 May 2006 09:04:44 -0000 1.176 +++ fc5 25 May 2006 10:21:42 -0000 1.177 @@ -1,11 +1,11 @@ -Up to date CVE as of CVE email 20060523 -Up to date FC5 as of 20060523 +Up to date CVE as of CVE email 20060524 +Up to date FC5 as of 20060524 ** are items that need attention CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) -CVE-2006-2440 VULNERABLE (ImageMagick) #192279 +CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-588] CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] CVE-2006-2366 VULNERABLE (openobex) #192087 @@ -46,6 +46,7 @@ CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] +CVE-2006-1862 ** kernel CVE-2006-1861 VULNERABLE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 version (kernel, fixed 2.6.16.16) [since FEDORA-2006-572] CVE-2006-1859 version (kernel, fixed 2.6.16.16) [since FEDORA-2006-572] From fedora-extras-commits at redhat.com Thu May 25 11:55:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 25 May 2006 04:55:01 -0700 Subject: rpms/lyx/FC-4 lyx.spec,1.23,1.24 Message-ID: <200605251155.k4PBt3eG007831@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7814 Modified Files: lyx.spec Log Message: * Thu May 25 2006 Rex Dieter 1.4.1-7.1 - fc4: drop Requires: tetex-preview, it's not ready yet. Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- lyx.spec 24 May 2006 14:01:28 -0000 1.23 +++ lyx.spec 25 May 2006 11:55:01 -0000 1.24 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 7%{?dist} +Release: 7%{?dist}.1 License: GPL Group: Applications/Publishing @@ -54,6 +54,9 @@ %if "%{?fedora}" > "3" # dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost +%endif +# tetex-preview isn't ready for prime-time on FC-4, yet. -- Rex +%if "%{?fedora}" > "4" Requires(hint): tetex-preview %endif @@ -213,6 +216,9 @@ %changelog +* Thu May 25 2006 Rex Dieter 1.4.1-7.1 +- fc4: drop Requires: tetex-preview, it's not ready yet. + * Wed May 24 2006 Rex Dieter 1.4.1-7 - use serverpipe "~/.lyx/lyxpipe" instead, that was the old default and what pybibliographer expects. From fedora-extras-commits at redhat.com Thu May 25 11:55:44 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 04:55:44 -0700 Subject: rpms/synaptic/FC-4 synaptic.spec,1.12,1.13 Message-ID: <200605251155.k4PBtkZ6007918@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/FC-4 Modified Files: synaptic.spec Log Message: Enable 64-bit builds again (#193075) Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/synaptic.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- synaptic.spec 14 Jul 2005 06:26:51 -0000 1.12 +++ synaptic.spec 25 May 2006 11:55:44 -0000 1.13 @@ -3,24 +3,28 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 1%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz Patch0: synaptic-0.57-desktop.patch Patch1: synaptic-0.57-firefox.patch +# Patches from apt-rpm maintainer for gcc 4.1 support, repomd support +# and progress meter fixes +Patch2: http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch +Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch +Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 +BuildRequires: apt-devel >= 0.5.15lorg3.1, rpm-devel >= 4.0 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper -ExcludeArch: x86_64 ppc64 %description Synaptic is a graphical package management @@ -31,6 +35,9 @@ %setup -q %patch0 -p1 -b .dt %patch1 -p1 -b .firefox +%patch2 -p1 -b .gcc41 +%patch3 -p1 -b .repomd +%patch4 -p1 -b .showprog %build %configure --disable-dependency-tracking @@ -99,6 +106,19 @@ %{_mandir}/man8/%{name}.8* %changelog +* Thu May 25 2006 Axel Thimm +- Enable 64-bit builds again (#193075 by Deji Akingunola). + +* Sat May 20 2006 Axel Thimm - 0.57.2-4 +- Add repomd support, gcc 4.1 build support, progress meter fixes (all + from apt-rpm upstream). + +* Wed Dec 14 2005 Deji Akingunola - 0.57.2-3 +- Rebuild for new openssl and apt in devel. + +* Wed Aug 17 2005 Ville Skytt?? - 0.57.2-2 +- Rebuild for new libcairo in devel. + * Tue Jul 12 2005 Panu Matilainen 0.57.2-1 - remove explicit yelp dependency, add support for browsing help with firefox (#163036) From fedora-extras-commits at redhat.com Thu May 25 11:55:45 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 04:55:45 -0700 Subject: rpms/synaptic/FC-5 synaptic.spec,1.16,1.17 Message-ID: <200605251155.k4PBtluc007922@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/FC-5 Modified Files: synaptic.spec Log Message: Enable 64-bit builds again (#193075) Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-5/synaptic.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- synaptic.spec 14 Dec 2005 17:51:18 -0000 1.16 +++ synaptic.spec 25 May 2006 11:55:45 -0000 1.17 @@ -3,24 +3,28 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 3%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz Patch0: synaptic-0.57-desktop.patch Patch1: synaptic-0.57-firefox.patch +# Patches from apt-rpm maintainer for gcc 4.1 support, repomd support +# and progress meter fixes +Patch2: http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch +Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch +Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 +BuildRequires: apt-devel >= 0.5.15lorg3.1, rpm-devel >= 4.0 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper -ExcludeArch: x86_64 ppc64 %description Synaptic is a graphical package management @@ -31,6 +35,9 @@ %setup -q %patch0 -p1 -b .dt %patch1 -p1 -b .firefox +%patch2 -p1 -b .gcc41 +%patch3 -p1 -b .repomd +%patch4 -p1 -b .showprog %build %configure --disable-dependency-tracking @@ -99,6 +106,13 @@ %{_mandir}/man8/%{name}.8* %changelog +* Thu May 25 2006 Axel Thimm +- Enable 64-bit builds again (#193075 by Deji Akingunola). + +* Sat May 20 2006 Axel Thimm - 0.57.2-4 +- Add repomd support, gcc 4.1 build support, progress meter fixes (all + from apt-rpm upstream). + * Wed Dec 14 2005 Deji Akingunola - 0.57.2-3 - Rebuild for new openssl and apt in devel. From fedora-extras-commits at redhat.com Thu May 25 11:55:45 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 04:55:45 -0700 Subject: rpms/synaptic/devel synaptic.spec,1.17,1.18 Message-ID: <200605251155.k4PBtlUM007926@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/devel Modified Files: synaptic.spec Log Message: Enable 64-bit builds again (#193075) Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- synaptic.spec 20 May 2006 17:09:21 -0000 1.17 +++ synaptic.spec 25 May 2006 11:55:45 -0000 1.18 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System @@ -25,7 +25,6 @@ BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper -ExcludeArch: x86_64 ppc64 %description Synaptic is a graphical package management @@ -107,6 +106,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Thu May 25 2006 Axel Thimm +- Enable 64-bit builds again (#193075 by Deji Akingunola). + * Sat May 20 2006 Axel Thimm - 0.57.2-4 - Add repomd support, gcc 4.1 build support, progress meter fixes (all from apt-rpm upstream). From fedora-extras-commits at redhat.com Thu May 25 12:18:46 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 25 May 2006 05:18:46 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo.spec,1.21,1.22 Message-ID: <200605251218.k4PCImA5010554@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10537 Modified Files: xemacs-sumo.spec Log Message: * Thu May 25 2006 Ville Skytt?? - 20060510-2.1 - Fix indentation in haskell-mode with XEmacs < 21.5 (#192481). Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xemacs-sumo.spec 13 May 2006 09:15:44 -0000 1.21 +++ xemacs-sumo.spec 25 May 2006 12:18:46 -0000 1.22 @@ -9,7 +9,7 @@ Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: XEmacs lisp packages Group: Applications/Editors @@ -105,6 +105,11 @@ # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch15 -p0 +# fix indentation in haskell-mode with XEmacs < 21.5, #192481 +sed -i -e s/line-beginning-position/point-at-bol/g -e \ + s/line-end-position/point-at-eol/g \ + xemacs-packages/lisp/haskell-mode/haskell-*indent.el + sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \ xemacs-packages/etc/bbdb/*.pl @@ -228,6 +233,9 @@ %changelog +* Thu May 25 2006 Ville Skytt?? - 20060510-2.1 +- Fix indentation in haskell-mode with XEmacs < 21.5 (#192481). + * Sat May 13 2006 Ville Skytt?? - 20060510-2 - Try to work around build system quirks in finding the XEmacs version. From fedora-extras-commits at redhat.com Thu May 25 12:26:59 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 25 May 2006 05:26:59 -0700 Subject: rpms/xmms/devel xmms-1.2.10-multidevel.patch, NONE, 1.1 xmms.spec, 1.21, 1.22 xmms-1.2.10-extra_libs.patch, 1.1, NONE Message-ID: <200605251227.k4PCR173010649@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10629 Modified Files: xmms.spec Added Files: xmms-1.2.10-multidevel.patch Removed Files: xmms-1.2.10-extra_libs.patch Log Message: * Thu May 25 2006 Ville Skytt?? - 1:1.2.10-25 - Avoid multilib conflicts in -devel, introducing xmms.pc. - Include license text in -libs. xmms-1.2.10-multidevel.patch: --- NEW FILE xmms-1.2.10-multidevel.patch --- --- xmms-1.2.10/xmms-config.in~ 2001-04-06 03:35:49.000000000 +0300 +++ xmms-1.2.10/xmms-config.in 2006-05-25 00:22:21.000000000 +0300 @@ -18,24 +18,6 @@ data_dir="@datadir@/@PACKAGE@" version="@VERSION@" -include_dir="@includedir@" -xmms_include_dir="@includedir@/@PACKAGE@" -lib_dir="@libdir@" - -if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` - gtk_cflags=`gtk-config --cflags` -else - gtk_libs="@GTK_LIBS@" - gtk_cflags="@GTK_CFLAGS@" -fi - -plugin_dir="@plugindir@" -visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@" -input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@" -output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@" -effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@" -general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@" usage() { @@ -146,24 +128,12 @@ echo $exec_prefix fi -if test "$include_dir" != "/usr/include"; then - cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags" -else - cflags="-I$xmms_include_dir $gtk_cflags" -fi - -if test "$lib_dir" != "/usr/lib"; then - libs="-L$lib_dir $gtk_libs -lxmms" -else - libs="$gtk_libs -lxmms" -fi - if test "$echo_cflags" = "yes"; then - echo $cflags + pkg-config xmms --cflags fi if test "$echo_libs" = "yes"; then - echo $libs + pkg-config xmms --libs fi if test "$echo_data_dir" = "yes"; then @@ -171,25 +141,25 @@ fi if test "$echo_plugin_dir" = "yes"; then - echo $plugin_dir + pkg-config xmms --variable=plugin_dir fi if test "$echo_visualization_plugin_dir" = "yes"; then - echo $visualization_plugin_dir + pkg-config xmms --variable=visualization_plugin_dir fi if test "$echo_input_plugin_dir" = "yes"; then - echo $input_plugin_dir + pkg-config xmms --variable=input_plugin_dir fi if test "$echo_output_plugin_dir" = "yes"; then - echo $output_plugin_dir + pkg-config xmms --variable=output_plugin_dir fi if test "$echo_general_plugin_dir" = "yes"; then - echo $general_plugin_dir + pkg-config xmms --variable=general_plugin_dir fi if test "$echo_effect_plugin_dir" = "yes"; then - echo $effect_plugin_dir + pkg-config xmms --variable=effect_plugin_dir fi --- xmms-1.2.10/configure~ 2004-02-23 23:44:32.000000000 +0200 +++ xmms-1.2.10/configure 2006-05-24 23:55:50.000000000 +0300 @@ -19201,7 +19201,7 @@ - ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Ma! kefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" + ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms.pc xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_! scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19861,6 +19861,7 @@ "wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;; "xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;; "xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;; + "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;; "xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;; "xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;; "Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;; --- xmms-1.2.10/xmms.pc.in~ 2006-05-24 23:54:59.000000000 +0300 +++ xmms-1.2.10/xmms.pc.in 2006-05-24 23:54:48.000000000 +0300 @@ -0,0 +1,18 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +data_dir=@datadir@ +plugin_dir=@plugindir@ +visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@ +input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@ +output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@ +effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@ +general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@ + +Name: XMMS +Description: The X MultiMedia System, a media player +Version: @VERSION@ +Requires: gtk+ +Libs: -L${libdir} -lxmms +Cflags: -I${includedir} -I${includedir}/@PACKAGE@ Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xmms.spec 23 May 2006 19:25:25 -0000 1.21 +++ xmms.spec 25 May 2006 12:26:59 -0000 1.22 @@ -4,7 +4,7 @@ Name: xmms Version: 1.2.10 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 1 Summary: The X MultiMedia System, a media player @@ -28,11 +28,12 @@ Patch5: %{name}-1.2.8-arts.patch Patch6: %{name}-1.2.8-alsalib.patch Patch7: %{name}-cd-mountpoint.patch +# Patch8 on top of patch4 +Patch8: %{name}-1.2.10-multidevel.patch Patch9: %{name}-underquoted.patch Patch10: %{name}-alsa-backport.patch Patch11: %{name}-1.2.10-gcc4.patch Patch12: %{name}-1.2.10-crossfade-0.3.9.patch -Patch13: %{name}-1.2.10-extra_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel @@ -71,6 +72,7 @@ Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: gtk+-devel +Requires: pkgconfig %description devel Files needed for building plug-ins for the X MultiMedia System. @@ -94,6 +96,8 @@ %patch6 -p1 -b .alsalib # Use something that's more likely to work as the default cdrom mountpoint %patch7 -p0 -b .cd-mountpoint +# Avoid multilib devel conflicts +%patch8 -p1 -b .multidevel # Fix m4 underquoted warning %patch9 -p1 -b .underquoted # Backport for recent ALSA @@ -102,8 +106,6 @@ %patch11 -p1 -b .gcc4 # Fix for crossfade >= 0.3.9 to work properly %patch12 -p1 -b .crossfade -# Remove extra libs from xmms-config output (only needed for static linking) -%patch13 -p1 -b .extra_libs # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure @@ -143,6 +145,8 @@ install -Dpm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm +install -Dpm 644 xmms.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xmms.pc + %find_lang %{name} @@ -175,6 +179,7 @@ %files libs %defattr(-,root,root,-) +%doc COPYING %{_libdir}/libxmms.so.* %{_libdir}/xmms/ @@ -183,10 +188,15 @@ %{_bindir}/xmms-config %{_includedir}/xmms/ %{_libdir}/libxmms.so +%{_libdir}/pkgconfig/xmms.pc %{_datadir}/aclocal/xmms.m4 %changelog +* Thu May 25 2006 Ville Skytt?? - 1:1.2.10-25 +- Avoid multilib conflicts in -devel, introducing xmms.pc. +- Include license text in -libs. + * Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 - Apply upstream fix for joystick plugin crashes. --- xmms-1.2.10-extra_libs.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 25 16:29:25 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 25 May 2006 09:29:25 -0700 Subject: rpms/lvcool/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE lvcool-g++.patch, 1.1, NONE lvcool.spec, 1.10, NONE sources, 1.2, NONE Message-ID: <200605251629.k4PGTPp7023373@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/lvcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23352 Added Files: dead.package Removed Files: Makefile lvcool-g++.patch lvcool.spec sources Log Message: This package is irrelevant and obsolete. --- NEW FILE dead.package --- --- Makefile DELETED --- --- lvcool-g++.patch DELETED --- --- lvcool.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu May 25 17:08:15 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:08:15 -0700 Subject: rpms/milter-regex/devel - New directory Message-ID: <200605251708.k4PH8H5V025841@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25812/milter-regex/devel Log Message: Directory /cvs/extras/rpms/milter-regex/devel added to the repository From fedora-extras-commits at redhat.com Thu May 25 17:08:15 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:08:15 -0700 Subject: rpms/milter-regex - New directory Message-ID: <200605251708.k4PH8H5I025838@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25812/milter-regex Log Message: Directory /cvs/extras/rpms/milter-regex added to the repository From fedora-extras-commits at redhat.com Thu May 25 17:08:37 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:08:37 -0700 Subject: rpms/milter-regex Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605251708.k4PH8d1P025885@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25857 Added Files: Makefile import.log Log Message: Setup of module milter-regex --- NEW FILE Makefile --- # Top level Makefile for module milter-regex all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 25 17:08:37 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:08:37 -0700 Subject: rpms/milter-regex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605251708.k4PH8dgo025888@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25857/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module milter-regex --- NEW 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 May 25 17:09:36 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:09:36 -0700 Subject: rpms/milter-regex import.log,1.1,1.2 Message-ID: <200605251709.k4PH9c6x025968@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25933 Modified Files: import.log Log Message: auto-import milter-regex-1.6-5 on branch devel from milter-regex-1.6-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/milter-regex/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 May 2006 17:08:37 -0000 1.1 +++ import.log 25 May 2006 17:09:35 -0000 1.2 @@ -0,0 +1 @@ +milter-regex-1_6-5:HEAD:milter-regex-1.6-5.src.rpm:1148576963 From fedora-extras-commits at redhat.com Thu May 25 17:17:48 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:17:48 -0700 Subject: owners owners.list,1.1054,1.1055 Message-ID: <200605251717.k4PHHol4026091@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26072 Modified Files: owners.list Log Message: Add milter-regex Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1054 retrieving revision 1.1055 diff -u -r1.1054 -r1.1055 --- owners.list 24 May 2006 14:23:59 -0000 1.1054 +++ owners.list 25 May 2006 17:17:47 -0000 1.1055 @@ -783,6 +783,7 @@ 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|extras-qa at fedoraproject.org| +Fedora Extras|milter-regex|Sendmail milter plugin for regular expression filtering|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|mimetex|Easily embed LaTeX math in web pages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 25 17:26:47 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Thu, 25 May 2006 10:26:47 -0700 Subject: rpms/rsnapshot/devel rsnapshot.conf.patch, 1.1, 1.2 rsnapshot.spec, 1.8, 1.9 Message-ID: <200605251726.k4PHQndx026138@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26116 Modified Files: rsnapshot.conf.patch rsnapshot.spec Log Message: update patch to work with 1.2.9 rsnapshot.conf.patch: Index: rsnapshot.conf.patch =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.conf.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rsnapshot.conf.patch 19 May 2006 23:34:16 -0000 1.1 +++ rsnapshot.conf.patch 25 May 2006 17:26:46 -0000 1.2 @@ -1,38 +1,43 @@ ---- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 -+++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 -@@ -40,7 +40,7 @@ - # - # See the README file or the man page for more details. +--- rsnapshot.conf.default.in.orig 2006-05-25 10:21:10.000000000 -0700 ++++ rsnapshot.conf.default.in 2006-05-25 10:23:49.000000000 -0700 +@@ -39,13 +39,7 @@ + # LINUX USERS: Be sure to uncomment "cmd_cp". This gives you extra features. + # EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility. # +-# Note: Linux users with gnu cp/coreutils version > 5.3, should leave +-# cmd_cp commented out, since cp fails to create destination directories +-# with a trailing slash for versions 5.3 or later. +-# +-# See the README file or the man page for more details. +-# -#@CMD_CP@ + at CMD_CP@ # uncomment this to use the rm program instead of the built-in perl routine. - @CMD_RM@ -@@ -55,7 +55,7 @@ - @CMD_LOGGER@ - - # Uncomment this to specify a path to "du" for disk usage checks. + # +@@ -68,7 +62,7 @@ + # If you have an older version of "du", you may also want to check the + # "du_args" parameter below. + # -#@CMD_DU@ + at CMD_DU@ - ######################################### - # BACKUP INTERVALS # -@@ -94,7 +94,7 @@ - + # Uncomment this to specify the path to rsnapshot-diff. + # +@@ -117,14 +111,14 @@ # If you enable this, data will be written to the file you specify. The # amount of data written is controlled by the "loglevel" parameter. + # -#logfile /var/log/rsnapshot +logfile /var/log/rsnapshot - # The include and exclude parameters, if enabled, simply get passed directly - # to rsync. If you have multiple include/exclude patterns, put each one on a -@@ -138,7 +138,7 @@ + # If enabled, rsnapshot will write a lockfile to prevent two instances + # from running simultaneously (and messing up the snapshot_root). # If you enable this, make sure the lockfile directory is not world # writable. Otherwise anyone can prevent the program from running. # -#lockfile /var/run/rsnapshot.pid +lockfile /var/run/rsnapshot.pid - # If enabled, rsnapshot will move the oldest directory for each interval - # to [interval_name].delete, then it will delete that directory as a + # Default rsync args. All rsync commands have at least these options set. + # Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rsnapshot.spec 25 May 2006 07:22:41 -0000 1.8 +++ rsnapshot.spec 25 May 2006 17:26:46 -0000 1.9 @@ -4,7 +4,7 @@ Name: rsnapshot Version: 1.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Local and remote filesystem snapshot utility Group: Applications/System @@ -120,6 +120,9 @@ %changelog +* Thu May 25 2006 Chris Petersen 1.2.9-2 +- Update configfile patch to work with 1.2.9 + * Sat May 21 2006 Chris Petersen 1.2.9-1 - Preliminary build for 1.2.9 From fedora-extras-commits at redhat.com Thu May 25 17:09:36 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:09:36 -0700 Subject: rpms/milter-regex/devel milter-regex-initscript, NONE, 1.1 milter-regex-options, NONE, 1.1 milter-regex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605251709.k4PH9cp7025973@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25933/devel Modified Files: .cvsignore sources Added Files: milter-regex-initscript milter-regex-options milter-regex.spec Log Message: auto-import milter-regex-1.6-5 on branch devel from milter-regex-1.6-5.src.rpm --- NEW FILE milter-regex-initscript --- #!/bin/sh # # Startup script for milter-regex # # chkconfig: - 75 40 # description: Allows sendmail to filter mail using regular expressions # processname: milter-regex # config: /etc/mail/milter-regex.conf /etc/sysconfig/milter-regex # Source function library. . /etc/rc.d/init.d/functions # Source options file [ -f /etc/sysconfig/milter-regex ] && . /etc/sysconfig/milter-regex [ -f /usr/sbin/milter-regex ] || exit 0 prog="milter-regex" start() { echo -n $"Starting $prog: " daemon $prog $OPTIONS RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/milter-regex echo return $RETVAL } stop() { if test "x`pidof milter-regex`" != x; then echo -n $"Stopping $prog: " killproc milter-regex echo fi RETVAL=$? rm -f /var/lock/subsys/milter-regex return $RETVAL } case "$1" in start) start ;; stop) stop ;; status) status milter-regex ;; restart) stop start ;; condrestart|reload) if test "x`pidof milter-regex`" != x; then stop start fi ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" exit 1 esac exit $RETVAL --- NEW FILE milter-regex-options --- # -c configfile -u user -p fifo_file # Defaults # configfile: /etc/mail/milter-regex.conf # user: mregex # fifo: /var/spool/milter-regex/sock OPTIONS= --- NEW FILE milter-regex.spec --- Name: milter-regex Version: 1.6 Release: 5%{?dist} Summary: Sendmail milter plugin for regular expression filtering Group: System Environment/Daemons License: BSD URL: http://www.benzedrine.cx/milter-regex.html Source0: http://www.benzedrine.cx/milter-regex-%{version}.tar.gz Source1: milter-regex-initscript Source2: milter-regex-options Buildroot: %{_tmppath}/%{name}-%{release}-root-%(%{__id_u} -n) Buildrequires: sendmail-devel >= 8.13, byacc, groff Requires: sendmail Requires(pre): /usr/sbin/useradd Requires(post): /usr/sbin/useradd Requires(preun): /sbin/chkconfig, /sbin/service Requires(postun): /sbin/service %description Milter-regex is a milter based filter that makes it possible to filter emails using regular expressions. %prep %setup -q -n %{name} %{__perl} -pi -e 's+/etc/milter-regex\.conf+%{_sysconfdir}/mail/milter-regex.conf+' milter-regex.[8c] %{__perl} -pi -e 's+_milter-regex+mregex+' milter-regex.[8c] /usr/bin/head -n +31 milter-regex.c > LICENSE %build %{__make} %{?_smp_mflags} -f Makefile.linux CFLAGS="%{optflags}" %install %{__rm} -rf %{buildroot} %{__mkdir} -p %{buildroot}%{_sbindir} \ %{buildroot}%{_sysconfdir}/{rc.d/init.d,mail,sysconfig} \ %{buildroot}%{_mandir}/man8 \ %{buildroot}%{_localstatedir}/spool/milter-regex %{__cp} -p milter-regex %{buildroot}%{_sbindir} %{__cp} -p milter-regex.8 %{buildroot}%{_mandir}/man8 %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/milter-regex %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/milter-regex %{__cat} > %{buildroot}%{_sysconfdir}/mail/milter-regex.conf << EOF # Insert here Your milter-regex rules. # See manpage milter-regex for details. # You don't need to reload config; milter-regex reloads it when it changes. EOF # Create a ghost sock file so we can remove it on package deletion : > %{buildroot}%{_localstatedir}/spool/milter-regex/sock %pre /usr/sbin/useradd -r -M -d / -s /sbin/nologin -c "Regex Milter" mregex &> /dev/null || : %post /sbin/chkconfig --add milter-regex || : %preun if [ $1 -eq 0 ] ; then /sbin/service milter-regex stop &> /dev/null || : /sbin/chkconfig --del milter-regex || : fi %postun [ $1 -eq 0 ] && /sbin/service milter-regexp condrestart &> /dev/null || : %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root) %doc LICENSE %{_sbindir}/milter-regex %{_sysconfdir}/rc.d/init.d/milter-regex %config(noreplace) %{_sysconfdir}/sysconfig/milter-regex %config(noreplace) %{_sysconfdir}/mail/milter-regex.conf %dir %attr(755,mregex,mregex) %{_localstatedir}/spool/milter-regex %ghost %{_localstatedir}/spool/milter-regex/sock %{_mandir}/man8/milter-regex.8* %changelog * Thu May 25 2006 Paul Howarth - 1.6-5 - Address issues raised in review (#189611) - Add sendmail dependency - Honor %%{optflags} * Fri Apr 21 2006 Paul Howarth - 1.6-4 - Minor cosmetic changes for resubmission for Fedora Extras * Fri Nov 18 2005 Paul Howarth - 1.6-3 - Remove redundant ver_ and rel_ macros - Don't include package name in the summary - Use macros consistently - Generate LICENSE file in %%prep rather than %%install - Don't strip binary, so debuginfo package is useful - Combine groupadd+useradd into a single useradd command - Use /sbin/nologin for mregex shell instead of non-existent /bin/nologin - Don't delete user+group on package removal (see http://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) - Install initscript in %%{_sysconfdir} rather than /etc/init.d - Don't enable service by default on installation - Add scriptlet dependencies - Add buildreq groff - Use full URL for source - Edit username in man page as well as in code - Use install rather than cp to install %%{SOURCE1} and %%{SOURCE2} so that permissions don't need to be set in SRPM - Ghost the socket for clean package removal - Buildreq sendmail-devel >= 8.13.0 because of the use of SMFIF_QUARANTINE - Use dist tag * Tue Jan 25 2005 Victor Ramirez - 1.6-2 - Initial rpm release - Modified user and configuration file location. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/milter-regex/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 May 2006 17:08:37 -0000 1.1 +++ .cvsignore 25 May 2006 17:09:36 -0000 1.2 @@ -0,0 +1 @@ +milter-regex-1.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/milter-regex/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 May 2006 17:08:37 -0000 1.1 +++ sources 25 May 2006 17:09:36 -0000 1.2 @@ -0,0 +1 @@ +6b5dbc79b0c78cf186f9a19f8d4e3889 milter-regex-1.6.tar.gz From fedora-extras-commits at redhat.com Thu May 25 18:07:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:07:24 -0700 Subject: rpms/perl-Pipeline - New directory Message-ID: <200605251807.k4PI7Qvl028616@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28590/perl-Pipeline Log Message: Directory /cvs/extras/rpms/perl-Pipeline added to the repository From fedora-extras-commits at redhat.com Thu May 25 18:07:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:07:25 -0700 Subject: rpms/perl-Pipeline/devel - New directory Message-ID: <200605251807.k4PI7RCD028619@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28590/perl-Pipeline/devel Log Message: Directory /cvs/extras/rpms/perl-Pipeline/devel added to the repository From fedora-extras-commits at redhat.com Thu May 25 18:07:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:07:54 -0700 Subject: rpms/perl-Pipeline/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605251807.k4PI7uhR028666@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28635/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Pipeline --- NEW 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 May 25 18:07:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:07:53 -0700 Subject: rpms/perl-Pipeline Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605251807.k4PI7tSC028663@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28635 Added Files: Makefile import.log Log Message: Setup of module perl-Pipeline --- NEW FILE Makefile --- # Top level Makefile for module perl-Pipeline all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 25 18:08:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:08:54 -0700 Subject: rpms/perl-Pipeline import.log,1.1,1.2 Message-ID: <200605251808.k4PI8uDE028732@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28699 Modified Files: import.log Log Message: auto-import perl-Pipeline-3.12-1 on branch devel from perl-Pipeline-3.12-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Pipeline/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 May 2006 18:07:53 -0000 1.1 +++ import.log 25 May 2006 18:08:54 -0000 1.2 @@ -0,0 +1 @@ +perl-Pipeline-3_12-1:HEAD:perl-Pipeline-3.12-1.src.rpm:1148580518 From fedora-extras-commits at redhat.com Thu May 25 18:08:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:08:54 -0700 Subject: rpms/perl-Pipeline/devel perl-Pipeline.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605251808.k4PI8u9M028737@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28699/devel Modified Files: .cvsignore sources Added Files: perl-Pipeline.spec Log Message: auto-import perl-Pipeline-3.12-1 on branch devel from perl-Pipeline-3.12-1.src.rpm --- NEW FILE perl-Pipeline.spec --- Name: perl-Pipeline Version: 3.12 Release: 1%{?dist} Summary: Generic pipeline interface License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Pipeline/ Source0: http://www.cpan.org/authors/id/R/RC/RCLAMP/Pipeline-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Data::Structure::Util) >= 0.04 BuildRequires: perl(Data::UUID) >= 0.01 BuildRequires: perl(Error) >= 0.15 BuildRequires: perl(IO::Null) >= 0.01 BuildRequires: perl(IO::String) >= 0.01 Requires: perl(Data::Structure::Util) >= 0.04 Requires: perl(Data::UUID) >= 0.01 Requires: perl(Error) >= 0.15 Requires: perl(IO::Null) >= 0.01 Requires: perl(IO::String) >= 0.01 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Pipelines are a mechanism to process data. They are designed to be plugged together to make fairly complex operations act in a fairly straightforward manner, cleanly, and simply. %prep %setup -q -n Pipeline-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri Mar 24 2006 Steven Pritchard 3.12-1 - Specfile autogenerated by cpanspec 1.63. - Drop NINJA from docs. - Fix License. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Pipeline/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 May 2006 18:07:54 -0000 1.1 +++ .cvsignore 25 May 2006 18:08:54 -0000 1.2 @@ -0,0 +1 @@ +Pipeline-3.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Pipeline/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 May 2006 18:07:54 -0000 1.1 +++ sources 25 May 2006 18:08:54 -0000 1.2 @@ -0,0 +1 @@ +52cbc818aa18f7307dc00624741e5a73 Pipeline-3.12.tar.gz From fedora-extras-commits at redhat.com Thu May 25 18:40:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:40:59 -0700 Subject: rpms/perl-Pipeline/devel perl-Pipeline.spec,1.1,1.2 Message-ID: <200605251841.k4PIf1GM028892@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28875 Modified Files: perl-Pipeline.spec Log Message: Add BR: File::Find::Rule for better test coverage. Index: perl-Pipeline.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Pipeline/devel/perl-Pipeline.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Pipeline.spec 25 May 2006 18:08:54 -0000 1.1 +++ perl-Pipeline.spec 25 May 2006 18:40:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Pipeline Version: 3.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generic pipeline interface License: GPL or Artistic Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: perl(Error) >= 0.15 BuildRequires: perl(IO::Null) >= 0.01 BuildRequires: perl(IO::String) >= 0.01 +BuildRequires: perl(File::Find::Rule) Requires: perl(Data::Structure::Util) >= 0.04 Requires: perl(Data::UUID) >= 0.01 Requires: perl(Error) >= 0.15 @@ -55,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Thu May 25 2006 Steven Pritchard 3.12-2 +- Add BR: File::Find::Rule for better test coverage. + * Fri Mar 24 2006 Steven Pritchard 3.12-1 - Specfile autogenerated by cpanspec 1.63. - Drop NINJA from docs. From fedora-extras-commits at redhat.com Thu May 25 18:51:04 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 11:51:04 -0700 Subject: rpms/texmaker import.log,1.2,1.3 Message-ID: <200605251851.k4PIp6iq029038@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29003 Modified Files: import.log Log Message: auto-import texmaker-1.3-1 on branch devel from texmaker-1.3-1.src.rpm import version 1.3 update Index: import.log =================================================================== RCS file: /cvs/extras/rpms/texmaker/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 28 Oct 2005 16:32:07 -0000 1.2 +++ import.log 25 May 2006 18:51:04 -0000 1.3 @@ -1 +1,2 @@ texmaker-1_12-3:HEAD:texmaker-1.12-3.src.rpm:1130517113 +texmaker-1_3-1:HEAD:texmaker-1.3-1.src.rpm:1148582993 From fedora-extras-commits at redhat.com Thu May 25 18:51:05 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 11:51:05 -0700 Subject: rpms/texmaker/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 texmaker-desktop.patch, 1.1, 1.2 texmaker-tools.patch, 1.1, 1.2 texmaker.spec, 1.3, 1.4 texmaker-install.patch, 1.1, NONE Message-ID: <200605251851.k4PIp7Gf029052@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29003/devel Modified Files: .cvsignore sources texmaker-desktop.patch texmaker-tools.patch texmaker.spec Removed Files: texmaker-install.patch Log Message: auto-import texmaker-1.3-1 on branch devel from texmaker-1.3-1.src.rpm import version 1.3 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Oct 2005 16:32:27 -0000 1.2 +++ .cvsignore 25 May 2006 18:51:05 -0000 1.3 @@ -1 +1 @@ -texmaker-1.12.tar.bz2 +texmaker-1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Oct 2005 16:32:27 -0000 1.2 +++ sources 25 May 2006 18:51:05 -0000 1.3 @@ -1 +1 @@ -af243a0506a296216b51aad80b244c63 texmaker-1.12.tar.bz2 +17f91175a32827e9c9f45dc7a20a0c2b texmaker-1.3.tar.bz2 texmaker-desktop.patch: Index: texmaker-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker-desktop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-desktop.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-desktop.patch 25 May 2006 18:51:05 -0000 1.2 @@ -1,12 +1,12 @@ --- utilities/texmaker.desktop 2005-04-24 14:55:25.000000000 -0400 +++ utilities/texmaker.desktop.new 2005-10-28 10:15:46.000000000 -0400 -@@ -1,20 +1,15 @@ +@@ -1,20 +1,16 @@ [Desktop Entry] --Categories=Qt;KDE;Publishing; +-Categories=Application;Utility;TextEditor;Publishing; -Comment= -Comment[fr]= -DocPath= -+Categories=Application;Publishing;Qt; ++Categories=Application;Utility;TextEditor;Publishing;Qt; Encoding=UTF-8 Exec=texmaker GenericName=LaTeX Editor @@ -14,15 +14,13 @@ Icon=texmaker MimeType=text/x-tex -MiniIcon=texmaker --Name=Texmaker --Name[fr]=Texmaker +X-KDE-StartupNotify=true -+Name=Texmaker LaTeX Editor -+Name[fr]=Texmaker Editeur LaTeX + Name=Texmaker + Name[fr]=Texmaker Path= -StartupNotify=false +StartupNotify=true Terminal=false -TerminalOptions= Type=Application -- + texmaker-tools.patch: Index: texmaker-tools.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker-tools.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-tools.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-tools.patch 25 May 2006 18:51:05 -0000 1.2 @@ -1,13 +1,24 @@ --- texmaker.cpp 2005-04-24 17:40:58.000000000 -0400 +++ texmaker.cpp.new 2005-10-27 13:25:15.000000000 -0400 -@@ -4033,8 +4033,8 @@ +@@ -1759,7 +1759,7 @@ + metapost_command=config.value("Tools/Metapost","\"/usr/local/teTeX/bin/powerpc-apple-darwin-current/mpost\" --interaction nonstopmode ").toString(); + #else + latex_command=config.value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString(); +-dvips_command=config.value("Tools/Dvips","dvips -o %.ps %.dvi").toString(); ++dvips_command=config.value("Tools/Dvips","dvips -o -t %.ps %.dvi").toString(); + ps2pdf_command=config.value("Tools/Ps2pdf","ps2pdf %.ps").toString(); + makeindex_command=config.value("Tools/Makeindex","makeindex %.idx").toString(); + bibtex_command=config.value("Tools/Bibtex","bibtex %.aux").toString(); +@@ -1778,9 +1778,9 @@ + viewpdf_command=config.value("Tools/Pdf","\"C:/Program Files/Adobe/Acrobat 7.0/Reader/AcroRd32.exe\" %.pdf").toString(); #endif #ifdef Q_WS_X11 - viewdvi_command=config.readEntry("/Tools/Dvi","xdvi %.dvi"); --viewps_command=config.readEntry("/Tools/Ps","gv %.ps"); --viewpdf_command=config.readEntry("/Tools/Pdf","xpdf %.pdf"); -+viewps_command=config.readEntry("/Tools/Ps","evince %.ps"); -+viewpdf_command=config.readEntry("/Tools/Pdf","evince %.pdf"); +-viewdvi_command=config.value("Tools/Dvi","xdvi %.dvi").toString(); +-viewps_command=config.value("Tools/Ps","gv %.ps").toString(); +-viewpdf_command=config.value("Tools/Pdf","xpdf %.pdf").toString(); ++viewdvi_command=config.value("Tools/Dvi","evince %.dvi").toString(); ++viewps_command=config.value("Tools/Ps","evince %.ps").toString(); ++viewpdf_command=config.value("Tools/Pdf","evince %.pdf").toString(); #endif #ifdef Q_WS_MACX - viewdvi_command=config.readEntry("/Tools/Dvi","/Applications/Preview.app/Contents/MacOS/Preview %.dvi"); + viewdvi_command=config.value("Tools/Dvi","open %.dvi").toString(); Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- texmaker.spec 13 Feb 2006 21:03:38 -0000 1.3 +++ texmaker.spec 25 May 2006 18:51:05 -0000 1.4 @@ -1,20 +1,21 @@ Summary: LaTeX editor Name: texmaker -Version: 1.12 -Release: 4%{?dist} +Version: 1.3 +Release: 1%{?dist} +Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel +BuildRequires: qt4-devel BuildRequires: desktop-file-utils +Requires: tetex-latex, tetex-dvipost Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Patch0: %{name}-desktop.patch -Patch1: %{name}-install.patch # Patch to use default Fedora's document viewer -Patch2: %{name}-tools.patch +Patch1: %{name}-tools.patch %description Texmaker is a program, that integrates many tools needed to develop @@ -24,14 +25,12 @@ %prep %setup -q -%patch0 -p0 -b .desktop -%patch1 -p0 -b .install -%patch2 -p0 -b .tools +%patch0 -p0 -b .install +%patch1 -p0 -b .tools %build -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -${QTDIR}/bin/qmake -makefile -unix texmaker.pro +export QTDIR=%{_libdir}/qt4 +qmake4 -unix PREFIX=%{buildroot}%{_prefix} texmaker.pro make %{?_smp_mflags} @@ -78,12 +77,17 @@ %files %defattr(-, root, root, -) %doc utilities/AUTHORS utilities/COPYING -%_bindir/texmaker +%{_bindir}/texmaker %{_datadir}/texmaker/ %{_datadir}/applications/fedora-texmaker.desktop %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Thu May 25 2006 Deji Akingunola - 1.3-1 +- Updated to 1.3 - had to add epoch to facilitate an upgrade +- New version depends on qt4 +- Explicitly add tetex-dvips Requires + * Mon Feb 13 2006 Deji Akingunola - 1.12-4 - Rebuild for Fedora Extras 5 --- texmaker-install.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 25 19:03:47 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 12:03:47 -0700 Subject: rpms/texmaker import.log,1.3,1.4 Message-ID: <200605251903.k4PJ3n4Q031564@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31529 Modified Files: import.log Log Message: auto-import texmaker-1.3-1 on branch FC-5 from texmaker-1.3-1.src.rpm import version 1.3 update Index: import.log =================================================================== RCS file: /cvs/extras/rpms/texmaker/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 25 May 2006 18:51:04 -0000 1.3 +++ import.log 25 May 2006 19:03:47 -0000 1.4 @@ -1,2 +1,3 @@ texmaker-1_12-3:HEAD:texmaker-1.12-3.src.rpm:1130517113 texmaker-1_3-1:HEAD:texmaker-1.3-1.src.rpm:1148582993 +texmaker-1_3-1:FC-5:texmaker-1.3-1.src.rpm:1148583756 From fedora-extras-commits at redhat.com Thu May 25 19:03:48 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 12:03:48 -0700 Subject: rpms/texmaker/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 texmaker-desktop.patch, 1.1, 1.2 texmaker-tools.patch, 1.1, 1.2 texmaker.spec, 1.3, 1.4 texmaker-install.patch, 1.1, NONE Message-ID: <200605251903.k4PJ3o9T031578@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31529/FC-5 Modified Files: .cvsignore sources texmaker-desktop.patch texmaker-tools.patch texmaker.spec Removed Files: texmaker-install.patch Log Message: auto-import texmaker-1.3-1 on branch FC-5 from texmaker-1.3-1.src.rpm import version 1.3 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Oct 2005 16:32:27 -0000 1.2 +++ .cvsignore 25 May 2006 19:03:48 -0000 1.3 @@ -1 +1 @@ -texmaker-1.12.tar.bz2 +texmaker-1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Oct 2005 16:32:27 -0000 1.2 +++ sources 25 May 2006 19:03:48 -0000 1.3 @@ -1 +1 @@ -af243a0506a296216b51aad80b244c63 texmaker-1.12.tar.bz2 +17f91175a32827e9c9f45dc7a20a0c2b texmaker-1.3.tar.bz2 texmaker-desktop.patch: Index: texmaker-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker-desktop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-desktop.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-desktop.patch 25 May 2006 19:03:48 -0000 1.2 @@ -1,12 +1,12 @@ --- utilities/texmaker.desktop 2005-04-24 14:55:25.000000000 -0400 +++ utilities/texmaker.desktop.new 2005-10-28 10:15:46.000000000 -0400 -@@ -1,20 +1,15 @@ +@@ -1,20 +1,16 @@ [Desktop Entry] --Categories=Qt;KDE;Publishing; +-Categories=Application;Utility;TextEditor;Publishing; -Comment= -Comment[fr]= -DocPath= -+Categories=Application;Publishing;Qt; ++Categories=Application;Utility;TextEditor;Publishing;Qt; Encoding=UTF-8 Exec=texmaker GenericName=LaTeX Editor @@ -14,15 +14,13 @@ Icon=texmaker MimeType=text/x-tex -MiniIcon=texmaker --Name=Texmaker --Name[fr]=Texmaker +X-KDE-StartupNotify=true -+Name=Texmaker LaTeX Editor -+Name[fr]=Texmaker Editeur LaTeX + Name=Texmaker + Name[fr]=Texmaker Path= -StartupNotify=false +StartupNotify=true Terminal=false -TerminalOptions= Type=Application -- + texmaker-tools.patch: Index: texmaker-tools.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker-tools.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-tools.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-tools.patch 25 May 2006 19:03:48 -0000 1.2 @@ -1,13 +1,24 @@ --- texmaker.cpp 2005-04-24 17:40:58.000000000 -0400 +++ texmaker.cpp.new 2005-10-27 13:25:15.000000000 -0400 -@@ -4033,8 +4033,8 @@ +@@ -1759,7 +1759,7 @@ + metapost_command=config.value("Tools/Metapost","\"/usr/local/teTeX/bin/powerpc-apple-darwin-current/mpost\" --interaction nonstopmode ").toString(); + #else + latex_command=config.value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString(); +-dvips_command=config.value("Tools/Dvips","dvips -o %.ps %.dvi").toString(); ++dvips_command=config.value("Tools/Dvips","dvips -o -t %.ps %.dvi").toString(); + ps2pdf_command=config.value("Tools/Ps2pdf","ps2pdf %.ps").toString(); + makeindex_command=config.value("Tools/Makeindex","makeindex %.idx").toString(); + bibtex_command=config.value("Tools/Bibtex","bibtex %.aux").toString(); +@@ -1778,9 +1778,9 @@ + viewpdf_command=config.value("Tools/Pdf","\"C:/Program Files/Adobe/Acrobat 7.0/Reader/AcroRd32.exe\" %.pdf").toString(); #endif #ifdef Q_WS_X11 - viewdvi_command=config.readEntry("/Tools/Dvi","xdvi %.dvi"); --viewps_command=config.readEntry("/Tools/Ps","gv %.ps"); --viewpdf_command=config.readEntry("/Tools/Pdf","xpdf %.pdf"); -+viewps_command=config.readEntry("/Tools/Ps","evince %.ps"); -+viewpdf_command=config.readEntry("/Tools/Pdf","evince %.pdf"); +-viewdvi_command=config.value("Tools/Dvi","xdvi %.dvi").toString(); +-viewps_command=config.value("Tools/Ps","gv %.ps").toString(); +-viewpdf_command=config.value("Tools/Pdf","xpdf %.pdf").toString(); ++viewdvi_command=config.value("Tools/Dvi","evince %.dvi").toString(); ++viewps_command=config.value("Tools/Ps","evince %.ps").toString(); ++viewpdf_command=config.value("Tools/Pdf","evince %.pdf").toString(); #endif #ifdef Q_WS_MACX - viewdvi_command=config.readEntry("/Tools/Dvi","/Applications/Preview.app/Contents/MacOS/Preview %.dvi"); + viewdvi_command=config.value("Tools/Dvi","open %.dvi").toString(); Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- texmaker.spec 13 Feb 2006 21:03:38 -0000 1.3 +++ texmaker.spec 25 May 2006 19:03:48 -0000 1.4 @@ -1,20 +1,21 @@ Summary: LaTeX editor Name: texmaker -Version: 1.12 -Release: 4%{?dist} +Version: 1.3 +Release: 1%{?dist} +Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel +BuildRequires: qt4-devel BuildRequires: desktop-file-utils +Requires: tetex-latex, tetex-dvipost Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Patch0: %{name}-desktop.patch -Patch1: %{name}-install.patch # Patch to use default Fedora's document viewer -Patch2: %{name}-tools.patch +Patch1: %{name}-tools.patch %description Texmaker is a program, that integrates many tools needed to develop @@ -24,14 +25,12 @@ %prep %setup -q -%patch0 -p0 -b .desktop -%patch1 -p0 -b .install -%patch2 -p0 -b .tools +%patch0 -p0 -b .install +%patch1 -p0 -b .tools %build -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -${QTDIR}/bin/qmake -makefile -unix texmaker.pro +export QTDIR=%{_libdir}/qt4 +qmake4 -unix PREFIX=%{buildroot}%{_prefix} texmaker.pro make %{?_smp_mflags} @@ -78,12 +77,17 @@ %files %defattr(-, root, root, -) %doc utilities/AUTHORS utilities/COPYING -%_bindir/texmaker +%{_bindir}/texmaker %{_datadir}/texmaker/ %{_datadir}/applications/fedora-texmaker.desktop %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Thu May 25 2006 Deji Akingunola - 1.3-1 +- Updated to 1.3 - had to add epoch to facilitate an upgrade +- New version depends on qt4 +- Explicitly add tetex-dvips Requires + * Mon Feb 13 2006 Deji Akingunola - 1.12-4 - Rebuild for Fedora Extras 5 --- texmaker-install.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 25 19:04:38 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 12:04:38 -0700 Subject: rpms/texmaker/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 texmaker-desktop.patch, 1.1, 1.2 texmaker-tools.patch, 1.1, 1.2 texmaker.spec, 1.2, 1.3 texmaker-install.patch, 1.1, NONE Message-ID: <200605251904.k4PJ4eeU031703@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654/FC-4 Modified Files: .cvsignore sources texmaker-desktop.patch texmaker-tools.patch texmaker.spec Removed Files: texmaker-install.patch Log Message: auto-import texmaker-1.3-1 on branch FC-4 from texmaker-1.3-1.src.rpm import version 1.3 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Oct 2005 16:32:27 -0000 1.2 +++ .cvsignore 25 May 2006 19:04:38 -0000 1.3 @@ -1 +1 @@ -texmaker-1.12.tar.bz2 +texmaker-1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Oct 2005 16:32:27 -0000 1.2 +++ sources 25 May 2006 19:04:38 -0000 1.3 @@ -1 +1 @@ -af243a0506a296216b51aad80b244c63 texmaker-1.12.tar.bz2 +17f91175a32827e9c9f45dc7a20a0c2b texmaker-1.3.tar.bz2 texmaker-desktop.patch: Index: texmaker-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker-desktop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-desktop.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-desktop.patch 25 May 2006 19:04:38 -0000 1.2 @@ -1,12 +1,12 @@ --- utilities/texmaker.desktop 2005-04-24 14:55:25.000000000 -0400 +++ utilities/texmaker.desktop.new 2005-10-28 10:15:46.000000000 -0400 -@@ -1,20 +1,15 @@ +@@ -1,20 +1,16 @@ [Desktop Entry] --Categories=Qt;KDE;Publishing; +-Categories=Application;Utility;TextEditor;Publishing; -Comment= -Comment[fr]= -DocPath= -+Categories=Application;Publishing;Qt; ++Categories=Application;Utility;TextEditor;Publishing;Qt; Encoding=UTF-8 Exec=texmaker GenericName=LaTeX Editor @@ -14,15 +14,13 @@ Icon=texmaker MimeType=text/x-tex -MiniIcon=texmaker --Name=Texmaker --Name[fr]=Texmaker +X-KDE-StartupNotify=true -+Name=Texmaker LaTeX Editor -+Name[fr]=Texmaker Editeur LaTeX + Name=Texmaker + Name[fr]=Texmaker Path= -StartupNotify=false +StartupNotify=true Terminal=false -TerminalOptions= Type=Application -- + texmaker-tools.patch: Index: texmaker-tools.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker-tools.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-tools.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-tools.patch 25 May 2006 19:04:38 -0000 1.2 @@ -1,13 +1,24 @@ --- texmaker.cpp 2005-04-24 17:40:58.000000000 -0400 +++ texmaker.cpp.new 2005-10-27 13:25:15.000000000 -0400 -@@ -4033,8 +4033,8 @@ +@@ -1759,7 +1759,7 @@ + metapost_command=config.value("Tools/Metapost","\"/usr/local/teTeX/bin/powerpc-apple-darwin-current/mpost\" --interaction nonstopmode ").toString(); + #else + latex_command=config.value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString(); +-dvips_command=config.value("Tools/Dvips","dvips -o %.ps %.dvi").toString(); ++dvips_command=config.value("Tools/Dvips","dvips -o -t %.ps %.dvi").toString(); + ps2pdf_command=config.value("Tools/Ps2pdf","ps2pdf %.ps").toString(); + makeindex_command=config.value("Tools/Makeindex","makeindex %.idx").toString(); + bibtex_command=config.value("Tools/Bibtex","bibtex %.aux").toString(); +@@ -1778,9 +1778,9 @@ + viewpdf_command=config.value("Tools/Pdf","\"C:/Program Files/Adobe/Acrobat 7.0/Reader/AcroRd32.exe\" %.pdf").toString(); #endif #ifdef Q_WS_X11 - viewdvi_command=config.readEntry("/Tools/Dvi","xdvi %.dvi"); --viewps_command=config.readEntry("/Tools/Ps","gv %.ps"); --viewpdf_command=config.readEntry("/Tools/Pdf","xpdf %.pdf"); -+viewps_command=config.readEntry("/Tools/Ps","evince %.ps"); -+viewpdf_command=config.readEntry("/Tools/Pdf","evince %.pdf"); +-viewdvi_command=config.value("Tools/Dvi","xdvi %.dvi").toString(); +-viewps_command=config.value("Tools/Ps","gv %.ps").toString(); +-viewpdf_command=config.value("Tools/Pdf","xpdf %.pdf").toString(); ++viewdvi_command=config.value("Tools/Dvi","evince %.dvi").toString(); ++viewps_command=config.value("Tools/Ps","evince %.ps").toString(); ++viewpdf_command=config.value("Tools/Pdf","evince %.pdf").toString(); #endif #ifdef Q_WS_MACX - viewdvi_command=config.readEntry("/Tools/Dvi","/Applications/Preview.app/Contents/MacOS/Preview %.dvi"); + viewdvi_command=config.value("Tools/Dvi","open %.dvi").toString(); Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- texmaker.spec 28 Oct 2005 17:29:24 -0000 1.2 +++ texmaker.spec 25 May 2006 19:04:38 -0000 1.3 @@ -1,20 +1,21 @@ Summary: LaTeX editor Name: texmaker -Version: 1.12 -Release: 3%{?dist} +Version: 1.3 +Release: 1%{?dist} +Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel +BuildRequires: qt4-devel BuildRequires: desktop-file-utils +Requires: tetex-latex, tetex-dvipost Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Patch0: %{name}-desktop.patch -Patch1: %{name}-install.patch # Patch to use default Fedora's document viewer -Patch2: %{name}-tools.patch +Patch1: %{name}-tools.patch %description Texmaker is a program, that integrates many tools needed to develop @@ -24,14 +25,12 @@ %prep %setup -q -%patch0 -p0 -b .desktop -%patch1 -p0 -b .install -%patch2 -p0 -b .tools +%patch0 -p0 -b .install +%patch1 -p0 -b .tools %build -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -${QTDIR}/bin/qmake -makefile -unix texmaker.pro +export QTDIR=%{_libdir}/qt4 +qmake4 -unix PREFIX=%{buildroot}%{_prefix} texmaker.pro make %{?_smp_mflags} @@ -78,12 +77,20 @@ %files %defattr(-, root, root, -) %doc utilities/AUTHORS utilities/COPYING -%_bindir/texmaker +%{_bindir}/texmaker %{_datadir}/texmaker/ %{_datadir}/applications/fedora-texmaker.desktop %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Thu May 25 2006 Deji Akingunola - 1.3-1 +- Updated to 1.3 - had to add epoch to facilitate an upgrade +- New version depends on qt4 +- Explicitly add tetex-dvips Requires + +* Mon Feb 13 2006 Deji Akingunola - 1.12-4 +- Rebuild for Fedora Extras 5 + * Fri Oct 28 2005 Deji Akingunola - 1.12-3 - Buildrequires qt-devel instead of kdelibs-devel - Fix typos in desktop file patch --- texmaker-install.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 25 19:04:37 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 12:04:37 -0700 Subject: rpms/texmaker import.log,1.4,1.5 Message-ID: <200605251904.k4PJ4du4031689@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654 Modified Files: import.log Log Message: auto-import texmaker-1.3-1 on branch FC-4 from texmaker-1.3-1.src.rpm import version 1.3 update Index: import.log =================================================================== RCS file: /cvs/extras/rpms/texmaker/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 25 May 2006 19:03:47 -0000 1.4 +++ import.log 25 May 2006 19:04:37 -0000 1.5 @@ -1,3 +1,4 @@ texmaker-1_12-3:HEAD:texmaker-1.12-3.src.rpm:1130517113 texmaker-1_3-1:HEAD:texmaker-1.3-1.src.rpm:1148582993 texmaker-1_3-1:FC-5:texmaker-1.3-1.src.rpm:1148583756 +texmaker-1_3-1:FC-4:texmaker-1.3-1.src.rpm:1148583805 From fedora-extras-commits at redhat.com Thu May 25 19:24:08 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 12:24:08 -0700 Subject: owners owners.list,1.1055,1.1056 Message-ID: <200605251924.k4PJOA8h031932@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31914 Modified Files: owners.list Log Message: Add perl-Pipeline. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1055 retrieving revision 1.1056 diff -u -r1.1055 -r1.1056 --- owners.list 25 May 2006 17:17:47 -0000 1.1055 +++ owners.list 25 May 2006 19:24:08 -0000 1.1056 @@ -1178,6 +1178,7 @@ Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PBS|Perl binding for the Portable Batch System client library|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Pipeline|Generic pipeline interface|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu May 25 22:09:13 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 25 May 2006 15:09:13 -0700 Subject: rpms/pgp-tools/devel .cvsignore, 1.3, 1.4 pgp-tools.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605252209.k4PM9G9C007182@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7161 Modified Files: .cvsignore pgp-tools.spec sources Log Message: upgrade to 0.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 04:51:50 -0000 1.3 +++ .cvsignore 25 May 2006 22:09:13 -0000 1.4 @@ -1 +1 @@ -pgp-tools-0.4.4-20060212svn.tar.bz2 +pgp-tools-0.4.6-20060525svn.tar.bz2 Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pgp-tools.spec 13 Feb 2006 04:51:11 -0000 1.2 +++ pgp-tools.spec 25 May 2006 22:09:13 -0000 1.3 @@ -1,7 +1,7 @@ -%define alphatag 20060212svn +%define alphatag 20060525svn Name: pgp-tools -Version: 0.4.4 -Release: 3.%{alphatag}%{?dist} +Version: 0.4.6 +Release: 1.%{alphatag}%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System License: BSD, GPL @@ -68,6 +68,9 @@ %changelog +* Thu May 25 2006 Matt Domsch 0.4.6-1.20060525svn +- upgrade to lastest upstream + * Sun Feb 12 2006 Matt Domsch 0.4.4-3.20060212svn - upgrade to lastest upstream - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 04:51:50 -0000 1.3 +++ sources 25 May 2006 22:09:13 -0000 1.4 @@ -1 +1 @@ -e77dc370a32731cd60d0ceb47218db96 pgp-tools-0.4.4-20060212svn.tar.bz2 +4d3630eeb382c04476631841f874516d pgp-tools-0.4.6-20060525svn.tar.bz2 From fedora-extras-commits at redhat.com Thu May 25 22:10:22 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 25 May 2006 15:10:22 -0700 Subject: rpms/pgp-tools/FC-5 .cvsignore, 1.3, 1.4 pgp-tools.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605252210.k4PMAO8I007239@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7217 Modified Files: .cvsignore pgp-tools.spec sources Log Message: upgrade to 0.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 04:51:50 -0000 1.3 +++ .cvsignore 25 May 2006 22:10:22 -0000 1.4 @@ -1 +1 @@ -pgp-tools-0.4.4-20060212svn.tar.bz2 +pgp-tools-0.4.6-20060525svn.tar.bz2 Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/pgp-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pgp-tools.spec 13 Feb 2006 04:51:11 -0000 1.2 +++ pgp-tools.spec 25 May 2006 22:10:22 -0000 1.3 @@ -1,7 +1,7 @@ -%define alphatag 20060212svn +%define alphatag 20060525svn Name: pgp-tools -Version: 0.4.4 -Release: 3.%{alphatag}%{?dist} +Version: 0.4.6 +Release: 1.%{alphatag}%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System License: BSD, GPL @@ -68,6 +68,9 @@ %changelog +* Thu May 25 2006 Matt Domsch 0.4.6-1.20060525svn +- upgrade to lastest upstream + * Sun Feb 12 2006 Matt Domsch 0.4.4-3.20060212svn - upgrade to lastest upstream - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 04:51:50 -0000 1.3 +++ sources 25 May 2006 22:10:22 -0000 1.4 @@ -1 +1 @@ -e77dc370a32731cd60d0ceb47218db96 pgp-tools-0.4.4-20060212svn.tar.bz2 +4d3630eeb382c04476631841f874516d pgp-tools-0.4.6-20060525svn.tar.bz2 From fedora-extras-commits at redhat.com Thu May 25 22:15:41 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 25 May 2006 15:15:41 -0700 Subject: rpms/pgp-tools/FC-4 .cvsignore, 1.2, 1.3 pgp-tools.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605252215.k4PMFhf7007309@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7288 Modified Files: .cvsignore pgp-tools.spec sources Log Message: upgrade to 0.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Nov 2005 17:18:35 -0000 1.2 +++ .cvsignore 25 May 2006 22:15:41 -0000 1.3 @@ -1 +1 @@ -pgp-tools-0.4.4-20051123svn.tar.bz2 +pgp-tools-0.4.6-20060525svn.tar.bz2 Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/pgp-tools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pgp-tools.spec 29 Nov 2005 17:18:35 -0000 1.1 +++ pgp-tools.spec 25 May 2006 22:15:41 -0000 1.2 @@ -1,7 +1,7 @@ -%define alphatag 20051123svn +%define alphatag 20060525svn Name: pgp-tools -Version: 0.4.4 -Release: 3.%{alphatag}%{?dist} +Version: 0.4.6 +Release: 1.%{alphatag}%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System License: BSD, GPL @@ -68,6 +68,13 @@ %changelog +* Thu May 25 2006 Matt Domsch 0.4.6-1.20060525svn +- upgrade to lastest upstream + +* Sun Feb 12 2006 Matt Domsch 0.4.4-3.20060212svn +- upgrade to lastest upstream +- rebuild for FC5 + * Tue Nov 29 2005 Matt Domsch 0.4.4-3.20051123svn - require perl(Locale::Recode) for gpgsigs Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Nov 2005 17:18:35 -0000 1.2 +++ sources 25 May 2006 22:15:41 -0000 1.3 @@ -1 +1 @@ -0c92a17af63242b52c63ad46b2091e2a pgp-tools-0.4.4-20051123svn.tar.bz2 +4d3630eeb382c04476631841f874516d pgp-tools-0.4.6-20060525svn.tar.bz2 From fedora-extras-commits at redhat.com Thu May 25 23:05:55 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:05:55 -0700 Subject: rpms/synaptic/FC-5 synaptic-0.57.2-gcc41.patch, NONE, 1.1 synaptic-0.57.2-repomd-1.patch, NONE, 1.1 synaptic-0.57.2-showprog.patch, NONE, 1.1 Message-ID: <200605252305.k4PN5vGv010059@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10010/FC-5 Added Files: synaptic-0.57.2-gcc41.patch synaptic-0.57.2-repomd-1.patch synaptic-0.57.2-showprog.patch Log Message: Sync FC-4/FC-5 with devel synaptic-0.57.2-gcc41.patch: --- NEW FILE synaptic-0.57.2-gcc41.patch --- --- synaptic-0.57.2/common/rcdscanner.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rcdscanner.h 2006-05-09 18:16:56.000000000 +0300 @@ -48,6 +48,7 @@ }; virtual void update(string text, int current) = 0; + virtual ~RCDScanProgress() {}; }; class RCDScanner { --- synaptic-0.57.2/common/rinstallprogress.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rinstallprogress.h 2006-05-09 18:16:56.000000000 +0300 @@ -63,6 +63,7 @@ RInstallProgress():_donePackagesTotal(0), _numPackagesTotal(0),_updateFinished(false) {}; + virtual ~RInstallProgress() {}; }; --- synaptic-0.57.2/common/indexcopy.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/indexcopy.h 2006-05-09 18:19:00.000000000 +0300 @@ -39,6 +39,7 @@ public: bool CopyPackages(string CDROM, string Name, vector &List); + virtual ~IndexCopy() {}; }; class PackageCopy:public IndexCopy { @@ -54,6 +55,7 @@ }; public: + virtual ~PackageCopy() {}; }; class SourceCopy:public IndexCopy { @@ -69,6 +71,7 @@ }; public: + virtual ~SourceCopy() {}; }; #endif --- synaptic-0.57.2/common/rpackagelister.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual void notifyChange(RPackage *pkg) = 0; virtual void notifyPreFilteredChange() = 0; virtual void notifyPostFilteredChange() = 0; + virtual ~RPackageObserver() {}; }; class RCacheObserver { @@ -71,6 +72,7 @@ virtual void notifyCacheOpen() = 0; virtual void notifyCachePreChange() = 0; virtual void notifyCachePostChange() = 0; + virtual ~RCacheObserver() {}; }; // base sort class --- synaptic-0.57.2/common/rpackagefilter.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagefilter.h 2006-05-09 18:16:56.000000000 +0300 @@ -130,7 +130,7 @@ bool and_mode; // patterns are applied in "AND" mode if true, "OR" if false inline bool filterName(Pattern pat, RPackage *pkg); - inline bool RPatternPackageFilter::filterVersion(Pattern pat, RPackage *pkg); + inline bool filterVersion(Pattern pat, RPackage *pkg); inline bool filterDescription(Pattern pat, RPackage *pkg); inline bool filterMaintainer(Pattern pat, RPackage *pkg); inline bool filterDepends(Pattern pat, RPackage *pkg, --- synaptic-0.57.2/common/rpackage.cc.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackage.cc 2006-05-09 18:16:56.000000000 +0300 @@ -848,7 +848,6 @@ void RPackage::setPinned(bool flag) { - FILE *out; struct stat stat_buf; string File =RStateDir() + "/preferences"; @@ -945,8 +944,8 @@ } } - return true; #endif + return true; } // format: first version, second archives --- synaptic-0.57.2/common/rpackagelister.cc.gcc41 2005-06-14 20:37:18.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.cc 2006-05-09 18:16:56.000000000 +0300 @@ -607,7 +607,7 @@ bool _ascent; RPackageStatus _status; public: - supportedSortFunc::supportedSortFunc(bool ascent, RPackageStatus &s) + supportedSortFunc(bool ascent, RPackageStatus &s) : _ascent(ascent), _status(s) {}; bool operator() (RPackage *x, RPackage *y) { if(_ascent) --- synaptic-0.57.2/common/ruserdialog.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/ruserdialog.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual bool showErrors(); + virtual ~RUserDialog() {}; }; #endif synaptic-0.57.2-repomd-1.patch: --- NEW FILE synaptic-0.57.2-repomd-1.patch --- --- synaptic-0.57.2/common/rsources.cc.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.cc 2006-05-09 20:38:03.000000000 +0300 @@ -352,8 +352,13 @@ Type |= RpmDir; else if (S == "rpm-src-dir") Type |= RpmSrcDir; + else if (S == "repomd") + Type |= Repomd; + else if (S == "repomd-src") + Type |= RepomdSrc; else return false; + cout << S << " settype " << (Type | Repomd) << endl; return true; } @@ -371,6 +376,11 @@ return "rpm-dir"; else if ((Type & RpmSrcDir) != 0) return "rpm-src-dir"; + else if ((Type & Repomd) != 0) + return "repomd"; + else if ((Type & RepomdSrc) != 0) + return "repomd-src"; + cout << "type " << (Type & Repomd) << endl; return "unknown"; } @@ -382,6 +392,7 @@ return false; S = SubstVar(S, "$(ARCH)", _config->Find("APT::Architecture")); + S = SubstVar(S, "$(VERSION)", _config->Find("APT::DistroVersion")); URI = S; // append a / to the end if one is not already there @@ -522,6 +533,10 @@ os << "RpmDir"; if ((rec.Type & SourcesList::RpmSrcDir) != 0) os << "RpmSrcDir"; + if ((rec.Type & SourcesList::Repomd) != 0) + os << "Repomd"; + if ((rec.Type & SourcesList::RepomdSrc) != 0) + os << "RepomdSrc"; os << endl; os << "SourceFile: " << rec.SourceFile << endl; os << "VendorID: " << rec.VendorID << endl; --- synaptic-0.57.2/common/rsources.h.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.h 2006-05-09 20:39:23.000000000 +0300 @@ -41,11 +41,13 @@ Disabled = 1 << 4, Comment = 1 << 5, RpmDir = 1 << 6, - RpmSrcDir = 1 << 7 + RpmSrcDir = 1 << 7, + Repomd = 1 << 8, + RepomdSrc = 1 << 9 }; struct SourceRecord { - unsigned char Type; + unsigned int Type; string VendorID; string URI; string Dist; --- synaptic-0.57.2/gtk/rgrepositorywin.cc.repomd 2005-05-20 21:24:35.000000000 +0300 +++ synaptic-0.57.2/gtk/rgrepositorywin.cc 2006-05-09 18:17:15.000000000 +0300 @@ -39,6 +39,8 @@ ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC, ITEM_TYPE_DEB, ITEM_TYPE_DEBSRC }; @@ -48,7 +50,9 @@ ITEM_TYPE_RPM, ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, - ITEM_TYPE_RPMSRCDIR + ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC }; #endif @@ -235,6 +239,16 @@ gtk_menu_append(GTK_MENU(_optTypeMenu), item); gtk_widget_show(item); gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_RPMSRCDIR); + + item = gtk_menu_item_new_with_label("repomd"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMD); + + item = gtk_menu_item_new_with_label("repomd-src"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMDSRC); #else item = gtk_menu_item_new_with_label(_("Binary (deb)")); gtk_menu_append(GTK_MENU(_optTypeMenu), item); @@ -512,6 +526,12 @@ case ITEM_TYPE_RPMSRCDIR: rec->Type |= SourcesList::RpmSrcDir; break; + case ITEM_TYPE_REPOMD: + rec->Type |= SourcesList::Repomd; + break; + case ITEM_TYPE_REPOMDSRC: + rec->Type |= SourcesList::RepomdSrc; + break; default: _userDialog->error(_("Unknown source type")); return; @@ -642,6 +662,10 @@ id = ITEM_TYPE_RPMDIR; else if (rec->Type & SourcesList::RpmSrcDir) id = ITEM_TYPE_RPMSRCDIR; + else if (rec->Type & SourcesList::Repomd) + id = ITEM_TYPE_REPOMD; + else if (rec->Type & SourcesList::RepomdSrc) + id = ITEM_TYPE_REPOMDSRC; gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optType), id); gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optVendor), synaptic-0.57.2-showprog.patch: --- NEW FILE synaptic-0.57.2-showprog.patch --- --- synaptic-0.57.2/gtk/rgfetchprogress.cc.showprog 2006-05-09 19:14:11.000000000 +0300 +++ synaptic-0.57.2/gtk/rgfetchprogress.cc 2006-05-09 19:13:35.000000000 +0300 @@ -337,6 +337,7 @@ //cout << "RGFetchProgress::Start()" << endl; pkgAcquireStatus::Start(); _cancelled = false; + show(); RGFlushInterface(); } From fedora-extras-commits at redhat.com Thu May 25 23:05:54 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:05:54 -0700 Subject: rpms/synaptic/FC-4 synaptic-0.57.2-gcc41.patch, NONE, 1.1 synaptic-0.57.2-repomd-1.patch, NONE, 1.1 synaptic-0.57.2-showprog.patch, NONE, 1.1 Message-ID: <200605252305.k4PN5uwD010050@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10010/FC-4 Added Files: synaptic-0.57.2-gcc41.patch synaptic-0.57.2-repomd-1.patch synaptic-0.57.2-showprog.patch Log Message: Sync FC-4/FC-5 with devel synaptic-0.57.2-gcc41.patch: --- NEW FILE synaptic-0.57.2-gcc41.patch --- --- synaptic-0.57.2/common/rcdscanner.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rcdscanner.h 2006-05-09 18:16:56.000000000 +0300 @@ -48,6 +48,7 @@ }; virtual void update(string text, int current) = 0; + virtual ~RCDScanProgress() {}; }; class RCDScanner { --- synaptic-0.57.2/common/rinstallprogress.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rinstallprogress.h 2006-05-09 18:16:56.000000000 +0300 @@ -63,6 +63,7 @@ RInstallProgress():_donePackagesTotal(0), _numPackagesTotal(0),_updateFinished(false) {}; + virtual ~RInstallProgress() {}; }; --- synaptic-0.57.2/common/indexcopy.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/indexcopy.h 2006-05-09 18:19:00.000000000 +0300 @@ -39,6 +39,7 @@ public: bool CopyPackages(string CDROM, string Name, vector &List); + virtual ~IndexCopy() {}; }; class PackageCopy:public IndexCopy { @@ -54,6 +55,7 @@ }; public: + virtual ~PackageCopy() {}; }; class SourceCopy:public IndexCopy { @@ -69,6 +71,7 @@ }; public: + virtual ~SourceCopy() {}; }; #endif --- synaptic-0.57.2/common/rpackagelister.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual void notifyChange(RPackage *pkg) = 0; virtual void notifyPreFilteredChange() = 0; virtual void notifyPostFilteredChange() = 0; + virtual ~RPackageObserver() {}; }; class RCacheObserver { @@ -71,6 +72,7 @@ virtual void notifyCacheOpen() = 0; virtual void notifyCachePreChange() = 0; virtual void notifyCachePostChange() = 0; + virtual ~RCacheObserver() {}; }; // base sort class --- synaptic-0.57.2/common/rpackagefilter.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagefilter.h 2006-05-09 18:16:56.000000000 +0300 @@ -130,7 +130,7 @@ bool and_mode; // patterns are applied in "AND" mode if true, "OR" if false inline bool filterName(Pattern pat, RPackage *pkg); - inline bool RPatternPackageFilter::filterVersion(Pattern pat, RPackage *pkg); + inline bool filterVersion(Pattern pat, RPackage *pkg); inline bool filterDescription(Pattern pat, RPackage *pkg); inline bool filterMaintainer(Pattern pat, RPackage *pkg); inline bool filterDepends(Pattern pat, RPackage *pkg, --- synaptic-0.57.2/common/rpackage.cc.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackage.cc 2006-05-09 18:16:56.000000000 +0300 @@ -848,7 +848,6 @@ void RPackage::setPinned(bool flag) { - FILE *out; struct stat stat_buf; string File =RStateDir() + "/preferences"; @@ -945,8 +944,8 @@ } } - return true; #endif + return true; } // format: first version, second archives --- synaptic-0.57.2/common/rpackagelister.cc.gcc41 2005-06-14 20:37:18.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.cc 2006-05-09 18:16:56.000000000 +0300 @@ -607,7 +607,7 @@ bool _ascent; RPackageStatus _status; public: - supportedSortFunc::supportedSortFunc(bool ascent, RPackageStatus &s) + supportedSortFunc(bool ascent, RPackageStatus &s) : _ascent(ascent), _status(s) {}; bool operator() (RPackage *x, RPackage *y) { if(_ascent) --- synaptic-0.57.2/common/ruserdialog.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/ruserdialog.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual bool showErrors(); + virtual ~RUserDialog() {}; }; #endif synaptic-0.57.2-repomd-1.patch: --- NEW FILE synaptic-0.57.2-repomd-1.patch --- --- synaptic-0.57.2/common/rsources.cc.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.cc 2006-05-09 20:38:03.000000000 +0300 @@ -352,8 +352,13 @@ Type |= RpmDir; else if (S == "rpm-src-dir") Type |= RpmSrcDir; + else if (S == "repomd") + Type |= Repomd; + else if (S == "repomd-src") + Type |= RepomdSrc; else return false; + cout << S << " settype " << (Type | Repomd) << endl; return true; } @@ -371,6 +376,11 @@ return "rpm-dir"; else if ((Type & RpmSrcDir) != 0) return "rpm-src-dir"; + else if ((Type & Repomd) != 0) + return "repomd"; + else if ((Type & RepomdSrc) != 0) + return "repomd-src"; + cout << "type " << (Type & Repomd) << endl; return "unknown"; } @@ -382,6 +392,7 @@ return false; S = SubstVar(S, "$(ARCH)", _config->Find("APT::Architecture")); + S = SubstVar(S, "$(VERSION)", _config->Find("APT::DistroVersion")); URI = S; // append a / to the end if one is not already there @@ -522,6 +533,10 @@ os << "RpmDir"; if ((rec.Type & SourcesList::RpmSrcDir) != 0) os << "RpmSrcDir"; + if ((rec.Type & SourcesList::Repomd) != 0) + os << "Repomd"; + if ((rec.Type & SourcesList::RepomdSrc) != 0) + os << "RepomdSrc"; os << endl; os << "SourceFile: " << rec.SourceFile << endl; os << "VendorID: " << rec.VendorID << endl; --- synaptic-0.57.2/common/rsources.h.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.h 2006-05-09 20:39:23.000000000 +0300 @@ -41,11 +41,13 @@ Disabled = 1 << 4, Comment = 1 << 5, RpmDir = 1 << 6, - RpmSrcDir = 1 << 7 + RpmSrcDir = 1 << 7, + Repomd = 1 << 8, + RepomdSrc = 1 << 9 }; struct SourceRecord { - unsigned char Type; + unsigned int Type; string VendorID; string URI; string Dist; --- synaptic-0.57.2/gtk/rgrepositorywin.cc.repomd 2005-05-20 21:24:35.000000000 +0300 +++ synaptic-0.57.2/gtk/rgrepositorywin.cc 2006-05-09 18:17:15.000000000 +0300 @@ -39,6 +39,8 @@ ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC, ITEM_TYPE_DEB, ITEM_TYPE_DEBSRC }; @@ -48,7 +50,9 @@ ITEM_TYPE_RPM, ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, - ITEM_TYPE_RPMSRCDIR + ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC }; #endif @@ -235,6 +239,16 @@ gtk_menu_append(GTK_MENU(_optTypeMenu), item); gtk_widget_show(item); gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_RPMSRCDIR); + + item = gtk_menu_item_new_with_label("repomd"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMD); + + item = gtk_menu_item_new_with_label("repomd-src"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMDSRC); #else item = gtk_menu_item_new_with_label(_("Binary (deb)")); gtk_menu_append(GTK_MENU(_optTypeMenu), item); @@ -512,6 +526,12 @@ case ITEM_TYPE_RPMSRCDIR: rec->Type |= SourcesList::RpmSrcDir; break; + case ITEM_TYPE_REPOMD: + rec->Type |= SourcesList::Repomd; + break; + case ITEM_TYPE_REPOMDSRC: + rec->Type |= SourcesList::RepomdSrc; + break; default: _userDialog->error(_("Unknown source type")); return; @@ -642,6 +662,10 @@ id = ITEM_TYPE_RPMDIR; else if (rec->Type & SourcesList::RpmSrcDir) id = ITEM_TYPE_RPMSRCDIR; + else if (rec->Type & SourcesList::Repomd) + id = ITEM_TYPE_REPOMD; + else if (rec->Type & SourcesList::RepomdSrc) + id = ITEM_TYPE_REPOMDSRC; gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optType), id); gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optVendor), synaptic-0.57.2-showprog.patch: --- NEW FILE synaptic-0.57.2-showprog.patch --- --- synaptic-0.57.2/gtk/rgfetchprogress.cc.showprog 2006-05-09 19:14:11.000000000 +0300 +++ synaptic-0.57.2/gtk/rgfetchprogress.cc 2006-05-09 19:13:35.000000000 +0300 @@ -337,6 +337,7 @@ //cout << "RGFetchProgress::Start()" << endl; pkgAcquireStatus::Start(); _cancelled = false; + show(); RGFlushInterface(); } From fedora-extras-commits at redhat.com Thu May 25 23:09:17 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:09:17 -0700 Subject: rpms/synaptic/FC-4 synaptic.spec,1.13,1.14 Message-ID: <200605252309.k4PN9Jet010196@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10151/FC-4 Modified Files: synaptic.spec Log Message: Last resort to convince th cvs/build to take the patches ... :/ Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/synaptic.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- synaptic.spec 25 May 2006 11:55:44 -0000 1.13 +++ synaptic.spec 25 May 2006 23:09:16 -0000 1.14 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 5%{?dist} +Release: 5.0%{?dist} License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu May 25 23:09:18 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:09:18 -0700 Subject: rpms/synaptic/devel synaptic.spec,1.18,1.19 Message-ID: <200605252309.k4PN9Khw010204@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10151/devel Modified Files: synaptic.spec Log Message: Last resort to convince th cvs/build to take the patches ... :/ Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- synaptic.spec 25 May 2006 11:55:45 -0000 1.18 +++ synaptic.spec 25 May 2006 23:09:18 -0000 1.19 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 5%{?dist} +Release: 5.0%{?dist} License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu May 25 23:09:17 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:09:17 -0700 Subject: rpms/synaptic/FC-5 synaptic.spec,1.17,1.18 Message-ID: <200605252309.k4PN9JC3010200@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10151/FC-5 Modified Files: synaptic.spec Log Message: Last resort to convince th cvs/build to take the patches ... :/ Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-5/synaptic.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- synaptic.spec 25 May 2006 11:55:45 -0000 1.17 +++ synaptic.spec 25 May 2006 23:09:17 -0000 1.18 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 5%{?dist} +Release: 5.0%{?dist} License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu May 25 23:53:22 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 16:53:22 -0700 Subject: rpms/libgalago/devel libgalago-gettext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libgalago.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605252353.k4PNrOe3010443@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10419 Modified Files: .cvsignore libgalago.spec sources Added Files: libgalago-gettext.patch Log Message: * Thu May 25 2006 Brian Pepple - 0.5.1-2 - Update to 0.5.1. - Add patch to fix setup-gettext script. - Add BR for gtk-doc, and build documentation. - Change BR from check-devel to check. libgalago-gettext.patch: --- NEW FILE libgalago-gettext.patch --- diff -ur libgalago-0.5.1.OLD/setup-gettext libgalago-0.5.1/setup-gettext --- libgalago-0.5.1.OLD/setup-gettext 2006-05-17 03:53:26.000000000 -0400 +++ libgalago-0.5.1/setup-gettext 2006-05-25 17:55:59.000000000 -0400 @@ -179,7 +179,7 @@ echo n | autopoint --force || abort restore_m4 - if test $GETTEXT_MINOR_VERSION -ge 12 -a $GETTEXT_MINOR_VERSION -lt 14; then + if test $GETTEXT_MINOR_VERSION -ge 12; then cp po/Makefile.in.in po/.tmp-Makefile.in.in sed -e 's#echo "\$(top_builddir)/\$(MKINSTALLDIRS)" ;; esac#echo "\$(MKINSTALLDIRS)" ;; esac#1' < po/.tmp-Makefile.in.in > po/Makefile.in.in rm po/.tmp-Makefile.in.in Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 17:48:26 -0000 1.2 +++ .cvsignore 25 May 2006 23:53:22 -0000 1.3 @@ -1 +1 @@ -libgalago-0.5.0.tar.bz2 +libgalago-0.5.1.tar.bz2 Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgalago.spec 17 May 2006 17:47:02 -0000 1.2 +++ libgalago.spec 25 May 2006 23:53:22 -0000 1.3 @@ -1,5 +1,5 @@ Name: libgalago -Version: 0.5.0 +Version: 0.5.1 Release: 2%{?dist} Summary: Galago presence library @@ -7,11 +7,13 @@ License: LGPL URL: http://www.galago-project.org/ Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: dbus-glib -BuildRequires: check-devel +BuildRequires: check +BuildRequires: gtk-doc %description @@ -35,10 +37,11 @@ %prep %setup -q - +%patch0 -p1 -b .gettext +./autogen.sh %build -%configure --enable-static=no +%configure --enable-static=no --enable-gtk-doc make %{?_smp_mflags} @@ -73,9 +76,16 @@ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/%{name}/ +%{_datadir}/gtk-doc/html/%{name} %changelog +* Thu May 25 2006 Brian Pepple - 0.5.1-2 +- Update to 0.5.1. +- Add patch to fix setup-gettext script. +- Add BR for gtk-doc, and build documentation. +- Change BR from check-devel to check. + * Wed May 17 2006 Brian Pepple - 0.5.0-2 - Bump. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 17:48:26 -0000 1.2 +++ sources 25 May 2006 23:53:22 -0000 1.3 @@ -1 +1 @@ -3e6fbc2f27c957cb50f08ceeb574cb5e libgalago-0.5.0.tar.bz2 +9ace3f93505626773b852d2ebbc7d5d6 libgalago-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Thu May 25 23:58:40 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 16:58:40 -0700 Subject: rpms/libgalago/FC-5 libgalago-gettext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libgalago.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605252358.k4PNwgc3010533@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10509 Modified Files: .cvsignore libgalago.spec sources Added Files: libgalago-gettext.patch Log Message: * Thu May 25 2006 Brian Pepple - 0.5.1-1 - Update to 0.5.1. - Change BR from check-devel to check. - Add BR for gtk-doc, and build documentation. - Add patch to fix setup-gettext script. libgalago-gettext.patch: --- NEW FILE libgalago-gettext.patch --- diff -ur libgalago-0.5.1.OLD/setup-gettext libgalago-0.5.1/setup-gettext --- libgalago-0.5.1.OLD/setup-gettext 2006-05-17 03:53:26.000000000 -0400 +++ libgalago-0.5.1/setup-gettext 2006-05-25 17:55:59.000000000 -0400 @@ -179,7 +179,7 @@ echo n | autopoint --force || abort restore_m4 - if test $GETTEXT_MINOR_VERSION -ge 12 -a $GETTEXT_MINOR_VERSION -lt 14; then + if test $GETTEXT_MINOR_VERSION -ge 12; then cp po/Makefile.in.in po/.tmp-Makefile.in.in sed -e 's#echo "\$(top_builddir)/\$(MKINSTALLDIRS)" ;; esac#echo "\$(MKINSTALLDIRS)" ;; esac#1' < po/.tmp-Makefile.in.in > po/Makefile.in.in rm po/.tmp-Makefile.in.in Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgalago/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 17:48:26 -0000 1.2 +++ .cvsignore 25 May 2006 23:58:40 -0000 1.3 @@ -1 +1 @@ -libgalago-0.5.0.tar.bz2 +libgalago-0.5.1.tar.bz2 Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgalago.spec 16 May 2006 17:48:26 -0000 1.1 +++ libgalago.spec 25 May 2006 23:58:40 -0000 1.2 @@ -1,5 +1,5 @@ Name: libgalago -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: Galago presence library @@ -7,11 +7,13 @@ License: LGPL URL: http://www.galago-project.org/ Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: dbus-glib -BuildRequires: check-devel +BuildRequires: check +BuildRequires: gtk-doc %description @@ -35,10 +37,12 @@ %prep %setup -q +%patch0 -p1 -b .gettext +./autogen.sh %build -%configure --enable-static=no +%configure --enable-static=no --enable-gtk-doc make %{?_smp_mflags} @@ -73,9 +77,16 @@ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/%{name}/ +%{_datadir}/gtk-doc/html/%{name} %changelog +* Thu May 25 2006 Brian Pepple - 0.5.1-1 +- Update to 0.5.1. +- Change BR from check-devel to check. +- Add BR for gtk-doc, and build documentation. +- Add patch to fix setup-gettext script. + * Fri Apr 21 2006 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgalago/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 17:48:26 -0000 1.2 +++ sources 25 May 2006 23:58:40 -0000 1.3 @@ -1 +1 @@ -3e6fbc2f27c957cb50f08ceeb574cb5e libgalago-0.5.0.tar.bz2 +9ace3f93505626773b852d2ebbc7d5d6 libgalago-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Fri May 26 00:19:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 17:19:53 -0700 Subject: rpms/libgalago/devel libgalago.spec,1.3,1.4 Message-ID: <200605260019.k4Q0Jt9c012913@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12896 Modified Files: libgalago.spec Log Message: * Thu May 25 2006 Brian Pepple - 0.5.1-3 - Add BR for gettext-devel, since autogen.sh is being reran. - Add back BR on check-devel. Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libgalago.spec 25 May 2006 23:53:22 -0000 1.3 +++ libgalago.spec 26 May 2006 00:19:53 -0000 1.4 @@ -1,6 +1,6 @@ Name: libgalago Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Galago presence library Group: System Environment/Libraries @@ -12,9 +12,11 @@ BuildRequires: dbus-devel BuildRequires: dbus-glib -BuildRequires: check +BuildRequires: check-devel BuildRequires: gtk-doc +BuildRequires: gettext-devel + %description Galago is a D-BUS-based desktop presence framework used to provide account, @@ -80,6 +82,10 @@ %changelog +* Thu May 25 2006 Brian Pepple - 0.5.1-3 +- Add BR for gettext-devel, since autogen.sh is being reran. +- Add back BR on check-devel. + * Thu May 25 2006 Brian Pepple - 0.5.1-2 - Update to 0.5.1. - Add patch to fix setup-gettext script. From fedora-extras-commits at redhat.com Fri May 26 00:21:59 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 17:21:59 -0700 Subject: rpms/libgalago/FC-5 libgalago.spec,1.2,1.3 Message-ID: <200605260022.k4Q0M1vd012986@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12969 Modified Files: libgalago.spec Log Message: * Thu May 25 2006 Brian Pepple - 0.5.1-2 - Add BR on gettext-devel, since autogen.sh is being reran. - Add back BR on check-devel. Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgalago.spec 25 May 2006 23:58:40 -0000 1.2 +++ libgalago.spec 26 May 2006 00:21:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: libgalago Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Galago presence library Group: System Environment/Libraries @@ -12,9 +12,11 @@ BuildRequires: dbus-devel BuildRequires: dbus-glib -BuildRequires: check +BuildRequires: check-devel BuildRequires: gtk-doc +BuildRequires: gettext-devel + %description Galago is a D-BUS-based desktop presence framework used to provide account, @@ -81,6 +83,10 @@ %changelog +* Thu May 25 2006 Brian Pepple - 0.5.1-2 +- Add BR on gettext-devel, since autogen.sh is being reran. +- Add back BR on check-devel. + * Thu May 25 2006 Brian Pepple - 0.5.1-1 - Update to 0.5.1. - Change BR from check-devel to check. From fedora-extras-commits at redhat.com Fri May 26 00:32:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 17:32:56 -0700 Subject: rpms/galago-daemon/devel galago-daemon.spec,1.2,1.3 Message-ID: <200605260032.k4Q0WwsZ013100@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13083 Modified Files: galago-daemon.spec Log Message: * Thu May 25 2006 Brian Pepple - 0.5.0-4 - Rebuild for new libgalago. Index: galago-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/devel/galago-daemon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- galago-daemon.spec 19 May 2006 15:44:02 -0000 1.2 +++ galago-daemon.spec 26 May 2006 00:32:56 -0000 1.3 @@ -1,6 +1,6 @@ Name: galago-daemon Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Galago presence daemon Group: System Environment/Daemons @@ -45,6 +45,9 @@ %changelog +* Thu May 25 2006 Brian Pepple - 0.5.0-4 +- Rebuild for new libgalago. + * Fri May 19 2006 Brian Pepple - 0.5.0-3 - Bump. From fedora-extras-commits at redhat.com Fri May 26 00:34:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 17:34:53 -0700 Subject: rpms/galago-daemon/FC-5 galago-daemon.spec,1.1,1.2 Message-ID: <200605260034.k4Q0Yt5g013163@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13145 Modified Files: galago-daemon.spec Log Message: * Thu May 25 2006 Brian Pepple - 0.5.0-3 - Rebuild for new libgalago. Index: galago-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/FC-5/galago-daemon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- galago-daemon.spec 18 May 2006 19:35:03 -0000 1.1 +++ galago-daemon.spec 26 May 2006 00:34:53 -0000 1.2 @@ -1,6 +1,6 @@ Name: galago-daemon Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Galago presence daemon Group: System Environment/Daemons @@ -45,6 +45,9 @@ %changelog +* Thu May 25 2006 Brian Pepple - 0.5.0-3 +- Rebuild for new libgalago. + * Thu May 18 2006 Brian Pepple - 0.5.0-2 - Mark file as %%config. From fedora-extras-commits at redhat.com Fri May 26 02:54:55 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:54:55 -0700 Subject: rpms/daap-sharp - New directory Message-ID: <200605260254.k4Q2svr9018250@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18223/daap-sharp Log Message: Directory /cvs/extras/rpms/daap-sharp added to the repository From fedora-extras-commits at redhat.com Fri May 26 02:54:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:54:56 -0700 Subject: rpms/daap-sharp/devel - New directory Message-ID: <200605260254.k4Q2swCI018253@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18223/daap-sharp/devel Log Message: Directory /cvs/extras/rpms/daap-sharp/devel added to the repository From fedora-extras-commits at redhat.com Fri May 26 02:55:04 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:55:04 -0700 Subject: rpms/daap-sharp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605260255.k4Q2t6DW018297@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18269 Added Files: Makefile import.log Log Message: Setup of module daap-sharp --- NEW FILE Makefile --- # Top level Makefile for module daap-sharp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 26 02:55:04 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:55:04 -0700 Subject: rpms/daap-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605260255.k4Q2t6wM018300@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18269/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module daap-sharp --- NEW 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 May 26 02:55:30 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:55:30 -0700 Subject: rpms/daap-sharp import.log,1.1,1.2 Message-ID: <200605260256.k4Q2u2Cl018375@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18338 Modified Files: import.log Log Message: auto-import daap-sharp-0.3.3-3 on branch devel from daap-sharp-0.3.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/daap-sharp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 May 2006 02:55:04 -0000 1.1 +++ import.log 26 May 2006 02:55:30 -0000 1.2 @@ -0,0 +1 @@ +daap-sharp-0_3_3-3:HEAD:daap-sharp-0.3.3-3.src.rpm:1148612126 From fedora-extras-commits at redhat.com Fri May 26 02:55:31 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:55:31 -0700 Subject: rpms/daap-sharp/devel daap-sharp-build.patch, NONE, 1.1 daap-sharp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605260256.k4Q2u3ox018379@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18338/devel Modified Files: .cvsignore sources Added Files: daap-sharp-build.patch daap-sharp.spec Log Message: auto-import daap-sharp-0.3.3-3 on branch devel from daap-sharp-0.3.3-3.src.rpm daap-sharp-build.patch: --- NEW FILE daap-sharp-build.patch --- Only in daap-sharp-0.3.3/src/en: * diff -ur daap-sharp-0.3.3.OLD/src/Makefile.in daap-sharp-0.3.3/src/Makefile.in --- daap-sharp-0.3.3.OLD/src/Makefile.in 2006-04-07 21:34:45.000000000 -0400 +++ daap-sharp-0.3.3/src/Makefile.in 2006-05-09 16:36:07.000000000 -0400 @@ -156,7 +156,7 @@ target_vendor = @target_vendor@ DAAP_ASSEMBLY = daap-sharp.dll ASSEMBLIES = $(DAAP_ASSEMBLY) -daapdir = $(libdir)/daap-sharp +daapdir = $(prefix)/lib/daap-sharp daap_SCRIPTS = $(ASSEMBLIES) $(DAAP_ASSEMBLY).config $(DAAP_ASSEMBLY).mdb DAAPSOURCES = \ $(srcdir)/AuthenticationException.cs \ --- NEW FILE daap-sharp.spec --- Name: daap-sharp Version: 0.3.3 Release: 3%{?dist} Summary: DAAP (Digial Audio Access Protocol) implementation using Mono Group: System Environment/Libraries License: LGPL URL: http://www.snorp.net/log/daap-sharp/ Source0: http://www.snorp.net/files/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel BuildRequires: avahi-sharp Requires: mono-core %description daap-sharp is a DAAP (Digial Audio Access Protocol) implementation. It is used by Apple's iTunes software to share music. %package devel Summary: Development libraries and headers for daap-sharp Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Libararies and header file for developing against daap-sharp. %prep %setup -q %patch0 -p1 -b .build %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure make %install rm -rf $RPM_BUILD_ROOT export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package daap-sharp /gacdir %{_prefix}/lib /root $RPM_BUILD_ROOT%{_prefix}/lib" %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_prefix}/lib/%{name} %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %changelog * Tue May 16 2006 Brian Pepple - 0.3.3-3 - Add devel package for *.pc file. - Add Req on mono-core. - Use cleaner URL. * Tue May 9 2006 Brian Pepple - 0.3.3-2 - Add patch to fix build on x86_64. * Sat May 6 2006 Brian Pepple - 0.3.3-1 - Initial FE RPM spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/daap-sharp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 May 2006 02:55:04 -0000 1.1 +++ .cvsignore 26 May 2006 02:55:30 -0000 1.2 @@ -0,0 +1 @@ +daap-sharp-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/daap-sharp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 May 2006 02:55:04 -0000 1.1 +++ sources 26 May 2006 02:55:30 -0000 1.2 @@ -0,0 +1 @@ +53feead0f3ef75cf5e34cbb4f1d37f30 daap-sharp-0.3.3.tar.gz From fedora-extras-commits at redhat.com Fri May 26 02:58:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:58:56 -0700 Subject: owners owners.list,1.1056,1.1057 Message-ID: <200605260258.k4Q2wwWL018443@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426 Modified Files: owners.list Log Message: Add daap-sharp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1056 retrieving revision 1.1057 diff -u -r1.1056 -r1.1057 --- owners.list 25 May 2006 19:24:08 -0000 1.1056 +++ owners.list 26 May 2006 02:58:56 -0000 1.1057 @@ -190,6 +190,7 @@ 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|daap-sharp|DAAP implementation using Mono|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|dap-freeform_handler|FreeForm data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|dap-hdf4_handler|HDF4 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|dap-netcdf_handler|NetCDF 3 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 26 07:30:49 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 26 May 2006 00:30:49 -0700 Subject: fedora-security/audit fc4,1.264,1.265 fc5,1.177,1.178 Message-ID: <200605260730.k4Q7Un7v030538@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30518 Modified Files: fc4 fc5 Log Message: Yesterdays updates (we didn't get a CVE name in time for the libtiff issue) Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- fc4 25 May 2006 10:21:42 -0000 1.264 +++ fc4 26 May 2006 07:30:46 -0000 1.265 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] +CVE-2006-2613 ** firefox CVE-2006-2493 ** freetype CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2453 backport (dia) #192538 [since FEDORA-2006-580] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- fc5 25 May 2006 10:21:42 -0000 1.177 +++ fc5 26 May 2006 07:30:46 -0000 1.178 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] +CVE-2006-2613 ** firefox CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-588] From fedora-extras-commits at redhat.com Fri May 26 13:17:36 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 26 May 2006 06:17:36 -0700 Subject: fedora-security/audit fc4,1.265,1.266 fc5,1.178,1.179 Message-ID: <200605261317.k4QDHa2d013090@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13070 Modified Files: fc4 fc5 Log Message: Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- fc4 26 May 2006 07:30:46 -0000 1.265 +++ fc4 26 May 2006 13:17:33 -0000 1.266 @@ -5,6 +5,7 @@ CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] CVE-2006-2613 ** firefox +CVE-2006-2607 backport (vixie-cron) #178431 CVE-2006-2493 ** freetype CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2453 backport (dia) #192538 [since FEDORA-2006-580] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- fc5 26 May 2006 07:30:46 -0000 1.178 +++ fc5 26 May 2006 13:17:33 -0000 1.179 @@ -5,6 +5,7 @@ CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] CVE-2006-2613 ** firefox +CVE-2006-2607 backport (vixie-cron) #177476 CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-588] From fedora-extras-commits at redhat.com Fri May 26 14:48:37 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 26 May 2006 07:48:37 -0700 Subject: rpms/loudmouth/devel loudmouth-1.0.3-reentrancy.patch, NONE, 1.1 loudmouth.spec, 1.12, 1.13 Message-ID: <200605261448.k4QEmdB5015639@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15619 Modified Files: loudmouth.spec Added Files: loudmouth-1.0.3-reentrancy.patch Log Message: * Fri May 26 2006 Brian Pepple - 1.0.3-4 - Add patch to fix some reentrancy crashes. (Thanks, Havoc) loudmouth-1.0.3-reentrancy.patch: --- NEW FILE loudmouth-1.0.3-reentrancy.patch --- --- loudmouth-1.0.3/loudmouth/lm-connection.c.reentrancy 2006-04-03 12:14:31.000000000 -0400 +++ loudmouth-1.0.3/loudmouth/lm-connection.c 2006-05-21 23:14:22.000000000 -0400 @@ -82,9 +82,9 @@ LmCallback *open_cb; gboolean cancel_open; - LmCallback *close_cb; + LmCallback *close_cb; /* unused */ LmCallback *auth_cb; - LmCallback *register_cb; + LmCallback *register_cb; /* unused */ LmCallback *disconnect_cb; @@ -224,6 +224,13 @@ connection_do_close (connection); } + if (connection->open_cb) + _lm_utils_free_callback (connection->open_cb); + if (connection->auth_cb) + _lm_utils_free_callback (connection->auth_cb); + + lm_connection_set_disconnect_function (connection, NULL, NULL, NULL); + while ((m = g_queue_pop_head (connection->incoming_messages)) != NULL) { lm_message_unref (m); } @@ -253,9 +260,11 @@ const gchar *id; LmHandlerResult result = LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; + lm_connection_ref (connection); + if (lm_message_get_type (m) == LM_MESSAGE_TYPE_STREAM) { connection_stream_received (connection, m); - return; + goto out; } id = lm_message_node_get_attribute (m->node, "id"); @@ -271,7 +280,7 @@ } if (result == LM_HANDLER_RESULT_REMOVE_MESSAGE) { - return; + goto out; } for (l = connection->handlers[lm_message_get_type (m)]; @@ -283,6 +292,9 @@ connection, m); } + +out: + lm_connection_unref (connection); return; } @@ -447,11 +459,13 @@ if (connect_data->current_addr == NULL) { connection_do_close (connection); - if (connection->open_cb && connection->open_cb->func) { + if (connection->open_cb) { LmCallback *cb = connection->open_cb; + connection->open_cb = NULL; (* ((LmResultFunction) cb->func)) (connection, FALSE, cb->user_data); + _lm_utils_free_callback (cb); } freeaddrinfo (connect_data->resolved_addrs); @@ -467,7 +481,7 @@ { _lm_connection_failed_with_error (connect_data,errno); } - + static gboolean connection_connect_cb (GIOChannel *source, GIOCondition condition, @@ -1169,16 +1183,17 @@ lm_verbose ("AUTH reply: %d\n", result); - if (connection->auth_cb && connection->auth_cb->func) { - LmCallback *cb = connection->auth_cb; + if (connection->auth_cb) { + LmCallback *cb = connection->auth_cb; + connection->auth_cb = NULL; + + if (cb->func) + (* ((LmResultFunction) cb->func)) (connection, + result, cb->user_data); - (* ((LmResultFunction) cb->func)) (connection, - result, cb->user_data); + _lm_utils_free_callback (cb); } - _lm_utils_free_callback (connection->auth_cb); - connection->auth_cb = NULL; - return LM_HANDLER_RESULT_REMOVE_MESSAGE; } @@ -1203,15 +1218,16 @@ connection_start_keep_alive (connection); - if (connection->open_cb && connection->open_cb->func) { + if (connection->open_cb) { LmCallback *cb = connection->open_cb; + connection->open_cb = NULL; - (* ((LmResultFunction) cb->func)) (connection, result, - cb->user_data); + if (cb->func) + (* ((LmResultFunction) cb->func)) (connection, result, + cb->user_data); + + _lm_utils_free_callback (connection->open_cb); } - - _lm_utils_free_callback (connection->open_cb); - connection->open_cb = NULL; } static gint @@ -2129,9 +2145,12 @@ _lm_utils_free_callback (connection->disconnect_cb); } - connection->disconnect_cb = _lm_utils_new_callback (function, - user_data, - notify); + if (function) + connection->disconnect_cb = _lm_utils_new_callback (function, + user_data, + notify); + else + connection->disconnect_cb = NULL; } /** Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- loudmouth.spec 5 Apr 2006 16:56:51 -0000 1.12 +++ loudmouth.spec 26 May 2006 14:48:37 -0000 1.13 @@ -2,13 +2,14 @@ Name: loudmouth Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries License: LGPL URL: http://www.imendio.com/projects/loudmouth Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-reentrancy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.4.0 @@ -41,6 +42,7 @@ %prep %setup -q +%patch0 -p1 -b .reentrancy %build @@ -78,15 +80,19 @@ %doc ChangeLog NEWS README COPYING %{_libdir}/libloudmouth*.so.* + %files devel %defattr(-,root,root,-) %{_libdir}/libloudmouth*.so -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/%{name}-1.0.pc %{_includedir}/%{name}-1.0 %{_datadir}/gtk-doc/html/%{name} %changelog +* Fri May 26 2006 Brian Pepple - 1.0.3-4 +- Add patch to fix some reentrancy crashes. (Thanks, Havoc) + * Wed Apr 5 2006 Brian Pepple - 1.0.3-3 - Update to 1.0.3. - Add BR for gnutls-devel to devel package. From fedora-extras-commits at redhat.com Fri May 26 14:49:48 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 26 May 2006 07:49:48 -0700 Subject: rpms/loudmouth/FC-5 loudmouth-1.0.3-reentrancy.patch, NONE, 1.1 loudmouth.spec, 1.12, 1.13 Message-ID: <200605261449.k4QEnonf015687@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15667 Modified Files: loudmouth.spec Added Files: loudmouth-1.0.3-reentrancy.patch Log Message: * Fri May 26 2006 Brian Pepple - 1.0.3-3 - Add patch to fix some reentrancy crashes. (Thanks, Havoc) loudmouth-1.0.3-reentrancy.patch: --- NEW FILE loudmouth-1.0.3-reentrancy.patch --- --- loudmouth-1.0.3/loudmouth/lm-connection.c.reentrancy 2006-04-03 12:14:31.000000000 -0400 +++ loudmouth-1.0.3/loudmouth/lm-connection.c 2006-05-21 23:14:22.000000000 -0400 @@ -82,9 +82,9 @@ LmCallback *open_cb; gboolean cancel_open; - LmCallback *close_cb; + LmCallback *close_cb; /* unused */ LmCallback *auth_cb; - LmCallback *register_cb; + LmCallback *register_cb; /* unused */ LmCallback *disconnect_cb; @@ -224,6 +224,13 @@ connection_do_close (connection); } + if (connection->open_cb) + _lm_utils_free_callback (connection->open_cb); + if (connection->auth_cb) + _lm_utils_free_callback (connection->auth_cb); + + lm_connection_set_disconnect_function (connection, NULL, NULL, NULL); + while ((m = g_queue_pop_head (connection->incoming_messages)) != NULL) { lm_message_unref (m); } @@ -253,9 +260,11 @@ const gchar *id; LmHandlerResult result = LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; + lm_connection_ref (connection); + if (lm_message_get_type (m) == LM_MESSAGE_TYPE_STREAM) { connection_stream_received (connection, m); - return; + goto out; } id = lm_message_node_get_attribute (m->node, "id"); @@ -271,7 +280,7 @@ } if (result == LM_HANDLER_RESULT_REMOVE_MESSAGE) { - return; + goto out; } for (l = connection->handlers[lm_message_get_type (m)]; @@ -283,6 +292,9 @@ connection, m); } + +out: + lm_connection_unref (connection); return; } @@ -447,11 +459,13 @@ if (connect_data->current_addr == NULL) { connection_do_close (connection); - if (connection->open_cb && connection->open_cb->func) { + if (connection->open_cb) { LmCallback *cb = connection->open_cb; + connection->open_cb = NULL; (* ((LmResultFunction) cb->func)) (connection, FALSE, cb->user_data); + _lm_utils_free_callback (cb); } freeaddrinfo (connect_data->resolved_addrs); @@ -467,7 +481,7 @@ { _lm_connection_failed_with_error (connect_data,errno); } - + static gboolean connection_connect_cb (GIOChannel *source, GIOCondition condition, @@ -1169,16 +1183,17 @@ lm_verbose ("AUTH reply: %d\n", result); - if (connection->auth_cb && connection->auth_cb->func) { - LmCallback *cb = connection->auth_cb; + if (connection->auth_cb) { + LmCallback *cb = connection->auth_cb; + connection->auth_cb = NULL; + + if (cb->func) + (* ((LmResultFunction) cb->func)) (connection, + result, cb->user_data); - (* ((LmResultFunction) cb->func)) (connection, - result, cb->user_data); + _lm_utils_free_callback (cb); } - _lm_utils_free_callback (connection->auth_cb); - connection->auth_cb = NULL; - return LM_HANDLER_RESULT_REMOVE_MESSAGE; } @@ -1203,15 +1218,16 @@ connection_start_keep_alive (connection); - if (connection->open_cb && connection->open_cb->func) { + if (connection->open_cb) { LmCallback *cb = connection->open_cb; + connection->open_cb = NULL; - (* ((LmResultFunction) cb->func)) (connection, result, - cb->user_data); + if (cb->func) + (* ((LmResultFunction) cb->func)) (connection, result, + cb->user_data); + + _lm_utils_free_callback (connection->open_cb); } - - _lm_utils_free_callback (connection->open_cb); - connection->open_cb = NULL; } static gint @@ -2129,9 +2145,12 @@ _lm_utils_free_callback (connection->disconnect_cb); } - connection->disconnect_cb = _lm_utils_new_callback (function, - user_data, - notify); + if (function) + connection->disconnect_cb = _lm_utils_new_callback (function, + user_data, + notify); + else + connection->disconnect_cb = NULL; } /** Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/FC-5/loudmouth.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- loudmouth.spec 5 Apr 2006 17:08:13 -0000 1.12 +++ loudmouth.spec 26 May 2006 14:49:48 -0000 1.13 @@ -2,13 +2,14 @@ Name: loudmouth Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries License: LGPL URL: http://www.imendio.com/projects/loudmouth Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-reentrancy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.4.0 @@ -20,11 +21,13 @@ BuildRequires: libtasn1 >= 0.2.6 %endif + %description 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. + %package devel Summary: Development files for Loudmouth Group: Development/Libraries @@ -34,13 +37,16 @@ BuildRequires: gnutls-devel >= 1.0.0 %endif + %description devel 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. + %prep %setup -q +%patch0 -p1 -b .reentrancy %build @@ -78,15 +84,19 @@ %doc ChangeLog NEWS README COPYING %{_libdir}/libloudmouth*.so.* + %files devel %defattr(-,root,root,-) %{_libdir}/libloudmouth*.so -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/%{name}-1.0.pc %{_includedir}/%{name}-1.0 %{_datadir}/gtk-doc/html/%{name} %changelog +* Fri May 26 2006 Brian Pepple - 1.0.3-3 +- Add patch to fix some reentrancy crashes. (Thanks, Havoc) + * Wed Apr 5 2006 Brian Pepple - 1.0.3-2 - Update to 1.0.3. - Add BR for gnutls-devel to devel package. From fedora-extras-commits at redhat.com Fri May 26 17:13:58 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:13:58 -0700 Subject: rpms/jack-audio-connection-kit - New directory Message-ID: <200605261714.k4QHE0EY023400@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23374/jack-audio-connection-kit Log Message: Directory /cvs/extras/rpms/jack-audio-connection-kit added to the repository From fedora-extras-commits at redhat.com Fri May 26 17:13:59 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:13:59 -0700 Subject: rpms/jack-audio-connection-kit/devel - New directory Message-ID: <200605261714.k4QHE1RI023403@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23374/jack-audio-connection-kit/devel Log Message: Directory /cvs/extras/rpms/jack-audio-connection-kit/devel added to the repository From fedora-extras-commits at redhat.com Fri May 26 17:14:15 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:14:15 -0700 Subject: rpms/jack-audio-connection-kit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605261714.k4QHEHst023452@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23421/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jack-audio-connection-kit --- NEW 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 May 26 17:14:15 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:14:15 -0700 Subject: rpms/jack-audio-connection-kit Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605261714.k4QHEHOk023449@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23421 Added Files: Makefile import.log Log Message: Setup of module jack-audio-connection-kit --- NEW FILE Makefile --- # Top level Makefile for module jack-audio-connection-kit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 26 17:15:12 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:15:12 -0700 Subject: rpms/jack-audio-connection-kit import.log,1.1,1.2 Message-ID: <200605261715.k4QHFiov023548@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23508 Modified Files: import.log Log Message: auto-import jack-audio-connection-kit-0.101.1-8 on branch devel from jack-audio-connection-kit-0.101.1-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 May 2006 17:14:14 -0000 1.1 +++ import.log 26 May 2006 17:15:11 -0000 1.2 @@ -0,0 +1 @@ +jack-audio-connection-kit-0_101_1-8:HEAD:jack-audio-connection-kit-0.101.1-8.src.rpm:1148663701 From fedora-extras-commits at redhat.com Fri May 26 17:15:12 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:15:12 -0700 Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit-README.Fedora, NONE, 1.1 jack-audio-connection-kit.spec, NONE, 1.1 jack-clock3.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605261715.k4QHFikn023552@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23508/devel Modified Files: .cvsignore sources Added Files: jack-audio-connection-kit-README.Fedora jack-audio-connection-kit.spec jack-clock3.patch Log Message: auto-import jack-audio-connection-kit-0.101.1-8 on branch devel from jack-audio-connection-kit-0.101.1-8.src.rpm --- NEW FILE jack-audio-connection-kit-README.Fedora --- Running JACK server in realtime mode. The JACK server jackd has the capability to run in a real-time mode which greatly decreases the chance of audio glitches. The real-time mode is enabled by passing the -R or --realtime option to jackd when starting the server. It is only possible to run jackd in real-time mode as a non-root user by modifying your PAM configuration, PAM stands for Pluggable Authentication Modules and is the primary authentification mechanism used on Fedora. The primary source of PAM documentation can be found at the following at http://www.kernel.org/pub/linux/libs/pam/ The specific PAM configuration file that needs to be modified is /etc/security/limits.conf and it controls the system resource limits. It is important to understand that modifying the resource limits configuration files can decrease the security of your system. Documentation specific to the resource limits PAM module can be found at http://www.kernel.org/pub/linux/libs/pam/Linux-PAM-html/pam-6.html#ss6.12 The resource limits that need to be changed to allow jackd to run in realtime mode are named rtprio and memlock. To increase the limits for a specific user named fred you would add the following to /etc/security/limits.conf fred - rtprio 20 fred - memlock 50000 The value of rtprio can be set in the range 0 - 99 where any value greater that 0 will allow the user to change the scheduling policy to "real-time". By default the JACK server requires a minimum rtprio setting of 20 but jackd will accept a command line parameter -P or --realtime-priority which will change the minimum required value of rtprio that is needed, but the default of 20 is nearly always sufficient. The appropriate value for memlock is dependent on the amount of memory present in the system but a minimum value of 50000(50MB) and a maximum value of half the available memory can be used as a rough guideline. To verify that the resource limits have been modified you can use the bash built-in ulimit command, for example: $ulimit -a core file size (blocks, -c) 0 data seg size (kbytes, -d) unlimited max nice (-e) 0 file size (blocks, -f) unlimited pending signals (-i) 8191 max locked memory (kbytes, -l) 50000 max memory size (kbytes, -m) unlimited open files (-n) 1024 pipe size (512 bytes, -p) 8 POSIX message queues (bytes, -q) 819200 max rt priority (-r) 20 stack size (kbytes, -s) 10240 cpu time (seconds, -t) unlimited max user processes (-u) 8191 virtual memory (kbytes, -v) unlimited file locks (-x) unlimited file locks (-x) unlimited Keep in mind that you may have to re-login before changes to limits.conf take effect. --- NEW FILE jack-audio-connection-kit.spec --- Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.101.1 Release: 8%{?dist} License: GPL/LGPL Group: System Environment/Daemons Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz Source1: %{name}-README.Fedora Patch0: http://lalists.stanford.edu/lad/2006/01/att-0167/jack-clock3.patch URL: http://jackit.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: libsndfile-devel >= 1.0.0 BuildRequires: pkgconfig BuildRequires: doxygen BuildRequires: readline-devel, libtermcap-devel, ncurses-devel %description JACK is a low-latency audio server, written primarily for the Linux operating system. It can connect a number of different applications to an audio device, as well as allowing them to share audio between themselves. Its clients can run in their own processes (ie. as a normal application), or can they can run within a JACK server (ie. a "plugin"). JACK is different from other audio server efforts in that it has been designed from the ground up to be suitable for professional audio work. This means that it focuses on two key areas: synchronous execution of all clients, and low latency operation. %package devel Summary: Header files for Jack Group: Development/Libraries Requires: %{name} = %{version} Requires: pkgconfig %description devel Header files for the Jack Audio Connection Kit. %package example-clients Summary: Example clients that use Jack Group: Applications/Multimedia Requires: %{name} = %{version} %description example-clients Small example clients that use the Jack Audio Connection Kit. %prep %setup -q %patch0 -p1 -b .clock3 %build # x86_64 issue reported by Rudolf Kastl (not checked, but not bad). # Also patch0 touches configure.ac. autoreconf --force --install %configure --enable-stripped-jackd \ --with-html-dir=%{_docdir} \ %ifarch i386 --enable-sse=no --enable-mmx=no \ %endif --disable-oss \ --disable-portaudio \ --enable-optimize \ --with-default-tmpdir=/dev/shm make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # can't use the makeinstall macro, jack needs DESTDIR and prefix gets # added to it and messes up part of the install make install DESTDIR=$RPM_BUILD_ROOT # prepare README.Fedora for documentation including cp -p %{SOURCE1} README.Fedora # remove extra install of the documentation rm -fr $RPM_BUILD_ROOT%{_docdir} # remove *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/jack/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS TODO COPYING* %doc README.Fedora %{_bindir}/jackd %{_bindir}/jack_load %{_bindir}/jack_unload %{_bindir}/jack_bufsize %{_bindir}/jack_freewheel %{_bindir}/jack_transport %{_libdir}/jack/ %{_mandir}/man1/jack*.1* %{_libdir}/libjack.so.* %files devel %defattr(-,root,root) %doc doc/reference %{_includedir}/jack/ %{_libdir}/libjack.so %{_libdir}/pkgconfig/jack.pc %files example-clients %defattr(-,root,root) %{_bindir}/jackrec %{_bindir}/jack_connect %{_bindir}/jack_disconnect %{_bindir}/jack_impulse_grabber %{_bindir}/jack_lsp %{_bindir}/jack_metro %{_bindir}/jack_showtime %{_bindir}/jack_monitor_client %{_bindir}/jack_simple_client %changelog * Fri May 19 2006 Andy Shevchenko 0.101.1-8 - uniform directories items at %files section * Wed May 17 2006 Andy Shevchenko 0.101.1-7 - change License tag to GPL/LGPL - remove --enable-shared (it should be default) - add a -p flag to the line that copies README.Fedora * Wed May 10 2006 Andy Shevchenko 0.101.1-6 - apply clock fix for AMD X2 CPUs (please, refer to http://sourceforge.net/mailarchive/forum.php?thread_id=8085535&forum_id=3040) * Wed May 03 2006 Andy Shevchenko 0.101.1-5 - adjust spec after reviewing * Thu Apr 27 2006 Andy Shevchenko 0.101.1-4 - reformatting README.Fedora to 72 symbols width * Wed Apr 26 2006 Andy Shevchenko 0.101.1-3 - add README.Fedora - remove useless BRs * Mon Apr 24 2006 Andy Shevchenko 0.101.1-2 - disable oss and portaudio engines - use /dev/shm as jack tmpdir - remove capabilities stuff * Tue Apr 04 2006 Andy Shevchenko 0.101.1-1 - update to 0.101.1 * Mon Mar 27 2006 Andy Shevchenko - update to 0.100.7 (#183912) - adjust BR (add versions) - replace files between examples and main packages - own jack tmpdir * Fri Mar 17 2006 Andy Shevchenko - no libs subpackage - From Fernando Lopez-Lezcano : - added configuration variable to build with/without capabilities - added --enable-optimize flag to configure script - disabled sse/mmx instructions in i386 build - create temporary directory as /var/lib/jack/tmp - create and erase tmp directory at install or uninstall - try to umount the temporary directory before uninstalling the package * Fri Mar 03 2006 Andy Shevchenko - fix spec for extras injection * Fri Nov 18 2005 Andy Shevchenko - exclude *.la files - use dist tag * Fri Oct 14 2005 Andy Shevchenko - 0.100.0 - no optimization * Tue Sep 28 2004 Andy Shevchenko - 0.99.1 * Fri Aug 20 2004 Andy Shevchenko - rebuild from Mandrake jack-clock3.patch: --- NEW FILE jack-clock3.patch --- diff -ur jack-audio-connection-kit-0.100.7/config/os/generic/time.h jack/config/os/generic/time.h --- jack-audio-connection-kit-0.100.7/config/os/generic/time.h 2004-04-07 07:52:58.000000000 +0300 +++ jack/config/os/generic/time.h 2005-12-06 12:24:03.000000000 +0200 @@ -1,5 +1,6 @@ /* Copyright (C) 2001-2004 Paul Davis, Tilman Linneweh + Copyright (C) 2005 Jussi Laako Generic version, overridden by OS-specific definition when needed. @@ -23,48 +24,24 @@ #define __jack_time_h__ #include +#include #include -#include - -/* This is a kludge. We need one global instantiation of this - * variable in each address space. So, libjack/client.c declares the - * actual storage. Other source files will see it as an extern. */ -#define JACK_TIME_GLOBAL_DECL jack_time_t __jack_cpu_mhz -extern JACK_TIME_GLOBAL_DECL; static inline jack_time_t jack_get_microseconds (void) { - return get_cycles() / __jack_cpu_mhz; -} + jack_time_t jackTime; + struct timeval time; -/* This function is inspired by similar code in MPLayer. - * It should be quite portable - */ -static inline jack_time_t -jack_get_mhz (void) -{ - jack_time_t tsc_start, tsc_end; - struct timeval tv_start, tv_end; - long usec_delay; - jack_time_t mhz; - - tsc_start = get_cycles(); - gettimeofday(&tv_start, NULL); - usleep(100000); - tsc_end = get_cycles(); - gettimeofday(&tv_end, NULL); - - usec_delay = 1000000 * (tv_end.tv_sec - tv_start.tv_sec) - + (tv_end.tv_usec - tv_start.tv_usec); - mhz = (tsc_end - tsc_start) / usec_delay; - return mhz; + gettimeofday(&time, NULL); + jackTime = (jack_time_t) time.tv_sec * 1e6 + + (jack_time_t) time.tv_usec; + return jackTime; } /* This should only be called ONCE per process. */ static inline void jack_init_time () { - __jack_cpu_mhz = jack_get_mhz (); } #endif /* __jack_time_h__ */ diff -ur jack-audio-connection-kit-0.100.7/config/os/gnu-linux/time.h jack/config/os/gnu-linux/time.h --- jack-audio-connection-kit-0.100.7/config/os/gnu-linux/time.h 2004-03-25 21:31:44.000000000 +0200 +++ jack/config/os/gnu-linux/time.h 2005-12-06 16:30:20.000000000 +0200 @@ -1,5 +1,6 @@ /* Copyright (C) 2001-2003 Paul Davis + Copyright (C) 2005 Jussi Laako This is the GNU/Linux version. @@ -23,18 +24,35 @@ #define __jack_time_h__ #include +#include +#include #include #include -/* This is a kludge. We need one global instantiation of this - * variable in each address space. So, libjack/client.c declares the - * actual storage. Other source files will see it as an extern. */ +/* This is a kludge. We need one global instantiation of these + * variables in each address space. So, libjack/client.c declares the + * actual storage. Other source files will see those as an externs. */ #define JACK_TIME_GLOBAL_DECL jack_time_t __jack_cpu_mhz +#define JACK_TIME_SOURCE_DECL int __jack_clock_source +#define JACK_TIME_FUNC_DECL jack_time_t (*jack_get_microseconds) (void) extern JACK_TIME_GLOBAL_DECL; +extern JACK_TIME_SOURCE_DECL; +extern JACK_TIME_FUNC_DECL; -static inline jack_time_t -jack_get_microseconds (void) { - return get_cycles() / __jack_cpu_mhz; +static jack_time_t +jack_get_microseconds0 (void) { + jack_time_t jackTime; + struct timespec time; + + clock_gettime(CLOCK_MONOTONIC, &time); + jackTime = (jack_time_t) time.tv_sec * 1e6 + + (jack_time_t) time.tv_nsec / 1e3; + return jackTime; +} + +static jack_time_t +jack_get_microseconds1 (void) { + return get_cycles() / __jack_cpu_mhz; } /* @@ -94,4 +112,21 @@ __jack_cpu_mhz = jack_get_mhz (); } +/* Set time function. */ +static inline void +jack_set_clock_source (int clocksrc) +{ + __jack_clock_source = clocksrc; + switch (__jack_clock_source) + { + case 1: + jack_get_microseconds = jack_get_microseconds1; + break; + case 0: + default: + jack_get_microseconds = jack_get_microseconds0; + break; + } +} + #endif /* __jack_time_h__ */ diff -ur jack-audio-connection-kit-0.100.7/configure.ac jack/configure.ac --- jack-audio-connection-kit-0.100.7/configure.ac 2005-10-30 13:01:31.000000000 +0200 +++ jack/configure.ac 2005-12-06 14:13:09.000000000 +0200 @@ -126,6 +126,7 @@ AC_CHECK_FUNCS(on_exit atexit) AC_CHECK_FUNCS(posix_memalign) AC_CHECK_LIB(m, sin) +AC_CHECK_FUNC(clock_gettime, [], AC_CHECK_LIB(rt, clock_gettime)) # should we use mlockall() on this platform? if test "x$JACK_DO_NOT_MLOCK" = "x"; then diff -ur jack-audio-connection-kit-0.100.7/jack/engine.h jack/jack/engine.h --- jack-audio-connection-kit-0.100.7/jack/engine.h 2004-12-19 20:41:28.000000000 +0200 +++ jack/jack/engine.h 2005-12-06 13:47:39.000000000 +0200 @@ -169,6 +169,8 @@ int jack_get_fifo_fd (jack_engine_t *engine, unsigned int which_fifo); +extern int clock_source; + extern jack_client_internal_t * jack_client_internal_by_id (jack_engine_t *engine, jack_client_id_t id); diff -ur jack-audio-connection-kit-0.100.7/jack/internal.h jack/jack/internal.h --- jack-audio-connection-kit-0.100.7/jack/internal.h 2005-08-22 23:48:24.000000000 +0300 +++ jack/jack/internal.h 2005-12-06 13:50:48.000000000 +0200 @@ -130,6 +130,7 @@ jack_time_t sync_time_left; jack_frame_timer_t frame_timer; int32_t internal; + int clock_source; pid_t engine_pid; jack_nframes_t buffer_size; int8_t real_time; diff -ur jack-audio-connection-kit-0.100.7/jackd/engine.c jack/jackd/engine.c --- jack-audio-connection-kit-0.100.7/jackd/engine.c 2005-06-15 12:18:40.000000000 +0300 +++ jack/jackd/engine.c 2005-12-06 16:21:50.000000000 +0200 @@ -78,6 +78,8 @@ dlhandle handle; } jack_driver_info_t; +int clock_source = 0; + static int jack_port_assign_buffer (jack_engine_t *, jack_port_internal_t *); static jack_port_internal_t *jack_get_port_by_name (jack_engine_t *, @@ -1679,6 +1681,13 @@ engine->control->xrun_delayed_usecs = 0; engine->control->max_delayed_usecs = 0; +#ifdef JACK_TIME_FUNC_DECL + jack_set_clock_source(clock_source); +#else + __jack_clock_source = clock_source; +#endif + engine->control->clock_source = clock_source; + engine->control->frame_timer.frames = 0; engine->control->frame_timer.reset_pending = 0; engine->control->frame_timer.current_wakeup = 0; diff -ur jack-audio-connection-kit-0.100.7/jackd/jackd.c jack/jackd/jackd.c --- jack-audio-connection-kit-0.100.7/jackd/jackd.c 2005-06-15 12:18:40.000000000 +0300 +++ jack/jackd/jackd.c 2005-12-06 13:52:15.000000000 +0200 @@ -368,6 +368,7 @@ " [ --verbose OR -v ]\n" " [ --silent OR -s ]\n" " [ --version OR -V ]\n" +" [ --clock-source OR -c ]\n" " -d driver [ ... driver args ... ]\n" " where driver can be `alsa', `coreaudio', `dummy',\n" " `oss' or `portaudio'\n\n" @@ -463,7 +464,7 @@ { jack_driver_desc_t * desc; - const char *options = "-ad:P:uvshVRTFl:t:mn:p:"; + const char *options = "-ad:P:uvshVRTFl:t:mn:p:c:"; struct option long_options[] = { { "driver", 1, 0, 'd' }, @@ -479,6 +480,7 @@ { "temporary", 0, 0, 'T' }, { "version", 0, 0, 'V' }, { "silent", 0, 0, 's' }, + { "clock-source", 1, 0, 'c' }, { 0, 0, 0, 0 } }; int opt = 0; @@ -586,6 +588,10 @@ show_version = 1; break; + case 'c': + clock_source = atoi (optarg); + break; + default: fprintf (stderr, "unknown option character %c\n", optopt); diff -ur jack-audio-connection-kit-0.100.7/libjack/client.c jack/libjack/client.c --- jack-audio-connection-kit-0.100.7/libjack/client.c 2005-09-11 02:58:43.000000000 +0300 +++ jack/libjack/client.c 2005-12-06 16:21:12.000000000 +0200 @@ -51,6 +51,10 @@ #include JACK_TIME_GLOBAL_DECL; /* One instance per process. */ +JACK_TIME_SOURCE_DECL; /* One instance per process. */ +#ifdef JACK_TIME_FUNC_DECL +JACK_TIME_FUNC_DECL; +#endif #include "local.h" @@ -959,6 +963,13 @@ client->engine = (jack_control_t *) jack_shm_addr (&client->engine_shm); + /* initialize clock source as early as possible */ +#ifdef JACK_TIME_FUNC_DECL + jack_set_clock_source(client->engine->clock_source); +#else + __jack_clock_source = client->engine->clock_source; +#endif + /* now attach the client control block */ client->control_shm = res.client_shm; if (jack_attach_shm (&client->control_shm)) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 May 2006 17:14:15 -0000 1.1 +++ .cvsignore 26 May 2006 17:15:12 -0000 1.2 @@ -0,0 +1 @@ +jack-audio-connection-kit-0.101.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 May 2006 17:14:15 -0000 1.1 +++ sources 26 May 2006 17:15:12 -0000 1.2 @@ -0,0 +1 @@ +bb25f7c1da5d488b70edcf39ff5a39b2 jack-audio-connection-kit-0.101.1.tar.gz From fedora-extras-commits at redhat.com Fri May 26 17:21:51 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:21:51 -0700 Subject: owners owners.list,1.1057,1.1058 Message-ID: <200605261721.k4QHLrgT023666@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632/owners Modified Files: owners.list Log Message: Added andy at smile.org.ua as owner of jack-audio-connection-kit. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1057 retrieving revision 1.1058 diff -u -r1.1057 -r1.1058 --- owners.list 26 May 2006 02:58:56 -0000 1.1057 +++ owners.list 26 May 2006 17:21:51 -0000 1.1058 @@ -546,6 +546,7 @@ Fedora Extras|itk|Object oriented extension to Tk|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|iwidgets|A set of useful widgets based on itcl and itk|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|jack-audio-connection-kit|The Jack Audio Connection Kit|andy at smile.org.ua|extras-qa at fedoraproject.org| Fedora Extras|jakarta-commons-cli|Command Line Interface Library for Java|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|jam|Program construction tool, similar to make|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 26 17:22:39 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 26 May 2006 10:22:39 -0700 Subject: fedora-security/audit fc4,1.266,1.267 fc5,1.179,1.180 Message-ID: <200605261722.k4QHMdd8023698@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23647 Modified Files: fc4 fc5 Log Message: Add some notes for a firefox issue that doesn't affect us. It's no secret where firefox is installed on a FC system. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- fc4 26 May 2006 13:17:33 -0000 1.266 +++ fc4 26 May 2006 17:22:36 -0000 1.267 @@ -4,7 +4,7 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] -CVE-2006-2613 ** firefox +CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 CVE-2006-2493 ** freetype CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- fc5 26 May 2006 13:17:33 -0000 1.179 +++ fc5 26 May 2006 17:22:36 -0000 1.180 @@ -4,7 +4,7 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] -CVE-2006-2613 ** firefox +CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) From fedora-extras-commits at redhat.com Fri May 26 17:23:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:23:33 -0700 Subject: rpms/pari - New directory Message-ID: <200605261723.k4QHNZqu023773@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23752/pari Log Message: Directory /cvs/extras/rpms/pari added to the repository From fedora-extras-commits at redhat.com Fri May 26 17:23:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:23:33 -0700 Subject: rpms/pari/devel - New directory Message-ID: <200605261723.k4QHNZlI023776@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23752/pari/devel Log Message: Directory /cvs/extras/rpms/pari/devel added to the repository From fedora-extras-commits at redhat.com Fri May 26 17:23:52 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:23:52 -0700 Subject: rpms/pari Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605261723.k4QHNsWA023825@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23797 Added Files: Makefile import.log Log Message: Setup of module pari --- NEW FILE Makefile --- # Top level Makefile for module pari all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri May 26 17:23:52 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:23:52 -0700 Subject: rpms/pari/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605261723.k4QHNtLW023828@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23797/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pari --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri May 26 17:25:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:25:12 -0700 Subject: rpms/pari import.log,1.1,1.2 Message-ID: <200605261725.k4QHPEui023910@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23877 Modified Files: import.log Log Message: auto-import pari-2.3.0-2.fc5 on branch devel from pari-2.3.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pari/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 May 2006 17:23:52 -0000 1.1 +++ import.log 26 May 2006 17:25:11 -0000 1.2 @@ -0,0 +1 @@ +pari-2_3_0-2_fc5:HEAD:pari-2.3.0-2.src.rpm:1148664303 From fedora-extras-commits at redhat.com Fri May 26 17:25:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:25:12 -0700 Subject: rpms/pari/devel pari.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605261725.k4QHPEhQ023915@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23877/devel Modified Files: .cvsignore sources Added Files: pari.spec Log Message: auto-import pari-2.3.0-2.fc5 on branch devel from pari-2.3.0-2.src.rpm --- NEW FILE pari.spec --- Name: pari Version: 2.3.0 Release: 2%{?dist} Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries License: GPL URL: http://pari.math.u-bordeaux.fr Source: http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: readline-devel BuildRequires: gmp-devel BuildRequires: tetex BuildRequires: tetex-dvips BuildRequires: desktop-file-utils %if "%{?fedora}" > "4" BuildRequires: libX11-devel %else BuildRequires: xorg-x11-devel %endif Requires: tetex-xdvi %description PARI is a widely used computer algebra system designed for fast computations in number theory (factorizations, algebraic number theory, elliptic curves...), but also contains a large number of other useful functions to compute with mathematical entities such as matrices, polynomials, power series, algebraic numbers, etc., and a lot of transcendental functions. This package contains the shared libraries. The interactive calculator PARI/GP is in package %{name}-gp. %package devel Summary: Header files and libraries for PARI development Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Header files and libraries for PARI development. %package gp Summary: PARI calculator Group: Applications/Engineering Requires: gzip %description gp PARI/GP is an advanced programmable calculator, which computes symbolically as long as possible, numerically where needed, and contains a wealth of number-theoretic functions. %package emacs Summary: Emacs mode for PARI/GP Group: Applications/Engineering Requires: emacs-common Requires: %{name}-gp = %{version}-%{release} %description emacs Emacs mode for PARI/GP. %prep %setup -q perl -pi -e "s|runpathprefix='.*'|runpathprefix=''|" config/get_ld %build ./Configure \ --prefix=%{_prefix} \ --share-prefix=%{_datadir} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ --mandir=%{_mandir}/man1 \ --datadir=%{_datadir}/pari \ --includedir=%{_includedir} \ --with-gmp make %{?_smp_mflags} gp CFLAGS="-fPIC $RPM_OPT_FLAGS" %check make dobench make dotest-compat make dotest-intnum make dotest-qfbsolve make dotest-rfrac make dotest-round4 %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # we move pari.cfg to the docdir rm -fr $RPM_BUILD_ROOT%{_prefix}/lib/pari mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d cat > $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/pari-init.el < gp.desktop < - 2.3.0-2 - added %%check section - use gmp * Thu May 25 2006 Gerard Milmeister - 2.3.0-1 - new version 2.3.0 * Fri May 19 2006 Orion Poplawski - 2.1.7-4 - Fix shared library builds * Fri Dec 2 2005 Gerard Milmeister - 2.1.7-3 - Use none for architecture to guarantee working 64bit builds * Fri Oct 21 2005 Gerard Milmeister - 2.1.7-2 - some cleanup * Fri Sep 30 2005 Gerard Milmeister - 2.1.7-1 - New Version 2.1.7 * Sun Mar 6 2005 Gerard Milmeister - 2.1.6-1 - New Version 2.1.6 * Mon Nov 22 2004 Gerard Milmeister - 0:2.1.5-0.fdr.2 - Fixed problem with readline * Wed Nov 12 2003 Gerard Milmeister - 0:2.1.5-0.fdr.x - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pari/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 May 2006 17:23:52 -0000 1.1 +++ .cvsignore 26 May 2006 17:25:12 -0000 1.2 @@ -0,0 +1 @@ +pari-2.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pari/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 May 2006 17:23:52 -0000 1.1 +++ sources 26 May 2006 17:25:12 -0000 1.2 @@ -0,0 +1 @@ +ea685da18e015a4365965e82e6e2a2dd pari-2.3.0.tar.gz From fedora-extras-commits at redhat.com Fri May 26 17:50:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:50:07 -0700 Subject: rpms/pari/FC-5 pari.spec,1.1,1.2 Message-ID: <200605261750.k4QHo9MI024844@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24827 Modified Files: pari.spec Log Message: Index: pari.spec =================================================================== RCS file: /cvs/extras/rpms/pari/FC-5/pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pari.spec 26 May 2006 17:25:12 -0000 1.1 +++ pari.spec 26 May 2006 17:50:07 -0000 1.2 @@ -1,6 +1,6 @@ Name: pari Version: 2.3.0 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries From fedora-extras-commits at redhat.com Fri May 26 17:58:14 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 26 May 2006 10:58:14 -0700 Subject: rpms/daap-sharp/devel daap-sharp.spec,1.1,1.2 Message-ID: <200605261758.k4QHwGsS024973@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24956 Modified Files: daap-sharp.spec Log Message: * Fri May 26 2006 Brian Pepple - 0.3.3-4 - Bump. Index: daap-sharp.spec =================================================================== RCS file: /cvs/extras/rpms/daap-sharp/devel/daap-sharp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- daap-sharp.spec 26 May 2006 02:55:30 -0000 1.1 +++ daap-sharp.spec 26 May 2006 17:58:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: daap-sharp Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: DAAP (Digial Audio Access Protocol) implementation using Mono Group: System Environment/Libraries @@ -63,6 +63,9 @@ %changelog +* Fri May 26 2006 Brian Pepple - 0.3.3-4 +- Bump. + * Tue May 16 2006 Brian Pepple - 0.3.3-3 - Add devel package for *.pc file. - Add Req on mono-core. From fedora-extras-commits at redhat.com Fri May 26 18:01:15 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 26 May 2006 11:01:15 -0700 Subject: rpms/qt4/devel .cvsignore,1.2,1.3 qt4.spec,1.2,1.3 Message-ID: <200605261801.k4QI1oQF027364@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27315 Modified Files: .cvsignore qt4.spec Log Message: * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %buildSQL macro - -libdir %qt_libdir Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2006 14:06:14 -0000 1.2 +++ .cvsignore 26 May 2006 18:01:15 -0000 1.3 @@ -1 +1,2 @@ +clog qt-x11-opensource-src-4.1.3.tar.gz Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt4.spec 24 May 2006 14:45:14 -0000 1.2 +++ qt4.spec 26 May 2006 18:01:15 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -22,18 +22,16 @@ Source24: qtconfig.desktop ## Optional bits -# Build mysql plugins -%define mysql 1 -# Build postgresql plugins -%define psql 1 -# Build ODBC plugins -%define odbc 1 -# Build sqlite plugins -%define sqlite 1 +# Build SQL plugins (mysql, unixodbc, postgresql, sqlite) +%define buildSQL 1 +# define to build sqlite2 plugin (FIXME/TODO) +#define sqlite2 1 %define qt_dirname qt4 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/%{name}-doc-%{version} +# Be careful about ever changing this, some 3rd-party libs install here -- Rex +%define qt_libdir %{qtdir}/%{_lib} Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d @@ -56,24 +54,20 @@ %endif BuildRequires: %{x_deps} -%if %{mysql} +%if %{buildSQL} +# mysql # mysql-devel < 4 build fails on 4.1.3+, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") %global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql") %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g") -%endif -%if %{psql} +# postgresql BuildRequires: postgresql-devel -%endif - -%if %{odbc} +# unixODBC BuildRequires: unixODBC-devel -%endif - -%if %{sqlite} +# sqlite BuildRequires: sqlite-devel %endif @@ -160,9 +154,6 @@ %build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -184,8 +175,8 @@ echo yes | ./configure -v \ -no-rpath \ -prefix %{qtdir} \ - -libdir %{qtdir}/%{_lib} \ -docdir %{qt_docdir} \ + -libdir %{qt_libdir} \ -platform %{platform} \ -release \ -shared \ @@ -195,18 +186,12 @@ -system-zlib \ -system-libpng \ -system-libjpeg \ -%if %{mysql} +%if %{buildSQL} -plugin-sql-mysql \ %{?mysql_include} \ %{?mysql_ldflags} \ -%endif -%if %{psql} -plugin-sql-psql \ -%endif -%if %{odbc} -plugin-sql-odbc \ -%endif -%if %{sqlite} -plugin-sql-sqlite \ %endif -cups \ @@ -227,27 +212,24 @@ %install rm -rf %{buildroot} -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" - make install INSTALL_ROOT=%{buildroot} ## pkg-config # strip extraneous dirs/libraries -- Rex # safe ones for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done # not-so-safe, but we can try -- Rex -for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl +# -L/usr/X11R6/%{_lib} +for dep in -lXrender -lXrandr -lXcursor -lXinerama -lXi -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done -sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl +sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ pushd %{buildroot}%{_libdir}/pkgconfig @@ -297,10 +279,10 @@ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} # .la files, die, die, die. -rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la +rm -f %{buildroot}%{qt_libdir}/lib*.la mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{qt_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean @@ -319,8 +301,8 @@ /etc/ld.so.conf.d/* %dir %{qtdir} %dir %{qtdir}/bin/ -%dir %{qtdir}/%{_lib}/ -%{qtdir}/%{_lib}/lib*.so.* +%dir %{qt_libdir} +%{qt_libdir}/lib*.so.* %dir %{qtdir}/plugins/ %{qtdir}/plugins/accessible/ %{qtdir}/plugins/imageformats/ @@ -354,13 +336,12 @@ %{_bindir}/uic* %{qtdir}/include/ %{qtdir}/mkspecs/ -%dir %{qtdir}/%{_lib} -%{qtdir}/%{_lib}/lib*.so +%{qt_libdir}/lib*.so # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a -%{qtdir}/%{_lib}/lib*.a -%{qtdir}/%{_lib}/lib*.prl +%{qt_libdir}/lib*.a +%{qt_libdir}/lib*.prl %{qtdir}/phrasebooks/ -%{qtdir}/%{_lib}/*.pc +%{qt_libdir}/*.pc %{_libdir}/pkgconfig/*.pc %{qtdir}/q3porting.xml # Qt designer @@ -390,25 +371,19 @@ %{_bindir}/qt*demo* %{_datadir}/applications/*qtdemo*.desktop -%if %{odbc} +%if %{buildSQL} %files odbc %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc* -%endif -%if %{psql} %files postgresql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql* -%endif -%if %{mysql} %files mysql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql* -%endif -%if %{sqlite} %files sqlite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite* @@ -416,6 +391,11 @@ %changelog +* Fri May 26 2006 Rex Dieter 4.1.3-5 +- strip -lXi from .pc files (#193258) +- simplify sql plugin builds via %%buildSQL macro +- -libdir %%qt_libdir + * Wed May 24 2006 Rex Dieter 4.1.3-4 - move (most) %%dir ownership (back) to main pkg From fedora-extras-commits at redhat.com Fri May 26 18:16:09 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:16:09 -0700 Subject: rpms/xscreensaver - New directory Message-ID: <200605261816.k4QIGB4n027558@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27537/xscreensaver Log Message: Directory /cvs/extras/rpms/xscreensaver added to the repository From fedora-extras-commits at redhat.com Fri May 26 18:16:09 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:16:09 -0700 Subject: rpms/xscreensaver/devel - New directory Message-ID: <200605261816.k4QIGBNR027561@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27537/xscreensaver/devel Log Message: Directory /cvs/extras/rpms/xscreensaver/devel added to the repository From fedora-extras-commits at redhat.com Fri May 26 18:16:45 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:16:45 -0700 Subject: rpms/xscreensaver Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605261816.k4QIGl4c027616@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583 Added Files: Makefile import.log Log Message: Setup of module xscreensaver --- NEW FILE Makefile --- # Top level Makefile for module xscreensaver all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 26 18:16:46 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:16:46 -0700 Subject: rpms/xscreensaver/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605261816.k4QIGmGB027619@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xscreensaver --- NEW 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 May 26 18:20:02 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:20:02 -0700 Subject: rpms/xscreensaver import.log,1.1,1.2 Message-ID: <200605261820.k4QIKYiM027737@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27680 Modified Files: import.log Log Message: auto-import xscreensaver-5.00-1 on branch devel from xscreensaver-5.00-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 May 2006 18:16:45 -0000 1.1 +++ import.log 26 May 2006 18:20:02 -0000 1.2 @@ -0,0 +1 @@ +xscreensaver-5_00-1:HEAD:xscreensaver-5.00-1.src.rpm:1148667575 From fedora-extras-commits at redhat.com Fri May 26 18:20:03 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:20:03 -0700 Subject: rpms/xscreensaver/devel xscreensaver-5.00-locale-safety.patch, NONE, 1.1 xscreensaver-5.00-matherr-utils.patch, NONE, 1.1 xscreensaver-5.00b5-change-defaults.patch, NONE, 1.1 xscreensaver-5.00b5-dont-allow-root.patch, NONE, 1.1 xscreensaver-5.00b5-include-directory.patch, NONE, 1.1 xscreensaver-5.00b5-sanitize-hacks.patch, NONE, 1.1 xscreensaver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605261820.k4QIKZLt027741@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27680/devel Modified Files: .cvsignore sources Added Files: xscreensaver-5.00-locale-safety.patch xscreensaver-5.00-matherr-utils.patch xscreensaver-5.00b5-change-defaults.patch xscreensaver-5.00b5-dont-allow-root.patch xscreensaver-5.00b5-include-directory.patch xscreensaver-5.00b5-sanitize-hacks.patch xscreensaver.spec Log Message: auto-import xscreensaver-5.00-1 on branch devel from xscreensaver-5.00-1.src.rpm xscreensaver-5.00-locale-safety.patch: --- NEW FILE xscreensaver-5.00-locale-safety.patch --- --- xscreensaver-5.00/hacks/screenhack.c.locale-safety 2006-05-24 07:09:58.000000000 +0900 +++ xscreensaver-5.00/hacks/screenhack.c 2006-05-26 01:53:18.000000000 +0900 @@ -170,6 +170,9 @@ const char *cmp_locale; int j = 0; + /* current_locale might be NULL */ + if (!current_locale || !*current_locale) return; + while ((cmp_locale = change_locale[j])) { if (!strncmp(current_locale, cmp_locale, strlen(cmp_locale))) xscreensaver-5.00-matherr-utils.patch: --- NEW FILE xscreensaver-5.00-matherr-utils.patch --- --- xscreensaver-5.00/utils/erase.c.matherr2 2006-03-28 16:07:37.000000000 +0900 +++ xscreensaver-5.00/utils/erase.c 2006-05-26 01:45:00.000000000 +0900 @@ -451,7 +451,7 @@ { st->cols = 10 + random() % 30; size = st->width / st->cols; - rows = (st->height / size) + 1; + rows = (size ? (st->height / size) : 0) + 1; st->nlines = st->cols * rows; st->lines = (int *) calloc (st->nlines, sizeof(*st->lines)); @@ -469,7 +469,7 @@ } size = st->width / st->cols; - rows = (st->height / size) + 1; + rows = (size ? (st->height / size) : 0) + 1; for (i = st->nlines * st->prev_ratio; i < st->nlines * st->ratio; xscreensaver-5.00b5-change-defaults.patch: --- NEW FILE xscreensaver-5.00b5-change-defaults.patch --- --- xscreensaver-5.00b5/driver/XScreenSaver.ad.in.change-defaults 2006-05-18 09:12:56.000000000 +0900 +++ xscreensaver-5.00b5/driver/XScreenSaver.ad.in 2006-05-18 15:05:31.000000000 +0900 @@ -37,24 +37,24 @@ *dpmsStandby: 2:00:00 *dpmsSuspend: 2:00:00 *dpmsOff: 4:00:00 -*grabDesktopImages: True +*grabDesktopImages: False *grabVideoFrames: False *chooseRandomImages: @DEFAULT_IMAGES_P@ *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ *nice: 10 *memoryLimit: 0 -*lock: False +*lock: True *verbose: False *timestamp: True *fade: True *unfade: False *fadeSeconds: 0:00:03 *fadeTicks: 20 -*splash: True +*splash: False *splashDuration: 0:00:05 *visualID: default *captureStderr: True -*ignoreUninstalledPrograms: False +*ignoreUninstalledPrograms: True *textMode: file *textLiteral: XScreenSaver @@ -74,7 +74,7 @@ ! Set this to True if you are experiencing longstanding XFree86 bug #421 ! (xscreensaver not covering the whole screen) -GetViewPortIsFullOfLies: False +GetViewPortIsFullOfLies: True ! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.) *demoCommand: xscreensaver-demo @@ -93,13 +93,11 @@ ! ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3) ! - at GNOME24@*loadURL: gnome-open '%s' @GNOME24@*manualCommand: gnome-terminal --title '%s manual' \ @GNOME24@ --command '/bin/sh -c "man %s; read foo"' ! ! Gnome 2.2: ! - at GNOME22@*loadURL: gnome-url-show '%s' @GNOME22@*manualCommand: gnome-terminal --title '%s manual' \ @GNOME22@ --command '/bin/sh -c "man %s; read foo"' ! @@ -110,10 +108,10 @@ ! ! non-Gnome systems: ! - at NOGNOME@*loadURL: firefox '%s' || mozilla '%s' || netscape '%s' @NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \ @NOGNOME@ -e /bin/sh -c 'man "%s" ; read foo' +*loadURL: htmlview '%s' ! The format used for printing the date and time in the password dialog box ! (see the strftime(3) manual page for details.) @@ -229,7 +227,7 @@ epicycle -root \n\ interference -root \n\ truchet -root \n\ - bsod -root \n\ +- bsod -root \n\ crystal -root \n\ discrete -root \n\ kumppa -root \n\ @@ -455,7 +453,7 @@ *Dialog.borderWidth: 1 *Dialog.shadowThickness: 2 -*passwd.heading.label: XScreenSaver %s +*passwd.heading.label: Screen Locked *passwd.body.label: Please enter your password. *passwd.login.label: New Login *passwd.user.label: Username: xscreensaver-5.00b5-dont-allow-root.patch: --- NEW FILE xscreensaver-5.00b5-dont-allow-root.patch --- --- xscreensaver-5.00b5/driver/passwd-pam.c.dont-allow-root 2006-05-17 11:14:58.000000000 +0900 +++ xscreensaver-5.00b5/driver/passwd-pam.c 2006-05-18 15:13:39.000000000 +0900 @@ -288,6 +288,7 @@ goto DONE; } +#if 0 /* If that didn't work, set the user to root, and try to authenticate again. */ if (user) free (user); @@ -300,6 +301,7 @@ if (status != PAM_SUCCESS) goto DONE; PAM_NO_DELAY(pamh); +#endif set = block_sigchld(); status = pam_authenticate (pamh, 0); xscreensaver-5.00b5-include-directory.patch: --- NEW FILE xscreensaver-5.00b5-include-directory.patch --- --- xscreensaver-5.00b5/hacks/glx/Makefile.in.include-dir 2006-05-18 09:22:21.000000000 +0900 +++ xscreensaver-5.00b5/hacks/glx/Makefile.in 2006-05-18 15:21:02.000000000 +0900 @@ -207,6 +207,7 @@ install-program:: $(EXES) @exes="$(HACK_EXES)" ; \ idir="$(install_prefix)$(HACKDIR)" ; \ + echo "Installing hack programs in the directory $(install_prefix)$(HACKDIR)" ;\ if [ "$$exes" != "" ]; then \ if [ ! -d $$idir ]; then \ $(INSTALL_DIRS) $$idir ; \ @@ -220,6 +221,7 @@ # the xscreensaver-gl-helper program, in $bindir install-program:: $(EXES) @exes="@GL_UTIL_EXES@" ; \ + echo "Installing gl-helper program in the directory $(install_prefix)$(bindir)" ;\ idir="$(install_prefix)$(bindir)" ; \ if [ "$$exes" != "" ]; then \ if [ ! -d $$idir ]; then \ @@ -246,6 +248,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ; \ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -266,6 +269,7 @@ install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing XML config files in the directory $(install_prefix)$(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ --- xscreensaver-5.00b5/hacks/Makefile.in.include-dir 2006-05-18 09:22:18.000000000 +0900 +++ xscreensaver-5.00b5/hacks/Makefile.in 2006-05-18 15:21:02.000000000 +0900 @@ -254,6 +254,7 @@ @if [ ! -d $(install_prefix)$(HACKDIR) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ; \ fi ; \ + echo "Installing hack programs in the directory $(install_prefix)$(HACKDIR)" ;\ for program in $(NEXES); do \ echo $(INSTALL_PROGRAM) $$program \ $(install_prefix)$(HACKDIR)/$$program ; \ @@ -327,6 +328,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ;\ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -347,6 +349,7 @@ install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing XML config documents in the directory $(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ --- xscreensaver-5.00b5/driver/Makefile.in.include-dir 2006-05-18 09:22:18.000000000 +0900 +++ xscreensaver-5.00b5/driver/Makefile.in 2006-05-18 15:21:02.000000000 +0900 @@ -26,6 +26,7 @@ GTK_DATADIR = @GTK_DATADIR@ GTK_APPDIR = $(GTK_DATADIR)/applications GTK_ICONDIR = $(GTK_DATADIR)/pixmaps +SAVER_DATADIR = $(GTK_DATADIR)/xscreensaver GTK_GLADEDIR = $(GTK_DATADIR)/xscreensaver/glade HACK_CONF_DIR = @HACK_CONF_DIR@ @@ -290,6 +291,7 @@ $$e "" ;\ fi ; \ fi ; \ + echo "Installing driver programs in the directory $(install_prefix)$(bindir)" ;\ echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver @for exe in xscreensaver-command xscreensaver-demo \ @@ -302,6 +304,7 @@ @if [ ! -d $(install_prefix)$(AD_DIR) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(AD_DIR) ; \ fi + @echo "Installing XScreenSaver.ad in the directory $(install_prefix)$(AD_DIR)" @-echo $(INSTALL_DATA) XScreenSaver.ad \ $(install_prefix)$(AD_DIR)/XScreenSaver ; \ if $(INSTALL_DATA) XScreenSaver.ad \ @@ -375,6 +378,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ; \ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -418,7 +422,15 @@ dir="$(install_prefix)$(PAM_DIR)" ; \ conf="$(PAM_CONF)" ; \ \ + \ + if [ ! -d $$dir -a ! -f $$conf ] ; then \ + echo $(INSTALL_DIRS) $$dir ; \ + $(INSTALL_DIRS) $$dir ; \ + fi ; \ + \ + \ if [ -d $$dir ] ; then \ + echo "Installing pam script file in the directory $(install_prefix)$(PAM_DIR)" ;\ \ if [ -f $$dir/xdm ]; then \ src2=$$dir/xdm ; \ @@ -491,6 +503,7 @@ # into /usr/share/applications/ install-gnome:: screensaver-properties.desktop @if [ "$(GTK_DATADIR)" != "" ]; then \ + echo "Installing desktop text in the directory $(install_prefix)$(GTK_APPDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ @@ -507,6 +520,7 @@ # into /usr/share/pixmaps/ install-gnome:: $(LOGO) @if [ "$(GTK_DATADIR)" != "" ]; then \ + echo "Installing X pixmap image file in the directory $(install_prefix)$(GTK_ICONDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_ICONDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ @@ -522,6 +536,15 @@ # into /usr/share/xscreensaver/glade/ install-gnome:: @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + \ + \ + echo "Creating the directory $(install_prefix)$(SAVER_DATADIR)" ;\ + if [ ! -d "$(install_prefix)$(SAVER_DATADIR)" ] ; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + fi ; \ + \ + echo "Installing PNG image file in the directory $(install_prefix)$(GTK_GLADEDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ @@ -539,6 +562,15 @@ # into /usr/share/xscreensaver/glade/ install-gnome:: xscreensaver-demo.glade2 @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + \ + \ + echo "Creating the directory $(install_prefix)$(SAVER_DATADIR)" ;\ + if [ ! -d "$(install_prefix)$(SAVER_DATADIR)" ] ; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + fi ; \ + \ + echo "Installing XML glade2 file in the directory $(install_prefix)$(GTK_GLADEDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ @@ -605,6 +637,7 @@ # /usr/share/xscreensaver/config/README install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing README text in the directory $(install_prefix)$(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ xscreensaver-5.00b5-sanitize-hacks.patch: --- NEW FILE xscreensaver-5.00b5-sanitize-hacks.patch --- --- xscreensaver-5.00b5/hacks/barcode.c.sanitize-hacks 2006-04-06 15:40:32.000000000 +0900 +++ xscreensaver-5.00b5/hacks/barcode.c 2006-05-18 15:09:13.000000000 +0900 @@ -117,8 +117,6 @@ "belly", "bliss", "bogosity", - "boobies", - "boobs", "booty", "bread", "bubba", @@ -131,7 +129,6 @@ "children", "chocolate", "CLONE", - "cock", "constriction", "contrition", "cop", @@ -171,7 +168,6 @@ "fear", "fever", "filth", - "flatulence", "fluff", "fnord", "freedom", @@ -188,9 +184,7 @@ "happiness", "hate", "helplessness", - "hemorrhoid", "hermaphrodite", - "heroin", "heroine", "hope", "hysteria", @@ -265,7 +259,6 @@ "punishment", "punk rock", "punk", - "pussy", "quagmire", "quarantine", "quartz", @@ -274,7 +267,6 @@ "rage", "readout", "reality", - "rectum", "reject", "rejection", "respect", @@ -333,8 +325,6 @@ "vegetarian", "venom", "verifiability", - "viagra", - "vibrator", "victim", "vignette", "villainy", --- xscreensaver-5.00b5/hacks/glx/glsnake.c.sanitize-hacks 2006-05-04 04:39:21.000000000 +0900 +++ xscreensaver-5.00b5/hacks/glx/glsnake.c 2006-05-18 15:09:13.000000000 +0900 @@ -535,7 +535,7 @@ PIN, ZERO, RIGHT, RIGHT, ZERO, PIN, PIN, ZERO, PIN, PIN, ZERO, RIGHT, ZERO } }, - { "k's turd", + { "caterpillar", { RIGHT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, ZERO } @@ -560,22 +560,22 @@ ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO } }, - { "kissy box", + { "ribbon", { PIN, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, PIN, ZERO } }, - { "erect penis", /* thanks benno */ + { "shuffle board", /* thanks benno */ { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO } }, - { "flaccid penis", + { "anchor", { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO } }, - { "vagina", + { "engagement ring", { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, PIN, RIGHT, ZERO } @@ -995,7 +995,7 @@ { "Parrot", { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } }, - { "Penis", + { "Shuttle", { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } }, { "PictureComingSoon", --- NEW FILE xscreensaver.spec --- %define name xscreensaver %define version 5.00 %define fedora_rel 1 %define default_text %{_datadir}/doc/fedora-release-5.89/RELEASE-NOTES Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Summary: X screen saver and locker Name: %{name} Version: %{version} Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: BSD Group: Amusements/Graphics URL: http://www.jwz.org/xscreensaver/ Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz Patch0: xscreensaver-5.00b5-change-defaults.patch Patch1: xscreensaver-5.00b5-sanitize-hacks.patch Patch5: xscreensaver-5.00b5-dont-allow-root.patch Patch8: xscreensaver-5.00b5-include-directory.patch Patch101: xscreensaver-5.00-locale-safety.patch Patch102: xscreensaver-5.00-matherr-utils.patch # find_lang BuildRequires: gettext BuildRequires: desktop-file-utils Requires: fedora-release %package base Summary: A minimal installation of xscreensaver Group: Amusements/Graphics BuildRequires: bc BuildRequires: pam-devel > 0.80-7 BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel BuildRequires: libXinerama-devel BuildRequires: libXmu-devel BuildRequires: libXpm-devel BuildRequires: libXt-devel BuildRequires: libXxf86misc-devel BuildRequires: libXxf86vm-devel BuildRequires: libjpeg-devel BuildRequires: gtk2-devel libglade2-devel Requires: /etc/pam.d/system-auth, htmlview, desktop-backgrounds-basic Provides: xscreensaver = %{epoch}:%{version}-%{release} Obsoletes: xscreensaver %package extras Summary: An enhanced set of screensavers Group: Amusements/Graphics %package gl-extras Summary: An enhanced set of screensavers that require OpenGL Group: Amusements/Graphics Provides: xscreensaver-gl = %{epoch}:%{version}-%{release} Obsoletes: xscreensaver-gl BuildRequires: libGLU-devel, libGL-devel %description A modular screen saver and locker for the X Window System. More than 200 display modes are included in this package. %description base A modular screen saver and locker for the X Window System. This package contains the bare minimum needed to blank and lock your screen. The graphical display modes are the "xscreensaver-extras" and "xscreensaver-gl-extras" packages. %description extras A modular screen saver and locker for the X Window System. This package contains a variety of graphical screen savers for your mind-numbing, ambition-eroding, time-wasting, hypnotized viewing pleasure. %description gl-extras A modular screen saver and locker for the X Window System. This package contains a variety of OpenGL-based (3D) screen savers for your mind-numbing, ambition-eroding, time-wasting, hypnotized viewing pleasure. %prep %setup -q %patch0 -p1 -b .change-defaults %patch1 -p1 -b .sanitize-hacks %patch5 -p1 -b .dont-allow-root %patch8 -p1 -b .include-dir %patch101 -p1 -b .locale-safety %patch102 -p1 -b .matherr2 sed -i -e 's|version [45].[0-9a-z][0-9a-z]*|version %{version}|' \ driver/XScreenSaver.ad.in eval sed \ -i -e \'s\|\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\|`LANG=C date -u +'%%d-%%b-%%Y'`\|g\' \ driver/XScreenSaver.ad.in cd utils eval sed \ -i -e \'s\|\(\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\)\|\(`LANG=C date -u +'%%d-%%b-%%Y'`\)\|g\' \ -i -e \'s\|\\\(5.\[0-9\]\[0-9\]\\\)[a-z]\[0-9\]\[0-9\]\*\|\\\1\|\' \ -i -e \'s\|5.\[0-9\]\[0-9\]\|%{version}-`echo %{release} | sed -e 's|\..*||g'`\|g\' \ version.h cd .. if [ -x %{_datadir}/libtool/config.guess ]; then # use system-wide copy cp -p %{_datadir}/libtool/config.{sub,guess} . fi %build ################################# # suppress rpmlint booing # suppress about pam config (although this is # not the fault of xscreensaver.pam ......) mv driver/xscreensaver.pam driver/xscreensaver.pam.rpmlint head -n 5 driver/xscreensaver.pam.rpmlint > driver/xscreensaver.pam chmod 644 driver/xscreensaver.pam ################################# autoconf archdir=`./config.guess` mkdir $archdir cd $archdir export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" CONFIG_OPTS="--prefix=/usr --with-pam --without-shadow --without-kerberos" CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks" CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}" CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults" # This is flaky: # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager" ln -s ../configure . %configure $CONFIG_OPTS rm -f configure make %install archdir=`./config.guess` cd $archdir rm -rf ${RPM_BUILD_ROOT} make install_prefix=$RPM_BUILD_ROOT install desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ --add-category X-Red-Hat-Base \ $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop # This function prints a list of things that get installed. # It does this by parsing the output of a dummy run of "make install". list_files() { make -s install_prefix=${RPM_BUILD_ROOT} INSTALL=true "$@" \ | sed -e 's|directory* \([^ ][^ ]*\)$|/%%dir\1|' \ | sed -n -e 's at .* \(/[^ ]*\)$@\1 at p' \ | sed -e "s@${RPM_BUILD_ROOT}@@" \ -e "s@/[a-z][a-z]*/\.\./@/@" \ | sed -e '/%%dir/!s@\(.*/man/.*\)@\1\*@' \ -e '/%%dir/!s@\(.*/pam\.d/\)@%%config(noreplace) \1@' \ -e 's|/%%dir\([^ ][^ ]*\)$|%%dir \1|' \ | sort \ | uniq } # Generate three lists of files for the three packages. # dd=%{_builddir}/%{name}-%{version} ( cd hacks ; list_files install ) > $dd/extras.files ( cd hacks/glx ; list_files install ) > $dd/gl-extras.files ( cd driver ; list_files install ) > $dd/base.files # Add documents pushd $dd &> /dev/null for f in README* ; do echo "%%doc $f" >> $dd/base.files done popd %find_lang %{name} cat %{name}.lang | uniq >> $dd/base.files ################################# # suppress rpmlint booing # remove directories explicitly included in filesystem rpm for f in %{_bindir} %{_datadir}/applications \ %{_mandir}/man[1-9] %{_datadir}/pixmaps ; do ff=`echo $f | sed -e 's|\/|\\\\\\\\\/|g'` for g in $dd/*.files ; do eval sed -i -e \/$ff\$\/d $g done done # sanitize path in script file for f in ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-getimage-* \ ${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver/vidwhacker \ ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-text ; do if [ -f $f ] ; then sed -i -e 's|/usr//bin/|/usr/bin/|g' $f fi done # Make sure all files are readable by all, and writable only by owner. # chmod -R a+r,u+w,og-w ${RPM_BUILD_ROOT} %clean rm -rf ${RPM_BUILD_ROOT} %files -f base.files base %defattr(-,root,root) %files -f extras.files extras %defattr(-,root,root) %files -f gl-extras.files gl-extras %defattr(-,root,root) %changelog * Fri May 26 2006 Mamoru Tasaka - 1:5.00-1 - Update to 5.00 - Switch to extras, don't remove anything. * Fri Mar 24 2006 Ray Strode - 1:4.24-2 - add patch from jwz to reap zombie processes (bug 185833) * Fri Feb 10 2006 Jesse Keating - 1:4.24-1.1 - bump again for double-long bug on ppc(64) * Tue Feb 07 2006 Jesse Keating - 1:4.23-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Jan 13 2006 Ray Strode 1:4.23-1 - update to 4.23 - add a BuildRequires on imake (spotted by Mamoru Tasaka) - add a lot of patches and fixes from Mamoru Tasaka * Sat Dec 17 2005 Jesse Keating - rebuilt * Mon Dec 5 2005 Ray Strode 1:4.22-21 - Update list_files function to fix ownership issues. Patch from Mamoru Tasaka (mtasaka at ioa.s.u-tokyo.ac.jp) (bug 161728). * Tue Nov 1 2005 Ray Strode 1:4.22-20 - Switch requires to modular X * Thu Oct 13 2005 Tomas Mraz 1:4.22-19 - use include instead of pam_stack in pam config * Wed Sep 28 2005 Ray Strode 1:4.22-18 - accept zero timeout values for suspend and off. Patch from Mamoru Tasaka (bug 157501). * Fri Sep 23 2005 Ray Strode 1:4.22-17 - remove explicit dependency on xscreensaver-base for extras and gl-extras packages * Fri Sep 16 2005 Ray Strode 1:4.22-16 - don't allow root to authenticate lock dialog when selinux is enabled (bug 157014). * Fri Sep 9 2005 Ray Strode 1:4.22-15 - take BSOD out of the default random list (bug 105388). * Thu Sep 08 2005 Florian La Roche - add version-release to the Provides: * Wed Sep 7 2005 Ray Strode 1:4.22-13 - Patch from Mamoru Tasaka to improve man page handling (bug 167708). * Tue Sep 6 2005 Ray Strode 1:4.22-12 - remove density option from squiral screensaver, Patch from Mamoru Tasaka (bug 167374). * Wed Aug 31 2005 Ray Strode 1:4.22-11 - ignore unprintable characters in password dialog (bug 135966). * Thu Aug 25 2005 Ray Strode 1:4.22-10 - Move man pages to section 6 (bug 166441). * Wed Aug 24 2005 Ray Strode 1:4.22-9 - The only legitimate way to call realpath is with NULL buffer (bug 165270). * Fri Aug 19 2005 Ray Strode 1:4.22-8 - Don't try to use an invalid tree iterator (bug 166299) * Tue Aug 16 2005 Warren Togami - 1:4.22-7 - rebuild for new cairo * Wed Aug 10 2005 Ray Strode 1:4.22-6 - Don't call printf in signal handler (might fix 126428) * Wed Aug 3 2005 Ray Strode 1:4.22-5 - Update to xscreensaver 4.22. * Sun Jun 19 2005 Ray Strode 1:4.21-5 - Add build requires for desktop-file-utils (bug 160980). * Wed May 11 2005 Ray Strode 1:4.21-4 - Allow configuration gui to support hacks with absolute paths (bug 157417). * Mon May 09 2005 Ray Strode 1:4.21-3 - Use @libexecdir@/xscreensaver instead of @HACKDIR@ in default configuration file so that the path gets expanded fully (bug 156906). * Tue May 03 2005 Ray Strode 1:4.21-2 - Use absolute filenames for screenhacks so we don't pull in screenhacks from PATH (bug 151677). - Don't try to ping in sonar screensaver (bug 139692). * Sun Mar 20 2005 Ray Strode 1:4.21-1 - Update to xscreensaver-4.21. - Update spec file to better match new upstream spec file. * Fri Feb 25 2005 Nalin Dahyabhai 1:4.18-19 - We don't patch configure.in, so we don't need to run 'autoconf'. - Add --without-kerberos to skip built-in Kerberos password verification, so that we'll always go through PAM (fixes 149731). * Mon Feb 21 2005 Ray Strode 1:4.18-18 - Install desktop files to /usr/share/applications instead of /usr/share/control-center-2.0 (should fix bug 149229). * Thu Jan 6 2005 Ray Strode 1:4.18-17 - Change lock dialog instructions to only ask for password and not username. * Tue Jan 4 2005 Ray Strode 1:4.18-16 - Add patch to spec file to change defaults * Tue Jan 4 2005 Ray Strode 1:4.18-15 - Remove xscreensaver-config-tool after some discussions with jwz. - Take out some additional screensavers * Wed Dec 1 2004 Ray Strode 1:4.18-14 - Add utility xscreensaver-config-tool to make changing settings easier (replaces the short lived xscreensaver-register-hack program). Use xscreensaver-config-tool to set default settings instead of using patches. - Split up xscreensaver (fixes 121693). - Make preferences dialog slightly more pretty - Make lock dialog slightly more pretty * Fri Nov 26 2004 Than Ngo 1:4.18-13 - add patch to fix vroot bug and make xscreensaver working in KDE again. - get rid of webcollage, which often download porn images * Wed Nov 10 2004 Ray Strode 1:4.18-10 - Get rid of unnecessary xloadimage requirement (bug 100641) * Wed Nov 10 2004 Ray Strode 1:4.18-9 - Call pam_acct_mgmt() (might fix bug 137195) * Tue Nov 9 2004 Ray Strode 1:4.18-8 - Give vidwhacker screensaver working defaults (bug 64518) * Tue Nov 9 2004 Ray Strode 1:4.18-7 - Get rid of old crufty %{_datadir}/control-center/ tree (bug 114692) * Wed Nov 3 2004 Ray Strode 1:4.18-6 - rebuild for rawhide * Wed Nov 3 2004 Ray Strode 1:4.18-5 - Don't allow screensavers access to desktop images by default (bug #126809) - Lock screen by default (bug #126809) * Tue Oct 19 2004 4.18-4 - Add xscreensaver-4.18-stuff-piecewise-leak.patch to stop piecewise from leaking (#135164). * Wed Sep 1 2004 Ray Strode 4.18-3 - remove superfluous line in the spec file * Wed Sep 1 2004 Ray Strode 4.18-2 - blank the screen by default * Tue Aug 24 2004 Ray Strode 4.18-1 - update to 4.18 (fixes bug 87745). * Sat Aug 14 2004 Ray Strode 4.16-4 - change titles of questionably named bar codes (fixes bug 129929). * Fri Aug 6 2004 Ray Strode 4.16-3 - change titles of questionably named shape formations (fixes bug 129335). * Wed Jun 23 2004 Ray Strode 4.16-2 - use htmlview for browsing help. * Mon Jun 21 2004 Ray Strode 4.16-1 - update to 4.16. Use desktop-file-install for desktop file. * Tue Jun 15 2004 Elliot Lee - rebuilt * Wed May 5 2004 Bill Nottingham 4.14-5 - config tweaks * Wed Mar 31 2004 Karsten Hopp 4.14-4 - fix fortune stand-in (#115369) * Fri Feb 13 2004 Elliot Lee - rebuilt * Mon Oct 27 2003 Bill Nottingham 1:4.14-1 - update to 4.14 * Tue Oct 7 2003 Bill Nottingham 1:4.13-1 - take out flag-with-logo, don't require redhat-logos (#106046) - update to 4.13 * Wed Aug 27 2003 Bill Nottingham 1:4.12-1 - update to 4.12 (fixes #101920) - re-add BSOD to the random list * Tue Jun 24 2003 Bill Nottingham 1:4.11-1 - update to 4.11 * Fri Jun 13 2003 Bill Nottingham 1:4.10-3 - fix some 64-bit arches (#97359) * Wed Jun 04 2003 Elliot Lee - rebuilt * Wed May 28 2003 Bill Nottingham 1:4.10-1 - update to 4.10 * Thu Mar 20 2003 Bill Nottingham 1:4.09-1 - update to 4.09, now with bouncing cows * Mon Feb 10 2003 Bill Nottingham 1:4.07-2 - oops, xloadimage *is* needed (#83676) * Thu Feb 6 2003 Bill Nottingham 1:4.07-1 - update to 4.07, fixes #76276, #75574 * Wed Jan 22 2003 Tim Powers - rebuilt * Fri Nov 29 2002 Tim Powers 1:4.06-4 - call autoconf instead of autoconf-2.53 * Mon Nov 11 2002 Bill Nottingham 4.06-3 - put glade tweaks back in - switch pam package to not specify directories, to work on multilib arches * Fri Nov 8 2002 Nalin Dahyabhai 4.06-1 - add a BuildPrereq on bc, which configure requires - replace use of fortune with an innocuous-and-editable stand-in script in %{stand_in_path} - define FORTUNE_PROGRAM at compile-time to force apps to use what's specified even if it doesn't happen to be installed at compile-time * Sun Sep 2 2002 Bill Nottingham 4.05-6 - fix typo (#73246) * Wed Aug 28 2002 Bill Nottingham 4.05-5 - revert to non-gtk unlock dialog - fix translations * Mon Aug 12 2002 Bill Nottingham 4.05-4 - twiddle titlebar (#67844) - fix extraneous text (#70975) - tweak desktop entry (#69502) * Fri Aug 9 2002 Yu Shao 4.05-3 - use GTK_IM_MODULE=gtk-im-context-simple in lock widget - to avoid CJK IM weirdness (#70655, #68216) - xscreensaver-rh-imcjk.patch * Wed Jul 17 2002 Elliot Lee 4.05-2 - Add fortune-mod to buildprereq to make beehive happy - Fix find_lang usage - install translations properly by specifying datadir * Tue Jun 11 2002 Bill Nottingham 4.05-1 - update to 4.05 - use gtk2 lock widget () - some Red Hat-ifications - fix critical (#63916) * Mon Jun 10 2002 Bill Nottingham 4.04-2 - remove no longer needed xloadimage dependency * Mon Jun 3 2002 Bill Nottingham 4.04-1 - update to 4.04, gtk2 property dialog is now mainline * Thu May 16 2002 Bill Nottingham 4.03-1 - update to 4.03 - use gtk2 properties dialog * Thu Mar 14 2002 Bill Nottingham 4.01-2 - don't show screensavers that aren't available * Sun Feb 24 2002 Bill Nottingham - update to 4.01 * Mon Feb 11 2002 Bill Nottingham - update to 4.00 * Wed Jan 09 2002 Tim Powers - automated rebuild * Thu Aug 23 2001 Bill Nottingham - fix segfault on ia64 (#52336) * Thu Aug 9 2001 Bill Nottingham - never mind, back to 3.33 (wheeee) - hack window-id back in for the time being - disable memlimit so GL works * Mon Jul 23 2001 Bill Nottingham - oops, back to 3.32 for now - remove optflags override (oops) - add pam-devel buildprereq * Mon Jul 16 2001 Bill Nottingham - update to 3.33, fix broken last build - fix build weirdness on some package sets (#48905) - don't document non-existent options for forest (#49139) * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. * Tue May 22 2001 Havoc Pennington - putting in tree for David * Tue May 22 2001 David Sainty - added DPMS options to command line help * Sun Apr 22 2001 Bill Nottingham - update to 3.32 - add patch to specify DPMS settings on the command line * Wed Apr 11 2001 Bill Nottingham - update to 3.31 * Wed Apr 4 2001 Bill Nottingham - fix extrusion exclusion (#34742) * Tue Apr 3 2001 Bill Nottingham - disable GL screensavers by default (bleah) * Mon Feb 19 2001 Bill Nottingham - update to 3.29 (#27437) * Tue Jan 23 2001 Bill Nottingham - update to 3.27 * Fri Dec 01 2000 Bill Nottingham - rebuild because of broken fileutils * Fri Nov 10 2000 Bill Nottingham - 3.26 * Fri Aug 11 2000 Jonathan Blandford - Up Epoch and release * Wed Jul 26 2000 Bill Nottingham - hey, vidmode works again * Fri Jul 21 2000 Bill Nottingham - update to 3.25 * Thu Jul 13 2000 Prospector - automatic rebuild * Sat Jun 17 2000 Bill Nottingham - xscreensaver.kss is not a %%config file. * Sun Jun 11 2000 Bill Nottingham - tweak kss module (#11872) * Thu Jun 1 2000 Nalin Dahyabhai - modify PAM configuration to use system-auth * Thu May 18 2000 Preston Brown - added Red Hat screensaver (waving flag has logo now). * Fri May 5 2000 Bill Nottingham - tweaks for ia64 * Mon Apr 10 2000 Bill Nottingham - turn off xf86vidmode ext, so that binaries built against XFree86 4.0 work on 3.x servers * Wed Apr 5 2000 Bill Nottingham - turn off gnome support for now * Mon Apr 3 2000 Bill Nottingham - update to 3.24 * Wed Feb 09 2000 Preston Brown - wmconfig entry gone. * Mon Jan 31 2000 Bill Nottingham - update to 3.23 * Fri Jan 14 2000 Bill Nottingham - rebuild to fix GL depdencies * Tue Dec 14 1999 Bill Nottingham - everyone in GL - single package again * Fri Dec 10 1999 Bill Nottingham - update to 3.22 - turn off xf86vmode on alpha * Tue Dec 7 1999 Bill Nottingham - mmm... hardware accelerated GL on i386. :) :) * Mon Nov 22 1999 Bill Nottingham - 3.21 - use shm on alpha, let's see what breaks * Tue Nov 16 1999 Bill Nottingham - update to 3.20 * Wed Nov 3 1999 Bill Nottingham - update to 3.19 * Thu Oct 14 1999 Bill Nottingham - update to 3.18 * Sat Sep 25 1999 Bill Nottingham - add a '-oneshot' single time lock option. * Mon Sep 20 1999 Bill Nottingham - take webcollage out of random list (for people who pay for bandwidth) * Fri Sep 10 1999 Bill Nottingham - patch webcollage to use xloadimage - in the random list, run petri with -size 2 to save memory - extend RPM silliness to man pages, too. * Mon Jul 19 1999 Bill Nottingham - update to 3.17 - add a little RPM silliness to package GL stuff if it's built * Thu Jun 24 1999 Bill Nottingham - update to 3.16 * Mon May 10 1999 Bill Nottingham - update to 3.12 * Tue May 4 1999 Bill Nottingham - remove security problem introduced earlier * Wed Apr 28 1999 Bill Nottingham - update to 3.10 * Thu Apr 15 1999 Bill Nottingham - kill setuid the Right Way(tm) * Mon Apr 12 1999 Bill Nottingham - fix xflame on alpha * Mon Apr 12 1999 Preston Brown - upgrade to 3.09, fixes vmware interaction problems. * Mon Apr 5 1999 Bill Nottingham - remove setuid bit. Really. I mean it. * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 3) * Fri Mar 19 1999 Bill Nottingham - kill setuid, since pam works OK * Tue Mar 16 1999 Bill Nottingham - update to 3.08 * Wed Feb 24 1999 Bill Nottingham - wmconfig returns, and no one is safe... * Tue Feb 23 1999 Bill Nottingham - remove bsod from random list because it's confusing people???? *sigh* * Tue Jan 12 1999 Cristian Gafton - call libtoolize to get it to compile cleanely on the arm * Tue Jan 5 1999 Bill Nottingham - update to 3.07 * Mon Nov 23 1998 Bill Nottingham - update to 3.06 * Tue Nov 17 1998 Bill Nottingham - update to 3.04 * Thu Nov 12 1998 Bill Nottingham - update to 3.02 - PAMify * Tue Oct 13 1998 Cristian Gafton - take out Noseguy module b/c of possible TMv - install modules in /usr/X11R6/lib/xscreensaver - don't compile support for xshm on the alpha - properly buildrooted - updated to version 2.34 * Fri Aug 7 1998 Bill Nottingham - update to 2.27 * Wed Jun 10 1998 Prospector System - translations modified for de * Mon Jun 08 1998 Erik Troan - added fix for argv0 buffer overflow * Fri Apr 24 1998 Prospector System - translations modified for de, fr, tr * Sat Apr 11 1998 Donnie Barnes - updated from 2.10 to 2.16 - added buildroot * Wed Oct 25 1997 Marc Ewing - wmconfig * Thu Oct 23 1997 Marc Ewing - new version, configure * Fri Aug 22 1997 Erik Troan - built against glibc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 May 2006 18:16:46 -0000 1.1 +++ .cvsignore 26 May 2006 18:20:03 -0000 1.2 @@ -0,0 +1 @@ +xscreensaver-5.00.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 May 2006 18:16:46 -0000 1.1 +++ sources 26 May 2006 18:20:03 -0000 1.2 @@ -0,0 +1 @@ +2c26877fb0acd508b9a726dce6a77f78 xscreensaver-5.00.tar.gz From fedora-extras-commits at redhat.com Fri May 26 18:26:31 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:26:31 -0700 Subject: owners owners.list,1.1058,1.1059 Message-ID: <200605261826.k4QIQXSQ027800@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27783 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1058 retrieving revision 1.1059 diff -u -r1.1058 -r1.1059 --- owners.list 26 May 2006 17:21:51 -0000 1.1058 +++ owners.list 26 May 2006 18:26:30 -0000 1.1059 @@ -1787,6 +1787,7 @@ Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xscorch|A Scorched Earth clone|mgarski at post.pl|extras-qa at fedoraproject.org| +Fedora Extras|xscreensaver|X screen saver and locker|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org| Fedora Extras|xsp|ASP.NET page server|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 26 19:48:45 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 26 May 2006 12:48:45 -0700 Subject: rpms/banshee/FC-5 banshee.spec,1.8,1.9 sources,1.5,1.6 Message-ID: <200605261948.k4QJmleC030725@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30706 Modified Files: banshee.spec sources Log Message: * Tue May 2 2006 Christopher Aillon 0.10.10-1 - Update to 0.10.10 Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/FC-5/banshee.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- banshee.spec 16 Apr 2006 20:30:49 -0000 1.8 +++ banshee.spec 26 May 2006 19:48:45 -0000 1.9 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.9 -Release: 1.%{?dist} +Version: 0.10.10 +Release: 1%{?dist} Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -96,6 +96,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Tue May 2 2006 Christopher Aillon 0.10.10-1 +- Update to 0.10.10 + * Tue Mar 21 2006 Christopher Aillon 0.10.9-1 - Update to 0.10.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Apr 2006 20:30:49 -0000 1.5 +++ sources 26 May 2006 19:48:45 -0000 1.6 @@ -1 +1 @@ -86b67e399ea805f69a860b3e6fd4627f banshee-0.10.9.tar.gz +cb553f5bc6dc14b7afa44349d025bbdc banshee-0.10.10.tar.gz From fedora-extras-commits at redhat.com Fri May 26 19:53:57 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 12:53:57 -0700 Subject: rpms/pari/devel pari.spec,1.1,1.2 Message-ID: <200605261953.k4QJrxWS030797@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30780 Modified Files: pari.spec Log Message: Index: pari.spec =================================================================== RCS file: /cvs/extras/rpms/pari/devel/pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pari.spec 26 May 2006 17:25:12 -0000 1.1 +++ pari.spec 26 May 2006 19:53:56 -0000 1.2 @@ -1,6 +1,6 @@ Name: pari Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries @@ -20,7 +20,7 @@ BuildRequires: xorg-x11-devel %endif Requires: tetex-xdvi - +ExcludeArch: ppc %description PARI is a widely used computer algebra system designed for fast @@ -167,6 +167,9 @@ %changelog +* Fri May 26 2006 Gerard Milmeister - 2.3.0-3 +- Exclude ppc for now, since test fails + * Fri May 26 2006 Gerard Milmeister - 2.3.0-2 - added %%check section - use gmp From fedora-extras-commits at redhat.com Fri May 26 19:55:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 12:55:12 -0700 Subject: rpms/pari/FC-5 pari.spec,1.2,1.3 Message-ID: <200605261955.k4QJtE08030873@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30856 Modified Files: pari.spec Log Message: Index: pari.spec =================================================================== RCS file: /cvs/extras/rpms/pari/FC-5/pari.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pari.spec 26 May 2006 17:50:07 -0000 1.2 +++ pari.spec 26 May 2006 19:55:12 -0000 1.3 @@ -1,6 +1,6 @@ Name: pari Version: 2.3.0 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries @@ -20,7 +20,7 @@ BuildRequires: xorg-x11-devel %endif Requires: tetex-xdvi - +ExcludeArch: ppc %description PARI is a widely used computer algebra system designed for fast @@ -167,6 +167,9 @@ %changelog +* Fri May 26 2006 Gerard Milmeister - 2.3.0-3 +- Exclude ppc for now, since test fails + * Fri May 26 2006 Gerard Milmeister - 2.3.0-2 - added %%check section - use gmp From fedora-extras-commits at redhat.com Fri May 26 19:56:01 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 12:56:01 -0700 Subject: rpms/pari/FC-4 pari.spec,1.1,1.2 Message-ID: <200605261956.k4QJu3Fs030903@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30886 Modified Files: pari.spec Log Message: Index: pari.spec =================================================================== RCS file: /cvs/extras/rpms/pari/FC-4/pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pari.spec 26 May 2006 17:25:12 -0000 1.1 +++ pari.spec 26 May 2006 19:56:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: pari Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries @@ -20,7 +20,7 @@ BuildRequires: xorg-x11-devel %endif Requires: tetex-xdvi - +ExcludeArch: ppc %description PARI is a widely used computer algebra system designed for fast @@ -167,6 +167,9 @@ %changelog +* Fri May 26 2006 Gerard Milmeister - 2.3.0-3 +- Exclude ppc for now, since test fails + * Fri May 26 2006 Gerard Milmeister - 2.3.0-2 - added %%check section - use gmp From fedora-extras-commits at redhat.com Fri May 26 20:28:16 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 13:28:16 -0700 Subject: owners owners.list,1.1059,1.1060 Message-ID: <200605262028.k4QKSIKh000957@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv940 Modified Files: owners.list Log Message: added pari Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1059 retrieving revision 1.1060 diff -u -r1.1059 -r1.1060 --- owners.list 26 May 2006 18:26:30 -0000 1.1059 +++ owners.list 26 May 2006 20:28:16 -0000 1.1060 @@ -913,6 +913,7 @@ Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org| Fedora Extras|paraview|Parallel visualization application|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|pari|Number Theory-oriented Computer Algebra System|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com From fedora-extras-commits at redhat.com Fri May 26 20:41:50 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 26 May 2006 13:41:50 -0700 Subject: rpms/qt4/FC-5 qt4.spec,1.3,1.4 Message-ID: <200605262041.k4QKfqgv001009@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv992 Modified Files: qt4.spec Log Message: * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %buildSQL macro - -libdir %qt_libdir Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qt4.spec 24 May 2006 18:36:20 -0000 1.3 +++ qt4.spec 26 May 2006 20:41:50 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 4%{?dist}.1 +Release: 5%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -22,18 +22,16 @@ Source24: qtconfig.desktop ## Optional bits -# Build mysql plugins -%define mysql 1 -# Build postgresql plugins -%define psql 1 -# Build ODBC plugins -%define odbc 1 -# Build sqlite plugins -%define sqlite 1 +# Build SQL plugins (mysql, unixodbc, postgresql, sqlite) +%define buildSQL 1 +# define to build sqlite2 plugin (FIXME/TODO) +#define sqlite2 1 %define qt_dirname qt4 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/%{name}-doc-%{version} +# Be careful about ever changing this, some 3rd-party libs install here -- Rex +%define qt_libdir %{qtdir}/%{_lib} Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d @@ -56,24 +54,20 @@ %endif BuildRequires: %{x_deps} -%if %{mysql} +%if %{buildSQL} +# mysql # mysql-devel < 4 build fails on 4.1.3+, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") %global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql") %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g") -%endif -%if %{psql} +# postgresql BuildRequires: postgresql-devel -%endif - -%if %{odbc} +# unixODBC BuildRequires: unixODBC-devel -%endif - -%if %{sqlite} +# sqlite BuildRequires: sqlite-devel %endif @@ -160,9 +154,6 @@ %build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -184,8 +175,8 @@ echo yes | ./configure -v \ -no-rpath \ -prefix %{qtdir} \ - -libdir %{qtdir}/%{_lib} \ -docdir %{qt_docdir} \ + -libdir %{qt_libdir} \ -platform %{platform} \ -release \ -shared \ @@ -195,18 +186,12 @@ -system-zlib \ -system-libpng \ -system-libjpeg \ -%if %{mysql} +%if %{buildSQL} -plugin-sql-mysql \ %{?mysql_include} \ %{?mysql_ldflags} \ -%endif -%if %{psql} -plugin-sql-psql \ -%endif -%if %{odbc} -plugin-sql-odbc \ -%endif -%if %{sqlite} -plugin-sql-sqlite \ %endif -cups \ @@ -227,27 +212,24 @@ %install rm -rf %{buildroot} -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" - make install INSTALL_ROOT=%{buildroot} ## pkg-config # strip extraneous dirs/libraries -- Rex # safe ones for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done # not-so-safe, but we can try -- Rex -for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl +# -L/usr/X11R6/%{_lib} +for dep in -lXrender -lXrandr -lXcursor -lXinerama -lXi -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done -sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl +sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ pushd %{buildroot}%{_libdir}/pkgconfig @@ -297,10 +279,10 @@ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} # .la files, die, die, die. -rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la +rm -f %{buildroot}%{qt_libdir}/lib*.la mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{qt_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean @@ -319,8 +301,8 @@ /etc/ld.so.conf.d/* %dir %{qtdir} %dir %{qtdir}/bin/ -%dir %{qtdir}/%{_lib}/ -%{qtdir}/%{_lib}/lib*.so.* +%dir %{qt_libdir} +%{qt_libdir}/lib*.so.* %dir %{qtdir}/plugins/ %{qtdir}/plugins/accessible/ %{qtdir}/plugins/imageformats/ @@ -354,13 +336,12 @@ %{_bindir}/uic* %{qtdir}/include/ %{qtdir}/mkspecs/ -%dir %{qtdir}/%{_lib} -%{qtdir}/%{_lib}/lib*.so +%{qt_libdir}/lib*.so # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a -%{qtdir}/%{_lib}/lib*.a -%{qtdir}/%{_lib}/lib*.prl +%{qt_libdir}/lib*.a +%{qt_libdir}/lib*.prl %{qtdir}/phrasebooks/ -%{qtdir}/%{_lib}/*.pc +%{qt_libdir}/*.pc %{_libdir}/pkgconfig/*.pc %{qtdir}/q3porting.xml # Qt designer @@ -390,25 +371,19 @@ %{_bindir}/qt*demo* %{_datadir}/applications/*qtdemo*.desktop -%if %{odbc} +%if %{buildSQL} %files odbc %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc* -%endif -%if %{psql} %files postgresql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql* -%endif -%if %{mysql} %files mysql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql* -%endif -%if %{sqlite} %files sqlite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite* @@ -416,6 +391,11 @@ %changelog +* Fri May 26 2006 Rex Dieter 4.1.3-5 +- strip -lXi from .pc files (#193258) +- simplify sql plugin builds via %%buildSQL macro +- -libdir %%qt_libdir + * Wed May 24 2006 Rex Dieter 4.1.3-4 - move (most) %%dir ownership (back) to main pkg From fedora-extras-commits at redhat.com Fri May 26 20:42:19 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 26 May 2006 13:42:19 -0700 Subject: rpms/qt4/FC-4 qt4.spec,1.2,1.3 Message-ID: <200605262042.k4QKgLla001071@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1054 Modified Files: qt4.spec Log Message: * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %buildSQL macro - -libdir %qt_libdir Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt4.spec 24 May 2006 14:45:14 -0000 1.2 +++ qt4.spec 26 May 2006 20:42:19 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -22,18 +22,16 @@ Source24: qtconfig.desktop ## Optional bits -# Build mysql plugins -%define mysql 1 -# Build postgresql plugins -%define psql 1 -# Build ODBC plugins -%define odbc 1 -# Build sqlite plugins -%define sqlite 1 +# Build SQL plugins (mysql, unixodbc, postgresql, sqlite) +%define buildSQL 1 +# define to build sqlite2 plugin (FIXME/TODO) +#define sqlite2 1 %define qt_dirname qt4 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/%{name}-doc-%{version} +# Be careful about ever changing this, some 3rd-party libs install here -- Rex +%define qt_libdir %{qtdir}/%{_lib} Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d @@ -56,24 +54,20 @@ %endif BuildRequires: %{x_deps} -%if %{mysql} +%if %{buildSQL} +# mysql # mysql-devel < 4 build fails on 4.1.3+, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") %global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql") %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g") -%endif -%if %{psql} +# postgresql BuildRequires: postgresql-devel -%endif - -%if %{odbc} +# unixODBC BuildRequires: unixODBC-devel -%endif - -%if %{sqlite} +# sqlite BuildRequires: sqlite-devel %endif @@ -160,9 +154,6 @@ %build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -184,8 +175,8 @@ echo yes | ./configure -v \ -no-rpath \ -prefix %{qtdir} \ - -libdir %{qtdir}/%{_lib} \ -docdir %{qt_docdir} \ + -libdir %{qt_libdir} \ -platform %{platform} \ -release \ -shared \ @@ -195,18 +186,12 @@ -system-zlib \ -system-libpng \ -system-libjpeg \ -%if %{mysql} +%if %{buildSQL} -plugin-sql-mysql \ %{?mysql_include} \ %{?mysql_ldflags} \ -%endif -%if %{psql} -plugin-sql-psql \ -%endif -%if %{odbc} -plugin-sql-odbc \ -%endif -%if %{sqlite} -plugin-sql-sqlite \ %endif -cups \ @@ -227,27 +212,24 @@ %install rm -rf %{buildroot} -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" - make install INSTALL_ROOT=%{buildroot} ## pkg-config # strip extraneous dirs/libraries -- Rex # safe ones for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done # not-so-safe, but we can try -- Rex -for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl +# -L/usr/X11R6/%{_lib} +for dep in -lXrender -lXrandr -lXcursor -lXinerama -lXi -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done -sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl +sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ pushd %{buildroot}%{_libdir}/pkgconfig @@ -297,10 +279,10 @@ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} # .la files, die, die, die. -rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la +rm -f %{buildroot}%{qt_libdir}/lib*.la mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{qt_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean @@ -319,8 +301,8 @@ /etc/ld.so.conf.d/* %dir %{qtdir} %dir %{qtdir}/bin/ -%dir %{qtdir}/%{_lib}/ -%{qtdir}/%{_lib}/lib*.so.* +%dir %{qt_libdir} +%{qt_libdir}/lib*.so.* %dir %{qtdir}/plugins/ %{qtdir}/plugins/accessible/ %{qtdir}/plugins/imageformats/ @@ -354,13 +336,12 @@ %{_bindir}/uic* %{qtdir}/include/ %{qtdir}/mkspecs/ -%dir %{qtdir}/%{_lib} -%{qtdir}/%{_lib}/lib*.so +%{qt_libdir}/lib*.so # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a -%{qtdir}/%{_lib}/lib*.a -%{qtdir}/%{_lib}/lib*.prl +%{qt_libdir}/lib*.a +%{qt_libdir}/lib*.prl %{qtdir}/phrasebooks/ -%{qtdir}/%{_lib}/*.pc +%{qt_libdir}/*.pc %{_libdir}/pkgconfig/*.pc %{qtdir}/q3porting.xml # Qt designer @@ -390,25 +371,19 @@ %{_bindir}/qt*demo* %{_datadir}/applications/*qtdemo*.desktop -%if %{odbc} +%if %{buildSQL} %files odbc %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc* -%endif -%if %{psql} %files postgresql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql* -%endif -%if %{mysql} %files mysql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql* -%endif -%if %{sqlite} %files sqlite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite* @@ -416,6 +391,11 @@ %changelog +* Fri May 26 2006 Rex Dieter 4.1.3-5 +- strip -lXi from .pc files (#193258) +- simplify sql plugin builds via %%buildSQL macro +- -libdir %%qt_libdir + * Wed May 24 2006 Rex Dieter 4.1.3-4 - move (most) %%dir ownership (back) to main pkg From fedora-extras-commits at redhat.com Fri May 26 21:34:26 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:34:26 -0700 Subject: rpms/crossfire-client/FC-5 crossfire-client.spec,1.1,1.2 Message-ID: <200605262134.k4QLYSuX004039@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4022 Modified Files: crossfire-client.spec Log Message: Create and own directory for client sounds and images Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/FC-5/crossfire-client.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crossfire-client.spec 16 May 2006 16:42:03 -0000 1.1 +++ crossfire-client.spec 26 May 2006 21:34:26 -0000 1.2 @@ -66,6 +66,9 @@ --add-category Application \ gtk/crossfire-client.desktop +# Create this directory that will be used by the client image and +# sound packages. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -90,6 +93,7 @@ # Sound support is too broken to use in Fedora right now. #%{_bindir}/cfsndserv #%{_bindir}/cfsndserv_alsa9 +%dir %{_datadir}/crossfire/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png From fedora-extras-commits at redhat.com Fri May 26 21:34:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:34:50 -0700 Subject: rpms/crossfire-client/FC-4 crossfire-client.spec,1.1,1.2 Message-ID: <200605262134.k4QLYqQl004068@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4045 Modified Files: crossfire-client.spec Log Message: Create and own directory for client sounds and images. Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/FC-4/crossfire-client.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crossfire-client.spec 16 May 2006 16:42:03 -0000 1.1 +++ crossfire-client.spec 26 May 2006 21:34:50 -0000 1.2 @@ -66,6 +66,9 @@ --add-category Application \ gtk/crossfire-client.desktop +# Create this directory that will be used by the client image and +# sound packages. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -90,6 +93,7 @@ # Sound support is too broken to use in Fedora right now. #%{_bindir}/cfsndserv #%{_bindir}/cfsndserv_alsa9 +%dir %{_datadir}/crossfire/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png From fedora-extras-commits at redhat.com Fri May 26 21:37:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:37:42 -0700 Subject: rpms/crossfire-client/devel crossfire-client.spec,1.1,1.2 Message-ID: <200605262137.k4QLbibF004196@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4179 Modified Files: crossfire-client.spec Log Message: Add dist tag. Create and own directory for client sounds and images. Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/crossfire-client.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crossfire-client.spec 16 May 2006 16:42:03 -0000 1.1 +++ crossfire-client.spec 26 May 2006 21:37:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: crossfire-client Version: 1.9.0 -Release: 2 +Release: 3%{?dist} Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPL @@ -66,6 +66,9 @@ --add-category Application \ gtk/crossfire-client.desktop +# Create this directory that will be used by the client image and +# sound packages. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -90,6 +93,7 @@ # Sound support is too broken to use in Fedora right now. #%{_bindir}/cfsndserv #%{_bindir}/cfsndserv_alsa9 +%dir %{_datadir}/crossfire/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png @@ -103,5 +107,8 @@ %changelog +* Fri May 9 2006 Wart 1.9.0-3 +- Create and own the directory for client sounds and images + * Thu Mar 9 2006 Wart 1.9.0-2 - Initial spec file following Fedora Extras conventions From fedora-extras-commits at redhat.com Fri May 26 21:38:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:38:17 -0700 Subject: rpms/crossfire-client/FC-4 crossfire-client.spec,1.2,1.3 Message-ID: <200605262138.k4QLcn1V004278@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4246/FC-4 Modified Files: crossfire-client.spec Log Message: Add dist tag Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/FC-4/crossfire-client.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- crossfire-client.spec 26 May 2006 21:34:50 -0000 1.2 +++ crossfire-client.spec 26 May 2006 21:38:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: crossfire-client Version: 1.9.0 -Release: 2 +Release: 2%{?dist} Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPL From fedora-extras-commits at redhat.com Fri May 26 21:38:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:38:17 -0700 Subject: rpms/crossfire-client/FC-5 crossfire-client.spec,1.2,1.3 Message-ID: <200605262138.k4QLcnhm004281@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4246/FC-5 Modified Files: crossfire-client.spec Log Message: Add dist tag Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/FC-5/crossfire-client.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- crossfire-client.spec 26 May 2006 21:34:26 -0000 1.2 +++ crossfire-client.spec 26 May 2006 21:38:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: crossfire-client Version: 1.9.0 -Release: 2 +Release: 2%{?dist} Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPL From fedora-extras-commits at redhat.com Sat May 27 01:19:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 26 May 2006 18:19:52 -0700 Subject: owners owners.list,1.1060,1.1061 Message-ID: <200605270119.k4R1Js2E014433@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14416 Modified Files: owners.list Log Message: Someone had orphaned perl-XML-Simple Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1060 retrieving revision 1.1061 diff -u -r1.1060 -r1.1061 --- owners.list 26 May 2006 20:28:16 -0000 1.1060 +++ owners.list 27 May 2006 01:19:52 -0000 1.1061 @@ -1281,7 +1281,7 @@ Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|zing at fastmail.fm|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 27 06:11:51 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:11:51 -0700 Subject: rpms/tcltls/devel - New directory Message-ID: <200605270611.k4R6BrrB026956@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26927/tcltls/devel Log Message: Directory /cvs/extras/rpms/tcltls/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 06:11:50 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:11:50 -0700 Subject: rpms/tcltls - New directory Message-ID: <200605270611.k4R6Bqs5026953@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26927/tcltls Log Message: Directory /cvs/extras/rpms/tcltls added to the repository From fedora-extras-commits at redhat.com Sat May 27 06:12:08 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:12:08 -0700 Subject: rpms/tcltls Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605270612.k4R6CASX027007@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26974 Added Files: Makefile import.log Log Message: Setup of module tcltls --- NEW FILE Makefile --- # Top level Makefile for module tcltls all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 06:12:08 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:12:08 -0700 Subject: rpms/tcltls/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605270612.k4R6CAVI027010@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26974/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tcltls --- NEW 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 May 27 06:13:33 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:13:33 -0700 Subject: rpms/tcltls import.log,1.1,1.2 Message-ID: <200605270613.k4R6DZph027119@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27078 Modified Files: import.log Log Message: auto-import tcltls-1.5.0-10 on branch devel from tcltls-1.5.0-10.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tcltls/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 06:12:08 -0000 1.1 +++ import.log 27 May 2006 06:13:33 -0000 1.2 @@ -0,0 +1 @@ +tcltls-1_5_0-10:HEAD:tcltls-1.5.0-10.src.rpm:1148710402 From fedora-extras-commits at redhat.com Sat May 27 06:13:34 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:13:34 -0700 Subject: rpms/tcltls/devel tcltls-1.5-64bit.patch, NONE, 1.1 tcltls-1.5-ciphertest-KRB5.patch, NONE, 1.1 tcltls-1.5-pkgindex-version.patch, NONE, 1.1 tcltls-1.5-relpath.patch, NONE, 1.1 tcltls-1.5-rpmoptflags.patch, NONE, 1.1 tcltls-configurein.pkgname.patch, NONE, 1.1 tcltls-makefilein-soname.patch, NONE, 1.1 tcltls-tclm4-soname.patch, NONE, 1.1 tcltls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605270613.k4R6DaVw027140@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27078/devel Modified Files: .cvsignore sources Added Files: tcltls-1.5-64bit.patch tcltls-1.5-ciphertest-KRB5.patch tcltls-1.5-pkgindex-version.patch tcltls-1.5-relpath.patch tcltls-1.5-rpmoptflags.patch tcltls-configurein.pkgname.patch tcltls-makefilein-soname.patch tcltls-tclm4-soname.patch tcltls.spec Log Message: auto-import tcltls-1.5.0-10 on branch devel from tcltls-1.5.0-10.src.rpm tcltls-1.5-64bit.patch: --- NEW FILE tcltls-1.5-64bit.patch --- diff -Naur tls1.5/config/tcl.m4 tls1.5.new/config/tcl.m4 --- tls1.5/config/tcl.m4 2006-03-28 12:17:43.000000000 -0800 +++ tls1.5.new/config/tcl.m4 2006-03-28 12:21:10.000000000 -0800 @@ -68,7 +68,9 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${prefix}/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` ; do if test -f "$i/tclConfig.sh" ; then diff -Naur tls1.5/configure tls1.5.new/configure --- tls1.5/configure 2006-03-28 12:20:15.000000000 -0800 +++ tls1.5.new/configure 2006-03-28 12:21:10.000000000 -0800 @@ -1362,7 +1362,9 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${prefix}/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` ; do if test -f "$i/tclConfig.sh" ; then tcltls-1.5-ciphertest-KRB5.patch: --- NEW FILE tcltls-1.5-ciphertest-KRB5.patch --- --- tls1.5/tests/ciphers.test~ 2006-03-27 20:44:22.000000000 +0200 +++ tls1.5/tests/ciphers.test 2006-03-27 20:48:40.000000000 +0200 @@ -95,6 +95,12 @@ EXP-DES-CBC-SHA EXP-EDH-DSS-DES-CBC-SHA EXP-EDH-RSA-DES-CBC-SHA +EXP-KRB5-DES-CBC-MD5 +EXP-KRB5-DES-CBC-SHA +EXP-KRB5-RC2-CBC-MD5 +EXP-KRB5-RC2-CBC-SHA +EXP-KRB5-RC4-MD5 +EXP-KRB5-RC4-SHA EXP-RC2-CBC-MD5 EXP-RC4-MD5 EXP1024-DES-CBC-SHA @@ -103,7 +109,12 @@ EXP1024-RC2-CBC-MD5 EXP1024-RC4-MD5 EXP1024-RC4-SHA -IDEA-CBC-SHA +KRB5-DES-CBC-MD5 +KRB5-DES-CBC-SHA +KRB5-DES-CBC3-MD5 +KRB5-DES-CBC3-SHA +KRB5-RC4-MD5 +KRB5-RC4-SHA RC4-MD5 RC4-SHA }] \n] @@ -133,6 +144,12 @@ EXP-DES-CBC-SHA EXP-EDH-DSS-DES-CBC-SHA EXP-EDH-RSA-DES-CBC-SHA +EXP-KRB5-DES-CBC-MD5 +EXP-KRB5-DES-CBC-SHA +EXP-KRB5-RC2-CBC-MD5 +EXP-KRB5-RC2-CBC-SHA +EXP-KRB5-RC4-MD5 +EXP-KRB5-RC4-SHA EXP-RC2-CBC-MD5 EXP-RC4-MD5 EXP1024-DES-CBC-SHA @@ -141,7 +158,12 @@ EXP1024-RC2-CBC-MD5 EXP1024-RC4-MD5 EXP1024-RC4-SHA -IDEA-CBC-SHA +KRB5-DES-CBC-MD5 +KRB5-DES-CBC-SHA +KRB5-DES-CBC3-MD5 +KRB5-DES-CBC3-SHA +KRB5-RC4-MD5 +KRB5-RC4-SHA RC4-MD5 RC4-SHA }] \n] tcltls-1.5-pkgindex-version.patch: --- NEW FILE tcltls-1.5-pkgindex-version.patch --- --- tls1.5/pkgIndex.tcl.in~ 2006-04-24 16:08:03.000000000 +0200 +++ tls1.5/pkgIndex.tcl.in 2006-04-24 16:09:06.000000000 +0200 @@ -5,5 +5,5 @@ # replace the original which didn't include the commands from "tls.tcl". # -package ifneeded tls 1.5 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]" +package ifneeded tls 1.50 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]" tcltls-1.5-relpath.patch: --- NEW FILE tcltls-1.5-relpath.patch --- diff -u tls1.5~/configure tls1.5/configure --- tls1.5~/configure 2002-02-04 23:46:09.000000000 +0100 +++ tls1.5/configure 2006-04-24 15:56:32.000000000 +0200 @@ -1297,7 +1297,7 @@ ;; *) CYGPATH=echo - RELPATH=".." + RELPATH="" ;; esac diff -u tls1.5~/configure.in tls1.5/configure.in --- tls1.5~/configure.in 2002-02-04 23:46:09.000000000 +0100 +++ tls1.5/configure.in 2006-04-24 15:56:56.000000000 +0200 @@ -227,7 +227,7 @@ ;; *) CYGPATH=echo - RELPATH=".." + RELPATH="" ;; esac tcltls-1.5-rpmoptflags.patch: --- NEW FILE tcltls-1.5-rpmoptflags.patch --- --- tls1.5/Makefile.in 2004-02-03 20:02:17.000000000 -0800 +++ tls1.5.new/Makefile.in 2006-03-28 12:23:54.000000000 -0800 @@ -170,7 +170,7 @@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ AR = ar -CFLAGS = @CFLAGS@ +CFLAGS = @TCL_EXTRA_CFLAGS@ @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ tcltls-configurein.pkgname.patch: --- NEW FILE tcltls-configurein.pkgname.patch --- --- tls1.5/configure.in~ 2006-03-24 09:51:35.000000000 +0100 +++ tls1.5/configure.in 2006-03-24 09:52:47.000000000 +0100 @@ -365,7 +365,7 @@ *) if test "${SHARED_BUILD}" = "1" ; then SHLIB_LD_LIBS="${TCL_STUB_LIB_SPEC} -L${SSL_LIB_DIR} -lssl -L${SSL_LIB_DIR} -lcrypto ${GCCPATH} ${GCCLIB}" - eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}" + eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}-${SHARED_LIB_SUFFIX}" RANLIB=: else eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}" diff -Naur tls1.5/configure tls1.5.new/configure --- tls1.5/configure 2002-02-04 14:46:09.000000000 -0800 +++ tls1.5.new/configure 2006-03-28 12:19:02.000000000 -0800 @@ -1796,7 +1796,7 @@ *) if test "${SHARED_BUILD}" = "1" ; then SHLIB_LD_LIBS="${TCL_STUB_LIB_SPEC} -L${SSL_LIB_DIR} -lssl -L${SSL_LIB_DIR} -lcrypto ${GCCPATH} ${GCCLIB}" - eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}" + eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}-${SHARED_LIB_SUFFIX}" RANLIB=: else eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}" tcltls-makefilein-soname.patch: --- NEW FILE tcltls-makefilein-soname.patch --- --- tls1.5/Makefile.in~ 2006-03-24 09:01:58.000000000 +0100 +++ tls1.5/Makefile.in 2006-03-24 09:03:11.000000000 +0100 @@ -136,7 +136,7 @@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ -SHLIB_LD = @SHLIB_LD@ +SHLIB_LD = @SHLIB_LD@ -Wl,-soname,${@} SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ STLIB_LD = @STLIB_LD@ tcltls-tclm4-soname.patch: --- NEW FILE tcltls-tclm4-soname.patch --- --- tls1.5/config/tcl.m4~ 2006-04-24 15:38:18.000000000 +0200 +++ tls1.5/config/tcl.m4 2006-04-24 15:39:00.000000000 +0200 @@ -826,7 +826,7 @@ CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" if test "$have_dl" = yes; then - SHLIB_LD="${CC} -shared" + SHLIB_LD='${CC} -shared -Wl,-soname,${@}' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="-rdynamic" --- NEW FILE tcltls.spec --- Name: tcltls Version: 1.5.0 Release: 10%{?dist} Summary: OpenSSL extension for Tcl Group: Development/Libraries License: BSD URL: http://tls.sourceforge.net/ Source0: http://dl.sourceforge.net/tls/tls%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, tcl-devel Patch1: tcltls-configurein.pkgname.patch Patch2: tcltls-1.5-rpmoptflags.patch Patch3: tcltls-1.5-64bit.patch Patch4: tcltls-makefilein-soname.patch Patch5: tcltls-tclm4-soname.patch Patch6: tcltls-1.5-relpath.patch Patch7: tcltls-1.5-pkgindex-version.patch Patch8: tcltls-1.5-ciphertest-KRB5.patch %description A TLS OpenSSL extension for Tcl %package devel Group: Development/Libraries Summary: Header files for the OpenSSL extension for Tcl Requires: %{name} = %{version}-%{release} %description devel The TLS OpenSSL extension to Tcl This package contains the development files for tls. %prep %setup -n tls1.5 -q %patch1 -p1 -b .1-pkgname %patch2 -p1 -b .2-rpmoptflags %patch3 -p1 -b .3-64bit %patch4 -p1 -b .4-soname %patch5 -p1 -b .5-soname %patch6 -p1 -b .6-relpath %patch7 -p1 -b .7-pkgindex-version %patch8 -p1 -b .8-ciphertest %build %configure --with-ssl-dir=%{_prefix} make %{?_smp_mflags} %check make test %install rm -rf $RPM_BUILD_ROOT make install libdir=${RPM_BUILD_ROOT}%{_libdir} includedir=${RPM_BUILD_ROOT}%{_includedir} #1.50 vs 1.5.0 mv $RPM_BUILD_ROOT/%{_libdir}/tls1.50 $RPM_BUILD_ROOT/%{_libdir}/tls%{version} mv $RPM_BUILD_ROOT/%{_libdir}/libtls-1.50.so $RPM_BUILD_ROOT/%{_libdir}/tls%{version}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README.txt ChangeLog license.terms %{_libdir}/tls%{version}/ %files devel %defattr(-,root,root,-) %{_includedir}/tls.h %changelog * Fri May 26 2006 Sander Hoentjen - 1.5.0-10 - reverted name change to tcltls * Fri May 26 2006 Sander Hoentjen - 1.5.0-9 - in reply to comment #39 from bug #186327 (review by wart) - changed name from tcltls to tcl-tls - changed lib dir from tls1.50 to tls1.5.0 - changed summary - removed some commented lines - use macro in configure instead of hardcoded /usr - changed group - removed inhereted tags in devel package * Tue Apr 24 2006 Sander Hoentjen - 1.5.0-8 - Source0 dl.sf.net instead of download.sf.net * Tue Apr 24 2006 Sander Hoentjen - 1.5.0-7 - source tarball has same md5sum as upstream now * Tue Apr 24 2006 Sander Hoentjen - 1.5.0-6 - added make test - no more enable-symbols * Tue Apr 24 2006 Sander Hoentjen - 1.5.0-5 patches from Wart (wart at kobold.org): - Patch1: tcltls-configurein.pkgname.patch - Patch2: tcltls-1.5-rpmoptflags.patch - Patch3: tcltls-1.5-64bit.patch Moved libtls out of /usr/lib into subdir * Tue Mar 28 2006 Sander Hoentjen - 1.5.0-4 * Tue Mar 28 2006 Sander Hoentjen - 1.5.0-3 * Thu Mar 23 2006 Sander Hoentjen - 1.5.0-2 - invalid-soname fixed - docs added (including license) - devel package has %defattr now * Tue Mar 21 2006 Sander Hoentjen - 1.5.0-1 - created Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tcltls/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 06:12:08 -0000 1.1 +++ .cvsignore 27 May 2006 06:13:34 -0000 1.2 @@ -0,0 +1 @@ +tls1.5.0-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tcltls/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 06:12:08 -0000 1.1 +++ sources 27 May 2006 06:13:34 -0000 1.2 @@ -0,0 +1 @@ +9eeab472475773b3810acc808ebec759 tls1.5.0-src.tar.gz From fedora-extras-commits at redhat.com Sat May 27 06:30:22 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:30:22 -0700 Subject: owners owners.list,1.1061,1.1062 Message-ID: <200605270630.k4R6UOal027223@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27194 Modified Files: owners.list Log Message: added tcltls Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1061 retrieving revision 1.1062 diff -u -r1.1061 -r1.1062 --- owners.list 27 May 2006 01:19:52 -0000 1.1061 +++ owners.list 27 May 2006 06:30:22 -0000 1.1062 @@ -1588,6 +1588,7 @@ Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tclsoap|Tcl commands for SOAP remote procedure calls|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|tcltls|OpenSSL extension for Tcl|sander at hoentjen.eu|extras-qa at fedoraproject.org| Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 27 07:11:19 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:11:19 -0700 Subject: rpms/php-pear-Mail - New directory Message-ID: <200605270711.k4R7BLa4029747@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29721/php-pear-Mail Log Message: Directory /cvs/extras/rpms/php-pear-Mail added to the repository From fedora-extras-commits at redhat.com Sat May 27 07:11:20 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:11:20 -0700 Subject: rpms/php-pear-Mail/devel - New directory Message-ID: <200605270711.k4R7BM9J029750@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29721/php-pear-Mail/devel Log Message: Directory /cvs/extras/rpms/php-pear-Mail/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 07:11:52 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:11:52 -0700 Subject: rpms/php-pear-Mail Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605270711.k4R7Bsab029801@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29768 Added Files: Makefile import.log Log Message: Setup of module php-pear-Mail --- NEW FILE Makefile --- # Top level Makefile for module php-pear-Mail all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 07:11:52 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:11:52 -0700 Subject: rpms/php-pear-Mail/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605270711.k4R7BsJh029804@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29768/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-Mail --- NEW 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 May 27 07:13:03 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:13:03 -0700 Subject: rpms/php-pear-Mail import.log,1.1,1.2 Message-ID: <200605270713.k4R7D5eM029871@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29837 Modified Files: import.log Log Message: auto-import php-pear-Mail-1.1.10-4.fc5 on branch devel from php-pear-Mail-1.1.10-4.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-pear-Mail/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 07:11:52 -0000 1.1 +++ import.log 27 May 2006 07:13:03 -0000 1.2 @@ -0,0 +1 @@ +php-pear-Mail-1_1_10-4_fc5:HEAD:php-pear-Mail-1.1.10-4.fc5.src.rpm:1148714054 From fedora-extras-commits at redhat.com Sat May 27 07:13:04 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:13:04 -0700 Subject: rpms/php-pear-Mail/devel PHP-LICENSE-3.01, NONE, 1.1 php-pear-Mail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605270713.k4R7D6KL029876@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29837/devel Modified Files: .cvsignore sources Added Files: PHP-LICENSE-3.01 php-pear-Mail.spec Log Message: auto-import php-pear-Mail-1.1.10-4.fc5 on branch devel from php-pear-Mail-1.1.10-4.fc5.src.rpm --- NEW FILE PHP-LICENSE-3.01 --- -------------------------------------------------------------------- The PHP License, version 3.01 Copyright (c) 1999 - 2006 The PHP Group. All rights reserved. -------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name "PHP" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact group at php.net. 4. Products derived from this software may not be called "PHP", nor may "PHP" appear in their name, without prior written permission from group at php.net. You may indicate that your software works in conjunction with PHP by saying "Foo for PHP" instead of calling it "PHP Foo" or "phpfoo" 5. The PHP Group may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. Once covered code has been published under a particular version of the license, you may always continue to use it under the terms of that version. You may also choose to use such covered code under the terms of any subsequent version of the license published by the PHP Group. No one other than the PHP Group has the right to modify the terms applicable to covered code created under this License. 6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes PHP software, freely available from ". THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- This software consists of voluntary contributions made by many individuals on behalf of the PHP Group. The PHP Group can be contacted via Email at group at php.net. For more information on the PHP Group and the PHP project, please see . PHP includes the Zend Engine, freely available at . --- NEW FILE php-pear-Mail.spec --- %define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear) %define xmldir %{peardir}/.pkgxml Summary: PEAR: Class that provides multiple interfaces for sending emails Summary(fr): PEAR: Une Classe fournissant des interfaces pour envoyer des emails Name: php-pear-Mail Version: 1.1.10 Release: 4%{?dist} License: PHP License Group: Development/Libraries Source: http://pear.php.net/get/Mail-%{version}.tgz Source1: PHP-LICENSE-3.01 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://pear.php.net/package/Mail BuildRequires: php-pear(PEAR) >= 1.4.9 Provides: php-pear(Mail) = %{version} Requires: php-pear(PEAR) >= 1.4.9 # Requires(hint): php-pear(Net_SMTP) >= 1.1.0 Requires(post): php-pear Requires(postun): php-pear BuildArch: noarch %description PEAR's Mail package defines an interface for implementing mailers under the PEAR hierarchy. It also provides supporting functions useful to multiple mailer backends. Currently supported backends include: PHP's native mail() function, sendmail, and SMTP. This package also provides a RFC822 email address list validation utility class. php-pear-Mail can optionally use package "php-pear-Net-SMTP" (version >= 1.1.0). %description -l fr L'extension Mail d??finie une interfance permettant de construire des gestionnaires de courrier dans l'arborescence PEAR. Elle fournie aussi des fonctions utiles ?? l'utilisation de ces gestionnaires. Actuellement elle supporte la fonction PHP standard mail(), sendmail et SMTP. Cette extension contient aussi une classe permettant de v??rifer la conformit?? ?? la RFC822 des liste d'adresses de courrier. php-pear-Mail peut optionellement utiliser l'extension "php-pear-Net-SMTP" (version >= 1.1.0). %prep %setup -c -T # XXX Source files location is missing here in pear cmd pear -v -c pearrc \ -d php_dir=%{peardir} \ -d doc_dir=/docs \ -d bin_dir=%{_bindir} \ -d data_dir=%{peardir}/data \ -d test_dir=%{peardir}/test \ -d ext_dir=%{_libdir} \ -s %install rm -rf %{buildroot} pear -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0} rm pearrc rm %{buildroot}/%{peardir}/.filemap rm %{buildroot}/%{peardir}/.lock rm -rf %{buildroot}/%{peardir}/.registry rm -rf %{buildroot}/%{peardir}/.channels rm %{buildroot}/%{peardir}/.depdb rm %{buildroot}/%{peardir}/.depdblock %{__mkdir_p} %{buildroot}%{xmldir} tar -xzf %{SOURCE0} package.xml cp -p package.xml %{buildroot}%{xmldir}/Mail.xml %{__install} -m 644 -c %{SOURCE1} LICENSE %check # Sanity check lst=$(find %{buildroot}%{peardir} -exec grep -q %{buildroot} {} \; -print) [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1; %clean rm -rf %{buildroot} %post pear install --nodeps --soft --force --register-only %{xmldir}/Mail.xml >/dev/null %postun # if refcount = 0 then package has been removed (not upgraded) if [ "$1" -eq "0" ]; then pear uninstall --nodeps --ignore-errors --register-only Mail >/dev/null fi %files %defattr(-,root,root) %{peardir}/Mail.php %{peardir}/Mail %{peardir}/test/Mail %{xmldir}/Mail.xml %doc LICENSE %changelog * Mon May 15 2006 Remi Collet 1.1.10-4.fc5 - Require pear >= 1:1.4.9 - Requires(hint): php-pear(Net_SMTP) >= 1.1.0 (only comment actually) - bundle the v3.01 PHP LICENSE file - use --packagingroot (instead of -R) - check from install to check (as in php-pear) * Sun May 14 2006 Remi Collet 1.1.10-3.fc5 - License : PHP -> PHP License * Sat May 06 2006 Remi Collet 1.1.10-2.fc5 - new spec for extras - use %{_datadir}/pear/.pkgxml for XML (Bug #190252) * Thu Apr 27 2006 Remi Collet 1.1.10-1.fc5 - spec for extras * Wed Apr 26 2006 Remi Collet 1.1.10-1.fc{3,4,5}.remi - update to 1.1.10 * Thu Apr 06 2006 Remi Collet 1.1.9-2.fc{3,4,5}.remi - change /var/lib/pear to %{_libdir}/php/pear for XML (as in extras for FC5) - spec cleanning * Sat Jan 7 2006 Remi Collet 1.1.9-1.fc{3,4}.remi - initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Mail/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 07:11:52 -0000 1.1 +++ .cvsignore 27 May 2006 07:13:04 -0000 1.2 @@ -0,0 +1 @@ +Mail-1.1.10.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Mail/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 07:11:52 -0000 1.1 +++ sources 27 May 2006 07:13:04 -0000 1.2 @@ -0,0 +1 @@ +a1ea25fb8ef61062e178bd34ab15ba33 Mail-1.1.10.tgz From fedora-extras-commits at redhat.com Sat May 27 07:16:16 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:16:16 -0700 Subject: owners owners.list,1.1062,1.1063 Message-ID: <200605270716.k4R7GI2R029939@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29920 Modified Files: owners.list Log Message: Adding php-pear-Mail Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1062 retrieving revision 1.1063 diff -u -r1.1062 -r1.1063 --- owners.list 27 May 2006 06:30:22 -0000 1.1062 +++ owners.list 27 May 2006 07:16:15 -0000 1.1063 @@ -1297,6 +1297,7 @@ Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.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-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org| +Fedora Extras|php-pear-Mail|PEAR: Class that provides multiple interfaces for sending emails|Fedora at FamilleCollet.com|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| From fedora-extras-commits at redhat.com Sat May 27 08:08:40 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sat, 27 May 2006 01:08:40 -0700 Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec, 1.1, 1.2 Message-ID: <200605270808.k4R88gsA032356@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32339 Modified Files: jack-audio-connection-kit.spec Log Message: Remove optimization switcher. Index: jack-audio-connection-kit.spec =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jack-audio-connection-kit.spec 26 May 2006 17:15:12 -0000 1.1 +++ jack-audio-connection-kit.spec 27 May 2006 08:08:40 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.101.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL/LGPL Group: System Environment/Daemons Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz @@ -54,14 +54,10 @@ # Also patch0 touches configure.ac. autoreconf --force --install -%configure --enable-stripped-jackd \ +%configure \ --with-html-dir=%{_docdir} \ -%ifarch i386 - --enable-sse=no --enable-mmx=no \ -%endif --disable-oss \ --disable-portaudio \ - --enable-optimize \ --with-default-tmpdir=/dev/shm make %{?_smp_mflags} @@ -123,6 +119,9 @@ %{_bindir}/jack_simple_client %changelog +* Sat May 27 2006 Andy Shevchenko 0.101.1-9 +- remove --enable-stripped-jackd and --enable-optimize (use default flags) + * Fri May 19 2006 Andy Shevchenko 0.101.1-8 - uniform directories items at %files section From fedora-extras-commits at redhat.com Sat May 27 11:10:21 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 04:10:21 -0700 Subject: rpms/gcfilms/FC-4 .cvsignore, 1.7, 1.8 gcfilms.spec, 1.7, 1.8 sources, 1.9, 1.10 Message-ID: <200605271110.k4RBANuq007980@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7944/FC-4 Modified Files: .cvsignore gcfilms.spec sources Log Message: auto-import gcfilms-6.2-1.fc4 on branch FC-4 from gcfilms-6.2-1.fc4.src.rpm New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 18 Feb 2006 13:34:26 -0000 1.7 +++ .cvsignore 27 May 2006 11:10:21 -0000 1.8 @@ -1 +1 @@ -gcfilms-6.1.tar.gz +gcfilms-6.2.tar.gz Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-4/gcfilms.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gcfilms.spec 27 Feb 2006 19:57:24 -0000 1.7 +++ gcfilms.spec 27 May 2006 11:10:21 -0000 1.8 @@ -1,6 +1,6 @@ Name: gcfilms -Version: 6.1 -Release: 2%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: Movies collection management Group: Applications/Databases @@ -97,11 +97,6 @@ %{_datadir}/mime/packages/%{name}.xml %changelog -* Mon Feb 27 2006 Tian - 6.1-2 - - New version because of a problem on build systems - (use of lib64 instead of lib on x86 systems) -* Sat Feb 18 2006 Tian - 6.1-1 - - New upstream version. * Sun Nov 20 2005 Tian - 6.0-1 - New upstream version. - Changed description to follow upstream conventions. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 Feb 2006 13:21:11 -0000 1.9 +++ sources 27 May 2006 11:10:21 -0000 1.10 @@ -1 +1 @@ -03da9f046268672f3f71c9887e2adbf3 gcfilms-6.1.tar.gz +933333293c4907aa33b3d52a7c022d9b gcfilms-6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 27 11:10:18 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 04:10:18 -0700 Subject: rpms/gcfilms import.log,1.7,1.8 Message-ID: <200605271110.k4RBAojN007983@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7944 Modified Files: import.log Log Message: auto-import gcfilms-6.2-1.fc4 on branch FC-4 from gcfilms-6.2-1.fc4.src.rpm New upstream version Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gcfilms/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 19 Nov 2005 17:17:09 -0000 1.7 +++ import.log 27 May 2006 11:10:18 -0000 1.8 @@ -4,3 +4,4 @@ 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 gcfilms-6_0-1_fc4:FC-4:gcfilms-6.0-1.fc4.src.rpm:1132420620 +gcfilms-6_2-1_fc4:FC-4:gcfilms-6.2-1.fc4.src.rpm:1148728209 From fedora-extras-commits at redhat.com Sat May 27 11:43:33 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 04:43:33 -0700 Subject: rpms/gcfilms/FC-4 gcfilms.spec,1.8,1.9 Message-ID: <200605271143.k4RBhZEm008133@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8116 Modified Files: gcfilms.spec Log Message: update changelog for 6.2 Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-4/gcfilms.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gcfilms.spec 27 May 2006 11:10:21 -0000 1.8 +++ gcfilms.spec 27 May 2006 11:43:33 -0000 1.9 @@ -97,6 +97,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat May 27 2006 Tian - 6.2-1 + - New upstream version. * Sun Nov 20 2005 Tian - 6.0-1 - New upstream version. - Changed description to follow upstream conventions. From fedora-extras-commits at redhat.com Sat May 27 11:48:00 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sat, 27 May 2006 04:48:00 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack_Bug_191515.patch, NONE, 1.1 ctapi-cyberjack.spec, 1.1, 1.2 ctapi-cyberjack_MakefileCtAPI.patch, 1.1, 1.2 ctapi-cyberjack_MakefilePCSC.patch, 1.1, 1.2 Message-ID: <200605271148.k4RBm2bt008183@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8147 Modified Files: ctapi-cyberjack.spec ctapi-cyberjack_MakefileCtAPI.patch ctapi-cyberjack_MakefilePCSC.patch Added Files: ctapi-cyberjack_Bug_191515.patch Log Message: - first test for the new version 2.0.10 of the driver - it need some testing because on some kernels sometimes the reader will not found ctapi-cyberjack_Bug_191515.patch: --- NEW FILE ctapi-cyberjack_Bug_191515.patch --- diff -Naur ctapi-cyberjack-2.0.10.org/makevars ctapi-cyberjack-2.0.10/makevars --- ctapi-cyberjack-2.0.10.org/makevars 2006-05-27 12:40:17.000000000 +0200 +++ ctapi-cyberjack-2.0.10/makevars 2006-05-27 12:43:51.000000000 +0200 @@ -23,7 +23,7 @@ CFLAGS+= -DHAVE_READLINE_HISTORY_H -DHAVE_READLINE_READLINE_H # include the known include folders -CFLAGS+= -I/usr/local/include -I/usr/include +CFLAGS+= -I/lib/modules/XX/source/include # the following is debugging stuff. If all works fine you want need this Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack.spec 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack.spec 27 May 2006 11:48:00 -0000 1.2 @@ -1,42 +1,46 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader -Version: 2.0.8 -Release: 13%{?dist} -Requires: %{_libdir}/ctapi -#For FC>4 -BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 -#For FC4 -#BuildRequires: libusb-devel readline-devel -URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.8/ctapi-cyberjack-2.0.8.tar.bz2 +Version: 2.0.10 +Release: 1_FC4 +BuildRequires: libusb, readline-devel, ncurses-devel, kernel-devel License: LGPL -Group: Development/Libraries +Group: System Environment/Libraries Source: %{name}-%{version}.tar.bz2 -Patch0: ctapi-cyberjack_MakefileCtAPI.patch -Patch1: ctapi-cyberjack_MakefilePCSC.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -#for FC4 -#%%define readers_dir %{_libdir}/readers -#for FC>4 -%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir) +Patch0: ctapi-cyberjack-2.0.4-rh73_old_libusb.patch +Buildroot: %{_tmppath}/ctapi-cyberjack-%{version}-%{release}-root + +#%define prefix /usr +#%define lib_dir %{prefix}/lib +%define readers_dir %{_libdir}/readers + +%package ifd-handler +Summary: cyberjack PC/SC IFD handler for pcsc-lite +Requires: %{name} = %{version} +Group: System Environment/Libraries + +%description ifd-handler +REINER SCT cyberJack pinpad/e-com USB user space driver + +This package includes the PC/SC IFD handler driver for the cyberJack +pinpad/e-com USB chipcard reader. + %package devel Summary: Development files for libctapi-cyberjack Requires: %{name} = %{version} Group: Development/Libraries -%package pcsc -Summary: PC/SC Module -Requires: pcsc-lite -Group: Development/Libraries - %description REINER SCT cyberJack pinpad/e-com USB user space driver This package includes the CT-API driver for the cyberJack pinpad/e-com USB chipcard reader. +This package changes the permissions of /dev/ttyUSB devices 0-3 to +2666. This gives the users the possibility to access the devices and +enables mandatory locking. + The kernel side driver is included in the official linux kernel starting with version 2.4.6. @@ -45,166 +49,111 @@ controllers. For more information about the reader, software updates and a shop see -http://www.reiner-sct.com - - WARNING -Use the tool ctsh only when you know what you are doing!!! -Or you can damage your SmartCard!!! - - Hint -When using the CT-API lib you must first stop the PC/SC daemon, -when you use it. +http://www.reiner-sct.com/ %description devel Development files for libctapi-cyberjack -%description pcsc -Files for the PC/SC system. - %prep %setup -q -n %{name}-%{version} -#fix path for the driver lib the config file - sed -i "s\/usr/lib/readers/libcyberjack_ifd.so\%{readers_dir}/libcyberjack_ifd.so\1" \ - etc/reader.conf - -#fix reader.conf for FC>4 - sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf - -%patch0 -p1 -%patch1 -p1 - %build -#make %{?_smp_mflags} will fail!!! -make +##Fedora korrektur +sed -e "s/CFLAGS+=\ -I\/usr\/local\/include\ -I\/usr\/include/CFLAGS+=\ -I\/usr\/local\/include\ -I\/lib\/modules\/$(uname -r)\/source\/include\ -I\/usr\/include/g" makevars >makevars.neu +mv makevars.neu makevars +make %install -rm -rf $RPM_BUILD_ROOT - +if [ -n "%{buildroot}" ] ; then + [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +fi # CT-API -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi -mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{_libdir}/ctapi/libctapi-cyberjack.so -install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h -install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/cjgeldkarte -install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ctsh - +mkdir -p %{buildroot}/%{readers_dir} +install -m 755 ctapi/libctapi-cyberjack.so %{buildroot}/%{readers_dir}/libctapi-cyberjack.so.%{version} +install -m 755 ctapi/libctapi-cyberjack.a %{buildroot}/%{readers_dir}/libctapi-cyberjack.a +( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so.%{version} libctapi-cyberjack.so ) +( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so libctapi.so ) +( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi.so libctapi.so ) +( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi-cyberjack.a libctapi-cyberjack.a ) +mkdir -p %{buildroot}/%{_includedir} +install -m 644 ctapi/include/ctapi.h %{buildroot}/%{_includedir}/ctapi.h +mkdir -p %{buildroot}/%{_bindir} +install -m 755 tools/cjgeldkarte %{buildroot}/%{_bindir}/cjgeldkarte +install -m 755 tools/ctsh %{buildroot}/%{_bindir}/ctsh # PC/SC -mkdir -p $RPM_BUILD_ROOT%{readers_dir} -install -m 755 pcsc/libcyberjack_ifd.so $RPM_BUILD_ROOT%{readers_dir}/libcyberjack_ifd.so -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d -install -m 444 etc/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/cyberjack.conf - -%post pcsc -#register PC/SC driver and restart daemon -/sbin/service pcscd condrestart||: - -%postun pcsc -#unregister PC/SC driver and restart daemon -/sbin/service pcscd condrestart||: - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +#mkdir -p %{buildroot}/%{readers_dir} +mkdir -p %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux +install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so %{buildroot}/%{readers_dir}/libcyberjack_ifd.so.%{version} +install -m 444 pcsc/ifd-cyberjack.bundle/Contents/Info.plist %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist +install -m 444 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo +( cd %{buildroot}/%{readers_dir}; ln -s libcyberjack_ifd.so.%{version} libcyberjack_ifd.so ) +( cd %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux; ln -s %{readers_dir}/libcyberjack_ifd.so cyberjack-ifd.so ) +mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d +install -m 644 etc/reader.conf %{buildroot}%{_sysconfdir}/reader.conf.d/cyberjack.conf + +%pre +groupadd -r cyberjack 2>/dev/null || : + +%post ifd-handler +/usr/sbin/update-reader.conf + +%post +if [ -e /dev/ttyUSB0 ] ; then + chmod 2666 /dev/ttyUSB0 +else + mknod -m 2666 /dev/ttyUSB0 c 188 0 +fi +if [ -e /dev/ttyUSB1 ] ; then + chmod 2666 /dev/ttyUSB1 +else + mknod -m 2666 /dev/ttyUSB1 c 188 1 +fi +if [ -e /dev/ttyUSB2 ] ; then + chmod 2666 /dev/ttyUSB2 +else + mknod -m 2666 /dev/ttyUSB2 c 188 2 +fi +if [ -e /dev/ttyUSB3 ] ; then + chmod 2666 /dev/ttyUSB3 +else + mknod -m 2666 /dev/ttyUSB3 c 188 3 +fi %clean -rm -rf $RPM_BUILD_ROOT +if [ -n "%{buildroot}" ] ; then + [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +fi %files -%doc COPYRIGHT* -%doc doc/README.txt -%doc doc/README.pdf -%doc doc/README.html - -%defattr(-,root,root,-) +%defattr(0644,root,root) +%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.pdf doc/README.html doc/README.txt MAKEUSBDEV tools/ctshrc.example # CT-API -%{_libdir}/ctapi/libctapi-cyberjack.so -%{_bindir}/cjgeldkarte -%{_bindir}/ctsh +%{readers_dir}/libctapi-cyberjack.so.%{version} +%{readers_dir}/libctapi-cyberjack.so +%{readers_dir}/libctapi.so +%{_libdir}/libctapi.so +%attr(0755,root,root) %{_bindir}/cjgeldkarte +%attr(0755,root,root) %{prefix}/bin/ctsh -%files pcsc # PC/SC -%defattr(755,root,root) +%files ifd-handler +/%{readers_dir}/libcyberjack_ifd.so.%{version} /%{readers_dir}/libcyberjack_ifd.so -%attr(644,root,root) %config(noreplace) %{_sysconfdir}/reader.conf.d/cyberjack.conf +%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo +%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist +%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux/cyberjack-ifd.so +%{_sysconfdir}/reader.conf.d/cyberjack.conf %files devel %defattr(0644,root,root) -%{_includedir}/ctapi-cyberjack/ctapi.h - -%changelog -* Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} -- rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to - libcyberjack_ifd.so -- fix place for the comments of /sbin/service pcscd condrestart - -* Wed May 10 2006 Frank B??ttner - 2.0.8-12%{?dist} -- fix comments for %%post/%%postun pcsc -- fix call of restart the PC/SC daemon -- move to the old version of dependency for the PC/SC package -- add -soname option in PS/SC driver - -* Tue May 9 2006 Frank B??ttner - 2.0.8-11%{?dist} -- remove comments at %%post and %%postun -- remove unneeded /usr/sbin/update-reader.conf call - -* Mon May 8 2006 Frank B??ttner - 2.0.8-10%{?dist} -- fix ldconfig for the PC/SC part -- fix dependency for the PC/SC package -- fix build dependency for the package. - -* Mon May 8 2006 Frank B??ttner - 2.0.8-9%{?dist} -- restart PC/SC daemon only when it run's -- fix CT-API version bug so that apps can find it in the ldcache via - libctapi-cyberjack.so -- add comment about using CT-API and PC/SC together - -* Sun May 7 2006 Frank B??ttner - 2.0.8-8%{?dist} -- add requirement of the ctapi dir under %{_libdir} -- the CT-API lib lives now under %{_libdir}/ctapi -- reenable link the ctapi driver static in the PC/SC part -- run ldconfig after install/uninstall - -* Mon May 1 2006 Frank B??ttner - 2.0.8-7%{?dist} -- fix permission of ctapi-cyberjack-2.0.8.tar.bz2 and ctapi-cyberjack.spec -- fix permisson of the PC/SC config file -- restart PC/SC daemon after remove the PS/SC driver - -* Sun Apr 30 2006 Frank B??ttner - 2.0.8-6%{?dist} -- replace if statements with comments -- replace german to english comments -- fix the makefile for the CT-API lib -- correct naming the libs CT-API and PS/SC -- rename package PS/SC to pcsc -- replace RPM_BUILD_ROOT -- fix doc -- add warning for the tool ctsh - -* Thu Apr 27 2006 Frank B??ttner - 2.0.8-5%{dist} -- fix owner of lib's -- add PC/SC fix for FC5 -- restart pcscd - -* Thu Apr 27 2006 Frank B??ttner - 2.0.8-4%{dist} -- change permisson of all lib's to 0755 -- rename lib files to support more reader's -- fix the path of the CT-API part and the devel file -- support FC4 and FC5 - -* Sat Apr 15 2006 Frank B??ttner - 2.0.8-3%{dist} -- remove makefile workaround - -* Sat Apr 15 2006 Frank B??ttner - 2.0.8-2%{dist} -- remove packager -- remove hardcodet Fedora Tag -- rename file from ctapi-cyberjack-version to ctapi-cyberjack -- modify source URL -- fix clean section - -* Sat Apr 08 2006 Frank B??ttner - 2.0.8-1.FC4 -- start for Fedora -- sepperate the PC/SC part +%{_includedir}/ctapi.h +%{readers_dir}/libctapi-cyberjack.a +%{_libdir}/libctapi-cyberjack.a + +%changelog -n ctapi-cyberjack +* Mon May 30 2005 - Harald Welte ++ ctapi-cyberjack-2.0.9-1 +- add pcsc-lite 'dropdir' compatible PC/SC driver * Wed Mar 02 2005 - Harald Welte + ctapi-cyberjack-2.0.8-1 ctapi-cyberjack_MakefileCtAPI.patch: Index: ctapi-cyberjack_MakefileCtAPI.patch =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack_MakefileCtAPI.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack_MakefileCtAPI.patch 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack_MakefileCtAPI.patch 27 May 2006 11:48:00 -0000 1.2 @@ -1,13 +1,12 @@ -diff -Naur ctapi-cyberjack-2.0.8.org/ctapi/Makefile ctapi-cyberjack-2.0.8/ctapi/Makefile ---- ctapi-cyberjack-2.0.8.org/ctapi/Makefile 2005-02-15 00:57:54.000000000 +0100 -+++ ctapi-cyberjack-2.0.8/ctapi/Makefile 2006-05-01 10:50:54.000000000 +0200 -@@ -22,7 +22,8 @@ +diff -Naur ctapi-cyberjack-2.0.10.org/ctapi/Makefile ctapi-cyberjack-2.0.10/ctapi/Makefile +--- ctapi-cyberjack-2.0.10.org/ctapi/Makefile 2006-05-27 12:40:17.000000000 +0200 ++++ ctapi-cyberjack-2.0.10/ctapi/Makefile 2006-05-27 13:17:09.000000000 +0200 +@@ -22,7 +22,7 @@ $(CC) $(CFLAGS) -o $@ -c $^ libso: $(OBJS) $(LIBS) - ld -x --shared -lusb -o libctapi-cyberjack.so $(OBJS) $(LIBS) -+ ld -x --shared -lusb -lc -soname libctapi-cyberjack.so -o libctapi-cyberjack.so \ -+ $(OBJS) $(LIBS) ++ ld -x --shared -lusb -lc -soname libctapi-cyberjack.so -o libctapi-cyberjack.so $(OBJS) $(LIBS) liba: $(OBJS) $(LIBS) mkdir tmp ctapi-cyberjack_MakefilePCSC.patch: Index: ctapi-cyberjack_MakefilePCSC.patch =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack_MakefilePCSC.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack_MakefilePCSC.patch 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack_MakefilePCSC.patch 27 May 2006 11:48:00 -0000 1.2 @@ -1,12 +1,12 @@ -diff -Naur ctapi-cyberjack-2.0.8.org/pcsc/Makefile ctapi-cyberjack-2.0.8/pcsc/Makefile ---- ctapi-cyberjack-2.0.8.org/pcsc/Makefile 2005-02-15 00:59:03.000000000 +0100 -+++ ctapi-cyberjack-2.0.8/pcsc/Makefile 2006-05-01 10:55:41.000000000 +0200 -@@ -20,7 +18,7 @@ - install -o root -g root libcyberjack_ifd.so $(INSTALL_PREFIX)/lib +diff -Naur ctapi-cyberjack-2.0.10.org/pcsc/Makefile ctapi-cyberjack-2.0.10/pcsc/Makefile +--- ctapi-cyberjack-2.0.10.org/pcsc/Makefile 2006-05-27 12:40:17.000000000 +0200 ++++ ctapi-cyberjack-2.0.10/pcsc/Makefile 2006-05-27 13:19:27.000000000 +0200 +@@ -24,7 +24,7 @@ + install -o root -g root $(PLUGDIR)/PkgInfo $(INSTALL_PREFIX)/lib/pcsc/drivers/$(PLUGDIR)/PkgInfo libso: $(OBJS) -- ld -x --shared -lusb -o libcyberjack_ifd.so $(OBJS) -+ ld -x --shared -lusb -lc -soname libcyberjack_ifd.so -o libcyberjack_ifd.so $(OBJS) +- ld -x --shared -lusb -o $(PLUGDIR)/Linux/ifd-cyberjack.so $(OBJS) ++ ld -x --shared -lusb -lc -soname ifd-cyberjack.so -o $(PLUGDIR)/Linux/ifd-cyberjack.so $(OBJS) liba: $(OBJS) ar r libcyberjack_ifd.a $(OBJS) $(CTOBJS) From fedora-extras-commits at redhat.com Sat May 27 11:48:56 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 04:48:56 -0700 Subject: rpms/gcfilms/FC-5 .cvsignore, 1.5, 1.6 gcfilms.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200605271148.k4RBmwto008210@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8189 Modified Files: .cvsignore gcfilms.spec sources Log Message: Preparation of 6.2 for FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Feb 2006 13:37:13 -0000 1.5 +++ .cvsignore 27 May 2006 11:48:56 -0000 1.6 @@ -1 +1 @@ -gcfilms-6.1.tar.gz +gcfilms-6.2.tar.gz Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-5/gcfilms.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gcfilms.spec 27 Feb 2006 20:00:24 -0000 1.10 +++ gcfilms.spec 27 May 2006 11:48:56 -0000 1.11 @@ -1,6 +1,6 @@ Name: gcfilms -Version: 6.1 -Release: 2%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: Movies collection management Group: Applications/Databases @@ -97,6 +97,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat May 27 2006 Tian - 6.2-1 + - New upstream version. * Mon Feb 27 2006 Tian - 6.1-2 - New version because of a problem on build systems (use of lib64 instead of lib on x86 systems) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Feb 2006 13:23:14 -0000 1.7 +++ sources 27 May 2006 11:48:56 -0000 1.8 @@ -1 +1 @@ -03da9f046268672f3f71c9887e2adbf3 gcfilms-6.1.tar.gz +933333293c4907aa33b3d52a7c022d9b gcfilms-6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 27 11:56:44 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sat, 27 May 2006 04:56:44 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec,1.2,1.3 Message-ID: <200605271156.k4RBukqm008320@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8303 Modified Files: ctapi-cyberjack.spec Log Message: - wrong spec files was used:( Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ctapi-cyberjack.spec 27 May 2006 11:48:00 -0000 1.2 +++ ctapi-cyberjack.spec 27 May 2006 11:56:43 -0000 1.3 @@ -1,46 +1,46 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.10 -Release: 1_FC4 -BuildRequires: libusb, readline-devel, ncurses-devel, kernel-devel +Release: 2%{?dist} +Requires: %{_libdir}/ctapi +#kernel-devel needed for workaround bug 191515 +#For FC>4 +BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 kernel-devel +#For FC4 +#BuildRequires: libusb-devel readline-devel kernel-devel + +URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.10/ctapi-cyberjack-2.0.10.tar.bz2 License: LGPL -Group: System Environment/Libraries +Group: Development/Libraries Source: %{name}-%{version}.tar.bz2 -Patch0: ctapi-cyberjack-2.0.4-rh73_old_libusb.patch -Buildroot: %{_tmppath}/ctapi-cyberjack-%{version}-%{release}-root - -#%define prefix /usr -#%define lib_dir %{prefix}/lib -%define readers_dir %{_libdir}/readers - -%package ifd-handler -Summary: cyberjack PC/SC IFD handler for pcsc-lite -Requires: %{name} = %{version} -Group: System Environment/Libraries - -%description ifd-handler -REINER SCT cyberJack pinpad/e-com USB user space driver - -This package includes the PC/SC IFD handler driver for the cyberJack -pinpad/e-com USB chipcard reader. - +Patch0: ctapi-cyberjack_MakefileCtAPI.patch +Patch1: ctapi-cyberjack_MakefilePCSC.patch +Patch2: ctapi-cyberjack_Bug_191515.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +#for FC4 +#%%define readers_dir %{_libdir}/readers/ifd-cyberjack.bundle/Contents +#for FC>4 +%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir)/ifd-cyberjack.bundle/Contents %package devel Summary: Development files for libctapi-cyberjack Requires: %{name} = %{version} Group: Development/Libraries +%package pcsc +Summary: PC/SC Module +Requires: pcsc-lite +Group: Development/Libraries +Provides: pcsc-ifd-handler + %description REINER SCT cyberJack pinpad/e-com USB user space driver This package includes the CT-API driver for the cyberJack pinpad/e-com USB chipcard reader. -This package changes the permissions of /dev/ttyUSB devices 0-3 to -2666. This gives the users the possibility to access the devices and -enables mandatory locking. - The kernel side driver is included in the official linux kernel starting with version 2.4.6. @@ -49,111 +49,183 @@ controllers. For more information about the reader, software updates and a shop see -http://www.reiner-sct.com/ +http://www.reiner-sct.com + + WARNING +Use the tool ctsh only when you know what you are doing!!! +Or you can damage your SmartCard!!! + + Hint +When using the CT-API lib you must first stop the PC/SC daemon, +when you use it. %description devel Development files for libctapi-cyberjack +%description pcsc +Files for the PC/SC system. + %prep %setup -q -n %{name}-%{version} +#fix path for the driver lib the config file +# sed -i "s\/usr/lib/readers/libcyberjack_ifd.so\%{readers_dir}/libcyberjack_ifd.so\1" \ +# etc/reader.conf + +#fix reader.conf for FC>4 +# sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf + +%patch0 -p1 +%patch1 -p1 + +#fix for bug 191515 +%patch2 -p1 +sed -i "s|XX|%(uname -r)|1" makevars + %build -##Fedora korrektur -sed -e "s/CFLAGS+=\ -I\/usr\/local\/include\ -I\/usr\/include/CFLAGS+=\ -I\/usr\/local\/include\ -I\/lib\/modules\/$(uname -r)\/source\/include\ -I\/usr\/include/g" makevars >makevars.neu -mv makevars.neu makevars -make +#make %{?_smp_mflags} will fail!!! +make %install -if [ -n "%{buildroot}" ] ; then - [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -fi +rm -rf $RPM_BUILD_ROOT + # CT-API -mkdir -p %{buildroot}/%{readers_dir} -install -m 755 ctapi/libctapi-cyberjack.so %{buildroot}/%{readers_dir}/libctapi-cyberjack.so.%{version} -install -m 755 ctapi/libctapi-cyberjack.a %{buildroot}/%{readers_dir}/libctapi-cyberjack.a -( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so.%{version} libctapi-cyberjack.so ) -( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so libctapi.so ) -( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi.so libctapi.so ) -( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi-cyberjack.a libctapi-cyberjack.a ) -mkdir -p %{buildroot}/%{_includedir} -install -m 644 ctapi/include/ctapi.h %{buildroot}/%{_includedir}/ctapi.h -mkdir -p %{buildroot}/%{_bindir} -install -m 755 tools/cjgeldkarte %{buildroot}/%{_bindir}/cjgeldkarte -install -m 755 tools/ctsh %{buildroot}/%{_bindir}/ctsh +mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi +mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack +mkdir -p $RPM_BUILD_ROOT%{_bindir} +install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{_libdir}/ctapi/libctapi-cyberjack.so +install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h +install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/cjgeldkarte +install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ctsh + # PC/SC -#mkdir -p %{buildroot}/%{readers_dir} -mkdir -p %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux -install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so %{buildroot}/%{readers_dir}/libcyberjack_ifd.so.%{version} -install -m 444 pcsc/ifd-cyberjack.bundle/Contents/Info.plist %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist -install -m 444 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo -( cd %{buildroot}/%{readers_dir}; ln -s libcyberjack_ifd.so.%{version} libcyberjack_ifd.so ) -( cd %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux; ln -s %{readers_dir}/libcyberjack_ifd.so cyberjack-ifd.so ) -mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d -install -m 644 etc/reader.conf %{buildroot}%{_sysconfdir}/reader.conf.d/cyberjack.conf - -%pre -groupadd -r cyberjack 2>/dev/null || : - -%post ifd-handler -/usr/sbin/update-reader.conf - -%post -if [ -e /dev/ttyUSB0 ] ; then - chmod 2666 /dev/ttyUSB0 -else - mknod -m 2666 /dev/ttyUSB0 c 188 0 -fi -if [ -e /dev/ttyUSB1 ] ; then - chmod 2666 /dev/ttyUSB1 -else - mknod -m 2666 /dev/ttyUSB1 c 188 1 -fi -if [ -e /dev/ttyUSB2 ] ; then - chmod 2666 /dev/ttyUSB2 -else - mknod -m 2666 /dev/ttyUSB2 c 188 2 -fi -if [ -e /dev/ttyUSB3 ] ; then - chmod 2666 /dev/ttyUSB3 -else - mknod -m 2666 /dev/ttyUSB3 c 188 3 -fi +install -d -m 755 $RPM_BUILD_ROOT%{readers_dir}/Linux +install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so $RPM_BUILD_ROOT%{readers_dir}/Linux/ifd-cyberjack.so +install -m 644 pcsc/ifd-cyberjack.bundle/Contents/Info.plist $RPM_BUILD_ROOT%{readers_dir}/Info.plist +install -m 644 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo $RPM_BUILD_ROOT%{readers_dir}/PkgInfo + +#install -m 755 pcsc/libcyberjack_ifd.so $RPM_BUILD_ROOT%{readers_dir}/libcyberjack_ifd.so +#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d +#install -m 444 etc/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/cyberjack.conf + +%post pcsc +#register PC/SC driver and restart daemon +/sbin/service pcscd condrestart||: + +%postun pcsc +#unregister PC/SC driver and restart daemon +/sbin/service pcscd condrestart||: + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %clean -if [ -n "%{buildroot}" ] ; then - [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -fi +rm -rf $RPM_BUILD_ROOT %files -%defattr(0644,root,root) -%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.pdf doc/README.html doc/README.txt MAKEUSBDEV tools/ctshrc.example +%doc COPYRIGHT* +%doc doc/README.txt +%doc doc/README.pdf +%doc doc/README.html + +%defattr(-,root,root,-) # CT-API -%{readers_dir}/libctapi-cyberjack.so.%{version} -%{readers_dir}/libctapi-cyberjack.so -%{readers_dir}/libctapi.so -%{_libdir}/libctapi.so -%attr(0755,root,root) %{_bindir}/cjgeldkarte -%attr(0755,root,root) %{prefix}/bin/ctsh +%{_libdir}/ctapi/libctapi-cyberjack.so +%{_bindir}/cjgeldkarte +%{_bindir}/ctsh +%files pcsc # PC/SC -%files ifd-handler -/%{readers_dir}/libcyberjack_ifd.so.%{version} -/%{readers_dir}/libcyberjack_ifd.so -%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo -%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist -%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux/cyberjack-ifd.so -%{_sysconfdir}/reader.conf.d/cyberjack.conf +%defattr(755,root,root) +/%{readers_dir}/Linux/* +%attr(0644,root,root)/%{readers_dir}/Info.plist + %attr(0644,root,root)/%{readers_dir}/PkgInfo +#%attr(644,root,root) %config(noreplace) %{_sysconfdir}/reader.conf.d/cyberjack.conf %files devel %defattr(0644,root,root) -%{_includedir}/ctapi.h -%{readers_dir}/libctapi-cyberjack.a -%{_libdir}/libctapi-cyberjack.a - -%changelog -n ctapi-cyberjack -* Mon May 30 2005 - Harald Welte -+ ctapi-cyberjack-2.0.9-1 -- add pcsc-lite 'dropdir' compatible PC/SC driver +%{_includedir}/ctapi-cyberjack/ctapi.h + +%changelog +* Sat May 27 2006 Frank B??ttner - 2.0.10-2%{?dist} +- add "Provides:pcsc-ifd-handler" for the PC/SC part + +* Fri May 12 2006 Frank B??ttner - 2.0.10-1%{?dist} +- update driver to 2.0.10 +- readers.conf now unnessery + +* Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} +- rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to + libcyberjack_ifd.so +- fix place for the comments of /sbin/service pcscd condrestart + +* Wed May 10 2006 Frank B??ttner - 2.0.8-12%{?dist} +- fix comments for %%post/%%postun pcsc +- fix call of restart the PC/SC daemon +- move to the old version of dependency for the PC/SC package +- add -soname option in PS/SC driver + +* Tue May 9 2006 Frank B??ttner - 2.0.8-11%{?dist} +- remove comments at %%post and %%postun +- remove unneeded /usr/sbin/update-reader.conf call + +* Mon May 8 2006 Frank B??ttner - 2.0.8-10%{?dist} +- fix ldconfig for the PC/SC part +- fix dependency for the PC/SC package +- fix build dependency for the package. + +* Mon May 8 2006 Frank B??ttner - 2.0.8-9%{?dist} +- restart PC/SC daemon only when it run's +- fix CT-API version bug so that apps can find it in the ldcache via + libctapi-cyberjack.so +- add comment about using CT-API and PC/SC together + +* Sun May 7 2006 Frank B??ttner - 2.0.8-8%{?dist} +- add requirement of the ctapi dir under %{_libdir} +- the CT-API lib lives now under %{_libdir}/ctapi +- reenable link the ctapi driver static in the PC/SC part +- run ldconfig after install/uninstall + +* Mon May 1 2006 Frank B??ttner - 2.0.8-7%{?dist} +- fix permission of ctapi-cyberjack-2.0.8.tar.bz2 and ctapi-cyberjack.spec +- fix permisson of the PC/SC config file +- restart PC/SC daemon after remove the PS/SC driver + +* Sun Apr 30 2006 Frank B??ttner - 2.0.8-6%{?dist} +- replace if statements with comments +- replace german to english comments +- fix the makefile for the CT-API lib +- correct naming the libs CT-API and PS/SC +- rename package PS/SC to pcsc +- replace RPM_BUILD_ROOT +- fix doc +- add warning for the tool ctsh + +* Thu Apr 27 2006 Frank B??ttner - 2.0.8-5%{dist} +- fix owner of lib's +- add PC/SC fix for FC5 +- restart pcscd + +* Thu Apr 27 2006 Frank B??ttner - 2.0.8-4%{dist} +- change permisson of all lib's to 0755 +- rename lib files to support more reader's +- fix the path of the CT-API part and the devel file +- support FC4 and FC5 + +* Sat Apr 15 2006 Frank B??ttner - 2.0.8-3%{dist} +- remove makefile workaround + +* Sat Apr 15 2006 Frank B??ttner - 2.0.8-2%{dist} +- remove packager +- remove hardcodet Fedora Tag +- rename file from ctapi-cyberjack-version to ctapi-cyberjack +- modify source URL +- fix clean section + +* Sat Apr 08 2006 Frank B??ttner - 2.0.8-1.FC4 +- start for Fedora +- sepperate the PC/SC part * Wed Mar 02 2005 - Harald Welte + ctapi-cyberjack-2.0.8-1 From fedora-extras-commits at redhat.com Sat May 27 12:19:19 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sat, 27 May 2006 05:19:19 -0700 Subject: rpms/ctapi-cyberjack/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605271219.k4RCJLWo010766@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10747 Modified Files: .cvsignore sources Log Message: I hope that now the correct files will be used for the devel build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 May 2006 14:40:35 -0000 1.2 +++ .cvsignore 27 May 2006 12:19:19 -0000 1.3 @@ -1 +1 @@ -ctapi-cyberjack-2.0.8.tar.bz2 +ctapi-cyberjack-2.0.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 May 2006 14:40:35 -0000 1.2 +++ sources 27 May 2006 12:19:19 -0000 1.3 @@ -1 +1 @@ -01283c7e5495d045c00dcde0593dcc55 ctapi-cyberjack-2.0.8.tar.bz2 +339b4a1b2117550c0be92e5609f0729e ctapi-cyberjack-2.0.10.tar.bz2 From fedora-extras-commits at redhat.com Sat May 27 13:36:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:36:39 -0700 Subject: rpms/asymptote/devel - New directory Message-ID: <200605271336.k4RDafLk013403@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13374/asymptote/devel Log Message: Directory /cvs/extras/rpms/asymptote/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 13:36:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:36:39 -0700 Subject: rpms/asymptote - New directory Message-ID: <200605271336.k4RDaf4j013400@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13374/asymptote Log Message: Directory /cvs/extras/rpms/asymptote added to the repository From fedora-extras-commits at redhat.com Sat May 27 13:36:55 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:36:55 -0700 Subject: rpms/asymptote Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605271336.k4RDavUO013447@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13419 Added Files: Makefile import.log Log Message: Setup of module asymptote --- NEW FILE Makefile --- # Top level Makefile for module asymptote all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 13:36:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:36:56 -0700 Subject: rpms/asymptote/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605271336.k4RDawfe013450@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13419/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module asymptote --- NEW 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 May 27 13:37:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:37:39 -0700 Subject: rpms/asymptote import.log,1.1,1.2 Message-ID: <200605271337.k4RDbffF013529@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13494 Modified Files: import.log Log Message: auto-import asymptote-1.06-3 on branch devel from asymptote-1.06-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/asymptote/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 13:36:55 -0000 1.1 +++ import.log 27 May 2006 13:37:39 -0000 1.2 @@ -0,0 +1 @@ +asymptote-1_06-3:HEAD:asymptote-1.06-3.src.rpm:1148737051 From fedora-extras-commits at redhat.com Sat May 27 13:37:40 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:37:40 -0700 Subject: rpms/asymptote/devel asy-init.el, NONE, 1.1 asymptote-1.05-docdir.patch, NONE, 1.1 asymptote.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605271337.k4RDbgLs013536@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13494/devel Modified Files: .cvsignore sources Added Files: asy-init.el asymptote-1.05-docdir.patch asymptote.spec Log Message: auto-import asymptote-1.06-3 on branch devel from asymptote-1.06-3.src.rpm --- NEW FILE asy-init.el --- (autoload 'asy-mode "asy-mode.el" "Asymptote major mode." t) (add-to-list 'auto-mode-alist '("\\.asy$" . asy-mode)) asymptote-1.05-docdir.patch: --- NEW FILE asymptote-1.05-docdir.patch --- diff -ruN asymptote-1.05-orig/configure asymptote-1.05/configure --- asymptote-1.05-orig/configure 2006-05-19 05:58:44.000000000 +0100 +++ asymptote-1.05/configure 2006-05-22 18:45:18.000000000 +0100 @@ -1438,7 +1438,7 @@ cat >>confdefs.h <<_ACEOF -#define ASYMPTOTE_DOCDIR "$Datadir/doc/asymptote" +#define ASYMPTOTE_DOCDIR "$Datadir/doc/asymptote-$VERSION" _ACEOF diff -ruN asymptote-1.05-orig/configure.ac asymptote-1.05/configure.ac --- asymptote-1.05-orig/configure.ac 2006-05-19 05:58:42.000000000 +0100 +++ asymptote-1.05/configure.ac 2006-05-22 18:44:22.000000000 +0100 @@ -37,7 +37,7 @@ AC_SUBST(latexdir) AC_DEFINE_UNQUOTED(ASYMPTOTE_SYSDIR,"$Datadir/asymptote", [System directory for global .asy files]) -AC_DEFINE_UNQUOTED(ASYMPTOTE_DOCDIR,"$Datadir/doc/asymptote", +AC_DEFINE_UNQUOTED(ASYMPTOTE_DOCDIR,"$Datadir/doc/asymptote-$VERSION", [Directory for documentation]) AC_CONFIG_SRCDIR([absyn.cc]) diff -ruN asymptote-1.05-orig/Makefile.in asymptote-1.05/Makefile.in --- asymptote-1.05-orig/Makefile.in 2006-05-18 06:44:26.000000000 +0100 +++ asymptote-1.05/Makefile.in 2006-05-22 18:46:07.000000000 +0100 @@ -38,7 +38,7 @@ mandir = $(DESTDIR)@mandir@ datadir = $(DESTDIR)@datadir@ asydir = $(datadir)/asymptote -docdir = $(datadir)/doc/asymptote +docdir = $(datadir)/doc/asymptote- at VERSION@ exampledir = $(docdir)/examples animationsdir = $(exampledir)/animations latexdir = $(DESTDIR)@latexdir@ --- NEW FILE asymptote.spec --- %{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} %define emacs_sitelisp %{_datadir}/emacs/site-lisp %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote Version: 1.06 Release: 3%{?dist} Summary: Descriptive vector graphics language Group: Development/Tools License: GPL URL: http://asymptote.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.tar.gz Source1: asy-init.el Patch: asymptote-1.05-docdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: fftw-devel >= 3.0 BuildRequires: gc-devel >= 6.7 BuildRequires: gsl-devel BuildRequires: tetex-latex BuildRequires: ghostscript BuildRequires: texinfo Requires: tetex-latex Requires: tkinter Requires(post): /usr/bin/texhash Requires(postun): /usr/bin/texhash %define texpkgdir %{_texmf}/tex/latex/%{name} %description Asymptote is a powerful descriptive vector graphics language for technical drawings, inspired by MetaPost but with an improved C++-like syntax. Asymptote provides for figures the same high-quality level of typesetting that LaTeX does for scientific text. %prep %setup -q %patch -p1 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy %build %configure --enable-gc=system make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -p -m 644 BUGS ChangeLog LICENSE README ReleaseNotes TODO \ $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/ # Emacs/Xemacs mode and init files install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ for dir in %{emacs_sitelisp} %{xemacs_sitelisp} ; do install -dm 755 $RPM_BUILD_ROOT$dir/site-start.d ln -s %{_datadir}/%{name}/asy-mode.el $RPM_BUILD_ROOT$dir touch $RPM_BUILD_ROOT$dir/asy-mode.elc ln -s %{_datadir}/%{name}/asy-init.el $RPM_BUILD_ROOT$dir/site-start.d touch $RPM_BUILD_ROOT$dir/site-start.d/asy-init.elc done # Vim syntax file for vimver in 63 64 70 ; do install -dm 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax ln -s %{_datadir}/%{name}/asy.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax done %clean rm -rf $RPM_BUILD_ROOT %post texhash >/dev/null 2>&1 || : %postun texhash >/dev/null 2>&1 || : %triggerin -- emacs-common [ -d %{emacs_sitelisp} ] && \ ln -sf %{_datadir}/%{name}/asy-mode.el %{emacs_sitelisp} || : [ -d %{emacs_sitelisp}/site-start.d ] && \ ln -sf %{_datadir}/%{name}/asy-init.el %{emacs_sitelisp}/site-start.d || : %triggerin -- xemacs-common [ -d %{xemacs_sitelisp} ] && \ ln -sf %{_datadir}/%{name}/asy-mode.el %{xemacs_sitelisp} || : [ -d %{xemacs_sitelisp}/site-start.d ] && \ ln -sf %{_datadir}/%{name}/asy-init.el %{xemacs_sitelisp}/site-start.d || : %triggerun -- emacs-common [ $2 = 0 ] && rm -f %{emacs_sitelisp}/{asy-mode.el*,site-start.d/asy-init.el*} || : %triggerun -- xemacs-common [ $2 = 0 ] && rm -f %{xemacs_sitelisp}/{asy-mode.el*,site-start.d/asy-init.el*} || : %triggerin -- vim-common VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \ ln -sf %{_datadir}/%{name}/asy.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || : %triggerun -- vim-common VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` [ $2 = 0 ] && rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/asy.vim || : %triggerpostun -- vim-common VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` if [ $1 = 1 ]; then rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/asy.vim || : [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \ ln -sf %{_datadir}/%{name}/asy.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || : fi %files %defattr(-,root,root,-) %doc %{_defaultdocdir}/%{name}-%{version}/ %{_bindir}/* %{_datadir}/%{name}/ %{texpkgdir}/ %{_mandir}/man1/*.1* %ghost %{_datadir}/*emacs %ghost %{_datadir}/vim/ %changelog * Sat May 27 2006 Jose Pedro Oliveira - 1.06-3 - Emacs/Xemacs init file (#193154 comment 6). * Fri May 26 2006 Jose Pedro Oliveira - 1.06-2 - Directories ownership (#193154). * Wed May 24 2006 Jose Pedro Oliveira - 1.06-1 - Update to 1.06. - Using triggers to install the Vim syntax file and the Emacs/Xemacs mode file. * Mon May 22 2006 Jose Pedro Oliveira - 1.05-1 - Update to 1.05. * Sun May 7 2006 Jose Pedro Oliveira - 1.04-1 - Update to 1.04. * Fri Mar 31 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. * Thu Mar 23 2006 Jose Pedro Oliveira - 1.02-1 - First build. # vim:set ai ts=4 sw=4 sts=4 et: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 13:36:55 -0000 1.1 +++ .cvsignore 27 May 2006 13:37:40 -0000 1.2 @@ -0,0 +1 @@ +asymptote-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 13:36:55 -0000 1.1 +++ sources 27 May 2006 13:37:40 -0000 1.2 @@ -0,0 +1 @@ +3dc87ce18034ee8c44e0cdbd49c126d2 asymptote-1.06.tar.gz From fedora-extras-commits at redhat.com Sat May 27 13:53:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:53:33 -0700 Subject: rpms/asymptote/devel asymptote.spec,1.1,1.2 Message-ID: <200605271353.k4RDrZCI013643@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13626 Modified Files: asymptote.spec Log Message: Group: Applications/Publishing Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- asymptote.spec 27 May 2006 13:37:40 -0000 1.1 +++ asymptote.spec 27 May 2006 13:53:33 -0000 1.2 @@ -5,10 +5,10 @@ Name: asymptote Version: 1.06 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Descriptive vector graphics language -Group: Development/Tools +Group: Applications/Publishing License: GPL URL: http://asymptote.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.tar.gz @@ -135,6 +135,9 @@ %changelog +* Sat May 27 2006 Jose Pedro Oliveira - 1.06-4 +- Group: Development/Tools -> Applications/Publishing (#193154). + * Sat May 27 2006 Jose Pedro Oliveira - 1.06-3 - Emacs/Xemacs init file (#193154 comment 6). From fedora-extras-commits at redhat.com Sat May 27 13:57:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:57:01 -0700 Subject: owners owners.list,1.1063,1.1064 Message-ID: <200605271357.k4RDv3MP013732@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13715 Modified Files: owners.list Log Message: New package: asymptote (#193154) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1063 retrieving revision 1.1064 diff -u -r1.1063 -r1.1064 --- owners.list 27 May 2006 07:16:15 -0000 1.1063 +++ owners.list 27 May 2006 13:57:01 -0000 1.1064 @@ -56,6 +56,7 @@ Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|aspell-he|Hebrew dictionary for Aspell (Hspell-based)|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| +Fedora Extras|asymptote|Descriptive vector graphics language|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 27 17:08:30 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 10:08:30 -0700 Subject: rpms/gcfilms/devel .cvsignore, 1.5, 1.6 gcfilms.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200605271708.k4RH8WFS023748@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23727 Modified Files: .cvsignore gcfilms.spec sources Log Message: Updated to 6-2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Feb 2006 13:37:13 -0000 1.5 +++ .cvsignore 27 May 2006 17:08:30 -0000 1.6 @@ -1 +1 @@ -gcfilms-6.1.tar.gz +gcfilms-6.2.tar.gz Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/gcfilms.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gcfilms.spec 27 Feb 2006 20:00:24 -0000 1.10 +++ gcfilms.spec 27 May 2006 17:08:30 -0000 1.11 @@ -1,6 +1,6 @@ Name: gcfilms -Version: 6.1 -Release: 2%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: Movies collection management Group: Applications/Databases @@ -97,6 +97,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat May 27 2006 Tian - 6.2-1 + - New upstream version. * Mon Feb 27 2006 Tian - 6.1-2 - New version because of a problem on build systems (use of lib64 instead of lib on x86 systems) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Feb 2006 13:23:14 -0000 1.7 +++ sources 27 May 2006 17:08:30 -0000 1.8 @@ -1 +1 @@ -03da9f046268672f3f71c9887e2adbf3 gcfilms-6.1.tar.gz +63a29b3f30c21a6116e41bf057ceb2e9 gcfilms-6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 27 17:09:47 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 10:09:47 -0700 Subject: extras-repoclosure rc-run.py,1.4,1.5 Message-ID: <200605271709.k4RH9lM8023817@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23799 Modified Files: rc-run.py Log Message: adjust to new repository structure of Fedora Core Development Index: rc-run.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rc-run.py 19 May 2006 22:50:18 -0000 1.4 +++ rc-run.py 27 May 2006 17:09:45 -0000 1.5 @@ -23,18 +23,16 @@ repos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'], '4' : ['fedora-core','fedora-core-updates','fedora-extras'], '5' : ['fedora-core','fedora-core-updates','fedora-extras'], - 'development' : ['fedora-core-development','fedora-extras'] + 'development' : ['fedora-core','fedora-extras'] } reponames = { 'fedora-core' : 'Fedora Core', - 'fedora-core-development' : 'Fedora Core Development Tree', 'fedora-core-updates' : 'Fedora Core Released Updates', 'fedora-extras' : 'Fedora Extras' } # (%s, %s) = (release, arch) baseurls = { 'fedora-core' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/os/', - 'fedora-core-development' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/', 'fedora-core-updates' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/updates/%s/%s/', 'fedora-extras' : 'file:///srv/rpmbuild/extras/tree/extras/%s/%s/' } From fedora-extras-commits at redhat.com Sat May 27 20:39:44 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:39:44 -0700 Subject: rpms/perl-XML-Stream/devel - New directory Message-ID: <200605272039.k4RKdkM8031662@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633/perl-XML-Stream/devel Log Message: Directory /cvs/extras/rpms/perl-XML-Stream/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 20:39:44 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:39:44 -0700 Subject: rpms/perl-XML-Stream - New directory Message-ID: <200605272039.k4RKdkwc031659@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633/perl-XML-Stream Log Message: Directory /cvs/extras/rpms/perl-XML-Stream added to the repository From fedora-extras-commits at redhat.com Sat May 27 20:39:51 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:39:51 -0700 Subject: rpms/perl-XML-Stream Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605272039.k4RKdr0a031711@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31678 Added Files: Makefile import.log Log Message: Setup of module perl-XML-Stream --- NEW FILE Makefile --- # Top level Makefile for module perl-XML-Stream all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 20:39:52 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:39:52 -0700 Subject: rpms/perl-XML-Stream/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605272039.k4RKdsk9031714@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31678/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-XML-Stream --- NEW 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 May 27 20:40:19 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:40:19 -0700 Subject: rpms/perl-XML-Stream import.log,1.1,1.2 Message-ID: <200605272040.k4RKepJK031790@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31752 Modified Files: import.log Log Message: auto-import perl-XML-Stream-1.22-4.fc5 on branch devel from perl-XML-Stream-1.22-4.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 20:39:51 -0000 1.1 +++ import.log 27 May 2006 20:40:19 -0000 1.2 @@ -0,0 +1 @@ +perl-XML-Stream-1_22-4_fc5:HEAD:perl-XML-Stream-1.22-4.fc5.src.rpm:1148762416 From fedora-extras-commits at redhat.com Sat May 27 20:40:19 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:40:19 -0700 Subject: rpms/perl-XML-Stream/devel LICENSING.correspondance, NONE, 1.1 perl-XML-Stream.spec, NONE, 1.1 tests.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605272040.k4RKeqZZ031794@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31752/devel Modified Files: .cvsignore sources Added Files: LICENSING.correspondance perl-XML-Stream.spec tests.patch Log Message: auto-import perl-XML-Stream-1.22-4.fc5 on branch devel from perl-XML-Stream-1.22-4.fc5.src.rpm --- NEW FILE LICENSING.correspondance --- The licensing for this module is interesting -- the documentation of the module states that the license is Perl (aka GPL or Artistic), whereas the files have LGPL headers and the tarball includes the text of the LGPL itself. Given the author's response, my assessment is that this software is triple licensed: It may be used under the terms of the GPL, LGPL, or Artistic license, at your option. From: Ryan Eatmon To: Chris Weyl Date: May 22, 2006 6:03 PM Subject: Re: Net::XMPP license question Whatever. I don't actually care one way or the other. Go right ahead. Chris Weyl wrote: > Sorry to keep on bugging you, but would it be OK for me to strip out > the LGPL licensing statements? > > Or is this software triple licensed? e.g. Perl (GPL or Artistic), LGPL? > > Thanks :) > -Chris > > On 5/15/06, Chris Weyl wrote: >> If this code isn't meant to also be licensed under the LGPL, would it >> be ok with you for me to patch the LGPL statements out for the version >> released under fedora extras? >> >> -Chris >> >> On 5/14/06, Ryan Eatmon wrote: >> > >> > Yep. >> > >> > >> > Chris Weyl wrote: >> > > Hey Ryan-- >> > > >> > > Quick question. I'm in the middle of packaging up Net::XMPP (and for >> > > that matter, XML::Stream and Net::Jabber) for fedora extras, and it >> > > was pointed out to me that while Net/XMPP.pm states "COPYRIGHT: This >> > > module is free software, you can redistribute it and/or modify it >> > > under the same terms as Perl itself", the actual archive includes a >> > > LICENSE.LGPL. >> > > >> > > Are all three of these modules under "the same terms as Perl itself"? >> > > >> > > Thanks:) >> > > -Chris >> > >> > >> > -- >> > Ryan Eatmon >> > reatmon at jabber.org >> > >> >> >> -- >> Chris Weyl >> Ex astris, scientia >> > > -- Ryan Eatmon reatmon at jabber.org --- NEW FILE perl-XML-Stream.spec --- # $Id$ Name: perl-XML-Stream Version: 1.22 Release: 4%{?dist} Summary: XML::Stream - streaming XML library Group: Development/Libraries License: GPL or Artistic or LGPL URL: http://search.cpan.org/dist/XML-Stream/ Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/XML-Stream-%{version}.tar.gz Source1: LICENSING.correspondance Patch0: tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl, perl(Authen::SASL), perl(MIME::Base64) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides the user with methods to connect to a remote server, send a stream of XML to the server, and receive/parse an XML stream from the server. It is primarily based work for the Etherx XML router developed by the Jabber Development Team. For more information about this project visit http://etherx.jabber.org/stream/. XML::Stream gives the user the ability to define a central callback that will be used to handle the tags received from the server. These tags are passed in the format defined at instantiation time. the closing tag of an object is seen, the tree is finished and passed to the call back function. What the user does with it from there is up to them. For a detailed description of how this module works, and about the data structure that it returns, please view the source of Stream.pm and look at the detailed description at the end of the file. %prep %setup -q -n XML-Stream-%{version} %patch0 cp %{SOURCE1} . # generate our other two licenses... perldoc perlgpl > LICENSE.GPL perldoc perlartistic > LICENSE.Artistic %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w %{buildroot}/* #%check # builders are (or may be) firewalled #make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README INFO LICENSE.* LICENSING* %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu May 25 2006 Chris Weyl 1.22-4 - include license text, including generated ones - include correspondance with the module's author * Wed May 24 2006 Chris Weyl 1.22-3 - update license to triple licensed, based on conversations with upstream * Mon May 15 2006 Chris Weyl 1.22-2 - add CHANGES, README, INFO to docs * Fri May 12 2006 Chris Weyl 1.22-1 - first f-e spec. - patched the tests to try to connect to the gtalk jabber servers, since the default one seemed to be "non-funct" tests.patch: --- NEW FILE tests.patch --- --- t/tcpip2ssl.t.orig 2006-05-12 09:42:01.727128761 -0700 +++ t/tcpip2ssl.t 2006-05-12 09:42:33.223423261 -0700 @@ -15,7 +15,7 @@ SKIP: { - my $status = $stream->Connect(hostname=>"obelisk.net", + my $status = $stream->Connect(hostname=>"talk.google.com", port=>5223, namespace=>"jabber:client", connectiontype=>"tcpip", Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 20:39:52 -0000 1.1 +++ .cvsignore 27 May 2006 20:40:19 -0000 1.2 @@ -0,0 +1 @@ +XML-Stream-1.22.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 20:39:52 -0000 1.1 +++ sources 27 May 2006 20:40:19 -0000 1.2 @@ -0,0 +1 @@ +ae09400fac17eaea4c9b12283db06881 XML-Stream-1.22.tar.gz From fedora-extras-commits at redhat.com Sat May 27 20:43:06 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:43:06 -0700 Subject: rpms/perl-XML-Stream/devel perl-XML-Stream.spec,1.1,1.2 Message-ID: <200605272043.k4RKh8l3031862@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31845 Modified Files: perl-XML-Stream.spec Log Message: Bump release Index: perl-XML-Stream.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/devel/perl-XML-Stream.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-XML-Stream.spec 27 May 2006 20:40:19 -0000 1.1 +++ perl-XML-Stream.spec 27 May 2006 20:43:06 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-XML-Stream Version: 1.22 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML::Stream - streaming XML library Group: Development/Libraries @@ -76,6 +76,9 @@ %changelog +* Sat May 27 2006 Chris Weyl 1.22-5 +- bump release, to deal with cvs-import.sh being confused by .rpmmacros + * Thu May 25 2006 Chris Weyl 1.22-4 - include license text, including generated ones - include correspondance with the module's author From fedora-extras-commits at redhat.com Sat May 27 23:53:19 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:53:19 -0700 Subject: rpms/ctorrent - New directory Message-ID: <200605272353.k4RNrLT6007270@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7249/ctorrent Log Message: Directory /cvs/extras/rpms/ctorrent added to the repository From fedora-extras-commits at redhat.com Sat May 27 23:53:19 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:53:19 -0700 Subject: rpms/ctorrent/devel - New directory Message-ID: <200605272353.k4RNrLbg007273@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7249/ctorrent/devel Log Message: Directory /cvs/extras/rpms/ctorrent/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 23:53:41 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:53:41 -0700 Subject: rpms/ctorrent Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605272353.k4RNrhaw007327@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7294 Added Files: Makefile import.log Log Message: Setup of module ctorrent --- NEW FILE Makefile --- # Top level Makefile for module ctorrent all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 23:53:41 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:53:41 -0700 Subject: rpms/ctorrent/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605272353.k4RNrh2h007330@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7294/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ctorrent --- NEW 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 May 27 23:54:20 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:54:20 -0700 Subject: rpms/ctorrent import.log,1.1,1.2 Message-ID: <200605272354.k4RNsMGg007391@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7358 Modified Files: import.log Log Message: auto-import ctorrent-1.3.2-3 on branch devel from ctorrent-1.3.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ctorrent/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 23:53:41 -0000 1.1 +++ import.log 27 May 2006 23:54:19 -0000 1.2 @@ -0,0 +1 @@ +ctorrent-1_3_2-3:HEAD:ctorrent-1.3.2-3.src.rpm:1148774111 From fedora-extras-commits at redhat.com Sat May 27 23:54:20 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:54:20 -0700 Subject: rpms/ctorrent/devel ctorrent.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605272354.k4RNsMCG007396@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7358/devel Modified Files: .cvsignore sources Added Files: ctorrent.spec Log Message: auto-import ctorrent-1.3.2-3 on branch devel from ctorrent-1.3.2-3.src.rpm --- NEW FILE ctorrent.spec --- Name: ctorrent Version: 1.3.2 Release: 3%{?dist} Summary: BitTorrent Client written in C Group: Applications/Internet License: GPL URL: http://ctorrent.sourceforge.net Source0: http://download.sourceforge.net/ctorrent/ctorrent-1.3.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel %description CTorrent is a BitTorrent Client written in C that doesn't require any graphical component, such as an X server. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/ctorrent %doc AUTHORS README NEWS %changelog * Wed May 24 2006 Andrea Veri 1.3.2-3 - Added openssl-devel to BR - Removed libc.so.6 libc.so.6(GLIBC_2.0), libc.so.6(GLIBC_2.1) in BR - Description Changed - Fixed URL * Sun Feb 1 2004 YuHong 1.3.2 - First Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctorrent/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 23:53:41 -0000 1.1 +++ .cvsignore 27 May 2006 23:54:20 -0000 1.2 @@ -0,0 +1 @@ +ctorrent-1.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctorrent/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 23:53:41 -0000 1.1 +++ sources 27 May 2006 23:54:20 -0000 1.2 @@ -0,0 +1 @@ +1bc787df91285a9cec8509617c3152d6 ctorrent-1.3.2.tar.gz From fedora-extras-commits at redhat.com Sun May 28 01:08:12 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 27 May 2006 18:08:12 -0700 Subject: rpms/commoncpp2/devel .cvsignore, 1.2, 1.3 commoncpp2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605280108.k4S18EeD012621@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/commoncpp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12600 Modified Files: .cvsignore commoncpp2.spec sources Log Message: * Sun May 28 2006 Andreas Thienemann 1.4.1-1 - Updated to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Feb 2006 21:47:33 -0000 1.2 +++ .cvsignore 28 May 2006 01:08:11 -0000 1.3 @@ -1 +1 @@ -commoncpp2-1.3.23.tar.gz +commoncpp2-1.4.1.tar.gz Index: commoncpp2.spec =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/devel/commoncpp2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- commoncpp2.spec 6 Feb 2006 21:47:33 -0000 1.1 +++ commoncpp2.spec 28 May 2006 01:08:11 -0000 1.2 @@ -1,6 +1,6 @@ Summary: GNU Common C++ class framework Name: commoncpp2 -Version: 1.3.23 +Version: 1.4.1 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -70,8 +70,8 @@ %files devel %defattr(-,root,root,-) %doc doc/html -%dir %{_includedir}/cc++2 -%{_includedir}/cc++2/* +%dir %{_includedir}/cc++ +%{_includedir}/cc++/* %{_bindir}/ccgnu2-config %{_libdir}/*.so %{_libdir}/pkgconfig/libccext2.pc @@ -80,6 +80,9 @@ %{_infodir}/commoncpp2.info* %changelog +* Sun May 28 2006 Andreas Thienemann 1.4.1-1 +- Updated to 1.4.1 + * Sun Feb 05 2006 Andreas Thienemann 1.3.23-1 - Incorporated suggestions for extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Feb 2006 21:47:33 -0000 1.2 +++ sources 28 May 2006 01:08:11 -0000 1.3 @@ -1 +1 @@ -7cf53157929876054cff3234f6ffaae7 commoncpp2-1.3.23.tar.gz +4946d8c771f5f96d2951791e8ca76e23 commoncpp2-1.4.1.tar.gz From fedora-extras-commits at redhat.com Sun May 28 03:58:01 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 27 May 2006 20:58:01 -0700 Subject: rpms/gtkglarea2/FC-4 gtkglarea2.spec,1.9,1.10 Message-ID: <200605280358.k4S3w3vM017838@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglarea2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17821 Modified Files: gtkglarea2.spec Log Message: * Sun May 28 2006 Ralf Corsepius - 0.1.99.0-2 - Append %{?dist} to Release. - Rebuild. Index: gtkglarea2.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglarea2/FC-4/gtkglarea2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkglarea2.spec 6 Apr 2005 22:11:39 -0000 1.9 +++ gtkglarea2.spec 28 May 2006 03:58:01 -0000 1.10 @@ -1,7 +1,7 @@ Summary: OpenGL GTK widget Name: gtkglarea2 Version: 1.99.0 -Release: 2 +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -60,6 +60,10 @@ %{_libdir}/pkgconfig/gtkgl-2.0.pc %changelog +* Sun May 28 2006 Ralf Corsepius - 0.1.99.0-2 +- Append %%{?dist} to Release. +- Rebuild. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Sun May 28 10:50:38 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 28 May 2006 03:50:38 -0700 Subject: rpms/gtkwave/devel gtkwave.spec,1.12,1.13 Message-ID: <200605281050.k4SAoevq002333@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2316 Modified Files: gtkwave.spec Log Message: adding missing buildreq flex Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gtkwave.spec 10 May 2006 09:12:33 -0000 1.12 +++ gtkwave.spec 28 May 2006 10:50:37 -0000 1.13 @@ -1,13 +1,13 @@ Summary: Waveform Viewer Name: gtkwave Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Sun May 28 2006 Paul Howarth 3.0.2-2 +- adding missing buildreq flex + * Wed May 10 2006 Paul Howarth 3.0.2-1 - update to 3.0.2 From fedora-extras-commits at redhat.com Sun May 28 11:11:26 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 04:11:26 -0700 Subject: owners owners.list,1.1064,1.1065 Message-ID: <200605281111.k4SBBSEN005281@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4844 Modified Files: owners.list Log Message: Added ctorrent in owner.list cvs file. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1064 retrieving revision 1.1065 diff -u -r1.1064 -r1.1065 --- owners.list 27 May 2006 13:57:01 -0000 1.1064 +++ owners.list 28 May 2006 11:11:26 -0000 1.1065 @@ -181,6 +181,7 @@ Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|ctorrent|BitTorrent Client written in C|bluekuja at ubuntu.com|extras-qa at fedoraproject.org| Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 28 11:35:43 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sun, 28 May 2006 04:35:43 -0700 Subject: rpms/ctapi-cyberjack/FC-4 ctapi-cyberjack.spec,1.2,1.3 Message-ID: <200605281135.k4SBZjVa005054@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5037 Modified Files: ctapi-cyberjack.spec Log Message: fix Bug 193323 Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-4/ctapi-cyberjack.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ctapi-cyberjack.spec 11 May 2006 15:49:14 -0000 1.2 +++ ctapi-cyberjack.spec 28 May 2006 11:35:43 -0000 1.3 @@ -1,7 +1,7 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.8 -Release: 13%{?dist} +Release: 14%{?dist} Requires: %{_libdir}/ctapi #For FC>4 #BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 @@ -30,6 +30,7 @@ Summary: PC/SC Module Requires: pcsc-lite Group: Development/Libraries +Provides: pcsc-ifd-handler %description REINER SCT cyberJack pinpad/e-com USB user space driver @@ -134,6 +135,9 @@ %{_includedir}/ctapi-cyberjack/ctapi.h %changelog +* Sun May 28 2006 Frank B??ttner - 2.0.8-14%{?dist} +- Add "Provides: pcsc-ifd-handler" to the PC/SC part(Bug 193323). + * Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} - rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to libcyberjack_ifd.so From fedora-extras-commits at redhat.com Sun May 28 11:49:29 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sun, 28 May 2006 04:49:29 -0700 Subject: rpms/ctapi-cyberjack/FC-5 ctapi-cyberjack.spec,1.1,1.2 Message-ID: <200605281149.k4SBnVAw005149@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5132 Modified Files: ctapi-cyberjack.spec Log Message: fix Bug 193323 Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-5/ctapi-cyberjack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack.spec 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack.spec 28 May 2006 11:49:29 -0000 1.2 @@ -1,7 +1,7 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.8 -Release: 13%{?dist} +Release: 14%{?dist} Requires: %{_libdir}/ctapi #For FC>4 BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 @@ -30,6 +30,7 @@ Summary: PC/SC Module Requires: pcsc-lite Group: Development/Libraries +Provides: pcsc-ifd-handler %description REINER SCT cyberJack pinpad/e-com USB user space driver @@ -134,6 +135,9 @@ %{_includedir}/ctapi-cyberjack/ctapi.h %changelog +* Sun May 28 2006 Frank B??ttner - 2.0.8-14%{?dist} +- Add "Provides: pcsc-ifd-handler" to the PC/SC part(Bug 193323). + * Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} - rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to libcyberjack_ifd.so From fedora-extras-commits at redhat.com Sun May 28 12:05:56 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 28 May 2006 05:05:56 -0700 Subject: rpms/gtorrentviewer/devel gtorrentviewer.spec,1.5,1.6 Message-ID: <200605281205.k4SC5wpd007565@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtorrentviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7546 Modified Files: gtorrentviewer.spec Log Message: add missing buildreq intltool Index: gtorrentviewer.spec =================================================================== RCS file: /cvs/extras/rpms/gtorrentviewer/devel/gtorrentviewer.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gtorrentviewer.spec 14 Feb 2006 09:53:40 -0000 1.5 +++ gtorrentviewer.spec 28 May 2006 12:05:56 -0000 1.6 @@ -1,6 +1,6 @@ Name: gtorrentviewer Version: 0.2b -Release: 8%{?dist} +Release: 9%{?dist} Summary: A GTK2-based viewer and editor for BitTorrent meta files Group: Applications/Internet @@ -12,7 +12,7 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -BuildRequires: curl-devel, gtk2-devel >= 2.4, desktop-file-utils, gettext +BuildRequires: curl-devel, gtk2-devel >= 2.4, desktop-file-utils, gettext, intltool %description GTorrentViewer gives you the ability to see and modify all the possible @@ -59,6 +59,9 @@ %{_mandir}/man1/gtorrentviewer.1* %changelog +* Sun May 28 2006 Paul Howarth 0.2b-9 +- add missing buildreq intltool + * Tue Feb 14 2006 Paul Howarth 0.2b-8 - cosmetic tweak: use macros instead of variables - don't use macros in command paths, hardcode them instead From fedora-extras-commits at redhat.com Sun May 28 12:45:04 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Sun, 28 May 2006 05:45:04 -0700 Subject: fedora-security/audit fc4,1.267,1.268 fc5,1.180,1.181 Message-ID: <200605281245.k4SCj4IU007665@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643 Modified Files: fc4 fc5 Log Message: Weekend updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- fc4 26 May 2006 17:22:36 -0000 1.267 +++ fc4 28 May 2006 12:45:01 -0000 1.268 @@ -4,6 +4,8 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] +CVE-2006-2660 ** kernel, fixed 2.6.10 +CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 CVE-2006-2493 ** freetype Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- fc5 26 May 2006 17:22:36 -0000 1.180 +++ fc5 28 May 2006 12:45:01 -0000 1.181 @@ -4,6 +4,8 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] +CVE-2006-2660 ** kernel, fixed 2.6.10 +CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 CVE-2006-2493 ** freetype From fedora-extras-commits at redhat.com Sun May 28 12:51:13 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:13 -0700 Subject: rpms/python-dns - New directory Message-ID: <200605281251.k4SCpF6E007765@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739/python-dns Log Message: Directory /cvs/extras/rpms/python-dns added to the repository From fedora-extras-commits at redhat.com Sun May 28 12:51:13 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:13 -0700 Subject: rpms/python-dns/devel - New directory Message-ID: <200605281251.k4SCpFWl007768@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739/python-dns/devel Log Message: Directory /cvs/extras/rpms/python-dns/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 12:51:25 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:25 -0700 Subject: rpms/python-dns Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605281251.k4SCpRlL007812@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784 Added Files: Makefile import.log Log Message: Setup of module python-dns --- NEW FILE Makefile --- # Top level Makefile for module python-dns all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 12:51:25 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:25 -0700 Subject: rpms/python-dns/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605281251.k4SCpRSu007815@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-dns --- NEW 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 May 28 12:51:57 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:57 -0700 Subject: rpms/python-dns import.log,1.1,1.2 Message-ID: <200605281252.k4SCqTlh007882@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7848 Modified Files: import.log Log Message: auto-import python-dns-1.3.5-1 on branch devel from python-dns-1.3.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-dns/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 12:51:24 -0000 1.1 +++ import.log 28 May 2006 12:51:57 -0000 1.2 @@ -0,0 +1 @@ +python-dns-1_3_5-1:HEAD:python-dns-1.3.5-1.src.rpm:1148819150 From fedora-extras-commits at redhat.com Sun May 28 12:51:57 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:57 -0700 Subject: rpms/python-dns/devel python-dns.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605281252.k4SCqTmo007886@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7848/devel Modified Files: .cvsignore sources Added Files: python-dns.spec Log Message: auto-import python-dns-1.3.5-1 on branch devel from python-dns-1.3.5-1.src.rpm --- NEW FILE python-dns.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-dns Version: 1.3.5 Release: 1%{?dist} Summary: DNS toolkit for Python Group: Development/Languages License: BSD-like URL: http://www.dnspython.org/ Source0: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0. dnspython provides both high and low level access to DNS. The high level classes perform queries for data of a given name, type, and class, and return an answer set. The low level classes allow direct manipulation of DNS zones, messages, names, and records. %prep %setup -q -n dnspython-%{version} # strip executable permissions so that we don't pick up dependencies # from documentation find examples -type f | xargs chmod a-x %build CFLAGS="%{optflags}" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %check pushd tests # skip one test because it queries the network for py in *.py do if [ $py != resolver.py ] then PYTHONPATH=%{buildroot}%{python_sitelib} %{__python} $py fi done %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog LICENSE README TODO examples %dir %{python_sitelib}/dns %{python_sitelib}/dns/*.py %{python_sitelib}/dns/*.pyc %ghost %{python_sitelib}/dns/*.pyo %dir %{python_sitelib}/dns/rdtypes %{python_sitelib}/dns/rdtypes/*.py %{python_sitelib}/dns/rdtypes/*.pyc %ghost %{python_sitelib}/dns/rdtypes/*.pyo %dir %{python_sitelib}/dns/rdtypes/ANY %{python_sitelib}/dns/rdtypes/ANY/*.py %{python_sitelib}/dns/rdtypes/ANY/*.pyc %ghost %{python_sitelib}/dns/rdtypes/ANY/*.pyo %dir %{python_sitelib}/dns/rdtypes/IN %{python_sitelib}/dns/rdtypes/IN/*.py %{python_sitelib}/dns/rdtypes/IN/*.pyc %ghost %{python_sitelib}/dns/rdtypes/IN/*.pyo %changelog * Fri May 26 2006 Jeffrey C. Ollie - 1.3.5-1 - First version for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-dns/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 12:51:25 -0000 1.1 +++ .cvsignore 28 May 2006 12:51:57 -0000 1.2 @@ -0,0 +1 @@ +dnspython-1.3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-dns/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 12:51:25 -0000 1.1 +++ sources 28 May 2006 12:51:57 -0000 1.2 @@ -0,0 +1 @@ +d086b05b70f7ab1b6308f29f2427623b dnspython-1.3.5.tar.gz From fedora-extras-commits at redhat.com Sun May 28 13:07:11 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sun, 28 May 2006 06:07:11 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec,1.3,1.4 Message-ID: <200605281307.k4SD7DX4010339@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10322 Modified Files: ctapi-cyberjack.spec Log Message: no change only respect to cvs trouble Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ctapi-cyberjack.spec 27 May 2006 11:56:43 -0000 1.3 +++ ctapi-cyberjack.spec 28 May 2006 13:07:11 -0000 1.4 @@ -1,7 +1,7 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.10 -Release: 2%{?dist} +Release: 3%{?dist} Requires: %{_libdir}/ctapi #kernel-devel needed for workaround bug 191515 #For FC>4 @@ -148,6 +148,9 @@ %{_includedir}/ctapi-cyberjack/ctapi.h %changelog +* Sun May 28 Frank B??ttner - 2.0.10-3%{?dist} +- no change only respect to cvs trouble + * Sat May 27 2006 Frank B??ttner - 2.0.10-2%{?dist} - add "Provides:pcsc-ifd-handler" for the PC/SC part From fedora-extras-commits at redhat.com Sun May 28 13:07:52 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:07:52 -0700 Subject: rpms/v2strip - New directory Message-ID: <200605281307.k4SD7s4W010397@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/v2strip Log Message: Directory /cvs/extras/rpms/v2strip added to the repository From fedora-extras-commits at redhat.com Sun May 28 13:07:52 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:07:52 -0700 Subject: rpms/v2strip/devel - New directory Message-ID: <200605281307.k4SD7ss0010400@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/v2strip/devel Log Message: Directory /cvs/extras/rpms/v2strip/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 13:08:17 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:08:17 -0700 Subject: rpms/v2strip Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605281308.k4SD8JRL010451@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10418 Added Files: Makefile import.log Log Message: Setup of module v2strip --- NEW FILE Makefile --- # Top level Makefile for module v2strip all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 13:08:18 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:08:18 -0700 Subject: rpms/v2strip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605281308.k4SD8KC7010454@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10418/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module v2strip --- NEW 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 May 28 13:08:29 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sun, 28 May 2006 06:08:29 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec,1.4,1.5 Message-ID: <200605281308.k4SD8V1a010482@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10462 Modified Files: ctapi-cyberjack.spec Log Message: no change only respect to cvs trouble Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ctapi-cyberjack.spec 28 May 2006 13:07:11 -0000 1.4 +++ ctapi-cyberjack.spec 28 May 2006 13:08:29 -0000 1.5 @@ -148,7 +148,7 @@ %{_includedir}/ctapi-cyberjack/ctapi.h %changelog -* Sun May 28 Frank B??ttner - 2.0.10-3%{?dist} +* Sun May 28 2006 Frank B??ttner - 2.0.10-3%{?dist} - no change only respect to cvs trouble * Sat May 27 2006 Frank B??ttner - 2.0.10-2%{?dist} From fedora-extras-commits at redhat.com Sun May 28 13:09:01 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:09:01 -0700 Subject: rpms/v2strip import.log,1.1,1.2 Message-ID: <200605281309.k4SD9X0f010581@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10542 Modified Files: import.log Log Message: auto-import v2strip-0.2.10-1 on branch devel from v2strip-0.2.10-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/v2strip/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 13:08:17 -0000 1.1 +++ import.log 28 May 2006 13:09:01 -0000 1.2 @@ -0,0 +1 @@ +v2strip-0_2_10-1:HEAD:v2strip-0.2.10-1.src.rpm:1148821648 From fedora-extras-commits at redhat.com Sun May 28 13:09:02 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:09:02 -0700 Subject: rpms/v2strip/devel v2strip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605281309.k4SD9YgK010585@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10542/devel Modified Files: .cvsignore sources Added Files: v2strip.spec Log Message: auto-import v2strip-0.2.10-1 on branch devel from v2strip-0.2.10-1.src.rpm --- NEW FILE v2strip.spec --- Name: v2strip Version: 0.2.10 Release: 1%{?dist} Summary: V2Strip ID3v2(Mp3 Files) tags remover Group: Applications/Shell License: GPL URL: http://www.geocities.com/matsp888/unix/ Source0: http://www.geocities.com/matsp888/unix/v2strip-0.2.10.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel %description Little utility that removes ID3v2 tags from MP3 files. The new ID3v2 tag format is nice in many ways, but it can cause confusion when parsed by certain MP3 players/utilities not yet supporting ID3v2 tags. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/v2strip %doc AUTHORS README NEWS %changelog * Sun May 28 2006 Andrea Veri 0.2.10-1 - First Package Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/v2strip/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 13:08:18 -0000 1.1 +++ .cvsignore 28 May 2006 13:09:01 -0000 1.2 @@ -0,0 +1 @@ +v2strip-0.2.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/v2strip/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 13:08:18 -0000 1.1 +++ sources 28 May 2006 13:09:01 -0000 1.2 @@ -0,0 +1 @@ +41c69d5d1138f609110bdae15e163317 v2strip-0.2.10.tar.gz From fedora-extras-commits at redhat.com Sun May 28 13:13:10 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:13:10 -0700 Subject: owners owners.list,1.1065,1.1066 Message-ID: <200605281313.k4SDDCFu010640@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10623 Modified Files: owners.list Log Message: Added v2strip in owner.list cvs file. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1065 retrieving revision 1.1066 diff -u -r1.1065 -r1.1066 --- owners.list 28 May 2006 11:11:26 -0000 1.1065 +++ owners.list 28 May 2006 13:13:09 -0000 1.1066 @@ -1681,6 +1681,7 @@ Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|vorbisgain|Adds tags to Ogg Vorbis files to adjust the volume|noa at resare.com|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|v2strip|ID3v2 tags remover|bluekuja at ubuntu.com|extras-qa at fedoraproject.org| Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 28 13:23:45 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:23:45 -0700 Subject: rpms/python-xmpp - New directory Message-ID: <200605281323.k4SDNlc0010878@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10852/python-xmpp Log Message: Directory /cvs/extras/rpms/python-xmpp added to the repository From fedora-extras-commits at redhat.com Sun May 28 13:23:45 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:23:45 -0700 Subject: rpms/python-xmpp/devel - New directory Message-ID: <200605281323.k4SDNlvo010881@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10852/python-xmpp/devel Log Message: Directory /cvs/extras/rpms/python-xmpp/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 13:24:04 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:24:04 -0700 Subject: rpms/python-xmpp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605281324.k4SDO673010926@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10898 Added Files: Makefile import.log Log Message: Setup of module python-xmpp --- NEW FILE Makefile --- # Top level Makefile for module python-xmpp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 13:24:04 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:24:04 -0700 Subject: rpms/python-xmpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605281324.k4SDO6ae010929@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10898/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-xmpp --- NEW 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 May 28 13:24:44 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:24:44 -0700 Subject: rpms/python-xmpp import.log,1.1,1.2 Message-ID: <200605281324.k4SDOkBk010997@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10964 Modified Files: import.log Log Message: auto-import python-xmpp-0.3.1-1 on branch devel from python-xmpp-0.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-xmpp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 13:24:03 -0000 1.1 +++ import.log 28 May 2006 13:24:44 -0000 1.2 @@ -0,0 +1 @@ +python-xmpp-0_3_1-1:HEAD:python-xmpp-0.3.1-1.src.rpm:1148822678 From fedora-extras-commits at redhat.com Sun May 28 13:24:44 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:24:44 -0700 Subject: rpms/python-xmpp/devel python-xmpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605281324.k4SDOkbU011002@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10964/devel Modified Files: .cvsignore sources Added Files: python-xmpp.spec Log Message: auto-import python-xmpp-0.3.1-1 on branch devel from python-xmpp-0.3.1-1.src.rpm --- NEW FILE python-xmpp.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-xmpp Version: 0.3.1 Release: 1%{?dist} Summary: Python library for easy scripting with Jabber Group: Development/Languages License: GPL URL: http://xmpppy.sourceforge.net/ Source0: http://dl.sourceforge.net/xmpppy/xmpppy-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-dns %description xmpppy is a Python library that is targeted to provide easy scripting with Jabber. Similar projects are Twisted Words and jabber.py. This library was not designed from scratch. It inherits some code from jabberpy and have very similar API in many places. Though it is separate project since it have almost completely different architecture and primarily aims to work with jabberd2 - the new Open Source Jabber Server. %prep %setup -q -n xmpppy-%{version} # strip executable permissions so that dependencies aren't picked up # from documentation files. find doc -type f | xargs chmod a-x %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog README doc/* %dir %{python_sitelib}/xmpp %{python_sitelib}/xmpp/*.py %{python_sitelib}/xmpp/*.pyc %ghost %{python_sitelib}/xmpp/*.pyo %changelog * Fri May 26 2006 Jeffrey C. Ollie - 0.3.1-1 - First version for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-xmpp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 13:24:04 -0000 1.1 +++ .cvsignore 28 May 2006 13:24:44 -0000 1.2 @@ -0,0 +1 @@ +xmpppy-0.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-xmpp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 13:24:04 -0000 1.1 +++ sources 28 May 2006 13:24:44 -0000 1.2 @@ -0,0 +1 @@ +56e8df54288e57bd626cb53b31e2b41c xmpppy-0.3.1.tar.gz From fedora-extras-commits at redhat.com Sun May 28 16:21:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 28 May 2006 09:21:45 -0700 Subject: rpms/lirc-kmod/devel kmodtool,1.6,1.7 lirc-kmod.spec,1.8,1.9 Message-ID: <200605281622.k4SGMH2c021953@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/lirc-kmod/devel Modified Files: kmodtool lirc-kmod.spec Log Message: * Sun May 28 2006 Ville Skytt?? - Update kmodtool to 0.10.10, invoke it with bash instead of sh. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kmodtool 15 May 2006 19:48:28 -0000 1.6 +++ kmodtool 28 May 2006 16:21:45 -0000 1.7 @@ -23,9 +23,11 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +shopt -s extglob + myprog="kmodtool" -myver="0.10.9" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' +myver="0.10.10" +knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)) kmod_name= kver= verrel= @@ -33,24 +35,27 @@ get_verrel () { - verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" + verrel=${1:-$(uname -r)} + verrel=${verrel%%$knownvariants} } print_verrel () { - get_verrel $@ || return $? + get_verrel $@ echo "${verrel}" } get_variant () { - variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" - [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' + get_verrel $@ + variant=${1:-$(uname -r)} + variant=${variant##$verrel} + variant=${variant:-'""'} } print_variant () { - get_variant $@ || return $? + get_variant $@ echo "${variant}" } Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lirc-kmod.spec 15 May 2006 19:48:28 -0000 1.8 +++ lirc-kmod.spec 28 May 2006 16:21:45 -0000 1.9 @@ -2,10 +2,10 @@ # stuff to be implemented externally: Source10: kmodtool -%define kmodtool sh %{SOURCE10} +%define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2111_FC5} +%{?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 7.%(echo %{kverrel} | tr - _) +Release: 8.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,9 @@ %changelog +* Sun May 28 2006 Ville Skytt?? - 0.8.0-8 +- Update kmodtool to 0.10.10, invoke it with bash instead of sh. + * Mon May 15 2006 Ville Skytt?? - 0.8.0-7 - Require version >= of lirc-kmod-common. - Provide lirc-kmod instead of kmod-lirc to fix upgrade problems. From fedora-extras-commits at redhat.com Sun May 28 16:21:44 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 28 May 2006 09:21:44 -0700 Subject: rpms/thinkpad-kmod/FC-5 kmodtool, 1.5, 1.6 thinkpad-kmod.spec, 1.9, 1.10 Message-ID: <200605281622.k4SGMGmG021947@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/thinkpad-kmod/FC-5 Modified Files: kmodtool thinkpad-kmod.spec Log Message: * Sun May 28 2006 Ville Skytt?? - Update kmodtool to 0.10.10, invoke it with bash instead of sh. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/kmodtool,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kmodtool 15 May 2006 19:48:21 -0000 1.5 +++ kmodtool 28 May 2006 16:21:44 -0000 1.6 @@ -23,9 +23,11 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +shopt -s extglob + myprog="kmodtool" -myver="0.10.9" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' +myver="0.10.10" +knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)) kmod_name= kver= verrel= @@ -33,24 +35,27 @@ get_verrel () { - verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" + verrel=${1:-$(uname -r)} + verrel=${verrel%%$knownvariants} } print_verrel () { - get_verrel $@ || return $? + get_verrel $@ echo "${verrel}" } get_variant () { - variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" - [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' + get_verrel $@ + variant=${1:-$(uname -r)} + variant=${variant##$verrel} + variant=${variant:-'""'} } print_variant () { - get_variant $@ || return $? + get_variant $@ echo "${variant}" } Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- thinkpad-kmod.spec 15 May 2006 19:48:21 -0000 1.9 +++ thinkpad-kmod.spec 28 May 2006 16:21:44 -0000 1.10 @@ -1,9 +1,9 @@ # stuff to be implemented externally: Source10: kmodtool -%define kmodtool sh %{SOURCE10} +%define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2111_FC5} +%{?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -19,7 +19,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 6.%(echo %{kverrel} | tr - _) +Release: 7.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -65,6 +65,9 @@ %changelog +* Sun May 28 2006 Ville Skytt?? - 5.9-7 +- Update kmodtool to 0.10.10, invoke it with bash instead of sh. + * Mon May 15 2006 Ville Skytt?? - 5.9-6 - Require version >= of thinkpad-kmod-common. - Provide thinkpad-kmod instead of kmod-thinkpad to fix upgrade problems. From fedora-extras-commits at redhat.com Sun May 28 16:21:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 28 May 2006 09:21:45 -0700 Subject: rpms/lirc-kmod/FC-5 kmodtool,1.5,1.6 lirc-kmod.spec,1.8,1.9 Message-ID: <200605281622.k4SGMH26021951@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/lirc-kmod/FC-5 Modified Files: kmodtool lirc-kmod.spec Log Message: * Sun May 28 2006 Ville Skytt?? - Update kmodtool to 0.10.10, invoke it with bash instead of sh. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/kmodtool,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kmodtool 15 May 2006 19:48:22 -0000 1.5 +++ kmodtool 28 May 2006 16:21:45 -0000 1.6 @@ -23,9 +23,11 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +shopt -s extglob + myprog="kmodtool" -myver="0.10.9" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' +myver="0.10.10" +knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)) kmod_name= kver= verrel= @@ -33,24 +35,27 @@ get_verrel () { - verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" + verrel=${1:-$(uname -r)} + verrel=${verrel%%$knownvariants} } print_verrel () { - get_verrel $@ || return $? + get_verrel $@ echo "${verrel}" } get_variant () { - variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" - [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' + get_verrel $@ + variant=${1:-$(uname -r)} + variant=${variant##$verrel} + variant=${variant:-'""'} } print_variant () { - get_variant $@ || return $? + get_variant $@ echo "${variant}" } Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lirc-kmod.spec 15 May 2006 19:48:22 -0000 1.8 +++ lirc-kmod.spec 28 May 2006 16:21:45 -0000 1.9 @@ -2,10 +2,10 @@ # stuff to be implemented externally: Source10: kmodtool -%define kmodtool sh %{SOURCE10} +%define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2111_FC5} +%{?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 7.%(echo %{kverrel} | tr - _) +Release: 8.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,9 @@ %changelog +* Sun May 28 2006 Ville Skytt?? - 0.8.0-8 +- Update kmodtool to 0.10.10, invoke it with bash instead of sh. + * Mon May 15 2006 Ville Skytt?? - 0.8.0-7 - Require version >= of lirc-kmod-common. - Provide lirc-kmod instead of kmod-lirc to fix upgrade problems. From fedora-extras-commits at redhat.com Sun May 28 16:27:02 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 28 May 2006 09:27:02 -0700 Subject: owners owners.list,1.1066,1.1067 Message-ID: <200605281627.k4SGR49K022023@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22006 Modified Files: owners.list Log Message: lirc-kmod* have been orphaned for a while, see Wiki (and ML soon) for more info Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1066 retrieving revision 1.1067 diff -u -r1.1066 -r1.1067 --- owners.list 28 May 2006 13:13:09 -0000 1.1066 +++ owners.list 28 May 2006 16:27:02 -0000 1.1067 @@ -745,8 +745,8 @@ Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org| Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|lirc-kmod|LIRC kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi +Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 28 17:52:04 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:52:04 -0700 Subject: owners owners.list,1.1067,1.1068 Message-ID: <200605281752.k4SHq6C7024601@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24584 Modified Files: owners.list Log Message: Add perl-XML-Stream Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1067 retrieving revision 1.1068 diff -u -r1.1067 -r1.1068 --- owners.list 28 May 2006 16:27:02 -0000 1.1067 +++ owners.list 28 May 2006 17:52:04 -0000 1.1068 @@ -1284,6 +1284,7 @@ Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-Stream|XML::Stream - streaming XML library|cweyl at alumni.drew.edu Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 28 17:54:43 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:54:43 -0700 Subject: rpms/perl-Net-XMPP - New directory Message-ID: <200605281754.k4SHsjtN024682@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24654/perl-Net-XMPP Log Message: Directory /cvs/extras/rpms/perl-Net-XMPP added to the repository From fedora-extras-commits at redhat.com Sun May 28 17:54:44 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:54:44 -0700 Subject: rpms/perl-Net-XMPP/devel - New directory Message-ID: <200605281754.k4SHskaO024685@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24654/perl-Net-XMPP/devel Log Message: Directory /cvs/extras/rpms/perl-Net-XMPP/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 17:54:51 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:54:51 -0700 Subject: rpms/perl-Net-XMPP Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605281754.k4SHsrXu024734@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24701 Added Files: Makefile import.log Log Message: Setup of module perl-Net-XMPP --- NEW FILE Makefile --- # Top level Makefile for module perl-Net-XMPP all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 17:54:52 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:54:52 -0700 Subject: rpms/perl-Net-XMPP/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605281754.k4SHssSc024737@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24701/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Net-XMPP --- NEW 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 May 28 17:55:10 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:55:10 -0700 Subject: rpms/perl-Net-XMPP import.log,1.1,1.2 Message-ID: <200605281755.k4SHtCTe024806@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24772 Modified Files: import.log Log Message: auto-import perl-Net-XMPP-1.0-4.fc5 on branch devel from perl-Net-XMPP-1.0-4.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Net-XMPP/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 17:54:51 -0000 1.1 +++ import.log 28 May 2006 17:55:09 -0000 1.2 @@ -0,0 +1 @@ +perl-Net-XMPP-1_0-4_fc5:HEAD:perl-Net-XMPP-1.0-4.fc5.src.rpm:1148838907 From fedora-extras-commits at redhat.com Sun May 28 17:55:10 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:55:10 -0700 Subject: rpms/perl-Net-XMPP/devel LICENSING.correspondance, NONE, 1.1 perl-Net-XMPP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605281755.k4SHtCmh024811@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24772/devel Modified Files: .cvsignore sources Added Files: LICENSING.correspondance perl-Net-XMPP.spec Log Message: auto-import perl-Net-XMPP-1.0-4.fc5 on branch devel from perl-Net-XMPP-1.0-4.fc5.src.rpm --- NEW FILE LICENSING.correspondance --- The licensing for this module is interesting -- the documentation of the module states that the license is Perl (aka GPL or Artistic), whereas the files have LGPL headers and the tarball includes the text of the LGPL itself. Given the author's response, my assessment is that this software is triple licensed: It may be used under the terms of the GPL, LGPL, or Artistic license, at your option. From: Ryan Eatmon To: Chris Weyl Date: May 22, 2006 6:03 PM Subject: Re: Net::XMPP license question Whatever. I don't actually care one way or the other. Go right ahead. Chris Weyl wrote: > Sorry to keep on bugging you, but would it be OK for me to strip out > the LGPL licensing statements? > > Or is this software triple licensed? e.g. Perl (GPL or Artistic), LGPL? > > Thanks :) > -Chris > > On 5/15/06, Chris Weyl wrote: >> If this code isn't meant to also be licensed under the LGPL, would it >> be ok with you for me to patch the LGPL statements out for the version >> released under fedora extras? >> >> -Chris >> >> On 5/14/06, Ryan Eatmon wrote: >> > >> > Yep. >> > >> > >> > Chris Weyl wrote: >> > > Hey Ryan-- >> > > >> > > Quick question. I'm in the middle of packaging up Net::XMPP (and for >> > > that matter, XML::Stream and Net::Jabber) for fedora extras, and it >> > > was pointed out to me that while Net/XMPP.pm states "COPYRIGHT: This >> > > module is free software, you can redistribute it and/or modify it >> > > under the same terms as Perl itself", the actual archive includes a >> > > LICENSE.LGPL. >> > > >> > > Are all three of these modules under "the same terms as Perl itself"? >> > > >> > > Thanks:) >> > > -Chris >> > >> > >> > -- >> > Ryan Eatmon >> > reatmon at jabber.org >> > >> >> >> -- >> Chris Weyl >> Ex astris, scientia >> > > -- Ryan Eatmon reatmon at jabber.org --- NEW FILE perl-Net-XMPP.spec --- # $Id$ Name: perl-Net-XMPP Version: 1.0 Release: 4%{?dist} Summary: Net::XMPP - perl XMPP library Group: Development/Libraries License: GPL or Artistic or LGPL URL: http://search.cpan.org/dist/Net-XMPP/ Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/Net-XMPP-%{version}.tar.gz Source1: LICENSING.correspondance BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl, perl(XML::Stream), perl(Digest::SHA1) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Net::XMPP provides a Perl user with access to the Extensible Messaging and Presence Protocol (XMPP). For more information about XMPP visit: http://www.xmpp.org %prep %setup -q -n Net-XMPP-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} cp %{SOURCE1} . # generate our other two licenses... perldoc perlgpl > LICENSE.GPL perldoc perlartistic > LICENSE.Artistic %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README CHANGES examples LICENSE.* LICENSING.* %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu May 25 2006 Chris Weyl 1.0-4 - include license text, including generated ones - include correspondance with the module's author * Wed May 24 2006 Chris Weyl 1.0-3 - update license to triple licensed, based on conversations with upstream * Mon May 15 2006 Chris Weyl 1.0-2 - include additional files as docs * Fri May 12 2006 Chris Weyl 1.0-1 - first f-e spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-XMPP/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 17:54:52 -0000 1.1 +++ .cvsignore 28 May 2006 17:55:10 -0000 1.2 @@ -0,0 +1 @@ +Net-XMPP-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-XMPP/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 17:54:52 -0000 1.1 +++ sources 28 May 2006 17:55:10 -0000 1.2 @@ -0,0 +1 @@ +6338484aa0d394e68c01666ca34e5241 Net-XMPP-1.0.tar.gz From fedora-extras-commits at redhat.com Sun May 28 17:57:19 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:57:19 -0700 Subject: owners owners.list,1.1068,1.1069 Message-ID: <200605281757.k4SHvLOV024888@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24871 Modified Files: owners.list Log Message: Add perl-Net-XMPP Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1068 retrieving revision 1.1069 diff -u -r1.1068 -r1.1069 --- owners.list 28 May 2006 17:52:04 -0000 1.1068 +++ owners.list 28 May 2006 17:57:19 -0000 1.1069 @@ -1171,6 +1171,7 @@ Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH-Perl|SSH (Secure Shell) client|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-XMPP|Net::XMPP - perl XMPP library|cweyl at alumni.drew.edu Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Object-Accessor|Perl module that allows per object accessors|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 28 21:36:47 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:36:47 -0700 Subject: rpms/blam - New directory Message-ID: <200605282136.k4SLanIA002624@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2597/blam Log Message: Directory /cvs/extras/rpms/blam added to the repository From fedora-extras-commits at redhat.com Sun May 28 21:36:48 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:36:48 -0700 Subject: rpms/blam/devel - New directory Message-ID: <200605282136.k4SLao5F002627@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2597/blam/devel Log Message: Directory /cvs/extras/rpms/blam/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 21:37:17 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:37:17 -0700 Subject: rpms/blam Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605282137.k4SLbJ3Y002676@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2643 Added Files: Makefile import.log Log Message: Setup of module blam --- NEW FILE Makefile --- # Top level Makefile for module blam all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 21:37:17 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:37:17 -0700 Subject: rpms/blam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605282137.k4SLbJjZ002679@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2643/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module blam --- NEW 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 May 28 21:45:14 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:45:14 -0700 Subject: rpms/blam import.log,1.1,1.2 Message-ID: <200605282145.k4SLjG8X002801@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2766 Modified Files: import.log Log Message: auto-import blam-1.8.2-5 on branch devel from blam-1.8.2-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/blam/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 21:37:16 -0000 1.1 +++ import.log 28 May 2006 21:45:14 -0000 1.2 @@ -0,0 +1 @@ +blam-1_8_2-5:HEAD:blam-1.8.2-5.src.rpm:1148852687 From fedora-extras-commits at redhat.com Sun May 28 21:45:15 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:45:15 -0700 Subject: rpms/blam/devel blam-aclocal.m4-ngettext.patch, NONE, 1.1 blam-gtk-sharp2-gecko-sharp2.patch, NONE, 1.1 blam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605282145.k4SLjHIS002812@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2766/devel Modified Files: .cvsignore sources Added Files: blam-aclocal.m4-ngettext.patch blam-gtk-sharp2-gecko-sharp2.patch blam.spec Log Message: auto-import blam-1.8.2-5 on branch devel from blam-1.8.2-5.src.rpm blam-aclocal.m4-ngettext.patch: --- NEW FILE blam-aclocal.m4-ngettext.patch --- --- aclocal.m4.orig 2006-05-28 13:33:18.000000000 -0500 +++ aclocal.m4 2006-04-07 13:43:39.000000000 -0500 @@ -121,7 +121,7 @@ [AC_TRY_LINK([ #include ], - [return (int) ngettext ("","", 1)], + [return !ngettext ("","", 1)], gt_cv_func_ngettext_libc=yes, gt_cv_func_ngettext_libc=no) ]) @@ -131,7 +131,7 @@ [AC_TRY_LINK([ #include ], - [return (int) dgettext ("","")], + [return !dgettext ("","")], gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no) ]) blam-gtk-sharp2-gecko-sharp2.patch: --- NEW FILE blam-gtk-sharp2-gecko-sharp2.patch --- --- configure.in.orig 2006-05-18 14:37:06.000000000 -0500 +++ configure.in 2006-05-18 16:53:27.000000000 -0500 @@ -45,20 +45,20 @@ dnl Find mono MONO_REQUIRED_VERSION=1.1.4 -GTKSHARP_REQUIRED_VERSION=1.0 +GTKSHARP_REQUIRED_VERSION=2.0 GCONF_REQUIRED_VERSION=2.4 -GECKOSHARP_REQUIRED_VERSION=0.6 +GECKOSHARP_REQUIRED_VERSION=0.1 PKG_CHECK_MODULES(BASE_DEPENDENCIES, mono >= $MONO_REQUIRED_VERSION - gtk-sharp >= $GTKSHARP_REQUIRED_VERSION + gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION) PKG_CHECK_MODULES(BLAM, - gtk-sharp >= $GTKSHARP_REQUIRED_VERSION - gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION - gconf-sharp >= $GTKSHARP_REQUIRED_VERSION - glade-sharp >= $GTKSHARP_REQUIRED_VERSION) + gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(BLAM_LIBS) --- NEW FILE blam.spec --- %define _libdir %{_exec_prefix}/lib Name: blam Version: 1.8.2 Release: 5%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet License: GPL URL: http://developer.imendio.com/wiki/Blam Source0: http://ftp.imendio.com/pub/imendio/blam/src/blam-%{version}.tar.gz Patch0: blam-gtk-sharp2-gecko-sharp2.patch Patch1: blam-aclocal.m4-ngettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2-gapi, gtk-sharp2, gecko-sharp2 BuildRequires: mozilla-devel BuildRequires: libgnomeui-devel BuildRequires: desktop-file-utils, gettext BuildRequires: autoconf Requires(pre): GConf2 Requires(post): GConf2, desktop-file-utils Requires(preun): GConf2 Requires(postun): desktop-file-utils %description Blam is a tool that helps you keep track of the growing number of news feeds distributed as RSS. Blam lets you subscribe to any number of feeds and provides an easy to use and clean interface to stay up to date %prep %setup -q %patch0 -p0 %patch1 -p0 %build autoconf %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT # Do not need devel files rm $RPM_BUILD_ROOT%{_libdir}/blam/libblam.{a,la} %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post update-desktop-database &> /dev/null ||: export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %postun update-desktop-database &> /dev/null ||: %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %config %{_sysconfdir}/gconf/schemas/blam.schemas %{_bindir}/* %{_libdir}/blam %{_datadir}/blam %{_datadir}/applications/* %{_datadir}/pixmaps/* %changelog * Sun May 28 2006 John Mahowald - 1.8.2-5 - fix ngettext autoconf macro for x86_64 * Sun May 21 2006 John Mahowald - 1.8.2-4 - readd .so - reenable find_lang - mark gconf schemea as config * Thu May 18 2006 John Mahowald - 1.8.2-2 - gtk-sharp2 gecko-sharp2 - no .a, .la, .so * Tue Mar 23 2006 Sindre Pedersen Bj??rdal - 1.8.2-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/blam/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 21:37:17 -0000 1.1 +++ .cvsignore 28 May 2006 21:45:15 -0000 1.2 @@ -0,0 +1 @@ +blam-1.8.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/blam/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 21:37:17 -0000 1.1 +++ sources 28 May 2006 21:45:15 -0000 1.2 @@ -0,0 +1 @@ +8cb05faedf60d895d94a5ecf9d10eb8f blam-1.8.2.tar.gz From fedora-extras-commits at redhat.com Sun May 28 22:55:52 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 28 May 2006 15:55:52 -0700 Subject: rpms/scim-skk/FC-5 scim-skk.spec,1.12,1.13 Message-ID: <200605282255.k4SMtsVf005460@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5443 Modified Files: scim-skk.spec Log Message: rebuild required for libstdc++so7-devel-0:4.2.0-0.3.20060428.fc5.2 Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-5/scim-skk.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim-skk.spec 20 May 2006 04:36:33 -0000 1.12 +++ scim-skk.spec 28 May 2006 22:55:51 -0000 1.13 @@ -2,7 +2,7 @@ Name: scim-skk Version: 0.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: SCIM IMEngine module for skk Group: System Environment/Libraries @@ -62,6 +62,10 @@ %changelog +* Mon Mar 29 2006 Ryo Dairiki - 0.5.2-5 +- rebuild against libstdc++so7 (0:4.2.0-0.3.20060428.fc5.2) + + * Sat Mar 20 2006 Ryo Dairiki - 0.5.2-4 - rebuild against libstdc++so7 (0:4.2.0-0.3.20060428.fc5.1) From fedora-extras-commits at redhat.com Mon May 29 00:17:45 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 28 May 2006 17:17:45 -0700 Subject: rpms/scim-tomoe/FC-5 scim-tomoe.spec,1.11,1.12 Message-ID: <200605290017.k4T0Hl6H010423@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10404 Modified Files: scim-tomoe.spec Log Message: rebuilding, required by libstdc++ Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-5/scim-tomoe.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim-tomoe.spec 20 May 2006 06:05:11 -0000 1.11 +++ scim-tomoe.spec 29 May 2006 00:17:45 -0000 1.12 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -64,6 +64,9 @@ %changelog +* Mon Mar 29 2006 Ryo Dairiki - 0.2-6 +- rebuild against new libstdc++so7 + * Sat May 20 2006 Ryo Dairiki - 0.2-5 - rebuild against new libstdc++so7 From fedora-extras-commits at redhat.com Mon May 29 00:18:26 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 28 May 2006 17:18:26 -0700 Subject: rpms/scim-tomoe/FC-5 scim-tomoe.spec,1.12,1.13 Message-ID: <200605290018.k4T0ISds010451@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10434 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-5/scim-tomoe.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim-tomoe.spec 29 May 2006 00:17:45 -0000 1.12 +++ scim-tomoe.spec 29 May 2006 00:18:26 -0000 1.13 @@ -64,7 +64,7 @@ %changelog -* Mon Mar 29 2006 Ryo Dairiki - 0.2-6 +* Mon May 29 2006 Ryo Dairiki - 0.2-6 - rebuild against new libstdc++so7 * Sat May 20 2006 Ryo Dairiki - 0.2-5 From fedora-extras-commits at redhat.com Mon May 29 00:49:18 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 28 May 2006 17:49:18 -0700 Subject: rpms/scim-input-pad/FC-5 scim-input-pad.spec,1.5,1.6 Message-ID: <200605290049.k4T0nKFB010618@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-input-pad/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10601 Modified Files: scim-input-pad.spec Log Message: rebuild against new libstdc++-so_7 Index: scim-input-pad.spec =================================================================== RCS file: /cvs/extras/rpms/scim-input-pad/FC-5/scim-input-pad.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-input-pad.spec 13 Feb 2006 06:21:12 -0000 1.5 +++ scim-input-pad.spec 29 May 2006 00:49:18 -0000 1.6 @@ -2,7 +2,7 @@ Name: scim-input-pad Version: 0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: On-screen Input Pad for SCIM Group: System Environment/Libraries @@ -73,6 +73,9 @@ %changelog +* Mon Mar 29 2006 Ryo Dairiki - 0.1.1-5 +- build against new libstdc++so7 preview library + * Mon Feb 13 2006 Jens Petersen - 0.1.1-3 - build conditionally with libstdc++so7 preview library (#166041) - add with_libstdc_preview switch and tweak libtool to link against it From fedora-extras-commits at redhat.com Mon May 29 04:02:26 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sun, 28 May 2006 21:02:26 -0700 Subject: rpms/qof/devel qof-gnc-date-test.patch,1.1,1.2 qof.spec,1.16,1.17 Message-ID: <200605290402.k4T42xUA020435@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20413 Modified Files: qof-gnc-date-test.patch qof.spec Log Message: - Use G_MAXINT32 for the test patch. - BR: gettext. qof-gnc-date-test.patch: Index: qof-gnc-date-test.patch =================================================================== RCS file: /cvs/extras/rpms/qof/devel/qof-gnc-date-test.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qof-gnc-date-test.patch 12 May 2006 21:01:50 -0000 1.1 +++ qof-gnc-date-test.patch 29 May 2006 04:02:21 -0000 1.2 @@ -6,7 +6,7 @@ + /* Get a random time that won't overflow a signed 32bit int durng testing */ ts = *get_random_timespec (); -+ while (ts.tv_sec >= ((2^31) - (10000*10800))) { ++ while (ts.tv_sec >= (G_MAXINT32 - (10000*10800))) { + ts = *get_random_timespec(); + }; Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- qof.spec 12 May 2006 21:01:50 -0000 1.16 +++ qof.spec 29 May 2006 04:02:22 -0000 1.17 @@ -1,6 +1,6 @@ Name: qof Version: 0.6.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries @@ -15,6 +15,7 @@ BuildRequires: glib2-devel BuildRequires: libgda-devel BuildRequires: intltool +BuildRequires: gettext # qof doesn't ship with pre-built documentation BuildRequires: doxygen @@ -116,6 +117,10 @@ %doc html %changelog +* Sun May 28 2006 Toshio Kuratomi - 0.6.4-5 +- Use G_MAXINT32 for the test patch. +- BR: gettext. + * Fri May 12 2006 Toshio Kuratomi - 0.6.4-4 - After talking with upstream it was decided that the supposed char problem was a problem with the test suite. New patch fixes an overflow in the From fedora-extras-commits at redhat.com Mon May 29 04:52:43 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 21:52:43 -0700 Subject: owners owners.list,1.1069,1.1070 Message-ID: <200605290452.k4T4qjmL020680@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20663 Modified Files: owners.list Log Message: Adding python-dns and python-xmpp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1069 retrieving revision 1.1070 diff -u -r1.1069 -r1.1070 --- owners.list 28 May 2006 17:57:19 -0000 1.1069 +++ owners.list 29 May 2006 04:52:43 -0000 1.1070 @@ -1371,6 +1371,7 @@ 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-dns|DNS toolkit for Python|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-elementtree|Fast XML parser and writer|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| @@ -1410,6 +1411,7 @@ Fedora Extras|python-TestGears|Unit testing for Python|ivazquez at ivazquez.net|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|python-xmpp|Python library for easy scripting with Jabber|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|PyX|Python graphics package|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net From fedora-extras-commits at redhat.com Mon May 29 05:12:51 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 28 May 2006 22:12:51 -0700 Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.7, 1.8 NetworkManager-vpnc.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200605290512.k4T5CrkB023084@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23063 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Mon May 29 2006 Dan Williams - 0.7.0-0.cvs20060529 - Gnome.org #336913: HIG tweaks for vpn properties pages Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2006 20:40:19 -0000 1.7 +++ .cvsignore 29 May 2006 05:12:51 -0000 1.8 @@ -4,3 +4,4 @@ NetworkManager-vpnc-0.6.0.tar.gz NetworkManager-vpnc-0.6.2.tar.gz NetworkManager-vpnc-0.7.0.cvs20060521.tar.gz +NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- NetworkManager-vpnc.spec 21 May 2006 20:40:19 -0000 1.11 +++ NetworkManager-vpnc.spec 29 May 2006 05:12:51 -0000 1.12 @@ -7,7 +7,7 @@ %define cvs_snapshot 1 %if %{cvs_snapshot} -%define nm_vpnc_cvs_version .cvs20060521 +%define nm_vpnc_cvs_version .cvs20060529 %endif Summary: NetworkManager VPN integration for vpnc @@ -90,6 +90,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Mon May 29 2006 Dan Williams - 0.7.0-0.cvs20060529 +- Gnome.org #336913: HIG tweaks for vpn properties pages + * Sun May 21 2006 Dan Williams 0.7.0-0.cvs20060521 - Update to CVS snapshot - Honor user-specified rekeying intervals Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2006 20:40:19 -0000 1.7 +++ sources 29 May 2006 05:12:51 -0000 1.8 @@ -1 +1 @@ -ea25752ca514d5e6f6acf6a797d44b82 NetworkManager-vpnc-0.7.0.cvs20060521.tar.gz +e49518b7932079ceaf4b358d6b0a727e NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:13:03 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:13:03 -0700 Subject: rpms/libeXosip2/FC-5 .cvsignore, 1.4, 1.5 libeXosip2.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605290513.k4T5D5Zc023140@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/libeXosip2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23119 Modified Files: .cvsignore libeXosip2.spec sources Log Message: Update to 2.2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 04:57:22 -0000 1.4 +++ .cvsignore 29 May 2006 05:13:03 -0000 1.5 @@ -1 +1 @@ -libeXosip2-2.2.2.tar.gz +libeXosip2-2.2.3.tar.gz Index: libeXosip2.spec =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-5/libeXosip2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libeXosip2.spec 20 Feb 2006 14:58:50 -0000 1.6 +++ libeXosip2.spec 29 May 2006 05:13:03 -0000 1.7 @@ -1,8 +1,8 @@ Summary: A library that hides the complexity of using the SIP protocol Name: libeXosip2 -Version: 2.2.2 -Release: 4%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://savannah.nongnu.org/projects/eXosip @@ -69,6 +69,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 2.2.3-1 +- Update to 2.2.3 + * Mon Feb 20 2006 Jeffrey C. Ollie - 2.2.2-4 - Bump release for rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 04:57:22 -0000 1.4 +++ sources 29 May 2006 05:13:03 -0000 1.5 @@ -1 +1 @@ -3434df493dc780b4bae76467ce29d689 libeXosip2-2.2.2.tar.gz +837a35f085890eac3328ac402b24383b libeXosip2-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:15:21 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:15:21 -0700 Subject: rpms/libeXosip2/FC-4 .cvsignore, 1.4, 1.5 libeXosip2.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605290515.k4T5FNSm023227@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/libeXosip2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23206 Modified Files: .cvsignore libeXosip2.spec sources Log Message: Update to 2.2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 04:53:43 -0000 1.4 +++ .cvsignore 29 May 2006 05:15:20 -0000 1.5 @@ -1 +1 @@ -libeXosip2-2.2.2.tar.gz +libeXosip2-2.2.3.tar.gz Index: libeXosip2.spec =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-4/libeXosip2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libeXosip2.spec 5 Jan 2006 04:53:43 -0000 1.5 +++ libeXosip2.spec 29 May 2006 05:15:20 -0000 1.6 @@ -1,8 +1,8 @@ Summary: A library that hides the complexity of using the SIP protocol Name: libeXosip2 -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://savannah.nongnu.org/projects/eXosip @@ -69,6 +69,15 @@ %{_mandir}/man3/*.3* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 2.2.3-1 +- Update to 2.2.3 + +* Mon Feb 20 2006 Jeffrey C. Ollie - 2.2.2-4 +- Bump release for rebuild. + +* Mon Feb 13 2006 Jeffrey C. Ollie - 2.2.2-3 +- Bump release and rebuild for gcc 4.1 and glibc. + * Wed Jan 4 2006 Jeffrey C. Ollie - 2.2.2 - Update to 2.2.2. - Bump release because forgot to upload new source. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 04:53:43 -0000 1.4 +++ sources 29 May 2006 05:15:20 -0000 1.5 @@ -1 +1 @@ -3434df493dc780b4bae76467ce29d689 libeXosip2-2.2.2.tar.gz +837a35f085890eac3328ac402b24383b libeXosip2-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:18:01 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:18:01 -0700 Subject: rpms/libeXosip2/devel .cvsignore, 1.4, 1.5 libeXosip2.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605290518.k4T5I3bL023330@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/libeXosip2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23309 Modified Files: .cvsignore libeXosip2.spec sources Log Message: Update to 2.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 04:57:22 -0000 1.4 +++ .cvsignore 29 May 2006 05:18:01 -0000 1.5 @@ -1 +1 @@ -libeXosip2-2.2.2.tar.gz +libeXosip2-2.2.3.tar.gz Index: libeXosip2.spec =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/devel/libeXosip2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libeXosip2.spec 20 Feb 2006 14:58:50 -0000 1.6 +++ libeXosip2.spec 29 May 2006 05:18:01 -0000 1.7 @@ -1,8 +1,8 @@ Summary: A library that hides the complexity of using the SIP protocol Name: libeXosip2 -Version: 2.2.2 -Release: 4%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://savannah.nongnu.org/projects/eXosip @@ -69,6 +69,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 2.2.3-1 +- Update to 2.2.3 + * Mon Feb 20 2006 Jeffrey C. Ollie - 2.2.2-4 - Bump release for rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 04:57:22 -0000 1.4 +++ sources 29 May 2006 05:18:01 -0000 1.5 @@ -1 +1 @@ -3434df493dc780b4bae76467ce29d689 libeXosip2-2.2.2.tar.gz +837a35f085890eac3328ac402b24383b libeXosip2-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:55:43 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:55:43 -0700 Subject: rpms/byzanz/devel .cvsignore, 1.3, 1.4 byzanz.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605290555.k4T5tjfQ023512@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/byzanz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23491 Modified Files: .cvsignore byzanz.spec sources Log Message: Update to 0.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/byzanz/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Jan 2006 05:09:48 -0000 1.3 +++ .cvsignore 29 May 2006 05:55:43 -0000 1.4 @@ -1 +1 @@ -byzanz-0.1.0.tar.gz +byzanz-0.1.1.tar.gz Index: byzanz.spec =================================================================== RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- byzanz.spec 20 Feb 2006 14:44:57 -0000 1.8 +++ byzanz.spec 29 May 2006 05:55:43 -0000 1.9 @@ -1,7 +1,7 @@ Summary: A desktop recorder Name: byzanz -Version: 0.1.0 -Release: 6%{?dist} +Version: 0.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.freedesktop.org/~company/byzanz/ @@ -82,11 +82,15 @@ %{_libdir}/bonobo/servers/ByzanzApplet.server %{_libexecdir}/byzanz-applet %{_datadir}/gnome-2.0/ui/byzanzapplet.xml -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-area.png -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-screen.png -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png +%{_datadir}/icons/hicolor/*/apps/byzanz-record-area.* +%{_datadir}/icons/hicolor/*/apps/byzanz-record-desktop.* +%{_datadir}/icons/hicolor/*/apps/byzanz-record-window.* +%{_mandir}/man1/byzanz-record.1* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 0.1.1-1 +- Update to 1.1.1. + * Mon Feb 20 2006 Jeffrey C. Ollie - 0.1.0-6 - Bump for another rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/byzanz/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Jan 2006 05:09:48 -0000 1.3 +++ sources 29 May 2006 05:55:43 -0000 1.4 @@ -1 +1 @@ -3637e3a078aec602606ad053512b1209 byzanz-0.1.0.tar.gz +717c7a15320507a7deaa36eeb73270de byzanz-0.1.1.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:56:46 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:56:46 -0700 Subject: rpms/byzanz/FC-5 .cvsignore, 1.3, 1.4 byzanz.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605290556.k4T5um3I023583@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/byzanz/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23562 Modified Files: .cvsignore byzanz.spec sources Log Message: Update to 0.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/byzanz/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Jan 2006 05:09:48 -0000 1.3 +++ .cvsignore 29 May 2006 05:56:46 -0000 1.4 @@ -1 +1 @@ -byzanz-0.1.0.tar.gz +byzanz-0.1.1.tar.gz Index: byzanz.spec =================================================================== RCS file: /cvs/extras/rpms/byzanz/FC-5/byzanz.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- byzanz.spec 20 Feb 2006 14:44:57 -0000 1.8 +++ byzanz.spec 29 May 2006 05:56:46 -0000 1.9 @@ -1,7 +1,7 @@ Summary: A desktop recorder Name: byzanz -Version: 0.1.0 -Release: 6%{?dist} +Version: 0.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.freedesktop.org/~company/byzanz/ @@ -82,11 +82,15 @@ %{_libdir}/bonobo/servers/ByzanzApplet.server %{_libexecdir}/byzanz-applet %{_datadir}/gnome-2.0/ui/byzanzapplet.xml -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-area.png -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-screen.png -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png +%{_datadir}/icons/hicolor/*/apps/byzanz-record-area.* +%{_datadir}/icons/hicolor/*/apps/byzanz-record-desktop.* +%{_datadir}/icons/hicolor/*/apps/byzanz-record-window.* +%{_mandir}/man1/byzanz-record.1* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 0.1.1-1 +- Update to 1.1.1. + * Mon Feb 20 2006 Jeffrey C. Ollie - 0.1.0-6 - Bump for another rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/byzanz/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Jan 2006 05:09:48 -0000 1.3 +++ sources 29 May 2006 05:56:46 -0000 1.4 @@ -1 +1 @@ -3637e3a078aec602606ad053512b1209 byzanz-0.1.0.tar.gz +717c7a15320507a7deaa36eeb73270de byzanz-0.1.1.tar.gz From fedora-extras-commits at redhat.com Mon May 29 07:01:54 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 00:01:54 -0700 Subject: rpms/lua/devel .cvsignore, 1.3, 1.4 lua.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200605290702.k4T72S9T028437@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28415 Modified Files: .cvsignore lua.spec sources Log Message: include shored lib, added autotools patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 22:26:23 -0000 1.3 +++ .cvsignore 29 May 2006 07:01:54 -0000 1.4 @@ -1 +1 @@ -lua-5.1.tar.gz +lua-5.1-autotoolize-r1.patch.bz2 Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lua.spec 7 May 2006 22:52:05 -0000 1.13 +++ lua.spec 29 May 2006 07:01:54 -0000 1.14 @@ -1,12 +1,13 @@ Name: lua Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT URL: http://www.lua.org/ Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz +Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, ncurses-devel @@ -25,31 +26,21 @@ %prep %setup -q +%patch0 -p1 %build -make %{?_smp_mflags} \ - MYCFLAGS="$RPM_OPT_FLAGS -fPIC" \ - MYLDFLAGS="-Wl,-E" \ - LOADLIB=-DUSE_DLOPEN=1 \ - DLLIB=-ldl \ -%ifarch %{ix86} x86_64 - NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ -%endif - USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" \ - linux +# fix perms on auto files +chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing +./autogen.sh -%install -rm -rf %{buildroot} -make install \ - INSTALL_TOP=%{buildroot}/usr \ - INSTALL_LIB=%{buildroot}/%{_libdir} \ - INSTALL_MAN=%{buildroot}%{_mandir}/man1 +%configure --with-readline -%check -make test +make %{?_smp_mflags} +%install +rm -rf %{buildroot} +%makeinstall %clean rm -rf %{buildroot} @@ -61,11 +52,15 @@ %{_bindir}/lua* %{_includedir}/l*.h %{_includedir}/l*.hpp -%{_libdir}/liblua*.a +%{_libdir}/liblua*.* +%{_libdir}/pkgconfig/*.pc %{_mandir}/man1/lua*.1* %changelog +* Mon May 29 2006 Michael J. Knox - 5.1-3 +- added autotools patch from Petri Lehtinen, http://lua-users.org + * Mon May 08 2006 Michael J. Knox - 5.1-2 - fixed x86_64 builds Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 May 2006 22:26:23 -0000 1.4 +++ sources 29 May 2006 07:01:54 -0000 1.5 @@ -1 +1 @@ -3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz +9e6a9655694450e26aa4e01220dd3636 lua-5.1-autotoolize-r1.patch.bz2 From fedora-extras-commits at redhat.com Mon May 29 07:04:13 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 00:04:13 -0700 Subject: rpms/lua/devel sources,1.5,1.6 Message-ID: <200605290704.k4T74kET028499@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28480 Modified Files: sources Log Message: don't clobber all the source files Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 May 2006 07:01:54 -0000 1.5 +++ sources 29 May 2006 07:04:13 -0000 1.6 @@ -1 +1,2 @@ +3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz 9e6a9655694450e26aa4e01220dd3636 lua-5.1-autotoolize-r1.patch.bz2 From fedora-extras-commits at redhat.com Mon May 29 07:15:30 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 00:15:30 -0700 Subject: rpms/lua/FC-4 .cvsignore, 1.3, 1.4 lua.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200605290715.k4T7FWYv028594@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555/FC-4 Modified Files: .cvsignore lua.spec sources Log Message: include shared lib, added autotools patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 22:26:59 -0000 1.3 +++ .cvsignore 29 May 2006 07:15:30 -0000 1.4 @@ -1 +1 @@ -lua-5.1.tar.gz +lua-5.1-autotoolize-r1.patch.bz2 Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/lua.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lua.spec 7 May 2006 22:52:03 -0000 1.13 +++ lua.spec 29 May 2006 07:15:30 -0000 1.14 @@ -1,12 +1,13 @@ Name: lua Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT URL: http://www.lua.org/ Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz +Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, ncurses-devel @@ -25,31 +26,21 @@ %prep %setup -q +%patch0 -p1 %build -make %{?_smp_mflags} \ - MYCFLAGS="$RPM_OPT_FLAGS -fPIC" \ - MYLDFLAGS="-Wl,-E" \ - LOADLIB=-DUSE_DLOPEN=1 \ - DLLIB=-ldl \ -%ifarch %{ix86} x86_64 - NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ -%endif - USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" \ - linux +# fix perms on auto files +chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing +./autogen.sh -%install -rm -rf %{buildroot} -make install \ - INSTALL_TOP=%{buildroot}/usr \ - INSTALL_LIB=%{buildroot}/%{_libdir} \ - INSTALL_MAN=%{buildroot}%{_mandir}/man1 +%configure --with-readline -%check -make test +make %{?_smp_mflags} +%install +rm -rf %{buildroot} +%makeinstall %clean rm -rf %{buildroot} @@ -61,11 +52,15 @@ %{_bindir}/lua* %{_includedir}/l*.h %{_includedir}/l*.hpp -%{_libdir}/liblua*.a +%{_libdir}/liblua*.* +%{_libdir}/pkgconfig/*.pc %{_mandir}/man1/lua*.1* %changelog +* Mon May 29 2006 Michael J. Knox - 5.1-3 +- added autotools patch from Petri Lehtinen, http://lua-users.org + * Mon May 08 2006 Michael J. Knox - 5.1-2 - fixed x86_64 builds Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 May 2006 22:26:59 -0000 1.4 +++ sources 29 May 2006 07:15:30 -0000 1.5 @@ -1 +1,2 @@ 3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz +9e6a9655694450e26aa4e01220dd3636 lua-5.1-autotoolize-r1.patch.bz2 From fedora-extras-commits at redhat.com Mon May 29 07:15:31 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 00:15:31 -0700 Subject: rpms/lua/FC-5 .cvsignore, 1.3, 1.4 lua.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200605290715.k4T7FXxg028600@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555/FC-5 Modified Files: .cvsignore lua.spec sources Log Message: include shared lib, added autotools patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 22:26:41 -0000 1.3 +++ .cvsignore 29 May 2006 07:15:31 -0000 1.4 @@ -1 +1 @@ -lua-5.1.tar.gz +lua-5.1-autotoolize-r1.patch.bz2 Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lua.spec 7 May 2006 22:52:04 -0000 1.13 +++ lua.spec 29 May 2006 07:15:31 -0000 1.14 @@ -1,12 +1,13 @@ Name: lua Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT URL: http://www.lua.org/ Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz +Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, ncurses-devel @@ -25,31 +26,21 @@ %prep %setup -q +%patch0 -p1 %build -make %{?_smp_mflags} \ - MYCFLAGS="$RPM_OPT_FLAGS -fPIC" \ - MYLDFLAGS="-Wl,-E" \ - LOADLIB=-DUSE_DLOPEN=1 \ - DLLIB=-ldl \ -%ifarch %{ix86} x86_64 - NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ -%endif - USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" \ - linux +# fix perms on auto files +chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing +./autogen.sh -%install -rm -rf %{buildroot} -make install \ - INSTALL_TOP=%{buildroot}/usr \ - INSTALL_LIB=%{buildroot}/%{_libdir} \ - INSTALL_MAN=%{buildroot}%{_mandir}/man1 +%configure --with-readline -%check -make test +make %{?_smp_mflags} +%install +rm -rf %{buildroot} +%makeinstall %clean rm -rf %{buildroot} @@ -61,11 +52,15 @@ %{_bindir}/lua* %{_includedir}/l*.h %{_includedir}/l*.hpp -%{_libdir}/liblua*.a +%{_libdir}/liblua*.* +%{_libdir}/pkgconfig/*.pc %{_mandir}/man1/lua*.1* %changelog +* Mon May 29 2006 Michael J. Knox - 5.1-3 +- added autotools patch from Petri Lehtinen, http://lua-users.org + * Mon May 08 2006 Michael J. Knox - 5.1-2 - fixed x86_64 builds Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 May 2006 22:26:41 -0000 1.4 +++ sources 29 May 2006 07:15:31 -0000 1.5 @@ -1 +1,2 @@ 3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz +9e6a9655694450e26aa4e01220dd3636 lua-5.1-autotoolize-r1.patch.bz2 From fedora-extras-commits at redhat.com Mon May 29 08:11:28 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:11:28 -0700 Subject: rpms/perl-Chart/devel .cvsignore, 1.4, 1.5 perl-Chart.spec, 1.5, 1.6 sources, 1.4, 1.5 dead.package, 1.1, NONE Message-ID: <200605290811.k4T8BVrA031180@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31159 Added Files: .cvsignore perl-Chart.spec sources Removed Files: dead.package Log Message: re-importing into devel Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 29 May 2006 08:11:28 -0000 1.5 @@ -0,0 +1 @@ +Chart-2.4.1.tar.gz Index: perl-Chart.spec =================================================================== RCS file: perl-Chart.spec diff -N perl-Chart.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ perl-Chart.spec 29 May 2006 08:11:28 -0000 1.6 @@ -0,0 +1,73 @@ +Name: perl-Chart +Version: 2.4.1 +Release: 2%{?dist} +Summary: Perl module for producing many types of charts + +Group: Development/Libraries +License: GPL or Artistic +URL: http://search.cpan.org/dist/Chart/ +Source0: http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: perl(GD) >= 1.20 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description +%{summary}. + + +%prep +%setup -q -n Chart-%{version} +chmod -c 644 Chart/*.pm TODO Documentation.pdf + + +%build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make pure_install PERL_INSTALL_ROOT=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w %{buildroot}/* + + +%check +make test + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc README TODO Documentation.pdf +%{perl_vendorlib}/Chart* +%{_mandir}/man3/Chart.3* + + +%changelog +* Mon May 29 2006 Michael J. Knox - 2.4.1-2 +- rebuilt and reimported in to devel + +* Wed Jan 25 2006 Ville Skytt?? - 2.4.1-1 +- 2.4.1. +- Don't ship rgb.txt in docs. +- Specfile cleanups. + +* Fri Apr 7 2005 Michael Schwendt - 2.3-3 +- rebuilt + +* Sun Jul 11 2004 Ville Skytt?? - 0:2.3-2 +- Bring up to date with current fedora.us Perl Spec template. + +* Thu Jan 15 2004 Ville Skytt?? - 0:2.3-0.fdr.1 +- Update to 2.3. +- Fix file permissions. + +* Sat Oct 11 2003 Ville Skytt?? - 0:2.2-0.fdr.1 +- First build. Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 29 May 2006 08:11:28 -0000 1.5 @@ -0,0 +1 @@ +5e7a80badfb8bf6e29b21879689bcc2f Chart-2.4.1.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Mon May 29 08:12:40 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:12:40 -0700 Subject: rpms/perl-Chart/devel Makefile,1.2,1.3 Message-ID: <200605290812.k4T8CgO0031208@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31191 Added Files: Makefile Log Message: and lets not forget the make file Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 29 May 2006 08:12:40 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: perl-Chart +# $Id$ +NAME := perl-Chart +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From fedora-extras-commits at redhat.com Mon May 29 08:15:26 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:15:26 -0700 Subject: rpms/perl-Chart/FC-5 perl-Chart.spec,1.4,1.5 Message-ID: <200605290815.k4T8FSq9031302@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31285 Modified Files: perl-Chart.spec Log Message: rebuild Index: perl-Chart.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/FC-5/perl-Chart.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Chart.spec 25 Jan 2006 16:34:46 -0000 1.4 +++ perl-Chart.spec 29 May 2006 08:15:26 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Chart Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module for producing many types of charts Group: Development/Libraries @@ -11,7 +11,7 @@ BuildArch: noarch BuildRequires: perl(GD) >= 1.20 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -28,11 +28,11 @@ %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/* +rm -rf %{buildroot} +make pure_install PERL_INSTALL_ROOT=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w %{buildroot}/* %check @@ -40,7 +40,7 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -51,6 +51,9 @@ %changelog +* Mon May 29 2006 Michael J. Knox - 2.4.1-2 +- rebuilt and reimported in to devel + * Wed Jan 25 2006 Ville Skytt?? - 2.4.1-1 - 2.4.1. - Don't ship rgb.txt in docs. From fedora-extras-commits at redhat.com Mon May 29 08:19:18 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:19:18 -0700 Subject: rpms/perl-Chart/devel perl-Chart.spec,1.6,1.7 Message-ID: <200605290819.k4T8JKW4031403@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31368/devel Modified Files: perl-Chart.spec Log Message: bump release Index: perl-Chart.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/devel/perl-Chart.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Chart.spec 29 May 2006 08:11:28 -0000 1.6 +++ perl-Chart.spec 29 May 2006 08:19:18 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Chart Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for producing many types of charts Group: Development/Libraries @@ -51,7 +51,7 @@ %changelog -* Mon May 29 2006 Michael J. Knox - 2.4.1-2 +* Mon May 29 2006 Michael J. Knox - 2.4.1-3 - rebuilt and reimported in to devel * Wed Jan 25 2006 Ville Skytt?? - 2.4.1-1 From fedora-extras-commits at redhat.com Mon May 29 08:19:17 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:19:17 -0700 Subject: rpms/perl-Chart/FC-5 perl-Chart.spec,1.5,1.6 Message-ID: <200605290819.k4T8JJ0I031399@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31368/FC-5 Modified Files: perl-Chart.spec Log Message: bump release Index: perl-Chart.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/FC-5/perl-Chart.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Chart.spec 29 May 2006 08:15:26 -0000 1.5 +++ perl-Chart.spec 29 May 2006 08:19:17 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Chart Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for producing many types of charts Group: Development/Libraries @@ -51,7 +51,7 @@ %changelog -* Mon May 29 2006 Michael J. Knox - 2.4.1-2 +* Mon May 29 2006 Michael J. Knox - 2.4.1-3 - rebuilt and reimported in to devel * Wed Jan 25 2006 Ville Skytt?? - 2.4.1-1 From fedora-extras-commits at redhat.com Mon May 29 08:21:44 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:21:44 -0700 Subject: owners owners.list,1.1070,1.1071 Message-ID: <200605290821.k4T8LkHR031514@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31497 Modified Files: owners.list Log Message: take ownership of perl-Chart Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1070 retrieving revision 1.1071 diff -u -r1.1070 -r1.1071 --- owners.list 29 May 2006 04:52:43 -0000 1.1070 +++ owners.list 29 May 2006 08:21:44 -0000 1.1071 @@ -950,7 +950,7 @@ Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Chart|Perl modules for producing many types of charts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Chart|Perl modules for producing many types of charts|michael at knox.net.nz|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 29 09:02:51 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 29 May 2006 02:02:51 -0700 Subject: rpms/mod_cband/devel .cvsignore, 1.3, 1.4 mod_cband.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605290903.k4T93OfC001496@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1467 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 29 2006 Michael Fleming 0.9.7.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 09:34:06 -0000 1.3 +++ .cvsignore 29 May 2006 09:02:51 -0000 1.4 @@ -1 +1 @@ -mod-cband-0.9.7.3.tgz +mod-cband-0.9.7.4.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/mod_cband.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_cband.spec 1 May 2006 09:55:56 -0000 1.3 +++ mod_cband.spec 29 May 2006 09:02:51 -0000 1.4 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.3 -Release: 2%{?dist} +Version: 0.9.7.4 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 29 2006 Michael Fleming 0.9.7.4-1 +- New upstream release + * Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 May 2006 09:55:56 -0000 1.4 +++ sources 29 May 2006 09:02:51 -0000 1.5 @@ -1 +1 @@ -958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz +ff635d7b55bf7ca648d319247dfb45e3 mod-cband-0.9.7.4.tgz From fedora-extras-commits at redhat.com Mon May 29 10:52:05 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:52:05 -0700 Subject: rpms/rss-glx/devel - New directory Message-ID: <200605291052.k4TAq7TY004330@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301/rss-glx/devel Log Message: Directory /cvs/extras/rpms/rss-glx/devel added to the repository From fedora-extras-commits at redhat.com Mon May 29 10:52:04 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:52:04 -0700 Subject: rpms/rss-glx - New directory Message-ID: <200605291052.k4TAq6eX004327@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301/rss-glx Log Message: Directory /cvs/extras/rpms/rss-glx added to the repository From fedora-extras-commits at redhat.com Mon May 29 10:52:19 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:52:19 -0700 Subject: rpms/rss-glx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605291052.k4TAqL4u004377@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rss-glx --- NEW 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 May 29 10:52:19 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:52:19 -0700 Subject: rpms/rss-glx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605291052.k4TAqLRu004374@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346 Added Files: Makefile import.log Log Message: Setup of module rss-glx --- NEW FILE Makefile --- # Top level Makefile for module rss-glx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 29 10:53:53 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:53:53 -0700 Subject: rpms/rss-glx import.log,1.1,1.2 Message-ID: <200605291053.k4TArtRR004468@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4431 Modified Files: import.log Log Message: auto-import rss-glx-0.8.1.p-0.6 on branch devel from rss-glx-0.8.1.p-0.6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rss-glx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 May 2006 10:52:19 -0000 1.1 +++ import.log 29 May 2006 10:53:53 -0000 1.2 @@ -0,0 +1 @@ +rss-glx-0_8_1_p-0_6:HEAD:rss-glx-0.8.1.p-0.6.src.rpm:1148900026 From fedora-extras-commits at redhat.com Mon May 29 10:53:54 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:53:54 -0700 Subject: rpms/rss-glx/devel README.fedora, NONE, 1.1 rss-glx-0.8.1-0.8.1.p.diff, NONE, 1.1 rss-glx-0.8.1-freealut.patch, NONE, 1.1 rss-glx-rm-matrixview.sh, NONE, 1.1 rss-glx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605291053.k4TAruND004477@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4431/devel Modified Files: .cvsignore sources Added Files: README.fedora rss-glx-0.8.1-0.8.1.p.diff rss-glx-0.8.1-freealut.patch rss-glx-rm-matrixview.sh rss-glx.spec Log Message: auto-import rss-glx-0.8.1.p-0.6 on branch devel from rss-glx-0.8.1.p-0.6.src.rpm --- NEW FILE README.fedora --- The Fedora packages of rss-glx contain a patched tarball without the matrixview hack. To generate this patched tarball from upstream sources, simply run: sh ./rss-glx-rm-matrixview.sh with e.g.: orig_tarball: rss-glx_0.8.1.tar.bz2 diff_file: rss-glx-0.8.1-0.8.1.p.diff new_tarball: rss-glx-0.8.1.p.tar.bz2 rss-glx-0.8.1-0.8.1.p.diff: --- NEW FILE rss-glx-0.8.1-0.8.1.p.diff --- diff -ur rss-glx_0.8.1/ChangeLog rss-glx_0.8.1.p/ChangeLog --- rss-glx_0.8.1/ChangeLog 2006-02-25 23:02:11.000000000 +0100 +++ rss-glx_0.8.1.p/ChangeLog 2006-03-10 15:25:10.000000000 +0100 @@ -1,3 +1,7 @@ +****************************** Version 0.8.1.p ******************************** + + Removed matrixview + ******************************* Version 0.8.1 ********************************* Pulled in vroot.h patch from Ari Pollak's Debian package. diff -ur rss-glx_0.8.1/configure.in rss-glx_0.8.1.p/configure.in --- rss-glx_0.8.1/configure.in 2006-02-25 22:10:54.000000000 +0100 +++ rss-glx_0.8.1.p/configure.in 2006-03-10 15:38:37.000000000 +0100 @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. AC_INIT(src/driver.cpp) -AM_INIT_AUTOMAKE(rss-glx,0.7.3) +AM_INIT_AUTOMAKE(rss-glx,0.8.1.p) AM_CONFIG_HEADER(config.h) # Checks for programs. @@ -177,9 +177,6 @@ AC_CHECK_LIB([MesaGLU],[gluLookAt],,AC_MSG_ERROR(GLU library was not found.)) fi -# Check for ImageMagick. -PKG_CHECK_MODULES(Wand, Wand >= 6.2) - AC_CHECK_HEADERS([GL/glew.h]) if test "x$ac_cv_header_GL_glew_h" = "xyes" ; then diff -ur rss-glx_0.8.1/other_src/Makefile.am rss-glx_0.8.1.p/other_src/Makefile.am --- rss-glx_0.8.1/other_src/Makefile.am 2006-02-25 22:14:53.000000000 +0100 +++ rss-glx_0.8.1.p/other_src/Makefile.am 2006-03-10 15:21:57.000000000 +0100 @@ -1,35 +1,20 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -bin_PROGRAMS = biof busyspheres matrixview spirographx sundancer2 +bin_PROGRAMS = biof busyspheres spirographx sundancer2 biof_SOURCES = driver.c biof.c busyspheres_SOURCES = driver.c busyspheres.c -matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c spirographx_SOURCES = driver.c spirographx.c sundancer2_SOURCES = driver.c sundancer2.c if INSTALL_XSCREENSAVER_CONFIG_FILES -dist_config_DATA = biof.xml busyspheres.xml matrixview.xml spirographx.xml sundancer2.xml +dist_config_DATA = biof.xml busyspheres.xml spirographx.xml sundancer2.xml endif if INSTALL_KDE_CONFIG_FILES -dist_kdessconfig_DATA = biof.desktop busyspheres.desktop matrixview.desktop spirographx.desktop sundancer2.desktop +dist_kdessconfig_DATA = biof.desktop busyspheres.desktop spirographx.desktop sundancer2.desktop endif -man_MANS = biof.1 busyspheres.1 matrixview.1 spirographx.1 sundancer2.1 +man_MANS = biof.1 busyspheres.1 spirographx.1 sundancer2.1 EXTRA_DIST = $(man_MANS) - -noinst_PROGRAMS = stringify -stringify_LDADD = @BZIP2@ - -matrixview_LDADD = @BZIP2@ @Wand_LIBS@ -matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics - ./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c - -if WITHPTHREADS -matrixview_LDADD += @PTHREADS@ -endif - -CLEANFILES = matrixview_textures.c - diff -ur rss-glx_0.8.1/README rss-glx_0.8.1.p/README --- rss-glx_0.8.1/README 2006-02-25 22:47:58.000000000 +0100 +++ rss-glx_0.8.1.p/README 2006-03-10 15:38:44.000000000 +0100 @@ -1,6 +1,4 @@ Requirements: (1) Recent gcc/g++ (2.95.x, 3.x). (2) X11+GLX. - (3) ImageMagick >6.2 (4) OPTIONAL: OpenAL for sound. (skyrocket) - (5) OPTIONAL: pthreads for smoother image loading. (matrixview) diff -ur rss-glx_0.8.1/README.xscreensaver rss-glx_0.8.1.p/README.xscreensaver --- rss-glx_0.8.1/README.xscreensaver 2005-04-10 04:16:42.000000000 +0200 +++ rss-glx_0.8.1.p/README.xscreensaver 2006-03-10 15:25:26.000000000 +0100 @@ -28,6 +28,5 @@ GL: "BioF" biof --root \n\ GL: "BusySpheres" busyspheres --root \n\ GL: "SpirographX" spirographx --root \n\ - GL: "MatrixView" matrixview --root \n\ -- End Here -- diff -ur rss-glx_0.8.1/utils/rss-glx_install.pl rss-glx_0.8.1.p/utils/rss-glx_install.pl --- rss-glx_0.8.1/utils/rss-glx_install.pl 2005-04-10 04:09:41.000000000 +0200 +++ rss-glx_0.8.1.p/utils/rss-glx_install.pl 2006-03-10 15:24:13.000000000 +0100 @@ -26,7 +26,6 @@ $screensavers->{'biof'} = ' GL: "BioF" biof --root \\n\\'; $screensavers->{'busyspheres'} = ' GL: "BusySpheres" busyspheres --root \\n\\'; $screensavers->{'spirographx'} = ' GL: "SpirographX" spirographx --root \\n\\'; -$screensavers->{'matrixview'} = ' GL: "MatrixView" matrixview --root \\n\\'; open XSCREENSAVER, "$ENV{'HOME'}/.xscreensaver"; my @xscreensaver_config_file = ; rss-glx-0.8.1-freealut.patch: --- NEW FILE rss-glx-0.8.1-freealut.patch --- --- rss-glx_0.8.1.p/configure.in.freealut 2006-03-10 15:38:37.000000000 +0100 +++ rss-glx_0.8.1.p/configure.in 2006-03-28 17:38:02.000000000 +0200 @@ -114,14 +114,30 @@ if test "x$ac_cv_header_AL_alut_h" = "xyes" ; then # Check for OpenAL library AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, -lopenal) AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + alut_libs_sav="$LIBS" + if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then + echo "... checking with separate -lalut"; + unset ac_cv_lib_openal_alutInit + LIBS="$LIBS -lalut" + AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + fi + LIBS="$alut_libs_sav" if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then - libs_sav=$LIBS + libs_sav="$LIBS" LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS -L/usr/local/lib" echo "Hrm, maybe -lopenal is in /usr/local/lib"; unset ac_cv_lib_openal_alutInit AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, -lopenal) AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + alut_libs_sav="$LIBS" + if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then + echo "... checking with separate -lalut"; + unset ac_cv_lib_openal_alutInit + LIBS="$LIBS -lalut" + AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + fi + LIBS="$alut_libs_sav" if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then # For FreeBSD -current @@ -132,6 +148,12 @@ unset ac_cv_lib_openal_alutInit AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lc_r") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then + echo "... checking with separate -lalut"; + unset ac_cv_lib_openal_alutInit + LIBS="$LIBS -lalut" + AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut -lc_r") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + fi LIBS=$libs_cr_sav --- NEW FILE rss-glx-rm-matrixview.sh --- #!/bin/bash MV_FILES="matrixview.1 matrixview.c matrixview.desktop matrixview_textures matrixview_textures.h matrixview.xml" mv_files= for i in $MV_FILES; do mv_files="$mv_files other_src/$i" done usage() { cat << EOF Usage: $0 original_tarball diff-file new_tarball E.g.: $0 rss-glx_0.8.1.tar.bz2 rss-glx-0.8.1-0.8.1.p.diff rss-glx_0.8.1.p.tar.bz2 Required tools for operation: mktemp patch aclocal automake autoconf tar EOF } tar_type() { local filename="$1" case "$filename" in *.tar.gz|*.tgz) echo -z ;; *.tar.bz2|*.tbz2) echo -j ;; *.tar) ;; *) usage exit 1 esac } tar_dir() { local filename="$1" local dirname="${filename##*/}" dirname="${dirname%.tar.bz2}" dirname="${dirname%.tbz2}" dirname="${dirname%.tar.gz}" dirname="${dirname%.tgz}" dirname="${dirname%.tar}" #dirname="${dirname/rss-glx_/rss-glx-}" echo "$dirname" } if [ "$#" -ne 3 ]; then usage exit 1 fi orig_tb="$1" if [ "$orig_tb" = "${orig_tb#/}" ]; then orig_tb="$PWD/$orig_tb" fi orig_tb_type="$(tar_type "$orig_tb")" orig_tb_dir="$(tar_dir "$orig_tb")" diff_file="$2" if [ "$diff_file" = "${diff_file#/}" ]; then diff_file="$PWD/$diff_file" fi new_tb="$3" if [ "$new_tb" = "${new_tb#/}" ]; then new_tb="$PWD/$new_tb" fi new_tb_type="$(tar_type "$new_tb")" new_tb_dir="$(tar_dir "$new_tb")" echo "Creating temporary directory." if ! TEMP_DIR="$(mktemp -d)"; then echo "mktemp failed to create a temporary directory. Aborting." exit 1 fi echo "Changing to temporary directory ${TEMP_DIR}." pushd "$TEMP_DIR" echo "Unpacking original tarball." set -x tar -x "$orig_tb_type" -f "$orig_tb" || exit 3 set +x pushd "$orig_tb_dir" echo "Removing files:" set -x for i in $mv_files; do rm -r "$i" || exit 4 done set +x echo "Applying diff file." patch -p1 < "$diff_file" || exit 5 echo 'Regenerating auto* files:' set -x aclocal || exit 6 automake || exit 7 autoconf || exit 8 rm -rf autom4te.cache || : set +x popd echo "Renaming directory:" set -x mv -f "$orig_tb_dir" "$new_tb_dir" || exit 9 set +x echo "Creating new tarball:" set -x tar -c "$new_tb_type" -f "$new_tb" "$new_tb_dir" || exit 10 set +x echo "Created ${new_tb}." popd echo "Removing temporary directory ${TEMP_DIR}." rm -rf "$TEMP_DIR" || exit 11 echo "Done." --- NEW FILE rss-glx.spec --- %define xssconfigdir %{_datadir}/xscreensaver/config %define xssbindir %{_libexecdir}/xscreensaver %define gssconfigdir %{_datadir}/gnome-screensaver/themes %define gssbindir %{_libexecdir}/gnome-screensaver %define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers %if 0%{?fedora} %if "%{fedora}" <= "4" %define modular_x 0%{?_with_modular_x:1} %define gss 0 %else %define modular_x 0%{!?_without_modular_x:1} %define gss 1 %endif %else %define modular_x 0%{?!_without_modular_x:1} %define gss 0%{?!_without_gss:1} %endif %define with_matrixview 0%{?_with_matrixview:1} %define patchext %{nil}%{?with_matrixview:.p} Summary: Really Slick Screensavers Name: rss-glx Version: 0.8.1%{patchext} Release: 0.6%{?dist} License: GPL Group: Amusements/Graphics URL: http://rss-glx.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2 Source1: README.fedora Source2: rss-glx-rm-matrixview.sh Source3: rss-glx-0.8.1-0.8.1.p.diff Patch0: rss-glx-0.8.1-freealut.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libGL-devel BuildRequires: libGLU-devel %if %modular_x BuildRequires: libICE-devel %if %with_matrixview BuildRequires: ImageMagick-devel >= 6.2.5.4 %endif BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel %endif BuildRequires: bzip2-devel BuildRequires: openal-devel BuildRequires: freealut-devel BuildRequires: autoconf %description A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. Note that this package contains only the display hacks themselves; you will need to install the appropriate subpackage for your desktop environment in order to use them as screensavers. %package xscreensaver Summary: Really Slick Screensavers Group: Amusements/Graphics Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: xscreensaver-base %description xscreensaver A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. This package contains files needed to use the hacks with xscreensaver. %if %gss %package gnome-screensaver Summary: Really Slick Screensavers Group: Amusements/Graphics Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gnome-screensaver %description gnome-screensaver A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. This package contains files needed to use the hacks with gnome-screensaver. %endif %package kde Summary: Really Slick Screensavers Group: Amusements/Graphics Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release} Requires: kdebase %description kde A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. This package contains files needed to use the hacks with KDE. %prep cat << EOF Build settings: %if %modular_x - with modular X %else - with monolithic X %endif %if %gss - with gnome-screensaver support %else - without gnome-screensaver support %endif %if %with_matrixview - with matrixview hack %else - without matrixview hack %endif EOF %setup -q -n rss-glx_%{version} %patch0 -p1 -b .freealut %build autoconf %configure \ --with-configdir=%{xssconfigdir} \ --with-kdessconfigdir=%{kdessconfigdir} make %{?_smp_mflags} %install generate_fix_desktop_files_links () { local line name trycmd cmd desc while read line; do %if %gss # generate GNOME screensaver desktop files eval $(echo "$line" | awk -F?? '{print "name=\"" $1 "\"; cmd=\"" $2 "\"; desc=\"" $3 "\""}') trycmd="${cmd%%%% *}" cat << EOF > %{buildroot}%{gssconfigdir}/rss-glx-${cmd}.desktop [Desktop Entry] Encoding=UTF-8 Name=${name} Comment=${desc} TryExec=rss-glx-${trycmd} Exec=rss-glx-${cmd} -r StartupNotify=false Terminal=false Type=Application Categories=Screensaver EOF ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{gssbindir}/rss-glx-${trycmd}" %endif # fix KDE screensaver desktop files pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null mv -f "${trycmd}.desktop" "${trycmd}.desktop.orig" awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${trycmd}.desktop.orig" > "${trycmd}.desktop" rm -f "${trycmd}.desktop.orig" popd >& /dev/null # symlinks for XScreenSaver ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}" done } rm -rf %buildroot cp -dpf "%SOURCE1" "%SOURCE2" "%SOURCE3" . make DESTDIR=%{buildroot} install rm -f %{buildroot}%{_libdir}/lib*.{,l}a %{buildroot}%{_bindir}/rss-glx_install.pl %if %gss mkdir -p %{buildroot}%{gssconfigdir} mkdir -p %{buildroot}%{gssbindir} mkdir -p %{buildroot}%{xssbindir} %endif cat << EOF | generate_fix_desktop_files_links BioF??biof??This is an attempt to recreate some of the work of William Latham. Busy Spheres??busyspheres??Spheres made of dancing particles. Colorfire??colorfire??Burning colors. Cyclone??cyclone??A cyclone made of particles. Euphoria??euphoria??Psychedelic shapes. Fieldlines??fieldlines??A simulation of the electric field lines between charged particles. Flocks??flocks??Flocks of birds. Flux??flux??If you know anything about strange attractors, you might recognize the patterns created by this screensaver. Helios??helios??Throw together some attraction/repulsion particle effects and some smooth implicit surfaces and this is what you get. Hufo's Smoke??hufo_smoke??Smoke effect. Hufo's Tunnel??hufo_tunnel??Inside a tunnel. Hyperspace??hyperspace??Hyperspace. Lattice??lattice??Fly through an endless world of linked rings. %if %with_matrixview MatrixView??matrixview??The Matrix. %endif Plasma??plasma??Probably the second most psychedelic screensaver in existence. Skyrocket (silent)??skyrocket -v 0??The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version. Skyrocket??skyrocket??The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound. Solarwinds??solarwinds??This is a very mesmerizing particle effects saver. SpirographX??spirographx??Spirograph-like screensaver. Sundancer2??sundancer2??Rotating stack of quads. EOF %clean rm -rf %buildroot %files %defattr(-, root, root) %doc ChangeLog COPYING INSTALL README README.xscreensaver %doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.1-0.8.1.p.diff %{_bindir}/* %{_mandir}/*/* %files xscreensaver %defattr(-, root, root) %{xssconfigdir}/*.xml %dir %{xssbindir} %{xssbindir}/* %if %gss %files gnome-screensaver %defattr(-, root, root) %dir %{gssconfigdir} %{gssconfigdir}/*.desktop %dir %{gssbindir} %{gssbindir}/* %endif %files kde %defattr(-, root, root) %dir %{kdessconfigdir} %{kdessconfigdir}/*.desktop %changelog * Fri May 26 2006 Nils Philippsen 0.8.1.p-0.6 - symlink hacks to /usr/libexec/xscreensaver - own directories not included in filesystem * Wed May 24 2006 Nils Philippsen 0.8.1.p-0.5 - include %%{patchext} in version - fix excessively long line in %%description - make -kde require -xscreensaver - fix "Actions", add "X-KDE-Category" and "X-KDE-Type" to KDE desktop files * Tue May 23 2006 Nils Philippsen 0.8.1.p-0.4 - remove executable bit from doc files, change README.fedora accordingly - use %%buildroot consistently - don't ship rss-glx_install.pl - make %%description more understandable (Jason Tibbitts) * Mon May 22 2006 Nils Philippsen 0.8.1.p-0.3 - include README.fedora, rss-glx-rm-matrixview.sh, rss-glx-0.8.1-0.8.1.p.diff to be able to generate patched from upstream tarball - versionize %%changelog - don't obsolete rss_glx - don't distribute zero-length AUTHORS and NEWS files * Mon Apr 03 2006 Nils Philippsen 0.8.1.p-0.2 - add libXt-devel to modular X build requirements (#90133) * Tue Mar 28 2006 Nils Philippsen - use freealut when needed * Fri Mar 10 2006 Nils Philippsen - add build requirements for non-modular X, default determined by Fedora version - patch tarball to remove matrixview - don't build gnome-screensaver subpackage before FC5 * Thu Mar 09 2006 Nils Philippsen 0.8.1 - version 0.8.1 - include gnome-screensaver support - new build requirements for FC5 * Wed Jul 07 2004 Nils Philippsen - rebuild for FC2 * Wed Sep 10 2003 Nils Philippsen - version 0.7.6 - manage new matrixview and spirographx hacks in XScreensaver.ad * Fri Jul 04 2003 Nils Philippsen - version 0.7.4 - fix temp file issue in scripts - buildrequire OpenAL-devel - move stuff out of /usr/X11R6 - patch inline asm to work with new gcc versions - remove hacks from XScreensaver.ad in %%preun Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rss-glx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 May 2006 10:52:19 -0000 1.1 +++ .cvsignore 29 May 2006 10:53:54 -0000 1.2 @@ -0,0 +1 @@ +rss-glx_0.8.1.p.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rss-glx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 May 2006 10:52:19 -0000 1.1 +++ sources 29 May 2006 10:53:54 -0000 1.2 @@ -0,0 +1 @@ +17870ad88d3a61ace94c04cb7677ddbf rss-glx_0.8.1.p.tar.bz2 From fedora-extras-commits at redhat.com Mon May 29 10:57:14 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:57:14 -0700 Subject: owners owners.list,1.1071,1.1072 Message-ID: <200605291057.k4TAvGNV004541@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4524 Modified Files: owners.list Log Message: Add rss-glx Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1071 retrieving revision 1.1072 diff -u -r1.1071 -r1.1072 --- owners.list 29 May 2006 08:21:44 -0000 1.1071 +++ owners.list 29 May 2006 10:57:13 -0000 1.1072 @@ -1474,6 +1474,7 @@ Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|lists at forevermore.net|extras-qa at fedoraproject.org| +Fedora Extras|rss-glx|Really Slick Screensavers|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 29 11:02:52 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Mon, 29 May 2006 04:02:52 -0700 Subject: fedora-security/audit fc4,1.268,1.269 fc5,1.181,1.182 Message-ID: <200605291102.k4TB2qGu006996@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6857/audit Modified Files: fc4 fc5 Log Message: It is CVE-2004-2660 and not CVE-2006-2660 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- fc4 28 May 2006 12:45:01 -0000 1.268 +++ fc4 29 May 2006 11:02:47 -0000 1.269 @@ -4,7 +4,6 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] -CVE-2006-2660 ** kernel, fixed 2.6.10 CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 @@ -921,6 +920,7 @@ CVE-2005-0004 version (mysql, fixed 4.1.10) CVE-2005-0003 version (kernel, fixed 2.6.10) CVE-2005-0001 version (kernel, fixed 2.6.10) +CVE-2004-2660 version (kernel, fixed 2.6.10) CVE-2004-2657 ignore (firefox) windows only CVE-2004-2655 version (xscreensaver) CVE-2004-2654 version (squid, fixed 2.6STABLE6) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- fc5 28 May 2006 12:45:01 -0000 1.181 +++ fc5 29 May 2006 11:02:47 -0000 1.182 @@ -4,7 +4,6 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] -CVE-2006-2660 ** kernel, fixed 2.6.10 CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 @@ -918,6 +917,7 @@ CVE-2005-0004 version (mysql, fixed 4.1.10) CVE-2005-0003 version (kernel, fixed 2.6.10) CVE-2005-0001 version (kernel, fixed 2.6.10) +CVE-2004-2660 version (kernel, fixed 2.6.10) CVE-2004-2657 ignore (firefox) windows only CVE-2004-2655 version (xscreensaver) CVE-2004-2654 version (squid, fixed 2.6STABLE6) From fedora-extras-commits at redhat.com Mon May 29 13:12:02 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 29 May 2006 06:12:02 -0700 Subject: rpms/perl-Crypt-DSA/devel perl-Crypt-DSA.spec,1.2,1.3 Message-ID: <200605291312.k4TDC43E013095@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Crypt-DSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13078 Modified Files: perl-Crypt-DSA.spec Log Message: Add missing buildreq: which Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Crypt-DSA.spec 9 May 2006 09:29:15 -0000 1.2 +++ perl-Crypt-DSA.spec 29 May 2006 13:12:02 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA Version: 0.14 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-DSA/ @@ -12,6 +12,7 @@ BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Convert::PEM) >= 0.07 BuildRequires: perl(Data::Buffer) >= 0.01 +BuildRequires: which %description Crypt::DSA is an implementation of the DSA (Digital Signature Algorithm) @@ -51,6 +52,9 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Mon May 29 2006 Paul Howarth 0.14-2 +- Add missing buildreq: which + * Tue May 9 2006 Paul Howarth 0.14-1 - Update to 0.14 From fedora-extras-commits at redhat.com Mon May 29 13:22:20 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 06:22:20 -0700 Subject: rpms/rss-glx/devel rss-glx.spec,1.1,1.2 Message-ID: <200605291322.k4TDMMS7013207@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13190 Modified Files: rss-glx.spec Log Message: bump release Index: rss-glx.spec =================================================================== RCS file: /cvs/extras/rpms/rss-glx/devel/rss-glx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rss-glx.spec 29 May 2006 10:53:54 -0000 1.1 +++ rss-glx.spec 29 May 2006 13:22:20 -0000 1.2 @@ -23,7 +23,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.8.1%{patchext} -Release: 0.6%{?dist} +Release: 1%{?dist} License: GPL Group: Amusements/Graphics URL: http://rss-glx.sourceforge.net/ @@ -228,6 +228,9 @@ %{kdessconfigdir}/*.desktop %changelog +* Mon May 29 2006 Nils Philippsen 0.8.1.p-1 +- bump release + * Fri May 26 2006 Nils Philippsen 0.8.1.p-0.6 - symlink hacks to /usr/libexec/xscreensaver - own directories not included in filesystem From fedora-extras-commits at redhat.com Mon May 29 14:02:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 07:02:42 -0700 Subject: rpms/asymptote/devel asymptote.spec,1.2,1.3 Message-ID: <200605291403.k4TE3EHP015681@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15661 Modified Files: asymptote.spec Log Message: Requires /usr/bin/texi2dvi instead of texinfo Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- asymptote.spec 27 May 2006 13:53:33 -0000 1.2 +++ asymptote.spec 29 May 2006 14:02:41 -0000 1.3 @@ -5,7 +5,7 @@ Name: asymptote Version: 1.06 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Descriptive vector graphics language Group: Applications/Publishing @@ -23,7 +23,8 @@ BuildRequires: gsl-devel BuildRequires: tetex-latex BuildRequires: ghostscript -BuildRequires: texinfo +# Fedora Core 6: the texinfo package produces two RPMS: texinfo and texinfo-tex. +BuildRequires: /usr/bin/texi2dvi Requires: tetex-latex Requires: tkinter @@ -135,6 +136,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 1.06-5 +- Fedora Core 6: the texinfo package has been splitted (texinfo + texinfo-tex). + * Sat May 27 2006 Jose Pedro Oliveira - 1.06-4 - Group: Development/Tools -> Applications/Publishing (#193154). From fedora-extras-commits at redhat.com Mon May 29 14:14:26 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 29 May 2006 07:14:26 -0700 Subject: rpms/liferea/FC-5 liferea-1.0.14-doc.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 liferea.spec, 1.39, 1.40 sources, 1.28, 1.29 Message-ID: <200605291414.k4TEESc9015851@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15827 Modified Files: .cvsignore liferea.spec sources Added Files: liferea-1.0.14-doc.patch Log Message: * Mon May 29 2006 Brian Pepple - 1.0.14-2 - Add patch to fix doc build. - Drop NEWS, since it doesn't contain any useful info. - Update to 1.0.14. liferea-1.0.14-doc.patch: --- NEW FILE liferea-1.0.14-doc.patch --- diff -ur liferea-1.0.14/configure liferea-1.0.14.NEW/configure --- liferea-1.0.14/configure 2006-05-28 21:04:10.000000000 -0400 +++ liferea-1.0.14.NEW/configure 2006-05-29 10:00:08.000000000 -0400 @@ -25798,7 +25798,7 @@ -ac_config_files="$ac_config_files Makefile src/Makefile src/mozilla/Makefile src/gtkhtml2/Makefile src/net/Makefile src/liferea doc/html/Makefile pixmaps/Makefile opml/Makefile po/Makefile.in liferea.spec liferea-SuSE.spec" +ac_config_files="$ac_config_files Makefile src/Makefile src/mozilla/Makefile src/gtkhtml2/Makefile src/net/Makefile src/liferea doc/Makefile doc/html/Makefile pixmaps/Makefile opml/Makefile po/Makefile.in liferea.spec liferea-SuSE.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -26450,6 +26450,7 @@ "src/gtkhtml2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gtkhtml2/Makefile" ;; "src/net/Makefile") CONFIG_FILES="$CONFIG_FILES src/net/Makefile" ;; "src/liferea") CONFIG_FILES="$CONFIG_FILES src/liferea" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;; "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;; "opml/Makefile") CONFIG_FILES="$CONFIG_FILES opml/Makefile" ;; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 13:08:59 -0000 1.27 +++ .cvsignore 29 May 2006 14:14:25 -0000 1.28 @@ -1 +1 @@ -liferea-1.0.11.tar.gz +liferea-1.0.14.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- liferea.spec 4 May 2006 13:08:59 -0000 1.39 +++ liferea.spec 29 May 2006 14:14:25 -0000 1.40 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.11 +Version: 1.0.14 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -9,6 +9,7 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-doc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -38,6 +39,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .doc %build @@ -92,11 +94,12 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc COPYING AUTHORS NEWS README ChangeLog +%doc COPYING AUTHORS README ChangeLog %{_mandir}/man1/%{name}.1.gz %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_bindir}/%{name}-bin +%{_bindir}/%{name}-add-feed %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -105,6 +108,11 @@ %changelog +* Mon May 29 2006 Brian Pepple - 1.0.14-2 +- Add patch to fix doc build. +- Drop NEWS, since it doesn't contain any useful info. +- Update to 1.0.14. + * Thu May 4 2006 Brian Pepple - 1.0.11-2 - Update to 1.0.11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 4 May 2006 13:08:59 -0000 1.28 +++ sources 29 May 2006 14:14:25 -0000 1.29 @@ -1 +1 @@ -6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz +066497fcfaa60472d4f6bea6ef85f132 liferea-1.0.14.tar.gz From fedora-extras-commits at redhat.com Mon May 29 14:18:05 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 29 May 2006 07:18:05 -0700 Subject: rpms/liferea/devel liferea-1.0.14-doc.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 liferea.spec, 1.39, 1.40 sources, 1.28, 1.29 Message-ID: <200605291418.k4TEI76B015975@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15950 Modified Files: .cvsignore liferea.spec sources Added Files: liferea-1.0.14-doc.patch Log Message: * Mon May 29 2006 Brian Pepple - 1.0.14-3 - Update to 1.0.14. - Add patch to fix doc build. - Drop NEWS, since it doesn't contain any useful info. liferea-1.0.14-doc.patch: --- NEW FILE liferea-1.0.14-doc.patch --- diff -ur liferea-1.0.14/configure liferea-1.0.14.NEW/configure --- liferea-1.0.14/configure 2006-05-28 21:04:10.000000000 -0400 +++ liferea-1.0.14.NEW/configure 2006-05-29 10:00:08.000000000 -0400 @@ -25798,7 +25798,7 @@ -ac_config_files="$ac_config_files Makefile src/Makefile src/mozilla/Makefile src/gtkhtml2/Makefile src/net/Makefile src/liferea doc/html/Makefile pixmaps/Makefile opml/Makefile po/Makefile.in liferea.spec liferea-SuSE.spec" +ac_config_files="$ac_config_files Makefile src/Makefile src/mozilla/Makefile src/gtkhtml2/Makefile src/net/Makefile src/liferea doc/Makefile doc/html/Makefile pixmaps/Makefile opml/Makefile po/Makefile.in liferea.spec liferea-SuSE.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -26450,6 +26450,7 @@ "src/gtkhtml2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gtkhtml2/Makefile" ;; "src/net/Makefile") CONFIG_FILES="$CONFIG_FILES src/net/Makefile" ;; "src/liferea") CONFIG_FILES="$CONFIG_FILES src/liferea" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;; "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;; "opml/Makefile") CONFIG_FILES="$CONFIG_FILES opml/Makefile" ;; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 13:03:47 -0000 1.27 +++ .cvsignore 29 May 2006 14:18:05 -0000 1.28 @@ -1 +1 @@ -liferea-1.0.11.tar.gz +liferea-1.0.14.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- liferea.spec 4 May 2006 13:03:47 -0000 1.39 +++ liferea.spec 29 May 2006 14:18:05 -0000 1.40 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.11 +Version: 1.0.14 Release: 3%{?dist} Summary: An RSS/RDF feed reader @@ -9,6 +9,7 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-doc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -38,6 +39,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .doc %build @@ -92,11 +94,12 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc COPYING AUTHORS NEWS README ChangeLog +%doc COPYING AUTHORS README ChangeLog %{_mandir}/man1/%{name}.1.gz %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_bindir}/%{name}-bin +%{_bindir}/%{name}-add-feed %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -105,6 +108,11 @@ %changelog +* Mon May 29 2006 Brian Pepple - 1.0.14-3 +- Update to 1.0.14. +- Add patch to fix doc build. +- Drop NEWS, since it doesn't contain any useful info. + * Wed May 3 2006 Brian Pepple - 1.0.11-3 - Update to 1.0.11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 4 May 2006 13:03:47 -0000 1.28 +++ sources 29 May 2006 14:18:05 -0000 1.29 @@ -1 +1 @@ -6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz +066497fcfaa60472d4f6bea6ef85f132 liferea-1.0.14.tar.gz From fedora-extras-commits at redhat.com Mon May 29 16:00:04 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 29 May 2006 09:00:04 -0700 Subject: rpms/azureus/FC-5 .cvsignore, 1.5, 1.6 azureus-MessageSlideShell-swt-3.1.patch, 1.1, 1.2 azureus-nativetabs.patch, 1.1, 1.2 azureus-no-install-remove-plugins.patch, 1.2, 1.3 azureus-no-update-manager-CoreUpdateChecker.patch, 1.2, 1.3 azureus-no-update-manager-SWTUpdateChecker.patch, 1.1, 1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.2, 1.3 azureus-no-updates-PluginInterfaceImpl.patch, 1.2, 1.3 azureus-themed.patch, 1.3, 1.4 sources, 1.5, 1.6 azureus-ChangeLog.txt, 1.1, NONE Message-ID: <200605291600.k4TG07i5018642@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568 Modified Files: .cvsignore azureus-MessageSlideShell-swt-3.1.patch azureus-nativetabs.patch azureus-no-install-remove-plugins.patch azureus-no-update-manager-CoreUpdateChecker.patch azureus-no-update-manager-SWTUpdateChecker.patch azureus-no-update-manager-UpdateMonitor.patch azureus-no-updates-PluginInterfaceImpl.patch azureus-themed.patch sources Removed Files: azureus-ChangeLog.txt Log Message: Update sources. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Apr 2006 22:08:05 -0000 1.5 +++ .cvsignore 29 May 2006 16:00:04 -0000 1.6 @@ -1,3 +1,3 @@ -azureus2-cvs-20060325.tar.gz -azplugins_1.8.8.jar +azureus2-cvs-20060529.tar.bz2 bdcc_2.2.2.zip +azplugins_1.8.8.jar azureus-MessageSlideShell-swt-3.1.patch: Index: azureus-MessageSlideShell-swt-3.1.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-MessageSlideShell-swt-3.1.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-MessageSlideShell-swt-3.1.patch 1 Apr 2006 22:08:05 -0000 1.1 +++ azureus-MessageSlideShell-swt-3.1.patch 29 May 2006 16:00:04 -0000 1.2 @@ -1,9 +1,9 @@ ---- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~ 2006-03-20 23:10:27.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-03-25 17:30:47.000000000 -0800 +--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.orig 2006-05-26 09:16:25.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-05-26 09:28:39.000000000 -0700 @@ -269,13 +269,7 @@ - // Create shell & widgets - shell = new Shell(display, SWT.ON_TOP); + int style = SWT.ON_TOP; + shell = new Shell(display, style); - if (USE_SWT32_BG_SET) { - try { - shell.setBackgroundMode(SWT.INHERIT_DEFAULT); @@ -15,7 +15,7 @@ Utils.setShellIcon(shell); shell.setText(popupParams.title); -@@ -507,13 +501,6 @@ +@@ -515,13 +509,6 @@ gc.dispose(); boolean bAlternateDrawing = true; azureus-nativetabs.patch: Index: azureus-nativetabs.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-nativetabs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-nativetabs.patch 24 Apr 2006 20:25:10 -0000 1.1 +++ azureus-nativetabs.patch 29 May 2006 16:00:04 -0000 1.2 @@ -1,28 +1,17 @@ ---- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-04-17 16:00:58.000000000 +0200 -+++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-04-17 16:01:21.000000000 +0200 -@@ -78,8 +78,8 @@ - cLook.setLayout(layout); +--- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-02-15 05:36:31.000000000 -0800 ++++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-05-26 09:55:19.000000000 -0700 +@@ -79,7 +79,7 @@ BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab", -- true, MSG_PREFIX + "useCustomTabs"); + true, MSG_PREFIX + "useCustomTabs"); - Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true, -+ false, MSG_PREFIX + "useCustomTabs"); + Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false, MSG_PREFIX + "useFancyTabs").getControl(); Control[] controls = { cFancyTab }; ---- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig 2006-04-17 17:25:18.000000000 +0200 -+++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-04-17 17:26:19.000000000 +0200 -@@ -154,7 +154,7 @@ - - def.put("User Mode", new Long(0)); - -- def.put("useCustomTab",TRUE); -+ def.put("useCustomTab",FALSE); - def.put("GUI Refresh",new Long(1000)); - def.put("Graphics Update",new Long(4)); - def.put("ReOrder Delay",new Long(0)); -@@ -167,7 +167,7 @@ +--- org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.~1.196.~ 2006-05-26 09:16:13.000000000 -0700 ++++ org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-05-26 09:56:44.000000000 -0700 +@@ -174,7 +174,7 @@ def.put("Use default data dir", FALSE); def.put("Default save path", "" ); azureus-no-install-remove-plugins.patch: Index: azureus-no-install-remove-plugins.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-install-remove-plugins.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-install-remove-plugins.patch 1 Apr 2006 22:08:05 -0000 1.2 +++ azureus-no-install-remove-plugins.patch 29 May 2006 16:00:04 -0000 1.3 @@ -1,5 +1,5 @@ ---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-03-28 04:35:35.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-03-28 04:41:30.000000000 -0800 +--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-05-26 09:20:06.000000000 -0700 @@ -347,26 +347,6 @@ menu_plugin_logViews.setMenu(pluginLogsMenu); menu_plugin_logViews.setData("EOL", "1"); @@ -38,7 +38,7 @@ - help_checkupdate.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - mainWindow.getShell().setFocus(); -- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true); +- UpdateMonitor.getSingleton( mainWindow.getAzureusCore(), mainWindow).performCheck(true); - } - }); - } azureus-no-update-manager-CoreUpdateChecker.patch: Index: azureus-no-update-manager-CoreUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-CoreUpdateChecker.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-update-manager-CoreUpdateChecker.patch 1 Apr 2006 22:08:05 -0000 1.2 +++ azureus-no-update-manager-CoreUpdateChecker.patch 29 May 2006 16:00:04 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-03-25 14:18:45.000000000 -0800 -+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-03-25 17:19:32.000000000 -0800 -@@ -122,8 +122,6 @@ +--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-05-14 08:10:03.000000000 -0700 ++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-05-26 09:23:28.000000000 -0700 +@@ -123,8 +123,6 @@ props.setProperty( "plugin.version", plugin_interface.getAzureusVersion()); rdf = plugin_interface.getUtilities().getResourceDownloaderFactory(); @@ -9,7 +9,7 @@ } public String -@@ -142,155 +140,9 @@ +@@ -143,156 +141,9 @@ checkForUpdate( final UpdateChecker checker ) { @@ -101,19 +101,6 @@ - - top_downloader.getSize(); - -- top_downloader.addListener( -- new ResourceDownloaderAdapter() -- { -- public boolean -- completed( -- final ResourceDownloader downloader, -- InputStream data ) -- { -- installUpdate( checker, downloader, f_latest_version, data ); -- -- return( true ); -- } -- }); - - byte[] info_b = (byte[])decoded.get( "info" ); - @@ -141,13 +128,27 @@ - desc = new String[]{"Core Azureus Version", info }; - } - -- checker.addUpdate( +- final Update update = +- checker.addUpdate( - "Core Azureus Version", - desc, - latest_version, - top_downloader, - Update.RESTART_REQUIRED_YES ); - +- top_downloader.addListener( +- new ResourceDownloaderAdapter() +- { +- public boolean +- completed( +- final ResourceDownloader downloader, +- InputStream data ) +- { +- installUpdate( checker, update, downloader, f_latest_version, data ); +- +- return( true ); +- } +- }); - }catch( Throwable e ){ - - log.log( e ); azureus-no-update-manager-SWTUpdateChecker.patch: Index: azureus-no-update-manager-SWTUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-SWTUpdateChecker.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-SWTUpdateChecker.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-SWTUpdateChecker.patch 29 May 2006 16:00:04 -0000 1.2 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-02-09 23:23:47.000000000 -0500 -+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-02-09 23:25:02.000000000 -0500 -@@ -57,77 +57,14 @@ +--- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-05-26 09:25:21.000000000 -0700 +@@ -57,77 +57,13 @@ public static void initialize() { @@ -37,14 +37,6 @@ - downloaders.toArray(new ResourceDownloader[downloaders.size()]); - - swtDownloader = factory.getRandomDownloader(resourceDownloaders); -- -- swtDownloader.addListener(new ResourceDownloaderAdapter() { -- -- public boolean completed(ResourceDownloader downloader, InputStream data) { -- //On completion, process the InputStream to store temp files -- return processData(checker,data); -- } -- }); - - // get the size so its cached up - @@ -56,13 +48,21 @@ - Debug.printStackTrace( e ); - } - -- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(), -- new String[] {"SWT is the graphical library used by Azureus"}, -- "" + versionGetter.getLatestVersion(), -- swtDownloader, -- Update.RESTART_REQUIRED_YES +- final Update update = +- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(), +- new String[] {"SWT is the graphical library used by Azureus"}, +- "" + versionGetter.getLatestVersion(), +- swtDownloader, +- Update.RESTART_REQUIRED_YES - ); - +- swtDownloader.addListener(new ResourceDownloaderAdapter() { +- +- public boolean completed(ResourceDownloader downloader, InputStream data) { +- //On completion, process the InputStream to store temp files +- return processData(checker,update,downloader,data); +- } +- }); - } - }catch( Throwable e ){ - Logger.log(new LogAlert(LogAlert.UNREPEATABLE, @@ -71,7 +71,7 @@ - checker.failed(); - - }finally{ - +- checker.completed(); - } - azureus-no-update-manager-UpdateMonitor.patch: Index: azureus-no-update-manager-UpdateMonitor.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-UpdateMonitor.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-update-manager-UpdateMonitor.patch 1 Apr 2006 22:08:05 -0000 1.2 +++ azureus-no-update-manager-UpdateMonitor.patch 29 May 2006 16:00:04 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-03-28 04:35:36.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-03-28 04:44:37.000000000 -0800 -@@ -88,149 +88,19 @@ +--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-05-26 09:27:25.000000000 -0700 +@@ -90,206 +90,19 @@ { azureus_core = _azureus_core; @@ -17,6 +17,63 @@ - } - }); - +- um.addVerificationListener( +- new UpdateManagerVerificationListener() +- { +- public boolean +- acceptUnVerifiedUpdate( +- final Update update ) +- { +- final boolean accept[] = {false}; +- +- Utils.execSWTThread( +- new Runnable() +- { +- public void +- run() +- { +- accept[0] = MessageBoxWindow.open( +- "UpdateMonitor.messagebox.accept.unverified", +- SWT.YES | SWT.NO, +- SWT.NULL, +- false, +- _main_window.getDisplay(), +- MessageBoxWindow.ICON_WARNING, +- MessageText.getString( "UpdateMonitor.messagebox.accept.unverified.title" ), +- MessageText.getString( +- "UpdateMonitor.messagebox.accept.unverified.text", +- new String[]{ update.getName()})) == SWT.YES; +- +- } +- }, +- false ); +- +- return( accept[0] ); +- } +- +- public void +- verificationFailed( +- final Update update, +- final Throwable cause ) +- { +- final String cause_str = Debug.getNestedExceptionMessage( cause ); +- +- Utils.execSWTThread( +- new Runnable() +- { +- public void +- run() +- { +- Utils.openMessageBox( +- _main_window.getShell(), +- SWT.OK, +- "UpdateMonitor.messagebox.verification.failed", +- new String[]{ update.getName(), cause_str }); +- } +- }); +- } +- }); +- - SimpleTimer.addPeriodicEvent( - AUTO_UPDATE_CHECK_PERIOD, - new TimerEventPerformer() @@ -81,12 +138,11 @@ - if ( start_of_day ){ - MainWindow.getWindow().setStatusText(""); - } -- + - CoreUpdateChecker.doUsageStats(); - } - }); - } -+ } public void azureus-no-updates-PluginInterfaceImpl.patch: Index: azureus-no-updates-PluginInterfaceImpl.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-updates-PluginInterfaceImpl.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-updates-PluginInterfaceImpl.patch 14 Feb 2006 04:46:19 -0000 1.2 +++ azureus-no-updates-PluginInterfaceImpl.patch 29 May 2006 16:00:04 -0000 1.3 @@ -1,14 +1,14 @@ ---- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-02-09 23:03:10.000000000 -0500 -+++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-02-09 23:03:41.000000000 -0500 -@@ -47,7 +47,6 @@ +--- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-05-02 02:33:14.000000000 -0700 ++++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-05-12 09:58:07.000000000 -0700 +@@ -48,7 +48,6 @@ import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository; import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl; import org.gudy.azureus2.pluginsimpl.local.utils.*; -import org.gudy.azureus2.pluginsimpl.local.update.*; + import org.gudy.azureus2.plugins.ipc.IPCInterface; import org.gudy.azureus2.plugins.ipfilter.IPFilter; import org.gudy.azureus2.plugins.tracker.Tracker; - import org.gudy.azureus2.plugins.ui.config.Parameter; -@@ -409,7 +408,7 @@ +@@ -412,7 +411,7 @@ public UpdateManager getUpdateManager() { azureus-themed.patch: Index: azureus-themed.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-themed.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- azureus-themed.patch 24 Apr 2006 20:25:10 -0000 1.3 +++ azureus-themed.patch 29 May 2006 16:00:04 -0000 1.4 @@ -1,15 +1,15 @@ ---- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-22 17:48:33.000000000 +0200 -+++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java 2006-04-22 17:50:33.000000000 +0200 +--- org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-24 06:11:48.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-05-12 09:54:14.000000000 -0700 @@ -32,6 +32,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; + import java.lang.reflect.Method; import java.util.*; - /** -@@ -59,6 +61,25 @@ +@@ -61,6 +63,25 @@ loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash"); } @@ -35,7 +35,7 @@ public static void loadImages(Display display) { loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32"); loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64"); -@@ -103,20 +124,44 @@ +@@ -105,20 +126,44 @@ //ToolBar Icons loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open"); @@ -89,10 +89,10 @@ + loadImage(display, + getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), + "cb_publish"); + loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/sendto.png", "cb_send"); //Status icons - loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok"); -@@ -157,6 +202,16 @@ +@@ -167,6 +212,16 @@ Image im = getImage(name,false); if(null == im) { InputStream is = loader.getResourceAsStream(res); @@ -109,10 +109,10 @@ if(null != is) { try { if(alpha == 255) { -@@ -453,4 +508,4 @@ +@@ -483,4 +538,4 @@ return key; } -} -\ Kein Zeilenumbruch am Dateiende. +\ No newline at end of file +} Index: sources =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Apr 2006 22:08:05 -0000 1.5 +++ sources 29 May 2006 16:00:04 -0000 1.6 @@ -1,3 +1,3 @@ -a1827e2041841940c4ca16fdf240afac azureus2-cvs-20060325.tar.gz -28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar +086cf7f988efd91064b6da5ab78469a8 azureus2-cvs-20060529.tar.bz2 0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip +28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar --- azureus-ChangeLog.txt DELETED --- From fedora-extras-commits at redhat.com Mon May 29 16:00:47 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 29 May 2006 09:00:47 -0700 Subject: rpms/azureus/FC-5 azureus.spec,1.24,1.25 Message-ID: <200605291600.k4TG0nE8018667@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648 Modified Files: azureus.spec Log Message: Update sources. Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- azureus.spec 24 Apr 2006 20:25:10 -0000 1.24 +++ azureus.spec 29 May 2006 16:00:46 -0000 1.25 @@ -1,6 +1,6 @@ Name: azureus Version: 2.4.0.3 -Release: 0.20060328cvs_5%{?dist} +Release: 0.20060529cvs_1%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -9,16 +9,15 @@ # A cvs snapshot with the build and bouncycastle directories # removed. -Source0: azureus2-cvs-20060325.tar.gz +Source0: azureus2-cvs-20060529.tar.bz2 Source1: azureus.script Source2: Azureus.desktop Source3: azureus.applications Source4: azureus-License.txt -Source5: azureus-ChangeLog.txt -Source6: azplugins_1.8.8.jar -Source7: bdcc_2.2.2.zip +Source5: azplugins_1.8.8.jar +Source6: bdcc_2.2.2.zip Patch0: azureus-remove-win32-osx-platforms.patch Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch @@ -47,6 +46,8 @@ Patch24: azureus-MessageSlideShell-swt-3.1.patch Patch25: azureus-no-update-manager-MainStatusBar.patch Patch26: azureus-nativetabs.patch +#Patch27: azureus-debug3.patch +#Patch28: azureus-debug4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,7 +78,7 @@ %patch4 -p0 %patch5 -p0 %patch6 -p0 -%patch7 -p1 +%patch7 -p0 %patch8 -p0 %patch9 -p0 %patch10 -p0 @@ -96,9 +97,10 @@ %patch23 -p0 %patch24 -p0 %patch25 -p0 -%patch26 -p1 +%patch26 -p0 +#%patch27 -p0 +#%patch28 -p0 cp %{SOURCE4} License.txt -cp %{SOURCE5} ChangeLog.txt %build mkdir -p build/libs @@ -114,14 +116,14 @@ mkdir -p plugins/azplugins cd plugins/azplugins -unzip -q %{SOURCE6} +unzip -q %{SOURCE5} rm -f *.jar `find ./ -name \*class` find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.1.1`:../..:. find ./ -name \*java | xargs rm jar cvf azplugins_1.8.8.jar . cd ../.. -unzip -q %{SOURCE7} +unzip -q %{SOURCE6} cd plugins/bdcc unzip *.jar rm -f *.jar `find ./ -name \*class` @@ -206,6 +208,14 @@ %{_libdir}/gcj/* %changelog +* Wed May 29 2006 Anthony Green - 2.4.0.3-0.20060529cvs_1 +- Updated sources. +- Re-enable close button on tabs in nativetabs patch. +- Use proper ChangeLog.txt file. + +* Wed May 03 2006 Anthony Green - 2.4.0.3-0.20060503cvs_1 +- Updated sources. + * Mon Apr 24 2006 Anthony Green - 2.4.0.3-0.20060328cvs_5 - Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and an updated azureus-themed.patch to work around GCC PR 27271. From fedora-extras-commits at redhat.com Mon May 29 16:02:46 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 29 May 2006 09:02:46 -0700 Subject: rpms/azureus/devel .cvsignore, 1.5, 1.6 azureus-MessageSlideShell-swt-3.1.patch, 1.1, 1.2 azureus-nativetabs.patch, 1.1, 1.2 azureus-no-install-remove-plugins.patch, 1.2, 1.3 azureus-no-update-manager-CoreUpdateChecker.patch, 1.2, 1.3 azureus-no-update-manager-SWTUpdateChecker.patch, 1.1, 1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.2, 1.3 azureus-no-updates-PluginInterfaceImpl.patch, 1.2, 1.3 azureus-themed.patch, 1.3, 1.4 azureus.script, 1.7, 1.8 azureus.spec, 1.20, 1.21 sources, 1.5, 1.6 azureus-ChangeLog.txt, 1.1, NONE Message-ID: <200605291603.k4TG3J0I021090@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008 Modified Files: .cvsignore azureus-MessageSlideShell-swt-3.1.patch azureus-nativetabs.patch azureus-no-install-remove-plugins.patch azureus-no-update-manager-CoreUpdateChecker.patch azureus-no-update-manager-SWTUpdateChecker.patch azureus-no-update-manager-UpdateMonitor.patch azureus-no-updates-PluginInterfaceImpl.patch azureus-themed.patch azureus.script azureus.spec sources Removed Files: azureus-ChangeLog.txt Log Message: Update sources. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 May 2006 14:35:02 -0000 1.5 +++ .cvsignore 29 May 2006 16:02:45 -0000 1.6 @@ -1,3 +1,3 @@ -azureus2-cvs-20060325.tar.gz -azplugins_1.8.8.jar +azureus2-cvs-20060529.tar.bz2 bdcc_2.2.2.zip +azplugins_1.8.8.jar azureus-MessageSlideShell-swt-3.1.patch: Index: azureus-MessageSlideShell-swt-3.1.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-MessageSlideShell-swt-3.1.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-MessageSlideShell-swt-3.1.patch 12 May 2006 14:35:02 -0000 1.1 +++ azureus-MessageSlideShell-swt-3.1.patch 29 May 2006 16:02:45 -0000 1.2 @@ -1,9 +1,9 @@ ---- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~ 2006-03-20 23:10:27.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-03-25 17:30:47.000000000 -0800 +--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.orig 2006-05-26 09:16:25.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-05-26 09:28:39.000000000 -0700 @@ -269,13 +269,7 @@ - // Create shell & widgets - shell = new Shell(display, SWT.ON_TOP); + int style = SWT.ON_TOP; + shell = new Shell(display, style); - if (USE_SWT32_BG_SET) { - try { - shell.setBackgroundMode(SWT.INHERIT_DEFAULT); @@ -15,7 +15,7 @@ Utils.setShellIcon(shell); shell.setText(popupParams.title); -@@ -507,13 +501,6 @@ +@@ -515,13 +509,6 @@ gc.dispose(); boolean bAlternateDrawing = true; azureus-nativetabs.patch: Index: azureus-nativetabs.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-nativetabs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-nativetabs.patch 12 May 2006 14:35:02 -0000 1.1 +++ azureus-nativetabs.patch 29 May 2006 16:02:45 -0000 1.2 @@ -1,28 +1,17 @@ ---- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-04-17 16:00:58.000000000 +0200 -+++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-04-17 16:01:21.000000000 +0200 -@@ -78,8 +78,8 @@ - cLook.setLayout(layout); +--- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-02-15 05:36:31.000000000 -0800 ++++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-05-26 09:55:19.000000000 -0700 +@@ -79,7 +79,7 @@ BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab", -- true, MSG_PREFIX + "useCustomTabs"); + true, MSG_PREFIX + "useCustomTabs"); - Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true, -+ false, MSG_PREFIX + "useCustomTabs"); + Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false, MSG_PREFIX + "useFancyTabs").getControl(); Control[] controls = { cFancyTab }; ---- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig 2006-04-17 17:25:18.000000000 +0200 -+++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-04-17 17:26:19.000000000 +0200 -@@ -154,7 +154,7 @@ - - def.put("User Mode", new Long(0)); - -- def.put("useCustomTab",TRUE); -+ def.put("useCustomTab",FALSE); - def.put("GUI Refresh",new Long(1000)); - def.put("Graphics Update",new Long(4)); - def.put("ReOrder Delay",new Long(0)); -@@ -167,7 +167,7 @@ +--- org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.~1.196.~ 2006-05-26 09:16:13.000000000 -0700 ++++ org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-05-26 09:56:44.000000000 -0700 +@@ -174,7 +174,7 @@ def.put("Use default data dir", FALSE); def.put("Default save path", "" ); azureus-no-install-remove-plugins.patch: Index: azureus-no-install-remove-plugins.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-install-remove-plugins.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-install-remove-plugins.patch 12 May 2006 14:35:02 -0000 1.2 +++ azureus-no-install-remove-plugins.patch 29 May 2006 16:02:45 -0000 1.3 @@ -1,5 +1,5 @@ ---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-03-28 04:35:35.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-03-28 04:41:30.000000000 -0800 +--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-05-26 09:20:06.000000000 -0700 @@ -347,26 +347,6 @@ menu_plugin_logViews.setMenu(pluginLogsMenu); menu_plugin_logViews.setData("EOL", "1"); @@ -38,7 +38,7 @@ - help_checkupdate.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - mainWindow.getShell().setFocus(); -- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true); +- UpdateMonitor.getSingleton( mainWindow.getAzureusCore(), mainWindow).performCheck(true); - } - }); - } azureus-no-update-manager-CoreUpdateChecker.patch: Index: azureus-no-update-manager-CoreUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-CoreUpdateChecker.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-update-manager-CoreUpdateChecker.patch 12 May 2006 14:35:02 -0000 1.2 +++ azureus-no-update-manager-CoreUpdateChecker.patch 29 May 2006 16:02:45 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-03-25 14:18:45.000000000 -0800 -+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-03-25 17:19:32.000000000 -0800 -@@ -122,8 +122,6 @@ +--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-05-14 08:10:03.000000000 -0700 ++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-05-26 09:23:28.000000000 -0700 +@@ -123,8 +123,6 @@ props.setProperty( "plugin.version", plugin_interface.getAzureusVersion()); rdf = plugin_interface.getUtilities().getResourceDownloaderFactory(); @@ -9,7 +9,7 @@ } public String -@@ -142,155 +140,9 @@ +@@ -143,156 +141,9 @@ checkForUpdate( final UpdateChecker checker ) { @@ -101,19 +101,6 @@ - - top_downloader.getSize(); - -- top_downloader.addListener( -- new ResourceDownloaderAdapter() -- { -- public boolean -- completed( -- final ResourceDownloader downloader, -- InputStream data ) -- { -- installUpdate( checker, downloader, f_latest_version, data ); -- -- return( true ); -- } -- }); - - byte[] info_b = (byte[])decoded.get( "info" ); - @@ -141,13 +128,27 @@ - desc = new String[]{"Core Azureus Version", info }; - } - -- checker.addUpdate( +- final Update update = +- checker.addUpdate( - "Core Azureus Version", - desc, - latest_version, - top_downloader, - Update.RESTART_REQUIRED_YES ); - +- top_downloader.addListener( +- new ResourceDownloaderAdapter() +- { +- public boolean +- completed( +- final ResourceDownloader downloader, +- InputStream data ) +- { +- installUpdate( checker, update, downloader, f_latest_version, data ); +- +- return( true ); +- } +- }); - }catch( Throwable e ){ - - log.log( e ); azureus-no-update-manager-SWTUpdateChecker.patch: Index: azureus-no-update-manager-SWTUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-SWTUpdateChecker.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-SWTUpdateChecker.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-SWTUpdateChecker.patch 29 May 2006 16:02:45 -0000 1.2 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-02-09 23:23:47.000000000 -0500 -+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-02-09 23:25:02.000000000 -0500 -@@ -57,77 +57,14 @@ +--- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-05-26 09:25:21.000000000 -0700 +@@ -57,77 +57,13 @@ public static void initialize() { @@ -37,14 +37,6 @@ - downloaders.toArray(new ResourceDownloader[downloaders.size()]); - - swtDownloader = factory.getRandomDownloader(resourceDownloaders); -- -- swtDownloader.addListener(new ResourceDownloaderAdapter() { -- -- public boolean completed(ResourceDownloader downloader, InputStream data) { -- //On completion, process the InputStream to store temp files -- return processData(checker,data); -- } -- }); - - // get the size so its cached up - @@ -56,13 +48,21 @@ - Debug.printStackTrace( e ); - } - -- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(), -- new String[] {"SWT is the graphical library used by Azureus"}, -- "" + versionGetter.getLatestVersion(), -- swtDownloader, -- Update.RESTART_REQUIRED_YES +- final Update update = +- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(), +- new String[] {"SWT is the graphical library used by Azureus"}, +- "" + versionGetter.getLatestVersion(), +- swtDownloader, +- Update.RESTART_REQUIRED_YES - ); - +- swtDownloader.addListener(new ResourceDownloaderAdapter() { +- +- public boolean completed(ResourceDownloader downloader, InputStream data) { +- //On completion, process the InputStream to store temp files +- return processData(checker,update,downloader,data); +- } +- }); - } - }catch( Throwable e ){ - Logger.log(new LogAlert(LogAlert.UNREPEATABLE, @@ -71,7 +71,7 @@ - checker.failed(); - - }finally{ - +- checker.completed(); - } - azureus-no-update-manager-UpdateMonitor.patch: Index: azureus-no-update-manager-UpdateMonitor.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-UpdateMonitor.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-update-manager-UpdateMonitor.patch 12 May 2006 14:35:02 -0000 1.2 +++ azureus-no-update-manager-UpdateMonitor.patch 29 May 2006 16:02:45 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-03-28 04:35:36.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-03-28 04:44:37.000000000 -0800 -@@ -88,149 +88,19 @@ +--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-05-26 09:27:25.000000000 -0700 +@@ -90,206 +90,19 @@ { azureus_core = _azureus_core; @@ -17,6 +17,63 @@ - } - }); - +- um.addVerificationListener( +- new UpdateManagerVerificationListener() +- { +- public boolean +- acceptUnVerifiedUpdate( +- final Update update ) +- { +- final boolean accept[] = {false}; +- +- Utils.execSWTThread( +- new Runnable() +- { +- public void +- run() +- { +- accept[0] = MessageBoxWindow.open( +- "UpdateMonitor.messagebox.accept.unverified", +- SWT.YES | SWT.NO, +- SWT.NULL, +- false, +- _main_window.getDisplay(), +- MessageBoxWindow.ICON_WARNING, +- MessageText.getString( "UpdateMonitor.messagebox.accept.unverified.title" ), +- MessageText.getString( +- "UpdateMonitor.messagebox.accept.unverified.text", +- new String[]{ update.getName()})) == SWT.YES; +- +- } +- }, +- false ); +- +- return( accept[0] ); +- } +- +- public void +- verificationFailed( +- final Update update, +- final Throwable cause ) +- { +- final String cause_str = Debug.getNestedExceptionMessage( cause ); +- +- Utils.execSWTThread( +- new Runnable() +- { +- public void +- run() +- { +- Utils.openMessageBox( +- _main_window.getShell(), +- SWT.OK, +- "UpdateMonitor.messagebox.verification.failed", +- new String[]{ update.getName(), cause_str }); +- } +- }); +- } +- }); +- - SimpleTimer.addPeriodicEvent( - AUTO_UPDATE_CHECK_PERIOD, - new TimerEventPerformer() @@ -81,12 +138,11 @@ - if ( start_of_day ){ - MainWindow.getWindow().setStatusText(""); - } -- + - CoreUpdateChecker.doUsageStats(); - } - }); - } -+ } public void azureus-no-updates-PluginInterfaceImpl.patch: Index: azureus-no-updates-PluginInterfaceImpl.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-updates-PluginInterfaceImpl.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-updates-PluginInterfaceImpl.patch 14 Feb 2006 04:46:19 -0000 1.2 +++ azureus-no-updates-PluginInterfaceImpl.patch 29 May 2006 16:02:45 -0000 1.3 @@ -1,14 +1,14 @@ ---- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-02-09 23:03:10.000000000 -0500 -+++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-02-09 23:03:41.000000000 -0500 -@@ -47,7 +47,6 @@ +--- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-05-02 02:33:14.000000000 -0700 ++++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-05-12 09:58:07.000000000 -0700 +@@ -48,7 +48,6 @@ import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository; import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl; import org.gudy.azureus2.pluginsimpl.local.utils.*; -import org.gudy.azureus2.pluginsimpl.local.update.*; + import org.gudy.azureus2.plugins.ipc.IPCInterface; import org.gudy.azureus2.plugins.ipfilter.IPFilter; import org.gudy.azureus2.plugins.tracker.Tracker; - import org.gudy.azureus2.plugins.ui.config.Parameter; -@@ -409,7 +408,7 @@ +@@ -412,7 +411,7 @@ public UpdateManager getUpdateManager() { azureus-themed.patch: Index: azureus-themed.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-themed.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- azureus-themed.patch 12 May 2006 14:35:02 -0000 1.3 +++ azureus-themed.patch 29 May 2006 16:02:45 -0000 1.4 @@ -1,15 +1,15 @@ ---- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-22 17:48:33.000000000 +0200 -+++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java 2006-04-22 17:50:33.000000000 +0200 +--- org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-24 06:11:48.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-05-12 09:54:14.000000000 -0700 @@ -32,6 +32,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; + import java.lang.reflect.Method; import java.util.*; - /** -@@ -59,6 +61,25 @@ +@@ -61,6 +63,25 @@ loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash"); } @@ -35,7 +35,7 @@ public static void loadImages(Display display) { loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32"); loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64"); -@@ -103,20 +124,44 @@ +@@ -105,20 +126,44 @@ //ToolBar Icons loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open"); @@ -89,10 +89,10 @@ + loadImage(display, + getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), + "cb_publish"); + loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/sendto.png", "cb_send"); //Status icons - loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok"); -@@ -157,6 +202,16 @@ +@@ -167,6 +212,16 @@ Image im = getImage(name,false); if(null == im) { InputStream is = loader.getResourceAsStream(res); @@ -109,10 +109,10 @@ if(null != is) { try { if(alpha == 255) { -@@ -453,4 +508,4 @@ +@@ -483,4 +538,4 @@ return key; } -} -\ Kein Zeilenumbruch am Dateiende. +\ No newline at end of file +} Index: azureus.script =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- azureus.script 10 Feb 2006 17:00:46 -0000 1.7 +++ azureus.script 29 May 2006 16:02:45 -0000 1.8 @@ -9,10 +9,10 @@ # Reconstruct the plugins dir. rm -rf $APPDIR/plugins mkdir -p $APPDIR/plugins -pushd $APPDIR/plugins +pushd $APPDIR/plugins > /dev/null 2>&1 for pdir in /usr/share/azureus/plugins/*; do ln -s $pdir .; done; -popd +popd > /dev/null 2>&1 -CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@" +LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@" Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- azureus.spec 12 May 2006 14:35:02 -0000 1.20 +++ azureus.spec 29 May 2006 16:02:45 -0000 1.21 @@ -1,6 +1,6 @@ Name: azureus Version: 2.4.0.3 -Release: 0.20060328cvs_5%{?dist} +Release: 0.20060529cvs_1%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -9,16 +9,15 @@ # A cvs snapshot with the build and bouncycastle directories # removed. -Source0: azureus2-cvs-20060325.tar.gz +Source0: azureus2-cvs-20060529.tar.bz2 Source1: azureus.script Source2: Azureus.desktop Source3: azureus.applications Source4: azureus-License.txt -Source5: azureus-ChangeLog.txt -Source6: azplugins_1.8.8.jar -Source7: bdcc_2.2.2.zip +Source5: azplugins_1.8.8.jar +Source6: bdcc_2.2.2.zip Patch0: azureus-remove-win32-osx-platforms.patch Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch @@ -47,6 +46,8 @@ Patch24: azureus-MessageSlideShell-swt-3.1.patch Patch25: azureus-no-update-manager-MainStatusBar.patch Patch26: azureus-nativetabs.patch +#Patch27: azureus-debug3.patch +#Patch28: azureus-debug4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,7 +78,7 @@ %patch4 -p0 %patch5 -p0 %patch6 -p0 -%patch7 -p1 +%patch7 -p0 %patch8 -p0 %patch9 -p0 %patch10 -p0 @@ -96,9 +97,10 @@ %patch23 -p0 %patch24 -p0 %patch25 -p0 -%patch26 -p1 +%patch26 -p0 +#%patch27 -p0 +#%patch28 -p0 cp %{SOURCE4} License.txt -cp %{SOURCE5} ChangeLog.txt %build mkdir -p build/libs @@ -114,14 +116,14 @@ mkdir -p plugins/azplugins cd plugins/azplugins -unzip -q %{SOURCE6} +unzip -q %{SOURCE5} rm -f *.jar `find ./ -name \*class` find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.1.1`:../..:. find ./ -name \*java | xargs rm jar cvf azplugins_1.8.8.jar . cd ../.. -unzip -q %{SOURCE7} +unzip -q %{SOURCE6} cd plugins/bdcc unzip *.jar rm -f *.jar `find ./ -name \*class` @@ -206,6 +208,14 @@ %{_libdir}/gcj/* %changelog +* Wed May 29 2006 Anthony Green - 2.4.0.3-0.20060529cvs_1 +- Updated sources. +- Re-enable close button on tabs in nativetabs patch. +- Use proper ChangeLog.txt file. + +* Wed May 03 2006 Anthony Green - 2.4.0.3-0.20060503cvs_1 +- Updated sources. + * Mon Apr 24 2006 Anthony Green - 2.4.0.3-0.20060328cvs_5 - Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and an updated azureus-themed.patch to work around GCC PR 27271. Index: sources =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 May 2006 14:35:02 -0000 1.5 +++ sources 29 May 2006 16:02:45 -0000 1.6 @@ -1,3 +1,3 @@ -a1827e2041841940c4ca16fdf240afac azureus2-cvs-20060325.tar.gz -28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar +086cf7f988efd91064b6da5ab78469a8 azureus2-cvs-20060529.tar.bz2 0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip +28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar --- azureus-ChangeLog.txt DELETED --- From fedora-extras-commits at redhat.com Mon May 29 16:10:18 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 29 May 2006 09:10:18 -0700 Subject: rpms/perl-Template-Toolkit/FC-4 perl-Template-Toolkit.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200605291610.k4TGAKb4021207@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157/FC-4 Modified Files: perl-Template-Toolkit.spec sources Log Message: Bump to 2.15 Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-4/perl-Template-Toolkit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Template-Toolkit.spec 7 Apr 2006 18:11:28 -0000 1.5 +++ perl-Template-Toolkit.spec 29 May 2006 16:10:18 -0000 1.6 @@ -1,13 +1,11 @@ Name: perl-Template-Toolkit -Version: 2.14 -Release: 8%{?dist} +Version: 2.15 +Release: 1%{?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 @@ -34,7 +32,6 @@ %prep %setup -q -n Template-Toolkit-%{version} -%patch0 -p0 find lib -type f | xargs chmod -c -x # Filter false positive provides. @@ -97,6 +94,10 @@ %{_datadir}/tt2/examples %changelog +* Mon May 29 2006 Tom "spot" Callaway - 2.15-1 +- bump to 2.15 +- gd test is gone, don't need to patch anything + * Tue Feb 28 2006 Tom "spot" Callaway - 2.14-8 - really resolve bug 173756 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jul 2005 17:41:38 -0000 1.2 +++ sources 29 May 2006 16:10:18 -0000 1.3 @@ -1 +1 @@ -0eed60763ef2465c50f9b6a33e51cc14 Template-Toolkit-2.14.tar.gz +26adb4e6d3f2f89e2b54a43f73b70a29 Template-Toolkit-2.15.tar.gz From fedora-extras-commits at redhat.com Mon May 29 16:10:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 29 May 2006 09:10:19 -0700 Subject: rpms/perl-Template-Toolkit/devel .cvsignore, 1.2, 1.3 perl-Template-Toolkit.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200605291610.k4TGALEZ021218@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-serv21157/devel Modified Files: .cvsignore perl-Template-Toolkit.spec sources Log Message: Bump to 2.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jul 2005 17:41:38 -0000 1.2 +++ .cvsignore 29 May 2006 16:10:19 -0000 1.3 @@ -1 +1,2 @@ Template-Toolkit-2.14.tar.gz +Template-Toolkit-2.15.tar.gz Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Template-Toolkit.spec 7 Apr 2006 18:11:30 -0000 1.5 +++ perl-Template-Toolkit.spec 29 May 2006 16:10:19 -0000 1.6 @@ -1,13 +1,11 @@ Name: perl-Template-Toolkit -Version: 2.14 -Release: 8%{?dist} +Version: 2.15 +Release: 1%{?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 @@ -34,7 +32,6 @@ %prep %setup -q -n Template-Toolkit-%{version} -%patch0 -p0 find lib -type f | xargs chmod -c -x # Filter false positive provides. @@ -97,6 +94,10 @@ %{_datadir}/tt2/examples %changelog +* Mon May 29 2006 Tom "spot" Callaway - 2.15-1 +- bump to 2.15 +- gd test is gone, don't need to patch anything + * Tue Feb 28 2006 Tom "spot" Callaway - 2.14-8 - really resolve bug 173756 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jul 2005 17:41:38 -0000 1.2 +++ sources 29 May 2006 16:10:19 -0000 1.3 @@ -1 +1 @@ -0eed60763ef2465c50f9b6a33e51cc14 Template-Toolkit-2.14.tar.gz +26adb4e6d3f2f89e2b54a43f73b70a29 Template-Toolkit-2.15.tar.gz From fedora-extras-commits at redhat.com Mon May 29 16:10:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 29 May 2006 09:10:19 -0700 Subject: rpms/perl-Template-Toolkit/FC-5 perl-Template-Toolkit.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200605291610.k4TGALQK021212@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157/FC-5 Modified Files: perl-Template-Toolkit.spec sources Log Message: Bump to 2.15 Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-5/perl-Template-Toolkit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Template-Toolkit.spec 7 Apr 2006 18:11:29 -0000 1.5 +++ perl-Template-Toolkit.spec 29 May 2006 16:10:19 -0000 1.6 @@ -1,13 +1,11 @@ Name: perl-Template-Toolkit -Version: 2.14 -Release: 8%{?dist} +Version: 2.15 +Release: 1%{?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 @@ -34,7 +32,6 @@ %prep %setup -q -n Template-Toolkit-%{version} -%patch0 -p0 find lib -type f | xargs chmod -c -x # Filter false positive provides. @@ -97,6 +94,10 @@ %{_datadir}/tt2/examples %changelog +* Mon May 29 2006 Tom "spot" Callaway - 2.15-1 +- bump to 2.15 +- gd test is gone, don't need to patch anything + * Tue Feb 28 2006 Tom "spot" Callaway - 2.14-8 - really resolve bug 173756 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jul 2005 17:41:38 -0000 1.2 +++ sources 29 May 2006 16:10:19 -0000 1.3 @@ -1 +1 @@ -0eed60763ef2465c50f9b6a33e51cc14 Template-Toolkit-2.14.tar.gz +26adb4e6d3f2f89e2b54a43f73b70a29 Template-Toolkit-2.15.tar.gz From fedora-extras-commits at redhat.com Mon May 29 16:33:07 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 29 May 2006 09:33:07 -0700 Subject: rpms/xmms/FC-5 xmms-1.2.10-joycrash.patch, NONE, 1.1 xmms-1.2.10-multidevel.patch, NONE, 1.1 xmms.spec, 1.20, 1.21 xmms-1.2.10-extra_libs.patch, 1.1, NONE Message-ID: <200605291633.k4TGX9Pw021457@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21434 Modified Files: xmms.spec Added Files: xmms-1.2.10-joycrash.patch xmms-1.2.10-multidevel.patch Removed Files: xmms-1.2.10-extra_libs.patch Log Message: * Thu May 25 2006 Ville Skytt?? - 1:1.2.10-25 - Avoid multilib conflicts in -devel, introducing xmms.pc. - Include license text in -libs. * Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 - Apply upstream fix for joystick plugin crashes. xmms-1.2.10-joycrash.patch: --- NEW FILE xmms-1.2.10-joycrash.patch --- =================================================================== RCS file: /cvs/xmms/General/joystick/joy.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- xmms/General/joystick/joy.c 2001/02/04 18:00:11 1.8 +++ xmms/General/joystick/joy.c 2004/07/17 21:54:55 1.9 @@ -177,8 +177,11 @@ static void init(void) /* ---------------------------------------------------------------------- */ static void cleanup(void) { - keep_going = FALSE; - pthread_join(joyapp_thread, NULL); + if (keep_going) + { + keep_going = FALSE; + pthread_join(joyapp_thread, NULL); + } if (joy_fd1 > 0) close(joy_fd1); if (joy_fd2 > 0) xmms-1.2.10-multidevel.patch: --- NEW FILE xmms-1.2.10-multidevel.patch --- --- xmms-1.2.10/xmms-config.in~ 2001-04-06 03:35:49.000000000 +0300 +++ xmms-1.2.10/xmms-config.in 2006-05-25 00:22:21.000000000 +0300 @@ -18,24 +18,6 @@ data_dir="@datadir@/@PACKAGE@" version="@VERSION@" -include_dir="@includedir@" -xmms_include_dir="@includedir@/@PACKAGE@" -lib_dir="@libdir@" - -if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` - gtk_cflags=`gtk-config --cflags` -else - gtk_libs="@GTK_LIBS@" - gtk_cflags="@GTK_CFLAGS@" -fi - -plugin_dir="@plugindir@" -visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@" -input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@" -output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@" -effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@" -general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@" usage() { @@ -146,24 +128,12 @@ echo $exec_prefix fi -if test "$include_dir" != "/usr/include"; then - cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags" -else - cflags="-I$xmms_include_dir $gtk_cflags" -fi - -if test "$lib_dir" != "/usr/lib"; then - libs="-L$lib_dir $gtk_libs -lxmms" -else - libs="$gtk_libs -lxmms" -fi - if test "$echo_cflags" = "yes"; then - echo $cflags + pkg-config xmms --cflags fi if test "$echo_libs" = "yes"; then - echo $libs + pkg-config xmms --libs fi if test "$echo_data_dir" = "yes"; then @@ -171,25 +141,25 @@ fi if test "$echo_plugin_dir" = "yes"; then - echo $plugin_dir + pkg-config xmms --variable=plugin_dir fi if test "$echo_visualization_plugin_dir" = "yes"; then - echo $visualization_plugin_dir + pkg-config xmms --variable=visualization_plugin_dir fi if test "$echo_input_plugin_dir" = "yes"; then - echo $input_plugin_dir + pkg-config xmms --variable=input_plugin_dir fi if test "$echo_output_plugin_dir" = "yes"; then - echo $output_plugin_dir + pkg-config xmms --variable=output_plugin_dir fi if test "$echo_general_plugin_dir" = "yes"; then - echo $general_plugin_dir + pkg-config xmms --variable=general_plugin_dir fi if test "$echo_effect_plugin_dir" = "yes"; then - echo $effect_plugin_dir + pkg-config xmms --variable=effect_plugin_dir fi --- xmms-1.2.10/configure~ 2004-02-23 23:44:32.000000000 +0200 +++ xmms-1.2.10/configure 2006-05-24 23:55:50.000000000 +0300 @@ -19201,7 +19201,7 @@ - ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Ma! kefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" + ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms.pc xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_! scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19861,6 +19861,7 @@ "wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;; "xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;; "xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;; + "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;; "xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;; "xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;; "Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;; --- xmms-1.2.10/xmms.pc.in~ 2006-05-24 23:54:59.000000000 +0300 +++ xmms-1.2.10/xmms.pc.in 2006-05-24 23:54:48.000000000 +0300 @@ -0,0 +1,18 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +data_dir=@datadir@ +plugin_dir=@plugindir@ +visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@ +input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@ +output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@ +effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@ +general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@ + +Name: XMMS +Description: The X MultiMedia System, a media player +Version: @VERSION@ +Requires: gtk+ +Libs: -L${libdir} -lxmms +Cflags: -I${includedir} -I${includedir}/@PACKAGE@ Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/FC-5/xmms.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xmms.spec 12 Apr 2006 19:58:53 -0000 1.20 +++ xmms.spec 29 May 2006 16:33:07 -0000 1.21 @@ -4,7 +4,7 @@ Name: xmms Version: 1.2.10 -Release: 23%{?dist} +Release: 25%{?dist} Epoch: 1 Summary: The X MultiMedia System, a media player @@ -19,6 +19,8 @@ Source1: xmms.req Source2: xmms.xpm Source3: rh_mp3.c +# http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9 +Patch0: %{name}-1.2.10-joycrash.patch Patch1: %{name}-1.2.6-audio.patch Patch2: %{name}-1.2.6-lazy.patch Patch3: %{name}-1.2.8-default-skin.patch @@ -26,11 +28,12 @@ Patch5: %{name}-1.2.8-arts.patch Patch6: %{name}-1.2.8-alsalib.patch Patch7: %{name}-cd-mountpoint.patch +# Patch8 on top of patch4 +Patch8: %{name}-1.2.10-multidevel.patch Patch9: %{name}-underquoted.patch Patch10: %{name}-alsa-backport.patch Patch11: %{name}-1.2.10-gcc4.patch Patch12: %{name}-1.2.10-crossfade-0.3.9.patch -Patch13: %{name}-1.2.10-extra_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel @@ -69,6 +72,7 @@ Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: gtk+-devel +Requires: pkgconfig %description devel Files needed for building plug-ins for the X MultiMedia System. @@ -76,6 +80,8 @@ %prep %setup -q +# Fix joystick plugin crashes +%patch0 -p1 -b .joycrash # Set default output plugin to ALSA %patch1 -p1 -b .audio # Use RTLD_LAZY, not RTLD_NOW @@ -90,6 +96,8 @@ %patch6 -p1 -b .alsalib # Use something that's more likely to work as the default cdrom mountpoint %patch7 -p0 -b .cd-mountpoint +# Avoid multilib devel conflicts +%patch8 -p1 -b .multidevel # Fix m4 underquoted warning %patch9 -p1 -b .underquoted # Backport for recent ALSA @@ -98,8 +106,6 @@ %patch11 -p1 -b .gcc4 # Fix for crossfade >= 0.3.9 to work properly %patch12 -p1 -b .crossfade -# Remove extra libs from xmms-config output (only needed for static linking) -%patch13 -p1 -b .extra_libs # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure @@ -139,6 +145,8 @@ install -Dpm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm +install -Dpm 644 xmms.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xmms.pc + %find_lang %{name} @@ -171,6 +179,7 @@ %files libs %defattr(-,root,root,-) +%doc COPYING %{_libdir}/libxmms.so.* %{_libdir}/xmms/ @@ -179,10 +188,18 @@ %{_bindir}/xmms-config %{_includedir}/xmms/ %{_libdir}/libxmms.so +%{_libdir}/pkgconfig/xmms.pc %{_datadir}/aclocal/xmms.m4 %changelog +* Thu May 25 2006 Ville Skytt?? - 1:1.2.10-25 +- Avoid multilib conflicts in -devel, introducing xmms.pc. +- Include license text in -libs. + +* Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 +- Apply upstream fix for joystick plugin crashes. + * Thu Apr 6 2006 Ville Skytt?? - 1:1.2.10-23 - Split library and plugins to xmms-libs (#184606). - ALSA is ubiquitous, don't filter dependencies to it. --- xmms-1.2.10-extra_libs.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 29 17:22:16 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:22:16 -0700 Subject: rpms/TeXmacs/FC-5 TeXmacs.spec,1.34,1.35 Message-ID: <200605291722.k4THMI7V024174@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24157 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- TeXmacs.spec 12 May 2006 17:36:59 -0000 1.34 +++ TeXmacs.spec 29 May 2006 17:22:15 -0000 1.35 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.6.1 -Release: 2%{?dist} +Version: 1.0.6.2 +Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.2-src.tar.gz Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch @@ -53,10 +53,10 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +#%patch3 -p1 +#%patch4 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -157,6 +157,9 @@ %changelog +* Mon May 29 2006 Gerard Milmeister - 1.0.6.2-1 +- new version 1.0.6.2 + * Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 - new version 1.0.6.1 From fedora-extras-commits at redhat.com Mon May 29 17:23:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 10:23:04 -0700 Subject: rpms/perl-Cache-Cache/FC-4 .cvsignore, 1.4, 1.5 perl-Cache-Cache.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605291723.k4THNapb024300@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Cache-Cache/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229/FC-4 Modified Files: .cvsignore perl-Cache-Cache.spec sources Log Message: Update to 1.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Mar 2005 16:04:09 -0000 1.4 +++ .cvsignore 29 May 2006 17:23:04 -0000 1.5 @@ -1 +1 @@ -Cache-Cache-1.04.tar.gz +Cache-Cache-1.05.tar.gz Index: perl-Cache-Cache.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-4/perl-Cache-Cache.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Cache-Cache.spec 6 Apr 2005 22:12:43 -0000 1.7 +++ perl-Cache-Cache.spec 29 May 2006 17:23:04 -0000 1.8 @@ -1,21 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Cache-Cache -Version: 1.04 -Release: 2 - +Version: 1.05 +Release: 1%{?dist} Summary: Generic cache interface and implementations Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Cache-Cache/ -Source0: http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.04.tar.gz +Source0: http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Storable) +BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Digest::SHA1), perl(Error), perl(IPC::ShareLite) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -45,7 +42,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -61,7 +58,16 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon May 29 2006 Jose Pedro Oliveira - 1.05-1 +- Update to 1.05. + +* Mon Feb 20 2006 Jose Pedro Oliveira - 1.04-4 +- Rebuild for FC5 (perl 5.8.8). + +* Thu Dec 29 2005 Jose Pedro Oliveira - 1.04-3 +- Dist tag. + +* Fri Apr 7 2005 Michael Schwendt - 1.04-2 - rebuilt * Fri Mar 18 2005 Jose Pedro Oliveira - 1.04-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Mar 2005 16:04:10 -0000 1.4 +++ sources 29 May 2006 17:23:04 -0000 1.5 @@ -1 +1 @@ -60f79f31e74830dba1e0acda4d232d31 Cache-Cache-1.04.tar.gz +09e4d37979c8f8ce2518e1d1ccd10d99 Cache-Cache-1.05.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:23:04 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:23:04 -0700 Subject: rpms/TeXmacs/FC-5 TeXmacs.spec,1.35,1.36 Message-ID: <200605291723.k4THNaQ0024301@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24222 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- TeXmacs.spec 29 May 2006 17:22:15 -0000 1.35 +++ TeXmacs.spec 29 May 2006 17:23:04 -0000 1.36 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors From fedora-extras-commits at redhat.com Mon May 29 17:23:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 10:23:05 -0700 Subject: rpms/perl-Cache-Cache/devel .cvsignore, 1.4, 1.5 perl-Cache-Cache.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200605291723.k4THNbAA024311@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Cache-Cache/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229/devel Modified Files: .cvsignore perl-Cache-Cache.spec sources Log Message: Update to 1.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Mar 2005 16:04:09 -0000 1.4 +++ .cvsignore 29 May 2006 17:23:05 -0000 1.5 @@ -1 +1 @@ -Cache-Cache-1.04.tar.gz +Cache-Cache-1.05.tar.gz Index: perl-Cache-Cache.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/perl-Cache-Cache.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Cache-Cache.spec 20 Feb 2006 19:06:25 -0000 1.9 +++ perl-Cache-Cache.spec 29 May 2006 17:23:05 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Cache-Cache -Version: 1.04 -Release: 4%{?dist} +Version: 1.05 +Release: 1%{?dist} Summary: Generic cache interface and implementations Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 1.05-1 +- Update to 1.05. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.04-4 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Mar 2005 16:04:10 -0000 1.4 +++ sources 29 May 2006 17:23:05 -0000 1.5 @@ -1 +1 @@ -60f79f31e74830dba1e0acda4d232d31 Cache-Cache-1.04.tar.gz +09e4d37979c8f8ce2518e1d1ccd10d99 Cache-Cache-1.05.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:23:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 10:23:05 -0700 Subject: rpms/perl-Cache-Cache/FC-5 .cvsignore, 1.4, 1.5 perl-Cache-Cache.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200605291723.k4THNbiH024306@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Cache-Cache/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229/FC-5 Modified Files: .cvsignore perl-Cache-Cache.spec sources Log Message: Update to 1.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Mar 2005 16:04:09 -0000 1.4 +++ .cvsignore 29 May 2006 17:23:04 -0000 1.5 @@ -1 +1 @@ -Cache-Cache-1.04.tar.gz +Cache-Cache-1.05.tar.gz Index: perl-Cache-Cache.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-5/perl-Cache-Cache.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Cache-Cache.spec 20 Feb 2006 19:06:25 -0000 1.9 +++ perl-Cache-Cache.spec 29 May 2006 17:23:04 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Cache-Cache -Version: 1.04 -Release: 4%{?dist} +Version: 1.05 +Release: 1%{?dist} Summary: Generic cache interface and implementations Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 1.05-1 +- Update to 1.05. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.04-4 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Mar 2005 16:04:10 -0000 1.4 +++ sources 29 May 2006 17:23:04 -0000 1.5 @@ -1 +1 @@ -60f79f31e74830dba1e0acda4d232d31 Cache-Cache-1.04.tar.gz +09e4d37979c8f8ce2518e1d1ccd10d99 Cache-Cache-1.05.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:28:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:28:12 -0700 Subject: rpms/TeXmacs/FC-5 .cvsignore, 1.19, 1.20 TeXmacs.spec, 1.36, 1.37 sources, 1.20, 1.21 Message-ID: <200605291728.k4THSFqE024465@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24444 Modified Files: .cvsignore TeXmacs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 12 May 2006 17:36:59 -0000 1.19 +++ .cvsignore 29 May 2006 17:28:12 -0000 1.20 @@ -1 +1 @@ -TeXmacs-1.0.6.1-src.tar.gz +TeXmacs-1.0.6.2-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- TeXmacs.spec 29 May 2006 17:23:04 -0000 1.36 +++ TeXmacs.spec 29 May 2006 17:28:12 -0000 1.37 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 12 May 2006 17:36:59 -0000 1.20 +++ sources 29 May 2006 17:28:12 -0000 1.21 @@ -1 +1 @@ -7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz +9f38c2a547b9508b7b263eaf12b2ed97 TeXmacs-1.0.6.2-src.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:31:44 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:31:44 -0700 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.28,1.29 Message-ID: <200605291731.k4THVkMx024550@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24533 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- TeXmacs.spec 12 May 2006 17:36:59 -0000 1.28 +++ TeXmacs.spec 29 May 2006 17:31:44 -0000 1.29 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.6.1 -Release: 2%{?dist} +Version: 1.0.6.2 +Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.2-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 @@ -136,6 +136,9 @@ %changelog +* Mon May 29 2006 Gerard Milmeister - 1.0.6.2-1 +- new version 1.0.6.2 + * Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 - new version 1.0.6.1 From fedora-extras-commits at redhat.com Mon May 29 17:41:26 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:41:26 -0700 Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.18, 1.19 TeXmacs.spec, 1.29, 1.30 branch, 1.1, 1.2 sources, 1.20, 1.21 Message-ID: <200605291741.k4THfSnJ024642@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24619 Modified Files: .cvsignore TeXmacs.spec branch sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 12 May 2006 17:36:59 -0000 1.18 +++ .cvsignore 29 May 2006 17:41:26 -0000 1.19 @@ -1 +1 @@ -TeXmacs-1.0.6.1-src.tar.gz +TeXmacs-1.0.6.2-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- TeXmacs.spec 29 May 2006 17:31:44 -0000 1.29 +++ TeXmacs.spec 29 May 2006 17:41:26 -0000 1.30 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: branch =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/branch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branch 31 May 2005 15:23:49 -0000 1.1 +++ branch 29 May 2006 17:41:26 -0000 1.2 @@ -1 +1 @@ -FC-4 +FC-5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 12 May 2006 17:36:59 -0000 1.20 +++ sources 29 May 2006 17:41:26 -0000 1.21 @@ -1 +1 @@ -7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz +9f38c2a547b9508b7b263eaf12b2ed97 TeXmacs-1.0.6.2-src.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:44:26 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:44:26 -0700 Subject: rpms/TeXmacs/devel .cvsignore, 1.19, 1.20 TeXmacs.spec, 1.37, 1.38 sources, 1.20, 1.21 Message-ID: <200605291744.k4THiS0v024795@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24774 Modified Files: .cvsignore TeXmacs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 12 May 2006 17:39:05 -0000 1.19 +++ .cvsignore 29 May 2006 17:44:26 -0000 1.20 @@ -1 +1 @@ -TeXmacs-1.0.6.1-src.tar.gz +TeXmacs-1.0.6.2-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- TeXmacs.spec 16 May 2006 23:03:10 -0000 1.37 +++ TeXmacs.spec 29 May 2006 17:44:26 -0000 1.38 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.6.1 -Release: 4%{?dist} +Version: 1.0.6.2 +Release: 3%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.2-src.tar.gz Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch @@ -56,10 +56,10 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +#%patch3 -p1 +#%patch4 -p1 %patch5 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -73,8 +73,9 @@ rm -fr $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install export GUILE_DATA_PATH=`guile-config info pkgdatadir` -export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d -name ice-9` +export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d | grep ice-9` cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs +chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/* chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info @@ -160,6 +161,9 @@ %changelog +* Mon May 29 2006 Gerard Milmeister - 1.0.6.2-1 +- new version 1.0.6.2 + * Tue May 16 2006 Gerard Milmeister - 1.0.6.1-4 - added patch for new guile-1.8 - added buildreq for libtool-ltdl-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 12 May 2006 17:39:05 -0000 1.20 +++ sources 29 May 2006 17:44:26 -0000 1.21 @@ -1 +1 @@ -7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz +9f38c2a547b9508b7b263eaf12b2ed97 TeXmacs-1.0.6.2-src.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:46:13 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:46:13 -0700 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.30,1.31 branch,1.2,1.3 Message-ID: <200605291746.k4THkFAJ024899@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24880 Modified Files: TeXmacs.spec branch Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- TeXmacs.spec 29 May 2006 17:41:26 -0000 1.30 +++ TeXmacs.spec 29 May 2006 17:46:13 -0000 1.31 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: branch =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/branch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- branch 29 May 2006 17:41:26 -0000 1.2 +++ branch 29 May 2006 17:46:13 -0000 1.3 @@ -1 +1 @@ -FC-5 +FC-4 From fedora-extras-commits at redhat.com Mon May 29 17:52:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 10:52:21 -0700 Subject: rpms/perl-Gtk2/devel .cvsignore, 1.13, 1.14 perl-Gtk2.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200605291752.k4THqNTf024975@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24954 Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Update to 1.122. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 11 Apr 2006 18:23:10 -0000 1.13 +++ .cvsignore 29 May 2006 17:52:21 -0000 1.14 @@ -1 +1 @@ -Gtk2-1.121.tar.gz +Gtk2-1.122.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Gtk2.spec 1 May 2006 00:16:40 -0000 1.18 +++ perl-Gtk2.spec 29 May 2006 17:52:21 -0000 1.19 @@ -5,8 +5,8 @@ # Name: perl-Gtk2 -Version: 1.121 -Release: 2%{?dist} +Version: 1.122 +Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries @@ -86,6 +86,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 1.122-1 +- Update to 1.122. + * Mon May 1 2006 Jose Pedro Oliveira - 1.121-2 - Requires perl(Cairo) (distro >= FC-5). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 11 Apr 2006 18:23:10 -0000 1.13 +++ sources 29 May 2006 17:52:21 -0000 1.14 @@ -1 +1 @@ -90bd58334c49a4db9d812537de5b1620 Gtk2-1.121.tar.gz +b7c9fc25329f507d263899699dc7ff09 Gtk2-1.122.tar.gz From fedora-extras-commits at redhat.com Mon May 29 18:06:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 11:06:36 -0700 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.38,1.39 Message-ID: <200605291806.k4TI6cOK027546@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27529 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- TeXmacs.spec 29 May 2006 17:44:26 -0000 1.38 +++ TeXmacs.spec 29 May 2006 18:06:36 -0000 1.39 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -73,9 +73,8 @@ rm -fr $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install export GUILE_DATA_PATH=`guile-config info pkgdatadir` -export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d | grep ice-9` +export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d -name ice-9` cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs -chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/* chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info From fedora-extras-commits at redhat.com Mon May 29 18:20:48 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 29 May 2006 11:20:48 -0700 Subject: owners owners.list,1.1072,1.1073 Message-ID: <200605291820.k4TIKoDq027715@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27696 Modified Files: owners.list Log Message: Add cc components.. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1072 retrieving revision 1.1073 diff -u -r1.1072 -r1.1073 --- owners.list 29 May 2006 10:57:13 -0000 1.1072 +++ owners.list 29 May 2006 18:20:48 -0000 1.1073 @@ -1171,7 +1171,7 @@ Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH-Perl|SSH (Secure Shell) client|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Net-XMPP|Net::XMPP - perl XMPP library|cweyl at alumni.drew.edu +Fedora Extras|perl-Net-XMPP|Net::XMPP - perl XMPP library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Object-Accessor|Perl module that allows per object accessors|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1285,7 +1285,7 @@ Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-Stream|XML::Stream - streaming XML library|cweyl at alumni.drew.edu +Fedora Extras|perl-XML-Stream|XML::Stream - streaming XML library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 29 19:12:58 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 29 May 2006 12:12:58 -0700 Subject: rpms/qt4/devel qt4-wrapper.sh,1.1,1.2 qt4.spec,1.3,1.4 Message-ID: <200605291913.k4TJD0Wp030117@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30098 Modified Files: qt4-wrapper.sh qt4.spec Log Message: * Mon May 29 2006 Rex Dieter 4.1.3-6 - make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't installed (#193369) Index: qt4-wrapper.sh =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4-wrapper.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4-wrapper.sh 24 May 2006 14:06:14 -0000 1.1 +++ qt4-wrapper.sh 29 May 2006 19:12:58 -0000 1.2 @@ -1,13 +1,13 @@ #!/bin/sh if [ -z "$QT4DIR" ] ; then - QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`" - - if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then - PATH=${QT4DIR}/bin:${PATH} - fi + QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || rpm -q --eval "%{_libdir}/qt4"`" + export QT4DIR +fi - export QT4DIR PATH +if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then + PATH=${QT4DIR}/bin:${PATH} + export PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qt4.spec 26 May 2006 18:01:15 -0000 1.3 +++ qt4.spec 29 May 2006 19:12:58 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -391,6 +391,10 @@ %changelog +* Mon May 29 2006 Rex Dieter 4.1.3-6 +- make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't + installed (#193369) + * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %%buildSQL macro From fedora-extras-commits at redhat.com Mon May 29 19:33:00 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 12:33:00 -0700 Subject: rpms/gurlchecker/FC-4 .cvsignore, 1.3, 1.4 gurlchecker.spec, 1.12, 1.13 sources, 1.3, 1.4 gurlchecker-gcc4.patch, 1.1, NONE gurlchecker.desktop, 1.2, NONE Message-ID: <200605291933.k4TJX2s0030298@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gurlchecker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/FC-4 Modified Files: .cvsignore gurlchecker.spec sources Removed Files: gurlchecker-gcc4.patch gurlchecker.desktop Log Message: updated to currently upstream. Removed old patches and desktop files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Apr 2006 23:00:11 -0000 1.3 +++ .cvsignore 29 May 2006 19:33:00 -0000 1.4 @@ -1 +1 @@ -gurlchecker-0.8.3.tar.gz +gurlchecker-0.10.0.tar.gz Index: gurlchecker.spec =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gurlchecker.spec 28 Apr 2006 07:21:45 -0000 1.12 +++ gurlchecker.spec 29 May 2006 19:33:00 -0000 1.13 @@ -1,6 +1,6 @@ Name: gurlchecker -Version: 0.8.3 -Release: 4%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: A Gnome link validity checker @@ -48,6 +48,9 @@ %{_mandir}/man?/* %changelog +* Tue May 30 2006 Michael J. Knox - 0.10.0-1 +- updated to 0.10.0 + * Fri Apr 28 2006 Michael J. Knox - 0.8.3-4 - missed docbookutils Index: sources =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Apr 2006 23:00:11 -0000 1.3 +++ sources 29 May 2006 19:33:00 -0000 1.4 @@ -1 +1 @@ -2c4d1c74d8044ae41db980ba7ff27e98 gurlchecker-0.8.3.tar.gz +cb5fd08fb4afe14e588fde0bc2744428 gurlchecker-0.10.0.tar.gz --- gurlchecker-gcc4.patch DELETED --- --- gurlchecker.desktop DELETED --- From fedora-extras-commits at redhat.com Mon May 29 19:33:01 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 12:33:01 -0700 Subject: rpms/gurlchecker/FC-5 .cvsignore, 1.3, 1.4 gurlchecker.spec, 1.13, 1.14 sources, 1.3, 1.4 gurlchecker-gcc4.patch, 1.1, NONE gurlchecker.desktop, 1.2, NONE Message-ID: <200605291933.k4TJX32G030304@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gurlchecker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/FC-5 Modified Files: .cvsignore gurlchecker.spec sources Removed Files: gurlchecker-gcc4.patch gurlchecker.desktop Log Message: updated to currently upstream. Removed old patches and desktop files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Apr 2006 23:00:11 -0000 1.3 +++ .cvsignore 29 May 2006 19:33:01 -0000 1.4 @@ -1 +1 @@ -gurlchecker-0.8.3.tar.gz +gurlchecker-0.10.0.tar.gz Index: gurlchecker.spec =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gurlchecker.spec 28 Apr 2006 07:21:46 -0000 1.13 +++ gurlchecker.spec 29 May 2006 19:33:01 -0000 1.14 @@ -1,6 +1,6 @@ Name: gurlchecker -Version: 0.8.3 -Release: 4%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: A Gnome link validity checker @@ -48,6 +48,9 @@ %{_mandir}/man?/* %changelog +* Tue May 30 2006 Michael J. Knox - 0.10.0-1 +- updated to 0.10.0 + * Fri Apr 28 2006 Michael J. Knox - 0.8.3-4 - missed docbookutils Index: sources =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Apr 2006 23:00:11 -0000 1.3 +++ sources 29 May 2006 19:33:01 -0000 1.4 @@ -1 +1 @@ -2c4d1c74d8044ae41db980ba7ff27e98 gurlchecker-0.8.3.tar.gz +cb5fd08fb4afe14e588fde0bc2744428 gurlchecker-0.10.0.tar.gz --- gurlchecker-gcc4.patch DELETED --- --- gurlchecker.desktop DELETED --- From fedora-extras-commits at redhat.com Mon May 29 19:33:02 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 12:33:02 -0700 Subject: rpms/gurlchecker/devel .cvsignore, 1.3, 1.4 gurlchecker.spec, 1.13, 1.14 sources, 1.3, 1.4 gurlchecker-gcc4.patch, 1.1, NONE gurlchecker.desktop, 1.2, NONE Message-ID: <200605291933.k4TJX4Ml030310@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gurlchecker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/devel Modified Files: .cvsignore gurlchecker.spec sources Removed Files: gurlchecker-gcc4.patch gurlchecker.desktop Log Message: updated to currently upstream. Removed old patches and desktop files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Apr 2006 23:00:12 -0000 1.3 +++ .cvsignore 29 May 2006 19:33:02 -0000 1.4 @@ -1 +1 @@ -gurlchecker-0.8.3.tar.gz +gurlchecker-0.10.0.tar.gz Index: gurlchecker.spec =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gurlchecker.spec 28 Apr 2006 07:21:47 -0000 1.13 +++ gurlchecker.spec 29 May 2006 19:33:02 -0000 1.14 @@ -1,6 +1,6 @@ Name: gurlchecker -Version: 0.8.3 -Release: 4%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: A Gnome link validity checker @@ -48,6 +48,9 @@ %{_mandir}/man?/* %changelog +* Tue May 30 2006 Michael J. Knox - 0.10.0-1 +- updated to 0.10.0 + * Fri Apr 28 2006 Michael J. Knox - 0.8.3-4 - missed docbookutils Index: sources =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Apr 2006 23:00:12 -0000 1.3 +++ sources 29 May 2006 19:33:02 -0000 1.4 @@ -1 +1 @@ -2c4d1c74d8044ae41db980ba7ff27e98 gurlchecker-0.8.3.tar.gz +cb5fd08fb4afe14e588fde0bc2744428 gurlchecker-0.10.0.tar.gz --- gurlchecker-gcc4.patch DELETED --- --- gurlchecker.desktop DELETED --- From fedora-extras-commits at redhat.com Mon May 29 20:06:22 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Mon, 29 May 2006 13:06:22 -0700 Subject: rpms/qps/devel .cvsignore,1.8,1.9 qps.spec,1.8,1.9 sources,1.8,1.9 Message-ID: <200605292006.k4TK6Oa0000466@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv436 Modified Files: .cvsignore qps.spec sources Log Message: - Update to 1.9.16 - Turn on optflags - Change e-mail address in ChangeLog entries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Apr 2006 20:55:51 -0000 1.8 +++ .cvsignore 29 May 2006 20:06:22 -0000 1.9 @@ -1 +1 @@ -qps-1.9.15.tar.gz +qps-1.9.16.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qps.spec 11 Apr 2006 20:55:51 -0000 1.8 +++ qps.spec 29 May 2006 20:06:22 -0000 1.9 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.15 +Version: 1.9.16 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz +Source0: http://kldp.net/frs/download.php/3375/qps-1.9.16.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,6 +19,10 @@ %prep %setup -q +# Turn on %optflags +sed -i -e ' +s/CONFIG += warn_off qt debug/CONFIG += warn_off qt release/' qps.pro + %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -52,32 +56,37 @@ %changelog -* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 +* Mon May 29 2006 Dawid Gajownik - 1.9.16-1 +- Update to 1.9.16 +- Turn on optflags +- Change e-mail address in ChangeLog entries + +* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 - Update to 1.9.15 -* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 - Update to 1.9.14 -* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 -* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 +* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Drop gcc41.patch (pushed upstream) -* Tue Feb 14 2006 Dawid Gajownik - 1.9.11-2.2 +* Tue Feb 14 2006 Dawid Gajownik - 1.9.11-2.2 - Rebuild for Fedora Extras 5 -* Sun Dec 18 2005 Dawid Gajownik - 1.9.11-2.1 +* Sun Dec 18 2005 Dawid Gajownik - 1.9.11-2.1 - Fix compilation with GCC 4.1 - Use funny release tag because tarball name contains `-' character - Add COPYING file -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 - Increase release tag (always do `cvs ci' before `make tag' ;) ) -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 - Update to 1.9.11. -* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 +* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 - Initial RPM release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Apr 2006 20:55:51 -0000 1.8 +++ sources 29 May 2006 20:06:22 -0000 1.9 @@ -1 +1 @@ -d4fd0c451598f12b8ff16e8bed58c07d qps-1.9.15.tar.gz +23aa2b9180e352b6e55e81bf5ab1af77 qps-1.9.16.tar.gz From fedora-extras-commits at redhat.com Mon May 29 20:09:00 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Mon, 29 May 2006 13:09:00 -0700 Subject: rpms/qps/FC-5 .cvsignore,1.8,1.9 qps.spec,1.8,1.9 sources,1.8,1.9 Message-ID: <200605292009.k4TK92OC000565@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv539 Modified Files: .cvsignore qps.spec sources Log Message: - Update to 1.9.16 - Turn on optflags - Change e-mail address in ChangeLog entries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Apr 2006 21:12:22 -0000 1.8 +++ .cvsignore 29 May 2006 20:09:00 -0000 1.9 @@ -1 +1 @@ -qps-1.9.15.tar.gz +qps-1.9.16.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/qps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qps.spec 11 Apr 2006 21:12:22 -0000 1.8 +++ qps.spec 29 May 2006 20:09:00 -0000 1.9 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.15 +Version: 1.9.16 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz +Source0: http://kldp.net/frs/download.php/3375/qps-1.9.16.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,6 +19,10 @@ %prep %setup -q +# Turn on %optflags +sed -i -e ' +s/CONFIG += warn_off qt debug/CONFIG += warn_off qt release/' qps.pro + %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -52,32 +56,37 @@ %changelog -* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 +* Mon May 29 2006 Dawid Gajownik - 1.9.16-1 +- Update to 1.9.16 +- Turn on optflags +- Change e-mail address in ChangeLog entries + +* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 - Update to 1.9.15 -* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 - Update to 1.9.14 -* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 -* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 +* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Drop gcc41.patch (pushed upstream) -* Tue Feb 14 2006 Dawid Gajownik - 1.9.11-2.2 +* Tue Feb 14 2006 Dawid Gajownik - 1.9.11-2.2 - Rebuild for Fedora Extras 5 -* Sun Dec 18 2005 Dawid Gajownik - 1.9.11-2.1 +* Sun Dec 18 2005 Dawid Gajownik - 1.9.11-2.1 - Fix compilation with GCC 4.1 - Use funny release tag because tarball name contains `-' character - Add COPYING file -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 - Increase release tag (always do `cvs ci' before `make tag' ;) ) -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 - Update to 1.9.11. -* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 +* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 - Initial RPM release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Apr 2006 21:12:22 -0000 1.8 +++ sources 29 May 2006 20:09:00 -0000 1.9 @@ -1 +1 @@ -d4fd0c451598f12b8ff16e8bed58c07d qps-1.9.15.tar.gz +23aa2b9180e352b6e55e81bf5ab1af77 qps-1.9.16.tar.gz From fedora-extras-commits at redhat.com Mon May 29 20:10:11 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 29 May 2006 13:10:11 -0700 Subject: rpms/qt4/FC-5 qt4-wrapper.sh,1.1,1.2 qt4.spec,1.4,1.5 Message-ID: <200605292010.k4TKADsJ000594@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv575 Modified Files: qt4-wrapper.sh qt4.spec Log Message: * Mon May 29 2006 Rex Dieter 4.1.3-6 - make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't installed (#193369) Index: qt4-wrapper.sh =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/qt4-wrapper.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4-wrapper.sh 24 May 2006 14:06:14 -0000 1.1 +++ qt4-wrapper.sh 29 May 2006 20:10:11 -0000 1.2 @@ -1,13 +1,13 @@ #!/bin/sh if [ -z "$QT4DIR" ] ; then - QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`" - - if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then - PATH=${QT4DIR}/bin:${PATH} - fi + QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || rpm -q --eval "%{_libdir}/qt4"`" + export QT4DIR +fi - export QT4DIR PATH +if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then + PATH=${QT4DIR}/bin:${PATH} + export PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qt4.spec 26 May 2006 20:41:50 -0000 1.4 +++ qt4.spec 29 May 2006 20:10:11 -0000 1.5 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -391,6 +391,10 @@ %changelog +* Mon May 29 2006 Rex Dieter 4.1.3-6 +- make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't + installed (#193369) + * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %%buildSQL macro From fedora-extras-commits at redhat.com Mon May 29 20:10:29 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 29 May 2006 13:10:29 -0700 Subject: rpms/qt4/FC-4 qt4-wrapper.sh,1.1,1.2 qt4.spec,1.3,1.4 Message-ID: <200605292010.k4TKAVaI000657@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv638 Modified Files: qt4-wrapper.sh qt4.spec Log Message: * Mon May 29 2006 Rex Dieter 4.1.3-6 - make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't installed (#193369) Index: qt4-wrapper.sh =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-4/qt4-wrapper.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4-wrapper.sh 24 May 2006 14:06:14 -0000 1.1 +++ qt4-wrapper.sh 29 May 2006 20:10:28 -0000 1.2 @@ -1,13 +1,13 @@ #!/bin/sh if [ -z "$QT4DIR" ] ; then - QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`" - - if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then - PATH=${QT4DIR}/bin:${PATH} - fi + QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || rpm -q --eval "%{_libdir}/qt4"`" + export QT4DIR +fi - export QT4DIR PATH +if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then + PATH=${QT4DIR}/bin:${PATH} + export PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qt4.spec 26 May 2006 20:42:19 -0000 1.3 +++ qt4.spec 29 May 2006 20:10:28 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -391,6 +391,10 @@ %changelog +* Mon May 29 2006 Rex Dieter 4.1.3-6 +- make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't + installed (#193369) + * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %%buildSQL macro From fedora-extras-commits at redhat.com Mon May 29 20:14:04 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Mon, 29 May 2006 13:14:04 -0700 Subject: rpms/qps/FC-4 .cvsignore,1.7,1.8 qps.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <200605292014.k4TKE6iH000792@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv769 Modified Files: .cvsignore qps.spec sources Log Message: - Update to 1.9.16 - Turn on optflags - Change e-mail address in ChangeLog entries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Apr 2006 21:19:30 -0000 1.7 +++ .cvsignore 29 May 2006 20:14:04 -0000 1.8 @@ -1 +1 @@ -qps-1.9.15.tar.gz +qps-1.9.16.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/qps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qps.spec 11 Apr 2006 21:19:30 -0000 1.7 +++ qps.spec 29 May 2006 20:14:04 -0000 1.8 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.15 +Version: 1.9.16 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz +Source0: http://kldp.net/frs/download.php/3375/qps-1.9.16.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,6 +19,10 @@ %prep %setup -q +# Turn on %optflags +sed -i -e ' +s/CONFIG += warn_off qt debug/CONFIG += warn_off qt release/' qps.pro + %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -52,24 +56,29 @@ %changelog -* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 +* Mon May 29 2006 Dawid Gajownik - 1.9.16-1 +- Update to 1.9.16 +- Turn on optflags +- Change e-mail address in ChangeLog entries + +* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 - Update to 1.9.15 -* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 - Update to 1.9.14 -* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 -* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 +* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Add COPYING file -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 - Increase release tag (always do `cvs ci' before `make tag' ;) ) -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 - Update to 1.9.11. -* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 +* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 - Initial RPM release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Apr 2006 21:19:30 -0000 1.7 +++ sources 29 May 2006 20:14:04 -0000 1.8 @@ -1 +1 @@ -d4fd0c451598f12b8ff16e8bed58c07d qps-1.9.15.tar.gz +23aa2b9180e352b6e55e81bf5ab1af77 qps-1.9.16.tar.gz From fedora-extras-commits at redhat.com Mon May 29 20:26:45 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:26:45 -0700 Subject: extras-buildsys/server ArchJob.py, 1.33, 1.34 Builder.py, 1.43, 1.44 BuilderManager.py, 1.26, 1.27 PackageJob.py, 1.50, 1.51 Message-ID: <200605292026.k4TKQjEY000948@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv877/server Modified Files: ArchJob.py Builder.py BuilderManager.py PackageJob.py Log Message: 2006-05-29 Dan Williams * Make most everything work now; both Passive and Active builders will download/upload the SRPM from the server. The SRPM's URL is no longer passed to the builder in the initial job request, but comes along later once the SPRM is actually available to the builder (which might be after an upload to the builder in the case of Passive builders). * Pylint cleanups * Clean up logging on builders by consolidating newline handling is one place * Use the Targets command to pass back to the server any upload URL the builder might have (for passive builders) Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ArchJob.py 20 May 2006 05:10:08 -0000 1.33 +++ ArchJob.py 29 May 2006 20:26:38 -0000 1.34 @@ -22,13 +22,13 @@ import sha -def _generate_uniqid(parent_jobid, start_time, target_dict, srpm_url): +def _generate_uniqid(parent_jobid, start_time, target_dict, srpm): distro = target_dict['distro'] repo = target_dict['repo'] target = target_dict['target'] arch = target_dict['arch'] hash_string = "%d%d%s%s%s%s%s" % (parent_jobid, start_time, distro, - target, arch, repo, srpm_url) + target, arch, repo, srpm) sha_hash = sha.new() sha_hash.update(hash_string) return sha_hash.hexdigest() @@ -36,30 +36,36 @@ AJ_STATUS_QUEUED = 'queued' AJ_STATUS_WAITING = 'waiting' +AJ_STATUS_UPLOADING = 'uploading' AJ_STATUS_REPO_WAIT = 'repo_wait' AJ_STATUS_REPO_UNLOCK = 'repo_unlock' AJ_STATUS_RUNNING = 'running' AJ_STATUS_DOWNLOADING = 'downloading' AJ_STATUS_DONE = 'done' +AJ_FAILURE_NONE = '' +AJ_FAILURE_DOWNLOAD = 'download' +AJ_FAILURE_BUILDER = 'builder' +AJ_FAILURE_INTERNAL = 'internal' + class ArchJob: """ Tracks a single build instance for a single arch on a builder """ - def __init__(self, parent, target_dict, srpm_url): + def __init__(self, parent, target_dict, srpm_path): self._parent = parent self._builder = None self._repo = parent.repo() self._starttime = time.time() self._endtime = 0 self._id = _generate_uniqid(parent.uid, self._starttime, target_dict, - srpm_url) + srpm_path) self._status = AJ_STATUS_QUEUED + self._uploader = None self._builder_status = '' self._failure_noticed = False - self._download_failed = False - self._internal_failure = False + self._failure_type = AJ_FAILURE_NONE self._target_dict = target_dict - self._srpm_url = srpm_url + self._srpm_path = srpm_path self._result_files = {} self._die = False self._die_user_requested = False @@ -89,6 +95,9 @@ attrdict = self._to_dict() self._parent.bm.queue_archjob_status_update(self._id, attrdict) del attrdict + + if builder_status in ['killed', 'failed']: + self._failure_type = AJ_FAILURE_BUILDER def failure_noticed(self): return self._failure_noticed @@ -101,16 +110,8 @@ return True return False - def builder_failed(self): - if self._builder_status in ['killed', 'failed']: - return True - return False - - def download_failed(self): - return self._download_failed - - def internal_failure(self): - return self._internal_failure + def failure_type(self): + return self._failure_type def prepping(self): return self._prepping @@ -121,8 +122,8 @@ def target_dict(self): return self._target_dict - def srpm_url(self): - return self._srpm_url + def srpm_path(self): + return self._srpm_path def archjob_id(self): return self._id @@ -130,6 +131,9 @@ def builder(self): return self._builder + def parent(self): + return self._parent + def orphaned(self): return self._orphaned @@ -144,6 +148,12 @@ def unclaim(self, builder): builder.remove_suspend_listener(self) + if builder != self._builder: + return + + if self._uploader: + self._uploader.cancel() + self._uploader = None self._builder = None if not self._is_done_status(): self._orphaned = True @@ -192,13 +202,38 @@ self._set_status(AJ_STATUS_DONE) def _handle_builder_finished(self): + self._uploader = None self._set_status(AJ_STATUS_DOWNLOADING) self._builder.request_job_files(self._id) def _status_queued(self): pass + def _upload_srpm_cb(self, builder, result, msg, user_data=None): + """Callback from our controlling Builer object when it has uploaded the SRPM + to the remote builder.""" + if builder != self._builder: + return + self._uploader = None + if result == FileTransfer.FT_RESULT_FAILED: + srpm_path = user_data + print "%s (%s/%s): %s - SRPM upload failed for %s." % (self._parent.uid, + self._parent.package, self._target_dict['arch'], self._id, srpm_path) + # Unclaim the job and try for another builder + self.unclaim(self._builder) + def _status_waiting(self): + if self._builder_status == 'init': + # Ask our Builder object to send the SRPM to the remote builder + # (if Passive) or to notify the builder of the SRPM URL (if Active). + self._set_status(AJ_STATUS_UPLOADING) + self._uploader = self._builder.request_srpm_upload(self, + self._upload_srpm_cb, self._srpm_path, self._srpm_path) + + if self._builder_finished(): + self._handle_builder_finished() + + def _status_uploading(self): # 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. @@ -262,11 +297,11 @@ return if len(files.keys()) == 0: - self._download_failed = True + self._failure_type = AJ_FAILURE_DOWNLOAD else: for fname in files.keys(): if files[fname] == FileTransfer.FT_RESULT_FAILED: - self._download_failed = True + self._failure_type = AJ_FAILURE_DOWNLOAD self._result_files = files self._print_downloaded_files(self._result_files) @@ -278,7 +313,11 @@ pass def _handle_death(self, user_requested): - self._builder.request_kill_for_job(self._id) + if self._builder: + self._builder.request_kill_for_job(self._id) + if self._uploader: + self._uploader.cancel() + self._uploader = None if self._status == AJ_STATUS_REPO_WAIT: self._repo.cancel_unlock_request(self) self._set_done() @@ -306,7 +345,7 @@ print "%s (%s/%s): %s - internal archjob inconsistency. Unknown status '%s'." % (self._parent.uid, self._parent.package, self._target_dict['arch'], self._id, self._status) self._set_done() - self._internal_failure = True + self._failure_type = AJ_FAILURE_INTERNAL return # Do the actual work for this status Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- Builder.py 20 May 2006 05:10:08 -0000 1.43 +++ Builder.py 29 May 2006 20:26:38 -0000 1.44 @@ -20,12 +20,13 @@ import os import urllib import threading +import shutil from plague import Commands from plague import XMLRPCServerProxy from plague import FileDownloader +from plague import FileUploader from plague import FileTransfer import OpenSSL -import ArchJob import EmailUtils from plague import DebugUtils @@ -314,12 +315,6 @@ self._free_slots = cmd.free_slots() self._num_slots = cmd.max_slots() self._lock.release() - elif isinstance(cmd, Commands.PlgCommandTargets): - self._lock.acquire() - self._target_list = cmd.targets() - self._lock.release() - elif isinstance(cmd, Commands.PlgCommandNewJobAck): - self._handle_new_job_ack(cmd) elif isinstance(cmd, Commands.PlgCommandBuildingJobs): status_reqs = self._handle_building_jobs(cmd) # Add any additional status requests onto our pending command queue @@ -329,6 +324,8 @@ self._lock.release() elif isinstance(cmd, Commands.PlgCommandJobStatusAck): self._handle_job_status_ack(cmd) + elif isinstance(cmd, Commands.PlgCommandNewJobAck): + self._handle_new_job_ack(cmd) else: handled = False return handled @@ -390,7 +387,7 @@ print "PassiveBuilder(%s) Error in request(): '%s'" % (self._address, exc) self.done = True - def close(self): + def cancel(self): try: self._server.close() except: @@ -413,6 +410,7 @@ Builder.__init__(self, manager, cfg, address, weight, TYPE_PASSIVE) # Builder will get pinged immediately since self._last_contact == 0 self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL + self._upload_url = None self._certs = None if self._server_cfg.get_bool("Builders", "use_ssl"): @@ -421,6 +419,33 @@ self._certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") self._certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + def _upload_cb(self, result, cb_data, msg): + """Call the archjob's upload callback with the upload result.""" + (archjob_id, srpm_path, upload_cb, user_data) = cb_data + + # Notify the builder that the SRPM is uploaded + if result == FileTransfer.FT_RESULT_SUCCESS: + url = "file:///%s" % os.path.basename(srpm_path) + cmd = Commands.PlgCommandJobSRPM(archjob_id, url, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + + # Call the archjob's upload callback + upload_cb(self, result, msg, user_data) + + def request_srpm_upload(self, archjob, upload_cb, user_data, srpm_path): + """Called by the archjob to request an upload of the SRPM to the builder.""" + archjob_id = archjob.archjob_id() + + # Start uploading the job to the builder + data = [("archjob_id", archjob_id)] + uploader = FileUploader.FileUploader(self._upload_url, [srpm_path], 'filedata', data, + self._certs) + uploader.set_callback(self._upload_cb, (archjob_id, srpm_path, upload_cb, user_data)) + uploader.start() + return uploader + def _download_cb(self, result, (archjob, urls), msg): """Notify archjob of the result of its download request.""" if result == FileTransfer.FT_RESULT_FAILED: @@ -526,8 +551,8 @@ # right now. Think server restart here. for item in cmd.jobs(): (uniqid, status) = cmd.get_job(item) - cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) - self._cmd_queue.append(cmd) + new_cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) + self._cmd_queue.append(new_cmd) handled = True # Let the superclass handle what's left @@ -542,7 +567,9 @@ elif isinstance(cmd, Commands.PlgCommandTargets): if not self._target_list: self._target_list = cmd.targets() - + self._upload_url = cmd.upload_url() + handled = True + if not handled: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) @@ -610,6 +637,44 @@ def __init__(self, manager, cfg, address, weight): Builder.__init__(self, manager, cfg, address, weight, TYPE_ACTIVE) + def _request_srpm_upload(self, archjob, upload_cb, user_data, srpm_path): + """Called by the archjob to request that an SRPM be made available to the builder.""" + # Copy the SRPM to the correct upload location + http_dir = self._manager.http_dir() + srpm_dest_dir = archjob.parent().make_stage_dir(http_dir, delete=False) + srpm_dest = os.path.join(srpm_dest_dir, os.path.basename(srpm_path)) + + err_msg = "Failed" + result = FileTransfer.FT_RESULT_FAILED + if srpm_dest != srpm_path: + # Copy file if it's not already in the HTTP server's download dir + try: + shutil.copyfile(srpm_path, srpm_dest) + err_msg = "Success" + result = FileTransfer.FT_RESULT_SUCCESS + except IOError, exc: + err_msg = str(exc) + else: + # Make sure it's where it's supposed to be + if os.path.exists(srpm_dest): + err_msg = "Success" + result = FileTransfer.FT_RESULT_SUCCESS + else: + err_msg = "Candidate SRPM file %s didn't exist." % srpm_dest + + if result == FileTransfer.FT_RESULT_SUCCESS: + # Construct the download URL + archjob_id = archjob.archjob_id() + url = self._manager.get_http_url_base() + srpm_dest[len(http_dir):] + cmd = Commands.PlgCommandJobSRPM(archjob_id, url, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + + # Call the archjob's upload callback + upload_cb(self, result, err_msg, user_data) + return None + def _handle_job_files_ack(self, cmd): (archjob, urls) = self._decompose_job_files_ack(cmd) if not archjob: Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- BuilderManager.py 16 May 2006 15:49:56 -0000 1.26 +++ BuilderManager.py 29 May 2006 20:26:38 -0000 1.27 @@ -115,7 +115,7 @@ Can't block the main BuilderManager object by sitting in serve_forever(). """ - def __init__(self, cfg, bm): + def __init__(self, bm, cfg, use_ssl, certs): self._cfg = cfg self._bm = bm self._stopped = False @@ -125,11 +125,7 @@ hostname = cfg.get_str("General", "hostname") port = cfg.get_int("Active Builders", "xmlrpc_server_port") try: - if cfg.get_bool("Builders", "use_ssl") == True: - certs = {} - certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") - certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") + if use_ssl: self._server = AuthedSSLBuilderServer((hostname, port), certs, self._bm) else: self._server = AuthedBuilderServer((hostname, port), self._bm) @@ -168,30 +164,43 @@ self._queue_lock = threading.Lock() self._queue = [] + self._certs = None + self._use_ssl = cfg.get_bool("Builders", "use_ssl") + if self._use_ssl: + self._certs = {} + self._certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") + self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") + self._certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") + self._xmlrpc_server = None if any_active: # Builder XMLRPC server # Only start it when there are active-type builders listed # in the config file - self._xmlrpc_server = BuilderServerThread(cfg, self) + self._xmlrpc_server = BuilderServerThread(self, cfg, self._use_ssl, self._certs) self._xmlrpc_server.start() # Builder HTTP fileserver - hostname = cfg.get_str("General", "hostname") - port = cfg.get_int("Active Builders", "file_server_port") - http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir") - certs = {} - if cfg.get_bool("Builders", "use_ssl"): - certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") - certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._fileserver = HTTPServer.PlgHTTPServerManager((hostname, port), http_dir, certs) + self._hostname = cfg.get_str("General", "hostname") + self._http_port = cfg.get_int("Active Builders", "file_server_port") + self._http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir") + self._fileserver = HTTPServer.PlgHTTPServerManager((self._hostname, self._http_port), self._http_dir, self._certs) if any_active: self._fileserver.set_POST_handler('/upload', self.upload_callback) self._fileserver.start() self._print_builders() + def get_http_url_base(self): + """Return the base HTTP server URL, taking port and SSL into account.""" + method = "http" + if self._use_ssl: + method = "https" + return "%s://%s:%d/" % (method, self._hostname, self._http_port) + + def http_dir(self): + return self._http_dir + def upload_callback(self, request_handler, fs): # Ensure we know this builder ip = request_handler.client_address[0] Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- PackageJob.py 14 May 2006 05:43:07 -0000 1.50 +++ PackageJob.py 29 May 2006 20:26:38 -0000 1.51 @@ -44,9 +44,11 @@ if DEBUG: print stuff -class PrepError(exceptions.Exception): pass +class PrepError(exceptions.Exception): + pass -class DepError(exceptions.Exception): pass +class DepError(exceptions.Exception): + pass class BuildError(exceptions.Exception): def __init__(self, msg, arch): @@ -164,8 +166,7 @@ self._killer = None self._die = False - self.http_dir = os.path.join(self._server_cfg.get_str("Directories", - "server_work_dir"), "srpm_http_dir") + self._base_work_dir = self._server_cfg.get_str("Directories", "server_work_dir") first_stage = 'initialize' if self.use_cvs == False: @@ -210,7 +211,7 @@ def get_uid(self): return self.uid - def arch_handling(self, hdr): + def arch_handling(self, ba, exclusive, exclude): # Grab additional allowed arches for this package, using # wildcard matching if needed addl_arches = self._target_cfg.addl_arches_for_pkg(self.name) @@ -230,13 +231,6 @@ if master_addl_arch not in base_arches: addl_arches.remove(arch) - # Grab arches the SRPM does/does not want to build for. If the package - # does use one or more of these tags in the specfile, hdr[''] will - # return an empty list, and we'll use defaults instead - ba = hdr['buildarchs'] - exclusive = hdr['exclusivearch'] - exclude = hdr['excludearch'] - build_arches = {} # If the SRPM is noarch, there's nothing left to do, since @@ -392,14 +386,14 @@ if not srpmpath: msg = "Error: could not find srpm for %s - output was:\n\n%s" % (self._source, o) raise PrepError(msg) - + self._srpm_path = srpmpath self._set_cur_stage('prep') return False def _stage_prep(self): - # In SRPM-only mode, cvs_tag is path to the SRPM to build + # In SRPM-only mode, 'source' is path to the SRPM to build if self.use_cvs == False: self._srpm_path = self._source @@ -417,9 +411,24 @@ self.epoch = '0' self.ver = hdr['version'] self.release = hdr['release'] - (self._archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr) - del hdr - del ts + + buildarchs = hdr['buildarchs'] + exclusive = hdr['exclusivearch'] + exclude = hdr['excludearch'] + del hdr, ts + + # copy the SRPM to our work directory + self._result_dir = self.make_stage_dir(self._base_work_dir) + dest = os.path.join(self._result_dir, os.path.basename(self._srpm_path)) + shutil.copy(self._srpm_path, dest) + self._srpm_path = dest + + # Remove CVS checkout dirs + if self.use_cvs == True: + shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + + # Find out what arches we're going to be building on + (self._archjobs, pkg_arches, allowed_arches) = self.arch_handling(buildarchs, exclusive, exclude) if len(self._archjobs) == 0: msg = """Package %s does not build on any architectures this build system supports. @@ -510,7 +519,8 @@ raise DepError(str(exc)) for dep in srpm.requiresList(): - if dep.startswith("rpmlib("): continue + if dep.startswith("rpmlib("): + continue try: pkg = base.returnPackageByDep(dep) except repomd.mdErrors.PackageSackError, exc: @@ -547,8 +557,7 @@ # Create the depsolve metadata cache dir if not self._depsolve_dir: - server_work_dir = self._server_cfg.get_str("Directories", "server_work_dir") - self._depsolve_dir = os.path.join(server_work_dir, "depsolve", "%s-%s" % (self.uid, self.name)) + self._depsolve_dir = os.path.join(self._base_work_dir, "depsolve", "%s-%s" % (self.uid, self.name)) if os.path.exists(self._depsolve_dir): shutil.rmtree(self._depsolve_dir, ignore_errors=True) os.makedirs(self._depsolve_dir) @@ -605,60 +614,43 @@ def _prepare_and_wait(self): # Make some directories we need - work_dir = self._server_cfg.get_str("Directories", "server_work_dir") - self._result_dir = self._make_stage_dir(work_dir) for arch in self._archjobs.keys(): thisdir = os.path.join(self._result_dir, arch) if not os.path.exists(thisdir): os.makedirs(thisdir) - # Copy SRPM to where the builder can access it - http_pkg_path = self._make_stage_dir(self.http_dir) - self._srpm_http_path = os.path.join(http_pkg_path, os.path.basename(self._srpm_path)) - shutil.copy(self._srpm_path, self._srpm_http_path) - self._srpm_path = None - - # Remove CVS checkout and make_srpm dirs - if self.use_cvs == True: - shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + self._set_cur_stage('waiting') # Queue up archjobs - self._set_cur_stage('waiting') - self._create_arch_jobs() + self._archjobs_lock.acquire() + for arch in self._archjobs.keys(): + # Create and queue a single archjob for one architecture + target_dict = self._target_cfg.target_dict(arch) + archjob = ArchJob.ArchJob(self, target_dict, self._srpm_path) + self._archjobs[arch] = archjob + self.bm.builder_manager.request_arch_job(archjob) + self._archjobs_lock.release() + return False def _stage_depsolve_wait(self): pass - def _make_stage_dir(self, rootdir): + def make_stage_dir(self, rootdir, delete=True): + """Given a root, creates a unique job-specific holding directory for + job files.""" # 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_str, pkgsubdir) - if os.path.exists(stage_dir): + if os.path.exists(stage_dir) and delete: shutil.rmtree(stage_dir, ignore_errors=True) - os.makedirs(stage_dir) + try: + os.makedirs(stage_dir) + except OSError, exc: + pass return stage_dir - def _create_arch_jobs(self): - self._archjobs_lock.acquire() - for arch in self._archjobs.keys(): - # Construct the SRPM URL - srpm_http_base = self._srpm_http_path[len(self.http_dir):] - method = "http" - if self._server_cfg.get_bool("Builders", "use_ssl") == True: - method = "https" - hostname = self._server_cfg.get_str("General", "hostname") - port = self._server_cfg.get_int("Active Builders", "file_server_port") - srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base) - - # Create and queue the archjob - target_dict = self._target_cfg.target_dict(arch) - archjob = ArchJob.ArchJob(self, target_dict, srpm_url) - self._archjobs[arch] = archjob - self.bm.builder_manager.request_arch_job(archjob) - self._archjobs_lock.release() - def archjob_started_cb(self, archjob): # If this is the first archjob, that means we are now building. # So we start up the second PackageJobController thread. @@ -725,7 +717,8 @@ self._event.wait() self._event.clear() except PrepError, exc: - if self.use_cvs == True: + # Clean up CVS checkout directory if it exists + if self.use_cvs == True and os.path.exists(self.checkout_tmpdir): shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) msg = str(exc) subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str) @@ -766,7 +759,8 @@ continue completed_jobs = completed_jobs + 1 - if job.builder_failed() or job.download_failed() or job.internal_failure(): + failure_type = job.failure_type() + if failure_type != ArchJob.AJ_FAILURE_NONE: failed_jobs = failed_jobs + 1 # Normal jobs will just stop when a single archjob fails, but @@ -777,12 +771,16 @@ job.set_failure_noticed() jobarch = job.arch() msg = "Job failed." - if job.builder_failed(): + if failure_type == ArchJob.AJ_FAILURE_BUILDER: msg = "Job failed on arch %s\n" % jobarch - elif job.download_failed(): + elif failure_type == ArchJob.AJ_FAILURE_DOWNLOAD: + addr = None + builder = job.builder() + if builder: + addr = job.builder().address() msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \ - "Please contact the build system administrator." % (jobarch, job.builder().address()) - elif job.internal_failure(): + "Please contact the build system administrator." % (jobarch, addr) + elif failure_type == ArchJob.AJ_FAILURE_INTERNAL: msg = "Job failed on arch %s: there was an internal build system failure.\n " \ "Please contact the build system administrator." % jobarch self._archjobs_lock.release() @@ -901,13 +899,11 @@ def _get_log_tail(self, arch): """ 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) - work_dir = self._server_cfg.get_str("Directories", "server_work_dir") - log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch) + log_dir = os.path.join(self._result_dir, arch) + build_log = os.path.join(log_dir, "build.log") + root_log = os.path.join(log_dir, "root.log") + job_log = os.path.join(log_dir, "job.log") final_log = None - build_log = "%s/%s" % (log_dir, "build.log") - root_log = "%s/%s" % (log_dir, "root.log") - job_log = "%s/%s" % (log_dir, "job.log") # Try the most relevant log file first if os.path.exists(build_log) and os.path.getsize(build_log) > 0: From fedora-extras-commits at redhat.com Mon May 29 20:26:34 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:26:34 -0700 Subject: extras-buildsys ChangeLog,1.202,1.203 Message-ID: <200605292027.k4TKR4lq000953@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv877 Modified Files: ChangeLog Log Message: 2006-05-29 Dan Williams * Make most everything work now; both Passive and Active builders will download/upload the SRPM from the server. The SRPM's URL is no longer passed to the builder in the initial job request, but comes along later once the SPRM is actually available to the builder (which might be after an upload to the builder in the case of Passive builders). * Pylint cleanups * Clean up logging on builders by consolidating newline handling is one place * Use the Targets command to pass back to the server any upload URL the builder might have (for passive builders) Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- ChangeLog 23 May 2006 15:06:14 -0000 1.202 +++ ChangeLog 29 May 2006 20:26:31 -0000 1.203 @@ -1,3 +1,15 @@ +2006-05-29 Dan Williams + + * Make most everything work now; both Passive and Active builders will + download/upload the SRPM from the server. The SRPM's URL is no longer + passed to the builder in the initial job request, but comes along later + once the SPRM is actually available to the builder (which might be after + an upload to the builder in the case of Passive builders). + * Pylint cleanups + * Clean up logging on builders by consolidating newline handling is one place + * Use the Targets command to pass back to the server any upload URL the builder + might have (for passive builders) + 2006-05-23 Dan Williams * common/Commands.py From fedora-extras-commits at redhat.com Mon May 29 20:26:39 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:26:39 -0700 Subject: extras-buildsys/builder Builder.py, 1.15, 1.16 BuilderMock.py, 1.9, 1.10 Message-ID: <200605292027.k4TKR94F000956@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv877/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-29 Dan Williams * Make most everything work now; both Passive and Active builders will download/upload the SRPM from the server. The SRPM's URL is no longer passed to the builder in the initial job request, but comes along later once the SPRM is actually available to the builder (which might be after an upload to the builder in the case of Passive builders). * Pylint cleanups * Clean up logging on builders by consolidating newline handling is one place * Use the Targets command to pass back to the server any upload URL the builder might have (for passive builders) 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 20 May 2006 05:10:02 -0000 1.15 +++ Builder.py 29 May 2006 20:26:32 -0000 1.16 @@ -94,6 +94,7 @@ self._server_ip = None self._get_server_ip() + self._upload_url = "" self._certs = None self._use_ssl = cfg.get_bool("SSL", "use_ssl") if self._use_ssl: @@ -218,7 +219,7 @@ # always send a target list next_seq = self._seq_gen.next() - cmd = Commands.PlgCommandTargets(self.supported_targets(), next_seq) + cmd = Commands.PlgCommandTargets(self.supported_targets(), self._upload_url, next_seq) defcmds.append(cmd) # always send free & max slots @@ -250,6 +251,8 @@ reply = self._handle_job_files_request(cmd) if reply: self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandJobSRPM): + self._handle_job_srpm_command(cmd) def _process_server_commands(self, cmd_list): """Process the server's command stream.""" @@ -281,7 +284,7 @@ def _start_new_job(self, cmd): target_dict = cmd.target_dict() - srpm_url = cmd.srpm_url() + jobname = cmd.job_name() uniqid = cmd.archjob_id() target_str = Config.make_target_string(target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo']) @@ -289,29 +292,27 @@ (free_slots, max_slots) = self.slots() if free_slots <= 0: msg = "Error: Tried to build '%s' on target %s when already building" \ - " maximum (%d) jobs" % (srpm_url, target_str, max_slots) + " maximum (%d) jobs" % (jobname, target_str, max_slots) self._log(msg) return (-1, msg) target_cfg = self._get_target_cfg(target_dict) if not target_cfg: - msg = "Error: Tried to build '%s' on target %s which isn't supported" % (srpm_url, target_str) + msg = "Error: Tried to build '%s' on target %s which isn't supported" % (jobname, target_str) self._log(msg) return (-1, msg) - archjob = None try: - archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], srpm_url, uniqid) + archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], jobname, uniqid) self._all_jobs[uniqid] = archjob self._building_jobs_lock.acquire() self._building_jobs.append(archjob) self._building_jobs_lock.release() - filename = os.path.basename(srpm_url) - msg = "%s: started %s on %s arch %s at time %d" % (uniqid, filename, + msg = "%s: started %s on %s arch %s at time %d" % (uniqid, jobname, target_str, target_dict['arch'], archjob.starttime()) archjob.start() except (OSError, TypeError), exc: - msg = "Failed request for %s on %s: '%s'" % (srpm_url, + msg = "Failed request for %s on %s: '%s'" % (jobname, target_str, exc) self._log(msg) @@ -355,6 +356,14 @@ except KeyError: pass + def _handle_job_srpm_command(self, cmd): + try: + uniqid = cmd.archjob_id() + archjob = self._all_jobs[uniqid] + archjob.notify_srpm_url(cmd.srpm_url()) + except KeyError: + pass + class PassiveBuilder(Builder, threading.Thread): """ @@ -382,9 +391,7 @@ """Startup HTTP and XML-RPC servers which the build server uses to talk to us.""" hostname = get_hostname(self._cfg, bind_all=True) - xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") - - self._log("Binding to address '%s:%d'\n" % (hostname, xmlrpc_port)) + external_hostname = get_hostname(self._cfg) try: self._http_server = HTTPServer.PlgHTTPServerManager((hostname, self._fileserver_port), @@ -392,8 +399,15 @@ except socket.error, exc: raise socket.error(exc[0], "Couldn't create server for %s:%s: '%s'" % (hostname, self._fileserver_port, exc[1])) - self._http_server.set_POST_handler('/upload', self.upload_callback) + # Set up upload handlers and addresses + upload_loc = "/upload" + host = self._prefix_url(external_hostname) + self._http_server.set_POST_handler(upload_loc, self.upload_callback) + self._upload_url = "%s:%d%s" % (host, self._fileserver_port, upload_loc) + + xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") + self._log("Binding to address '%s:%d'\n" % (external_hostname, xmlrpc_port)) try: if self._use_ssl: self._xmlrpc_server = AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) @@ -428,8 +442,8 @@ if item.name == 'archjob_id': try: jobid = urllib.unquote(str(item.value)) - # Ensure archjob_id is only as long as a sha1 hash - if len(jobid) is not 40: + # ensure we know about this job already + if not jobid in self._all_jobs.keys(): jobid = None except ValueError: pass @@ -524,6 +538,7 @@ msg = "Failed" for fpath in files: if fpath.startswith(work_dir): + result = FileTransfer.FT_RESULT_SUCCESS continue last_part = fpath[len(work_dir):] new_path = os.path.join(work_dir, last_part) @@ -531,7 +546,7 @@ shutil.move(fpath, new_path) result = FileTransfer.FT_RESULT_SUCCESS except IOError, exc: - msg = str(exc) + msg = "Failed moving %s to %s: '%s'" % (fpath, new_path, str(exc)) break if result == FileTransfer.FT_RESULT_SUCCESS: @@ -569,6 +584,7 @@ self.done = False self.failed = False self.response = None + self.err_msg = '' threading.Thread.__init__(self) def run(self): @@ -578,9 +594,10 @@ self.response = self._server.request(cmd_stream) except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError), exc: + self.err_msg = "Builder Error (%s) in request(): network problem '%s'" % (self._address, exc) self.failed = True except xmlrpclib.Fault, exc: - print "Builder Error (%s) in request(): server replied '%s'" % (self._address, exc) + self.err_msg = "Builder Error (%s) in request(): server replied '%s'" % (self._address, exc) self.failed = True self.done = True @@ -605,6 +622,7 @@ def download_srpm(self, archjob_id, url, target_dir, dl_callback, cb_data=None): """Download an SRPM from the build server. Only used by BuilderMock objects.""" + self._log("%s: Starting download of %s.\n" % (archjob_id, url)) downloader = FileDownloader.FileDownloader(url, target_dir, ['.src.rpm'], self._certs) downloader.set_callback(dl_callback, url) @@ -655,9 +673,12 @@ break time.sleep(0.5) - if req.done and not req.failed: - self._queued_cmds = [] - return req.response + if req.done: + if not req.failed: + self._queued_cmds = [] + return req.response + else: + self._log(req.err_msg) return None def run(self): Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BuilderMock.py 20 May 2006 05:07:56 -0000 1.9 +++ BuilderMock.py 29 May 2006 20:26:32 -0000 1.10 @@ -40,9 +40,10 @@ """puts things together for an arch - baseclass for handling builds for other arches""" - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self._controller = controller self._buildarch = buildarch + self._jobname = jobname self._starttime = time.time() self._endtime = 0 self._mockstarttime = 0 @@ -55,8 +56,8 @@ self._childpid = 0 self._target_cfg = target_cfg self._builder_cfg = target_cfg.parent_cfg() - self._srpm_url = srpm_url - self._srpm_tries = 0 + self._srpm_path = None + self._srpm_wait_start = 0 self._log_fd = None self._mock_config = None self._done_status = '' @@ -100,7 +101,7 @@ def _handle_death(self): self._die = False self._done_status = 'killed' - self._log("Killing build process...\n") + self._log("Killing build process...") if self._downloader: self._downloader.cancel() @@ -116,30 +117,32 @@ # Kill all members of the child's process group os.kill(child_pgroup, 9) except OSError, exc: - self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, exc)) + self._log("ERROR: Couldn't kill child process group %d: %s" % (child_pgroup, exc)) else: # Ensure child process is reaped - self._log("Waiting for mock process %d to exit...\n" % self._childpid) + self._log("Waiting for mock process %d to exit..." % self._childpid) try: (pid, status) = os.waitpid(self._childpid, 0) except OSError: pass - self._log("Mock process %d exited.\n" % self._childpid) + self._log("Mock process %d exited." % self._childpid) self._childpid = 0 # Start cleanup up the job self._start_cleanup() - self._log("Killed.\n"); + self._log("Killed."); - def _log(self, msg): + def _log(self, msg, newline=True): if msg and self._log_fd: + if newline: + msg = msg + "\n" self._log_fd.write(msg) self._log_fd.flush() os.fsync(self._log_fd.fileno()) if self._builder_cfg.get_bool("General", "debug"): - s = "%s: " % self._uniqid - sys.stdout.write(s + msg) + logtext = "%s: %s" % (self._uniqid, msg) + sys.stdout.write(logtext) sys.stdout.flush() def _copy_mock_output_to_log(self): @@ -155,7 +158,7 @@ self._mock_log = None def _start_build(self): - self._log("Starting step 'building' with command:\n") + self._log("Starting step 'building' with command:") if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) @@ -177,7 +180,7 @@ args.append("--statedir=%s" % self._state_dir) args.append("--uniqueext=%s" % self._uniqid) args.append(self._srpm_path) - self._log(" %s\n" % string.join(args)) + self._log(" %s" % string.join(args)) self._mock_log = os.path.join(self._result_dir, "mock-output.log") self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, self._mock_log, self._mock_log) @@ -185,7 +188,7 @@ self._status = 'prepping' def _start_cleanup(self): - self._log("Cleaning up the buildroot...\n") + self._log("Cleaning up the buildroot...") args = [] builder_cmd = os.path.abspath(self._builder_cfg.get_str("General", "builder_cmd")) @@ -201,7 +204,7 @@ args.append("-r") args.append(self._buildroot) - self._log(" %s\n" % string.join(args)) + self._log(" %s" % string.join(args)) self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None) self._status = 'cleanup' @@ -274,32 +277,62 @@ f.close() return contents - def dl_callback(self, dl_status, cb_data, err_msg=None): - if not self.is_done_status(): - url = cb_data - if dl_status == FileTransfer.FT_RESULT_SUCCESS: - self._status = 'downloaded' - self._log("Retrieved %s.\n" % url) - elif dl_status == FileTransfer.FT_RESULT_FAILED: - self._done_status = 'failed' - self._log("ERROR: Failed to retrieve '%s' because: %s\n" % (url, err_msg)) - self._post_cleanup() - elif dl_status == FileTransfer.FT_RESULT_CANCELED: - # Ignore cancelation - pass + def _srpm_download_cb(self, dl_status, cb_data, err_msg=None): + # We might have been cancelled + if self.is_done_status(): + return + + url = cb_data + if dl_status == FileTransfer.FT_RESULT_SUCCESS: + self._status = 'downloaded' + self._log("Retrieved %s." % url) + elif dl_status == FileTransfer.FT_RESULT_FAILED: + self._log("ERROR: Failed to retrieve '%s' because: %s" % (url, err_msg)) + self._post_cleanup('failed') + elif dl_status == FileTransfer.FT_RESULT_CANCELED: + # Ignore cancelation + pass self._downloader = None def _status_init(self): - self._log("Starting download of %s.\n" % self._srpm_url) - self._status = 'downloading' + if not self._srpm_wait_start: + self._srpm_wait_start = time.time() + + # Kill a job that's waiting for its SRPM URL + # after 30 minutes because it's likely orphaned + if time.time() > (self._srpm_wait_start + (60 * 30)): + self._log("Job waited too long waiting for its SRPM URL. Killing it...") + self._post_cleanup('failed') + + def notify_srpm_url(self, srpm_url): + """Called by our controlling Builder object to tell us that the server + has sent our SRPM URL.""" + if self._status != "init": + return + + err_msg = None try: - target_dir = os.path.dirname(self._srpm_path) - self._downloader = self._controller.download_srpm(self._uniqid, - self._srpm_url, target_dir, self.dl_callback, self._srpm_url) + # Validate the SRPM URL and the SRPM's filename + srpm_filename = FileDownloader.get_base_filename_from_url(srpm_url, ['.src.rpm']) + self._srpm_path = os.path.join(self._source_dir, srpm_filename) + success = True except FileDownloader.FileNameException, exc: - self._done_status = 'failed' - self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (exc, self._srpm_url)) - self._post_cleanup() + err_msg = "ERROR: SRPM file name was invalid. Message: '%s'" % exc + + if not err_msg: + # Ask our controlling builder to download it (if an Active builder) + # or to move it for us (if a Passive builder) + self._status = 'downloading' + try: + target_dir = os.path.dirname(self._srpm_path) + self._downloader = self._controller.download_srpm(self._uniqid, + srpm_url, target_dir, self._srpm_download_cb, srpm_url) + except FileDownloader.FileNameException, exc: + err_msg = "ERROR: Failed to begin SRPM download. Error: '%s' URL: %s" % (exc, srpm_url) + + if err_msg: + self._log(err_msg) + self._post_cleanup('failed') def _status_downloading(self): pass @@ -309,18 +342,18 @@ # server tells us the repo is unlocked. if not self._repo_locked: self._start_build() - else: - # Only show this message once - if self._repo_wait_start <= 0: - self._log("Waiting for repository to unlock before starting the build...\n") - self._repo_wait_start = time.time() - - # Kill a job in 'downloaded' state after 30 minutes because - # it's likely orphaned - if time.time() > (self._repo_wait_start + (60 * 30)): - self._done_status = 'failed' - self._log("Job waited too long for repo to unlock. Killing it...\n") - self._post_cleanup() + return + + # Only show this message once + if self._repo_wait_start <= 0: + self._log("Waiting for repository to unlock before starting the build...") + self._repo_wait_start = time.time() + + # Kill a job in 'downloaded' state after 30 minutes because + # it's likely orphaned + if time.time() > (self._repo_wait_start + (60 * 30)): + self._log("Job waited too long for repo to unlock. Killing it...") + self._post_cleanup('failed') def _watch_mock(self, good_exit, bad_exit): (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG) @@ -349,9 +382,8 @@ # something is wrong if mock takes more than 15s to write the status file if time.time() > self._mockstarttime + 15: self._mockstarttime = 0 - self._done_status = 'failed' - self._log("ERROR: Timed out waiting for the mock status file! %s\n" % mockstatusfile) - self._post_cleanup() + self._log("ERROR: Timed out waiting for the mock status file! %s" % mockstatusfile) + self._post_cleanup('failed') else: if not self._mock_config and self._mock_is_prepping(): self._mock_config = self._read_mock_config() @@ -364,8 +396,8 @@ def _status_cleanup(self): (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG) if aux_pid: - self._childpid = 0 # Mock exited + self._childpid = 0 if self._mock_config: if self._mock_config.has_key('rootdir'): mock_root_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../")) @@ -384,7 +416,7 @@ # Ensure child process is reaped if it's still around if self._childpid: try: - self._log("Waiting for child process %d to exit.\n" % self._childpid) + self._log("Waiting for child process %d to exit." % self._childpid) (pid, status) = os.waitpid(self._childpid, 0) except OSError: self._childpid = 0 @@ -395,21 +427,25 @@ self._post_cleanup() - def _post_cleanup(self): + def _post_cleanup(self, done_status=None): + if done_status: + self._done_status = done_status + + # If we're killed, we don't care about uploading logs to the build server if self._done_status is not 'killed': self._status = "uploading" self._files = self._find_files() self._uploader = self._controller.upload_files(self._uniqid, self._files, - self.ul_callback, None) + self._upload_cb, None) else: self._status = self._done_status - def ul_callback(self, status, cb_data, msg): + def _upload_cb(self, status, cb_data, msg): if status == FileTransfer.FT_RESULT_SUCCESS: pass elif status == FileTransfer.FT_RESULT_FAILED: self._done_status = 'failed' - self._log("Job failed because files could not be uploaded: %s\n" % msg) + self._log("Job failed because files could not be uploaded: %s" % msg) self._status = self._done_status self._uploader = None @@ -417,14 +453,14 @@ pass def _job_done(self): - self._log("-----------------------\n") + self._log("-----------------------") if self._status == 'done': - self._log("Job completed successfully.\n") + self._log("Job completed successfully.") elif self._status == 'failed': - self._log("Job failed due to build errors! Please see build logs.\n") + self._log("Job failed due to build errors! Please see build logs.") elif self._status == 'killed': - self._log("Job failed because it was killed.\n") - self._log("\n\n") + self._log("Job failed because it was killed.") + self._log("\n") if self._log_fd: self._log_fd.close() @@ -433,21 +469,12 @@ def run(self): # Print out a nice message at the start of the job target_str = Config.make_target_string_from_dict(self._target_cfg.target_dict()) - time_str = time.asctime(time.localtime(self._starttime)) - self._log("""Starting job: - Time: %s - Target: %s - UID: %s - Architecture: %s - SRPM: %s\n\n""" % (time_str, target_str, self._uniqid, self._buildarch, self._srpm_url)) - - try: - srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm']) - self._srpm_path = os.path.join(self._source_dir, srpm_filename) - except FileDownloader.FileNameException, exc: - self._done_status = 'failed' - self._log("ERROR: SRPM file name was invalid. Message: '%s'\n" % exc) - self._post_cleanup() + self._log("Starting job:") + self._log(" Name: %s" % self._jobname) + self._log(" UID: %s" % self._uniqid) + self._log(" Arch: %s" % self._buildarch) + self._log(" Time: %s" % time.asctime(time.localtime(self._starttime))) + self._log(" Target: %s" % target_str) # Main build job work loop while not self.is_done_status(): @@ -458,9 +485,8 @@ try: func = getattr(self, "_status_%s" % self._status) except AttributeError: - self._done_status = 'failed' - self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'.\n" % self._status) - self._post_cleanup() + self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'." % self._status) + self._post_cleanup('failed') else: func() time.sleep(3) @@ -476,8 +502,8 @@ files_in_dir = os.listdir(self._result_dir) file_list = [] self._log("\n") - self._log("Output File List:\n") - self._log("-----------------\n") + self._log("Output File List:") + self._log("-----------------") log_files = [] rpms = [] # sort into logs first, rpms later @@ -493,10 +519,10 @@ i = 1 num_files = len(file_list) for fpath in file_list: - self._log(" File (%d of %d): %s\n" % (i, num_files, + self._log(" File (%d of %d): %s" % (i, num_files, os.path.basename(fpath))) i = i + 1 - self._log("-----------------\n") + self._log("-----------------") return file_list def status(self): @@ -520,34 +546,34 @@ class InvalidTargetError(exceptions.Exception): pass class i386Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '/usr/bin/setarch i686' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class x86_64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class PPCArch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '/usr/bin/setarch ppc32' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class PPC64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class SparcArch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '/usr/bin/sparc32' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class Sparc64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '/usr/bin/sparc64' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) BuilderClassDict = { From fedora-extras-commits at redhat.com Mon May 29 20:26:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:26:40 -0700 Subject: extras-buildsys/common Commands.py,1.9,1.10 Message-ID: <200605292027.k4TKRAGo000960@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv877/common Modified Files: Commands.py Log Message: 2006-05-29 Dan Williams * Make most everything work now; both Passive and Active builders will download/upload the SRPM from the server. The SRPM's URL is no longer passed to the builder in the initial job request, but comes along later once the SPRM is actually available to the builder (which might be after an upload to the builder in the case of Passive builders). * Pylint cleanups * Clean up logging on builders by consolidating newline handling is one place * Use the Targets command to pass back to the server any upload URL the builder might have (for passive builders) Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Commands.py 23 May 2006 15:06:14 -0000 1.9 +++ Commands.py 29 May 2006 20:26:37 -0000 1.10 @@ -19,7 +19,7 @@ import threading - +import os CMD_NAME_ERROR = "Error" @@ -290,15 +290,17 @@ class PlgCommandTargets(PlgCommand): - def __init__(self, targets, seq=0): + def __init__(self, targets, upload_url, seq=0): PlgCommand.__init__(self, CMD_NAME_TARGETS, seq) self._targets = targets + self._upload_url = upload_url def _deserialize(args): try: targets = args['targets'] - except (KeyError, TypeError): - raise ValueError("No 'targets' argument found.") + upload_url = args['upload_url'] + except (KeyError, TypeError), exc: + raise ValueError("No '%s' argument found." % exc) # Sanity checking on targets argument if type(targets) != type([]): @@ -313,62 +315,63 @@ except KeyError, exc: raise ValueError("Required item '%s' not found in a target." % exc) - return PlgCommandTargets(targets) + return PlgCommandTargets(targets, upload_url) _deserialize = staticmethod(_deserialize) def serialize(self): args = {} args['targets'] = self._targets + args['upload_url'] = self._upload_url return PlgCommand._serialize(self, args) def targets(self): return self._targets + def upload_url(self): + return self._upload_url + def __str__(self): - return "%s(seq: %d, targets: %s)" % (self._name, self._seq, self._targets) + return "%s(seq: %d, targets: %s, upload_url: %s)" % (self._name, self._seq, self._targets, self._upload_url) class PlgCommandNewJobReq(PlgCommand): _need_ack = True - def __init__(self, archjob, target_dict=None, srpm_url=None, archjob_id=None, seq=0): + _SRPM_EXT = ".src.rpm" + def __init__(self, archjob, target_dict=None, jobname=None, archjob_id=None, seq=0): PlgCommand.__init__(self, CMD_NAME_NEW_JOB_REQ, seq) self._archjob = archjob # doesn't get serialized if archjob: self._target_dict = archjob.target_dict() - self._srpm_url = archjob.srpm_url() + self._jobname = os.path.basename(archjob.srpm_path()) + if self._jobname.endswith(self._SRPM_EXT): + self._jobname = self._jobname[:len(self._jobname) - len(self._SRPM_EXT)] self._archjob_id = archjob.archjob_id() else: - if not target_dict or not srpm_url or not archjob_id: - raise Exception("Need a target_dict, an srpm_url, and an archjob_id.") + if not target_dict or not jobname or not archjob_id: + raise Exception("Need a target_dict, a jobname, and an archjob_id.") self._target_dict = target_dict - self._srpm_url = srpm_url + self._jobname = jobname self._archjob_id = archjob_id def _deserialize(args): try: target_dict = args['target_dict'] - except (KeyError, TypeError): - raise ValueError("No 'target_dict' argument found.") - try: - srpm_url = args['srpm_url'] - except (KeyError, TypeError): - raise ValueError("No 'srpm_url' argument found.") - try: + jobname = args['jobname'] archjob_id = args['archjob_id'] - except (KeyError, TypeError): - raise ValueError("No 'archjob_id' argument found.") + except (KeyError, TypeError), exc: + raise ValueError("No '%s' argument found." % exc) - return PlgCommandNewJobReq(None, target_dict, srpm_url, archjob_id) + return PlgCommandNewJobReq(None, target_dict, jobname, archjob_id) _deserialize = staticmethod(_deserialize) def serialize(self): args = {} args['target_dict'] = self._target_dict - args['srpm_url'] = self._srpm_url + args['jobname'] = self._jobname args['archjob_id'] = self._archjob_id return PlgCommand._serialize(self, args) @@ -378,15 +381,15 @@ def target_dict(self): return self._target_dict - def srpm_url(self): - return self._srpm_url + def job_name(self): + return self._jobname def archjob_id(self): return self._archjob_id def __str__(self): - return "%s(seq: %d, target_dict: %s, srpm_url: %s, archjob_id: %s)" % (self._name, - self._seq, self._target_dict, self._srpm_url, self._archjob_id) + return "%s(seq: %d, target_dict: %s, jobname: %s, archjob_id: %s)" % (self._name, + self._seq, self._target_dict, self._jobname, self._archjob_id) class PlgCommandNewJobAck(PlgCommandAck): From fedora-extras-commits at redhat.com Mon May 29 20:46:25 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:46:25 -0700 Subject: extras-buildsys/server Builder.py,1.44,1.45 Message-ID: <200605292046.k4TKkPS4001046@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1028/server Modified Files: Builder.py Log Message: Small fixes for Active builders Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Builder.py 29 May 2006 20:26:38 -0000 1.44 +++ Builder.py 29 May 2006 20:46:22 -0000 1.45 @@ -637,7 +637,7 @@ def __init__(self, manager, cfg, address, weight): Builder.__init__(self, manager, cfg, address, weight, TYPE_ACTIVE) - def _request_srpm_upload(self, archjob, upload_cb, user_data, srpm_path): + def request_srpm_upload(self, archjob, upload_cb, user_data, srpm_path): """Called by the archjob to request that an SRPM be made available to the builder.""" # Copy the SRPM to the correct upload location http_dir = self._manager.http_dir() @@ -709,6 +709,12 @@ if isinstance(cmd, Commands.PlgCommandJobFilesAck): self._handle_job_files_ack(cmd) handled = True + elif isinstance(cmd, Commands.PlgCommandTargets): + if not self._target_list: + self._lock.acquire() + self._target_list = cmd.targets() + self._lock.release() + handled = True if not handled: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) From fedora-extras-commits at redhat.com Mon May 29 21:47:45 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 29 May 2006 14:47:45 -0700 Subject: rpms/jpgraph/FC-5 .cvsignore, 1.6, 1.7 jpgraph.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200605292147.k4TLlliR003894@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/jpgraph/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3857/FC-5 Modified Files: .cvsignore jpgraph.spec sources Log Message: update to 2.1.2, explicitely require php >= 5.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jpgraph/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Feb 2006 12:10:01 -0000 1.6 +++ .cvsignore 29 May 2006 21:47:45 -0000 1.7 @@ -1 +1 @@ -jpgraph-2.1.1.tar.gz +jpgraph-2.1.2.tar.gz Index: jpgraph.spec =================================================================== RCS file: /cvs/extras/rpms/jpgraph/FC-5/jpgraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jpgraph.spec 22 Feb 2006 12:10:01 -0000 1.8 +++ jpgraph.spec 29 May 2006 21:47:45 -0000 1.9 @@ -1,18 +1,18 @@ Name: jpgraph Summary: Object oriented graph drawing class library for PHP -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} -Source0: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.1.1.tar.gz +Source0: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.1.2.tar.gz License: QPL URL: http://www.aditus.nu/jpgraph/ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: php-gd +Requires: php >= 5.0.0, php-gd %description -JpGraph is a OO Graph drawing library for PHP 4.0.2 and above. +JpGraph is a OO Graph drawing library for PHP 4.3.1 and above. Highlights of the available features are: text, linear, and log scales for both the X and Y axes, anti-aliasing of lines, color-gradient fills, support for GIF, JPG, and PNG formats, @@ -24,12 +24,15 @@ Extensive documentations are availible at: http://www.aditus.nu/jpgraph/ +Note: This version will only work with PHP5, not with PHP4 + + %package doc Summary: Documenation for %{name} Group: Documentation %description doc -JpGraph is a OO Graph drawing library for PHP 4.0.2 and above. +JpGraph is a OO Graph drawing library for PHP 4.3.1 and above. Highlights of the available features are: text, linear, and log scales for both the X and Y axes, anti-aliasing of lines, color-gradient fills, support for GIF, JPG, and PNG formats, @@ -40,6 +43,9 @@ This package contains the documenation for %{name}. +Note: This version will only work with PHP5, not with PHP4 + + %prep %setup -q @@ -63,6 +69,10 @@ %doc docs/* src/Examples %changelog +* Mon May 29 2006 Aurelien Bompard 2.1.2-1 +- version 2.1.2 +- explicitely require php >= 5.0.0 + * Wed Feb 22 2006 Aurelien Bompard 2.1.1-1 - version 2.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jpgraph/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Feb 2006 12:10:01 -0000 1.6 +++ sources 29 May 2006 21:47:45 -0000 1.7 @@ -1 +1 @@ -3adf3c51210044ee6f34ef28fb2f09ca jpgraph-2.1.1.tar.gz +af90ddff994629d3162192efff565179 jpgraph-2.1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 29 21:47:46 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 29 May 2006 14:47:46 -0700 Subject: rpms/jpgraph/devel .cvsignore, 1.6, 1.7 jpgraph.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200605292147.k4TLlmVK003900@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/jpgraph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3857/devel Modified Files: .cvsignore jpgraph.spec sources Log Message: update to 2.1.2, explicitely require php >= 5.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jpgraph/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Feb 2006 12:10:01 -0000 1.6 +++ .cvsignore 29 May 2006 21:47:45 -0000 1.7 @@ -1 +1 @@ -jpgraph-2.1.1.tar.gz +jpgraph-2.1.2.tar.gz Index: jpgraph.spec =================================================================== RCS file: /cvs/extras/rpms/jpgraph/devel/jpgraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jpgraph.spec 22 Feb 2006 12:10:01 -0000 1.8 +++ jpgraph.spec 29 May 2006 21:47:45 -0000 1.9 @@ -1,18 +1,18 @@ Name: jpgraph Summary: Object oriented graph drawing class library for PHP -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} -Source0: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.1.1.tar.gz +Source0: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.1.2.tar.gz License: QPL URL: http://www.aditus.nu/jpgraph/ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: php-gd +Requires: php >= 5.0.0, php-gd %description -JpGraph is a OO Graph drawing library for PHP 4.0.2 and above. +JpGraph is a OO Graph drawing library for PHP 4.3.1 and above. Highlights of the available features are: text, linear, and log scales for both the X and Y axes, anti-aliasing of lines, color-gradient fills, support for GIF, JPG, and PNG formats, @@ -24,12 +24,15 @@ Extensive documentations are availible at: http://www.aditus.nu/jpgraph/ +Note: This version will only work with PHP5, not with PHP4 + + %package doc Summary: Documenation for %{name} Group: Documentation %description doc -JpGraph is a OO Graph drawing library for PHP 4.0.2 and above. +JpGraph is a OO Graph drawing library for PHP 4.3.1 and above. Highlights of the available features are: text, linear, and log scales for both the X and Y axes, anti-aliasing of lines, color-gradient fills, support for GIF, JPG, and PNG formats, @@ -40,6 +43,9 @@ This package contains the documenation for %{name}. +Note: This version will only work with PHP5, not with PHP4 + + %prep %setup -q @@ -63,6 +69,10 @@ %doc docs/* src/Examples %changelog +* Mon May 29 2006 Aurelien Bompard 2.1.2-1 +- version 2.1.2 +- explicitely require php >= 5.0.0 + * Wed Feb 22 2006 Aurelien Bompard 2.1.1-1 - version 2.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jpgraph/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Feb 2006 12:10:01 -0000 1.6 +++ sources 29 May 2006 21:47:45 -0000 1.7 @@ -1 +1 @@ -3adf3c51210044ee6f34ef28fb2f09ca jpgraph-2.1.1.tar.gz +af90ddff994629d3162192efff565179 jpgraph-2.1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 29 21:48:09 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 29 May 2006 14:48:09 -0700 Subject: rpms/gossip/FC-5 .cvsignore, 1.7, 1.8 gossip.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200605292148.k4TLmBZZ003937@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3916 Modified Files: .cvsignore gossip.spec sources Log Message: * Mon May 29 2006 Brian Pepple - 0.11.1-2 - Update to 0.11.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 May 2006 23:59:38 -0000 1.7 +++ .cvsignore 29 May 2006 21:48:08 -0000 1.8 @@ -1 +1 @@ -gossip-0.11.tar.bz2 +gossip-0.11.1.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/gossip.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gossip.spec 1 May 2006 23:59:38 -0000 1.17 +++ gossip.spec 29 May 2006 21:48:08 -0000 1.18 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: gossip -Version: 0.11 +Version: 0.11.1 Release: 2%{?dist} Summary: Gnome Jabber Client @@ -130,6 +130,9 @@ %changelog +* Mon May 29 2006 Brian Pepple - 0.11.1-2 +- Update to 0.11.1. + * Mon May 1 2006 Brian Pepple - 0.11-2 - Update to 0.11. - Add scriptlets for gtk+ icon cache. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 May 2006 23:59:38 -0000 1.7 +++ sources 29 May 2006 21:48:08 -0000 1.8 @@ -1 +1 @@ -4b2720f96df77e9c35f5eb7abbb10dab gossip-0.11.tar.bz2 +814c4734b9df3979f3d9c63ca365b3df gossip-0.11.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 29 21:50:08 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 29 May 2006 14:50:08 -0700 Subject: rpms/gossip/devel .cvsignore, 1.7, 1.8 gossip.spec, 1.18, 1.19 sources, 1.7, 1.8 Message-ID: <200605292150.k4TLoAKe004018@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3997 Modified Files: .cvsignore gossip.spec sources Log Message: * Mon May 29 2006 Brian Pepple - 0.11.1-3 - Update to 0.11.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 May 2006 23:27:20 -0000 1.7 +++ .cvsignore 29 May 2006 21:50:07 -0000 1.8 @@ -1 +1 @@ -gossip-0.11.tar.bz2 +gossip-0.11.1.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gossip.spec 20 May 2006 17:01:01 -0000 1.18 +++ gossip.spec 29 May 2006 21:50:07 -0000 1.19 @@ -1,8 +1,8 @@ %define with_dbus 1 Name: gossip -Version: 0.11 -Release: 4%{?dist} +Version: 0.11.1 +Release: 3%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -131,6 +131,9 @@ %changelog +* Mon May 29 2006 Brian Pepple - 0.11.1-3 +- Update to 0.11.1. + * Sat May 20 2006 Brian Pepple - 0.11-4 - Build with libnotify support. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 May 2006 23:27:20 -0000 1.7 +++ sources 29 May 2006 21:50:07 -0000 1.8 @@ -1 +1 @@ -4b2720f96df77e9c35f5eb7abbb10dab gossip-0.11.tar.bz2 +814c4734b9df3979f3d9c63ca365b3df gossip-0.11.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 29 22:08:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 15:08:41 -0700 Subject: rpms/perl-GSSAPI/devel .cvsignore, 1.2, 1.3 perl-GSSAPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605292208.k4TM8hus006537@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GSSAPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6516 Modified Files: .cvsignore perl-GSSAPI.spec sources Log Message: Update to 0.22. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 19:06:13 -0000 1.2 +++ .cvsignore 29 May 2006 22:08:40 -0000 1.3 @@ -1 +1 @@ -GSSAPI-0.21.tar.gz +GSSAPI-0.22.tar.gz Index: perl-GSSAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/perl-GSSAPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-GSSAPI.spec 21 Apr 2006 19:06:13 -0000 1.1 +++ perl-GSSAPI.spec 29 May 2006 22:08:40 -0000 1.2 @@ -5,7 +5,7 @@ # Name: perl-GSSAPI -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Perl extension providing access to the GSSAPIv2 library @@ -17,8 +17,8 @@ BuildRequires: perl BuildRequires: krb5-devel +BuildRequires: which BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -64,6 +64,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 0.22-1 +- Update to 0.22. + * Thu Apr 6 2006 Jose Pedro Oliveira - 0.21-1 - Update to 0.21. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 19:06:13 -0000 1.2 +++ sources 29 May 2006 22:08:40 -0000 1.3 @@ -1 +1 @@ -2779227c30afa412415680da54b98a10 GSSAPI-0.21.tar.gz +63ea55e46783c028ef6dac0ec2ca0887 GSSAPI-0.22.tar.gz From fedora-extras-commits at redhat.com Mon May 29 22:11:46 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 29 May 2006 15:11:46 -0700 Subject: rpms/xbindkeys/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xbindkeys.spec, 1.8, 1.9 Message-ID: <200605292211.k4TMBmp8006626@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/xbindkeys/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6589/FC-5 Modified Files: .cvsignore sources xbindkeys.spec Log Message: version 1.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 May 2005 17:30:22 -0000 1.3 +++ .cvsignore 29 May 2006 22:11:46 -0000 1.4 @@ -1 +1 @@ -xbindkeys-1.7.2.tar.gz +xbindkeys-1.7.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 May 2005 17:30:22 -0000 1.3 +++ sources 29 May 2006 22:11:46 -0000 1.4 @@ -1 +1 @@ -7aead9049d972221b879f22718528690 xbindkeys-1.7.2.tar.gz +eea2fe306e99274e8730e199b85706d5 xbindkeys-1.7.3.tar.gz Index: xbindkeys.spec =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/FC-5/xbindkeys.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xbindkeys.spec 22 Feb 2006 08:11:25 -0000 1.8 +++ xbindkeys.spec 29 May 2006 22:11:46 -0000 1.9 @@ -1,6 +1,6 @@ Name: xbindkeys -Version: 1.7.2 -Release: 4%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Binds keys or mouse buttons to shell commands under X. License: GPL @@ -27,7 +27,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -39,6 +39,12 @@ %attr(0644, root, root) %{_mandir}/man?/* %changelog +* Tue May 30 2006 Aurelien Bompard 1.7.3-1 +- version 1.7.3 + +* Fri May 12 2006 Aurelien Bompard 1.7.2-5 +- rebuild + * Wed Feb 22 2006 Aurelien Bompard 1.7.2-4 - fix dependencies for modular Xorg From fedora-extras-commits at redhat.com Mon May 29 22:11:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 29 May 2006 15:11:47 -0700 Subject: rpms/xbindkeys/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xbindkeys.spec, 1.9, 1.10 Message-ID: <200605292211.k4TMBnoI006632@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/xbindkeys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6589/devel Modified Files: .cvsignore sources xbindkeys.spec Log Message: version 1.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 May 2005 17:30:22 -0000 1.3 +++ .cvsignore 29 May 2006 22:11:47 -0000 1.4 @@ -1 +1 @@ -xbindkeys-1.7.2.tar.gz +xbindkeys-1.7.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 May 2005 17:30:22 -0000 1.3 +++ sources 29 May 2006 22:11:47 -0000 1.4 @@ -1 +1 @@ -7aead9049d972221b879f22718528690 xbindkeys-1.7.2.tar.gz +eea2fe306e99274e8730e199b85706d5 xbindkeys-1.7.3.tar.gz Index: xbindkeys.spec =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/devel/xbindkeys.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xbindkeys.spec 11 May 2006 22:23:35 -0000 1.9 +++ xbindkeys.spec 29 May 2006 22:11:47 -0000 1.10 @@ -1,6 +1,6 @@ Name: xbindkeys -Version: 1.7.2 -Release: 5%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Binds keys or mouse buttons to shell commands under X. License: GPL @@ -27,7 +27,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -39,6 +39,9 @@ %attr(0644, root, root) %{_mandir}/man?/* %changelog +* Tue May 30 2006 Aurelien Bompard 1.7.3-1 +- version 1.7.3 + * Fri May 12 2006 Aurelien Bompard 1.7.2-5 - rebuild From fedora-extras-commits at redhat.com Mon May 29 22:26:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 15:26:21 -0700 Subject: rpms/perl-GSSAPI/FC-4 .cvsignore, 1.2, 1.3 perl-GSSAPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605292226.k4TMQNSO006765@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GSSAPI/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6728/FC-4 Modified Files: .cvsignore perl-GSSAPI.spec sources Log Message: Update to 0.22. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 19:06:13 -0000 1.2 +++ .cvsignore 29 May 2006 22:26:21 -0000 1.3 @@ -1 +1 @@ -GSSAPI-0.21.tar.gz +GSSAPI-0.22.tar.gz Index: perl-GSSAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-4/perl-GSSAPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-GSSAPI.spec 21 Apr 2006 19:06:13 -0000 1.1 +++ perl-GSSAPI.spec 29 May 2006 22:26:21 -0000 1.2 @@ -5,7 +5,7 @@ # Name: perl-GSSAPI -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Perl extension providing access to the GSSAPIv2 library @@ -17,8 +17,8 @@ BuildRequires: perl BuildRequires: krb5-devel +BuildRequires: which BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -64,6 +64,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 0.22-1 +- Update to 0.22. + * Thu Apr 6 2006 Jose Pedro Oliveira - 0.21-1 - Update to 0.21. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 19:06:13 -0000 1.2 +++ sources 29 May 2006 22:26:21 -0000 1.3 @@ -1 +1 @@ -2779227c30afa412415680da54b98a10 GSSAPI-0.21.tar.gz +63ea55e46783c028ef6dac0ec2ca0887 GSSAPI-0.22.tar.gz From fedora-extras-commits at redhat.com Mon May 29 22:26:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 15:26:21 -0700 Subject: rpms/perl-GSSAPI/FC-5 .cvsignore, 1.2, 1.3 perl-GSSAPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605292226.k4TMQN6V006771@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GSSAPI/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6728/FC-5 Modified Files: .cvsignore perl-GSSAPI.spec sources Log Message: Update to 0.22. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 19:06:13 -0000 1.2 +++ .cvsignore 29 May 2006 22:26:21 -0000 1.3 @@ -1 +1 @@ -GSSAPI-0.21.tar.gz +GSSAPI-0.22.tar.gz Index: perl-GSSAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-5/perl-GSSAPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-GSSAPI.spec 21 Apr 2006 19:06:13 -0000 1.1 +++ perl-GSSAPI.spec 29 May 2006 22:26:21 -0000 1.2 @@ -5,7 +5,7 @@ # Name: perl-GSSAPI -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Perl extension providing access to the GSSAPIv2 library @@ -17,8 +17,8 @@ BuildRequires: perl BuildRequires: krb5-devel +BuildRequires: which BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -64,6 +64,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 0.22-1 +- Update to 0.22. + * Thu Apr 6 2006 Jose Pedro Oliveira - 0.21-1 - Update to 0.21. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 19:06:13 -0000 1.2 +++ sources 29 May 2006 22:26:21 -0000 1.3 @@ -1 +1 @@ -2779227c30afa412415680da54b98a10 GSSAPI-0.21.tar.gz +63ea55e46783c028ef6dac0ec2ca0887 GSSAPI-0.22.tar.gz From fedora-extras-commits at redhat.com Mon May 29 22:52:38 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 29 May 2006 15:52:38 -0700 Subject: fedora-security/audit fc5,1.182,1.183 fc4,1.269,1.270 Message-ID: <200605292252.k4TMqc9q006940@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6920 Modified Files: fc5 fc4 Log Message: Mailman Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- fc5 29 May 2006 11:02:47 -0000 1.182 +++ fc5 29 May 2006 22:52:35 -0000 1.183 @@ -281,7 +281,7 @@ CVE-2005-4268 backport (cpio) also blocked by FORTIFY_SOURCE CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment CVE-2005-4154 ignore (php) don't install untrusted pear packages -CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch +CVE-2005-4153 version (mailman) [since FEDORA-2006-535] was backport mailman-2.1.5-date_overflows.patch since GA CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html CVE-2005-4134 backport (mozilla) mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch CVE-2005-4130 ignore (HelixPlayer) not verified Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- fc4 29 May 2006 11:02:47 -0000 1.269 +++ fc4 29 May 2006 22:52:35 -0000 1.270 @@ -248,7 +248,7 @@ CVE-2006-0095 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-102 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-194] -CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) #187421 +CVE-2006-0052 version (mailman, fixed 2.1.6) #187421 [since FEDORA-2006-534] CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0039 version (kernel, fixed 2.6.16.17) [since FEDORA-2006-573] @@ -280,7 +280,7 @@ CVE-2005-4268 blocked (cpio) #172669 by FORTIFY_SOURCE CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment CVE-2005-4154 ignore (php) don't install untrusted pear packages -CVE-2005-4153 VULNERABLE (mailman) +CVE-2005-4153 version (mailman) [since FEDORA-2006-534] CVE-2005-4134 backport (mozilla) [since FEDORA-2006-075] CVE-2005-4134 backport (firefox) [since FEDORA-2006-076] CVE-2005-4130 ignore (HelixPlayer) not verified @@ -341,7 +341,7 @@ CVE-2005-3624 backport (cups) [since FEDORA-2006-010] CVE-2005-3623 version (kernel, fixed 2.6.14.5) [since FEDORA-2006-077] was backport since FEDORA-2006-013 CVE-2005-3582 version (ImageMagick) gentoo only -CVE-2005-3573 VULNERABLE (mailman) +CVE-2005-3573 VULNERABLE (mailman) ** CVE-2005-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067] CVE-2005-3402 ignore (thunderbird) mozilla say by design CVE-2005-3392 ignore (php) safe mode isn't safe @@ -841,7 +841,7 @@ CVE-2005-0206 version (xpdf, only bad patch for 2004-0888) CVE-2005-0205 version (kdenetwork, not 3.3 onwards) CVE-2005-0204 version (kernel, didn't affect upstream) -CVE-2005-0202 backport (mailman, fixed 2.1.6) from srpm +CVE-2005-0202 version (mailman, fixed 2.1.6) [since FEDORA-2006-534] was backport since GA CVE-2005-0201 backport (dbus) [since FEDORA-2005-822] CVE-2005-0194 version (squid, fixed 2.5.STABLE8) CVE-2005-0180 version (kernel, fixed 2.6.11) @@ -1013,7 +1013,7 @@ CVE-2004-1184 backport (enscript) in srpm CVE-2004-1183 backport (libtiff) libtiff-3.5.7-dump.patch CVE-2004-1180 version (rwho, fixed 0.17) -CVE-2004-1177 backport (mailman, fixed 2.1.6) in srpm +CVE-2004-1177 version (mailman, fixed 2.1.6) [since FEDORA-2006-534] was backport since GA CVE-2004-1176 version (mc, fixed 4.6.0) CVE-2004-1175 version (mc, fixed 4.6.0) CVE-2004-1174 version (mc, fixed 4.6.0) From fedora-extras-commits at redhat.com Tue May 30 03:19:12 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 29 May 2006 20:19:12 -0700 Subject: rpms/kasumi/FC-4 .cvsignore, 1.4, 1.5 kasumi.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605300319.k4U3JEBJ019827@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kasumi/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19806 Modified Files: .cvsignore kasumi.spec sources Log Message: * Tue May 30 2006 Akira TAGOH - 2.0-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Dec 2005 12:11:10 -0000 1.4 +++ .cvsignore 30 May 2006 03:19:12 -0000 1.5 @@ -1,3 +1,4 @@ kasumi-0.9.tar.gz kasumi-0.10.tar.gz kasumi-1.0.tar.gz +kasumi-2.0.tar.gz Index: kasumi.spec =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/kasumi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kasumi.spec 13 Dec 2005 12:11:10 -0000 1.4 +++ kasumi.spec 30 May 2006 03:19:12 -0000 1.5 @@ -1,5 +1,5 @@ Name: kasumi -Version: 1.0 +Version: 2.0 Release: 1%{?dist} License: GPL @@ -52,6 +52,9 @@ %changelog +* Tue May 30 2006 Akira TAGOH - 2.0-1 +- New upstream release. + * Mon Dec 12 2005 Akira TAGOH - 1.0-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Dec 2005 12:11:10 -0000 1.4 +++ sources 30 May 2006 03:19:12 -0000 1.5 @@ -1 +1 @@ -15314d8eaaf83abf5fd41b93be8ce91f kasumi-1.0.tar.gz +f2b080cbea0bac90fadcc8cfcc500460 kasumi-2.0.tar.gz From fedora-extras-commits at redhat.com Tue May 30 04:13:12 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 29 May 2006 21:13:12 -0700 Subject: rpms/kasumi/FC-4 kasumi-1.0-gcc41.patch, NONE, 1.1 kasumi.spec, 1.5, 1.6 Message-ID: <200605300413.k4U4DEQ2022300@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kasumi/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22280 Modified Files: kasumi.spec Added Files: kasumi-1.0-gcc41.patch Log Message: - kasumi-1.0-gcc41.patch: backport to build with gcc-4.1. kasumi-1.0-gcc41.patch: --- NEW FILE kasumi-1.0-gcc41.patch --- --- kasumi-1.0.orig/Makefile.am 2005-09-01 16:48:07.000000000 +0900 +++ kasumi-1.0/Makefile.am 2005-12-15 15:47:48.000000000 +0900 @@ -13,7 +13,7 @@ pkgdata_DATA = kasumi.png -AM_CPPFLAGS=-DLOCALEDIR='"$(localedir)"' +AM_CPPFLAGS=-DLOCALEDIR='"$(localedir)"' -ffriend-injection SUBDIRS = intl m4 po ACLOCAL_AMFLAGS = -I m4 Index: kasumi.spec =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/kasumi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kasumi.spec 30 May 2006 03:19:12 -0000 1.5 +++ kasumi.spec 30 May 2006 04:13:12 -0000 1.6 @@ -8,6 +8,7 @@ BuildRequires: desktop-file-utils, gtk2-devel Source0: %{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch1: kasumi-1.0-gcc41.patch Summary: An anthy dictionary management tool. @@ -18,6 +19,10 @@ %prep %setup -q +%patch1 -p1 -b .gcc41 +aclocal +automake --add-missing +autoconf %build @@ -54,6 +59,7 @@ %changelog * Tue May 30 2006 Akira TAGOH - 2.0-1 - New upstream release. +- kasumi-1.0-gcc41.patch: backport to build with gcc-4.1. * Mon Dec 12 2005 Akira TAGOH - 1.0-1 - New upstream release. From fedora-extras-commits at redhat.com Tue May 30 06:44:18 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:44:18 -0700 Subject: rpms/scim-bridge - New directory Message-ID: <200605300644.k4U6iKfw027270@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27244/scim-bridge Log Message: Directory /cvs/extras/rpms/scim-bridge added to the repository From fedora-extras-commits at redhat.com Tue May 30 06:44:18 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:44:18 -0700 Subject: rpms/scim-bridge/devel - New directory Message-ID: <200605300644.k4U6iKMn027273@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27244/scim-bridge/devel Log Message: Directory /cvs/extras/rpms/scim-bridge/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 06:44:40 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:44:40 -0700 Subject: rpms/scim-bridge Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300644.k4U6ihcJ027317@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27289 Added Files: Makefile import.log Log Message: Setup of module scim-bridge --- NEW FILE Makefile --- # Top level Makefile for module scim-bridge all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 06:44:41 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:44:41 -0700 Subject: rpms/scim-bridge/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300644.k4U6ihSg027320@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27289/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scim-bridge --- NEW 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 May 30 06:45:21 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:45:21 -0700 Subject: rpms/scim-bridge import.log,1.1,1.2 Message-ID: <200605300645.k4U6jNFY027395@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361 Modified Files: import.log Log Message: auto-import scim-bridge-0.1.12-1 on branch devel from scim-bridge-0.1.12-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scim-bridge/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 06:44:40 -0000 1.1 +++ import.log 30 May 2006 06:45:21 -0000 1.2 @@ -0,0 +1 @@ +scim-bridge-0_1_12-1:HEAD:scim-bridge-0.1.12-1.src.rpm:1148971513 From fedora-extras-commits at redhat.com Tue May 30 06:45:21 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:45:21 -0700 Subject: rpms/scim-bridge/devel scim-bridge.spec, NONE, 1.1 xinput-scim-bridge, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300645.k4U6jNok027400@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361/devel Modified Files: .cvsignore sources Added Files: scim-bridge.spec xinput-scim-bridge Log Message: auto-import scim-bridge-0.1.12-1 on branch devel from scim-bridge-0.1.12-1.src.rpm --- NEW FILE scim-bridge.spec --- %define with_libstdc_preview 0 Name: scim-bridge Version: 0.1.12 Release: 1%{?dist} Summary: SCIM Bridge Group: System Environment/Libraries License: LGPL URL: http://shibatama.tea-nifty.com/blog/2006/02/scimbridge_has__e4eb.html Source0: http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz Source1: xinput-scim-bridge BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif Requires: scim, scim-bridge-gtkimm = %{version}-%{release} %description SCIM Bridge is a C implementation of a Gtk IM module for SCIM. %package gtkimm Summary: SCIM Bridge Gtk IM module Group: System Environment/Libraries # for update-gtk-immodules PreReq: gtk2 > 2.8 %if %{with_libstdc_preview} PreReq: libstdc++so7 %endif %description gtkimm This package provides the SCIM Bridge GTK input method module. %prep %setup -q %build %if %{with_libstdc_preview} export CXX=%{_bindir}/g++-libstdc++-so_7 %endif %configure --disable-static %if %{with_libstdc_preview} # tweak libtool for libstdc++-so7 sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool %endif make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %if %{with_libstdc_preview} export CXX=%{_bindir}/g++-libstdc++-so_7 %endif make install DESTDIR=$RPM_BUILD_ROOT mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim-bridge rm $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/immodules/im-scim-bridge.*a %clean rm -rf $RPM_BUILD_ROOT %post gtkimm %{_bindir}/update-gtk-immodules %{_target_platform} %postun gtkimm %{_bindir}/update-gtk-immodules %{_target_platform} %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/scim-bridge-agent %{_sysconfdir}/X11/xinit/xinput.d/scim-bridge %files gtkimm %defattr(-,root,root,-) %dir %{_libdir}/gtk-2.0/immodules %{_libdir}/gtk-2.0/immodules/im-scim-bridge.so %changelog * Tue May 30 2006 Jens Petersen - 0.1.12-1 - update to 0.1.12 * Tue May 16 2006 Jens Petersen - 0.1.8-1 - update to 0.1.8 * Thu May 11 2006 Jens Petersen - 0.1.7-1 - update to 0.1.7 release * Sat Apr 29 2006 Jens Petersen - package for Fedora Extras * Wed Mar 15 2006 Jens Petersen - cvs snapshot --- NEW FILE xinput-scim-bridge --- GTK_IM_MODULE=scim-bridge Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-bridge/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 06:44:41 -0000 1.1 +++ .cvsignore 30 May 2006 06:45:21 -0000 1.2 @@ -0,0 +1 @@ +scim-bridge-0.1.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-bridge/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 06:44:41 -0000 1.1 +++ sources 30 May 2006 06:45:21 -0000 1.2 @@ -0,0 +1 @@ +3439bdf3695fcfe53e6cce234dc985bf scim-bridge-0.1.12.tar.gz From fedora-extras-commits at redhat.com Tue May 30 07:27:36 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:27:36 -0700 Subject: rpms/koffice/FC-4 .cvsignore, 1.7, 1.8 koffice.spec, 1.13, 1.14 sources, 1.7, 1.8 Message-ID: <200605300728.k4U7S8Hr030118@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/FC-4 Modified Files: .cvsignore koffice.spec sources Log Message: - fix #191388 - add kexi forms patch - version upgrade - exclude x-raw.desktop again Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Apr 2006 22:05:51 -0000 1.7 +++ .cvsignore 30 May 2006 07:27:36 -0000 1.8 @@ -1 +1 @@ -koffice-1.5.0.tar.bz2 +koffice-1.5.1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- koffice.spec 22 Apr 2006 07:41:24 -0000 1.13 +++ koffice.spec 30 May 2006 07:27:36 -0000 1.14 @@ -1,23 +1,22 @@ Name: koffice -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-1.5.1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kexi-version.patch +Patch1: koffice-forms-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) BuildRequires: automake BuildRequires: autoconf >= 2.53 -BuildRequires: xorg-x11-devel BuildRequires: kdebase-devel BuildRequires: kdelibs-devel BuildRequires: freetype-devel @@ -56,6 +55,7 @@ BuildRequires: libxslt-devel BuildRequires: OpenEXR-devel BuildRequires: libexif-devel +BuildRequires: xorg-x11-devel BuildRequires: readline-devel BuildRequires: ruby ruby-devel @@ -226,8 +226,9 @@ %prep %setup -q %patch0 -p1 +cd kexi %patch1 - +cd .. # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -478,6 +479,8 @@ %{_libdir}/libkformulalib.so.* %{_libdir}/libkopalette.so.* %{_libdir}/libkoproperty.so.* +%{_libdir}/libkrossapi.so.* +%{_libdir}/libkrossmain.so.* %{_libdir}/kde3/kfile_koffice.* %{_libdir}/kde3/kfile_ooo.* %{_libdir}/kde3/kfile_abiword.* @@ -526,6 +529,7 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* +%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -703,7 +707,6 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* -%{_libdir}/kde3/kritaperftest.* %{_libdir}/kde3/krosskritacore.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop @@ -768,8 +771,6 @@ %{_libdir}/kde3/kexihandler_csv_importexport.* %{_libdir}/kde3/krosskexiapp.* %{_libdir}/kde3/krosskexidb.* -%{_libdir}/libkrossapi.so.* -%{_libdir}/libkrossmain.so.* %{_datadir}/config/kexirc %{_datadir}/config/magic/kexi.magic %{_datadir}/mimelnk/application/* @@ -910,6 +911,13 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Sun May 21 2006 Andreas Bierfert +1.5.1-1 +- fix #191388 +- add kexi forms patch +- version upgrade +- exclude x-raw.desktop again + * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 - split out kexi-drivers (#188746) and fix some related issues Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Apr 2006 22:05:51 -0000 1.7 +++ sources 30 May 2006 07:27:36 -0000 1.8 @@ -1 +1 @@ -220b6bde28b5ebd5c6621bc87ca2c05f koffice-1.5.0.tar.bz2 +50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 07:27:37 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:27:37 -0700 Subject: rpms/koffice/FC-5 koffice-forms-plugins.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 koffice.spec, 1.36, 1.37 sources, 1.10, 1.11 koffice-filters-krita-tiff.patch, 1.1, NONE koffice-kexi-version.patch, 1.1, NONE Message-ID: <200605300728.k4U7S97N030123@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/FC-5 Modified Files: .cvsignore koffice.spec sources Added Files: koffice-forms-plugins.patch Removed Files: koffice-filters-krita-tiff.patch koffice-kexi-version.patch Log Message: - fix #191388 - add kexi forms patch - version upgrade - exclude x-raw.desktop again koffice-forms-plugins.patch: --- NEW FILE koffice-forms-plugins.patch --- Index: plugins/forms/Makefile.am =================================================================== --- plugins/forms/Makefile.am (wersja 541836) +++ plugins/forms/Makefile.am (kopia robocza) @@ -23,9 +23,10 @@ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp -libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner Index: plugins/reports/Makefile.am =================================================================== --- plugins/reports/Makefile.am (wersja 541836) +++ plugins/reports/Makefile.am (kopia robocza) @@ -5,24 +5,29 @@ kexihandler_report_la_SOURCES = kexireports.cpp kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined kexihandler_report_la_LIBADD = ../../core/libkexicore.la \ - ../../widget/utils/libkexiguiutils.la \ - ../../widget/libkexiextendedwidgets.la \ - ../../formeditor/libkformdesigner.la \ - ../forms/libkexiformutils.la \ + $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ ./libkexireportutils.la kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ ./libkexireportutils.la lib_LTLIBRARIES = libkexireportutils.la libkexireportutils_la_SOURCES = \ kexireportpart.cpp kexireportview.cpp kexireportform.cpp -libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 16 Apr 2006 22:05:51 -0000 1.10 +++ .cvsignore 30 May 2006 07:27:37 -0000 1.11 @@ -1 +1 @@ -koffice-1.5.0.tar.bz2 +koffice-1.5.1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- koffice.spec 22 Apr 2006 07:41:24 -0000 1.36 +++ koffice.spec 30 May 2006 07:27:37 -0000 1.37 @@ -1,17 +1,17 @@ Name: koffice -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-1.5.1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kexi-version.patch +Patch1: koffice-forms-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -227,8 +227,9 @@ %prep %setup -q %patch0 -p1 +cd kexi %patch1 - +cd .. # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -479,6 +480,8 @@ %{_libdir}/libkformulalib.so.* %{_libdir}/libkopalette.so.* %{_libdir}/libkoproperty.so.* +%{_libdir}/libkrossapi.so.* +%{_libdir}/libkrossmain.so.* %{_libdir}/kde3/kfile_koffice.* %{_libdir}/kde3/kfile_ooo.* %{_libdir}/kde3/kfile_abiword.* @@ -527,6 +530,7 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* +%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -704,7 +708,6 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* -%{_libdir}/kde3/kritaperftest.* %{_libdir}/kde3/krosskritacore.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop @@ -769,8 +772,6 @@ %{_libdir}/kde3/kexihandler_csv_importexport.* %{_libdir}/kde3/krosskexiapp.* %{_libdir}/kde3/krosskexidb.* -%{_libdir}/libkrossapi.so.* -%{_libdir}/libkrossmain.so.* %{_datadir}/config/kexirc %{_datadir}/config/magic/kexi.magic %{_datadir}/mimelnk/application/* @@ -911,6 +912,13 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Sun May 21 2006 Andreas Bierfert +1.5.1-1 +- fix #191388 +- add kexi forms patch +- version upgrade +- exclude x-raw.desktop again + * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 - split out kexi-drivers (#188746) and fix some related issues Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Apr 2006 22:05:51 -0000 1.10 +++ sources 30 May 2006 07:27:37 -0000 1.11 @@ -1 +1 @@ -220b6bde28b5ebd5c6621bc87ca2c05f koffice-1.5.0.tar.bz2 +50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 --- koffice-filters-krita-tiff.patch DELETED --- --- koffice-kexi-version.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 07:27:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:27:38 -0700 Subject: rpms/koffice/devel koffice-forms-plugins.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 koffice.spec, 1.35, 1.36 sources, 1.10, 1.11 koffice-kexi-version.patch, 1.1, NONE Message-ID: <200605300728.k4U7SAic030128@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/devel Modified Files: .cvsignore koffice.spec sources Added Files: koffice-forms-plugins.patch Removed Files: koffice-kexi-version.patch Log Message: - fix #191388 - add kexi forms patch - version upgrade - exclude x-raw.desktop again koffice-forms-plugins.patch: --- NEW FILE koffice-forms-plugins.patch --- Index: plugins/forms/Makefile.am =================================================================== --- plugins/forms/Makefile.am (wersja 541836) +++ plugins/forms/Makefile.am (kopia robocza) @@ -23,9 +23,10 @@ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp -libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner Index: plugins/reports/Makefile.am =================================================================== --- plugins/reports/Makefile.am (wersja 541836) +++ plugins/reports/Makefile.am (kopia robocza) @@ -5,24 +5,29 @@ kexihandler_report_la_SOURCES = kexireports.cpp kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined kexihandler_report_la_LIBADD = ../../core/libkexicore.la \ - ../../widget/utils/libkexiguiutils.la \ - ../../widget/libkexiextendedwidgets.la \ - ../../formeditor/libkformdesigner.la \ - ../forms/libkexiformutils.la \ + $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ ./libkexireportutils.la kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ ./libkexireportutils.la lib_LTLIBRARIES = libkexireportutils.la libkexireportutils_la_SOURCES = \ kexireportpart.cpp kexireportview.cpp kexireportform.cpp -libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 16 Apr 2006 22:05:52 -0000 1.10 +++ .cvsignore 30 May 2006 07:27:38 -0000 1.11 @@ -1 +1 @@ -koffice-1.5.0.tar.bz2 +koffice-1.5.1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- koffice.spec 22 Apr 2006 07:41:25 -0000 1.35 +++ koffice.spec 30 May 2006 07:27:38 -0000 1.36 @@ -1,17 +1,17 @@ Name: koffice -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-1.5.1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kexi-version.patch +Patch1: koffice-forms-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -227,8 +227,9 @@ %prep %setup -q %patch0 -p1 +cd kexi %patch1 - +cd .. # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -479,6 +480,8 @@ %{_libdir}/libkformulalib.so.* %{_libdir}/libkopalette.so.* %{_libdir}/libkoproperty.so.* +%{_libdir}/libkrossapi.so.* +%{_libdir}/libkrossmain.so.* %{_libdir}/kde3/kfile_koffice.* %{_libdir}/kde3/kfile_ooo.* %{_libdir}/kde3/kfile_abiword.* @@ -527,6 +530,7 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* +%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -704,7 +708,6 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* -%{_libdir}/kde3/kritaperftest.* %{_libdir}/kde3/krosskritacore.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop @@ -769,8 +772,6 @@ %{_libdir}/kde3/kexihandler_csv_importexport.* %{_libdir}/kde3/krosskexiapp.* %{_libdir}/kde3/krosskexidb.* -%{_libdir}/libkrossapi.so.* -%{_libdir}/libkrossmain.so.* %{_datadir}/config/kexirc %{_datadir}/config/magic/kexi.magic %{_datadir}/mimelnk/application/* @@ -911,6 +912,13 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Sun May 21 2006 Andreas Bierfert +1.5.1-1 +- fix #191388 +- add kexi forms patch +- version upgrade +- exclude x-raw.desktop again + * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 - split out kexi-drivers (#188746) and fix some related issues Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Apr 2006 22:05:52 -0000 1.10 +++ sources 30 May 2006 07:27:38 -0000 1.11 @@ -1 +1 @@ -220b6bde28b5ebd5c6621bc87ca2c05f koffice-1.5.0.tar.bz2 +50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 --- koffice-kexi-version.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 07:43:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:43:53 -0700 Subject: rpms/scribus/devel .cvsignore, 1.9, 1.10 scribus.spec, 1.19, 1.20 sources, 1.9, 1.10 Message-ID: <200605300743.k4U7htPu030193@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30172 Modified Files: .cvsignore scribus.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Apr 2006 09:30:51 -0000 1.9 +++ .cvsignore 30 May 2006 07:43:53 -0000 1.10 @@ -1 +1 @@ -scribus-1.3.3.1.tar.bz2 +scribus-1.3.3.2.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- scribus.spec 22 Apr 2006 09:30:51 -0000 1.19 +++ scribus.spec 30 May 2006 07:43:53 -0000 1.20 @@ -1,5 +1,5 @@ Name: scribus -Version: 1.3.3.1 +Version: 1.3.3.2 Release: 1%{?dist} Summary: DeskTop Publishing application written in Qt @@ -7,7 +7,7 @@ Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://dl.sf.net/scribus/scribus-1.3.3.1.tar.bz2 +Source0: http://dl.sf.net/scribus/scribus-1.3.3.2.tar.bz2 Source1: scribus.xml Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -137,6 +137,10 @@ %changelog +* Tue May 30 2006 Andreas Bierfert +1.3.3.2-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 1.3.3.1-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Apr 2006 09:30:51 -0000 1.9 +++ sources 30 May 2006 07:43:53 -0000 1.10 @@ -1 +1 @@ -73864eea86de686904f4741ef35152ca scribus-1.3.3.1.tar.bz2 +fa5d0dbb675b41f3d56823943b06c84c scribus-1.3.3.2.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 07:44:31 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:44:31 -0700 Subject: rpms/koffice/FC-4 koffice-kexi-checkbox-data-saving.patch, NONE, 1.1 koffice.spec, 1.14, 1.15 Message-ID: <200605300744.k4U7iXP5030289@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30239/FC-4 Modified Files: koffice.spec Added Files: koffice-kexi-checkbox-data-saving.patch Log Message: - add kexi checkbox patch koffice-kexi-checkbox-data-saving.patch: --- NEW FILE koffice-kexi-checkbox-data-saving.patch --- Index: kexi/plugins/forms/kexidataprovider.cpp =================================================================== --- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) +++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) @@ -92,7 +92,8 @@ for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); it!=m_fieldNumbersForDataItems.constEnd(); ++it) { - kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; + kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() + << " data=" << row.at(it.data()) << endl; it.key()->setValue( row.at(it.data()) ); } } Index: kexi/plugins/forms/widgets/kexidbautofield.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) @@ -446,8 +446,11 @@ @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] (see doc/dev/settings.txt) */ if (!text.isEmpty()) { - realText = text[0].upper(); - realText += (text.mid(1) + ": "); + realText = text[0].upper() + text.mid(1); + if (m_widgetType!=Boolean) { +//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label + realText += ": "; + } } } else Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) @@ -27,7 +27,9 @@ : QCheckBox(text, parent, name), KexiFormDataItemInterface() { m_invalidState = false; +//! todo: tristate setTristate(true); + setFocusPolicy(QWidget::StrongFocus); connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); } @@ -56,13 +58,16 @@ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) { - setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); +// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); + setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); } QVariant KexiDBCheckBox::value() { - return QVariant( isChecked(), 3 ); + if (state()==NoChange) + return QVariant(); + return QVariant(state()==On, 1); } void KexiDBCheckBox::slotStateChanged(int ) Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- koffice.spec 30 May 2006 07:27:36 -0000 1.14 +++ koffice.spec 30 May 2006 07:44:31 -0000 1.15 @@ -12,6 +12,7 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch Patch1: koffice-forms-plugins.patch +Patch2: koffice-kexi-checkbox-data-saving.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -229,6 +230,8 @@ cd kexi %patch1 cd .. +%patch2 + # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -915,6 +918,7 @@ 1.5.1-1 - fix #191388 - add kexi forms patch +- add kexi checkbox patch - version upgrade - exclude x-raw.desktop again From fedora-extras-commits at redhat.com Tue May 30 07:44:31 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:44:31 -0700 Subject: rpms/koffice/FC-5 koffice-kexi-checkbox-data-saving.patch, NONE, 1.1 koffice.spec, 1.37, 1.38 Message-ID: <200605300744.k4U7iXvX030295@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30239/FC-5 Modified Files: koffice.spec Added Files: koffice-kexi-checkbox-data-saving.patch Log Message: - add kexi checkbox patch koffice-kexi-checkbox-data-saving.patch: --- NEW FILE koffice-kexi-checkbox-data-saving.patch --- Index: kexi/plugins/forms/kexidataprovider.cpp =================================================================== --- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) +++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) @@ -92,7 +92,8 @@ for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); it!=m_fieldNumbersForDataItems.constEnd(); ++it) { - kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; + kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() + << " data=" << row.at(it.data()) << endl; it.key()->setValue( row.at(it.data()) ); } } Index: kexi/plugins/forms/widgets/kexidbautofield.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) @@ -446,8 +446,11 @@ @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] (see doc/dev/settings.txt) */ if (!text.isEmpty()) { - realText = text[0].upper(); - realText += (text.mid(1) + ": "); + realText = text[0].upper() + text.mid(1); + if (m_widgetType!=Boolean) { +//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label + realText += ": "; + } } } else Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) @@ -27,7 +27,9 @@ : QCheckBox(text, parent, name), KexiFormDataItemInterface() { m_invalidState = false; +//! todo: tristate setTristate(true); + setFocusPolicy(QWidget::StrongFocus); connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); } @@ -56,13 +58,16 @@ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) { - setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); +// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); + setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); } QVariant KexiDBCheckBox::value() { - return QVariant( isChecked(), 3 ); + if (state()==NoChange) + return QVariant(); + return QVariant(state()==On, 1); } void KexiDBCheckBox::slotStateChanged(int ) Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- koffice.spec 30 May 2006 07:27:37 -0000 1.37 +++ koffice.spec 30 May 2006 07:44:31 -0000 1.38 @@ -12,6 +12,7 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch Patch1: koffice-forms-plugins.patch +Patch2: koffice-kexi-checkbox-data-saving.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -230,6 +231,8 @@ cd kexi %patch1 cd .. +%patch2 + # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -916,6 +919,7 @@ 1.5.1-1 - fix #191388 - add kexi forms patch +- add kexi checkbox patch - version upgrade - exclude x-raw.desktop again From fedora-extras-commits at redhat.com Tue May 30 07:44:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:44:32 -0700 Subject: rpms/koffice/devel koffice-kexi-checkbox-data-saving.patch, NONE, 1.1 koffice.spec, 1.36, 1.37 Message-ID: <200605300744.k4U7iYs8030299@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30239/devel Modified Files: koffice.spec Added Files: koffice-kexi-checkbox-data-saving.patch Log Message: - add kexi checkbox patch koffice-kexi-checkbox-data-saving.patch: --- NEW FILE koffice-kexi-checkbox-data-saving.patch --- Index: kexi/plugins/forms/kexidataprovider.cpp =================================================================== --- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) +++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) @@ -92,7 +92,8 @@ for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); it!=m_fieldNumbersForDataItems.constEnd(); ++it) { - kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; + kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() + << " data=" << row.at(it.data()) << endl; it.key()->setValue( row.at(it.data()) ); } } Index: kexi/plugins/forms/widgets/kexidbautofield.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) @@ -446,8 +446,11 @@ @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] (see doc/dev/settings.txt) */ if (!text.isEmpty()) { - realText = text[0].upper(); - realText += (text.mid(1) + ": "); + realText = text[0].upper() + text.mid(1); + if (m_widgetType!=Boolean) { +//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label + realText += ": "; + } } } else Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) @@ -27,7 +27,9 @@ : QCheckBox(text, parent, name), KexiFormDataItemInterface() { m_invalidState = false; +//! todo: tristate setTristate(true); + setFocusPolicy(QWidget::StrongFocus); connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); } @@ -56,13 +58,16 @@ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) { - setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); +// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); + setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); } QVariant KexiDBCheckBox::value() { - return QVariant( isChecked(), 3 ); + if (state()==NoChange) + return QVariant(); + return QVariant(state()==On, 1); } void KexiDBCheckBox::slotStateChanged(int ) Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- koffice.spec 30 May 2006 07:27:38 -0000 1.36 +++ koffice.spec 30 May 2006 07:44:32 -0000 1.37 @@ -12,6 +12,7 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch Patch1: koffice-forms-plugins.patch +Patch2: koffice-kexi-checkbox-data-saving.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -230,6 +231,8 @@ cd kexi %patch1 cd .. +%patch2 + # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -916,6 +919,7 @@ 1.5.1-1 - fix #191388 - add kexi forms patch +- add kexi checkbox patch - version upgrade - exclude x-raw.desktop again From fedora-extras-commits at redhat.com Tue May 30 07:57:20 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 30 May 2006 00:57:20 -0700 Subject: owners owners.list,1.1073,1.1074 Message-ID: <200605300757.k4U7vMWR030457@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30433 Modified Files: owners.list Log Message: add scim-bridge. tweak gtk2hs description. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1073 retrieving revision 1.1074 diff -u -r1.1073 -r1.1074 --- owners.list 29 May 2006 18:20:48 -0000 1.1073 +++ owners.list 30 May 2006 07:57:20 -0000 1.1074 @@ -463,7 +463,7 @@ Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| -Fedora Extras|gtk2hs|A Haskell binding of the Gtk+ toolkit|petersen at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|gtk2hs|A Haskell binding of Gtk+|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| @@ -1493,6 +1493,7 @@ Fedora Extras|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|scim-bridge|SCIM Bridge Gtk IM module|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|qshen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 30 08:08:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:08:39 -0700 Subject: rpms/koffice/FC-4 koffice-forms-plugins.patch,NONE,1.1 Message-ID: <200605300808.k4U88fUR000490@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv467 Added Files: koffice-forms-plugins.patch Log Message: - forgot forms patch koffice-forms-plugins.patch: --- NEW FILE koffice-forms-plugins.patch --- Index: plugins/forms/Makefile.am =================================================================== --- plugins/forms/Makefile.am (wersja 541836) +++ plugins/forms/Makefile.am (kopia robocza) @@ -23,9 +23,10 @@ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp -libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner Index: plugins/reports/Makefile.am =================================================================== --- plugins/reports/Makefile.am (wersja 541836) +++ plugins/reports/Makefile.am (kopia robocza) @@ -5,24 +5,29 @@ kexihandler_report_la_SOURCES = kexireports.cpp kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined kexihandler_report_la_LIBADD = ../../core/libkexicore.la \ - ../../widget/utils/libkexiguiutils.la \ - ../../widget/libkexiextendedwidgets.la \ - ../../formeditor/libkformdesigner.la \ - ../forms/libkexiformutils.la \ + $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ ./libkexireportutils.la kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ ./libkexireportutils.la lib_LTLIBRARIES = libkexireportutils.la libkexireportutils_la_SOURCES = \ kexireportpart.cpp kexireportview.cpp kexireportform.cpp -libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop From fedora-extras-commits at redhat.com Tue May 30 08:18:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:18:38 -0700 Subject: rpms/libpqxx/devel .cvsignore, 1.3, 1.4 libpqxx.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605300818.k4U8IeIu000774@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv718/devel Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 +++ .cvsignore 30 May 2006 08:18:38 -0000 1.4 @@ -1 +1 @@ -libpqxx-2.5.5.tar.gz +libpqxx-2.6.6.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libpqxx.spec 16 Feb 2006 22:49:57 -0000 1.6 +++ libpqxx.spec 30 May 2006 08:18:38 -0000 1.7 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.5 -Release: 7%{?dist} +Version: 2.6.6 +Release: 1%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD -URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz +URL: http://pqxx.org +Source0: http://thaiopensource.org/download/software/libpqxx/libpqxx-2.6.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -57,7 +57,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.5.so +%{_libdir}/libpqxx-2.6.6.so %files devel %doc README-UPGRADE @@ -67,6 +67,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Mon May 29 2006 Andreas Bierfert 2.6.6-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 2.5.5-7 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2005 20:54:43 -0000 1.3 +++ sources 30 May 2006 08:18:38 -0000 1.4 @@ -1 +1 @@ -db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz +65f6fd330b9f673eaac4408eb6ea58fa libpqxx-2.6.6.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:18:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:18:32 -0700 Subject: rpms/libpqxx/FC-4 .cvsignore, 1.3, 1.4 libpqxx.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605300819.k4U8J4GH000781@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv718/FC-4 Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 +++ .cvsignore 30 May 2006 08:18:31 -0000 1.4 @@ -1 +1 @@ -libpqxx-2.5.5.tar.gz +libpqxx-2.6.6.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libpqxx.spec 28 Sep 2005 14:51:25 -0000 1.4 +++ libpqxx.spec 30 May 2006 08:18:31 -0000 1.5 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.5 -Release: 5%{?dist} +Version: 2.6.6 +Release: 1%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz +Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.6.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -57,7 +57,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.5.so +%{_libdir}/libpqxx-2.6.6.so %files devel %doc README-UPGRADE @@ -67,6 +67,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue May 30 2006 Andreas Bierfert 2.6.6-1 +- version upgrade + * Wed Sep 28 2005 Andreas Bierfert 2.5.5-5 - fix #169441 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2005 20:54:43 -0000 1.3 +++ sources 30 May 2006 08:18:31 -0000 1.4 @@ -1 +1 @@ -db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz +65f6fd330b9f673eaac4408eb6ea58fa libpqxx-2.6.6.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:18:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:18:32 -0700 Subject: rpms/libpqxx/FC-5 .cvsignore, 1.3, 1.4 libpqxx.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605300819.k4U8J4lt000786@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv718/FC-5 Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 +++ .cvsignore 30 May 2006 08:18:32 -0000 1.4 @@ -1 +1 @@ -libpqxx-2.5.5.tar.gz +libpqxx-2.6.6.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-5/libpqxx.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libpqxx.spec 16 Feb 2006 22:49:57 -0000 1.6 +++ libpqxx.spec 30 May 2006 08:18:32 -0000 1.7 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.5 -Release: 7%{?dist} +Version: 2.6.6 +Release: 1%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD -URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz +URL: http://pqxx.org +Source0: http://thaiopensource.org/download/software/libpqxx/libpqxx-2.6.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -57,7 +57,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.5.so +%{_libdir}/libpqxx-2.6.6.so %files devel %doc README-UPGRADE @@ -67,6 +67,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Mon May 29 2006 Andreas Bierfert 2.6.6-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 2.5.5-7 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2005 20:54:43 -0000 1.3 +++ sources 30 May 2006 08:18:32 -0000 1.4 @@ -1 +1 @@ -db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz +65f6fd330b9f673eaac4408eb6ea58fa libpqxx-2.6.6.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:23:49 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:23:49 -0700 Subject: rpms/python-ogg - New directory Message-ID: <200605300823.k4U8Np6H000908@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv882/python-ogg Log Message: Directory /cvs/extras/rpms/python-ogg added to the repository From fedora-extras-commits at redhat.com Tue May 30 08:23:50 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:23:50 -0700 Subject: rpms/python-ogg/devel - New directory Message-ID: <200605300823.k4U8NqWd000911@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv882/python-ogg/devel Log Message: Directory /cvs/extras/rpms/python-ogg/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 08:24:12 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:24:12 -0700 Subject: rpms/python-ogg Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300824.k4U8OEJV000955@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv927 Added Files: Makefile import.log Log Message: Setup of module python-ogg --- NEW FILE Makefile --- # Top level Makefile for module python-ogg all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 08:24:12 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:24:12 -0700 Subject: rpms/python-ogg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300824.k4U8OEMj000958@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv927/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-ogg --- NEW 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 May 30 08:25:08 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:25:08 -0700 Subject: rpms/python-ogg import.log,1.1,1.2 Message-ID: <200605300825.k4U8PAua001025@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv992 Modified Files: import.log Log Message: auto-import python-ogg-1.3-2 on branch devel from python-ogg-1.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-ogg/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 08:24:12 -0000 1.1 +++ import.log 30 May 2006 08:25:08 -0000 1.2 @@ -0,0 +1 @@ +python-ogg-1_3-2:HEAD:python-ogg-1.3-2.src.rpm:1148977948 From fedora-extras-commits at redhat.com Tue May 30 08:25:09 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:25:09 -0700 Subject: rpms/python-ogg/devel python-ogg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300825.k4U8PB0C001030@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv992/devel Modified Files: .cvsignore sources Added Files: python-ogg.spec Log Message: auto-import python-ogg-1.3-2 on branch devel from python-ogg-1.3-2.src.rpm --- NEW FILE python-ogg.spec --- # Some informations on this spec were based on dries' work available in URL # http://dries.ulyssis.org/rpm/packages/python-ogg/info.html %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_incdir: %define python_incdir %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")} Name: python-ogg Version: 1.3 Release: 2%{?dist} Summary: A Python wrapper for the Ogg libraries Group: Development/Languages License: LGPL URL: http://www.andrewchatham.com/pyogg/ Source0: http://www.andrewchatham.com/pyogg/download/pyogg-1.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, libogg-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description An object-oriented Python binding for the Ogg libraries. Ogg is a multimedia bitstream format. With this you can write your own python applications to play and encode audio files in Ogg format. %package devel Summary: Development files for the Ogg Python Wrapper Group: Development/Libraries Requires: %{name} = %{version}-%{release}, libogg-devel %description devel This package contains headers and libraries required to build applications that use the python-ogg, a python wrapper for the Ogg libraries. %prep %setup -q -n pyogg-%{version} %build %{__python} config_unix.py 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 AUTHORS ChangeLog COPYING NEWS README # Include files and dirs below %{python_sitelib} (for noarch packages) and # %{python_sitearch} (for arch-dependent packages) as appropriate, and mark # *.pyo as %ghost (do not include in package). %ghost %{python_sitearch}/ogg/*.pyo %{python_sitearch}/ogg/*.pyc %{python_sitearch}/ogg/*.py %{python_sitearch}/ogg/_ogg.so %files devel %defattr(-,root,root,-) %{python_incdir}/pyogg/pyogg.h %changelog * Thu May 25 2006 Hugo Cisneiros 1.3-2 - Forked the package with a -devel one including the header. * Fri May 19 2006 Hugo Cisneiros 1.3-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-ogg/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 08:24:12 -0000 1.1 +++ .cvsignore 30 May 2006 08:25:09 -0000 1.2 @@ -0,0 +1 @@ +pyogg-1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-ogg/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 08:24:12 -0000 1.1 +++ sources 30 May 2006 08:25:09 -0000 1.2 @@ -0,0 +1 @@ +45a4ecc4d0600661199e4040a81ea3fe pyogg-1.3.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:26:52 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:26:52 -0700 Subject: rpms/python-vorbis - New directory Message-ID: <200605300826.k4U8Qsbl001171@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1145/python-vorbis Log Message: Directory /cvs/extras/rpms/python-vorbis added to the repository From fedora-extras-commits at redhat.com Tue May 30 08:26:52 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:26:52 -0700 Subject: rpms/python-vorbis/devel - New directory Message-ID: <200605300826.k4U8QssE001174@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1145/python-vorbis/devel Log Message: Directory /cvs/extras/rpms/python-vorbis/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 08:27:17 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:27:17 -0700 Subject: rpms/python-vorbis Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300827.k4U8RJ8c001249@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1194 Added Files: Makefile import.log Log Message: Setup of module python-vorbis --- NEW FILE Makefile --- # Top level Makefile for module python-vorbis all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 08:27:17 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:27:17 -0700 Subject: rpms/python-vorbis/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300827.k4U8RJZo001254@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1194/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-vorbis --- NEW 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 May 30 08:28:11 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:28:11 -0700 Subject: rpms/python-vorbis import.log,1.1,1.2 Message-ID: <200605300828.k4U8SDOr001327@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1294 Modified Files: import.log Log Message: auto-import python-vorbis-1.3-2 on branch devel from python-vorbis-1.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-vorbis/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 08:27:16 -0000 1.1 +++ import.log 30 May 2006 08:28:11 -0000 1.2 @@ -0,0 +1 @@ +python-vorbis-1_3-2:HEAD:python-vorbis-1.3-2.src.rpm:1148978131 From fedora-extras-commits at redhat.com Tue May 30 08:28:12 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:28:12 -0700 Subject: rpms/python-vorbis/devel python-vorbis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300828.k4U8SEaX001332@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1294/devel Modified Files: .cvsignore sources Added Files: python-vorbis.spec Log Message: auto-import python-vorbis-1.3-2 on branch devel from python-vorbis-1.3-2.src.rpm --- NEW FILE python-vorbis.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-vorbis Version: 1.3 Release: 2%{?dist} Summary: A Python wrapper for the Ogg Vorbis audio libraries Group: Development/Languages License: LGPL URL: http://www.andrewchatham.com/pyogg/ Source0: http://www.andrewchatham.com/pyogg/download/pyvorbis-1.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-ogg-devel, libvorbis-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description An object-oriented Python binding for the Ogg Vorbis libraries. Ogg is a multimedia bitstream format. With this you can write your own python applications to play and encode audio files in Ogg Vorbis format. %prep %setup -q -n pyvorbis-%{version} %build %{__python} config_unix.py 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 AUTHORS ChangeLog COPYING NEWS README # Include files and dirs below %{python_sitelib} (for noarch packages) and # %{python_sitearch} (for arch-dependent packages) as appropriate, and mark # *.pyo as %ghost (do not include in package). %{python_sitearch}/ogg/vorbis.so %changelog * Thu May 25 2006 Hugo Cisneiros 1.3-2 - Improvements in BuildRequires dependencies (point to python-ogg-devel) * Fri May 19 2006 Hugo Cisneiros 1.3-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-vorbis/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 08:27:17 -0000 1.1 +++ .cvsignore 30 May 2006 08:28:11 -0000 1.2 @@ -0,0 +1 @@ +pyvorbis-1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-vorbis/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 08:27:17 -0000 1.1 +++ sources 30 May 2006 08:28:11 -0000 1.2 @@ -0,0 +1 @@ +3ddd0dc996b57827c324910cc899d40b pyvorbis-1.3.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:37:12 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:37:12 -0700 Subject: owners owners.list,1.1074,1.1075 Message-ID: <200605300837.k4U8bEu5001462@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1441 Modified Files: owners.list Log Message: added python-ogg and python-vorbis packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1074 retrieving revision 1.1075 diff -u -r1.1074 -r1.1075 --- owners.list 30 May 2006 07:57:20 -0000 1.1074 +++ owners.list 30 May 2006 08:37:12 -0000 1.1075 @@ -1395,6 +1395,7 @@ Fedora Extras|python-nose|A discovery-based unittest extension for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-numarray|Python array manipulation and computational library|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|python-ogg|A Python wrapper for the Ogg libraries|hugo at devin.com.br|extras-qa at fedoraproject.org| Fedora Extras|python-paramiko|A SSH2 protocol library for python|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-protocols|PyProtocols 'adapt()' implementation|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-psyco|Python specializing compiler|shahms at shahms.com|extras-qa at fedoraproject.org| @@ -1411,6 +1412,7 @@ Fedora Extras|python-TestGears|Unit testing for Python|ivazquez at ivazquez.net|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|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org| Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|PyX|Python graphics package|mpeters at mac.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 30 08:37:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:37:25 -0700 Subject: rpms/koffice-langpack/FC-4 .cvsignore, 1.4, 1.5 koffice-langpack.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605300837.k4U8bRil001517@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice-langpack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1460/FC-4 Modified Files: .cvsignore koffice-langpack.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Apr 2006 01:24:55 -0000 1.4 +++ .cvsignore 30 May 2006 08:37:24 -0000 1.5 @@ -46,3 +46,51 @@ koffice-l10n-uk-1.5.0.tar.bz2 koffice-l10n-uz-1.5.0.tar.bz2 koffice-l10n-zh_CN-1.5.0.tar.bz2 +koffice-l10n-af-1.5.1.tar.bz2 +koffice-l10n-ar-1.5.1.tar.bz2 +koffice-l10n-bg-1.5.1.tar.bz2 +koffice-l10n-br-1.5.1.tar.bz2 +koffice-l10n-bs-1.5.1.tar.bz2 +koffice-l10n-ca-1.5.1.tar.bz2 +koffice-l10n-cs-1.5.1.tar.bz2 +koffice-l10n-cy-1.5.1.tar.bz2 +koffice-l10n-da-1.5.1.tar.bz2 +koffice-l10n-de-1.5.1.tar.bz2 +koffice-l10n-el-1.5.1.tar.bz2 +koffice-l10n-en_GB-1.5.1.tar.bz2 +koffice-l10n-eo-1.5.1.tar.bz2 +koffice-l10n-es-1.5.1.tar.bz2 +koffice-l10n-et-1.5.1.tar.bz2 +koffice-l10n-eu-1.5.1.tar.bz2 +koffice-l10n-fi-1.5.1.tar.bz2 +koffice-l10n-fr-1.5.1.tar.bz2 +koffice-l10n-ga-1.5.1.tar.bz2 +koffice-l10n-he-1.5.1.tar.bz2 +koffice-l10n-hi-1.5.1.tar.bz2 +koffice-l10n-hu-1.5.1.tar.bz2 +koffice-l10n-is-1.5.1.tar.bz2 +koffice-l10n-it-1.5.1.tar.bz2 +koffice-l10n-ja-1.5.1.tar.bz2 +koffice-l10n-lt-1.5.1.tar.bz2 +koffice-l10n-mk-1.5.1.tar.bz2 +koffice-l10n-ms-1.5.1.tar.bz2 +koffice-l10n-nb-1.5.1.tar.bz2 +koffice-l10n-nl-1.5.1.tar.bz2 +koffice-l10n-nn-1.5.1.tar.bz2 +koffice-l10n-pl-1.5.1.tar.bz2 +koffice-l10n-pt-1.5.1.tar.bz2 +koffice-l10n-pt_BR-1.5.1.tar.bz2 +koffice-l10n-ro-1.5.1.tar.bz2 +koffice-l10n-ru-1.5.1.tar.bz2 +koffice-l10n-se-1.5.1.tar.bz2 +koffice-l10n-sk-1.5.1.tar.bz2 +koffice-l10n-sl-1.5.1.tar.bz2 +koffice-l10n-sr-1.5.1.tar.bz2 +koffice-l10n-sr at Latn-1.5.1.tar.bz2 +koffice-l10n-sv-1.5.1.tar.bz2 +koffice-l10n-ta-1.5.1.tar.bz2 +koffice-l10n-tg-1.5.1.tar.bz2 +koffice-l10n-tr-1.5.1.tar.bz2 +koffice-l10n-uk-1.5.1.tar.bz2 +koffice-l10n-uz-1.5.1.tar.bz2 +koffice-l10n-zh_CN-1.5.1.tar.bz2 Index: koffice-langpack.spec =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/koffice-langpack.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- koffice-langpack.spec 22 Apr 2006 01:24:55 -0000 1.4 +++ koffice-langpack.spec 30 May 2006 08:37:24 -0000 1.5 @@ -1,58 +1,59 @@ Name: koffice-langpack -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Language files for koffice Group: Applications/Productivity License: GPL URL: http://www.koffice.org -Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2 -Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2 -Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2 -Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2 -Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2 -Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2 -Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2 -Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2 -Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2 -Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2 -Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2 -Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2 -Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2 -Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2 -Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2 -Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2 -Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2 -Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2 -Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2 -Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2 -Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2 -Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2 -Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2 -Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2 -Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2 -Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2 -Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2 -Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2 -Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2 -Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2 -Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2 -Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2 -Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2 -Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2 -Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2 -Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2 -Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2 -Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2 -Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2 -Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2 -Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2 -Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2 -Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2 -Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2 -Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2 -Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2 -Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2 +Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-af-1.5.1.tar.bz2 +Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ar-1.5.1.tar.bz2 +Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bg-1.5.1.tar.bz2 +Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-br-1.5.1.tar.bz2 +Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bs-1.5.1.tar.bz2 +Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ca-1.5.1.tar.bz2 +Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cs-1.5.1.tar.bz2 +Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cy-1.5.1.tar.bz2 +Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-da-1.5.1.tar.bz2 +Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-de-1.5.1.tar.bz2 +Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-el-1.5.1.tar.bz2 +Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-en_GB-1.5.1.tar.bz2 +Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eo-1.5.1.tar.bz2 +Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-es-1.5.1.tar.bz2 +Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-et-1.5.1.tar.bz2 +Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eu-1.5.1.tar.bz2 +Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fi-1.5.1.tar.bz2 +Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fr-1.5.1.tar.bz2 +Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ga-1.5.1.tar.bz2 +Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-he-1.5.1.tar.bz2 +Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hi-1.5.1.tar.bz2 +Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hu-1.5.1.tar.bz2 +Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-is-1.5.1.tar.bz2 +Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-it-1.5.1.tar.bz2 +Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ja-1.5.1.tar.bz2 +Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-lt-1.5.1.tar.bz2 +Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-mk-1.5.1.tar.bz2 +Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nb-1.5.1.tar.bz2 +Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nl-1.5.1.tar.bz2 +Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nn-1.5.1.tar.bz2 +Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pl-1.5.1.tar.bz2 +Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt-1.5.1.tar.bz2 +Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt_BR-1.5.1.tar.bz2 +Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ro-1.5.1.tar.bz2 +Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ru-1.5.1.tar.bz2 +Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-se-1.5.1.tar.bz2 +Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sk-1.5.1.tar.bz2 +Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sl-1.5.1.tar.bz2 +Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr-1.5.1.tar.bz2 +Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.1.tar.bz2 +Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sv-1.5.1.tar.bz2 +Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ta-1.5.1.tar.bz2 +Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tg-1.5.1.tar.bz2 +Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tr-1.5.1.tar.bz2 +Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uk-1.5.1.tar.bz2 +Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uz-1.5.1.tar.bz2 +Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-zh_CN-1.5.1.tar.bz2 +Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ms-1.5.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -283,6 +284,14 @@ %description mk Provides additional macedonian translations for koffice +%package ms +Summary: Malay language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description ms +Provides additional malay translations for koffice + %package nb Summary: Bokmal language pack for koffice Group: Applications/Productivity @@ -426,6 +435,14 @@ %description uk Provides additional ukrainian translations for koffice +%package uz +Summary: Uzbek language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description uz +Provides additional uzbek translations for koffice + %package zh_CN Summary: Simplified Chinese language pack for koffice Group: Applications/Productivity @@ -485,12 +502,13 @@ %{__tar} xjvf %{SOURCE44} %{__tar} xjvf %{SOURCE45} %{__tar} xjvf %{SOURCE46} +%{__tar} xjvf %{SOURCE47} %build # dont work: et for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} %configure make %{?_smp_mflags} @@ -500,8 +518,8 @@ %install rm -rf $RPM_BUILD_ROOT for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} make install DESTDIR=$RPM_BUILD_ROOT done @@ -647,6 +665,10 @@ %defattr(-,root,root,-) %lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/* +%files ms +%defattr(-,root,root,-) +%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/* + %files nb %defattr(-,root,root,-) %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/* @@ -728,11 +750,19 @@ %defattr(-,root,root,-) %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/* +%files uz +%defattr(-,root,root,-) +%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/* + %files zh_CN %defattr(-,root,root,-) %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* %changelog +* Tue May 30 2006 Andreas Bierfert +1.5.1-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 1.5.0-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Apr 2006 01:24:55 -0000 1.4 +++ sources 30 May 2006 08:37:24 -0000 1.5 @@ -1,48 +1,48 @@ - -03217f2f39b1a21cc685a5aa85200247 koffice-l10n-af-1.5.0.tar.bz2 -922cdc3f2de8d350deaf54c32feab117 koffice-l10n-ar-1.5.0.tar.bz2 -5e24b5028de337c2cbda323fa69d56f2 koffice-l10n-bg-1.5.0.tar.bz2 -4c5c9d834f14defd87c5580092002e51 koffice-l10n-br-1.5.0.tar.bz2 -6086121e25b243d7b5543dc15ebaf3ee koffice-l10n-bs-1.5.0.tar.bz2 -cc24df3b6d3899b89776e2d2cabb3eb5 koffice-l10n-ca-1.5.0.tar.bz2 -193f7d66d9b5c945932ee9868721f9f1 koffice-l10n-cs-1.5.0.tar.bz2 -14c6069119fb491e6b430d6663e3a60f koffice-l10n-cy-1.5.0.tar.bz2 -fedd3f7c0c39a40940576fb86d7262f0 koffice-l10n-da-1.5.0.tar.bz2 -fe3334c31472b006907f59f47db6cb75 koffice-l10n-de-1.5.0.tar.bz2 -d7384ecf60617aa054ec3ded25cff1ea koffice-l10n-el-1.5.0.tar.bz2 -5f00c66613f2250babd4cb02590952df koffice-l10n-en_GB-1.5.0.tar.bz2 -79d73a7d8e5a284e1c997cbec6bc804c koffice-l10n-eo-1.5.0.tar.bz2 -0abef42c4ea3a0992b69933ad1e94287 koffice-l10n-es-1.5.0.tar.bz2 -149ba841f9dc322336b9c153b598dea5 koffice-l10n-et-1.5.0.tar.bz2 -af2a4e93887cd55ba0cda123362650d7 koffice-l10n-eu-1.5.0.tar.bz2 -e87c44fc8c7b10c4c44c76d90cb1ca7c koffice-l10n-fi-1.5.0.tar.bz2 -65b9b6fd7903050c4c170af11aa94fb2 koffice-l10n-fr-1.5.0.tar.bz2 -47b453c7444e404c19cc8dc85cf56d37 koffice-l10n-ga-1.5.0.tar.bz2 -1d0810b08947f072631615ffa3260bec koffice-l10n-he-1.5.0.tar.bz2 -82231d5c7e273d0384d04e80be228167 koffice-l10n-hi-1.5.0.tar.bz2 -9c1d2441a49eaf06a6adac3f61590076 koffice-l10n-hu-1.5.0.tar.bz2 -3fc01e0a34d0ce9a2988ef30df638f62 koffice-l10n-is-1.5.0.tar.bz2 -db8b9a1bb5114e69c3768508c09bde8d koffice-l10n-it-1.5.0.tar.bz2 -16435cf9fd545529bea61010fb35ad03 koffice-l10n-ja-1.5.0.tar.bz2 -c306e0bfdccd60fd9f11e93828475fac koffice-l10n-lt-1.5.0.tar.bz2 -b0469b72436e35a1101ee9ea4e981ae3 koffice-l10n-mk-1.5.0.tar.bz2 -8cffcf181366737bea12a1ae9a14c294 koffice-l10n-nb-1.5.0.tar.bz2 -f4bfc5952a2612c72443d266df034e7d koffice-l10n-nl-1.5.0.tar.bz2 -bb3444c52bcbc33aaaad542454048c69 koffice-l10n-nn-1.5.0.tar.bz2 -442946625f984e8eb9f977c39a57749d koffice-l10n-pl-1.5.0.tar.bz2 -285b5766d9955de0fd7c2599b25115ab koffice-l10n-pt-1.5.0.tar.bz2 -41373317668d2d7cbc20e4a5a188daf6 koffice-l10n-pt_BR-1.5.0.tar.bz2 -35fb855cb7c18b95a11602a7c8483d2d koffice-l10n-ro-1.5.0.tar.bz2 -f5842b78af8ba903129942dfa7f6d7d4 koffice-l10n-ru-1.5.0.tar.bz2 -d153416b1403f7e4cf8a03b5739ab6a9 koffice-l10n-se-1.5.0.tar.bz2 -400b547e0520fe769594d4f39c3ec769 koffice-l10n-sk-1.5.0.tar.bz2 -7e73b04ed5952631efa8ef9ed216ce3d koffice-l10n-sl-1.5.0.tar.bz2 -5b7f01f22ae97c8983411b043c41a689 koffice-l10n-sr-1.5.0.tar.bz2 -5bafc53a3c3b4f863fd28fc9f0a090f9 koffice-l10n-sr at Latn-1.5.0.tar.bz2 -810dd9311472f1e60f90c9fdfcc6c84c koffice-l10n-sv-1.5.0.tar.bz2 -2991caa710ad20da8925331a51026498 koffice-l10n-ta-1.5.0.tar.bz2 -3c9f50e64cc892cfcb840c424b2940e4 koffice-l10n-tg-1.5.0.tar.bz2 -411466bf3f0f7340431f2f6448332a89 koffice-l10n-tr-1.5.0.tar.bz2 -8e3294a78b9beab5122703d61d2e9a2c koffice-l10n-uk-1.5.0.tar.bz2 -ace68fe74216fb0a57024fb3b750fdaf koffice-l10n-uz-1.5.0.tar.bz2 -3b15bc617451461f9911ad316a264005 koffice-l10n-zh_CN-1.5.0.tar.bz2 +99f5fae8b0d15bcdec7daa3dfadfc20d koffice-l10n-af-1.5.1.tar.bz2 +3ace1a68c04d3cb3d0e2b45ab9a059d0 koffice-l10n-ar-1.5.1.tar.bz2 +8daaeb614b3439490c2dd64a5ca6a90d koffice-l10n-bg-1.5.1.tar.bz2 +bed06b1e8dc15ab3f0360d66ecb5eca8 koffice-l10n-br-1.5.1.tar.bz2 +f5e83bf3d981a433fe8470947ed22c0a koffice-l10n-bs-1.5.1.tar.bz2 +a9386b6c6049814d6f4a3f67a4cb51d8 koffice-l10n-ca-1.5.1.tar.bz2 +6f68790c56564626e42949979a4e1dba koffice-l10n-cs-1.5.1.tar.bz2 +780d5816865f60b88209059c6c2e7d02 koffice-l10n-cy-1.5.1.tar.bz2 +aa38e3e0f04a930e89543cfb79c6184d koffice-l10n-da-1.5.1.tar.bz2 +dcd8043ab5b5d2642e4302f1f89fc639 koffice-l10n-de-1.5.1.tar.bz2 +350963ba95241e2576c077d4558d7fcb koffice-l10n-el-1.5.1.tar.bz2 +b7ae8b4aee9810f2b78235962f7f1dc2 koffice-l10n-en_GB-1.5.1.tar.bz2 +71c42a69ea9c417494d1603bc3b646b8 koffice-l10n-eo-1.5.1.tar.bz2 +70b926928aa1a2facb3409f144191967 koffice-l10n-es-1.5.1.tar.bz2 +23311d668c05da159ea12240f950e763 koffice-l10n-et-1.5.1.tar.bz2 +39f2c93001a037b79eda7e3f9611ea8a koffice-l10n-eu-1.5.1.tar.bz2 +f72750aa5c9cd5aa3814715ff36acd33 koffice-l10n-fi-1.5.1.tar.bz2 +d63d63daa55fa32e5c93b72c902cd4d1 koffice-l10n-fr-1.5.1.tar.bz2 +42615504255afdbadcbaafb197a6adb4 koffice-l10n-ga-1.5.1.tar.bz2 +a20e78860f0975b65ed59720924591ca koffice-l10n-he-1.5.1.tar.bz2 +37de7254e2d6610ad395c260cb002201 koffice-l10n-hi-1.5.1.tar.bz2 +8a8d4f7adaaed89063c4971c9bbfbf43 koffice-l10n-hu-1.5.1.tar.bz2 +33cf09b995ffde0c28a794ce3f6c6d51 koffice-l10n-is-1.5.1.tar.bz2 +71cf4cad9272090e6469a96736bd785e koffice-l10n-it-1.5.1.tar.bz2 +8f7893e842afd51368bd18c37b221f57 koffice-l10n-ja-1.5.1.tar.bz2 +6ece374294c001730552883defb0a53c koffice-l10n-lt-1.5.1.tar.bz2 +6adad6081c79ac9dc3edcae7bb5a9494 koffice-l10n-mk-1.5.1.tar.bz2 +43f77ffa86d70b1fb42cf4bc2312e783 koffice-l10n-ms-1.5.1.tar.bz2 +ff774ceadd4c42b80ab138c4446d8843 koffice-l10n-nb-1.5.1.tar.bz2 +f76f2b7b8a65a528d3d0514f5f1a0cbf koffice-l10n-nl-1.5.1.tar.bz2 +12a451ca1384c776045a86aa3f0fecb5 koffice-l10n-nn-1.5.1.tar.bz2 +5580950ba10229b65563ae8b9c29e8c4 koffice-l10n-pl-1.5.1.tar.bz2 +549c4668a4ec2fbc71a2fadb9597ea8f koffice-l10n-pt-1.5.1.tar.bz2 +5882aeae172ccfebbf68bad8f4dc0ced koffice-l10n-pt_BR-1.5.1.tar.bz2 +b01b4652edcd49e2d1f77db8040a2552 koffice-l10n-ro-1.5.1.tar.bz2 +7a484f7d54125398516cf54a2139e84d koffice-l10n-ru-1.5.1.tar.bz2 +ae4b1cabf24dcf7a89fbef573b07301a koffice-l10n-se-1.5.1.tar.bz2 +11a9def76b738074d5a70bf81a5e5b4b koffice-l10n-sk-1.5.1.tar.bz2 +4520614986d6fb70b1d4b8eb117815a5 koffice-l10n-sl-1.5.1.tar.bz2 +a825f39361da5599bcd572907eb9d068 koffice-l10n-sr-1.5.1.tar.bz2 +0413072d626a8b6291f65504f76d93f6 koffice-l10n-sr at Latn-1.5.1.tar.bz2 +4afcc6585df0a171e90b595c3d3311ae koffice-l10n-sv-1.5.1.tar.bz2 +536e66f3b85923771f2af964b51a465e koffice-l10n-ta-1.5.1.tar.bz2 +a38ec98b0f6437ddb93196f369a09485 koffice-l10n-tg-1.5.1.tar.bz2 +0026e7f0b40b76a700792bf3a8a40427 koffice-l10n-tr-1.5.1.tar.bz2 +114018e8d5e5935c8d47c717dbb3523c koffice-l10n-uk-1.5.1.tar.bz2 +b4ce57436f31a2c5b63572b27b1c3582 koffice-l10n-uz-1.5.1.tar.bz2 +f691b1667472c36f8c8ec3fb69ac11ea koffice-l10n-zh_CN-1.5.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 08:37:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:37:25 -0700 Subject: rpms/koffice-langpack/FC-5 .cvsignore, 1.4, 1.5 koffice-langpack.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605300837.k4U8bRuQ001523@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice-langpack/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1460/FC-5 Modified Files: .cvsignore koffice-langpack.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Apr 2006 01:24:55 -0000 1.4 +++ .cvsignore 30 May 2006 08:37:25 -0000 1.5 @@ -46,3 +46,51 @@ koffice-l10n-uk-1.5.0.tar.bz2 koffice-l10n-uz-1.5.0.tar.bz2 koffice-l10n-zh_CN-1.5.0.tar.bz2 +koffice-l10n-af-1.5.1.tar.bz2 +koffice-l10n-ar-1.5.1.tar.bz2 +koffice-l10n-bg-1.5.1.tar.bz2 +koffice-l10n-br-1.5.1.tar.bz2 +koffice-l10n-bs-1.5.1.tar.bz2 +koffice-l10n-ca-1.5.1.tar.bz2 +koffice-l10n-cs-1.5.1.tar.bz2 +koffice-l10n-cy-1.5.1.tar.bz2 +koffice-l10n-da-1.5.1.tar.bz2 +koffice-l10n-de-1.5.1.tar.bz2 +koffice-l10n-el-1.5.1.tar.bz2 +koffice-l10n-en_GB-1.5.1.tar.bz2 +koffice-l10n-eo-1.5.1.tar.bz2 +koffice-l10n-es-1.5.1.tar.bz2 +koffice-l10n-et-1.5.1.tar.bz2 +koffice-l10n-eu-1.5.1.tar.bz2 +koffice-l10n-fi-1.5.1.tar.bz2 +koffice-l10n-fr-1.5.1.tar.bz2 +koffice-l10n-ga-1.5.1.tar.bz2 +koffice-l10n-he-1.5.1.tar.bz2 +koffice-l10n-hi-1.5.1.tar.bz2 +koffice-l10n-hu-1.5.1.tar.bz2 +koffice-l10n-is-1.5.1.tar.bz2 +koffice-l10n-it-1.5.1.tar.bz2 +koffice-l10n-ja-1.5.1.tar.bz2 +koffice-l10n-lt-1.5.1.tar.bz2 +koffice-l10n-mk-1.5.1.tar.bz2 +koffice-l10n-ms-1.5.1.tar.bz2 +koffice-l10n-nb-1.5.1.tar.bz2 +koffice-l10n-nl-1.5.1.tar.bz2 +koffice-l10n-nn-1.5.1.tar.bz2 +koffice-l10n-pl-1.5.1.tar.bz2 +koffice-l10n-pt-1.5.1.tar.bz2 +koffice-l10n-pt_BR-1.5.1.tar.bz2 +koffice-l10n-ro-1.5.1.tar.bz2 +koffice-l10n-ru-1.5.1.tar.bz2 +koffice-l10n-se-1.5.1.tar.bz2 +koffice-l10n-sk-1.5.1.tar.bz2 +koffice-l10n-sl-1.5.1.tar.bz2 +koffice-l10n-sr-1.5.1.tar.bz2 +koffice-l10n-sr at Latn-1.5.1.tar.bz2 +koffice-l10n-sv-1.5.1.tar.bz2 +koffice-l10n-ta-1.5.1.tar.bz2 +koffice-l10n-tg-1.5.1.tar.bz2 +koffice-l10n-tr-1.5.1.tar.bz2 +koffice-l10n-uk-1.5.1.tar.bz2 +koffice-l10n-uz-1.5.1.tar.bz2 +koffice-l10n-zh_CN-1.5.1.tar.bz2 Index: koffice-langpack.spec =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/koffice-langpack.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- koffice-langpack.spec 22 Apr 2006 01:24:55 -0000 1.5 +++ koffice-langpack.spec 30 May 2006 08:37:25 -0000 1.6 @@ -1,58 +1,59 @@ Name: koffice-langpack -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Language files for koffice Group: Applications/Productivity License: GPL URL: http://www.koffice.org -Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2 -Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2 -Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2 -Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2 -Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2 -Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2 -Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2 -Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2 -Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2 -Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2 -Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2 -Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2 -Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2 -Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2 -Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2 -Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2 -Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2 -Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2 -Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2 -Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2 -Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2 -Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2 -Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2 -Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2 -Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2 -Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2 -Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2 -Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2 -Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2 -Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2 -Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2 -Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2 -Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2 -Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2 -Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2 -Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2 -Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2 -Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2 -Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2 -Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2 -Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2 -Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2 -Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2 -Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2 -Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2 -Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2 -Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2 +Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-af-1.5.1.tar.bz2 +Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ar-1.5.1.tar.bz2 +Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bg-1.5.1.tar.bz2 +Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-br-1.5.1.tar.bz2 +Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bs-1.5.1.tar.bz2 +Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ca-1.5.1.tar.bz2 +Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cs-1.5.1.tar.bz2 +Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cy-1.5.1.tar.bz2 +Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-da-1.5.1.tar.bz2 +Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-de-1.5.1.tar.bz2 +Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-el-1.5.1.tar.bz2 +Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-en_GB-1.5.1.tar.bz2 +Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eo-1.5.1.tar.bz2 +Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-es-1.5.1.tar.bz2 +Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-et-1.5.1.tar.bz2 +Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eu-1.5.1.tar.bz2 +Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fi-1.5.1.tar.bz2 +Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fr-1.5.1.tar.bz2 +Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ga-1.5.1.tar.bz2 +Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-he-1.5.1.tar.bz2 +Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hi-1.5.1.tar.bz2 +Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hu-1.5.1.tar.bz2 +Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-is-1.5.1.tar.bz2 +Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-it-1.5.1.tar.bz2 +Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ja-1.5.1.tar.bz2 +Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-lt-1.5.1.tar.bz2 +Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-mk-1.5.1.tar.bz2 +Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nb-1.5.1.tar.bz2 +Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nl-1.5.1.tar.bz2 +Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nn-1.5.1.tar.bz2 +Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pl-1.5.1.tar.bz2 +Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt-1.5.1.tar.bz2 +Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt_BR-1.5.1.tar.bz2 +Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ro-1.5.1.tar.bz2 +Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ru-1.5.1.tar.bz2 +Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-se-1.5.1.tar.bz2 +Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sk-1.5.1.tar.bz2 +Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sl-1.5.1.tar.bz2 +Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr-1.5.1.tar.bz2 +Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.1.tar.bz2 +Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sv-1.5.1.tar.bz2 +Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ta-1.5.1.tar.bz2 +Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tg-1.5.1.tar.bz2 +Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tr-1.5.1.tar.bz2 +Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uk-1.5.1.tar.bz2 +Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uz-1.5.1.tar.bz2 +Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-zh_CN-1.5.1.tar.bz2 +Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ms-1.5.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -283,6 +284,14 @@ %description mk Provides additional macedonian translations for koffice +%package ms +Summary: Malay language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description ms +Provides additional malay translations for koffice + %package nb Summary: Bokmal language pack for koffice Group: Applications/Productivity @@ -426,6 +435,14 @@ %description uk Provides additional ukrainian translations for koffice +%package uz +Summary: Uzbek language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description uz +Provides additional uzbek translations for koffice + %package zh_CN Summary: Simplified Chinese language pack for koffice Group: Applications/Productivity @@ -485,12 +502,13 @@ %{__tar} xjvf %{SOURCE44} %{__tar} xjvf %{SOURCE45} %{__tar} xjvf %{SOURCE46} +%{__tar} xjvf %{SOURCE47} %build # dont work: et for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} %configure make %{?_smp_mflags} @@ -500,8 +518,8 @@ %install rm -rf $RPM_BUILD_ROOT for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} make install DESTDIR=$RPM_BUILD_ROOT done @@ -647,6 +665,10 @@ %defattr(-,root,root,-) %lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/* +%files ms +%defattr(-,root,root,-) +%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/* + %files nb %defattr(-,root,root,-) %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/* @@ -728,11 +750,19 @@ %defattr(-,root,root,-) %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/* +%files uz +%defattr(-,root,root,-) +%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/* + %files zh_CN %defattr(-,root,root,-) %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* %changelog +* Tue May 30 2006 Andreas Bierfert +1.5.1-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 1.5.0-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Apr 2006 01:24:55 -0000 1.4 +++ sources 30 May 2006 08:37:25 -0000 1.5 @@ -1,48 +1,48 @@ - -03217f2f39b1a21cc685a5aa85200247 koffice-l10n-af-1.5.0.tar.bz2 -922cdc3f2de8d350deaf54c32feab117 koffice-l10n-ar-1.5.0.tar.bz2 -5e24b5028de337c2cbda323fa69d56f2 koffice-l10n-bg-1.5.0.tar.bz2 -4c5c9d834f14defd87c5580092002e51 koffice-l10n-br-1.5.0.tar.bz2 -6086121e25b243d7b5543dc15ebaf3ee koffice-l10n-bs-1.5.0.tar.bz2 -cc24df3b6d3899b89776e2d2cabb3eb5 koffice-l10n-ca-1.5.0.tar.bz2 -193f7d66d9b5c945932ee9868721f9f1 koffice-l10n-cs-1.5.0.tar.bz2 -14c6069119fb491e6b430d6663e3a60f koffice-l10n-cy-1.5.0.tar.bz2 -fedd3f7c0c39a40940576fb86d7262f0 koffice-l10n-da-1.5.0.tar.bz2 -fe3334c31472b006907f59f47db6cb75 koffice-l10n-de-1.5.0.tar.bz2 -d7384ecf60617aa054ec3ded25cff1ea koffice-l10n-el-1.5.0.tar.bz2 -5f00c66613f2250babd4cb02590952df koffice-l10n-en_GB-1.5.0.tar.bz2 -79d73a7d8e5a284e1c997cbec6bc804c koffice-l10n-eo-1.5.0.tar.bz2 -0abef42c4ea3a0992b69933ad1e94287 koffice-l10n-es-1.5.0.tar.bz2 -149ba841f9dc322336b9c153b598dea5 koffice-l10n-et-1.5.0.tar.bz2 -af2a4e93887cd55ba0cda123362650d7 koffice-l10n-eu-1.5.0.tar.bz2 -e87c44fc8c7b10c4c44c76d90cb1ca7c koffice-l10n-fi-1.5.0.tar.bz2 -65b9b6fd7903050c4c170af11aa94fb2 koffice-l10n-fr-1.5.0.tar.bz2 -47b453c7444e404c19cc8dc85cf56d37 koffice-l10n-ga-1.5.0.tar.bz2 -1d0810b08947f072631615ffa3260bec koffice-l10n-he-1.5.0.tar.bz2 -82231d5c7e273d0384d04e80be228167 koffice-l10n-hi-1.5.0.tar.bz2 -9c1d2441a49eaf06a6adac3f61590076 koffice-l10n-hu-1.5.0.tar.bz2 -3fc01e0a34d0ce9a2988ef30df638f62 koffice-l10n-is-1.5.0.tar.bz2 -db8b9a1bb5114e69c3768508c09bde8d koffice-l10n-it-1.5.0.tar.bz2 -16435cf9fd545529bea61010fb35ad03 koffice-l10n-ja-1.5.0.tar.bz2 -c306e0bfdccd60fd9f11e93828475fac koffice-l10n-lt-1.5.0.tar.bz2 -b0469b72436e35a1101ee9ea4e981ae3 koffice-l10n-mk-1.5.0.tar.bz2 -8cffcf181366737bea12a1ae9a14c294 koffice-l10n-nb-1.5.0.tar.bz2 -f4bfc5952a2612c72443d266df034e7d koffice-l10n-nl-1.5.0.tar.bz2 -bb3444c52bcbc33aaaad542454048c69 koffice-l10n-nn-1.5.0.tar.bz2 -442946625f984e8eb9f977c39a57749d koffice-l10n-pl-1.5.0.tar.bz2 -285b5766d9955de0fd7c2599b25115ab koffice-l10n-pt-1.5.0.tar.bz2 -41373317668d2d7cbc20e4a5a188daf6 koffice-l10n-pt_BR-1.5.0.tar.bz2 -35fb855cb7c18b95a11602a7c8483d2d koffice-l10n-ro-1.5.0.tar.bz2 -f5842b78af8ba903129942dfa7f6d7d4 koffice-l10n-ru-1.5.0.tar.bz2 -d153416b1403f7e4cf8a03b5739ab6a9 koffice-l10n-se-1.5.0.tar.bz2 -400b547e0520fe769594d4f39c3ec769 koffice-l10n-sk-1.5.0.tar.bz2 -7e73b04ed5952631efa8ef9ed216ce3d koffice-l10n-sl-1.5.0.tar.bz2 -5b7f01f22ae97c8983411b043c41a689 koffice-l10n-sr-1.5.0.tar.bz2 -5bafc53a3c3b4f863fd28fc9f0a090f9 koffice-l10n-sr at Latn-1.5.0.tar.bz2 -810dd9311472f1e60f90c9fdfcc6c84c koffice-l10n-sv-1.5.0.tar.bz2 -2991caa710ad20da8925331a51026498 koffice-l10n-ta-1.5.0.tar.bz2 -3c9f50e64cc892cfcb840c424b2940e4 koffice-l10n-tg-1.5.0.tar.bz2 -411466bf3f0f7340431f2f6448332a89 koffice-l10n-tr-1.5.0.tar.bz2 -8e3294a78b9beab5122703d61d2e9a2c koffice-l10n-uk-1.5.0.tar.bz2 -ace68fe74216fb0a57024fb3b750fdaf koffice-l10n-uz-1.5.0.tar.bz2 -3b15bc617451461f9911ad316a264005 koffice-l10n-zh_CN-1.5.0.tar.bz2 +99f5fae8b0d15bcdec7daa3dfadfc20d koffice-l10n-af-1.5.1.tar.bz2 +3ace1a68c04d3cb3d0e2b45ab9a059d0 koffice-l10n-ar-1.5.1.tar.bz2 +8daaeb614b3439490c2dd64a5ca6a90d koffice-l10n-bg-1.5.1.tar.bz2 +bed06b1e8dc15ab3f0360d66ecb5eca8 koffice-l10n-br-1.5.1.tar.bz2 +f5e83bf3d981a433fe8470947ed22c0a koffice-l10n-bs-1.5.1.tar.bz2 +a9386b6c6049814d6f4a3f67a4cb51d8 koffice-l10n-ca-1.5.1.tar.bz2 +6f68790c56564626e42949979a4e1dba koffice-l10n-cs-1.5.1.tar.bz2 +780d5816865f60b88209059c6c2e7d02 koffice-l10n-cy-1.5.1.tar.bz2 +aa38e3e0f04a930e89543cfb79c6184d koffice-l10n-da-1.5.1.tar.bz2 +dcd8043ab5b5d2642e4302f1f89fc639 koffice-l10n-de-1.5.1.tar.bz2 +350963ba95241e2576c077d4558d7fcb koffice-l10n-el-1.5.1.tar.bz2 +b7ae8b4aee9810f2b78235962f7f1dc2 koffice-l10n-en_GB-1.5.1.tar.bz2 +71c42a69ea9c417494d1603bc3b646b8 koffice-l10n-eo-1.5.1.tar.bz2 +70b926928aa1a2facb3409f144191967 koffice-l10n-es-1.5.1.tar.bz2 +23311d668c05da159ea12240f950e763 koffice-l10n-et-1.5.1.tar.bz2 +39f2c93001a037b79eda7e3f9611ea8a koffice-l10n-eu-1.5.1.tar.bz2 +f72750aa5c9cd5aa3814715ff36acd33 koffice-l10n-fi-1.5.1.tar.bz2 +d63d63daa55fa32e5c93b72c902cd4d1 koffice-l10n-fr-1.5.1.tar.bz2 +42615504255afdbadcbaafb197a6adb4 koffice-l10n-ga-1.5.1.tar.bz2 +a20e78860f0975b65ed59720924591ca koffice-l10n-he-1.5.1.tar.bz2 +37de7254e2d6610ad395c260cb002201 koffice-l10n-hi-1.5.1.tar.bz2 +8a8d4f7adaaed89063c4971c9bbfbf43 koffice-l10n-hu-1.5.1.tar.bz2 +33cf09b995ffde0c28a794ce3f6c6d51 koffice-l10n-is-1.5.1.tar.bz2 +71cf4cad9272090e6469a96736bd785e koffice-l10n-it-1.5.1.tar.bz2 +8f7893e842afd51368bd18c37b221f57 koffice-l10n-ja-1.5.1.tar.bz2 +6ece374294c001730552883defb0a53c koffice-l10n-lt-1.5.1.tar.bz2 +6adad6081c79ac9dc3edcae7bb5a9494 koffice-l10n-mk-1.5.1.tar.bz2 +43f77ffa86d70b1fb42cf4bc2312e783 koffice-l10n-ms-1.5.1.tar.bz2 +ff774ceadd4c42b80ab138c4446d8843 koffice-l10n-nb-1.5.1.tar.bz2 +f76f2b7b8a65a528d3d0514f5f1a0cbf koffice-l10n-nl-1.5.1.tar.bz2 +12a451ca1384c776045a86aa3f0fecb5 koffice-l10n-nn-1.5.1.tar.bz2 +5580950ba10229b65563ae8b9c29e8c4 koffice-l10n-pl-1.5.1.tar.bz2 +549c4668a4ec2fbc71a2fadb9597ea8f koffice-l10n-pt-1.5.1.tar.bz2 +5882aeae172ccfebbf68bad8f4dc0ced koffice-l10n-pt_BR-1.5.1.tar.bz2 +b01b4652edcd49e2d1f77db8040a2552 koffice-l10n-ro-1.5.1.tar.bz2 +7a484f7d54125398516cf54a2139e84d koffice-l10n-ru-1.5.1.tar.bz2 +ae4b1cabf24dcf7a89fbef573b07301a koffice-l10n-se-1.5.1.tar.bz2 +11a9def76b738074d5a70bf81a5e5b4b koffice-l10n-sk-1.5.1.tar.bz2 +4520614986d6fb70b1d4b8eb117815a5 koffice-l10n-sl-1.5.1.tar.bz2 +a825f39361da5599bcd572907eb9d068 koffice-l10n-sr-1.5.1.tar.bz2 +0413072d626a8b6291f65504f76d93f6 koffice-l10n-sr at Latn-1.5.1.tar.bz2 +4afcc6585df0a171e90b595c3d3311ae koffice-l10n-sv-1.5.1.tar.bz2 +536e66f3b85923771f2af964b51a465e koffice-l10n-ta-1.5.1.tar.bz2 +a38ec98b0f6437ddb93196f369a09485 koffice-l10n-tg-1.5.1.tar.bz2 +0026e7f0b40b76a700792bf3a8a40427 koffice-l10n-tr-1.5.1.tar.bz2 +114018e8d5e5935c8d47c717dbb3523c koffice-l10n-uk-1.5.1.tar.bz2 +b4ce57436f31a2c5b63572b27b1c3582 koffice-l10n-uz-1.5.1.tar.bz2 +f691b1667472c36f8c8ec3fb69ac11ea koffice-l10n-zh_CN-1.5.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 08:37:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:37:26 -0700 Subject: rpms/koffice-langpack/devel .cvsignore, 1.4, 1.5 koffice-langpack.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605300837.k4U8bSLf001529@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice-langpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1460/devel Modified Files: .cvsignore koffice-langpack.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Apr 2006 01:24:56 -0000 1.4 +++ .cvsignore 30 May 2006 08:37:26 -0000 1.5 @@ -46,3 +46,51 @@ koffice-l10n-uk-1.5.0.tar.bz2 koffice-l10n-uz-1.5.0.tar.bz2 koffice-l10n-zh_CN-1.5.0.tar.bz2 +koffice-l10n-af-1.5.1.tar.bz2 +koffice-l10n-ar-1.5.1.tar.bz2 +koffice-l10n-bg-1.5.1.tar.bz2 +koffice-l10n-br-1.5.1.tar.bz2 +koffice-l10n-bs-1.5.1.tar.bz2 +koffice-l10n-ca-1.5.1.tar.bz2 +koffice-l10n-cs-1.5.1.tar.bz2 +koffice-l10n-cy-1.5.1.tar.bz2 +koffice-l10n-da-1.5.1.tar.bz2 +koffice-l10n-de-1.5.1.tar.bz2 +koffice-l10n-el-1.5.1.tar.bz2 +koffice-l10n-en_GB-1.5.1.tar.bz2 +koffice-l10n-eo-1.5.1.tar.bz2 +koffice-l10n-es-1.5.1.tar.bz2 +koffice-l10n-et-1.5.1.tar.bz2 +koffice-l10n-eu-1.5.1.tar.bz2 +koffice-l10n-fi-1.5.1.tar.bz2 +koffice-l10n-fr-1.5.1.tar.bz2 +koffice-l10n-ga-1.5.1.tar.bz2 +koffice-l10n-he-1.5.1.tar.bz2 +koffice-l10n-hi-1.5.1.tar.bz2 +koffice-l10n-hu-1.5.1.tar.bz2 +koffice-l10n-is-1.5.1.tar.bz2 +koffice-l10n-it-1.5.1.tar.bz2 +koffice-l10n-ja-1.5.1.tar.bz2 +koffice-l10n-lt-1.5.1.tar.bz2 +koffice-l10n-mk-1.5.1.tar.bz2 +koffice-l10n-ms-1.5.1.tar.bz2 +koffice-l10n-nb-1.5.1.tar.bz2 +koffice-l10n-nl-1.5.1.tar.bz2 +koffice-l10n-nn-1.5.1.tar.bz2 +koffice-l10n-pl-1.5.1.tar.bz2 +koffice-l10n-pt-1.5.1.tar.bz2 +koffice-l10n-pt_BR-1.5.1.tar.bz2 +koffice-l10n-ro-1.5.1.tar.bz2 +koffice-l10n-ru-1.5.1.tar.bz2 +koffice-l10n-se-1.5.1.tar.bz2 +koffice-l10n-sk-1.5.1.tar.bz2 +koffice-l10n-sl-1.5.1.tar.bz2 +koffice-l10n-sr-1.5.1.tar.bz2 +koffice-l10n-sr at Latn-1.5.1.tar.bz2 +koffice-l10n-sv-1.5.1.tar.bz2 +koffice-l10n-ta-1.5.1.tar.bz2 +koffice-l10n-tg-1.5.1.tar.bz2 +koffice-l10n-tr-1.5.1.tar.bz2 +koffice-l10n-uk-1.5.1.tar.bz2 +koffice-l10n-uz-1.5.1.tar.bz2 +koffice-l10n-zh_CN-1.5.1.tar.bz2 Index: koffice-langpack.spec =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/devel/koffice-langpack.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- koffice-langpack.spec 22 Apr 2006 01:24:56 -0000 1.5 +++ koffice-langpack.spec 30 May 2006 08:37:26 -0000 1.6 @@ -1,58 +1,59 @@ Name: koffice-langpack -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Language files for koffice Group: Applications/Productivity License: GPL URL: http://www.koffice.org -Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2 -Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2 -Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2 -Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2 -Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2 -Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2 -Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2 -Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2 -Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2 -Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2 -Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2 -Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2 -Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2 -Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2 -Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2 -Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2 -Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2 -Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2 -Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2 -Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2 -Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2 -Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2 -Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2 -Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2 -Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2 -Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2 -Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2 -Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2 -Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2 -Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2 -Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2 -Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2 -Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2 -Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2 -Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2 -Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2 -Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2 -Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2 -Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2 -Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2 -Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2 -Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2 -Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2 -Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2 -Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2 -Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2 -Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2 +Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-af-1.5.1.tar.bz2 +Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ar-1.5.1.tar.bz2 +Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bg-1.5.1.tar.bz2 +Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-br-1.5.1.tar.bz2 +Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bs-1.5.1.tar.bz2 +Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ca-1.5.1.tar.bz2 +Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cs-1.5.1.tar.bz2 +Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cy-1.5.1.tar.bz2 +Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-da-1.5.1.tar.bz2 +Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-de-1.5.1.tar.bz2 +Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-el-1.5.1.tar.bz2 +Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-en_GB-1.5.1.tar.bz2 +Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eo-1.5.1.tar.bz2 +Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-es-1.5.1.tar.bz2 +Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-et-1.5.1.tar.bz2 +Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eu-1.5.1.tar.bz2 +Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fi-1.5.1.tar.bz2 +Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fr-1.5.1.tar.bz2 +Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ga-1.5.1.tar.bz2 +Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-he-1.5.1.tar.bz2 +Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hi-1.5.1.tar.bz2 +Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hu-1.5.1.tar.bz2 +Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-is-1.5.1.tar.bz2 +Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-it-1.5.1.tar.bz2 +Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ja-1.5.1.tar.bz2 +Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-lt-1.5.1.tar.bz2 +Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-mk-1.5.1.tar.bz2 +Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nb-1.5.1.tar.bz2 +Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nl-1.5.1.tar.bz2 +Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nn-1.5.1.tar.bz2 +Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pl-1.5.1.tar.bz2 +Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt-1.5.1.tar.bz2 +Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt_BR-1.5.1.tar.bz2 +Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ro-1.5.1.tar.bz2 +Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ru-1.5.1.tar.bz2 +Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-se-1.5.1.tar.bz2 +Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sk-1.5.1.tar.bz2 +Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sl-1.5.1.tar.bz2 +Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr-1.5.1.tar.bz2 +Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.1.tar.bz2 +Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sv-1.5.1.tar.bz2 +Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ta-1.5.1.tar.bz2 +Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tg-1.5.1.tar.bz2 +Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tr-1.5.1.tar.bz2 +Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uk-1.5.1.tar.bz2 +Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uz-1.5.1.tar.bz2 +Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-zh_CN-1.5.1.tar.bz2 +Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ms-1.5.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -283,6 +284,14 @@ %description mk Provides additional macedonian translations for koffice +%package ms +Summary: Malay language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description ms +Provides additional malay translations for koffice + %package nb Summary: Bokmal language pack for koffice Group: Applications/Productivity @@ -426,6 +435,14 @@ %description uk Provides additional ukrainian translations for koffice +%package uz +Summary: Uzbek language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description uz +Provides additional uzbek translations for koffice + %package zh_CN Summary: Simplified Chinese language pack for koffice Group: Applications/Productivity @@ -485,12 +502,13 @@ %{__tar} xjvf %{SOURCE44} %{__tar} xjvf %{SOURCE45} %{__tar} xjvf %{SOURCE46} +%{__tar} xjvf %{SOURCE47} %build # dont work: et for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} %configure make %{?_smp_mflags} @@ -500,8 +518,8 @@ %install rm -rf $RPM_BUILD_ROOT for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} make install DESTDIR=$RPM_BUILD_ROOT done @@ -647,6 +665,10 @@ %defattr(-,root,root,-) %lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/* +%files ms +%defattr(-,root,root,-) +%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/* + %files nb %defattr(-,root,root,-) %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/* @@ -728,11 +750,19 @@ %defattr(-,root,root,-) %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/* +%files uz +%defattr(-,root,root,-) +%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/* + %files zh_CN %defattr(-,root,root,-) %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* %changelog +* Tue May 30 2006 Andreas Bierfert +1.5.1-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 1.5.0-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Apr 2006 01:24:56 -0000 1.4 +++ sources 30 May 2006 08:37:26 -0000 1.5 @@ -1,48 +1,48 @@ - -03217f2f39b1a21cc685a5aa85200247 koffice-l10n-af-1.5.0.tar.bz2 -922cdc3f2de8d350deaf54c32feab117 koffice-l10n-ar-1.5.0.tar.bz2 -5e24b5028de337c2cbda323fa69d56f2 koffice-l10n-bg-1.5.0.tar.bz2 -4c5c9d834f14defd87c5580092002e51 koffice-l10n-br-1.5.0.tar.bz2 -6086121e25b243d7b5543dc15ebaf3ee koffice-l10n-bs-1.5.0.tar.bz2 -cc24df3b6d3899b89776e2d2cabb3eb5 koffice-l10n-ca-1.5.0.tar.bz2 -193f7d66d9b5c945932ee9868721f9f1 koffice-l10n-cs-1.5.0.tar.bz2 -14c6069119fb491e6b430d6663e3a60f koffice-l10n-cy-1.5.0.tar.bz2 -fedd3f7c0c39a40940576fb86d7262f0 koffice-l10n-da-1.5.0.tar.bz2 -fe3334c31472b006907f59f47db6cb75 koffice-l10n-de-1.5.0.tar.bz2 -d7384ecf60617aa054ec3ded25cff1ea koffice-l10n-el-1.5.0.tar.bz2 -5f00c66613f2250babd4cb02590952df koffice-l10n-en_GB-1.5.0.tar.bz2 -79d73a7d8e5a284e1c997cbec6bc804c koffice-l10n-eo-1.5.0.tar.bz2 -0abef42c4ea3a0992b69933ad1e94287 koffice-l10n-es-1.5.0.tar.bz2 -149ba841f9dc322336b9c153b598dea5 koffice-l10n-et-1.5.0.tar.bz2 -af2a4e93887cd55ba0cda123362650d7 koffice-l10n-eu-1.5.0.tar.bz2 -e87c44fc8c7b10c4c44c76d90cb1ca7c koffice-l10n-fi-1.5.0.tar.bz2 -65b9b6fd7903050c4c170af11aa94fb2 koffice-l10n-fr-1.5.0.tar.bz2 -47b453c7444e404c19cc8dc85cf56d37 koffice-l10n-ga-1.5.0.tar.bz2 -1d0810b08947f072631615ffa3260bec koffice-l10n-he-1.5.0.tar.bz2 -82231d5c7e273d0384d04e80be228167 koffice-l10n-hi-1.5.0.tar.bz2 -9c1d2441a49eaf06a6adac3f61590076 koffice-l10n-hu-1.5.0.tar.bz2 -3fc01e0a34d0ce9a2988ef30df638f62 koffice-l10n-is-1.5.0.tar.bz2 -db8b9a1bb5114e69c3768508c09bde8d koffice-l10n-it-1.5.0.tar.bz2 -16435cf9fd545529bea61010fb35ad03 koffice-l10n-ja-1.5.0.tar.bz2 -c306e0bfdccd60fd9f11e93828475fac koffice-l10n-lt-1.5.0.tar.bz2 -b0469b72436e35a1101ee9ea4e981ae3 koffice-l10n-mk-1.5.0.tar.bz2 -8cffcf181366737bea12a1ae9a14c294 koffice-l10n-nb-1.5.0.tar.bz2 -f4bfc5952a2612c72443d266df034e7d koffice-l10n-nl-1.5.0.tar.bz2 -bb3444c52bcbc33aaaad542454048c69 koffice-l10n-nn-1.5.0.tar.bz2 -442946625f984e8eb9f977c39a57749d koffice-l10n-pl-1.5.0.tar.bz2 -285b5766d9955de0fd7c2599b25115ab koffice-l10n-pt-1.5.0.tar.bz2 -41373317668d2d7cbc20e4a5a188daf6 koffice-l10n-pt_BR-1.5.0.tar.bz2 -35fb855cb7c18b95a11602a7c8483d2d koffice-l10n-ro-1.5.0.tar.bz2 -f5842b78af8ba903129942dfa7f6d7d4 koffice-l10n-ru-1.5.0.tar.bz2 -d153416b1403f7e4cf8a03b5739ab6a9 koffice-l10n-se-1.5.0.tar.bz2 -400b547e0520fe769594d4f39c3ec769 koffice-l10n-sk-1.5.0.tar.bz2 -7e73b04ed5952631efa8ef9ed216ce3d koffice-l10n-sl-1.5.0.tar.bz2 -5b7f01f22ae97c8983411b043c41a689 koffice-l10n-sr-1.5.0.tar.bz2 -5bafc53a3c3b4f863fd28fc9f0a090f9 koffice-l10n-sr at Latn-1.5.0.tar.bz2 -810dd9311472f1e60f90c9fdfcc6c84c koffice-l10n-sv-1.5.0.tar.bz2 -2991caa710ad20da8925331a51026498 koffice-l10n-ta-1.5.0.tar.bz2 -3c9f50e64cc892cfcb840c424b2940e4 koffice-l10n-tg-1.5.0.tar.bz2 -411466bf3f0f7340431f2f6448332a89 koffice-l10n-tr-1.5.0.tar.bz2 -8e3294a78b9beab5122703d61d2e9a2c koffice-l10n-uk-1.5.0.tar.bz2 -ace68fe74216fb0a57024fb3b750fdaf koffice-l10n-uz-1.5.0.tar.bz2 -3b15bc617451461f9911ad316a264005 koffice-l10n-zh_CN-1.5.0.tar.bz2 +99f5fae8b0d15bcdec7daa3dfadfc20d koffice-l10n-af-1.5.1.tar.bz2 +3ace1a68c04d3cb3d0e2b45ab9a059d0 koffice-l10n-ar-1.5.1.tar.bz2 +8daaeb614b3439490c2dd64a5ca6a90d koffice-l10n-bg-1.5.1.tar.bz2 +bed06b1e8dc15ab3f0360d66ecb5eca8 koffice-l10n-br-1.5.1.tar.bz2 +f5e83bf3d981a433fe8470947ed22c0a koffice-l10n-bs-1.5.1.tar.bz2 +a9386b6c6049814d6f4a3f67a4cb51d8 koffice-l10n-ca-1.5.1.tar.bz2 +6f68790c56564626e42949979a4e1dba koffice-l10n-cs-1.5.1.tar.bz2 +780d5816865f60b88209059c6c2e7d02 koffice-l10n-cy-1.5.1.tar.bz2 +aa38e3e0f04a930e89543cfb79c6184d koffice-l10n-da-1.5.1.tar.bz2 +dcd8043ab5b5d2642e4302f1f89fc639 koffice-l10n-de-1.5.1.tar.bz2 +350963ba95241e2576c077d4558d7fcb koffice-l10n-el-1.5.1.tar.bz2 +b7ae8b4aee9810f2b78235962f7f1dc2 koffice-l10n-en_GB-1.5.1.tar.bz2 +71c42a69ea9c417494d1603bc3b646b8 koffice-l10n-eo-1.5.1.tar.bz2 +70b926928aa1a2facb3409f144191967 koffice-l10n-es-1.5.1.tar.bz2 +23311d668c05da159ea12240f950e763 koffice-l10n-et-1.5.1.tar.bz2 +39f2c93001a037b79eda7e3f9611ea8a koffice-l10n-eu-1.5.1.tar.bz2 +f72750aa5c9cd5aa3814715ff36acd33 koffice-l10n-fi-1.5.1.tar.bz2 +d63d63daa55fa32e5c93b72c902cd4d1 koffice-l10n-fr-1.5.1.tar.bz2 +42615504255afdbadcbaafb197a6adb4 koffice-l10n-ga-1.5.1.tar.bz2 +a20e78860f0975b65ed59720924591ca koffice-l10n-he-1.5.1.tar.bz2 +37de7254e2d6610ad395c260cb002201 koffice-l10n-hi-1.5.1.tar.bz2 +8a8d4f7adaaed89063c4971c9bbfbf43 koffice-l10n-hu-1.5.1.tar.bz2 +33cf09b995ffde0c28a794ce3f6c6d51 koffice-l10n-is-1.5.1.tar.bz2 +71cf4cad9272090e6469a96736bd785e koffice-l10n-it-1.5.1.tar.bz2 +8f7893e842afd51368bd18c37b221f57 koffice-l10n-ja-1.5.1.tar.bz2 +6ece374294c001730552883defb0a53c koffice-l10n-lt-1.5.1.tar.bz2 +6adad6081c79ac9dc3edcae7bb5a9494 koffice-l10n-mk-1.5.1.tar.bz2 +43f77ffa86d70b1fb42cf4bc2312e783 koffice-l10n-ms-1.5.1.tar.bz2 +ff774ceadd4c42b80ab138c4446d8843 koffice-l10n-nb-1.5.1.tar.bz2 +f76f2b7b8a65a528d3d0514f5f1a0cbf koffice-l10n-nl-1.5.1.tar.bz2 +12a451ca1384c776045a86aa3f0fecb5 koffice-l10n-nn-1.5.1.tar.bz2 +5580950ba10229b65563ae8b9c29e8c4 koffice-l10n-pl-1.5.1.tar.bz2 +549c4668a4ec2fbc71a2fadb9597ea8f koffice-l10n-pt-1.5.1.tar.bz2 +5882aeae172ccfebbf68bad8f4dc0ced koffice-l10n-pt_BR-1.5.1.tar.bz2 +b01b4652edcd49e2d1f77db8040a2552 koffice-l10n-ro-1.5.1.tar.bz2 +7a484f7d54125398516cf54a2139e84d koffice-l10n-ru-1.5.1.tar.bz2 +ae4b1cabf24dcf7a89fbef573b07301a koffice-l10n-se-1.5.1.tar.bz2 +11a9def76b738074d5a70bf81a5e5b4b koffice-l10n-sk-1.5.1.tar.bz2 +4520614986d6fb70b1d4b8eb117815a5 koffice-l10n-sl-1.5.1.tar.bz2 +a825f39361da5599bcd572907eb9d068 koffice-l10n-sr-1.5.1.tar.bz2 +0413072d626a8b6291f65504f76d93f6 koffice-l10n-sr at Latn-1.5.1.tar.bz2 +4afcc6585df0a171e90b595c3d3311ae koffice-l10n-sv-1.5.1.tar.bz2 +536e66f3b85923771f2af964b51a465e koffice-l10n-ta-1.5.1.tar.bz2 +a38ec98b0f6437ddb93196f369a09485 koffice-l10n-tg-1.5.1.tar.bz2 +0026e7f0b40b76a700792bf3a8a40427 koffice-l10n-tr-1.5.1.tar.bz2 +114018e8d5e5935c8d47c717dbb3523c koffice-l10n-uk-1.5.1.tar.bz2 +b4ce57436f31a2c5b63572b27b1c3582 koffice-l10n-uz-1.5.1.tar.bz2 +f691b1667472c36f8c8ec3fb69ac11ea koffice-l10n-zh_CN-1.5.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 08:38:06 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 30 May 2006 01:38:06 -0700 Subject: rpms/kasumi/FC-4 kasumi.spec,1.6,1.7 Message-ID: <200605300838.k4U8c8sd001552@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kasumi/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1535 Modified Files: kasumi.spec Log Message: Index: kasumi.spec =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/kasumi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kasumi.spec 30 May 2006 04:13:12 -0000 1.6 +++ kasumi.spec 30 May 2006 08:38:06 -0000 1.7 @@ -5,7 +5,7 @@ License: GPL URL: http://kasumi.sourceforge.jp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, gtk2-devel +BuildRequires: desktop-file-utils, gtk2-devel gettext-devel Source0: %{name}-%{version}.tar.gz Source1: %{name}.desktop Patch1: kasumi-1.0-gcc41.patch From fedora-extras-commits at redhat.com Tue May 30 08:59:42 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Tue, 30 May 2006 01:59:42 -0700 Subject: rpms/anjuta-gdl/devel .cvsignore, 1.2, 1.3 anjuta-gdl.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605300859.k4U8xiII001923@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/anjuta-gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1902 Modified Files: .cvsignore anjuta-gdl.spec sources Log Message: - update to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2006 22:35:30 -0000 1.2 +++ .cvsignore 30 May 2006 08:59:41 -0000 1.3 @@ -1 +1 @@ -gdl-0.6.0.tar.gz +gdl-0.6.1.tar.gz Index: anjuta-gdl.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/devel/anjuta-gdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- anjuta-gdl.spec 23 Apr 2006 22:35:30 -0000 1.1 +++ anjuta-gdl.spec 30 May 2006 08:59:41 -0000 1.2 @@ -1,7 +1,7 @@ Name: anjuta-gdl Summary: Components and library for GNOME development tools -Version: 0.6.0 -Release: 5%{?dist} +Version: 0.6.1 +Release: 1%{?dist} License: GPL Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/gdl/0.6/gdl-%{version}.tar.gz @@ -59,6 +59,9 @@ %{_libdir}/pkgconfig/gdl-1.0.pc %changelog +* Tue May 30 2006 Radek Vokal 0.6.1-1 +- update to 0.6.1 + * Sun Apr 23 2006 Paul F. Johnson 0.6.0-5 - added --disable-static and removed the .a delete line - very minor spec changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2006 22:35:30 -0000 1.2 +++ sources 30 May 2006 08:59:41 -0000 1.3 @@ -1 +1 @@ -527555a617fd670a0d4b7d03cae03dad gdl-0.6.0.tar.gz +6dfe748f15799f46cd8cfb8f80837ed0 gdl-0.6.1.tar.gz From fedora-extras-commits at redhat.com Tue May 30 09:05:18 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:05:18 -0700 Subject: rpms/kerry - New directory Message-ID: <200605300905.k4U95KHc004415@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4394/kerry Log Message: Directory /cvs/extras/rpms/kerry added to the repository From fedora-extras-commits at redhat.com Tue May 30 09:05:19 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:05:19 -0700 Subject: rpms/kerry/devel - New directory Message-ID: <200605300905.k4U95LRk004418@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4394/kerry/devel Log Message: Directory /cvs/extras/rpms/kerry/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 09:05:44 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:05:44 -0700 Subject: rpms/kerry Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300905.k4U95k4Y004476@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443 Added Files: Makefile import.log Log Message: Setup of module kerry --- NEW FILE Makefile --- # Top level Makefile for module kerry all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 09:05:45 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:05:45 -0700 Subject: rpms/kerry/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300905.k4U95lOV004479@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kerry --- NEW 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 May 30 09:06:57 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:06:57 -0700 Subject: rpms/kerry import.log,1.1,1.2 Message-ID: <200605300907.k4U97TP2004551@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4517 Modified Files: import.log Log Message: auto-import kerry-0.1.1-2 on branch devel from kerry-0.1.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kerry/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 09:05:44 -0000 1.1 +++ import.log 30 May 2006 09:06:57 -0000 1.2 @@ -0,0 +1 @@ +kerry-0_1_1-2:HEAD:kerry-0.1.1-2.src.rpm:1148980457 From fedora-extras-commits at redhat.com Tue May 30 09:06:58 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:06:58 -0700 Subject: rpms/kerry/devel kerry.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300907.k4U97U43004555@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4517/devel Modified Files: .cvsignore sources Added Files: kerry.spec Log Message: auto-import kerry-0.1.1-2 on branch devel from kerry-0.1.1-2.src.rpm --- NEW FILE kerry.spec --- Name: kerry Version: 0.1.1 Release: 2%{?dist} Summary: Kerry Beagle is a KDE frontend for the Beagle desktop search Group: User Interface/Desktops License: GPL URL: http://www.kde-apps.org/content/show.php?content=36832 Source0: http://developer.kde.org/~binner/kerry/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, qt-devel, kdelibs-devel, kdebase-devel BuildRequires: desktop-file-utils, libbeagle-devel, glib-devel # We have an exception here, this application is not linked with beagle itself, # but depends on it for all its operation. Requires: beagle %description Kerry Beagle is a nice KDE frontend for the Beagle desktop search daemon, it uses indexed searched files from beagle and displays in a KDE way, integrating totally with the desktop, systray, and Konqueror. %prep %setup -q %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure --disable-rpath --disable-debug make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Removing libtool archive files #rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/kerry.la rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_kerry.la # Moving shutdown script mkdir -p $RPM_BUILD_ROOT%{_datadir}/shutdown mv $RPM_BUILD_ROOT%{_prefix}/shutdown/beagled-shutdown.sh \ $RPM_BUILD_ROOT%{_datadir}/shutdown rmdir $RPM_BUILD_ROOT%{_prefix}/shutdown # Install .desktop file using desktop-file-utils desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \ --add-category X-Fedora \ --add-category Application \ --add-category Core \ --add-category Utility \ --add-category Filesystem \ --add-category KDE \ --add-category Qt \ --add-only-show-in=KDE \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kerry.desktop # Uh-oh, a version number in locale files! %find_lang %{name}-%{version} %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{version}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO %{_bindir}/kerry %{_libdir}/kde3/kerry.so %{_libdir}/kde3/kerry.la %{_libdir}/libkdeinit_kerry.so %{_datadir}/autostart/beagled.desktop %{_datadir}/autostart/kerry.autostart.desktop %{_datadir}/applications/kde/fedora-kerry.desktop %{_datadir}/icons/hicolor/*/apps/kerry.png %{_datadir}/shutdown/beagled-shutdown.sh %changelog * Thu May 25 2006 Hugo Cisneiros 0.1.1-2 - Added kerry.la to libdir/kde3 as KDE applications requires - Updated desktop-file-install with '--only-show-in=KDE' - Added beagle as a dependency since kerry requires it * Wed May 24 2006 Hugo Cisneiros 0.1.1-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kerry/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 09:05:45 -0000 1.1 +++ .cvsignore 30 May 2006 09:06:57 -0000 1.2 @@ -0,0 +1 @@ +kerry-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kerry/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 09:05:45 -0000 1.1 +++ sources 30 May 2006 09:06:57 -0000 1.2 @@ -0,0 +1 @@ +fedb001d73ad80d90ecb850dab19a709 kerry-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 09:29:53 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:29:53 -0700 Subject: rpms/knemo - New directory Message-ID: <200605300929.k4U9TtRs004799@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4771/knemo Log Message: Directory /cvs/extras/rpms/knemo added to the repository From fedora-extras-commits at redhat.com Tue May 30 09:29:54 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:29:54 -0700 Subject: rpms/knemo/devel - New directory Message-ID: <200605300930.k4U9TuSG004802@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4771/knemo/devel Log Message: Directory /cvs/extras/rpms/knemo/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 09:30:21 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:30:21 -0700 Subject: rpms/knemo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300930.k4U9UN1r004858@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4821/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module knemo --- NEW 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 May 30 09:30:21 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:30:21 -0700 Subject: rpms/knemo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300930.k4U9UNwN004855@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4821 Added Files: Makefile import.log Log Message: Setup of module knemo --- NEW FILE Makefile --- # Top level Makefile for module knemo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 09:31:45 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:31:45 -0700 Subject: rpms/knemo import.log,1.1,1.2 Message-ID: <200605300931.k4U9VlMn004929@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4895 Modified Files: import.log Log Message: auto-import knemo-0.4.0-4 on branch devel from knemo-0.4.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/knemo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 09:30:20 -0000 1.1 +++ import.log 30 May 2006 09:31:45 -0000 1.2 @@ -0,0 +1 @@ +knemo-0_4_0-4:HEAD:knemo-0.4.0-4.src.rpm:1148981945 From fedora-extras-commits at redhat.com Tue May 30 09:31:46 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:31:46 -0700 Subject: rpms/knemo/devel knemo-desktop-file-fix.patch, NONE, 1.1 knemo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300931.k4U9VmAw004936@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4895/devel Modified Files: .cvsignore sources Added Files: knemo-desktop-file-fix.patch knemo.spec Log Message: auto-import knemo-0.4.0-4 on branch devel from knemo-0.4.0-4.src.rpm knemo-desktop-file-fix.patch: --- NEW FILE knemo-desktop-file-fix.patch --- --- src/kcm/kcm_knemo.desktop.orig 2006-05-20 16:23:00.000000000 -0300 +++ src/kcm/kcm_knemo.desktop 2006-05-20 16:23:47.000000000 -0300 @@ -61,16 +61,4 @@ Comment[xx]=xxMonitor network interfacesxx Comment[zh_CN]=?????????????????? -Keywords=knemo,network monitor,wlan monitor,wifi monitor,ethernet monitor,wireless monitor,systray -Keywords[da]=knemo,netv??rksoverv??gning,WLAN-overv??gning,WIFI-overv??gning,Ethernet-overv??gning,tr??dl??s overv??gning,statusfelt -Keywords[el]=knemo,?????????????? ??????????????,?????????????? wlan,?????????????? wifi,?????????????? ethernet, ?????????????? wireless,?????????????? ???????????????????? -Keywords[es]=knemo,monitor de red,monitor de wlan,monitor wifi,monitor de ethernet,monitor inal??mbrico,bandeja del sistema -Keywords[et]=knemo,v??rgumonitor,wlan monitor,wifi monitor,ethernet monitor,traadita v??rgu monitor,s??steemne salv -Keywords[it]=knemo,monitor di rete,wlan monitor,monitor senza fili,ethernet monitor,vassoio di sistema -Keywords[nl]=knemo,netwerkmonitor,wlan-monitor,wifi-monitor,ethernetmonitor,wireless-monitor,systeemvak -Keywords[pt]=knemo,monitor da rede,monitor de wlan,monitor wifi,monitor de ethernet,monitor sem-fios,bandeja do sistema -Keywords[pt_BR]=knemo,monitor da rede,monitor de wlan,monitor wifi,monitor de ethernet,monitor sem-fios,bandeja do sistema -Keywords[sv]=knemo,n??tverks??vervakning,WLAN-??vervakning,WIFI-??vervakning,Ethernet-??vervakning,tr??dl??s ??vervakning,systembricka -Keywords[xx]=xxknemo,network monitor,wlan monitor,wifi monitor,ethernet monitor,wireless monitor,systrayxx - -Categories=Qt;KDE;X-KDE-settings-network +Categories=Qt;KDE;X-KDE-settings-network; --- NEW FILE knemo.spec --- Name: knemo Version: 0.4.0 Release: 4%{?dist} Summary: A KDE network monitoring tool Group: Applications/Internet License: GPL URL: http://extragear.kde.org/apps/knemo/ Source0: http://www.eris23.de/knemo/%{name}-%{version}.tar.bz2 Patch0: knemo-desktop-file-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, qt-devel, kdelibs-devel, desktop-file-utils BuildRequires: wireless-tools net-tools Requires: kdebase %description KNemo displays for every network interface an icon in the systray. Tooltips and an info dialog provide further information about the interface. Passive popups inform about interface changes. A traffic plotter is also integrated. It polls the network interface status every second using the ifconfig, route and iwconfig tools. %prep %setup -q %patch0 -p0 %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure --disable-rpath --disable-debug make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT #rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la desktop-file-install --vendor="" \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \ --add-category X-Fedora \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kcm_knemo.desktop desktop-file-install --vendor="" \ --dir ${RPM_BUILD_ROOT}%{_datadir}/services/kded \ --add-category X-Fedora \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/services/kded/knemod.desktop %find_lang kcm_knemo kcm_knemo.lang %find_lang knemod knemod.lang cat kcm_knemo.lang knemod.lang > knemo.lang %post touch --no-create %{_datadir}/icons/crystalsvg || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : fi %postun touch --no-create %{_datadir}/icons/crystalsvg || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : fi %clean rm -rf $RPM_BUILD_ROOT # *.la files are usually not necessary (as Extras Guidelines say) and should not # be packaged. But KDE and KControl needs it to work, so we'll make an exception # here %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/kde3/*.so %{_libdir}/kde3/*.la %{_datadir}/applications/kde/kcm_knemo.desktop %{_datadir}/services/kded/knemod.desktop %{_datadir}/apps/knemo %{_datadir}/icons/crystalsvg/16x16/apps/knemo.png %{_datadir}/icons/crystalsvg/22x22/actions/*.png %{_datadir}/icons/crystalsvg/32x32/apps/knemo.png %changelog * Tue May 30 2006 Hugo Cisneiros 0.4.0-4 - Created BuildRequires for the ifconfig and iwconfig commands, as knemo utilizes it for monitoring. - Removed addition of categories in desktop-file-install command * Thu May 25 2006 Hugo Cisneiros 0.4.0-3 - Removed vendor option from desktop-file-install (no renaming) * Sat May 20 2006 Hugo Cisneiros 0.4.0-2 - Installed .desktop files now use desktop-file-install * Sat May 20 2006 Hugo Cisneiros 0.4.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/knemo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 09:30:21 -0000 1.1 +++ .cvsignore 30 May 2006 09:31:45 -0000 1.2 @@ -0,0 +1 @@ +knemo-0.4.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/knemo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 09:30:21 -0000 1.1 +++ sources 30 May 2006 09:31:45 -0000 1.2 @@ -0,0 +1 @@ +a849c490844f33206027d8780bc2d218 knemo-0.4.0.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 09:36:29 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:36:29 -0700 Subject: rpms/gtkwave/devel gtkwave.spec,1.13,1.14 Message-ID: <200605300936.k4U9aVFW005042@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5025 Modified Files: gtkwave.spec Log Message: update to 3.0.3 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gtkwave.spec 28 May 2006 10:50:37 -0000 1.13 +++ gtkwave.spec 30 May 2006 09:36:28 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.2 -Release: 2%{?dist} +Version: 3.0.3 +Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 30 2006 Paul Howarth 3.0.3-1 +- update to 3.0.3 + * Sun May 28 2006 Paul Howarth 3.0.2-2 - adding missing buildreq flex From fedora-extras-commits at redhat.com Tue May 30 09:36:47 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:36:47 -0700 Subject: rpms/gtkwave/devel .cvsignore,1.12,1.13 sources,1.12,1.13 Message-ID: <200605300936.k4U9anRh005067@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5048 Modified Files: .cvsignore sources Log Message: update to 3.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 May 2006 09:12:33 -0000 1.12 +++ .cvsignore 30 May 2006 09:36:47 -0000 1.13 @@ -1 +1 @@ -gtkwave-3.0.2.tgz +gtkwave-3.0.3.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 May 2006 09:12:33 -0000 1.12 +++ sources 30 May 2006 09:36:47 -0000 1.13 @@ -1 +1 @@ -2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz +4f9a61bbec20c307ce6f874313b05b69 gtkwave-3.0.3.tgz From fedora-extras-commits at redhat.com Tue May 30 09:38:33 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:38:33 -0700 Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.12, 1.13 sources, 1.12, 1.13 .cvsignore, 1.12, 1.13 Message-ID: <200605300938.k4U9cZcc005142@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5121 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gtkwave.spec 10 May 2006 09:13:45 -0000 1.12 +++ gtkwave.spec 30 May 2006 09:38:33 -0000 1.13 @@ -1,13 +1,13 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -81,6 +81,12 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 30 2006 Paul Howarth 3.0.3-1 +- update to 3.0.3 + +* Sun May 28 2006 Paul Howarth 3.0.2-2 +- adding missing buildreq flex + * Wed May 10 2006 Paul Howarth 3.0.2-1 - update to 3.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 May 2006 09:13:45 -0000 1.12 +++ sources 30 May 2006 09:38:33 -0000 1.13 @@ -1 +1 @@ -2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz +4f9a61bbec20c307ce6f874313b05b69 gtkwave-3.0.3.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 May 2006 09:13:45 -0000 1.12 +++ .cvsignore 30 May 2006 09:38:33 -0000 1.13 @@ -1 +1 @@ -gtkwave-3.0.2.tgz +gtkwave-3.0.3.tgz From fedora-extras-commits at redhat.com Tue May 30 09:39:36 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:39:36 -0700 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.11, 1.12 sources, 1.12, 1.13 .cvsignore, 1.12, 1.13 Message-ID: <200605300939.k4U9dcYJ005214@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5193 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkwave.spec 10 May 2006 09:14:54 -0000 1.11 +++ gtkwave.spec 30 May 2006 09:39:35 -0000 1.12 @@ -1,13 +1,13 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -81,6 +81,12 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 30 2006 Paul Howarth 3.0.3-1 +- update to 3.0.3 + +* Sun May 28 2006 Paul Howarth 3.0.2-2 +- adding missing buildreq flex + * Wed May 10 2006 Paul Howarth 3.0.2-1 - update to 3.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 May 2006 09:14:54 -0000 1.12 +++ sources 30 May 2006 09:39:35 -0000 1.13 @@ -1 +1 @@ -2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz +4f9a61bbec20c307ce6f874313b05b69 gtkwave-3.0.3.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 May 2006 09:14:54 -0000 1.12 +++ .cvsignore 30 May 2006 09:39:35 -0000 1.13 @@ -1 +1 @@ -gtkwave-3.0.2.tgz +gtkwave-3.0.3.tgz From fedora-extras-commits at redhat.com Tue May 30 09:40:34 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:40:34 -0700 Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.10, 1.11 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Message-ID: <200605300940.k4U9eav9005287@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5264 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkwave.spec 10 May 2006 09:16:03 -0000 1.10 +++ gtkwave.spec 30 May 2006 09:40:34 -0000 1.11 @@ -1,13 +1,13 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -81,6 +81,12 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 30 2006 Paul Howarth 3.0.3-1 +- update to 3.0.3 + +* Sun May 28 2006 Paul Howarth 3.0.2-2 +- adding missing buildreq flex + * Wed May 10 2006 Paul Howarth 3.0.2-1 - update to 3.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 May 2006 09:16:03 -0000 1.11 +++ sources 30 May 2006 09:40:34 -0000 1.12 @@ -1 +1 @@ -2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz +4f9a61bbec20c307ce6f874313b05b69 gtkwave-3.0.3.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 May 2006 09:16:03 -0000 1.11 +++ .cvsignore 30 May 2006 09:40:34 -0000 1.12 @@ -1 +1 @@ -gtkwave-3.0.2.tgz +gtkwave-3.0.3.tgz From fedora-extras-commits at redhat.com Tue May 30 10:14:48 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 30 May 2006 03:14:48 -0700 Subject: rpms/sylpheed/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 sylpheed.spec, 1.29, 1.30 Message-ID: <200605301014.k4UAEoP3007784@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7763 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Tue May 30 2006 Michael Schwendt - 2.2.5-1 - Update to 2.2.5 (includes more "bold" fixes, too). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 31 Mar 2006 01:33:31 -0000 1.17 +++ .cvsignore 30 May 2006 10:14:48 -0000 1.18 @@ -1,2 +1 @@ -sylpheed-2.2.4.tar.bz2.asc -sylpheed-2.2.4.tar.bz2 +sylpheed-2.2.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 31 Mar 2006 01:33:31 -0000 1.17 +++ sources 30 May 2006 10:14:48 -0000 1.18 @@ -1,2 +1 @@ -6f60a04132f85161f8b3e44af2b63a98 sylpheed-2.2.4.tar.bz2.asc -4e5608e63d4ea413bf4a0fa3abb4223f sylpheed-2.2.4.tar.bz2 +6e20522180ba0346d3f85de160076560 sylpheed-2.2.5.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sylpheed.spec 31 Mar 2006 01:33:31 -0000 1.29 +++ sylpheed.spec 30 May 2006 10:14:48 -0000 1.30 @@ -4,7 +4,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.2.4 +Version: 2.2.5 Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ @@ -82,6 +82,9 @@ %{_mandir}/man1/* %changelog +* Tue May 30 2006 Michael Schwendt - 2.2.5-1 +- Update to 2.2.5 (includes more "bold" fixes, too). + * Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 - Update to 2.2.4. From fedora-extras-commits at redhat.com Tue May 30 10:15:57 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 30 May 2006 03:15:57 -0700 Subject: rpms/sylpheed/FC-5 sylpheed-2.2.3-defs.h.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 sylpheed.spec, 1.27, 1.28 sylpheed-default-browser.patch, 1.1, NONE Message-ID: <200605301015.k4UAFxNx007860@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7836 Modified Files: .cvsignore sources sylpheed.spec Added Files: sylpheed-2.2.3-defs.h.patch Removed Files: sylpheed-default-browser.patch Log Message: * Tue May 30 2006 Michael Schwendt - 2.2.5-1 - Update to 2.2.5 (includes more "bold" fixes, too). * Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 - Update to 2.2.4. * Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 - Update to 2.2.3. - Update external commands (defs.h) patch. * Sat Feb 18 2006 Michael Schwendt - 2.2.0-1 - Update to 2.2.0 (new stable series). - BR gtkspell-devel. sylpheed-2.2.3-defs.h.patch: --- NEW FILE sylpheed-2.2.3-defs.h.patch --- diff -Nur sylpheed-2.2.3-orig/libsylph/defs.h sylpheed-2.2.3/libsylph/defs.h --- sylpheed-2.2.3-orig/libsylph/defs.h 2006-01-10 09:18:15.000000000 +0100 +++ sylpheed-2.2.3/libsylph/defs.h 2006-03-19 22:45:40.000000000 +0100 @@ -87,12 +87,12 @@ #else # define DEFAULT_SIGNATURE ".signature" #endif -#define DEFAULT_INC_PATH "/usr/bin/mh/inc" +#define DEFAULT_INC_PATH "/usr/bin/inc" #define DEFAULT_INC_PROGRAM "inc" /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ /* #define DEFAULT_INC_PROGRAM "imget" */ #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i" -#define DEFAULT_BROWSER_CMD "mozilla-firefox -remote 'openURL(%s,new-window)'" +#define DEFAULT_BROWSER_CMD "gnome-open '%s'" #ifdef _PATH_MAILDIR # define DEFAULT_SPOOL_PATH _PATH_MAILDIR Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 11 Nov 2005 11:03:34 -0000 1.15 +++ .cvsignore 30 May 2006 10:15:57 -0000 1.16 @@ -1,2 +1 @@ -sylpheed-2.0.4.tar.bz2.asc -sylpheed-2.0.4.tar.bz2 +sylpheed-2.2.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Nov 2005 11:03:35 -0000 1.15 +++ sources 30 May 2006 10:15:57 -0000 1.16 @@ -1,2 +1 @@ -f4dc5a59840a59d92d432e297f7b5106 sylpheed-2.0.4.tar.bz2.asc -c9f1c4cf2b3933ebbb58519ba3b77887 sylpheed-2.0.4.tar.bz2 +6e20522180ba0346d3f85de160076560 sylpheed-2.2.5.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/sylpheed.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sylpheed.spec 15 Feb 2006 02:16:00 -0000 1.27 +++ sylpheed.spec 30 May 2006 10:15:57 -0000 1.28 @@ -4,8 +4,8 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.0.4 -Release: 2%{?dist} +Version: 2.2.5 +Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,11 +16,12 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 +BuildRequires: gtkspell-devel +Source0: http://sylpheed.good-day.net/sylpheed/v2.2/%{name}-%{version}.tar.bz2 Source1: sylpheed.1 -Patch2: sylpheed-default-browser.patch -Patch3: sylpheed-1.9.10-desktop.patch +Patch1: sylpheed-2.2.3-defs.h.patch +Patch2: sylpheed-1.9.10-desktop.patch %description This program is an X based fast email client which has features @@ -39,8 +40,8 @@ %prep %setup -q -%patch2 -p1 -b .default-browser -%patch3 -p1 -b .desktop +%patch1 -p1 -b .defs.h +%patch2 -p1 -b .desktop %build %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \ @@ -75,12 +76,26 @@ %doc COPYING ChangeLog README INSTALL TODO %doc ChangeLog.ja README.ja INSTALL.ja TODO.ja %{_bindir}/sylpheed -%{_datadir}/sylpheed +%{_datadir}/sylpheed/ %{_datadir}/applications/* %{_datadir}/pixmaps/* -%{_mandir}/man1 +%{_mandir}/man1/* %changelog +* Tue May 30 2006 Michael Schwendt - 2.2.5-1 +- Update to 2.2.5 (includes more "bold" fixes, too). + +* Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 +- Update to 2.2.4. + +* Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 +- Update to 2.2.3. +- Update external commands (defs.h) patch. + +* Sat Feb 18 2006 Michael Schwendt - 2.2.0-1 +- Update to 2.2.0 (new stable series). +- BR gtkspell-devel. + * Wed Feb 15 2006 Michael Schwendt - 2.0.4-2 - rebuilt for FC5 --- sylpheed-default-browser.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 11:55:40 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Tue, 30 May 2006 04:55:40 -0700 Subject: rpms/mail-notification/devel mail-notification-evolution.patch, 1.2, 1.3 mail-notification.spec, 1.18, 1.19 Message-ID: <200605301155.k4UBtgGR023068@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23038 Modified Files: mail-notification-evolution.patch mail-notification.spec Log Message: - fixed for evolution 2.7 mail-notification-evolution.patch: Index: mail-notification-evolution.patch =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-evolution.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mail-notification-evolution.patch 17 Jan 2006 18:07:25 -0000 1.2 +++ mail-notification-evolution.patch 30 May 2006 11:55:40 -0000 1.3 @@ -17,13 +17,13 @@ elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 -+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 -+ ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ++ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.8 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 ++ ($PKG_CONFIG --exists "evolution-plugin-2.8 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` -+ pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null` ++ pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.8 $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -33,13 +33,13 @@ elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 -+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 -+ ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ++ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.8 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 ++ ($PKG_CONFIG --exists "evolution-plugin-2.8 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` -+ pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null` ++ pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.8 $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -48,7 +48,7 @@ if test $pkg_failed = yes; then - EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"` -+ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.6 $evolution_plugin_min_version"` ++ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.8 $evolution_plugin_min_version"` # Put the nasty error message in config.log where it belongs echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5 @@ -57,7 +57,7 @@ echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5 echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6 - evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null` -+ evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.6 2>/dev/null` ++ evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.8 2>/dev/null` if test -n "$evolution_plugindir"; then echo "$as_me:$LINENO: result: $evolution_plugindir" >&5 echo "${ECHO_T}$evolution_plugindir" >&6 Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mail-notification.spec 28 Apr 2006 14:17:37 -0000 1.18 +++ mail-notification.spec 30 May 2006 11:55:40 -0000 1.19 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -26,7 +26,7 @@ BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libicu-devel >= 2.6 BuildRequires: gob2 -BuildRequires: evolution-devel >= 2.5 +BuildRequires: evolution-devel >= 2.7 BuildRequires: evolution-data-server-devel >= 1.5 @@ -52,7 +52,7 @@ %build export LDFLAGS="-Wl,--export-dynamic" -%configure --disable-schemas-install --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.6 +%configure --disable-schemas-install --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.8 make %{?_smp_mflags} @@ -113,13 +113,16 @@ %{_datadir}/applications/fedora-mail-notification.desktop %{_datadir}/applications/fedora-mail-notification-properties.desktop %{_datadir}/gnome/help/mail-notification/ -%{_libdir}/evolution/2.6/plugins/* +%{_libdir}/evolution/2.8/plugins/* %dir %{_datadir}/omf/mail-notification/ %{_datadir}/omf/mail-notification/mail-notification-C.omf %{_datadir}/pixmaps/mail-notification.png %changelog +* Tue May 30 2006 Radek Vokal 2.0-13 +- fixed for evolution 2.7 + * Thu Apr 27 2006 Paul Clifford 2.0-12 - Added patch for IMAP authentication problem from project homepage (#190137) From fedora-extras-commits at redhat.com Tue May 30 13:31:24 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 06:31:24 -0700 Subject: rpms/koffice/FC-5 koffice.spec,1.38,1.39 Message-ID: <200605301331.k4UDVQvr029959@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29942 Modified Files: koffice.spec Log Message: - hm seems like the buildsys does not look for x-raw.desktop Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- koffice.spec 30 May 2006 07:44:31 -0000 1.38 +++ koffice.spec 30 May 2006 13:31:23 -0000 1.39 @@ -533,7 +533,6 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -921,7 +920,6 @@ - add kexi forms patch - add kexi checkbox patch - version upgrade -- exclude x-raw.desktop again * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 From fedora-extras-commits at redhat.com Tue May 30 13:47:45 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 06:47:45 -0700 Subject: rpms/libqalculate/devel libqalculate.spec,1.8,1.9 Message-ID: <200605301347.k4UDllfC030107@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/libqalculate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30090 Modified Files: libqalculate.spec Log Message: * Tue Apr 30 2006 Deji Akingunola - 0.9.3-2 - More BRs from Paul Howarth (#193481) Index: libqalculate.spec =================================================================== RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libqalculate.spec 30 Mar 2006 19:59:49 -0000 1.8 +++ libqalculate.spec 30 May 2006 13:47:45 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Multi-purpose calculator library Name: libqalculate Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://qalculate.sourceforge.net/ @@ -10,6 +10,7 @@ BuildRequires: glib2-devel, cln-devel BuildRequires: libxml2-devel >= 2.3.8 BuildRequires: readline-devel, ncurses-devel +BuildRequires: perl(XML::Parser), gettext %description This library underpins the Qalculate! multi-purpose desktop calculator for @@ -73,6 +74,9 @@ %{_bindir}/qalc %changelog +* Tue Apr 30 2006 Deji Akingunola - 0.9.3-2 +- More BRs from Paul Howarth (#193481) + * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version From fedora-extras-commits at redhat.com Tue May 30 14:04:12 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 07:04:12 -0700 Subject: rpms/nautilus-actions/devel nautilus-actions.spec,1.5,1.6 Message-ID: <200605301404.k4UE4EM1032541@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/nautilus-actions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32524 Modified Files: nautilus-actions.spec Log Message: * Tue May 30 2006 Deji Akingunola - 1.2-2 - Add gettext and perl(XML::Parser) to BRs Index: nautilus-actions.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/devel/nautilus-actions.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nautilus-actions.spec 1 May 2006 16:27:37 -0000 1.5 +++ nautilus-actions.spec 30 May 2006 14:04:12 -0000 1.6 @@ -1,14 +1,14 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: User Interface/Desktops License: GPL URL: http://www.grumz.net/node/8 Source0: http://www.grumz.net/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel, libglade2-devel, nautilus -BuildRequires: e2fsprogs-devel +BuildRequires: e2fsprogs-devel, gettext, perl(XML::Parser) BuildRequires: desktop-file-utils Requires(pre): GConf2 Requires(preun): GConf2 @@ -91,6 +91,9 @@ %{_datadir}/applications/fedora-nact.desktop %changelog +* Tue May 30 2006 Deji Akingunola - 1.2-2 +- Add gettext and perl(XML::Parser) to BRs + * Mon May 01 2006 Deji Akingunola - 1.2-1 - Update to version 1.2 - Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors From fedora-extras-commits at redhat.com Tue May 30 14:50:52 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 07:50:52 -0700 Subject: owners owners.list,1.1075,1.1076 Message-ID: <200605301450.k4UEosNx000352@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv335 Modified Files: owners.list Log Message: added kerry and knemo packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1075 retrieving revision 1.1076 diff -u -r1.1075 -r1.1076 --- owners.list 30 May 2006 08:37:12 -0000 1.1075 +++ owners.list 30 May 2006 14:50:52 -0000 1.1076 @@ -578,6 +578,7 @@ Fedora Extras|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|kerry|Kerry Beagle is a KDE frontend for the Beagle desktop search|hugo at devin.com.br|extras-qa at fedoraproject.org| Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org| Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org| @@ -587,6 +588,7 @@ Fedora Extras|kipi-plugins|Plugins to use with Kipi|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kismet|WLAN detector, sniffer and IDS|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|kmymoney2|Personal finance|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|knemo|A KDE network monitoring tool|hugo at devin.com.br|extras-qa at fedoraproject.org| Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 30 15:17:36 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 08:17:36 -0700 Subject: rpms/Coin2/devel .cvsignore, 1.8, 1.9 Coin2.spec, 1.29, 1.30 sources, 1.8, 1.9 Message-ID: <200605301517.k4UFHcLR002861@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2834 Modified Files: .cvsignore Coin2.spec sources Log Message: * Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 - Upstream update. - Drop gcc-4.1 patch. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Sep 2005 03:10:21 -0000 1.8 +++ .cvsignore 30 May 2006 15:17:36 -0000 1.9 @@ -1 +1 @@ -Coin-2.4.4.tar.gz +Coin-2.4.5.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Coin2.spec 22 Feb 2006 16:23:33 -0000 1.29 +++ Coin2.spec 30 May 2006 15:17:36 -0000 1.30 @@ -12,8 +12,8 @@ Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.4 -Release: 10%{?dist} +Version: 2.4.5 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -23,7 +23,6 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: Coin-2.4.4-gcc-4.1.diff Patch5: coin-2.3.0-man3.diff BuildRequires: libGLU-devel @@ -60,7 +59,6 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch5 -p1 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ @@ -119,6 +117,11 @@ %doc %{coin_htmldir} %changelog +* Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 +- Upstream update. +- Drop gcc-4.1 patch. +- Spec file cleanup. + * Wed Feb 22 2006 Ralf Cors??pius - 2.4.4-10 - Rename man3 manpages to .3sim (PR 182212). @@ -154,38 +157,3 @@ * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. - -* Tue May 10 2005 Ralf Corsepius - 0:2.3.0-9 -- Introduce %%{coin_includedir} %%{coin_htmldir}. -- Misc. spec cleanup. - -* Fri May 06 2005 Ralf Corsepius - 0:2.3.0-8 -- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead - SONAME handling. - -* Tue May 03 2005 Ralf Corsepius - 0:2.3.0-7 -- Minor spec changes. - -* Tue Feb 22 2005 Ralf Corsepius - 0:2.3.0-5 -- Include simacros. -- Regenerate configure from simacros and FC3 libtool for x86_64. -- Don't install bogusly generated manpages for dirs. - -* Sun Jul 4 2004 Ralf Corsepius - 0:2.3.0-0.fdr.4 -- Let Coin-devel Require: bzip2-devel, zlib-devel. -- Use @XX@ patterns in soname sed calls. -- Remove Mesa from BuildRequires. - -* Sat Jul 3 2004 Ralf Corsepius - 0:2.3.0-0.fdr.3 -- Disable run-time linkage for GLU, bzip2, zlib. -- Add SONAME-hacks to simage, openal, freetype. -- Enable static libs. - -* Fri Jun 25 2004 Ralf Corsepius - 0:2.3.0-0.fdr.2 -- Fix package description. -- Initial submission to Fedora Extra. - -* Thu Jun 24 2004 Ralf Corsepius - 0:2.3.0-0.fdr.1 -- Update to 2.3.0 -- Install html docs to default installation dir (%%{_datadir}/html). -- Remove dependency to simage. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Sep 2005 03:10:21 -0000 1.8 +++ sources 30 May 2006 15:17:36 -0000 1.9 @@ -1 +1 @@ -7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz +99b83c5189c3755fd5f08fcad0994a7b Coin-2.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 30 15:18:15 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 08:18:15 -0700 Subject: rpms/Coin2/devel Coin-2.4.4-gcc-4.1.diff,1.1,NONE Message-ID: <200605301518.k4UFIHAs002934@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2915 Removed Files: Coin-2.4.4-gcc-4.1.diff Log Message: Remove --- Coin-2.4.4-gcc-4.1.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 15:53:07 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 08:53:07 -0700 Subject: rpms/Coin2/FC-5 .cvsignore, 1.8, 1.9 Coin2.spec, 1.29, 1.30 sources, 1.8, 1.9 Message-ID: <200605301553.k4UFr92F003284@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3257 Modified Files: .cvsignore Coin2.spec sources Log Message: * Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 - Upstream update. - Drop gcc-4.1 patch. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Sep 2005 03:10:21 -0000 1.8 +++ .cvsignore 30 May 2006 15:53:07 -0000 1.9 @@ -1 +1 @@ -Coin-2.4.4.tar.gz +Coin-2.4.5.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-5/Coin2.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Coin2.spec 22 Feb 2006 16:23:33 -0000 1.29 +++ Coin2.spec 30 May 2006 15:53:07 -0000 1.30 @@ -12,8 +12,8 @@ Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.4 -Release: 10%{?dist} +Version: 2.4.5 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -23,7 +23,6 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: Coin-2.4.4-gcc-4.1.diff Patch5: coin-2.3.0-man3.diff BuildRequires: libGLU-devel @@ -60,7 +59,6 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch5 -p1 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ @@ -119,6 +117,11 @@ %doc %{coin_htmldir} %changelog +* Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 +- Upstream update. +- Drop gcc-4.1 patch. +- Spec file cleanup. + * Wed Feb 22 2006 Ralf Cors??pius - 2.4.4-10 - Rename man3 manpages to .3sim (PR 182212). @@ -154,38 +157,3 @@ * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. - -* Tue May 10 2005 Ralf Corsepius - 0:2.3.0-9 -- Introduce %%{coin_includedir} %%{coin_htmldir}. -- Misc. spec cleanup. - -* Fri May 06 2005 Ralf Corsepius - 0:2.3.0-8 -- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead - SONAME handling. - -* Tue May 03 2005 Ralf Corsepius - 0:2.3.0-7 -- Minor spec changes. - -* Tue Feb 22 2005 Ralf Corsepius - 0:2.3.0-5 -- Include simacros. -- Regenerate configure from simacros and FC3 libtool for x86_64. -- Don't install bogusly generated manpages for dirs. - -* Sun Jul 4 2004 Ralf Corsepius - 0:2.3.0-0.fdr.4 -- Let Coin-devel Require: bzip2-devel, zlib-devel. -- Use @XX@ patterns in soname sed calls. -- Remove Mesa from BuildRequires. - -* Sat Jul 3 2004 Ralf Corsepius - 0:2.3.0-0.fdr.3 -- Disable run-time linkage for GLU, bzip2, zlib. -- Add SONAME-hacks to simage, openal, freetype. -- Enable static libs. - -* Fri Jun 25 2004 Ralf Corsepius - 0:2.3.0-0.fdr.2 -- Fix package description. -- Initial submission to Fedora Extra. - -* Thu Jun 24 2004 Ralf Corsepius - 0:2.3.0-0.fdr.1 -- Update to 2.3.0 -- Install html docs to default installation dir (%%{_datadir}/html). -- Remove dependency to simage. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Sep 2005 03:10:21 -0000 1.8 +++ sources 30 May 2006 15:53:07 -0000 1.9 @@ -1 +1 @@ -7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz +99b83c5189c3755fd5f08fcad0994a7b Coin-2.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 30 15:54:02 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 08:54:02 -0700 Subject: rpms/Coin2/FC-5 Coin-2.4.4-gcc-4.1.diff,1.1,NONE Message-ID: <200605301554.k4UFs4wx003314@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3299 Removed Files: Coin-2.4.4-gcc-4.1.diff Log Message: Remove. --- Coin-2.4.4-gcc-4.1.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 16:07:32 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 30 May 2006 09:07:32 -0700 Subject: fedora-security/audit fe4,1.33,1.34 fe5,1.33,1.34 Message-ID: <200605301607.k4UG7W6g005757@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5737 Modified Files: fe4 fe5 Log Message: CVE-2006-0847 version (python-cherrypy, fixed 2.1.1) Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- fe4 24 May 2006 23:25:02 -0000 1.33 +++ fe4 30 May 2006 16:07:30 -0000 1.34 @@ -56,6 +56,7 @@ CVE-2006-1079 VULNERABLE (thttpd) bz#191095 CVE-2006-1078 VULNERABLE (thttpd) bz#191095 CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7) +CVE-2006-0847 version (python-cherrypy, fixed 2.1.1) CVE-2006-0841 VULNERABLE (mantis) bz#191089 CVE-2006-0840 VULNERABLE (mantis) bz#191089 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- fe5 24 May 2006 23:25:02 -0000 1.33 +++ fe5 30 May 2006 16:07:30 -0000 1.34 @@ -60,6 +60,7 @@ CVE-2006-1079 VULNERABLE (thttpd) bz#191095 CVE-2006-1078 VULNERABLE (thttpd) bz#191095 CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7) +CVE-2006-0847 version (python-cherrypy, fixed 2.1.1) CVE-2006-0841 version (mantis, fixed 1.0.1) CVE-2006-0840 version (mantis, fixed 1.0.1) CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 From fedora-extras-commits at redhat.com Tue May 30 16:13:52 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 09:13:52 -0700 Subject: rpms/koffice/devel koffice.spec,1.37,1.38 Message-ID: <200605301613.k4UGDsFm005787@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5770 Modified Files: koffice.spec Log Message: - don't need exclude on buildsys Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- koffice.spec 30 May 2006 07:44:32 -0000 1.37 +++ koffice.spec 30 May 2006 16:13:52 -0000 1.38 @@ -533,7 +533,6 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -921,7 +920,6 @@ - add kexi forms patch - add kexi checkbox patch - version upgrade -- exclude x-raw.desktop again * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 From fedora-extras-commits at redhat.com Tue May 30 16:16:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 09:16:30 -0700 Subject: rpms/koffice/FC-4 koffice.spec,1.15,1.16 Message-ID: <200605301616.k4UGGWcU005872@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5855 Modified Files: koffice.spec Log Message: - don't need exclude on buildsys Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- koffice.spec 30 May 2006 07:44:31 -0000 1.15 +++ koffice.spec 30 May 2006 16:16:30 -0000 1.16 @@ -532,7 +532,6 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* From fedora-extras-commits at redhat.com Tue May 30 17:28:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:28:52 -0700 Subject: rpms/dbus-qt - New directory Message-ID: <200605301728.k4UHSs2W008679@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8653/dbus-qt Log Message: Directory /cvs/extras/rpms/dbus-qt added to the repository From fedora-extras-commits at redhat.com Tue May 30 17:28:53 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:28:53 -0700 Subject: rpms/dbus-qt/devel - New directory Message-ID: <200605301729.k4UHSt2Q008682@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8653/dbus-qt/devel Log Message: Directory /cvs/extras/rpms/dbus-qt/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 17:29:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:29:06 -0700 Subject: rpms/dbus-qt Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605301729.k4UHT8qw008731@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8698 Added Files: Makefile import.log Log Message: Setup of module dbus-qt --- NEW FILE Makefile --- # Top level Makefile for module dbus-qt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 17:29:07 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:29:07 -0700 Subject: rpms/dbus-qt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605301729.k4UHT9rr008734@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8698/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dbus-qt --- NEW 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 May 30 17:29:31 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:29:31 -0700 Subject: rpms/dbus-qt import.log,1.1,1.2 Message-ID: <200605301729.k4UHTXkI008795@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8762 Modified Files: import.log Log Message: auto-import dbus-qt-0.61-3 on branch devel from dbus-qt-0.61-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 17:29:06 -0000 1.1 +++ import.log 30 May 2006 17:29:31 -0000 1.2 @@ -0,0 +1 @@ +dbus-qt-0_61-3:HEAD:dbus-qt-0.61-3.src.rpm:1149010167 From fedora-extras-commits at redhat.com Tue May 30 17:29:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:29:32 -0700 Subject: rpms/dbus-qt/devel dbus-qt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605301729.k4UHTY7i008802@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8762/devel Modified Files: .cvsignore sources Added Files: dbus-qt.spec Log Message: auto-import dbus-qt-0.61-3 on branch devel from dbus-qt-0.61-3.src.rpm --- NEW FILE dbus-qt.spec --- # For FC-5 -- Rex Summary: Qt-based library for using D-BUS Name: dbus-qt Version: 0.61 Release: 3%{?dist} License: AFL/GPL URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/dbus-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel BuildRequires: libxml2-devel Provides: dbus-qt3 = %{version}-%{release} Requires: dbus = %{version} %description D-BUS add-on library to integrate the standard D-BUS library with the Qt3 thread abstraction and main loop. %package devel Summary: Libraries and headers for D-BUS Group: Development/Libraries Provides: dbus-qt3-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: dbus-devel Requires: qt-devel %description devel %{summary}. %prep %setup -q -n dbus-%{version} %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-tests --disable-verbose-mode --disable-asserts \ --disable-static \ --enable-qt3 \ --disable-qt \ --disable-libaudit --enable-selinux=no \ --disable-glib --disable-gtk make %{?_smp_mflags} -C dbus make %{?_smp_mflags} -C qt3 %install rm -rf $RPM_BUILD_ROOT make -C dbus install DESTDIR=$RPM_BUILD_ROOT make -C qt3 install DESTDIR=$RPM_BUILD_ROOT make -C dbus uninstall DESTDIR=$RPM_BUILD_ROOT # Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/libdbus-qt-*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/dbus-1.0/dbus/* %{_libdir}/libdbus-qt-*.so %changelog * Tue May 30 2006 Rex Dieter 0.61-3 - Requires: dbus = %%version * Mon May 29 2006 Rex Dieter 0.61-2 - %%post/%%postun: /sbin/ldconfig * Mon May 15 2006 Rex Dieter 0.61-1 - first try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 17:29:06 -0000 1.1 +++ .cvsignore 30 May 2006 17:29:32 -0000 1.2 @@ -0,0 +1 @@ +dbus-0.61.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 17:29:06 -0000 1.1 +++ sources 30 May 2006 17:29:32 -0000 1.2 @@ -0,0 +1 @@ +cfd4f26004e4304e0dace4d82894e50b dbus-0.61.tar.gz From fedora-extras-commits at redhat.com Tue May 30 17:30:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:30:28 -0700 Subject: rpms/dbus-qt/devel dbus-qt.spec,1.1,1.2 Message-ID: <200605301730.k4UHUUg6008866@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8849 Modified Files: dbus-qt.spec Log Message: remove FC-5 comment Index: dbus-qt.spec =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/dbus-qt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dbus-qt.spec 30 May 2006 17:29:32 -0000 1.1 +++ dbus-qt.spec 30 May 2006 17:30:28 -0000 1.2 @@ -1,6 +1,4 @@ -# For FC-5 -- Rex - Summary: Qt-based library for using D-BUS Name: dbus-qt Version: 0.61 From fedora-extras-commits at redhat.com Tue May 30 17:35:10 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:35:10 -0700 Subject: rpms/freehdl import.log,1.8,1.9 Message-ID: <200605301735.k4UHZC59008996@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8963 Modified Files: import.log Log Message: auto-import freehdl-0.0.2-1 on branch devel from freehdl-0.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freehdl/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 16 Feb 2006 17:10:06 -0000 1.8 +++ import.log 30 May 2006 17:35:09 -0000 1.9 @@ -5,3 +5,4 @@ freehdl-0_0_1-3:HEAD:freehdl-0.0.1-3.src.rpm:1140109517 freehdl-0_0_1-3:FC-4:freehdl-0.0.1-3.src.rpm:1140109656 freehdl-0_0_1-3:FC-3:freehdl-0.0.1-3.src.rpm:1140109781 +freehdl-0_0_2-1:HEAD:freehdl-0.0.2-1.src.rpm:1149010505 From fedora-extras-commits at redhat.com Tue May 30 17:35:10 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:35:10 -0700 Subject: rpms/freehdl/devel .cvsignore, 1.2, 1.3 freehdl.spec, 1.3, 1.4 sources, 1.2, 1.3 freehdl.diff, 1.1, NONE Message-ID: <200605301735.k4UHZCJZ009002@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8963/devel Modified Files: .cvsignore freehdl.spec sources Removed Files: freehdl.diff Log Message: auto-import freehdl-0.0.2-1 on branch devel from freehdl-0.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freehdl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2006 09:35:07 -0000 1.2 +++ .cvsignore 30 May 2006 17:35:10 -0000 1.3 @@ -1 +1 @@ -freehdl-0.0.1.tar.gz +freehdl-0.0.2.tar.gz Index: freehdl.spec =================================================================== RCS file: /cvs/extras/rpms/freehdl/devel/freehdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freehdl.spec 16 Feb 2006 17:06:09 -0000 1.3 +++ freehdl.spec 30 May 2006 17:35:10 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GPLed free VHDL Name: freehdl -Version: 0.0.1 -Release: 3%{?dist} +Version: 0.0.2 +Release: 1%{?dist} License: GPL Group: Applications/Engineering -Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz -Patch0: freehdl.diff +Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz +#Patch0: freehdl.diff URL: http://www.freehdl.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info /sbin/ldconfig @@ -16,7 +16,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure \ @@ -55,6 +55,9 @@ %{_mandir}/man5/* %changelog +* Mon May 29 2006 Eric Tanguy 0.0.2-1 +- Update to 0.0.2 + * Mon Feb 13 2006 Eric Tanguy 0.0.1-3 - Add Requires : gcc-c++ Index: sources =================================================================== RCS file: /cvs/extras/rpms/freehdl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2006 09:35:07 -0000 1.2 +++ sources 30 May 2006 17:35:10 -0000 1.3 @@ -1 +1 @@ -a88be93ac3eed4452cc64c86b4573013 freehdl-0.0.1.tar.gz +abe93550e5c2a0e7062d3ff4ea8deb09 freehdl-0.0.2.tar.gz --- freehdl.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 17:36:41 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:36:41 -0700 Subject: rpms/freehdl import.log,1.9,1.10 Message-ID: <200605301736.k4UHahnB009102@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9069 Modified Files: import.log Log Message: auto-import freehdl-0.0.2-1 on branch FC-5 from freehdl-0.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freehdl/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 30 May 2006 17:35:09 -0000 1.9 +++ import.log 30 May 2006 17:36:41 -0000 1.10 @@ -6,3 +6,4 @@ freehdl-0_0_1-3:FC-4:freehdl-0.0.1-3.src.rpm:1140109656 freehdl-0_0_1-3:FC-3:freehdl-0.0.1-3.src.rpm:1140109781 freehdl-0_0_2-1:HEAD:freehdl-0.0.2-1.src.rpm:1149010505 +freehdl-0_0_2-1:FC-5:freehdl-0.0.2-1.src.rpm:1149010597 From fedora-extras-commits at redhat.com Tue May 30 17:36:41 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:36:41 -0700 Subject: rpms/freehdl/FC-5 .cvsignore, 1.2, 1.3 freehdl.spec, 1.3, 1.4 sources, 1.2, 1.3 freehdl.diff, 1.1, NONE Message-ID: <200605301736.k4UHahIf009108@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9069/FC-5 Modified Files: .cvsignore freehdl.spec sources Removed Files: freehdl.diff Log Message: auto-import freehdl-0.0.2-1 on branch FC-5 from freehdl-0.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2006 09:35:07 -0000 1.2 +++ .cvsignore 30 May 2006 17:36:41 -0000 1.3 @@ -1 +1 @@ -freehdl-0.0.1.tar.gz +freehdl-0.0.2.tar.gz Index: freehdl.spec =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-5/freehdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freehdl.spec 16 Feb 2006 17:06:09 -0000 1.3 +++ freehdl.spec 30 May 2006 17:36:41 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GPLed free VHDL Name: freehdl -Version: 0.0.1 -Release: 3%{?dist} +Version: 0.0.2 +Release: 1%{?dist} License: GPL Group: Applications/Engineering -Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz -Patch0: freehdl.diff +Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz +#Patch0: freehdl.diff URL: http://www.freehdl.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info /sbin/ldconfig @@ -16,7 +16,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure \ @@ -55,6 +55,9 @@ %{_mandir}/man5/* %changelog +* Mon May 29 2006 Eric Tanguy 0.0.2-1 +- Update to 0.0.2 + * Mon Feb 13 2006 Eric Tanguy 0.0.1-3 - Add Requires : gcc-c++ Index: sources =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2006 09:35:07 -0000 1.2 +++ sources 30 May 2006 17:36:41 -0000 1.3 @@ -1 +1 @@ -a88be93ac3eed4452cc64c86b4573013 freehdl-0.0.1.tar.gz +abe93550e5c2a0e7062d3ff4ea8deb09 freehdl-0.0.2.tar.gz --- freehdl.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 17:37:45 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:37:45 -0700 Subject: rpms/freehdl import.log,1.10,1.11 Message-ID: <200605301737.k4UHblHE009208@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9175 Modified Files: import.log Log Message: auto-import freehdl-0.0.2-1 on branch FC-4 from freehdl-0.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freehdl/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 30 May 2006 17:36:41 -0000 1.10 +++ import.log 30 May 2006 17:37:45 -0000 1.11 @@ -7,3 +7,4 @@ freehdl-0_0_1-3:FC-3:freehdl-0.0.1-3.src.rpm:1140109781 freehdl-0_0_2-1:HEAD:freehdl-0.0.2-1.src.rpm:1149010505 freehdl-0_0_2-1:FC-5:freehdl-0.0.2-1.src.rpm:1149010597 +freehdl-0_0_2-1:FC-4:freehdl-0.0.2-1.src.rpm:1149010661 From fedora-extras-commits at redhat.com Tue May 30 17:37:46 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:37:46 -0700 Subject: rpms/freehdl/FC-4 .cvsignore, 1.2, 1.3 freehdl.spec, 1.3, 1.4 sources, 1.2, 1.3 freehdl.diff, 1.1, NONE Message-ID: <200605301737.k4UHbmu7009214@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9175/FC-4 Modified Files: .cvsignore freehdl.spec sources Removed Files: freehdl.diff Log Message: auto-import freehdl-0.0.2-1 on branch FC-4 from freehdl-0.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2006 09:35:07 -0000 1.2 +++ .cvsignore 30 May 2006 17:37:46 -0000 1.3 @@ -1 +1 @@ -freehdl-0.0.1.tar.gz +freehdl-0.0.2.tar.gz Index: freehdl.spec =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-4/freehdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freehdl.spec 16 Feb 2006 17:08:20 -0000 1.3 +++ freehdl.spec 30 May 2006 17:37:46 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GPLed free VHDL Name: freehdl -Version: 0.0.1 -Release: 3%{?dist} +Version: 0.0.2 +Release: 1%{?dist} License: GPL Group: Applications/Engineering -Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz -Patch0: freehdl.diff +Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz +#Patch0: freehdl.diff URL: http://www.freehdl.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info /sbin/ldconfig @@ -16,7 +16,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure \ @@ -55,6 +55,9 @@ %{_mandir}/man5/* %changelog +* Mon May 29 2006 Eric Tanguy 0.0.2-1 +- Update to 0.0.2 + * Mon Feb 13 2006 Eric Tanguy 0.0.1-3 - Add Requires : gcc-c++ Index: sources =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2006 09:35:07 -0000 1.2 +++ sources 30 May 2006 17:37:46 -0000 1.3 @@ -1 +1 @@ -a88be93ac3eed4452cc64c86b4573013 freehdl-0.0.1.tar.gz +abe93550e5c2a0e7062d3ff4ea8deb09 freehdl-0.0.2.tar.gz --- freehdl.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 17:38:47 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:38:47 -0700 Subject: rpms/freehdl import.log,1.11,1.12 Message-ID: <200605301738.k4UHcngL009331@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9298 Modified Files: import.log Log Message: auto-import freehdl-0.0.2-1 on branch FC-3 from freehdl-0.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freehdl/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 30 May 2006 17:37:45 -0000 1.11 +++ import.log 30 May 2006 17:38:47 -0000 1.12 @@ -8,3 +8,4 @@ freehdl-0_0_2-1:HEAD:freehdl-0.0.2-1.src.rpm:1149010505 freehdl-0_0_2-1:FC-5:freehdl-0.0.2-1.src.rpm:1149010597 freehdl-0_0_2-1:FC-4:freehdl-0.0.2-1.src.rpm:1149010661 +freehdl-0_0_2-1:FC-3:freehdl-0.0.2-1.src.rpm:1149010723 From fedora-extras-commits at redhat.com Tue May 30 17:38:48 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:38:48 -0700 Subject: rpms/freehdl/FC-3 .cvsignore, 1.2, 1.3 freehdl.spec, 1.3, 1.4 sources, 1.2, 1.3 freehdl.diff, 1.1, NONE Message-ID: <200605301738.k4UHcorP009337@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9298/FC-3 Modified Files: .cvsignore freehdl.spec sources Removed Files: freehdl.diff Log Message: auto-import freehdl-0.0.2-1 on branch FC-3 from freehdl-0.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2006 09:35:07 -0000 1.2 +++ .cvsignore 30 May 2006 17:38:48 -0000 1.3 @@ -1 +1 @@ -freehdl-0.0.1.tar.gz +freehdl-0.0.2.tar.gz Index: freehdl.spec =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-3/freehdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freehdl.spec 16 Feb 2006 17:10:12 -0000 1.3 +++ freehdl.spec 30 May 2006 17:38:48 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GPLed free VHDL Name: freehdl -Version: 0.0.1 -Release: 3%{?dist} +Version: 0.0.2 +Release: 1%{?dist} License: GPL Group: Applications/Engineering -Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz -Patch0: freehdl.diff +Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz +#Patch0: freehdl.diff URL: http://www.freehdl.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info /sbin/ldconfig @@ -16,7 +16,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure \ @@ -55,6 +55,9 @@ %{_mandir}/man5/* %changelog +* Mon May 29 2006 Eric Tanguy 0.0.2-1 +- Update to 0.0.2 + * Mon Feb 13 2006 Eric Tanguy 0.0.1-3 - Add Requires : gcc-c++ Index: sources =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2006 09:35:07 -0000 1.2 +++ sources 30 May 2006 17:38:48 -0000 1.3 @@ -1 +1 @@ -a88be93ac3eed4452cc64c86b4573013 freehdl-0.0.1.tar.gz +abe93550e5c2a0e7062d3ff4ea8deb09 freehdl-0.0.2.tar.gz --- freehdl.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 17:40:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:40:28 -0700 Subject: rpms/kmymoney2/FC-4 .cvsignore,1.5,1.6 Message-ID: <200605301740.k4UHeUFO009491@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kmymoney2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9444/FC-4 Modified Files: .cvsignore Log Message: cosmetics Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmymoney2/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2006 11:38:02 -0000 1.5 +++ .cvsignore 30 May 2006 17:40:28 -0000 1.6 @@ -1 +1,2 @@ +clog kmymoney2-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 17:40:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:40:30 -0700 Subject: rpms/kmymoney2/devel .cvsignore,1.5,1.6 Message-ID: <200605301740.k4UHeWq5009499@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kmymoney2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9444/devel Modified Files: .cvsignore Log Message: cosmetics Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmymoney2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2006 01:36:07 -0000 1.5 +++ .cvsignore 30 May 2006 17:40:30 -0000 1.6 @@ -1 +1,2 @@ +clog kmymoney2-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 17:40:29 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:40:29 -0700 Subject: rpms/kmymoney2/FC-5 .cvsignore,1.5,1.6 Message-ID: <200605301740.k4UHeV5Q009495@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kmymoney2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9444/FC-5 Modified Files: .cvsignore Log Message: cosmetics Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmymoney2/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2006 11:38:37 -0000 1.5 +++ .cvsignore 30 May 2006 17:40:29 -0000 1.6 @@ -1 +1,2 @@ +clog kmymoney2-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 17:42:22 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:42:22 -0700 Subject: rpms/qucs import.log,1.12,1.13 Message-ID: <200605301742.k4UHgOP5009561@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9528 Modified Files: import.log Log Message: auto-import qucs-0.0.9-1 on branch devel from qucs-0.0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qucs/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 14 Feb 2006 21:32:31 -0000 1.12 +++ import.log 30 May 2006 17:42:22 -0000 1.13 @@ -9,3 +9,4 @@ qucs-0_0_8-1:HEAD:qucs-0.0.8-1.src.rpm:1139867738 qucs-0_0_8-1:FC-4:qucs-0.0.8-1.src.rpm:1139952604 qucs-0_0_8-1:FC-3:qucs-0.0.8-1.src.rpm:1139952725 +qucs-0_0_9-1:HEAD:qucs-0.0.9-1.src.rpm:1149010939 From fedora-extras-commits at redhat.com Tue May 30 17:42:23 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:42:23 -0700 Subject: rpms/qucs/devel .cvsignore, 1.3, 1.4 qucs.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605301742.k4UHgPS1009567@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9528/devel Modified Files: .cvsignore qucs.spec sources Log Message: auto-import qucs-0.0.9-1 on branch devel from qucs-0.0.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 21:55:53 -0000 1.3 +++ .cvsignore 30 May 2006 17:42:22 -0000 1.4 @@ -1 +1 @@ -qucs-0.0.8.tar.gz +qucs-0.0.9.tar.gz Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qucs.spec 13 Feb 2006 21:55:53 -0000 1.5 +++ qucs.spec 30 May 2006 17:42:22 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_mandir}/man1/* %changelog +* Mon May 29 2006 Eric Tanguy - 0.0.9-1 +- Update to 0.0.9 + * Mon Jan 23 2006 Eric Tanguy - 0.0.8-1 - Update to 0.0.8 - Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 21:55:53 -0000 1.3 +++ sources 30 May 2006 17:42:22 -0000 1.4 @@ -1 +1 @@ -0b280090e4b7ff390c6cc4458b3387a8 qucs-0.0.8.tar.gz +863eba475f35d006325f9d49671a2031 qucs-0.0.9.tar.gz From fedora-extras-commits at redhat.com Tue May 30 17:43:30 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:43:30 -0700 Subject: rpms/qucs import.log,1.13,1.14 Message-ID: <200605301743.k4UHhWCX009661@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628 Modified Files: import.log Log Message: auto-import qucs-0.0.9-1 on branch FC-5 from qucs-0.0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qucs/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 30 May 2006 17:42:22 -0000 1.13 +++ import.log 30 May 2006 17:43:29 -0000 1.14 @@ -10,3 +10,4 @@ qucs-0_0_8-1:FC-4:qucs-0.0.8-1.src.rpm:1139952604 qucs-0_0_8-1:FC-3:qucs-0.0.8-1.src.rpm:1139952725 qucs-0_0_9-1:HEAD:qucs-0.0.9-1.src.rpm:1149010939 +qucs-0_0_9-1:FC-5:qucs-0.0.9-1.src.rpm:1149011007 From fedora-extras-commits at redhat.com Tue May 30 17:43:30 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:43:30 -0700 Subject: rpms/qucs/FC-5 .cvsignore, 1.3, 1.4 qucs.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605301743.k4UHhWKW009667@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628/FC-5 Modified Files: .cvsignore qucs.spec sources Log Message: auto-import qucs-0.0.9-1 on branch FC-5 from qucs-0.0.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 21:55:53 -0000 1.3 +++ .cvsignore 30 May 2006 17:43:30 -0000 1.4 @@ -1 +1 @@ -qucs-0.0.8.tar.gz +qucs-0.0.9.tar.gz Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-5/qucs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qucs.spec 13 Feb 2006 21:55:53 -0000 1.5 +++ qucs.spec 30 May 2006 17:43:30 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_mandir}/man1/* %changelog +* Mon May 29 2006 Eric Tanguy - 0.0.9-1 +- Update to 0.0.9 + * Mon Jan 23 2006 Eric Tanguy - 0.0.8-1 - Update to 0.0.8 - Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 21:55:53 -0000 1.3 +++ sources 30 May 2006 17:43:30 -0000 1.4 @@ -1 +1 @@ -0b280090e4b7ff390c6cc4458b3387a8 qucs-0.0.8.tar.gz +863eba475f35d006325f9d49671a2031 qucs-0.0.9.tar.gz From fedora-extras-commits at redhat.com Tue May 30 17:44:42 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:44:42 -0700 Subject: rpms/qucs import.log,1.14,1.15 Message-ID: <200605301745.k4UHjE6Y009766@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9730 Modified Files: import.log Log Message: auto-import qucs-0.0.9-1 on branch FC-4 from qucs-0.0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qucs/import.log,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import.log 30 May 2006 17:43:29 -0000 1.14 +++ import.log 30 May 2006 17:44:41 -0000 1.15 @@ -11,3 +11,4 @@ qucs-0_0_8-1:FC-3:qucs-0.0.8-1.src.rpm:1139952725 qucs-0_0_9-1:HEAD:qucs-0.0.9-1.src.rpm:1149010939 qucs-0_0_9-1:FC-5:qucs-0.0.9-1.src.rpm:1149011007 +qucs-0_0_9-1:FC-4:qucs-0.0.9-1.src.rpm:1149011079 From fedora-extras-commits at redhat.com Tue May 30 17:44:42 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:44:42 -0700 Subject: rpms/qucs/FC-4 .cvsignore, 1.3, 1.4 qucs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605301745.k4UHjElw009771@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9730/FC-4 Modified Files: .cvsignore qucs.spec sources Log Message: auto-import qucs-0.0.9-1 on branch FC-4 from qucs-0.0.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 21:30:32 -0000 1.3 +++ .cvsignore 30 May 2006 17:44:42 -0000 1.4 @@ -1 +1 @@ -qucs-0.0.8.tar.gz +qucs-0.0.9.tar.gz Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-4/qucs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qucs.spec 14 Feb 2006 21:30:32 -0000 1.4 +++ qucs.spec 30 May 2006 17:44:42 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_mandir}/man1/* %changelog +* Mon May 29 2006 Eric Tanguy - 0.0.9-1 +- Update to 0.0.9 + * Mon Jan 23 2006 Eric Tanguy - 0.0.8-1 - Update to 0.0.8 - Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 21:30:32 -0000 1.3 +++ sources 30 May 2006 17:44:42 -0000 1.4 @@ -1 +1 @@ -0b280090e4b7ff390c6cc4458b3387a8 qucs-0.0.8.tar.gz +863eba475f35d006325f9d49671a2031 qucs-0.0.9.tar.gz From fedora-extras-commits at redhat.com Tue May 30 17:46:23 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:46:23 -0700 Subject: rpms/qucs import.log,1.15,1.16 Message-ID: <200605301746.k4UHktG6009867@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9833 Modified Files: import.log Log Message: auto-import qucs-0.0.9-1 on branch FC-3 from qucs-0.0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qucs/import.log,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- import.log 30 May 2006 17:44:41 -0000 1.15 +++ import.log 30 May 2006 17:46:23 -0000 1.16 @@ -12,3 +12,4 @@ qucs-0_0_9-1:HEAD:qucs-0.0.9-1.src.rpm:1149010939 qucs-0_0_9-1:FC-5:qucs-0.0.9-1.src.rpm:1149011007 qucs-0_0_9-1:FC-4:qucs-0.0.9-1.src.rpm:1149011079 +qucs-0_0_9-1:FC-3:qucs-0.0.9-1.src.rpm:1149011181 From fedora-extras-commits at redhat.com Tue May 30 17:46:24 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:46:24 -0700 Subject: rpms/qucs/FC-3 .cvsignore, 1.3, 1.4 qucs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605301746.k4UHku4f009872@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9833/FC-3 Modified Files: .cvsignore qucs.spec sources Log Message: auto-import qucs-0.0.9-1 on branch FC-3 from qucs-0.0.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 21:32:38 -0000 1.3 +++ .cvsignore 30 May 2006 17:46:24 -0000 1.4 @@ -1 +1 @@ -qucs-0.0.8.tar.gz +qucs-0.0.9.tar.gz Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-3/qucs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qucs.spec 14 Feb 2006 21:32:38 -0000 1.4 +++ qucs.spec 30 May 2006 17:46:24 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_mandir}/man1/* %changelog +* Mon May 29 2006 Eric Tanguy - 0.0.9-1 +- Update to 0.0.9 + * Mon Jan 23 2006 Eric Tanguy - 0.0.8-1 - Update to 0.0.8 - Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 21:32:38 -0000 1.3 +++ sources 30 May 2006 17:46:24 -0000 1.4 @@ -1 +1 @@ -0b280090e4b7ff390c6cc4458b3387a8 qucs-0.0.8.tar.gz +863eba475f35d006325f9d49671a2031 qucs-0.0.9.tar.gz From fedora-extras-commits at redhat.com Tue May 30 18:09:04 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 30 May 2006 11:09:04 -0700 Subject: fedora-security/audit fc4,1.270,1.271 fc5,1.183,1.184 Message-ID: <200605301809.k4UI94nb012658@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12638 Modified Files: fc4 fc5 Log Message: Note the tiffsplit CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- fc4 29 May 2006 22:52:35 -0000 1.270 +++ fc4 30 May 2006 18:09:01 -0000 1.271 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] +CVE-2006-2656 backport (libtiff) [since FEDORA-2006-591] CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- fc5 29 May 2006 22:52:35 -0000 1.183 +++ fc5 30 May 2006 18:09:01 -0000 1.184 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] +CVE-2006-2656 backport (libtiff) [since FEDORA-2006-592] CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 From fedora-extras-commits at redhat.com Tue May 30 18:21:47 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 11:21:47 -0700 Subject: rpms/Coin2/FC-4 .cvsignore, 1.7, 1.8 Coin2.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200605301821.k4UILnMf012735@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714 Modified Files: .cvsignore Coin2.spec sources Log Message: * Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 - Upstream update. - Drop gcc-4.1 patch. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Sep 2005 07:06:10 -0000 1.7 +++ .cvsignore 30 May 2006 18:21:47 -0000 1.8 @@ -1 +1 @@ -Coin-2.4.4.tar.gz +Coin-2.4.5.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Coin2.spec 22 Feb 2006 16:26:58 -0000 1.16 +++ Coin2.spec 30 May 2006 18:21:47 -0000 1.17 @@ -12,8 +12,8 @@ Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.4 -Release: 3.2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -23,7 +23,6 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: Coin-2.4.4-gcc-4.1.diff Patch5: coin-2.3.0-man3.diff BuildRequires: xorg-x11-Mesa-libGL @@ -35,7 +34,6 @@ BuildRequires: freetype-devel BuildRequires: doxygen BuildRequires: /usr/bin/rename - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -58,7 +56,6 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch5 -p1 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ @@ -117,6 +114,11 @@ %doc %{coin_htmldir} %changelog +* Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 +- Upstream update. +- Drop gcc-4.1 patch. +- Spec file cleanup. + * Wed Feb 22 2006 Ralf Cors??pius - 2.4.4-3.2 - Rename man3 manpages to .3sim (PR 182212). @@ -137,19 +139,3 @@ * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. - -* Tue May 10 2005 Ralf Corsepius - 0:2.3.0-9 -- Introduce %%{coin_includedir} %%{coin_htmldir}. -- Misc. spec cleanup. - -* Fri May 06 2005 Ralf Corsepius - 0:2.3.0-8 -- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead - SONAME handling. - -* Tue May 03 2005 Ralf Corsepius - 0:2.3.0-7 -- Minor spec changes. - -* Tue Feb 22 2005 Ralf Corsepius - 0:2.3.0-5 -- Include simacros. -- Regenerate configure from simacros and FC3 libtool for x86_64. -- Don't install bogusly generated manpages for dirs. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Sep 2005 07:31:34 -0000 1.8 +++ sources 30 May 2006 18:21:47 -0000 1.9 @@ -1 +1 @@ -7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz +99b83c5189c3755fd5f08fcad0994a7b Coin-2.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 30 18:22:48 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 11:22:48 -0700 Subject: rpms/Coin2/FC-4 Coin-2.4.4-gcc-4.1.diff,1.1,NONE Message-ID: <200605301822.k4UIMoXc012790@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12775 Removed Files: Coin-2.4.4-gcc-4.1.diff Log Message: Remove. --- Coin-2.4.4-gcc-4.1.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 19:45:34 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Tue, 30 May 2006 12:45:34 -0700 Subject: rpms/vpnc/FC-5 vpnc.spec,1.12,1.13 Message-ID: <200605301945.k4UJjaUY015423@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/vpnc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404 Modified Files: vpnc.spec Log Message: * Tue May 30 2006 Tomas Mraz 0.3.3-7.1 - drop -fstack-protector from x86_64 build (workaround for #172145) Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/FC-5/vpnc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vpnc.spec 9 Mar 2006 17:42:53 -0000 1.12 +++ vpnc.spec 30 May 2006 19:45:34 -0000 1.13 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.3 -Release: 7 +Release: 7.1 Summary: IPSec VPN client compatible with Cisco equipment @@ -35,6 +35,9 @@ %patch4 -p1 -b .rekeying %build +%ifarch x86_64 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed s/-f-stack-protector//g) +%endif make PREFIX=/usr %install @@ -65,6 +68,9 @@ %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup %changelog +* Tue May 30 2006 Tomas Mraz 0.3.3-7.1 +- drop -fstack-protector from x86_64 build (workaround for #172145) + * Thu Mar 9 2006 Tomas Mraz 0.3.3-7 - add basic rekeying support (the patch includes NAT keepalive support by Brian Downing) From fedora-extras-commits at redhat.com Tue May 30 19:50:35 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 30 May 2006 12:50:35 -0700 Subject: rpms/pan/devel .cvsignore, 1.9, 1.10 pan.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <200605301950.k4UJobh7015512@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15489 Modified Files: .cvsignore pan.spec sources Log Message: new upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 May 2006 15:59:38 -0000 1.9 +++ .cvsignore 30 May 2006 19:50:35 -0000 1.10 @@ -1 +1,2 @@ pan-0.98.tar.bz2 +pan-0.99.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pan.spec 23 May 2006 15:59:38 -0000 1.17 +++ pan.spec 30 May 2006 19:50:35 -0000 1.18 @@ -1,6 +1,6 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.98 +Version: 0.99 Release: 1%{?dist} Epoch: 1 License: GPL @@ -70,6 +70,9 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Tue May 30 2006 Michael A. Peters - 1:0.99-1 +- Update to 0.99 + * Tue May 23 2006 Michael A. Peters - 1:0.98-1 - Update to 0.98 - previous patches not needed Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 May 2006 15:59:38 -0000 1.9 +++ sources 30 May 2006 19:50:35 -0000 1.10 @@ -1 +1,2 @@ 004dd79036b726e666cadcfd080fd515 pan-0.98.tar.bz2 +d67316c696298e37471bd3638828de67 pan-0.99.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 19:50:52 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Tue, 30 May 2006 12:50:52 -0700 Subject: rpms/vpnc/devel vpnc-0.3.3-rekeying.patch, 1.1, 1.2 vpnc.spec, 1.12, 1.13 Message-ID: <200605301950.k4UJosxa015569@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15520 Modified Files: vpnc-0.3.3-rekeying.patch vpnc.spec Log Message: * Tue May 30 2006 Tomas Mraz 0.3.3-8 - drop -fstack-protector from x86_64 build (workaround for #172145) - make rekeying a little bit better vpnc-0.3.3-rekeying.patch: Index: vpnc-0.3.3-rekeying.patch =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc-0.3.3-rekeying.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vpnc-0.3.3-rekeying.patch 9 Mar 2006 17:42:53 -0000 1.1 +++ vpnc-0.3.3-rekeying.patch 30 May 2006 19:50:52 -0000 1.2 @@ -1,5 +1,5 @@ ---- vpnc-0.3.3/vpnc.c.rekeying 2006-03-09 18:33:04.000000000 +0100 -+++ vpnc-0.3.3/vpnc.c 2006-03-09 18:33:40.000000000 +0100 +--- vpnc-0.3.3/vpnc.c.rekeying 2006-03-14 22:53:00.000000000 +0100 ++++ vpnc-0.3.3/vpnc.c 2006-03-14 22:54:16.000000000 +0100 @@ -60,15 +60,13 @@ static uint8_t r_packet[2048]; static ssize_t r_length; @@ -50,7 +50,39 @@ } /* Wait at least 2s for a response or 4 times the time it took -@@ -1882,7 +1886,7 @@ +@@ -396,6 +400,31 @@ + return recvsize; + } + ++static void ++flushrecv(void) ++{ ++ struct pollfd pfd; ++ int recvsize = -1; ++ struct sockaddr_in recvaddr; ++ socklen_t recvaddr_size = sizeof(recvaddr); ++ uint8_t r_packet[2048]; ++ ++ pfd.fd = sockfd; ++ pfd.events = POLLIN; ++ ++ for (;;) { ++ int pollresult; ++ ++ pollresult = poll(&pfd, 1, 0); ++ ++ if (pollresult <= 0) ++ return; ++ ++ recvsize = recvfrom(sockfd, r_packet, sizeof(r_packet), 0, ++ (struct sockaddr *)&recvaddr, &recvaddr_size); ++ } ++} ++ + int isakmp_crypt(struct sa_block *s, uint8_t * block, size_t blocklen, int enc) + { + unsigned char *new_iv, *iv = NULL; +@@ -1882,7 +1911,7 @@ return r; } @@ -59,7 +91,7 @@ { struct isakmp_payload *rp, *us, *ke = NULL, *them, *nonce_r = NULL; struct isakmp_packet *r; -@@ -1893,6 +1897,8 @@ +@@ -1893,6 +1922,8 @@ size_t p_size = 0; uint8_t nonce[20], *dh_public = NULL; int ipsec_cry_algo = 0, ipsec_hash_algo = 0, i; @@ -68,15 +100,30 @@ DEBUG(2, printf("S7.1\n")); /* Set up the Diffie-Hellman stuff. */ -@@ -1944,6 +1950,7 @@ - memcpy(realiv_msgid, s->current_iv_msgid, 4); - } +@@ -1934,6 +1965,11 @@ + msgid = 1; + + DEBUG(2, printf("S7.2\n")); ++ ++ if(rekey) { ++ flushrecv(); ++ } ++ + for (i = 0; i < 4; i++) { + sendrecv_phase2(s, rp, ISAKMP_EXCHANGE_IKE_QUICK, + msgid, 0, &p_flat, &p_size, 0, 0, 0, 0); +@@ -1946,12 +1982,24 @@ -+again: DEBUG(2, printf("S7.3\n")); reject = unpack_verify_phase2(s, r_packet, r_length, &r, nonce, sizeof(nonce)); ++ if (reject != 0 && reject != ISAKMP_N_AUTHENTICATION_FAILED) { ++ DEBUG(2, printf("ignoring bad packet, retrying\n")); ++ r_length = sendrecv(r_packet, sizeof(*r_packet), NULL, 0, 0); ++ continue; ++ } -@@ -1952,6 +1959,13 @@ + DEBUG(2, printf("S7.4\n")); + if (((reject == 0) || (reject == ISAKMP_N_AUTHENTICATION_FAILED)) && r->exchange_type == ISAKMP_EXCHANGE_INFORMATIONAL) { /* handle notifie responder-lifetime (ignore) */ /* (broken hash => ignore AUTHENTICATION_FAILED) */ @@ -84,13 +131,13 @@ + && r->payload->next->type == ISAKMP_PAYLOAD_D && rekey) { + DEBUG(2, printf("ignoring delete old ESP SA notify\n")); + r_length = sendrecv(r_packet, sizeof(*r_packet), NULL, 0, 0); -+ goto again; ++ continue; + } + if (reject == 0 && r->payload->next->type != ISAKMP_PAYLOAD_N) reject = ISAKMP_N_INVALID_PAYLOAD_TYPE; -@@ -2122,51 +2136,20 @@ +@@ -2122,51 +2170,20 @@ nonce_r->u.nonce.data, nonce_r->u.nonce.length); DEBUG(2, printf("S7.7\n")); @@ -149,7 +196,7 @@ if (dh_grp) { /* Determine the shared secret. */ dh_shared_secret = xallocc(dh_getlen(dh_grp)); -@@ -2186,21 +2169,66 @@ +@@ -2186,21 +2203,66 @@ nonce, sizeof(nonce), nonce_r->u.nonce.data, nonce_r->u.nonce.length); memcpy(&tous_dest, dest_addr, sizeof(tous_dest)); if (opt_udpencap && s->peer_udpencap_port) { @@ -184,7 +231,7 @@ + s->tun_fd, ipsec_hash_algo, ipsec_cry_algo, em, tunnelfd, config[CONFIG_PID_FILE]); + rekey = reject == 0; - } ++ } + + DEBUG(2, printf("S7.10\n")); + /* Create and send the delete payload. */ @@ -219,12 +266,12 @@ + sendrecv_phase2(s, d_ipsec, ISAKMP_EXCHANGE_INFORMATIONAL, + del_msgid, 1, NULL, NULL, + NULL, 0, NULL, 0); -+ } + } + return reject; } int main(int argc, char **argv) -@@ -2239,7 +2267,9 @@ +@@ -2239,7 +2301,9 @@ do_load_balance = do_phase_2_config(oursa); } while (do_load_balance); DEBUG(2, printf("S7\n")); @@ -236,7 +283,7 @@ setenv("reason", "disconnect", 1); system(config[CONFIG_SCRIPT]); --- vpnc-0.3.3/config.c.rekeying 2005-05-01 22:06:36.000000000 +0200 -+++ vpnc-0.3.3/config.c 2006-03-09 18:33:04.000000000 +0100 ++++ vpnc-0.3.3/config.c 2006-03-14 22:53:00.000000000 +0100 @@ -56,6 +56,8 @@ int opt_1des; int opt_udpencap; @@ -294,7 +341,7 @@ if (opt_debug >= 99) { --- vpnc-0.3.3/tunip.c.rekeying 2005-05-05 12:25:00.000000000 +0200 -+++ vpnc-0.3.3/tunip.c 2006-03-09 18:33:04.000000000 +0100 ++++ vpnc-0.3.3/tunip.c 2006-03-14 22:53:00.000000000 +0100 @@ -333,18 +333,14 @@ return 1; } @@ -457,7 +504,7 @@ + return vpnc_main_loop(&vpnpeer, &meth, tun_fd, (!opt_nd) ? pidfile : NULL); } --- vpnc-0.3.3/config.h.rekeying 2005-05-01 22:06:45.000000000 +0200 -+++ vpnc-0.3.3/config.h 2006-03-09 18:33:04.000000000 +0100 ++++ vpnc-0.3.3/config.h 2006-03-14 22:53:00.000000000 +0100 @@ -44,6 +44,8 @@ CONFIG_UDP_ENCAP, CONFIG_UDP_ENCAP_PORT, @@ -477,7 +524,7 @@ #define DEBUG(lvl, a) do {if (opt_debug >= (lvl)) {a;}} while (0) --- vpnc-0.3.3/vpnc.h.rekeying 2004-11-22 01:11:55.000000000 +0100 -+++ vpnc-0.3.3/vpnc.h 2006-03-09 18:33:04.000000000 +0100 ++++ vpnc-0.3.3/vpnc.h 2006-03-14 22:53:00.000000000 +0100 @@ -46,8 +46,6 @@ uint8_t *current_iv; uint8_t our_address[4], our_netmask[4]; Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vpnc.spec 9 Mar 2006 17:42:53 -0000 1.12 +++ vpnc.spec 30 May 2006 19:50:52 -0000 1.13 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.3 -Release: 7 +Release: 8 Summary: IPSec VPN client compatible with Cisco equipment @@ -35,6 +35,9 @@ %patch4 -p1 -b .rekeying %build +%ifarch x86_64 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed s/-f-stack-protector//g) +%endif make PREFIX=/usr %install @@ -65,6 +68,10 @@ %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup %changelog +* Tue May 30 2006 Tomas Mraz 0.3.3-8 +- drop -fstack-protector from x86_64 build (workaround for #172145) +- make rekeying a little bit better + * Thu Mar 9 2006 Tomas Mraz 0.3.3-7 - add basic rekeying support (the patch includes NAT keepalive support by Brian Downing) From fedora-extras-commits at redhat.com Tue May 30 20:15:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 13:15:32 -0700 Subject: rpms/sbcl/devel sbcl-0.9.13-LIB_DIR.patch, NONE, 1.1 sbcl.spec, 1.43, 1.44 sbcl-0.9.10-make-config-ppc.patch, 1.1, NONE sbcl-0.9.4-LIB_DIR.patch, 1.3, NONE Message-ID: <200605302015.k4UKFYq2018086@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18064 Modified Files: sbcl.spec Added Files: sbcl-0.9.13-LIB_DIR.patch Removed Files: sbcl-0.9.10-make-config-ppc.patch sbcl-0.9.4-LIB_DIR.patch Log Message: * Tue May 30 2006 Rex Dieter 0.9.13-1 - 0.9.13 sbcl-0.9.13-LIB_DIR.patch: --- NEW FILE sbcl-0.9.13-LIB_DIR.patch --- --- sbcl-0.9.13/install.sh.LIB_DIR 2006-05-17 07:06:08.000000000 -0500 +++ sbcl-0.9.13/install.sh 2006-05-30 15:09:38.000000000 -0500 @@ -23,10 +23,11 @@ MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man} INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info} DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl} +LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib} # Does the environment look sane? SBCL_SOURCE=`pwd` -if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then +if [ -n "$SBCL_HOME" -a "$LIB_DIR/sbcl" != "$SBCL_HOME" ];then echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT. echo Aborting installation. Unset one or reset the other, then try again echo INSTALL_ROOT="$INSTALL_ROOT" @@ -47,10 +48,10 @@ exit 1 fi -SBCL_HOME=$INSTALL_ROOT/lib/sbcl +SBCL_HOME=$LIB_DIR/sbcl export SBCL_HOME INSTALL_ROOT ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \ - $BUILD_ROOT$INSTALL_ROOT/lib \ + $BUILD_ROOT$LIB_DIR \ $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \ $BUILD_ROOT$INFO_DIR $BUILD_ROOT$DOC_DIR \ $BUILD_ROOT$DOC_DIR/html \ @@ -87,7 +88,7 @@ echo echo "SBCL has been installed:" echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/$RUNTIME" -echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" +echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" # Installing manual & misc bits of documentation # Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sbcl.spec 28 Apr 2006 14:32:32 -0000 1.43 +++ sbcl.spec 30 May 2006 20:15:31 -0000 1.44 @@ -9,8 +9,8 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.12 -Release: 2%{?dist} +Version: 0.9.13 +Release: 1%{?dist} License: BSD/MIT Group: Development/Languages @@ -56,8 +56,8 @@ Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.5-optflags.patch -Patch4: sbcl-0.9.4-LIB_DIR.patch -#Patch5: sbcl-0.9.10-make-config-ppc.patch +Patch4: sbcl-0.9.13-LIB_DIR.patch + Patch6: sbcl-0.9.5-verbose-build.patch # Allow override of contrib test failure(s) Patch7: sbcl-0.9.9-permissive.patch @@ -216,6 +216,9 @@ %changelog +* Tue May 30 2006 Rex Dieter 0.9.13-1 +- 0.9.13 + * Mon Apr 26 2006 Rex Dieter 0.9.12-2 - respin, using new ppc bootstrap --- sbcl-0.9.10-make-config-ppc.patch DELETED --- --- sbcl-0.9.4-LIB_DIR.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 20:15:48 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 13:15:48 -0700 Subject: rpms/wine-docs/FC-5 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wine-docs.spec, 1.10, 1.11 Message-ID: <200605302015.k4UKFo2p018164@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18090/FC-5 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 08:13:59 -0000 1.10 +++ .cvsignore 30 May 2006 20:15:48 -0000 1.11 @@ -1 +1 @@ -wine-docs-0.9.13.tar.bz2 +wine-docs-0.9.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 08:13:59 -0000 1.10 +++ sources 30 May 2006 20:15:48 -0000 1.11 @@ -1 +1 @@ -e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 +3798d7e4472abc0f29e9b239dc68e9d5 wine-docs-0.9.14.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wine-docs.spec 15 May 2006 08:13:59 -0000 1.10 +++ wine-docs.spec 30 May 2006 20:15:48 -0000 1.11 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.13 +Version: 0.9.14 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue May 30 2006 Andreas Bierfert +0.9.14-1 +- version upgrade + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Tue May 30 20:15:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 13:15:49 -0700 Subject: rpms/wine-docs/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wine-docs.spec, 1.10, 1.11 Message-ID: <200605302015.k4UKFpg8018170@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18090/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 08:13:59 -0000 1.10 +++ .cvsignore 30 May 2006 20:15:48 -0000 1.11 @@ -1 +1 @@ -wine-docs-0.9.13.tar.bz2 +wine-docs-0.9.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 08:13:59 -0000 1.10 +++ sources 30 May 2006 20:15:48 -0000 1.11 @@ -1 +1 @@ -e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 +3798d7e4472abc0f29e9b239dc68e9d5 wine-docs-0.9.14.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wine-docs.spec 15 May 2006 08:13:59 -0000 1.10 +++ wine-docs.spec 30 May 2006 20:15:48 -0000 1.11 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.13 +Version: 0.9.14 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue May 30 2006 Andreas Bierfert +0.9.14-1 +- version upgrade + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Tue May 30 20:15:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 13:15:47 -0700 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wine-docs.spec, 1.14, 1.15 Message-ID: <200605302015.k4UKFn5e018160@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18090/FC-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 08:13:53 -0000 1.10 +++ .cvsignore 30 May 2006 20:15:47 -0000 1.11 @@ -1 +1 @@ -wine-docs-0.9.13.tar.bz2 +wine-docs-0.9.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 08:13:53 -0000 1.10 +++ sources 30 May 2006 20:15:47 -0000 1.11 @@ -1 +1 @@ -e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 +3798d7e4472abc0f29e9b239dc68e9d5 wine-docs-0.9.14.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wine-docs.spec 15 May 2006 08:13:53 -0000 1.14 +++ wine-docs.spec 30 May 2006 20:15:47 -0000 1.15 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.13 +Version: 0.9.14 Release: 0.1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -46,6 +46,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue May 30 2006 Andreas Bierfert +0.9.14-0.1 +- version upgrade + * Mon May 15 2006 Andreas Bierfert 0.9.13-0.1 - version upgrade From fedora-extras-commits at redhat.com Tue May 30 20:15:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 13:15:46 -0700 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wine-docs.spec, 1.13, 1.14 Message-ID: <200605302016.k4UKGJuL018177@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18090/FC-3 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 08:13:53 -0000 1.10 +++ .cvsignore 30 May 2006 20:15:46 -0000 1.11 @@ -1 +1 @@ -wine-docs-0.9.13.tar.bz2 +wine-docs-0.9.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 08:13:53 -0000 1.10 +++ sources 30 May 2006 20:15:46 -0000 1.11 @@ -1 +1 @@ -e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 +3798d7e4472abc0f29e9b239dc68e9d5 wine-docs-0.9.14.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wine-docs.spec 15 May 2006 08:13:53 -0000 1.13 +++ wine-docs.spec 30 May 2006 20:15:46 -0000 1.14 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.13 +Version: 0.9.14 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue May 30 2006 Andreas Bierfert +0.9.14-1 +- version upgrade + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Tue May 30 20:24:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 13:24:54 -0700 Subject: rpms/sbcl/devel .cvsignore, 1.12, 1.13 sbcl.spec, 1.44, 1.45 sources, 1.14, 1.15 Message-ID: <200605302024.k4UKOulM018431@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18409 Modified Files: .cvsignore sbcl.spec sources Log Message: respin for missing sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Apr 2006 18:51:33 -0000 1.12 +++ .cvsignore 30 May 2006 20:24:54 -0000 1.13 @@ -1,4 +1,4 @@ -sbcl-0.9.12-source.tar.bz2 +sbcl-0.9.13-source.tar.bz2 sbcl-0.9.11-x86-64-linux-binary.tar.bz2 sbcl-0.9.11-x86-linux-binary.tar.bz2 sbcl-0.9.8-powerpc-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sbcl.spec 30 May 2006 20:15:31 -0000 1.44 +++ sbcl.spec 30 May 2006 20:24:54 -0000 1.45 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD/MIT Group: Development/Languages @@ -216,7 +216,7 @@ %changelog -* Tue May 30 2006 Rex Dieter 0.9.13-1 +* Tue May 30 2006 Rex Dieter 0.9.13-2 - 0.9.13 * Mon Apr 26 2006 Rex Dieter 0.9.12-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 28 Apr 2006 14:32:32 -0000 1.14 +++ sources 30 May 2006 20:24:54 -0000 1.15 @@ -1 +1 @@ -82eef4f47d6a72a36d4484bf503fc7db sbcl-0.9.12-source.tar.bz2 +1423210cc88b6c373f1db3dccc76acf6 sbcl-0.9.13-source.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 20:46:00 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 30 May 2006 13:46:00 -0700 Subject: fedora-security/audit fc4,1.271,1.272 fc5,1.184,1.185 Message-ID: <200605302046.k4UKk0QY018566@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18533 Modified Files: fc4 fc5 Log Message: * Note a new freetype CVE id. * Remove a dupe CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- fc4 30 May 2006 18:09:01 -0000 1.271 +++ fc4 30 May 2006 20:45:57 -0000 1.272 @@ -3,11 +3,11 @@ ** are items that need attention +CVE-2006-2661 VULNERABLE (freetype, fixed 2.2.1) #183677 CVE-2006-2656 backport (libtiff) [since FEDORA-2006-591] CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 -CVE-2006-2493 ** freetype CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2453 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- fc5 30 May 2006 18:09:01 -0000 1.184 +++ fc5 30 May 2006 20:45:57 -0000 1.185 @@ -3,11 +3,11 @@ ** are items that need attention +CVE-2006-2661 VULNERABLE (freetype, fixed 2.2.1) #183677 CVE-2006-2656 backport (libtiff) [since FEDORA-2006-592] CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 -CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-588] CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue From fedora-extras-commits at redhat.com Tue May 30 21:05:57 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 14:05:57 -0700 Subject: rpms/maxima/devel maxima.spec,1.26,1.27 Message-ID: <200605302105.k4UL5xWp021132@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115 Modified Files: maxima.spec Log Message: * Tue May 30 2006 Rex Dieter 5.9.3-4 - respin for sbcl-0.9.13 Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- maxima.spec 28 Apr 2006 15:20:59 -0000 1.26 +++ maxima.spec 30 May 2006 21:05:57 -0000 1.27 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -366,6 +366,9 @@ %changelog +* Tue May 30 2006 Rex Dieter 5.9.3-4 +- respin for sbcl-0.9.13 + * Mon Apr 28 2006 Rex Dieter 5.9.3-3 - respin, using new ppc bootstrap From fedora-extras-commits at redhat.com Tue May 30 21:25:10 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 14:25:10 -0700 Subject: rpms/poker-eval/FC-4 .cvsignore, 1.2, 1.3 poker-eval.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200605302125.k4ULPC5Y021323@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-eval/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21271/FC-4 Modified Files: .cvsignore poker-eval.spec sources Log Message: Upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Apr 2006 14:49:20 -0000 1.2 +++ .cvsignore 30 May 2006 21:25:10 -0000 1.3 @@ -1 +1 @@ -poker-eval-130.0.tar.gz +poker-eval-131.0.tar.gz Index: poker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-4/poker-eval.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- poker-eval.spec 23 Apr 2006 19:59:47 -0000 1.7 +++ poker-eval.spec 30 May 2006 21:25:10 -0000 1.8 @@ -1,11 +1,11 @@ Name: poker-eval -Version: 130.0 -Release: 5%{?dist} +Version: 131.0 +Release: 1%{?dist} Summary: Poker hand evaluator library Group: Development/Libraries License: GPL -URL: http://pokersource.org/poker-eval/ -Source0: http://download.gna.org/pokersource/%{name}-%{version}.tar.gz +URL: http://pokersource.org/poker-eval +Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,9 +24,6 @@ %prep %setup -q -# rpmlint fix -chmod -x examples/five_card_hands.c - # use examples/ directory for devel package %doc section mkdir -p tmp/examples && cp examples/*.c tmp/examples rm -f tmp/examples/getopt_w32.c @@ -62,6 +59,10 @@ %exclude %{_libdir}/*.la %changelog +* Sat May 13 2006 Christopher Stone 131.0-1 +- upstream sync +- Remove rpmlint fix since it's no longer needed + * Sun Apr 23 2006 Christopher Stone 130.0-5 - Update URL to new permanent URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2006 14:49:20 -0000 1.2 +++ sources 30 May 2006 21:25:10 -0000 1.3 @@ -1 +1 @@ -b6feea367ba1c49d85fb04cf5913e2d9 poker-eval-130.0.tar.gz +001cf7f9dfea57a5d8479ceb5342736a poker-eval-131.0.tar.gz From fedora-extras-commits at redhat.com Tue May 30 21:25:11 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 14:25:11 -0700 Subject: rpms/poker-eval/FC-5 .cvsignore, 1.2, 1.3 poker-eval.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200605302125.k4ULPDgv021329@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-eval/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21271/FC-5 Modified Files: .cvsignore poker-eval.spec sources Log Message: Upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Apr 2006 14:49:20 -0000 1.2 +++ .cvsignore 30 May 2006 21:25:11 -0000 1.3 @@ -1 +1 @@ -poker-eval-130.0.tar.gz +poker-eval-131.0.tar.gz Index: poker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-5/poker-eval.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- poker-eval.spec 23 Apr 2006 19:59:48 -0000 1.7 +++ poker-eval.spec 30 May 2006 21:25:11 -0000 1.8 @@ -1,11 +1,11 @@ Name: poker-eval -Version: 130.0 -Release: 5%{?dist} +Version: 131.0 +Release: 1%{?dist} Summary: Poker hand evaluator library Group: Development/Libraries License: GPL -URL: http://pokersource.org/poker-eval/ -Source0: http://download.gna.org/pokersource/%{name}-%{version}.tar.gz +URL: http://pokersource.org/poker-eval +Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,9 +24,6 @@ %prep %setup -q -# rpmlint fix -chmod -x examples/five_card_hands.c - # use examples/ directory for devel package %doc section mkdir -p tmp/examples && cp examples/*.c tmp/examples rm -f tmp/examples/getopt_w32.c @@ -62,6 +59,10 @@ %exclude %{_libdir}/*.la %changelog +* Sat May 13 2006 Christopher Stone 131.0-1 +- upstream sync +- Remove rpmlint fix since it's no longer needed + * Sun Apr 23 2006 Christopher Stone 130.0-5 - Update URL to new permanent URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2006 14:49:20 -0000 1.2 +++ sources 30 May 2006 21:25:11 -0000 1.3 @@ -1 +1 @@ -b6feea367ba1c49d85fb04cf5913e2d9 poker-eval-130.0.tar.gz +001cf7f9dfea57a5d8479ceb5342736a poker-eval-131.0.tar.gz From fedora-extras-commits at redhat.com Tue May 30 21:25:11 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 14:25:11 -0700 Subject: rpms/poker-eval/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605302125.k4ULPDok021334@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21271/devel Modified Files: .cvsignore sources Log Message: Upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-eval/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Apr 2006 14:49:20 -0000 1.2 +++ .cvsignore 30 May 2006 21:25:11 -0000 1.3 @@ -1 +1 @@ -poker-eval-130.0.tar.gz +poker-eval-131.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-eval/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2006 14:49:20 -0000 1.2 +++ sources 30 May 2006 21:25:11 -0000 1.3 @@ -1 +1 @@ -b6feea367ba1c49d85fb04cf5913e2d9 poker-eval-130.0.tar.gz +001cf7f9dfea57a5d8479ceb5342736a poker-eval-131.0.tar.gz From fedora-extras-commits at redhat.com Tue May 30 22:15:01 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Tue, 30 May 2006 15:15:01 -0700 Subject: rpms/rapidsvn/devel rapidsvn-0.9.2-gcc41.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rapidsvn.spec, 1.1, 1.2 sources, 1.2, 1.3 rapidsvn-0.9.1-gcc41.patch, 1.1, NONE Message-ID: <200605302215.k4UMF3xA023961@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23935 Modified Files: .cvsignore rapidsvn.spec sources Added Files: rapidsvn-0.9.2-gcc41.patch Removed Files: rapidsvn-0.9.1-gcc41.patch Log Message: Check in rapidsvn 0.9.2 rapidsvn-0.9.2-gcc41.patch: --- NEW FILE rapidsvn-0.9.2-gcc41.patch --- diff -ur rapidsvn-0.9.2.orig/src/action.hpp rapidsvn-0.9.2/src/action.hpp --- rapidsvn-0.9.2.orig/src/action.hpp 2006-04-04 10:53:17.000000000 +0100 +++ rapidsvn-0.9.2/src/action.hpp 2006-05-30 18:12:59.000000000 +0100 @@ -299,7 +299,7 @@ * @return temporary filename */ svn::Path - Action::GetPathAsTempFile ( + GetPathAsTempFile ( const svn::Path & path, const svn::Revision & revision = svn::Revision::HEAD); Only in rapidsvn-0.9.2/src: action.hpp.orig diff -ur rapidsvn-0.9.2.orig/src/preferences_dlg.cpp rapidsvn-0.9.2/src/preferences_dlg.cpp --- rapidsvn-0.9.2.orig/src/preferences_dlg.cpp 2006-05-10 14:52:36.000000000 +0100 +++ rapidsvn-0.9.2/src/preferences_dlg.cpp 2006-05-30 18:13:17.000000000 +0100 @@ -94,7 +94,7 @@ class ProgramsPanel : public wxPanel { public: - ProgramsPanel::ProgramsPanel (wxWindow* parent, Preferences * prefs) + ProgramsPanel (wxWindow* parent, Preferences * prefs) : wxPanel (parent), m_prefs (prefs) { InitializeData (); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 May 2006 21:48:05 -0000 1.2 +++ .cvsignore 30 May 2006 22:15:01 -0000 1.3 @@ -1 +1 @@ -rapidsvn-0.9.1.tar.gz +rapidsvn-0.9.2.tar.gz Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rapidsvn.spec 4 May 2006 21:48:05 -0000 1.1 +++ rapidsvn.spec 30 May 2006 22:15:01 -0000 1.2 @@ -1,15 +1,20 @@ Name: rapidsvn -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools License: GPL URL: http://www.rapidsvn.org/ Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz -Patch0: rapidsvn-0.9.1-gcc41.patch +Patch0: rapidsvn-0.9.2-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Has to be a manual requirement, because the library version appears to not +# be being bumped upstream on API changes - well, at least RapidSVN 0.9.2 +# has unresolved symbols if run against svncpp from the 0.9.1 distribution +Requires: svncpp = %{version} + BuildRequires: apr-devel, apr-util-devel, neon-devel BuildRequires: libtool >= 1.4.2 @@ -136,6 +141,10 @@ %{_libdir}/libsvncpp.so %changelog +* Tue May 30 2006 Tim Jackson 0.9.2-1 +- Update to 0.9.2 +- Add explicit dep on svn-cpp = [rapidsvn ver] + * Wed May 03 2006 Tim Jackson 0.9.1-3 - libtool hack to fix RPATH issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 May 2006 21:48:05 -0000 1.2 +++ sources 30 May 2006 22:15:01 -0000 1.3 @@ -1 +1 @@ -ba03034db35912c7b51b146cc7e6090e rapidsvn-0.9.1.tar.gz +f52e7cdb233abf8c56ff21ee0cf268c4 rapidsvn-0.9.2.tar.gz --- rapidsvn-0.9.1-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 23:10:12 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Tue, 30 May 2006 16:10:12 -0700 Subject: rpms/rapidsvn/FC-5 rapidsvn-0.9.2-gcc41.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rapidsvn.spec, 1.1, 1.2 sources, 1.2, 1.3 rapidsvn-0.9.1-gcc41.patch, 1.1, NONE Message-ID: <200605302310.k4UNAEOs026560@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26536 Modified Files: .cvsignore rapidsvn.spec sources Added Files: rapidsvn-0.9.2-gcc41.patch Removed Files: rapidsvn-0.9.1-gcc41.patch Log Message: Check in rapidsvn-0.9.2 rapidsvn-0.9.2-gcc41.patch: --- NEW FILE rapidsvn-0.9.2-gcc41.patch --- diff -ur rapidsvn-0.9.2.orig/src/action.hpp rapidsvn-0.9.2/src/action.hpp --- rapidsvn-0.9.2.orig/src/action.hpp 2006-04-04 10:53:17.000000000 +0100 +++ rapidsvn-0.9.2/src/action.hpp 2006-05-30 18:12:59.000000000 +0100 @@ -299,7 +299,7 @@ * @return temporary filename */ svn::Path - Action::GetPathAsTempFile ( + GetPathAsTempFile ( const svn::Path & path, const svn::Revision & revision = svn::Revision::HEAD); Only in rapidsvn-0.9.2/src: action.hpp.orig diff -ur rapidsvn-0.9.2.orig/src/preferences_dlg.cpp rapidsvn-0.9.2/src/preferences_dlg.cpp --- rapidsvn-0.9.2.orig/src/preferences_dlg.cpp 2006-05-10 14:52:36.000000000 +0100 +++ rapidsvn-0.9.2/src/preferences_dlg.cpp 2006-05-30 18:13:17.000000000 +0100 @@ -94,7 +94,7 @@ class ProgramsPanel : public wxPanel { public: - ProgramsPanel::ProgramsPanel (wxWindow* parent, Preferences * prefs) + ProgramsPanel (wxWindow* parent, Preferences * prefs) : wxPanel (parent), m_prefs (prefs) { InitializeData (); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 May 2006 21:48:05 -0000 1.2 +++ .cvsignore 30 May 2006 23:10:12 -0000 1.3 @@ -1 +1 @@ -rapidsvn-0.9.1.tar.gz +rapidsvn-0.9.2.tar.gz Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/FC-5/rapidsvn.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rapidsvn.spec 4 May 2006 21:48:05 -0000 1.1 +++ rapidsvn.spec 30 May 2006 23:10:12 -0000 1.2 @@ -1,15 +1,20 @@ Name: rapidsvn -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools License: GPL URL: http://www.rapidsvn.org/ Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz -Patch0: rapidsvn-0.9.1-gcc41.patch +Patch0: rapidsvn-0.9.2-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Has to be a manual requirement, because the library version appears to not +# be being bumped upstream on API changes - well, at least RapidSVN 0.9.2 +# has unresolved symbols if run against svncpp from the 0.9.1 distribution +Requires: svncpp = %{version} + BuildRequires: apr-devel, apr-util-devel, neon-devel BuildRequires: libtool >= 1.4.2 @@ -136,6 +141,10 @@ %{_libdir}/libsvncpp.so %changelog +* Tue May 30 2006 Tim Jackson 0.9.2-1 +- Update to 0.9.2 +- Add explicit dep on svn-cpp = [rapidsvn ver] + * Wed May 03 2006 Tim Jackson 0.9.1-3 - libtool hack to fix RPATH issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 May 2006 21:48:05 -0000 1.2 +++ sources 30 May 2006 23:10:12 -0000 1.3 @@ -1 +1 @@ -ba03034db35912c7b51b146cc7e6090e rapidsvn-0.9.1.tar.gz +f52e7cdb233abf8c56ff21ee0cf268c4 rapidsvn-0.9.2.tar.gz --- rapidsvn-0.9.1-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 00:08:55 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 30 May 2006 17:08:55 -0700 Subject: rpms/gobby/FC-5 .cvsignore, 1.4, 1.5 gobby.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605310008.k4V08vJP029149@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/gobby/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29128 Modified Files: .cvsignore gobby.spec sources Log Message: 0.3.1 bugfix release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gobby/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Dec 2005 09:13:30 -0000 1.4 +++ .cvsignore 31 May 2006 00:08:55 -0000 1.5 @@ -1 +1 @@ -gobby-0.3.0.tar.gz +gobby-0.3.1.tar.gz Index: gobby.spec =================================================================== RCS file: /cvs/extras/rpms/gobby/FC-5/gobby.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gobby.spec 15 Feb 2006 22:09:21 -0000 1.7 +++ gobby.spec 31 May 2006 00:08:55 -0000 1.8 @@ -1,6 +1,6 @@ Name: gobby -Version: 0.3.0 -Release: 4%{?dist} +Version: 0.3.1 +Release: 1%{?dist} Summary: Free collaborative editor Group: Applications/Internet @@ -66,6 +66,9 @@ %changelog +* Tue May 30 2006 Luke Macken - 0.3.1-1 +- 0.3.1 bugfix release + * Wed Feb 15 2006 Luke Macken - 0.3.0-4 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gobby/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Dec 2005 09:13:30 -0000 1.4 +++ sources 31 May 2006 00:08:55 -0000 1.5 @@ -1 +1 @@ -1b674f42654cc1960d37e0a6a2fcff1f gobby-0.3.0.tar.gz +157f20caeb4c875712f405bec1ec4699 gobby-0.3.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 03:23:33 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:23:33 -0700 Subject: rpms/poker-engine - New directory Message-ID: <200605310323.k4V3NZRK004188@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/poker-engine Log Message: Directory /cvs/extras/rpms/poker-engine added to the repository From fedora-extras-commits at redhat.com Wed May 31 03:23:33 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:23:33 -0700 Subject: rpms/poker-engine/devel - New directory Message-ID: <200605310323.k4V3NZPd004191@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/poker-engine/devel Log Message: Directory /cvs/extras/rpms/poker-engine/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 03:23:50 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:23:50 -0700 Subject: rpms/poker-engine Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605310323.k4V3Nqcx004246@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4213 Added Files: Makefile import.log Log Message: Setup of module poker-engine --- NEW FILE Makefile --- # Top level Makefile for module poker-engine all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 03:23:51 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:23:51 -0700 Subject: rpms/poker-engine/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605310323.k4V3NrbP004249@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4213/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module poker-engine --- NEW 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 May 31 03:24:15 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:24:15 -0700 Subject: rpms/poker-engine import.log,1.1,1.2 Message-ID: <200605310324.k4V3OloV004311@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4277 Modified Files: import.log Log Message: auto-import poker-engine-1.0.15-1 on branch devel from poker-engine-1.0.15-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/poker-engine/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 03:23:50 -0000 1.1 +++ import.log 31 May 2006 03:24:15 -0000 1.2 @@ -0,0 +1 @@ +poker-engine-1_0_15-1:HEAD:poker-engine-1.0.15-1.src.rpm:1149045848 From fedora-extras-commits at redhat.com Wed May 31 03:24:15 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:24:15 -0700 Subject: rpms/poker-engine/devel poker-engine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605310324.k4V3OldO004315@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4277/devel Modified Files: .cvsignore sources Added Files: poker-engine.spec Log Message: auto-import poker-engine-1.0.15-1 on branch devel from poker-engine-1.0.15-1.src.rpm --- NEW FILE poker-engine.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: poker-engine Version: 1.0.15 Release: 1%{?dist} Summary: Python library that implements poker rules Group: Development/Libraries License: GPL URL: http://pokersource.org/poker-engine Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: pypoker-eval-devel >= 128.0 BuildRequires: rsync libxml2-python libxslt-python Requires: pypoker-eval >= 128.0 Requires: rsync %description This is a python library that implements poker rules according to variants and betting structures specified in configuration files. It designed to be used by a multiplayer poker server, a poker AI or a poker client. %package devel Summary: Poker rule implementation library development files Group: Development/Libraries Requires: pypoker-eval-devel Requires: %{name} = %{version}-%{release} %description devel This package contains files required to build applications that use poker-engine. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %check # upstream is aware of some check failures make %{?_smp_mflags} check %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %doc %{_mandir}/man8/*.8.gz %{_sbindir}/pokerconfigupgrade %{_datadir}/%{name}/conf/*.xml %{python_sitelib}/pokerengine/*.py %{python_sitelib}/pokerengine/*.pyc %ghost %{python_sitelib}/pokerengine/*.pyo %config(noreplace) %{_sysconfdir}/%{name}/* %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %changelog * Tue May 30 2006 Christopher Stone - 1.0.15-1 - Upstream sync - Add rsync to Requires - Remove patches and autoreconf since these have been fixed in new release * Mon May 15 2006 Christopher Stone - 1.0.14-3 - Add Requires pypoker-eval-devel to devel package * Sun May 14 2006 Christopher Stone - 1.0.14-2 - Add patch for noarch configuration - Readded BuildArch of noarch - Removed python-abi Requires - Added %%check section - Updated Source0 location - Add patch to place python files in sitelib - Replace %%{python_sitearch} with %%{python_sitelib} - Removed unnecessary Requires - Removed examples from -devel since this is no longer maintained by upstream * Thu Mar 30 2006 Loic Dachary - 1.0.14-1 - upstream sync * Sun Mar 26 2006 Christopher Stone 1.0.13-2 - Fix BuildRequires * Sat Mar 25 2006 Loic Dachary 1.0.13-1 - upstream sync * Fri Mar 17 2006 Christopher Stone 1.0.12-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-engine/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 03:23:51 -0000 1.1 +++ .cvsignore 31 May 2006 03:24:15 -0000 1.2 @@ -0,0 +1 @@ +poker-engine-1.0.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-engine/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 03:23:51 -0000 1.1 +++ sources 31 May 2006 03:24:15 -0000 1.2 @@ -0,0 +1 @@ +5b51616881d0ee10354b0f5f573a52d1 poker-engine-1.0.15.tar.gz From fedora-extras-commits at redhat.com Wed May 31 03:26:49 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:26:49 -0700 Subject: owners owners.list,1.1076,1.1077 Message-ID: <200605310326.k4V3QpK8004370@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4353 Modified Files: owners.list Log Message: Add poker-engine Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1076 retrieving revision 1.1077 diff -u -r1.1076 -r1.1077 --- owners.list 30 May 2006 14:50:52 -0000 1.1076 +++ owners.list 31 May 2006 03:26:48 -0000 1.1077 @@ -1323,6 +1323,7 @@ Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|poker-engine|Python library that implements poker rules|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|poker-eval|Poker hand evaluator library|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|polyxmass-bin|The GNU polyxmass software suite|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|polyxmass-common|Contains all textual/graphical data required for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 03:30:44 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:30:44 -0700 Subject: rpms/nucleo - New directory Message-ID: <200605310330.k4V3Uk24004458@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4437/nucleo Log Message: Directory /cvs/extras/rpms/nucleo added to the repository From fedora-extras-commits at redhat.com Wed May 31 03:30:45 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:30:45 -0700 Subject: rpms/nucleo/devel - New directory Message-ID: <200605310330.k4V3UlGF004461@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4437/nucleo/devel Log Message: Directory /cvs/extras/rpms/nucleo/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 03:30:59 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:30:59 -0700 Subject: rpms/nucleo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605310331.k4V3V1LZ004515@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4482 Added Files: Makefile import.log Log Message: Setup of module nucleo --- NEW FILE Makefile --- # Top level Makefile for module nucleo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 03:31:00 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:31:00 -0700 Subject: rpms/nucleo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605310331.k4V3V29s004516@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4482/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nucleo --- NEW 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 May 31 03:31:44 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:31:44 -0700 Subject: rpms/nucleo/devel nucleo-0.5-64bit.patch, NONE, 1.1 nucleo-0.5-gcc.patch, NONE, 1.1 nucleo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605310331.k4V3VkMc004601@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557/devel Modified Files: .cvsignore sources Added Files: nucleo-0.5-64bit.patch nucleo-0.5-gcc.patch nucleo.spec Log Message: auto-import nucleo-0.5-2 on branch devel from nucleo-0.5-2.src.rpm nucleo-0.5-64bit.patch: --- NEW FILE nucleo-0.5-64bit.patch --- --- nucleo/image/Image.cxx.orig 2006-05-20 12:38:57.000000000 -0700 +++ nucleo/image/Image.cxx 2006-05-20 12:39:07.000000000 -0700 @@ -240,7 +240,7 @@ out << getWidth() << "x" << getHeight() << " " << std::flush ; out << getEncodingName(_encoding) ; out << " (" << _size ; - out << " " << std::hex << "0x" << (int)_data << std::dec ; + out << " " << std::hex << "0x" << (intptr_t)_data << std::dec ; out << " " << getFreeMethodName(_fmethod) ; out << ")" << std::flush ; } --- nucleo/gl/scenegraph/sgNode.cxx.orig 2006-05-20 12:39:46.000000000 -0700 +++ nucleo/gl/scenegraph/sgNode.cxx 2006-05-20 12:40:00.000000000 -0700 @@ -283,7 +283,7 @@ sgNode::selectGraph(void) { // if (debugMode) std::cout << "select '" << _name << "' (" << this << ")" << std::endl ; if (_hidden) return; - glPushName((GLuint)this) ; + glPushName((intptr_t)this) ; glPushMatrix() ; glMultMatrixf((const GLfloat *)_transformations) ; select() ; nucleo-0.5-gcc.patch: --- NEW FILE nucleo-0.5-gcc.patch --- --- nucleo/utils/StringUtils.cxx.orig 2006-05-20 12:37:48.000000000 -0700 +++ nucleo/utils/StringUtils.cxx 2006-05-20 12:37:58.000000000 -0700 @@ -17,10 +17,6 @@ namespace nucleo { -#if defined(__GNUC__) - template class std::basic_string ; -#endif - void trimString(std::string &s, std::string badboys) { std::string::size_type end = s.find_last_not_of(badboys) ; --- NEW FILE nucleo.spec --- Name: nucleo Version: 0.5 Release: 2%{?dist} Summary: Toolkit for exploring new uses of video Group: Development/Tools License: LGPL URL: http://insitu.lri.fr/~roussel/projects/nucleo Source0: http://insitu.lri.fr/~chapuis/software/metisse/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-gcc.patch Patch1: %{name}-%{version}-64bit.patch BuildRequires: libGL-devel libGLU-devel BuildRequires: libjpeg-devel libpng-devel libexif-devel freetype-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Nucleo is a toolkit for exploring new uses of video and new human-computer interaction techniques. %package devel Summary: Files necessary for developing with %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains files required to build applications that make use of %{name}. %prep %setup -q %patch0 -p0 -b .gcc %patch1 -p0 -b .64bit %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LESSER INSTALL LICENSE NEWS README %{_bindir}/nBundle %{_bindir}/nTest %{_bindir}/videoClient %{_bindir}/videoServer %{_libdir}/libNucleo.so.* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %files devel %defattr(-,root,root,-) %{_bindir}/%{name}-config %dir %{_includedir}/%{name} %{_includedir}/%{name}/* %{_libdir}/libNucleo.so %{_libdir}/pkgconfig/%{name}.pc %exclude %{_libdir}/*.la %changelog * Sun May 21 2006 Christopher Stone 0.5-2 - Add optional BuildRequires * Sat May 20 2006 Christopher Stone 0.5-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nucleo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 03:31:00 -0000 1.1 +++ .cvsignore 31 May 2006 03:31:44 -0000 1.2 @@ -0,0 +1 @@ +nucleo-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nucleo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 03:31:00 -0000 1.1 +++ sources 31 May 2006 03:31:44 -0000 1.2 @@ -0,0 +1 @@ +e968b0ce94a69119a11d113f973aa616 nucleo-0.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 03:31:44 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:31:44 -0700 Subject: rpms/nucleo import.log,1.1,1.2 Message-ID: <200605310331.k4V3VkeK004592@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557 Modified Files: import.log Log Message: auto-import nucleo-0.5-2 on branch devel from nucleo-0.5-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nucleo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 03:30:59 -0000 1.1 +++ import.log 31 May 2006 03:31:44 -0000 1.2 @@ -0,0 +1 @@ +nucleo-0_5-2:HEAD:nucleo-0.5-2.src.rpm:1149046298 From fedora-extras-commits at redhat.com Wed May 31 03:33:20 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:33:20 -0700 Subject: owners owners.list,1.1077,1.1078 Message-ID: <200605310333.k4V3XM7Z004650@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4633 Modified Files: owners.list Log Message: Add nucleo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1077 retrieving revision 1.1078 diff -u -r1.1077 -r1.1078 --- owners.list 31 May 2006 03:26:48 -0000 1.1077 +++ owners.list 31 May 2006 03:33:20 -0000 1.1078 @@ -871,6 +871,7 @@ Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|nsd|NSD is a complete implementation of an authoritative DNS name server|paul at xtdnet.nl|extras-qa at fedoraproject.org| Fedora Extras|ntl|High-performance algorithms for vectors, matrices, and polynomials|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|nucleo|Toolkit for exploring new uses of video|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|numpy|A fast multidimensional array facility for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|nuttcp|A network performance measurement tool intended for use by network and system managers|rvokal at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 04:23:56 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 21:23:56 -0700 Subject: rpms/texmaker/FC-4 texmaker.spec,1.3,1.4 Message-ID: <200605310423.k4V4Nww6007134@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7117 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- texmaker.spec 25 May 2006 19:04:38 -0000 1.3 +++ texmaker.spec 31 May 2006 04:23:56 -0000 1.4 @@ -1,13 +1,14 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -83,6 +84,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-2 +- This should have been a noarch package (#193601) + * Thu May 25 2006 Deji Akingunola - 1.3-1 - Updated to 1.3 - had to add epoch to facilitate an upgrade - New version depends on qt4 From fedora-extras-commits at redhat.com Wed May 31 04:38:55 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 21:38:55 -0700 Subject: rpms/texmaker/FC-5 texmaker.spec,1.4,1.5 Message-ID: <200605310438.k4V4cvW5007224@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7207 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- texmaker.spec 25 May 2006 19:03:48 -0000 1.4 +++ texmaker.spec 31 May 2006 04:38:55 -0000 1.5 @@ -1,13 +1,14 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -83,6 +84,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-2 +- This should have been a noarch package (#193601) + * Thu May 25 2006 Deji Akingunola - 1.3-1 - Updated to 1.3 - had to add epoch to facilitate an upgrade - New version depends on qt4 From fedora-extras-commits at redhat.com Wed May 31 04:39:25 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 21:39:25 -0700 Subject: rpms/texmaker/devel texmaker.spec,1.4,1.5 Message-ID: <200605310439.k4V4dRHw007285@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7268 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- texmaker.spec 25 May 2006 18:51:05 -0000 1.4 +++ texmaker.spec 31 May 2006 04:39:25 -0000 1.5 @@ -1,13 +1,14 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -83,6 +84,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-2 +- This should have been a noarch package (#193601) + * Thu May 25 2006 Deji Akingunola - 1.3-1 - Updated to 1.3 - had to add epoch to facilitate an upgrade - New version depends on qt4 From fedora-extras-commits at redhat.com Wed May 31 04:39:49 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 21:39:49 -0700 Subject: rpms/Coin2/FC-3 .cvsignore, 1.6, 1.7 Coin2.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200605310439.k4V4dpW3007350@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7329 Modified Files: .cvsignore Coin2.spec sources Log Message: * Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 - Upstream update. - Drop gcc-4.1 patch. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Aug 2005 08:46:48 -0000 1.6 +++ .cvsignore 31 May 2006 04:39:49 -0000 1.7 @@ -1,3 +1 @@ -Coin-2.4.3-libtool.diff.bz2 -Coin-2.4.3-simacros.diff.bz2 -Coin-2.4.3.tar.gz +Coin-2.4.5.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-3/Coin2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Coin2.spec 1 Aug 2005 08:46:48 -0000 1.9 +++ Coin2.spec 31 May 2006 04:39:49 -0000 1.10 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany. +# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -9,11 +9,10 @@ %define libopenal_SONAME libopenal.so.0 %define libsimage_SONAME libsimage.so.20 -%define libfreetype_SONAME libfreetype.so.6 Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.3 +Version: 2.4.5 Release: 1%{?dist} License: GPL @@ -24,16 +23,17 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: coin-2.3.0-freetype-soname.diff -Patch3: Coin-2.4.3-simacros.diff.bz2 -Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel bzip2-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel BuildRequires: doxygen +BuildRequires: /usr/bin/rename BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -56,13 +56,8 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 -sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ - src/glue/freetype.c sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ src/glue/simage_wrapper.c sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \ @@ -76,18 +71,23 @@ --disable-dl-libbzip2 \ --disable-dl-glu \ --disable-dl-zlib \ + --disable-dl-freetype \ + --disable-dl-fontconfig \ + --disable-spidermonkey \ --enable-man \ --enable-html \ --enable-3ds-import \ - htmldir=%{coin_htmldir}/Coin + htmldir=%{coin_htmldir}/Coin \ + CPPFLAGS=$(pkg-config --cflags freetype2) make %{?_smp_mflags} %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +/usr/bin/rename .3 .3sim $RPM_BUILD_ROOT%{_mandir}/man3/* %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -114,43 +114,28 @@ %doc %{coin_htmldir} %changelog +* Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 +- Upstream update. +- Drop gcc-4.1 patch. +- Spec file cleanup. + +* Wed Feb 22 2006 Ralf Cors??pius - 2.4.4-3.2 +- Rename man3 manpages to .3sim (PR 182212). + +* Thu Sep 22 2005 Ralf Cors??pius - 2.4.4-3.1 +- Add Coin-2.4.4-gcc-4.1.diff. +- Remove ancient changelog entries from spec file. + +* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-3 +- Remove simacros patch. +- Remove libtool patch. +- Link against freetype2. + +* Tue Sep 20 2005 Ralf Corsepius - 2.4.4-1 +- Upstream update. + * Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 - Upstream update. * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. - -* Tue May 10 2005 Ralf Corsepius - 0:2.3.0-9 -- Introduce %%{coin_includedir} %%{coin_htmldir}. -- Misc. spec cleanup. - -* Fri May 06 2005 Ralf Corsepius - 0:2.3.0-8 -- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead - SONAME handling. - -* Tue May 03 2005 Ralf Corsepius - 0:2.3.0-7 -- Minor spec changes. - -* Tue Feb 22 2005 Ralf Corsepius - 0:2.3.0-5 -- Include simacros. -- Regenerate configure from simacros and FC3 libtool for x86_64. -- Don't install bogusly generated manpages for dirs. - -* Sun Jul 4 2004 Ralf Corsepius - 0:2.3.0-0.fdr.4 -- Let Coin-devel Require: bzip2-devel, zlib-devel. -- Use @XX@ patterns in soname sed calls. -- Remove Mesa from BuildRequires. - -* Sat Jul 3 2004 Ralf Corsepius - 0:2.3.0-0.fdr.3 -- Disable run-time linkage for GLU, bzip2, zlib. -- Add SONAME-hacks to simage, openal, freetype. -- Enable static libs. - -* Fri Jun 25 2004 Ralf Corsepius - 0:2.3.0-0.fdr.2 -- Fix package description. -- Initial submission to Fedora Extra. - -* Thu Jun 24 2004 Ralf Corsepius - 0:2.3.0-0.fdr.1 -- Update to 2.3.0 -- Install html docs to default installation dir (%%{_datadir}/html). -- Remove dependency to simage. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Aug 2005 08:46:48 -0000 1.6 +++ sources 31 May 2006 04:39:49 -0000 1.7 @@ -1,3 +1 @@ -e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 -4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 -57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz +99b83c5189c3755fd5f08fcad0994a7b Coin-2.4.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 07:22:42 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 31 May 2006 00:22:42 -0700 Subject: rpms/SoQt/devel SoQt.spec,1.15,1.16 Message-ID: <200605310722.k4V7MiY7014881@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14864 Modified Files: SoQt.spec Log Message: * Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 - Rebuild against Coin-2.4.5. - Spec file cleanup. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- SoQt.spec 20 Feb 2006 03:48:32 -0000 1.15 +++ SoQt.spec 31 May 2006 07:22:42 -0000 1.16 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -86,38 +86,13 @@ %{_mandir}/man?/*.?.gz %changelog +* Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 +- Rebuild against Coin-2.4.5. +- Spec file cleanup. + * Mon Feb 20 2006 Ralf Cors??pius - 0:1.3.0-2 - Rebuild for FC5. * Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 - Update to 1.3.0 - Build w/o simacros. - -* Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 -- Rebuild against Coin-2.4.3. -- Let devel provide Coin2-SoQt-devel. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 -- Rebuild against Coin-2.4.1. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-5 -- Add *-man3.diff. Prevent bogus manpages. -- Mark html as %doc. -- Install html docs into %%{_datadir}/Coin2/SoQt. - -* Mon May 09 2005 Ralf Corsepius - 0:1.2.0-4 -- Add Provides:Coin2-SoQt*. - -* Tue Apr 12 2005 Ralf Corsepius - 0:1.2.0-3 -- Include simacros. -- Work-around issues with RH's libtool. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Aug 27 2004 Ralf Corsepius - 0:1.2.0-0.fdr.1 -- Update. -- Minor cleanups to the spec. - -* Sun Jul 4 2004 Ralf Corsepius - 0:1.0.2-0.fdr.1 -- Initial Fedora Extras RPM. From fedora-extras-commits at redhat.com Wed May 31 07:35:58 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 31 May 2006 00:35:58 -0700 Subject: rpms/SoQt/FC-5 SoQt.spec,1.15,1.16 Message-ID: <200605310736.k4V7a0c7014966@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14949 Modified Files: SoQt.spec Log Message: * Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 - Rebuild against Coin-2.4.5. - Spec file cleanup. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-5/SoQt.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- SoQt.spec 20 Feb 2006 03:48:32 -0000 1.15 +++ SoQt.spec 31 May 2006 07:35:58 -0000 1.16 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -86,38 +86,13 @@ %{_mandir}/man?/*.?.gz %changelog +* Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 +- Rebuild against Coin-2.4.5. +- Spec file cleanup. + * Mon Feb 20 2006 Ralf Cors??pius - 0:1.3.0-2 - Rebuild for FC5. * Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 - Update to 1.3.0 - Build w/o simacros. - -* Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 -- Rebuild against Coin-2.4.3. -- Let devel provide Coin2-SoQt-devel. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 -- Rebuild against Coin-2.4.1. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-5 -- Add *-man3.diff. Prevent bogus manpages. -- Mark html as %doc. -- Install html docs into %%{_datadir}/Coin2/SoQt. - -* Mon May 09 2005 Ralf Corsepius - 0:1.2.0-4 -- Add Provides:Coin2-SoQt*. - -* Tue Apr 12 2005 Ralf Corsepius - 0:1.2.0-3 -- Include simacros. -- Work-around issues with RH's libtool. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Aug 27 2004 Ralf Corsepius - 0:1.2.0-0.fdr.1 -- Update. -- Minor cleanups to the spec. - -* Sun Jul 4 2004 Ralf Corsepius - 0:1.0.2-0.fdr.1 -- Initial Fedora Extras RPM. From fedora-extras-commits at redhat.com Wed May 31 07:37:47 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 31 May 2006 00:37:47 -0700 Subject: rpms/SoQt/FC-4 SoQt.spec,1.10,1.11 Message-ID: <200605310737.k4V7bnxg015027@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15010 Modified Files: SoQt.spec Log Message: * Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 - Rebuild against Coin-2.4.5. - Spec file cleanup. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/SoQt.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SoQt.spec 23 Sep 2005 13:20:55 -0000 1.10 +++ SoQt.spec 31 May 2006 07:37:47 -0000 1.11 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.3.0 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -86,35 +86,13 @@ %{_mandir}/man?/*.?.gz %changelog +* Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 +- Rebuild against Coin-2.4.5. +- Spec file cleanup. + +* Mon Feb 20 2006 Ralf Cors??pius - 0:1.3.0-2 +- Rebuild for FC5. + * Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 - Update to 1.3.0 - Build w/o simacros. - -* Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 -- Rebuild against Coin-2.4.3. -- Let devel provide Coin2-SoQt-devel. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 -- Rebuild against Coin-2.4.1. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-5 -- Add *-man3.diff. Prevent bogus manpages. -- Mark html as %doc. -- Install html docs into %%{_datadir}/Coin2/SoQt. - -* Mon May 09 2005 Ralf Corsepius - 0:1.2.0-4 -- Add Provides:Coin2-SoQt*. - -* Tue Apr 12 2005 Ralf Corsepius - 0:1.2.0-3 -- Include simacros. -- Work-around issues with RH's libtool. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Aug 27 2004 Ralf Corsepius - 0:1.2.0-0.fdr.1 -- Update. -- Minor cleanups to the spec. - -* Sun Jul 4 2004 Ralf Corsepius - 0:1.0.2-0.fdr.1 -- Initial Fedora Extras RPM. From fedora-extras-commits at redhat.com Wed May 31 07:42:46 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 31 May 2006 00:42:46 -0700 Subject: rpms/scim-qtimm/FC-4 scim-qtimm.spec,1.2,1.3 Message-ID: <200605310742.k4V7gmbA015107@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-qtimm/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15090 Modified Files: scim-qtimm.spec Log Message: bump release (#193625) Index: scim-qtimm.spec =================================================================== RCS file: /cvs/extras/rpms/scim-qtimm/FC-4/scim-qtimm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-qtimm.spec 23 Aug 2005 07:12:47 -0000 1.2 +++ scim-qtimm.spec 31 May 2006 07:42:46 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-qtimm Version: 0.9.4 -Release: 0%{?dist} +Release: 1%{?dist} Summary: SCIM input method module for Qt License: GPL @@ -47,6 +47,9 @@ %changelog +* Wed Aug 24 2005 Jens Petersen - 0.9.4-1.fc4 +- bump release (#193625) + * Wed Aug 17 2005 Jens Petersen - 0.9.4-0 - update to 0.9.4 From fedora-extras-commits at redhat.com Wed May 31 07:44:39 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 31 May 2006 00:44:39 -0700 Subject: fedora-security/audit fc4,1.272,1.273 fc5,1.185,1.186 Message-ID: <200605310744.k4V7id3M015171@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15151/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-1343 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- fc4 30 May 2006 20:45:57 -0000 1.272 +++ fc4 31 May 2006 07:44:37 -0000 1.273 @@ -147,7 +147,7 @@ CVE-2006-1490 VULNERABLE (php, fixed 5.1.4) CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1354 VULNERABLE (freeradius) #186084 -CVE-2006-1343 VULNERABLE (kernel) +CVE-2006-1343 VULNERABLE (kernel, fixed 2.6.16.19) CVE-2006-1342 version (kernel, not 2.6) not vulnerable CVE-2006-1273 ignore (firefox) This is an IE only issue CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- fc5 30 May 2006 20:45:57 -0000 1.185 +++ fc5 31 May 2006 07:44:37 -0000 1.186 @@ -145,7 +145,7 @@ CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289] CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 -CVE-2006-1343 VULNERABLE (kernel) +CVE-2006-1343 VULNERABLE (kernel, fixed 2.6.16.19) CVE-2006-1342 version (kernel, not 2.6) not vulnerable CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 version (beagle, fixed 0.2.4) bz#185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188 From fedora-extras-commits at redhat.com Wed May 31 08:03:38 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:03:38 -0700 Subject: rpms/openalpp - New directory Message-ID: <200605310803.k4V83epc017632@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611/openalpp Log Message: Directory /cvs/extras/rpms/openalpp added to the repository From fedora-extras-commits at redhat.com Wed May 31 08:03:38 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:03:38 -0700 Subject: rpms/openalpp/devel - New directory Message-ID: <200605310803.k4V83euv017635@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611/openalpp/devel Log Message: Directory /cvs/extras/rpms/openalpp/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 08:03:52 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:03:52 -0700 Subject: rpms/openalpp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605310803.k4V83sD5017689@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17656 Added Files: Makefile import.log Log Message: Setup of module openalpp --- NEW FILE Makefile --- # Top level Makefile for module openalpp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 08:03:53 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:03:53 -0700 Subject: rpms/openalpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605310803.k4V83thx017692@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17656/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module openalpp --- NEW 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 May 31 08:04:44 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:04:44 -0700 Subject: rpms/openalpp import.log,1.1,1.2 Message-ID: <200605310804.k4V84k5d017759@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17725 Modified Files: import.log Log Message: auto-import openalpp-20060405-3 on branch devel from openalpp-20060405-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/openalpp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 08:03:52 -0000 1.1 +++ import.log 31 May 2006 08:04:44 -0000 1.2 @@ -0,0 +1 @@ +openalpp-20060405-3:HEAD:openalpp-20060405-3.src.rpm:1149062678 From fedora-extras-commits at redhat.com Wed May 31 08:04:45 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:04:45 -0700 Subject: rpms/openalpp/devel openalpp-cvs-debian-01.dpatch, NONE, 1.1 openalpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605310804.k4V84l3p017764@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17725/devel Modified Files: .cvsignore sources Added Files: openalpp-cvs-debian-01.dpatch openalpp.spec Log Message: auto-import openalpp-20060405-3 on branch devel from openalpp-20060405-3.src.rpm --- NEW FILE openalpp-cvs-debian-01.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run @DPATCH@ Index: configure.in =================================================================== RCS file: /cvs/underware/openalpp/configure.in,v retrieving revision 1.11 diff -b -B -u -u -r1.11 configure.in --- openalpp/configure.in 7 Apr 2006 17:16:29 -0000 1.11 +++ openalpp/configure.in 7 May 2006 19:31:53 -0000 @@ -70,6 +70,11 @@ AC_CHECK_LIB(openal,main) AC_CHECK_LIB(alut,main) +if test "$ac_cv_lib_alut_main" = "yes" ; then + ALUT_LIB=-lalut +fi +AC_SUBST(ALUT_LIB) + # # Was introduced sometime in 2005, does not show pre-2005 # #define ALC_STEREO_SOURCES 0x1011 Index: openalpp.pc.in =================================================================== RCS file: /cvs/underware/openalpp/openalpp.pc.in,v retrieving revision 1.3 diff -b -B -u -u -r1.3 openalpp.pc.in --- openalpp/openalpp.pc.in 28 Oct 2004 15:20:15 -0000 1.3 +++ openalpp/openalpp.pc.in 7 May 2006 19:31:53 -0000 @@ -7,5 +7,5 @@ Description: OpenAL C++ Abstraction Layer Version: @VERSION@ Requires: openthreads, vorbis, vorbisfile -Libs: -L${libdir} -lopenalpp -lopenal +Libs: -L${libdir} -lopenalpp -lopenal @ALUT_LIB@ Cflags: -I${includedir} Index: src/sourcebase.cpp =================================================================== RCS file: /cvs/underware/openalpp/src/sourcebase.cpp,v retrieving revision 1.1.1.3 diff -b -B -u -u -r1.1.1.3 sourcebase.cpp --- openalpp/src/sourcebase.cpp 7 Sep 2005 12:21:42 -0000 1.1.1.3 +++ openalpp/src/sourcebase.cpp 7 May 2006 19:31:53 -0000 @@ -168,7 +168,7 @@ ALint state; alGetSourceiv(sourcename_,AL_SOURCE_STATE,&state); - if (ALenum errorCode = alGetError() != AL_FALSE) + if (alGetError() != AL_FALSE) { /** error occurs here when switching files fprintf(stderr, "SourceBase::getState() - Warning - Error getting state (%d)\n", --- NEW FILE openalpp.spec --- Name: openalpp Version: 20060405 Release: 3%{?dist} Summary: Object Oriented version of OpenAL Group: System Environment/Libraries License: LGPL URL: http://alpp.sourceforge.net Patch0: openalpp-cvs-debian-01.dpatch Source0: http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openal-devel freealut-devel libvorbis-devel OpenThreads-devel %description Written in C++, makes OpenAL so much more accessible. Compare openalpp to a scenegraph for OpenGL. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains headers and libraries required to build applications that use %{name}. %prep %setup -q -n %{name}-cvs-%{version} %patch0 -p1 autoreconf --force --install %build %configure --disable-static %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/*.so.* %files devel %{_includedir}/openalpp %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/*.so %exclude %{_libdir}/*.la %changelog * Tue May 30 2006 Christopher Stone 20060405-3 - Fix Group - Fix patch number * Sun May 21 2006 Christopher Stone 20060405-2 - Remove unneeded Requires - Remove portaudio from BuildRequires - Add autoreconf to %%prep * Mon Apr 10 2006 Loic Dachary 20060405-1 - upstream sync * Sun Mar 26 2006 Christopher Stone 20060321-2 - Remove docs package - Fix BuildRequires and Requires - Remove unneeded autoconf * Wed Mar 22 2006 Loic Dachary 20060321-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openalpp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 08:03:53 -0000 1.1 +++ .cvsignore 31 May 2006 08:04:45 -0000 1.2 @@ -0,0 +1 @@ +openalpp-cvs-20060405.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/openalpp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 08:03:53 -0000 1.1 +++ sources 31 May 2006 08:04:45 -0000 1.2 @@ -0,0 +1 @@ +f3e8fe435495e9f373c561f93a87e30e openalpp-cvs-20060405.tar.gz From fedora-extras-commits at redhat.com Wed May 31 08:06:15 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:06:15 -0700 Subject: owners owners.list,1.1078,1.1079 Message-ID: <200605310806.k4V86Hkc017823@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17806 Modified Files: owners.list Log Message: Add openalpp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1078 retrieving revision 1.1079 diff -u -r1.1078 -r1.1079 --- owners.list 31 May 2006 03:33:20 -0000 1.1078 +++ owners.list 31 May 2006 08:06:15 -0000 1.1079 @@ -884,6 +884,7 @@ Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|openalpp|Object Oriented version of OpenAL|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|openbox|Openbox window manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 08:06:36 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 31 May 2006 01:06:36 -0700 Subject: rpms/SoQt/FC-3 .cvsignore, 1.3, 1.4 SoQt.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200605310806.k4V86cVk017852@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17831 Modified Files: .cvsignore SoQt.spec sources Log Message: * Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 - Rebuild against Coin-2.4.5. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2005 15:32:46 -0000 1.3 +++ .cvsignore 31 May 2006 08:06:36 -0000 1.4 @@ -1,3 +1 @@ -SoQt-1.2.0.tar.gz -SoQt-1.2.0-config.diff.bz2 -SoQt-1.2.0-simacros.diff.bz2 +SoQt-1.3.0.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/SoQt.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SoQt.spec 20 May 2005 14:09:48 -0000 1.7 +++ SoQt.spec 31 May 2006 08:06:36 -0000 1.8 @@ -3,8 +3,8 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.2.0 -Release: 6%{?dist} +Version: 1.3.0 +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -12,14 +12,6 @@ Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz -# Needed to rebuild patch1 -Patch0: SoQt-1.2.0-simacros.diff.bz2 - -# Work-around to issues with RH's libtool on ix86_64 -# libtoolize -f -c -# aclocal-1.7 -I cfg/m4 -# autoconf -Patch1: SoQt-1.2.0-config.diff.bz2 Patch2: SoQt-1.2.0-man3.diff BuildRequires: doxygen @@ -40,9 +32,9 @@ %package devel Summary: Development files for SoQt Requires: %{name} = %{version}-%{release} -Requires: autoconf +Requires: %{_datadir}/aclocal Requires: Coin2-devel qt-devel -Provides: Coin2-SoQt = %{version}-%{release} +Provides: Coin2-SoQt-devel = %{version}-%{release} Group: Development/Libraries %description devel @@ -50,8 +42,6 @@ %prep %setup -%patch0 -p1 -%patch1 -p1 %patch2 -p1 %build @@ -66,11 +56,11 @@ make %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -96,27 +86,13 @@ %{_mandir}/man?/*.?.gz %changelog -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 -- Rebuild against Coin-2.4.1. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-5 -- Add *-man3.diff. Prevent bogus manpages. -- Mark html as %doc. -- Install html docs into %%{_datadir}/Coin2/SoQt. - -* Mon May 09 2005 Ralf Corsepius - 0:1.2.0-4 -- Add Provides:Coin2-SoQt*. - -* Tue Apr 12 2005 Ralf Corsepius - 0:1.2.0-3 -- Include simacros. -- Work-around issues with RH's libtool. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Aug 27 2004 Ralf Corsepius - 0:1.2.0-0.fdr.1 -- Update. -- Minor cleanups to the spec. - -* Sun Jul 4 2004 Ralf Corsepius - 0:1.0.2-0.fdr.1 -- Initial Fedora Extras RPM. +* Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 +- Rebuild against Coin-2.4.5. +- Spec file cleanup. + +* Mon Feb 20 2006 Ralf Cors??pius - 0:1.3.0-2 +- Rebuild for FC5. + +* Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 +- Update to 1.3.0 +- Build w/o simacros. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2005 15:32:46 -0000 1.3 +++ sources 31 May 2006 08:06:36 -0000 1.4 @@ -1,3 +1 @@ -4a20e834ace358f3e81fd43b38a69efb SoQt-1.2.0.tar.gz -22454ea02257dbff7304da6e9e12dc63 SoQt-1.2.0-config.diff.bz2 -99db70be7488e3b15a164ece03492db6 SoQt-1.2.0-simacros.diff.bz2 +85d6b2b1a78eacd38f1c7219f4a745e3 SoQt-1.3.0.tar.gz From fedora-extras-commits at redhat.com Wed May 31 08:14:13 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 31 May 2006 01:14:13 -0700 Subject: rpms/qemu/devel .cvsignore, 1.4, 1.5 qemu-0.7.0-build.patch, 1.4, 1.5 qemu.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605310814.k4V8EFNq017923@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17897 Modified Files: .cvsignore qemu-0.7.0-build.patch qemu.spec sources Log Message: 0.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Mar 2006 00:34:39 -0000 1.4 +++ .cvsignore 31 May 2006 08:14:13 -0000 1.5 @@ -1 +1,2 @@ qemu-0.8.0.tar.gz +qemu-0.8.1.tar.gz qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu-0.7.0-build.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qemu-0.7.0-build.patch 21 Mar 2006 17:28:20 -0000 1.4 +++ qemu-0.7.0-build.patch 31 May 2006 08:14:13 -0000 1.5 @@ -4,8 +4,8 @@ install: all ifneq ($(PROGS),) -- install -m 755 -s $(PROGS) "$(bindir)" -+ install -m 755 $(PROGS) "$(bindir)" +- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" endif ifneq ($(wildcard .depend),) Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qemu.spec 21 Mar 2006 17:28:20 -0000 1.10 +++ qemu.spec 31 May 2006 08:14:13 -0000 1.11 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.8.0 -Release: 6%{?dist} +Version: 0.8.1 +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools @@ -80,6 +80,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Tue May 30 2006 David Woodhouse 0.8.1-1 +- Update to 0.8.1 + * Sat Mar 18 2006 David Woodhouse 0.8.0-6 - Update linker script for PPC Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Mar 2006 00:34:39 -0000 1.4 +++ sources 31 May 2006 08:14:13 -0000 1.5 @@ -1 +1,2 @@ eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz +67d924324a5ab79d017bd97a1e767285 qemu-0.8.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 08:43:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 01:43:14 -0700 Subject: rpms/gcl/FC-4 gcl.spec,1.16,1.17 Message-ID: <200605310843.k4V8hGES018101@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18084 Modified Files: gcl.spec Log Message: Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcl.spec 9 Sep 2005 20:34:17 -0000 1.16 +++ gcl.spec 31 May 2006 08:43:14 -0000 1.17 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 4%{?dist} +Release: 6%{?dist} Summary: GNU Common Lisp Group: Development/Languages From fedora-extras-commits at redhat.com Wed May 31 09:54:01 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 31 May 2006 02:54:01 -0700 Subject: rpms/xfce4-taskmanager/FC-4 xfce4-taskmanager.spec,1.1,1.2 Message-ID: <200605310954.k4V9s3Vj020628@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-taskmanager/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20611 Modified Files: xfce4-taskmanager.spec Log Message: Bump release to fix upgrade path (#193629) Index: xfce4-taskmanager.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-taskmanager/FC-4/xfce4-taskmanager.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-taskmanager.spec 21 Jan 2006 20:17:12 -0000 1.1 +++ xfce4-taskmanager.spec 31 May 2006 09:54:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: xfce4-taskmanager Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Taskmanager for the Xfce desktop environment Group: User Interface/Desktops @@ -46,6 +46,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 31 2006 Christoph Wickert - 0.3.1-3 +- Bump release to fix upgrade path (#193629). + * Thu Dec 15 2005 Christoph Wickert - 0.3.1-2 - Initial Fedora Extras version. - Add xfce4-taskmanager.desktop. From fedora-extras-commits at redhat.com Wed May 31 10:00:31 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 31 May 2006 03:00:31 -0700 Subject: rpms/xfce4-weather-plugin/FC-4 xfce4-weather-plugin.spec,1.2,1.3 Message-ID: <200605311000.k4VA0X9F020710@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-weather-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20693 Modified Files: xfce4-weather-plugin.spec Log Message: Bump release to fix upgrade path (#193630) Index: xfce4-weather-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-weather-plugin/FC-4/xfce4-weather-plugin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xfce4-weather-plugin.spec 11 Apr 2006 11:47:34 -0000 1.2 +++ xfce4-weather-plugin.spec 31 May 2006 10:00:31 -0000 1.3 @@ -41,6 +41,7 @@ %changelog * Tue Apr 11 2006 Christoph Wickert - 0.4.9-5 - Require xfce4-panel. +- Bump release to fix upgrade path (#193630). * Thu Dec 01 2005 Christoph Wickert - 0.4.9-4 - Add libxfcegui4-devel BuildReqs. From fedora-extras-commits at redhat.com Wed May 31 10:14:36 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 31 May 2006 03:14:36 -0700 Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605311014.k4VAEcR6023109@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Math-Pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23088 Modified Files: perl-Math-Pari.spec sources .cvsignore Log Message: Update to 2.010705 Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Math-Pari.spec 18 Apr 2006 18:33:50 -0000 1.1 +++ perl-Math-Pari.spec 31 May 2006 10:14:36 -0000 1.2 @@ -9,12 +9,12 @@ Summary: Perl interface to PARI Name: perl-Math-Pari -Version: 2.010704 +Version: 2.010705 # You'll need to replace pariversion with a hardcoded version number if you're # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 2%{?dist} +Release: 1%{?dist} License: Artistic or GPL Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -73,6 +73,9 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Wed May 31 2006 Paul Howarth 2.010705-1 +- Update to 2.010705 + * Tue Apr 18 2006 Paul Howarth 2.010704-2 - Omit dumb docs (#175198) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Apr 2006 18:33:50 -0000 1.2 +++ sources 31 May 2006 10:14:36 -0000 1.3 @@ -1,2 +1,2 @@ -0397da31fbe4f5485c4e7094c3661c5a Math-Pari-2.010704.tar.gz +87afce649551dd906ff7a648e00f5c34 Math-Pari-2.010705.tar.gz 357b7a42e89e2761a5367bbcbfcca5f2 pari-2.1.7.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Apr 2006 18:33:50 -0000 1.2 +++ .cvsignore 31 May 2006 10:14:36 -0000 1.3 @@ -1,2 +1,2 @@ -Math-Pari-2.010704.tar.gz +Math-Pari-2.010705.tar.gz pari-2.1.7.tgz From fedora-extras-commits at redhat.com Wed May 31 10:16:14 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 31 May 2006 03:16:14 -0700 Subject: rpms/perl-Math-Pari/FC-5 perl-Math-Pari.spec, 1.2, 1.3 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605311016.k4VAGGeB023185@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Math-Pari/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23164 Modified Files: perl-Math-Pari.spec sources .cvsignore Log Message: resync with devel Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/perl-Math-Pari.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Math-Pari.spec 20 Apr 2006 07:17:20 -0000 1.2 +++ perl-Math-Pari.spec 31 May 2006 10:16:14 -0000 1.3 @@ -9,12 +9,12 @@ Summary: Perl interface to PARI Name: perl-Math-Pari -Version: 2.010704 +Version: 2.010705 # You'll need to replace pariversion with a hardcoded version number if you're # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 2%{?dist}.1 +Release: 1%{?dist} License: Artistic or GPL Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -73,8 +73,8 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog -* Thu Apr 20 2006 Paul Howarth 2.010704-2.1 -- Bump for tag issue. Won't import mock-built SRPMs again! +* Wed May 31 2006 Paul Howarth 2.010705-1 +- Update to 2.010705 * Tue Apr 18 2006 Paul Howarth 2.010704-2 - Omit dumb docs (#175198) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Apr 2006 18:33:50 -0000 1.2 +++ sources 31 May 2006 10:16:14 -0000 1.3 @@ -1,2 +1,2 @@ -0397da31fbe4f5485c4e7094c3661c5a Math-Pari-2.010704.tar.gz +87afce649551dd906ff7a648e00f5c34 Math-Pari-2.010705.tar.gz 357b7a42e89e2761a5367bbcbfcca5f2 pari-2.1.7.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Apr 2006 18:33:50 -0000 1.2 +++ .cvsignore 31 May 2006 10:16:14 -0000 1.3 @@ -1,2 +1,2 @@ -Math-Pari-2.010704.tar.gz +Math-Pari-2.010705.tar.gz pari-2.1.7.tgz From fedora-extras-commits at redhat.com Wed May 31 10:17:38 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 31 May 2006 03:17:38 -0700 Subject: rpms/perl-Math-Pari/FC-4 perl-Math-Pari.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605311017.k4VAHeYM023257@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Math-Pari/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23236 Modified Files: perl-Math-Pari.spec sources .cvsignore Log Message: resync with devel Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/perl-Math-Pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Math-Pari.spec 18 Apr 2006 18:33:50 -0000 1.1 +++ perl-Math-Pari.spec 31 May 2006 10:17:38 -0000 1.2 @@ -9,12 +9,12 @@ Summary: Perl interface to PARI Name: perl-Math-Pari -Version: 2.010704 +Version: 2.010705 # You'll need to replace pariversion with a hardcoded version number if you're # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 2%{?dist} +Release: 1%{?dist} License: Artistic or GPL Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -73,6 +73,9 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Wed May 31 2006 Paul Howarth 2.010705-1 +- Update to 2.010705 + * Tue Apr 18 2006 Paul Howarth 2.010704-2 - Omit dumb docs (#175198) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Apr 2006 18:33:50 -0000 1.2 +++ sources 31 May 2006 10:17:38 -0000 1.3 @@ -1,2 +1,2 @@ -0397da31fbe4f5485c4e7094c3661c5a Math-Pari-2.010704.tar.gz +87afce649551dd906ff7a648e00f5c34 Math-Pari-2.010705.tar.gz 357b7a42e89e2761a5367bbcbfcca5f2 pari-2.1.7.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Apr 2006 18:33:50 -0000 1.2 +++ .cvsignore 31 May 2006 10:17:38 -0000 1.3 @@ -1,2 +1,2 @@ -Math-Pari-2.010704.tar.gz +Math-Pari-2.010705.tar.gz pari-2.1.7.tgz From fedora-extras-commits at redhat.com Wed May 31 10:57:53 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 31 May 2006 03:57:53 -0700 Subject: rpms/showimg/devel showimg.spec,1.9,1.10 Message-ID: <200605311057.k4VAvtZx023438@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/showimg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23391/devel Modified Files: showimg.spec Log Message: rebuild for new libpqxx Index: showimg.spec =================================================================== RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- showimg.spec 21 Feb 2006 19:02:00 -0000 1.9 +++ showimg.spec 31 May 2006 10:57:53 -0000 1.10 @@ -1,6 +1,6 @@ Name: showimg Version: 0.9.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Feature-rich image viewer for KDE Group: Applications/Multimedia @@ -122,8 +122,11 @@ %changelog +* Wed May 31 2006 Aurelien Bompard 0.9.5-6 +- rebuild for new libpqxx + * Tue Feb 21 2006 Aurelien Bompard 0.9.5-5 -- rebuild for FC5 +- rebuild * Sun Jan 22 2006 Aurelien Bompard 0.9.5-4 - fix pqxx detection on x86_64 From fedora-extras-commits at redhat.com Wed May 31 10:57:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 31 May 2006 03:57:47 -0700 Subject: rpms/showimg/FC-4 showimg.spec,1.8,1.9 Message-ID: <200605311058.k4VAwJUl023441@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/showimg/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23391/FC-4 Modified Files: showimg.spec Log Message: rebuild for new libpqxx Index: showimg.spec =================================================================== RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- showimg.spec 22 Jan 2006 09:37:49 -0000 1.8 +++ showimg.spec 31 May 2006 10:57:47 -0000 1.9 @@ -1,6 +1,6 @@ Name: showimg Version: 0.9.5 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Feature-rich image viewer for KDE Group: Applications/Multimedia @@ -122,6 +122,12 @@ %changelog +* Wed May 31 2006 Aurelien Bompard 0.9.5-6 +- rebuild for new libpqxx + +* Tue Feb 21 2006 Aurelien Bompard 0.9.5-5 +- rebuild + * Sun Jan 22 2006 Aurelien Bompard 0.9.5-4 - fix pqxx detection on x86_64 From fedora-extras-commits at redhat.com Wed May 31 10:57:48 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 31 May 2006 03:57:48 -0700 Subject: rpms/showimg/FC-5 showimg.spec,1.9,1.10 Message-ID: <200605311058.k4VAwKkn023444@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/showimg/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23391/FC-5 Modified Files: showimg.spec Log Message: rebuild for new libpqxx Index: showimg.spec =================================================================== RCS file: /cvs/extras/rpms/showimg/FC-5/showimg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- showimg.spec 21 Feb 2006 19:02:00 -0000 1.9 +++ showimg.spec 31 May 2006 10:57:47 -0000 1.10 @@ -1,6 +1,6 @@ Name: showimg Version: 0.9.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Feature-rich image viewer for KDE Group: Applications/Multimedia @@ -122,8 +122,11 @@ %changelog +* Wed May 31 2006 Aurelien Bompard 0.9.5-6 +- rebuild for new libpqxx + * Tue Feb 21 2006 Aurelien Bompard 0.9.5-5 -- rebuild for FC5 +- rebuild * Sun Jan 22 2006 Aurelien Bompard 0.9.5-4 - fix pqxx detection on x86_64 From fedora-extras-commits at redhat.com Wed May 31 12:19:55 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Wed, 31 May 2006 05:19:55 -0700 Subject: rpms/mod_cband/FC-5 .cvsignore, 1.3, 1.4 mod_cband.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605311219.k4VCJvr0029000@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28979 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 29 2006 Michael Fleming 0.9.7.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 09:36:58 -0000 1.3 +++ .cvsignore 31 May 2006 12:19:54 -0000 1.4 @@ -1 +1 @@ -mod-cband-0.9.7.3.tgz +mod-cband-0.9.7.4.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/mod_cband.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_cband.spec 1 May 2006 10:14:33 -0000 1.3 +++ mod_cband.spec 31 May 2006 12:19:54 -0000 1.4 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.3 -Release: 2%{?dist} +Version: 0.9.7.4 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 29 2006 Michael Fleming 0.9.7.4-1 +- New upstream release + * Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 May 2006 10:14:33 -0000 1.4 +++ sources 31 May 2006 12:19:54 -0000 1.5 @@ -1 +1 @@ -958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz +ff635d7b55bf7ca648d319247dfb45e3 mod-cband-0.9.7.4.tgz From fedora-extras-commits at redhat.com Wed May 31 12:27:49 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Wed, 31 May 2006 05:27:49 -0700 Subject: rpms/mod_cband/FC-4 .cvsignore, 1.3, 1.4 mod_cband.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605311227.k4VCRpAA029091@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29070 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 29 2006 Michael Fleming 0.9.7.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 09:42:57 -0000 1.3 +++ .cvsignore 31 May 2006 12:27:49 -0000 1.4 @@ -1 +1 @@ -mod-cband-0.9.7.3.tgz +mod-cband-0.9.7.4.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/mod_cband.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_cband.spec 1 May 2006 10:16:00 -0000 1.3 +++ mod_cband.spec 31 May 2006 12:27:49 -0000 1.4 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.3 -Release: 2%{?dist} +Version: 0.9.7.4 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 29 2006 Michael Fleming 0.9.7.4-1 +- New upstream release + * Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 May 2006 10:16:00 -0000 1.4 +++ sources 31 May 2006 12:27:49 -0000 1.5 @@ -1 +1 @@ -958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz +ff635d7b55bf7ca648d319247dfb45e3 mod-cband-0.9.7.4.tgz From fedora-extras-commits at redhat.com Wed May 31 14:13:44 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 31 May 2006 07:13:44 -0700 Subject: rpms/xscreensaver/devel xscreensaver-5.00-browser-setting.patch, NONE, 1.1 xscreensaver-5.00-change-defaults.patch, NONE, 1.1 xscreensaver-5.00-locale-decimal.patch, NONE, 1.1 xscreensaver-5.00-rootpasswd.patch, NONE, 1.1 xscreensaver.spec, 1.1, 1.2 Message-ID: <200605311413.k4VEDkn9001615@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586 Modified Files: xscreensaver.spec Added Files: xscreensaver-5.00-browser-setting.patch xscreensaver-5.00-change-defaults.patch xscreensaver-5.00-locale-decimal.patch xscreensaver-5.00-rootpasswd.patch Log Message: * Wed May 31 2006 Mamoru Tasaka - 1:5.00-2 - Change the default text. - Rewrite root passwd patch. - Add browser option to configure. - Fix requirement about desktop-backgrounds-basic - Fix decimal separator problem reported by upstream. xscreensaver-5.00-browser-setting.patch: --- NEW FILE xscreensaver-5.00-browser-setting.patch --- --- xscreensaver-5.00/configure.in.browser-setting 2006-05-24 07:07:00.000000000 +0900 +++ xscreensaver-5.00/configure.in 2006-05-31 03:42:39.000000000 +0900 @@ -1793,6 +1793,40 @@ ############################################################################### # +# Whether to allow root password to unblank. +# +############################################################################### +AC_ARG_ENABLE(root-passwd, [ + --enable-root-passwd Allow root passwd to unlock screen. + --disable-root-passwd Do not allow that.], + [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) +if test "$enable_root_passwd" = yes; then + AC_DEFINE(ALLOW_ROOT_PASSWD) + true +elif test "$enable_root_passwd" != no; then + echo "error: something wrong with root-passwd option. Check configure.in ." + exit 1 +fi + +############################################################################### +# +# Whether to allow root password to unblank. +# +############################################################################### +AC_ARG_ENABLE(root-passwd, [ + --enable-root-passwd Allow root passwd to unlock screen. + --disable-root-passwd Do not allow that.], + [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) +if test "$enable_root_passwd" = yes; then + AC_DEFINE(ALLOW_ROOT_PASSWD) + true +elif test "$enable_root_passwd" != no; then + echo "error: something wrong with root-passwd option. Check configure.in ." + exit 1 +fi + +############################################################################### +# # Check for PAM. # ############################################################################### @@ -2430,6 +2464,7 @@ # Check for the various Gnome help and URL loading programs. # +WITH_BROWSER=gnome-open if test "$have_gtk" = yes; then AC_CHECK_PROGS(gnome_open_program, gnome-open) AC_CHECK_PROGS(gnome_url_show_program, gnome-url-show) @@ -3359,6 +3394,45 @@ ############################################################################### # +# Check the browser to see help URL +# +############################################################################### + +have_browser=no +with_browser_req=unspecified + +AC_ARG_WITH(browser, +[ --with-browser=BROWSER Specify the browser to show help URL.], + [with_browser="$withval"; with_browser_req="$withval"], + [with_browser=no ]) +# no HANDLE_X_PATH_ARG for this one + +case "$with_browser" in + no ) + ;; + * ) + WITH_BROWSER=$with_browser + gnome_open_program=$with_browser + AC_MSG_CHECKING([for browser $with_browser]) + with_browser_fullpath=`which $with_browser 2>/dev/null` + case $with_browser_fullpath in + /* ) + AC_MSG_RESULT(yes) + have_browser=yes + ;; + * ) + AC_MSG_RESULT(no) +# Only warning: we don't want to install all packages for the +# dependency of the browser in building stage... + echo "WARNING: browser not found: --with-browser=$with_browser" + ;; + esac + ;; +esac +ac_cv_browser="$with_browser" + +############################################################################### +# # Check whether it's ok to install some hacks as setuid (e.g., "sonar") # This should be safe, but let's give people the option. # @@ -3579,6 +3653,7 @@ AC_SUBST(DEFAULT_IMAGES_P) AC_SUBST(DEFAULT_IMAGE_DIRECTORY) AC_SUBST(DEFAULT_TEXT_FILE) +AC_SUBST(WITH_BROWSER) AC_SUBST(OBJCC) AC_SUBST(EXES_OSX) --- xscreensaver-5.00/driver/XScreenSaver.ad.in.browser-setting 2006-05-24 08:01:34.000000000 +0900 +++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-05-31 03:44:31.000000000 +0900 @@ -93,7 +93,7 @@ ! ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3) ! - at GNOME24@*loadURL: gnome-open '%s' + at GNOME24@*loadURL: @WITH_BROWSER@ '%s' @GNOME24@*manualCommand: gnome-terminal --title '%s manual' \ @GNOME24@ --command '/bin/sh -c "man %s; read foo"' ! xscreensaver-5.00-change-defaults.patch: --- NEW FILE xscreensaver-5.00-change-defaults.patch --- --- xscreensaver-5.00/driver/XScreenSaver.ad.in.change-defaults 2006-05-31 02:38:54.000000000 +0900 +++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-05-31 03:08:33.000000000 +0900 @@ -37,24 +37,24 @@ *dpmsStandby: 2:00:00 *dpmsSuspend: 2:00:00 *dpmsOff: 4:00:00 -*grabDesktopImages: True +*grabDesktopImages: False *grabVideoFrames: False *chooseRandomImages: @DEFAULT_IMAGES_P@ *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ *nice: 10 *memoryLimit: 0 -*lock: False +*lock: True *verbose: False *timestamp: True *fade: True *unfade: False *fadeSeconds: 0:00:03 *fadeTicks: 20 -*splash: True +*splash: False *splashDuration: 0:00:05 *visualID: default *captureStderr: True -*ignoreUninstalledPrograms: False +*ignoreUninstalledPrograms: True *textMode: file *textLiteral: XScreenSaver @@ -229,7 +229,7 @@ epicycle -root \n\ interference -root \n\ truchet -root \n\ - bsod -root \n\ +- bsod -root \n\ crystal -root \n\ discrete -root \n\ kumppa -root \n\ xscreensaver-5.00-locale-decimal.patch: --- NEW FILE xscreensaver-5.00-locale-decimal.patch --- --- xscreensaver-5.00/utils/resources.c.localefix 2006-02-11 13:25:37.000000000 +0900 +++ xscreensaver-5.00/utils/resources.c 2006-05-31 18:27:51.000000000 +0900 @@ -12,6 +12,9 @@ #include "utils.h" #include "resources.h" +#ifdef HAVE_SETLOCALE +#include +#endif extern char *progname; @@ -124,15 +127,32 @@ { double val; char c, *s = get_string_resource (dpy, res_name, res_class); + +#ifdef HAVE_SETLOCALE + const char *current_locale; +#endif + if (! s) return 0.0; + +#ifdef HAVE_SETLOCALE + current_locale = setlocale(LC_ALL, NULL); + (void) setlocale(LC_ALL, "C"); +#endif + if (1 == sscanf (s, " %lf %c", &val, &c)) { free (s); +#ifdef HAVE_SETLOCALE + (void) setlocale(LC_ALL, current_locale); +#endif return val; } fprintf (stderr, "%s: %s must be a float, not %s.\n", progname, res_name, s); free (s); +#ifdef HAVE_SETLOCALE + (void) setlocale(LC_ALL, current_locale); +#endif return 0.0; } xscreensaver-5.00-rootpasswd.patch: --- NEW FILE xscreensaver-5.00-rootpasswd.patch --- --- xscreensaver-5.00/config.h.in.rootpasswd 2006-05-18 08:36:52.000000000 +0900 +++ xscreensaver-5.00/config.h.in 2006-05-31 00:09:40.000000000 +0900 @@ -398,6 +398,11 @@ /* Define this to remove the option of locking the screen at all. */ #undef NO_LOCKING +/* Define this if allowing root passwd to unlock screen + Default is YES!! +*/ +#undef ALLOW_ROOT_PASSWD + /* This is the same as GETTEXT_PACKAGE, but for the glade generated code. */ #undef PACKAGE --- xscreensaver-5.00/configure.in.rootpasswd 2006-05-24 07:07:00.000000000 +0900 +++ xscreensaver-5.00/configure.in 2006-05-31 00:31:29.000000000 +0900 @@ -1793,6 +1793,23 @@ ############################################################################### # +# Whether to allow root password to unblank. +# +############################################################################### +AC_ARG_ENABLE(root-passwd, [ + --enable-root-passwd Allow root passwd to unlock screen. + --disable-root-passwd Do not allow that.], + [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) +if test "$enable_root_passwd" = yes; then + AC_DEFINE(ALLOW_ROOT_PASSWD) + true +elif test "$enable_root_passwd" != no; then + echo "error: something wrong with root-passwd option. Check configure.in ." + exit 1 +fi + +############################################################################### +# # Check for PAM. # ############################################################################### --- xscreensaver-5.00/driver/passwd-pam.c.rootpasswd 2006-05-17 11:14:58.000000000 +0900 +++ xscreensaver-5.00/driver/passwd-pam.c 2006-05-31 00:09:40.000000000 +0900 @@ -288,6 +288,7 @@ goto DONE; } +#ifdef ALLOW_ROOT_PASSWD /* If that didn't work, set the user to root, and try to authenticate again. */ if (user) free (user); @@ -300,6 +301,7 @@ if (status != PAM_SUCCESS) goto DONE; PAM_NO_DELAY(pamh); +#endif set = block_sigchld(); status = pam_authenticate (pamh, 0); Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xscreensaver.spec 26 May 2006 18:20:03 -0000 1.1 +++ xscreensaver.spec 31 May 2006 14:13:44 -0000 1.2 @@ -1,9 +1,10 @@ %define name xscreensaver %define version 5.00 -%define fedora_rel 1 +%define fedora_rel 2 -%define default_text %{_datadir}/doc/fedora-release-5.89/RELEASE-NOTES +%define fedora_ver 5.89 +%define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,12 +17,15 @@ Group: Amusements/Graphics URL: http://www.jwz.org/xscreensaver/ Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz -Patch0: xscreensaver-5.00b5-change-defaults.patch +Patch0: xscreensaver-5.00-browser-setting.patch Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch5: xscreensaver-5.00b5-dont-allow-root.patch +Patch5: xscreensaver-5.00-rootpasswd.patch Patch8: xscreensaver-5.00b5-include-directory.patch Patch101: xscreensaver-5.00-locale-safety.patch Patch102: xscreensaver-5.00-matherr-utils.patch +Patch103: xscreensaver-5.00-change-defaults.patch +Patch104: xscreensaver-5.00-locale-decimal.patch + # find_lang BuildRequires: gettext @@ -44,13 +48,16 @@ BuildRequires: libXxf86vm-devel BuildRequires: libjpeg-devel BuildRequires: gtk2-devel libglade2-devel -Requires: /etc/pam.d/system-auth, htmlview, desktop-backgrounds-basic +Requires: /etc/pam.d/system-auth, htmlview Provides: xscreensaver = %{epoch}:%{version}-%{release} Obsoletes: xscreensaver %package extras Summary: An enhanced set of screensavers Group: Amusements/Graphics +# Switch desktop-backgrounds-basic from Requires to BuildRequires as +# configure needs it but xscreensaver can get along with no images. +BuildRequires: desktop-backgrounds-basic %package gl-extras Summary: An enhanced set of screensavers that require OpenGL @@ -84,12 +91,14 @@ %prep %setup -q -%patch0 -p1 -b .change-defaults +%patch0 -p1 -b .browser-setting %patch1 -p1 -b .sanitize-hacks -%patch5 -p1 -b .dont-allow-root +%patch5 -p1 -b .rootpasswd %patch8 -p1 -b .include-dir %patch101 -p1 -b .locale-safety %patch102 -p1 -b .matherr2 +%patch103 -p1 -b .change-defaults +%patch104 -p1 -b .locale-decimal sed -i -e 's|version [45].[0-9a-z][0-9a-z]*|version %{version}|' \ driver/XScreenSaver.ad.in @@ -133,6 +142,8 @@ CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks" CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}" CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults" +CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd" +CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview" # This is flaky: # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager" @@ -226,6 +237,13 @@ %defattr(-,root,root) %changelog +* Wed May 31 2006 Mamoru Tasaka - 1:5.00-2 +- Change the default text. +- Rewrite root passwd patch. +- Add browser option to configure. +- Fix requirement about desktop-backgrounds-basic +- Fix decimal separator problem reported by upstream. + * Fri May 26 2006 Mamoru Tasaka - 1:5.00-1 - Update to 5.00 - Switch to extras, don't remove anything. From fedora-extras-commits at redhat.com Wed May 31 14:18:39 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 31 May 2006 07:18:39 -0700 Subject: rpms/texmaker/FC-4 texmaker.spec,1.4,1.5 Message-ID: <200605311418.k4VEIfun001683@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1666 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-3 - Revert bad change Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- texmaker.spec 31 May 2006 04:23:56 -0000 1.4 +++ texmaker.spec 31 May 2006 14:18:39 -0000 1.5 @@ -1,14 +1,13 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -84,6 +83,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-3 +- Revert bad change + * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) From fedora-extras-commits at redhat.com Wed May 31 14:19:52 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 31 May 2006 07:19:52 -0700 Subject: rpms/texmaker/FC-5 texmaker.spec,1.5,1.6 Message-ID: <200605311419.k4VEJs0W001744@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1727 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-3 - Revert bad change Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- texmaker.spec 31 May 2006 04:38:55 -0000 1.5 +++ texmaker.spec 31 May 2006 14:19:51 -0000 1.6 @@ -1,14 +1,13 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -84,6 +83,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-3 +- Revert bad change + * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) From fedora-extras-commits at redhat.com Wed May 31 14:20:24 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 31 May 2006 07:20:24 -0700 Subject: rpms/texmaker/devel texmaker.spec,1.5,1.6 Message-ID: <200605311420.k4VEKQY5001807@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1790 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-3 - Revert bad change Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- texmaker.spec 31 May 2006 04:39:25 -0000 1.5 +++ texmaker.spec 31 May 2006 14:20:24 -0000 1.6 @@ -1,14 +1,13 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -84,6 +83,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-3 +- Revert bad change + * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) From fedora-extras-commits at redhat.com Wed May 31 14:21:47 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 31 May 2006 07:21:47 -0700 Subject: rpms/gparted/devel gparted.spec,1.10,1.11 Message-ID: <200605311421.k4VELnJZ001868@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1851 Modified Files: gparted.spec Log Message: * Mon May 22 2006 Deji Akingunola - 0.2.5-2 - Rebuild Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gparted.spec 22 May 2006 18:20:31 -0000 1.10 +++ gparted.spec 31 May 2006 14:21:47 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Gnome Partition Editor Name: gparted Version: 0.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System License: GPL URL: http://gparted.sourceforge.net @@ -77,6 +77,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Mon May 22 2006 Deji Akingunola - 0.2.5-2 +- Rebuild + * Mon May 22 2006 Deji Akingunola - 0.2.5-1 - Update to version 0.2.5 From fedora-extras-commits at redhat.com Wed May 31 14:31:22 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:31:22 -0700 Subject: rpms/xgalaxy - New directory Message-ID: <200605311431.k4VEVO4c002026@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/xgalaxy Log Message: Directory /cvs/extras/rpms/xgalaxy added to the repository From fedora-extras-commits at redhat.com Wed May 31 14:31:22 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:31:22 -0700 Subject: rpms/xgalaxy/devel - New directory Message-ID: <200605311431.k4VEVOcW002029@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/xgalaxy/devel Log Message: Directory /cvs/extras/rpms/xgalaxy/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 14:31:36 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:31:36 -0700 Subject: rpms/xgalaxy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605311431.k4VEVcxh002078@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xgalaxy --- NEW 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 May 31 14:31:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:31:35 -0700 Subject: rpms/xgalaxy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605311431.k4VEVb4L002075@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045 Added Files: Makefile import.log Log Message: Setup of module xgalaxy --- NEW FILE Makefile --- # Top level Makefile for module xgalaxy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 14:32:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:32:28 -0700 Subject: rpms/xgalaxy import.log,1.1,1.2 Message-ID: <200605311432.k4VEWUWv002187@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2148 Modified Files: import.log Log Message: auto-import xgalaxy-2.0.34-2 on branch devel from xgalaxy-2.0.34-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 14:31:35 -0000 1.1 +++ import.log 31 May 2006 14:32:28 -0000 1.2 @@ -0,0 +1 @@ +xgalaxy-2_0_34-2:HEAD:xgalaxy-2.0.34-2.src.rpm:1149085971 From fedora-extras-commits at redhat.com Wed May 31 14:32:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:32:29 -0700 Subject: rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen.patch, NONE, 1.1 xgalaxy-2.0.34-warn.patch, NONE, 1.1 xgalaxy-2.0.34-xgalaxy.patch, NONE, 1.1 xgalaxy-hyperspace.desktop, NONE, 1.1 xgalaxy.desktop, NONE, 1.1 xgalaxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605311432.k4VEWVXx002198@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2148/devel Modified Files: .cvsignore sources Added Files: xgalaxy-2.0.34-fullscreen.patch xgalaxy-2.0.34-warn.patch xgalaxy-2.0.34-xgalaxy.patch xgalaxy-hyperspace.desktop xgalaxy.desktop xgalaxy.spec Log Message: auto-import xgalaxy-2.0.34-2 on branch devel from xgalaxy-2.0.34-2.src.rpm xgalaxy-2.0.34-fullscreen.patch: --- NEW FILE xgalaxy-2.0.34-fullscreen.patch --- --- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200 +++ xgalaga-2.0.34/libsprite/struct.h 2006-05-22 11:45:35.000000000 +0200 @@ -55,6 +55,8 @@ W_Callback handle_button; W_Callback handle_expose; #endif /* 0 */ + W_Window wm_window; + Window fs_window; }; struct stringList { --- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-22 11:45:35.000000000 +0200 +++ xgalaga-2.0.34/libsprite/data.c 2006-05-22 11:45:35.000000000 +0200 @@ -158,3 +158,6 @@ int useBuffered = 1; +#ifdef XF86VIDMODE +struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 }; +#endif --- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-22 11:45:35.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; extern unsigned long w_socket; + +/* For XF86VIDMODE Support */ +#ifdef XF86VIDMODE +#include +#include + +struct xf86vidmode_data { + int vidmode_available; + XF86VidModeModeInfo orig_mode; + int orig_viewport_x; + int orig_viewport_y; +}; + +extern struct xf86vidmode_data XF86VidModeData; +#endif + #endif /* AMIGA */ #if 0 --- xgalaga-2.0.34/libsprite/mapwindow.c.fs 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-22 11:45:35.000000000 +0200 @@ -13,6 +13,8 @@ if(win->type != WIN_BORDER && win->borderwin) { W_MapWindow(win->borderwin); } + if (win->wm_window) + W_MapWindow(win->wm_window); if (win->mapped) return; win->mapped = 1; @@ -36,6 +38,8 @@ if(win->type != WIN_BORDER && win->borderwin) { W_UnmapWindow(win->borderwin); } + if (win->wm_window) + W_UnmapWindow(win->wm_window); } int @@ -75,17 +79,25 @@ W_Window window; { struct window *win; - + W_Window wm_window; #ifdef DEBUG printf("Destroying %d\n", window); #endif win = W_Void2Window(window); + wm_window = win->wm_window; + + if(win->fs_window != None) + W_ToggleFullscreen(window); + deleteWindow(win); XDestroyWindow(W_Display, win->window); if(win->buffer) XFreePixmap(W_Display, win->buffer); if(win->type != WIN_BORDER && win->borderwin) W_DestroyWindow(win->borderwin); free((char *) win); + + if (wm_window) + W_DestroyWindow(wm_window); } void --- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-22 11:45:35.000000000 +0200 +++ xgalaga-2.0.34/libsprite/init.c 2006-05-22 11:45:35.000000000 +0200 @@ -356,6 +356,31 @@ XFreeModifiermap(m); } +#ifdef XF86VIDMODE +static void +xf86_vidmode_init ( void ) +{ + int i,j; + XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) + &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); + + if (!XF86VidModeQueryVersion(W_Display, &i, &j)) + XF86VidModeData.vidmode_available = 0; + else if (!XF86VidModeQueryExtension(W_Display, &i, &j)) + XF86VidModeData.vidmode_available = 0; + else if (!XF86VidModeGetModeLine(W_Display, W_Screen, + (int *)&XF86VidModeData.orig_mode.dotclock, l)) + XF86VidModeData.vidmode_available = 0; + else if (!XF86VidModeGetViewPort(W_Display, W_Screen, + &XF86VidModeData.orig_viewport_x, + &XF86VidModeData.orig_viewport_y)) + XF86VidModeData.vidmode_available = 0; + + if (!XF86VidModeData.vidmode_available) + fprintf(stderr, "Warning: XF86VidMode not available\n"); +} +#endif + void W_Initialize(str) char *str; @@ -395,5 +420,9 @@ GetAltMask(); backColor = W_Black; + +#ifdef XF86VIDMODE + xf86_vidmode_init(); +#endif } --- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-22 11:45:35.000000000 +0200 +++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-22 11:45:35.000000000 +0200 @@ -236,6 +236,10 @@ neww->type = type; neww->mapped = 0; neww->insensitive = 0; +#ifdef XF86VIDMODE + neww->wm_window = NULL; + neww->fs_window = None; +#endif addToHash(neww); return (neww); } @@ -454,6 +458,22 @@ int border; W_Color color; { + /* When creating a toplevel window create a real toplevel + window and a child window of the same dimensions. Then when switching + fullscreen we can create a fullscreen window and reparent the child + window to the fullscreen window and back again when switching to + windowed mode again. */ + if(parent == NULL) + { + W_Window wm_window = w_MakeWindow(name, x, y, width, height, 0, + cursname, border, color, WIN_GRAPH); + struct window *child_window = (struct window *)w_MakeWindow( + name, x, y, width, height, + wm_window, cursname, border, color, + WIN_GRAPH); + child_window->wm_window = wm_window; + return (W_Window)child_window; + } return w_MakeWindow(name, x, y, width, height, parent, cursname, border, color, WIN_GRAPH); } @@ -498,5 +518,208 @@ XSetWMHints(W_Display, W_Void2Window(win)->window, &hints); } +#ifdef XF86VIDMODE +/* qsort comparison function for sorting the modes */ +static int cmpmodes(const void *va, const void *vb) +{ + const XF86VidModeModeInfo *a = *(const XF86VidModeModeInfo **)va; + const XF86VidModeModeInfo *b = *(const XF86VidModeModeInfo **)vb; + if ( a->hdisplay == b->hdisplay ) + return b->vdisplay - a->vdisplay; + else + return b->hdisplay - a->hdisplay; +} +#endif + +void W_ToggleFullscreen(_win) + W_Window _win; +{ +#ifdef XF86VIDMODE + int i; + XF86VidModeModeLine mode = { .hdisplay = 0, .privsize = 0 }; + XF86VidModeModeInfo **modes; + int mode_count; +#endif + struct window *win = (struct window *)_win; + static int mouse_grabbed = 0; + static int keyboard_grabbed = 0; + + /* Check we get a nested toplevel WIN_GRAPH window passed */ + if (win->wm_window == NULL) + return; + + /* If there is no fullscreen window enter fullscreen mode, otherwise exit + fullscreen mode */ + if (win->fs_window == None) + { + XEvent event; + XSetWindowAttributes setattr; + /* local width and height vars used for fullscreen window size and for + storing the video_mode size which is then used to center the window */ + int fs_width = DisplayWidth(W_Display, W_Screen); + int fs_height = DisplayHeight(W_Display, W_Screen); + + /* Create the fullscreen window */ + setattr.override_redirect = True; + setattr.background_pixel = XBlackPixel(W_Display, W_Screen); + setattr.border_pixel = XBlackPixel(W_Display, W_Screen); + setattr.event_mask = StructureNotifyMask; + setattr.colormap = W_Colormap; + win->fs_window = XCreateWindow(W_Display, W_Root, + 0, 0, fs_width, fs_height, 0, + CopyFromParent, InputOutput, + CopyFromParent, CWOverrideRedirect | + CWBackPixel | CWColormap | CWBorderPixel | + CWEventMask, &setattr); + + /* Map the fullscreen window */ + XMapRaised(W_Display, win->fs_window); + /* wait until we are mapped. (shamelessly borrowed from SDL) */ + do { + XMaskEvent(W_Display, StructureNotifyMask, &event); + } while ( (event.type != MapNotify) || + (event.xmap.event != win->fs_window) ); + /* Make sure we got to the top of the window stack */ + XRaiseWindow(W_Display, win->fs_window); + + /* Reparent the real window */ + XReparentWindow(W_Display, win->window, win->fs_window, 0, 0); + + /* Grab the keyboard and mouse. */ + if (XGrabKeyboard(W_Display, win->window, False, GrabModeAsync, + GrabModeAsync, CurrentTime) != GrabSuccess) + fprintf(stderr, "Warning can not grab keyboard\n"); + else + keyboard_grabbed = 1; + + if (XGrabPointer(W_Display, win->window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, win->window, None, + CurrentTime) != GrabSuccess) + fprintf(stderr, "Warning can not grab mouse\n"); + else + mouse_grabbed = 1; + +#ifdef XF86VIDMODE + /* Try to switch video mode. This must be done after the pointer is + grabbed, because otherwise it can be outside the window negating the + XF86VidModeSetViewPort. */ + if (XF86VidModeGetModeLine(W_Display, W_Screen, &i, &mode)) + { + fs_width = mode.hdisplay; + fs_height = mode.vdisplay; + } + + /* Get list of modelines. */ + if (!XF86VidModeGetAllModeLines(W_Display, W_Screen, &mode_count, &modes)) + mode_count = 0; + + /* Search for an exact matching video mode. */ + for (i = 0; i < mode_count; i++) { + if ((modes[i]->hdisplay == win->width) && + (modes[i]->vdisplay == win->height)) + break; + } + + /* Search for a non exact match (smallest bigger res). */ + if (i == mode_count) { + int best_width = 0, best_height = 0; + qsort(modes, mode_count, sizeof(void *), cmpmodes); + for (i = mode_count-1; i > 0; i--) { + if ( ! best_width ) { + if ( (modes[i]->hdisplay >= win->width) && + (modes[i]->vdisplay >= win->height) ) { + best_width = modes[i]->hdisplay; + best_height = modes[i]->vdisplay; + } + } else { + if ( (modes[i]->hdisplay != best_width) || + (modes[i]->vdisplay != best_height) ) { + i++; + break; + } + } + } + } + + /* Switch video mode. */ + if ((i >= 0) && + ((modes[i]->hdisplay != mode.hdisplay) || + (modes[i]->vdisplay != mode.vdisplay)) && + XF86VidModeSwitchToMode(W_Display, W_Screen, modes[i])) + { + fs_width = modes[i]->hdisplay; + fs_height = modes[i]->vdisplay; + } + + /* Lock mode switching. */ + XF86VidModeLockModeSwitch(W_Display, W_Screen, True); + + /* Set viewport. */ + XF86VidModeSetViewPort(W_Display, W_Screen, 0, 0); + + /* clean up */ + if (mode.privsize) + XFree(mode.private); + if (mode_count) + { + for (i = 0; i < mode_count; i++) + if (modes[i]->privsize) + XFree(modes[i]->private); + XFree(modes); + } +#endif + + /* Center the window (if nescesarry) */ + if ((fs_width != win->width) || (fs_height != win->height)) + XMoveWindow(W_Display, win->window, (fs_width - win->width) / 2, + (fs_height - win->height) / 2); + + /* And last blank the cursor */ + W_BlankCursor(_win); + } + else + { + struct window *wm_window = (struct window *)win->wm_window; + + if (mouse_grabbed) { + XUngrabPointer(W_Display, CurrentTime); + mouse_grabbed = 0; + } + if (keyboard_grabbed) { + XUngrabKeyboard(W_Display, CurrentTime); + keyboard_grabbed = 0; + } +#ifdef XF86VIDMODE + /* Unlock mode switching. */ + XF86VidModeLockModeSwitch(W_Display, W_Screen, False); + + if (!XF86VidModeGetModeLine(W_Display, W_Screen, &i, &mode) || + (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || + (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) + { + if (!XF86VidModeSwitchToMode(W_Display, W_Screen, + &XF86VidModeData.orig_mode)) + fprintf(stderr, "XF86VidMode couldnot restore original resolution\n"); + } + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + { + if (!XF86VidModeSetViewPort(W_Display, W_Screen, + XF86VidModeData.orig_viewport_x, + XF86VidModeData.orig_viewport_y)) + fprintf(stderr, "XF86VidMode couldnot restore original viewport\n"); + } + XSync(W_Display, False); +#endif + /* Reparent the real window! */ + XReparentWindow(W_Display, win->window, wm_window->window, 0, 0); + XUnmapWindow(W_Display, win->fs_window); + XDestroyWindow(W_Display, win->fs_window); + win->fs_window = None; + + /* And last unblank the cursor */ + W_RevertCursor(_win); + } +} --- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-22 11:45:35.000000000 +0200 @@ -63,6 +63,7 @@ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); void W_SetIconWindow(W_Window win, W_Window icon); +void W_ToggleFullscreen(W_Window win); /* point.c */ void W_DrawPoint(W_Window window, int x, int y, W_Color color); void FlushPointCache(Window win, int color); --- xgalaga-2.0.34/defs.h.fs 2006-05-22 11:45:35.000000000 +0200 +++ xgalaga-2.0.34/defs.h 2006-05-22 11:45:35.000000000 +0200 @@ -26,8 +26,9 @@ #define TORPDELAY 5 -#define WINWIDTH 400 -#define WINHEIGHT 500 +/* Modified slightly to better fit on 800x600 in fullscreen mode */ +#define WINWIDTH 464 /* was 400 */ +#define WINHEIGHT 580 /* was 500 */ #define NUMSTARS 30 --- xgalaga-2.0.34/Wlib.h.fs 1998-04-12 08:03:20.000000000 +0200 +++ xgalaga-2.0.34/Wlib.h 2006-05-22 11:45:35.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; extern unsigned long w_socket; + +/* For XF86VIDMODE Support */ +#ifdef XF86VIDMODE +#include +#include + +struct xf86vidmode_data { + int vidmode_available; + XF86VidModeModeInfo orig_mode; + int orig_viewport_x; + int orig_viewport_y; +}; + +extern struct xf86vidmode_data XF86VidModeData; +#endif + #endif /* AMIGA */ #if 0 --- xgalaga-2.0.34/main.c.fs 2006-05-22 11:45:36.000000000 +0200 +++ xgalaga-2.0.34/main.c 2006-05-22 11:45:35.000000000 +0200 @@ -32,6 +32,7 @@ static int attacking = 0, maxattacking, entering=0; static int maxetorps = 5, numetorps=0; static int plflash = 50; +static int fullscreen = 0; #ifndef ORIGINAL_XGALAGA static int shots = 0; static int hits = 0; @@ -63,10 +64,14 @@ xgal_exit(int v) { /* W_AutoRepeatOn();*/ + /* Destroy our main window so the fullscreen mode gets unset if we're + running fullscreen. (We should really clean up much more here!) */ + W_DestroyWindow(shellWin); #ifdef SOUND kill_sound(); #endif /* sleep(1);*/ /* Without this, the auto-repeat request fails on my machine... */ + /* Note if we ever need this autorepeat thingie again, the sleep can and should be replaced by a call to XSync() */ exit(v); } @@ -89,6 +94,7 @@ -mouse Use mouse control (same as 'm' at the title screen)\n\ -keyboard Use keyboard control (same as 'k')\n%s\ -level Choose starting level (>= 1)\n\ +-window Start in windowed mode instead of fullscreen\n\ -b turn buffered mode off, use this if it runs\n\ too slowly. Will cause flicker, maybe lots,\n\ maybe only a little.\n\ @@ -105,7 +111,8 @@ p - pauses\n\ q - end this game\n\ b - Toggle buffering (flicker vs. speed.)\n\ -o - Toggle OR mode. Don't use this, it sucks.\n", VERSION, +o - Toggle OR mode. Don't use this, it sucks.\n\ +alt + enter - Toggle fullscreen - window\n", VERSION, PRINT_SOUND ); } @@ -844,6 +851,14 @@ case 'm': mouseControl = 2; break; + case '\r'+256: + W_ToggleFullscreen(shellWin); + fullscreen = !fullscreen; + if (fullscreen) + W_BlankCursor(baseWin); + else + W_RevertCursor(baseWin); + break; default: break; } @@ -997,6 +1012,14 @@ maxtorps = MINTORPS; break; #endif /* IM_A_BIG_FAT_CHEATER */ + case '\r'+256: + W_ToggleFullscreen(shellWin); + fullscreen = !fullscreen; + if (fullscreen) + W_BlankCursor(baseWin); + else + W_RevertCursor(baseWin); + break; default: break; } @@ -1214,6 +1237,7 @@ int ac; char *dpyname = 0; int mx, my, but; + int start_fullscreen = 1; for(ac = 1; ac < argc; ac++) { if(*argv[ac] == '-') { @@ -1245,6 +1269,8 @@ useOR = 0; } else if (strcmp(argv[ac], "-noclipmask") == 0) { useClipMask = 0; + } else if (strcmp(argv[ac], "-window") == 0) { + start_fullscreen = 0; } else { print_usage(); exit(0); @@ -1263,6 +1289,12 @@ W_Buffer(shellWin, 0); W_MapWindow(shellWin); W_MapWindow(baseWin); + if (start_fullscreen) + { + W_ToggleFullscreen(shellWin); + W_BlankCursor(baseWin); + fullscreen = 1; + } /* W_AutoRepeatOff();*/ --- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200 +++ xgalaga-2.0.34/Wproto.h 2006-05-22 11:45:35.000000000 +0200 @@ -63,6 +63,7 @@ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); void W_SetIconWindow(W_Window win, W_Window icon); +void W_ToggleFullscreen(W_Window win); /* point.c */ void W_DrawPoint(W_Window window, int x, int y, W_Color color); void FlushPointCache(Window win, int color); xgalaxy-2.0.34-warn.patch: --- NEW FILE xgalaxy-2.0.34-warn.patch --- --- xgalaga-2.0.34/libsprite/image.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/libsprite/image.c 2006-05-11 22:28:08.000000000 +0200 @@ -210,7 +210,7 @@ if(image->compiled_in) { if(image->xbmdata) { image->clipmask = XCreateBitmapFromData(W_Display, W_Root, - image->xbmdata, image->width, image->height); + (char *)image->xbmdata, image->width, image->height); ErrorStatus = BitmapSuccess; } else { ErrorStatus = !BitmapSuccess; --- xgalaga-2.0.34/libsprite/line.c.warn 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/line.c 2006-05-11 22:28:08.000000000 +0200 @@ -37,7 +37,7 @@ W_Window window; { Window win = W_Void2Window(window)->drawable; - register i; + int i; for (i = 0; i < NCOLORS; i++) { if (_lcache_index[i]) FlushLineCache(win, i); --- xgalaga-2.0.34/libsprite/makewindow.c.warn 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-11 22:28:08.000000000 +0200 @@ -4,20 +4,20 @@ #define tiny_height 3 #define tiny_x_hot 1 #define tiny_y_hot 1 -static unsigned char tiny_bits[] = { +static char tiny_bits[] = { 0x05, 0x02, 0x05, }; -static unsigned char tinymask_bits[] = { +static char tinymask_bits[] = { 0x05, 0x02, 0x05, }; #define cross_width 16 #define cross_height 16 #define cross_x_hot 7 #define cross_y_hot 7 -static unsigned char cross_bits[] = { +static char cross_bits[] = { 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0xc0, 0x01, 0x80, 0x00, 0x10, 0x04, 0x3f, 0x7e, 0x10, 0x04, 0x80, 0x00, 0xc0, 0x01, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00}; -static unsigned char crossmask_bits[] = { +static char crossmask_bits[] = { 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xe0, 0x03, 0xd0, 0x05, 0xbf, 0x7e, 0x7f, 0x7f, 0xbf, 0x7e, 0xd0, 0x05, 0xe0, 0x03, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00}; --- xgalaga-2.0.34/libsprite/point.c.warn 1998-04-12 08:03:23.000000000 +0200 +++ xgalaga-2.0.34/libsprite/point.c 2006-05-11 22:28:08.000000000 +0200 @@ -49,7 +49,7 @@ W_Window window; { Window win = W_Void2Window(window)->drawable; - register i; + int i; for (i = 0; i < NCOLORS; i++) { if (_pcache_index[i]) FlushPointCache(win, i); --- xgalaga-2.0.34/libsprite/scroll.c.warn 1998-04-12 08:03:23.000000000 +0200 +++ xgalaga-2.0.34/libsprite/scroll.c 2006-05-11 22:28:08.000000000 +0200 @@ -9,12 +9,11 @@ char *str; int len; { - struct stringList **strings; char *newstring; - int count; + char **p = & (win->data); + struct stringList **strings = (struct stringList **)p ; + int count = 0; - strings = (struct stringList **) & (win->data); - count = 0; while ((*strings) != NULL) { count++; strings = &((*strings)->next); --- xgalaga-2.0.34/frate.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/frate.c 2006-05-11 22:28:08.000000000 +0200 @@ -4,6 +4,7 @@ #include #include +#include #ifdef HAVE_SYS_TIME_H # include #endif --- xgalaga-2.0.34/highscore.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/highscore.c 2006-05-11 22:28:08.000000000 +0200 @@ -191,13 +191,15 @@ if(write(hsf, &x, sizeof(long)) < sizeof(long)) goto error2; } + close(hsf); } - close(hsf); return; +#ifndef NO_GLOBAL_SCORES error: printf("Error saving high scores file %s\n", SCOREFILE); return; +#endif error2: printf("Error saving high scores file %s\n", my_file_name); return; @@ -457,10 +459,10 @@ } } return; +#ifndef NO_GLOBAL_SCORES error: if(i>0) printf("Error reading high scores file '%s'\n", SCOREFILE); -#ifndef NO_GLOBAL_SCORES for(i=0;i0) printf("Error reading high scores file '%s'\n", my_file_name); --- xgalaga-2.0.34/main.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/main.c 2006-05-11 22:30:11.000000000 +0200 @@ -32,29 +32,31 @@ static int attacking = 0, maxattacking, entering=0; static int maxetorps = 5, numetorps=0; static int plflash = 50; +#ifndef ORIGINAL_XGALAGA static int shots = 0; static int hits = 0; +#endif #define convoy_x_pos(i) (convoyx+(20 * (i - 10 * (i/10)))) #define convoy_y_pos(i) (20 + (20*(i/10))) static int moves[16][2] = { - 0,-4, - 1,-4, - 3,-3, - 4,-1, - 4,0, - 4,1, - 3,3, - 1,4, - 0,4, - -1,4, - -3,3, - -4,1, - -4,0, - -4,-1, - -3,-3, - -1,-4 + {0,-4}, + {1,-4}, + {3,-3}, + {4,-1}, + {4,0}, + {4,1}, + {3,3}, + {1,4}, + {0,4}, + {-1,4}, + {-3,3}, + {-4,1}, + {-4,0}, + {-4,-1}, + {-3,-3}, + {-1,-4} }; void @@ -817,7 +819,9 @@ int mx, my, but; { static int torpok; - static int shotside = 0, shotsidedirection = 1; +#ifdef ENABLE_MACHINE_GUN + static int shotside = 0; +#endif W_Event wev; static int keys = 0; @@ -1209,7 +1213,6 @@ { int ac; char *dpyname = 0; - long ut; int mx, my, but; for(ac = 1; ac < argc; ac++) { --- xgalaga-2.0.34/paths.c.warn 1998-04-30 07:11:57.000000000 +0200 +++ xgalaga-2.0.34/paths.c 2006-05-11 22:28:08.000000000 +0200 @@ -1197,8 +1197,6 @@ void new_alien(int level, int anum, struct alien *al) { - int l = (level-1) % NUMLEVELS; - if(get_shape(anum) >= 0) { al->alive = 1; al->dying = 0; --- xgalaga-2.0.34/proto.h.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/proto.h 2006-05-11 22:28:08.000000000 +0200 @@ -1,3 +1,5 @@ +#include + /* main.c */ void xgal_exit(int v); int main(int argc, char **argv); @@ -58,3 +60,9 @@ int get_duration(int, int); int get_shape(int); int read_level(int); +/* frate.c */ +void init_framerate(void); +void do_framerate(void); +/* linux-joystick.c */ +void init_joystick(void); +void do_joystick(int* x, int* y, int* but); --- xgalaga-2.0.34/sound.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/sound.c 2006-05-11 22:28:08.000000000 +0200 @@ -54,7 +54,10 @@ /* Create a pipe, set the write end to close when we exec the sound server, and set both (is the write end necessary?) ends to non-blocking */ - pipe(fd); + if (pipe(fd)) { + audioOK = 0; + return; + } soundfd=fd[1]; if( !(child=fork()) ) { @@ -88,7 +91,9 @@ char c; c = k; - if ((playSounds) && (audioOK)) write (soundfd, &c, sizeof (c)); + if ((playSounds) && (audioOK)) + if(write (soundfd, &c, sizeof (c)) != sizeof (c)) + audioOK = 0; } @@ -103,7 +108,9 @@ sound_flags[k] |= 1; c = (unsigned char)(k); - if ((playSounds) && (audioOK)) write (soundfd, &c, sizeof (c)); + if ((playSounds) && (audioOK)) + if(write (soundfd, &c, sizeof (c)) != sizeof (c)) + audioOK = 0; } @@ -121,7 +128,9 @@ char c; c = -1; - if ((playSounds) && (audioOK)) write (soundfd, &c, sizeof (c)); + if ((playSounds) && (audioOK)) + if(write (soundfd, &c, sizeof (c)) != sizeof (c)) + audioOK = 0; } #endif /* SOUND */ --- xgalaga-2.0.34/xgal.sndsrv.linux.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/xgal.sndsrv.linux.c 2006-05-11 22:28:08.000000000 +0200 @@ -17,7 +17,7 @@ #include #include #include -/*#include "linux_pcsp.h" /* /usr/include/linux/pcsp.h */ +/*#include "linux_pcsp.h" /usr/include/linux/pcsp.h */ #include #include #include @@ -39,7 +39,7 @@ #define NUM_SOUNDS (sizeof(FILENAME)/sizeof(char*)) -signed char *sound_buffer[NUM_SOUNDS]; +char *sound_buffer[NUM_SOUNDS]; int sound_size[NUM_SOUNDS]; int fragsize; @@ -161,10 +161,12 @@ return(0); }; lseek(fd,0,SEEK_SET); - read(fd,sound_buffer[k],size); + size = read(fd,sound_buffer[k],size); close(fd); - for(i=0;i print usage and version. Basic instructions: - It's Galaga, you know how to play Galaga, stop bothering me. - (Ship follows the mouse, button fires. Auto-fire by holding it - down, so no-one accuses me of breaking their mouse!) + It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, + stop bothering me. (Ship follows the mouse, button fires. Auto-fire by + holding it down, so no-one accuses me of breaking their mouse!) Keyboard commands: @@ -73,7 +73,7 @@ games written quickly and painlessly. Credits: - Galaga code: + XGalaxy code: Joe Rumsey (mrogre at mediaone.net) X interface: Bill Dyess(dyessww at eng.auburn.edu), --- xgalaga-2.0.34/xgal.6x.xgalaxy 2006-05-22 15:30:59.000000000 +0200 +++ xgalaga-2.0.34/xgal.6x 2006-05-22 15:30:59.000000000 +0200 @@ -1,6 +1,6 @@ -.TH XGALAGA 6x "23 April 2003" "2.0.34" +.TH XGALAXY 6 "23 April 2003" "2.0.34" .SH NAME -xgalaga \- X11 version of the famous Galaga game +xgalaga \- X11 Galaga like game .SH SYNOPSIS .B xgalaxy [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] @@ -11,9 +11,9 @@ [-noclipmask] [-nouseor] [-nostars] .SH INSTRUCTIONS .LP -It's Galaga, you know how to play Galaga, stop bothering me. -(Ship follows the mouse, button fires. Auto-fire by holding it -down, so no-one accuses me of breaking their mouse!) +It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, +stop bothering me. (Ship follows the mouse, button fires. Auto-fire by +holding it down, so no-one accuses me of breaking their mouse!) .P The xgalaxy-hyperspace version features some new weapons and different gameplay. @@ -69,7 +69,7 @@ .TP 8 x - use your shields (xgalaxy-hyperspace only) .SH "SEE ALSO" -Xgalaga home page +XGalaxy home page .RI < http://rumsey.org/xgal.html > .SH AUTHORS Joe Rumsey, <\fIjoe at rumsey.org\fP> (Original author) --- xgalaga-2.0.34/images.c.xgalaxy 2006-05-22 15:31:13.000000000 +0200 +++ xgalaga-2.0.34/images.c 2006-05-22 16:14:13.000000000 +0200 @@ -6786,54 +6786,108 @@ /* XPM */ static char * title_xpm[] = { /* width height ncolors chars_per_pixel */ -"126 37 7 1", +"136 37 62 1", /* colors */ -"` c None", -"a c #606000", -"b c #909000", -"c c #C0B000", -"d c #F0E000", -"e c #404040", -"f c #303030", +" c None", +". c #303030", +"+ c #606000", +"@ c #909000", +"# c #C0B000", +"$ c #F0E000", +"% c #404040", +"& c #6E6C00", +"* c #9A9300", +"= c #DECE00", +"- c #AFA600", +"; c #A29A00", +"> c #C2B200", +", c #B7B000", +"' c #C8BD00", +") c #DDCD01", +"! c #DBCD05", +"~ c #A5A100", +"{ c #C8B800", +"] c #E3D300", +"^ c #C2BA00", +"/ c #9C9400", +"( c #C4B400", +"_ c #C3B300", +": c #B8B100", +"< c #D3C600", +"[ c #B4AA04", +"} c #9F940E", +"| c #32322F", +"1 c #A09D00", +"2 c #34342E", +"3 c #A69D03", +"4 c #C7B700", +"5 c #949300", +"6 c #C1B100", +"7 c #CCC200", +"8 c #9B9314", +"9 c #C5B500", +"0 c #ACA600", +"a c #EADB00", +"b c #BFB307", +"c c #35352E", +"d c #6A6900", +"e c #979100", +"f c #EADA00", +"g c #989100", +"h c #B6AE00", +"i c #A19D00", +"j c #E9D900", +"k c #D9CB00", +"l c #B1AB00", +"m c #ADA10E", +"n c #656121", +"o c #BCB500", +"p c #7A7800", +"q c #C0B800", +"r c #42412B", +"s c #676600", +"t c #38372D", +"u c #8D8700", +"v c #AAA300", +"w c #666500", /* pixels */ -"`````````````````faf`````````````````````````````````````````````````faf``````````````````````````````````````````````````````", -"````fabf````````fccbf`````````fabbbf````````````````````````````````fccbf`````````````````````````````````````````````````````", -"```fccdbf``````acddda```````fbccdddbbf`````````````````````````````acddda`````````````````````````````````````````````````````", -"``abcddda`````aabddda``````fccdbaaccdbf```````````````````````````acdddda`````````````````````````````````````````````````````", -"`accdddbf````aaacddbf`````acdbaaababddbf`````````````````````````abcdbcda`````````````````````````````````````````````````````", -"`cccddda`````fabcdda`````acddaffbaaabddbf```````````````````````accdbbcda`````````````````````````````````````````````````````", -"`ccabdda`````abcddbf````abcdbf``fbaaabdda```````````````````````cbcdabcbf`````````````````````````````````````````````````````", -"`caacddcf````bbcdbf````abcdbf````fbaacddcf``````````````````````bbcdaaca``````````````````````````````````````````````````````", -"`fbcabdda```abcdda`````acdbf``````fbccddda`````````````````````accddabca``````````````````````````````````````````````````````", -"``caacddcf``bbcdbf````abcda````````ccabdbf`````````````````````cccdbacbf``````````````````````````````````````````````````````", -"``fbcabdda`abcdbf````accdda````````caaaae``````````````````````cccdaaca``````````````````````````````fabbf````````````````````", -"```caacddcfacdda`````cbcdbf````````fbaaf```````````````````````cccdccbf`````````````````````````````fccdda````````````````````", -"```fbcabddbcddbf`````bbcda``````````ff```````````````fabbf`````cbcddda````````````````fabbf````````acdddbf```````````fabbf````", -"````caaabddddbf`````accdda`````````````````````````fbccdbf`````bbcddbf``````````````fbccdbf```````acdddbf``````````fbccdbf````", -"````fbaaabddbf``````cccdda```````````````````````fbccbaae`````accddda`````````````fbccbaae```````abcdbae`````````fbccbaae`````", -"`````fbaacdda```````cbcdda``````````````````````fccbaaafaf````cccddbf````````````fccbaaafaf`````abcdbaf`````````fccbaaafaf````", -"``````facdddcf``````bbcdda````````````````````fbcdbafffcca````cccdda```````````fbcdbafffcca`````bbcbf`````````fbcdbafffcca````", -"``````acdbcdda`````accddda```````````fabf````fccdbf``acdda````cbcddcf`````````fccdbf``acdda````abcda`````````fccdbf``acdda````", -"`````abcbbabdcf````cccddda``````````fbcda```acddbf``acddda````acdddda````````acddbf``acddda````acdbf````````acddbf``acddda````", -"````abcdaaaabcbf```ccabddcf````````aacdda``acddbf``abcddbf```acbcddda```````acddbf``abcddbf```acdda```````fbcddbf``abcddbf````", -"````acdbebaacdda```caacddda````````acddda`abcdbf``abcbcda```acbbcddda`````fbcddbf``abcbcda```aaacdcf`````fccddbf``abcbcda```ff", -"```abcbf`fbcabdcf``fbccdddcf``````acdddbfacabda``fbcbbcda``acbbcabddcf```fcbacda``fbcbbcda``acaacdda````acbacda``fbcbbcda``fba", -"``abcbf```caaabcbf``ccabdddbf````acdddda`caacdcbbccdabcdcbbcbfcaacdddbbbbcbaacdcbbccdabcdcbbcbaccddcf``acbaacdcbbccdabcdcbbcbf", -"``acbf````fbaaabcbf`caaabdddbbbbbcbcddda`fabcdddddbaacabcddbf`fbcabddddddbfabcdddddbaacabcddbfccabddbbbcbfabcdddddbaacabcddbf`", -"`abca``````fbaaaaba`fbaaaacdddddbabcddda`acabddddbafcaaaaaae```caaabdddbaeacabddddbafcaaaaaae`caaabddddbfacabddddbafcaaaaaae``", -"acaaf```````fbaaaa```fbaabaaaaaaaaccddda`caaaaaaae``fbaaaaf````fbaaaaaaaf`caaaaaaae``fbaaaaf``fbaaabddda`caaaaaaae``fbaaaaf```", -"caaf`````````ffbe`````ffbaaaaaaf`cccddbf`fbaaaaaf````ffff```````fbaaaaf```fbaaaaaf````ffff`````fbaacdddcffbaaaaaf````ffff`````", -"ff`````````````f````````ffffff```cccdda```fffff``````````````````ffff``````fffff````````````````facbaaccbffffff```````````````", -"`````````````````````````````````cccdda`````````````````````````````````````````````````````````acbaabcdda````````````````````", -"`````````````````````````````````cccdda````````````````````````````````````````````````````````acbffbcabda````````````````````", -"`````````````````````````````````cccdda```````````````````````````````````````````````````````abbf``caacda````````````````````", -"`````````````````````````````````cccdda``````````````````````````````````````````````````````accbf``fabcda````````````````````", -"`````````````````````````````````cccdda``````````````````````````````````````````````````````cbabbbbbccdbf````````````````````", -"`````````````````````````````````cccdbf``````````````````````````````````````````````````````caaabcdddbae`````````````````````", -"`````````````````````````````````ccaae```````````````````````````````````````````````````````fbaaaaaaaaf``````````````````````", -"`````````````````````````````````caaf`````````````````````````````````````````````````````````fbaaaaaf````````````````````````", -"`````````````````````````````````ff````````````````````````````````````````````````````````````fffff``````````````````````````" -}; +" .+. .+. ", +" .+ at . .##@. .+@@@. .##@. ", +" .##$@. +#$$$+ .@##$$$@@. +#$$$+ ", +" +@#$$$+ ++@$$$+ .##$@++##$@. +#$$$$+ ", +" +##$$$@. +++#$$@. +#$@+++ at +@$$@. +@#$@#$+ ", +" ###$$$+ .+@#$$+ +#$$+.. at +++@$$@. +##$@@#$+ ", +" ##+@$$+ +@#$$@. +@#$@. . at +++@$$+ #@#$+@#@. ", +" #++#$$#. @@#$@. +@#$@. . at ++#$$#. @@#$++#+ ", +" .@#+@$$+ +@#$$+ +#$@. .@##$$$+ +##$$+@#+ ", +" #++#$$#. @@#$@. +@#$+ ##+@$@. ###$@+#@. ", +" .@#+@$$+ +@#$@. +##$$+ #++++% ###$++#+ .+ .+@@. ", +" #++#$$#.+#$$+ #@#$@. . at ++. ###$##@. .#$. +$$+ .##$$+ ", +" .@#+@$$@#$$@. @@#$+ .. .+@@. #@#$$$+ .+@@. +@$$+ ++$$+ +#$$$@. .+@@.", +" #+++@$$$$@. +##$$+ .@##$@. @@#$$@. .@##$@. ##$$ +@$$ +#$$$@. .@##$@.", +" . at +++@$$@. ###$$+ .@##@++% +##$$$+ .@##@++% ++$$. @#@. +@#$@+% .@##@++% ", +" . at ++#$$+ #@#$$+ .##@+++.+. ###$$@. .##@+++.+. @#@$+ +#$+ +@#$@+. .##@+++. ", +" .+#$$$#. @@#$$+ .@#$@+...##+ ###$$+ .@#$@+...##+ . at +@$++@$@ @@#@. .@#$@+... ", +" +#$@#$$+ +##$$$+ .+ at . .##$@. +#$$+ #@#$$#. .##$@. +#$$+ #+#$#+#$+ +@#$+ .##$@. ", +" +@#@@+@$#. ###$$$+ .@#$+ +#$$@. +#$$$+ +#$$$$+ +#$$@. +#$$$+ ++@$$$. +#$@. +#$$@. ", +" +@#$++++@#@. ##+@$$#. ++#$$+ +#$$@. +@#$$@. +#@#$$$+ +#$$@. +@#$$@. @++@$@ +#$$+ .@#$$@. ", +" +#$@%@++#$$+ #++#$$$+ +#$$$+ +@#$@. +@#@#$+ +#@@#$$$+ .@#$$@. +@#@#$+ .#$$# +&*#$#. .##$$@. ", +" +@#@. .@#+@$#. .@##$$$#. +#$$$@.+#+@$+ .@#@@#$+ +#@@#+@$$#. .#@+#$+ .@#@@#$+ +$@$$ +=-;#$$+ +>,')!+ ", +" +@#@. #+++@#@. ##+@$$$@. +#$$$$+ #++#$#@@##$+@#$#@@#@.#++#$$$@@@@#@++#$#@@##$+@#$#@ ~{+++@@. @]^/(#$$#. +_:<[}| ", +" +#@. . at +++@#@. #+++@$$$@@@@@#@#$$$+ .+@#$$$$$@++#+@#$$@. .@#+@$$$$$$@.+@#$$$$$@++#+@#$$12 345 .#+$6$$78##+@$$@@@90abc ", +" +@#+ . at ++++@+ . at ++++#$$$$$@+@#$$$+ +#+@$$$$@+.#++++++% #+++@$$$@+%+#+@$$$$@+.#++++def$ghi. ++@]jk% #+++@$$$$lmn ", +"+#++. . at ++++ . at ++@++++++++##$$$+ #+++++++% . at ++++. . at +++++++. #+++++++% . at ++++.$$o_ . at +pqr . at +++@$$$s t ", +"#++. ..@% .. at ++++++. ###$$@. . at +++++. .... . at ++++. . at +++++. .... uvw .+++ . at ++#$$$#.. ", +".. . ...... ###$$+ ..... .... ..... . . .+#@++##@. ", +" ###$$+ +#@++@#$$+ ", +" ###$$+ +#@..@#+@$+ ", +" ###$$+ +@@. #++#$+ ", +" ###$$+ +##@. .+@#$+ ", +" ###$$+ #@+@@@@@##$@. ", +" ###$@. #+++@#$$$@+% ", +" ##++% . at ++++++++. ", +" #++. . at +++++. ", +" .. ..... "}; /* keep sorted (for bsearch) [BDyess] */ static W_Image imagearray[] = { --- NEW FILE xgalaxy-hyperspace.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XGalaxy-Hyperspace Comment=Modified version of XGalaxy Exec=xgalaxy-hyperspace Icon=xgalaxy.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; --- NEW FILE xgalaxy.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XGalaxy Comment=Galaxian / Galaga like game with powerups Exec=xgalaxy Icon=xgalaxy.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; --- NEW FILE xgalaxy.spec --- Name: xgalaxy Version: 2.0.34 Release: 2%{?dist} Summary: Galaxian / Galaga like game with powerups Group: Amusements/Games License: GPL URL: http://sourceforge.net/projects/xgalaga/ Source0: http://download.sourceforge.net/xgalaga/xgalaga_%{version}.orig.tar.gz Source1: %{name}.desktop Source2: %{name}-hyperspace.desktop Patch0: http://ftp.debian.org/debian/pool/main/x/xgalaga/xgalaga_2.0.34-34.diff.gz Patch1: %{name}-2.0.34-warn.patch Patch2: %{name}-2.0.34-fullscreen.patch Patch3: %{name}-2.0.34-%{name}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel libXpm-devel libXmu-devel libXxf86vm-devel BuildRequires: desktop-file-utils ImageMagick %description Arcade game for the X Window System inspired by the classic game Galaga. Xgalaxy is a Galaxian like game with additional features to produce a more interesting game. %prep %setup -q -n xgalaga-%{version} # many thanks to Debian for all their excellent work on xgalala %patch0 -p1 -z .deb %patch1 -p1 -z .warn %patch2 -p1 -z .fs %patch3 -p1 -z .%{name} sed -e 's/Debian/Fedora/g' debian/README.Debian > README.fedora cat >> README.fedora << EOF The latest Fedora %{name} package also includes fullscreen support, start %{name} with -window to get the old windowed behavior. You can switch on the fly between window and fullscreen mode with alt+enter. EOF # Change the name everywhere as upstreams name has already been used for a game # much like this one in the past, upstreams use of this is a legal gray area. sed -i 's/xgalaga/xgalaxy/g' `grep -rls xgalaga .` sed -i 's/XGalaga/XGalaxy/g' `grep -rls XGalaga .` %build export CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DXF86VIDMODE" export LDFLAGS=-lXxf86vm ./configure --libdir=%{_libdir} --exec-prefix=%{_bindir} \ --prefix=%{_datadir}/%{name} make %{?_smp_mflags} convert images/player3.xpm %{name}.png %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # move the sound-server binary out of %{_datadir} mv $RPM_BUILD_ROOT%{_datadir}/%{name}/xgal.sndsrv.linux \ $RPM_BUILD_ROOT%{_bindir} ln -s ../../bin/xgal.sndsrv.linux \ $RPM_BUILD_ROOT%{_datadir}/%{name}/xgal.sndsrv.linux # fix useless exec bit chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/*/* # make install doesn't install the manpage mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 install -m 644 xgal.6x $RPM_BUILD_ROOT%{_mandir}/man6/%{name}.6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps install -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES COPYING README README.fedora %{_bindir}/%{name}* %{_bindir}/xgal.sndsrv.linux %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.gz %{_datadir}/applications/fedora-%{name}*.desktop %{_datadir}/icons/hicolor/22x22/apps/%{name}.png %changelog * Mon May 22 2006 Hans de Goede 2.0.34-2 - Change name to xgalaxy because??upstreams name has already been used for a game much like this one in the past, upstreams use of this name thus legally is a bit dodgy. - Add missing BR: libXxf86vm-devel - Stop using %%{__sed} just use sed, to be consistent with the way make, rm, etc. are called. - Package the included manpage. * Thu May 11 2006 Hans de Goede 2.0.34-1 - Initial packaging based on spec file by Michael A. Peters Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 14:31:36 -0000 1.1 +++ .cvsignore 31 May 2006 14:32:28 -0000 1.2 @@ -0,0 +1,2 @@ +xgalaga_2.0.34-34.diff.gz +xgalaga_2.0.34.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 14:31:36 -0000 1.1 +++ sources 31 May 2006 14:32:28 -0000 1.2 @@ -0,0 +1,2 @@ +6543cc0b309402109c85fb43ac69423f xgalaga_2.0.34-34.diff.gz +9f7ee685e9c4741b5f0edc3f91df9510 xgalaga_2.0.34.orig.tar.gz From fedora-extras-commits at redhat.com Wed May 31 15:13:48 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 31 May 2006 08:13:48 -0700 Subject: rpms/workrave/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 workrave.spec, 1.5, 1.6 workrave-1.8.2-cpp-fix.patch, 1.1, NONE Message-ID: <200605311513.k4VFDojl004757@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4736 Modified Files: .cvsignore sources workrave.spec Removed Files: workrave-1.8.2-cpp-fix.patch Log Message: * Wed May 31 2006 Tomas Mraz - 1.8.3-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 10:56:09 -0000 1.3 +++ .cvsignore 31 May 2006 15:13:48 -0000 1.4 @@ -1 +1 @@ -workrave-1.8.2.tar.gz +workrave-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 10:56:09 -0000 1.3 +++ sources 31 May 2006 15:13:48 -0000 1.4 @@ -1 +1 @@ -0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz +e1fe49f6fdf9d725bd21d50e2e0dc20d workrave-1.8.3.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/workrave.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- workrave.spec 15 Feb 2006 11:52:40 -0000 1.5 +++ workrave.spec 31 May 2006 15:13:48 -0000 1.6 @@ -1,6 +1,6 @@ Name: workrave -Version: 1.8.2 -Release: 2%{?dist} +Version: 1.8.3 +Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL @@ -8,7 +8,6 @@ URL: http://workrave.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz Source1: workrave.desktop -Patch1: workrave-1.8.2-cpp-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -27,8 +26,6 @@ %prep %setup -q -%patch1 -p1 -b .cpp-fix - %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -67,6 +64,9 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + * Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 - Rebuilt with updated gcc --- workrave-1.8.2-cpp-fix.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 15:16:14 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 31 May 2006 08:16:14 -0700 Subject: rpms/workrave/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 workrave.spec, 1.5, 1.6 Message-ID: <200605311516.k4VFGGNd004825@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4803 Modified Files: .cvsignore sources workrave.spec Log Message: * Wed May 31 2006 Tomas Mraz - 1.8.3-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 10:56:09 -0000 1.3 +++ .cvsignore 31 May 2006 15:16:14 -0000 1.4 @@ -1 +1 @@ -workrave-1.8.2.tar.gz +workrave-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 10:56:09 -0000 1.3 +++ sources 31 May 2006 15:16:14 -0000 1.4 @@ -1 +1 @@ -0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz +e1fe49f6fdf9d725bd21d50e2e0dc20d workrave-1.8.3.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-5/workrave.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- workrave.spec 15 Feb 2006 11:52:40 -0000 1.5 +++ workrave.spec 31 May 2006 15:16:14 -0000 1.6 @@ -1,6 +1,6 @@ Name: workrave -Version: 1.8.2 -Release: 2%{?dist} +Version: 1.8.3 +Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL @@ -8,7 +8,6 @@ URL: http://workrave.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz Source1: workrave.desktop -Patch1: workrave-1.8.2-cpp-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -27,8 +26,6 @@ %prep %setup -q -%patch1 -p1 -b .cpp-fix - %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -67,6 +64,9 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + * Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 - Rebuilt with updated gcc From fedora-extras-commits at redhat.com Wed May 31 15:16:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 08:16:41 -0700 Subject: rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen.patch, 1.1, 1.2 xgalaxy-2.0.34-xgalaxy.patch, 1.1, 1.2 xgalaxy.spec, 1.1, 1.2 Message-ID: <200605311516.k4VFGhZq004894@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4865 Modified Files: xgalaxy-2.0.34-fullscreen.patch xgalaxy-2.0.34-xgalaxy.patch xgalaxy.spec Log Message: xgalaxy-2.0.34-3 wip xgalaxy-2.0.34-fullscreen.patch: Index: xgalaxy-2.0.34-fullscreen.patch =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-fullscreen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xgalaxy-2.0.34-fullscreen.patch 31 May 2006 14:32:28 -0000 1.1 +++ xgalaxy-2.0.34-fullscreen.patch 31 May 2006 15:16:41 -0000 1.2 @@ -1,5 +1,5 @@ --- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/struct.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/struct.h 2006-05-31 16:56:50.000000000 +0200 @@ -55,6 +55,8 @@ W_Callback handle_button; W_Callback handle_expose; @@ -9,8 +9,8 @@ }; struct stringList { ---- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-22 11:45:35.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/data.c 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/data.c 2006-05-31 16:56:50.000000000 +0200 @@ -158,3 +158,6 @@ int useBuffered = 1; @@ -19,7 +19,7 @@ +struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 }; +#endif --- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-31 16:56:50.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; @@ -44,7 +44,7 @@ #if 0 --- xgalaga-2.0.34/libsprite/mapwindow.c.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-31 16:56:50.000000000 +0200 @@ -13,6 +13,8 @@ if(win->type != WIN_BORDER && win->borderwin) { W_MapWindow(win->borderwin); @@ -90,8 +90,8 @@ } void ---- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-22 11:45:35.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/init.c 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/init.c 2006-05-31 16:56:50.000000000 +0200 @@ -356,6 +356,31 @@ XFreeModifiermap(m); } @@ -134,8 +134,8 @@ +#endif } ---- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-22 11:45:35.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-31 16:56:50.000000000 +0200 @@ -236,6 +236,10 @@ neww->type = type; neww->mapped = 0; @@ -380,7 +380,7 @@ + } +} --- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-31 16:56:50.000000000 +0200 @@ -63,6 +63,7 @@ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); @@ -389,8 +389,8 @@ /* point.c */ void W_DrawPoint(W_Window window, int x, int y, W_Color color); void FlushPointCache(Window win, int color); ---- xgalaga-2.0.34/defs.h.fs 2006-05-22 11:45:35.000000000 +0200 -+++ xgalaga-2.0.34/defs.h 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/defs.h.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/defs.h 2006-05-31 16:56:50.000000000 +0200 @@ -26,8 +26,9 @@ #define TORPDELAY 5 @@ -404,7 +404,7 @@ #define NUMSTARS 30 --- xgalaga-2.0.34/Wlib.h.fs 1998-04-12 08:03:20.000000000 +0200 -+++ xgalaga-2.0.34/Wlib.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/Wlib.h 2006-05-31 16:56:50.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; @@ -428,8 +428,8 @@ #endif /* AMIGA */ #if 0 ---- xgalaga-2.0.34/main.c.fs 2006-05-22 11:45:36.000000000 +0200 -+++ xgalaga-2.0.34/main.c 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/main.c.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/main.c 2006-05-31 16:56:50.000000000 +0200 @@ -32,6 +32,7 @@ static int attacking = 0, maxattacking, entering=0; static int maxetorps = 5, numetorps=0; @@ -532,7 +532,7 @@ /* W_AutoRepeatOff();*/ --- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200 -+++ xgalaga-2.0.34/Wproto.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/Wproto.h 2006-05-31 16:56:50.000000000 +0200 @@ -63,6 +63,7 @@ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); @@ -541,3 +541,51 @@ /* point.c */ void W_DrawPoint(W_Window window, int x, int y, W_Color color); void FlushPointCache(Window win, int color); +--- xgalaga-2.0.34/xgal.6x.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/xgal.6x 2006-05-31 16:56:50.000000000 +0200 +@@ -4,11 +4,11 @@ + .SH SYNOPSIS + .B xgalaga + [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] +-[-noclipmask] [-nouseor] [-nostars] ++[-noclipmask] [-nouseor] [-nostars] [-window] + .P + .B xgalaga-hyperspace + [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] +-[-noclipmask] [-nouseor] [-nostars] ++[-noclipmask] [-nouseor] [-nostars] [-window] + .SH INSTRUCTIONS + .LP + It's Galaga, you know how to play Galaga, stop bothering me. +@@ -35,6 +35,9 @@ + .B \-nosound + Turn sound OFF + .TP 8 ++.B \-window ++Run in a window, not full screen. Full screen is the default. ++.TP 8 + .B \-b + Turn buffered mode off, use this if it runs too slowly. Will cause + flicker, maybe lots, maybe only a little. +@@ -68,6 +71,8 @@ + k - Use keyboard control + .TP 8 + x - use your shields (xgalaga-hyperspace only) ++.TP 8 ++alt-enter - Toggle full screen node. + .SH "SEE ALSO" + Xgalaga home page + .RI < http://rumsey.org/xgal.html > +--- xgalaga-2.0.34/pathfile.c.fs 2006-05-31 17:08:48.000000000 +0200 ++++ xgalaga-2.0.34/pathfile.c 2006-05-31 17:09:37.000000000 +0200 +@@ -387,8 +387,8 @@ + + void get_xy(int anum, int* x, int* y) + { +- *x = pathinfo[al_paths[anum]].startx; +- *y = pathinfo[al_paths[anum]].starty; ++ *x = (WINWIDTH * pathinfo[al_paths[anum]].startx) / 400; ++ *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500; + } + + int get_delay(int anum) xgalaxy-2.0.34-xgalaxy.patch: Index: xgalaxy-2.0.34-xgalaxy.patch =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-xgalaxy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 14:32:28 -0000 1.1 +++ xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 15:16:41 -0000 1.2 @@ -34,7 +34,7 @@ .B xgalaxy [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] @@ -11,9 +11,9 @@ - [-noclipmask] [-nouseor] [-nostars] + [-noclipmask] [-nouseor] [-nostars] [-window] .SH INSTRUCTIONS .LP -It's Galaga, you know how to play Galaga, stop bothering me. @@ -46,9 +46,9 @@ .P The xgalaxy-hyperspace version features some new weapons and different gameplay. -@@ -69,7 +69,7 @@ +@@ -71,7 +71,7 @@ .TP 8 - x - use your shields (xgalaxy-hyperspace only) + alt-enter - Toggle full screen node. .SH "SEE ALSO" -Xgalaga home page +XGalaxy home page Index: xgalaxy.spec =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xgalaxy.spec 31 May 2006 14:32:28 -0000 1.1 +++ xgalaxy.spec 31 May 2006 15:16:41 -0000 1.2 @@ -1,6 +1,6 @@ Name: xgalaxy Version: 2.0.34 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Galaxian / Galaga like game with powerups Group: Amusements/Games License: GPL @@ -97,6 +97,9 @@ %changelog +* Mon May 22 2006 Hans de Goede 2.0.34-3 +- Documented the new -window switch in the manpage. + * Mon May 22 2006 Hans de Goede 2.0.34-2 - Change name to xgalaxy because??upstreams name has already been used for a game much like this one in the past, upstreams use of this name thus legally From fedora-extras-commits at redhat.com Wed May 31 15:21:51 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 31 May 2006 08:21:51 -0700 Subject: rpms/workrave/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 workrave.spec, 1.2, 1.3 Message-ID: <200605311521.k4VFLrS7004969@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4947 Modified Files: .cvsignore sources workrave.spec Log Message: * Wed May 31 2006 Tomas Mraz - 1.8.3-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 11:11:58 -0000 1.3 +++ .cvsignore 31 May 2006 15:21:51 -0000 1.4 @@ -1 +1 @@ -workrave-1.8.2.tar.gz +workrave-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 11:11:58 -0000 1.3 +++ sources 31 May 2006 15:21:51 -0000 1.4 @@ -1 +1 @@ -0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz +e1fe49f6fdf9d725bd21d50e2e0dc20d workrave-1.8.3.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/workrave.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workrave.spec 2 Feb 2006 11:11:58 -0000 1.2 +++ workrave.spec 31 May 2006 15:21:51 -0000 1.3 @@ -1,5 +1,5 @@ Name: workrave -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -8,12 +8,14 @@ URL: http://workrave.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz Source1: workrave.desktop + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: gnet2-devel BuildRequires: libgnomeuimm26-devel BuildRequires: gnome-panel-devel BuildRequires: desktop-file-utils +BuildRequires: xorg-x11-devel %description Workrave is a program that assists in the recovery and prevention of @@ -61,8 +63,16 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + +* Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 +- Rebuilt with updated gcc + * Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 - Updated version, dropped obsolete patch +- Added missing buildrequires for modular X +- Fixed compilation on gcc-4.1 * Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 - Added a desktop file From fedora-extras-commits at redhat.com Wed May 31 15:22:28 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 31 May 2006 08:22:28 -0700 Subject: rpms/workrave/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 workrave.spec, 1.2, 1.3 Message-ID: <200605311522.k4VFMUVm005040@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5019 Modified Files: .cvsignore sources workrave.spec Log Message: * Wed May 31 2006 Tomas Mraz - 1.8.3-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 11:28:26 -0000 1.3 +++ .cvsignore 31 May 2006 15:22:28 -0000 1.4 @@ -1 +1 @@ -workrave-1.8.2.tar.gz +workrave-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 11:28:26 -0000 1.3 +++ sources 31 May 2006 15:22:28 -0000 1.4 @@ -1 +1 @@ -0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz +e1fe49f6fdf9d725bd21d50e2e0dc20d workrave-1.8.3.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/workrave.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workrave.spec 2 Feb 2006 11:28:26 -0000 1.2 +++ workrave.spec 31 May 2006 15:22:28 -0000 1.3 @@ -1,5 +1,5 @@ Name: workrave -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -8,12 +8,14 @@ URL: http://workrave.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz Source1: workrave.desktop + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: gnet2-devel BuildRequires: libgnomeuimm26-devel BuildRequires: gnome-panel-devel BuildRequires: desktop-file-utils +BuildRequires: xorg-x11-devel %description Workrave is a program that assists in the recovery and prevention of @@ -61,8 +63,16 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + +* Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 +- Rebuilt with updated gcc + * Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 - Updated version, dropped obsolete patch +- Added missing buildrequires for modular X +- Fixed compilation on gcc-4.1 * Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 - Added a desktop file From fedora-extras-commits at redhat.com Wed May 31 15:38:38 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 08:38:38 -0700 Subject: rpms/paraview/FC-4 paraview.spec,1.2,1.3 Message-ID: <200605311538.k4VFceaQ005188@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/paraview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5169 Modified Files: paraview.spec Log Message: Use VTK_OPENGL_HAS_OSMESA on FC4 Index: paraview.spec =================================================================== RCS file: /cvs/extras/rpms/paraview/FC-4/paraview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- paraview.spec 17 Apr 2006 20:43:43 -0000 1.2 +++ paraview.spec 31 May 2006 15:38:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: paraview Version: 2.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -118,7 +118,7 @@ -DTCL_LIBRARY:PATH=tcl \ -DTK_LIBRARY:PATH=tk \ -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ - -DVTK_USE_MAGLED_MESA:BOOL=ON \ + -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -153,7 +153,7 @@ -DVTK_USE_MPI:BOOL=ON \ -DMPI_INCLUDE_PATH:PATH=%{_includedir}/lam \ -DMPI_LIBRARY:STRING="-L%{_libdir}/lam -llammpio -llammpi++ -llamf77mpi -lmpi -llam -laio -lutil -ldl" \ - -DVTK_USE_MAGLED_MESA:BOOL=ON \ + -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -308,6 +308,9 @@ %changelog +* Tue May 30 2006 - Orion Poplawski - 2.4.3-6 +- Use VTK_OPENGL_HAS_OSMESA on FC4 + * Wed Apr 12 2006 - Orion Poplawski - 2.4.3-5 - Cleanup permissions From fedora-extras-commits at redhat.com Wed May 31 15:41:54 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 31 May 2006 08:41:54 -0700 Subject: rpms/xscreensaver/devel xscreensaver-5.00-browser-setting.patch, 1.1, 1.2 xscreensaver.spec, 1.2, 1.3 Message-ID: <200605311541.k4VFfu8R005266@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5244 Modified Files: xscreensaver-5.00-browser-setting.patch xscreensaver.spec Log Message: * Wed May 31 2006 Mamoru Tasaka - 1:5.00-3 - Fix browser option patch. xscreensaver-5.00-browser-setting.patch: Index: xscreensaver-5.00-browser-setting.patch =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.00-browser-setting.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xscreensaver-5.00-browser-setting.patch 31 May 2006 14:13:44 -0000 1.1 +++ xscreensaver-5.00-browser-setting.patch 31 May 2006 15:41:54 -0000 1.2 @@ -1,47 +1,6 @@ --- xscreensaver-5.00/configure.in.browser-setting 2006-05-24 07:07:00.000000000 +0900 -+++ xscreensaver-5.00/configure.in 2006-05-31 03:42:39.000000000 +0900 -@@ -1793,6 +1793,40 @@ - - ############################################################################### - # -+# Whether to allow root password to unblank. -+# -+############################################################################### -+AC_ARG_ENABLE(root-passwd, [ -+ --enable-root-passwd Allow root passwd to unlock screen. -+ --disable-root-passwd Do not allow that.], -+ [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) -+if test "$enable_root_passwd" = yes; then -+ AC_DEFINE(ALLOW_ROOT_PASSWD) -+ true -+elif test "$enable_root_passwd" != no; then -+ echo "error: something wrong with root-passwd option. Check configure.in ." -+ exit 1 -+fi -+ -+############################################################################### -+# -+# Whether to allow root password to unblank. -+# -+############################################################################### -+AC_ARG_ENABLE(root-passwd, [ -+ --enable-root-passwd Allow root passwd to unlock screen. -+ --disable-root-passwd Do not allow that.], -+ [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) -+if test "$enable_root_passwd" = yes; then -+ AC_DEFINE(ALLOW_ROOT_PASSWD) -+ true -+elif test "$enable_root_passwd" != no; then -+ echo "error: something wrong with root-passwd option. Check configure.in ." -+ exit 1 -+fi -+ -+############################################################################### -+# - # Check for PAM. - # - ############################################################################### -@@ -2430,6 +2464,7 @@ ++++ xscreensaver-5.00/configure.in 2006-06-01 00:25:45.000000000 +0900 +@@ -2430,6 +2430,7 @@ # Check for the various Gnome help and URL loading programs. # @@ -49,7 +8,7 @@ if test "$have_gtk" = yes; then AC_CHECK_PROGS(gnome_open_program, gnome-open) AC_CHECK_PROGS(gnome_url_show_program, gnome-url-show) -@@ -3359,6 +3394,45 @@ +@@ -3359,6 +3360,45 @@ ############################################################################### # @@ -95,7 +54,7 @@ # Check whether it's ok to install some hacks as setuid (e.g., "sonar") # This should be safe, but let's give people the option. # -@@ -3579,6 +3653,7 @@ +@@ -3579,6 +3619,7 @@ AC_SUBST(DEFAULT_IMAGES_P) AC_SUBST(DEFAULT_IMAGE_DIRECTORY) AC_SUBST(DEFAULT_TEXT_FILE) @@ -104,7 +63,7 @@ AC_SUBST(OBJCC) AC_SUBST(EXES_OSX) --- xscreensaver-5.00/driver/XScreenSaver.ad.in.browser-setting 2006-05-24 08:01:34.000000000 +0900 -+++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-05-31 03:44:31.000000000 +0900 ++++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-06-01 00:24:49.000000000 +0900 @@ -93,7 +93,7 @@ ! ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3) Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xscreensaver.spec 31 May 2006 14:13:44 -0000 1.2 +++ xscreensaver.spec 31 May 2006 15:41:54 -0000 1.3 @@ -1,7 +1,7 @@ %define name xscreensaver %define version 5.00 -%define fedora_rel 2 +%define fedora_rel 3 %define fedora_ver 5.89 %define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt @@ -237,6 +237,9 @@ %defattr(-,root,root) %changelog +* Wed May 31 2006 Mamoru Tasaka - 1:5.00-3 +- Fix browser option patch. + * Wed May 31 2006 Mamoru Tasaka - 1:5.00-2 - Change the default text. - Rewrite root passwd patch. From fedora-extras-commits at redhat.com Wed May 31 16:08:56 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 31 May 2006 09:08:56 -0700 Subject: rpms/bsd-games/devel bsd-games.spec,1.4,1.5 Message-ID: <200605311608.k4VG8wwf007770@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7751 Modified Files: bsd-games.spec Log Message: Added missing BR: flex Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bsd-games.spec 2 May 2006 00:00:30 -0000 1.4 +++ bsd-games.spec 31 May 2006 16:08:56 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 10%{?dist} +Release: 12%{?dist} License: BSD Group: Amusements/Games URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -18,14 +18,16 @@ Patch5: bsd-games-2.17-tetrisgid.patch Patch6: bsd-games-2.17-hackgid.patch Patch7: bsd-games-2.17-phantasiagid.patch +# Add patch for monop->mpoly man page +Patch8: bsd-games-2.17-monop-rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel libtermcap-devel words +BuildRequires: ncurses-devel libtermcap-devel words flex Requires(Pre): /usr/sbin/groupadd %description Bsd-games includes adventure, arithmetic, atc, backgammon, battlestar, bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku, -hunt, mille, monop, morse, number, phantasia, pig, pom, ppt, primes, +hunt, mille, mpoly, morse, number, phantasia, pig, pom, ppt, primes, quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon, tetris-bsd, trek, wargames, worm, worms and wump. @@ -40,6 +42,7 @@ %patch5 -p1 -b .tetrisgid %patch6 -p1 -b .hackgid %patch7 -p1 -b .phantasiagid +%patch8 -p1 -b .monop.rename %build # We include a templatized configuration settings file to set @@ -71,6 +74,7 @@ # Change the binary name for monop to prevent a conflict with the mono-devel # package mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly +mv $RPM_BUILD_ROOT/%{_mandir}/man6/monop.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/mpoly.6.gz # Remove this doc file. We're copying it to a different location for Fedora. rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me @@ -149,6 +153,12 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed May 31 2006 Wart 2.17-12 +- Added missing BR: flex + +* Tue May 2 2006 Wart 2.17-11 +- Rename monop man page to match the renamed executable. + * Mon May 1 2006 Wart 2.17-10 - Remove banner (conflict with a similar package in FE) From fedora-extras-commits at redhat.com Wed May 31 16:09:16 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 09:09:16 -0700 Subject: rpms/fillets-ng/devel fillets-ng-0.7.3-lua-pkgconfig.patch, NONE, 1.1 fillets-ng.spec, 1.6, 1.7 Message-ID: <200605311609.k4VG9IXK007826@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/fillets-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7753 Modified Files: fillets-ng.spec Added Files: fillets-ng-0.7.3-lua-pkgconfig.patch Log Message: Patch build to use pkgconfig for lua detection instead of the no longer provided lua-config script. fillets-ng-0.7.3-lua-pkgconfig.patch: --- NEW FILE fillets-ng-0.7.3-lua-pkgconfig.patch --- diff -Naupr fillets-ng-0.7.3.orig/configure.in fillets-ng-0.7.3/configure.in --- fillets-ng-0.7.3.orig/configure.in 2005-10-04 20:11:00.000000000 +0200 +++ fillets-ng-0.7.3/configure.in 2006-05-31 17:49:58.000000000 +0200 @@ -22,41 +22,9 @@ AC_CHECK_LIB(m, sin, LIBS="$LIBS -lm") ################################################### # Check for lua and define LUA_CFLAGS and LUA_LIBS - -dnl ---- lua check ------------- (stolen from Stratagus) -AC_ARG_WITH(lua, [ --with-lua=PFX Prefix where Lua is installed], - LUAPFX="$withval", LUAPFX="") -if test "x$LUAPFX" != x ; then - LUA_CFLAGS="-I$LUAPFX" - LUA_LIBS="-L$LUAPFX -llua -llualib" -else -dnl Debian, and possibly other systems, include this script... - AC_CHECK_PROGS(LUACONFIG, [lua-config lua-config50 lua-config5.0], "") - if test "x$LUACONFIG" != x; then - LUA_CFLAGS="`[$LUACONFIG --include]`" - LUA_LIBS="`[$LUACONFIG --static]`" - else dnl ...otherwise, attempt to guess - LUA_CFLAGS="" - LUA_LIBS="" - AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua", - [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50", - [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0", - [AC_MSG_ERROR([*** Lua5 is required. - Try --with-lua=PREFIX - You can download lua from http://www.lua.org])], - $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS) - - AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib", - [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib50", - [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib5.0", - [AC_MSG_ERROR([*** Lualib5 is required. - You can download lua from http://www.lua.org])], - $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS) - fi -fi +PKG_CHECK_MODULES(LUA, lua, [have_lua="yes"], [have_lua="no"]) AC_SUBST(LUA_CFLAGS) AC_SUBST(LUA_LIBS) -dnl ---- end of lua check ------ ################################################### Index: fillets-ng.spec =================================================================== RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fillets-ng.spec 6 Mar 2006 15:41:33 -0000 1.6 +++ fillets-ng.spec 31 May 2006 16:09:16 -0000 1.7 @@ -1,17 +1,20 @@ Summary: Fish Fillets Next Generation, a puzzle game with 70 levels Name: fillets-ng Version: 0.7.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games URL: http://fillets.sourceforge.net/ Source0: http://dl.sf.net/fillets/fillets-ng-%{version}.tar.gz Source1: fillets.desktop Source2: fillets.png +Patch0: fillets-ng-0.7.3-lua-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: fillets-ng-data >= 0.7.1 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel BuildRequires: lua-devel, fribidi-devel, desktop-file-utils +# Required for autoreconf +BuildRequires: autoconf, automake, libtool %description Fish Fillets is strictly a puzzle game. The goal in every of the @@ -24,6 +27,8 @@ %prep %setup -q +%patch0 -p1 -b .lua-pkgconfig +autoreconf --install --force %build @@ -66,6 +71,10 @@ %changelog +* Wed May 31 2006 Matthias Saou 0.7.3-4 +- Add patch to change lua detection from lua-config to pkgconfig since the + latest lua packages no longer provide the config script. + * Mon Mar 6 2006 Matthias Saou 0.7.3-3 - FC5 rebuild. From fedora-extras-commits at redhat.com Wed May 31 16:11:12 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 31 May 2006 09:11:12 -0700 Subject: rpms/bsd-games/devel bsd-games-2.17-monop-rename.patch,NONE,1.1 Message-ID: <200605311611.k4VGBE6H007904@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7886 Added Files: bsd-games-2.17-monop-rename.patch Log Message: Added missing patch bsd-games-2.17-monop-rename.patch: --- NEW FILE bsd-games-2.17-monop-rename.patch --- --- bsd-games-2.17.new/monop/monop.6.in 2003-12-16 18:47:37.000000000 -0800 +++ bsd-games-2.17.new/monop/monop.6.in.new 2006-05-03 07:33:20.000000000 -0700 @@ -30,10 +30,10 @@ .\" @(#)monop.6 6.5 (Berkeley) 3/25/93 .\" .Dd March 25, 1993 -.Dt MONOP 6 +.Dt MPOLY 6 .Os .Sh NAME -.Nm monop +.Nm mpoly .Nd Monopoly game .Sh SYNOPSIS .Nm From fedora-extras-commits at redhat.com Wed May 31 17:14:15 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:14:15 -0700 Subject: rpms/AGReader - New directory Message-ID: <200605311714.k4VHEH0c010477@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10456/AGReader Log Message: Directory /cvs/extras/rpms/AGReader added to the repository From fedora-extras-commits at redhat.com Wed May 31 17:14:15 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:14:15 -0700 Subject: rpms/AGReader/devel - New directory Message-ID: <200605311714.k4VHEHhq010480@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10456/AGReader/devel Log Message: Directory /cvs/extras/rpms/AGReader/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 17:14:35 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:14:35 -0700 Subject: rpms/AGReader Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605311714.k4VHEbio010534@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501 Added Files: Makefile import.log Log Message: Setup of module AGReader --- NEW FILE Makefile --- # Top level Makefile for module AGReader all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 17:14:35 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:14:35 -0700 Subject: rpms/AGReader/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605311714.k4VHEbVq010537@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module AGReader --- NEW 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 May 31 17:15:21 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:15:21 -0700 Subject: rpms/AGReader import.log,1.1,1.2 Message-ID: <200605311715.k4VHFNnm010613@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10578 Modified Files: import.log Log Message: auto-import AGReader-1.1-9 on branch devel from AGReader-1.1-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/AGReader/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 17:14:34 -0000 1.1 +++ import.log 31 May 2006 17:15:20 -0000 1.2 @@ -0,0 +1 @@ +AGReader-1_1-9:HEAD:AGReader-1.1-9.src.rpm:1149095666 From fedora-extras-commits at redhat.com Wed May 31 17:15:21 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:15:21 -0700 Subject: rpms/AGReader/devel AGReader-1.1-gcc41.patch, NONE, 1.1 AGReader-1.1-keys.patch, NONE, 1.1 AGReader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605311715.k4VHFNm3010622@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10578/devel Modified Files: .cvsignore sources Added Files: AGReader-1.1-gcc41.patch AGReader-1.1-keys.patch AGReader.spec Log Message: auto-import AGReader-1.1-9 on branch devel from AGReader-1.1-9.src.rpm AGReader-1.1-gcc41.patch: --- NEW FILE AGReader-1.1-gcc41.patch --- --- AGReader/Sources/Text.h.gcc41 2001-12-05 21:42:45.000000000 +0100 +++ AGReader/Sources/Text.h 2006-05-27 10:48:23.000000000 +0200 @@ -21,4 +21,6 @@ /** Create a AGFile directly from a char stream **/ AGFile CreateTextFromStream(char *stream, char *title); +void AdjustColors(AGNode node); + #endif --- AGReader/Sources/Text.c.gcc41 2001-12-05 22:10:33.000000000 +0100 +++ AGReader/Sources/Text.c 2006-05-27 10:53:25.000000000 +0200 @@ -8,6 +8,7 @@ #include "AGNodes.h" #include "AGObj.h" #include "Text.h" +#include "Input.h" /** Redefines only functions that differs from AG_lib.c **/ @@ -15,11 +16,11 @@ AGFile CreateTextNodes(char *filename) { AGFile new; - if( new = CreateFile( filename ) ) + if( (new = CreateFile( filename )) ) { AGNode node; /* Only one node is defined for text file */ - if( (AGNode) new->Content = node = (AGNode) malloc(sizeof(*node)) ) + if( (new->Content = (AGList)(node = (AGNode) malloc(sizeof(*node)))) ) { memset(node, 0, sizeof(*node)); node->name = "MAIN"; @@ -45,7 +46,7 @@ { AGFile new; - if( new = CreateTextNodes( NULL ) ) + if( (new = CreateTextNodes( NULL )) ) { AGNode node = (AGNode) new->Content; node->start = new->Buffer = stream; @@ -102,7 +103,6 @@ static AGPara par; static AGWord new; char *buf, *p; - long nb; InitContext(&AGC, JM_NORMAL); /* Alloc a first paragraph */ --- /dev/null 2006-05-27 07:46:48.810857750 +0200 +++ AGReader/Sources/Input.h 2006-05-27 10:48:23.000000000 +0200 @@ -0,0 +1,11 @@ +#ifndef INPUT_H +#define INPUT_H + +#include "AGNodes.h" + +void Prompt( char *str ); +void SetTopLine( AGNode node ); +void ThrowError(char *msg, char *param); +void ProcessKeys( void ); + +#endif --- AGReader/Sources/AGNodes.h.gcc41 2001-12-05 21:48:46.000000000 +0100 +++ AGReader/Sources/AGNodes.h 2006-05-27 10:48:23.000000000 +0200 @@ -124,8 +124,10 @@ char tabstop(short pos); /* Amount of spaces to add to reach tabstop */ void RenderAGNode(AGPara, short nbl, short left, short wid, char mode); +void RenderLine(AGPara para, short start, short max, char ins_mode); void ScrollDisplay(struct scrpos *, short pos); void AGFileInfo(AGFile, char *obj, char *objs); +char *FindAGLinkInfo(AGLink link, char *format); /*** Special character may trashed the display ***/ AGWord DisableSpecialChar(AGPara par,AGWord old, unsigned char); --- AGReader/Sources/Input.c.gcc41 2001-07-14 15:13:34.000000000 +0200 +++ AGReader/Sources/Input.c 2006-05-27 10:48:23.000000000 +0200 @@ -3,11 +3,13 @@ ** by T.Pierron, 11/9/2000, free software ** ****************************************************/ +#include #include "AGReader.h" #include "AGNodes.h" #include "Navig.h" #include "IO_tty.h" #include "Help.h" +#include "Text.h" static char InfDisp = 0; /* 1 if information screen is displayed */ static char TmpBuf[80]; /* Buffer used for various output */ @@ -32,7 +34,7 @@ printf("[%d;H%4d%%%*s[%d;6H", terminfo.height,(node && node->maxlines > terminfo.height ? - (100 * node->line) / (node->maxlines-terminfo.height+1) : 100), + (100 * node->line) / ((int)node->maxlines-terminfo.height+1) : 100), terminfo.width-5,str,terminfo.height ); if( svg[0] ) memcpy(str + plen, svg, 2); @@ -81,6 +83,7 @@ void ThrowError(char *msg, char *param) { char *d, *s; + int i; /* silence warnings */ /* Frequently error message encountered */ if(msg == ERROR_NO_FREE_STORE) msg = "Not enough memory!"; @@ -95,7 +98,7 @@ /* If GUI isn't already set, display on stderr */ if( is_rawmode() ) *d='\0',Prompt(TmpBuf); else /* fputs doesn't write any \n */ - *d++='\n',write(2,TmpBuf,d-TmpBuf); + *d++='\n',i=write(2,TmpBuf,d-TmpBuf); } /*** Toggle display between node and information ***/ @@ -106,7 +109,7 @@ if( InfDisp ) inf->node = old; else /* The node may not yet exists */ - if(strinfo = (AGList) FindAGNode(inf->file, STR_INFONAME)) + if( (strinfo = (AGList) FindAGNode(inf->file, STR_INFONAME)) ) old = inf->node, inf->node = strinfo; else return; @@ -266,7 +269,7 @@ case '=': /* Display line statistics */ sprintf(TmpBuf,"line %d of %d ",AGNODE(&terminfo)->line+1, - AGNODE(&terminfo)->maxlines); + (int)AGNODE(&terminfo)->maxlines); Prompt(TmpBuf); break; case 'b': case 'B': --- AGReader/Sources/Navig.h.gcc41 2001-10-15 12:47:01.000000000 +0200 +++ AGReader/Sources/Navig.h 2006-05-27 10:48:23.000000000 +0200 @@ -30,6 +30,8 @@ /** Search for node/file pointed by link and display it **/ int Navigate( char *GuideName, AGLink ); +void SetActiveLine( AGNode node ); + /** Function use to create file / node **/ typedef AGFile (*pfnCreateNodes)( char *path ); typedef char (*pfnCreateWords)( AGNode node ); --- AGReader/Sources/AGReader.h.gcc41 2001-03-21 11:28:39.000000000 +0100 +++ AGReader/Sources/AGReader.h 2006-05-27 10:48:23.000000000 +0200 @@ -60,5 +60,7 @@ #define QUIT_OK 0 #define QUIT_ERROR 1 +void quit(char *msg, int status); + #endif --- AGReader/Sources/main.c.gcc41 2001-12-05 21:03:14.000000000 +0100 +++ AGReader/Sources/main.c 2006-05-27 10:48:23.000000000 +0200 @@ -10,6 +10,7 @@ #include "AGNodes.h" #include "IO_tty.h" #include "Navig.h" +#include "Input.h" struct scrpos terminfo; /* Information about visited node & screen */ @@ -96,5 +97,7 @@ } else /* Errors will be displayed in Navigate() */ quit(NULL,QUIT_ERROR); + + return 0; } --- AGReader/Sources/Navigate.c.gcc41 2001-10-16 15:24:18.000000000 +0200 +++ AGReader/Sources/Navigate.c 2006-05-27 10:56:17.000000000 +0200 @@ -12,6 +12,8 @@ #include "AGObj.h" #include "Navig.h" #include "Text.h" +#include "Input.h" +#include "IO_tty.h" extern char buffer[ 512 ]; extern short *tabs; @@ -25,15 +27,15 @@ /*** System-specific execute command ***/ int myExecute( char *fmt, char *arg ) { - char *space, *drive, *dest; + char *space, *drive, *dest = NULL; int pid; /* Command comes from AmigaOS, try to convert to Unix */ if( strncasecmp(fmt, "Run ", 4) == 0 ) fmt += 4; /* Get command name */ - if( space = strchr(fmt, ' ') ) *space = 0; + if( (space = strchr(fmt, ' ')) ) *space = 0; /* Get device specifier */ - if( drive = strchr(fmt, ':') ) { + if( (drive = strchr(fmt, ':')) ) { *drive = 0; if(NULL != (dest = getenv( fmt )) || NULL != (dest = getenv( AGR_PATH_ENV_NAME ))) @@ -229,7 +231,7 @@ /*** Try to locate a file, depending where program runs ***/ char *LocateFile( char *guidename, char *filename ) { - char *p, *path, isdev=0; + char *p = NULL, *path, isdev=0; int fd; /* Retrieve directory where remains the document */ @@ -289,7 +291,7 @@ if( (*path = LocateFile( GuideName, link->file )) != NULL ) { extern char AGHeader[]; - unsigned char *p; + char *p; /* Read a few bytes from this file */ if( (fd = open(*path,O_RDONLY)) == -1 ) @@ -317,9 +319,10 @@ /* Check for a few bytes, whether it's ASCII text */ for(p=buffer+len-1; (char *)p>=buffer; p--) { + unsigned char u = *p; /* Non-ISO-8859-1 characters */ - if( *p>126 && *p<160 ) break; - if( *p<32 && *p!='\r' && *p!='\n' && *p!='\t' && *p!=27) break; + if( u>126 && u<160 ) break; + if( u<32 && u!='\r' && u!='\n' && u!='\t' && u!=27) break; } if((char *)pprev ) { @@ -417,8 +419,11 @@ SetActiveLine(node); /* Set the first displayed line */ FindNth(node, link->line, &terminfo); - if(node != AGNODE(&terminfo)); - PushAGNode(terminfo.file, AGNODE(&terminfo) = node, 0); + if(node != (AGNode)terminfo.node) { + terminfo.node = node; + PushAGNode(terminfo.file, + terminfo.node, 0); + } if( is_rawmode() ) ReRenderAGNode(); } else ThrowError("Can't find node `%s'.", link->node); return 1; --- AGReader/Sources/IO_tty.c.gcc41 2001-12-05 20:59:30.000000000 +0100 +++ AGReader/Sources/IO_tty.c 2006-05-27 10:48:23.000000000 +0200 @@ -4,6 +4,7 @@ ***** but greatly simplified by T.Pierron **** ****************************************************************/ +#include #include #include #include @@ -44,6 +45,7 @@ { static struct termios save_term; struct termios s; + int i; /* silence warnings */ /* Do not set twice the same mode!! */ if (old_st == on) return; old_st = on; @@ -121,12 +123,12 @@ s.c_cc[VTIME] = 0; /* let's enter in private mode */ - write(1,SET_PRIV,sizeof(SET_PRIV)-1); + i = write(1,SET_PRIV,sizeof(SET_PRIV)-1); } else { /* Restore saved modes */ s = save_term; /* and old display mode */ - write(1,SET_PUB,sizeof(SET_PUB)-1); + i = write(1,SET_PUB,sizeof(SET_PUB)-1); } tcsetattr(2, TCSADRAIN, &s); } @@ -185,7 +187,8 @@ char getchr(void) { char c; - read(tty, &c, sizeof(c)); + if (read(tty, &c, sizeof(c)) != sizeof(c)) + return 0; return c; } --- AGReader/Sources/Makefile.gcc41 2001-07-10 12:41:17.000000000 +0200 +++ AGReader/Sources/Makefile 2006-05-27 10:48:23.000000000 +0200 @@ -21,7 +21,7 @@ $(CC) $(OBJECTS) -o $(EXE) $(LIBS) -g final: $(OBJECTS) - $(CC) $(OBJECTS) -o $(EXE) $(LIBS) -s + $(CC) $(OBJECTS) -o $(EXE) $(LIBS) install: cp $(EXE) $(HOME)/bin -f --- AGReader/Sources/AGObj.c.gcc41 2001-05-10 23:01:03.000000000 +0200 +++ AGReader/Sources/AGObj.c 2006-05-27 10:48:23.000000000 +0200 @@ -5,6 +5,8 @@ ** Started on 13/2/2001, free software under GNU PL ** ********************************************************/ +#include +#include #include "AGReader.h" #include "AGNodes.h" #include "AGObj.h" @@ -51,7 +53,7 @@ /* Makes them appear like web-page anchor */ new->style = DEF_LINKSTYLE; - new->fgpen = LinkColor[ new->link->type ]; + new->fgpen = LinkColor[ (int)new->link->type ]; /* Search content of command/node */ if( new->link->type != UNKNOWN_TYPE ) FindAGLinkInfo(new->link, p+strlen(LinkTokens[new->link->type-1])); --- AGReader/Sources/AGObj.h.gcc41 2001-05-10 22:43:29.000000000 +0200 +++ AGReader/Sources/AGObj.h 2006-05-27 10:48:23.000000000 +0200 @@ -69,6 +69,8 @@ /*** Object containing series of tab stops in spaces ***/ AGWord NewTabs(AGPara par, AGWord old, char *fmt); +void InsertAGWord(AGPara par, AGWord new, AGWord ins); + /** pfnInit parameter for NewObject ***/ void WrapOFF(AGObj, ObjPara *); void ClearTabs(AGObj, ObjPara *); --- AGReader/Sources/AG_lib.c.gcc41 2001-12-05 22:00:24.000000000 +0100 +++ AGReader/Sources/AG_lib.c 2006-05-27 10:51:25.000000000 +0200 @@ -7,11 +7,13 @@ #include #include +#include #include "AGReader.h" #include "AGNodes.h" #include "AGObj.h" #include "IO_tty.h" #include "Version.h" +#include "Input.h" /** Global buffer used to render one line of text **/ char buffer[512], ts, bgpen; @@ -350,7 +352,7 @@ *buf = '\0'; if(p < buf) new = NewWord(par,new,p,&AGC); p = ++buf; - } else if(*buf == '@') /* Start of an AmigaGuide style modifier */ + } else if(*buf == '@') { /* Start of an AmigaGuide style modifier */ if( buf[1] == '{' ) { char **token; *buf='\0'; @@ -426,9 +428,8 @@ ** already processed in CreateAGNodes(), so just skip them. */ while(*buf != '\n') buf++; *buf='\0'; p = buf+1; - } + } } } - eof: for(; PREV(par); par = PREV(par)); node->AGContent = node->Shown = par; node->column = node->line = 0; @@ -441,7 +442,7 @@ if(len > width) len = width; switch( (unsigned char)par->align & ~JMF_PREVIOUS ) { - case JMF_CENTER: par->spaces = (width - len + indent >> 1); break; + case JMF_CENTER: par->spaces = (width - len + indent) >> 1; break; case JMF_RIGHT: par->spaces = width - len; break; default: par->spaces = indent + par->alinea; } @@ -453,7 +454,7 @@ { AGPara new, next = NEXT(par); AGWord wrd; - if( new = NewPara(par, NULL) ) + if( (new = NewPara(par, NULL)) ) { if(next) PREV(next) = new, NEXT(new) = next; /* Paragraph's indenting properties equal previous */ @@ -469,7 +470,7 @@ } else /* Split the whole word */ { - if(wrd = PREV(cut)) NEXT(wrd) = NULL; + if( (wrd = PREV(cut)) ) NEXT(wrd) = NULL; new->line = cut; PREV(cut) = NULL; } } @@ -485,8 +486,8 @@ if( wrd->style & FSF_SPLITTED ) wrd = FreeSplit(wrd); else if(isspace( wrd->data[-1] )) wrd->data--; for(ins=((AGPara)PREV(par))->line; NEXT(ins); ins=NEXT(ins)); - if( NEXT(ins) = wrd ) PREV(wrd) = ins; - if( NEXT((AGPara)PREV(par)) = next ) + if( (NEXT(ins) = wrd) ) PREV(wrd) = ins; + if( (NEXT((AGPara)PREV(par)) = next) ) PREV(next) = PREV(par); free(par); return ins; @@ -496,14 +497,14 @@ char FormatPara( AGNode node, short width ) { AGPara par; AGWord word; ObjPara op; - short len, lg, spc, indent; + short len, lg, spc = 0, indent; ts = node->tabsize; tabs = NULL; node->width = ((op.limit = node->wordwrap) ? width : 0x7fff); op.nidt = indent = 0; for(par=node->AGContent; par; indent=op.nidt, par=NEXT(par)) { - char *p, *q, nbwrd; + char *p = NULL, *q, nbwrd; redo:for(len=indent+par->alinea, nbwrd=1, word=par->line; word; word=NEXT(word)) { @@ -536,7 +537,7 @@ if( tmp && (tmp->align & JMF_PREVIOUS) && p) { /* This reduce a lot of computing with opaque resizing */ - if(word = tmp->line) + if( (word = tmp->line) ) for(t=word->data,spc=0; *t && !isspace(*t); t++, spc++); if(len+spc <= width) { AGReader-1.1-keys.patch: --- NEW FILE AGReader-1.1-keys.patch --- --- AGReader/Sources/Input.c.keys 2006-05-27 12:01:05.000000000 +0200 +++ AGReader/Sources/Input.c 2006-05-28 12:02:06.000000000 +0200 @@ -163,7 +163,11 @@ { static char *Keys[] = { "OA", "OB", "OC","OD", /* Cursor keys */ - "[5~","[6~","[H","[F",NULL /* PgDown, PgUp, End, Home */ + "[5~","[6~","[H","[F", /* PgDown, PgUp, End, Home */ + "[1~","[4~","OH","OF", /* 2x Alternative End, Home */ + "[11~","[12~", "[13~", /* F1, F2, F3 */ + "OP" ,"OQ", "OR", /* Alternative F1, F2, F3 */ + "[[A","[[B","[[C", NULL /* Linux console F1, F2, F3 */ }; static char *StrNode[] = { "help", "index", "table of content" @@ -178,7 +182,9 @@ /* Get a single char from stdin */ *p = getchr(); /* A escape char indicates beginning of command */ - if(*p == '\033') *(p=buffer) = '\033'; *++p = 0; + if(*p == '\033') *(p=buffer) = '\033'; + + *++p = 0; /* Special sequence ? */ if( buffer[0]=='\033' ) @@ -202,6 +208,19 @@ case 5: scroll_vert(&terminfo, terminfo.height-2); break; case 6: scroll_vert(&terminfo, -0x7fff); break; case 7: scroll_vert(&terminfo, 0x7fff); break; + case 8: scroll_vert(&terminfo, -0x7fff); break; + case 9: scroll_vert(&terminfo, 0x7fff); break; + case 10: scroll_vert(&terminfo, -0x7fff); break; + case 11: scroll_vert(&terminfo, 0x7fff); break; + case 12: p[-1] = '1'; goto singleton; + case 13: p[-1] = '2'; goto singleton; + case 14: p[-1] = '3'; goto singleton; + case 15: p[-1] = '1'; goto singleton; + case 16: p[-1] = '2'; goto singleton; + case 17: p[-1] = '3'; goto singleton; + case 18: p[-1] = '1'; goto singleton; + case 19: p[-1] = '2'; goto singleton; + case 20: p[-1] = '3'; goto singleton; } p=buffer; } else goto singleton; --- NEW FILE AGReader.spec --- Name: AGReader Version: 1.1 Release: 9%{?dist} Summary: Console reader for viewing AmigaGuide files Group: Applications/Text License: GPL URL: http://wuarchive.wustl.edu/aminet/misc/unix Source0: http://wuarchive.wustl.edu/aminet/misc/unix/%{name}.tgz Patch0: AGReader-1.1-gcc41.patch Patch1: AGReader-1.1-keys.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: agreader = %{version}-%{release} %description A viewer for the UNIX console which can read and display AmigaGuide files. It supports all of the v39 AmigaGuide specification possible and supports a large subset of the v40 specifications. %prep %setup -q -n %{name} %patch0 -p1 %patch1 -p1 %build cd Sources make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf %{buildroot} cd Sources mkdir -p %{buildroot}%{_bindir} install -m0755 agr %{buildroot}%{_bindir} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/agr %doc Docs/agr.guide Docs/test.guide Docs/agr.html README %changelog * Sun May 28 2006 Ian Chapman 1.1-9%{?dist} - Updated keys patch which fixes the keys under BOTH the console and an xterm, courtesy of Hans de Goede - Added provides to offer lower case alias in preparation for probable policy change * Sat May 27 2006 Ian Chapman 1.1-8.iss - Added patch to fix compilation with gcc41 courtesy of Hans de Goede - Added patch to fix Home, End, F1, F2, F3 keys courtesy of Hans de Goede - Added rpmoptflags to make line - Removed compat-gcc-32 buildrequires - obsoleted by gcc41 patch. - Use %%{?dist} for most recent changelog entry - avoids incoherent changelog versions if %%{?dist} macro is missing or different. * Sat May 13 2006 Ian Chapman 1.1-7.iss - Removed gcc32 patch. It's now specified on the make command line - Replaced %{__rm} in clean section with rm * Mon May 01 2006 Ian Chapman 1.1-6.iss - Altered spec file to more closely follow Fedora build guidelines * Tue Oct 25 2004 Ian Chapman 1.1-5.iss - Fixes for deprecated fields with the latest version of rpmbuild * Thu Dec 04 2003 Ian Chapman 1.1-4 - Minor fixes to changelog - Fixed permissions on documentation directory - Changed group to Applications/Text * Sun Oct 05 2003 Ian Chapman 1.1-3 - Minor fixes to prep and clean * Fri Jul 18 2003 Ian Chapman 1.1-2 - Fixed few harmless bugs in SPEC file. Improved use of Macros. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/AGReader/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 17:14:35 -0000 1.1 +++ .cvsignore 31 May 2006 17:15:21 -0000 1.2 @@ -0,0 +1 @@ +AGReader.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/AGReader/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 17:14:35 -0000 1.1 +++ sources 31 May 2006 17:15:21 -0000 1.2 @@ -0,0 +1 @@ +07eae411edf5e580773331a696e8f890 AGReader.tgz From fedora-extras-commits at redhat.com Wed May 31 17:28:00 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:28:00 -0700 Subject: owners owners.list,1.1079,1.1080 Message-ID: <200605311728.k4VHS2Pb010710@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10693 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1079 retrieving revision 1.1080 diff -u -r1.1079 -r1.1080 --- owners.list 31 May 2006 08:06:15 -0000 1.1079 +++ owners.list 31 May 2006 17:28:00 -0000 1.1080 @@ -22,6 +22,7 @@ Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|adplug|AdLib OPL sound emulation library|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|AGReader|Console reader for viewing AmigaGuide files|packages at amiga-hardware.com|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 17:51:12 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 31 May 2006 10:51:12 -0700 Subject: fedora-security/audit fc4,1.273,1.274 fc5,1.186,1.187 Message-ID: <200605311751.k4VHpCVn010816@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10791/audit Modified Files: fc4 fc5 Log Message: Add CVE-2004-0138 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- fc4 31 May 2006 07:44:37 -0000 1.273 +++ fc4 31 May 2006 17:51:09 -0000 1.274 @@ -1337,6 +1337,7 @@ CVE-2004-0155 version (racoon) CVE-2004-0154 version (nfs-utils, fixed 1.0.6) CVE-2004-0150 version (python, fixed 2.2.2) +CVE-2004-0138 version (kernel, fixed 2.6.0) CVE-2004-0133 version (kernel, 2.6.4) CVE-2004-0113 version (httpd, fixed 2.0.49) CVE-2004-0112 version (openssl, fixed 0.9.7d) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- fc5 31 May 2006 07:44:37 -0000 1.186 +++ fc5 31 May 2006 17:51:09 -0000 1.187 @@ -1334,6 +1334,7 @@ CVE-2004-0155 version (racoon) CVE-2004-0154 version (nfs-utils, fixed 1.0.6) CVE-2004-0150 version (python, fixed 2.2.2) +CVE-2004-0138 version (kernel, fixed 2.6.0) CVE-2004-0133 version (kernel, 2.6.4) CVE-2004-0113 version (httpd, fixed 2.0.49) CVE-2004-0112 version (openssl, not 0.9.8) From fedora-extras-commits at redhat.com Wed May 31 17:54:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 10:54:15 -0700 Subject: rpms/perl-IO-Tty/FC-4 .cvsignore, 1.3, 1.4 perl-IO-Tty.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605311754.k4VHsHJY010896@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10843/FC-4 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 May 2006 18:42:31 -0000 1.3 +++ .cvsignore 31 May 2006 17:54:15 -0000 1.4 @@ -1 +1 @@ -IO-Tty-1.03.tar.gz +IO-Tty-1.04.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/perl-IO-Tty.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-IO-Tty.spec 9 May 2006 18:42:31 -0000 1.8 +++ perl-IO-Tty.spec 31 May 2006 17:54:15 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-IO-Tty -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl interface to pseudo tty's @@ -51,6 +51,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + * Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. - Taking maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 May 2006 18:42:31 -0000 1.3 +++ sources 31 May 2006 17:54:15 -0000 1.4 @@ -1 +1 @@ -785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz +301cea1bbc2eefc28f49b08b74bfca78 IO-Tty-1.04.tar.gz From fedora-extras-commits at redhat.com Wed May 31 17:54:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 10:54:16 -0700 Subject: rpms/perl-IO-Tty/FC-5 .cvsignore, 1.3, 1.4 perl-IO-Tty.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200605311754.k4VHsIwW010902@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10843/FC-5 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 May 2006 18:39:25 -0000 1.3 +++ .cvsignore 31 May 2006 17:54:16 -0000 1.4 @@ -1 +1 @@ -IO-Tty-1.03.tar.gz +IO-Tty-1.04.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/perl-IO-Tty.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-IO-Tty.spec 9 May 2006 18:39:25 -0000 1.10 +++ perl-IO-Tty.spec 31 May 2006 17:54:16 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-IO-Tty -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl interface to pseudo tty's @@ -51,6 +51,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + * Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. - Taking maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 May 2006 18:39:25 -0000 1.3 +++ sources 31 May 2006 17:54:16 -0000 1.4 @@ -1 +1 @@ -785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz +301cea1bbc2eefc28f49b08b74bfca78 IO-Tty-1.04.tar.gz From fedora-extras-commits at redhat.com Wed May 31 17:54:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 10:54:17 -0700 Subject: rpms/perl-IO-Tty/devel .cvsignore, 1.3, 1.4 perl-IO-Tty.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200605311754.k4VHsJxv010906@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10843/devel Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 May 2006 18:03:42 -0000 1.3 +++ .cvsignore 31 May 2006 17:54:17 -0000 1.4 @@ -1 +1 @@ -IO-Tty-1.03.tar.gz +IO-Tty-1.04.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-IO-Tty.spec 9 May 2006 18:03:42 -0000 1.10 +++ perl-IO-Tty.spec 31 May 2006 17:54:17 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-IO-Tty -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl interface to pseudo tty's @@ -51,6 +51,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + * Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. - Taking maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 May 2006 18:03:42 -0000 1.3 +++ sources 31 May 2006 17:54:17 -0000 1.4 @@ -1 +1 @@ -785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz +301cea1bbc2eefc28f49b08b74bfca78 IO-Tty-1.04.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:29:11 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:29:11 -0700 Subject: rpms/DevIL - New directory Message-ID: <200605311829.k4VITD05013545@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13519/DevIL Log Message: Directory /cvs/extras/rpms/DevIL added to the repository From fedora-extras-commits at redhat.com Wed May 31 18:29:12 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:29:12 -0700 Subject: rpms/DevIL/devel - New directory Message-ID: <200605311829.k4VITECT013548@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13519/DevIL/devel Log Message: Directory /cvs/extras/rpms/DevIL/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 18:29:32 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:29:32 -0700 Subject: rpms/DevIL/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605311829.k4VITYrH013602@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13564/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module DevIL --- NEW 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 May 31 18:29:31 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:29:31 -0700 Subject: rpms/DevIL Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605311829.k4VITXd0013599@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13564 Added Files: Makefile import.log Log Message: Setup of module DevIL --- NEW FILE Makefile --- # Top level Makefile for module DevIL all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 18:30:43 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:30:43 -0700 Subject: rpms/DevIL import.log,1.1,1.2 Message-ID: <200605311831.k4VIVFRX013709@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13662 Modified Files: import.log Log Message: auto-import DevIL-1.6.8-0.7.rc1 on branch devel from DevIL-1.6.8-0.7.rc1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/DevIL/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 18:29:31 -0000 1.1 +++ import.log 31 May 2006 18:30:43 -0000 1.2 @@ -0,0 +1 @@ +DevIL-1_6_8-0_7_rc1:HEAD:DevIL-1.6.8-0.7.rc1.src.rpm:1149100235 From fedora-extras-commits at redhat.com Wed May 31 18:30:44 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:30:44 -0700 Subject: rpms/DevIL/devel DevIL-1.6.8-rc1-allegropicfix.patch, NONE, 1.1 DevIL-1.6.8-rc1-headerfix.patch, NONE, 1.1 DevIL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605311831.k4VIVGqO013713@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13662/devel Modified Files: .cvsignore sources Added Files: DevIL-1.6.8-rc1-allegropicfix.patch DevIL-1.6.8-rc1-headerfix.patch DevIL.spec Log Message: auto-import DevIL-1.6.8-0.7.rc1 on branch devel from DevIL-1.6.8-0.7.rc1.src.rpm DevIL-1.6.8-rc1-allegropicfix.patch: --- NEW FILE DevIL-1.6.8-rc1-allegropicfix.patch --- --- configure.orig 2006-04-15 15:21:01.000000000 +0100 +++ configure 2006-05-27 15:20:19.000000000 +0100 @@ -23727,7 +23727,7 @@ LIBALLEGRO="" HALLEGRO="" else - LIBALLEGRO=`allegro-config --libs` + LIBALLEGRO=`allegro-config --libs | sed 's/-lalleg_unsharable//'` HALLEGRO=`allegro-config --cflags` fi fi DevIL-1.6.8-rc1-headerfix.patch: --- NEW FILE DevIL-1.6.8-rc1-headerfix.patch --- --- DevIL-1.6.8-RC1/include/IL/il_wrap.h.orig 2002-01-26 01:15:36.000000000 +0000 +++ DevIL-1.6.8-RC1/include/IL/il_wrap.h 2006-05-29 02:23:58.000000000 +0100 @@ -3,7 +3,7 @@ /*#include #include */ -#include // Probably only have to #include this one +#include // Probably only have to #include this one #ifdef _MSC_VER #ifndef _IL_WRAP_BUILD_LIB @@ -202,4 +202,4 @@ }; -#endif//WRAPPER_H \ No newline at end of file +#endif//WRAPPER_H --- DevIL-1.6.8-RC1/include/IL/ilu_region.h.orig 2004-07-08 20:13:03.000000000 +0100 +++ DevIL-1.6.8-RC1/include/IL/ilu_region.h 2006-05-29 02:24:54.000000000 +0100 @@ -13,7 +13,7 @@ #ifndef ILU_REGION_H #define ILU_REGION_H -#include "ilu_internal.h" +#include typedef struct Edge --- DevIL-1.6.8-RC1/src-ILU/src/ilu_region.c.orig 2003-04-06 12:44:30.000000000 +0100 +++ DevIL-1.6.8-RC1/src-ILU/src/ilu_region.c 2006-05-29 02:25:45.000000000 +0100 @@ -12,7 +12,7 @@ #include "ilu_region.h" - +#include "ilu_internal.h" ILpointi *RegionPointsi = NULL; ILpointf *RegionPointsf = NULL; --- NEW FILE DevIL.spec --- Name: DevIL Version: 1.6.8 Release: 0.7.rc1%{?dist} Summary: A cross-platform image library Group: System Environment/Libraries License: LGPL URL: http://openil.sourceforge.net/ Source0: http://download.sourceforge.net/openil/%{name}-%{version}-RC1-src.tar.gz Patch0: DevIL-1.6.8-rc1-allegropicfix.patch Patch1: DevIL-1.6.8-rc1-headerfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: lcms-devel BuildRequires: libmng-devel BuildRequires: SDL-devel => 1.2.5 BuildRequires: allegro-devel BuildRequires: libtool BuildRequires: libGLU-devel Provides: openil = %{version}-%{release} Provides: devil = %{version}-%{release} %description Developer's Image Library (DevIL) is a programmer's library to develop applications with very powerful image loading capabilities, yet is easy for a developer to learn and use. Ultimate control of images is left to the developer, so unnecessary conversions, etc. are not performed. DevIL utilizes a simple, yet powerful, syntax. DevIL can load, save, convert, manipulate, filter and display a wide variety of image formats. %package devel Summary: Development files for DevIL Group: Development/Libraries Requires: DevIL = %{version}-%{release} Requires: allegro-devel Requires: libGLU-devel Provides: openil-devel = %{version}-%{release} Provides: devil-devel = %{version}-%{release} %description devel Development files for DevIL %prep %setup -q -n %{name}-%{version}-RC1 %patch0 -p0 %patch1 -p1 %build %configure make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.a #Replace autoconf generated config.h to avoid potential define collisions cat >%{buildroot}%{_includedir}/IL/config.h < 1.6.8-0.7.rc1%{?dist} - Added libGLU-devel to buildrequires - Dropped libGL-devel from requires for devel package * Sun May 28 2006 Ian Chapman 1.6.8-0.6.rc1.iss - Dropped xorg-x11-devel as a buildrequire - Dropped zlib-devel as a buildrequire - Dropped xorg-x11-devel as a require for the devel package - Added libGL-devel and libGLU-devel as requires for devel package - Dropped superfluous documentation from devel package - Added provides to offer lower case alias in preparation for probable policy change - Replace autoconf generated config.h in devel package to avoid potential define collisions - Replace source URL with primary sf site, rather than a mirror - Fix ilu_region.h to use IL\il.h and not ilu_internal.h and roll into a single patch incorporating previous header fixes. * Sat May 27 2006 Ian Chapman 1.6.8-0.5.rc1.iss - Added patch to stop linking against alleg_unsharable, otherwise non PIC code is included in the library - Use %%{?dist} for most recent changelog entry - avoids incoherent changelog versions if %%{?dist} macro is missing or different. * Fri May 26 2006 Ian Chapman 1.6.8-0.4.rc1.iss - Made zlib-devel and xorg-x11-devel explicit buildrequires - Corrected release name format to 0.%%{X}.%%{alphatag} from 0.%%{alphatag}.%%{X} - Added -q to %%setup - Added %%{version}-%%{release} to provides field * Sun May 21 2006 Ian Chapman 1.6.8-0.RC1.3.iss - Use Fedora's libtool, seems to fix rpaths problem on x86_64. * Sun May 14 2006 Ian Chapman 1.6.8-0.RC1.2.iss - Now compiled against allegro * Sat May 13 2006 Ian Chapman 1.6.8-0.RC1.1.iss - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/DevIL/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 18:29:31 -0000 1.1 +++ .cvsignore 31 May 2006 18:30:44 -0000 1.2 @@ -0,0 +1 @@ +DevIL-1.6.8-RC1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/DevIL/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 18:29:31 -0000 1.1 +++ sources 31 May 2006 18:30:44 -0000 1.2 @@ -0,0 +1 @@ +1a850a979057174e01ae87ed6405dd61 DevIL-1.6.8-RC1-src.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:34:38 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:34:38 -0700 Subject: owners owners.list,1.1080,1.1081 Message-ID: <200605311834.k4VIYeMS013816@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13792 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1080 retrieving revision 1.1081 diff -u -r1.1080 -r1.1081 --- owners.list 31 May 2006 17:28:00 -0000 1.1080 +++ owners.list 31 May 2006 18:34:38 -0000 1.1081 @@ -209,6 +209,7 @@ 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|deutex|Doom wad manipulation tool|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|DevIL|A cross-platform image library|packages at amiga-hardware.com|extras-qa at fedoraproject.org| Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|dia|A diagram drawing program|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 18:34:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 11:34:47 -0700 Subject: rpms/perl-Expect/FC-5 .cvsignore, 1.2, 1.3 perl-Expect.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311834.k4VIYnJ3013861@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13824/FC-5 Modified Files: .cvsignore perl-Expect.spec sources Log Message: Update to 1.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 18:55:21 -0000 1.2 +++ .cvsignore 31 May 2006 18:34:47 -0000 1.3 @@ -1 +1 @@ -Expect-1.16.tar.gz +Expect-1.17.tar.gz Index: perl-Expect.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/FC-5/perl-Expect.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Expect.spec 16 May 2006 18:55:21 -0000 1.1 +++ perl-Expect.spec 31 May 2006 18:34:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Expect -Version: 1.16 -Release: 2%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Expect for Perl Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.17-1 +- Update to 1.17. + * Tue May 16 2006 Jose Pedro Oliveira - 1.16-2 - Description improved as suggested in #191622. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 18:55:21 -0000 1.2 +++ sources 31 May 2006 18:34:47 -0000 1.3 @@ -1 +1 @@ -f5f0ea179c6f19d9f08e22c6a0072292 Expect-1.16.tar.gz +081c253a1ca20ad693a3665c68fcdc33 Expect-1.17.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:34:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 11:34:47 -0700 Subject: rpms/perl-Expect/devel .cvsignore, 1.2, 1.3 perl-Expect.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311834.k4VIYnwH013867@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13824/devel Modified Files: .cvsignore perl-Expect.spec sources Log Message: Update to 1.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 18:55:21 -0000 1.2 +++ .cvsignore 31 May 2006 18:34:47 -0000 1.3 @@ -1 +1 @@ -Expect-1.16.tar.gz +Expect-1.17.tar.gz Index: perl-Expect.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/perl-Expect.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Expect.spec 16 May 2006 18:55:21 -0000 1.1 +++ perl-Expect.spec 31 May 2006 18:34:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Expect -Version: 1.16 -Release: 2%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Expect for Perl Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.17-1 +- Update to 1.17. + * Tue May 16 2006 Jose Pedro Oliveira - 1.16-2 - Description improved as suggested in #191622. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 18:55:21 -0000 1.2 +++ sources 31 May 2006 18:34:47 -0000 1.3 @@ -1 +1 @@ -f5f0ea179c6f19d9f08e22c6a0072292 Expect-1.16.tar.gz +081c253a1ca20ad693a3665c68fcdc33 Expect-1.17.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:41:38 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:41:38 -0700 Subject: rpms/xmms-arts/FC-5 xmms-arts.spec,1.2,1.3 Message-ID: <200605311841.k4VIfedx014040@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-arts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14008/FC-5 Modified Files: xmms-arts.spec Log Message: Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, don't own the Output/ directory and exclude the .la file. Index: xmms-arts.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-arts/FC-5/xmms-arts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xmms-arts.spec 13 Feb 2006 12:53:38 -0000 1.2 +++ xmms-arts.spec 31 May 2006 18:41:37 -0000 1.3 @@ -1,13 +1,14 @@ Summary: X MultiMedia System output plugin for the aRts sound system Name: xmms-arts Version: 0.7.1 -Release: 2 +Release: 3 License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: http://havardk.xmms.org/plugins/arts_output/arts_output-%{version}.tar.gz Patch: arts_output-0.6.0-buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xmms-libs BuildRequires: xmms-devel, arts-devel > 1.2.0-1.5 Conflicts: arts < 1.2.0-1.5 Conflicts: xmms < 1:1.2.10-15 @@ -41,10 +42,15 @@ %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/xmms-arts-helper -%{_libdir}/xmms/Output/ +%exclude %{_libdir}/xmms/Output/libarts.la +%{_libdir}/xmms/Output/libarts.so %changelog +* Wed May 31 2006 Matthias Saou 0.7.1-3 +- Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, + don't own the Output/ directory and exclude the .la file. + * Mon Feb 13 2006 Matthias Saou 0.7.1-2 - Add missing make call in %%build. From fedora-extras-commits at redhat.com Wed May 31 18:41:38 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:41:38 -0700 Subject: rpms/xmms-arts/devel xmms-arts.spec,1.2,1.3 Message-ID: <200605311841.k4VIfeOd014044@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-arts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14008/devel Modified Files: xmms-arts.spec Log Message: Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, don't own the Output/ directory and exclude the .la file. Index: xmms-arts.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-arts/devel/xmms-arts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xmms-arts.spec 13 Feb 2006 12:53:38 -0000 1.2 +++ xmms-arts.spec 31 May 2006 18:41:38 -0000 1.3 @@ -1,13 +1,14 @@ Summary: X MultiMedia System output plugin for the aRts sound system Name: xmms-arts Version: 0.7.1 -Release: 2 +Release: 3 License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: http://havardk.xmms.org/plugins/arts_output/arts_output-%{version}.tar.gz Patch: arts_output-0.6.0-buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xmms-libs BuildRequires: xmms-devel, arts-devel > 1.2.0-1.5 Conflicts: arts < 1.2.0-1.5 Conflicts: xmms < 1:1.2.10-15 @@ -41,10 +42,15 @@ %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/xmms-arts-helper -%{_libdir}/xmms/Output/ +%exclude %{_libdir}/xmms/Output/libarts.la +%{_libdir}/xmms/Output/libarts.so %changelog +* Wed May 31 2006 Matthias Saou 0.7.1-3 +- Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, + don't own the Output/ directory and exclude the .la file. + * Mon Feb 13 2006 Matthias Saou 0.7.1-2 - Add missing make call in %%build. From fedora-extras-commits at redhat.com Wed May 31 18:44:25 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:44:25 -0700 Subject: rpms/xmms-arts/devel xmms-arts.spec,1.3,1.4 Message-ID: <200605311844.k4VIiROj014161@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-arts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14142 Modified Files: xmms-arts.spec Log Message: Add dist tag to the release. Index: xmms-arts.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-arts/devel/xmms-arts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmms-arts.spec 31 May 2006 18:41:38 -0000 1.3 +++ xmms-arts.spec 31 May 2006 18:44:25 -0000 1.4 @@ -1,7 +1,7 @@ Summary: X MultiMedia System output plugin for the aRts sound system Name: xmms-arts Version: 0.7.1 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ @@ -50,6 +50,7 @@ * Wed May 31 2006 Matthias Saou 0.7.1-3 - Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, don't own the Output/ directory and exclude the .la file. +- Add dist tag to the release. * Mon Feb 13 2006 Matthias Saou 0.7.1-2 - Add missing make call in %%build. From fedora-extras-commits at redhat.com Wed May 31 18:47:03 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:47:03 -0700 Subject: rpms/xmms-lirc/FC-5 xmms-lirc.spec,1.8,1.9 Message-ID: <200605311847.k4VIl5R7014258@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-lirc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14227/FC-5 Modified Files: xmms-lirc.spec Log Message: Add explicit xmms requirement (#193599). Index: xmms-lirc.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-lirc/FC-5/xmms-lirc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmms-lirc.spec 13 Feb 2006 14:12:01 -0000 1.8 +++ xmms-lirc.spec 31 May 2006 18:47:03 -0000 1.9 @@ -3,12 +3,13 @@ Summary: X MultiMedia System control plugin to use infrared devices Name: xmms-lirc Version: 1.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.lirc.org/ Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xmms BuildRequires: xmms-devel, lirc-devel @@ -42,6 +43,9 @@ %changelog +* Wed May 31 2006 Matthias Saou 1.4-8 +- Add explicit xmms requirement (#193599). + * Mon Feb 13 2006 Matthias Saou 1.4-7 - Rebuild for new gcc/glibc. - Spec file cleanup. From fedora-extras-commits at redhat.com Wed May 31 18:47:04 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:47:04 -0700 Subject: rpms/xmms-lirc/devel xmms-lirc.spec,1.8,1.9 Message-ID: <200605311847.k4VIl6S1014262@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-lirc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14227/devel Modified Files: xmms-lirc.spec Log Message: Add explicit xmms requirement (#193599). Index: xmms-lirc.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-lirc/devel/xmms-lirc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmms-lirc.spec 13 Feb 2006 14:12:01 -0000 1.8 +++ xmms-lirc.spec 31 May 2006 18:47:04 -0000 1.9 @@ -3,12 +3,13 @@ Summary: X MultiMedia System control plugin to use infrared devices Name: xmms-lirc Version: 1.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.lirc.org/ Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xmms BuildRequires: xmms-devel, lirc-devel @@ -42,6 +43,9 @@ %changelog +* Wed May 31 2006 Matthias Saou 1.4-8 +- Add explicit xmms requirement (#193599). + * Mon Feb 13 2006 Matthias Saou 1.4-7 - Rebuild for new gcc/glibc. - Spec file cleanup. From fedora-extras-commits at redhat.com Wed May 31 18:48:52 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Wed, 31 May 2006 11:48:52 -0700 Subject: rpms/splint/devel splint.spec,1.6,1.7 Message-ID: <200605311848.k4VImslo014373@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/splint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14356 Modified Files: splint.spec Log Message: fix br Index: splint.spec =================================================================== RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- splint.spec 21 Apr 2006 14:52:22 -0000 1.6 +++ splint.spec 31 May 2006 18:48:52 -0000 1.7 @@ -1,6 +1,6 @@ Name: splint Version: 3.1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: An implementation of the lint program Group: Development/Tools @@ -8,6 +8,7 @@ URL: http://www.splint.org/ Source0: http://www.splint.org/downloads/%{name}-%{version}.src.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: flex Obsoletes: lclint @@ -45,6 +46,9 @@ %changelog +* Wed May 31 2006 Paul Nasrat - 3.1.1-14 +- Add flex br + * Thu Apr 20 2006 Jose Pedro Oliveira - 3.1.1-13 - Manual.pdf - file permissions corrected. - Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc). From fedora-extras-commits at redhat.com Wed May 31 18:56:33 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 11:56:33 -0700 Subject: rpms/gnomad2/devel .cvsignore, 1.5, 1.6 gnomad2.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605311856.k4VIuZFN014472@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14451 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Mar 2006 21:17:54 -0000 1.5 +++ .cvsignore 31 May 2006 18:56:33 -0000 1.6 @@ -1 +1 @@ -gnomad2-2.8.3.tar.gz +gnomad2-2.8.5.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnomad2.spec 22 Mar 2006 21:17:54 -0000 1.6 +++ gnomad2.spec 31 May 2006 18:56:33 -0000 1.7 @@ -9,7 +9,7 @@ # Name: gnomad2 -Version: 2.8.3 +Version: 2.8.5 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Wed May 31 2006 Linus Walleij 2.8.5-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.3-1 - New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 21:17:54 -0000 1.5 +++ sources 31 May 2006 18:56:33 -0000 1.6 @@ -1 +1 @@ -cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz +00b737b87a71ebde142b6032b623b65e gnomad2-2.8.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:58:08 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 11:58:08 -0700 Subject: rpms/gnomad2/FC-5 .cvsignore, 1.5, 1.6 gnomad2.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605311858.k4VIwAtk014543@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14522 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Mar 2006 21:20:06 -0000 1.5 +++ .cvsignore 31 May 2006 18:58:08 -0000 1.6 @@ -1 +1 @@ -gnomad2-2.8.3.tar.gz +gnomad2-2.8.5.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/gnomad2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnomad2.spec 22 Mar 2006 21:20:06 -0000 1.6 +++ gnomad2.spec 31 May 2006 18:58:08 -0000 1.7 @@ -9,7 +9,7 @@ # Name: gnomad2 -Version: 2.8.3 +Version: 2.8.5 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Wed May 31 2006 Linus Walleij 2.8.5-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.3-1 - New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 21:20:06 -0000 1.5 +++ sources 31 May 2006 18:58:08 -0000 1.6 @@ -1 +1 @@ -cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz +00b737b87a71ebde142b6032b623b65e gnomad2-2.8.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:00:05 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 12:00:05 -0700 Subject: rpms/gnomad2/FC-4 .cvsignore, 1.5, 1.6 gnomad2.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200605311900.k4VJ07tE014635@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14606 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Mar 2006 21:22:35 -0000 1.5 +++ .cvsignore 31 May 2006 19:00:05 -0000 1.6 @@ -1 +1 @@ -gnomad2-2.8.3.tar.gz +gnomad2-2.8.5.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/gnomad2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnomad2.spec 22 Mar 2006 21:22:35 -0000 1.5 +++ gnomad2.spec 31 May 2006 19:00:05 -0000 1.6 @@ -9,7 +9,7 @@ # Name: gnomad2 -Version: 2.8.3 +Version: 2.8.5 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Wed May 31 2006 Linus Walleij 2.8.5-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.3-1 - New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 21:22:35 -0000 1.5 +++ sources 31 May 2006 19:00:05 -0000 1.6 @@ -1 +1 @@ -cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz +00b737b87a71ebde142b6032b623b65e gnomad2-2.8.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:01:22 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 12:01:22 -0700 Subject: rpms/gnomad2/FC-3 gnomad2.spec,1.5,1.6 Message-ID: <200605311901.k4VJ1uEH016983@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16927 Modified Files: gnomad2.spec Log Message: New upstream version. Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/gnomad2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnomad2.spec 22 Mar 2006 21:24:25 -0000 1.5 +++ gnomad2.spec 31 May 2006 19:01:22 -0000 1.6 @@ -9,7 +9,7 @@ # Name: gnomad2 -Version: 2.8.3 +Version: 2.8.5 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Wed May 31 2006 Linus Walleij 2.8.5-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.3-1 - New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 From fedora-extras-commits at redhat.com Wed May 31 19:02:56 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 12:02:56 -0700 Subject: rpms/gnomad2/FC-3 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200605311903.k4VJ3Ubi017048@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16995 Modified Files: .cvsignore sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Mar 2006 21:24:25 -0000 1.5 +++ .cvsignore 31 May 2006 19:02:56 -0000 1.6 @@ -1 +1 @@ -gnomad2-2.8.3.tar.gz +gnomad2-2.8.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 21:24:25 -0000 1.5 +++ sources 31 May 2006 19:02:56 -0000 1.6 @@ -1 +1 @@ -cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz +00b737b87a71ebde142b6032b623b65e gnomad2-2.8.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:14:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:14:39 -0700 Subject: rpms/lirc-kmod/devel lirc-kmod.spec,1.9,1.10 Message-ID: <200605311914.k4VJEfA5017206@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159/lirc-kmod/devel Modified Files: lirc-kmod.spec Log Message: * Wed May 31 2006 Ville Skytt?? - Fix setting kversion (Matthias Saou). Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lirc-kmod.spec 28 May 2006 16:21:45 -0000 1.9 +++ lirc-kmod.spec 31 May 2006 19:14:39 -0000 1.10 @@ -5,7 +5,7 @@ %define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2122_FC5} +%{!?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 8.%(echo %{kverrel} | tr - _) +Release: 9.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,9 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 0.8.0-9 +- Fix setting kversion (Matthias Saou). + * Sun May 28 2006 Ville Skytt?? - 0.8.0-8 - Update kmodtool to 0.10.10, invoke it with bash instead of sh. From fedora-extras-commits at redhat.com Wed May 31 19:14:33 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:14:33 -0700 Subject: rpms/thinkpad-kmod/FC-5 thinkpad-kmod.spec,1.10,1.11 Message-ID: <200605311915.k4VJF5np017211@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159/thinkpad-kmod/FC-5 Modified Files: thinkpad-kmod.spec Log Message: * Wed May 31 2006 Ville Skytt?? - Fix setting kversion (Matthias Saou). Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- thinkpad-kmod.spec 28 May 2006 16:21:44 -0000 1.10 +++ thinkpad-kmod.spec 31 May 2006 19:14:33 -0000 1.11 @@ -3,7 +3,7 @@ %define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2122_FC5} +%{!?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -19,7 +19,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 7.%(echo %{kverrel} | tr - _) +Release: 8.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -65,6 +65,9 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 5.9-8 +- Fix setting kversion (Matthias Saou). + * Sun May 28 2006 Ville Skytt?? - 5.9-7 - Update kmodtool to 0.10.10, invoke it with bash instead of sh. From fedora-extras-commits at redhat.com Wed May 31 19:14:34 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:14:34 -0700 Subject: rpms/lirc-kmod/FC-5 lirc-kmod.spec,1.9,1.10 Message-ID: <200605311915.k4VJF6ti017214@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159/lirc-kmod/FC-5 Modified Files: lirc-kmod.spec Log Message: * Wed May 31 2006 Ville Skytt?? - Fix setting kversion (Matthias Saou). Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lirc-kmod.spec 28 May 2006 16:21:45 -0000 1.9 +++ lirc-kmod.spec 31 May 2006 19:14:34 -0000 1.10 @@ -5,7 +5,7 @@ %define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2122_FC5} +%{!?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 8.%(echo %{kverrel} | tr - _) +Release: 9.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,9 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 0.8.0-9 +- Fix setting kversion (Matthias Saou). + * Sun May 28 2006 Ville Skytt?? - 0.8.0-8 - Update kmodtool to 0.10.10, invoke it with bash instead of sh. From fedora-extras-commits at redhat.com Wed May 31 19:18:55 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 12:18:55 -0700 Subject: rpms/pypoker-eval/FC-4 pypoker-eval.spec,1.1,1.2 Message-ID: <200605311918.k4VJIvkg017271@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17226/FC-4 Modified Files: pypoker-eval.spec Log Message: Add new required BR and add some macros Index: pypoker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/FC-4/pypoker-eval.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypoker-eval.spec 12 May 2006 15:42:46 -0000 1.1 +++ pypoker-eval.spec 31 May 2006 19:18:55 -0000 1.2 @@ -2,13 +2,13 @@ Name: pypoker-eval Version: 131.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python interface to poker-eval Group: Development/Libraries License: GPL URL: http://pokersource.org/pypoker-eval Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz -BuildRequires: python-devel +BuildRequires: python-devel pkgconfig BuildRequires: poker-eval-devel >= 124.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,21 +29,21 @@ %setup -q # make examples directory for devel %doc -mkdir -p tmp/examples && cp test.py tmp/examples +%{__mkdir} -p tmp/examples && %{__cp} test.py tmp/examples %build %configure --disable-static -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%{__rm} -rf %{buildroot} +%makeinstall %check %{__python} test.py %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -64,6 +64,10 @@ %exclude %{python_sitearch}/*.la %changelog +* Wed May 31 2006 Christopher Stone 131.0-4 +- Add missing Build Requires +- Use macros for system commands + * Fri May 12 2006 Christopher Stone 131.0-3 - Place unversioned .so link in -devel package From fedora-extras-commits at redhat.com Wed May 31 19:18:55 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 12:18:55 -0700 Subject: rpms/pypoker-eval/FC-5 pypoker-eval.spec,1.1,1.2 Message-ID: <200605311918.k4VJIvKP017276@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17226/FC-5 Modified Files: pypoker-eval.spec Log Message: Add new required BR and add some macros Index: pypoker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/FC-5/pypoker-eval.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypoker-eval.spec 12 May 2006 15:42:46 -0000 1.1 +++ pypoker-eval.spec 31 May 2006 19:18:55 -0000 1.2 @@ -2,13 +2,13 @@ Name: pypoker-eval Version: 131.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python interface to poker-eval Group: Development/Libraries License: GPL URL: http://pokersource.org/pypoker-eval Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz -BuildRequires: python-devel +BuildRequires: python-devel pkgconfig BuildRequires: poker-eval-devel >= 124.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,21 +29,21 @@ %setup -q # make examples directory for devel %doc -mkdir -p tmp/examples && cp test.py tmp/examples +%{__mkdir} -p tmp/examples && %{__cp} test.py tmp/examples %build %configure --disable-static -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%{__rm} -rf %{buildroot} +%makeinstall %check %{__python} test.py %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -64,6 +64,10 @@ %exclude %{python_sitearch}/*.la %changelog +* Wed May 31 2006 Christopher Stone 131.0-4 +- Add missing Build Requires +- Use macros for system commands + * Fri May 12 2006 Christopher Stone 131.0-3 - Place unversioned .so link in -devel package From fedora-extras-commits at redhat.com Wed May 31 19:18:56 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 12:18:56 -0700 Subject: rpms/pypoker-eval/devel pypoker-eval.spec,1.1,1.2 Message-ID: <200605311918.k4VJIwNp017280@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17226/devel Modified Files: pypoker-eval.spec Log Message: Add new required BR and add some macros Index: pypoker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/devel/pypoker-eval.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypoker-eval.spec 12 May 2006 15:42:46 -0000 1.1 +++ pypoker-eval.spec 31 May 2006 19:18:56 -0000 1.2 @@ -2,13 +2,13 @@ Name: pypoker-eval Version: 131.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python interface to poker-eval Group: Development/Libraries License: GPL URL: http://pokersource.org/pypoker-eval Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz -BuildRequires: python-devel +BuildRequires: python-devel pkgconfig BuildRequires: poker-eval-devel >= 124.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,21 +29,21 @@ %setup -q # make examples directory for devel %doc -mkdir -p tmp/examples && cp test.py tmp/examples +%{__mkdir} -p tmp/examples && %{__cp} test.py tmp/examples %build %configure --disable-static -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%{__rm} -rf %{buildroot} +%makeinstall %check %{__python} test.py %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -64,6 +64,10 @@ %exclude %{python_sitearch}/*.la %changelog +* Wed May 31 2006 Christopher Stone 131.0-4 +- Add missing Build Requires +- Use macros for system commands + * Fri May 12 2006 Christopher Stone 131.0-3 - Place unversioned .so link in -devel package From fedora-extras-commits at redhat.com Wed May 31 19:24:08 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:24:08 -0700 Subject: rpms/openct/devel openct.spec,1.13,1.14 Message-ID: <200605311924.k4VJOAt8017367@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17350 Modified Files: openct.spec Log Message: * Thu May 25 2006 Ville Skytt?? - 0.6.7-3 - Make installation more multilib friendly. Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- openct.spec 7 May 2006 13:47:25 -0000 1.13 +++ openct.spec 31 May 2006 19:24:08 -0000 1.14 @@ -2,7 +2,7 @@ Name: openct Version: 0.6.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries @@ -57,7 +57,7 @@ %setup -q sh bootstrap # avoid standard rpaths on lib64 archs sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in -sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \ +sed -i -e 's|/etc/hotplug/usb/openct|%{_datadir}/openct/hotplug|' \ etc/openct.udev @@ -78,7 +78,7 @@ install -Dpm 644 etc/openct.udev \ $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules -install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug +install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_datadir}/openct/hotplug install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf @@ -132,7 +132,8 @@ %doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css %config(noreplace) %{_sysconfdir}/openct.conf %config(noreplace) %{_sysconfdir}/sysconfig/openct -%config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules +# Temporarily not noreplace, 0.6.7-2 -> 0.6.7-3 +%config %{_sysconfdir}/udev/rules.d/*openct.rules %{_initrddir}/openct %{_bindir}/openct-tool %{_sbindir}/ifdhandler @@ -140,7 +141,7 @@ %{_sbindir}/openct-control %{_libdir}/ctapi/libopenctapi.so %{_libdir}/libopenct.so.* -%{_libdir}/openct/ +%{_datadir}/openct/ %dir %{_localstatedir}/run/openct/ %ghost %{_localstatedir}/run/openct/status %{_mandir}/man1/openct-tool.1* @@ -159,6 +160,9 @@ %changelog +* Thu May 25 2006 Ville Skytt?? - 0.6.7-3 +- Make installation more multilib friendly. + * Sat May 6 2006 Ville Skytt?? - 0.6.7-2 - Install CT-API module into %%{_libdir}/ctapi, add dependency on it (#190903). - Update URL. From fedora-extras-commits at redhat.com Wed May 31 19:33:19 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 31 May 2006 12:33:19 -0700 Subject: rpms/python-sqlalchemy/FC-5 .cvsignore, 1.2, 1.3 python-sqlalchemy.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311933.k4VJXLaB017560@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17503/FC-5 Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: update to new upstream version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 May 2006 14:57:51 -0000 1.2 +++ .cvsignore 31 May 2006 19:33:18 -0000 1.3 @@ -1 +1 @@ -SQLAlchemy-0.1.7.tar.gz +SQLAlchemy-0.2.1.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-5/python-sqlalchemy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-sqlalchemy.spec 23 May 2006 14:57:51 -0000 1.1 +++ python-sqlalchemy.spec 31 May 2006 19:33:18 -0000 1.2 @@ -5,7 +5,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.1.7 +Version: 0.2.1 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc README LICENSE PKG-INFO doc examples +%doc README LICENSE PKG-INFO CHANGES doc examples %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info %dir %{python_sitelib}/sqlalchemy %{python_sitelib}/sqlalchemy/*.py @@ -62,16 +62,23 @@ %{python_sitelib}/sqlalchemy/ext/*.py %{python_sitelib}/sqlalchemy/ext/*.pyc %ghost %{python_sitelib}/sqlalchemy/ext/*.pyo -%dir %{python_sitelib}/sqlalchemy/mapping -%{python_sitelib}/sqlalchemy/mapping/*.py -%{python_sitelib}/sqlalchemy/mapping/*.pyc -%ghost %{python_sitelib}/sqlalchemy/mapping/*.pyo %dir %{python_sitelib}/sqlalchemy/mods %{python_sitelib}/sqlalchemy/mods/*.py %{python_sitelib}/sqlalchemy/mods/*.pyc %ghost %{python_sitelib}/sqlalchemy/mods/*.pyo +%dir %{python_sitelib}/sqlalchemy/engine +%{python_sitelib}/sqlalchemy/engine/*.py +%{python_sitelib}/sqlalchemy/engine/*.pyc +%ghost %{python_sitelib}/sqlalchemy/engine/*.pyo +%dir %{python_sitelib}/sqlalchemy/orm +%{python_sitelib}/sqlalchemy/orm/*.py +%{python_sitelib}/sqlalchemy/orm/*.pyc +%ghost %{python_sitelib}/sqlalchemy/orm/*.pyo %changelog +* Wed May 31 2006 Shahms E. King 0.2.1-1 +- Update to new upstream version + * Tue May 16 2006 Shahms E. King 0.1.7-1 - Update to new upstream version - Point URL to direct link, not sourceforge redirect Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 May 2006 14:57:51 -0000 1.2 +++ sources 31 May 2006 19:33:18 -0000 1.3 @@ -1 +1 @@ -1c9c0124ad057c9fbcf8c4e16ecae960 SQLAlchemy-0.1.7.tar.gz +2756451f806c33bb83f301b1df1199f4 SQLAlchemy-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:33:18 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 31 May 2006 12:33:18 -0700 Subject: rpms/python-sqlalchemy/FC-4 .cvsignore, 1.2, 1.3 python-sqlalchemy.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311933.k4VJXKd7017556@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17503/FC-4 Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: update to new upstream version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 May 2006 14:57:51 -0000 1.2 +++ .cvsignore 31 May 2006 19:33:18 -0000 1.3 @@ -1 +1 @@ -SQLAlchemy-0.1.7.tar.gz +SQLAlchemy-0.2.1.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-4/python-sqlalchemy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-sqlalchemy.spec 23 May 2006 14:57:51 -0000 1.1 +++ python-sqlalchemy.spec 31 May 2006 19:33:18 -0000 1.2 @@ -5,7 +5,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.1.7 +Version: 0.2.1 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc README LICENSE PKG-INFO doc examples +%doc README LICENSE PKG-INFO CHANGES doc examples %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info %dir %{python_sitelib}/sqlalchemy %{python_sitelib}/sqlalchemy/*.py @@ -62,16 +62,23 @@ %{python_sitelib}/sqlalchemy/ext/*.py %{python_sitelib}/sqlalchemy/ext/*.pyc %ghost %{python_sitelib}/sqlalchemy/ext/*.pyo -%dir %{python_sitelib}/sqlalchemy/mapping -%{python_sitelib}/sqlalchemy/mapping/*.py -%{python_sitelib}/sqlalchemy/mapping/*.pyc -%ghost %{python_sitelib}/sqlalchemy/mapping/*.pyo %dir %{python_sitelib}/sqlalchemy/mods %{python_sitelib}/sqlalchemy/mods/*.py %{python_sitelib}/sqlalchemy/mods/*.pyc %ghost %{python_sitelib}/sqlalchemy/mods/*.pyo +%dir %{python_sitelib}/sqlalchemy/engine +%{python_sitelib}/sqlalchemy/engine/*.py +%{python_sitelib}/sqlalchemy/engine/*.pyc +%ghost %{python_sitelib}/sqlalchemy/engine/*.pyo +%dir %{python_sitelib}/sqlalchemy/orm +%{python_sitelib}/sqlalchemy/orm/*.py +%{python_sitelib}/sqlalchemy/orm/*.pyc +%ghost %{python_sitelib}/sqlalchemy/orm/*.pyo %changelog +* Wed May 31 2006 Shahms E. King 0.2.1-1 +- Update to new upstream version + * Tue May 16 2006 Shahms E. King 0.1.7-1 - Update to new upstream version - Point URL to direct link, not sourceforge redirect Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 May 2006 14:57:51 -0000 1.2 +++ sources 31 May 2006 19:33:18 -0000 1.3 @@ -1 +1 @@ -1c9c0124ad057c9fbcf8c4e16ecae960 SQLAlchemy-0.1.7.tar.gz +2756451f806c33bb83f301b1df1199f4 SQLAlchemy-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:33:19 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 31 May 2006 12:33:19 -0700 Subject: rpms/python-sqlalchemy/devel .cvsignore, 1.2, 1.3 python-sqlalchemy.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311933.k4VJXLTE017566@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17503/devel Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: update to new upstream version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 May 2006 14:57:51 -0000 1.2 +++ .cvsignore 31 May 2006 19:33:19 -0000 1.3 @@ -1 +1 @@ -SQLAlchemy-0.1.7.tar.gz +SQLAlchemy-0.2.1.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-sqlalchemy.spec 23 May 2006 14:57:51 -0000 1.1 +++ python-sqlalchemy.spec 31 May 2006 19:33:19 -0000 1.2 @@ -5,7 +5,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.1.7 +Version: 0.2.1 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc README LICENSE PKG-INFO doc examples +%doc README LICENSE PKG-INFO CHANGES doc examples %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info %dir %{python_sitelib}/sqlalchemy %{python_sitelib}/sqlalchemy/*.py @@ -62,16 +62,23 @@ %{python_sitelib}/sqlalchemy/ext/*.py %{python_sitelib}/sqlalchemy/ext/*.pyc %ghost %{python_sitelib}/sqlalchemy/ext/*.pyo -%dir %{python_sitelib}/sqlalchemy/mapping -%{python_sitelib}/sqlalchemy/mapping/*.py -%{python_sitelib}/sqlalchemy/mapping/*.pyc -%ghost %{python_sitelib}/sqlalchemy/mapping/*.pyo %dir %{python_sitelib}/sqlalchemy/mods %{python_sitelib}/sqlalchemy/mods/*.py %{python_sitelib}/sqlalchemy/mods/*.pyc %ghost %{python_sitelib}/sqlalchemy/mods/*.pyo +%dir %{python_sitelib}/sqlalchemy/engine +%{python_sitelib}/sqlalchemy/engine/*.py +%{python_sitelib}/sqlalchemy/engine/*.pyc +%ghost %{python_sitelib}/sqlalchemy/engine/*.pyo +%dir %{python_sitelib}/sqlalchemy/orm +%{python_sitelib}/sqlalchemy/orm/*.py +%{python_sitelib}/sqlalchemy/orm/*.pyc +%ghost %{python_sitelib}/sqlalchemy/orm/*.pyo %changelog +* Wed May 31 2006 Shahms E. King 0.2.1-1 +- Update to new upstream version + * Tue May 16 2006 Shahms E. King 0.1.7-1 - Update to new upstream version - Point URL to direct link, not sourceforge redirect Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 May 2006 14:57:51 -0000 1.2 +++ sources 31 May 2006 19:33:19 -0000 1.3 @@ -1 +1 @@ -1c9c0124ad057c9fbcf8c4e16ecae960 SQLAlchemy-0.1.7.tar.gz +2756451f806c33bb83f301b1df1199f4 SQLAlchemy-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:42:31 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:42:31 -0700 Subject: rpms/opensc/FC-5 .cvsignore, 1.6, 1.7 opensc.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200605311942.k4VJgXgC017744@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17706/FC-5 Modified Files: .cvsignore opensc.spec sources Log Message: * Wed May 31 2006 Ville Skytt?? - 0.11.1-1 - 0.11.1. - Avoid some multilib conflicts. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 May 2006 13:51:19 -0000 1.6 +++ .cvsignore 31 May 2006 19:42:31 -0000 1.7 @@ -1 +1 @@ -opensc-0.11.0.tar.gz +opensc-0.11.1.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/opensc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- opensc.spec 7 May 2006 13:51:19 -0000 1.11 +++ opensc.spec 31 May 2006 19:42:31 -0000 1.12 @@ -1,14 +1,15 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.11.0 -Release: 2%{?dist} +Version: 0.11.1 +Release: 1%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL URL: http://www.opensc-project.org/opensc/ Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz +Patch0: %{name}-0.11.1-develconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -51,10 +52,12 @@ %prep %setup -q +%patch0 -p1 sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . -sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in +# No %{_libdir} here to avoid multilib conflicts; it's just an example +sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in %build @@ -137,6 +140,10 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 0.11.1-1 +- 0.11.1. +- Avoid some multilib conflicts. + * Sun May 7 2006 Ville Skytt?? - 0.11.0-2 - Sync example paths in openct.conf with ctapi-common. - Update URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 May 2006 13:51:19 -0000 1.6 +++ sources 31 May 2006 19:42:31 -0000 1.7 @@ -1 +1 @@ -be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz +94ce00a6bda38fac10ab06f5d5d1a8c3 opensc-0.11.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:42:32 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:42:32 -0700 Subject: rpms/opensc/devel opensc-0.11.1-develconfig.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 opensc.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <200605311942.k4VJgYhO017752@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17706/devel Modified Files: .cvsignore opensc.spec sources Added Files: opensc-0.11.1-develconfig.patch Log Message: * Wed May 31 2006 Ville Skytt?? - 0.11.1-1 - 0.11.1. - Avoid some multilib conflicts. opensc-0.11.1-develconfig.patch: --- NEW FILE opensc-0.11.1-develconfig.patch --- --- opensc-0.11.1/src/libopensc/opensc-config.in~ 2005-12-29 14:36:30.000000000 +0200 +++ opensc-0.11.1/src/libopensc/opensc-config.in 2006-05-31 22:26:57.000000000 +0300 @@ -14,8 +14,8 @@ exec_prefix=@exec_prefix@ exec_prefix_set=no -opensc_libs="@OPENSC_LIBS@" -opensc_cflags="@OPENSC_CFLAGS@" +opensc_libs="`pkg-config libopensc --libs`" +opensc_cflags="`pkg-config libopensc --cflags`" usage() --- opensc-0.11.1/src/libopensc/libopensc.pc.in~ 2005-12-29 14:36:30.000000000 +0200 +++ opensc-0.11.1/src/libopensc/libopensc.pc.in 2006-05-31 22:26:54.000000000 +0300 @@ -6,6 +6,6 @@ Name: libopensc Description: libopensc Version: @VERSION@ -Libs: -L${libdir} -lopensc -lscconf +Libs: -L${libdir} -lopensc Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 4 May 2006 17:05:31 -0000 1.8 +++ .cvsignore 31 May 2006 19:42:32 -0000 1.9 @@ -1 +1 @@ -opensc-0.11.0.tar.gz +opensc-0.11.1.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- opensc.spec 7 May 2006 13:49:24 -0000 1.14 +++ opensc.spec 31 May 2006 19:42:32 -0000 1.15 @@ -1,14 +1,15 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.11.0 -Release: 2%{?dist} +Version: 0.11.1 +Release: 1%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL URL: http://www.opensc-project.org/opensc/ Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz +Patch0: %{name}-0.11.1-develconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -51,10 +52,12 @@ %prep %setup -q +%patch0 -p1 sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . -sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in +# No %{_libdir} here to avoid multilib conflicts; it's just an example +sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in %build @@ -137,6 +140,10 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 0.11.1-1 +- 0.11.1. +- Avoid some multilib conflicts. + * Sun May 7 2006 Ville Skytt?? - 0.11.0-2 - Sync example paths in openct.conf with ctapi-common. - Update URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 May 2006 17:05:31 -0000 1.8 +++ sources 31 May 2006 19:42:32 -0000 1.9 @@ -1 +1 @@ -be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz +94ce00a6bda38fac10ab06f5d5d1a8c3 opensc-0.11.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:43:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:43:38 -0700 Subject: rpms/opensc/FC-5 opensc-0.11.1-develconfig.patch,NONE,1.1 Message-ID: <200605311943.k4VJheJ7017824@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17806 Added Files: opensc-0.11.1-develconfig.patch Log Message: Add forgotten patch. opensc-0.11.1-develconfig.patch: --- NEW FILE opensc-0.11.1-develconfig.patch --- --- opensc-0.11.1/src/libopensc/opensc-config.in~ 2005-12-29 14:36:30.000000000 +0200 +++ opensc-0.11.1/src/libopensc/opensc-config.in 2006-05-31 22:26:57.000000000 +0300 @@ -14,8 +14,8 @@ exec_prefix=@exec_prefix@ exec_prefix_set=no -opensc_libs="@OPENSC_LIBS@" -opensc_cflags="@OPENSC_CFLAGS@" +opensc_libs="`pkg-config libopensc --libs`" +opensc_cflags="`pkg-config libopensc --cflags`" usage() --- opensc-0.11.1/src/libopensc/libopensc.pc.in~ 2005-12-29 14:36:30.000000000 +0200 +++ opensc-0.11.1/src/libopensc/libopensc.pc.in 2006-05-31 22:26:54.000000000 +0300 @@ -6,6 +6,6 @@ Name: libopensc Description: libopensc Version: @VERSION@ -Libs: -L${libdir} -lopensc -lscconf +Libs: -L${libdir} -lopensc Cflags: -I${includedir} From fedora-extras-commits at redhat.com Wed May 31 19:45:44 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 12:45:44 -0700 Subject: rpms/plplot/FC-5 .cvsignore, 1.6, 1.7 plplot.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200605311945.k4VJjkAx017900@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17879 Modified Files: .cvsignore plplot.spec sources Log Message: - Update to 5.6.1 - Enable f95 bindings - Remove patches applied upstream - Now include pkgconfig files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 May 2006 15:40:10 -0000 1.6 +++ .cvsignore 31 May 2006 19:45:44 -0000 1.7 @@ -1 +1 @@ -plplot-5.6.0.tar.gz +plplot-5.6.1.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plplot.spec 9 May 2006 15:40:10 -0000 1.10 +++ plplot.spec 31 May 2006 19:45:44 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.6.0 +Version: 5.6.1 Release: 1%{?dist} Summary: Library of functions for making scientific plots @@ -10,8 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch1: plplot-5.5.3-tk.patch -Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -139,14 +137,12 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch1 -p1 -b .orig -%patch3 -p1 -b .orig %patch4 -p1 -b .orig %patch6 -p1 -b .orig %build -%configure --disable-static --without-rpath --with-pthreads \ +%configure --enable-f95 --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ @@ -209,6 +205,8 @@ %{_libdir}/libplplotd.so.* %{_libdir}/libplplotf77cd.so.* %{_libdir}/libplplotf77d.so.* +%{_libdir}/libplplotf95cd.so.* +%{_libdir}/libplplotf95d.so.* %dir %{_libdir}/plplot%{version} %dir %{_libdir}/plplot%{version}/driversd %{_libdir}/plplot%{version}/driversd/gd.rc @@ -273,13 +271,22 @@ %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so +%{_libdir}/libplplotf95cd.so +%{_libdir}/libplplotf95d.so +%{_libdir}/fortran/ +%{_libdir}/pkgconfig/plplotd.pc +%{_libdir}/pkgconfig/plplotd-c++.pc +%{_libdir}/pkgconfig/plplotd-f77.pc +%{_libdir}/pkgconfig/plplotd-f95.pc %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ +%{_datadir}/plplot%{version}/examples/f95/ %{_datadir}/plplot%{version}/examples/Makefile %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_datadir}/plplot%{version}/examples/test_f95.sh %{_mandir}/man3/pl*.3* %files gnome @@ -287,6 +294,7 @@ %{_libdir}/libplplotgnome2d.so.* %{_libdir}/plplot%{version}/driversd/gcw.rc %{_libdir}/plplot%{version}/driversd/gcw.so +%{_libdir}/pkgconfig/plplotd-gnome2.pc %{python_sitelib}/gcwmodule.so %{python_sitelib}/cplplotcanvasmodule.so @@ -322,6 +330,7 @@ %{_libdir}/plplot%{version}/driversd/tk.so %{_libdir}/plplot%{version}/driversd/tkwin.rc %{_libdir}/plplot%{version}/driversd/tkwin.so +%{_libdir}/pkgconfig/plplotd-tcl.pc %{_mandir}/man1/plserver.1.gz %{_mandir}/man1/pltcl.1.gz @@ -339,6 +348,12 @@ %changelog +* Mon May 22 2006 - Orion Poplawski - 5.6.1-1 +- Update to 5.6.1 +- Enable f95 bindings +- Remove patches applied upstream +- Now include pkgconfig files + * Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver - Add wxGTK support Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 May 2006 15:40:10 -0000 1.6 +++ sources 31 May 2006 19:45:44 -0000 1.7 @@ -1 +1 @@ -0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz +51029b256f3333449de9bcd3e00c088f plplot-5.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:47:20 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 12:47:20 -0700 Subject: rpms/plplot/FC-5 plplot.spec,1.11,1.12 Message-ID: <200605311947.k4VJlMCH017923@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17906 Modified Files: plplot.spec Log Message: Fixup .pc files and add BR pkgconfig Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- plplot.spec 31 May 2006 19:45:44 -0000 1.11 +++ plplot.spec 31 May 2006 19:47:20 -0000 1.12 @@ -54,6 +54,7 @@ Summary: Development headers and libraries for PLplot Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel %{summary} @@ -73,6 +74,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} +Requires: pkgconfig %description gnome-devel %{summary} @@ -120,6 +122,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} +Requires: pkgconfig %description tk-devel %{summary} @@ -294,13 +297,13 @@ %{_libdir}/libplplotgnome2d.so.* %{_libdir}/plplot%{version}/driversd/gcw.rc %{_libdir}/plplot%{version}/driversd/gcw.so -%{_libdir}/pkgconfig/plplotd-gnome2.pc %{python_sitelib}/gcwmodule.so %{python_sitelib}/cplplotcanvasmodule.so %files gnome-devel %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so +%{_libdir}/pkgconfig/plplotd-gnome2.pc %files java %defattr(-,root,root,-) @@ -330,7 +333,6 @@ %{_libdir}/plplot%{version}/driversd/tk.so %{_libdir}/plplot%{version}/driversd/tkwin.rc %{_libdir}/plplot%{version}/driversd/tkwin.so -%{_libdir}/pkgconfig/plplotd-tcl.pc %{_mandir}/man1/plserver.1.gz %{_mandir}/man1/pltcl.1.gz @@ -338,6 +340,7 @@ %defattr(-,root,root,-) %{_libdir}/libplplottcltkd.so %{_libdir}/libtclmatrixd.so +%{_libdir}/pkgconfig/plplotd-tcl.pc %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ From fedora-extras-commits at redhat.com Wed May 31 19:48:32 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 12:48:32 -0700 Subject: rpms/plplot/devel .cvsignore, 1.6, 1.7 plplot.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200605311948.k4VJmYIY017995@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17974 Modified Files: .cvsignore plplot.spec sources Log Message: - Update to 5.6.1 - Enable f95 bindings - Remove patches applied upstream - Now include pkgconfig files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 May 2006 19:24:40 -0000 1.6 +++ .cvsignore 31 May 2006 19:48:32 -0000 1.7 @@ -1 +1 @@ -plplot-5.6.0.tar.gz +plplot-5.6.1.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plplot.spec 8 May 2006 18:26:41 -0000 1.10 +++ plplot.spec 31 May 2006 19:48:32 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.6.0 +Version: 5.6.1 Release: 1%{?dist} Summary: Library of functions for making scientific plots @@ -10,8 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch1: plplot-5.5.3-tk.patch -Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +54,7 @@ Summary: Development headers and libraries for PLplot Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel %{summary} @@ -75,6 +74,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} +Requires: pkgconfig %description gnome-devel %{summary} @@ -122,6 +122,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} +Requires: pkgconfig %description tk-devel %{summary} @@ -139,14 +140,12 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch1 -p1 -b .orig -%patch3 -p1 -b .orig %patch4 -p1 -b .orig %patch6 -p1 -b .orig %build -%configure --disable-static --without-rpath --with-pthreads \ +%configure --enable-f95 --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ @@ -209,6 +208,8 @@ %{_libdir}/libplplotd.so.* %{_libdir}/libplplotf77cd.so.* %{_libdir}/libplplotf77d.so.* +%{_libdir}/libplplotf95cd.so.* +%{_libdir}/libplplotf95d.so.* %dir %{_libdir}/plplot%{version} %dir %{_libdir}/plplot%{version}/driversd %{_libdir}/plplot%{version}/driversd/gd.rc @@ -273,13 +274,22 @@ %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so +%{_libdir}/libplplotf95cd.so +%{_libdir}/libplplotf95d.so +%{_libdir}/fortran/ +%{_libdir}/pkgconfig/plplotd.pc +%{_libdir}/pkgconfig/plplotd-c++.pc +%{_libdir}/pkgconfig/plplotd-f77.pc +%{_libdir}/pkgconfig/plplotd-f95.pc %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ +%{_datadir}/plplot%{version}/examples/f95/ %{_datadir}/plplot%{version}/examples/Makefile %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_datadir}/plplot%{version}/examples/test_f95.sh %{_mandir}/man3/pl*.3* %files gnome @@ -293,6 +303,7 @@ %files gnome-devel %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so +%{_libdir}/pkgconfig/plplotd-gnome2.pc %files java %defattr(-,root,root,-) @@ -329,6 +340,7 @@ %defattr(-,root,root,-) %{_libdir}/libplplottcltkd.so %{_libdir}/libtclmatrixd.so +%{_libdir}/pkgconfig/plplotd-tcl.pc %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ @@ -339,6 +351,12 @@ %changelog +* Mon May 22 2006 - Orion Poplawski - 5.6.1-1 +- Update to 5.6.1 +- Enable f95 bindings +- Remove patches applied upstream +- Now include pkgconfig files + * Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver - Add wxGTK support Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 May 2006 19:24:40 -0000 1.6 +++ sources 31 May 2006 19:48:32 -0000 1.7 @@ -1 +1 @@ -0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz +51029b256f3333449de9bcd3e00c088f plplot-5.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:52:26 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 31 May 2006 12:52:26 -0700 Subject: rpms/stellarium/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 stellarium.spec, 1.19, 1.20 Message-ID: <200605311952.k4VJqS86018028@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18007 Modified Files: .cvsignore sources stellarium.spec Log Message: User guide updated Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 8 May 2006 16:59:39 -0000 1.8 +++ .cvsignore 31 May 2006 19:52:26 -0000 1.9 @@ -1,2 +1,3 @@ stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf +stellarium_user_guide-0.8.0-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 8 May 2006 16:59:39 -0000 1.8 +++ sources 31 May 2006 19:52:26 -0000 1.9 @@ -1,2 +1,2 @@ 2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz -9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf +2fd23dd0300af03cabc9ba5564cc919d stellarium_user_guide-0.8.0-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- stellarium.spec 8 May 2006 18:09:16 -0000 1.19 +++ stellarium.spec 31 May 2006 19:52:26 -0000 1.20 @@ -1,14 +1,14 @@ Name: stellarium Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-%{version}.tar.gz +Source0: http://prdownloads.sf.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop -Source2: http://dl.sf.net/stellarum/stellarium_user_guide-0.7.1-1.pdf +Source2: http://prdownloads.sf.net/stellarum/stellarium_user_guide-0.8.0-1.pdf Patch1: stellarium-0.8.0-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,9 +81,13 @@ %files doc -%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf +%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.8.0-1.pdf %changelog +* Wed May 31 2006 Jochen Schmitt 0.8.0-4 +- Update user guide +- change dl.sf.net to prdownloads.sf.net + * Sun May 7 2006 Jochen Schmitt 0.8.0-3 - New upstream release From fedora-extras-commits at redhat.com Wed May 31 19:53:30 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 31 May 2006 12:53:30 -0700 Subject: rpms/stellarium/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 stellarium.spec, 1.18, 1.19 Message-ID: <200605311953.k4VJrW3L018129@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18108 Modified Files: .cvsignore sources stellarium.spec Log Message: User guide updated Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 8 May 2006 17:06:01 -0000 1.8 +++ .cvsignore 31 May 2006 19:53:30 -0000 1.9 @@ -1,2 +1,3 @@ stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf +stellarium_user_guide-0.8.0-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 8 May 2006 17:06:01 -0000 1.8 +++ sources 31 May 2006 19:53:30 -0000 1.9 @@ -1,2 +1,2 @@ 2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz -9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf +2fd23dd0300af03cabc9ba5564cc919d stellarium_user_guide-0.8.0-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- stellarium.spec 8 May 2006 17:43:17 -0000 1.18 +++ stellarium.spec 31 May 2006 19:53:30 -0000 1.19 @@ -1,14 +1,14 @@ Name: stellarium Version: 0.8.0 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-%{version}.tar.gz +Source0: http://prdownloads.sf.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop -Source2: http://dl.sf.net/stellarum/stellarium_user_guide-0.7.1-1.pdf +Source2: http://prdownloads.sf.net/stellarum/stellarium_user_guide-0.8.0-1.pdf Patch1: stellarium-0.8.0-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,10 +81,14 @@ %files doc -%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf +%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.8.0-1.pdf %changelog -* Sun May 7 2006 Jochen Schmitt 0.8.0-2 +* Wed May 31 2006 Jochen Schmitt 0.8.0-4 +- Update user guide +- change dl.sf.net to prdownloads.sf.net + +* Sun May 7 2006 Jochen Schmitt 0.8.0-3 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 From fedora-extras-commits at redhat.com Wed May 31 20:02:28 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Wed, 31 May 2006 13:02:28 -0700 Subject: rpms/lua/FC-4 lua.spec,1.14,1.15 Message-ID: <200605312003.k4VK31iT020532@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481/FC-4 Modified Files: lua.spec Log Message: added requires for pkgconfig Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/lua.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lua.spec 29 May 2006 07:15:30 -0000 1.14 +++ lua.spec 31 May 2006 20:02:28 -0000 1.15 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -10,6 +10,7 @@ Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: pkgconfig BuildRequires: readline-devel, ncurses-devel Provides: %{name}-devel = %{version}-%{release} @@ -58,6 +59,9 @@ %changelog +* Thu Jun 01 2006 Michael J. Knox - 5.1-4 +- added Requires for pkgconfig BZ#193674 + * Mon May 29 2006 Michael J. Knox - 5.1-3 - added autotools patch from Petri Lehtinen, http://lua-users.org From fedora-extras-commits at redhat.com Wed May 31 20:02:34 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Wed, 31 May 2006 13:02:34 -0700 Subject: rpms/lua/FC-5 lua.spec,1.14,1.15 Message-ID: <200605312003.k4VK38FL020536@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481/FC-5 Modified Files: lua.spec Log Message: added requires for pkgconfig Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lua.spec 29 May 2006 07:15:31 -0000 1.14 +++ lua.spec 31 May 2006 20:02:34 -0000 1.15 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -10,6 +10,7 @@ Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: pkgconfig BuildRequires: readline-devel, ncurses-devel Provides: %{name}-devel = %{version}-%{release} @@ -58,6 +59,9 @@ %changelog +* Thu Jun 01 2006 Michael J. Knox - 5.1-4 +- added Requires for pkgconfig BZ#193674 + * Mon May 29 2006 Michael J. Knox - 5.1-3 - added autotools patch from Petri Lehtinen, http://lua-users.org From fedora-extras-commits at redhat.com Wed May 31 20:03:08 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:03:08 -0700 Subject: rpms/plplot/FC-5 plplot.spec,1.12,1.13 Message-ID: <200605312003.k4VK3Anv020557@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20531 Modified Files: plplot.spec Log Message: Remove octave patch applied upstream Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- plplot.spec 31 May 2006 19:47:20 -0000 1.12 +++ plplot.spec 31 May 2006 20:03:08 -0000 1.13 @@ -10,7 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch4: plplot-5.5.3-octave.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,7 +139,6 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch4 -p1 -b .orig %patch6 -p1 -b .orig From fedora-extras-commits at redhat.com Wed May 31 20:02:47 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Wed, 31 May 2006 13:02:47 -0700 Subject: rpms/lua/devel lua.spec,1.14,1.15 Message-ID: <200605312003.k4VK3Jp3020560@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481/devel Modified Files: lua.spec Log Message: added requires for pkgconfig Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lua.spec 29 May 2006 07:01:54 -0000 1.14 +++ lua.spec 31 May 2006 20:02:47 -0000 1.15 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -10,6 +10,7 @@ Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: pkgconfig BuildRequires: readline-devel, ncurses-devel Provides: %{name}-devel = %{version}-%{release} @@ -58,6 +59,9 @@ %changelog +* Thu Jun 01 2006 Michael J. Knox - 5.1-4 +- added Requires for pkgconfig BZ#193674 + * Mon May 29 2006 Michael J. Knox - 5.1-3 - added autotools patch from Petri Lehtinen, http://lua-users.org From fedora-extras-commits at redhat.com Wed May 31 20:04:13 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:04:13 -0700 Subject: rpms/plplot/FC-5 plplot-5.5.3-octave.patch, 1.1, NONE plplot-5.5.3-tk.patch, 1.2, NONE plplot-5.5.3-x86_64.patch, 1.1, NONE Message-ID: <200605312004.k4VK4FhL020693@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20674 Removed Files: plplot-5.5.3-octave.patch plplot-5.5.3-tk.patch plplot-5.5.3-x86_64.patch Log Message: Remove old patches --- plplot-5.5.3-octave.patch DELETED --- --- plplot-5.5.3-tk.patch DELETED --- --- plplot-5.5.3-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 20:07:16 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:07:16 -0700 Subject: rpms/plplot/devel plplot.spec, 1.11, 1.12 plplot-5.5.3-octave.patch, 1.1, NONE plplot-5.5.3-tk.patch, 1.2, NONE plplot-5.5.3-x86_64.patch, 1.1, NONE Message-ID: <200605312007.k4VK7I6T020802@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20785 Modified Files: plplot.spec Removed Files: plplot-5.5.3-octave.patch plplot-5.5.3-tk.patch plplot-5.5.3-x86_64.patch Log Message: Remove upstream applied patches Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- plplot.spec 31 May 2006 19:48:32 -0000 1.11 +++ plplot.spec 31 May 2006 20:07:16 -0000 1.12 @@ -10,7 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch4: plplot-5.5.3-octave.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,7 +139,6 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch4 -p1 -b .orig %patch6 -p1 -b .orig --- plplot-5.5.3-octave.patch DELETED --- --- plplot-5.5.3-tk.patch DELETED --- --- plplot-5.5.3-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 20:10:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:10:19 -0700 Subject: rpms/plplot/devel plplot.spec,1.12,1.13 Message-ID: <200605312010.k4VKALOH020845@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20812/devel Modified Files: plplot.spec Log Message: Add . to descriptions Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- plplot.spec 31 May 2006 20:07:16 -0000 1.12 +++ plplot.spec 31 May 2006 20:10:18 -0000 1.13 @@ -56,7 +56,7 @@ Requires: pkgconfig %description devel -%{summary} +%{summary}. %package gnome @@ -65,7 +65,7 @@ Requires: %{name} = %{version}-%{release} %description gnome -%{summary} +%{summary}. %package gnome-devel Summary: Development files for using PLplot GNOME @@ -76,7 +76,7 @@ Requires: pkgconfig %description gnome-devel -%{summary} +%{summary}. %package java @@ -85,7 +85,7 @@ Requires: %{name} = %{version}-%{release} %description java -%{summary} +%{summary}. %package java-devel Summary: Development files for using PLplot GNOME @@ -95,7 +95,7 @@ Requires: %{name}-java = %{version}-%{release} %description java-devel -%{summary} +%{summary}. %package octave @@ -104,7 +104,7 @@ Requires: %{name} = %{version}-%{release}, octave %description octave -%{summary} +%{summary}. %package tk @@ -113,7 +113,7 @@ Requires: %{name} = %{version}-%{release} %description tk -%{summary} +%{summary}. %package tk-devel Summary: Development files for using PLplot with Tk @@ -124,7 +124,7 @@ Requires: pkgconfig %description tk-devel -%{summary} +%{summary}. %package wxGTK @@ -133,7 +133,7 @@ Requires: %{name} = %{version}-%{release} %description wxGTK -%{summary} +%{summary}. %prep From fedora-extras-commits at redhat.com Wed May 31 20:10:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:10:19 -0700 Subject: rpms/plplot/FC-5 plplot.spec,1.13,1.14 Message-ID: <200605312010.k4VKALbC020849@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20812/FC-5 Modified Files: plplot.spec Log Message: Add . to descriptions Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- plplot.spec 31 May 2006 20:03:08 -0000 1.13 +++ plplot.spec 31 May 2006 20:10:19 -0000 1.14 @@ -56,7 +56,7 @@ Requires: pkgconfig %description devel -%{summary} +%{summary}. %package gnome @@ -65,7 +65,7 @@ Requires: %{name} = %{version}-%{release} %description gnome -%{summary} +%{summary}. %package gnome-devel Summary: Development files for using PLplot GNOME @@ -76,7 +76,7 @@ Requires: pkgconfig %description gnome-devel -%{summary} +%{summary}. %package java @@ -85,7 +85,7 @@ Requires: %{name} = %{version}-%{release} %description java -%{summary} +%{summary}. %package java-devel Summary: Development files for using PLplot GNOME @@ -95,7 +95,7 @@ Requires: %{name}-java = %{version}-%{release} %description java-devel -%{summary} +%{summary}. %package octave @@ -104,7 +104,7 @@ Requires: %{name} = %{version}-%{release}, octave %description octave -%{summary} +%{summary}. %package tk @@ -113,7 +113,7 @@ Requires: %{name} = %{version}-%{release} %description tk -%{summary} +%{summary}. %package tk-devel Summary: Development files for using PLplot with Tk @@ -124,7 +124,7 @@ Requires: pkgconfig %description tk-devel -%{summary} +%{summary}. %package wxGTK @@ -133,7 +133,7 @@ Requires: %{name} = %{version}-%{release} %description wxGTK -%{summary} +%{summary}. %prep From fedora-extras-commits at redhat.com Wed May 31 20:16:46 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:16:46 -0700 Subject: rpms/plplot/FC-4 .cvsignore, 1.5, 1.6 plplot.spec, 1.4, 1.5 sources, 1.5, 1.6 plplot-5.5.3-octave.patch, 1.1, NONE plplot-5.5.3-tk.patch, 1.1, NONE plplot-5.5.3-x86_64.patch, 1.1, NONE Message-ID: <200605312016.k4VKGmXq020901@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20880 Modified Files: .cvsignore plplot.spec sources Removed Files: plplot-5.5.3-octave.patch plplot-5.5.3-tk.patch plplot-5.5.3-x86_64.patch Log Message: - Update to 5.6.1 - Remove patches applied upstream - Now include pkgconfig files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 May 2006 17:57:10 -0000 1.5 +++ .cvsignore 31 May 2006 20:16:46 -0000 1.6 @@ -1 +1 @@ -plplot-5.6.0.tar.gz +plplot-5.6.1.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plplot.spec 9 May 2006 17:57:10 -0000 1.4 +++ plplot.spec 31 May 2006 20:16:46 -0000 1.5 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.6.0 +Version: 5.6.1 Release: 1%{?dist} Summary: Library of functions for making scientific plots @@ -10,9 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch1: plplot-5.5.3-tk.patch -Patch3: plplot-5.5.3-x86_64.patch -Patch4: plplot-5.5.3-octave.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel @@ -60,6 +57,7 @@ Summary: Development headers and libraries for PLplot Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel %{summary}. @@ -79,6 +77,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} +Requires: pkgconfig %description gnome-devel %{summary}. @@ -128,6 +127,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} +Requires: pkgconfig %description tk-devel %{summary}. @@ -145,9 +145,6 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch1 -p1 -b .orig -%patch3 -p1 -b .orig -%patch4 -p1 -b .orig %build @@ -272,6 +269,10 @@ %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so +%{_libdir}/pkgconfig/plplotd.pc +%{_libdir}/pkgconfig/plplotd-c++.pc +%{_libdir}/pkgconfig/plplotd-f77.pc +%{_libdir}/pkgconfig/plplotd-f95.pc %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ @@ -292,6 +293,7 @@ %files gnome-devel %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so +%{_libdir}/pkgconfig/plplotd-gnome2.pc %ifarch %{ix86} x86_64 %files java @@ -330,6 +332,7 @@ %defattr(-,root,root,-) %{_libdir}/libplplottcltkd.so %{_libdir}/libtclmatrixd.so +%{_libdir}/pkgconfig/plplotd-tcl.pc %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ @@ -340,6 +343,11 @@ %changelog +* Wed May 31 2006 - Orion Poplawski - 5.6.1-1 +- Update to 5.6.1 +- Remove patches applied upstream +- Now include pkgconfig files + * Tue May 9 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver - Add wxGTK support Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 May 2006 17:57:10 -0000 1.5 +++ sources 31 May 2006 20:16:46 -0000 1.6 @@ -1 +1 @@ -0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz +51029b256f3333449de9bcd3e00c088f plplot-5.6.1.tar.gz --- plplot-5.5.3-octave.patch DELETED --- --- plplot-5.5.3-tk.patch DELETED --- --- plplot-5.5.3-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 20:23:04 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:23:04 -0700 Subject: rpms/plplot/devel plplot.spec,1.13,1.14 Message-ID: <200605312023.k4VKN6s2020988@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943/devel Modified Files: plplot.spec Log Message: pstex driver no longer shipped Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- plplot.spec 31 May 2006 20:10:18 -0000 1.13 +++ plplot.spec 31 May 2006 20:23:03 -0000 1.14 @@ -224,8 +224,6 @@ %{_libdir}/plplot%{version}/driversd/plmeta.so %{_libdir}/plplot%{version}/driversd/ps.rc %{_libdir}/plplot%{version}/driversd/ps.so -%{_libdir}/plplot%{version}/driversd/pstex.rc -%{_libdir}/plplot%{version}/driversd/pstex.so %{_libdir}/plplot%{version}/driversd/psttf.rc %{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc @@ -354,6 +352,7 @@ - Enable f95 bindings - Remove patches applied upstream - Now include pkgconfig files +- pstex driver no longer shipped * Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver From fedora-extras-commits at redhat.com Wed May 31 20:23:04 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:23:04 -0700 Subject: rpms/plplot/FC-4 plplot.spec,1.5,1.6 Message-ID: <200605312023.k4VKN6cY020992@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943/FC-4 Modified Files: plplot.spec Log Message: pstex driver no longer shipped Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plplot.spec 31 May 2006 20:16:46 -0000 1.5 +++ plplot.spec 31 May 2006 20:23:04 -0000 1.6 @@ -227,8 +227,6 @@ %{_libdir}/plplot%{version}/driversd/plmeta.so %{_libdir}/plplot%{version}/driversd/ps.rc %{_libdir}/plplot%{version}/driversd/ps.so -%{_libdir}/plplot%{version}/driversd/pstex.rc -%{_libdir}/plplot%{version}/driversd/pstex.so %{_libdir}/plplot%{version}/driversd/psttf.rc %{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc @@ -347,6 +345,7 @@ - Update to 5.6.1 - Remove patches applied upstream - Now include pkgconfig files +- pstex driver no longer shipped * Tue May 9 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver From fedora-extras-commits at redhat.com Wed May 31 20:23:05 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:23:05 -0700 Subject: rpms/plplot/FC-5 plplot.spec,1.14,1.15 Message-ID: <200605312023.k4VKN7kE020996@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943/FC-5 Modified Files: plplot.spec Log Message: pstex driver no longer shipped Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- plplot.spec 31 May 2006 20:10:19 -0000 1.14 +++ plplot.spec 31 May 2006 20:23:05 -0000 1.15 @@ -224,8 +224,6 @@ %{_libdir}/plplot%{version}/driversd/plmeta.so %{_libdir}/plplot%{version}/driversd/ps.rc %{_libdir}/plplot%{version}/driversd/ps.so -%{_libdir}/plplot%{version}/driversd/pstex.rc -%{_libdir}/plplot%{version}/driversd/pstex.so %{_libdir}/plplot%{version}/driversd/psttf.rc %{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc @@ -354,6 +352,7 @@ - Enable f95 bindings - Remove patches applied upstream - Now include pkgconfig files +- pstex driver no longer shipped * Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver From fedora-extras-commits at redhat.com Wed May 31 20:42:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 13:42:33 -0700 Subject: rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen.patch, 1.2, 1.3 xgalaxy-2.0.34-xgalaxy.patch, 1.2, 1.3 xgalaxy.spec, 1.2, 1.3 Message-ID: <200605312042.k4VKgZ1Z021230@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21202 Modified Files: xgalaxy-2.0.34-fullscreen.patch xgalaxy-2.0.34-xgalaxy.patch xgalaxy.spec Log Message: * Mon May 22 2006 Hans de Goede 2.0.34-3 - Fixed ships not being centered when flying in in level 1 - Fixed artifacts (ships not yet on screen showing) in level 2 - Added -winsize widthxheight option, which can be used to specify an alternative window size - Documented the -level, -window, -winsize switch in the manpage. xgalaxy-2.0.34-fullscreen.patch: Index: xgalaxy-2.0.34-fullscreen.patch =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-fullscreen.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xgalaxy-2.0.34-fullscreen.patch 31 May 2006 15:16:41 -0000 1.2 +++ xgalaxy-2.0.34-fullscreen.patch 31 May 2006 20:42:33 -0000 1.3 @@ -1,50 +1,199 @@ ---- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/struct.h 2006-05-31 16:56:50.000000000 +0200 -@@ -55,6 +55,8 @@ - W_Callback handle_button; - W_Callback handle_expose; - #endif /* 0 */ -+ W_Window wm_window; -+ Window fs_window; - }; +--- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200 ++++ xgalaga-2.0.34/Wproto.h 2006-05-31 22:28:06.000000000 +0200 +@@ -63,6 +63,7 @@ + W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); + W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); + void W_SetIconWindow(W_Window win, W_Window icon); ++void W_ToggleFullscreen(W_Window win); + /* point.c */ + void W_DrawPoint(W_Window window, int x, int y, W_Color color); + void FlushPointCache(Window win, int color); +--- xgalaga-2.0.34/data.h.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/data.h 2006-05-31 22:28:06.000000000 +0200 +@@ -35,6 +35,9 @@ + extern int mouseControl; + extern int wantStars; - struct stringList { ---- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/data.c 2006-05-31 16:56:50.000000000 +0200 -@@ -158,3 +158,6 @@ ++extern int winwidth; ++extern int winheight; ++ + extern int alien_shape[]; - int useBuffered = 1; + extern int weapon; +--- xgalaga-2.0.34/main.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/main.c 2006-05-31 22:28:06.000000000 +0200 +@@ -32,6 +32,7 @@ + static int attacking = 0, maxattacking, entering=0; + static int maxetorps = 5, numetorps=0; + static int plflash = 50; ++static int fullscreen = 0; + #ifndef ORIGINAL_XGALAGA + static int shots = 0; + static int hits = 0; +@@ -63,10 +64,14 @@ + xgal_exit(int v) + { + /* W_AutoRepeatOn();*/ ++ /* Destroy our main window so the fullscreen mode gets unset if we're ++ running fullscreen. (We should really clean up much more here!) */ ++ W_DestroyWindow(shellWin); + #ifdef SOUND + kill_sound(); + #endif + /* sleep(1);*/ /* Without this, the auto-repeat request fails on my machine... */ ++ /* Note if we ever need this autorepeat thingie again, the sleep can and should be replaced by a call to XSync() */ + exit(v); + } -+#ifdef XF86VIDMODE -+struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 }; -+#endif ---- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-31 16:56:50.000000000 +0200 -@@ -91,6 +91,22 @@ +@@ -89,6 +94,8 @@ + -mouse Use mouse control (same as 'm' at the title screen)\n\ + -keyboard Use keyboard control (same as 'k')\n%s\ + -level Choose starting level (>= 1)\n\ ++-window Start in windowed mode instead of fullscreen\n\ ++-winsize Window size (default 468 x 596)\n\ + -b turn buffered mode off, use this if it runs\n\ + too slowly. Will cause flicker, maybe lots,\n\ + maybe only a little.\n\ +@@ -100,7 +107,8 @@ + p - pauses\n\ + q - end this game\n\ + b - Toggle buffering (flicker vs. speed.)\n\ +-o - Toggle OR mode. Don't use this, it sucks.\n", VERSION, ++o - Toggle OR mode. Don't use this, it sucks.\n\ ++alt + enter - Toggle fullscreen - window\n", VERSION, + PRINT_SOUND + ); + } +@@ -470,8 +478,8 @@ + if(convoyx <= 0) { + convoyx=0; + convoymove = -convoymove; +- } else if(convoyx >= WINWIDTH/2) { +- convoyx = WINWIDTH/2; ++ } else if(convoyx >= (WINWIDTH-180)) { ++ convoyx = WINWIDTH - 180; + convoymove = -convoymove; + } + } +@@ -844,6 +852,14 @@ + case 'm': + mouseControl = 2; + break; ++ case '\r'+256: ++ W_ToggleFullscreen(shellWin); ++ fullscreen = !fullscreen; ++ if (fullscreen) ++ W_BlankCursor(baseWin); ++ else ++ W_RevertCursor(baseWin); ++ break; + default: + break; + } +@@ -997,6 +1013,14 @@ + maxtorps = MINTORPS; + break; + #endif /* IM_A_BIG_FAT_CHEATER */ ++ case '\r'+256: ++ W_ToggleFullscreen(shellWin); ++ fullscreen = !fullscreen; ++ if (fullscreen) ++ W_BlankCursor(baseWin); ++ else ++ W_RevertCursor(baseWin); ++ break; + default: + break; + } +@@ -1214,9 +1238,11 @@ + int ac; + char *dpyname = 0; + int mx, my, but; ++ int start_fullscreen = 1; + + for(ac = 1; ac < argc; ac++) { + if(*argv[ac] == '-') { ++ int w, h; + if(strcmp(argv[ac], "-scores") == 0) { + print_scores(); + exit(0); +@@ -1245,6 +1271,12 @@ + useOR = 0; + } else if (strcmp(argv[ac], "-noclipmask") == 0) { + useClipMask = 0; ++ } else if (strcmp(argv[ac], "-window") == 0) { ++ start_fullscreen = 0; ++ } else if ((strcmp(argv[ac], "-winsize") == 0) && (++ac < argc) && ++ (sscanf(argv[ac], "%dx%d", &w, &h) == 2)) { ++ WINWIDTH = w; ++ WINHEIGHT = h; + } else { + print_usage(); + exit(0); +@@ -1258,11 +1290,18 @@ + W_Initialize(dpyname); - extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; - extern unsigned long w_socket; -+ -+/* For XF86VIDMODE Support */ -+#ifdef XF86VIDMODE -+#include -+#include -+ -+struct xf86vidmode_data { -+ int vidmode_available; -+ XF86VidModeModeInfo orig_mode; -+ int orig_viewport_x; -+ int orig_viewport_y; -+}; -+ -+extern struct xf86vidmode_data XF86VidModeData; -+#endif + backColor = W_Black; ++ WINHEIGHT -= (W_Textheight+1); + shellWin = W_MakeWindow("XGalaga", 0, 0, WINWIDTH, WINHEIGHT + W_Textheight+1, 0, "tiny", 0, W_White); + baseWin = W_MakeWindow("", 0, W_Textheight+1, WINWIDTH, WINHEIGHT, shellWin, "tiny", 0, W_White); + W_Buffer(shellWin, 0); + W_MapWindow(shellWin); + W_MapWindow(baseWin); ++ if (start_fullscreen) ++ { ++ W_ToggleFullscreen(shellWin); ++ W_BlankCursor(baseWin); ++ fullscreen = 1; ++ } + + /* W_AutoRepeatOff();*/ + +--- xgalaga-2.0.34/paths.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/paths.c 2006-05-31 22:30:58.000000000 +0200 +@@ -159,6 +159,8 @@ + { 6,80, -1,-1, }, + }; + ++/* These aren't used anymore! (see filepath.c) Maybe we should nuke them? */ ++#if 0 + /* enter_paths are for new ships. consists of starting co-ordinates, number of frames + to wait at the start (presumably offscreen) and a path to follow. + path -1 means this ship is not used on this level +@@ -1159,6 +1161,8 @@ + }, + }; + ++#endif /* This isn't used anymore! Maybe we should nuke it */ + - #endif /* AMIGA */ + void path_dir(int path, int pos, int *dir, int *steer) + { + *dir = paths[path][pos][0]; +--- xgalaga-2.0.34/pathfile.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/pathfile.c 2006-05-31 22:28:06.000000000 +0200 +@@ -387,8 +387,8 @@ - #if 0 + void get_xy(int anum, int* x, int* y) + { +- *x = pathinfo[al_paths[anum]].startx; +- *y = pathinfo[al_paths[anum]].starty; ++ *x = (WINWIDTH * pathinfo[al_paths[anum]].startx) / 400; ++ *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500; + } + + int get_delay(int anum) +--- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-31 22:28:06.000000000 +0200 +@@ -63,6 +63,7 @@ + W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); + W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); + void W_SetIconWindow(W_Window win, W_Window icon); ++void W_ToggleFullscreen(W_Window win); + /* point.c */ + void W_DrawPoint(W_Window window, int x, int y, W_Color color); + void FlushPointCache(Window win, int color); --- xgalaga-2.0.34/libsprite/mapwindow.c.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-31 22:28:06.000000000 +0200 @@ -13,6 +13,8 @@ if(win->type != WIN_BORDER && win->borderwin) { W_MapWindow(win->borderwin); @@ -90,52 +239,53 @@ } void ---- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/init.c 2006-05-31 16:56:50.000000000 +0200 -@@ -356,6 +356,31 @@ - XFreeModifiermap(m); - } +--- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/struct.h 2006-05-31 22:28:06.000000000 +0200 +@@ -55,6 +55,8 @@ + W_Callback handle_button; + W_Callback handle_expose; + #endif /* 0 */ ++ W_Window wm_window; ++ Window fs_window; + }; + + struct stringList { +--- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-31 22:28:06.000000000 +0200 +@@ -91,6 +91,22 @@ + extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; + extern unsigned long w_socket; ++ ++/* For XF86VIDMODE Support */ +#ifdef XF86VIDMODE -+static void -+xf86_vidmode_init ( void ) -+{ -+ int i,j; -+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) -+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); -+ -+ if (!XF86VidModeQueryVersion(W_Display, &i, &j)) -+ XF86VidModeData.vidmode_available = 0; -+ else if (!XF86VidModeQueryExtension(W_Display, &i, &j)) -+ XF86VidModeData.vidmode_available = 0; -+ else if (!XF86VidModeGetModeLine(W_Display, W_Screen, -+ (int *)&XF86VidModeData.orig_mode.dotclock, l)) -+ XF86VidModeData.vidmode_available = 0; -+ else if (!XF86VidModeGetViewPort(W_Display, W_Screen, -+ &XF86VidModeData.orig_viewport_x, -+ &XF86VidModeData.orig_viewport_y)) -+ XF86VidModeData.vidmode_available = 0; -+ -+ if (!XF86VidModeData.vidmode_available) -+ fprintf(stderr, "Warning: XF86VidMode not available\n"); -+} ++#include ++#include ++ ++struct xf86vidmode_data { ++ int vidmode_available; ++ XF86VidModeModeInfo orig_mode; ++ int orig_viewport_x; ++ int orig_viewport_y; ++}; ++ ++extern struct xf86vidmode_data XF86VidModeData; +#endif + - void - W_Initialize(str) - char *str; -@@ -395,5 +420,9 @@ - GetAltMask(); + #endif /* AMIGA */ + + #if 0 +--- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/data.c 2006-05-31 22:28:06.000000000 +0200 +@@ -158,3 +158,6 @@ + + int useBuffered = 1; - backColor = W_Black; -+ +#ifdef XF86VIDMODE -+ xf86_vidmode_init(); ++struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 }; +#endif - } - ---- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-31 16:56:50.000000000 +0200 +--- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-31 22:28:06.000000000 +0200 @@ -236,6 +236,10 @@ neww->type = type; neww->mapped = 0; @@ -379,32 +529,52 @@ + W_RevertCursor(_win); + } +} ---- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-31 16:56:50.000000000 +0200 -@@ -63,6 +63,7 @@ - W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); - W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); - void W_SetIconWindow(W_Window win, W_Window icon); -+void W_ToggleFullscreen(W_Window win); - /* point.c */ - void W_DrawPoint(W_Window window, int x, int y, W_Color color); - void FlushPointCache(Window win, int color); ---- xgalaga-2.0.34/defs.h.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/defs.h 2006-05-31 16:56:50.000000000 +0200 -@@ -26,8 +26,9 @@ - - #define TORPDELAY 5 +--- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/init.c 2006-05-31 22:28:06.000000000 +0200 +@@ -356,6 +356,31 @@ + XFreeModifiermap(m); + } --#define WINWIDTH 400 --#define WINHEIGHT 500 -+/* Modified slightly to better fit on 800x600 in fullscreen mode */ -+#define WINWIDTH 464 /* was 400 */ -+#define WINHEIGHT 580 /* was 500 */ ++#ifdef XF86VIDMODE ++static void ++xf86_vidmode_init ( void ) ++{ ++ int i,j; ++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) ++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); ++ ++ if (!XF86VidModeQueryVersion(W_Display, &i, &j)) ++ XF86VidModeData.vidmode_available = 0; ++ else if (!XF86VidModeQueryExtension(W_Display, &i, &j)) ++ XF86VidModeData.vidmode_available = 0; ++ else if (!XF86VidModeGetModeLine(W_Display, W_Screen, ++ (int *)&XF86VidModeData.orig_mode.dotclock, l)) ++ XF86VidModeData.vidmode_available = 0; ++ else if (!XF86VidModeGetViewPort(W_Display, W_Screen, ++ &XF86VidModeData.orig_viewport_x, ++ &XF86VidModeData.orig_viewport_y)) ++ XF86VidModeData.vidmode_available = 0; ++ ++ if (!XF86VidModeData.vidmode_available) ++ fprintf(stderr, "Warning: XF86VidMode not available\n"); ++} ++#endif ++ + void + W_Initialize(str) + char *str; +@@ -395,5 +420,9 @@ + GetAltMask(); - #define NUMSTARS 30 + backColor = W_Black; ++ ++#ifdef XF86VIDMODE ++ xf86_vidmode_init(); ++#endif + } --- xgalaga-2.0.34/Wlib.h.fs 1998-04-12 08:03:20.000000000 +0200 -+++ xgalaga-2.0.34/Wlib.h 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/Wlib.h 2006-05-31 22:28:06.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; @@ -428,146 +598,68 @@ #endif /* AMIGA */ #if 0 ---- xgalaga-2.0.34/main.c.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/main.c 2006-05-31 16:56:50.000000000 +0200 -@@ -32,6 +32,7 @@ - static int attacking = 0, maxattacking, entering=0; - static int maxetorps = 5, numetorps=0; - static int plflash = 50; -+static int fullscreen = 0; - #ifndef ORIGINAL_XGALAGA - static int shots = 0; - static int hits = 0; -@@ -63,10 +64,14 @@ - xgal_exit(int v) - { - /* W_AutoRepeatOn();*/ -+ /* Destroy our main window so the fullscreen mode gets unset if we're -+ running fullscreen. (We should really clean up much more here!) */ -+ W_DestroyWindow(shellWin); - #ifdef SOUND - kill_sound(); - #endif - /* sleep(1);*/ /* Without this, the auto-repeat request fails on my machine... */ -+ /* Note if we ever need this autorepeat thingie again, the sleep can and should be replaced by a call to XSync() */ - exit(v); - } +--- xgalaga-2.0.34/data.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/data.c 2006-05-31 22:28:06.000000000 +0200 +@@ -32,6 +32,10 @@ + int mouseControl = 0; + int wantStars = 1; -@@ -89,6 +94,7 @@ - -mouse Use mouse control (same as 'm' at the title screen)\n\ - -keyboard Use keyboard control (same as 'k')\n%s\ - -level Choose starting level (>= 1)\n\ -+-window Start in windowed mode instead of fullscreen\n\ - -b turn buffered mode off, use this if it runs\n\ - too slowly. Will cause flicker, maybe lots,\n\ - maybe only a little.\n\ -@@ -105,7 +111,8 @@ - p - pauses\n\ - q - end this game\n\ - b - Toggle buffering (flicker vs. speed.)\n\ --o - Toggle OR mode. Don't use this, it sucks.\n", VERSION, -+o - Toggle OR mode. Don't use this, it sucks.\n\ -+alt + enter - Toggle fullscreen - window\n", VERSION, - PRINT_SOUND - ); - } -@@ -844,6 +851,14 @@ - case 'm': - mouseControl = 2; - break; -+ case '\r'+256: -+ W_ToggleFullscreen(shellWin); -+ fullscreen = !fullscreen; -+ if (fullscreen) -+ W_BlankCursor(baseWin); -+ else -+ W_RevertCursor(baseWin); -+ break; - default: - break; - } -@@ -997,6 +1012,14 @@ - maxtorps = MINTORPS; - break; - #endif /* IM_A_BIG_FAT_CHEATER */ -+ case '\r'+256: -+ W_ToggleFullscreen(shellWin); -+ fullscreen = !fullscreen; -+ if (fullscreen) -+ W_BlankCursor(baseWin); -+ else -+ W_RevertCursor(baseWin); -+ break; - default: - break; - } -@@ -1214,6 +1237,7 @@ - int ac; - char *dpyname = 0; - int mx, my, but; -+ int start_fullscreen = 1; - - for(ac = 1; ac < argc; ac++) { - if(*argv[ac] == '-') { -@@ -1245,6 +1269,8 @@ - useOR = 0; - } else if (strcmp(argv[ac], "-noclipmask") == 0) { - useClipMask = 0; -+ } else if (strcmp(argv[ac], "-window") == 0) { -+ start_fullscreen = 0; - } else { - print_usage(); - exit(0); -@@ -1263,6 +1289,12 @@ - W_Buffer(shellWin, 0); - W_MapWindow(shellWin); - W_MapWindow(baseWin); -+ if (start_fullscreen) -+ { -+ W_ToggleFullscreen(shellWin); -+ W_BlankCursor(baseWin); -+ fullscreen = 1; -+ } ++/* Modified slightly to better fit on 800x600 in fullscreen mode */ ++int winwidth = 468; /* was 400 */ ++int winheight = 596; /* was 511 */ ++ + int alien_shape[ALIENSHAPES] = { + I_ALIEN1, + I_ALIEN2, +--- xgalaga-2.0.34/defs.h.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/defs.h 2006-05-31 22:28:06.000000000 +0200 +@@ -26,8 +26,8 @@ - /* W_AutoRepeatOff();*/ + #define TORPDELAY 5 ---- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200 -+++ xgalaga-2.0.34/Wproto.h 2006-05-31 16:56:50.000000000 +0200 -@@ -63,6 +63,7 @@ - W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); - W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); - void W_SetIconWindow(W_Window win, W_Window icon); -+void W_ToggleFullscreen(W_Window win); - /* point.c */ - void W_DrawPoint(W_Window window, int x, int y, W_Color color); - void FlushPointCache(Window win, int color); ---- xgalaga-2.0.34/xgal.6x.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/xgal.6x 2006-05-31 16:56:50.000000000 +0200 -@@ -4,11 +4,11 @@ +-#define WINWIDTH 400 +-#define WINHEIGHT 500 ++#define WINWIDTH winwidth /* was 400 */ ++#define WINHEIGHT winheight /* was 500 */ + + #define NUMSTARS 30 + +--- xgalaga-2.0.34/xgal.6x.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/xgal.6x 2006-05-31 22:31:02.000000000 +0200 +@@ -3,12 +3,12 @@ + xgalaga \- X11 version of the famous Galaga game .SH SYNOPSIS .B xgalaga - [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] +-[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] -[-noclipmask] [-nouseor] [-nostars] -+[-noclipmask] [-nouseor] [-nostars] [-window] ++[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl] ++[-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars] .P .B xgalaga-hyperspace - [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] +-[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] -[-noclipmask] [-nouseor] [-nostars] -+[-noclipmask] [-nouseor] [-nostars] [-window] ++[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl] ++[-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars] .SH INSTRUCTIONS .LP It's Galaga, you know how to play Galaga, stop bothering me. -@@ -35,6 +35,9 @@ +@@ -35,6 +35,15 @@ .B \-nosound Turn sound OFF .TP 8 ++.B \-level \fIlvl\fP ++Choose starting level (>= 1) ++.TP 8 +.B \-window +Run in a window, not full screen. Full screen is the default. +.TP 8 ++.B \-winsize \fIwidthxheight\fP ++Set windowsize, default 468x596. ++.TP 8 .B \-b Turn buffered mode off, use this if it runs too slowly. Will cause flicker, maybe lots, maybe only a little. -@@ -68,6 +71,8 @@ +@@ -68,6 +77,8 @@ k - Use keyboard control .TP 8 x - use your shields (xgalaga-hyperspace only) @@ -576,16 +668,3 @@ .SH "SEE ALSO" Xgalaga home page .RI < http://rumsey.org/xgal.html > ---- xgalaga-2.0.34/pathfile.c.fs 2006-05-31 17:08:48.000000000 +0200 -+++ xgalaga-2.0.34/pathfile.c 2006-05-31 17:09:37.000000000 +0200 -@@ -387,8 +387,8 @@ - - void get_xy(int anum, int* x, int* y) - { -- *x = pathinfo[al_paths[anum]].startx; -- *y = pathinfo[al_paths[anum]].starty; -+ *x = (WINWIDTH * pathinfo[al_paths[anum]].startx) / 400; -+ *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500; - } - - int get_delay(int anum) xgalaxy-2.0.34-xgalaxy.patch: Index: xgalaxy-2.0.34-xgalaxy.patch =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-xgalaxy.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 15:16:41 -0000 1.2 +++ xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 20:42:33 -0000 1.3 @@ -1,62 +1,5 @@ ---- xgalaga-2.0.34/README.xgalaxy 2006-05-22 15:31:00.000000000 +0200 -+++ xgalaga-2.0.34/README 2006-05-22 15:30:59.000000000 +0200 -@@ -44,9 +44,9 @@ - print usage and version. - - Basic instructions: -- It's Galaga, you know how to play Galaga, stop bothering me. -- (Ship follows the mouse, button fires. Auto-fire by holding it -- down, so no-one accuses me of breaking their mouse!) -+ It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, -+ stop bothering me. (Ship follows the mouse, button fires. Auto-fire by -+ holding it down, so no-one accuses me of breaking their mouse!) - - Keyboard commands: - -@@ -73,7 +73,7 @@ - games written quickly and painlessly. - - Credits: -- Galaga code: -+ XGalaxy code: - Joe Rumsey (mrogre at mediaone.net) - X interface: - Bill Dyess(dyessww at eng.auburn.edu), ---- xgalaga-2.0.34/xgal.6x.xgalaxy 2006-05-22 15:30:59.000000000 +0200 -+++ xgalaga-2.0.34/xgal.6x 2006-05-22 15:30:59.000000000 +0200 -@@ -1,6 +1,6 @@ --.TH XGALAGA 6x "23 April 2003" "2.0.34" -+.TH XGALAXY 6 "23 April 2003" "2.0.34" - .SH NAME --xgalaga \- X11 version of the famous Galaga game -+xgalaga \- X11 Galaga like game - .SH SYNOPSIS - .B xgalaxy - [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] -@@ -11,9 +11,9 @@ - [-noclipmask] [-nouseor] [-nostars] [-window] - .SH INSTRUCTIONS - .LP --It's Galaga, you know how to play Galaga, stop bothering me. --(Ship follows the mouse, button fires. Auto-fire by holding it --down, so no-one accuses me of breaking their mouse!) -+It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, -+stop bothering me. (Ship follows the mouse, button fires. Auto-fire by -+holding it down, so no-one accuses me of breaking their mouse!) - .P - The xgalaxy-hyperspace version features some new weapons and different - gameplay. -@@ -71,7 +71,7 @@ - .TP 8 - alt-enter - Toggle full screen node. - .SH "SEE ALSO" --Xgalaga home page -+XGalaxy home page - .RI < http://rumsey.org/xgal.html > - .SH AUTHORS - Joe Rumsey, <\fIjoe at rumsey.org\fP> (Original author) ---- xgalaga-2.0.34/images.c.xgalaxy 2006-05-22 15:31:13.000000000 +0200 -+++ xgalaga-2.0.34/images.c 2006-05-22 16:14:13.000000000 +0200 +--- xgalaga-2.0.34/images.c.xgalaxy 2006-05-31 22:24:50.000000000 +0200 ++++ xgalaga-2.0.34/images.c 2006-05-31 22:24:50.000000000 +0200 @@ -6786,54 +6786,108 @@ /* XPM */ static char * title_xpm[] = { @@ -212,3 +155,83 @@ /* keep sorted (for bsearch) [BDyess] */ static W_Image imagearray[] = { +--- xgalaga-2.0.34/README.xgalaxy 2006-05-31 22:24:51.000000000 +0200 ++++ xgalaga-2.0.34/README 2006-05-31 22:24:51.000000000 +0200 +@@ -44,9 +44,9 @@ + print usage and version. + + Basic instructions: +- It's Galaga, you know how to play Galaga, stop bothering me. +- (Ship follows the mouse, button fires. Auto-fire by holding it +- down, so no-one accuses me of breaking their mouse!) ++ It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, ++ stop bothering me. (Ship follows the mouse, button fires. Auto-fire by ++ holding it down, so no-one accuses me of breaking their mouse!) + + Keyboard commands: + +@@ -73,7 +73,7 @@ + games written quickly and painlessly. + + Credits: +- Galaga code: ++ XGalaxy code: + Joe Rumsey (mrogre at mediaone.net) + X interface: + Bill Dyess(dyessww at eng.auburn.edu), +--- xgalaga-2.0.34/main.c.xgalaxy 2006-05-31 22:25:01.000000000 +0200 ++++ xgalaga-2.0.34/main.c 2006-05-31 22:26:42.000000000 +0200 +@@ -97,15 +97,15 @@ + -window Start in windowed mode instead of fullscreen\n\ + -winsize Window size (default 468 x 596)\n\ + -b turn buffered mode off, use this if it runs\n\ +-too slowly. Will cause flicker, maybe lots,\n\ +-maybe only a little.\n\ ++ too slowly. Will cause flicker, maybe lots,\n\ ++ maybe only a little.\n\ + \n\ + This game is now free software, under the GPL\n\ + \n\ + Basic instructions:\n\ +-It's Galaga, you know how to play Galaga, stop bothering me.\n\ +-(Ship follows the mouse, button fires. Auto-fire by holding it\n\ +-down, so no-one accuses me of breaking their mouse!)\n\ ++It's just like Galaxian / Galaga, you know how to play Galaxian / Galaga,\n\ ++stop bothering me. (Ship follows the mouse, button fires. Auto-fire by\n\ ++holding it down, so no-one accuses me of breaking their mouse!)\n\ + \n\ + Keyboard commands:\n\ + \n\ +--- xgalaga-2.0.34/xgal.6x.xgalaxy 2006-05-31 22:24:51.000000000 +0200 ++++ xgalaga-2.0.34/xgal.6x 2006-05-31 22:24:51.000000000 +0200 +@@ -1,6 +1,6 @@ +-.TH XGALAGA 6x "23 April 2003" "2.0.34" ++.TH XGALAXY 6 "23 April 2003" "2.0.34" + .SH NAME +-xgalaga \- X11 version of the famous Galaga game ++xgalaga \- X11 Galaga like game + .SH SYNOPSIS + .B xgalaga + [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl] +@@ -11,9 +11,9 @@ + [-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars] + .SH INSTRUCTIONS + .LP +-It's Galaga, you know how to play Galaga, stop bothering me. +-(Ship follows the mouse, button fires. Auto-fire by holding it +-down, so no-one accuses me of breaking their mouse!) ++It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, ++stop bothering me. (Ship follows the mouse, button fires. Auto-fire by ++holding it down, so no-one accuses me of breaking their mouse!) + .P + The xgalaga-hyperspace version features some new weapons and different + gameplay. +@@ -80,7 +80,7 @@ + .TP 8 + alt-enter - Toggle full screen node. + .SH "SEE ALSO" +-Xgalaga home page ++XGalaxy home page + .RI < http://rumsey.org/xgal.html > + .SH AUTHORS + Joe Rumsey, <\fIjoe at rumsey.org\fP> (Original author) Index: xgalaxy.spec =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xgalaxy.spec 31 May 2006 15:16:41 -0000 1.2 +++ xgalaxy.spec 31 May 2006 20:42:33 -0000 1.3 @@ -98,7 +98,11 @@ %changelog * Mon May 22 2006 Hans de Goede 2.0.34-3 -- Documented the new -window switch in the manpage. +- Fixed ships not being centered when flying in in level 1 +- Fixed artifacts (ships not yet on screen showing) in level 2 +- Added -winsize widthxheight option, which can be used to specify an + alternative window size +- Documented the -level, -window, -winsize switch in the manpage. * Mon May 22 2006 Hans de Goede 2.0.34-2 - Change name to xgalaxy because??upstreams name has already been used for a From fedora-extras-commits at redhat.com Wed May 31 20:52:54 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:52:54 -0700 Subject: rpms/plplot/FC-4 plplot.spec,1.6,1.7 Message-ID: <200605312052.k4VKqubO021310@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21293 Modified Files: plplot.spec Log Message: Remove f95 file that snuck in Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plplot.spec 31 May 2006 20:23:04 -0000 1.6 +++ plplot.spec 31 May 2006 20:52:54 -0000 1.7 @@ -270,7 +270,6 @@ %{_libdir}/pkgconfig/plplotd.pc %{_libdir}/pkgconfig/plplotd-c++.pc %{_libdir}/pkgconfig/plplotd-f77.pc -%{_libdir}/pkgconfig/plplotd-f95.pc %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ From fedora-extras-commits at redhat.com Wed May 31 21:29:43 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 14:29:43 -0700 Subject: rpms/gtklp/devel .cvsignore, 1.2, 1.3 gtklp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605312129.k4VLTklF023938@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/devel Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 16:16:12 -0000 1.2 +++ .cvsignore 31 May 2006 21:29:43 -0000 1.3 @@ -1 +1 @@ -gtklp-1.2.1.src.tar.gz +gtklp-1.2.2.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/gtklp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtklp.spec 16 May 2006 16:16:12 -0000 1.1 +++ gtklp.spec 31 May 2006 21:29:43 -0000 1.2 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.1.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Wed May 31 2006 Gerard Milmeister - 1.2.2-1 +- new version 1.2.2 + * Sun May 7 2006 Gerard Milmeister - 1.2.1-2 - cleaned up buildrequires - added %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 16:16:12 -0000 1.2 +++ sources 31 May 2006 21:29:43 -0000 1.3 @@ -1 +1 @@ -374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz +f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz From fedora-extras-commits at redhat.com Wed May 31 21:29:43 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 14:29:43 -0700 Subject: rpms/gtklp/FC-5 .cvsignore, 1.2, 1.3 gtklp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605312129.k4VLTjXB023932@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/FC-5 Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 16:16:12 -0000 1.2 +++ .cvsignore 31 May 2006 21:29:42 -0000 1.3 @@ -1 +1 @@ -gtklp-1.2.1.src.tar.gz +gtklp-1.2.2.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/gtklp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtklp.spec 16 May 2006 16:16:12 -0000 1.1 +++ gtklp.spec 31 May 2006 21:29:42 -0000 1.2 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.1.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Wed May 31 2006 Gerard Milmeister - 1.2.2-1 +- new version 1.2.2 + * Sun May 7 2006 Gerard Milmeister - 1.2.1-2 - cleaned up buildrequires - added %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 16:16:12 -0000 1.2 +++ sources 31 May 2006 21:29:42 -0000 1.3 @@ -1 +1 @@ -374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz +f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz From fedora-extras-commits at redhat.com Wed May 31 21:29:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 14:29:42 -0700 Subject: rpms/gtklp/FC-4 .cvsignore, 1.2, 1.3 gtklp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605312130.k4VLUEpW023948@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/FC-4 Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 16:16:12 -0000 1.2 +++ .cvsignore 31 May 2006 21:29:42 -0000 1.3 @@ -1 +1 @@ -gtklp-1.2.1.src.tar.gz +gtklp-1.2.2.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-4/gtklp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtklp.spec 16 May 2006 16:16:12 -0000 1.1 +++ gtklp.spec 31 May 2006 21:29:42 -0000 1.2 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.1.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Wed May 31 2006 Gerard Milmeister - 1.2.2-1 +- new version 1.2.2 + * Sun May 7 2006 Gerard Milmeister - 1.2.1-2 - cleaned up buildrequires - added %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 16:16:12 -0000 1.2 +++ sources 31 May 2006 21:29:42 -0000 1.3 @@ -1 +1 @@ -374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz +f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz From fedora-extras-commits at redhat.com Wed May 31 21:33:35 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 14:33:35 -0700 Subject: comps comps-fe5.xml.in,1.53,1.54 comps-fe6.xml.in,1.17,1.18 Message-ID: <200605312133.k4VLXbu7024119@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24100 Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: added gtklp Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- comps-fe5.xml.in 21 May 2006 13:31:30 -0000 1.53 +++ comps-fe5.xml.in 31 May 2006 21:33:35 -0000 1.54 @@ -480,6 +480,7 @@ fwbuilder ghasher ghex + gtklp hercules ibmonitor inadyn Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- comps-fe6.xml.in 18 May 2006 15:11:17 -0000 1.17 +++ comps-fe6.xml.in 31 May 2006 21:33:35 -0000 1.18 @@ -481,6 +481,7 @@ fwbuilder ghasher ghex + gtklp hercules ibmonitor inadyn From fedora-extras-commits at redhat.com Wed May 31 22:00:44 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 31 May 2006 15:00:44 -0700 Subject: rpms/libapreq2/devel libapreq2.spec,1.12,1.13 Message-ID: <200605312200.k4VM0kcI024339@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24316 Modified Files: libapreq2.spec Log Message: Add -fno-strict-aliasing to CFLAGS (prevent infinite loop). Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libapreq2.spec 23 May 2006 04:37:23 -0000 1.12 +++ libapreq2.spec 31 May 2006 22:00:44 -0000 1.13 @@ -2,7 +2,7 @@ Name: libapreq2 Version: 2.08 -Release: 0.rc2.1%{?dist} +Release: 0.rc2.2%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries @@ -88,6 +88,7 @@ %build +CFLAGS="-fno-strict-aliasing" \ %configure \ --disable-dependency-tracking \ --disable-static \ @@ -152,6 +153,9 @@ %changelog +* Thu Jun 01 2006 Bojan Smojver - 2.08-0.rc2.2 +- add -fno-strict-aliasing to CFLAGS (prevent endless loop) + * Tue May 23 2006 Bojan Smojver - 2.08-0.rc2.1 - bump up to 2.08-RC2 for Rawhide - revert back some changes to spec file made for 2.08-RC1 From fedora-extras-commits at redhat.com Wed May 31 22:02:12 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 15:02:12 -0700 Subject: rpms/anjuta-gdl/devel anjuta-gdl.spec,1.2,1.3 Message-ID: <200605312202.k4VM2iED026727@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta-gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26694/devel Modified Files: anjuta-gdl.spec Log Message: auto-import anjuta-gdl-0.6.1-2 on branch devel from anjuta-gdl-0.6.1-2.src.rpm Index: anjuta-gdl.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/devel/anjuta-gdl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- anjuta-gdl.spec 30 May 2006 08:59:41 -0000 1.2 +++ anjuta-gdl.spec 31 May 2006 22:02:12 -0000 1.3 @@ -1,13 +1,13 @@ Name: anjuta-gdl Summary: Components and library for GNOME development tools Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/gdl/0.6/gdl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org -BuildRequires: gtk2-devel, libgnomeui-devel, libbonoboui-devel, libxml2-devel, librsvg2-devel +BuildRequires: gtk2-devel, libgnomeui-devel, libbonoboui-devel, libxml2-devel, librsvg2-devel, intltool, gettext %description This package contains components and libraries that are intended to be @@ -59,8 +59,11 @@ %{_libdir}/pkgconfig/gdl-1.0.pc %changelog -* Tue May 30 2006 Radek Vokal 0.6.1-1 -- update to 0.6.1 +* Wed May 31 2006 Paul F. Johnson 0.6.1-2 +- Added addition buildreqs + +* Tue May 23 2006 Paul F. Johnson 0.6.1-1 +- bump to new version * Sun Apr 23 2006 Paul F. Johnson 0.6.0-5 - added --disable-static and removed the .a delete line From fedora-extras-commits at redhat.com Wed May 31 22:02:07 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 15:02:07 -0700 Subject: rpms/anjuta-gdl import.log,1.2,1.3 Message-ID: <200605312202.k4VM2f5c026726@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta-gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26694 Modified Files: import.log Log Message: auto-import anjuta-gdl-0.6.1-2 on branch devel from anjuta-gdl-0.6.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 23 Apr 2006 22:35:29 -0000 1.2 +++ import.log 31 May 2006 22:02:06 -0000 1.3 @@ -1 +1,2 @@ anjuta-gdl-0_6_0-5:HEAD:anjuta-gdl-0.6.0-5.src.rpm:1145831749 +anjuta-gdl-0_6_1-2:HEAD:anjuta-gdl-0.6.1-2.src.rpm:1149112710 From fedora-extras-commits at redhat.com Wed May 31 22:15:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 31 May 2006 15:15:39 -0700 Subject: rpms/perl-HTML-Mason/devel .cvsignore, 1.3, 1.4 perl-HTML-Mason.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605312215.k4VMFfKZ026990@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTML-Mason/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26969 Modified Files: .cvsignore perl-HTML-Mason.spec sources Log Message: Update to 1.33. Switch to Module::Build-based build. Add various bindir mason scripts. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 01:00:28 -0000 1.3 +++ .cvsignore 31 May 2006 22:15:39 -0000 1.4 @@ -1 +1 @@ -HTML-Mason-1.32.tar.gz +HTML-Mason-1.33.tar.gz Index: perl-HTML-Mason.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-HTML-Mason.spec 19 Jan 2006 18:28:12 -0000 1.4 +++ perl-HTML-Mason.spec 31 May 2006 22:15:39 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-HTML-Mason -Version: 1.32 -Release: 2%{?dist} +Version: 1.33 +Release: 1%{?dist} Epoch: 1 Summary: Powerful Perl-based web site development and delivery engine License: GPL or Artistic @@ -22,8 +22,8 @@ BuildRequires: perl(Cache::Cache) >= 1 BuildRequires: perl(Class::Container) >= 0.07 BuildRequires: perl(Exception::Class) >= 1.15 -BuildRequires: perl(Module::Build::Compat) >= 0.02 BuildRequires: perl(Params::Validate) >= 0.7 +BuildRequires: perl(Module::Build) BuildRequires: perl(mod_perl2) Requires: perl(Cache::Cache) >= 1 Requires: perl(Class::Container) >= 0.07 @@ -44,20 +44,23 @@ %setup -q -n HTML-Mason-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -# make: *** No rule to make target `pure_install'. Stop. -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +rm -f $RPM_BUILD_ROOT%{_bindir}/*.README +for file in $RPM_BUILD_ROOT%{_bindir}/convert*.pl ; do + mv -f $file $( echo $file | sed 's,/\(convert.*\)\.pl$,/mason_\1,' ) +done +mv -f $RPM_BUILD_ROOT%{_bindir}/mason.pl $RPM_BUILD_ROOT%{_bindir}/mason + mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/ @@ -65,7 +68,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mason %check -make test +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -74,6 +77,7 @@ %defattr(-,root,root,-) %doc CREDITS Changes LICENSE README UPGRADE %doc htdocs/ eg/ samples/ +%{_bindir}/mason* %{perl_vendorlib}/* %{_mandir}/man3/* %config(noreplace) %{_sysconfdir}/httpd/conf.d/perl-HTML-Mason.conf @@ -81,6 +85,11 @@ %dir %{_localstatedir}/www/mason %changelog +* Mon May 29 2006 Steven Pritchard 1:1.33-1 +- Update to 1.33 +- Switch to Module::Build-based build +- Add various bindir mason scripts + * Thu Jan 19 2006 Steven Pritchard 1:1.32-2 - Epoch bump to resolve rpm thinking 1.3101 > 1.32 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 01:00:28 -0000 1.3 +++ sources 31 May 2006 22:15:39 -0000 1.4 @@ -1 +1 @@ -b0abfdd869d828a0ebbf2f64cfb9d094 HTML-Mason-1.32.tar.gz +22c2cd76ed068630708175d570f97277 HTML-Mason-1.33.tar.gz From fedora-extras-commits at redhat.com Wed May 31 22:23:50 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 31 May 2006 15:23:50 -0700 Subject: rpms/libapreq2/devel libapreq2.spec,1.13,1.14 Message-ID: <200605312223.k4VMNq13027031@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27010 Modified Files: libapreq2.spec Log Message: Include default RPM build flags too. Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libapreq2.spec 31 May 2006 22:00:44 -0000 1.13 +++ libapreq2.spec 31 May 2006 22:23:50 -0000 1.14 @@ -2,7 +2,7 @@ Name: libapreq2 Version: 2.08 -Release: 0.rc2.2%{?dist} +Release: 0.rc2.3%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries @@ -88,7 +88,7 @@ %build -CFLAGS="-fno-strict-aliasing" \ +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ %configure \ --disable-dependency-tracking \ --disable-static \ @@ -153,6 +153,9 @@ %changelog +* Thu Jun 01 2006 Bojan Smojver - 2.08-0.rc2.3 +- include exisiting CFLAGS too + * Thu Jun 01 2006 Bojan Smojver - 2.08-0.rc2.2 - add -fno-strict-aliasing to CFLAGS (prevent endless loop) From fedora-extras-commits at redhat.com Wed May 31 23:15:14 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 16:15:14 -0700 Subject: rpms/ikvm import.log,1.4,1.5 Message-ID: <200605312315.k4VNFGf3029572@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29539 Modified Files: import.log Log Message: auto-import ikvm-0.22-7 on branch devel from ikvm-0.22-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ikvm/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 18 Apr 2006 22:27:01 -0000 1.4 +++ import.log 31 May 2006 23:15:14 -0000 1.5 @@ -1,3 +1,4 @@ ikvm-0_22-4:HEAD:ikvm-0.22-4.src.rpm:1141834969 ikvm-0_22-5:HEAD:ikvm-0.22-5.src.rpm:1145399070 ikvm-0_22-5:FC-5:ikvm-0.22-5.src.rpm:1145399164 +ikvm-0_22-7:HEAD:ikvm-0.22-7.src.rpm:1149117129 From fedora-extras-commits at redhat.com Wed May 31 23:15:15 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 16:15:15 -0700 Subject: rpms/ikvm/devel ikvm.spec,1.2,1.3 Message-ID: <200605312315.k4VNFHMC029576@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29539/devel Modified Files: ikvm.spec Log Message: auto-import ikvm-0.22-7 on branch devel from ikvm-0.22-7.src.rpm Index: ikvm.spec =================================================================== RCS file: /cvs/extras/rpms/ikvm/devel/ikvm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ikvm.spec 18 Apr 2006 22:24:43 -0000 1.2 +++ ikvm.spec 31 May 2006 23:15:15 -0000 1.3 @@ -1,9 +1,9 @@ -%define _libdir /usr/lib +%define _libdir %{_exec_prefix}/lib Summary: An implementation of Java for Mono Name: ikvm Version: 0.22 -Release: 5%{?dist} +Release: 7%{?dist} License: BSD Group: Development/Languages Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz @@ -12,6 +12,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, dos2unix Requires: mono-core +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 %description This package provides IKVM.NET, an open source Java compatibility @@ -19,30 +20,53 @@ and various class libraries for Java, as well as tools for Java and Mono interoperability. +%package devel +Summary: Development files for ikvm +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for ikvm + %prep rm -rf %{RPM_BUILD_ROOT} %setup -q %patch0 -p1 -b .patch0 %build +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure -make +make %{?_smp_mflags} dos2unix LICENSE %install +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install %files +%defattr (-,root,root,-) %doc LICENSE COPYING %{_bindir}/* %{_libdir}/ikvm/ + +%files devel +%defattr(-,root,root,-) %{_libdir}/pkgconfig/ikvm.pc %clean %{__rm} -rf %{buildroot} %changelog +* Wed May 31 2006 Paul F. Johnson 0.22-7 +- Added devel package +- Added 64 bit fix + +* Sun Apr 23 2006 Paul F. Johnson 0.22-6 +- static libdir removed +- added %%defattr +- added archs mono is currently on + * Tue Apr 18 2006 Paul F. Johnson 0.22-5 - libdir is now usr-lib irrespective of architecture built on - removed devel as there is no point of a devel for one file From fedora-extras-commits at redhat.com Wed May 31 23:19:49 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 16:19:49 -0700 Subject: rpms/ikvm import.log,1.5,1.6 Message-ID: <200605312320.k4VNKLhC029737@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29703 Modified Files: import.log Log Message: auto-import ikvm-0.22-7 on branch FC-5 from ikvm-0.22-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ikvm/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 31 May 2006 23:15:14 -0000 1.5 +++ import.log 31 May 2006 23:19:49 -0000 1.6 @@ -2,3 +2,4 @@ ikvm-0_22-5:HEAD:ikvm-0.22-5.src.rpm:1145399070 ikvm-0_22-5:FC-5:ikvm-0.22-5.src.rpm:1145399164 ikvm-0_22-7:HEAD:ikvm-0.22-7.src.rpm:1149117129 +ikvm-0_22-7:FC-5:ikvm-0.22-7.src.rpm:1149117388 From fedora-extras-commits at redhat.com Wed May 31 23:19:49 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 16:19:49 -0700 Subject: rpms/ikvm/FC-5 ikvm.spec,1.2,1.3 Message-ID: <200605312320.k4VNKMI5029740@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29703/FC-5 Modified Files: ikvm.spec Log Message: auto-import ikvm-0.22-7 on branch FC-5 from ikvm-0.22-7.src.rpm Index: ikvm.spec =================================================================== RCS file: /cvs/extras/rpms/ikvm/FC-5/ikvm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ikvm.spec 18 Apr 2006 22:27:01 -0000 1.2 +++ ikvm.spec 31 May 2006 23:19:49 -0000 1.3 @@ -1,9 +1,9 @@ -%define _libdir /usr/lib +%define _libdir %{_exec_prefix}/lib Summary: An implementation of Java for Mono Name: ikvm Version: 0.22 -Release: 5%{?dist} +Release: 7%{?dist} License: BSD Group: Development/Languages Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz @@ -12,6 +12,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, dos2unix Requires: mono-core +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 %description This package provides IKVM.NET, an open source Java compatibility @@ -19,30 +20,53 @@ and various class libraries for Java, as well as tools for Java and Mono interoperability. +%package devel +Summary: Development files for ikvm +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for ikvm + %prep rm -rf %{RPM_BUILD_ROOT} %setup -q %patch0 -p1 -b .patch0 %build +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure -make +make %{?_smp_mflags} dos2unix LICENSE %install +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install %files +%defattr (-,root,root,-) %doc LICENSE COPYING %{_bindir}/* %{_libdir}/ikvm/ + +%files devel +%defattr(-,root,root,-) %{_libdir}/pkgconfig/ikvm.pc %clean %{__rm} -rf %{buildroot} %changelog +* Wed May 31 2006 Paul F. Johnson 0.22-7 +- Added devel package +- Added 64 bit fix + +* Sun Apr 23 2006 Paul F. Johnson 0.22-6 +- static libdir removed +- added %%defattr +- added archs mono is currently on + * Tue Apr 18 2006 Paul F. Johnson 0.22-5 - libdir is now usr-lib irrespective of architecture built on - removed devel as there is no point of a devel for one file From fedora-extras-commits at redhat.com Wed May 31 23:36:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 31 May 2006 16:36:53 -0700 Subject: rpms/sylpheed/devel .cvsignore,1.18,1.19 sources,1.18,1.19 Message-ID: <200605312336.k4VNatfx029933@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29913 Modified Files: .cvsignore sources Log Message: Add the GPG sig which Hiroyuki has published later. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 30 May 2006 10:14:48 -0000 1.18 +++ .cvsignore 31 May 2006 23:36:53 -0000 1.19 @@ -1 +1,2 @@ sylpheed-2.2.5.tar.bz2 +sylpheed-2.2.5.tar.bz2.asc Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 30 May 2006 10:14:48 -0000 1.18 +++ sources 31 May 2006 23:36:53 -0000 1.19 @@ -1 +1,2 @@ 6e20522180ba0346d3f85de160076560 sylpheed-2.2.5.tar.bz2 +512571513d7d3fdfa23a9c857e594568 sylpheed-2.2.5.tar.bz2.asc From fedora-extras-commits at redhat.com Wed May 31 23:37:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 31 May 2006 16:37:31 -0700 Subject: rpms/sylpheed/FC-5 .cvsignore,1.16,1.17 sources,1.16,1.17 Message-ID: <200605312337.k4VNbXKi029984@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29965 Modified Files: .cvsignore sources Log Message: Add the GPG sig which Hiroyuki has published later. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 30 May 2006 10:15:57 -0000 1.16 +++ .cvsignore 31 May 2006 23:37:30 -0000 1.17 @@ -1 +1,2 @@ sylpheed-2.2.5.tar.bz2 +sylpheed-2.2.5.tar.bz2.asc Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 30 May 2006 10:15:57 -0000 1.16 +++ sources 31 May 2006 23:37:30 -0000 1.17 @@ -1 +1,2 @@ 6e20522180ba0346d3f85de160076560 sylpheed-2.2.5.tar.bz2 +512571513d7d3fdfa23a9c857e594568 sylpheed-2.2.5.tar.bz2.asc From fedora-extras-commits at redhat.com Mon May 1 00:16:40 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 30 Apr 2006 17:16:40 -0700 Subject: rpms/perl-Gtk2/devel perl-Gtk2.spec,1.17,1.18 Message-ID: <200605010016.k410GgDb002607@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2590 Modified Files: perl-Gtk2.spec Log Message: Requires perl(Cairo) (distro >= FC-5). Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Gtk2.spec 11 Apr 2006 18:23:10 -0000 1.17 +++ perl-Gtk2.spec 1 May 2006 00:16:40 -0000 1.18 @@ -6,7 +6,7 @@ Name: perl-Gtk2 Version: 1.121 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries @@ -16,10 +16,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 2:5.8.0 -BuildRequires: gtk2-devel, perl-Glib >= 1.120 +BuildRequires: gtk2-devel BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) -Requires: perl-Glib >= 1.120 +BuildRequires: perl(Glib) >= 1.120 +BuildRequires: perl(Cairo) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Glib) >= 1.120 +Requires: perl(Cairo) %description This module allows you to write Gtk+ graphical user interfaces in a @@ -42,6 +45,14 @@ %define __perl_provides %{_builddir}/Gtk2-%{version}/%{name}-perl.prov chmod +x %{__perl_provides} +# Requires: exclude unversioned perl(Glib) +cat <<__EOF__ > %{name}-perl.req +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v '^perl(Glib)$' +__EOF__ +%define __perl_requires %{_builddir}/Gtk2-%{version}/%{name}-perl.req +chmod +x %{__perl_requires} + %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -75,6 +86,9 @@ %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.121-2 +- Requires perl(Cairo) (distro >= FC-5). + * Tue Apr 11 2006 Jose Pedro Oliveira - 1.121-1 - Update to 1.121. From fedora-extras-commits at redhat.com Mon May 1 01:17:17 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sun, 30 Apr 2006 18:17:17 -0700 Subject: rpms/qof/FC-4 qof-gnc-date-char.patch, NONE, 1.1 qof-x86_64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 qof.spec, 1.10, 1.11 sources, 1.3, 1.4 qof-0.6.1-build.patch, 1.1, NONE qof-dependencies.patch, 1.1, NONE Message-ID: <200605010117.k411HJXT005012@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4985 Modified Files: .cvsignore qof.spec sources Added Files: qof-gnc-date-char.patch qof-x86_64.patch Removed Files: qof-0.6.1-build.patch qof-dependencies.patch Log Message: * Sync with devel. This updates to qof-0.6.4 qof-gnc-date-char.patch: --- NEW FILE qof-gnc-date-char.patch --- --- qof-0.6.4/qof/gnc-date.c.char 2006-04-30 10:08:44.000000000 -0700 +++ qof-0.6.4/qof/gnc-date.c 2006-04-30 10:09:38.000000000 -0700 @@ -1060,7 +1060,7 @@ str +=3; if ('.' == *str) str++; - if (isdigit ((unsigned char)*str) && isdigit ((unsigned char)*(str+1))) + if (isdigit ((char)*str) && isdigit ((char)*(str+1))) { int cyn; /* copy sign from hour part */ qof-x86_64.patch: --- NEW FILE qof-x86_64.patch --- Index: qof-0.6.4/qof/test/test-date.c =================================================================== --- qof-0.6.4.orig/qof/test/test-date.c +++ qof-0.6.4/qof/test/test-date.c @@ -93,8 +93,8 @@ check_conversion (const char * str, Time if ((expected_ts.tv_sec != ts.tv_sec) || (expected_ts.tv_nsec != ts.tv_nsec)) { fprintf (stderr, - "\nmis-converted \"%s\" to %lld.%09ld seconds\n" - "\twas expecting %lld.%09ld seconds\n", + "\nmis-converted \"%s\" to %" G_GUINT64_FORMAT ".%09ld seconds\n" + "\twas expecting %" G_GUINT64_FORMAT ".%09ld seconds\n", str, ts.tv_sec, ts.tv_nsec, expected_ts.tv_sec, expected_ts.tv_nsec); failure ("misconverted timespec"); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qof/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Jan 2006 18:40:10 -0000 1.3 +++ .cvsignore 1 May 2006 01:17:17 -0000 1.4 @@ -1 +1 @@ -qof-0.6.1.tar.gz +qof-0.6.4.tar.gz Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/FC-4/qof.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qof.spec 15 Jan 2006 18:40:10 -0000 1.10 +++ qof.spec 1 May 2006 01:17:17 -0000 1.11 @@ -1,14 +1,14 @@ Name: qof -Version: 0.6.1 -Release: 1%{?dist} +Version: 0.6.4 +Release: 3%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries License: GPL URL: http://qof.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: qof-0.6.1-build.patch -Patch1: qof-dependencies.patch +Patch0: qof-x86_64.patch +Patch1: qof-gnc-date-char.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -17,8 +17,6 @@ BuildRequires: intltool # qof doesn't ship with pre-built documentation BuildRequires: doxygen -# Patch1 modifies configure.in so we have to use autoconf -BuildRequires: autoconf %description QOF - The Query Object Framework is a C library that provides a query engine @@ -70,7 +68,6 @@ %patch1 -p1 %build -autoconf --force %configure --disable-static make @@ -119,6 +116,19 @@ %doc html %changelog +* Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-3 +- Fix stupid in a hurry typo. + +* Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-2 +- Patch to fix a signed/unsigned char problem on ppc. + +* Mon Apr 17 2006 Toshio Kuratomi - 0.6.4-1 +- Update to qof 0.6.4. +- Patch a small compile problem in building tests on x86_64. + +* Mon Feb 13 2006 Toshio Kuratomi - 0.6.1-2 +- Bump and rebuild for FC5. + * Sat Jan 14 2006 Toshio Kuratomi - 0.6.1-1 - Upgrade to 0.6.1. - Drop patches integrated upstream. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qof/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Jan 2006 18:40:10 -0000 1.3 +++ sources 1 May 2006 01:17:17 -0000 1.4 @@ -1 +1 @@ -2a1c4b231fb03e49d5d9237dc6698c3e qof-0.6.1.tar.gz +555787c7ea06a3412ff9119fe4127886 qof-0.6.4.tar.gz --- qof-0.6.1-build.patch DELETED --- --- qof-dependencies.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 1 04:52:56 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 30 Apr 2006 21:52:56 -0700 Subject: rpms/raidem/devel raidem.spec,1.5,1.6 Message-ID: <200605010452.k414qwvO012110@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12093 Modified Files: raidem.spec Log Message: * Mon May 1 2006 Hans de Goede 0.3.1-2 - Fix big finger typo which put the datafiles under /use/share instead of /usr/share. Index: raidem.spec =================================================================== RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- raidem.spec 29 Apr 2006 18:56:35 -0000 1.5 +++ raidem.spec 1 May 2006 04:52:55 -0000 1.6 @@ -1,6 +1,6 @@ Name: raidem Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 2d top-down shoot'em up Group: Amusements/Games License: zlib License @@ -38,9 +38,7 @@ %build # override _datadir otherwise it expects its datafile directly under /use/share -%define _datadir /usr/share/%{name} -%configure -%define _datadir /use/share +%configure --datadir=%{_datadir}/%{name} make %{?_smp_mflags} @@ -91,6 +89,10 @@ %changelog +* Mon May 1 2006 Hans de Goede 0.3.1-2 +- Fix big finger typo which put the datafiles under /use/share instead + of /usr/share. + * Sat Apr 29 2006 Hans de Goede 0.3.1-1 - New upstream release 0.3.1 - Upstream has merged most patches, dropped. From fedora-extras-commits at redhat.com Mon May 1 04:57:38 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 30 Apr 2006 21:57:38 -0700 Subject: rpms/monkey-bubble/devel monkey-bubble.spec,1.4,1.5 Message-ID: <200605010457.k414veEm012187@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/monkey-bubble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12170 Modified Files: monkey-bubble.spec Log Message: Add missing scrollkeeper BR Index: monkey-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monkey-bubble.spec 30 Apr 2006 21:58:26 -0000 1.4 +++ monkey-bubble.spec 1 May 2006 04:57:38 -0000 1.5 @@ -10,7 +10,7 @@ Patch1: monkey-bubble-0.3.2-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel librsvg2-devel gstreamer-devel gettext -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils scrollkeeper Requires(pre): GConf2 Requires(post): GConf2 scrollkeeper Requires(preun): GConf2 From fedora-extras-commits at redhat.com Mon May 1 05:00:09 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 30 Apr 2006 22:00:09 -0700 Subject: rpms/monkey-bubble/FC-5 monkey-bubble.spec,1.4,1.5 Message-ID: <200605010500.k4150BUs012306@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/monkey-bubble/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12289 Modified Files: monkey-bubble.spec Log Message: Add missing scrollkeeper BR Index: monkey-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/monkey-bubble.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monkey-bubble.spec 30 Apr 2006 22:01:31 -0000 1.4 +++ monkey-bubble.spec 1 May 2006 05:00:09 -0000 1.5 @@ -10,7 +10,7 @@ Patch1: monkey-bubble-0.3.2-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel librsvg2-devel gstreamer-devel gettext -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils scrollkeeper Requires(pre): GConf2 Requires(post): GConf2 scrollkeeper Requires(preun): GConf2 From fedora-extras-commits at redhat.com Mon May 1 05:15:52 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 30 Apr 2006 22:15:52 -0700 Subject: rpms/raidem-music/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 dilvie_-_east_of_the_sun.ogg, 1.1, NONE dilvie_-_half_baked.ogg, 1.1, NONE dilvie_-_the_dragonfly.ogg, 1.1, NONE dilvie_-_up_in_ashes.ogg, 1.1, NONE Message-ID: <200605010515.k415FskM014550@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem-music/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14531 Modified Files: .cvsignore sources Removed Files: dilvie_-_east_of_the_sun.ogg dilvie_-_half_baked.ogg dilvie_-_the_dragonfly.ogg dilvie_-_up_in_ashes.ogg Log Message: put the .ogg files in the lookaside cache instead of in CVS Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raidem-music/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Apr 2006 20:59:45 -0000 1.1 +++ .cvsignore 1 May 2006 05:15:51 -0000 1.2 @@ -0,0 +1,4 @@ +dilvie_-_east_of_the_sun.ogg +dilvie_-_half_baked.ogg +dilvie_-_the_dragonfly.ogg +dilvie_-_up_in_ashes.ogg Index: sources =================================================================== RCS file: /cvs/extras/rpms/raidem-music/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Apr 2006 20:59:45 -0000 1.1 +++ sources 1 May 2006 05:15:52 -0000 1.2 @@ -0,0 +1,4 @@ +903a2589d6457f2d3b4b0dae0d358d9f dilvie_-_east_of_the_sun.ogg +52f4b1f07ad972f30f38adeb40db2de7 dilvie_-_half_baked.ogg +413b1cebfe8bc40e6100548caaeebd51 dilvie_-_the_dragonfly.ogg +08a852b2e2402dbeadd4fae0ba23c93b dilvie_-_up_in_ashes.ogg --- dilvie_-_east_of_the_sun.ogg DELETED --- --- dilvie_-_half_baked.ogg DELETED --- --- dilvie_-_the_dragonfly.ogg DELETED --- --- dilvie_-_up_in_ashes.ogg DELETED --- From fedora-extras-commits at redhat.com Mon May 1 05:30:25 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:30:25 -0700 Subject: rpms/bogofilter - New directory Message-ID: <200605010530.k415UR1H014660@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14634/bogofilter Log Message: Directory /cvs/extras/rpms/bogofilter added to the repository From fedora-extras-commits at redhat.com Mon May 1 05:30:26 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:30:26 -0700 Subject: rpms/bogofilter/devel - New directory Message-ID: <200605010530.k415UScp014663@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14634/bogofilter/devel Log Message: Directory /cvs/extras/rpms/bogofilter/devel added to the repository From fedora-extras-commits at redhat.com Mon May 1 05:30:46 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:30:46 -0700 Subject: rpms/bogofilter Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605010530.k415Um7r014707@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14679 Added Files: Makefile import.log Log Message: Setup of module bogofilter --- NEW FILE Makefile --- # Top level Makefile for module bogofilter all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon May 1 05:30:47 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:30:47 -0700 Subject: rpms/bogofilter/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605010530.k415UnXB014710@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14679/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bogofilter --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon May 1 05:32:02 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:32:02 -0700 Subject: rpms/bogofilter/devel bogofilter.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605010532.k415W43F014783@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14745/devel Modified Files: .cvsignore sources Added Files: bogofilter.spec Log Message: auto-import bogofilter-1.0.2-1 on branch devel from bogofilter-1.0.2-1.src.rpm --- NEW FILE bogofilter.spec --- Summary: Fast anti-spam filtering by Bayesian statistical analysis Name: bogofilter Version: 1.0.2 Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://bogofilter.sourceforge.net/ Source: http://dl.sf.net/bogofilter/bogofilter-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex db4-devel gsl-devel %description Bogofilter is a Bayesian spam filter. In its normal mode of operation, it takes an email message or other text on standard input, does a statistical check against lists of "good" and "bad" words, and returns a status code indicating whether or not the message is spam. Bogofilter is designed with fast algorithms (including Berkeley DB system), coded directly in C, and tuned for speed, so it can be used for production by sites that process a lot of mail. %prep %setup -q %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %{__mv} -f %{buildroot}%{_sysconfdir}/bogofilter.cf.example %{buildroot}%{_sysconfdir}/bogofilter.cf %{__install} -d -m0755 rpm-doc/xml/ rpm-doc/html/ %{__install} -m644 doc/*.xml rpm-doc/xml/ %{__install} -m644 doc/*.html rpm-doc/html/ %{__chmod} -x contrib/* %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc AUTHORS COPYING NEWS README* RELEASE.NOTES* TODO bogofilter.cf.example %doc doc/bogofilter-SA* doc/bogofilter-tuning.HOWTO* doc/integrating* doc/programmer/ %doc rpm-doc/html/ rpm-doc/xml/ contrib %{_mandir}/man1/bogo*.1* %{_mandir}/man1/bf_*.1* %config(noreplace) %{_sysconfdir}/bogofilter.cf %{_bindir}/bogo* %{_bindir}/bf_* %changelog * Wed Apr 19 2006 Adrian Reber - 1.0.2-1 - updated to 1.0.2 * Mon Jan 02 2006 Dries Verachtert - 1.0.1-1 - 3875/dries - Updated to release 1.0.1. * Fri Dec 02 2005 Dag Wieers - 1.0.0-1 - Updated to release 1.0.0. * Tue Nov 22 2005 Dries Verachtert - 0.96.6-1 - Updated to release 0.96.6. * Mon Aug 02 2004 Dag Wieers - 0.92.4-1 - Updated to release 0.92.4. * Sat Apr 10 2004 Dag Wieers - 0.17.5-1 - Updated to release 0.17.5. * Mon Jan 26 2004 Dag Wieers - 0.16.4-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bogofilter/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 May 2006 05:30:46 -0000 1.1 +++ .cvsignore 1 May 2006 05:32:02 -0000 1.2 @@ -0,0 +1 @@ +bogofilter-1.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bogofilter/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 May 2006 05:30:46 -0000 1.1 +++ sources 1 May 2006 05:32:02 -0000 1.2 @@ -0,0 +1 @@ +a1e201e544a3d9181b44b051b46435c3 bogofilter-1.0.2.tar.gz From fedora-extras-commits at redhat.com Mon May 1 05:32:01 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:32:01 -0700 Subject: rpms/bogofilter import.log,1.1,1.2 Message-ID: <200605010532.k415W32c014778@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/bogofilter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14745 Modified Files: import.log Log Message: auto-import bogofilter-1.0.2-1 on branch devel from bogofilter-1.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bogofilter/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 May 2006 05:30:46 -0000 1.1 +++ import.log 1 May 2006 05:32:01 -0000 1.2 @@ -0,0 +1 @@ +bogofilter-1_0_2-1:HEAD:bogofilter-1.0.2-1.src.rpm:1146461555 From fedora-extras-commits at redhat.com Mon May 1 05:51:55 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 22:51:55 -0700 Subject: owners owners.list,1.927,1.928 Message-ID: <200605010551.k415pvCM014877@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14860 Modified Files: owners.list Log Message: added bogofilter Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.927 retrieving revision 1.928 diff -u -r1.927 -r1.928 --- owners.list 30 Apr 2006 21:41:16 -0000 1.927 +++ owners.list 1 May 2006 05:51:55 -0000 1.928 @@ -93,6 +93,7 @@ Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|bogofilter|Fast anti-spam filtering by Bayesian statistical analysis|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|bsd-games|Collection of classic text-based games|wart at kobold.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 1 06:36:08 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 23:36:08 -0700 Subject: rpms/xlockmore/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xlockmore.spec, 1.9, 1.10 Message-ID: <200605010636.k416aBAT017294@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/xlockmore/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17273 Modified Files: .cvsignore sources xlockmore.spec Log Message: * Mon May 01 2006 Adrian Reber - 5.22-1 - updated to 5.22 - changed pam file to use include instead of pam_stack.so Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Feb 2006 20:20:07 -0000 1.7 +++ .cvsignore 1 May 2006 06:36:08 -0000 1.8 @@ -1 +1 @@ -xlockmore-5.21.tar.bz2 +xlockmore-5.22.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Feb 2006 20:20:07 -0000 1.7 +++ sources 1 May 2006 06:36:08 -0000 1.8 @@ -1 +1 @@ -eefe878d7efaa982ee53553c78534315 xlockmore-5.21.tar.bz2 +abf503b6b7af128312fa3f500e8a2121 xlockmore-5.22.tar.bz2 Index: xlockmore.spec =================================================================== RCS file: /cvs/extras/rpms/xlockmore/devel/xlockmore.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xlockmore.spec 21 Feb 2006 20:20:07 -0000 1.9 +++ xlockmore.spec 1 May 2006 06:36:08 -0000 1.10 @@ -1,11 +1,11 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.21 +Version: 5.22 Release: 1%{?dist} License: BSD Group: Amusements/Graphics URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.21.tar.bz2 +Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.22.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel @@ -55,10 +55,10 @@ %{__mkdir_p} %{buildroot}%{_sysconfdir}/pam.d cat > %{buildroot}%{_sysconfdir}/pam.d/xlock << EOF #%PAM-1.0 -auth required pam_stack.so service=system-auth -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth +auth include system-auth +account include system-auth +password include system-auth +session include system-auth EOF %{__mkdir_p} %{buildroot}%{_datadir}/applications @@ -105,6 +105,10 @@ %{_bindir}/xglock %changelog +* Mon May 01 2006 Adrian Reber - 5.22-1 +- updated to 5.22 +- changed pam file to use include instead of pam_stack.so + * Tue Feb 21 2006 Adrian Reber - 5.21-1 - updated to 5.21 From fedora-extras-commits at redhat.com Mon May 1 06:54:52 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 30 Apr 2006 23:54:52 -0700 Subject: rpms/xlockmore/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xlockmore.spec, 1.9, 1.10 Message-ID: <200605010654.k416ssLN017479@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/xlockmore/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17458 Modified Files: .cvsignore sources xlockmore.spec Log Message: * Mon May 01 2006 Adrian Reber - 5.22-1 - updated to 5.22 - changed pam file to use include instead of pam_stack.so Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Feb 2006 20:20:07 -0000 1.7 +++ .cvsignore 1 May 2006 06:54:52 -0000 1.8 @@ -1 +1 @@ -xlockmore-5.21.tar.bz2 +xlockmore-5.22.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Feb 2006 20:20:07 -0000 1.7 +++ sources 1 May 2006 06:54:52 -0000 1.8 @@ -1 +1 @@ -eefe878d7efaa982ee53553c78534315 xlockmore-5.21.tar.bz2 +abf503b6b7af128312fa3f500e8a2121 xlockmore-5.22.tar.bz2 Index: xlockmore.spec =================================================================== RCS file: /cvs/extras/rpms/xlockmore/FC-5/xlockmore.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xlockmore.spec 21 Feb 2006 20:20:07 -0000 1.9 +++ xlockmore.spec 1 May 2006 06:54:52 -0000 1.10 @@ -1,11 +1,11 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.21 +Version: 5.22 Release: 1%{?dist} License: BSD Group: Amusements/Graphics URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.21.tar.bz2 +Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.22.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel @@ -55,10 +55,10 @@ %{__mkdir_p} %{buildroot}%{_sysconfdir}/pam.d cat > %{buildroot}%{_sysconfdir}/pam.d/xlock << EOF #%PAM-1.0 -auth required pam_stack.so service=system-auth -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth +auth include system-auth +account include system-auth +password include system-auth +session include system-auth EOF %{__mkdir_p} %{buildroot}%{_datadir}/applications @@ -105,6 +105,10 @@ %{_bindir}/xglock %changelog +* Mon May 01 2006 Adrian Reber - 5.22-1 +- updated to 5.22 +- changed pam file to use include instead of pam_stack.so + * Tue Feb 21 2006 Adrian Reber - 5.21-1 - updated to 5.21 From fedora-extras-commits at redhat.com Mon May 1 06:59:28 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 30 Apr 2006 23:59:28 -0700 Subject: rpms/GeoIP/devel .cvsignore, 1.2, 1.3 GeoIP.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010659.k416xU1D017579@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17558 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 1 2006 Michael Fleming 1.3.16-1 - New upstream release - Add INSTALL document to package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2006 05:44:56 -0000 1.2 +++ .cvsignore 1 May 2006 06:59:28 -0000 1.3 @@ -1 +1 @@ -GeoIP-1.3.14.tar.gz +GeoIP-1.3.16.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GeoIP.spec 18 Feb 2006 05:44:56 -0000 1.1 +++ GeoIP.spec 1 May 2006 06:59:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.3.14 -Release: 3%{?dist} +Version: 1.3.16 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: GPL @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,6 +71,10 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 1 2006 Michael Fleming 1.3.16-1 +- New upstream release +- Add INSTALL document to package. + * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages - Move .so symlinks to -devel where they should be Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2006 05:44:56 -0000 1.2 +++ sources 1 May 2006 06:59:28 -0000 1.3 @@ -1 +1 @@ -a1f6fb744d85e96a457808f9c32fd334 GeoIP-1.3.14.tar.gz +f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz From fedora-extras-commits at redhat.com Mon May 1 07:00:05 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 1 May 2006 00:00:05 -0700 Subject: rpms/jhead/devel .cvsignore, 1.6, 1.7 jhead.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200605010700.k4170797017624@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17603 Modified Files: .cvsignore jhead.spec sources Log Message: * Mon May 01 2006 Adrian Reber - 2.6-1 - updated to 2.6 - removed gcc4 patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Feb 2006 14:59:57 -0000 1.6 +++ .cvsignore 1 May 2006 07:00:04 -0000 1.7 @@ -1 +1 @@ -jhead-2.5.tar.gz +jhead-2.6.tar.gz Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jhead.spec 19 Feb 2006 14:59:57 -0000 1.13 +++ jhead.spec 1 May 2006 07:00:04 -0000 1.14 @@ -1,13 +1,12 @@ Name: jhead -Version: 2.5 +Version: 2.6 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.5.tar.gz +Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz Patch0: jhead-makefile.patch -Patch1: jhead-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -17,7 +16,6 @@ %prep %setup -q %patch0 -%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -39,6 +37,10 @@ %{_mandir}/man?/* %changelog +* Mon May 01 2006 Adrian Reber - 2.6-1 +- updated to 2.6 +- removed gcc4 patch + * Sat Feb 18 2006 Adrian Reber - 2.5-1 - updated to 2.5 - removed compiler warnings patch and added gcc4 patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Feb 2006 14:59:57 -0000 1.6 +++ sources 1 May 2006 07:00:04 -0000 1.7 @@ -1 +1 @@ -e6ea1eacd35c55dfd8dc1f6dd0abaa2d jhead-2.5.tar.gz +fa3f1d3243fab7bc3b81688a3f2eec25 jhead-2.6.tar.gz From fedora-extras-commits at redhat.com Mon May 1 07:01:50 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 1 May 2006 00:01:50 -0700 Subject: rpms/jhead/devel jhead-gcc4.patch,1.1,NONE Message-ID: <200605010701.k4171qGY019828@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19774 Removed Files: jhead-gcc4.patch Log Message: gcc4 patch is no longer required --- jhead-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 1 07:03:36 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 00:03:36 -0700 Subject: rpms/mod_geoip/devel .cvsignore, 1.2, 1.3 mod_geoip.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010703.k4173c54019903@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19882 Modified Files: .cvsignore mod_geoip.spec sources Log Message: * Mon May 1 2006 Michael Fleming 1.1.8-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 22:45:12 -0000 1.2 +++ .cvsignore 1 May 2006 07:03:36 -0000 1.3 @@ -1 +1 @@ -mod_geoip2_1.1.7.tar.gz +mod_geoip2_1.1.8.tar.gz Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/devel/mod_geoip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_geoip.spec 20 Feb 2006 22:45:12 -0000 1.1 +++ mod_geoip.spec 1 May 2006 07:03:36 -0000 1.2 @@ -1,7 +1,7 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip -Version: 1.1.7 -Release: 2%{?dist} +Version: 1.1.8 +Release: 1%{?dist} License: Apache Software License Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip @@ -46,6 +46,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Mon May 1 2006 Michael Fleming 1.1.8-1 +- New upstream release + * Sat Feb 18 2006 Michael Fleming 1.1.7-2 - Small cleanups, including a saner Requires: for httpd - Don't strip the binary Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 22:45:12 -0000 1.2 +++ sources 1 May 2006 07:03:36 -0000 1.3 @@ -1 +1 @@ -ca02b8b955d95d659037f8c633908ae9 mod_geoip2_1.1.7.tar.gz +165607221c6a95ace7d840c5aea39696 mod_geoip2_1.1.8.tar.gz From fedora-extras-commits at redhat.com Mon May 1 08:27:51 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 1 May 2006 01:27:51 -0700 Subject: rpms/jhead/FC-5 .cvsignore, 1.6, 1.7 jhead.spec, 1.13, 1.14 sources, 1.6, 1.7 jhead-gcc4.patch, 1.1, NONE Message-ID: <200605010827.k418RrFt022393@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22372 Modified Files: .cvsignore jhead.spec sources Removed Files: jhead-gcc4.patch Log Message: * Mon May 01 2006 Adrian Reber - 2.6-1 - updated to 2.6 - removed gcc4 patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Feb 2006 14:59:57 -0000 1.6 +++ .cvsignore 1 May 2006 08:27:51 -0000 1.7 @@ -1 +1 @@ -jhead-2.5.tar.gz +jhead-2.6.tar.gz Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-5/jhead.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jhead.spec 19 Feb 2006 14:59:57 -0000 1.13 +++ jhead.spec 1 May 2006 08:27:51 -0000 1.14 @@ -1,13 +1,12 @@ Name: jhead -Version: 2.5 +Version: 2.6 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.5.tar.gz +Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz Patch0: jhead-makefile.patch -Patch1: jhead-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -17,7 +16,6 @@ %prep %setup -q %patch0 -%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -39,6 +37,10 @@ %{_mandir}/man?/* %changelog +* Mon May 01 2006 Adrian Reber - 2.6-1 +- updated to 2.6 +- removed gcc4 patch + * Sat Feb 18 2006 Adrian Reber - 2.5-1 - updated to 2.5 - removed compiler warnings patch and added gcc4 patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Feb 2006 14:59:57 -0000 1.6 +++ sources 1 May 2006 08:27:51 -0000 1.7 @@ -1 +1 @@ -e6ea1eacd35c55dfd8dc1f6dd0abaa2d jhead-2.5.tar.gz +fa3f1d3243fab7bc3b81688a3f2eec25 jhead-2.6.tar.gz --- jhead-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 1 08:34:30 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:34:30 -0700 Subject: rpms/kchmviewer - New directory Message-ID: <200605010834.k418YW4R022518@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22492/kchmviewer Log Message: Directory /cvs/extras/rpms/kchmviewer added to the repository From fedora-extras-commits at redhat.com Mon May 1 08:34:30 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:34:30 -0700 Subject: rpms/kchmviewer/devel - New directory Message-ID: <200605010834.k418YWGV022521@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22492/kchmviewer/devel Log Message: Directory /cvs/extras/rpms/kchmviewer/devel added to the repository From fedora-extras-commits at redhat.com Mon May 1 08:34:48 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:34:48 -0700 Subject: rpms/kchmviewer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605010834.k418YoIZ022572@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22539 Added Files: Makefile import.log Log Message: Setup of module kchmviewer --- NEW FILE Makefile --- # Top level Makefile for module kchmviewer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 1 08:34:48 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:34:48 -0700 Subject: rpms/kchmviewer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605010834.k418YoVF022575@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22539/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kchmviewer --- NEW 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 May 1 08:35:31 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Mon, 1 May 2006 01:35:31 -0700 Subject: rpms/kchmviewer/devel kchmviewer-desktop.diff, NONE, 1.1 kchmviewer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605010835.k418ZYQH022631@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22608/devel Modified Files: .cvsignore sources Added Files: kchmviewer-desktop.diff kchmviewer.spec Log Message: auto-import kchmviewer-2.0-3 on branch devel from kchmviewer-2.0-3.src.rpm kchmviewer-desktop.diff: --- NEW FILE kchmviewer-desktop.diff --- --- kio-msits/kchmviewer.desktop-orig 2006-03-13 23:08:01.000000000 +0100 +++ kio-msits/kchmviewer.desktop 2006-03-13 23:09:16.000000000 +0100 @@ -1,11 +1,11 @@ [Desktop Entry] Categories=Qt;KDE;Utility; Encoding=UTF-8 +GenericName=CHM file viewer Type=Application Exec=kchmviewer %U Icon=kchmviewer.png -Comment= -Terminal=0 +Terminal=false Name=KchmViewer Comment=A viewer of CHM (MS-Help) files MimeType=application/chm --- NEW FILE kchmviewer.spec --- Name: kchmviewer Version: 2.0 Release: 3%{?dist} Summary: CHM viewer Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ Source0: http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel BuildRequires: desktop-file-utils kdelibs-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. The main advantage of KchmViewer is extended support for non-English languages. Unlike others, KchmViewer in most cases correctly detects chm file encoding, correctly shows tables of context of Russian, Korean, Chinese and Japanese help files, and correctly searches in non-English help files (search for MBCS languages - ja/ko/ch is still in progress). - Completely safe and harmless. Does not support JavaScript in any way, optionally warns you before opening an external web page, or switching to another help file. - Shows an appropriate image for every TOC entry. - Has complete chm index support, including multiple index entries, cross-links and parent/child entries in index. - Persistent bookmarks support. Allows to store bookmarks even if "Favorites" window was not enabled for this chm file. Also stores the screen position for every bookmark. You can also edit/delete bookmarks. - For any opened chm file, stores the last opened window, search history, bookmark history, font size and so on, so when you open this file again, everything is always on the place. - Has easy and powerful search-in-page support. - Allows to increase or decrease the font size, so physically handicapped people can read texts easily. - Has standard Back/Forward/Home navigation. - Can print the opened pages on a standard printer (usually via CUPS). - Has complex search query support. You can use search queries like "lazy people" + learn -not. %prep %setup -q %patch chmod -x kio-msits/msits.* %build %configure --disable-static --with-kde --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps install -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ kio-msits/kchmviewer.desktop %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null ||: %postun update-desktop-database &> /dev/null ||: %files %defattr(-,root,root,-) %doc README COPYING ChangeLog %{_bindir}/kchmviewer %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la %{_datadir}/applnk/kchmviewer.desktop %{_datadir}/services/msits.protocol %changelog * Mon Mar 13 2006 Patrice Dumas 2.0-3 - use update-desktop-database * Mon Mar 13 2006 Patrice Dumas 2.0-2 - enable kde support * Sun Mar 12 2006 Patrice Dumas 2.0-1 - Fedora Extras submission Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 May 2006 08:34:48 -0000 1.1 +++ .cvsignore 1 May 2006 08:35:31 -0000 1.2 @@ -0,0 +1 @@ +kchmviewer-2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 May 2006 08:34:48 -0000 1.1 +++ sources 1 May 2006 08:35:31 -0000 1.2 @@ -0,0 +1 @@ +94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 08:37:50 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 01:37:50 -0700 Subject: rpms/GeoIP/FC-5 .cvsignore, 1.2, 1.3 GeoIP.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605010837.k418bq8K022699@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22678 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 1 2006 Michael Fleming 1.3.16-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2006 05:44:56 -0000 1.2 +++ .cvsignore 1 May 2006 08:37:50 -0000 1.3 @@ -1 +1 @@ -GeoIP-1.3.14.tar.gz +GeoIP-1.3.16.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GeoIP.spec 17 Mar 2006 23:31:30 -0000 1.2 +++ GeoIP.spec 1 May 2006 08:37:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.3.14 -Release: 4%{?dist} +Version: 1.3.16 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: GPL @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,6 +71,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 1 2006 Michael Fleming 1.3.16-1 +- New upstream release + * Sat Mar 18 2006 Michael Fleming 1.3.14-4 - Build for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2006 05:44:56 -0000 1.2 +++ sources 1 May 2006 08:37:50 -0000 1.3 @@ -1 +1 @@ -a1f6fb744d85e96a457808f9c32fd334 GeoIP-1.3.14.tar.gz +f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz From fedora-extras-commits at redhat.com Mon May 1 08:40:53 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 01:40:53 -0700 Subject: rpms/GeoIP/FC-4 .cvsignore, 1.2, 1.3 GeoIP.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010840.k418etAs022827@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22804 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 1 2006 Michael Fleming 1.3.16-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Feb 2006 05:44:56 -0000 1.2 +++ .cvsignore 1 May 2006 08:40:53 -0000 1.3 @@ -1 +1 @@ -GeoIP-1.3.14.tar.gz +GeoIP-1.3.16.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/GeoIP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GeoIP.spec 18 Feb 2006 05:44:56 -0000 1.1 +++ GeoIP.spec 1 May 2006 08:40:53 -0000 1.2 @@ -1,6 +1,6 @@ Name: GeoIP -Version: 1.3.14 -Release: 3%{?dist} +Version: 1.3.16 +Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: GPL @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,6 +71,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 1 2006 Michael Fleming 1.3.16-1 +- New upstream release + * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages - Move .so symlinks to -devel where they should be Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Feb 2006 05:44:56 -0000 1.2 +++ sources 1 May 2006 08:40:53 -0000 1.3 @@ -1 +1 @@ -a1f6fb744d85e96a457808f9c32fd334 GeoIP-1.3.14.tar.gz +f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz From fedora-extras-commits at redhat.com Mon May 1 08:42:33 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 May 2006 01:42:33 -0700 Subject: rpms/amaya/FC-5 amaya.spec,1.29,1.30 Message-ID: <200605010842.k418gZTh022927@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amaya/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880/FC-5 Modified Files: amaya.spec Log Message: - forgot to update version tag... Index: amaya.spec =================================================================== RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- amaya.spec 14 Apr 2006 08:18:41 -0000 1.29 +++ amaya.spec 1 May 2006 08:42:33 -0000 1.30 @@ -1,6 +1,6 @@ Name: amaya -Version: 9.4 -Release: 4%{?dist} +Version: 9.5 +Release: 1%{?dist} Summary: W3C's browser/web authoring tool Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 1 08:42:32 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 May 2006 01:42:32 -0700 Subject: rpms/amaya/FC-4 amaya.spec,1.19,1.20 Message-ID: <200605010842.k418gYpR022925@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amaya/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880/FC-4 Modified Files: amaya.spec Log Message: - forgot to update version tag... Index: amaya.spec =================================================================== RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- amaya.spec 14 Apr 2006 08:18:40 -0000 1.19 +++ amaya.spec 1 May 2006 08:42:32 -0000 1.20 @@ -1,6 +1,6 @@ Name: amaya -Version: 9.4 -Release: 4%{?dist} +Version: 9.5 +Release: 1%{?dist} Summary: W3C's browser/web authoring tool Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 1 08:42:34 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 May 2006 01:42:34 -0700 Subject: rpms/amaya/devel amaya.spec,1.29,1.30 Message-ID: <200605010842.k418garA022931@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amaya/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880/devel Modified Files: amaya.spec Log Message: - forgot to update version tag... Index: amaya.spec =================================================================== RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- amaya.spec 14 Apr 2006 08:18:42 -0000 1.29 +++ amaya.spec 1 May 2006 08:42:34 -0000 1.30 @@ -1,6 +1,6 @@ Name: amaya -Version: 9.4 -Release: 4%{?dist} +Version: 9.5 +Release: 1%{?dist} Summary: W3C's browser/web authoring tool Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 1 09:34:06 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:34:06 -0700 Subject: rpms/mod_cband/devel .cvsignore, 1.2, 1.3 mod_cband.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010934.k419Y8vZ025353@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25332 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 1 2006 Michael Fleming 0.9.7.3-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2006 23:24:26 -0000 1.2 +++ .cvsignore 1 May 2006 09:34:06 -0000 1.3 @@ -1 +1 @@ -mod-cband-0.9.7.2.tgz +mod-cband-0.9.7.3.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/mod_cband.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_cband.spec 17 Mar 2006 23:24:26 -0000 1.1 +++ mod_cband.spec 1 May 2006 09:34:06 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.2 -Release: 3%{?dist} +Version: 0.9.7.3 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +- New upstream release + * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 - Config file set not to be replaced on upgrade - Status information URI limited to localhost by default. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2006 23:24:26 -0000 1.2 +++ sources 1 May 2006 09:34:06 -0000 1.3 @@ -1 +1 @@ -d261161ac299437a1342b12ae586cab9 mod-cband-0.9.7.2.tgz +5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 09:36:08 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:36:08 -0700 Subject: rpms/mod_cband/FC-5 mod_cband.spec,1.1,1.2 Message-ID: <200605010936.k419aA23025455@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25438 Modified Files: mod_cband.spec Log Message: * Mon May 1 2006 Michael Fleming 0.9.7.3-1 - New upstream release Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/mod_cband.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_cband.spec 17 Mar 2006 23:24:26 -0000 1.1 +++ mod_cband.spec 1 May 2006 09:36:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.2 -Release: 3%{?dist} +Version: 0.9.7.3 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +- New upstream release + * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 - Config file set not to be replaced on upgrade - Status information URI limited to localhost by default. From fedora-extras-commits at redhat.com Mon May 1 09:36:59 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:36:59 -0700 Subject: rpms/mod_cband/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605010937.k419b1A1025498@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25479 Modified Files: .cvsignore sources Log Message: Whoops, forgot sources. I'm a tool. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2006 23:24:26 -0000 1.2 +++ .cvsignore 1 May 2006 09:36:58 -0000 1.3 @@ -1 +1 @@ -mod-cband-0.9.7.2.tgz +mod-cband-0.9.7.3.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2006 23:24:26 -0000 1.2 +++ sources 1 May 2006 09:36:58 -0000 1.3 @@ -1 +1 @@ -d261161ac299437a1342b12ae586cab9 mod-cband-0.9.7.2.tgz +5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 09:42:57 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:42:57 -0700 Subject: rpms/mod_cband/FC-4 .cvsignore, 1.2, 1.3 mod_cband.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605010942.k419gxSa025611@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25590 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 1 2006 Michael Fleming 0.9.7.3-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2006 23:24:26 -0000 1.2 +++ .cvsignore 1 May 2006 09:42:57 -0000 1.3 @@ -1 +1 @@ -mod-cband-0.9.7.2.tgz +mod-cband-0.9.7.3.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/mod_cband.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_cband.spec 17 Mar 2006 23:24:26 -0000 1.1 +++ mod_cband.spec 1 May 2006 09:42:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.2 -Release: 3%{?dist} +Version: 0.9.7.3 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +- New upstream release + * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 - Config file set not to be replaced on upgrade - Status information URI limited to localhost by default. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2006 23:24:26 -0000 1.2 +++ sources 1 May 2006 09:42:57 -0000 1.3 @@ -1 +1 @@ -d261161ac299437a1342b12ae586cab9 mod-cband-0.9.7.2.tgz +5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 09:55:56 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 02:55:56 -0700 Subject: rpms/mod_cband/devel mod_cband.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200605010955.k419twOG025699@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25680 Modified Files: mod_cband.spec sources Log Message: Bump due to bad tarball Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/mod_cband.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_cband.spec 1 May 2006 09:34:06 -0000 1.2 +++ mod_cband.spec 1 May 2006 09:55:56 -0000 1.3 @@ -1,6 +1,6 @@ Name: mod_cband Version: 0.9.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,7 +42,7 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog -* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +* Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 09:34:06 -0000 1.3 +++ sources 1 May 2006 09:55:56 -0000 1.4 @@ -1 +1 @@ -5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz +958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 10:14:33 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 03:14:33 -0700 Subject: rpms/mod_cband/FC-5 mod_cband.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200605011014.k41AEZ1u027998@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27965 Modified Files: mod_cband.spec sources Log Message: Bump for bad source tarball Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/mod_cband.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_cband.spec 1 May 2006 09:36:08 -0000 1.2 +++ mod_cband.spec 1 May 2006 10:14:33 -0000 1.3 @@ -1,6 +1,6 @@ Name: mod_cband Version: 0.9.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,7 +42,7 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog -* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +* Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 09:36:58 -0000 1.3 +++ sources 1 May 2006 10:14:33 -0000 1.4 @@ -1 +1 @@ -5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz +958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 10:16:00 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 03:16:00 -0700 Subject: rpms/mod_cband/FC-4 mod_cband.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200605011016.k41AG2IQ028076@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28057 Modified Files: mod_cband.spec sources Log Message: Bump for bad source tarball Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/mod_cband.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_cband.spec 1 May 2006 09:42:57 -0000 1.2 +++ mod_cband.spec 1 May 2006 10:16:00 -0000 1.3 @@ -1,6 +1,6 @@ Name: mod_cband Version: 0.9.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,7 +42,7 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog -* Mon May 1 2006 Michael Fleming 0.9.7.3-1 +* Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 09:42:57 -0000 1.3 +++ sources 1 May 2006 10:16:00 -0000 1.4 @@ -1 +1 @@ -5dab229bf0e8f543f3e44c2b88fabbcd mod-cband-0.9.7.3.tgz +958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz From fedora-extras-commits at redhat.com Mon May 1 10:55:44 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 03:55:44 -0700 Subject: rpms/yap/devel chr_translate.pl, NONE, 1.1 chr_translate_bootstrap1.pl, NONE, 1.1 chr_translate_bootstrap2.pl, NONE, 1.1 guard_entailment.pl, NONE, 1.1 yap.spec, 1.9, 1.10 Message-ID: <200605011055.k41AtkH2028287@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28266 Modified Files: yap.spec Added Files: chr_translate.pl chr_translate_bootstrap1.pl chr_translate_bootstrap2.pl guard_entailment.pl Log Message: new version 5.1.1 --- NEW FILE chr_translate.pl --- /* Generated by CHR bootstrap compiler From: chr_translate.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,50,58,49,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(listmap). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-use_module(guard_entailment). :-use_module(chr_compiler_options). :-use_module(chr_compiler_utility). :-include(chr_op). :-op(1150,fx,chr_type). :-op(1130,xfx,--->). :-op(1150,fx,+). :-op(1150,fx,-). :-op(1150,fx,?). set_constraint_indices(A) :- set_constraint_indices(A,1). set_constraint_indices([],A) :- B is A-1, max_constraint_index(B). set_constraint_indices([A|B],C) :- ( ( chr_pp_flag(debugable,on) ; may_trigger(A) ; is_stored(A), get_store_type(A,default) ) -> constraint_index(A,C), D is C+1, set_constraint_indices(B,D) ; set_constraint_indices(B,C) ). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), check_declared_constraints(C), ( C==[] -> insert_declarations(E,B) ; generate_show_constraint(C,F,D,G), add_constraints(F), add_rules(G), check_rules(G,F), add_occurrences(G), functional_dependency_analysis(G), set_semantics_rules(G), symmetry_analysis(G), guard_simplification, storage_analysis(F), observation_analysis(F), ai_observation_analysis(F), late_allocation(F), assume_constraint_stores(F), set_constraint_indices(F), constraints_code(F,H), validate_store_type_assumptions(F), store_management_preds(F,I), insert_declarations(E,J), chr_module_declaration(K), append_lists([J,I,H,K],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_attach_code(A,I), generate_counter_code(J), append_lists([C,D,E,F,G,H,I,J],B). insert_declarations(A,B) :- append(A,[(:-use_module(chr(chr_runtime))),(:-use_module(chr(chr_hashtable_store))),(:-use_module(library('clp/clp_events')))],B). generate_counter_code(A) :- ( chr_pp_flag(store_counter,on) -> A=[('$counter_init'(B):-nb_setval(B,0)),('$counter'(C,D):-nb_getval(C,D)),('$counter_inc'(E):-nb_getval(E,F),G is F+1,nb_setval(E,G)),(:-'$counter_init'('$insert_counter')),(:-'$counter_init'('$delete_counter')),('$insert_counter_inc':-'$counter_inc'('$insert_counter')),('$delete_counter_inc':-'$counter_inc'('$delete_counter')),(counter_stats(H,I):-'$counter'('$insert_counter',H),'$counter'('$delete_counter',I))] ; A=[] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( is_type_definition(A) -> C=G, D=H, E=I ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,E), extract_type_mode(E,B). extract_type_mode([],[]). extract_type_mode([A/B|C],[A/B|D]) :- !, extract_type_mode(C,D). extract_type_mode([A|B],[C|D]) :- functor(A,E,F), C=E/F, A=..[_|G], extract_types_and_modes(G,H,I), constraint_type(E/F,H), constraint_mode(E/F,I), extract_type_mode(B,D). extract_types_and_modes([],[],[]). extract_types_and_modes([(+A)|B],[A|C],[+|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(?A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(-A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([A|_],_,_) :- format('CHR compiler ERROR: Illegal mode/type declaration "~w". ',[A]), format(' `--> correct syntax is +type, -type or ?type. ',[]), [...8829 lines suppressed...] ; true ) ; 'depends_on_goal/2__1__0'(G,A,B,C) ). 'depends_on_goal/2__1'(A,B,C) :- allocate_constraint(true,C,depends_on_goal(A,B),[A,B]), 'depends_on_goal/2__2'(A,B,C). 'depends_on_goal/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_goal/2'(A) ; true ). ai_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,C), !, 'ai_observed/2__0__0'(C,A,B). 'ai_observed/2__0__0'([],A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__0__0'([E|F],A,B) :- ( E=suspension(_,mutable(active),_,_,_,_,C,D), C==A, D==B -> remove_constraint_internal(E,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(E) ; true ), 'ai_observed/2__0__0'(F,A,B) ; 'ai_observed/2__0__0'(F,A,B) ). ai_observed(A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__1'(A,B) :- '$via1_multi_hash_ai_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !. 'ai_observed/2__1'(A,B) :- insert_constraint_internal(_,_,C,true,ai_observed(A,B),[A,B]), '$insert_in_store_ai_observed/2'(C). ai_not_observed(A,B) :- 'ai_not_observed/2__0'(A,B,_). 'ai_not_observed/2__0'(A,B,C) :- '$via1_multi_hash_stored/3-1'(A,D), !, allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__0__0'(D,A,B,C). 'ai_not_observed/2__0__0'([],A,B,C) :- 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__0__0'([G|H],A,B,C) :- ( G=suspension(_,mutable(active),_,_,_,_,D,E,F), D==A, E==B, F=yes, '$via1_multi_hash_stored_complete/3-1'(A,L), 'chr sbag_member'(I,L), I=suspension(_,mutable(active),_,_,_,_,_,J,K), B remove_constraint_internal(G,_,M), ( M==yes -> '$delete_from_store_stored/3'(G) ; true ), remove_constraint_internal(I,_,N), ( N==yes -> '$delete_from_store_stored_complete/3'(I) ; true ), activate_constraint(P,_,C,Q), ( P==yes -> '$insert_in_store_ai_not_observed/2'(C) ; true ), O is K-1, stored(A,B,maybe), stored_complete(A,J,O), ( C=suspension(_,mutable(active),_,mutable(Q),_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'ai_not_observed/2__0__0'(H,A,B,C) ; true ) ; 'ai_not_observed/2__0__0'(H,A,B,C) ). 'ai_not_observed/2__0'(A,B,C) :- allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_not_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_ai_not_observed/2'(A) ; true ). ai_is_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !, fail. ai_is_observed(_,_). depends_on_as(A,B,C) :- 'depends_on_as/3__0'(A,B,C,_). 'depends_on_as/3__0'(A,B,C,D) :- '$via1_multi_hash_final_answer_pattern/2-1'(B,E), !, allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__0'([],A,B,C,D) :- 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__0__0'([G|I],A,B,C,D) :- ( G=suspension(_,mutable(active),_,_,_,_,E,F), E==B, '$via1_multi_hash_final_answer_pattern/2-1'(C,H) -> 'depends_on_as/3__0__1'(H,F,G,I,A,B,C,D) ; 'depends_on_as/3__0__0'(I,A,B,C,D) ). 'depends_on_as/3__0__1'([],_,_,E,A,B,C,D) :- 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__1'([J|K],F,A,G,B,C,D,E) :- ( J=suspension(_,mutable(active),_,_,_,_,H,I), J\==A, H==D, O=t(141,E,A,J), 'chr novel_production'(E,O), 'chr novel_production'(A,O), 'chr novel_production'(J,O) -> 'chr extend_history'(E,O), activate_constraint(M,_,E,N), ( M==yes -> '$insert_in_store_depends_on_as/3'(E) ; true ), ai_observation_lub(F,I,L), final_answer_pattern(B,L), ( E=suspension(_,mutable(active),_,mutable(N),_,_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ; true ) ; 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ). 'depends_on_as/3__0'(A,B,C,D) :- allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__1'(_,_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_as/3'(A) ; true ). --- NEW FILE chr_translate_bootstrap1.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap1.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate_bootstrap1,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> B=E ; check_rules(D,C), unique_analyse_optimise(D,F), check_attachments(F), set_constraint_indices(C,1), store_management_preds(C,G), constraints_code(C,F,H), append_lists([E,G,H],B) ), chr_clear. store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_attach_increment(D), generate_attr_unify_hook(E), append_lists([C,D,E],B). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), C=pragma(F,G,H,B). rule(A,B,C) :- is_rule(A,D,E), C=pragma(D,E,[],B). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). check_rules(A,B) :- check_rules(A,B,1). check_rules([],_,_). check_rules([A|B],C,D) :- check_rule(A,C,D), E is D+1, check_rules(B,C,E). check_rule(A,B,C) :- A=pragma(D,_,E,_), D=rule(F,G,_,_), append(F,G,H), check_head_constraints(H,B,A,C), check_pragmas(E,A,C). check_head_constraints([],_,_,_). check_head_constraints([A|B],C,D,E) :- functor(A,F,G), ( member(F/G,C) -> check_head_constraints(B,C,D,E) ; format('CHR compiler ERROR: Undeclared constraint ~w in head of ~@. ',[F/G,format_rule(D,E)]), format(' `--> Constraint should be on of ~w. ',[C]), fail ). check_pragmas([],_,_). check_pragmas([A|B],C,D) :- check_pragma(A,C,D), check_pragmas(B,C,D). check_pragma(A,B,C) :- var(A), !, format('CHR compiler ERROR: invalid pragma ~w in ~@. ',[A,format_rule(B,C)]), format(' `--> Pragma should not be a variable! ',[]), fail. check_pragma(passive(A),B,C) :- !, B=pragma(_,ids(D,E),_,_), [...2192 lines suppressed...] 'detach_attached/2'(K,B) ). 'attached/2__1'(A,B,C) :- B==no, 'chr via_1'(A,D), get_attr(D,chr_translate_bootstrap1,E), E=v(G,_,_,_,_,_,F), G/\32=:=32, !, 'attached/2__1__0'(F,A,B,C). 'attached/2__1__0'([],A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,G,_,_,_,_,F,_), G=mutable(active), F==A -> 'chr remove_constraint_internal'(D,H), 'detach_attached/2'(H,D), 'attached/2__1__0'(E,A,B,C) ; 'attached/2__1__0'(E,A,B,C) ). 'attached/2__1'(A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__2'(A,B,C) :- B==maybe, 'chr via_1'(A,E), get_attr(E,chr_translate_bootstrap1,F), F=v(K,_,_,_,_,_,J), K/\32=:=32, ( 'chr sbag_member'(D,J), D=suspension(_,I,_,_,_,_,G,H), I=mutable(active), G==A, H==maybe -> true ), !, ( var(C) -> true ; 'chr remove_constraint_internal'(C,L), 'detach_attached/2'(L,C) ). 'attached/2__2'(_,_,A) :- 'chr activate_constraint'(B,A,_), 'attach_attached/2'(B,A). is_attached(A) :- 'is_attached/1__0'(A,_). 'is_attached/1__0'(A,_) :- 'chr via_1'(A,C), get_attr(C,chr_translate_bootstrap1,D), D=v(I,_,_,_,_,_,H), I/\32=:=32, 'chr sbag_member'(B,H), B=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, ( F==no -> fail ; true ). 'is_attached/1__0'(_,_) :- !. chr_clear :- 'chr_clear/0__0'(_). 'chr_clear/0__0'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,D,_,_,_,_,_), E/\1=:=1, !, ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__0__0'(D,A). 'chr_clear/0__0__0'([],A) :- 'chr_clear/0__1'(A). 'chr_clear/0__0__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint/2'(E,B), 'chr_clear/0__0__0'(C,A) ; 'chr_clear/0__0__0'(C,A) ). 'chr_clear/0__0'(A) :- ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__1'(A). 'chr_clear/0__1'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,D,_,_,_,_), E/\2=:=2, !, 'chr_clear/0__1__0'(D,A). 'chr_clear/0__1__0'([],A) :- 'chr_clear/0__2'(A). 'chr_clear/0__1__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_count/1'(E,B), 'chr_clear/0__1__0'(C,A) ; 'chr_clear/0__1__0'(C,A) ). 'chr_clear/0__1'(A) :- 'chr_clear/0__2'(A). 'chr_clear/0__2'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,D,_,_,_), E/\4=:=4, !, 'chr_clear/0__2__0'(D,A). 'chr_clear/0__2__0'([],A) :- 'chr_clear/0__3'(A). 'chr_clear/0__2__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_index/2'(E,B), 'chr_clear/0__2__0'(C,A) ; 'chr_clear/0__2__0'(C,A) ). 'chr_clear/0__2'(A) :- 'chr_clear/0__3'(A). 'chr_clear/0__3'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,D,_,_), E/\8=:=8, !, 'chr_clear/0__3__0'(D,A). 'chr_clear/0__3__0'([],A) :- 'chr_clear/0__4'(A). 'chr_clear/0__3__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_max_constraint_index/1'(E,B), 'chr_clear/0__3__0'(C,A) ; 'chr_clear/0__3__0'(C,A) ). 'chr_clear/0__3'(A) :- 'chr_clear/0__4'(A). 'chr_clear/0__4'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,D,_), E/\16=:=16, !, 'chr_clear/0__4__0'(D,A). 'chr_clear/0__4__0'([],A) :- 'chr_clear/0__5'(A). 'chr_clear/0__4__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_target_module/1'(E,B), 'chr_clear/0__4__0'(C,A) ; 'chr_clear/0__4__0'(C,A) ). 'chr_clear/0__4'(A) :- 'chr_clear/0__5'(A). 'chr_clear/0__5'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,_,D), E/\32=:=32, !, 'chr_clear/0__5__0'(D,A). 'chr_clear/0__5__0'([],A) :- 'chr_clear/0__6'(A). 'chr_clear/0__5__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_attached/2'(E,B), 'chr_clear/0__5__0'(C,A) ; 'chr_clear/0__5__0'(C,A) ). 'chr_clear/0__5'(A) :- 'chr_clear/0__6'(A). 'chr_clear/0__6'(_) :- !. --- NEW FILE chr_translate_bootstrap2.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap2.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(chr_runtime). :-use_module(chr_hashtable_store). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> insert_declarations(E,B) ; add_rules(D), check_rules(D,C), add_occurrences(D), late_allocation(C), unique_analyse_optimise(D,F), check_attachments(C), assume_constraint_stores(C), set_constraint_indices(C,1), constraints_code(C,F,G), validate_store_type_assumptions(C), store_management_preds(C,H), insert_declarations(E,I), chr_module_declaration(J), append_lists([I,H,G,J],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_store_code(A,I), append_lists([C,D,E,F,G,H,I],B). insert_declarations(A,B) :- ( A=[(:-module(C,D))|E] -> B=[(:-module(C,D)),(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|E] ; B=[(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|A] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). parse_rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). parse_rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), inc_rule_count(I), C=pragma(F,G,H,B,I). rule(A,B,C) :- is_rule(A,D,E), inc_rule_count(F), C=pragma(D,E,[],B,F). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). add_rules([]). add_rules([A|B]) :- A=pragma(_,_,_,_,C), rule(C,A), add_rules(B). check_rules([],_). check_rules([A|B],C) :- [...3285 lines suppressed...] E==A -> true ), !, B=F. 'get_max_occurrence/2__0'(_,A,_) :- !, A=0. allocation_occurrence(A,B) :- 'allocation_occurrence/2__0'(A,B,_). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,N,_,_,_,_,J,K,L,M), N=mutable(active), J==A, K==B, L==E, 'chr lock'(F), 'chr lock'(M), F=pragma(_,ids(_,_),_,_,_), member(M,_), 'chr unlock'(F), 'chr unlock'(M), !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,M,_,_,_,_,J,K,L,_), M=mutable(active), J==A, K==B, L==E, 'chr lock'(F), F=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(F), !, N is B+1, allocation_occurrence(A,N). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,I,_,_,_,_,E,F,G,H), I=mutable(active), E==A, F==B, '$via1_multi_hash_passive/2-1'(G,K), 'chr sbag_member'(J,K), J=suspension(_,N,_,_,_,_,L,M), N=mutable(active), L==G, M==H, !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,C) :- insert_constraint_internal(_,_,C,chr_translate:'allocation_occurrence/2__0'(A,B,C),allocation_occurrence(A,B),[A,B]), '$insert_in_store_allocation_occurrence/2'(C). get_allocation_occurrence(A,B) :- 'get_allocation_occurrence/2__0'(A,B,_). 'get_allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_allocation_occurrence/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_allocation_occurrence/2__0'(_,_,_) :- !, fail. rule(A,B) :- 'rule/2__0'(A,B,_). 'rule/2__0'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__0__0'(D,A,B,C). 'rule/2__0__0'([],A,B,C) :- 'rule/2__1'(A,B,C). 'rule/2__0__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,O,_,_,_,_,K,L,M,N), O=mutable(active), K==F, L==G, M==A, 'chr lock'(B), 'chr lock'(N), B=pragma(_,ids(_,_),_,_,_), member(N,_), 'chr unlock'(B), 'chr unlock'(N) -> remove_constraint_internal(D,_,P), ( P==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(R,_,C,S), ( R==yes -> '$insert_in_store_rule/2'(C) ; true ), Q is G+1, allocation_occurrence(F,Q), ( C=suspension(_,T,_,U,_,_,_,_), T=mutable(active), U=mutable(S) -> 'chr update_mutable'(inactive,T), 'rule/2__0__0'(E,A,B,C) ; true ) ; 'rule/2__0__0'(E,A,B,C) ). 'rule/2__0'(A,B,C) :- allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__1'(A,B,C). 'rule/2__1'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, 'rule/2__1__0'(D,A,B,C). 'rule/2__1__0'([],A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,N,_,_,_,_,K,L,M,_), N=mutable(active), K==F, L==G, M==A, 'chr lock'(B), B=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(B) -> remove_constraint_internal(D,_,O), ( O==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(Q,_,C,R), ( Q==yes -> '$insert_in_store_rule/2'(C) ; true ), P is G+1, allocation_occurrence(F,P), ( C=suspension(_,S,_,T,_,_,_,_), S=mutable(active), T=mutable(R) -> 'chr update_mutable'(inactive,S), 'rule/2__1__0'(E,A,B,C) ; true ) ; 'rule/2__1__0'(E,A,B,C) ). 'rule/2__1'(A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_rule/2'(A) ; true ). get_rule(A,B) :- 'get_rule/2__0'(A,B,_). 'get_rule/2__0'(A,B,_) :- '$via1_multi_hash_rule/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_rule/2__0'(_,_,_) :- !, fail. --- NEW FILE guard_entailment.pl --- /* Generated by CHR bootstrap compiler From: guard_entailment.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,53,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(guard_entailment,[entails_guard/2,simplify_guards/5]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(builtins). entails_guard(A,B) :- copy_term_nat((A,B),(C,D)), term_variables(C,E), variables(E), entails_guard2(C), !, test(D), !, cleanup. entails_guard2([]). entails_guard2([A|B]) :- known(A), entails_guard2(B). simplify_guards(A,B,C,D,E) :- copy_term_nat((A,C),(F,G)), term_variables(F,H), variables(H), entails_guard2(F), !, simplify(G,I), simplified(C,I,D,B,E), !, cleanup. simplified([],[],[],A,A). simplified([A|B],[keep|C],[A|D],E,F) :- simplified(B,C,D,E,F). simplified([_|_],[fail|_],fail,A,A). simplified([A|B],[true|C],[D|E],F,G) :- builtins:binds_b(A,H), term_variables(B,I), intersect_eq(H,I,J), !, ( J=[] -> term_variables(F,K), intersect_eq(H,K,L), !, ( L=[] -> D=true, G=M ; D=true, G=(A,M) ) ; D=A, G=M ), simplified(B,C,E,F,M). simplify([],[]). simplify([A|B],[C|D]) :- ( \+try(true,A) -> C=true ; builtins:negate_b(A,E), ( \+try(true,E) -> C=fail ; C=keep ) ), known(A), simplify(B,D). try(A,B) :- ( known(A) -> true ; format(' ERROR: entailment checker: this is not supposed to happen. ',[]) ), ( test(B) -> fail ; true ). lookup([],[],_,_) :- fail. lookup([A|B],[C|D],E,F) :- ( E==A -> F=C ; lookup(B,D,E,F) ). add_args_unif([],[],true). add_args_unif([A|B],[C|D],(A=C,E)) :- add_args_unif(B,D,E). add_args_nunif([],[],fail). add_args_nunif([A|B],[C|D],(A\=C;E)) :- add_args_nunif(B,D,E). add_args_nmatch([],[],fail). add_args_nmatch([A|B],[C|D],(A\==C;E)) :- add_args_nmatch(B,D,E). all_unique_vars(A,B) :- all_unique_vars(A,B,[]). all_unique_vars([],_,_). all_unique_vars([A|B],C,D) :- var(A), \+memberchk_eq(A,C), \+memberchk_eq(A,D), all_unique_vars(B,[A|D]). :-use_module(chr(chr_runtime)). :-use_module(chr(chr_hashtable_store)). :-use_module(library('clp/clp_events')). 'attach_known/1'([],_). 'attach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\1=:=1 -> put_attr(A,guard_entailment,v(F,[C|D],E)) ; G is F\/1, put_attr(A,guard_entailment,v(G,[C],E)) ) ; put_attr(A,guard_entailment,v(1,[C],[])) ), true, 'attach_known/1'(B,C). 'detach_known/1'([],_). 'detach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\1=:=1 -> 'chr sbag_del_element'(D,C,H), ( H==[] -> G is F/\ -2, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,[],E)) ) ; put_attr(A,guard_entailment,v(F,H,E)) ) ; true ) ; true ), 'detach_known/1'(B,C). 'attach_variables/1'([],_). 'attach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\2=:=2 -> put_attr(A,guard_entailment,v(F,D,[C|E])) ; G is F\/2, put_attr(A,guard_entailment,v(G,D,[C])) ) ; put_attr(A,guard_entailment,v(2,[],[C])) ), true, 'attach_variables/1'(B,C). 'detach_variables/1'([],_). 'detach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\2=:=2 -> 'chr sbag_del_element'(E,C,H), ( H==[] -> G is F/\ -3, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,D,[])) ) ; put_attr(A,guard_entailment,v(F,D,H)) ) ; true ) ; true ), 'detach_variables/1'(B,C). '$indexed_variables'(B,A) :- B=known(_), term_variables(B,A). '$indexed_variables'(B,A) :- B=variables(_), term_variables(B,A). attach_increment([],_). [...3131 lines suppressed...] B=functor(C,_,_), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=ground(C), ground(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), number(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), float(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), integer(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), nonvar(C), !. test(A) :- nonvar(A), A=(B,C), !, test(B), known(B), test(C). test(A) :- nonvar(A), A=(B;C), !, negate_b(B,D), negate_b(C,E), ( known(E), test(B) ; known(D), test(C) ). test(A) :- 'chr global_term_ref_1'(D), get_attr(D,guard_entailment,E), E=v(G,F,_), G/\1=:=1, 'chr sbag_member'(B,F), B=suspension(_,mutable(active),_,_,_,_,C), nonvar(C), C=(H;I), !, remove_constraint_internal(B,K,L), ( L==yes -> '$delete_from_store_known/1'(B), 'detach_known/1'(K,B) ; true ), \+try(H,A), !, negate_b(H,J), known(J), \+try(I,A). test(_) :- fail. cleanup :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,C,_), D/\1=:=1, !, 'cleanup/0__0__0'(C). 'cleanup/0__0__0'([]) :- 'cleanup/0__1'. 'cleanup/0__0__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_known/1'(A), 'detach_known/1'(C,A) ; true ), 'cleanup/0__0__0'(B) ; 'cleanup/0__0__0'(B) ). cleanup :- 'cleanup/0__1'. 'cleanup/0__1' :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,_,C), D/\2=:=2, !, 'cleanup/0__1__0'(C). 'cleanup/0__1__0'([]) :- 'cleanup/0__2'. 'cleanup/0__1__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_variables/1'(A), 'detach_variables/1'(C,A) ; true ), 'cleanup/0__1__0'(B) ; 'cleanup/0__1__0'(B) ). 'cleanup/0__1' :- 'cleanup/0__2'. 'cleanup/0__2'. variables(A) :- 'variables/1__0'(A,_). 'variables/1__0'(A,B) :- 'chr global_term_ref_1'(E), get_attr(E,guard_entailment,F), F=v(H,G,_), H/\1=:=1, 'chr sbag_member'(C,G), C=suspension(_,mutable(active),_,_,_,_,D), nonvar(D), D=functor(I,J,K), ground(K), ground(J), var(I), !, remove_constraint_internal(C,N,O), ( O==yes -> '$delete_from_store_known/1'(C), 'detach_known/1'(N,C) ; true ), ( var(B) -> true ; remove_constraint_internal(B,P,Q), ( Q==yes -> '$delete_from_store_variables/1'(B), 'detach_variables/1'(P,B) ; true ) ), functor(I,J,K), I=..[_|L], append(L,A,M), variables(M). 'variables/1__0'(A,B) :- ( var(B) -> insert_constraint_internal(D,C,B,guard_entailment:'variables/1__0'(A,B),variables(A),[A]) ; activate_constraint(D,C,B,_) ), ( D==yes -> '$insert_in_store_variables/1'(B), 'attach_variables/1'(C,B) ; true ). :-multifile chr:'$chr_module'/1. chr:'$chr_module'(guard_entailment). Index: yap.spec =================================================================== RCS file: /cvs/extras/rpms/yap/devel/yap.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- yap.spec 17 Feb 2006 21:42:57 -0000 1.9 +++ yap.spec 1 May 2006 10:55:44 -0000 1.10 @@ -1,12 +1,16 @@ Name: yap -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages License: Artistic/LGPL -Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.0.1.tar.gz +Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.1.1.tar.gz +Source1: guard_entailment.pl +Source2: chr_translate_bootstrap1.pl +Source3: chr_translate_bootstrap2.pl +Source4: chr_translate.pl Patch1: Yap-noni386.patch URL: http://www.ncc.up.pt/~vsc/Yap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,9 +25,29 @@ follows the Edinburgh tradition, and is largely compatible with the ISO-Prolog standard and with Quintus and SICStus Prolog. + +%package devel +Summary: C-Interface development files for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description devel +C-Interface development files for Yap. + + +%package docs +Summary: Documentation for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description docs +Documentation for Yap. + + %prep %setup -q -n Yap-%{version} %patch1 -p1 +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr %build %configure \ @@ -33,6 +57,7 @@ make %{?_smp_mflags} (cd docs; make info) + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install @@ -40,10 +65,23 @@ cp -f docs/yap.info* $RPM_BUILD_ROOT%{_infodir} cp -f LGPL/pillow/doc/pillow_doc.info $RPM_BUILD_ROOT%{_infodir} +# fix permissions and flags +chmod 0644 $RPM_BUILD_ROOT%{_datadir}/Yap/pl/* +chmod 0644 $RPM_BUILD_ROOT%{_includedir}/Yap/* +find -name '*.lgt' -exec chmod 0644 '{}' ';' +find -name '*.h' -exec chmod 0644 '{}' ';' +find -name '*.c' -exec chmod 0644 '{}' ';' + +# move examples to docdir +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv $RPM_BUILD_ROOT%{_datadir}/Yap/examples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT%{_datadir}/Yap/clpbn/examples + %post /sbin/install-info %{_infodir}/yap.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : + %postun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || : @@ -54,24 +92,38 @@ %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc README %doc changes* +%{_bindir}/yap +%{_datadir}/Yap +%{_prefix}/lib/Yap +%{_infodir}/* + + +%files devel +%defattr(-,root,root,-) +%{_prefix}/lib/libYap.a +%{_includedir}/Yap + + +%files docs +%defattr(-,root,root,-) %doc docs/*.html %doc docs/yap.pdf %doc LGPL/pillow/doc/pillow_doc_html/* %doc LGPL/pillow/doc/article.ps.gz %doc --parent Logtalk/manuals %doc --parent Logtalk/examples -%{_bindir}/yap -%{_datadir}/Yap -%{_includedir}/Yap -%{_prefix}/lib/libYap.a -%{_prefix}/lib/Yap -%{_infodir}/* + %changelog +* Mon May 1 2006 Gerard Milmeister - 5.1.1-1 +- new version 5.1.1 +- split off devel and docs packages + * Fri Feb 17 2006 Gerard Milmeister - 5.0.1-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon May 1 10:59:04 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 03:59:04 -0700 Subject: rpms/yap/devel .cvsignore,1.3,1.4 sources,1.4,1.5 Message-ID: <200605011059.k41Ax6tv028341@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28322 Modified Files: .cvsignore sources Log Message: new version 5.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yap/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Oct 2005 08:32:24 -0000 1.3 +++ .cvsignore 1 May 2006 10:59:04 -0000 1.4 @@ -1 +1 @@ -Yap-5.0.1.tar.gz +Yap-5.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yap/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Oct 2005 08:32:24 -0000 1.4 +++ sources 1 May 2006 10:59:04 -0000 1.5 @@ -1 +1 @@ -d8d1f1c5a38d501eb9db38d880668eda Yap-5.0.1.tar.gz +1f5c26642a27158c98f6c2fac56d3dad Yap-5.1.1.tar.gz From fedora-extras-commits at redhat.com Mon May 1 11:06:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 04:06:59 -0700 Subject: rpms/yap/FC-5 chr_translate.pl, NONE, 1.1 chr_translate_bootstrap1.pl, NONE, 1.1 chr_translate_bootstrap2.pl, NONE, 1.1 guard_entailment.pl, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 yap.spec, 1.9, 1.10 Message-ID: <200605011107.k41B7Yct031029@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953 Modified Files: .cvsignore sources yap.spec Added Files: chr_translate.pl chr_translate_bootstrap1.pl chr_translate_bootstrap2.pl guard_entailment.pl Log Message: new version 5.1.1 --- NEW FILE chr_translate.pl --- /* Generated by CHR bootstrap compiler From: chr_translate.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,50,58,49,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(listmap). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-use_module(guard_entailment). :-use_module(chr_compiler_options). :-use_module(chr_compiler_utility). :-include(chr_op). :-op(1150,fx,chr_type). :-op(1130,xfx,--->). :-op(1150,fx,+). :-op(1150,fx,-). :-op(1150,fx,?). set_constraint_indices(A) :- set_constraint_indices(A,1). set_constraint_indices([],A) :- B is A-1, max_constraint_index(B). set_constraint_indices([A|B],C) :- ( ( chr_pp_flag(debugable,on) ; may_trigger(A) ; is_stored(A), get_store_type(A,default) ) -> constraint_index(A,C), D is C+1, set_constraint_indices(B,D) ; set_constraint_indices(B,C) ). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), check_declared_constraints(C), ( C==[] -> insert_declarations(E,B) ; generate_show_constraint(C,F,D,G), add_constraints(F), add_rules(G), check_rules(G,F), add_occurrences(G), functional_dependency_analysis(G), set_semantics_rules(G), symmetry_analysis(G), guard_simplification, storage_analysis(F), observation_analysis(F), ai_observation_analysis(F), late_allocation(F), assume_constraint_stores(F), set_constraint_indices(F), constraints_code(F,H), validate_store_type_assumptions(F), store_management_preds(F,I), insert_declarations(E,J), chr_module_declaration(K), append_lists([J,I,H,K],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_attach_code(A,I), generate_counter_code(J), append_lists([C,D,E,F,G,H,I,J],B). insert_declarations(A,B) :- append(A,[(:-use_module(chr(chr_runtime))),(:-use_module(chr(chr_hashtable_store))),(:-use_module(library('clp/clp_events')))],B). generate_counter_code(A) :- ( chr_pp_flag(store_counter,on) -> A=[('$counter_init'(B):-nb_setval(B,0)),('$counter'(C,D):-nb_getval(C,D)),('$counter_inc'(E):-nb_getval(E,F),G is F+1,nb_setval(E,G)),(:-'$counter_init'('$insert_counter')),(:-'$counter_init'('$delete_counter')),('$insert_counter_inc':-'$counter_inc'('$insert_counter')),('$delete_counter_inc':-'$counter_inc'('$delete_counter')),(counter_stats(H,I):-'$counter'('$insert_counter',H),'$counter'('$delete_counter',I))] ; A=[] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( is_type_definition(A) -> C=G, D=H, E=I ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,E), extract_type_mode(E,B). extract_type_mode([],[]). extract_type_mode([A/B|C],[A/B|D]) :- !, extract_type_mode(C,D). extract_type_mode([A|B],[C|D]) :- functor(A,E,F), C=E/F, A=..[_|G], extract_types_and_modes(G,H,I), constraint_type(E/F,H), constraint_mode(E/F,I), extract_type_mode(B,D). extract_types_and_modes([],[],[]). extract_types_and_modes([(+A)|B],[A|C],[+|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(?A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(-A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([A|_],_,_) :- format('CHR compiler ERROR: Illegal mode/type declaration "~w". ',[A]), format(' `--> correct syntax is +type, -type or ?type. ',[]), [...8829 lines suppressed...] ; true ) ; 'depends_on_goal/2__1__0'(G,A,B,C) ). 'depends_on_goal/2__1'(A,B,C) :- allocate_constraint(true,C,depends_on_goal(A,B),[A,B]), 'depends_on_goal/2__2'(A,B,C). 'depends_on_goal/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_goal/2'(A) ; true ). ai_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,C), !, 'ai_observed/2__0__0'(C,A,B). 'ai_observed/2__0__0'([],A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__0__0'([E|F],A,B) :- ( E=suspension(_,mutable(active),_,_,_,_,C,D), C==A, D==B -> remove_constraint_internal(E,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(E) ; true ), 'ai_observed/2__0__0'(F,A,B) ; 'ai_observed/2__0__0'(F,A,B) ). ai_observed(A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__1'(A,B) :- '$via1_multi_hash_ai_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !. 'ai_observed/2__1'(A,B) :- insert_constraint_internal(_,_,C,true,ai_observed(A,B),[A,B]), '$insert_in_store_ai_observed/2'(C). ai_not_observed(A,B) :- 'ai_not_observed/2__0'(A,B,_). 'ai_not_observed/2__0'(A,B,C) :- '$via1_multi_hash_stored/3-1'(A,D), !, allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__0__0'(D,A,B,C). 'ai_not_observed/2__0__0'([],A,B,C) :- 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__0__0'([G|H],A,B,C) :- ( G=suspension(_,mutable(active),_,_,_,_,D,E,F), D==A, E==B, F=yes, '$via1_multi_hash_stored_complete/3-1'(A,L), 'chr sbag_member'(I,L), I=suspension(_,mutable(active),_,_,_,_,_,J,K), B remove_constraint_internal(G,_,M), ( M==yes -> '$delete_from_store_stored/3'(G) ; true ), remove_constraint_internal(I,_,N), ( N==yes -> '$delete_from_store_stored_complete/3'(I) ; true ), activate_constraint(P,_,C,Q), ( P==yes -> '$insert_in_store_ai_not_observed/2'(C) ; true ), O is K-1, stored(A,B,maybe), stored_complete(A,J,O), ( C=suspension(_,mutable(active),_,mutable(Q),_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'ai_not_observed/2__0__0'(H,A,B,C) ; true ) ; 'ai_not_observed/2__0__0'(H,A,B,C) ). 'ai_not_observed/2__0'(A,B,C) :- allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_not_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_ai_not_observed/2'(A) ; true ). ai_is_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !, fail. ai_is_observed(_,_). depends_on_as(A,B,C) :- 'depends_on_as/3__0'(A,B,C,_). 'depends_on_as/3__0'(A,B,C,D) :- '$via1_multi_hash_final_answer_pattern/2-1'(B,E), !, allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__0'([],A,B,C,D) :- 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__0__0'([G|I],A,B,C,D) :- ( G=suspension(_,mutable(active),_,_,_,_,E,F), E==B, '$via1_multi_hash_final_answer_pattern/2-1'(C,H) -> 'depends_on_as/3__0__1'(H,F,G,I,A,B,C,D) ; 'depends_on_as/3__0__0'(I,A,B,C,D) ). 'depends_on_as/3__0__1'([],_,_,E,A,B,C,D) :- 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__1'([J|K],F,A,G,B,C,D,E) :- ( J=suspension(_,mutable(active),_,_,_,_,H,I), J\==A, H==D, O=t(141,E,A,J), 'chr novel_production'(E,O), 'chr novel_production'(A,O), 'chr novel_production'(J,O) -> 'chr extend_history'(E,O), activate_constraint(M,_,E,N), ( M==yes -> '$insert_in_store_depends_on_as/3'(E) ; true ), ai_observation_lub(F,I,L), final_answer_pattern(B,L), ( E=suspension(_,mutable(active),_,mutable(N),_,_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ; true ) ; 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ). 'depends_on_as/3__0'(A,B,C,D) :- allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__1'(_,_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_as/3'(A) ; true ). --- NEW FILE chr_translate_bootstrap1.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap1.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate_bootstrap1,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> B=E ; check_rules(D,C), unique_analyse_optimise(D,F), check_attachments(F), set_constraint_indices(C,1), store_management_preds(C,G), constraints_code(C,F,H), append_lists([E,G,H],B) ), chr_clear. store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_attach_increment(D), generate_attr_unify_hook(E), append_lists([C,D,E],B). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), C=pragma(F,G,H,B). rule(A,B,C) :- is_rule(A,D,E), C=pragma(D,E,[],B). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). check_rules(A,B) :- check_rules(A,B,1). check_rules([],_,_). check_rules([A|B],C,D) :- check_rule(A,C,D), E is D+1, check_rules(B,C,E). check_rule(A,B,C) :- A=pragma(D,_,E,_), D=rule(F,G,_,_), append(F,G,H), check_head_constraints(H,B,A,C), check_pragmas(E,A,C). check_head_constraints([],_,_,_). check_head_constraints([A|B],C,D,E) :- functor(A,F,G), ( member(F/G,C) -> check_head_constraints(B,C,D,E) ; format('CHR compiler ERROR: Undeclared constraint ~w in head of ~@. ',[F/G,format_rule(D,E)]), format(' `--> Constraint should be on of ~w. ',[C]), fail ). check_pragmas([],_,_). check_pragmas([A|B],C,D) :- check_pragma(A,C,D), check_pragmas(B,C,D). check_pragma(A,B,C) :- var(A), !, format('CHR compiler ERROR: invalid pragma ~w in ~@. ',[A,format_rule(B,C)]), format(' `--> Pragma should not be a variable! ',[]), fail. check_pragma(passive(A),B,C) :- !, B=pragma(_,ids(D,E),_,_), [...2192 lines suppressed...] 'detach_attached/2'(K,B) ). 'attached/2__1'(A,B,C) :- B==no, 'chr via_1'(A,D), get_attr(D,chr_translate_bootstrap1,E), E=v(G,_,_,_,_,_,F), G/\32=:=32, !, 'attached/2__1__0'(F,A,B,C). 'attached/2__1__0'([],A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,G,_,_,_,_,F,_), G=mutable(active), F==A -> 'chr remove_constraint_internal'(D,H), 'detach_attached/2'(H,D), 'attached/2__1__0'(E,A,B,C) ; 'attached/2__1__0'(E,A,B,C) ). 'attached/2__1'(A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__2'(A,B,C) :- B==maybe, 'chr via_1'(A,E), get_attr(E,chr_translate_bootstrap1,F), F=v(K,_,_,_,_,_,J), K/\32=:=32, ( 'chr sbag_member'(D,J), D=suspension(_,I,_,_,_,_,G,H), I=mutable(active), G==A, H==maybe -> true ), !, ( var(C) -> true ; 'chr remove_constraint_internal'(C,L), 'detach_attached/2'(L,C) ). 'attached/2__2'(_,_,A) :- 'chr activate_constraint'(B,A,_), 'attach_attached/2'(B,A). is_attached(A) :- 'is_attached/1__0'(A,_). 'is_attached/1__0'(A,_) :- 'chr via_1'(A,C), get_attr(C,chr_translate_bootstrap1,D), D=v(I,_,_,_,_,_,H), I/\32=:=32, 'chr sbag_member'(B,H), B=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, ( F==no -> fail ; true ). 'is_attached/1__0'(_,_) :- !. chr_clear :- 'chr_clear/0__0'(_). 'chr_clear/0__0'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,D,_,_,_,_,_), E/\1=:=1, !, ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__0__0'(D,A). 'chr_clear/0__0__0'([],A) :- 'chr_clear/0__1'(A). 'chr_clear/0__0__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint/2'(E,B), 'chr_clear/0__0__0'(C,A) ; 'chr_clear/0__0__0'(C,A) ). 'chr_clear/0__0'(A) :- ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__1'(A). 'chr_clear/0__1'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,D,_,_,_,_), E/\2=:=2, !, 'chr_clear/0__1__0'(D,A). 'chr_clear/0__1__0'([],A) :- 'chr_clear/0__2'(A). 'chr_clear/0__1__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_count/1'(E,B), 'chr_clear/0__1__0'(C,A) ; 'chr_clear/0__1__0'(C,A) ). 'chr_clear/0__1'(A) :- 'chr_clear/0__2'(A). 'chr_clear/0__2'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,D,_,_,_), E/\4=:=4, !, 'chr_clear/0__2__0'(D,A). 'chr_clear/0__2__0'([],A) :- 'chr_clear/0__3'(A). 'chr_clear/0__2__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_index/2'(E,B), 'chr_clear/0__2__0'(C,A) ; 'chr_clear/0__2__0'(C,A) ). 'chr_clear/0__2'(A) :- 'chr_clear/0__3'(A). 'chr_clear/0__3'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,D,_,_), E/\8=:=8, !, 'chr_clear/0__3__0'(D,A). 'chr_clear/0__3__0'([],A) :- 'chr_clear/0__4'(A). 'chr_clear/0__3__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_max_constraint_index/1'(E,B), 'chr_clear/0__3__0'(C,A) ; 'chr_clear/0__3__0'(C,A) ). 'chr_clear/0__3'(A) :- 'chr_clear/0__4'(A). 'chr_clear/0__4'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,D,_), E/\16=:=16, !, 'chr_clear/0__4__0'(D,A). 'chr_clear/0__4__0'([],A) :- 'chr_clear/0__5'(A). 'chr_clear/0__4__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_target_module/1'(E,B), 'chr_clear/0__4__0'(C,A) ; 'chr_clear/0__4__0'(C,A) ). 'chr_clear/0__4'(A) :- 'chr_clear/0__5'(A). 'chr_clear/0__5'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,_,D), E/\32=:=32, !, 'chr_clear/0__5__0'(D,A). 'chr_clear/0__5__0'([],A) :- 'chr_clear/0__6'(A). 'chr_clear/0__5__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_attached/2'(E,B), 'chr_clear/0__5__0'(C,A) ; 'chr_clear/0__5__0'(C,A) ). 'chr_clear/0__5'(A) :- 'chr_clear/0__6'(A). 'chr_clear/0__6'(_) :- !. --- NEW FILE chr_translate_bootstrap2.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap2.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(chr_runtime). :-use_module(chr_hashtable_store). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> insert_declarations(E,B) ; add_rules(D), check_rules(D,C), add_occurrences(D), late_allocation(C), unique_analyse_optimise(D,F), check_attachments(C), assume_constraint_stores(C), set_constraint_indices(C,1), constraints_code(C,F,G), validate_store_type_assumptions(C), store_management_preds(C,H), insert_declarations(E,I), chr_module_declaration(J), append_lists([I,H,G,J],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_store_code(A,I), append_lists([C,D,E,F,G,H,I],B). insert_declarations(A,B) :- ( A=[(:-module(C,D))|E] -> B=[(:-module(C,D)),(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|E] ; B=[(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|A] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). parse_rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). parse_rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), inc_rule_count(I), C=pragma(F,G,H,B,I). rule(A,B,C) :- is_rule(A,D,E), inc_rule_count(F), C=pragma(D,E,[],B,F). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). add_rules([]). add_rules([A|B]) :- A=pragma(_,_,_,_,C), rule(C,A), add_rules(B). check_rules([],_). check_rules([A|B],C) :- [...3285 lines suppressed...] E==A -> true ), !, B=F. 'get_max_occurrence/2__0'(_,A,_) :- !, A=0. allocation_occurrence(A,B) :- 'allocation_occurrence/2__0'(A,B,_). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,N,_,_,_,_,J,K,L,M), N=mutable(active), J==A, K==B, L==E, 'chr lock'(F), 'chr lock'(M), F=pragma(_,ids(_,_),_,_,_), member(M,_), 'chr unlock'(F), 'chr unlock'(M), !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,M,_,_,_,_,J,K,L,_), M=mutable(active), J==A, K==B, L==E, 'chr lock'(F), F=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(F), !, N is B+1, allocation_occurrence(A,N). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,I,_,_,_,_,E,F,G,H), I=mutable(active), E==A, F==B, '$via1_multi_hash_passive/2-1'(G,K), 'chr sbag_member'(J,K), J=suspension(_,N,_,_,_,_,L,M), N=mutable(active), L==G, M==H, !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,C) :- insert_constraint_internal(_,_,C,chr_translate:'allocation_occurrence/2__0'(A,B,C),allocation_occurrence(A,B),[A,B]), '$insert_in_store_allocation_occurrence/2'(C). get_allocation_occurrence(A,B) :- 'get_allocation_occurrence/2__0'(A,B,_). 'get_allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_allocation_occurrence/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_allocation_occurrence/2__0'(_,_,_) :- !, fail. rule(A,B) :- 'rule/2__0'(A,B,_). 'rule/2__0'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__0__0'(D,A,B,C). 'rule/2__0__0'([],A,B,C) :- 'rule/2__1'(A,B,C). 'rule/2__0__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,O,_,_,_,_,K,L,M,N), O=mutable(active), K==F, L==G, M==A, 'chr lock'(B), 'chr lock'(N), B=pragma(_,ids(_,_),_,_,_), member(N,_), 'chr unlock'(B), 'chr unlock'(N) -> remove_constraint_internal(D,_,P), ( P==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(R,_,C,S), ( R==yes -> '$insert_in_store_rule/2'(C) ; true ), Q is G+1, allocation_occurrence(F,Q), ( C=suspension(_,T,_,U,_,_,_,_), T=mutable(active), U=mutable(S) -> 'chr update_mutable'(inactive,T), 'rule/2__0__0'(E,A,B,C) ; true ) ; 'rule/2__0__0'(E,A,B,C) ). 'rule/2__0'(A,B,C) :- allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__1'(A,B,C). 'rule/2__1'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, 'rule/2__1__0'(D,A,B,C). 'rule/2__1__0'([],A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,N,_,_,_,_,K,L,M,_), N=mutable(active), K==F, L==G, M==A, 'chr lock'(B), B=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(B) -> remove_constraint_internal(D,_,O), ( O==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(Q,_,C,R), ( Q==yes -> '$insert_in_store_rule/2'(C) ; true ), P is G+1, allocation_occurrence(F,P), ( C=suspension(_,S,_,T,_,_,_,_), S=mutable(active), T=mutable(R) -> 'chr update_mutable'(inactive,S), 'rule/2__1__0'(E,A,B,C) ; true ) ; 'rule/2__1__0'(E,A,B,C) ). 'rule/2__1'(A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_rule/2'(A) ; true ). get_rule(A,B) :- 'get_rule/2__0'(A,B,_). 'get_rule/2__0'(A,B,_) :- '$via1_multi_hash_rule/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_rule/2__0'(_,_,_) :- !, fail. --- NEW FILE guard_entailment.pl --- /* Generated by CHR bootstrap compiler From: guard_entailment.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,53,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(guard_entailment,[entails_guard/2,simplify_guards/5]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(builtins). entails_guard(A,B) :- copy_term_nat((A,B),(C,D)), term_variables(C,E), variables(E), entails_guard2(C), !, test(D), !, cleanup. entails_guard2([]). entails_guard2([A|B]) :- known(A), entails_guard2(B). simplify_guards(A,B,C,D,E) :- copy_term_nat((A,C),(F,G)), term_variables(F,H), variables(H), entails_guard2(F), !, simplify(G,I), simplified(C,I,D,B,E), !, cleanup. simplified([],[],[],A,A). simplified([A|B],[keep|C],[A|D],E,F) :- simplified(B,C,D,E,F). simplified([_|_],[fail|_],fail,A,A). simplified([A|B],[true|C],[D|E],F,G) :- builtins:binds_b(A,H), term_variables(B,I), intersect_eq(H,I,J), !, ( J=[] -> term_variables(F,K), intersect_eq(H,K,L), !, ( L=[] -> D=true, G=M ; D=true, G=(A,M) ) ; D=A, G=M ), simplified(B,C,E,F,M). simplify([],[]). simplify([A|B],[C|D]) :- ( \+try(true,A) -> C=true ; builtins:negate_b(A,E), ( \+try(true,E) -> C=fail ; C=keep ) ), known(A), simplify(B,D). try(A,B) :- ( known(A) -> true ; format(' ERROR: entailment checker: this is not supposed to happen. ',[]) ), ( test(B) -> fail ; true ). lookup([],[],_,_) :- fail. lookup([A|B],[C|D],E,F) :- ( E==A -> F=C ; lookup(B,D,E,F) ). add_args_unif([],[],true). add_args_unif([A|B],[C|D],(A=C,E)) :- add_args_unif(B,D,E). add_args_nunif([],[],fail). add_args_nunif([A|B],[C|D],(A\=C;E)) :- add_args_nunif(B,D,E). add_args_nmatch([],[],fail). add_args_nmatch([A|B],[C|D],(A\==C;E)) :- add_args_nmatch(B,D,E). all_unique_vars(A,B) :- all_unique_vars(A,B,[]). all_unique_vars([],_,_). all_unique_vars([A|B],C,D) :- var(A), \+memberchk_eq(A,C), \+memberchk_eq(A,D), all_unique_vars(B,[A|D]). :-use_module(chr(chr_runtime)). :-use_module(chr(chr_hashtable_store)). :-use_module(library('clp/clp_events')). 'attach_known/1'([],_). 'attach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\1=:=1 -> put_attr(A,guard_entailment,v(F,[C|D],E)) ; G is F\/1, put_attr(A,guard_entailment,v(G,[C],E)) ) ; put_attr(A,guard_entailment,v(1,[C],[])) ), true, 'attach_known/1'(B,C). 'detach_known/1'([],_). 'detach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\1=:=1 -> 'chr sbag_del_element'(D,C,H), ( H==[] -> G is F/\ -2, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,[],E)) ) ; put_attr(A,guard_entailment,v(F,H,E)) ) ; true ) ; true ), 'detach_known/1'(B,C). 'attach_variables/1'([],_). 'attach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\2=:=2 -> put_attr(A,guard_entailment,v(F,D,[C|E])) ; G is F\/2, put_attr(A,guard_entailment,v(G,D,[C])) ) ; put_attr(A,guard_entailment,v(2,[],[C])) ), true, 'attach_variables/1'(B,C). 'detach_variables/1'([],_). 'detach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\2=:=2 -> 'chr sbag_del_element'(E,C,H), ( H==[] -> G is F/\ -3, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,D,[])) ) ; put_attr(A,guard_entailment,v(F,D,H)) ) ; true ) ; true ), 'detach_variables/1'(B,C). '$indexed_variables'(B,A) :- B=known(_), term_variables(B,A). '$indexed_variables'(B,A) :- B=variables(_), term_variables(B,A). attach_increment([],_). [...3131 lines suppressed...] B=functor(C,_,_), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=ground(C), ground(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), number(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), float(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), integer(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), nonvar(C), !. test(A) :- nonvar(A), A=(B,C), !, test(B), known(B), test(C). test(A) :- nonvar(A), A=(B;C), !, negate_b(B,D), negate_b(C,E), ( known(E), test(B) ; known(D), test(C) ). test(A) :- 'chr global_term_ref_1'(D), get_attr(D,guard_entailment,E), E=v(G,F,_), G/\1=:=1, 'chr sbag_member'(B,F), B=suspension(_,mutable(active),_,_,_,_,C), nonvar(C), C=(H;I), !, remove_constraint_internal(B,K,L), ( L==yes -> '$delete_from_store_known/1'(B), 'detach_known/1'(K,B) ; true ), \+try(H,A), !, negate_b(H,J), known(J), \+try(I,A). test(_) :- fail. cleanup :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,C,_), D/\1=:=1, !, 'cleanup/0__0__0'(C). 'cleanup/0__0__0'([]) :- 'cleanup/0__1'. 'cleanup/0__0__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_known/1'(A), 'detach_known/1'(C,A) ; true ), 'cleanup/0__0__0'(B) ; 'cleanup/0__0__0'(B) ). cleanup :- 'cleanup/0__1'. 'cleanup/0__1' :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,_,C), D/\2=:=2, !, 'cleanup/0__1__0'(C). 'cleanup/0__1__0'([]) :- 'cleanup/0__2'. 'cleanup/0__1__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_variables/1'(A), 'detach_variables/1'(C,A) ; true ), 'cleanup/0__1__0'(B) ; 'cleanup/0__1__0'(B) ). 'cleanup/0__1' :- 'cleanup/0__2'. 'cleanup/0__2'. variables(A) :- 'variables/1__0'(A,_). 'variables/1__0'(A,B) :- 'chr global_term_ref_1'(E), get_attr(E,guard_entailment,F), F=v(H,G,_), H/\1=:=1, 'chr sbag_member'(C,G), C=suspension(_,mutable(active),_,_,_,_,D), nonvar(D), D=functor(I,J,K), ground(K), ground(J), var(I), !, remove_constraint_internal(C,N,O), ( O==yes -> '$delete_from_store_known/1'(C), 'detach_known/1'(N,C) ; true ), ( var(B) -> true ; remove_constraint_internal(B,P,Q), ( Q==yes -> '$delete_from_store_variables/1'(B), 'detach_variables/1'(P,B) ; true ) ), functor(I,J,K), I=..[_|L], append(L,A,M), variables(M). 'variables/1__0'(A,B) :- ( var(B) -> insert_constraint_internal(D,C,B,guard_entailment:'variables/1__0'(A,B),variables(A),[A]) ; activate_constraint(D,C,B,_) ), ( D==yes -> '$insert_in_store_variables/1'(B), 'attach_variables/1'(C,B) ; true ). :-multifile chr:'$chr_module'/1. chr:'$chr_module'(guard_entailment). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yap/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Oct 2005 08:32:24 -0000 1.3 +++ .cvsignore 1 May 2006 11:06:59 -0000 1.4 @@ -1 +1 @@ -Yap-5.0.1.tar.gz +Yap-5.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yap/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Oct 2005 08:32:24 -0000 1.4 +++ sources 1 May 2006 11:06:59 -0000 1.5 @@ -1 +1 @@ -d8d1f1c5a38d501eb9db38d880668eda Yap-5.0.1.tar.gz +1f5c26642a27158c98f6c2fac56d3dad Yap-5.1.1.tar.gz Index: yap.spec =================================================================== RCS file: /cvs/extras/rpms/yap/FC-5/yap.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- yap.spec 17 Feb 2006 21:42:57 -0000 1.9 +++ yap.spec 1 May 2006 11:06:59 -0000 1.10 @@ -1,12 +1,16 @@ Name: yap -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages License: Artistic/LGPL -Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.0.1.tar.gz +Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.1.1.tar.gz +Source1: guard_entailment.pl +Source2: chr_translate_bootstrap1.pl +Source3: chr_translate_bootstrap2.pl +Source4: chr_translate.pl Patch1: Yap-noni386.patch URL: http://www.ncc.up.pt/~vsc/Yap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,9 +25,29 @@ follows the Edinburgh tradition, and is largely compatible with the ISO-Prolog standard and with Quintus and SICStus Prolog. + +%package devel +Summary: C-Interface development files for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description devel +C-Interface development files for Yap. + + +%package docs +Summary: Documentation for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description docs +Documentation for Yap. + + %prep %setup -q -n Yap-%{version} %patch1 -p1 +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr %build %configure \ @@ -33,6 +57,7 @@ make %{?_smp_mflags} (cd docs; make info) + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install @@ -40,10 +65,23 @@ cp -f docs/yap.info* $RPM_BUILD_ROOT%{_infodir} cp -f LGPL/pillow/doc/pillow_doc.info $RPM_BUILD_ROOT%{_infodir} +# fix permissions and flags +chmod 0644 $RPM_BUILD_ROOT%{_datadir}/Yap/pl/* +chmod 0644 $RPM_BUILD_ROOT%{_includedir}/Yap/* +find -name '*.lgt' -exec chmod 0644 '{}' ';' +find -name '*.h' -exec chmod 0644 '{}' ';' +find -name '*.c' -exec chmod 0644 '{}' ';' + +# move examples to docdir +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv $RPM_BUILD_ROOT%{_datadir}/Yap/examples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT%{_datadir}/Yap/clpbn/examples + %post /sbin/install-info %{_infodir}/yap.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : + %postun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || : @@ -54,24 +92,38 @@ %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc README %doc changes* +%{_bindir}/yap +%{_datadir}/Yap +%{_prefix}/lib/Yap +%{_infodir}/* + + +%files devel +%defattr(-,root,root,-) +%{_prefix}/lib/libYap.a +%{_includedir}/Yap + + +%files docs +%defattr(-,root,root,-) %doc docs/*.html %doc docs/yap.pdf %doc LGPL/pillow/doc/pillow_doc_html/* %doc LGPL/pillow/doc/article.ps.gz %doc --parent Logtalk/manuals %doc --parent Logtalk/examples -%{_bindir}/yap -%{_datadir}/Yap -%{_includedir}/Yap -%{_prefix}/lib/libYap.a -%{_prefix}/lib/Yap -%{_infodir}/* + %changelog +* Mon May 1 2006 Gerard Milmeister - 5.1.1-1 +- new version 5.1.1 +- split off devel and docs packages + * Fri Feb 17 2006 Gerard Milmeister - 5.0.1-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon May 1 11:09:50 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 04:09:50 -0700 Subject: rpms/yap/FC-4 chr_translate.pl, NONE, 1.1 chr_translate_bootstrap1.pl, NONE, 1.1 chr_translate_bootstrap2.pl, NONE, 1.1 guard_entailment.pl, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 yap.spec, 1.11, 1.12 Message-ID: <200605011109.k41B9qmw031225@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/yap/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31200 Modified Files: .cvsignore sources yap.spec Added Files: chr_translate.pl chr_translate_bootstrap1.pl chr_translate_bootstrap2.pl guard_entailment.pl Log Message: new version 5.1.1 --- NEW FILE chr_translate.pl --- /* Generated by CHR bootstrap compiler From: chr_translate.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,50,58,49,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(listmap). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-use_module(guard_entailment). :-use_module(chr_compiler_options). :-use_module(chr_compiler_utility). :-include(chr_op). :-op(1150,fx,chr_type). :-op(1130,xfx,--->). :-op(1150,fx,+). :-op(1150,fx,-). :-op(1150,fx,?). set_constraint_indices(A) :- set_constraint_indices(A,1). set_constraint_indices([],A) :- B is A-1, max_constraint_index(B). set_constraint_indices([A|B],C) :- ( ( chr_pp_flag(debugable,on) ; may_trigger(A) ; is_stored(A), get_store_type(A,default) ) -> constraint_index(A,C), D is C+1, set_constraint_indices(B,D) ; set_constraint_indices(B,C) ). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), check_declared_constraints(C), ( C==[] -> insert_declarations(E,B) ; generate_show_constraint(C,F,D,G), add_constraints(F), add_rules(G), check_rules(G,F), add_occurrences(G), functional_dependency_analysis(G), set_semantics_rules(G), symmetry_analysis(G), guard_simplification, storage_analysis(F), observation_analysis(F), ai_observation_analysis(F), late_allocation(F), assume_constraint_stores(F), set_constraint_indices(F), constraints_code(F,H), validate_store_type_assumptions(F), store_management_preds(F,I), insert_declarations(E,J), chr_module_declaration(K), append_lists([J,I,H,K],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_attach_code(A,I), generate_counter_code(J), append_lists([C,D,E,F,G,H,I,J],B). insert_declarations(A,B) :- append(A,[(:-use_module(chr(chr_runtime))),(:-use_module(chr(chr_hashtable_store))),(:-use_module(library('clp/clp_events')))],B). generate_counter_code(A) :- ( chr_pp_flag(store_counter,on) -> A=[('$counter_init'(B):-nb_setval(B,0)),('$counter'(C,D):-nb_getval(C,D)),('$counter_inc'(E):-nb_getval(E,F),G is F+1,nb_setval(E,G)),(:-'$counter_init'('$insert_counter')),(:-'$counter_init'('$delete_counter')),('$insert_counter_inc':-'$counter_inc'('$insert_counter')),('$delete_counter_inc':-'$counter_inc'('$delete_counter')),(counter_stats(H,I):-'$counter'('$insert_counter',H),'$counter'('$delete_counter',I))] ; A=[] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( is_type_definition(A) -> C=G, D=H, E=I ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,E), extract_type_mode(E,B). extract_type_mode([],[]). extract_type_mode([A/B|C],[A/B|D]) :- !, extract_type_mode(C,D). extract_type_mode([A|B],[C|D]) :- functor(A,E,F), C=E/F, A=..[_|G], extract_types_and_modes(G,H,I), constraint_type(E/F,H), constraint_mode(E/F,I), extract_type_mode(B,D). extract_types_and_modes([],[],[]). extract_types_and_modes([(+A)|B],[A|C],[+|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(?A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([(-A)|B],[A|C],[?|D]) :- !, extract_types_and_modes(B,C,D). extract_types_and_modes([A|_],_,_) :- format('CHR compiler ERROR: Illegal mode/type declaration "~w". ',[A]), format(' `--> correct syntax is +type, -type or ?type. ',[]), [...8829 lines suppressed...] ; true ) ; 'depends_on_goal/2__1__0'(G,A,B,C) ). 'depends_on_goal/2__1'(A,B,C) :- allocate_constraint(true,C,depends_on_goal(A,B),[A,B]), 'depends_on_goal/2__2'(A,B,C). 'depends_on_goal/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_goal/2'(A) ; true ). ai_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,C), !, 'ai_observed/2__0__0'(C,A,B). 'ai_observed/2__0__0'([],A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__0__0'([E|F],A,B) :- ( E=suspension(_,mutable(active),_,_,_,_,C,D), C==A, D==B -> remove_constraint_internal(E,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(E) ; true ), 'ai_observed/2__0__0'(F,A,B) ; 'ai_observed/2__0__0'(F,A,B) ). ai_observed(A,B) :- 'ai_observed/2__1'(A,B). 'ai_observed/2__1'(A,B) :- '$via1_multi_hash_ai_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !. 'ai_observed/2__1'(A,B) :- insert_constraint_internal(_,_,C,true,ai_observed(A,B),[A,B]), '$insert_in_store_ai_observed/2'(C). ai_not_observed(A,B) :- 'ai_not_observed/2__0'(A,B,_). 'ai_not_observed/2__0'(A,B,C) :- '$via1_multi_hash_stored/3-1'(A,D), !, allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__0__0'(D,A,B,C). 'ai_not_observed/2__0__0'([],A,B,C) :- 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__0__0'([G|H],A,B,C) :- ( G=suspension(_,mutable(active),_,_,_,_,D,E,F), D==A, E==B, F=yes, '$via1_multi_hash_stored_complete/3-1'(A,L), 'chr sbag_member'(I,L), I=suspension(_,mutable(active),_,_,_,_,_,J,K), B remove_constraint_internal(G,_,M), ( M==yes -> '$delete_from_store_stored/3'(G) ; true ), remove_constraint_internal(I,_,N), ( N==yes -> '$delete_from_store_stored_complete/3'(I) ; true ), activate_constraint(P,_,C,Q), ( P==yes -> '$insert_in_store_ai_not_observed/2'(C) ; true ), O is K-1, stored(A,B,maybe), stored_complete(A,J,O), ( C=suspension(_,mutable(active),_,mutable(Q),_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'ai_not_observed/2__0__0'(H,A,B,C) ; true ) ; 'ai_not_observed/2__0__0'(H,A,B,C) ). 'ai_not_observed/2__0'(A,B,C) :- allocate_constraint(true,C,ai_not_observed(A,B),[A,B]), 'ai_not_observed/2__1'(A,B,C). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(A,B,C) :- '$via1_multi_hash_ai_not_observed/2-1'(A,F), 'chr sbag_member'(D,F), D=suspension(_,mutable(active),_,_,_,_,_,E), E=B, !, ( var(C) -> true ; remove_constraint_internal(C,_,G), ( G==yes -> '$delete_from_store_ai_not_observed/2'(C) ; true ) ). 'ai_not_observed/2__1'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_ai_not_observed/2'(A) ; true ). ai_is_observed(A,B) :- '$via1_multi_hash_ai_not_observed/2-1'(A,E), 'chr sbag_member'(C,E), C=suspension(_,mutable(active),_,_,_,_,_,D), D=B, !, fail. ai_is_observed(_,_). depends_on_as(A,B,C) :- 'depends_on_as/3__0'(A,B,C,_). 'depends_on_as/3__0'(A,B,C,D) :- '$via1_multi_hash_final_answer_pattern/2-1'(B,E), !, allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__0'([],A,B,C,D) :- 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__0__0'([G|I],A,B,C,D) :- ( G=suspension(_,mutable(active),_,_,_,_,E,F), E==B, '$via1_multi_hash_final_answer_pattern/2-1'(C,H) -> 'depends_on_as/3__0__1'(H,F,G,I,A,B,C,D) ; 'depends_on_as/3__0__0'(I,A,B,C,D) ). 'depends_on_as/3__0__1'([],_,_,E,A,B,C,D) :- 'depends_on_as/3__0__0'(E,A,B,C,D). 'depends_on_as/3__0__1'([J|K],F,A,G,B,C,D,E) :- ( J=suspension(_,mutable(active),_,_,_,_,H,I), J\==A, H==D, O=t(141,E,A,J), 'chr novel_production'(E,O), 'chr novel_production'(A,O), 'chr novel_production'(J,O) -> 'chr extend_history'(E,O), activate_constraint(M,_,E,N), ( M==yes -> '$insert_in_store_depends_on_as/3'(E) ; true ), ai_observation_lub(F,I,L), final_answer_pattern(B,L), ( E=suspension(_,mutable(active),_,mutable(N),_,_,_,_,_) -> 'chr update_mutable'(inactive,mutable(active)), 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ; true ) ; 'depends_on_as/3__0__1'(K,F,A,G,B,C,D,E) ). 'depends_on_as/3__0'(A,B,C,D) :- allocate_constraint(true,D,depends_on_as(A,B,C),[A,B,C]), 'depends_on_as/3__1'(A,B,C,D). 'depends_on_as/3__1'(_,_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_depends_on_as/3'(A) ; true ). --- NEW FILE chr_translate_bootstrap1.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap1.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,51,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate_bootstrap1,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> B=E ; check_rules(D,C), unique_analyse_optimise(D,F), check_attachments(F), set_constraint_indices(C,1), store_management_preds(C,G), constraints_code(C,F,H), append_lists([E,G,H],B) ), chr_clear. store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_attach_increment(D), generate_attr_unify_hook(E), append_lists([C,D,E],B). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), C=pragma(F,G,H,B). rule(A,B,C) :- is_rule(A,D,E), C=pragma(D,E,[],B). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). check_rules(A,B) :- check_rules(A,B,1). check_rules([],_,_). check_rules([A|B],C,D) :- check_rule(A,C,D), E is D+1, check_rules(B,C,E). check_rule(A,B,C) :- A=pragma(D,_,E,_), D=rule(F,G,_,_), append(F,G,H), check_head_constraints(H,B,A,C), check_pragmas(E,A,C). check_head_constraints([],_,_,_). check_head_constraints([A|B],C,D,E) :- functor(A,F,G), ( member(F/G,C) -> check_head_constraints(B,C,D,E) ; format('CHR compiler ERROR: Undeclared constraint ~w in head of ~@. ',[F/G,format_rule(D,E)]), format(' `--> Constraint should be on of ~w. ',[C]), fail ). check_pragmas([],_,_). check_pragmas([A|B],C,D) :- check_pragma(A,C,D), check_pragmas(B,C,D). check_pragma(A,B,C) :- var(A), !, format('CHR compiler ERROR: invalid pragma ~w in ~@. ',[A,format_rule(B,C)]), format(' `--> Pragma should not be a variable! ',[]), fail. check_pragma(passive(A),B,C) :- !, B=pragma(_,ids(D,E),_,_), [...2192 lines suppressed...] 'detach_attached/2'(K,B) ). 'attached/2__1'(A,B,C) :- B==no, 'chr via_1'(A,D), get_attr(D,chr_translate_bootstrap1,E), E=v(G,_,_,_,_,_,F), G/\32=:=32, !, 'attached/2__1__0'(F,A,B,C). 'attached/2__1__0'([],A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,G,_,_,_,_,F,_), G=mutable(active), F==A -> 'chr remove_constraint_internal'(D,H), 'detach_attached/2'(H,D), 'attached/2__1__0'(E,A,B,C) ; 'attached/2__1__0'(E,A,B,C) ). 'attached/2__1'(A,B,C) :- 'attached/2__2'(A,B,C). 'attached/2__2'(A,B,C) :- B==maybe, 'chr via_1'(A,E), get_attr(E,chr_translate_bootstrap1,F), F=v(K,_,_,_,_,_,J), K/\32=:=32, ( 'chr sbag_member'(D,J), D=suspension(_,I,_,_,_,_,G,H), I=mutable(active), G==A, H==maybe -> true ), !, ( var(C) -> true ; 'chr remove_constraint_internal'(C,L), 'detach_attached/2'(L,C) ). 'attached/2__2'(_,_,A) :- 'chr activate_constraint'(B,A,_), 'attach_attached/2'(B,A). is_attached(A) :- 'is_attached/1__0'(A,_). 'is_attached/1__0'(A,_) :- 'chr via_1'(A,C), get_attr(C,chr_translate_bootstrap1,D), D=v(I,_,_,_,_,_,H), I/\32=:=32, 'chr sbag_member'(B,H), B=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, ( F==no -> fail ; true ). 'is_attached/1__0'(_,_) :- !. chr_clear :- 'chr_clear/0__0'(_). 'chr_clear/0__0'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,D,_,_,_,_,_), E/\1=:=1, !, ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__0__0'(D,A). 'chr_clear/0__0__0'([],A) :- 'chr_clear/0__1'(A). 'chr_clear/0__0__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint/2'(E,B), 'chr_clear/0__0__0'(C,A) ; 'chr_clear/0__0__0'(C,A) ). 'chr_clear/0__0'(A) :- ( var(A) -> 'chr allocate_constraint'(chr_translate_bootstrap1:'chr_clear/0__0'(A),A,chr_clear,[]) ; true ), 'chr_clear/0__1'(A). 'chr_clear/0__1'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,D,_,_,_,_), E/\2=:=2, !, 'chr_clear/0__1__0'(D,A). 'chr_clear/0__1__0'([],A) :- 'chr_clear/0__2'(A). 'chr_clear/0__1__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_count/1'(E,B), 'chr_clear/0__1__0'(C,A) ; 'chr_clear/0__1__0'(C,A) ). 'chr_clear/0__1'(A) :- 'chr_clear/0__2'(A). 'chr_clear/0__2'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,D,_,_,_), E/\4=:=4, !, 'chr_clear/0__2__0'(D,A). 'chr_clear/0__2__0'([],A) :- 'chr_clear/0__3'(A). 'chr_clear/0__2__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_constraint_index/2'(E,B), 'chr_clear/0__2__0'(C,A) ; 'chr_clear/0__2__0'(C,A) ). 'chr_clear/0__2'(A) :- 'chr_clear/0__3'(A). 'chr_clear/0__3'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,D,_,_), E/\8=:=8, !, 'chr_clear/0__3__0'(D,A). 'chr_clear/0__3__0'([],A) :- 'chr_clear/0__4'(A). 'chr_clear/0__3__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_max_constraint_index/1'(E,B), 'chr_clear/0__3__0'(C,A) ; 'chr_clear/0__3__0'(C,A) ). 'chr_clear/0__3'(A) :- 'chr_clear/0__4'(A). 'chr_clear/0__4'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,D,_), E/\16=:=16, !, 'chr_clear/0__4__0'(D,A). 'chr_clear/0__4__0'([],A) :- 'chr_clear/0__5'(A). 'chr_clear/0__4__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_target_module/1'(E,B), 'chr_clear/0__4__0'(C,A) ; 'chr_clear/0__4__0'(C,A) ). 'chr_clear/0__4'(A) :- 'chr_clear/0__5'(A). 'chr_clear/0__5'(A) :- 'chr global_term_ref_1'(B), get_attr(B,chr_translate_bootstrap1,C), C=v(E,_,_,_,_,_,D), E/\32=:=32, !, 'chr_clear/0__5__0'(D,A). 'chr_clear/0__5__0'([],A) :- 'chr_clear/0__6'(A). 'chr_clear/0__5__0'([B|C],A) :- ( B=suspension(_,D,_,_,_,_,_,_), D=mutable(active) -> 'chr remove_constraint_internal'(B,E), 'detach_attached/2'(E,B), 'chr_clear/0__5__0'(C,A) ; 'chr_clear/0__5__0'(C,A) ). 'chr_clear/0__5'(A) :- 'chr_clear/0__6'(A). 'chr_clear/0__6'(_) :- !. --- NEW FILE chr_translate_bootstrap2.pl --- /* Generated by CHR bootstrap compiler From: chr_translate_bootstrap2.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,51,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(chr_translate,[chr_translate/2]). :-use_module(chr_runtime). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(chr_runtime). :-use_module(chr_hashtable_store). :-style_check(-singleton). :-style_check(-discontiguous). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(library(assoc)). :-use_module(pairlist). :-use_module(library(ordsets)). :-use_module(a_star). :-use_module(clean_code). :-use_module(builtins). :-use_module(find). :-include(chr_op2). chr_translate(A,B) :- init_chr_pp_flags, partition_clauses(A,C,D,E), ( C==[] -> insert_declarations(E,B) ; add_rules(D), check_rules(D,C), add_occurrences(D), late_allocation(C), unique_analyse_optimise(D,F), check_attachments(C), assume_constraint_stores(C), set_constraint_indices(C,1), constraints_code(C,F,G), validate_store_type_assumptions(C), store_management_preds(C,H), insert_declarations(E,I), chr_module_declaration(J), append_lists([I,H,G,J],B) ). store_management_preds(A,B) :- generate_attach_detach_a_constraint_all(A,C), generate_indexed_variables_clauses(A,D), generate_attach_increment(E), generate_attr_unify_hook(F), generate_extra_clauses(A,G), generate_insert_delete_constraints(A,H), generate_store_code(A,I), append_lists([C,D,E,F,G,H,I],B). insert_declarations(A,B) :- ( A=[(:-module(C,D))|E] -> B=[(:-module(C,D)),(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|E] ; B=[(:-use_module(chr_runtime)),(:-use_module(chr_hashtable_store)),(:-style_check(-singleton)),(:-style_check(-discontiguous))|A] ). chr_module_declaration(A) :- get_target_module(B), ( B\==chr_translate -> A=[(:-multifile chr:'$chr_module'/1),chr:'$chr_module'(B)] ; A=[] ). partition_clauses([],[],[],[]). partition_clauses([A|B],C,D,E) :- ( parse_rule(A,F) -> C=G, D=[F|H], E=I ; ( is_declaration(A,J) -> append(J,G,C), D=H, E=I ) ; ( is_module_declaration(A,K) -> target_module(K), C=G, D=H, E=[A|I] ) ; ( A=(handler _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring handler/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=(rules _) -> format('CHR compiler WARNING: ~w. ',[A]), format(' `--> SICStus compatibility: ignoring rules/1 declaration. ',[]), C=G, D=H, E=I ) ; ( A=option(L,M) -> handle_option(L,M), C=G, D=H, E=I ) ; C=G, D=H, E=[A|I] ), partition_clauses(B,G,H,I). is_declaration(A,B) :- ( A=(:-C) -> true ; A=C ), C=..[constraints,D], conj2list(D,B). parse_rule(A,B) :- A=(C at D), !, rule(D,yes(C),B). parse_rule(A,B) :- rule(A,no,B). rule(A,B,C) :- A=(D pragma E), !, is_rule(D,F,G), conj2list(E,H), inc_rule_count(I), C=pragma(F,G,H,B,I). rule(A,B,C) :- is_rule(A,D,E), inc_rule_count(F), C=pragma(D,E,[],B,F). is_rule(A,B,C) :- A=(D==>E), !, conj2list(D,F), get_ids(F,G,H), C=ids([],G), ( E=(I '|' J) -> B=rule([],H,I,J) ; B=rule([],H,true,E) ). is_rule(A,B,C) :- A=(D<=>E), !, ( E=(F '|' G) -> H=F, I=G ; H=true, I=E ), ( D=(J\K) -> conj2list(J,L), conj2list(K,M), get_ids(L,N,O,0,P), get_ids(M,Q,R,P,_), C=ids(Q,N) ; conj2list(D,M), O=[], get_ids(M,Q,R), C=ids(Q,[]) ), B=rule(R,O,H,I). get_ids(A,B,C) :- get_ids(A,B,C,0,_). get_ids([],[],[],A,A). get_ids([A|B],[C|D],[E|F],C,G) :- ( A=E#C -> true ; E=A ), H is C+1, get_ids(B,D,F,H,G). is_module_declaration((:-module(A)),A). is_module_declaration((:-module(A,_)),A). add_rules([]). add_rules([A|B]) :- A=pragma(_,_,_,_,C), rule(C,A), add_rules(B). check_rules([],_). check_rules([A|B],C) :- [...3285 lines suppressed...] E==A -> true ), !, B=F. 'get_max_occurrence/2__0'(_,A,_) :- !, A=0. allocation_occurrence(A,B) :- 'allocation_occurrence/2__0'(A,B,_). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,N,_,_,_,_,J,K,L,M), N=mutable(active), J==A, K==B, L==E, 'chr lock'(F), 'chr lock'(M), F=pragma(_,ids(_,_),_,_,_), member(M,_), 'chr unlock'(F), 'chr unlock'(M), !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,I), nb_getval('$chr_store_global_ground_chr_translate:rule/2',D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), 'chr sbag_member'(H,I), H=suspension(_,M,_,_,_,_,J,K,L,_), M=mutable(active), J==A, K==B, L==E, 'chr lock'(F), F=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(F), !, N is B+1, allocation_occurrence(A,N). 'allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_occurrence/4-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,I,_,_,_,_,E,F,G,H), I=mutable(active), E==A, F==B, '$via1_multi_hash_passive/2-1'(G,K), 'chr sbag_member'(J,K), J=suspension(_,N,_,_,_,_,L,M), N=mutable(active), L==G, M==H, !, O is B+1, allocation_occurrence(A,O). 'allocation_occurrence/2__0'(A,B,C) :- insert_constraint_internal(_,_,C,chr_translate:'allocation_occurrence/2__0'(A,B,C),allocation_occurrence(A,B),[A,B]), '$insert_in_store_allocation_occurrence/2'(C). get_allocation_occurrence(A,B) :- 'get_allocation_occurrence/2__0'(A,B,_). 'get_allocation_occurrence/2__0'(A,B,_) :- '$via1_multi_hash_allocation_occurrence/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_allocation_occurrence/2__0'(_,_,_) :- !, fail. rule(A,B) :- 'rule/2__0'(A,B,_). 'rule/2__0'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__0__0'(D,A,B,C). 'rule/2__0__0'([],A,B,C) :- 'rule/2__1'(A,B,C). 'rule/2__0__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,O,_,_,_,_,K,L,M,N), O=mutable(active), K==F, L==G, M==A, 'chr lock'(B), 'chr lock'(N), B=pragma(_,ids(_,_),_,_,_), member(N,_), 'chr unlock'(B), 'chr unlock'(N) -> remove_constraint_internal(D,_,P), ( P==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(R,_,C,S), ( R==yes -> '$insert_in_store_rule/2'(C) ; true ), Q is G+1, allocation_occurrence(F,Q), ( C=suspension(_,T,_,U,_,_,_,_), T=mutable(active), U=mutable(S) -> 'chr update_mutable'(inactive,T), 'rule/2__0__0'(E,A,B,C) ; true ) ; 'rule/2__0__0'(E,A,B,C) ). 'rule/2__0'(A,B,C) :- allocate_constraint(chr_translate:'rule/2__0'(A,B,C),C,rule(A,B),[A,B]), 'rule/2__1'(A,B,C). 'rule/2__1'(A,B,C) :- nb_getval('$chr_store_global_ground_chr_translate:allocation_occurrence/2',D), !, 'rule/2__1__0'(D,A,B,C). 'rule/2__1__0'([],A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__1__0'([D|E],A,B,C) :- ( D=suspension(_,H,_,_,_,_,F,G), H=mutable(active), '$via1_multi_hash_occurrence/4-1'(F,J), 'chr sbag_member'(I,J), I=suspension(_,N,_,_,_,_,K,L,M,_), N=mutable(active), K==F, L==G, M==A, 'chr lock'(B), B=pragma(rule(_,_,_,true),_,_,_,_), 'chr unlock'(B) -> remove_constraint_internal(D,_,O), ( O==yes -> '$delete_from_store_allocation_occurrence/2'(D) ; true ), activate_constraint(Q,_,C,R), ( Q==yes -> '$insert_in_store_rule/2'(C) ; true ), P is G+1, allocation_occurrence(F,P), ( C=suspension(_,S,_,T,_,_,_,_), S=mutable(active), T=mutable(R) -> 'chr update_mutable'(inactive,S), 'rule/2__1__0'(E,A,B,C) ; true ) ; 'rule/2__1__0'(E,A,B,C) ). 'rule/2__1'(A,B,C) :- 'rule/2__2'(A,B,C). 'rule/2__2'(_,_,A) :- activate_constraint(B,_,A,_), ( B==yes -> '$insert_in_store_rule/2'(A) ; true ). get_rule(A,B) :- 'get_rule/2__0'(A,B,_). 'get_rule/2__0'(A,B,_) :- '$via1_multi_hash_rule/2-1'(A,D), 'chr sbag_member'(C,D), C=suspension(_,G,_,_,_,_,E,F), G=mutable(active), E==A, !, B=F. 'get_rule/2__0'(_,_,_) :- !, fail. --- NEW FILE guard_entailment.pl --- /* Generated by CHR bootstrap compiler From: guard_entailment.chr Date: [77,111,110,32,77,97,121,32,32,49,32,49,50,58,50,49,58,53,55,32,50,48,48,54,10] DO NOT EDIT. EDIT THE CHR FILE INSTEAD */ :-module(guard_entailment,[entails_guard/2,simplify_guards/5]). :-use_module(chr_runtime). :-style_check((-singleton)). :-style_check((-discontiguous)). :-use_module(library(lists)). :-use_module(hprolog). :-use_module(builtins). entails_guard(A,B) :- copy_term_nat((A,B),(C,D)), term_variables(C,E), variables(E), entails_guard2(C), !, test(D), !, cleanup. entails_guard2([]). entails_guard2([A|B]) :- known(A), entails_guard2(B). simplify_guards(A,B,C,D,E) :- copy_term_nat((A,C),(F,G)), term_variables(F,H), variables(H), entails_guard2(F), !, simplify(G,I), simplified(C,I,D,B,E), !, cleanup. simplified([],[],[],A,A). simplified([A|B],[keep|C],[A|D],E,F) :- simplified(B,C,D,E,F). simplified([_|_],[fail|_],fail,A,A). simplified([A|B],[true|C],[D|E],F,G) :- builtins:binds_b(A,H), term_variables(B,I), intersect_eq(H,I,J), !, ( J=[] -> term_variables(F,K), intersect_eq(H,K,L), !, ( L=[] -> D=true, G=M ; D=true, G=(A,M) ) ; D=A, G=M ), simplified(B,C,E,F,M). simplify([],[]). simplify([A|B],[C|D]) :- ( \+try(true,A) -> C=true ; builtins:negate_b(A,E), ( \+try(true,E) -> C=fail ; C=keep ) ), known(A), simplify(B,D). try(A,B) :- ( known(A) -> true ; format(' ERROR: entailment checker: this is not supposed to happen. ',[]) ), ( test(B) -> fail ; true ). lookup([],[],_,_) :- fail. lookup([A|B],[C|D],E,F) :- ( E==A -> F=C ; lookup(B,D,E,F) ). add_args_unif([],[],true). add_args_unif([A|B],[C|D],(A=C,E)) :- add_args_unif(B,D,E). add_args_nunif([],[],fail). add_args_nunif([A|B],[C|D],(A\=C;E)) :- add_args_nunif(B,D,E). add_args_nmatch([],[],fail). add_args_nmatch([A|B],[C|D],(A\==C;E)) :- add_args_nmatch(B,D,E). all_unique_vars(A,B) :- all_unique_vars(A,B,[]). all_unique_vars([],_,_). all_unique_vars([A|B],C,D) :- var(A), \+memberchk_eq(A,C), \+memberchk_eq(A,D), all_unique_vars(B,[A|D]). :-use_module(chr(chr_runtime)). :-use_module(chr(chr_hashtable_store)). :-use_module(library('clp/clp_events')). 'attach_known/1'([],_). 'attach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\1=:=1 -> put_attr(A,guard_entailment,v(F,[C|D],E)) ; G is F\/1, put_attr(A,guard_entailment,v(G,[C],E)) ) ; put_attr(A,guard_entailment,v(1,[C],[])) ), true, 'attach_known/1'(B,C). 'detach_known/1'([],_). 'detach_known/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\1=:=1 -> 'chr sbag_del_element'(D,C,H), ( H==[] -> G is F/\ -2, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,[],E)) ) ; put_attr(A,guard_entailment,v(F,H,E)) ) ; true ) ; true ), 'detach_known/1'(B,C). 'attach_variables/1'([],_). 'attach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,H) -> H=v(F,D,E), ( F/\2=:=2 -> put_attr(A,guard_entailment,v(F,D,[C|E])) ; G is F\/2, put_attr(A,guard_entailment,v(G,D,[C])) ) ; put_attr(A,guard_entailment,v(2,[],[C])) ), true, 'attach_variables/1'(B,C). 'detach_variables/1'([],_). 'detach_variables/1'([A|B],C) :- ( get_attr(A,guard_entailment,I) -> I=v(F,D,E), ( F/\2=:=2 -> 'chr sbag_del_element'(E,C,H), ( H==[] -> G is F/\ -3, ( G==0 -> del_attr(A,guard_entailment) ; put_attr(A,guard_entailment,v(G,D,[])) ) ; put_attr(A,guard_entailment,v(F,D,H)) ) ; true ) ; true ), 'detach_variables/1'(B,C). '$indexed_variables'(B,A) :- B=known(_), term_variables(B,A). '$indexed_variables'(B,A) :- B=variables(_), term_variables(B,A). attach_increment([],_). [...3131 lines suppressed...] B=functor(C,_,_), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=ground(C), ground(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), number(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), float(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), integer(C), !, fail. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=number(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=float(C), nonvar(C), !. test(A) :- nonvar(A), A=(\+B), nonvar(B), B=integer(C), nonvar(C), !. test(A) :- nonvar(A), A=(B,C), !, test(B), known(B), test(C). test(A) :- nonvar(A), A=(B;C), !, negate_b(B,D), negate_b(C,E), ( known(E), test(B) ; known(D), test(C) ). test(A) :- 'chr global_term_ref_1'(D), get_attr(D,guard_entailment,E), E=v(G,F,_), G/\1=:=1, 'chr sbag_member'(B,F), B=suspension(_,mutable(active),_,_,_,_,C), nonvar(C), C=(H;I), !, remove_constraint_internal(B,K,L), ( L==yes -> '$delete_from_store_known/1'(B), 'detach_known/1'(K,B) ; true ), \+try(H,A), !, negate_b(H,J), known(J), \+try(I,A). test(_) :- fail. cleanup :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,C,_), D/\1=:=1, !, 'cleanup/0__0__0'(C). 'cleanup/0__0__0'([]) :- 'cleanup/0__1'. 'cleanup/0__0__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_known/1'(A), 'detach_known/1'(C,A) ; true ), 'cleanup/0__0__0'(B) ; 'cleanup/0__0__0'(B) ). cleanup :- 'cleanup/0__1'. 'cleanup/0__1' :- 'chr global_term_ref_1'(A), get_attr(A,guard_entailment,B), B=v(D,_,C), D/\2=:=2, !, 'cleanup/0__1__0'(C). 'cleanup/0__1__0'([]) :- 'cleanup/0__2'. 'cleanup/0__1__0'([A|B]) :- ( A=suspension(_,mutable(active),_,_,_,_,_) -> remove_constraint_internal(A,C,D), ( D==yes -> '$delete_from_store_variables/1'(A), 'detach_variables/1'(C,A) ; true ), 'cleanup/0__1__0'(B) ; 'cleanup/0__1__0'(B) ). 'cleanup/0__1' :- 'cleanup/0__2'. 'cleanup/0__2'. variables(A) :- 'variables/1__0'(A,_). 'variables/1__0'(A,B) :- 'chr global_term_ref_1'(E), get_attr(E,guard_entailment,F), F=v(H,G,_), H/\1=:=1, 'chr sbag_member'(C,G), C=suspension(_,mutable(active),_,_,_,_,D), nonvar(D), D=functor(I,J,K), ground(K), ground(J), var(I), !, remove_constraint_internal(C,N,O), ( O==yes -> '$delete_from_store_known/1'(C), 'detach_known/1'(N,C) ; true ), ( var(B) -> true ; remove_constraint_internal(B,P,Q), ( Q==yes -> '$delete_from_store_variables/1'(B), 'detach_variables/1'(P,B) ; true ) ), functor(I,J,K), I=..[_|L], append(L,A,M), variables(M). 'variables/1__0'(A,B) :- ( var(B) -> insert_constraint_internal(D,C,B,guard_entailment:'variables/1__0'(A,B),variables(A),[A]) ; activate_constraint(D,C,B,_) ), ( D==yes -> '$insert_in_store_variables/1'(B), 'attach_variables/1'(C,B) ; true ). :-multifile chr:'$chr_module'/1. chr:'$chr_module'(guard_entailment). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yap/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Oct 2005 08:39:17 -0000 1.4 +++ .cvsignore 1 May 2006 11:09:50 -0000 1.5 @@ -1 +1 @@ -Yap-5.0.1.tar.gz +Yap-5.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yap/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Oct 2005 08:39:17 -0000 1.4 +++ sources 1 May 2006 11:09:50 -0000 1.5 @@ -1 +1 @@ -d8d1f1c5a38d501eb9db38d880668eda Yap-5.0.1.tar.gz +1f5c26642a27158c98f6c2fac56d3dad Yap-5.1.1.tar.gz Index: yap.spec =================================================================== RCS file: /cvs/extras/rpms/yap/FC-4/yap.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- yap.spec 25 Oct 2005 08:39:49 -0000 1.11 +++ yap.spec 1 May 2006 11:09:50 -0000 1.12 @@ -1,12 +1,16 @@ Name: yap -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages License: Artistic/LGPL -Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.0.1.tar.gz +Source: http://www.ncc.up.pt/~vsc/Yap/current/Yap-5.1.1.tar.gz +Source1: guard_entailment.pl +Source2: chr_translate_bootstrap1.pl +Source3: chr_translate_bootstrap2.pl +Source4: chr_translate.pl Patch1: Yap-noni386.patch URL: http://www.ncc.up.pt/~vsc/Yap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,9 +25,29 @@ follows the Edinburgh tradition, and is largely compatible with the ISO-Prolog standard and with Quintus and SICStus Prolog. + +%package devel +Summary: C-Interface development files for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description devel +C-Interface development files for Yap. + + +%package docs +Summary: Documentation for Yap +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description docs +Documentation for Yap. + + %prep %setup -q -n Yap-%{version} %patch1 -p1 +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr %build %configure \ @@ -33,6 +57,7 @@ make %{?_smp_mflags} (cd docs; make info) + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install @@ -40,10 +65,23 @@ cp -f docs/yap.info* $RPM_BUILD_ROOT%{_infodir} cp -f LGPL/pillow/doc/pillow_doc.info $RPM_BUILD_ROOT%{_infodir} +# fix permissions and flags +chmod 0644 $RPM_BUILD_ROOT%{_datadir}/Yap/pl/* +chmod 0644 $RPM_BUILD_ROOT%{_includedir}/Yap/* +find -name '*.lgt' -exec chmod 0644 '{}' ';' +find -name '*.h' -exec chmod 0644 '{}' ';' +find -name '*.c' -exec chmod 0644 '{}' ';' + +# move examples to docdir +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv $RPM_BUILD_ROOT%{_datadir}/Yap/examples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -rf $RPM_BUILD_ROOT%{_datadir}/Yap/clpbn/examples + %post /sbin/install-info %{_infodir}/yap.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/pillow_doc.info --section "Programming Languages" %{_infodir}/dir 2>/dev/null || : + %postun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/yap.info %{_infodir}/dir 2>/dev/null || : @@ -54,24 +92,41 @@ %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc README %doc changes* +%{_bindir}/yap +%{_datadir}/Yap +%{_prefix}/lib/Yap +%{_infodir}/* + + +%files devel +%defattr(-,root,root,-) +%{_prefix}/lib/libYap.a +%{_includedir}/Yap + + +%files docs +%defattr(-,root,root,-) %doc docs/*.html %doc docs/yap.pdf %doc LGPL/pillow/doc/pillow_doc_html/* %doc LGPL/pillow/doc/article.ps.gz %doc --parent Logtalk/manuals %doc --parent Logtalk/examples -%{_bindir}/yap -%{_datadir}/Yap -%{_includedir}/Yap -%{_prefix}/lib/libYap.a -%{_prefix}/lib/Yap -%{_infodir}/* + %changelog +* Mon May 1 2006 Gerard Milmeister - 5.1.1-1 +- new version 5.1.1 +- split off devel and docs packages + +* Fri Feb 17 2006 Gerard Milmeister - 5.0.1-2 +- Rebuild for Fedora Extras 5 + * Tue Oct 25 2005 Gerard Milmeister - 5.0.1-1 - New Version 5.0.1 From fedora-extras-commits at redhat.com Mon May 1 11:17:40 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 1 May 2006 04:17:40 -0700 Subject: rpms/clamav/FC-5 clamav-0.88.2-guys, please-read-the-compiler-warnings-before-doing-a-release.patch, NONE, 1.1 clamav-0.88.1-strncpy.patch, 1.1, 1.2 clamav-0.88.1-guys, please-read-the-compiler-warnings-before-doing-a-release.patch, 1.1, NONE Message-ID: <200605011117.k41BHgku031499@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31449/FC-5 Modified Files: clamav-0.88.1-strncpy.patch Added Files: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch Removed Files: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch Log Message: fixed broken patches ***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1 ***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1 clamav-0.88.1-strncpy.patch: Index: clamav-0.88.1-strncpy.patch =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-5/clamav-0.88.1-strncpy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-0.88.1-strncpy.patch 30 Apr 2006 10:33:38 -0000 1.1 +++ clamav-0.88.1-strncpy.patch 1 May 2006 11:17:39 -0000 1.2 @@ -24,29 +24,3 @@ while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ { -2006-04-24 Enrico Scholz - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { ***** Not enough context to create diffstat for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE ***** Not enough context to create diff for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE From fedora-extras-commits at redhat.com Mon May 1 11:17:40 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 1 May 2006 04:17:40 -0700 Subject: rpms/clamav/FC-4 clamav-0.88.2-guys, please-read-the-compiler-warnings-before-doing-a-release.patch, 1.1, 1.2 clamav-0.88.1-strncpy.patch, 1.1, 1.2 Message-ID: <200605011117.k41BHgmt031506@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31449/FC-4 Modified Files: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch clamav-0.88.1-strncpy.patch Log Message: fixed broken patches ***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,1.2 ***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,1.2 clamav-0.88.1-strncpy.patch: Index: clamav-0.88.1-strncpy.patch =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav-0.88.1-strncpy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-0.88.1-strncpy.patch 30 Apr 2006 10:33:39 -0000 1.1 +++ clamav-0.88.1-strncpy.patch 1 May 2006 11:17:40 -0000 1.2 @@ -24,29 +24,3 @@ while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ { -2006-04-24 Enrico Scholz - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { From fedora-extras-commits at redhat.com Mon May 1 11:17:41 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 1 May 2006 04:17:41 -0700 Subject: rpms/clamav/FC-3 clamav-0.88.1-strncpy.patch,1.1,1.2 Message-ID: <200605011117.k41BHhEK031513@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31449/FC-3 Modified Files: clamav-0.88.1-strncpy.patch Log Message: fixed broken patches clamav-0.88.1-strncpy.patch: Index: clamav-0.88.1-strncpy.patch =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav-0.88.1-strncpy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-0.88.1-strncpy.patch 30 Apr 2006 10:33:39 -0000 1.1 +++ clamav-0.88.1-strncpy.patch 1 May 2006 11:17:41 -0000 1.2 @@ -24,29 +24,3 @@ while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ { -2006-04-24 Enrico Scholz - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { From fedora-extras-commits at redhat.com Mon May 1 12:05:23 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 05:05:23 -0700 Subject: rpms/pl/FC-5 pl-5.6.12-xft.patch,NONE,1.1 pl.spec,1.24,1.25 Message-ID: <200605011205.k41C5PD7001439@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1419 Modified Files: pl.spec Added Files: pl-5.6.12-xft.patch Log Message: fix for xft pl-5.6.12-xft.patch: --- NEW FILE pl-5.6.12-xft.patch --- --- pl-5.6.12/packages/xpce/src/configure.xft 2006-05-01 13:44:44.000000000 +0200 +++ pl-5.6.12/packages/xpce/src/configure 2006-05-01 13:46:45.000000000 +0200 @@ -309,7 +309,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA XFTCONFIG LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -8036,7 +8036,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8044,7 +8044,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -8071,7 +8071,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -8092,11 +8092,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -9136,56 +9136,13 @@ fi -for ac_prog in xft-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_XFTCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$XFTCONFIG"; then - ac_cv_prog_XFTCONFIG="$XFTCONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_XFTCONFIG="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -XFTCONFIG=$ac_cv_prog_XFTCONFIG -if test -n "$XFTCONFIG"; then - echo "$as_me:$LINENO: result: $XFTCONFIG" >&5 -echo "${ECHO_T}$XFTCONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$XFTCONFIG" && break -done -test -n "$XFTCONFIG" || XFTCONFIG=""false"" - -if test "$XFTCONFIG" != "false" ; then cat >>confdefs.h <<\_ACEOF #define USE_XFT 1 _ACEOF - XLIBS="$XLIBS `$XFTCONFIG --libs`" - XINCLUDES="$XINCLUDES `$XFTCONFIG --cflags`" -fi; + XLIBS="$XLIBS `pkg-config xft --libs`" + XINCLUDES="$XINCLUDES `pkg-config xft --cflags`" @@ -9927,7 +9884,6 @@ s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at EGREP@,$EGREP,;t t s, at ALLOCA@,$ALLOCA,;t t -s, at XFTCONFIG@,$XFTCONFIG,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/FC-5/pl.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pl.spec 30 Apr 2006 21:27:52 -0000 1.24 +++ pl.spec 1 May 2006 12:05:23 -0000 1.25 @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -12,6 +12,7 @@ Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch +Patch2: pl-5.6.12-xft.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel BuildRequires: readline-devel @@ -45,6 +46,7 @@ %setup -q %patch0 -p1 -b .rpath %patch1 -p1 -b .multilib +%patch2 -p1 -b .xft ( mkdir doc-install cd doc-install @@ -95,6 +97,9 @@ %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-2 +- added patch to compile with xft + * Sun Apr 30 2006 Gerard Milmeister - 5.6.12-1 - new version 5.6.12 From fedora-extras-commits at redhat.com Mon May 1 12:06:30 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 05:06:30 -0700 Subject: rpms/pl/devel pl-5.6.12-xft.patch,NONE,1.1 pl.spec,1.24,1.25 Message-ID: <200605011206.k41C6W67001508@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1488 Modified Files: pl.spec Added Files: pl-5.6.12-xft.patch Log Message: fix for xft pl-5.6.12-xft.patch: --- NEW FILE pl-5.6.12-xft.patch --- --- pl-5.6.12/packages/xpce/src/configure.xft 2006-05-01 13:44:44.000000000 +0200 +++ pl-5.6.12/packages/xpce/src/configure 2006-05-01 13:46:45.000000000 +0200 @@ -309,7 +309,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA XFTCONFIG LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -8036,7 +8036,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8044,7 +8044,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -8071,7 +8071,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -8092,11 +8092,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -9136,56 +9136,13 @@ fi -for ac_prog in xft-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_XFTCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$XFTCONFIG"; then - ac_cv_prog_XFTCONFIG="$XFTCONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_XFTCONFIG="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -XFTCONFIG=$ac_cv_prog_XFTCONFIG -if test -n "$XFTCONFIG"; then - echo "$as_me:$LINENO: result: $XFTCONFIG" >&5 -echo "${ECHO_T}$XFTCONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$XFTCONFIG" && break -done -test -n "$XFTCONFIG" || XFTCONFIG=""false"" - -if test "$XFTCONFIG" != "false" ; then cat >>confdefs.h <<\_ACEOF #define USE_XFT 1 _ACEOF - XLIBS="$XLIBS `$XFTCONFIG --libs`" - XINCLUDES="$XINCLUDES `$XFTCONFIG --cflags`" -fi; + XLIBS="$XLIBS `pkg-config xft --libs`" + XINCLUDES="$XINCLUDES `pkg-config xft --cflags`" @@ -9927,7 +9884,6 @@ s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at EGREP@,$EGREP,;t t s, at ALLOCA@,$ALLOCA,;t t -s, at XFTCONFIG@,$XFTCONFIG,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pl.spec 30 Apr 2006 21:27:53 -0000 1.24 +++ pl.spec 1 May 2006 12:06:30 -0000 1.25 @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -12,6 +12,7 @@ Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch +Patch2: pl-5.6.12-xft.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel BuildRequires: readline-devel @@ -45,6 +46,7 @@ %setup -q %patch0 -p1 -b .rpath %patch1 -p1 -b .multilib +%patch2 -p1 -b .xft ( mkdir doc-install cd doc-install @@ -95,6 +97,9 @@ %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-2 +- added patch to compile with xft + * Sun Apr 30 2006 Gerard Milmeister - 5.6.12-1 - new version 5.6.12 From fedora-extras-commits at redhat.com Mon May 1 12:47:03 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Mon, 1 May 2006 05:47:03 -0700 Subject: rpms/libvisual-plugins/devel libvisual-plugins.spec-notyet.txt, NONE, 1.1 Message-ID: <200605011247.k41Cl5A1001770@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/libvisual-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1754 Added Files: libvisual-plugins.spec-notyet.txt Log Message: Not tagging/building/etc yet. --- NEW FILE libvisual-plugins.spec-notyet.txt --- %define libv_majv 0.4 %{!?with_gst: %define with_gst 0} %if %{with_gst} %define gst_args --enable-gstreamer-plugin %else %define gst_args --disable-gstreamer-plugin %endif Name: libvisual-plugins Version: 0.4.0 Release: 1%{?dist} Summary: Plugins for use with libvisual Group: Applications/Multimedia License: GPL URL: http://libvisual.sourceforge.net/v2/ Source0: http://easynews.dl.sourceforge.net/sourceforge/libvisual/%{name}-%{version}.tar.gz Patch0: libvisual-plugins-0.2.0.mkinstalldirs.patch #Patch1: libvisual-plugins-0.2.0-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvisual-devel >= 0.4.0 #BuildRequires: xorg-x11-proto-devel #BuildRequires: libX11-devel BuildRequires: libXt-devel BuildRequires: gtk2-devel BuildRequires: alsa-lib-devel BuildRequires: esound-devel BuildRequires: pango-devel #BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %if %with_gst BuildRequires: %{_libdir}/pkgconfig/gstreamer-0.8.pc %endif %description Libvisual is an abstraction library that comes between applications and audio visualisation plugins. This package provides visualizer plugins for use with libvisual aware applications. %prep %setup -q #%%patch0 -p1 #%%patch1 -p1 %build %configure \ %{gst_args} \ --enable-extra-optimization #--disable-infinite \ #--disable-flower \ #--disable-dancingparticles \ #--disable-gltest \ #--disable-madspin \ #--disable-nebulus ## infinite disabled due to gcc 4 issue ## rest disabled because they are broken ## and cause totem to fail in a bad way make %{?_smp_mflags} %install rm -rf %buildroot make DESTDIR=%buildroot install find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name}-%{libv_majv} %clean rm -rf %buildroot %files -f %{name}-%{libv_majv}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %_libdir/libvisual-%{libv_majv}/ %_datadir/libvisual-plugins-%{libv_majv}/ %changelog * Mon May 01 2006 Michael A. Peters - 0.4.0-1 - Initial build of 0.4.0 * Fri Feb 17 2006 Michael A. Peters - 0.2.0-3 - Rebuild in devel branch * Sun Nov 20 2005 Michael A. Peters - 0.2.0-2 - configure patch (patch1) to fix detection of xlibraries/xincludes - removed sed line fix of rpath in %%prep - no longer needed with - the configure patch * Sun Nov 20 2005 Michael A. Peters - 0.2.0-1.9 - fixed it so it builds (specified x-libraries) - building OpenGL plugin * Sat Nov 19 2005 Michael A. Peters - 0.2.0-1.3 - fix BuildRequires for mock, specify x-includedir to configure * Fri Nov 18 2005 Michael A. Peters - 0.2.0-1.2 - changed the xorg-x11-devel BuildRequires to modular xorg-x11 - for fc5 - put / at end of directories owned in %%files for readability. * Sun Jun 19 2005 Michael A. Peters - 0.2.0-1.1 - remove explicit rpath from LIBTOOL options * Wed Jun 15 2005 Michael A. Peters - 0.2.0-1 - initial checkin to Extras CVS From fedora-extras-commits at redhat.com Mon May 1 13:21:46 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 06:21:46 -0700 Subject: rpms/pl/FC-5 pl.spec,1.25,1.26 Message-ID: <200605011321.k41DLmjI004049@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4032 Modified Files: pl.spec Log Message: Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/FC-5/pl.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- pl.spec 1 May 2006 12:05:23 -0000 1.25 +++ pl.spec 1 May 2006 13:21:46 -0000 1.26 @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -29,6 +29,7 @@ BuildRequires: libXpm-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel +BuildRequires: libXinerama-devel # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038 #ExcludeArch: x86_64 @@ -97,6 +98,9 @@ %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-3 +- added buildreq for libXinerama-devel + * Mon May 1 2006 Gerard Milmeister - 5.6.12-2 - added patch to compile with xft From fedora-extras-commits at redhat.com Mon May 1 13:25:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 1 May 2006 06:25:40 -0700 Subject: rpms/pl/devel pl.spec,1.25,1.26 Message-ID: <200605011325.k41DPgGu004122@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104 Modified Files: pl.spec Log Message: Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- pl.spec 1 May 2006 12:06:30 -0000 1.25 +++ pl.spec 1 May 2006 13:25:39 -0000 1.26 @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -29,6 +29,7 @@ BuildRequires: libXpm-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel +BuildRequires: libXinerama-devel # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038 #ExcludeArch: x86_64 @@ -97,6 +98,9 @@ %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-3 +- added buildreq for libXinerama-devel + * Mon May 1 2006 Gerard Milmeister - 5.6.12-2 - added patch to compile with xft From fedora-extras-commits at redhat.com Mon May 1 14:38:29 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:29 -0700 Subject: rpms/gsview/FC-1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.1, NONE gsview.desktop, 1.2, NONE gsview.spec, 1.2, NONE Message-ID: <200605011439.k41Ed1aj006722@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-1 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-1/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 1 May 2006 14:38:29 -0000 1.3 @@ -1 +0,0 @@ -gsview-4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-1/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:19 -0000 1.2 +++ sources 1 May 2006 14:38:29 -0000 1.3 @@ -1 +0,0 @@ -35cb5e421faca49eb70c426354e41ba8 gsview-4.6.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:30 -0700 Subject: rpms/gsview/FC-2 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.1, NONE gsview.desktop, 1.2, NONE gsview.spec, 1.3, NONE Message-ID: <200605011439.k41Ed2qQ006726@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-2 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 1 May 2006 14:38:30 -0000 1.3 @@ -1 +0,0 @@ -gsview-4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:19 -0000 1.2 +++ sources 1 May 2006 14:38:30 -0000 1.3 @@ -1 +0,0 @@ -35cb5e421faca49eb70c426354e41ba8 gsview-4.6.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:31 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:31 -0700 Subject: rpms/gsview/FC-3 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.2, NONE gsview-4.7-dllversion.patch, 1.1, NONE gsview-4.7-letterpaper.patch, 1.1, NONE gsview.desktop, 1.2, NONE gsview.spec, 1.7, NONE Message-ID: <200605011439.k41Ed39V006730@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-3 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 1 May 2006 14:38:30 -0000 1.3 @@ -1 +0,0 @@ -gsview-4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Aug 2005 16:53:35 -0000 1.3 +++ sources 1 May 2006 14:38:30 -0000 1.4 @@ -1 +0,0 @@ -ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview-4.7-dllversion.patch DELETED --- --- gsview-4.7-letterpaper.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:31 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:31 -0700 Subject: rpms/gsview/FC-4 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.2, NONE gsview-4.7-dllversion.patch, 1.1, NONE gsview-4.7-letterpaper.patch, 1.1, NONE gsview.desktop, 1.2, NONE gsview.spec, 1.10, NONE Message-ID: <200605011439.k41Ed3p6006734@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-4 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 1 May 2006 14:38:31 -0000 1.3 @@ -1 +0,0 @@ -gsview-4.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Aug 2005 16:50:52 -0000 1.3 +++ sources 1 May 2006 14:38:31 -0000 1.4 @@ -1 +0,0 @@ -ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview-4.7-dllversion.patch DELETED --- --- gsview-4.7-letterpaper.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:32 -0700 Subject: rpms/gsview/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.2, NONE gsview-4.7-dllversion.patch, 1.1, NONE gsview-4.7-letterpaper.patch, 1.1, NONE gsview.desktop, 1.3, NONE gsview.spec, 1.17, NONE Message-ID: <200605011439.k41Ed4TN006738@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/FC-5 Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Aug 2005 18:17:28 -0000 1.3 +++ .cvsignore 1 May 2006 14:38:32 -0000 1.4 @@ -1 +0,0 @@ -gsview-4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Aug 2005 18:17:28 -0000 1.3 +++ sources 1 May 2006 14:38:32 -0000 1.4 @@ -1 +0,0 @@ -ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview-4.7-dllversion.patch DELETED --- --- gsview-4.7-letterpaper.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:38:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:38:33 -0700 Subject: rpms/gsview/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 gsview-4.4-htmlview.patch, 1.1, NONE gsview-4.6-libgs.patch, 1.2, NONE gsview-4.7-dllversion.patch, 1.1, NONE gsview-4.7-letterpaper.patch, 1.1, NONE gsview.desktop, 1.3, NONE gsview.spec, 1.17, NONE Message-ID: <200605011439.k41Ed5sR006742@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623/devel Modified Files: .cvsignore sources Removed Files: gsview-4.4-htmlview.patch gsview-4.6-libgs.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview.desktop gsview.spec Log Message: remove gsview from cvs (see bug #190276) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Aug 2005 18:17:28 -0000 1.3 +++ .cvsignore 1 May 2006 14:38:32 -0000 1.4 @@ -1 +0,0 @@ -gsview-4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Aug 2005 18:17:28 -0000 1.3 +++ sources 1 May 2006 14:38:32 -0000 1.4 @@ -1 +0,0 @@ -ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz --- gsview-4.4-htmlview.patch DELETED --- --- gsview-4.6-libgs.patch DELETED --- --- gsview-4.7-dllversion.patch DELETED --- --- gsview-4.7-letterpaper.patch DELETED --- --- gsview.desktop DELETED --- --- gsview.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 1 14:40:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 1 May 2006 07:40:25 -0700 Subject: rpms/gsview/FC-1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.3, NONE Message-ID: <200605011440.k41EeRtR006778@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6753 Removed Files: .cvsignore Makefile branch sources Log Message: gsview pruning --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 1 15:16:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 1 May 2006 08:16:56 -0700 Subject: rpms/gramps/devel .cvsignore, 1.13, 1.14 gramps.spec, 1.19, 1.20 sources, 1.13, 1.14 Message-ID: <200605011516.k41FGwCv010084@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10063 Modified Files: .cvsignore gramps.spec sources Log Message: * Mon May 1 2006 Brian Pepple - 2.0.11-3 - Update to 2.0.11. - Drop INSTALL, README & ChangeLog documentation. - Ghost .pyo files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 28 Feb 2006 18:56:34 -0000 1.13 +++ .cvsignore 1 May 2006 15:16:56 -0000 1.14 @@ -1 +1 @@ -gramps-2.0.10.tar.gz +gramps-2.0.11.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gramps.spec 11 Mar 2006 20:23:56 -0000 1.19 +++ gramps.spec 1 May 2006 15:16:56 -0000 1.20 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.10 +Version: 2.0.11 Release: 3%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,21 +111,50 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO +%doc AUTHORS COPYING COPYING-DOCS FAQ NEWS TODO %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/application-registry/%{name}.applications -%{_datadir}/%{name}/ %{_datadir}/omf/%{name}/ %{_datadir}/mime/packages/%{name}.xml %{_datadir}/mime-info/* %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/gnome/48x48/mimetypes/*.png %{_sysconfdir}/gconf/schemas/%{name}.schemas -%{_mandir}/man1/* +%{_mandir}/man1/%{name}.1.gz +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.py +%{_datadir}/%{name}/*.pyc +%{_datadir}/%{name}/*.png +%{_datadir}/%{name}/*.jpg +%{_datadir}/%{name}/*.glade +%ghost %{_datadir}/%{name}/*.pyo +%{_datadir}/%{name}/data/ +%dir %{_datadir}/%{name}/dates +%{_datadir}/%{name}/dates/*.py +%{_datadir}/%{name}/dates/*.pyc +%ghost %{_datadir}/%{name}/dates/*.pyo +%dir %{_datadir}/%{name}/docgen +%{_datadir}/%{name}/docgen/*.py +%{_datadir}/%{name}/docgen/*.pyc +%ghost %{_datadir}/%{name}/docgen/*.pyo +%{_datadir}/%{name}/example/ +%{_datadir}/%{name}/gnome/ +%dir %{_datadir}/%{name}/plugins +%{_datadir}/%{name}/plugins/*.py +%{_datadir}/%{name}/plugins/*.pyc +%{_datadir}/%{name}/plugins/*.glade +%{_datadir}/%{name}/plugins/*.xml +%{_datadir}/%{name}/plugins/*.png +%ghost %{_datadir}/%{name}/plugins/*.pyo %changelog +* Mon May 1 2006 Brian Pepple - 2.0.11-3 +- Update to 2.0.11. +- Drop INSTALL, README & ChangeLog documentation. +- Ghost .pyo files. + * Sat Mar 11 2006 Brian Pepple - 2.0.10-3 - Remove Utility category from desktop file. - Update scriptlets. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 28 Feb 2006 18:56:34 -0000 1.13 +++ sources 1 May 2006 15:16:56 -0000 1.14 @@ -1 +1 @@ -2c9c00acce995546af325087622235e5 gramps-2.0.10.tar.gz +650873c3c571a921a9c42b975ced2105 gramps-2.0.11.tar.gz From fedora-extras-commits at redhat.com Mon May 1 15:53:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 08:53:57 -0700 Subject: rpms/perl-Image-Info/devel .cvsignore, 1.5, 1.6 perl-Image-Info.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200605011553.k41Frxx3010324@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10303 Modified Files: .cvsignore perl-Image-Info.spec sources Log Message: Update to 1.21. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 21:57:23 -0000 1.5 +++ .cvsignore 1 May 2006 15:53:57 -0000 1.6 @@ -1 +1 @@ -Image-Info-1.20.tar.gz +Image-Info-1.21.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Image-Info.spec 13 Mar 2006 21:57:23 -0000 1.11 +++ perl-Image-Info.spec 1 May 2006 15:53:57 -0000 1.12 @@ -1,7 +1,7 @@ %define rgbtxt %{_datadir}/X11/rgb.txt Name: perl-Image-Info -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Image meta information extraction module for Perl @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} @@ -25,7 +24,7 @@ %prep %setup -q -n Image-Info-%{version} -chmod 644 README exifdump imgdump +chmod 644 exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -55,10 +54,13 @@ %defattr(-,root,root,-) %doc Changes README exifdump imgdump %{perl_vendorlib}/Image/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-1 +- Update to 1.21. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 - Update to 1.20. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 21:57:23 -0000 1.5 +++ sources 1 May 2006 15:53:57 -0000 1.6 @@ -1 +1 @@ -91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz +c1e07651729fe88e1da5a0fe9337836a Image-Info-1.21.tar.gz From fedora-extras-commits at redhat.com Mon May 1 15:59:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 08:59:41 -0700 Subject: rpms/perl-Image-Info/devel perl-Image-Info.spec,1.12,1.13 Message-ID: <200605011559.k41FxhNB010901@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10880 Modified Files: perl-Image-Info.spec Log Message: Bumping release due to CVS problem. Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Image-Info.spec 1 May 2006 15:53:57 -0000 1.12 +++ perl-Image-Info.spec 1 May 2006 15:59:40 -0000 1.13 @@ -2,7 +2,7 @@ Name: perl-Image-Info Version: 1.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-2 +- Bumping release due to CVS problem. + * Mon May 1 2006 Jose Pedro Oliveira - 1.21-1 - Update to 1.21. From fedora-extras-commits at redhat.com Mon May 1 16:07:48 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 09:07:48 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.1,1.2 Message-ID: <200605011607.k41G7ohs013403@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13386 Modified Files: gcompris.spec Log Message: * Mon May 1 2006 Hans de Goede 7.4-5 - Make -devel require -libs instead of -lib (oops). Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcompris.spec 30 Apr 2006 08:28:51 -0000 1.1 +++ gcompris.spec 1 May 2006 16:07:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -68,7 +68,7 @@ %package devel Summary: Development libraries and headers for gcompris-lib Group: Development/Libraries -Requires: %{name}-lib = %{version} +Requires: %{name}-libs = %{version} Requires: libgnomecanvas-devel pkgconfig %description devel @@ -475,6 +475,9 @@ %changelog +* Mon May 1 2006 Hans de Goede 7.4-5 +- Make -devel require -libs instead of -lib (oops). + * Sat Apr 29 2006 Hans de Goede 7.4-4 - Add click_on_letter.patch from CVS which fixes a few problems with the click on letter activity when the sounds are not installed From fedora-extras-commits at redhat.com Mon May 1 16:10:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 09:10:39 -0700 Subject: rpms/perl-Image-Info/FC-4 .cvsignore, 1.3, 1.4 perl-Image-Info.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605011610.k41GAfgh013496@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13459/FC-4 Modified Files: .cvsignore perl-Image-Info.spec sources Log Message: Update to 1.21. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Mar 2006 22:18:15 -0000 1.3 +++ .cvsignore 1 May 2006 16:10:39 -0000 1.4 @@ -1 +1 @@ -Image-Info-1.20.tar.gz +Image-Info-1.21.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/perl-Image-Info.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Image-Info.spec 13 Mar 2006 22:18:15 -0000 1.8 +++ perl-Image-Info.spec 1 May 2006 16:10:39 -0000 1.9 @@ -1,8 +1,8 @@ %define rgbtxt %{_prefix}/X11R6/lib/X11/rgb.txt Name: perl-Image-Info -Version: 1.20 -Release: 1%{?dist} +Version: 1.21 +Release: 2%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} @@ -25,7 +24,7 @@ %prep %setup -q -n Image-Info-%{version} -chmod 644 README exifdump imgdump +chmod 644 exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -55,10 +54,16 @@ %defattr(-,root,root,-) %doc Changes README exifdump imgdump %{perl_vendorlib}/Image/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-2 +- Bumping release due to CVS problem. + +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-1 +- Update to 1.21. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 - Update to 1.20. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Mar 2006 22:18:15 -0000 1.3 +++ sources 1 May 2006 16:10:39 -0000 1.4 @@ -1 +1 @@ -91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz +c1e07651729fe88e1da5a0fe9337836a Image-Info-1.21.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:10:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 09:10:39 -0700 Subject: rpms/perl-Image-Info/FC-5 .cvsignore, 1.5, 1.6 perl-Image-Info.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200605011610.k41GAfIH013502@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13459/FC-5 Modified Files: .cvsignore perl-Image-Info.spec sources Log Message: Update to 1.21. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 21:57:23 -0000 1.5 +++ .cvsignore 1 May 2006 16:10:39 -0000 1.6 @@ -1 +1 @@ -Image-Info-1.20.tar.gz +Image-Info-1.21.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-5/perl-Image-Info.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Image-Info.spec 13 Mar 2006 21:57:23 -0000 1.11 +++ perl-Image-Info.spec 1 May 2006 16:10:39 -0000 1.12 @@ -1,8 +1,8 @@ %define rgbtxt %{_datadir}/X11/rgb.txt Name: perl-Image-Info -Version: 1.20 -Release: 1%{?dist} +Version: 1.21 +Release: 2%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} @@ -25,7 +24,7 @@ %prep %setup -q -n Image-Info-%{version} -chmod 644 README exifdump imgdump +chmod 644 exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -55,10 +54,16 @@ %defattr(-,root,root,-) %doc Changes README exifdump imgdump %{perl_vendorlib}/Image/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-2 +- Bumping release due to CVS problem. + +* Mon May 1 2006 Jose Pedro Oliveira - 1.21-1 +- Update to 1.21. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 - Update to 1.20. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 21:57:23 -0000 1.5 +++ sources 1 May 2006 16:10:39 -0000 1.6 @@ -1 +1 @@ -91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz +c1e07651729fe88e1da5a0fe9337836a Image-Info-1.21.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:14:25 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 09:14:25 -0700 Subject: rpms/gcompris/FC-5 gcompris.spec,1.1,1.2 Message-ID: <200605011614.k41GERmw013628@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13611 Modified Files: gcompris.spec Log Message: * Mon May 1 2006 Hans de Goede 7.4-5 - Make -devel require -libs instead of -lib (oops). Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcompris.spec 30 Apr 2006 08:28:51 -0000 1.1 +++ gcompris.spec 1 May 2006 16:14:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -68,7 +68,7 @@ %package devel Summary: Development libraries and headers for gcompris-lib Group: Development/Libraries -Requires: %{name}-lib = %{version} +Requires: %{name}-libs = %{version} Requires: libgnomecanvas-devel pkgconfig %description devel @@ -475,6 +475,9 @@ %changelog +* Mon May 1 2006 Hans de Goede 7.4-5 +- Make -devel require -libs instead of -lib (oops). + * Sat Apr 29 2006 Hans de Goede 7.4-4 - Add click_on_letter.patch from CVS which fixes a few problems with the click on letter activity when the sounds are not installed From fedora-extras-commits at redhat.com Mon May 1 16:25:19 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Mon, 1 May 2006 09:25:19 -0700 Subject: rpms/nautilus-actions/FC-4 .cvsignore, 1.3, 1.4 nautilus-actions.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605011625.k41GPLGN013828@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/nautilus-actions/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13807 Modified Files: .cvsignore nautilus-actions.spec sources Log Message: * Mon May 01 2006 Deji Akingunola - 1.2-1 - Update to version 1.2 - Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2006 22:34:26 -0000 1.3 +++ .cvsignore 1 May 2006 16:25:19 -0000 1.4 @@ -1 +1 @@ -nautilus-actions-1.0.tar.gz +nautilus-actions-1.2.tar.gz Index: nautilus-actions.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/nautilus-actions.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nautilus-actions.spec 8 Feb 2006 22:34:26 -0000 1.4 +++ nautilus-actions.spec 1 May 2006 16:25:19 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions -Version: 1.0 +Version: 1.2 Release: 1%{?dist} Group: User Interface/Desktops License: GPL @@ -30,8 +30,6 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install -cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png - rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop @@ -48,14 +46,17 @@ rm -rf %{buildroot} %pre +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || : killall -HUP gconfd-2 || : fi +fi %preun +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ @@ -64,6 +65,19 @@ gconftool-2 --recursive-unset /schemas/apps/nautilus-actions killall -HUP gconfd-2 || : fi +fi + +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) @@ -73,10 +87,14 @@ %{_bindir}/nautilus-actions-new-config %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so %{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/*/apps/nautilus-actions.* %{_datadir}/applications/fedora-nact.desktop -%{_datadir}/pixmaps/nautilus-actions-icon.png %changelog +* Mon May 01 2006 Deji Akingunola - 1.2-1 +- Update to version 1.2 +- Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors + * Wed Feb 8 2006 Deji Akingunola - 1.0-1 - New upstream version - Do away with gconf schemas installation Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2006 22:34:26 -0000 1.3 +++ sources 1 May 2006 16:25:19 -0000 1.4 @@ -1 +1 @@ -fde8d7ad832009bfd1746bf076e8a838 nautilus-actions-1.0.tar.gz +d1d4bf81c0f611610d33cfec59c5e549 nautilus-actions-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:26:44 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Mon, 1 May 2006 09:26:44 -0700 Subject: rpms/nautilus-actions/FC-5 .cvsignore, 1.3, 1.4 nautilus-actions.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605011626.k41GQkOZ013902@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/nautilus-actions/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13881 Modified Files: .cvsignore nautilus-actions.spec sources Log Message: * Mon May 01 2006 Deji Akingunola - 1.2-1 - Update to version 1.2 - Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2006 22:32:43 -0000 1.3 +++ .cvsignore 1 May 2006 16:26:44 -0000 1.4 @@ -1 +1 @@ -nautilus-actions-1.0.tar.gz +nautilus-actions-1.2.tar.gz Index: nautilus-actions.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/nautilus-actions.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nautilus-actions.spec 13 Feb 2006 21:01:42 -0000 1.4 +++ nautilus-actions.spec 1 May 2006 16:26:44 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions -Version: 1.0 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} Group: User Interface/Desktops License: GPL URL: http://www.grumz.net/node/8 @@ -30,8 +30,6 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install -cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png - rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop @@ -48,14 +46,17 @@ rm -rf %{buildroot} %pre +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || : killall -HUP gconfd-2 || : fi +fi %preun +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ @@ -64,6 +65,19 @@ gconftool-2 --recursive-unset /schemas/apps/nautilus-actions killall -HUP gconfd-2 || : fi +fi + +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) @@ -73,10 +87,14 @@ %{_bindir}/nautilus-actions-new-config %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so %{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/*/apps/nautilus-actions.* %{_datadir}/applications/fedora-nact.desktop -%{_datadir}/pixmaps/nautilus-actions-icon.png %changelog +* Mon May 01 2006 Deji Akingunola - 1.2-1 +- Update to version 1.2 +- Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors + * Mon Feb 13 2006 Deji Akingunola - 1.0-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2006 22:32:43 -0000 1.3 +++ sources 1 May 2006 16:26:44 -0000 1.4 @@ -1 +1 @@ -fde8d7ad832009bfd1746bf076e8a838 nautilus-actions-1.0.tar.gz +d1d4bf81c0f611610d33cfec59c5e549 nautilus-actions-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:27:38 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Mon, 1 May 2006 09:27:38 -0700 Subject: rpms/nautilus-actions/devel .cvsignore, 1.3, 1.4 nautilus-actions.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605011627.k41GRe9X013979@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/nautilus-actions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13958 Modified Files: .cvsignore nautilus-actions.spec sources Log Message: * Mon May 01 2006 Deji Akingunola - 1.2-1 - Update to version 1.2 - Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2006 22:32:43 -0000 1.3 +++ .cvsignore 1 May 2006 16:27:37 -0000 1.4 @@ -1 +1 @@ -nautilus-actions-1.0.tar.gz +nautilus-actions-1.2.tar.gz Index: nautilus-actions.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/devel/nautilus-actions.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nautilus-actions.spec 13 Feb 2006 21:01:42 -0000 1.4 +++ nautilus-actions.spec 1 May 2006 16:27:37 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions -Version: 1.0 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} Group: User Interface/Desktops License: GPL URL: http://www.grumz.net/node/8 @@ -30,8 +30,6 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install -cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png - rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop @@ -48,14 +46,17 @@ rm -rf %{buildroot} %pre +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || : killall -HUP gconfd-2 || : fi +fi %preun +if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ @@ -64,6 +65,19 @@ gconftool-2 --recursive-unset /schemas/apps/nautilus-actions killall -HUP gconfd-2 || : fi +fi + +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) @@ -73,10 +87,14 @@ %{_bindir}/nautilus-actions-new-config %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so %{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/*/apps/nautilus-actions.* %{_datadir}/applications/fedora-nact.desktop -%{_datadir}/pixmaps/nautilus-actions-icon.png %changelog +* Mon May 01 2006 Deji Akingunola - 1.2-1 +- Update to version 1.2 +- Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors + * Mon Feb 13 2006 Deji Akingunola - 1.0-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2006 22:32:43 -0000 1.3 +++ sources 1 May 2006 16:27:37 -0000 1.4 @@ -1 +1 @@ -fde8d7ad832009bfd1746bf076e8a838 nautilus-actions-1.0.tar.gz +d1d4bf81c0f611610d33cfec59c5e549 nautilus-actions-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 1 16:29:28 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:29:28 -0700 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.8,1.9 Message-ID: <200605011629.k41GTUxi014046@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14025 Modified Files: emacs-auctex.spec Log Message: Add preview-latex functionality Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emacs-auctex.spec 20 Apr 2006 19:35:29 -0000 1.8 +++ emacs-auctex.spec 1 May 2006 16:29:28 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 3%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -34,12 +34,12 @@ %setup -q -n auctex-%{version} %build -# --with-texmf-dir overrides local docstrip configurations. -# "--disable-preview" it would be nice to get preview added but -# unfortunately its Makefile is simplistic and will need some -# effort to get it working with rpmbuild -%configure "--with-emacs" "--disable-preview" '--with-texmf-dir=%{_datadir}/texmf' +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview + +%configure --with-emacs --without-texmf-dir + make + pushd doc make auctex.info tex-ref.pdf popd @@ -47,47 +47,60 @@ %install rm -rf %{buildroot} mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}} -# mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview -#makeinstall install-contrib install-info +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview %makeinstall mkdir -p %{buildroot}%{startupdir} -echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile} -echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \ - %{buildroot}%{startupfile} -echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile} -rm -rf %{buildroot}%{_var} -rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch +cat < %{buildroot}%{startupfile} +;; This enables AUCTeX globally. +;; See (info "(auctex)Introduction") on how to disable AUCTeX. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "auctex.el" nil t t) + +;; This enables preview-latex globally. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "preview-latex.el" nil t t) +EOF -# Remove dir file that has been created by the makeinfo calls because this -# file will not been included in the rpm distribution (make RPM 4.1+ happy) -# rm -f '%{buildroot}%{_infodir}/dir' +rm -rf %{buildroot}%{_var} +#rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) -%doc RELEASE COPYING INSTALL README TODO FAQ CHANGES +%doc RELEASE COPYING README TODO FAQ CHANGES %doc doc/tex-ref.pdf %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{startupdir} -# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el %{_datadir}/emacs/site-lisp/auctex -# %{startupfile} %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-6 +- Leave .nosearch file in styles directory - this directory shouldn't be in the load-path + +* Mon May 1 2006 Jonathan Underwood - 11.82-5 +- Move installation of the preview style files out of the texmf tree for now + +* Mon Apr 24 2006 Jonathan Underwood - 11.82-4 +- Added preview-latex +- Removed INSTALL document from package (not necessary) +- Clean up generation of startup files from spec file + * Thu Apr 20 2006 Ed Hill - 11.82-3 - fix startup file per bug# 189488 From fedora-extras-commits at redhat.com Mon May 1 16:30:41 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:30:41 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.8,1.9 Message-ID: <200605011630.k41GUhPr014122@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14104 Modified Files: emacs-auctex.spec Log Message: Add preview-latex functionality Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emacs-auctex.spec 20 Apr 2006 19:35:28 -0000 1.8 +++ emacs-auctex.spec 1 May 2006 16:30:41 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 3%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -34,12 +34,12 @@ %setup -q -n auctex-%{version} %build -# --with-texmf-dir overrides local docstrip configurations. -# "--disable-preview" it would be nice to get preview added but -# unfortunately its Makefile is simplistic and will need some -# effort to get it working with rpmbuild -%configure "--with-emacs" "--disable-preview" '--with-texmf-dir=%{_datadir}/texmf' +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview + +%configure --with-emacs --without-texmf-dir + make + pushd doc make auctex.info tex-ref.pdf popd @@ -47,47 +47,60 @@ %install rm -rf %{buildroot} mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}} -# mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview -#makeinstall install-contrib install-info +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview %makeinstall mkdir -p %{buildroot}%{startupdir} -echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile} -echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \ - %{buildroot}%{startupfile} -echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile} -rm -rf %{buildroot}%{_var} -rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch +cat < %{buildroot}%{startupfile} +;; This enables AUCTeX globally. +;; See (info "(auctex)Introduction") on how to disable AUCTeX. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "auctex.el" nil t t) + +;; This enables preview-latex globally. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "preview-latex.el" nil t t) +EOF -# Remove dir file that has been created by the makeinfo calls because this -# file will not been included in the rpm distribution (make RPM 4.1+ happy) -# rm -f '%{buildroot}%{_infodir}/dir' +rm -rf %{buildroot}%{_var} +#rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) -%doc RELEASE COPYING INSTALL README TODO FAQ CHANGES +%doc RELEASE COPYING README TODO FAQ CHANGES %doc doc/tex-ref.pdf %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{startupdir} -# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el %{_datadir}/emacs/site-lisp/auctex -# %{startupfile} %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-6 +- Leave .nosearch file in styles directory - this directory shouldn't be in the load-path + +* Mon May 1 2006 Jonathan Underwood - 11.82-5 +- Move installation of the preview style files out of the texmf tree for now + +* Mon Apr 24 2006 Jonathan Underwood - 11.82-4 +- Added preview-latex +- Removed INSTALL document from package (not necessary) +- Clean up generation of startup files from spec file + * Thu Apr 20 2006 Ed Hill - 11.82-3 - fix startup file per bug# 189488 From fedora-extras-commits at redhat.com Mon May 1 16:31:27 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:31:27 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.6,1.7 Message-ID: <200605011631.k41GVTGV014184@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14167 Modified Files: emacs-auctex.spec Log Message: Add preview-latex functionality Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- emacs-auctex.spec 20 Apr 2006 19:35:27 -0000 1.6 +++ emacs-auctex.spec 1 May 2006 16:31:27 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 2%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -34,12 +34,12 @@ %setup -q -n auctex-%{version} %build -# --with-texmf-dir overrides local docstrip configurations. -# "--disable-preview" it would be nice to get preview added but -# unfortunately its Makefile is simplistic and will need some -# effort to get it working with rpmbuild -%configure "--with-emacs" "--disable-preview" '--with-texmf-dir=%{_datadir}/texmf' +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview + +%configure --with-emacs --without-texmf-dir + make + pushd doc make auctex.info tex-ref.pdf popd @@ -47,53 +47,72 @@ %install rm -rf %{buildroot} mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}} -# mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview -#makeinstall install-contrib install-info +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview %makeinstall mkdir -p %{buildroot}%{startupdir} -echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile} -echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \ - %{buildroot}%{startupfile} -echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile} -rm -rf %{buildroot}%{_var} -rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch +cat < %{buildroot}%{startupfile} +;; This enables AUCTeX globally. +;; See (info "(auctex)Introduction") on how to disable AUCTeX. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "auctex.el" nil t t) + +;; This enables preview-latex globally. +;; Created for %{name}-%{version}-%{release}.noarch.rpm +(load "preview-latex.el" nil t t) +EOF -# Remove dir file that has been created by the makeinfo calls because this -# file will not been included in the rpm distribution (make RPM 4.1+ happy) -# rm -f '%{buildroot}%{_infodir}/dir' +rm -rf %{buildroot}%{_var} +#rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) -%doc RELEASE COPYING INSTALL README TODO FAQ CHANGES +%doc RELEASE COPYING README TODO FAQ CHANGES %doc doc/tex-ref.pdf %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{startupdir} -# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el %{_datadir}/emacs/site-lisp/auctex -# %{startupfile} %{_datadir}/emacs/site-lisp/tex-site.el %changelog -* Thu Apr 20 2006 Ed Hill - 11.82-2 +* Mon May 1 2006 Jonathan Underwood - 11.82-6 +- Leave .nosearch file in styles directory - this directory shouldn't be in the load-path + +* Mon May 1 2006 Jonathan Underwood - 11.82-5 +- Move installation of the preview style files out of the texmf tree for now + +* Mon Apr 24 2006 Jonathan Underwood - 11.82-4 +- Added preview-latex +- Removed INSTALL document from package (not necessary) +- Clean up generation of startup files from spec file + +* Thu Apr 20 2006 Ed Hill - 11.82-3 - fix startup file per bug# 189488 +* Sun Apr 9 2006 Ed Hill - 11.82-2 +- rebuild + * Sun Apr 9 2006 Ed Hill - 11.82-1 - update to 11.82 +* Fri Sep 30 2005 Ed Hill - 11.81-2 +- fix stupid tagging mistake + * Fri Sep 30 2005 Ed Hill - 11.81-1 - update to 11.81 - disable preview for now since it needs some packaging work From fedora-extras-commits at redhat.com Mon May 1 16:34:18 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 09:34:18 -0700 Subject: rpms/raidem/FC-5 raidem-0.3.1-syslibs.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 raidem.spec, 1.3, 1.4 sources, 1.2, 1.3 raidem-0.3-loadpng.patch, 1.1, NONE raidem-0.3-no-mp3.patch, 1.1, NONE raidem-0.3-syslibs.patch, 1.1, NONE raidem-0.3-warn.patch, 1.1, NONE Message-ID: <200605011634.k41GYKDM014264@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14240 Modified Files: .cvsignore raidem.spec sources Added Files: raidem-0.3.1-syslibs.patch Removed Files: raidem-0.3-loadpng.patch raidem-0.3-no-mp3.patch raidem-0.3-syslibs.patch raidem-0.3-warn.patch Log Message: * Mon May 1 2006 Hans de Goede 0.3.1-2 - Fix big finger typo which put the datafiles under /use/share instead of /usr/share. raidem-0.3.1-syslibs.patch: --- NEW FILE raidem-0.3.1-syslibs.patch --- --- raidem-0.3.1-src/configure.ac.syslibs 2006-04-08 10:48:00.000000000 +0200 +++ raidem-0.3.1-src/configure.ac 2006-04-29 15:01:51.000000000 +0200 @@ -53,7 +53,8 @@ AC_MSG_NOTICE([===== Using lib/adime =====]) && (cd lib/adime; sh fix.sh unix --quick) && AC_MSG_NOTICE([===== Configured adime =====]), - AC_MSG_ERROR([cannot find adime]))) + AC_MSG_ERROR([cannot find adime])), + [`$alcfg --libs`]) AC_HAVE_LIBRARY([glyph-alleg], @@ -104,7 +105,7 @@ #---------------------------------------------------------------- # Optional -if ! ${alrand}; then +if [ "$alrand" != "true" ]; then AC_SUBST(NO_ALRAND, 1) fi @@ -120,7 +121,7 @@ if ${ogg}; then -AC_HAVE_LIBRARY([alogg], +PKG_CHECK_MODULES(AllegroOGG, [AllegroOGG >= 1.0.0], AC_SUBST(HAVE_ALLEGROOGG, 1), AC_CHECK_FILE([lib/allegroogg/Makefile], AC_MSG_NOTICE([===== Using lib/allegroogg =====]), --- raidem-0.3.1-src/src/map-editor/map-proc.m.syslibs 2006-01-20 03:33:33.000000000 +0100 +++ raidem-0.3.1-src/src/map-editor/map-proc.m 2006-04-29 15:01:51.000000000 +0200 @@ -4,7 +4,7 @@ #include #include #include -#include "adime/include/adime.h" +#include #include "common.h" #include "group.h" #include "gui/gui-clip.h" --- raidem-0.3.1-src/Makefile.cfg.in.syslibs 2006-04-08 07:23:28.000000000 +0200 +++ raidem-0.3.1-src/Makefile.cfg.in 2006-04-29 15:01:51.000000000 +0200 @@ -8,6 +8,7 @@ INSTALL := install alcfg := @alcfg@ ftcfg := @ftcfg@ +pkgcfg := @PKG_CONFIG@ # Install paths. prefix := @prefix@ --- raidem-0.3.1-src/Makefile.syslibs 2006-04-08 06:54:03.000000000 +0200 +++ raidem-0.3.1-src/Makefile 2006-04-29 15:13:53.000000000 +0200 @@ -4,8 +4,8 @@ include Makefile.cfg -CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \ - -fno-strict-aliasing \ +CFLAGS += -W -Wall -Wno-deprecated-declarations \ + -fno-strict-aliasing \ -Iinclude -Ilib #CFLAGS += -g3 --- raidem-0.3.1-src/misc/Makefile.all.syslibs 2006-04-08 09:12:44.000000000 +0200 +++ raidem-0.3.1-src/misc/Makefile.all 2006-04-29 15:01:51.000000000 +0200 @@ -30,7 +30,8 @@ CFLAGS += -DNO_OGG else ifdef HAVE_ALLEGROOGG -LDLIBS += -lalogg +LDLIBS += `$(pkgcfg) AllegroOGG --libs` +CFLAGS += `$(pkgcfg) AllegroOGG --cflags` else CFLAGS += -Ilib/allegroogg/include endif # HAVE_ALLEGROOGG @@ -56,11 +57,14 @@ # Glyph-Keeper ifdef HAVE_GLYPH_KEEPER LDLIBS += -lglyph-alleg +CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO else CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -Ilib/glyph-keeper/include endif # HAVE_GLYPH_KEEPER -ifndef HAVE_FREETYPE +ifdef HAVE_FREETYPE +LDLIBS += `$(ftcfg) --libs` +else CFLAGS += -Ilib/freetype/include endif Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raidem/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Mar 2006 18:43:34 -0000 1.2 +++ .cvsignore 1 May 2006 16:34:18 -0000 1.3 @@ -1 +1 @@ -raidem-0.3-src.zip +raidem-0.3.1-src.zip Index: raidem.spec =================================================================== RCS file: /cvs/extras/rpms/raidem/FC-5/raidem.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- raidem.spec 6 Apr 2006 20:28:50 -0000 1.3 +++ raidem.spec 1 May 2006 16:34:18 -0000 1.4 @@ -1,5 +1,5 @@ Name: raidem -Version: 0.3 +Version: 0.3.1 Release: 2%{?dist} Summary: 2d top-down shoot'em up Group: Amusements/Games @@ -10,13 +10,11 @@ Source0: %{name}-%{version}-src.zip Source1: raidem.png Source2: raidem.desktop -Patch0: raidem-0.3-no-mp3.patch -Patch1: raidem-0.3-syslibs.patch -Patch2: raidem-0.3-warn.patch -Patch3: raidem-0.3-loadpng.patch +Patch0: raidem-0.3.1-syslibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-objc glyph-keeper-devel freetype-devel adime-devel -BuildRequires: zziplib-devel libpng-devel desktop-file-utils +BuildRequires: zziplib-devel libpng-devel libid3tag-devel AllegroOGG-devel +BuildRequires: automake desktop-file-utils %description Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II @@ -29,30 +27,27 @@ %prep %setup -q -n %{name}-%{version}-src -%patch0 -p1 -z .no_mp3 -%patch1 -p1 -z .syslibs -%patch2 -p1 -z .warn -%patch3 -p1 -z .loadpng +%patch0 -p1 -z .syslibs # remove all included system libs, to avoid using the included system headers. mv lib/loadpng . rm -fr lib/* mv loadpng lib +aclocal +autoconf %build -make %{?_smp_mflags} lib/loadpng/libldpng.a raid \ - CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Iinclude -Ilib -D__LINUX__ -DNO_MP3 \ - -DNO_ID3TAGS -DNO_FBLEND -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \ - -DRAIDEM_DATA_DIR=\\\"%{_datadir}/%{name}/\\\"" \ - LDLIBS="-lglyph-alleg `freetype-config --libs` lib/loadpng/libldpng.a -lpng \ - -lzzip -ladime `allegro-config --libs` -lz -lpthread -lobjc" +# override _datadir otherwise it expects its datafile directly under /use/share +%configure --datadir=%{_datadir}/%{name} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -#DIY, since the Makefile uses hardcoded ( := assigned) paths. +# DIY, since the Makefile uses hardcoded ( := assigned) paths and install -s +# and install -g games, etc. Fixable but this is easier mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 755 raid $RPM_BUILD_ROOT%{_bindir}/%{name} +install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a data demos maps $RPM_BUILD_ROOT%{_datadir}/%{name} @@ -89,11 +84,20 @@ %doc ChangeLog docs/LICENCE.txt docs/README.txt docs/damages.txt %{_bindir}/%{name} %{_datadir}/%{name} -%{_datadir}/applications/fedora-raidem.desktop -%{_datadir}/icons/hicolor/48x48/apps/raidem.png +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog +* Mon May 1 2006 Hans de Goede 0.3.1-2 +- Fix big finger typo which put the datafiles under /use/share instead + of /usr/share. + +* Sat Apr 29 2006 Hans de Goede 0.3.1-1 +- New upstream release 0.3.1 +- Upstream has merged most patches, dropped. +- Upstream has added ogg support (yeah!), add ogg and id3tag support. + * Sun Apr 2 2006 Hans de Goede 0.3-2 - Add missing RPM_OPT_FLAGS to CFLAGS - Add missing -D__LINUX__ to CFLAGS with this patch2 is no longer needed Index: sources =================================================================== RCS file: /cvs/extras/rpms/raidem/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Mar 2006 18:43:34 -0000 1.2 +++ sources 1 May 2006 16:34:18 -0000 1.3 @@ -1 +1 @@ -7a8de682a0fe122e784cc192b19ece4e raidem-0.3-src.zip +5bb3fa98b43e86afa453f88a8d90bf64 raidem-0.3.1-src.zip --- raidem-0.3-loadpng.patch DELETED --- --- raidem-0.3-no-mp3.patch DELETED --- --- raidem-0.3-syslibs.patch DELETED --- --- raidem-0.3-warn.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 1 16:49:20 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:49:20 -0700 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.9,1.10 Message-ID: <200605011649.k41GnMlb014349@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14332 Modified Files: emacs-auctex.spec Log Message: Add ghostscript to Requires and BuildRequires Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- emacs-auctex.spec 1 May 2006 16:29:28 -0000 1.9 +++ emacs-auctex.spec 1 May 2006 16:49:20 -0000 1.10 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,8 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common -BuildRequires: emacs tetex tetex-dvips texinfo +Requires: emacs emacs-common ghostscript +BuildRequires: emacs tetex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +90,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-7 +- Add ghostscript to Requires and BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 16:50:22 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:50:22 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.9,1.10 Message-ID: <200605011650.k41GoOGC014416@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14399 Modified Files: emacs-auctex.spec Log Message: Add ghostscript to Requires and BuildRequires Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- emacs-auctex.spec 1 May 2006 16:30:41 -0000 1.9 +++ emacs-auctex.spec 1 May 2006 16:50:22 -0000 1.10 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,8 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common -BuildRequires: emacs tetex tetex-dvips texinfo +Requires: emacs emacs-common ghostscript +BuildRequires: emacs tetex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +90,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-7 +- Add ghostscript to Requires and BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 16:51:17 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 09:51:17 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.7,1.8 Message-ID: <200605011651.k41GpJKo014485@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14466 Modified Files: emacs-auctex.spec Log Message: Add ghostscript to Requires and BuildRequires Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- emacs-auctex.spec 1 May 2006 16:31:27 -0000 1.7 +++ emacs-auctex.spec 1 May 2006 16:51:17 -0000 1.8 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,8 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common -BuildRequires: emacs tetex tetex-dvips texinfo +Requires: emacs emacs-common ghostscript +BuildRequires: emacs tetex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +90,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-7 +- Add ghostscript to Requires and BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 17:10:36 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 10:10:36 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.10,1.11 Message-ID: <200605011710.k41HAc5d016785@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16768 Modified Files: emacs-auctex.spec Log Message: Added tetex-latex to BuildRequires Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- emacs-auctex.spec 1 May 2006 16:50:22 -0000 1.10 +++ emacs-auctex.spec 1 May 2006 17:10:35 -0000 1.11 @@ -14,8 +14,9 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common ghostscript -BuildRequires: emacs tetex tetex-dvips texinfo ghostscript +Requires: emacs emacs-common ghostscript +Requires: tetex tetex-latex tetex-dvips tetex-xdvi +BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -92,6 +93,7 @@ %changelog * Mon May 1 2006 Jonathan Underwood - 11.82-7 - Add ghostscript to Requires and BuildRequires +- Add tetex-latex to BuildRequires * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 17:27:18 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 10:27:18 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.11,1.12 Message-ID: <200605011727.k41HRKUs016903@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16886 Modified Files: emacs-auctex.spec Log Message: Bump release tag Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- emacs-auctex.spec 1 May 2006 17:10:35 -0000 1.11 +++ emacs-auctex.spec 1 May 2006 17:27:18 -0000 1.12 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -91,9 +91,11 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-8 +- Add tetex-latex to BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-7 - Add ghostscript to Requires and BuildRequires -- Add tetex-latex to BuildRequires * Mon May 1 2006 Jonathan Underwood - 11.82-6 - Leave .nosearch file in styles directory - this directory shouldn't be in the load-path From fedora-extras-commits at redhat.com Mon May 1 17:48:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 1 May 2006 10:48:50 -0700 Subject: owners owners.list,1.928,1.929 Message-ID: <200605011748.k41Hmqh3017022@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17005 Modified Files: owners.list Log Message: Take ownership of perl-XML-RSS. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.928 retrieving revision 1.929 diff -u -r1.928 -r1.929 --- owners.list 1 May 2006 05:51:55 -0000 1.928 +++ owners.list 1 May 2006 17:48:50 -0000 1.929 @@ -1200,7 +1200,7 @@ Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 1 17:57:44 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 10:57:44 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.8,1.9 Message-ID: <200605011757.k41HvkbT017063@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17046 Modified Files: emacs-auctex.spec Log Message: Bump release tag Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emacs-auctex.spec 1 May 2006 16:51:17 -0000 1.8 +++ emacs-auctex.spec 1 May 2006 17:57:44 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,9 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common ghostscript -BuildRequires: emacs tetex tetex-dvips texinfo ghostscript +Requires: emacs emacs-common ghostscript +Requires: tetex tetex-latex tetex-dvips tetex-xdvi +BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +91,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-8 +- Add tetex-latex to BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-7 - Add ghostscript to Requires and BuildRequires From fedora-extras-commits at redhat.com Mon May 1 17:58:24 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 1 May 2006 10:58:24 -0700 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.10,1.11 Message-ID: <200605011758.k41HwQat017124@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17107 Modified Files: emacs-auctex.spec Log Message: Bump release tag Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- emacs-auctex.spec 1 May 2006 16:49:20 -0000 1.10 +++ emacs-auctex.spec 1 May 2006 17:58:23 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -14,8 +14,9 @@ Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex -Requires: emacs emacs-common ghostscript -BuildRequires: emacs tetex tetex-dvips texinfo ghostscript +Requires: emacs emacs-common ghostscript +Requires: tetex tetex-latex tetex-dvips tetex-xdvi +BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting @@ -90,6 +91,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Mon May 1 2006 Jonathan Underwood - 11.82-8 +- Add tetex-latex to BuildRequires + * Mon May 1 2006 Jonathan Underwood - 11.82-7 - Add ghostscript to Requires and BuildRequires From fedora-extras-commits at redhat.com Mon May 1 19:57:33 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Mon, 1 May 2006 12:57:33 -0700 Subject: rpms/pan/devel pan-0.95-upstream-tree.patch, NONE, 1.1 pan.spec, 1.11, 1.12 Message-ID: <200605011957.k41JvZ8W022138@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22104 Modified Files: pan.spec Added Files: pan-0.95-upstream-tree.patch Log Message: Patch to fix tree view issue (from upstream) pan-0.95-upstream-tree.patch: --- NEW FILE pan-0.95-upstream-tree.patch --- diff -ur pan-0.95/pan/gui/group-pane.cc pan-0.95-patched/pan/gui/group-pane.cc --- pan-0.95/pan/gui/group-pane.cc 2006-04-29 14:39:01.000000000 -0700 +++ pan-0.95-patched/pan/gui/group-pane.cc 2006-05-01 12:50:59.000000000 -0700 @@ -127,20 +127,30 @@ TimeElapsed te; GtkTreeIter iter; GtkTreeIter root (root_iter); - unsigned long groups_added (0); + GtkTreeModel * model (GTK_TREE_MODEL(store)); - for (std::vector::const_iterator it(sorted_groups.begin()), end(sorted_groups.end()); it!=end; ++it) - { + // find the groups that match our criteria + typedef std::vector quark_v; + quark_v matching_groups; + if (!match) + matching_groups = sorted_groups; + else foreach_const (quark_v, sorted_groups, it) { const Quark& groupname (*it); if (!match || match->test (groupname.to_string())) - { - pan_tree_store_append (store, &iter, &root); - populate_row (store, &iter, data, *added_groups.insert(groupname).first); - ++groups_added; + matching_groups.push_back (groupname); + } + + // insert the matching groups + const unsigned long n_rows = matching_groups.size (); + if (n_rows) { + pan_tree_store_append_n (store, &iter, &root, n_rows); + foreach_const (quark_v, matching_groups, it) { + populate_row (store, &iter, data, *added_groups.insert(*it).first); + gtk_tree_model_iter_next (model, &iter); } } - return groups_added; + return n_rows; } } diff -ur pan-0.95/pan/gui/header-pane.cc pan-0.95-patched/pan/gui/header-pane.cc --- pan-0.95/pan/gui/header-pane.cc 2006-04-29 09:33:15.000000000 -0700 +++ pan-0.95-patched/pan/gui/header-pane.cc 2006-05-01 12:50:59.000000000 -0700 @@ -424,15 +424,30 @@ const Quark & parent_mid, const Data::ArticleTree * atree) { + // see if this parent has any children... typedef Data::ArticleTree::articles_t articles_t; articles_t children; atree->get_children (parent_mid, children); + if (children.empty()) + return; + // add all these children... + GtkTreeModel * model (GTK_TREE_MODEL(store)); + GtkTreeIter child, iter; + pan_tree_store_append_n (store, &iter, parent_iter, children.size()); + child = iter; // keep a handle to this first new row... foreach_const (articles_t, children, it) { - GtkTreeIter child_iter; - add_article_to_model (data, store, parent_iter, *it, &child_iter); - add_children_to_model (data, store, &child_iter, (*it)->message_id, atree); + const Article * article (*it); + char * date_str (get_evolution_style_date_string (article->time_posted)); + get_rec (GTK_TREE_MODEL(store), &iter).set_article (article); + pan_tree_store_set (store, &iter, + COL_STATE, get_article_state(data, article), + COL_DATE_STR, date_str, + -1); + g_free (date_str); + add_children_to_model (data, store, &iter, article->message_id, atree); + gtk_tree_model_iter_next (model, &iter); } } @@ -1632,11 +1647,11 @@ // siblings GtkTreeIter up = *iter; do { + tmp = up; if (gtk_tree_model_iter_next (model, &up)) { *iter = up; return true; } - tmp = up; } while (gtk_tree_model_iter_parent (model, &up, &tmp)); return false; diff -ur pan-0.95/pan/gui/pan-tree.cc pan-0.95-patched/pan/gui/pan-tree.cc --- pan-0.95/pan/gui/pan-tree.cc 2006-04-29 14:20:19.000000000 -0700 +++ pan-0.95-patched/pan/gui/pan-tree.cc 2006-05-01 12:50:59.000000000 -0700 @@ -411,13 +411,13 @@ typedef std::vector values_t; - void pan_tree_node_unset_values (PanTreeStore * tree, PanTreeStore::Node * node) + void pan_tree_node_unset_values (PanTreeStore::Node * node, int n_columns) { if (node->columns) { GValue * it = node->columns; - for (int i=0, n=tree->n_columns; icolumns); node->columns = 0; } @@ -427,13 +427,27 @@ pan_tree_finalize (GObject *object) { PanTreeStore * tree = (PanTreeStore*)object; + const int n_columns = tree->n_columns; for (std::deque::iterator it(tree->nodes->begin()), end(tree->nodes->end()); it!=end; ++it) - pan_tree_node_unset_values (tree, &*it); - - delete tree->sort_info; + pan_tree_node_unset_values (&*it, n_columns); + + // tear it all down... delete tree->column_types; - delete tree->nodes; delete tree->reuse_me; + delete tree->nodes; + delete tree->sort_info; + + // ...and salt the earth + tree->column_types = (std::vector*) 0xDEADBEEF; + tree->reuse_me = (std::deque*) 0xDEADBEEF; + tree->nodes = (std::deque*) 0xDEADBEEF; + tree->root = (PanTreeStore::Node*) 0xDEADBEEF; + tree->n_columns = 0xDEADBEEF; + tree->stamp = 0xDEADBEEF; + tree->order = (GtkSortType) 0xDEADBEEF; + tree->sort_column_id = 0xDEADBEEF; + tree->sort_info = (std::map*) 0xDEADBEEF; + (*parent_class->finalize) (object); } @@ -513,6 +527,21 @@ return node; } + + void + pan_tree_alloc_nodes (PanTreeStore * tree, int n_rows, std::vector& setme) + { + const int n_cols = tree->n_columns; + const int pos = tree->nodes->size (); + tree->nodes->resize (pos + n_rows); + setme.resize (n_rows); + for (int r=0; rnodes)[pos+r]; + node->columns = g_new0 (GValue, n_cols); + for (int c=0; ccolumns[c], (*tree->column_types)[c]); + } + } } /*** @@ -569,7 +598,6 @@ **** ***/ -#if 0 namespace { bool the_kids_are_alright (const PanTreeStore::Node * parent) @@ -585,13 +613,71 @@ return true; } } -#endif void -pan_tree_store_insert (PanTreeStore * tree, - GtkTreeIter * iter, - GtkTreeIter * parent, - gint position) +pan_tree_store_insert_n (PanTreeStore * tree, + GtkTreeIter * iter, + GtkTreeIter * parent_it, + int position, + int n_rows) +{ + g_return_if_fail (IS_PAN_TREE_STORE(tree)); + g_return_if_fail (position >= 0); + g_return_if_fail (n_rows > 0); + + // insert the rows + PanTreeStore::Node * parent_node = parent_it ? static_cast(parent_it->user_data) : tree->root; + g_assert (the_kids_are_alright (parent_node)); + std::vector new_children; + pan_tree_alloc_nodes (tree, n_rows, new_children); + const int old_size = parent_node->n_children; + position = std::min (position, old_size); + parent_node->children.insert (parent_node->children.begin()+position, new_children.begin(), new_children.end()); + parent_node->n_children += n_rows; + PanTreeStore::Node** it = &parent_node->children[position]; + for (int i=position, new_size=old_size+n_rows; ichild_index = i; + node->parent = parent_node; + } + + // set the return iter + set_iter (iter, tree->stamp, parent_node->children[position]); + + // emit some signals + GtkTreeModel * model = GTK_TREE_MODEL(tree); + GtkTreeIter walk = *iter;; + GtkTreePath * path = get_path (model, &walk); + it = &parent_node->children[position]; + for (int i=0; istamp, node); + gtk_tree_model_row_inserted (model, path, &walk); + gtk_tree_path_next (path); + } + if (!old_size && parent_node!=tree->root) { + gtk_tree_path_up (path); + gtk_tree_model_row_has_child_toggled (model, path, parent_it); + } + gtk_tree_path_free (path); + g_assert (the_kids_are_alright (parent_node)); +} + +void +pan_tree_store_append_n (PanTreeStore * tree, + GtkTreeIter * iter, + GtkTreeIter * parent_it, + int n_rows) +{ + const int position = gtk_tree_model_iter_n_children (GTK_TREE_MODEL(tree), parent_it); + pan_tree_store_insert_n (tree, iter, parent_it, position, n_rows); +} + +void +pan_tree_store_insert (PanTreeStore * tree, + GtkTreeIter * iter, + GtkTreeIter * parent, + gint position) { g_return_if_fail (IS_PAN_TREE_STORE(tree)); g_return_if_fail (position >= 0); @@ -600,7 +686,7 @@ PanTreeStore::Node * node = parent ? static_cast(parent->user_data) : tree->root; PanTreeStore::Node * child = pan_tree_alloc_node (tree); const int old_size = node->n_children; - //g_assert (the_kids_are_alright (node)); + g_assert (the_kids_are_alright (node)); if (position < old_size) { node->children.insert (node->children.begin()+position, child); ++node->n_children; @@ -608,14 +694,12 @@ PanTreeStore::Node** it = &node->children[position]; for (int i=position; ichild_index = i++; - //g_assert (the_kids_are_alright (node)); } else { child->child_index = old_size; child->parent = node; node->children.push_back (child); ++node->n_children; - //g_assert (the_kids_are_alright (node)); } // set the return iter @@ -626,13 +710,13 @@ GtkTreePath * path = get_path (model, iter); //std::cerr << LINE_ID << " emitting row inserted on " << gtk_tree_path_to_string(path) << std::endl; gtk_tree_model_row_inserted (model, path, iter); - if (node != tree->root) { + if (!old_size && (node != tree->root)) { gtk_tree_path_up (path); //std::cerr << LINE_ID << " emitting row has child toggled on " << gtk_tree_path_to_string(path) << std::endl; gtk_tree_model_row_has_child_toggled (model, path, parent); } gtk_tree_path_free (path); - //g_assert (the_kids_are_alright (node)); + g_assert (the_kids_are_alright (node)); } void @@ -816,7 +900,7 @@ UnsetNodeWalker(PanTreeStore* t): tree(t) {} virtual ~UnsetNodeWalker() {} virtual void operator()(PanTreeStore::Node* node) { - pan_tree_node_unset_values (tree, node); + pan_tree_node_unset_values (node, tree->n_columns); node->parent = 0; node->child_index = -1; //tree->reuse_me->push_back (node); @@ -837,7 +921,7 @@ // check the pre-removal state PanTreeStore::Node * node = static_cast(iter->user_data); PanTreeStore::Node * parent = node->parent; - //g_assert (the_kids_are_alright (parent)); + g_assert (the_kids_are_alright (parent)); // unthread the node const int pos = node->child_index; @@ -848,7 +932,6 @@ for (int i=pos; in_children; ++i, ++it) (*it)->child_index = i; } - //g_assert (the_kids_are_alright (parent)); // revalidate the iterator const bool iter_is_valid_now (pos < parent->n_children); @@ -874,6 +957,6 @@ UnsetNodeWalker walker (tree); node_walk (walker, node); - //g_assert (the_kids_are_alright (parent)); + g_assert (the_kids_are_alright (parent)); return iter_is_valid_now; } diff -ur pan-0.95/pan/gui/pan-tree.h pan-0.95-patched/pan/gui/pan-tree.h --- pan-0.95/pan/gui/pan-tree.h 2006-04-29 14:41:55.000000000 -0700 +++ pan-0.95-patched/pan/gui/pan-tree.h 2006-05-01 12:50:59.000000000 -0700 @@ -73,6 +73,13 @@ int child_index; // this node is its parent's Nth child (zero-based) GValue * columns; // this row's data values. This is a pointer to tree->column_types.size() GValues. Node(): parent(0), n_children(0), child_index(-1), columns(0) {} + ~Node() { + parent = (Node*) 0xDEADBEEF; + children.clear (); + n_children = 0xDEADBEEF; + child_index = 0xDEADBEEF; + columns = (GValue*) 0xDEADBEEF; // its values need to have been unset, and the array freed, before we reach the dtor + } }; int stamp; // used to verify that gtkiters came from this tree int n_columns; // number of columns in the tree @@ -91,7 +98,12 @@ GType pan_tree_store_get_type (void); PanTreeStore* pan_tree_store_new (int n_cols, ...); -// pan_tree_store_append() is the fastest of the various insertion methods +// {insert|append}_n is faster than adding one by one. +// appending is faster than prepending. + +void pan_tree_store_insert_n (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent, int pos, int n); +void pan_tree_store_append_n (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent, int n); +void pan_tree_store_append (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent); void pan_tree_store_append (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent); void pan_tree_store_insert (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent, gint position); void pan_tree_store_insert_before (PanTreeStore*, GtkTreeIter *iter, GtkTreeIter *parent, GtkTreeIter *sibling); Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pan.spec 30 Apr 2006 16:16:39 -0000 1.11 +++ pan.spec 1 May 2006 19:57:33 -0000 1.12 @@ -1,11 +1,12 @@ Summary: A GNOME/GTK+ news reader for X Name: pan Version: 0.95 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 +Patch0: pan-0.95-upstream-tree.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 echo "StartupNotify=true" >> pan.desktop @@ -70,6 +72,10 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Mon May 01 2006 Michael A. Peters - 1:0.95-3 +- Apply a patch from upstream for new tree implementation bug +- (Patch0) + * Sun Apr 30 2006 Michael A. Peters - 1:0.95-2 - Fix rpmlint errors on debug package From fedora-extras-commits at redhat.com Mon May 1 19:58:28 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:28 -0700 Subject: rpms/bitbake - New directory Message-ID: <200605011958.k41JwUPl022261@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22229/bitbake Log Message: Directory /cvs/extras/rpms/bitbake added to the repository From fedora-extras-commits at redhat.com Mon May 1 19:58:28 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:28 -0700 Subject: rpms/bitbake/devel - New directory Message-ID: <200605011958.k41JwUtT022262@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22229/bitbake/devel Log Message: Directory /cvs/extras/rpms/bitbake/devel added to the repository From fedora-extras-commits at redhat.com Mon May 1 19:58:46 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:46 -0700 Subject: owners owners.list,1.929,1.930 Message-ID: <200605011958.k41Jwmve022302@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22274 Modified Files: owners.list Log Message: Added bitbake Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.929 retrieving revision 1.930 diff -u -r1.929 -r1.930 --- owners.list 1 May 2006 17:48:50 -0000 1.929 +++ owners.list 1 May 2006 19:58:46 -0000 1.930 @@ -81,6 +81,7 @@ Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|bin2iso|Convert ".bin" files into ISO or WAV|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|bitbake|BitBake build tool|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 1 19:58:58 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:58 -0700 Subject: rpms/bitbake Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605011959.k41Jx046022339@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22311 Added Files: Makefile import.log Log Message: Setup of module bitbake --- NEW FILE Makefile --- # Top level Makefile for module bitbake all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 1 19:58:59 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:58:59 -0700 Subject: rpms/bitbake/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605011959.k41Jx1g1022342@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22311/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bitbake --- NEW 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 May 1 19:59:54 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:59:54 -0700 Subject: rpms/bitbake import.log,1.1,1.2 Message-ID: <200605011959.k41Jxu5C022421@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22387 Modified Files: import.log Log Message: auto-import bitbake-1.4.0-1 on branch devel from bitbake-1.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bitbake/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 May 2006 19:58:58 -0000 1.1 +++ import.log 1 May 2006 19:59:54 -0000 1.2 @@ -0,0 +1 @@ +bitbake-1_4_0-1:HEAD:bitbake-1.4.0-1.src.rpm:1146513582 From fedora-extras-commits at redhat.com Mon May 1 19:59:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 1 May 2006 12:59:55 -0700 Subject: rpms/bitbake/devel bitbake-path.patch, NONE, 1.1 bitbake.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605012000.k41JxvWW022428@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/bitbake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22387/devel Modified Files: .cvsignore sources Added Files: bitbake-path.patch bitbake.spec Log Message: auto-import bitbake-1.4.0-1 on branch devel from bitbake-1.4.0-1.src.rpm bitbake-path.patch: --- NEW FILE bitbake-path.patch --- --- bitbake-1.3.3/setup.py.orig 2006-02-16 15:52:59.180203928 +0100 +++ bitbake-1.3.3/setup.py 2006-02-16 15:53:10.238522808 +0100 @@ -20,10 +20,10 @@ from distutils.core import setup import os, sys -# bbdir = os.path.join(sys.prefix, 'share', 'bitbake') -# docdir = os.path.join(sys.prefix, 'share', 'doc') -bbdir = os.path.join('bitbake') -docdir = os.path.join('doc') +bbdir = os.path.join(sys.prefix, 'share', 'bitbake') +docdir = os.path.join(sys.prefix, 'share', 'doc') +#bbdir = os.path.join('bitbake') +#docdir = os.path.join('doc') def clean_doc(type): origpath = os.path.abspath(os.curdir) --- NEW FILE bitbake.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: BitBake build tool Name: bitbake Version: 1.4.0 Release: 1%{?dist} License: GPL Group: Development/Tools Source0: ftp://ftp.berlios.de/pub/bitbake/bitbake-%{version}.tar.gz Patch0: bitbake-path.patch URL: http://developer.berlios.de/projects/bitbake/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python, xmlto, lynx BuildArch: noarch %description BitBake is a simple tool for the execution of tasks. It is derived from Portage, which is the package management system used by the Gentoo Linux distribution. It is most commonly used to build packages, and is used as the basis of the OpenEmbedded project. %prep %setup -q %patch0 -p 1 -b .path %build CFLAGS="$RPM_OPT_FLAGS" python setup.py build # Generating docs make -C doc/manual all %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} # Removing extra docs rm -rf %{buildroot}%{_docdir} %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc doc/COPYING.GPL doc/manual/xhtml/ doc/manual/txt/usermanual.txt doc/manual/pdf/usermanual.pdf %{_bindir}/bbimage %{_bindir}/bitbake %{_datadir}/bitbake/ %{python_sitelib}/bb/ %changelog * Wed Apr 26 2006 Andreas Thienemann 1.4.0-1 - Updated to 1.4.0 - Modified to conform to FC4+ .spec syntax. * Thu Apr 13 2006 Andreas Thienemann 1.3.3-2 - Cleaned up .spec. * Thu Feb 16 2006 Andreas Thienemann 1.3.3-1 - Initial spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bitbake/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 May 2006 19:58:58 -0000 1.1 +++ .cvsignore 1 May 2006 19:59:55 -0000 1.2 @@ -0,0 +1 @@ +bitbake-1.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bitbake/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 May 2006 19:58:58 -0000 1.1 +++ sources 1 May 2006 19:59:55 -0000 1.2 @@ -0,0 +1 @@ +fa962beffb66668318684baaffadaaf0 bitbake-1.4.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 20:11:41 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Mon, 1 May 2006 13:11:41 -0700 Subject: rpms/python-logilab-common/FC-5 .cvsignore, 1.6, 1.7 python-logilab-common.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605012011.k41KBhRM024840@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786/FC-5 Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.15.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:12:25 -0000 1.6 +++ .cvsignore 1 May 2006 20:11:41 -0000 1.7 @@ -1 +1 @@ -common-0.14.1.tar.gz +common-0.15.0.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-5/python-logilab-common.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-logilab-common.spec 12 Mar 2006 18:35:47 -0000 1.6 +++ python-logilab-common.spec 1 May 2006 20:11:41 -0000 1.7 @@ -1,8 +1,8 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-logilab-common -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Common libraries for Logilab projects Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.15.0-1 +- Version 0.15.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-2 - Also handle __init__.pyc and __init__.pyo Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:12:25 -0000 1.6 +++ sources 1 May 2006 20:11:41 -0000 1.7 @@ -1 +1 @@ -8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz +1cf6ae5086e1dfd81e8836ac4fa3a206 common-0.15.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 20:11:41 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Mon, 1 May 2006 13:11:41 -0700 Subject: rpms/python-logilab-common/devel .cvsignore, 1.6, 1.7 python-logilab-common.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605012011.k41KBiGI024846@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786/devel Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.15.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:12:25 -0000 1.6 +++ .cvsignore 1 May 2006 20:11:41 -0000 1.7 @@ -1 +1 @@ -common-0.14.1.tar.gz +common-0.15.0.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-logilab-common.spec 12 Mar 2006 18:35:47 -0000 1.6 +++ python-logilab-common.spec 1 May 2006 20:11:41 -0000 1.7 @@ -1,8 +1,8 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-logilab-common -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Common libraries for Logilab projects Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.15.0-1 +- Version 0.15.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-2 - Also handle __init__.pyc and __init__.pyo Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:12:25 -0000 1.6 +++ sources 1 May 2006 20:11:41 -0000 1.7 @@ -1 +1 @@ -8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz +1cf6ae5086e1dfd81e8836ac4fa3a206 common-0.15.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 20:11:40 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Mon, 1 May 2006 13:11:40 -0700 Subject: rpms/python-logilab-common/FC-4 .cvsignore, 1.6, 1.7 python-logilab-common.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605012012.k41KCC7s024851@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24786/FC-4 Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.15.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:12:18 -0000 1.6 +++ .cvsignore 1 May 2006 20:11:40 -0000 1.7 @@ -1 +1 @@ -common-0.14.1.tar.gz +common-0.15.0.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/python-logilab-common.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-logilab-common.spec 12 Mar 2006 18:12:18 -0000 1.5 +++ python-logilab-common.spec 1 May 2006 20:11:40 -0000 1.6 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-logilab-common -Version: 0.14.1 +Version: 0.15.0 Release: 1%{?dist} Summary: Common libraries for Logilab projects @@ -46,6 +46,8 @@ %dir %{_python_sitelib}/logilab/common %dir %{_python_sitelib}/logilab/common/ureports %{_python_sitelib}/logilab/*.py +%{_python_sitelib}/logilab/*.pyc +%ghost %{_python_sitelib}/logilab/*.pyo %{_python_sitelib}/logilab/common/*.py %{_python_sitelib}/logilab/common/*.pyc %ghost %{_python_sitelib}/logilab/common/*.pyo @@ -55,6 +57,12 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.15.0-1 +- Version 0.15.0 + +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-2 +- Also handle __init__.pyc and __init__.pyo + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-1 - Version 0.14.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:12:18 -0000 1.6 +++ sources 1 May 2006 20:11:40 -0000 1.7 @@ -1 +1 @@ -8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz +1cf6ae5086e1dfd81e8836ac4fa3a206 common-0.15.0.tar.gz From fedora-extras-commits at redhat.com Mon May 1 20:36:26 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 13:36:26 -0700 Subject: comps comps-fe5.xml.in,1.42,1.43 Message-ID: <200605012036.k41KaSDj025021@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25004/comps Modified Files: comps-fe5.xml.in Log Message: add gcompris Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- comps-fe5.xml.in 30 Apr 2006 07:31:43 -0000 1.42 +++ comps-fe5.xml.in 1 May 2006 20:36:26 -0000 1.43 @@ -214,6 +214,7 @@ freedoom freedroid freedroidrpg + gcompris gl-117 gnofract4d gnome-sudoku From fedora-extras-commits at redhat.com Mon May 1 20:38:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 1 May 2006 13:38:34 -0700 Subject: comps comps-fe5.xml.in,1.43,1.44 comps-fe6.xml.in,1.6,1.7 Message-ID: <200605012038.k41KcadW025055@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25036/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: move gcompris from Games to Educational Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- comps-fe5.xml.in 1 May 2006 20:36:26 -0000 1.43 +++ comps-fe5.xml.in 1 May 2006 20:38:34 -0000 1.44 @@ -214,7 +214,6 @@ freedoom freedroid freedroidrpg - gcompris gl-117 gnofract4d gnome-sudoku @@ -271,6 +270,7 @@ drgeo drgeo-doc + gcompris gperiodic stellarium tuxtype2 Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- comps-fe6.xml.in 30 Apr 2006 11:24:55 -0000 1.6 +++ comps-fe6.xml.in 1 May 2006 20:38:34 -0000 1.7 @@ -214,7 +214,6 @@ freedoom freedroid freedroidrpg - gcompris gl-117 gnofract4d gnome-sudoku @@ -271,6 +270,7 @@ drgeo drgeo-doc + gcompris gperiodic stellarium tuxtype2 From fedora-extras-commits at redhat.com Mon May 1 20:53:37 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 13:53:37 -0700 Subject: rpms/unifdef - New directory Message-ID: <200605012053.k41Krd4t025543@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25517/unifdef Log Message: Directory /cvs/extras/rpms/unifdef added to the repository From fedora-extras-commits at redhat.com Mon May 1 20:53:37 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 13:53:37 -0700 Subject: rpms/unifdef/devel - New directory Message-ID: <200605012053.k41Krds2025546@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25517/unifdef/devel Log Message: Directory /cvs/extras/rpms/unifdef/devel added to the repository From fedora-extras-commits at redhat.com Mon May 1 20:53:45 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 13:53:45 -0700 Subject: rpms/unifdef Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605012053.k41KrlUi025588@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25554 Added Files: Makefile import.log Log Message: Setup of module unifdef --- NEW FILE Makefile --- # Top level Makefile for module unifdef all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 1 20:53:46 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 13:53:46 -0700 Subject: rpms/unifdef/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605012053.k41KrmT7025591@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25554/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module unifdef --- NEW 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 May 1 21:01:31 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 1 May 2006 14:01:31 -0700 Subject: rpms/unifdef/devel unifdef.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605012102.k41L21tG027787@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27767 Modified Files: .cvsignore sources Added Files: unifdef.spec Log Message: initial import --- NEW FILE unifdef.spec --- Summary: Unifdef tool for removing ifdef'd lines Name: unifdef Version: 1.171 Release: 3%{?dist} License: BSD Group: Development/Languages URL: http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/unifdef/ Source0: unifdef-1.171.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Unifdef is useful for removing ifdefed lines from a file while otherwise leaving the file alone. Unifdef acts on #ifdef, #ifndef, #else, and #endif lines, and it knows only enough about C and C++ to know when one of these is inactive because it is inside a comment, or a single or double quote. %prep %setup -q %build make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT install -d -m0755 $RPM_BUILD_ROOT%{_bindir} install -p -m0755 unifdef $RPM_BUILD_ROOT%{_bindir}/unifdef install -p -m0755 unifdefall.sh $RPM_BUILD_ROOT%{_bindir}/unifdefall.sh install -d -m0755 $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m0644 unifdef.1 $RPM_BUILD_ROOT%{_mandir}/man1/unifdef.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/unifdef %{_bindir}/unifdefall.sh %{_mandir}/man1/unifdef.1.gz %changelog * Wed Apr 26 2006 David Woodhouse - 1.171-2 - Change BuildRoot * Tue Apr 25 2006 David Woodhouse - 1.171-1 - Initial import from FreeBSD CVS Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/unifdef/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 May 2006 20:53:46 -0000 1.1 +++ .cvsignore 1 May 2006 21:01:29 -0000 1.2 @@ -0,0 +1 @@ +unifdef-1.171.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unifdef/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 May 2006 20:53:46 -0000 1.1 +++ sources 1 May 2006 21:01:29 -0000 1.2 @@ -0,0 +1 @@ +657e97bab7cfed217f3a7c73fba9f1cb unifdef-1.171.tar.bz2 From fedora-extras-commits at redhat.com Mon May 1 21:44:39 2006 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Mon, 1 May 2006 14:44:39 -0700 Subject: CVSROOT avail,1.28,1.29 Message-ID: <200605012144.k41Lid8E027980@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27960 Modified Files: avail Log Message: Add bressers to CVSROOT committers, because he's the leader of the Fedora Security team... Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- avail 6 Apr 2006 14:38:13 -0000 1.28 +++ avail 1 May 2006 21:44:36 -0000 1.29 @@ -13,7 +13,7 @@ # Lock down the CVSROOT directory so ACLs make sense unavail | | CVSROOT # Access to all files to policy setters -avail | notting,sopwith,wtogami,katzj,gdk,nman64 | CVSROOT +avail | notting,sopwith,wtogami,katzj,gdk,nman64,bressers | CVSROOT # trusted developers that can add modules avail | | CVSROOT/modules avail | kwade | CVSROOT/avail From fedora-extras-commits at redhat.com Mon May 1 22:33:50 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:33:50 -0700 Subject: rpms/dclib/FC-5 dclib-0.3.7-hashfix.patch, NONE, 1.1 dclib-0.3.7-keylock.patch, NONE, 1.1 dclib-0.3.7-permissions.patch, NONE, 1.1 dclib.spec, 1.7, 1.8 Message-ID: <200605012233.k41MXqOW030303@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/dclib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30277 Modified Files: dclib.spec Added Files: dclib-0.3.7-hashfix.patch dclib-0.3.7-keylock.patch dclib-0.3.7-permissions.patch Log Message: * Mon May 01 2006 Luke Macken 0.3.7-7 - dclib-0.3.7-permissions.patch make valknut use the umask instead of hardcoded permissions - dclib-0.3.7-keylock.patch fixes $Lock-parsing problem - dclib-0.3.7-hashfix.patch fixes production of wrong hashes dclib-0.3.7-hashfix.patch: --- NEW FILE dclib-0.3.7-hashfix.patch --- --- dclib/csearchindex.cpp 2005-04-06 01:21:00.397324222 +0200 +++ dclib/csearchindex.cpp 2005-04-06 01:25:34.469238109 +0200 @@ -419,10 +419,12 @@ CString s; CBase32 base32; CByteArray dst,src; - - if ( hbi < m_pHashIndex->Size() ) + struct hashbaseobject * hbo; + + if ( hbi < m_pHashBaseArray->Size() ) { - src.Append(m_pHashIndex->Data()+hbi,TIGERSIZE); + hbo = (struct hashbaseobject *)(m_pHashBaseArray->Data()+hbi); + src.Append(m_pHashIndex->Data()+hbo->m_nHashIndex,TIGERSIZE); base32.Encode( &dst, &src ); if ( dst.Size() > 0 ) { dclib-0.3.7-keylock.patch: --- NEW FILE dclib-0.3.7-keylock.patch --- --- dclib/cmessagehandler.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/cmessagehandler.cpp 2005-06-26 00:09:12.000000000 +0200 @@ -428,7 +428,7 @@ int i,i1; - i = sContent.Find(' '); + i = sContent.Find(" Pk="); if ( (msg = new CMessageLock()) != 0 ) { dclib-0.3.7-permissions.patch: --- NEW FILE dclib-0.3.7-permissions.patch --- --- dclib/core/cdir.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/core/cdir.cpp 2005-06-24 13:41:38.000000000 +0200 @@ -553,7 +553,7 @@ #ifdef WIN32 if ( _mkdir((Path()+DIRSEPARATOR+s1).Data()) != 0 ) #else - if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),S_IRUSR|S_IWUSR|S_IXUSR) != 0 ) + if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),0777) != 0 ) #endif { if ( errno != EEXIST ) --- dclib/core/filecopy.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/core/filecopy.cpp 2005-06-24 13:40:54.000000000 +0200 @@ -94,7 +94,7 @@ blen = sb.st_blksize; - while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0) + while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) < 0) { if (errno == EEXIST && unlink(to) == 0) continue; --- dclib/ctransfer.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/ctransfer.cpp 2005-06-24 13:39:08.000000000 +0200 @@ -488,7 +488,7 @@ mode |= IO_RAW | IO_WRITEONLY; - if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IROTH ) == FALSE ) + if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IWGRP|MO_IROTH|MO_IWOTH ) == FALSE ) { CallBack_SendError(strerror(errno)); perror("File open"); Index: dclib.spec =================================================================== RCS file: /cvs/extras/rpms/dclib/FC-5/dclib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dclib.spec 13 Feb 2006 21:00:26 -0000 1.7 +++ dclib.spec 1 May 2006 22:33:50 -0000 1.8 @@ -1,14 +1,17 @@ Name: dclib Version: 0.3.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Direct Connect file sharing library Group: Applications/Internet License: GPL URL: http://dcgui.berlios.de/ Source0: http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-%{version}-hashfix.patch +Patch1: %{name}-%{version}-keylock.patch +Patch2: %{name}-%{version}-permissions.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel, openssl-devel, bzip2-devel %description @@ -31,6 +34,9 @@ %prep %setup -q +%patch0 -b .hashfix +%patch1 -b .keylock +%patch2 -b .perms %build @@ -66,6 +72,14 @@ %changelog +* Mon May 01 2006 Luke Macken 0.3.7-7 +- dclib-0.3.7-permissions.patch + make valknut use the umask instead of hardcoded permissions +- dclib-0.3.7-keylock.patch + fixes $Lock-parsing problem +- dclib-0.3.7-hashfix.patch + fixes production of wrong hashes + * Mon Feb 13 2006 Luke Macken 0.3.7-6 - Rebuild for FE5 From fedora-extras-commits at redhat.com Mon May 1 22:37:21 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:37:21 -0700 Subject: rpms/dclib/FC-5 dclib.spec,1.8,1.9 Message-ID: <200605012237.k41MbNhP030441@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/dclib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30424 Modified Files: dclib.spec Log Message: nudge. Index: dclib.spec =================================================================== RCS file: /cvs/extras/rpms/dclib/FC-5/dclib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dclib.spec 1 May 2006 22:33:50 -0000 1.8 +++ dclib.spec 1 May 2006 22:37:21 -0000 1.9 @@ -1,6 +1,6 @@ Name: dclib Version: 0.3.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Direct Connect file sharing library Group: Applications/Internet @@ -72,7 +72,7 @@ %changelog -* Mon May 01 2006 Luke Macken 0.3.7-7 +* Mon May 01 2006 Luke Macken 0.3.7-8 - dclib-0.3.7-permissions.patch make valknut use the umask instead of hardcoded permissions - dclib-0.3.7-keylock.patch From fedora-extras-commits at redhat.com Mon May 1 22:38:26 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:38:26 -0700 Subject: rpms/dclib/FC-4 dclib-0.3.7-hashfix.patch, NONE, 1.1 dclib-0.3.7-keylock.patch, NONE, 1.1 dclib-0.3.7-permissions.patch, NONE, 1.1 dclib.spec, 1.2, 1.3 Message-ID: <200605012238.k41McSOE030520@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/dclib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30494 Modified Files: dclib.spec Added Files: dclib-0.3.7-hashfix.patch dclib-0.3.7-keylock.patch dclib-0.3.7-permissions.patch Log Message: * Mon May 01 2006 Luke Macken 0.3.7-8 - dclib-0.3.7-permissions.patch make valknut use the umask instead of hardcoded permissions - dclib-0.3.7-keylock.patch fixes $Lock-parsing problem - dclib-0.3.7-hashfix.patch fixes production of wrong hashes dclib-0.3.7-hashfix.patch: --- NEW FILE dclib-0.3.7-hashfix.patch --- --- dclib/csearchindex.cpp 2005-04-06 01:21:00.397324222 +0200 +++ dclib/csearchindex.cpp 2005-04-06 01:25:34.469238109 +0200 @@ -419,10 +419,12 @@ CString s; CBase32 base32; CByteArray dst,src; - - if ( hbi < m_pHashIndex->Size() ) + struct hashbaseobject * hbo; + + if ( hbi < m_pHashBaseArray->Size() ) { - src.Append(m_pHashIndex->Data()+hbi,TIGERSIZE); + hbo = (struct hashbaseobject *)(m_pHashBaseArray->Data()+hbi); + src.Append(m_pHashIndex->Data()+hbo->m_nHashIndex,TIGERSIZE); base32.Encode( &dst, &src ); if ( dst.Size() > 0 ) { dclib-0.3.7-keylock.patch: --- NEW FILE dclib-0.3.7-keylock.patch --- --- dclib/cmessagehandler.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/cmessagehandler.cpp 2005-06-26 00:09:12.000000000 +0200 @@ -428,7 +428,7 @@ int i,i1; - i = sContent.Find(' '); + i = sContent.Find(" Pk="); if ( (msg = new CMessageLock()) != 0 ) { dclib-0.3.7-permissions.patch: --- NEW FILE dclib-0.3.7-permissions.patch --- --- dclib/core/cdir.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/core/cdir.cpp 2005-06-24 13:41:38.000000000 +0200 @@ -553,7 +553,7 @@ #ifdef WIN32 if ( _mkdir((Path()+DIRSEPARATOR+s1).Data()) != 0 ) #else - if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),S_IRUSR|S_IWUSR|S_IXUSR) != 0 ) + if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),0777) != 0 ) #endif { if ( errno != EEXIST ) --- dclib/core/filecopy.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/core/filecopy.cpp 2005-06-24 13:40:54.000000000 +0200 @@ -94,7 +94,7 @@ blen = sb.st_blksize; - while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0) + while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) < 0) { if (errno == EEXIST && unlink(to) == 0) continue; --- dclib/ctransfer.cpp 2005-06-24 13:32:11.000000000 +0200 +++ dclib/ctransfer.cpp 2005-06-24 13:39:08.000000000 +0200 @@ -488,7 +488,7 @@ mode |= IO_RAW | IO_WRITEONLY; - if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IROTH ) == FALSE ) + if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IWGRP|MO_IROTH|MO_IWOTH ) == FALSE ) { CallBack_SendError(strerror(errno)); perror("File open"); Index: dclib.spec =================================================================== RCS file: /cvs/extras/rpms/dclib/FC-4/dclib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dclib.spec 3 Oct 2005 19:50:31 -0000 1.2 +++ dclib.spec 1 May 2006 22:38:26 -0000 1.3 @@ -1,14 +1,17 @@ Name: dclib Version: 0.3.7 -Release: 3%{?dist} +Release: 8%{?dist} Summary: Direct Connect file sharing library Group: Applications/Internet License: GPL URL: http://dcgui.berlios.de/ Source0: http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-%{version}-hashfix.patch +Patch1: %{name}-%{version}-keylock.patch +Patch2: %{name}-%{version}-permissions.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel, openssl-devel, bzip2-devel %description @@ -31,6 +34,9 @@ %prep %setup -q +%patch0 -b .hashfix +%patch1 -b .keylock +%patch2 -b .perms %build @@ -66,6 +72,23 @@ %changelog +* Mon May 01 2006 Luke Macken 0.3.7-8 +- dclib-0.3.7-permissions.patch + make valknut use the umask instead of hardcoded permissions +- dclib-0.3.7-keylock.patch + fixes $Lock-parsing problem +- dclib-0.3.7-hashfix.patch + fixes production of wrong hashes + +* Mon Feb 13 2006 Luke Macken 0.3.7-6 +- Rebuild for FE5 + +* Tue Dec 27 2005 Luke Macken 0.3.7-5 +- Rebuild + +* Thu Nov 10 2005 Luke Macken 0.3.7-4 +- Rebuild for new openssl + * Mon Oct 03 2005 Luke Macken 0.3.7-3 - Add libxml2-devel to Requires From fedora-extras-commits at redhat.com Mon May 1 22:42:21 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:42:21 -0700 Subject: rpms/valknut/FC-4 valknut-0.3.7-extra-qualification.patch, NONE, 1.1 valknut.desktop, 1.1, 1.2 valknut.spec, 1.2, 1.3 Message-ID: <200605012242.k41MgNOo030633@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/valknut/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30595/FC-4 Modified Files: valknut.desktop valknut.spec Added Files: valknut-0.3.7-extra-qualification.patch Log Message: * Sun Apr 30 2006 Luke Macken 0.3.7-8 - Execute with --disable-tray in desktop file, since it is horribly broken. * Tue Feb 28 2006 Luke Macken 0.3.7-7 - Add patch to remove extra qualification build error valknut-0.3.7-extra-qualification.patch: --- NEW FILE valknut-0.3.7-extra-qualification.patch --- --- valknut/dciconloader.h.orig 2006-02-28 13:47:46.000000000 -0500 +++ valknut/dciconloader.h 2006-02-28 13:48:02.000000000 -0500 @@ -122,7 +122,7 @@ private: /** */ - QPixmap DCIconLoader::LoadPixmap( QString file ); + QPixmap LoadPixmap( QString file ); /** */ PixmapMap m_PixmapMap; Index: valknut.desktop =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-4/valknut.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- valknut.desktop 4 Oct 2005 16:58:43 -0000 1.1 +++ valknut.desktop 1 May 2006 22:42:21 -0000 1.2 @@ -3,7 +3,7 @@ Name=Valknut Comment=Direct Connect client Icon=valknut.png -Exec=valknut +Exec=valknut --disable-tray Terminal=false Type=Application Categories=Network;Application;X-Fedora; Index: valknut.spec =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-4/valknut.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- valknut.spec 4 Oct 2005 17:13:18 -0000 1.2 +++ valknut.spec 1 May 2006 22:42:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: valknut Version: 0.3.7 -Release: 4%{?dist} +Release: 8%{?dist} Summary: Valknut is a QT Direct Connect client Group: Applications/Internet @@ -9,6 +9,7 @@ Source0: http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz Source1: valknut.desktop Source2: valknut.png +Patch0: %{name}-%{version}-extra-qualification.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dclib-devel, qt-devel, desktop-file-utils, bzip2-devel @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 %build @@ -56,6 +58,18 @@ %changelog +* Sun Apr 30 2006 Luke Macken 0.3.7-8 +- Execute with --disable-tray in desktop file, since it is horribly broken. + +* Tue Feb 28 2006 Luke Macken 0.3.7-7 +- Add patch to remove extra qualification build error + +* Wed Feb 15 2006 Luke Macken 0.3.7-6 +- Rebuild for FE5 + +* Wed Nov 09 2005 Luke Macken 0.3.7-5 +- Rebuild for new openssl + * Tue Oct 03 2005 Luke Macken 0.3.7-4 - Add openssl-devel to BuildRequires From fedora-extras-commits at redhat.com Mon May 1 22:42:22 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:42:22 -0700 Subject: rpms/valknut/FC-5 valknut.desktop,1.1,1.2 valknut.spec,1.5,1.6 Message-ID: <200605012242.k41MgOhS030638@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/valknut/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30595/FC-5 Modified Files: valknut.desktop valknut.spec Log Message: * Sun Apr 30 2006 Luke Macken 0.3.7-8 - Execute with --disable-tray in desktop file, since it is horribly broken. * Tue Feb 28 2006 Luke Macken 0.3.7-7 - Add patch to remove extra qualification build error Index: valknut.desktop =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-5/valknut.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- valknut.desktop 4 Oct 2005 16:58:43 -0000 1.1 +++ valknut.desktop 1 May 2006 22:42:21 -0000 1.2 @@ -3,7 +3,7 @@ Name=Valknut Comment=Direct Connect client Icon=valknut.png -Exec=valknut +Exec=valknut --disable-tray Terminal=false Type=Application Categories=Network;Application;X-Fedora; Index: valknut.spec =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-5/valknut.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- valknut.spec 28 Feb 2006 18:57:35 -0000 1.5 +++ valknut.spec 1 May 2006 22:42:21 -0000 1.6 @@ -1,6 +1,6 @@ Name: valknut Version: 0.3.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Valknut is a QT Direct Connect client Group: Applications/Internet @@ -58,6 +58,9 @@ %changelog +* Sun Apr 30 2006 Luke Macken 0.3.7-8 +- Execute with --disable-tray in desktop file, since it is horribly broken. + * Tue Feb 28 2006 Luke Macken 0.3.7-7 - Add patch to remove extra qualification build error From fedora-extras-commits at redhat.com Mon May 1 22:44:09 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 1 May 2006 15:44:09 -0700 Subject: rpms/valknut/FC-5 valknut.spec,1.6,1.7 Message-ID: <200605012244.k41MiBYF030730@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/valknut/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30713 Modified Files: valknut.spec Log Message: bump Index: valknut.spec =================================================================== RCS file: /cvs/extras/rpms/valknut/FC-5/valknut.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- valknut.spec 1 May 2006 22:42:21 -0000 1.6 +++ valknut.spec 1 May 2006 22:44:09 -0000 1.7 @@ -1,6 +1,6 @@ Name: valknut Version: 0.3.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Valknut is a QT Direct Connect client Group: Applications/Internet @@ -58,6 +58,9 @@ %changelog +* Mon May 01 2006 Luke Macken 0.3.7-9 +- Bump + * Sun Apr 30 2006 Luke Macken 0.3.7-8 - Execute with --disable-tray in desktop file, since it is horribly broken. From fedora-extras-commits at redhat.com Mon May 1 23:27:20 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 1 May 2006 16:27:20 -0700 Subject: rpms/gossip/devel .cvsignore, 1.6, 1.7 gossip.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200605012327.k41NRM0X000637@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv616 Modified Files: .cvsignore gossip.spec sources Log Message: * Mon May 1 2006 Brian Pepple - 0.11-3 - Update to 0.11. - Add scriptlets for gtk+ icon cache. - Add icons to files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Mar 2006 20:51:36 -0000 1.6 +++ .cvsignore 1 May 2006 23:27:20 -0000 1.7 @@ -1 +1 @@ -gossip-0.10.2.tar.bz2 +gossip-0.11.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gossip.spec 18 Mar 2006 20:51:36 -0000 1.16 +++ gossip.spec 1 May 2006 23:27:20 -0000 1.17 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: gossip -Version: 0.10.2 +Version: 0.11 Release: 3%{?dist} Summary: Gnome Jabber Client @@ -85,6 +85,10 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %preun @@ -97,6 +101,10 @@ %postun scrollkeeper-update -q || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang @@ -106,7 +114,8 @@ %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_sysconfdir}/sound/events/%{name}.soundlist %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %{_datadir}/%{name}/*.png @@ -121,6 +130,11 @@ %changelog +* Mon May 1 2006 Brian Pepple - 0.11-3 +- Update to 0.11. +- Add scriptlets for gtk+ icon cache. +- Add icons to files. + * Sat Mar 18 2006 Brian Pepple - 0.10.2-3 - Update to 0.10.2. - Add BR for iso-codes-devel & gnome-doc-utils. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Mar 2006 20:51:36 -0000 1.6 +++ sources 1 May 2006 23:27:20 -0000 1.7 @@ -1 +1 @@ -f53dbf1fa951c620dbf4b95560e51c8c gossip-0.10.2.tar.bz2 +4b2720f96df77e9c35f5eb7abbb10dab gossip-0.11.tar.bz2 From fedora-extras-commits at redhat.com Mon May 1 23:59:29 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 1 May 2006 16:59:29 -0700 Subject: rpms/bsd-games/devel bsd-games.spec,1.2,1.3 config.params,1.1,1.2 Message-ID: <200605012359.k41NxVH9000852@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828 Modified Files: bsd-games.spec config.params Log Message: Remove banner (conflict with a similar package in FE) Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bsd-games.spec 29 Apr 2006 22:58:16 -0000 1.2 +++ bsd-games.spec 1 May 2006 23:59:29 -0000 1.3 @@ -91,7 +91,6 @@ %{_bindir}/backgammon %{_bindir}/teachgammon %attr(2755,root,games) %{_bindir}/battlestar -%{_bindir}/banner %{_bindir}/boggle %{_bindir}/bcd %{_bindir}/caesar @@ -150,6 +149,9 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Mon May 1 2006 Wart 2.17-10 +- Remove banner (conflict with a similar package in FE) + * Sat Apr 29 2006 Wart 2.17-9 - Simplify files section - Remove unnecessary comment Index: config.params =================================================================== RCS file: /cvs/extras/rpms/bsd-games/devel/config.params,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.params 29 Apr 2006 15:34:43 -0000 1.1 +++ config.params 1 May 2006 23:59:29 -0000 1.2 @@ -7,7 +7,7 @@ bsd_games_cfg_non_interactive=y bsd_games_cfg_install_prefix=@DESTDIR@ -bsd_games_cfg_no_build_dirs="countmail dm factor fortune" +bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune" bsd_games_cfg_gamesdir=@bindir@ bsd_games_cfg_sbindir=@sbindir@ bsd_games_cfg_libexecdir=@libdir@ From fedora-extras-commits at redhat.com Mon May 1 23:59:38 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 1 May 2006 16:59:38 -0700 Subject: rpms/gossip/FC-5 .cvsignore, 1.6, 1.7 gossip.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200605012359.k41NxeFe000879@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv858 Modified Files: .cvsignore gossip.spec sources Log Message: * Mon May 1 2006 Brian Pepple - 0.11-2 - Update to 0.11. - Add scriptlets for gtk+ icon cache. - Add icons to files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Mar 2006 20:54:32 -0000 1.6 +++ .cvsignore 1 May 2006 23:59:38 -0000 1.7 @@ -1 +1 @@ -gossip-0.10.2.tar.bz2 +gossip-0.11.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/gossip.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gossip.spec 18 Mar 2006 20:54:32 -0000 1.16 +++ gossip.spec 1 May 2006 23:59:38 -0000 1.17 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: gossip -Version: 0.10.2 +Version: 0.11 Release: 2%{?dist} Summary: Gnome Jabber Client @@ -85,6 +85,10 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %preun @@ -97,6 +101,10 @@ %postun scrollkeeper-update -q || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang @@ -106,7 +114,8 @@ %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_sysconfdir}/sound/events/%{name}.soundlist %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %{_datadir}/%{name}/*.png @@ -121,6 +130,11 @@ %changelog +* Mon May 1 2006 Brian Pepple - 0.11-2 +- Update to 0.11. +- Add scriptlets for gtk+ icon cache. +- Add icons to files. + * Sat Mar 18 2006 Brian Pepple - 0.10.2-2 - Update to 0.10.2. - Add BR for iso-codes-devel & gnome-doc-utils. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Mar 2006 20:54:32 -0000 1.6 +++ sources 1 May 2006 23:59:38 -0000 1.7 @@ -1 +1 @@ -f53dbf1fa951c620dbf4b95560e51c8c gossip-0.10.2.tar.bz2 +4b2720f96df77e9c35f5eb7abbb10dab gossip-0.11.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 00:00:30 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 1 May 2006 17:00:30 -0700 Subject: rpms/bsd-games/devel bsd-games.spec,1.3,1.4 Message-ID: <200605020000.k4200WIr000954@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv935 Modified Files: bsd-games.spec Log Message: Forgot to bump Release tag. Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bsd-games.spec 1 May 2006 23:59:29 -0000 1.3 +++ bsd-games.spec 2 May 2006 00:00:30 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Amusements/Games URL: ftp://metalab.unc.edu/pub/Linux/games/ From fedora-extras-commits at redhat.com Tue May 2 00:12:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 1 May 2006 17:12:02 -0700 Subject: rpms/bsd-games/FC-4 bsd-games.spec,1.2,1.3 config.params,1.1,1.2 Message-ID: <200605020012.k420C41o003197@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3162/FC-4 Modified Files: bsd-games.spec config.params Log Message: Remove 'banner' due to conflict with existing FE package. Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/FC-4/bsd-games.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bsd-games.spec 29 Apr 2006 22:59:13 -0000 1.2 +++ bsd-games.spec 2 May 2006 00:12:02 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Amusements/Games URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -91,7 +91,6 @@ %{_bindir}/backgammon %{_bindir}/teachgammon %attr(2755,root,games) %{_bindir}/battlestar -%{_bindir}/banner %{_bindir}/boggle %{_bindir}/bcd %{_bindir}/caesar @@ -150,6 +149,9 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Mon May 1 2006 Wart 2.17-10 +- Remove banner (conflict with a similar package in FE) + * Sat Apr 29 2006 Wart 2.17-9 - Simplify files section - Remove unnecessary comment Index: config.params =================================================================== RCS file: /cvs/extras/rpms/bsd-games/FC-4/config.params,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.params 29 Apr 2006 15:34:43 -0000 1.1 +++ config.params 2 May 2006 00:12:02 -0000 1.2 @@ -7,7 +7,7 @@ bsd_games_cfg_non_interactive=y bsd_games_cfg_install_prefix=@DESTDIR@ -bsd_games_cfg_no_build_dirs="countmail dm factor fortune" +bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune" bsd_games_cfg_gamesdir=@bindir@ bsd_games_cfg_sbindir=@sbindir@ bsd_games_cfg_libexecdir=@libdir@ From fedora-extras-commits at redhat.com Tue May 2 00:12:03 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 1 May 2006 17:12:03 -0700 Subject: rpms/bsd-games/FC-5 bsd-games.spec,1.2,1.3 config.params,1.1,1.2 Message-ID: <200605020012.k420C5IA003202@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3162/FC-5 Modified Files: bsd-games.spec config.params Log Message: Remove 'banner' due to conflict with existing FE package. Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/FC-5/bsd-games.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bsd-games.spec 29 Apr 2006 22:59:14 -0000 1.2 +++ bsd-games.spec 2 May 2006 00:12:02 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Amusements/Games URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -91,7 +91,6 @@ %{_bindir}/backgammon %{_bindir}/teachgammon %attr(2755,root,games) %{_bindir}/battlestar -%{_bindir}/banner %{_bindir}/boggle %{_bindir}/bcd %{_bindir}/caesar @@ -150,6 +149,9 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Mon May 1 2006 Wart 2.17-10 +- Remove banner (conflict with a similar package in FE) + * Sat Apr 29 2006 Wart 2.17-9 - Simplify files section - Remove unnecessary comment Index: config.params =================================================================== RCS file: /cvs/extras/rpms/bsd-games/FC-5/config.params,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.params 29 Apr 2006 15:34:43 -0000 1.1 +++ config.params 2 May 2006 00:12:02 -0000 1.2 @@ -7,7 +7,7 @@ bsd_games_cfg_non_interactive=y bsd_games_cfg_install_prefix=@DESTDIR@ -bsd_games_cfg_no_build_dirs="countmail dm factor fortune" +bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune" bsd_games_cfg_gamesdir=@bindir@ bsd_games_cfg_sbindir=@sbindir@ bsd_games_cfg_libexecdir=@libdir@ From fedora-extras-commits at redhat.com Tue May 2 00:18:02 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 17:18:02 -0700 Subject: rpms/mod_geoip/FC-5 .cvsignore, 1.2, 1.3 mod_geoip.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605020018.k420I4wm003407@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3386 Modified Files: .cvsignore mod_geoip.spec sources Log Message: * Tue May 2 2006 Michael Fleming 1.1.8-1 - New upstream release (also fixes #189035) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 22:45:12 -0000 1.2 +++ .cvsignore 2 May 2006 00:18:02 -0000 1.3 @@ -1 +1 @@ -mod_geoip2_1.1.7.tar.gz +mod_geoip2_1.1.8.tar.gz Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-5/mod_geoip.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_geoip.spec 19 Mar 2006 01:29:53 -0000 1.2 +++ mod_geoip.spec 2 May 2006 00:18:02 -0000 1.3 @@ -1,7 +1,7 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip -Version: 1.1.7 -Release: 3%{?dist} +Version: 1.1.8 +Release: 1%{?dist} License: Apache Software License Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip @@ -46,6 +46,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Tue May 2 2006 Michael Fleming 1.1.8-1 +- New upstream release (also fixes #189035) + * Sun Mar 19 2006 Michael Fleming 1.1.7-3 - Bump for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 22:45:12 -0000 1.2 +++ sources 2 May 2006 00:18:02 -0000 1.3 @@ -1 +1 @@ -ca02b8b955d95d659037f8c633908ae9 mod_geoip2_1.1.7.tar.gz +165607221c6a95ace7d840c5aea39696 mod_geoip2_1.1.8.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:20:21 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 1 May 2006 17:20:21 -0700 Subject: rpms/mod_geoip/FC-4 .cvsignore, 1.2, 1.3 mod_geoip.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605020020.k420KNWg003483@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3462 Modified Files: .cvsignore mod_geoip.spec sources Log Message: * Tue May 2 2006 Michael Fleming 1.1.8-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 22:45:12 -0000 1.2 +++ .cvsignore 2 May 2006 00:20:21 -0000 1.3 @@ -1 +1 @@ -mod_geoip2_1.1.7.tar.gz +mod_geoip2_1.1.8.tar.gz Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-4/mod_geoip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_geoip.spec 20 Feb 2006 22:45:12 -0000 1.1 +++ mod_geoip.spec 2 May 2006 00:20:21 -0000 1.2 @@ -1,7 +1,7 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip -Version: 1.1.7 -Release: 2%{?dist} +Version: 1.1.8 +Release: 1%{?dist} License: Apache Software License Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip @@ -46,6 +46,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Tue May 2 2006 Michael Fleming 1.1.8-1 +- New upstream release + * Sat Feb 18 2006 Michael Fleming 1.1.7-2 - Small cleanups, including a saner Requires: for httpd - Don't strip the binary Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 22:45:12 -0000 1.2 +++ sources 2 May 2006 00:20:21 -0000 1.3 @@ -1 +1 @@ -ca02b8b955d95d659037f8c633908ae9 mod_geoip2_1.1.7.tar.gz +165607221c6a95ace7d840c5aea39696 mod_geoip2_1.1.8.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:33:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:33:52 -0700 Subject: rpms/perl-Email-MIME - New directory Message-ID: <200605020033.k420Xso3003658@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3637/perl-Email-MIME Log Message: Directory /cvs/extras/rpms/perl-Email-MIME added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:33:53 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:33:53 -0700 Subject: rpms/perl-Email-MIME/devel - New directory Message-ID: <200605020034.k420Xt2s003661@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3637/perl-Email-MIME/devel Log Message: Directory /cvs/extras/rpms/perl-Email-MIME/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:34:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:34:14 -0700 Subject: rpms/perl-Email-MIME Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605020034.k420YG0o003717@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3682 Added Files: Makefile import.log Log Message: Setup of module perl-Email-MIME --- NEW FILE Makefile --- # Top level Makefile for module perl-Email-MIME all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 00:34:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:34:15 -0700 Subject: rpms/perl-Email-MIME/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605020034.k420YHKE003720@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3682/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Email-MIME --- NEW 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 May 2 00:34:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:34:43 -0700 Subject: rpms/perl-Email-MIME import.log,1.1,1.2 Message-ID: <200605020034.k420YjPN003786@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3753 Modified Files: import.log Log Message: auto-import perl-Email-MIME-1.82-2 on branch devel from perl-Email-MIME-1.82-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 00:34:14 -0000 1.1 +++ import.log 2 May 2006 00:34:43 -0000 1.2 @@ -0,0 +1 @@ +perl-Email-MIME-1_82-2:HEAD:perl-Email-MIME-1.82-2.src.rpm:1146530075 From fedora-extras-commits at redhat.com Tue May 2 00:34:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:34:44 -0700 Subject: rpms/perl-Email-MIME/devel perl-Email-MIME.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605020034.k420Ykiq003791@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3753/devel Modified Files: .cvsignore sources Added Files: perl-Email-MIME.spec Log Message: auto-import perl-Email-MIME-1.82-2 on branch devel from perl-Email-MIME-1.82-2.src.rpm --- NEW FILE perl-Email-MIME.spec --- Name: perl-Email-MIME Version: 1.82 Release: 2%{?dist} Summary: Easy MIME message parsing Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Email-MIME/ Source0: http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Email::MIME::ContentType) >= 1.0 BuildRequires: perl(Email::MIME::Encodings) >= 1.3 BuildRequires: perl(Email::Simple) >= 1.91 BuildRequires: perl(MIME::Types) >= 1.13 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Email::Simple) >= 1.91 Requires: perl(MIME::Types) >= 1.13 %description This is an extension of the Email::Simple module, to handle MIME encoded messages. It takes a message as a string, splits it up into its constituent parts, and allows you access to various parts of the message. Headers are decoded from MIME encoding. %prep %setup -q -n Email-MIME-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Email/ %{_mandir}/man3/*.3pm* %changelog * Thu Sep 8 2005 Jose Pedro Oliveira - 1.82-2 - Requires Email::Simple (rpm "use base" shortcoming). * Thu Sep 08 2005 Jose Pedro Oliveira - 1.82-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 00:34:14 -0000 1.1 +++ .cvsignore 2 May 2006 00:34:44 -0000 1.2 @@ -0,0 +1 @@ +Email-MIME-1.82.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 00:34:14 -0000 1.1 +++ sources 2 May 2006 00:34:44 -0000 1.2 @@ -0,0 +1 @@ +fe917f83f7ff5f6425e388857a7400eb Email-MIME-1.82.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:35:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:35:43 -0700 Subject: rpms/perl-Email-MIME-Modifier - New directory Message-ID: <200605020035.k420ZjlO003937@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3911/perl-Email-MIME-Modifier Log Message: Directory /cvs/extras/rpms/perl-Email-MIME-Modifier added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:35:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:35:44 -0700 Subject: rpms/perl-Email-MIME-Modifier/devel - New directory Message-ID: <200605020035.k420Zk1a003940@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3911/perl-Email-MIME-Modifier/devel Log Message: Directory /cvs/extras/rpms/perl-Email-MIME-Modifier/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:36:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:36:05 -0700 Subject: rpms/perl-Email-MIME-Modifier Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605020036.k420a7bp003989@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3961 Added Files: Makefile import.log Log Message: Setup of module perl-Email-MIME-Modifier --- NEW FILE Makefile --- # Top level Makefile for module perl-Email-MIME-Modifier all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 00:36:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:36:05 -0700 Subject: rpms/perl-Email-MIME-Modifier/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605020036.k420a7oB003992@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3961/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Email-MIME-Modifier --- NEW 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 May 2 00:36:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:36:37 -0700 Subject: rpms/perl-Email-MIME-Modifier import.log,1.1,1.2 Message-ID: <200605020036.k420adKn004061@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4026 Modified Files: import.log Log Message: auto-import perl-Email-MIME-Modifier-1.42-2 on branch devel from perl-Email-MIME-Modifier-1.42-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 00:36:05 -0000 1.1 +++ import.log 2 May 2006 00:36:37 -0000 1.2 @@ -0,0 +1 @@ +perl-Email-MIME-Modifier-1_42-2:HEAD:perl-Email-MIME-Modifier-1.42-2.src.rpm:1146530189 From fedora-extras-commits at redhat.com Tue May 2 00:36:38 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:36:38 -0700 Subject: rpms/perl-Email-MIME-Modifier/devel perl-Email-MIME-Modifier.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605020036.k420ae6x004066@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Email-MIME-Modifier/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4026/devel Modified Files: .cvsignore sources Added Files: perl-Email-MIME-Modifier.spec Log Message: auto-import perl-Email-MIME-Modifier-1.42-2 on branch devel from perl-Email-MIME-Modifier-1.42-2.src.rpm --- NEW FILE perl-Email-MIME-Modifier.spec --- Name: perl-Email-MIME-Modifier Version: 1.42 Release: 2%{?dist} Summary: Modify Email::MIME Objects Easily Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Email-MIME-Modifier/ Source0: http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-Modifier-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Email::MessageID) >= 1.2 BuildRequires: perl(Email::MIME) >= 1.82 BuildRequires: perl(Email::MIME::Encodings) >= 1.3 BuildRequires: perl(Email::MIME::ContentType) >= 1.0 BuildRequires: perl(Email::Simple) >= 1.92 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Provides a number of useful methods for manipulating MIME messages. These method are declared in the "Email::MIME" namespace, and are used with "Email::MIME" objects. %prep %setup -q -n Email-MIME-Modifier-%{version} # Provides: filter perl(Email::MIME) cat <<__EOF__ > %{name}-filterprovides #!/bin/sh /usr/lib/rpm/perl.prov \$* | grep -v 'perl(Email::MIME)' __EOF__ %define __perl_provides %{_builddir}/Email-MIME-Modifier-%{version}/%{name}-filterprovides chmod +x %{__perl_provides} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Email/MIME/ %{_mandir}/man3/*.3pm* %changelog * Thu Sep 8 2005 Jose Pedro Oliveira - 1.42-2 - Filter the Email::MIME provide. * Thu Sep 08 2005 Jose Pedro Oliveira - 1.42-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 00:36:05 -0000 1.1 +++ .cvsignore 2 May 2006 00:36:38 -0000 1.2 @@ -0,0 +1 @@ +Email-MIME-Modifier-1.42.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Email-MIME-Modifier/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 00:36:05 -0000 1.1 +++ sources 2 May 2006 00:36:38 -0000 1.2 @@ -0,0 +1 @@ +3acf1c19da93334be37f3f9a288acd91 Email-MIME-Modifier-1.42.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:38:54 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:38:54 -0700 Subject: owners owners.list,1.930,1.931 Message-ID: <200605020038.k420cu7n004139@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4122 Modified Files: owners.list Log Message: New packages: - #190315 : perl-Email-MIME - Easy MIME message parsing - #190316 : perl-Email-MIME-Modifier - Modify Email::MIME Objects Easily Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.930 retrieving revision 1.931 diff -u -r1.930 -r1.931 --- owners.list 1 May 2006 19:58:46 -0000 1.930 +++ owners.list 2 May 2006 00:38:53 -0000 1.931 @@ -972,8 +972,10 @@ Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-Address|RFC 2822 Address Parsing and Creation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-MessageID|Generate world unique message-ids|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Email-MIME|Easy MIME message parsing|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-MIME-ContentType|Parse a MIME Content-Type Header|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-MIME-Encodings|Unified interface to MIME encoding and decoding|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Email-MIME-Modifier|Modify Email::MIME Objects Easily|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 00:47:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:47:56 -0700 Subject: rpms/perl-HTTP-Request-Params - New directory Message-ID: <200605020047.k420lwjs004278@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4250/perl-HTTP-Request-Params Log Message: Directory /cvs/extras/rpms/perl-HTTP-Request-Params added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:47:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:47:57 -0700 Subject: rpms/perl-HTTP-Request-Params/devel - New directory Message-ID: <200605020047.k420lxq0004281@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4250/perl-HTTP-Request-Params/devel Log Message: Directory /cvs/extras/rpms/perl-HTTP-Request-Params/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 00:48:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:48:13 -0700 Subject: rpms/perl-HTTP-Request-Params Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605020048.k420mFXp004330@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4297 Added Files: Makefile import.log Log Message: Setup of module perl-HTTP-Request-Params --- NEW FILE Makefile --- # Top level Makefile for module perl-HTTP-Request-Params all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 00:48:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:48:14 -0700 Subject: rpms/perl-HTTP-Request-Params/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605020048.k420mGxQ004333@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4297/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTTP-Request-Params --- NEW 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 May 2 00:48:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:48:42 -0700 Subject: rpms/perl-HTTP-Request-Params/devel perl-HTTP-Request-Params.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605020048.k420miL7004399@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4361/devel Modified Files: .cvsignore sources Added Files: perl-HTTP-Request-Params.spec Log Message: auto-import perl-HTTP-Request-Params-1.01-1 on branch devel from perl-HTTP-Request-Params-1.01-1.src.rpm --- NEW FILE perl-HTTP-Request-Params.spec --- Name: perl-HTTP-Request-Params Version: 1.01 Release: 1%{?dist} Summary: Retrieve GET/POST Parameters from HTTP Requests Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTTP-Request-Params/ Source0: http://www.cpan.org/authors/id/C/CW/CWEST/HTTP-Request-Params-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::Accessor::Fast) >= 0.19 BuildRequires: perl(HTTP::Request) >= 1.40 BuildRequires: perl(Email::MIME::Modifier) >= 1.42 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Class::Accessor::Fast) >= 0.19 %description This software does all the dirty work of parsing HTTP Requests to find incoming query parameters. %prep %setup -q -n HTTP-Request-Params-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/HTTP/Request/ %{_mandir}/man3/*.3pm* %changelog * Wed Sep 07 2005 Jose Pedro Oliveira - 1.01-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Request-Params/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 00:48:13 -0000 1.1 +++ .cvsignore 2 May 2006 00:48:42 -0000 1.2 @@ -0,0 +1 @@ +HTTP-Request-Params-1.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Request-Params/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 00:48:13 -0000 1.1 +++ sources 2 May 2006 00:48:42 -0000 1.2 @@ -0,0 +1 @@ +fccd255a2992c77b5c40cb5e1e75b256 HTTP-Request-Params-1.01.tar.gz From fedora-extras-commits at redhat.com Tue May 2 00:48:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:48:41 -0700 Subject: rpms/perl-HTTP-Request-Params import.log,1.1,1.2 Message-ID: <200605020048.k420mhf8004394@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Request-Params In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4361 Modified Files: import.log Log Message: auto-import perl-HTTP-Request-Params-1.01-1 on branch devel from perl-HTTP-Request-Params-1.01-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Request-Params/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 00:48:13 -0000 1.1 +++ import.log 2 May 2006 00:48:41 -0000 1.2 @@ -0,0 +1 @@ +perl-HTTP-Request-Params-1_01-1:HEAD:perl-HTTP-Request-Params-1.01-1.src.rpm:1146530913 From fedora-extras-commits at redhat.com Tue May 2 00:49:38 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 17:49:38 -0700 Subject: owners owners.list,1.931,1.932 Message-ID: <200605020049.k420neRF004453@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4436 Modified Files: owners.list Log Message: New package: perl-HTTP-Request-Params (#190318) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.931 retrieving revision 1.932 diff -u -r1.931 -r1.932 --- owners.list 2 May 2006 00:38:53 -0000 1.931 +++ owners.list 2 May 2006 00:49:38 -0000 1.932 @@ -1021,6 +1021,7 @@ Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTTP-Request-Params|Retrieve GET/POST Parameters from HTTP Requests|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 01:18:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:01 -0700 Subject: rpms/perl-HTTP-Recorder - New directory Message-ID: <200605020118.k421I3bX006860@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6839/perl-HTTP-Recorder Log Message: Directory /cvs/extras/rpms/perl-HTTP-Recorder added to the repository From fedora-extras-commits at redhat.com Tue May 2 01:18:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:02 -0700 Subject: rpms/perl-HTTP-Recorder/devel - New directory Message-ID: <200605020118.k421I4cV006863@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6839/perl-HTTP-Recorder/devel Log Message: Directory /cvs/extras/rpms/perl-HTTP-Recorder/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 01:18:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:21 -0700 Subject: rpms/perl-HTTP-Recorder Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605020118.k421INj2006919@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6890 Added Files: Makefile import.log Log Message: Setup of module perl-HTTP-Recorder --- NEW FILE Makefile --- # Top level Makefile for module perl-HTTP-Recorder all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 01:18:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:22 -0700 Subject: rpms/perl-HTTP-Recorder/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605020118.k421IOSZ006922@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6890/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTTP-Recorder --- NEW 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 May 2 01:18:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:44 -0700 Subject: owners owners.list,1.932,1.933 Message-ID: <200605020118.k421IkW0006969@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6947 Modified Files: owners.list Log Message: New package: perl-HTTP-Recorder (#190319) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.932 retrieving revision 1.933 diff -u -r1.932 -r1.933 --- owners.list 2 May 2006 00:49:38 -0000 1.932 +++ owners.list 2 May 2006 01:18:44 -0000 1.933 @@ -1021,6 +1021,7 @@ Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTTP-Recorder|Record interaction with web sites|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Request-Params|Retrieve GET/POST Parameters from HTTP Requests|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 01:18:53 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:53 -0700 Subject: rpms/perl-HTTP-Recorder import.log,1.1,1.2 Message-ID: <200605020118.k421ItSA007011@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6978 Modified Files: import.log Log Message: auto-import perl-HTTP-Recorder-0.05-1 on branch devel from perl-HTTP-Recorder-0.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Recorder/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 01:18:21 -0000 1.1 +++ import.log 2 May 2006 01:18:53 -0000 1.2 @@ -0,0 +1 @@ +perl-HTTP-Recorder-0_05-1:HEAD:perl-HTTP-Recorder-0.05-1.src.rpm:1146532725 From fedora-extras-commits at redhat.com Tue May 2 01:18:54 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 1 May 2006 18:18:54 -0700 Subject: rpms/perl-HTTP-Recorder/devel perl-HTTP-Recorder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605020119.k421IukI007016@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Recorder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6978/devel Modified Files: .cvsignore sources Added Files: perl-HTTP-Recorder.spec Log Message: auto-import perl-HTTP-Recorder-0.05-1 on branch devel from perl-HTTP-Recorder-0.05-1.src.rpm --- NEW FILE perl-HTTP-Recorder.spec --- Name: perl-HTTP-Recorder Version: 0.05 Release: 1%{?dist} Summary: Record interaction with web sites Group: Development/Libraries License: GPL URL: http://search.cpan.org/dist/HTTP-Recorder/ Source0: http://www.cpan.org/authors/id/L/LE/LEIRA/HTTP-Recorder-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(HTML::TokeParser) BuildRequires: perl(HTTP::Request::Params) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(URI::Escape) BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Browser-independent recorder for recording interactions with web sites. %prep %setup -q -n HTTP-Recorder-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/HTTP/ %{_mandir}/man3/*.3pm* %changelog * Thu Sep 8 2005 Jose Pedro Oliveira - 0.05-1 - Update to 0.05. * Sun Jul 04 2004 Jose Pedro Oliveira - 0:0.02-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Recorder/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 01:18:21 -0000 1.1 +++ .cvsignore 2 May 2006 01:18:54 -0000 1.2 @@ -0,0 +1 @@ +HTTP-Recorder-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Recorder/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 01:18:21 -0000 1.1 +++ sources 2 May 2006 01:18:54 -0000 1.2 @@ -0,0 +1 @@ +a2c167d06509620921e4d417ce9354a7 HTTP-Recorder-0.05.tar.gz From fedora-extras-commits at redhat.com Tue May 2 07:51:35 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 2 May 2006 00:51:35 -0700 Subject: fedora-security/audit fc4,1.223,1.224 fc5,1.137,1.138 Message-ID: <200605020751.k427pZB3022394@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22374 Modified Files: fc4 fc5 Log Message: Updates from over the weekend Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- fc4 28 Apr 2006 07:51:39 -0000 1.223 +++ fc4 2 May 2006 07:51:32 -0000 1.224 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060427 -Up to date FC4 as of 20060427 +Up to date CVE as of CVE email 20060501 +Up to date FC4 as of 20060501 ** are items that need attention +CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] +CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423] CVE-2006-2057 ** firefox CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- fc5 28 Apr 2006 07:51:39 -0000 1.137 +++ fc5 2 May 2006 07:51:32 -0000 1.138 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060427 -Up to date FC5 as of 20060427 +Up to date CVE as of CVE email 20060501 +Up to date FC5 as of 20060501 ** are items that need attention +CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] +CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421] CVE-2006-2057 ** firefox CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] From fedora-extras-commits at redhat.com Tue May 2 08:19:13 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 2 May 2006 01:19:13 -0700 Subject: fedora-security/audit fc4,1.224,1.225 fc5,1.138,1.139 Message-ID: <200605020819.k428JD02025676@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25656 Modified Files: fc4 fc5 Log Message: Missing firefox issues Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- fc4 2 May 2006 07:51:32 -0000 1.224 +++ fc4 2 May 2006 08:19:10 -0000 1.225 @@ -10,6 +10,7 @@ CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] +CVE-2006-1993 version (firefox, 1.5 only) CVE-2006-1991 VULNERABLE (php) CVE-2006-1990 VULNERABLE (php) CVE-2006-1942 ** firefox Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- fc5 2 May 2006 07:51:32 -0000 1.138 +++ fc5 2 May 2006 08:19:10 -0000 1.139 @@ -10,6 +10,7 @@ CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] +CVE-2006-1993 VULNERABLE (firefox) #190124 CVE-2006-1991 VULNERABLE (php) CVE-2006-1990 VULNERABLE (php) CVE-2006-1942 ** firefox From fedora-extras-commits at redhat.com Tue May 2 09:52:14 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 2 May 2006 02:52:14 -0700 Subject: rpms/p7zip/devel .cvsignore, 1.5, 1.6 p7zip.spec, 1.9, 1.10 sources, 1.5, 1.6 p7zip_4.30-extraqualif.patch, 1.1, NONE Message-ID: <200605020952.k429qGip028319@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/p7zip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28264/devel Modified Files: .cvsignore p7zip.spec sources Removed Files: p7zip_4.30-extraqualif.patch Log Message: Update to 4.39 and remove all Rar-related files since their license is not acceptable for inclusion in Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p7zip/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Nov 2005 15:09:10 -0000 1.5 +++ .cvsignore 2 May 2006 09:52:14 -0000 1.6 @@ -1 +1 @@ -p7zip_4.30_src_all.tar.bz2 +p7zip_4.39_src_all-norar.tar.bz2 Index: p7zip.spec =================================================================== RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- p7zip.spec 6 Mar 2006 15:20:37 -0000 1.9 +++ p7zip.spec 2 May 2006 09:52:14 -0000 1.10 @@ -1,14 +1,19 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.30 -Release: 3%{?dist} +Version: 4.39 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ -Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 -Patch0: p7zip_4.30-extraqualif.patch +# RAR sources removed since their license is incompatible with the LGPL +#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# VERSION= +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* +# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt +# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +Source: p7zip_%{version}_src_all-norar.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++ %description p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high @@ -27,7 +32,6 @@ %prep %setup -n %{name}_%{version} -%patch0 -p1 -b .extraqualif # Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the # same directory as the binaries, and we don't want them in %{_bindir}. @@ -44,7 +48,7 @@ %build %ifarch %{ix86} ppc -%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine +%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64 makefile.machine @@ -90,6 +94,12 @@ %changelog +* Tue May 2 2006 Matthias Saou 4.39-1 +- Update to 4.39. +- Remove no longer needed gcc 4.1 patch. +- Use the gcc_4.X makefile. +- Remove RAR licensed files and RAR license itself (#190277). + * Mon Mar 6 2006 Matthias Saou 4.30-3 - FC5 rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/p7zip/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Nov 2005 15:09:10 -0000 1.5 +++ sources 2 May 2006 09:52:14 -0000 1.6 @@ -1 +1 @@ -cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 +06dc4693d44c9efecca98969256ddb6c p7zip_4.39_src_all-norar.tar.bz2 --- p7zip_4.30-extraqualif.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 09:52:07 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 2 May 2006 02:52:07 -0700 Subject: rpms/p7zip/FC-4 .cvsignore, 1.5, 1.6 p7zip.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605020952.k429qd6U028329@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/p7zip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28264/FC-4 Modified Files: .cvsignore p7zip.spec sources Log Message: Update to 4.39 and remove all Rar-related files since their license is not acceptable for inclusion in Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Nov 2005 16:33:57 -0000 1.5 +++ .cvsignore 2 May 2006 09:52:07 -0000 1.6 @@ -1 +1 @@ -p7zip_4.30_src_all.tar.bz2 +p7zip_4.39_src_all-norar.tar.bz2 Index: p7zip.spec =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-4/p7zip.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- p7zip.spec 28 Nov 2005 16:33:57 -0000 1.6 +++ p7zip.spec 2 May 2006 09:52:07 -0000 1.7 @@ -1,13 +1,19 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.30 +Version: 4.39 Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ -Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# RAR sources removed since their license is incompatible with the LGPL +#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# VERSION= +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* +# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt +# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +Source: p7zip_%{version}_src_all-norar.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++ %description p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high @@ -42,7 +48,7 @@ %build %ifarch %{ix86} ppc -%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine +%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64 makefile.machine @@ -88,6 +94,19 @@ %changelog +* Tue May 2 2006 Matthias Saou 4.39-1 +- Update to 4.39. +- Remove no longer needed gcc 4.1 patch. +- Use the gcc_4.X makefile. +- Remove RAR licensed files and RAR license itself (#190277). + +* Mon Mar 6 2006 Matthias Saou 4.30-3 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 4.30-2 +- Rebuild for new gcc/glibc. +- Include gcc 4.1 patch for extra qualification errors. + * Mon Nov 28 2005 Matthias Saou 4.30-1 - Update to 4.30. Index: sources =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Nov 2005 16:33:57 -0000 1.5 +++ sources 2 May 2006 09:52:07 -0000 1.6 @@ -1 +1 @@ -cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 +06dc4693d44c9efecca98969256ddb6c p7zip_4.39_src_all-norar.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 09:52:08 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 2 May 2006 02:52:08 -0700 Subject: rpms/p7zip/FC-5 .cvsignore, 1.5, 1.6 p7zip.spec, 1.9, 1.10 sources, 1.5, 1.6 p7zip_4.30-extraqualif.patch, 1.1, NONE Message-ID: <200605020952.k429qeOH028334@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/p7zip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28264/FC-5 Modified Files: .cvsignore p7zip.spec sources Removed Files: p7zip_4.30-extraqualif.patch Log Message: Update to 4.39 and remove all Rar-related files since their license is not acceptable for inclusion in Fedora. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Nov 2005 15:09:10 -0000 1.5 +++ .cvsignore 2 May 2006 09:52:08 -0000 1.6 @@ -1 +1 @@ -p7zip_4.30_src_all.tar.bz2 +p7zip_4.39_src_all-norar.tar.bz2 Index: p7zip.spec =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-5/p7zip.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- p7zip.spec 6 Mar 2006 15:20:37 -0000 1.9 +++ p7zip.spec 2 May 2006 09:52:08 -0000 1.10 @@ -1,14 +1,19 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.30 -Release: 3%{?dist} +Version: 4.39 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ -Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 -Patch0: p7zip_4.30-extraqualif.patch +# RAR sources removed since their license is incompatible with the LGPL +#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# VERSION= +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* +# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt +# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +Source: p7zip_%{version}_src_all-norar.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++ %description p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high @@ -27,7 +32,6 @@ %prep %setup -n %{name}_%{version} -%patch0 -p1 -b .extraqualif # Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the # same directory as the binaries, and we don't want them in %{_bindir}. @@ -44,7 +48,7 @@ %build %ifarch %{ix86} ppc -%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine +%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64 makefile.machine @@ -90,6 +94,12 @@ %changelog +* Tue May 2 2006 Matthias Saou 4.39-1 +- Update to 4.39. +- Remove no longer needed gcc 4.1 patch. +- Use the gcc_4.X makefile. +- Remove RAR licensed files and RAR license itself (#190277). + * Mon Mar 6 2006 Matthias Saou 4.30-3 - FC5 rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/p7zip/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Nov 2005 15:09:10 -0000 1.5 +++ sources 2 May 2006 09:52:08 -0000 1.6 @@ -1 +1 @@ -cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 +06dc4693d44c9efecca98969256ddb6c p7zip_4.39_src_all-norar.tar.bz2 --- p7zip_4.30-extraqualif.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 10:34:50 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 2 May 2006 03:34:50 -0700 Subject: rpms/gtkwave/devel gtkwave.spec, 1.9, 1.10 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200605021034.k42AYq9J030810@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786 Modified Files: gtkwave.spec sources .cvsignore Log Message: * Tue May 2 2006 Paul Howarth 3.0.0-1 - update to 3.0.0 - add examples directory as %%doc - add new buildreq gperf - tweak Makefile.in edits to handle Makefiles under contrib/ - add new binaries rtlbrowse and vertex - add new manpages for rtlbrowse, vertex, and gtkwaverc - %%{_mandir} no longer needs to be created manually - configure script now accepts --libdir Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkwave.spec 7 Mar 2006 13:22:54 -0000 1.9 +++ gtkwave.spec 2 May 2006 10:34:49 -0000 1.10 @@ -1,30 +1,28 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.86 +Version: 3.0.0 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog simulation tools, as well as LXT files produced by certain Verilog simulation tools. -This package includes support for reading .ghw files as produced by ghdl. - %prep %setup -q -n gtkwave-%{version} # Honour %{optflags} and use system zlib/bzip2 library -%{__perl} -pi -e 's/^CFLAGS = -O2/CFLAGS = %{optflags}/;' \ +%{__perl} -pi -e 's/^C(FLAGS|OPT) ?= ?-O2/C\1 = %{optflags}/;' \ -e 's at -I\.\.?/libz -I\.\.?/libbz2@@;' \ - -e 's@(\.\./)?libz/libz\.a at -lz@;' \ - -e 's@(\.\./)?libbz2/libbz2\.a at -lbz2@;' \ + -e 's@(\.\./(\.\./src/)?)?libz/libz\.a at -lz@;' \ + -e 's@(\.\./(\.\./src/)?)?libbz2/libbz2\.a at -lbz2@;' \ -e 's@^([a-z0-9]+:.*) -lz( -lbz2)?@\1@;' \ - src/Makefile*.in src/*/Makefile*.in + src/Makefile*.in src/*/Makefile*.in contrib/*/Makefile*.in %{__rm} -rf src/lib{z,bz2} # Fix file permissions for sane debuginfo package @@ -35,13 +33,11 @@ # to view) and cannot be opened in a "no file" mode from a menu. %build -# This is not an autotools-generated config script, and does not accept --libdir etc. -echo 2 | ./configure +echo 2 | ./configure --libdir=%{_libdir} %{__make} %install %{__rm} -rf %{buildroot} -%{__install} -m 755 -d %{buildroot}%{_mandir}/man1 %{__make} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} \ @@ -53,17 +49,19 @@ %files %defattr(-,root,root,0755) -%doc doc/* *.TXT gtkwaverc.sample +%doc doc/* *.TXT gtkwaverc.sample examples/ %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd %{_bindir}/mvl2lxt %{_bindir}/mvl2vcd +%{_bindir}/rtlbrowse %{_bindir}/tex2vcd %{_bindir}/tla2vcd %{_bindir}/vcd2lxt %{_bindir}/vcd2lxt2 %{_bindir}/vcd2vzt +%{_bindir}/vertex %{_bindir}/vzt2vcd %{_bindir}/vztminer %{_mandir}/man1/gtkwave.1* @@ -71,15 +69,28 @@ %{_mandir}/man1/lxt2vcd.1* %{_mandir}/man1/mvl2lxt.1* %{_mandir}/man1/mvl2vcd.1* +%{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/tex2vcd.1* %{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/vcd2lxt.1* %{_mandir}/man1/vcd2lxt2.1* %{_mandir}/man1/vcd2vzt.1* +%{_mandir}/man1/vertex.1* %{_mandir}/man1/vzt2vcd.1* %{_mandir}/man1/vztminer.1* +%{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 2 2006 Paul Howarth 3.0.0-1 +- update to 3.0.0 +- add examples directory as %%doc +- add new buildreq gperf +- tweak Makefile.in edits to handle Makefiles under contrib/ +- add new binaries rtlbrowse and vertex +- add new manpages for rtlbrowse, vertex, and gtkwaverc +- %%{_mandir} no longer needs to be created manually +- configure script now accepts --libdir + * Tue Mar 7 2006 Paul Howarth 1.3.86-1 - update to 1.3.86 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 13:22:54 -0000 1.9 +++ sources 2 May 2006 10:34:49 -0000 1.10 @@ -1 +1 @@ -8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz +1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 13:22:54 -0000 1.9 +++ .cvsignore 2 May 2006 10:34:49 -0000 1.10 @@ -1 +1 @@ -gtkwave-1.3.86.tgz +gtkwave-3.0.0.tgz From fedora-extras-commits at redhat.com Tue May 2 10:47:26 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 03:47:26 -0700 Subject: rpms/unifdef/devel unifdef.spec,1.1,1.2 Message-ID: <200605021047.k42AlSk3030906@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30889 Modified Files: unifdef.spec Log Message: add changelog Index: unifdef.spec =================================================================== RCS file: /cvs/extras/rpms/unifdef/devel/unifdef.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- unifdef.spec 1 May 2006 21:01:29 -0000 1.1 +++ unifdef.spec 2 May 2006 10:47:26 -0000 1.2 @@ -41,6 +41,9 @@ %changelog +* Tue May 2 2006 David Woodhouse - 1.171-3 +- Minor specfile cleanups from review + * Wed Apr 26 2006 David Woodhouse - 1.171-2 - Change BuildRoot From fedora-extras-commits at redhat.com Tue May 2 10:53:55 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 03:53:55 -0700 Subject: rpms/exim/devel .cvsignore, 1.9, 1.10 exim.spec, 1.18, 1.19 sources, 1.9, 1.10 exim-4.61-c-before-d.patch, 1.1, NONE Message-ID: <200605021053.k42Arvlg030946@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30925 Modified Files: .cvsignore exim.spec sources Removed Files: exim-4.61-c-before-d.patch Log Message: update to 4.62 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 4 Apr 2006 20:03:39 -0000 1.9 +++ .cvsignore 2 May 2006 10:53:54 -0000 1.10 @@ -1,2 +1,2 @@ sa-exim-4.2.tar.gz -exim-4.61.tar.bz2 +exim-4.62.tar.bz2 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- exim.spec 7 Apr 2006 15:05:18 -0000 1.18 +++ exim.spec 2 May 2006 10:53:54 -0000 1.19 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.61 -Release: 2%{?dist} +Version: 4.62 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,7 +25,6 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch -Patch16: exim-4.61-c-before-d.patch Patch17: exim-4.61-ldap-deprecated.patch Requires: /etc/aliases @@ -81,7 +80,6 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre -%patch16 -p0 %patch17 -p1 -b .ldap %build @@ -291,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Fri Apr 7 2006 David Woodhouse 4.61-2 - Define LDAP_DEPRECATED to ensure ldap functions are all declared. Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 4 Apr 2006 20:03:39 -0000 1.9 +++ sources 2 May 2006 10:53:54 -0000 1.10 @@ -1,2 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -f6bbf99a6f63c0f5045a1779e7e810c4 exim-4.61.tar.bz2 +a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 --- exim-4.61-c-before-d.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 10:55:18 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 2 May 2006 03:55:18 -0700 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.8, 1.9 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200605021055.k42AtK1i031013@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30992 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkwave.spec 7 Mar 2006 13:26:07 -0000 1.8 +++ gtkwave.spec 2 May 2006 10:55:18 -0000 1.9 @@ -1,30 +1,28 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.86 +Version: 3.0.0 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog simulation tools, as well as LXT files produced by certain Verilog simulation tools. -This package includes support for reading .ghw files as produced by ghdl. - %prep %setup -q -n gtkwave-%{version} # Honour %{optflags} and use system zlib/bzip2 library -%{__perl} -pi -e 's/^CFLAGS = -O2/CFLAGS = %{optflags}/;' \ +%{__perl} -pi -e 's/^C(FLAGS|OPT) ?= ?-O2/C\1 = %{optflags}/;' \ -e 's at -I\.\.?/libz -I\.\.?/libbz2@@;' \ - -e 's@(\.\./)?libz/libz\.a at -lz@;' \ - -e 's@(\.\./)?libbz2/libbz2\.a at -lbz2@;' \ + -e 's@(\.\./(\.\./src/)?)?libz/libz\.a at -lz@;' \ + -e 's@(\.\./(\.\./src/)?)?libbz2/libbz2\.a at -lbz2@;' \ -e 's@^([a-z0-9]+:.*) -lz( -lbz2)?@\1@;' \ - src/Makefile*.in src/*/Makefile*.in + src/Makefile*.in src/*/Makefile*.in contrib/*/Makefile*.in %{__rm} -rf src/lib{z,bz2} # Fix file permissions for sane debuginfo package @@ -35,13 +33,11 @@ # to view) and cannot be opened in a "no file" mode from a menu. %build -# This is not an autotools-generated config script, and does not accept --libdir etc. -echo 2 | ./configure +echo 2 | ./configure --libdir=%{_libdir} %{__make} %install %{__rm} -rf %{buildroot} -%{__install} -m 755 -d %{buildroot}%{_mandir}/man1 %{__make} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} \ @@ -53,17 +49,19 @@ %files %defattr(-,root,root,0755) -%doc doc/* *.TXT gtkwaverc.sample +%doc doc/* *.TXT gtkwaverc.sample examples/ %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd %{_bindir}/mvl2lxt %{_bindir}/mvl2vcd +%{_bindir}/rtlbrowse %{_bindir}/tex2vcd %{_bindir}/tla2vcd %{_bindir}/vcd2lxt %{_bindir}/vcd2lxt2 %{_bindir}/vcd2vzt +%{_bindir}/vertex %{_bindir}/vzt2vcd %{_bindir}/vztminer %{_mandir}/man1/gtkwave.1* @@ -71,15 +69,28 @@ %{_mandir}/man1/lxt2vcd.1* %{_mandir}/man1/mvl2lxt.1* %{_mandir}/man1/mvl2vcd.1* +%{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/tex2vcd.1* %{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/vcd2lxt.1* %{_mandir}/man1/vcd2lxt2.1* %{_mandir}/man1/vcd2vzt.1* +%{_mandir}/man1/vertex.1* %{_mandir}/man1/vzt2vcd.1* %{_mandir}/man1/vztminer.1* +%{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 2 2006 Paul Howarth 3.0.0-1 +- update to 3.0.0 +- add examples directory as %%doc +- add new buildreq gperf +- tweak Makefile.in edits to handle Makefiles under contrib/ +- add new binaries rtlbrowse and vertex +- add new manpages for rtlbrowse, vertex, and gtkwaverc +- %%{_mandir} no longer needs to be created manually +- configure script now accepts --libdir + * Tue Mar 7 2006 Paul Howarth 1.3.86-1 - update to 1.3.86 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 13:26:07 -0000 1.9 +++ sources 2 May 2006 10:55:18 -0000 1.10 @@ -1 +1 @@ -8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz +1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 13:26:07 -0000 1.9 +++ .cvsignore 2 May 2006 10:55:18 -0000 1.10 @@ -1 +1 @@ -gtkwave-1.3.86.tgz +gtkwave-3.0.0.tgz From fedora-extras-commits at redhat.com Tue May 2 10:58:19 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 2 May 2006 03:58:19 -0700 Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.9, 1.10 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200605021058.k42AwLNT031061@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31040 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkwave.spec 7 Mar 2006 13:22:54 -0000 1.9 +++ gtkwave.spec 2 May 2006 10:58:19 -0000 1.10 @@ -1,30 +1,28 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.86 +Version: 3.0.0 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog simulation tools, as well as LXT files produced by certain Verilog simulation tools. -This package includes support for reading .ghw files as produced by ghdl. - %prep %setup -q -n gtkwave-%{version} # Honour %{optflags} and use system zlib/bzip2 library -%{__perl} -pi -e 's/^CFLAGS = -O2/CFLAGS = %{optflags}/;' \ +%{__perl} -pi -e 's/^C(FLAGS|OPT) ?= ?-O2/C\1 = %{optflags}/;' \ -e 's at -I\.\.?/libz -I\.\.?/libbz2@@;' \ - -e 's@(\.\./)?libz/libz\.a at -lz@;' \ - -e 's@(\.\./)?libbz2/libbz2\.a at -lbz2@;' \ + -e 's@(\.\./(\.\./src/)?)?libz/libz\.a at -lz@;' \ + -e 's@(\.\./(\.\./src/)?)?libbz2/libbz2\.a at -lbz2@;' \ -e 's@^([a-z0-9]+:.*) -lz( -lbz2)?@\1@;' \ - src/Makefile*.in src/*/Makefile*.in + src/Makefile*.in src/*/Makefile*.in contrib/*/Makefile*.in %{__rm} -rf src/lib{z,bz2} # Fix file permissions for sane debuginfo package @@ -35,13 +33,11 @@ # to view) and cannot be opened in a "no file" mode from a menu. %build -# This is not an autotools-generated config script, and does not accept --libdir etc. -echo 2 | ./configure +echo 2 | ./configure --libdir=%{_libdir} %{__make} %install %{__rm} -rf %{buildroot} -%{__install} -m 755 -d %{buildroot}%{_mandir}/man1 %{__make} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} \ @@ -53,17 +49,19 @@ %files %defattr(-,root,root,0755) -%doc doc/* *.TXT gtkwaverc.sample +%doc doc/* *.TXT gtkwaverc.sample examples/ %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd %{_bindir}/mvl2lxt %{_bindir}/mvl2vcd +%{_bindir}/rtlbrowse %{_bindir}/tex2vcd %{_bindir}/tla2vcd %{_bindir}/vcd2lxt %{_bindir}/vcd2lxt2 %{_bindir}/vcd2vzt +%{_bindir}/vertex %{_bindir}/vzt2vcd %{_bindir}/vztminer %{_mandir}/man1/gtkwave.1* @@ -71,15 +69,28 @@ %{_mandir}/man1/lxt2vcd.1* %{_mandir}/man1/mvl2lxt.1* %{_mandir}/man1/mvl2vcd.1* +%{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/tex2vcd.1* %{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/vcd2lxt.1* %{_mandir}/man1/vcd2lxt2.1* %{_mandir}/man1/vcd2vzt.1* +%{_mandir}/man1/vertex.1* %{_mandir}/man1/vzt2vcd.1* %{_mandir}/man1/vztminer.1* +%{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 2 2006 Paul Howarth 3.0.0-1 +- update to 3.0.0 +- add examples directory as %%doc +- add new buildreq gperf +- tweak Makefile.in edits to handle Makefiles under contrib/ +- add new binaries rtlbrowse and vertex +- add new manpages for rtlbrowse, vertex, and gtkwaverc +- %%{_mandir} no longer needs to be created manually +- configure script now accepts --libdir + * Tue Mar 7 2006 Paul Howarth 1.3.86-1 - update to 1.3.86 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 13:22:54 -0000 1.9 +++ sources 2 May 2006 10:58:19 -0000 1.10 @@ -1 +1 @@ -8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz +1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 13:22:54 -0000 1.9 +++ .cvsignore 2 May 2006 10:58:19 -0000 1.10 @@ -1 +1 @@ -gtkwave-1.3.86.tgz +gtkwave-3.0.0.tgz From fedora-extras-commits at redhat.com Tue May 2 11:12:09 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:12:09 -0700 Subject: rpms/exim/FC-5 exim.spec,1.18,1.19 sources,1.9,1.10 Message-ID: <200605021112.k42BCBAS001417@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1398 Modified Files: exim.spec sources Log Message: Update to 4.62 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- exim.spec 7 Apr 2006 15:04:50 -0000 1.18 +++ exim.spec 2 May 2006 11:12:08 -0000 1.19 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.61 -Release: 2%{?dist} +Version: 4.62 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,7 +25,6 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch -Patch16: exim-4.61-c-before-d.patch Patch17: exim-4.61-ldap-deprecated.patch Requires: /etc/aliases @@ -81,7 +80,6 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre -%patch16 -p0 %patch17 -p1 -b .ldap %build @@ -291,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Fri Apr 7 2006 David Woodhouse 4.61-2 - Define LDAP_DEPRECATED to ensure ldap functions are all declared. Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 4 Apr 2006 20:05:57 -0000 1.9 +++ sources 2 May 2006 11:12:08 -0000 1.10 @@ -1,2 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -f6bbf99a6f63c0f5045a1779e7e810c4 exim-4.61.tar.bz2 +a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 11:27:47 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Tue, 2 May 2006 04:27:47 -0700 Subject: rpms/gajim/devel .cvsignore, 1.7, 1.8 gajim.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200605021127.k42BRn4J001487@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1464 Modified Files: .cvsignore gajim.spec sources Log Message: Update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Apr 2006 14:13:45 -0000 1.7 +++ .cvsignore 2 May 2006 11:27:46 -0000 1.8 @@ -1 +1 @@ -gajim-0.10-pre2.tar.bz2 +gajim-0.10.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gajim.spec 19 Apr 2006 14:13:45 -0000 1.11 +++ gajim.spec 2 May 2006 11:27:46 -0000 1.12 @@ -1,12 +1,12 @@ Name: gajim Version: 0.10 -Release: 0.1.pre2%{?dist} +Release: 1%{?dist} Summary: Jabber client written in PyGTK Group: Applications/Internet License: GPL URL: http://gajim.org/ -Source0: http://gajim.org/downloads/gajim-%{version}-pre2.tar.bz2 +Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -80,6 +80,9 @@ %{_mandir}/man1/gajim-remote.1* %changelog +* Tue May 2 2006 Dawid Gajownik - 0.10-1 +- Update to 0.10 + * Wed Apr 19 2006 Dawid Gajownik - 0.10-0.1.pre2 - Update to 0.10-pre2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Apr 2006 14:13:45 -0000 1.7 +++ sources 2 May 2006 11:27:46 -0000 1.8 @@ -1 +1 @@ -a452d0435e730a22d83393cb97ad96d3 gajim-0.10-pre2.tar.bz2 +0d568857ea25acf8366cff43d2317757 gajim-0.10.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 11:30:00 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:30:00 -0700 Subject: rpms/exim/devel exim.spec,1.19,1.20 Message-ID: <200605021130.k42BU2Ac001607@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1589 Modified Files: exim.spec Log Message: bump release Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- exim.spec 2 May 2006 10:53:54 -0000 1.19 +++ exim.spec 2 May 2006 11:30:00 -0000 1.20 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.62 -Release: 1%{?dist} +Release: 1.1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -289,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around 'make tag' error + * Tue May 2 2006 David Woodhouse 4.62-1 - Update to 4.62 From fedora-extras-commits at redhat.com Tue May 2 11:30:19 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:30:19 -0700 Subject: rpms/exim/devel exim.spec,1.20,1.21 Message-ID: <200605021130.k42BULtT001638@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1621 Modified Files: exim.spec Log Message: be consistent Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- exim.spec 2 May 2006 11:30:00 -0000 1.20 +++ exim.spec 2 May 2006 11:30:19 -0000 1.21 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.62 -Release: 1.1%{?dist} +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons From fedora-extras-commits at redhat.com Tue May 2 11:30:43 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:30:43 -0700 Subject: rpms/exim/FC-5 exim.spec,1.19,1.20 Message-ID: <200605021130.k42BUj8s001691@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1673 Modified Files: exim.spec Log Message: bump release Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- exim.spec 2 May 2006 11:12:08 -0000 1.19 +++ exim.spec 2 May 2006 11:30:43 -0000 1.20 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.62 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -289,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around 'make tag' error + * Tue May 2 2006 David Woodhouse 4.62-1 - Update to 4.62 From fedora-extras-commits at redhat.com Tue May 2 11:32:35 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:32:35 -0700 Subject: rpms/exim/FC-4 .cvsignore, 1.7, 1.8 exim.spec, 1.12, 1.13 sources, 1.8, 1.9 exim-4.61-c-before-d.patch, 1.1, NONE Message-ID: <200605021132.k42BWbak001769@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1748 Modified Files: .cvsignore exim.spec sources Removed Files: exim-4.61-c-before-d.patch Log Message: update to 4.62 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 4 Apr 2006 20:27:21 -0000 1.7 +++ .cvsignore 2 May 2006 11:32:35 -0000 1.8 @@ -1,2 +1,2 @@ sa-exim-4.2.tar.gz -exim-4.61.tar.bz2 +exim-4.62.tar.bz2 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- exim.spec 4 Apr 2006 20:27:21 -0000 1.12 +++ exim.spec 2 May 2006 11:32:35 -0000 1.13 @@ -1,6 +1,6 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.61 +Version: 4.62 Release: 1%{?dist} License: GPL Url: http://www.exim.org/ @@ -25,7 +25,6 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch -Patch16: exim-4.61-c-before-d.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel pam-devel @@ -79,7 +78,6 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre -%patch16 -p0 %build %ifnarch s390 s390x @@ -288,6 +286,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Tue Apr 4 2006 David Woodhouse 4.61-1 - Update to 4.61 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 Apr 2006 20:27:21 -0000 1.8 +++ sources 2 May 2006 11:32:35 -0000 1.9 @@ -1,2 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -f6bbf99a6f63c0f5045a1779e7e810c4 exim-4.61.tar.bz2 +a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 --- exim-4.61-c-before-d.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 11:32:53 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:32:53 -0700 Subject: rpms/exim/FC-5 exim-4.61-c-before-d.patch,1.1,NONE Message-ID: <200605021132.k42BWtac001789@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1774 Removed Files: exim-4.61-c-before-d.patch Log Message: remove 4.61 patch --- exim-4.61-c-before-d.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 11:34:24 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Tue, 2 May 2006 04:34:24 -0700 Subject: rpms/gajim/FC-5 .cvsignore, 1.5, 1.6 gajim.spec, 1.9, 1.10 sources, 1.5, 1.6 gajim-0.9.1.modularX.patch, 1.1, NONE gajim-0.9.1.notify_crash.patch, 1.1, NONE Message-ID: <200605021134.k42BYQxv001868@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843 Modified Files: .cvsignore gajim.spec sources Removed Files: gajim-0.9.1.modularX.patch gajim-0.9.1.notify_crash.patch Log Message: Update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Jan 2006 16:11:52 -0000 1.5 +++ .cvsignore 2 May 2006 11:34:24 -0000 1.6 @@ -1 +1 @@ -gajim-0.9.1.tar.bz2 +gajim-0.10.tar.bz2 Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-5/gajim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gajim.spec 30 Mar 2006 20:51:41 -0000 1.9 +++ gajim.spec 2 May 2006 11:34:24 -0000 1.10 @@ -1,14 +1,12 @@ Name: gajim -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Jabber client written in PyGTK Group: Applications/Internet License: GPL URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 -Patch0: gajim-0.9.1.modularX.patch -Patch1: gajim-0.9.1.notify_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -21,6 +19,7 @@ BuildRequires: python-devel BuildRequires: gtkspell-devel +Requires: bind-utils Requires: dbus-python #Requires: gnome-python2-gconf Requires: pygtk2-libglade @@ -35,11 +34,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -# gajim wants to handle executables; why? -sed -i -e '/MimeType/d' gajim.desktop.in %build make \ @@ -85,6 +80,16 @@ %{_mandir}/man1/gajim-remote.1* %changelog +* Tue May 2 2006 Dawid Gajownik - 0.10-1 +- Update to 0.10 + +* Wed Apr 19 2006 Dawid Gajownik - 0.10-0.1.pre2 +- Update to 0.10-pre2 + +* Thu Apr 13 2006 Dawid Gajownik - 0.10-0.1.pre1 +- Update to 0.10-pre1 +- Drop patches + * Thu Mar 30 2006 Dawid Gajownik - 0.9.1-3 - Remove Gnome dependencies - Fix crash with notify-daemon (#187274, Stefan Plewako) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Jan 2006 16:11:53 -0000 1.5 +++ sources 2 May 2006 11:34:24 -0000 1.6 @@ -1 +1 @@ -ca82dfb7ab5c51984357ea7bab0e99af gajim-0.9.1.tar.bz2 +0d568857ea25acf8366cff43d2317757 gajim-0.10.tar.bz2 --- gajim-0.9.1.modularX.patch DELETED --- --- gajim-0.9.1.notify_crash.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 2 11:44:22 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:44:22 -0700 Subject: rpms/exim-doc/devel .cvsignore, 1.4, 1.5 exim-doc.spec, 1.3, 1.4 sources, 1.5, 1.6 Message-ID: <200605021144.k42BiO9Y001983@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1962 Modified Files: .cvsignore exim-doc.spec sources Log Message: update to 4.62 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Apr 2006 20:40:01 -0000 1.4 +++ .cvsignore 2 May 2006 11:44:22 -0000 1.5 @@ -1,6 +1,6 @@ FAQ-html-20050415.tar.bz2 config.samples-20050415.tar.bz2 -exim-html-4.61.tar.bz2 -exim-pdf-4.61.tar.bz2 -exim-postscript-4.61.tar.bz2 -exim-texinfo-4.61.tar.bz2 +exim-html-4.62.tar.bz2 +exim-pdf-4.62.tar.bz2 +exim-postscript-4.62.tar.bz2 +exim-texinfo-4.62.tar.bz2 Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/exim-doc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- exim-doc.spec 4 Apr 2006 20:40:01 -0000 1.3 +++ exim-doc.spec 2 May 2006 11:44:22 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc -Version: 4.61 +Version: 4.62 Release: 1%{?dist} License: GPL Url: http://www.exim.org/ @@ -45,6 +45,9 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Tue Apr 4 2006 David Woodhouse 4.61-1 - Update to 4.61 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Apr 2006 20:40:01 -0000 1.5 +++ sources 2 May 2006 11:44:22 -0000 1.6 @@ -1,6 +1,6 @@ ecceef7c8d1a352caf6c2992a6f4cb69 FAQ-html-20050415.tar.bz2 4b93321938a800caa6127c48ad60a42b config.samples-20050415.tar.bz2 -77d042dad6b4ebcb757ec2b02a7761f8 exim-html-4.61.tar.bz2 -5ac27708c9aef892f199e9b769d15300 exim-pdf-4.61.tar.bz2 -84dc0c3154a432bfea2afc59c46000ce exim-postscript-4.61.tar.bz2 -f86c26fda8871c72892b3ff586677310 exim-texinfo-4.61.tar.bz2 +638b2949c48f6ebe068430ccf1332a4e exim-html-4.62.tar.bz2 +84d042c6501350fb152f631074de9152 exim-pdf-4.62.tar.bz2 +c08a1e3fe996e596ec68c3793b5435f1 exim-postscript-4.62.tar.bz2 +f6b5e7441405e485a38c9f3d96336c3a exim-texinfo-4.62.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 11:49:49 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 04:49:49 -0700 Subject: rpms/exim-doc/devel exim-doc.spec,1.4,1.5 Message-ID: <200605021149.k42Bnpkd002130@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2113 Modified Files: exim-doc.spec Log Message: Gr. Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/devel/exim-doc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-doc.spec 2 May 2006 11:44:22 -0000 1.4 +++ exim-doc.spec 2 May 2006 11:49:48 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc Version: 4.62 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: Documentation @@ -45,6 +45,11 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around the fact that 'make tag' _still_ doesn't + make sure that the common directory is up to date, just like it didn't + half an hour ago. + * Tue May 2 2006 David Woodhouse 4.62-1 - Update to 4.62 From fedora-extras-commits at redhat.com Tue May 2 12:06:59 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:06:59 -0700 Subject: rpms/mtd-utils - New directory Message-ID: <200605021207.k42C71DJ004447@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4426/mtd-utils Log Message: Directory /cvs/extras/rpms/mtd-utils added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:07:00 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:00 -0700 Subject: rpms/mtd-utils/devel - New directory Message-ID: <200605021207.k42C72nV004450@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4426/mtd-utils/devel Log Message: Directory /cvs/extras/rpms/mtd-utils/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:07:13 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:13 -0700 Subject: rpms/mtd-utils Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605021207.k42C7Fv7004495@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462 Added Files: Makefile import.log Log Message: Setup of module mtd-utils --- NEW FILE Makefile --- # Top level Makefile for module mtd-utils all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue May 2 12:07:14 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:14 -0700 Subject: rpms/mtd-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605021207.k42C7GAo004498@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mtd-utils --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue May 2 12:07:40 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:40 -0700 Subject: rpms/mtd-utils import.log,1.1,1.2 Message-ID: <200605021208.k42C8CC9004548@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4513 Modified Files: import.log Log Message: auto-import mtd-utils-1.0.0-1 on branch devel from mtd-utils-1.0.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 12:07:13 -0000 1.1 +++ import.log 2 May 2006 12:07:40 -0000 1.2 @@ -0,0 +1 @@ +mtd-utils-1_0_0-1:HEAD:mtd-utils-1.0.0-1.src.rpm:1146571703 From fedora-extras-commits at redhat.com Tue May 2 12:07:41 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:07:41 -0700 Subject: rpms/mtd-utils/devel COPYING, NONE, 1.1 mtd-utils.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605021208.k42C8DWq004552@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4513/devel Modified Files: .cvsignore sources Added Files: COPYING mtd-utils.spec Log Message: auto-import mtd-utils-1.0.0-1 on branch devel from mtd-utils-1.0.0-1.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) 19yy 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) 19yy 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 mtd-utils.spec --- Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 Release: 1 License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ Source0: ftp://ftp.infradead.org/pub/mtd-utils/%{name}-%{version}.tar.gz Source1: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel %description The mtd-utils package contains utilities related to handling MTD devices, and for dealing with FTL, NFTL JFFS2 etc. %prep %setup -q cp %{SOURCE1} . %build make CFLAGS="$RPM_OPT_FLAGS -I./include" %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} MANDIR=%{_mandir} install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_sbindir}/* %{_mandir}/*/* %doc COPYING device_table.txt %changelog * Sun Apr 30 2006 David Woodhouse - 1.0.0-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 12:07:14 -0000 1.1 +++ .cvsignore 2 May 2006 12:07:41 -0000 1.2 @@ -0,0 +1 @@ +mtd-utils-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 12:07:14 -0000 1.1 +++ sources 2 May 2006 12:07:41 -0000 1.2 @@ -0,0 +1 @@ +442bdbdb024db27dc9c89207fac16f95 mtd-utils-1.0.0.tar.gz From fedora-extras-commits at redhat.com Tue May 2 12:11:22 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:11:22 -0700 Subject: rpms/mtd-utils/devel mtd-utils.spec,1.1,1.2 Message-ID: <200605021211.k42CBOJH004604@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4587 Modified Files: mtd-utils.spec Log Message: Oops. Forgot to bump release before import Index: mtd-utils.spec =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/devel/mtd-utils.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mtd-utils.spec 2 May 2006 12:07:41 -0000 1.1 +++ mtd-utils.spec 2 May 2006 12:11:22 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 -Release: 1 +Release: 2 License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ @@ -37,6 +37,10 @@ %changelog +* Tue May 2 2006 David Woodhouse - 1.0.0-2 +- Fixes from review (include COPYING), BR zlib-devel +- Include device_table.txt + * Sun Apr 30 2006 David Woodhouse - 1.0.0-1 - Initial build. From fedora-extras-commits at redhat.com Tue May 2 12:15:55 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:15:55 -0700 Subject: rpms/exim-doc/FC-5 .cvsignore, 1.4, 1.5 exim-doc.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200605021215.k42CFvLY004668@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4647 Modified Files: .cvsignore exim-doc.spec sources Log Message: 4.62-2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Apr 2006 20:38:45 -0000 1.4 +++ .cvsignore 2 May 2006 12:15:55 -0000 1.5 @@ -1,6 +1,6 @@ FAQ-html-20050415.tar.bz2 config.samples-20050415.tar.bz2 -exim-html-4.61.tar.bz2 -exim-pdf-4.61.tar.bz2 -exim-postscript-4.61.tar.bz2 -exim-texinfo-4.61.tar.bz2 +exim-html-4.62.tar.bz2 +exim-pdf-4.62.tar.bz2 +exim-postscript-4.62.tar.bz2 +exim-texinfo-4.62.tar.bz2 Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-5/exim-doc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-doc.spec 4 Apr 2006 20:39:10 -0000 1.4 +++ exim-doc.spec 2 May 2006 12:15:55 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc -Version: 4.61 -Release: 1%{?dist} +Version: 4.62 +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: Documentation @@ -45,6 +45,14 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around the fact that 'make tag' _still_ doesn't + make sure that the common directory is up to date, just like it didn't + half an hour ago. + +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Tue Apr 4 2006 David Woodhouse 4.61-1 - Update to 4.61 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Apr 2006 20:38:45 -0000 1.5 +++ sources 2 May 2006 12:15:55 -0000 1.6 @@ -1,6 +1,6 @@ ecceef7c8d1a352caf6c2992a6f4cb69 FAQ-html-20050415.tar.bz2 4b93321938a800caa6127c48ad60a42b config.samples-20050415.tar.bz2 -77d042dad6b4ebcb757ec2b02a7761f8 exim-html-4.61.tar.bz2 -5ac27708c9aef892f199e9b769d15300 exim-pdf-4.61.tar.bz2 -84dc0c3154a432bfea2afc59c46000ce exim-postscript-4.61.tar.bz2 -f86c26fda8871c72892b3ff586677310 exim-texinfo-4.61.tar.bz2 +638b2949c48f6ebe068430ccf1332a4e exim-html-4.62.tar.bz2 +84d042c6501350fb152f631074de9152 exim-pdf-4.62.tar.bz2 +c08a1e3fe996e596ec68c3793b5435f1 exim-postscript-4.62.tar.bz2 +f6b5e7441405e485a38c9f3d96336c3a exim-texinfo-4.62.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 12:16:16 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 2 May 2006 05:16:16 -0700 Subject: rpms/exim-doc/FC-4 .cvsignore, 1.3, 1.4 exim-doc.spec, 1.2, 1.3 sources, 1.4, 1.5 Message-ID: <200605021216.k42CGIJ4004726@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim-doc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4705 Modified Files: .cvsignore exim-doc.spec sources Log Message: 4.62-2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Apr 2006 20:40:15 -0000 1.3 +++ .cvsignore 2 May 2006 12:16:15 -0000 1.4 @@ -1,6 +1,6 @@ FAQ-html-20050415.tar.bz2 config.samples-20050415.tar.bz2 -exim-html-4.61.tar.bz2 -exim-pdf-4.61.tar.bz2 -exim-postscript-4.61.tar.bz2 -exim-texinfo-4.61.tar.bz2 +exim-html-4.62.tar.bz2 +exim-pdf-4.62.tar.bz2 +exim-postscript-4.62.tar.bz2 +exim-texinfo-4.62.tar.bz2 Index: exim-doc.spec =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-4/exim-doc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- exim-doc.spec 4 Apr 2006 20:40:15 -0000 1.2 +++ exim-doc.spec 2 May 2006 12:16:15 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Documentation for the exim mail transfer agent Name: exim-doc -Version: 4.61 -Release: 1%{?dist} +Version: 4.62 +Release: 2%{?dist} License: GPL Url: http://www.exim.org/ Group: Documentation @@ -45,6 +45,14 @@ %doc faq html ps pdf texinfo config.samples %changelog +* Tue May 2 2006 David Woodhouse 4.62-2 +- Bump release to work around the fact that 'make tag' _still_ doesn't + make sure that the common directory is up to date, just like it didn't + half an hour ago. + +* Tue May 2 2006 David Woodhouse 4.62-1 +- Update to 4.62 + * Tue Apr 4 2006 David Woodhouse 4.61-1 - Update to 4.61 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim-doc/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Apr 2006 20:40:15 -0000 1.4 +++ sources 2 May 2006 12:16:15 -0000 1.5 @@ -1,6 +1,6 @@ ecceef7c8d1a352caf6c2992a6f4cb69 FAQ-html-20050415.tar.bz2 4b93321938a800caa6127c48ad60a42b config.samples-20050415.tar.bz2 -77d042dad6b4ebcb757ec2b02a7761f8 exim-html-4.61.tar.bz2 -5ac27708c9aef892f199e9b769d15300 exim-pdf-4.61.tar.bz2 -84dc0c3154a432bfea2afc59c46000ce exim-postscript-4.61.tar.bz2 -f86c26fda8871c72892b3ff586677310 exim-texinfo-4.61.tar.bz2 +638b2949c48f6ebe068430ccf1332a4e exim-html-4.62.tar.bz2 +84d042c6501350fb152f631074de9152 exim-pdf-4.62.tar.bz2 +c08a1e3fe996e596ec68c3793b5435f1 exim-postscript-4.62.tar.bz2 +f6b5e7441405e485a38c9f3d96336c3a exim-texinfo-4.62.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 12:37:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:37:15 -0700 Subject: rpms/perl-PPI - New directory Message-ID: <200605021237.k42CbHSD004946@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4925/perl-PPI Log Message: Directory /cvs/extras/rpms/perl-PPI added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:37:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:37:16 -0700 Subject: rpms/perl-PPI/devel - New directory Message-ID: <200605021237.k42CbIc2004949@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4925/perl-PPI/devel Log Message: Directory /cvs/extras/rpms/perl-PPI/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:37:36 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:37:36 -0700 Subject: rpms/perl-PPI Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605021237.k42CbcPr005005@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4972 Added Files: Makefile import.log Log Message: Setup of module perl-PPI --- NEW FILE Makefile --- # Top level Makefile for module perl-PPI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 12:37:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:37:37 -0700 Subject: rpms/perl-PPI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605021237.k42CbdMx005008@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4972/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-PPI --- NEW 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 May 2 12:38:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:38:07 -0700 Subject: rpms/perl-PPI import.log,1.1,1.2 Message-ID: <200605021238.k42Cc9VD005073@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040 Modified Files: import.log Log Message: auto-import perl-PPI-1.112-1 on branch devel from perl-PPI-1.112-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 12:37:36 -0000 1.1 +++ import.log 2 May 2006 12:38:07 -0000 1.2 @@ -0,0 +1 @@ +perl-PPI-1_112-1:HEAD:perl-PPI-1.112-1.src.rpm:1146573478 From fedora-extras-commits at redhat.com Tue May 2 12:38:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:38:07 -0700 Subject: rpms/perl-PPI/devel perl-PPI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605021238.k42Cc94X005078@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/devel Modified Files: .cvsignore sources Added Files: perl-PPI.spec Log Message: auto-import perl-PPI-1.112-1 on branch devel from perl-PPI-1.112-1.src.rpm --- NEW FILE perl-PPI.spec --- Name: perl-PPI Version: 1.112 Release: 1%{?dist} Summary: Parse, Analyze and Manipulate Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/PPI/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Perl core modules BuildRequires: perl(List::Util) >= 1.17 BuildRequires: perl(Storable) >= 2.14 # CPAN modules BuildRequires: perl(Clone) >= 0.17 BuildRequires: perl(IO::Scalar) >= 2.105 BuildRequires: perl(File::Remove) >= 0.22 BuildRequires: perl(List::MoreUtils) >= 0.13 BuildRequires: perl(Params::Util) >= 0.10 BuildRequires: perl(Test::ClassAPI) >= 1.02 BuildRequires: perl(Test::SubCalls) >= 0.01 BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Parse, Analyze and Manipulate Perl (without perl). %prep %setup -q -n PPI-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README inline2test.conf inline2test.tpl %{perl_vendorlib}/PPI* %{_mandir}/man3/*.3pm* %changelog * Tue Apr 25 2006 Jose Pedro Oliveira - 1.112-1 - Update to 1.112. * Sat Apr 22 2006 Jose Pedro Oliveira - 1.111-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 12:37:37 -0000 1.1 +++ .cvsignore 2 May 2006 12:38:07 -0000 1.2 @@ -0,0 +1 @@ +PPI-1.112.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 12:37:37 -0000 1.1 +++ sources 2 May 2006 12:38:07 -0000 1.2 @@ -0,0 +1 @@ +a629d953e0002813061c4308c64993f6 PPI-1.112.tar.gz From fedora-extras-commits at redhat.com Tue May 2 12:39:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:39:21 -0700 Subject: rpms/perl-File-Find-Rule-PPI/devel - New directory Message-ID: <200605021239.k42CdNcO005184@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5153/perl-File-Find-Rule-PPI/devel Log Message: Directory /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:39:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:39:21 -0700 Subject: rpms/perl-File-Find-Rule-PPI - New directory Message-ID: <200605021239.k42CdNiH005179@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5153/perl-File-Find-Rule-PPI Log Message: Directory /cvs/extras/rpms/perl-File-Find-Rule-PPI added to the repository From fedora-extras-commits at redhat.com Tue May 2 12:39:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:39:37 -0700 Subject: rpms/perl-File-Find-Rule-PPI Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605021239.k42Cddfx005240@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5207 Added Files: Makefile import.log Log Message: Setup of module perl-File-Find-Rule-PPI --- NEW FILE Makefile --- # Top level Makefile for module perl-File-Find-Rule-PPI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 12:39:38 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:39:38 -0700 Subject: rpms/perl-File-Find-Rule-PPI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605021239.k42CdePO005243@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5207/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-File-Find-Rule-PPI --- NEW 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 May 2 12:40:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:40:12 -0700 Subject: rpms/perl-File-Find-Rule-PPI import.log,1.1,1.2 Message-ID: <200605021240.k42CeEuo005304@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5271 Modified Files: import.log Log Message: auto-import perl-File-Find-Rule-PPI-0.03-1 on branch devel from perl-File-Find-Rule-PPI-0.03-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule-PPI/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 12:39:37 -0000 1.1 +++ import.log 2 May 2006 12:40:12 -0000 1.2 @@ -0,0 +1 @@ +perl-File-Find-Rule-PPI-0_03-1:HEAD:perl-File-Find-Rule-PPI-0.03-1.src.rpm:1146573603 From fedora-extras-commits at redhat.com Tue May 2 12:40:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:40:12 -0700 Subject: rpms/perl-File-Find-Rule-PPI/devel perl-File-Find-Rule-PPI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605021240.k42CeF8m005309@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5271/devel Modified Files: .cvsignore sources Added Files: perl-File-Find-Rule-PPI.spec Log Message: auto-import perl-File-Find-Rule-PPI-0.03-1 on branch devel from perl-File-Find-Rule-PPI-0.03-1.src.rpm --- NEW FILE perl-File-Find-Rule-PPI.spec --- Name: perl-File-Find-Rule-PPI Version: 0.03 Release: 1%{?dist} Summary: Add support for PPI queries to File::Find::Rule Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/File-Find-Rule-PPI/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/File-Find-Rule-PPI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(File::Find::Rule) >= 0.20 BuildRequires: perl(Params::Util) >= 0.10 BuildRequires: perl(PPI) >= 1.000 BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description File::Find::Rule::PPI allows you to integrate PPI content queries into your File::Find::Rule searches. %prep %setup -q -n File-Find-Rule-PPI-%{version} %{__sed} -i 's|\r||' Changes %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README %{perl_vendorlib}/File/ %{_mandir}/man3/*.3pm* %changelog * Tue Apr 25 2006 Jose Pedro Oliveira - 0.03-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 12:39:38 -0000 1.1 +++ .cvsignore 2 May 2006 12:40:12 -0000 1.2 @@ -0,0 +1 @@ +File-Find-Rule-PPI-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule-PPI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 12:39:38 -0000 1.1 +++ sources 2 May 2006 12:40:12 -0000 1.2 @@ -0,0 +1 @@ +a63dfd3b079258f4766b6445c1614b0f File-Find-Rule-PPI-0.03.tar.gz From fedora-extras-commits at redhat.com Tue May 2 12:40:27 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 2 May 2006 05:40:27 -0700 Subject: owners owners.list,1.933,1.934 Message-ID: <200605021240.k42CeTKX005354@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5206 Modified Files: owners.list Log Message: New packages: - #190310 : perl-File-Find-Rule-PPI - Add support for PPI queries to File::Find::Rule - #190308 : perl-PPI - Parse, Analyze and Manipulate Perl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.933 retrieving revision 1.934 diff -u -r1.933 -r1.934 --- owners.list 2 May 2006 01:18:44 -0000 1.933 +++ owners.list 2 May 2006 12:40:26 -0000 1.934 @@ -989,6 +989,7 @@ Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Fetch|A generic file fetching mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-Find-Rule-PPI|Add support for PPI queries to File::Find::Rule|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-NCopy|Copy files to directories, or a single file to another file|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1118,6 +1119,7 @@ Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PBS|Perl binding for the Portable Batch System client library|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 13:16:19 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Tue, 2 May 2006 06:16:19 -0700 Subject: rpms/gjots2/devel .cvsignore, 1.2, 1.3 gjots2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605021316.k42DGLNe007748@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/gjots2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7727 Modified Files: .cvsignore gjots2.spec sources Log Message: - new menu icon (#190221) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gjots2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Apr 2006 05:58:56 -0000 1.2 +++ .cvsignore 2 May 2006 13:16:18 -0000 1.3 @@ -1 +1,2 @@ gjots2-2.3.4.tgz +gjots.png Index: gjots2.spec =================================================================== RCS file: /cvs/extras/rpms/gjots2/devel/gjots2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gjots2.spec 3 Apr 2006 05:58:56 -0000 1.1 +++ gjots2.spec 2 May 2006 13:16:18 -0000 1.2 @@ -19,7 +19,7 @@ # MA 02111-1307, USA. %define ver 2.3.4 -%define rel 4 +%define rel 5 Summary: A note jotter - Organise your ideas, notes, facts in a hierarchy Name: gjots2 @@ -27,6 +27,7 @@ Release: %{rel}%{?dist} URL: http://bhepple.freeshell.org/gjots Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz +Source1: gjots.png Patch0: gjots2-2.3.4-sitelib.patch License: GPL Group: Applications/Productivity @@ -83,8 +84,8 @@ %{__install} -m0755 bin/gjots2 bin/gjots2docbook bin/gjots2html bin/docbook2gjots %{buildroot}%{_bindir}/ %{__install} -m0644 lib/*.py %{buildroot}%{python_sitelib}/%{name}/ %{__install} -m0644 gjots.glade2 %{buildroot}%{_datadir}/%{name} -%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/%{name} -%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/pixmaps/ +%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name} +%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/ %{__install} -m0644 gjots2-hide-all.png %{buildroot}%{_datadir}/%{name} %{__install} -m0644 gjots2-merge-items.png %{buildroot}%{_datadir}/%{name} %{__install} -m0644 gjots2-new-child.png %{buildroot}%{_datadir}/%{name} @@ -130,6 +131,9 @@ %{_mandir}/man1/docbook2gjots* %changelog +* Tue May 02 2006 Radek Vok??l 2.3.4-5 +- new menu icon (#190221) + * Thu Mar 30 2006 Radek Vok??l 2.3.4-4 - BuildRequires: desktop-file-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/gjots2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Apr 2006 05:58:56 -0000 1.2 +++ sources 2 May 2006 13:16:18 -0000 1.3 @@ -1 +1,2 @@ ae05d1ea976de08dd9fc80faa04c558f gjots2-2.3.4.tgz +4ae5dfb2ae559470c06739f7e310e233 gjots.png From fedora-extras-commits at redhat.com Tue May 2 13:47:10 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:47:10 -0700 Subject: rpms/PyX - New directory Message-ID: <200605021347.k42DlCrQ008058@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8032/PyX Log Message: Directory /cvs/extras/rpms/PyX added to the repository From fedora-extras-commits at redhat.com Tue May 2 13:47:11 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:47:11 -0700 Subject: rpms/PyX/devel - New directory Message-ID: <200605021347.k42DlDki008061@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8032/PyX/devel Log Message: Directory /cvs/extras/rpms/PyX/devel added to the repository From fedora-extras-commits at redhat.com Tue May 2 13:47:51 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:47:51 -0700 Subject: rpms/PyX Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605021347.k42DlrT7008110@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8077 Added Files: Makefile import.log Log Message: Setup of module PyX --- NEW FILE Makefile --- # Top level Makefile for module PyX all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 2 13:47:52 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:47:52 -0700 Subject: rpms/PyX/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605021347.k42DlsXo008113@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8077/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module PyX --- NEW 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 May 2 13:49:33 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:49:33 -0700 Subject: rpms/PyX/devel PyX-0.8.1-siteconfig.patch, NONE, 1.1 PyX.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605021349.k42DnZ3O008191@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150/devel Modified Files: .cvsignore sources Added Files: PyX-0.8.1-siteconfig.patch PyX.spec Log Message: auto-import PyX-0.8.1-4 on branch devel from PyX-0.8.1-4.src.rpm PyX-0.8.1-siteconfig.patch: --- NEW FILE PyX-0.8.1-siteconfig.patch --- diff -ur PyX-0.8.1/setup.py PyX-0.8.1-patched/setup.py --- PyX-0.8.1/setup.py 2005-08-13 05:32:46.000000000 -0700 +++ PyX-0.8.1-patched/setup.py 2006-04-29 02:49:37.000000000 -0700 @@ -15,8 +15,6 @@ log = None from distutils.core import setup, Extension from distutils.util import change_root, convert_path -from distutils.command.build_py import build_py -from distutils.command.install_data import install_data from distutils.command.install_lib import install_lib import ConfigParser import sys, os @@ -81,79 +79,21 @@ # extend install commands to overwrite siteconfig.py during build and install # - -class pyx_build_py(build_py): - - def build_module(self, module, module_file, package): - if package == "pyx" and module == "siteconfig": - # generate path information as the original build_module does it - outfile = self.get_module_outfile(self.build_lib, [package], module) - outdir = os.path.dirname(outfile) - self.mkpath(outdir) - - if log: - log.info("creating proper %s" % outfile) - - # create the additional relative path parts to be inserted into the - # os.path.join methods in the original siteconfig.py - indir = os.path.dirname(module_file) - addjoinstring = ", ".join(["'..'" for d in outdir.split(os.path.sep)] + - ["'%s'" % d for d in indir.split(os.path.sep)]) - - # write a modifed version of siteconfig.py - fin = open(module_file, "r") - fout = open(outfile, "w") - for line in fin.readlines(): - fout.write(line.replace("os.path.join(os.path.dirname(__file__), ", - "os.path.join(os.path.dirname(__file__), %s, " % addjoinstring)) - fin.close() - fout.close() - else: - return build_py.build_module(self, module, module_file, package) - - -class pyx_install_data(install_data): - - def run(self): - self.siteconfiglines = [] - for dir, files in self.data_files: - # append siteconfiglines by " =

    " - - # get the install directory - # (the following four lines are copied from within the install_data.run loop) - dir = convert_path(dir) - if not os.path.isabs(dir): - dir = os.path.join(self.install_dir, dir) - elif self.root: - dir = change_root(self.root, dir) - - self.siteconfiglines.append("%s = '%s'\n" % (siteconfignames[files], dir)) - - install_data.run(self) - - class pyx_install_lib(install_lib): - def run(self): - # siteconfig.py depends on install_data: - self.run_command('install_data') - install_lib.run(self) - def install(self): - # first we perform the tree_copy result = install_lib.install(self) - - # siteconfiglines have been created by install_data - siteconfiglines = self.distribution.command_obj["install_data"].siteconfiglines - - # such that we can easily overwrite siteconfig.py + root = self.get_finalized_command('install').root + if root == None: + root = '' + pyx_lfsdir = pyx_sharedir = os.path.join(sys.prefix, "share", "pyx") + pyx_pyxrc = os.path.join("/", "etc", "pyxrc") outfile = os.path.join(self.install_dir, "pyx", "siteconfig.py") - if log: - log.info("creating proper %s" % outfile) f = open(outfile, "w") - f.writelines(siteconfiglines) + f.write("lfsdir = %r\n" % pyx_lfsdir) + f.write("sharedir = %r\n" % pyx_sharedir) + f.write("pyxrcdir = %r\n" % pyx_pyxrc) f.close() - return result ################################################################################ @@ -193,7 +133,5 @@ packages=["pyx", "pyx/graph", "pyx/graph/axis", "pyx/t1strip", "pyx/pykpathsea"], ext_modules=ext_modules, data_files=data_files, - cmdclass = {"build_py": pyx_build_py, - "install_data": pyx_install_data, - "install_lib": pyx_install_lib}, + cmdclass = {"install_lib": pyx_install_lib}, **addargs) --- NEW FILE PyX.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyX Version: 0.8.1 Release: 4%{?dist} Summary: Python graphics package Group: Applications/Publishing License: GPL URL: http://pyx.sourceforge.net/ Source0: http://easynews.dl.sourceforge.net/sourceforge/pyx/PyX-%{version}.tar.gz # Fedora doesn't seem to ship with the python mkhowto script needed to generate # the manual at build time. The manual here is from: # http://pyx.sourceforge.net/manual.pdf Source1: %{name}-%{version}-manual.pdf # Fix the install root in the siteconfig.py Patch0: PyX-0.8.1-siteconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel >= 2.2 BuildRequires: tetex-latex Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: tetex %description PyX is a Python package for the creation of PostScript and PDF files. It combines an abstraction of the PostScript drawing model with a TeX/LaTeX interface. Complex tasks like 2d and 3d plots in publication-ready quality are built out of these primitives. %prep %setup -q %patch0 -p1 %build %{__sed} -i 's?^build_t1strip=.*?build_t1strip=1?' setup.cfg # Bug #150085 excludes x86_64 - don't enable pykpathsea C module for x86_64 %ifnarch x86_64 %{__sed} -i 's?^build_pykpathsea=.*?build_pykpathsea=1?' setup.cfg %endif CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build # turn on ipc in config file %{__sed} -i 's?^texipc =.*?texipc = 1?' pyxrc pushd faq make popd pushd manual ## Nope - fedora doesn't ship with mkhowto ## Bug #177349 # ln -s /path/to/python/mkhowto . # make cp %{SOURCE1} ./manual.pdf popd %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} # Fix the non-exec with shellbang rpmlint errors for file in `find %{buildroot}%{python_sitearch}/pyx -type f -name "*.py"`; do [ ! -x ${file} ] && %{__sed} -i 's?^#!?##?' ${file} done %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE PKG-INFO README faq/pyxfaq.pdf manual/manual.pdf %doc contrib/ examples/ %config(noreplace) %{_sysconfdir}/pyxrc %{_datadir}/pyx/ %dir %{python_sitearch}/pyx %{python_sitearch}/pyx/*.py %{python_sitearch}/pyx/*.pyc %ghost %{python_sitearch}/pyx/*.pyo %dir %{python_sitearch}/pyx/graph %{python_sitearch}/pyx/graph/*.py %{python_sitearch}/pyx/graph/*.pyc %ghost %{python_sitearch}/pyx/graph/*.pyo %dir %{python_sitearch}/pyx/graph/axis %{python_sitearch}/pyx/graph/axis/*.py %{python_sitearch}/pyx/graph/axis/*.pyc %ghost %{python_sitearch}/pyx/graph/axis/*.pyo %dir %{python_sitearch}/pyx/pykpathsea %{python_sitearch}/pyx/pykpathsea/*.py %{python_sitearch}/pyx/pykpathsea/*.pyc %ghost %{python_sitearch}/pyx/pykpathsea/*.pyo %ifnarch x86_64 %{python_sitearch}/pyx/pykpathsea/*.so %endif %dir %{python_sitearch}/pyx/t1strip %{python_sitearch}/pyx/t1strip/*.py %{python_sitearch}/pyx/t1strip/*.pyc %ghost %{python_sitearch}/pyx/t1strip/*.pyo %{python_sitearch}/pyx/t1strip/*.so %changelog * Sun Apr 30 2006 Michael A. Peters - 0.8.1-4 - Fixed rpmlint errors noted in 190247#3 - Don't build pykpathsea C module for x86_64 (Bug #150085) * Sat Apr 29 2006 Michael A. Peters - 0.8.1-3 - Fixed a typo in the borrowed SuSE patch * Sat Apr 29 2006 Michael A. Peters - 0.8.1-2 - Fix improper siteconfig.py (Patch0, borrowed from SuSE) - alter default config file (turn texipc on) - BuildRequires python-devel >= 2.2 * Sat Apr 29 2006 Michael A. Peters - 0.8.1-1 - Initial packaging for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/PyX/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 May 2006 13:47:52 -0000 1.1 +++ .cvsignore 2 May 2006 13:49:32 -0000 1.2 @@ -0,0 +1,2 @@ +PyX-0.8.1-manual.pdf +PyX-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/PyX/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 May 2006 13:47:52 -0000 1.1 +++ sources 2 May 2006 13:49:32 -0000 1.2 @@ -0,0 +1,2 @@ +bfab7bbc4f3442c946f489133df515f0 PyX-0.8.1-manual.pdf +5e751cef8d62774a6fc659cc9a03c231 PyX-0.8.1.tar.gz From fedora-extras-commits at redhat.com Tue May 2 13:49:32 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:49:32 -0700 Subject: rpms/PyX import.log,1.1,1.2 Message-ID: <200605021349.k42DnYXr008184@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/PyX In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150 Modified Files: import.log Log Message: auto-import PyX-0.8.1-4 on branch devel from PyX-0.8.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/PyX/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 May 2006 13:47:51 -0000 1.1 +++ import.log 2 May 2006 13:49:32 -0000 1.2 @@ -0,0 +1 @@ +PyX-0_8_1-4:HEAD:PyX-0.8.1-4.src.rpm:1146577752 From fedora-extras-commits at redhat.com Tue May 2 13:54:24 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 06:54:24 -0700 Subject: owners owners.list,1.934,1.935 Message-ID: <200605021354.k42DsQk6008310@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8291 Modified Files: owners.list Log Message: added PyX Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.934 retrieving revision 1.935 diff -u -r1.934 -r1.935 --- owners.list 2 May 2006 12:40:26 -0000 1.934 +++ owners.list 2 May 2006 13:54:24 -0000 1.935 @@ -1327,6 +1327,7 @@ 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|PyX|Python graphics package|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|pyzor|Pyzor collaborative spam filtering system|wtogami at redhat.com|extras-qa at fedoraproject.org| 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 Tue May 2 15:25:23 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:25:23 -0700 Subject: rpms/nagios/devel nagios.spec,1.10,1.11 Message-ID: <200605021525.k42FPP3B013196@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13167 Modified Files: nagios.spec Log Message: Added 2.2 tag for new upstream version. Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nagios.spec 21 Feb 2006 10:36:06 -0000 1.10 +++ nagios.spec 2 May 2006 15:25:23 -0000 1.11 @@ -1,5 +1,5 @@ Name: nagios -Version: 2.0 +Version: 2.2 Release: 1%{?dist} Summary: Host/service/network monitoring program @@ -76,9 +76,9 @@ %{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora %{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \ - -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora + -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora %{__sed} -e "s|resource.cfg|private/resource.cfg|" \ - -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora + -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora %{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg echo >> html/stylesheets/common.css @@ -86,7 +86,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config -%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name} +%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd %{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private @@ -145,7 +145,8 @@ %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample -%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives @@ -154,6 +155,28 @@ %{_includedir}/%{name} %changelog +* Tue May 02 2006 Mike McGrath imlinux at gmail.com> 2.2-1 +- Upstream released 2.2 +- Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd +- 2.2 -------------------------------------------------- +- Minor bug fix in availability CGI +- Bug fix with temporary file location used for retention data +- Fix for segfault that occurred in 2.1 during service flapping notifications +- 2.1 -------------------------------------------------- +- Changed freshness logic so that passive checks don't immediately go stale after program restart +- Bug fix for minor memory leak in object cleanup code +- Bug fix for flapping notifications during scheduled downtime +- Bug fix for $TOTALHOSTSDOWNUNHANDLED$ macro +- Bug fix in sample minimal.cfg file +- Bug fix in status CGI when displaying servicegroups +- Bug fixes in computation of indeterminate time and scheduled downtime in availability CGI +- Bug fix with not deleting all comments associated with a service +- Lowered max plugin output length from 348 to 332 chars to run on 64-bit systems without problems +- Minor fix to p1.pl for embedded Perl interpreter +- Minor fixes to WAP interface (statuswml CGI) +- Minor bug fix to VRML interface (statuswrl CGI) +- Minor doc updates + * Tue Feb 21 2006 Mike McGrath imlinux at gmail.com> 2.0-1 - Upstream released 2.0 (changes below) - Fix for segfault in timed event queue From fedora-extras-commits at redhat.com Tue May 2 15:27:22 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:27:22 -0700 Subject: rpms/nagios/devel .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200605021527.k42FRObC013290@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13271 Modified Files: .cvsignore sources Log Message: New source for Nagios 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Feb 2006 10:34:40 -0000 1.4 +++ .cvsignore 2 May 2006 15:27:22 -0000 1.5 @@ -1 +1 @@ -nagios-2.0.tar.gz +nagios-2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Feb 2006 10:34:40 -0000 1.4 +++ sources 2 May 2006 15:27:22 -0000 1.5 @@ -1 +1 @@ -2a30ccf68bdbebc9c6f5a06e9c09e757 nagios-2.0.tar.gz +38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz From fedora-extras-commits at redhat.com Tue May 2 15:28:03 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:28:03 -0700 Subject: rpms/nagios/devel nagios.spec,1.11,1.12 Message-ID: <200605021528.k42FS5Y3013318@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13301 Modified Files: nagios.spec Log Message: Minor change to email address in changelog - oops Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nagios.spec 2 May 2006 15:25:23 -0000 1.11 +++ nagios.spec 2 May 2006 15:28:03 -0000 1.12 @@ -155,7 +155,7 @@ %{_includedir}/%{name} %changelog -* Tue May 02 2006 Mike McGrath imlinux at gmail.com> 2.2-1 +* Tue May 02 2006 Mike McGrath 2.2-1 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd - 2.2 -------------------------------------------------- @@ -177,7 +177,7 @@ - Minor bug fix to VRML interface (statuswrl CGI) - Minor doc updates -* Tue Feb 21 2006 Mike McGrath imlinux at gmail.com> 2.0-1 +* Tue Feb 21 2006 Mike McGrath 2.0-1 - Upstream released 2.0 (changes below) - Fix for segfault in timed event queue - Removed length limitations for object vars/vals From fedora-extras-commits at redhat.com Tue May 2 15:30:36 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:30:36 -0700 Subject: rpms/nagios/devel nagios.spec,1.12,1.13 Message-ID: <200605021530.k42FUcCU013463@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13446 Modified Files: nagios.spec Log Message: Updated Nagios to release number 2 Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nagios.spec 2 May 2006 15:28:03 -0000 1.12 +++ nagios.spec 2 May 2006 15:30:35 -0000 1.13 @@ -1,6 +1,6 @@ Name: nagios Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -155,7 +155,7 @@ %{_includedir}/%{name} %changelog -* Tue May 02 2006 Mike McGrath 2.2-1 +* Tue May 02 2006 Mike McGrath 2.2-2 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd - 2.2 -------------------------------------------------- From fedora-extras-commits at redhat.com Tue May 2 15:32:28 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:32:28 -0700 Subject: rpms/nagios/devel nagios.spec,1.13,1.14 Message-ID: <200605021532.k42FWUpm013529@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13512 Modified Files: nagios.spec Log Message: Somethings changed and I missed it, I keep tetting tag errors. Trying again with a new tag. Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nagios.spec 2 May 2006 15:30:35 -0000 1.13 +++ nagios.spec 2 May 2006 15:32:28 -0000 1.14 @@ -1,6 +1,6 @@ Name: nagios Version: 2.2 -Release: 2%{?dist} +Release: 2_%{?dist} Summary: Host/service/network monitoring program Group: Applications/System From fedora-extras-commits at redhat.com Tue May 2 15:33:20 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:33:20 -0700 Subject: rpms/nagios/devel nagios.spec,1.14,1.15 Message-ID: <200605021533.k42FXMdP013555@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13537 Modified Files: nagios.spec Log Message: STupid tagging, back to release 2%{dist} Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nagios.spec 2 May 2006 15:32:28 -0000 1.14 +++ nagios.spec 2 May 2006 15:33:20 -0000 1.15 @@ -1,6 +1,6 @@ Name: nagios Version: 2.2 -Release: 2_%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System From fedora-extras-commits at redhat.com Tue May 2 15:41:18 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 2 May 2006 08:41:18 -0700 Subject: rpms/nagios/devel nagios.spec,1.15,1.16 Message-ID: <200605021541.k42FfKsO013682@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13665 Modified Files: nagios.spec Log Message: Yet another release increment Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- nagios.spec 2 May 2006 15:33:20 -0000 1.15 +++ nagios.spec 2 May 2006 15:41:18 -0000 1.16 @@ -1,6 +1,6 @@ Name: nagios Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -155,7 +155,7 @@ %{_includedir}/%{name} %changelog -* Tue May 02 2006 Mike McGrath 2.2-2 +* Tue May 02 2006 Mike McGrath 2.2-3 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd - 2.2 -------------------------------------------------- From fedora-extras-commits at redhat.com Tue May 2 15:47:53 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 2 May 2006 08:47:53 -0700 Subject: rpms/proftpd/FC-5 proftpd-1.3.0-rpath.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 proftpd.init, 1.4, 1.5 proftpd.spec, 1.13, 1.14 sources, 1.7, 1.8 Message-ID: <200605021547.k42FltaS013802@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13775 Modified Files: .cvsignore proftpd.init proftpd.spec sources Added Files: proftpd-1.3.0-rpath.patch Log Message: Update to 1.3.0 final and backport all of the recent devel changes. proftpd-1.3.0-rpath.patch: --- NEW FILE proftpd-1.3.0-rpath.patch --- diff -Naupr proftpd-1.3.0.orig/configure proftpd-1.3.0/configure --- proftpd-1.3.0.orig/configure 2006-03-09 19:20:04.000000000 +0100 +++ proftpd-1.3.0.orig/configure 2006-03-09 19:20:04.000000000 +0100 @@ -19660,7 +19660,7 @@ if test "${enable_dso+set}" = set; then ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o" ac_build_addl_includes="$INCLTDL $ac_build_addl_includes" - MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)" + MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic" MAIN_LIBS="\$(LIBLTDL)" MODULE_LDFLAGS="-avoid-version -export-dynamic -module" diff -Naupr proftpd-1.3.0.orig/configure.in proftpd-1.3.0/configure.in --- proftpd-1.3.0.orig/configure.in 2006-03-09 19:12:35.000000000 +0100 +++ proftpd-1.3.0.orig/configure.in 2006-03-09 19:12:35.000000000 +0100 @@ -372,7 +372,7 @@ AC_ARG_ENABLE(dso, ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o" ac_build_addl_includes="$INCLTDL $ac_build_addl_includes" - MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)" + MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic" MAIN_LIBS="\$(LIBLTDL)" MODULE_LDFLAGS="-avoid-version -export-dynamic -module" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Mar 2006 10:34:01 -0000 1.7 +++ .cvsignore 2 May 2006 15:47:53 -0000 1.8 @@ -1 +1 @@ -proftpd-1.3.0rc4.tar.bz2 +proftpd-1.3.0.tar.bz2 Index: proftpd.init =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- proftpd.init 16 Nov 2004 18:34:32 -0000 1.4 +++ proftpd.init 2 May 2006 15:47:53 -0000 1.5 @@ -32,7 +32,7 @@ start() { echo -n $"Starting $prog: " - daemon proftpd + daemon proftpd 2>/dev/null RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- proftpd.spec 7 Mar 2006 10:34:01 -0000 1.13 +++ proftpd.spec 2 May 2006 15:47:53 -0000 1.14 @@ -1,30 +1,27 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0 -Release: 0.2.rc4%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ -Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc4.tar.bz2 +Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2 Source1: proftpd.conf Source2: proftpd.init Source3: proftpd-xinetd Source4: proftpd.logrotate Source5: welcome.msg Source6: proftpd.pam +Patch0: proftpd-1.3.0-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: pam >= 0.59, /sbin/service, /sbin/chkconfig -BuildRequires: pam-devel, perl, ncurses-devel, pkgconfig -%{!?_without_tls:Requires: openssl} -%{!?_without_tls:BuildRequires: openssl-devel, krb5-devel} -%{?_with_ldap:Requires: openldap} -%{?_with_ldap:BuildRequires: openldap-devel} -%{?_with_mysql:Requires: mysql} -%{?_with_mysql:BuildRequires: mysql-devel, zlib-devel} -%{?_with_postgresql:Requires: postgresql-libs} -%{?_with_postgresql:BuildRequires: postgresql-devel} +Requires: pam >= 0.59 +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service, /sbin/chkconfig +Requires(postun): /sbin/service +BuildRequires: pam-devel, ncurses-devel, pkgconfig +BuildRequires: openssl-devel, krb5-devel, libacl-devel +BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel Provides: ftpserver -Conflicts: wu-ftpd, anonftp, vsftpd %description ProFTPD is an enhanced FTP server with a focus toward simplicity, security, @@ -36,56 +33,74 @@ This package defaults to the standalone behaviour of ProFTPD, but all the needed scripts to have it run by xinetd instead are included. -Available rpmbuild rebuild options : ---without : tls ---with : ldap mysql postgresql ipv6 + +%package ldap +Summary: Module to add LDAP support to the ProFTPD FTP server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description ldap +Module to add LDAP support to the ProFTPD FTP server. + + +%package mysql +Summary: Module to add MySQL support to the ProFTPD FTP server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description mysql +Module to add MySQL support to the ProFTPD FTP server. + + +%package postgresql +Summary: Module to add PostgreSQL support to the ProFTPD FTP server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description postgresql +Module to add PostgreSQL support to the ProFTPD FTP server. %prep -%setup -n %{name}-%{version}rc4 +%setup +%patch0 -p1 -b .rpath %build -# Workaround for the PostgreSQL include file -%{__perl} -pi -e 's|pgsql/libpq-fe.h|libpq-fe.h|g' contrib/mod_sql_postgres.c - # Disable stripping in order to get useful debuginfo packages %{__perl} -pi -e 's|"-s"|""|g' configure -# TLS includes -OPENSSL_INC="" -if OPENSSL_CFLAGS=`pkg-config --cflags openssl`; then - for i in ${OPENSSL_CFLAGS}; do - INCPATH=`echo $i | perl -pi -e 's|-I([a-z/]*)|$1|g'` - test ! -z ${INCPATH} && OPENSSL_INC="${OPENSSL_INC}:${INCPATH}" - done -fi - %configure \ - --localstatedir="/var/run" \ - --with-includes="%{_includedir}%{!?_without_tls:${OPENSSL_INC}}%{?_with_mysql::%{_includedir}/mysql}" \ - %{?_with_ipv6:--enable-ipv6} \ - %{?_with_mysql:--with-libraries="%{_libdir}/mysql"} \ - %{?_with_postgresql:--with-libraries="%{_libdir}"} \ - --with-modules=mod_readme:mod_auth_pam%{?_with_ldap::mod_ldap}%{?_with_mysql::mod_sql:mod_sql_mysql}%{?_with_postgresql::mod_sql:mod_sql_postgres}%{!?_without_tls::mod_tls} + --libexecdir="%{_libexecdir}/proftpd" \ + --localstatedir="%{_var}/run" \ + --enable-ctrls \ + --enable-facl \ + --enable-dso \ + --enable-ipv6 \ + --with-libraries="%{_libdir}/mysql" \ + --with-includes="%{_includedir}/mysql" \ + --with-modules=mod_readme:mod_auth_pam:mod_tls \ + --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres + %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -%makeinstall rundir="%{buildroot}%{_localstatedir}/run/proftpd" \ +%{__make} install DESTDIR=%{buildroot} \ + rundir="%{_var}/run/proftpd" \ INSTALL_USER=`id -un` \ INSTALL_GROUP=`id -gn` -%{__install} -D -p -m 640 %{SOURCE1} \ +%{__install} -D -p -m 0640 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/proftpd.conf -%{__install} -D -p -m 755 %{SOURCE2} \ +%{__install} -D -p -m 0755 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd -%{__install} -D -p -m 640 %{SOURCE3} \ +%{__install} -D -p -m 0640 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd -%{__install} -D -p -m 644 %{SOURCE4} \ +%{__install} -D -p -m 0644 %{SOURCE4} \ %{buildroot}%{_sysconfdir}/logrotate.d/proftpd -%{__install} -D -p -m 644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg -%{__install} -D -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd +%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg +%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd %{__mkdir_p} %{buildroot}/var/ftp/uploads %{__mkdir_p} %{buildroot}/var/ftp/pub %{__mkdir_p} %{buildroot}/var/log/proftpd @@ -97,7 +112,7 @@ %post -if [ $1 = 1 ]; then +if [ $1 -eq 1 ]; then /sbin/chkconfig --add proftpd IFS=":"; cat /etc/passwd | \ while { read username nu nu gid nu nu nu nu; }; do \ @@ -108,12 +123,12 @@ fi %preun -if [ $1 = 0 ]; then +if [ $1 -eq 0 ]; then /sbin/service proftpd stop &>/dev/null || : /sbin/chkconfig --del proftpd /sbin/service xinetd reload &>/dev/null || : - if [ -d /var/run/proftpd ]; then - rm -rf /var/run/proftpd/* + if [ -d %{_var}/run/proftpd ]; then + rm -rf %{_var}/run/proftpd/* fi fi @@ -131,11 +146,15 @@ %config(noreplace) %{_sysconfdir}/proftpd.conf %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd %config %{_sysconfdir}/ftpusers -%config %{_sysconfdir}/pam.d/proftpd -%config %{_sysconfdir}/logrotate.d/proftpd +%config(noreplace) %{_sysconfdir}/pam.d/proftpd +%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd %{_sysconfdir}/rc.d/init.d/proftpd %{_mandir}/*/* %{_bindir}/* +%dir %{_libexecdir}/proftpd/ +%{_libexecdir}/proftpd/mod_sql.so +%exclude %{_libexecdir}/proftpd/*.a +%exclude %{_libexecdir}/proftpd/*.la %{_sbindir}/* %dir /var/ftp/ %attr(331, ftp, ftp) %dir /var/ftp/uploads/ @@ -143,8 +162,42 @@ %config(noreplace) /var/ftp/welcome.msg %attr(750, root, root) %dir /var/log/proftpd/ +%files ldap +%defattr(-, root, root, 0755) +%dir %{_libexecdir}/proftpd/ +%{_libexecdir}/proftpd/mod_ldap.so + +%files mysql +%defattr(-, root, root, 0755) +%dir %{_libexecdir}/proftpd/ +%{_libexecdir}/proftpd/mod_sql_mysql.so + +%files postgresql +%defattr(-, root, root, 0755) +%dir %{_libexecdir}/proftpd/ +%{_libexecdir}/proftpd/mod_sql_postgres.so + %changelog +* Fri Apr 28 2006 Matthias Saou 1.3.0-2 +- Mark pam.d and logrotate.d config files as noreplace. +- Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary + when DSO is enabled (#190122). + +* Fri Apr 21 2006 Matthias Saou 1.3.0-1 +- Update to 1.3.0 final. +- Remove no longer needed PostgreSQL and OpenSSL detection workarounds. +- Remove explicit conflicts on wu-ftpd, anonftp and vsftpd to let people + install more than one ftp daemon (what for? hmm...) (#189023). +- Enable LDAP, MySQL and PostgreSQL as DSOs by default, and stuff them in + new sub-packages. This won't introduce any regression since they weren't + enabled by default. +- Remove useless explicit requirements. +- Rearrange scriplets requirements. +- Enable ctrls (controls via ftpdctl) and facl (POSIX ACLs). +- Using --disable-static makes the build fail, so exclude .a files in %%files. +- Silence harmless IPv6 failure message at startup when IPv6 isn't available. + * Tue Mar 7 2006 Matthias Saou 1.3.0-0.2.rc4 - Update to 1.3.0rc4 (bugfix release). Index: sources =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Mar 2006 10:34:01 -0000 1.7 +++ sources 2 May 2006 15:47:53 -0000 1.8 @@ -1 +1 @@ -175da3e672d9f441b852259c7baee21e proftpd-1.3.0rc4.tar.bz2 +fae47d01b52e035eb6b7190e74c17722 proftpd-1.3.0.tar.bz2 From fedora-extras-commits at redhat.com Tue May 2 15:50:24 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 08:50:24 -0700 Subject: rpms/gnomesword/FC-5 gnomesword-2.1.6-svn1213-kjvot.patch, NONE, 1.1 gnomesword.spec, 1.10, 1.11 Message-ID: <200605021550.k42FoQpL013932@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gnomesword/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886/FC-5 Modified Files: gnomesword.spec Added Files: gnomesword-2.1.6-svn1213-kjvot.patch Log Message: Fixes bug 190413 gnomesword-2.1.6-svn1213-kjvot.patch: --- NEW FILE gnomesword-2.1.6-svn1213-kjvot.patch --- diff -ur gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp --- gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp 2006-04-04 10:16:30.000000000 -0700 +++ gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp 2006-05-02 08:29:36.000000000 -0700 @@ -408,7 +408,10 @@ // else if (!strcmp(tag.getName(), "milestone")&& tag.getAttribute("type")) { if(!strcmp(tag.getAttribute("type"),"x-p")) - buf += tag.getAttribute("marker"); + if( tag.getAttribute("marker")) + buf += tag.getAttribute("marker"); + else + buf += ""; else if(!strcmp(tag.getAttribute("type"), "line")) { buf += "
    "; //g_message("\ntoken: %s\ntag: %s\ntype: %s",token,tag.getName(),tag.getAttribute("type")); @@ -437,7 +440,7 @@ if(u->inName) { char firstChar = *u->lastTextNode.c_str(); const char *name = u->lastTextNode.c_str(); - g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name); + //g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name); ++name; buf += firstChar; buf += ""; diff -ur gnomesword-2.1.6/src/backend/sword_main.cc gnomesword-2.1.6-patched/src/backend/sword_main.cc --- gnomesword-2.1.6/src/backend/sword_main.cc 2006-04-04 13:46:50.000000000 -0700 +++ gnomesword-2.1.6-patched/src/backend/sword_main.cc 2006-05-02 08:29:36.000000000 -0700 @@ -486,7 +486,8 @@ vkey.AutoNormalize(1); vkey = mykey; g_free(mykey); - mykey = g_convert((char*)vkey.getText(), + + mykey = g_convert((char*)vkey.getShortText(), -1, UTF_8, OLD_CODESET, diff -ur gnomesword-2.1.6/src/gnome2/main_window.c gnomesword-2.1.6-patched/src/gnome2/main_window.c --- gnomesword-2.1.6/src/gnome2/main_window.c 2006-04-12 11:17:31.000000000 -0700 +++ gnomesword-2.1.6-patched/src/gnome2/main_window.c 2006-05-02 08:29:36.000000000 -0700 @@ -806,6 +806,24 @@ settings.gs_hight); } +/* +void new_main_window(void) +{ + gchar *glade_file; + GladeXML *gxml; + + glade_file = + gui_general_user_file("main-window.glade", FALSE); + g_return_if_fail(glade_file != NULL); + g_message(glade_file); + + // ** build the widget ** + gxml = glade_xml_new(glade_file, "main-window", NULL); + + + +} + /****************************************************************************** * Name diff -ur gnomesword-2.1.6/src/gnome2/search_dialog.c gnomesword-2.1.6-patched/src/gnome2/search_dialog.c --- gnomesword-2.1.6/src/gnome2/search_dialog.c 2006-03-29 08:27:16.000000000 -0800 +++ gnomesword-2.1.6-patched/src/gnome2/search_dialog.c 2006-05-02 08:29:36.000000000 -0700 @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include #endif - + #include #include diff -ur gnomesword-2.1.6/src/main/display.cc gnomesword-2.1.6-patched/src/main/display.cc --- gnomesword-2.1.6/src/main/display.cc 2006-04-02 20:08:46.000000000 -0700 +++ gnomesword-2.1.6-patched/src/main/display.cc 2006-05-02 08:29:36.000000000 -0700 @@ -400,21 +400,20 @@ main_set_strongs_morphs_off(ops); } #endif -/* if (newparagraph && settings.versestyle) { + if (newparagraph && settings.versestyle) { newparagraph = FALSE; swbuf += paragraphMark;; } -*/ + swbuf += (const char *)imodule; buf = g_strdup_printf("%s",(const char *)imodule); if (settings.versestyle) { - /*if(g_strstr_len(buf,strlen(buf),"")|| - g_strstr_len(buf,strlen(buf),"

    ")) { + if(g_strstr_len(buf,strlen(buf),"")) { newparagraph = TRUE; } else { newparagraph = FALSE; - }*/ + } swbuf.append("
    "); } else { swbuf.append(""); diff -ur gnomesword-2.1.6/src/main/navbar.cc gnomesword-2.1.6-patched/src/main/navbar.cc --- gnomesword-2.1.6/src/main/navbar.cc 2006-03-14 13:41:21.000000000 -0800 +++ gnomesword-2.1.6-patched/src/main/navbar.cc 2006-05-02 08:29:36.000000000 -0700 @@ -137,6 +137,7 @@ void main_navbar_fill_book_combo(NAVBAR navbar) { VerseKey key; + VerseKey key_abrev; gsize bytes_read; gsize bytes_written; GError *error = NULL; @@ -155,15 +156,16 @@ GTK_COMBO_BOX(navbar.comboboxentry_book)); gtk_list_store_clear(GTK_LIST_STORE(book_model)); if (backend->module_has_testament(navbar.module_name, 1)) { - while(i < key.BMAX[0]) { - - book = g_convert((const char *)key.books[0][i].name, + while(i < key.BMAX[0]) { + key_abrev = key.books[0][i].name; + book = g_convert((const char *)key_abrev.getBookAbbrev(), -1, UTF_8, OLD_CODESET, &bytes_read, &bytes_written, &error); + if(book == NULL) { g_print ("error: %s\n", error->message); g_error_free (error); @@ -181,9 +183,9 @@ } i = 0; if (backend->module_has_testament(navbar.module_name, 2)) { - while(i < key.BMAX[1]) { - //g_message((const char *)key.books[1][i].name); - book = g_convert((const char *)key.books[1][i].name, + while(i < key.BMAX[1]) { + key_abrev = key.books[1][i].name; + book = g_convert((const char *)key_abrev.getBookAbbrev(), -1, UTF_8, OLD_CODESET, Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/FC-5/gnomesword.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnomesword.spec 25 Apr 2006 07:43:47 -0000 1.10 +++ gnomesword.spec 2 May 2006 15:50:24 -0000 1.11 @@ -1,12 +1,13 @@ Name: gnomesword Version: 2.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text License: GPL URL: http://gnomesword.sourceforge.net/ Source0: http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz +Patch0: gnomesword-2.1.6-svn1213-kjvot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sed >= 3.95 @@ -32,6 +33,7 @@ %prep %setup -q +%patch0 -p1 %{__sed} -i 's?\r??' doc/help/C/legal.xml %{__sed} -i 's?\r??' doc/help/fr/legal.xml @@ -80,6 +82,10 @@ %changelog +* Tue May 02 2006 Michael A. Peters - 2.1.6-2 +- Fixed crash when viewing OT using KJV module (Patch0) +- Closes bug 190413 + * Tue Apr 25 2006 Michael A. Peters - 2.1.6-1 - New upstream version - removed commented out fixes for since upstream fixed 64-bit issues From fedora-extras-commits at redhat.com Tue May 2 15:50:25 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 2 May 2006 08:50:25 -0700 Subject: rpms/gnomesword/devel gnomesword-2.1.6-svn1213-kjvot.patch, NONE, 1.1 gnomesword.spec, 1.9, 1.10 Message-ID: <200605021550.k42FoRVh013938@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gnomesword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886/devel Modified Files: gnomesword.spec Added Files: gnomesword-2.1.6-svn1213-kjvot.patch Log Message: Fixes bug 190413 gnomesword-2.1.6-svn1213-kjvot.patch: --- NEW FILE gnomesword-2.1.6-svn1213-kjvot.patch --- diff -ur gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp --- gnomesword-2.1.6/src/backend/gs_osishtmlhref.cpp 2006-04-04 10:16:30.000000000 -0700 +++ gnomesword-2.1.6-patched/src/backend/gs_osishtmlhref.cpp 2006-05-02 08:29:36.000000000 -0700 @@ -408,7 +408,10 @@ // else if (!strcmp(tag.getName(), "milestone")&& tag.getAttribute("type")) { if(!strcmp(tag.getAttribute("type"),"x-p")) - buf += tag.getAttribute("marker"); + if( tag.getAttribute("marker")) + buf += tag.getAttribute("marker"); + else + buf += ""; else if(!strcmp(tag.getAttribute("type"), "line")) { buf += "
    "; //g_message("\ntoken: %s\ntag: %s\ntype: %s",token,tag.getName(),tag.getAttribute("type")); @@ -437,7 +440,7 @@ if(u->inName) { char firstChar = *u->lastTextNode.c_str(); const char *name = u->lastTextNode.c_str(); - g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name); + //g_message("\nverse: %s\ntoken: %s\nname: %s",(char*)u->key->getText(), token,name); ++name; buf += firstChar; buf += ""; diff -ur gnomesword-2.1.6/src/backend/sword_main.cc gnomesword-2.1.6-patched/src/backend/sword_main.cc --- gnomesword-2.1.6/src/backend/sword_main.cc 2006-04-04 13:46:50.000000000 -0700 +++ gnomesword-2.1.6-patched/src/backend/sword_main.cc 2006-05-02 08:29:36.000000000 -0700 @@ -486,7 +486,8 @@ vkey.AutoNormalize(1); vkey = mykey; g_free(mykey); - mykey = g_convert((char*)vkey.getText(), + + mykey = g_convert((char*)vkey.getShortText(), -1, UTF_8, OLD_CODESET, diff -ur gnomesword-2.1.6/src/gnome2/main_window.c gnomesword-2.1.6-patched/src/gnome2/main_window.c --- gnomesword-2.1.6/src/gnome2/main_window.c 2006-04-12 11:17:31.000000000 -0700 +++ gnomesword-2.1.6-patched/src/gnome2/main_window.c 2006-05-02 08:29:36.000000000 -0700 @@ -806,6 +806,24 @@ settings.gs_hight); } +/* +void new_main_window(void) +{ + gchar *glade_file; + GladeXML *gxml; + + glade_file = + gui_general_user_file("main-window.glade", FALSE); + g_return_if_fail(glade_file != NULL); + g_message(glade_file); + + // ** build the widget ** + gxml = glade_xml_new(glade_file, "main-window", NULL); + + + +} + /****************************************************************************** * Name diff -ur gnomesword-2.1.6/src/gnome2/search_dialog.c gnomesword-2.1.6-patched/src/gnome2/search_dialog.c --- gnomesword-2.1.6/src/gnome2/search_dialog.c 2006-03-29 08:27:16.000000000 -0800 +++ gnomesword-2.1.6-patched/src/gnome2/search_dialog.c 2006-05-02 08:29:36.000000000 -0700 @@ -22,7 +22,7 @@ #ifdef HAVE_CONFIG_H #include #endif - + #include #include diff -ur gnomesword-2.1.6/src/main/display.cc gnomesword-2.1.6-patched/src/main/display.cc --- gnomesword-2.1.6/src/main/display.cc 2006-04-02 20:08:46.000000000 -0700 +++ gnomesword-2.1.6-patched/src/main/display.cc 2006-05-02 08:29:36.000000000 -0700 @@ -400,21 +400,20 @@ main_set_strongs_morphs_off(ops); } #endif -/* if (newparagraph && settings.versestyle) { + if (newparagraph && settings.versestyle) { newparagraph = FALSE; swbuf += paragraphMark;; } -*/ + swbuf += (const char *)imodule; buf = g_strdup_printf("%s",(const char *)imodule); if (settings.versestyle) { - /*if(g_strstr_len(buf,strlen(buf),"")|| - g_strstr_len(buf,strlen(buf),"

    ")) { + if(g_strstr_len(buf,strlen(buf),"")) { newparagraph = TRUE; } else { newparagraph = FALSE; - }*/ + } swbuf.append("
    "); } else { swbuf.append(""); diff -ur gnomesword-2.1.6/src/main/navbar.cc gnomesword-2.1.6-patched/src/main/navbar.cc --- gnomesword-2.1.6/src/main/navbar.cc 2006-03-14 13:41:21.000000000 -0800 +++ gnomesword-2.1.6-patched/src/main/navbar.cc 2006-05-02 08:29:36.000000000 -0700 @@ -137,6 +137,7 @@ void main_navbar_fill_book_combo(NAVBAR navbar) { VerseKey key; + VerseKey key_abrev; gsize bytes_read; gsize bytes_written; GError *error = NULL; @@ -155,15 +156,16 @@ GTK_COMBO_BOX(navbar.comboboxentry_book)); gtk_list_store_clear(GTK_LIST_STORE(book_model)); if (backend->module_has_testament(navbar.module_name, 1)) { - while(i < key.BMAX[0]) { - - book = g_convert((const char *)key.books[0][i].name, + while(i < key.BMAX[0]) { + key_abrev = key.books[0][i].name; + book = g_convert((const char *)key_abrev.getBookAbbrev(), -1, UTF_8, OLD_CODESET, &bytes_read, &bytes_written, &error); + if(book == NULL) { g_print ("error: %s\n", error->message); g_error_free (error); @@ -181,9 +183,9 @@ } i = 0; if (backend->module_has_testament(navbar.module_name, 2)) { - while(i < key.BMAX[1]) { - //g_message((const char *)key.books[1][i].name); - book = g_convert((const char *)key.books[1][i].name, + while(i < key.BMAX[1]) { + key_abrev = key.books[1][i].name; + book = g_convert((const char *)key_abrev.getBookAbbrev(), -1, UTF_8, OLD_CODESET, Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnomesword.spec 25 Apr 2006 07:41:35 -0000 1.9 +++ gnomesword.spec 2 May 2006 15:50:25 -0000 1.10 @@ -1,12 +1,13 @@ Name: gnomesword Version: 2.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text License: GPL URL: http://gnomesword.sourceforge.net/ Source0: http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz +Patch0: gnomesword-2.1.6-svn1213-kjvot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sed >= 3.95 @@ -32,6 +33,7 @@ %prep %setup -q +%patch0 -p1 %{__sed} -i 's?\r??' doc/help/C/legal.xml %{__sed} -i 's?\r??' doc/help/fr/legal.xml @@ -80,6 +82,10 @@ %changelog +* Tue May 02 2006 Michael A. Peters - 2.1.6-2 +- Fixed crash when viewing OT using KJV module (Patch0) +- Closes bug 190413 + * Tue Apr 25 2006 Michael A. Peters - 2.1.6-1 - New upstream version - removed commented out fixes for since upstream fixed 64-bit issues From fedora-extras-commits at redhat.com Tue May 2 15:51:01 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 08:51:01 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3 Message-ID: <200605021551.k42Fp3Ye013975@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13870/devel Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Log Message: Fixed bug #190379 Moved options from init script to sysconfig file dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq-2.30-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:16:45 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 15:51:01 -0000 1.2 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh ---- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500 +--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-05-02 09:35:27.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 09:48:47.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,58 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,19 +19,10 @@ + dnsmasq=/usr/sbin/dnsmasq + [ -f $dnsmasq ] || exit 0 + +-# change this line if you want dnsmasq to serve an MX record for +-# the host it is running on. +-MAILHOSTNAME="" +-# change this line if you want dns to get its upstream servers from +-# somewhere other that /etc/resolv.conf +-RESOLV_CONF="" +-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from +-# a dhcpd's lease file +-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" +-DOMAIN_SUFFIX=`dnsdomainname` +- +-OPTIONS="" ++# source /etc/sysconfig/dnsmasq if it exists ++[ -f /etc/sysconfig/dnsmasq ] && . /etc/sysconfig/dnsmasq + ++# apply options from /etc/sysconfig/dnsmasq if they're set + if [ ! -z "${MAILHOSTNAME}" ]; then + OPTIONS="$OPTIONS -m $MAILHOSTNAME" + fi +@@ -72,7 +63,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? +diff -urN dnsmasq-2.30/rpm/dnsmasq.sysconfig dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig +--- dnsmasq-2.30/rpm/dnsmasq.sysconfig 1969-12-31 18:00:00.000000000 -0600 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig 2006-05-02 09:49:42.000000000 -0500 +@@ -0,0 +1,13 @@ ++# change this line if you want dnsmasq to serve an MX record for ++# the host it is running on. ++MAILHOSTNAME="" ++# change this line if you want dns to get its upstream servers from ++# somewhere other that /etc/resolv.conf ++RESOLV_CONF="" ++# change this if you want dnsmasq to cache any "hostname" or "client-hostname" ++# from a dhcpd's lease file ++# (deprecated!) ++#DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" ++DOMAIN_SUFFIX=`dnsdomainname` ++# other options? ++OPTIONS="" Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq.spec 27 Apr 2006 15:06:50 -0000 1.2 +++ dnsmasq.spec 2 May 2006 15:51:01 -0000 1.3 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -36,6 +37,7 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,13 @@ rm -rf $RPM_BUILD_ROOT # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ - $RPM_BUILD_ROOT%{_mandir}/man8 + $RPM_BUILD_ROOT%{_mandir}/man8 \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +install rpm/dnsmasq.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dnsmasq +install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -73,13 +79,20 @@ %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 -%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/dnsmasq +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 +- Moved options out of init script and into /etc/sysconfig/dnsmasq +- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 +- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball + * Thu Apr 27 2006 Patrick "Jima" Laughton 2.30-3 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request) - Split initscript & enable-dbus patches, conditionalized dbus for FC3 From fedora-extras-commits at redhat.com Tue May 2 15:51:28 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 08:51:28 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.30-dbus-config.patch,NONE,1.1 Message-ID: <200605021551.k42FpUS4014012@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13992/devel Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + From fedora-extras-commits at redhat.com Tue May 2 16:19:59 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:19:59 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.30-initscript.patch, 1.2, 1.3 dnsmasq.spec, 1.3, 1.4 Message-ID: <200605021620.k42GK14K016533@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16510/devel Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Log Message: More upstream-recommended cleanups :) dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq-2.30-initscript.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq-2.30-initscript.patch 2 May 2006 15:51:01 -0000 1.2 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:19:59 -0000 1.3 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh ---- dnsmasq-2.30/rpm/dnsmasq.rh 2006-05-02 09:35:27.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 09:48:47.000000000 -0500 +--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,7 +10,7 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid -@@ -19,19 +19,10 @@ +@@ -19,33 +19,9 @@ dnsmasq=/usr/sbin/dnsmasq [ -f $dnsmasq ] || exit 0 @@ -23,17 +23,29 @@ -# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from -# a dhcpd's lease file -DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" --DOMAIN_SUFFIX=`dnsdomainname` + DOMAIN_SUFFIX=`dnsdomainname` - -OPTIONS="" -+# source /etc/sysconfig/dnsmasq if it exists -+[ -f /etc/sysconfig/dnsmasq ] && . /etc/sysconfig/dnsmasq - -+# apply options from /etc/sysconfig/dnsmasq if they're set - if [ ! -z "${MAILHOSTNAME}" ]; then - OPTIONS="$OPTIONS -m $MAILHOSTNAME" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" fi -@@ -72,7 +63,13 @@ + + RETVAL=0 +@@ -72,7 +48,13 @@ status dnsmasq RETVAL=$? ;; @@ -48,20 +60,3 @@ $0 stop $0 start RETVAL=$? -diff -urN dnsmasq-2.30/rpm/dnsmasq.sysconfig dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig ---- dnsmasq-2.30/rpm/dnsmasq.sysconfig 1969-12-31 18:00:00.000000000 -0600 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig 2006-05-02 09:49:42.000000000 -0500 -@@ -0,0 +1,13 @@ -+# change this line if you want dnsmasq to serve an MX record for -+# the host it is running on. -+MAILHOSTNAME="" -+# change this line if you want dns to get its upstream servers from -+# somewhere other that /etc/resolv.conf -+RESOLV_CONF="" -+# change this if you want dnsmasq to cache any "hostname" or "client-hostname" -+# from a dhcpd's lease file -+# (deprecated!) -+#DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" -+DOMAIN_SUFFIX=`dnsdomainname` -+# other options? -+OPTIONS="" Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 15:51:01 -0000 1.3 +++ dnsmasq.spec 2 May 2006 16:19:59 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 4%{?dist} +Release: 4.1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -34,10 +34,10 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %if "%{dist}" != ".fc3" -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 %endif %build @@ -53,7 +53,6 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf -install rpm/dnsmasq.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dnsmasq install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -80,7 +79,6 @@ %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/dnsmasq %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq @@ -88,6 +86,11 @@ %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.1 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 - Moved options out of init script and into /etc/sysconfig/dnsmasq - Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 From fedora-extras-commits at redhat.com Tue May 2 16:28:07 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:28:07 -0700 Subject: rpms/dnsmasq/devel dnsmasq.spec,1.4,1.5 Message-ID: <200605021628.k42GS9jb016641@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16624/devel Modified Files: dnsmasq.spec Log Message: Fix stupid mistake with dnsmasq.spec Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnsmasq.spec 2 May 2006 16:19:59 -0000 1.4 +++ dnsmasq.spec 2 May 2006 16:28:07 -0000 1.5 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 4.1%{?dist} +Release: 4.2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -34,10 +34,10 @@ %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %if "%{dist}" != ".fc3" -#%patch1 -p1 -#%patch2 -p1 +%patch1 -p1 +%patch2 -p1 %endif %build @@ -86,7 +86,7 @@ %changelog -* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.1 +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) - Tweaked init script a little more From fedora-extras-commits at redhat.com Tue May 2 16:37:48 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:37:48 -0700 Subject: rpms/dnsmasq/FC-3 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.6, 1.7 Message-ID: <200605021637.k42GbpW4016765@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/FC-3 Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Fixed bug #190379 Moved options from init script to sysconfig file Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq-2.30-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:54:51 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:48 -0000 1.2 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh --- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,53 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,33 +19,9 @@ + dnsmasq=/usr/sbin/dnsmasq + [ -f $dnsmasq ] || exit 0 + +-# change this line if you want dnsmasq to serve an MX record for +-# the host it is running on. +-MAILHOSTNAME="" +-# change this line if you want dns to get its upstream servers from +-# somewhere other that /etc/resolv.conf +-RESOLV_CONF="" +-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from +-# a dhcpd's lease file +-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" + DOMAIN_SUFFIX=`dnsdomainname` +- +-OPTIONS="" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" + fi + + RETVAL=0 +@@ -72,7 +48,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dnsmasq.spec 27 Apr 2006 15:54:51 -0000 1.6 +++ dnsmasq.spec 2 May 2006 16:37:48 -0000 1.7 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4.2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -36,6 +37,7 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,12 @@ rm -rf $RPM_BUILD_ROOT # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ - $RPM_BUILD_ROOT%{_mandir}/man8 + $RPM_BUILD_ROOT%{_mandir}/man8 \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -73,13 +78,24 @@ %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 -%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 +- Moved options out of init script and into /etc/sysconfig/dnsmasq +- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 +- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball + * Thu Apr 27 2006 Patrick "Jima" Laughton 2.30-3 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request) - Split initscript & enable-dbus patches, conditionalized dbus for FC3 From fedora-extras-commits at redhat.com Tue May 2 16:37:50 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:37:50 -0700 Subject: rpms/dnsmasq/FC-5 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3 Message-ID: <200605021637.k42GbqFX016783@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/FC-5 Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Fixed bug #190379 Moved options from init script to sysconfig file Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq-2.30-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:54:52 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:50 -0000 1.2 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh --- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,53 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,33 +19,9 @@ + dnsmasq=/usr/sbin/dnsmasq + [ -f $dnsmasq ] || exit 0 + +-# change this line if you want dnsmasq to serve an MX record for +-# the host it is running on. +-MAILHOSTNAME="" +-# change this line if you want dns to get its upstream servers from +-# somewhere other that /etc/resolv.conf +-RESOLV_CONF="" +-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from +-# a dhcpd's lease file +-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" + DOMAIN_SUFFIX=`dnsdomainname` +- +-OPTIONS="" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" + fi + + RETVAL=0 +@@ -72,7 +48,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq.spec 27 Apr 2006 15:54:52 -0000 1.2 +++ dnsmasq.spec 2 May 2006 16:37:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4.2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -36,6 +37,7 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,12 @@ rm -rf $RPM_BUILD_ROOT # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ - $RPM_BUILD_ROOT%{_mandir}/man8 + $RPM_BUILD_ROOT%{_mandir}/man8 \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -73,13 +78,24 @@ %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 -%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 +- Moved options out of init script and into /etc/sysconfig/dnsmasq +- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 +- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball + * Thu Apr 27 2006 Patrick "Jima" Laughton 2.30-3 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request) - Split initscript & enable-dbus patches, conditionalized dbus for FC3 From fedora-extras-commits at redhat.com Tue May 2 16:37:49 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:37:49 -0700 Subject: rpms/dnsmasq/FC-4 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3 Message-ID: <200605021637.k42GbpQg016775@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16708/FC-4 Modified Files: dnsmasq-2.30-initscript.patch dnsmasq.spec Added Files: dnsmasq-2.30-dbus-config.patch Log Message: Fixed bug #190379 Moved options from init script to sysconfig file Added dbus configuration file dnsmasq-2.30-dbus-config.patch: --- NEW FILE dnsmasq-2.30-dbus-config.patch --- diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf --- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + dnsmasq-2.30-initscript.patch: Index: dnsmasq-2.30-initscript.patch =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq-2.30-initscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:54:52 -0000 1.1 +++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:49 -0000 1.2 @@ -1,6 +1,6 @@ diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh --- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500 -+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500 ++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500 @@ -2,7 +2,7 @@ # # Startup script for the DNS caching server @@ -10,3 +10,53 @@ # description: This script starts your DNS caching server # processname: dnsmasq # pidfile: /var/run/dnsmasq.pid +@@ -19,33 +19,9 @@ + dnsmasq=/usr/sbin/dnsmasq + [ -f $dnsmasq ] || exit 0 + +-# change this line if you want dnsmasq to serve an MX record for +-# the host it is running on. +-MAILHOSTNAME="" +-# change this line if you want dns to get its upstream servers from +-# somewhere other that /etc/resolv.conf +-RESOLV_CONF="" +-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from +-# a dhcpd's lease file +-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases" + DOMAIN_SUFFIX=`dnsdomainname` +- +-OPTIONS="" +- +-if [ ! -z "${MAILHOSTNAME}" ]; then +- OPTIONS="$OPTIONS -m $MAILHOSTNAME" +-fi +- +-if [ ! -z "${RESOLV_CONF}" ]; then +- OPTIONS="$OPTIONS -r $RESOLV_CONF" +-fi +- +-if [ ! -z "${DHCP_LEASE}" ]; then +- OPTIONS="$OPTIONS -l $DHCP_LEASE" +-fi +- + if [ ! -z "${DOMAIN_SUFFIX}" ]; then +- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX" ++ OPTIONS="-s $DOMAIN_SUFFIX" + fi + + RETVAL=0 +@@ -72,7 +48,13 @@ + status dnsmasq + RETVAL=$? + ;; +- restart|reload) ++ reload) ++ echo -n "Reloading dnsmasq: " ++ killproc dnsmasq -HUP ++ RETVAL=$? ++ echo ++ ;; ++ restart) + $0 stop + $0 start + RETVAL=$? Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dnsmasq.spec 27 Apr 2006 15:54:52 -0000 1.2 +++ dnsmasq.spec 2 May 2006 16:37:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 3%{?dist} +Release: 4.2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -36,6 +37,7 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 +%patch2 -p1 %endif %build @@ -46,9 +48,12 @@ rm -rf $RPM_BUILD_ROOT # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ - $RPM_BUILD_ROOT%{_mandir}/man8 + $RPM_BUILD_ROOT%{_mandir}/man8 \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -73,13 +78,24 @@ %files %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 -%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 +- More upstream-recommended cleanups :) +- Killed sysconfig file (provides unneeded functionality) +- Tweaked init script a little more + +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4 +- Moved options out of init script and into /etc/sysconfig/dnsmasq +- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379 +- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball + * Thu Apr 27 2006 Patrick "Jima" Laughton 2.30-3 - Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request) - Split initscript & enable-dbus patches, conditionalized dbus for FC3 From fedora-extras-commits at redhat.com Tue May 2 16:48:07 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Tue, 2 May 2006 09:48:07 -0700 Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.7,1.8 Message-ID: <200605021648.k42Gm9DB016936@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16919/FC-3 Modified Files: dnsmasq.spec Log Message: Don't install dbus/dnsmasq.conf on FC3 (dbus too old) Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dnsmasq.spec 2 May 2006 16:37:48 -0000 1.7 +++ dnsmasq.spec 2 May 2006 16:48:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.30 -Release: 4.2%{?dist} +Release: 4.2%{?dist}.1 Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -53,7 +53,9 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ +%endif install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -79,13 +81,18 @@ %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2.fc3.1 +- Don't install dbus/dnsmasq.conf on FC3 (dbus too old) + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) From fedora-extras-commits at redhat.com Tue May 2 18:22:42 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 2 May 2006 11:22:42 -0700 Subject: rpms/libipoddevice/FC-5 .cvsignore, 1.2, 1.3 libipoddevice.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605021822.k42IMiAq021689@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21668 Modified Files: .cvsignore libipoddevice.spec sources Log Message: * Tue May 2 2006 Christopher Aillon 0.4.5-1 - Update to 0.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 00:42:27 -0000 1.2 +++ .cvsignore 2 May 2006 18:22:42 -0000 1.3 @@ -1 +1 @@ -libipoddevice-0.4.1.tar.gz +libipoddevice-0.4.5.tar.gz Index: libipoddevice.spec =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/FC-5/libipoddevice.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libipoddevice.spec 3 Mar 2006 00:42:27 -0000 1.1 +++ libipoddevice.spec 2 May 2006 18:22:42 -0000 1.2 @@ -2,8 +2,8 @@ %define hal_ver 0.5.2 Name: libipoddevice -Version: 0.4.1 -Release: 1 +Version: 0.4.5 +Release: 1%{?dist} Summary: Device-specific layer for the Apple iPod Group: Development/Libraries @@ -67,5 +67,8 @@ %changelog +* Tue May 2 2006 Christopher Aillon 0.4.5-1 +- Update to 0.4.5 + * Tue Feb 21 2006 Christopher Aillon 0.4.1-1 - Initial RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 00:42:27 -0000 1.2 +++ sources 2 May 2006 18:22:42 -0000 1.3 @@ -1 +1 @@ -000b3c7b82026bf052a16811ba34c515 libipoddevice-0.4.1.tar.gz +aac402761cf2eca2b16d14acf81dd2b3 libipoddevice-0.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 2 18:28:57 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 2 May 2006 11:28:57 -0700 Subject: rpms/libipoddevice/devel .cvsignore, 1.2, 1.3 libipoddevice.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605021828.k42ISxm5021776@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21755 Modified Files: .cvsignore libipoddevice.spec sources Log Message: * Tue May 2 2006 Christopher Aillon 0.4.5-1 - Update to 0.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 00:42:27 -0000 1.2 +++ .cvsignore 2 May 2006 18:28:57 -0000 1.3 @@ -1 +1 @@ -libipoddevice-0.4.1.tar.gz +libipoddevice-0.4.5.tar.gz Index: libipoddevice.spec =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/libipoddevice.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libipoddevice.spec 3 Mar 2006 00:42:27 -0000 1.1 +++ libipoddevice.spec 2 May 2006 18:28:57 -0000 1.2 @@ -2,8 +2,8 @@ %define hal_ver 0.5.2 Name: libipoddevice -Version: 0.4.1 -Release: 1 +Version: 0.4.5 +Release: 1%{?dist} Summary: Device-specific layer for the Apple iPod Group: Development/Libraries @@ -67,5 +67,8 @@ %changelog +* Tue May 2 2006 Christopher Aillon 0.4.5-1 +- Update to 0.4.5 + * Tue Feb 21 2006 Christopher Aillon 0.4.1-1 - Initial RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 00:42:27 -0000 1.2 +++ sources 2 May 2006 18:28:57 -0000 1.3 @@ -1 +1 @@ -000b3c7b82026bf052a16811ba34c515 libipoddevice-0.4.1.tar.gz +aac402761cf2eca2b16d14acf81dd2b3 libipoddevice-0.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 2 20:28:39 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 13:28:39 -0700 Subject: fedora-security/tools - New directory Message-ID: <200605022028.k42KSdRk026597@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26582/tools Log Message: Directory /cvs/fedora/fedora-security/tools added to the repository From fedora-extras-commits at redhat.com Tue May 2 20:29:34 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 13:29:34 -0700 Subject: fedora-security/tools package-release,NONE,1.1 Message-ID: <200605022029.k42KTYGL026625@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26608/tools Added Files: package-release Log Message: Initial commit of a script to query the various packages shipped in extras. ***** Error reading new file: [Errno 2] No such file or directory: 'package-release' From fedora-extras-commits at redhat.com Tue May 2 21:04:25 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 14:04:25 -0700 Subject: CVSROOT avail,1.29,1.30 Message-ID: <200605022104.k42L4PbT028991@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28967 Modified Files: avail Log Message: Add the inital members of the Fedora Security Response Team Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- avail 1 May 2006 21:44:36 -0000 1.29 +++ avail 2 May 2006 21:04:22 -0000 1.30 @@ -41,8 +41,12 @@ avail | eitch | web/html/download avail | eitch | web/html/Download +# Fedora security repository unavail | | fedora-security +# Red Hat Security Response Team avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security +# Fedora Security Response Team +avail | jkeating,ausil,tibbs,kaboom | fedora-security avail | pfrields | web/html/projects/docs avail | pfrields | web/html/participate/documentation-faq From fedora-extras-commits at redhat.com Tue May 2 21:07:43 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 14:07:43 -0700 Subject: fedora-security/audit fe4,NONE,1.1 fe5,NONE,1.1 Message-ID: <200605022107.k42L7hQ4029034@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29015 Added Files: fe4 fe5 Log Message: Add empty files for the tracking of fedora extras security issues. ***** Error reading new file: [Errno 2] No such file or directory: 'fe4' ***** Error reading new file: [Errno 2] No such file or directory: 'fe5' From fedora-extras-commits at redhat.com Tue May 2 21:27:10 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 2 May 2006 14:27:10 -0700 Subject: CVSROOT avail,1.30,1.31 Message-ID: <200605022127.k42LRAUY029120@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100 Modified Files: avail Log Message: Restrict the Fedora Security Response Team's access to the fc4/fc5 files. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- avail 2 May 2006 21:04:22 -0000 1.30 +++ avail 2 May 2006 21:27:07 -0000 1.31 @@ -47,6 +47,8 @@ avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security # Fedora Security Response Team avail | jkeating,ausil,tibbs,kaboom | fedora-security +unavail | jkeating,ausil,tibbs,kaboom | fedora-security/audit/fc4 +unavail | jkeating,ausil,tibbs,kaboom | fedora-security/audit/fc5 avail | pfrields | web/html/projects/docs avail | pfrields | web/html/participate/documentation-faq From fedora-extras-commits at redhat.com Tue May 2 21:28:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 2 May 2006 14:28:59 -0700 Subject: owners owners.list,1.935,1.936 Message-ID: <200605022129.k42LT1NZ029160@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29141 Modified Files: owners.list Log Message: Take ownership of perl-XML-DOM and perl-XML-RegExp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.935 retrieving revision 1.936 diff -u -r1.935 -r1.936 --- owners.list 2 May 2006 13:54:24 -0000 1.935 +++ owners.list 2 May 2006 21:28:58 -0000 1.936 @@ -1204,9 +1204,9 @@ Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 2 21:29:41 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:29:41 -0700 Subject: rpms/putty/FC-5 putty.spec,1.11,1.12 Message-ID: <200605022129.k42LThvH029229@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/putty/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-5 Modified Files: putty.spec Log Message: taking ownership of package Index: putty.spec =================================================================== RCS file: /cvs/extras/rpms/putty/FC-5/putty.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- putty.spec 26 Feb 2006 07:51:47 -0000 1.11 +++ putty.spec 2 May 2006 21:29:41 -0000 1.12 @@ -1,6 +1,6 @@ Name: putty Version: 0.58 -Release: 1 +Release: 2%{?dist} Summary: SSH, Telnet and Rlogin client License: MIT Group: Applications/Internet @@ -12,22 +12,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel desktop-file-utils sed - %description Putty is a SSH, Telnet & Rlogin client - this time for Linux. - %prep -cat< - 0.58-2 +- rebuild + * Tue Apr 19 2005 Adrian Reber - 0.58-1 - Updated to 0.58 From fedora-extras-commits at redhat.com Tue May 2 21:29:41 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:29:41 -0700 Subject: rpms/putty/devel putty.spec,1.11,1.12 Message-ID: <200605022129.k42LThTr029233@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/putty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/devel Modified Files: putty.spec Log Message: taking ownership of package Index: putty.spec =================================================================== RCS file: /cvs/extras/rpms/putty/devel/putty.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- putty.spec 26 Feb 2006 07:51:47 -0000 1.11 +++ putty.spec 2 May 2006 21:29:41 -0000 1.12 @@ -1,6 +1,6 @@ Name: putty Version: 0.58 -Release: 1 +Release: 2%{?dist} Summary: SSH, Telnet and Rlogin client License: MIT Group: Applications/Internet @@ -12,22 +12,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel desktop-file-utils sed - %description Putty is a SSH, Telnet & Rlogin client - this time for Linux. - %prep -cat< - 0.58-2 +- rebuild + * Tue Apr 19 2005 Adrian Reber - 0.58-1 - Updated to 0.58 From fedora-extras-commits at redhat.com Tue May 2 21:29:34 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:29:34 -0700 Subject: rpms/putty/FC-3 putty.spec,1.7,1.8 Message-ID: <200605022130.k42LU67J029248@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/putty/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-3 Modified Files: putty.spec Log Message: taking ownership of package Index: putty.spec =================================================================== RCS file: /cvs/extras/rpms/putty/FC-3/putty.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- putty.spec 21 Feb 2005 13:18:35 -0000 1.7 +++ putty.spec 2 May 2006 21:29:34 -0000 1.8 @@ -1,40 +1,35 @@ -Name: putty -Version: 0.57 -Release: 1 -Epoch: 0 -Summary: Putty - a SSH, Telnet & Rlogin client -License: MIT -Group: Applications/Internet -Url: http://www.chiark.greenend.org.uk/~sgtatham/putty/ -Source0: http://the.earth.li/~sgtatham/putty/latest/putty-0.57.tar.gz -Source1: putty.desktop -Source2: putty.png -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel desktop-file-utils - - -#--------------------------------------------------------------------- +Name: putty +Version: 0.58 +Release: 2%{?dist} +Summary: SSH, Telnet and Rlogin client +License: MIT +Group: Applications/Internet +URL: http://www.chiark.greenend.org.uk/~sgtatham/putty/ +Source0: http://the.earth.li/~sgtatham/putty/latest/putty-0.58.tar.gz +Source1: http://the.earth.li/~sgtatham/putty/latest/putty-0.58.tar.gz.RSA +Source2: putty.desktop +Source3: putty.png +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gtk+-devel desktop-file-utils sed %description Putty is a SSH, Telnet & Rlogin client - this time for Linux. -#--------------------------------------------------------------------- - %prep -%setup -q -#--------------------------------------------------------------------- +%setup -q %build +%{__sed} -i -e "/.*sbcsdat.c/d" manifest ./mkfiles.pl pushd unix -perl -pi -e "s,-O2,$RPM_OPT_FLAGS,g;s,/usr/local,%{_prefix},g" Makefile.gtk +%{__sed} -i -e "s/-O2 -Wall -Werror/$RPM_OPT_FLAGS/g" \ + -e "s,/usr/local,%{_prefix},g" \ + Makefile.gtk ln -s Makefile.gtk Makefile make %{?_smp_mflags} popd -#--------------------------------------------------------------------- - %install rm -rf $RPM_BUILD_ROOT pushd unix @@ -49,11 +44,9 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 644 \ --add-category X-Fedora \ - %{SOURCE1} - -install -m644 -D -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png + %{SOURCE2} -#--------------------------------------------------------------------- +install -m644 -D -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png %files %defattr(-,root,root) @@ -67,6 +60,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 03 2006 Michael J. Knox - 0.58-2 +- rebuild + +* Tue Apr 19 2005 Adrian Reber - 0.58-1 +- Updated to 0.58 + +* Tue Feb 29 2005 Adrian Reber - 0.57-2 +- fix build with gcc4 + * Mon Feb 21 2005 Adrian Reber - 0.57-1 - Updated to 0.57 From fedora-extras-commits at redhat.com Tue May 2 21:29:35 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:29:35 -0700 Subject: rpms/putty/FC-4 putty.spec,1.10,1.11 Message-ID: <200605022130.k42LU7gc029251@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/putty/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29166/FC-4 Modified Files: putty.spec Log Message: taking ownership of package Index: putty.spec =================================================================== RCS file: /cvs/extras/rpms/putty/FC-4/putty.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- putty.spec 19 Apr 2005 12:22:49 -0000 1.10 +++ putty.spec 2 May 2006 21:29:35 -0000 1.11 @@ -1,6 +1,6 @@ Name: putty Version: 0.58 -Release: 1 +Release: 2%{?dist} Summary: SSH, Telnet and Rlogin client License: MIT Group: Applications/Internet @@ -12,14 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel desktop-file-utils sed - %description Putty is a SSH, Telnet & Rlogin client - this time for Linux. - %prep -%setup -q +%setup -q %build %{__sed} -i -e "/.*sbcsdat.c/d" manifest @@ -32,7 +30,6 @@ make %{?_smp_mflags} popd - %install rm -rf $RPM_BUILD_ROOT pushd unix @@ -51,7 +48,6 @@ install -m644 -D -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/putty.png - %files %defattr(-,root,root) %doc LICENCE @@ -60,12 +56,13 @@ %{_datadir}/applications/* %{_datadir}/pixmaps/putty.png - %clean rm -rf $RPM_BUILD_ROOT - %changelog +* Wed May 03 2006 Michael J. Knox - 0.58-2 +- rebuild + * Tue Apr 19 2005 Adrian Reber - 0.58-1 - Updated to 0.58 From fedora-extras-commits at redhat.com Tue May 2 21:32:02 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 14:32:02 -0700 Subject: owners owners.list,1.936,1.937 Message-ID: <200605022132.k42LW4UA029284@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29267 Modified Files: owners.list Log Message: taking ownership of putty Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.936 retrieving revision 1.937 diff -u -r1.936 -r1.937 --- owners.list 2 May 2006 21:28:58 -0000 1.936 +++ owners.list 2 May 2006 21:32:02 -0000 1.937 @@ -1261,7 +1261,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-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|pwgen|Automatic password generation|jbowes at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pybliographer|A framework for working with bibliographic databases|z.kota at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 2 22:52:21 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:52:21 -0700 Subject: rpms/libibverbs import.log,1.10,1.11 Message-ID: <200605022252.k42MqNAE032158@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32123 Modified Files: import.log Log Message: auto-import libibverbs-1.0.3-1 on branch devel from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 14 Mar 2006 06:18:39 -0000 1.10 +++ import.log 2 May 2006 22:52:21 -0000 1.11 @@ -7,3 +7,4 @@ libibverbs-1_0-1:FC-4:libibverbs-1.0-1.src.rpm:1142292600 libibverbs-1_0_1-1:HEAD:libibverbs-1.0.1-1.src.rpm:1142315940 libibverbs-1_0_1-1:FC-4:libibverbs-1.0.1-1.src.rpm:1142317199 +libibverbs-1_0_3-1:HEAD:libibverbs-1.0.3-1.src.rpm:1146610338 From fedora-extras-commits at redhat.com Tue May 2 22:52:22 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:52:22 -0700 Subject: rpms/libibverbs/devel .cvsignore, 1.6, 1.7 libibverbs.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605022252.k42MqOQl032164@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32123/devel Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.3-1 on branch devel from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2006 05:57:45 -0000 1.6 +++ .cvsignore 2 May 2006 22:52:22 -0000 1.7 @@ -1 +1 @@ -libibverbs-1.0.1.tar.gz +libibverbs-1.0.3.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libibverbs.spec 14 Mar 2006 05:57:45 -0000 1.5 +++ libibverbs.spec 2 May 2006 22:52:22 -0000 1.6 @@ -1,19 +1,19 @@ # $Id$ -%define ver 1.0.1 +%define ver 1.0.3 Name: libibverbs -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sysfsutils-devel +BuildRequires: %{_includedir}/sysfs/libsysfs.h %description libibverbs is a library that allows userspace processes to use @@ -27,7 +27,7 @@ %package devel Summary: Development files for the libibverbs library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} sysfsutils-devel +Requires: %{name} = %{version}-%{release} %{_includedir}/sysfs/libsysfs.h %description devel Static libraries and header files for the libibverbs verbs library. @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 14 2006 Roland Dreier - 1.0.3-1 +- New upstream release + * Mon Mar 13 2006 Roland Dreier - 1.0.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 05:57:45 -0000 1.6 +++ sources 2 May 2006 22:52:22 -0000 1.7 @@ -1 +1 @@ -641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz +344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz From fedora-extras-commits at redhat.com Tue May 2 22:54:40 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:54:40 -0700 Subject: rpms/libibverbs import.log,1.11,1.12 Message-ID: <200605022254.k42Msg4b032332@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299 Modified Files: import.log Log Message: auto-import libibverbs-1.0.3-1 on branch FC-5 from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 2 May 2006 22:52:21 -0000 1.11 +++ import.log 2 May 2006 22:54:40 -0000 1.12 @@ -8,3 +8,4 @@ libibverbs-1_0_1-1:HEAD:libibverbs-1.0.1-1.src.rpm:1142315940 libibverbs-1_0_1-1:FC-4:libibverbs-1.0.1-1.src.rpm:1142317199 libibverbs-1_0_3-1:HEAD:libibverbs-1.0.3-1.src.rpm:1146610338 +libibverbs-1_0_3-1:FC-5:libibverbs-1.0.3-1.src.rpm:1146610477 From fedora-extras-commits at redhat.com Tue May 2 22:54:40 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:54:40 -0700 Subject: rpms/libibverbs/FC-5 .cvsignore, 1.6, 1.7 libibverbs.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605022254.k42Msgvc032339@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/FC-5 Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.3-1 on branch FC-5 from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2006 05:57:45 -0000 1.6 +++ .cvsignore 2 May 2006 22:54:40 -0000 1.7 @@ -1 +1 @@ -libibverbs-1.0.1.tar.gz +libibverbs-1.0.3.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-5/libibverbs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libibverbs.spec 14 Mar 2006 05:57:45 -0000 1.5 +++ libibverbs.spec 2 May 2006 22:54:40 -0000 1.6 @@ -1,19 +1,19 @@ # $Id$ -%define ver 1.0.1 +%define ver 1.0.3 Name: libibverbs -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sysfsutils-devel +BuildRequires: %{_includedir}/sysfs/libsysfs.h %description libibverbs is a library that allows userspace processes to use @@ -27,7 +27,7 @@ %package devel Summary: Development files for the libibverbs library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} sysfsutils-devel +Requires: %{name} = %{version}-%{release} %{_includedir}/sysfs/libsysfs.h %description devel Static libraries and header files for the libibverbs verbs library. @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 14 2006 Roland Dreier - 1.0.3-1 +- New upstream release + * Mon Mar 13 2006 Roland Dreier - 1.0.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 05:57:45 -0000 1.6 +++ sources 2 May 2006 22:54:40 -0000 1.7 @@ -1 +1 @@ -641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz +344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz From fedora-extras-commits at redhat.com Tue May 2 22:55:26 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:55:26 -0700 Subject: rpms/libibverbs import.log,1.12,1.13 Message-ID: <200605022255.k42MtSKs032508@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32471 Modified Files: import.log Log Message: auto-import libibverbs-1.0.3-1 on branch FC-4 from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 2 May 2006 22:54:40 -0000 1.12 +++ import.log 2 May 2006 22:55:26 -0000 1.13 @@ -9,3 +9,4 @@ libibverbs-1_0_1-1:FC-4:libibverbs-1.0.1-1.src.rpm:1142317199 libibverbs-1_0_3-1:HEAD:libibverbs-1.0.3-1.src.rpm:1146610338 libibverbs-1_0_3-1:FC-5:libibverbs-1.0.3-1.src.rpm:1146610477 +libibverbs-1_0_3-1:FC-4:libibverbs-1.0.3-1.src.rpm:1146610524 From fedora-extras-commits at redhat.com Tue May 2 22:55:27 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 2 May 2006 15:55:27 -0700 Subject: rpms/libibverbs/FC-4 .cvsignore, 1.6, 1.7 libibverbs.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605022255.k42MtTIR032514@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32471/FC-4 Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.3-1 on branch FC-4 from libibverbs-1.0.3-1.src.rpm Import libibverbs 1.0.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2006 06:18:46 -0000 1.6 +++ .cvsignore 2 May 2006 22:55:27 -0000 1.7 @@ -1 +1 @@ -libibverbs-1.0.1.tar.gz +libibverbs-1.0.3.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libibverbs.spec 14 Mar 2006 06:18:46 -0000 1.5 +++ libibverbs.spec 2 May 2006 22:55:27 -0000 1.6 @@ -1,19 +1,19 @@ # $Id$ -%define ver 1.0.1 +%define ver 1.0.3 Name: libibverbs -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sysfsutils-devel +BuildRequires: %{_includedir}/sysfs/libsysfs.h %description libibverbs is a library that allows userspace processes to use @@ -27,7 +27,7 @@ %package devel Summary: Development files for the libibverbs library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} sysfsutils-devel +Requires: %{name} = %{version}-%{release} %{_includedir}/sysfs/libsysfs.h %description devel Static libraries and header files for the libibverbs verbs library. @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 14 2006 Roland Dreier - 1.0.3-1 +- New upstream release + * Mon Mar 13 2006 Roland Dreier - 1.0.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 06:18:46 -0000 1.6 +++ sources 2 May 2006 22:55:27 -0000 1.7 @@ -1 +1 @@ -641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz +344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz From fedora-extras-commits at redhat.com Tue May 2 23:01:13 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 16:01:13 -0700 Subject: rpms/prozilla/FC-4 prozilla.spec,1.12,1.13 Message-ID: <200605022301.k42N1n3t002353@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/prozilla/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619/FC-4 Modified Files: prozilla.spec Log Message: taking ownership. Package not sync'ed with upstream due to compiler error. Upstream has been notified. Index: prozilla.spec =================================================================== RCS file: /cvs/extras/rpms/prozilla/FC-4/prozilla.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- prozilla.spec 20 Jan 2006 10:08:02 -0000 1.12 +++ prozilla.spec 2 May 2006 23:01:13 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Advanced Linux download manager Name: prozilla Version: 1.3.7.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet @@ -27,6 +27,7 @@ fastest ping times. %prep + %setup -q %patch0 -p1 -z .buf %configure @@ -51,6 +52,9 @@ %{_mandir}/man1/proz* %changelog +* Wed May 02 2006 Michael J. Knox - 1.3.7.4-3 +- rebuild + * Fri Jan 20 2006 Hans de Goede - Fix CAN-2005-2961 / bugzilla 169791 From fedora-extras-commits at redhat.com Tue May 2 23:01:17 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 16:01:17 -0700 Subject: rpms/prozilla/devel prozilla.spec,1.13,1.14 Message-ID: <200605022301.k42N1nFc002352@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/prozilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619/devel Modified Files: prozilla.spec Log Message: taking ownership. Package not sync'ed with upstream due to compiler error. Upstream has been notified. Index: prozilla.spec =================================================================== RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- prozilla.spec 2 Mar 2006 21:31:31 -0000 1.13 +++ prozilla.spec 2 May 2006 23:01:16 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Advanced Linux download manager Name: prozilla Version: 1.3.7.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet @@ -27,12 +27,6 @@ fastest ping times. %prep -cat< - 1.3.7.4-3 +- rebuild + * Fri Jan 20 2006 Hans de Goede - Fix CAN-2005-2961 / bugzilla 169791 From fedora-extras-commits at redhat.com Tue May 2 23:01:14 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 16:01:14 -0700 Subject: rpms/prozilla/FC-5 prozilla.spec,1.13,1.14 Message-ID: <200605022301.k42N1n1F002351@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/prozilla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619/FC-5 Modified Files: prozilla.spec Log Message: taking ownership. Package not sync'ed with upstream due to compiler error. Upstream has been notified. Index: prozilla.spec =================================================================== RCS file: /cvs/extras/rpms/prozilla/FC-5/prozilla.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- prozilla.spec 2 Mar 2006 21:31:31 -0000 1.13 +++ prozilla.spec 2 May 2006 23:01:13 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Advanced Linux download manager Name: prozilla Version: 1.3.7.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet @@ -27,12 +27,6 @@ fastest ping times. %prep -cat< - 1.3.7.4-3 +- rebuild + * Fri Jan 20 2006 Hans de Goede - Fix CAN-2005-2961 / bugzilla 169791 From fedora-extras-commits at redhat.com Tue May 2 23:03:27 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Tue, 2 May 2006 16:03:27 -0700 Subject: owners owners.list,1.937,1.938 Message-ID: <200605022303.k42N3Txi002393@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371 Modified Files: owners.list Log Message: taking ownership of prozilla Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.937 retrieving revision 1.938 diff -u -r1.937 -r1.938 --- owners.list 2 May 2006 21:32:02 -0000 1.937 +++ owners.list 2 May 2006 23:03:27 -0000 1.938 @@ -1256,7 +1256,7 @@ Fedora Extras|prboom|GPL Doom game engine|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| -Fedora Extras|prozilla|An advanced Linux download manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|prozilla|An advanced Linux download manager|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 2 23:36:33 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:36:33 -0700 Subject: rpms/oddjob import.log,1.14,1.15 Message-ID: <200605022336.k42NaZd5002761@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2728 Modified Files: import.log Log Message: auto-import oddjob-0.26-1 on branch FC-3 from oddjob-0.26-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oddjob/import.log,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import.log 11 Apr 2006 22:23:57 -0000 1.14 +++ import.log 2 May 2006 23:36:33 -0000 1.15 @@ -11,3 +11,4 @@ oddjob-0_25-6:FC-4:oddjob-0.25-6.src.rpm:1144794136 oddjob-0_25-7:FC-5:oddjob-0.25-7.src.rpm:1144794170 oddjob-0_25-8:HEAD:oddjob-0.25-8.src.rpm:1144794233 +oddjob-0_26-1:FC-3:oddjob-0.26-1.src.rpm:1146612987 From fedora-extras-commits at redhat.com Tue May 2 23:36:34 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:36:34 -0700 Subject: rpms/oddjob/FC-3 .cvsignore, 1.4, 1.5 oddjob.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605022336.k42NaaEo002767@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2728/FC-3 Modified Files: .cvsignore oddjob.spec sources Log Message: auto-import oddjob-0.26-1 on branch FC-3 from oddjob-0.26-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2006 22:18:57 -0000 1.4 +++ .cvsignore 2 May 2006 23:36:33 -0000 1.5 @@ -1 +1 @@ -oddjob-0.25-1.tar.gz +oddjob-0.26-1.tar.gz Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-3/oddjob.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- oddjob.spec 11 Apr 2006 22:21:02 -0000 1.5 +++ oddjob.spec 2 May 2006 23:36:33 -0000 1.6 @@ -1,8 +1,8 @@ %define build_sample 0 Name: oddjob -Version: 0.25 -Release: 5 +Version: 0.26 +Release: 1 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,6 +26,7 @@ Group: Development/Libraries Summary: Files for developing oddjob clients Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains header files and static libraries which aid in the @@ -143,6 +144,24 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue May 2 2006 Nalin Dahyabhai 0.26-1 +- update to 0.26-1: + - don't get confused when ACL entries for introspection show up in the + configuration before we add the handlers for them + - export $ODDJOB_CALLING_USER to helpers + +* Tue May 2 2006 Nalin Dahyabhai +- add recommended dependency on pkgconfig in the -devel subpackage + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-8 +- rebuild + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-7 +- rebuild + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-6 +- rebuild + * Tue Apr 11 2006 Nalin Dahyabhai 0.25-5 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2006 22:18:57 -0000 1.4 +++ sources 2 May 2006 23:36:33 -0000 1.5 @@ -1 +1 @@ -097d0a926874551a661f33d4c2db5169 oddjob-0.25-1.tar.gz +f564acf65081c7e83f4ab4c428715bd1 oddjob-0.26-1.tar.gz From fedora-extras-commits at redhat.com Tue May 2 23:41:09 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:41:09 -0700 Subject: rpms/oddjob import.log,1.15,1.16 Message-ID: <200605022341.k42Nffu4002899@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2864 Modified Files: import.log Log Message: auto-import oddjob-0.26-2 on branch FC-4 from oddjob-0.26-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oddjob/import.log,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- import.log 2 May 2006 23:36:33 -0000 1.15 +++ import.log 2 May 2006 23:41:09 -0000 1.16 @@ -12,3 +12,4 @@ oddjob-0_25-7:FC-5:oddjob-0.25-7.src.rpm:1144794170 oddjob-0_25-8:HEAD:oddjob-0.25-8.src.rpm:1144794233 oddjob-0_26-1:FC-3:oddjob-0.26-1.src.rpm:1146612987 +oddjob-0_26-2:FC-4:oddjob-0.26-2.src.rpm:1146613262 From fedora-extras-commits at redhat.com Tue May 2 23:41:10 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:41:10 -0700 Subject: rpms/oddjob/FC-4 .cvsignore, 1.4, 1.5 oddjob.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605022341.k42Nfggq002904@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2864/FC-4 Modified Files: .cvsignore oddjob.spec sources Log Message: auto-import oddjob-0.26-2 on branch FC-4 from oddjob-0.26-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2006 22:22:20 -0000 1.4 +++ .cvsignore 2 May 2006 23:41:09 -0000 1.5 @@ -1 +1 @@ -oddjob-0.25-1.tar.gz +oddjob-0.26-1.tar.gz Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-4/oddjob.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- oddjob.spec 11 Apr 2006 22:22:20 -0000 1.3 +++ oddjob.spec 2 May 2006 23:41:09 -0000 1.4 @@ -1,8 +1,8 @@ %define build_sample 0 Name: oddjob -Version: 0.25 -Release: 6 +Version: 0.26 +Release: 2 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,6 +26,7 @@ Group: Development/Libraries Summary: Files for developing oddjob clients Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains header files and static libraries which aid in the @@ -143,6 +144,27 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue May 2 2006 Nalin Dahyabhai 0.26-2 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1.1 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1 +- update to 0.26-1: + - don't get confused when ACL entries for introspection show up in the + configuration before we add the handlers for them + - export $ODDJOB_CALLING_USER to helpers + +* Tue May 2 2006 Nalin Dahyabhai +- add recommended dependency on pkgconfig in the -devel subpackage + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-8 +- rebuild + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-7 +- rebuild + * Tue Apr 11 2006 Nalin Dahyabhai 0.25-6 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2006 22:22:20 -0000 1.4 +++ sources 2 May 2006 23:41:09 -0000 1.5 @@ -1 +1 @@ -097d0a926874551a661f33d4c2db5169 oddjob-0.25-1.tar.gz +f564acf65081c7e83f4ab4c428715bd1 oddjob-0.26-1.tar.gz From fedora-extras-commits at redhat.com Tue May 2 23:43:11 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:43:11 -0700 Subject: rpms/oddjob/FC-5 .cvsignore, 1.4, 1.5 oddjob.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605022343.k42NhDbq003022@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2982/FC-5 Modified Files: .cvsignore oddjob.spec sources Log Message: auto-import oddjob-0.26-3 on branch FC-5 from oddjob-0.26-3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2006 22:22:54 -0000 1.4 +++ .cvsignore 2 May 2006 23:43:11 -0000 1.5 @@ -1 +1 @@ -oddjob-0.25-1.tar.gz +oddjob-0.26-1.tar.gz Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-5/oddjob.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- oddjob.spec 11 Apr 2006 22:22:54 -0000 1.3 +++ oddjob.spec 2 May 2006 23:43:11 -0000 1.4 @@ -1,8 +1,8 @@ %define build_sample 0 Name: oddjob -Version: 0.25 -Release: 7 +Version: 0.26 +Release: 3 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,6 +26,7 @@ Group: Development/Libraries Summary: Files for developing oddjob clients Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains header files and static libraries which aid in the @@ -143,6 +144,27 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue May 2 2006 Nalin Dahyabhai 0.26-3 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-2 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1.1 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1 +- update to 0.26-1: + - don't get confused when ACL entries for introspection show up in the + configuration before we add the handlers for them + - export $ODDJOB_CALLING_USER to helpers + +* Tue May 2 2006 Nalin Dahyabhai +- add recommended dependency on pkgconfig in the -devel subpackage + +* Tue Apr 11 2006 Nalin Dahyabhai 0.25-8 +- rebuild + * Tue Apr 11 2006 Nalin Dahyabhai 0.25-7 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/oddjob/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2006 22:22:54 -0000 1.4 +++ sources 2 May 2006 23:43:11 -0000 1.5 @@ -1 +1 @@ -097d0a926874551a661f33d4c2db5169 oddjob-0.25-1.tar.gz +f564acf65081c7e83f4ab4c428715bd1 oddjob-0.26-1.tar.gz From fedora-extras-commits at redhat.com Tue May 2 23:43:10 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:43:10 -0700 Subject: rpms/oddjob import.log,1.16,1.17 Message-ID: <200605022343.k42NhC7I003015@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2982 Modified Files: import.log Log Message: auto-import oddjob-0.26-3 on branch FC-5 from oddjob-0.26-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oddjob/import.log,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- import.log 2 May 2006 23:41:09 -0000 1.16 +++ import.log 2 May 2006 23:43:10 -0000 1.17 @@ -13,3 +13,4 @@ oddjob-0_25-8:HEAD:oddjob-0.25-8.src.rpm:1144794233 oddjob-0_26-1:FC-3:oddjob-0.26-1.src.rpm:1146612987 oddjob-0_26-2:FC-4:oddjob-0.26-2.src.rpm:1146613262 +oddjob-0_26-3:FC-5:oddjob-0.26-3.src.rpm:1146613384 From fedora-extras-commits at redhat.com Tue May 2 23:44:07 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:44:07 -0700 Subject: rpms/oddjob import.log,1.17,1.18 Message-ID: <200605022344.k42Ni9J0003123@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3085 Modified Files: import.log Log Message: auto-import oddjob-0.26-4 on branch devel from oddjob-0.26-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oddjob/import.log,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- import.log 2 May 2006 23:43:10 -0000 1.17 +++ import.log 2 May 2006 23:44:07 -0000 1.18 @@ -14,3 +14,4 @@ oddjob-0_26-1:FC-3:oddjob-0.26-1.src.rpm:1146612987 oddjob-0_26-2:FC-4:oddjob-0.26-2.src.rpm:1146613262 oddjob-0_26-3:FC-5:oddjob-0.26-3.src.rpm:1146613384 +oddjob-0_26-4:HEAD:oddjob-0.26-4.src.rpm:1146613440 From fedora-extras-commits at redhat.com Tue May 2 23:44:07 2006 From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin)) Date: Tue, 2 May 2006 16:44:07 -0700 Subject: rpms/oddjob/devel .cvsignore, 1.4, 1.5 oddjob.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605022344.k42Ni94S003129@cvs-int.fedora.redhat.com> Author: nalin Update of /cvs/extras/rpms/oddjob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3085/devel Modified Files: .cvsignore oddjob.spec sources Log Message: auto-import oddjob-0.26-4 on branch devel from oddjob-0.26-4.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oddjob/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Apr 2006 22:14:54 -0000 1.4 +++ .cvsignore 2 May 2006 23:44:07 -0000 1.5 @@ -1 +1 @@ -oddjob-0.25-1.tar.gz +oddjob-0.26-1.tar.gz Index: oddjob.spec =================================================================== RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- oddjob.spec 11 Apr 2006 22:23:58 -0000 1.7 +++ oddjob.spec 2 May 2006 23:44:07 -0000 1.8 @@ -1,8 +1,8 @@ %define build_sample 0 Name: oddjob -Version: 0.25 -Release: 8 +Version: 0.26 +Release: 4 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz Summary: A D-BUS service which runs odd jobs on behalf of client applications License: BSD @@ -26,6 +26,7 @@ Group: Development/Libraries Summary: Files for developing oddjob clients Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains header files and static libraries which aid in the @@ -143,6 +144,27 @@ %postun libs -p /sbin/ldconfig %changelog +* Tue May 2 2006 Nalin Dahyabhai 0.26-4 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-3 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-2 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1.1 +- rebuild + +* Tue May 2 2006 Nalin Dahyabhai 0.26-1 +- update to 0.26-1: + - don't get confused when ACL entries for introspection show up in the + configuration before we add the handlers for them + - export $ODDJOB_CALLING_USER to helpers + +* Tue May 2 2006 Nalin Dahyabhai +- add recommended dependency on pkgconfig in the -devel subpackage + * Tue Apr 11 2006 Nalin Dahyabhai 0.25-8 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/oddjob/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Apr 2006 22:14:54 -0000 1.4 +++ sources 2 May 2006 23:44:07 -0000 1.5 @@ -1 +1 @@ -097d0a926874551a661f33d4c2db5169 oddjob-0.25-1.tar.gz +f564acf65081c7e83f4ab4c428715bd1 oddjob-0.26-1.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:11:42 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:11:42 -0700 Subject: rpms/python-astng/devel .cvsignore, 1.5, 1.6 python-astng.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605030211.k432Binw010285@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10225/devel Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.16.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 18:15:40 -0000 1.5 +++ .cvsignore 3 May 2006 02:11:42 -0000 1.6 @@ -1 +1 @@ -astng-0.15.1.tar.gz +astng-0.16.0.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/python-astng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-astng.spec 12 Mar 2006 18:15:40 -0000 1.6 +++ python-astng.spec 3 May 2006 02:11:42 -0000 1.7 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.15.1 -Release: 1%{?dist} +Version: 0.16.0 +Release: 0%{?dist} Summary: Python Abstract Syntax Tree New Generation Group: Development/Languages @@ -53,6 +53,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.16.0-0 +- Version 0.16.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 - Version 0.15.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 18:15:40 -0000 1.5 +++ sources 3 May 2006 02:11:42 -0000 1.6 @@ -1 +1 @@ -2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz +636b57a742ad5d9cb030429eca9841e9 astng-0.16.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:11:41 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:11:41 -0700 Subject: rpms/python-astng/FC-5 .cvsignore, 1.5, 1.6 python-astng.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605030211.k432BhnQ010279@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10225/FC-5 Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.16.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 18:15:40 -0000 1.5 +++ .cvsignore 3 May 2006 02:11:41 -0000 1.6 @@ -1 +1 @@ -astng-0.15.1.tar.gz +astng-0.16.0.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-5/python-astng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-astng.spec 12 Mar 2006 18:15:40 -0000 1.6 +++ python-astng.spec 3 May 2006 02:11:41 -0000 1.7 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.15.1 -Release: 1%{?dist} +Version: 0.16.0 +Release: 0%{?dist} Summary: Python Abstract Syntax Tree New Generation Group: Development/Languages @@ -53,6 +53,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.16.0-0 +- Version 0.16.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 - Version 0.15.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 18:15:40 -0000 1.5 +++ sources 3 May 2006 02:11:41 -0000 1.6 @@ -1 +1 @@ -2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz +636b57a742ad5d9cb030429eca9841e9 astng-0.16.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:11:41 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:11:41 -0700 Subject: rpms/python-astng/FC-4 .cvsignore, 1.5, 1.6 python-astng.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605030212.k432CDGX010290@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10225/FC-4 Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.16.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 18:15:25 -0000 1.5 +++ .cvsignore 3 May 2006 02:11:40 -0000 1.6 @@ -1 +1 @@ -astng-0.15.1.tar.gz +astng-0.16.0.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/python-astng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-astng.spec 12 Mar 2006 18:15:25 -0000 1.6 +++ python-astng.spec 3 May 2006 02:11:40 -0000 1.7 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.15.1 -Release: 1%{?dist} +Version: 0.16.0 +Release: 0%{?dist} Summary: Python Abstract Syntax Tree New Generation Group: Development/Languages @@ -53,6 +53,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.16.0-0 +- Version 0.16.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 - Version 0.15.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 18:15:25 -0000 1.5 +++ sources 3 May 2006 02:11:40 -0000 1.6 @@ -1 +1 @@ -2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz +636b57a742ad5d9cb030429eca9841e9 astng-0.16.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:14:22 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:14:22 -0700 Subject: rpms/pylint/FC-4 .cvsignore, 1.6, 1.7 pylint.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605030214.k432EOIp010467@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10412/FC-4 Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:18:21 -0000 1.6 +++ .cvsignore 3 May 2006 02:14:22 -0000 1.7 @@ -1 +1 @@ -pylint-0.10.0.tar.gz +pylint-0.11.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/pylint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pylint.spec 12 Mar 2006 18:18:21 -0000 1.6 +++ pylint.spec 3 May 2006 02:14:22 -0000 1.7 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.11.0-0 +- Version 0.11.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 - Version 0.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:18:21 -0000 1.6 +++ sources 3 May 2006 02:14:22 -0000 1.7 @@ -1 +1 @@ -9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz +6c2cd68c49c5a672124c2399b248fb3b pylint-0.11.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:14:23 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:14:23 -0700 Subject: rpms/pylint/FC-5 .cvsignore, 1.6, 1.7 pylint.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605030214.k432EPPW010473@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10412/FC-5 Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:18:26 -0000 1.6 +++ .cvsignore 3 May 2006 02:14:23 -0000 1.7 @@ -1 +1 @@ -pylint-0.10.0.tar.gz +pylint-0.11.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-5/pylint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pylint.spec 12 Mar 2006 18:18:26 -0000 1.6 +++ pylint.spec 3 May 2006 02:14:23 -0000 1.7 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.11.0-0 +- Version 0.11.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 - Version 0.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:18:26 -0000 1.6 +++ sources 3 May 2006 02:14:23 -0000 1.7 @@ -1 +1 @@ -9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz +6c2cd68c49c5a672124c2399b248fb3b pylint-0.11.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 02:14:24 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 19:14:24 -0700 Subject: rpms/pylint/devel .cvsignore, 1.6, 1.7 pylint.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200605030214.k432EQg7010479@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10412/devel Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Mar 2006 18:18:26 -0000 1.6 +++ .cvsignore 3 May 2006 02:14:23 -0000 1.7 @@ -1 +1 @@ -pylint-0.10.0.tar.gz +pylint-0.11.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/pylint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pylint.spec 12 Mar 2006 18:18:26 -0000 1.6 +++ pylint.spec 3 May 2006 02:14:23 -0000 1.7 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Mon May 01 2006 Konstantin Ryabitsev - 0.11.0-0 +- Version 0.11.0 + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 - Version 0.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Mar 2006 18:18:26 -0000 1.6 +++ sources 3 May 2006 02:14:23 -0000 1.7 @@ -1 +1 @@ -9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz +6c2cd68c49c5a672124c2399b248fb3b pylint-0.11.0.tar.gz From fedora-extras-commits at redhat.com Wed May 3 04:02:11 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 21:02:11 -0700 Subject: rpms/libxml++/devel .cvsignore, 1.4, 1.5 libxml++.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605030402.k4342D19015250@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/libxml++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175/devel Modified Files: .cvsignore libxml++.spec sources Log Message: Version 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxml++/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2005 04:26:50 -0000 1.4 +++ .cvsignore 3 May 2006 04:02:11 -0000 1.5 @@ -1 +1 @@ -libxml++-2.12.0.tar.bz2 +libxml++-2.14.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libxml++.spec 13 Feb 2006 19:17:55 -0000 1.12 +++ libxml++.spec 3 May 2006 04:02:11 -0000 1.13 @@ -1,6 +1,6 @@ Name: libxml++ -Version: 2.12.0 -Release: 2.1%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries @@ -78,6 +78,9 @@ %changelog +* Tue May 02 2006 Konstantin Ryabitsev - 2.14.0-1 +- Version 2.14.0 + * Mon Feb 13 2006 Konstantin Ryabitsev - 2.12.0-2.1 - FC5 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxml++/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2005 04:26:50 -0000 1.4 +++ sources 3 May 2006 04:02:11 -0000 1.5 @@ -1 +1 @@ -062653883d0ce38a3c7b4ec85b2bfe4b libxml++-2.12.0.tar.bz2 +4f5644788dfd6ba87ce7c9b6cc28890d libxml++-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 04:02:10 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 21:02:10 -0700 Subject: rpms/libxml++/FC-5 .cvsignore, 1.4, 1.5 libxml++.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605030402.k4342CQ4015246@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/libxml++/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175/FC-5 Modified Files: .cvsignore libxml++.spec sources Log Message: Version 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2005 04:26:50 -0000 1.4 +++ .cvsignore 3 May 2006 04:02:10 -0000 1.5 @@ -1 +1 @@ -libxml++-2.12.0.tar.bz2 +libxml++-2.14.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-5/libxml++.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libxml++.spec 13 Feb 2006 19:17:55 -0000 1.12 +++ libxml++.spec 3 May 2006 04:02:10 -0000 1.13 @@ -1,6 +1,6 @@ Name: libxml++ -Version: 2.12.0 -Release: 2.1%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries @@ -78,6 +78,9 @@ %changelog +* Tue May 02 2006 Konstantin Ryabitsev - 2.14.0-1 +- Version 2.14.0 + * Mon Feb 13 2006 Konstantin Ryabitsev - 2.12.0-2.1 - FC5 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2005 04:26:50 -0000 1.4 +++ sources 3 May 2006 04:02:10 -0000 1.5 @@ -1 +1 @@ -062653883d0ce38a3c7b4ec85b2bfe4b libxml++-2.12.0.tar.bz2 +4f5644788dfd6ba87ce7c9b6cc28890d libxml++-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 04:01:58 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 21:01:58 -0700 Subject: rpms/libxml++/FC-3 .cvsignore, 1.3, 1.4 libxml++.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605030402.k4342VPM015259@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/libxml++/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175/FC-3 Modified Files: .cvsignore libxml++.spec sources Log Message: Version 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Oct 2005 20:12:33 -0000 1.3 +++ .cvsignore 3 May 2006 04:01:58 -0000 1.4 @@ -1 +1 @@ -libxml++-2.12.0.tar.bz2 +libxml++-2.14.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-3/libxml++.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libxml++.spec 26 Jan 2006 15:25:33 -0000 1.6 +++ libxml++.spec 3 May 2006 04:01:58 -0000 1.7 @@ -1,6 +1,6 @@ Name: libxml++ -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries @@ -78,6 +78,12 @@ %changelog +* Tue May 02 2006 Konstantin Ryabitsev - 2.14.0-1 +- Version 2.14.0 + +* Mon Feb 13 2006 Konstantin Ryabitsev - 2.12.0-2.1 +- FC5 Rebuild + * Thu Jan 26 2006 Konstantin Ryabitsev - 2.12.0-2 - Rebuilt to address RH #178592 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Oct 2005 20:12:33 -0000 1.3 +++ sources 3 May 2006 04:01:58 -0000 1.4 @@ -1 +1 @@ -062653883d0ce38a3c7b4ec85b2bfe4b libxml++-2.12.0.tar.bz2 +4f5644788dfd6ba87ce7c9b6cc28890d libxml++-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 04:02:06 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 2 May 2006 21:02:06 -0700 Subject: rpms/libxml++/FC-4 .cvsignore, 1.4, 1.5 libxml++.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605030402.k4342cUu015264@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/libxml++/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15175/FC-4 Modified Files: .cvsignore libxml++.spec sources Log Message: Version 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2005 04:09:56 -0000 1.4 +++ .cvsignore 3 May 2006 04:02:06 -0000 1.5 @@ -1 +1 @@ -libxml++-2.12.0.tar.bz2 +libxml++-2.14.0.tar.bz2 Index: libxml++.spec =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libxml++.spec 26 Jan 2006 15:25:39 -0000 1.12 +++ libxml++.spec 3 May 2006 04:02:06 -0000 1.13 @@ -1,6 +1,6 @@ Name: libxml++ -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: C++ wrapper for the libxml2 XML parser library Group: System Environment/Libraries @@ -78,6 +78,12 @@ %changelog +* Tue May 02 2006 Konstantin Ryabitsev - 2.14.0-1 +- Version 2.14.0 + +* Mon Feb 13 2006 Konstantin Ryabitsev - 2.12.0-2.1 +- FC5 Rebuild + * Thu Jan 26 2006 Konstantin Ryabitsev - 2.12.0-2 - Rebuilt to address RH #178592 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libxml++/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2005 04:09:56 -0000 1.4 +++ sources 3 May 2006 04:02:06 -0000 1.5 @@ -1 +1 @@ -062653883d0ce38a3c7b4ec85b2bfe4b libxml++-2.12.0.tar.bz2 +4f5644788dfd6ba87ce7c9b6cc28890d libxml++-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 04:04:29 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 May 2006 21:04:29 -0700 Subject: extras-buildsys ChangeLog,1.184,1.185 Message-ID: <200605030404.k4344T2t015372@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275 Modified Files: ChangeLog Log Message: 2006-05-03 Dan Williams More builder/server comm rework; - Add job status command - implement repo unlock command - fix bugs Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- ChangeLog 28 Apr 2006 03:17:34 -0000 1.184 +++ ChangeLog 3 May 2006 04:04:27 -0000 1.185 @@ -1,3 +1,10 @@ +2006-05-03 Dan Williams + + More builder/server comm rework; + - Add job status command + - implement repo unlock command + - fix bugs + 2006-04-27 Dan Williams Commit partial rework of builder<->server communcation. From fedora-extras-commits at redhat.com Wed May 3 04:04:30 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 May 2006 21:04:30 -0700 Subject: extras-buildsys/common Commands.py,1.1,1.2 HTTPServer.py,1.13,1.14 Message-ID: <200605030404.k4344UUC015386@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/common Modified Files: Commands.py HTTPServer.py Log Message: 2006-05-03 Dan Williams More builder/server comm rework; - Add job status command - implement repo unlock command - fix bugs Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Commands.py 28 Apr 2006 03:17:40 -0000 1.1 +++ Commands.py 3 May 2006 04:04:28 -0000 1.2 @@ -28,6 +28,12 @@ CMD_NAME_SLOTS = "Slots" CMD_NAME_NEW_JOB_REQ = "NewJob" CMD_NAME_NEW_JOB_ACK = "NewJobAck" +CMD_NAME_UNLOCK_REPO = "UnlockRepo" +CMD_NAME_JOB_FILES_REQ = "JobFiles" +CMD_NAME_JOB_FILES_ACK = "JobFilesAck" +CMD_NAME_BUILDING_JOBS = "BuildingJobs" +CMD_NAME_JOB_STATUS_REQ = "JobStatus" +CMD_NAME_JOB_STATUS_ACK = "JobStatusAck" class SequenceGenerator(object): @@ -119,6 +125,8 @@ cmd = PlgCommandNewJobReq._deserialize(args) elif name == CMD_NAME_NEW_JOB_ACK: cmd = PlgCommandNewJobAck._deserialize(args) + elif name == CMD_NAME_BUILDING_JOBS: + cmd = PlgCommandBuildingJobs._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't @@ -376,3 +384,138 @@ def message(self): return self._msg + +class PlgCommandUnlockRepo(PlgCommand): + def __init__(self, archjob_id, seq=0): + PlgCommand.__init__(self, CMD_NAME_UNLOCK_REPO, seq) + self._archjob_id = archjob_id + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except ValueError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + return PlgCommandUnlockRepo(archjob_id) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def __str__(self): + return "%s(seq: %d, archjob_id: %s)" % (self._name, self._seq, self._archjob_id) + + +class PlgCommandBuildingJobs(PlgCommand): + def __init__(self, seq=0): + PlgCommand.__init__(self, CMD_NAME_BUILDING_JOBS, seq) + self._jobs = [] + + def _deserialize(args): + try: + jobs = args['jobs'] + except ValueError, TypeError: + raise ValueError("No 'jobs' argument found.") + + # Basic sanity + if type(jobs) != type([]): + print "Jobs is type %s" % type(jobs) + raise ValueError("jobs wasn't a list.") + try: + for job in jobs: + archjob_id = job['archjob_id'] + status = job['status'] + except KeyError, e: + raise ValueError("Required item '%s' wasn't found in jobs item.") + + cmd = PlgCommandBuildingJobs() + for job in jobs: + cmd.add_job(job['archjob_id'], job['status']) + return cmd + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['jobs'] = self._jobs + return PlgCommand._serialize(self, args) + + def jobs(self): + return self._jobs + + def add_job(self, archjob_id, status): + self._jobs.append({'archjob_id': archjob_id, 'status': status}) + + def get_job(self, job): + return (job['archjob_id'], job['status']) + + def __str__(self): + return "%s(seq: %d, jobs: %s)" % (self._name, self._seq, self._jobs) + + +class PlgCommandJobStatus(PlgCommand): + + _need_ack = True + + def __init__(self, archjob_id, seq=0): + PlgCommand.__init__(self, CMD_NAME_JOB_STATUS_REQ, seq) + self._archjob_id = archjob_id + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except KeyError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + + return PlgCommandJobStatusReq(archjob_id) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def __str__(self): + return "%s(seq: %d, target_dict: %s, srpm_url: %s)" % (self._name, self._seq, self._archjob_id) + + +class PlgCommandJobStatusAck(PlgCommandAck): + def __init__(self, archjob_id, status, req_seq, seq=0): + PlgCommandAck.__init__(self, CMD_NAME_JOB_STATUS_ACK, req_seq, seq) + self._archjob_id = archjob_id + self._status = status + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except KeyError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + try: + status = args['status'] + except KeyError, TypeError: + raise ValueError("No 'status' argument found.") + req_seq = PlgCommandAck._deserialize_acked_seq(args) + return PlgCommandJobStatusAck(archjob_id, status, req_seq) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + args['status'] = self._status + return PlgCommandAck._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def status(self): + return self._status Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- HTTPServer.py 28 Apr 2006 03:17:40 -0000 1.13 +++ HTTPServer.py 3 May 2006 04:04:28 -0000 1.14 @@ -182,12 +182,12 @@ def stop(self): self._server.stop() t = time.time() - while not self._stopped: - try: + try: + while not self._stopped: if time.time() > t + 2: break - except KeyboardInterrupt: - pass + except KeyboardInterrupt: + pass ########################################################### From fedora-extras-commits at redhat.com Wed May 3 04:04:31 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 May 2006 21:04:31 -0700 Subject: extras-buildsys/server ArchJob.py, 1.27, 1.28 Builder.py, 1.34, 1.35 PackageJob.py, 1.45, 1.46 Message-ID: <200605030404.k4344VFs015393@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/server Modified Files: ArchJob.py Builder.py PackageJob.py Log Message: 2006-05-03 Dan Williams More builder/server comm rework; - Add job status command - implement repo unlock command - fix bugs Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ArchJob.py 20 Mar 2006 12:47:01 -0000 1.27 +++ ArchJob.py 3 May 2006 04:04:28 -0000 1.28 @@ -38,12 +38,10 @@ class ArchJob: """ Tracks a single build instance for a single arch on a builder """ - def __init__(self, builder, cfg, server, par_job, jobid, target_dict): + def __init__(self, builder, par_job, jobid, target_dict): self.par_job = par_job - self.builder = builder + self._builder = builder self._repo = par_job.repo() - self._server = server - self._use_ssl = cfg.get_bool("Builders", "use_ssl") self.jobid = jobid self._status = 'starting' self._builder_status = '' @@ -61,15 +59,6 @@ self._die_lock = threading.Lock() self._prepping = False - # SSL certificate and key filenames - if self._use_ssl: - self._certs = {} - self._certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") - self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") - else: - self._certs = None - def failure_noticed(self): return self._failure_noticed @@ -98,12 +87,15 @@ def arch(self): return self._target_dict['arch'] + def builder(self): + return self._builder + def _to_dict(self): attrdict = {} attrdict['jobid'] = self.jobid attrdict['parent_uid'] = self.par_job.uid attrdict['arch'] = self._target_dict['arch'] - addr = self.builder.address() + (ip, 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"): @@ -137,22 +129,6 @@ self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) del attrdict - def _send_repo_unlocked(self): - success = False - try: - self._server.repo_unlocked(self.jobid) - success = True - except socket.error, e: - if not CommonErrors.canIgnoreSocketError(e): - print "%s (%s/%s): [ %s ] Unknown error sending repo unlocked: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), e) - except socket.timeout, e: - print "%s (%s/%s): [ %s ] Timeout sending repo unlocked: '%s'. Trying again." % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), e) - except xmlrpclib.ProtocolError, e: - pass - return success - def _dl_files(self): files = [] success = False @@ -162,10 +138,10 @@ except socket.error, e: if not CommonErrors.canIgnoreSocketError(e): print "%s (%s/%s): [ %s ] Unknown error getting file list: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), e) + self.par_job.package, self._target_dict['arch'], self._builder.address(), e) except socket.timeout, e: print "%s (%s/%s): [ %s ] Timeout getting file list: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), e) + self.par_job.package, self._target_dict['arch'], self._builder.address(), e) except xmlrpclib.ProtocolError, e: pass return (success, files) @@ -193,10 +169,10 @@ def _status_repo_unlock(self): # Builder will be in 'downloaded' state until # it notices that the repo has been unlocked - if self._send_repo_unlocked(): - self._prepping = True - if self._builder_status != 'downloaded': - self._set_status('running') + self._builder.unlock_repo_for_job(self._uniqid) + self._prepping = True + if self._builder_status != 'downloaded': + self._set_status('running') def _status_running(self): if self._builder_status != 'prepping': @@ -279,7 +255,7 @@ dl_dict[DL_STATUS] = STATUS_INPROGRESS except FileDownloader.FileNameException, e: print "%s (%s/%s): [ %s ] Bad file name error getting %s: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.builder.address(), url, e) + self.par_job.package, self._target_dict['arch'], self._builder.address(), url, e) # Hard error, we don't retry this one dl_dict[DL_STATUS] = STATUS_ERROR break Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Builder.py 28 Apr 2006 03:17:41 -0000 1.34 +++ Builder.py 3 May 2006 04:04:28 -0000 1.35 @@ -181,6 +181,41 @@ builder_dict['free_slots'] = self._free_slots return builder_dict + def _handle_building_jobs(self, cmd): + building_jobs = cmd.jobs() + reported_uniqids = [] + new_cmds = [] + print "Building Jobs: %s" % building_jobs + for item in building_jobs: + (uniqid, status) = cmd.get_job(item) + try: + job = self._jobs[uniqid] + job.set_builder_job_status(status) +# reported_uniqids.append(uniqid) + except KeyError: + pass + + # We have to check jobs that weren't reported + # as 'building' by the builder, since the job + # may have finished on the builder and was + # removed from the building job list before we + # were able to know that it was done. HACK + self._prepping_jobs = False + for jobid in self._jobs.keys(): + # If the builder didn't report this job as building, + # and its not done, explicitly get its status + job = self._jobs[jobid] + if jobid not in reported_uniqids and job.get_status() != 'done': + new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) + + # Check for prepping jobs + if job.prepping(): + self._prepping_jobs = True + + del reported_uniqids + print "New Commands: %s" % new_cmds + return new_cmds + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt class BuildingJobsCheck(threading.Thread): @@ -450,6 +485,18 @@ def _init_builder(self, target_list): self._target_list = target_list + def unlock_repo_for_job(self, uniqid): + """Called by an archjob to request the sending of a RepoUnlocked + command to the builder for a particular archjob.""" + + cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + + def request_job_files(self, archjob): + pass + def _handle_new_job_ack(self, ack): """Handle a NewJobAck command by finding the original command sent to the builder, removing it from the command queue, and notifying @@ -457,16 +504,18 @@ old_cmd = None self._lock.acquire() - for old_cmd in self._cmd_queue: - if old_cmd.seq() == ack.acked_seq() and isinstance(old_cmd, Commands.PlgCommandNewJobReq): - self._cmd_queue.remove(old_cmd) + for queued_cmd in self._cmd_queue: + if queued_cmd.seq() == ack.acked_seq() and isinstance(queued_cmd, Commands.PlgCommandNewJobReq): + old_cmd = queued_cmd + self._cmd_queue.remove(queued_cmd) break self._lock.release() if old_cmd: parent = old_cmd.parent_job() - archjob = ArchJob.ArchJob(self, parent, ack.archjob_id(), old_cmd.target_dict()) - self._jobs[jobid] = archjob + archjob_id = ack.archjob_id() + archjob = ArchJob.ArchJob(self, parent, archjob_id, old_cmd.target_dict()) + self._jobs[archjob_id] = archjob parent.add_arch_job(archjob) def _dispatch_command(self, cmd): @@ -482,6 +531,13 @@ self._lock.release() elif isinstance(cmd, Commands.PlgCommandNewJobAck): self._handle_new_job_ack(cmd) + elif isinstance(cmd, Commands.PlgCommandBuildingJobs): + status_reqs = self._handle_building_jobs(cmd) + # Add any additional status requests onto our pending command queue + if len(status_reqs) > 0: + self._lock.acquire() + self._cmd_queue = self._cmd_queue + status_reqs + self._lock.release() else: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- PackageJob.py 24 Mar 2006 01:33:31 -0000 1.45 +++ PackageJob.py 3 May 2006 04:04:28 -0000 1.46 @@ -672,7 +672,7 @@ t.start() self._archjobs_lock.release() - log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, job.builder.address(), job.jobid)) + log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, job.builder().address(), job.jobid)) def remove_arch_job(self, job): """ Removes an arch job when its builder is no longer responding """ @@ -801,7 +801,7 @@ msg = "Job failed on arch %s\n" % jobarch elif job.download_failed(): msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \ - "Please contact the build system administrator." % (jobarch, job.builder.address()) + "Please contact the build system administrator." % (jobarch, job.builder().address()) elif job.internal_failure(): msg = "Job failed on arch %s: there was an internal build system failure.\n " \ "Please contact the build system administrator." % jobarch From fedora-extras-commits at redhat.com Wed May 3 04:04:30 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 May 2006 21:04:30 -0700 Subject: extras-buildsys/builder Builder.py,1.1,1.2 BuilderMock.py,1.1,1.2 Message-ID: <200605030404.k4344UPK015379@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-03 Dan Williams More builder/server comm rework; - Add job status command - implement repo unlock command - fix bugs Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/Builder.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Builder.py 28 Apr 2006 03:17:35 -0000 1.1 +++ Builder.py 3 May 2006 04:04:27 -0000 1.2 @@ -99,7 +99,7 @@ def repo_unlocked(self, uniqid): try: job = self._all_jobs[uniqid] - job.repo_unlocked() + job.unlock_repo() except KeyError: pass return 0 @@ -271,6 +271,32 @@ self._log(msg) return (uniqid, msg) + def _get_building_jobs_cmd(self): + jobs_list = [] + cmd = Commands.PlgCommandBuildingJobs(self._seq_gen.next()) + self._building_jobs_lock.acquire() + for job in self._building_jobs: + cmd.add_job(job.uniqid(), job.status()) + self._building_jobs_lock.release() + return cmd + + def _handle_unlock_repo_request(self, cmd): + uniqid = cmd.archjob_id() + self._building_jobs_lock.acquire() + for item in self._building_jobs: + if job.uniqid() == uniqid: + job.unlock_repo() + self._building_jobs_lock.release() + + def _handle_job_status_request(self, cmd): + reply = None + try: + uniqid = cmd.archjob_id() + job = self._all_jobs[uniqid] + reply = Commands.PlgCommandJobStatusAck(uniqid, job.status(), cmd.seq(), self._seq_gen.next()) + except KeyError, e: + pass + return reply class PassiveBuilder(Builder): """ @@ -405,6 +431,8 @@ cmd = Commands.PlgCommandSlots(free, max, next_seq) defcmds.append(cmd) + defcmds.append(self._get_building_jobs_cmd()) + return defcmds def _send_commands(self): @@ -438,6 +466,12 @@ (uniqid, msg) = self._start_new_job(cmd.target_dict(), cmd.srpm_url()) ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) self._queued_cmds.append(ack) + elif isinstance(cmd, Commands.PlgCommandUnlockRepo): + self._handle_unlock_repo_request(cmd) + elif isinstance(cmd, Commands.PlgCommandJobStatus): + reply = self._handle_job_status_request() + if reply: + self._queued_cmds = self._queued_cmds + reply def _process_server_response(self, response): """Process the server's response.""" Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BuilderMock.py 28 Apr 2006 03:17:35 -0000 1.1 +++ BuilderMock.py 3 May 2006 04:04:27 -0000 1.2 @@ -493,7 +493,7 @@ def files(self): return self._files - def repo_unlocked(self): + def unlock_repo(self): self._repo_locked = False def is_done_status(self): From fedora-extras-commits at redhat.com Wed May 3 05:03:43 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 2 May 2006 22:03:43 -0700 Subject: rpms/wifiroamd/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wifiroamd.spec, 1.1, 1.2 Message-ID: <200605030503.k4353jZ0017959@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17904/devel Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 17:48:58 -0000 1.2 +++ .cvsignore 3 May 2006 05:03:43 -0000 1.3 @@ -1 +1 @@ -wifiroamd-1.05.tar.gz +wifiroamd-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 17:48:58 -0000 1.2 +++ sources 3 May 2006 05:03:43 -0000 1.3 @@ -1 +1 @@ -697166fe19c150ae312276ff0eb0fe40 wifiroamd-1.05.tar.gz +197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/wifiroamd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wifiroamd.spec 21 Apr 2006 17:48:58 -0000 1.1 +++ wifiroamd.spec 3 May 2006 05:03:43 -0000 1.2 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -48,6 +48,9 @@ %{__mkdir} -p $RPM_BUILD_ROOT/etc/init.d %{__cp} wifiroamd.init $RPM_BUILD_ROOT/etc/init.d/wifiroamd +%{__mkdir} -p $RPM_BUILD_ROOT/etc/sysconfig +%{__cp} wifiroamd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/wifiroamd + %{__mkdir} -p $RPM_BUILD_ROOT/var/lib/wifiroamd/dhclient-leases %{__mkdir} -p $RPM_BUILD_ROOT/etc/cron.daily @@ -90,6 +93,7 @@ %dir /etc/wifiroamd/seen # config-default should not be user-modified. %config /etc/wifiroamd/config-defaults +%config /etc/sysconfig/wifiroamd %attr(755,root,root) /etc/wifiroamd/scripts/monitor_pinggw.d/* %attr(755,root,root) /etc/wifiroamd/scripts/reset.d/* %attr(755,root,root) /etc/wifiroamd/scripts/up.d/* @@ -103,6 +107,9 @@ %doc debian/copyright %changelog +* Wed May 3 2006 Ed Hill - 1.06-1 +- new upstream 1.06 + * Sun Mar 12 2006 Sean Reifschneider - 1.05-1 - Release of 1.05. From fedora-extras-commits at redhat.com Wed May 3 05:03:37 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 2 May 2006 22:03:37 -0700 Subject: rpms/wifiroamd/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wifiroamd.spec, 1.1, 1.2 Message-ID: <200605030504.k43549HG017966@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17904/FC-4 Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 17:48:58 -0000 1.2 +++ .cvsignore 3 May 2006 05:03:37 -0000 1.3 @@ -1 +1 @@ -wifiroamd-1.05.tar.gz +wifiroamd-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 17:48:58 -0000 1.2 +++ sources 3 May 2006 05:03:37 -0000 1.3 @@ -1 +1 @@ -697166fe19c150ae312276ff0eb0fe40 wifiroamd-1.05.tar.gz +197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/wifiroamd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wifiroamd.spec 21 Apr 2006 17:48:58 -0000 1.1 +++ wifiroamd.spec 3 May 2006 05:03:37 -0000 1.2 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -48,6 +48,9 @@ %{__mkdir} -p $RPM_BUILD_ROOT/etc/init.d %{__cp} wifiroamd.init $RPM_BUILD_ROOT/etc/init.d/wifiroamd +%{__mkdir} -p $RPM_BUILD_ROOT/etc/sysconfig +%{__cp} wifiroamd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/wifiroamd + %{__mkdir} -p $RPM_BUILD_ROOT/var/lib/wifiroamd/dhclient-leases %{__mkdir} -p $RPM_BUILD_ROOT/etc/cron.daily @@ -90,6 +93,7 @@ %dir /etc/wifiroamd/seen # config-default should not be user-modified. %config /etc/wifiroamd/config-defaults +%config /etc/sysconfig/wifiroamd %attr(755,root,root) /etc/wifiroamd/scripts/monitor_pinggw.d/* %attr(755,root,root) /etc/wifiroamd/scripts/reset.d/* %attr(755,root,root) /etc/wifiroamd/scripts/up.d/* @@ -103,6 +107,9 @@ %doc debian/copyright %changelog +* Wed May 3 2006 Ed Hill - 1.06-1 +- new upstream 1.06 + * Sun Mar 12 2006 Sean Reifschneider - 1.05-1 - Release of 1.05. From fedora-extras-commits at redhat.com Wed May 3 05:03:38 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 2 May 2006 22:03:38 -0700 Subject: rpms/wifiroamd/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wifiroamd.spec, 1.1, 1.2 Message-ID: <200605030504.k4354Alj017971@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17904/FC-5 Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.06 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 17:48:58 -0000 1.2 +++ .cvsignore 3 May 2006 05:03:37 -0000 1.3 @@ -1 +1 @@ -wifiroamd-1.05.tar.gz +wifiroamd-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 17:48:58 -0000 1.2 +++ sources 3 May 2006 05:03:37 -0000 1.3 @@ -1 +1 @@ -697166fe19c150ae312276ff0eb0fe40 wifiroamd-1.05.tar.gz +197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/wifiroamd.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wifiroamd.spec 21 Apr 2006 17:48:58 -0000 1.1 +++ wifiroamd.spec 3 May 2006 05:03:37 -0000 1.2 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.05 +Version: 1.06 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -48,6 +48,9 @@ %{__mkdir} -p $RPM_BUILD_ROOT/etc/init.d %{__cp} wifiroamd.init $RPM_BUILD_ROOT/etc/init.d/wifiroamd +%{__mkdir} -p $RPM_BUILD_ROOT/etc/sysconfig +%{__cp} wifiroamd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/wifiroamd + %{__mkdir} -p $RPM_BUILD_ROOT/var/lib/wifiroamd/dhclient-leases %{__mkdir} -p $RPM_BUILD_ROOT/etc/cron.daily @@ -90,6 +93,7 @@ %dir /etc/wifiroamd/seen # config-default should not be user-modified. %config /etc/wifiroamd/config-defaults +%config /etc/sysconfig/wifiroamd %attr(755,root,root) /etc/wifiroamd/scripts/monitor_pinggw.d/* %attr(755,root,root) /etc/wifiroamd/scripts/reset.d/* %attr(755,root,root) /etc/wifiroamd/scripts/up.d/* @@ -103,6 +107,9 @@ %doc debian/copyright %changelog +* Wed May 3 2006 Ed Hill - 1.06-1 +- new upstream 1.06 + * Sun Mar 12 2006 Sean Reifschneider - 1.05-1 - Release of 1.05. From fedora-extras-commits at redhat.com Wed May 3 08:47:28 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 3 May 2006 01:47:28 -0700 Subject: fedora-security/audit fc4,1.225,1.226 fc5,1.139,1.140 Message-ID: <200605030847.k438lSiF025620@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25600 Modified Files: fc4 fc5 Log Message: Yesterdays updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- fc4 2 May 2006 08:19:10 -0000 1.225 +++ fc4 3 May 2006 08:47:25 -0000 1.226 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060501 -Up to date FC4 as of 20060501 +Up to date CVE as of CVE email 20060502 +Up to date FC4 as of 20060502 ** are items that need attention @@ -101,6 +101,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) +CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- fc5 2 May 2006 08:19:10 -0000 1.139 +++ fc5 3 May 2006 08:47:25 -0000 1.140 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060501 -Up to date FC5 as of 20060501 +Up to date CVE as of CVE email 20060502 +Up to date FC5 as of 20060502 ** are items that need attention @@ -101,6 +101,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Wed May 3 08:54:28 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:54:28 -0700 Subject: rpms/fuse import.log,1.5,1.6 Message-ID: <200605030854.k438sUB3025726@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693 Modified Files: import.log Log Message: auto-import fuse-2.5.3-1 on branch devel from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 8 Feb 2006 11:09:17 -0000 1.5 +++ import.log 3 May 2006 08:54:28 -0000 1.6 @@ -2,3 +2,4 @@ fuse-0_7_0-5:HEAD:fuse-0.7.0-5.src.rpm:1137113371 fuse-2_5_2-1:HEAD:fuse-2.5.2-1.src.rpm:1139346656 fuse-2_5_2-1:FC-4:fuse-2.5.2-1.src.rpm:1139396928 +fuse-2_5_3-1:HEAD:fuse-2.5.3-1.src.rpm:1146646447 From fedora-extras-commits at redhat.com Wed May 3 08:54:29 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:54:29 -0700 Subject: rpms/fuse/devel .cvsignore, 1.5, 1.6 fuse.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605030854.k438sVSf025732@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693/devel Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.5.3-1 on branch devel from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Feb 2006 21:11:24 -0000 1.5 +++ .cvsignore 3 May 2006 08:54:29 -0000 1.6 @@ -1 +1 @@ -fuse-2.5.2.tar.gz +fuse-2.5.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fuse.spec 30 Mar 2006 06:33:08 -0000 1.8 +++ fuse.spec 3 May 2006 08:54:29 -0000 1.9 @@ -1,6 +1,6 @@ Name: fuse -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.5.3 +Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -117,6 +117,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 2.5.3-1%{?dist} +- Update to 2.5.3 + * Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Feb 2006 21:11:24 -0000 1.5 +++ sources 3 May 2006 08:54:29 -0000 1.6 @@ -1 +1 @@ -ea565debe6c7486963bef05c45c50361 fuse-2.5.2.tar.gz +9c7e8b6606b9f158ae20b8521ba2867c fuse-2.5.3.tar.gz From fedora-extras-commits at redhat.com Wed May 3 08:56:04 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:56:04 -0700 Subject: rpms/fuse import.log,1.6,1.7 Message-ID: <200605030856.k438u6HH025826@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25793 Modified Files: import.log Log Message: auto-import fuse-2.5.3-1 on branch FC-4 from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 May 2006 08:54:28 -0000 1.6 +++ import.log 3 May 2006 08:56:04 -0000 1.7 @@ -3,3 +3,4 @@ fuse-2_5_2-1:HEAD:fuse-2.5.2-1.src.rpm:1139346656 fuse-2_5_2-1:FC-4:fuse-2.5.2-1.src.rpm:1139396928 fuse-2_5_3-1:HEAD:fuse-2.5.3-1.src.rpm:1146646447 +fuse-2_5_3-1:FC-4:fuse-2.5.3-1.src.rpm:1146646544 From fedora-extras-commits at redhat.com Wed May 3 08:56:04 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:56:04 -0700 Subject: rpms/fuse/FC-4 .cvsignore, 1.3, 1.4 fuse.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605030856.k438u6Jn025832@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25793/FC-4 Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.5.3-1 on branch FC-4 from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2006 11:09:24 -0000 1.3 +++ .cvsignore 3 May 2006 08:56:04 -0000 1.4 @@ -1 +1 @@ -fuse-2.5.2.tar.gz +fuse-2.5.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse.spec 30 Mar 2006 06:33:07 -0000 1.5 +++ fuse.spec 3 May 2006 08:56:04 -0000 1.6 @@ -1,6 +1,6 @@ Name: fuse -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.5.3 +Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -117,6 +117,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 2.5.3-1%{?dist} +- Update to 2.5.3 + * Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Feb 2006 11:09:24 -0000 1.3 +++ sources 3 May 2006 08:56:04 -0000 1.4 @@ -1 +1 @@ -ea565debe6c7486963bef05c45c50361 fuse-2.5.2.tar.gz +9c7e8b6606b9f158ae20b8521ba2867c fuse-2.5.3.tar.gz From fedora-extras-commits at redhat.com Wed May 3 08:58:06 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:58:06 -0700 Subject: rpms/fuse import.log,1.7,1.8 Message-ID: <200605030858.k438wcnR025939@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25905 Modified Files: import.log Log Message: auto-import fuse-2.5.3-1 on branch FC-5 from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 3 May 2006 08:56:04 -0000 1.7 +++ import.log 3 May 2006 08:58:06 -0000 1.8 @@ -4,3 +4,4 @@ fuse-2_5_2-1:FC-4:fuse-2.5.2-1.src.rpm:1139396928 fuse-2_5_3-1:HEAD:fuse-2.5.3-1.src.rpm:1146646447 fuse-2_5_3-1:FC-4:fuse-2.5.3-1.src.rpm:1146646544 +fuse-2_5_3-1:FC-5:fuse-2.5.3-1.src.rpm:1146646666 From fedora-extras-commits at redhat.com Wed May 3 08:58:07 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 01:58:07 -0700 Subject: rpms/fuse/FC-5 .cvsignore, 1.5, 1.6 fuse.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200605030858.k438wdkg025944@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25905/FC-5 Modified Files: .cvsignore fuse.spec sources Log Message: auto-import fuse-2.5.3-1 on branch FC-5 from fuse-2.5.3-1.src.rpm Update to 2.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Feb 2006 21:11:24 -0000 1.5 +++ .cvsignore 3 May 2006 08:58:07 -0000 1.6 @@ -1 +1 @@ -fuse-2.5.2.tar.gz +fuse-2.5.3.tar.gz Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fuse.spec 30 Mar 2006 06:35:09 -0000 1.9 +++ fuse.spec 3 May 2006 08:58:07 -0000 1.10 @@ -1,6 +1,6 @@ Name: fuse -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.5.3 +Release: 1%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -117,9 +117,11 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 2.5.3-1%{?dist} +- Update to 2.5.3 + * Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} - rebuild -- typo fix * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Feb 2006 21:11:24 -0000 1.5 +++ sources 3 May 2006 08:58:07 -0000 1.6 @@ -1 +1 @@ -ea565debe6c7486963bef05c45c50361 fuse-2.5.2.tar.gz +9c7e8b6606b9f158ae20b8521ba2867c fuse-2.5.3.tar.gz From fedora-extras-commits at redhat.com Wed May 3 09:09:55 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 3 May 2006 02:09:55 -0700 Subject: fedora-security/audit fc4,1.226,1.227 fc5,1.140,1.141 Message-ID: <200605030909.k4399tJU028329@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28309/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-1527 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- fc4 3 May 2006 08:47:25 -0000 1.226 +++ fc4 3 May 2006 09:09:52 -0000 1.227 @@ -101,6 +101,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) +CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- fc5 3 May 2006 08:47:25 -0000 1.140 +++ fc5 3 May 2006 09:09:52 -0000 1.141 @@ -101,6 +101,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Wed May 3 11:07:08 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 3 May 2006 04:07:08 -0700 Subject: rpms/yumex/devel sources,1.25,1.26 yumex.spec,1.26,1.27 Message-ID: <200605031107.k43B7AsR000844@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792/devel Modified Files: sources yumex.spec Log Message: Release 1.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 21 Apr 2006 08:58:34 -0000 1.25 +++ sources 3 May 2006 11:07:07 -0000 1.26 @@ -1 +1 @@ -a4d1b18e36e63b6a7605dbb76823dae8 yumex-0.99.17.tar.gz +ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- yumex.spec 21 Apr 2006 08:58:34 -0000 1.26 +++ yumex.spec 3 May 2006 11:07:07 -0000 1.27 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.17 +Version: 1.0.0 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 +- Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 - Development Release 0.99.17-1.0 * Thu Mar 30 2006 Tim Lauridsen - 0.99.16-1.0 From fedora-extras-commits at redhat.com Wed May 3 11:07:01 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 3 May 2006 04:07:01 -0700 Subject: rpms/yumex/FC-4 sources,1.13,1.14 yumex.spec,1.13,1.14 Message-ID: <200605031107.k43B7XU3000848@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792/FC-4 Modified Files: sources yumex.spec Log Message: Release 1.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Feb 2006 11:06:16 -0000 1.13 +++ sources 3 May 2006 11:07:01 -0000 1.14 @@ -1 +1 @@ -dff849b49e993777a2f13e704a5fd5bd yumex-0.44-4.tar.gz +ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- yumex.spec 8 Feb 2006 11:06:16 -0000 1.13 +++ yumex.spec 3 May 2006 11:07:01 -0000 1.14 @@ -1,14 +1,12 @@ -%define build_v 4 - Name: yumex -Version: 0.44 -Release: 4.0%{?dist} +Version: 1.0.0 +Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System License: GPL URL: http://linux.rasmil.dk/yumex -Source0: http://linux.rasmil.dk/dnl/yumex/%{name}-%{version}-%{build_v}.tar.gz +Source0: http://linux.rasmil.dk/dnl/yumex/%{name}-%{version}.tar.gz BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,7 +24,7 @@ %prep -%setup +%setup -q %build @@ -56,9 +54,9 @@ %doc COPYING ChangeLog %{_datadir}/pixmaps/yumex %{_datadir}/yumex - %{_bindir}/yumex - +/usr/lib/python?.?/site-packages/yumex +/usr/lib/python?.?/site-packages/yumgui %config(noreplace) %{_sysconfdir}/yumex.profiles.conf %config(noreplace) %{_sysconfdir}/yumex.conf %config(noreplace) %{_sysconfdir}/pam.d/yumex @@ -67,12 +65,57 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog -* Wed Feb 8 2006 Tim Lauridsen - 0.44-4.0 -- Public Release 0.44-4.0 -* Tue Feb 7 2006 Tim Lauridsen - 0.44-3.0 -- Public Release 0.44-3.0 -* Fri Dec 16 2005 Tim Lauridsen - 0.44-2.0 -- Public Release 0.44-2.0 +* Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 +- Release 1.0.0-1.0 +* Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 +- Development Release 0.99.17-1.0 +* Thu Mar 30 2006 Tim Lauridsen - 0.99.16-1.0 +- Development Release 0.99.16-1.0 +* Wed Mar 22 2006 Tim Lauridsen - 0.99.15-1.0 +- Development Release 0.99.15-1.0 +* Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 +- Development Release 0.99.14-1.0 +* Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 +- Development Release 0.99.13-1.0 +* Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 +- Development Release 0.99.12-1.0 +- Added '-q' option to %%setup +* Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 +- Development Release 0.99.11-1.0 +* Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 +- Development Release 0.99.10-1.0 +* Tue Feb 14 2006 Tim Lauridsen - 0.99.9-1.0 +- Development Release 0.99.9-1.0 +* Tue Feb 14 2006 Tim Lauridsen - 0.99.8-1.0 +- Development Release 0.99.8-1.0 +* Thu Feb 09 2006 Tim Lauridsen - 0.99.7-1.0 +- Development Release 0.99.7-1.0 +* Thu Feb 09 2006 Tim Lauridsen - 0.99.6-2.0 +- Development Release 0.99.6-2.0 +- Requires: yum from 2.5 to 2.4 +* Thu Feb 09 2006 Tim Lauridsen - 0.99.5-1.0 +- Development Release 0.99.5-1.0 +* Sun Feb 05 2006 Tim Lauridsen - 0.99.4-1.0 +- Development Release 0.99.4-1.0 +* Thu Jan 26 2006 Tim Lauridsen - 0.99.3-1.0 +- Development Release 0.99.3-1.0 +* Wed Jan 25 2006 Tim Lauridsen - 0.99.2-1.0 +- Development Release 0.99.2-1.0 +* Tue Jan 24 2006 Tim Lauridsen - 0.99.1-1.0 +- Development Release 0.99.1-1.0 +- Changed versioning from X.Y to X.Y.Z +- Remove build_v +- Removed build_v from source0 +- Added /usr/lib/python?.?/site-packages/yumex to %files +- Added /usr/lib/python?.?/site-packages/yumgui to %files +* Fri Jan 6 2006 Tim Lauridsen - 0.45-2.0 +- Development Release 0.45-2.0 +- Lot of changes, check the changelog. +* Tue Dec 20 2005 Tim Lauridsen - 0.45-1.0 +- Development Release 0.45-1.0 +- Changed to work with yum 2.5.0 +- Requires: yum >= 2.5 +- Same features as 0.44-1.0, but uses yum 2.5.0 API * Thu Dec 15 2005 Tim Lauridsen - 0.44-1.0 - Public Release 0.44-1.0 * Sun Dec 11 2005 Tim Lauridsen - 0.43-10.0 From fedora-extras-commits at redhat.com Wed May 3 11:07:02 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 3 May 2006 04:07:02 -0700 Subject: rpms/yumex/FC-5 .cvsignore, 1.20, 1.21 sources, 1.25, 1.26 yumex.spec, 1.26, 1.27 Message-ID: <200605031107.k43B7YJH000853@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792/FC-5 Modified Files: .cvsignore sources yumex.spec Log Message: Release 1.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 21 Apr 2006 08:58:34 -0000 1.20 +++ .cvsignore 3 May 2006 11:07:02 -0000 1.21 @@ -1 +1 @@ -yumex-0.99.17.tar.gz +yumex-1.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 21 Apr 2006 08:58:34 -0000 1.25 +++ sources 3 May 2006 11:07:02 -0000 1.26 @@ -1 +1 @@ -a4d1b18e36e63b6a7605dbb76823dae8 yumex-0.99.17.tar.gz +ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- yumex.spec 21 Apr 2006 08:58:34 -0000 1.26 +++ yumex.spec 3 May 2006 11:07:02 -0000 1.27 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.17 +Version: 1.0.0 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 +- Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 - Development Release 0.99.17-1.0 * Thu Mar 30 2006 Tim Lauridsen - 0.99.16-1.0 From fedora-extras-commits at redhat.com Wed May 3 13:47:58 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 06:47:58 -0700 Subject: rpms/fuse/devel fuse.spec,1.9,1.10 Message-ID: <200605031348.k43Dm0ej007510@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7493 Modified Files: fuse.spec Log Message: Rebuild Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fuse.spec 3 May 2006 08:54:29 -0000 1.9 +++ fuse.spec 3 May 2006 13:47:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base From fedora-extras-commits at redhat.com Wed May 3 13:57:28 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 06:57:28 -0700 Subject: rpms/fuse-encfs/devel .cvsignore, 1.3, 1.4 fuse-encfs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605031357.k43DvUVh007631@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7610 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Mar 2006 07:46:41 -0000 1.3 +++ .cvsignore 3 May 2006 13:57:28 -0000 1.4 @@ -1,2 +1,2 @@ -encfs-1.3.0-1.tgz -encfs-1.3.0-1.tgz.asc +encfs-1.3.1-1.tgz +encfs-1.3.1-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/fuse-encfs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fuse-encfs.spec 30 Mar 2006 07:46:41 -0000 1.3 +++ fuse-encfs.spec 3 May 2006 13:57:28 -0000 1.4 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -47,6 +47,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 1.3.1-1%{?dist} +- Version 1.3.1 + * Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} - Version 1.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Mar 2006 07:46:41 -0000 1.3 +++ sources 3 May 2006 13:57:28 -0000 1.4 @@ -1,2 +1,2 @@ -6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz -62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc +c93d6a22aa858db4eb3803170a82274a encfs-1.3.1-1.tgz +190ce801172ac75f03e6a577761cad0c encfs-1.3.1-1.tgz.asc From fedora-extras-commits at redhat.com Wed May 3 13:57:49 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 06:57:49 -0700 Subject: rpms/fuse-encfs/FC-4 .cvsignore, 1.3, 1.4 fuse-encfs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605031357.k43DvpBT007658@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7637 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Mar 2006 07:46:39 -0000 1.3 +++ .cvsignore 3 May 2006 13:57:49 -0000 1.4 @@ -1,2 +1,2 @@ -encfs-1.3.0-1.tgz -encfs-1.3.0-1.tgz.asc +encfs-1.3.1-1.tgz +encfs-1.3.1-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/fuse-encfs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fuse-encfs.spec 30 Mar 2006 07:46:39 -0000 1.3 +++ fuse-encfs.spec 3 May 2006 13:57:49 -0000 1.4 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -47,6 +47,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 1.3.1-1%{?dist} +- Version 1.3.1 + * Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} - Version 1.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Mar 2006 07:46:39 -0000 1.3 +++ sources 3 May 2006 13:57:49 -0000 1.4 @@ -1,2 +1,2 @@ -6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz -62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc +c93d6a22aa858db4eb3803170a82274a encfs-1.3.1-1.tgz +190ce801172ac75f03e6a577761cad0c encfs-1.3.1-1.tgz.asc From fedora-extras-commits at redhat.com Wed May 3 13:58:08 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 3 May 2006 06:58:08 -0700 Subject: rpms/fuse-encfs/FC-5 .cvsignore, 1.3, 1.4 fuse-encfs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605031358.k43DwAr1007685@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7664 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Mar 2006 07:46:40 -0000 1.3 +++ .cvsignore 3 May 2006 13:58:08 -0000 1.4 @@ -1,2 +1,2 @@ -encfs-1.3.0-1.tgz -encfs-1.3.0-1.tgz.asc +encfs-1.3.1-1.tgz +encfs-1.3.1-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/fuse-encfs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fuse-encfs.spec 30 Mar 2006 07:46:40 -0000 1.3 +++ fuse-encfs.spec 3 May 2006 13:58:08 -0000 1.4 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -47,6 +47,9 @@ %changelog +* Wed May 03 2006 Peter Lemenkov 1.3.1-1%{?dist} +- Version 1.3.1 + * Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} - Version 1.3.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Mar 2006 07:46:40 -0000 1.3 +++ sources 3 May 2006 13:58:08 -0000 1.4 @@ -1,2 +1,2 @@ -6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz -62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc +c93d6a22aa858db4eb3803170a82274a encfs-1.3.1-1.tgz +190ce801172ac75f03e6a577761cad0c encfs-1.3.1-1.tgz.asc From fedora-extras-commits at redhat.com Wed May 3 14:14:35 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 07:14:35 -0700 Subject: rpms/octave/FC-5 octave-2.9.5-lex.patch, NONE, 1.1 octave.spec, 1.35, 1.36 Message-ID: <200605031414.k43EEbLT010055@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10035 Modified Files: octave.spec Added Files: octave-2.9.5-lex.patch Log Message: Bug fix and spec file changes. octave-2.9.5-lex.patch: --- NEW FILE octave-2.9.5-lex.patch --- src/ChangeLog: 2006-05-02 John W. Eaton * lex.l ({CCHAR}): Exit rawcommand mode if returning '\n' token. Index: src/lex.l =================================================================== RCS file: /cvs/octave/src/lex.l,v retrieving revision 1.232 diff -u -r1.232 lex.l --- src/lex.l 24 Apr 2006 19:13:08 -0000 1.232 +++ src/lex.l 2 May 2006 23:31:14 -0000 @@ -696,7 +696,10 @@ BEGIN (INITIAL); if (nesting_level.none ()) - COUNT_TOK_AND_RETURN ('\n'); + { + lexer_flags.doing_rawcommand = false; + COUNT_TOK_AND_RETURN ('\n'); + } else if (nesting_level.is_bracket_or_brace ()) COUNT_TOK_AND_RETURN (';'); } Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- octave.spec 21 Apr 2006 17:10:12 -0000 1.35 +++ octave.spec 3 May 2006 14:14:35 -0000 1.36 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -9,6 +9,7 @@ Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 Patch0: octave-2.9.5-sparse.patch Patch1: octave-2.9.5-config.patch +Patch2: octave-2.9.5-lex.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -53,6 +54,7 @@ %setup -q %patch0 -p0 %patch1 -p0 +%patch2 -p0 %build @@ -69,7 +71,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links @@ -135,6 +136,10 @@ %changelog +* Wed May 3 2006 Quentin Spencer 2.9.5-3 +- Add patch for bug #190481 +- Manually stripping of .oct files is no longer necessary. + * Fri Apr 21 2006 Quentin Spencer 2.9.5-2 - Use updated sparse patch from development tree. From fedora-extras-commits at redhat.com Wed May 3 14:16:04 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 07:16:04 -0700 Subject: rpms/octave/devel octave-2.9.5-lex.patch, NONE, 1.1 octave.spec, 1.37, 1.38 Message-ID: <200605031416.k43EG6K2010136@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10116 Modified Files: octave.spec Added Files: octave-2.9.5-lex.patch Log Message: Bug fix and spec file changes. octave-2.9.5-lex.patch: --- NEW FILE octave-2.9.5-lex.patch --- src/ChangeLog: 2006-05-02 John W. Eaton * lex.l ({CCHAR}): Exit rawcommand mode if returning '\n' token. Index: src/lex.l =================================================================== RCS file: /cvs/octave/src/lex.l,v retrieving revision 1.232 diff -u -r1.232 lex.l --- src/lex.l 24 Apr 2006 19:13:08 -0000 1.232 +++ src/lex.l 2 May 2006 23:31:14 -0000 @@ -696,7 +696,10 @@ BEGIN (INITIAL); if (nesting_level.none ()) - COUNT_TOK_AND_RETURN ('\n'); + { + lexer_flags.doing_rawcommand = false; + COUNT_TOK_AND_RETURN ('\n'); + } else if (nesting_level.is_bracket_or_brace ()) COUNT_TOK_AND_RETURN (';'); } Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- octave.spec 19 Apr 2006 16:51:35 -0000 1.37 +++ octave.spec 3 May 2006 14:16:04 -0000 1.38 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -9,6 +9,7 @@ Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 Patch0: octave-2.9.5-sparse.patch Patch1: octave-2.9.5-config.patch +Patch2: octave-2.9.5-lex.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -53,6 +54,7 @@ %setup -q %patch0 -p0 %patch1 -p0 +%patch2 -p0 %build @@ -69,7 +71,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links @@ -135,6 +136,10 @@ %changelog +* Wed Apr 27 2006 Quentin Spencer 2.9.5-6 +- Add patch for bug #190481 +- Manual stripping of .oct files is no longer necessary. + * Wed Apr 19 2006 Quentin Spencer 2.9.5-5 - Add new patch to configure script (breaks octave-forge without it). From fedora-extras-commits at redhat.com Wed May 3 14:40:13 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 3 May 2006 07:40:13 -0700 Subject: fedora-security/audit fc4,1.227,1.228 fc5,1.141,1.142 Message-ID: <200605031440.k43EeDqC011271@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11235 Modified Files: fc4 fc5 Log Message: Update and sync with our internal tracking, make sure we mention the bz's. This is now our definitive source for FC tracking of public issues, so the sync is no longer needed. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- fc4 3 May 2006 09:09:52 -0000 1.227 +++ fc4 3 May 2006 14:40:10 -0000 1.228 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423] @@ -11,19 +12,19 @@ CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474] CVE-2006-1993 version (firefox, 1.5 only) -CVE-2006-1991 VULNERABLE (php) -CVE-2006-1990 VULNERABLE (php) +CVE-2006-1991 VULNERABLE (php) #190034 +CVE-2006-1990 VULNERABLE (php) #190034 CVE-2006-1942 ** firefox -CVE-2006-1940 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1939 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1938 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1937 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1936 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1935 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1934 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1933 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1932 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461] -CVE-2006-1931 version (ruby, fixed 1.8.3) +CVE-2006-1940 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1939 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1938 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1937 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1936 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1935 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1934 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1933 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1932 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] +CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 VULNERABLE (kernel) CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11) @@ -83,18 +84,18 @@ CVE-2006-1724 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1723 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1721 ** cyrus-sasl +CVE-2006-1721 VULNERABLE (cyrus-sasl, fixd 2.1.21) #189815 CVE-2006-1712 version (mailman, only 2.1.7) CVE-2006-1650 ** firefox CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue CVE-2006-1608 ignore (php) safe mode isn't safe -CVE-2006-1550 backport (dia) bz#187402 [since FEDORA-2006-261] +CVE-2006-1550 backport (dia) #187402 [since FEDORA-2006-261] CVE-2006-1549 ignore (php) this is not a security issue -CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544 -CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544 -CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544 -CVE-2006-1542 VULNERABLE (python) bz#169046 +CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) #187544 +CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) #187544 +CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) #187544 +CVE-2006-1542 VULNERABLE (python) #169046 CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1531 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.0.8) @@ -102,14 +103,14 @@ CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) -CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 +CVE-2006-1526 VULNERABLE (xorg-x11) #189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423] -CVE-2006-1494 VULNERABLE (php) +CVE-2006-1494 VULNERABLE (php) #189592 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] -CVE-2006-1354 VULNERABLE (freeradius) bz#186084 +CVE-2006-1354 VULNERABLE (freeradius) #186084 CVE-2006-1343 VULNERABLE (kernel) CVE-2006-1342 version (kernel, not 2.6) not vulnerable CVE-2006-1273 ignore (firefox) This is an IE only issue @@ -121,16 +122,16 @@ CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) CVE-2006-1059 version (samba) -CVE-2006-1058 VULNERABLE (busybox) bz#187386 -CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) bz#188303 +CVE-2006-1058 VULNERABLE (busybox) #187386 +CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) #188303 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423] CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423] CVE-2006-1052 version (kernel, fixed 2.6.16) [since FEDORA-2006-423] was backport since FEDORA-2006-245 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe -CVE-2006-0996 VULNERABLE (php) bz#187511 -CVE-2006-0903 VULNERABLE (mysql) bz#183261 +CVE-2006-0996 VULNERABLE (php) #187511 +CVE-2006-0903 VULNERABLE (mysql) #183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.0.8) @@ -139,7 +140,7 @@ CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13) CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-0746 VULNERABLE (kpdf) bz#184308 +CVE-2006-0746 VULNERABLE (kpdf) #184308 CVE-2006-0745 version (xorg-x11) not fc4 CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423] CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245] @@ -147,8 +148,8 @@ CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] -CVE-2006-0591 version (postgresql, fixed 8.0.6) [since FEDORA-2005-021] -CVE-2006-0576 VULNERABLE (oprofile) +CVE-2006-0591 version (postgresql, fixed 8.0.6) #180537 [since FEDORA-2005-021] +CVE-2006-0576 VULNERABLE (oprofile) #180724 CVE-2006-0558 * kernel CVE-2006-0557 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 CVE-2006-0555 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 @@ -170,7 +171,7 @@ CVE-2006-0301 version (poppler, fixed 0.4.5) [since FEDORA-2006-103] CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] CVE-2006-0301 version (kdegraphics, fixed 3.5.2) [since FEDORA-2006-385] was backport since FEDORA-2006-105 -CVE-2006-0300 VULNERABLE (tar) bz#181773 +CVE-2006-0300 VULNERABLE (tar) #181773 CVE-2006-0299 version (thunderbird, 1.5 only) CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 version (firefox, 1.5 only) @@ -195,11 +196,11 @@ CVE-2006-0292 backport (mozilla) [since FEDORA-2006-075] CVE-2006-0292 backport (firefox) [since FEDORA-2006-076] CVE-2006-0292 VULNERABLE (thunderbird) -CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178 +CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) #178178 CVE-2006-0236 ignore (thunderbird) windows only flaw -CVE-2006-0225 backport (openssh) [since FEDORA-2006-056] -CVE-2006-0208 VULNERABLE (php) bz#178036 -CVE-2006-0207 VULNERABLE (php) bz#178044 +CVE-2006-0225 backport (openssh) #168167 [since FEDORA-2006-056] +CVE-2006-0208 VULNERABLE (php) #178036 +CVE-2006-0207 VULNERABLE (php) #178044 CVE-2006-0200 version (php, 5.1.0 5.1.1 only) CVE-2006-0197 ** xorg-x11 CVE-2006-0195 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] @@ -209,7 +210,7 @@ CVE-2006-0095 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-102 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-194] -CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) bz#187421 +CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) #187421 CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0037 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077 @@ -219,7 +220,7 @@ CVE-2005-4784 ignore (glibc) struct dirent is big enough CVE-2005-4746 version (freeradius) we don't build vulnerable bits CVE-2005-4745 version (freeradius) we don't build vulnerable bits -CVE-2005-4744 VULNERABLE (freeradius, fixed 1.0.5) bz#167677 +CVE-2005-4744 VULNERABLE (freeradius, fixed 1.0.5) #167677 CVE-2005-4720 VULNERABLE (thunderbird) CVE-2005-4720 VULNERABLE (mozilla) CVE-2005-4720 VULNERABLE (firefox) @@ -227,7 +228,7 @@ CVE-2005-4685 VULNERABLE (mozilla) CVE-2005-4685 VULNERABLE (firefox) CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream -CVE-2005-4667 backport (unzip) [since FEDORA-2006-098] bz#178961 +CVE-2005-4667 backport (unzip) [since FEDORA-2006-098] #178961 CVE-2005-4639 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] CVE-2005-4636 version (openoffice.org, fixed 2.0.1) CVE-2005-4635 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2006-013 @@ -235,8 +236,8 @@ CVE-2005-4605 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2006-013 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006] CVE-2005-4442 version (openldap) gentoo only -CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187] -CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE +CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) #176267 [since FEDORA-2005-1187] +CVE-2005-4268 blocked (cpio) #172669 by FORTIFY_SOURCE CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment CVE-2005-4154 ignore (php) don't install untrusted pear packages CVE-2005-4153 VULNERABLE (mailman) @@ -245,7 +246,7 @@ CVE-2005-4130 ignore (HelixPlayer) not verified CVE-2005-4126 ignore (HelixPlayer) not verified CVE-2005-4077 backport (curl) [since FEDORA-2005-1137] -CVE-2005-3964 VULNERABLE (openmotif) bz#174815 +CVE-2005-3964 VULNERABLE (openmotif) #174815 CVE-2005-3962 backport (perl) [since FEDORA-2005-1144] CVE-2005-3912 backport (perl) [since FEDORA-2005-1144] CVE-2005-3896 ignore (mozilla) recoverable DoS only @@ -264,7 +265,7 @@ CVE-2005-3783 version (kernel, fixed 2.6.14.2) [since FEDORA-2006-077] was backport since FEDORA-2005-1104 CVE-2005-3753 version (kernel, fixed 2.6.14) also not a vuln CVE-2005-3745 ignore (struts, fixed 1.2.8) but not through tomcat -CVE-2005-3732 VULNERABLE (ipsec-tools, fixed 0.6.3) bz#173842 +CVE-2005-3732 VULNERABLE (ipsec-tools, fixed 0.6.3) #173842 CVE-2005-3675 VULNERABLE (kernel) optack CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093] CVE-2005-3662 version (netpbm) @@ -356,7 +357,7 @@ CVE-2005-3185 blocked (wget) by FORTIFY_SOURCE CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE CVE-2005-3184 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] -CVE-2005-3183 backport (w3c-libwww) [since FEDORA-2005-952] +CVE-2005-3183 backport (w3c-libwww) #159597 [since FEDORA-2005-952] CVE-2005-3181 version (kernel, fixed 2.6.13.4 at least) [since FEDORA-2005-1067] was backport since FEDORA-2005-1013 CVE-2005-3180 version (kernel, fixed 2.6.13.4 at least) [since FEDORA-2005-1067] was backport since FEDORA-2005-1013 CVE-2005-3179 version (kernel, fixed 2.6.13.4 at least) [since FEDORA-2005-1067] was backport since FEDORA-2005-1013 @@ -372,10 +373,10 @@ CVE-2005-3089 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] CVE-2005-3088 ignore (fetchmail) fetchmailconf not shipped CVE-2005-3055 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067] -CVE-2005-3054 ignore (php) see bz#169857 +CVE-2005-3054 ignore (php) see #169857 CVE-2005-3053 version (kernel) [since FEDORA-2005-949] was backport since FEDORA-2005-820 CVE-2005-3044 version (kernel, fixed 2.6.13.2) [since FEDORA-2005-1067] was backport since FEODRA-2005-949 -CVE-2005-3011 backport (texinfo) [since FEDORA-2005-991] +CVE-2005-3011 backport (texinfo) #169585 [since FEDORA-2005-991] CVE-2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts CVE-2005-2978 version (netpbm, fixed 10.25) CVE-2005-2977 backport (pam) [since FEDORA-2005-1031] @@ -384,7 +385,7 @@ CVE-2005-2975 backport (gdk-pixbuf) [since FEDORA-2005-1085] CVE-2005-2974 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046] CVE-2005-2973 version (kernel, 2.6.14 at least) [since FEODRA-2005-1067] -CVE-2005-2970 backport (httpd) bz#171759 [since FEDORA-2006-052] +CVE-2005-2970 backport (httpd) #171759 [since FEDORA-2006-052] CVE-2005-2969 backport (openssl097a, fixed 0.9.7h) [since FEDORA-2005-986] CVE-2005-2969 backport (openssl, fixed 0.9.7h) [since FEDORA-2005-986] CVE-2005-2968 version (thunderbird) [since FEDORA-2005-963] @@ -393,7 +394,7 @@ CVE-2005-2959 ignore (sudo) not a vulnerability CVE-2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md) CVE-2005-2933 backport (libc-client) [since FEDORA-2005-1115] -CVE-2005-2933 VULNERABLE (uw-imap) bz#171345 +CVE-2005-2933 VULNERABLE (uw-imap) #171345 CVE-2005-2929 backport (lynx) [since FEDORA-2005-1079] CVE-2005-2922 version (HelixPlayer, fixed 1.0.6) [since FEDORA-2005-940] CVE-2005-2917 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] @@ -438,9 +439,9 @@ CVE-2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849] CVE-2005-2693 backport (cvs) [since FEDORA-2005-790] CVE-2005-2672 backport (lm_sensors) [since FEDORA-2005-1053] -CVE-2005-2666 VULNERABLE (openssh) see bz#162681 +CVE-2005-2666 VULNERABLE (openssh) #162681 CVE-2005-2642 version (mutt, openbsd only) -CVE-2005-2641 VULNERABLE (pam_ldap) bz#166164 +CVE-2005-2641 VULNERABLE (pam_ldap) #166164 CVE-2005-2629 version (helixplayer, fixed 1.0.6) [since FEDORA-2005-940] CVE-2005-2617 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820] CVE-2005-2602 ignore (thunderbird) probably @@ -459,14 +460,14 @@ CVE-2005-2498 version (php xml_rpc, fixed 1.4.0) [since FEDORA-2005-810] CVE-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch CVE-2005-2495 backport (xorg-x11) [since FEDORA-2005-894] -CVE-2005-2494 version (kdebase, fixed after 3.4.2) [since FEDORA-2005-1152] +CVE-2005-2494 version (kdebase, fixed after 3.4.2) #166997 [since FEDORA-2005-1152] CVE-2005-2492 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906 CVE-2005-2491 ignore (python, fc4 python does not contain pcre) CVE-2005-2491 ignore (php, pcre uses system pcre) CVE-2005-2491 ignore (httpd, pcre uses system pcre) CVE-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803] CVE-2005-2490 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906 -CVE-2005-2475 VULNERABLE (unzip) bz#164928 +CVE-2005-2475 VULNERABLE (unzip) #164928 CVE-2005-2471 version (netpbm, 10.31 at least) [since FEDORA-2005-000**] was backport since FEDORA-2005-728 CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible CVE-2005-2458 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820] @@ -568,6 +569,7 @@ CVE-2005-1705 backport (gdb) [since FEDORA-2005-1033] CVE-2005-1704 backport (gdb) [since FEDORA-2005-1033] CVE-2005-1704 backport (binutils) ...eadelf-overflows.patch [since FEDORA-2005-498] +CVE-2005-1704 ** elfutils #159891 CVE-2005-1689 backport (krb5) [since FEDORA-2005-553] CVE-2005-1686 ignore (gedit, not a vulnerability) CVE-2005-1636 version (mysql, fixed 4.1.12) [since FEDORA-2005-557] @@ -682,7 +684,7 @@ CVE-2005-0760 version (ImageMagick, fixed 6.0) CVE-2005-0759 version (ImageMagick, fixed 6.0) CVE-2005-0758 version (gzip, fixed 1.3.5) -CVE-2005-0758 VULNERABLE (bzip2) by inspection bz#159819 +CVE-2005-0758 VULNERABLE (bzip2) by inspection #159819 CVE-2005-0757 version (kernel, not 2.6) CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport since GA CVE-2005-0755 version (HelixPlayer, fixed 10.0.4) @@ -752,7 +754,7 @@ CVE-2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch CVE-2005-0455 version (HelixPlayer, fixed 1.0.3) CVE-2005-0449 version (kernel, fixed 2.6.11) -CVE-2005-0448 version (perl, fixed 5.8.6) bz#173793 +CVE-2005-0448 version (perl, fixed 5.8.6) #173793 CVE-2005-0446 version (squid, fixed 2.5.STABLE9) CVE-2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020 CVE-2005-0403 version (kernel, not upstream) @@ -888,7 +890,7 @@ CVE-2004-2536 version (kernel, fixed 2.6.7) CVE-2004-2531 version (gnutls, fixed 1.0.17) CVE-2004-2502 version (iiimf, fixed 11.4-46.1) -CVE-2004-2480 ignore (squid) bz#166523, not reproducable +CVE-2004-2480 ignore (squid) #166523, not reproducable CVE-2004-2479 version (squid, fixed 2.5.STABLE8) CVE-2004-2396 version (passwd, fixed 0.69) verified in source CVE-2004-2395 version (passwd, fixed 0.69) verified in source @@ -1054,7 +1056,7 @@ CVE-2004-0956 version (mysql, fixed 4.0.20) CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6) CVE-2004-0942 version (httpd, fixed 2.0.53) -CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream bz#175414 +CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream #175414 CVE-2004-0940 version (httpd, not 2.0) CVE-2004-0938 version (freeradius, fixed 1.0.1) CVE-2004-0930 version (samba, fixed 3.0.8) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- fc5 3 May 2006 09:09:52 -0000 1.141 +++ fc5 3 May 2006 14:40:10 -0000 1.142 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421] @@ -11,19 +12,19 @@ CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-1993 VULNERABLE (firefox) #190124 -CVE-2006-1991 VULNERABLE (php) -CVE-2006-1990 VULNERABLE (php) +CVE-2006-1991 VULNERABLE (php) #190034 +CVE-2006-1990 VULNERABLE (php) #190034 CVE-2006-1942 ** firefox -CVE-2006-1940 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1939 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1938 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1937 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1936 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1935 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1934 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1933 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1932 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456] -CVE-2006-1931 version (ruby, fixed 1.8.3) +CVE-2006-1940 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1939 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1938 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1937 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1936 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1935 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1934 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1933 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1932 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] +CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 VULNERABLE (kernel) @@ -84,7 +85,7 @@ CVE-2006-1724 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1723 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1721 ** cyrus-sasl +CVE-2006-1721 version (cyrus-sasl, fixed 2.1.21) CVE-2006-1712 version (mailman, only 2.1.7) CVE-2006-1650 ** firefox CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon @@ -107,7 +108,7 @@ CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421] -CVE-2006-1494 VULNERABLE (php) +CVE-2006-1494 VULNERABLE (php)#189592 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 VULNERABLE (kernel) @@ -132,7 +133,7 @@ CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0996 VULNERABLE (php) bz#187511 -CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet +CVE-2006-0903 VULNERABLE (mysql) #183261 low/not upstream yet CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.5.0.2) @@ -197,7 +198,7 @@ CVE-2006-0292 version (thunderbird, fixed 1.5) CVE-2006-0292 version (firefox, fixed 1.5.1) CVE-2006-0292 backport (mozilla) mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch -CVE-2006-0254 backport (tomcat5, fixed 5.5.16) **check this** +CVE-2006-0254 backport (tomcat5, fixed 5.5.16) #178179 **check this** CVE-2006-0236 ignore (thunderbird) windows only CVE-2006-0225 version (openssh, fixed 4.3p2) CVE-2006-0208 version (php, fixed 5.1.2) @@ -214,7 +215,7 @@ CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193] CVE-2006-0052 version (mailman, fixed 2.1.6) CVE-2006-0049 version (gnupg, fixed 1.4.2.2) -CVE-2006-0040 ** VULNERABLE (gtkhtml) no upstream fix +CVE-2006-0040 ** VULNERABLE (gtkhtml) #183680 no upstream fix CVE-2006-0037 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] From fedora-extras-commits at redhat.com Wed May 3 15:42:44 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 08:42:44 -0700 Subject: rpms/octave-forge/devel octave-forge-2006.03.17-zplane.patch, NONE, 1.1 octave-forge.spec, 1.23, 1.24 Message-ID: <200605031542.k43FgksT016198@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16178 Modified Files: octave-forge.spec Added Files: octave-forge-2006.03.17-zplane.patch Log Message: Bug fix for #190481 octave-forge-2006.03.17-zplane.patch: --- NEW FILE octave-forge-2006.03.17-zplane.patch --- Index: main/signal/zplane.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/signal/zplane.m,v retrieving revision 1.4 diff -u -r1.4 zplane.m --- main/signal/zplane.m 7 Jan 2006 05:23:27 -0000 1.4 +++ main/signal/zplane.m 3 May 2006 14:27:36 -0000 @@ -83,9 +83,12 @@ catch eleo = 0; end; ##= 2.9.5 ImageMagick @@ -38,6 +39,7 @@ %patch0 -p1 # The following patch requires regenerating the configure script %patch1 -p0 +%patch2 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL @@ -73,6 +75,9 @@ %changelog +* Wed May 3 2006 Quentin Spencer 2006.03.17-4 +- Bug fix for #190481 + * Thu Apr 27 2006 Quentin Spencer 2006.03.17-3 - Add fixes for octcdf (from the author), which changes the dependency from netcdf to libnc-dap. (This requires autoconf temporarily.) From fedora-extras-commits at redhat.com Wed May 3 15:44:00 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 08:44:00 -0700 Subject: rpms/galeon/devel galeon.spec,1.15,1.16 Message-ID: <200605031544.k43Fi2mv016248@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16231 Modified Files: galeon.spec Log Message: Rebuild for mozilla 1.7.13 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- galeon.spec 1 Mar 2006 08:13:33 -0000 1.15 +++ galeon.spec 3 May 2006 15:44:00 -0000 1.16 @@ -1,13 +1,13 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -Requires: mozilla = 37:1.7.12 +Requires: mozilla = 37:1.7.13 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: gnome-desktop-devel @@ -113,6 +113,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-2 +- Rebuild for mozilla 1.7.13 + * Tue Feb 28 2006 Denis Leroy - 2.0.1-1 - Update to 2.0.1 From fedora-extras-commits at redhat.com Wed May 3 15:44:07 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 08:44:07 -0700 Subject: rpms/octave-forge/FC-5 octave-forge-2006.03.17-zplane.patch, NONE, 1.1 octave-forge.spec, 1.22, 1.23 Message-ID: <200605031544.k43Fi9We016308@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16283 Modified Files: octave-forge.spec Added Files: octave-forge-2006.03.17-zplane.patch Log Message: Fix octcdf. Bug fix for #190481 octave-forge-2006.03.17-zplane.patch: --- NEW FILE octave-forge-2006.03.17-zplane.patch --- Index: main/signal/zplane.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/signal/zplane.m,v retrieving revision 1.4 diff -u -r1.4 zplane.m --- main/signal/zplane.m 7 Jan 2006 05:23:27 -0000 1.4 +++ main/signal/zplane.m 3 May 2006 15:37:01 -0000 @@ -83,9 +83,12 @@ catch eleo = 0; end; ##= 2.9.5 ImageMagick BuildRequires: octave-devel tetex gcc-gfortran ginac-devel qhull-devel -BuildRequires: ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel +BuildRequires: ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel BuildRequires: libjpeg-devel libpng-devel ncurses-devel libtermcap-devel +BuildRequires: autoconf %description Octave-forge is a community project for collaborative development of @@ -34,11 +37,14 @@ %prep %setup -q %patch0 -p1 +# The following patch requires regenerating the configure script +%patch1 -p0 +%patch2 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL %build -export CPPFLAGS=-I%{_includedir}/netcdf-3 +./autogen.sh %configure make %{?_smp_mflags} @@ -69,6 +75,11 @@ %changelog +* Wed May 3 2006 Quentin Spencer 2006.03.17-3 +- Add fixes for octcdf (from the author), which changes the dependency + from netcdf to libnc-dap. (This requires autoconf temporarily.) +- Bug fix for #190481 + * Thu Apr 20 2006 Quentin Spencer 2006.03.17-2 - Add patch for system function so it works with octave 2.9.5. From fedora-extras-commits at redhat.com Wed May 3 15:47:34 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 May 2006 08:47:34 -0700 Subject: rpms/octave-forge/FC-5 octave-forge-2006.03.17-octcdf.patch, NONE, 1.1 octave-forge.spec, 1.23, 1.24 Message-ID: <200605031547.k43Flaj5016504@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16484 Modified Files: octave-forge.spec Added Files: octave-forge-2006.03.17-octcdf.patch Log Message: Forgot to commit octcdf patch. octave-forge-2006.03.17-octcdf.patch: --- NEW FILE octave-forge-2006.03.17-octcdf.patch --- Index: main/octcdf/Makefile =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- main/octcdf/Makefile 19 Apr 2006 19:09:51 -0000 1.6 +++ main/octcdf/Makefile 28 Apr 2006 17:51:17 -0000 @@ -34,7 +34,7 @@ RM = rm -f endif -NCTARGET = ov-netcdf.oct +NCTARGET = netcdf.oct NCSOURCES = ov-netcdf.cc ov-ncfile.cc ov-ncvar.cc ov-ncatt.cc ov-ncdim.cc OBJECTS = $(patsubst %.cc,%.o,$(NCSOURCES)) Index: main/octcdf/configure.add =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/configure.add,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main/octcdf/configure.add 15 Dec 2005 22:13:52 -0000 1.2 +++ main/octcdf/configure.add 25 Apr 2006 16:35:01 -0000 1.3 @@ -11,34 +11,29 @@ OCTCDF_LIBS="$LDFLAGS" OCTCDF_CFLAGS="$CPPFLAGS" - dnl checking for opendap support + dnl first checking for opendap support - AC_MSG_CHECKING([for nc-dap]) + AC_MSG_CHECKING([for nc-dap]) - if ncdap-config --version > /dev/null 2>&1; then + if ncdap-config --version > /dev/null 2>&1; then + AC_MSG_RESULT([yes]) OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`" OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`" - HAVE_NCDAP=yes - AC_MSG_RESULT([yes]) - else - HAVE_NCDAP=no - AC_MSG_RESULT([no]) - fi - - dnl Checking if the NetCDF library exists. + HAVE_NETCDF=yes + else + AC_MSG_RESULT([no]) - AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,) + dnl if no opendap, checking if the NetCDF library exists. - if test $HAVE_NETCDF = yes ; then - OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf" - fi + AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,) - dnl if we don't have nc-dap then we have to check for netcdf.h - dnl otherwise it is already given by ncdap-config --cflags + if test $HAVE_NETCDF = yes ; then + OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf" - if test $HAVE_NCDAP = no ; then - AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no) + dnl we have the libraries, no we have also the headers? + AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no) + fi fi if test $HAVE_NETCDF = yes ; then Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- octave-forge.spec 3 May 2006 15:44:07 -0000 1.23 +++ octave-forge.spec 3 May 2006 15:47:33 -0000 1.24 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2006.03.17 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -75,6 +75,9 @@ %changelog +* Wed May 3 2006 Quentin Spencer 2006.03.17-4 +- Forgot to commit octcdf patch. + * Wed May 3 2006 Quentin Spencer 2006.03.17-3 - Add fixes for octcdf (from the author), which changes the dependency from netcdf to libnc-dap. (This requires autoconf temporarily.) From fedora-extras-commits at redhat.com Wed May 3 16:22:08 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 09:22:08 -0700 Subject: rpms/galeon/FC-5 galeon.spec,1.15,1.16 Message-ID: <200605031622.k43GMACr018911@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18894 Modified Files: galeon.spec Log Message: Rebuild for mozilla 1.7.13 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-5/galeon.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- galeon.spec 1 Mar 2006 08:13:33 -0000 1.15 +++ galeon.spec 3 May 2006 16:22:08 -0000 1.16 @@ -1,13 +1,13 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) -Requires: mozilla = 37:1.7.12 +Requires: mozilla = 37:1.7.13 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: gnome-desktop-devel @@ -113,6 +113,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-2 +- Rebuild for mozilla 1.7.13 + * Tue Feb 28 2006 Denis Leroy - 2.0.1-1 - Update to 2.0.1 From fedora-extras-commits at redhat.com Wed May 3 16:26:28 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 3 May 2006 09:26:28 -0700 Subject: rpms/pygame/FC-4 pygame.spec,1.6,1.7 Message-ID: <200605031626.k43GQUYs019016@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pygame/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18971/pygame/FC-4 Modified Files: pygame.spec Log Message: Fix Obsolete/Provides for python-pygame-doc Index: pygame.spec =================================================================== RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pygame.spec 26 Apr 2006 15:06:45 -0000 1.6 +++ pygame.spec 3 May 2006 16:26:28 -0000 1.7 @@ -2,7 +2,7 @@ Name: pygame Version: 1.7.1 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Python modules for writing games Group: Development/Languages License: LGPL @@ -15,9 +15,9 @@ BuildRequires: SDL_ttf-devel SDL_image-devel SDL_mixer-devel Requires: python-numeric Obsoletes: python-pygame < 1.7.1 -Obsoletes: python-pygame-docs < 1.7.1 +Obsoletes: python-pygame-doc < 1.7.1 Provides: python-pygame = %{version}-%{release} -Provides: python-pygame-docs = %{version}-%{release} +Provides: python-pygame-doc = %{version}-%{release} %description Pygame is a set of Python modules designed for writing games. It is @@ -86,6 +86,12 @@ %{_includedir}/python*/%{name}/*.h %changelog +* Wed May 03 2006 Christopher Stone 1.7.1.7 +- Fix Obsolete/Provides of python-pygame-doc + +* Wed Apr 26 2006 Christopher Stone 1.7.1-6 +- Bump release for new build on devel + * Wed Apr 26 2006 Christopher Stone 1.7.1-5 - Add Obsolete/Provides tags for python-pygame-docs - Add Obsolete/Provides tags for python-pygame-devel to devel package From fedora-extras-commits at redhat.com Wed May 3 16:26:29 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 3 May 2006 09:26:29 -0700 Subject: rpms/pygame/FC-5 pygame.spec,1.6,1.7 Message-ID: <200605031626.k43GQVt0019020@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pygame/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18971/pygame/FC-5 Modified Files: pygame.spec Log Message: Fix Obsolete/Provides for python-pygame-doc Index: pygame.spec =================================================================== RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pygame.spec 26 Apr 2006 15:06:46 -0000 1.6 +++ pygame.spec 3 May 2006 16:26:29 -0000 1.7 @@ -2,7 +2,7 @@ Name: pygame Version: 1.7.1 -Release: 5%{?dist} +Release: 7%{?dist} Summary: Python modules for writing games Group: Development/Languages License: LGPL @@ -15,9 +15,9 @@ BuildRequires: SDL_ttf-devel SDL_image-devel SDL_mixer-devel Requires: python-numeric Obsoletes: python-pygame < 1.7.1 -Obsoletes: python-pygame-docs < 1.7.1 +Obsoletes: python-pygame-doc < 1.7.1 Provides: python-pygame = %{version}-%{release} -Provides: python-pygame-docs = %{version}-%{release} +Provides: python-pygame-doc = %{version}-%{release} %description Pygame is a set of Python modules designed for writing games. It is @@ -86,6 +86,12 @@ %{_includedir}/python*/%{name}/*.h %changelog +* Wed May 03 2006 Christopher Stone 1.7.1.7 +- Fix Obsolete/Provides of python-pygame-doc + +* Wed Apr 26 2006 Christopher Stone 1.7.1-6 +- Bump release for new build on devel + * Wed Apr 26 2006 Christopher Stone 1.7.1-5 - Add Obsolete/Provides tags for python-pygame-docs - Add Obsolete/Provides tags for python-pygame-devel to devel package From fedora-extras-commits at redhat.com Wed May 3 16:26:30 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 3 May 2006 09:26:30 -0700 Subject: rpms/pygame/devel pygame.spec,1.7,1.8 Message-ID: <200605031626.k43GQW60019024@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pygame/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18971/pygame/devel Modified Files: pygame.spec Log Message: Fix Obsolete/Provides for python-pygame-doc Index: pygame.spec =================================================================== RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pygame.spec 26 Apr 2006 15:17:36 -0000 1.7 +++ pygame.spec 3 May 2006 16:26:29 -0000 1.8 @@ -2,7 +2,7 @@ Name: pygame Version: 1.7.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Python modules for writing games Group: Development/Languages License: LGPL @@ -15,9 +15,9 @@ BuildRequires: SDL_ttf-devel SDL_image-devel SDL_mixer-devel Requires: python-numeric Obsoletes: python-pygame < 1.7.1 -Obsoletes: python-pygame-docs < 1.7.1 +Obsoletes: python-pygame-doc < 1.7.1 Provides: python-pygame = %{version}-%{release} -Provides: python-pygame-docs = %{version}-%{release} +Provides: python-pygame-doc = %{version}-%{release} %description Pygame is a set of Python modules designed for writing games. It is @@ -86,6 +86,9 @@ %{_includedir}/python*/%{name}/*.h %changelog +* Wed May 03 2006 Christopher Stone 1.7.1.7 +- Fix Obsolete/Provides of python-pygame-doc + * Wed Apr 26 2006 Christopher Stone 1.7.1-6 - Bump release for new build on devel From fedora-extras-commits at redhat.com Wed May 3 17:12:37 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 3 May 2006 10:12:37 -0700 Subject: rpms/mail-notification/FC-5 mail-notification.spec,1.17,1.18 Message-ID: <200605031712.k43HCd4K021588@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21571 Modified Files: mail-notification.spec Log Message: Added patch for IMAP authentication problem from project homepage (#190137) Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-5/mail-notification.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mail-notification.spec 13 Feb 2006 17:31:56 -0000 1.17 +++ mail-notification.spec 3 May 2006 17:12:37 -0000 1.18 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -11,6 +11,7 @@ Patch0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff Patch1: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff Patch2: mail-notification-evolution.patch +Patch3: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-imapauth.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext >= 0.14.1 @@ -47,6 +48,7 @@ %patch0 -b .patch0 %patch1 -b .patch1 %patch2 -p1 -b .evolution +%patch3 -b .patch3 %build export LDFLAGS="-Wl,--export-dynamic" @@ -118,6 +120,9 @@ %changelog +* Thu Apr 27 2006 Paul Clifford 2.0-12 +- Added patch for IMAP authentication problem from project homepage (#190137) + * Mon Feb 13 2006 Thorsten Leemhuis - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed May 3 17:17:01 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 3 May 2006 10:17:01 -0700 Subject: rpms/mail-notification/FC-5 mail-notification-2.0-imapauth.diff, NONE, 1.1 Message-ID: <200605031717.k43HH3M9021665@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21647 Added Files: mail-notification-2.0-imapauth.diff Log Message: add missing file mail-notification-2.0-imapauth.diff: --- NEW FILE mail-notification-2.0-imapauth.diff --- --- src/mn-imap-mailbox.c.orig Tue Aug 9 22:01:56 2005 +++ src/mn-imap-mailbox.c Wed Jan 25 19:22:48 2006 @@ -1646,7 +1646,12 @@ */ if (mn_ascii_validate(input)) { - if (g_str_has_prefix(input, "+ ")) + if (! strcmp(input, "+")) + { + response = g_new0(MNClientSessionResponse, 1); + response->continuation = g_strdup(""); + } + else if (g_str_has_prefix(input, "+ ")) { response = g_new0(MNClientSessionResponse, 1); response->continuation = g_strdup(input + 2); From fedora-extras-commits at redhat.com Wed May 3 17:48:50 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 3 May 2006 10:48:50 -0700 Subject: rpms/banshee/devel .cvsignore, 1.5, 1.6 banshee.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200605031748.k43HmqZR021942@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21921 Modified Files: .cvsignore banshee.spec sources Log Message: * Tue May 2 2006 Christopher Aillon 0.10.10-1 - Update to 0.10.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Apr 2006 20:27:43 -0000 1.5 +++ .cvsignore 3 May 2006 17:48:50 -0000 1.6 @@ -1 +1 @@ -banshee-0.10.9.tar.gz +banshee-0.10.10.tar.gz Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- banshee.spec 16 Apr 2006 20:32:12 -0000 1.9 +++ banshee.spec 3 May 2006 17:48:50 -0000 1.10 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.9 -Release: 1.%{?dist} +Version: 0.10.10 +Release: 1%{?dist} Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -96,6 +96,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Tue May 2 2006 Christopher Aillon 0.10.10-1 +- Update to 0.10.10 + * Tue Mar 21 2006 Christopher Aillon 0.10.9-1 - Update to 0.10.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Apr 2006 20:27:43 -0000 1.5 +++ sources 3 May 2006 17:48:50 -0000 1.6 @@ -1 +1 @@ -86b67e399ea805f69a860b3e6fd4627f banshee-0.10.9.tar.gz +cb553f5bc6dc14b7afa44349d025bbdc banshee-0.10.10.tar.gz From fedora-extras-commits at redhat.com Wed May 3 18:07:11 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 3 May 2006 11:07:11 -0700 Subject: rpms/hddtemp/devel .cvsignore, 1.6, 1.7 hddtemp.db, 1.10, 1.11 hddtemp.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200605031807.k43I7DmS024252@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229 Modified Files: .cvsignore hddtemp.db hddtemp.spec sources Log Message: * Wed May 3 2006 Ville Skytt?? - 0.3-0.8.beta15 - 0.3-beta15, drive database 2006-04-26. - Specfile cleanups. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Sep 2005 18:09:14 -0000 1.6 +++ .cvsignore 3 May 2006 18:07:11 -0000 1.7 @@ -1 +1 @@ -hddtemp-0.3-beta14.tar.bz2 +hddtemp-0.3-beta15.tar.bz2 Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hddtemp.db 26 Feb 2006 15:41:47 -0000 1.10 +++ hddtemp.db 3 May 2006 18:07:11 -0000 1.11 @@ -9,7 +9,7 @@ # The following list was found at (http://www.almico.com/forumharddisks.php) # If your drive is in the list send me a mail. # -# Manufacturer Model Size Notes +# Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB @@ -42,7 +42,7 @@ ######################################## ############# ExcelStor drives ######################################## -# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" +# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" "ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)" @@ -54,88 +54,84 @@ ######################################## ############# Fujitsu drives ######################################## -"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" +"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" -"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" -"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" -"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" +"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" +"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" +"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" -"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" -"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" +"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" +"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" -"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" -"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" -"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" +"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" +"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" +"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" -"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" +"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" -"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" -"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" -"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" -"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" -"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" -"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" +"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" +"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" +"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" +"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" +"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" +"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" -"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" +"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" -"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" -"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH" +"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" +"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH" -"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" +"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" -"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" -"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" -"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" -"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" -"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" -"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" +"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" +"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" +"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" +"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" +"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" +"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" ######################################## ############# Hitachi drives ######################################## -"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" -"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" -"HITACHI_DK23CA-15" 194 C "Hitachi DK23CA-15" -"HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" -"HITACHI_DK23CA-30" 194 C "Hitachi DK23CA-30" -"HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" -"HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" -"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" -"HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" -"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" -"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" -"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" - -"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" -"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" -"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" -"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" -"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" -"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" -"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" - -"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" - -"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" -"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" -"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" -"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" - -"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" -"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" -"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" -"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" -"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" -"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" -"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" -"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" -"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" +"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" +"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" +"HITACHI_DK23CA-(15|20|30|30B|75)" 194 C "Hitachi DK23CA series" +"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" +"HITACHI_DK23EA-[2346]0" 194 C "Hitachi DK23EA series" +"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" +"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" +"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" + +"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" +"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" +"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" +"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" +"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" +"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" +"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" + +"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" + +"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" +"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" + +"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" +"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" +"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" +"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" +"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" +"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" +"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" +"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" +"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## @@ -144,60 +140,60 @@ # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. -# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" +# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" -"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" -"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" +"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" +"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report -#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" +#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" -"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" -"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" -"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" -"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" -"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" -"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" -"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" -"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" -"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" -"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" -"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" -"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" -"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" -"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" -"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" -"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" +"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" +"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" +"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" +"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" +"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" +"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" +"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" +"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" +"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" +"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" +"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" +"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" +"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" +"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" +"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" +"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## -#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" -"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" +#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" +"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" +#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D060H3" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" -"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" -"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" -"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" +"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" +"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" +"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" -"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" -"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" -"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" -"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" -"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" -"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" -"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM" -"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" -"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" +"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" +"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" +"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" +"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" +"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" +"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" +"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM" +"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" +"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" "Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM" -"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" +"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" @@ -217,126 +213,128 @@ ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature -"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" -"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)" -"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" -"SAMSUNG SW0434A" 0 C "Samsung SW0434A" -"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" -"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" -"SAMSUNG SP0822N" 194 C "Samsung SP0822N" -"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" +"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" +"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)" +"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" +"SAMSUNG SW0434A" 0 C "Samsung SW0434A" +"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" +"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" +"SAMSUNG SP0822N" 194 C "Samsung SP0822N" +"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SP2[05]14N" 194 C "Samsung SpinPoint P120 series (7200RPM, 8MB cache)" -"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" -"SAMSUNG SV0432A" 0 C "Samsung SV0432A" -"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" -#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" -#"SAMSUNG SV1204H" 194 C "Samsung 120G" -"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" -"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" +"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" +"SAMSUNG SV0432A" 0 C "Samsung SV0432A" +"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" +#"SAMSUNG SV1204H" 194 C "Samsung 120G" +"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" +"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" ######################################## ############# Seagate drives ######################################## -"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" -"ST3412A" 0 C "Seagate ST3412A" -"ST38641A" 0 C "Seagate ST38641A" -"ST310014A" 194 C "Seagate ST310014A" -"ST310210A" 0 C "Seagate ST310210A" -"ST310211A" 194 C "Seagate ST310211A" -"ST310220A" 0 C "Seagate ST310220A" +"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" +"ST3412A" 0 C "Seagate ST3412A" +"ST38641A" 0 C "Seagate ST38641A" +"ST310014A" 194 C "Seagate ST310014A" +"ST310210A" 0 C "Seagate ST310210A" +"ST310211A" 194 C "Seagate ST310211A" +"ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB -"ST313021A" 0 C "Seagate U8 ST313021A" -"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" -"ST315320A" 194 C "Seagate ST315320A" -"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" -"ST320011A" 194 C "Seagate ST320011A" -"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" -"ST320410A" 194 C "Seagate ST320410A" -"ST320413A" 194 C "Seagate ST320413A" -"ST320414A" 194 C "Seagate ST320414A" -"ST320420A" 194 C "Seagate Barracuda II ST320420A" -"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" -"ST330620A" 194 C "Seagate ST330620A" -"ST330621A" 194 C "Seagate ST330621A" -"ST330630A" 194 C "Seagate Barracuda ST330630A" -"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" -"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" -"ST340016A" 194 C "Seagate ST340016A" -"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" -"ST340823A" 194 C "Seagate U Series 5 40823" -"ST340824A" 194 C "Seagate Barracuda III" -"ST360015A" 194 C "Seagate Barracuda V ST360015A" -"ST360020A" 194 C "Seagate U Series 60020" -"ST360021A" 194 C "Seagate Barracuda IV ST360021A" -"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380012A" 194 C "Seagate ST380012A 80GB" -"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" -"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" -"ST380021A" 194 C "Seagate Barracuda IV ST380021A" -"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" -"ST380023A" 194 C "Seagate Barracuda V ST380023A" -"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" -"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" -"ST3120020A" 194 C "Seagate ST3120020A" -"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" -"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" -"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" -"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" -"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" -"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" -"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" -"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" -"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" -"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" -"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" -"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" -"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" -"ST3300831A" 194 C "Seagate 300GB ST3300831A" -"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" -"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" +"ST313021A" 0 C "Seagate U8 ST313021A" +"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" +"ST315320A" 194 C "Seagate ST315320A" +"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" +"ST320011A" 194 C "Seagate ST320011A" +"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" +"ST320410A" 194 C "Seagate ST320410A" +"ST320413A" 194 C "Seagate ST320413A" +"ST320414A" 194 C "Seagate ST320414A" +"ST320420A" 194 C "Seagate Barracuda II ST320420A" +"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" +"ST330620A" 194 C "Seagate ST330620A" +"ST330621A" 194 C "Seagate ST330621A" +"ST330630A" 194 C "Seagate Barracuda ST330630A" +"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" +"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" +"ST340016A" 194 C "Seagate ST340016A" +"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" +"ST340823A" 194 C "Seagate U Series 5 40823" +"ST340824A" 194 C "Seagate Barracuda III" +"ST360015A" 194 C "Seagate Barracuda V ST360015A" +"ST360020A" 194 C "Seagate U Series 60020" +"ST360021A" 194 C "Seagate Barracuda IV ST360021A" +"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380012A" 194 C "Seagate ST380012A 80GB" +"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" +"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" +"ST380021A" 194 C "Seagate Barracuda IV ST380021A" +"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" +"ST380023A" 194 C "Seagate Barracuda V ST380023A" +"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" +"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" +"ST3120020A" 194 C "Seagate ST3120020A" +"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" +"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" +"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" +"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" +"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" +"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" +"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" +"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" +"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" +"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" +"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" +"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" +"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" +"ST3300831A" 194 C "Seagate 300GB ST3300831A" +"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" +"ST3802110A" 194 C "Seagate Barracuda 7200.9 80 GB" +"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" "ST9100823A" 194 C "Seagate Momentus 5400.2 100GB" -"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" -"ST94019A" 194 C "Seagate ST94019A" -"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" -"ST94[08]11A" 194 C "Seagate ST94011A" -"ST960821A" 194 C "Seagate ST960821A" -"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" -"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" -"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" +"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" +"ST94019A" 194 C "Seagate ST94019A" +"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" +"ST94[08]11A" 194 C "Seagate ST94011A" +"ST960821A" 194 C "Seagate ST960821A" +"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" +"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" +"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" + ######################################## ############# TOSHIBA Laptops ######################################## -"MK4313MAT" 220 C "Toshiba MK4313MAT" -"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" -"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" -"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" -"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" - -"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" -"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" -"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" - -#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" -"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" -"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" -"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" -"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" +"MK4313MAT" 220 C "Toshiba MK4313MAT" +"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" +"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" +"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" +"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" + +"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" +"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" +"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" + +#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" +"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" +"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" +"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" -"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" -"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" -"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" -"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" +"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" +"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" +"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" +"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" -"MK4025GAS" 194 C "Toshiba MK4025GAS" +"MK4025GAS" 194 C "Toshiba MK4025GAS" ######################################## @@ -345,12 +343,12 @@ # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC AC22000L" 0 C "Western Digital Caviar AC22000" -"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" +"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Western Digital WD135BA" -"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" -"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" +"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" +"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" #"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" "WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" @@ -359,7 +357,7 @@ "WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" #"WDC WD400BB-00GFA0" 0 C "" "WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" -"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" +"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" @@ -370,7 +368,7 @@ "WDC WD400VE-75HDT1" 194 C "Western Digital Scorpio 40GB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" -"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" +"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" "WDC WD600VE-75HDT0" 194 C "Western Digital 600VE-75HDT0" "WDC WD600VE-00HDT0" 194 C "Western Digital 600VE-00HDT0" "WDC WD740GD-00FL21.0" 194 C "Western Digital SATA Raptor" @@ -383,20 +381,20 @@ "WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" "WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" "WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" -"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" +"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" "WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB" "WDC WD800JB-00JJ[AC]0" 194 C "Western Digital WD800JB" "WDC WD800JD-(00|55)(HK|JR)A0" 194 C "Western Digital SATA 80GB, 8MB Cache" "WDC WD800LB-(00|55)DNA0" 194 C "Western Digital Caviar WD800LB 80 Go ATA-100" "WDC WD800VE-07HDT0" 194 C "Western Digital 800VE-07HDT0" "WDC WD1200BB-00(FTA|GUA)0" 194 C "Western Digital Caviar EIDE 2MB Cache" -"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" -"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" -"WDC WD1200JD-00GBB0" 194 C "Western Digital WD1200JD" +"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" +"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" +"WDC WD1200JD-00(GBB|HBC)0" 194 C "Western Digital WD1200JD" "WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" "WDC WD1200SB-01KB[AC]0" 194 C "Western Digital Caviar RE (Raid Edition) 120 GB" "WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" -"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" +"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" "WDC WD2000BB-00FTA0" 194 C "Western Digital WD2000BB" "WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" "WDC WD2000JB-00GVC0" 194 C "Western Digital WD2000JB" @@ -405,9 +403,12 @@ "WDC WD2500JD-(00G|32H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" "WDC WD2500JD-40HBC0" 194 C "Western Digital WD2500JD-40HBC0" "WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" +"WDC WD2500PD-00FZB1" 194 C "Western Digital WD2500PD-00FZB1" +"WDC WD2500SD-01KCB0" 194 C "Western Digital Caviar RE 250GB 8MB" "WDC WD3000JB-00KFA0" 194 C "Western Digital WD3000JB" "WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" "WDC WD4000KD-00NAB0" 194 C "Western Digital Caviar SE16 400GB 16MB" +"WDC WD4000YR-01PLB0" 194 C "Western Digital Caviar RE2 400GB 16MB" # not sure for next # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- hddtemp.spec 26 Feb 2006 15:41:47 -0000 1.16 +++ hddtemp.spec 3 May 2006 18:07:11 -0000 1.17 @@ -1,4 +1,4 @@ -%define beta beta14 +%define beta beta15 Name: hddtemp Version: 0.3 @@ -8,7 +8,7 @@ Group: Applications/System License: GPL URL: http://www.guzu.net/linux/hddtemp.php -Source0: http://www.guzu.net/linux/%{name}-%{version}-%{beta}.tar.bz2 +Source0: http://www.guzu.net/files/%{name}-%{version}-%{beta}.tar.bz2 Source1: http://www.guzu.net/linux/hddtemp.db Source2: %{name}.init Source3: %{name}.sysconfig @@ -28,9 +28,6 @@ %prep %setup -q -n %{name}-%{version}-%{beta} -%{__perl} -pi -e \ - 's|/usr/share/misc/hddtemp\.db\b|%{_datadir}/misc/hddtemp.db|' \ - src/db.h doc/hddtemp.8 cp -p %{SOURCE2} ./hddtemp.init %{__perl} -pi -e \ 's|__ETCDIR__|%{_sysconfdir}|g ; @@ -39,27 +36,23 @@ s|__LOCKDIR__|%{_localstatedir}/lock|g' \ hddtemp.init chmod -x contribs/analyze/* +rm COPYING ; cp -p GPL-2 COPYING %build -%configure --disable-dependency-tracking \ - --with-db-path=%{_datadir}/misc/hddtemp.db +%configure --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/misc/hddtemp.db -install -Dpm 755 hddtemp.init \ - $RPM_BUILD_ROOT%{_initrddir}/hddtemp -install -Dpm 644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp +install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/misc/hddtemp.db +install -Dpm 755 hddtemp.init $RPM_BUILD_ROOT%{_initrddir}/hddtemp +install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp install -dm 755 $RPM_BUILD_ROOT%{_bindir} ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/hddtemp -install -Dpm 644 %{SOURCE4} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp +install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp install -Dpm 644 %{SOURCE5} \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/hddtemp %find_lang %{name} @@ -84,18 +77,22 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO contribs +%doc ChangeLog COPYING README TODO contribs/ %config(noreplace) %{_sysconfdir}/sysconfig/hddtemp %config(noreplace) %{_sysconfdir}/pam.d/hddtemp %config(noreplace) %{_sysconfdir}/security/console.apps/hddtemp %{_initrddir}/hddtemp %{_bindir}/hddtemp %{_sbindir}/hddtemp -%config %{_datadir}/misc/hddtemp.db +%config /usr/share/misc/hddtemp.db %{_mandir}/man8/hddtemp.8* %changelog +* Wed May 3 2006 Ville Skytt?? - 0.3-0.8.beta15 +- 0.3-beta15, drive database 2006-04-26. +- Specfile cleanups. + * Wed Feb 8 2006 Ville Skytt?? - 0.3-0.8.beta14 - Update drive database to 2006-02-07. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Sep 2005 18:09:14 -0000 1.7 +++ sources 3 May 2006 18:07:11 -0000 1.8 @@ -1 +1 @@ -bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 +8b829339e1ae9df701684ec239021bb8 hddtemp-0.3-beta15.tar.bz2 From fedora-extras-commits at redhat.com Wed May 3 18:44:06 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 11:44:06 -0700 Subject: rpms/nagios/FC-4 .cvsignore, 1.4, 1.5 nagios.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200605031844.k43Ii8Kl024414@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24393 Modified Files: .cvsignore nagios.spec sources Log Message: New source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2006 03:10:52 -0000 1.4 +++ .cvsignore 3 May 2006 18:44:06 -0000 1.5 @@ -1 +1 @@ -nagios-2.0.tar.gz +nagios-2.2.tar.gz Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nagios.spec 27 Feb 2006 03:10:52 -0000 1.9 +++ nagios.spec 3 May 2006 18:44:06 -0000 1.10 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.0 -Release: 1%{?dist} +Version: 2.2 +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -76,9 +76,9 @@ %{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora %{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \ - -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora + -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora %{__sed} -e "s|resource.cfg|private/resource.cfg|" \ - -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora + -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora %{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg echo >> html/stylesheets/common.css @@ -86,7 +86,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config -%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name} +%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd %{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private @@ -145,7 +145,8 @@ %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample -%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives @@ -154,7 +155,29 @@ %{_includedir}/%{name} %changelog -* Tue Feb 21 2006 Mike McGrath imlinux at gmail.com> 2.0-1 +* Tue May 02 2006 Mike McGrath 2.2-3 +- Upstream released 2.2 +- Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd +- 2.2 -------------------------------------------------- +- Minor bug fix in availability CGI +- Bug fix with temporary file location used for retention data +- Fix for segfault that occurred in 2.1 during service flapping notifications +- 2.1 -------------------------------------------------- +- Changed freshness logic so that passive checks don't immediately go stale after program restart +- Bug fix for minor memory leak in object cleanup code +- Bug fix for flapping notifications during scheduled downtime +- Bug fix for $TOTALHOSTSDOWNUNHANDLED$ macro +- Bug fix in sample minimal.cfg file +- Bug fix in status CGI when displaying servicegroups +- Bug fixes in computation of indeterminate time and scheduled downtime in availability CGI +- Bug fix with not deleting all comments associated with a service +- Lowered max plugin output length from 348 to 332 chars to run on 64-bit systems without problems +- Minor fix to p1.pl for embedded Perl interpreter +- Minor fixes to WAP interface (statuswml CGI) +- Minor bug fix to VRML interface (statuswrl CGI) +- Minor doc updates + +* Tue Feb 21 2006 Mike McGrath 2.0-1 - Upstream released 2.0 (changes below) - Fix for segfault in timed event queue - Removed length limitations for object vars/vals Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Feb 2006 03:10:52 -0000 1.4 +++ sources 3 May 2006 18:44:06 -0000 1.5 @@ -1 +1 @@ -2a30ccf68bdbebc9c6f5a06e9c09e757 nagios-2.0.tar.gz +38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz From fedora-extras-commits at redhat.com Wed May 3 18:47:38 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 11:47:38 -0700 Subject: rpms/galeon/FC-4 galeon.spec,1.21,1.22 Message-ID: <200605031847.k43IletB024506@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24489 Modified Files: galeon.spec Log Message: Rebuild for mozilla 1.7.13 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- galeon.spec 16 Mar 2006 19:44:20 -0000 1.21 +++ galeon.spec 3 May 2006 18:47:37 -0000 1.22 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -96,6 +96,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-3 +- Rebuild for mozilla 1.7.13 + * Thu Mar 16 2006 Denis Leroy - 2.0.1-2 - Removed x86_64 specific automake runs From fedora-extras-commits at redhat.com Wed May 3 19:23:42 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 12:23:42 -0700 Subject: rpms/galeon/FC-4 galeon.spec,1.22,1.23 Message-ID: <200605031923.k43JNisH026993@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26975 Modified Files: galeon.spec Log Message: Fixed mozilla Requires Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- galeon.spec 3 May 2006 18:47:37 -0000 1.22 +++ galeon.spec 3 May 2006 19:23:41 -0000 1.23 @@ -1,14 +1,14 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: scrollkeeper -Requires: mozilla = 37:1.7.12 +Requires: mozilla = 37:1.7.13 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 gnome-desktop-devel BuildRequires: libglade2-devel >= 2.3.1 libbonoboui-devel >= 2.1.1 @@ -96,6 +96,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-4 +- Fixed mozilla Requires + * Wed May 3 2006 Denis Leroy - 2.0.1-3 - Rebuild for mozilla 1.7.13 From fedora-extras-commits at redhat.com Wed May 3 22:01:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:01:07 -0700 Subject: rpms/erlang/devel otp-run_erl.patch,NONE,1.1 erlang.spec,1.11,1.12 Message-ID: <200605032201.k43M198M001843@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469/devel Modified Files: erlang.spec Added Files: otp-run_erl.patch Log Message: run_erl patch otp-run_erl.patch: --- NEW FILE otp-run_erl.patch --- --- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 +++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #if !defined(NO_SYSLOG) #include #endif @@ -803,6 +805,7 @@ static int open_pty_master(char **ptyslave) { int mfd; + int sfd; char *major, *minor; static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; @@ -818,6 +821,15 @@ /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ { + static char ttyname[] = " "; + if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { + close(sfd); + *ptyslave = ttyname; + return mfd; + } + } + + { /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ static char ptyname[] = "/dev/pty/mX"; --- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 +++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 @@ -241,7 +241,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o + $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- erlang.spec 13 Mar 2006 16:18:42 -0000 1.11 +++ erlang.spec 3 May 2006 22:01:07 -0000 1.12 @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.2%{?dist} +Release: 10.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -14,6 +14,7 @@ Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch Patch4: otp-glibc24.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -48,6 +49,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build @@ -101,6 +103,9 @@ %changelog +* Wed May 3 2006 Gerard Milmeister - R10B-10.3 +- added patch for run_erl by Knut-H??vard Aksnes + * Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 - new version R10B-10 From fedora-extras-commits at redhat.com Wed May 3 22:01:05 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:01:05 -0700 Subject: rpms/erlang/FC-4 otp-run_erl.patch,NONE,1.1 erlang.spec,1.7,1.8 Message-ID: <200605032201.k43M1b53001899@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469/FC-4 Modified Files: erlang.spec Added Files: otp-run_erl.patch Log Message: run_erl patch otp-run_erl.patch: --- NEW FILE otp-run_erl.patch --- --- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 +++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #if !defined(NO_SYSLOG) #include #endif @@ -803,6 +805,7 @@ static int open_pty_master(char **ptyslave) { int mfd; + int sfd; char *major, *minor; static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; @@ -818,6 +821,15 @@ /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ { + static char ttyname[] = " "; + if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { + close(sfd); + *ptyslave = ttyname; + return mfd; + } + } + + { /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ static char ptyname[] = "/dev/pty/mX"; --- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 +++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 @@ -241,7 +241,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o + $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- erlang.spec 13 Mar 2006 15:58:42 -0000 1.7 +++ erlang.spec 3 May 2006 22:01:04 -0000 1.8 @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.1%{?dist} +Release: 10.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -46,6 +47,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch5 -p1 %build @@ -99,6 +101,9 @@ %changelog +* Wed May 3 2006 Gerard Milmeister - R10B-10.3 +- added patch for run_erl by Knut-H??vard Aksnes + * Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 - new version R10B-10 From fedora-extras-commits at redhat.com Wed May 3 22:01:06 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:01:06 -0700 Subject: rpms/erlang/FC-5 otp-run_erl.patch,NONE,1.1 erlang.spec,1.11,1.12 Message-ID: <200605032201.k43M1dPR001900@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469/FC-5 Modified Files: erlang.spec Added Files: otp-run_erl.patch Log Message: run_erl patch otp-run_erl.patch: --- NEW FILE otp-run_erl.patch --- --- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 +++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #if !defined(NO_SYSLOG) #include #endif @@ -803,6 +805,7 @@ static int open_pty_master(char **ptyslave) { int mfd; + int sfd; char *major, *minor; static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; @@ -818,6 +821,15 @@ /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ { + static char ttyname[] = " "; + if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { + close(sfd); + *ptyslave = ttyname; + return mfd; + } + } + + { /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ static char ptyname[] = "/dev/pty/mX"; --- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 +++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 @@ -241,7 +241,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o + $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/erlang.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- erlang.spec 13 Mar 2006 16:18:42 -0000 1.11 +++ erlang.spec 3 May 2006 22:01:05 -0000 1.12 @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.2%{?dist} +Release: 10.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -14,6 +14,7 @@ Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch Patch4: otp-glibc24.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -48,6 +49,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build @@ -101,6 +103,9 @@ %changelog +* Wed May 3 2006 Gerard Milmeister - R10B-10.3 +- added patch for run_erl by Knut-H??vard Aksnes + * Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 - new version R10B-10 From fedora-extras-commits at redhat.com Wed May 3 22:18:09 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 3 May 2006 15:18:09 -0700 Subject: fedora-security/audit fe4,1.1,1.2 fe5,1.1,1.2 Message-ID: <200605032218.k43MI9YT002137@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2115 Modified Files: fe4 fe5 Log Message: Note a new nagios issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fe4 2 May 2006 21:07:40 -0000 1.1 +++ fe4 3 May 2006 22:18:06 -0000 1.2 @@ -1,3 +1,5 @@ # $Id$ ** are items that need attention + +CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fe5 2 May 2006 21:07:40 -0000 1.1 +++ fe5 3 May 2006 22:18:06 -0000 1.2 @@ -1,3 +1,5 @@ # $Id$ ** are items that need attention + +CVE-2006-2162 VULNERABLE (nagios) bz#190612 From fedora-extras-commits at redhat.com Wed May 3 22:36:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:36:29 -0700 Subject: rpms/gauche/FC-5 gauche-arch.patch,NONE,1.1 gauche.spec,1.2,1.3 Message-ID: <200605032236.k43MaVMQ002263@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2209/FC-5 Modified Files: gauche.spec Added Files: gauche-arch.patch Log Message: added arch patch gauche-arch.patch: --- NEW FILE gauche-arch.patch --- --- Gauche-0.8.7/ext/Makefile.ext.in.arch 2006-05-04 00:22:48.000000000 +0200 +++ Gauche-0.8.7/ext/Makefile.ext.in 2006-05-04 00:23:25.000000000 +0200 @@ -10,7 +10,7 @@ datadir = @datadir@ VPATH = $(srcdir) GAUCHE_VERSION = @GAUCHE_VERSION@ -HOST = @host@ +HOST = @target@ # These may be overridden by make invocators DESTDIR = Index: gauche.spec =================================================================== RCS file: /cvs/extras/rpms/gauche/FC-5/gauche.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gauche.spec 29 Apr 2006 09:21:55 -0000 1.2 +++ gauche.spec 3 May 2006 22:36:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: gauche Version: 0.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Scheme script interpreter with multibyte character handling Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz Patch0: gauche-jp.patch +Patch1: gauche-arch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel BuildRequires: texinfo @@ -34,6 +35,7 @@ %prep %setup -q -n Gauche-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -121,12 +123,15 @@ %changelog +* Thu May 4 2006 Gerard Milmeister - 0.8.7-5 +- added patch for consistent arch directories (gauche-arch.patch) + * Fri Apr 28 2006 Gerard Milmeister - 0.8.7-3 - added %%check - included COPYING file in %%doc * Thu Apr 27 2006 Gerard Milmeister - 0.8.7-2 -- fixes to permissions +- fixes permissions - patch to fix jp problem in texinfo file * Fri Apr 21 2006 Gerard Milmeister - 0.8.7-1 From fedora-extras-commits at redhat.com Wed May 3 22:36:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:36:29 -0700 Subject: rpms/gauche/devel gauche-arch.patch,NONE,1.1 gauche.spec,1.2,1.3 Message-ID: <200605032236.k43MaVwD002269@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2209/devel Modified Files: gauche.spec Added Files: gauche-arch.patch Log Message: added arch patch gauche-arch.patch: --- NEW FILE gauche-arch.patch --- --- Gauche-0.8.7/ext/Makefile.ext.in.arch 2006-05-04 00:22:48.000000000 +0200 +++ Gauche-0.8.7/ext/Makefile.ext.in 2006-05-04 00:23:25.000000000 +0200 @@ -10,7 +10,7 @@ datadir = @datadir@ VPATH = $(srcdir) GAUCHE_VERSION = @GAUCHE_VERSION@ -HOST = @host@ +HOST = @target@ # These may be overridden by make invocators DESTDIR = Index: gauche.spec =================================================================== RCS file: /cvs/extras/rpms/gauche/devel/gauche.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gauche.spec 29 Apr 2006 09:21:55 -0000 1.2 +++ gauche.spec 3 May 2006 22:36:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: gauche Version: 0.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Scheme script interpreter with multibyte character handling Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz Patch0: gauche-jp.patch +Patch1: gauche-arch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel BuildRequires: texinfo @@ -34,6 +35,7 @@ %prep %setup -q -n Gauche-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -121,12 +123,15 @@ %changelog +* Thu May 4 2006 Gerard Milmeister - 0.8.7-5 +- added patch for consistent arch directories (gauche-arch.patch) + * Fri Apr 28 2006 Gerard Milmeister - 0.8.7-3 - added %%check - included COPYING file in %%doc * Thu Apr 27 2006 Gerard Milmeister - 0.8.7-2 -- fixes to permissions +- fixes permissions - patch to fix jp problem in texinfo file * Fri Apr 21 2006 Gerard Milmeister - 0.8.7-1 From fedora-extras-commits at redhat.com Wed May 3 22:36:28 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 3 May 2006 15:36:28 -0700 Subject: rpms/gauche/FC-4 gauche-arch.patch,NONE,1.1 gauche.spec,1.2,1.3 Message-ID: <200605032236.k43MaU2B002259@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2209/FC-4 Modified Files: gauche.spec Added Files: gauche-arch.patch Log Message: added arch patch gauche-arch.patch: --- NEW FILE gauche-arch.patch --- --- Gauche-0.8.7/ext/Makefile.ext.in.arch 2006-05-04 00:22:48.000000000 +0200 +++ Gauche-0.8.7/ext/Makefile.ext.in 2006-05-04 00:23:25.000000000 +0200 @@ -10,7 +10,7 @@ datadir = @datadir@ VPATH = $(srcdir) GAUCHE_VERSION = @GAUCHE_VERSION@ -HOST = @host@ +HOST = @target@ # These may be overridden by make invocators DESTDIR = Index: gauche.spec =================================================================== RCS file: /cvs/extras/rpms/gauche/FC-4/gauche.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gauche.spec 29 Apr 2006 09:21:55 -0000 1.2 +++ gauche.spec 3 May 2006 22:36:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: gauche Version: 0.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Scheme script interpreter with multibyte character handling Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz Patch0: gauche-jp.patch +Patch1: gauche-arch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gdbm-devel BuildRequires: texinfo @@ -34,6 +35,7 @@ %prep %setup -q -n Gauche-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -121,12 +123,15 @@ %changelog +* Thu May 4 2006 Gerard Milmeister - 0.8.7-5 +- added patch for consistent arch directories (gauche-arch.patch) + * Fri Apr 28 2006 Gerard Milmeister - 0.8.7-3 - added %%check - included COPYING file in %%doc * Thu Apr 27 2006 Gerard Milmeister - 0.8.7-2 -- fixes to permissions +- fixes permissions - patch to fix jp problem in texinfo file * Fri Apr 21 2006 Gerard Milmeister - 0.8.7-1 From fedora-extras-commits at redhat.com Wed May 3 23:20:41 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 16:20:41 -0700 Subject: rpms/galeon/FC-5 galeon.spec,1.16,1.17 Message-ID: <200605032320.k43NKh2w004854@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4837 Modified Files: galeon.spec Log Message: Bumping up release to be >= than that of FC4 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-5/galeon.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- galeon.spec 3 May 2006 16:22:08 -0000 1.16 +++ galeon.spec 3 May 2006 23:20:40 -0000 1.17 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -113,6 +113,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-4 +- Bumping up release to be >= that of FC-4 + * Wed May 3 2006 Denis Leroy - 2.0.1-2 - Rebuild for mozilla 1.7.13 From fedora-extras-commits at redhat.com Wed May 3 23:21:50 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 3 May 2006 16:21:50 -0700 Subject: rpms/galeon/devel galeon.spec,1.16,1.17 Message-ID: <200605032321.k43NLqdk004935@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4918 Modified Files: galeon.spec Log Message: Bumping up release to match that of FC4 and FC5 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- galeon.spec 3 May 2006 15:44:00 -0000 1.16 +++ galeon.spec 3 May 2006 23:21:50 -0000 1.17 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -113,6 +113,9 @@ %changelog +* Wed May 3 2006 Denis Leroy - 2.0.1-4 +- Bumping up release to match that of FC-4 and FC-5 + * Wed May 3 2006 Denis Leroy - 2.0.1-2 - Rebuild for mozilla 1.7.13 From fedora-extras-commits at redhat.com Thu May 4 03:19:42 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:19:42 -0700 Subject: owners owners.list,1.938,1.939 Message-ID: <200605040319.k443JioO016046@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16026 Modified Files: owners.list Log Message: Added mboxgrep Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.938 retrieving revision 1.939 diff -u -r1.938 -r1.939 --- owners.list 2 May 2006 23:03:27 -0000 1.938 +++ owners.list 4 May 2006 03:19:41 -0000 1.939 @@ -731,6 +731,7 @@ Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|mboxgrep|Displays e-mail messages matching a pattern|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 4 03:22:02 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:02 -0700 Subject: rpms/mboxgrep - New directory Message-ID: <200605040322.k443M43T016137@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16116/mboxgrep Log Message: Directory /cvs/extras/rpms/mboxgrep added to the repository From fedora-extras-commits at redhat.com Thu May 4 03:22:02 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:02 -0700 Subject: rpms/mboxgrep/devel - New directory Message-ID: <200605040322.k443M4k1016140@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16116/mboxgrep/devel Log Message: Directory /cvs/extras/rpms/mboxgrep/devel added to the repository From fedora-extras-commits at redhat.com Thu May 4 03:22:21 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:21 -0700 Subject: rpms/mboxgrep Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605040322.k443MNZr016189@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16161 Added Files: Makefile import.log Log Message: Setup of module mboxgrep --- NEW FILE Makefile --- # Top level Makefile for module mboxgrep all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 4 03:22:21 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:21 -0700 Subject: rpms/mboxgrep/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605040322.k443MN78016192@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16161/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mboxgrep --- NEW 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 May 4 03:22:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:55 -0700 Subject: rpms/mboxgrep import.log,1.1,1.2 Message-ID: <200605040322.k443Mv1s016258@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16225 Modified Files: import.log Log Message: auto-import mboxgrep-0.7.9-2 on branch devel from mboxgrep-0.7.9-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mboxgrep/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 May 2006 03:22:20 -0000 1.1 +++ import.log 4 May 2006 03:22:55 -0000 1.2 @@ -0,0 +1 @@ +mboxgrep-0_7_9-2:HEAD:mboxgrep-0.7.9-2.src.rpm:1146712967 From fedora-extras-commits at redhat.com Thu May 4 03:22:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 3 May 2006 20:22:55 -0700 Subject: rpms/mboxgrep/devel mboxgrep.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605040323.k443Mv5M016263@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mboxgrep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16225/devel Modified Files: .cvsignore sources Added Files: mboxgrep.spec Log Message: auto-import mboxgrep-0.7.9-2 on branch devel from mboxgrep-0.7.9-2.src.rpm --- NEW FILE mboxgrep.spec --- Summary: Displays e-mail messages matching a pattern Name: mboxgrep Version: 0.7.9 Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz URL: http://www.mboxgrep.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel, bzip2-devel, pcre-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description mboxgrep is a small utility that scans a mailbox for messages matching a basic, extended, or Perl-compatible regular expression. Selected messages can be either displayed on standard output, counted, piped to a command or written to another mailbox. It supports mbox (both plain and compressed), MH, nnmh, nnml and maildir folders. %prep %setup -q %build %configure %{__make} %{?_smp_mflags} %install rm -rf %{buildroot} %makeinstall %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/mboxgrep %{_mandir}/man1/mboxgrep.1* %{_infodir}/mboxgrep.info* %changelog * Wed Mar 29 2006 Andreas Thienemann 0.7.9-2 - Cleaned up for FE * Wed May 26 2004 Andreas Thienemann 0.7.9-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mboxgrep/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 May 2006 03:22:21 -0000 1.1 +++ .cvsignore 4 May 2006 03:22:55 -0000 1.2 @@ -0,0 +1 @@ +mboxgrep-0.7.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mboxgrep/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 May 2006 03:22:21 -0000 1.1 +++ sources 4 May 2006 03:22:55 -0000 1.2 @@ -0,0 +1 @@ +4b256de164b8f094db9ccf0e6386d246 mboxgrep-0.7.9.tar.gz From fedora-extras-commits at redhat.com Thu May 4 03:32:53 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:32:53 -0700 Subject: rpms/nagios/devel nagios.spec,1.16,1.17 Message-ID: <200605040332.k443Wtv8016505@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16458/devel Modified Files: nagios.spec Log Message: - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs - Added missing links for notes_url and action_url to service column of status detail page Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- nagios.spec 2 May 2006 15:41:18 -0000 1.16 +++ nagios.spec 4 May 2006 03:32:52 -0000 1.17 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.2 -Release: 3%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -155,6 +155,11 @@ %{_includedir}/%{name} %changelog +* Wed May 03 2006 Mike McGrath 2.3-1 +- Upstream released 2.3 +- Bug fix for negative HTTP content_length header in CGIs +- Added missing links for notes_url and action_url to service column of status detail page + * Tue May 02 2006 Mike McGrath 2.2-3 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd From fedora-extras-commits at redhat.com Thu May 4 03:32:46 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:32:46 -0700 Subject: rpms/nagios/FC-4 nagios.spec,1.10,1.11 Message-ID: <200605040333.k443XISn016508@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16458/FC-4 Modified Files: nagios.spec Log Message: - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs - Added missing links for notes_url and action_url to service column of status detail page Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nagios.spec 3 May 2006 18:44:06 -0000 1.10 +++ nagios.spec 4 May 2006 03:32:46 -0000 1.11 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.2 -Release: 3%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -155,6 +155,11 @@ %{_includedir}/%{name} %changelog +* Wed May 03 2006 Mike McGrath 2.3-1 +- Upstream released 2.3 +- Bug fix for negative HTTP content_length header in CGIs +- Added missing links for notes_url and action_url to service column of status detail page + * Tue May 02 2006 Mike McGrath 2.2-3 - Upstream released 2.2 - Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd From fedora-extras-commits at redhat.com Thu May 4 03:32:47 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:32:47 -0700 Subject: rpms/nagios/FC-5 nagios.spec,1.10,1.11 Message-ID: <200605040333.k443XJRt016511@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16458/FC-5 Modified Files: nagios.spec Log Message: - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs - Added missing links for notes_url and action_url to service column of status detail page Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nagios.spec 21 Feb 2006 10:36:06 -0000 1.10 +++ nagios.spec 4 May 2006 03:32:47 -0000 1.11 @@ -1,5 +1,5 @@ Name: nagios -Version: 2.0 +Version: 2.3 Release: 1%{?dist} Summary: Host/service/network monitoring program @@ -76,9 +76,9 @@ %{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora %{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \ - -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora + -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora %{__sed} -e "s|resource.cfg|private/resource.cfg|" \ - -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora + -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora %{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg echo >> html/stylesheets/common.css @@ -86,7 +86,7 @@ %install rm -rf %{buildroot} make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config -%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name} +%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd %{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name} %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private @@ -145,7 +145,8 @@ %attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample -%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name} +%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name} %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives @@ -154,7 +155,34 @@ %{_includedir}/%{name} %changelog -* Tue Feb 21 2006 Mike McGrath imlinux at gmail.com> 2.0-1 +* Wed May 03 2006 Mike McGrath 2.3-1 +- Upstream released 2.3 +- Bug fix for negative HTTP content_length header in CGIs +- Added missing links for notes_url and action_url to service column of status detail page + +* Tue May 02 2006 Mike McGrath 2.2-3 +- Upstream released 2.2 +- Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd +- 2.2 -------------------------------------------------- +- Minor bug fix in availability CGI +- Bug fix with temporary file location used for retention data +- Fix for segfault that occurred in 2.1 during service flapping notifications +- 2.1 -------------------------------------------------- +- Changed freshness logic so that passive checks don't immediately go stale after program restart +- Bug fix for minor memory leak in object cleanup code +- Bug fix for flapping notifications during scheduled downtime +- Bug fix for $TOTALHOSTSDOWNUNHANDLED$ macro +- Bug fix in sample minimal.cfg file +- Bug fix in status CGI when displaying servicegroups +- Bug fixes in computation of indeterminate time and scheduled downtime in availability CGI +- Bug fix with not deleting all comments associated with a service +- Lowered max plugin output length from 348 to 332 chars to run on 64-bit systems without problems +- Minor fix to p1.pl for embedded Perl interpreter +- Minor fixes to WAP interface (statuswml CGI) +- Minor bug fix to VRML interface (statuswrl CGI) +- Minor doc updates + +* Tue Feb 21 2006 Mike McGrath 2.0-1 - Upstream released 2.0 (changes below) - Fix for segfault in timed event queue - Removed length limitations for object vars/vals From fedora-extras-commits at redhat.com Thu May 4 03:35:36 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:35:36 -0700 Subject: rpms/nagios/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200605040335.k443ZcsC016547@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16528 Modified Files: .cvsignore sources Log Message: New source - 2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 May 2006 15:27:22 -0000 1.5 +++ .cvsignore 4 May 2006 03:35:36 -0000 1.6 @@ -1 +1 @@ -nagios-2.2.tar.gz +nagios-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 May 2006 15:27:22 -0000 1.5 +++ sources 4 May 2006 03:35:36 -0000 1.6 @@ -1 +1 @@ -38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz +6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz From fedora-extras-commits at redhat.com Thu May 4 03:36:31 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:36:31 -0700 Subject: rpms/nagios/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200605040336.k443aXP5016592@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558/FC-4 Modified Files: .cvsignore sources Log Message: New source - 2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 3 May 2006 18:44:06 -0000 1.5 +++ .cvsignore 4 May 2006 03:36:31 -0000 1.6 @@ -1 +1 @@ -nagios-2.2.tar.gz +nagios-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 3 May 2006 18:44:06 -0000 1.5 +++ sources 4 May 2006 03:36:31 -0000 1.6 @@ -1 +1 @@ -38d375fa728d8475b65af63af85d6cea nagios-2.2.tar.gz +6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz From fedora-extras-commits at redhat.com Thu May 4 03:36:32 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 3 May 2006 20:36:32 -0700 Subject: rpms/nagios/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200605040336.k443aYdF016597@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558/FC-5 Modified Files: .cvsignore sources Log Message: New source - 2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Feb 2006 10:34:40 -0000 1.4 +++ .cvsignore 4 May 2006 03:36:32 -0000 1.5 @@ -1 +1 @@ -nagios-2.0.tar.gz +nagios-2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Feb 2006 10:34:40 -0000 1.4 +++ sources 4 May 2006 03:36:32 -0000 1.5 @@ -1 +1 @@ -2a30ccf68bdbebc9c6f5a06e9c09e757 nagios-2.0.tar.gz +6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz From fedora-extras-commits at redhat.com Thu May 4 04:48:44 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 3 May 2006 21:48:44 -0700 Subject: rpms/sobby/devel .cvsignore, 1.3, 1.4 sobby.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605040448.k444mk92019108@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/sobby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19087 Modified Files: .cvsignore sobby.spec sources Log Message: 0.4.0rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sobby/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2005 09:14:32 -0000 1.3 +++ .cvsignore 4 May 2006 04:48:43 -0000 1.4 @@ -1 +1 @@ -sobby-0.3.0.tar.gz +sobby-0.4.0rc1.tar.gz Index: sobby.spec =================================================================== RCS file: /cvs/extras/rpms/sobby/devel/sobby.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sobby.spec 15 Feb 2006 22:11:50 -0000 1.3 +++ sobby.spec 4 May 2006 04:48:43 -0000 1.4 @@ -1,12 +1,14 @@ +%define _rc rc1 + Name: sobby -Version: 0.3.0 -Release: 2%{?dist} +Version: 0.4.0 +Release: 1.%{_rc}%{?dist} Summary: Standalone obby server Group: Applications/Internet License: GPL URL: http://gobby.0x539.de -Source0: http://releases.0x539.de/sobby/%{name}-%{version}.tar.gz +Source0: http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: obby-devel, glibmm24-devel @@ -16,7 +18,7 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{_rc} %build @@ -37,9 +39,14 @@ %defattr(-,root,root,-) %doc README NEWS AUTHORS COPYING ChangeLog %{_bindir}/sobby +%{_mandir}/*/* %changelog +* Mon May 04 2006 Luke Macken - 0.4.0-1.rc1 +- 0.4.0rc1 +- Add man page + * Wed Feb 15 2006 Luke Macken - 0.3.0-2 - Rebuild for FE5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sobby/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2005 09:14:32 -0000 1.3 +++ sources 4 May 2006 04:48:43 -0000 1.4 @@ -1 +1 @@ -5408fc08d610be5aac4476c6ea6277f9 sobby-0.3.0.tar.gz +43bb4cbb9949179b3ecb1cbc0b447e24 sobby-0.4.0rc1.tar.gz From fedora-extras-commits at redhat.com Thu May 4 04:57:35 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 3 May 2006 21:57:35 -0700 Subject: rpms/sobby/devel sobby.spec,1.4,1.5 Message-ID: <200605040457.k444vbUm019184@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/sobby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19166 Modified Files: sobby.spec Log Message: add libxml++-devel to BR Index: sobby.spec =================================================================== RCS file: /cvs/extras/rpms/sobby/devel/sobby.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sobby.spec 4 May 2006 04:48:43 -0000 1.4 +++ sobby.spec 4 May 2006 04:57:35 -0000 1.5 @@ -2,7 +2,7 @@ Name: sobby Version: 0.4.0 -Release: 1.%{_rc}%{?dist} +Release: 2.%{_rc}%{?dist} Summary: Standalone obby server Group: Applications/Internet @@ -11,7 +11,7 @@ Source0: http://releases.0x539.de/sobby/%{name}-%{version}%{_rc}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: obby-devel, glibmm24-devel +BuildRequires: obby-devel, glibmm24-devel, libxml++-devel %description Sobby is a standalone obby server. @@ -43,6 +43,9 @@ %changelog +* Mon May 04 2006 Luke Macken - 0.4.0-2.rc1 +- Add libxml++-devel to BuildRequires + * Mon May 04 2006 Luke Macken - 0.4.0-1.rc1 - 0.4.0rc1 - Add man page From fedora-extras-commits at redhat.com Thu May 4 07:59:40 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 00:59:40 -0700 Subject: rpms/scim-tables/devel README,1.1,1.2 Message-ID: <200605040759.k447xgsk026413@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26396 Modified Files: README Log Message: update text Index: README =================================================================== RCS file: /cvs/extras/rpms/scim-tables/devel/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 7 Nov 2005 06:30:28 -0000 1.1 +++ README 4 May 2006 07:59:40 -0000 1.2 @@ -1 +1 @@ -scim-tables is in Core devel. +scim-tables is in Core since FC5. From fedora-extras-commits at redhat.com Thu May 4 08:10:53 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 01:10:53 -0700 Subject: rpms/scim-tables/FC-5 README,1.1,1.2 Message-ID: <200605040810.k448Atue028664@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26431 Modified Files: README Log Message: update text Index: README =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-5/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 7 Nov 2005 06:30:28 -0000 1.1 +++ README 4 May 2006 08:10:52 -0000 1.2 @@ -1 +1 @@ -scim-tables is in Core devel. +scim-tables is in Fedora Core 5. From fedora-extras-commits at redhat.com Thu May 4 08:13:29 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Thu, 4 May 2006 01:13:29 -0700 Subject: fedora-security/audit fc5,1.142,1.143 Message-ID: <200605040813.k448DTIP028713@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28693/audit Modified Files: fc5 Log Message: Update with FEDORA-2006-499 (kernel) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- fc5 3 May 2006 14:40:10 -0000 1.142 +++ fc5 4 May 2006 08:13:26 -0000 1.143 @@ -27,8 +27,8 @@ CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] -CVE-2006-1864 VULNERABLE (kernel) -CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11) +CVE-2006-1864 ignore (kernel) not compiled in +CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13) @@ -102,7 +102,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2) CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) +CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499] CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Thu May 4 08:13:53 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Thu, 4 May 2006 01:13:53 -0700 Subject: fedora-security/audit fc4,1.228,1.229 Message-ID: <200605040813.k448Druo028741@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28721/audit Modified Files: fc4 Log Message: Update with FEDORA-2006-500 (kernel) Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- fc4 3 May 2006 14:40:10 -0000 1.228 +++ fc4 4 May 2006 08:13:51 -0000 1.229 @@ -27,7 +27,7 @@ CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 VULNERABLE (kernel) -CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11) +CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13) @@ -102,7 +102,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1527 VULNERABLE (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) +CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-500] CVE-2006-1526 VULNERABLE (xorg-x11) #189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] From fedora-extras-commits at redhat.com Thu May 4 08:49:03 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 May 2006 01:49:03 -0700 Subject: rpms/synergy/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 synergy.spec, 1.13, 1.14 Message-ID: <200605040849.k448n6QR029029@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/devel Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Dec 2005 10:51:24 -0000 1.8 +++ .cvsignore 4 May 2006 08:49:03 -0000 1.9 @@ -1 +1 @@ -synergy-1.2.7.tar.gz +synergy-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Dec 2005 10:51:24 -0000 1.8 +++ sources 4 May 2006 08:49:03 -0000 1.9 @@ -1 +1 @@ -da9effc847d13f9725b6db043d8283a5 synergy-1.2.7.tar.gz +a6e09d6b71cb217f23069980060abf27 synergy-1.3.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- synergy.spec 6 Mar 2006 17:26:29 -0000 1.13 +++ synergy.spec 4 May 2006 08:49:03 -0000 1.14 @@ -1,14 +1,14 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.7 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, autoconf, automake +BuildRequires: autoconf, automake # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora %if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel @@ -28,7 +28,7 @@ %prep %setup %patch -p1 -b .werror -%{__autoconf} +autoreconf %build @@ -55,6 +55,10 @@ %changelog +* Thu May 4 2006 Matthias Saou 1.3.1-1 +- Update to 1.3.1. +- Run full autoreconf instead of just autoconf since 1.6 is required otherwise. + * Mon Mar 6 2006 Matthias Saou 1.2.7-2 - FC5 rebuild. From fedora-extras-commits at redhat.com Thu May 4 08:48:58 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 May 2006 01:48:58 -0700 Subject: rpms/synergy/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 synergy.spec, 1.13, 1.14 Message-ID: <200605040849.k448nUbO029049@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/FC-5 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Dec 2005 10:51:24 -0000 1.8 +++ .cvsignore 4 May 2006 08:48:58 -0000 1.9 @@ -1 +1 @@ -synergy-1.2.7.tar.gz +synergy-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Dec 2005 10:51:24 -0000 1.8 +++ sources 4 May 2006 08:48:58 -0000 1.9 @@ -1 +1 @@ -da9effc847d13f9725b6db043d8283a5 synergy-1.2.7.tar.gz +a6e09d6b71cb217f23069980060abf27 synergy-1.3.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-5/synergy.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- synergy.spec 6 Mar 2006 17:26:29 -0000 1.13 +++ synergy.spec 4 May 2006 08:48:58 -0000 1.14 @@ -1,14 +1,14 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.7 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, autoconf, automake +BuildRequires: autoconf, automake # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora %if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel @@ -28,7 +28,7 @@ %prep %setup %patch -p1 -b .werror -%{__autoconf} +autoreconf %build @@ -55,6 +55,10 @@ %changelog +* Thu May 4 2006 Matthias Saou 1.3.1-1 +- Update to 1.3.1. +- Run full autoreconf instead of just autoconf since 1.6 is required otherwise. + * Mon Mar 6 2006 Matthias Saou 1.2.7-2 - FC5 rebuild. From fedora-extras-commits at redhat.com Thu May 4 08:48:56 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 May 2006 01:48:56 -0700 Subject: rpms/synergy/FC-3 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 synergy.spec, 1.8, 1.9 Message-ID: <200605040849.k448nSg5029039@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/FC-3 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Nov 2005 13:36:42 -0000 1.7 +++ .cvsignore 4 May 2006 08:48:56 -0000 1.8 @@ -1 +1 @@ -synergy-1.2.5.tar.gz +synergy-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Nov 2005 13:36:42 -0000 1.7 +++ sources 4 May 2006 08:48:56 -0000 1.8 @@ -1 +1 @@ -cf1b981acd317c003357f4ecba42448b synergy-1.2.5.tar.gz +a6e09d6b71cb217f23069980060abf27 synergy-1.3.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/synergy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synergy.spec 7 Nov 2005 13:36:42 -0000 1.8 +++ synergy.spec 4 May 2006 08:48:56 -0000 1.9 @@ -1,14 +1,21 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.5 +Version: 1.3.1 Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ -Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz +Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, xorg-x11-devel, autoconf +BuildRequires: autoconf, automake +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel +BuildRequires: libXinerama-devel +%else +BuildRequires: xorg-x11-devel +%endif %description Synergy lets you easily share a single mouse and keyboard between @@ -21,7 +28,7 @@ %prep %setup %patch -p1 -b .werror -%{__autoconf} +autoreconf %build @@ -48,6 +55,18 @@ %changelog +* Thu May 4 2006 Matthias Saou 1.3.1-1 +- Update to 1.3.1. +- Run full autoreconf instead of just autoconf since 1.6 is required otherwise. + +* Mon Mar 6 2006 Matthias Saou 1.2.7-2 +- FC5 rebuild. + +* Tue Dec 20 2005 Matthias Saou 1.2.7-1 +- Update to 1.2.7. +- Add automake build requirement (to get aclocal). +- For %%{fedora} >= 5, buildrequire modular X packages. + * Mon Nov 7 2005 Matthias Saou 1.2.5-1 - Update to 1.2.5, -Werror patch still required. From fedora-extras-commits at redhat.com Thu May 4 08:48:57 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 May 2006 01:48:57 -0700 Subject: rpms/synergy/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 synergy.spec, 1.12, 1.13 Message-ID: <200605040849.k448nTBH029044@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28954/FC-4 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.3.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Dec 2005 11:23:20 -0000 1.8 +++ .cvsignore 4 May 2006 08:48:57 -0000 1.9 @@ -1 +1 @@ -synergy-1.2.7.tar.gz +synergy-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Dec 2005 11:23:20 -0000 1.8 +++ sources 4 May 2006 08:48:57 -0000 1.9 @@ -1 +1 @@ -da9effc847d13f9725b6db043d8283a5 synergy-1.2.7.tar.gz +a6e09d6b71cb217f23069980060abf27 synergy-1.3.1.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/synergy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- synergy.spec 21 Dec 2005 11:23:20 -0000 1.12 +++ synergy.spec 4 May 2006 08:48:57 -0000 1.13 @@ -1,6 +1,6 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.7 +Version: 1.3.1 Release: 1%{?dist} License: GPL Group: System Environment/Daemons @@ -8,8 +8,9 @@ Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, autoconf, automake -%if "%{fedora}" >= "5" +BuildRequires: autoconf, automake +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel BuildRequires: libXinerama-devel %else @@ -27,7 +28,7 @@ %prep %setup %patch -p1 -b .werror -%{__autoconf} +autoreconf %build @@ -54,6 +55,13 @@ %changelog +* Thu May 4 2006 Matthias Saou 1.3.1-1 +- Update to 1.3.1. +- Run full autoreconf instead of just autoconf since 1.6 is required otherwise. + +* Mon Mar 6 2006 Matthias Saou 1.2.7-2 +- FC5 rebuild. + * Tue Dec 20 2005 Matthias Saou 1.2.7-1 - Update to 1.2.7. - Add automake build requirement (to get aclocal). From fedora-extras-commits at redhat.com Thu May 4 09:26:58 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 02:26:58 -0700 Subject: rpms/scim-tables/FC-4 .cvsignore, 1.5, 1.6 scim-tables.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200605040927.k449R0Je031588@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567 Modified Files: .cvsignore scim-tables.spec sources Log Message: sync with Core: - obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt) * Thu Mar 2 2006 Jens Petersen - add %%indic_tables build switch * Thu Feb 9 2006 Jens Petersen - update filelist since moduledir is now api-versioned * Fri Jan 13 2006 Jens Petersen - update to 0.5.6 release - update tables-skip-ja-ko.patch - updates filelist for chinese tables Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 06:38:59 -0000 1.5 +++ .cvsignore 4 May 2006 09:26:57 -0000 1.6 @@ -1 +1 @@ -scim-tables-0.5.5.tar.gz +scim-tables-0.5.6.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- scim-tables.spec 27 Dec 2005 06:38:59 -0000 1.14 +++ scim-tables.spec 4 May 2006 09:26:57 -0000 1.15 @@ -1,8 +1,11 @@ # set to include Japanese and Korean tables %define jk_tables 0 +# set to include Indic tables +%define indic_tables 1 + Name: scim-tables -Version: 0.5.5 +Version: 0.5.6 Release: 1%{?dist} Summary: SCIM Generic Table IMEngine @@ -14,6 +17,9 @@ BuildRequires: scim-devel, gtk2-devel BuildRequires: gettext-devel +%if !%{jk_tables} +Obsoletes: scim-tables-japanese < 0.5.6, scim-tables-korean < 0.5.6 +%endif Requires: scim Patch1: tables-skip-ja-ko.patch @@ -36,6 +42,7 @@ %description arabic This package contains scim-tables files for Chinese input. +%if %{indic_tables} %package bengali Summary: SCIM tables for Bengali Group: System Environment/Libraries @@ -43,6 +50,7 @@ %description bengali This package contains scim-tables files for Bengali input. +%endif %package chinese Summary: SCIM tables for Chinese @@ -53,6 +61,7 @@ %description chinese This package contains scim-tables files for Chinese input. +%if %{indic_tables} %package gujarati Summary: SCIM tables for Gujarati Group: System Environment/Libraries @@ -68,6 +77,7 @@ %description hindi This package contains scim-tables files for Hindi input. +%endif %if %{jk_tables} %package japanese @@ -80,6 +90,7 @@ This package contains scim-tables files for Japanese. %endif +%if %{indic_tables} %package kannada Summary: SCIM tables for Kannada Group: System Environment/Libraries @@ -87,6 +98,7 @@ %description kannada This package contains scim-tables files for Kannada input. +%endif %if %{jk_tables} %package korean @@ -99,6 +111,7 @@ This package contains scim-tables files for Korean. %endif +%if %{indic_tables} %package malayalam Summary: SCIM tables for Malayalam scripts Group: System Environment/Libraries @@ -106,6 +119,7 @@ %description malayalam This package contains scim-tables files for Malayalam languages. +%endif %package nepali Summary: SCIM tables for @@ -113,8 +127,9 @@ Requires: scim-tables = %{version} %description nepali -This package contains scim-tables files for input. +This package contains scim-tables files for Nepali input. +%if %{indic_tables} %package punjabi Summary: SCIM tables for Punjabi Group: System Environment/Libraries @@ -122,6 +137,7 @@ %description punjabi This package contains scim-tables files for Punjabi input. +%endif %package russian Summary: SCIM tables for Russian @@ -131,6 +147,7 @@ %description russian This package contains scim-tables files for Russian input. +%if %{indic_tables} %package tamil Summary: SCIM tables for Tamil Group: System Environment/Libraries @@ -138,6 +155,7 @@ %description tamil This package contains scim-tables files for Tamil input. +%endif %package thai Summary: SCIM tables for Thai @@ -147,6 +165,7 @@ %description thai This package contains scim-tables files for Thai input. +%if %{indic_tables} %package telugu Summary: SCIM tables for Telugu Group: System Environment/Libraries @@ -154,6 +173,7 @@ %description telugu This package contains scim-tables files for Telugu input. +%endif %package vietnamese Summary: SCIM tables for Vietnamese @@ -192,7 +212,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.la + +%if !%{indic_tables} +rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Bengali,Gujarati,Hindi,Kannada,Malayalam,Punjabi,Tamil,Telugu}-* +%endif %find_lang %{name} @@ -210,8 +234,8 @@ %files -f %{name}.lang %defattr(-, root, root, -) %{_bindir}/scim-make-table -%{_libdir}/scim-1.0/IMEngine/table.so -%{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so +%{_libdir}/scim-1.0/*/IMEngine/table.so +%{_libdir}/scim-1.0/*/SetupUI/table-imengine-setup.so %{_datadir}/scim/icons/table.png %{_mandir}/man1/scim-make-table.1* @@ -230,6 +254,7 @@ %{_datadir}/scim/icons/Arabic.png +%if %{indic_tables} %files bengali %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -237,13 +262,14 @@ %{_datadir}/scim/tables/Bengali-probhat.bin %{_datadir}/scim/icons/Bengali-inscript.png %{_datadir}/scim/icons/Bengali-probhat.png - +%endif %files chinese %defattr(-, root, root, -) %doc tables/zh/README-*.txt %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Array30.bin +%{_datadir}/scim/tables/CNS11643.bin %{_datadir}/scim/tables/CangJie*.bin %{_datadir}/scim/tables/Cantonese.bin %{_datadir}/scim/tables/CantonHK.bin @@ -258,8 +284,9 @@ %{_datadir}/scim/tables/Wu.bin %{_datadir}/scim/tables/Wubi.bin %{_datadir}/scim/tables/Ziranma.bin -%{_datadir}/scim/tables/ZhuYin.bin +%{_datadir}/scim/tables/ZhuYin*.bin %{_datadir}/scim/icons/Array30.png +%{_datadir}/scim/icons/CNS11643.png %{_datadir}/scim/icons/CangJie*.png %{_datadir}/scim/icons/Cantonese.png %{_datadir}/scim/icons/CantonHK.png @@ -277,6 +304,7 @@ %{_datadir}/scim/icons/ZhuYin.png +%if %{indic_tables} %files gujarati %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -285,7 +313,6 @@ %{_datadir}/scim/icons/Gujarati-inscript.png %{_datadir}/scim/icons/Gujarati-phonetic.png - %files hindi %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -293,7 +320,7 @@ %{_datadir}/scim/tables/Hindi-phonetic.bin %{_datadir}/scim/icons/Hindi-inscript.png %{_datadir}/scim/icons/Hindi-phonetic.png - +%endif %if %{jk_tables} %files japanese @@ -309,6 +336,7 @@ %endif +%if %{indic_tables} %files kannada %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -316,7 +344,7 @@ %{_datadir}/scim/tables/Kannada-kgp.bin %{_datadir}/scim/icons/Kannada-inscript.png %{_datadir}/scim/icons/Kannada-kgp.png - +%endif %if %{jk_tables} %files korean @@ -330,12 +358,13 @@ %endif +%if %{indic_tables} %files malayalam %defattr(-, root, root, -) %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Malayalam-inscript.bin %{_datadir}/scim/icons/Malayalam-inscript.png - +%endif %files nepali %defattr(-, root, root, -) @@ -344,6 +373,7 @@ %{_datadir}/scim/icons/Nepali.png +%if %{indic_tables} %files punjabi %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -353,6 +383,7 @@ %{_datadir}/scim/icons/Punjabi-inscript.png %{_datadir}/scim/icons/Punjabi-jhelum.png %{_datadir}/scim/icons/Punjabi-phonetic.png +%endif %files russian @@ -362,6 +393,7 @@ %{_datadir}/scim/icons/Yawerty.png +%if %{indic_tables} %files tamil %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -369,6 +401,7 @@ %{_datadir}/scim/tables/Tamil-phonetic.bin %{_datadir}/scim/icons/Tamil-inscript.png %{_datadir}/scim/icons/Tamil-phonetic.png +%endif %files thai @@ -378,11 +411,13 @@ %{_datadir}/scim/icons/Thai.png +%if %{indic_tables} %files telugu %defattr(-, root, root, -) %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Telugu-inscript.bin %{_datadir}/scim/icons/Telugu-inscript.png +%endif %files vietnamese @@ -402,23 +437,37 @@ %changelog -* Mon Dec 26 2005 Jens Petersen - 0.5.5-1%{?dist} +* Thu May 4 2006 Jens Petersen - 0.5.6-1.fc4 +- obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt) + +* Thu Mar 2 2006 Jens Petersen +- add %%indic_tables build switch + +* Thu Feb 9 2006 Jens Petersen +- update filelist since moduledir is now api-versioned + +* Fri Jan 13 2006 Jens Petersen +- update to 0.5.6 release + - update tables-skip-ja-ko.patch + - updates filelist for chinese tables + +* Mon Dec 26 2005 Jens Petersen - 0.5.5-1.fc4 - update to 0.5.5 - update filelists -- remove the Japanese and Korean tables and subpackages with +- remove the Japanese and Korean tables and their subpackages with tables-skip-ja-ko.patch and %%{jk_tables} -* Wed Dec 1 2005 Ryo Dairiki - 0.6.0-1%{?dist} +* Wed Dec 1 2005 Ryo Dairiki - 0.5.4-1.fc4 - update to 0.5.4 -* Tue Oct 18 2005 Jens Petersen - 0.5.3-6%{?dist} +* Tue Oct 18 2005 Jens Petersen - 0.5.3-6.fc4 - update to cvs head to fix various table issues with scim-tables-cvs-20051018.patch -* Fri Oct 7 2005 Jens Petersen - 0.5.3-5%{?dist} +* Fri Oct 7 2005 Jens Petersen - 0.5.3-5.fc4 - require scim -* Thu Sep 22 2005 Jens Petersen - 0.5.3-4%{?dist} +* Thu Sep 22 2005 Jens Petersen - 0.5.3-4.fc4 - add a Thai table derived from m17n-db with a Thai icon - separate the Indic tables and the additional language tables into separate language subpackages Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 06:38:59 -0000 1.5 +++ sources 4 May 2006 09:26:57 -0000 1.6 @@ -1 +1 @@ -15da0323195dea92690d4b391665b95a scim-tables-0.5.5.tar.gz +ff8d59e8f3dedb7dd7c6d87c8fc408db scim-tables-0.5.6.tar.gz From fedora-extras-commits at redhat.com Thu May 4 09:37:00 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 02:37:00 -0700 Subject: rpms/ghc/FC-5 ghc.spec,1.13,1.14 Message-ID: <200605040937.k449b2qa031699@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31682 Modified Files: ghc.spec Log Message: sync with devel: - buildrequire libXt-devel so that the X11 package and deps get built (Garrett Mitchener, #190201) Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-5/ghc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ghc.spec 22 Apr 2006 02:13:32 -0000 1.13 +++ ghc.spec 4 May 2006 09:37:00 -0000 1.14 @@ -6,7 +6,7 @@ Name: ghc Version: 6.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -15,9 +15,11 @@ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, sed -Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel +Buildrequires: gmp-devel, readline-devel +Buildrequires: libX11-devel, libXt-devel +Buildrequires: freeglut-devel, openal-devel %if %{build_doc} -# haddock generates libraries/ docs +# haddock generates docs in libraries Buildrequires: libxslt, docbook-style-xsl, haddock %endif Prefix: %{_prefix} @@ -115,9 +117,11 @@ cat rpm-dir.files rpm-prof.files > rpm-prof-filelist %endif + %clean rm -rf $RPM_BUILD_ROOT + %post ## tweak prefix in drivers scripts if relocating if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then @@ -125,6 +129,7 @@ sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/{ghcprof,hsc2hs} fi + %post -n %{ghcver} ## tweak prefix in drivers scripts if relocating if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then @@ -133,29 +138,38 @@ sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/ghc*-%{version} ${LIBDIR}/ghc-%{version}/package.conf fi + %files %defattr(-,root,root,-) %{_bindir}/* %exclude %{_bindir}/ghc*%{version} + %files -n %{ghcver} -f rpm-base-filelist %defattr(-,root,root,-) %doc ghc/ANNOUNCE ghc/LICENSE ghc/README %{_bindir}/ghc*%{version} %config(noreplace) %{_libdir}/ghc-%{version}/package.conf + %if %{build_prof} %files -n %{ghcver}-prof -f rpm-prof-filelist %defattr(-,root,root,-) %endif + %if %{build_doc} %files doc %defattr(-,root,root,-) %{_docdir}/%{name}-%{version} %endif + %changelog +* Thu May 4 2006 Jens Petersen - 6.4.2-2.fc5 +- buildrequire libXt-devel so that the X11 package and deps get built + (Garrett Mitchener, #190201) + * Sat Apr 22 2006 Jens Petersen - 6.4.2-1.fc5 - update to 6.4.2 release - ghc-6.4.1-gcc41.patch no longer needed From fedora-extras-commits at redhat.com Thu May 4 09:41:22 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 4 May 2006 02:41:22 -0700 Subject: rpms/scim-tables/FC-4 tables-skip-ja-ko.patch,1.1,1.2 Message-ID: <200605040941.k449fPXu031773@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31753 Modified Files: tables-skip-ja-ko.patch Log Message: remember to update tables-skip-ja-ko.patch tables-skip-ja-ko.patch: Index: tables-skip-ja-ko.patch =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/tables-skip-ja-ko.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tables-skip-ja-ko.patch 27 Dec 2005 06:42:08 -0000 1.1 +++ tables-skip-ja-ko.patch 4 May 2006 09:41:22 -0000 1.2 @@ -1,9 +1,9 @@ --- scim-tables-0.5.5/configure.ac~ 2005-12-05 15:37:12.000000000 +0900 +++ scim-tables-0.5.5/configure.ac 2005-12-26 17:02:55.000000000 +0900 @@ -126,14 +126,6 @@ - tables/zh/Wubi.txt tables/zh/Ziranma.txt tables/zh/ZhuYin.txt + tables/zh/ZhuYin-Big.txt - tables/ja/Makefile - tables/ja/HIRAGANA.txt - tables/ja/KATAKANA.txt From fedora-extras-commits at redhat.com Thu May 4 11:56:17 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 4 May 2006 04:56:17 -0700 Subject: fedora-security/audit fe4,1.2,1.3 fe5,1.2,1.3 Message-ID: <200605041156.k44BuHXN005071@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5009 Modified Files: fe4 fe5 Log Message: Note a new rt issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fe4 3 May 2006 22:18:06 -0000 1.2 +++ fe4 4 May 2006 11:56:15 -0000 1.3 @@ -2,4 +2,5 @@ ** are items that need attention +CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fe5 3 May 2006 22:18:06 -0000 1.2 +++ fe5 4 May 2006 11:56:15 -0000 1.3 @@ -2,4 +2,5 @@ ** are items that need attention +CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 From fedora-extras-commits at redhat.com Thu May 4 13:03:47 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 4 May 2006 06:03:47 -0700 Subject: rpms/liferea/devel .cvsignore, 1.26, 1.27 liferea.spec, 1.38, 1.39 sources, 1.27, 1.28 Message-ID: <200605041303.k44D3nFZ009779@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9758 Modified Files: .cvsignore liferea.spec sources Log Message: * Wed May 3 2006 Brian Pepple - 1.0.11-3 - Update to 1.0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 22 Apr 2006 14:13:13 -0000 1.26 +++ .cvsignore 4 May 2006 13:03:47 -0000 1.27 @@ -1 +1 @@ -liferea-1.0.10.tar.gz +liferea-1.0.11.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- liferea.spec 22 Apr 2006 14:13:13 -0000 1.38 +++ liferea.spec 4 May 2006 13:03:47 -0000 1.39 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.10 +Version: 1.0.11 Release: 3%{?dist} Summary: An RSS/RDF feed reader @@ -105,6 +105,9 @@ %changelog +* Wed May 3 2006 Brian Pepple - 1.0.11-3 +- Update to 1.0.11. + * Sat Apr 22 2006 Brian Pepple - 1.0.10-3 - Update to 1.0.10, - Delete origianl desktop file with desktop-file-install call. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 22 Apr 2006 14:13:13 -0000 1.27 +++ sources 4 May 2006 13:03:47 -0000 1.28 @@ -1 +1 @@ -41201991b4d7a113169ebda3e7dc54ef liferea-1.0.10.tar.gz +6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz From fedora-extras-commits at redhat.com Thu May 4 13:08:59 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 4 May 2006 06:08:59 -0700 Subject: rpms/liferea/FC-5 .cvsignore, 1.26, 1.27 liferea.spec, 1.38, 1.39 sources, 1.27, 1.28 Message-ID: <200605041309.k44D91xl009860@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9839 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu May 4 2006 Brian Pepple - 1.0.11-2 - Update to 1.0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 25 Apr 2006 14:40:30 -0000 1.26 +++ .cvsignore 4 May 2006 13:08:59 -0000 1.27 @@ -1 +1 @@ -liferea-1.0.10.tar.gz +liferea-1.0.11.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- liferea.spec 25 Apr 2006 14:40:30 -0000 1.38 +++ liferea.spec 4 May 2006 13:08:59 -0000 1.39 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.10 +Version: 1.0.11 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -105,6 +105,9 @@ %changelog +* Thu May 4 2006 Brian Pepple - 1.0.11-2 +- Update to 1.0.11. + * Sat Apr 22 2006 Brian Pepple - 1.0.10-2 - Update to 1.0.10. - Remove *.la, instead of excluding. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 25 Apr 2006 14:40:30 -0000 1.27 +++ sources 4 May 2006 13:08:59 -0000 1.28 @@ -1 +1 @@ -41201991b4d7a113169ebda3e7dc54ef liferea-1.0.10.tar.gz +6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz From fedora-extras-commits at redhat.com Thu May 4 13:13:39 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 4 May 2006 06:13:39 -0700 Subject: rpms/liferea/FC-4 .cvsignore, 1.23, 1.24 liferea.spec, 1.29, 1.30 sources, 1.24, 1.25 Message-ID: <200605041313.k44DDfBs009955@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9934 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu May 4 2006 Brian Pepple - 1.0.11-1 - Update to 1.0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 5 Apr 2006 17:50:48 -0000 1.23 +++ .cvsignore 4 May 2006 13:13:39 -0000 1.24 @@ -1 +1 @@ -liferea-1.0.9.tar.gz +liferea-1.0.11.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- liferea.spec 5 Apr 2006 18:16:50 -0000 1.29 +++ liferea.spec 4 May 2006 13:13:39 -0000 1.30 @@ -1,8 +1,8 @@ %define with_dbus 1 Name: liferea -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.11 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -102,6 +102,9 @@ %changelog +* Thu May 4 2006 Brian Pepple - 1.0.11-1 +- Update to 1.0.11. + * Wed Apr 5 2006 Brian Pepple - 1.0.9-2 - Fix typo. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 5 Apr 2006 17:50:48 -0000 1.24 +++ sources 4 May 2006 13:13:39 -0000 1.25 @@ -1 +1 @@ -60f743fcb41876ad2d02f6da88251c31 liferea-1.0.9.tar.gz +6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz From fedora-extras-commits at redhat.com Thu May 4 13:21:45 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 4 May 2006 06:21:45 -0700 Subject: rpms/gramps/FC-5 .cvsignore, 1.13, 1.14 gramps.spec, 1.19, 1.20 sources, 1.13, 1.14 Message-ID: <200605041321.k44DLl45010051@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10030 Modified Files: .cvsignore gramps.spec sources Log Message: * Mon May 1 2006 Brian Pepple - 2.0.11-2 - Update to 2.0.11. - Drop INSTALL, README & ChangeLog documentation. - Ghost .pyo files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 28 Feb 2006 18:56:34 -0000 1.13 +++ .cvsignore 4 May 2006 13:21:45 -0000 1.14 @@ -1 +1 @@ -gramps-2.0.10.tar.gz +gramps-2.0.11.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-5/gramps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gramps.spec 11 Mar 2006 20:23:56 -0000 1.19 +++ gramps.spec 4 May 2006 13:21:45 -0000 1.20 @@ -1,6 +1,6 @@ Name: gramps -Version: 2.0.10 -Release: 3%{?dist} +Version: 2.0.11 +Release: 2%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -111,21 +111,50 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO +%doc AUTHORS COPYING COPYING-DOCS FAQ NEWS TODO %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/application-registry/%{name}.applications -%{_datadir}/%{name}/ %{_datadir}/omf/%{name}/ %{_datadir}/mime/packages/%{name}.xml %{_datadir}/mime-info/* %{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/gnome/48x48/mimetypes/*.png %{_sysconfdir}/gconf/schemas/%{name}.schemas -%{_mandir}/man1/* +%{_mandir}/man1/%{name}.1.gz +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.py +%{_datadir}/%{name}/*.pyc +%{_datadir}/%{name}/*.png +%{_datadir}/%{name}/*.jpg +%{_datadir}/%{name}/*.glade +%ghost %{_datadir}/%{name}/*.pyo +%{_datadir}/%{name}/data/ +%dir %{_datadir}/%{name}/dates +%{_datadir}/%{name}/dates/*.py +%{_datadir}/%{name}/dates/*.pyc +%ghost %{_datadir}/%{name}/dates/*.pyo +%dir %{_datadir}/%{name}/docgen +%{_datadir}/%{name}/docgen/*.py +%{_datadir}/%{name}/docgen/*.pyc +%ghost %{_datadir}/%{name}/docgen/*.pyo +%{_datadir}/%{name}/example/ +%{_datadir}/%{name}/gnome/ +%dir %{_datadir}/%{name}/plugins +%{_datadir}/%{name}/plugins/*.py +%{_datadir}/%{name}/plugins/*.pyc +%{_datadir}/%{name}/plugins/*.glade +%{_datadir}/%{name}/plugins/*.xml +%{_datadir}/%{name}/plugins/*.png +%ghost %{_datadir}/%{name}/plugins/*.pyo %changelog +* Mon May 1 2006 Brian Pepple - 2.0.11-2 +- Update to 2.0.11. +- Drop INSTALL, README & ChangeLog documentation. +- Ghost .pyo files. + * Sat Mar 11 2006 Brian Pepple - 2.0.10-3 - Remove Utility category from desktop file. - Update scriptlets. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 28 Feb 2006 18:56:34 -0000 1.13 +++ sources 4 May 2006 13:21:45 -0000 1.14 @@ -1 +1 @@ -2c9c00acce995546af325087622235e5 gramps-2.0.10.tar.gz +650873c3c571a921a9c42b975ced2105 gramps-2.0.11.tar.gz From fedora-extras-commits at redhat.com Thu May 4 14:32:56 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 07:32:56 -0700 Subject: rpms/glib/devel glib-1.2.10-no_undefined.patch, NONE, 1.1 glib.spec, 1.1, 1.2 Message-ID: <200605041432.k44EWwNs012860@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12838 Modified Files: glib.spec Added Files: glib-1.2.10-no_undefined.patch Log Message: * Thu May 04 2006 Rex Dieter 1:1.2.10-21 - fix undefined symbols in libgmodule,libgthread glib-1.2.10-no_undefined.patch: --- NEW FILE glib-1.2.10-no_undefined.patch --- --- glib-1.2.10/gthread/Makefile.am.no_undefined 1999-08-26 08:09:43.000000000 -0500 +++ glib-1.2.10/gthread/Makefile.am 2006-05-04 08:38:36.000000000 -0500 @@ -17,9 +17,11 @@ libgthread_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ + -no-undefined -Wl,--no-undefined \ -export-dynamic -libgthread_la_LIBADD = @G_THREAD_LIBS@ +libgthread_la_DEPENDENCIES = $(libglib) $(top_builddir)/gmodule/libgmodule.la +libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib) $(top_builddir)/gmodule/libgmodule.la noinst_PROGRAMS = testgthread -testgthread_LDADD = ../libglib.la libgthread.la +testgthread_LDADD = libgthread.la --- glib-1.2.10/gmodule/Makefile.am.no_undefined 2001-03-15 09:33:10.000000000 -0600 +++ glib-1.2.10/gmodule/Makefile.am 2006-05-04 08:33:22.000000000 -0500 @@ -27,23 +27,25 @@ @G_MODULE_LDFLAGS@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ + -no-undefined -Wl,--no-undefined \ -export-dynamic -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule_la_DEPENDENCIES = $(libglib) +libgmodule_la_LIBADD = @G_MODULE_LIBS@ $(libglib) # we should really depend on $(libglib) for libgmodule.la, but libtool has a # problem with this ;( libgplugin_a_la_SOURCES = libgplugin_a.c libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module -libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libglib) libgplugin_b_la_SOURCES = libgplugin_b.c libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module -libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib) noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ -testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ +testgmodule_LDADD = libgmodule.la @G_MODULE_LIBS@ .PHONY: files release Index: glib.spec =================================================================== RCS file: /cvs/extras/rpms/glib/devel/glib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glib.spec 24 Apr 2006 14:37:42 -0000 1.1 +++ glib.spec 4 May 2006 14:32:56 -0000 1.2 @@ -3,7 +3,7 @@ Name: glib Epoch: 1 Version: 1.2.10 -Release: 20%{?dist} +Release: 21%{?dist} License: LGPL Group: System Environment/Libraries @@ -11,10 +11,14 @@ Source: ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: automake14 autoconf213 +BuildRequires: libtool + # Suppress warnings about varargs macros for -pedantic Patch1: glib-1.2.10-isowarning.patch Patch2: glib-1.2.10-gcc34.patch Patch3: glib-1.2.10-underquoted.patch +Patch4: glib-1.2.10-no_undefined.patch %description GLib is a handy library of utility functions. This C library is @@ -36,28 +40,43 @@ %patch1 -p1 -b .isowarning %patch2 -p1 -b .gcc34 %patch3 -p1 -b .underquoted +%patch4 -p1 -b .no_undefined + +#libtoolize --copy --force +automake-1.4 +aclocal-1.4 +autoconf-2.13 +autoheader-2.13 %build +LIBTOOL=/usr/bin/libtool \ %configure --disable-static -make %{?_smp_mflags} - - -# I *know* ||: isn't needed, but this *is* a legacy pkg afterall. -%check || : -make check +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf $RPM_BUILD_ROOT -%makeinstall +#makeinstall +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool + +# libgmodule-1.2.so.0* missing eXecute bit +chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so* +## Unpackaged files +# info rm -rf $RPM_BUILD_ROOT%{_infodir} +# .la fies... die die die. rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -# libgmodule-1.2.so.0* missing eXecute bit -chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so +# despite use of --disable-static, delete static libs that get built anyway +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a + + +# I *know* ||: isn't needed, but this could end up used by legacy +%check ||: +make check LIBTOOL=/usr/bin/libtool %clean @@ -86,6 +105,9 @@ %changelog +* Thu May 04 2006 Rex Dieter 1:1.2.10-21 +- fix undefined symbols in libgmodule,libgthread + * Wed Apr 12 2006 Rex Dieter 1:1.2.10-20 - cleanup %%description - libgmodule-1.2.so.0* missing eXecute bit From fedora-extras-commits at redhat.com Thu May 4 16:04:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:04:01 -0700 Subject: rpms/gtk+ - New directory Message-ID: <200605041604.k44G43YY018268@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18247/gtk+ Log Message: Directory /cvs/extras/rpms/gtk+ added to the repository From fedora-extras-commits at redhat.com Thu May 4 16:04:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:04:01 -0700 Subject: rpms/gtk+/devel - New directory Message-ID: <200605041604.k44G43wW018269@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18247/gtk+/devel Log Message: Directory /cvs/extras/rpms/gtk+/devel added to the repository From fedora-extras-commits at redhat.com Thu May 4 16:04:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:04:13 -0700 Subject: rpms/gtk+ Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605041604.k44G4F2i018320@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18292 Added Files: Makefile import.log Log Message: Setup of module gtk+ --- NEW FILE Makefile --- # Top level Makefile for module gtk+ all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 4 16:04:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:04:13 -0700 Subject: rpms/gtk+/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605041604.k44G4FpQ018323@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18292/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtk+ --- NEW 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 May 4 16:05:39 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:05:39 -0700 Subject: rpms/gtk+/devel gtk+-1.2.10-alignment.patch, NONE, 1.1 gtk+-1.2.10-bellvolume.patch, NONE, 1.1 gtk+-1.2.10-clistfocusrow.patch, NONE, 1.1 gtk+-1.2.10-ctext.patch, NONE, 1.1 gtk+-1.2.10-deletedir.patch, NONE, 1.1 gtk+-1.2.10-dndorder.patch, NONE, 1.1 gtk+-1.2.10-encoding.patch, NONE, 1.1 gtk+-1.2.10-expose.patch, NONE, 1.1 gtk+-1.2.10-focus.patch, NONE, 1.1 gtk+-1.2.10-fontwarning.patch, NONE, 1.1 gtk+-1.2.10-gtkgdkdep.patch, NONE, 1.1 gtk+-1.2.10-kpenter.patch, NONE, 1.1 gtk+-1.2.10-libtool.patch, NONE, 1.1 gtk+-1.2.10-localecrash.patch, NONE, 1.1 gtk+-1.2.10-missingchar.patch, NONE, 1.1 gtk+-1.2.10-no_undefined.patch, NONE, 1.1 gtk+-1.2.10-pixmapref.patch, NONE, 1.1 gtk+-1.2.10-ppc64.patch, NONE, 1.1 gtk+-1.2.10-themeswitch.patch, NONE, 1.1 gtk+-1.2.10-troughpaint.patch, NONE, 1.1 gtk+-1.2.10-ukfont.patch, NONE, 1.1 gtk+-1.2.10-utf8fontset.patch, NONE, 1.1 gtk+-1.2.6-ahiguti.patch, NONE, 1.1 gtk+-1.2.8-wrap-alnum.patch, NONE, 1.1 gtk+-underquoted.patch, NONE, 1.1 gtk+.spec, NONE, 1.1 gtkrc-default, NONE, 1.1 gtkrc.ja.utf8, NONE, 1.1 gtkrc.ko.utf8, NONE, 1.1 gtkrc.zh_CN.utf8, NONE, 1.1 gtkrc.zh_TW.utf8, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605041606.k44G6BjF018627@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508/devel Modified Files: .cvsignore sources Added Files: gtk+-1.2.10-alignment.patch gtk+-1.2.10-bellvolume.patch gtk+-1.2.10-clistfocusrow.patch gtk+-1.2.10-ctext.patch gtk+-1.2.10-deletedir.patch gtk+-1.2.10-dndorder.patch gtk+-1.2.10-encoding.patch gtk+-1.2.10-expose.patch gtk+-1.2.10-focus.patch gtk+-1.2.10-fontwarning.patch gtk+-1.2.10-gtkgdkdep.patch gtk+-1.2.10-kpenter.patch gtk+-1.2.10-libtool.patch gtk+-1.2.10-localecrash.patch gtk+-1.2.10-missingchar.patch gtk+-1.2.10-no_undefined.patch gtk+-1.2.10-pixmapref.patch gtk+-1.2.10-ppc64.patch gtk+-1.2.10-themeswitch.patch gtk+-1.2.10-troughpaint.patch gtk+-1.2.10-ukfont.patch gtk+-1.2.10-utf8fontset.patch gtk+-1.2.6-ahiguti.patch gtk+-1.2.8-wrap-alnum.patch gtk+-underquoted.patch gtk+.spec gtkrc-default gtkrc.ja.utf8 gtkrc.ko.utf8 gtkrc.zh_CN.utf8 gtkrc.zh_TW.utf8 Log Message: auto-import gtk+-1.2.10-52 on branch devel from gtk+-1.2.10-52.src.rpm gtk+-1.2.10-alignment.patch: --- NEW FILE gtk+-1.2.10-alignment.patch --- --- gtk+-1.2.10/gtk/gtktypeutils.h.alignment Fri Aug 18 17:36:34 2000 +++ gtk+-1.2.10/gtk/gtktypeutils.h Tue Jul 3 21:07:40 2001 @@ -191,6 +191,13 @@ GtkTypeClass *klass; }; +#ifdef __GNUC__ +struct _GtkTypeClassDummyAlign +{ + GtkType type; + guint *signals; +}; +#endif /* __GNUC__ */ /* A GtkTypeClass defines the minimum structure requirements for * a types class. Classes returned from gtk_type_class () and @@ -203,7 +210,11 @@ * one unique identifier per class. */ GtkType type; -}; +} +#ifdef __GNUC__ +__attribute__ ((aligned (__alignof (struct _GtkTypeClassDummyAlign)))) +#endif /* __GNUC__ */ +; struct _GtkArg gtk+-1.2.10-bellvolume.patch: --- NEW FILE gtk+-1.2.10-bellvolume.patch --- --- gtk+-1.2.10/gdk/gdk.c.bellvolume Wed Jan 15 12:32:25 2003 +++ gtk+-1.2.10/gdk/gdk.c Wed Jan 15 12:32:28 2003 @@ -989,7 +989,7 @@ void gdk_beep (void) { - XBell(gdk_display, 100); + XBell(gdk_display, 0); } /* gtk+-1.2.10-clistfocusrow.patch: --- NEW FILE gtk+-1.2.10-clistfocusrow.patch --- Index: gtk/gtkclist.c =================================================================== RCS file: /cvs/gnome/gtk+/gtk/gtkclist.c,v retrieving revision 1.156.2.25 retrieving revision 1.156.2.26 diff -u -p -r1.156.2.25 -r1.156.2.26 --- gtk/gtkclist.c 1 Mar 2001 00:18:20 -0000 1.156.2.25 +++ gtk/gtkclist.c 14 Dec 2002 04:17:03 -0000 1.156.2.26 @@ -2800,10 +2800,6 @@ real_remove_row (GtkCList *clist, clist->row_list_end = g_list_previous (list); g_list_remove (list, clist_row); - /*if (clist->focus_row >=0 && - (row <= clist->focus_row || clist->focus_row >= clist->rows)) - clist->focus_row--;*/ - if (row < ROW_FROM_YPIXEL (clist, 0)) clist->voffset += clist->row_height + CELL_SPACING; @@ -4331,7 +4327,9 @@ sync_selection (GtkCList *clist, clist->focus_row += d; if (clist->focus_row == -1 && clist->rows >= 1) clist->focus_row = 0; - else if (clist->focus_row >= clist->rows) + else if (d < 0 && clist->focus_row >= clist->rows - 1) + clist->focus_row = clist->rows - 2; + else if (clist->focus_row >= clist->rows) /* Paranoia */ clist->focus_row = clist->rows - 1; } gtk+-1.2.10-ctext.patch: --- NEW FILE gtk+-1.2.10-ctext.patch --- --- gtk+-1.2.10/gdk/gdkselection.c.ctext Thu Jul 5 12:41:42 2001 +++ gtk+-1.2.10/gdk/gdkselection.c Thu Jul 5 12:45:25 2001 @@ -191,73 +191,6 @@ gdk_send_xevent (requestor, False, NoEventMask, (XEvent*) &xevent); } - -/* The output of XmbTextPropertyToTextList may include stuff not valid - * for COMPOUND_TEXT. This routine tries to correct this by: - * - * a) Canonicalizing CR LF and CR to LF - * b) Stripping out all other non-allowed control characters - * - * See the COMPOUND_TEXT spec distributed with X for explanations - * what is allowed. - */ -static gchar * -sanitize_ctext (const char *str, - gint *length) -{ - gchar *result = g_malloc (*length + 1); - gint out_length = 0; - gint i; - const guchar *ustr = (const guchar *)str; - - for (i=0; i < *length; i++) - { - guchar c = ustr[i]; - - if (c == '\r') - { - result[out_length++] = '\n'; - if (i + 1 < *length && ustr[i + 1] == '\n') - i++; - } - else if (c == 27 /* ESC */) - { - /* Check for "extended segments, which can contain arbitrary - * octets. See CTEXT spec, section 6. - */ - - if (i + 5 < *length && - ustr[i + 1] == '%' && - ustr[i + 2] == '/' && - (ustr[i + 3] >= 48 && ustr[i + 3] <= 52) && - ustr[i + 4] >= 128 && - ustr[i + 5] >= 128) - { - int extra_len = 6 + (ustr[i + 4] - 128) * 128 + ustr[i + 5] - 128; - extra_len = MAX (extra_len, *length - i); - - memcpy (result + out_length, ustr + i, extra_len); - out_length += extra_len; - i += extra_len - 1; - } - else - result[out_length++] = c; - } - else if (c == '\n' || c == '\t' || c == 27 /* ESC */ || - (c >= 32 && c <= 127) || /* GL */ - c == 155 /* CONTROL SEQUENCE INTRODUCER */ || - (c >= 160 && c <= 255)) /* GR */ - { - result[out_length++] = c; - } - } - - result[out_length] = '\0'; - *length = out_length; - - return result; -} - gint gdk_text_property_to_text_list (GdkAtom encoding, gint format, guchar *text, gint length, @@ -266,32 +199,16 @@ XTextProperty property; gint count = 0; gint res; - gchar *sanitized_text = NULL; if (!list) return 0; property.encoding = encoding; property.format = format; - - if (encoding == gdk_atom_intern ("COMPOUND_TEXT", FALSE) && format == 8) - { - gint sanitized_text_length = length; - - property.value = sanitized_text = sanitize_ctext (text, &sanitized_text_length); - property.nitems = sanitized_text_length; - } - else - { - property.value = text; - property.nitems = length; - } - + property.value = text; + property.nitems = length; res = XmbTextPropertyToTextList (GDK_DISPLAY(), &property, list, &count); - if (sanitized_text) - g_free (sanitized_text); - if (res == XNoMemory || res == XLocaleNotSupported || res == XConverterNotFound) return 0; @@ -314,8 +231,6 @@ { gint res; XTextProperty property; - gint sanitized_text_length; - gchar *sanitized_text; res = XmbTextListToTextProperty (GDK_DISPLAY(), (char **)&str, 1, XCompoundTextStyle, @@ -334,17 +249,10 @@ *encoding = property.encoding; if (format) *format = property.format; - - sanitized_text_length = property.nitems; - sanitized_text = sanitize_ctext (property.value, &sanitized_text_length); - if (ctext) - *ctext = sanitized_text; - else - g_free (sanitized_text); - + *ctext = g_strdup (property.value); if (length) - *length = sanitized_text_length; + *length = property.nitems; if (property.value) XFree (property.value); gtk+-1.2.10-deletedir.patch: --- NEW FILE gtk+-1.2.10-deletedir.patch --- --- gtk+-1.2.10/gtk/gtkfilesel.c.deletedir Thu Feb 15 23:36:19 2001 +++ gtk+-1.2.10/gtk/gtkfilesel.c Wed Apr 17 20:36:25 2002 @@ -325,7 +325,8 @@ static void gtk_file_selection_populate (GtkFileSelection *fs, gchar *rel_path, - gint try_complete); + gboolean try_complete, + gboolean reset_entry); static void gtk_file_selection_abort (GtkFileSelection *fs); static void gtk_file_selection_update_history_menu (GtkFileSelection *fs, @@ -522,7 +523,7 @@ } else { - gtk_file_selection_populate (filesel, "", FALSE); + gtk_file_selection_populate (filesel, "", FALSE, TRUE); } gtk_widget_grab_focus (filesel->selection_entry); @@ -637,7 +638,7 @@ name = last_slash + 1; } - gtk_file_selection_populate (filesel, buf, FALSE); + gtk_file_selection_populate (filesel, buf, FALSE, TRUE); if (filesel->selection_entry) gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), name); @@ -673,7 +674,7 @@ if (filesel->selection_entry) gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), pattern); - gtk_file_selection_populate (filesel, (gchar*) pattern, TRUE); + gtk_file_selection_populate (filesel, (gchar*) pattern, TRUE, TRUE); } static void @@ -806,7 +807,7 @@ g_free (full_path); gtk_widget_destroy (fs->fileop_dialog); - gtk_file_selection_populate (fs, "", FALSE); + gtk_file_selection_populate (fs, "", FALSE, FALSE); } static void @@ -903,7 +904,7 @@ g_free (full_path); gtk_widget_destroy (fs->fileop_dialog); - gtk_file_selection_populate (fs, "", FALSE); + gtk_file_selection_populate (fs, "", FALSE, TRUE); } static void @@ -1009,8 +1010,9 @@ g_free (new_filename); g_free (old_filename); + gtk_file_selection_populate (fs, "", FALSE, FALSE); + gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), file); gtk_widget_destroy (fs->fileop_dialog); - gtk_file_selection_populate (fs, "", FALSE); } static void @@ -1112,7 +1114,7 @@ text = g_strdup (text); - gtk_file_selection_populate (fs, text, TRUE); + gtk_file_selection_populate (fs, text, TRUE, TRUE); g_free (text); @@ -1124,7 +1126,6 @@ return FALSE; } - static void gtk_file_selection_history_callback (GtkWidget *widget, gpointer data) { @@ -1142,7 +1143,7 @@ if (callback_arg->menu_item == widget) { - gtk_file_selection_populate (fs, callback_arg->directory, FALSE); + gtk_file_selection_populate (fs, callback_arg->directory, FALSE, FALSE); break; } @@ -1272,7 +1273,7 @@ gpointer user_data) { GtkFileSelection *fs = NULL; - gchar *filename, *temp = NULL; + gchar *filename = NULL; g_return_if_fail (GTK_IS_CLIST (widget)); @@ -1280,39 +1281,23 @@ g_return_if_fail (fs != NULL); g_return_if_fail (GTK_IS_FILE_SELECTION (fs)); - gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &temp); - filename = g_strdup (temp); - - if (filename) - { - if (bevent) - switch (bevent->type) - { - case GDK_2BUTTON_PRESS: - gtk_file_selection_populate (fs, filename, FALSE); - break; - - default: - gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); - break; - } - else - gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); - - g_free (filename); - } + gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &filename); + + if (filename && bevent && bevent->type == GDK_2BUTTON_PRESS) + gtk_file_selection_populate (fs, filename, FALSE, FALSE); } static void gtk_file_selection_populate (GtkFileSelection *fs, gchar *rel_path, - gint try_complete) + gboolean try_complete, + gboolean reset_entry) { CompletionState *cmpl_state; PossibleCompletion* poss; gchar* filename; gint row; - gchar* rem_path = rel_path; + gchar* rem_path; gchar* sel_text; gchar* text[2]; gint did_recurse = FALSE; @@ -1323,6 +1308,8 @@ g_return_if_fail (fs != NULL); g_return_if_fail (GTK_IS_FILE_SELECTION (fs)); + + rem_path = rel_path = g_strdup (rel_path); cmpl_state = (CompletionState*) fs->cmpl_state; poss = cmpl_completion_matches (rel_path, &rem_path, cmpl_state); @@ -1422,7 +1409,7 @@ did_recurse = TRUE; - gtk_file_selection_populate (fs, dir_name, TRUE); + gtk_file_selection_populate (fs, dir_name, TRUE, TRUE); g_free (dir_name); } @@ -1441,7 +1428,7 @@ gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), rem_path); } } - else + else if (reset_entry) { if (fs->selection_entry) gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), ""); @@ -1466,8 +1453,9 @@ { gtk_file_selection_update_history_menu (fs, cmpl_reference_position (cmpl_state)); } - } + + g_free (rel_path); } static void gtk+-1.2.10-dndorder.patch: --- NEW FILE gtk+-1.2.10-dndorder.patch --- Index: gdk/gdkdnd.c =================================================================== RCS file: /cvs/gnome/gtk+/gdk/gdkdnd.c,v retrieving revision 1.25.2.7 retrieving revision 1.25.2.9 diff -u -p -r1.25.2.7 -r1.25.2.9 --- gdk/gdkdnd.c 13 Mar 2000 23:41:53 -0000 1.25.2.7 +++ gdk/gdkdnd.c 14 May 2002 22:14:15 -0000 1.25.2.9 @@ -275,12 +275,16 @@ gdk_window_cache_filter (GdkXEvent *xev, GUINT_TO_POINTER (xce->above)); if (above_node && node->prev != above_node) { + /* Put the window above (before in the list) above_node + */ cache->children = g_list_remove_link (cache->children, node); - node->next = above_node->next; - if (node->next) - node->next->prev = node; - node->prev = above_node; - above_node->next = node; + node->prev = above_node->prev; + if (node->prev) + node->prev->next = node; + else + cache->children = node; + node->next = above_node; + above_node->prev = node; } } } gtk+-1.2.10-encoding.patch: --- NEW FILE gtk+-1.2.10-encoding.patch --- --- gtk+-1.2.10/gtk/gtkrc.iso88593.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88593 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-3" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-3,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-3,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-3" + --- gtk+-1.2.10/gtk/Makefile.am.encoding Fri Feb 2 12:09:02 2001 +++ gtk+-1.2.10/gtk/Makefile.am Fri Jul 26 16:47:04 2002 @@ -374,10 +374,12 @@ gtkconfdir = $(sysconfdir)/gtk -gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \ - gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \ - gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \ - gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \ +gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \ + gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \ + gtkrc.utf8 gtkrc.iso88592 \ + gtkrc.iso88593 gtkrc.iso88595 gtkrc.iso88597 \ + gtkrc.iso88599 gtkrc.iso885913 gtkrc.iso885914 \ + gtkrc.iso885915 gtkrc.zh_CN gtkrc.zh_TW.big5 \ gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \ gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255 @@ -390,11 +392,11 @@ cd $(DESTDIR)$(gtkconfdir) && \ for i in cs hr hu pl ro sk sl sq sr ; do \ rm -f gtkrc.$$i ; \ - ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \ + ln -s gtkrc.iso88592 gtkrc.$$i ; \ done ; \ for i in bg_BG.iso88595 mk sp ru_RU.iso88595 ; do \ rm -f gtkrc.$$i ; \ - ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \ + ln -s gtkrc.iso88595 gtkrc.$$i ; \ done ; \ for i in he_IL.cp1255 he_IL.microsoftcp1255 yi ; do \ rm -f gtkrc.$$i ; \ @@ -403,12 +405,12 @@ rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \ gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi \ gtkrc.be gtkrc.bg gtkrc.mi ; \ - ln -s gtkrc.iso-8859-13 gtkrc.mi ; \ - ln -s gtkrc.iso-8859-13 gtkrc.lt ; \ - ln -s gtkrc.iso-8859-13 gtkrc.lv ; \ - ln -s gtkrc.iso-8859-14 gtkrc.cy ; \ - ln -s gtkrc.iso-8859-14 gtkrc.ga ; \ - ln -s gtkrc.iso-8859-15 gtkrc.et ; \ + ln -s gtkrc.iso885913 gtkrc.mi ; \ + ln -s gtkrc.iso885913 gtkrc.lt ; \ + ln -s gtkrc.iso885913 gtkrc.lv ; \ + ln -s gtkrc.iso885914 gtkrc.cy ; \ + ln -s gtkrc.iso885914 gtkrc.ga ; \ + ln -s gtkrc.iso885915 gtkrc.et ; \ ln -s gtkrc.ka_GE.georgianps gtkrc.ka ; \ ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 ; \ ln -s gtkrc.vi_VN.tcvn gtkrc.vi ; \ --- gtk+-1.2.10/gtk/gtkrc.c.encoding Thu Mar 15 13:41:40 2001 +++ gtk+-1.2.10/gtk/gtkrc.c Fri Jul 26 16:49:24 2002 @@ -33,6 +33,7 @@ #include #include #include +#include #include "gtkrc.h" #include "gtkbindings.h" @@ -440,7 +441,7 @@ void gtk_rc_init (void) { - static gchar *locale_suffixes[3]; + static gchar *locale_suffixes[8]; static gint n_locale_suffixes = 0; gint i, j; @@ -449,9 +450,7 @@ if (!initted) { - gint length; - - char *locale = setlocale (LC_CTYPE, NULL); + char *locale = g_strdup (setlocale (LC_CTYPE, NULL)); char *p; initted = TRUE; @@ -470,39 +469,88 @@ * We normalize the charset into a standard form, * which has all '-' and '_' characters removed, * and is lowercase. + * + * the search is done in that order: + * gtkrc.ll_cc.lowercasecodeset + * gtkrc.ll_cc.normalizedcodeset + * gtkrc.ll.lowercasecodeset + * gtkrc.ll.normalizedcodeset + * gtkrc.lowercasecodeset + * gtkrc.normalizedcodeset + * gtkrc.ll_cc + * gtkrc.ll + * */ - gchar *normalized_locale; + char *codeset = NULL; + char *normalized_codeset = NULL; + char *cc = NULL; + char *ll; p = strchr (locale, '@'); - length = p ? (p -locale) : strlen (locale); + if (p) + *p = '\0'; + codeset = nl_langinfo (CODESET); + p = strchr (locale, '.'); + if (!codeset && p) + codeset = p + 1; if (p) + *p = '\0'; + + if (codeset) { - gchar *tmp1 = g_strndup (locale, p - locale + 1); - gchar *tmp2 = _gtk_normalize_codeset (p + 1, length - (p - locale + 1)); + codeset = g_strdup (codeset); - normalized_locale = g_strconcat (tmp1, tmp2, NULL); - g_free (tmp1); - g_free (tmp2); - - locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_locale); - length = p - locale; + p = codeset; + while (*p) + { + /* tolower not used, because some locales are not + * compatible with C locale in lowercasing ascii + */ + if (*p >= 'A' && *p <= 'Z') + *p = (*p) - 'A' + 'a'; + p++; + } + + normalized_codeset = _gtk_normalize_codeset(codeset, strlen (codeset)); + if (strcmp (normalized_codeset, codeset) == 0) + { + g_free (normalized_codeset); + normalized_codeset = NULL; + } } - else - normalized_locale = g_strndup (locale, length); - p = strchr (normalized_locale, '_'); + p = strchr (locale, '_'); if (p) { - locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length); - length = p - normalized_locale; + cc = p + 1; + *p = '\0'; } - - locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length); - g_free (normalized_locale); + ll = locale; + + if (cc && codeset) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, ".", codeset, NULL); + if (cc && normalized_codeset) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, ".", normalized_codeset, NULL); + if (codeset) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, ".", codeset, NULL); + if (normalized_codeset) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, ".", normalized_codeset, NULL); + if (codeset) + locale_suffixes[n_locale_suffixes++] = g_strdup (codeset); + if (normalized_codeset) + locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_codeset); + if (cc) + locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, NULL); + locale_suffixes[n_locale_suffixes++] = g_strdup (ll); + + g_free (normalized_codeset); + g_free (codeset); } + + g_free (locale); } i = 0; --- gtk+-1.2.10/gtk/gtkrc.iso88599.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88599 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-9" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-9,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-9,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-9" + --- gtk+-1.2.10/gtk/gtkrc.utf8.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.utf8 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,7 @@ +style "default-text" { + fontset = "-*-helvetica-medium-r-normal--*-120-*-*-p-*-*-*" + +} + +class "GtkWidget" style "default-text" + --- gtk+-1.2.10/gtk/gtkrc.iso885913.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso885913 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,7 @@ +style "gtk-default-iso-8859-13" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-13,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-13,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-13" --- gtk+-1.2.10/gtk/gtkrc.iso885914.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso885914 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-14" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-14,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-14,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-14" + --- gtk+-1.2.10/gtk/gtkrc.iso885915.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso885915 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-15" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-15,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-15,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-15" + --- gtk+-1.2.10/gtk/gtkrc.iso88592.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88592 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,14 @@ +#$(gtkconfigdir)/gtkrc.iso-8859-2 +# +# This file defines the fontsets for iso-8859-2 encoding +# make symliks or hardlinks to gtkrc.$LANG if your language uses iso-8859-2 +# and a gtkrc.$LANG doesn't exist yet. + +style "gtk-default-iso-8859-2" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-2,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-2,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-2" + --- gtk+-1.2.10/gtk/gtkrc.iso88595.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88595 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,14 @@ +#$(gtkconfigdir)/gtkrc.iso-8859-5 +# +# This file defines the fontsets for iso-8859-5 encoding +# make symliks or hardlinks to gtkrc.$LANG if your language uses iso-8859-5 +# and a gtkrc.$LANG doesn't exist yet. + +style "gtk-default-iso-8859-5" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-5,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-5,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-5" + --- gtk+-1.2.10/gtk/gtkrc.iso88597.encoding Fri Jul 26 16:47:04 2002 +++ gtk+-1.2.10/gtk/gtkrc.iso88597 Fri Jul 26 16:47:04 2002 @@ -0,0 +1,8 @@ +style "gtk-default-iso-8859-7" { + fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-7,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-7,*-r-*" +} +class "GtkWidget" style "gtk-default-iso-8859-7" + gtk+-1.2.10-expose.patch: --- NEW FILE gtk+-1.2.10-expose.patch --- --- gtk+-1.2.10/gdk/gdkevents.c.expose Sun Dec 3 11:02:49 2000 +++ gtk+-1.2.10/gdk/gdkevents.c Wed Jul 11 15:54:18 2001 @@ -383,6 +383,7 @@ struct _GdkExposeInfo { Window window; + GdkWindowPrivate *toplevel_window; gboolean seen_nonmatching; }; @@ -400,10 +401,21 @@ * we'll get a whole bunch of them interspersed with * expose events. */ - if (xevent->xany.type != Expose && - xevent->xany.type != GravityNotify) + switch (xevent->xany.type) { + case Expose: + case GravityNotify: + break; + case ConfigureNotify: + if (xevent->xconfigure.window != info->toplevel_window->xwindow) + break; + if (xevent->xconfigure.width == info->toplevel_window->width && + xevent->xconfigure.height == info->toplevel_window->height) + break; + /* Fall through */ + default: info->seen_nonmatching = TRUE; + break; } if (info->seen_nonmatching || @@ -429,6 +441,7 @@ GdkEvent event; info.window = xevent->xany.window; + info.toplevel_window = (GdkWindowPrivate *) gdk_window_get_toplevel (window); info.seen_nonmatching = FALSE; rect1.x = xevent->xexpose.x; gtk+-1.2.10-focus.patch: --- NEW FILE gtk+-1.2.10-focus.patch --- --- gtk+-1.2.10/gtk/gtkwindow.c.focus Fri Mar 9 18:39:16 2001 +++ gtk+-1.2.10/gtk/gtkwindow.c Thu Jul 5 10:34:00 2001 @@ -985,7 +985,13 @@ break; case EnterNotify: case LeaveNotify: - if (xev->xcrossing.detail != NotifyInferior && + /* We only track the actual destination of keyboard events for real + * toplevels, not for embedded toplevels such as GtkPlug. The reason for + * this is that GtkPlug redirects events so the widget may effectively not + * have the focus even if it actually has the focus. + */ + if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () && + xev->xcrossing.detail != NotifyInferior && xev->xcrossing.focus && !window->window_has_focus) { window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE; gtk+-1.2.10-fontwarning.patch: --- NEW FILE gtk+-1.2.10-fontwarning.patch --- --- gtk+-1.2.10/gdk/gdkfont.c.fontwarning Fri Apr 12 17:33:55 2002 +++ gtk+-1.2.10/gdk/gdkfont.c Fri Apr 12 17:36:52 2002 @@ -27,6 +27,7 @@ #include #include #include +#include #include "gdk.h" #include "gdkprivate.h" @@ -187,9 +188,11 @@ if (g_strcasecmp (codeset, "utf-8") != 0 && g_strcasecmp (codeset, "utf8") != 0) { - g_warning ("Missing charsets in FontSet creation\n"); + g_printerr ("The font \"%s\" does not support all the required character sets for the current locale \"%s\"\n", + fontset_name, setlocale (LC_ALL, NULL)); for (i=0;istate & GDK_CONTROL_MASK) gtk_signal_emit_by_name (GTK_OBJECT (text), "activate"); else @@ -2161,6 +2162,7 @@ gtk_editable_insert_text (editable, "\t", 1, &position); break; case GDK_Return: + case GDK_KP_Enter: if (event->state & GDK_CONTROL_MASK) gtk_signal_emit_by_name (GTK_OBJECT (text), "activate"); else --- gtk+-1.2.10/gtk/gtkmenushell.c.kpenter Sat Jul 21 20:27:59 2001 +++ gtk+-1.2.10/gtk/gtkmenushell.c Sat Jul 21 20:28:05 2001 @@ -258,6 +258,11 @@ GTK_TYPE_BOOL, TRUE); gtk_binding_entry_add_signal (binding_set, + GDK_KP_Enter, 0, + "activate_current", 1, + GTK_TYPE_BOOL, + TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "activate_current", 1, GTK_TYPE_BOOL, --- gtk+-1.2.10/gtk/gtknotebook.c.kpenter Sat Jul 21 20:28:30 2001 +++ gtk+-1.2.10/gtk/gtknotebook.c Sat Jul 21 20:28:38 2001 @@ -1369,6 +1369,7 @@ gtk_notebook_switch_focus_tab (notebook, list); return TRUE; case GDK_Return: + case GDK_KP_Enter: case GDK_space: gtk_notebook_page_select (GTK_NOTEBOOK (widget)); return TRUE; gtk+-1.2.10-libtool.patch: --- NEW FILE gtk+-1.2.10-libtool.patch --- --- gtk+-1.2.10/configure.libtool Wed Jan 15 12:44:35 2003 +++ gtk+-1.2.10/configure Wed Jan 15 12:45:29 2003 @@ -1389,11 +1389,7 @@ echo "$ac_t""no" 1>&6 fi - -case "$target" in -NONE) lt_target="$host" ;; -*) lt_target="$target" ;; -esac +lt_target="$host" # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" --- gtk+-1.2.10/aclocal.m4.libtool Wed Jan 15 12:44:47 2003 +++ gtk+-1.2.10/aclocal.m4 Wed Jan 15 12:45:42 2003 @@ -56,10 +56,7 @@ AC_REQUIRE([AC_PROG_LN_S])dnl dnl -case "$target" in -NONE) lt_target="$host" ;; -*) lt_target="$target" ;; -esac +lt_target="$host" # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" --- gtk+-1.2.10/ltconfig.libtool Wed Jan 15 12:44:58 2003 +++ gtk+-1.2.10/ltconfig Wed Jan 15 12:46:15 2003 @@ -447,16 +447,16 @@ host_alias=$host fi +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. case "$host_os" in linux-gnu*) ;; linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` esac -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - case "$host_os" in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some gtk+-1.2.10-localecrash.patch: --- NEW FILE gtk+-1.2.10-localecrash.patch --- --- gtk+-1.2.10/gdk/gdkselection.c.localecrash Thu Aug 22 16:50:01 2002 +++ gtk+-1.2.10/gdk/gdkselection.c Thu Aug 22 17:50:46 2002 @@ -238,12 +238,14 @@ if (res != Success) { property.encoding = None; - property.format = None; + property.format = 8; property.value = NULL; property.nitems = 0; - } - g_assert (property.encoding == gdk_atom_intern ("COMPOUND_TEXT", FALSE) && property.format == 8); + g_warning ("Error converting string to compound text.\n" + "This might mean that your locale setting is supported\n" + "by the C library but not by Xlib."); + } if (encoding) *encoding = property.encoding; gtk+-1.2.10-missingchar.patch: --- NEW FILE gtk+-1.2.10-missingchar.patch --- --- gtk+-1.2.10/gdk/gdkfont.c.missingchar Mon Aug 13 13:37:52 2001 +++ gtk+-1.2.10/gdk/gdkfont.c Mon Aug 13 13:39:30 2001 @@ -461,7 +461,6 @@ GdkFontPrivate *private; XCharStruct *chars; gint width; - guint ch = character & 0xff; /* get rid of sign-extension */ XFontStruct *xfont; XFontSet fontset; @@ -474,21 +473,7 @@ case GDK_FONT_FONT: /* only 8 bits characters are considered here */ xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && - (xfont->max_byte1 == 0) && - (ch >= xfont->min_char_or_byte2) && - (ch <= xfont->max_char_or_byte2)) - { - chars = xfont->per_char; - if (chars) - width = chars[ch - xfont->min_char_or_byte2].width; - else - width = xfont->min_bounds.width; - } - else - { - width = XTextWidth (xfont, &character, 1); - } + width = XTextWidth (xfont, &character, 1); break; case GDK_FONT_FONTSET: fontset = (XFontSet) private->xfont; gtk+-1.2.10-no_undefined.patch: --- NEW FILE gtk+-1.2.10-no_undefined.patch --- --- gtk+-1.2.10/gtk/Makefile.am.no_undefined 2006-04-08 20:58:18.000000000 -0500 +++ gtk+-1.2.10/gtk/Makefile.am 2006-04-08 20:58:59.000000000 -0500 @@ -31,6 +31,7 @@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ + -no-undefined -Wl,--no-undefined \ @GLIB_DEPLIBS@ \ @x_ldflags@ \ @x_libs@ \ --- gtk+-1.2.10/gdk/Makefile.am.no_undefined 2000-10-21 13:20:40.000000000 -0500 +++ gtk+-1.2.10/gdk/Makefile.am 2006-04-08 20:58:18.000000000 -0500 @@ -21,6 +21,7 @@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ + -no-undefined -Wl,--no-undefined \ @GLIB_DEPLIBS@ \ @x_ldflags@ \ @x_libs@ \ gtk+-1.2.10-pixmapref.patch: --- NEW FILE gtk+-1.2.10-pixmapref.patch --- --- gtk+-1.2.10/gtk/gtkstyle.c.pixmapref Tue Feb 20 11:46:58 2001 +++ gtk+-1.2.10/gtk/gtkstyle.c Sun Aug 12 15:42:06 2001 @@ -348,8 +348,9 @@ new_style->bg[i] = style->bg[i]; new_style->text[i] = style->text[i]; new_style->base[i] = style->base[i]; - - new_style->bg_pixmap[i] = style->bg_pixmap[i]; + + if (style->bg_pixmap[i] && !(style->rc_style && style->rc_style->bg_pixmap_name[i])) + new_style->bg_pixmap[i] = gdk_pixmap_ref (style->bg_pixmap[i]); } gdk_font_unref (new_style->font); gtk+-1.2.10-ppc64.patch: --- NEW FILE gtk+-1.2.10-ppc64.patch --- --- gtk+-1.2.10/ltconfig.ppc64 2005-11-01 11:11:27.000000000 -0500 +++ gtk+-1.2.10/ltconfig 2005-11-01 11:12:42.000000000 -0500 @@ -1968,7 +1968,7 @@ shlibpath_overrides_runpath=no deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + file_magic_test_file=`echo /lib{,64}/libc.so* /lib{,64}/libc-*.so` if test -f /lib/ld.so.1; then dynamic_linker='GNU ld.so' gtk+-1.2.10-themeswitch.patch: --- NEW FILE gtk+-1.2.10-themeswitch.patch --- --- gtk+-1.2.10/gtk/gtkwindow.c.themeswitch Mon Aug 13 13:42:05 2001 +++ gtk+-1.2.10/gtk/gtkwindow.c Mon Aug 13 13:42:05 2001 @@ -859,13 +859,60 @@ GTK_OBJECT_CLASS(parent_class)->finalize (object); } + +static void +reread_rc_files () +{ + if (gtk_rc_reparse_all ()) + { + /* If the above returned true, some of our RC files are out + * of date, so we need to reset all our widgets. Our other + * toplevel windows will also get the message, but by + * then, the RC file will up to date, so we have to tell + * them now. + */ + GList *toplevels; + + toplevels = gtk_container_get_toplevels(); + while (toplevels) + { + gtk_widget_reset_rc_styles (toplevels->data); + toplevels = toplevels->next; + } + } +} + static void gtk_window_show (GtkWidget *widget) { GtkWindow *window = GTK_WINDOW (widget); GtkContainer *container = GTK_CONTAINER (window); gboolean need_resize; + GList *toplevels; + gboolean had_visible = FALSE; + /* If we have no windows shown at this point, then check for + * theme changes before showing the window. We really should + * be checking realized, not shown, but shown => realized, + * and checking in realize might cause reentrancy problems. + * + * Plus, this allows us to get the new size right before + * realizing. + */ + toplevels = gtk_container_get_toplevels (); + while (toplevels) + { + if (GTK_WIDGET_VISIBLE (toplevels->data)) + { + had_visible = TRUE; + break; + } + toplevels = toplevels->next; + } + + if (!had_visible) + reread_rc_files (); + GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE); need_resize = container->need_resize || !GTK_WIDGET_REALIZED (widget); @@ -1480,23 +1527,7 @@ } } - if (gtk_rc_reparse_all ()) - { - /* If the above returned true, some of our RC files are out - * of date, so we need to reset all our widgets. Our other - * toplevel windows will also get the message, but by - * then, the RC file will up to date, so we have to tell - * them now. - */ - GList *toplevels; - - toplevels = gtk_container_get_toplevels(); - while (toplevels) - { - gtk_widget_reset_rc_styles (toplevels->data); - toplevels = toplevels->next; - } - } + reread_rc_files (); } static gint gtk+-1.2.10-troughpaint.patch: --- NEW FILE gtk+-1.2.10-troughpaint.patch --- Index: gtk/gtkrange.c =================================================================== RCS file: /cvs/gnome/gtk+/gtk/gtkrange.c,v retrieving revision 1.26.2.3 diff -u -p -r1.26.2.3 gtkrange.c --- gtk/gtkrange.c 22 Feb 2001 20:38:14 -0000 1.26.2.3 +++ gtk/gtkrange.c 19 Jul 2002 15:41:58 -0000 @@ -829,7 +828,10 @@ gtk_range_expose (GtkWidget *widget (event->area.x + event->area.width <= widget->allocation.width - trough_border) && (event->area.y + event->area.height <= - widget->allocation.height - trough_border))) + widget->allocation.height - trough_border)) || + gtk_style_get_prop_experimental (widget->style, + "GtkRange::always_draw_trough", + 0)) gtk_range_draw_trough (range); } else if (event->window == widget->window) gtk+-1.2.10-ukfont.patch: --- NEW FILE gtk+-1.2.10-ukfont.patch --- --- gtk+-1.2.10/gtk/gtkrc.uk.ukfont Wed Apr 10 19:20:40 2002 +++ gtk+-1.2.10/gtk/gtkrc.uk Wed Apr 10 19:20:56 2002 @@ -7,10 +7,10 @@ # style "gtk-default-uk" { - fontset = "-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-*,\ + fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\ -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ - -*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-u,\ - -*-arial-medium-r-normal--14-*-*-*-*-*-koi8-u,*-r-*" + -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-u,\ + -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-u,*-r-*" } class "GtkWidget" style "gtk-default-uk" --- gtk+-1.2.10/gtk/gtkrc.ru.ukfont Thu Apr 11 10:22:15 2002 +++ gtk+-1.2.10/gtk/gtkrc.ru Mon May 8 14:49:18 2000 @@ -1,7 +1,7 @@ style "gtk-default-ru" { fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\ -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ - -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ + -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r,*-r-*" } class "GtkWidget" style "gtk-default-ru" gtk+-1.2.10-utf8fontset.patch: --- NEW FILE gtk+-1.2.10-utf8fontset.patch --- --- gtk+-1.2.10/gdk/gdkfont.c.utf8fontset Sun Apr 1 22:31:25 2001 +++ gtk+-1.2.10/gdk/gdkfont.c Tue Jul 10 11:31:54 2001 @@ -26,6 +26,7 @@ #include #include +#include #include "gdk.h" #include "gdkprivate.h" @@ -173,9 +174,24 @@ if (missing_charset_count) { gint i; - g_warning ("Missing charsets in FontSet creation\n"); - for (i=0;i Received: from localhost (IDENT:otaylor at localhost [127.0.0.1]) by fresnel.labs.redhat.com (8.9.3/8.9.3) with ESMTP id OAA00891 for ; Thu, 23 Sep 1999 14:52:41 -0400 Received: from lacrosse.redhat.com by localhost with POP3 (fetchmail-5.0.0) for otaylor at localhost (single-drop); Thu, 23 Sep 1999 14:52:42 -0400 (EDT) Received: from mail.redhat.com (mail.redhat.com [199.183.24.239]) by lacrosse.corp.redhat.com (8.9.3/8.9.3) with ESMTP id OAA19205 for ; Thu, 23 Sep 1999 14:01:27 -0400 Received: from math.sci.hokudai.ac.jp (seki.math.sci.hokudai.ac.jp [133.50.152.8]) by mail.redhat.com (8.8.7/8.8.7) with ESMTP id OAA13383 for ; Thu, 23 Sep 1999 14:01:49 -0400 Received: from heathcliff (a-higuti at hilbert.math.sci.hokudai.ac.jp [133.50.152.11]) by math.sci.hokudai.ac.jp (8.8.8/3.6W01/06/98) with SMTP id DAA23889 for ; Fri, 24 Sep 1999 03:01:10 +0900 (JST) Date: Fri, 24 Sep 1999 03:01:10 +0900 (JST) Message-Id: <199909231801.DAA23889 at math.sci.hokudai.ac.jp> From: a-higuti at math.sci.hokudai.ac.jp (Akira Higuchi) To: otaylor at redhat.com Subject: Adding more gdk_isw* macros Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Status: O Lines: 528 Xref: fresnel.labs.redhat.com prog-gtk:648 Hello Owen, I'm working on adding CJK support to gnome apps, and I need your advice. As you know, gtk+-1.2 has some support for CJK. It's sufficient for most gnome apps to be internationalized, but some problems remain. The most problem is that there is no way of doing word wrapping for CJK strings. For example, gtk-xmhtml shows Japanese text very uglily, because Japanese sentences are recognized as very long words. (a Japanese sentence contain any spaces in most cases.) The same problem is in gtk+ itself, too; Word wrapping in GtkLabel and GtkText doesn't work correctly for CJK text, because of the same reason as above. In order to fix it, we need more gdk_isw* functions than we already have in gdki18n.h. (I regret I didn't add them before gtk+-1.2 was released.) I attach herewith a patch which fixes it, but I think it's not acceptable to adding a new macro to a stable version of gtk+. (is it?) The question I want to ask you is: what's the best way of fixing the problem without adding these macros to gdki18n.h? A solution is to add these macros to each *.c files (in GtkLabel, GtkText, and gtkxmhtml etc.) rather than gtki18n.h, but it's very ugly I think. Please don't say "wait until gscript is completed" ;-( I don't want to wait for a long time. (Please let me know if I can help you with gscript BTW. I've not hacked gscript yet, because it seems to be too early to be hacked by other than you.) Thanks, Akira Higuchi ---------------- x8 ---------------- x8 ---------------- x8 ---------------- diff -ur gtk+-1.2.5-pre2/gdk/gdki18n.h gtk+-1.2.5-pre2.new/gdk/gdki18n.h --- gtk+-1.2.5-pre2/gdk/gdki18n.h Wed Jun 9 21:07:51 1999 +++ gtk+-1.2.5-pre2.new/gdk/gdki18n.h Thu Sep 23 14:59:38 1999 @@ -50,4 +50,32 @@ # define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c)) #endif +/* The following 9 macros are added in gtk+ 1.2.X. Don't use them without + * checking GTK_CHECK_VERSION. For example, + * #if GTK_CHECK_VERSION (1,2,X) + * ... code which uses gdk_iswalpha(), gdk_iswcntrl(), etc. ... + * #endif + */ +#if !defined(G_HAVE_BROKEN_WCTYPE) && (defined(G_HAVE_WCTYPE_H) || defined(G_HAVE_WCHAR_H)) && !defined(X_LOCALE) +# define gdk_iswalpha(c) iswalpha(c) +# define gdk_iswcntrl(c) iswcntrl(c) +# define gdk_iswdigit(c) iswdigit(c) +# define gdk_iswlower(c) iswlower(c) +# define gdk_iswgraph(c) iswgraph(c) +# define gdk_iswprint(c) iswprint(c) +# define gdk_iswpunct(c) iswpunct(c) +# define gdk_iswupper(c) iswupper(c) +# define gdk_iswxdigit(c) iswxdigit(c) +#else +# define gdk_iswalpha(c) ((wchar_t)(c) <= 0xFF && isalpha(c)) +# define gdk_iswcntrl(c) ((wchar_t)(c) <= 0xFF && iscntrl(c)) +# define gdk_iswdigit(c) ((wchar_t)(c) <= 0xFF && isdigit(c)) +# define gdk_iswlower(c) ((wchar_t)(c) <= 0xFF && islower(c)) +# define gdk_iswgraph(c) ((wchar_t)(c) > 0xFF || isgraph(c)) +# define gdk_iswprint(c) ((wchar_t)(c) > 0xFF || isprint(c)) +# define gdk_iswpunct(c) ((wchar_t)(c) <= 0xFF && ispunct(c)) +# define gdk_iswupper(c) ((wchar_t)(c) <= 0xFF && isupper(c)) +# define gdk_iswxdigit(c) ((wchar_t)(c) <= 0xFF && isxdigit(c)) +#endif + #endif /* __GDK_I18N_H__ */ diff -ur gtk+-1.2.5-pre2/gtk/gtkentry.c gtk+-1.2.5-pre2.new/gtk/gtkentry.c --- gtk+-1.2.5-pre2/gtk/gtkentry.c Wed Aug 18 14:23:53 1999 +++ gtk+-1.2.5-pre2.new/gtk/gtkentry.c Thu Sep 23 00:22:21 1999 @@ -1943,11 +1943,21 @@ gtk_move_backward_word (GTK_ENTRY (editable)); } +static gboolean +alnum_or_ideogram (GtkEntry *entry, guint index) +{ + GdkWChar ch; + ch = entry->text[index]; + if (entry->use_wchar) + return !(gdk_iswpunct (ch) || gdk_iswcntrl (ch) || gdk_iswspace (ch)); + else + return !(ispunct (ch) || iscntrl (ch) || isspace (ch)); +} + static void gtk_move_forward_word (GtkEntry *entry) { GtkEditable *editable; - GdkWChar *text; gint i; editable = GTK_EDITABLE (entry); @@ -1961,21 +1971,12 @@ if (entry->text && (editable->current_pos < entry->text_length)) { - text = entry->text; - i = editable->current_pos; - - if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i]))) - for (; i < entry->text_length; i++) - { - if ((entry->use_wchar) ? gdk_iswalnum (text[i]) : isalnum (text[i])) - break; - } - + for (i = editable->current_pos; i < entry->text_length; i++) + if (alnum_or_ideogram (entry, i)) + break; for (; i < entry->text_length; i++) - { - if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i]))) - break; - } + if (!alnum_or_ideogram (entry, i)) + break; editable->current_pos = i; } @@ -1985,7 +1986,6 @@ gtk_move_backward_word (GtkEntry *entry) { GtkEditable *editable; - GdkWChar *text; gint i; editable = GTK_EDITABLE (entry); @@ -1999,26 +1999,19 @@ if (entry->text && editable->current_pos > 0) { - text = entry->text; - i = editable->current_pos - 1; - if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i]))) - for (; i >= 0; i--) + for (i = editable->current_pos - 1; i >= 0; i--) + if (alnum_or_ideogram (entry, i)) + break; + for (; i >= 0; i--) + if (!alnum_or_ideogram (entry, i)) { - if ((entry->use_wchar) ? gdk_iswalnum (text[i]) : isalnum (text[i])) - break; + i++; + break; } - for (; i >= 0; i--) - { - if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i]))) - { - i++; - break; - } - } - + if (i < 0) i = 0; - + editable->current_pos = i; } } diff -ur gtk+-1.2.5-pre2/gtk/gtklabel.c gtk+-1.2.5-pre2.new/gtk/gtklabel.c --- gtk+-1.2.5-pre2/gtk/gtklabel.c Wed Jun 9 20:40:13 1999 +++ gtk+-1.2.5-pre2.new/gtk/gtklabel.c Thu Sep 23 11:29:25 1999 @@ -56,6 +56,7 @@ GtkLabelWord *next; gint uline_y; GtkLabelULine *uline; + gboolean paragraph_break; }; struct _GtkLabelULine @@ -396,6 +397,7 @@ word->beginning = NULL; word->next = NULL; word->uline = NULL; + word->paragraph_break = FALSE; return word; } @@ -441,6 +443,7 @@ if (str == label->label_wc || str[-1] == '\n') { /* Paragraph break */ + word->paragraph_break = TRUE; word->space = 0; max_line_width = MAX (line_width, max_line_width); @@ -488,6 +491,7 @@ { word = gtk_label_word_alloc (); + word->paragraph_break = TRUE; word->space = 0; word->beginning = str; word->length = 0; @@ -500,6 +504,13 @@ return MAX (line_width, max_line_width); } +static gboolean +is_ideogram (GdkWChar wc) +{ + return !(gdk_iswalnum (wc) || gdk_iswspace (wc) || + gdk_iswpunct (wc) || gdk_iswcntrl (wc)); +} + /* this needs to handle white space better. */ static gint gtk_label_split_text_wrapped (GtkLabel *label) @@ -526,6 +537,7 @@ if (str == label->label_wc || str[-1] == '\n') { /* Paragraph break */ + word->paragraph_break = TRUE; word->space = 0; max_line_width = MAX (line_width, max_line_width); @@ -546,24 +558,30 @@ else word->space = space_width * nspaces; } - else + else if (gdk_iswspace (str[-1])) { /* Regular inter-word space */ word->space = space_width; } + else + { + word->space = 0; + } word->beginning = str; word->length = 0; p = word->beginning; while (*p && !gdk_iswspace (*p)) { + if (word->length > 0 && (is_ideogram (p[-1]) || is_ideogram (*p))) + break; word->length++; p++; } word->width = gdk_text_width_wc (GTK_WIDGET (label)->style->font, str, word->length); str += word->length; - if (*str) + if (*str && gdk_iswspace (*str)) str++; line_width += word->space + word->width; @@ -600,7 +618,7 @@ width = 0; for (word = label->words; word; word = word->next) { - if (word->space == 0 + if (word->paragraph_break || (line_width && (line_width >= min_width || line_width + word->width + word->space > max_width))) @@ -716,7 +734,8 @@ GtkLabelWord *word, *line, *next_line; GtkWidget *widget; gchar *ptrn; - gint x, y, space, extra_width, add_space, baseline_skip; + gint x, y, space, num_words, extra_width, add_space, baseline_skip; + gboolean deliver_equivalently; g_return_if_fail (label->wrap); @@ -724,20 +743,24 @@ y = 0; baseline_skip = (GTK_WIDGET (label)->style->font->ascent + GTK_WIDGET (label)->style->font->descent + 1); + deliver_equivalently = FALSE; for (line = label->words; line != 0; line = next_line) { - space = 0; + space = num_words = 0; extra_width = max_line_width - line->width; for (next_line = line->next; next_line; next_line = next_line->next) { - if (next_line->space == 0) + if (next_line->paragraph_break) break; /* New paragraph */ if (next_line->space + next_line->width > extra_width) break; + if (next_line->space == 0) + deliver_equivalently = TRUE; /* An ideogram is found. */ extra_width -= next_line->space + next_line->width; space += next_line->space; + num_words++; } line->x = 0; @@ -747,14 +770,18 @@ for (word = line->next; word != next_line; word = word->next) { - if (next_line && next_line->space) + if (next_line && !next_line->paragraph_break && + label->jtype == GTK_JUSTIFY_FILL && + (deliver_equivalently ? num_words : space) > 0) { - /* Not last line of paragraph --- fill line if needed */ - if (label->jtype == GTK_JUSTIFY_FILL) { + /* Not last line of paragraph --- fill line */ + if (deliver_equivalently) + add_space = (extra_width + num_words / 2) / num_words; + else add_space = (extra_width * word->space + space / 2) / space; - extra_width -= add_space; - space -= word->space; - } + extra_width -= add_space; + space -= word->space; + num_words--; } word->x = x + word->space + add_space; @@ -925,7 +952,7 @@ for (word = label->words; word; word = word->next) { - gchar save = word->beginning[word->length]; + GdkWChar save = word->beginning[word->length]; word->beginning[word->length] = '\0'; gtk_label_paint_word (label, x, y, word, &event->area); word->beginning[word->length] = save; diff -ur gtk+-1.2.5-pre2/gtk/gtktext.c gtk+-1.2.5-pre2.new/gtk/gtktext.c --- gtk+-1.2.5-pre2/gtk/gtktext.c Sat Sep 4 08:50:38 1999 +++ gtk+-1.2.5-pre2.new/gtk/gtktext.c Thu Sep 23 00:21:40 1999 @@ -101,6 +101,13 @@ ARG_WORD_WRAP }; +typedef enum { + CHAR_CLASS_SPACE, + CHAR_CLASS_ALNUM, + CHAR_CLASS_IDEOGRAM, + CHAR_CLASS_OTHERS /* punct, cntrl */ +} CharClass; + typedef struct _TextProperty TextProperty; typedef struct _TabStopMark TabStopMark; typedef struct _PrevTabCont PrevTabCont; @@ -298,6 +305,8 @@ const GtkPropertyMark *mark, const PrevTabCont *tab_cont, PrevTabCont *next_cont); +static void find_word_wrap_position (GtkText* text, LineParams *lp); +static CharClass char_class (GtkText* text, guint index); static void recompute_geometry (GtkText* text); static void insert_expose (GtkText* text, guint old_pixels, gint nchars, guint new_line_count); static void delete_expose (GtkText* text, @@ -4084,27 +4093,21 @@ undraw_cursor (text, FALSE); - if (text->use_wchar) + while (!LAST_INDEX (text, text->cursor_mark)) { - while (!LAST_INDEX (text, text->cursor_mark) && - !gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index))) - advance_mark (&text->cursor_mark); - - while (!LAST_INDEX (text, text->cursor_mark) && - gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index))) - advance_mark (&text->cursor_mark); + CharClass cc = char_class (text, text->cursor_mark.index); + if (cc == CHAR_CLASS_ALNUM || cc == CHAR_CLASS_IDEOGRAM) + break; + advance_mark (&text->cursor_mark); } - else + while (!LAST_INDEX (text, text->cursor_mark)) { - while (!LAST_INDEX (text, text->cursor_mark) && - !isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index))) - advance_mark (&text->cursor_mark); - - while (!LAST_INDEX (text, text->cursor_mark) && - isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index))) - advance_mark (&text->cursor_mark); + CharClass cc = char_class (text, text->cursor_mark.index); + if (cc != CHAR_CLASS_ALNUM && cc != CHAR_CLASS_IDEOGRAM) + break; + advance_mark (&text->cursor_mark); } - + find_cursor (text, TRUE); draw_cursor (text, FALSE); } @@ -4116,25 +4119,19 @@ undraw_cursor (text, FALSE); - if (text->use_wchar) + while (text->cursor_mark.index > 0) { - while ((text->cursor_mark.index > 0) && - !gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1))) - decrement_mark (&text->cursor_mark); - - while ((text->cursor_mark.index > 0) && - gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1))) - decrement_mark (&text->cursor_mark); + CharClass cc = char_class (text, text->cursor_mark.index - 1); + if (cc == CHAR_CLASS_ALNUM || cc == CHAR_CLASS_IDEOGRAM) + break; + decrement_mark (&text->cursor_mark); } - else + while (text->cursor_mark.index > 0) { - while ((text->cursor_mark.index > 0) && - !isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1))) - decrement_mark (&text->cursor_mark); - - while ((text->cursor_mark.index > 0) && - isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1))) - decrement_mark (&text->cursor_mark); + CharClass cc = char_class (text, text->cursor_mark.index - 1); + if (cc != CHAR_CLASS_ALNUM && cc != CHAR_CLASS_IDEOGRAM) + break; + decrement_mark (&text->cursor_mark); } find_cursor (text, TRUE); @@ -4755,27 +4752,8 @@ GtkPropertyMark saved_mark = lp.end; guint saved_characters = lp.displayable_chars; - lp.displayable_chars += 1; - - if (text->use_wchar) - { - while (!gdk_iswspace (GTK_TEXT_INDEX (text, lp.end.index)) && - (lp.end.index > lp.start.index)) - { - decrement_mark (&lp.end); - lp.displayable_chars -= 1; - } - } - else - { - while (!isspace(GTK_TEXT_INDEX (text, lp.end.index)) && - (lp.end.index > lp.start.index)) - { - decrement_mark (&lp.end); - lp.displayable_chars -= 1; - } - } - + find_word_wrap_position (text, &lp); + /* If whole line is one word, revert to char wrapping */ if (lp.end.index == lp.start.index) { @@ -4821,6 +4799,54 @@ lp.tab_cont_next = *next_cont; return lp; +} + +static CharClass +char_class (GtkText* text, guint index) +{ + GdkWChar wc; + wc = GTK_TEXT_INDEX (text, index); + if (text->use_wchar) + { + if (gdk_iswspace (wc)) + return CHAR_CLASS_SPACE; + else if (gdk_iswalnum (wc)) + return CHAR_CLASS_ALNUM; + else if (gdk_iswpunct (wc) || gdk_iswcntrl (wc)) + return CHAR_CLASS_OTHERS; + else + return CHAR_CLASS_IDEOGRAM; + } + else + { + if (isspace (wc)) + return CHAR_CLASS_SPACE; + else if (isalnum (wc)) + return CHAR_CLASS_ALNUM; + else if (ispunct (wc) || iscntrl (wc)) + return CHAR_CLASS_OTHERS; + else + return CHAR_CLASS_IDEOGRAM; + } +} + +static void +find_word_wrap_position (GtkText* text, LineParams *lp) +{ + while (lp->end.index > lp->start.index && + char_class (text, lp->end.index) != CHAR_CLASS_SPACE && + char_class (text, lp->end.index) != CHAR_CLASS_IDEOGRAM && + char_class (text, lp->end.index - 1) != CHAR_CLASS_IDEOGRAM) + { + decrement_mark (&lp->end); + lp->displayable_chars -= 1; + } + + /* lp->end.index points the position to be cut just now. If it's not a + * space, move it to the next display line. */ + if (lp->end.index > lp->start.index && + char_class (text, lp->end.index) != CHAR_CLASS_SPACE) + decrement_mark (&lp->end); } static void ---------------- x8 ---------------- x8 ---------------- x8 ---------------- -------------------------------------- Akira Higuchi Dept. of Mathematics, Hokkaido Univ. Hokkaido, Japan Email: a-higuti at math.sci.hokudai.ac.jp gtk+-1.2.8-wrap-alnum.patch: --- NEW FILE gtk+-1.2.8-wrap-alnum.patch --- --- gtk+-1.2.8/gtk/gtklabel.c.alnum Wed Jan 24 05:56:00 2001 +++ gtk+-1.2.8/gtk/gtklabel.c Wed Jan 24 07:44:22 2001 @@ -507,8 +507,11 @@ static gboolean is_ideogram (GdkWChar wc) { - return !(gdk_iswalnum (wc) || gdk_iswspace (wc) || - gdk_iswpunct (wc) || gdk_iswcntrl (wc)); + if (gdk_iswalpha (wc) && (!gdk_iswupper (wc) && !gdk_iswlower (wc))) + return TRUE; + + return !(gdk_iswspace (wc) || gdk_iswalnum (wc) || + gdk_iswpunct (wc) || gdk_iswcntrl (wc)); } /* this needs to handle white space better. */ gtk+-underquoted.patch: --- NEW FILE gtk+-underquoted.patch --- --- gtk+-1.2.10/gtk.m4.underquoted 2004-08-15 22:20:34.253447389 +0100 +++ gtk+-1.2.10/gtk.m4 2004-08-15 22:20:47.874844660 +0100 @@ -4,7 +4,7 @@ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl -AC_DEFUN(AM_PATH_GTK, +AC_DEFUN([AM_PATH_GTK], [dnl dnl Get the cflags and libraries from the gtk-config script dnl --- NEW FILE gtk+.spec --- Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk+ Epoch: 1 Version: 1.2.10 Release: 52%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.gtk.org/ Source: ftp://ftp.gimp.org/pub/gtk/v1.2/gtk+-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: gtkrc-default Source2: gtk+-pofiles.tar.gz Source3: gtkrc.ja.utf8 Source4: gtkrc.ko.utf8 Source5: gtkrc.zh_CN.utf8 Source6: gtkrc.zh_TW.utf8 Patch1: gtk+-1.2.6-ahiguti.patch Patch5: gtk+-1.2.8-wrap-alnum.patch # Supress alignment warnings on ia64 Patch10: gtk+-1.2.10-alignment.patch # Improve exposure compression Patch11: gtk+-1.2.10-expose.patch # Handle focus tracking for embedded window properly Patch12: gtk+-1.2.10-focus.patch # Find gtkrc files for the current encoding better Patch13: gtk+-1.2.10-encoding.patch # Don't screw up CTEXT encoding for UTF-8 Patch14: gtk+-1.2.10-ctext.patch # Don't warn about missing fonts for UTF-8 Patch15: gtk+-1.2.10-utf8fontset.patch # Accept KP_Enter as a synonym for Return everywhere Patch16: gtk+-1.2.10-kpenter.patch # Allow theme switching to work properly when no windows are realized Patch17: gtk+-1.2.10-themeswitch.patch # Fix crash when switching themes Patch18: gtk+-1.2.10-pixmapref.patch # Fix computation of width of missing characters Patch19: gtk+-1.2.10-missingchar.patch # Fix sizes of Ukrainian fontsets Patch20: gtk+-1.2.10-ukfont.patch # Fix file selection delete-dir when changing directory problem # also, fix memory corruption problem when changing directories. Patch21: gtk+-1.2.10-deletedir.patch # Improve warning for missing fonts Patch22: gtk+-1.2.10-fontwarning.patch # Allow themes to make scrollbar trough always repaint Patch23: gtk+-1.2.10-troughpaint.patch # Fix a crash that can happen in some apps when the current # locale is not supported by XLib. Patch24: gtk+-1.2.10-localecrash.patch # Patch from CVS to fix b.g.o #56349 Patch26: gtk+-1.2.10-dndorder.patch # Patch from CVS to fix b.g.o #94812 Patch27: gtk+-1.2.10-clistfocusrow.patch # Fix GTK+ to obey X server's default bell volume Patch28: gtk+-1.2.10-bellvolume.patch # Hack up the configure scripts to deal with some obscure # breakage with ancient libtool Patch29: gtk+-1.2.10-libtool.patch # Add a dependency on libgdk to libgtk Patch30: gtk+-1.2.10-gtkgdkdep.patch Patch31: gtk+-underquoted.patch Patch32: gtk+-1.2.10-ppc64.patch # do not allow for undefined symbols in shared libraries -- Rex Patch33: gtk+-1.2.10-no_undefined.patch BuildRequires: glib-devel >= 1:%{version} BuildRequires: automake14 autoconf213 BuildRequires: libtool BuildRequires: gettext ## This can theoretically be used for legacy -- Rex %if "%{?fedora}" > "4" BuildRequires: libX11-devel libXext-devel libXi-devel libXt-devel %else BuildRequires: XFree86-devel %endif ## *very* old, deprecated Obsoletes (pun intended) -- Rex #Obsoletes: gtk ## auto-req -- Rex #Requires: glib >= 1:%{version} # The highly broken gdk-pixbuf circular dependency is # added so that when you install gtk+, you get the # dependencies you need for the Bluecurve GTK+-1.2 theme # engine that redhat-artwork installs without proper # dependencies. # ## Ack, No-way, hosay. -- Rex # Requires: gdk-pixbuf >= 0.18.0 %description The gtk+ package contains the GIMP ToolKit (GTK+), a library for creating graphical user interfaces for the X Window System. GTK+ was originally written for the GIMP (GNU Image Manipulation Program) image processing program, but is now used by several other programs as well. %package devel Summary: Development tools for GTK+ (GIMP ToolKit) applications Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: glib-devel Requires: pkgconfig ## this can theoretically be used for legacy -- Rex #if "%{?fedora}" > "4" Requires: libX11-devel, libXext-devel, libXi-devel #else #Requires: XFree86-devel #endif ## *very* old, deprecated Obsoletes (pun intended) -- Rex #Obsoletes: gtk-devel < %{epoch}:%{version} ## info files not included #Requires(post): /sbin/install-info #Requires(preun): /sbin/install-info %description devel Libraries, header files and documentation for developing GTK+ (GIMP ToolKit) applications. %prep %setup -q -a 2 %patch1 -p1 -b .ahiguti %patch5 -p1 -b .alnum %patch10 -p1 -b .alignment %patch11 -p1 -b .expose %patch12 -p1 -b .focus %patch13 -p1 -b .encoding %patch14 -p1 -b .ctext %patch15 -p1 -b .utf8fontset %patch16 -p1 -b .kpenter %patch17 -p1 -b .themeswitch %patch18 -p1 -b .pixmapref %patch19 -p1 -b .missingchar %patch20 -p1 -b .ukfont %patch21 -p1 -b .deletedir %patch22 -p1 -b .fontwarning %patch23 -p0 -b .troughpaint %patch24 -p1 -b .localecrash %patch26 -p0 -b .dndorder %patch27 -p0 -b .clistfocusrow %patch28 -p1 -b .bellvolume %patch29 -p1 -b .libtool %patch30 -p1 -b .gtkgdkdep %patch31 -p1 -b .underquoted %patch32 -p1 -b .ppc64 %patch33 -p1 -b .no_undefined #libtoolize --force automake-1.4 #aclocal-1.4 autoconf-2.13 autoheader-2.13 %build LIBTOOL=/usr/bin/libtool \ %configure \ --disable-static \ --with-xinput=xfree\ --with-native-locale make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool # # Make cleaned-up versions of examples and tutorial for installation # ./mkinstalldirs tmpdocs/tutorial install -p -m0644 docs/html/gtk_tut.html docs/html/gtk_tut-[0-9]*.html docs/html/*.gif tmpdocs/tutorial for dir in examples/* ; do if [ -d $dir ] ; then ./mkinstalldirs tmpdocs/$dir for file in $dir/* ; do case $file in *pre1.2.7) ;; *) install -p -m0644 $file tmpdocs/$dir ;; esac done fi done install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT/etc/gtk/gtkrc # Install some extra gtkrc files to improve functioning of GTK+ # in UTF-8 locales for Chinese, Japanese, Korean. for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} ; do install -p -m0644 $i $RPM_BUILD_ROOT/etc/gtk/ done # We don't ship the info files rm -rf $RPM_BUILD_ROOT%{_infodir} # .la fies... die die die. rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la # despite use of --disable-static, delete static libs that get built anyway rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a %find_lang %{name} # I *know* ||: isn't needed, but this could end up used by legacy %check ||: make check LIBTOOL=/usr/bin/libtool %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_libdir}/lib*.so.* %dir %{_datadir}/themes %{_datadir}/themes/Default/ %config(noreplace) %{_sysconfdir}/gtk/ %files devel %defattr(-,root,root,-) %doc tmpdocs/tutorial/ %doc tmpdocs/examples/ %{_bindir}/gtk-config %{_datadir}/aclocal/* %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_mandir}/man1/* %changelog * Mon Apr 24 2006 Rex Dieter 1:1.2.10-52 - install -m644 gtkrc ... - utf-8 specfile - comment %%fedora > 4 constructs - own %%_datadir/themes - move %%check after %%install * Sat Apr 08 2006 Rex Dieter 1:1.2.10-51 - cleanup for Extras - drop Obsoletes: gtk (that must be *way* old) - drop gdk-pixbuf debpendancy - fix/re-enable gdkgtkdep patch - no_undefined patch * Wed Mar 01 2006 Karsten Hopp 1:1.2.10-50 - BuildRequires: libXt-devel * Fri Feb 10 2006 Jesse Keating - 1:1.2.10-49.2.1 - bump again for double-long bug on ppc(64) * Tue Feb 07 2006 Jesse Keating - 1:1.2.10-49.2 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Dec 09 2005 Jesse Keating - rebuilt * Fri Nov 18 2005 Bill Nottingham 1:1.2.10-49 - Remove references to obsolete X11R6 paths * Wed Nov 16 2005 Matthias Clasen 1:1.2.10-48 - Fix Requires of -devel * Mon Nov 7 2005 Matthias Clasen 1:1.2.10-47 - Remove .la files and static libs * Tue Nov 7 2005 Matthias Clasen 1:1.2.10-46 - Rebuilt * Tue Nov 1 2005 Matthias Clasen 1:1.2.10-45 - Switch requires to modular X * Wed Mar 2 2005 Matthias Clasen 1:1.2.10-35 - Rebuild with gcc4 * Thu Feb 17 2005 Matthias Clasen 1:1.2.10-34 - Replace Copyright tag in header. * Sun Aug 15 2004 Tim Waugh 1:1.2.10-33 - Fixed underquoted m4 definition. * Thu Jun 24 2004 Matthias Clasen - add missing buildrequires (#124159) * Tue Jun 16 2004 Matthias Clasen - rebuilt for RHEL3 U3 * Tue Jun 15 2004 Elliot Lee - rebuilt * Tue Mar 02 2004 Elliot Lee - rebuilt * Fri Feb 13 2004 Elliot Lee - rebuilt * Mon Oct 27 2003 Owen Taylor 1:1.2.10-28.1 - Cave like a cheap house of cards and add gdk-pixbuf dependency (#105613) - Add gtkrc.*.utf8 RC files for CJK (#84593) - Add a dependency on libgdk to libgtk (#106677) * Sun Jun 8 2003 Tim Powers 1:1.2.10-27.1 - build for RHEL * Wed Jun 04 2003 Elliot Lee - rebuilt * Tue Jun 3 2003 Jeff Johnson - add explicit epoch's where needed. * Thu Feb 13 2003 Elliot Lee 1.2.10-26 - Run libtoolize/auto* to get an updated libtool that recognizes ppc64 * Wed Jan 22 2003 Tim Powers - rebuilt * Wed Jan 15 2003 Owen Taylor 1.2.10-24 - Add a couple of patches from GNOME CVS, fixing a crash with CList focus row tracking, and a place where DND would get confused. - Obey the system bell volume (#74802) - Ship the pkg-config files * Mon Nov 4 2002 Tim Waugh 1.2.10-23 - Don't install files not shipped. - Fix gtk-config output for multilib archs. * Thu Aug 22 2002 Owen Taylor - Fix a crash that can happen in some apps when the current locale is not supported by XLib. (#72157) * Fri Jul 26 2002 Owen Taylor - Fix a small memory leak in the .encoding patch (Kjartan Maraas) * Fri Jul 19 2002 Alexander Larsson - Add troughpaint patch * Thu Jun 27 2002 Owen Taylor - Fix UTF-8 font specification not to pick up *-c-* fonts * Fri Jun 21 2002 Tim Powers - automated rebuild * Sun May 26 2002 Tim Powers - automated rebuild * Thu May 16 2002 Alex Larsson - Require automake 1.4 * Wed Apr 17 2002 Owen Taylor - Fix problem with incorrect directory contents when changing directories (#63726) * Mon Apr 15 2002 Havoc Pennington - merge translations * Fri Apr 12 2002 Owen Taylor - Fix filesel delete-filename-on-dir-change problem - Improve warning for missing fontset elements * Thu Apr 11 2002 Owen Taylor - Fix ukrainian font sizes, minor tweak to russian fonts (#63135) - Own /etc/gtk/ as well as the files in it (#63139) * Mon Aug 27 2001 Havoc Pennington - Add po files from sources.redhat.com * Mon Aug 13 2001 Owen Taylor - Fix problem with width computation for missing characters * Sun Aug 12 2001 Owen Taylor - Fix refcounting problem in gtk_style_copy() that might affect theme switching. (#51580) * Wed Aug 8 2001 Owen Taylor - Add fix for theme switching in nautilus sidebar tabs (and other similar situations) * Sat Jul 21 2001 Owen Taylor - Accept KP_Enter as well as Return (#21111) * Wed Jul 11 2001 Owen Taylor - Further improve exposure compression code * Tue Jul 10 2001 Owen Taylor - Omit warnings about character sets not found in fontset, if current locale is UTF-8 based. (Hack!) * Tue Jul 3 2001 Owen Taylor - Add patch for alignment warnings on ia64 - Add from Alex to vastly improve expose compression - Add patch to fix focus tracking for embedded windows - Add patch by Pablo Saratxaga to improve encoding handling - Add patch to not screw up CTEXT for UTF-8 locales * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. * Tue Apr 17 2001 Jonathan Blandford - Upped to version 1.2.10 * Thu Mar 15 2001 Havoc Pennington - translations * Fri Mar 9 2001 Owen Taylor - Fix problem with focus and no window manager running - Fix freeing NULL event when copying without a current event * Mon Mar 5 2001 Trond Eivind Glomsrod - langify * Mon Mar 05 2001 Owen Taylor - Version 1.2.9 - Patch to fix problem with menus not popping down * Thu Mar 01 2001 Owen Taylor - Version 1.2.9pre4 * Wed Feb 28 2001 Owen Taylor - Version 1.2.9pre3 * Thu Feb 15 2001 Owen Taylor - Version 1.2.9pre1 * Sat Feb 10 2001 Owen Taylor - Fix stupid mistake in last version of patch * Sat Feb 10 2001 Owen Taylor - New version of theme patch. * Wed Jan 24 2001 Matt Wilson - Japanese ideographs now show up in iswalnum, don't include it in the ideograph check (Patch5: gtk+-1.2.8-wrap-alnum.patch) * Tue Nov 21 2000 Owen Taylor - Add patch for enabling better themes * Thu Oct 19 2000 Elliot Lee - Fix bug in shm patch error handling. * Fri Aug 18 2000 Jakub Jelinek - fix GtkClist bug * Sat Aug 12 2000 Owen Taylor - Add patch to reduce shm segment usage from 6 to 1 * Fri Aug 11 2000 Jonathan Blandford - Up Epoch and release * Wed Jul 19 2000 Owen Taylor - Add BuildPreReq on glib = %{version} * Thu Jul 13 2000 Prospector - automatic rebuild * Fri Jun 9 2000 Matt Wilson - rebuilt with corrected compiler to fix ABI breakage - FHS packaging. * Thu May 25 2000 Owen Taylor - Version 1.2.8 * Fri May 12 2000 Matt Wilson - reapply gtkrc fixes for various locales * Mon May 1 2000 Matt Wilson - build package version 1.2.7 * Mon Feb 21 2000 Owen Taylor - Fix weird excess " problem that somehow turned up in /etc/gtkrc.LANG * Mon Feb 14 2000 Owen Taylor - More patches from 1.2.7 * Fri Feb 04 2000 Owen Taylor - Set the charset explicitely for the default font to avoid problems with XFree86-4.0 where the default charset is iso10646-1, not iso8859-1. - Fix problems with size requisitions for scrolled windows that was causing looping. (RH bug #7997) * Thu Feb 03 2000 Owen Taylor - Explicitely set the foreground of the tooltips to black to avoid bad interactions with themes that set a light foreground color. * Thu Feb 03 2000 Owen Taylor - Added large patch of bugfixes in stable branch of CVS * Tue Oct 12 1999 Owen Taylor - Added Akira Higuti's patch for line-wrapping in GTK+ * Thu Oct 7 1999 Owen Taylor - version 1.2.6 * Thu Sep 23 1999 Owen Taylor - version 1.2.5 - install tutorial GIFs * Wed Sep 22 1999 Owen Taylor - Upgrade to real 1.2.5pre2 - Changed name so upgrade to 1.2.5 will work :-( - Add extra gtkrc files - Add examples and English language tutorial to -devel package * Fri Sep 17 1999 Owen Taylor - Upgraded to 1.2.5pre2. (Actually, pre-pre-2) * Tue Aug 17 1999 Michael Fulbright - added threaded patch * Mon Jun 7 1999 Owen Taylor - Update for GTK+-1.2.3 - Patches that will be in GTK+-1.2.4 - Patch to keep GTK+ from coredumping on X IO errors - Patch to improve compatilibity with GTK-1.2.1 (allow event mask to be set on realized widgets) * Mon Apr 19 1999 Michael Fulbright - fixes memory leak * Mon Apr 12 1999 Owen Taylor - The important bug fixes that will be in GTK+-1.2.2 * Thu Apr 01 1999 Michael Fulbright - patches from owen to handle various gdk bugs * Sun Mar 28 1999 Michael Fulbright - added XFree86-devel requirement for gtk+-devel * Thu Mar 25 1999 Michael Fulbright - version 1.2.1 * Wed Mar 17 1999 Michael Fulbright - removed /usr/info/dir.gz file from package * Fri Feb 26 1999 Michael Fulbright - Version 1.2.0 * Thu Feb 25 1999 Michael Fulbright - version 1.2.0pre2, patched to use --sysconfdir=/etc * Mon Feb 15 1999 Michael Fulbright - patched in Owen's patch to fix Metal theme * Fri Feb 05 1999 Michael Fulbright - bumped up to 1.1.15 * Wed Feb 03 1999 Michael Fulbright - bumped up to 1.1.14 * Mon Jan 18 1999 Michael Fulbright - bumped up to 1.1.13 * Wed Jan 06 1999 Michael Fulbright - bumped up to 1.1.12 * Wed Dec 16 1998 Michael Fulbright - added Theme directory to file list - up to 1.1.7 for GNOME freeze * Sun Oct 25 1998 Shawn T. Amundson - Fixed Source: to point to v1.1 * Tue Aug 04 1998 Michael Fulbright - change %postun to %preun * Mon Jun 27 1998 Shawn T. Amundson - Changed version to 1.1.0 * Thu Jun 11 1998 Dick Porter - Removed glib, since it is its own module now * Mon Apr 13 1998 Marc Ewing - Split out glib package * Tue Apr 8 1998 Shawn T. Amundson - Changed version to 1.0.0 * Tue Apr 7 1998 Owen Taylor - Changed version to 0.99.10 * Thu Mar 19 1998 Shawn T. Amundson - Changed version to 0.99.9 - Changed gtk home page to www.gtk.org * Thu Mar 19 1998 Shawn T. Amundson - Changed version to 0.99.8 * Sun Mar 15 1998 Marc Ewing - Added aclocal and bin stuff to file list. - Added -k to the SMP make line. - Added lib/glib to file list. * Fri Mar 14 1998 Shawn T. Amundson - Changed version to 0.99.7 * Fri Mar 14 1998 Shawn T. Amundson - Updated ftp url and changed version to 0.99.6 * Thu Mar 12 1998 Marc Ewing - Reworked to integrate into gtk+ source tree - Truncated ChangeLog. Previous Authors: Trond Eivind Glomsrod Michael K. Johnson Otto Hammersmith --- NEW FILE gtkrc-default --- style "gtk-tooltips-style" { bg[NORMAL] = "#ffffc0" fg[NORMAL] = "#000000" } widget "gtk-tooltips" style "gtk-tooltips-style" style "gtk-progressbar-style" { bg[NORMAL] = "#ffffff" bg[PRELIGHT] = "#a0a0a0" } class "GtkProgressBar" style "gtk-progressbar-style" --- NEW FILE gtkrc.ja.utf8 --- style "gtk-default-ja-utf8" { fontset = "-misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0,\ -adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1,\ *-r-*" } class "GtkWidget" style "gtk-default-ja-utf8" --- NEW FILE gtkrc.ko.utf8 --- style "gtk-default-ko-utf8" { fontset = "-*-gulim*-medium-r-normal--*-120-*-*-*-*-ksc5601.1987-0,\ -*-gulim*-medium-r-normal--*-120-*-*-*-*-ksc5601.1987-0,\ -*-kodig-medium-r-normal--*-120-*-*-*-*-ksc5601.1987-0,\ -*-*-medium-r-normal--*-120-*-*-*-*-ksc5601.1987-0,\ -adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,\ *" } class "GtkWidget" style "gtk-default-ko-utf8" --- NEW FILE gtkrc.zh_CN.utf8 --- # $(gtkconfigdir)/gtkrc.zh_CN # # This file defines the fontsets for Chinese language (zh) using # the simplified chinese standard GuoBiao as in mainland China (CN) # # 1999, Pablo Saratxaga # style "gtk-default-zh-cn-utf8" { fontset = "-adobe-helvetica-medium-r-normal--16-*-*-*-*-*-iso8859-1,\ -*-*-medium-r-normal--16-*-*-*-*-*-gb2312.1980-0,*-r-*" } class "GtkWidget" style "gtk-default-zh-cn-utf8" --- NEW FILE gtkrc.zh_TW.utf8 --- # $(gtkconfigdir)/gtkrc.zh_TW # # This file defines the fontsets for Chinese language (ch) using # the traditional chinese Big5 encoding as used in Taiwan (TW) # # 1999, Pablo Saratxaga # # IMPORTANT NOTE: The name of this file *MUST* be "gtkrc.zh_TW.big5" # the lowercasing of "big5" is done on purpose, if you change it it won't work style "gtk-default-zh-tw-utf8" { fontset = "-adobe-helvetica-medium-r-normal--16-*-*-*-*-*-iso8859-1,\ -taipei-*-medium-r-normal--*-*-*-*-*-*-big5-0,\ -*-*-medium-r-normal--16-*-*-*-*-*-big5-0,*-r-*" } class "GtkWidget" style "gtk-default-zh-tw-utf8" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk+/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 May 2006 16:04:13 -0000 1.1 +++ .cvsignore 4 May 2006 16:05:38 -0000 1.2 @@ -0,0 +1,2 @@ +gtk+-1.2.10.tar.gz +gtk+-pofiles.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk+/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 May 2006 16:04:13 -0000 1.1 +++ sources 4 May 2006 16:05:38 -0000 1.2 @@ -0,0 +1,2 @@ +4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz +bd8c32890a2d6430395b0031d350b435 gtk+-pofiles.tar.gz From fedora-extras-commits at redhat.com Thu May 4 16:05:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 4 May 2006 09:05:38 -0700 Subject: rpms/gtk+ import.log,1.1,1.2 Message-ID: <200605041606.k44G6Alu018623@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk+ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508 Modified Files: import.log Log Message: auto-import gtk+-1.2.10-52 on branch devel from gtk+-1.2.10-52.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtk+/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 May 2006 16:04:13 -0000 1.1 +++ import.log 4 May 2006 16:05:38 -0000 1.2 @@ -0,0 +1 @@ +gtk+-1_2_10-52:HEAD:gtk+-1.2.10-52.src.rpm:1146758734 From fedora-extras-commits at redhat.com Thu May 4 16:16:35 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 May 2006 09:16:35 -0700 Subject: rpms/cpanspec/devel cpanspec-1.65-regex.patch, NONE, 1.1 cpanspec.spec, 1.7, 1.8 Message-ID: <200605041616.k44GGbUS019218@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19191 Modified Files: cpanspec.spec Added Files: cpanspec-1.65-regex.patch Log Message: Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). cpanspec-1.65-regex.patch: --- NEW FILE cpanspec-1.65-regex.patch --- ? Build ? META.yml ? _build ? cpanspec-1.59.tar.gz ? cpanspec-1.60.tar.gz ? cpanspec-1.61.tar.gz ? cpanspec-1.62.tar.gz ? cpanspec-1.63.tar.gz ? cpanspec-1.64.tar.gz ? cpanspec-1.65.tar.gz ? tmp Index: cpanspec =================================================================== RCS file: /cvsroot/cpanspec/cpanspec/cpanspec,v retrieving revision 1.22 diff -u -r1.22 cpanspec --- cpanspec 26 Apr 2006 21:08:45 -0000 1.22 +++ cpanspec 4 May 2006 16:12:55 -0000 @@ -393,7 +393,7 @@ if ($rendered=~/NAME\s*$args{module}\s[-\s]*(\S[^\n]*)/s) { if ($1 ne "SYNOPSIS") { $summary=$1; - $summary=~s/[.\s]+//; + $summary=~s/[.\s]+$//; $summary=~s/^A\s+//i; $summary=ucfirst($summary); } Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cpanspec.spec 26 Apr 2006 21:23:42 -0000 1.7 +++ cpanspec.spec 4 May 2006 16:16:35 -0000 1.8 @@ -1,11 +1,12 @@ Name: cpanspec Version: 1.65 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz +Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -51,6 +53,9 @@ %{_mandir}/man1/* %changelog +* Thu May 04 2006 Steven Pritchard 1.65-2 +- Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). + * Wed Apr 26 2006 Steven Pritchard 1.65-1 - Update to 1.65. - cpanget requires wget. From fedora-extras-commits at redhat.com Thu May 4 16:18:40 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 4 May 2006 09:18:40 -0700 Subject: rpms/icecast/devel icecast.init,1.2,1.3 icecast.spec,1.1,1.2 Message-ID: <200605041618.k44GIgZU019571@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/icecast/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19547 Modified Files: icecast.init icecast.spec Log Message: * Thu May 04 2006 Andreas Thienemann 2.3.1-2 - Enabled Theora Streaming Index: icecast.init =================================================================== RCS file: /cvs/extras/rpms/icecast/devel/icecast.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- icecast.init 16 Feb 2006 08:48:09 -0000 1.2 +++ icecast.init 4 May 2006 16:18:39 -0000 1.3 @@ -20,7 +20,7 @@ start) # Start daemon. echo -n $"Starting icecast streaming daemon: " - daemon /usr/bin/icecast -b -c /etc/icecast.xml + daemon "/usr/bin/icecast -b -c /etc/icecast.xml > /dev/null" RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/icecast Index: icecast.spec =================================================================== RCS file: /cvs/extras/rpms/icecast/devel/icecast.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icecast.spec 16 Feb 2006 07:23:04 -0000 1.1 +++ icecast.spec 4 May 2006 16:18:39 -0000 1.2 @@ -1,7 +1,7 @@ Summary: ShoutCast compatible streaming media server Name: icecast Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL URL: http://www.icecast.org/ @@ -18,7 +18,7 @@ BuildRequires: libvorbis-devel >= 1.0, libogg-devel >= 1.0, curl-devel >= 7.10.0 BuildRequires: libxml2-devel, libxslt-devel, speex-devel # To be enabled as soon as Fedora's libtheora supports ogg_stream_init -# BuidRequires: libtheora-devel >= 1.0 +BuildRequires: libtheora-devel >= 1.0 Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig @@ -43,7 +43,8 @@ %build # theora support is to be enabled as soon as Fedora's libtheora supports # ogg_stream_init -%configure --disable-theora +# --disable-theora +%configure %{__make} %{?_smp_mflags} @@ -89,6 +90,7 @@ userdel icecast >/dev/null 2>&1 || : fi + %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS ChangeLog @@ -105,6 +107,9 @@ %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast %changelog +* Thu May 04 2006 Andreas Thienemann 2.3.1-2 +- Enabled Theora Streaming + * Fri Feb 03 2006 Andreas Thienemann 2.3.1-1 - Updated to icecast 2.3.1-1 From fedora-extras-commits at redhat.com Thu May 4 16:32:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 May 2006 09:32:39 -0700 Subject: rpms/perl-YAML/devel .cvsignore, 1.3, 1.4 perl-YAML.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200605041632.k44GWfIH021670@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21597 Modified Files: .cvsignore perl-YAML.spec sources Log Message: Update to 0.58. Small spec cleanups. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Apr 2005 07:06:47 -0000 1.3 +++ .cvsignore 4 May 2006 16:32:39 -0000 1.4 @@ -1 +1 @@ -YAML-0.39.tar.gz +YAML-0.58.tar.gz Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-YAML.spec 14 Apr 2005 07:06:47 -0000 1.7 +++ perl-YAML.spec 4 May 2006 16:32:39 -0000 1.8 @@ -1,18 +1,16 @@ Name: perl-YAML -Version: 0.39 -Release: 2 +Version: 0.58 +Release: 1%{?dist} Summary: YAML Ain't Markup Language (tm) - -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz Patch0: %{name}-testmore054.patch 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)) +BuildRequires: perl(Test::Base) >= 0.49 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The YAML.pm module implements a YAML Loader and Dumper based on the @@ -23,33 +21,30 @@ For information on the YAML syntax, please refer to the YAML specification. - %prep %setup -q -n YAML-%{version} %patch0 -p0 - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT + make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w $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 \; -%check || : -make test +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%check +make test %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc Changes README @@ -58,8 +53,11 @@ %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* - %changelog +* Thu May 04 2006 Steven Pritchard 0.58-1 +- Update to 0.58. +- Small spec cleanups. + * Thu Apr 14 2005 Ville Skytt?? - 0.39-2 - 0.39. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Apr 2005 07:06:47 -0000 1.3 +++ sources 4 May 2006 16:32:39 -0000 1.4 @@ -1 +1 @@ -b8a49f49cb0ee6d9698807fb3f606922 YAML-0.39.tar.gz +aa5ac653057914ca995dd74de8212ebc YAML-0.58.tar.gz From fedora-extras-commits at redhat.com Thu May 4 16:36:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 May 2006 09:36:13 -0700 Subject: rpms/cpanspec/FC-5 cpanspec-1.65-regex.patch, NONE, 1.1 cpanspec.spec, 1.7, 1.8 Message-ID: <200605041636.k44GaFxJ022233@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206 Modified Files: cpanspec.spec Added Files: cpanspec-1.65-regex.patch Log Message: Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). cpanspec-1.65-regex.patch: --- NEW FILE cpanspec-1.65-regex.patch --- ? Build ? META.yml ? _build ? cpanspec-1.59.tar.gz ? cpanspec-1.60.tar.gz ? cpanspec-1.61.tar.gz ? cpanspec-1.62.tar.gz ? cpanspec-1.63.tar.gz ? cpanspec-1.64.tar.gz ? cpanspec-1.65.tar.gz ? tmp Index: cpanspec =================================================================== RCS file: /cvsroot/cpanspec/cpanspec/cpanspec,v retrieving revision 1.22 diff -u -r1.22 cpanspec --- cpanspec 26 Apr 2006 21:08:45 -0000 1.22 +++ cpanspec 4 May 2006 16:12:55 -0000 @@ -393,7 +393,7 @@ if ($rendered=~/NAME\s*$args{module}\s[-\s]*(\S[^\n]*)/s) { if ($1 ne "SYNOPSIS") { $summary=$1; - $summary=~s/[.\s]+//; + $summary=~s/[.\s]+$//; $summary=~s/^A\s+//i; $summary=ucfirst($summary); } Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cpanspec.spec 26 Apr 2006 23:07:56 -0000 1.7 +++ cpanspec.spec 4 May 2006 16:36:13 -0000 1.8 @@ -1,11 +1,12 @@ Name: cpanspec Version: 1.65 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz +Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -51,6 +53,9 @@ %{_mandir}/man1/* %changelog +* Thu May 04 2006 Steven Pritchard 1.65-2 +- Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). + * Wed Apr 26 2006 Steven Pritchard 1.65-1 - Update to 1.65. - cpanget requires wget. From fedora-extras-commits at redhat.com Thu May 4 16:37:46 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 May 2006 09:37:46 -0700 Subject: rpms/cpanspec/FC-4 cpanspec-1.65-regex.patch, NONE, 1.1 cpanspec.spec, 1.7, 1.8 Message-ID: <200605041637.k44Gbm7x022516@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22486 Modified Files: cpanspec.spec Added Files: cpanspec-1.65-regex.patch Log Message: Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). cpanspec-1.65-regex.patch: --- NEW FILE cpanspec-1.65-regex.patch --- ? Build ? META.yml ? _build ? cpanspec-1.59.tar.gz ? cpanspec-1.60.tar.gz ? cpanspec-1.61.tar.gz ? cpanspec-1.62.tar.gz ? cpanspec-1.63.tar.gz ? cpanspec-1.64.tar.gz ? cpanspec-1.65.tar.gz ? tmp Index: cpanspec =================================================================== RCS file: /cvsroot/cpanspec/cpanspec/cpanspec,v retrieving revision 1.22 diff -u -r1.22 cpanspec --- cpanspec 26 Apr 2006 21:08:45 -0000 1.22 +++ cpanspec 4 May 2006 16:12:55 -0000 @@ -393,7 +393,7 @@ if ($rendered=~/NAME\s*$args{module}\s[-\s]*(\S[^\n]*)/s) { if ($1 ne "SYNOPSIS") { $summary=$1; - $summary=~s/[.\s]+//; + $summary=~s/[.\s]+$//; $summary=~s/^A\s+//i; $summary=ucfirst($summary); } Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cpanspec.spec 26 Apr 2006 23:09:00 -0000 1.7 +++ cpanspec.spec 4 May 2006 16:37:46 -0000 1.8 @@ -1,11 +1,12 @@ Name: cpanspec Version: 1.65 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz +Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) @@ -22,6 +23,7 @@ %prep %setup -q +%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -51,6 +53,9 @@ %{_mandir}/man1/* %changelog +* Thu May 04 2006 Steven Pritchard 1.65-2 +- Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). + * Wed Apr 26 2006 Steven Pritchard 1.65-1 - Update to 1.65. - cpanget requires wget. From fedora-extras-commits at redhat.com Thu May 4 16:51:11 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 4 May 2006 09:51:11 -0700 Subject: rpms/openct/devel .cvsignore, 1.6, 1.7 openct.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200605041651.k44GpDSQ024365@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24338 Modified Files: .cvsignore openct.spec sources Log Message: * Thu May 4 2006 Ville Skytt?? - 0.6.7-1 - 0.6.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Apr 2006 14:03:56 -0000 1.6 +++ .cvsignore 4 May 2006 16:51:11 -0000 1.7 @@ -1 +1 @@ -openct-0.6.7-rc4.tar.gz +openct-0.6.7.tar.gz Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- openct.spec 26 Apr 2006 14:03:56 -0000 1.11 +++ openct.spec 4 May 2006 16:51:11 -0000 1.12 @@ -2,13 +2,13 @@ Name: openct Version: 0.6.7 -Release: 0.1.rc4%{?dist} +Release: 1%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries License: LGPL URL: http://www.opensc-project.org/ -Source0: http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc4.tar.gz +Source0: http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,7 +53,7 @@ %prep -%setup -q -n %{name}-%{version}-rc4 +%setup -q sh bootstrap # avoid standard rpaths on lib64 archs sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \ @@ -155,6 +155,9 @@ %changelog +* Thu May 4 2006 Ville Skytt?? - 0.6.7-1 +- 0.6.7. + * Wed Apr 26 2006 Ville Skytt?? - 0.6.7-0.1.rc4 - 0.6.7-rc4. - Re-enable PCSC hotplug in pcsc-lite subpackage. Index: sources =================================================================== RCS file: /cvs/extras/rpms/openct/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Apr 2006 14:03:56 -0000 1.6 +++ sources 4 May 2006 16:51:11 -0000 1.7 @@ -1 +1 @@ -261d40f71696a9a2ae168ae09e18f124 openct-0.6.7-rc4.tar.gz +1b33d319f364acafbcf130d7ba34ea4c openct-0.6.7.tar.gz From fedora-extras-commits at redhat.com Thu May 4 17:05:31 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 4 May 2006 10:05:31 -0700 Subject: rpms/opensc/devel .cvsignore, 1.7, 1.8 opensc.spec, 1.12, 1.13 sources, 1.7, 1.8 Message-ID: <200605041705.k44H5XcB026838@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26817 Modified Files: .cvsignore opensc.spec sources Log Message: * Thu May 4 2006 Ville Skytt?? - 0.11.0-1 - 0.11.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 Apr 2006 19:11:33 -0000 1.7 +++ .cvsignore 4 May 2006 17:05:31 -0000 1.8 @@ -1 +1 @@ -opensc-0.11.0-rc2.tar.gz +opensc-0.11.0.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- opensc.spec 27 Apr 2006 19:11:33 -0000 1.12 +++ opensc.spec 4 May 2006 17:05:31 -0000 1.13 @@ -2,13 +2,13 @@ Name: opensc Version: 0.11.0 -Release: 0.1.rc2%{?dist} +Release: 1%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL URL: http://www.opensc-project.org/ -Source0: http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc2.tar.gz +Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -50,7 +50,7 @@ %prep -%setup -q -n %{name}-%{version}-rc2 +%setup -q sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . @@ -136,6 +136,9 @@ %changelog +* Thu May 4 2006 Ville Skytt?? - 0.11.0-1 +- 0.11.0. + * Thu Apr 27 2006 Ville Skytt?? - 0.11.0-0.1.rc2 - 0.11.0-rc2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 27 Apr 2006 19:11:33 -0000 1.7 +++ sources 4 May 2006 17:05:31 -0000 1.8 @@ -1 +1 @@ -960e33d4328bc7ee209a7a296bfc2fcc opensc-0.11.0-rc2.tar.gz +be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:44:23 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 4 May 2006 12:44:23 -0700 Subject: rpms/git/devel .cvsignore, 1.26, 1.27 git.spec, 1.14, 1.15 sources, 1.26, 1.27 Message-ID: <200605041944.k44JiPXl031967@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31945 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Apr 2006 01:22:33 -0000 1.26 +++ .cvsignore 4 May 2006 19:44:23 -0000 1.27 @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/devel/git.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git.spec 29 Apr 2006 01:22:33 -0000 1.14 +++ git.spec 4 May 2006 19:44:23 -0000 1.15 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Apr 2006 01:22:33 -0000 1.26 +++ sources 4 May 2006 19:44:23 -0000 1.27 @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:45:14 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 12:45:14 -0700 Subject: rpms/goffice/devel goffice.spec,1.9,1.10 Message-ID: <200605041945.k44JjGLi032034@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32017 Modified Files: goffice.spec Log Message: * Tue May 2 2006 Hans de Goede 0.2.1-1 - new upstream version: 0.2.1 Index: goffice.spec =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- goffice.spec 21 Mar 2006 17:52:41 -0000 1.9 +++ goffice.spec 4 May 2006 19:45:14 -0000 1.10 @@ -1,6 +1,6 @@ Name: goffice -Version: 0.2.0 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Goffice support libraries Group: System Environment/Libraries License: GPL @@ -70,6 +70,9 @@ %changelog +* Tue May 2 2006 Hans de Goede 0.2.1-1 +- new upstream version: 0.2.1 + * Tue Mar 21 2006 Hans de Goede 0.2.0-2 - rebuild for new libgsf From fedora-extras-commits at redhat.com Thu May 4 19:45:50 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 4 May 2006 12:45:50 -0700 Subject: rpms/git/FC-5 .cvsignore, 1.26, 1.27 git.spec, 1.14, 1.15 sources, 1.26, 1.27 Message-ID: <200605041945.k44JjqpG032074@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32053 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Apr 2006 01:24:12 -0000 1.26 +++ .cvsignore 4 May 2006 19:45:50 -0000 1.27 @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git.spec 29 Apr 2006 01:24:12 -0000 1.14 +++ git.spec 4 May 2006 19:45:50 -0000 1.15 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Apr 2006 01:24:12 -0000 1.26 +++ sources 4 May 2006 19:45:50 -0000 1.27 @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:46:49 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 4 May 2006 12:46:49 -0700 Subject: rpms/git/FC-4 .cvsignore, 1.26, 1.27 git.spec, 1.14, 1.15 sources, 1.26, 1.27 Message-ID: <200605041946.k44JkpYE032156@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32133 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Apr 2006 01:27:52 -0000 1.26 +++ .cvsignore 4 May 2006 19:46:49 -0000 1.27 @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git.spec 29 Apr 2006 01:27:52 -0000 1.14 +++ git.spec 4 May 2006 19:46:49 -0000 1.15 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Apr 2006 01:27:52 -0000 1.26 +++ sources 4 May 2006 19:46:49 -0000 1.27 @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:48:01 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 4 May 2006 12:48:01 -0700 Subject: rpms/git/FC-3 .cvsignore, 1.26, 1.27 git.spec, 1.14, 1.15 sources, 1.26, 1.27 Message-ID: <200605041948.k44Jm3rR032246@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32225 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 29 Apr 2006 01:28:51 -0000 1.26 +++ .cvsignore 4 May 2006 19:48:01 -0000 1.27 @@ -1 +1 @@ -git-1.3.1.tar.gz +git-1.3.2.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- git.spec 29 Apr 2006 01:28:51 -0000 1.14 +++ git.spec 4 May 2006 19:48:01 -0000 1.15 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.2-1 +- git-1.3.2 + * Fri Apr 28 2006 Chris Wright 1.3.1-1 - git-1.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Apr 2006 01:28:51 -0000 1.26 +++ sources 4 May 2006 19:48:01 -0000 1.27 @@ -1 +1 @@ -c925fd87f01f5ba638ff06d21578405b git-1.3.1.tar.gz +df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz From fedora-extras-commits at redhat.com Thu May 4 19:48:40 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 12:48:40 -0700 Subject: rpms/goffice/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200605041948.k44JmgaS032309@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32290 Modified Files: .cvsignore sources Log Message: * Tue May 2 2006 Hans de Goede 0.2.1-1 - new upstream version: 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 00:21:28 -0000 1.3 +++ .cvsignore 4 May 2006 19:48:40 -0000 1.4 @@ -1 +1 @@ -goffice-0.2.0.tar.bz2 +goffice-0.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 00:21:28 -0000 1.3 +++ sources 4 May 2006 19:48:40 -0000 1.4 @@ -1 +1 @@ -e1f60fc9822813c6c3f20296e54928bf goffice-0.2.0.tar.bz2 +73b733556db5721ddfd5c72fc6428a15 goffice-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Thu May 4 19:49:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 4 May 2006 12:49:38 -0700 Subject: extras-buildsys/utils extras-push-all,1.2,1.3 Message-ID: <200605041949.k44Jncii032376@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32355 Modified Files: extras-push-all Log Message: -f forces repodata+repoview rebuild even if no new packages were found. Index: extras-push-all =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- extras-push-all 17 Mar 2006 07:46:49 -0000 1.2 +++ extras-push-all 4 May 2006 19:49:36 -0000 1.3 @@ -14,6 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +[ "$1" = "-f" ] && force=yes || force= dists="3 4 5 development" changed= @@ -34,6 +35,7 @@ sign_move $dist || exit $? done +[ "$force" = "yes" ] && changed="$dists" for dist in $changed ; do extras-repobuild.py $dist && extras-repoview.py $dist || exit $? done From fedora-extras-commits at redhat.com Thu May 4 21:10:24 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 14:10:24 -0700 Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-64bit.patch, NONE, 1.1 libgnomedb.spec, 1.13, 1.14 Message-ID: <200605042110.k44LAQYN005046@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5024 Modified Files: libgnomedb.spec Added Files: libgnomedb-1.9.100-64bit.patch Log Message: * Thu May 4 2006 Hans de Goede 1:1.9.100-7 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) libgnomedb-1.9.100-64bit.patch: --- NEW FILE libgnomedb-1.9.100-64bit.patch --- --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c~ 2006-05-04 22:16:54.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c 2006-05-04 22:16:54.000000000 +0200 @@ -19,6 +19,7 @@ */ #include "gnome-db-handler-filesel.h" +#include "gnome-db-entry-filesel.h" #include #include #include Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libgnomedb.spec 24 Mar 2006 10:22:02 -0000 1.13 +++ libgnomedb.spec 4 May 2006 21:10:24 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.9.100 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -18,6 +18,7 @@ Patch0: libgnomedb-1.2.0-desktop.patch Patch1: libgnomedb-1.9.100-sharp.patch Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch +Patch3: libgnomedb-1.9.100-64bit.patch %description libgnomedb is a library that eases the task of writing @@ -56,6 +57,7 @@ %patch0 -p1 -b .desktop.patch %patch1 -p1 -b .sharp %patch2 -p1 -b .unknown +%patch3 -p1 -b .64bit %build @@ -155,6 +157,9 @@ %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-7 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 From fedora-extras-commits at redhat.com Thu May 4 21:11:09 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:11:09 -0700 Subject: rpms/netpanzer - New directory Message-ID: <200605042111.k44LBBSY005152@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5126/netpanzer Log Message: Directory /cvs/extras/rpms/netpanzer added to the repository From fedora-extras-commits at redhat.com Thu May 4 21:11:10 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:11:10 -0700 Subject: rpms/netpanzer/devel - New directory Message-ID: <200605042111.k44LBCsS005155@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5126/netpanzer/devel Log Message: Directory /cvs/extras/rpms/netpanzer/devel added to the repository From fedora-extras-commits at redhat.com Thu May 4 21:11:44 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:11:44 -0700 Subject: rpms/netpanzer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605042111.k44LBk8d005204@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5176 Added Files: Makefile import.log Log Message: Setup of module netpanzer --- NEW FILE Makefile --- # Top level Makefile for module netpanzer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 4 21:11:45 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:11:45 -0700 Subject: rpms/netpanzer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605042111.k44LBlx1005207@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5176/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module netpanzer --- NEW 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 May 4 21:12:25 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 14:12:25 -0700 Subject: rpms/libgnomedb/FC-5 libgnomedb-1.9.100-64bit.patch, NONE, 1.1 libgnomedb.spec, 1.13, 1.14 Message-ID: <200605042112.k44LCR1x005256@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5233 Modified Files: libgnomedb.spec Added Files: libgnomedb-1.9.100-64bit.patch Log Message: * Thu May 4 2006 Hans de Goede 1:1.9.100-7 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) libgnomedb-1.9.100-64bit.patch: --- NEW FILE libgnomedb-1.9.100-64bit.patch --- --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c~ 2006-05-04 22:16:54.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c 2006-05-04 22:16:54.000000000 +0200 @@ -19,6 +19,7 @@ */ #include "gnome-db-handler-filesel.h" +#include "gnome-db-entry-filesel.h" #include #include #include Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/FC-5/libgnomedb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libgnomedb.spec 24 Mar 2006 14:49:54 -0000 1.13 +++ libgnomedb.spec 4 May 2006 21:12:25 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.9.100 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -18,6 +18,7 @@ Patch0: libgnomedb-1.2.0-desktop.patch Patch1: libgnomedb-1.9.100-sharp.patch Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch +Patch3: libgnomedb-1.9.100-64bit.patch %description libgnomedb is a library that eases the task of writing @@ -56,6 +57,7 @@ %patch0 -p1 -b .desktop.patch %patch1 -p1 -b .sharp %patch2 -p1 -b .unknown +%patch3 -p1 -b .64bit %build @@ -155,6 +157,9 @@ %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-7 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 From fedora-extras-commits at redhat.com Thu May 4 21:12:42 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 14:12:42 -0700 Subject: rpms/libgda/devel libgda-1.9.100-64bit.patch, NONE, 1.1 libgda.spec, 1.11, 1.12 Message-ID: <200605042112.k44LCilw005324@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5304 Modified Files: libgda.spec Added Files: libgda-1.9.100-64bit.patch Log Message: * Thu May 4 2006 Hans de Goede 1:1.9.100-5 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) libgda-1.9.100-64bit.patch: --- NEW FILE libgda-1.9.100-64bit.patch --- --- libgda-1.9.100/libgda/gda-data-model-hash.c~ 2006-05-03 23:04:11.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-hash.c 2006-05-03 23:04:11.000000000 +0200 @@ -70,7 +70,7 @@ return GDA_DATA_MODEL_HASH (model)->priv->number_of_columns; } -static GdaRow * +GdaRow * gda_data_model_hash_get_row (GdaDataModelBase *model, gint row) { gint hash_entry; --- libgda-1.9.100/libgda/gda-data-model-array.c~ 2006-05-03 22:48:02.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-array.c 2006-05-03 22:48:02.000000000 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #define PARENT_TYPE GDA_TYPE_DATA_MODEL_BASE @@ -430,7 +431,7 @@ } if (! cur) { - g_set_error (error, 0, 0, _("No specified in "), node->name); + g_set_error (error, 0, 0, _("No specified in ")); clean_field_specs (fields); return NULL; } --- libgda-1.9.100/libgda/gda-data-model-hash.h~ 2006-05-03 23:03:48.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-hash.h 2006-05-03 23:03:48.000000000 +0200 @@ -60,6 +60,7 @@ gint rownum, GdaRow *row); +GdaRow *gda_data_model_hash_get_row (GdaDataModelBase *model, gint row); G_END_DECLS --- libgda-1.9.100/providers/postgres/utils.c~ 2006-05-03 23:08:57.000000000 +0200 +++ libgda-1.9.100/providers/postgres/utils.c 2006-05-03 23:08:57.000000000 +0200 @@ -289,7 +289,7 @@ break; case GDA_VALUE_TYPE_BLOB : blob = gda_postgres_blob_new (cnc); - gda_postgres_blob_set_id (GDA_POSTRES_BLOB (blob), atoi (thevalue)); + gda_postgres_blob_set_id (GDA_POSTGRES_BLOB (blob), atoi (thevalue)); gda_value_set_blob (value, blob); break; default : --- libgda-1.9.100/providers/odbc/gda-odbc-provider.c~ 2006-05-03 23:06:12.000000000 +0200 +++ libgda-1.9.100/providers/odbc/gda-odbc-provider.c 2006-05-03 23:06:12.000000000 +0200 @@ -502,7 +502,7 @@ return FALSE; } - rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (UDWORD) name ); + rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (unsigned long) name ); if ( SQL_SUCCEEDED( rc )) { return TRUE; --- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c~ 2006-05-03 22:49:54.000000000 +0200 +++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c 2006-05-03 22:49:54.000000000 +0200 @@ -882,7 +882,7 @@ { GdaDataModel *model = NULL; gchar *sql; - gchar reference = NULL; + gchar *reference = NULL; GList *reclist; /* use the SQLite PRAGMA command to get the list of FK keys for the table */ --- libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c~ 2006-05-03 22:50:39.000000000 +0200 +++ libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c 2006-05-03 22:50:39.000000000 +0200 @@ -24,6 +24,7 @@ #include #include +#include #include "gda-sqlite.h" #include "gda-sqlite-recordset.h" #include "gda-sqlite-provider.h" --- libgda-1.9.100/providers/bdb/libmain.c~ 2006-05-04 22:41:59.000000000 +0200 +++ libgda-1.9.100/providers/bdb/libmain.c 2006-05-04 22:41:59.000000000 +0200 @@ -20,6 +20,7 @@ */ #include +#include #include "gda-bdb.h" const gchar *plugin_get_name (void); Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libgda.spec 14 Feb 2006 19:25:15 -0000 1.11 +++ libgda.spec 4 May 2006 21:12:41 -0000 1.12 @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -76,6 +76,7 @@ Patch0: libgda-1.9.100-configure.patch Patch1: libgda-1.9.100-sharp.patch Patch2: libgda-1.9.100-syslibs.patch +Patch3: libgda-1.9.100-64bit.patch %description libgda is a library that eases the task of writing @@ -211,6 +212,7 @@ %patch0 -p1 -b .configure %patch1 -p1 -b .sharp %patch2 -p1 -b .syslibs +%patch3 -p1 -b .64bit %build @@ -397,6 +399,9 @@ %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-5 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-4 - Bump release and rebuild for new gcc4.1 and glibc. - Make sqlite plugin use system sqlite not build in version From fedora-extras-commits at redhat.com Thu May 4 21:13:31 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:13:31 -0700 Subject: rpms/netpanzer import.log,1.1,1.2 Message-ID: <200605042113.k44LDX58005428@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5389 Modified Files: import.log Log Message: auto-import netpanzer-0.8-3 on branch devel from netpanzer-0.8-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/netpanzer/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 May 2006 21:11:44 -0000 1.1 +++ import.log 4 May 2006 21:13:31 -0000 1.2 @@ -0,0 +1 @@ +netpanzer-0_8-3:HEAD:netpanzer-0.8-3.src.rpm:1146777576 From fedora-extras-commits at redhat.com Thu May 4 21:13:32 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:13:32 -0700 Subject: rpms/netpanzer/devel gcc-4.1-extra-qualification.patch, NONE, 1.1 netpanzer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605042113.k44LDYDL005436@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5389/devel Modified Files: .cvsignore sources Added Files: gcc-4.1-extra-qualification.patch netpanzer.spec Log Message: auto-import netpanzer-0.8-3 on branch devel from netpanzer-0.8-3.src.rpm gcc-4.1-extra-qualification.patch: --- NEW FILE gcc-4.1-extra-qualification.patch --- diff -ur netpanzer-0.8.orig/src/Lib/Network/Address.hpp netpanzer-0.8/src/Lib/Network/Address.hpp --- netpanzer-0.8.orig/src/Lib/Network/Address.hpp 2004-10-14 10:22:50.000000000 -0300 +++ netpanzer-0.8/src/Lib/Network/Address.hpp 2006-05-01 05:58:05.000000000 -0300 @@ -34,7 +34,7 @@ /** resolves a hostname or IP-Number together with a port and returns a * new Address object. */ - static Address Address::resolve(const std::string& name, uint16_t port); + static Address resolve(const std::string& name, uint16_t port); /** returns the ip address of this Address as string */ std::string getIP() const; diff -ur netpanzer-0.8.orig/src/NetPanzer/Classes/PlayerState.hpp netpanzer-0.8/src/NetPanzer/Classes/PlayerState.hpp --- netpanzer-0.8.orig/src/NetPanzer/Classes/PlayerState.hpp 2004-12-25 20:58:39.000000000 -0200 +++ netpanzer-0.8/src/NetPanzer/Classes/PlayerState.hpp 2006-05-01 05:58:36.000000000 -0300 @@ -81,8 +81,8 @@ public: PlayerUnitConfig unit_config; - PlayerState::PlayerState(); - PlayerState::PlayerState(const PlayerState& other); + PlayerState(); + PlayerState(const PlayerState& other); void operator= (const PlayerState& other); diff -ur netpanzer-0.8.orig/src/NetPanzer/Interfaces/Console.cpp netpanzer-0.8/src/NetPanzer/Interfaces/Console.cpp --- netpanzer-0.8.orig/src/NetPanzer/Interfaces/Console.cpp 2004-11-22 14:19:54.000000000 -0200 +++ netpanzer-0.8/src/NetPanzer/Interfaces/Console.cpp 2006-05-01 05:58:56.000000000 -0300 @@ -46,7 +46,7 @@ setp(buf, buf+sizeof(buf)); } - FileStampStreamBuf::~FileStampStreamBuf() + ~FileStampStreamBuf() { sync(); if(file) --- NEW FILE netpanzer.spec --- Name: netpanzer Version: 0.8 Release: 3%{?dist} Summary: An Online Multiplayer Tactical Warfare Game Group: Amusements/Games License: GPL URL: http://netpanzer.berlios.de Source0: http://download.berlios.de/netpanzer/netpanzer-%{version}.tar.bz2 Patch0: gcc-4.1-extra-qualification.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jam, physfs-devel >= 0.1.9, desktop-file-utils, doxygen BuildRequires: SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2 #Requires: SDL >= 1.2.5, SDL_mixer >= 1.2, SDL_image >= 1.2, physfs >= 0.1.9 Requires: netpanzer-data = %{version} %description netPanzer is an online multiplayer tactical warfare game designed for FAST ACTION combat. Gameplay concentrates on the core -- no resource management is needed. The game is based on quick tactical action and unit management in real-time. Battles progress quickly and constantly as destroyed players respawn with a set of new units. Players can join or leave multiplayer games at any time. %prep %setup -q %patch0 -p1 # Strip \r from RELNOTES file sed -i 's/\r//' RELNOTES %build %configure jam %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT jam install # Install desktop item rm -f $RPM_BUILD_ROOT%{_datadir}/applications/netpanzer.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/netpanzer.xpm mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/netpanzer.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ netpanzer.desktop %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README RELNOTES TODO docs/serverhowto.html docs/tipofday.txt %{_bindir}/netpanzer %{_datadir}/applications/fedora-netpanzer.desktop %{_datadir}/icons/hicolor/48x48/apps/netpanzer.png %changelog * Thu May 4 2006 Hugo Cisneiros 0.8-3 - Changed netpanzer.png to comply with freedesktop.org standards. - Added scripts to update the icon cache after installing * Mon May 1 2006 Hugo Cisneiros 0.8-2 - Changed Package's RPM Group - Fixed Changelog entries to specify versions - Stripped '\r' EOL from RELNOTES file - Added COPYING file * Mon May 1 2006 Hugo Cisneiros 0.8-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/netpanzer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 May 2006 21:11:45 -0000 1.1 +++ .cvsignore 4 May 2006 21:13:32 -0000 1.2 @@ -0,0 +1 @@ +netpanzer-0.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/netpanzer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 May 2006 21:11:45 -0000 1.1 +++ sources 4 May 2006 21:13:32 -0000 1.2 @@ -0,0 +1 @@ +c08c1b703eac533407db02510deca68e netpanzer-0.8.tar.bz2 From fedora-extras-commits at redhat.com Thu May 4 21:13:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 May 2006 14:13:35 -0700 Subject: rpms/libgda/FC-5 libgda-1.9.100-64bit.patch, NONE, 1.1 libgda.spec, 1.11, 1.12 Message-ID: <200605042113.k44LDbe3005464@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5431 Modified Files: libgda.spec Added Files: libgda-1.9.100-64bit.patch Log Message: * Thu May 4 2006 Hans de Goede 1:1.9.100-5 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) libgda-1.9.100-64bit.patch: --- NEW FILE libgda-1.9.100-64bit.patch --- --- libgda-1.9.100/libgda/gda-data-model-hash.c~ 2006-05-03 23:04:11.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-hash.c 2006-05-03 23:04:11.000000000 +0200 @@ -70,7 +70,7 @@ return GDA_DATA_MODEL_HASH (model)->priv->number_of_columns; } -static GdaRow * +GdaRow * gda_data_model_hash_get_row (GdaDataModelBase *model, gint row) { gint hash_entry; --- libgda-1.9.100/libgda/gda-data-model-array.c~ 2006-05-03 22:48:02.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-array.c 2006-05-03 22:48:02.000000000 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #define PARENT_TYPE GDA_TYPE_DATA_MODEL_BASE @@ -430,7 +431,7 @@ } if (! cur) { - g_set_error (error, 0, 0, _("No specified in "), node->name); + g_set_error (error, 0, 0, _("No specified in ")); clean_field_specs (fields); return NULL; } --- libgda-1.9.100/libgda/gda-data-model-hash.h~ 2006-05-03 23:03:48.000000000 +0200 +++ libgda-1.9.100/libgda/gda-data-model-hash.h 2006-05-03 23:03:48.000000000 +0200 @@ -60,6 +60,7 @@ gint rownum, GdaRow *row); +GdaRow *gda_data_model_hash_get_row (GdaDataModelBase *model, gint row); G_END_DECLS --- libgda-1.9.100/providers/postgres/utils.c~ 2006-05-03 23:08:57.000000000 +0200 +++ libgda-1.9.100/providers/postgres/utils.c 2006-05-03 23:08:57.000000000 +0200 @@ -289,7 +289,7 @@ break; case GDA_VALUE_TYPE_BLOB : blob = gda_postgres_blob_new (cnc); - gda_postgres_blob_set_id (GDA_POSTRES_BLOB (blob), atoi (thevalue)); + gda_postgres_blob_set_id (GDA_POSTGRES_BLOB (blob), atoi (thevalue)); gda_value_set_blob (value, blob); break; default : --- libgda-1.9.100/providers/odbc/gda-odbc-provider.c~ 2006-05-03 23:06:12.000000000 +0200 +++ libgda-1.9.100/providers/odbc/gda-odbc-provider.c 2006-05-03 23:06:12.000000000 +0200 @@ -502,7 +502,7 @@ return FALSE; } - rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (UDWORD) name ); + rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (unsigned long) name ); if ( SQL_SUCCEEDED( rc )) { return TRUE; --- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c~ 2006-05-03 22:49:54.000000000 +0200 +++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c 2006-05-03 22:49:54.000000000 +0200 @@ -882,7 +882,7 @@ { GdaDataModel *model = NULL; gchar *sql; - gchar reference = NULL; + gchar *reference = NULL; GList *reclist; /* use the SQLite PRAGMA command to get the list of FK keys for the table */ --- libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c~ 2006-05-03 22:50:39.000000000 +0200 +++ libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c 2006-05-03 22:50:39.000000000 +0200 @@ -24,6 +24,7 @@ #include #include +#include #include "gda-sqlite.h" #include "gda-sqlite-recordset.h" #include "gda-sqlite-provider.h" --- libgda-1.9.100/providers/bdb/libmain.c~ 2006-05-04 22:41:59.000000000 +0200 +++ libgda-1.9.100/providers/bdb/libmain.c 2006-05-04 22:41:59.000000000 +0200 @@ -20,6 +20,7 @@ */ #include +#include #include "gda-bdb.h" const gchar *plugin_get_name (void); Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/FC-5/libgda.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libgda.spec 14 Feb 2006 19:25:15 -0000 1.11 +++ libgda.spec 4 May 2006 21:13:34 -0000 1.12 @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -76,6 +76,7 @@ Patch0: libgda-1.9.100-configure.patch Patch1: libgda-1.9.100-sharp.patch Patch2: libgda-1.9.100-syslibs.patch +Patch3: libgda-1.9.100-64bit.patch %description libgda is a library that eases the task of writing @@ -211,6 +212,7 @@ %patch0 -p1 -b .configure %patch1 -p1 -b .sharp %patch2 -p1 -b .syslibs +%patch3 -p1 -b .64bit %build @@ -397,6 +399,9 @@ %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-5 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-4 - Bump release and rebuild for new gcc4.1 and glibc. - Make sqlite plugin use system sqlite not build in version From fedora-extras-commits at redhat.com Thu May 4 21:46:40 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:46:40 -0700 Subject: rpms/rapidsvn - New directory Message-ID: <200605042146.k44LkgBD005720@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689/rapidsvn Log Message: Directory /cvs/extras/rpms/rapidsvn added to the repository From fedora-extras-commits at redhat.com Thu May 4 21:46:41 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:46:41 -0700 Subject: rpms/rapidsvn/devel - New directory Message-ID: <200605042146.k44LkhmA005723@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689/rapidsvn/devel Log Message: Directory /cvs/extras/rpms/rapidsvn/devel added to the repository From fedora-extras-commits at redhat.com Thu May 4 21:46:57 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:46:57 -0700 Subject: rpms/rapidsvn Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605042146.k44LkxjC005772@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5739 Added Files: Makefile import.log Log Message: Setup of module rapidsvn --- NEW FILE Makefile --- # Top level Makefile for module rapidsvn all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 4 21:46:57 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:46:57 -0700 Subject: rpms/rapidsvn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605042147.k44LkxxD005775@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5739/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rapidsvn --- NEW 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 May 4 21:48:04 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:48:04 -0700 Subject: rpms/rapidsvn import.log,1.1,1.2 Message-ID: <200605042148.k44LmaRt005849@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5812 Modified Files: import.log Log Message: auto-import rapidsvn-0.9.1-3 on branch devel from rapidsvn-0.9.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 May 2006 21:46:57 -0000 1.1 +++ import.log 4 May 2006 21:48:04 -0000 1.2 @@ -0,0 +1 @@ +rapidsvn-0_9_1-3:HEAD:rapidsvn-0.9.1-3.src.rpm:1146779276 From fedora-extras-commits at redhat.com Thu May 4 21:48:05 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:48:05 -0700 Subject: rpms/rapidsvn/devel rapidsvn-0.9.1-gcc41.patch, NONE, 1.1 rapidsvn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605042148.k44Lmbwm005851@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5812/devel Modified Files: .cvsignore sources Added Files: rapidsvn-0.9.1-gcc41.patch rapidsvn.spec Log Message: auto-import rapidsvn-0.9.1-3 on branch devel from rapidsvn-0.9.1-3.src.rpm rapidsvn-0.9.1-gcc41.patch: --- NEW FILE rapidsvn-0.9.1-gcc41.patch --- --- rapidsvn-0.9.1/src/action.hpp 2006-02-14 15:30:20.000000000 +0100 +++ rapidsvn-0.9.1-edited/src/action.hpp 2006-04-03 23:24:33.000000000 +0200 @@ -300,7 +300,7 @@ * @return temporary filename */ svn::Path - Action::GetPathAsTempFile ( + GetPathAsTempFile ( const svn::Path & path, const svn::Revision & revision = svn::Revision::HEAD); --- rapidsvn-0.9.1/src/rapidsvn_frame.hpp 2006-02-14 15:30:20.000000000 +0100 +++ rapidsvn-0.9.1-edited/src/rapidsvn_frame.hpp 2006-04-03 23:28:22.000000000 +0200 @@ -161,7 +161,7 @@ // Enable/disable action menu items bool - RapidSvnFrame::ValidateIDActionFlags (int id, unsigned int selectionActionFlags); + ValidateIDActionFlags (int id, unsigned int selectionActionFlags); void OnUpdateCommand (wxUpdateUIEvent & updateUIEvent); const svn::Targets --- rapidsvn-0.9.1/src/preferences_dlg.cpp 2006-02-14 15:30:20.000000000 +0100 +++ rapidsvn-0.9.1-edited/src/preferences_dlg.cpp 2006-04-03 23:30:23.000000000 +0200 @@ -95,7 +95,7 @@ { public: - ProgramsPanel::ProgramsPanel (wxWindow* parent, Preferences * prefs) + ProgramsPanel (wxWindow* parent, Preferences * prefs) : wxPanel (parent), m_prefs (prefs) { InitializeData (); --- NEW FILE rapidsvn.spec --- Name: rapidsvn Version: 0.9.1 Release: 3%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools License: GPL URL: http://www.rapidsvn.org/ Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz Patch0: rapidsvn-0.9.1-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: apr-devel, apr-util-devel, neon-devel BuildRequires: libtool >= 1.4.2 # For doc generation; rapidsvn needs the "dot" tool from graphviz BuildRequires: docbook-style-xsl >= 1.58.1, doxygen, libxslt >= 1.0.27 BuildRequires: graphviz BuildRequires: wxGTK-devel >= 2.4.2 BuildRequires: desktop-file-utils %description RapidSVN is a GUI front-end for the Subversion revision control system. It allows access to most of the features of Subversion through a user-friendly interface. %package -n svncpp Summary: C++ bindings for the Subversion client library Group: Development/Libraries License: LGPL BuildRequires: subversion-devel # for test framework BuildRequires: cppunit-devel Requires: subversion Requires(pre): /sbin/ldconfig Requires(post): /sbin/ldconfig %description -n svncpp svncpp is a C++ wrapper for the C Subversion client library which abstracts many parts of the C API and provides an object-oriented programming interface. %package -n svncpp-devel Summary: Development resources for the 'svncpp' library Group: Development/Libraries License: LGPL Requires: svncpp = %{version}-%{release} %description -n svncpp-devel Development resources for the 'svncpp' C++ client library for Subversion. Install this package if you need to compile an application that requires the 'svncpp' library. %prep %setup -q %patch0 -p1 %{__cat} <rapidsvn.desktop [Desktop Entry] Encoding=UTF-8 Name=RapidSVN GenericName=Subversion client Comment=Manage Subversion repositories Exec=rapidsvn Icon=rapidsvn.png Terminal=false Type=Application Categories=Application;Development;GNOME; Version=0.9.4 EOF %build %configure \ --disable-static \ --disable-no-exceptions \ --with-svn-lib=%{_libdir} \ --with-apu-config=%{_bindir}/apu-1-config \ --with-apr-config=%{_bindir}/apr-1-config \ --with-docbook-xsl-manpages=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool pushd doc/manpage iconv --from-code ISO-8859-1 --to-code UTF-8 --output rapidsvn.1.utf8 rapidsvn.1 mv rapidsvn.1.utf8 rapidsvn.1 popd %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} # Install desktop file and icon %{__install} -D -m 644 src/res/bitmaps/svn.xpm %{buildroot}%{_datadir}/pixmaps/rapidsvn.xpm %{__install} -d -m 755 %{buildroot}%{_datadir}/applications/ desktop-file-install --vendor fedora \ --add-category X-Fedora \ --dir %{buildroot}%{_datadir}/applications \ rapidsvn.desktop # Install manpage %{__install} -D -m 644 doc/manpage/rapidsvn.1 %{buildroot}%{_mandir}/man1/rapidsvn.1 # Remove libtool stuff rm -f %{buildroot}%{_libdir}/libsvncpp.{a,la} %check -n svncpp pushd src/tests/svncpp make ./svncpptest | grep OK if [ $? != 0 ]; then echo "svncpp tests failed" exit 5 fi %clean rm -rf %{buildroot} %post -n svncpp -p /sbin/ldconfig %postun -n svncpp -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS CHANGES FDL.txt GPL.txt LICENSE.txt README %{_bindir}/rapidsvn %{_datadir}/applications/fedora-rapidsvn.desktop %{_datadir}/pixmaps/rapidsvn.xpm %{_mandir}/man1/* %files -n svncpp %doc LGPL.txt %{_libdir}/libsvncpp.so.* %files -n svncpp-devel %doc LGPL.txt doc/svncpp/html %{_includedir}/svncpp/ %{_libdir}/libsvncpp.so %changelog * Wed May 03 2006 Tim Jackson 0.9.1-3 - libtool hack to fix RPATH issue * Sat Apr 29 2006 Tim Jackson 0.9.1-2 - Update list of docs inc. add GPL, LGPL docs and LICENSE.txt - Remove autoconf from BR - Fix manpage generation and add manpage to package - Add graphviz BR for correct doc generation - Add --disable-no-exceptions per README - Use --disable-static since we don't use the static libs - Spin off svncpp and svncpp-devel subpackages - svncpp has ldconfig in post/postun - Add --with-svn-lib which should fix build on x86_64 - Add %check section using package's inbuilt tests (requires cppunit) * Thu Apr 27 2006 Tim Jackson 0.9.1-1 - Initial package for Fedora Extras; based originally on an old DAG spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 May 2006 21:46:57 -0000 1.1 +++ .cvsignore 4 May 2006 21:48:05 -0000 1.2 @@ -0,0 +1 @@ +rapidsvn-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 May 2006 21:46:57 -0000 1.1 +++ sources 4 May 2006 21:48:05 -0000 1.2 @@ -0,0 +1 @@ +ba03034db35912c7b51b146cc7e6090e rapidsvn-0.9.1.tar.gz From fedora-extras-commits at redhat.com Thu May 4 21:56:09 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Thu, 4 May 2006 14:56:09 -0700 Subject: owners owners.list,1.939,1.940 Message-ID: <200605042156.k44LuBC2005966@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5949 Modified Files: owners.list Log Message: Added netpanzer owner (hugo at devin.com.br) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.939 retrieving revision 1.940 diff -u -r1.939 -r1.940 --- owners.list 4 May 2006 03:19:41 -0000 1.939 +++ owners.list 4 May 2006 21:56:08 -0000 1.940 @@ -804,6 +804,7 @@ Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|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|netpanzer|An Online Multiplayer Tactical Warfare Game|hugo at devin.com.br|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|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|new|A simple template system|redhat at flyn.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 4 21:57:13 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Thu, 4 May 2006 14:57:13 -0700 Subject: owners owners.list,1.940,1.941 Message-ID: <200605042157.k44LvFHB005999@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5982 Modified Files: owners.list Log Message: New package: rapidsvn (bug #190139) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.940 retrieving revision 1.941 diff -u -r1.940 -r1.941 --- owners.list 4 May 2006 21:56:08 -0000 1.940 +++ owners.list 4 May 2006 21:57:13 -0000 1.941 @@ -1361,6 +1361,7 @@ Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|rapidsvn|Graphical interface for the Subversion revision control system|rpm at timj.co.uk|extras-qa at fedoraproject.org| Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 5 02:10:41 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 May 2006 19:10:41 -0700 Subject: extras-buildsys/builder Builder.py,1.2,1.3 Message-ID: <200605050210.k452Af09018172@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128/builder Modified Files: Builder.py Log Message: Clean up a few more bugs Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/Builder.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Builder.py 3 May 2006 04:04:27 -0000 1.2 +++ Builder.py 5 May 2006 02:10:38 -0000 1.3 @@ -469,9 +469,9 @@ elif isinstance(cmd, Commands.PlgCommandUnlockRepo): self._handle_unlock_repo_request(cmd) elif isinstance(cmd, Commands.PlgCommandJobStatus): - reply = self._handle_job_status_request() + reply = self._handle_job_status_request(cmd) if reply: - self._queued_cmds = self._queued_cmds + reply + self._queued_cmds.append(reply) def _process_server_response(self, response): """Process the server's response.""" From fedora-extras-commits at redhat.com Fri May 5 02:10:42 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 May 2006 19:10:42 -0700 Subject: extras-buildsys/server Builder.py,1.35,1.36 Message-ID: <200605050210.k452AglW018182@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128/server Modified Files: Builder.py Log Message: Clean up a few more bugs Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Builder.py 3 May 2006 04:04:28 -0000 1.35 +++ Builder.py 5 May 2006 02:10:39 -0000 1.36 @@ -59,6 +59,8 @@ self._weight = weight self._type = btype self._seq_gen = Commands.SequenceGenerator() + self._lock = threading.Lock() + self._cmd_queue = [] try: type, rest = urllib.splittype(address) @@ -185,7 +187,6 @@ building_jobs = cmd.jobs() reported_uniqids = [] new_cmds = [] - print "Building Jobs: %s" % building_jobs for item in building_jobs: (uniqid, status) = cmd.get_job(item) try: @@ -213,9 +214,44 @@ self._prepping_jobs = True del reported_uniqids - print "New Commands: %s" % new_cmds return new_cmds + def _find_and_remove_cmd_for_ack(self, ack, old_cmd_type): + """Find a command in the sent command queue by sequence number + and command type. Remove the command from the command queue + and return it.""" + + old_cmd = None + self._lock.acquire() + for queued_cmd in self._cmd_queue: + if queued_cmd.seq() == ack.acked_seq() and isinstance(queued_cmd, old_cmd_type): + old_cmd = queued_cmd + self._cmd_queue.remove(queued_cmd) + break + self._lock.release() + return old_cmd + + def _handle_new_job_ack(self, ack): + """Handle a NewJobAck command by notifying the parent job + that this archjob is now in progress.""" + + old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandNewJobReq) + if old_cmd: + parent = old_cmd.parent_job() + archjob_id = ack.archjob_id() + archjob = ArchJob.ArchJob(self, parent, archjob_id, old_cmd.target_dict()) + self._jobs[archjob_id] = archjob + parent.add_arch_job(archjob) + + def _handle_job_status_ack(self, ack): + old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandJobStatus) + if old_cmd: + archjob_id = ack.archjob_id() + status = ack.status() + job = self._jobs[archjob_id] + job.set_builder_job_status(status) + + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt class BuildingJobsCheck(threading.Thread): @@ -479,8 +515,6 @@ def __init__(self, manager, cfg, address, weight, btype): Builder.__init__(self, manager, cfg, address, weight, btype) self._last_contact = 0 - self._lock = threading.Lock() - self._cmd_queue = [] def _init_builder(self, target_list): self._target_list = target_list @@ -497,27 +531,6 @@ def request_job_files(self, archjob): pass - def _handle_new_job_ack(self, ack): - """Handle a NewJobAck command by finding the original command - sent to the builder, removing it from the command queue, and notifying - the parent job that this archjob is now in progress.""" - - old_cmd = None - self._lock.acquire() - for queued_cmd in self._cmd_queue: - if queued_cmd.seq() == ack.acked_seq() and isinstance(queued_cmd, Commands.PlgCommandNewJobReq): - old_cmd = queued_cmd - self._cmd_queue.remove(queued_cmd) - break - self._lock.release() - - if old_cmd: - parent = old_cmd.parent_job() - archjob_id = ack.archjob_id() - archjob = ArchJob.ArchJob(self, parent, archjob_id, old_cmd.target_dict()) - self._jobs[archjob_id] = archjob - parent.add_arch_job(archjob) - def _dispatch_command(self, cmd): name = cmd.name() if isinstance(cmd, Commands.PlgCommandSlots): @@ -538,6 +551,8 @@ self._lock.acquire() self._cmd_queue = self._cmd_queue + status_reqs self._lock.release() + elif isinstance(cmd, Commands.PlgCommandJobStatusAck): + self._handle_job_status_ack(cmd) else: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) From fedora-extras-commits at redhat.com Fri May 5 02:10:41 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 May 2006 19:10:41 -0700 Subject: extras-buildsys/common Commands.py,1.2,1.3 Message-ID: <200605050210.k452AfjN018178@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128/common Modified Files: Commands.py Log Message: Clean up a few more bugs Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Commands.py 3 May 2006 04:04:28 -0000 1.2 +++ Commands.py 5 May 2006 02:10:39 -0000 1.3 @@ -127,6 +127,10 @@ cmd = PlgCommandNewJobAck._deserialize(args) elif name == CMD_NAME_BUILDING_JOBS: cmd = PlgCommandBuildingJobs._deserialize(args) + elif name == CMD_NAME_JOB_STATUS_REQ: + cmd = PlgCommandJobStatus._deserialize(args) + elif name == CMD_NAME_JOB_STATUS_ACK: + cmd = PlgCommandJobStatusAck._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't @@ -472,7 +476,7 @@ except KeyError, TypeError: raise ValueError("No 'archjob_id' argument found.") - return PlgCommandJobStatusReq(archjob_id) + return PlgCommandJobStatus(archjob_id) _deserialize = staticmethod(_deserialize) @@ -485,7 +489,7 @@ return self._archjob_id def __str__(self): - return "%s(seq: %d, target_dict: %s, srpm_url: %s)" % (self._name, self._seq, self._archjob_id) + return "%s(seq: %d, archjob_id: %s)" % (self._name, self._seq, self._archjob_id) class PlgCommandJobStatusAck(PlgCommandAck): From fedora-extras-commits at redhat.com Fri May 5 02:13:18 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 4 May 2006 19:13:18 -0700 Subject: fedora-security/tools package-release,1.1,1.2 Message-ID: <200605050213.k452DI68018225@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18207 Modified Files: package-release Log Message: Use fuzzy matching rather than strict matching. Index: package-release =================================================================== RCS file: /cvs/fedora/fedora-security/tools/package-release,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- package-release 2 May 2006 20:29:31 -0000 1.1 +++ package-release 5 May 2006 02:13:16 -0000 1.2 @@ -17,37 +17,55 @@ # Global variables my ($owner_file, $mirror_host, $mirror_path, @releases); -my ($distro, $package, $desc, $owner, $qa, $cc); $owner_file='http://cvs.fedora.redhat.com/viewcvs/*checkout*/owners/owners.list?root=extras'; $mirror_host='download.fedora.redhat.com'; $mirror_path='/pub/fedora/linux/extras'; @releases=qw(3 4 5 development); -my $owner_content = get($owner_file) - or die "Couldn't get $owner_file"; +sub get_owner_content { + my $match = pop; -foreach (split(/\n/, $owner_content)) { - next if /^#/; - chomp; + my ($distro, $package, $desc, $owner, $qa, $cc); - ($distro, $package, $desc, $owner, $qa, $cc) = split(/\|/, $_); + my %owner; + + my $owner_content = get($owner_file) + or die "Couldn't get $owner_file"; + + foreach (split(/\n/, $owner_content)) { + next if /^#/; + chomp; + + ($distro, $package, $desc, $owner, $qa, $cc) = split(/\|/, $_); + + next if ( $package !~ m/$match/i); + + $owner{$package} = {}; + $owner{$package}->{'product'} = $distro; + $owner{$package}->{'package'} = $package; + $owner{$package}->{'description'} = $desc; + $owner{$package}->{'owner'} = $owner; + $owner{$package}->{'qacontact'} = $qa; + $owner{$package}->{'cclist'} = $cc; + } + + return %owner; - last if $package eq $ARGV[0]; - undef $package; # If we don't undef this, we fall through } -unless ($package) { - print "Could not find package $ARGV[0] in $owner_file\n"; +my $package = $ARGV[0]; + +my %owner = get_owner_content($package); + +if (!keys(%owner)) { + print "Could not find package \"$package\" in $owner_file\n"; exit 1; } -print "Found package $package in owners.list:\n"; -print " Distro:\t$distro\n"; -print " Desc:\t\t$desc\n"; -print " Owner:\t$owner\n"; -print " CC:\t\t$cc\n"; -print " Releases and versions:\n"; +foreach (keys(%owner)) { +print "Found package $_ in owners.list:\n"; +} my $ftp = Net::FTP->new($mirror_host, Debug => 0) or die "Cannot connect to $mirror_host: $@"; @@ -56,7 +74,7 @@ foreach my $release (@releases) { - my ($f, $dir, $files, $rev, $ver); + my ($f, $dir, $files, $rev, $ver, $name); $dir = "$mirror_path/$release/SRPMS"; $release eq "development" && ($release = "dev"); @@ -66,11 +84,13 @@ foreach my $f (@$files) { chomp($f); $f =~ s/$dir\///; - next unless $f =~ /^$package-(.*)\.src\.rpm$/; - next if $1 =~ /-.*-/; + next unless $f =~ /^(.*$package.*)-([^\-]*)-([^\-]*)\.src\.rpm$/; + $name = $1; + $ver = $2; + $rev = $3; - ($ver, $rev) = $1 =~ /^([^-]+)-([^-]+)$/; - - print " $release\t$ver\t$rev\t$dir/$f\n"; + print " $release\t$name\t$ver\t$rev\t$f\n"; } } + +$ftp->quit; From fedora-extras-commits at redhat.com Fri May 5 02:17:44 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 4 May 2006 19:17:44 -0700 Subject: fedora-security/tools package-release,1.2,1.3 Message-ID: <200605050217.k452HiNj018263@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18245 Modified Files: package-release Log Message: Ignore case when searching the filelist. Index: package-release =================================================================== RCS file: /cvs/fedora/fedora-security/tools/package-release,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- package-release 5 May 2006 02:13:16 -0000 1.2 +++ package-release 5 May 2006 02:17:42 -0000 1.3 @@ -58,7 +58,7 @@ my %owner = get_owner_content($package); -if (!keys(%owner)) { +if (!keys(%owner) or $package eq '') { print "Could not find package \"$package\" in $owner_file\n"; exit 1; } @@ -84,7 +84,7 @@ foreach my $f (@$files) { chomp($f); $f =~ s/$dir\///; - next unless $f =~ /^(.*$package.*)-([^\-]*)-([^\-]*)\.src\.rpm$/; + next unless $f =~ /^(.*$package.*)-([^\-]*)-([^\-]*)\.src\.rpm$/i; $name = $1; $ver = $2; $rev = $3; From fedora-extras-commits at redhat.com Fri May 5 07:46:38 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 May 2006 00:46:38 -0700 Subject: rpms/raidem-music/FC-5 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE license.txt, 1.1, NONE raidem-music.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <200605050746.k457kehM030032@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem-music/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30017/FC-5 Removed Files: .cvsignore Makefile branch license.txt raidem-music.spec sources Log Message: remove FC-5 branch because of special noarch content handling discussed on fedora-games-list --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- license.txt DELETED --- --- raidem-music.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri May 5 07:48:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 May 2006 00:48:12 -0700 Subject: rpms/raidem-music/devel raidem-music.spec,1.1,1.2 Message-ID: <200605050748.k457mEan030069@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem-music/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30052 Modified Files: raidem-music.spec Log Message: remove %{?dist} for noarch content packages as discussed on fedora-games-list Index: raidem-music.spec =================================================================== RCS file: /cvs/extras/rpms/raidem-music/devel/raidem-music.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- raidem-music.spec 30 Apr 2006 21:22:53 -0000 1.1 +++ raidem-music.spec 5 May 2006 07:48:12 -0000 1.2 @@ -1,6 +1,6 @@ Name: raidem-music Version: 1.0 -Release: 1%{?dist} +Release: 1 Summary: Background music for the game raidem Group: Amusements/Games License: Creative Commons BY / Attribution From fedora-extras-commits at redhat.com Fri May 5 09:41:39 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 02:41:39 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.12,1.13 Message-ID: <200605050941.k459ff3O002628@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2611 Modified Files: php-eaccelerator.spec Log Message: Fix typo that probably prevented the build. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- php-eaccelerator.spec 11 Apr 2006 16:57:47 -0000 1.12 +++ php-eaccelerator.spec 5 May 2006 09:41:39 -0000 1.13 @@ -44,7 +44,7 @@ phpize %configure \ %ifarch ppc -% --with-eaccelerator-userid="%{userid}" + --with-eaccelerator-userid="%{userid}" %endif %{__make} %{?_smp_mflags} From fedora-extras-commits at redhat.com Fri May 5 09:50:00 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 02:50:00 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.13,1.14 Message-ID: <200605050950.k459o2TC002769@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2746 Modified Files: php-eaccelerator.spec Log Message: Fix api version detection macro when php or gcc aren't installed. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- php-eaccelerator.spec 5 May 2006 09:41:39 -0000 1.13 +++ php-eaccelerator.spec 5 May 2006 09:50:00 -0000 1.14 @@ -1,6 +1,7 @@ %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) -%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.2)} +%define php_includes %(php-config --includes 2>/dev/null || echo) +%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h %{php_includes} - 2>/dev/null | tail -1) +%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.3)} %define module_version 0.9.5 %define prever beta2 From fedora-extras-commits at redhat.com Fri May 5 11:41:33 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 04:41:33 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.14,1.15 Message-ID: <200605051141.k45BfZPM008149@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8132 Modified Files: php-eaccelerator.spec Log Message: Keep trying to get the API version detection to work in all possible cases. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- php-eaccelerator.spec 5 May 2006 09:50:00 -0000 1.14 +++ php-eaccelerator.spec 5 May 2006 11:41:33 -0000 1.15 @@ -1,11 +1,15 @@ -%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%define php_includes %(php-config --includes 2>/dev/null || echo) -%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h %{php_includes} - 2>/dev/null | tail -1) -%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.3)} +# Useful defaults when building in chroots on systems where PHP is unavailable +%define default_extdir %{_libdir}/php4 +%define default_apiver 20041225 +%define default_version 5.1.3 %define module_version 0.9.5 %define prever beta2 +%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) +%define php_apiver %(php -i 2>/dev/null | sed -n 's/^PHP API => //p' 2>/dev/null || echo %{default_apiver}) +%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} + # This is the apache userid, only used for sysvipc semaphores which is the # default on ppc since spinlock is not detected %define userid 48 @@ -13,7 +17,7 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 0.1.%{prever}%{?dist} +Release: 0.2.%{prever}%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ @@ -97,7 +101,12 @@ %changelog -* Tue Apr 11 2006 Matthias Saou 5.1.2_0.9.5-0.1.beta2 +* Fri May 5 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 +- Rework heavily the API version requirement detection, should work with + chroots builds where PHP isn't installed outside. +- Replace the CC way of getting the API version with php -i output. + +* Tue Apr 11 2006 Matthias Saou 5.1.x_0.9.5-0.1.beta2 - Update to 0.9.5-beta2. * Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.3 From fedora-extras-commits at redhat.com Fri May 5 12:16:09 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:16:09 -0700 Subject: rpms/kdemultimedia-extras/devel .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605051216.k45CGBZC010518@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10497 Modified Files: .cvsignore kdemultimedia-extras.spec sources Log Message: * Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 - omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) - 3.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Mar 2006 12:39:58 -0000 1.2 +++ .cvsignore 5 May 2006 12:16:08 -0000 1.3 @@ -1 +1 @@ -kdemultimedia-3.5.1-patched.tar.bz2 +kdemultimedia-3.5.2-patched.tar.bz2 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdemultimedia-extras.spec 5 Apr 2006 18:03:01 -0000 1.2 +++ kdemultimedia-extras.spec 5 May 2006 12:16:08 -0000 1.3 @@ -18,8 +18,6 @@ %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode -#define to include/build juk, undef not -%define juk juk # to make sure no nonfree bits get included BuildConflicts: akode-extras # debugging: to make sure no extras bits (accidentally) get excluded @@ -33,6 +31,7 @@ %define _with_akode --with-akode BuildRequires: akode-extras %define _with_lame --with-lame --disable-lametest +%define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -42,6 +41,9 @@ %endif %if "%{?fedora}" > "4" %define gst gstreamer08 +BuildRequires: libXxf86vm-devel +# likely only required for nonfree -- Rex +BuildRequires: libXxf86dga-devel %endif %if "%{?rhel}" > "3" %define _with_gstreamer --with-gstreamer @@ -58,28 +60,27 @@ Summary: Extras for KDE multimedia applications %endif %if "%{?nonfree}" == "1" -Name: kdemultimedia-nonfree +Name: kdemultimedia-extras-nonfree Summary: Nonfree Extras for KDE multimedia applications %endif Group: Applications/Multimedia Epoch: 6 -Version: 3.5.1 -Release: 8%{?dist}%{?kde} +Version: 3.5.2 +Release: 3%{?dist}%{?kde} License: GPL -%if "%{?nonfree}" == "1" -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 -%else +%if "%{?patched:1}" == "1" # From Core's kdemultimedia pkg -Source0: kdemultimedia-3.5.1-patched.tar.bz2 +Source0: kdemultimedia-%{version}-patched.tar.bz2 +%else +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 %endif Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} -BuildRequires: libtool %if "%{is_release}" != "1" BuildRequires: automake %endif @@ -113,6 +114,8 @@ ## kde-redhat patches # unconditinally include oggvorbis_artsplugin Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch +# exclude kfile_mpeg +Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch # akode: http://bugs.kde.org/116958 @@ -151,26 +154,27 @@ %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } -Requires: kdemultimedia >= %{epoch}:%{version} +Requires: kdemultimedia = %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) -%{?juk:* juk (libtunepimp)} +* juk (libtunepimp) * kfile-plugins: flac, mpc (taglib) %endif %if "%{?nonfree}" == "1" +Obsoletes: kdemultimedia-nonfree < %{epoch}:%{version}-%{release} # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} -%{?debug:BuildConflicts: kdemultimedia-nonfree} +%{?debug:BuildConflicts: kdemultimedia-extras-nonfree} Requires: kdemultimedia = %{epoch}:%{version} # for main akode_artsplugins bits -Requires: kdemultimedia-extras >= %{epoch}:%{version} +Requires: kdemultimedia-extras = %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: * akode_artsplugin (akode-extras), -* kfile-plugins: mp3 (taglib), +* kfile-plugins: mp3 (taglib), mpeg * krec mp3 export (lame), * mpeglib_artsplugin, * xine_artsplugin (xine-lib) @@ -204,7 +208,6 @@ DO_NOT_COMPILE="" -%{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} @@ -241,14 +244,14 @@ %endif %if "%{?extras}" == "1" -for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make %{?_smp_mflags} -C $module done %endif %if "%{?nonfree}" == "1" -for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make %{?_smp_mflags} -C $module done %endif @@ -261,17 +264,17 @@ %endif %if "%{?extras}" == "1" -for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" desktop-file-install --vendor="fedora" \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -%endif +#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -287,8 +290,8 @@ %endif %if "%{?nonfree}" == "1" -for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits @@ -359,8 +362,7 @@ %endif %if "%{?extras}" == "1" -# Since the icons come from juk -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -372,7 +374,7 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -%endif +#endif %endif %if "%{?nonfree}" == "1" @@ -413,7 +415,7 @@ %files -f extras.list %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{?juk:%dir %{_datadir}/apps/juk/} +%dir %{_datadir}/apps/juk/ %endif %if "%{?nonfree}" == "1" @@ -433,8 +435,24 @@ %changelog -* Wed Apr 05 2006 Rex Dieter 6:3.5.1-8 -- -extras: Requires: kdemultimedia >= 6:3.5.1 +* Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 +- omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) + +* Tue Mar 28 2006 Rex Dieter 6:3.5.2-2 +- -extras-nonfree: (fix) Obsoletes: kdemultimedia-nonfree + +* Mon Mar 20 2006 Rex Dieter 6:3.5.2-1 +- 3.5.2 + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-10 +- fc5: BR: libXxf86vm-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-9 +- fc5: BR: libXxf86dga-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-8 +- -extras-nonfree: rename -nonfree -> -extras-nonfree +- -extras-nonfree: drop 0.lvn from Release * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7 - kfile-plugins/mp3: -extras -> -nonfree Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Mar 2006 12:39:58 -0000 1.2 +++ sources 5 May 2006 12:16:08 -0000 1.3 @@ -1 +1 @@ -31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2 +54f9947051ee5cf50c81a5ea382943f1 kdemultimedia-3.5.2-patched.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 12:18:46 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 5 May 2006 05:18:46 -0700 Subject: rpms/scim-tables/FC-3 .cvsignore, 1.3, 1.4 scim-tables.spec, 1.10, 1.11 sources, 1.5, 1.6 tables-skip-ja-ko.patch, 1.1, 1.2 Message-ID: <200605051218.k45CInif010623@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-tables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10591 Modified Files: .cvsignore scim-tables.spec sources tables-skip-ja-ko.patch Log Message: sync with FE4: - obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt) * Thu Mar 2 2006 Jens Petersen - add %%indic_tables build switch * Thu Feb 9 2006 Jens Petersen - update filelist since moduledir is now api-versioned * Fri Jan 13 2006 Jens Petersen - update to 0.5.6 release - update tables-skip-ja-ko.patch - updates filelist for chinese tables Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Sep 2005 06:38:51 -0000 1.3 +++ .cvsignore 5 May 2006 12:18:46 -0000 1.4 @@ -1,2 +1 @@ -scim-tables-0.5.3.tar.gz -indic-icons-1.tar.gz +scim-tables-0.5.6.tar.gz Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-tables.spec 27 Dec 2005 06:44:56 -0000 1.10 +++ scim-tables.spec 5 May 2006 12:18:46 -0000 1.11 @@ -1,8 +1,11 @@ # set to include Japanese and Korean tables %define jk_tables 0 +# set to include Indic tables +%define indic_tables 1 + Name: scim-tables -Version: 0.5.5 +Version: 0.5.6 Release: 1%{?dist} Summary: SCIM Generic Table IMEngine @@ -14,6 +17,9 @@ BuildRequires: scim-devel, gtk2-devel BuildRequires: gettext-devel +%if !%{jk_tables} +Obsoletes: scim-tables-japanese < 0.5.6, scim-tables-korean < 0.5.6 +%endif Requires: scim Patch1: tables-skip-ja-ko.patch @@ -36,6 +42,7 @@ %description arabic This package contains scim-tables files for Chinese input. +%if %{indic_tables} %package bengali Summary: SCIM tables for Bengali Group: System Environment/Libraries @@ -43,6 +50,7 @@ %description bengali This package contains scim-tables files for Bengali input. +%endif %package chinese Summary: SCIM tables for Chinese @@ -53,6 +61,7 @@ %description chinese This package contains scim-tables files for Chinese input. +%if %{indic_tables} %package gujarati Summary: SCIM tables for Gujarati Group: System Environment/Libraries @@ -68,6 +77,7 @@ %description hindi This package contains scim-tables files for Hindi input. +%endif %if %{jk_tables} %package japanese @@ -80,6 +90,7 @@ This package contains scim-tables files for Japanese. %endif +%if %{indic_tables} %package kannada Summary: SCIM tables for Kannada Group: System Environment/Libraries @@ -87,6 +98,7 @@ %description kannada This package contains scim-tables files for Kannada input. +%endif %if %{jk_tables} %package korean @@ -99,6 +111,7 @@ This package contains scim-tables files for Korean. %endif +%if %{indic_tables} %package malayalam Summary: SCIM tables for Malayalam scripts Group: System Environment/Libraries @@ -106,6 +119,7 @@ %description malayalam This package contains scim-tables files for Malayalam languages. +%endif %package nepali Summary: SCIM tables for @@ -113,8 +127,9 @@ Requires: scim-tables = %{version} %description nepali -This package contains scim-tables files for input. +This package contains scim-tables files for Nepali input. +%if %{indic_tables} %package punjabi Summary: SCIM tables for Punjabi Group: System Environment/Libraries @@ -122,6 +137,7 @@ %description punjabi This package contains scim-tables files for Punjabi input. +%endif %package russian Summary: SCIM tables for Russian @@ -131,6 +147,7 @@ %description russian This package contains scim-tables files for Russian input. +%if %{indic_tables} %package tamil Summary: SCIM tables for Tamil Group: System Environment/Libraries @@ -138,6 +155,7 @@ %description tamil This package contains scim-tables files for Tamil input. +%endif %package thai Summary: SCIM tables for Thai @@ -147,6 +165,7 @@ %description thai This package contains scim-tables files for Thai input. +%if %{indic_tables} %package telugu Summary: SCIM tables for Telugu Group: System Environment/Libraries @@ -154,6 +173,7 @@ %description telugu This package contains scim-tables files for Telugu input. +%endif %package vietnamese Summary: SCIM tables for Vietnamese @@ -192,7 +212,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.la + +%if !%{indic_tables} +rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Bengali,Gujarati,Hindi,Kannada,Malayalam,Punjabi,Tamil,Telugu}-* +%endif %find_lang %{name} @@ -210,8 +234,8 @@ %files -f %{name}.lang %defattr(-, root, root, -) %{_bindir}/scim-make-table -%{_libdir}/scim-1.0/IMEngine/table.so -%{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so +%{_libdir}/scim-1.0/*/IMEngine/table.so +%{_libdir}/scim-1.0/*/SetupUI/table-imengine-setup.so %{_datadir}/scim/icons/table.png %{_mandir}/man1/scim-make-table.1* @@ -230,6 +254,7 @@ %{_datadir}/scim/icons/Arabic.png +%if %{indic_tables} %files bengali %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -237,13 +262,14 @@ %{_datadir}/scim/tables/Bengali-probhat.bin %{_datadir}/scim/icons/Bengali-inscript.png %{_datadir}/scim/icons/Bengali-probhat.png - +%endif %files chinese %defattr(-, root, root, -) %doc tables/zh/README-*.txt %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Array30.bin +%{_datadir}/scim/tables/CNS11643.bin %{_datadir}/scim/tables/CangJie*.bin %{_datadir}/scim/tables/Cantonese.bin %{_datadir}/scim/tables/CantonHK.bin @@ -258,8 +284,9 @@ %{_datadir}/scim/tables/Wu.bin %{_datadir}/scim/tables/Wubi.bin %{_datadir}/scim/tables/Ziranma.bin -%{_datadir}/scim/tables/ZhuYin.bin +%{_datadir}/scim/tables/ZhuYin*.bin %{_datadir}/scim/icons/Array30.png +%{_datadir}/scim/icons/CNS11643.png %{_datadir}/scim/icons/CangJie*.png %{_datadir}/scim/icons/Cantonese.png %{_datadir}/scim/icons/CantonHK.png @@ -277,6 +304,7 @@ %{_datadir}/scim/icons/ZhuYin.png +%if %{indic_tables} %files gujarati %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -285,7 +313,6 @@ %{_datadir}/scim/icons/Gujarati-inscript.png %{_datadir}/scim/icons/Gujarati-phonetic.png - %files hindi %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -293,7 +320,7 @@ %{_datadir}/scim/tables/Hindi-phonetic.bin %{_datadir}/scim/icons/Hindi-inscript.png %{_datadir}/scim/icons/Hindi-phonetic.png - +%endif %if %{jk_tables} %files japanese @@ -309,6 +336,7 @@ %endif +%if %{indic_tables} %files kannada %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -316,7 +344,7 @@ %{_datadir}/scim/tables/Kannada-kgp.bin %{_datadir}/scim/icons/Kannada-inscript.png %{_datadir}/scim/icons/Kannada-kgp.png - +%endif %if %{jk_tables} %files korean @@ -330,12 +358,13 @@ %endif +%if %{indic_tables} %files malayalam %defattr(-, root, root, -) %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Malayalam-inscript.bin %{_datadir}/scim/icons/Malayalam-inscript.png - +%endif %files nepali %defattr(-, root, root, -) @@ -344,6 +373,7 @@ %{_datadir}/scim/icons/Nepali.png +%if %{indic_tables} %files punjabi %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -353,6 +383,7 @@ %{_datadir}/scim/icons/Punjabi-inscript.png %{_datadir}/scim/icons/Punjabi-jhelum.png %{_datadir}/scim/icons/Punjabi-phonetic.png +%endif %files russian @@ -362,6 +393,7 @@ %{_datadir}/scim/icons/Yawerty.png +%if %{indic_tables} %files tamil %defattr(-, root, root, -) %dir %{_datadir}/scim/tables @@ -369,6 +401,7 @@ %{_datadir}/scim/tables/Tamil-phonetic.bin %{_datadir}/scim/icons/Tamil-inscript.png %{_datadir}/scim/icons/Tamil-phonetic.png +%endif %files thai @@ -378,11 +411,13 @@ %{_datadir}/scim/icons/Thai.png +%if %{indic_tables} %files telugu %defattr(-, root, root, -) %dir %{_datadir}/scim/tables %{_datadir}/scim/tables/Telugu-inscript.bin %{_datadir}/scim/icons/Telugu-inscript.png +%endif %files vietnamese @@ -402,23 +437,37 @@ %changelog -* Mon Dec 26 2005 Jens Petersen - 0.5.5-1%{?dist} +* Thu May 4 2006 Jens Petersen - 0.5.6-1.fc3 +- obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt) + +* Thu Mar 2 2006 Jens Petersen +- add %%indic_tables build switch + +* Thu Feb 9 2006 Jens Petersen +- update filelist since moduledir is now api-versioned + +* Fri Jan 13 2006 Jens Petersen +- update to 0.5.6 release + - update tables-skip-ja-ko.patch + - updates filelist for chinese tables + +* Mon Dec 26 2005 Jens Petersen - 0.5.5-1.fc3 - update to 0.5.5 - update filelists -- remove the Japanese and Korean tables and subpackages with +- remove the Japanese and Korean tables and their subpackages with tables-skip-ja-ko.patch and %%{jk_tables} -* Wed Dec 1 2005 Ryo Dairiki - 0.6.0-1%{?dist} +* Wed Dec 1 2005 Ryo Dairiki - 0.5.4-1.fc3 - update to 0.5.4 -* Tue Oct 18 2005 Jens Petersen - 0.5.3-6%{?dist} +* Tue Oct 18 2005 Jens Petersen - 0.5.3-6.fc3 - update to cvs head to fix various table issues with scim-tables-cvs-20051018.patch -* Fri Oct 7 2005 Jens Petersen - 0.5.3-5%{?dist} +* Fri Oct 7 2005 Jens Petersen - 0.5.3-5.fc3 - require scim -* Thu Sep 22 2005 Jens Petersen - 0.5.3-4%{?dist} +* Thu Sep 22 2005 Jens Petersen - 0.5.3-4.fc3 - add a Thai table derived from m17n-db with a Thai icon - separate the Indic tables and the additional language tables into separate language subpackages Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 06:44:56 -0000 1.5 +++ sources 5 May 2006 12:18:46 -0000 1.6 @@ -1 +1 @@ -15da0323195dea92690d4b391665b95a scim-tables-0.5.5.tar.gz +ff8d59e8f3dedb7dd7c6d87c8fc408db scim-tables-0.5.6.tar.gz tables-skip-ja-ko.patch: Index: tables-skip-ja-ko.patch =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/tables-skip-ja-ko.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tables-skip-ja-ko.patch 27 Dec 2005 06:44:56 -0000 1.1 +++ tables-skip-ja-ko.patch 5 May 2006 12:18:46 -0000 1.2 @@ -1,9 +1,9 @@ --- scim-tables-0.5.5/configure.ac~ 2005-12-05 15:37:12.000000000 +0900 +++ scim-tables-0.5.5/configure.ac 2005-12-26 17:02:55.000000000 +0900 @@ -126,14 +126,6 @@ - tables/zh/Wubi.txt tables/zh/Ziranma.txt tables/zh/ZhuYin.txt + tables/zh/ZhuYin-Big.txt - tables/ja/Makefile - tables/ja/HIRAGANA.txt - tables/ja/KATAKANA.txt From fedora-extras-commits at redhat.com Fri May 5 12:20:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:20:22 -0700 Subject: rpms/kdemultimedia-extras/devel kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 kdemultimedia-extras.spec, 1.3, 1.4 Message-ID: <200605051220.k45CKO9j010691@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10671 Modified Files: kdemultimedia-extras.spec Added Files: kdemultimedia-3.5.2-omit_kfile_mpeg.patch Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-4 - respin for Extras kdemultimedia-3.5.2-omit_kfile_mpeg.patch: --- NEW FILE kdemultimedia-3.5.2-omit_kfile_mpeg.patch --- --- kdemultimedia-3.5.2/kfile-plugins/Makefile.am.omit_kfile_mpeg_plugin 2005-09-10 03:20:08.000000000 -0500 +++ kdemultimedia-3.5.2/kfile-plugins/Makefile.am 2006-04-02 22:01:51.000000000 -0500 @@ -18,5 +18,5 @@ KFILE_THEORA_SUBDIR=theora endif -SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \ +SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi wav sid $(KFILE_OGG_SUBDIR) \ $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR) Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdemultimedia-extras.spec 5 May 2006 12:16:08 -0000 1.3 +++ kdemultimedia-extras.spec 5 May 2006 12:20:22 -0000 1.4 @@ -67,7 +67,7 @@ Group: Applications/Multimedia Epoch: 6 Version: 3.5.2 -Release: 3%{?dist}%{?kde} +Release: 4%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" @@ -435,6 +435,9 @@ %changelog +* Fri May 05 2006 Rex Dieter 6:3.5.2-4 +- respin for Extras + * Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 - omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) From fedora-extras-commits at redhat.com Fri May 5 12:28:44 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:28:44 -0700 Subject: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec,1.4,1.5 Message-ID: <200605051228.k45CSk9n010772@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10755 Modified Files: kdemultimedia-extras.spec Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-5 - relax Requires: kdemultimedia Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kdemultimedia-extras.spec 5 May 2006 12:20:22 -0000 1.4 +++ kdemultimedia-extras.spec 5 May 2006 12:28:44 -0000 1.5 @@ -154,7 +154,7 @@ %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } -Requires: kdemultimedia = %{epoch}:%{version} +Requires: kdemultimedia >= %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) @@ -167,9 +167,9 @@ # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} %{?debug:BuildConflicts: kdemultimedia-extras-nonfree} -Requires: kdemultimedia = %{epoch}:%{version} +Requires: kdemultimedia >= %{epoch}:%{version} # for main akode_artsplugins bits -Requires: kdemultimedia-extras = %{epoch}:%{version} +Requires: kdemultimedia-extras >= %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: @@ -435,8 +435,11 @@ %changelog +* Fri May 05 2006 Rex Dieter 6:3.5.2-5 +- relax Requires: kdemultimedia + * Fri May 05 2006 Rex Dieter 6:3.5.2-4 -- respin for Extras +- respin 3.5.2 for Extras * Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 - omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) From fedora-extras-commits at redhat.com Fri May 5 12:29:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:29:06 -0700 Subject: rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec,1.5,1.6 Message-ID: <200605051229.k45CT8RN010825@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10808 Modified Files: kdemultimedia-extras.spec Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-5 - relax Requires: kdemultimedia Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdemultimedia-extras.spec 5 May 2006 12:28:44 -0000 1.5 +++ kdemultimedia-extras.spec 5 May 2006 12:29:06 -0000 1.6 @@ -67,7 +67,7 @@ Group: Applications/Multimedia Epoch: 6 Version: 3.5.2 -Release: 4%{?dist}%{?kde} +Release: 5%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" From fedora-extras-commits at redhat.com Fri May 5 12:29:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:29:24 -0700 Subject: rpms/kdemultimedia-extras/FC-5 kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605051229.k45CTQ5D010884@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10860 Modified Files: .cvsignore kdemultimedia-extras.spec sources Added Files: kdemultimedia-3.5.2-omit_kfile_mpeg.patch Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-4 - respin 3.5.2 for Extras kdemultimedia-3.5.2-omit_kfile_mpeg.patch: --- NEW FILE kdemultimedia-3.5.2-omit_kfile_mpeg.patch --- --- kdemultimedia-3.5.2/kfile-plugins/Makefile.am.omit_kfile_mpeg_plugin 2005-09-10 03:20:08.000000000 -0500 +++ kdemultimedia-3.5.2/kfile-plugins/Makefile.am 2006-04-02 22:01:51.000000000 -0500 @@ -18,5 +18,5 @@ KFILE_THEORA_SUBDIR=theora endif -SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \ +SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi wav sid $(KFILE_OGG_SUBDIR) \ $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Mar 2006 12:39:58 -0000 1.2 +++ .cvsignore 5 May 2006 12:29:24 -0000 1.3 @@ -1 +1 @@ -kdemultimedia-3.5.1-patched.tar.bz2 +kdemultimedia-3.5.2-patched.tar.bz2 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdemultimedia-extras.spec 13 Apr 2006 18:43:13 -0000 1.2 +++ kdemultimedia-extras.spec 5 May 2006 12:29:24 -0000 1.3 @@ -18,8 +18,6 @@ %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode -#define to include/build juk, undef not -%define juk juk # to make sure no nonfree bits get included BuildConflicts: akode-extras # debugging: to make sure no extras bits (accidentally) get excluded @@ -33,6 +31,7 @@ %define _with_akode --with-akode BuildRequires: akode-extras %define _with_lame --with-lame --disable-lametest +%define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -42,6 +41,9 @@ %endif %if "%{?fedora}" > "4" %define gst gstreamer08 +BuildRequires: libXxf86vm-devel +# likely only required for nonfree -- Rex +BuildRequires: libXxf86dga-devel %endif %if "%{?rhel}" > "3" %define _with_gstreamer --with-gstreamer @@ -58,28 +60,27 @@ Summary: Extras for KDE multimedia applications %endif %if "%{?nonfree}" == "1" -Name: kdemultimedia-nonfree +Name: kdemultimedia-extras-nonfree Summary: Nonfree Extras for KDE multimedia applications %endif Group: Applications/Multimedia Epoch: 6 -Version: 3.5.1 -Release: 8%{?dist}%{?kde} +Version: 3.5.2 +Release: 5%{?dist}%{?kde} License: GPL -%if "%{?nonfree}" == "1" -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 -%else +%if "%{?patched:1}" == "1" # From Core's kdemultimedia pkg -Source0: kdemultimedia-3.5.1-patched.tar.bz2 +Source0: kdemultimedia-%{version}-patched.tar.bz2 +%else +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 %endif Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} -BuildRequires: libtool %if "%{is_release}" != "1" BuildRequires: automake %endif @@ -113,6 +114,8 @@ ## kde-redhat patches # unconditinally include oggvorbis_artsplugin Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch +# exclude kfile_mpeg +Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch # akode: http://bugs.kde.org/116958 @@ -151,26 +154,27 @@ %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } -Requires: kdemultimedia >= %{epoch}:%{version} +Requires: kdemultimedia >= %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) -%{?juk:* juk (libtunepimp)} +* juk (libtunepimp) * kfile-plugins: flac, mpc (taglib) %endif %if "%{?nonfree}" == "1" +Obsoletes: kdemultimedia-nonfree < %{epoch}:%{version}-%{release} # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} -%{?debug:BuildConflicts: kdemultimedia-nonfree} -Requires: kdemultimedia = %{epoch}:%{version} +%{?debug:BuildConflicts: kdemultimedia-extras-nonfree} +Requires: kdemultimedia >= %{epoch}:%{version} # for main akode_artsplugins bits Requires: kdemultimedia-extras >= %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: * akode_artsplugin (akode-extras), -* kfile-plugins: mp3 (taglib), +* kfile-plugins: mp3 (taglib), mpeg * krec mp3 export (lame), * mpeglib_artsplugin, * xine_artsplugin (xine-lib) @@ -204,7 +208,6 @@ DO_NOT_COMPILE="" -%{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} @@ -241,14 +244,14 @@ %endif %if "%{?extras}" == "1" -for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make %{?_smp_mflags} -C $module done %endif %if "%{?nonfree}" == "1" -for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make %{?_smp_mflags} -C $module done %endif @@ -261,17 +264,17 @@ %endif %if "%{?extras}" == "1" -for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" desktop-file-install --vendor="fedora" \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -%endif +#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -287,8 +290,8 @@ %endif %if "%{?nonfree}" == "1" -for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits @@ -359,8 +362,7 @@ %endif %if "%{?extras}" == "1" -# Since the icons come from juk -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -372,7 +374,7 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -%endif +#endif %endif %if "%{?nonfree}" == "1" @@ -413,7 +415,7 @@ %files -f extras.list %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{?juk:%dir %{_datadir}/apps/juk/} +%dir %{_datadir}/apps/juk/ %endif %if "%{?nonfree}" == "1" @@ -433,8 +435,30 @@ %changelog -* Wed Apr 05 2006 Rex Dieter 6:3.5.1-8 -- -extras: Requires: kdemultimedia >= 6:3.5.1 +* Fri May 05 2006 Rex Dieter 6:3.5.2-5 +- relax Requires: kdemultimedia + +* Fri May 05 2006 Rex Dieter 6:3.5.2-4 +- respin 3.5.2 for Extras + +* Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 +- omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) + +* Tue Mar 28 2006 Rex Dieter 6:3.5.2-2 +- -extras-nonfree: (fix) Obsoletes: kdemultimedia-nonfree + +* Mon Mar 20 2006 Rex Dieter 6:3.5.2-1 +- 3.5.2 + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-10 +- fc5: BR: libXxf86vm-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-9 +- fc5: BR: libXxf86dga-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-8 +- -extras-nonfree: rename -nonfree -> -extras-nonfree +- -extras-nonfree: drop 0.lvn from Release * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7 - kfile-plugins/mp3: -extras -> -nonfree Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Mar 2006 12:39:58 -0000 1.2 +++ sources 5 May 2006 12:29:24 -0000 1.3 @@ -1 +1 @@ -31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2 +54f9947051ee5cf50c81a5ea382943f1 kdemultimedia-3.5.2-patched.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 12:29:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 05:29:54 -0700 Subject: rpms/kdemultimedia-extras/FC-4 kdemultimedia-3.5.2-omit_kfile_mpeg.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kdemultimedia-extras.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605051229.k45CTuTv010955@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10930 Modified Files: .cvsignore kdemultimedia-extras.spec sources Added Files: kdemultimedia-3.5.2-omit_kfile_mpeg.patch Log Message: * Fri May 05 2006 Rex Dieter 6:3.5.2-5 - relax Requires: kdemultimedia kdemultimedia-3.5.2-omit_kfile_mpeg.patch: --- NEW FILE kdemultimedia-3.5.2-omit_kfile_mpeg.patch --- --- kdemultimedia-3.5.2/kfile-plugins/Makefile.am.omit_kfile_mpeg_plugin 2005-09-10 03:20:08.000000000 -0500 +++ kdemultimedia-3.5.2/kfile-plugins/Makefile.am 2006-04-02 22:01:51.000000000 -0500 @@ -18,5 +18,5 @@ KFILE_THEORA_SUBDIR=theora endif -SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \ +SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi wav sid $(KFILE_OGG_SUBDIR) \ $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Mar 2006 12:39:58 -0000 1.2 +++ .cvsignore 5 May 2006 12:29:54 -0000 1.3 @@ -1 +1 @@ -kdemultimedia-3.5.1-patched.tar.bz2 +kdemultimedia-3.5.2-patched.tar.bz2 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-4/kdemultimedia-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdemultimedia-extras.spec 13 Apr 2006 18:45:45 -0000 1.2 +++ kdemultimedia-extras.spec 5 May 2006 12:29:54 -0000 1.3 @@ -18,8 +18,6 @@ %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode -#define to include/build juk, undef not -%define juk juk # to make sure no nonfree bits get included BuildConflicts: akode-extras # debugging: to make sure no extras bits (accidentally) get excluded @@ -33,6 +31,7 @@ %define _with_akode --with-akode BuildRequires: akode-extras %define _with_lame --with-lame --disable-lametest +%define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -42,6 +41,9 @@ %endif %if "%{?fedora}" > "4" %define gst gstreamer08 +BuildRequires: libXxf86vm-devel +# likely only required for nonfree -- Rex +BuildRequires: libXxf86dga-devel %endif %if "%{?rhel}" > "3" %define _with_gstreamer --with-gstreamer @@ -58,28 +60,27 @@ Summary: Extras for KDE multimedia applications %endif %if "%{?nonfree}" == "1" -Name: kdemultimedia-nonfree +Name: kdemultimedia-extras-nonfree Summary: Nonfree Extras for KDE multimedia applications %endif Group: Applications/Multimedia Epoch: 6 -Version: 3.5.1 -Release: 8%{?dist}%{?kde} +Version: 3.5.2 +Release: 5%{?dist}%{?kde} License: GPL -%if "%{?nonfree}" == "1" -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 -%else +%if "%{?patched:1}" == "1" # From Core's kdemultimedia pkg -Source0: kdemultimedia-3.5.1-patched.tar.bz2 +Source0: kdemultimedia-%{version}-patched.tar.bz2 +%else +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 %endif Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} -BuildRequires: libtool %if "%{is_release}" != "1" BuildRequires: automake %endif @@ -113,6 +114,8 @@ ## kde-redhat patches # unconditinally include oggvorbis_artsplugin Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch +# exclude kfile_mpeg +Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch # akode: http://bugs.kde.org/116958 @@ -151,26 +154,27 @@ %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } -Requires: kdemultimedia >= %{epoch}:%{version} +Requires: kdemultimedia >= %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) -%{?juk:* juk (libtunepimp)} +* juk (libtunepimp) * kfile-plugins: flac, mpc (taglib) %endif %if "%{?nonfree}" == "1" +Obsoletes: kdemultimedia-nonfree < %{epoch}:%{version}-%{release} # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} -%{?debug:BuildConflicts: kdemultimedia-nonfree} -Requires: kdemultimedia = %{epoch}:%{version} +%{?debug:BuildConflicts: kdemultimedia-extras-nonfree} +Requires: kdemultimedia >= %{epoch}:%{version} # for main akode_artsplugins bits Requires: kdemultimedia-extras >= %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: * akode_artsplugin (akode-extras), -* kfile-plugins: mp3 (taglib), +* kfile-plugins: mp3 (taglib), mpeg * krec mp3 export (lame), * mpeglib_artsplugin, * xine_artsplugin (xine-lib) @@ -204,7 +208,6 @@ DO_NOT_COMPILE="" -%{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} @@ -241,14 +244,14 @@ %endif %if "%{?extras}" == "1" -for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make %{?_smp_mflags} -C $module done %endif %if "%{?nonfree}" == "1" -for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module %{?_smp_mflags} +for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make %{?_smp_mflags} -C $module done %endif @@ -261,17 +264,17 @@ %endif %if "%{?extras}" == "1" -for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" desktop-file-install --vendor="fedora" \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -%endif +#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -287,8 +290,8 @@ %endif %if "%{?nonfree}" == "1" -for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do -make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits @@ -359,8 +362,7 @@ %endif %if "%{?extras}" == "1" -# Since the icons come from juk -%if "%{?juk:1}" == "1" +#if "%{?juk:1}" == "1" %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -372,7 +374,7 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -%endif +#endif %endif %if "%{?nonfree}" == "1" @@ -413,7 +415,7 @@ %files -f extras.list %defattr(-,root,root,-) %doc AUTHORS COPYING README -%{?juk:%dir %{_datadir}/apps/juk/} +%dir %{_datadir}/apps/juk/ %endif %if "%{?nonfree}" == "1" @@ -433,8 +435,30 @@ %changelog -* Wed Apr 05 2006 Rex Dieter 6:3.5.1-8 -- -extras: Requires: kdemultimedia >= 6:3.5.1 +* Fri May 05 2006 Rex Dieter 6:3.5.2-5 +- relax Requires: kdemultimedia + +* Fri May 05 2006 Rex Dieter 6:3.5.2-4 +- respin 3.5.2 for Extras + +* Sun Apr 02 2006 Rex Dieter 6:3.5.2-3 +- omit kfile_mpeg from (core) kdemultimedia (-> kdemultimedia-extras-nonfree) + +* Tue Mar 28 2006 Rex Dieter 6:3.5.2-2 +- -extras-nonfree: (fix) Obsoletes: kdemultimedia-nonfree + +* Mon Mar 20 2006 Rex Dieter 6:3.5.2-1 +- 3.5.2 + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-10 +- fc5: BR: libXxf86vm-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-9 +- fc5: BR: libXxf86dga-devel + +* Fri Mar 17 2006 Rex Dieter 6:3.5.1-8 +- -extras-nonfree: rename -nonfree -> -extras-nonfree +- -extras-nonfree: drop 0.lvn from Release * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7 - kfile-plugins/mp3: -extras -> -nonfree Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Mar 2006 12:39:58 -0000 1.2 +++ sources 5 May 2006 12:29:54 -0000 1.3 @@ -1 +1 @@ -31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2 +54f9947051ee5cf50c81a5ea382943f1 kdemultimedia-3.5.2-patched.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 13:14:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 May 2006 06:14:30 -0700 Subject: rpms/Macaulay2/devel Macaulay2-0.9.8-64bit.patch, NONE, 1.1 Macaulay2.spec, 1.15, 1.16 Message-ID: <200605051314.k45DEWif013398@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13378 Modified Files: Macaulay2.spec Added Files: Macaulay2-0.9.8-64bit.patch Log Message: * Fri May 05 2006 Rex Dieter 0.9.8-0.4.cvs20060327 - 64bit patch (#188709) Macaulay2-0.9.8-64bit.patch: --- NEW FILE Macaulay2-0.9.8-64bit.patch --- --- M2/Macaulay2/e/linalgGB/linalgGB.cpp.64bit 2005-08-12 11:37:57.000000000 -0500 +++ M2/Macaulay2/e/linalgGB/linalgGB.cpp 2006-05-05 08:12:19.000000000 -0500 @@ -191,7 +191,7 @@ bool found = lookup->search(ce.monom, b); if (found) { - int which = reinterpret_cast(b->bag); + int which = (reinterpret_cast(b->bag)); uninterned_monomial um = H.reserve(MONOMIAL_LENGTH(ce.monom)); monomial m; monomial_quotient(ce.monom, gb[which]->f.monoms[0], um); Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Macaulay2.spec 12 Apr 2006 14:30:33 -0000 1.15 +++ Macaulay2.spec 5 May 2006 13:14:30 -0000 1.16 @@ -4,7 +4,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.8 -Release: 0.3.%{beta}%{?dist} +Release: 0.4.%{beta}%{?dist} License: GPL Group: Applications/Engineering @@ -13,7 +13,7 @@ Source: M2-0.9.8-%{beta}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # "64 bit build fails", http://bugzilla.redhat.com/bugzilla/188709 -ExcludeArch: x86_64 ppc64 +#ExcludeArch: x86_64 ppc64 Source1: Macaulay2.png Source2: Macaulay2.desktop @@ -23,6 +23,7 @@ Patch2: Macaulay2-0.9.8-cout.patch Patch3: Macaulay2-0.9.8-infodir.patch Patch4: Macaulay2-0.9.8-gcc4.patch +Patch5: Macaulay2-0.9.8-64bit.patch BuildRequires: desktop-file-utils BuildRequires: gc-devel @@ -69,6 +70,7 @@ %patch2 -p1 -b .cout %patch3 -p1 -b .infodir %patch4 -p1 -b .gcc4 +%patch5 -p1 -b .64bit %build @@ -142,6 +144,9 @@ %changelog +* Fri May 05 2006 Rex Dieter 0.9.8-0.4.cvs20060327 +- 64bit patch (#188709) + * Wed Apr 12 2006 Rex Dieter 0.9.8-0.3.cvs20060327 - omit x86_64, for now (#188709) From fedora-extras-commits at redhat.com Fri May 5 13:23:56 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 5 May 2006 06:23:56 -0700 Subject: fedora-security/audit fc4,1.229,1.230 fc5,1.143,1.144 Message-ID: <200605051323.k45DNukv013486@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13462 Modified Files: fc4 fc5 Log Message: Note the last few days worth of updates. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- fc4 4 May 2006 08:13:51 -0000 1.229 +++ fc4 5 May 2006 13:23:53 -0000 1.230 @@ -29,62 +29,62 @@ CVE-2006-1864 VULNERABLE (kernel) CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1742 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1742 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1742 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1741 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1741 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1741 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1740 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1740 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1739 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1739 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1739 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1738 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1738 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1738 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1737 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1737 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1737 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1736 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1736 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1735 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1735 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1735 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1734 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1734 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1734 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1733 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1733 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1733 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1732 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1732 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1732 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1731 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1731 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1731 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1730 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] +CVE-2006-1730 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1730 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1729 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1729 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1728 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1728 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1728 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1727 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1727 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1727 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1726 version (firefox, fixed 1.5.0.2) 1.5 only CVE-2006-1726 version (thunderbird, fixed 1.5.0.2) 1.5 only CVE-2006-1725 version (firefox, fixed 1.5.0.2) 1.5 only -CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1724 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-1724 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-1724 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1723 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1723 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1721 VULNERABLE (cyrus-sasl, fixd 2.1.21) #189815 +CVE-2006-1721 backport (cyrus-sasl, fixd 2.1.21) #189815 [since FEDORA-2006-515] CVE-2006-1712 version (mailman, only 2.1.7) CVE-2006-1650 ** firefox CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon @@ -96,11 +96,11 @@ CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) #187544 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) #187544 CVE-2006-1542 VULNERABLE (python) #169046 -CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1531 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1531 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1530 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) -CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8) +CVE-2006-1529 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-500] CVE-2006-1526 VULNERABLE (xorg-x11) #189802 @@ -122,7 +122,7 @@ CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) CVE-2006-1059 version (samba) -CVE-2006-1058 VULNERABLE (busybox) #187386 +CVE-2006-1058 backport (busybox) #187386 [since FEDORA-2006-511] CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) #188303 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423] CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423] @@ -134,11 +134,11 @@ CVE-2006-0903 VULNERABLE (mysql) #183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) -CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-0749 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-0749 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-0749 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] -CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.0.8) -CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-0748 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] +CVE-2006-0748 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-0746 VULNERABLE (kpdf) #184308 CVE-2006-0745 version (xorg-x11) not fc4 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- fc5 4 May 2006 08:13:26 -0000 1.143 +++ fc5 5 May 2006 13:23:53 -0000 1.144 @@ -30,61 +30,61 @@ CVE-2006-1864 ignore (kernel) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1790 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1742 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1742 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1742 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1741 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1741 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1741 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1740 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1740 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1739 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1739 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1739 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1738 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1738 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1738 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1737 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1737 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1737 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1736 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1736 VULNERABLE (firefox, fixed 1.5.0.2) CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1735 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1735 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1734 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1734 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1734 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1733 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1733 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1733 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1732 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1732 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1732 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1731 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1731 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1731 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.5.0.2) +CVE-2006-1730 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-1730 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1730 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1729 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1729 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1728 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1728 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1728 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1727 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1727 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1727 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1726 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1726 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1725 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-1726 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1726 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1725 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1724 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1724 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-1724 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1723 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-1723 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1723 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1721 version (cyrus-sasl, fixed 2.1.21) CVE-2006-1712 version (mailman, only 2.1.7) CVE-2006-1650 ** firefox @@ -96,12 +96,12 @@ CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544 CVE-2006-1542 VULNERABLE (python) bz#169046 -CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1531 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2) -CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-1531 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1531 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1530 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1530 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1529 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-1529 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499] CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] @@ -124,7 +124,7 @@ CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189] CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259] -CVE-2006-1058 VULNERABLE (busybox) bz#187386 +CVE-2006-1058 backport (busybox) bz#187386 [since FEDORA-2006-510] CVE-2006-1057 version (gdm, fixed 2.14.1) bz#188303 [since FEDORA-2006-338] CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421] CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421] @@ -136,12 +136,12 @@ CVE-2006-0903 VULNERABLE (mysql) #183261 low/not upstream yet CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) -CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13) +CVE-2006-0749 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-0749 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-0749 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] -CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.5.0.2) -CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13) -CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2) +CVE-2006-0748 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] +CVE-2006-0748 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] +CVE-2006-0748 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-0746 version (kdegraphics, fixed 3.4) CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172] CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Fri May 5 13:51:45 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 06:51:45 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.15,1.16 Message-ID: <200605051351.k45DplR5013625@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13608 Modified Files: php-eaccelerator.spec Log Message: Try to get the API version check working. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- php-eaccelerator.spec 5 May 2006 11:41:33 -0000 1.15 +++ php-eaccelerator.spec 5 May 2006 13:51:45 -0000 1.16 @@ -7,7 +7,7 @@ %define prever beta2 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) -%define php_apiver %(php -i 2>/dev/null | sed -n 's/^PHP API => //p' 2>/dev/null || echo %{default_apiver}) +%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null) | sed -n 's/^PHP API => //p' | tail -1) %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} # This is the apache userid, only used for sysvipc semaphores which is the @@ -26,7 +26,6 @@ Patch1: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: php-api = %{php_apiver} -#Requires: php = %{php_version} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel From fedora-extras-commits at redhat.com Fri May 5 13:53:17 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 5 May 2006 06:53:17 -0700 Subject: fedora-security/audit fc4,1.230,1.231 fc5,1.144,1.145 Message-ID: <200605051353.k45DrIj7013687@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13667 Modified Files: fc4 fc5 Log Message: Note the xorg update. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- fc4 5 May 2006 13:23:53 -0000 1.230 +++ fc4 5 May 2006 13:53:15 -0000 1.231 @@ -103,7 +103,7 @@ CVE-2006-1529 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-500] -CVE-2006-1526 VULNERABLE (xorg-x11) #189802 +CVE-2006-1526 backport (xorg-x11) #189802 [since FEDORA-2006-484] CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- fc5 5 May 2006 13:23:53 -0000 1.144 +++ fc5 5 May 2006 13:53:15 -0000 1.145 @@ -103,7 +103,7 @@ CVE-2006-1529 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1529 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499] -CVE-2006-1526 VULNERABLE (xorg-x11) bz#189802 +CVE-2006-1526 backport (xorg-x11) bz#189802 [since FEDORA-2006-483] CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Fri May 5 13:57:59 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 May 2006 06:57:59 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.16,1.17 Message-ID: <200605051358.k45Dw1WM013746@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13729 Modified Files: php-eaccelerator.spec Log Message: Try to get the API version check working. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- php-eaccelerator.spec 5 May 2006 13:51:45 -0000 1.16 +++ php-eaccelerator.spec 5 May 2006 13:57:59 -0000 1.17 @@ -7,7 +7,7 @@ %define prever beta2 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) -%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null) | sed -n 's/^PHP API => //p' | tail -1) +%define php_apiver %(echo %{default_apiver}; (php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} # This is the apache userid, only used for sysvipc semaphores which is the From fedora-extras-commits at redhat.com Fri May 5 14:52:44 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:52:44 -0700 Subject: rpms/python-paramiko/devel .cvsignore, 1.2, 1.3 python-paramiko.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605051452.k45EqkQh016230@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16176/devel Modified Files: .cvsignore python-paramiko.spec sources Log Message: Update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Apr 2006 14:38:24 -0000 1.2 +++ .cvsignore 5 May 2006 14:52:44 -0000 1.3 @@ -1 +1 @@ -paramiko-1.5.3.zip +paramiko-1.5.4.zip Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/devel/python-paramiko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-paramiko.spec 13 Apr 2006 14:38:24 -0000 1.1 +++ python-paramiko.spec 5 May 2006 14:52:44 -0000 1.2 @@ -4,7 +4,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -54,5 +54,8 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-1 +- Update to new upstream version + * Wed Apr 12 2006 Shahms E. King 1.5.3-1 - Initial package Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2006 14:38:24 -0000 1.2 +++ sources 5 May 2006 14:52:44 -0000 1.3 @@ -1 +1 @@ -9c1389f19a331554e052a7e4e2b1471c paramiko-1.5.3.zip +a580fab7d295e7c731d0c270465d9560 paramiko-1.5.4.zip From fedora-extras-commits at redhat.com Fri May 5 14:52:38 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:52:38 -0700 Subject: rpms/python-paramiko/FC-4 python-paramiko.spec,1.1,1.2 Message-ID: <200605051453.k45ErAQr016234@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16176/FC-4 Modified Files: python-paramiko.spec Log Message: Update to new upstream version Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-4/python-paramiko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-paramiko.spec 13 Apr 2006 14:38:24 -0000 1.1 +++ python-paramiko.spec 5 May 2006 14:52:38 -0000 1.2 @@ -4,7 +4,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -54,5 +54,8 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-1 +- Update to new upstream version + * Wed Apr 12 2006 Shahms E. King 1.5.3-1 - Initial package From fedora-extras-commits at redhat.com Fri May 5 14:52:39 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:52:39 -0700 Subject: rpms/python-paramiko/FC-5 python-paramiko.spec,1.1,1.2 Message-ID: <200605051453.k45ErB6S016237@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16176/FC-5 Modified Files: python-paramiko.spec Log Message: Update to new upstream version Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-5/python-paramiko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-paramiko.spec 13 Apr 2006 14:38:24 -0000 1.1 +++ python-paramiko.spec 5 May 2006 14:52:38 -0000 1.2 @@ -4,7 +4,7 @@ %define srcname paramiko Name: python-paramiko -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} Summary: A SSH2 protocol library for python @@ -54,5 +54,8 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-1 +- Update to new upstream version + * Wed Apr 12 2006 Shahms E. King 1.5.3-1 - Initial package From fedora-extras-commits at redhat.com Fri May 5 14:55:27 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:55:27 -0700 Subject: rpms/python-psyco/devel .cvsignore, 1.3, 1.4 python-psyco.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605051455.k45EtTBv016404@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16365/devel Modified Files: .cvsignore python-psyco.spec sources Log Message: Update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-psyco/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Nov 2005 20:24:34 -0000 1.3 +++ .cvsignore 5 May 2006 14:55:27 -0000 1.4 @@ -1 +1 @@ -psyco-1.5-src.tar.gz +psyco-1.5.1-src.tar.gz Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/devel/python-psyco.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-psyco.spec 13 Feb 2006 17:47:48 -0000 1.8 +++ python-psyco.spec 5 May 2006 14:55:27 -0000 1.9 @@ -3,8 +3,8 @@ %define srcname psyco Name: python-%{srcname} -Version: 1.5 -Release: 4%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,9 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-1 +- Update to new upstream + * Mon Feb 13 2006 Shahms E. King 1.5-4 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-psyco/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 20:24:34 -0000 1.3 +++ sources 5 May 2006 14:55:27 -0000 1.4 @@ -1 +1 @@ -ff79e5daf94924fc7401d336d33edebf psyco-1.5-src.tar.gz +89e629d27acda765f01aa870230d1162 psyco-1.5.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 5 14:55:26 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:55:26 -0700 Subject: rpms/python-psyco/FC-4 python-psyco.spec,1.8,1.9 Message-ID: <200605051455.k45EtS37016398@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16365/FC-4 Modified Files: python-psyco.spec Log Message: Update to new upstream version Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-4/python-psyco.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-psyco.spec 13 Feb 2006 17:47:42 -0000 1.8 +++ python-psyco.spec 5 May 2006 14:55:26 -0000 1.9 @@ -3,8 +3,8 @@ %define srcname psyco Name: python-%{srcname} -Version: 1.5 -Release: 4%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,9 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-1 +- Update to new upstream + * Mon Feb 13 2006 Shahms E. King 1.5-4 - Rebuild for FC5 From fedora-extras-commits at redhat.com Fri May 5 14:58:07 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:58:07 -0700 Subject: rpms/python-paramiko/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605051458.k45Ew9cm016527@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16493/FC-4 Modified Files: .cvsignore sources Log Message: fix sources and cvsignore in FC-4 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Apr 2006 14:38:24 -0000 1.2 +++ .cvsignore 5 May 2006 14:58:07 -0000 1.3 @@ -1 +1 @@ -paramiko-1.5.3.zip +paramiko-1.5.4.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2006 14:38:24 -0000 1.2 +++ sources 5 May 2006 14:58:07 -0000 1.3 @@ -1 +1 @@ -9c1389f19a331554e052a7e4e2b1471c paramiko-1.5.3.zip +a580fab7d295e7c731d0c270465d9560 paramiko-1.5.4.zip From fedora-extras-commits at redhat.com Fri May 5 14:58:08 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:58:08 -0700 Subject: rpms/python-paramiko/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605051458.k45EwAKQ016532@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16493/FC-5 Modified Files: .cvsignore sources Log Message: fix sources and cvsignore in FC-4 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Apr 2006 14:38:24 -0000 1.2 +++ .cvsignore 5 May 2006 14:58:07 -0000 1.3 @@ -1 +1 @@ -paramiko-1.5.3.zip +paramiko-1.5.4.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2006 14:38:24 -0000 1.2 +++ sources 5 May 2006 14:58:07 -0000 1.3 @@ -1 +1 @@ -9c1389f19a331554e052a7e4e2b1471c paramiko-1.5.3.zip +a580fab7d295e7c731d0c270465d9560 paramiko-1.5.4.zip From fedora-extras-commits at redhat.com Fri May 5 14:58:31 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:58:31 -0700 Subject: rpms/python-psyco/FC-4 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200605051459.k45Ex3UJ016573@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16538/FC-4 Modified Files: .cvsignore sources Log Message: fix cvsignore and sources in FC-4 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Nov 2005 20:24:29 -0000 1.3 +++ .cvsignore 5 May 2006 14:58:31 -0000 1.4 @@ -1 +1 @@ -psyco-1.5-src.tar.gz +psyco-1.5.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 20:24:29 -0000 1.3 +++ sources 5 May 2006 14:58:31 -0000 1.4 @@ -1 +1 @@ -ff79e5daf94924fc7401d336d33edebf psyco-1.5-src.tar.gz +89e629d27acda765f01aa870230d1162 psyco-1.5.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 5 14:58:32 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 07:58:32 -0700 Subject: rpms/python-psyco/FC-5 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200605051459.k45Ex4vg016577@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16538/FC-5 Modified Files: .cvsignore sources Log Message: fix cvsignore and sources in FC-4 and FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Nov 2005 20:24:34 -0000 1.3 +++ .cvsignore 5 May 2006 14:58:32 -0000 1.4 @@ -1 +1 @@ -psyco-1.5-src.tar.gz +psyco-1.5.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Nov 2005 20:24:34 -0000 1.3 +++ sources 5 May 2006 14:58:32 -0000 1.4 @@ -1 +1 @@ -ff79e5daf94924fc7401d336d33edebf psyco-1.5-src.tar.gz +89e629d27acda765f01aa870230d1162 psyco-1.5.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 5 15:02:41 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:02:41 -0700 Subject: rpms/python-paramiko/devel python-paramiko.spec,1.2,1.3 Message-ID: <200605051502.k45F2hjQ018787@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18738/devel Modified Files: python-paramiko.spec Log Message: fix source line and rebuild Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/devel/python-paramiko.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-paramiko.spec 5 May 2006 14:52:44 -0000 1.2 +++ python-paramiko.spec 5 May 2006 15:02:40 -0000 1.3 @@ -5,7 +5,7 @@ Name: python-paramiko Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SSH2 protocol library for python Group: Development/Libraries @@ -54,6 +54,9 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.4-1 - Update to new upstream version From fedora-extras-commits at redhat.com Fri May 5 15:02:30 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:02:30 -0700 Subject: rpms/python-paramiko/FC-4 python-paramiko.spec,1.2,1.3 Message-ID: <200605051503.k45F33Gl018793@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18738/FC-4 Modified Files: python-paramiko.spec Log Message: fix source line and rebuild Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-4/python-paramiko.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-paramiko.spec 5 May 2006 14:52:38 -0000 1.2 +++ python-paramiko.spec 5 May 2006 15:02:30 -0000 1.3 @@ -5,7 +5,7 @@ Name: python-paramiko Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SSH2 protocol library for python Group: Development/Libraries @@ -54,6 +54,9 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.4-1 - Update to new upstream version From fedora-extras-commits at redhat.com Fri May 5 15:02:35 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:02:35 -0700 Subject: rpms/python-paramiko/FC-5 python-paramiko.spec,1.2,1.3 Message-ID: <200605051503.k45F3A6m018796@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-paramiko/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18738/FC-5 Modified Files: python-paramiko.spec Log Message: fix source line and rebuild Index: python-paramiko.spec =================================================================== RCS file: /cvs/extras/rpms/python-paramiko/FC-5/python-paramiko.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-paramiko.spec 5 May 2006 14:52:38 -0000 1.2 +++ python-paramiko.spec 5 May 2006 15:02:35 -0000 1.3 @@ -5,7 +5,7 @@ Name: python-paramiko Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SSH2 protocol library for python Group: Development/Libraries @@ -54,6 +54,9 @@ %{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info %changelog +* Fri May 05 2006 Shahms E. King 1.5.4-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.4-1 - Update to new upstream version From fedora-extras-commits at redhat.com Fri May 5 15:03:28 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:03:28 -0700 Subject: rpms/python-psyco/FC-5 python-psyco.spec,1.8,1.9 Message-ID: <200605051503.k45F3VBb018853@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/FC-5 Modified Files: python-psyco.spec Log Message: fix source line and rebuild Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-5/python-psyco.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-psyco.spec 13 Feb 2006 17:47:48 -0000 1.8 +++ python-psyco.spec 5 May 2006 15:03:26 -0000 1.9 @@ -3,8 +3,8 @@ %define srcname psyco Name: python-%{srcname} -Version: 1.5 -Release: 4%{?dist} +Version: 1.5.1 +Release: 2%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,12 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-2 +- Fix source line and rebuild + +* Fri May 05 2006 Shahms E. King 1.5.1-1 +- Update to new upstream + * Mon Feb 13 2006 Shahms E. King 1.5-4 - Rebuild for FC5 From fedora-extras-commits at redhat.com Fri May 5 15:03:29 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:03:29 -0700 Subject: rpms/python-psyco/devel python-psyco.spec,1.9,1.10 Message-ID: <200605051503.k45F3V8e018855@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/devel Modified Files: python-psyco.spec Log Message: fix source line and rebuild Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/devel/python-psyco.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-psyco.spec 5 May 2006 14:55:27 -0000 1.9 +++ python-psyco.spec 5 May 2006 15:03:29 -0000 1.10 @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,9 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.1-1 - Update to new upstream From fedora-extras-commits at redhat.com Fri May 5 15:03:21 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Fri, 5 May 2006 08:03:21 -0700 Subject: rpms/python-psyco/FC-4 python-psyco.spec,1.9,1.10 Message-ID: <200605051503.k45F3tjV018961@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-psyco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18803/FC-4 Modified Files: python-psyco.spec Log Message: fix source line and rebuild Index: python-psyco.spec =================================================================== RCS file: /cvs/extras/rpms/python-psyco/FC-4/python-psyco.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-psyco.spec 5 May 2006 14:55:26 -0000 1.9 +++ python-psyco.spec 5 May 2006 15:03:21 -0000 1.10 @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Python Specialing Compiler @@ -55,6 +55,9 @@ %ghost %{python_sitearch}/psyco/*.pyo %changelog +* Fri May 05 2006 Shahms E. King 1.5.1-2 +- Fix source line and rebuild + * Fri May 05 2006 Shahms E. King 1.5.1-1 - Update to new upstream From fedora-extras-commits at redhat.com Fri May 5 17:17:38 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 5 May 2006 10:17:38 -0700 Subject: rpms/environment-modules/FC-4 .cvsignore, 1.3, 1.4 environment-modules.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605051718.k45HIADN024256@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24193/FC-4 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Mar 2006 18:53:24 -0000 1.3 +++ .cvsignore 5 May 2006 17:17:38 -0000 1.4 @@ -1 +1 @@ -modules-3.2.1.tar.bz2 +modules-3.2.2.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/environment-modules.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- environment-modules.spec 24 Mar 2006 18:53:24 -0000 1.2 +++ environment-modules.spec 5 May 2006 17:17:38 -0000 1.3 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri May 5 2006 - Orion Poplawski - 3.2.2-1 +- Update to 3.2.2 + * Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 - Update to 3.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Mar 2006 18:53:24 -0000 1.3 +++ sources 5 May 2006 17:17:38 -0000 1.4 @@ -1 +1 @@ -fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 +c2d8ed5b09cc6de43889bb30cecb43b0 modules-3.2.2.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 17:17:39 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 5 May 2006 10:17:39 -0700 Subject: rpms/environment-modules/FC-5 .cvsignore, 1.3, 1.4 environment-modules.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605051718.k45HIBxa024261@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24193/FC-5 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Mar 2006 18:51:28 -0000 1.3 +++ .cvsignore 5 May 2006 17:17:39 -0000 1.4 @@ -1 +1 @@ -modules-3.2.1.tar.bz2 +modules-3.2.2.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/environment-modules.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- environment-modules.spec 24 Mar 2006 18:51:28 -0000 1.2 +++ environment-modules.spec 5 May 2006 17:17:39 -0000 1.3 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri May 5 2006 - Orion Poplawski - 3.2.2-1 +- Update to 3.2.2 + * Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 - Update to 3.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Mar 2006 18:51:28 -0000 1.3 +++ sources 5 May 2006 17:17:39 -0000 1.4 @@ -1 +1 @@ -fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 +c2d8ed5b09cc6de43889bb30cecb43b0 modules-3.2.2.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 17:17:40 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 5 May 2006 10:17:40 -0700 Subject: rpms/environment-modules/devel .cvsignore, 1.3, 1.4 environment-modules.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605051718.k45HICRn024266@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24193/devel Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Mar 2006 16:46:26 -0000 1.3 +++ .cvsignore 5 May 2006 17:17:40 -0000 1.4 @@ -1 +1 @@ -modules-3.2.1.tar.bz2 +modules-3.2.2.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/environment-modules.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- environment-modules.spec 24 Mar 2006 16:46:26 -0000 1.2 +++ environment-modules.spec 5 May 2006 17:17:40 -0000 1.3 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri May 5 2006 - Orion Poplawski - 3.2.2-1 +- Update to 3.2.2 + * Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 - Update to 3.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Mar 2006 16:46:26 -0000 1.3 +++ sources 5 May 2006 17:17:40 -0000 1.4 @@ -1 +1 @@ -fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 +c2d8ed5b09cc6de43889bb30cecb43b0 modules-3.2.2.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 17:50:21 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Fri, 5 May 2006 10:50:21 -0700 Subject: fedora-security/audit fe4,1.3,1.4 fe5,1.3,1.4 Message-ID: <200605051750.k45HoLiP024568@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24548 Modified Files: fe4 fe5 Log Message: Add recent clamav issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fe4 4 May 2006 11:56:15 -0000 1.3 +++ fe4 5 May 2006 17:50:19 -0000 1.4 @@ -4,3 +4,4 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 +CVE-2006-1989 version (clamav, fixed 0.88.2) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fe5 4 May 2006 11:56:15 -0000 1.3 +++ fe5 5 May 2006 17:50:19 -0000 1.4 @@ -4,3 +4,4 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 +CVE-2006-1989 version (clamav, fixed 0.88.2) From fedora-extras-commits at redhat.com Fri May 5 18:07:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 5 May 2006 11:07:18 -0700 Subject: rpms/syslog-ng/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.13, 1.14 Message-ID: <200605051807.k45I7KXO026874@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26853 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Mar 2006 16:52:52 -0000 1.5 +++ .cvsignore 5 May 2006 18:07:18 -0000 1.6 @@ -1 +1 @@ -syslog-ng-1.6.10.tar.gz +syslog-ng-1.6.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Mar 2006 16:52:52 -0000 1.5 +++ sources 5 May 2006 18:07:18 -0000 1.6 @@ -1 +1 @@ -b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz +8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- syslog-ng.spec 5 Apr 2006 20:24:10 -0000 1.13 +++ syslog-ng.spec 5 May 2006 18:07:18 -0000 1.14 @@ -12,8 +12,8 @@ %{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.10 -Release: 2%{?dist} +Version: 1.6.11 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -129,6 +129,9 @@ %changelog +* Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 +- Update to 1.6.11. + * Sun Apr 2 2006 Jose Pedro Oliveira - 1.6.10-2 - Build option to support the syslog-ng spoof-source feature (the feature spoof-source is disabled by default). From fedora-extras-commits at redhat.com Fri May 5 18:08:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 May 2006 11:08:47 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.2,1.3 Message-ID: <200605051808.k45I8nIo026944@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26927 Modified Files: gcompris.spec Log Message: * Fri May 5 2006 Hans de Goede 7.4-6 - Add missing python module Requires. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcompris.spec 1 May 2006 16:07:48 -0000 1.2 +++ gcompris.spec 5 May 2006 18:08:47 -0000 1.3 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -18,6 +18,7 @@ Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags +Requires: gnome-python2-canvas python-sqlite2 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -475,6 +476,9 @@ %changelog +* Fri May 5 2006 Hans de Goede 7.4-6 +- Add missing python module Requires. + * Mon May 1 2006 Hans de Goede 7.4-5 - Make -devel require -libs instead of -lib (oops). From fedora-extras-commits at redhat.com Fri May 5 18:11:25 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 May 2006 11:11:25 -0700 Subject: rpms/gcompris/FC-5 gcompris.spec,1.2,1.3 Message-ID: <200605051811.k45IBRxu027063@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27046 Modified Files: gcompris.spec Log Message: * Fri May 5 2006 Hans de Goede 7.4-6 - Add missing python module Requires. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcompris.spec 1 May 2006 16:14:25 -0000 1.2 +++ gcompris.spec 5 May 2006 18:11:25 -0000 1.3 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -18,6 +18,7 @@ Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags +Requires: gnome-python2-canvas python-sqlite2 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -475,6 +476,9 @@ %changelog +* Fri May 5 2006 Hans de Goede 7.4-6 +- Add missing python module Requires. + * Mon May 1 2006 Hans de Goede 7.4-5 - Make -devel require -libs instead of -lib (oops). From fedora-extras-commits at redhat.com Fri May 5 18:45:25 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:45:25 -0700 Subject: rpms/xfce4-mailwatch-plugin - New directory Message-ID: <200605051845.k45IjRa3027417@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27391/xfce4-mailwatch-plugin Log Message: Directory /cvs/extras/rpms/xfce4-mailwatch-plugin added to the repository From fedora-extras-commits at redhat.com Fri May 5 18:45:25 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:45:25 -0700 Subject: rpms/xfce4-mailwatch-plugin/devel - New directory Message-ID: <200605051845.k45IjR5t027420@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27391/xfce4-mailwatch-plugin/devel Log Message: Directory /cvs/extras/rpms/xfce4-mailwatch-plugin/devel added to the repository From fedora-extras-commits at redhat.com Fri May 5 18:45:40 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:45:40 -0700 Subject: rpms/xfce4-mailwatch-plugin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605051845.k45IjgDc027466@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27438 Added Files: Makefile import.log Log Message: Setup of module xfce4-mailwatch-plugin --- NEW FILE Makefile --- # Top level Makefile for module xfce4-mailwatch-plugin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 5 18:45:40 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:45:40 -0700 Subject: rpms/xfce4-mailwatch-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605051845.k45Ijgna027469@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27438/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xfce4-mailwatch-plugin --- NEW 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 May 5 18:46:49 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:46:49 -0700 Subject: rpms/xfce4-mailwatch-plugin import.log,1.1,1.2 Message-ID: <200605051846.k45IkpBj027554@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27519 Modified Files: import.log Log Message: auto-import xfce4-mailwatch-plugin-1.0.0-2.fc5 on branch devel from xfce4-mailwatch-plugin-1.0.0-2.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xfce4-mailwatch-plugin/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 May 2006 18:45:39 -0000 1.1 +++ import.log 5 May 2006 18:46:49 -0000 1.2 @@ -0,0 +1 @@ +xfce4-mailwatch-plugin-1_0_0-2_fc5:HEAD:xfce4-mailwatch-plugin-1.0.0-2.fc5.src.rpm:1146854801 From fedora-extras-commits at redhat.com Fri May 5 18:46:49 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 11:46:49 -0700 Subject: rpms/xfce4-mailwatch-plugin/devel xfce4-mailwatch-plugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605051846.k45IkpRM027559@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-mailwatch-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27519/devel Modified Files: .cvsignore sources Added Files: xfce4-mailwatch-plugin.spec Log Message: auto-import xfce4-mailwatch-plugin-1.0.0-2.fc5 on branch devel from xfce4-mailwatch-plugin-1.0.0-2.fc5.src.rpm --- NEW FILE xfce4-mailwatch-plugin.spec --- Name: xfce4-mailwatch-plugin Version: 1.0.0 Release: 2%{?dist} Summary: Mail Watcher plugin for the Xfce panel Group: User Interface/Desktops License: GPL URL: http://spuriousinterrupt.org/projects/mailwatch Source0: http://spuriousinterrupt.org/files/mailwatch/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel BuildRequires: gettext # only enable TLS support if a recent version of gnutls is available # install libXt for modular X %if "%fedora" > "4" BuildRequires: gnutls-devel >= 1.2.0, libXt-devel %endif Requires: xfce4-panel >= 4.2 %description Mailwatch is a plugin for the Xfce 4 panel. It is intended to replace the current (4.0, 4.2) mail checker plugin in Xfce 4.4. It supports IMAP and POP, local mailboxes in Mbox, Maildir and MH-Maildir format as well as Gmail. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libdir}/xfce4/panel-plugins/*.so %{_datadir}/icons/hicolor/48x48/apps/xfce-newmail.png %{_datadir}/icons/hicolor/48x48/apps/xfce-nomail.png %{_datadir}/icons/hicolor/scalable/apps/xfce-newmail.svg %{_datadir}/icons/hicolor/scalable/apps/xfce-nomail.svg %{_datadir}/xfce4/doc/C/xfce4-mailwatch-plugin.html %{_datadir}/xfce4/doc/C/images/mailwatch-*.png %changelog * Mon Apr 10 2006 Christoph Wickert - 1.0.0-2 - Fix description. - Fix files section. - Require xfce4-panel. * Sat Feb 18 2006 Christoph Wickert - 1.0.0-1 - Initial Fedora Extras release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-mailwatch-plugin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 May 2006 18:45:40 -0000 1.1 +++ .cvsignore 5 May 2006 18:46:49 -0000 1.2 @@ -0,0 +1 @@ +xfce4-mailwatch-plugin-1.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-mailwatch-plugin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 May 2006 18:45:40 -0000 1.1 +++ sources 5 May 2006 18:46:49 -0000 1.2 @@ -0,0 +1 @@ +e31d32b08f82e24e730831641cdd65f0 xfce4-mailwatch-plugin-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 18:47:25 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:47:25 -0700 Subject: rpms/netpanzer-data - New directory Message-ID: <200605051847.k45IlRZe027638@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27617/netpanzer-data Log Message: Directory /cvs/extras/rpms/netpanzer-data added to the repository From fedora-extras-commits at redhat.com Fri May 5 18:47:26 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:47:26 -0700 Subject: rpms/netpanzer-data/devel - New directory Message-ID: <200605051847.k45IlSeP027641@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27617/netpanzer-data/devel Log Message: Directory /cvs/extras/rpms/netpanzer-data/devel added to the repository From fedora-extras-commits at redhat.com Fri May 5 18:48:03 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:48:03 -0700 Subject: rpms/netpanzer-data Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605051848.k45Im5MG027695@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27662 Added Files: Makefile import.log Log Message: Setup of module netpanzer-data --- NEW FILE Makefile --- # Top level Makefile for module netpanzer-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 May 5 18:48:03 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:48:03 -0700 Subject: rpms/netpanzer-data/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605051848.k45Im5AM027698@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27662/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module netpanzer-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 May 5 18:59:25 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:59:25 -0700 Subject: rpms/netpanzer-data import.log,1.1,1.2 Message-ID: <200605051859.k45IxvWF028116@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28080 Modified Files: import.log Log Message: auto-import netpanzer-data-0.8-3 on branch devel from netpanzer-data-0.8-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/netpanzer-data/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 May 2006 18:48:02 -0000 1.1 +++ import.log 5 May 2006 18:59:25 -0000 1.2 @@ -0,0 +1 @@ +netpanzer-data-0_8-3:HEAD:netpanzer-data-0.8-3.src.rpm:1146855931 From fedora-extras-commits at redhat.com Fri May 5 18:59:26 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 11:59:26 -0700 Subject: rpms/netpanzer-data/devel netpanzer-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605051859.k45Ixw9v028120@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28080/devel Modified Files: .cvsignore sources Added Files: netpanzer-data.spec Log Message: auto-import netpanzer-data-0.8-3 on branch devel from netpanzer-data-0.8-3.src.rpm --- NEW FILE netpanzer-data.spec --- Name: netpanzer-data Version: 0.8 Release: 3 Summary: Data files for netpanzer Group: Amusements/Games License: GPL URL: http://netpanzer.berlios.de Source0: http://download.berlios.de/netpanzer/netpanzer-data-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # While contents of this packages includes only data-files, they are included # with configure script and jam (make substitute). This is really strange indeed, # but this configure searchs for these dependencies below. BuildRequires: jam, physfs-devel >= 0.1.9, doxygen BuildRequires: SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2 Requires: netpanzer = %{version} %description This package contains the graphics and sounds for netpanzer, an online multiplayer tactical warfare game designed for FAST ACTION combat. %prep %setup -q # Strip \r from RELNOTES file sed -i 's/\r//' RELNOTES %build %configure --target=i386-redhat-linux-gnu jam %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT jam install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README RELNOTES TODO %{_datadir}/netpanzer %changelog * Thu May 4 2006 Hugo Cisneiros 0.8-3 - Removed desktop-file-utils BuildReq entry * Mon May 1 2006 Hugo Cisneiros 0.8-2 - Changed Package's RPM Group - Fixed Changelog entries to specify versions - Stripped '\r' EOL from RELNOTES file * Mon May 1 2006 Hugo Cisneiros 0.8-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/netpanzer-data/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 May 2006 18:48:03 -0000 1.1 +++ .cvsignore 5 May 2006 18:59:26 -0000 1.2 @@ -0,0 +1 @@ +netpanzer-data-0.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/netpanzer-data/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 May 2006 18:48:03 -0000 1.1 +++ sources 5 May 2006 18:59:26 -0000 1.2 @@ -0,0 +1 @@ +d2dbd5a6c38a181fa3b6aa9a68c81d2f netpanzer-data-0.8.tar.bz2 From fedora-extras-commits at redhat.com Fri May 5 19:05:08 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 5 May 2006 12:05:08 -0700 Subject: owners owners.list,1.941,1.942 Message-ID: <200605051905.k45J5AKc030384@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30365 Modified Files: owners.list Log Message: add xfce4-mailwatch-plugin Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.941 retrieving revision 1.942 diff -u -r1.941 -r1.942 --- owners.list 4 May 2006 21:57:13 -0000 1.941 +++ owners.list 5 May 2006 19:05:08 -0000 1.942 @@ -1641,6 +1641,7 @@ Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| +Fedora Extras|xfce4-mailwatch-plugin|Mail Watcher plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 5 19:13:57 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 5 May 2006 12:13:57 -0700 Subject: fedora-security/audit fe4,1.4,1.5 fe5,1.4,1.5 Message-ID: <200605051913.k45JDvsr030432@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30412 Modified Files: fe4 fe5 Log Message: Note a new openvpn issue Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fe4 5 May 2006 17:50:19 -0000 1.4 +++ fe4 5 May 2006 19:13:55 -0000 1.5 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-1989 version (clamav, fixed 0.88.2) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fe5 5 May 2006 17:50:19 -0000 1.4 +++ fe5 5 May 2006 19:13:55 -0000 1.5 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-1989 version (clamav, fixed 0.88.2) From fedora-extras-commits at redhat.com Fri May 5 19:22:51 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 12:22:51 -0700 Subject: owners owners.list,1.942,1.943 Message-ID: <200605051922.k45JMrXk030684@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30667 Modified Files: owners.list Log Message: added netpanzer-data Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.942 retrieving revision 1.943 diff -u -r1.942 -r1.943 --- owners.list 5 May 2006 19:05:08 -0000 1.942 +++ owners.list 5 May 2006 19:22:51 -0000 1.943 @@ -805,6 +805,7 @@ Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|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|netpanzer|An Online Multiplayer Tactical Warfare Game|hugo at devin.com.br|extras-qa at fedoraproject.org| +Fedora Extras|netpanzer-data|Data files for netpanzer|hugo at devin.com.br|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|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|new|A simple template system|redhat at flyn.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 5 19:54:13 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 5 May 2006 12:54:13 -0700 Subject: fedora-security/audit fc4,1.231,1.232 fc5,1.145,1.146 Message-ID: <200605051954.k45JsDu3031001@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30975 Modified Files: fc4 fc5 Log Message: Add the new mysql CVE ids. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- fc4 5 May 2006 13:53:15 -0000 1.231 +++ fc4 5 May 2006 19:54:11 -0000 1.232 @@ -108,6 +108,9 @@ CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423] +CVE-2006-1518 ignore (mysql) 5.x only +CVE-2006-1517 VULNERABLE (mysql, fixed 4.1.19) #190868 +CVE-2006-1516 VULNERABLE (mysql, fixed 4.1.19) #190866 CVE-2006-1494 VULNERABLE (php) #189592 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1354 VULNERABLE (freeradius) #186084 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- fc5 5 May 2006 13:53:15 -0000 1.145 +++ fc5 5 May 2006 19:54:11 -0000 1.146 @@ -108,6 +108,9 @@ CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421] +CVE-2006-1518 VULNERABLE (mysql, fixed 5.0.21) #190870 +CVE-2006-1517 VULNERABLE (mysql, fixed 5.0.21) #190868 +CVE-2006-1516 VULNERABLE (mysql, fixed 5.0.21) #190866 CVE-2006-1494 VULNERABLE (php)#189592 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 From fedora-extras-commits at redhat.com Fri May 5 21:31:01 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Fri, 5 May 2006 14:31:01 -0700 Subject: rpms/netpanzer-data/FC-4 netpanzer-data.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200605052131.k45LV3Cj003505@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/netpanzer-data/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3486 Modified Files: sources Added Files: netpanzer-data.spec Log Message: --- NEW FILE netpanzer-data.spec --- Name: netpanzer-data Version: 0.8 Release: 3 Summary: Data files for netpanzer Group: Amusements/Games License: GPL URL: http://netpanzer.berlios.de Source0: http://download.berlios.de/netpanzer/netpanzer-data-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # While contents of this packages includes only data-files, they are included # with configure script and jam (make substitute). This is really strange indeed, # but this configure searchs for these dependencies below. BuildRequires: jam, physfs-devel >= 0.1.9, doxygen BuildRequires: SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2 Requires: netpanzer = %{version} %description This package contains the graphics and sounds for netpanzer, an online multiplayer tactical warfare game designed for FAST ACTION combat. %prep %setup -q # Strip \r from RELNOTES file sed -i 's/\r//' RELNOTES %build %configure --target=i386-redhat-linux-gnu jam %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT jam install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING README RELNOTES TODO %{_datadir}/netpanzer %changelog * Thu May 4 2006 Hugo Cisneiros 0.8-3 - Removed desktop-file-utils BuildReq entry * Mon May 1 2006 Hugo Cisneiros 0.8-2 - Changed Package's RPM Group - Fixed Changelog entries to specify versions - Stripped '\r' EOL from RELNOTES file * Mon May 1 2006 Hugo Cisneiros 0.8-1 - Initial RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/netpanzer-data/FC-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 May 2006 18:48:03 -0000 1.1 +++ sources 5 May 2006 21:31:00 -0000 1.2 @@ -0,0 +1 @@ +d2dbd5a6c38a181fa3b6aa9a68c81d2f netpanzer-data-0.8.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 04:00:04 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Fri, 5 May 2006 21:00:04 -0700 Subject: rpms/stratagus/devel stratagus.spec,1.6,1.7 Message-ID: <200605060400.k46406St017719@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17691 Modified Files: stratagus.spec Log Message: Added link to page with datasets Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- stratagus.spec 30 Mar 2006 20:08:35 -0000 1.6 +++ stratagus.spec 6 May 2006 04:00:04 -0000 1.7 @@ -6,7 +6,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -34,7 +34,8 @@ includes support for playing over the internet/LAN, or playing a computer opponent. The engine is configurable and can be used to create games with a wide-range of features specific to your needs. See the -data sets page for a list of current games using the stratagus engine. +data sets page ( http://stratagus.sourceforge.net/games.shtml ) for a list +of current games using the stratagus engine. %prep %setup -q -n %{name}-040702 @@ -71,6 +72,9 @@ %changelog +* Sat May 06 2006 Peter Lemenkov 2.1-6%{?dist} +- Added link to page with datasets + * Thu Mar 30 2006 Peter Lemenkov 2.1-5%{?dist} - addition of new patch From fedora-extras-commits at redhat.com Sat May 6 06:43:16 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 5 May 2006 23:43:16 -0700 Subject: rpms/tetex-dvipost/devel tetex-dvipost.spec,1.1,1.2 Message-ID: <200605060643.k466hIOB024753@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tetex-dvipost/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24736 Modified Files: tetex-dvipost.spec Log Message: * Sat May 6 2006 Jos?? Matos - 1.1-5 - Clean up spec file Index: tetex-dvipost.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-dvipost/devel/tetex-dvipost.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-dvipost.spec 27 Apr 2006 16:18:45 -0000 1.1 +++ tetex-dvipost.spec 6 May 2006 06:43:15 -0000 1.2 @@ -1,9 +1,9 @@ %define real_name dvipost -%define texmf %{_datadir}/texmf +%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} Name: tetex-%{real_name} Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: LaTeX post filter command to support change bars and overstrike mode Group: Applications/Publishing @@ -13,11 +13,9 @@ Patch0: %{name}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tetex BuildRequires: tetex-latex +BuildRequires: /usr/bin/kpsewhich -Requires: tetex -Requires: tetex-fonts Requires: tetex-latex %description @@ -55,13 +53,16 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%{texmf}/tex/latex/misc/* +%{_texmf}/tex/latex/misc/* %doc README COPYING NOTES dvipost.html %{_mandir}/man*/* %changelog +* Sat May 6 2006 Jos?? Matos - 1.1-5 +- Clean up spec file + * Thu Apr 27 2006 Jos?? Matos - 1.1-4 - Rename package to tetex-dvipost From fedora-extras-commits at redhat.com Sat May 6 06:43:34 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 5 May 2006 23:43:34 -0700 Subject: rpms/tetex-dvipost/FC-5 tetex-dvipost.spec,1.1,1.2 Message-ID: <200605060643.k466haw9024778@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tetex-dvipost/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24761 Modified Files: tetex-dvipost.spec Log Message: * Sat May 6 2006 Jos?? Matos - 1.1-5 - Clean up spec file Index: tetex-dvipost.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-dvipost/FC-5/tetex-dvipost.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-dvipost.spec 27 Apr 2006 16:18:45 -0000 1.1 +++ tetex-dvipost.spec 6 May 2006 06:43:34 -0000 1.2 @@ -1,9 +1,9 @@ %define real_name dvipost -%define texmf %{_datadir}/texmf +%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} Name: tetex-%{real_name} Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: LaTeX post filter command to support change bars and overstrike mode Group: Applications/Publishing @@ -13,11 +13,9 @@ Patch0: %{name}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tetex BuildRequires: tetex-latex +BuildRequires: /usr/bin/kpsewhich -Requires: tetex -Requires: tetex-fonts Requires: tetex-latex %description @@ -55,13 +53,16 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%{texmf}/tex/latex/misc/* +%{_texmf}/tex/latex/misc/* %doc README COPYING NOTES dvipost.html %{_mandir}/man*/* %changelog +* Sat May 6 2006 Jos?? Matos - 1.1-5 +- Clean up spec file + * Thu Apr 27 2006 Jos?? Matos - 1.1-4 - Rename package to tetex-dvipost From fedora-extras-commits at redhat.com Sat May 6 06:51:21 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 5 May 2006 23:51:21 -0700 Subject: rpms/tetex-dvipost/FC-4 tetex-dvipost.spec,1.1,1.2 Message-ID: <200605060651.k466pN86024807@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/tetex-dvipost/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24790 Modified Files: tetex-dvipost.spec Log Message: * Sat May 6 2006 Jos?? Matos - 1.1-5 - Clean up spec file Index: tetex-dvipost.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-dvipost/FC-4/tetex-dvipost.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-dvipost.spec 27 Apr 2006 16:18:45 -0000 1.1 +++ tetex-dvipost.spec 6 May 2006 06:51:21 -0000 1.2 @@ -1,9 +1,9 @@ %define real_name dvipost -%define texmf %{_datadir}/texmf +%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} Name: tetex-%{real_name} Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: LaTeX post filter command to support change bars and overstrike mode Group: Applications/Publishing @@ -13,11 +13,9 @@ Patch0: %{name}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: tetex BuildRequires: tetex-latex +BuildRequires: /usr/bin/kpsewhich -Requires: tetex -Requires: tetex-fonts Requires: tetex-latex %description @@ -55,13 +53,16 @@ %files %defattr(-,root,root,-) %{_bindir}/* -%{texmf}/tex/latex/misc/* +%{_texmf}/tex/latex/misc/* %doc README COPYING NOTES dvipost.html %{_mandir}/man*/* %changelog +* Sat May 6 2006 Jos?? Matos - 1.1-5 +- Clean up spec file + * Thu Apr 27 2006 Jos?? Matos - 1.1-4 - Rename package to tetex-dvipost From fedora-extras-commits at redhat.com Sat May 6 07:42:32 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 00:42:32 -0700 Subject: owners owners.list,1.943,1.944 Message-ID: <200605060742.k467gYEa027138@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27121/owners Modified Files: owners.list Log Message: add gnucap Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.943 retrieving revision 1.944 diff -u -r1.943 -r1.944 --- owners.list 5 May 2006 19:22:51 -0000 1.943 +++ owners.list 6 May 2006 07:42:32 -0000 1.944 @@ -398,6 +398,7 @@ Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| +Fedora Extras|gnucap|The Gnu Circuit Analysis Package|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|gnugo|Text based go program|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 6 07:49:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 00:49:41 -0700 Subject: rpms/goffice/FC-5 .cvsignore, 1.3, 1.4 goffice.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605060749.k467nhtL027228@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207 Modified Files: .cvsignore goffice.spec sources Log Message: * Tue May 2 2006 Hans de Goede 0.2.1-1 - new upstream version: 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/goffice/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 00:21:28 -0000 1.3 +++ .cvsignore 6 May 2006 07:49:41 -0000 1.4 @@ -1 +1 @@ -goffice-0.2.0.tar.bz2 +goffice-0.2.1.tar.bz2 Index: goffice.spec =================================================================== RCS file: /cvs/extras/rpms/goffice/FC-5/goffice.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- goffice.spec 17 Feb 2006 00:15:36 -0000 1.8 +++ goffice.spec 6 May 2006 07:49:41 -0000 1.9 @@ -1,5 +1,5 @@ Name: goffice -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: Goffice support libraries Group: System Environment/Libraries @@ -70,6 +70,12 @@ %changelog +* Tue May 2 2006 Hans de Goede 0.2.1-1 +- new upstream version: 0.2.1 + +* Tue Mar 21 2006 Hans de Goede 0.2.0-2 +- rebuild for new libgsf + * Thu Feb 16 2006 Hans de Goede 0.2.0-1 - New upstream version - Remove .la files from plugin dirs Index: sources =================================================================== RCS file: /cvs/extras/rpms/goffice/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 00:21:28 -0000 1.3 +++ sources 6 May 2006 07:49:41 -0000 1.4 @@ -1 +1 @@ -e1f60fc9822813c6c3f20296e54928bf goffice-0.2.0.tar.bz2 +73b733556db5721ddfd5c72fc6428a15 goffice-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 07:53:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 00:53:57 -0700 Subject: rpms/gnumeric/devel .cvsignore, 1.4, 1.5 gnumeric.spec, 1.17, 1.18 sources, 1.4, 1.5 Message-ID: <200605060753.k467rxN7027307@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27286 Modified Files: .cvsignore gnumeric.spec sources Log Message: * Tue May 2 2006 Hans de Goede 1:1.6.3-1 - new upstream version 1.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 00:25:39 -0000 1.4 +++ .cvsignore 6 May 2006 07:53:57 -0000 1.5 @@ -1 +1 @@ -gnumeric-1.6.2.tar.bz2 +gnumeric-1.6.3.tar.bz2 Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnumeric.spec 8 Apr 2006 09:18:04 -0000 1.17 +++ gnumeric.spec 6 May 2006 07:53:57 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Spreadsheet program for GNOME Name: gnumeric -Version: 1.6.2 -Release: 3%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Productivity @@ -166,6 +166,9 @@ %changelog +* Tue May 2 2006 Hans de Goede 1:1.6.3-1 +- new upstream version 1.6.3 + * Sat Apr 8 2006 Hans de Goede 1:1.6.2-3 - drop bogus mc stuff (bz 169332) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 00:25:39 -0000 1.4 +++ sources 6 May 2006 07:53:57 -0000 1.5 @@ -1 +1 @@ -ca6ecf464279297a4f3d41e7f35ebb39 gnumeric-1.6.2.tar.bz2 +78ffd75ae6abc3bb20dd04407a082a26 gnumeric-1.6.3.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 07:55:56 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 00:55:56 -0700 Subject: rpms/gnumeric/FC-5 .cvsignore, 1.4, 1.5 gnumeric.spec, 1.16, 1.17 sources, 1.4, 1.5 Message-ID: <200605060755.k467twDi027383@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27362 Modified Files: .cvsignore gnumeric.spec sources Log Message: * Tue May 2 2006 Hans de Goede 1:1.6.3-1 - new upstream version 1.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnumeric/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 00:25:39 -0000 1.4 +++ .cvsignore 6 May 2006 07:55:55 -0000 1.5 @@ -1 +1 @@ -gnumeric-1.6.2.tar.bz2 +gnumeric-1.6.3.tar.bz2 Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/FC-5/gnumeric.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnumeric.spec 8 Apr 2006 09:21:12 -0000 1.16 +++ gnumeric.spec 6 May 2006 07:55:55 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Spreadsheet program for GNOME Name: gnumeric -Version: 1.6.2 -Release: 3%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Productivity @@ -166,6 +166,9 @@ %changelog +* Tue May 2 2006 Hans de Goede 1:1.6.3-1 +- new upstream version 1.6.3 + * Sat Apr 8 2006 Hans de Goede 1:1.6.2-3 - drop bogus mc stuff (bz 169332) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnumeric/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 00:25:39 -0000 1.4 +++ sources 6 May 2006 07:55:55 -0000 1.5 @@ -1 +1 @@ -ca6ecf464279297a4f3d41e7f35ebb39 gnumeric-1.6.2.tar.bz2 +78ffd75ae6abc3bb20dd04407a082a26 gnumeric-1.6.3.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 08:31:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 01:31:58 -0700 Subject: rpms/crystal-stacker/devel crystal-stacker.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605060832.k468W0Rl029769@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/crystal-stacker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29750 Modified Files: crystal-stacker.spec sources Log Message: * Sat May 6 2006 Hans de Goede 1.5-1 - New upstream release 1.5 (final). Index: crystal-stacker.spec =================================================================== RCS file: /cvs/extras/rpms/crystal-stacker/devel/crystal-stacker.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crystal-stacker.spec 9 Apr 2006 07:30:54 -0000 1.1 +++ crystal-stacker.spec 6 May 2006 08:31:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: crystal-stacker Version: 1.5 -Release: 0.pre.2%{?dist} +Release: 1%{?dist} Summary: Falling blocks, match 3 or more of the same color crystals Group: Amusements/Games License: Freeware @@ -8,7 +8,6 @@ Source0: http://www.t3-i.com/ncdgames/cs15src.zip Source1: %{name}.desktop Source2: %{name}-theme-editor.desktop -Patch0: crystal-stacker-1.5-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel dumb-devel ImageMagick desktop-file-utils @@ -31,7 +30,6 @@ %prep %setup -q -c -%patch0 -p1 -z .fixes %{__sed} -i 's/\r//' ce/*.txt cs/*.txt @@ -123,6 +121,9 @@ %changelog +* Sat May 6 2006 Hans de Goede 1.5-1 +- New upstream release 1.5 (final). + * Fri Apr 8 2006 Hans de Goede 1.5-0.pre.2 - Updated Patch0 to not unnescesarry pause the music when selecting a new theme and using pthreads to play the music. Index: sources =================================================================== RCS file: /cvs/extras/rpms/crystal-stacker/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Apr 2006 07:30:54 -0000 1.2 +++ sources 6 May 2006 08:31:58 -0000 1.3 @@ -1 +1 @@ -d961dfdc859267b2763f4b585a732f3e cs15src.zip +c0e50b809f581807644171490afb3481 cs15src.zip From fedora-extras-commits at redhat.com Sat May 6 08:32:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 01:32:44 -0700 Subject: rpms/crystal-stacker/devel crystal-stacker-1.5-fixes.patch, 1.1, NONE Message-ID: <200605060832.k468WkbI029833@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/crystal-stacker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29818 Removed Files: crystal-stacker-1.5-fixes.patch Log Message: remove no longr used patchfile --- crystal-stacker-1.5-fixes.patch DELETED --- From fedora-extras-commits at redhat.com Sat May 6 09:03:34 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Sat, 6 May 2006 02:03:34 -0700 Subject: owners owners.list,1.944,1.945 Message-ID: <200605060903.k4693bY4032118@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32101 Modified Files: owners.list Log Message: Fix sort order. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.944 retrieving revision 1.945 diff -u -r1.944 -r1.945 --- owners.list 6 May 2006 07:42:32 -0000 1.944 +++ owners.list 6 May 2006 09:03:34 -0000 1.945 @@ -1123,12 +1123,12 @@ Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PBS|Perl binding for the Portable Batch System client library|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 6 10:10:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sat, 6 May 2006 03:10:54 -0700 Subject: rpms/gcl/FC-5 gcl.spec,1.19,1.20 Message-ID: <200605061010.k46AAuDJ002076@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045/FC-5 Modified Files: gcl.spec Log Message: Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/FC-5/gcl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gcl.spec 14 Apr 2006 09:44:15 -0000 1.19 +++ gcl.spec 6 May 2006 10:10:54 -0000 1.20 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 10%{?dist} +Release: 11%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -21,7 +21,7 @@ %description -GCL is a Common Lisp currently compliant with the CLtL1 standard. Lisp +GCL is a Common Lisp currently compliant with the ANSI standard. Lisp compilation produces native code through the intermediary of the system's C compiler, from which GCL derives efficient performance and facile portability. Currently uses TCL/Tk as GUI. @@ -34,7 +34,7 @@ %build -%configure --enable-readine --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} +%configure --enable-readline --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} perl -pi -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh makedefc makedefs perl -pi -e 's|/usr/lib/tcl|%{_datadir}/tcl|' debian/gcl.sh makedefc makedefs # %{?_smp_mflags} breaks the build @@ -97,6 +97,10 @@ %changelog +* Sat May 6 2006 Gerard Milmeister - 2.6.7-11 +- fixed summary text (CLtL1 -> ANSI) +- configure: readine -> readline + * Fri Apr 14 2006 Gerard Milmeister - 2.6.7-10 - added changes to SELinux policy From fedora-extras-commits at redhat.com Sat May 6 10:10:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sat, 6 May 2006 03:10:54 -0700 Subject: rpms/gcl/devel gcl.spec,1.18,1.19 Message-ID: <200605061010.k46AAutp002080@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045/devel Modified Files: gcl.spec Log Message: Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gcl.spec 8 Mar 2006 20:53:23 -0000 1.18 +++ gcl.spec 6 May 2006 10:10:54 -0000 1.19 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 9%{?dist} +Release: 11%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -15,13 +15,13 @@ BuildRequires: tcl-devel BuildRequires: gmp-devel BuildRequires: tetex, texinfo -Requires(post): /sbin/install-info -Requires(postun): /sbin/install-info +Requires(post): /sbin/install-info, policycoreutils +Requires(postun): /sbin/install-info, policycoreutils ExcludeArch: ppc ppc64 %description -GCL is a Common Lisp currently compliant with the CLtL1 standard. Lisp +GCL is a Common Lisp currently compliant with the ANSI standard. Lisp compilation produces native code through the intermediary of the system's C compiler, from which GCL derives efficient performance and facile portability. Currently uses TCL/Tk as GUI. @@ -34,7 +34,7 @@ %build -%configure --enable-readine --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} +%configure --enable-readline --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} perl -pi -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh makedefc makedefs perl -pi -e 's|/usr/lib/tcl|%{_datadir}/tcl|' debian/gcl.sh makedefc makedefs # %{?_smp_mflags} breaks the build @@ -72,14 +72,15 @@ %post /sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || : +/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || : +/sbin/restorecon "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2> /dev/null || : %postun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}-si.info \ - %{_infodir}/dir 2>/dev/null || : - /sbin/install-info --delete %{_infodir}/%{name}-tk.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || : + /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || : fi @@ -96,6 +97,13 @@ %changelog +* Sat May 6 2006 Gerard Milmeister - 2.6.7-11 +- fixed summary text (CLtL1 -> ANSI) +- configure: readine -> readline + +* Fri Apr 14 2006 Gerard Milmeister - 2.6.7-10 +- added changes to SELinux policy + * Wed Mar 8 2006 Gerard Milmeister - 2.6.7-7 - Patch gcl-bash.patch for configure From fedora-extras-commits at redhat.com Sat May 6 12:52:50 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 05:52:50 -0700 Subject: rpms/syslog-ng/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.12, 1.13 Message-ID: <200605061252.k46Cqq7O007532@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7511 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Mar 2006 16:52:51 -0000 1.5 +++ .cvsignore 6 May 2006 12:52:49 -0000 1.6 @@ -1 +1 @@ -syslog-ng-1.6.10.tar.gz +syslog-ng-1.6.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Mar 2006 16:52:51 -0000 1.5 +++ sources 6 May 2006 12:52:49 -0000 1.6 @@ -1 +1 @@ -b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz +8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/syslog-ng.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- syslog-ng.spec 30 Mar 2006 16:52:51 -0000 1.12 +++ syslog-ng.spec 6 May 2006 12:52:49 -0000 1.13 @@ -1,22 +1,36 @@ +# +# Rebuild option: +# +# --with spoofing enables the syslog-ng feature spoof-source +# (see README.spoof for more information) +# %define sbindir /sbin +%define libolver 0.3.18 +%define spoofing 0 + +%{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.10 +Version: 1.6.11 Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL -Url: http://www.balabit.com/products/syslog_ng/ +URL: http://www.balabit.com/products/syslog_ng/ Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz Source1: syslog.log Patch0: syslog-ng-1.6.7-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildConflicts: libol-devel < 0.3.17 -BuildRequires: flex, tcp_wrappers, which +BuildConflicts: libol-devel < %{libolver} +BuildRequires: flex, which +BuildRequires: tcp_wrappers +%if %{spoofing} +BuildRequires: libnet-devel >= 1.1 +%endif Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts @@ -42,11 +56,14 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.18/ChangeLog ChangeLog.libol +mv libol-%{libolver}/{ChangeLog,ChangeLog.libol} %build %configure \ --sbindir=%{sbindir} \ +%if %{spoofing} + --enable-spoof-source \ +%endif --enable-tcp-wrapper make %{?_smp_mflags} @@ -76,15 +93,15 @@ %post # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then - /sbin/chkconfig --add syslog-ng -# /sbin/service syslog-ng start + /sbin/chkconfig --add syslog-ng +# /sbin/service syslog-ng start fi %preun # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then - /sbin/service syslog-ng stop > /dev/null 2>&1 || : - /sbin/chkconfig --del syslog-ng + /sbin/service syslog-ng stop > /dev/null 2>&1 || : + /sbin/chkconfig --del syslog-ng fi %postun @@ -97,11 +114,10 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt -%doc doc/*.demo doc/*.sample +%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample} %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl -%doc ChangeLog.libol +%doc libol-%{libolver}/ChangeLog.libol %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -113,8 +129,16 @@ %changelog +* Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 +- Update to 1.6.11. + +* Sun Apr 2 2006 Jose Pedro Oliveira - 1.6.10-2 +- Build option to support the syslog-ng spoof-source feature + (the feature spoof-source is disabled by default). + * Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 - Update to 1.6.10. +- The postscript documentation has been dropped (upstream). * Wed Feb 15 2006 Jose Pedro Oliveira - 1.6.9-3 - Rebuild. From fedora-extras-commits at redhat.com Sat May 6 12:56:43 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 6 May 2006 05:56:43 -0700 Subject: extras-buildsys/utils extras-push-new,NONE,1.1 Message-ID: <200605061256.k46Cuheg007601@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7584 Added Files: extras-push-new Log Message: Add a extras-push-new script, which combines the scripts extras-push, extras-push-all and extras-sign-move.py and avoids some of the problems we've experienced. --- NEW FILE extras-push-new --- #!/usr/bin/python -t # -*- mode: Python; indent-tabs-mode: nil; -*- # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import fcntl import os, sys import rpmUtils import shutil import string DEBUG = False signersgid = 100581 # extras_signers group distro = 'fedora' project = 'extras' stagesdir = '/srv/rpmbuild/repodir' treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project) # Where we store mails to be sent, lockfiles. rundir = '/srv/rpmbuild/extras-push-rundir' cachedir = '/tmp/repomd-cache' compsname = 'comps.xml' project_hr = 'Fedora Extras' mail_from = 'buildsys at fedoraproject.org' mail_to = 'fedora-extras-list at redhat.com' mail_footer = """ For more information about the built packages please see the repository or the fedora Info Feed: http://fedoraproject.org/infofeed/ """ config = { 'repoview' : True, 'repoclosure' : False, 'gidcheck' : True, 'setumask' : True, 'mail' : True } alldists = [ 'development', '5', '4', '3' ] archdict = { '3' : ['x86_64', 'i386'], '4' : ['ppc','x86_64', 'i386'], '5' : ['ppc','x86_64', 'i386'], 'development' : ['ppc','x86_64','i386'], } # Note: *no* depsolving is done for these. copydict = { 'wine.i386': ['x86_64'], 'wine-arts.i386': ['x86_64'], 'wine-capi.i386': ['x86_64'], 'wine-cms.i386': ['x86_64'], 'wine-debuginfo.i386': ['x86_64'], 'wine-devel.i386': ['x86_64'], 'wine-esd.i386': ['x86_64'], 'wine-jack.i386': ['x86_64'], 'wine-ldap.i386': ['x86_64'], 'wine-nas.i386': ['x86_64'], 'wine-tools.i386': ['x86_64'], 'wine-twain.i386': ['x86_64'], # lcms for wine-cms in FE-3 and FE-4 'lcms.i386': ['x86_64'], 'lcms-debuginfo.i386': ['x86_64'], } ts = rpmUtils.transaction.initReadOnlyTransaction() def debugprint(msg): if DEBUG: print msg def run_and_check(cmd): debugprint(cmd) if DEBUG: return result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd sys.exit(result) class LockFile: def __init__(self, name): self.name = name def lock(self): if DEBUG: return self.file = open(self.name,'w') try: self.rc = fcntl.flock(self.file, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError: print 'ERROR: script locked via lockfile %s - it seems to be running already' % name sys.exit(11) def unlock(self): if DEBUG: return fcntl.flock(self.file, fcntl.LOCK_UN) self.file.close() # ==================================================================== # (previously in extras-sign-move.py) # get the path to where to look for the packages to be signed # get the list of stuff there (logs, md5sums, specs, rpms) # list the rpms and pause # sign the rpms # collect list of srpms and get package n-v-r from them # move pkgs into repo def find_files(path): """returns a dict of filetypes and paths to those files""" filedict = {} filedict['srpm'] = [] filedict['log'] = [] filedict['rpm'] = [] filedict['spec'] = [] filedict['md5sum'] = [] filedict['debuginfo'] = [] filedict['other'] = [] for root, dirs, files in os.walk(path): for file in files: # match the files to what list they should be in if file.endswith('.log'): which = 'log' elif file.endswith('.rpm'): if file.find('debuginfo') != -1: which = 'debuginfo' elif file.endswith('.src.rpm'): which = 'srpm' else: which = 'rpm' elif file.endswith('.spec'): which = 'spec' elif file.endswith('.md5sum'): which = 'md5sum' else: which = 'other' fullfile = os.path.join(root, file) filedict[which].append(fullfile) return filedict def naevr(pkg): """return nevra from the package srpm""" hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg) name = hdr['name'] ver = hdr['version'] rel = hdr['release'] arch = hdr['arch'] epoch = hdr['epoch'] if epoch is None: epoch = 0 return (name, arch, epoch, ver, rel) def sign_pkgs(filelist): """gpg sign all the rpms""" numfiles = len(filelist) if numfiles < 1: print "No packages to sign" return False while numfiles > 0: if numfiles > 256: files = filelist[:256] del filelist[:256] else: files = filelist filelist = [] foo = string.join(files) result = os.system('echo %s | xargs rpm --resign' % foo) if result != 0: return False numfiles = len(filelist) return True def sign_move(dist): runfilename = os.path.join(rundir, dist) if DEBUG: runfilename += '.DEBUG' try: rundirfile = open(runfilename,'a') except: print 'ERROR: Could not write to %s' % runfilename return 11 distdir = '%s-%s-%s' % (distro, dist, project) needsign = os.path.join(stagesdir, distdir) files = find_files(needsign) rpms = files['rpm'] + files['srpm'] + files['debuginfo'] rpms.sort() for item in rpms: print ' %s' % os.path.basename(item) destdir = os.path.join(treedir, dist) if not os.path.exists(destdir): for arch in archdict[dist]: if not DEBUG: os.makedirs(destdir + '/' + arch + '/debug') if not DEBUG: os.makedirs(destdir + '/' + 'SRPMS') rpms = files['rpm'] + files['srpm'] + files['debuginfo'] if len(rpms) == 0: print 'nothing to sign' return(4) print "Signing Packages:" if not DEBUG: result = sign_pkgs(rpms) if not result: print "Error signing packages" return(2) print "Moving Packages into Place" infolist = [] for package in files['srpm']: (n,a,e,v,r) = naevr(package) pkg_fn = os.path.basename(package) srpmloc = os.path.join(destdir, 'SRPMS', pkg_fn) debugprint('Moving %s to %s' % (package, srpmloc)) if os.path.exists(srpmloc): debugprint('%s already exists, ignoring new one' % srpmloc) if not DEBUG: os.unlink(package) else: infolist.append('%s-%s-%s' % (n,v,r)) if not DEBUG: shutil.move(package, srpmloc) # go through each package and move it to the right arch location. # if it is a noarch package, copy2 it to all arch locations and unlink it # if it is listed in copydict, copy2 it around as appropriate # if it is a debuginfo package, move it into the 'debug' dir for that arch for package in files['rpm'] + files['debuginfo']: pkg_fn = os.path.basename(package) (n,a,e,v,r) = naevr(package) copyarchs = copydict.get('%s.%s' % (n, a)) if copyarchs: for arch in copyarchs: if not arch in archdict[dist]: continue if package in files['debuginfo']: arch = '%s/debug' % arch rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint("Copying %s to %s" % (package, rpmloc)) if os.path.exists(rpmloc): debugprint('%s already exists, ignoring new one' % rpmloc) elif not DEBUG: shutil.copy2(package, rpmloc) if a == 'noarch': for arch in archdict[dist]: if package in files['debuginfo']: arch = '%s/debug' % arch rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint("Copying %s to %s" % (package, rpmloc)) if os.path.exists(rpmloc): debugprint('%s already exists, ignoring new one' % rpmloc) elif not DEBUG: shutil.copy2(package, rpmloc) if not DEBUG: os.unlink(package) continue elif a in ['i386', 'i486', 'i586', 'i686', 'athlon']: if package in files['debuginfo']: arch = 'i386/debug' else: arch = 'i386' elif a in ['x86_64', 'ia32e', 'amd64']: if package in files['debuginfo']: arch = 'x86_64/debug' else: arch = 'x86_64' elif a in ['ppc', 'ppc64', 'ppc32']: if package in files['debuginfo']: arch = 'ppc/debug' else: arch = 'ppc' else: print 'Unknown arch %s' % a continue rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint('Moving %s to %s' % (package, rpmloc)) if os.path.exists(rpmloc): debugprint('%s already exists, ignoring new one' % rpmloc) if not DEBUG: os.unlink(package) elif not DEBUG: shutil.move(package, rpmloc) # Store list of move packages, so it can be mailed later. for add in infolist: add += '\n' rundirfile.write( add ) rundirfile.close() # clean up the crap print "Cleaning Up" for file in files['log'] + files['md5sum'] + files['spec']: debugprint('removing %s' % file) if not DEBUG: os.unlink(file) # FIXME clean up empty dirs, too. return(0) # ==================================================================== import smtplib from email.MIMEText import MIMEText def email_list(pkglist, dist): """email mailing list with the new package listing""" uniqued = rpmUtils.miscutils.unique(pkglist) uniqued.sort() output = "\nPackages built and released for %s %s: %s \n\n" % (project_hr, dist, len(uniqued)) for pkg in uniqued: add = '%s\n' % (pkg) output = output + add output = output + mail_footer msg = MIMEText(output) subject = '%s %s Package Build Report' % (project_hr, dist) msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to debugprint( msg.as_string() ) if DEBUG: return s = smtplib.SMTP() s.connect() s.sendmail(mail_from, [mail_to], msg.as_string()) s.close() # ==================================================================== def getlinesfromrunfile(dist): runfilename = os.path.join(rundir, dist) if DEBUG: runfilename += '.DEBUG' pkglist = [] if os.path.isfile(runfilename): try: rundirfile = open(runfilename,'r') for line in rundirfile: pkglist.append( line.rstrip() ) rundirfile.close() except IOError: print 'ERROR: Could not open %s' % runfilename sys.exit(5) return pkglist def emptyrunfile(dist): runfilename = os.path.join(rundir, dist) if DEBUG: runfilename += '.DEBUG' if not os.path.isfile(runfilename): return try: os.remove(runfilename) except: print 'ERROR: Could not remove %s' % runfilename pass if __name__ == '__main__': if config['gidcheck']: if os.getgid() != signersgid: print 'ERROR: Change into extras_signers group!' sys.exit(13) if config['setumask']: os.umask(0002) if len(sys.argv) < 2: print 'SYNTAX: %s [dist]...' % sys.argv[0] sys.exit(22) dists = [] # the list of distribution release we want to push distdict = {} for d in sys.argv[1:]: if d == 'all': dists = alldists continue if d not in alldists: print "ERROR: No Distribution named '%s' found" % d sys.exit(1) if not distdict.has_key(d): dists.append(d) distdict[d] = True debugprint(dists) # If we are called as 'extras-sign-move.py' we simulate old # behaviour and only do: sign, move, repobuild, sync if sys.argv[0].endswith('extras-sign-move.py'): config['repoview'] = False if not os.path.exists(rundir): os.makedirs(rundir) lockfile = os.path.join(rundir,'extras-push.lock') lock = LockFile(lockfile) lock.lock() for dist in dists: result = sign_move(dist) if result and result != 4: # 4 = no packages to sign sys.exit(result) for dist in dists: # Process all dists for which we find a run-file which contains >= 1 pkg names. pkglist = getlinesfromrunfile(dist) if len(pkglist): run_and_check('extras-repobuild.py %s' % dist) if config['repoview']: run_and_check('extras-repoview.py %s' % dist) if config['repoclosure']: pass run_and_check('extras-sync') if config['mail']: for dist in dists: email_list( getlinesfromrunfile(dist), dist ) emptyrunfile(dist) lock.unlock() sys.exit(0) From fedora-extras-commits at redhat.com Sat May 6 13:09:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 06:09:13 -0700 Subject: rpms/syslog-ng/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.8, 1.9 Message-ID: <200605061309.k46D9jNC009913@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9873/FC-3 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Apr 2006 19:52:51 -0000 1.5 +++ .cvsignore 6 May 2006 13:09:13 -0000 1.6 @@ -1 +1 @@ -syslog-ng-1.6.10.tar.gz +syslog-ng-1.6.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Apr 2006 19:52:51 -0000 1.5 +++ sources 6 May 2006 13:09:13 -0000 1.6 @@ -1 +1 @@ -b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz +8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-3/syslog-ng.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- syslog-ng.spec 5 Apr 2006 19:52:51 -0000 1.8 +++ syslog-ng.spec 6 May 2006 13:09:13 -0000 1.9 @@ -1,22 +1,36 @@ +# +# Rebuild option: +# +# --with spoofing enables the syslog-ng feature spoof-source +# (see README.spoof for more information) +# %define sbindir /sbin +%define libolver 0.3.18 +%define spoofing 0 + +%{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.10 +Version: 1.6.11 Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL -Url: http://www.balabit.com/products/syslog_ng/ +URL: http://www.balabit.com/products/syslog_ng/ Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz Source1: syslog.log Patch0: syslog-ng-1.6.7-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildConflicts: libol-devel < 0.3.17 -BuildRequires: flex, tcp_wrappers, which +BuildConflicts: libol-devel < %{libolver} +BuildRequires: flex, which +BuildRequires: tcp_wrappers +%if %{spoofing} +BuildRequires: libnet-devel >= 1.1 +%endif Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts @@ -47,11 +61,14 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.18/ChangeLog ChangeLog.libol +mv libol-%{libolver}/{ChangeLog,ChangeLog.libol} %build %configure \ --sbindir=%{sbindir} \ +%if %{spoofing} + --enable-spoof-source \ +%endif --enable-tcp-wrapper make %{?_smp_mflags} @@ -81,15 +98,15 @@ %post # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then - /sbin/chkconfig --add syslog-ng -# /sbin/service syslog-ng start + /sbin/chkconfig --add syslog-ng +# /sbin/service syslog-ng start fi %preun # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then - /sbin/service syslog-ng stop > /dev/null 2>&1 || : - /sbin/chkconfig --del syslog-ng + /sbin/service syslog-ng stop > /dev/null 2>&1 || : + /sbin/chkconfig --del syslog-ng fi %postun @@ -102,11 +119,10 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt -%doc doc/*.demo doc/*.sample +%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample} %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl -%doc ChangeLog.libol +%doc libol-%{libolver}/ChangeLog.libol %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -118,8 +134,16 @@ %changelog +* Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 +- Update to 1.6.11. + +* Sun Apr 2 2006 Jose Pedro Oliveira - 1.6.10-2 +- Build option to support the syslog-ng spoof-source feature + (the feature spoof-source is disabled by default). + * Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 - Update to 1.6.10. +- The postscript documentation has been dropped (upstream). * Wed Nov 30 2005 Jose Pedro Oliveira - 1.6.9-1 - Build conflict statement From fedora-extras-commits at redhat.com Sat May 6 13:09:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 06:09:13 -0700 Subject: rpms/syslog-ng/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.8, 1.9 Message-ID: <200605061309.k46D9jre009918@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9873/FC-4 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Mar 2006 16:52:50 -0000 1.5 +++ .cvsignore 6 May 2006 13:09:13 -0000 1.6 @@ -1 +1 @@ -syslog-ng-1.6.10.tar.gz +syslog-ng-1.6.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Mar 2006 16:52:50 -0000 1.5 +++ sources 6 May 2006 13:09:13 -0000 1.6 @@ -1 +1 @@ -b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz +8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/syslog-ng.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- syslog-ng.spec 30 Mar 2006 16:52:50 -0000 1.8 +++ syslog-ng.spec 6 May 2006 13:09:13 -0000 1.9 @@ -1,22 +1,36 @@ +# +# Rebuild option: +# +# --with spoofing enables the syslog-ng feature spoof-source +# (see README.spoof for more information) +# %define sbindir /sbin +%define libolver 0.3.18 +%define spoofing 0 + +%{?_with_spoofing:%define spoofing 1} Name: syslog-ng -Version: 1.6.10 +Version: 1.6.11 Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons License: GPL -Url: http://www.balabit.com/products/syslog_ng/ +URL: http://www.balabit.com/products/syslog_ng/ Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz Source1: syslog.log Patch0: syslog-ng-1.6.7-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildConflicts: libol-devel < 0.3.17 -BuildRequires: flex, tcp_wrappers, which +BuildConflicts: libol-devel < %{libolver} +BuildRequires: flex, which +BuildRequires: tcp_wrappers +%if %{spoofing} +BuildRequires: libnet-devel >= 1.1 +%endif Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts @@ -47,11 +61,14 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.18/ChangeLog ChangeLog.libol +mv libol-%{libolver}/{ChangeLog,ChangeLog.libol} %build %configure \ --sbindir=%{sbindir} \ +%if %{spoofing} + --enable-spoof-source \ +%endif --enable-tcp-wrapper make %{?_smp_mflags} @@ -81,15 +98,15 @@ %post # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then - /sbin/chkconfig --add syslog-ng -# /sbin/service syslog-ng start + /sbin/chkconfig --add syslog-ng +# /sbin/service syslog-ng start fi %preun # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then - /sbin/service syslog-ng stop > /dev/null 2>&1 || : - /sbin/chkconfig --del syslog-ng + /sbin/service syslog-ng stop > /dev/null 2>&1 || : + /sbin/chkconfig --del syslog-ng fi %postun @@ -102,11 +119,10 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt -%doc doc/*.demo doc/*.sample +%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample} %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl -%doc ChangeLog.libol +%doc libol-%{libolver}/ChangeLog.libol %{sbindir}/syslog-ng %{_initrddir}/syslog-ng %dir %{_sysconfdir}/%{name} @@ -118,8 +134,16 @@ %changelog +* Fri May 5 2006 Jose Pedro Oliveira - 1.6.11-1 +- Update to 1.6.11. + +* Sun Apr 2 2006 Jose Pedro Oliveira - 1.6.10-2 +- Build option to support the syslog-ng spoof-source feature + (the feature spoof-source is disabled by default). + * Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 - Update to 1.6.10. +- The postscript documentation has been dropped (upstream). * Wed Nov 30 2005 Jose Pedro Oliveira - 1.6.9-1 - Build conflict statement From fedora-extras-commits at redhat.com Sat May 6 13:14:44 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 6 May 2006 06:14:44 -0700 Subject: extras-buildsys/utils extras-push-new,1.1,1.2 Message-ID: <200605061314.k46DEikI010020@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10002 Modified Files: extras-push-new Log Message: re-use code Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- extras-push-new 6 May 2006 12:56:40 -0000 1.1 +++ extras-push-new 6 May 2006 13:14:41 -0000 1.2 @@ -121,6 +121,39 @@ self.file.close() +def getrunfilename(dist): + runfilename = os.path.join(rundir, dist) + if DEBUG: + runfilename += '.DEBUG' + return runfilename + + +def getlinesfromrunfile(dist): + runfilename = getrunfilename(dist) + pkglist = [] + if os.path.isfile(runfilename): + try: + rundirfile = open(runfilename,'r') + for line in rundirfile: + pkglist.append( line.rstrip() ) + rundirfile.close() + except IOError: + print 'ERROR: Could not open %s' % runfilename + sys.exit(5) + return pkglist + + +def emptyrunfile(dist): + runfilename = getrunfilename(dist) + if not os.path.isfile(runfilename): + return + try: + os.remove(runfilename) + except: + print 'ERROR: Could not remove %s' % runfilename + pass + + # ==================================================================== # (previously in extras-sign-move.py) @@ -205,9 +238,7 @@ def sign_move(dist): - runfilename = os.path.join(rundir, dist) - if DEBUG: - runfilename += '.DEBUG' + runfilename = getrunfilename(dist) try: rundirfile = open(runfilename,'a') except: @@ -378,36 +409,6 @@ # ==================================================================== -def getlinesfromrunfile(dist): - runfilename = os.path.join(rundir, dist) - if DEBUG: - runfilename += '.DEBUG' - pkglist = [] - if os.path.isfile(runfilename): - try: - rundirfile = open(runfilename,'r') - for line in rundirfile: - pkglist.append( line.rstrip() ) - rundirfile.close() - except IOError: - print 'ERROR: Could not open %s' % runfilename - sys.exit(5) - return pkglist - - -def emptyrunfile(dist): - runfilename = os.path.join(rundir, dist) - if DEBUG: - runfilename += '.DEBUG' - if not os.path.isfile(runfilename): - return - try: - os.remove(runfilename) - except: - print 'ERROR: Could not remove %s' % runfilename - pass - - if __name__ == '__main__': if config['gidcheck']: if os.getgid() != signersgid: From fedora-extras-commits at redhat.com Sat May 6 14:43:09 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 6 May 2006 07:43:09 -0700 Subject: owners owners.list,1.945,1.946 Message-ID: <200605061443.k46EhB6h012485@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12468 Modified Files: owners.list Log Message: Fix typo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.945 retrieving revision 1.946 diff -u -r1.945 -r1.946 --- owners.list 6 May 2006 09:03:34 -0000 1.945 +++ owners.list 6 May 2006 14:43:08 -0000 1.946 @@ -1000,7 +1000,7 @@ Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Finanace-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Finance-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Font-TTF|Perl interface to TrueType Font files|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 6 15:26:05 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 6 May 2006 08:26:05 -0700 Subject: rpms/SOAPpy/FC-5 SOAPpy.spec,1.1,1.2 Message-ID: <200605061526.k46FQ7XI014920@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/SOAPpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874/SOAPpy/FC-5 Modified Files: SOAPpy.spec Log Message: Add Provides/Obsolete for python-SOAPpy Index: SOAPpy.spec =================================================================== RCS file: /cvs/extras/rpms/SOAPpy/FC-5/SOAPpy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SOAPpy.spec 18 Apr 2006 01:39:11 -0000 1.1 +++ SOAPpy.spec 6 May 2006 15:26:05 -0000 1.2 @@ -2,7 +2,7 @@ Name: SOAPpy Version: 0.11.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-featured SOAP library for Python Group: Development/Languages License: Python Software Foundation License @@ -13,7 +13,8 @@ BuildRequires: python-fpconst >= 0.6.0 Requires: python-fpconst >= 0.6.0 Requires: PyXML >= 0.8.3 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Obsoletes: python-SOAPpy +Provides: python-SOAPpy = %{version}-%{release} %description The goal of the SOAPpy team is to provide a full-featured SOAP library @@ -73,6 +74,9 @@ %changelog +* Sat May 06 2006 Christopher Stone 0.11.6-3 +- Add Provides/Obsolete for python-SOAPpy + * Mon Apr 17 2006 Christopher Stone 0.11.6-2 - Add docs directory to %doc - Remove PyXML BR From fedora-extras-commits at redhat.com Sat May 6 15:26:05 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 6 May 2006 08:26:05 -0700 Subject: rpms/SOAPpy/devel SOAPpy.spec,1.1,1.2 Message-ID: <200605061526.k46FQ7g8014925@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/SOAPpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874/SOAPpy/devel Modified Files: SOAPpy.spec Log Message: Add Provides/Obsolete for python-SOAPpy Index: SOAPpy.spec =================================================================== RCS file: /cvs/extras/rpms/SOAPpy/devel/SOAPpy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SOAPpy.spec 18 Apr 2006 01:39:11 -0000 1.1 +++ SOAPpy.spec 6 May 2006 15:26:05 -0000 1.2 @@ -2,7 +2,7 @@ Name: SOAPpy Version: 0.11.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-featured SOAP library for Python Group: Development/Languages License: Python Software Foundation License @@ -13,7 +13,8 @@ BuildRequires: python-fpconst >= 0.6.0 Requires: python-fpconst >= 0.6.0 Requires: PyXML >= 0.8.3 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Obsoletes: python-SOAPpy +Provides: python-SOAPpy = %{version}-%{release} %description The goal of the SOAPpy team is to provide a full-featured SOAP library @@ -73,6 +74,9 @@ %changelog +* Sat May 06 2006 Christopher Stone 0.11.6-3 +- Add Provides/Obsolete for python-SOAPpy + * Mon Apr 17 2006 Christopher Stone 0.11.6-2 - Add docs directory to %doc - Remove PyXML BR From fedora-extras-commits at redhat.com Sat May 6 15:26:04 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 6 May 2006 08:26:04 -0700 Subject: rpms/SOAPpy/FC-4 SOAPpy.spec,1.1,1.2 Message-ID: <200605061526.k46FQas7014934@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/SOAPpy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874/SOAPpy/FC-4 Modified Files: SOAPpy.spec Log Message: Add Provides/Obsolete for python-SOAPpy Index: SOAPpy.spec =================================================================== RCS file: /cvs/extras/rpms/SOAPpy/FC-4/SOAPpy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SOAPpy.spec 18 Apr 2006 01:39:11 -0000 1.1 +++ SOAPpy.spec 6 May 2006 15:26:04 -0000 1.2 @@ -2,7 +2,7 @@ Name: SOAPpy Version: 0.11.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-featured SOAP library for Python Group: Development/Languages License: Python Software Foundation License @@ -13,7 +13,8 @@ BuildRequires: python-fpconst >= 0.6.0 Requires: python-fpconst >= 0.6.0 Requires: PyXML >= 0.8.3 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Obsoletes: python-SOAPpy +Provides: python-SOAPpy = %{version}-%{release} %description The goal of the SOAPpy team is to provide a full-featured SOAP library @@ -73,6 +74,9 @@ %changelog +* Sat May 06 2006 Christopher Stone 0.11.6-3 +- Add Provides/Obsolete for python-SOAPpy + * Mon Apr 17 2006 Christopher Stone 0.11.6-2 - Add docs directory to %doc - Remove PyXML BR From fedora-extras-commits at redhat.com Sat May 6 15:31:18 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Sat, 6 May 2006 08:31:18 -0700 Subject: CVSROOT avail,1.31,1.32 Message-ID: <200605061531.k46FVI4P015003@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14985 Modified Files: avail Log Message: Add Ville Skytta to the Fedora Security Response Team Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- avail 2 May 2006 21:27:07 -0000 1.31 +++ avail 6 May 2006 15:31:16 -0000 1.32 @@ -46,9 +46,9 @@ # Red Hat Security Response Team avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security # Fedora Security Response Team -avail | jkeating,ausil,tibbs,kaboom | fedora-security -unavail | jkeating,ausil,tibbs,kaboom | fedora-security/audit/fc4 -unavail | jkeating,ausil,tibbs,kaboom | fedora-security/audit/fc5 +avail | jkeating,ausil,tibbs,kaboom,scop | fedora-security +unavail | jkeating,ausil,tibbs,kaboom,scop | fedora-security/audit/fc4 +unavail | jkeating,ausil,tibbs,kaboom,scop | fedora-security/audit/fc5 avail | pfrields | web/html/projects/docs avail | pfrields | web/html/participate/documentation-faq From fedora-extras-commits at redhat.com Sat May 6 16:11:54 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 6 May 2006 09:11:54 -0700 Subject: owners owners.list,1.946,1.947 Message-ID: <200605061611.k46GBu8f017466@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17449 Modified Files: owners.list Log Message: Change my e-mail address Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.946 retrieving revision 1.947 diff -u -r1.946 -r1.947 --- owners.list 6 May 2006 14:43:08 -0000 1.946 +++ owners.list 6 May 2006 16:11:54 -0000 1.947 @@ -1246,7 +1246,7 @@ Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| -Fedora Extras|poker-eval|Poker hand evaluator library|tkmame at retrogames.com|extras-qa at fedoraproject.org|loic at gnu.org +Fedora Extras|poker-eval|Poker hand evaluator library|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|polyxmass-bin|The GNU polyxmass software suite|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|polyxmass-common|Contains all textual/graphical data required for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|polyxmass-data|Contains configuration files describing polymer chemistry|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -1271,7 +1271,7 @@ Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pydot|Python interface to Graphviz's Dot language|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pyflowtools|Python bindings to OSU Flow-Tools library|i at stingr.net|extras-qa at fedoraproject.org| -Fedora Extras|pygame|Python modules for writing games|tkmame at retrogames.com|extras-qa at fedoraproject.org| +Fedora Extras|pygame|Python modules for writing games|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| @@ -1299,7 +1299,7 @@ Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|python-feedparser|Parse RSS and Atom feeds in Python|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-formencode|FormEncode is a validation and form generation package.|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|python-fpconst|A Python module for handling IEEE 754 floating point special values|tkmame at retrogames.com|extras-qa at fedoraproject.org| +Fedora Extras|python-fpconst|A Python module for handling IEEE 754 floating point special values|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| @@ -1449,7 +1449,7 @@ Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|snort|An intrusion detection system|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org| -Fedora Extras|SOAPpy|Full-featured SOAP library for Python|tkmame at retrogames.com|extras-qa at fedoraproject.org| +Fedora Extras|SOAPpy|Full-featured SOAP library for Python|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|sodipodi|Vector-based drawing program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|sopwith|SDL port of sopwith|adrian at lisas.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 6 17:24:01 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 6 May 2006 10:24:01 -0700 Subject: rpms/rssowl/FC-5 rssowl-swt31-SortingSelectionAdapter.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rssowl-browser.patch, 1.1, 1.2 rssowl-build0.patch, 1.1, 1.2 rssowl-build1.patch, 1.1, 1.2 rssowl-swt31.patch, 1.1, 1.2 rssowl-use-jce.patch, 1.1, 1.2 rssowl.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200605061724.k46HO3DP020465@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20377 Modified Files: .cvsignore rssowl-browser.patch rssowl-build0.patch rssowl-build1.patch rssowl-swt31.patch rssowl-use-jce.patch rssowl.spec sources Added Files: rssowl-swt31-SortingSelectionAdapter.patch Log Message: Update to rssowl 1.2.1. rssowl-swt31-SortingSelectionAdapter.patch: --- NEW FILE rssowl-swt31-SortingSelectionAdapter.patch --- --- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java.orig 2006-04-23 05:30:41.000000000 -0700 +++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java 2006-05-06 09:42:26.000000000 -0700 @@ -26,7 +26,6 @@ import net.sourceforge.rssowl.controller.NewsTable; -import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Table; @@ -42,7 +41,7 @@ * header is clicked and update it. * * @author Ludovic Kim-Xuan Galibert - * @version 1.2.1 + * @version 1.1.3 */ public class SortingSelectionAdapter extends SelectionAdapter { @@ -101,59 +100,67 @@ } /** - * Sort the News using a Sorter that is identified by the given field value. + * Handle the sorting corresponding to the header clicked * - * @param field The identifier of the Sorter to use. - * @return boolean TRUE if the sort was ascending, FALSE if descending. + * @param se the SelectionEvent */ - public boolean sort(String field) { + public void widgetSelected(SelectionEvent se) { + widgetSelected((TableColumn) se.getSource()); + } + + /** + * Handle the sorting corresponding to the header clicked + * + * @param tc The selected TableColumn + */ + public void widgetSelected(TableColumn tc) { Comparator sorter = null; boolean ascending = true; /** Sort by news title */ - if ("TABLE_HEADER_NEWSTITLE".equals(field)) { + if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) { ascending = this.titleAscending; this.titleAscending = !this.titleAscending; sorter = new TitleSorter(); } /** Sort by publish date */ - else if ("TABLE_HEADER_PUBDATE".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) { ascending = this.pudDateAscending; this.pudDateAscending = !this.pudDateAscending; sorter = new PubDateSorter(newsItems); } /** Sort by author */ - else if ("TABLE_HEADER_AUTHOR".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) { ascending = this.authorAscending; this.authorAscending = !this.authorAscending; sorter = new AuthorSorter(newsItems); } /** Sort by category */ - else if ("TABLE_HEADER_CATEGORY".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) { ascending = this.categoryAscending; this.categoryAscending = !this.categoryAscending; sorter = new CategorySorter(newsItems); } /** Sort by publisher */ - else if ("TABLE_HEADER_PUBLISHER".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) { ascending = this.publisherAscending; this.publisherAscending = !this.publisherAscending; sorter = new PublisherSorter(newsItems); } /** Sort by news feed */ - else if ("TABLE_HEADER_FEED".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_FEED")) { ascending = this.newsfeedAscending; this.newsfeedAscending = !this.newsfeedAscending; sorter = new NewsFeedSorter(newsItems); } /** Sort by news status */ - else if ("TABLE_HEADER_STATUS".equals(field)) { + else if (tc.getData().equals("TABLE_HEADER_STATUS")) { ascending = this.statusAscending; this.statusAscending = !this.statusAscending; sorter = new StatusSorter(newsItems); @@ -169,28 +176,6 @@ if (!ascending) Collections.reverse(newsItemOrder); - return ascending; - } - - /** - * Handle the sorting corresponding to the header clicked - * - * @param se the SelectionEvent - */ - public void widgetSelected(SelectionEvent se) { - widgetSelected((TableColumn) se.getSource()); - } - - /** - * Handle the sorting corresponding to the header clicked - * - * @param tc The selected TableColumn - */ - public void widgetSelected(TableColumn tc) { - - /** Sort based on the given TableColumn */ - boolean ascending = sort((String) tc.getData()); - /** Remember the width values of the columns */ int columnCount = table.getColumnCount(); int columnWidth[] = new int[columnCount]; @@ -202,41 +187,6 @@ if (table.getSelectionCount() > 0) selectedNews = table.getSelection()[0].getText(1); - /** Show a Sort Indicator inside the selected TableColumn */ - if (!tc.getData().equals("TABLE_HEADER_STATUS")) { - table.setSortColumn(tc); - - /** Reset Sort Direction */ - if (table.getSortDirection() != SWT.NONE) - table.setSortDirection(SWT.NONE); - - /** Apply the new direction */ - table.setSortDirection(ascending ? SWT.DOWN : SWT.UP); - - /** - * The Indicator requires some space, so pack the TableColumn. In order to - * avoid flashing, first set the Table to redraw = false before packing. - */ - table.setRedraw(false); - tc.pack(); - table.setRedraw(true); - - /** Restore Focus if necessary */ - if (!table.isFocusControl()) - table.setFocus(); - - /** Grant the sorted Column its preferred Width */ - int sortColumnIndex = table.indexOf(tc); - if (columnWidth[sortColumnIndex] < tc.getWidth()) - columnWidth[sortColumnIndex] = tc.getWidth(); - } - - /** Do not show the Indicator in the first, narrow Column */ - else if (table.getSortColumn() != null) { - table.setSortDirection(SWT.NONE); - table.setSortColumn(null); - } - /** Remove All tableitems */ table.removeAll(); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jan 2006 14:16:01 -0000 1.2 +++ .cvsignore 6 May 2006 17:24:01 -0000 1.3 @@ -1 +1,2 @@ rssowl_1_2_src_clean.tar.gz +rssowl_1_2_1_src.tar.gz rssowl-browser.patch: Index: rssowl-browser.patch =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-browser.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl-browser.patch 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl-browser.patch 6 May 2006 17:24:01 -0000 1.2 @@ -1,5 +1,5 @@ ---- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java~ 2005-11-06 08:06:57.000000000 -0800 -+++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java 2006-01-13 18:33:12.000000000 -0800 +--- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java.orig 2006-04-23 05:30:40.000000000 -0700 ++++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java 2006-05-06 09:54:29.000000000 -0700 @@ -36,6 +36,9 @@ import org.eclipse.swt.SWTError; import org.eclipse.swt.program.Program; @@ -10,14 +10,13 @@ import java.io.IOException; /** -@@ -267,11 +270,28 @@ +@@ -268,14 +271,31 @@ /** Try Netscape as default browser */ if (webBrowser == null) { try { - webBrowser = "netscape"; - p = Runtime.getRuntime().exec(webBrowser + " " + href); - } catch (IOException e) { -- p = null; - webBrowser = "mozilla"; + // This is kind of lame, but - oh well - it's slightly better than + // the original. @@ -30,17 +29,29 @@ + else if (webBrowser.startsWith("epiphany")) + webBrowser = "epiphany"; + if (webBrowser.startsWith("netscape")) -+ webBrowser = "netscape"; -+ else -+ webBrowser = "firefox"; ++ webBrowser = "netscape"; ++ else ++ webBrowser = "firefox"; + } catch (ConfException ce) { -+ try { -+ webBrowser = "firefox"; -+ p = Runtime.getRuntime().exec(webBrowser + " " + href); -+ } catch (IOException e) { -+ p = null; -+ webBrowser = "mozilla"; -+ } ++ try { ++ webBrowser = "firefox"; ++ p = Runtime.getRuntime().exec(webBrowser + " " + href); ++ } catch (IOException e) { ++ p = null; ++ webBrowser = "mozilla"; ++ } + } + } + +- /** Try Mozilla as default browser */ + if (p == null) { + try { + p = Runtime.getRuntime().exec(webBrowser + " " + href); +@@ -284,6 +304,7 @@ + errorMessage(); } } ++ + return p; + } rssowl-build0.patch: Index: rssowl-build0.patch =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-build0.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl-build0.patch 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl-build0.patch 6 May 2006 17:24:01 -0000 1.2 @@ -1,21 +1,16 @@ ---- src/build.xml~ 2005-11-06 08:06:57.000000000 -0800 -+++ src/build.xml 2006-01-04 05:46:08.000000000 -0800 -@@ -127,12 +127,17 @@ +--- src/build.xml.orig 2006-04-23 05:30:41.000000000 -0700 ++++ src/build.xml 2006-05-06 09:34:24.000000000 -0700 +@@ -121,7 +121,12 @@ for the special-chars of the translations. --> - -+ -+ -+ -+ - -+ srcdir="${src}"> -+ -+ - + +- ++ ++ ++ ++ ++ ++ + - - -- -- -- -- -- -- -- - -- -- -- -- - - - + +- +- +- +- +- +- +- + +- +- +- +- + + + rssowl-swt31.patch: Index: rssowl-swt31.patch =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-swt31.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl-swt31.patch 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl-swt31.patch 6 May 2006 17:24:01 -0000 1.2 @@ -1,179 +1,3 @@ ---- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java~ 2006-01-04 05:58:01.000000000 -0800 -+++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java 2005-06-14 14:15:46.000000000 -0700 -@@ -26,7 +26,6 @@ - - import net.sourceforge.rssowl.controller.NewsTable; - --import org.eclipse.swt.SWT; - import org.eclipse.swt.events.SelectionAdapter; - import org.eclipse.swt.events.SelectionEvent; - import org.eclipse.swt.widgets.Table; -@@ -42,7 +41,7 @@ - * header is clicked and update it. - * - * @author Ludovic Kim-Xuan Galibert -- * @version 1.2 -+ * @version 1.1.3 - */ - public class SortingSelectionAdapter extends SelectionAdapter { - -@@ -101,59 +100,67 @@ - } - - /** -- * Sort the News using a Sorter that is identified by the given field value. -+ * Handle the sorting corresponding to the header clicked - * -- * @param field The identifier of the Sorter to use. -- * @return boolean TRUE if the sort was ascending, FALSE if descending. -+ * @param se the SelectionEvent - */ -- public boolean sort(String field) { -+ public void widgetSelected(SelectionEvent se) { -+ widgetSelected((TableColumn) se.getSource()); -+ } -+ -+ /** -+ * Handle the sorting corresponding to the header clicked -+ * -+ * @param tc The selected TableColumn -+ */ -+ public void widgetSelected(TableColumn tc) { - Comparator sorter = null; - boolean ascending = true; - - /** Sort by news title */ -- if ("TABLE_HEADER_NEWSTITLE".equals(field)) { -+ if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) { - ascending = this.titleAscending; - this.titleAscending = !this.titleAscending; - sorter = new TitleSorter(); - } - - /** Sort by publish date */ -- else if ("TABLE_HEADER_PUBDATE".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) { - ascending = this.pudDateAscending; - this.pudDateAscending = !this.pudDateAscending; - sorter = new PubDateSorter(newsItems); - } - - /** Sort by author */ -- else if ("TABLE_HEADER_AUTHOR".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) { - ascending = this.authorAscending; - this.authorAscending = !this.authorAscending; - sorter = new AuthorSorter(newsItems); - } - - /** Sort by category */ -- else if ("TABLE_HEADER_CATEGORY".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) { - ascending = this.categoryAscending; - this.categoryAscending = !this.categoryAscending; - sorter = new CategorySorter(newsItems); - } - - /** Sort by publisher */ -- else if ("TABLE_HEADER_PUBLISHER".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) { - ascending = this.publisherAscending; - this.publisherAscending = !this.publisherAscending; - sorter = new PublisherSorter(newsItems); - } - - /** Sort by news feed */ -- else if ("TABLE_HEADER_FEED".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_FEED")) { - ascending = this.newsfeedAscending; - this.newsfeedAscending = !this.newsfeedAscending; - sorter = new NewsFeedSorter(newsItems); - } - - /** Sort by news status */ -- else if ("TABLE_HEADER_STATUS".equals(field)) { -+ else if (tc.getData().equals("TABLE_HEADER_STATUS")) { - ascending = this.statusAscending; - this.statusAscending = !this.statusAscending; - sorter = new StatusSorter(newsItems); -@@ -165,33 +172,11 @@ - else - Collections.sort(newsItemOrder, sorter); - -- /** Reverse if not ascending order */ -+ /** Reverse is not ascending order */ - if (!ascending) - Collections.reverse(newsItemOrder); - -- return ascending; -- } -- -- /** -- * Handle the sorting corresponding to the header clicked -- * -- * @param se the SelectionEvent -- */ -- public void widgetSelected(SelectionEvent se) { -- widgetSelected((TableColumn) se.getSource()); -- } -- -- /** -- * Handle the sorting corresponding to the header clicked -- * -- * @param tc The selected TableColumn -- */ -- public void widgetSelected(TableColumn tc) { -- -- /** Sort based on the given TableColumn */ -- boolean ascending = sort((String) tc.getData()); -- -- /** Remember the width values of the columns */ -+ /** Remember the width values of the columns before sorting */ - int columnWidth[] = new int[table.getColumnCount()]; - for (int a = 0; a < table.getColumnCount(); a++) - columnWidth[a] = table.getColumn(a).getWidth(); -@@ -201,41 +186,6 @@ - if (table.getSelectionCount() > 0) - selectedNews = table.getSelection()[0].getText(1); - -- /** Show a Sort Indicator inside the selected TableColumn */ -- if (!tc.getData().equals("TABLE_HEADER_STATUS")) { -- table.setSortColumn(tc); -- -- /** Reset Sort Direction */ -- if (table.getSortDirection() != SWT.NONE) -- table.setSortDirection(SWT.NONE); -- -- /** Apply the new direction */ -- table.setSortDirection(ascending ? SWT.DOWN : SWT.UP); -- -- /** -- * The Indicator requires some space, so pack the TableColumn. In order to -- * avoid flashing, first set the Table visible before packing the Column. -- */ -- table.setVisible(false); -- tc.pack(); -- table.setVisible(true); -- -- /** Restore Focus if necessary */ -- if (!table.isFocusControl()) -- table.setFocus(); -- -- /** Grant the sorted Column its preferred Width */ -- int sortColumnIndex = table.indexOf(tc); -- if (columnWidth[sortColumnIndex] < tc.getWidth()) -- columnWidth[sortColumnIndex] = tc.getWidth(); -- } -- -- /** Do not show the Indicator in the first, narrow Column */ -- else if (table.getSortColumn() != null) { -- table.setSortDirection(SWT.NONE); -- table.setSortColumn(null); -- } -- - /** Remove All tableitems */ - table.removeAll(); - --- src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java~ 2006-01-04 06:01:14.000000000 -0800 +++ src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java 2005-07-15 16:44:50.000000000 -0700 @@ -54,7 +54,6 @@ @@ -188,7 +12,7 @@ * Table. A selection on a newstitle will open it inside the Newstext panel. * * @author Benjamin Pasero -- * @version 1.2 +- * @version 1.2.1 + * @version 1.1.3 */ public class NewsfeedPanel { rssowl-use-jce.patch: Index: rssowl-use-jce.patch =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl-use-jce.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rssowl-use-jce.patch 17 Jan 2006 14:16:01 -0000 1.1 +++ rssowl-use-jce.patch 6 May 2006 17:24:01 -0000 1.2 @@ -1,5 +1,5 @@ ---- src/java/net/sourceforge/rssowl/util/CryptoManager.java.sav 2006-01-04 05:29:01.000000000 -0800 -+++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-01-04 05:31:00.000000000 -0800 +--- src/java/net/sourceforge/rssowl/util/CryptoManager.java.orig 2006-04-23 05:30:41.000000000 -0700 ++++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-05-06 09:27:30.000000000 -0700 @@ -24,7 +24,9 @@ package net.sourceforge.rssowl.util; @@ -11,15 +11,6 @@ import net.sourceforge.rssowl.controller.GUI; import net.sourceforge.rssowl.util.shop.StringShop; -@@ -41,7 +43,7 @@ - * - * @author Benjamin Pasero - * @version 1.2 -- */ -+*/ - public class CryptoManager { - - /** Unique key for the proxy domain (NTLM only) */ @@ -56,15 +58,28 @@ /** An instance of the CryptoManager */ private static CryptoManager instance; Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rssowl.spec 2 Apr 2006 03:59:39 -0000 1.7 +++ rssowl.spec 6 May 2006 17:24:01 -0000 1.8 @@ -1,6 +1,6 @@ %define name rssowl -%define version 1.2 -%define release 13%{?dist} +%define version 1.2.1 +%define release 1%{?dist} %define jdk java Name: %name @@ -10,15 +10,16 @@ License: CPL Group: Applications/Internet URL: http://www.rssowl.org -Source0: rssowl_1_2_src_clean.tar.gz +Source0: rssowl_1_2_1_src.tar.gz Source1: %{name}.script Source2: %{name}.desktop Patch0: %{name}-use-jce.patch Patch1: %{name}-build0.patch Patch2: %{name}-swt31.patch Patch3: %{name}-build1.patch -Patch4: %{name}-JessieX509.patch +#Patch4: %{name}-JessieX509.patch Patch5: %{name}-browser.patch +Patch6: %{name}-swt31-SortingSelectionAdapter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: jre >= 1.4.2- @@ -50,13 +51,14 @@ integrierte Browser. %prep -%setup -q -n %{name}_1_2_src_clean +%setup -q -n rssowl_1_2_1_src %patch0 -p0 %patch1 -p0 %patch2 -p0 %patch3 -p0 -%patch4 -p0 +#%patch4 -p0 %patch5 -p0 +%patch6 -p0 # This package doesn't contain any MPL licensed code. rm doc/mpl-v11.txt @@ -138,6 +140,9 @@ %{_libdir}/gcj/%{name} %changelog +* Sat May 6 2006 Anthony Green - 1.2.1-1 +- Update sources. + * Fri Mar 10 2006 Anthony Green - 1.2-13 - Fix script goof. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jan 2006 14:16:01 -0000 1.2 +++ sources 6 May 2006 17:24:01 -0000 1.3 @@ -1 +1,2 @@ d440e36983de3dba0239b4f1020f0837 rssowl_1_2_src_clean.tar.gz +be9c070343aa145807e1e708ed535a9b rssowl_1_2_1_src.tar.gz From fedora-extras-commits at redhat.com Sat May 6 17:31:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 6 May 2006 10:31:47 -0700 Subject: fedora-security/audit fe4,1.5,1.6 fe5,1.5,1.6 Message-ID: <200605061731.k46HVlDU020576@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20556 Modified Files: fe4 fe5 Log Message: Add recent awstats issues. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fe4 5 May 2006 19:13:55 -0000 1.5 +++ fe4 6 May 2006 17:31:44 -0000 1.6 @@ -2,7 +2,9 @@ ** are items that need attention +CVE-NOID VULNERABLE (awstats) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-1989 version (clamav, fixed 0.88.2) +CVE-2006-1945 VULNERABLE (awstats) bz#190921 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fe5 5 May 2006 19:13:55 -0000 1.5 +++ fe5 6 May 2006 17:31:44 -0000 1.6 @@ -2,7 +2,9 @@ ** are items that need attention +CVE-NOID VULNERABLE (awstats) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-1989 version (clamav, fixed 0.88.2) +CVE-2006-1945 VULNERABLE (awstats) bz#190922 From fedora-extras-commits at redhat.com Sat May 6 18:46:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:16 -0700 Subject: rpms/perl-Module-Info - New directory Message-ID: <200605061846.k46IkIX1023803@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23765/perl-Module-Info Log Message: Directory /cvs/extras/rpms/perl-Module-Info added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:46:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:17 -0700 Subject: rpms/perl-Module-Info/devel - New directory Message-ID: <200605061846.k46IkJUt023807@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23765/perl-Module-Info/devel Log Message: Directory /cvs/extras/rpms/perl-Module-Info/devel added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:46:46 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:46 -0700 Subject: rpms/perl-Module-Info/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605061846.k46IkmxV023902@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23866/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-Info --- NEW 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 May 6 18:46:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:17 -0700 Subject: owners owners.list,1.947,1.948 Message-ID: <200605061846.k46IknpS023905@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23763 Modified Files: owners.list Log Message: Add perl-Module-Info. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.947 retrieving revision 1.948 diff -u -r1.947 -r1.948 --- owners.list 6 May 2006 16:11:54 -0000 1.947 +++ owners.list 6 May 2006 18:46:16 -0000 1.948 @@ -1093,6 +1093,7 @@ Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Module-Info|Information about Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 6 18:46:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:46:45 -0700 Subject: rpms/perl-Module-Info Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605061846.k46Iklej023899@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23866 Added Files: Makefile import.log Log Message: Setup of module perl-Module-Info --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-Info all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 6 18:47:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:47:33 -0700 Subject: rpms/perl-Module-Info import.log,1.1,1.2 Message-ID: <200605061847.k46IlZ9Y023999@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23962 Modified Files: import.log Log Message: auto-import perl-Module-Info-0.30-2 on branch devel from perl-Module-Info-0.30-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 May 2006 18:46:45 -0000 1.1 +++ import.log 6 May 2006 18:47:33 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-Info-0_30-2:HEAD:perl-Module-Info-0.30-2.src.rpm:1146941237 From fedora-extras-commits at redhat.com Sat May 6 18:47:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:47:34 -0700 Subject: rpms/perl-Module-Info/devel perl-Module-Info.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605061847.k46IlaQS024005@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23962/devel Modified Files: .cvsignore sources Added Files: perl-Module-Info.spec Log Message: auto-import perl-Module-Info-0.30-2 on branch devel from perl-Module-Info-0.30-2.src.rpm --- NEW FILE perl-Module-Info.spec --- Name: perl-Module-Info Version: 0.30 Release: 2%{?dist} Summary: Information about Perl modules License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Info/ Source0: http://www.cpan.org/authors/id/M/MB/MBARBON/Module-Info-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) BuildRequires: perl(version) Requires: perl(version) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::Info gives you information about Perl modules without actually loading the module. It actually isn't specific to modules and should work on any perl code. %prep %setup -q -n Module-Info-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{_bindir}/* %{perl_vendorlib}/* %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Sat May 06 2006 Steven Pritchard 0.30-2 - Add BR: perl(Test::Pod) and perl(version). - Add Requires: perl(version). * Fri Apr 21 2006 Steven Pritchard 0.30-1 - Update to 0.30. - Use perl macro. - Drop extra find. * Fri Mar 24 2006 Steven Pritchard 0.290-1 - Specfile autogenerated by cpanspec 1.64. - Add bindir and man1 files. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2006 18:46:46 -0000 1.1 +++ .cvsignore 6 May 2006 18:47:34 -0000 1.2 @@ -0,0 +1 @@ +Module-Info-0.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2006 18:46:46 -0000 1.1 +++ sources 6 May 2006 18:47:34 -0000 1.2 @@ -0,0 +1 @@ +a1e4e39cceda93dc0ab2d296b5075d76 Module-Info-0.30.tar.gz From fedora-extras-commits at redhat.com Sat May 6 18:53:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:53:05 -0700 Subject: rpms/perl-Test-Prereq - New directory Message-ID: <200605061853.k46Ir7qP024231@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24205/perl-Test-Prereq Log Message: Directory /cvs/extras/rpms/perl-Test-Prereq added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:53:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:53:06 -0700 Subject: rpms/perl-Test-Prereq/devel - New directory Message-ID: <200605061853.k46Ir82Y024234@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24205/perl-Test-Prereq/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Prereq/devel added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:53:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:53:33 -0700 Subject: rpms/perl-Test-Prereq Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605061853.k46IrZia024283@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24250 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Prereq --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Prereq all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 6 18:53:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:53:34 -0700 Subject: rpms/perl-Test-Prereq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605061853.k46Irajh024286@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24250/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Prereq --- NEW 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 May 6 18:54:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:54:21 -0700 Subject: rpms/perl-Test-Prereq import.log,1.1,1.2 Message-ID: <200605061854.k46IsNGO024349@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24316 Modified Files: import.log Log Message: auto-import perl-Test-Prereq-1.030-1 on branch devel from perl-Test-Prereq-1.030-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 May 2006 18:53:33 -0000 1.1 +++ import.log 6 May 2006 18:54:21 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Prereq-1_030-1:HEAD:perl-Test-Prereq-1.030-1.src.rpm:1146941646 From fedora-extras-commits at redhat.com Sat May 6 18:54:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:54:21 -0700 Subject: rpms/perl-Test-Prereq/devel perl-Test-Prereq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605061854.k46IsNux024354@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24316/devel Modified Files: .cvsignore sources Added Files: perl-Test-Prereq.spec Log Message: auto-import perl-Test-Prereq-1.030-1 on branch devel from perl-Test-Prereq-1.030-1.src.rpm --- NEW FILE perl-Test-Prereq.spec --- Name: perl-Test-Prereq Version: 1.030 Release: 1%{?dist} Summary: Check if Makefile.PL has the right pre-requisites License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Prereq/ Source0: http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Prereq-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Module::CoreList) BuildRequires: perl(Module::Info) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The prereq_ok() function examines the modules it finds in blib/lib/, blib/script, and the test files it finds in t/ (and test.pl). It figures out which modules they use, skips the modules that are in the Perl core, and compares the remaining list of modules to those in the PREREQ_PM section of Makefile.PL. %prep %setup -q -n Test-Prereq-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check %{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri Mar 24 2006 Steven Pritchard 1.030-1 - Specfile autogenerated by cpanspec 1.64. - Fix License. - Drop explicit Requires. - Disable tests by default (uses network). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2006 18:53:34 -0000 1.1 +++ .cvsignore 6 May 2006 18:54:21 -0000 1.2 @@ -0,0 +1 @@ +Test-Prereq-1.030.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2006 18:53:34 -0000 1.1 +++ sources 6 May 2006 18:54:21 -0000 1.2 @@ -0,0 +1 @@ +9acb4eb0737bb041e9ece8ad08e127c3 Test-Prereq-1.030.tar.gz From fedora-extras-commits at redhat.com Sat May 6 18:56:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:56:39 -0700 Subject: rpms/perl-Graphics-ColorNames - New directory Message-ID: <200605061856.k46IufkV024467@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24441/perl-Graphics-ColorNames Log Message: Directory /cvs/extras/rpms/perl-Graphics-ColorNames added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:56:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:56:39 -0700 Subject: rpms/perl-Graphics-ColorNames/devel - New directory Message-ID: <200605061856.k46IufNw024470@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24441/perl-Graphics-ColorNames/devel Log Message: Directory /cvs/extras/rpms/perl-Graphics-ColorNames/devel added to the repository From fedora-extras-commits at redhat.com Sat May 6 18:57:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:12 -0700 Subject: rpms/perl-Graphics-ColorNames Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605061857.k46IvEv0024523@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24490 Added Files: Makefile import.log Log Message: Setup of module perl-Graphics-ColorNames --- NEW FILE Makefile --- # Top level Makefile for module perl-Graphics-ColorNames all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 6 18:57:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:13 -0700 Subject: rpms/perl-Graphics-ColorNames/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605061857.k46IvFuJ024526@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24490/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Graphics-ColorNames --- NEW 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 May 6 18:57:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:17 -0700 Subject: owners owners.list,1.948,1.949 Message-ID: <200605061857.k46IvJmi024547@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24486 Modified Files: owners.list Log Message: Add perl-Test-Prereq and perl-Graphics-ColorNames. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.948 retrieving revision 1.949 diff -u -r1.948 -r1.949 --- owners.list 6 May 2006 18:46:16 -0000 1.948 +++ owners.list 6 May 2006 18:57:16 -0000 1.949 @@ -1012,6 +1012,7 @@ Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Gnome2-Canvas|Perl interface to Gnome Canvas|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Graphics-ColorNames|Defines RGB values for common color names|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| @@ -1166,6 +1167,7 @@ Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Prereq|Check if Makefile.PL has the right pre-requisites|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-SubCalls|Track the number of times subs are called|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Tester|Ease testing test modules built with Test::Builder|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 6 18:57:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:57 -0700 Subject: rpms/perl-Graphics-ColorNames import.log,1.1,1.2 Message-ID: <200605061857.k46Ivx8a024606@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24573 Modified Files: import.log Log Message: auto-import perl-Graphics-ColorNames-1.06-1 on branch devel from perl-Graphics-ColorNames-1.06-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Graphics-ColorNames/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 May 2006 18:57:12 -0000 1.1 +++ import.log 6 May 2006 18:57:56 -0000 1.2 @@ -0,0 +1 @@ +perl-Graphics-ColorNames-1_06-1:HEAD:perl-Graphics-ColorNames-1.06-1.src.rpm:1146941863 From fedora-extras-commits at redhat.com Sat May 6 18:57:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 11:57:57 -0700 Subject: rpms/perl-Graphics-ColorNames/devel perl-Graphics-ColorNames.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605061858.k46Ivxpb024611@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Graphics-ColorNames/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24573/devel Modified Files: .cvsignore sources Added Files: perl-Graphics-ColorNames.spec Log Message: auto-import perl-Graphics-ColorNames-1.06-1 on branch devel from perl-Graphics-ColorNames-1.06-1.src.rpm --- NEW FILE perl-Graphics-ColorNames.spec --- Name: perl-Graphics-ColorNames Version: 1.06 Release: 1%{?dist} Summary: Defines RGB values for common color names License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Graphics-ColorNames/ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Graphics-ColorNames-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Module::Load) >= 0.1 BuildRequires: perl(Pod::Coverage) BuildRequires: perl(Test::Pod) >= 1 BuildRequires: perl(Test::Prereq) Requires: perl(Module::Load) >= 0.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module defines RGB values for common color names. The intention is to (1) provide a common module that authors can use with other modules to specify colors; and (2) free module authors from having to "re-invent the wheel" whenever they decide to give the users the option of specifying a color by name rather than RGB value. %prep %setup -q -n Graphics-ColorNames-%{version} perl -pi -e 's/\r//g' Changes README %build perl Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri Mar 24 2006 Steven Pritchard 1.06-1 - Specfile autogenerated by cpanspec 1.64. - Drop some explicit Requires. - Drop explicit BR: perl. - dos2unix Changes and README. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Graphics-ColorNames/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2006 18:57:12 -0000 1.1 +++ .cvsignore 6 May 2006 18:57:57 -0000 1.2 @@ -0,0 +1 @@ +Graphics-ColorNames-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Graphics-ColorNames/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2006 18:57:12 -0000 1.1 +++ sources 6 May 2006 18:57:57 -0000 1.2 @@ -0,0 +1 @@ +0551cb0b17babcbdef284d5b502731a4 Graphics-ColorNames-1.06.tar.gz From fedora-extras-commits at redhat.com Sat May 6 19:19:31 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 6 May 2006 12:19:31 -0700 Subject: rpms/pan/devel .cvsignore, 1.6, 1.7 pan.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200605061919.k46JJXt7026973@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26952 Modified Files: .cvsignore pan.spec sources Log Message: new devel update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Apr 2006 15:43:09 -0000 1.6 +++ .cvsignore 6 May 2006 19:19:31 -0000 1.7 @@ -2,3 +2,4 @@ pan-0.93.tar.bz2 pan-0.94.tar.bz2 pan-0.95.tar.bz2 +pan-0.96.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pan.spec 1 May 2006 19:57:33 -0000 1.12 +++ pan.spec 6 May 2006 19:19:31 -0000 1.13 @@ -1,12 +1,12 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.95 -Release: 3%{?dist} +Version: 0.96 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 -Patch0: pan-0.95-upstream-tree.patch +#Patch0: pan-0.95-upstream-tree.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -27,7 +27,7 @@ %prep %setup -q -%patch0 -p1 +#%%patch0 -p1 echo "StartupNotify=true" >> pan.desktop @@ -72,6 +72,9 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Sat May 06 2006 Michael A. Peters - 1:0.96-1 +- Update to 0.96 - patch1 no longer needed + * Mon May 01 2006 Michael A. Peters - 1:0.95-3 - Apply a patch from upstream for new tree implementation bug - (Patch0) Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Apr 2006 15:43:09 -0000 1.6 +++ sources 6 May 2006 19:19:31 -0000 1.7 @@ -1,2 +1,2 @@ -1013562743c330b07b84b749ed247c66 pan-0.94.tar.bz2 3a0cff7a3bc8b77ad19af4a492859804 pan-0.95.tar.bz2 +b4e355553cd502add3e599d1e867da9e pan-0.96.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 19:48:11 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 6 May 2006 12:48:11 -0700 Subject: extras-buildsys/utils extras-push-new, 1.2, 1.3 extras-sign-move.py, 1.14, 1.15 Message-ID: <200605061948.k46JmBvN027196@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27176 Modified Files: extras-push-new extras-sign-move.py Log Message: Make SMTP server configurable. Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- extras-push-new 6 May 2006 13:14:41 -0000 1.2 +++ extras-push-new 6 May 2006 19:48:09 -0000 1.3 @@ -45,6 +45,7 @@ or the fedora Info Feed: http://fedoraproject.org/infofeed/ """ +smtp_server = '' config = { 'repoview' : True, 'repoclosure' : False, @@ -402,7 +403,10 @@ if DEBUG: return s = smtplib.SMTP() - s.connect() + if smtp_server: + s.connect(smtp_server) + else: + s.connect() s.sendmail(mail_from, [mail_to], msg.as_string()) s.close() Index: extras-sign-move.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- extras-sign-move.py 24 Apr 2006 17:43:46 -0000 1.14 +++ extras-sign-move.py 6 May 2006 19:48:09 -0000 1.15 @@ -41,6 +41,7 @@ or the fedora Info Feed: http://fedoraproject.org/infofeed/ """ +smtp_server = '' stagesdir = '/srv/rpmbuild/repodir' treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project) cachedir = '/tmp/repomd-cache' @@ -142,7 +143,10 @@ msg['From'] = mail_from msg['To'] = mail_to s = smtplib.SMTP() - s.connect() + if smtp_server: + s.connect(smtp_server) + else: + s.connect() s.sendmail(mail_from, [mail_to], msg.as_string()) s.close() From fedora-extras-commits at redhat.com Sat May 6 22:42:38 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 15:42:38 -0700 Subject: rpms/gcompris/devel gcompris-7.4-xf86vidmode.patch, NONE, 1.1 gcompris.spec, 1.3, 1.4 Message-ID: <200605062242.k46Mge2P008076@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8056 Modified Files: gcompris.spec Added Files: gcompris-7.4-xf86vidmode.patch Log Message: * Sat May 6 2006 Hans de Goede 7.4-7 - Use XF86VidMode instead of Xrandr extension for resolution switching, hopefully fixing bug 190918. gcompris-7.4-xf86vidmode.patch: --- NEW FILE gcompris-7.4-xf86vidmode.patch --- --- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 +++ gcompris-7.4/configure 2006-05-07 00:25:10.000000000 +0200 @@ -1094,7 +1094,7 @@ --disable-sdltest Do not try to compile and run a test SDL program --disable-glibtest do not try to compile and run a test GLIB program --disable-rpath do not hardcode runtime library paths - --disable-xrandr Turn off xrandr + --disable-xf86vidmode Turn off xf86vidmode --enable-debug Turn on debugging messages --disable-sqlite Turn off sqlite (will disable profile) --enable-py-build-only Skip python modules tests. (Useful if you just need @@ -23630,7 +23630,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -23638,7 +23638,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -23665,7 +23665,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -23686,11 +23686,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -23769,23 +23769,23 @@ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -# Check whether --enable-xrandr or --disable-xrandr was given. -if test "${enable_xrandr+set}" = set; then - enableval="$enable_xrandr" - USE_XRANDR="$enableval" +# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. +if test "${enable_xf86vidmode+set}" = set; then + enableval="$enable_xf86vidmode" + USE_XF86VM="$enableval" else - USE_XRANDR="yes" + USE_XF86VM="yes" fi; -found_randr=no -if test "x$USE_XRANDR" == "xyes" ; then - RANDR_LIBS= - echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 -echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 -if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then +found_xf86vidmode=no +if test "x$USE_XF86VM" == "xyes" ; then + XF86VM_LIBS= + echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 +if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" +LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23799,11 +23799,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XRRSetScreenConfigAndRate (); +char XF86VidModeQueryExtension (); int main () { -XRRSetScreenConfigAndRate (); +XF86VidModeQueryExtension (); ; return 0; } @@ -23830,23 +23830,23 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no +ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 -if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then - echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 +if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then + echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 +echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23857,7 +23857,7 @@ /* end confdefs.h. */ #include -#include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -23881,38 +23881,38 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_X11_extensions_Xrandr_h=yes + ac_cv_header_X11_extensions_xf86vmode_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_Xrandr_h=no +ac_cv_header_X11_extensions_xf86vmode_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 -if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then - RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 +if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then + XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes fi fi - if test "x$found_randr" = "xno"; then - { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 -echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} + if test "x$found_xf86vidmode" = "xno"; then + { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 +echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} else cat >>confdefs.h <<_ACEOF -#define XRANDR 1 +#define XF86_VIDMODE 1 _ACEOF fi fi -LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" +LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" @@ -28651,7 +28651,7 @@ echo "SDL LIBS = found" fi -echo "XRANDR option (--enable-xrandr) = $found_randr" +echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" --- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 +++ gcompris-7.4/config.h.in 2006-05-07 00:25:10.000000000 +0200 @@ -141,5 +141,5 @@ /* Version number of package */ #undef VERSION -/* XRANDR Available */ -#undef XRANDR +/* XF86VidMode Available */ +#undef XF86_VIDMODE --- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-07 00:25:10.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } } - if(strcmp(name,"noxrandr")==0){ - if(self->cdata->noxrandr){ + if(strcmp(name,"noxf86vm")==0){ + if(self->cdata->noxf86vm){ Py_INCREF(Py_True); return Py_True; } else { --- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 +++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-07 00:29:58.000000000 +0200 @@ -33,12 +33,13 @@ #include "cursor.h" -/* For XRANDR Support */ -#ifdef XRANDR +/* For XF86_VIDMODE Support */ +#ifdef XF86_VIDMODE #include #include -#include -#include +#include +#include +#include #endif #if defined _WIN32 || defined __WIN32__ @@ -104,7 +105,7 @@ static int popt_aalias = FALSE; static int popt_difficulty_filter = FALSE; static int popt_debug = FALSE; -static int popt_noxrandr = FALSE; +static int popt_noxf86vm = FALSE; static char *popt_root_menu = NULL; static char *popt_local_activity = NULL; static int popt_administration = FALSE; @@ -139,8 +140,8 @@ N_("Print the version of " PACKAGE), NULL}, {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, N_("Use the antialiased canvas (slower)."), NULL}, - {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, - N_("Disable XRANDR (No screen resolution change)."), NULL}, + {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, + N_("Disable XF86VidMode (No screen resolution change)."), NULL}, {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, @@ -184,29 +185,19 @@ }; /* XRandr Stuff */ -#ifdef XRANDR -typedef struct +#ifdef XF86_VIDMODE +static struct { - gboolean xr_lock_updates; + int vidmode_available; + XF86VidModeModeInfo orig_mode; + int orig_viewport_x; + int orig_viewport_y; + int width; + int height; +} XF86VidModeData = { 0, { 0 }, 0, 0 }; - XRRScreenConfiguration *xr_screen_conf; - - XRRScreenSize *xr_sizes; - int xr_nsize; - SizeID xr_current_size; - - Rotation xr_rotations; - Rotation xr_current_rotation; - -} XRANDRData; - -static SizeID xr_previous_size; -static gboolean xr_previous_size_set = FALSE; -static XRANDRData *xrandr = NULL; - -static void xrandr_init ( XRANDRData *xrandr ); -static void xrandr_get_config ( XRANDRData *xrandr ); -static void xrandr_set_config( XRANDRData *xrandr ); +static void xf86_vidmode_init( void ); +static void xf86_vidmode_set_fullscreen( int state ); #endif /****************************************************************************/ @@ -441,8 +432,8 @@ gint screen_height, screen_width; GtkWidget *vbox; -#ifdef XRANDR - xrandr = g_new0 (XRANDRData, 1); +#ifdef XF86_VIDMODE + xf86_vidmode_init(); #endif gcompris_set_fullscreen(properties->fullscreen); @@ -450,10 +441,10 @@ screen_height = gdk_screen_height(); screen_width = gdk_screen_width(); -#ifdef XRANDR - if(properties->fullscreen && !properties->noxrandr) { - screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; - screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; +#ifdef XF86_VIDMODE + if(properties->fullscreen && !properties->noxf86vm) { + screen_width = XF86VidModeData.width; + screen_height = XF86VidModeData.height; } #endif @@ -811,39 +802,18 @@ */ void gcompris_set_fullscreen(gboolean state) { - - if(state) - { -#ifdef XRANDR - gint i; - /* Search the 800x600 Resolution */ - if(properties->fullscreen && !properties->noxrandr) { - - g_warning("XRANDR Is compiled in. Searching a good resolution"); - - /* Check if XRANDR is available */ - if (!properties->noxrandr) { - xrandr_get_config ( xrandr ); - xr_previous_size = (SizeID)xrandr->xr_current_size; - for (i = 0; i < xrandr->xr_nsize; i++) { - if(xrandr->xr_sizes[i].width == BOARDWIDTH && - xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) - { - xrandr->xr_current_size = (SizeID)i; - xr_previous_size_set = TRUE; - break; - } - } - } - - /* Set the Fullscreen now */ - if(xr_previous_size_set) - { - if(is_mapped) - xrandr_set_config( xrandr ); - } - } + properties->fullscreen = state; + /* We need to grab the pointer before doing the vidmode switch otherwise the + setviewport may be "canceled" by the pointer being outside the viewport */ + if(properties->fullscreen) + gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, + GDK_CURRENT_TIME); + +#ifdef XF86_VIDMODE + xf86_vidmode_set_fullscreen(properties->fullscreen); #endif + if(properties->fullscreen) + { gdk_window_set_decorations (window->window, 0); gdk_window_set_functions (window->window, 0); gtk_widget_set_uposition (window, 0, 0); @@ -851,20 +821,7 @@ } else { -#ifdef XRANDR - /* Set back the original screen size */ - if(xr_previous_size_set && !properties->noxrandr) - { - /* Need to refresh our config or xrandr api will reject us */ - if(xrandr) - { - xrandr_get_config ( xrandr ); - xrandr->xr_current_size = (SizeID)xr_previous_size; - xrandr_set_config( xrandr ); - } - } - xr_previous_size_set = FALSE; -#endif + gdk_pointer_ungrab(GDK_CURRENT_TIME); /* The hide must be done at least for KDE */ gtk_widget_hide (window); gdk_window_set_decorations (window->window, GDK_DECOR_ALL); @@ -1044,68 +1001,136 @@ g_printerr ("%s: %s\n\n", "gcompris", message); } -#ifdef XRANDR +#ifdef XF86_VIDMODE /* - * XRANDR STUFF - * ------------ + * XF86VidMode STUFF + * ----------------- */ static void -xrandr_init ( XRANDRData *data ) +xf86_vidmode_init ( void ) { - if(data==NULL) + int i,j; + XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) + &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); + + if (properties->noxf86vm) return; - - data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); - - if (data->xr_screen_conf == NULL) + + if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, + &XF86VidModeData.orig_viewport_x)) + properties->noxf86vm = TRUE; + + if (properties->noxf86vm) + g_warning("XF86VidMode not available"); + else { - g_warning("XRANDR not available"); - properties->noxrandr = TRUE; + XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; + XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; + g_warning("XF86VidMode support enabled"); } - else - g_warning("XRANDR support enabled"); - } - -static void -xrandr_get_config ( XRANDRData *data ) -{ - if(data==NULL) - return; - - xrandr_init (data); - - data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, - &data->xr_current_rotation); - - data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); - - data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, - &data->xr_current_rotation); } + static void -xrandr_set_config( XRANDRData *data ) +xf86_vidmode_set_fullscreen ( int state ) { - Status status = RRSetConfigFailed; + int i; + XF86VidModeModeLine mode; - if(data==NULL) + if (properties->noxf86vm) return; - if (data->xr_lock_updates) return; - - status = XRRSetScreenConfig (GDK_DISPLAY(), - data->xr_screen_conf, - GDK_ROOT_WINDOW(), - data->xr_current_size, - data->xr_current_rotation, - CurrentTime); - - if(status) { - g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", - (int)status); - } - return; - + if (state) + { + XF86VidModeModeInfo **modes; + int mode_count; + + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode)) + { + g_warning("XF86VidMode couldnot get current mode, not switching resolution"); + properties->fullscreen = FALSE; + return; + } + + /* Do we need to switch? */ + if ((mode.hdisplay == BOARDWIDTH) && + (mode.vdisplay == BOARDHEIGHT+BARHEIGHT)) + { + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), + GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) + g_warning("XF86VidMode couldnot change viewport"); + return; + } + + if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &mode_count, &modes)) + { + g_warning("XF86VidMode couldnot get modes not switching resolution"); + properties->fullscreen = FALSE; + return; + } + + for (i = 0; i < mode_count; i++) + { + if ((modes[i]->hdisplay == BOARDWIDTH) && + (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) + { + if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), modes[i])) + { + XF86VidModeData.width = modes[i]->hdisplay; + XF86VidModeData.height = modes[i]->vdisplay; + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), + GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) + g_warning("XF86VidMode couldnot change viewport"); + } + else + { + g_warning("XF86VidMode couldnot switch resolution"); + properties->fullscreen = FALSE; + } + break; + } + } + if (i == mode_count) + { + g_warning("XF86VidMode couldnot find a suitable resolution"); + properties->fullscreen = FALSE; + } + XFree(modes); + } + else + { + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode) || + (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || + (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) + { + if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_mode)) + { + XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; + XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; + } + else + g_warning("XF86VidMode couldnot restore original resolution"); + + } + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, + XF86VidModeData.orig_viewport_y)) + g_warning("XF86VidMode couldnot restore original viewport"); + } } #endif @@ -1185,9 +1210,9 @@ properties->fullscreen = TRUE; } - if (popt_noxrandr) + if (popt_noxf86vm) { - properties->noxrandr = TRUE; + properties->noxf86vm = TRUE; } if (popt_window) --- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/gcompris/properties.c 2006-05-07 00:25:10.000000000 +0200 @@ -160,7 +160,7 @@ tmp->fx = 1; tmp->screensize = 1; tmp->fullscreen = 1; - tmp->noxrandr = FALSE; + tmp->noxf86vm = FALSE; tmp->timer = 1; tmp->skin = "babytoy"; tmp->key = "default"; @@ -244,8 +244,8 @@ } else if(!strcmp(value.v_identifier, "fullscreen")) { if(!scan_get_int(scanner, &tmp->fullscreen)) g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "noxrandr")) { - if(!scan_get_int(scanner, &tmp->noxrandr)) + } else if(!strcmp(value.v_identifier, "noxf86vm")) { + if(!scan_get_int(scanner, &tmp->noxf86vm)) g_warning("Config file parsing error on token %s", token); } else if(!strcmp(value.v_identifier, "timer")) { if(!scan_get_int(scanner, &tmp->timer)) --- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/gcompris/properties.h 2006-05-07 00:25:10.000000000 +0200 @@ -28,7 +28,7 @@ gint music; gint fx; gint fullscreen; - gint noxrandr; + gint noxf86vm; gint screensize; gint defaultcursor; gint timer; --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 +++ gcompris-7.4/configure.in 2006-05-07 00:25:10.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV -dnl XRANDR Allow us to set the screen resolution dynamically +dnl XF86VidMode allows us to set the screen resolution dynamically AC_PATH_X -AC_ARG_ENABLE(xrandr, +AC_ARG_ENABLE(xf86vidmode, AC_HELP_STRING( - [--disable-xrandr], - [Turn off xrandr]), - USE_XRANDR="$enableval", USE_XRANDR="yes") -found_randr=no -if test "x$USE_XRANDR" == "xyes" ; then - RANDR_LIBS= - AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate, - [AC_CHECK_HEADER(X11/extensions/Xrandr.h, - RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes,, + [--disable-xf86vidmode], + [Turn off xf86vidmode]), + USE_XF86VM="$enableval", USE_XF86VM="yes") +found_xf86vidmode=no +if test "x$USE_XF86VM" == "xyes" ; then + XF86VM_LIBS= + AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, + [AC_CHECK_HEADER(X11/extensions/xf86vmode.h, + XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes,, [#include ])], , -L$x_libraries $ALL_X_LIBS ) - if test "x$found_randr" = "xno"; then - AC_MSG_NOTICE(["Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen."]) + if test "x$found_xf86vidmode" = "xno"; then + AC_MSG_NOTICE(["Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen."]) else - AC_DEFINE_UNQUOTED(XRANDR, 1, [XRANDR Available]) + AC_DEFINE_UNQUOTED(XF86_VIDMODE, 1, [XF86VidMode Available]) fi fi -LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" +LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" dnl Add the languages which your application supports here. ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" @@ -680,7 +680,7 @@ echo "SDL LIBS = found" fi -echo "XRANDR option (--enable-xrandr) = $found_randr" +echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcompris.spec 5 May 2006 18:08:47 -0000 1.3 +++ gcompris.spec 6 May 2006 22:42:38 -0000 1.4 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -12,6 +12,7 @@ Patch2: gcompris-nl.patch Patch3: gcompris-electric.patch Patch4: gcompris-click_on_letter.patch +Patch5: gcompris-7.4-xf86vidmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel @@ -220,6 +221,7 @@ %patch2 -p1 %patch3 -p1 -z .electric %patch4 -p1 -z .click_on_letter +%patch5 -p1 -z .xf86vm iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp mv tmp docs/C/gcompris.info # fix gnome.canvas deprecation warnings @@ -476,6 +478,10 @@ %changelog +* Sat May 6 2006 Hans de Goede 7.4-7 +- Use XF86VidMode instead of Xrandr extension for resolution switching, + hopefully fixing bug 190918. + * Fri May 5 2006 Hans de Goede 7.4-6 - Add missing python module Requires. From fedora-extras-commits at redhat.com Sat May 6 23:38:33 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 6 May 2006 16:38:33 -0700 Subject: extras-buildsys/utils extras-push-new,1.3,1.4 Message-ID: <200605062338.k46NcXeO010570@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10552 Modified Files: extras-push-new Log Message: remove tiny bit of superfluous code Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- extras-push-new 6 May 2006 19:48:09 -0000 1.3 +++ extras-push-new 6 May 2006 23:38:31 -0000 1.4 @@ -427,7 +427,6 @@ sys.exit(22) dists = [] # the list of distribution release we want to push - distdict = {} for d in sys.argv[1:]: if d == 'all': dists = alldists @@ -435,9 +434,8 @@ if d not in alldists: print "ERROR: No Distribution named '%s' found" % d sys.exit(1) - if not distdict.has_key(d): + if d not in dists: dists.append(d) - distdict[d] = True debugprint(dists) # If we are called as 'extras-sign-move.py' we simulate old From fedora-extras-commits at redhat.com Sat May 6 23:45:54 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:45:54 -0700 Subject: rpms/gnome-ppp - New directory Message-ID: <200605062345.k46NjuYW010665@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644/gnome-ppp Log Message: Directory /cvs/extras/rpms/gnome-ppp added to the repository From fedora-extras-commits at redhat.com Sat May 6 23:45:54 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:45:54 -0700 Subject: rpms/gnome-ppp/devel - New directory Message-ID: <200605062346.k46Njuqb010668@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644/gnome-ppp/devel Log Message: Directory /cvs/extras/rpms/gnome-ppp/devel added to the repository From fedora-extras-commits at redhat.com Sat May 6 23:46:14 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:46:14 -0700 Subject: rpms/gnome-ppp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605062346.k46NkG9w010722@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10689 Added Files: Makefile import.log Log Message: Setup of module gnome-ppp --- NEW FILE Makefile --- # Top level Makefile for module gnome-ppp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 6 23:46:14 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:46:14 -0700 Subject: rpms/gnome-ppp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605062346.k46NkGCB010725@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10689/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnome-ppp --- NEW 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 May 6 23:47:09 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:47:09 -0700 Subject: rpms/gnome-ppp import.log,1.1,1.2 Message-ID: <200605062347.k46NlflE010799@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10759 Modified Files: import.log Log Message: auto-import gnome-ppp-0.3.23-1.fc5 on branch devel from gnome-ppp-0.3.23-1.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnome-ppp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 May 2006 23:46:13 -0000 1.1 +++ import.log 6 May 2006 23:47:09 -0000 1.2 @@ -0,0 +1 @@ +gnome-ppp-0_3_23-1_fc5:HEAD:gnome-ppp-0.3.23-1.fc5.src.rpm:1146959221 From fedora-extras-commits at redhat.com Sat May 6 23:47:10 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:47:10 -0700 Subject: rpms/gnome-ppp/devel gnome-ppp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605062347.k46NlgNH010803@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/gnome-ppp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10759/devel Modified Files: .cvsignore sources Added Files: gnome-ppp.spec Log Message: auto-import gnome-ppp-0.3.23-1.fc5 on branch devel from gnome-ppp-0.3.23-1.fc5.src.rpm --- NEW FILE gnome-ppp.spec --- Name: gnome-ppp Version: 0.3.23 Release: 1%{?dist} Summary: A GNOME 2 WvDial frontend Group: Applications/Communications License: GPL URL: http://www.icmreza.co.yu/blogs/vladecks/?page_id=7 Source0: http://www.icmreza.co.yu/blogs/vladecks/wp-content/projects/gnome-ppp/download/0.3/gnome-ppp-0.3.23.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libglade2-devel >= 2.4.0, gettext, desktop-file-utils Requires: wvdial %description GNOME PPP is a modem dialup tool designed to integrate nicely into GNOME 2 Desktop Environment. It is very similar to GPPP dialup utility created for GNOME 1 and KDE equivalent, KPPP. Since it is a graphical frontend for the excellent WvDial too, very little knowledge is needed to setup a dialup connection using GNOME PPP. It features ease of use, HIG dialogs, auto detection of your modem and connection monitoring. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --add-category GNOME \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/%{name} %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog * Sun Apr 16 2006 Christoph Wickert - 0.3.23-1 - Initial Fedora Extras release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-ppp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 May 2006 23:46:14 -0000 1.1 +++ .cvsignore 6 May 2006 23:47:10 -0000 1.2 @@ -0,0 +1 @@ +gnome-ppp-0.3.23.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-ppp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 May 2006 23:46:14 -0000 1.1 +++ sources 6 May 2006 23:47:10 -0000 1.2 @@ -0,0 +1 @@ +ec2e20fc713a01c953d759bea3df8618 gnome-ppp-0.3.23.tar.bz2 From fedora-extras-commits at redhat.com Sat May 6 23:53:10 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sat, 6 May 2006 16:53:10 -0700 Subject: owners owners.list,1.949,1.950 Message-ID: <200605062353.k46NrCOE010877@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10860 Modified Files: owners.list Log Message: add gnome-ppp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.949 retrieving revision 1.950 diff -u -r1.949 -r1.950 --- owners.list 6 May 2006 18:57:16 -0000 1.949 +++ owners.list 6 May 2006 23:53:09 -0000 1.950 @@ -385,6 +385,7 @@ Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-password-generator|Graphical secure password generator|michael at knox.net.nz|extras-qa at fedoraproject.org| +Fedora Extras|gnome-ppp|A GNOME 2 WvDial frontend|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-schedule|A GTK+ based user interface for cron and at|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org| Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-telnet|A fancy GNOME telnet client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 01:10:32 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:10:32 -0700 Subject: owners owners.list,1.950,1.951 Message-ID: <200605070110.k471AYAF016604@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16576 Modified Files: owners.list Log Message: Adding perl-CPANPLUS. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.950 retrieving revision 1.951 diff -u -r1.950 -r1.951 --- owners.list 6 May 2006 23:53:09 -0000 1.950 +++ owners.list 7 May 2006 01:10:32 -0000 1.951 @@ -943,6 +943,7 @@ Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CPAN-DistnameInfo|CPAN::DistnameInfo Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-CPANPLUS|Command-line access to the CPAN interface|steve at silug.org|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-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-DES|Crypt::DES Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 7 01:10:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:10:42 -0700 Subject: rpms/perl-CPANPLUS - New directory Message-ID: <200605070110.k471AiNm016632@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/perl-CPANPLUS Log Message: Directory /cvs/extras/rpms/perl-CPANPLUS added to the repository From fedora-extras-commits at redhat.com Sun May 7 01:10:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:10:43 -0700 Subject: rpms/perl-CPANPLUS/devel - New directory Message-ID: <200605070110.k471AjQo016635@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/perl-CPANPLUS/devel Log Message: Directory /cvs/extras/rpms/perl-CPANPLUS/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 01:11:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:11:10 -0700 Subject: rpms/perl-CPANPLUS Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605070111.k471BCWK016691@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16658 Added Files: Makefile import.log Log Message: Setup of module perl-CPANPLUS --- NEW FILE Makefile --- # Top level Makefile for module perl-CPANPLUS all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 01:11:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:11:10 -0700 Subject: rpms/perl-CPANPLUS/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605070111.k471BCrh016694@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16658/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-CPANPLUS --- NEW 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 May 7 01:12:15 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:12:15 -0700 Subject: rpms/perl-CPANPLUS import.log,1.1,1.2 Message-ID: <200605070112.k471CHTh016765@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16731 Modified Files: import.log Log Message: auto-import perl-CPANPLUS-0.061-2 on branch devel from perl-CPANPLUS-0.061-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-CPANPLUS/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 01:11:10 -0000 1.1 +++ import.log 7 May 2006 01:12:15 -0000 1.2 @@ -0,0 +1 @@ +perl-CPANPLUS-0_061-2:HEAD:perl-CPANPLUS-0.061-2.src.rpm:1146964323 From fedora-extras-commits at redhat.com Sun May 7 01:12:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 6 May 2006 18:12:16 -0700 Subject: rpms/perl-CPANPLUS/devel CPANPLUS-filter-requires.sh, NONE, 1.1 perl-CPANPLUS.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605070112.k471CIJe016770@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-CPANPLUS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16731/devel Modified Files: .cvsignore sources Added Files: CPANPLUS-filter-requires.sh perl-CPANPLUS.spec Log Message: auto-import perl-CPANPLUS-0.061-2 on branch devel from perl-CPANPLUS-0.061-2.src.rpm --- NEW FILE CPANPLUS-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(Your::Module::Here)$/d' --- NEW FILE perl-CPANPLUS.spec --- Name: perl-CPANPLUS Version: 0.061 Release: 2%{?dist} Summary: Command-line access to the CPAN interface License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/CPANPLUS/ Source0: http://www.cpan.org/authors/id/K/KA/KANE/CPANPLUS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Extract) >= 0.07 BuildRequires: perl(File::Fetch) >= 0.07 BuildRequires: perl(IPC::Cmd) >= 0.24 BuildRequires: perl(IPC::Run) >= 0.79 BuildRequires: perl(Locale::Maketext::Simple) BuildRequires: perl(Log::Message) BuildRequires: perl(Module::Load) >= 0.10 BuildRequires: perl(Module::Load::Conditional) >= 0.07 BuildRequires: perl(Module::Loaded) BuildRequires: perl(Module::Pluggable) >= 2.4 BuildRequires: perl(Object::Accessor) >= 0.03 BuildRequires: perl(Params::Check) >= 0.22 BuildRequires: perl(Term::UI) >= 0.05 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Source98: CPANPLUS-filter-requires.sh %global real_perl_requires %{__perl_requires} %define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires %description The CPANPLUS library is an API to the CPAN mirrors and a collection of interactive shells, commandline programs, daemons, etc, that use this API. %prep %setup -q -n CPANPLUS-%{version} sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor AUTOINSTALL=1 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check %{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) %doc ChangeLog README %{_bindir}/* %{perl_vendorlib}/* %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Sat May 06 2006 Steven Pritchard 0.061-2 - Delete zero-length files from $RPM_BUILD_ROOT. * Thu Mar 23 2006 Steven Pritchard 0.061-1 - Specfile autogenerated by cpanspec 1.62. - Removed explicit BR: perl. - Add a ton of BuildRequires. - Disabled "make test" by default (wants to install to root fs). - Add bindir and man1 files. - Add AUTOINSTALL=1 to Makefile.PL run to avoid configuring at build time. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 01:11:10 -0000 1.1 +++ .cvsignore 7 May 2006 01:12:16 -0000 1.2 @@ -0,0 +1 @@ +CPANPLUS-0.061.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-CPANPLUS/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 01:11:10 -0000 1.1 +++ sources 7 May 2006 01:12:16 -0000 1.2 @@ -0,0 +1 @@ +c9e9831d24d69b1f690d8b4967436899 CPANPLUS-0.061.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:05:11 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:05:11 -0700 Subject: rpms/yum-utils/FC-5 yum-utils.spec,1.4,1.5 Message-ID: <200605070205.k4725Dql019184@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19167 Modified Files: yum-utils.spec Log Message: 0.6 spec file Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/yum-utils.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yum-utils.spec 23 Feb 2006 16:59:09 -0000 1.4 +++ yum-utils.spec 7 May 2006 02:05:11 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 0.5 +Version: 0.6 Release: 1 License: GPL Group: Development/Tools @@ -45,6 +45,63 @@ This plugin sorts each repository's mirrorlist by connection speed prior to downloading packages. +%package -n yum-fedorakmod +Summary: Yum plugin to handle fedora kernel modules. +Group: System Environment/Base +Requires: yum >= 2.6.0 + +%description -n yum-fedorakmod +Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions +are installed. +kmod-foo kernel modules is described by the Fedora Extras packaging standards. + +%package -n yum-protectbase +Summary: Yum plugin to protect packages from certain repositories. +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-protectbase +This plugin allows certain repositories to be protected. Packages in the +protected repositories can't be overridden by packages in non-protected +repositories even if the non-protected repo has a later version. + +%package -n yum-versionlock +Summary: Yum plugin to lock specified packages from being updated +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-versionlock +This plugin allows certain packages specified in a file to be protected from being updated by +newer versions. + +%package -n yum-tsflags +Summary: Yum plugin to add tsflags by a commandline option +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-tsflags +This plugin allows you to specify optional transaction flags on the yum +command line + +%package -n yum-kernel-module +Summary: Yum plugin to handle kernel-module-foo type of kernel module +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-kernel-module +This plugin handle installation of kernel-module-foo type of kernel modules when new version of +kernels are installed. + + +%package -n yum-downloadonly +Summary: Yum plugin to add downloadonly command option +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-downloadonly +This plugin adds a --downloadonly flag to yum so that yum will only download +the packages and not install/update them. + %prep %setup -q @@ -53,8 +110,8 @@ make DESTDIR=$RPM_BUILD_ROOT install make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install -# only changelog plugin for now... -plugins="changelog fastestmirror" +# Plugins to install +plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ cd plugins @@ -85,6 +142,7 @@ %{_bindir}/repomanage %{_bindir}/repoquery %{_bindir}/repotrack +%{_bindir}/reposync %{_bindir}/repo-graph %{_bindir}/repo-rss %{_bindir}/yumdownloader @@ -100,14 +158,60 @@ %files -n yum-changelog %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf -/usr/lib/yum-plugins/changelog.py +/usr/lib/yum-plugins/changelog.* %files -n yum-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf -/usr/lib/yum-plugins/fastestmirror.py +/usr/lib/yum-plugins/fastestmirror.* + +%files -n yum-fedorakmod +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf +/usr/lib/yum-plugins/fedorakmod.* + +%files -n yum-protectbase +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf +/usr/lib/yum-plugins/protectbase.* + +%files -n yum-versionlock +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf +/usr/lib/yum-plugins/versionlock.* + +%files -n yum-tsflags +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf +/usr/lib/yum-plugins/tsflags.* + +%files -n yum-kernel-module +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf +/usr/lib/yum-plugins/kernel-module.* + +%files -n yum-downloadonly +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf +/usr/lib/yum-plugins/downloadonly.* %changelog +* Sat May 6 2006 Seth Vidal +- bump version number +- added yum-downloadonly plugin +- fix minor item in tsflags description + +* Sat Apr 29 2006 Seth Vidal +- add reposync + +* Fri Apr 28 2006 Tim Lauridsen +- added yum-fedorakmod plugin subpackage +- added yum-protectbase plugin subpackage. +- added yum-versionlock plugin subpackage. +- added yum-tsflags plugin subpackage. +- added yum-kernel-module plugin subpackage +- changed .py to .* in files sections for plugin subpackages to build rpms without error. + * Thu Feb 23 2006 Seth Vidal - changed some of the yum version dependencies From fedora-extras-commits at redhat.com Sun May 7 02:06:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:06:16 -0700 Subject: rpms/perl-Test-Differences - New directory Message-ID: <200605070206.k4726ISx019261@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19235/perl-Test-Differences Log Message: Directory /cvs/extras/rpms/perl-Test-Differences added to the repository From fedora-extras-commits at redhat.com Sun May 7 02:06:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:06:17 -0700 Subject: rpms/perl-Test-Differences/devel - New directory Message-ID: <200605070206.k4726JvJ019264@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19235/perl-Test-Differences/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Differences/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 02:06:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:06:33 -0700 Subject: rpms/perl-Test-Differences Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605070206.k4726ZIm019316@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19283 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Differences --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Differences all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 02:06:34 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:06:34 -0700 Subject: rpms/perl-Test-Differences/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605070206.k4726aYd019319@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19283/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Differences --- NEW 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 May 7 02:07:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:07:01 -0700 Subject: rpms/perl-Test-Differences import.log,1.1,1.2 Message-ID: <200605070207.k47273jH019391@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19355 Modified Files: import.log Log Message: auto-import perl-Test-Differences-0.47-1 on branch devel from perl-Test-Differences-0.47-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 02:06:33 -0000 1.1 +++ import.log 7 May 2006 02:07:01 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Differences-0_47-1:HEAD:perl-Test-Differences-0.47-1.src.rpm:1146967613 From fedora-extras-commits at redhat.com Sun May 7 02:07:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:07:02 -0700 Subject: rpms/perl-Test-Differences/devel perl-Test-Differences.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605070207.k47274lO019397@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19355/devel Modified Files: .cvsignore sources Added Files: perl-Test-Differences.spec Log Message: auto-import perl-Test-Differences-0.47-1 on branch devel from perl-Test-Differences-0.47-1.src.rpm --- NEW FILE perl-Test-Differences.spec --- Name: perl-Test-Differences Version: 0.47 Release: 1%{?dist} Summary: Test strings and data structures and show differences if not ok Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Differences/ Source0: http://www.cpan.org/authors/id/R/RB/RBS/Test-Differences-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Text::Diff) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description When the code you're testing returns multiple lines, records or data structures and they're just plain wrong, an equivalent to the Unix diff utility may be just what's needed. %prep %setup -q -n Test-Differences-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes eg/ %{perl_vendorlib}/Test/ %{_mandir}/man3/*.3pm* %changelog * Mon May 01 2006 Jose Pedro Oliveira - 0.47-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 02:06:33 -0000 1.1 +++ .cvsignore 7 May 2006 02:07:02 -0000 1.2 @@ -0,0 +1 @@ +Test-Differences-0.47.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 02:06:33 -0000 1.1 +++ sources 7 May 2006 02:07:02 -0000 1.2 @@ -0,0 +1 @@ +e4fa76bb11b0d1db2d4213390413f5af Test-Differences-0.47.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:07:14 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:07:14 -0700 Subject: rpms/yum-utils/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200605070207.k4727GKq019450@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19403 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Feb 2006 16:38:55 -0000 1.4 +++ .cvsignore 7 May 2006 02:07:14 -0000 1.5 @@ -1 +1,2 @@ yum-utils-0.5.tar.gz +yum-utils-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Feb 2006 16:38:55 -0000 1.4 +++ sources 7 May 2006 02:07:14 -0000 1.5 @@ -1 +1,2 @@ 8800911781a6c54becb8a3a627639356 yum-utils-0.5.tar.gz +3ac019970ed334b530dc130da97e9851 yum-utils-0.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:07:59 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:07:59 -0700 Subject: rpms/yum-utils/FC-5 yum-utils.spec,1.5,1.6 Message-ID: <200605070208.k47281oZ019483@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19465 Modified Files: yum-utils.spec Log Message: dist tag Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/yum-utils.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- yum-utils.spec 7 May 2006 02:05:11 -0000 1.5 +++ yum-utils.spec 7 May 2006 02:07:59 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 0.6 -Release: 1 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:09:00 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:09:00 -0700 Subject: rpms/yum-utils/FC-5 sources,1.5,1.6 Message-ID: <200605070209.k47292Du019549@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19530 Modified Files: sources Log Message: kill old yum-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 May 2006 02:07:14 -0000 1.5 +++ sources 7 May 2006 02:09:00 -0000 1.6 @@ -1,2 +1 @@ -8800911781a6c54becb8a3a627639356 yum-utils-0.5.tar.gz 3ac019970ed334b530dc130da97e9851 yum-utils-0.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:10:50 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:10:50 -0700 Subject: rpms/yum-utils import.log,1.2,1.3 Message-ID: <200605070210.k472AqcX019631@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19595 Modified Files: import.log Log Message: auto-import yum-utils-0.6-1.fc5 on branch devel from yum-utils-0.6-1.fc5.src.rpm yum utils 0.6 for devel Index: import.log =================================================================== RCS file: /cvs/extras/rpms/yum-utils/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 11 Jun 2005 19:28:19 -0000 1.2 +++ import.log 7 May 2006 02:10:50 -0000 1.3 @@ -1 +1,2 @@ yum-utils-0_2-2:HEAD:yum-utils-0.2-2.src.rpm:1118518174 +yum-utils-0_6-1_fc5:HEAD:yum-utils-0.6-1.fc5.src.rpm:1146968022 From fedora-extras-commits at redhat.com Sun May 7 02:10:51 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:10:51 -0700 Subject: rpms/yum-utils/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 yum-utils.spec, 1.4, 1.5 Message-ID: <200605070210.k472Ar26019638@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19595/devel Modified Files: .cvsignore sources yum-utils.spec Log Message: auto-import yum-utils-0.6-1.fc5 on branch devel from yum-utils-0.6-1.fc5.src.rpm yum utils 0.6 for devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Feb 2006 16:38:55 -0000 1.4 +++ .cvsignore 7 May 2006 02:10:50 -0000 1.5 @@ -1 +1 @@ -yum-utils-0.5.tar.gz +yum-utils-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Feb 2006 16:38:55 -0000 1.4 +++ sources 7 May 2006 02:10:50 -0000 1.5 @@ -1 +1 @@ -8800911781a6c54becb8a3a627639356 yum-utils-0.5.tar.gz +3ac019970ed334b530dc130da97e9851 yum-utils-0.6.tar.gz Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yum-utils.spec 23 Feb 2006 16:59:09 -0000 1.4 +++ yum-utils.spec 7 May 2006 02:10:50 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils -Version: 0.5 -Release: 1 +Version: 0.6 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz @@ -45,6 +45,63 @@ This plugin sorts each repository's mirrorlist by connection speed prior to downloading packages. +%package -n yum-fedorakmod +Summary: Yum plugin to handle fedora kernel modules. +Group: System Environment/Base +Requires: yum >= 2.6.0 + +%description -n yum-fedorakmod +Plugin for Yum to handle installation of kmod-foo type of kernel modules, when new kernel versions +are installed. +kmod-foo kernel modules is described by the Fedora Extras packaging standards. + +%package -n yum-protectbase +Summary: Yum plugin to protect packages from certain repositories. +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-protectbase +This plugin allows certain repositories to be protected. Packages in the +protected repositories can't be overridden by packages in non-protected +repositories even if the non-protected repo has a later version. + +%package -n yum-versionlock +Summary: Yum plugin to lock specified packages from being updated +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-versionlock +This plugin allows certain packages specified in a file to be protected from being updated by +newer versions. + +%package -n yum-tsflags +Summary: Yum plugin to add tsflags by a commandline option +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-tsflags +This plugin allows you to specify optional transaction flags on the yum +command line + +%package -n yum-kernel-module +Summary: Yum plugin to handle kernel-module-foo type of kernel module +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-kernel-module +This plugin handle installation of kernel-module-foo type of kernel modules when new version of +kernels are installed. + + +%package -n yum-downloadonly +Summary: Yum plugin to add downloadonly command option +Group: System Environment/Base +Requires: yum >= 2.4.1 + +%description -n yum-downloadonly +This plugin adds a --downloadonly flag to yum so that yum will only download +the packages and not install/update them. + %prep %setup -q @@ -53,8 +110,8 @@ make DESTDIR=$RPM_BUILD_ROOT install make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install -# only changelog plugin for now... -plugins="changelog fastestmirror" +# Plugins to install +plugins="changelog fastestmirror fedorakmod protectbase versionlock tsflags kernel-module downloadonly" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/ cd plugins @@ -85,6 +142,7 @@ %{_bindir}/repomanage %{_bindir}/repoquery %{_bindir}/repotrack +%{_bindir}/reposync %{_bindir}/repo-graph %{_bindir}/repo-rss %{_bindir}/yumdownloader @@ -100,14 +158,60 @@ %files -n yum-changelog %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf -/usr/lib/yum-plugins/changelog.py +/usr/lib/yum-plugins/changelog.* %files -n yum-fastestmirror %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf -/usr/lib/yum-plugins/fastestmirror.py +/usr/lib/yum-plugins/fastestmirror.* + +%files -n yum-fedorakmod +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fedorakmod.conf +/usr/lib/yum-plugins/fedorakmod.* + +%files -n yum-protectbase +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/protectbase.conf +/usr/lib/yum-plugins/protectbase.* + +%files -n yum-versionlock +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/versionlock.conf +/usr/lib/yum-plugins/versionlock.* + +%files -n yum-tsflags +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/tsflags.conf +/usr/lib/yum-plugins/tsflags.* + +%files -n yum-kernel-module +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/kernel-module.conf +/usr/lib/yum-plugins/kernel-module.* + +%files -n yum-downloadonly +%defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/downloadonly.conf +/usr/lib/yum-plugins/downloadonly.* %changelog +* Sat May 6 2006 Seth Vidal +- bump version number +- added yum-downloadonly plugin +- fix minor item in tsflags description + +* Sat Apr 29 2006 Seth Vidal +- add reposync + +* Fri Apr 28 2006 Tim Lauridsen +- added yum-fedorakmod plugin subpackage +- added yum-protectbase plugin subpackage. +- added yum-versionlock plugin subpackage. +- added yum-tsflags plugin subpackage. +- added yum-kernel-module plugin subpackage +- changed .py to .* in files sections for plugin subpackages to build rpms without error. + * Thu Feb 23 2006 Seth Vidal - changed some of the yum version dependencies From fedora-extras-commits at redhat.com Sun May 7 02:11:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 6 May 2006 19:11:30 -0700 Subject: owners owners.list,1.951,1.952 Message-ID: <200605070211.k472BWV5019705@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19688 Modified Files: owners.list Log Message: New package: perl-Test-Differences (#190583) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.951 retrieving revision 1.952 diff -u -r1.951 -r1.952 --- owners.list 7 May 2006 01:10:32 -0000 1.951 +++ owners.list 7 May 2006 02:11:29 -0000 1.952 @@ -1159,6 +1159,7 @@ Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Differences|Test strings and data structures and show differences if not ok|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-Inline|Test::Inline Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 7 02:14:30 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:14:30 -0700 Subject: rpms/yum-utils/FC-5 yum-utils.spec,1.6,1.7 Message-ID: <200605070214.k472EWoO019873@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19856 Modified Files: yum-utils.spec Log Message: stupid me Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/FC-5/yum-utils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yum-utils.spec 7 May 2006 02:07:59 -0000 1.6 +++ yum-utils.spec 7 May 2006 02:14:29 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Sun May 7 02:14:48 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 6 May 2006 19:14:48 -0700 Subject: rpms/yum-utils/devel yum-utils.spec,1.5,1.6 Message-ID: <200605070214.k472Eot4019896@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/yum-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19879 Modified Files: yum-utils.spec Log Message: stupid me Index: yum-utils.spec =================================================================== RCS file: /cvs/extras/rpms/yum-utils/devel/yum-utils.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- yum-utils.spec 7 May 2006 02:10:50 -0000 1.5 +++ yum-utils.spec 7 May 2006 02:14:48 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Utilities based around the yum package manager Name: yum-utils Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Sun May 7 06:29:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 23:29:43 -0700 Subject: rpms/gcompris/FC-5 gcompris-7.4-xf86vidmode.patch, NONE, 1.1 gcompris.spec, 1.3, 1.4 Message-ID: <200605070629.k476Tj92029446@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29426 Modified Files: gcompris.spec Added Files: gcompris-7.4-xf86vidmode.patch Log Message: * Sat May 6 2006 Hans de Goede 7.4-7 - Use XF86VidMode instead of Xrandr extension for resolution switching, hopefully fixing bug 190918. gcompris-7.4-xf86vidmode.patch: --- NEW FILE gcompris-7.4-xf86vidmode.patch --- --- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 +++ gcompris-7.4/configure 2006-05-07 00:25:10.000000000 +0200 @@ -1094,7 +1094,7 @@ --disable-sdltest Do not try to compile and run a test SDL program --disable-glibtest do not try to compile and run a test GLIB program --disable-rpath do not hardcode runtime library paths - --disable-xrandr Turn off xrandr + --disable-xf86vidmode Turn off xf86vidmode --enable-debug Turn on debugging messages --disable-sqlite Turn off sqlite (will disable profile) --enable-py-build-only Skip python modules tests. (Useful if you just need @@ -23630,7 +23630,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -23638,7 +23638,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -23665,7 +23665,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -23686,11 +23686,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -23769,23 +23769,23 @@ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -# Check whether --enable-xrandr or --disable-xrandr was given. -if test "${enable_xrandr+set}" = set; then - enableval="$enable_xrandr" - USE_XRANDR="$enableval" +# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. +if test "${enable_xf86vidmode+set}" = set; then + enableval="$enable_xf86vidmode" + USE_XF86VM="$enableval" else - USE_XRANDR="yes" + USE_XF86VM="yes" fi; -found_randr=no -if test "x$USE_XRANDR" == "xyes" ; then - RANDR_LIBS= - echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 -echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 -if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then +found_xf86vidmode=no +if test "x$USE_XF86VM" == "xyes" ; then + XF86VM_LIBS= + echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 +if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" +LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23799,11 +23799,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XRRSetScreenConfigAndRate (); +char XF86VidModeQueryExtension (); int main () { -XRRSetScreenConfigAndRate (); +XF86VidModeQueryExtension (); ; return 0; } @@ -23830,23 +23830,23 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no +ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 -if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then - echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 +if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then + echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 +echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23857,7 +23857,7 @@ /* end confdefs.h. */ #include -#include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -23881,38 +23881,38 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_X11_extensions_Xrandr_h=yes + ac_cv_header_X11_extensions_xf86vmode_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_X11_extensions_Xrandr_h=no +ac_cv_header_X11_extensions_xf86vmode_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 -if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then - RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 +if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then + XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes fi fi - if test "x$found_randr" = "xno"; then - { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 -echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} + if test "x$found_xf86vidmode" = "xno"; then + { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 +echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} else cat >>confdefs.h <<_ACEOF -#define XRANDR 1 +#define XF86_VIDMODE 1 _ACEOF fi fi -LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" +LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" @@ -28651,7 +28651,7 @@ echo "SDL LIBS = found" fi -echo "XRANDR option (--enable-xrandr) = $found_randr" +echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" --- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 +++ gcompris-7.4/config.h.in 2006-05-07 00:25:10.000000000 +0200 @@ -141,5 +141,5 @@ /* Version number of package */ #undef VERSION -/* XRANDR Available */ -#undef XRANDR +/* XF86VidMode Available */ +#undef XF86_VIDMODE --- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-07 00:25:10.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } } - if(strcmp(name,"noxrandr")==0){ - if(self->cdata->noxrandr){ + if(strcmp(name,"noxf86vm")==0){ + if(self->cdata->noxf86vm){ Py_INCREF(Py_True); return Py_True; } else { --- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 +++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-07 00:29:58.000000000 +0200 @@ -33,12 +33,13 @@ #include "cursor.h" -/* For XRANDR Support */ -#ifdef XRANDR +/* For XF86_VIDMODE Support */ +#ifdef XF86_VIDMODE #include #include -#include -#include +#include +#include +#include #endif #if defined _WIN32 || defined __WIN32__ @@ -104,7 +105,7 @@ static int popt_aalias = FALSE; static int popt_difficulty_filter = FALSE; static int popt_debug = FALSE; -static int popt_noxrandr = FALSE; +static int popt_noxf86vm = FALSE; static char *popt_root_menu = NULL; static char *popt_local_activity = NULL; static int popt_administration = FALSE; @@ -139,8 +140,8 @@ N_("Print the version of " PACKAGE), NULL}, {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, N_("Use the antialiased canvas (slower)."), NULL}, - {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, - N_("Disable XRANDR (No screen resolution change)."), NULL}, + {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, + N_("Disable XF86VidMode (No screen resolution change)."), NULL}, {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, @@ -184,29 +185,19 @@ }; /* XRandr Stuff */ -#ifdef XRANDR -typedef struct +#ifdef XF86_VIDMODE +static struct { - gboolean xr_lock_updates; + int vidmode_available; + XF86VidModeModeInfo orig_mode; + int orig_viewport_x; + int orig_viewport_y; + int width; + int height; +} XF86VidModeData = { 0, { 0 }, 0, 0 }; - XRRScreenConfiguration *xr_screen_conf; - - XRRScreenSize *xr_sizes; - int xr_nsize; - SizeID xr_current_size; - - Rotation xr_rotations; - Rotation xr_current_rotation; - -} XRANDRData; - -static SizeID xr_previous_size; -static gboolean xr_previous_size_set = FALSE; -static XRANDRData *xrandr = NULL; - -static void xrandr_init ( XRANDRData *xrandr ); -static void xrandr_get_config ( XRANDRData *xrandr ); -static void xrandr_set_config( XRANDRData *xrandr ); +static void xf86_vidmode_init( void ); +static void xf86_vidmode_set_fullscreen( int state ); #endif /****************************************************************************/ @@ -441,8 +432,8 @@ gint screen_height, screen_width; GtkWidget *vbox; -#ifdef XRANDR - xrandr = g_new0 (XRANDRData, 1); +#ifdef XF86_VIDMODE + xf86_vidmode_init(); #endif gcompris_set_fullscreen(properties->fullscreen); @@ -450,10 +441,10 @@ screen_height = gdk_screen_height(); screen_width = gdk_screen_width(); -#ifdef XRANDR - if(properties->fullscreen && !properties->noxrandr) { - screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; - screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; +#ifdef XF86_VIDMODE + if(properties->fullscreen && !properties->noxf86vm) { + screen_width = XF86VidModeData.width; + screen_height = XF86VidModeData.height; } #endif @@ -811,39 +802,18 @@ */ void gcompris_set_fullscreen(gboolean state) { - - if(state) - { -#ifdef XRANDR - gint i; - /* Search the 800x600 Resolution */ - if(properties->fullscreen && !properties->noxrandr) { - - g_warning("XRANDR Is compiled in. Searching a good resolution"); - - /* Check if XRANDR is available */ - if (!properties->noxrandr) { - xrandr_get_config ( xrandr ); - xr_previous_size = (SizeID)xrandr->xr_current_size; - for (i = 0; i < xrandr->xr_nsize; i++) { - if(xrandr->xr_sizes[i].width == BOARDWIDTH && - xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) - { - xrandr->xr_current_size = (SizeID)i; - xr_previous_size_set = TRUE; - break; - } - } - } - - /* Set the Fullscreen now */ - if(xr_previous_size_set) - { - if(is_mapped) - xrandr_set_config( xrandr ); - } - } + properties->fullscreen = state; + /* We need to grab the pointer before doing the vidmode switch otherwise the + setviewport may be "canceled" by the pointer being outside the viewport */ + if(properties->fullscreen) + gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, + GDK_CURRENT_TIME); + +#ifdef XF86_VIDMODE + xf86_vidmode_set_fullscreen(properties->fullscreen); #endif + if(properties->fullscreen) + { gdk_window_set_decorations (window->window, 0); gdk_window_set_functions (window->window, 0); gtk_widget_set_uposition (window, 0, 0); @@ -851,20 +821,7 @@ } else { -#ifdef XRANDR - /* Set back the original screen size */ - if(xr_previous_size_set && !properties->noxrandr) - { - /* Need to refresh our config or xrandr api will reject us */ - if(xrandr) - { - xrandr_get_config ( xrandr ); - xrandr->xr_current_size = (SizeID)xr_previous_size; - xrandr_set_config( xrandr ); - } - } - xr_previous_size_set = FALSE; -#endif + gdk_pointer_ungrab(GDK_CURRENT_TIME); /* The hide must be done at least for KDE */ gtk_widget_hide (window); gdk_window_set_decorations (window->window, GDK_DECOR_ALL); @@ -1044,68 +1001,136 @@ g_printerr ("%s: %s\n\n", "gcompris", message); } -#ifdef XRANDR +#ifdef XF86_VIDMODE /* - * XRANDR STUFF - * ------------ + * XF86VidMode STUFF + * ----------------- */ static void -xrandr_init ( XRANDRData *data ) +xf86_vidmode_init ( void ) { - if(data==NULL) + int i,j; + XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) + &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); + + if (properties->noxf86vm) return; - - data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); - - if (data->xr_screen_conf == NULL) + + if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) + properties->noxf86vm = TRUE; + else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, + &XF86VidModeData.orig_viewport_x)) + properties->noxf86vm = TRUE; + + if (properties->noxf86vm) + g_warning("XF86VidMode not available"); + else { - g_warning("XRANDR not available"); - properties->noxrandr = TRUE; + XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; + XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; + g_warning("XF86VidMode support enabled"); } - else - g_warning("XRANDR support enabled"); - } - -static void -xrandr_get_config ( XRANDRData *data ) -{ - if(data==NULL) - return; - - xrandr_init (data); - - data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, - &data->xr_current_rotation); - - data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); - - data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, - &data->xr_current_rotation); } + static void -xrandr_set_config( XRANDRData *data ) +xf86_vidmode_set_fullscreen ( int state ) { - Status status = RRSetConfigFailed; + int i; + XF86VidModeModeLine mode; - if(data==NULL) + if (properties->noxf86vm) return; - if (data->xr_lock_updates) return; - - status = XRRSetScreenConfig (GDK_DISPLAY(), - data->xr_screen_conf, - GDK_ROOT_WINDOW(), - data->xr_current_size, - data->xr_current_rotation, - CurrentTime); - - if(status) { - g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", - (int)status); - } - return; - + if (state) + { + XF86VidModeModeInfo **modes; + int mode_count; + + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode)) + { + g_warning("XF86VidMode couldnot get current mode, not switching resolution"); + properties->fullscreen = FALSE; + return; + } + + /* Do we need to switch? */ + if ((mode.hdisplay == BOARDWIDTH) && + (mode.vdisplay == BOARDHEIGHT+BARHEIGHT)) + { + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), + GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) + g_warning("XF86VidMode couldnot change viewport"); + return; + } + + if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &mode_count, &modes)) + { + g_warning("XF86VidMode couldnot get modes not switching resolution"); + properties->fullscreen = FALSE; + return; + } + + for (i = 0; i < mode_count; i++) + { + if ((modes[i]->hdisplay == BOARDWIDTH) && + (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) + { + if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), modes[i])) + { + XF86VidModeData.width = modes[i]->hdisplay; + XF86VidModeData.height = modes[i]->vdisplay; + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), + GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) + g_warning("XF86VidMode couldnot change viewport"); + } + else + { + g_warning("XF86VidMode couldnot switch resolution"); + properties->fullscreen = FALSE; + } + break; + } + } + if (i == mode_count) + { + g_warning("XF86VidMode couldnot find a suitable resolution"); + properties->fullscreen = FALSE; + } + XFree(modes); + } + else + { + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode) || + (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || + (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) + { + if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &XF86VidModeData.orig_mode)) + { + XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; + XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; + } + else + g_warning("XF86VidMode couldnot restore original resolution"); + + } + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, + XF86VidModeData.orig_viewport_y)) + g_warning("XF86VidMode couldnot restore original viewport"); + } } #endif @@ -1185,9 +1210,9 @@ properties->fullscreen = TRUE; } - if (popt_noxrandr) + if (popt_noxf86vm) { - properties->noxrandr = TRUE; + properties->noxf86vm = TRUE; } if (popt_window) --- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/gcompris/properties.c 2006-05-07 00:25:10.000000000 +0200 @@ -160,7 +160,7 @@ tmp->fx = 1; tmp->screensize = 1; tmp->fullscreen = 1; - tmp->noxrandr = FALSE; + tmp->noxf86vm = FALSE; tmp->timer = 1; tmp->skin = "babytoy"; tmp->key = "default"; @@ -244,8 +244,8 @@ } else if(!strcmp(value.v_identifier, "fullscreen")) { if(!scan_get_int(scanner, &tmp->fullscreen)) g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "noxrandr")) { - if(!scan_get_int(scanner, &tmp->noxrandr)) + } else if(!strcmp(value.v_identifier, "noxf86vm")) { + if(!scan_get_int(scanner, &tmp->noxf86vm)) g_warning("Config file parsing error on token %s", token); } else if(!strcmp(value.v_identifier, "timer")) { if(!scan_get_int(scanner, &tmp->timer)) --- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-07 00:25:10.000000000 +0200 +++ gcompris-7.4/src/gcompris/properties.h 2006-05-07 00:25:10.000000000 +0200 @@ -28,7 +28,7 @@ gint music; gint fx; gint fullscreen; - gint noxrandr; + gint noxf86vm; gint screensize; gint defaultcursor; gint timer; --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 +++ gcompris-7.4/configure.in 2006-05-07 00:25:10.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV -dnl XRANDR Allow us to set the screen resolution dynamically +dnl XF86VidMode allows us to set the screen resolution dynamically AC_PATH_X -AC_ARG_ENABLE(xrandr, +AC_ARG_ENABLE(xf86vidmode, AC_HELP_STRING( - [--disable-xrandr], - [Turn off xrandr]), - USE_XRANDR="$enableval", USE_XRANDR="yes") -found_randr=no -if test "x$USE_XRANDR" == "xyes" ; then - RANDR_LIBS= - AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate, - [AC_CHECK_HEADER(X11/extensions/Xrandr.h, - RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes,, + [--disable-xf86vidmode], + [Turn off xf86vidmode]), + USE_XF86VM="$enableval", USE_XF86VM="yes") +found_xf86vidmode=no +if test "x$USE_XF86VM" == "xyes" ; then + XF86VM_LIBS= + AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, + [AC_CHECK_HEADER(X11/extensions/xf86vmode.h, + XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes,, [#include ])], , -L$x_libraries $ALL_X_LIBS ) - if test "x$found_randr" = "xno"; then - AC_MSG_NOTICE(["Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen."]) + if test "x$found_xf86vidmode" = "xno"; then + AC_MSG_NOTICE(["Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen."]) else - AC_DEFINE_UNQUOTED(XRANDR, 1, [XRANDR Available]) + AC_DEFINE_UNQUOTED(XF86_VIDMODE, 1, [XF86VidMode Available]) fi fi -LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" +LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" dnl Add the languages which your application supports here. ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" @@ -680,7 +680,7 @@ echo "SDL LIBS = found" fi -echo "XRANDR option (--enable-xrandr) = $found_randr" +echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcompris.spec 5 May 2006 18:11:25 -0000 1.3 +++ gcompris.spec 7 May 2006 06:29:43 -0000 1.4 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -12,6 +12,7 @@ Patch2: gcompris-nl.patch Patch3: gcompris-electric.patch Patch4: gcompris-click_on_letter.patch +Patch5: gcompris-7.4-xf86vidmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel @@ -220,6 +221,7 @@ %patch2 -p1 %patch3 -p1 -z .electric %patch4 -p1 -z .click_on_letter +%patch5 -p1 -z .xf86vm iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp mv tmp docs/C/gcompris.info # fix gnome.canvas deprecation warnings @@ -476,6 +478,10 @@ %changelog +* Sat May 6 2006 Hans de Goede 7.4-7 +- Use XF86VidMode instead of Xrandr extension for resolution switching, + hopefully fixing bug 190918. + * Fri May 5 2006 Hans de Goede 7.4-6 - Add missing python module Requires. From fedora-extras-commits at redhat.com Sun May 7 06:35:36 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 23:35:36 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.4,1.5 Message-ID: <200605070635.k476Zcw2029526@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29509 Modified Files: gcompris.spec Log Message: Change Xrandr BR to Xxf86vm BR Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gcompris.spec 6 May 2006 22:42:38 -0000 1.4 +++ gcompris.spec 7 May 2006 06:35:36 -0000 1.5 @@ -15,7 +15,8 @@ Patch5: gcompris-7.4-xf86vidmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel -Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel +Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel +Buildrequires: xorg-x11-proto-devel Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags From fedora-extras-commits at redhat.com Sun May 7 06:37:37 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 23:37:37 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.5,1.6 Message-ID: <200605070637.k476bd2v029579@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29562 Modified Files: gcompris.spec Log Message: * Sun May 7 2006 Hans de Goede 7.4-8 - Change Xrandr BR to Xxf86vm BR. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gcompris.spec 7 May 2006 06:35:36 -0000 1.5 +++ gcompris.spec 7 May 2006 06:37:37 -0000 1.6 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -479,6 +479,9 @@ %changelog +* Sun May 7 2006 Hans de Goede 7.4-8 +- Change Xrandr BR to Xxf86vm BR. + * Sat May 6 2006 Hans de Goede 7.4-7 - Use XF86VidMode instead of Xrandr extension for resolution switching, hopefully fixing bug 190918. From fedora-extras-commits at redhat.com Sun May 7 06:39:15 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 6 May 2006 23:39:15 -0700 Subject: rpms/gcompris/FC-5 gcompris.spec,1.4,1.5 Message-ID: <200605070639.k476dHAj029649@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29632 Modified Files: gcompris.spec Log Message: * Sun May 7 2006 Hans de Goede 7.4-8 - Change Xrandr BR to Xxf86vm BR. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gcompris.spec 7 May 2006 06:29:43 -0000 1.4 +++ gcompris.spec 7 May 2006 06:39:15 -0000 1.5 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -15,7 +15,8 @@ Patch5: gcompris-7.4-xf86vidmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel -Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel +Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel +Buildrequires: xorg-x11-proto-devel Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags @@ -478,6 +479,9 @@ %changelog +* Sun May 7 2006 Hans de Goede 7.4-8 +- Change Xrandr BR to Xxf86vm BR. + * Sat May 6 2006 Hans de Goede 7.4-7 - Use XF86VidMode instead of Xrandr extension for resolution switching, hopefully fixing bug 190918. From fedora-extras-commits at redhat.com Sun May 7 08:17:09 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 01:17:09 -0700 Subject: rpms/awstats/FC-4 .cvsignore, 1.5, 1.6 awstats.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <200605070817.k478HBTx006689@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6630/FC-4 Modified Files: .cvsignore awstats.spec sources Log Message: version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Aug 2005 10:18:16 -0000 1.5 +++ .cvsignore 7 May 2006 08:17:08 -0000 1.6 @@ -1 +1 @@ -awstats-6.5.tar.gz +awstats-6.6.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- awstats.spec 11 Jan 2006 15:07:15 -0000 1.9 +++ awstats.spec 7 May 2006 08:17:08 -0000 1.10 @@ -1,18 +1,19 @@ Name: awstats -Version: 6.5 -Release: 1%{?dist} +Version: 6.6 +Release: 0.1.beta%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz -#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz +#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz +Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz +Source1: awstats.README.SELinux BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd Requires: perl -Requires(post): perl -Requires(postun): /sbin/service +Requires(post): perl, policycoreutils +Requires(postun): /sbin/service, policycoreutils %description Advanced Web Statistics is a powerful and featureful tool that generates @@ -30,18 +31,19 @@ With the default configuration, the statistics are available: http://localhost/awstats/awstats.pl + %prep %setup -q - # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* - # Fix some bad file permissions here for convenience. chmod -x tools/httpd_conf find tools/xslt -type f | xargs chmod -x - # Remove \r in conf file (file written on MS Windows) perl -pi -e 's/\r//g' tools/httpd_conf +# SELinux README +cp -a %{SOURCE1} README.SELinux + %install rm -rf $RPM_BUILD_ROOT @@ -79,7 +81,7 @@ ### Commit permanent changes to default configuration install -p -m 644 wwwroot/cgi-bin/awstats.model.conf \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf -%{__perl} -pi -e ' +perl -pi -e ' s|^LogFile=.*$|LogFile="%{_localstatedir}/log/httpd/access_log"|; s|^DirData=.*$|DirData="%{_localstatedir}/lib/awstats"|; s|^DirCgi=.*$|DirCgi="/awstats"|; @@ -90,16 +92,17 @@ s|^SaveDatabaseFilesWithPermissionsForEveryone=.*$|SaveDatabaseFilesWithPermissionsForEveryone=0|; s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|; s|^Expires=.*$|Expires=3600|; - ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf + ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf # Fix scripts -%{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ +perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf} # Apache configuration install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf -%{__perl} -pi -e 's|/usr/local|%{_datadir}|g' $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf +perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \ + $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf echo "# Additional Perl modules SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins @@ -112,6 +115,7 @@ %clean rm -rf $RPM_BUILD_ROOT + %post if [ $1 -eq 1 ]; then if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then @@ -121,11 +125,27 @@ ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || : fi fi +### SELinux support ### +# Set SELinux file_context +semanage fcontext -a -t httpd_sys_script_exec_t \ + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : +semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : +# Actually change the context +chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || : +chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || : + %postun if [ $1 -ne 0 ]; then /sbin/service httpd condrestart >/dev/null 2>&1 fi +# SELinux support +if [ $1 -eq 0 ]; then + semanage fcontext -d -t httpd_sys_script_exec_t \ + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : +fi + %files @@ -141,7 +161,7 @@ %{_datadir}/%{name}/wwwroot/cgi-bin # Different defattr to fix lots of files which should not be +x. %defattr(644,root,root,755) -%doc README.TXT docs/* +%doc README.TXT docs/* README.SELinux %{_datadir}/%{name}/lang %{_datadir}/%{name}/lib %{_datadir}/%{name}/plugins @@ -150,7 +170,19 @@ %{_datadir}/%{name}/wwwroot/icon %{_datadir}/%{name}/wwwroot/js + + %changelog +* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta +- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) + +* Sun Apr 09 2006 Aurelien Bompard 6.5-3 +- SELinux support: use semanage to label the cgi and the database files +- Only allow access from localhost by default (this app has a security history) + +* Thu Feb 23 2006 Aurelien Bompard 6.5-2 +- rebuild for FC5 + * Wed Jan 11 2006 Aurelien Bompard 6.5-1 - version 6.5 final Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Jan 2006 15:07:15 -0000 1.8 +++ sources 7 May 2006 08:17:08 -0000 1.9 @@ -1 +1 @@ -aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz +c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 08:17:09 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 01:17:09 -0700 Subject: rpms/awstats/FC-5 .cvsignore, 1.5, 1.6 awstats.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200605070817.k478HB4x006697@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6630/FC-5 Modified Files: .cvsignore awstats.spec sources Log Message: version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Aug 2005 10:18:17 -0000 1.5 +++ .cvsignore 7 May 2006 08:17:09 -0000 1.6 @@ -1 +1 @@ -awstats-6.5.tar.gz +awstats-6.6.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- awstats.spec 9 Apr 2006 15:30:30 -0000 1.11 +++ awstats.spec 7 May 2006 08:17:09 -0000 1.12 @@ -1,19 +1,19 @@ Name: awstats -Version: 6.5 -Release: 3%{?dist} +Version: 6.6 +Release: 0.1.beta%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz -#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz +#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz +Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz +Source1: awstats.README.SELinux BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd Requires: perl -Requires(post): perl -Requires(postun): /sbin/service -Requires(pre): policycoreutils +Requires(post): perl, policycoreutils +Requires(postun): /sbin/service, policycoreutils %description Advanced Web Statistics is a powerful and featureful tool that generates @@ -31,18 +31,19 @@ With the default configuration, the statistics are available: http://localhost/awstats/awstats.pl + %prep %setup -q - # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* - # Fix some bad file permissions here for convenience. chmod -x tools/httpd_conf find tools/xslt -type f | xargs chmod -x - # Remove \r in conf file (file written on MS Windows) perl -pi -e 's/\r//g' tools/httpd_conf +# SELinux README +cp -a %{SOURCE1} README.SELinux + %install rm -rf $RPM_BUILD_ROOT @@ -80,7 +81,7 @@ ### Commit permanent changes to default configuration install -p -m 644 wwwroot/cgi-bin/awstats.model.conf \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf -%{__perl} -pi -e ' +perl -pi -e ' s|^LogFile=.*$|LogFile="%{_localstatedir}/log/httpd/access_log"|; s|^DirData=.*$|DirData="%{_localstatedir}/lib/awstats"|; s|^DirCgi=.*$|DirCgi="/awstats"|; @@ -91,16 +92,17 @@ s|^SaveDatabaseFilesWithPermissionsForEveryone=.*$|SaveDatabaseFilesWithPermissionsForEveryone=0|; s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|; s|^Expires=.*$|Expires=3600|; - ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf + ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf # Fix scripts -%{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ +perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf} # Apache configuration install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf -%{__perl} -pi -e 's|/usr/local|%{_datadir}|g' $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf +perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \ + $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf echo "# Additional Perl modules SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins @@ -114,13 +116,6 @@ rm -rf $RPM_BUILD_ROOT -%pre -# Set SELinux types -semanage fcontext -a -t httpd_sys_script_exec_t \ - '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' 2>/dev/null || : - - %post if [ $1 -eq 1 ]; then if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then @@ -130,18 +125,29 @@ ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || : fi fi +### SELinux support ### +# Set SELinux file_context +semanage fcontext -a -t httpd_sys_script_exec_t \ + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : +semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : +# Actually change the context +chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || : +chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || : %postun if [ $1 -ne 0 ]; then /sbin/service httpd condrestart >/dev/null 2>&1 fi +# SELinux support if [ $1 -eq 0 ]; then semanage fcontext -d -t httpd_sys_script_exec_t \ - '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : fi + %files %defattr(-,root,root,755) # Apache configuration file @@ -155,7 +161,7 @@ %{_datadir}/%{name}/wwwroot/cgi-bin # Different defattr to fix lots of files which should not be +x. %defattr(644,root,root,755) -%doc README.TXT docs/* +%doc README.TXT docs/* README.SELinux %{_datadir}/%{name}/lang %{_datadir}/%{name}/lib %{_datadir}/%{name}/plugins @@ -164,9 +170,15 @@ %{_datadir}/%{name}/wwwroot/icon %{_datadir}/%{name}/wwwroot/js + + %changelog +* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta +- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) + * Sun Apr 09 2006 Aurelien Bompard 6.5-3 - SELinux support: use semanage to label the cgi and the database files +- Only allow access from localhost by default (this app has a security history) * Thu Feb 23 2006 Aurelien Bompard 6.5-2 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Jan 2006 15:07:29 -0000 1.8 +++ sources 7 May 2006 08:17:09 -0000 1.9 @@ -1 +1 @@ -aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz +c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 08:17:10 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 01:17:10 -0700 Subject: rpms/awstats/devel .cvsignore, 1.5, 1.6 awstats.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200605070817.k478HCTD006705@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6630/devel Modified Files: .cvsignore awstats.spec sources Log Message: version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Aug 2005 10:18:17 -0000 1.5 +++ .cvsignore 7 May 2006 08:17:10 -0000 1.6 @@ -1 +1 @@ -awstats-6.5.tar.gz +awstats-6.6.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- awstats.spec 12 Apr 2006 19:16:45 -0000 1.12 +++ awstats.spec 7 May 2006 08:17:10 -0000 1.13 @@ -1,12 +1,12 @@ Name: awstats -Version: 6.5 -Release: 3%{?dist} +Version: 6.6 +Release: 0.1.beta%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz -#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz +#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz +Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz Source1: awstats.README.SELinux BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -131,8 +131,8 @@ '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : # Actually change the context -chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin -chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats +chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || : +chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || : %postun @@ -142,7 +142,8 @@ # SELinux support if [ $1 -eq 0 ]; then semanage fcontext -d -t httpd_sys_script_exec_t \ - '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : + semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : fi @@ -172,6 +173,9 @@ %changelog +* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta +- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) + * Sun Apr 09 2006 Aurelien Bompard 6.5-3 - SELinux support: use semanage to label the cgi and the database files - Only allow access from localhost by default (this app has a security history) Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Jan 2006 15:07:29 -0000 1.8 +++ sources 7 May 2006 08:17:10 -0000 1.9 @@ -1 +1 @@ -aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz +c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz From fedora-extras-commits at redhat.com Sun May 7 10:43:20 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 May 2006 03:43:20 -0700 Subject: rpms/spamass-milter/devel spamass-milter.spec,1.7,1.8 Message-ID: <200605071043.k47AhMQr030574@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30542 Modified Files: spamass-milter.spec Log Message: Fix race condition in "stop" clause of initscript (#190894) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/devel/spamass-milter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spamass-milter.spec 6 Apr 2006 13:10:14 -0000 1.7 +++ spamass-milter.spec 7 May 2006 10:43:19 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -92,11 +92,11 @@ stop() { echo -n $"Shutting down $desc ($prog): " + rm -f %{_localstatedir}/lock/subsys/spamass-milter killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $pidfile - [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/spamass-milter return $RETVAL } @@ -176,6 +176,9 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Sun May 7 2006 Paul Howarth - 0.3.1-2 +- Fix race condition in "stop" clause of initscript (#190894) + * Thu Apr 6 2006 Paul Howarth - 0.3.1-1 - Update to 0.3.1 From fedora-extras-commits at redhat.com Sun May 7 10:44:51 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 May 2006 03:44:51 -0700 Subject: rpms/spamass-milter/FC-5 spamass-milter.spec,1.7,1.8 Message-ID: <200605071044.k47AiraM030833@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30792 Modified Files: spamass-milter.spec Log Message: resync with devel Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-5/spamass-milter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spamass-milter.spec 6 Apr 2006 13:11:59 -0000 1.7 +++ spamass-milter.spec 7 May 2006 10:44:51 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -92,11 +92,11 @@ stop() { echo -n $"Shutting down $desc ($prog): " + rm -f %{_localstatedir}/lock/subsys/spamass-milter killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $pidfile - [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/spamass-milter return $RETVAL } @@ -176,6 +176,9 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Sun May 7 2006 Paul Howarth - 0.3.1-2 +- Fix race condition in "stop" clause of initscript (#190894) + * Thu Apr 6 2006 Paul Howarth - 0.3.1-1 - Update to 0.3.1 From fedora-extras-commits at redhat.com Sun May 7 10:45:48 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 May 2006 03:45:48 -0700 Subject: rpms/spamass-milter/FC-4 spamass-milter.spec,1.6,1.7 Message-ID: <200605071045.k47AjouG031023@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30975 Modified Files: spamass-milter.spec Log Message: resync with devel Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-4/spamass-milter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- spamass-milter.spec 6 Apr 2006 13:13:28 -0000 1.6 +++ spamass-milter.spec 7 May 2006 10:45:48 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -92,11 +92,11 @@ stop() { echo -n $"Shutting down $desc ($prog): " + rm -f %{_localstatedir}/lock/subsys/spamass-milter killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $pidfile - [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/spamass-milter return $RETVAL } @@ -176,6 +176,9 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Sun May 7 2006 Paul Howarth - 0.3.1-2 +- Fix race condition in "stop" clause of initscript (#190894) + * Thu Apr 6 2006 Paul Howarth - 0.3.1-1 - Update to 0.3.1 From fedora-extras-commits at redhat.com Sun May 7 10:46:58 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 May 2006 03:46:58 -0700 Subject: rpms/spamass-milter/FC-3 spamass-milter.spec,1.6,1.7 Message-ID: <200605071047.k47Al1Ru031235@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31196 Modified Files: spamass-milter.spec Log Message: resync with devel Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-3/spamass-milter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- spamass-milter.spec 6 Apr 2006 13:14:39 -0000 1.6 +++ spamass-milter.spec 7 May 2006 10:46:58 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -92,11 +92,11 @@ stop() { echo -n $"Shutting down $desc ($prog): " + rm -f %{_localstatedir}/lock/subsys/spamass-milter killproc $prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $pidfile - [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/spamass-milter return $RETVAL } @@ -176,6 +176,9 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Sun May 7 2006 Paul Howarth - 0.3.1-2 +- Fix race condition in "stop" clause of initscript (#190894) + * Thu Apr 6 2006 Paul Howarth - 0.3.1-1 - Update to 0.3.1 From fedora-extras-commits at redhat.com Sun May 7 10:53:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 03:53:19 -0700 Subject: owners owners.list,1.952,1.953 Message-ID: <200605071053.k47ArL57032135@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32108/owners Modified Files: owners.list Log Message: Unorphan arc Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.952 retrieving revision 1.953 diff -u -r1.952 -r1.953 --- owners.list 7 May 2006 02:11:29 -0000 1.952 +++ owners.list 7 May 2006 10:53:19 -0000 1.953 @@ -48,7 +48,7 @@ Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|arc|Arc archiver|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|archmage|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org| Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 10:56:24 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 03:56:24 -0700 Subject: rpms/arc/devel arc.spec,1.13,1.14 Message-ID: <200605071056.k47AuQND032571@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/arc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32548 Modified Files: arc.spec Log Message: * Sun May 7 2006 5.21o-2 - Unorphan, build for FC-5, devel Index: arc.spec =================================================================== RCS file: /cvs/extras/rpms/arc/devel/arc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- arc.spec 2 Mar 2006 21:28:17 -0000 1.13 +++ arc.spec 7 May 2006 10:56:24 -0000 1.14 @@ -1,9 +1,7 @@ Name: arc Version: 5.21o -Release: 1%{dist} - +Release: 2%{?dist} Summary: Arc archiver - Group: Applications/Archiving License: GPL URL: http://arc.sourceforge.net/ @@ -14,39 +12,37 @@ Arc file archiver and compressor. Long since superseded by zip/unzip but useful if you have old .arc files you need to unpack. -%prep -cat< 5.21o-2 +- Unorphan, build for FC-5, devel * Thu Oct 13 2005 5.21o-1 - 5.21o From fedora-extras-commits at redhat.com Sun May 7 10:57:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 03:57:02 -0700 Subject: rpms/arc/FC-5 arc.spec,1.13,1.14 Message-ID: <200605071057.k47Av4ft032714@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/arc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32691 Modified Files: arc.spec Log Message: * Sun May 7 2006 5.21o-2 - Unorphan, build for FC-5, devel Index: arc.spec =================================================================== RCS file: /cvs/extras/rpms/arc/FC-5/arc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- arc.spec 2 Mar 2006 21:28:17 -0000 1.13 +++ arc.spec 7 May 2006 10:57:02 -0000 1.14 @@ -1,9 +1,7 @@ Name: arc Version: 5.21o -Release: 1%{dist} - +Release: 2%{?dist} Summary: Arc archiver - Group: Applications/Archiving License: GPL URL: http://arc.sourceforge.net/ @@ -14,39 +12,37 @@ Arc file archiver and compressor. Long since superseded by zip/unzip but useful if you have old .arc files you need to unpack. -%prep -cat< 5.21o-2 +- Unorphan, build for FC-5, devel * Thu Oct 13 2005 5.21o-1 - 5.21o From fedora-extras-commits at redhat.com Sun May 7 11:16:04 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 04:16:04 -0700 Subject: rpms/pipenightdreams/devel pipenightdreams-0.10.0-quit.patch, NONE, 1.1 pipenightdreams.spec, 1.2, 1.3 Message-ID: <200605071116.k47BG65A005471@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/pipenightdreams/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444 Modified Files: pipenightdreams.spec Added Files: pipenightdreams-0.10.0-quit.patch Log Message: * Sun May 7 2006 Hans de Goede 0.10.0-3 - Add Patch3 which fixes quiting during the "try again dialog" (bz 188345) pipenightdreams-0.10.0-quit.patch: --- NEW FILE pipenightdreams-0.10.0-quit.patch --- --- pipenightdreams-0.10.0/src/pipenightdreams.cpp~ 2006-05-07 13:10:55.000000000 +0200 +++ pipenightdreams-0.10.0/src/pipenightdreams.cpp 2006-05-07 13:10:55.000000000 +0200 @@ -356,7 +356,9 @@ do{ event_manager->pumpEvents(true); event=sys->get(); - }while (event!=GO); + }while (event!=GO && event!=BACK); + if (event == BACK) + sys->put(SDLK_ESCAPE); } void PipeNightDreams::showFinal(){ Index: pipenightdreams.spec =================================================================== RCS file: /cvs/extras/rpms/pipenightdreams/devel/pipenightdreams.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pipenightdreams.spec 7 Apr 2006 15:36:56 -0000 1.2 +++ pipenightdreams.spec 7 May 2006 11:16:04 -0000 1.3 @@ -1,6 +1,6 @@ Name: pipenightdreams Version: 0.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Connect the waterpipes to create a proper pipeline Group: Amusements/Games License: GPL @@ -10,6 +10,7 @@ Patch0: pipenightdreams-0.10.0-gcc41.patch Patch1: pipenightdreams-0.10.0-datadir.patch Patch2: pipenightdreams-0.10.0-sanitize.patch +Patch3: pipenightdreams-0.10.0-quit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel desktop-file-utils @@ -26,6 +27,7 @@ %patch0 -p1 -z .gcc41 %patch1 -p1 -z .datadir %patch2 -p1 -z .sanitize +%patch3 -p1 -z .quit %build @@ -80,6 +82,9 @@ %changelog +* Sun May 7 2006 Hans de Goede 0.10.0-3 +- Add Patch3 which fixes quiting during the "try again dialog" (bz 188345) + * Fri Apr 7 2006 Hans de Goede 0.10.0-2 - Remove use of a trademarked term from %%description, manpage and docs From fedora-extras-commits at redhat.com Sun May 7 11:17:04 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 May 2006 04:17:04 -0700 Subject: rpms/pipenightdreams/FC-5 pipenightdreams-0.10.0-quit.patch, NONE, 1.1 pipenightdreams.spec, 1.2, 1.3 Message-ID: <200605071117.k47BH6L1005671@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/pipenightdreams/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643 Modified Files: pipenightdreams.spec Added Files: pipenightdreams-0.10.0-quit.patch Log Message: * Sun May 7 2006 Hans de Goede 0.10.0-3 - Add Patch3 which fixes quiting during the "try again dialog" (bz 188345) pipenightdreams-0.10.0-quit.patch: --- NEW FILE pipenightdreams-0.10.0-quit.patch --- --- pipenightdreams-0.10.0/src/pipenightdreams.cpp~ 2006-05-07 13:10:55.000000000 +0200 +++ pipenightdreams-0.10.0/src/pipenightdreams.cpp 2006-05-07 13:10:55.000000000 +0200 @@ -356,7 +356,9 @@ do{ event_manager->pumpEvents(true); event=sys->get(); - }while (event!=GO); + }while (event!=GO && event!=BACK); + if (event == BACK) + sys->put(SDLK_ESCAPE); } void PipeNightDreams::showFinal(){ Index: pipenightdreams.spec =================================================================== RCS file: /cvs/extras/rpms/pipenightdreams/FC-5/pipenightdreams.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pipenightdreams.spec 9 Apr 2006 07:26:15 -0000 1.2 +++ pipenightdreams.spec 7 May 2006 11:17:04 -0000 1.3 @@ -1,6 +1,6 @@ Name: pipenightdreams Version: 0.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Connect the waterpipes to create a proper pipeline Group: Amusements/Games License: GPL @@ -10,6 +10,7 @@ Patch0: pipenightdreams-0.10.0-gcc41.patch Patch1: pipenightdreams-0.10.0-datadir.patch Patch2: pipenightdreams-0.10.0-sanitize.patch +Patch3: pipenightdreams-0.10.0-quit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel desktop-file-utils @@ -26,6 +27,7 @@ %patch0 -p1 -z .gcc41 %patch1 -p1 -z .datadir %patch2 -p1 -z .sanitize +%patch3 -p1 -z .quit %build @@ -80,6 +82,9 @@ %changelog +* Sun May 7 2006 Hans de Goede 0.10.0-3 +- Add Patch3 which fixes quiting during the "try again dialog" (bz 188345) + * Fri Apr 7 2006 Hans de Goede 0.10.0-2 - Remove use of a trademarked term from %%description, manpage and docs From fedora-extras-commits at redhat.com Sun May 7 13:35:53 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:35:53 -0700 Subject: rpms/ctapi-common - New directory Message-ID: <200605071335.k47DZtIW012406@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12380/ctapi-common Log Message: Directory /cvs/extras/rpms/ctapi-common added to the repository From fedora-extras-commits at redhat.com Sun May 7 13:35:54 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:35:54 -0700 Subject: rpms/ctapi-common/devel - New directory Message-ID: <200605071335.k47DZuLC012409@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12380/ctapi-common/devel Log Message: Directory /cvs/extras/rpms/ctapi-common/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 13:36:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:36:10 -0700 Subject: rpms/ctapi-common Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605071336.k47DaCSb012460@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427 Added Files: Makefile import.log Log Message: Setup of module ctapi-common --- NEW FILE Makefile --- # Top level Makefile for module ctapi-common all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 13:36:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:36:10 -0700 Subject: rpms/ctapi-common/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605071336.k47DaCeA012463@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ctapi-common --- NEW 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 May 7 13:36:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:36:45 -0700 Subject: rpms/ctapi-common import.log,1.1,1.2 Message-ID: <200605071336.k47Daluv012527@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12494 Modified Files: import.log Log Message: auto-import ctapi-common-1.0-2 on branch devel from ctapi-common-1.0-2.src.rpm Initial import (#190911). Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ctapi-common/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 13:36:10 -0000 1.1 +++ import.log 7 May 2006 13:36:45 -0000 1.2 @@ -0,0 +1 @@ +ctapi-common-1_0-2:HEAD:ctapi-common-1.0-2.src.rpm:1147008997 From fedora-extras-commits at redhat.com Sun May 7 13:36:46 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:36:46 -0700 Subject: rpms/ctapi-common/devel ctapi-common.LICENSE, NONE, 1.1 ctapi-common.README, NONE, 1.1 ctapi-common.spec, NONE, 1.1 Message-ID: <200605071336.k47Damcu012530@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ctapi-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12494/devel Added Files: ctapi-common.LICENSE ctapi-common.README ctapi-common.spec Log Message: auto-import ctapi-common-1.0-2 on branch devel from ctapi-common-1.0-2.src.rpm Initial import (#190911). --- NEW FILE ctapi-common.LICENSE --- Copyright (c) 2006 Fedora Project Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- NEW FILE ctapi-common.README --- The ctapi-common package provides common infrastructure for CT-API modules. To take advantage of this: - Install the modules into a directory listed in /etc/ld.so.conf.d/ctapi-*.conf for the target architecture. - Add a dependency on that directory in packages. --- NEW FILE ctapi-common.spec --- # Not noarch, but nothing to strip: %define debug_package %{nil} Name: ctapi-common Version: 1.0 Release: 2%{?dist} Summary: Common files and packaging infrastructure for CT-API modules Group: System Environment/Libraries License: MIT URL: http://fedoraproject.org/ Source0: %{name}.LICENSE Source1: %{name}.README BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description %{summary}. %prep %setup -c -T cp -p %{SOURCE0} LICENSE cp -p %{SOURCE1} README %build echo %{_libdir}/ctapi > ctapi.conf %install rm -rf $RPM_BUILD_ROOT install -Dpm 644 ctapi.conf \ $RPM_BUILD_ROOT/etc/ld.so.conf.d/ctapi-%{_target_cpu}.conf install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ctapi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE README # Hardcoded /etc in README -> hardcoded here. /etc/ld.so.conf.d/ctapi-%{_target_cpu}.conf %{_libdir}/ctapi/ %changelog * Sat May 6 2006 Ville Skytt?? - 1.0-2 - Encourage dir based dependency on %%{_libdir}/ctapi in packages (#190911). - Split contents of README into a separate file. - Change license to MIT, include license text. - Add URL. * Sat May 6 2006 Ville Skytt?? - 1.0-1 - First build. From fedora-extras-commits at redhat.com Sun May 7 13:47:25 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:47:25 -0700 Subject: rpms/openct/devel openct.spec,1.12,1.13 Message-ID: <200605071347.k47DlRxL012665@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12648 Modified Files: openct.spec Log Message: * Sat May 6 2006 Ville Skytt?? - 0.6.7-2 - Install CT-API module into %{_libdir}/ctapi, add dependency on it (#190903). - Update URL. Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openct.spec 4 May 2006 16:51:11 -0000 1.12 +++ openct.spec 7 May 2006 13:47:25 -0000 1.13 @@ -2,12 +2,12 @@ Name: openct Version: 0.6.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries License: LGPL -URL: http://www.opensc-project.org/ +URL: http://www.opensc-project.org/openct/ Source0: http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig @@ -17,6 +17,7 @@ BuildRequires: libusb-devel BuildRequires: libtool-ltdl-devel BuildRequires: libtool +Requires: %{_libdir}/ctapi # TODO: verify minimum udev version Requires: udev >= 062 Requires(post): /sbin/chkconfig @@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ctapi +mv $RPM_BUILD_ROOT%{_libdir}/{libopenctapi.so,ctapi} + install -Dpm 644 etc/openct.udev \ $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug @@ -134,8 +138,8 @@ %{_sbindir}/ifdhandler %{_sbindir}/ifdproxy %{_sbindir}/openct-control +%{_libdir}/ctapi/libopenctapi.so %{_libdir}/libopenct.so.* -%{_libdir}/libopenctapi.so %{_libdir}/openct/ %dir %{_localstatedir}/run/openct/ %ghost %{_localstatedir}/run/openct/status @@ -155,6 +159,10 @@ %changelog +* Sat May 6 2006 Ville Skytt?? - 0.6.7-2 +- Install CT-API module into %%{_libdir}/ctapi, add dependency on it (#190903). +- Update URL. + * Thu May 4 2006 Ville Skytt?? - 0.6.7-1 - 0.6.7. From fedora-extras-commits at redhat.com Sun May 7 13:48:14 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:48:14 -0700 Subject: rpms/openct/FC-5 .cvsignore, 1.4, 1.5 openct.spec, 1.9, 1.10 sources, 1.4, 1.5 openct-0.6.6-rpath64.patch, 1.1, NONE openct-reader.conf, 1.1, NONE openct.rules, 1.1, NONE Message-ID: <200605071348.k47DmG4V012737@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12716 Modified Files: .cvsignore openct.spec sources Removed Files: openct-0.6.6-rpath64.patch openct-reader.conf openct.rules Log Message: * Sat May 6 2006 Ville Skytt?? - 0.6.7-2 - Install CT-API module into %{_libdir}/ctapi, add dependency on it (#190903). - Update URL. * Thu May 4 2006 Ville Skytt?? - 0.6.7-1 - 0.6.7. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openct/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Sep 2005 07:06:13 -0000 1.4 +++ .cvsignore 7 May 2006 13:48:13 -0000 1.5 @@ -1 +1 @@ -openct-0.6.6.tar.gz +openct-0.6.7.tar.gz Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/FC-5/openct.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- openct.spec 6 Mar 2006 15:50:50 -0000 1.9 +++ openct.spec 7 May 2006 13:48:13 -0000 1.10 @@ -1,25 +1,23 @@ %define dropdir %(pkg-config libpcsclite --variable=usbdropdir) Name: openct -Version: 0.6.6 -Release: 5%{?dist} +Version: 0.6.7 +Release: 2%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries -License: BSD -URL: http://www.opensc.org/ -Source0: http://www.opensc.org/files/%{name}-%{version}.tar.gz +License: LGPL +URL: http://www.opensc-project.org/openct/ +Source0: http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig -Source3: %{name}-reader.conf -Source4: %{name}.rules -Patch0: %{name}-0.6.6-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.3.0 BuildRequires: libusb-devel BuildRequires: libtool-ltdl-devel -BuildRequires: sed +BuildRequires: libtool +Requires: %{_libdir}/ctapi # TODO: verify minimum udev version Requires: udev >= 062 Requires(post): /sbin/chkconfig @@ -57,16 +55,17 @@ %prep %setup -q -# patch0: --disable-rpath doesn't appear to do its job -%patch0 -p1 -sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf +sh bootstrap # avoid standard rpaths on lib64 archs +sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in +sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \ + etc/openct.udev %build %configure \ - --disable-dependency-tracking \ - --disable-static \ - --with-bundle-dir=%{dropdir} + --disable-dependency-tracking \ + --disable-static \ + --with-bundle-dir=%{dropdir} make %{?_smp_mflags} @@ -74,23 +73,29 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -Dpm 644 \ - %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ctapi +mv $RPM_BUILD_ROOT%{_libdir}/{libopenctapi.so,ctapi} -ln -sf %{_libdir}/openct-ifd.so \ - $RPM_BUILD_ROOT%{dropdir}/openct-ifd.bundle/Contents/*/ +install -Dpm 644 etc/openct.udev \ + $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules +install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf + install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct + install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct -install -Dpm 644 %{name}-reader.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf + +so=$(find $RPM_BUILD_ROOT%{dropdir} -name \*.so | sed "s|^$RPM_BUILD_ROOT||") +sed -i -e "s|\\(LIBPATH\\s*\\).*|\\1$so|" etc/reader.conf +install -Dpm 644 etc/reader.conf \ + $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,openct-ifd.so} %clean @@ -103,19 +108,19 @@ %preun if [ $1 -eq 0 ] ; then - %{_initrddir}/openct stop >/dev/null 2>&1 || : - /sbin/chkconfig --del openct + %{_initrddir}/openct stop >/dev/null 2>&1 || : + /sbin/chkconfig --del openct fi %postun /sbin/ldconfig if [ $1 -gt 0 ] ; then - %{_initrddir}/openct try-restart >/dev/null || : + %{_initrddir}/openct try-restart >/dev/null || : fi %post -n pcsc-lite-%{name} if [ $1 -eq 1 ] ; then - %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || : + %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || : fi %postun -n pcsc-lite-%{name} @@ -124,7 +129,7 @@ %files %defattr(-,root,root,-) -%doc ANNOUNCE NEWS TODO doc/*.html doc/*.css +%doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css %config(noreplace) %{_sysconfdir}/openct.conf %config(noreplace) %{_sysconfdir}/sysconfig/openct %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules @@ -133,8 +138,9 @@ %{_sbindir}/ifdhandler %{_sbindir}/ifdproxy %{_sbindir}/openct-control +%{_libdir}/ctapi/libopenctapi.so %{_libdir}/libopenct.so.* -%{_libdir}/libopenctapi.so +%{_libdir}/openct/ %dir %{_localstatedir}/run/openct/ %ghost %{_localstatedir}/run/openct/status %{_mandir}/man1/openct-tool.1* @@ -149,11 +155,25 @@ %files -n pcsc-lite-%{name} %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf -%{_libdir}/openct-ifd.so %{dropdir}/openct-ifd.bundle/ %changelog +* Sat May 6 2006 Ville Skytt?? - 0.6.7-2 +- Install CT-API module into %%{_libdir}/ctapi, add dependency on it (#190903). +- Update URL. + +* Thu May 4 2006 Ville Skytt?? - 0.6.7-1 +- 0.6.7. + +* Wed Apr 26 2006 Ville Skytt?? - 0.6.7-0.1.rc4 +- 0.6.7-rc4. +- Re-enable PCSC hotplug in pcsc-lite subpackage. +- Include license text. + +* Sat Apr 22 2006 Ville Skytt?? - 0.6.7-0.1.rc1 +- 0.6.7-rc1, udev rules and reader.conf included upstream. + * Mon Mar 6 2006 Ville Skytt?? - 0.6.6-5 - Rebuild with new pcsc-lite. Index: sources =================================================================== RCS file: /cvs/extras/rpms/openct/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Sep 2005 07:06:13 -0000 1.4 +++ sources 7 May 2006 13:48:13 -0000 1.5 @@ -1 +1 @@ -a9de3bef8e5e2827b8d72a2a50d0bc66 openct-0.6.6.tar.gz +1b33d319f364acafbcf130d7ba34ea4c openct-0.6.7.tar.gz --- openct-0.6.6-rpath64.patch DELETED --- --- openct-reader.conf DELETED --- --- openct.rules DELETED --- From fedora-extras-commits at redhat.com Sun May 7 13:49:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:49:24 -0700 Subject: rpms/opensc/devel opensc.spec,1.13,1.14 Message-ID: <200605071349.k47DnQ4h012776@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12759 Modified Files: opensc.spec Log Message: * Sun May 7 2006 Ville Skytt?? - 0.11.0-2 - Sync example paths in openct.conf with ctapi-common. - Update URL. Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- opensc.spec 4 May 2006 17:05:31 -0000 1.13 +++ opensc.spec 7 May 2006 13:49:24 -0000 1.14 @@ -2,12 +2,12 @@ Name: opensc Version: 0.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL -URL: http://www.opensc-project.org/ +URL: http://www.opensc-project.org/opensc/ Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,7 @@ sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . +sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in %build @@ -136,6 +137,10 @@ %changelog +* Sun May 7 2006 Ville Skytt?? - 0.11.0-2 +- Sync example paths in openct.conf with ctapi-common. +- Update URL. + * Thu May 4 2006 Ville Skytt?? - 0.11.0-1 - 0.11.0. From fedora-extras-commits at redhat.com Sun May 7 13:51:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 06:51:19 -0700 Subject: rpms/opensc/FC-5 .cvsignore, 1.5, 1.6 opensc.spec, 1.10, 1.11 sources, 1.5, 1.6 opensc-0.10.1-rpath64.patch, 1.1, NONE Message-ID: <200605071351.k47DpLY8012862@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12841 Modified Files: .cvsignore opensc.spec sources Removed Files: opensc-0.10.1-rpath64.patch Log Message: * Sun May 7 2006 Ville Skytt?? - 0.11.0-2 - Sync example paths in openct.conf with ctapi-common. - Update URL. * Thu May 4 2006 Ville Skytt?? - 0.11.0-1 - 0.11.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jan 2006 22:14:15 -0000 1.5 +++ .cvsignore 7 May 2006 13:51:19 -0000 1.6 @@ -1 +1 @@ -opensc-0.10.1.tar.gz +opensc-0.11.0.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/opensc.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- opensc.spec 6 Mar 2006 16:03:01 -0000 1.10 +++ opensc.spec 7 May 2006 13:51:19 -0000 1.11 @@ -1,15 +1,14 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.10.1 -Release: 3%{?dist} +Version: 0.11.0 +Release: 2%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL -URL: http://www.opensc.org/ -Source0: http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz -Patch0: %{name}-0.10.1-rpath64.patch +URL: http://www.opensc-project.org/opensc/ +Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -17,6 +16,7 @@ BuildRequires: openct-devel BuildRequires: openssl-devel >= 0.9.7a BuildRequires: libtool-ltdl-devel +BuildRequires: libtool %description OpenSC is a package for for accessing smart card devices. Basic @@ -51,10 +51,10 @@ %prep %setup -q -# patch0: --disable-rpath doesn't seem to do what it implies -%patch0 -p1 +sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . +sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in %build @@ -74,14 +74,12 @@ install -dm 755 _docs/openssh install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh cp -pR doc _docs -rm -r _docs/doc/{*.sh,*.xsl,old,Makefile*,tools} +rm -r _docs/doc/{*.sh,*.xsl,api,Makefile*,tools} find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm rm $RPM_BUILD_ROOT%{plugindir}/opensc-signer.so -mv $RPM_BUILD_ROOT%{_libdir}/opensc/opensc-signer.so \ - $RPM_BUILD_ROOT%{plugindir} -rmdir $RPM_BUILD_ROOT%{_libdir}/opensc +mv $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{plugindir} %clean @@ -103,6 +101,7 @@ %{_bindir}/netkey-tool %{_bindir}/opensc-explorer %{_bindir}/opensc-tool +%{_bindir}/piv-tool %{_bindir}/pkcs11-tool %{_bindir}/pkcs15-crypt %{_bindir}/pkcs15-init @@ -138,6 +137,19 @@ %changelog +* Sun May 7 2006 Ville Skytt?? - 0.11.0-2 +- Sync example paths in openct.conf with ctapi-common. +- Update URL. + +* Thu May 4 2006 Ville Skytt?? - 0.11.0-1 +- 0.11.0. + +* Thu Apr 27 2006 Ville Skytt?? - 0.11.0-0.1.rc2 +- 0.11.0-rc2. + +* Sat Apr 22 2006 Ville Skytt?? - 0.11.0-0.1.rc1 +- 0.11.0-rc1. + * Mon Mar 6 2006 Ville Skytt?? - 0.10.1-3 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Jan 2006 22:14:15 -0000 1.5 +++ sources 7 May 2006 13:51:19 -0000 1.6 @@ -1 +1 @@ -5549c7c339775356784837887750d232 opensc-0.10.1.tar.gz +be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz --- opensc-0.10.1-rpath64.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 7 13:59:30 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Sun, 7 May 2006 06:59:30 -0700 Subject: rpms/pitivi/devel pitivi.spec,1.2,1.3 Message-ID: <200605071359.k47DxWGI012915@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12898 Modified Files: pitivi.spec Log Message: BuildRequires: gnonlin added to spec file. Index: pitivi.spec =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/pitivi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pitivi.spec 26 Apr 2006 21:17:58 -0000 1.2 +++ pitivi.spec 7 May 2006 13:59:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: pitivi Version: 0.10.0 -Release: 1 +Release: 2 Summary: Non-linear video editor Group: Applications/Multimedia @@ -22,6 +22,7 @@ BuildRequires: pkgconfig BuildRequires: desktop-file-utils BuildRequires: gnome-python2 +BuildRequires: gnonlin %description Pitivi is an application using the GStreamer multimedia framework to @@ -75,6 +76,9 @@ %{_datadir}/applications/* %changelog +* Sun May 07 2006 W. Michael Petullo 0.10.0-2 +- BuildRequires: gnonlin because plugins are required a build time + * Wed Apr 26 2006 W. Michael Petullo 0.10.0-1 - update to 0.10.0 - remove BuildRequires: gnonlin-devel From fedora-extras-commits at redhat.com Sun May 7 15:07:16 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Sun, 7 May 2006 08:07:16 -0700 Subject: rpms/pitivi/devel pitivi.spec,1.3,1.4 Message-ID: <200605071507.k47F7IiU019761@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19743 Modified Files: pitivi.spec Log Message: BuildRequires: pygtk2-libglade Index: pitivi.spec =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/pitivi.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pitivi.spec 7 May 2006 13:59:29 -0000 1.3 +++ pitivi.spec 7 May 2006 15:07:16 -0000 1.4 @@ -1,6 +1,6 @@ Name: pitivi Version: 0.10.0 -Release: 2 +Release: 3 Summary: Non-linear video editor Group: Applications/Multimedia @@ -18,6 +18,7 @@ BuildRequires: GConf2-devel BuildRequires: gtk2-devel >= 2.8 BuildRequires: pygtk2-devel +BuildRequires: pygtk2-libglade BuildRequires: gtk-doc BuildRequires: pkgconfig BuildRequires: desktop-file-utils @@ -76,6 +77,9 @@ %{_datadir}/applications/* %changelog +* Sun May 07 2006 W. Michael Petullo 0.10.0-3 +- BuildRequires: pygtk2-libglade + * Sun May 07 2006 W. Michael Petullo 0.10.0-2 - BuildRequires: gnonlin because plugins are required a build time From fedora-extras-commits at redhat.com Sun May 7 15:38:18 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 7 May 2006 08:38:18 -0700 Subject: rpms/raptor/FC-5 .cvsignore, 1.2, 1.3 raptor.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605071538.k47FcKoW020035@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/raptor/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20010 Modified Files: .cvsignore raptor.spec sources Log Message: Update to 1.4.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raptor/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Apr 2006 00:40:34 -0000 1.2 +++ .cvsignore 7 May 2006 15:38:18 -0000 1.3 @@ -1 +1,2 @@ raptor-1.4.8.tar.gz +raptor-1.4.9.tar.gz Index: raptor.spec =================================================================== RCS file: /cvs/extras/rpms/raptor/FC-5/raptor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- raptor.spec 27 Apr 2006 00:40:34 -0000 1.1 +++ raptor.spec 7 May 2006 15:38:18 -0000 1.2 @@ -1,10 +1,10 @@ Summary: Raptor RDF Parser Toolkit for Redland Name: raptor -Version: 1.4.8 -Release: 5%{?dist} +Version: 1.4.9 +Release: 2%{?dist} License: LGPL or Apache License Version 2.0 Group: System Environment/Libraries -Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.8.tar.gz +Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.9.tar.gz Patch0: raptor-1.4.8-pkgconfig.patch Patch1: raptor-1.4.8-config.patch URL: http://www.redland.opensource.ac.uk/raptor/ @@ -52,7 +52,6 @@ %defattr(-, root, root) %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc %{_mandir}/man1/rapper.1* -%doc %{_mandir}/man3/libraptor.3* %{_libdir}/lib*.so.* %{_bindir}/rapper @@ -62,6 +61,7 @@ %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc INSTALL.html %doc %{_mandir}/man1/raptor-config.1* +%doc %{_mandir}/man3/libraptor.3* %doc %{_datadir}/gtk-doc/html/raptor %{_libdir}/lib*.so %{_libdir}/pkgconfig/raptor.pc @@ -69,6 +69,10 @@ %{_bindir}/raptor-config %changelog +* Sun May 7 2006 Anthony Green 1.4.9-2 +- Move libraptor man page to devel package. +- Update sources to 1.4.9. + * Wed Apr 26 2006 Anthony Green 1.4.8-5 - Add raptor-1.4.8-config.patch from Michael Schwendt. - Remove some Requires from the devel package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/raptor/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Apr 2006 00:40:34 -0000 1.2 +++ sources 7 May 2006 15:38:18 -0000 1.3 @@ -1 +1,2 @@ 112d8b72a37f4de8a00f840999f2d383 raptor-1.4.8.tar.gz +c2c4c5724c5f245a166d05eaf529fe4c raptor-1.4.9.tar.gz From fedora-extras-commits at redhat.com Sun May 7 15:39:41 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 7 May 2006 08:39:41 -0700 Subject: rpms/raptor/devel .cvsignore, 1.2, 1.3 raptor.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605071539.k47Fdhfm020110@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/raptor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20089 Modified Files: .cvsignore raptor.spec sources Log Message: Update to 1.4.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raptor/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Apr 2006 00:40:34 -0000 1.2 +++ .cvsignore 7 May 2006 15:39:41 -0000 1.3 @@ -1 +1,2 @@ raptor-1.4.8.tar.gz +raptor-1.4.9.tar.gz Index: raptor.spec =================================================================== RCS file: /cvs/extras/rpms/raptor/devel/raptor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- raptor.spec 27 Apr 2006 00:40:34 -0000 1.1 +++ raptor.spec 7 May 2006 15:39:41 -0000 1.2 @@ -1,10 +1,10 @@ Summary: Raptor RDF Parser Toolkit for Redland Name: raptor -Version: 1.4.8 -Release: 5%{?dist} +Version: 1.4.9 +Release: 2%{?dist} License: LGPL or Apache License Version 2.0 Group: System Environment/Libraries -Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.8.tar.gz +Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.9.tar.gz Patch0: raptor-1.4.8-pkgconfig.patch Patch1: raptor-1.4.8-config.patch URL: http://www.redland.opensource.ac.uk/raptor/ @@ -52,7 +52,6 @@ %defattr(-, root, root) %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc %{_mandir}/man1/rapper.1* -%doc %{_mandir}/man3/libraptor.3* %{_libdir}/lib*.so.* %{_bindir}/rapper @@ -62,6 +61,7 @@ %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README %doc INSTALL.html %doc %{_mandir}/man1/raptor-config.1* +%doc %{_mandir}/man3/libraptor.3* %doc %{_datadir}/gtk-doc/html/raptor %{_libdir}/lib*.so %{_libdir}/pkgconfig/raptor.pc @@ -69,6 +69,10 @@ %{_bindir}/raptor-config %changelog +* Sun May 7 2006 Anthony Green 1.4.9-2 +- Move libraptor man page to devel package. +- Update sources to 1.4.9. + * Wed Apr 26 2006 Anthony Green 1.4.8-5 - Add raptor-1.4.8-config.patch from Michael Schwendt. - Remove some Requires from the devel package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/raptor/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Apr 2006 00:40:34 -0000 1.2 +++ sources 7 May 2006 15:39:41 -0000 1.3 @@ -1 +1,2 @@ 112d8b72a37f4de8a00f840999f2d383 raptor-1.4.8.tar.gz +c2c4c5724c5f245a166d05eaf529fe4c raptor-1.4.9.tar.gz From fedora-extras-commits at redhat.com Sun May 7 16:36:06 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 7 May 2006 09:36:06 -0700 Subject: rpms/mtd-utils/devel mtd-utils.spec,1.2,1.3 Message-ID: <200605071636.k47Ga8NR022660@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22643 Modified Files: mtd-utils.spec Log Message: Add dist tag Index: mtd-utils.spec =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/devel/mtd-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mtd-utils.spec 2 May 2006 12:11:22 -0000 1.2 +++ mtd-utils.spec 7 May 2006 16:36:06 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 -Release: 2 +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ From fedora-extras-commits at redhat.com Sun May 7 16:37:08 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 7 May 2006 09:37:08 -0700 Subject: rpms/mtd-utils/FC-4 mtd-utils.spec,1.2,1.3 Message-ID: <200605071637.k47GbA9n022757@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22740 Modified Files: mtd-utils.spec Log Message: Add dist tag Index: mtd-utils.spec =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/FC-4/mtd-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mtd-utils.spec 2 May 2006 12:11:22 -0000 1.2 +++ mtd-utils.spec 7 May 2006 16:37:08 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 -Release: 2 +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ From fedora-extras-commits at redhat.com Sun May 7 16:38:36 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 7 May 2006 09:38:36 -0700 Subject: rpms/mtd-utils/FC-5 mtd-utils.spec,1.2,1.3 Message-ID: <200605071638.k47GccUK022811@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/mtd-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22794 Modified Files: mtd-utils.spec Log Message: Add dist tag Index: mtd-utils.spec =================================================================== RCS file: /cvs/extras/rpms/mtd-utils/FC-5/mtd-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mtd-utils.spec 2 May 2006 12:11:22 -0000 1.2 +++ mtd-utils.spec 7 May 2006 16:38:36 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Utilities for dealing with MTD (flash) devices Name: mtd-utils Version: 1.0.0 -Release: 2 +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.linux-mtd.infradead.org/ From fedora-extras-commits at redhat.com Sun May 7 16:51:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 09:51:24 -0700 Subject: rpms/hddtemp/FC-5 .cvsignore, 1.6, 1.7 hddtemp.db, 1.10, 1.11 hddtemp.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200605071651.k47GpRr2022926@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/hddtemp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22903 Modified Files: .cvsignore hddtemp.db hddtemp.spec sources Log Message: * Wed May 3 2006 Ville Skytt?? - 0.3-0.8.beta15 - 0.3-beta15, drive database 2006-04-26. - Specfile cleanups. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Sep 2005 18:09:14 -0000 1.6 +++ .cvsignore 7 May 2006 16:51:24 -0000 1.7 @@ -1 +1 @@ -hddtemp-0.3-beta14.tar.bz2 +hddtemp-0.3-beta15.tar.bz2 Index: hddtemp.db =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-5/hddtemp.db,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hddtemp.db 26 Feb 2006 15:41:47 -0000 1.10 +++ hddtemp.db 7 May 2006 16:51:24 -0000 1.11 @@ -9,7 +9,7 @@ # The following list was found at (http://www.almico.com/forumharddisks.php) # If your drive is in the list send me a mail. # -# Manufacturer Model Size Notes +# Manufacturer Model Size Notes # FUJITSU FUJITSU MPF3102AH 10.0GB # FUJITSU FUJITSU MPG3204AH E 20.0GB # FUJITSU FUJITSU MPG3307AT 30.0GB @@ -42,7 +42,7 @@ ######################################## ############# ExcelStor drives ######################################## -# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" +# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" "ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)" @@ -54,88 +54,84 @@ ######################################## ############# Fujitsu drives ######################################## -"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" +"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" -"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" -"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" -"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" +"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" +"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" +"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" -"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" -"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" +"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" +"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" -"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" -"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" -"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" +"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" +"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" +"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" -"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" +"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" -"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" -"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" -"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" -"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" -"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" -"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" +"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" +"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" +"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" +"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" +"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" +"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" -"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" +"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" -"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" -"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH" +"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" +"FUJITSU MHV2080AH" 194 C "FUJITSU MHV2080AH" -"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" +"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" -"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" -"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" -"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" -"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" -"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" -"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" +"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" +"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" +"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" +"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" +"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" +"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" ######################################## ############# Hitachi drives ######################################## -"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" -"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" -"HITACHI_DK23CA-15" 194 C "Hitachi DK23CA-15" -"HITACHI_DK23CA-20" 194 C "Hitachi DK23CA-20" -"HITACHI_DK23CA-30" 194 C "Hitachi DK23CA-30" -"HITACHI_DK23CA-30B" 194 C "Hitachi DK23CA-30B" -"HITACHI_DK23CA-75" 194 C "Hitachi DK23CA-75" -"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" -"HITACHI_DK23EA-[346]0" 194 C "Hitachi DK23EA series" -"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" -"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" -"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" - -"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" -"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" -"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" -"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" -"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" -"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" -"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" - -"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" - -"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" -"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" -"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" -"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" - -"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" -"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" -"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" -"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" -"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" -"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" -"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" -"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" -"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" +"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" +"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" +"HITACHI_DK23CA-(15|20|30|30B|75)" 194 C "Hitachi DK23CA series" +"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" +"HITACHI_DK23EA-[2346]0" 194 C "Hitachi DK23EA series" +"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" +"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" +"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" + +"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" +"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" +"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" +"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" +"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" +"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" +"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" + +"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" + +"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" +"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" +"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" +"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" + +"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" +"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" +"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" +"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" +"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" +"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" +"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" +"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" +"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" +"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" +"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" ######################################## @@ -144,60 +140,60 @@ # DJSA serie is using F0h command to report temperature and also have # SMART capabilties but it was reported not to work. -# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" +# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" -"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" -"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" +"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" +"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" # according to specifications they do not seems to have sensor # but I prefer waiting for a report -#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" +#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" -"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" -"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" -"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" -"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" -"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" -"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" -"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" -"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" -"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" -"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" -"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" -"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" -"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" -"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" -"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" -"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" +"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" +"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" +"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" +"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" +"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" +"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" +"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" +"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" +"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" +"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" +"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" +"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" +"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" +"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" +"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" +"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" ######################################## ############# Maxtor drives ######################################## -#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" -"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" +#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" +"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" # which one must I trust ? #"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" +#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" #"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D060H3" 12 C "Maxtor DiamondMax D540X-4D" #"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" -"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" -"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" -"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" +"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" +"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" +"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" "Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" -"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" -"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" -"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" -"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" -"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" -"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" -"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM" -"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" -"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" +"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" +"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" +"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" +"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" +"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" +"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" +"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm" +"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB 7200RPM" +"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" +"Maxtor 7L300R0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" "Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM" -"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" +"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" @@ -217,126 +213,128 @@ ######################################## # somenone reported a problem with the SP8004H which reports a temperature # 10?C below the ambient temperature -"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" -"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)" -"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" -"SAMSUNG SW0434A" 0 C "Samsung SW0434A" -"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" -"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" -"SAMSUNG SP0822N" 194 C "Samsung SP0822N" -"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" +"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" +"SAMSUNG HD300LD" 194 C "Samsung SpinPoint M series (7200RPM, 8MB cache)" +"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" +"SAMSUNG SW0434A" 0 C "Samsung SW0434A" +"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" +"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" +"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" +"SAMSUNG SP0822N" 194 C "Samsung SP0822N" +"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" "SAMSUNG SP2[05]14N" 194 C "Samsung SpinPoint P120 series (7200RPM, 8MB cache)" -"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" -"SAMSUNG SV0432A" 0 C "Samsung SV0432A" -"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" -#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" -#"SAMSUNG SV1204H" 194 C "Samsung 120G" -"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" -"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" +"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" +"SAMSUNG SV0432A" 0 C "Samsung SV0432A" +"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" +"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" +#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" +#"SAMSUNG SV1204H" 194 C "Samsung 120G" +"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" +"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" ######################################## ############# Seagate drives ######################################## -"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" -"ST3412A" 0 C "Seagate ST3412A" -"ST38641A" 0 C "Seagate ST38641A" -"ST310014A" 194 C "Seagate ST310014A" -"ST310210A" 0 C "Seagate ST310210A" -"ST310211A" 194 C "Seagate ST310211A" -"ST310220A" 0 C "Seagate ST310220A" +"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" +"ST3412A" 0 C "Seagate ST3412A" +"ST38641A" 0 C "Seagate ST38641A" +"ST310014A" 194 C "Seagate ST310014A" +"ST310210A" 0 C "Seagate ST310210A" +"ST310211A" 194 C "Seagate ST310211A" +"ST310220A" 0 C "Seagate ST310220A" # SEAGATE ST313021A 13.0GB -"ST313021A" 0 C "Seagate U8 ST313021A" -"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" -"ST315320A" 194 C "Seagate ST315320A" -"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" -"ST320011A" 194 C "Seagate ST320011A" -"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" -"ST320410A" 194 C "Seagate ST320410A" -"ST320413A" 194 C "Seagate ST320413A" -"ST320414A" 194 C "Seagate ST320414A" -"ST320420A" 194 C "Seagate Barracuda II ST320420A" -"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" -"ST330620A" 194 C "Seagate ST330620A" -"ST330621A" 194 C "Seagate ST330621A" -"ST330630A" 194 C "Seagate Barracuda ST330630A" -"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" -"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" -"ST340016A" 194 C "Seagate ST340016A" -"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" -"ST340823A" 194 C "Seagate U Series 5 40823" -"ST340824A" 194 C "Seagate Barracuda III" -"ST360015A" 194 C "Seagate Barracuda V ST360015A" -"ST360020A" 194 C "Seagate U Series 60020" -"ST360021A" 194 C "Seagate Barracuda IV ST360021A" -"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380012A" 194 C "Seagate ST380012A 80GB" -"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" -"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" -"ST380021A" 194 C "Seagate Barracuda IV ST380021A" -"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" -"ST380023A" 194 C "Seagate Barracuda V ST380023A" -"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" -"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" -"ST3120020A" 194 C "Seagate ST3120020A" -"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" -"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" -"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" -"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" -"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" -"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" -"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" -"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" -"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" -"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" -"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" -"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" -"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" -"ST3300831A" 194 C "Seagate 300GB ST3300831A" -"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" -"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" +"ST313021A" 0 C "Seagate U8 ST313021A" +"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" +"ST315320A" 194 C "Seagate ST315320A" +"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" +"ST320011A" 194 C "Seagate ST320011A" +"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" +"ST320410A" 194 C "Seagate ST320410A" +"ST320413A" 194 C "Seagate ST320413A" +"ST320414A" 194 C "Seagate ST320414A" +"ST320420A" 194 C "Seagate Barracuda II ST320420A" +"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" +"ST330620A" 194 C "Seagate ST330620A" +"ST330621A" 194 C "Seagate ST330621A" +"ST330630A" 194 C "Seagate Barracuda ST330630A" +"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" +"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" +"ST340016A" 194 C "Seagate ST340016A" +"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" +"ST340823A" 194 C "Seagate U Series 5 40823" +"ST340824A" 194 C "Seagate Barracuda III" +"ST360015A" 194 C "Seagate Barracuda V ST360015A" +"ST360020A" 194 C "Seagate U Series 60020" +"ST360021A" 194 C "Seagate Barracuda IV ST360021A" +"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380012A" 194 C "Seagate ST380012A 80GB" +"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" +"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" +"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" +"ST380021A" 194 C "Seagate Barracuda IV ST380021A" +"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" +"ST380023A" 194 C "Seagate Barracuda V ST380023A" +"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" +"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" +"ST3120020A" 194 C "Seagate ST3120020A" +"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" +"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" +"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" +"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" +"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" +"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" +"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" +"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" +"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" +"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" +"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" +"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" +"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" +"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" +"ST3300831A" 194 C "Seagate 300GB ST3300831A" +"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" +"ST3802110A" 194 C "Seagate Barracuda 7200.9 80 GB" +"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" "ST9100823A" 194 C "Seagate Momentus 5400.2 100GB" -"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" -"ST94019A" 194 C "Seagate ST94019A" -"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" -"ST94[08]11A" 194 C "Seagate ST94011A" -"ST960821A" 194 C "Seagate ST960821A" -"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" -"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" -"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" +"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" +"ST94019A" 194 C "Seagate ST94019A" +"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" +"ST94[08]11A" 194 C "Seagate ST94011A" +"ST960821A" 194 C "Seagate ST960821A" +"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" +"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" +"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" + ######################################## ############# TOSHIBA Laptops ######################################## -"MK4313MAT" 220 C "Toshiba MK4313MAT" -"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" -"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" -"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" -"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" - -"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" -"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" -"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" - -#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" -"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" -"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" -"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" -"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" +"MK4313MAT" 220 C "Toshiba MK4313MAT" +"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" +"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" +"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" +"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" + +"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" +"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" +"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" + +#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" +"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" +"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" +"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" +"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" "TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" "TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" -"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" -"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" -"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" -"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" +"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" +"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" +"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" +"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" -"MK4025GAS" 194 C "Toshiba MK4025GAS" +"MK4025GAS" 194 C "Toshiba MK4025GAS" ######################################## @@ -345,12 +343,12 @@ # WDC AC310100B and WDC AC2850F are reported not working # no more informations were given "WDC AC22000L" 0 C "Western Digital Caviar AC22000" -"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" +"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" "WDC AC418000D" 231 C "Western Digital AC418000D" "WDC WD135BA" 231 C "Western Digital WD135BA" -"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" -"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" +"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" +"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" #"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" "WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" "WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" @@ -359,7 +357,7 @@ "WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" #"WDC WD400BB-00GFA0" 0 C "" "WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" -"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" +"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" "WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" "WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" "WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" @@ -370,7 +368,7 @@ "WDC WD400VE-75HDT1" 194 C "Western Digital Scorpio 40GB" "WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" "WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" -"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" +"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" "WDC WD600VE-75HDT0" 194 C "Western Digital 600VE-75HDT0" "WDC WD600VE-00HDT0" 194 C "Western Digital 600VE-00HDT0" "WDC WD740GD-00FL21.0" 194 C "Western Digital SATA Raptor" @@ -383,20 +381,20 @@ "WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" "WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" "WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" -"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" +"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" "WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB" "WDC WD800JB-00JJ[AC]0" 194 C "Western Digital WD800JB" "WDC WD800JD-(00|55)(HK|JR)A0" 194 C "Western Digital SATA 80GB, 8MB Cache" "WDC WD800LB-(00|55)DNA0" 194 C "Western Digital Caviar WD800LB 80 Go ATA-100" "WDC WD800VE-07HDT0" 194 C "Western Digital 800VE-07HDT0" "WDC WD1200BB-00(FTA|GUA)0" 194 C "Western Digital Caviar EIDE 2MB Cache" -"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" -"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" -"WDC WD1200JD-00GBB0" 194 C "Western Digital WD1200JD" +"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" +"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" +"WDC WD1200JD-00(GBB|HBC)0" 194 C "Western Digital WD1200JD" "WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" "WDC WD1200SB-01KB[AC]0" 194 C "Western Digital Caviar RE (Raid Edition) 120 GB" "WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" -"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" +"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" "WDC WD2000BB-00FTA0" 194 C "Western Digital WD2000BB" "WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" "WDC WD2000JB-00GVC0" 194 C "Western Digital WD2000JB" @@ -405,9 +403,12 @@ "WDC WD2500JD-(00G|32H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" "WDC WD2500JD-40HBC0" 194 C "Western Digital WD2500JD-40HBC0" "WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" +"WDC WD2500PD-00FZB1" 194 C "Western Digital WD2500PD-00FZB1" +"WDC WD2500SD-01KCB0" 194 C "Western Digital Caviar RE 250GB 8MB" "WDC WD3000JB-00KFA0" 194 C "Western Digital WD3000JB" "WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" "WDC WD4000KD-00NAB0" 194 C "Western Digital Caviar SE16 400GB 16MB" +"WDC WD4000YR-01PLB0" 194 C "Western Digital Caviar RE2 400GB 16MB" # not sure for next # "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" Index: hddtemp.spec =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-5/hddtemp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- hddtemp.spec 26 Feb 2006 15:41:47 -0000 1.16 +++ hddtemp.spec 7 May 2006 16:51:24 -0000 1.17 @@ -1,4 +1,4 @@ -%define beta beta14 +%define beta beta15 Name: hddtemp Version: 0.3 @@ -8,7 +8,7 @@ Group: Applications/System License: GPL URL: http://www.guzu.net/linux/hddtemp.php -Source0: http://www.guzu.net/linux/%{name}-%{version}-%{beta}.tar.bz2 +Source0: http://www.guzu.net/files/%{name}-%{version}-%{beta}.tar.bz2 Source1: http://www.guzu.net/linux/hddtemp.db Source2: %{name}.init Source3: %{name}.sysconfig @@ -28,9 +28,6 @@ %prep %setup -q -n %{name}-%{version}-%{beta} -%{__perl} -pi -e \ - 's|/usr/share/misc/hddtemp\.db\b|%{_datadir}/misc/hddtemp.db|' \ - src/db.h doc/hddtemp.8 cp -p %{SOURCE2} ./hddtemp.init %{__perl} -pi -e \ 's|__ETCDIR__|%{_sysconfdir}|g ; @@ -39,27 +36,23 @@ s|__LOCKDIR__|%{_localstatedir}/lock|g' \ hddtemp.init chmod -x contribs/analyze/* +rm COPYING ; cp -p GPL-2 COPYING %build -%configure --disable-dependency-tracking \ - --with-db-path=%{_datadir}/misc/hddtemp.db +%configure --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/misc/hddtemp.db -install -Dpm 755 hddtemp.init \ - $RPM_BUILD_ROOT%{_initrddir}/hddtemp -install -Dpm 644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp +install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/misc/hddtemp.db +install -Dpm 755 hddtemp.init $RPM_BUILD_ROOT%{_initrddir}/hddtemp +install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hddtemp install -dm 755 $RPM_BUILD_ROOT%{_bindir} ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/hddtemp -install -Dpm 644 %{SOURCE4} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp +install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/hddtemp install -Dpm 644 %{SOURCE5} \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/hddtemp %find_lang %{name} @@ -84,18 +77,22 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO contribs +%doc ChangeLog COPYING README TODO contribs/ %config(noreplace) %{_sysconfdir}/sysconfig/hddtemp %config(noreplace) %{_sysconfdir}/pam.d/hddtemp %config(noreplace) %{_sysconfdir}/security/console.apps/hddtemp %{_initrddir}/hddtemp %{_bindir}/hddtemp %{_sbindir}/hddtemp -%config %{_datadir}/misc/hddtemp.db +%config /usr/share/misc/hddtemp.db %{_mandir}/man8/hddtemp.8* %changelog +* Wed May 3 2006 Ville Skytt?? - 0.3-0.8.beta15 +- 0.3-beta15, drive database 2006-04-26. +- Specfile cleanups. + * Wed Feb 8 2006 Ville Skytt?? - 0.3-0.8.beta14 - Update drive database to 2006-02-07. Index: sources =================================================================== RCS file: /cvs/extras/rpms/hddtemp/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Sep 2005 18:09:14 -0000 1.7 +++ sources 7 May 2006 16:51:24 -0000 1.8 @@ -1 +1 @@ -bbf8be4539495e18bec54af77511a680 hddtemp-0.3-beta14.tar.bz2 +8b829339e1ae9df701684ec239021bb8 hddtemp-0.3-beta15.tar.bz2 From fedora-extras-commits at redhat.com Sun May 7 17:10:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 10:10:44 -0700 Subject: rpms/perl-DBD-XBase/devel perl-DBD-XBase.spec,1.4,1.5 Message-ID: <200605071710.k47HAk4g025273@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-XBase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256 Modified Files: perl-DBD-XBase.spec Log Message: Bugzilla ticket added to the changelog. Index: perl-DBD-XBase.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/perl-DBD-XBase.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DBD-XBase.spec 22 Apr 2006 22:50:48 -0000 1.4 +++ perl-DBD-XBase.spec 7 May 2006 17:10:44 -0000 1.5 @@ -64,7 +64,7 @@ %changelog * Thu Mar 16 2006 Jose Pedro Oliveira - 0.241-4 -- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib. +- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib (#181999). * Fri Feb 17 2006 Jose Pedro Oliveira - 0.241-3 - Rebuild for FC5 (perl 5.8.8). From fedora-extras-commits at redhat.com Sun May 7 17:17:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 10:17:22 -0700 Subject: rpms/perl-DBD-XBase/FC-4 DBD-XBase-0.241-dbfdump-rename.patch, NONE, 1.1 perl-DBD-XBase.spec, 1.2, 1.3 Message-ID: <200605071717.k47HHOpQ025361@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-XBase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25321/FC-4 Modified Files: perl-DBD-XBase.spec Added Files: DBD-XBase-0.241-dbfdump-rename.patch Log Message: dbfdump renamed to dbfdump.pl in order to avoid file conflict with shapelib (#181999) DBD-XBase-0.241-dbfdump-rename.patch: --- NEW FILE DBD-XBase-0.241-dbfdump-rename.patch --- diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.PL DBD-XBase-0.241/bin/dbfdump.PL --- DBD-XBase-0.241-orig/bin/dbfdump.PL 2002-03-07 07:36:02.000000000 +0000 +++ DBD-XBase-0.241/bin/dbfdump.PL 1970-01-01 01:00:00.000000000 +0100 @@ -1,189 +0,0 @@ - -use Config; -my $filename = $0; - -$filename =~ s/\.PL$//; -open OUT,">$filename" or die "Can't create $filename: $!"; -chmod(0755, $filename); -print "Extracting $filename (with #! and variable substitution)\n"; - -print OUT <<"EOHEADER"; -$Config{'startperl'} -w - -EOHEADER - -print OUT <<'EOBODY'; - -use XBase; -use Getopt::Long; -use strict; -$^W = 1; - -my $stdin = 0; - -if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') { - $stdin = 1; pop @ARGV; -} - -my %options; -Getopt::Long::GetOptions( \%options, - 'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s', - 'nomemo', 'memofile=s', 'memosep=s', 'table', - 'SQL', - ) or exit; - -if (defined $options{'version'}) { - print "This is dbfdump version $XBase::VERSION.\n"; - exit; -} - -if ($stdin) { - push @ARGV, '-'; - $options{'nomemo'} = 1; -} - -if (@ARGV == 0 or defined $options{'help'}) { - die <<'EOF'; -Usage: dbfdump [ options ] files - where the options specify - --rs output record separator (default newline) - --fs output field separator (default colon) - --fields comma separated list of fields to print (default all) - --undef what to print for NULL values (default empty string) - --memofile specifies unstandard name of attached memo file - --memosep separator for dBase III dbt's (default \x1a\x1a) - --table output in nice table format (needs Data::ShowTable) - all having as parameter a string; and also - --nomemo do not try to read the memo (dbt/fpt) file - --info only print info about the file and fields - --version print version of the XBase library -EOF -} - -my %addopts = (); -if (defined $options{'nomemo'} or defined $options{'info'}) { - $addopts{'ignorememo'} = 1; -} - -$addopts{'memosep'} = $options{'memosep'}; -$addopts{'memofile'} = $options{'memofile'}; - -if (defined $options{'info'}) { - $addopts{'ignorebadheader'} = 1; -} - -my $file; -for $file (@ARGV) { - my $table = new XBase 'name' => $file, %addopts; - - if (not defined $table) { - print STDERR XBase->errstr; - next; - } - if (defined $options{'info'}) { - if (not defined $options{'SQL'}) { - print $table->header_info; - } else { - my $name = $file; - $name =~ s!^.*/|\.dbf$!!ig; - print "create table $name (\n"; - my @names = $table->field_names; - my %conv = qw! - C varchar - N numeric - F numeric - L boolean - M blob - D date - T time - !; - my @types = map { $conv{$_} } $table->field_types; - my @lengths = $table->field_lengths; - my @decimals = $table->field_decimals; - for (my $i = 0; $i < @names; $i++) { - print "\t$names[$i] $types[$i]"; - if ($types[$i] eq 'blob') { - $lengths[$i] = $decimals[$i] = undef; - } - if ($lengths[$i] or $decimals[$i]) { - print "($lengths[$i]"; - print ", $decimals[$i]" if $decimals[$i]; - print ")"; - } - if (defined $names[$i+1]) { - print ','; - } - print "\n"; - } - print ")\n"; - } - } else { - $table->dump_records(%options) or print STDERR $table->errstr; - } - $table->close; -} - -1; - -__END__ - -=head1 NAME - -dbfdump - Dump the record of the dbf file - -=head1 FORMAT - - dbfdump [options] files - -where options are - - --rs output record separator (default newline) - --fs output field separator (default colon) - --fields comma separated list of fields to print (default all) - --undef string to print for NULL values (default empty) - --memofile specifies unstandard name of attached memo file - --memosep separator for dBase III dbt's (default \x1a\x1a) - - --nomemo do not try to read the memo (dbt/fpt) file - --info print info about the file and fields - with additional --SQL parameter, outputs the SQL create table - --version print version of the XBase library - --table output in nice table format (only available when - Data::ShowTable is installed, overrides rs and fs) - -=head1 SYNOPSIS - - dbfdump -fields id,msg table.dbf - dbfdump -fs=' : ' table - dbfdump --nomemo file.dbf - - ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump - - -=head1 DESCRIPTION - -Dbfdump prints to standard output the content of dbf files listed. By -default, it prints all fields, separated by colons, one record on -a line. The output record and column separators can be changed by -switches on the command line. You can also ask only for some fields to -be printed. - -The content of associated memo files (dbf, fpt) is printed for memo -fields, unless you use the C<--nomemo> option. - -You can specify reading the standard input by putting dash (-) instead -of file name. - -=head1 AUTHOR - -(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz, -http://www.fi.muni.cz/~adelton/ -at Faculty of Informatics, Masaryk University in Brno, Czech Republic - -=head1 SEE ALSO - -perl(1); XBase(3) - -=cut - -EOBODY - diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.pl.PL DBD-XBase-0.241/bin/dbfdump.pl.PL --- DBD-XBase-0.241-orig/bin/dbfdump.pl.PL 1970-01-01 01:00:00.000000000 +0100 +++ DBD-XBase-0.241/bin/dbfdump.pl.PL 2006-03-16 22:17:24.000000000 +0000 @@ -0,0 +1,189 @@ + +use Config; +my $filename = $0; + +$filename =~ s/\.PL$//; +open OUT,">$filename" or die "Can't create $filename: $!"; +chmod(0755, $filename); +print "Extracting $filename (with #! and variable substitution)\n"; + +print OUT <<"EOHEADER"; +$Config{'startperl'} -w + +EOHEADER + +print OUT <<'EOBODY'; + +use XBase; +use Getopt::Long; +use strict; +$^W = 1; + +my $stdin = 0; + +if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') { + $stdin = 1; pop @ARGV; +} + +my %options; +Getopt::Long::GetOptions( \%options, + 'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s', + 'nomemo', 'memofile=s', 'memosep=s', 'table', + 'SQL', + ) or exit; + +if (defined $options{'version'}) { + print "This is dbfdump.pl version $XBase::VERSION.\n"; + exit; +} + +if ($stdin) { + push @ARGV, '-'; + $options{'nomemo'} = 1; +} + +if (@ARGV == 0 or defined $options{'help'}) { + die <<'EOF'; +Usage: dbfdump.pl [ options ] files + where the options specify + --rs output record separator (default newline) + --fs output field separator (default colon) + --fields comma separated list of fields to print (default all) + --undef what to print for NULL values (default empty string) + --memofile specifies unstandard name of attached memo file + --memosep separator for dBase III dbt's (default \x1a\x1a) + --table output in nice table format (needs Data::ShowTable) + all having as parameter a string; and also + --nomemo do not try to read the memo (dbt/fpt) file + --info only print info about the file and fields + --version print version of the XBase library +EOF +} + +my %addopts = (); +if (defined $options{'nomemo'} or defined $options{'info'}) { + $addopts{'ignorememo'} = 1; +} + +$addopts{'memosep'} = $options{'memosep'}; +$addopts{'memofile'} = $options{'memofile'}; + +if (defined $options{'info'}) { + $addopts{'ignorebadheader'} = 1; +} + +my $file; +for $file (@ARGV) { + my $table = new XBase 'name' => $file, %addopts; + + if (not defined $table) { + print STDERR XBase->errstr; + next; + } + if (defined $options{'info'}) { + if (not defined $options{'SQL'}) { + print $table->header_info; + } else { + my $name = $file; + $name =~ s!^.*/|\.dbf$!!ig; + print "create table $name (\n"; + my @names = $table->field_names; + my %conv = qw! + C varchar + N numeric + F numeric + L boolean + M blob + D date + T time + !; + my @types = map { $conv{$_} } $table->field_types; + my @lengths = $table->field_lengths; + my @decimals = $table->field_decimals; + for (my $i = 0; $i < @names; $i++) { + print "\t$names[$i] $types[$i]"; + if ($types[$i] eq 'blob') { + $lengths[$i] = $decimals[$i] = undef; + } + if ($lengths[$i] or $decimals[$i]) { + print "($lengths[$i]"; + print ", $decimals[$i]" if $decimals[$i]; + print ")"; + } + if (defined $names[$i+1]) { + print ','; + } + print "\n"; + } + print ")\n"; + } + } else { + $table->dump_records(%options) or print STDERR $table->errstr; + } + $table->close; +} + +1; + +__END__ + +=head1 NAME + +dbfdump.pl - Dump the record of the dbf file + +=head1 FORMAT + + dbfdump.pl [options] files + +where options are + + --rs output record separator (default newline) + --fs output field separator (default colon) + --fields comma separated list of fields to print (default all) + --undef string to print for NULL values (default empty) + --memofile specifies unstandard name of attached memo file + --memosep separator for dBase III dbt's (default \x1a\x1a) + + --nomemo do not try to read the memo (dbt/fpt) file + --info print info about the file and fields + with additional --SQL parameter, outputs the SQL create table + --version print version of the XBase library + --table output in nice table format (only available when + Data::ShowTable is installed, overrides rs and fs) + +=head1 SYNOPSIS + + dbfdump.pl -fields id,msg table.dbf + dbfdump.pl -fs=' : ' table + dbfdump.pl --nomemo file.dbf + + ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump.pl - + +=head1 DESCRIPTION + +Dbfdump prints to standard output the content of dbf files listed. By +default, it prints all fields, separated by colons, one record on +a line. The output record and column separators can be changed by +switches on the command line. You can also ask only for some fields to +be printed. + +The content of associated memo files (dbf, fpt) is printed for memo +fields, unless you use the C<--nomemo> option. + +You can specify reading the standard input by putting dash (-) instead +of file name. + +=head1 AUTHOR + +(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz, +http://www.fi.muni.cz/~adelton/ +at Faculty of Informatics, Masaryk University in Brno, Czech Republic + +=head1 SEE ALSO + +perl(1); XBase(3) + +=cut + +EOBODY + diff -ruN DBD-XBase-0.241-orig/Changes DBD-XBase-0.241/Changes --- DBD-XBase-0.241-orig/Changes 2003-11-21 14:13:43.000000000 +0000 +++ DBD-XBase-0.241/Changes 2006-03-16 22:09:11.000000000 +0000 @@ -136,7 +136,7 @@ 0.1551 Sat Jan 9 19:21:16 CET 2000 - dbfdump: Accepts --SQL modifier to --info, prints structure + dbfdump.pl: Accepts --SQL modifier to --info, prints structure of the table as a create table SQL. 0.155 Sun Nov 7 15:43:59 CET 1999 @@ -272,7 +272,7 @@ XBase::Memo: we now reset next_for_append to point behind the end of the file, problem pointed out by Artem Belevich. - dbfdump: option --table, --fields now handles intervals. + dbfdump.pl: option --table, --fields now handles intervals. t/2_read.t: fixed problem with order of fields in hash, patch by Andreas J. Koenig. @@ -301,7 +301,7 @@ XBase::SQL: fix of handling of double quoted strings. - dbfdump: memosep and memofile options fixed. + dbfdump.pl: memosep and memofile options fixed. t/4_dbfdump.t: avoided using cat. @@ -427,7 +427,7 @@ 0.0632 Wed May 27 12:27:04 MET DST 1998 - Added --nomemo option to dbfdump. The list of entires is made + Added --nomemo option to dbfdump.pl. The list of entires is made longer in any non-leaf page in ndx. Added check for the magic "FFFF0800" tag in dBaseIV dbt file when reading it. @@ -479,7 +479,7 @@ long selects. Method dump_records now prints directly, doesn't use get_all_records. - Added parameter --info into the script dbfdump to print the + Added parameter --info into the script dbfdump.pl to print the header info. Changed way of determining the type of the dbt file after diff -ruN DBD-XBase-0.241-orig/INSTALL DBD-XBase-0.241/INSTALL --- DBD-XBase-0.241-orig/INSTALL 2003-04-03 18:02:37.000000000 +0100 +++ DBD-XBase-0.241/INSTALL 2006-03-16 22:08:17.000000000 +0000 @@ -43,7 +43,7 @@ If you do not have make or you cannot run it (do you really want to use Perl on that machine?), just copy the content of the DBD-XBase-x.xxx/lib directory to wherever you want to have it. That -should work, even if it won't give you man pages and dbfdump/indexdump +should work, even if it won't give you man pages and dbfdump.pl/indexdump scripts. If you use a platform supported by ActiveState and run ActiveState diff -ruN DBD-XBase-0.241-orig/lib/XBase/FAQ.pod DBD-XBase-0.241/lib/XBase/FAQ.pod --- DBD-XBase-0.241-orig/lib/XBase/FAQ.pod 2002-08-16 10:38:53.000000000 +0100 +++ DBD-XBase-0.241/lib/XBase/FAQ.pod 2006-03-16 22:06:06.000000000 +0000 @@ -175,11 +175,11 @@ to your script and you will see that it's not B problem. -=item The B stops after reading I records ... +=item The B stops after reading I records ... ... why doesn't it read all I<10 x n> records? -Check if the file isn't truncated. C will tell +Check if the file isn't truncated. C will tell you the expected number of records and length of one record, like Filename: file.dbf @@ -191,7 +191,7 @@ Num fields: 40 So the expected length of the file is at least I<1313 + 65 * 1117>. If -it's shorter, you've got damaged file and B only +it's shorter, you've got damaged file and B only reads as much rows as it can find in the dbf. =item How is this B related to B? diff -ruN DBD-XBase-0.241-orig/lib/XBase.pm DBD-XBase-0.241/lib/XBase.pm --- DBD-XBase-0.241-orig/lib/XBase.pm 2003-11-21 14:17:49.000000000 +0000 +++ DBD-XBase-0.241/lib/XBase.pm 2006-03-16 22:05:32.000000000 +0000 @@ -1341,7 +1341,7 @@ $table->dump_records("fs" => " | ", "rs" => " <-+\n", "fields" => [ "id", "msg" ]);' -Also note that there is a script dbfdump(1) that does the printing. +Also note that there is a script dbfdump.pl(1) that does the printing. =head2 Errors and debugging @@ -1423,7 +1423,7 @@ =head1 SEE ALSO perl(1); XBase::FAQ(3); DBD::XBase(3) and DBI(3) for DBI interface; -dbfdump(1) +dbfdump.pl(1) =cut diff -ruN DBD-XBase-0.241-orig/Makefile.PL DBD-XBase-0.241/Makefile.PL --- DBD-XBase-0.241-orig/Makefile.PL 2003-04-03 17:37:19.000000000 +0100 +++ DBD-XBase-0.241/Makefile.PL 2006-03-16 22:20:20.000000000 +0000 @@ -41,11 +41,11 @@ 'AUTHOR' => 'Jan Pazdziora (adelton at fi.muni.cz)', 'ABSTRACT' => 'Reads and writes XBase (dbf) files, includes DBI support', ) : ()), - 'PL_FILES' => { 'bin/dbfdump.PL' => 'bin/dbfdump', + 'PL_FILES' => { 'bin/dbfdump.pl.PL' => 'bin/dbfdump.pl', 'bin/indexdump.PL' => 'bin/indexdump' }, - 'EXE_FILES' => [ 'bin/dbfdump', ' bin/indexdump' ], + 'EXE_FILES' => [ 'bin/dbfdump.pl', ' bin/indexdump' ], 'dist' => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', POSTOP => 'mv $(DISTNAME)-$(VERSION).tar.gz ../' }, - 'clean' => { FILES => 'bin/dbfdump bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '}, + 'clean' => { FILES => 'bin/dbfdump.pl bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '}, ); diff -ruN DBD-XBase-0.241-orig/MANIFEST DBD-XBase-0.241/MANIFEST --- DBD-XBase-0.241-orig/MANIFEST 2003-07-07 19:30:41.000000000 +0100 +++ DBD-XBase-0.241/MANIFEST 2006-03-16 22:20:06.000000000 +0000 @@ -4,7 +4,7 @@ Makefile.PL README ToDo -bin/dbfdump.PL +bin/dbfdump.pl.PL bin/indexdump.PL dbit/00base.t dbit/10dsnlist.t diff -ruN DBD-XBase-0.241-orig/new-XBase DBD-XBase-0.241/new-XBase --- DBD-XBase-0.241-orig/new-XBase 2001-02-06 10:44:13.000000000 +0000 +++ DBD-XBase-0.241/new-XBase 2006-03-16 22:09:55.000000000 +0000 @@ -395,7 +395,7 @@ $table->dump_records("fs" => " | ", "rs" => " <-+\n", "fields" => [ "id", "msg" ]);' -Also note that there is a command line script dbfdump(1) that does +Also note that there is a command line script dbfdump.pl(1) that does the printing. =head1 Writing the data @@ -597,7 +597,7 @@ XBase::FAQ(3); XBase::Index(3); DBD::XBase(3) and DBI(3) for DBI interface; -dbfdump(1); perl(1) +dbfdump.pl(1); perl(1) =cut diff -ruN DBD-XBase-0.241-orig/README DBD-XBase-0.241/README --- DBD-XBase-0.241-orig/README 2003-04-03 18:02:47.000000000 +0100 +++ DBD-XBase-0.241/README 2006-03-16 22:09:29.000000000 +0000 @@ -48,7 +48,7 @@ my $table = new XBase 'table.dbf'; my @data = $table->get_record(0); - The distribution also includes a dbfdump script that prints + The distribution also includes a dbfdump.pl script that prints the content of the table in readable form. @@ -75,7 +75,7 @@ native XBase engines produce data incompatible with this module. - Man pages for XBase, DBD::XBase, dbfdump, XBase::Index and + Man pages for XBase, DBD::XBase, dbfdump.pl, XBase::Index and XBase::SDBM are included, examples of little scripts can also be found in eg/ directory of the distribution. Read the DBI man page for DBI specific issues, and the XBase::FAQ page. diff -ruN DBD-XBase-0.241-orig/t/4_dbfdump.t DBD-XBase-0.241/t/4_dbfdump.t --- DBD-XBase-0.241-orig/t/4_dbfdump.t 2002-05-15 17:18:09.000000000 +0100 +++ DBD-XBase-0.241/t/4_dbfdump.t 2006-03-16 22:07:14.000000000 +0000 @@ -9,13 +9,13 @@ use ExtUtils::testlib; my $libs = join " -I", '', @INC; -my $dbfdump = "$dir/blib/script/dbfdump"; +my $dbfdump = "$dir/blib/script/dbfdump.pl"; my $expected = join '', ; my $result = ''; my $command = qq!$^X $libs $dbfdump "$dir/t/rooms.dbf"!; -print "Running dbfdump rooms.dbf: $command\n"; +print "Running dbfdump.pl rooms.dbf: $command\n"; $result = `$command`; if ($result ne $expected) @@ -23,7 +23,7 @@ print "ok 1\n"; $command = qq!$^X $libs $dbfdump -- - < "$dir/t/rooms.dbf"!; -print "Running stdin dbfdump < rooms.dbf: $command\n"; +print "Running stdin dbfdump.pl < rooms.dbf: $command\n"; $result = `$command`; if ($result ne $expected) Index: perl-DBD-XBase.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-XBase/FC-4/perl-DBD-XBase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-XBase.spec 16 Dec 2005 11:40:40 -0000 1.2 +++ perl-DBD-XBase.spec 7 May 2006 17:17:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-DBD-XBase Version: 0.241 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Perl module for reading and writing the dbf files Group: Development/Libraries @@ -8,6 +8,7 @@ URL: http://search.cpan.org/dist/DBD-XBase/ Source0: http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz Patch0: DBD-XBase-0.241-indexdump.PL.patch +Patch1: DBD-XBase-0.241-dbfdump-rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +27,7 @@ %prep %setup -q -n DBD-XBase-%{version} %patch0 -p1 +%patch1 -p1 chmod a-x eg/*table %build @@ -61,6 +63,12 @@ %changelog +* Thu Mar 16 2006 Jose Pedro Oliveira - 0.241-4 +- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib (#181999). + +* Fri Feb 17 2006 Jose Pedro Oliveira - 0.241-3 +- Rebuild for FC5 (perl 5.8.8). + * Fri Dec 16 2005 Jose Pedro Oliveira - 0.241-2 - Patch to remove the duplicate shebang line in bin/indexdump (#175895). From fedora-extras-commits at redhat.com Sun May 7 17:17:23 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 10:17:23 -0700 Subject: rpms/perl-DBD-XBase/FC-5 DBD-XBase-0.241-dbfdump-rename.patch, NONE, 1.1 perl-DBD-XBase.spec, 1.3, 1.4 Message-ID: <200605071717.k47HHP0p025367@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-XBase/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25321/FC-5 Modified Files: perl-DBD-XBase.spec Added Files: DBD-XBase-0.241-dbfdump-rename.patch Log Message: dbfdump renamed to dbfdump.pl in order to avoid file conflict with shapelib (#181999) DBD-XBase-0.241-dbfdump-rename.patch: --- NEW FILE DBD-XBase-0.241-dbfdump-rename.patch --- diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.PL DBD-XBase-0.241/bin/dbfdump.PL --- DBD-XBase-0.241-orig/bin/dbfdump.PL 2002-03-07 07:36:02.000000000 +0000 +++ DBD-XBase-0.241/bin/dbfdump.PL 1970-01-01 01:00:00.000000000 +0100 @@ -1,189 +0,0 @@ - -use Config; -my $filename = $0; - -$filename =~ s/\.PL$//; -open OUT,">$filename" or die "Can't create $filename: $!"; -chmod(0755, $filename); -print "Extracting $filename (with #! and variable substitution)\n"; - -print OUT <<"EOHEADER"; -$Config{'startperl'} -w - -EOHEADER - -print OUT <<'EOBODY'; - -use XBase; -use Getopt::Long; -use strict; -$^W = 1; - -my $stdin = 0; - -if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') { - $stdin = 1; pop @ARGV; -} - -my %options; -Getopt::Long::GetOptions( \%options, - 'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s', - 'nomemo', 'memofile=s', 'memosep=s', 'table', - 'SQL', - ) or exit; - -if (defined $options{'version'}) { - print "This is dbfdump version $XBase::VERSION.\n"; - exit; -} - -if ($stdin) { - push @ARGV, '-'; - $options{'nomemo'} = 1; -} - -if (@ARGV == 0 or defined $options{'help'}) { - die <<'EOF'; -Usage: dbfdump [ options ] files - where the options specify - --rs output record separator (default newline) - --fs output field separator (default colon) - --fields comma separated list of fields to print (default all) - --undef what to print for NULL values (default empty string) - --memofile specifies unstandard name of attached memo file - --memosep separator for dBase III dbt's (default \x1a\x1a) - --table output in nice table format (needs Data::ShowTable) - all having as parameter a string; and also - --nomemo do not try to read the memo (dbt/fpt) file - --info only print info about the file and fields - --version print version of the XBase library -EOF -} - -my %addopts = (); -if (defined $options{'nomemo'} or defined $options{'info'}) { - $addopts{'ignorememo'} = 1; -} - -$addopts{'memosep'} = $options{'memosep'}; -$addopts{'memofile'} = $options{'memofile'}; - -if (defined $options{'info'}) { - $addopts{'ignorebadheader'} = 1; -} - -my $file; -for $file (@ARGV) { - my $table = new XBase 'name' => $file, %addopts; - - if (not defined $table) { - print STDERR XBase->errstr; - next; - } - if (defined $options{'info'}) { - if (not defined $options{'SQL'}) { - print $table->header_info; - } else { - my $name = $file; - $name =~ s!^.*/|\.dbf$!!ig; - print "create table $name (\n"; - my @names = $table->field_names; - my %conv = qw! - C varchar - N numeric - F numeric - L boolean - M blob - D date - T time - !; - my @types = map { $conv{$_} } $table->field_types; - my @lengths = $table->field_lengths; - my @decimals = $table->field_decimals; - for (my $i = 0; $i < @names; $i++) { - print "\t$names[$i] $types[$i]"; - if ($types[$i] eq 'blob') { - $lengths[$i] = $decimals[$i] = undef; - } - if ($lengths[$i] or $decimals[$i]) { - print "($lengths[$i]"; - print ", $decimals[$i]" if $decimals[$i]; - print ")"; - } - if (defined $names[$i+1]) { - print ','; - } - print "\n"; - } - print ")\n"; - } - } else { - $table->dump_records(%options) or print STDERR $table->errstr; - } - $table->close; -} - -1; - -__END__ - -=head1 NAME - -dbfdump - Dump the record of the dbf file - -=head1 FORMAT - - dbfdump [options] files - -where options are - - --rs output record separator (default newline) - --fs output field separator (default colon) - --fields comma separated list of fields to print (default all) - --undef string to print for NULL values (default empty) - --memofile specifies unstandard name of attached memo file - --memosep separator for dBase III dbt's (default \x1a\x1a) - - --nomemo do not try to read the memo (dbt/fpt) file - --info print info about the file and fields - with additional --SQL parameter, outputs the SQL create table - --version print version of the XBase library - --table output in nice table format (only available when - Data::ShowTable is installed, overrides rs and fs) - -=head1 SYNOPSIS - - dbfdump -fields id,msg table.dbf - dbfdump -fs=' : ' table - dbfdump --nomemo file.dbf - - ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump - - -=head1 DESCRIPTION - -Dbfdump prints to standard output the content of dbf files listed. By -default, it prints all fields, separated by colons, one record on -a line. The output record and column separators can be changed by -switches on the command line. You can also ask only for some fields to -be printed. - -The content of associated memo files (dbf, fpt) is printed for memo -fields, unless you use the C<--nomemo> option. - -You can specify reading the standard input by putting dash (-) instead -of file name. - -=head1 AUTHOR - -(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz, -http://www.fi.muni.cz/~adelton/ -at Faculty of Informatics, Masaryk University in Brno, Czech Republic - -=head1 SEE ALSO - -perl(1); XBase(3) - -=cut - -EOBODY - diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.pl.PL DBD-XBase-0.241/bin/dbfdump.pl.PL --- DBD-XBase-0.241-orig/bin/dbfdump.pl.PL 1970-01-01 01:00:00.000000000 +0100 +++ DBD-XBase-0.241/bin/dbfdump.pl.PL 2006-03-16 22:17:24.000000000 +0000 @@ -0,0 +1,189 @@ + +use Config; +my $filename = $0; + +$filename =~ s/\.PL$//; +open OUT,">$filename" or die "Can't create $filename: $!"; +chmod(0755, $filename); +print "Extracting $filename (with #! and variable substitution)\n"; + +print OUT <<"EOHEADER"; +$Config{'startperl'} -w + +EOHEADER + +print OUT <<'EOBODY'; + +use XBase; +use Getopt::Long; +use strict; +$^W = 1; + +my $stdin = 0; + +if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') { + $stdin = 1; pop @ARGV; +} + +my %options; +Getopt::Long::GetOptions( \%options, + 'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s', + 'nomemo', 'memofile=s', 'memosep=s', 'table', + 'SQL', + ) or exit; + +if (defined $options{'version'}) { + print "This is dbfdump.pl version $XBase::VERSION.\n"; + exit; +} + +if ($stdin) { + push @ARGV, '-'; + $options{'nomemo'} = 1; +} + +if (@ARGV == 0 or defined $options{'help'}) { + die <<'EOF'; +Usage: dbfdump.pl [ options ] files + where the options specify + --rs output record separator (default newline) + --fs output field separator (default colon) + --fields comma separated list of fields to print (default all) + --undef what to print for NULL values (default empty string) + --memofile specifies unstandard name of attached memo file + --memosep separator for dBase III dbt's (default \x1a\x1a) + --table output in nice table format (needs Data::ShowTable) + all having as parameter a string; and also + --nomemo do not try to read the memo (dbt/fpt) file + --info only print info about the file and fields + --version print version of the XBase library +EOF +} + +my %addopts = (); +if (defined $options{'nomemo'} or defined $options{'info'}) { + $addopts{'ignorememo'} = 1; +} + +$addopts{'memosep'} = $options{'memosep'}; +$addopts{'memofile'} = $options{'memofile'}; + +if (defined $options{'info'}) { + $addopts{'ignorebadheader'} = 1; +} + +my $file; +for $file (@ARGV) { + my $table = new XBase 'name' => $file, %addopts; + + if (not defined $table) { + print STDERR XBase->errstr; + next; + } + if (defined $options{'info'}) { + if (not defined $options{'SQL'}) { + print $table->header_info; + } else { + my $name = $file; + $name =~ s!^.*/|\.dbf$!!ig; + print "create table $name (\n"; + my @names = $table->field_names; + my %conv = qw! + C varchar + N numeric + F numeric + L boolean + M blob + D date + T time + !; + my @types = map { $conv{$_} } $table->field_types; + my @lengths = $table->field_lengths; + my @decimals = $table->field_decimals; + for (my $i = 0; $i < @names; $i++) { + print "\t$names[$i] $types[$i]"; + if ($types[$i] eq 'blob') { + $lengths[$i] = $decimals[$i] = undef; + } + if ($lengths[$i] or $decimals[$i]) { + print "($lengths[$i]"; + print ", $decimals[$i]" if $decimals[$i]; + print ")"; + } + if (defined $names[$i+1]) { + print ','; + } + print "\n"; + } + print ")\n"; + } + } else { + $table->dump_records(%options) or print STDERR $table->errstr; + } + $table->close; +} + +1; + +__END__ + +=head1 NAME + +dbfdump.pl - Dump the record of the dbf file + +=head1 FORMAT + + dbfdump.pl [options] files + +where options are + + --rs output record separator (default newline) + --fs output field separator (default colon) + --fields comma separated list of fields to print (default all) + --undef string to print for NULL values (default empty) + --memofile specifies unstandard name of attached memo file + --memosep separator for dBase III dbt's (default \x1a\x1a) + + --nomemo do not try to read the memo (dbt/fpt) file + --info print info about the file and fields + with additional --SQL parameter, outputs the SQL create table + --version print version of the XBase library + --table output in nice table format (only available when + Data::ShowTable is installed, overrides rs and fs) + +=head1 SYNOPSIS + + dbfdump.pl -fields id,msg table.dbf + dbfdump.pl -fs=' : ' table + dbfdump.pl --nomemo file.dbf + + ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump.pl - + +=head1 DESCRIPTION + +Dbfdump prints to standard output the content of dbf files listed. By +default, it prints all fields, separated by colons, one record on +a line. The output record and column separators can be changed by +switches on the command line. You can also ask only for some fields to +be printed. + +The content of associated memo files (dbf, fpt) is printed for memo +fields, unless you use the C<--nomemo> option. + +You can specify reading the standard input by putting dash (-) instead +of file name. + +=head1 AUTHOR + +(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz, +http://www.fi.muni.cz/~adelton/ +at Faculty of Informatics, Masaryk University in Brno, Czech Republic + +=head1 SEE ALSO + +perl(1); XBase(3) + +=cut + +EOBODY + diff -ruN DBD-XBase-0.241-orig/Changes DBD-XBase-0.241/Changes --- DBD-XBase-0.241-orig/Changes 2003-11-21 14:13:43.000000000 +0000 +++ DBD-XBase-0.241/Changes 2006-03-16 22:09:11.000000000 +0000 @@ -136,7 +136,7 @@ 0.1551 Sat Jan 9 19:21:16 CET 2000 - dbfdump: Accepts --SQL modifier to --info, prints structure + dbfdump.pl: Accepts --SQL modifier to --info, prints structure of the table as a create table SQL. 0.155 Sun Nov 7 15:43:59 CET 1999 @@ -272,7 +272,7 @@ XBase::Memo: we now reset next_for_append to point behind the end of the file, problem pointed out by Artem Belevich. - dbfdump: option --table, --fields now handles intervals. + dbfdump.pl: option --table, --fields now handles intervals. t/2_read.t: fixed problem with order of fields in hash, patch by Andreas J. Koenig. @@ -301,7 +301,7 @@ XBase::SQL: fix of handling of double quoted strings. - dbfdump: memosep and memofile options fixed. + dbfdump.pl: memosep and memofile options fixed. t/4_dbfdump.t: avoided using cat. @@ -427,7 +427,7 @@ 0.0632 Wed May 27 12:27:04 MET DST 1998 - Added --nomemo option to dbfdump. The list of entires is made + Added --nomemo option to dbfdump.pl. The list of entires is made longer in any non-leaf page in ndx. Added check for the magic "FFFF0800" tag in dBaseIV dbt file when reading it. @@ -479,7 +479,7 @@ long selects. Method dump_records now prints directly, doesn't use get_all_records. - Added parameter --info into the script dbfdump to print the + Added parameter --info into the script dbfdump.pl to print the header info. Changed way of determining the type of the dbt file after diff -ruN DBD-XBase-0.241-orig/INSTALL DBD-XBase-0.241/INSTALL --- DBD-XBase-0.241-orig/INSTALL 2003-04-03 18:02:37.000000000 +0100 +++ DBD-XBase-0.241/INSTALL 2006-03-16 22:08:17.000000000 +0000 @@ -43,7 +43,7 @@ If you do not have make or you cannot run it (do you really want to use Perl on that machine?), just copy the content of the DBD-XBase-x.xxx/lib directory to wherever you want to have it. That -should work, even if it won't give you man pages and dbfdump/indexdump +should work, even if it won't give you man pages and dbfdump.pl/indexdump scripts. If you use a platform supported by ActiveState and run ActiveState diff -ruN DBD-XBase-0.241-orig/lib/XBase/FAQ.pod DBD-XBase-0.241/lib/XBase/FAQ.pod --- DBD-XBase-0.241-orig/lib/XBase/FAQ.pod 2002-08-16 10:38:53.000000000 +0100 +++ DBD-XBase-0.241/lib/XBase/FAQ.pod 2006-03-16 22:06:06.000000000 +0000 @@ -175,11 +175,11 @@ to your script and you will see that it's not B problem. -=item The B stops after reading I records ... +=item The B stops after reading I records ... ... why doesn't it read all I<10 x n> records? -Check if the file isn't truncated. C will tell +Check if the file isn't truncated. C will tell you the expected number of records and length of one record, like Filename: file.dbf @@ -191,7 +191,7 @@ Num fields: 40 So the expected length of the file is at least I<1313 + 65 * 1117>. If -it's shorter, you've got damaged file and B only +it's shorter, you've got damaged file and B only reads as much rows as it can find in the dbf. =item How is this B related to B? diff -ruN DBD-XBase-0.241-orig/lib/XBase.pm DBD-XBase-0.241/lib/XBase.pm --- DBD-XBase-0.241-orig/lib/XBase.pm 2003-11-21 14:17:49.000000000 +0000 +++ DBD-XBase-0.241/lib/XBase.pm 2006-03-16 22:05:32.000000000 +0000 @@ -1341,7 +1341,7 @@ $table->dump_records("fs" => " | ", "rs" => " <-+\n", "fields" => [ "id", "msg" ]);' -Also note that there is a script dbfdump(1) that does the printing. +Also note that there is a script dbfdump.pl(1) that does the printing. =head2 Errors and debugging @@ -1423,7 +1423,7 @@ =head1 SEE ALSO perl(1); XBase::FAQ(3); DBD::XBase(3) and DBI(3) for DBI interface; -dbfdump(1) +dbfdump.pl(1) =cut diff -ruN DBD-XBase-0.241-orig/Makefile.PL DBD-XBase-0.241/Makefile.PL --- DBD-XBase-0.241-orig/Makefile.PL 2003-04-03 17:37:19.000000000 +0100 +++ DBD-XBase-0.241/Makefile.PL 2006-03-16 22:20:20.000000000 +0000 @@ -41,11 +41,11 @@ 'AUTHOR' => 'Jan Pazdziora (adelton at fi.muni.cz)', 'ABSTRACT' => 'Reads and writes XBase (dbf) files, includes DBI support', ) : ()), - 'PL_FILES' => { 'bin/dbfdump.PL' => 'bin/dbfdump', + 'PL_FILES' => { 'bin/dbfdump.pl.PL' => 'bin/dbfdump.pl', 'bin/indexdump.PL' => 'bin/indexdump' }, - 'EXE_FILES' => [ 'bin/dbfdump', ' bin/indexdump' ], + 'EXE_FILES' => [ 'bin/dbfdump.pl', ' bin/indexdump' ], 'dist' => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', POSTOP => 'mv $(DISTNAME)-$(VERSION).tar.gz ../' }, - 'clean' => { FILES => 'bin/dbfdump bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '}, + 'clean' => { FILES => 'bin/dbfdump.pl bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '}, ); diff -ruN DBD-XBase-0.241-orig/MANIFEST DBD-XBase-0.241/MANIFEST --- DBD-XBase-0.241-orig/MANIFEST 2003-07-07 19:30:41.000000000 +0100 +++ DBD-XBase-0.241/MANIFEST 2006-03-16 22:20:06.000000000 +0000 @@ -4,7 +4,7 @@ Makefile.PL README ToDo -bin/dbfdump.PL +bin/dbfdump.pl.PL bin/indexdump.PL dbit/00base.t dbit/10dsnlist.t diff -ruN DBD-XBase-0.241-orig/new-XBase DBD-XBase-0.241/new-XBase --- DBD-XBase-0.241-orig/new-XBase 2001-02-06 10:44:13.000000000 +0000 +++ DBD-XBase-0.241/new-XBase 2006-03-16 22:09:55.000000000 +0000 @@ -395,7 +395,7 @@ $table->dump_records("fs" => " | ", "rs" => " <-+\n", "fields" => [ "id", "msg" ]);' -Also note that there is a command line script dbfdump(1) that does +Also note that there is a command line script dbfdump.pl(1) that does the printing. =head1 Writing the data @@ -597,7 +597,7 @@ XBase::FAQ(3); XBase::Index(3); DBD::XBase(3) and DBI(3) for DBI interface; -dbfdump(1); perl(1) +dbfdump.pl(1); perl(1) =cut diff -ruN DBD-XBase-0.241-orig/README DBD-XBase-0.241/README --- DBD-XBase-0.241-orig/README 2003-04-03 18:02:47.000000000 +0100 +++ DBD-XBase-0.241/README 2006-03-16 22:09:29.000000000 +0000 @@ -48,7 +48,7 @@ my $table = new XBase 'table.dbf'; my @data = $table->get_record(0); - The distribution also includes a dbfdump script that prints + The distribution also includes a dbfdump.pl script that prints the content of the table in readable form. @@ -75,7 +75,7 @@ native XBase engines produce data incompatible with this module. - Man pages for XBase, DBD::XBase, dbfdump, XBase::Index and + Man pages for XBase, DBD::XBase, dbfdump.pl, XBase::Index and XBase::SDBM are included, examples of little scripts can also be found in eg/ directory of the distribution. Read the DBI man page for DBI specific issues, and the XBase::FAQ page. diff -ruN DBD-XBase-0.241-orig/t/4_dbfdump.t DBD-XBase-0.241/t/4_dbfdump.t --- DBD-XBase-0.241-orig/t/4_dbfdump.t 2002-05-15 17:18:09.000000000 +0100 +++ DBD-XBase-0.241/t/4_dbfdump.t 2006-03-16 22:07:14.000000000 +0000 @@ -9,13 +9,13 @@ use ExtUtils::testlib; my $libs = join " -I", '', @INC; -my $dbfdump = "$dir/blib/script/dbfdump"; +my $dbfdump = "$dir/blib/script/dbfdump.pl"; my $expected = join '', ; my $result = ''; my $command = qq!$^X $libs $dbfdump "$dir/t/rooms.dbf"!; -print "Running dbfdump rooms.dbf: $command\n"; +print "Running dbfdump.pl rooms.dbf: $command\n"; $result = `$command`; if ($result ne $expected) @@ -23,7 +23,7 @@ print "ok 1\n"; $command = qq!$^X $libs $dbfdump -- - < "$dir/t/rooms.dbf"!; -print "Running stdin dbfdump < rooms.dbf: $command\n"; +print "Running stdin dbfdump.pl < rooms.dbf: $command\n"; $result = `$command`; if ($result ne $expected) Index: perl-DBD-XBase.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-XBase/FC-5/perl-DBD-XBase.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-DBD-XBase.spec 17 Feb 2006 18:33:17 -0000 1.3 +++ perl-DBD-XBase.spec 7 May 2006 17:17:23 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-DBD-XBase Version: 0.241 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module for reading and writing the dbf files Group: Development/Libraries @@ -8,6 +8,7 @@ URL: http://search.cpan.org/dist/DBD-XBase/ Source0: http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz Patch0: DBD-XBase-0.241-indexdump.PL.patch +Patch1: DBD-XBase-0.241-dbfdump-rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +27,7 @@ %prep %setup -q -n DBD-XBase-%{version} %patch0 -p1 +%patch1 -p1 chmod a-x eg/*table %build @@ -61,6 +63,9 @@ %changelog +* Thu Mar 16 2006 Jose Pedro Oliveira - 0.241-4 +- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib (#181999). + * Fri Feb 17 2006 Jose Pedro Oliveira - 0.241-3 - Rebuild for FC5 (perl 5.8.8). From fedora-extras-commits at redhat.com Sun May 7 17:40:06 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:40:06 -0700 Subject: rpms/scribes - New directory Message-ID: <200605071740.k47He86Q025606@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25580/scribes Log Message: Directory /cvs/extras/rpms/scribes added to the repository From fedora-extras-commits at redhat.com Sun May 7 17:40:07 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:40:07 -0700 Subject: rpms/scribes/devel - New directory Message-ID: <200605071740.k47He9pY025609@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25580/scribes/devel Log Message: Directory /cvs/extras/rpms/scribes/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 17:40:40 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:40:40 -0700 Subject: rpms/scribes Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605071740.k47HegRn025658@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25625 Added Files: Makefile import.log Log Message: Setup of module scribes --- NEW FILE Makefile --- # Top level Makefile for module scribes all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 17:40:41 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:40:41 -0700 Subject: rpms/scribes/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605071740.k47HeheQ025661@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25625/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scribes --- NEW 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 May 7 17:42:33 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:42:33 -0700 Subject: rpms/scribes import.log,1.1,1.2 Message-ID: <200605071742.k47HgatI025758@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25722 Modified Files: import.log Log Message: auto-import scribes-0.2.4.3-3 on branch devel from scribes-0.2.4.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scribes/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 17:40:40 -0000 1.1 +++ import.log 7 May 2006 17:42:33 -0000 1.2 @@ -0,0 +1 @@ +scribes-0_2_4_3-3:HEAD:scribes-0.2.4.3-3.src.rpm:1147023733 From fedora-extras-commits at redhat.com Sun May 7 17:42:34 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:42:34 -0700 Subject: rpms/scribes/devel scribes.spec, NONE, 1.1 setup-install-gconf-schemas.patch, NONE, 1.1 setup-no-dep-check.patch, NONE, 1.1 setup-no-manual-gconf.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605071742.k47Hga4s025769@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25722/devel Modified Files: .cvsignore sources Added Files: scribes.spec setup-install-gconf-schemas.patch setup-no-dep-check.patch setup-no-manual-gconf.patch Log Message: auto-import scribes-0.2.4.3-3 on branch devel from scribes-0.2.4.3-3.src.rpm --- NEW FILE scribes.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define python_module_name Scribes Name: scribes Version: 0.2.4.3 Release: 3%{?dist} Summary: A sleek, simple, and powerful text editor for the GNOME desktop Group: Applications/Editors License: GPL URL: http://scribes.sourceforge.net/ Source0: http://openusability.org/download.php/93/%{name}-%{version}.tar.gz Patch0: setup-no-dep-check.patch Patch1: setup-install-gconf-schemas.patch Patch2: setup-no-manual-gconf.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils Requires: gnome-python2-gtkspell >= 2.12 Requires: gnome-python2-gtksourceview >= 2.12 Requires: pygtk2 >= 2.8 Requires(pre): GConf2 Requires(post): GConf2 Requires(post): scrollkeeper Requires(preun): GConf2 Requires(postun): scrollkeeper %description Scribes is a simple and sleek text editor for the the GNOME desktop. It focuses on keeping the working environment free from distractions, and providing strong automation of mundane, repetitive tasks. Through this simplicity, Scribes is very powerful. Its many features include: * A dynamic templating system (called Snippets), * Automatic completion of indentifiers and bracketing, * Automatic indentation and file saving, * Bookmarks, * Drag-and-drop functionality, * Full support for Unicode (UTF-8) text (and many other encodings), * Syntax highlighting for over 30 programming languages, * Powerful GNOME integration * Translations into several different languages, ...and more are in development! In order to make use of its runtime documentation facilities, you will need to install Yelp. %prep %setup -q %patch0 -p0 %patch1 -p0 %patch2 -p0 %build %{__python} setup.py build %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||: fi %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %find_lang %{name} desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --delete-original \ %{buildroot}/%{_datadir}/applications/scribes.desktop chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/findbar.py chmod a+x %{buildroot}/%{python_sitelib}/%{python_module_name}/license.py %post export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||: update-desktop-database &> /dev/null ||: %clean rm -rf %{buildroot} %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: fi %postun update-desktop-database &> /dev/null ||: %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS CHANGELOG README TODO TRANSLATORS COPYING %{_bindir}/%{name} %dir %{python_sitelib}/%{python_module_name} %{python_sitelib}/%{python_module_name}/*.py %{python_sitelib}/%{python_module_name}/*.pyc %ghost %{python_sitelib}/%{python_module_name}/*.pyo %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.svg %{_datadir}/application-registry/%{name}.application %{_datadir}/gnome/help/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/omf/%{name}/ %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog * Sat May 06 2006 Peter Gordon - 0.2.4.3-3 - Removed yelp Requires; added scrollkeeper as Requires(post) and Requires(postun) - Dropped gconfd-2 killall statements in the scriptlets (not needed in FC5+). - Thanks to Brian Pepple (Bug #189727). * Tue Apr 25 2006 Peter Gordon - 0.2.4.3-2 - Added patch to remove unnecessary gconf foo in the setup.py script. - Fix a few spacing inconsistencies in the .spec file. * Sat Apr 22 2006 Peter Gordon - 0.2.4.3-1 - Initial packaging. setup-install-gconf-schemas.patch: --- NEW FILE setup-install-gconf-schemas.patch --- --- setup.py 2006-04-22 18:29:10.000000000 -0700 +++ patched-setup.py 2006-04-22 18:35:33.000000000 -0700 @@ -82,6 +82,7 @@ license="GNU GPL v2 and above", packages=["Scribes"], data_files=[ + ("/etc/gconf/schemas", ["data/scribes.schemas"]), ("share/applications", ["data/scribes.desktop"]), ("share/application-registry", ["data/scribes.application"]), ("share/pixmaps", ["data/scribes.svg"]), setup-no-dep-check.patch: --- NEW FILE setup-no-dep-check.patch --- --- setup.py 2006-03-04 12:28:07.916137104 -0500 +++ patch.py 2006-03-26 18:54:39.614303696 -0500 @@ -42,94 +42,6 @@ from distutils.core import setup from Scribes.info import version - -def check_dependencies(): - u""" - Check for Scribes' runtime software dependencies. - - The function aborts the installation process if runtime software - dependencies are not met by the host system. - - """ - - try: - - import pygtk - pygtk.require("2.0") - import gtk - - if gtk.pygtk_version < (2, 8, 0): - - raise ImportError - - except ImportError: - - print "You need PyGTK version 2.8 or later to run Scribes." - exit(1) - - try: - - import pygtk - pygtk.require("2.0") - import gnome - - if gnome.gnome_python_version < (2, 12, 0): - - raise ImportError - - except ImportError: - - print "You need GNOME Python version 2.12 or later to run Scribes" - exit(1) - - try: - - import pygtk - pygtk.require("2.0") - import gtksourceview - - except ImportError: - - print "You need the gtksourceview module in GNOME Python Extras version" - print " 2.12 or later to run Scribes." - exit(1) - - try: - - import pygtk - pygtk.require("2.0") - import gtkspell - - except ImportError: - - print "You need the gtkspell module in GNOME Python Extras version" - print " 2.12 or later to run Scribes." - exit(1) - - # Check to see if Yelp is installed on the host system - - cmd = "which yelp" - err, out = getstatusoutput(cmd) - - if err: - - print "You need Yelp version 2.12 or later to run Scribes." - exit(1) - - # Check to see if GConf is installed on the host system - - cmd = "which gconftool-2" - err, out = getstatusoutput(cmd) - - if err: - - print "You need GConf version 2.12 or later to run Scribes." - exit(1) - - return - -check_dependencies() - # Trove classification classifiers = """ setup-no-manual-gconf.patch: --- NEW FILE setup-no-manual-gconf.patch --- --- setup.py 2006-04-25 20:55:16.000000000 -0700 +++ patch.py 2006-04-25 20:58:52.000000000 -0700 @@ -101,48 +101,3 @@ "data/scribes_editing.png", "data/scribes_status.png"]) ], scripts=["scribes"],) - - -################################################################################ -# -# GConf Installation -# -################################################################################ - -# Get gconf's default source -cmd = "gconftool-2 --get-default-source" -err, out = getstatusoutput(cmd) - -# Set up the gconf environment variable. -putenv('GCONF_CONFIG_SOURCE', out) - -# Install gconf to the default source -cmd = "gconftool-2 --makefile-install-rule data/scribes.schemas" -err, out = getstatusoutput(cmd) - -if out: - - print "installing GConf schema files" - -if err: - - print 'Error: installation of gconf schema files failed: %s' % out - -# Kill the GConf daemon -cmd = "killall gconfd-2" -err, out = getstatusoutput(cmd) - -if err: - - print "Problem shutting down gconf." - -# Start the GConf daemon -cmd = "gconftool-2 --spawn" -err, out = getstatusoutput(cmd) - -if err: - - print "Problem restarting down gconf." - -print "scribes installation complete" - Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 17:40:41 -0000 1.1 +++ .cvsignore 7 May 2006 17:42:34 -0000 1.2 @@ -0,0 +1 @@ +scribes-0.2.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 17:40:41 -0000 1.1 +++ sources 7 May 2006 17:42:34 -0000 1.2 @@ -0,0 +1 @@ +5031eaa0ef8817ea32d390fc4d26ceda scribes-0.2.4.3.tar.gz From fedora-extras-commits at redhat.com Sun May 7 17:47:05 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 7 May 2006 10:47:05 -0700 Subject: owners owners.list,1.953,1.954 Message-ID: <200605071747.k47Hl7Ki025837@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25820/owners Modified Files: owners.list Log Message: Add entry for Scribes (bug #189727). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.953 retrieving revision 1.954 diff -u -r1.953 -r1.954 --- owners.list 7 May 2006 10:53:19 -0000 1.953 +++ owners.list 7 May 2006 17:47:05 -0000 1.954 @@ -1427,6 +1427,7 @@ Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|screem|A website development enviroment|michael at knox.net.nz|extras-qa at fedoraproject.org| +Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scribus-templates|This package includes additional templates for Scribus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 18:56:28 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 11:56:28 -0700 Subject: rpms/nsd/devel nsd.spec,1.6,1.7 nsd.init,1.1,1.2 Message-ID: <200605071856.k47IuUth028432@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28411 Modified Files: nsd.spec nsd.init Log Message: updated spec and init file for nsd-2.3.4 Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsd.spec 15 Dec 2005 15:48:59 -0000 1.6 +++ nsd.spec 7 May 2006 18:56:28 -0000 1.7 @@ -1,12 +1,11 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd -Version: 2.3.3 -Release: 7%{?dist} +Version: 2.3.4 +Release: 1%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz Source1: nsd.init -Patch0: nsd-2.3.3-checking.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel @@ -19,9 +18,8 @@ %prep %setup -q -%patch0 -p1 -b .checking.patch -%configure --enable-bind8-stats --enable-plugins \ +%configure --enable-bind8-stats --enable-plugins --enable-checking \ --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \ --with-user=nsd @@ -30,22 +28,16 @@ %install rm -rf %{buildroot} -# Not using their 'make install' since it uses install-sh which does not -# get the correct install path within the RPM_BUILD_ROOT -#%{__make} install -install -d 0755 %{buildroot}/%{_sysconfdir}/nsd -install -d 0755 %{buildroot}/%{_sbindir} -install -d 0755 %{buildroot}/%{_mandir}/man8 -install -d 0755 %{buildroot}/%{_initrddir} -install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name} - -install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf -install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones +%{__make} DESTDIR=%{buildroot} install +install -d 0755 %{buildroot}%{_initrddir} install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd +install -d 0700 %{buildroot}%{_localstatedir}/run/%{name} -install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir} -install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc -install -m 0644 *.8 %{buildroot}/%{_mandir}/man8 +# change .sample to normal config files +mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsdc.conf +mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsd.zones %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,6 +76,12 @@ fi %changelog +* Sun May 7 2006 Paul Wouters - 2.3.4-1 +- Upgraded to nsd-2.3.4. +- Removed manual install targets because DESTDIR is now supported +- Re-enabled --checking, checking patch no longer needed and removed. +- Work around in nsd.init for nsd failing to start when there is no ipv6 + * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsd.init 13 Dec 2005 03:51:03 -0000 1.1 +++ nsd.init 7 May 2006 18:56:28 -0000 1.2 @@ -24,9 +24,14 @@ #extra verbosity #ZONEC_VERBOSE=-v - OTHER_NSD_OPTS="" +#work around for bug in nsd-2.3.4 when no ipv6 is available +if [ ! -d /proc/sys/net/ipv6/ ] +then + OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS" +fi + # Source function library. . /etc/init.d/functions From fedora-extras-commits at redhat.com Sun May 7 18:57:40 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 11:57:40 -0700 Subject: rpms/nsd/devel sources,1.2,1.3 Message-ID: <200605071857.k47IvglA028486@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28469 Modified Files: sources Log Message: new source Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 03:51:03 -0000 1.2 +++ sources 7 May 2006 18:57:40 -0000 1.3 @@ -1 +1,2 @@ 7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz +72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:02:16 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:02:16 -0700 Subject: rpms/nsd/devel .cvsignore,1.2,1.3 Message-ID: <200605071902.k47J2nVL030713@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30692 Modified Files: .cvsignore Log Message: guess it wants cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 03:51:03 -0000 1.2 +++ .cvsignore 7 May 2006 19:02:16 -0000 1.3 @@ -1 +1,2 @@ nsd-2.3.3.tar.gz +nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:04:48 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:04:48 -0700 Subject: rpms/nsd/devel nsd.spec,1.7,1.8 Message-ID: <200605071904.k47J4o9t030845@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30828 Modified Files: nsd.spec Log Message: bump on silly 'tag exists and does not exist' error again. Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsd.spec 7 May 2006 18:56:28 -0000 1.7 +++ nsd.spec 7 May 2006 19:04:48 -0000 1.8 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz @@ -76,7 +76,7 @@ fi %changelog -* Sun May 7 2006 Paul Wouters - 2.3.4-1 +* Sun May 7 2006 Paul Wouters - 2.3.4-2 - Upgraded to nsd-2.3.4. - Removed manual install targets because DESTDIR is now supported - Re-enabled --checking, checking patch no longer needed and removed. From fedora-extras-commits at redhat.com Sun May 7 19:05:33 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:05:33 -0700 Subject: rpms/nsd/devel nsd.spec,1.8,1.9 Message-ID: <200605071905.k47J5ZGL030898@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30881 Modified Files: nsd.spec Log Message: and again Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nsd.spec 7 May 2006 19:04:48 -0000 1.8 +++ nsd.spec 7 May 2006 19:05:33 -0000 1.9 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz @@ -76,7 +76,7 @@ fi %changelog -* Sun May 7 2006 Paul Wouters - 2.3.4-2 +* Sun May 7 2006 Paul Wouters - 2.3.4-3 - Upgraded to nsd-2.3.4. - Removed manual install targets because DESTDIR is now supported - Re-enabled --checking, checking patch no longer needed and removed. From fedora-extras-commits at redhat.com Sun May 7 19:19:08 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:19:08 -0700 Subject: rpms/nsd/FC-4 nsd.init,1.1,1.2 nsd.spec,1.6,1.7 Message-ID: <200605071919.k47JJAsQ030973@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30953 Modified Files: nsd.init nsd.spec Log Message: updates pulled from devel. Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsd.init 13 Dec 2005 03:51:03 -0000 1.1 +++ nsd.init 7 May 2006 19:19:07 -0000 1.2 @@ -24,9 +24,14 @@ #extra verbosity #ZONEC_VERBOSE=-v - OTHER_NSD_OPTS="" +#work around for bug in nsd-2.3.4 when no ipv6 is available +if [ ! -d /proc/sys/net/ipv6/ ] +then + OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS" +fi + # Source function library. . /etc/init.d/functions Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsd.spec 15 Dec 2005 16:30:36 -0000 1.6 +++ nsd.spec 7 May 2006 19:19:07 -0000 1.7 @@ -1,12 +1,11 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd -Version: 2.3.3 -Release: 8%{?dist} +Version: 2.3.4 +Release: 3%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz Source1: nsd.init -Patch0: nsd-2.3.3-checking.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel @@ -19,9 +18,8 @@ %prep %setup -q -%patch0 -p1 -b .checking.patch -%configure --enable-bind8-stats --enable-plugins \ +%configure --enable-bind8-stats --enable-plugins --enable-checking \ --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \ --with-user=nsd @@ -30,22 +28,16 @@ %install rm -rf %{buildroot} -# Not using their 'make install' since it uses install-sh which does not -# get the correct install path within the RPM_BUILD_ROOT -#%{__make} install -install -d 0755 %{buildroot}/%{_sysconfdir}/nsd -install -d 0755 %{buildroot}/%{_sbindir} -install -d 0755 %{buildroot}/%{_mandir}/man8 -install -d 0755 %{buildroot}/%{_initrddir} -install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name} - -install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf -install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones +%{__make} DESTDIR=%{buildroot} install +install -d 0755 %{buildroot}%{_initrddir} install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd +install -d 0700 %{buildroot}%{_localstatedir}/run/%{name} -install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir} -install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc -install -m 0644 *.8 %{buildroot}/%{_mandir}/man8 +# change .sample to normal config files +mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsdc.conf +mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsd.zones %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,6 +76,12 @@ fi %changelog +* Sun May 7 2006 Paul Wouters - 2.3.4-3 +- Upgraded to nsd-2.3.4. +- Removed manual install targets because DESTDIR is now supported +- Re-enabled --checking, checking patch no longer needed and removed. +- Work around in nsd.init for nsd failing to start when there is no ipv6 + * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Sun May 7 19:19:31 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:19:31 -0700 Subject: rpms/nsd/FC-3 nsd.init,1.1,1.2 nsd.spec,1.5,1.6 Message-ID: <200605071919.k47JJX88031002@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30983 Modified Files: nsd.init nsd.spec Log Message: updates pulled from devel Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsd.init 13 Dec 2005 03:51:03 -0000 1.1 +++ nsd.init 7 May 2006 19:19:30 -0000 1.2 @@ -24,9 +24,14 @@ #extra verbosity #ZONEC_VERBOSE=-v - OTHER_NSD_OPTS="" +#work around for bug in nsd-2.3.4 when no ipv6 is available +if [ ! -d /proc/sys/net/ipv6/ ] +then + OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS" +fi + # Source function library. . /etc/init.d/functions Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsd.spec 15 Dec 2005 16:21:52 -0000 1.5 +++ nsd.spec 7 May 2006 19:19:30 -0000 1.6 @@ -1,12 +1,11 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd -Version: 2.3.3 -Release: 7%{?dist} +Version: 2.3.4 +Release: 3%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz Source1: nsd.init -Patch0: nsd-2.3.3-checking.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel @@ -19,9 +18,8 @@ %prep %setup -q -%patch0 -p1 -b .checking.patch -%configure --enable-bind8-stats --enable-plugins \ +%configure --enable-bind8-stats --enable-plugins --enable-checking \ --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \ --with-user=nsd @@ -30,22 +28,16 @@ %install rm -rf %{buildroot} -# Not using their 'make install' since it uses install-sh which does not -# get the correct install path within the RPM_BUILD_ROOT -#%{__make} install -install -d 0755 %{buildroot}/%{_sysconfdir}/nsd -install -d 0755 %{buildroot}/%{_sbindir} -install -d 0755 %{buildroot}/%{_mandir}/man8 -install -d 0755 %{buildroot}/%{_initrddir} -install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name} - -install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf -install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones +%{__make} DESTDIR=%{buildroot} install +install -d 0755 %{buildroot}%{_initrddir} install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd +install -d 0700 %{buildroot}%{_localstatedir}/run/%{name} -install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir} -install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc -install -m 0644 *.8 %{buildroot}/%{_mandir}/man8 +# change .sample to normal config files +mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsdc.conf +mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsd.zones %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,6 +76,12 @@ fi %changelog +* Sun May 7 2006 Paul Wouters - 2.3.4-3 +- Upgraded to nsd-2.3.4. +- Removed manual install targets because DESTDIR is now supported +- Re-enabled --checking, checking patch no longer needed and removed. +- Work around in nsd.init for nsd failing to start when there is no ipv6 + * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Sun May 7 19:21:27 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:21:27 -0700 Subject: rpms/nsd/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605071921.k47JLTBw031109@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31090 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 03:51:03 -0000 1.2 +++ .cvsignore 7 May 2006 19:21:27 -0000 1.3 @@ -1 +1,2 @@ nsd-2.3.3.tar.gz +nsd-2.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 03:51:03 -0000 1.2 +++ sources 7 May 2006 19:21:27 -0000 1.3 @@ -1 +1,2 @@ 7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz +72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:21:51 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:21:51 -0700 Subject: rpms/nsd/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605071921.k47JLr7G031145@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31126 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 03:51:03 -0000 1.2 +++ .cvsignore 7 May 2006 19:21:51 -0000 1.3 @@ -1 +1,2 @@ nsd-2.3.3.tar.gz +nsd-2.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 03:51:03 -0000 1.2 +++ sources 7 May 2006 19:21:51 -0000 1.3 @@ -1 +1,2 @@ 7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz +72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:23:47 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 12:23:47 -0700 Subject: rpms/nsd/FC-4 sources,1.3,1.4 Message-ID: <200605071923.k47JNnLI031220@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31203 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 May 2006 19:21:27 -0000 1.3 +++ sources 7 May 2006 19:23:47 -0000 1.4 @@ -1,2 +1 @@ -7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz 72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 19:44:23 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 7 May 2006 12:44:23 -0700 Subject: rpms/lightning - New directory Message-ID: <200605071944.k47JiPPK032741@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32711/lightning Log Message: Directory /cvs/extras/rpms/lightning added to the repository From fedora-extras-commits at redhat.com Sun May 7 19:44:24 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 7 May 2006 12:44:24 -0700 Subject: rpms/lightning/devel - New directory Message-ID: <200605071944.k47JiQqt032744@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32711/lightning/devel Log Message: Directory /cvs/extras/rpms/lightning/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 19:44:45 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 7 May 2006 12:44:45 -0700 Subject: rpms/lightning Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605071944.k47Jil86000353@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv316 Added Files: Makefile import.log Log Message: Setup of module lightning --- NEW FILE Makefile --- # Top level Makefile for module lightning all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 19:44:46 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 7 May 2006 12:44:46 -0700 Subject: rpms/lightning/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605071944.k47JimuQ000358@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv316/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lightning --- NEW 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 May 7 20:36:57 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 7 May 2006 13:36:57 -0700 Subject: rpms/xemacs/devel xemacs-21.5.26-maximize.patch, NONE, 1.1 xemacs.spec, 1.24, 1.25 Message-ID: <200605072036.k47Kax4n005242@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5222 Modified Files: xemacs.spec Added Files: xemacs-21.5.26-maximize.patch Log Message: * Sun May 7 2006 Ville Skytt?? - 21.5.26-5 - Apply upstream fix for window maximization problems (#111225). xemacs-21.5.26-maximize.patch: --- NEW FILE xemacs-21.5.26-maximize.patch --- Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.954 diff -u -r1.954 ChangeLog --- src/ChangeLog 6 May 2006 08:46:38 -0000 1.954 +++ src/ChangeLog 6 May 2006 17:26:00 -0000 @@ -0,0 +1,26 @@ +2006-04-30 Stephen J. Turnbull + + Move geometry management from EmacsFrameResize to x_set_frame_size. + Should fix "metacity maximization" bug. + Provide (deprecated, temporary) backward compatibility option. + + * EmacsFrame.c (EmacsFrameResize): + * frame-x.c (x_set_frame_size): + Move call of ChangeEmacsManagerSize. + Don't bogusly notify WM about size changes the WM asked for. + + * console-x.c (wedge-metacity): New builtin Boolean Lisp variable. + * console-x-impl.h (wedge_metacity): Declare C variable. + * console-x.c (vars_of_console_x): New function to initialize it. + * symsinit.h (vars_of_console_x): declare it. + * emacs.c (main_1): Call vars_of_console_x. + + * EmacsFrameP.h (struct EmacsFrame): + * EmacsManager.c (ChangeEmacsManagerSize): + * EmacsShell-sub.c (SuperClassRootGeometryManager): + * console-x-impl.h (wedge_metacity): + Various comments, some improved documentation, mostly sad comments + on the state of the art of Xt programming. + + * frame-x.c (defi): #undef it. (Random code cleanliness.) + Index: src/EmacsFrame.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrame.c,v retrieving revision 1.28 diff -u -r1.28 EmacsFrame.c --- src/EmacsFrame.c 25 Oct 2005 11:16:20 -0000 1.28 +++ src/EmacsFrame.c 6 May 2006 17:26:00 -0000 @@ -360,19 +360,32 @@ pixel_to_char_size (f, ew->core.width, ew->core.height, &columns, &rows); change_frame_size (f, rows, columns, 0); - /* Now we tell the EmacsShell that we've changed the size of the non-fixed - portion of the frame. Note that, if we the resize occurred as a result - of EmacsFrameSetCharSize(), this information will be stored twice. - This is not a big deal, as storing this information doesn't actually - do anything until the next resize. */ - if (FRAME_X_TOP_LEVEL_FRAME_P (f)) - x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); + /* The code below is just plain wrong. If the EmacsShell or EmacsManager + needs to know, they should just ask. If needed information is being + updated here, then we should set a dirty flag and have it updated on an + as-needed basis. + For now, conditionalize so people can get work done if this breaks + something. */ + if (wedge_metacity) /* cf. x_set_frame_size */ + { + /* Now we tell the EmacsShell that we've changed the size of the + non-fixed portion of the frame. Note that, if the resize occurred + as a result of EmacsFrameSetCharSize(), this information will be + stored twice. This is not a big deal, as storing this information + doesn't actually do anything until the next resize. */ + if (FRAME_X_TOP_LEVEL_FRAME_P (f)) + x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); - /* Kick the manager so that it knows we've changed size. */ - req.request_mode = 0; - XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); - EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), repl.width, - repl.height); + /* Kick the manager so that it knows we've changed size. + #### No, no, no! If this does anything at all, it will involve + changing the manager's size. That's not something that a child + widget should initialize as part of a purely informational + method!! */ + req.request_mode = 0; + XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); + EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), + repl.width, repl.height); + } } static Boolean Index: src/EmacsFrameP.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrameP.h,v retrieving revision 1.7 diff -u -r1.7 EmacsFrameP.h --- src/EmacsFrameP.h 4 May 2003 02:34:35 -0000 1.7 +++ src/EmacsFrameP.h 6 May 2006 17:26:00 -0000 @@ -65,13 +65,16 @@ Boolean iconic; /* whether this frame is iconic */ /* The rest of this is crap and should be deleted. + #### Comments that start with + are fields that actually get referred + to somewhere aside from the init function. + I guess the "crap" has mostly moved to specifiers? */ Boolean minibuffer; /* 0: normal frames with minibuffers. * 1: frames without minibuffers * 2: minibuffer only. */ Boolean unsplittable; /* frame can only have one window */ - int internal_border_width; /* internal borders */ + int internal_border_width; /* + internal borders */ int scrollbar_width; /* width of frame vertical sb's */ int scrollbar_height; /* height of frame horizontal sb's */ int top_toolbar_height; /* height of top toolbar */ @@ -82,9 +85,9 @@ int bottom_toolbar_border_width; /* ... of bottom toolbar */ int left_toolbar_border_width; /* ... of left toolbar */ int right_toolbar_border_width; /* ... of right toolbar */ - Dimension toolbar_shadow_thickness; + Dimension toolbar_shadow_thickness; /* + of shadows */ unsigned char scrollbar_placement; - int interline; /* skips between lines */ + int interline; /* + skips between lines */ XFontStruct* font; /* font */ Pixel foreground_pixel; /* foreground */ @@ -97,7 +100,7 @@ int bell_volume; /* how loud is beep */ Boolean menubar_p; /* initially show a menubar? */ - Boolean initially_unmapped; /* inhibit initial window mapping */ + Boolean initially_unmapped; /* + inhibit initial window mapping */ Boolean use_backing_store; /* backing store for menubar & ew? */ Dimension preferred_width; /* if non-zero, preferred size for */ Index: src/EmacsManager.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsManager.c,v retrieving revision 1.7 diff -u -r1.7 EmacsManager.c --- src/EmacsManager.c 22 Dec 2004 10:59:09 -0000 1.7 +++ src/EmacsManager.c 6 May 2006 17:26:00 -0000 @@ -241,6 +241,12 @@ if (height == 0) height = w->core.height; + /* #### AFAICT this gets called in two places. One is in ChangeManaged(), + above. The other is in EmacsFrameResize(). Perhaps ChangeManaged() + should initiate resize requests, but EmacsFrameResize() should not. + Unfortunately, I've tried making this conditional on whether we're + called from EmacsFrameResize() or not, but that results in an infloop + via the callback to x_layout_widgets() in Resize(). Whee! */ /* do nothing if we're already that size */ if (w->core.width != width || w->core.height != height) { Index: src/EmacsShell-sub.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsShell-sub.c,v retrieving revision 1.7 diff -u -r1.7 EmacsShell-sub.c --- src/EmacsShell-sub.c 24 Jan 2005 23:33:46 -0000 1.7 +++ src/EmacsShell-sub.c 6 May 2006 17:26:00 -0000 @@ -278,7 +278,8 @@ GenericClassExtRec *gcer; /* find the shell extension record that specifies the - root geometry manager method */ + root geometry manager method + #### We could use XtGetClassExtension here. */ for (gcer = (GenericClassExtRec *) swc->shell_class.extension; gcer; gcer = (GenericClassExtRec *) gcer->next_extension) @@ -287,6 +288,9 @@ break; } + /* #### The R11.6.4 Xt specification says if we don't find NULLQUARK here, + we should assume root_geometry_manager = XtInheritRootGeometryManager. + Is that actually callable? */ if (!gcer) ABORT (); Index: src/console-x-impl.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x-impl.h,v retrieving revision 1.5 diff -u -r1.5 console-x-impl.h --- src/console-x-impl.h 26 Nov 2005 11:46:07 -0000 1.5 +++ src/console-x-impl.h 6 May 2006 17:26:00 -0000 @@ -40,6 +40,8 @@ DECLARE_CONSOLE_TYPE (x); +extern int wedge_metacity; + struct x_device { #ifdef NEW_GC @@ -234,7 +236,8 @@ /* The maximum number of widgets that can be displayed above the text area at one time. Currently no more than 3 will ever actually be - displayed (menubar, psheet, debugger panel). */ + displayed (menubar, psheet, debugger panel). + #### Are "psheet" and "debugger panel" relevant any more? */ #define MAX_CONCURRENT_TOP_WIDGETS 8 struct x_frame @@ -243,12 +246,17 @@ struct lrecord_header header; #endif /* NEW_GC */ - /* The widget of this frame. This is an EmacsShell or an - ExternalShell. */ + /* The widget of this frame. + This is an EmacsShell or an ExternalShell. + It negotiates with the window manager or containing app on behalf of + the container widget. Should be (but isn't) invisible to Emacs. */ Widget widget; /* The parent of the EmacsFrame, the menubar, and the scrollbars. - This is an EmacsManager. */ + This is an EmacsManager. + It is responsible for managing the geometry of the frame. This is what + Emacs mostly talks to. Anything that affects its geometry will be + reflected in the Shell widget, and thus cause WM interaction. */ Widget container; /* The widget of the menubar, of whatever widget class it happens to be. */ Index: src/console-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x.c,v retrieving revision 1.16 diff -u -r1.16 console-x.c --- src/console-x.c 17 Dec 2005 19:47:02 -0000 1.16 +++ src/console-x.c 6 May 2006 17:26:00 -0000 @@ -41,6 +41,8 @@ DEFINE_CONSOLE_TYPE (x); +int wedge_metacity; /* nonzero means update WM_HINTS always */ + extern void x_has_keysym (KeySym, Lisp_Object, int); static int @@ -399,6 +401,22 @@ CONSOLE_HAS_METHOD (x, perhaps_init_unseen_key_defaults); } + +void +vars_of_console_x (void) +{ + DEFVAR_BOOL ("wedge-metacity", &wedge_metacity /* +When non-nil, frame geometry management is backward-compatible. +This is known to create inflooping window jitter in metacity, et al. +It also does not conform to Xt conventions for geometry management. +Specifically, all frame resizes, XEmacs-initiated or not, update WM_HINTS. +Furthermore, geometry changes occur in the widget resize method. + +The default is nil. This probably gives correct behavior regardless of the +window manager used. +This variable is deprecated and will be removed. +*/ ); +} void reinit_console_type_create_x (void) Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.166 diff -u -r1.166 emacs.c --- src/emacs.c 25 Apr 2006 14:02:08 -0000 1.166 +++ src/emacs.c 6 May 2006 17:26:01 -0000 @@ -2186,6 +2186,7 @@ #ifdef HAVE_BALLOON_HELP vars_of_balloon_x (); #endif + vars_of_console_x (); vars_of_device_x (); #ifdef HAVE_X_DIALOGS vars_of_dialog_x (); Index: src/frame-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v retrieving revision 1.72 diff -u -r1.72 frame-x.c --- src/frame-x.c 26 Nov 2005 11:46:08 -0000 1.72 +++ src/frame-x.c 6 May 2006 17:26:01 -0000 @@ -507,6 +507,7 @@ defi(Qtop, XtNy); #undef def +#undef defi } static Lisp_Object @@ -2307,6 +2308,17 @@ x_set_frame_size (struct frame *f, int cols, int rows) { EmacsFrameSetCharSize (FRAME_X_TEXT_WIDGET (f), cols, rows); + + if (!wedge_metacity) /* cf. EmacsFrameResize */ + { + /* Kick the manager so that it knows we've changed size. */ + XtWidgetGeometry req, repl; + req.request_mode = 0; + XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); + EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), + repl.width, repl.height); + } + #if 0 /* this is not correct. x_set_frame_size() is called from Fset_frame_size(), which may or may not have been called Index: src/symsinit.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v retrieving revision 1.57 diff -u -r1.57 symsinit.h --- src/symsinit.h 25 Apr 2006 14:02:09 -0000 1.57 +++ src/symsinit.h 6 May 2006 17:26:01 -0000 @@ -306,6 +306,7 @@ void vars_of_console_stream (void); void vars_of_console_mswindows (void); void vars_of_console_tty (void); +void vars_of_console_x (void); void vars_of_data (void); void vars_of_database (void); void vars_of_debug (void); Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xemacs.spec 23 Apr 2006 18:05:29 -0000 1.24 +++ xemacs.spec 7 May 2006 20:36:57 -0000 1.25 @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -42,6 +42,7 @@ Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch +Patch7: %{name}-21.5.26-maximize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -182,6 +183,7 @@ %endif %patch5 -p1 %patch6 -p1 +%patch7 -p0 for f in man/lispref/mule.texi man/xemacs-faq.texi ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f @@ -491,6 +493,9 @@ %changelog +* Sun May 7 2006 Ville Skytt?? - 21.5.26-5 +- Apply upstream fix for window maximization problems (#111225). + * Sun Apr 23 2006 Ville Skytt?? - 21.5.26-4 - Bring StartupWMClass in desktop entry up to date. - Fix non-MULE build. From fedora-extras-commits at redhat.com Sun May 7 21:09:37 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 7 May 2006 14:09:37 -0700 Subject: rpms/bakery/FC-5 .cvsignore, 1.2, 1.3 bakery.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605072109.k47L9dZE008338@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8316 Modified Files: .cvsignore bakery.spec sources Log Message: Update to 2.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bakery/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Mar 2006 19:13:24 -0000 1.2 +++ .cvsignore 7 May 2006 21:09:37 -0000 1.3 @@ -1 +1 @@ -bakery-2.3.17.tar.bz2 +bakery-2.4.0.tar.bz2 Index: bakery.spec =================================================================== RCS file: /cvs/extras/rpms/bakery/FC-5/bakery.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bakery.spec 5 Mar 2006 19:13:24 -0000 1.1 +++ bakery.spec 7 May 2006 21:09:37 -0000 1.2 @@ -1,5 +1,5 @@ -%define major_version 2.3 -%define minor_version 17 +%define major_version 2.4 +%define minor_version 0 %define api_version 2.4 Name: bakery @@ -13,7 +13,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/bakery/%{major_version}/bakery-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtkmm24-devel >= 2.6.0 +BuildRequires: gtkmm24-devel >= 2.8.0 BuildRequires: gconfmm26-devel >= 2.6.0 BuildRequires: libglademm24-devel >= 2.4.0 BuildRequires: libxml++-devel >= 2.8.0 @@ -90,6 +90,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun May 7 2006 Denis Leroy - 2.4.0-1 +- Update to 2.4.0 + * Sat Mar 4 2006 Denis Leroy - 2.3.17-1 - Update to 2.3.17 - Added gettext and graphviz BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bakery/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Mar 2006 19:13:24 -0000 1.2 +++ sources 7 May 2006 21:09:37 -0000 1.3 @@ -1 +1 @@ -d1e78b0f520c125b21340ac73dc6aaab bakery-2.3.17.tar.bz2 +d5ec6dfe1c9e6cf98e245ed93dc284d9 bakery-2.4.0.tar.bz2 From fedora-extras-commits at redhat.com Sun May 7 21:14:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:01 -0700 Subject: rpms/perl-Module-ScanDeps - New directory Message-ID: <200605072114.k47LE3Bp008775@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8744/perl-Module-ScanDeps Log Message: Directory /cvs/extras/rpms/perl-Module-ScanDeps added to the repository From fedora-extras-commits at redhat.com Sun May 7 21:14:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:02 -0700 Subject: rpms/perl-Module-ScanDeps/devel - New directory Message-ID: <200605072114.k47LE4vS008778@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8744/perl-Module-ScanDeps/devel Log Message: Directory /cvs/extras/rpms/perl-Module-ScanDeps/devel added to the repository From fedora-extras-commits at redhat.com Sun May 7 21:14:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:18 -0700 Subject: rpms/perl-Module-ScanDeps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605072114.k47LEKje008842@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8810 Added Files: Makefile import.log Log Message: Setup of module perl-Module-ScanDeps --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-ScanDeps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 7 21:14:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:19 -0700 Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605072114.k47LELa8008845@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8810/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-ScanDeps --- NEW 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 May 7 21:14:51 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:51 -0700 Subject: rpms/perl-Module-ScanDeps import.log,1.1,1.2 Message-ID: <200605072115.k47LFNar008987@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918 Modified Files: import.log Log Message: auto-import perl-Module-ScanDeps-0.59-1 on branch devel from perl-Module-ScanDeps-0.59-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 May 2006 21:14:18 -0000 1.1 +++ import.log 7 May 2006 21:14:51 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-ScanDeps-0_59-1:HEAD:perl-Module-ScanDeps-0.59-1.src.rpm:1147036482 From fedora-extras-commits at redhat.com Sun May 7 21:14:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:14:52 -0700 Subject: rpms/perl-Module-ScanDeps/devel perl-Module-ScanDeps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605072115.k47LFOjK008993@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918/devel Modified Files: .cvsignore sources Added Files: perl-Module-ScanDeps.spec Log Message: auto-import perl-Module-ScanDeps-0.59-1 on branch devel from perl-Module-ScanDeps-0.59-1.src.rpm --- NEW FILE perl-Module-ScanDeps.spec --- Name: perl-Module-ScanDeps Version: 0.59 Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-ScanDeps/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-ScanDeps-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description An application of Module::ScanDeps is to generate executables from scripts that contains necessary modules; this module supports two such projects, PAR and App::Packer. Please see their respective documentations on CPAN for further information. %prep %setup -q -n Module-ScanDeps-%{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 AUTHORS Changes README %{_bindir}/* %{perl_vendorlib}/Module/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3pm* %changelog * Wed May 3 2006 Jose Pedro Oliveira - 0.59-1 - Update to 0.59. * Thu Mar 16 2006 Jose Pedro Oliveira - 0.57-1 - Update to 0.57. * Tue Feb 28 2006 Jose Pedro Oliveira - 0.56-1 - Update to 0.56. * Tue Jan 10 2006 Jose Pedro Oliveira - 0.53-1 - Update to 0.53. * Fri Sep 9 2005 Jose Pedro Oliveira - 0.51-1 - Update to Fedora Extras Template. * Sat Jan 08 2005 Jose Pedro Oliveira - 0:0.51-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 21:14:18 -0000 1.1 +++ .cvsignore 7 May 2006 21:14:51 -0000 1.2 @@ -0,0 +1 @@ +Module-ScanDeps-0.59.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 21:14:18 -0000 1.1 +++ sources 7 May 2006 21:14:51 -0000 1.2 @@ -0,0 +1 @@ +6e20e368ff101d8bc8f31eaa2d81c264 Module-ScanDeps-0.59.tar.gz From fedora-extras-commits at redhat.com Sun May 7 21:22:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:22:12 -0700 Subject: owners owners.list,1.954,1.955 Message-ID: <200605072122.k47LMErQ009168@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9151 Modified Files: owners.list Log Message: New package: perl-Module-ScanDeps (#190582) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.954 retrieving revision 1.955 diff -u -r1.954 -r1.955 --- owners.list 7 May 2006 17:47:05 -0000 1.954 +++ owners.list 7 May 2006 21:22:11 -0000 1.955 @@ -1103,6 +1103,7 @@ Fedora Extras|perl-Module-Locate|Locate modules in the same fashion as "require" and "use"|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Module-ScanDeps|Recursively scan Perl code for dependencies|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 7 21:25:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 7 May 2006 14:25:39 -0700 Subject: rpms/perl-Module-ScanDeps/devel perl-Module-ScanDeps.spec,1.1,1.2 Message-ID: <200605072125.k47LPfnd009213@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9196 Modified Files: perl-Module-ScanDeps.spec Log Message: Source URL corrected (failed to detect the maintainer change). Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Module-ScanDeps.spec 7 May 2006 21:14:51 -0000 1.1 +++ perl-Module-ScanDeps.spec 7 May 2006 21:25:39 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-Module-ScanDeps Version: 0.59 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-ScanDeps/ -Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-ScanDeps-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/S/SM/SMUELLER/Module-ScanDeps-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -54,6 +54,9 @@ %changelog +* Sun May 7 2006 Jose Pedro Oliveira - 0.59-2 +- Source URL corrected (failed to detect the maintainer change). + * Wed May 3 2006 Jose Pedro Oliveira - 0.59-1 - Update to 0.59. From fedora-extras-commits at redhat.com Sun May 7 22:04:53 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:04:53 -0700 Subject: owners owners.list,1.955,1.956 Message-ID: <200605072204.k47M4tgf011712@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11695 Modified Files: owners.list Log Message: taking on lua Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.955 retrieving revision 1.956 diff -u -r1.955 -r1.956 --- owners.list 7 May 2006 21:22:11 -0000 1.955 +++ owners.list 7 May 2006 22:04:53 -0000 1.956 @@ -715,7 +715,7 @@ Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lrmi|Library for calling real mode BIOS routines|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|fedora at soeterbroek.com|extras-qa at fedoraproject.org| -Fedora Extras|lua|A powerful light-weight programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|lua|A powerful light-weight programming language|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 22:26:23 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:26:23 -0700 Subject: rpms/lua/devel .cvsignore, 1.2, 1.3 lua.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605072226.k47MQP5v011794@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11770 Modified Files: .cvsignore lua.spec sources Log Message: version bump and rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:49 -0000 1.2 +++ .cvsignore 7 May 2006 22:26:23 -0000 1.3 @@ -1 +1 @@ -lua-5.0.tar.gz +lua-5.1.tar.gz Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lua.spec 16 Oct 2005 18:00:53 -0000 1.11 +++ lua.spec 7 May 2006 22:26:23 -0000 1.12 @@ -1,6 +1,6 @@ Name: lua -Version: 5.0.2 -Release: 5%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -36,28 +36,22 @@ NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ %endif USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" + EXTRA_LIBS="-lm -lreadline -lncurses" \ + linux %install -rm -rf $RPM_BUILD_ROOT -%makeinstall \ - STRIP=/bin/true \ - INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} \ - INSTALL_BIN=$RPM_BUILD_ROOT%{_bindir} \ - INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \ - INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} \ - INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \ - INSTALL_EXEC="install -pm 755" \ - INSTALL_DATA="install -pm 644" - +rm -rf %{buildroot} +make install \ + INSTALL_TOP=%{buildroot}/usr \ + INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -65,11 +59,15 @@ %doc COPYRIGHT HISTORY README doc/*.html doc/*.gif %{_bindir}/lua* %{_includedir}/l*.h +%{_includedir}/l*.hpp %{_libdir}/liblua*.a %{_mandir}/man1/lua*.1* %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-1 +- version bump + * Sun Oct 16 2005 Ville Skytt?? - 5.0.2-5 - Fix -debuginfo (#165304). - Cosmetic specfile improvements. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 23:37:12 -0000 1.3 +++ sources 7 May 2006 22:26:23 -0000 1.4 @@ -1 +1 @@ -dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz +3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz From fedora-extras-commits at redhat.com Sun May 7 22:26:41 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:26:41 -0700 Subject: rpms/lua/FC-5 .cvsignore, 1.2, 1.3 lua.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605072226.k47MQha4011821@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11800 Modified Files: .cvsignore lua.spec sources Log Message: version bump and rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:49 -0000 1.2 +++ .cvsignore 7 May 2006 22:26:41 -0000 1.3 @@ -1 +1 @@ -lua-5.0.tar.gz +lua-5.1.tar.gz Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lua.spec 16 Oct 2005 18:00:53 -0000 1.11 +++ lua.spec 7 May 2006 22:26:41 -0000 1.12 @@ -1,6 +1,6 @@ Name: lua -Version: 5.0.2 -Release: 5%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -36,28 +36,22 @@ NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ %endif USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" + EXTRA_LIBS="-lm -lreadline -lncurses" \ + linux %install -rm -rf $RPM_BUILD_ROOT -%makeinstall \ - STRIP=/bin/true \ - INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} \ - INSTALL_BIN=$RPM_BUILD_ROOT%{_bindir} \ - INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \ - INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} \ - INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \ - INSTALL_EXEC="install -pm 755" \ - INSTALL_DATA="install -pm 644" - +rm -rf %{buildroot} +make install \ + INSTALL_TOP=%{buildroot}/usr \ + INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -65,11 +59,15 @@ %doc COPYRIGHT HISTORY README doc/*.html doc/*.gif %{_bindir}/lua* %{_includedir}/l*.h +%{_includedir}/l*.hpp %{_libdir}/liblua*.a %{_mandir}/man1/lua*.1* %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-1 +- version bump + * Sun Oct 16 2005 Ville Skytt?? - 5.0.2-5 - Fix -debuginfo (#165304). - Cosmetic specfile improvements. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 23:37:12 -0000 1.3 +++ sources 7 May 2006 22:26:41 -0000 1.4 @@ -1 +1 @@ -dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz +3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz From fedora-extras-commits at redhat.com Sun May 7 22:27:00 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:27:00 -0700 Subject: rpms/lua/FC-4 .cvsignore, 1.2, 1.3 lua.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605072227.k47MR2lt011848@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11827 Modified Files: .cvsignore lua.spec sources Log Message: version bump and rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:49 -0000 1.2 +++ .cvsignore 7 May 2006 22:26:59 -0000 1.3 @@ -1 +1 @@ -lua-5.0.tar.gz +lua-5.1.tar.gz Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/lua.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lua.spec 16 Oct 2005 18:00:53 -0000 1.11 +++ lua.spec 7 May 2006 22:26:59 -0000 1.12 @@ -1,6 +1,6 @@ Name: lua -Version: 5.0.2 -Release: 5%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -36,28 +36,22 @@ NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ %endif USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" + EXTRA_LIBS="-lm -lreadline -lncurses" \ + linux %install -rm -rf $RPM_BUILD_ROOT -%makeinstall \ - STRIP=/bin/true \ - INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} \ - INSTALL_BIN=$RPM_BUILD_ROOT%{_bindir} \ - INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \ - INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} \ - INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \ - INSTALL_EXEC="install -pm 755" \ - INSTALL_DATA="install -pm 644" - +rm -rf %{buildroot} +make install \ + INSTALL_TOP=%{buildroot}/usr \ + INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -65,11 +59,15 @@ %doc COPYRIGHT HISTORY README doc/*.html doc/*.gif %{_bindir}/lua* %{_includedir}/l*.h +%{_includedir}/l*.hpp %{_libdir}/liblua*.a %{_mandir}/man1/lua*.1* %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-1 +- version bump + * Sun Oct 16 2005 Ville Skytt?? - 5.0.2-5 - Fix -debuginfo (#165304). - Cosmetic specfile improvements. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 23:37:12 -0000 1.3 +++ sources 7 May 2006 22:26:59 -0000 1.4 @@ -1 +1 @@ -dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz +3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz From fedora-extras-commits at redhat.com Sun May 7 22:52:03 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:52:03 -0700 Subject: rpms/lua/FC-4 lua.spec,1.12,1.13 Message-ID: <200605072252.k47Mq5Td012129@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12082/FC-4 Modified Files: lua.spec Log Message: fixed x86_64 builds Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/lua.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lua.spec 7 May 2006 22:26:59 -0000 1.12 +++ lua.spec 7 May 2006 22:52:03 -0000 1.13 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -44,6 +44,7 @@ rm -rf %{buildroot} make install \ INSTALL_TOP=%{buildroot}/usr \ + INSTALL_LIB=%{buildroot}/%{_libdir} \ INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check @@ -65,6 +66,9 @@ %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-2 +- fixed x86_64 builds + * Mon May 08 2006 Michael J. Knox - 5.1-1 - version bump From fedora-extras-commits at redhat.com Sun May 7 22:52:04 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:52:04 -0700 Subject: rpms/lua/FC-5 lua.spec,1.12,1.13 Message-ID: <200605072252.k47Mq6ur012133@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12082/FC-5 Modified Files: lua.spec Log Message: fixed x86_64 builds Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lua.spec 7 May 2006 22:26:41 -0000 1.12 +++ lua.spec 7 May 2006 22:52:04 -0000 1.13 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -44,6 +44,7 @@ rm -rf %{buildroot} make install \ INSTALL_TOP=%{buildroot}/usr \ + INSTALL_LIB=%{buildroot}/%{_libdir} \ INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check @@ -65,6 +66,9 @@ %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-2 +- fixed x86_64 builds + * Mon May 08 2006 Michael J. Knox - 5.1-1 - version bump From fedora-extras-commits at redhat.com Sun May 7 22:52:05 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sun, 7 May 2006 15:52:05 -0700 Subject: rpms/lua/devel lua.spec,1.12,1.13 Message-ID: <200605072252.k47Mq7di012137@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12082/devel Modified Files: lua.spec Log Message: fixed x86_64 builds Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lua.spec 7 May 2006 22:26:23 -0000 1.12 +++ lua.spec 7 May 2006 22:52:05 -0000 1.13 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -44,6 +44,7 @@ rm -rf %{buildroot} make install \ INSTALL_TOP=%{buildroot}/usr \ + INSTALL_LIB=%{buildroot}/%{_libdir} \ INSTALL_MAN=%{buildroot}%{_mandir}/man1 %check @@ -65,6 +66,9 @@ %changelog +* Mon May 08 2006 Michael J. Knox - 5.1-2 +- fixed x86_64 builds + * Mon May 08 2006 Michael J. Knox - 5.1-1 - version bump From fedora-extras-commits at redhat.com Sun May 7 23:06:45 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 7 May 2006 16:06:45 -0700 Subject: rpms/bakery/devel .cvsignore, 1.2, 1.3 bakery.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605072306.k47N6l2T014543@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14522 Modified Files: .cvsignore bakery.spec sources Log Message: Update to 2.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Mar 2006 19:13:24 -0000 1.2 +++ .cvsignore 7 May 2006 23:06:45 -0000 1.3 @@ -1 +1 @@ -bakery-2.3.17.tar.bz2 +bakery-2.4.0.tar.bz2 Index: bakery.spec =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/bakery.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bakery.spec 5 Mar 2006 19:13:24 -0000 1.1 +++ bakery.spec 7 May 2006 23:06:45 -0000 1.2 @@ -1,5 +1,5 @@ -%define major_version 2.3 -%define minor_version 17 +%define major_version 2.4 +%define minor_version 0 %define api_version 2.4 Name: bakery @@ -13,7 +13,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/bakery/%{major_version}/bakery-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtkmm24-devel >= 2.6.0 +BuildRequires: gtkmm24-devel >= 2.8.0 BuildRequires: gconfmm26-devel >= 2.6.0 BuildRequires: libglademm24-devel >= 2.4.0 BuildRequires: libxml++-devel >= 2.8.0 @@ -90,6 +90,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun May 7 2006 Denis Leroy - 2.4.0-1 +- Update to 2.4.0 + * Sat Mar 4 2006 Denis Leroy - 2.3.17-1 - Update to 2.3.17 - Added gettext and graphviz BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Mar 2006 19:13:24 -0000 1.2 +++ sources 7 May 2006 23:06:45 -0000 1.3 @@ -1 +1 @@ -d1e78b0f520c125b21340ac73dc6aaab bakery-2.3.17.tar.bz2 +d5ec6dfe1c9e6cf98e245ed93dc284d9 bakery-2.4.0.tar.bz2 From fedora-extras-commits at redhat.com Sun May 7 23:40:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 16:40:35 -0700 Subject: rpms/awstats/FC-5 awstats-6.5-CVE-2006-1945.patch, NONE, 1.1 awstats.README.SELinux, NONE, 1.1 .cvsignore, 1.6, 1.7 awstats.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <200605072340.k47NebjP014867@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14808/FC-5 Modified Files: .cvsignore awstats.spec sources Added Files: awstats-6.5-CVE-2006-1945.patch awstats.README.SELinux Log Message: revert to version 6.5 (build failed for FC-4 and 5 anyway) and backport the fix for the vulnerability awstats-6.5-CVE-2006-1945.patch: --- NEW FILE awstats-6.5-CVE-2006-1945.patch --- diff -u -r1.860 -r1.861 --- wwwroot/cgi-bin/awstats.pl 9 Jan 2006 18:51:06 -0000 1.860 +++ wwwroot/cgi-bin/awstats.pl 22 Jan 2006 12:55:14 -0000 1.861 @@ -5542,7 +5542,7 @@ # No update but report by default when run from a browser $UpdateStats=($QueryString=~/update=1/i?1:0); - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } @@ -5591,7 +5591,7 @@ # Update with no report by default when run from command line $UpdateStats=1; - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig="$1"; } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } --- NEW FILE awstats.README.SELinux --- ========================== SELinux support in AWStats ========================== What is the problem ? --------------------- AWStats is a CGI script, and needs to be labelled correctly to be called from Apache. The files in ``/usr/share/awstats/wwwroot/cgi-bin`` need to have the ``httpd_sys_script_exec_t`` type, and the databases files in ``/var/lib/awstats`` need to have the ``httpd_sys_script_rw_t`` type. How do we solve it ? -------------------- You can change the type with the ``chcon`` command:: chcon -R -t httpd_sys_script_exec_t /usr/share/awstats/wwwroot/cgi-bin chcon -R -t httpd_sys_script_rw_t /var/lib/awstats But these modifications will be lost if the system is relabeled (you can request a relabel with the system-config-security tool). To make these changes permanent, this package sets the contexts by running the following commands:: semanage fcontext -a -t httpd_sys_script_exec_t \ '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' Please send your bug reports (if any ;) ) to https://bugzilla.redhat.com Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 May 2006 08:17:09 -0000 1.6 +++ .cvsignore 7 May 2006 23:40:34 -0000 1.7 @@ -1 +1 @@ -awstats-6.6.tar.gz +awstats-6.5.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- awstats.spec 7 May 2006 08:17:09 -0000 1.12 +++ awstats.spec 7 May 2006 23:40:34 -0000 1.13 @@ -1,13 +1,14 @@ Name: awstats -Version: 6.6 -Release: 0.1.beta%{?dist} +Version: 6.5 +Release: 4%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz -Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz +Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz +#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz Source1: awstats.README.SELinux +Patch0: awstats-6.5-CVE-2006-1945.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd @@ -34,6 +35,8 @@ %prep %setup -q +# no backup or the orig file will be installed +%patch0 -p0 # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* # Fix some bad file permissions here for convenience. @@ -49,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT ### Create cron job -%{__cat} <awstats.cron +cat <awstats.cron #!/bin/bash if [ -f %{_localstatedir}/log/httpd/access_log ] ; then @@ -173,8 +176,8 @@ %changelog -* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta -- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) +* Mon May 08 2006 Aurelien Bompard 6.5-4 +- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923) * Sun Apr 09 2006 Aurelien Bompard 6.5-3 - SELinux support: use semanage to label the cgi and the database files Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 May 2006 08:17:09 -0000 1.9 +++ sources 7 May 2006 23:40:34 -0000 1.10 @@ -1 +1 @@ -c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz +aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz From fedora-extras-commits at redhat.com Sun May 7 23:40:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 16:40:35 -0700 Subject: rpms/awstats/devel awstats.spec,1.13,1.14 Message-ID: <200605072340.k47NebZE014871@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14808/devel Modified Files: awstats.spec Log Message: revert to version 6.5 (build failed for FC-4 and 5 anyway) and backport the fix for the vulnerability Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- awstats.spec 7 May 2006 08:17:10 -0000 1.13 +++ awstats.spec 7 May 2006 23:40:35 -0000 1.14 @@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT ### Create cron job -%{__cat} <awstats.cron +cat <awstats.cron #!/bin/bash if [ -f %{_localstatedir}/log/httpd/access_log ] ; then From fedora-extras-commits at redhat.com Sun May 7 23:40:34 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 16:40:34 -0700 Subject: rpms/awstats/FC-4 awstats-6.5-CVE-2006-1945.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 awstats.spec, 1.10, 1.11 sources, 1.9, 1.10 Message-ID: <200605072341.k47Nf6Iv014876@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14808/FC-4 Modified Files: .cvsignore awstats.spec sources Added Files: awstats-6.5-CVE-2006-1945.patch Log Message: revert to version 6.5 (build failed for FC-4 and 5 anyway) and backport the fix for the vulnerability awstats-6.5-CVE-2006-1945.patch: --- NEW FILE awstats-6.5-CVE-2006-1945.patch --- diff -u -r1.860 -r1.861 --- wwwroot/cgi-bin/awstats.pl 9 Jan 2006 18:51:06 -0000 1.860 +++ wwwroot/cgi-bin/awstats.pl 22 Jan 2006 12:55:14 -0000 1.861 @@ -5542,7 +5542,7 @@ # No update but report by default when run from a browser $UpdateStats=($QueryString=~/update=1/i?1:0); - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } @@ -5591,7 +5591,7 @@ # Update with no report by default when run from command line $UpdateStats=1; - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig="$1"; } + if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 May 2006 08:17:08 -0000 1.6 +++ .cvsignore 7 May 2006 23:40:34 -0000 1.7 @@ -1 +1 @@ -awstats-6.6.tar.gz +awstats-6.5.tar.gz Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- awstats.spec 7 May 2006 08:17:08 -0000 1.10 +++ awstats.spec 7 May 2006 23:40:34 -0000 1.11 @@ -1,19 +1,19 @@ Name: awstats -Version: 6.6 -Release: 0.1.beta%{?dist} +Version: 6.5 +Release: 1%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet URL: http://awstats.sourceforge.net -#Source0: http://dl.sf.net/awstats/awstats-6.6.tar.gz -Source0: http://awstats.sourceforge.net/files/awstats-6.6.tar.gz -Source1: awstats.README.SELinux +Source0: http://dl.sf.net/awstats/awstats-6.5.tar.gz +#Source0: http://awstats.sourceforge.net/files/awstats-6.5.tar.gz +Patch0: awstats-6.5-CVE-2006-1945.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd Requires: perl -Requires(post): perl, policycoreutils -Requires(postun): /sbin/service, policycoreutils +Requires(post): perl +Requires(postun): /sbin/service %description Advanced Web Statistics is a powerful and featureful tool that generates @@ -31,19 +31,20 @@ With the default configuration, the statistics are available: http://localhost/awstats/awstats.pl - %prep %setup -q +# no backup or the orig file will be installed +%patch0 -p0 + # Fix style sheets. perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/* + # Fix some bad file permissions here for convenience. chmod -x tools/httpd_conf find tools/xslt -type f | xargs chmod -x + # Remove \r in conf file (file written on MS Windows) perl -pi -e 's/\r//g' tools/httpd_conf -# SELinux README -cp -a %{SOURCE1} README.SELinux - %install rm -rf $RPM_BUILD_ROOT @@ -81,7 +82,7 @@ ### Commit permanent changes to default configuration install -p -m 644 wwwroot/cgi-bin/awstats.model.conf \ $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf -perl -pi -e ' +%{__perl} -pi -e ' s|^LogFile=.*$|LogFile="%{_localstatedir}/log/httpd/access_log"|; s|^DirData=.*$|DirData="%{_localstatedir}/lib/awstats"|; s|^DirCgi=.*$|DirCgi="/awstats"|; @@ -92,17 +93,16 @@ s|^SaveDatabaseFilesWithPermissionsForEveryone=.*$|SaveDatabaseFilesWithPermissionsForEveryone=0|; s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|; s|^Expires=.*$|Expires=3600|; - ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf + ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf # Fix scripts -perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ +%{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \ $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf} # Apache configuration install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf -perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \ - $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf +%{__perl} -pi -e 's|/usr/local|%{_datadir}|g' $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf echo "# Additional Perl modules SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins @@ -115,7 +115,6 @@ %clean rm -rf $RPM_BUILD_ROOT - %post if [ $1 -eq 1 ]; then if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then @@ -125,27 +124,11 @@ ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || : fi fi -### SELinux support ### -# Set SELinux file_context -semanage fcontext -a -t httpd_sys_script_exec_t \ - '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : -semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : -# Actually change the context -chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin || : -chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats || : - %postun if [ $1 -ne 0 ]; then /sbin/service httpd condrestart >/dev/null 2>&1 fi -# SELinux support -if [ $1 -eq 0 ]; then - semanage fcontext -d -t httpd_sys_script_exec_t \ - '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || : - semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || : -fi - %files @@ -161,7 +144,7 @@ %{_datadir}/%{name}/wwwroot/cgi-bin # Different defattr to fix lots of files which should not be +x. %defattr(644,root,root,755) -%doc README.TXT docs/* README.SELinux +%doc README.TXT docs/* %{_datadir}/%{name}/lang %{_datadir}/%{name}/lib %{_datadir}/%{name}/plugins @@ -170,19 +153,7 @@ %{_datadir}/%{name}/wwwroot/icon %{_datadir}/%{name}/wwwroot/js - - %changelog -* Sun May 07 2006 Aurelien Bompard 6.6-0.1.beta -- version 6.6 (beta), fixes CVE-2005-2732 (bug 190921, 190922, and 190923) - -* Sun Apr 09 2006 Aurelien Bompard 6.5-3 -- SELinux support: use semanage to label the cgi and the database files -- Only allow access from localhost by default (this app has a security history) - -* Thu Feb 23 2006 Aurelien Bompard 6.5-2 -- rebuild for FC5 - * Wed Jan 11 2006 Aurelien Bompard 6.5-1 - version 6.5 final Index: sources =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 May 2006 08:17:08 -0000 1.9 +++ sources 7 May 2006 23:40:34 -0000 1.10 @@ -1 +1 @@ -c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz +aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz From fedora-extras-commits at redhat.com Sun May 7 23:49:31 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 16:49:31 -0700 Subject: rpms/nsd/FC-4 .cvsignore,1.3,1.4 Message-ID: <200605072349.k47NnXNI015026@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15005 Modified Files: .cvsignore Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 19:21:27 -0000 1.3 +++ .cvsignore 7 May 2006 23:49:31 -0000 1.4 @@ -1,2 +1 @@ -nsd-2.3.3.tar.gz nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Sun May 7 23:49:26 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 7 May 2006 16:49:26 -0700 Subject: rpms/awstats/FC-4 awstats.spec,1.11,1.12 Message-ID: <200605072349.k47NnS4P015007@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14988 Modified Files: awstats.spec Log Message: bump release Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- awstats.spec 7 May 2006 23:40:34 -0000 1.11 +++ awstats.spec 7 May 2006 23:49:26 -0000 1.12 @@ -1,6 +1,6 @@ Name: awstats Version: 6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -154,6 +154,9 @@ %{_datadir}/%{name}/wwwroot/js %changelog +* Mon May 08 2006 Aurelien Bompard 6.5-2 +- add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923) + * Wed Jan 11 2006 Aurelien Bompard 6.5-1 - version 6.5 final From fedora-extras-commits at redhat.com Sun May 7 23:53:35 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 7 May 2006 16:53:35 -0700 Subject: owners owners.list,1.956,1.957 Message-ID: <200605072353.k47Nrb4A015119@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15102 Modified Files: owners.list Log Message: Add raptor. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.956 retrieving revision 1.957 diff -u -r1.956 -r1.957 --- owners.list 7 May 2006 22:04:53 -0000 1.956 +++ owners.list 7 May 2006 23:53:35 -0000 1.957 @@ -1371,6 +1371,7 @@ Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|rapidsvn|Graphical interface for the Subversion revision control system|rpm at timj.co.uk|extras-qa at fedoraproject.org| +Fedora Extras|raptor|Raptor RDF Parser Toolkit for Redland|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 7 23:59:04 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sun, 7 May 2006 16:59:04 -0700 Subject: fedora-security/audit fe4,1.6,1.7 fe5,1.6,1.7 Message-ID: <200605072359.k47Nx4EC015186@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15164 Modified Files: fe4 fe5 Log Message: Note awstats fixes. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fe4 6 May 2006 17:31:44 -0000 1.6 +++ fe4 7 May 2006 23:59:01 -0000 1.7 @@ -7,4 +7,4 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-1989 version (clamav, fixed 0.88.2) -CVE-2006-1945 VULNERABLE (awstats) bz#190921 +CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fe5 6 May 2006 17:31:44 -0000 1.6 +++ fe5 7 May 2006 23:59:01 -0000 1.7 @@ -7,4 +7,4 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-1989 version (clamav, fixed 0.88.2) -CVE-2006-1945 VULNERABLE (awstats) bz#190922 +CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch From fedora-extras-commits at redhat.com Mon May 8 00:04:55 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sun, 7 May 2006 17:04:55 -0700 Subject: fedora-security/audit fe4,1.7,1.8 fe5,1.7,1.8 Message-ID: <200605080004.k4804twS017417@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17397 Modified Files: fe4 fe5 Log Message: Another awstats fix. Fix a typo in fe5 awstats version. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fe4 7 May 2006 23:59:01 -0000 1.7 +++ fe4 8 May 2006 00:04:52 -0000 1.8 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-NOID VULNERABLE (awstats) bz#190924 +CVE-NOID backport (awstats, fixed 6.5-2) bz#190923 awstats-6.5-CVE-2006-1945.patch CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fe5 7 May 2006 23:59:01 -0000 1.7 +++ fe5 8 May 2006 00:04:52 -0000 1.8 @@ -2,9 +2,9 @@ ** are items that need attention -CVE-NOID VULNERABLE (awstats) bz#190923 +CVE-NOID backport (awstats, fixed 6.5-4) bz#190923 awstats-6.5-CVE-2006-1945.patch CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-1989 version (clamav, fixed 0.88.2) -CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch +CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch From fedora-extras-commits at redhat.com Mon May 8 00:07:47 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:07:47 -0700 Subject: rpms/nsd/FC-4 nsd.spec,1.7,1.8 Message-ID: <200605080007.k4807nfD017443@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17426 Modified Files: nsd.spec Log Message: bump Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-4/nsd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsd.spec 7 May 2006 19:19:07 -0000 1.7 +++ nsd.spec 8 May 2006 00:07:47 -0000 1.8 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz @@ -76,11 +76,12 @@ fi %changelog -* Sun May 7 2006 Paul Wouters - 2.3.4-3 +* Sun May 7 2006 Paul Wouters - 2.3.4-4 - Upgraded to nsd-2.3.4. - Removed manual install targets because DESTDIR is now supported - Re-enabled --checking, checking patch no longer needed and removed. - Work around in nsd.init for nsd failing to start when there is no ipv6 +- Various release bumps due to 'make tag' failures :( * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Mon May 8 00:12:01 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 7 May 2006 17:12:01 -0700 Subject: owners owners.list,1.957,1.958 Message-ID: <200605080012.k480C3hd017518@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17501 Modified Files: owners.list Log Message: own mtd-utils and unifdef Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.957 retrieving revision 1.958 diff -u -r1.957 -r1.958 --- owners.list 7 May 2006 23:53:35 -0000 1.957 +++ owners.list 8 May 2006 00:12:01 -0000 1.958 @@ -772,6 +772,7 @@ 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|mtd-utils|Utilities for dealing with MTD (flash) devices|dwmw2 at redhat.com|extras-qa at fedoraproject.org|jwboyer at jdub.homelinux.org Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org| Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org| @@ -1579,6 +1580,7 @@ Fedora Extras|uim|A multilingual input method library|tagoh at redhat.com|extras-qa at fedoraproject.org|petersen at redhat.com Fedora Extras|ularn|Roguelike game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|ulogd|The userspace logging daemon for netfilter|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|unifdef|Unifdef tool for removing ifdef'd lines|dwmw2 at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|unison|File synchronization tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|unshield|Install InstallShield applications on a Pocket PC|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 00:24:38 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:24:38 -0700 Subject: rpms/nsd/FC-3 nsd.spec,1.6,1.7 Message-ID: <200605080024.k480OeNd017568@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17551 Modified Files: nsd.spec Log Message: bump Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsd.spec 7 May 2006 19:19:30 -0000 1.6 +++ nsd.spec 8 May 2006 00:24:38 -0000 1.7 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz @@ -76,11 +76,12 @@ fi %changelog -* Sun May 7 2006 Paul Wouters - 2.3.4-3 +* Sun May 7 2006 Paul Wouters - 2.3.4-4 - Upgraded to nsd-2.3.4. - Removed manual install targets because DESTDIR is now supported - Re-enabled --checking, checking patch no longer needed and removed. - Work around in nsd.init for nsd failing to start when there is no ipv6 +- Various release bumps due to 'make tag' failures :( * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Mon May 8 00:25:45 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:25:45 -0700 Subject: rpms/nsd/FC-3 sources,1.3,1.4 Message-ID: <200605080025.k480Pl5u017599@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17582 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 May 2006 19:21:51 -0000 1.3 +++ sources 8 May 2006 00:25:45 -0000 1.4 @@ -1,2 +1 @@ -7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz 72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Mon May 8 00:26:20 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:26:20 -0700 Subject: rpms/nsd/FC-3 .cvsignore,1.3,1.4 Message-ID: <200605080026.k480QMR2017651@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17634 Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 19:21:51 -0000 1.3 +++ .cvsignore 8 May 2006 00:26:20 -0000 1.4 @@ -1,2 +1 @@ -nsd-2.3.3.tar.gz nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Mon May 8 00:27:06 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 17:27:06 -0700 Subject: rpms/nsd/FC-3 nsd.spec,1.7,1.8 Message-ID: <200605080027.k480R8GK017704@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17687 Modified Files: nsd.spec Log Message: bump cause of cvsignore causing make tag to fail Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-3/nsd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsd.spec 8 May 2006 00:24:38 -0000 1.7 +++ nsd.spec 8 May 2006 00:27:06 -0000 1.8 @@ -1,7 +1,7 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd Version: 2.3.4 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Mon May 8 00:55:56 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 7 May 2006 17:55:56 -0700 Subject: rpms/glibmm24/devel .cvsignore, 1.8, 1.9 glibmm.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200605080055.k480twnT017940@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17919 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to 2.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 23 Mar 2006 02:36:22 -0000 1.8 +++ .cvsignore 8 May 2006 00:55:56 -0000 1.9 @@ -1 +1 @@ -glibmm-2.10.0.tar.bz2 +glibmm-2.10.1.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- glibmm.spec 23 Mar 2006 02:36:22 -0000 1.11 +++ glibmm.spec 8 May 2006 00:55:56 -0000 1.12 @@ -1,12 +1,12 @@ Name: glibmm24 -Version: 2.10.0 +Version: 2.10.1 Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) Group: System Environment/Libraries License: LGPL URL: http://gtkmm.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.10/glibmm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -77,6 +77,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Sun May 7 2006 Denis Leroy - 2.10.1-1 +- Update to 2.10.1 + * Mon Mar 20 2006 Denis Leroy - 2.10.0-1 - Update to 2.10.0, requires newer glib Index: sources =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 Mar 2006 02:36:22 -0000 1.9 +++ sources 8 May 2006 00:55:56 -0000 1.10 @@ -1 +1 @@ -3024ad2b8f8fd4f512e1f58d087599bb glibmm-2.10.0.tar.bz2 +3af9f4f3dbec200545f1eb21a678706d glibmm-2.10.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 01:01:29 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 7 May 2006 18:01:29 -0700 Subject: rpms/abiword/FC-5 abiword-2.4.4-x86_64.patch, NONE, 1.1 abiword.spec, 1.34, 1.35 Message-ID: <200605080102.k4812128020190@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20120 Modified Files: abiword.spec Added Files: abiword-2.4.4-x86_64.patch Log Message: fix 190591 abiword-2.4.4-x86_64.patch: --- NEW FILE abiword-2.4.4-x86_64.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2005-09-27 00:23:02.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2006-05-08 01:17:00.000000000 +0200 @@ -586,7 +586,7 @@ (!m_bSave ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL) + (gchar*)NULL) ); #endif Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- abiword.spec 12 Apr 2006 23:23:38 -0000 1.34 +++ abiword.spec 8 May 2006 01:01:29 -0000 1.35 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -44,6 +44,7 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.4-docbuild.patch +Patch3: abiword-2.4.4-x86_64.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -54,6 +55,7 @@ %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop %patch2 -p1 -b .docbuild +%patch3 -p1 -b .x86_64 %build cd abi @@ -135,6 +137,9 @@ %{_datadir}/icons/*png %changelog +* Mon May 08 2006 Marc Maurer - 1:2.4.4-3.fc5 +- Fix bug 190591 - crash on x86_64 machines when saving a document + * Wed Apr 12 2006 Marc Maurer - 1:2.4.4-2.fc5 - Fix documentation generation - Fix charting support From fedora-extras-commits at redhat.com Mon May 8 01:11:25 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 7 May 2006 18:11:25 -0700 Subject: rpms/gtkmm24/devel .cvsignore, 1.6, 1.7 gtkmm.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <200605080111.k481BRbb020352@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gtkmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331 Modified Files: .cvsignore gtkmm.spec sources Log Message: Update to 2.8.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Feb 2006 22:34:36 -0000 1.6 +++ .cvsignore 8 May 2006 01:11:25 -0000 1.7 @@ -1 +1 @@ -gtkmm-2.8.3.tar.bz2 +gtkmm-2.8.5.tar.bz2 Index: gtkmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/gtkmm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkmm.spec 28 Feb 2006 22:34:36 -0000 1.11 +++ gtkmm.spec 8 May 2006 01:11:25 -0000 1.12 @@ -1,5 +1,5 @@ Name: gtkmm24 -Version: 2.8.3 +Version: 2.8.5 Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) @@ -100,6 +100,9 @@ %changelog +* Sun May 7 2006 Denis Leroy - 2.8.5-1 +- Update to 2.8.5 + * Tue Feb 28 2006 Denis Leroy - 2.8.3-1 - Update to version 2.8.3 - Added optional macro to compile static libs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkmm24/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Feb 2006 22:34:36 -0000 1.8 +++ sources 8 May 2006 01:11:25 -0000 1.9 @@ -1 +1 @@ -578dca71e56db17f400abd21ca8e7ce5 gtkmm-2.8.3.tar.bz2 +630040e17bb491228ae22919188abcf2 gtkmm-2.8.5.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 01:23:17 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:23:17 -0700 Subject: rpms/hping2/FC-5 hping2-bytesex.patch, NONE, 1.1 hping2.spec, 1.9, 1.10 hping2-x86_64.patch, 1.1, NONE Message-ID: <200605080123.k481NJ5I020512@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20466 Modified Files: hping2.spec Added Files: hping2-bytesex.patch Removed Files: hping2-x86_64.patch Log Message: merged 64bit patches into one. hping2-bytesex.patch: --- NEW FILE hping2-bytesex.patch --- --- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 +++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 @@ -9,6 +9,8 @@ #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-5/hping2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hping2.spec 2 Mar 2006 21:30:26 -0000 1.9 +++ hping2.spec 8 May 2006 01:23:17 -0000 1.10 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.6.rc3 +Release: 0.7.rc3 Summary: TCP/IP stack auditing and much more Group: Applications/Internet @@ -8,7 +8,7 @@ URL: http://www.hping.org/ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch -Patch1: hping2-x86_64.patch +Patch1: hping2-bytesex.patch Patch2: hping2-getifnamedebug.patch Patch3: hping2-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,16 +21,10 @@ in order to transfer files under supported protocols. %prep -cat< +- Add patch to fix build on IA64 + * Wed Feb 08 2006 Peter Vrabec - rebuilt --- hping2-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 01:23:21 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:23:21 -0700 Subject: rpms/svnmailer - New directory Message-ID: <200605080123.k481NNLn020537@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20516/svnmailer Log Message: Directory /cvs/extras/rpms/svnmailer added to the repository From fedora-extras-commits at redhat.com Mon May 8 01:23:22 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:23:22 -0700 Subject: rpms/svnmailer/devel - New directory Message-ID: <200605080123.k481NOr4020540@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20516/svnmailer/devel Log Message: Directory /cvs/extras/rpms/svnmailer/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 01:23:44 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:23:44 -0700 Subject: rpms/svnmailer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605080123.k481NkNs020594@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20561 Added Files: Makefile import.log Log Message: Setup of module svnmailer --- NEW FILE Makefile --- # Top level Makefile for module svnmailer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 01:23:45 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:23:45 -0700 Subject: rpms/svnmailer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605080123.k481Nlbi020597@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20561/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module svnmailer --- NEW 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 May 8 01:24:42 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:24:42 -0700 Subject: rpms/hping2/devel hping2-bytesex.patch, NONE, 1.1 hping2.spec, 1.9, 1.10 hping2-x86_64.patch, 1.1, NONE Message-ID: <200605080124.k481OiMb020643@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20623 Modified Files: hping2.spec Added Files: hping2-bytesex.patch Removed Files: hping2-x86_64.patch Log Message: merged 64bit patches into one hping2-bytesex.patch: --- NEW FILE hping2-bytesex.patch --- --- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 +++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 @@ -9,6 +9,8 @@ #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hping2.spec 2 Mar 2006 21:30:26 -0000 1.9 +++ hping2.spec 8 May 2006 01:24:42 -0000 1.10 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.6.rc3 +Release: 0.7.rc3 Summary: TCP/IP stack auditing and much more Group: Applications/Internet @@ -8,7 +8,7 @@ URL: http://www.hping.org/ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch -Patch1: hping2-x86_64.patch +Patch1: hping2-bytesex.patch Patch2: hping2-getifnamedebug.patch Patch3: hping2-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,16 +21,10 @@ in order to transfer files under supported protocols. %prep -cat< +- Add patch to fix build on IA64 + * Wed Feb 08 2006 Peter Vrabec - rebuilt --- hping2-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 01:27:23 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:27:23 -0700 Subject: rpms/hping2/FC-5 hping2.spec,1.10,1.11 Message-ID: <200605080127.k481RPRR020753@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20736 Modified Files: hping2.spec Log Message: bump Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-5/hping2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hping2.spec 8 May 2006 01:23:17 -0000 1.10 +++ hping2.spec 8 May 2006 01:27:23 -0000 1.11 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.7.rc3 +Release: 0.8.rc3 Summary: TCP/IP stack auditing and much more Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 8 01:33:04 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:33:04 -0700 Subject: rpms/hping2/FC-4 hping2-bytesex.patch, NONE, 1.1 hping2.spec, 1.6, 1.7 hping2-x86_64.patch, 1.1, NONE Message-ID: <200605080133.k481X700020872@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20852 Modified Files: hping2.spec Added Files: hping2-bytesex.patch Removed Files: hping2-x86_64.patch Log Message: merged 64bit patches hping2-bytesex.patch: --- NEW FILE hping2-bytesex.patch --- --- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 +++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 @@ -9,6 +9,8 @@ #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-4/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 8 May 2006 01:33:04 -0000 1.7 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.4.rc3 +Release: 0.5.rc3 Summary: TCP/IP stack auditing and much more @@ -9,7 +9,7 @@ URL: http://www.hping.org/ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch -Patch1: hping2-x86_64.patch +Patch1: hping2-bytesex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -49,6 +49,9 @@ %{_mandir}/man8/* %changelog +* Sun May 07 2006 Paul Wouters - 2.0.0-0.5.rc3 +- Add patch to fix build on IA64 + * Fri Apr 7 2005 Michael Schwendt - rebuilt --- hping2-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 01:34:35 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:34:35 -0700 Subject: rpms/svnmailer/devel svnmailer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605080134.k481Yb2L020933@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/svnmailer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20913 Modified Files: .cvsignore sources Added Files: svnmailer.spec Log Message: * Mon May 8 2006 Michael Fleming 1.0.8-1 - Initial import into Fedora Extras - Update to new upstream version. --- NEW FILE svnmailer.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: svnmailer Version: 1.0.8 Release: 1%{?dist} Summary: Tool to post subversion repository commit information Group: Development/Tools License: Apache Software License URL: http://opensource.perlig.de/svnmailer/ Source0: http://storage.perlig.de/svnmailer/svnmailer-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel subversion >= 1.0.0 Requires: subversion >= 1.0.0 python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description Svnmailer is a tool to post subversion repository commit information by mail, news or XML (to a CIA tracker for example). %package doc Summary: Developer and API documentation for svnmailer Group: Development/Tools %description doc This package contains developer information and API documentation for the svnmailer tool %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README CHANGES CREDITS LICENSE NOTICE # Include files and dirs below %{python_sitelib} (for noarch packages) and # %{python_sitearch} (for arch-dependent packages) as appropriate, and mark # *.pyo as %ghost (do not include in package). %{_bindir}/svn-mailer %dir %{python_sitelib}/svnmailer %dir %{python_sitelib}/svnmailer/notifier %{python_sitelib}/svnmailer/*.py %{python_sitelib}/svnmailer/*.pyc %ghost %{python_sitelib}/svnmailer/*.pyo %{python_sitelib}/svnmailer/notifier/*.py %{python_sitelib}/svnmailer/notifier/*.pyc %ghost %{python_sitelib}/svnmailer/notifier/*.pyo %files doc %defattr(-,root,root,-) %doc docs/* %changelog * Mon May 8 2006 Michael Fleming 1.0.8-1 - Initial import into Fedora Extras - Update to new upstream version. * Tue Feb 28 2006 Michael Fleming 1.0.7-1 - Update to new upstream version. * Wed Feb 8 2006 Michael Fleming 1.0.6-3 - Use newer python template from fedora-rpmdevtools - Corrected license entry - Split off API / dev docs into subpackage * Tue Feb 7 2006 Michael Fleming 1.0.6-2 - Respun spec following comments from roozbeh * Sun Feb 5 2006 Michael Fleming 1.0.6-1 - Initial review package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/svnmailer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 01:23:45 -0000 1.1 +++ .cvsignore 8 May 2006 01:34:34 -0000 1.2 @@ -0,0 +1 @@ +svnmailer-1.0.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/svnmailer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 01:23:45 -0000 1.1 +++ sources 8 May 2006 01:34:34 -0000 1.2 @@ -0,0 +1 @@ +b4ea9caff6db64e7a415ac467e5e4b19 svnmailer-1.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 01:35:59 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:35:59 -0700 Subject: rpms/hping2/FC-4 hping2.spec,1.7,1.8 Message-ID: <200605080136.k481a1FA021021@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21004 Modified Files: hping2.spec Log Message: bump Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-4/hping2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hping2.spec 8 May 2006 01:33:04 -0000 1.7 +++ hping2.spec 8 May 2006 01:35:58 -0000 1.8 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.5.rc3 +Release: 0.6.rc3 Summary: TCP/IP stack auditing and much more @@ -49,7 +49,7 @@ %{_mandir}/man8/* %changelog -* Sun May 07 2006 Paul Wouters - 2.0.0-0.5.rc3 +* Sun May 07 2006 Paul Wouters - 2.0.0-0.6.rc3 - Add patch to fix build on IA64 * Fri Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Mon May 8 01:37:53 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:37:53 -0700 Subject: rpms/hping2/FC-4 hping2.spec,1.8,1.9 Message-ID: <200605080137.k481btX5021077@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21060 Modified Files: hping2.spec Log Message: Add disttag to release Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-4/hping2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hping2.spec 8 May 2006 01:35:58 -0000 1.8 +++ hping2.spec 8 May 2006 01:37:52 -0000 1.9 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.6.rc3 +Release: 0.6.rc3%{?dist} Summary: TCP/IP stack auditing and much more From fedora-extras-commits at redhat.com Mon May 8 01:38:54 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:38:54 -0700 Subject: rpms/hping2/FC-5 hping2.spec,1.11,1.12 Message-ID: <200605080138.k481cuLg021142@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21125 Modified Files: hping2.spec Log Message: Added disttag to release Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-5/hping2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- hping2.spec 8 May 2006 01:27:23 -0000 1.11 +++ hping2.spec 8 May 2006 01:38:54 -0000 1.12 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.8.rc3 +Release: 0.8.rc3%{?dist} Summary: TCP/IP stack auditing and much more Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 8 01:39:20 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:39:20 -0700 Subject: rpms/hping2/devel hping2.spec,1.10,1.11 Message-ID: <200605080139.k481dMTO021165@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21148 Modified Files: hping2.spec Log Message: added disttag to release Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hping2.spec 8 May 2006 01:24:42 -0000 1.10 +++ hping2.spec 8 May 2006 01:39:20 -0000 1.11 @@ -1,6 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.7.rc3 +Release: 0.7.rc3%{?dist} Summary: TCP/IP stack auditing and much more Group: Applications/Internet From fedora-extras-commits at redhat.com Mon May 8 01:40:33 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sun, 7 May 2006 18:40:33 -0700 Subject: rpms/hping2/FC-3 hping2-bytesex.patch, NONE, 1.1 hping2.spec, 1.4, 1.5 hping2-x86_64.patch, 1.1, NONE Message-ID: <200605080140.k481eZ1F021203@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/hping2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21183 Modified Files: hping2.spec Added Files: hping2-bytesex.patch Removed Files: hping2-x86_64.patch Log Message: merge 64bit patches hping2-bytesex.patch: --- NEW FILE hping2-bytesex.patch --- --- bytesex.h.orig 2003-07-28 05:00:55.000000000 -0400 +++ bytesex.h 2006-05-07 21:19:31.000000000 -0400 @@ -9,6 +9,8 @@ #if defined(__i386__) \ || defined(__alpha__) \ + || defined(__x86_64__) \ + || defined(__ia64__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/FC-3/hping2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hping2.spec 13 Feb 2005 11:49:15 -0000 1.4 +++ hping2.spec 8 May 2006 01:40:33 -0000 1.5 @@ -1,15 +1,15 @@ Name: hping2 Version: 2.0.0 -Release: 0.3.rc3 -Epoch: 0 -Summary: A software to do TCP/IP stack auditing and much more +Release: 0.6.rc3%{?dist} + +Summary: TCP/IP stack auditing and much more Group: Applications/Internet License: GPL -URL: http://www.hping.org/ +URL: http://www.hping.org/ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch -Patch1: hping2-x86_64.patch +Patch1: hping2-bytesex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -43,13 +43,18 @@ %files %defattr(0644,root,root,0755) +%doc COPYING *BUGS CHANGES README TODO docs/AS-BACKDOOR docs/HPING2-HOWTO.txt +%doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt %attr(755,root,root) %{_sbindir}/* %{_mandir}/man8/* -%doc COPYING *BUGS CHANGES README TODO docs/AS-BACKDOOR docs/HPING2-HOWTO.txt -%doc docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt - %changelog +* Sun May 07 2006 Paul Wouters - 2.0.0-0.6.rc3 +- Add patch to fix build on IA64 + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sun Feb 13 2005 Thorsten Leemhuis - 2.0.0-0.3.rc3 - Add patch to fix build on x86_64 --- hping2-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 01:48:19 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sun, 7 May 2006 18:48:19 -0700 Subject: owners owners.list,1.958,1.959 Message-ID: <200605080148.k481mMB1021291@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21274 Modified Files: owners.list Log Message: Added svnmailer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.958 retrieving revision 1.959 diff -u -r1.958 -r1.959 --- owners.list 8 May 2006 00:12:01 -0000 1.958 +++ owners.list 8 May 2006 01:48:19 -0000 1.959 @@ -1488,6 +1488,7 @@ Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|swh-plugins|A set of audio plugins for LADSPA|green at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 03:00:25 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 7 May 2006 20:00:25 -0700 Subject: kadischi/ks_examples standard-livecd.cfg, NONE, 1.1 Makefile.am, 1.1.1.1, 1.2 minimal-livecd.cfg, 1.3, 1.4 Message-ID: <200605080300.k4830PVl023876@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/ks_examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23856/kadischi/ks_examples Modified Files: Makefile.am minimal-livecd.cfg Added Files: standard-livecd.cfg Log Message: ks_examples/ standard-livecd.cfg and minimal-livecd.cfg changes --- NEW FILE standard-livecd.cfg --- # Kickstart file automatically generated by anaconda. # File: ks.cfg_FC5-LiveCD-generic # Built by: Eugene Teo # Date: 20060507 ############################################################################### # FC5 kickstart for Kadischi (Generic) # Eugene Teo # # Feel free to make any changes to my kickstart file. Kadischi was able to # create a 641MB ISO based on this. If you make any improvements to this file, # do email me the changes so that i can learn from you too. # # Usage: # kadischi /path_to_repo /path_to_iso --kickstart=ks.cfg_FC5-LiveCD-generic # kadischi http://path_to_repo /path_to_iso --kickstart=ks.cfg_FC5-LiveCD-generic # ############################################################################### #--------------------------------------------------------------# lang en_US.UTF-8 keyboard us #timezone --utc Asia/Singapore timezone --utc GMT # Default root password: redhat rootpw --iscrypted $1$PvvvUg73$zWYeWG2HFaMCgO9B/RE6B. #--------------------------------------------------------------# install xconfig --driver "vesa" --videoram 65472 --resolution 800x600 --depth 16 --startxonboot monitor --hsync 31.5-37.9 --vsync 50-70 network --device eth0 --bootproto dhcp network --device eth1 --onboot no --bootproto dhcp network --device sit0 --onboot no --bootproto dhcp network --device tun0 --onboot no --bootproto dhcp network --device vmnet1 --onboot no --bootproto dhcp network --device vmnet8 --onboot no --bootproto dhcp firewall --enabled --port=22:tcp #selinux --disabled selinux --enforcing authconfig --enableshadow --enablemd5 #--------------------------------------------------------------# bootloader --location=none # The following is the partition information you requested # Note that any partitions you deleted are not expressed # here so unless you clear all partitions first, this is # not guaranteed to work #clearpart --linux #--------------------------------------------------------------# %packages @admin-tools @base @base-x @core @gnome-desktop @graphical-internet @office @printing @sound-and-video # korean-support # chinese-support # thai-support bsf comps-extras cracklib-dicts gnome-mime-data iso-codes rmt tzdata %post useradd redhat # Default user password: redhat usermod -p '$1$PvvvUg73$zWYeWG2HFaMCgO9B/RE6B.' redhat echo -e "[security]\nDisallowTCP=false\n\n[daemon]\nAutomaticLoginEnable=true\nAutomaticLogin=redhat\n\n[greeter]\n" > /etc/gdm/custom.conf Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/ks_examples/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile.am 21 Aug 2005 17:09:06 -0000 1.1.1.1 +++ Makefile.am 8 May 2006 03:00:23 -0000 1.2 @@ -1,5 +1,5 @@ ksdir = $(pkgdatadir)/ks_examples -ks_DATA = minimal-livecd.cfg +ks_DATA = minimal-livecd.cfg standard-livecd.cfg uninstall-hook: - rmdir $(ksdir) \ No newline at end of file + rmdir $(ksdir) Index: minimal-livecd.cfg =================================================================== RCS file: /cvs/devel/kadischi/ks_examples/minimal-livecd.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- minimal-livecd.cfg 20 Mar 2006 05:59:00 -0000 1.3 +++ minimal-livecd.cfg 8 May 2006 03:00:23 -0000 1.4 @@ -23,5 +23,45 @@ reboot %packages +# Packages to exclude for minimal package set +- atk +- bind +- bind-libs +- bind-utils +- bluez-libs +- bluez-pin +- bluez-utils +- caching-nameserver +- cairo +- cyrus-sasl-plain +- expat +- freeglut +- GConf2 +- htmlview +- irda-utils +- libglade2 +- libICE +- libIDL +- libSM +- libX11 +- libXau +- libXcursor +- libXdmcp +- libXext +- libXfixes +- libXft +- libXi +- libXinerama +- libXmu +- libXrandr +- libXrender +- libXt +- libXxf86vm +- mesa-libGL +- mesa-libGLU +- NetworkManager +- numactl +- ORBit2 +# End package set %post From fedora-extras-commits at redhat.com Mon May 8 03:56:49 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 20:56:49 -0700 Subject: rpms/perl-Class-Inspector/devel .cvsignore, 1.3, 1.4 perl-Class-Inspector.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605080356.k483updf030667@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30638 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Sep 2005 13:06:13 -0000 1.3 +++ .cvsignore 8 May 2006 03:56:49 -0000 1.4 @@ -1 +1 @@ -Class-Inspector-1.13.tar.gz +Class-Inspector-1.15.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Inspector.spec 28 Feb 2006 23:18:47 -0000 1.5 +++ perl-Class-Inspector.spec 8 May 2006 03:56:49 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.13 -Release: 2%{?dist} +Version: 1.15 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 1.15-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 1.13-2 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Sep 2005 13:06:13 -0000 1.3 +++ sources 8 May 2006 03:56:49 -0000 1.4 @@ -1 +1 @@ -ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz +b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:00:18 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:00:18 -0700 Subject: rpms/perl-Params-Util/devel .cvsignore, 1.8, 1.9 perl-Params-Util.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605080400.k4840Kw3031339@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31310 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Apr 2006 16:33:26 -0000 1.8 +++ .cvsignore 8 May 2006 04:00:18 -0000 1.9 @@ -1 +1 @@ -Params-Util-0.11.tar.gz +Params-Util-0.13.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Params-Util.spec 20 Apr 2006 16:33:26 -0000 1.8 +++ perl-Params-Util.spec 8 May 2006 04:00:18 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.11 +Version: 0.13 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 0.13-1 +- Upstream update. + * Thu Apr 20 2006 Ralf Cors??pius - 0.11-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Apr 2006 16:33:26 -0000 1.8 +++ sources 8 May 2006 04:00:18 -0000 1.9 @@ -1 +1 @@ -d3fce431cff46caa926ece63fda73946 Params-Util-0.11.tar.gz +1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:19:41 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:19:41 -0700 Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.8, 1.9 perl-Params-Util.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605080419.k484JhGt001786@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1765 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Apr 2006 01:30:48 -0000 1.8 +++ .cvsignore 8 May 2006 04:19:41 -0000 1.9 @@ -1 +1 @@ -Params-Util-0.11.tar.gz +Params-Util-0.13.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Params-Util.spec 22 Apr 2006 01:30:48 -0000 1.8 +++ perl-Params-Util.spec 8 May 2006 04:19:41 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.11 +Version: 0.13 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 0.13-1 +- Upstream update. + * Thu Apr 20 2006 Ralf Cors??pius - 0.11-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Apr 2006 01:30:48 -0000 1.8 +++ sources 8 May 2006 04:19:41 -0000 1.9 @@ -1 +1 @@ -d3fce431cff46caa926ece63fda73946 Params-Util-0.11.tar.gz +1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:20:46 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:20:46 -0700 Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.8, 1.9 perl-Params-Util.spec, 1.7, 1.8 sources, 1.8, 1.9 Message-ID: <200605080420.k484KmaL001856@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1835 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Apr 2006 01:33:15 -0000 1.8 +++ .cvsignore 8 May 2006 04:20:46 -0000 1.9 @@ -1 +1 @@ -Params-Util-0.11.tar.gz +Params-Util-0.13.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Params-Util.spec 22 Apr 2006 01:33:16 -0000 1.7 +++ perl-Params-Util.spec 8 May 2006 04:20:46 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.11 +Version: 0.13 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,9 +49,15 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 0.13-1 +- Upstream update. + * Thu Apr 20 2006 Ralf Cors??pius - 0.11-1 - Upstream update. +* Wed Mar 01 2006 Ralf Cors??pius - 0.10-2 +- Rebuild for perl-5.8.8. + * Wed Jan 18 2006 Ralf Cors??pius - 0.10-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Apr 2006 01:33:16 -0000 1.8 +++ sources 8 May 2006 04:20:46 -0000 1.9 @@ -1 +1 @@ -d3fce431cff46caa926ece63fda73946 Params-Util-0.11.tar.gz +1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:23:32 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:23:32 -0700 Subject: rpms/perl-Class-Inspector/FC-5 .cvsignore, 1.3, 1.4 perl-Class-Inspector.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605080423.k484NYsn001936@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1915 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Sep 2005 13:06:13 -0000 1.3 +++ .cvsignore 8 May 2006 04:23:32 -0000 1.4 @@ -1 +1 @@ -Class-Inspector-1.13.tar.gz +Class-Inspector-1.15.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/perl-Class-Inspector.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Inspector.spec 28 Feb 2006 23:18:47 -0000 1.5 +++ perl-Class-Inspector.spec 8 May 2006 04:23:32 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Class-Inspector -Version: 1.13 -Release: 2%{?dist} +Version: 1.15 +Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 1.15-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 1.13-2 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Sep 2005 13:06:13 -0000 1.3 +++ sources 8 May 2006 04:23:32 -0000 1.4 @@ -1 +1 @@ -ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz +b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:25:33 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:25:33 -0700 Subject: rpms/perl-Class-Inspector/FC-4 .cvsignore, 1.3, 1.4 perl-Class-Inspector.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605080425.k484PZdP002006@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1985 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Sep 2005 13:11:46 -0000 1.3 +++ .cvsignore 8 May 2006 04:25:33 -0000 1.4 @@ -1 +1 @@ -Class-Inspector-1.13.tar.gz +Class-Inspector-1.15.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/perl-Class-Inspector.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-Inspector.spec 29 Sep 2005 13:11:46 -0000 1.4 +++ perl-Class-Inspector.spec 8 May 2006 04:25:33 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.13 +Version: 1.15 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 08 2006 Ralf Cors??pius - 1.15-1 +- Upstream update. + * Thu Sep 29 2005 Ralf Corsepius - 1.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Sep 2005 13:11:46 -0000 1.3 +++ sources 8 May 2006 04:25:33 -0000 1.4 @@ -1 +1 @@ -ffce59a030a0c2d3234d285be96530e0 Class-Inspector-1.13.tar.gz +b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz From fedora-extras-commits at redhat.com Mon May 8 04:42:23 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 7 May 2006 21:42:23 -0700 Subject: rpms/perl-Params-Validate/FC-4 .cvsignore, 1.4, 1.5 perl-Params-Validate.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605080442.k484gPlt002144@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2123 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: * Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Feb 2006 05:53:25 -0000 1.4 +++ .cvsignore 8 May 2006 04:42:23 -0000 1.5 @@ -1 +1 @@ -Params-Validate-0.80.tar.gz +Params-Validate-0.81.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/perl-Params-Validate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Params-Validate.spec 1 Feb 2006 05:53:25 -0000 1.4 +++ perl-Params-Validate.spec 8 May 2006 04:42:23 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.80 +Version: 0.81 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 +- Upstream update. + * Wed Feb 01 2006 Ralf Cors??pius - 0.80-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Feb 2006 05:53:25 -0000 1.4 +++ sources 8 May 2006 04:42:23 -0000 1.5 @@ -1 +1 @@ -37acde17038290becdef848f566698d6 Params-Validate-0.80.tar.gz +033d043c4764b800722b9d7442bc4530 Params-Validate-0.81.tar.gz From fedora-extras-commits at redhat.com Mon May 8 08:20:08 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 8 May 2006 01:20:08 -0700 Subject: fedora-security/audit fc4,1.232,1.233 fc5,1.146,1.147 Message-ID: <200605080820.k488K8eW011746@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11726 Modified Files: fc4 fc5 Log Message: Update for weekend, not including kernel updates from May 5 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- fc4 5 May 2006 19:54:11 -0000 1.232 +++ fc4 8 May 2006 08:20:05 -0000 1.233 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060502 -Up to date FC4 as of 20060502 +Up to date CVE as of CVE email 20060507 +Up to date FC4 as of 20060507 ** are items that need attention +CVE-2006-2224 VULNERABLE (quagga) +CVE-2006-2223 VULNERABLE (quagga) CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- fc5 5 May 2006 19:54:11 -0000 1.146 +++ fc5 8 May 2006 08:20:05 -0000 1.147 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060502 -Up to date FC5 as of 20060502 +Up to date CVE as of CVE email 20060507 +Up to date FC5 as of 20060507 ** are items that need attention +CVE-2006-2224 VULNERABLE (quagga) +CVE-2006-2223 VULNERABLE (quagga) CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 From fedora-extras-commits at redhat.com Mon May 8 08:46:21 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 8 May 2006 01:46:21 -0700 Subject: comps comps-fe5.xml, 1.5, 1.6 comps-fe5.xml.in, 1.44, 1.45 comps-fe6.xml.in, 1.7, 1.8 Message-ID: <200605080846.k488kNBi011884@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11862 Modified Files: comps-fe5.xml comps-fe5.xml.in comps-fe6.xml.in Log Message: Added svnmailer Index: comps-fe5.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- comps-fe5.xml 17 Apr 2006 17:49:10 -0000 1.5 +++ comps-fe5.xml 8 May 2006 08:46:21 -0000 1.6 @@ -56,6 +56,7 @@ quilt rpmlint splint + svnmailer tkcvs tla yap @@ -813,4 +814,4 @@ network-server - \ No newline at end of file + Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- comps-fe5.xml.in 1 May 2006 20:38:34 -0000 1.44 +++ comps-fe5.xml.in 8 May 2006 08:46:21 -0000 1.45 @@ -58,6 +58,7 @@ quilt rpmlint splint + svnmailer tkcvs tla yap Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- comps-fe6.xml.in 1 May 2006 20:38:34 -0000 1.7 +++ comps-fe6.xml.in 8 May 2006 08:46:21 -0000 1.8 @@ -58,6 +58,7 @@ quilt rpmlint splint + svnmailer tkcvs tla yap From fedora-extras-commits at redhat.com Mon May 8 09:37:01 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Mon, 8 May 2006 02:37:01 -0700 Subject: fedora-security/audit fc4,1.233,1.234 fc5,1.147,1.148 Message-ID: <200605080937.k489b1l3014313@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14293/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-1864 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- fc4 8 May 2006 08:20:05 -0000 1.233 +++ fc4 8 May 2006 09:36:59 -0000 1.234 @@ -28,7 +28,7 @@ CVE-2006-1932 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability -CVE-2006-1864 VULNERABLE (kernel) +CVE-2006-1864 VULNERABLE (kernel, fixed 2.6.16.14) CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- fc5 8 May 2006 08:20:05 -0000 1.147 +++ fc5 8 May 2006 09:36:59 -0000 1.148 @@ -29,7 +29,7 @@ CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] -CVE-2006-1864 ignore (kernel) not compiled in +CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1790 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] From fedora-extras-commits at redhat.com Mon May 8 09:50:11 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Mon, 8 May 2006 02:50:11 -0700 Subject: fedora-security/audit fc4,1.234,1.235 Message-ID: <200605080950.k489oBSe014569@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14535/audit Modified Files: fc4 Log Message: Update with FEDORA-2006-517 (kernel) Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- fc4 8 May 2006 09:36:59 -0000 1.234 +++ fc4 8 May 2006 09:50:08 -0000 1.235 @@ -28,7 +28,7 @@ CVE-2006-1932 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-461] CVE-2006-1931 version (ruby, fixed 1.8.3) #189540 CVE-2006-1902 ignore (gcc) not a vulnerability -CVE-2006-1864 VULNERABLE (kernel, fixed 2.6.16.14) +CVE-2006-1864 version (kernel, fixed 2.6.16.14) [since FEDORA-2006-517] CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] From fedora-extras-commits at redhat.com Mon May 8 11:15:20 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 8 May 2006 04:15:20 -0700 Subject: rpms/abiword/FC-4 abiword-2.4.4-x86_64.patch, NONE, 1.1 abiword.spec, 1.23, 1.24 Message-ID: <200605081115.k48BFMv0020972@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20952 Modified Files: abiword.spec Added Files: abiword-2.4.4-x86_64.patch Log Message: Fix crash on x86_64 abiword-2.4.4-x86_64.patch: --- NEW FILE abiword-2.4.4-x86_64.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2005-09-27 00:23:02.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2006-05-08 01:17:00.000000000 +0200 @@ -586,7 +586,7 @@ (!m_bSave ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL) + (gchar*)NULL) ); #endif Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- abiword.spec 13 Apr 2006 11:57:11 -0000 1.23 +++ abiword.spec 8 May 2006 11:15:20 -0000 1.24 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -43,6 +43,7 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.4-docbuild.patch +Patch3: abiword-2.4.4-x86_64.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -53,6 +54,7 @@ %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop %patch2 -p1 -b .docbuild +%patch3 -p1 -b .x86_64 %build cd abi @@ -136,6 +138,9 @@ %{_datadir}/icons/*png %changelog +* Mon May 08 2006 Marc Maurer - 1:2.4.4-3.fc4 +- Fix bug 190591 - crash on x86_64 machines when saving a document + * Tue Apr 13 2006 Marc Maurer - 1:2.4.4-2.fc4 - Fix documentation generation From fedora-extras-commits at redhat.com Mon May 8 13:46:36 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 8 May 2006 06:46:36 -0700 Subject: rpms/rssowl/FC-5 rssowl.spec,1.8,1.9 Message-ID: <200605081346.k48DkcIq026140@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26123 Modified Files: rssowl.spec Log Message: Fix bugzilla 191044. Release -2. Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rssowl.spec 6 May 2006 17:24:01 -0000 1.8 +++ rssowl.spec 8 May 2006 13:46:36 -0000 1.9 @@ -1,6 +1,6 @@ %define name rssowl %define version 1.2.1 -%define release 1%{?dist} +%define release 2%{?dist} %define jdk java Name: %name @@ -110,7 +110,7 @@ %post %{_bindir}/rebuild-gcj-db -update-desktop-database %{_datadir}/application +update-desktop-database %{_datadir}/applications # update icon themes touch %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -140,6 +140,10 @@ %{_libdir}/gcj/%{name} %changelog +* Mon May 8 2006 Anthony Green - 1.2.1-2 +- Fix bugzilla #191044 - postinstall scriptlet typo error. + Thanks to Chien-Chung Yeh for the fix. + * Sat May 6 2006 Anthony Green - 1.2.1-1 - Update sources. From fedora-extras-commits at redhat.com Mon May 8 14:21:41 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Mon, 8 May 2006 07:21:41 -0700 Subject: extras-buildsys/utils extras-push-all,1.3,1.4 Message-ID: <200605081421.k48ELfV2028593@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28557 Modified Files: extras-push-all Log Message: Add sanity tests for group and gpg .rpmmacros setup. Index: extras-push-all =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- extras-push-all 4 May 2006 19:49:36 -0000 1.3 +++ extras-push-all 8 May 2006 14:21:38 -0000 1.4 @@ -14,6 +14,21 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Sanity Tests +if [ "`id -g -n`" != "extras_signers" ]; then + echo "ERROR: Your group must be extras_signers. Try \`newgrp extras_signers\' before running this again." + exit 1 +fi +if [ ! -h ~/.rpmmacros ]; then + echo "ERROR: ~/.rpmmacros must be a symbolic link." + exit 1 +fi +if [ "`readlink -f ~/.rpmmacros`" != "/srv/extras-push/.rpmmacros" ]; then + echo "ERROR: ~/.rpmmacros must be pointing at /srv/extras-push/.rpmmacros." + exit 1 +fi + +# Sign & Push [ "$1" = "-f" ] && force=yes || force= dists="3 4 5 development" changed= From fedora-extras-commits at redhat.com Mon May 8 14:24:37 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:24:37 -0700 Subject: extras-buildsys/common FileTransfer.py, NONE, 1.1 FileUploader.py, 1.1, 1.2 FileDownloader.py, 1.18, 1.19 Message-ID: <200605081424.k48EObMo028657@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28620/common Modified Files: FileUploader.py FileDownloader.py Added Files: FileTransfer.py Log Message: 2006-05-08 Dan Williams * common/FileTransfer.py - Refactor common code from FileDownload.py and FileUpload.py into FileTransfer.py * common/FileDownload.py - pylint cleanups - Refactor for FileTransfer.py - Allow multiple transfers for one FileDownloader object * common/FileUploader.py - pylint cleanups - Refactor for FileTransfer.py - Allow multiple uploads for one FileUploader object --- NEW FILE FileTransfer.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2006 Dan Williams and Red Hat, Inc. import threading import URLopener import time FT_RESULT_SUCCESS = 'success' FT_RESULT_FAILED = 'failed' FT_RESULT_CANCELED = 'canceled' class FileTransfer(threading.Thread): def __init__(self, url, certs=None): self._callback = None self._cb_data = None self._cancel = False self._tries = 5 self._opener = None if not url: raise Exception("Require a URL to download.") self._url = url if certs: if type(certs) is not type({}): raise ValueError("Certs must be a dict of certificate paths.") self._certs = certs self._opener = URLopener.PlgURLopener(self._certs, 20) threading.Thread.__init__(self) def set_tries(self, tries): if tries <= 0: raise ValueError("Tries must be larger than 0") self._tries = tries def set_callback(self, callback, cb_data): self._callback = callback self._cb_data = cb_data def cancel(self): self._cancel = True def _action(self, data=None): # Should be implemented by subclasses return (False, "_action should be implemented by subclass") def _process_one_transfer(self, data=None): """Retries a transfer for a specified number of times before failing.""" status = FT_RESULT_FAILED result = msg = None for attempt in range(1, self._tries + 1): (result, msg) = self._action(data) if result: status = FT_RESULT_SUCCESS break if self._cancel: status = FT_RESULT_CANCELED break time.sleep(5) msg = "Transfer of timed out." return (status, msg) def run(self): (status, msg) = self._process_one_transfer() if self._callback: self._callback(status, self._cb_data, msg) Index: FileUploader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileUploader.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileUploader.py 27 Mar 2006 04:12:11 -0000 1.1 +++ FileUploader.py 8 May 2006 14:24:30 -0000 1.2 @@ -23,40 +23,62 @@ import OpenSSL import CommonErrors import exceptions +import FileTransfer -class FileUploader(threading.Thread): - def __init__(self, callback, cb_data, url, data, certs=None): - self._callback = callback - self._cb_data = cb_data - self._url = url - self._data = data - self._opener = URLopener.PlgURLopener(certs, 20) - threading.Thread.__init__(self) +class FileUploader(FileTransfer.FileTransfer): + def __init__(self, url, files, filevar, cgi_vars=None, certs=None): + FileTransfer.FileTransfer.__init__(self, url, certs) + self._files = {} + + if files and type(files) == type(""): + files = [files] + if not files or type(files) is not type([]): + raise ValueError("Require a list of files to upload.") + for fpath in files: + self._files[os.path.abspath(fpath)] = (None, None) + self._filevar = filevar + + if cgi_vars: + if type(cgi_vars) is not type([]): + raise ValueError("cgi_vars must be a list of tuples") + for var in cgi_vars: + if type(var) is not type(()): + raise ValueError("cgi_vars must be a list of tuples") + self._cgi_vars = cgi_vars - def run(self): + def _action(self, cgivars=None): result = None err_msg = None - if self._url and self._data: - try: - result = self._opener.open(self._url, self._data) -# except SSL.SSLError, e: -# # Don't traceback on dropped connections or timeouts -# if CommonErrors.canIgnoreSSLError(e): -# pass - except socket.error, e: - if not CommonErrors.canIgnoreSocketError(e): - err_msg = "Socket Error: %s" % e - except IOError, e: - if not CommonErrors.canIgnoreSocketError(e): - err_msg = "IOError Error: %s" % e - - if result: - self._callback('done', self._cb_data, err_msg) - else: - self._callback('failed', self._cb_data, err_msg) - + try: + result = self._opener.open(self._url, cgivars) + except socket.error, exc: + if not CommonErrors.canIgnoreSocketError(exc): + err_msg = "Socket Error: %s" % exc + except IOError, exc: + if not CommonErrors.canIgnoreSocketError(exc): + err_msg = "IOError Error: %s" % exc + return (result, err_msg) + def run(self): + final_result = FileTransfer.FT_RESULT_SUCCESS + msg = None + for fpath in self._files.keys(): + fd = open(fpath, "r") + cgivars = [(self._filevar, fd)] + cgivars = cgivars + self._cgi_vars + (result, msg) = self._process_one_transfer(cgivars) + fd.close() + self._files[fpath] = (result, msg) + if result == FileTransfer.FT_RESULT_FAILED: + final_result = FileTransfer.FT_RESULT_FAILED + msg = "Upload of %s failed because: %s" % (fpath, msg) + break + if self._cancel: + final_result = FileTransfer.FT_RESULT_CANCELED + break + if self._callback: + self._callback(final_result, self._cb_data, msg) ########################################################### # Testing stuff @@ -64,7 +86,7 @@ import sys, time -class dlwr: +class UlCallbackData: def __init__(self, x, t): self.num = x self.tracker = t @@ -74,62 +96,57 @@ self.dl = dl -class dl_tracker: +class UlTracker: def __init__(self): self.lst = [] - def add(self, dlwr): - self.lst.append(dlwr) + def add(self, ulcbdata): + self.lst.append(ulcbdata) - def remove(self, dlwr): - self.lst.remove(dlwr) + def remove(self, ulcbdata): + self.lst.remove(ulcbdata) def num(self): return len(self.lst) -def ul_callback(status, dlwr, msg=""): - print "Finished with %d (%s: %s)" % (dlwr.num, status, msg) - dlwr.tracker.remove(dlwr) +def UploadCallback(status, ulcbdata, msg=""): + print "Finished with %d (%s: %s)" % (ulcbdata.num, status, msg) + ulcbdata.tracker.remove(ulcbdata) if __name__ == '__main__': if len(sys.argv) < 5: - print "Usage: python FileUploader.py filename key_and_cert ca_cert peer_ca_cert" + print "Usage: python FileUploader.py key_and_cert ca_cert peer_ca_cert fname1 fname2 ..." sys.exit(1) certs = {} - certs['key_and_cert'] = sys.argv[2] - certs['ca_cert'] = sys.argv[3] - certs['peer_ca_cert'] = sys.argv[4] + 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() + dlt = UlTracker() x = 0 - filename = sys.argv[1] + files = [] + for fname in sys.argv[4:]: + files.append(os.path.abspath(fname)) + while x < 100: - wr = dlwr(x, dlt) - time.sleep(0.25) + wr = UlCallbackData(x, dlt) + try: + time.sleep(0.25) + except KeyboardInterrupt: + break data = [] data.append(('jobid', x)) data.append(('arch', 'i386')) - import shutil, string - name = os.path.basename(filename) - parts = name.split(".") - ext = parts[-1] - firstpart = string.join(parts[:len(parts)-1], ".") - try: - os.makedirs("/tmp/foo") - except: - pass - newname = os.path.join("/tmp/foo", firstpart + "-%s.%s" % (x, ext)) - shutil.copyfile(filename, newname) - fd = open(newname, "r") - data.append(('filedata', fd)) - dl = FileUploader(ul_callback, wr, "https://localhost:8886/upload", data, certs) + ful = FileUploader("https://localhost:8886/upload", files, + 'filedata', data, certs) + ful.set_callback(UploadCallback, wr) dlt.add(wr) - dl.start() + ful.start() x = x + 1 while dlt.num() > 0: Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- FileDownloader.py 27 Mar 2006 04:12:11 -0000 1.18 +++ FileDownloader.py 8 May 2006 14:24:30 -0000 1.19 @@ -14,18 +14,17 @@ # # Copyright 2005 Dan Williams and Red Hat, Inc. -import threading import urllib -import string import os import socket -import URLopener -import OpenSSL import CommonErrors import exceptions +import time +import FileTransfer -class FileNameException(exceptions.Exception): pass +class FileNameException(exceptions.Exception): + pass def get_base_filename_from_url(url, legal_exts): """ Safely unquotes a URL and gets the base file name from it. @@ -65,91 +64,102 @@ # FIXME: what other validation can we do here? safe_list = ['_', '-', '.', '+'] - for c in filename: + for char in filename: # For now, legal characters are '_-.' plus alphanumeric - if c in safe_list or c.isalnum(): + if char in safe_list or char.isalnum(): pass else: - raise FileNameException("Illegal character '%s' encountered." % c) + raise FileNameException("Illegal character '%s' encountered." % char) return filename -class FileDownloader(threading.Thread): - def __init__(self, callback, cb_data, url, target_dir, legal_exts, certs): - self._callback = callback - self._cb_data = cb_data - self._url = url +class FileDownloader(FileTransfer.FileTransfer): + def __init__(self, urls, target_dir, legal_exts, certs=None): + FileTransfer.FileTransfer.__init__(self, url, certs) + + if not target_dir: + raise Exception("Require a target directory to download to.") self._target_dir = target_dir - # May fail with FileNameException, trapped elsewhere - self._filename = get_base_filename_from_url(self._url, legal_exts) - self._opener = URLopener.PlgURLopener(certs, 20) - threading.Thread.__init__(self) + if type(urls) == type(""): + urls = [urls] + if type(urls) is not type([]): + raise ValueError("urls argument must be a list of URLs.") + for url in urls: + fname = get_base_filename_from_url(url, legal_exts) + if not fname: + raise FileNameException("Bad file name from url %s" % url) + self._files[url] = fname - def run(self): + def _action(self, (url, fname)): result = None err_msg = None - if self._url and self._target_dir and self._filename: - if not os.path.exists(self._target_dir): - os.makedirs(self._target_dir) - 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 socket.error, e: - if not CommonErrors.canIgnoreSocketError(e): - err_msg = "Socket Error: %s" % e - except IOError, e: - if not CommonErrors.canIgnoreSocketError(e): - err_msg = "IOError Error: %s" % e - - if result: - self._callback('done', self._cb_data, err_msg) - else: - self._callback('failed', self._cb_data, err_msg) + if not os.path.exists(self._target_dir): + os.makedirs(self._target_dir) + target_file = os.path.join(self._target_dir, fname) + try: + result = self._opener.retrieve(url, target_file) + except socket.error, exc: + if not CommonErrors.canIgnoreSocketError(exc): + err_msg = "Socket Error: %s" % exc + except IOError, exc: + if not CommonErrors.canIgnoreSocketError(exc): + err_msg = "IOError Error: %s" % exc + return (result, err_msg) + def run(self): + final_result = FileTransfer.FT_RESULT_SUCCESS + msg = None + for url in self._files.keys(): + (result, msg) = self._process_one_transfer((url, self._files[url])) + if result == FileTransfer.FT_RESULT_FAILED: + final_result = FileTransfer.FT_RESULT_FAILED + msg = "Download of %s failed because: %s" % (url, msg) + break + if self._cancel: + final_result = FileTransfer.FT_RESULT_CANCELED + break + if self._callback: + self._callback(final_result, self._cb_data, msg) ########################################################### # Testing stuff ########################################################### -import sys, time +import sys -class dlwr: - def __init__(self, x, t): - self.num = x - self.tracker = t - self.dl = None +class DlCallbackData: + def __init__(self, num, tracker): + self.num = num + self.tracker = tracker + self.fdl = None - def set_dl(self, dl): - self.dl = dl + def set_dl(self, fdl): + self.fdl = fdl -class dl_tracker: +class DlTracker: def __init__(self): self.lst = [] - def add(self, dlwr): - self.lst.append(dlwr) + def add(self, dlcb): + self.lst.append(dlcbdata) - def remove(self, dlwr): - self.lst.remove(dlwr) + def remove(self, dlcbdata): + self.lst.remove(dlcbdata) def num(self): return len(self.lst) -def dl_callback(status, dlwr, msg=""): - print "Finished with %d (%s: %s)" % (dlwr.num, status, msg) - dlwr.tracker.remove(dlwr) +def dl_callback(status, dlcbdata, msg=""): + print "Finished with %d (%s: %s)" % (dlcbdata.num, status, msg) + dlcbdata.tracker.remove(dlcbdata) -if __name__ == '__main__': +def main(): if len(sys.argv) < 4: print "Usage: python FileDownloader.py key_and_cert ca_cert peer_ca_cert" sys.exit(1) @@ -160,19 +170,21 @@ certs['peer_ca_cert'] = sys.argv[3] print "Starting..." - dlt = dl_tracker() + dlt = DlTracker() - x = 0 - while x < 100: - wr = dlwr(x, dlt) - dstdir = os.path.join("/tmp", "client_dir", "%s" % x) + count = 0 + while count < 100: + dlcb = DlCallbackData(count, dlt) + dstdir = os.path.join("/tmp", "client_dir", "%s" % count) 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 + fdl = FileDownloader("https://localhost:8886/testfile.dat", + dstdir, ['.dat'], certs) + fdl.set_callback(dl_callback, dlcb) + dlt.add(dlcb) + fdl.start() + count = count + 1 while dlt.num() > 0: try: @@ -180,3 +192,6 @@ except KeyboardInterrupt: print "Quitting..." os._exit(0) + +if __name__ == '__main__': + main() From fedora-extras-commits at redhat.com Mon May 8 14:24:32 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:24:32 -0700 Subject: extras-buildsys ChangeLog,1.185,1.186 Message-ID: <200605081425.k48EP2Ct028660@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28620 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * common/FileTransfer.py - Refactor common code from FileDownload.py and FileUpload.py into FileTransfer.py * common/FileDownload.py - pylint cleanups - Refactor for FileTransfer.py - Allow multiple transfers for one FileDownloader object * common/FileUploader.py - pylint cleanups - Refactor for FileTransfer.py - Allow multiple uploads for one FileUploader object Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- ChangeLog 3 May 2006 04:04:27 -0000 1.185 +++ ChangeLog 8 May 2006 14:24:29 -0000 1.186 @@ -1,3 +1,19 @@ +2006-05-08 Dan Williams + + * common/FileTransfer.py + - Refactor common code from FileDownload.py and + FileUpload.py into FileTransfer.py + + * common/FileDownload.py + - pylint cleanups + - Refactor for FileTransfer.py + - Allow multiple transfers for one FileDownloader object + + * common/FileUploader.py + - pylint cleanups + - Refactor for FileTransfer.py + - Allow multiple uploads for one FileUploader object + 2006-05-03 Dan Williams More builder/server comm rework; From fedora-extras-commits at redhat.com Mon May 8 14:25:46 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:25:46 -0700 Subject: extras-buildsys ChangeLog,1.186,1.187 Message-ID: <200605081425.k48EPkKD028699@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * common/HTTPServer.py - For test code, print out received files, and put them in /tmp/server_dir rather than just in /tmp Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- ChangeLog 8 May 2006 14:24:29 -0000 1.186 +++ ChangeLog 8 May 2006 14:25:44 -0000 1.187 @@ -1,5 +1,11 @@ 2006-05-08 Dan Williams + * common/HTTPServer.py + - For test code, print out received files, and put them + in /tmp/server_dir rather than just in /tmp + +2006-05-08 Dan Williams + * common/FileTransfer.py - Refactor common code from FileDownload.py and FileUpload.py into FileTransfer.py From fedora-extras-commits at redhat.com Mon May 8 14:25:47 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:25:47 -0700 Subject: extras-buildsys/common HTTPServer.py,1.14,1.15 Message-ID: <200605081425.k48EPl5B028705@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668/common Modified Files: HTTPServer.py Log Message: 2006-05-08 Dan Williams * common/HTTPServer.py - For test code, print out received files, and put them in /tmp/server_dir rather than just in /tmp Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- HTTPServer.py 3 May 2006 04:04:28 -0000 1.14 +++ HTTPServer.py 8 May 2006 14:25:44 -0000 1.15 @@ -225,13 +225,14 @@ if jobid is not None and arch and filename and tmpfile: import shutil - dest = file("/tmp/%s" % filename, "w+b") + dest = file("/tmp/server_dir/%s" % filename, "w+b") shutil.copyfileobj(tmpfile, dest) dest.close() request_handler.send_response(200, "Success") request_handler.send_header("Content-type", "text/html") request_handler.end_headers() request_handler.wfile.write("Success!") + print "Finished with %d (%s) at %s" % (jobid, arch, filename) else: request_handler.send_error(400, "Invalid request for %s" % request_handler.path) From fedora-extras-commits at redhat.com Mon May 8 14:26:42 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:26:42 -0700 Subject: extras-buildsys/common Commands.py,1.3,1.4 Message-ID: <200605081426.k48EQgUk028749@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28715/common Modified Files: Commands.py Log Message: 2006-05-08 Dan Williams * common/Commands.py - Add JobFiles and JobFilesAck commands Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Commands.py 5 May 2006 02:10:39 -0000 1.3 +++ Commands.py 8 May 2006 14:26:34 -0000 1.4 @@ -29,11 +29,11 @@ CMD_NAME_NEW_JOB_REQ = "NewJob" CMD_NAME_NEW_JOB_ACK = "NewJobAck" CMD_NAME_UNLOCK_REPO = "UnlockRepo" -CMD_NAME_JOB_FILES_REQ = "JobFiles" -CMD_NAME_JOB_FILES_ACK = "JobFilesAck" CMD_NAME_BUILDING_JOBS = "BuildingJobs" CMD_NAME_JOB_STATUS_REQ = "JobStatus" CMD_NAME_JOB_STATUS_ACK = "JobStatusAck" +CMD_NAME_JOB_FILES_REQ = "JobFiles" +CMD_NAME_JOB_FILES_ACK = "JobFilesAck" class SequenceGenerator(object): @@ -131,6 +131,10 @@ cmd = PlgCommandJobStatus._deserialize(args) elif name == CMD_NAME_JOB_STATUS_ACK: cmd = PlgCommandJobStatusAck._deserialize(args) + elif name == CMD_NAME_JOB_FILES_REQ: + cmd = PlgCommandJobFiles._deserialize(args) + elif name == CMD_NAME_JOB_FILES_ACK: + cmd = PlgCommandJobFilesAck._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't @@ -523,3 +527,70 @@ def status(self): return self._status + + +class PlgCommandJobFiles(PlgCommand): + + _need_ack = True + + def __init__(self, archjob_id, seq=0): + PlgCommand.__init__(self, CMD_NAME_JOB_FILES_REQ, seq) + self._archjob_id = archjob_id + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except KeyError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + + return PlgCommandJobFiles(archjob_id) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def __str__(self): + return "%s(seq: %d, archjob_id: %s)" % (self._name, self._seq, self._archjob_id) + + +class PlgCommandJobFilesAck(PlgCommandAck): + def __init__(self, archjob_id, files, req_seq, seq=0): + """The files argument is a python list of output files from the job""" + PlgCommandAck.__init__(self, CMD_NAME_JOB_FILES_ACK, req_seq, seq) + self._archjob_id = archjob_id + self._files = files + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except KeyError, TypeError: + raise ValueError("No 'archjob_id' argument found.") + try: + files = args['files'] + except KeyError, TypeError: + raise ValueError("No 'files' argument found.") + if type(files) != type([]): + raise ValueError("The 'files' argument was of the wrong type.") + + req_seq = PlgCommandAck._deserialize_acked_seq(args) + return PlgCommandJobFilesAck(archjob_id, files, req_seq) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + args['files'] = self._files + return PlgCommandAck._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def files(self): + return self._files From fedora-extras-commits at redhat.com Mon May 8 14:26:36 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:26:36 -0700 Subject: extras-buildsys ChangeLog,1.187,1.188 Message-ID: <200605081427.k48ER6FV028752@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28715 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * common/Commands.py - Add JobFiles and JobFilesAck commands Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- ChangeLog 8 May 2006 14:25:44 -0000 1.187 +++ ChangeLog 8 May 2006 14:26:33 -0000 1.188 @@ -1,8 +1,13 @@ 2006-05-08 Dan Williams + * common/Commands.py + - Add JobFiles and JobFilesAck commands + +2006-05-08 Dan Williams + * common/HTTPServer.py - For test code, print out received files, and put them - in /tmp/server_dir rather than just in /tmp + in /tmp/server_dir rather than just in 2006-05-08 Dan Williams From fedora-extras-commits at redhat.com Mon May 8 14:32:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 07:32:58 -0700 Subject: extras-buildsys/common Makefile,1.12,1.13 Message-ID: <200605081432.k48EWwiB028802@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28784 Modified Files: Makefile Log Message: Install FileTransfer.py Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile 28 Apr 2006 03:17:40 -0000 1.12 +++ Makefile 8 May 2006 14:32:55 -0000 1.13 @@ -17,6 +17,7 @@ DebugUtils.py \ ExecUtils.py \ FileDownloader.py \ + FileTransfer.py \ FileUploader.py \ HTTPServer.py \ SSLCommon.py \ From fedora-extras-commits at redhat.com Mon May 8 14:35:37 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Mon, 8 May 2006 07:35:37 -0700 Subject: rpms/fonttools/devel fonttools-unsigned-ranges.patch, NONE, 1.1 fonttools.spec, 1.3, 1.4 Message-ID: <200605081435.k48EZd44028838@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28816 Modified Files: fonttools.spec Added Files: fonttools-unsigned-ranges.patch Log Message: * Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs - Change specification of ulUnicodeRange1-4 to unsigned long fonttools-unsigned-ranges.patch: --- NEW FILE fonttools-unsigned-ranges.patch --- --- fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py.unsigned-ranges 2006-05-08 17:13:17.000000000 +0330 +++ fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py 2006-05-08 17:14:04.000000000 +0330 @@ -52,10 +52,10 @@ yStrikeoutPosition: h # strikeout position sFamilyClass: h # font family class and subclass panose: 10s # panose classification number - ulUnicodeRange1: l # character range - ulUnicodeRange2: l # character range - ulUnicodeRange3: l # character range - ulUnicodeRange4: l # character range + ulUnicodeRange1: L # character range + ulUnicodeRange2: L # character range + ulUnicodeRange3: L # character range + ulUnicodeRange4: L # character range achVendID: 4s # font vendor identification fsSelection: H # font selection flags fsFirstCharIndex: H # first unicode character index Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fonttools.spec 13 Feb 2006 18:01:32 -0000 1.3 +++ fonttools.spec 8 May 2006 14:35:36 -0000 1.4 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.5.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -11,6 +11,7 @@ URL: http://sourceforge.net/projects/fonttools/ Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2 Patch1: fonttools-20050315-20050624.patch +Patch2: fonttools-unsigned-ranges.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-numeric @@ -28,6 +29,7 @@ %prep %setup -q -n %{name} %patch1 -p1 -b .20050624 +%patch2 -p1 -b .unsigned-ranges %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py %{__chmod} a-x LICENSE.txt @@ -76,6 +78,9 @@ %changelog +* Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs +- Change specification of ulUnicodeRange1-4 to unsigned long + * Mon Feb 13 2006 Roozbeh Pournader - 2.0-0.5.20050624cvs - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon May 8 15:09:21 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Mon, 8 May 2006 08:09:21 -0700 Subject: rpms/abiword/FC-3 abiword-2.4.4-x86_64.patch, NONE, 1.1 abiword.spec, 1.34, 1.35 Message-ID: <200605081509.k48F9N38031278@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31256 Modified Files: abiword.spec Added Files: abiword-2.4.4-x86_64.patch Log Message: Fix 190591 abiword-2.4.4-x86_64.patch: --- NEW FILE abiword-2.4.4-x86_64.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2005-09-27 00:23:02.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2006-05-08 01:17:00.000000000 +0200 @@ -586,7 +586,7 @@ (!m_bSave ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL) + (gchar*)NULL) ); #endif Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- abiword.spec 11 Apr 2006 10:31:23 -0000 1.34 +++ abiword.spec 8 May 2006 15:09:21 -0000 1.35 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -42,6 +42,7 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.2-gsf.patch +Patch3: abiword-2.4.4-x86_64.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -52,6 +53,7 @@ %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop %patch2 -p1 -b .gsf +%patch3 -p1 -b .x86_64 %build cd abi @@ -135,6 +137,9 @@ %{_datadir}/icons/*png %changelog +* Mon May 08 2006 Marc Maurer - 1:2.4.4-2.fc3 +- Fix bug 190591 - crash on x86_64 machines when saving a document + * Tue Apr 11 2006 Marc Maurer - 1:2.4.4-1.fc3 - New upstream version - Remove the macro patch and update the desktop patch From fedora-extras-commits at redhat.com Mon May 8 15:34:35 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 08:34:35 -0700 Subject: fedora-security/audit fe4,1.8,1.9 fe5,1.8,1.9 Message-ID: <200605081534.k48FYZ2t031498@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31476 Modified Files: fe4 fe5 Log Message: add nessus candidate Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fe4 8 May 2006 00:04:52 -0000 1.8 +++ fe4 8 May 2006 15:34:32 -0000 1.9 @@ -6,5 +6,6 @@ CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 +CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fe5 8 May 2006 00:04:52 -0000 1.8 +++ fe5 8 May 2006 15:34:32 -0000 1.9 @@ -6,5 +6,6 @@ CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 +CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch From fedora-extras-commits at redhat.com Mon May 8 15:51:19 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 08:51:19 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.5, 1.6 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.3, NONE Message-ID: <200605081551.k48FpL3U031641@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31614/devel Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h --- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 +++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 @@ -169,7 +169,7 @@ /* platform independent options- uncomment to enable */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_ISC_READER */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init --- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 @@ -0,0 +1,75 @@ +#!/bin/sh +# +# Startup script for the DNS caching server +# +# chkconfig: - 99 01 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.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 + +dnsmasq=/usr/sbin/dnsmasq +[ -f $dnsmasq ] || exit 0 + +DOMAIN_SUFFIX=`dnsdomainname` +if [ ! -z "${DOMAIN_SUFFIX}" ]; then + OPTIONS="-s $DOMAIN_SUFFIX" +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting dnsmasq: " + daemon $dnsmasq $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq + ;; + stop) + if test "x`pidof dnsmasq`" != x; then + echo -n "Shutting down dnsmasq: " + killproc dnsmasq + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid + ;; + status) + status dnsmasq + RETVAL=$? + ;; + reload) + echo -n "Reloading dnsmasq: " + killproc dnsmasq -HUP + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + if test "x`/sbin/pidof dnsmasq`" != x; then + $0 stop + $0 start + RETVAL=$? + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dnsmasq.spec 2 May 2006 16:28:07 -0000 1.5 +++ dnsmasq.spec 8 May 2006 15:51:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -53,8 +51,10 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 15:51:19 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 16:00:59 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Mon, 8 May 2006 09:00:59 -0700 Subject: rpms/flumotion/FC-5 .cvsignore, 1.4, 1.5 flumotion.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605081601.k48G11QK031836@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31814 Modified Files: .cvsignore flumotion.spec sources Log Message: update spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Mar 2006 14:17:25 -0000 1.4 +++ .cvsignore 8 May 2006 16:00:59 -0000 1.5 @@ -1 +1 @@ -flumotion-0.2.0.tar.bz2 +flumotion-0.2.1.tar.bz2 Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- flumotion.spec 17 Mar 2006 21:29:04 -0000 1.6 +++ flumotion.spec 8 May 2006 16:00:59 -0000 1.7 @@ -4,8 +4,8 @@ %define gstreamer gstreamer Name: flumotion -Version: 0.2.0 -Release: 2%{?dist} +Version: 0.2.1 +Release: 1%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet @@ -141,7 +141,7 @@ # create a default worker config if no worker configs present # the default login will be user/test # FIXME: still need a way of specifying we really do not want a default worker -if ! test -e %{_sysconfdir}/flumotion/*/default.xml +if ! test -e %{_sysconfdir}/flumotion/workers/default.xml then cat > %{_sysconfdir}/flumotion/workers/default.xml < @@ -219,6 +219,11 @@ %{_sysconfdir}/rc.d/init.d/flumotion %changelog +* Mon May 08 2006 Thomas Vander Stichele +- 0.2.1-1 +- new upstream release +- fix post script for creating worker config + * Fri Mar 17 2006 Thomas Vander Stichele - 0.2.0-2 - require pyOpenSSL, without which the manager does not start Index: sources =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Mar 2006 14:17:25 -0000 1.4 +++ sources 8 May 2006 16:00:59 -0000 1.5 @@ -1 +1 @@ -f674eb7286fb0cef687c372a0da1ebd1 flumotion-0.2.0.tar.bz2 +56b54f35f791eca377475640725bd227 flumotion-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 16:03:39 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Mon, 8 May 2006 09:03:39 -0700 Subject: rpms/flumotion/devel flumotion.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200605081603.k48G3fT0001684@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1665 Modified Files: flumotion.spec sources Log Message: new upstream release Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/devel/flumotion.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- flumotion.spec 5 Mar 2006 14:17:25 -0000 1.4 +++ flumotion.spec 8 May 2006 16:03:39 -0000 1.5 @@ -4,7 +4,7 @@ %define gstreamer gstreamer Name: flumotion -Version: 0.2.0 +Version: 0.2.1 Release: 1%{?dist} Summary: Flumotion - the Fluendo Streaming Server @@ -21,6 +21,7 @@ Requires: python-twisted >= 1.3.0 Requires: pygtk2 >= 2.8.0 Requires: python-imaging +Requires: pyOpenSSL # for make-dummy-cert to work Requires(post): openssl @@ -99,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT %pre -/usr/sbin/useradd -s /sbin/nologin -r -d %{_datadir}/flumotion -M -r \ +/usr/sbin/useradd -s /sbin/nologin -r -d %{_localstatedir}/cache/flumotion -M -r \ flumotion > /dev/null 2> /dev/null || : %post @@ -140,7 +141,7 @@ # create a default worker config if no worker configs present # the default login will be user/test # FIXME: still need a way of specifying we really do not want a default worker -if ! test -e %{_sysconfdir}/flumotion/*/default.xml +if ! test -e %{_sysconfdir}/flumotion/workers/default.xml then cat > %{_sysconfdir}/flumotion/workers/default.xml < @@ -210,7 +211,6 @@ %{_datadir}/flumotion/image %{_datadir}/flumotion/make-dummy-cert %{_datadir}/flumotion/*.xsl -%dir %attr(750,flumotion,root) %{_datadir}/flumotion/.flumotion %attr(750,flumotion,root) %{_sysconfdir}/flumotion %attr(750,flumotion,root) %{_localstatedir}/run/flumotion @@ -219,6 +219,17 @@ %{_sysconfdir}/rc.d/init.d/flumotion %changelog +* Mon May 08 2006 Thomas Vander Stichele +- 0.2.1-1 +- new upstream release +- fix post script for creating worker config + +* Fri Mar 17 2006 Thomas Vander Stichele +- 0.2.0-2 +- require pyOpenSSL, without which the manager does not start +- use /var/cache/flumotion as the home dir, so that the cache can be written, + instead of using datadir + * Sun Mar 05 2006 Thomas Vander Stichele - 0.2.0-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/flumotion/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Mar 2006 14:17:25 -0000 1.4 +++ sources 8 May 2006 16:03:39 -0000 1.5 @@ -1 +1 @@ -f674eb7286fb0cef687c372a0da1ebd1 flumotion-0.2.0.tar.bz2 +56b54f35f791eca377475640725bd227 flumotion-0.2.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 16:12:28 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 8 May 2006 09:12:28 -0700 Subject: rpms/nsd/FC-5 nsd.init,1.1,1.2 Message-ID: <200605081612.k48GCUnE001843@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1826 Modified Files: nsd.init Log Message: added workaround for when no ipv6 Index: nsd.init =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-5/nsd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsd.init 13 Dec 2005 03:51:03 -0000 1.1 +++ nsd.init 8 May 2006 16:12:28 -0000 1.2 @@ -24,9 +24,14 @@ #extra verbosity #ZONEC_VERBOSE=-v - OTHER_NSD_OPTS="" +#work around for bug in nsd-2.3.4 when no ipv6 is available +if [ ! -d /proc/sys/net/ipv6/ ] +then + OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS" +fi + # Source function library. . /etc/init.d/functions From fedora-extras-commits at redhat.com Mon May 8 16:13:35 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 8 May 2006 09:13:35 -0700 Subject: rpms/nsd/FC-5 nsd.spec,1.6,1.7 Message-ID: <200605081613.k48GDbiw001866@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1849 Modified Files: nsd.spec Log Message: sync with nsd-2.3.4 Index: nsd.spec =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-5/nsd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsd.spec 15 Dec 2005 15:48:59 -0000 1.6 +++ nsd.spec 8 May 2006 16:13:35 -0000 1.7 @@ -1,12 +1,11 @@ Summary: NSD is a complete implementation of an authoritative DNS name server Name: nsd -Version: 2.3.3 -Release: 7%{?dist} +Version: 2.3.4 +Release: 4%{?dist} License: BSD-like Url: http://open.nlnetlabs.nl/nsd/ Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz Source1: nsd.init -Patch0: nsd-2.3.3-checking.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel @@ -19,9 +18,8 @@ %prep %setup -q -%patch0 -p1 -b .checking.patch -%configure --enable-bind8-stats --enable-plugins \ +%configure --enable-bind8-stats --enable-plugins --enable-checking \ --enable-mmap --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid --with-ssl \ --with-user=nsd @@ -30,22 +28,16 @@ %install rm -rf %{buildroot} -# Not using their 'make install' since it uses install-sh which does not -# get the correct install path within the RPM_BUILD_ROOT -#%{__make} install -install -d 0755 %{buildroot}/%{_sysconfdir}/nsd -install -d 0755 %{buildroot}/%{_sbindir} -install -d 0755 %{buildroot}/%{_mandir}/man8 -install -d 0755 %{buildroot}/%{_initrddir} -install -d 0700 %{buildroot}/%{_localstatedir}/run/%{name} - -install -m 0644 nsdc.conf.sample %{buildroot}/%{_sysconfdir}/nsd/nsdc.conf -install -m 0644 nsd.zones.sample %{buildroot}/%{_sysconfdir}/nsd/nsd.zones +%{__make} DESTDIR=%{buildroot} install +install -d 0755 %{buildroot}%{_initrddir} install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd +install -d 0700 %{buildroot}%{_localstatedir}/run/%{name} -install -m 0755 nsd zonec nsd-notify nsd-xfer %{buildroot}/%{_sbindir} -install -m 0755 nsdc.sh %{buildroot}/%{_sbindir}/nsdc -install -m 0644 *.8 %{buildroot}/%{_mandir}/man8 +# change .sample to normal config files +mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsdc.conf +mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \ + %{buildroot}%{_sysconfdir}/nsd/nsd.zones %clean rm -rf ${RPM_BUILD_ROOT} @@ -84,6 +76,13 @@ fi %changelog +* Sun May 7 2006 Paul Wouters - 2.3.4-4 +- Upgraded to nsd-2.3.4. +- Removed manual install targets because DESTDIR is now supported +- Re-enabled --checking, checking patch no longer needed and removed. +- Work around in nsd.init for nsd failing to start when there is no ipv6 +- Various release bumps due to 'make tag' failures :( + * Thu Dec 15 2005 Paul Wouters - 2.3.3-7 - chkconfig and attribute changes as proposed by Dmitry Butskoy From fedora-extras-commits at redhat.com Mon May 8 16:14:27 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Mon, 8 May 2006 09:14:27 -0700 Subject: rpms/nsd/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605081614.k48GET1a001904@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/nsd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1881 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 03:51:03 -0000 1.2 +++ .cvsignore 8 May 2006 16:14:26 -0000 1.3 @@ -1 +1 @@ -nsd-2.3.3.tar.gz +nsd-2.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nsd/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 03:51:03 -0000 1.2 +++ sources 8 May 2006 16:14:26 -0000 1.3 @@ -1 +1 @@ -7e9f0ebfdf9dd29213170999cd60c20e nsd-2.3.3.tar.gz +72b50c182ea1132bfe23977f0ae7f705 nsd-2.3.4.tar.gz From fedora-extras-commits at redhat.com Mon May 8 16:23:27 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Mon, 8 May 2006 09:23:27 -0700 Subject: rpms/fonttools/FC-4 fonttools-unsigned-ranges.patch, NONE, 1.1 fonttools.spec, 1.2, 1.3 Message-ID: <200605081623.k48GNTcg002056@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2036 Modified Files: fonttools.spec Added Files: fonttools-unsigned-ranges.patch Log Message: * Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs - Change specification of ulUnicodeRange1-4 to unsigned long fonttools-unsigned-ranges.patch: --- NEW FILE fonttools-unsigned-ranges.patch --- --- fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py.unsigned-ranges 2006-05-08 17:13:17.000000000 +0330 +++ fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py 2006-05-08 17:14:04.000000000 +0330 @@ -52,10 +52,10 @@ yStrikeoutPosition: h # strikeout position sFamilyClass: h # font family class and subclass panose: 10s # panose classification number - ulUnicodeRange1: l # character range - ulUnicodeRange2: l # character range - ulUnicodeRange3: l # character range - ulUnicodeRange4: l # character range + ulUnicodeRange1: L # character range + ulUnicodeRange2: L # character range + ulUnicodeRange3: L # character range + ulUnicodeRange4: L # character range achVendID: 4s # font vendor identification fsSelection: H # font selection flags fsFirstCharIndex: H # first unicode character index Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/FC-4/fonttools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fonttools.spec 2 Feb 2006 13:13:43 -0000 1.2 +++ fonttools.spec 8 May 2006 16:23:27 -0000 1.3 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.4.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -11,6 +11,7 @@ URL: http://sourceforge.net/projects/fonttools/ Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2 Patch1: fonttools-20050315-20050624.patch +Patch2: fonttools-unsigned-ranges.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-numeric @@ -28,6 +29,7 @@ %prep %setup -q -n %{name} %patch1 -p1 -b .20050624 +%patch2 -p1 -b .unsigned-ranges %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py %{__chmod} a-x LICENSE.txt @@ -76,6 +78,12 @@ %changelog +* Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs +- Change specification of ulUnicodeRange1-4 to unsigned long + +* Mon Feb 13 2006 Roozbeh Pournader - 2.0-0.5.20050624cvs +- Rebuild for Fedora Extras 5 + * Thu Feb 02 2006 Roozbeh Pournader - 2.0-0.4.20050624cvs - Provide ttx From fedora-extras-commits at redhat.com Mon May 8 16:32:59 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Mon, 8 May 2006 09:32:59 -0700 Subject: rpms/fonttools/FC-5 fonttools-unsigned-ranges.patch, NONE, 1.1 fonttools.spec, 1.3, 1.4 Message-ID: <200605081633.k48GX19q002189@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2169 Modified Files: fonttools.spec Added Files: fonttools-unsigned-ranges.patch Log Message: * Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs - Change specification of ulUnicodeRange1-4 to unsigned long fonttools-unsigned-ranges.patch: --- NEW FILE fonttools-unsigned-ranges.patch --- --- fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py.unsigned-ranges 2006-05-08 17:13:17.000000000 +0330 +++ fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py 2006-05-08 17:14:04.000000000 +0330 @@ -52,10 +52,10 @@ yStrikeoutPosition: h # strikeout position sFamilyClass: h # font family class and subclass panose: 10s # panose classification number - ulUnicodeRange1: l # character range - ulUnicodeRange2: l # character range - ulUnicodeRange3: l # character range - ulUnicodeRange4: l # character range + ulUnicodeRange1: L # character range + ulUnicodeRange2: L # character range + ulUnicodeRange3: L # character range + ulUnicodeRange4: L # character range achVendID: 4s # font vendor identification fsSelection: H # font selection flags fsFirstCharIndex: H # first unicode character index Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/FC-5/fonttools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fonttools.spec 13 Feb 2006 18:01:32 -0000 1.3 +++ fonttools.spec 8 May 2006 16:32:59 -0000 1.4 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.5.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -11,6 +11,7 @@ URL: http://sourceforge.net/projects/fonttools/ Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2 Patch1: fonttools-20050315-20050624.patch +Patch2: fonttools-unsigned-ranges.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-numeric @@ -28,6 +29,7 @@ %prep %setup -q -n %{name} %patch1 -p1 -b .20050624 +%patch2 -p1 -b .unsigned-ranges %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py %{__chmod} a-x LICENSE.txt @@ -76,6 +78,9 @@ %changelog +* Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs +- Change specification of ulUnicodeRange1-4 to unsigned long + * Mon Feb 13 2006 Roozbeh Pournader - 2.0-0.5.20050624cvs - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon May 8 16:35:04 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 09:35:04 -0700 Subject: fedora-security/audit fe4,1.9,1.10 fe5,1.9,1.10 Message-ID: <200605081635.k48GZ4Ns002229@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2209 Modified Files: fe4 fe5 Log Message: add fixed amaya cve Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fe4 8 May 2006 15:34:32 -0000 1.9 +++ fe4 8 May 2006 16:35:02 -0000 1.10 @@ -9,3 +9,4 @@ CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch +CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fe5 8 May 2006 15:34:32 -0000 1.9 +++ fe5 8 May 2006 16:35:02 -0000 1.10 @@ -9,3 +9,4 @@ CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch +CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 From fedora-extras-commits at redhat.com Mon May 8 16:39:56 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Mon, 8 May 2006 09:39:56 -0700 Subject: mock mock.py,1.42,1.43 Message-ID: <200605081639.k48GduAu002309@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2290 Modified Files: mock.py Log Message: enable SLES9 and SLES10 build environments Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mock.py 21 Apr 2006 13:07:26 -0000 1.42 +++ mock.py 8 May 2006 16:39:53 -0000 1.43 @@ -566,8 +566,9 @@ for item in [os.path.join(self.rootdir, 'etc', 'mtab'), os.path.join(self.rootdir, 'etc', 'fstab'), os.path.join(self.rootdir, 'var', 'log', 'yum.log')]: - fo = open(item, 'w') - fo.close() + if not os.path.exists(item): + fo = open(item, 'w') + fo.close() # write in yum.conf into chroot yumconf = os.path.join(self.rootdir, 'etc', 'yum.conf') @@ -578,6 +579,13 @@ # files in /etc that need doing filedict = self.config['files'] for key in filedict: + # ensure permisssions + if os.path.exists( "%s%s" % (self.rootdir, key) ): + cmd = "chown %s.%s %s" % (self.config['chrootuser'], + self.config['chrootgroup'], "%s" % key) + self.do_chroot(cmd, fatal = True) + + # write file fn = '%s%s' % (self.rootdir, key) fo = open(fn, 'w') fo.write(filedict[key]) @@ -589,7 +597,7 @@ if not os.path.exists(self.rootdir + self.homedir): if not os.path.exists(os.path.join(self.rootdir, 'usr/sbin/useradd')): raise RootError, "Could not find useradd in chroot, maybe the install failed?" - cmd = '/usr/sbin/useradd -u %s -d %s %s' % (self.config['chrootuid'], + cmd = '/usr/sbin/useradd -m -u %s -d %s %s' % (self.config['chrootuid'], self.homedir, self.config['chrootuser']) self.do_chroot(cmd, fatal = True) @@ -604,9 +612,11 @@ for subdir in ('RPMS', 'SRPMS', 'SOURCES', 'SPECS', 'BUILD', 'originals'): cmd = "mkdir -p %s/%s" % (self.builddir, subdir) self.do_chroot(cmd, fatal = True) - cmd = "chown %s.%s %s/%s" % (self.config['chrootuser'], - self.config['chrootgroup'], self.builddir, subdir) - self.do_chroot(cmd, fatal = True) + + # change ownership so we can write to build home dir + cmd = "chown -R %s.%s %s" % (self.config['chrootuser'], + self.config['chrootgroup'], self.homedir) + self.do_chroot(cmd, fatal = True) # rpmmacros default macrofile_out = '%s%s/.rpmmacros' % (self.rootdir, self.homedir) From fedora-extras-commits at redhat.com Mon May 8 16:55:31 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 09:55:31 -0700 Subject: rpms/lightning/devel lightning.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605081655.k48GtXWA002487@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lightning/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2467 Modified Files: .cvsignore sources Added Files: lightning.spec Log Message: Manual import of lightning --- NEW FILE lightning.spec --- Name: lightning Version: 1.2 Release: 3%{?dist} Summary: GNU Lightning Group: Development/Libraries License: LGPL URL: http://www.gnu.org/software/lightning/lightning.html Source0: ftp://ftp.gnu.org/pub/gnu/lightning/lightning-1.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} ppc sparc Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description GNU lightning is a library to aid in making portable programs that compiles assembly code at run time. %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/%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/lightning.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/lightning.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %{_bindir}/lightningize %{_includedir}/lightning/ %{_datadir}/aclocal/lightning.m4 %dir %{_datadir}/lightning %{_datadir}/lightning/Makefile.am %{_mandir}/man1/lightningize.1.gz %{_infodir}/lightning.info.gz %doc AUTHORS ChangeLog COPYING COPYING.DOC COPYING.LESSER NEWS README THANKS %changelog * Mon Feb 20 2006 Jochen Schmitt 1.2-3 - Remove %%{_infodir}/dir * Sun Feb 19 2006 Jochen Schmitt 1.2-2 - Fix buildRequires - rmove %%{_infodir}/dir file * Sun Dec 4 2005 Jochen Schmitt 1.2-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lightning/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 May 2006 19:44:46 -0000 1.1 +++ .cvsignore 8 May 2006 16:55:31 -0000 1.2 @@ -0,0 +1 @@ +lightning-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lightning/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 May 2006 19:44:46 -0000 1.1 +++ sources 8 May 2006 16:55:31 -0000 1.2 @@ -0,0 +1 @@ +dcd2c46ee4dd5d99edd9930022ad2153 lightning-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 8 16:59:40 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 09:59:40 -0700 Subject: rpms/stellarium/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 stellarium.spec, 1.16, 1.17 Message-ID: <200605081659.k48Gxgsh002592@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571 Modified Files: .cvsignore sources stellarium.spec Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Feb 2006 17:33:53 -0000 1.7 +++ .cvsignore 8 May 2006 16:59:39 -0000 1.8 @@ -1,2 +1,2 @@ -stellarium-0.7.1.tar.gz +stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Feb 2006 17:33:53 -0000 1.7 +++ sources 8 May 2006 16:59:39 -0000 1.8 @@ -1,2 +1,2 @@ -94cb47d20d31d5e0bba5d9e0189c331b stellarium-0.7.1.tar.gz +2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz 9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- stellarium.spec 14 Feb 2006 17:38:08 -0000 1.16 +++ stellarium.spec 8 May 2006 16:59:39 -0000 1.17 @@ -1,6 +1,6 @@ Name: stellarium -Version: 0.7.1 -Release: 7%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -9,7 +9,7 @@ Source0: http://dl.sf.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop Source2: http://dl.sf.net/stellarum/stellarium_user_guide-0.7.1-1.pdf -Patch0: stellarium-0.7.1-gcc41.patch +Patch1: stellarium-0.8.0-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -39,7 +39,7 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 %build %configure @@ -61,7 +61,7 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ install -m 0644 -p stellarium-2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png -rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,files_format.txt,stellarium.ico} +rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico} cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version} %find_lang %{name} @@ -83,6 +83,9 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog +* Sun May 7 2006 Jochen Schmitt 0.8.0-1 +- New upstream release + * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 - Add stellarium user guide as doc subpackage - Add gcc41 patch from Diego Petteno From fedora-extras-commits at redhat.com Mon May 8 17:05:41 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 10:05:41 -0700 Subject: rpms/dnsmasq/FC-5 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.3, 1.4 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.2, NONE Message-ID: <200605081705.k48H5hTD005016@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-5 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h --- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 +++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 @@ -169,7 +169,7 @@ /* platform independent options- uncomment to enable */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_ISC_READER */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init --- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 @@ -0,0 +1,75 @@ +#!/bin/sh +# +# Startup script for the DNS caching server +# +# chkconfig: - 99 01 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.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 + +dnsmasq=/usr/sbin/dnsmasq +[ -f $dnsmasq ] || exit 0 + +DOMAIN_SUFFIX=`dnsdomainname` +if [ ! -z "${DOMAIN_SUFFIX}" ]; then + OPTIONS="-s $DOMAIN_SUFFIX" +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting dnsmasq: " + daemon $dnsmasq $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq + ;; + stop) + if test "x`pidof dnsmasq`" != x; then + echo -n "Shutting down dnsmasq: " + killproc dnsmasq + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid + ;; + status) + status dnsmasq + RETVAL=$? + ;; + reload) + echo -n "Reloading dnsmasq: " + killproc dnsmasq -HUP + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + if test "x`/sbin/pidof dnsmasq`" != x; then + $0 stop + $0 start + RETVAL=$? + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 16:37:50 -0000 1.3 +++ dnsmasq.spec 8 May 2006 17:05:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -53,8 +51,10 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 17:05:41 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:05:41 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 10:05:41 -0700 Subject: rpms/dnsmasq/FC-4 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.3, 1.4 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.2, NONE Message-ID: <200605081705.k48H5hNP005007@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-4 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h --- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 +++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 @@ -169,7 +169,7 @@ /* platform independent options- uncomment to enable */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_ISC_READER */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init --- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 @@ -0,0 +1,75 @@ +#!/bin/sh +# +# Startup script for the DNS caching server +# +# chkconfig: - 99 01 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.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 + +dnsmasq=/usr/sbin/dnsmasq +[ -f $dnsmasq ] || exit 0 + +DOMAIN_SUFFIX=`dnsdomainname` +if [ ! -z "${DOMAIN_SUFFIX}" ]; then + OPTIONS="-s $DOMAIN_SUFFIX" +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting dnsmasq: " + daemon $dnsmasq $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq + ;; + stop) + if test "x`pidof dnsmasq`" != x; then + echo -n "Shutting down dnsmasq: " + killproc dnsmasq + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid + ;; + status) + status dnsmasq + RETVAL=$? + ;; + reload) + echo -n "Reloading dnsmasq: " + killproc dnsmasq -HUP + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + if test "x`/sbin/pidof dnsmasq`" != x; then + $0 stop + $0 start + RETVAL=$? + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnsmasq.spec 2 May 2006 16:37:49 -0000 1.3 +++ dnsmasq.spec 8 May 2006 17:05:40 -0000 1.4 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist} +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -53,8 +51,10 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +%endif +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -77,15 +77,22 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf +%endif %{_initrddir}/dnsmasq %{_sbindir}/dnsmasq %{_mandir}/man8/dnsmasq* %changelog +* Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs + * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) - Killed sysconfig file (provides unneeded functionality) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 17:05:40 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:05:42 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 10:05:42 -0700 Subject: rpms/dnsmasq/devel .cvsignore,1.2,1.3 Message-ID: <200605081705.k48H5iA0005020@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/devel Modified Files: .cvsignore Log Message: Upgrade to 2.31 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2006 16:51:25 -0000 1.2 +++ .cvsignore 8 May 2006 17:05:42 -0000 1.3 @@ -1 +1,2 @@ dnsmasq-2.30.tar.gz +dnsmasq-2.31.tar.gz From fedora-extras-commits at redhat.com Mon May 8 17:06:01 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:06:01 -0700 Subject: rpms/stellarium/FC-5 stellarium-0.8.0-gcc41.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 stellarium.spec, 1.16, 1.17 stellarium-0.7.1-gcc41.patch, 1.1, NONE Message-ID: <200605081706.k48H638O005050@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5026 Modified Files: .cvsignore sources stellarium.spec Added Files: stellarium-0.8.0-gcc41.patch Removed Files: stellarium-0.7.1-gcc41.patch Log Message: New upstream release stellarium-0.8.0-gcc41.patch: --- NEW FILE stellarium-0.8.0-gcc41.patch --- --- stellarium-0.8.0/src/s_gui.h.org 2006-05-08 17:52:41.000000000 +0200 +++ stellarium-0.8.0/src/s_gui.h 2006-05-08 17:55:02.000000000 +0200 @@ -510,7 +510,7 @@ private: callback onChangeCallback; - void ScrollBar::adjustSize(void); + void adjustSize(void); Button scrollBt; bool vertical; unsigned int scrollOffset, scrollSize; @@ -837,7 +837,7 @@ class City { public: - City::City(const string& _name = "", const string& _state = "", const string& _country = "", + City(const string& _name = "", const string& _state = "", const string& _country = "", double _longitude = 0.f, double _latitude = 0.f, float zone = 0, int _showatzoom = 0, int _altitude = 0); void addCity(const string& _name = "", const string& _state = "", const string& _country = "", double _longitude = 0.f, double _latitude = 0.f, float zone = 0, int _showatzoom = 0, int _altitude = 0); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Feb 2006 17:33:53 -0000 1.7 +++ .cvsignore 8 May 2006 17:06:01 -0000 1.8 @@ -1,2 +1,2 @@ -stellarium-0.7.1.tar.gz +stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Feb 2006 17:33:53 -0000 1.7 +++ sources 8 May 2006 17:06:01 -0000 1.8 @@ -1,2 +1,2 @@ -94cb47d20d31d5e0bba5d9e0189c331b stellarium-0.7.1.tar.gz +2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz 9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- stellarium.spec 14 Feb 2006 17:38:08 -0000 1.16 +++ stellarium.spec 8 May 2006 17:06:01 -0000 1.17 @@ -1,6 +1,6 @@ Name: stellarium -Version: 0.7.1 -Release: 7%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -9,7 +9,7 @@ Source0: http://dl.sf.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop Source2: http://dl.sf.net/stellarum/stellarium_user_guide-0.7.1-1.pdf -Patch0: stellarium-0.7.1-gcc41.patch +Patch1: stellarium-0.8.0-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -39,7 +39,7 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 %build %configure @@ -61,7 +61,7 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ install -m 0644 -p stellarium-2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png -rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,files_format.txt,stellarium.ico} +rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico} cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version} %find_lang %{name} @@ -83,6 +83,9 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog +* Sun May 7 2006 Jochen Schmitt 0.8.0-1 +- New upstream release + * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 - Add stellarium user guide as doc subpackage - Add gcc41 patch from Diego Petteno --- stellarium-0.7.1-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:05:40 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 8 May 2006 10:05:40 -0700 Subject: rpms/dnsmasq/FC-3 dnsmasq-2.31-enable-dbus.patch, NONE, 1.1 dnsmasq-2.31-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.8, 1.9 sources, 1.2, 1.3 dnsmasq-2.30-dbus-config.patch, 1.1, NONE dnsmasq-2.30-enable-dbus.patch, 1.1, NONE dnsmasq-2.30-initscript.patch, 1.2, NONE Message-ID: <200605081706.k48H6CRa005083@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4920/FC-3 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch Removed Files: dnsmasq-2.30-dbus-config.patch dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch Log Message: Upgrade to 2.31 dnsmasq-2.31-enable-dbus.patch: --- NEW FILE dnsmasq-2.31-enable-dbus.patch --- diff -urN dnsmasq-2.31/src/config.h dnsmasq-2.31-patched/src/config.h --- dnsmasq-2.31/src/config.h 2006-05-06 06:18:25.000000000 -0500 +++ dnsmasq-2.31-patched/src/config.h 2006-05-08 07:26:04.000000000 -0500 @@ -169,7 +169,7 @@ /* platform independent options- uncomment to enable */ /* #define HAVE_BROKEN_RTC */ /* #define HAVE_ISC_READER */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER) # error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC dnsmasq-2.31-initscript.patch: --- NEW FILE dnsmasq-2.31-initscript.patch --- diff -urN dnsmasq-2.31/rpm/dnsmasq.init dnsmasq-2.31-patched/rpm/dnsmasq.init --- dnsmasq-2.31/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600 +++ dnsmasq-2.31-patched/rpm/dnsmasq.init 2006-05-08 07:30:11.000000000 -0500 @@ -0,0 +1,75 @@ +#!/bin/sh +# +# Startup script for the DNS caching server +# +# chkconfig: - 99 01 +# description: This script starts your DNS caching server +# processname: dnsmasq +# pidfile: /var/run/dnsmasq.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 + +dnsmasq=/usr/sbin/dnsmasq +[ -f $dnsmasq ] || exit 0 + +DOMAIN_SUFFIX=`dnsdomainname` +if [ ! -z "${DOMAIN_SUFFIX}" ]; then + OPTIONS="-s $DOMAIN_SUFFIX" +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting dnsmasq: " + daemon $dnsmasq $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq + ;; + stop) + if test "x`pidof dnsmasq`" != x; then + echo -n "Shutting down dnsmasq: " + killproc dnsmasq + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid + ;; + status) + status dnsmasq + RETVAL=$? + ;; + reload) + echo -n "Reloading dnsmasq: " + killproc dnsmasq -HUP + RETVAL=$? + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + if test "x`/sbin/pidof dnsmasq`" != x; then + $0 stop + $0 start + RETVAL=$? + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 +esac + +exit $RETVAL + Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dnsmasq.spec 2 May 2006 16:48:07 -0000 1.8 +++ dnsmasq.spec 8 May 2006 17:05:40 -0000 1.9 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.30 -Release: 4.2%{?dist}.1 +Version: 2.31 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,7 +9,6 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch -Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%{dist}" != ".fc3" @@ -37,7 +36,6 @@ %patch0 -p1 %if "%{dist}" != ".fc3" %patch1 -p1 -%patch2 -p1 %endif %build @@ -56,7 +54,7 @@ %if "%{dist}" != ".fc3" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ %endif -install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq +install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %clean @@ -79,7 +77,7 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 +%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf %if "%{dist}" != ".fc3" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf @@ -90,8 +88,10 @@ %changelog -* Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2.fc3.1 -- Don't install dbus/dnsmasq.conf on FC3 (dbus too old) +* Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 +- Removed dbus config patch (now provided upstream) +- Patched in init script (no longer provided upstream) +- Added DBus-interface to docs * Tue May 2 2006 Patrick "Jima" Laughton 2.30-4.2 - More upstream-recommended cleanups :) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 16:51:25 -0000 1.2 +++ sources 8 May 2006 17:05:40 -0000 1.3 @@ -1 +1 @@ -91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz +26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz --- dnsmasq-2.30-dbus-config.patch DELETED --- --- dnsmasq-2.30-enable-dbus.patch DELETED --- --- dnsmasq-2.30-initscript.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:12:24 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:12:24 -0700 Subject: rpms/stellarium/FC-4 stellarium.spec,1.13,1.14 Message-ID: <200605081712.k48HCQw3005171@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5154 Modified Files: stellarium.spec Log Message: New upstream release Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- stellarium.spec 14 Feb 2006 17:42:55 -0000 1.13 +++ stellarium.spec 8 May 2006 17:12:24 -0000 1.14 @@ -1,6 +1,6 @@ Name: stellarium -Version: 0.7.1 -Release: 5%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -57,7 +57,7 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ install -m 0644 -p stellarium-2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png -rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,files_format.txt,stellarium.ico} +rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico} cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version} %find_lang %{name} @@ -78,6 +78,9 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog +* Mon May 8 2006 Jochen Schmitt 0.8.0-1 +- New upstream release + * Tue Feb 14 2006 Jochen Schmitt 0.7.1-5 - Add stellarium user guide as doc subpackage From fedora-extras-commits at redhat.com Mon May 8 17:18:37 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:18:37 -0700 Subject: rpms/stellarium/FC-4 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 stellarium.spec, 1.14, 1.15 Message-ID: <200605081718.k48HIdQm005277@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5256 Modified Files: .cvsignore sources stellarium.spec Log Message: correction becouse forgetting make new-source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Feb 2006 17:42:55 -0000 1.6 +++ .cvsignore 8 May 2006 17:18:36 -0000 1.7 @@ -1,2 +1,2 @@ -stellarium-0.7.1.tar.gz +stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Feb 2006 17:42:55 -0000 1.7 +++ sources 8 May 2006 17:18:36 -0000 1.8 @@ -1,2 +1,2 @@ -94cb47d20d31d5e0bba5d9e0189c331b stellarium-0.7.1.tar.gz +2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz 9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- stellarium.spec 8 May 2006 17:12:24 -0000 1.14 +++ stellarium.spec 8 May 2006 17:18:36 -0000 1.15 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -78,7 +78,7 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog -* Mon May 8 2006 Jochen Schmitt 0.8.0-1 +* Mon May 8 2006 Jochen Schmitt 0.8.0-2 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-5 From fedora-extras-commits at redhat.com Mon May 8 17:36:13 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:36:13 -0700 Subject: rpms/stellarium/devel stellarium-0.8.0-gcc41.patch, NONE, 1.1 stellarium.spec, 1.17, 1.18 Message-ID: <200605081736.k48HaFNe005517@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5497 Modified Files: stellarium.spec Added Files: stellarium-0.8.0-gcc41.patch Log Message: Add gcc41 patch to cvs stellarium-0.8.0-gcc41.patch: --- NEW FILE stellarium-0.8.0-gcc41.patch --- --- stellarium-0.8.0/src/s_gui.h.org 2006-05-08 17:52:41.000000000 +0200 +++ stellarium-0.8.0/src/s_gui.h 2006-05-08 17:55:02.000000000 +0200 @@ -510,7 +510,7 @@ private: callback onChangeCallback; - void ScrollBar::adjustSize(void); + void adjustSize(void); Button scrollBt; bool vertical; unsigned int scrollOffset, scrollSize; @@ -837,7 +837,7 @@ class City { public: - City::City(const string& _name = "", const string& _state = "", const string& _country = "", + City(const string& _name = "", const string& _state = "", const string& _country = "", double _longitude = 0.f, double _latitude = 0.f, float zone = 0, int _showatzoom = 0, int _altitude = 0); void addCity(const string& _name = "", const string& _state = "", const string& _country = "", double _longitude = 0.f, double _latitude = 0.f, float zone = 0, int _showatzoom = 0, int _altitude = 0); Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- stellarium.spec 8 May 2006 16:59:39 -0000 1.17 +++ stellarium.spec 8 May 2006 17:36:13 -0000 1.18 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -83,7 +83,7 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog -* Sun May 7 2006 Jochen Schmitt 0.8.0-1 +* Sun May 7 2006 Jochen Schmitt 0.8.0-2 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 From fedora-extras-commits at redhat.com Mon May 8 17:36:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:36:39 -0700 Subject: rpms/perl-Module-Install/devel - New directory Message-ID: <200605081736.k48HafnA005612@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5578/perl-Module-Install/devel Log Message: Directory /cvs/extras/rpms/perl-Module-Install/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 17:36:38 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:36:38 -0700 Subject: rpms/perl-Module-Install - New directory Message-ID: <200605081736.k48HaenD005606@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5578/perl-Module-Install Log Message: Directory /cvs/extras/rpms/perl-Module-Install added to the repository From fedora-extras-commits at redhat.com Mon May 8 17:36:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:36:59 -0700 Subject: rpms/perl-Module-Install Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605081737.k48Hb1ST005662@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5634 Added Files: Makefile import.log Log Message: Setup of module perl-Module-Install --- NEW FILE Makefile --- # Top level Makefile for module perl-Module-Install all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 17:37:00 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:37:00 -0700 Subject: rpms/perl-Module-Install/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605081737.k48Hb2T2005665@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5634/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Module-Install --- NEW 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 May 8 17:37:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:37:44 -0700 Subject: rpms/perl-Module-Install import.log,1.1,1.2 Message-ID: <200605081738.k48HcG0G005737@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5698 Modified Files: import.log Log Message: auto-import perl-Module-Install-0.62-2 on branch devel from perl-Module-Install-0.62-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Install/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 May 2006 17:36:59 -0000 1.1 +++ import.log 8 May 2006 17:37:44 -0000 1.2 @@ -0,0 +1 @@ +perl-Module-Install-0_62-2:HEAD:perl-Module-Install-0.62-2.src.rpm:1147109852 From fedora-extras-commits at redhat.com Mon May 8 17:37:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:37:44 -0700 Subject: rpms/perl-Module-Install/devel perl-Module-Install.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605081738.k48HcGXI005741@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Install/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5698/devel Modified Files: .cvsignore sources Added Files: perl-Module-Install.spec Log Message: auto-import perl-Module-Install-0.62-2 on branch devel from perl-Module-Install-0.62-2.src.rpm --- NEW FILE perl-Module-Install.spec --- Name: perl-Module-Install Version: 0.62 Release: 2%{?dist} Summary: Standalone, extensible Perl module installer License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Install/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Install-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Module::CoreList) BuildRequires: perl(Module::ScanDeps) >= 0.28 BuildRequires: perl(PAR::Dist) >= 0.03 BuildRequires: perl(YAML) >= 0.35 BuildRequires: perl(Test::Pod) >= 1.14 Requires: perl(Module::Build) Requires: perl(Module::CoreList) Requires: perl(Module::ScanDeps) >= 0.28 Requires: perl(PAR::Dist) >= 0.03 Requires: perl(YAML) >= 0.35 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Module::Install is a package for writing installers for CPAN (or CPAN-like) distributions that are clean, simple, minimalist, act in a strictly correct manner with both the ExtUtils::MakeMaker and Module::Build build systems, and will run on any Perl installation version 5.004 or newer. %prep %setup -q -n Module-Install-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* find $RPM_BUILD_ROOT%{perl_vendorlib} -type f -perm +100 -exec chmod a-x {} \; %check make test TEST_POD=1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 08 2006 Steven Pritchard 0.62-2 - Fix Source0 URL. * Sat May 06 2006 Steven Pritchard 0.62-1 - Update to 0.62. - Drop executable bit from everything in vendor_perl to make rpmlint happy. * Thu Mar 23 2006 Steven Pritchard 0.61-1 - Specfile autogenerated by cpanspec 1.63. - Drop explicit BR: perl. - Turn on TEST_POD. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Install/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 17:37:00 -0000 1.1 +++ .cvsignore 8 May 2006 17:37:44 -0000 1.2 @@ -0,0 +1 @@ +Module-Install-0.62.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Install/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 17:37:00 -0000 1.1 +++ sources 8 May 2006 17:37:44 -0000 1.2 @@ -0,0 +1 @@ +92eda243d936f4010883825aa2dd2993 Module-Install-0.62.tar.gz From fedora-extras-commits at redhat.com Mon May 8 17:43:18 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 10:43:18 -0700 Subject: rpms/stellarium/FC-5 stellarium.spec,1.17,1.18 Message-ID: <200605081743.k48HhKu1005816@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5799 Modified Files: stellarium.spec Log Message: Add Fretype-devel as BuildRequires Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- stellarium.spec 8 May 2006 17:06:01 -0000 1.17 +++ stellarium.spec 8 May 2006 17:43:17 -0000 1.18 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -20,6 +20,7 @@ BuildRequires: mesa-libGLU-devel BuildRequires: ImageMagick BuildRequires: libpng-devel +BuildRequires: freetype-devel %description Stellarium is a real-time 3D photo-realistic nightsky renderer. It can @@ -83,7 +84,7 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog -* Sun May 7 2006 Jochen Schmitt 0.8.0-1 +* Sun May 7 2006 Jochen Schmitt 0.8.0-2 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 From fedora-extras-commits at redhat.com Mon May 8 17:48:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 8 May 2006 10:48:38 -0700 Subject: rpms/pcsc-tools/FC-5 .cvsignore, 1.5, 1.6 pcsc-tools.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605081748.k48Hmep8005943@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5906/FC-5 Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Mon May 8 2006 Ville Skytt?? - 1.4.5-1 - 1.4.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Mar 2006 19:21:44 -0000 1.5 +++ .cvsignore 8 May 2006 17:48:38 -0000 1.6 @@ -1 +1 @@ -pcsc-tools-1.4.4.tar.gz +pcsc-tools-1.4.5.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/pcsc-tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pcsc-tools.spec 25 Mar 2006 19:21:44 -0000 1.6 +++ pcsc-tools.spec 8 May 2006 17:48:38 -0000 1.7 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -29,7 +29,7 @@ sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c fi # cp %{SOURCE1} . -for f in Changelog smartcard_list.txt ; do +for f in Changelog README smartcard_list.txt ; do iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f done @@ -64,6 +64,9 @@ %changelog +* Mon May 8 2006 Ville Skytt?? - 1.4.5-1 +- 1.4.5. + * Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Mar 2006 19:21:44 -0000 1.5 +++ sources 8 May 2006 17:48:38 -0000 1.6 @@ -1 +1 @@ -f224de5a58f533f7b5bce1b9e9a340d7 pcsc-tools-1.4.4.tar.gz +706a6e3bcac08d62c44fb2cd1d561969 pcsc-tools-1.4.5.tar.gz From fedora-extras-commits at redhat.com Mon May 8 17:48:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 8 May 2006 10:48:39 -0700 Subject: rpms/pcsc-tools/devel .cvsignore, 1.5, 1.6 pcsc-tools.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605081748.k48Hmf7v005949@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5906/devel Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Mon May 8 2006 Ville Skytt?? - 1.4.5-1 - 1.4.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Mar 2006 19:21:52 -0000 1.5 +++ .cvsignore 8 May 2006 17:48:39 -0000 1.6 @@ -1 +1 @@ -pcsc-tools-1.4.4.tar.gz +pcsc-tools-1.4.5.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pcsc-tools.spec 25 Mar 2006 19:21:52 -0000 1.6 +++ pcsc-tools.spec 8 May 2006 17:48:39 -0000 1.7 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -29,7 +29,7 @@ sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c fi # cp %{SOURCE1} . -for f in Changelog smartcard_list.txt ; do +for f in Changelog README smartcard_list.txt ; do iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f done @@ -64,6 +64,9 @@ %changelog +* Mon May 8 2006 Ville Skytt?? - 1.4.5-1 +- 1.4.5. + * Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Mar 2006 19:21:52 -0000 1.5 +++ sources 8 May 2006 17:48:39 -0000 1.6 @@ -1 +1 @@ -f224de5a58f533f7b5bce1b9e9a340d7 pcsc-tools-1.4.4.tar.gz +706a6e3bcac08d62c44fb2cd1d561969 pcsc-tools-1.4.5.tar.gz From fedora-extras-commits at redhat.com Mon May 8 17:50:06 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 8 May 2006 10:50:06 -0700 Subject: rpms/adns/FC-5 adns-autoconf-noexpand.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 adns-DESTDIR.patch, 1.1, 1.2 adns.spec, 1.6, 1.7 sources, 1.2, 1.3 adns-1.1-parsedomain.patch, 1.1, NONE adns-1.1-semicolon.patch, 1.1, NONE Message-ID: <200605081750.k48Ho9n6006070@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/adns/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6041 Modified Files: .cvsignore adns-DESTDIR.patch adns.spec sources Added Files: adns-autoconf-noexpand.patch Removed Files: adns-1.1-parsedomain.patch adns-1.1-semicolon.patch Log Message: Upgrading to 1.2 adns-autoconf-noexpand.patch: --- NEW FILE adns-autoconf-noexpand.patch --- --- adns-1.2/settings.make.in.noexpand 2006-05-08 10:24:44.000000000 -0400 +++ adns-1.2/settings.make.in 2006-05-08 10:25:46.000000000 -0400 @@ -47,9 +47,9 @@ prefix= @prefix@ exec_prefix= @exec_prefix@ -bin_dir= $(exec_prefix)/bin -lib_dir= $(exec_prefix)/lib -include_dir= $(prefix)/include +bin_dir= @bindir@ +lib_dir= @libdir@ +include_dir= @includedir@ AC_INSTALL= @INSTALL@ ifeq ($(AC_INSTALL),./install-sh -c) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:00:46 -0000 1.2 +++ .cvsignore 8 May 2006 17:50:06 -0000 1.3 @@ -1 +1,2 @@ adns-1.1.tar.gz +adns-1.2.tar.gz adns-DESTDIR.patch: Index: adns-DESTDIR.patch =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/adns-DESTDIR.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- adns-DESTDIR.patch 8 Nov 2004 04:00:46 -0000 1.1 +++ adns-DESTDIR.patch 8 May 2006 17:50:06 -0000 1.2 @@ -1,7 +1,6 @@ -diff -Nru adns-1.0/Makefile.in adns-1.0.new/Makefile.in ---- adns-1.0/Makefile.in Sun Sep 17 16:10:57 2000 -+++ adns-1.0.new/Makefile.in Mon Nov 19 02:34:14 2001 -@@ -38,7 +38,7 @@ +--- adns-1.2/Makefile.in.destdir 2006-04-08 10:37:21.000000000 -0400 ++++ adns-1.2/Makefile.in 2006-05-08 10:11:16.000000000 -0400 +@@ -37,7 +37,7 @@ SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress all install uninstall clean distclean mostlyclean maintainer-clean distprep: @@ -10,79 +9,64 @@ $(MAKE) $@-here all-here install-here uninstall-here distprep-here: README -diff -Nru adns-1.0/client/Makefile.in adns-1.0.new/client/Makefile.in ---- adns-1.0/client/Makefile.in Sun Sep 17 02:43:10 2000 -+++ adns-1.0.new/client/Makefile.in Mon Nov 19 02:36:50 2001 -@@ -59,11 +59,12 @@ - all: $(TARGETS) - - install: $(TARG_INSTALL) -+ $(INSTALL) -d $(DESTDIR)$(bindir) - set -xe; for f in $(TARG_INSTALL); \ -- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done -+ do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done - - uninstall: -- for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done -+ for f in $(TARGETS); do rm -f $(DESTDIR)$(bindir)/$$f; done - - adnshost: $(ADH_OBJS) $(DYNAMIC_DEP) - $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) -diff -Nru adns-1.0/settings.make.in adns-1.0.new/settings.make.in ---- adns-1.0/settings.make.in Sun Sep 17 03:01:11 2000 -+++ adns-1.0.new/settings.make.in Mon Nov 19 02:36:25 2001 -@@ -47,10 +47,10 @@ - MKSHLIB_3= @MKSHLIB_3@ - - prefix= @prefix@ --exec_prefix= @exec_prefix@ --bin_dir= $(exec_prefix)/bin --lib_dir= $(exec_prefix)/lib --include_dir= $(prefix)/include -+execprefix= @execprefix@ -+bindir= @bindir@ -+libdir= @libdir@ -+includedir= @includedir@ - - AC_INSTALL= @INSTALL@ - ifeq ($(AC_INSTALL),./install-sh -c) -diff -Nru adns-1.0/src/Makefile.in adns-1.0.new/src/Makefile.in ---- adns-1.0/src/Makefile.in Sun Sep 17 02:24:24 2000 -+++ adns-1.0.new/src/Makefile.in Mon Nov 19 02:35:18 2001 -@@ -29,13 +29,14 @@ +--- adns-1.2/src/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400 ++++ adns-1.2/src/Makefile.in 2006-05-08 10:12:22.000000000 -0400 +@@ -28,14 +28,14 @@ include adns.make install: -+ $(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) +- mkdir -p $(lib_dir) $(include_dir) ++ mkdir -p $(DESTDIR)$(lib_dir) $(DESTDIR)$(include_dir) set -xe; for f in $(TARGETS); \ - do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done - $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h -+ do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done -+ $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h ++ do $(INSTALL_DATA) $$f $(DESTDIR)$(lib_dir)/$$f; done ++ $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(include_dir)/adns.h uninstall: - for f in $(TARGETS); do rm -f $(lib_dir)/$$f; done - rm -f $(include_dir)/adns.h -+ for f in $(TARGETS); do rm -f $(DESTDIR)$(libdir)/$$f; done -+ rm -f $(DESTDIR)$(includedir)/adns.h ++ for f in $(TARGETS); do rm -f $(DESTDIR)$(lib_dir)/$$f; done ++ rm -f $(DESTDIR)$(include_dir)/adns.h ALLOBJS= $(LIBOBJS) ---- adns-1.0/dynamic/Makefile.in~ Mon Nov 19 03:01:54 2001 -+++ adns-1.0/dynamic/Makefile.in Mon Nov 19 03:01:54 2001 -@@ -31,11 +31,12 @@ +--- adns-1.2/client/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400 ++++ adns-1.2/client/Makefile.in 2006-05-08 10:12:56.000000000 -0400 +@@ -58,12 +58,12 @@ + all: $(TARGETS) + + install: $(TARG_INSTALL) +- mkdir -p $(bin_dir) ++ mkdir -p $(DESTDIR)$(bin_dir) + set -xe; for f in $(TARG_INSTALL); \ +- do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done ++ do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bin_dir)/$$f; done + + uninstall: +- for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done ++ for f in $(TARGETS); do rm -f $(DESTDIR)$(bin_dir)/$$f; done + + adnshost: $(ADH_OBJS) $(DYNAMIC_DEP) + $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) +--- adns-1.2/dynamic/Makefile.in.destdir 2006-04-08 10:36:57.000000000 -0400 ++++ adns-1.2/dynamic/Makefile.in 2006-05-08 10:12:32.000000000 -0400 +@@ -30,13 +30,13 @@ ALLOBJS= $(addsuffix _p.o, $(basename $(LIBOBJS))) install: +- mkdir -p $(lib_dir) - $(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE) - ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) -+ $(INSTALL) -d $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE) -+ ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) +- ln -sf $(SHLIBSONAME) $(lib_dir)/$(SHLIBFORLINK) ++ mkdir -p $(DESTDIR)$(lib_dir) ++ $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBFILE) ++ ln -sf $(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBSONAME) ++ ln -sf $(SHLIBSONAME) $(DESTDIR)$(lib_dir)/$(SHLIBFORLINK) uninstall: - rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) -+ rm -f $(DESTDIR)$(libdir)/$(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) ++ rm -f $(DESTDIR)$(lib_dir)/$(SHLIBFILE) $(DESTDIR)$(lib_dir)/$(SHLIBSONAME) $(SHLIBFORLINK): ln -s $(SHLIBSONAME) $(SHLIBFORLINK) Index: adns.spec =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/adns.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- adns.spec 6 Apr 2005 22:10:47 -0000 1.6 +++ adns.spec 8 May 2006 17:50:06 -0000 1.7 @@ -1,18 +1,17 @@ Name: adns -Version: 1.1 -Release: 5 +Version: 1.2 +Release: 1 Summary: Advanced, easy to use, asynchronous-capable DNS client library Group: System Environment/Libraries License: GPL URL: http://www.chiark.greenend.org.uk/~ian/adns/ -Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-1.1.tar.gz +Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz Patch0: %{name}-DESTDIR.patch -Patch1: %{name}-ac_fix.patch -Patch2: adns-1.1-semicolon.patch -Patch3: adns-1.1-parsedomain.patch -BuildRequires: autoconf213 automake15 +Patch1: %{name}-ac_fix.patch +Patch2: %{name}-autoconf-noexpand.patch +#BuildRequires: autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -72,16 +71,13 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .semicolon -%patch3 -p1 -b .parsedomain +%patch0 -p1 -b .destdir +%patch1 -p1 -b .ac_fix +%patch2 -p1 -b .noexpand %build #aclocal #%{__autoconf} -aclocal-1.5 -autoconf-2.13 %configure --enable-dynamic make %{?_smp_mflags} @@ -112,6 +108,11 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Mon May 8 2006 Mihai Ibanescu 1.2-1 +- Updated to 1.2, some of the patches were already upstream +- Removed dependency on autoconf/automake since it builds just fine without + that + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:00:46 -0000 1.2 +++ sources 8 May 2006 17:50:06 -0000 1.3 @@ -1 +1 @@ -891956e305acf5fc83b099333bf3ffd9 adns-1.1.tar.gz +4d9ad052125ddd295ee75ea608b992b7 adns-1.2.tar.gz --- adns-1.1-parsedomain.patch DELETED --- --- adns-1.1-semicolon.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 17:52:23 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:52:23 -0700 Subject: owners owners.list,1.959,1.960 Message-ID: <200605081752.k48HqPi3006135@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6118 Modified Files: owners.list Log Message: Add perl-Module-Install. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.959 retrieving revision 1.960 diff -u -r1.959 -r1.960 --- owners.list 8 May 2006 01:48:19 -0000 1.959 +++ owners.list 8 May 2006 17:52:23 -0000 1.960 @@ -1098,6 +1098,7 @@ Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Info|Information about Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Module-Install|Standalone, extensible Perl module installer|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 8 17:57:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:57:39 -0700 Subject: rpms/perl-Test-Base - New directory Message-ID: <200605081757.k48Hvfl9006235@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6209/perl-Test-Base Log Message: Directory /cvs/extras/rpms/perl-Test-Base added to the repository From fedora-extras-commits at redhat.com Mon May 8 17:57:40 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:57:40 -0700 Subject: rpms/perl-Test-Base/devel - New directory Message-ID: <200605081757.k48HvgHj006238@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6209/perl-Test-Base/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Base/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 17:58:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:58:07 -0700 Subject: rpms/perl-Test-Base Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605081758.k48Hw9Hx006287@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6254 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Base --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Base all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 17:58:08 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:58:08 -0700 Subject: rpms/perl-Test-Base/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605081758.k48HwAlR006290@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6254/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Base --- NEW 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 May 8 17:58:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:58:50 -0700 Subject: rpms/perl-Test-Base import.log,1.1,1.2 Message-ID: <200605081759.k48HxMNW006354@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6320 Modified Files: import.log Log Message: auto-import perl-Test-Base-0.50-2 on branch devel from perl-Test-Base-0.50-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Base/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 May 2006 17:58:07 -0000 1.1 +++ import.log 8 May 2006 17:58:50 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Base-0_50-2:HEAD:perl-Test-Base-0.50-2.src.rpm:1147111118 From fedora-extras-commits at redhat.com Mon May 8 17:58:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 10:58:51 -0700 Subject: rpms/perl-Test-Base/devel perl-Test-Base.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605081759.k48HxNow006358@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6320/devel Modified Files: .cvsignore sources Added Files: perl-Test-Base.spec Log Message: auto-import perl-Test-Base-0.50-2 on branch devel from perl-Test-Base-0.50-2.src.rpm --- NEW FILE perl-Test-Base.spec --- Name: perl-Test-Base Version: 0.50 Release: 2%{?dist} Summary: Data Driven Testing Framework License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Base/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/Test-Base-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.30 BuildRequires: perl(Text::Diff) >= 0.35 BuildRequires: perl(Algorithm::Diff) >= 1.15 Requires: perl(Text::Diff) >= 0.35 Requires: perl(Algorithm::Diff) >= 1.15 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Testing is usually the ugly part of Perl module authoring. Perl gives you a standard way to run tests with Test::Harness, and basic testing primitives with Test::More. After that you are pretty much on your own to develop a testing framework and philosophy. Test::More encourages you to make your own framework by subclassing Test::Builder, but that is not trivial. %prep %setup -q -n Test-Base-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README ToDo %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 08 2006 Steven Pritchard 0.50-2 - Add explicit dependencies for Text::Diff and Algorithm::Diff. * Thu May 04 2006 Steven Pritchard 0.50-1 - Specfile autogenerated by cpanspec 1.65. - Remove explicit BR: perl and Requires: perl(Spiffy). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Base/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 17:58:07 -0000 1.1 +++ .cvsignore 8 May 2006 17:58:51 -0000 1.2 @@ -0,0 +1 @@ +Test-Base-0.50.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Base/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 17:58:07 -0000 1.1 +++ sources 8 May 2006 17:58:51 -0000 1.2 @@ -0,0 +1 @@ +1917571661a8302626a8c82eb047f941 Test-Base-0.50.tar.gz From fedora-extras-commits at redhat.com Mon May 8 18:01:08 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 11:01:08 -0700 Subject: owners owners.list,1.960,1.961 Message-ID: <200605081801.k48I1Ag6008545@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6414 Modified Files: owners.list Log Message: Add perl-Test-Base. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.960 retrieving revision 1.961 diff -u -r1.960 -r1.961 --- owners.list 8 May 2006 17:52:23 -0000 1.960 +++ owners.list 8 May 2006 18:01:07 -0000 1.961 @@ -1159,6 +1159,7 @@ Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Term-UI|Term::ReadLine UI made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Base|Data Driven Testing Framework|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 8 18:09:16 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 May 2006 11:09:16 -0700 Subject: rpms/stellarium/devel stellarium.spec,1.18,1.19 Message-ID: <200605081809.k48I9I2f008705@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8687 Modified Files: stellarium.spec Log Message: ADd freetype-devel as BuildRequires Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- stellarium.spec 8 May 2006 17:36:13 -0000 1.18 +++ stellarium.spec 8 May 2006 18:09:16 -0000 1.19 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -20,6 +20,7 @@ BuildRequires: mesa-libGLU-devel BuildRequires: ImageMagick BuildRequires: libpng-devel +BuildRequires: freetype-devel %description Stellarium is a real-time 3D photo-realistic nightsky renderer. It can @@ -83,7 +84,7 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog -* Sun May 7 2006 Jochen Schmitt 0.8.0-2 +* Sun May 7 2006 Jochen Schmitt 0.8.0-3 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 From fedora-extras-commits at redhat.com Mon May 8 18:18:37 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:18:37 -0700 Subject: rpms/lasi - New directory Message-ID: <200605081818.k48IIdAg008834@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8809/lasi Log Message: Directory /cvs/extras/rpms/lasi added to the repository From fedora-extras-commits at redhat.com Mon May 8 18:18:37 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:18:37 -0700 Subject: rpms/lasi/devel - New directory Message-ID: <200605081818.k48IId9v008838@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8809/lasi/devel Log Message: Directory /cvs/extras/rpms/lasi/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 18:18:49 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:18:49 -0700 Subject: rpms/lasi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605081818.k48IIp5K008892@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8859 Added Files: Makefile import.log Log Message: Setup of module lasi --- NEW FILE Makefile --- # Top level Makefile for module lasi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 18:18:49 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:18:49 -0700 Subject: rpms/lasi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605081818.k48IIpOm008895@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8859/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lasi --- NEW 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 May 8 18:19:13 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:19:13 -0700 Subject: rpms/lasi import.log,1.1,1.2 Message-ID: <200605081819.k48IJFNq008962@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8928 Modified Files: import.log Log Message: auto-import lasi-1.0.5-2.fc5 on branch devel from lasi-1.0.5-2.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lasi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 May 2006 18:18:48 -0000 1.1 +++ import.log 8 May 2006 18:19:13 -0000 1.2 @@ -0,0 +1 @@ +lasi-1_0_5-2_fc5:HEAD:lasi-1.0.5-2.fc5.src.rpm:1147112350 From fedora-extras-commits at redhat.com Mon May 8 18:19:14 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:19:14 -0700 Subject: rpms/lasi/devel lasi-1.0.5-pc.patch, NONE, 1.1 lasi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605081819.k48IJG4V008969@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/lasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8928/devel Modified Files: .cvsignore sources Added Files: lasi-1.0.5-pc.patch lasi.spec Log Message: auto-import lasi-1.0.5-2.fc5 on branch devel from lasi-1.0.5-2.fc5.src.rpm lasi-1.0.5-pc.patch: --- NEW FILE lasi-1.0.5-pc.patch --- --- lasi-1.0.5/lasi.pc.in.libs 2006-05-08 09:58:13.000000000 -0600 +++ lasi-1.0.5/lasi.pc.in 2006-05-08 09:58:23.000000000 -0600 @@ -6,6 +6,6 @@ Name: LASi Description: Library to write UTF-8 strings to Postscript stream. Version: @VERSION@ -Libs: -L${libdir} +Libs: -L${libdir} -lLASi Cflags: -I${includedir} --- NEW FILE lasi.spec --- Name: lasi Version: 1.0.5 Release: 2%{?dist} Summary: C++ library for creating Postscript documents Group: Development/Libraries License: LGPL URL: http://www.unifont.org/lasi/ Source0: http://www.unifont.org/lasi/download/lasi-%{version}.tar.gz Patch0: lasi-1.0.5-pc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pango-devel %description LASi is a library written by Larry Siden that provides a C++ stream output interface ( with operator << ) for creating Postscript documents that can contain characters from any of the scripts and symbol blocks supported in Unicode and by Owen Taylor's Pango layout engine. The library accomodates right-to-left scripts such as Arabic and Hebrew as easily as left-to-right scripts. Indic and Indic-derived Complex Text Layout (CTL) scripts, such as Devanagari, Thai, Lao, and Tibetan are supported to the extent provided by Pango and by the OpenType fonts installed on your system. All of this is provided without need for any special configuration or layout calculation on the programmer's part. Although the capability to produce Unicode-based multilingual Postscript documents exists in large Open Source application framework libraries such as GTK+, QT, and KDE, LASi was designed for projects which require the ability to produce Postscript independent of any one application framework. %package devel Summary: Development headers and libraries for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pango-devel %description devel %{summary}. %prep %setup -q %patch -p1 -b .pc %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libLASi.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/libLASi.so.* %files devel %defattr(-,root,root,-) %doc doc examples/* %{_includedir}/LASi.h %{_libdir}/libLASi.so %{_libdir}/pkgconfig/lasi.pc %changelog * Mon May 8 2006 - Orion Poplawski - 1.0.5-2 - Disable static libs - Patch pc file to return -lLASi * Thu May 4 2006 - Orion Poplawski - 1.0.5-1 - Update to 1.0.5 - Remove unneeded patches and autotools - Move doc dir to -devel package - Make -devel package require pango-devel, included in LASi.h * Mon Apr 24 2006 - Orion Poplawski - 1.0.4-1 - Initial Fedora Extras version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lasi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 18:18:49 -0000 1.1 +++ .cvsignore 8 May 2006 18:19:14 -0000 1.2 @@ -0,0 +1 @@ +lasi-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lasi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 18:18:49 -0000 1.1 +++ sources 8 May 2006 18:19:14 -0000 1.2 @@ -0,0 +1 @@ +b9f766f0b262bd3a5365fa81aea47ed8 lasi-1.0.5.tar.gz From fedora-extras-commits at redhat.com Mon May 8 18:19:48 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:19:48 -0700 Subject: owners owners.list,1.961,1.962 Message-ID: <200605081819.k48IJoDu009022@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9005 Modified Files: owners.list Log Message: Add lasi Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.961 retrieving revision 1.962 diff -u -r1.961 -r1.962 --- owners.list 8 May 2006 18:01:07 -0000 1.961 +++ owners.list 8 May 2006 18:19:48 -0000 1.962 @@ -582,6 +582,7 @@ Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|lagan|Local, global, and multiple alignment of DNA sequences|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|lasi|C++ library for creating Postscript documents|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|lcms|Color Management System|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|lcov|LTP GCOV extension code coverage tool|roland at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 18:20:58 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 8 May 2006 11:20:58 -0700 Subject: rpms/perl-Test-Base/devel perl-Test-Base.spec,1.1,1.2 Message-ID: <200605081821.k48IL0pv009097@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Base/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9080 Modified Files: perl-Test-Base.spec Log Message: Drop Algorithm::Diff dep and add LWP::Simple. (Suggested by jpo.) Index: perl-Test-Base.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Base/devel/perl-Test-Base.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Base.spec 8 May 2006 17:58:51 -0000 1.1 +++ perl-Test-Base.spec 8 May 2006 18:20:57 -0000 1.2 @@ -10,9 +10,8 @@ BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.30 BuildRequires: perl(Text::Diff) >= 0.35 -BuildRequires: perl(Algorithm::Diff) >= 1.15 Requires: perl(Text::Diff) >= 0.35 -Requires: perl(Algorithm::Diff) >= 1.15 +Requires: perl(LWP::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -53,7 +52,7 @@ %changelog * Mon May 08 2006 Steven Pritchard 0.50-2 -- Add explicit dependencies for Text::Diff and Algorithm::Diff. +- Add explicit dependencies for Text::Diff and LWP::Simple. * Thu May 04 2006 Steven Pritchard 0.50-1 - Specfile autogenerated by cpanspec 1.65. From fedora-extras-commits at redhat.com Mon May 8 18:26:41 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 11:26:41 -0700 Subject: rpms/plplot/devel plplot.spec,1.9,1.10 Message-ID: <200605081826.k48IQhdo009179@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9160 Modified Files: plplot.spec Log Message: - Update to 5.6.0 with new psttf driver - Add wxGTK support Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plplot.spec 24 Feb 2006 22:04:56 -0000 1.9 +++ plplot.spec 8 May 2006 18:26:41 -0000 1.10 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.5.3 -Release: 12%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -11,11 +11,9 @@ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch -Patch2: plplot-5.5.3-buffer.patch Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch -Patch5: plplot-5.5.3-check.patch -Patch6: plplot-5.5.3-x.patch +Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel @@ -24,9 +22,10 @@ BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 BuildRequires: perl(XML::DOM) -#Temporary until bz #176313 is fixed -BuildRequires: libXau-devel, libXdmcp-devel -#BuildRequires: libunicode-devel +BuildRequires: lasi-devel +BuildRequires: wxGTK-devel +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description PLplot is a library of functions that are useful for making scientific @@ -127,14 +126,22 @@ %description tk-devel %{summary} + +%package wxGTK +Summary: Functions for scientific plotting with wxGTK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description wxGTK +%{summary} + + %prep %setup -q %patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig %patch3 -p1 -b .orig %patch4 -p1 -b .orig -%patch5 -p1 -b .orig %patch6 -p1 -b .orig @@ -142,7 +149,8 @@ %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ - --disable-wingcc --disable-aqt --disable-pdl + --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ + --with-prebuiltdoc make @@ -155,8 +163,6 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version} find $RPM_BUILD_ROOT -name \*.la | xargs rm -#Remove non-existant PDL dependency -rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl #Permissions find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x @@ -165,7 +171,14 @@ rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || : +fi %postun -p /sbin/ldconfig @@ -214,6 +227,8 @@ %{_libdir}/plplot%{version}/driversd/ps.so %{_libdir}/plplot%{version}/driversd/pstex.rc %{_libdir}/plplot%{version}/driversd/pstex.so +%{_libdir}/plplot%{version}/driversd/psttf.rc +%{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc @@ -229,6 +244,7 @@ %{python_sitelib}/plplotcanvas.py %{python_sitelib}/plplotcanvas.pyc %{python_sitelib}/plplotcanvas.pyo +%{_infodir}/plplotdoc.info* %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz %{_mandir}/man1/plrender.1.gz @@ -264,6 +280,7 @@ %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_mandir}/man3/pl*.3* %files gnome %defattr(-,root,root,-) @@ -315,7 +332,17 @@ %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ +%files wxGTK +%defattr(-,root,root,-) +%{_libdir}/plplot%{version}/driversd/wxwidgets.rc +%{_libdir}/plplot%{version}/driversd/wxwidgets.so + + %changelog +* Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 +- Update to 5.6.0 with new psttf driver +- Add wxGTK support + * Fri Feb 24 2006 - Orion Poplawski - 5.5.3-12 - Rebuild for FC5 gcc/glibc changes From fedora-extras-commits at redhat.com Mon May 8 18:40:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 8 May 2006 11:40:47 -0700 Subject: owners owners.list,1.962,1.963 Message-ID: <200605081840.k48IenHt009586@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565 Modified Files: owners.list Log Message: +ctapi-common Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.962 retrieving revision 1.963 diff -u -r1.962 -r1.963 --- owners.list 8 May 2006 18:19:48 -0000 1.962 +++ owners.list 8 May 2006 18:40:46 -0000 1.963 @@ -170,6 +170,7 @@ Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 19:02:46 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 8 May 2006 12:02:46 -0700 Subject: fedora-security/audit fc4,1.235,1.236 fc5,1.148,1.149 Message-ID: <200605081902.k48J2nHi011949@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11928 Modified Files: fc4 fc5 Log Message: Add Quagga bugs. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- fc4 8 May 2006 09:50:08 -0000 1.235 +++ fc4 8 May 2006 19:02:36 -0000 1.236 @@ -3,8 +3,8 @@ ** are items that need attention -CVE-2006-2224 VULNERABLE (quagga) -CVE-2006-2223 VULNERABLE (quagga) +CVE-2006-2224 VULNERABLE (quagga) #191085 +CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- fc5 8 May 2006 09:36:59 -0000 1.148 +++ fc5 8 May 2006 19:02:36 -0000 1.149 @@ -3,8 +3,8 @@ ** are items that need attention -CVE-2006-2224 VULNERABLE (quagga) -CVE-2006-2223 VULNERABLE (quagga) +CVE-2006-2224 VULNERABLE (quagga) #191085 +CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 From fedora-extras-commits at redhat.com Mon May 8 19:21:15 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 12:21:15 -0700 Subject: rpms/plplot/devel plplot-5.5.3-buffer.patch, 1.1, NONE plplot-5.5.3-check.patch, 1.1, NONE Message-ID: <200605081921.k48JLHSQ012171@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12154 Removed Files: plplot-5.5.3-buffer.patch plplot-5.5.3-check.patch Log Message: Remove old patches --- plplot-5.5.3-buffer.patch DELETED --- --- plplot-5.5.3-check.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 19:21:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 12:21:59 -0700 Subject: rpms/plplot/devel plplot-5.5.3-x.patch,1.1,NONE Message-ID: <200605081922.k48JM1bn012210@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12191 Removed Files: plplot-5.5.3-x.patch Log Message: Remove old patch --- plplot-5.5.3-x.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 8 19:24:40 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 12:24:40 -0700 Subject: rpms/plplot/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200605081924.k48JOgT1012298@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12279 Modified Files: .cvsignore sources Log Message: 5.6.0 source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Dec 2005 23:37:42 -0000 1.5 +++ .cvsignore 8 May 2006 19:24:40 -0000 1.6 @@ -1 +1 @@ -plplot-5.5.3.tar.gz +plplot-5.6.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Dec 2005 23:37:42 -0000 1.5 +++ sources 8 May 2006 19:24:40 -0000 1.6 @@ -1 +1 @@ -6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz +0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz From fedora-extras-commits at redhat.com Mon May 8 19:25:25 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 8 May 2006 12:25:25 -0700 Subject: rpms/plplot/devel plplot-5.6.0-x.patch,NONE,1.1 Message-ID: <200605081925.k48JPRQw012332@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12314 Added Files: plplot-5.6.0-x.patch Log Message: Updated X configure patch plplot-5.6.0-x.patch: --- NEW FILE plplot-5.6.0-x.patch --- --- plplot-5.6.0/configure.orig 2006-04-25 10:53:26.000000000 -0600 +++ plplot-5.6.0/configure 2006-04-25 10:58:30.000000000 -0600 @@ -30155,1411 +30155,10 @@ - - -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XtMalloc (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -fi - -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_nospace=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_space=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_space=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder at skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - - if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -int -main () -{ -connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != remove; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 - - if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -int -main () -{ -remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmat; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 - - if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -int -main () -{ -shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); -int -main () -{ -IceConnectionNumber (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - -if test "$have_x" != "yes"; then - enable_xwin="no" -fi - - - -if test "$enable_xwin" = yes; then - enable_xwin_TRUE= - enable_xwin_FALSE='#' -else - enable_xwin_TRUE='#' - enable_xwin_FALSE= -fi - +enable_xwin=yes +enable_xwin_TRUE= +enable_xwin_FALSE='#' +have_x=yes From fedora-extras-commits at redhat.com Mon May 8 19:32:15 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 12:32:15 -0700 Subject: fedora-security/audit fe4,1.10,1.11 fe5,1.10,1.11 Message-ID: <200605081932.k48JWFoo012449@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427 Modified Files: fe4 fe5 Log Message: several CVE-2006 additions Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fe4 8 May 2006 16:35:02 -0000 1.10 +++ fe4 8 May 2006 19:32:12 -0000 1.11 @@ -7,6 +7,16 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-2093 VULNERABLE (nessus) bz#191053 +CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) +CVE-2006-1329 version (jabberd, fixed 2.0s11) +CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-0814 ignore (lighttpd, Windows-specific problem) +CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 +CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 +CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 +CVE-2006-0042 version (libapreq2, fixed 2.0.7) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fe5 8 May 2006 16:35:02 -0000 1.10 +++ fe5 8 May 2006 19:32:12 -0000 1.11 @@ -7,6 +7,17 @@ CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-2093 VULNERABLE (nessus) bz#191053 +CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) +CVE-2006-1550 version (dia, fixed 0.95) bz#187556 +CVE-2006-1329 version (jabberd, fixed 2.0s11) +CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-0814 ignore (lighttpd, Windows-specific problem) +CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 +CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 +CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 +CVE-2006-0042 version (libapreq2, fixed 2.0.7) From fedora-extras-commits at redhat.com Mon May 8 19:36:13 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 12:36:13 -0700 Subject: fedora-security/audit fe4,1.11,1.12 fe5,1.11,1.12 Message-ID: <200605081936.k48JaDMU012511@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12491 Modified Files: fe4 fe5 Log Message: mantis CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fe4 8 May 2006 19:32:12 -0000 1.11 +++ fe4 8 May 2006 19:36:10 -0000 1.12 @@ -11,11 +11,16 @@ CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-0841 VULNERABLE (mantis) bz#191089 +CVE-2006-0840 VULNERABLE (mantis) bz#191089 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0665 VULNERABLE (mantis) bz#191089 +CVE-2006-0664 VULNERABLE (mantis) bz#191089 CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fe5 8 May 2006 19:32:12 -0000 1.11 +++ fe5 8 May 2006 19:36:10 -0000 1.12 @@ -11,12 +11,17 @@ CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-0841 version (mantis, fixed 1.0.1) +CVE-2006-0840 version (mantis, fixed 1.0.1) CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0665 version (mantis, fixed 1.0.1) +CVE-2006-0664 version (mantis, fixed 1.0.1) CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 From fedora-extras-commits at redhat.com Mon May 8 19:50:02 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 8 May 2006 12:50:02 -0700 Subject: rpms/monotone/FC-5 monotone.init,1.4,1.5 monotone.spec,1.11,1.12 Message-ID: <200605081950.k48Jo4rC012676@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12657 Modified Files: monotone.init monotone.spec Log Message: Fix service script genkey subcommand. Index: monotone.init =================================================================== RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monotone.init 11 Apr 2006 22:28:39 -0000 1.4 +++ monotone.init 8 May 2006 19:50:02 -0000 1.5 @@ -112,9 +112,10 @@ if passphrase=`random_passphrase` && { echo $passphrase; echo $passphrase; } | - runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c \ - "$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ - genkey $MONOTONE_KEYID" > /dev/null 2>&1 && + (umask 027; $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ + genkey $MONOTONE_KEYID > /dev/null 2>&1) && + /bin/chgrp ${MONOTONE_GROUP:-monotone} \ + "$MONOTONE_KEYDIR/$MONOTONE_KEYID" && cat > $tmp < - 0.26-2 +- Fix service script genkey subcommand. + * Mon Apr 10 2006 Roland McGrath - 0.26-1 - Updated for 0.25 release. - Major changes; see UPGRADE doc file for details. From fedora-extras-commits at redhat.com Mon May 8 19:50:21 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 8 May 2006 12:50:21 -0700 Subject: rpms/monotone/devel monotone.init,1.4,1.5 monotone.spec,1.11,1.12 Message-ID: <200605081950.k48JoNUs012703@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12684 Modified Files: monotone.init monotone.spec Log Message: Fix service script genkey subcommand. Index: monotone.init =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- monotone.init 11 Apr 2006 21:10:32 -0000 1.4 +++ monotone.init 8 May 2006 19:50:21 -0000 1.5 @@ -112,9 +112,10 @@ if passphrase=`random_passphrase` && { echo $passphrase; echo $passphrase; } | - runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c \ - "$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ - genkey $MONOTONE_KEYID" > /dev/null 2>&1 && + (umask 027; $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ + genkey $MONOTONE_KEYID > /dev/null 2>&1) && + /bin/chgrp ${MONOTONE_GROUP:-monotone} \ + "$MONOTONE_KEYDIR/$MONOTONE_KEYID" && cat > $tmp < - 0.26-2 +- Fix service script genkey subcommand. + * Mon Apr 10 2006 Roland McGrath - 0.26-1 - Updated for 0.25 release. - Major changes; see UPGRADE doc file for details. From fedora-extras-commits at redhat.com Mon May 8 19:50:54 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 8 May 2006 12:50:54 -0700 Subject: rpms/monotone/FC-4 monotone.init,1.7,1.8 monotone.spec,1.15,1.16 Message-ID: <200605081950.k48JouaP012764@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12745 Modified Files: monotone.init monotone.spec Log Message: Fix service script genkey subcommand. Index: monotone.init =================================================================== RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.init,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- monotone.init 11 Apr 2006 22:29:29 -0000 1.7 +++ monotone.init 8 May 2006 19:50:54 -0000 1.8 @@ -112,9 +112,10 @@ if passphrase=`random_passphrase` && { echo $passphrase; echo $passphrase; } | - runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c \ - "$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ - genkey $MONOTONE_KEYID" > /dev/null 2>&1 && + (umask 027; $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ + genkey $MONOTONE_KEYID > /dev/null 2>&1) && + /bin/chgrp ${MONOTONE_GROUP:-monotone} \ + "$MONOTONE_KEYDIR/$MONOTONE_KEYID" && cat > $tmp < - 0.26-2 +- Fix service script genkey subcommand. + * Mon Apr 10 2006 Roland McGrath - 0.26-1 - Updated for 0.25 release. - Major changes; see UPGRADE doc file for details. From fedora-extras-commits at redhat.com Mon May 8 20:19:57 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 13:19:57 -0700 Subject: fedora-security/audit fe4,1.12,1.13 fe5,1.12,1.13 Message-ID: <200605082019.k48KJvro016002@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15982 Modified Files: fe4 fe5 Log Message: more CVE-2006 updates Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fe4 8 May 2006 19:36:10 -0000 1.12 +++ fe4 8 May 2006 20:19:55 -0000 1.13 @@ -8,20 +8,30 @@ CVE-2006-2162 VULNERABLE (nagios) bz#190614 CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) +CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) +CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-1079 VULNERABLE (thttpd) bz#191095 +CVE-2006-1078 VULNERABLE (thttpd) bz#191095 CVE-2006-0841 VULNERABLE (mantis) bz#191089 CVE-2006-0840 VULNERABLE (mantis) bz#191089 +CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) CVE-2006-0665 VULNERABLE (mantis) bz#191089 CVE-2006-0664 VULNERABLE (mantis) bz#191089 CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 +CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0126 version (rxvt-unicode, fixed 7.5) +CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fe5 8 May 2006 19:36:10 -0000 1.12 +++ fe5 8 May 2006 20:19:55 -0000 1.13 @@ -8,21 +8,32 @@ CVE-2006-2162 VULNERABLE (nagios) bz#190612 CVE-2006-2093 VULNERABLE (nessus) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) +CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1656 version (util-vserver, fixed 0.30.210) +CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 +CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 +CVE-2006-1079 VULNERABLE (thttpd) bz#191095 +CVE-2006-1078 VULNERABLE (thttpd) bz#191095 CVE-2006-0841 version (mantis, fixed 1.0.1) CVE-2006-0840 version (mantis, fixed 1.0.1) +CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) CVE-2006-0665 version (mantis, fixed 1.0.1) CVE-2006-0664 version (mantis, fixed 1.0.1) CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 +CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0126 version (rxvt-unicode, fixed 7.5) +CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) From fedora-extras-commits at redhat.com Mon May 8 20:25:26 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Mon, 8 May 2006 13:25:26 -0700 Subject: fedora-security/audit fe4,1.13,1.14 fe5,1.13,1.14 Message-ID: <200605082025.k48KPQgI016048@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16027 Modified Files: fe4 fe5 Log Message: add zoo CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fe4 8 May 2006 20:19:55 -0000 1.13 +++ fe4 8 May 2006 20:25:23 -0000 1.14 @@ -18,9 +18,11 @@ CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1329 version (jabberd, fixed 2.0s11) +CVE-2006-1269 patch (zoo, fixed 2.10-7) bz#183109 CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 CVE-2006-1079 VULNERABLE (thttpd) bz#191095 CVE-2006-1078 VULNERABLE (thttpd) bz#191095 +CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7) CVE-2006-0841 VULNERABLE (mantis) bz#191089 CVE-2006-0840 VULNERABLE (mantis) bz#191089 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fe5 8 May 2006 20:19:55 -0000 1.13 +++ fe5 8 May 2006 20:25:23 -0000 1.14 @@ -20,9 +20,11 @@ CVE-2006-1550 version (dia, fixed 0.95) bz#187556 CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1329 version (jabberd, fixed 2.0s11) +CVE-2006-1269 patch (zoo, fixed 2.10-7) bz#183109 CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 CVE-2006-1079 VULNERABLE (thttpd) bz#191095 CVE-2006-1078 VULNERABLE (thttpd) bz#191095 +CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7) CVE-2006-0841 version (mantis, fixed 1.0.1) CVE-2006-0840 version (mantis, fixed 1.0.1) CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 From fedora-extras-commits at redhat.com Mon May 8 21:09:11 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:09:11 -0700 Subject: rpms/pessulus - New directory Message-ID: <200605082109.k48L9D9l019825@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19804/pessulus Log Message: Directory /cvs/extras/rpms/pessulus added to the repository From fedora-extras-commits at redhat.com Mon May 8 21:09:12 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:09:12 -0700 Subject: rpms/pessulus/devel - New directory Message-ID: <200605082109.k48L9ENW019828@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19804/pessulus/devel Log Message: Directory /cvs/extras/rpms/pessulus/devel added to the repository From fedora-extras-commits at redhat.com Mon May 8 21:09:32 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:09:32 -0700 Subject: rpms/pessulus Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605082109.k48L9Y3U019877@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19849 Added Files: Makefile import.log Log Message: Setup of module pessulus --- NEW FILE Makefile --- # Top level Makefile for module pessulus all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 8 21:09:33 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:09:33 -0700 Subject: rpms/pessulus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605082109.k48L9Zbb019880@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19849/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pessulus --- NEW 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 May 8 21:10:11 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:10:11 -0700 Subject: rpms/pessulus import.log,1.1,1.2 Message-ID: <200605082110.k48LADhs019946@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913 Modified Files: import.log Log Message: auto-import pessulus-0.10.1-1.fc6 on branch devel from pessulus-0.10.1-1.fc6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pessulus/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 May 2006 21:09:32 -0000 1.1 +++ import.log 8 May 2006 21:10:11 -0000 1.2 @@ -0,0 +1 @@ +pessulus-0_10_1-1_fc6:HEAD:pessulus-0.10.1-1.fc6.src.rpm:1147122603 From fedora-extras-commits at redhat.com Mon May 8 21:10:12 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:10:12 -0700 Subject: rpms/pessulus/devel pessulus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605082110.k48LAEEV019951@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19913/devel Modified Files: .cvsignore sources Added Files: pessulus.spec Log Message: auto-import pessulus-0.10.1-1.fc6 on branch devel from pessulus-0.10.1-1.fc6.src.rpm --- NEW FILE pessulus.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pessulus Version: 0.10.1 Release: 1%{?dist} Summary: A lockdown editor for GNOME Group: Applications/System License: GPL URL: http://www.gnome.org/~vuntz/pessulus/ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, pygtk2-devel, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2 BuildRequires: gettext Requires: pygtk2, gnome-python2, gnome-python2-gconf %description Pessulus is a lockdown editor for GNOME, written in python. Pessulus enables administrators to set mandatory settings in GConf. The users can not change these settings. Use of pessulus can be useful on computers that are open to use by everyone, e.g. in an internet cafe. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{python_sitearch}/Pessulus/*.py desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS COPYING %{_bindir}/%{name} %{python_sitearch}/Pessulus/ %{_datadir}/applications/*.desktop %{_datadir}/%{name}/* %changelog * Wed May 3 2006 Damien Durand - 0.10.1 - upgrade version to 0.10.1 * Fri Apr 7 2006 Tom "spot" Callaway - 0.9-2 - fix BR - remove unnecessary Requires - use version-release in changelog entries - fix directory ownership - use python_sitearch - make python "scripts" executable * Thu Apr 6 2006 Damien Durand - 0.9-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pessulus/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 May 2006 21:09:33 -0000 1.1 +++ .cvsignore 8 May 2006 21:10:12 -0000 1.2 @@ -0,0 +1 @@ +pessulus-0.10.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pessulus/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 May 2006 21:09:33 -0000 1.1 +++ sources 8 May 2006 21:10:12 -0000 1.2 @@ -0,0 +1 @@ +96cf672b87dace8c21dcaf07a0015c66 pessulus-0.10.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 8 21:15:11 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Mon, 8 May 2006 14:15:11 -0700 Subject: owners owners.list,1.963,1.964 Message-ID: <200605082115.k48LFDIO020018@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19997 Modified Files: owners.list Log Message: Add pessulus Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.963 retrieving revision 1.964 diff -u -r1.963 -r1.964 --- owners.list 8 May 2006 18:40:46 -0000 1.963 +++ owners.list 8 May 2006 21:15:10 -0000 1.964 @@ -1230,6 +1230,7 @@ Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML-Parser-Syck|Perl Wrapper for the YAML Parser Extension: libsyck|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|pessulus|A lockdown editor for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 8 23:43:16 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Mon, 8 May 2006 16:43:16 -0700 Subject: comps comps-fe5.xml.in,1.45,1.46 comps-fe6.xml.in,1.8,1.9 Message-ID: <200605082343.k48NhIOu025070@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25051/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: Add Scribes to the Editors group. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- comps-fe5.xml.in 8 May 2006 08:46:21 -0000 1.45 +++ comps-fe5.xml.in 8 May 2006 23:43:16 -0000 1.46 @@ -91,6 +91,7 @@ gobby jed leafpad + scribes TeXmacs Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- comps-fe6.xml.in 8 May 2006 08:46:21 -0000 1.8 +++ comps-fe6.xml.in 8 May 2006 23:43:16 -0000 1.9 @@ -91,6 +91,7 @@ gobby jed leafpad + scribes TeXmacs From fedora-extras-commits at redhat.com Tue May 9 00:59:08 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Mon, 8 May 2006 17:59:08 -0700 Subject: rpms/pan/devel pan-0.96-upstream-sort_segfault.patch, NONE, 1.1 pan-0.96-upstream-subscribed_group.patch, NONE, 1.1 pan.spec, 1.13, 1.14 Message-ID: <200605090059.k490xArR027585@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27530 Modified Files: pan.spec Added Files: pan-0.96-upstream-sort_segfault.patch pan-0.96-upstream-subscribed_group.patch Log Message: Two patches from upstream that fix some bad stuff pan-0.96-upstream-sort_segfault.patch: --- NEW FILE pan-0.96-upstream-sort_segfault.patch --- --- pan/gui/header-pane.cc.bak 2006-05-08 11:19:05.000000000 -0500 +++ pan/gui/header-pane.cc 2006-05-08 15:56:51.000000000 -0500 @@ -78,6 +78,10 @@ StringView in (view); while (!in.empty() && !isalpha(*in.str)) in.eat_chars (1); + + if (in.empty()) + return g_strdup (""); + char * casefold = g_utf8_casefold (in.str, in.len); char * ret = g_utf8_collate_key (casefold, -1); g_free (casefold); @@ -89,9 +93,8 @@ { const char * pch = (const char*) pan_tree_store_peek_value (PAN_TREE_STORE(model), iter, COL_COLLATED_AUTHOR); if (!pch) { - const Article * a (get_article (model, iter)); - const char * in = a->author.empty() ? "" : a->author.c_str(); - char * tmp = do_collate (in); + const Article * article (get_article (model, iter)); + char * tmp = do_collate (article->author.to_view()); pan_tree_store_set (PAN_TREE_STORE(model), iter, COL_COLLATED_AUTHOR, tmp, -1); g_free (tmp); pch = get_collated_author (model, iter); @@ -104,9 +107,8 @@ { const char * pch = (const char*) pan_tree_store_peek_value (PAN_TREE_STORE(model), iter, COL_COLLATED_SUBJECT); if (!pch) { - const Article * a (get_article (model, iter)); - const char * in = a->subject.empty() ? "" : a->subject.c_str(); - char * tmp = do_collate (in); + const Article * article (get_article (model, iter)); + char * tmp = do_collate (article->subject.to_view()); pan_tree_store_set (PAN_TREE_STORE(model), iter, COL_COLLATED_SUBJECT, tmp, -1); g_free (tmp); pch = get_collated_subject (model, iter); pan-0.96-upstream-subscribed_group.patch: --- NEW FILE pan-0.96-upstream-subscribed_group.patch --- --- pan/data-impl/groups.cc.old 2006-05-08 10:50:16.000000000 -0500 +++ pan/data-impl/groups.cc 2006-05-07 23:32:36.000000000 -0500 @@ -129,7 +129,7 @@ std::set_union (sub.begin(), sub.end(), tmp_sub.begin(), tmp_sub.end(), std::inserter (tmp, tmp.begin()), o); - sub.get_container().swap (tmp_sub); + sub.get_container().swap (tmp); } // unsub += tmp_unsub @@ -159,13 +159,14 @@ delete in; } - // if it's in both _sub and _unsub, remove it from _unsub. + // unsub -= sub + AlphabeticalQuarkOrdering o; std::vector tmp; tmp.reserve (_unsubscribed.size()); std::set_difference (_unsubscribed.begin(), _unsubscribed.end(), _subscribed.begin(), _subscribed.end(), - inserter (tmp, tmp.begin())); - _unsubscribed.get_container().assign (tmp.begin(), tmp.end()); + inserter (tmp, tmp.begin()), o); + _unsubscribed.get_container().swap (tmp); } void @@ -212,25 +213,37 @@ void DataImpl :: load_group_permissions (const DataIO& data_io) { - _moderated.clear (); - _nopost.clear (); + std::vector m, n; LineReader * in (data_io.read_group_permissions ()); - StringView s, group; - while (in && !in->fail() && in->getline(group)) { - if (group.len && *group.str=='#') + StringView s, line; + while (in && !in->fail() && in->getline(line)) + { + if (line.len && *line.str=='#') continue; - else if (!group.pop_last_token (s, ':')) - std::cerr << LINE_ID << " I don't understand \"" << group << '"' << std::endl; - else if (!s.len) - std::cerr << LINE_ID << " Permission for " << group << " needs to be one of 'y', 'n', or 'm'.\n"; - else if (*s.str=='m') - _moderated.insert (group); - else if (*s.str=='n') - _nopost.insert (group); - else if (*s.str!='y') - std::cerr << LINE_ID << " Permission for " << group << " needs to be one of 'y', 'n', or 'm'.\n"; - } + + else if (!line.pop_last_token (s, ':') || !s.len || (*s.str!='y' && *s.str!='n' && *s.str!='m')) { + std::cerr << LINE_ID << " Group permissions: Can't parse line `" << line << std::endl; + continue; + } + + const Quark group (line); + const char ch = *s.str; + + if (ch == 'm') + m.push_back (group); + else if (ch == 'n') + n.push_back (group); + } + + std::sort (m.begin(), m.end()); + m.erase (std::unique(m.begin(), m.end()), m.end()); + _moderated.get_container().swap (m); + + std::sort (n.begin(), n.end()); + n.erase (std::unique(n.begin(), n.end()), n.end()); + _nopost.get_container().swap (n); + delete in; } @@ -421,6 +434,7 @@ // make a groups_t of groups we didn't already have, // and merge it with _unsubscribed (i.e., groups we haven't seen before become unsubscribed) + AlphabeticalQuarkOrdering o; groups.clear (); for (const NewGroup *it=newgroups, *end=newgroups+count; it!=end; ++it) if (!_subscribed.count (it->group)) @@ -429,7 +443,7 @@ tmp.clear (); std::set_union (groups.begin(), groups.end(), _unsubscribed.begin(), _unsubscribed.end(), - std::back_inserter (tmp)); + std::back_inserter (tmp), o); tmp.erase (std::unique(tmp.begin(), tmp.end()), tmp.end()); _unsubscribed.get_container().swap (tmp); } Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pan.spec 6 May 2006 19:19:31 -0000 1.13 +++ pan.spec 9 May 2006 00:59:08 -0000 1.14 @@ -1,12 +1,13 @@ Summary: A GNOME/GTK+ news reader for X Name: pan Version: 0.96 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 -#Patch0: pan-0.95-upstream-tree.patch +Patch0: pan-0.96-upstream-sort_segfault.patch +Patch1: pan-0.96-upstream-subscribed_group.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -27,7 +28,8 @@ %prep %setup -q -#%%patch0 -p1 +%patch0 -p0 +%patch1 -p0 echo "StartupNotify=true" >> pan.desktop @@ -72,8 +74,12 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Mon May 08 2006 Michael A. Peters - 1:0.96-2 +- Two patches from upstream (pan-0.96-upstream-sort_segfault.patch +- and pan-0.96-upstream-subscribed_group.patch) + * Sat May 06 2006 Michael A. Peters - 1:0.96-1 -- Update to 0.96 - patch1 no longer needed +- Update to 0.96 - patch0 no longer needed * Mon May 01 2006 Michael A. Peters - 1:0.95-3 - Apply a patch from upstream for new tree implementation bug From fedora-extras-commits at redhat.com Tue May 9 01:06:53 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Mon, 8 May 2006 18:06:53 -0700 Subject: rpms/pan/devel pan-0.95-upstream-tree.patch,1.1,NONE Message-ID: <200605090106.k4916tLV029900@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29885 Removed Files: pan-0.95-upstream-tree.patch Log Message: This patch is in current upstream pan --- pan-0.95-upstream-tree.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 02:43:59 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 8 May 2006 19:43:59 -0700 Subject: rpms/wifiroamd/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wifiroamd.spec, 1.2, 1.3 Message-ID: <200605090244.k492i1De032576@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32521/devel Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2006 05:03:43 -0000 1.3 +++ .cvsignore 9 May 2006 02:43:59 -0000 1.4 @@ -1 +1 @@ -wifiroamd-1.06.tar.gz +wifiroamd-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2006 05:03:43 -0000 1.3 +++ sources 9 May 2006 02:43:59 -0000 1.4 @@ -1 +1 @@ -197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz +2beae3dfc34dde031292e780a6fd5331 wifiroamd-1.08.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/devel/wifiroamd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wifiroamd.spec 3 May 2006 05:03:43 -0000 1.2 +++ wifiroamd.spec 9 May 2006 02:43:59 -0000 1.3 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.06 +Version: 1.08 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -107,6 +107,9 @@ %doc debian/copyright %changelog +* Mon May 8 2006 Ed Hill - 1.08-1 +- new upstream 1.08 + * Wed May 3 2006 Ed Hill - 1.06-1 - new upstream 1.06 From fedora-extras-commits at redhat.com Tue May 9 02:43:53 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 8 May 2006 19:43:53 -0700 Subject: rpms/wifiroamd/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wifiroamd.spec, 1.2, 1.3 Message-ID: <200605090244.k492iPYb032583@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32521/FC-4 Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2006 05:03:37 -0000 1.3 +++ .cvsignore 9 May 2006 02:43:53 -0000 1.4 @@ -1 +1 @@ -wifiroamd-1.06.tar.gz +wifiroamd-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2006 05:03:37 -0000 1.3 +++ sources 9 May 2006 02:43:53 -0000 1.4 @@ -1 +1 @@ -197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz +2beae3dfc34dde031292e780a6fd5331 wifiroamd-1.08.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-4/wifiroamd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wifiroamd.spec 3 May 2006 05:03:37 -0000 1.2 +++ wifiroamd.spec 9 May 2006 02:43:53 -0000 1.3 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.06 +Version: 1.08 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -107,6 +107,9 @@ %doc debian/copyright %changelog +* Mon May 8 2006 Ed Hill - 1.08-1 +- new upstream 1.08 + * Wed May 3 2006 Ed Hill - 1.06-1 - new upstream 1.06 From fedora-extras-commits at redhat.com Tue May 9 02:43:53 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 8 May 2006 19:43:53 -0700 Subject: rpms/wifiroamd/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wifiroamd.spec, 1.2, 1.3 Message-ID: <200605090244.k492iQbj032588@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/wifiroamd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32521/FC-5 Modified Files: .cvsignore sources wifiroamd.spec Log Message: new upstream 1.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2006 05:03:37 -0000 1.3 +++ .cvsignore 9 May 2006 02:43:53 -0000 1.4 @@ -1 +1 @@ -wifiroamd-1.06.tar.gz +wifiroamd-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2006 05:03:37 -0000 1.3 +++ sources 9 May 2006 02:43:53 -0000 1.4 @@ -1 +1 @@ -197335568f76fc22b79def353b37478d wifiroamd-1.06.tar.gz +2beae3dfc34dde031292e780a6fd5331 wifiroamd-1.08.tar.gz Index: wifiroamd.spec =================================================================== RCS file: /cvs/extras/rpms/wifiroamd/FC-5/wifiroamd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wifiroamd.spec 3 May 2006 05:03:37 -0000 1.2 +++ wifiroamd.spec 9 May 2006 02:43:53 -0000 1.3 @@ -1,5 +1,5 @@ Name: wifiroamd -Version: 1.06 +Version: 1.08 Release: 1%{?dist} Summary: Automatic WiFi connection (re)establishment daemon @@ -107,6 +107,9 @@ %doc debian/copyright %changelog +* Mon May 8 2006 Ed Hill - 1.08-1 +- new upstream 1.08 + * Wed May 3 2006 Ed Hill - 1.06-1 - new upstream 1.06 From fedora-extras-commits at redhat.com Tue May 9 02:53:05 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:53:05 -0700 Subject: extras-buildsys/server PackageJob.py, 1.46, 1.47 ArchJob.py, 1.28, 1.29 Message-ID: <200605090253.k492r5BV000313@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32728/server Modified Files: PackageJob.py ArchJob.py Log Message: 2006-05-08 Dan Williams * server/PackageJob.py - (_request_one_arch_job): Use the correct fileserver port * server/ArchJob.py - (_status_repo_unlock): fix unknown variable, should be self.job * common/URLopener.py - import socket to fix an unknown type * common/FileUploader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself * common/FileTransfer.py - (__init__): don't keep track of url as each subclass needs to do this separately; Fix indentation of self._certs to make sure it gets set even if it's None * common/FileDownloader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself; in our case it's actually a list of urls. Make sure self._files is defined, and has at least one item too. * common/Commands.py - (deserialize_command_stream): don't let unknown commands into the deserialized command stream; they show up as None items in the returned list. - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands too Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- PackageJob.py 3 May 2006 04:04:28 -0000 1.46 +++ PackageJob.py 9 May 2006 02:52:58 -0000 1.47 @@ -639,11 +639,12 @@ def _request_one_arch_job(self, arch, orphaned): # Construct SPRM URL srpm_http_base = self._srpm_http_path[len(self.http_dir):] - method = "http://" + method = "http" if self._server_cfg.get_bool("Builders", "use_ssl") == True: - method = "https://" + method = "https" hostname = self._server_cfg.get_str("General", "hostname") - srpm_url = method + hostname + ":8886/" + srpm_http_base + port = self._server_cfg.get_int("Active Builders", "file_server_port") + srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base) target_dict = self._target_cfg.target_dict(arch) self.bm.builder_manager.request_arch_job(self, target_dict, srpm_url, orphaned) Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ArchJob.py 3 May 2006 04:04:28 -0000 1.28 +++ ArchJob.py 9 May 2006 02:52:58 -0000 1.29 @@ -169,7 +169,7 @@ def _status_repo_unlock(self): # Builder will be in 'downloaded' state until # it notices that the repo has been unlocked - self._builder.unlock_repo_for_job(self._uniqid) + self._builder.unlock_repo_for_job(self.jobid) self._prepping = True if self._builder_status != 'downloaded': self._set_status('running') From fedora-extras-commits at redhat.com Tue May 9 02:53:06 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:53:06 -0700 Subject: extras-buildsys/common URLopener.py, 1.2, 1.3 FileUploader.py, 1.2, 1.3 FileTransfer.py, 1.1, 1.2 FileDownloader.py, 1.19, 1.20 Commands.py, 1.4, 1.5 Message-ID: <200605090253.k492r6eJ000323@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32728/common Modified Files: URLopener.py FileUploader.py FileTransfer.py FileDownloader.py Commands.py Log Message: 2006-05-08 Dan Williams * server/PackageJob.py - (_request_one_arch_job): Use the correct fileserver port * server/ArchJob.py - (_status_repo_unlock): fix unknown variable, should be self.job * common/URLopener.py - import socket to fix an unknown type * common/FileUploader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself * common/FileTransfer.py - (__init__): don't keep track of url as each subclass needs to do this separately; Fix indentation of self._certs to make sure it gets set even if it's None * common/FileDownloader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself; in our case it's actually a list of urls. Make sure self._files is defined, and has at least one item too. * common/Commands.py - (deserialize_command_stream): don't let unknown commands into the deserialized command stream; they show up as None items in the returned list. - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands too Index: URLopener.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/URLopener.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- URLopener.py 28 Apr 2006 03:17:40 -0000 1.2 +++ URLopener.py 9 May 2006 02:53:03 -0000 1.3 @@ -26,6 +26,7 @@ import stat import httplib import shutil +import socket def get_content_type(filename): return mimetypes.guess_type(filename)[0] or 'application/octet-stream' Index: FileUploader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileUploader.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FileUploader.py 8 May 2006 14:24:30 -0000 1.2 +++ FileUploader.py 9 May 2006 02:53:03 -0000 1.3 @@ -28,8 +28,9 @@ class FileUploader(FileTransfer.FileTransfer): def __init__(self, url, files, filevar, cgi_vars=None, certs=None): - FileTransfer.FileTransfer.__init__(self, url, certs) + FileTransfer.FileTransfer.__init__(self, certs) self._files = {} + self._url = url if files and type(files) == type(""): files = [files] Index: FileTransfer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileTransfer.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileTransfer.py 8 May 2006 14:24:30 -0000 1.1 +++ FileTransfer.py 9 May 2006 02:53:03 -0000 1.2 @@ -26,20 +26,17 @@ class FileTransfer(threading.Thread): - def __init__(self, url, certs=None): + def __init__(self, certs=None): self._callback = None self._cb_data = None self._cancel = False self._tries = 5 self._opener = None - if not url: - raise Exception("Require a URL to download.") - self._url = url if certs: if type(certs) is not type({}): raise ValueError("Certs must be a dict of certificate paths.") - self._certs = certs + self._certs = certs self._opener = URLopener.PlgURLopener(self._certs, 20) Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- FileDownloader.py 8 May 2006 14:24:30 -0000 1.19 +++ FileDownloader.py 9 May 2006 02:53:03 -0000 1.20 @@ -76,12 +76,13 @@ class FileDownloader(FileTransfer.FileTransfer): def __init__(self, urls, target_dir, legal_exts, certs=None): - FileTransfer.FileTransfer.__init__(self, url, certs) + FileTransfer.FileTransfer.__init__(self, certs) if not target_dir: raise Exception("Require a target directory to download to.") self._target_dir = target_dir + self._files = {} if type(urls) == type(""): urls = [urls] if type(urls) is not type([]): @@ -92,6 +93,9 @@ raise FileNameException("Bad file name from url %s" % url) self._files[url] = fname + if len(self._files.keys()) == 0: + raise ValueError("Need at least one file to download.") + def _action(self, (url, fname)): result = None err_msg = None Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Commands.py 8 May 2006 14:26:34 -0000 1.4 +++ Commands.py 9 May 2006 02:53:03 -0000 1.5 @@ -73,7 +73,8 @@ cmds = [] for item in cmd_stream: cmd = PlgCommand.deserialize(item) - cmds.append(cmd) + if cmd: + cmds.append(cmd) return cmds @@ -135,6 +136,8 @@ cmd = PlgCommandJobFiles._deserialize(args) elif name == CMD_NAME_JOB_FILES_ACK: cmd = PlgCommandJobFilesAck._deserialize(args) + elif name == CMD_NAME_UNLOCK_REPO: + cmd = PlgCommandUnlockRepo._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't From fedora-extras-commits at redhat.com Tue May 9 02:53:00 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:53:00 -0700 Subject: extras-buildsys ChangeLog,1.188,1.189 Message-ID: <200605090253.k492rUTA000328@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32728 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * server/PackageJob.py - (_request_one_arch_job): Use the correct fileserver port * server/ArchJob.py - (_status_repo_unlock): fix unknown variable, should be self.job * common/URLopener.py - import socket to fix an unknown type * common/FileUploader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself * common/FileTransfer.py - (__init__): don't keep track of url as each subclass needs to do this separately; Fix indentation of self._certs to make sure it gets set even if it's None * common/FileDownloader.py - (__init__): don't need to pass url in as each subclass keeps track of the url itself; in our case it's actually a list of urls. Make sure self._files is defined, and has at least one item too. * common/Commands.py - (deserialize_command_stream): don't let unknown commands into the deserialized command stream; they show up as None items in the returned list. - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands too Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- ChangeLog 8 May 2006 14:26:33 -0000 1.188 +++ ChangeLog 9 May 2006 02:52:57 -0000 1.189 @@ -1,5 +1,38 @@ 2006-05-08 Dan Williams + * server/PackageJob.py + - (_request_one_arch_job): Use the correct fileserver port + + * server/ArchJob.py + - (_status_repo_unlock): fix unknown variable, should be self.job + + * common/URLopener.py + - import socket to fix an unknown type + + * common/FileUploader.py + - (__init__): don't need to pass url in as each subclass keeps + track of the url itself + + * common/FileTransfer.py + - (__init__): don't keep track of url as each subclass needs + to do this separately; Fix indentation of self._certs to make + sure it gets set even if it's None + + * common/FileDownloader.py + - (__init__): don't need to pass url in as each subclass keeps + track of the url itself; in our case it's actually a list of + urls. Make sure self._files is defined, and has at least one + item too. + + * common/Commands.py + - (deserialize_command_stream): don't let unknown commands into + the deserialized command stream; they show up as None items + in the returned list. + - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands + too + +2006-05-08 Dan Williams + * common/Commands.py - Add JobFiles and JobFilesAck commands From fedora-extras-commits at redhat.com Tue May 9 02:57:13 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:57:13 -0700 Subject: extras-buildsys ChangeLog,1.189,1.190 Message-ID: <200605090257.k492vDoG000404@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv359 Modified Files: ChangeLog Log Message: 2006-05-08 Dan Williams * builder/Builder.py - pylint cleanups - make SRPM downloads and uploads work * builder/BuilderMock.py - pyling cleanups - remove log() - make download and upload work * server/Builder.py - Don't send multiple UnlockRepo commands - Actually let archjobs have some processing time Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- ChangeLog 9 May 2006 02:52:57 -0000 1.189 +++ ChangeLog 9 May 2006 02:57:11 -0000 1.190 @@ -1,5 +1,20 @@ 2006-05-08 Dan Williams + * builder/Builder.py + - pylint cleanups + - make SRPM downloads and uploads work + + * builder/BuilderMock.py + - pyling cleanups + - remove log() + - make download and upload work + + * server/Builder.py + - Don't send multiple UnlockRepo commands + - Actually let archjobs have some processing time + +2006-05-08 Dan Williams + * server/PackageJob.py - (_request_one_arch_job): Use the correct fileserver port From fedora-extras-commits at redhat.com Tue May 9 02:57:14 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:57:14 -0700 Subject: extras-buildsys/server Builder.py,1.36,1.37 Message-ID: <200605090257.k492vEYj000414@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv359/server Modified Files: Builder.py Log Message: 2006-05-08 Dan Williams * builder/Builder.py - pylint cleanups - make SRPM downloads and uploads work * builder/BuilderMock.py - pyling cleanups - remove log() - make download and upload work * server/Builder.py - Don't send multiple UnlockRepo commands - Actually let archjobs have some processing time Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Builder.py 5 May 2006 02:10:39 -0000 1.36 +++ Builder.py 9 May 2006 02:57:12 -0000 1.37 @@ -192,7 +192,7 @@ try: job = self._jobs[uniqid] job.set_builder_job_status(status) -# reported_uniqids.append(uniqid) + reported_uniqids.append(uniqid) except KeyError: pass @@ -523,9 +523,16 @@ """Called by an archjob to request the sending of a RepoUnlocked command to the builder for a particular archjob.""" - cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) self._lock.acquire() - self._cmd_queue.append(cmd) + found = False + for cmd in self._cmd_queue: + if isinstance(cmd, Commands.PlgCommandUnlockRepo): + if cmd.archjob_id() == uniqid: + found = True + break + if not found: + cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) + self._cmd_queue.append(cmd) self._lock.release() def request_job_files(self, archjob): @@ -581,6 +588,12 @@ # Copy command queue self._cmd_queue = self._cmd_queue + new_cmds cmd_list = self._cmd_queue[:] + # Remove commands that don't require an ack + tmp_cmd_queue = [] + for cmd in self._cmd_queue: + if cmd.need_ack(): + tmp_cmd_queue.append(cmd) + self._cmd_queue = tmp_cmd_queue self._lock.release() return cmd_list @@ -596,13 +609,19 @@ time.sleep(self._SLEEP_INTERVAL) continue + process_jobs = True self._lock.acquire() if self._unavail_count > 2: self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") + process_jobs = False elif self._last_contact + self._REQUIRED_CONTACT_INTERVAL < time.time(): self._unavail_count = self._unavail_count + 1 self._lock.release() + if process_jobs: + for j in self._jobs.values(): + j.process() + time.sleep(self._SLEEP_INTERVAL) def _handle_builder_suspend(self, reason, msg): From fedora-extras-commits at redhat.com Tue May 9 02:57:14 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 19:57:14 -0700 Subject: extras-buildsys/builder Builder.py,1.3,1.4 BuilderMock.py,1.2,1.3 Message-ID: <200605090257.k492vEsn000410@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv359/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-08 Dan Williams * builder/Builder.py - pylint cleanups - make SRPM downloads and uploads work * builder/BuilderMock.py - pyling cleanups - remove log() - make download and upload work * server/Builder.py - Don't send multiple UnlockRepo commands - Actually let archjobs have some processing time 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 5 May 2006 02:10:38 -0000 1.3 +++ Builder.py 9 May 2006 02:57:11 -0000 1.4 @@ -20,20 +20,22 @@ import socket import time import threading -import sha -import exceptions +import urllib import xmlrpclib import OpenSSL from plague import Commands from plague import AuthedXMLRPCServer from plague import HTTPServer from plague import XMLRPCServerProxy +from plague import FileDownloader +from plague import FileUploader import Config import BuilderMock -class BuilderInitException(Exception): pass +class BuilderInitException(Exception): + pass def get_hostname(cfg, bind_all): cfg_hostname = cfg.get_str("Passive", "hostname") @@ -49,10 +51,10 @@ import commands max_jobs = 1 cmd = "/usr/bin/getconf _NPROCESSORS_ONLN" - (s, o) = commands.getstatusoutput(cmd) - if s == 0: + (status, output) = commands.getstatusoutput(cmd) + if status == 0: try: - max_jobs = int(o) + max_jobs = int(output) except ValueError: pass return max_jobs @@ -62,75 +64,6 @@ sys.stdout.flush() -class PassiveBuilderRequestHandler: - def __init__(self, cfg, builder): - self._builder = builder - self._all_jobs = {} # unique id => awclass instance - self._building_jobs_lock = threading.Lock() - self._building_jobs = [] - self._cfg = cfg - - def _log(self, string): - if self._cfg.get_bool("General", "debug"): - print string - - def notify_job_done(self, archjob): - self._building_jobs_lock.acquire() - if archjob in self._building_jobs: - self._building_jobs.remove(archjob) - self._building_jobs_lock.release() - - def die(self, uniqid): - try: - job = self._all_jobs[uniqid] - job.die() - except KeyError: - pass - return 0 - - def files(self, uniqid): - try: - job = self._all_jobs[uniqid] - return job.files() - except KeyError: - pass - return [] - - def repo_unlocked(self, uniqid): - try: - job = self._all_jobs[uniqid] - job.unlock_repo() - except KeyError: - pass - return 0 - - def building_jobs(self): - jobs = {} - self._building_jobs_lock.acquire() - building = 0 - for job in self._building_jobs: - jobs[job.uniqid()] = job.status() - building = building + 1 - free = self._max_jobs - building - self._building_jobs_lock.release() - return (jobs, free) - - def num_slots(self): - (free_slots, max_slots) = self._builder.slots() - return max_slots - - def job_status(self, uniqid): - try: - job = self._all_jobs[uniqid] - return job.status() - except KeyError: - pass - return '' - - def supported_targets(self): - return self._builder.supported_targets() - - class Builder(object): """ Abstract builder base object """ def __init__(self, cfg): @@ -174,13 +107,13 @@ bcs.die(jobid) # wait for the jobs to clean up before quitting - log("Waiting for running jobs to stop...") + self._log("Waiting for running jobs to stop...") while True: (building_jobs, free) = bcs.building_jobs() if len(building_jobs.keys()) == 0: break try: - log(".") + self._log(".") time.sleep(0.5) except KeyboardInterrupt: break @@ -193,12 +126,18 @@ def supported_targets(self): targets = [] - for t in self._cfg.targets(): - td = t.target_dict() - td['supported_arches'] = t.arches() - targets.append(td) + for target in self._cfg.targets(): + target_dict = target.target_dict() + target_dict['supported_arches'] = target.arches() + targets.append(target_dict) return targets + def notify_job_done(self, archjob): + self._building_jobs_lock.acquire() + if archjob in self._building_jobs: + self._building_jobs.remove(archjob) + self._building_jobs_lock.release() + def _get_target_cfg(self, target_dict): target_cfg = None @@ -239,10 +178,10 @@ uniqid = -1 msg = "Success" - (free, max) = self.slots() - if free <= 0: + (free_slots, max_slots) = self.slots() + if free_slots <= 0: msg = "Error: Tried to build '%s' on target %s when already building" \ - " maximum (%d) jobs" % (srpm_url, target_str, max) + " maximum (%d) jobs" % (srpm_url, target_str, max_slots) self._log(msg) return (uniqid, msg) @@ -263,16 +202,15 @@ filename = os.path.basename(srpm_url) msg = "%s: started %s on %s arch %s at time %d" % (uniqid, filename, target_str, target_dict['arch'], archjob.starttime()) -# job.start() - except (OSError, TypeError), err: + archjob.start() + except (OSError, TypeError), exc: msg = "Failed request for %s on %s: '%s'" % (srpm_url, - target_str, err) + target_str, exc) self._log(msg) return (uniqid, msg) def _get_building_jobs_cmd(self): - jobs_list = [] cmd = Commands.PlgCommandBuildingJobs(self._seq_gen.next()) self._building_jobs_lock.acquire() for job in self._building_jobs: @@ -283,7 +221,7 @@ def _handle_unlock_repo_request(self, cmd): uniqid = cmd.archjob_id() self._building_jobs_lock.acquire() - for item in self._building_jobs: + for job in self._building_jobs: if job.uniqid() == uniqid: job.unlock_repo() self._building_jobs_lock.release() @@ -294,10 +232,74 @@ uniqid = cmd.archjob_id() job = self._all_jobs[uniqid] reply = Commands.PlgCommandJobStatusAck(uniqid, job.status(), cmd.seq(), self._seq_gen.next()) - except KeyError, e: + except KeyError: pass return reply + +class PassiveBuilderRequestHandler: + def __init__(self, cfg, builder): + self._builder = builder + self._all_jobs = {} # unique id => awclass instance + self._building_jobs_lock = threading.Lock() + self._building_jobs = [] + self._cfg = cfg + + def _log(self, string): + if self._cfg.get_bool("General", "debug"): + print string + + def die(self, uniqid): + try: + job = self._all_jobs[uniqid] + job.die() + except KeyError: + pass + return 0 + + def files(self, uniqid): + try: + job = self._all_jobs[uniqid] + return job.files() + except KeyError: + pass + return [] + + def repo_unlocked(self, uniqid): + try: + job = self._all_jobs[uniqid] + job.unlock_repo() + except KeyError: + pass + return 0 + + def building_jobs(self): + jobs = {} + self._building_jobs_lock.acquire() + building = 0 + for job in self._building_jobs: + jobs[job.uniqid()] = job.status() + building = building + 1 + free = self._max_jobs - building + self._building_jobs_lock.release() + return (jobs, free) + + def num_slots(self): + (free_slots, max_slots) = self._builder.slots() + return max_slots + + def job_status(self, uniqid): + try: + job = self._all_jobs[uniqid] + return job.status() + except KeyError: + pass + return '' + + def supported_targets(self): + return self._builder.supported_targets() + + class PassiveBuilder(Builder): """ Passive builders initiate no communication of their own. They wait @@ -317,15 +319,15 @@ self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs) self._http_server.start() - log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) + self._log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port") try: if cfg.get_bool("SSL", "use_ssl") == True: self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) else: self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) - except socket.error, e: - if e[0] == 98: + except socket.error, exc: + if exc[0] == 98: raise BuilderInitException("Error: couldn't bind to address '%s:%s'. " \ "Is the builder already running?\n" % (hostname, xmlrpc_port)) @@ -339,6 +341,12 @@ except KeyboardInterrupt: pass + def download_srpm(self, url, target_dir, dl_callback, cb_data): + """For passive builders, the server uploads the RPM to the builder. + Therefore, we already have it. Move it from the HTTP server's upload + directory to the requested target_dir, if the SRPM exists.""" + pass + def _stop_servers(self): self._http_server.stop() self._xmlrpc_server.stop() @@ -373,8 +381,8 @@ self.response = self._server.request(cmd_stream) except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): self.failed = True - except xmlrpclib.Fault, e: - print "Builder Error (%s) in request(): server replied '%s'" % (self._address, e) + except xmlrpclib.Fault, exc: + print "Builder Error (%s) in request(): server replied '%s'" % (self._address, exc) self.failed = True self.done = True @@ -414,6 +422,30 @@ except KeyboardInterrupt: pass + def download_srpm(self, url, target_dir, dl_callback, cb_data=None): + """Download an SRPM from the build server. Only used by BuilderMock + objects.""" + downloader = FileDownloader.FileDownloader(url, target_dir, ['.src.rpm'], + self._certs) + downloader.set_callback(dl_callback, url) + downloader.start() + return downloader + + def upload_files(self, files, ul_callback, cb_data=None): + server = self._cfg.get_str("Active", "server") + (urltype, urlrest) = urllib.splittype(server) + (server, urlrest) = urllib.splithost(urlrest) + if self._cfg.get_bool("SSL", "use_ssl"): + url = "https://" + server + else: + url = "http://" + server + url = url + ":%d/upload" % self._cfg.get_int("Active", "fileserver_port") + uploader = FileUploader.FileUploader(url, files, 'filedata', None, + self._certs) + uploader.set_callback(ul_callback, cb_data) + uploader.start() + return uploader + def _get_default_commands(self): """Return a python list of serialized commands that the builder sends to the server every time it contacts the server.""" @@ -427,8 +459,8 @@ # always send free & max slots next_seq = self._seq_gen.next() - (free, max) = self.slots() - cmd = Commands.PlgCommandSlots(free, max, next_seq) + (free_slots, max_slots) = self.slots() + cmd = Commands.PlgCommandSlots(free_slots, max_slots, next_seq) defcmds.append(cmd) defcmds.append(self._get_building_jobs_cmd()) @@ -455,7 +487,7 @@ time.sleep(0.5) if req.done and not req.failed: - self.queued_cmds = [] + self._queued_cmds = [] return req.response return None @@ -474,7 +506,7 @@ self._queued_cmds.append(reply) def _process_server_response(self, response): - """Process the server's response.""" + """Process the server's response command stream.""" if not response: # Something went wrong... Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BuilderMock.py 3 May 2006 04:04:27 -0000 1.2 +++ BuilderMock.py 9 May 2006 02:57:11 -0000 1.3 @@ -20,25 +20,20 @@ import os -import socket import shutil import string import fcntl import urllib import errno import exceptions -import threading import sha import time from plague import ExecUtils from plague import FileDownloader +from plague import FileTransfer -def log(string): - sys.stdout.write(string) - sys.stdout.flush() - def get_url_for_file(cfg, file_path): """ Return a URL pointing to a particular file in our work dir """ @@ -57,9 +52,9 @@ return urllib.quote(full_url) def _generate_uniqid(target_str, srpm_url): - sum = sha.new() - sum.update('%d %s %s' % (time.time(), target_str, srpm_url)) - return sum.hexdigest() + sha_hash = sha.new() + sha_hash.update('%d %s %s' % (time.time(), target_str, srpm_url)) + return sha_hash.hexdigest() class BuilderMock(threading.Thread): @@ -68,7 +63,7 @@ def __init__(self, controller, target_cfg, buildarch, srpm_url): self._controller = controller - self.buildarch = buildarch + self._buildarch = buildarch self._starttime = time.time() self._endtime = 0 self._mockstarttime = 0 @@ -77,7 +72,7 @@ self._die = False self._repo_locked = True self._repo_wait_start = 0 - self._files = [] + self._files = {} self._childpid = 0 self._target_cfg = target_cfg self._builder_cfg = target_cfg.parent_cfg() @@ -87,7 +82,10 @@ self._mock_config = None self._done_status = '' self._mock_log = None - self.buildroot = self._target_cfg.mock_config() + self._buildroot = self._target_cfg.mock_config() + self._downloader = None + self._uploader = None + self.arch_command = "" self._work_dir = self._builder_cfg.get_str("Directories", "builder_work_dir") self._result_dir = os.path.join(self._work_dir, self._uniqid, "result") @@ -120,6 +118,11 @@ self._done_status = 'killed' self._log("Killing build process...\n") + if self._downloader: + self._downloader.cancel() + if self._uploader: + self._uploader.cancel() + # Don't try to kill a running cleanup process if self._status != 'cleanup': # Kill a running non-cleanup mock process, if any @@ -145,36 +148,16 @@ self._log("Killed.\n"); - def _log(self, string): - if string and self._log_fd: - self._log_fd.write(string) + def _log(self, msg): + if msg and self._log_fd: + self._log_fd.write(msg) self._log_fd.flush() os.fsync(self._log_fd.fileno()) if self._builder_cfg.get_bool("General", "debug"): s = "%s: " % self._uniqid - sys.stdout.write(s + string) + sys.stdout.write(s + msg) sys.stdout.flush() - def dl_callback(self, dl_status, cb_data, err_msg): - url = cb_data - if dl_status == 'done': - self._status = 'downloaded' - self._log("Retrieved %s.\n" % url) - elif dl_status == 'failed': - # If job was cancelled, just return - if self.is_done_status(): - return - - # Retry up to 5 times - self._srpm_tries = self._srpm_tries + 1 - if self._srpm_tries >= 5: - self._status = 'failed' - self._log("ERROR: Failed to retrieve %s.\n" % url) - else: - # retry the download - self._status = 'init' - self._log("ERROR: Failed to retrieve %s on attempt %d (%s). Trying again...\n" % (url, self._srpm_tries, err_msg)) - def _copy_mock_output_to_log(self): if self._mock_log and os.path.exists(self._mock_log): ml = open(self._mock_log, "r") @@ -205,9 +188,9 @@ cmd = os.path.abspath(arg_list[0]) args.append(builder_cmd) args.append("-r") - args.append(self.buildroot) + args.append(self._buildroot) args.append("--arch") - args.append(self.buildarch) + args.append(self._buildarch) args.append("--resultdir=%s" % self._result_dir) args.append("--statedir=%s" % self._state_dir) args.append("--uniqueext=%s" % self._uniqid) @@ -234,7 +217,7 @@ args.append("clean") args.append("--uniqueext=%s" % self._uniqid) args.append("-r") - args.append(self.buildroot) + args.append(self._buildroot) self._log(" %s\n" % string.join(args)) self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None) @@ -279,7 +262,7 @@ while True: try: f.seek(0, 0) - string = f.read(4) + mockstat = f.read(4) except OSError, e: if e.errno == errno.EAGAIN: try: @@ -288,12 +271,11 @@ pass continue else: - if len(string) < 4: + if len(mockstat) < 4: continue break f.close() - string = string.lower() - return string + return mockstat.lower() def _read_mock_config(self): mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log') @@ -310,17 +292,32 @@ f.close() return contents + def dl_callback(self, dl_status, cb_data, err_msg=None): + url = cb_data + if dl_status == FileTransfer.FT_RESULT_SUCCESS: + self._status = 'downloaded' + self._log("Retrieved %s.\n" % url) + elif dl_status == FileTransfer.FT_RESULT_FAILED: + # If job was cancelled, just return + if self.is_done_status(): + return + self._status = 'failed' + self._log("ERROR: Failed to retrieve %s.\n" % url) + elif dl_status == FileTransfer.FT_RESULT_CANCELED: + # Ignore cancelation + pass + self._downloader = None + def _status_init(self): self._log("Starting download of %s.\n" % self._srpm_url) self._status = 'downloading' target_dir = os.path.dirname(self._srpm_path) try: - dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url, - target_dir, ['.src.rpm'], certs) - dl_thread.start() + self._downloader = self._controller.download_srpm(self._srpm_url, + target_dir, self.dl_callback, self._srpm_url) except FileDownloader.FileNameException, e: self._status = 'failed' - self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (e, self._srpm_url)) + self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (e, self._srpm_url)) def _status_downloading(self): pass @@ -360,7 +357,7 @@ # something is wrong self._watch_mock('failed', 'failed') if self._status != 'prepping': - return + return # We need to make sure that mock has dumped the status file withing a certain # amount of time, otherwise we can't tell what it's doing @@ -400,7 +397,7 @@ if source_dir.endswith(os.path.join(self._uniqid, "source")): shutil.rmtree(source_dir, ignore_errors=True) - # Ensure child process is reaped, if any + # Ensure child process is reaped if it's still around if self._childpid: try: self._log("Waiting for child process %d to exit.\n" % self._childpid) @@ -410,9 +407,21 @@ pass self._copy_mock_output_to_log() - self._files = self._find_files() + self._uploader = self._controller.upload_files(self._files, self.ul_callback, None) + self._status = "uploading" + + def _ul_callback(self, status, cb_data, msg): + if status == FileTransfer.FT_RESULT_SUCCESS: + pass + elif status == FileTransfer.FT_RESULT_FAILED: + self._done_status = 'failed' + self._log("Job failed because files could not be uploaded: %s" % msg) self._status = self._done_status + self._uploader = None + + def _status_uploading(self): + pass def _job_done(self): self._log("-----------------------\n") @@ -437,7 +446,7 @@ Target: %s UID: %s Architecture: %s - SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self.buildarch, self._srpm_url)) + SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self._buildarch, self._srpm_url)) try: srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm']) @@ -474,13 +483,24 @@ self._log("\n") self._log("Output File List:\n") self._log("-----------------\n") - for f in files_in_dir: - file_url = get_url_for_file(self._builder_cfg, os.path.join(self._result_dir, f)) - if file_url: - file_list.append(file_url) - self._log(" Output File: %s\n" % urllib.unquote(file_url)) + log_files = [] + rpms = [] + # sort into logs first, rpms later + for fname in files_in_dir: + fpath = os.path.join(self._result_dir, fname) + if fpath.endswith(".log"): + log_files.append(fpath) else: - self._log(" Error: Couldn't get file URL for file %s\n" % f) + rpms.append(fpath) + + # Dump file list to log + file_list = log_files + rpms + i = 1 + num_files = len(file_list) + for fpath in file_list: + self._log(" File (%d of %d): %s\n" % (i, num_files, + os.path.basename(fpath))) + i = i + 1 self._log("-----------------\n") return file_list From fedora-extras-commits at redhat.com Tue May 9 02:58:20 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 19:58:20 -0700 Subject: rpms/fwrestart/devel .cvsignore, 1.3, 1.4 fwrestart.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605090258.k492wMQK000449@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv428 Modified Files: .cvsignore fwrestart.spec sources Log Message: Update to 1.04 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Nov 2005 02:37:56 -0000 1.3 +++ .cvsignore 9 May 2006 02:58:20 -0000 1.4 @@ -1 +1 @@ -fwrestart-1.03.tar.gz +fwrestart-1.04.tar.gz Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/fwrestart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwrestart.spec 15 Nov 2005 02:37:56 -0000 1.3 +++ fwrestart.spec 9 May 2006 02:58:20 -0000 1.4 @@ -1,11 +1,11 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart -Version: 1.03 +Version: 1.04 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ -Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.03.tar.gz +Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Mon May 8 2006 Kevin Fenzi - 1.04-1 +- Update to 1.04 + * Mon Nov 14 2005 Kevin Fenzi - 1.03-1.fc5 - Update to 1.03 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Nov 2005 02:37:56 -0000 1.3 +++ sources 9 May 2006 02:58:20 -0000 1.4 @@ -1 +1 @@ -ea28bcab6c3829c4e3f29f70292b3880 fwrestart-1.03.tar.gz +90fdd16491da250877911cd08a257ebe fwrestart-1.04.tar.gz From fedora-extras-commits at redhat.com Tue May 9 03:07:17 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:07:17 -0700 Subject: rpms/fwrestart/FC-5 .cvsignore, 1.3, 1.4 fwrestart.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605090307.k4937JdI002743@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2722 Modified Files: .cvsignore fwrestart.spec sources Log Message: Update to 1.04 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Nov 2005 02:37:56 -0000 1.3 +++ .cvsignore 9 May 2006 03:07:17 -0000 1.4 @@ -1 +1 @@ -fwrestart-1.03.tar.gz +fwrestart-1.04.tar.gz Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-5/fwrestart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwrestart.spec 15 Nov 2005 02:37:56 -0000 1.3 +++ fwrestart.spec 9 May 2006 03:07:17 -0000 1.4 @@ -1,11 +1,11 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart -Version: 1.03 +Version: 1.04 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ -Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.03.tar.gz +Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Mon May 8 2006 Kevin Fenzi - 1.04-1 +- Update to 1.04 + * Mon Nov 14 2005 Kevin Fenzi - 1.03-1.fc5 - Update to 1.03 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Nov 2005 02:37:56 -0000 1.3 +++ sources 9 May 2006 03:07:17 -0000 1.4 @@ -1 +1 @@ -ea28bcab6c3829c4e3f29f70292b3880 fwrestart-1.03.tar.gz +90fdd16491da250877911cd08a257ebe fwrestart-1.04.tar.gz From fedora-extras-commits at redhat.com Tue May 9 03:08:49 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:08:49 -0700 Subject: rpms/fwrestart/FC-4 .cvsignore, 1.3, 1.4 fwrestart.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605090308.k4938pH8002826@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2802 Modified Files: .cvsignore fwrestart.spec sources Log Message: Update to 1.04 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Nov 2005 02:44:32 -0000 1.3 +++ .cvsignore 9 May 2006 03:08:49 -0000 1.4 @@ -1 +1 @@ -fwrestart-1.03.tar.gz +fwrestart-1.04.tar.gz Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-4/fwrestart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwrestart.spec 15 Nov 2005 02:44:32 -0000 1.3 +++ fwrestart.spec 9 May 2006 03:08:49 -0000 1.4 @@ -1,11 +1,11 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart -Version: 1.03 +Version: 1.04 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ -Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.03.tar.gz +Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Mon May 8 2006 Kevin Fenzi - 1.04-1 +- Update to 1.04 + * Mon Nov 14 2005 Kevin Fenzi - 1.03-1.fc4 - Update to 1.03 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Nov 2005 02:44:32 -0000 1.3 +++ sources 9 May 2006 03:08:49 -0000 1.4 @@ -1 +1 @@ -ea28bcab6c3829c4e3f29f70292b3880 fwrestart-1.03.tar.gz +90fdd16491da250877911cd08a257ebe fwrestart-1.04.tar.gz From fedora-extras-commits at redhat.com Tue May 9 03:10:05 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:10:05 -0700 Subject: rpms/fwrestart/FC-3 .cvsignore, 1.3, 1.4 fwrestart.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605090310.k493A7pj002908@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/fwrestart/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2887 Modified Files: .cvsignore fwrestart.spec sources Log Message: Update to 1.04 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Nov 2005 02:45:43 -0000 1.3 +++ .cvsignore 9 May 2006 03:10:05 -0000 1.4 @@ -1 +1 @@ -fwrestart-1.03.tar.gz +fwrestart-1.04.tar.gz Index: fwrestart.spec =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-3/fwrestart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fwrestart.spec 15 Nov 2005 02:45:43 -0000 1.3 +++ fwrestart.spec 9 May 2006 03:10:05 -0000 1.4 @@ -1,11 +1,11 @@ Summary: A way to more safely re-load firewall rules remotely Name: fwrestart -Version: 1.03 +Version: 1.04 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.tummy.com/Community/software/ -Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.03.tar.gz +Source: ftp://ftp.tummy.com/pub/tummy/fwrestart/fwrestart-1.04.tar.gz BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ %{_sbindir}/fwrestart %changelog +* Mon May 8 2006 Kevin Fenzi - 1.04-1 +- Update to 1.04 + * Mon Nov 14 2005 Kevin Fenzi - 1.03-1.fc3 - Update to 1.03 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwrestart/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Nov 2005 02:45:43 -0000 1.3 +++ sources 9 May 2006 03:10:05 -0000 1.4 @@ -1 +1 @@ -ea28bcab6c3829c4e3f29f70292b3880 fwrestart-1.03.tar.gz +90fdd16491da250877911cd08a257ebe fwrestart-1.04.tar.gz From fedora-extras-commits at redhat.com Tue May 9 03:36:20 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:36:20 -0700 Subject: rpms/p0f/devel .cvsignore,1.3,1.4 p0f.spec,1.7,1.8 sources,1.3,1.4 Message-ID: <200605090336.k493aMqO003140@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/p0f/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3119 Modified Files: .cvsignore p0f.spec sources Log Message: Update to 2.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p0f/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Dec 2004 01:10:15 -0000 1.3 +++ .cvsignore 9 May 2006 03:36:19 -0000 1.4 @@ -1 +1 @@ -p0f-2.0.5.tgz +p0f-2.0.6.tgz Index: p0f.spec =================================================================== RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- p0f.spec 17 Feb 2006 02:03:26 -0000 1.7 +++ p0f.spec 9 May 2006 03:36:19 -0000 1.8 @@ -1,13 +1,12 @@ Name: p0f -Version: 2.0.5 -Release: 4%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Summary: Versatile passive OS fingerprinting tool Group: Applications/Internet License: GPL URL: http://lcamtuf.coredump.cx/p0f.shtml -Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.5.tgz -Patch: p0f-include.patch +Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.6.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -20,7 +19,6 @@ %prep %setup -q -n p0f -%patch %build make -f mk/Linux %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -53,6 +51,10 @@ %changelog +* Mon May 8 2006 Kevin Fenzi - 2.0.6-1 +- Upgrade to 2.0.6 +- Remove unneeded include patch (fixed upstream) + * Thu Feb 16 2006 Kevin Fenzi - 2.0.5-4.fc5 - Rebuild for fc5 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/p0f/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Dec 2004 01:10:15 -0000 1.3 +++ sources 9 May 2006 03:36:19 -0000 1.4 @@ -1 +1 @@ -78235749e8ada6ad2b16b40fe15081f6 p0f-2.0.5.tgz +d6333198027b90e05ccb3412d8f25d05 p0f-2.0.6.tgz From fedora-extras-commits at redhat.com Tue May 9 03:46:18 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:46:18 -0700 Subject: rpms/p0f/FC-5 .cvsignore,1.3,1.4 p0f.spec,1.7,1.8 sources,1.3,1.4 Message-ID: <200605090346.k493kKYk003346@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/p0f/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3325 Modified Files: .cvsignore p0f.spec sources Log Message: Update to 2.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Dec 2004 01:10:15 -0000 1.3 +++ .cvsignore 9 May 2006 03:46:18 -0000 1.4 @@ -1 +1 @@ -p0f-2.0.5.tgz +p0f-2.0.6.tgz Index: p0f.spec =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-5/p0f.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- p0f.spec 17 Feb 2006 02:03:26 -0000 1.7 +++ p0f.spec 9 May 2006 03:46:18 -0000 1.8 @@ -1,13 +1,12 @@ Name: p0f -Version: 2.0.5 -Release: 4%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Summary: Versatile passive OS fingerprinting tool Group: Applications/Internet License: GPL URL: http://lcamtuf.coredump.cx/p0f.shtml -Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.5.tgz -Patch: p0f-include.patch +Source: http://lcamtuf.coredump.cx/p0f/p0f-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -20,7 +19,6 @@ %prep %setup -q -n p0f -%patch %build make -f mk/Linux %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -53,6 +51,10 @@ %changelog +* Mon May 8 2006 Kevin Fenzi - 2.0.6-1 +- Upgrade to 2.0.6 +- Remove unneeded include patch (fixed upstream) + * Thu Feb 16 2006 Kevin Fenzi - 2.0.5-4.fc5 - Rebuild for fc5 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Dec 2004 01:10:15 -0000 1.3 +++ sources 9 May 2006 03:46:18 -0000 1.4 @@ -1 +1 @@ -78235749e8ada6ad2b16b40fe15081f6 p0f-2.0.5.tgz +d6333198027b90e05ccb3412d8f25d05 p0f-2.0.6.tgz From fedora-extras-commits at redhat.com Tue May 9 03:50:17 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 8 May 2006 20:50:17 -0700 Subject: rpms/p0f/FC-4 .cvsignore,1.3,1.4 p0f.spec,1.6,1.7 sources,1.3,1.4 Message-ID: <200605090350.k493oJF5003463@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/p0f/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3442 Modified Files: .cvsignore p0f.spec sources Log Message: Update to 2.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Dec 2004 01:10:15 -0000 1.3 +++ .cvsignore 9 May 2006 03:50:17 -0000 1.4 @@ -1 +1 @@ -p0f-2.0.5.tgz +p0f-2.0.6.tgz Index: p0f.spec =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-4/p0f.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- p0f.spec 22 May 2005 22:29:25 -0000 1.6 +++ p0f.spec 9 May 2006 03:50:17 -0000 1.7 @@ -1,13 +1,12 @@ Name: p0f -Version: 2.0.5 -Release: 3 +Version: 2.0.6 +Release: 1%{?dist} Summary: Versatile passive OS fingerprinting tool Group: Applications/Internet License: GPL URL: http://lcamtuf.coredump.cx/p0f.shtml -Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.5.tgz -Patch: p0f-include.patch +Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.6.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -20,7 +19,6 @@ %prep %setup -q -n p0f -%patch %build make -f mk/Linux %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -53,6 +51,10 @@ %changelog +* Mon May 8 2006 Kevin Fenzi - 2.0.6-1 +- Upgrade to 2.0.6 +- Remove unneeded include patch (fixed upstream) + * Sun May 22 2005 Jeremy Katz - 2.0.5-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/p0f/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Dec 2004 01:10:15 -0000 1.3 +++ sources 9 May 2006 03:50:17 -0000 1.4 @@ -1 +1 @@ -78235749e8ada6ad2b16b40fe15081f6 p0f-2.0.5.tgz +d6333198027b90e05ccb3412d8f25d05 p0f-2.0.6.tgz From fedora-extras-commits at redhat.com Tue May 9 04:37:09 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Mon, 8 May 2006 21:37:09 -0700 Subject: owners owners.list,1.964,1.965 Message-ID: <200605090437.k494bBWL005861@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5844/owners Modified Files: owners.list Log Message: Scribes: Add upstream author to initial CC: list. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.964 retrieving revision 1.965 diff -u -r1.964 -r1.965 --- owners.list 8 May 2006 21:15:10 -0000 1.964 +++ owners.list 9 May 2006 04:37:09 -0000 1.965 @@ -1435,7 +1435,7 @@ Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|screem|A website development enviroment|michael at knox.net.nz|extras-qa at fedoraproject.org| -Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org| +Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org|mystilleef at gmail.com Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scribus-templates|This package includes additional templates for Scribus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 05:38:19 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 8 May 2006 22:38:19 -0700 Subject: rpms/Maelstrom/devel Maelstrom-3.0.6-install.patch, NONE, 1.1 Maelstrom-3.0.6-setgid.patch, NONE, 1.1 Maelstrom.desktop, NONE, 1.1 Maelstrom.spec, 1.6, 1.7 Maelstrom-3.0.5-setgid.patch, 1.1, NONE Message-ID: <200605090538.k495cLQD008409@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/Maelstrom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8385 Modified Files: Maelstrom.spec Added Files: Maelstrom-3.0.6-install.patch Maelstrom-3.0.6-setgid.patch Maelstrom.desktop Removed Files: Maelstrom-3.0.5-setgid.patch Log Message: use full source URL tweak buildroot tweak summary move out of /usr/games to /usr/share/Maelstrom move score file to /var use desktop-file-install drop gid completely on startup, rework setgid code Maelstrom-3.0.6-install.patch: --- NEW FILE Maelstrom-3.0.6-install.patch --- --- Maelstrom-3.0.6/configure.foo 2006-05-09 00:08:43.000000000 -0400 +++ Maelstrom-3.0.6/configure 2006-05-09 00:09:00.000000000 -0400 @@ -3232,7 +3232,7 @@ GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" ;; *) - GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" + GAME_INSTALLDIR="\$(datadir)/$PACKAGE" ;; esac Maelstrom-3.0.6-setgid.patch: --- NEW FILE Maelstrom-3.0.6-setgid.patch --- diff -ru Maelstrom-3.0.6/main.cpp Maelstrom-3.0.6-new/main.cpp --- Maelstrom-3.0.6/main.cpp 2002-10-19 22:53:32.000000000 -0400 +++ Maelstrom-3.0.6-new/main.cpp 2006-05-09 01:05:07.000000000 -0400 @@ -170,12 +170,21 @@ /* Command line flags */ int doprinthigh = 0; int speedtest = 0; + gid_t gid; + Uint32 video_flags = SDL_SWSURFACE; /* Normal variables */ SDL_Event event; LibPath::SetExePath(argv[0]); + GetScoreFile(); + gid = getgid(); + if (setresgid(-1,gid,gid) != 0) { + error("Could not drop privleges. -- Exiting.\n"); + exit(1); + } + #ifndef __WIN95__ /* The first thing we do is calculate our checksum */ (void) checksum(); diff -ru Maelstrom-3.0.6/scores.cpp Maelstrom-3.0.6-new/scores.cpp --- Maelstrom-3.0.6/scores.cpp 2000-09-24 13:55:39.000000000 -0400 +++ Maelstrom-3.0.6-new/scores.cpp 2006-05-09 01:26:19.000000000 -0400 @@ -4,6 +4,8 @@ */ #ifdef unix +#include +#include #include #include #endif @@ -15,22 +17,40 @@ #include "load.h" #include "dialog.h" -#define MAELSTROM_SCORES "Maelstrom-Scores" +#define MAELSTROM_SCORES "/var/games/Maelstrom-Scores" #define NUM_SCORES 10 // Do not change this! /* Everyone can write to scores file if defined to 0 */ -#define SCORES_PERMMASK 0 +#define SCORES_PERMMASK 002 #define CLR_DIALOG_WIDTH 281 #define CLR_DIALOG_HEIGHT 111 Bool gNetScores = 0; Scores hScores[NUM_SCORES]; +int gScoreFile = -1; + +void GetScoreFile(void) +{ +#ifdef unix + int omask; +#endif + int f; + +#ifdef unix + omask=umask(SCORES_PERMMASK); +#endif + f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT); + if (f == -1) + f = open(MAELSTROM_SCORES,O_RDONLY); + gScoreFile = f; +#ifdef unix + umask(omask); +#endif +} void LoadScores(void) { - LibPath path; - SDL_RWops *scores_src; int i; /* Try to load network scores, if we can */ @@ -44,50 +64,50 @@ } memset(&hScores, 0, sizeof(hScores)); - scores_src = SDL_RWFromFile(path.Path(MAELSTROM_SCORES), "rb"); - if ( scores_src != NULL ) { + if (gScoreFile != -1) { + lseek(gScoreFile,0,SEEK_SET); for ( i=0; i $RPM_BUILD_ROOT%{_datadir}/applications/net-Maelstrom.desktop << EOF -[Desktop Entry] -Name=Maelstrom -Comment=Space combat game -Exec=%{_bindir}/Maelstrom -Icon=maelstrom.png -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;Game;ArcadeGame;X-Red-Hat-Base; -EOF +desktop-file-install --vendor fedora --dir \ + $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora %{SOURCE2} # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav} @@ -56,25 +50,43 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/games +mv $RPM_BUILD_ROOT%{_datadir}/Maelstrom/*Scores $RPM_BUILD_ROOT%{_localstatedir}/lib/games + %clean rm -rf $RPM_BUILD_ROOT +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +touch --no-create /usr/share/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q /usr/share/icons/hicolor +fi + + %files -%defattr(-, root, games) +%defattr(-, root, root) %doc COPYING CREDITS README* Changelog Docs %attr(2755,root,games) %{_bindir}/Maelstrom -%attr(0575,root,games) %dir %{_prefix}/games/Maelstrom -%config %attr(0060,root,games) %{_prefix}/games/Maelstrom/Maelstrom-Scores -%{_prefix}/games/Maelstrom/icon* -%{_prefix}/games/Maelstrom/Images -%{_prefix}/games/Maelstrom/Maelstrom_Fonts -%{_prefix}/games/Maelstrom/Maelstrom_Sounds -%{_prefix}/games/Maelstrom/Maelstrom_Sprites -%defattr(-, root, root) -%{_datadir}/applications/net-Maelstrom.desktop +%{_datadir}/Maelstrom +%{_datadir}/applications/* %{_datadir}/icons +%config(noreplace) %attr(0664,root,games) %{_localstatedir}/lib/games/Maelstrom-Scores %changelog +* Tue May 9 2006 Bill Nottingham 3.0.6-11 +- various fixes from review: + - update the icon cache + - move out of /usr/games + - move scores to /var + - rework setuid code + - use desktop-file-install + * Mon Feb 13 2006 Bill Nottingham 3.0.6-10 - rebuild --- Maelstrom-3.0.5-setgid.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 05:52:38 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 8 May 2006 22:52:38 -0700 Subject: rpms/Maelstrom/devel Maelstrom-3.0.6-setgid.patch, 1.1, 1.2 Maelstrom.spec, 1.7, 1.8 Message-ID: <200605090552.k495qeD5008465@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/Maelstrom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8443 Modified Files: Maelstrom-3.0.6-setgid.patch Maelstrom.spec Log Message: fix setgid Maelstrom-3.0.6-setgid.patch: Index: Maelstrom-3.0.6-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom-3.0.6-setgid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Maelstrom-3.0.6-setgid.patch 9 May 2006 05:38:19 -0000 1.1 +++ Maelstrom-3.0.6-setgid.patch 9 May 2006 05:52:38 -0000 1.2 @@ -35,12 +35,12 @@ #include #include #endif -@@ -15,22 +17,40 @@ +@@ -15,22 +17,42 @@ #include "load.h" #include "dialog.h" -#define MAELSTROM_SCORES "Maelstrom-Scores" -+#define MAELSTROM_SCORES "/var/games/Maelstrom-Scores" ++#define MAELSTROM_SCORES "/var/lib/games/Maelstrom-Scores" #define NUM_SCORES 10 // Do not change this! /* Everyone can write to scores file if defined to 0 */ @@ -67,6 +67,8 @@ + f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT); + if (f == -1) + f = open(MAELSTROM_SCORES,O_RDONLY); ++ if (f == -1) ++ error("Couldn't open score file %s.\n",MAELSTROM_SCORES); + gScoreFile = f; +#ifdef unix + umask(omask); @@ -171,3 +173,16 @@ extern int ZapHighScores(void); extern int GetStartLevel(void); extern void PrintHighScores(void); +diff -ru Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp +--- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp 2006-05-09 01:42:42.000000000 -0400 ++++ Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp 2006-05-09 01:07:58.000000000 -0400 +@@ -536,6 +536,8 @@ + const int max = 32; + Uint16 ramp[256]; + ++ faded = !faded; ++ return; + for ( int j = 1; j <= max; j++ ) { + int v = faded ? j : max - j + 1; + for ( int i = 0; i < 256; i++ ) { +Binary files Maelstrom-3.0.6/screenlib/SDL_FrameBuf.o and Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.o differ Index: Maelstrom.spec =================================================================== RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Maelstrom.spec 9 May 2006 05:38:19 -0000 1.7 +++ Maelstrom.spec 9 May 2006 05:52:38 -0000 1.8 @@ -23,7 +23,7 @@ %prep %setup -q -#%patch0 -p1 -b .setgid +%patch0 -p1 -b .setgid %patch1 -p1 -b .gcc34 %patch2 -p1 -b .64bit %patch3 -p1 -b .install From fedora-extras-commits at redhat.com Tue May 9 06:04:55 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 8 May 2006 23:04:55 -0700 Subject: rpms/Maelstrom/devel Maelstrom-3.0.6-setgid.patch,1.2,1.3 Message-ID: <200605090604.k4964wEW010815@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/Maelstrom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10737 Modified Files: Maelstrom-3.0.6-setgid.patch Log Message: remove make-it-go-fast hack. Need to figure out why the fade is so slow on current X. Maelstrom-3.0.6-setgid.patch: Index: Maelstrom-3.0.6-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom-3.0.6-setgid.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Maelstrom-3.0.6-setgid.patch 9 May 2006 05:52:38 -0000 1.2 +++ Maelstrom-3.0.6-setgid.patch 9 May 2006 06:04:55 -0000 1.3 @@ -173,16 +173,3 @@ extern int ZapHighScores(void); extern int GetStartLevel(void); extern void PrintHighScores(void); -diff -ru Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp ---- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp 2006-05-09 01:42:42.000000000 -0400 -+++ Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.cpp 2006-05-09 01:07:58.000000000 -0400 -@@ -536,6 +536,8 @@ - const int max = 32; - Uint16 ramp[256]; - -+ faded = !faded; -+ return; - for ( int j = 1; j <= max; j++ ) { - int v = faded ? j : max - j + 1; - for ( int i = 0; i < 256; i++ ) { -Binary files Maelstrom-3.0.6/screenlib/SDL_FrameBuf.o and Maelstrom-3.0.6-new/screenlib/SDL_FrameBuf.o differ From fedora-extras-commits at redhat.com Tue May 9 06:05:01 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:05:01 -0700 Subject: extras-buildsys/server ArchJob.py, 1.29, 1.30 Builder.py, 1.37, 1.38 BuilderManager.py, 1.22, 1.23 Message-ID: <200605090605.k49651Im010830@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735/server Modified Files: ArchJob.py Builder.py BuilderManager.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for * builder/BuilderMock.py - Fix name of ul_callback() * common/FileTransfer.py - Trap operational errors * server/ArchJob.py - (get_upload_dir): new function; return the directory into which result files should be written * server/Builder.py - (get_archjob): new function; return archjob object for a particular jobid - (_handle_building_jobs): correct scoping of bits that get status for certain jobs - Increase the required active builder contact interval slightly - (request): reset the unavailable count every time the builder contacts us * server/BuilderManager.py - (__init__): Enable the HTTP POST handler when there are active builders - (upload_callback): handle incoming files by writing them to the correct location based on their jobid Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ArchJob.py 9 May 2006 02:52:58 -0000 1.29 +++ ArchJob.py 9 May 2006 06:04:54 -0000 1.30 @@ -225,6 +225,12 @@ print "%s (%s/%s): Build result files - [ %s ]" % (self.par_job.uid, self.par_job.package, self._target_dict['arch'], file_string) + def get_upload_dir(self): + upload_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) + if not os.path.exists(upload_dir): + os.makedirs(upload_dir) + return upload_dir + def _status_downloading(self): # Start grabbing the next undownloaded file, but only # if we aren't already pulling one down Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- Builder.py 9 May 2006 02:57:12 -0000 1.37 +++ Builder.py 9 May 2006 06:04:54 -0000 1.38 @@ -117,6 +117,13 @@ def stop(self): self._stop = True + def get_archjob(self, archjob_id): + try: + return self._jobs[archjob_id] + except KeyError: + pass + return None + def _handle_builder_suspend(self, reason, msg): for jobid in self._jobs.keys(): job = self._jobs[jobid] @@ -196,22 +203,23 @@ except KeyError: pass - # We have to check jobs that weren't reported - # as 'building' by the builder, since the job - # may have finished on the builder and was - # removed from the building job list before we - # were able to know that it was done. HACK - self._prepping_jobs = False - for jobid in self._jobs.keys(): - # If the builder didn't report this job as building, - # and its not done, explicitly get its status - job = self._jobs[jobid] - if jobid not in reported_uniqids and job.get_status() != 'done': - new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) - - # Check for prepping jobs - if job.prepping(): - self._prepping_jobs = True + # We have to check jobs that weren't reported + # as 'building' by the builder, since the job + # may have finished on the builder and was + # removed from the building job list before we + # were able to know that it was done. HACK + self._prepping_jobs = False + for jobid in self._jobs.keys(): + # If the builder didn't report this job as building, + # and its not done, explicitly get its status + job = self._jobs[jobid] + if jobid not in reported_uniqids and job.get_status() != 'done': + print "Requesting job status for %s" % jobid + new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) + + # Check for prepping jobs + if job.prepping(): + self._prepping_jobs = True del reported_uniqids return new_cmds @@ -510,7 +518,7 @@ punching holes through it. """ - _REQUIRED_CONTACT_INTERVAL = 20 + _REQUIRED_CONTACT_INTERVAL = 25 def __init__(self, manager, cfg, address, weight, btype): Builder.__init__(self, manager, cfg, address, weight, btype) @@ -568,6 +576,8 @@ from the BuildMaster's XML-RPC server.""" self._last_contact = time.time() + self._unavail_count = 0 + print "%s: builder contact" % self._last_contact if not self._available: self._handle_builder_reactivate(cmd_list) Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- BuilderManager.py 28 Apr 2006 03:17:41 -0000 1.22 +++ BuilderManager.py 9 May 2006 06:04:54 -0000 1.23 @@ -185,8 +185,51 @@ certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._srpm_server = HTTPServer.PlgHTTPServerManager((hostname, port), http_dir, certs) - self._srpm_server.start() + self._fileserver = HTTPServer.PlgHTTPServerManager((hostname, port), http_dir, certs) + if any_active: + self._fileserver.set_POST_handler('/upload', self.upload_callback) + self._fileserver.start() + + def upload_callback(self, request_handler, fs): + # Ensure we know this builder + addr = request_handler.client_address[0] + builder = self.get_builder(addr, addr) + if not builder: + request_handler.send_error(403, "Unauthorized") + return + + # Search for filename + fslist = [fs] + if not fs.name and not fs.filename and fs.value: + fslist = fs.value + jobid = filename = tmpfile = None + for item in fslist: + if item.name == 'archjob_id': + try: + jobid = str(item.value) + except ValueError: + pass + elif item.name == 'filedata': + filename = item.filename + tmpfile = item.file + + if jobid and filename and tmpfile: + archjob = builder.get_archjob(jobid) + if archjob: + upload_dir = archjob.get_upload_dir() + import shutil, urllib + destpath = os.path.join(upload_dir, urllib.unquote(filename)) + dest = file(destpath, "w+b") + shutil.copyfileobj(tmpfile, dest) + dest.close() + request_handler.send_response(200, "Success") + request_handler.send_header("Content-type", "text/html") + request_handler.end_headers() + request_handler.wfile.write("Success!") + else: + request_handler.send_error(400, "Invalid request for archjob_id %s" % jobid) + else: + request_handler.send_error(400, "Invalid request for %s" % request_handler.path) def _print_builders(self): # Print out builder list when starting up @@ -213,7 +256,7 @@ builder.stop() if self._xmlrpc_server: self._xmlrpc_server.stop() - self._srpm_server.stop() + self._fileserver.stop() def _load_builders(self): self._builders_lock.acquire() From fedora-extras-commits at redhat.com Tue May 9 06:04:50 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:04:50 -0700 Subject: extras-buildsys ChangeLog,1.190,1.191 Message-ID: <200605090605.k4965Klu010833@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735 Modified Files: ChangeLog Log Message: 2006-05-09 Dan Williams * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for * builder/BuilderMock.py - Fix name of ul_callback() * common/FileTransfer.py - Trap operational errors * server/ArchJob.py - (get_upload_dir): new function; return the directory into which result files should be written * server/Builder.py - (get_archjob): new function; return archjob object for a particular jobid - (_handle_building_jobs): correct scoping of bits that get status for certain jobs - Increase the required active builder contact interval slightly - (request): reset the unavailable count every time the builder contacts us * server/BuilderManager.py - (__init__): Enable the HTTP POST handler when there are active builders - (upload_callback): handle incoming files by writing them to the correct location based on their jobid Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- ChangeLog 9 May 2006 02:57:11 -0000 1.190 +++ ChangeLog 9 May 2006 06:04:47 -0000 1.191 @@ -1,3 +1,35 @@ +2006-05-09 Dan Williams + + * builder/Builder.py + - (upload_files): fix extraction of server address, and pass + the jobid to the server so it knows what the result files + are for + + * builder/BuilderMock.py + - Fix name of ul_callback() + + * common/FileTransfer.py + - Trap operational errors + + * server/ArchJob.py + - (get_upload_dir): new function; return the directory into + which result files should be written + + * server/Builder.py + - (get_archjob): new function; return archjob object for a + particular jobid + - (_handle_building_jobs): correct scoping of bits that get + status for certain jobs + - Increase the required active builder contact interval slightly + - (request): reset the unavailable count every time the builder + contacts us + + * server/BuilderManager.py + - (__init__): Enable the HTTP POST handler when there are + active builders + - (upload_callback): handle incoming files by writing them + to the correct location based on their jobid + 2006-05-08 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Tue May 9 06:04:55 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:04:55 -0700 Subject: extras-buildsys/builder Builder.py,1.4,1.5 BuilderMock.py,1.3,1.4 Message-ID: <200605090605.k4965Pp1010837@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for * builder/BuilderMock.py - Fix name of ul_callback() * common/FileTransfer.py - Trap operational errors * server/ArchJob.py - (get_upload_dir): new function; return the directory into which result files should be written * server/Builder.py - (get_archjob): new function; return archjob object for a particular jobid - (_handle_building_jobs): correct scoping of bits that get status for certain jobs - Increase the required active builder contact interval slightly - (request): reset the unavailable count every time the builder contacts us * server/BuilderManager.py - (__init__): Enable the HTTP POST handler when there are active builders - (upload_callback): handle incoming files by writing them to the correct location based on their jobid 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 9 May 2006 02:57:11 -0000 1.4 +++ Builder.py 9 May 2006 06:04:48 -0000 1.5 @@ -431,16 +431,17 @@ downloader.start() return downloader - def upload_files(self, files, ul_callback, cb_data=None): + def upload_files(self, archjob_id, files, ul_callback, cb_data=None): server = self._cfg.get_str("Active", "server") (urltype, urlrest) = urllib.splittype(server) - (server, urlrest) = urllib.splithost(urlrest) + (ignore, server) = urllib.splithost(urlrest) if self._cfg.get_bool("SSL", "use_ssl"): url = "https://" + server else: url = "http://" + server url = url + ":%d/upload" % self._cfg.get_int("Active", "fileserver_port") - uploader = FileUploader.FileUploader(url, files, 'filedata', None, + data = [("archjob_id", archjob_id)] + uploader = FileUploader.FileUploader(url, files, 'filedata', data, self._certs) uploader.set_callback(ul_callback, cb_data) uploader.start() Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BuilderMock.py 9 May 2006 02:57:11 -0000 1.3 +++ BuilderMock.py 9 May 2006 06:04:48 -0000 1.4 @@ -408,10 +408,11 @@ self._copy_mock_output_to_log() self._files = self._find_files() - self._uploader = self._controller.upload_files(self._files, self.ul_callback, None) + self._uploader = self._controller.upload_files(self._uniqid, self._files, + self.ul_callback, None) self._status = "uploading" - def _ul_callback(self, status, cb_data, msg): + def ul_callback(self, status, cb_data, msg): if status == FileTransfer.FT_RESULT_SUCCESS: pass elif status == FileTransfer.FT_RESULT_FAILED: From fedora-extras-commits at redhat.com Tue May 9 06:04:56 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:04:56 -0700 Subject: extras-buildsys/common FileTransfer.py,1.2,1.3 Message-ID: <200605090605.k4965Q7O010840@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10735/common Modified Files: FileTransfer.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for * builder/BuilderMock.py - Fix name of ul_callback() * common/FileTransfer.py - Trap operational errors * server/ArchJob.py - (get_upload_dir): new function; return the directory into which result files should be written * server/Builder.py - (get_archjob): new function; return archjob object for a particular jobid - (_handle_building_jobs): correct scoping of bits that get status for certain jobs - Increase the required active builder contact interval slightly - (request): reset the unavailable count every time the builder contacts us * server/BuilderManager.py - (__init__): Enable the HTTP POST handler when there are active builders - (upload_callback): handle incoming files by writing them to the correct location based on their jobid Index: FileTransfer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileTransfer.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FileTransfer.py 9 May 2006 02:53:03 -0000 1.2 +++ FileTransfer.py 9 May 2006 06:04:53 -0000 1.3 @@ -61,9 +61,13 @@ def _process_one_transfer(self, data=None): """Retries a transfer for a specified number of times before failing.""" status = FT_RESULT_FAILED - result = msg = None + result = msg = filed_msg = None for attempt in range(1, self._tries + 1): - (result, msg) = self._action(data) + try: + (result, msg) = self._action(data) + except ValueError, exc: + result = None + failed_msg = str(exc) if result: status = FT_RESULT_SUCCESS break @@ -71,7 +75,9 @@ status = FT_RESULT_CANCELED break time.sleep(5) - msg = "Transfer of timed out." + failed_msg = "Transfer timed out." + if status == FT_RESULT_FAILED: + msg = failed_msg return (status, msg) def run(self): From fedora-extras-commits at redhat.com Tue May 9 06:09:55 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 May 2006 23:09:55 -0700 Subject: extras-buildsys/server Builder.py,1.38,1.39 Message-ID: <200605090609.k4969txL010877@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10859/server Modified Files: Builder.py Log Message: Remove debug print Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- Builder.py 9 May 2006 06:04:54 -0000 1.38 +++ Builder.py 9 May 2006 06:09:53 -0000 1.39 @@ -577,7 +577,6 @@ self._last_contact = time.time() self._unavail_count = 0 - print "%s: builder contact" % self._last_contact if not self._available: self._handle_builder_reactivate(cmd_list) From fedora-extras-commits at redhat.com Tue May 9 06:25:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 8 May 2006 23:25:19 -0700 Subject: fedora-security/audit fe4,1.14,1.15 fe5,1.14,1.15 Message-ID: <200605090625.k496PJY0010934@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10914/audit Modified Files: fe4 fe5 Log Message: awstats update/reopen, CVE-2006-2237 != CVE-2006-1945. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fe4 8 May 2006 20:25:23 -0000 1.14 +++ fe4 9 May 2006 06:25:16 -0000 1.15 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-NOID backport (awstats, fixed 6.5-2) bz#190923 awstats-6.5-CVE-2006-1945.patch +CVE-2006-2237 VULNERABLE (awstats) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fe5 8 May 2006 20:25:23 -0000 1.14 +++ fe5 9 May 2006 06:25:16 -0000 1.15 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-NOID backport (awstats, fixed 6.5-4) bz#190923 awstats-6.5-CVE-2006-1945.patch +CVE-2006-2237 VULNERABLE (awstats) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 From fedora-extras-commits at redhat.com Tue May 9 06:58:13 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:58:13 -0700 Subject: rpms/par2cmdline - New directory Message-ID: <200605090658.k496wFDO011097@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11076/par2cmdline Log Message: Directory /cvs/extras/rpms/par2cmdline added to the repository From fedora-extras-commits at redhat.com Tue May 9 06:58:14 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:58:14 -0700 Subject: rpms/par2cmdline/devel - New directory Message-ID: <200605090658.k496wGab011100@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11076/par2cmdline/devel Log Message: Directory /cvs/extras/rpms/par2cmdline/devel added to the repository From fedora-extras-commits at redhat.com Tue May 9 06:58:35 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:58:35 -0700 Subject: rpms/par2cmdline Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605090658.k496wb8Q011156@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11123 Added Files: Makefile import.log Log Message: Setup of module par2cmdline --- NEW FILE Makefile --- # Top level Makefile for module par2cmdline all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 9 06:58:36 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:58:36 -0700 Subject: rpms/par2cmdline/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605090658.k496wcQi011159@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11123/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module par2cmdline --- NEW 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 May 9 06:59:18 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:59:18 -0700 Subject: rpms/par2cmdline import.log,1.1,1.2 Message-ID: <200605090659.k496xKgN011226@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11192 Modified Files: import.log Log Message: auto-import par2cmdline-0.4-7 on branch devel from par2cmdline-0.4-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 May 2006 06:58:35 -0000 1.1 +++ import.log 9 May 2006 06:59:18 -0000 1.2 @@ -0,0 +1 @@ +par2cmdline-0_4-7:HEAD:par2cmdline-0.4-7.src.rpm:1147157953 From fedora-extras-commits at redhat.com Tue May 9 06:59:19 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Mon, 8 May 2006 23:59:19 -0700 Subject: rpms/par2cmdline/devel par2cmdline-reedsolomon.cpp.patch, NONE, 1.1 par2cmdline.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605090659.k496xLFS011233@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11192/devel Modified Files: .cvsignore sources Added Files: par2cmdline-reedsolomon.cpp.patch par2cmdline.spec Log Message: auto-import par2cmdline-0.4-7 on branch devel from par2cmdline-0.4-7.src.rpm par2cmdline-reedsolomon.cpp.patch: --- NEW FILE par2cmdline-reedsolomon.cpp.patch --- diff -u -r par2cmdline-0.4.orig/reedsolomon.cpp par2cmdline-0.4/reedsolomon.cpp --- par2cmdline-0.4.orig/reedsolomon.cpp 2003-05-26 20:01:31.000000000 +0200 +++ par2cmdline-0.4/reedsolomon.cpp 2006-04-11 19:44:52.000000000 +0200 @@ -51,6 +51,7 @@ } } +template <> bool ReedSolomon::SetInput(const vector &present) { inputcount = (u32)present.size(); @@ -80,6 +81,7 @@ return true; } +template <> bool ReedSolomon::SetInput(u32 count) { inputcount = count; @@ -101,6 +103,7 @@ return true; } +template <> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) { // Look up the appropriate element in the RS matrix @@ -189,6 +192,7 @@ // Set which of the source files are present and which are missing // and compute the base values to use for the vandermonde matrix. +template <> bool ReedSolomon::SetInput(const vector &present) { inputcount = (u32)present.size(); @@ -233,6 +237,7 @@ // Record that the specified number of source files are all present // and compute the base values to use for the vandermonde matrix. +template <> bool ReedSolomon::SetInput(u32 count) { inputcount = count; @@ -267,6 +272,7 @@ return true; } +template <> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) { // Look up the appropriate element in the RS matrix --- NEW FILE par2cmdline.spec --- Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 Release: 7%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 Provides: parchive = 1.1.4.0.par2.%{version} %description par2cmdline is a program for creating and using PAR2 files to detect damage in data files and repair them if necessary. PAR2 files are usually published in binary newsgroups on Usenet; they apply the data-recovery capability concepts of RAID-like systems to the posting and recovery of multi-part archives. %prep %setup %patch0 -p1 sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build %configure make %{_smp_mflags} chmod 644 ChangeLog galois.h par1repairer.cpp par2repairer.cpp par2repairersourcefile.cpp par2repairersourcefile.h %install %makeinstall ln -sf par2 $RPM_BUILD_ROOT/%{_bindir}/par %clean rm -rf $RPM_BUILD_ROOT %check make check-TESTS %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog PORTING README ROADMAP %{_bindir}/* %changelog * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. - Add %check section * Thu Apr 27 2006 Laurent Rineau - 0.4-6 - chmod 644 several files, in %build - fix the Source: tag. - new %description - changed the buildroot to the one recommanded for Fedora Extras * Wed Apr 12 2006 Laurent Rineau - 0.4-5 - Added the dist tag. - Recode several file with sed, to remove DOS end-of-lines. - Changed the URL: tag. - Cleanup after a rpmlint pass. * Tue Apr 11 2006 Laurent Rineau - 0.4-3 - updated for Fedora Core 4 - obsolete parchive 1.1.4 - provides parchive = 1.1.4.0.par2.%{version} * Tue May 11 2004 - Thibaut Cousin - updated to version 0.4 for SUSE 9.1 * Tue Oct 21 2003 - Thibaut Cousin - first release of this package for SuSE 9.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 May 2006 06:58:36 -0000 1.1 +++ .cvsignore 9 May 2006 06:59:19 -0000 1.2 @@ -0,0 +1 @@ +par2cmdline-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 May 2006 06:58:36 -0000 1.1 +++ sources 9 May 2006 06:59:19 -0000 1.2 @@ -0,0 +1 @@ +1551b63e57e3c232254dc62073b723a9 par2cmdline-0.4.tar.gz From fedora-extras-commits at redhat.com Tue May 9 07:05:30 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Tue, 9 May 2006 00:05:30 -0700 Subject: owners owners.list,1.965,1.966 Message-ID: <200605090705.k4975W6T013512@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13495 Modified Files: owners.list Log Message: Added myself as owner of par2cmdline. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.965 retrieving revision 1.966 diff -u -r1.965 -r1.966 --- owners.list 9 May 2006 04:37:09 -0000 1.965 +++ owners.list 9 May 2006 07:05:30 -0000 1.966 @@ -872,6 +872,7 @@ Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fc_extra at normalesup.org|extras-qa at fedoraproject.org| Fedora Extras|paraview|Parallel visualization application|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 09:04:14 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 9 May 2006 02:04:14 -0700 Subject: rpms/awstats/FC-4 awstats-6.5-CVE-2006-1945.patch, 1.1, 1.2 awstats.spec, 1.12, 1.13 Message-ID: <200605090904.k4994GeS029947@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29910/FC-4 Modified Files: awstats-6.5-CVE-2006-1945.patch awstats.spec Log Message: really fix CVE-2006-1945 awstats-6.5-CVE-2006-1945.patch: Index: awstats-6.5-CVE-2006-1945.patch =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats-6.5-CVE-2006-1945.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- awstats-6.5-CVE-2006-1945.patch 7 May 2006 23:40:34 -0000 1.1 +++ awstats-6.5-CVE-2006-1945.patch 9 May 2006 09:04:14 -0000 1.2 @@ -1,16 +1,81 @@ -diff -u -r1.860 -r1.861 ---- wwwroot/cgi-bin/awstats.pl 9 Jan 2006 18:51:06 -0000 1.860 -+++ wwwroot/cgi-bin/awstats.pl 22 Jan 2006 12:55:14 -0000 1.861 -@@ -5542,7 +5542,7 @@ +--- ./wwwroot/cgi-bin/awstats.pl.CVE-2006-1945 2005-11-24 21:11:19.000000000 +0100 ++++ ./wwwroot/cgi-bin/awstats.pl 2006-05-09 10:46:34.000000000 +0200 +@@ -4430,6 +4394,7 @@ + + #------------------------------------------------------------------------------ + # Function: Clean a string of HTML tags to avoid 'Cross Site Scripting attacks' ++# and clean | char. + # Parameters: stringtoclean + # Input: None + # Output: None +@@ -4439,6 +4404,7 @@ + my $stringtoclean=shift; + $stringtoclean =~ s//>/g; ++ $stringtoclean =~ s/|//g; + return $stringtoclean; + } + +@@ -5516,6 +5483,7 @@ + 'hostfilter','hostfilterex','urlfilter','urlfilterex','refererpagesfilter','refererpagesfilterex', + 'pluginmode','filterrawlog'); + ++# Parse input parameters and sanitize them for security reasons + $QueryString=''; + # AWStats use GATEWAY_INTERFACE to known if ran as CLI or CGI. AWSTATS_DEL_GATEWAY_INTERFACE can + # be set to force AWStats to be ran as CLI even from a web page. +@@ -5534,7 +5502,7 @@ + $QueryString =~ s/&/&/g; + } + +- $QueryString = CleanFromCSSA($QueryString); ++ $QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString)); + + # Security test + if ($QueryString =~ /LogFile=([^&]+)/i) { error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); } +@@ -5542,26 +5510,26 @@ # No update but report by default when run from a browser $UpdateStats=($QueryString=~/update=1/i?1:0); - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } -+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } - if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } - if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } - if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } -@@ -5591,7 +5591,7 @@ +- if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } +- if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } +- if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } ++ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } ++ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } ++ if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } ++ if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } + # All filters +- if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can also be defined with hostfilter=filter +- if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}=&DecodeEncodedString("$1"); } # +- if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can also be defined with urlfilter=filter +- if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}=&DecodeEncodedString("$1"); } # +- if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can also be defined with refererpagesfilter=filter +- if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}=&DecodeEncodedString("$1"); } # ++ if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can also be defined with hostfilter=filter ++ if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}="$1"; } # ++ if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can also be defined with urlfilter=filter ++ if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}="$1"; } # ++ if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can also be defined with refererpagesfilter=filter ++ if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}="$1"; } # + # All output +- if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed + + # If migrate + if ($QueryString =~ /(^|-|&|&)migrate=([^&]+)/i) { +- $MigrateStats=&DecodeEncodedString("$2"); ++ $MigrateStats=&Sanitize("$2"); + $MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/; + $SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//; # SiteConfig is used to find config file + } +@@ -5591,7 +5559,7 @@ # Update with no report by default when run from command line $UpdateStats=1; @@ -19,3 +84,12 @@ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } +@@ -5625,8 +5593,6 @@ + if ($QueryString =~ /(^|&|&)databasebreak=(\w+)/i) { $DatabaseBreak=$2; } + if ($QueryString =~ /(^|&|&)updatefor=(\d+)/i) { $UpdateFor=$2; } + if ($QueryString =~ /(^|&|&)noloadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=1; } } +-#Removed for security reasons +-#if ($QueryString =~ /(^|&|&)loadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=-1; } } + if ($QueryString =~ /(^|&|&)limitflush=(\d+)/i) { $LIMITFLUSH=$2; } + # Get/Define output + if ($QueryString =~ /(^|&|&)output(=[^&]*|)(.*)(&|&)output(=[^&]*|)(&|$)/i) { error("Only 1 output option is allowed","","",1); } Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- awstats.spec 7 May 2006 23:49:26 -0000 1.12 +++ awstats.spec 9 May 2006 09:04:14 -0000 1.13 @@ -1,6 +1,6 @@ Name: awstats Version: 6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -154,6 +154,9 @@ %{_datadir}/%{name}/wwwroot/js %changelog +* Tue May 09 2006 Aurelien Bompard 6.5-3 +- really fix CVE-2006-1945... + * Mon May 08 2006 Aurelien Bompard 6.5-2 - add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923) From fedora-extras-commits at redhat.com Tue May 9 09:04:15 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 9 May 2006 02:04:15 -0700 Subject: rpms/awstats/FC-5 awstats-6.5-CVE-2006-1945.patch, 1.1, 1.2 awstats.spec, 1.13, 1.14 Message-ID: <200605090904.k4994Hta029955@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29910/FC-5 Modified Files: awstats-6.5-CVE-2006-1945.patch awstats.spec Log Message: really fix CVE-2006-1945 awstats-6.5-CVE-2006-1945.patch: Index: awstats-6.5-CVE-2006-1945.patch =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats-6.5-CVE-2006-1945.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- awstats-6.5-CVE-2006-1945.patch 7 May 2006 23:40:34 -0000 1.1 +++ awstats-6.5-CVE-2006-1945.patch 9 May 2006 09:04:15 -0000 1.2 @@ -1,16 +1,81 @@ -diff -u -r1.860 -r1.861 ---- wwwroot/cgi-bin/awstats.pl 9 Jan 2006 18:51:06 -0000 1.860 -+++ wwwroot/cgi-bin/awstats.pl 22 Jan 2006 12:55:14 -0000 1.861 -@@ -5542,7 +5542,7 @@ +--- ./wwwroot/cgi-bin/awstats.pl.CVE-2006-1945 2005-11-24 21:11:19.000000000 +0100 ++++ ./wwwroot/cgi-bin/awstats.pl 2006-05-09 10:46:34.000000000 +0200 +@@ -4430,6 +4394,7 @@ + + #------------------------------------------------------------------------------ + # Function: Clean a string of HTML tags to avoid 'Cross Site Scripting attacks' ++# and clean | char. + # Parameters: stringtoclean + # Input: None + # Output: None +@@ -4439,6 +4404,7 @@ + my $stringtoclean=shift; + $stringtoclean =~ s//>/g; ++ $stringtoclean =~ s/|//g; + return $stringtoclean; + } + +@@ -5516,6 +5483,7 @@ + 'hostfilter','hostfilterex','urlfilter','urlfilterex','refererpagesfilter','refererpagesfilterex', + 'pluginmode','filterrawlog'); + ++# Parse input parameters and sanitize them for security reasons + $QueryString=''; + # AWStats use GATEWAY_INTERFACE to known if ran as CLI or CGI. AWSTATS_DEL_GATEWAY_INTERFACE can + # be set to force AWStats to be ran as CLI even from a web page. +@@ -5534,7 +5502,7 @@ + $QueryString =~ s/&/&/g; + } + +- $QueryString = CleanFromCSSA($QueryString); ++ $QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString)); + + # Security test + if ($QueryString =~ /LogFile=([^&]+)/i) { error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); } +@@ -5542,26 +5510,26 @@ # No update but report by default when run from a browser $UpdateStats=($QueryString=~/update=1/i?1:0); - if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } -+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } - if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } - if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } - if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } -@@ -5591,7 +5591,7 @@ +- if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } +- if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } +- if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } ++ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } ++ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } ++ if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } ++ if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } + # All filters +- if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can also be defined with hostfilter=filter +- if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}=&DecodeEncodedString("$1"); } # +- if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can also be defined with urlfilter=filter +- if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}=&DecodeEncodedString("$1"); } # +- if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can also be defined with refererpagesfilter=filter +- if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}=&DecodeEncodedString("$1"); } # ++ if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can also be defined with hostfilter=filter ++ if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}="$1"; } # ++ if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can also be defined with urlfilter=filter ++ if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}="$1"; } # ++ if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can also be defined with refererpagesfilter=filter ++ if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}="$1"; } # + # All output +- if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed +- if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed ++ if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed + + # If migrate + if ($QueryString =~ /(^|-|&|&)migrate=([^&]+)/i) { +- $MigrateStats=&DecodeEncodedString("$2"); ++ $MigrateStats=&Sanitize("$2"); + $MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/; + $SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//; # SiteConfig is used to find config file + } +@@ -5591,7 +5559,7 @@ # Update with no report by default when run from command line $UpdateStats=1; @@ -19,3 +84,12 @@ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } +@@ -5625,8 +5593,6 @@ + if ($QueryString =~ /(^|&|&)databasebreak=(\w+)/i) { $DatabaseBreak=$2; } + if ($QueryString =~ /(^|&|&)updatefor=(\d+)/i) { $UpdateFor=$2; } + if ($QueryString =~ /(^|&|&)noloadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=1; } } +-#Removed for security reasons +-#if ($QueryString =~ /(^|&|&)loadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=-1; } } + if ($QueryString =~ /(^|&|&)limitflush=(\d+)/i) { $LIMITFLUSH=$2; } + # Get/Define output + if ($QueryString =~ /(^|&|&)output(=[^&]*|)(.*)(&|&)output(=[^&]*|)(&|$)/i) { error("Only 1 output option is allowed","","",1); } Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- awstats.spec 7 May 2006 23:40:34 -0000 1.13 +++ awstats.spec 9 May 2006 09:04:15 -0000 1.14 @@ -1,6 +1,6 @@ Name: awstats Version: 6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -176,6 +176,9 @@ %changelog +* Tue May 09 2006 Aurelien Bompard 6.5-5 +- really fix CVE-2006-1945... + * Mon May 08 2006 Aurelien Bompard 6.5-4 - add patch to fix CVE-2006-1945 (bugs 190921, 190922 and 190923) From fedora-extras-commits at redhat.com Tue May 9 09:29:15 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:29:15 -0700 Subject: rpms/perl-Crypt-DSA/devel perl-Crypt-DSA.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605090929.k499THll030128@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Crypt-DSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30106 Modified Files: perl-Crypt-DSA.spec sources .cvsignore Log Message: Update to 0.14 Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DSA.spec 8 Feb 2006 14:23:06 -0000 1.1 +++ perl-Crypt-DSA.spec 9 May 2006 09:29:15 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA -Version: 0.13 +Version: 0.14 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -51,5 +51,8 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Tue May 9 2006 Paul Howarth 0.14-1 +- Update to 0.14 + * Mon Nov 28 2005 Paul Howarth 0.13-1 - Initial build Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2006 14:23:06 -0000 1.2 +++ sources 9 May 2006 09:29:15 -0000 1.3 @@ -1 +1 @@ -269261448ecc6b3b82a854e3b774c4ae Crypt-DSA-0.13.tar.gz +5ff5ab4be5501f5547bbe46cdc3de442 Crypt-DSA-0.14.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2006 14:23:06 -0000 1.2 +++ .cvsignore 9 May 2006 09:29:15 -0000 1.3 @@ -1 +1 @@ -Crypt-DSA-0.13.tar.gz +Crypt-DSA-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 9 09:30:51 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:30:51 -0700 Subject: rpms/perl-Crypt-DSA/FC-5 perl-Crypt-DSA.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605090930.k499UrES030212@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Crypt-DSA/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30190 Modified Files: perl-Crypt-DSA.spec sources .cvsignore Log Message: resync with devel Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-5/perl-Crypt-DSA.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DSA.spec 8 Feb 2006 14:23:06 -0000 1.1 +++ perl-Crypt-DSA.spec 9 May 2006 09:30:51 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA -Version: 0.13 +Version: 0.14 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -51,5 +51,8 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Tue May 9 2006 Paul Howarth 0.14-1 +- Update to 0.14 + * Mon Nov 28 2005 Paul Howarth 0.13-1 - Initial build Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2006 14:23:06 -0000 1.2 +++ sources 9 May 2006 09:30:51 -0000 1.3 @@ -1 +1 @@ -269261448ecc6b3b82a854e3b774c4ae Crypt-DSA-0.13.tar.gz +5ff5ab4be5501f5547bbe46cdc3de442 Crypt-DSA-0.14.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2006 14:23:06 -0000 1.2 +++ .cvsignore 9 May 2006 09:30:51 -0000 1.3 @@ -1 +1 @@ -Crypt-DSA-0.13.tar.gz +Crypt-DSA-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 9 09:32:12 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:32:12 -0700 Subject: rpms/perl-Crypt-DSA/FC-4 perl-Crypt-DSA.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605090932.k499WERq030285@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Crypt-DSA/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30264 Modified Files: perl-Crypt-DSA.spec sources .cvsignore Log Message: resync with devel Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-4/perl-Crypt-DSA.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-DSA.spec 8 Feb 2006 14:23:06 -0000 1.1 +++ perl-Crypt-DSA.spec 9 May 2006 09:32:12 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA -Version: 0.13 +Version: 0.14 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -51,5 +51,8 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Tue May 9 2006 Paul Howarth 0.14-1 +- Update to 0.14 + * Mon Nov 28 2005 Paul Howarth 0.13-1 - Initial build Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Feb 2006 14:23:06 -0000 1.2 +++ sources 9 May 2006 09:32:12 -0000 1.3 @@ -1 +1 @@ -269261448ecc6b3b82a854e3b774c4ae Crypt-DSA-0.13.tar.gz +5ff5ab4be5501f5547bbe46cdc3de442 Crypt-DSA-0.14.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Feb 2006 14:23:06 -0000 1.2 +++ .cvsignore 9 May 2006 09:32:12 -0000 1.3 @@ -1 +1 @@ -Crypt-DSA-0.13.tar.gz +Crypt-DSA-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 9 09:42:19 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:42:19 -0700 Subject: rpms/gtkwave/devel gtkwave.spec, 1.10, 1.11 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 Message-ID: <200605090942.k499gLr9030430@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30409 Modified Files: gtkwave.spec sources .cvsignore Log Message: Update to 3.0.1 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkwave.spec 2 May 2006 10:34:49 -0000 1.10 +++ gtkwave.spec 9 May 2006 09:42:19 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 9 2006 Paul Howarth 3.0.1-1 +- update to 3.0.1 + * Tue May 2 2006 Paul Howarth 3.0.0-1 - update to 3.0.0 - add examples directory as %%doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 May 2006 10:34:49 -0000 1.10 +++ sources 9 May 2006 09:42:19 -0000 1.11 @@ -1 +1 @@ -1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz +4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2006 10:34:49 -0000 1.10 +++ .cvsignore 9 May 2006 09:42:19 -0000 1.11 @@ -1 +1 @@ -gtkwave-3.0.0.tgz +gtkwave-3.0.1.tgz From fedora-extras-commits at redhat.com Tue May 9 09:43:39 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:43:39 -0700 Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.10, 1.11 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 Message-ID: <200605090943.k499hf1Z030505@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkwave.spec 2 May 2006 10:58:19 -0000 1.10 +++ gtkwave.spec 9 May 2006 09:43:39 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 9 2006 Paul Howarth 3.0.1-1 +- update to 3.0.1 + * Tue May 2 2006 Paul Howarth 3.0.0-1 - update to 3.0.0 - add examples directory as %%doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 May 2006 10:58:19 -0000 1.10 +++ sources 9 May 2006 09:43:39 -0000 1.11 @@ -1 +1 @@ -1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz +4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2006 10:58:19 -0000 1.10 +++ .cvsignore 9 May 2006 09:43:39 -0000 1.11 @@ -1 +1 @@ -gtkwave-3.0.0.tgz +gtkwave-3.0.1.tgz From fedora-extras-commits at redhat.com Tue May 9 09:44:48 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:44:48 -0700 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.9, 1.10 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 Message-ID: <200605090944.k499ioUl030577@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30556 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkwave.spec 2 May 2006 10:55:18 -0000 1.9 +++ gtkwave.spec 9 May 2006 09:44:48 -0000 1.10 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 9 2006 Paul Howarth 3.0.1-1 +- update to 3.0.1 + * Tue May 2 2006 Paul Howarth 3.0.0-1 - update to 3.0.0 - add examples directory as %%doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 May 2006 10:55:18 -0000 1.10 +++ sources 9 May 2006 09:44:48 -0000 1.11 @@ -1 +1 @@ -1fbeaaed44715feab6769a1079d256e2 gtkwave-3.0.0.tgz +4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2006 10:55:18 -0000 1.10 +++ .cvsignore 9 May 2006 09:44:48 -0000 1.11 @@ -1 +1 @@ -gtkwave-3.0.0.tgz +gtkwave-3.0.1.tgz From fedora-extras-commits at redhat.com Tue May 9 09:45:56 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 9 May 2006 02:45:56 -0700 Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.8, 1.9 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200605090945.k499jwDA030650@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30629 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkwave.spec 7 Mar 2006 13:28:21 -0000 1.8 +++ gtkwave.spec 9 May 2006 09:45:56 -0000 1.9 @@ -1,30 +1,28 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.86 +Version: 3.0.1 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog simulation tools, as well as LXT files produced by certain Verilog simulation tools. -This package includes support for reading .ghw files as produced by ghdl. - %prep %setup -q -n gtkwave-%{version} # Honour %{optflags} and use system zlib/bzip2 library -%{__perl} -pi -e 's/^CFLAGS = -O2/CFLAGS = %{optflags}/;' \ +%{__perl} -pi -e 's/^C(FLAGS|OPT) ?= ?-O2/C\1 = %{optflags}/;' \ -e 's at -I\.\.?/libz -I\.\.?/libbz2@@;' \ - -e 's@(\.\./)?libz/libz\.a at -lz@;' \ - -e 's@(\.\./)?libbz2/libbz2\.a at -lbz2@;' \ + -e 's@(\.\./(\.\./src/)?)?libz/libz\.a at -lz@;' \ + -e 's@(\.\./(\.\./src/)?)?libbz2/libbz2\.a at -lbz2@;' \ -e 's@^([a-z0-9]+:.*) -lz( -lbz2)?@\1@;' \ - src/Makefile*.in src/*/Makefile*.in + src/Makefile*.in src/*/Makefile*.in contrib/*/Makefile*.in %{__rm} -rf src/lib{z,bz2} # Fix file permissions for sane debuginfo package @@ -35,13 +33,11 @@ # to view) and cannot be opened in a "no file" mode from a menu. %build -# This is not an autotools-generated config script, and does not accept --libdir etc. -echo 2 | ./configure +echo 2 | ./configure --libdir=%{_libdir} %{__make} %install %{__rm} -rf %{buildroot} -%{__install} -m 755 -d %{buildroot}%{_mandir}/man1 %{__make} \ bindir=%{buildroot}%{_bindir} \ mandir=%{buildroot}%{_mandir} \ @@ -53,17 +49,19 @@ %files %defattr(-,root,root,0755) -%doc doc/* *.TXT gtkwaverc.sample +%doc doc/* *.TXT gtkwaverc.sample examples/ %{_bindir}/gtkwave %{_bindir}/lxt2miner %{_bindir}/lxt2vcd %{_bindir}/mvl2lxt %{_bindir}/mvl2vcd +%{_bindir}/rtlbrowse %{_bindir}/tex2vcd %{_bindir}/tla2vcd %{_bindir}/vcd2lxt %{_bindir}/vcd2lxt2 %{_bindir}/vcd2vzt +%{_bindir}/vertex %{_bindir}/vzt2vcd %{_bindir}/vztminer %{_mandir}/man1/gtkwave.1* @@ -71,15 +69,31 @@ %{_mandir}/man1/lxt2vcd.1* %{_mandir}/man1/mvl2lxt.1* %{_mandir}/man1/mvl2vcd.1* +%{_mandir}/man1/rtlbrowse.1* %{_mandir}/man1/tex2vcd.1* %{_mandir}/man1/tla2vcd.1* %{_mandir}/man1/vcd2lxt.1* %{_mandir}/man1/vcd2lxt2.1* %{_mandir}/man1/vcd2vzt.1* +%{_mandir}/man1/vertex.1* %{_mandir}/man1/vzt2vcd.1* %{_mandir}/man1/vztminer.1* +%{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 9 2006 Paul Howarth 3.0.1-1 +- update to 3.0.1 + +* Tue May 2 2006 Paul Howarth 3.0.0-1 +- update to 3.0.0 +- add examples directory as %%doc +- add new buildreq gperf +- tweak Makefile.in edits to handle Makefiles under contrib/ +- add new binaries rtlbrowse and vertex +- add new manpages for rtlbrowse, vertex, and gtkwaverc +- %%{_mandir} no longer needs to be created manually +- configure script now accepts --libdir + * Tue Mar 7 2006 Paul Howarth 1.3.86-1 - update to 1.3.86 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 13:28:21 -0000 1.9 +++ sources 9 May 2006 09:45:56 -0000 1.10 @@ -1 +1 @@ -8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz +4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 13:28:21 -0000 1.9 +++ .cvsignore 9 May 2006 09:45:56 -0000 1.10 @@ -1 +1 @@ -gtkwave-1.3.86.tgz +gtkwave-3.0.1.tgz From fedora-extras-commits at redhat.com Tue May 9 09:50:16 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Tue, 9 May 2006 02:50:16 -0700 Subject: rpms/par2cmdline/devel par2cmdline-packed.patch, NONE, 1.1 par2cmdline.spec, 1.1, 1.2 Message-ID: <200605090950.k499oITM030756@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30735 Modified Files: par2cmdline.spec Added Files: par2cmdline-packed.patch Log Message: Added a new patch, to kill warnings, and try to fix ppc compilation error. par2cmdline-packed.patch: --- NEW FILE par2cmdline-packed.patch --- diff -ur par2cmdline-0.4-orig/letype.h par2cmdline-0.4/letype.h --- par2cmdline-0.4-orig/letype.h 2003-05-26 20:01:17.000000000 +0200 +++ par2cmdline-0.4/letype.h 2006-05-09 10:47:29.000000000 +0200 @@ -28,44 +28,15 @@ #else -class leu16 +struct leu16 { -public: - leu16(void); - - leu16(const leu16 &other); - leu16& operator=(const leu16 &other); - - leu16(const u16 &other); leu16& operator=(const u16 &other); operator u16(void) const; -protected: u16 value; }; -inline leu16::leu16(void) -{ -} - -inline leu16::leu16(const leu16 &other) -: value(other.value) -{ -} - -inline leu16& leu16::operator =(const leu16 &other) -{ - value = other.value; - return *this; -} - -inline leu16::leu16(const u16 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); -} - inline leu16& leu16::operator=(const u16 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); @@ -81,46 +52,15 @@ } -class leu32 +struct leu32 { -public: - leu32(void); - - leu32(const leu32 &other); - leu32& operator=(const leu32 &other); - - leu32(const u32 &other); leu32& operator=(const u32 &other); operator u32(void) const; -protected: u32 value; }; -inline leu32::leu32(void) -{ -} - -inline leu32::leu32(const leu32 &other) -: value(other.value) -{ -} - -inline leu32& leu32::operator =(const leu32 &other) -{ - value = other.value; - return *this; -} - -inline leu32::leu32(const u32 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); - ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); - ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); -} - inline leu32& leu32::operator=(const u32 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); @@ -140,50 +80,15 @@ } -class leu64 +struct leu64 { -public: - leu64(void); - - leu64(const leu64 &other); - leu64& operator=(const leu64 &other); - - leu64(const u64 &other); leu64& operator=(const u64 &other); operator u64(void) const; -protected: u64 value; }; -inline leu64::leu64(void) -{ -} - -inline leu64::leu64(const leu64 &other) -: value(other.value) -{ -} - -inline leu64& leu64::operator =(const leu64 &other) -{ - value = other.value; - return *this; -} - -inline leu64::leu64(const u64 &other) -{ - ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); - ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); - ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); - ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); - ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff); - ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff); - ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff); - ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff); -} - inline leu64& leu64::operator=(const u64 &other) { ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); diff -ur par2cmdline-0.4-orig/md5.h par2cmdline-0.4/md5.h --- par2cmdline-0.4-orig/md5.h 2003-08-02 01:41:04.000000000 +0200 +++ par2cmdline-0.4/md5.h 2006-05-09 10:47:29.000000000 +0200 @@ -20,6 +20,13 @@ #ifndef __MD5_H__ #define __MD5_H__ +#ifdef WIN32 +#pragma pack(push, 1) +#define PACKED +#else +#define PACKED __attribute__ ((packed)) +#endif + // This file defines the MD5Hash and MD5Context objects which are used // to compute and manipulate the MD5 Hash values for a block of data. @@ -35,12 +42,11 @@ // MD5 Hash value -class MD5Hash -{ -public: - // Constructor does not initialise the value - MD5Hash(void) {}; +struct MD5Hash; +ostream& operator<<(ostream &s, const MD5Hash &hash); +struct MD5Hash +{ // Comparison operators bool operator==(const MD5Hash &other) const; bool operator!=(const MD5Hash &other) const; @@ -54,13 +60,8 @@ friend ostream& operator<<(ostream &s, const MD5Hash &hash); string print(void) const; - // Copy and assignment - MD5Hash(const MD5Hash &other); - MD5Hash& operator=(const MD5Hash &other); - -public: u8 hash[16]; // 16 byte MD5 Hash value -}; +} PACKED; // Intermediate computation state @@ -144,16 +145,9 @@ return !other.operator<(*this); } -inline MD5Hash::MD5Hash(const MD5Hash &other) -{ - memcpy(&hash, &other.hash, sizeof(hash)); -} - -inline MD5Hash& MD5Hash::operator=(const MD5Hash &other) -{ - memcpy(&hash, &other.hash, sizeof(hash)); - - return *this; -} +#ifdef WIN32 +#pragma pack(pop) +#endif +#undef PACKED #endif // __MD5_H__ Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/par2cmdline.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- par2cmdline.spec 9 May 2006 06:59:19 -0000 1.1 +++ par2cmdline.spec 9 May 2006 09:50:16 -0000 1.2 @@ -1,11 +1,12 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch +Patch1: par2cmdline-packed.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 @@ -21,6 +22,7 @@ %prep %setup %patch0 -p1 +%patch1 -p1 sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build @@ -44,6 +46,9 @@ %{_bindir}/* %changelog +* Tue May 9 2006 Laurent Rineau - 0.4-8 +- Added a new patch, to kill warnings, and try to fix ppc compilation error. + * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. - Add %check section From fedora-extras-commits at redhat.com Tue May 9 13:34:32 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Tue, 9 May 2006 06:34:32 -0700 Subject: rpms/liboil/FC-4 .cvsignore, 1.6, 1.7 liboil.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200605091334.k49DYYoA010546@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboil/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10525 Modified Files: .cvsignore liboil.spec sources Log Message: update to new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2006 09:45:55 -0000 1.6 +++ .cvsignore 9 May 2006 13:34:31 -0000 1.7 @@ -1 +1 @@ -liboil-0.3.7.tar.gz +liboil-0.3.8.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/liboil.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- liboil.spec 3 Feb 2006 09:45:55 -0000 1.11 +++ liboil.spec 9 May 2006 13:34:31 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.7 +Version: 0.3.8 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -64,6 +64,7 @@ %files %defattr(-, root, root, 0755) %doc ChangeLog +%{_bindir}/oil-bugreport %{_libdir}/*.so.* %files devel @@ -77,6 +78,10 @@ %changelog +* Mon May 08 2006 Thomas Vander Stichele +- 0.3.8-1 +- update to new upstream version + * Fri Feb 3 2006 Matthias Saou 0.3.7-1 - Update to 0.3.7. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2006 09:45:55 -0000 1.6 +++ sources 9 May 2006 13:34:31 -0000 1.7 @@ -1 +1 @@ -1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz +a402c4af2603c8fb69b365af0b8ec775 liboil-0.3.8.tar.gz From fedora-extras-commits at redhat.com Tue May 9 14:35:52 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Tue, 9 May 2006 07:35:52 -0700 Subject: rpms/adns/FC-5 adns.spec,1.7,1.8 Message-ID: <200605091435.k49EZseg013023@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/adns/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13006 Modified Files: adns.spec Log Message: More work done - added -fPIC, removed DESTDIR patch Index: adns.spec =================================================================== RCS file: /cvs/extras/rpms/adns/FC-5/adns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- adns.spec 8 May 2006 17:50:06 -0000 1.7 +++ adns.spec 9 May 2006 14:35:52 -0000 1.8 @@ -1,6 +1,6 @@ Name: adns Version: 1.2 -Release: 1 +Release: 2 Summary: Advanced, easy to use, asynchronous-capable DNS client library @@ -8,7 +8,6 @@ License: GPL URL: http://www.chiark.greenend.org.uk/~ian/adns/ Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz -Patch0: %{name}-DESTDIR.patch Patch1: %{name}-ac_fix.patch Patch2: %{name}-autoconf-noexpand.patch #BuildRequires: autoconf @@ -71,20 +70,23 @@ %prep %setup -q -%patch0 -p1 -b .destdir %patch1 -p1 -b .ac_fix %patch2 -p1 -b .noexpand %build #aclocal #%{__autoconf} +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" %configure --enable-dynamic make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -ln -sf libadns.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libadns.so +make install \ + prefix=$RPM_BUILD_ROOT/usr \ + bin_dir=$RPM_BUILD_ROOT%{_bindir} \ + include_dir=$RPM_BUILD_ROOT%{_includedir} \ + lib_dir=$RPM_BUILD_ROOT%{_libdir} %clean rm -fr $RPM_BUILD_ROOT @@ -108,6 +110,11 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Tue May 9 2006 Mihai Ibanescu 1.2-2 +- Dropped the DESTDIR patch since it was not accepted upstream. +- Added -fPIC in the compiled flags, otherwise we won't be able to link + against this library. + * Mon May 8 2006 Mihai Ibanescu 1.2-1 - Updated to 1.2, some of the patches were already upstream - Removed dependency on autoconf/automake since it builds just fine without From fedora-extras-commits at redhat.com Tue May 9 15:40:10 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 9 May 2006 08:40:10 -0700 Subject: rpms/plplot/FC-5 plplot-5.6.0-x.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 plplot.spec, 1.9, 1.10 sources, 1.5, 1.6 plplot-5.5.3-buffer.patch, 1.1, NONE plplot-5.5.3-check.patch, 1.1, NONE plplot-5.5.3-x.patch, 1.1, NONE Message-ID: <200605091540.k49FeC1r016455@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16431 Modified Files: .cvsignore plplot.spec sources Added Files: plplot-5.6.0-x.patch Removed Files: plplot-5.5.3-buffer.patch plplot-5.5.3-check.patch plplot-5.5.3-x.patch Log Message: - Update to 5.6.0 with new psttf driver - Add wxGTK support plplot-5.6.0-x.patch: --- NEW FILE plplot-5.6.0-x.patch --- --- plplot-5.6.0/configure.orig 2006-04-25 10:53:26.000000000 -0600 +++ plplot-5.6.0/configure 2006-04-25 10:58:30.000000000 -0600 @@ -30155,1411 +30155,10 @@ - - -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XtMalloc (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -fi - -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_nospace=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_space=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_space=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder at skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - - if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -int -main () -{ -connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != remove; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 - - if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -int -main () -{ -remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmat; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 - - if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -int -main () -{ -shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); -int -main () -{ -IceConnectionNumber (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - -if test "$have_x" != "yes"; then - enable_xwin="no" -fi - - - -if test "$enable_xwin" = yes; then - enable_xwin_TRUE= - enable_xwin_FALSE='#' -else - enable_xwin_TRUE='#' - enable_xwin_FALSE= -fi - +enable_xwin=yes +enable_xwin_TRUE= +enable_xwin_FALSE='#' +have_x=yes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Dec 2005 23:37:42 -0000 1.5 +++ .cvsignore 9 May 2006 15:40:10 -0000 1.6 @@ -1 +1 @@ -plplot-5.5.3.tar.gz +plplot-5.6.0.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plplot.spec 24 Feb 2006 22:04:56 -0000 1.9 +++ plplot.spec 9 May 2006 15:40:10 -0000 1.10 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.5.3 -Release: 12%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -11,11 +11,9 @@ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch -Patch2: plplot-5.5.3-buffer.patch Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch -Patch5: plplot-5.5.3-check.patch -Patch6: plplot-5.5.3-x.patch +Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel @@ -24,9 +22,10 @@ BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 BuildRequires: perl(XML::DOM) -#Temporary until bz #176313 is fixed -BuildRequires: libXau-devel, libXdmcp-devel -#BuildRequires: libunicode-devel +BuildRequires: lasi-devel +BuildRequires: wxGTK-devel +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description PLplot is a library of functions that are useful for making scientific @@ -127,14 +126,22 @@ %description tk-devel %{summary} + +%package wxGTK +Summary: Functions for scientific plotting with wxGTK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description wxGTK +%{summary} + + %prep %setup -q %patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig %patch3 -p1 -b .orig %patch4 -p1 -b .orig -%patch5 -p1 -b .orig %patch6 -p1 -b .orig @@ -142,7 +149,8 @@ %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ - --disable-wingcc --disable-aqt --disable-pdl + --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ + --with-prebuiltdoc make @@ -155,8 +163,6 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version} find $RPM_BUILD_ROOT -name \*.la | xargs rm -#Remove non-existant PDL dependency -rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl #Permissions find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x @@ -165,7 +171,14 @@ rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || : +fi %postun -p /sbin/ldconfig @@ -214,6 +227,8 @@ %{_libdir}/plplot%{version}/driversd/ps.so %{_libdir}/plplot%{version}/driversd/pstex.rc %{_libdir}/plplot%{version}/driversd/pstex.so +%{_libdir}/plplot%{version}/driversd/psttf.rc +%{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc @@ -229,6 +244,7 @@ %{python_sitelib}/plplotcanvas.py %{python_sitelib}/plplotcanvas.pyc %{python_sitelib}/plplotcanvas.pyo +%{_infodir}/plplotdoc.info* %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz %{_mandir}/man1/plrender.1.gz @@ -264,6 +280,7 @@ %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_mandir}/man3/pl*.3* %files gnome %defattr(-,root,root,-) @@ -315,7 +332,17 @@ %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ +%files wxGTK +%defattr(-,root,root,-) +%{_libdir}/plplot%{version}/driversd/wxwidgets.rc +%{_libdir}/plplot%{version}/driversd/wxwidgets.so + + %changelog +* Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 +- Update to 5.6.0 with new psttf driver +- Add wxGTK support + * Fri Feb 24 2006 - Orion Poplawski - 5.5.3-12 - Rebuild for FC5 gcc/glibc changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Dec 2005 23:37:42 -0000 1.5 +++ sources 9 May 2006 15:40:10 -0000 1.6 @@ -1 +1 @@ -6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz +0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz --- plplot-5.5.3-buffer.patch DELETED --- --- plplot-5.5.3-check.patch DELETED --- --- plplot-5.5.3-x.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 17:19:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 9 May 2006 10:19:22 -0700 Subject: rpms/perl-YAML/devel perl-YAML.spec, 1.8, 1.9 perl-YAML-testmore054.patch, 1.1, NONE Message-ID: <200605091719.k49HJOQG021440@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21419 Modified Files: perl-YAML.spec Removed Files: perl-YAML-testmore054.patch Log Message: Drop testmore patch. Catch Test::YAML module and man page in file list. Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-YAML.spec 4 May 2006 16:32:39 -0000 1.8 +++ perl-YAML.spec 9 May 2006 17:19:22 -0000 1.9 @@ -1,12 +1,11 @@ Name: perl-YAML Version: 0.58 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML Ain't Markup Language (tm) License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz -Patch0: %{name}-testmore054.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Test::Base) >= 0.49 @@ -23,7 +22,6 @@ %prep %setup -q -n YAML-%{version} -%patch0 -p0 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -50,10 +48,16 @@ %doc Changes README %{_bindir}/ysh %{perl_vendorlib}/YAML* +%{perl_vendorlib}/Test/YAML* %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* +%{_mandir}/man3/Test::YAML*.3* %changelog +* Tue May 09 2006 Steven Pritchard 0.58-2 +- Drop testmore patch. +- Catch Test::YAML module and man page in file list. + * Thu May 04 2006 Steven Pritchard 0.58-1 - Update to 0.58. - Small spec cleanups. --- perl-YAML-testmore054.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 17:48:55 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 9 May 2006 10:48:55 -0700 Subject: owners owners.list,1.966,1.967 Message-ID: <200605091748.k49HmvD8022831@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22814 Modified Files: owners.list Log Message: Maintainer change: scop -> jpo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.966 retrieving revision 1.967 diff -u -r1.966 -r1.967 --- owners.list 9 May 2006 07:05:30 -0000 1.966 +++ owners.list 9 May 2006 17:48:55 -0000 1.967 @@ -1052,7 +1052,7 @@ Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IPC-Cmd|Finding and running system commands made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 9 17:57:10 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 9 May 2006 10:57:10 -0700 Subject: rpms/plplot/FC-4 plplot-5.5.3-octave.patch, NONE, 1.1 plplot-5.5.3-x86_64.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 plplot.spec, 1.3, 1.4 sources, 1.4, 1.5 plplot-5.5.3-buffer.patch, 1.1, NONE Message-ID: <200605091757.k49HvC7e022906@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22879 Modified Files: .cvsignore plplot.spec sources Added Files: plplot-5.5.3-octave.patch plplot-5.5.3-x86_64.patch Removed Files: plplot-5.5.3-buffer.patch Log Message: - Update to 5.6.0 with new psttf driver - Add wxGTK support plplot-5.5.3-octave.patch: --- NEW FILE plplot-5.5.3-octave.patch --- --- plplot-5.5.3/bindings/octave/PLplot/figure.m.orig 2005-08-10 11:56:53.000000000 -0600 +++ plplot-5.5.3/bindings/octave/PLplot/figure.m 2005-08-10 12:00:39.000000000 -0600 @@ -49,9 +49,10 @@ if (!exist("__pl") || !struct_contains (__pl,"inited")) v = split(version ,'.'); - if (! (str2num(v(1,:)) >= 2 && - str2num(v(2,:)) >= 1 && - str2num(v(3,:)) >= 57)) + if (! ((str2num(v(1,:)) > 2) || + (str2num(v(1,:)) == 2 && str2num(v(2,:)) > 1) || + (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 1 && + str2num(v(3,:)) >= 57))) error("The PLplot-Octave scripts need an Octave version \n\ greater then or equal to 2.1.57.\n"); endif plplot-5.5.3-x86_64.patch: --- NEW FILE plplot-5.5.3-x86_64.patch --- --- plplot-5.5.3/cf/tcl.ac.orig 2005-08-10 11:46:11.000000000 -0600 +++ plplot-5.5.3/cf/tcl.ac 2005-08-10 11:46:47.000000000 -0600 @@ -78,6 +78,7 @@ $HOME/local/lib \ $HOME/lib \ /usr/local/lib \ +/usr/lib64 \ /usr/lib" incdirs=$incdirs_default Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Aug 2005 21:36:20 -0000 1.4 +++ .cvsignore 9 May 2006 17:57:10 -0000 1.5 @@ -1,4 +1 @@ -plplot-5.5.3.tar.gz -plplot-5.5.3-x86_64.patch -plplot-5.5.3-octave.patch -plplot-5.5.3-check.patch +plplot-5.6.0.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plplot.spec 11 Aug 2005 21:36:20 -0000 1.3 +++ plplot.spec 9 May 2006 17:57:10 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.5.3 -Release: 7%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -11,13 +11,10 @@ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch -Patch2: plplot-5.5.3-buffer.patch Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch -Patch5: plplot-5.5.3-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel %ifarch %{ix86} x86_64 BuildRequires: java-devel, libgcj-devel @@ -29,7 +26,10 @@ BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 BuildRequires: perl(XML::DOM) -#BuildRequires: libunicode-devel +BuildRequires: lasi-devel +BuildRequires: wxGTK-devel +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description PLplot is a library of functions that are useful for making scientific @@ -62,7 +62,7 @@ Requires: %{name} = %{version}-%{release} %description devel -%{summary} +%{summary}. %package gnome @@ -71,7 +71,7 @@ Requires: %{name} = %{version}-%{release} %description gnome -%{summary} +%{summary}. %package gnome-devel Summary: Development files for using PLplot GNOME @@ -81,7 +81,7 @@ Requires: %{name}-gnome = %{version}-%{release} %description gnome-devel -%{summary} +%{summary}. %ifarch %{ix86} x86_64 @@ -91,7 +91,7 @@ Requires: %{name} = %{version}-%{release} %description java -%{summary} +%{summary}. %package java-devel Summary: Development files for using PLplot GNOME @@ -101,7 +101,7 @@ Requires: %{name}-java = %{version}-%{release} %description java-devel -%{summary} +%{summary}. %endif @@ -111,7 +111,7 @@ Requires: %{name} = %{version}-%{release}, octave %description octave -%{summary} +%{summary}. %package tk @@ -120,7 +120,7 @@ Requires: %{name} = %{version}-%{release} %description tk -%{summary} +%{summary}. %package tk-devel Summary: Development files for using PLplot with Tk @@ -130,24 +130,32 @@ Requires: %{name}-tk = %{version}-%{release} %description tk-devel -%{summary} +%{summary}. + + +%package wxGTK +Summary: Functions for scientific plotting with wxGTK +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description wxGTK +%{summary}. + %prep %setup -q %patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig %patch3 -p1 -b .orig %patch4 -p1 -b .orig -%patch5 -p1 -b .orig %build -autoconf %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ - --disable-wingcc --disable-aqt --disable-pdl %{java_config} + --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ + --with-prebuiltdoc %{java_config} make @@ -160,8 +168,6 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version} find $RPM_BUILD_ROOT -name \*.la | xargs rm -#Remove non-existant PDL dependency -rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl #Permissions find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x @@ -170,7 +176,14 @@ rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || : +fi %postun -p /sbin/ldconfig @@ -219,6 +232,8 @@ %{_libdir}/plplot%{version}/driversd/ps.so %{_libdir}/plplot%{version}/driversd/pstex.rc %{_libdir}/plplot%{version}/driversd/pstex.so +%{_libdir}/plplot%{version}/driversd/psttf.rc +%{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc @@ -228,6 +243,7 @@ %{python_sitelib}/plplot_widgetmodule.so %{python_sitelib}/plplotc.py %{python_sitelib}/plplotcanvas.py +%{_infodir}/plplotdoc.info* %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz %{_mandir}/man1/plrender.1.gz @@ -263,6 +279,7 @@ %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_mandir}/man3/pl*.3* %files gnome %defattr(-,root,root,-) @@ -316,7 +333,17 @@ %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ +%files wxGTK +%defattr(-,root,root,-) +%{_libdir}/plplot%{version}/driversd/wxwidgets.rc +%{_libdir}/plplot%{version}/driversd/wxwidgets.so + + %changelog +* Tue May 9 2006 - Orion Poplawski - 5.6.0-1 +- Update to 5.6.0 with new psttf driver +- Add wxGTK support + * Thu Aug 11 2005 - Orion Poplawski - 5.5.3-7 - Breakout java into its own sub-package, don't build on non x86 - Add patch to use new octave in devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Aug 2005 21:36:20 -0000 1.4 +++ sources 9 May 2006 17:57:10 -0000 1.5 @@ -1,4 +1 @@ -6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz -02cc9f8eb72211581aae2bd38670252f plplot-5.5.3-x86_64.patch -7970faa7d90fe1e98e19354fd607a309 plplot-5.5.3-octave.patch -22f2761b863bf1f47fb37b7d7fb9ab85 plplot-5.5.3-check.patch +0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz --- plplot-5.5.3-buffer.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 9 18:03:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 9 May 2006 11:03:42 -0700 Subject: rpms/perl-IO-Tty/devel .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200605091803.k49I3iEm025235@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25217 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: - Update to 1.03. - Taking maintainership. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:38 -0000 1.2 +++ .cvsignore 9 May 2006 18:03:42 -0000 1.3 @@ -1 +1 @@ -IO-Tty-1.02.tar.gz +IO-Tty-1.03.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-IO-Tty.spec 14 Feb 2006 20:37:17 -0000 1.9 +++ perl-IO-Tty.spec 9 May 2006 18:03:42 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-IO-Tty -Version: 1.02 -Release: 5%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Perl interface to pseudo tty's License: GPL or Artistic @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IO::Tty and IO::Pty provide an interface to pseudo tty's. @@ -46,10 +47,14 @@ %doc ChangeLog README %{perl_vendorarch}/auto/IO/ %{perl_vendorarch}/IO/ -%{_mandir}/man3/IO::*ty*.3* +%{_mandir}/man3/IO::*ty*.3pm* %changelog +* Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. +- Taking maintainership. + * Tue Feb 14 2006 Ville Skytt?? - 1.02-5 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:38 -0000 1.2 +++ sources 9 May 2006 18:03:42 -0000 1.3 @@ -1 +1 @@ -875a8bc6e0643f4fc892dbe113e43286 IO-Tty-1.02.tar.gz +785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz From fedora-extras-commits at redhat.com Tue May 9 18:10:38 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Tue, 9 May 2006 11:10:38 -0700 Subject: rpms/apt/devel apt.spec,1.26,1.27 default.conf,1.8,1.9 Message-ID: <200605091810.k49IAeGe025673@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25654 Modified Files: apt.spec default.conf Log Message: Prepare for splitting off config files (no tag/build yet!). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- apt.spec 25 Apr 2006 18:47:24 -0000 1.26 +++ apt.spec 9 May 2006 18:10:38 -0000 1.27 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Base URL: http://apt-rpm.laiskiainen.org/ License: GPL @@ -32,20 +32,10 @@ Source50: preserve-conf.lua Source51: upgradevirt.lua -# 100-149 for sources.list.d -Source100: fedora-core.list -Source101: fedora-extras.list -Source102: fedora-updates.list - # 150-199 for apt.conf.d -# "factory defaults" for Fedora Core + Extras +# "factory defaults" Source150: default.conf -# 200-249 for additional trusted gpg keys - -# 250-299 for vendor.list.d -Source250: fedora-vendor.list - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # TODO: verify the required minimum Python version @@ -75,6 +65,7 @@ %if 0%{!?_with_groupinstall:1} Obsoletes: %{name}-groupinstall < %{version}-%{release} %endif +Requires: apt-config %description APT-RPM is a port of Debian's apt tools for RPM based distributions. @@ -175,15 +166,8 @@ install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ -# Default source list entries -for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do - install -pm 644 $source $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d/ -done - # install config parts install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ -install -pm 644 %{SOURCE250} \ - $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list # GPG keys mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ @@ -250,12 +234,12 @@ %config(noreplace) %{_sysconfdir}/apt/rpmpriorities %config(noreplace) %{_sysconfdir}/apt/sources.list %config(noreplace) %{_sysconfdir}/apt/vendors.list -# NOTE: no noreplace on *.d because we WANT to be able to change the defaults -# without user intervention! %dir %{_sysconfdir}/apt/apt.conf.d/ -%config %{_sysconfdir}/apt/apt.conf.d/default.conf -%config %{_sysconfdir}/apt/sources.list.d/ -%config %{_sysconfdir}/apt/vendors.list.d/ +# NOTE: no noreplace because we WANT to be able to change the defaults +# without user intervention! +%config %{_sysconfdir}/apt/apt.conf.d/defaults.conf +%dir %{_sysconfdir}/apt/sources.list.d/ +%dir %{_sysconfdir}/apt/vendors.list.d/ %config(noreplace) %{_sysconfdir}/sysconfig/apt %config %{_sysconfdir}/cron.daily/apt.cron @@ -308,7 +292,10 @@ %changelog -* Tue Apr 25 2006 Axel Thimm +* Mon May 8 2006 Axel Thimm - 0.5.15lorg3-2 +- Split off configuration files from apt. + +* Tue Apr 25 2006 Axel Thimm - 0.5.15lorg3-1 - Update to 0.5.15lorg3 final. - Fix URL. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- default.conf 23 Mar 2006 06:33:58 -0000 1.8 +++ default.conf 9 May 2006 18:10:38 -0000 1.9 @@ -17,7 +17,6 @@ { AllNames "false"; } - DistroVerPkg "fedora-release"; }; RPM @@ -55,7 +54,7 @@ // Options for the downloading routines Acquire { - http::User-Agent "Fedora APT-HTTP/1.3"; + http::User-Agent "APT-HTTP/1.3"; }; Scripts From fedora-extras-commits at redhat.com Tue May 9 18:39:25 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 9 May 2006 11:39:25 -0700 Subject: rpms/perl-IO-Tty/FC-5 .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200605091839.k49IdRHS026126@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26102 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: - Update to 1.03. - Taking maintainership. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:38 -0000 1.2 +++ .cvsignore 9 May 2006 18:39:25 -0000 1.3 @@ -1 +1 @@ -IO-Tty-1.02.tar.gz +IO-Tty-1.03.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/perl-IO-Tty.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-IO-Tty.spec 14 Feb 2006 20:37:17 -0000 1.9 +++ perl-IO-Tty.spec 9 May 2006 18:39:25 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-IO-Tty -Version: 1.02 -Release: 5%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: Perl interface to pseudo tty's License: GPL or Artistic @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IO::Tty and IO::Pty provide an interface to pseudo tty's. @@ -46,10 +47,14 @@ %doc ChangeLog README %{perl_vendorarch}/auto/IO/ %{perl_vendorarch}/IO/ -%{_mandir}/man3/IO::*ty*.3* +%{_mandir}/man3/IO::*ty*.3pm* %changelog +* Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. +- Taking maintainership. + * Tue Feb 14 2006 Ville Skytt?? - 1.02-5 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:38 -0000 1.2 +++ sources 9 May 2006 18:39:25 -0000 1.3 @@ -1 +1 @@ -875a8bc6e0643f4fc892dbe113e43286 IO-Tty-1.02.tar.gz +785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz From fedora-extras-commits at redhat.com Tue May 9 18:42:32 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 9 May 2006 11:42:32 -0700 Subject: rpms/perl-IO-Tty/FC-4 .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200605091842.k49IgYV5026228@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26207 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: Sync with FC-5 and devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:01:38 -0000 1.2 +++ .cvsignore 9 May 2006 18:42:31 -0000 1.3 @@ -1 +1 @@ -IO-Tty-1.02.tar.gz +IO-Tty-1.03.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/perl-IO-Tty.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-IO-Tty.spec 6 Apr 2005 22:12:45 -0000 1.7 +++ perl-IO-Tty.spec 9 May 2006 18:42:31 -0000 1.8 @@ -1,18 +1,16 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-IO-Tty -Version: 1.02 -Release: 3 - +Version: 1.03 +Release: 1%{?dist} Summary: Perl interface to pseudo tty's License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Tty/ -Source0: http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-1.02.tar.gz +Source0: http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IO::Tty and IO::Pty provide an interface to pseudo tty's. @@ -23,22 +21,20 @@ %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -49,13 +45,23 @@ %files %defattr(-,root,root,-) %doc ChangeLog README -%{perl_vendorarch}/auto/IO -%{perl_vendorarch}/IO -%{_mandir}/man3/*.3* +%{perl_vendorarch}/auto/IO/ +%{perl_vendorarch}/IO/ +%{_mandir}/man3/IO::*ty*.3pm* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. +- Taking maintainership. + +* Tue Feb 14 2006 Ville Skytt?? - 1.02-5 +- Rebuild. + +* Tue Jan 17 2006 Ville Skytt?? - 1.02-4 +- Rebuild, cosmetic cleanups. + +* Fri Apr 7 2005 Michael Schwendt - 1.02-3 - rebuilt * Sun Feb 1 2004 Ville Skytt?? - 0:1.02-0.fdr.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:01:38 -0000 1.2 +++ sources 9 May 2006 18:42:31 -0000 1.3 @@ -1 +1 @@ -875a8bc6e0643f4fc892dbe113e43286 IO-Tty-1.02.tar.gz +785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz From fedora-extras-commits at redhat.com Tue May 9 18:51:01 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Tue, 9 May 2006 11:51:01 -0700 Subject: fedora-security/audit fc4,1.236,1.237 fc5,1.149,1.150 Message-ID: <200605091851.k49Ip1dE026687@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26559/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-2271 and CVE-2006-2272 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- fc4 8 May 2006 19:02:36 -0000 1.236 +++ fc4 9 May 2006 18:50:58 -0000 1.237 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-2272 VULNERABLE (kernel) +CVE-2006-2271 VULNERABLE (kernel) CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- fc5 8 May 2006 19:02:36 -0000 1.149 +++ fc5 9 May 2006 18:50:58 -0000 1.150 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-2272 VULNERABLE (kernel) +CVE-2006-2271 VULNERABLE (kernel) CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] From fedora-extras-commits at redhat.com Tue May 9 19:10:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 9 May 2006 12:10:58 -0700 Subject: extras-buildsys/builder Builder.py,1.5,1.6 Message-ID: <200605091910.k49JAwFU029486@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29423/builder Modified Files: Builder.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - Handle the JobFiles request * common/Commands.py - Check arguments on PlgCommandJobFiles * server/ArchJob.py - pylint cleanups - Rework result files download code; archjob now requests result files from the builder, which knows how to handle builder-type specific result files operations - get_upload_dir() renamed to get_result_files_dir() * server/Builder.py - pylint cleanups - Move dispatching of common commands into the base Builder class - (_decompose_job_files_ack): new function; extract and return info from a JobFilesAck command - (_handle_job_files_ack): new function; handle a JobFilesAck in the builder-type specific manner. For Active builders, we don't have to do much since the file was uploaded to us by the builder itself * server/BuilderManager.py - (any_prepping_builders): fix usage of builder.alive() -> builder.available() * server/PackageJob.py - Small cleanup of result files bits 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 9 May 2006 06:04:48 -0000 1.5 +++ Builder.py 9 May 2006 19:10:51 -0000 1.6 @@ -447,6 +447,20 @@ uploader.start() return uploader + def _handle_job_files_request(self, cmd): + """Return a list of urls of the result files of this job.""" + archjob_id = cmd.archjob_id() + try: + job = self._all_jobs[archjob_id] + except KeyError: + return None + + # url-ify the file list + urls = [] + for fpath in job.files(): + urls.append("file:///%s" % os.path.basename(fpath)) + return Commands.PlgCommandJobFilesAck(archjob_id, urls, cmd.seq(), self._seq_gen.next()) + def _get_default_commands(self): """Return a python list of serialized commands that the builder sends to the server every time it contacts the server.""" @@ -505,6 +519,10 @@ reply = self._handle_job_status_request(cmd) if reply: self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandJobFiles): + reply = self._handle_job_files_request(cmd) + if reply: + self._queued_cmds.append(reply) def _process_server_response(self, response): """Process the server's response command stream.""" From fedora-extras-commits at redhat.com Tue May 9 19:10:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 9 May 2006 12:10:59 -0700 Subject: extras-buildsys/common Commands.py,1.5,1.6 Message-ID: <200605091911.k49JAxob029492@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29423/common Modified Files: Commands.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - Handle the JobFiles request * common/Commands.py - Check arguments on PlgCommandJobFiles * server/ArchJob.py - pylint cleanups - Rework result files download code; archjob now requests result files from the builder, which knows how to handle builder-type specific result files operations - get_upload_dir() renamed to get_result_files_dir() * server/Builder.py - pylint cleanups - Move dispatching of common commands into the base Builder class - (_decompose_job_files_ack): new function; extract and return info from a JobFilesAck command - (_handle_job_files_ack): new function; handle a JobFilesAck in the builder-type specific manner. For Active builders, we don't have to do much since the file was uploaded to us by the builder itself * server/BuilderManager.py - (any_prepping_builders): fix usage of builder.alive() -> builder.available() * server/PackageJob.py - Small cleanup of result files bits Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Commands.py 9 May 2006 02:53:03 -0000 1.5 +++ Commands.py 9 May 2006 19:10:56 -0000 1.6 @@ -567,6 +567,8 @@ """The files argument is a python list of output files from the job""" PlgCommandAck.__init__(self, CMD_NAME_JOB_FILES_ACK, req_seq, seq) self._archjob_id = archjob_id + if type(files) is not type([]): + raise ValueError("files argument must be a list of URLs.") self._files = files def _deserialize(args): From fedora-extras-commits at redhat.com Tue May 9 19:10:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 9 May 2006 12:10:59 -0700 Subject: extras-buildsys/server ArchJob.py, 1.30, 1.31 Builder.py, 1.39, 1.40 BuilderManager.py, 1.23, 1.24 PackageJob.py, 1.47, 1.48 Message-ID: <200605091910.k49JAxRn029497@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29423/server Modified Files: ArchJob.py Builder.py BuilderManager.py PackageJob.py Log Message: 2006-05-09 Dan Williams * builder/Builder.py - Handle the JobFiles request * common/Commands.py - Check arguments on PlgCommandJobFiles * server/ArchJob.py - pylint cleanups - Rework result files download code; archjob now requests result files from the builder, which knows how to handle builder-type specific result files operations - get_upload_dir() renamed to get_result_files_dir() * server/Builder.py - pylint cleanups - Move dispatching of common commands into the base Builder class - (_decompose_job_files_ack): new function; extract and return info from a JobFilesAck command - (_handle_job_files_ack): new function; handle a JobFilesAck in the builder-type specific manner. For Active builders, we don't have to do much since the file was uploaded to us by the builder itself * server/BuilderManager.py - (any_prepping_builders): fix usage of builder.alive() -> builder.available() * server/PackageJob.py - Small cleanup of result files bits Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ArchJob.py 9 May 2006 06:04:54 -0000 1.30 +++ ArchJob.py 9 May 2006 19:10:57 -0000 1.31 @@ -15,25 +15,13 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import time -import string -import xmlrpclib -import sys import socket import os import threading import urllib import OpenSSL -from plague import FileDownloader -from plague import CommonErrors +from plague import FileTransfer -DL_RETRIES = 'retries' -DL_STATUS = 'status' -DL_WAIT_TIME = 'wait_time' - -STATUS_WAITING = 'waiting' -STATUS_ERROR = 'error' -STATUS_INPROGRESS = 'in-progress' -STATUS_DONE = 'done' class ArchJob: """ Tracks a single build instance for a single arch on a builder """ @@ -50,8 +38,7 @@ self._internal_failure = False self._target_dict = target_dict self._builder_gone = False - self._download_lock = threading.Lock() - self._downloads = {} + self._result_files = {} self._starttime = time.time() self._endtime = 0 self._die = False @@ -66,12 +53,12 @@ self._failure_noticed = True def _builder_finished(self): - if self._builder_status == 'done' or self._builder_status == 'killed' or self._builder_status == 'failed' or self._builder_status == 'orphaned': + if self._builder_status in ['done', 'killed', 'failed', 'orphaned']: return True return False def builder_failed(self): - if self._builder_status == 'killed' or self._builder_status == 'failed': + if self._builder_status in ['killed', 'failed']: return True return False @@ -129,23 +116,6 @@ self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) del attrdict - def _dl_files(self): - files = [] - success = False - try: - files = self._server.files(self.jobid) - success = True - except socket.error, e: - if not CommonErrors.canIgnoreSocketError(e): - print "%s (%s/%s): [ %s ] Unknown error getting file list: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self._builder.address(), e) - except socket.timeout, e: - print "%s (%s/%s): [ %s ] Timeout getting file list: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self._builder.address(), e) - except xmlrpclib.ProtocolError, e: - pass - return (success, files) - def _is_done_status(self): if self._status == 'done': return True @@ -178,111 +148,50 @@ if self._builder_status != 'prepping': self._prepping = False - # if the builder is done, grab list of files to download if self._builder_finished(): - (success, files) = self._dl_files() - if success: - self._set_status('downloading') - for f in files: - uf = urllib.unquote(f) - dl_dict = {} - dl_dict[DL_STATUS] = STATUS_WAITING - dl_dict[DL_RETRIES] = 0 - dl_dict[DL_WAIT_TIME] = 0 - self._downloads[uf] = dl_dict - - def dl_callback(self, status, cb_data, err_msg): - url = cb_data - self._download_lock.acquire() - dl_dict = self._downloads[url] - if status == 'done': - dl_dict[DL_STATUS] = STATUS_DONE - elif status == 'failed': - # Retry the download up to 10 times, then fail it - if dl_dict[DL_RETRIES] >= 10: - dl_dict[DL_STATUS] = STATUS_ERROR - else: - print "%s (%s/%s): Failed to retrieve %s (attempt %d) (Error %s), trying again..." % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES], err_msg) - dl_dict[DL_STATUS] = STATUS_WAITING - dl_dict[DL_WAIT_TIME] = 5 # Wait a bit before trying again - dl_dict[DL_RETRIES] = dl_dict[DL_RETRIES] + 1 - self._download_lock.release() + self._set_status('downloading') + self._builder.request_job_files(self.jobid) - def _print_downloaded_files(self): + def get_result_files_dir(self): + result_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) + if not os.path.exists(result_dir): + os.makedirs(result_dir) + return result_dir + + def _print_downloaded_files(self, files): file_string = "" - ndownloads = len(self._downloads.keys()) - for url in self._downloads.keys(): - filename = os.path.basename(url) - string = "'" + filename + "'" - dl_dict = self._downloads[url] - if dl_dict[DL_STATUS] == STATUS_ERROR: + nresults = len(files.keys()) + for fname in files.keys(): + string = "'" + fname + "'" + if files[fname] == FileTransfer.FT_RESULT_FAILED: string = string + " (failed)" file_string = file_string + string - if url != self._downloads.keys()[ndownloads - 1]: + if fname != files.keys()[nresults - 1]: file_string = file_string + ", " print "%s (%s/%s): Build result files - [ %s ]" % (self.par_job.uid, self.par_job.package, self._target_dict['arch'], file_string) - def get_upload_dir(self): - upload_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) - if not os.path.exists(upload_dir): - os.makedirs(upload_dir) - return upload_dir + def download_cb(self, files): + """Called by the Builder to notify us that our job's files are available. + The files argument should be a list of _filenames_, not paths. All files + are assumed to be in the directory returned by get_result_files_dir.""" + if len(files.keys()) == 0: + self._download_failed = True + else: + for fname in files.keys(): + if files[fname] == FileTransfer.FT_RESULT_FAILED: + self._download_failed = True + self._result_files = files + self._print_downloaded_files(self._result_files) + + self._endtime = time.time() + self._set_status('done') + self.par_job.wake() def _status_downloading(self): - # Start grabbing the next undownloaded file, but only - # if we aren't already pulling one down - undownloaded = False - failed = False - self._download_lock.acquire() - for url in self._downloads.keys(): - dl_dict = self._downloads[url] - dl_status = dl_dict[DL_STATUS] - if dl_status == STATUS_WAITING: - # If the download got retried due to a previous - # download error, we may have to wait a bit - if dl_dict[DL_WAIT_TIME] > 0: - dl_dict[DL_WAIT_TIME] = dl_dict[DL_WAIT_TIME] - 1 - undownloaded = True - continue - - # Otherwise, spawn the download thread to grab the file - target_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) - if not os.path.exists(target_dir): - os.makedirs(target_dir) - - try: - dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url, - target_dir, ['.rpm', '.log'], self._certs) - dl_thread.start() - undownloaded = True - dl_dict[DL_STATUS] = STATUS_INPROGRESS - except FileDownloader.FileNameException, e: - print "%s (%s/%s): [ %s ] Bad file name error getting %s: '%s'" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self._builder.address(), url, e) - # Hard error, we don't retry this one - dl_dict[DL_STATUS] = STATUS_ERROR - break - elif dl_status == STATUS_INPROGRESS: - undownloaded = True - break - elif dl_status == STATUS_ERROR: - failed = True - continue - elif dl_status == STATUS_DONE: - continue - self._download_lock.release() - - # All done downloading? - if not undownloaded: - self._print_downloaded_files() - self._endtime = time.time() - if failed: - self._download_failed = True - self._set_status('done') - self.par_job.wake() + # Wait to be notified that our files are downloaded + pass def process(self): if self._is_done_status(): @@ -323,20 +232,11 @@ return self._status def get_files(self): - """ Return a list of base filenames we got from the builder """ + """Return a list result files that we got from the builder""" files = [] - for url in self._downloads.keys(): - try: - fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) - dl_dict = self._downloads[url] - dl_status = dl_dict[DL_STATUS] - if dl_status == STATUS_DONE: - files.append(fname) - except FileDownloader.FileNameException, e: - # Just ignore the file then - print "%s (%s/%s): Illegal file name. Error: '%s', URL: %s" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], e, url) - pass + for fname in self._result_files.keys(): + if self._result_files[fname] == FileTransfer.FT_RESULT_SUCCESS: + files.append(fname) return files def builder_gone(self): Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- Builder.py 9 May 2006 06:09:53 -0000 1.39 +++ Builder.py 9 May 2006 19:10:57 -0000 1.40 @@ -17,18 +17,17 @@ import time import string import xmlrpclib -import sys import socket import os import urllib import threading from plague import Commands from plague import XMLRPCServerProxy -from plague import CommonErrors +from plague import FileDownloader +from plague import FileTransfer import OpenSSL import ArchJob import EmailUtils -import Config from plague import DebugUtils SUSPEND_NONE = 'none' @@ -214,7 +213,6 @@ # and its not done, explicitly get its status job = self._jobs[jobid] if jobid not in reported_uniqids and job.get_status() != 'done': - print "Requesting job status for %s" % jobid new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) # Check for prepping jobs @@ -252,6 +250,9 @@ parent.add_arch_job(archjob) def _handle_job_status_ack(self, ack): + """Handle a job status ack by setting telling the job object + what the builder said its status was.""" + old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandJobStatus) if old_cmd: archjob_id = ack.archjob_id() @@ -259,6 +260,51 @@ job = self._jobs[archjob_id] job.set_builder_job_status(status) + def _decompose_job_files_ack(self, ack): + """Handle a job files ack by finding the archjob it's for, then + notifying that archjob that its files are available.""" + old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandJobFiles) + if old_cmd: + archjob_id = ack.archjob_id() + files = ack.files() + job = self._jobs[archjob_id] + return (job, files) + return (None, None) + + def _dispatch_common_command(self, cmd): + """Handle commands that are common to all builder types.""" + handled = True + if isinstance(cmd, Commands.PlgCommandSlots): + self._lock.acquire() + self._free_slots = cmd.free_slots() + self._num_slots = cmd.max_slots() + self._lock.release() + elif isinstance(cmd, Commands.PlgCommandTargets): + self._lock.acquire() + self._target_list = cmd.targets() + self._lock.release() + elif isinstance(cmd, Commands.PlgCommandNewJobAck): + self._handle_new_job_ack(cmd) + elif isinstance(cmd, Commands.PlgCommandBuildingJobs): + status_reqs = self._handle_building_jobs(cmd) + # Add any additional status requests onto our pending command queue + if len(status_reqs) > 0: + self._lock.acquire() + self._cmd_queue = self._cmd_queue + status_reqs + self._lock.release() + elif isinstance(cmd, Commands.PlgCommandJobStatusAck): + self._handle_job_status_ack(cmd) + else: + handled = False + return handled + + def request_job_files(self, archjob_id): + """Construct and send a request for a job's files.""" + cmd = Commands.PlgCommandJobFiles(archjob_id, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt @@ -543,38 +589,49 @@ self._cmd_queue.append(cmd) self._lock.release() - def request_job_files(self, archjob): - pass + def _handle_job_files_ack(self, cmd): + (archjob, urls) = self._decompose_job_files_ack(cmd) + if not archjob: + return + + if not urls or not len(urls): + archjob.download_cb({}) + return + + # Basic sanity checks; whether the files exist, etc + result_files_dir = archjob.get_result_files_dir() + files = {} + for url in urls: + try: + fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) + except FileDownloader.FileNameException, exc: + print "Error in JobFilesAck for %s: %s" % (url, exc) + continue + fpath = os.path.join(result_files_dir, fname) + if os.path.exists(fpath): + files[fname] = FileTransfer.FT_RESULT_SUCCESS + else: + files[fname] = FileTransfer.FT_RESULT_FAILED + archjob.download_cb(files) def _dispatch_command(self, cmd): - name = cmd.name() - if isinstance(cmd, Commands.PlgCommandSlots): - self._lock.acquire() - self._free_slots = cmd.free_slots() - self._num_slots = cmd.max_slots() - self._lock.release() - elif isinstance(cmd, Commands.PlgCommandTargets): - self._lock.acquire() - self._target_list = cmd.targets() - self._lock.release() - elif isinstance(cmd, Commands.PlgCommandNewJobAck): - self._handle_new_job_ack(cmd) - elif isinstance(cmd, Commands.PlgCommandBuildingJobs): - status_reqs = self._handle_building_jobs(cmd) - # Add any additional status requests onto our pending command queue - if len(status_reqs) > 0: - self._lock.acquire() - self._cmd_queue = self._cmd_queue + status_reqs - self._lock.release() - elif isinstance(cmd, Commands.PlgCommandJobStatusAck): - self._handle_job_status_ack(cmd) - else: + """Dispatch one command. We let the superclass dispatch the common + commands, and handle only those that need action specific to the + Active builder type.""" + handled = self._dispatch_common_command(cmd) + if not handled: + if isinstance(cmd, Commands.PlgCommandJobFilesAck): + self._handle_job_files_ack(cmd) + handled = True + + if not handled: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) def request(self, cmd_list): """Process and respond to an active builder's request. Called from the BuildMaster's XML-RPC server.""" + # Reset unavailability counters and reactivate builder if needed self._last_contact = time.time() self._unavail_count = 0 if not self._available: @@ -594,15 +651,19 @@ new_cmds.append(cmd) self._lock.acquire() + # Copy command queue self._cmd_queue = self._cmd_queue + new_cmds cmd_list = self._cmd_queue[:] - # Remove commands that don't require an ack + + # Remove commands that don't require an ack, + # since we don't need to keep track of those tmp_cmd_queue = [] for cmd in self._cmd_queue: if cmd.need_ack(): tmp_cmd_queue.append(cmd) self._cmd_queue = tmp_cmd_queue + self._lock.release() return cmd_list Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- BuilderManager.py 9 May 2006 06:04:54 -0000 1.23 +++ BuilderManager.py 9 May 2006 19:10:57 -0000 1.24 @@ -216,7 +216,7 @@ if jobid and filename and tmpfile: archjob = builder.get_archjob(jobid) if archjob: - upload_dir = archjob.get_upload_dir() + upload_dir = archjob.get_result_files_dir() import shutil, urllib destpath = os.path.join(upload_dir, urllib.unquote(filename)) dest = file(destpath, "w+b") @@ -369,7 +369,7 @@ def any_prepping_builders(self): # query each build builder for any jobs that are in the 'prepping' state for builder in self._builders: - if builder.alive() and builder.any_prepping_jobs(): + if builder.available() and builder.any_prepping_jobs(): return True return False Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- PackageJob.py 9 May 2006 02:52:58 -0000 1.47 +++ PackageJob.py 9 May 2006 19:10:57 -0000 1.48 @@ -849,10 +849,11 @@ for job in self.archjobs.values(): if not job: continue + job_result_dir = job.get_result_files_dir() for f in job.get_files(): if not f.endswith(".rpm"): continue - src_file = os.path.join(self._result_dir, job.arch(), f) + src_file = os.path.join(job_result_dir, f) if src_file.endswith(".src.rpm"): # Keep an SRPM. We prefer built SRPMs from builders over # the original SRPM. @@ -874,16 +875,16 @@ for job in self.archjobs.values(): if not job: continue + job_result_dir = job.get_result_files_dir() for f in job.get_files(): if not f.endswith(".rpm"): continue - jobarch = job.arch() - src_file = os.path.join(self._result_dir, jobarch, f) + src_file = os.path.join(job_result_dir, f) verrel = "%s-%s" % (self.ver, self.release) if f.endswith(".src.rpm"): dst_path = os.path.join(repo_dir, self._target_str, self.name, verrel, "SRPM") else: - dst_path = os.path.join(repo_dir, self._target_str, self.name, verrel, jobarch) + dst_path = os.path.join(repo_dir, self._target_str, self.name, verrel, job.arch()) self.repofiles[src_file] = os.path.join(dst_path, f) self._event.clear() From fedora-extras-commits at redhat.com Tue May 9 19:10:53 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 9 May 2006 12:10:53 -0700 Subject: extras-buildsys ChangeLog,1.191,1.192 Message-ID: <200605091911.k49JBNIx029504@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29423 Modified Files: ChangeLog Log Message: 2006-05-09 Dan Williams * builder/Builder.py - Handle the JobFiles request * common/Commands.py - Check arguments on PlgCommandJobFiles * server/ArchJob.py - pylint cleanups - Rework result files download code; archjob now requests result files from the builder, which knows how to handle builder-type specific result files operations - get_upload_dir() renamed to get_result_files_dir() * server/Builder.py - pylint cleanups - Move dispatching of common commands into the base Builder class - (_decompose_job_files_ack): new function; extract and return info from a JobFilesAck command - (_handle_job_files_ack): new function; handle a JobFilesAck in the builder-type specific manner. For Active builders, we don't have to do much since the file was uploaded to us by the builder itself * server/BuilderManager.py - (any_prepping_builders): fix usage of builder.alive() -> builder.available() * server/PackageJob.py - Small cleanup of result files bits Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- ChangeLog 9 May 2006 06:04:47 -0000 1.191 +++ ChangeLog 9 May 2006 19:10:50 -0000 1.192 @@ -1,6 +1,36 @@ 2006-05-09 Dan Williams * builder/Builder.py + - Handle the JobFiles request + + * common/Commands.py + - Check arguments on PlgCommandJobFiles + + * server/ArchJob.py + - pylint cleanups + - Rework result files download code; archjob now requests result files + from the builder, which knows how to handle builder-type specific + result files operations + - get_upload_dir() renamed to get_result_files_dir() + + * server/Builder.py + - pylint cleanups + - Move dispatching of common commands into the base Builder class + - (_decompose_job_files_ack): new function; extract and return info + from a JobFilesAck command + - (_handle_job_files_ack): new function; handle a JobFilesAck in the + builder-type specific manner. For Active builders, we don't have + to do much since the file was uploaded to us by the builder itself + + * server/BuilderManager.py + - (any_prepping_builders): fix usage of builder.alive() -> builder.available() + + * server/PackageJob.py + - Small cleanup of result files bits + +2006-05-09 Dan Williams + + * builder/Builder.py - (upload_files): fix extraction of server address, and pass the jobid to the server so it knows what the result files are for From fedora-extras-commits at redhat.com Tue May 9 19:16:54 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 12:16:54 -0700 Subject: rpms/gcompris/devel gcompris-7.4-xf86vidmode.patch, 1.1, 1.2 gcompris.spec, 1.6, 1.7 Message-ID: <200605091916.k49JGuWe029587@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29565 Modified Files: gcompris-7.4-xf86vidmode.patch gcompris.spec Log Message: * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcompris-7.4-xf86vidmode.patch 6 May 2006 22:42:38 -0000 1.1 +++ gcompris-7.4-xf86vidmode.patch 9 May 2006 19:16:54 -0000 1.2 @@ -1,5 +1,5 @@ --- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-09 19:51:54.000000000 +0200 @@ -1094,7 +1094,7 @@ --disable-sdltest Do not try to compile and run a test SDL program --disable-glibtest do not try to compile and run a test GLIB program @@ -201,7 +201,7 @@ echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" --- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-09 19:51:54.000000000 +0200 @@ -141,5 +141,5 @@ /* Version number of package */ #undef VERSION @@ -210,8 +210,8 @@ -#undef XRANDR +/* XF86VidMode Available */ +#undef XF86_VIDMODE ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-09 19:51:54.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } @@ -223,8 +223,301 @@ Py_INCREF(Py_True); return Py_True; } else { +--- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-09 12:35:04.000000000 +0200 +@@ -2008,7 +2008,7 @@ + case 1: + fleur = gdk_cursor_new(get_resize_cursor(anchor)); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2031,7 +2031,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + } +@@ -2179,7 +2179,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2296,7 +2296,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + +--- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-09 12:35:04.000000000 +0200 +@@ -472,7 +472,7 @@ + gnome_canvas_item_raise_to_top(data->item); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(data->item, ++ gcompris_canvas_item_grab(data->item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -513,7 +513,7 @@ + disc_h = gdk_pixbuf_get_height(pixmap)/2; + gdk_pixbuf_unref(pixmap); + +- gnome_canvas_item_ungrab(data->item, event->button.time); ++ gcompris_canvas_item_ungrab(data->item, event->button.time); + dragging = FALSE; + + /* Search the column (x) where this item is ungrabbed */ +--- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -663,7 +663,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -710,7 +710,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-09 12:35:04.000000000 +0200 +@@ -645,7 +645,7 @@ + gnome_canvas_item_raise_to_top(data->item_text); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(data->item, ++ gcompris_canvas_item_grab(data->item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -679,7 +679,7 @@ + PieceItem *piece_dst; + gint col, line; + +- gnome_canvas_item_ungrab(data->item, event->button.time); ++ gcompris_canvas_item_ungrab(data->item, event->button.time); + dragging = FALSE; + + /* Search the column (x) where this item is ungrabbed */ +--- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-09 12:35:04.000000000 +0200 +@@ -839,7 +839,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + gnome_canvas_item_raise_to_top(item); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -909,7 +909,7 @@ + gnome_canvas_item_move(item, ofset_x, ofset_y); + } + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + + position_display(position); +--- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -1103,7 +1103,7 @@ + gnome_canvas_item_raise_to_top(shape_list_root_item); + gnome_canvas_item_raise_to_top(item); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -1143,7 +1143,7 @@ + { + Shape *targetshape = NULL; + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + + targetshape = find_closest_shape(item_x - offset_x, +@@ -1304,7 +1304,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -1341,7 +1341,7 @@ + if(dragging) + { + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + gnome_canvas_item_raise_to_top(item); + dragging = FALSE; + +--- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -578,7 +578,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -608,7 +608,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-09 12:35:04.000000000 +0200 +@@ -522,7 +522,7 @@ + gnome_canvas_item_raise_to_top(item); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -577,7 +577,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -598,7 +598,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -683,7 +683,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-09 12:35:04.000000000 +0200 +@@ -417,7 +417,7 @@ + cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + else + cursor=gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, + cursor, + event->button.time); +@@ -495,7 +495,7 @@ + dx=CLAMP(item_x-start_x,-39,39); + + if (thiscar->goal && big_x==250+OFSET_X) { +- gnome_canvas_item_ungrab(item,event->button.time); ++ gcompris_canvas_item_ungrab(item,event->button.time); + gnome_canvas_item_hide(item); + moving=FALSE; + +@@ -573,7 +573,7 @@ + dy=*ptr-y; + + gnome_canvas_item_move(item,dx,dy); +- gnome_canvas_item_ungrab(item,event->button.time); ++ gcompris_canvas_item_ungrab(item,event->button.time); + hit=0; + moving=FALSE; + } +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-09 19:51:55.000000000 +0200 +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen): ++ gtk.gdk.pointer_ungrab() + + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) + + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -221,6 +226,9 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-09 19:51:54.000000000 +0200 +@@ -159,6 +159,12 @@ + + void gcompris_confirm_stop (void); + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" --- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-07 00:29:58.000000000 +0200 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-09 20:51:10.000000000 +0200 @@ -33,12 +33,13 @@ #include "cursor.h" @@ -330,13 +623,16 @@ } #endif -@@ -811,39 +802,18 @@ +@@ -811,39 +802,11 @@ */ void gcompris_set_fullscreen(gboolean state) { - -- if(state) -- { ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { -#ifdef XRANDR - gint i; - /* Search the 800x600 Resolution */ @@ -366,22 +662,11 @@ - xrandr_set_config( xrandr ); - } - } -+ properties->fullscreen = state; -+ /* We need to grab the pointer before doing the vidmode switch otherwise the -+ setviewport may be "canceled" by the pointer being outside the viewport */ -+ if(properties->fullscreen) -+ gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME); -+ -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(properties->fullscreen); - #endif -+ if(properties->fullscreen) -+ { +-#endif gdk_window_set_decorations (window->window, 0); gdk_window_set_functions (window->window, 0); gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +821,7 @@ +@@ -851,20 +814,6 @@ } else { @@ -399,11 +684,53 @@ - } - xr_previous_size_set = FALSE; -#endif -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); /* The hide must be done at least for KDE */ gtk_widget_hide (window); gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -1044,68 +1001,136 @@ +@@ -876,6 +825,42 @@ + + } + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1029,129 @@ g_printerr ("%s: %s\n\n", "gcompris", message); } @@ -510,57 +837,49 @@ + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode)) + { -+ g_warning("XF86VidMode couldnot get current mode, not switching resolution"); -+ properties->fullscreen = FALSE; -+ return; ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; + } + + /* Do we need to switch? */ -+ if ((mode.hdisplay == BOARDWIDTH) && -+ (mode.vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) + { -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ return; -+ } ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; + -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ { -+ g_warning("XF86VidMode couldnot get modes not switching resolution"); -+ properties->fullscreen = FALSE; -+ return; -+ } -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ for (i = 0; i < mode_count; i++) + { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) + { -+ g_warning("XF86VidMode couldnot switch resolution"); -+ properties->fullscreen = FALSE; ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; + } -+ break; + } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); + } -+ if (i == mode_count) -+ { -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ properties->fullscreen = FALSE; -+ } -+ XFree(modes); ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) ++ g_warning("XF86VidMode couldnot change viewport"); + } + else + { @@ -579,6 +898,7 @@ + g_warning("XF86VidMode couldnot restore original resolution"); + + } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, @@ -588,7 +908,7 @@ } #endif -@@ -1185,9 +1210,9 @@ +@@ -1185,9 +1231,9 @@ properties->fullscreen = TRUE; } @@ -600,8 +920,8 @@ } if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-09 19:51:54.000000000 +0200 @@ -160,7 +160,7 @@ tmp->fx = 1; tmp->screensize = 1; @@ -622,8 +942,8 @@ g_warning("Config file parsing error on token %s", token); } else if(!strcmp(value.v_identifier, "timer")) { if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-09 19:51:54.000000000 +0200 @@ -28,7 +28,7 @@ gint music; gint fx; @@ -634,7 +954,7 @@ gint defaultcursor; gint timer; --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-09 19:51:54.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gcompris.spec 7 May 2006 06:37:37 -0000 1.6 +++ gcompris.spec 9 May 2006 19:16:54 -0000 1.7 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -479,6 +479,9 @@ %changelog +* Tue May 9 2006 Hans de Goede 7.4-9 +- Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. + * Sun May 7 2006 Hans de Goede 7.4-8 - Change Xrandr BR to Xxf86vm BR. From fedora-extras-commits at redhat.com Tue May 9 19:18:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 12:18:43 -0700 Subject: rpms/gcompris/FC-5 gcompris-7.4-xf86vidmode.patch, 1.1, 1.2 gcompris.spec, 1.5, 1.6 Message-ID: <200605091918.k49JIjYa029683@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29661 Modified Files: gcompris-7.4-xf86vidmode.patch gcompris.spec Log Message: * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcompris-7.4-xf86vidmode.patch 7 May 2006 06:29:43 -0000 1.1 +++ gcompris-7.4-xf86vidmode.patch 9 May 2006 19:18:43 -0000 1.2 @@ -1,5 +1,5 @@ --- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-09 19:51:54.000000000 +0200 @@ -1094,7 +1094,7 @@ --disable-sdltest Do not try to compile and run a test SDL program --disable-glibtest do not try to compile and run a test GLIB program @@ -201,7 +201,7 @@ echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" --- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-09 19:51:54.000000000 +0200 @@ -141,5 +141,5 @@ /* Version number of package */ #undef VERSION @@ -210,8 +210,8 @@ -#undef XRANDR +/* XF86VidMode Available */ +#undef XF86_VIDMODE ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-09 19:51:54.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } @@ -223,8 +223,301 @@ Py_INCREF(Py_True); return Py_True; } else { +--- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-09 12:35:04.000000000 +0200 +@@ -2008,7 +2008,7 @@ + case 1: + fleur = gdk_cursor_new(get_resize_cursor(anchor)); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2031,7 +2031,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + } +@@ -2179,7 +2179,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2296,7 +2296,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + +--- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-09 12:35:04.000000000 +0200 +@@ -472,7 +472,7 @@ + gnome_canvas_item_raise_to_top(data->item); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(data->item, ++ gcompris_canvas_item_grab(data->item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -513,7 +513,7 @@ + disc_h = gdk_pixbuf_get_height(pixmap)/2; + gdk_pixbuf_unref(pixmap); + +- gnome_canvas_item_ungrab(data->item, event->button.time); ++ gcompris_canvas_item_ungrab(data->item, event->button.time); + dragging = FALSE; + + /* Search the column (x) where this item is ungrabbed */ +--- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -663,7 +663,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -710,7 +710,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-09 12:35:04.000000000 +0200 +@@ -645,7 +645,7 @@ + gnome_canvas_item_raise_to_top(data->item_text); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(data->item, ++ gcompris_canvas_item_grab(data->item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -679,7 +679,7 @@ + PieceItem *piece_dst; + gint col, line; + +- gnome_canvas_item_ungrab(data->item, event->button.time); ++ gcompris_canvas_item_ungrab(data->item, event->button.time); + dragging = FALSE; + + /* Search the column (x) where this item is ungrabbed */ +--- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-09 12:35:04.000000000 +0200 +@@ -839,7 +839,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + gnome_canvas_item_raise_to_top(item); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -909,7 +909,7 @@ + gnome_canvas_item_move(item, ofset_x, ofset_y); + } + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + + position_display(position); +--- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -1103,7 +1103,7 @@ + gnome_canvas_item_raise_to_top(shape_list_root_item); + gnome_canvas_item_raise_to_top(item); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -1143,7 +1143,7 @@ + { + Shape *targetshape = NULL; + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + + targetshape = find_closest_shape(item_x - offset_x, +@@ -1304,7 +1304,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -1341,7 +1341,7 @@ + if(dragging) + { + +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + gnome_canvas_item_raise_to_top(item); + dragging = FALSE; + +--- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -578,7 +578,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -608,7 +608,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-09 12:35:04.000000000 +0200 +@@ -522,7 +522,7 @@ + gnome_canvas_item_raise_to_top(item); + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -577,7 +577,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-09 12:35:04.000000000 +0200 +@@ -598,7 +598,7 @@ + y = item_y; + + fleur = gdk_cursor_new(GDK_FLEUR); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -683,7 +683,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + } + break; +--- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-09 12:35:04.000000000 +0200 +@@ -417,7 +417,7 @@ + cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + else + cursor=gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, + cursor, + event->button.time); +@@ -495,7 +495,7 @@ + dx=CLAMP(item_x-start_x,-39,39); + + if (thiscar->goal && big_x==250+OFSET_X) { +- gnome_canvas_item_ungrab(item,event->button.time); ++ gcompris_canvas_item_ungrab(item,event->button.time); + gnome_canvas_item_hide(item); + moving=FALSE; + +@@ -573,7 +573,7 @@ + dy=*ptr-y; + + gnome_canvas_item_move(item,dx,dy); +- gnome_canvas_item_ungrab(item,event->button.time); ++ gcompris_canvas_item_ungrab(item,event->button.time); + hit=0; + moving=FALSE; + } +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-09 19:51:55.000000000 +0200 +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen): ++ gtk.gdk.pointer_ungrab() + + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) + + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -221,6 +226,9 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-09 19:51:54.000000000 +0200 +@@ -159,6 +159,12 @@ + + void gcompris_confirm_stop (void); + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" --- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-07 00:29:58.000000000 +0200 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-09 20:51:10.000000000 +0200 @@ -33,12 +33,13 @@ #include "cursor.h" @@ -330,13 +623,16 @@ } #endif -@@ -811,39 +802,18 @@ +@@ -811,39 +802,11 @@ */ void gcompris_set_fullscreen(gboolean state) { - -- if(state) -- { ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { -#ifdef XRANDR - gint i; - /* Search the 800x600 Resolution */ @@ -366,22 +662,11 @@ - xrandr_set_config( xrandr ); - } - } -+ properties->fullscreen = state; -+ /* We need to grab the pointer before doing the vidmode switch otherwise the -+ setviewport may be "canceled" by the pointer being outside the viewport */ -+ if(properties->fullscreen) -+ gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME); -+ -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(properties->fullscreen); - #endif -+ if(properties->fullscreen) -+ { +-#endif gdk_window_set_decorations (window->window, 0); gdk_window_set_functions (window->window, 0); gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +821,7 @@ +@@ -851,20 +814,6 @@ } else { @@ -399,11 +684,53 @@ - } - xr_previous_size_set = FALSE; -#endif -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); /* The hide must be done at least for KDE */ gtk_widget_hide (window); gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -1044,68 +1001,136 @@ +@@ -876,6 +825,42 @@ + + } + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1029,129 @@ g_printerr ("%s: %s\n\n", "gcompris", message); } @@ -510,57 +837,49 @@ + if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), &i, &mode)) + { -+ g_warning("XF86VidMode couldnot get current mode, not switching resolution"); -+ properties->fullscreen = FALSE; -+ return; ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; + } + + /* Do we need to switch? */ -+ if ((mode.hdisplay == BOARDWIDTH) && -+ (mode.vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) + { -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ return; -+ } ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; + -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ { -+ g_warning("XF86VidMode couldnot get modes not switching resolution"); -+ properties->fullscreen = FALSE; -+ return; -+ } -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ for (i = 0; i < mode_count; i++) + { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) + { -+ g_warning("XF86VidMode couldnot switch resolution"); -+ properties->fullscreen = FALSE; ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; + } -+ break; + } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); + } -+ if (i == mode_count) -+ { -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ properties->fullscreen = FALSE; -+ } -+ XFree(modes); ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) ++ g_warning("XF86VidMode couldnot change viewport"); + } + else + { @@ -579,6 +898,7 @@ + g_warning("XF86VidMode couldnot restore original resolution"); + + } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( + gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, @@ -588,7 +908,7 @@ } #endif -@@ -1185,9 +1210,9 @@ +@@ -1185,9 +1231,9 @@ properties->fullscreen = TRUE; } @@ -600,8 +920,8 @@ } if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-09 19:51:54.000000000 +0200 @@ -160,7 +160,7 @@ tmp->fx = 1; tmp->screensize = 1; @@ -622,8 +942,8 @@ g_warning("Config file parsing error on token %s", token); } else if(!strcmp(value.v_identifier, "timer")) { if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-07 00:25:10.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-07 00:25:10.000000000 +0200 +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-09 19:51:54.000000000 +0200 @@ -28,7 +28,7 @@ gint music; gint fx; @@ -634,7 +954,7 @@ gint defaultcursor; gint timer; --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-07 00:25:10.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-09 19:51:54.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gcompris.spec 7 May 2006 06:39:15 -0000 1.5 +++ gcompris.spec 9 May 2006 19:18:43 -0000 1.6 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -479,6 +479,9 @@ %changelog +* Tue May 9 2006 Hans de Goede 7.4-9 +- Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. + * Sun May 7 2006 Hans de Goede 7.4-8 - Change Xrandr BR to Xxf86vm BR. From fedora-extras-commits at redhat.com Tue May 9 19:19:16 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 9 May 2006 12:19:16 -0700 Subject: rpms/pessulus import.log,1.2,1.3 Message-ID: <200605091919.k49JJIEx029778@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29747 Modified Files: import.log Log Message: auto-import pessulus-0.10.1-1 on branch devel from pessulus-0.10.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pessulus/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 May 2006 21:10:11 -0000 1.2 +++ import.log 9 May 2006 19:19:16 -0000 1.3 @@ -1 +1,2 @@ pessulus-0_10_1-1_fc6:HEAD:pessulus-0.10.1-1.fc6.src.rpm:1147122603 +pessulus-0_10_1-1:HEAD:pessulus-0.10.1-1.src.rpm:1147202351 From fedora-extras-commits at redhat.com Tue May 9 19:19:17 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 9 May 2006 12:19:17 -0700 Subject: rpms/pessulus/devel pessulus.spec,1.1,1.2 Message-ID: <200605091919.k49JJJLm029782@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29747/devel Modified Files: pessulus.spec Log Message: auto-import pessulus-0.10.1-1 on branch devel from pessulus-0.10.1-1.src.rpm Index: pessulus.spec =================================================================== RCS file: /cvs/extras/rpms/pessulus/devel/pessulus.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pessulus.spec 8 May 2006 21:10:12 -0000 1.1 +++ pessulus.spec 9 May 2006 19:19:16 -0000 1.2 @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, pygtk2-devel, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2 +BuildRequires: gtk2-devel, pygtk2-devel >= 2.6.0, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2 BuildRequires: gettext Requires: pygtk2, gnome-python2, gnome-python2-gconf From fedora-extras-commits at redhat.com Tue May 9 19:26:20 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:26:20 -0700 Subject: rpms/gauche-gl/devel - New directory Message-ID: <200605091926.k49JQMSn030835@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786/gauche-gl/devel Log Message: Directory /cvs/extras/rpms/gauche-gl/devel added to the repository From fedora-extras-commits at redhat.com Tue May 9 19:26:19 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:26:19 -0700 Subject: rpms/gauche-gl - New directory Message-ID: <200605091926.k49JQLut030828@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786/gauche-gl Log Message: Directory /cvs/extras/rpms/gauche-gl added to the repository From fedora-extras-commits at redhat.com Tue May 9 19:26:35 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:26:35 -0700 Subject: rpms/gauche-gl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605091926.k49JQbYB030968@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30921 Added Files: Makefile import.log Log Message: Setup of module gauche-gl --- NEW FILE Makefile --- # Top level Makefile for module gauche-gl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 9 19:26:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:26:36 -0700 Subject: rpms/gauche-gl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605091926.k49JQclA030979@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30921/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gauche-gl --- NEW 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 May 9 19:27:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:27:29 -0700 Subject: rpms/gauche-gl import.log,1.1,1.2 Message-ID: <200605091927.k49JRV0w031354@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31306 Modified Files: import.log Log Message: auto-import gauche-gl-0.4.1-4.fc5 on branch devel from gauche-gl-0.4.1-4.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 May 2006 19:26:35 -0000 1.1 +++ import.log 9 May 2006 19:27:29 -0000 1.2 @@ -0,0 +1 @@ +gauche-gl-0_4_1-4_fc5:HEAD:gauche-gl-0.4.1-4.fc5.src.rpm:1147202841 From fedora-extras-commits at redhat.com Tue May 9 19:27:30 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 12:27:30 -0700 Subject: rpms/gauche-gl/devel Gauche-gl-fix.patch, NONE, 1.1 gauche-gl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605091927.k49JRWbP031366@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31306/devel Modified Files: .cvsignore sources Added Files: Gauche-gl-fix.patch gauche-gl.spec Log Message: auto-import gauche-gl-0.4.1-4.fc5 on branch devel from gauche-gl-0.4.1-4.fc5.src.rpm Gauche-gl-fix.patch: --- NEW FILE Gauche-gl-fix.patch --- --- Gauche-gl-0.4/src/gauche-gl.c.fix 2005-07-01 23:58:51.000000000 +0200 +++ Gauche-gl-0.4/src/gauche-gl.c 2005-07-01 23:59:01.000000000 +0200 @@ -136,11 +136,7 @@ supports GLX for the time being. */ void *Scm_GLGetProcAddress(const char *name) { -#if defined(GLX_VERSION_1_4) - if (glXGetProcAddress != NULL) { - return glXGetProcAddress(name); - } -#elif defined(GLX_ARB_get_proc_address) +#if defined(GLX_ARB_get_proc_address) if (glXGetProcAddressARB != NULL) { return glXGetProcAddressARB(name); } --- NEW FILE gauche-gl.spec --- %define gauche_version 0.8.7 Name: gauche-gl Version: 0.4.1 Release: 4%{?dist} Summary: OpenGL binding for Gauche Group: Development/Languages License: BSD URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-gl-0.4.1.tgz Patch0: Gauche-gl-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gauche-devel = %{gauche_version} BuildRequires: freeglut-devel BuildRequires: libSM-devel BuildRequires: libXext-devel BuildRequires: libXi-devel BuildRequires: libXmu-devel BuildRequires: texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description OpenGL binding for Gauche. %prep %setup -q -n Gauche-gl-%{version} %patch0 -p1 (cd src; mv gauche-gl.c.orig gauche-gl.c) %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # no japanese info docs rm -f $RPM_BUILD_ROOT%{_infodir}/gauche-gl-refj.* # make .so files executable find $RPM_BUILD_ROOT -name '*.so' -exec chmod 0755 '{}' ';' # include file not necessary rm -rf $RPM_BUILD_ROOT%{_libdir}/gauche/%{gauche_version}/include # correct end-of-line-encoding sed -i 's/\r//' examples/slbook/ogl2particle/* examples/slbook/ogl2brick/* # these are not necessary rm -f examples/glbook/run rm -f examples/slbook/ogl2particle/run.sh %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/%{name}-refe.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}-refe.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) %{_libdir}/gauche %{_datadir}/gauche %{_infodir}/gauche-gl-refe.* %doc COPYING examples %changelog * Fri May 5 2006 Gerard Milmeister - 0.4.1-4 - cleaned up Requires - removed unnecessary files * Sun Nov 6 2005 Gerard Milmeister - 0.4.1-1 - New Version 0.4.1 * Fri Jul 1 2005 Gerard Milmeister - 0.4-1 - New Version 0.4 * Wed Feb 23 2005 Gerard Milmeister - 0:0.3.1-1 - New Version 0.3.1 * Mon Nov 10 2003 Gerard Milmeister - 0:0.3-0.fdr.1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 May 2006 19:26:36 -0000 1.1 +++ .cvsignore 9 May 2006 19:27:29 -0000 1.2 @@ -0,0 +1 @@ +Gauche-gl-0.4.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 May 2006 19:26:36 -0000 1.1 +++ sources 9 May 2006 19:27:29 -0000 1.2 @@ -0,0 +1 @@ +a51b19a0f16f88ed6cd85c6e49cc6e75 Gauche-gl-0.4.1.tgz From fedora-extras-commits at redhat.com Tue May 9 19:28:49 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Tue, 9 May 2006 12:28:49 -0700 Subject: extras-buildsys/utils extras-push-all,1.4,1.5 Message-ID: <200605091928.k49JSnuH031958@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31883 Modified Files: extras-push-all Log Message: add umask to sanity tests. Index: extras-push-all =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extras-push-all 8 May 2006 14:21:38 -0000 1.4 +++ extras-push-all 9 May 2006 19:28:47 -0000 1.5 @@ -27,6 +27,10 @@ echo "ERROR: ~/.rpmmacros must be pointing at /srv/extras-push/.rpmmacros." exit 1 fi +if [ "`umask`" != "0002" ]; then + echo "ERROR: umask must be 0002." + exit 1 +fi # Sign & Push [ "$1" = "-f" ] && force=yes || force= From fedora-extras-commits at redhat.com Tue May 9 19:44:48 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 12:44:48 -0700 Subject: rpms/njam/devel njam-1.25-leveledit.patch, NONE, 1.1 njam.spec, 1.1, 1.2 Message-ID: <200605091944.k49Jiosp004049@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/njam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4020 Modified Files: njam.spec Added Files: njam-1.25-leveledit.patch Log Message: * Tue May 9 2006 Hans de Goede 1.25-3 - Add Patch2, which fixes the leveleditor to save custom made levels under $HOME/.njam-levels instead of trying to write them under /usr/share. Also teach njam to look for levels under both $HOME/.njam-levels and /usr/share (bug 188078). njam-1.25-leveledit.patch: --- NEW FILE njam-1.25-leveledit.patch --- --- njam-1.25-src/src/njamutils.h.leveledit 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njamutils.h 2006-05-09 19:40:37.000000000 +0200 @@ -25,6 +25,10 @@ void NjamSetRect(SDL_Rect& rect, int x, int y, int w=0, int h=0); SDLKey NjamGetch(bool Wait); int NjamRandom(int MaxValue); +#ifdef __linux__ +char *NjamGetHomeDir(); +int NjamCheckAndCreateDir(const char *name); +#endif typedef enum { fxBlackWhite, fxDarken } tEffect; bool SurfaceEffect(SDL_Surface *surface, SDL_Rect& r, tEffect Effect = fxBlackWhite); --- njam-1.25-src/src/njam.cpp.leveledit 2006-05-09 19:40:37.000000000 +0200 +++ njam-1.25-src/src/njam.cpp 2006-05-09 19:40:37.000000000 +0200 @@ -350,6 +350,12 @@ bool NjamEngine::Init(bool Fullscreen, bool SoftwareSurface, bool UseDGA) { #ifdef __linux__ + // Check if $HOME/.njam-levels exists and if it doesn't create it + char buf[512]; + char *home = NjamGetHomeDir(); + snprintf(buf, sizeof(buf), "%s/.njam-levels", home? home:""); + NjamCheckAndCreateDir(buf); + sprintf(linux_sdl_driver, "x11\0"); char *driver_name = getenv("SDL_VIDEODRIVER"); if (driver_name) @@ -624,7 +630,9 @@ // Load user settings from .conf file LogFile("Opening njam.conf file.\n"); +#ifndef __linux__ char *home = getenv("HOME"); +#endif std::string njamconf("njam.conf"); if (home) njamconf = std::string(home) + "/.njamconf"; --- njam-1.25-src/src/njam.h.leveledit 2006-05-09 21:06:37.000000000 +0200 +++ njam-1.25-src/src/njam.h 2006-05-09 21:07:42.000000000 +0200 @@ -98,6 +98,7 @@ struct list_item { char item_text[50]; + char item_path[512]; struct list_item *next; struct list_item *prev; }; @@ -192,7 +193,7 @@ void LevelEditor(); // level editor (njamedit.cpp) void RenderEditor(bool, int, int, int); bool EnterFileName(char *file_name); - int SelectMap(char type, char *filename = NULL); + int SelectMap(char type, char *filename = NULL, int filename_size = 0); struct list_item *SelectFromList(struct list_item *first); void Message(char *text); bool Query(char *text); --- njam-1.25-src/src/njamedit.cpp.leveledit 2005-12-13 12:56:42.000000000 +0100 +++ njam-1.25-src/src/njamedit.cpp 2006-05-09 21:06:08.000000000 +0200 @@ -41,7 +41,7 @@ { int level_type = 0; // cooperative int level_type_was = 0; - char filename[250]; + char filename[512]; filename[0] = '\0'; int x=2, y=1; @@ -90,7 +90,7 @@ if (key == SDLK_l) // select file from directory { - if (SelectMap('A', filename) > -1) + if (SelectMap('A', filename, sizeof(filename)) > -1) { int w=0; while (filename[w]) @@ -127,12 +127,20 @@ { if (EnterFileName(filename)) { - char buf[250]; + char buf[512]; char types[2][5] = { "COOP", "DUEL" }; - sprintf(buf, "levels/%s.%s\0", filename, types[level_type]); - sprintf(filename, "%s\0", buf); +#ifdef __linux__ + char *home = NjamGetHomeDir(); + snprintf(buf, sizeof(buf), + "%s/.njam-levels/%s.%s", + home? home:"", +#else + snprintf(buf, sizeof(buf), + "levels/%s.%s", +#endif + filename, types[level_type]); LogFile::LogFile("Saving maps"); - m_Maps.Save(filename); + m_Maps.Save(buf); level_type_was = level_type; changed = false; } @@ -458,51 +466,72 @@ } } //--------------------------------------------------------------------------- -int NjamEngine::SelectMap(char type, char *filename) +int NjamEngine::SelectMap(char type, char *filename, int filename_size) { struct list_item *first = NULL; - // open folder, load all entries + // open folders, load all entries DIR *dir; struct dirent *ent; + int i; + char dirname[512] = "levels"; - if ((dir = opendir("levels")) == NULL) +#ifdef __linux__ + for (i=0; i<2; i++) { - printf("Unable to open directory\n"); - return -1; - } + if (i==0) + { +#endif + if ((dir = opendir(dirname)) == NULL) + { + printf("Unable to open directory\n"); + return -1; + } +#ifdef __linux__ + } + else + { + char *home = NjamGetHomeDir(); - while ((ent = readdir(dir)) != NULL) - { - // check if last letter of name maches: - int p = 0; - while (ent->d_name[p]) - p++; + snprintf(dirname, sizeof(dirname), "%s/.njam-levels", + home? home:""); + if ((dir = opendir(dirname)) == NULL) + break; + } +#endif + while ((ent = readdir(dir)) != NULL) + { + // check if last letter of name maches: + int p = 0; + while (ent->d_name[p]) + p++; - char c = ent->d_name[p-1]; - if (c != 'P' && c != 'L') - continue; + char c = ent->d_name[p-1]; + if (c != 'P' && c != 'L') + continue; - if (type != 'A' && c != type) - continue; + if (type != 'A' && c != type) + continue; - struct list_item *new_file = new struct list_item; - new_file->next = first; - new_file->prev = NULL; - if (first) - first->prev = new_file; - first = new_file; + struct list_item *new_file = new struct list_item; + new_file->next = first; + new_file->prev = NULL; + if (first) + first->prev = new_file; + first = new_file; - // copy file name - for (int i=0; ent->d_name[i] && i<29; i++) - { - first->item_text[i] = ent->d_name[i]; - first->item_text[i+1] = '\0'; + // copy file name + snprintf(first->item_text, sizeof(first->item_text), + "%s", ent->d_name); + snprintf(first->item_path, sizeof(first->item_path), + "%s/%s", dirname, ent->d_name); } - } - if (closedir(dir) != 0) - printf("Unable to close directory\n"); + if (closedir(dir) != 0) + printf("Unable to close directory\n"); +#ifdef __linux__ + } +#endif // show and let player select if more than one levelset struct list_item *selected; @@ -514,11 +543,10 @@ int result = 0; // no levels loaded (so far) if (selected) { - char file_name[200]; - sprintf(file_name, "levels/%s\0", selected->item_text); - result = m_Maps.Load(file_name); + result = m_Maps.Load(selected->item_path); if (filename) - sprintf(filename, "%s\0", file_name); + snprintf(filename, filename_size, "%s", + selected->item_path); } while (first) // free memory --- njam-1.25-src/src/njamutils.cpp.leveledit 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njamutils.cpp 2006-05-09 19:40:37.000000000 +0200 @@ -162,3 +162,83 @@ return true; } //----------------------------------------------------------------------------- +#ifdef __linux__ +#include +#include +#include +#include +#include +#if defined(__DECC) && defined(VMS) +#include +static char *vms_to_unix_buffer = NULL; +static int convert_vms_to_unix(char *vms_dir_name) +{ + vms_to_unix_buffer = vms_dir_name; +} +#endif + +char *NjamGetHomeDir() +{ + struct passwd *pw; + + if (!(pw = getpwuid(getuid()))) + { + fprintf(stderr, "Who are you? Not found in passwd database!!\n"); + return NULL; + } + +#if defined(__DECC) && defined(VMS) + /* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix + Format. */ + decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1); + return vms_to_unix_buffer; +#else + return pw->pw_dir; +#endif +} +//----------------------------------------------------------------------------- +int NjamCheckAndCreateDir(const char *name) +{ + struct stat stat_buffer; + + if (stat(name, &stat_buffer)) + { + /* error check if it doesn't exist or something else is wrong */ + if (errno == ENOENT) + { + /* doesn't exist letts create it ;) */ +#ifdef BSD43 + if (mkdir(name, 0775)) +#else + if (mkdir(name, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH)) +#endif + { + fprintf(stderr, "Error creating dir %s", name); + perror(" "); + return -1; + } + } + else + { + /* something else went wrong yell about it */ + fprintf(stderr, "Error opening %s", name); + perror(" "); + return -1; + } + } + else + { + /* file exists check it's a dir otherwise yell about it */ +#ifdef BSD43 + if (!(S_IFDIR & stat_buffer.st_mode)) +#else + if (!S_ISDIR(stat_buffer.st_mode)) +#endif + { + fprintf(stderr,"Error %s exists but isn't a dir\n", name); + return -1; + } + } + return 0; +} +#endif Index: njam.spec =================================================================== RCS file: /cvs/extras/rpms/njam/devel/njam.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- njam.spec 29 Mar 2006 19:45:02 -0000 1.1 +++ njam.spec 9 May 2006 19:44:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: njam Version: 1.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maze-game, eat all the cookies while avoiding the badguys Group: Amusements/Games License: GPL @@ -10,6 +10,7 @@ Source2: njam.desktop Patch0: njam-1.25-drop-setgid.patch Patch1: njam-1.25-html.patch +Patch2: njam-1.25-leveledit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel SDL_net-devel BuildRequires: ImageMagick desktop-file-utils @@ -26,6 +27,7 @@ %setup -q -n %{name}-%{version}-src %patch0 -p1 -z .setgid %patch1 -p1 +%patch2 -p1 -z .leveledit %build @@ -96,6 +98,12 @@ %changelog +* Tue May 9 2006 Hans de Goede 1.25-3 +- Add Patch2, which fixes the leveleditor to save custom made levels under + $HOME/.njam-levels instead of trying to write them under /usr/share. + Also teach njam to look for levels under both $HOME/.njam-levels and + /usr/share (bug 188078). + * Tue Mar 28 2006 Hans de Goede 1.25-2 - Cleaned up description in spec and man using the cleaner description provided in bz 186813 From fedora-extras-commits at redhat.com Tue May 9 19:46:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 12:46:28 -0700 Subject: rpms/njam/FC-5 njam-1.25-leveledit.patch, NONE, 1.1 njam.spec, 1.1, 1.2 Message-ID: <200605091946.k49JkUVm004384@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/njam/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4357 Modified Files: njam.spec Added Files: njam-1.25-leveledit.patch Log Message: * Tue May 9 2006 Hans de Goede 1.25-3 - Add Patch2, which fixes the leveleditor to save custom made levels under $HOME/.njam-levels instead of trying to write them under /usr/share. Also teach njam to look for levels under both $HOME/.njam-levels and /usr/share (bug 188078). njam-1.25-leveledit.patch: --- NEW FILE njam-1.25-leveledit.patch --- --- njam-1.25-src/src/njamutils.h.leveledit 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njamutils.h 2006-05-09 19:40:37.000000000 +0200 @@ -25,6 +25,10 @@ void NjamSetRect(SDL_Rect& rect, int x, int y, int w=0, int h=0); SDLKey NjamGetch(bool Wait); int NjamRandom(int MaxValue); +#ifdef __linux__ +char *NjamGetHomeDir(); +int NjamCheckAndCreateDir(const char *name); +#endif typedef enum { fxBlackWhite, fxDarken } tEffect; bool SurfaceEffect(SDL_Surface *surface, SDL_Rect& r, tEffect Effect = fxBlackWhite); --- njam-1.25-src/src/njam.cpp.leveledit 2006-05-09 19:40:37.000000000 +0200 +++ njam-1.25-src/src/njam.cpp 2006-05-09 19:40:37.000000000 +0200 @@ -350,6 +350,12 @@ bool NjamEngine::Init(bool Fullscreen, bool SoftwareSurface, bool UseDGA) { #ifdef __linux__ + // Check if $HOME/.njam-levels exists and if it doesn't create it + char buf[512]; + char *home = NjamGetHomeDir(); + snprintf(buf, sizeof(buf), "%s/.njam-levels", home? home:""); + NjamCheckAndCreateDir(buf); + sprintf(linux_sdl_driver, "x11\0"); char *driver_name = getenv("SDL_VIDEODRIVER"); if (driver_name) @@ -624,7 +630,9 @@ // Load user settings from .conf file LogFile("Opening njam.conf file.\n"); +#ifndef __linux__ char *home = getenv("HOME"); +#endif std::string njamconf("njam.conf"); if (home) njamconf = std::string(home) + "/.njamconf"; --- njam-1.25-src/src/njam.h.leveledit 2006-05-09 21:06:37.000000000 +0200 +++ njam-1.25-src/src/njam.h 2006-05-09 21:07:42.000000000 +0200 @@ -98,6 +98,7 @@ struct list_item { char item_text[50]; + char item_path[512]; struct list_item *next; struct list_item *prev; }; @@ -192,7 +193,7 @@ void LevelEditor(); // level editor (njamedit.cpp) void RenderEditor(bool, int, int, int); bool EnterFileName(char *file_name); - int SelectMap(char type, char *filename = NULL); + int SelectMap(char type, char *filename = NULL, int filename_size = 0); struct list_item *SelectFromList(struct list_item *first); void Message(char *text); bool Query(char *text); --- njam-1.25-src/src/njamedit.cpp.leveledit 2005-12-13 12:56:42.000000000 +0100 +++ njam-1.25-src/src/njamedit.cpp 2006-05-09 21:06:08.000000000 +0200 @@ -41,7 +41,7 @@ { int level_type = 0; // cooperative int level_type_was = 0; - char filename[250]; + char filename[512]; filename[0] = '\0'; int x=2, y=1; @@ -90,7 +90,7 @@ if (key == SDLK_l) // select file from directory { - if (SelectMap('A', filename) > -1) + if (SelectMap('A', filename, sizeof(filename)) > -1) { int w=0; while (filename[w]) @@ -127,12 +127,20 @@ { if (EnterFileName(filename)) { - char buf[250]; + char buf[512]; char types[2][5] = { "COOP", "DUEL" }; - sprintf(buf, "levels/%s.%s\0", filename, types[level_type]); - sprintf(filename, "%s\0", buf); +#ifdef __linux__ + char *home = NjamGetHomeDir(); + snprintf(buf, sizeof(buf), + "%s/.njam-levels/%s.%s", + home? home:"", +#else + snprintf(buf, sizeof(buf), + "levels/%s.%s", +#endif + filename, types[level_type]); LogFile::LogFile("Saving maps"); - m_Maps.Save(filename); + m_Maps.Save(buf); level_type_was = level_type; changed = false; } @@ -458,51 +466,72 @@ } } //--------------------------------------------------------------------------- -int NjamEngine::SelectMap(char type, char *filename) +int NjamEngine::SelectMap(char type, char *filename, int filename_size) { struct list_item *first = NULL; - // open folder, load all entries + // open folders, load all entries DIR *dir; struct dirent *ent; + int i; + char dirname[512] = "levels"; - if ((dir = opendir("levels")) == NULL) +#ifdef __linux__ + for (i=0; i<2; i++) { - printf("Unable to open directory\n"); - return -1; - } + if (i==0) + { +#endif + if ((dir = opendir(dirname)) == NULL) + { + printf("Unable to open directory\n"); + return -1; + } +#ifdef __linux__ + } + else + { + char *home = NjamGetHomeDir(); - while ((ent = readdir(dir)) != NULL) - { - // check if last letter of name maches: - int p = 0; - while (ent->d_name[p]) - p++; + snprintf(dirname, sizeof(dirname), "%s/.njam-levels", + home? home:""); + if ((dir = opendir(dirname)) == NULL) + break; + } +#endif + while ((ent = readdir(dir)) != NULL) + { + // check if last letter of name maches: + int p = 0; + while (ent->d_name[p]) + p++; - char c = ent->d_name[p-1]; - if (c != 'P' && c != 'L') - continue; + char c = ent->d_name[p-1]; + if (c != 'P' && c != 'L') + continue; - if (type != 'A' && c != type) - continue; + if (type != 'A' && c != type) + continue; - struct list_item *new_file = new struct list_item; - new_file->next = first; - new_file->prev = NULL; - if (first) - first->prev = new_file; - first = new_file; + struct list_item *new_file = new struct list_item; + new_file->next = first; + new_file->prev = NULL; + if (first) + first->prev = new_file; + first = new_file; - // copy file name - for (int i=0; ent->d_name[i] && i<29; i++) - { - first->item_text[i] = ent->d_name[i]; - first->item_text[i+1] = '\0'; + // copy file name + snprintf(first->item_text, sizeof(first->item_text), + "%s", ent->d_name); + snprintf(first->item_path, sizeof(first->item_path), + "%s/%s", dirname, ent->d_name); } - } - if (closedir(dir) != 0) - printf("Unable to close directory\n"); + if (closedir(dir) != 0) + printf("Unable to close directory\n"); +#ifdef __linux__ + } +#endif // show and let player select if more than one levelset struct list_item *selected; @@ -514,11 +543,10 @@ int result = 0; // no levels loaded (so far) if (selected) { - char file_name[200]; - sprintf(file_name, "levels/%s\0", selected->item_text); - result = m_Maps.Load(file_name); + result = m_Maps.Load(selected->item_path); if (filename) - sprintf(filename, "%s\0", file_name); + snprintf(filename, filename_size, "%s", + selected->item_path); } while (first) // free memory --- njam-1.25-src/src/njamutils.cpp.leveledit 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njamutils.cpp 2006-05-09 19:40:37.000000000 +0200 @@ -162,3 +162,83 @@ return true; } //----------------------------------------------------------------------------- +#ifdef __linux__ +#include +#include +#include +#include +#include +#if defined(__DECC) && defined(VMS) +#include +static char *vms_to_unix_buffer = NULL; +static int convert_vms_to_unix(char *vms_dir_name) +{ + vms_to_unix_buffer = vms_dir_name; +} +#endif + +char *NjamGetHomeDir() +{ + struct passwd *pw; + + if (!(pw = getpwuid(getuid()))) + { + fprintf(stderr, "Who are you? Not found in passwd database!!\n"); + return NULL; + } + +#if defined(__DECC) && defined(VMS) + /* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix + Format. */ + decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1); + return vms_to_unix_buffer; +#else + return pw->pw_dir; +#endif +} +//----------------------------------------------------------------------------- +int NjamCheckAndCreateDir(const char *name) +{ + struct stat stat_buffer; + + if (stat(name, &stat_buffer)) + { + /* error check if it doesn't exist or something else is wrong */ + if (errno == ENOENT) + { + /* doesn't exist letts create it ;) */ +#ifdef BSD43 + if (mkdir(name, 0775)) +#else + if (mkdir(name, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH)) +#endif + { + fprintf(stderr, "Error creating dir %s", name); + perror(" "); + return -1; + } + } + else + { + /* something else went wrong yell about it */ + fprintf(stderr, "Error opening %s", name); + perror(" "); + return -1; + } + } + else + { + /* file exists check it's a dir otherwise yell about it */ +#ifdef BSD43 + if (!(S_IFDIR & stat_buffer.st_mode)) +#else + if (!S_ISDIR(stat_buffer.st_mode)) +#endif + { + fprintf(stderr,"Error %s exists but isn't a dir\n", name); + return -1; + } + } + return 0; +} +#endif Index: njam.spec =================================================================== RCS file: /cvs/extras/rpms/njam/FC-5/njam.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- njam.spec 29 Mar 2006 19:45:02 -0000 1.1 +++ njam.spec 9 May 2006 19:46:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: njam Version: 1.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maze-game, eat all the cookies while avoiding the badguys Group: Amusements/Games License: GPL @@ -10,6 +10,7 @@ Source2: njam.desktop Patch0: njam-1.25-drop-setgid.patch Patch1: njam-1.25-html.patch +Patch2: njam-1.25-leveledit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel SDL_net-devel BuildRequires: ImageMagick desktop-file-utils @@ -26,6 +27,7 @@ %setup -q -n %{name}-%{version}-src %patch0 -p1 -z .setgid %patch1 -p1 +%patch2 -p1 -z .leveledit %build @@ -96,6 +98,12 @@ %changelog +* Tue May 9 2006 Hans de Goede 1.25-3 +- Add Patch2, which fixes the leveleditor to save custom made levels under + $HOME/.njam-levels instead of trying to write them under /usr/share. + Also teach njam to look for levels under both $HOME/.njam-levels and + /usr/share (bug 188078). + * Tue Mar 28 2006 Hans de Goede 1.25-2 - Cleaned up description in spec and man using the cleaner description provided in bz 186813 From fedora-extras-commits at redhat.com Tue May 9 20:12:08 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 9 May 2006 13:12:08 -0700 Subject: owners owners.list,1.967,1.968 Message-ID: <200605092012.k49KCA1S010592@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558 Modified Files: owners.list Log Message: Adding Lightning to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.967 retrieving revision 1.968 diff -u -r1.967 -r1.968 --- owners.list 9 May 2006 17:48:55 -0000 1.967 +++ owners.list 9 May 2006 20:12:08 -0000 1.968 @@ -699,6 +699,7 @@ Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|lightning|GNU Lightning|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 20:17:24 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 9 May 2006 13:17:24 -0700 Subject: comps comps-fe5.xml.in,1.46,1.47 comps-fe6.xml.in,1.9,1.10 Message-ID: <200605092017.k49KHQwN011451@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11420 Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: Adding GNU Lightning Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- comps-fe5.xml.in 8 May 2006 23:43:16 -0000 1.46 +++ comps-fe5.xml.in 9 May 2006 20:17:24 -0000 1.47 @@ -43,6 +43,7 @@ ghc git highlight + lightning hugs98 lincvs lua Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- comps-fe6.xml.in 8 May 2006 23:43:16 -0000 1.9 +++ comps-fe6.xml.in 9 May 2006 20:17:24 -0000 1.10 @@ -44,6 +44,7 @@ git highlight hugs98 + lightning lincvs lua mach From fedora-extras-commits at redhat.com Tue May 9 20:44:13 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 13:44:13 -0700 Subject: rpms/gauche-gl/FC-5 gauche-gl.spec,1.1,1.2 Message-ID: <200605092044.k49KiFOw015691@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15650 Modified Files: gauche-gl.spec Log Message: Index: gauche-gl.spec =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/FC-5/gauche-gl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gauche-gl.spec 9 May 2006 19:27:29 -0000 1.1 +++ gauche-gl.spec 9 May 2006 20:44:13 -0000 1.2 @@ -2,7 +2,7 @@ Name: gauche-gl Version: 0.4.1 -Release: 4%{?dist} +Release: 5?{?dist} Summary: OpenGL binding for Gauche Group: Development/Languages From fedora-extras-commits at redhat.com Tue May 9 20:44:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 13:44:54 -0700 Subject: rpms/gauche-gl/FC-5 gauche-gl.spec,1.2,1.3 Message-ID: <200605092044.k49Kiux9015822@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15799 Modified Files: gauche-gl.spec Log Message: Index: gauche-gl.spec =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/FC-5/gauche-gl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gauche-gl.spec 9 May 2006 20:44:13 -0000 1.2 +++ gauche-gl.spec 9 May 2006 20:44:54 -0000 1.3 @@ -2,7 +2,7 @@ Name: gauche-gl Version: 0.4.1 -Release: 5?{?dist} +Release: 5%{?dist} Summary: OpenGL binding for Gauche Group: Development/Languages From fedora-extras-commits at redhat.com Tue May 9 20:46:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 13:46:33 -0700 Subject: rpms/gauche-gl/FC-4 gauche-gl.spec,1.1,1.2 Message-ID: <200605092046.k49KkZtg016142@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16118 Modified Files: gauche-gl.spec Log Message: Index: gauche-gl.spec =================================================================== RCS file: /cvs/extras/rpms/gauche-gl/FC-4/gauche-gl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gauche-gl.spec 9 May 2006 19:27:29 -0000 1.1 +++ gauche-gl.spec 9 May 2006 20:46:32 -0000 1.2 @@ -13,10 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gauche-devel = %{gauche_version} BuildRequires: freeglut-devel -BuildRequires: libSM-devel -BuildRequires: libXext-devel -BuildRequires: libXi-devel -BuildRequires: libXmu-devel +BuildRequires: xorg-x11-devel BuildRequires: texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info From fedora-extras-commits at redhat.com Tue May 9 20:55:31 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 9 May 2006 13:55:31 -0700 Subject: owners owners.list,1.968,1.969 Message-ID: <200605092055.k49KtXuf017607@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17581 Modified Files: owners.list Log Message: added gauche-gl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.968 retrieving revision 1.969 diff -u -r1.968 -r1.969 --- owners.list 9 May 2006 20:12:08 -0000 1.968 +++ owners.list 9 May 2006 20:55:31 -0000 1.969 @@ -319,6 +319,7 @@ Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|gauche|Scheme script interpreter with multibyte character handling|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|gauche-gl|OpenGL binding for Gauche|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 21:11:11 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 9 May 2006 14:11:11 -0700 Subject: rpms/pessulus import.log,1.3,1.4 Message-ID: <200605092111.k49LBD5l022186@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22147 Modified Files: import.log Log Message: auto-import pessulus-0.10.1-2 on branch devel from pessulus-0.10.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pessulus/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 9 May 2006 19:19:16 -0000 1.3 +++ import.log 9 May 2006 21:11:11 -0000 1.4 @@ -1,2 +1,3 @@ pessulus-0_10_1-1_fc6:HEAD:pessulus-0.10.1-1.fc6.src.rpm:1147122603 pessulus-0_10_1-1:HEAD:pessulus-0.10.1-1.src.rpm:1147202351 +pessulus-0_10_1-2:HEAD:pessulus-0.10.1-2.src.rpm:1147209067 From fedora-extras-commits at redhat.com Tue May 9 21:11:12 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 9 May 2006 14:11:12 -0700 Subject: rpms/pessulus/devel pessulus.spec,1.2,1.3 Message-ID: <200605092111.k49LBEIU022191@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/pessulus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22147/devel Modified Files: pessulus.spec Log Message: auto-import pessulus-0.10.1-2 on branch devel from pessulus-0.10.1-2.src.rpm Index: pessulus.spec =================================================================== RCS file: /cvs/extras/rpms/pessulus/devel/pessulus.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pessulus.spec 9 May 2006 19:19:16 -0000 1.2 +++ pessulus.spec 9 May 2006 21:11:12 -0000 1.3 @@ -2,7 +2,7 @@ Name: pessulus Version: 0.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lockdown editor for GNOME Group: Applications/System @@ -12,8 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, pygtk2-devel >= 2.6.0, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2 -BuildRequires: gettext +BuildRequires: gtk2-devel, pygtk2-devel, perl-XML-Parser,gnome-python2, pkgconfig, desktop-file-utils, GConf2, gettext Requires: pygtk2, gnome-python2, gnome-python2-gconf %description @@ -57,7 +56,10 @@ %{_datadir}/%{name}/* %changelog -* Wed May 3 2006 Damien Durand - 0.10.1 +* Wed May 9 2006 Damien Durand - 0.10.1-2 +- Fixing dependancy + +* Wed May 3 2006 Damien Durand - 0.10.1-1 - upgrade version to 0.10.1 * Fri Apr 7 2006 Tom "spot" Callaway - 0.9-2 From fedora-extras-commits at redhat.com Tue May 9 21:38:54 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:38:54 -0700 Subject: rpms/xsp - New directory Message-ID: <200605092138.k49LcuhT024513@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24492/xsp Log Message: Directory /cvs/extras/rpms/xsp added to the repository From fedora-extras-commits at redhat.com Tue May 9 21:38:55 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:38:55 -0700 Subject: rpms/xsp/devel - New directory Message-ID: <200605092139.k49LcvoE024516@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24492/xsp/devel Log Message: Directory /cvs/extras/rpms/xsp/devel added to the repository From fedora-extras-commits at redhat.com Tue May 9 21:39:21 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:39:21 -0700 Subject: rpms/xsp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605092139.k49LdNB8024576@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24543 Added Files: Makefile import.log Log Message: Setup of module xsp --- NEW FILE Makefile --- # Top level Makefile for module xsp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 9 21:39:21 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:39:21 -0700 Subject: rpms/xsp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605092139.k49LdNN1024579@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24543/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xsp --- NEW 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 May 9 21:40:12 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:40:12 -0700 Subject: rpms/xsp import.log,1.1,1.2 Message-ID: <200605092140.k49Leiur024655@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24614 Modified Files: import.log Log Message: auto-import xsp-1.1.13-3 on branch devel from xsp-1.1.13-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xsp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 May 2006 21:39:21 -0000 1.1 +++ import.log 9 May 2006 21:40:12 -0000 1.2 @@ -0,0 +1 @@ +xsp-1_1_13-3:HEAD:xsp-1.1.13-3.src.rpm:1147210802 From fedora-extras-commits at redhat.com Tue May 9 21:40:13 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:40:13 -0700 Subject: rpms/xsp/devel xsp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605092140.k49Lej6o024659@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24614/devel Modified Files: .cvsignore sources Added Files: xsp.spec Log Message: auto-import xsp-1.1.13-3 on branch devel from xsp-1.1.13-3.src.rpm --- NEW FILE xsp.spec --- %define _libdir /usr/lib Name: xsp Version: 1.1.13 Release: 3%{?dist} License: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.mono-project.com/ASP.NET#XSP Source0: http://www.go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz BuildRequires: mono-web, mono-data, mono-core Requires: mono-core Summary: A small web server that hosts ASP.NET Group: System Environment/Daemons %description XSP is a standalone web server written in C# that can be used to run ASP.NET applications as well as a set of pages, controls and web services that you can use to experience ASP.NET. %prep %setup -q %build %configure make %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-, root, root,-) %doc NEWS README COPYING %{_bindir}/* %{_libdir}/pkgconfig/xsp.pc %{_libdir}/pkgconfig/xsp-2.pc %{_libdir}/%{name}/1.0/* %{_libdir}/%{name}/2.0/* %{_libdir}/%{name}/test/* %{_mandir}/man1/* %changelog * Mon May 08 2006 Paul F. Johnson 1.1.13-3 - Fixes to the spec file - Added clean * Mon Apr 17 2006 Paul F. Johnson 1.1.13-1 - Initial import for FE - Heavily amended spec file (based on the Novell original) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 May 2006 21:39:21 -0000 1.1 +++ .cvsignore 9 May 2006 21:40:13 -0000 1.2 @@ -0,0 +1 @@ +xsp-1.1.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 May 2006 21:39:21 -0000 1.1 +++ sources 9 May 2006 21:40:13 -0000 1.2 @@ -0,0 +1 @@ +58facfdb9d13d48f9e8ad5069500081d xsp-1.1.13.tar.gz From fedora-extras-commits at redhat.com Tue May 9 21:43:51 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 9 May 2006 14:43:51 -0700 Subject: owners owners.list,1.969,1.970 Message-ID: <200605092143.k49Lhrr2024774@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24757/owners Modified Files: owners.list Log Message: Added XSP (ASP.NET page server) xsp-1.1.13-3 owners/owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.969 retrieving revision 1.970 diff -u -r1.969 -r1.970 --- owners.list 9 May 2006 20:55:31 -0000 1.969 +++ owners.list 9 May 2006 21:43:51 -0000 1.970 @@ -1719,6 +1719,7 @@ Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xscorch|A Scorched Earth clone|mgarski at post.pl|extras-qa at fedoraproject.org| +Fedora Extras|xsp|ASP.NET page server|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 9 21:55:46 2006 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 9 May 2006 14:55:46 -0700 Subject: CVSROOT avail,1.32,1.33 Message-ID: <200605092155.k49LtklQ024904@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24886 Modified Files: avail Log Message: Stuart needs access for install guide, yum guide. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- avail 6 May 2006 15:31:16 -0000 1.32 +++ avail 9 May 2006 21:55:44 -0000 1.33 @@ -56,3 +56,4 @@ avail | pfrields,mjohnson | web/html/participate/documentation-quick-start avail | pfrields | web/html/participate/developers-guide avail | tchung | web/html/News +avail | elliss | web/html/docs From fedora-extras-commits at redhat.com Tue May 9 22:10:39 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 9 May 2006 15:10:39 -0700 Subject: comps comps-fe5.xml,1.6,1.7 Message-ID: <200605092210.k49MAfU5027245@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27226 Modified Files: comps-fe5.xml Log Message: Whitespace fixes Index: comps-fe5.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- comps-fe5.xml 8 May 2006 08:46:21 -0000 1.6 +++ comps-fe5.xml 9 May 2006 22:10:39 -0000 1.7 @@ -115,7 +115,7 @@ qalculate-gtk qalculate-kde qcad - qucs + qucs R R-gnomeGUI scalapack @@ -157,9 +157,9 @@ gtweakui istanbul lock-keys-applet - nautilus-actions - nautilus-flac-converter - nautilus-image-converter + nautilus-actions + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -267,7 +267,7 @@ true drgeo - drgeo-doc + drgeo-doc gperiodic stellarium tuxtype2 @@ -398,7 +398,7 @@ gnotime gnumeric gourmet - gramps + gramps grisbi gsview koffice-suite @@ -441,8 +441,8 @@ soundconverter soundtracker sweep - tagtool - ushare + tagtool + ushare xmms xmms-cdread xmms-flac @@ -460,9 +460,9 @@ airsnort apcupsd cfengine - cfs - crack - dkms + cfs + crack + dkms environment-modules epylog fuse @@ -471,7 +471,7 @@ ghex hercules ibmonitor - inadyn + inadyn lirc moodss moomps @@ -611,10 +611,10 @@ xffm-icons xfprint xfwm4 - xfce4-toys - xfwm4-themes + xfce4-toys + xfwm4-themes xfwm4-themes - xfcalendar + xfcalendar From fedora-extras-commits at redhat.com Tue May 9 22:13:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 9 May 2006 15:13:55 -0700 Subject: comps comps-fe6.xml,1.1,1.2 Message-ID: <200605092213.k49MDvw4027302@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27285 Modified Files: comps-fe6.xml Log Message: Whitespace fixes Index: comps-fe6.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- comps-fe6.xml 17 Apr 2006 17:49:10 -0000 1.1 +++ comps-fe6.xml 9 May 2006 22:13:55 -0000 1.2 @@ -114,7 +114,7 @@ qalculate-gtk qalculate-kde qcad - qucs + qucs R R-gnomeGUI scalapack @@ -156,9 +156,9 @@ gtweakui istanbul lock-keys-applet - nautilus-actions - nautilus-flac-converter - nautilus-image-converter + nautilus-actions + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -266,7 +266,7 @@ true drgeo - drgeo-doc + drgeo-doc gperiodic stellarium tuxtype2 @@ -397,7 +397,7 @@ gnotime gnumeric gourmet - gramps + gramps grisbi gsview koffice-suite @@ -440,8 +440,8 @@ soundconverter soundtracker sweep - tagtool - ushare + tagtool + ushare xmms xmms-cdread xmms-flac @@ -459,9 +459,9 @@ airsnort apcupsd cfengine - cfs - crack - dkms + cfs + crack + dkms environment-modules epylog fuse @@ -470,7 +470,7 @@ ghex hercules ibmonitor - inadyn + inadyn lirc moodss moomps @@ -516,7 +516,7 @@ ircd-hybrid jabberd kannel - ushare + ushare From fedora-extras-commits at redhat.com Tue May 9 22:15:42 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 9 May 2006 15:15:42 -0700 Subject: comps comps-fe5.xml.in,1.47,1.48 comps-fe6.xml.in,1.10,1.11 Message-ID: <200605092215.k49MFif8027376@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27357 Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: Whitespace fixes Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- comps-fe5.xml.in 9 May 2006 20:17:24 -0000 1.47 +++ comps-fe5.xml.in 9 May 2006 22:15:42 -0000 1.48 @@ -43,8 +43,8 @@ ghc git highlight - lightning - hugs98 + lightning + hugs98 lincvs lua mach @@ -119,7 +119,7 @@ qalculate-gtk qalculate-kde qcad - qucs + qucs R R-gnomeGUI scalapack @@ -161,9 +161,9 @@ gtweakui istanbul lock-keys-applet - nautilus-actions - nautilus-flac-converter - nautilus-image-converter + nautilus-actions + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -272,7 +272,7 @@ true drgeo - drgeo-doc + drgeo-doc gcompris gperiodic stellarium @@ -405,7 +405,7 @@ gnotime gnumeric gourmet - gramps + gramps grisbi gsview koffice-suite @@ -448,8 +448,8 @@ soundconverter soundtracker sweep - tagtool - ushare + tagtool + ushare xmms xmms-cdread xmms-flac @@ -467,9 +467,9 @@ airsnort apcupsd cfengine - cfs - crack - dkms + cfs + crack + dkms environment-modules epylog fuse @@ -478,7 +478,7 @@ ghex hercules ibmonitor - inadyn + inadyn lirc moodss moomps @@ -524,7 +524,7 @@ ircd-hybrid jabberd kannel - ushare + ushare Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- comps-fe6.xml.in 9 May 2006 20:17:24 -0000 1.10 +++ comps-fe6.xml.in 9 May 2006 22:15:42 -0000 1.11 @@ -43,8 +43,8 @@ ghc git highlight - hugs98 - lightning + hugs98 + lightning lincvs lua mach @@ -119,7 +119,7 @@ qalculate-gtk qalculate-kde qcad - qucs + qucs R R-gnomeGUI scalapack @@ -161,9 +161,9 @@ gtweakui istanbul lock-keys-applet - nautilus-actions - nautilus-flac-converter - nautilus-image-converter + nautilus-actions + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -272,7 +272,7 @@ true drgeo - drgeo-doc + drgeo-doc gcompris gperiodic stellarium @@ -405,7 +405,7 @@ gnotime gnumeric gourmet - gramps + gramps grisbi gsview koffice-suite @@ -448,8 +448,8 @@ soundconverter soundtracker sweep - tagtool - ushare + tagtool + ushare xmms xmms-cdread xmms-flac @@ -467,9 +467,9 @@ airsnort apcupsd cfengine - cfs - crack - dkms + cfs + crack + dkms environment-modules epylog fuse @@ -478,7 +478,7 @@ ghex hercules ibmonitor - inadyn + inadyn lirc moodss moomps @@ -524,7 +524,7 @@ ircd-hybrid jabberd kannel - ushare + ushare From fedora-extras-commits at redhat.com Tue May 9 23:25:13 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:25:13 -0700 Subject: rpms/nagios/devel nagios-initrd.patch, NONE, 1.1 nagios.spec, 1.17, 1.18 Message-ID: <200605092325.k49NPFc8030022@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30002 Modified Files: nagios.spec Added Files: nagios-initrd.patch Log Message: init.d patch - Bugzilla #191046 nagios-initrd.patch: --- NEW FILE nagios-initrd.patch --- --- nagios 2006-05-08 10:39:49.000000000 -0300 +++ daemon-init.in 2006-05-08 10:33:26.000000000 -0300 @@ -114,11 +114,13 @@ echo "Starting network monitor: nagios" $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + touch $NagiosVarDir/nagios.log $NagiosRetentionFile + chown $NagiosUser:$NagiosGroup $NagiosVarDir/nagios.log $NagiosRetentionFile rm -f $NagiosCommandFile touch $NagiosRunFile chown $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosBin -d $NagiosCfgFile + pidof nagios > $NagiosRunFile if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi #sleep 1 #status_nagios nagios Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- nagios.spec 4 May 2006 03:32:52 -0000 1.17 +++ nagios.spec 9 May 2006 23:25:13 -0000 1.18 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate Source2: nagios.htaccess +Patch0: nagios-initrd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p0 %build ./configure \ @@ -155,6 +157,9 @@ %{_includedir}/%{name} %changelog +* Tue May 09 2006 Mike McGrath 2.3-2 +- updates to the init script that prevented nagios from shutting down + * Wed May 03 2006 Mike McGrath 2.3-1 - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs From fedora-extras-commits at redhat.com Tue May 9 23:38:45 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:38:45 -0700 Subject: rpms/nagios/FC-4 nagios.spec,1.11,1.12 Message-ID: <200605092339.k49NdH46030163@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30131/FC-4 Modified Files: nagios.spec Log Message: bugzilla# 191046 fix Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nagios.spec 4 May 2006 03:32:46 -0000 1.11 +++ nagios.spec 9 May 2006 23:38:45 -0000 1.12 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate Source2: nagios.htaccess +Patch0: nagios-initrd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p0 %build ./configure \ @@ -155,6 +157,9 @@ %{_includedir}/%{name} %changelog +* Tue May 09 2006 Mike McGrath 2.3-2 +- updates to the init script that prevented nagios from shutting down + * Wed May 03 2006 Mike McGrath 2.3-1 - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs From fedora-extras-commits at redhat.com Tue May 9 23:38:45 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:38:45 -0700 Subject: rpms/nagios/FC-5 nagios.spec,1.11,1.12 Message-ID: <200605092339.k49NdHYw030166@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30131/FC-5 Modified Files: nagios.spec Log Message: bugzilla# 191046 fix Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nagios.spec 4 May 2006 03:32:47 -0000 1.11 +++ nagios.spec 9 May 2006 23:38:45 -0000 1.12 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz Source1: nagios.logrotate Source2: nagios.htaccess +Patch0: nagios-initrd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel > 1.8, mailx @@ -51,6 +52,7 @@ %prep %setup -q +%patch0 -p0 %build ./configure \ @@ -155,6 +157,9 @@ %{_includedir}/%{name} %changelog +* Tue May 09 2006 Mike McGrath 2.3-2 +- updates to the init script that prevented nagios from shutting down + * Wed May 03 2006 Mike McGrath 2.3-1 - Upstream released 2.3 - Bug fix for negative HTTP content_length header in CGIs From fedora-extras-commits at redhat.com Tue May 9 23:42:17 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:42:17 -0700 Subject: rpms/nagios/FC-4 nagios-initrd.patch,NONE,1.1 Message-ID: <200605092342.k49NgJ81030292@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30260/FC-4 Added Files: nagios-initrd.patch Log Message: Forgot to add actual files for bug fix 191046 nagios-initrd.patch: --- NEW FILE nagios-initrd.patch --- --- nagios 2006-05-08 10:39:49.000000000 -0300 +++ daemon-init.in 2006-05-08 10:33:26.000000000 -0300 @@ -114,11 +114,13 @@ echo "Starting network monitor: nagios" $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + touch $NagiosVarDir/nagios.log $NagiosRetentionFile + chown $NagiosUser:$NagiosGroup $NagiosVarDir/nagios.log $NagiosRetentionFile rm -f $NagiosCommandFile touch $NagiosRunFile chown $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosBin -d $NagiosCfgFile + pidof nagios > $NagiosRunFile if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi #sleep 1 #status_nagios nagios From fedora-extras-commits at redhat.com Tue May 9 23:42:18 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:42:18 -0700 Subject: rpms/nagios/FC-5 nagios-initrd.patch,NONE,1.1 Message-ID: <200605092342.k49NgKgo030297@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30260/FC-5 Added Files: nagios-initrd.patch Log Message: Forgot to add actual files for bug fix 191046 nagios-initrd.patch: --- NEW FILE nagios-initrd.patch --- --- nagios 2006-05-08 10:39:49.000000000 -0300 +++ daemon-init.in 2006-05-08 10:33:26.000000000 -0300 @@ -114,11 +114,13 @@ echo "Starting network monitor: nagios" $NagiosBin -v $NagiosCfgFile > /dev/null 2>&1; if [ $? -eq 0 ]; then - su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" + touch $NagiosVarDir/nagios.log $NagiosRetentionFile + chown $NagiosUser:$NagiosGroup $NagiosVarDir/nagios.log $NagiosRetentionFile rm -f $NagiosCommandFile touch $NagiosRunFile chown $NagiosUser:$NagiosGroup $NagiosRunFile $NagiosBin -d $NagiosCfgFile + pidof nagios > $NagiosRunFile if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi #sleep 1 #status_nagios nagios From fedora-extras-commits at redhat.com Tue May 9 23:59:23 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:59:23 -0700 Subject: rpms/nagios/FC-4 nagios.spec,1.12,1.13 Message-ID: <200605092359.k49NxtEs030559@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30511/FC-4 Modified Files: nagios.spec Log Message: Increment of release number Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nagios.spec 9 May 2006 23:38:45 -0000 1.12 +++ nagios.spec 9 May 2006 23:59:23 -0000 1.13 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -157,7 +157,7 @@ %{_includedir}/%{name} %changelog -* Tue May 09 2006 Mike McGrath 2.3-2 +* Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down * Wed May 03 2006 Mike McGrath 2.3-1 From fedora-extras-commits at redhat.com Tue May 9 23:59:24 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:59:24 -0700 Subject: rpms/nagios/FC-5 nagios.spec,1.12,1.13 Message-ID: <200605092359.k49NxuaU030562@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30511/FC-5 Modified Files: nagios.spec Log Message: Increment of release number Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nagios.spec 9 May 2006 23:38:45 -0000 1.12 +++ nagios.spec 9 May 2006 23:59:24 -0000 1.13 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -157,7 +157,7 @@ %{_includedir}/%{name} %changelog -* Tue May 09 2006 Mike McGrath 2.3-2 +* Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down * Wed May 03 2006 Mike McGrath 2.3-1 From fedora-extras-commits at redhat.com Tue May 9 23:59:25 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Tue, 9 May 2006 16:59:25 -0700 Subject: rpms/nagios/devel nagios.spec,1.18,1.19 Message-ID: <200605092359.k49NxvYo030565@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30511/devel Modified Files: nagios.spec Log Message: Increment of release number Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nagios.spec 9 May 2006 23:25:13 -0000 1.18 +++ nagios.spec 9 May 2006 23:59:24 -0000 1.19 @@ -1,6 +1,6 @@ Name: nagios Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -157,7 +157,7 @@ %{_includedir}/%{name} %changelog -* Tue May 09 2006 Mike McGrath 2.3-2 +* Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down * Wed May 03 2006 Mike McGrath 2.3-1 From fedora-extras-commits at redhat.com Wed May 10 03:18:48 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Tue, 9 May 2006 20:18:48 -0700 Subject: rpms/jed/devel jed-etc.patch,NONE,1.1 jed.spec,1.10,1.11 Message-ID: <200605100318.k4A3Io7E007977@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/extras/rpms/jed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7957 Modified Files: jed.spec Added Files: jed-etc.patch Log Message: cleanups: - use make install - which fixes the built-in help - make /etc/jed.rc work (#189374) - get rid of JED_ROOT in man page (#189374) jed-etc.patch: --- NEW FILE jed-etc.patch --- --- jed-0.99-18/lib/site.sl.foo 2006-05-09 23:11:26.000000000 -0400 +++ jed-0.99-18/lib/site.sl 2006-05-09 23:13:57.000000000 -0400 @@ -3274,13 +3274,7 @@ $1 = getenv ("JED_CONF_DIR"); if ($1 == NULL) { - $1 = guess_jed_install_prefix (); - if ($1 != NULL) - { - $1 = path_concat ($1, "etc"); - if (($1 == "/usr/etc") and (0 == file_status ($1))) - $1 = "/etc"; - } + $1 = "/etc"; } if ($1 != NULL) { Index: jed.spec =================================================================== RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jed.spec 18 Apr 2006 15:25:23 -0000 1.10 +++ jed.spec 10 May 2006 03:18:48 -0000 1.11 @@ -1,18 +1,19 @@ Summary: Fast, compact editor based on the S-Lang screen library Name: jed Version: 0.99.18 -Release: 1 +Release: 2 License: GPL Group: Applications/Editors Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2 Patch1: jed-0.99.12-xkeys.patch URL: http://www.jedsoft.org/jed/ +Patch2: jed-etc.patch Patch3: jed-multilib.patch Patch4: jed-selinux.patch Prereq: /sbin/install-info Obsoletes: jed-common jed-xjed BuildPrereq: slang-devel >= 2.0, autoconf, libselinux-devel -BuildRoot: /var/tmp/jed-root +BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root %description Jed is a fast, compact editor based on the S-lang screen library. Jed @@ -28,6 +29,7 @@ %prep %setup -q -n jed-0.99-18 %patch1 -p1 -b .xkeys +%patch2 -p1 #%patch3 -p1 %patch4 -p1 -b .selinux cd autoconf @@ -42,19 +44,16 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/jed -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +make install DESTDIR=$RPM_BUILD_ROOT -cp -r lib $RPM_BUILD_ROOT%{_datadir}/jed - -cd src/objs -install -m 0755 jed $RPM_BUILD_ROOT%{_bindir} JED_ROOT=$RPM_BUILD_ROOT%{_datadir}/jed $RPM_BUILD_ROOT%{_bindir}/jed -batch -n -l preparse.sl - 0.99.18-2 +- don't do all the installation by hand +- get help files installed +- fix JED_ROOT references in man page +- make /etc/jed.rc (as specified in man page) work + * Tue Apr 18 2006 Bill Nottingham - 0.99.18-1 - update to 0.99.18 From fedora-extras-commits at redhat.com Wed May 10 04:52:01 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 9 May 2006 21:52:01 -0700 Subject: rpms/gcompris/devel gcompris.spec,1.7,1.8 Message-ID: <200605100452.k4A4q3v7011504@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487 Modified Files: gcompris.spec Log Message: Add a hard Requires on gcompris-libs version-release to the base package because upstream doesn't bump the soname version when the abi changes. Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gcompris.spec 9 May 2006 19:16:54 -0000 1.7 +++ gcompris.spec 10 May 2006 04:52:01 -0000 1.8 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -21,6 +21,7 @@ Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags Requires: gnome-python2-canvas python-sqlite2 +Requires: %{name}-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -71,7 +72,7 @@ %package devel Summary: Development libraries and headers for gcompris-lib Group: Development/Libraries -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} Requires: libgnomecanvas-devel pkgconfig %description devel @@ -479,6 +480,10 @@ %changelog +* unreleased 2006 Hans de Goede 7.4-10 +- Add a hard Requires on gcompris-libs version-release to the base package + because upstream doesn't bump the soname version when the abi changes. + * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. From fedora-extras-commits at redhat.com Wed May 10 06:58:56 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 9 May 2006 23:58:56 -0700 Subject: rpms/yumex/devel sources,1.26,1.27 yumex.spec,1.27,1.28 Message-ID: <200605100658.k4A6wwqs016352@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300/devel Modified Files: sources yumex.spec Log Message: Release 1.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 May 2006 11:07:07 -0000 1.26 +++ sources 10 May 2006 06:58:55 -0000 1.27 @@ -1 +1 @@ -ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz +5a49b1145be3315939596fcb1849f141 yumex-1.0.1.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- yumex.spec 3 May 2006 11:07:07 -0000 1.27 +++ yumex.spec 10 May 2006 06:58:55 -0000 1.28 @@ -1,5 +1,5 @@ Name: yumex -Version: 1.0.0 +Version: 1.0.1 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 3 2006 Tim Lauridsen - 1.0.1-1.0 +- Release 1.0.1-1.0 * Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 - Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 From fedora-extras-commits at redhat.com Wed May 10 06:58:49 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 9 May 2006 23:58:49 -0700 Subject: rpms/yumex/FC-4 sources,1.14,1.15 yumex.spec,1.14,1.15 Message-ID: <200605100659.k4A6xLnA016356@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300/FC-4 Modified Files: sources yumex.spec Log Message: Release 1.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 3 May 2006 11:07:01 -0000 1.14 +++ sources 10 May 2006 06:58:49 -0000 1.15 @@ -1 +1 @@ -ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz +5a49b1145be3315939596fcb1849f141 yumex-1.0.1.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- yumex.spec 3 May 2006 11:07:01 -0000 1.14 +++ yumex.spec 10 May 2006 06:58:49 -0000 1.15 @@ -1,5 +1,5 @@ Name: yumex -Version: 1.0.0 +Version: 1.0.1 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 3 2006 Tim Lauridsen - 1.0.1-1.0 +- Release 1.0.1-1.0 * Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 - Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 From fedora-extras-commits at redhat.com Wed May 10 06:58:50 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Tue, 9 May 2006 23:58:50 -0700 Subject: rpms/yumex/FC-5 .cvsignore, 1.21, 1.22 sources, 1.26, 1.27 yumex.spec, 1.27, 1.28 Message-ID: <200605100659.k4A6xMrA016361@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300/FC-5 Modified Files: .cvsignore sources yumex.spec Log Message: Release 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 3 May 2006 11:07:02 -0000 1.21 +++ .cvsignore 10 May 2006 06:58:50 -0000 1.22 @@ -1 +1 @@ -yumex-1.0.0.tar.gz +yumex-1.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 May 2006 11:07:02 -0000 1.26 +++ sources 10 May 2006 06:58:50 -0000 1.27 @@ -1 +1 @@ -ac241f41b04a3a314265fa9bb1fe573c yumex-1.0.0.tar.gz +5a49b1145be3315939596fcb1849f141 yumex-1.0.1.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- yumex.spec 3 May 2006 11:07:02 -0000 1.27 +++ yumex.spec 10 May 2006 06:58:50 -0000 1.28 @@ -1,5 +1,5 @@ Name: yumex -Version: 1.0.0 +Version: 1.0.1 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 3 2006 Tim Lauridsen - 1.0.1-1.0 +- Release 1.0.1-1.0 * Fri Apr 21 2006 Tim Lauridsen - 1.0.0-1.0 - Release 1.0.0-1.0 * Fri Apr 21 2006 Tim Lauridsen - 0.99.17-1.0 From fedora-extras-commits at redhat.com Wed May 10 08:17:17 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 10 May 2006 01:17:17 -0700 Subject: fedora-security/audit fc4,1.237,1.238 fc5,1.150,1.151 Message-ID: <200605100817.k4A8HHTD021152@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21132/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-2274 and CVE-2006-2275 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- fc4 9 May 2006 18:50:58 -0000 1.237 +++ fc4 10 May 2006 08:17:14 -0000 1.238 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-2275 VULNERABLE (kernel) +CVE-2006-2274 VULNERABLE (kernel) CVE-2006-2272 VULNERABLE (kernel) CVE-2006-2271 VULNERABLE (kernel) CVE-2006-2224 VULNERABLE (quagga) #191085 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- fc5 9 May 2006 18:50:58 -0000 1.150 +++ fc5 10 May 2006 08:17:14 -0000 1.151 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-2006-2275 VULNERABLE (kernel) +CVE-2006-2274 VULNERABLE (kernel) CVE-2006-2272 VULNERABLE (kernel) CVE-2006-2271 VULNERABLE (kernel) CVE-2006-2224 VULNERABLE (quagga) #191085 From fedora-extras-commits at redhat.com Wed May 10 08:18:57 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 10 May 2006 01:18:57 -0700 Subject: owners owners.list,1.970,1.971 Message-ID: <200605100819.k4A8J0pZ021187@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21170 Modified Files: owners.list Log Message: reassign scim-fcitx to qshen Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.970 retrieving revision 1.971 diff -u -r1.970 -r1.971 --- owners.list 9 May 2006 21:43:51 -0000 1.970 +++ owners.list 10 May 2006 08:18:57 -0000 1.971 @@ -1424,7 +1424,7 @@ Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|petersen at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|qshen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-input-pad|SCIM On-screen Input Pad|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scim-m17n|m17n-lib input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 10 08:20:49 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 10 May 2006 01:20:49 -0700 Subject: fedora-security/audit fc4,1.238,1.239 fc5,1.151,1.152 Message-ID: <200605100820.k4A8KnT6021213@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21193/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-2271, CVE-2006-2272, CVE-2006-2274 and CVE-2006-2275 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- fc4 10 May 2006 08:17:14 -0000 1.238 +++ fc4 10 May 2006 08:20:46 -0000 1.239 @@ -3,10 +3,10 @@ ** are items that need attention -CVE-2006-2275 VULNERABLE (kernel) -CVE-2006-2274 VULNERABLE (kernel) -CVE-2006-2272 VULNERABLE (kernel) -CVE-2006-2271 VULNERABLE (kernel) +CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2271 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- fc5 10 May 2006 08:17:14 -0000 1.151 +++ fc5 10 May 2006 08:20:46 -0000 1.152 @@ -3,10 +3,10 @@ ** are items that need attention -CVE-2006-2275 VULNERABLE (kernel) -CVE-2006-2274 VULNERABLE (kernel) -CVE-2006-2272 VULNERABLE (kernel) -CVE-2006-2271 VULNERABLE (kernel) +CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) +CVE-2006-2271 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] From fedora-extras-commits at redhat.com Wed May 10 09:12:34 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 May 2006 02:12:34 -0700 Subject: rpms/gtkwave/devel gtkwave.spec, 1.11, 1.12 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Message-ID: <200605100912.k4A9Ca0I023650@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23629 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 3.0.2 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkwave.spec 9 May 2006 09:42:19 -0000 1.11 +++ gtkwave.spec 10 May 2006 09:12:33 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Wed May 10 2006 Paul Howarth 3.0.2-1 +- update to 3.0.2 + * Tue May 9 2006 Paul Howarth 3.0.1-1 - update to 3.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 May 2006 09:42:19 -0000 1.11 +++ sources 10 May 2006 09:12:33 -0000 1.12 @@ -1 +1 @@ -4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz +2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 May 2006 09:42:19 -0000 1.11 +++ .cvsignore 10 May 2006 09:12:33 -0000 1.12 @@ -1 +1 @@ -gtkwave-3.0.1.tgz +gtkwave-3.0.2.tgz From fedora-extras-commits at redhat.com Wed May 10 09:13:45 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 May 2006 02:13:45 -0700 Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.11, 1.12 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Message-ID: <200605100913.k4A9DlIF023725@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23704 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 3.0.2 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkwave.spec 9 May 2006 09:43:39 -0000 1.11 +++ gtkwave.spec 10 May 2006 09:13:45 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Wed May 10 2006 Paul Howarth 3.0.2-1 +- update to 3.0.2 + * Tue May 9 2006 Paul Howarth 3.0.1-1 - update to 3.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 May 2006 09:43:39 -0000 1.11 +++ sources 10 May 2006 09:13:45 -0000 1.12 @@ -1 +1 @@ -4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz +2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 May 2006 09:43:39 -0000 1.11 +++ .cvsignore 10 May 2006 09:13:45 -0000 1.12 @@ -1 +1 @@ -gtkwave-3.0.1.tgz +gtkwave-3.0.2.tgz From fedora-extras-commits at redhat.com Wed May 10 09:14:54 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 May 2006 02:14:54 -0700 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.10, 1.11 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Message-ID: <200605100914.k4A9EuuF023800@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23779 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 3.0.2 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkwave.spec 9 May 2006 09:44:48 -0000 1.10 +++ gtkwave.spec 10 May 2006 09:14:54 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Wed May 10 2006 Paul Howarth 3.0.2-1 +- update to 3.0.2 + * Tue May 9 2006 Paul Howarth 3.0.1-1 - update to 3.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 May 2006 09:44:48 -0000 1.11 +++ sources 10 May 2006 09:14:54 -0000 1.12 @@ -1 +1 @@ -4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz +2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 9 May 2006 09:44:48 -0000 1.11 +++ .cvsignore 10 May 2006 09:14:54 -0000 1.12 @@ -1 +1 @@ -gtkwave-3.0.1.tgz +gtkwave-3.0.2.tgz From fedora-extras-commits at redhat.com Wed May 10 09:16:03 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 May 2006 02:16:03 -0700 Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.9, 1.10 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 Message-ID: <200605100916.k4A9G5OM023878@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23857 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 3.0.2 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkwave.spec 9 May 2006 09:45:56 -0000 1.9 +++ gtkwave.spec 10 May 2006 09:16:03 -0000 1.10 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Wed May 10 2006 Paul Howarth 3.0.2-1 +- update to 3.0.2 + * Tue May 9 2006 Paul Howarth 3.0.1-1 - update to 3.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 9 May 2006 09:45:56 -0000 1.10 +++ sources 10 May 2006 09:16:03 -0000 1.11 @@ -1 +1 @@ -4608689893b6a48babe7d7cc5d6c382f gtkwave-3.0.1.tgz +2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 9 May 2006 09:45:56 -0000 1.10 +++ .cvsignore 10 May 2006 09:16:03 -0000 1.11 @@ -1 +1 @@ -gtkwave-3.0.1.tgz +gtkwave-3.0.2.tgz From fedora-extras-commits at redhat.com Wed May 10 09:36:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 10 May 2006 02:36:50 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.17,1.18 Message-ID: <200605100936.k4A9aqef024086@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24069 Modified Files: php-eaccelerator.spec Log Message: Fix API version when defaulting. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- php-eaccelerator.spec 5 May 2006 13:57:59 -0000 1.17 +++ php-eaccelerator.spec 10 May 2006 09:36:50 -0000 1.18 @@ -7,7 +7,7 @@ %define prever beta2 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) -%define php_apiver %(echo %{default_apiver}; (php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) +%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} # This is the apache userid, only used for sysvipc semaphores which is the @@ -30,7 +30,7 @@ Conflicts: php-mmcache BuildRequires: php, php-devel # Required by phpize -BuildRequires: autoconf, automake, libtool, gcc-c++ +BuildRequires: autoconf, automake, libtool %description eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. From fedora-extras-commits at redhat.com Wed May 10 09:41:59 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 10 May 2006 02:41:59 -0700 Subject: rpms/php-eaccelerator/FC-4 .cvsignore, 1.3, 1.4 php-eaccelerator.spec, 1.7, 1.8 sources, 1.3, 1.4 eaccelerator-0.9.3-buffer-overflow.patch, 1.1, NONE Message-ID: <200605100942.k4A9g1K6024273@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24249 Modified Files: .cvsignore php-eaccelerator.spec sources Removed Files: eaccelerator-0.9.3-buffer-overflow.patch Log Message: Update to 0.9.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Jun 2005 09:01:03 -0000 1.3 +++ .cvsignore 10 May 2006 09:41:59 -0000 1.4 @@ -1 +1 @@ -eaccelerator-0.9.3.tar.gz +eaccelerator-0.9.4.tar.bz2 Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-4/php-eaccelerator.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php-eaccelerator.spec 17 Oct 2005 13:38:32 -0000 1.7 +++ php-eaccelerator.spec 10 May 2006 09:41:59 -0000 1.8 @@ -1,24 +1,23 @@ %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)} +%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.0.1)} -%define module_version 0.9.3 +%define module_version 0.9.4 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 4%{?dist} +Release: 1%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ -Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz -Patch: eaccelerator-0.9.3-buffer-overflow.patch +Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: php = %{php_version} +Requires: php >= %{php_version} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel # Required by phpize -BuildRequires: autoconf, automake, libtool, gcc-c++ +BuildRequires: autoconf, automake, libtool %description eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. @@ -28,18 +27,11 @@ %prep %setup -n eaccelerator-%{module_version} -%patch -p1 %build phpize %configure -# Set fcntl based semaphores to avoid ipc based locking issues on x86_64 -%ifarch x86_64 -%{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h -%{__perl} -pi -e 's|.*(MM_SEM_FCNTL).*|#define $1 1|g' config.h -%endif -# Compile! %{__make} %{?_smp_mflags} @@ -85,10 +77,17 @@ %doc eaccelerator.ini *.php %config(noreplace) %{_sysconfdir}/php.d/eaccelerator.ini %{php_extdir}/eaccelerator.so -%attr(0750, apache, apache) %{_localstatedir}/cache/php-eaccelerator +%attr(0750, apache, apache) %{_localstatedir}/cache/php-eaccelerator/ %changelog +* Tue Apr 11 2006 Matthias Saou 5.0.1_0.9.4-1 +- Update to 0.9.4. +- Remove no longer needed buffer overflow patch. +- Re-enable ipc based semaphores on x86_64. +- Don't switch to using PHP_API_VERSION requirement, since FC-4 PHP 5.0.1 + packages don't provide it unfortunately. + * Mon Oct 17 2005 Matthias Saou 4.x.x_0.9.3-4 - Re-add %%{?_smp_mflags}, as this was a false alarm. - Force SEM to FCNTL as the IPC version is buggy on x86_64 SMP at least. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Jun 2005 09:01:03 -0000 1.3 +++ sources 10 May 2006 09:41:59 -0000 1.4 @@ -1 +1 @@ -b17ddf953f18ee6df5c2c24ffccb37d9 eaccelerator-0.9.3.tar.gz +e9143a592b2b8e2e0f9aed2d00df03ce eaccelerator-0.9.4.tar.bz2 --- eaccelerator-0.9.3-buffer-overflow.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 10 10:03:22 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 10 May 2006 03:03:22 -0700 Subject: rpms/php-eaccelerator/FC-4 php-eaccelerator.spec,1.8,1.9 Message-ID: <200605101003.k4AA3O9G026620@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26603 Modified Files: php-eaccelerator.spec Log Message: Pass userid 48 to configure script on PPC for sysvipc semaphores. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-4/php-eaccelerator.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-eaccelerator.spec 10 May 2006 09:41:59 -0000 1.8 +++ php-eaccelerator.spec 10 May 2006 10:03:21 -0000 1.9 @@ -3,6 +3,10 @@ %define module_version 0.9.4 +# This is the apache userid, only used for sysvipc semaphores which is the +# default on ppc since spinlock is not detected +%define userid 48 + Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} @@ -31,7 +35,11 @@ %build phpize -%configure +%configure \ +%ifarch ppc + --with-eaccelerator-userid="%{userid}" +%endif + %{__make} %{?_smp_mflags} @@ -87,6 +95,7 @@ - Re-enable ipc based semaphores on x86_64. - Don't switch to using PHP_API_VERSION requirement, since FC-4 PHP 5.0.1 packages don't provide it unfortunately. +- Pass userid 48 to configure script on PPC for sysvipc semaphores. * Mon Oct 17 2005 Matthias Saou 4.x.x_0.9.3-4 - Re-add %%{?_smp_mflags}, as this was a false alarm. From fedora-extras-commits at redhat.com Wed May 10 11:29:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 10 May 2006 04:29:02 -0700 Subject: rpms/proftpd/devel proftpd.conf,1.5,1.6 proftpd.spec,1.15,1.16 Message-ID: <200605101129.k4ABT4W2029865@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29846 Modified Files: proftpd.conf proftpd.spec Log Message: Comment DSO loading in config and update TLS certs paths. Index: proftpd.conf =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- proftpd.conf 1 Aug 2005 15:17:49 -0000 1.5 +++ proftpd.conf 10 May 2006 11:29:02 -0000 1.6 @@ -77,14 +77,22 @@ # Explained at http://www.castaglia.org/proftpd/modules/mod_tls.html #TLSEngine on #TLSRequired on -#TLSRSACertificateFile /usr/share/ssl/certs/proftpd.pem -#TLSRSACertificateKeyFile /usr/share/ssl/certs/proftpd.pem +#TLSRSACertificateFile /etc/pki/tls/certs/proftpd.pem +#TLSRSACertificateKeyFile /etc/pki/tls/certs/proftpd.pem #TLSCipherSuite ALL:!ADH:!DES #TLSOptions NoCertRequest #TLSVerifyClient off ##TLSRenegotiate ctrl 3600 data 512000 required off timeout 300 #TLSLog /var/log/proftpd/tls.log +# SQL authentication Dynamic Shared Object (DSO) loading +# See README.DSO and howto/DSO.html for more details. +# +# LoadModule mod_sql.c +# LoadModule mod_sql_mysql.c +# LoadModule mod_sql_postgres.c +# + # A basic anonymous configuration, with an upload directory. # # User ftp Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- proftpd.spec 28 Apr 2006 09:23:46 -0000 1.15 +++ proftpd.spec 10 May 2006 11:29:02 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -179,6 +179,10 @@ %changelog +* Wed May 10 2006 Matthias Saou 1.3.0-3 +- Add commented section about DSO loading to the default proftpd.conf. +- Update TLS cert paths in the default proftpd.conf to /etc/pki/tls. + * Fri Apr 28 2006 Matthias Saou 1.3.0-2 - Mark pam.d and logrotate.d config files as noreplace. - Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary From fedora-extras-commits at redhat.com Wed May 10 11:53:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 04:53:21 -0700 Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.8, 1.9 perl-Config-Tiny.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200605101153.k4ABrNgP030039@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30018 Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Updated to 2.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Apr 2006 21:07:39 -0000 1.8 +++ .cvsignore 10 May 2006 11:53:21 -0000 1.9 @@ -1 +1 @@ -Config-Tiny-2.06.tar.gz +Config-Tiny-2.07.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Config-Tiny.spec 22 Apr 2006 21:07:39 -0000 1.13 +++ perl-Config-Tiny.spec 10 May 2006 11:53:21 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-Config-Tiny -Version: 2.06 +Version: 2.07 Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files @@ -54,6 +54,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 2.07-1 +- Updated to 2.07. + * Sat Apr 22 2006 Jose Pedro Oliveira - 2.06-1 - Updated to 2.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Apr 2006 21:07:39 -0000 1.8 +++ sources 10 May 2006 11:53:21 -0000 1.9 @@ -1 +1 @@ -40b5ce184ee6307b5a9ce1f588f824d6 Config-Tiny-2.06.tar.gz +19cb3091a01baed531ac2dc7d7eee629 Config-Tiny-2.07.tar.gz From fedora-extras-commits at redhat.com Wed May 10 12:00:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 05:00:04 -0700 Subject: rpms/perl-PPI/devel .cvsignore, 1.2, 1.3 perl-PPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605101200.k4AC063T030147@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30121 Modified Files: .cvsignore perl-PPI.spec sources Log Message: Update to 1.113. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 May 2006 12:38:07 -0000 1.2 +++ .cvsignore 10 May 2006 12:00:03 -0000 1.3 @@ -1 +1 @@ -PPI-1.112.tar.gz +PPI-1.113.tar.gz Index: perl-PPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/perl-PPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-PPI.spec 2 May 2006 12:38:07 -0000 1.1 +++ perl-PPI.spec 10 May 2006 12:00:03 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-PPI -Version: 1.112 +Version: 1.113 Release: 1%{?dist} Summary: Parse, Analyze and Manipulate Perl @@ -61,6 +61,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 1.113-1 +- Update to 1.113. + * Tue Apr 25 2006 Jose Pedro Oliveira - 1.112-1 - Update to 1.112. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 May 2006 12:38:07 -0000 1.2 +++ sources 10 May 2006 12:00:03 -0000 1.3 @@ -1 +1 @@ -a629d953e0002813061c4308c64993f6 PPI-1.112.tar.gz +8e06ad1a96244618fbebdd346791067c PPI-1.113.tar.gz From fedora-extras-commits at redhat.com Wed May 10 13:48:47 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 10 May 2006 06:48:47 -0700 Subject: CVSROOT avail,1.33,1.34 Message-ID: <200605101348.k4ADmlwk002630@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2612 Modified Files: avail Log Message: Add David Eisenstein to the fedora security group. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- avail 9 May 2006 21:55:44 -0000 1.33 +++ avail 10 May 2006 13:48:44 -0000 1.34 @@ -46,9 +46,9 @@ # Red Hat Security Response Team avail | mjc,bressers,jorton,notting,sopwith,katzj,holtmann | fedora-security # Fedora Security Response Team -avail | jkeating,ausil,tibbs,kaboom,scop | fedora-security -unavail | jkeating,ausil,tibbs,kaboom,scop | fedora-security/audit/fc4 -unavail | jkeating,ausil,tibbs,kaboom,scop | fedora-security/audit/fc5 +avail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security +unavail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security/audit/fc4 +unavail | jkeating,ausil,tibbs,kaboom,scop,questor | fedora-security/audit/fc5 avail | pfrields | web/html/projects/docs avail | pfrields | web/html/participate/documentation-faq From fedora-extras-commits at redhat.com Wed May 10 14:28:14 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 10 May 2006 07:28:14 -0700 Subject: extras-buildsys ChangeLog,1.192,1.193 Message-ID: <200605101428.k4AESEqP005135@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5103 Modified Files: ChangeLog Log Message: 2006-05-10 Dan Williams * builder/Builder.py - (Builder::__init__): print out build arches on start * builder/main.py - pylint cleanups - (drop_privs): use Exceptions rather than return; and ensure that, if we aren't running as root, that we are running as who the user configured us to run as in the config file Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- ChangeLog 9 May 2006 19:10:50 -0000 1.192 +++ ChangeLog 10 May 2006 14:28:12 -0000 1.193 @@ -1,3 +1,14 @@ +2006-05-10 Dan Williams + + * builder/Builder.py + - (Builder::__init__): print out build arches on start + + * builder/main.py + - pylint cleanups + - (drop_privs): use Exceptions rather than return; and ensure that, if + we aren't running as root, that we are running as who the user + configured us to run as in the config file + 2006-05-09 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Wed May 10 14:28:15 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 10 May 2006 07:28:15 -0700 Subject: extras-buildsys/builder Builder.py,1.6,1.7 main.py,1.1,1.2 Message-ID: <200605101428.k4AESFCu005142@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5103/builder Modified Files: Builder.py main.py Log Message: 2006-05-10 Dan Williams * builder/Builder.py - (Builder::__init__): print out build arches on start * builder/main.py - pylint cleanups - (drop_privs): use Exceptions rather than return; and ensure that, if we aren't running as root, that we are running as who the user configured us to run as in the config file 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 9 May 2006 19:10:51 -0000 1.6 +++ Builder.py 10 May 2006 14:28:12 -0000 1.7 @@ -21,6 +21,7 @@ import time import threading import urllib +import string import xmlrpclib import OpenSSL from plague import Commands @@ -68,7 +69,6 @@ """ Abstract builder base object """ def __init__(self, cfg): self._cfg = cfg - self._certs = None self._max_slots = determine_max_jobs(cfg) self._seq_gen = Commands.SequenceGenerator() @@ -76,6 +76,7 @@ self._building_jobs = [] self._all_jobs = {} + self._certs = None if cfg.get_bool("SSL", "use_ssl"): hostname = get_hostname(self._cfg, False) key_file = os.path.join(cfg.get_str("SSL", "builder_key_and_cert_dir"), "%s.pem" % hostname) @@ -84,6 +85,13 @@ self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") self._certs['peer_ca_cert'] = self._certs['ca_cert'] + build_arches = [] + for target in self._cfg.targets(): + for arch in target.arches(): + if not arch in build_arches: + build_arches.append(arch) + self._log("Available architectures: [%s]" % string.join(build_arches, ", ")) + def _log(self, string): if self._cfg.get_bool("General", "debug"): log(string) @@ -319,7 +327,7 @@ self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs) self._http_server.start() - self._log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) + self._log("Binding to address '%s'\n" % hostname) xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port") try: if cfg.get_bool("SSL", "use_ssl") == True: Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/main.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- main.py 28 Apr 2006 03:17:35 -0000 1.1 +++ main.py 10 May 2006 14:28:12 -0000 1.2 @@ -37,57 +37,61 @@ def drop_privs(user): - """ - We can't and shouldn't run mock as root, so we drop privs. - We have to run the HTTP server as root though so it can chroot - to the fileserver directory. - """ - - if os.getuid() != 0: - return + """Drop privileges, since we don't need to run as a privileged + user after we've started up.""" import pwd import grp - eu = user + effective_user = user try: - uid = int(eu) + uid = int(effective_user) except ValueError: try: - pwrec = pwd.getpwnam(eu) + pwrec = pwd.getpwnam(effective_user) except KeyError: - print "Username '%s' does not exist." % eu - return -1 + raise Exception("Username '%s' does not exist." % effective_user) uid = pwrec[2] else: try: pwrec = pwd.getpwuid(uid) except KeyError: - print "User ID %d doesn't exist." % uid - return -1 + raise Exception("User ID %d doesn't exist." % uid) gid = pwrec[3] if uid == 0: - print "You cannot use the superuser as the 'builder_user' option." - return -1 + raise Exception("You cannot use the superuser as the 'builder_user' option.") + + # If we're already not running as root, ensure that who we are running as + # matches what the admin configured in the config file + cur_uid = os.getuid() + if cur_uid != 0: + if cur_uid != uid: + try: + cur_nam = pwd.getpwuid(cur_uid)[0] + except KeyError: + cur_nam = str(cur_uid) + uid_nam = pwd.getpwuid(uid)[0] + raise Exception("Attempting to run as '%s', but configured for" \ + " '%s'" % (cur_nam, uid_nam)) + # Otherwise, we're already running as the requested + # user and we don't need to do anything else + return # 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 + raise Exception("The 'mock' group doesn't exist in the groups file.") 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 + raise Exception("Error dropping group privileges. '%s'" % sys.exc_info()) os.setuid(uid) - return 0 def determine_build_arches(cfg): @@ -118,14 +122,12 @@ builder = None -def exit_handler(signum, frame): +def exit_handler(signum=0, frame=0): global builder log("Received SIGTERM, quitting...\n") builder.stop() def main(): - global builder - usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -160,21 +162,21 @@ sys.exit(1) if opts.daemon: - ret=daemonize.createDaemon() + ret = daemonize.createDaemon() if ret: log("Daemonizing failed!\n") sys.exit(2) if opts.pidfile: - f = open(opts.pidfile, 'w', 1) - f.write('%d\n' % os.getpid()) - f.flush() - f.close() + pidf = open(opts.pidfile, 'w', 1) + pidf.write('%d\n' % os.getpid()) + pidf.flush() + pidf.close() if opts.logfile: - logf=open(opts.logfile, 'a') - sys.stdout=logf - sys.stderr=logf + logf = open(opts.logfile, 'a') + sys.stdout = logf + sys.stderr = logf work_dir = cfg.get_str("Directories", "builder_work_dir") if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): @@ -182,13 +184,16 @@ os._exit(1) # Stop running as root - if drop_privs(cfg.get_str("General", "builder_user")) == -1: - builder.cleanup() + try: + drop_privs(cfg.get_str("General", "builder_user")) + except Exception, exc: + log("Couldn't drop privileges: %s\n" % exc) os._exit(1) # Set up our termination handler signal.signal(signal.SIGTERM, exit_handler) + global builder builder = Builder.Builder.new_builder(cfg, btype) # Start doing stuff From fedora-extras-commits at redhat.com Wed May 10 14:30:07 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 10 May 2006 07:30:07 -0700 Subject: extras-buildsys/server .cvsignore,1.1,1.2 Message-ID: <200605101430.k4AEU7d2005200@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5179 Modified Files: .cvsignore Log Message: Update cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jun 2005 12:53:37 -0000 1.1 +++ .cvsignore 10 May 2006 14:30:04 -0000 1.2 @@ -1,7 +1,13 @@ BuildJob.pyc BuildMaster.pyc -client_manager.pyc -CONFIG.pyc Repo.pyc UserInterface.pyc User.pyc +ArchJob.pyc +Builder.pyc +BuilderManager.pyc +Config.pyc +DBManager.pyc +EmailUtils.pyc +PackageJob.pyc + From fedora-extras-commits at redhat.com Wed May 10 14:31:08 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 10 May 2006 07:31:08 -0700 Subject: extras-buildsys/builder .cvsignore,NONE,1.1 Message-ID: <200605101431.k4AEV8NO005244@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5226 Added Files: .cvsignore Log Message: Add cvsignore --- NEW FILE .cvsignore --- Builder.pyc BuilderMock.pyc Config.pyc From fedora-extras-commits at redhat.com Wed May 10 14:40:28 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 07:40:28 -0700 Subject: rpms/htop/devel .cvsignore, 1.3, 1.4 htop.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605101440.k4AEeUnr005328@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5307 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Dec 2005 20:00:37 -0000 1.3 +++ .cvsignore 10 May 2006 14:40:27 -0000 1.4 @@ -1 +1 @@ -htop-0.6.tar.gz +htop-0.6.1.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- htop.spec 14 Feb 2006 09:58:11 -0000 1.4 +++ htop.spec 10 May 2006 14:40:27 -0000 1.5 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6 -Release: 3%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -29,6 +29,14 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor fedora \ + --add-category X-Fedora \ + --add-category Application \ + --delete-original \ + %{buildroot}%{_datadir}/applications/htop.desktop + %clean rm -rf %{buildroot} @@ -36,12 +44,17 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README TODO +%doc COPYING ChangeLog README %{_bindir}/htop +%{_datadir}/applications/*htop.desktop +%{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 +- Update to 0.6.1 + * Tue Feb 14 2006 Dawid Gajownik - 0.6-3 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Dec 2005 22:28:28 -0000 1.4 +++ sources 10 May 2006 14:40:27 -0000 1.5 @@ -1 +1 @@ -c00b1dba101569a055ed260e06a25596 htop-0.6.tar.gz +f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 10 14:42:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 07:42:23 -0700 Subject: rpms/htop/FC-5 .cvsignore, 1.3, 1.4 htop.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605101442.k4AEgPsq005409@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5388 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Dec 2005 20:00:37 -0000 1.3 +++ .cvsignore 10 May 2006 14:42:23 -0000 1.4 @@ -1 +1 @@ -htop-0.6.tar.gz +htop-0.6.1.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/htop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- htop.spec 14 Feb 2006 09:58:11 -0000 1.4 +++ htop.spec 10 May 2006 14:42:23 -0000 1.5 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6 -Release: 3%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -29,6 +29,14 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor fedora \ + --add-category X-Fedora \ + --add-category Application \ + --delete-original \ + %{buildroot}%{_datadir}/applications/htop.desktop + %clean rm -rf %{buildroot} @@ -36,12 +44,17 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README TODO +%doc COPYING ChangeLog README %{_bindir}/htop +%{_datadir}/applications/*htop.desktop +%{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 +- Update to 0.6.1 + * Tue Feb 14 2006 Dawid Gajownik - 0.6-3 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Dec 2005 22:28:28 -0000 1.4 +++ sources 10 May 2006 14:42:23 -0000 1.5 @@ -1 +1 @@ -c00b1dba101569a055ed260e06a25596 htop-0.6.tar.gz +f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 10 14:49:10 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 07:49:10 -0700 Subject: rpms/htop/FC-4 .cvsignore, 1.3, 1.4 htop.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605101449.k4AEnCCG005483@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5462 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Dec 2005 20:00:31 -0000 1.3 +++ .cvsignore 10 May 2006 14:49:10 -0000 1.4 @@ -1 +1 @@ -htop-0.6.tar.gz +htop-0.6.1.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- htop.spec 28 Dec 2005 22:28:22 -0000 1.3 +++ htop.spec 10 May 2006 14:49:10 -0000 1.4 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6 -Release: 2%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -29,6 +29,14 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor fedora \ + --add-category X-Fedora \ + --add-category Application \ + --delete-original \ + %{buildroot}%{_datadir}/applications/htop.desktop + %clean rm -rf %{buildroot} @@ -36,12 +44,17 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README TODO +%doc COPYING ChangeLog README %{_bindir}/htop +%{_datadir}/applications/*htop.desktop +%{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 +- Update to 0.6.1 + * Wed Dec 28 2005 Dawid Gajownik - 0.6-2 - Rebuild with updated tarball Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Dec 2005 22:28:22 -0000 1.4 +++ sources 10 May 2006 14:49:10 -0000 1.5 @@ -1 +1 @@ -c00b1dba101569a055ed260e06a25596 htop-0.6.tar.gz +f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 10 15:03:57 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 08:03:57 -0700 Subject: rpms/htop/devel htop.spec,1.5,1.6 Message-ID: <200605101503.k4AF3x3s007856@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7834 Modified Files: htop.spec Log Message: Add missing BR: desktop-file-utils Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- htop.spec 10 May 2006 14:40:27 -0000 1.5 +++ htop.spec 10 May 2006 15:03:57 -0000 1.6 @@ -1,6 +1,6 @@ Name: htop Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils BuildRequires: ncurses-devel %description @@ -52,6 +53,9 @@ %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 +- Add missing BR: desktop-file-utils + * Wed May 10 2006 Dawid Gajownik - 0.6.1-1 - Update to 0.6.1 From fedora-extras-commits at redhat.com Wed May 10 15:05:34 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 08:05:34 -0700 Subject: rpms/htop/FC-5 htop.spec,1.5,1.6 Message-ID: <200605101505.k4AF5aof007913@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7896 Modified Files: htop.spec Log Message: Add missing BR: desktop-file-utils Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/htop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- htop.spec 10 May 2006 14:42:23 -0000 1.5 +++ htop.spec 10 May 2006 15:05:34 -0000 1.6 @@ -1,6 +1,6 @@ Name: htop Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils BuildRequires: ncurses-devel %description @@ -52,6 +53,9 @@ %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 +- Add missing BR: desktop-file-utils + * Wed May 10 2006 Dawid Gajownik - 0.6.1-1 - Update to 0.6.1 From fedora-extras-commits at redhat.com Wed May 10 15:06:57 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 10 May 2006 08:06:57 -0700 Subject: rpms/htop/FC-4 htop.spec,1.4,1.5 Message-ID: <200605101506.k4AF6xiO007979@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7962 Modified Files: htop.spec Log Message: Add missing BR: desktop-file-utils Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- htop.spec 10 May 2006 14:49:10 -0000 1.4 +++ htop.spec 10 May 2006 15:06:57 -0000 1.5 @@ -1,6 +1,6 @@ Name: htop Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,6 +9,7 @@ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils BuildRequires: ncurses-devel %description @@ -52,6 +53,9 @@ %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 +- Add missing BR: desktop-file-utils + * Wed May 10 2006 Dawid Gajownik - 0.6.1-1 - Update to 0.6.1 From fedora-extras-commits at redhat.com Wed May 10 15:13:10 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 10 May 2006 08:13:10 -0700 Subject: extras-buildsys/utils extras-push-new,1.4,1.5 Message-ID: <200605101513.k4AFDAvb008098@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8047 Modified Files: extras-push-new Log Message: - sync twice: before and after running repoview (which takes so long) - use splitlines() when reading the pkglist file and be more explicit about which error conditions are harmless - add option -f (=force) which re-runs repobuild/repoview for all dists - update SYNTAX help - update group check message Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extras-push-new 6 May 2006 23:38:31 -0000 1.4 +++ extras-push-new 10 May 2006 15:13:08 -0000 1.5 @@ -51,7 +51,9 @@ 'repoclosure' : False, 'gidcheck' : True, 'setumask' : True, - 'mail' : True + 'mail' : True, + 'doublesync' : True, + 'force' : False } alldists = [ 'development', '5', '4', '3' ] @@ -132,15 +134,12 @@ def getlinesfromrunfile(dist): runfilename = getrunfilename(dist) pkglist = [] - if os.path.isfile(runfilename): - try: - rundirfile = open(runfilename,'r') - for line in rundirfile: - pkglist.append( line.rstrip() ) - rundirfile.close() - except IOError: - print 'ERROR: Could not open %s' % runfilename - sys.exit(5) + try: + pkglist = file(runfilename).read().splitlines() + except IOError, (errno, strerr): + if errno != 2: # everything but file_not_found is unexpected + print 'ERROR: %s: %s' % (strerr,runfilename) + sys.exit(errno) return pkglist @@ -199,6 +198,7 @@ filedict[which].append(fullfile) return filedict + def naevr(pkg): """return nevra from the package srpm""" @@ -416,14 +416,18 @@ if __name__ == '__main__': if config['gidcheck']: if os.getgid() != signersgid: - print 'ERROR: Change into extras_signers group!' + print 'ERROR: Change into extras_signers group before running this! Use "newgrp extras_signers".' sys.exit(13) if config['setumask']: os.umask(0002) + + if '-f' in sys.argv[1:]: + sys.argv.remove('-f') + config['force'] = True if len(sys.argv) < 2: - print 'SYNTAX: %s [dist]...' % sys.argv[0] + print 'SYNTAX: %s [dist]...' % sys.argv[0] sys.exit(22) dists = [] # the list of distribution release we want to push @@ -455,15 +459,26 @@ if result and result != 4: # 4 = no packages to sign sys.exit(result) - for dist in dists: - # Process all dists for which we find a run-file which contains >= 1 pkg names. - pkglist = getlinesfromrunfile(dist) - if len(pkglist): + # Option -f re-runs repobuild/repoview for all dists, even if + # no new packages have been pushed for a dist. + changed = dists + if config['force']: + changed = alldists + + # len(getlinesfromrunfile(dist)) is the number of packages + # per dist which have been pushed. + + for dist in changed: + if config['force'] or len( getlinesfromrunfile(dist) ): run_and_check('extras-repobuild.py %s' % dist) + + if config['doublesync']: + run_and_check('extras-sync') + + for dist in changed: + if config['force'] or len( getlinesfromrunfile(dist) ): if config['repoview']: run_and_check('extras-repoview.py %s' % dist) - if config['repoclosure']: - pass run_and_check('extras-sync') From fedora-extras-commits at redhat.com Wed May 10 15:13:45 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Wed, 10 May 2006 08:13:45 -0700 Subject: rpms/par2cmdline/devel par2cmdline-Makefile.am.patch, NONE, 1.1 par2cmdline.spec, 1.2, 1.3 Message-ID: <200605101513.k4AFDl3v008162@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8102/devel Modified Files: par2cmdline.spec Added Files: par2cmdline-Makefile.am.patch Log Message: - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 par2cmdline-Makefile.am.patch: --- NEW FILE par2cmdline-Makefile.am.patch --- diff -ur par2cmdline-0.4/aclocal.m4 par2cmdline-0.4-new/aclocal.m4 --- par2cmdline-0.4/aclocal.m4 2004-04-12 18:44:05.000000000 +0200 +++ par2cmdline-0.4-new/aclocal.m4 2006-05-10 16:50:02.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,55 +11,32 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.3])]) - -# AM_AUX_DIR_EXPAND + [AM_AUTOMAKE_VERSION([1.9.6])]) -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -106,26 +83,16 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -145,30 +112,19 @@ fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) fi])]) -# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -177,7 +133,6 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -266,9 +221,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -312,26 +272,16 @@ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# 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. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -#serial 2 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -350,27 +300,21 @@ else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -396,54 +340,31 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# serial 12 -# serial 11 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -501,7 +422,6 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -510,7 +430,9 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl - +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], @@ -544,51 +466,27 @@ done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. @@ -603,26 +501,15 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Check to see how 'make' treats includes. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # AM_MAKE_INCLUDE() # ----------------- @@ -666,27 +553,16 @@ rm -f confinc confmf ]) -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -712,27 +588,16 @@ fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -753,13 +618,21 @@ # this.) AC_DEFUN([AM_PROG_MKDIR_P], [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -778,26 +651,15 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -822,28 +684,16 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# 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. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -886,25 +736,14 @@ fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -925,3 +764,99 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + Only in par2cmdline-0.4-new: autom4te.cache diff -ur par2cmdline-0.4/configure par2cmdline-0.4-new/configure --- par2cmdline-0.4/configure 2004-04-12 18:44:22.000000000 +0200 +++ par2cmdline-0.4-new/configure 2006-05-10 16:52:42.000000000 +0200 @@ -311,7 +311,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1409,7 +1409,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version="1.8" +am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1561,13 +1561,21 @@ fi if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -1711,9 +1719,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1806,6 +1811,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2503,9 +2515,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CXX_dependencies_compiler_type=$depmode break fi @@ -3417,9 +3434,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -6969,7 +6991,6 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t -s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t @@ -6978,6 +6999,9 @@ s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t s, at am__leading_dot@,$am__leading_dot,;t t +s, at AMTAR@,$AMTAR,;t t +s, at am__tar@,$am__tar,;t t +s, at am__untar@,$am__untar,;t t s, at CXX@,$CXX,;t t s, at CXXFLAGS@,$CXXFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -7630,27 +7654,21 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue diff -ur par2cmdline-0.4/Makefile.am par2cmdline-0.4-new/Makefile.am --- par2cmdline-0.4/Makefile.am 2004-04-12 18:40:40.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.am 2006-05-10 16:48:51.000000000 +0200 @@ -45,7 +45,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ diff -ur par2cmdline-0.4/Makefile.in par2cmdline-0.4-new/Makefile.in --- par2cmdline-0.4/Makefile.in 2004-04-12 18:44:18.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.in 2006-05-10 16:50:16.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(par2_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -36,6 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = par2$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -69,31 +68,9 @@ verificationpacket.$(OBJEXT) par2_OBJECTS = $(am_par2_OBJECTS) par2_LDADD = $(LDADD) -par2_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles - at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commandline.Po ./$(DEPDIR)/crc.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/creatorpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/criticalpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/datablock.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/descriptionpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/diskfile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/filechecksummer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/galois.Po ./$(DEPDIR)/mainpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/par1fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2cmdline.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creator.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creatorsourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/recoverypacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/reedsolomon.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationhashtable.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationpacket.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -173,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -227,7 +206,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ testdata.tar.gz pretest test1 test2 test3 test4 test5 test6 \ @@ -353,16 +331,14 @@ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -386,9 +362,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -467,20 +445,20 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi @@ -521,15 +499,15 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) dist-shar: distdir @@ -542,7 +520,7 @@ $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -551,13 +529,13 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -639,7 +617,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -707,12 +685,12 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am + install-exec-am install-exec-hook install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-hook uninstall-info-am install-exec-hook : Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/par2cmdline.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- par2cmdline.spec 9 May 2006 09:50:16 -0000 1.2 +++ par2cmdline.spec 10 May 2006 15:13:45 -0000 1.3 @@ -1,12 +1,13 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch Patch1: par2cmdline-packed.patch +Patch2: par2cmdline-Makefile.am.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 @@ -23,6 +24,9 @@ %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +# fix end-of-lines of several files sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build @@ -42,10 +46,14 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog PORTING README ROADMAP +%doc AUTHORS COPYING ChangeLog README %{_bindir}/* %changelog +* Wed May 10 2006 Laurent Rineau - 0.4-9 +- Remove PORTING and ROADMAP from doc files. +- Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 + * Tue May 9 2006 Laurent Rineau - 0.4-8 - Added a new patch, to kill warnings, and try to fix ppc compilation error. From fedora-extras-commits at redhat.com Wed May 10 15:13:39 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Wed, 10 May 2006 08:13:39 -0700 Subject: rpms/par2cmdline/FC-4 par2cmdline-Makefile.am.patch, NONE, 1.1 par2cmdline.spec, 1.2, 1.3 Message-ID: <200605101514.k4AFEBpf008171@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8102/FC-4 Modified Files: par2cmdline.spec Added Files: par2cmdline-Makefile.am.patch Log Message: - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 par2cmdline-Makefile.am.patch: --- NEW FILE par2cmdline-Makefile.am.patch --- diff -ur par2cmdline-0.4/aclocal.m4 par2cmdline-0.4-new/aclocal.m4 --- par2cmdline-0.4/aclocal.m4 2004-04-12 18:44:05.000000000 +0200 +++ par2cmdline-0.4-new/aclocal.m4 2006-05-10 16:50:02.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,55 +11,32 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.3])]) - -# AM_AUX_DIR_EXPAND + [AM_AUTOMAKE_VERSION([1.9.6])]) -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -106,26 +83,16 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -145,30 +112,19 @@ fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) fi])]) -# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -177,7 +133,6 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -266,9 +221,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -312,26 +272,16 @@ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# 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. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -#serial 2 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -350,27 +300,21 @@ else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -396,54 +340,31 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# serial 12 -# serial 11 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -501,7 +422,6 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -510,7 +430,9 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl - +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], @@ -544,51 +466,27 @@ done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. @@ -603,26 +501,15 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Check to see how 'make' treats includes. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # AM_MAKE_INCLUDE() # ----------------- @@ -666,27 +553,16 @@ rm -f confinc confmf ]) -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -712,27 +588,16 @@ fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -753,13 +618,21 @@ # this.) AC_DEFUN([AM_PROG_MKDIR_P], [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -778,26 +651,15 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -822,28 +684,16 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# 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. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -886,25 +736,14 @@ fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -925,3 +764,99 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + Only in par2cmdline-0.4-new: autom4te.cache diff -ur par2cmdline-0.4/configure par2cmdline-0.4-new/configure --- par2cmdline-0.4/configure 2004-04-12 18:44:22.000000000 +0200 +++ par2cmdline-0.4-new/configure 2006-05-10 16:52:42.000000000 +0200 @@ -311,7 +311,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1409,7 +1409,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version="1.8" +am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1561,13 +1561,21 @@ fi if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -1711,9 +1719,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1806,6 +1811,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2503,9 +2515,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CXX_dependencies_compiler_type=$depmode break fi @@ -3417,9 +3434,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -6969,7 +6991,6 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t -s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t @@ -6978,6 +6999,9 @@ s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t s, at am__leading_dot@,$am__leading_dot,;t t +s, at AMTAR@,$AMTAR,;t t +s, at am__tar@,$am__tar,;t t +s, at am__untar@,$am__untar,;t t s, at CXX@,$CXX,;t t s, at CXXFLAGS@,$CXXFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -7630,27 +7654,21 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue diff -ur par2cmdline-0.4/Makefile.am par2cmdline-0.4-new/Makefile.am --- par2cmdline-0.4/Makefile.am 2004-04-12 18:40:40.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.am 2006-05-10 16:48:51.000000000 +0200 @@ -45,7 +45,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ diff -ur par2cmdline-0.4/Makefile.in par2cmdline-0.4-new/Makefile.in --- par2cmdline-0.4/Makefile.in 2004-04-12 18:44:18.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.in 2006-05-10 16:50:16.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(par2_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -36,6 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = par2$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -69,31 +68,9 @@ verificationpacket.$(OBJEXT) par2_OBJECTS = $(am_par2_OBJECTS) par2_LDADD = $(LDADD) -par2_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles - at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commandline.Po ./$(DEPDIR)/crc.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/creatorpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/criticalpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/datablock.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/descriptionpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/diskfile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/filechecksummer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/galois.Po ./$(DEPDIR)/mainpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/par1fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2cmdline.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creator.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creatorsourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/recoverypacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/reedsolomon.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationhashtable.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationpacket.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -173,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -227,7 +206,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ testdata.tar.gz pretest test1 test2 test3 test4 test5 test6 \ @@ -353,16 +331,14 @@ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -386,9 +362,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -467,20 +445,20 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi @@ -521,15 +499,15 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) dist-shar: distdir @@ -542,7 +520,7 @@ $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -551,13 +529,13 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -639,7 +617,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -707,12 +685,12 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am + install-exec-am install-exec-hook install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-hook uninstall-info-am install-exec-hook : Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/FC-4/par2cmdline.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- par2cmdline.spec 9 May 2006 09:50:16 -0000 1.2 +++ par2cmdline.spec 10 May 2006 15:13:39 -0000 1.3 @@ -1,12 +1,13 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch Patch1: par2cmdline-packed.patch +Patch2: par2cmdline-Makefile.am.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 @@ -23,6 +24,9 @@ %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +# fix end-of-lines of several files sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build @@ -42,10 +46,14 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog PORTING README ROADMAP +%doc AUTHORS COPYING ChangeLog README %{_bindir}/* %changelog +* Wed May 10 2006 Laurent Rineau - 0.4-9 +- Remove PORTING and ROADMAP from doc files. +- Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 + * Tue May 9 2006 Laurent Rineau - 0.4-8 - Added a new patch, to kill warnings, and try to fix ppc compilation error. From fedora-extras-commits at redhat.com Wed May 10 15:13:39 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Wed, 10 May 2006 08:13:39 -0700 Subject: rpms/par2cmdline/FC-5 par2cmdline-Makefile.am.patch, NONE, 1.1 par2cmdline.spec, 1.2, 1.3 Message-ID: <200605101514.k4AFEBtW008174@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8102/FC-5 Modified Files: par2cmdline.spec Added Files: par2cmdline-Makefile.am.patch Log Message: - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 par2cmdline-Makefile.am.patch: --- NEW FILE par2cmdline-Makefile.am.patch --- diff -ur par2cmdline-0.4/aclocal.m4 par2cmdline-0.4-new/aclocal.m4 --- par2cmdline-0.4/aclocal.m4 2004-04-12 18:44:05.000000000 +0200 +++ par2cmdline-0.4-new/aclocal.m4 2006-05-10 16:50:02.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.8.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,55 +11,32 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.3])]) - -# AM_AUX_DIR_EXPAND + [AM_AUTOMAKE_VERSION([1.9.6])]) -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -106,26 +83,16 @@ am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -145,30 +112,19 @@ fi AC_CONFIG_COMMANDS_PRE( [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) fi])]) -# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -177,7 +133,6 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -266,9 +221,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -312,26 +272,16 @@ AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# 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. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -#serial 2 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -350,27 +300,21 @@ else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -396,54 +340,31 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# serial 12 -# serial 11 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -501,7 +422,6 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -510,7 +430,9 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl - +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], @@ -544,51 +466,27 @@ done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. @@ -603,26 +501,15 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Check to see how 'make' treats includes. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # AM_MAKE_INCLUDE() # ----------------- @@ -666,27 +553,16 @@ rm -f confinc confmf ]) -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -712,27 +588,16 @@ fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -753,13 +618,21 @@ # this.) AC_DEFUN([AM_PROG_MKDIR_P], [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -778,26 +651,15 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -822,28 +684,16 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# 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. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -886,25 +736,14 @@ fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -925,3 +764,99 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + Only in par2cmdline-0.4-new: autom4te.cache diff -ur par2cmdline-0.4/configure par2cmdline-0.4-new/configure --- par2cmdline-0.4/configure 2004-04-12 18:44:22.000000000 +0200 +++ par2cmdline-0.4-new/configure 2006-05-10 16:52:42.000000000 +0200 @@ -311,7 +311,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1409,7 +1409,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version="1.8" +am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1561,13 +1561,21 @@ fi if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # Keeping the `.' argument allows $(mkdir_p) to be used without - # argument. Indeed, we sometimes output rules like + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. - # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more - # expensive solution, as it forces Make to start a sub-shell.) - mkdir_p='mkdir -p -- .' + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else # On NextStep and OpenStep, the `mkdir' command does not # recognize any option. It will interpret all options as @@ -1711,9 +1719,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1806,6 +1811,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2503,9 +2515,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CXX_dependencies_compiler_type=$depmode break fi @@ -3417,9 +3434,14 @@ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -6969,7 +6991,6 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t -s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t @@ -6978,6 +6999,9 @@ s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t s, at am__leading_dot@,$am__leading_dot,;t t +s, at AMTAR@,$AMTAR,;t t +s, at am__tar@,$am__tar,;t t +s, at am__untar@,$am__untar,;t t s, at CXX@,$CXX,;t t s, at CXXFLAGS@,$CXXFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -7630,27 +7654,21 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it U=`sed -n 's/^U = //p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue diff -ur par2cmdline-0.4/Makefile.am par2cmdline-0.4-new/Makefile.am --- par2cmdline-0.4/Makefile.am 2004-04-12 18:40:40.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.am 2006-05-10 16:48:51.000000000 +0200 @@ -45,7 +45,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ diff -ur par2cmdline-0.4/Makefile.in par2cmdline-0.4-new/Makefile.in --- par2cmdline-0.4/Makefile.in 2004-04-12 18:44:18.000000000 +0200 +++ par2cmdline-0.4-new/Makefile.in 2006-05-10 16:50:16.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(par2_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -36,6 +34,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = par2$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -69,31 +68,9 @@ verificationpacket.$(OBJEXT) par2_OBJECTS = $(am_par2_OBJECTS) par2_LDADD = $(LDADD) -par2_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles - at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commandline.Po ./$(DEPDIR)/crc.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/creatorpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/criticalpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/datablock.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/descriptionpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/diskfile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/filechecksummer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/galois.Po ./$(DEPDIR)/mainpacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/par1fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par1repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2cmdline.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creator.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2creatorsourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2fileformat.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairer.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/par2repairersourcefile.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/recoverypacket.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/reedsolomon.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationhashtable.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/verificationpacket.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) @@ -173,6 +150,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -227,7 +206,6 @@ verificationhashtable.cpp verificationhashtable.h \ verificationpacket.cpp verificationpacket.h -LDADD = -lstdc++ AM_CXXFLAGS = -Wall EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ testdata.tar.gz pretest test1 test2 test3 test4 test5 test6 \ @@ -353,16 +331,14 @@ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: @@ -386,9 +362,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -467,20 +445,20 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$skipped"; \ fi; \ report=""; \ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ echo "$$dashes"; \ echo "$$banner"; \ - test -n "$$skipped" && echo "$$skipped"; \ - test -n "$$report" && echo "$$report"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi @@ -521,15 +499,15 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-tarZ: distdir - $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) dist-shar: distdir @@ -542,7 +520,7 @@ $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -551,13 +529,13 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -639,7 +617,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -707,12 +685,12 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am + install-exec-am install-exec-hook install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-hook uninstall-info-am install-exec-hook : Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/FC-5/par2cmdline.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- par2cmdline.spec 9 May 2006 09:50:16 -0000 1.2 +++ par2cmdline.spec 10 May 2006 15:13:39 -0000 1.3 @@ -1,12 +1,13 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz Patch0: par2cmdline-reedsolomon.cpp.patch Patch1: par2cmdline-packed.patch +Patch2: par2cmdline-Makefile.am.patch URL: http://parchive.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: parchive <= 1.1.4 @@ -23,6 +24,9 @@ %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 + +# fix end-of-lines of several files sed -i 's/\r//' AUTHORS PORTING README ROADMAP %build @@ -42,10 +46,14 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog PORTING README ROADMAP +%doc AUTHORS COPYING ChangeLog README %{_bindir}/* %changelog +* Wed May 10 2006 Laurent Rineau - 0.4-9 +- Remove PORTING and ROADMAP from doc files. +- Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 + * Tue May 9 2006 Laurent Rineau - 0.4-8 - Added a new patch, to kill warnings, and try to fix ppc compilation error. From fedora-extras-commits at redhat.com Wed May 10 16:59:43 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 10 May 2006 09:59:43 -0700 Subject: fedora-security/audit fc4,1.239,1.240 fc5,1.152,1.153 Message-ID: <200605101659.k4AGxhX3011587@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11565/audit Modified Files: fc4 fc5 Log Message: Add CVE-2005-4798 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- fc4 10 May 2006 08:20:46 -0000 1.239 +++ fc4 10 May 2006 16:59:41 -0000 1.240 @@ -226,6 +226,7 @@ CVE-2006-0036 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2006-0035 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 +CVE-2005-4798 version (kernel, not 2.6) CVE-2005-4784 ignore (glibc) struct dirent is big enough CVE-2005-4746 version (freeradius) we don't build vulnerable bits CVE-2005-4745 version (freeradius) we don't build vulnerable bits Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- fc5 10 May 2006 08:20:46 -0000 1.152 +++ fc5 10 May 2006 16:59:41 -0000 1.153 @@ -229,6 +229,7 @@ CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0019 version (kdelibs, fixed 3.5.1) +CVE-2005-4798 version (kernel, not 2.6) CVE-2005-4784 ignore (glibc) struct dirent is big enough CVE-2005-4746 version (freeradius) we don't build vulnerable bits CVE-2005-4745 version (freeradius) we don't build vulnerable bits From fedora-extras-commits at redhat.com Wed May 10 17:24:38 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:24:38 -0700 Subject: rpms/perl-Test-Cmd - New directory Message-ID: <200605101724.k4AHOeAW013946@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13925/perl-Test-Cmd Log Message: Directory /cvs/extras/rpms/perl-Test-Cmd added to the repository From fedora-extras-commits at redhat.com Wed May 10 17:24:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:24:39 -0700 Subject: rpms/perl-Test-Cmd/devel - New directory Message-ID: <200605101724.k4AHOfJV013949@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13925/perl-Test-Cmd/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Cmd/devel added to the repository From fedora-extras-commits at redhat.com Wed May 10 17:24:58 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:24:58 -0700 Subject: rpms/perl-Test-Cmd Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605101725.k4AHP0fE014012@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13979 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Cmd --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Cmd all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed May 10 17:24:59 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:24:59 -0700 Subject: rpms/perl-Test-Cmd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605101725.k4AHP1B5014015@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13979/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Cmd --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed May 10 17:25:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:25:33 -0700 Subject: rpms/perl-Test-Cmd import.log,1.1,1.2 Message-ID: <200605101725.k4AHPZI3014076@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14043 Modified Files: import.log Log Message: auto-import perl-Test-Cmd-1.05-1 on branch devel from perl-Test-Cmd-1.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Cmd/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 May 2006 17:24:58 -0000 1.1 +++ import.log 10 May 2006 17:25:33 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Cmd-1_05-1:HEAD:perl-Test-Cmd-1.05-1.src.rpm:1147281924 From fedora-extras-commits at redhat.com Wed May 10 17:25:34 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:25:34 -0700 Subject: rpms/perl-Test-Cmd/devel perl-Test-Cmd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605101725.k4AHPaoJ014081@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14043/devel Modified Files: .cvsignore sources Added Files: perl-Test-Cmd.spec Log Message: auto-import perl-Test-Cmd-1.05-1 on branch devel from perl-Test-Cmd-1.05-1.src.rpm --- NEW FILE perl-Test-Cmd.spec --- Name: perl-Test-Cmd Version: 1.05 Release: 1%{?dist} Summary: Perl module for portable testing of commands and scripts Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Cmd/ Source0: http://www.cpan.org/authors/id/K/KN/KNIGHT/Test-Cmd-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Algorithm::DiffOld) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Algorithm::DiffOld) %description The Test::Cmd module provides a framework for portable automated testing of executable commands and scripts (in any language, not just Perl), especially commands and scripts that interace with the file system. %prep %setup -q -n Test-Cmd-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+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/*.3pm* %changelog * Mon May 01 2006 Jose Pedro Oliveira - 1.05-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Cmd/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 May 2006 17:24:59 -0000 1.1 +++ .cvsignore 10 May 2006 17:25:33 -0000 1.2 @@ -0,0 +1 @@ +Test-Cmd-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Cmd/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 May 2006 17:24:59 -0000 1.1 +++ sources 10 May 2006 17:25:33 -0000 1.2 @@ -0,0 +1 @@ +462ed981f09e02a5d9bdfb309425ede0 Test-Cmd-1.05.tar.gz From fedora-extras-commits at redhat.com Wed May 10 17:32:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 10 May 2006 10:32:17 -0700 Subject: owners owners.list,1.971,1.972 Message-ID: <200605101732.k4AHWJED014156@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14139 Modified Files: owners.list Log Message: New package: perl-Test-Cmd (#191111) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.971 retrieving revision 1.972 diff -u -r1.971 -r1.972 --- owners.list 10 May 2006 08:18:57 -0000 1.971 +++ owners.list 10 May 2006 17:32:17 -0000 1.972 @@ -1167,6 +1167,7 @@ Fedora Extras|perl-Test-Base|Data Driven Testing Framework|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Cmd|Perl module for portable testing of commands and scripts|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Differences|Test strings and data structures and show differences if not ok|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 From fedora-extras-commits at redhat.com Wed May 10 17:53:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 10:53:14 -0700 Subject: rpms/lablgtk/FC-4 lablgtk.spec,1.12,1.13 Message-ID: <200605101753.k4AHrG5m014290@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgtk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14230/FC-4 Modified Files: lablgtk.spec Log Message: Index: lablgtk.spec =================================================================== RCS file: /cvs/extras/rpms/lablgtk/FC-4/lablgtk.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lablgtk.spec 26 Feb 2006 18:51:26 -0000 1.12 +++ lablgtk.spec 10 May 2006 17:53:14 -0000 1.13 @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.6.0 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Objective Caml interface to gtk+ @@ -80,12 +80,6 @@ rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %files %defattr(-,root,root,-) %{_bindir}/* @@ -101,6 +95,10 @@ %changelog +* Wed May 10 2006 Gerard Milmeister - 2.6.0-4 +- rebuilt for ocaml 3.09.2 +- removed unnecessary ldconfig + * Sun Feb 26 2006 Gerard Milmeister - 2.6.0-2 - Rebuild for ocaml 3.09.1 From fedora-extras-commits at redhat.com Wed May 10 17:53:15 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 10:53:15 -0700 Subject: rpms/lablgtk/FC-5 lablgtk.spec,1.14,1.15 Message-ID: <200605101753.k4AHrHYr014294@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgtk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14230/FC-5 Modified Files: lablgtk.spec Log Message: Index: lablgtk.spec =================================================================== RCS file: /cvs/extras/rpms/lablgtk/FC-5/lablgtk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lablgtk.spec 26 Feb 2006 18:56:40 -0000 1.14 +++ lablgtk.spec 10 May 2006 17:53:15 -0000 1.15 @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective Caml interface to gtk+ @@ -38,6 +38,7 @@ is not that easy if you know the dynamic typing approach taken by gtk+. + %package doc Group: System Environment/Libraries Summary: Documentation for LablGTK @@ -74,12 +75,10 @@ DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -89,12 +88,17 @@ %doc README COPYING CHANGES %doc examples + %files doc %defattr(-,root,root,-) %doc doc/html %changelog +* Wed May 10 2006 Gerard Milmeister - 2.6.0-4 +- rebuilt for ocaml 3.09.2 +- removed unnecessary ldconfig + * Sun Feb 26 2006 Gerard Milmeister - 2.6.0-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed May 10 17:53:16 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 10:53:16 -0700 Subject: rpms/lablgtk/devel lablgtk.spec,1.14,1.15 Message-ID: <200605101753.k4AHrIWw014296@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14230/devel Modified Files: lablgtk.spec Log Message: Index: lablgtk.spec =================================================================== RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lablgtk.spec 26 Feb 2006 18:56:40 -0000 1.14 +++ lablgtk.spec 10 May 2006 17:53:15 -0000 1.15 @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective Caml interface to gtk+ @@ -38,6 +38,7 @@ is not that easy if you know the dynamic typing approach taken by gtk+. + %package doc Group: System Environment/Libraries Summary: Documentation for LablGTK @@ -74,12 +75,10 @@ DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -89,12 +88,17 @@ %doc README COPYING CHANGES %doc examples + %files doc %defattr(-,root,root,-) %doc doc/html %changelog +* Wed May 10 2006 Gerard Milmeister - 2.6.0-4 +- rebuilt for ocaml 3.09.2 +- removed unnecessary ldconfig + * Sun Feb 26 2006 Gerard Milmeister - 2.6.0-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed May 10 17:53:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 10:53:14 -0700 Subject: rpms/lablgtk/FC-3 lablgtk.spec,1.7,1.8 Message-ID: <200605101753.k4AHrkl6014301@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgtk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14230/FC-3 Modified Files: lablgtk.spec Log Message: Index: lablgtk.spec =================================================================== RCS file: /cvs/extras/rpms/lablgtk/FC-3/lablgtk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lablgtk.spec 31 Dec 2005 23:49:32 -0000 1.7 +++ lablgtk.spec 10 May 2006 17:53:13 -0000 1.8 @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.6.0 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Objective Caml interface to gtk+ @@ -9,7 +9,7 @@ URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html Source: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ocaml >= 3.08, camlp4 >= 3.08 +BuildRequires: ocaml >= 3.09.1, camlp4 >= 3.09.1 # lablgtk can generate quite extensive documentation. # Probably should enable this and create a subpackage for it. BuildRequires: ocaml-ocamldoc @@ -24,7 +24,7 @@ BuildRequires: gnome-panel-devel BuildRequires: gtkspell-devel -Requires: ocaml >= 3.08 +Requires: ocaml >= 3.09.1 Requires: lablgl >= 1.02 @@ -36,6 +36,7 @@ is not that easy if you know the dynamic typing approach taken by gtk+. + %package doc Group: System Environment/Libraries Summary: Documentation for LablGTK @@ -71,12 +72,10 @@ DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 + %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -86,12 +85,17 @@ %doc README COPYING CHANGES %doc examples + %files doc %defattr(-,root,root,-) %doc doc/html %changelog +* Wed May 10 2006 Gerard Milmeister - 2.6.0-4 +- rebuilt for ocaml 3.09.2 +- removed unnecessary ldconfig + * Sun Jan 1 2006 Gerard Milmeister - 2.6.0-1 - new version 2.6.0 From fedora-extras-commits at redhat.com Wed May 10 18:09:01 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 11:09:01 -0700 Subject: rpms/lablgl/devel lablgl.spec,1.16,1.17 Message-ID: <200605101809.k4AI93Z2016781@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16719/devel Modified Files: lablgl.spec Log Message: rebuilt for ocaml 3.09.2 Index: lablgl.spec =================================================================== RCS file: /cvs/extras/rpms/lablgl/devel/lablgl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lablgl.spec 26 Feb 2006 13:11:06 -0000 1.16 +++ lablgl.spec 10 May 2006 18:09:00 -0000 1.17 @@ -1,6 +1,6 @@ Name: lablgl Version: 1.02 -Release: 6%{?dist} +Release: 7%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -31,9 +31,11 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. + %prep %setup -q + %build cat > Makefile.config < - 1.02-7 +- rebuilt for ocaml 3.09.2 + * Sun Feb 26 2006 Gerard Milmeister - 1.02-4 - Rebuild for ocaml 3.09.1 From fedora-extras-commits at redhat.com Wed May 10 18:08:53 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 11:08:53 -0700 Subject: rpms/lablgl/FC-3 lablgl.spec,1.8,1.9 Message-ID: <200605101809.k4AI9P2M016786@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16719/FC-3 Modified Files: lablgl.spec Log Message: rebuilt for ocaml 3.09.2 Index: lablgl.spec =================================================================== RCS file: /cvs/extras/rpms/lablgl/FC-3/lablgl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lablgl.spec 1 Nov 2005 15:39:10 -0000 1.8 +++ lablgl.spec 10 May 2006 18:08:53 -0000 1.9 @@ -1,6 +1,6 @@ Name: lablgl Version: 1.02 -Release: 2%{?dist} +Release: 7%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -21,9 +21,11 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. + %prep %setup -q + %build cat > Makefile.config < - 1.02-7 +- rebuilt for ocaml 3.09.2 + * Tue Nov 1 2005 Gerard Milmeister - 1.02-2 - build opt libraries From fedora-extras-commits at redhat.com Wed May 10 18:08:55 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 11:08:55 -0700 Subject: rpms/lablgl/FC-5 lablgl.spec,1.16,1.17 Message-ID: <200605101809.k4AI9Rf6016790@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16719/FC-5 Modified Files: lablgl.spec Log Message: rebuilt for ocaml 3.09.2 Index: lablgl.spec =================================================================== RCS file: /cvs/extras/rpms/lablgl/FC-5/lablgl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lablgl.spec 26 Feb 2006 13:11:06 -0000 1.16 +++ lablgl.spec 10 May 2006 18:08:55 -0000 1.17 @@ -1,6 +1,6 @@ Name: lablgl Version: 1.02 -Release: 6%{?dist} +Release: 7%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -31,9 +31,11 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. + %prep %setup -q + %build cat > Makefile.config < - 1.02-7 +- rebuilt for ocaml 3.09.2 + * Sun Feb 26 2006 Gerard Milmeister - 1.02-4 - Rebuild for ocaml 3.09.1 From fedora-extras-commits at redhat.com Wed May 10 18:08:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 10 May 2006 11:08:54 -0700 Subject: rpms/lablgl/FC-4 lablgl.spec,1.14,1.15 Message-ID: <200605101809.k4AI9QiK016789@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/lablgl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16719/FC-4 Modified Files: lablgl.spec Log Message: rebuilt for ocaml 3.09.2 Index: lablgl.spec =================================================================== RCS file: /cvs/extras/rpms/lablgl/FC-4/lablgl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lablgl.spec 26 Feb 2006 12:49:41 -0000 1.14 +++ lablgl.spec 10 May 2006 18:08:54 -0000 1.15 @@ -1,6 +1,6 @@ Name: lablgl Version: 1.02 -Release: 4%{?dist} +Release: 7%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -26,9 +26,11 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. + %prep %setup -q + %build cat > Makefile.config < - 1.02-7 +- rebuilt for ocaml 3.09.2 + * Sun Feb 26 2006 Gerard Milmeister - 1.02-3 - Rebuild for ocaml 3.09.1 From fedora-extras-commits at redhat.com Wed May 10 18:40:46 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 10 May 2006 11:40:46 -0700 Subject: fedora-security/audit fe4,1.15,1.16 fe5,1.15,1.16 Message-ID: <200605101840.k4AIekj1017115@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17095 Modified Files: fe4 fe5 Log Message: add more CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fe4 9 May 2006 06:25:16 -0000 1.15 +++ fe4 10 May 2006 18:40:43 -0000 1.16 @@ -16,7 +16,9 @@ CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) +CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 +CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1269 patch (zoo, fixed 2.10-7) bz#183109 CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 @@ -34,6 +36,7 @@ CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) +CVE-2006-0106 version (wine, fixed 0.9.10) CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fe5 9 May 2006 06:25:16 -0000 1.15 +++ fe5 10 May 2006 18:40:43 -0000 1.16 @@ -18,7 +18,9 @@ CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 +CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 +CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353 CVE-2006-1329 version (jabberd, fixed 2.0s11) CVE-2006-1269 patch (zoo, fixed 2.10-7) bz#183109 CVE-2006-1251 ignore (exim-sa, configuration not vulnerable) bz#191082 @@ -36,6 +38,7 @@ CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) +CVE-2006-0106 version (wine, fixed 0.9.10) CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) From fedora-extras-commits at redhat.com Wed May 10 18:53:09 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 10 May 2006 11:53:09 -0700 Subject: fedora-security/audit fe4,1.16,1.17 fe5,1.16,1.17 Message-ID: <200605101853.k4AIr9Dp017226@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17202 Modified Files: fe4 fe5 Log Message: add clamav CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fe4 10 May 2006 18:40:43 -0000 1.16 +++ fe4 10 May 2006 18:53:06 -0000 1.17 @@ -13,7 +13,10 @@ CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 +CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286 +CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) @@ -35,6 +38,7 @@ CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0162 version (clamav, fixed 0.88) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) CVE-2006-0106 version (wine, fixed 0.9.10) CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fe5 10 May 2006 18:40:43 -0000 1.16 +++ fe5 10 May 2006 18:53:06 -0000 1.17 @@ -14,7 +14,10 @@ CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 CVE-2006-1656 version (util-vserver, fixed 0.30.210) +CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 +CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286 +CVE-2006-1614 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 @@ -37,6 +40,7 @@ CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0162 version (clamav, fixed 0.88) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) CVE-2006-0106 version (wine, fixed 0.9.10) CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) From fedora-extras-commits at redhat.com Wed May 10 19:14:11 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 10 May 2006 12:14:11 -0700 Subject: fedora-security/audit fe4,1.17,1.18 fe5,1.17,1.18 Message-ID: <200605101914.k4AJEBkb020509@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20488 Modified Files: fe4 fe5 Log Message: add seamonkey CVEs Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fe4 10 May 2006 18:53:06 -0000 1.17 +++ fe4 10 May 2006 19:14:08 -0000 1.18 @@ -12,6 +12,26 @@ CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-2) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1742 version (seamonkey, fixed 1.0) +CVE-2006-1741 version (seamonkey, fixed 1.0) +CVE-2006-1740 version (seamonkey, fixed 1.0) +CVE-2006-1739 version (seamonkey, fixed 1.0) +CVE-2006-1738 version (seamonkey, fixed 1.0) +CVE-2006-1737 version (seamonkey, fixed 1.0) +CVE-2006-1736 version (seamonkey, fixed 1.0) +CVE-2006-1735 version (seamonkey, fixed 1.0) +CVE-2006-1734 version (seamonkey, fixed 1.0) +CVE-2006-1733 version (seamonkey, fixed 1.0) +CVE-2006-1732 version (seamonkey, fixed 1.0) +CVE-2006-1731 version (seamonkey, fixed 1.0) +CVE-2006-1730 version (seamonkey, fixed 1.0.1) +CVE-2006-1729 version (seamonkey, fixed 1.0.1) +CVE-2006-1728 version (seamonkey, fixed 1.0.1) +CVE-2006-1727 version (seamonkey, fixed 1.0.1) +CVE-2006-1726 version (seamonkey, fixed 1.0.1) +CVE-2006-1725 version (seamonkey, fixed 1.0.1) +CVE-2006-1724 version (seamonkey, fixed 1.0.1) +CVE-2006-1723 version (seamonkey, fixed 1.0.1) CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 @@ -20,6 +40,9 @@ CVE-2006-1577 VULNERABLE (mantis) bz#191089 CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) +CVE-2006-1531 version (seamonkey, fixed 1.0.1) +CVE-2006-1530 version (seamonkey, fixed 1.0.1) +CVE-2006-1529 version (seamonkey, fixed 1.0.1) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353 CVE-2006-1329 version (jabberd, fixed 2.0s11) @@ -33,11 +56,19 @@ CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0749 version (seamonkey, fixed 1.0) +CVE-2006-0748 version (seamonkey, fixed 1.0.1) CVE-2006-0665 VULNERABLE (mantis) bz#191089 CVE-2006-0664 VULNERABLE (mantis) bz#191089 CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0299 version (seamonkey, fixed 1.0) +CVE-2006-0298 version (seamonkey, fixed 1.0) +CVE-2006-0297 version (seamonkey, fixed 1.0) +CVE-2006-0296 version (seamonkey, fixed 1.0) +CVE-2006-0295 version (seamonkey, fixed 1.0) +CVE-2006-0294 version (seamonkey, fixed 1.0) CVE-2006-0162 version (clamav, fixed 0.88) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) CVE-2006-0106 version (wine, fixed 0.9.10) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fe5 10 May 2006 18:53:06 -0000 1.17 +++ fe5 10 May 2006 19:14:08 -0000 1.18 @@ -12,6 +12,26 @@ CVE-2006-1989 version (clamav, fixed 0.88.2) CVE-2006-1945 backport (awstats, fixed 6.5-4) bz#190922 awstats-6.5-CVE-2006-1945.patch CVE-2006-1900 version (amaya, fixed 9.5) bz#190324 +CVE-2006-1742 version (seamonkey, fixed 1.0) +CVE-2006-1741 version (seamonkey, fixed 1.0) +CVE-2006-1740 version (seamonkey, fixed 1.0) +CVE-2006-1739 version (seamonkey, fixed 1.0) +CVE-2006-1738 version (seamonkey, fixed 1.0) +CVE-2006-1737 version (seamonkey, fixed 1.0) +CVE-2006-1736 version (seamonkey, fixed 1.0) +CVE-2006-1735 version (seamonkey, fixed 1.0) +CVE-2006-1734 version (seamonkey, fixed 1.0) +CVE-2006-1733 version (seamonkey, fixed 1.0) +CVE-2006-1732 version (seamonkey, fixed 1.0) +CVE-2006-1731 version (seamonkey, fixed 1.0) +CVE-2006-1730 version (seamonkey, fixed 1.0.1) +CVE-2006-1729 version (seamonkey, fixed 1.0.1) +CVE-2006-1728 version (seamonkey, fixed 1.0.1) +CVE-2006-1727 version (seamonkey, fixed 1.0.1) +CVE-2006-1726 version (seamonkey, fixed 1.0.1) +CVE-2006-1725 version (seamonkey, fixed 1.0.1) +CVE-2006-1724 version (seamonkey, fixed 1.0.1) +CVE-2006-1723 version (seamonkey, fixed 1.0.1) CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 CVE-2006-1656 version (util-vserver, fixed 0.30.210) CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 @@ -22,6 +42,9 @@ CVE-2006-1566 ignore (libtunepimp, Debian-specific problem) CVE-2006-1550 version (dia, fixed 0.95) bz#187556 CVE-2006-1539 ignore (bsd-games, Gentoo-specific problem) +CVE-2006-1531 version (seamonkey, fixed 1.0.1) +CVE-2006-1530 version (seamonkey, fixed 1.0.1) +CVE-2006-1529 version (seamonkey, fixed 1.0.1) CVE-2006-1498 version (mediawiki, fixed 1.5.8) bz#188122 CVE-2006-1390 ignore (nethack, Gentoo-specific problem) bz#187353 CVE-2006-1329 version (jabberd, fixed 2.0s11) @@ -35,11 +58,19 @@ CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 CVE-2006-0814 ignore (lighttpd, Windows-specific problem) CVE-2006-0760 version (lighttpd, fixed 1.4.10) +CVE-2006-0749 version (seamonkey, fixed 1.0) +CVE-2006-0748 version (seamonkey, fixed 1.0.1) CVE-2006-0665 version (mantis, fixed 1.0.1) CVE-2006-0664 version (mantis, fixed 1.0.1) CVE-2006-0645 version (libtasn1, fixed 0.3.0) bz#184097 CVE-2006-0458 version (irssi, fixed 0.8.10) bz#184509 CVE-2006-0322 version (mediawiki, fixed 1.5.8) +CVE-2006-0299 version (seamonkey, fixed 1.0) +CVE-2006-0298 version (seamonkey, fixed 1.0) +CVE-2006-0297 version (seamonkey, fixed 1.0) +CVE-2006-0296 version (seamonkey, fixed 1.0) +CVE-2006-0295 version (seamonkey, fixed 1.0) +CVE-2006-0294 version (seamonkey, fixed 1.0) CVE-2006-0162 version (clamav, fixed 0.88) CVE-2006-0126 version (rxvt-unicode, fixed 7.5) CVE-2006-0106 version (wine, fixed 0.9.10) From fedora-extras-commits at redhat.com Wed May 10 20:15:58 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 May 2006 13:15:58 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo-20051208-aspellenc-190151.patch, NONE, 1.1 xemacs-sumo-20060510-browse-url-htmlview-84262.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xemacs-sumo.spec, 1.17, 1.18 browse-url-htmlview-84262.patch, 1.1, NONE xemacs-sumo-20051208-latin-unity-kludge.patch, 1.1, NONE xemacs-sumo-20051208-pydoc-path.patch, 1.1, NONE Message-ID: <200605102016.k4AKG0ha023317@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/FC-5 Modified Files: .cvsignore sources xemacs-sumo.spec Added Files: xemacs-sumo-20051208-aspellenc-190151.patch xemacs-sumo-20060510-browse-url-htmlview-84262.patch Removed Files: browse-url-htmlview-84262.patch xemacs-sumo-20051208-latin-unity-kludge.patch xemacs-sumo-20051208-pydoc-path.patch Log Message: * Wed May 10 2006 Ville Skytt?? - 20060510-1 - 2006-05-10; pydoc and latin-unity patches applied upstream. - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). - Drop no longer relevant obsoletes and conflicts. - Add version to xemacs-common dependency. - Fix build with XEmacs 21.5.x. - Don't ship mule-ucs for 21.5.x. - Require main package in -info. xemacs-sumo-20051208-aspellenc-190151.patch: --- NEW FILE xemacs-sumo-20051208-aspellenc-190151.patch --- --- xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el~ 2005-10-16 19:47:08.000000000 +0300 +++ xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el 2006-04-29 22:42:03.000000000 +0300 @@ -2249,6 +2249,12 @@ (expand-file-name ispell-personal-dictionary))))) (setq args (append args ispell-extra-args)) + ;; Fix encoding with aspell >= 0.60 (and blindly assume it's >= 0.60 + ;; if it looks like aspell :P) + (when (string-match "^aspell" (file-name-nondirectory ispell-program-name)) + (add-to-list + 'args (concat "--encoding=" (symbol-name (ispell-get-coding-system))))) + (if ispell-async-processp (let ((process-connection-type ispell-use-ptys-p)) (apply 'start-process xemacs-sumo-20060510-browse-url-htmlview-84262.patch: --- NEW FILE xemacs-sumo-20060510-browse-url-htmlview-84262.patch --- --- xemacs-packages/lisp/mail-lib/browse-url.el~ 2005-03-09 13:14:56.000000000 +0200 +++ xemacs-packages/lisp/mail-lib/browse-url.el 2006-05-10 20:35:52.000000000 +0300 @@ -566,7 +566,7 @@ :group 'browse-url) ;;;###autoload -(defcustom browse-url-generic-program nil +(defcustom browse-url-generic-program "htmlview" "*The name of the browser program used by `browse-url-generic'." :type '(choice string (const :tag "None" nil)) :group 'browse-url) @@ -615,12 +615,12 @@ :type 'number :group 'browse-url) -(defcustom browse-url-kde-program "kfmclient" +(defcustom browse-url-kde-program "konqueror" "*The name by which to invoke the KDE web browser." :type 'string :group 'browse-url) -(defcustom browse-url-kde-args '("openURL") +(defcustom browse-url-kde-args nil "*A list of strings defining options for `browse-url-kde-program'." :type '(repeat (string :tag "Argument")) :group 'browse-url) @@ -872,6 +872,7 @@ xterm, MMM, and then W3." (apply (cond + (browse-url-generic-program 'browse-url-generic) ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) ((executable-find browse-url-firefox-program) 'browse-url-firefox) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Feb 2006 15:16:39 -0000 1.8 +++ .cvsignore 10 May 2006 20:15:58 -0000 1.9 @@ -1,3 +1,2 @@ -xemacs-mule-sumo-2005-12-08.tar.bz2 -xemacs-sumo-2005-12-08.tar.bz2 -gnus-1.89-pkg.tar.gz +xemacs-mule-sumo-2006-05-10.tar.bz2 +xemacs-sumo-2006-05-10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Feb 2006 15:16:39 -0000 1.8 +++ sources 10 May 2006 20:15:58 -0000 1.9 @@ -1,3 +1,2 @@ -553da38bc36b4365ab98e0565a0530b8 xemacs-mule-sumo-2005-12-08.tar.bz2 -1927c40affd04ff7c10b979ef24548d0 xemacs-sumo-2005-12-08.tar.bz2 -e7707178416716eac643af29c437f619 gnus-1.89-pkg.tar.gz +62cce3c50de3b102df15e1e223b79dbd xemacs-mule-sumo-2006-05-10.tar.bz2 +242938f820b85ae27e8584de3afbcb80 xemacs-sumo-2006-05-10.tar.bz2 Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xemacs-sumo.spec 5 Mar 2006 19:20:41 -0000 1.17 +++ xemacs-sumo.spec 10 May 2006 20:15:58 -0000 1.18 @@ -1,10 +1,11 @@ -%define sumo 2005-12-08 +%define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla +%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 2 +Release: 1%{?dist} Summary: XEmacs lisp packages Group: Applications/Editors @@ -12,7 +13,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: ftp://ftp.xemacs.org/packages/gnus-1.89-pkg.tar.gz Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -22,13 +22,12 @@ Source16: Emacs.ad.zh_CN.UTF-8 Source17: Emacs.ad.zh_TW.UTF-8 Patch0: %{name}-20051208-hypb-posix.patch -Patch1: %{name}-20051208-pydoc-path.patch -Patch2: %{name}-20051208-latin-unity-kludge.patch +Patch1: %{name}-20051208-aspellenc-190151.patch Patch3: %{name}-20051208-trax.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 +Patch11: %{name}-20060510-browse-url-htmlview-84262.patch Patch12: psgml-browsers-84262.patch Patch15: avoid-catch-error-65346.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,14 +39,12 @@ BuildRequires: %{__python} BuildRequires: %{__perl} BuildRequires: java-devel -Requires: xemacs-common +Requires: xemacs-common >= %{xemver} # Fake release in this provision in order to avoid self-obsoletion (for now). Provides: apel-xemacs = 10.6-6 Provides: ruby-mode-xemacs Obsoletes: apel-xemacs < 10.6-6 Obsoletes: ruby-mode-xemacs -Obsoletes: tm -Conflicts: xemacs < 21.4.12-12 %description XEmacs is a highly customizable open source text editor and @@ -65,7 +62,6 @@ 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 @@ -75,7 +71,7 @@ %package info Summary: XEmacs packages documentation in GNU texinfo format Group: Documentation -Conflicts: xemacs-info < 21.4.12-12 +Requires: xemacs-sumo = %{version} %description info This package contains optional documentation for the XEmacs Sumo @@ -84,17 +80,12 @@ %prep %setup -q -c -a1 -tar zxf %{SOURCE2} -C xemacs-packages # get rid of csh dependency %patch0 -p0 rm xemacs-packages/lisp/hyperbole/file-newer -# find pydoc_lisp.py out-of-the-box -%patch1 -p0 -install -dm 755 xemacs-packages/etc/python-modes -mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes} -# support write-region's kludge in latin-unity -%patch2 -p0 +# adapt ispell.el to aspell >= 0.60's encoding behaviour, #190151 +%patch1 -p1 # use TrAX by default in xslt-process %patch3 -p0 # fix jlatex autodetection @@ -113,7 +104,8 @@ sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \ xemacs-packages/etc/bbdb/*.pl -chmod -c -x xemacs-packages/lisp/edit-utils/crm.el +chmod -c -x xemacs-packages/lisp/edit-utils/crm.el \ + xemacs-packages/{lisp/erc/ChangeLog.2005.upstream,man/erc/erc.texi} # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* @@ -135,11 +127,18 @@ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk +# not needed (and unusable) with >= 21.5 +if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then +%{xemacsb} -l package-admin -eval \ + "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" +rm -rf mule-packages/{etc,lisp,man}/mule-ucs +fi + %build export EMACSPACKAGEPATH=`pwd` -%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \ - -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* +%{xemacsb} -no-autoloads -l autoload -eval "(setq make-backup-files nil)" \ + -f batch-update-autoloads xemacs-packages/lisp/* mule-packages/lisp/* %{xemacsb} -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp @@ -225,6 +224,15 @@ %changelog +* Wed May 10 2006 Ville Skytt?? - 20060510-1 +- 2006-05-10; pydoc and latin-unity patches applied upstream. +- Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). +- Drop no longer relevant obsoletes and conflicts. +- Add version to xemacs-common dependency. +- Fix build with XEmacs 21.5.x. +- Don't ship mule-ucs for 21.5.x. +- Require main package in -info. + * Fri Mar 3 2006 Ville Skytt?? - 20051208-2 - Drop JDE; the full source for jde.jar doesn't seem to be available and even the included parts won't build with gcj eg. due to use of --- browse-url-htmlview-84262.patch DELETED --- --- xemacs-sumo-20051208-latin-unity-kludge.patch DELETED --- --- xemacs-sumo-20051208-pydoc-path.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 10 20:15:59 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 May 2006 13:15:59 -0700 Subject: rpms/xemacs-sumo/devel xemacs-sumo-20051208-aspellenc-190151.patch, NONE, 1.1 xemacs-sumo-20060510-browse-url-htmlview-84262.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xemacs-sumo.spec, 1.17, 1.18 browse-url-htmlview-84262.patch, 1.1, NONE xemacs-sumo-20051208-latin-unity-kludge.patch, 1.1, NONE xemacs-sumo-20051208-pydoc-path.patch, 1.1, NONE Message-ID: <200605102016.k4AKG1RH023327@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23272/devel Modified Files: .cvsignore sources xemacs-sumo.spec Added Files: xemacs-sumo-20051208-aspellenc-190151.patch xemacs-sumo-20060510-browse-url-htmlview-84262.patch Removed Files: browse-url-htmlview-84262.patch xemacs-sumo-20051208-latin-unity-kludge.patch xemacs-sumo-20051208-pydoc-path.patch Log Message: * Wed May 10 2006 Ville Skytt?? - 20060510-1 - 2006-05-10; pydoc and latin-unity patches applied upstream. - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). - Drop no longer relevant obsoletes and conflicts. - Add version to xemacs-common dependency. - Fix build with XEmacs 21.5.x. - Don't ship mule-ucs for 21.5.x. - Require main package in -info. xemacs-sumo-20051208-aspellenc-190151.patch: --- NEW FILE xemacs-sumo-20051208-aspellenc-190151.patch --- --- xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el~ 2005-10-16 19:47:08.000000000 +0300 +++ xemacs-sumo-20051208/xemacs-packages/lisp/ispell/ispell.el 2006-04-29 22:42:03.000000000 +0300 @@ -2249,6 +2249,12 @@ (expand-file-name ispell-personal-dictionary))))) (setq args (append args ispell-extra-args)) + ;; Fix encoding with aspell >= 0.60 (and blindly assume it's >= 0.60 + ;; if it looks like aspell :P) + (when (string-match "^aspell" (file-name-nondirectory ispell-program-name)) + (add-to-list + 'args (concat "--encoding=" (symbol-name (ispell-get-coding-system))))) + (if ispell-async-processp (let ((process-connection-type ispell-use-ptys-p)) (apply 'start-process xemacs-sumo-20060510-browse-url-htmlview-84262.patch: --- NEW FILE xemacs-sumo-20060510-browse-url-htmlview-84262.patch --- --- xemacs-packages/lisp/mail-lib/browse-url.el~ 2005-03-09 13:14:56.000000000 +0200 +++ xemacs-packages/lisp/mail-lib/browse-url.el 2006-05-10 20:35:52.000000000 +0300 @@ -566,7 +566,7 @@ :group 'browse-url) ;;;###autoload -(defcustom browse-url-generic-program nil +(defcustom browse-url-generic-program "htmlview" "*The name of the browser program used by `browse-url-generic'." :type '(choice string (const :tag "None" nil)) :group 'browse-url) @@ -615,12 +615,12 @@ :type 'number :group 'browse-url) -(defcustom browse-url-kde-program "kfmclient" +(defcustom browse-url-kde-program "konqueror" "*The name by which to invoke the KDE web browser." :type 'string :group 'browse-url) -(defcustom browse-url-kde-args '("openURL") +(defcustom browse-url-kde-args nil "*A list of strings defining options for `browse-url-kde-program'." :type '(repeat (string :tag "Argument")) :group 'browse-url) @@ -872,6 +872,7 @@ xterm, MMM, and then W3." (apply (cond + (browse-url-generic-program 'browse-url-generic) ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) ((executable-find browse-url-firefox-program) 'browse-url-firefox) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Feb 2006 15:16:39 -0000 1.8 +++ .cvsignore 10 May 2006 20:15:59 -0000 1.9 @@ -1,3 +1,2 @@ -xemacs-mule-sumo-2005-12-08.tar.bz2 -xemacs-sumo-2005-12-08.tar.bz2 -gnus-1.89-pkg.tar.gz +xemacs-mule-sumo-2006-05-10.tar.bz2 +xemacs-sumo-2006-05-10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Feb 2006 15:16:39 -0000 1.8 +++ sources 10 May 2006 20:15:59 -0000 1.9 @@ -1,3 +1,2 @@ -553da38bc36b4365ab98e0565a0530b8 xemacs-mule-sumo-2005-12-08.tar.bz2 -1927c40affd04ff7c10b979ef24548d0 xemacs-sumo-2005-12-08.tar.bz2 -e7707178416716eac643af29c437f619 gnus-1.89-pkg.tar.gz +62cce3c50de3b102df15e1e223b79dbd xemacs-mule-sumo-2006-05-10.tar.bz2 +242938f820b85ae27e8584de3afbcb80 xemacs-sumo-2006-05-10.tar.bz2 Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xemacs-sumo.spec 5 Mar 2006 19:20:41 -0000 1.17 +++ xemacs-sumo.spec 10 May 2006 20:15:59 -0000 1.18 @@ -1,10 +1,11 @@ -%define sumo 2005-12-08 +%define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla +%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 2 +Release: 1%{?dist} Summary: XEmacs lisp packages Group: Applications/Editors @@ -12,7 +13,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: ftp://ftp.xemacs.org/packages/gnus-1.89-pkg.tar.gz Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -22,13 +22,12 @@ Source16: Emacs.ad.zh_CN.UTF-8 Source17: Emacs.ad.zh_TW.UTF-8 Patch0: %{name}-20051208-hypb-posix.patch -Patch1: %{name}-20051208-pydoc-path.patch -Patch2: %{name}-20051208-latin-unity-kludge.patch +Patch1: %{name}-20051208-aspellenc-190151.patch Patch3: %{name}-20051208-trax.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 +Patch11: %{name}-20060510-browse-url-htmlview-84262.patch Patch12: psgml-browsers-84262.patch Patch15: avoid-catch-error-65346.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,14 +39,12 @@ BuildRequires: %{__python} BuildRequires: %{__perl} BuildRequires: java-devel -Requires: xemacs-common +Requires: xemacs-common >= %{xemver} # Fake release in this provision in order to avoid self-obsoletion (for now). Provides: apel-xemacs = 10.6-6 Provides: ruby-mode-xemacs Obsoletes: apel-xemacs < 10.6-6 Obsoletes: ruby-mode-xemacs -Obsoletes: tm -Conflicts: xemacs < 21.4.12-12 %description XEmacs is a highly customizable open source text editor and @@ -65,7 +62,6 @@ 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 @@ -75,7 +71,7 @@ %package info Summary: XEmacs packages documentation in GNU texinfo format Group: Documentation -Conflicts: xemacs-info < 21.4.12-12 +Requires: xemacs-sumo = %{version} %description info This package contains optional documentation for the XEmacs Sumo @@ -84,17 +80,12 @@ %prep %setup -q -c -a1 -tar zxf %{SOURCE2} -C xemacs-packages # get rid of csh dependency %patch0 -p0 rm xemacs-packages/lisp/hyperbole/file-newer -# find pydoc_lisp.py out-of-the-box -%patch1 -p0 -install -dm 755 xemacs-packages/etc/python-modes -mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes} -# support write-region's kludge in latin-unity -%patch2 -p0 +# adapt ispell.el to aspell >= 0.60's encoding behaviour, #190151 +%patch1 -p1 # use TrAX by default in xslt-process %patch3 -p0 # fix jlatex autodetection @@ -113,7 +104,8 @@ sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \ xemacs-packages/etc/bbdb/*.pl -chmod -c -x xemacs-packages/lisp/edit-utils/crm.el +chmod -c -x xemacs-packages/lisp/edit-utils/crm.el \ + xemacs-packages/{lisp/erc/ChangeLog.2005.upstream,man/erc/erc.texi} # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* @@ -135,11 +127,18 @@ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk +# not needed (and unusable) with >= 21.5 +if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then +%{xemacsb} -l package-admin -eval \ + "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" +rm -rf mule-packages/{etc,lisp,man}/mule-ucs +fi + %build export EMACSPACKAGEPATH=`pwd` -%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \ - -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* +%{xemacsb} -no-autoloads -l autoload -eval "(setq make-backup-files nil)" \ + -f batch-update-autoloads xemacs-packages/lisp/* mule-packages/lisp/* %{xemacsb} -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp @@ -225,6 +224,15 @@ %changelog +* Wed May 10 2006 Ville Skytt?? - 20060510-1 +- 2006-05-10; pydoc and latin-unity patches applied upstream. +- Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). +- Drop no longer relevant obsoletes and conflicts. +- Add version to xemacs-common dependency. +- Fix build with XEmacs 21.5.x. +- Don't ship mule-ucs for 21.5.x. +- Require main package in -info. + * Fri Mar 3 2006 Ville Skytt?? - 20051208-2 - Drop JDE; the full source for jde.jar doesn't seem to be available and even the included parts won't build with gcj eg. due to use of --- browse-url-htmlview-84262.patch DELETED --- --- xemacs-sumo-20051208-latin-unity-kludge.patch DELETED --- --- xemacs-sumo-20051208-pydoc-path.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 10 20:53:22 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:53:22 -0700 Subject: rpms/libnfnetlink - New directory Message-ID: <200605102053.k4AKrOaH023577@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23556/libnfnetlink Log Message: Directory /cvs/extras/rpms/libnfnetlink added to the repository From fedora-extras-commits at redhat.com Wed May 10 20:53:22 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:53:22 -0700 Subject: rpms/libnfnetlink/devel - New directory Message-ID: <200605102053.k4AKrOZp023580@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23556/libnfnetlink/devel Log Message: Directory /cvs/extras/rpms/libnfnetlink/devel added to the repository From fedora-extras-commits at redhat.com Wed May 10 20:53:55 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:53:55 -0700 Subject: rpms/libnfnetlink Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605102053.k4AKrv3v023630@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23602 Added Files: Makefile import.log Log Message: Setup of module libnfnetlink --- NEW FILE Makefile --- # Top level Makefile for module libnfnetlink all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 10 20:53:55 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:53:55 -0700 Subject: rpms/libnfnetlink/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605102053.k4AKrvBT023633@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23602/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libnfnetlink --- NEW 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 May 10 20:55:16 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:55:16 -0700 Subject: rpms/libnfnetlink import.log,1.1,1.2 Message-ID: <200605102055.k4AKtIxk023705@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23671 Modified Files: import.log Log Message: auto-import libnfnetlink-0.0.14-3 on branch devel from libnfnetlink-0.0.14-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 May 2006 20:53:55 -0000 1.1 +++ import.log 10 May 2006 20:55:16 -0000 1.2 @@ -0,0 +1 @@ +libnfnetlink-0_0_14-3:HEAD:libnfnetlink-0.0.14-3.src.rpm:1147294497 From fedora-extras-commits at redhat.com Wed May 10 20:55:17 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Wed, 10 May 2006 13:55:17 -0700 Subject: rpms/libnfnetlink/devel gpl.txt, NONE, 1.1 libnfnetlink.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605102055.k4AKtJil023710@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnfnetlink/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23671/devel Modified Files: .cvsignore sources Added Files: gpl.txt libnfnetlink.spec Log Message: auto-import libnfnetlink-0.0.14-3 on branch devel from libnfnetlink-0.0.14-3.src.rpm --- NEW FILE gpl.txt --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. --- NEW FILE libnfnetlink.spec --- Name: libnfnetlink Version: 0.0.14 Release: 3%{?dist} Summary: Netfilter netlink userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/libnfnetlink/files/%{name}-%{version}.tar.bz2 Source1: http://www.gnu.org/licenses/gpl.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: %description libnfnetlink is a userspace library that provides some low-level nfnetlink handling functions. It is used as a foundation for other, netfilter subsystem specific libraries such as libnfnetlink_conntrack, libnfnetlink_log and libnfnetlink_queue. %package devel Summary: Netfilter netlink userspace library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel libnfnetlink is a userspace library that provides some low-level nfnetlink handling functions. It is used as a foundation for other, netfilter subsystem specific libraries such as libnfnetlink_conntrack, libnfnetlink_log and libnfnetlink_queue. %prep %setup -q cp %{SOURCE1} LICENSE %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README LICENSE %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/libnfnetlink/*.h %changelog * Mon May 8 2006 Paul P Komkoff Jr - 0.0.14-3 - Include borrowed gpl.txt as LICENSE in %doc * Sun Mar 26 2006 Paul P Komkoff Jr - 0.0.14-1 - Preparing for submission to fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 May 2006 20:53:55 -0000 1.1 +++ .cvsignore 10 May 2006 20:55:17 -0000 1.2 @@ -0,0 +1 @@ +libnfnetlink-0.0.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnfnetlink/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 May 2006 20:53:55 -0000 1.1 +++ sources 10 May 2006 20:55:17 -0000 1.2 @@ -0,0 +1 @@ +420d312cb9754e571a0677631b4777a0 libnfnetlink-0.0.14.tar.bz2 From fedora-extras-commits at redhat.com Wed May 10 21:21:46 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 May 2006 14:21:46 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo.spec,1.18,1.19 Message-ID: <200605102121.k4ALLmFn026137@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26106/FC-5 Modified Files: xemacs-sumo.spec Log Message: Brown paper bag build fix. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xemacs-sumo.spec 10 May 2006 20:15:58 -0000 1.18 +++ xemacs-sumo.spec 10 May 2006 21:21:46 -0000 1.19 @@ -1,7 +1,7 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR) +%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox | cut -d' ' -f 1) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) @@ -128,7 +128,7 @@ rmdir mule-packages/{etc,lisp,man}/skk # not needed (and unusable) with >= 21.5 -if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then +if [ "%{xemver}" '>' "21.5." ] ; then %{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" rm -rf mule-packages/{etc,lisp,man}/mule-ucs From fedora-extras-commits at redhat.com Wed May 10 21:21:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 May 2006 14:21:47 -0700 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.18,1.19 Message-ID: <200605102121.k4ALLnnp026141@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26106/devel Modified Files: xemacs-sumo.spec Log Message: Brown paper bag build fix. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xemacs-sumo.spec 10 May 2006 20:15:59 -0000 1.18 +++ xemacs-sumo.spec 10 May 2006 21:21:46 -0000 1.19 @@ -1,7 +1,7 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox 2>/dev/null || echo ERROR) +%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox | cut -d' ' -f 1) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) @@ -128,7 +128,7 @@ rmdir mule-packages/{etc,lisp,man}/skk # not needed (and unusable) with >= 21.5 -if [ "$(rpm -q --qf=%%{VERSION} xemacs-nox)" '>' "21.5." ] ; then +if [ "%{xemver}" '>' "21.5." ] ; then %{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" rm -rf mule-packages/{etc,lisp,man}/mule-ucs From fedora-extras-commits at redhat.com Wed May 10 21:41:39 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 10 May 2006 14:41:39 -0700 Subject: extras-buildsys/utils extras-push-new,1.5,1.6 Message-ID: <200605102141.k4ALfdJJ026298@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26277 Modified Files: extras-push-new Log Message: - add a safety check on whether ~/.rpmmacros might not be set up Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- extras-push-new 10 May 2006 15:13:08 -0000 1.5 +++ extras-push-new 10 May 2006 21:41:37 -0000 1.6 @@ -51,6 +51,7 @@ 'repoclosure' : False, 'gidcheck' : True, 'setumask' : True, + 'signkeycheck' : True, 'mail' : True, 'doublesync' : True, 'force' : False @@ -419,6 +420,11 @@ print 'ERROR: Change into extras_signers group before running this! Use "newgrp extras_signers".' sys.exit(13) + if config['signkeycheck']: + if 'extras at fedoraproject.org' != os.popen('rpm --eval %_gpg_name','r').read().rstrip(): + print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!' + sys.exit(13) + if config['setumask']: os.umask(0002) From fedora-extras-commits at redhat.com Wed May 10 22:33:09 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Wed, 10 May 2006 15:33:09 -0700 Subject: rpms/cfengine/devel .cvsignore, 1.11, 1.12 cfengine.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200605102233.k4AMXBG5028738@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28717 Modified Files: .cvsignore cfengine.spec sources Log Message: patch for ipv6 buffer overflow (#190822) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Apr 2006 12:50:33 -0000 1.11 +++ .cvsignore 10 May 2006 22:33:08 -0000 1.12 @@ -1,3 +1,4 @@ +cfengine-2.1.20-ipv6-overflow.patch cfengine-2.1.20.tar.gz cfenvd cfexecd Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cfengine.spec 1 Apr 2006 12:50:33 -0000 1.17 +++ cfengine.spec 10 May 2006 22:33:08 -0000 1.18 @@ -1,13 +1,14 @@ Summary: A systems administration tool for networks Name: cfengine Version: 2.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd +Patch0: cfengine-2.1.20-ipv6-overflow.patch URL: http://www.cfengine.org/ BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel Requires(post): /sbin/chkconfig, /sbin/install-info @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .ipv6-overflow %build @@ -118,6 +120,9 @@ %changelog +* Mon May 8 2006 Jeff Sheltren - 2.1.20-3 +- Patch for buffer overflow when using ipv6 addresses (#190822) + * Fri Mar 31 2006 Jeff Sheltren - 2.1.20-1 - Update to upstream 2.1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Apr 2006 12:50:33 -0000 1.11 +++ sources 10 May 2006 22:33:08 -0000 1.12 @@ -1,3 +1,4 @@ +a30e414c5b51271c4d263be8043ecb07 cfengine-2.1.20-ipv6-overflow.patch 2510349fef9ccc47d80f133d4a35322e cfengine-2.1.20.tar.gz 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd From fedora-extras-commits at redhat.com Wed May 10 22:36:34 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Wed, 10 May 2006 15:36:34 -0700 Subject: rpms/cfengine/FC-5 .cvsignore, 1.11, 1.12 cfengine.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200605102236.k4AMaanx028781@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28760 Modified Files: .cvsignore cfengine.spec sources Log Message: patch for ipv6 buffer overflow (#190822) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Apr 2006 12:43:07 -0000 1.11 +++ .cvsignore 10 May 2006 22:36:34 -0000 1.12 @@ -2,3 +2,4 @@ cfenvd cfexecd cfservd +cfengine-2.1.20-ipv6-overflow.patch Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-5/cfengine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cfengine.spec 1 Apr 2006 12:43:07 -0000 1.17 +++ cfengine.spec 10 May 2006 22:36:34 -0000 1.18 @@ -1,13 +1,14 @@ Summary: A systems administration tool for networks Name: cfengine Version: 2.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd +Patch0: cfengine-2.1.20-ipv6-overflow.patch URL: http://www.cfengine.org/ BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel Requires(post): /sbin/chkconfig, /sbin/install-info @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .ipv6-overflow %build @@ -118,6 +120,9 @@ %changelog +* Mon May 8 2006 Jeff Sheltren - 2.1.20-3 +- Patch for buffer overflow when using ipv6 addresses (#190822) + * Fri Mar 31 2006 Jeff Sheltren - 2.1.20-1 - Update to upstream 2.1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Apr 2006 12:43:07 -0000 1.11 +++ sources 10 May 2006 22:36:34 -0000 1.12 @@ -2,3 +2,4 @@ 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd +a30e414c5b51271c4d263be8043ecb07 cfengine-2.1.20-ipv6-overflow.patch From fedora-extras-commits at redhat.com Wed May 10 22:37:54 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Wed, 10 May 2006 15:37:54 -0700 Subject: rpms/cfengine/FC-4 .cvsignore, 1.11, 1.12 cfengine.spec, 1.15, 1.16 sources, 1.11, 1.12 Message-ID: <200605102237.k4AMbuQG028821@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28800 Modified Files: .cvsignore cfengine.spec sources Log Message: patch for ipv6 buffer overflow (#190822) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Apr 2006 12:47:11 -0000 1.11 +++ .cvsignore 10 May 2006 22:37:54 -0000 1.12 @@ -2,3 +2,4 @@ cfenvd cfexecd cfservd +cfengine-2.1.20-ipv6-overflow.patch Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/cfengine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cfengine.spec 1 Apr 2006 12:47:11 -0000 1.15 +++ cfengine.spec 10 May 2006 22:37:54 -0000 1.16 @@ -1,13 +1,14 @@ Summary: A systems administration tool for networks Name: cfengine Version: 2.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd +Patch0: cfengine-2.1.20-ipv6-overflow.patch URL: http://www.cfengine.org/ BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel Requires(post): /sbin/chkconfig, /sbin/install-info @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .ipv6-overflow %build @@ -118,6 +120,9 @@ %changelog +* Mon May 8 2006 Jeff Sheltren - 2.1.20-3 +- Patch for buffer overflow when using ipv6 addresses (#190822) + * Fri Mar 31 2006 Jeff Sheltren - 2.1.20-1 - Update to upstream 2.1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Apr 2006 12:47:11 -0000 1.11 +++ sources 10 May 2006 22:37:54 -0000 1.12 @@ -2,3 +2,4 @@ 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd +a30e414c5b51271c4d263be8043ecb07 cfengine-2.1.20-ipv6-overflow.patch From fedora-extras-commits at redhat.com Wed May 10 22:38:58 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Wed, 10 May 2006 15:38:58 -0700 Subject: rpms/cfengine/FC-3 .cvsignore, 1.12, 1.13 cfengine.spec, 1.14, 1.15 sources, 1.12, 1.13 Message-ID: <200605102239.k4AMd0LE028859@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28838 Modified Files: .cvsignore cfengine.spec sources Log Message: patch for ipv6 buffer overflow (#190822) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Apr 2006 12:49:00 -0000 1.12 +++ .cvsignore 10 May 2006 22:38:58 -0000 1.13 @@ -2,3 +2,4 @@ cfenvd cfexecd cfservd +cfengine-2.1.20-ipv6-overflow.patch Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cfengine.spec 1 Apr 2006 12:49:00 -0000 1.14 +++ cfengine.spec 10 May 2006 22:38:58 -0000 1.15 @@ -1,13 +1,14 @@ Summary: A systems administration tool for networks Name: cfengine Version: 2.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd +Patch0: cfengine-2.1.20-ipv6-overflow.patch URL: http://www.cfengine.org/ BuildRequires: db4-devel,openssl-devel,texinfo,tetex,tetex-dvips,bison,flex,m4,libacl-devel Requires(post): /sbin/chkconfig, /sbin/install-info @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .ipv6-overflow %build @@ -118,6 +120,9 @@ %changelog +* Mon May 8 2006 Jeff Sheltren - 2.1.20-3 +- Patch for buffer overflow when using ipv6 addresses (#190822) + * Fri Mar 31 2006 Jeff Sheltren - 2.1.20-1 - Update to upstream 2.1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Apr 2006 12:49:00 -0000 1.12 +++ sources 10 May 2006 22:38:58 -0000 1.13 @@ -2,3 +2,4 @@ 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd +a30e414c5b51271c4d263be8043ecb07 cfengine-2.1.20-ipv6-overflow.patch From fedora-extras-commits at redhat.com Wed May 10 22:40:38 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 10 May 2006 15:40:38 -0700 Subject: rpms/bzr/devel .cvsignore, 1.2, 1.3 bzr-sys-etree.patch, 1.1, 1.2 bzr.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605102240.k4AMeeW9028928@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28866/devel Modified Files: .cvsignore bzr-sys-etree.patch bzr.spec sources Log Message: update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Feb 2006 19:00:25 -0000 1.2 +++ .cvsignore 10 May 2006 22:40:38 -0000 1.3 @@ -1 +1 @@ -bzr-0.7.tar.gz +bzr-0.8.tar.gz bzr-sys-etree.patch: Index: bzr-sys-etree.patch =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/bzr-sys-etree.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-sys-etree.patch 10 Feb 2006 19:00:25 -0000 1.1 +++ bzr-sys-etree.patch 10 May 2006 22:40:38 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur bzr-0.7.orig/bzrlib/xml.py bzr-0.7/bzrlib/xml.py ---- bzr-0.7.orig/bzrlib/xml.py 2006-01-23 01:33:08.000000000 -0800 -+++ bzr-0.7/bzrlib/xml.py 2006-02-10 09:37:34.000000000 -0800 +diff -ru bzr-0.8.orig/bzrlib/xml_serializer.py bzr-0.8/bzrlib/xml_serializer.py +--- bzr-0.8.orig/bzrlib/xml_serializer.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/bzrlib/xml_serializer.py 2006-05-10 15:19:46.000000000 -0700 @@ -30,9 +30,9 @@ except ImportError: mutter('WARNING: using slower ElementTree; consider installing cElementTree' @@ -14,11 +14,11 @@ from bzrlib.errors import BzrError -diff -ur bzr-0.7.orig/setup.py bzr-0.7/setup.py ---- bzr-0.7.orig/setup.py 2006-01-23 01:33:09.000000000 -0800 -+++ bzr-0.7/setup.py 2006-02-10 09:36:39.000000000 -0800 -@@ -96,7 +96,6 @@ - 'bzrlib.transport', +diff -ru bzr-0.8.orig/setup.py bzr-0.8/setup.py +--- bzr-0.8.orig/setup.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/setup.py 2006-05-10 15:20:04.000000000 -0700 +@@ -108,7 +108,6 @@ + 'bzrlib.transport.http', 'bzrlib.ui', 'bzrlib.util', - 'bzrlib.util.elementtree', Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bzr.spec 13 Feb 2006 15:59:24 -0000 1.3 +++ bzr.spec 10 May 2006 22:40:38 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.7 -Release: 3%{dist} +Version: 0.8 +Release: 1%{dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -51,6 +51,16 @@ %{python_sitelib}/bzrlib/*.pyc %ghost %{python_sitelib}/bzrlib/*.pyo +%dir %{python_sitelib}/bzrlib/doc +%{python_sitelib}/bzrlib/doc/*.py +%{python_sitelib}/bzrlib/doc/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/*.pyo + +%dir %{python_sitelib}/bzrlib/doc/api +%{python_sitelib}/bzrlib/doc/api/*.py +%{python_sitelib}/bzrlib/doc/api/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/api/*.pyo + %dir %{python_sitelib}/bzrlib/export %{python_sitelib}/bzrlib/export/*.py %{python_sitelib}/bzrlib/export/*.pyc @@ -81,15 +91,20 @@ %{python_sitelib}/bzrlib/store/*.pyc %ghost %{python_sitelib}/bzrlib/store/*.pyo -%dir %{python_sitelib}/bzrlib/tests -%{python_sitelib}/bzrlib/tests/*.py -%{python_sitelib}/bzrlib/tests/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/*.pyo - -%dir %{python_sitelib}/bzrlib/tests/blackbox -%{python_sitelib}/bzrlib/tests/blackbox/*.py -%{python_sitelib}/bzrlib/tests/blackbox/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo +%dir %{python_sitelib}/bzrlib/store/revision +%{python_sitelib}/bzrlib/store/revision/*.py +%{python_sitelib}/bzrlib/store/revision/*.pyc +%ghost %{python_sitelib}/bzrlib/store/revision/*.pyo + +%dir %{python_sitelib}/bzrlib/store/versioned +%{python_sitelib}/bzrlib/store/versioned/*.py +%{python_sitelib}/bzrlib/store/versioned/*.pyc +%ghost %{python_sitelib}/bzrlib/store/versioned/*.pyo + +%dir %{python_sitelib}/bzrlib/transport/http +%{python_sitelib}/bzrlib/transport/http/*.py +%{python_sitelib}/bzrlib/transport/http/*.pyc +%ghost %{python_sitelib}/bzrlib/transport/http/*.pyo %dir %{python_sitelib}/bzrlib/ui %{python_sitelib}/bzrlib/ui/*.py @@ -101,7 +116,56 @@ %{python_sitelib}/bzrlib/util/effbot/org/*.pyc %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo +%dir %{python_sitelib}/bzrlib/tests +%{python_sitelib}/bzrlib/tests/*.py +%{python_sitelib}/bzrlib/tests/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/blackbox +%{python_sitelib}/bzrlib/tests/blackbox/*.py +%{python_sitelib}/bzrlib/tests/blackbox/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/branch_implementations +%{python_sitelib}/bzrlib/tests/branch_implementations/*.py +%{python_sitelib}/bzrlib/tests/branch_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/branch_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/bzrdir_implementations +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.py +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interrepository_implementations +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.py +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interversionedfile_implementations +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.py +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/repository_implementations +%{python_sitelib}/bzrlib/tests/repository_implementations/*.py +%{python_sitelib}/bzrlib/tests/repository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/repository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/revisionstore_implementations +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.py +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/workingtree_implementations +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.py +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo + %changelog +* Wed May 10 2006 Shahms E. King 0.8-1 +- Update to new upstream version +- Update bzr-sys-etree.patch for changes + * Mon Feb 13 2006 Shahms E. King 0.7-3 - Add python-elementtree to BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Feb 2006 19:00:25 -0000 1.2 +++ sources 10 May 2006 22:40:38 -0000 1.3 @@ -1 +1 @@ -5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz +88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz From fedora-extras-commits at redhat.com Wed May 10 22:40:31 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 10 May 2006 15:40:31 -0700 Subject: rpms/bzr/FC-4 .cvsignore, 1.2, 1.3 bzr-sys-etree.patch, 1.1, 1.2 bzr.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605102241.k4AMf4Wh028938@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28866/FC-4 Modified Files: .cvsignore bzr-sys-etree.patch bzr.spec sources Log Message: update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Feb 2006 19:00:25 -0000 1.2 +++ .cvsignore 10 May 2006 22:40:31 -0000 1.3 @@ -1 +1 @@ -bzr-0.7.tar.gz +bzr-0.8.tar.gz bzr-sys-etree.patch: Index: bzr-sys-etree.patch =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/bzr-sys-etree.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-sys-etree.patch 10 Feb 2006 19:00:25 -0000 1.1 +++ bzr-sys-etree.patch 10 May 2006 22:40:31 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur bzr-0.7.orig/bzrlib/xml.py bzr-0.7/bzrlib/xml.py ---- bzr-0.7.orig/bzrlib/xml.py 2006-01-23 01:33:08.000000000 -0800 -+++ bzr-0.7/bzrlib/xml.py 2006-02-10 09:37:34.000000000 -0800 +diff -ru bzr-0.8.orig/bzrlib/xml_serializer.py bzr-0.8/bzrlib/xml_serializer.py +--- bzr-0.8.orig/bzrlib/xml_serializer.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/bzrlib/xml_serializer.py 2006-05-10 15:19:46.000000000 -0700 @@ -30,9 +30,9 @@ except ImportError: mutter('WARNING: using slower ElementTree; consider installing cElementTree' @@ -14,11 +14,11 @@ from bzrlib.errors import BzrError -diff -ur bzr-0.7.orig/setup.py bzr-0.7/setup.py ---- bzr-0.7.orig/setup.py 2006-01-23 01:33:09.000000000 -0800 -+++ bzr-0.7/setup.py 2006-02-10 09:36:39.000000000 -0800 -@@ -96,7 +96,6 @@ - 'bzrlib.transport', +diff -ru bzr-0.8.orig/setup.py bzr-0.8/setup.py +--- bzr-0.8.orig/setup.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/setup.py 2006-05-10 15:20:04.000000000 -0700 +@@ -108,7 +108,6 @@ + 'bzrlib.transport.http', 'bzrlib.ui', 'bzrlib.util', - 'bzrlib.util.elementtree', Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/bzr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bzr.spec 13 Feb 2006 15:59:18 -0000 1.3 +++ bzr.spec 10 May 2006 22:40:31 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.7 -Release: 3%{dist} +Version: 0.8 +Release: 1%{dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -51,6 +51,16 @@ %{python_sitelib}/bzrlib/*.pyc %ghost %{python_sitelib}/bzrlib/*.pyo +%dir %{python_sitelib}/bzrlib/doc +%{python_sitelib}/bzrlib/doc/*.py +%{python_sitelib}/bzrlib/doc/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/*.pyo + +%dir %{python_sitelib}/bzrlib/doc/api +%{python_sitelib}/bzrlib/doc/api/*.py +%{python_sitelib}/bzrlib/doc/api/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/api/*.pyo + %dir %{python_sitelib}/bzrlib/export %{python_sitelib}/bzrlib/export/*.py %{python_sitelib}/bzrlib/export/*.pyc @@ -81,15 +91,20 @@ %{python_sitelib}/bzrlib/store/*.pyc %ghost %{python_sitelib}/bzrlib/store/*.pyo -%dir %{python_sitelib}/bzrlib/tests -%{python_sitelib}/bzrlib/tests/*.py -%{python_sitelib}/bzrlib/tests/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/*.pyo - -%dir %{python_sitelib}/bzrlib/tests/blackbox -%{python_sitelib}/bzrlib/tests/blackbox/*.py -%{python_sitelib}/bzrlib/tests/blackbox/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo +%dir %{python_sitelib}/bzrlib/store/revision +%{python_sitelib}/bzrlib/store/revision/*.py +%{python_sitelib}/bzrlib/store/revision/*.pyc +%ghost %{python_sitelib}/bzrlib/store/revision/*.pyo + +%dir %{python_sitelib}/bzrlib/store/versioned +%{python_sitelib}/bzrlib/store/versioned/*.py +%{python_sitelib}/bzrlib/store/versioned/*.pyc +%ghost %{python_sitelib}/bzrlib/store/versioned/*.pyo + +%dir %{python_sitelib}/bzrlib/transport/http +%{python_sitelib}/bzrlib/transport/http/*.py +%{python_sitelib}/bzrlib/transport/http/*.pyc +%ghost %{python_sitelib}/bzrlib/transport/http/*.pyo %dir %{python_sitelib}/bzrlib/ui %{python_sitelib}/bzrlib/ui/*.py @@ -101,7 +116,56 @@ %{python_sitelib}/bzrlib/util/effbot/org/*.pyc %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo +%dir %{python_sitelib}/bzrlib/tests +%{python_sitelib}/bzrlib/tests/*.py +%{python_sitelib}/bzrlib/tests/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/blackbox +%{python_sitelib}/bzrlib/tests/blackbox/*.py +%{python_sitelib}/bzrlib/tests/blackbox/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/branch_implementations +%{python_sitelib}/bzrlib/tests/branch_implementations/*.py +%{python_sitelib}/bzrlib/tests/branch_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/branch_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/bzrdir_implementations +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.py +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interrepository_implementations +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.py +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interversionedfile_implementations +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.py +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/repository_implementations +%{python_sitelib}/bzrlib/tests/repository_implementations/*.py +%{python_sitelib}/bzrlib/tests/repository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/repository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/revisionstore_implementations +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.py +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/workingtree_implementations +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.py +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo + %changelog +* Wed May 10 2006 Shahms E. King 0.8-1 +- Update to new upstream version +- Update bzr-sys-etree.patch for changes + * Mon Feb 13 2006 Shahms E. King 0.7-3 - Add python-elementtree to BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Feb 2006 19:00:25 -0000 1.2 +++ sources 10 May 2006 22:40:31 -0000 1.3 @@ -1 +1 @@ -5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz +88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz From fedora-extras-commits at redhat.com Wed May 10 22:40:32 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 10 May 2006 15:40:32 -0700 Subject: rpms/bzr/FC-5 .cvsignore, 1.2, 1.3 bzr-sys-etree.patch, 1.1, 1.2 bzr.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605102241.k4AMf4tZ028947@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28866/FC-5 Modified Files: .cvsignore bzr-sys-etree.patch bzr.spec sources Log Message: update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Feb 2006 19:00:25 -0000 1.2 +++ .cvsignore 10 May 2006 22:40:32 -0000 1.3 @@ -1 +1 @@ -bzr-0.7.tar.gz +bzr-0.8.tar.gz bzr-sys-etree.patch: Index: bzr-sys-etree.patch =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/bzr-sys-etree.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzr-sys-etree.patch 10 Feb 2006 19:00:25 -0000 1.1 +++ bzr-sys-etree.patch 10 May 2006 22:40:32 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur bzr-0.7.orig/bzrlib/xml.py bzr-0.7/bzrlib/xml.py ---- bzr-0.7.orig/bzrlib/xml.py 2006-01-23 01:33:08.000000000 -0800 -+++ bzr-0.7/bzrlib/xml.py 2006-02-10 09:37:34.000000000 -0800 +diff -ru bzr-0.8.orig/bzrlib/xml_serializer.py bzr-0.8/bzrlib/xml_serializer.py +--- bzr-0.8.orig/bzrlib/xml_serializer.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/bzrlib/xml_serializer.py 2006-05-10 15:19:46.000000000 -0700 @@ -30,9 +30,9 @@ except ImportError: mutter('WARNING: using slower ElementTree; consider installing cElementTree' @@ -14,11 +14,11 @@ from bzrlib.errors import BzrError -diff -ur bzr-0.7.orig/setup.py bzr-0.7/setup.py ---- bzr-0.7.orig/setup.py 2006-01-23 01:33:09.000000000 -0800 -+++ bzr-0.7/setup.py 2006-02-10 09:36:39.000000000 -0800 -@@ -96,7 +96,6 @@ - 'bzrlib.transport', +diff -ru bzr-0.8.orig/setup.py bzr-0.8/setup.py +--- bzr-0.8.orig/setup.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/setup.py 2006-05-10 15:20:04.000000000 -0700 +@@ -108,7 +108,6 @@ + 'bzrlib.transport.http', 'bzrlib.ui', 'bzrlib.util', - 'bzrlib.util.elementtree', Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/bzr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bzr.spec 13 Feb 2006 15:59:24 -0000 1.3 +++ bzr.spec 10 May 2006 22:40:32 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.7 -Release: 3%{dist} +Version: 0.8 +Release: 1%{dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -51,6 +51,16 @@ %{python_sitelib}/bzrlib/*.pyc %ghost %{python_sitelib}/bzrlib/*.pyo +%dir %{python_sitelib}/bzrlib/doc +%{python_sitelib}/bzrlib/doc/*.py +%{python_sitelib}/bzrlib/doc/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/*.pyo + +%dir %{python_sitelib}/bzrlib/doc/api +%{python_sitelib}/bzrlib/doc/api/*.py +%{python_sitelib}/bzrlib/doc/api/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/api/*.pyo + %dir %{python_sitelib}/bzrlib/export %{python_sitelib}/bzrlib/export/*.py %{python_sitelib}/bzrlib/export/*.pyc @@ -81,15 +91,20 @@ %{python_sitelib}/bzrlib/store/*.pyc %ghost %{python_sitelib}/bzrlib/store/*.pyo -%dir %{python_sitelib}/bzrlib/tests -%{python_sitelib}/bzrlib/tests/*.py -%{python_sitelib}/bzrlib/tests/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/*.pyo - -%dir %{python_sitelib}/bzrlib/tests/blackbox -%{python_sitelib}/bzrlib/tests/blackbox/*.py -%{python_sitelib}/bzrlib/tests/blackbox/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo +%dir %{python_sitelib}/bzrlib/store/revision +%{python_sitelib}/bzrlib/store/revision/*.py +%{python_sitelib}/bzrlib/store/revision/*.pyc +%ghost %{python_sitelib}/bzrlib/store/revision/*.pyo + +%dir %{python_sitelib}/bzrlib/store/versioned +%{python_sitelib}/bzrlib/store/versioned/*.py +%{python_sitelib}/bzrlib/store/versioned/*.pyc +%ghost %{python_sitelib}/bzrlib/store/versioned/*.pyo + +%dir %{python_sitelib}/bzrlib/transport/http +%{python_sitelib}/bzrlib/transport/http/*.py +%{python_sitelib}/bzrlib/transport/http/*.pyc +%ghost %{python_sitelib}/bzrlib/transport/http/*.pyo %dir %{python_sitelib}/bzrlib/ui %{python_sitelib}/bzrlib/ui/*.py @@ -101,7 +116,56 @@ %{python_sitelib}/bzrlib/util/effbot/org/*.pyc %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo +%dir %{python_sitelib}/bzrlib/tests +%{python_sitelib}/bzrlib/tests/*.py +%{python_sitelib}/bzrlib/tests/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/blackbox +%{python_sitelib}/bzrlib/tests/blackbox/*.py +%{python_sitelib}/bzrlib/tests/blackbox/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/branch_implementations +%{python_sitelib}/bzrlib/tests/branch_implementations/*.py +%{python_sitelib}/bzrlib/tests/branch_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/branch_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/bzrdir_implementations +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.py +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interrepository_implementations +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.py +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interversionedfile_implementations +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.py +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/repository_implementations +%{python_sitelib}/bzrlib/tests/repository_implementations/*.py +%{python_sitelib}/bzrlib/tests/repository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/repository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/revisionstore_implementations +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.py +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/workingtree_implementations +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.py +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo + %changelog +* Wed May 10 2006 Shahms E. King 0.8-1 +- Update to new upstream version +- Update bzr-sys-etree.patch for changes + * Mon Feb 13 2006 Shahms E. King 0.7-3 - Add python-elementtree to BuildRequires Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Feb 2006 19:00:25 -0000 1.2 +++ sources 10 May 2006 22:40:32 -0000 1.3 @@ -1 +1 @@ -5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz +88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz From fedora-extras-commits at redhat.com Wed May 10 23:03:05 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 10 May 2006 16:03:05 -0700 Subject: rpms/naim/devel .cvsignore, 1.6, 1.7 naim.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200605102303.k4AN3bUS031618@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561 Modified Files: .cvsignore naim.spec sources Log Message: 0.11.8.2 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Mar 2006 01:01:43 -0000 1.6 +++ .cvsignore 10 May 2006 23:03:04 -0000 1.7 @@ -1 +1 @@ -naim-0.11.8.2-2006-02-28-2047.tar.bz2 +naim-0.11.8.2.tar.bz2 Index: naim.spec =================================================================== RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- naim.spec 17 Mar 2006 01:01:43 -0000 1.9 +++ naim.spec 10 May 2006 23:03:04 -0000 1.10 @@ -1,14 +1,12 @@ -%define snapshot 2006-02-28-2047 - Name: naim Version: 0.11.8.2 -Release: 2%{?dist} +Release: 4%{?dist} 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}-%{snapshot}.tar.bz2 +Source0: http://shell.n.ml.org/n/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -18,7 +16,7 @@ Internet Relay Chat (IRC), and The lily CMC. %prep -%setup -q -n %{name}-%{version}-%{snapshot} +%setup -q %build %configure @@ -40,6 +38,9 @@ %{_mandir}/*/* %changelog +* Wed May 10 2006 Luke Macken 0.11.8.2-4 +- 0.11.8.2 final + * Thu Mar 16 2006 Luke Macken 0.11.8.2-3 - 2006-02-28-2047 development snapshot Index: sources =================================================================== RCS file: /cvs/extras/rpms/naim/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Mar 2006 01:01:43 -0000 1.6 +++ sources 10 May 2006 23:03:04 -0000 1.7 @@ -1 +1 @@ -6e4f551a4bc784b889a0368e0aa2a0a3 naim-0.11.8.2-2006-02-28-2047.tar.bz2 +92bfbf60c4fd8f0eab4c4c6bbfe50422 naim-0.11.8.2.tar.bz2 From fedora-extras-commits at redhat.com Thu May 11 00:05:57 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 10 May 2006 17:05:57 -0700 Subject: fedora-security/audit fe4,1.18,1.19 fe5,1.18,1.19 Message-ID: <200605110005.k4B05vWA001687@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1667 Modified Files: fe4 fe5 Log Message: Add perl-Net-SSLeay issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fe4 10 May 2006 19:14:08 -0000 1.18 +++ fe4 11 May 2006 00:05:54 -0000 1.19 @@ -75,3 +75,4 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) +CVE-2005-0106 VULNERABLE (perl-Net-SSLeay) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fe5 10 May 2006 19:14:08 -0000 1.18 +++ fe5 11 May 2006 00:05:54 -0000 1.19 @@ -77,3 +77,4 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) +CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.30-3) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch From fedora-extras-commits at redhat.com Thu May 11 01:34:27 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Wed, 10 May 2006 18:34:27 -0700 Subject: krbVmodule krb5module.c,1.21,1.22 Message-ID: <200605110134.k4B1YR1r004363@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/devel/krbVmodule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346 Modified Files: krb5module.c Log Message: enable setting address information manually Index: krb5module.c =================================================================== RCS file: /cvs/devel/krbVmodule/krb5module.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- krb5module.c 5 Apr 2006 05:11:07 -0000 1.21 +++ krb5module.c 11 May 2006 01:34:25 -0000 1.22 @@ -1047,6 +1047,52 @@ } } +typedef struct addr_storage +{ + struct in_addr ip4; + struct in6_addr ip6; +} addr_storage; + +/* Convert a string representation of an address to a krb5_address */ +static int +str_to_addr(const char* address, krb5_address *krb5addr, addr_storage *as) +{ + struct in_addr ipv4addr; + struct in6_addr ipv6addr; + + /* First try ipv4, and if that fails, try ipv6 */ + if (inet_pton(AF_INET, address, &ipv4addr)) { + krb5addr->addrtype = ADDRTYPE_INET; + as->ip4 = ipv4addr; + krb5addr->length = sizeof(as->ip4.s_addr); + krb5addr->contents = (krb5_octet *) &(as->ip4.s_addr); + return 1; + } else if (inet_pton(AF_INET6, address, &ipv6addr)) { + krb5addr->addrtype = ADDRTYPE_INET6; + as->ip6 = ipv6addr; + krb5addr->length = sizeof(as->ip6.s6_addr); + krb5addr->contents = (krb5_octet *) &(as->ip6.s6_addr); + return 1; + } + + return 0; +} + +/* Convert an unsigned short port to a krb5_address */ +static int +port_to_addr(unsigned short port, krb5_address *krb5addr) +{ + /* If port == 0, don't set anything and return 0 */ + if (port > 0) { + krb5addr->addrtype = ADDRTYPE_IPPORT; + krb5addr->length = sizeof(port); + krb5addr->contents = (krb5_octet *) &port; + return 1; + } + + return 0; +} + /*********************** AuthContext **********************/ static PyObject* AuthContext_getattr(PyObject *unself __UNUSED, PyObject *args) @@ -1152,7 +1198,7 @@ krb5_context ctx = NULL; krb5_auth_context ac = NULL; krb5_error_code rc; - + if(!PyArg_ParseTuple(args, "OO!O:__setattr__", &self, &PyString_Type, &nameo, &value)) return NULL; inst = (PyInstanceObject *)self; @@ -1213,10 +1259,56 @@ if(rc) return pk_error(rc); } - else if(!strcmp(name, "addrs") - || (!strcmp(name, "context") && ctx) - || (!strcmp(name, "_ac") && ac) - ) + else if(!strcmp(name, "addrs")) + { + krb5_address localaddr, remoteaddr, localport, remoteport; + krb5_address *la = NULL, *ra = NULL, *lp = NULL, *rp = NULL; + unsigned int lport, rport; + char *laddr, *raddr; + addr_storage local_as, remote_as; + + if(!PyArg_ParseTuple(value, "zIzI", &laddr, &lport, &raddr, &rport)) + return NULL; + + if(laddr) { + if (str_to_addr(laddr, &localaddr, &local_as)) { + la = &localaddr; + } else { + PyErr_Format(PyExc_AttributeError, "invalid address: %.400s", laddr); + return NULL; + } + } + + if(raddr) { + if (str_to_addr(raddr, &remoteaddr, &remote_as)) { + ra = &remoteaddr; + } else { + PyErr_Format(PyExc_AttributeError, "invalid address: %.400s", raddr); + return NULL; + } + } + + if(lport > 65535 || rport > 65535) { + PyErr_Format(PyExc_AttributeError, "port numbers cannot be greater than 65535"); + return NULL; + } + + if (port_to_addr((unsigned short) lport, &localport)) + lp = &localport; + + if (port_to_addr((unsigned short) rport, &remoteport)) + rp = &remoteport; + + rc = krb5_auth_con_setaddrs(ctx, ac, la, ra); + if(rc) + return pk_error(rc); + + rc = krb5_auth_con_setports(ctx, ac, lp, rp); + if(rc) + return pk_error(rc); + } + else if((!strcmp(name, "context") && ctx) || + (!strcmp(name, "_ac") && ac)) { PyErr_Format(PyExc_AttributeError, "You cannot set attribute '%.400s'", name); return NULL; From fedora-extras-commits at redhat.com Thu May 11 01:37:44 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Wed, 10 May 2006 18:37:44 -0700 Subject: krbVmodule python-krbV.spec,1.3,1.4 Message-ID: <200605110137.k4B1biT1004407@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/devel/krbVmodule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4390 Modified Files: python-krbV.spec Log Message: bump release Index: python-krbV.spec =================================================================== RCS file: /cvs/devel/krbVmodule/python-krbV.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-krbV.spec 27 Apr 2006 19:52:36 -0000 1.3 +++ python-krbV.spec 11 May 2006 01:37:42 -0000 1.4 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)")} Name: python-krbV -Version: 1.0.12 -Release: 2%{?dist} +Version: 1.0.13 +Release: 1%{?dist} Summary: Python extension module for Kerberos 5 Group: Development/Languages @@ -47,6 +47,9 @@ %{python_sitelib}/krbVmodule.so %changelog +* Wed May 10 2006 Mike Bonnet - 1.0.13-1 +- AuthContext.addrs can now be set manually, rather than calling genaddrs() + * Thu Apr 27 2006 Mike Bonnet - 1.0.12-2 - configure.in: parse version number out of spec file - add URL tag From fedora-extras-commits at redhat.com Thu May 11 02:54:22 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 10 May 2006 19:54:22 -0700 Subject: fedora-security/audit fe4,1.19,1.20 Message-ID: <200605110254.k4B2sMlM007036@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018 Modified Files: fe4 Log Message: perl-Net-SSLeay bugzilla ticket. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fe4 11 May 2006 00:05:54 -0000 1.19 +++ fe4 11 May 2006 02:54:20 -0000 1.20 @@ -75,4 +75,4 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) -CVE-2005-0106 VULNERABLE (perl-Net-SSLeay) +CVE-2005-0106 VULNERABLE (perl-Net-SSLeay) bz#191351 From fedora-extras-commits at redhat.com Thu May 11 09:03:13 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 May 2006 02:03:13 -0700 Subject: extras-buildsys/utils extras-push-new, 1.6, 1.7 extras-repobuild.py, 1.14, 1.15 extras-repoview.py, 1.4, 1.5 Message-ID: <200605110903.k4B93DHn000497@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv472 Modified Files: extras-push-new extras-repobuild.py extras-repoview.py Log Message: - make run_and_check() check the range of returned error condition codes Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- extras-push-new 10 May 2006 21:41:37 -0000 1.6 +++ extras-push-new 11 May 2006 09:03:08 -0000 1.7 @@ -98,6 +98,8 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd + if result > 255: + sys.exit(1) sys.exit(result) Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- extras-repobuild.py 23 Apr 2006 13:44:36 -0000 1.14 +++ extras-repobuild.py 11 May 2006 09:03:08 -0000 1.15 @@ -51,6 +51,8 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd + if result > 255: + sys.exit(1) sys.exit(result) Index: extras-repoview.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extras-repoview.py 23 Apr 2006 13:44:36 -0000 1.4 +++ extras-repoview.py 11 May 2006 09:03:08 -0000 1.5 @@ -43,6 +43,8 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd + if result > 255: + sys.exit(1) sys.exit(result) From fedora-extras-commits at redhat.com Thu May 11 09:38:29 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 11 May 2006 02:38:29 -0700 Subject: fedora-security/audit fc4,1.240,1.241 fc5,1.153,1.154 Message-ID: <200605110938.k4B9cTfT000742@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv721 Modified Files: fc4 fc5 Log Message: Another quagga issue CVE name Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- fc4 10 May 2006 16:59:41 -0000 1.240 +++ fc4 11 May 2006 09:38:27 -0000 1.241 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060507 -Up to date FC4 as of 20060507 +Up to date CVE as of CVE email 20060510 +Up to date FC4 as of 20060510 ** are items that need attention +CVE-2006-2276 VULNERABLE (quagga) CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- fc5 10 May 2006 16:59:41 -0000 1.153 +++ fc5 11 May 2006 09:38:27 -0000 1.154 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060507 -Up to date FC5 as of 20060507 +Up to date CVE as of CVE email 20060510 +Up to date FC5 as of 20060510 ** are items that need attention +CVE-2006-2276 VULNERABLE (quagga) CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Thu May 11 10:54:14 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 May 2006 03:54:14 -0700 Subject: extras-buildsys/utils extras-push-new, 1.7, 1.8 extras-repobuild.py, 1.15, 1.16 extras-repoview.py, 1.5, 1.6 Message-ID: <200605111054.k4BAsEvV003348@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3326 Modified Files: extras-push-new extras-repobuild.py extras-repoview.py Log Message: - keep exit code in 0-127 Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- extras-push-new 11 May 2006 09:03:08 -0000 1.7 +++ extras-push-new 11 May 2006 10:54:11 -0000 1.8 @@ -98,7 +98,7 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd - if result > 255: + if result > 127: sys.exit(1) sys.exit(result) Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- extras-repobuild.py 11 May 2006 09:03:08 -0000 1.15 +++ extras-repobuild.py 11 May 2006 10:54:11 -0000 1.16 @@ -51,7 +51,7 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd - if result > 255: + if result > 127: sys.exit(1) sys.exit(result) Index: extras-repoview.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- extras-repoview.py 11 May 2006 09:03:08 -0000 1.5 +++ extras-repoview.py 11 May 2006 10:54:11 -0000 1.6 @@ -43,7 +43,7 @@ result = os.system(cmd) if result != 0: print >> sys.stderr, 'Error running command: %s ' % cmd - if result > 255: + if result > 127: sys.exit(1) sys.exit(result) From fedora-extras-commits at redhat.com Thu May 11 12:28:45 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Thu, 11 May 2006 05:28:45 -0700 Subject: owners owners.list,1.972,1.973 Message-ID: <200605111228.k4BCSlnr008700@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8683 Modified Files: owners.list Log Message: libnfnetlink - Netfilter netlink userspace library Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.972 retrieving revision 1.973 diff -u -r1.972 -r1.973 --- owners.list 10 May 2006 17:32:17 -0000 1.972 +++ owners.list 11 May 2006 12:28:44 -0000 1.973 @@ -648,6 +648,7 @@ Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|libnfnetlink|Netfilter netlink userspace library|i at stingr.net|extras-qa at fedoraproject.org| Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 12:52:17 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 11 May 2006 05:52:17 -0700 Subject: rpms/anjuta import.log,1.12,1.13 Message-ID: <200605111252.k4BCqJDY010010@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9976 Modified Files: import.log Log Message: auto-import anjuta-1.2.4a-2 on branch devel from anjuta-1.2.4a-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 23 Apr 2006 23:28:29 -0000 1.12 +++ import.log 11 May 2006 12:52:17 -0000 1.13 @@ -9,3 +9,4 @@ anjuta-1_2_4a-1:HEAD:anjuta-1.2.4a-1.src.rpm:1145834807 anjuta-1_2_4a-1:FC-5:anjuta-1.2.4a-1.src.rpm:1145834875 anjuta-1_2_4a-1:FC-4:anjuta-1.2.4a-1.src.rpm:1145834931 +anjuta-1_2_4a-2:HEAD:anjuta-1.2.4a-2.src.rpm:1147351927 From fedora-extras-commits at redhat.com Thu May 11 12:52:18 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 11 May 2006 05:52:18 -0700 Subject: rpms/anjuta/devel anjuta.spec,1.17,1.18 Message-ID: <200605111252.k4BCqKtM010014@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9976/devel Modified Files: anjuta.spec Log Message: auto-import anjuta-1.2.4a-2 on branch devel from anjuta-1.2.4a-2.src.rpm Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- anjuta.spec 23 Apr 2006 23:26:25 -0000 1.17 +++ anjuta.spec 11 May 2006 12:52:18 -0000 1.18 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.4a -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME IDE for C and C++ Group: Development/Tools @@ -114,6 +114,9 @@ %{_datadir}/omf/%{name} %changelog +* Thu May 11 2006 Paul F. Johnson 1.2.4a-2 +- rebuild + * Mon Apr 24 2006 Paul F. Johnson 1.2.4a-1 - Bump to newer version From fedora-extras-commits at redhat.com Thu May 11 13:19:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:19:33 -0700 Subject: rpms/childsplay - New directory Message-ID: <200605111319.k4BDJZGd014269@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14237/childsplay Log Message: Directory /cvs/extras/rpms/childsplay added to the repository From fedora-extras-commits at redhat.com Thu May 11 13:19:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:19:34 -0700 Subject: rpms/childsplay/devel - New directory Message-ID: <200605111319.k4BDJaVA014272@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14237/childsplay/devel Log Message: Directory /cvs/extras/rpms/childsplay/devel added to the repository From fedora-extras-commits at redhat.com Thu May 11 13:19:54 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:19:54 -0700 Subject: rpms/childsplay/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605111319.k4BDJu8V014345@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14304/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module childsplay --- NEW 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 May 11 13:19:53 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:19:53 -0700 Subject: rpms/childsplay Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605111319.k4BDJtrY014342@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14304 Added Files: Makefile import.log Log Message: Setup of module childsplay --- NEW FILE Makefile --- # Top level Makefile for module childsplay all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 11 13:20:40 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:20:40 -0700 Subject: rpms/childsplay import.log,1.1,1.2 Message-ID: <200605111320.k4BDKhIQ014471@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14433 Modified Files: import.log Log Message: auto-import childsplay-0.81.8-2 on branch devel from childsplay-0.81.8-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/childsplay/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 May 2006 13:19:53 -0000 1.1 +++ import.log 11 May 2006 13:20:40 -0000 1.2 @@ -0,0 +1 @@ +childsplay-0_81_8-2:HEAD:childsplay-0.81.8-2.src.rpm:1147353654 From fedora-extras-commits at redhat.com Thu May 11 13:20:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:20:41 -0700 Subject: rpms/childsplay/devel childsplay-0.81.8-assetml.patch, NONE, 1.1 childsplay-0.81.8-highscore.patch, NONE, 1.1 childsplay.desktop, NONE, 1.1 childsplay.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605111320.k4BDKh97014482@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14433/devel Modified Files: .cvsignore sources Added Files: childsplay-0.81.8-assetml.patch childsplay-0.81.8-highscore.patch childsplay.desktop childsplay.spec Log Message: auto-import childsplay-0.81.8-2 on branch devel from childsplay-0.81.8-2.src.rpm childsplay-0.81.8-assetml.patch: --- NEW FILE childsplay-0.81.8-assetml.patch --- --- childsplay-0.81.8/assetml/childsplay/memory-136x136/memory-136x136.assetml.assetml 2006-05-05 15:59:55.000000000 +0200 +++ childsplay-0.81.8/assetml/childsplay/memory-136x136/memory-136x136.assetml 2006-05-05 16:00:09.000000000 +0200 @@ -1,5 +1,5 @@ - + Apple ?????????? --- childsplay-0.81.8/pyassetml.py.assetml 2006-04-09 11:11:02.000000000 +0200 +++ childsplay-0.81.8/pyassetml.py 2006-05-05 15:58:28.000000000 +0200 @@ -164,9 +164,9 @@ rootnode = self.xml.getElementsByTagName('AssetML')[0] self.root_obj = RootNode() self.root_obj.dataset = rootnode.attributes[u'dataset'].value - path = rootnode.attributes[u'rootdir'].value[3:] #path starts with ../, loose it - #self.root_obj.rootdir = os.path.join(self.parserroot, path) - self.root_obj.rootdir = self.parserroot + path = rootnode.attributes[u'rootdir'].value + self.root_obj.rootdir = os.path.join(self.parserroot, path) + #self.root_obj.rootdir = self.parserroot self.root_obj.locale = rootnode.attributes[u'locale'].value for node in self.xmlnodes: --- childsplay-0.81.8/childsplay.py.assetml 2006-04-09 11:11:02.000000000 +0200 +++ childsplay-0.81.8/childsplay.py 2006-05-05 15:58:28.000000000 +0200 @@ -301,10 +301,10 @@ # create two assetmlSDL instances one for parsing images and one for sounds Assets_img = pyassetmlSDL.AssetmlSDL() -Assets_img.set_mldir('childsplay/childsplay-images/childsplay-images.assetml') +Assets_img.set_mldir('childsplay-images.assetml') Assets_snd = pyassetmlSDL.AssetmlSDL() -Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') +Assets_snd.set_mldir('childsplay-sounds.assetml') ############################################ ########### End toplevel code ##################### --- childsplay-0.81.8/lib/memory.py.assetml 2006-04-09 11:11:03.000000000 +0200 +++ childsplay-0.81.8/lib/memory.py 2006-05-05 15:58:28.000000000 +0200 @@ -57,9 +57,9 @@ raise MyError,text # create two assetmlSDL instances one for parsing images and one for sounds self.Assets_img = pyassetmlSDL.AssetmlSDL() - self.Assets_img.set_mldir('childsplay/memory-136x136/memory-136x136.assetml') + self.Assets_img.set_mldir('memory-136x136.assetml') self.Assets_snd = pyassetmlSDL.AssetmlSDL() - self.Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') + self.Assets_snd.set_mldir('childsplay-sounds.assetml') self.libdir = libdir # This will also used as a test if we are using other images --- childsplay-0.81.8/lib/letters.py.assetml 2006-04-09 11:11:03.000000000 +0200 +++ childsplay-0.81.8/lib/letters.py 2006-05-05 15:58:28.000000000 +0200 @@ -98,13 +98,13 @@ if DEBUG: print "ChildsplayGoodies",dir(ChildsplayGoodies) # create two assetmlSDL instances one for parsing images and one for sounds self.Assets_img = pyassetmlSDL.AssetmlSDL() - self.Assets_img.set_mldir('childsplay/childsplay-images/childsplay-images.assetml') + self.Assets_img.set_mldir('childsplay-images.assetml') Img.arrow = self.Assets_img.get_assets(('arrow.png',)) # get pictures - self.Assets_img.set_mldir('childsplay/memory-136x136/memory-136x136.assetml') + self.Assets_img.set_mldir('memory-136x136.assetml') descr_pics = self.Assets_img.get_assets(('*.png',),fullname=1)# {foo.png:foo.png object,spam.png:spam.png object} - parser = pyassetml.AssetmlParser('childsplay/memory-136x136/memory-136x136.assetml') + parser = pyassetml.AssetmlParser('memory-136x136.assetml') loc = ChildsplayGoodies.language if DEBUG: print "letters game, locale set to",loc @@ -124,7 +124,7 @@ if DEBUG: print "Found words",k self.Assets_snd = pyassetmlSDL.AssetmlSDL() - self.Assets_snd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') + self.Assets_snd.set_mldir('childsplay-sounds.assetml') files = ('bummer.wav','wahoo.wav') self.Assets_snd.get_assets(files, Snd) childsplay-0.81.8-highscore.patch: --- NEW FILE childsplay-0.81.8-highscore.patch --- --- childsplay-0.81.8/CPConstants.py~ 2006-05-05 10:56:38.000000000 +0200 +++ childsplay-0.81.8/CPConstants.py 2006-05-05 10:56:38.000000000 +0200 @@ -21,7 +21,6 @@ MODULESDATADIR = BASEPATH.SHARELIBDATADIR LOCALEDIR = BASEPATH.LOCALEDIR ASSETMLROOT = BASEPATH.ASSETMLDIR -SCOREFILE = BASEPATH.SCOREFILE CHILDSPLAYRC = BASEPATH.CHILDSPLAYRC LIBDIR = BASEPATH.LIBDIR MODULES = BASEPATH.MODULESDIR @@ -43,6 +42,9 @@ except KeyError,info: print info HOMEDIR = os.path.abspath(sys.path[0]) + +# no sgid support for python, so drop the scorefile in the homedir +SCOREFILE = os.path.join(HOMEDIR, 'childsplay.score') # this is the directory tree in HOME_DIR_NAME. # Names seperated by commas are the names from which directories are created --- NEW FILE childsplay.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Childsplay GenericName=Educational games for young children Comment=Educational and at the same time be fun to play Exec=childsplay Icon=childsplay.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game; Version=0.81.8 --- NEW FILE childsplay.spec --- Name: childsplay Version: 0.81.8 Release: 2%{?dist} Summary: Suite of educational games for young children Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ Source: http://prdownloads.sourceforge.net/childsplay/%{name}-%{version}.tgz Source1: childsplay.desktop Patch0: childsplay-0.81.8-highscore.patch Patch1: childsplay-0.81.8-assetml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: desktop-file-utils Requires: pygame, childsplay_plugins >= 0.80.7 %description Childsplay is a suite of educational games for young children. It's written in Python and uses the SDL-libraries. The aim is to be educational and at the same time be fun to play. Some activities make use of language dependent voice samples, these sounds are shared with gcompris. For those you'll have to install the gcompris-sound package for the languages you intend to use. For example gcompris-sound-en . %prep %setup -q %patch0 -p1 -z .highscore # no backups otherwise the backups endup in the rpm. %patch1 -p1 # we don't use the buggy provided install rm install.py # the translation is merged into the assetml file, so don't ship it seperatly rm -r assetml/childsplay/memory-136x136/po # fixup the python scripts to call python directly and make them executable sed -i 's!/usr/bin/env python!%{_bindir}/python!' %{name}.py letters-trans.py chmod 755 %{name}.py letters-trans.py pyassetmlcreator.py # move these out of Data so our wildcard install doesn't install them mv Data/*.txt Data/chpl-icon-48*.png Data/childsplay.* . %build # INSTALL.sh is seriously borked, so DIY echo "## Automated file please do not edit" > BASEPATH.py echo "CPDIR=\"%{_datadir}/%{name}\"" >> BASEPATH.py echo "SHAREDATADIR=\"%{_datadir}/%{name}/Data\"" >> BASEPATH.py echo "RCDIR=\"%{_datadir}/%{name}/ConfigData\"" >> BASEPATH.py echo "SHARELIBDATADIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "LIBDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py echo "HOME_DIR_NAME=\".childsplay\"" >> BASEPATH.py %install rm -rf $RPM_BUILD_ROOT # INSTALL.sh is seriously borked, so DIY mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 cp -a *.py $RPM_BUILD_ROOT%{_datadir}/%{name} ln -s ../share/%{name}/%{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name} ln -s ../share/%{name}/letters-trans.py \ $RPM_BUILD_ROOT%{_bindir}/letters-trans cp -a Data $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/%{name} mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.assetml \ $RPM_BUILD_ROOT%{_datadir}/assetml cp -a locale/* $RPM_BUILD_ROOT%{_datadir}/locale cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man6 %find_lang %{name} # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 chpl-icon-48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-, root, root, -) %doc README* doc/GPL* doc/README* License_*.ttf.txt %{_bindir}/%{name} %{_bindir}/letters-trans %dir %{_datadir}/childsplay %{_datadir}/childsplay/*.py %{_datadir}/childsplay/*.pyc %ghost %{_datadir}/childsplay/*.pyo %{_datadir}/childsplay/Data %{_datadir}/childsplay/childsplay-images %{_datadir}/childsplay/childsplay-sounds %{_datadir}/childsplay/memory-136x136 %dir %{_datadir}/childsplay/plugins %{_datadir}/childsplay/plugins/*.py %{_datadir}/childsplay/plugins/*.pyc %ghost %{_datadir}/childsplay/plugins/*.pyo %{_datadir}/childsplay/plugins/*Data %{_datadir}/assetml %{_mandir}/man6/*.6.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog * Wed May 10 2006 Hans de Goede 0.81.8-2 - Ghost .pyo files - BR: desktop-file-utils * Fri May 5 2006 Hans de Goede 0.81.8-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 May 2006 13:19:54 -0000 1.1 +++ .cvsignore 11 May 2006 13:20:41 -0000 1.2 @@ -0,0 +1 @@ +childsplay-0.81.8.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 May 2006 13:19:54 -0000 1.1 +++ sources 11 May 2006 13:20:41 -0000 1.2 @@ -0,0 +1 @@ +2353509fda8cf7d32c8a10ebd8390370 childsplay-0.81.8.tgz From fedora-extras-commits at redhat.com Thu May 11 13:25:14 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:25:14 -0700 Subject: rpms/childsplay/devel childsplay.spec,1.1,1.2 Message-ID: <200605111325.k4BDPGAj014814@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14795 Modified Files: childsplay.spec Log Message: Fix Source0 URL Index: childsplay.spec =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay.spec 11 May 2006 13:20:41 -0000 1.1 +++ childsplay.spec 11 May 2006 13:25:14 -0000 1.2 @@ -5,7 +5,7 @@ Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ -Source: http://prdownloads.sourceforge.net/childsplay/%{name}-%{version}.tgz +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tgz Source1: childsplay.desktop Patch0: childsplay-0.81.8-highscore.patch Patch1: childsplay-0.81.8-assetml.patch From fedora-extras-commits at redhat.com Thu May 11 13:39:03 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 06:39:03 -0700 Subject: rpms/childsplay/devel childsplay.spec,1.2,1.3 Message-ID: <200605111339.k4BDd57x014891@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874 Modified Files: childsplay.spec Log Message: * Thu May 11 2006 Hans de Goede 0.81.8-3 - Fix not finding of initial/default childsplayrc file. Index: childsplay.spec =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- childsplay.spec 11 May 2006 13:25:14 -0000 1.2 +++ childsplay.spec 11 May 2006 13:39:03 -0000 1.3 @@ -1,6 +1,6 @@ Name: childsplay Version: 0.81.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Suite of educational games for young children Group: Amusements/Games License: GPL @@ -44,10 +44,10 @@ echo "## Automated file please do not edit" > BASEPATH.py echo "CPDIR=\"%{_datadir}/%{name}\"" >> BASEPATH.py echo "SHAREDATADIR=\"%{_datadir}/%{name}/Data\"" >> BASEPATH.py -echo "RCDIR=\"%{_datadir}/%{name}/ConfigData\"" >> BASEPATH.py echo "SHARELIBDATADIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "LIBDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py echo "MODULESDIR=\"%{_datadir}/%{name}/plugins\"" >> BASEPATH.py +echo "RCDIR=\"%{_datadir}/%{name}/plugins/ConfigData\"" >> BASEPATH.py echo "LOCALEDIR=\"%{_datadir}/locale\"" >> BASEPATH.py echo "ASSETMLDIR=\"%{_datadir}/assetml\"" >> BASEPATH.py echo "CHILDSPLAYRC=\"childsplayrc\"" >> BASEPATH.py @@ -129,6 +129,9 @@ %changelog +* Thu May 11 2006 Hans de Goede 0.81.8-3 +- Fix not finding of initial/default childsplayrc file. + * Wed May 10 2006 Hans de Goede 0.81.8-2 - Ghost .pyo files - BR: desktop-file-utils From fedora-extras-commits at redhat.com Thu May 11 13:43:43 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 06:43:43 -0700 Subject: owners owners.list,1.973,1.974 Message-ID: <200605111343.k4BDhjLX014946@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14919 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.973 retrieving revision 1.974 diff -u -r1.973 -r1.974 --- owners.list 11 May 2006 12:28:44 -0000 1.973 +++ owners.list 11 May 2006 13:43:43 -0000 1.974 @@ -171,6 +171,7 @@ Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 14:06:32 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:06:32 -0700 Subject: rpms/python-clientform/devel .cvsignore, 1.2, 1.3 python-clientform.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605111406.k4BE6Y7H017363@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17342 Modified Files: .cvsignore python-clientform.spec sources Log Message: bump to 0.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Nov 2005 13:45:32 -0000 1.2 +++ .cvsignore 11 May 2006 14:06:32 -0000 1.3 @@ -1 +1 @@ -ClientForm-0.1.17.tar.gz +ClientForm-0.2.2.tar.gz Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-clientform.spec 15 Feb 2006 03:48:53 -0000 1.2 +++ python-clientform.spec 11 May 2006 14:06:32 -0000 1.3 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-clientform -Version: 0.1.17 -Release: 4%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages @@ -45,6 +45,9 @@ %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 11 2006 Luke Macken 0.2.2-1 +- Bump to 0.2.2 + * Tue Feb 14 2006 Josh Boyer 0.1.17-4 - Bump for FE5 rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Nov 2005 13:45:32 -0000 1.2 +++ sources 11 May 2006 14:06:32 -0000 1.3 @@ -1 +1 @@ -0aa01b3ebcdf800d7ec07c86c7e60b38 ClientForm-0.1.17.tar.gz +2aaff3f85450120b0d3875a221b3cc6e ClientForm-0.2.2.tar.gz From fedora-extras-commits at redhat.com Thu May 11 14:09:22 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:09:22 -0700 Subject: owners owners.list,1.974,1.975 Message-ID: <200605111409.k4BE9Oek017444@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17427 Modified Files: owners.list Log Message: own python-clientform Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.974 retrieving revision 1.975 diff -u -r1.974 -r1.975 --- owners.list 11 May 2006 13:43:43 -0000 1.974 +++ owners.list 11 May 2006 14:09:22 -0000 1.975 @@ -1307,7 +1307,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-chm|Python package for CHM files handling|pertusus at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|python-clientform|Python module for client-side HTML forms|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| +Fedora Extras|python-clientform|Python module for client-side HTML forms|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-cpio|A Python module for accessing cpio archives|ivazquez at ivazquez.net|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| From fedora-extras-commits at redhat.com Thu May 11 14:11:01 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:11:01 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.3,1.4 Message-ID: <200605111411.k4BEB3vP017467@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17450 Modified Files: python-clientform.spec Log Message: fix version in Source0 Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-clientform.spec 11 May 2006 14:06:32 -0000 1.3 +++ python-clientform.spec 11 May 2006 14:11:01 -0000 1.4 @@ -8,7 +8,7 @@ Group: Development/Languages License: BSD URL: http://wwwsearch.sourceforge.net/ClientForm/ -Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-0.1.17.tar.gz +Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From fedora-extras-commits at redhat.com Thu May 11 14:12:48 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:12:48 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.4,1.5 Message-ID: <200605111412.k4BECoXA017499@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17482 Modified Files: python-clientform.spec Log Message: bumpage Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-clientform.spec 11 May 2006 14:11:01 -0000 1.4 +++ python-clientform.spec 11 May 2006 14:12:47 -0000 1.5 @@ -45,6 +45,9 @@ %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 12 2006 Luke Macken 0.2.2-2 +- Fix version in Source0 + * Thu May 11 2006 Luke Macken 0.2.2-1 - Bump to 0.2.2 From fedora-extras-commits at redhat.com Thu May 11 14:15:45 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 11 May 2006 07:15:45 -0700 Subject: fedora-security/audit fc4,1.241,1.242 fc5,1.154,1.155 Message-ID: <200605111415.k4BEFjQi017571@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17550 Modified Files: fc4 fc5 Log Message: Note the quagga bugs. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- fc4 11 May 2006 09:38:27 -0000 1.241 +++ fc4 11 May 2006 14:15:42 -0000 1.242 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-2276 VULNERABLE (quagga) +CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- fc5 11 May 2006 09:38:27 -0000 1.154 +++ fc5 11 May 2006 14:15:42 -0000 1.155 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-2276 VULNERABLE (quagga) +CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2272 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Thu May 11 14:32:23 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:32:23 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.5,1.6 Message-ID: <200605111432.k4BEWPlm017780@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761 Modified Files: python-clientform.spec Log Message: ... one more time . Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-clientform.spec 11 May 2006 14:12:47 -0000 1.5 +++ python-clientform.spec 11 May 2006 14:32:23 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-clientform Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages From fedora-extras-commits at redhat.com Thu May 11 14:38:25 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:38:25 -0700 Subject: rpms/ctapi-cyberjack - New directory Message-ID: <200605111438.k4BEcRi7017934@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17908/ctapi-cyberjack Log Message: Directory /cvs/extras/rpms/ctapi-cyberjack added to the repository From fedora-extras-commits at redhat.com Thu May 11 14:38:26 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:38:26 -0700 Subject: rpms/ctapi-cyberjack/devel - New directory Message-ID: <200605111438.k4BEcSeC017937@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17908/ctapi-cyberjack/devel Log Message: Directory /cvs/extras/rpms/ctapi-cyberjack/devel added to the repository From fedora-extras-commits at redhat.com Thu May 11 14:38:59 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:38:59 -0700 Subject: rpms/ctapi-cyberjack Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605111439.k4BEd1Ku017981@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17953 Added Files: Makefile import.log Log Message: Setup of module ctapi-cyberjack --- NEW FILE Makefile --- # Top level Makefile for module ctapi-cyberjack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 11 14:38:59 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:38:59 -0700 Subject: rpms/ctapi-cyberjack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605111439.k4BEd1l1017984@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17953/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ctapi-cyberjack --- NEW 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 May 11 14:40:35 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:40:35 -0700 Subject: rpms/ctapi-cyberjack import.log,1.1,1.2 Message-ID: <200605111440.k4BEebA3018065@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18030 Modified Files: import.log Log Message: auto-import ctapi-cyberjack-2.0.8-13FC5 on branch devel from ctapi-cyberjack-2.0.8-13FC5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 May 2006 14:38:58 -0000 1.1 +++ import.log 11 May 2006 14:40:35 -0000 1.2 @@ -0,0 +1 @@ +ctapi-cyberjack-2_0_8-13FC5:HEAD:ctapi-cyberjack-2.0.8-13FC5.src.rpm:1147358412 From fedora-extras-commits at redhat.com Thu May 11 14:40:35 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 07:40:35 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec, NONE, 1.1 ctapi-cyberjack_MakefileCtAPI.patch, NONE, 1.1 ctapi-cyberjack_MakefilePCSC.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605111440.k4BEecCX018074@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18030/devel Modified Files: .cvsignore sources Added Files: ctapi-cyberjack.spec ctapi-cyberjack_MakefileCtAPI.patch ctapi-cyberjack_MakefilePCSC.patch Log Message: auto-import ctapi-cyberjack-2.0.8-13FC5 on branch devel from ctapi-cyberjack-2.0.8-13FC5.src.rpm --- NEW FILE ctapi-cyberjack.spec --- Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.8 Release: 13%{?dist} Requires: %{_libdir}/ctapi #For FC>4 BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 #For FC4 #BuildRequires: libusb-devel readline-devel URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.8/ctapi-cyberjack-2.0.8.tar.bz2 License: LGPL Group: Development/Libraries Source: %{name}-%{version}.tar.bz2 Patch0: ctapi-cyberjack_MakefileCtAPI.patch Patch1: ctapi-cyberjack_MakefilePCSC.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #for FC4 #%%define readers_dir %{_libdir}/readers #for FC>4 %define readers_dir %(pkg-config libpcsclite --variable=usbdropdir) %package devel Summary: Development files for libctapi-cyberjack Requires: %{name} = %{version} Group: Development/Libraries %package pcsc Summary: PC/SC Module Requires: pcsc-lite Group: Development/Libraries %description REINER SCT cyberJack pinpad/e-com USB user space driver This package includes the CT-API driver for the cyberJack pinpad/e-com USB chipcard reader. The kernel side driver is included in the official linux kernel starting with version 2.4.6. For more information regarding installation under Linux see the README.txt in the documentation directory, esp. regarding compatibility with host controllers. For more information about the reader, software updates and a shop see http://www.reiner-sct.com WARNING Use the tool ctsh only when you know what you are doing!!! Or you can damage your SmartCard!!! Hint When using the CT-API lib you must first stop the PC/SC daemon, when you use it. %description devel Development files for libctapi-cyberjack %description pcsc Files for the PC/SC system. %prep %setup -q -n %{name}-%{version} #fix path for the driver lib the config file sed -i "s\/usr/lib/readers/libcyberjack_ifd.so\%{readers_dir}/libcyberjack_ifd.so\1" \ etc/reader.conf #fix reader.conf for FC>4 sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf %patch0 -p1 %patch1 -p1 %build #make %{?_smp_mflags} will fail!!! make %install rm -rf $RPM_BUILD_ROOT # CT-API mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{_libdir}/ctapi/libctapi-cyberjack.so install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/cjgeldkarte install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ctsh # PC/SC mkdir -p $RPM_BUILD_ROOT%{readers_dir} install -m 755 pcsc/libcyberjack_ifd.so $RPM_BUILD_ROOT%{readers_dir}/libcyberjack_ifd.so mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d install -m 444 etc/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/cyberjack.conf %post pcsc #register PC/SC driver and restart daemon /sbin/service pcscd condrestart||: %postun pcsc #unregister PC/SC driver and restart daemon /sbin/service pcscd condrestart||: %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %doc COPYRIGHT* %doc doc/README.txt %doc doc/README.pdf %doc doc/README.html %defattr(-,root,root,-) # CT-API %{_libdir}/ctapi/libctapi-cyberjack.so %{_bindir}/cjgeldkarte %{_bindir}/ctsh %files pcsc # PC/SC %defattr(755,root,root) /%{readers_dir}/libcyberjack_ifd.so %attr(644,root,root) %config(noreplace) %{_sysconfdir}/reader.conf.d/cyberjack.conf %files devel %defattr(0644,root,root) %{_includedir}/ctapi-cyberjack/ctapi.h %changelog * Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} - rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to libcyberjack_ifd.so - fix place for the comments of /sbin/service pcscd condrestart * Wed May 10 2006 Frank B??ttner - 2.0.8-12%{?dist} - fix comments for %%post/%%postun pcsc - fix call of restart the PC/SC daemon - move to the old version of dependency for the PC/SC package - add -soname option in PS/SC driver * Tue May 9 2006 Frank B??ttner - 2.0.8-11%{?dist} - remove comments at %%post and %%postun - remove unneeded /usr/sbin/update-reader.conf call * Mon May 8 2006 Frank B??ttner - 2.0.8-10%{?dist} - fix ldconfig for the PC/SC part - fix dependency for the PC/SC package - fix build dependency for the package. * Mon May 8 2006 Frank B??ttner - 2.0.8-9%{?dist} - restart PC/SC daemon only when it run's - fix CT-API version bug so that apps can find it in the ldcache via libctapi-cyberjack.so - add comment about using CT-API and PC/SC together * Sun May 7 2006 Frank B??ttner - 2.0.8-8%{?dist} - add requirement of the ctapi dir under %{_libdir} - the CT-API lib lives now under %{_libdir}/ctapi - reenable link the ctapi driver static in the PC/SC part - run ldconfig after install/uninstall * Mon May 1 2006 Frank B??ttner - 2.0.8-7%{?dist} - fix permission of ctapi-cyberjack-2.0.8.tar.bz2 and ctapi-cyberjack.spec - fix permisson of the PC/SC config file - restart PC/SC daemon after remove the PS/SC driver * Sun Apr 30 2006 Frank B??ttner - 2.0.8-6%{?dist} - replace if statements with comments - replace german to english comments - fix the makefile for the CT-API lib - correct naming the libs CT-API and PS/SC - rename package PS/SC to pcsc - replace RPM_BUILD_ROOT - fix doc - add warning for the tool ctsh * Thu Apr 27 2006 Frank B??ttner - 2.0.8-5%{dist} - fix owner of lib's - add PC/SC fix for FC5 - restart pcscd * Thu Apr 27 2006 Frank B??ttner - 2.0.8-4%{dist} - change permisson of all lib's to 0755 - rename lib files to support more reader's - fix the path of the CT-API part and the devel file - support FC4 and FC5 * Sat Apr 15 2006 Frank B??ttner - 2.0.8-3%{dist} - remove makefile workaround * Sat Apr 15 2006 Frank B??ttner - 2.0.8-2%{dist} - remove packager - remove hardcodet Fedora Tag - rename file from ctapi-cyberjack-version to ctapi-cyberjack - modify source URL - fix clean section * Sat Apr 08 2006 Frank B??ttner - 2.0.8-1.FC4 - start for Fedora - sepperate the PC/SC part * Wed Mar 02 2005 - Harald Welte + ctapi-cyberjack-2.0.8-1 - fix double-free bug - update support email address to reflect current one - fix 'make install' target - add '-lusb' to libcyberjack_ifd (Martin Preuss) * Sun Jan 30 2005 - Harald Welte + ctapi-cyberjack-2.0.6-1 - add magic to automatically put current version number in specfile - add 0x800 e-com direct-ttyUSBx open hack - fix initialization errors (Martin Preuss) - simplified Makefile System (Martin Preuss) - Added make target "install" (Martin Preuss) - Fixed the name of the CTAPI driver loaded by "cjgeldkarte" - Fix typos in README.xml * Sun Dec 19 2004 - Harald Welte + ctapi-cyberjack-2.0.5-1 - add functionality to beep at keypress - introduce CJCTAPI_NO_KEYBEEP environment variable * Wed Nov 17 2004 - Harald Welte + ctapi-cyberjack-2.0.4-2 - add x86_64 -fPIC patch for pcsc - add x86_64 64bit data type patch * Tue Nov 16 2004 - Harald Welte + ctapi-cyberjack-2.0.4-1 - fixes: gcc-2.95 compile, cjgeldkarte-getopt, SIGSEGV / ctapiClose * Tue Nov 02 2004 - Harald Welte + ctapi-cyberjack-2.0.2-1 - fix libusb linking dependency * Wed Aug 25 2004 - Harald Welte + ctapi-cyberjack-2.0.1-1 - Bugfixes in REINER-SCT driver for pinpad_a * Fri Aug 13 2004 - Harald Welte + ctapi-cyberjack-2.0.0-0beta1 - final new usb ProductID (0x300) for pp_a - Include build of pcsc library - Include ctsh - Include static library into -devel * Wed Aug 11 2004 - Harald Welte + ctapi-cyberjack-2.0.0-0beta - Update to new major release including pinpad_a support - New dual driver shared library architecture * Tue Mar 18 2003 - Matthias Bruestle - Devices are created, when not present. * Sun May 03 2002 - Matthias Bruestle - Added ctsh. * Fri Dec 21 2001 - Matthias Bruestle - Added cjgeldkarte. * Fri Dec 14 2001 - Matthias Bruestle - Added some polish. * Sat Dec 01 2001 - Matthias Bruestle - Added PC/SC IFD handler. * Sun Aug 26 2001 - mge at suse.de - adopted package to SuSE build system * Sun Jun 03 2001 - Matthias Bruestle Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18131 Modified Files: gcompris-7.4-xf86vidmode.patch gcompris.spec Log Message: * Thu May 11 2006 Hans de Goede 7.4-10 - Add a hard Requires on gcompris-libs version-release to the base package because upstream doesn't bump the soname version when the abi changes. - Fix 2 more bugs introduced by the fix for bug 190918 (sigh, sorry). gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcompris-7.4-xf86vidmode.patch 9 May 2006 19:16:54 -0000 1.2 +++ gcompris-7.4-xf86vidmode.patch 11 May 2006 14:43:20 -0000 1.3 @@ -1,254 +1,587 @@ ---- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-09 19:51:54.000000000 +0200 -@@ -1094,7 +1094,7 @@ - --disable-sdltest Do not try to compile and run a test SDL program - --disable-glibtest do not try to compile and run a test GLIB program - --disable-rpath do not hardcode runtime library paths -- --disable-xrandr Turn off xrandr -+ --disable-xf86vidmode Turn off xf86vidmode - --enable-debug Turn on debugging messages - --disable-sqlite Turn off sqlite (will disable profile) - --enable-py-build-only Skip python modules tests. (Useful if you just need -@@ -23630,7 +23630,7 @@ - /usr/openwin/share/include' +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-11 09:42:18.000000000 +0200 +@@ -159,6 +159,12 @@ - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23638,7 +23638,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -23665,7 +23665,7 @@ - sed 's/^/| /' conftest.$ac_ext >&5 + void gcompris_confirm_stop (void); - for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -23686,11 +23686,11 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - int - main () - { --XtMalloc (0) -+XrmInitialize () - ; - return 0; - } -@@ -23769,23 +23769,23 @@ - echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 - fi ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" +--- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-11 09:42:18.000000000 +0200 +@@ -33,12 +33,13 @@ --# Check whether --enable-xrandr or --disable-xrandr was given. --if test "${enable_xrandr+set}" = set; then -- enableval="$enable_xrandr" -- USE_XRANDR="$enableval" -+# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. -+if test "${enable_xf86vidmode+set}" = set; then -+ enableval="$enable_xf86vidmode" -+ USE_XF86VM="$enableval" - else -- USE_XRANDR="yes" -+ USE_XF86VM="yes" - fi; --found_randr=no --if test "x$USE_XRANDR" == "xyes" ; then -- RANDR_LIBS= -- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 --echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 --if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then -+found_xf86vidmode=no -+if test "x$USE_XF86VM" == "xyes" ; then -+ XF86VM_LIBS= -+ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 -+if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" -+LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23799,11 +23799,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char XRRSetScreenConfigAndRate (); -+char XF86VidModeQueryExtension (); - int - main () - { --XRRSetScreenConfigAndRate (); -+XF86VidModeQueryExtension (); - ; - return 0; - } -@@ -23830,23 +23830,23 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes -+ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 + #include "cursor.h" --ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no -+ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 --echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 --if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then -- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 --echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 --if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 -+if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then -+ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 -+echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 -+if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -23857,7 +23857,7 @@ - /* end confdefs.h. */ +-/* For XRANDR Support */ +-#ifdef XRANDR ++/* For XF86_VIDMODE Support */ ++#ifdef XF86_VIDMODE + #include #include - -#include -+#include - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -23881,38 +23881,38 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_header_X11_extensions_Xrandr_h=yes -+ ac_cv_header_X11_extensions_xf86vmode_h=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_X11_extensions_Xrandr_h=no -+ac_cv_header_X11_extensions_xf86vmode_h=no - fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 --echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 --if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then -- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes -+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 -+if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then -+ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes - fi +-#include ++#include ++#include ++#include + #endif + #if defined _WIN32 || defined __WIN32__ +@@ -104,7 +105,7 @@ + static int popt_aalias = FALSE; + static int popt_difficulty_filter = FALSE; + static int popt_debug = FALSE; +-static int popt_noxrandr = FALSE; ++static int popt_noxf86vm = FALSE; + static char *popt_root_menu = NULL; + static char *popt_local_activity = NULL; + static int popt_administration = FALSE; +@@ -139,8 +140,8 @@ + N_("Print the version of " PACKAGE), NULL}, + {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, + N_("Use the antialiased canvas (slower)."), NULL}, +- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, +- N_("Disable XRANDR (No screen resolution change)."), NULL}, ++ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, ++ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, + {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, + N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, + {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, +@@ -184,29 +185,19 @@ + }; - fi + /* XRandr Stuff */ +-#ifdef XRANDR +-typedef struct ++#ifdef XF86_VIDMODE ++static struct + { +- gboolean xr_lock_updates; ++ int vidmode_available; ++ XF86VidModeModeInfo orig_mode; ++ int orig_viewport_x; ++ int orig_viewport_y; ++ int width; ++ int height; ++} XF86VidModeData = { 0, { 0 }, 0, 0 }; +- XRRScreenConfiguration *xr_screen_conf; +- +- XRRScreenSize *xr_sizes; +- int xr_nsize; +- SizeID xr_current_size; +- +- Rotation xr_rotations; +- Rotation xr_current_rotation; +- +-} XRANDRData; +- +-static SizeID xr_previous_size; +-static gboolean xr_previous_size_set = FALSE; +-static XRANDRData *xrandr = NULL; +- +-static void xrandr_init ( XRANDRData *xrandr ); +-static void xrandr_get_config ( XRANDRData *xrandr ); +-static void xrandr_set_config( XRANDRData *xrandr ); ++static void xf86_vidmode_init( void ); ++static void xf86_vidmode_set_fullscreen( int state ); + #endif -- if test "x$found_randr" = "xno"; then -- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 --echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} -+ if test "x$found_xf86vidmode" = "xno"; then -+ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 -+echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} - else + /****************************************************************************/ +@@ -441,8 +432,8 @@ + gint screen_height, screen_width; + GtkWidget *vbox; - cat >>confdefs.h <<_ACEOF --#define XRANDR 1 -+#define XF86_VIDMODE 1 - _ACEOF - - fi - fi - --LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" -+LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" +-#ifdef XRANDR +- xrandr = g_new0 (XRANDRData, 1); ++#ifdef XF86_VIDMODE ++ xf86_vidmode_init(); + #endif - ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" + gcompris_set_fullscreen(properties->fullscreen); +@@ -450,10 +441,10 @@ + screen_height = gdk_screen_height(); + screen_width = gdk_screen_width(); -@@ -28651,7 +28651,7 @@ - echo "SDL LIBS = found" - fi +-#ifdef XRANDR +- if(properties->fullscreen && !properties->noxrandr) { +- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; +- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; ++#ifdef XF86_VIDMODE ++ if(properties->fullscreen && !properties->noxf86vm) { ++ screen_width = XF86VidModeData.width; ++ screen_height = XF86VidModeData.height; + } + #endif --echo "XRANDR option (--enable-xrandr) = $found_randr" -+echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" +@@ -811,39 +802,11 @@ + */ + void gcompris_set_fullscreen(gboolean state) + { +- ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { +-#ifdef XRANDR +- gint i; +- /* Search the 800x600 Resolution */ +- if(properties->fullscreen && !properties->noxrandr) { +- +- g_warning("XRANDR Is compiled in. Searching a good resolution"); +- +- /* Check if XRANDR is available */ +- if (!properties->noxrandr) { +- xrandr_get_config ( xrandr ); +- xr_previous_size = (SizeID)xrandr->xr_current_size; +- for (i = 0; i < xrandr->xr_nsize; i++) { +- if(xrandr->xr_sizes[i].width == BOARDWIDTH && +- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) +- { +- xrandr->xr_current_size = (SizeID)i; +- xr_previous_size_set = TRUE; +- break; +- } +- } +- } +- +- /* Set the Fullscreen now */ +- if(xr_previous_size_set) +- { +- if(is_mapped) +- xrandr_set_config( xrandr ); +- } +- } +-#endif + gdk_window_set_decorations (window->window, 0); + gdk_window_set_functions (window->window, 0); + gtk_widget_set_uposition (window, 0, 0); +@@ -851,20 +814,6 @@ + } + else + { +-#ifdef XRANDR +- /* Set back the original screen size */ +- if(xr_previous_size_set && !properties->noxrandr) +- { +- /* Need to refresh our config or xrandr api will reject us */ +- if(xrandr) +- { +- xrandr_get_config ( xrandr ); +- xrandr->xr_current_size = (SizeID)xr_previous_size; +- xrandr_set_config( xrandr ); +- } +- } +- xr_previous_size_set = FALSE; +-#endif + /* The hide must be done at least for KDE */ + gtk_widget_hide (window); + gdk_window_set_decorations (window->window, GDK_DECOR_ALL); +@@ -876,6 +825,42 @@ - echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" + } ---- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-09 19:51:54.000000000 +0200 -@@ -141,5 +141,5 @@ - /* Version number of package */ - #undef VERSION ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1029,131 @@ + g_printerr ("%s: %s\n\n", "gcompris", message); + } --/* XRANDR Available */ --#undef XRANDR -+/* XF86VidMode Available */ -+#undef XF86_VIDMODE ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-09 19:51:54.000000000 +0200 -@@ -72,8 +72,8 @@ - return Py_False; - } +-#ifdef XRANDR ++#ifdef XF86_VIDMODE + /* +- * XRANDR STUFF +- * ------------ ++ * XF86VidMode STUFF ++ * ----------------- + */ + static void +-xrandr_init ( XRANDRData *data ) ++xf86_vidmode_init ( void ) + { +- if(data==NULL) ++ int i,j; ++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) ++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); ++ ++ if (properties->noxf86vm) + return; +- +- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); +- +- if (data->xr_screen_conf == NULL) ++ ++ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, ++ &XF86VidModeData.orig_viewport_x)) ++ properties->noxf86vm = TRUE; ++ ++ if (properties->noxf86vm) ++ g_warning("XF86VidMode not available"); ++ else + { +- g_warning("XRANDR not available"); +- properties->noxrandr = TRUE; ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ g_warning("XF86VidMode support enabled"); } -- if(strcmp(name,"noxrandr")==0){ -- if(self->cdata->noxrandr){ -+ if(strcmp(name,"noxf86vm")==0){ -+ if(self->cdata->noxf86vm){ - Py_INCREF(Py_True); - return Py_True; - } else { ---- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 -+++ gcompris-7.4/src/boards/draw.c 2006-05-09 12:35:04.000000000 +0200 -@@ -2008,7 +2008,7 @@ - case 1: - fleur = gdk_cursor_new(get_resize_cursor(anchor)); - -- gnome_canvas_item_grab(item, -+ gcompris_canvas_item_grab(item, - GDK_POINTER_MOTION_MASK | - GDK_BUTTON_RELEASE_MASK, - fleur, -@@ -2031,7 +2031,7 @@ - case GDK_BUTTON_RELEASE: - if(dragging) - { -- gnome_canvas_item_ungrab(item, event->button.time); -+ gcompris_canvas_item_ungrab(item, event->button.time); - dragging = FALSE; - draggingItem = NULL; - } -@@ -2179,7 +2179,7 @@ +- else +- g_warning("XRANDR support enabled"); +- } +- +-static void +-xrandr_get_config ( XRANDRData *data ) +-{ +- if(data==NULL) +- return; +- +- xrandr_init (data); +- +- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, +- &data->xr_current_rotation); +- +- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); +- +- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, +- &data->xr_current_rotation); + } - fleur = gdk_cursor_new(GDK_FLEUR); ++ + static void +-xrandr_set_config( XRANDRData *data ) ++xf86_vidmode_set_fullscreen ( int state ) + { +- Status status = RRSetConfigFailed; ++ int i; ++ XF86VidModeModeLine mode; -- gnome_canvas_item_grab(item, -+ gcompris_canvas_item_grab(item, +- if(data==NULL) ++ if (properties->noxf86vm) + return; + +- if (data->xr_lock_updates) return; +- +- status = XRRSetScreenConfig (GDK_DISPLAY(), +- data->xr_screen_conf, +- GDK_ROOT_WINDOW(), +- data->xr_current_size, +- data->xr_current_rotation, +- CurrentTime); +- +- if(status) { +- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", +- (int)status); +- } +- return; +- ++ if (state) ++ { ++ XF86VidModeModeInfo **modes; ++ int mode_count; ++ gint x,y; ++ ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode)) ++ { ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; ++ } ++ ++ /* Do we need to switch? */ ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; ++ ++ for (i = 0; i < mode_count; i++) ++ { ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; ++ } ++ } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); ++ } ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ gdk_window_get_position(window->window, &x, &y); ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), x, y)) ++ g_warning("XF86VidMode couldnot change viewport"); ++ } ++ else ++ { ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode) || ++ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || ++ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) ++ { ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot restore original resolution"); ++ ++ } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); ++ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, ++ XF86VidModeData.orig_viewport_y)) ++ g_warning("XF86VidMode couldnot restore original viewport"); ++ } + } + #endif + +@@ -1185,9 +1233,9 @@ + properties->fullscreen = TRUE; + } + +- if (popt_noxrandr) ++ if (popt_noxf86vm) + { +- properties->noxrandr = TRUE; ++ properties->noxf86vm = TRUE; + } + + if (popt_window) +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-11 09:42:18.000000000 +0200 +@@ -160,7 +160,7 @@ + tmp->fx = 1; + tmp->screensize = 1; + tmp->fullscreen = 1; +- tmp->noxrandr = FALSE; ++ tmp->noxf86vm = FALSE; + tmp->timer = 1; + tmp->skin = "babytoy"; + tmp->key = "default"; +@@ -244,8 +244,8 @@ + } else if(!strcmp(value.v_identifier, "fullscreen")) { + if(!scan_get_int(scanner, &tmp->fullscreen)) + g_warning("Config file parsing error on token %s", token); +- } else if(!strcmp(value.v_identifier, "noxrandr")) { +- if(!scan_get_int(scanner, &tmp->noxrandr)) ++ } else if(!strcmp(value.v_identifier, "noxf86vm")) { ++ if(!scan_get_int(scanner, &tmp->noxf86vm)) + g_warning("Config file parsing error on token %s", token); + } else if(!strcmp(value.v_identifier, "timer")) { + if(!scan_get_int(scanner, &tmp->timer)) +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-11 09:42:18.000000000 +0200 +@@ -28,7 +28,7 @@ + gint music; + gint fx; + gint fullscreen; +- gint noxrandr; ++ gint noxf86vm; + gint screensize; + gint defaultcursor; + gint timer; +--- gcompris-7.4/src/gcompris/board_config.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/board_config.c 2006-05-11 12:04:27.000000000 +0200 +@@ -125,6 +125,34 @@ + + } + ++#ifdef XF86_VIDMODE ++static GdkEventConfigure gcompris_last_configure_event; ++ ++static gint gcompris_conf_window_configured(GtkWindow *window, ++ GdkEventConfigure *event, gpointer param) ++{ ++ gint new_x, new_y; ++ double screen_width, screen_height; ++ /* Because we call gtk_window_move, we cause a configure event. Filter out ++ identical events to avoid looping. */ ++ if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) ++ { ++ gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( ++ gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); ++ /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ ++ screen_height -= 30; ++ new_x = ((gint)screen_width - event->width) / 2; ++ new_y = ((gint)screen_height - event->height) / 2; ++ /* printf("screen %dx%d, window %dx%d, place %dx%d\n", (int)screen_width, (int)screen_height, event->width, event->height, new_x, new_y); */ ++ gtk_window_move (conf_window, new_x, new_y); ++ memcpy(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure)); ++ } ++ ++ /* Act as if we aren't there / aren't hooked up */ ++ return FALSE; ++} ++#endif ++ + GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) + { + GtkWidget *header; +@@ -145,7 +173,18 @@ + + + /* parameters */ +- gtk_window_set_position (conf_window, ++#ifdef XF86_VIDMODE ++ if (gcompris_get_properties()->fullscreen && ++ !gcompris_get_properties()->noxf86vm) ++ { ++ memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); ++ gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); ++ gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", ++ GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); ++ } ++ else ++#endif ++ gtk_window_set_position (conf_window, + GTK_WIN_POS_CENTER_ALWAYS); + + gtk_widget_show(GTK_WIDGET(conf_window)); +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-11 09:42:22.000000000 +0200 +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen and not Prop.noxf86vm): ++ gtk.gdk.pointer_ungrab() + + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) + + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -221,6 +226,10 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen and ++ not gcompris.get_properties().noxf86vm): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-11 09:42:18.000000000 +0200 +@@ -72,8 +72,8 @@ + return Py_False; + } + } +- if(strcmp(name,"noxrandr")==0){ +- if(self->cdata->noxrandr){ ++ if(strcmp(name,"noxf86vm")==0){ ++ if(self->cdata->noxf86vm){ + Py_INCREF(Py_True); + return Py_True; + } else { +--- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-11 09:42:18.000000000 +0200 +@@ -2008,7 +2008,7 @@ + case 1: + fleur = gdk_cursor_new(get_resize_cursor(anchor)); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2031,7 +2031,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + } +@@ -2179,7 +2179,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -262,7 +595,7 @@ draggingItem = NULL; --- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-11 09:42:18.000000000 +0200 @@ -472,7 +472,7 @@ gnome_canvas_item_raise_to_top(data->item); @@ -282,7 +615,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 -+++ gcompris-7.4/src/boards/clockgame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-11 09:42:18.000000000 +0200 @@ -663,7 +663,7 @@ y = item_y; @@ -302,7 +635,7 @@ } break; --- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-11 09:42:18.000000000 +0200 @@ -645,7 +645,7 @@ gnome_canvas_item_raise_to_top(data->item_text); @@ -322,7 +655,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 -+++ gcompris-7.4/src/boards/chess.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-11 09:42:18.000000000 +0200 @@ -839,7 +839,7 @@ fleur = gdk_cursor_new(GDK_FLEUR); @@ -342,7 +675,7 @@ position_display(position); --- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 -+++ gcompris-7.4/src/boards/shapegame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-11 09:42:18.000000000 +0200 @@ -1103,7 +1103,7 @@ gnome_canvas_item_raise_to_top(shape_list_root_item); gnome_canvas_item_raise_to_top(item); @@ -380,7 +713,7 @@ dragging = FALSE; --- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 -+++ gcompris-7.4/src/boards/planegame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-11 09:42:18.000000000 +0200 @@ -578,7 +578,7 @@ y = item_y; @@ -400,7 +733,7 @@ } break; --- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 -+++ gcompris-7.4/src/boards/enumerate.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-11 09:42:18.000000000 +0200 @@ -522,7 +522,7 @@ gnome_canvas_item_raise_to_top(item); @@ -420,7 +753,7 @@ } break; --- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 -+++ gcompris-7.4/src/boards/clickgame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-11 09:42:18.000000000 +0200 @@ -598,7 +598,7 @@ y = item_y; @@ -440,7 +773,7 @@ } break; --- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 -+++ gcompris-7.4/src/boards/traffic.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-11 09:42:18.000000000 +0200 @@ -417,7 +417,7 @@ cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); else @@ -468,493 +801,220 @@ hit=0; moving=FALSE; } ---- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 -+++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-09 19:51:55.000000000 +0200 -@@ -103,6 +103,11 @@ - options.append('--nostampcontrols') - - gcompris.sound.close() -+ -+ # release pointergrab if running fullscreen, tuxpaint wants to grab the -+ # pointer itself -+ if (Prop.fullscreen): -+ gtk.gdk.pointer_ungrab() - - #self.window.set_property("accept-focus", 0) - #self.window.set_keep_below(False) -@@ -115,7 +120,7 @@ - gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) - return - -- gcompris.child_watch_add(pid, child_callback, None) -+ gcompris.child_watch_add(pid, child_callback, self) - - gcompris.bar_set(0) - gcompris.bar_hide(1) -@@ -221,6 +226,9 @@ - return default_config_dict +--- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-11 09:42:18.000000000 +0200 +@@ -1094,7 +1094,7 @@ + --disable-sdltest Do not try to compile and run a test SDL program + --disable-glibtest do not try to compile and run a test GLIB program + --disable-rpath do not hardcode runtime library paths +- --disable-xrandr Turn off xrandr ++ --disable-xf86vidmode Turn off xf86vidmode + --enable-debug Turn on debugging messages + --disable-sqlite Turn off sqlite (will disable profile) + --enable-py-build-only Skip python modules tests. (Useful if you just need +@@ -23630,7 +23630,7 @@ + /usr/openwin/share/include' - def child_callback(fd, cond, data): -+ # restore pointergrab if running fullscreen -+ if (gcompris.get_properties().fullscreen): -+ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) - #global board - #board.window.set_property("accept-focus", 1) - #board.window.set_keep_above(False) ---- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-09 19:51:54.000000000 +0200 -@@ -159,6 +159,12 @@ - - void gcompris_confirm_stop (void); + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23638,7 +23638,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -23665,7 +23665,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime); -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); -+ - /* Trace Log */ - #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" - #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" ---- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-09 20:51:10.000000000 +0200 -@@ -33,12 +33,13 @@ + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -23686,11 +23686,11 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -23769,23 +23769,23 @@ + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi - #include "cursor.h" +-# Check whether --enable-xrandr or --disable-xrandr was given. +-if test "${enable_xrandr+set}" = set; then +- enableval="$enable_xrandr" +- USE_XRANDR="$enableval" ++# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. ++if test "${enable_xf86vidmode+set}" = set; then ++ enableval="$enable_xf86vidmode" ++ USE_XF86VM="$enableval" + else +- USE_XRANDR="yes" ++ USE_XF86VM="yes" + fi; +-found_randr=no +-if test "x$USE_XRANDR" == "xyes" ; then +- RANDR_LIBS= +- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 +-echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then ++found_xf86vidmode=no ++if test "x$USE_XF86VM" == "xyes" ; then ++ XF86VM_LIBS= ++ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ++echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 ++if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" ++LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23799,11 +23799,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char XRRSetScreenConfigAndRate (); ++char XF86VidModeQueryExtension (); + int + main () + { +-XRRSetScreenConfigAndRate (); ++XF86VidModeQueryExtension (); + ; + return 0; + } +@@ -23830,23 +23830,23 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes ++ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 --/* For XRANDR Support */ --#ifdef XRANDR -+/* For XF86_VIDMODE Support */ -+#ifdef XF86_VIDMODE - #include +-ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no ++ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 +-if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then +- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +-echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +-if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 ++if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then ++ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 ++if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -23857,7 +23857,7 @@ + /* end confdefs.h. */ #include + -#include --#include -+#include -+#include -+#include - #endif ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -23881,38 +23881,38 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_header_X11_extensions_Xrandr_h=yes ++ ac_cv_header_X11_extensions_xf86vmode_h=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 - #if defined _WIN32 || defined __WIN32__ -@@ -104,7 +105,7 @@ - static int popt_aalias = FALSE; - static int popt_difficulty_filter = FALSE; - static int popt_debug = FALSE; --static int popt_noxrandr = FALSE; -+static int popt_noxf86vm = FALSE; - static char *popt_root_menu = NULL; - static char *popt_local_activity = NULL; - static int popt_administration = FALSE; -@@ -139,8 +140,8 @@ - N_("Print the version of " PACKAGE), NULL}, - {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, - N_("Use the antialiased canvas (slower)."), NULL}, -- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, -- N_("Disable XRANDR (No screen resolution change)."), NULL}, -+ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, -+ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, - {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, - N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, - {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, -@@ -184,29 +185,19 @@ - }; +-ac_cv_header_X11_extensions_Xrandr_h=no ++ac_cv_header_X11_extensions_xf86vmode_h=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +-if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then +- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes ++echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 ++if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then ++ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes + fi - /* XRandr Stuff */ --#ifdef XRANDR --typedef struct -+#ifdef XF86_VIDMODE -+static struct - { -- gboolean xr_lock_updates; -+ int vidmode_available; -+ XF86VidModeModeInfo orig_mode; -+ int orig_viewport_x; -+ int orig_viewport_y; -+ int width; -+ int height; -+} XF86VidModeData = { 0, { 0 }, 0, 0 }; -- XRRScreenConfiguration *xr_screen_conf; -- -- XRRScreenSize *xr_sizes; -- int xr_nsize; -- SizeID xr_current_size; -- -- Rotation xr_rotations; -- Rotation xr_current_rotation; -- --} XRANDRData; -- --static SizeID xr_previous_size; --static gboolean xr_previous_size_set = FALSE; --static XRANDRData *xrandr = NULL; -- --static void xrandr_init ( XRANDRData *xrandr ); --static void xrandr_get_config ( XRANDRData *xrandr ); --static void xrandr_set_config( XRANDRData *xrandr ); -+static void xf86_vidmode_init( void ); -+static void xf86_vidmode_set_fullscreen( int state ); - #endif + fi - /****************************************************************************/ -@@ -441,8 +432,8 @@ - gint screen_height, screen_width; - GtkWidget *vbox; --#ifdef XRANDR -- xrandr = g_new0 (XRANDRData, 1); -+#ifdef XF86_VIDMODE -+ xf86_vidmode_init(); - #endif +- if test "x$found_randr" = "xno"; then +- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 +-echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} ++ if test "x$found_xf86vidmode" = "xno"; then ++ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 ++echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} + else - gcompris_set_fullscreen(properties->fullscreen); -@@ -450,10 +441,10 @@ - screen_height = gdk_screen_height(); - screen_width = gdk_screen_width(); - --#ifdef XRANDR -- if(properties->fullscreen && !properties->noxrandr) { -- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; -- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; -+#ifdef XF86_VIDMODE -+ if(properties->fullscreen && !properties->noxf86vm) { -+ screen_width = XF86VidModeData.width; -+ screen_height = XF86VidModeData.height; - } - #endif - -@@ -811,39 +802,11 @@ - */ - void gcompris_set_fullscreen(gboolean state) - { -- -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(state); -+#endif - if(state) - { --#ifdef XRANDR -- gint i; -- /* Search the 800x600 Resolution */ -- if(properties->fullscreen && !properties->noxrandr) { -- -- g_warning("XRANDR Is compiled in. Searching a good resolution"); -- -- /* Check if XRANDR is available */ -- if (!properties->noxrandr) { -- xrandr_get_config ( xrandr ); -- xr_previous_size = (SizeID)xrandr->xr_current_size; -- for (i = 0; i < xrandr->xr_nsize; i++) { -- if(xrandr->xr_sizes[i].width == BOARDWIDTH && -- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) -- { -- xrandr->xr_current_size = (SizeID)i; -- xr_previous_size_set = TRUE; -- break; -- } -- } -- } -- -- /* Set the Fullscreen now */ -- if(xr_previous_size_set) -- { -- if(is_mapped) -- xrandr_set_config( xrandr ); -- } -- } --#endif - gdk_window_set_decorations (window->window, 0); - gdk_window_set_functions (window->window, 0); - gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +814,6 @@ - } - else - { --#ifdef XRANDR -- /* Set back the original screen size */ -- if(xr_previous_size_set && !properties->noxrandr) -- { -- /* Need to refresh our config or xrandr api will reject us */ -- if(xrandr) -- { -- xrandr_get_config ( xrandr ); -- xrandr->xr_current_size = (SizeID)xr_previous_size; -- xrandr_set_config( xrandr ); -- } -- } -- xr_previous_size_set = FALSE; --#endif - /* The hide must be done at least for KDE */ - gtk_widget_hide (window); - gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -876,6 +825,42 @@ - - } + cat >>confdefs.h <<_ACEOF +-#define XRANDR 1 ++#define XF86_VIDMODE 1 + _ACEOF -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime) -+{ -+ int retval; -+ -+ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); -+ if (retval != GDK_GRAB_SUCCESS) -+ return retval; -+ -+#ifdef XF86_VIDMODE -+ /* When fullscreen override mouse grab with our own which -+ confines the cursor to our fullscreen window */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, -+ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+ -+ return retval; -+} -+ -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) -+{ -+ gnome_canvas_item_ungrab(item, etime); -+#ifdef XF86_VIDMODE -+ /* When fullscreen restore the normal mouse grab which avoids -+ scrolling the virtual desktop */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+} -+ - void gcompris_exit() - { - /* Do not loopback in exit */ -@@ -1044,68 +1029,129 @@ - g_printerr ("%s: %s\n\n", "gcompris", message); - } + fi + fi --#ifdef XRANDR -+#ifdef XF86_VIDMODE - /* -- * XRANDR STUFF -- * ------------ -+ * XF86VidMode STUFF -+ * ----------------- - */ - static void --xrandr_init ( XRANDRData *data ) -+xf86_vidmode_init ( void ) - { -- if(data==NULL) -+ int i,j; -+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) -+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); -+ -+ if (properties->noxf86vm) - return; -- -- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); -- -- if (data->xr_screen_conf == NULL) -+ -+ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, -+ &XF86VidModeData.orig_viewport_x)) -+ properties->noxf86vm = TRUE; -+ -+ if (properties->noxf86vm) -+ g_warning("XF86VidMode not available"); -+ else - { -- g_warning("XRANDR not available"); -- properties->noxrandr = TRUE; -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ g_warning("XF86VidMode support enabled"); - } -- else -- g_warning("XRANDR support enabled"); -- } -- --static void --xrandr_get_config ( XRANDRData *data ) --{ -- if(data==NULL) -- return; -- -- xrandr_init (data); -- -- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, -- &data->xr_current_rotation); -- -- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); -- -- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, -- &data->xr_current_rotation); - } +-LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" ++LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" -+ - static void --xrandr_set_config( XRANDRData *data ) -+xf86_vidmode_set_fullscreen ( int state ) - { -- Status status = RRSetConfigFailed; -+ int i; -+ XF86VidModeModeLine mode; + ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" -- if(data==NULL) -+ if (properties->noxf86vm) - return; +@@ -28651,7 +28651,7 @@ + echo "SDL LIBS = found" + fi -- if (data->xr_lock_updates) return; -- -- status = XRRSetScreenConfig (GDK_DISPLAY(), -- data->xr_screen_conf, -- GDK_ROOT_WINDOW(), -- data->xr_current_size, -- data->xr_current_rotation, -- CurrentTime); -- -- if(status) { -- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", -- (int)status); -- } -- return; -- -+ if (state) -+ { -+ XF86VidModeModeInfo **modes; -+ int mode_count; -+ -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode)) -+ { -+ /* If we can't get the currentmode force setting of a new mode. */ -+ mode.hdisplay = 0; -+ } -+ -+ /* Do we need to switch? */ -+ if ((mode.hdisplay != BOARDWIDTH) || -+ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ mode_count = 0; -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot switch resolution"); -+ break; -+ } -+ } -+ if (i == mode_count) -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ if (mode_count) -+ XFree(modes); -+ } -+ /* We need to grab the pointer before setting the viewport otherwise -+ setviewport may get "canceled" by the pointer being outside the -+ current viewport. */ -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+ -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else -+ { -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode) || -+ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || -+ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) -+ { -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot restore original resolution"); -+ -+ } -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); -+ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, -+ XF86VidModeData.orig_viewport_y)) -+ g_warning("XF86VidMode couldnot restore original viewport"); -+ } - } - #endif +-echo "XRANDR option (--enable-xrandr) = $found_randr" ++echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" -@@ -1185,9 +1231,9 @@ - properties->fullscreen = TRUE; - } + echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" -- if (popt_noxrandr) -+ if (popt_noxf86vm) - { -- properties->noxrandr = TRUE; -+ properties->noxf86vm = TRUE; - } +--- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-11 09:42:18.000000000 +0200 +@@ -141,5 +141,5 @@ + /* Version number of package */ + #undef VERSION - if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-09 19:51:54.000000000 +0200 -@@ -160,7 +160,7 @@ - tmp->fx = 1; - tmp->screensize = 1; - tmp->fullscreen = 1; -- tmp->noxrandr = FALSE; -+ tmp->noxf86vm = FALSE; - tmp->timer = 1; - tmp->skin = "babytoy"; - tmp->key = "default"; -@@ -244,8 +244,8 @@ - } else if(!strcmp(value.v_identifier, "fullscreen")) { - if(!scan_get_int(scanner, &tmp->fullscreen)) - g_warning("Config file parsing error on token %s", token); -- } else if(!strcmp(value.v_identifier, "noxrandr")) { -- if(!scan_get_int(scanner, &tmp->noxrandr)) -+ } else if(!strcmp(value.v_identifier, "noxf86vm")) { -+ if(!scan_get_int(scanner, &tmp->noxf86vm)) - g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "timer")) { - if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-09 19:51:54.000000000 +0200 -@@ -28,7 +28,7 @@ - gint music; - gint fx; - gint fullscreen; -- gint noxrandr; -+ gint noxf86vm; - gint screensize; - gint defaultcursor; - gint timer; +-/* XRANDR Available */ +-#undef XRANDR ++/* XF86VidMode Available */ ++#undef XF86_VIDMODE --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-11 09:42:18.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gcompris.spec 10 May 2006 04:52:01 -0000 1.8 +++ gcompris.spec 11 May 2006 14:43:20 -0000 1.9 @@ -480,9 +480,10 @@ %changelog -* unreleased 2006 Hans de Goede 7.4-10 +* Thu May 11 2006 Hans de Goede 7.4-10 - Add a hard Requires on gcompris-libs version-release to the base package because upstream doesn't bump the soname version when the abi changes. +- Fix 2 more bugs introduced by the fix for bug 190918 (sigh, sorry). * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. From fedora-extras-commits at redhat.com Thu May 11 14:44:25 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 07:44:25 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.6,1.7 Message-ID: <200605111444.k4BEiR67018224@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18207 Modified Files: python-clientform.spec Log Message: add python-setuptools to buildrequires Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-clientform.spec 11 May 2006 14:32:23 -0000 1.6 +++ python-clientform.spec 11 May 2006 14:44:24 -0000 1.7 @@ -2,7 +2,7 @@ Name: python-clientform Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python, python-setuptools %description ClientForm is a Python module for handling HTML forms on the client side, @@ -45,7 +45,10 @@ %ghost %{python_sitelib}/ClientForm.pyo %changelog -* Thu May 12 2006 Luke Macken 0.2.2-2 +* Thu May 11 2006 Luke Macken 0.2.2-3 +- Add python-setuptools to BuildRequires + +* Thu May 11 2006 Luke Macken 0.2.2-2 - Fix version in Source0 * Thu May 11 2006 Luke Macken 0.2.2-1 From fedora-extras-commits at redhat.com Thu May 11 14:44:55 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 07:44:55 -0700 Subject: rpms/gcompris/FC-5 gcompris-7.4-xf86vidmode.patch, 1.2, 1.3 gcompris.spec, 1.6, 1.7 Message-ID: <200605111444.k4BEivLX018308@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18268 Modified Files: gcompris-7.4-xf86vidmode.patch gcompris.spec Log Message: * Thu May 11 2006 Hans de Goede 7.4-10 - Add a hard Requires on gcompris-libs version-release to the base package because upstream doesn't bump the soname version when the abi changes. - Fix 2 more bugs introduced by the fix for bug 190918 (sigh, sorry). gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcompris-7.4-xf86vidmode.patch 9 May 2006 19:18:43 -0000 1.2 +++ gcompris-7.4-xf86vidmode.patch 11 May 2006 14:44:54 -0000 1.3 @@ -1,254 +1,587 @@ ---- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-09 19:51:54.000000000 +0200 -@@ -1094,7 +1094,7 @@ - --disable-sdltest Do not try to compile and run a test SDL program - --disable-glibtest do not try to compile and run a test GLIB program - --disable-rpath do not hardcode runtime library paths -- --disable-xrandr Turn off xrandr -+ --disable-xf86vidmode Turn off xf86vidmode - --enable-debug Turn on debugging messages - --disable-sqlite Turn off sqlite (will disable profile) - --enable-py-build-only Skip python modules tests. (Useful if you just need -@@ -23630,7 +23630,7 @@ - /usr/openwin/share/include' +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-11 09:42:18.000000000 +0200 +@@ -159,6 +159,12 @@ - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23638,7 +23638,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -23665,7 +23665,7 @@ - sed 's/^/| /' conftest.$ac_ext >&5 + void gcompris_confirm_stop (void); - for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -23686,11 +23686,11 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - int - main () - { --XtMalloc (0) -+XrmInitialize () - ; - return 0; - } -@@ -23769,23 +23769,23 @@ - echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 - fi ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" +--- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-11 09:42:18.000000000 +0200 +@@ -33,12 +33,13 @@ --# Check whether --enable-xrandr or --disable-xrandr was given. --if test "${enable_xrandr+set}" = set; then -- enableval="$enable_xrandr" -- USE_XRANDR="$enableval" -+# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. -+if test "${enable_xf86vidmode+set}" = set; then -+ enableval="$enable_xf86vidmode" -+ USE_XF86VM="$enableval" - else -- USE_XRANDR="yes" -+ USE_XF86VM="yes" - fi; --found_randr=no --if test "x$USE_XRANDR" == "xyes" ; then -- RANDR_LIBS= -- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 --echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 --if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then -+found_xf86vidmode=no -+if test "x$USE_XF86VM" == "xyes" ; then -+ XF86VM_LIBS= -+ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 -+if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" -+LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23799,11 +23799,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char XRRSetScreenConfigAndRate (); -+char XF86VidModeQueryExtension (); - int - main () - { --XRRSetScreenConfigAndRate (); -+XF86VidModeQueryExtension (); - ; - return 0; - } -@@ -23830,23 +23830,23 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes -+ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 + #include "cursor.h" --ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no -+ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 --echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 --if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then -- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 --echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 --if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 -+if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then -+ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 -+echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 -+if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -23857,7 +23857,7 @@ - /* end confdefs.h. */ +-/* For XRANDR Support */ +-#ifdef XRANDR ++/* For XF86_VIDMODE Support */ ++#ifdef XF86_VIDMODE + #include #include - -#include -+#include - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -23881,38 +23881,38 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_header_X11_extensions_Xrandr_h=yes -+ ac_cv_header_X11_extensions_xf86vmode_h=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_X11_extensions_Xrandr_h=no -+ac_cv_header_X11_extensions_xf86vmode_h=no - fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 --echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 --if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then -- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes -+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 -+if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then -+ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes - fi +-#include ++#include ++#include ++#include + #endif + #if defined _WIN32 || defined __WIN32__ +@@ -104,7 +105,7 @@ + static int popt_aalias = FALSE; + static int popt_difficulty_filter = FALSE; + static int popt_debug = FALSE; +-static int popt_noxrandr = FALSE; ++static int popt_noxf86vm = FALSE; + static char *popt_root_menu = NULL; + static char *popt_local_activity = NULL; + static int popt_administration = FALSE; +@@ -139,8 +140,8 @@ + N_("Print the version of " PACKAGE), NULL}, + {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, + N_("Use the antialiased canvas (slower)."), NULL}, +- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, +- N_("Disable XRANDR (No screen resolution change)."), NULL}, ++ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, ++ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, + {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, + N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, + {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, +@@ -184,29 +185,19 @@ + }; - fi + /* XRandr Stuff */ +-#ifdef XRANDR +-typedef struct ++#ifdef XF86_VIDMODE ++static struct + { +- gboolean xr_lock_updates; ++ int vidmode_available; ++ XF86VidModeModeInfo orig_mode; ++ int orig_viewport_x; ++ int orig_viewport_y; ++ int width; ++ int height; ++} XF86VidModeData = { 0, { 0 }, 0, 0 }; +- XRRScreenConfiguration *xr_screen_conf; +- +- XRRScreenSize *xr_sizes; +- int xr_nsize; +- SizeID xr_current_size; +- +- Rotation xr_rotations; +- Rotation xr_current_rotation; +- +-} XRANDRData; +- +-static SizeID xr_previous_size; +-static gboolean xr_previous_size_set = FALSE; +-static XRANDRData *xrandr = NULL; +- +-static void xrandr_init ( XRANDRData *xrandr ); +-static void xrandr_get_config ( XRANDRData *xrandr ); +-static void xrandr_set_config( XRANDRData *xrandr ); ++static void xf86_vidmode_init( void ); ++static void xf86_vidmode_set_fullscreen( int state ); + #endif -- if test "x$found_randr" = "xno"; then -- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 --echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} -+ if test "x$found_xf86vidmode" = "xno"; then -+ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 -+echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} - else + /****************************************************************************/ +@@ -441,8 +432,8 @@ + gint screen_height, screen_width; + GtkWidget *vbox; - cat >>confdefs.h <<_ACEOF --#define XRANDR 1 -+#define XF86_VIDMODE 1 - _ACEOF - - fi - fi - --LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" -+LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" +-#ifdef XRANDR +- xrandr = g_new0 (XRANDRData, 1); ++#ifdef XF86_VIDMODE ++ xf86_vidmode_init(); + #endif - ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" + gcompris_set_fullscreen(properties->fullscreen); +@@ -450,10 +441,10 @@ + screen_height = gdk_screen_height(); + screen_width = gdk_screen_width(); -@@ -28651,7 +28651,7 @@ - echo "SDL LIBS = found" - fi +-#ifdef XRANDR +- if(properties->fullscreen && !properties->noxrandr) { +- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; +- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; ++#ifdef XF86_VIDMODE ++ if(properties->fullscreen && !properties->noxf86vm) { ++ screen_width = XF86VidModeData.width; ++ screen_height = XF86VidModeData.height; + } + #endif --echo "XRANDR option (--enable-xrandr) = $found_randr" -+echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" +@@ -811,39 +802,11 @@ + */ + void gcompris_set_fullscreen(gboolean state) + { +- ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { +-#ifdef XRANDR +- gint i; +- /* Search the 800x600 Resolution */ +- if(properties->fullscreen && !properties->noxrandr) { +- +- g_warning("XRANDR Is compiled in. Searching a good resolution"); +- +- /* Check if XRANDR is available */ +- if (!properties->noxrandr) { +- xrandr_get_config ( xrandr ); +- xr_previous_size = (SizeID)xrandr->xr_current_size; +- for (i = 0; i < xrandr->xr_nsize; i++) { +- if(xrandr->xr_sizes[i].width == BOARDWIDTH && +- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) +- { +- xrandr->xr_current_size = (SizeID)i; +- xr_previous_size_set = TRUE; +- break; +- } +- } +- } +- +- /* Set the Fullscreen now */ +- if(xr_previous_size_set) +- { +- if(is_mapped) +- xrandr_set_config( xrandr ); +- } +- } +-#endif + gdk_window_set_decorations (window->window, 0); + gdk_window_set_functions (window->window, 0); + gtk_widget_set_uposition (window, 0, 0); +@@ -851,20 +814,6 @@ + } + else + { +-#ifdef XRANDR +- /* Set back the original screen size */ +- if(xr_previous_size_set && !properties->noxrandr) +- { +- /* Need to refresh our config or xrandr api will reject us */ +- if(xrandr) +- { +- xrandr_get_config ( xrandr ); +- xrandr->xr_current_size = (SizeID)xr_previous_size; +- xrandr_set_config( xrandr ); +- } +- } +- xr_previous_size_set = FALSE; +-#endif + /* The hide must be done at least for KDE */ + gtk_widget_hide (window); + gdk_window_set_decorations (window->window, GDK_DECOR_ALL); +@@ -876,6 +825,42 @@ - echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" + } ---- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-09 19:51:54.000000000 +0200 -@@ -141,5 +141,5 @@ - /* Version number of package */ - #undef VERSION ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1029,131 @@ + g_printerr ("%s: %s\n\n", "gcompris", message); + } --/* XRANDR Available */ --#undef XRANDR -+/* XF86VidMode Available */ -+#undef XF86_VIDMODE ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-09 19:51:54.000000000 +0200 -@@ -72,8 +72,8 @@ - return Py_False; - } +-#ifdef XRANDR ++#ifdef XF86_VIDMODE + /* +- * XRANDR STUFF +- * ------------ ++ * XF86VidMode STUFF ++ * ----------------- + */ + static void +-xrandr_init ( XRANDRData *data ) ++xf86_vidmode_init ( void ) + { +- if(data==NULL) ++ int i,j; ++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) ++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); ++ ++ if (properties->noxf86vm) + return; +- +- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); +- +- if (data->xr_screen_conf == NULL) ++ ++ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, ++ &XF86VidModeData.orig_viewport_x)) ++ properties->noxf86vm = TRUE; ++ ++ if (properties->noxf86vm) ++ g_warning("XF86VidMode not available"); ++ else + { +- g_warning("XRANDR not available"); +- properties->noxrandr = TRUE; ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ g_warning("XF86VidMode support enabled"); } -- if(strcmp(name,"noxrandr")==0){ -- if(self->cdata->noxrandr){ -+ if(strcmp(name,"noxf86vm")==0){ -+ if(self->cdata->noxf86vm){ - Py_INCREF(Py_True); - return Py_True; - } else { ---- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 -+++ gcompris-7.4/src/boards/draw.c 2006-05-09 12:35:04.000000000 +0200 -@@ -2008,7 +2008,7 @@ - case 1: - fleur = gdk_cursor_new(get_resize_cursor(anchor)); - -- gnome_canvas_item_grab(item, -+ gcompris_canvas_item_grab(item, - GDK_POINTER_MOTION_MASK | - GDK_BUTTON_RELEASE_MASK, - fleur, -@@ -2031,7 +2031,7 @@ - case GDK_BUTTON_RELEASE: - if(dragging) - { -- gnome_canvas_item_ungrab(item, event->button.time); -+ gcompris_canvas_item_ungrab(item, event->button.time); - dragging = FALSE; - draggingItem = NULL; - } -@@ -2179,7 +2179,7 @@ +- else +- g_warning("XRANDR support enabled"); +- } +- +-static void +-xrandr_get_config ( XRANDRData *data ) +-{ +- if(data==NULL) +- return; +- +- xrandr_init (data); +- +- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, +- &data->xr_current_rotation); +- +- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); +- +- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, +- &data->xr_current_rotation); + } - fleur = gdk_cursor_new(GDK_FLEUR); ++ + static void +-xrandr_set_config( XRANDRData *data ) ++xf86_vidmode_set_fullscreen ( int state ) + { +- Status status = RRSetConfigFailed; ++ int i; ++ XF86VidModeModeLine mode; -- gnome_canvas_item_grab(item, -+ gcompris_canvas_item_grab(item, +- if(data==NULL) ++ if (properties->noxf86vm) + return; + +- if (data->xr_lock_updates) return; +- +- status = XRRSetScreenConfig (GDK_DISPLAY(), +- data->xr_screen_conf, +- GDK_ROOT_WINDOW(), +- data->xr_current_size, +- data->xr_current_rotation, +- CurrentTime); +- +- if(status) { +- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", +- (int)status); +- } +- return; +- ++ if (state) ++ { ++ XF86VidModeModeInfo **modes; ++ int mode_count; ++ gint x,y; ++ ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode)) ++ { ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; ++ } ++ ++ /* Do we need to switch? */ ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; ++ ++ for (i = 0; i < mode_count; i++) ++ { ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; ++ } ++ } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); ++ } ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ gdk_window_get_position(window->window, &x, &y); ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), x, y)) ++ g_warning("XF86VidMode couldnot change viewport"); ++ } ++ else ++ { ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode) || ++ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || ++ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) ++ { ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot restore original resolution"); ++ ++ } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); ++ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, ++ XF86VidModeData.orig_viewport_y)) ++ g_warning("XF86VidMode couldnot restore original viewport"); ++ } + } + #endif + +@@ -1185,9 +1233,9 @@ + properties->fullscreen = TRUE; + } + +- if (popt_noxrandr) ++ if (popt_noxf86vm) + { +- properties->noxrandr = TRUE; ++ properties->noxf86vm = TRUE; + } + + if (popt_window) +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-11 09:42:18.000000000 +0200 +@@ -160,7 +160,7 @@ + tmp->fx = 1; + tmp->screensize = 1; + tmp->fullscreen = 1; +- tmp->noxrandr = FALSE; ++ tmp->noxf86vm = FALSE; + tmp->timer = 1; + tmp->skin = "babytoy"; + tmp->key = "default"; +@@ -244,8 +244,8 @@ + } else if(!strcmp(value.v_identifier, "fullscreen")) { + if(!scan_get_int(scanner, &tmp->fullscreen)) + g_warning("Config file parsing error on token %s", token); +- } else if(!strcmp(value.v_identifier, "noxrandr")) { +- if(!scan_get_int(scanner, &tmp->noxrandr)) ++ } else if(!strcmp(value.v_identifier, "noxf86vm")) { ++ if(!scan_get_int(scanner, &tmp->noxf86vm)) + g_warning("Config file parsing error on token %s", token); + } else if(!strcmp(value.v_identifier, "timer")) { + if(!scan_get_int(scanner, &tmp->timer)) +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-11 09:42:18.000000000 +0200 +@@ -28,7 +28,7 @@ + gint music; + gint fx; + gint fullscreen; +- gint noxrandr; ++ gint noxf86vm; + gint screensize; + gint defaultcursor; + gint timer; +--- gcompris-7.4/src/gcompris/board_config.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/gcompris/board_config.c 2006-05-11 12:04:27.000000000 +0200 +@@ -125,6 +125,34 @@ + + } + ++#ifdef XF86_VIDMODE ++static GdkEventConfigure gcompris_last_configure_event; ++ ++static gint gcompris_conf_window_configured(GtkWindow *window, ++ GdkEventConfigure *event, gpointer param) ++{ ++ gint new_x, new_y; ++ double screen_width, screen_height; ++ /* Because we call gtk_window_move, we cause a configure event. Filter out ++ identical events to avoid looping. */ ++ if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) ++ { ++ gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( ++ gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); ++ /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ ++ screen_height -= 30; ++ new_x = ((gint)screen_width - event->width) / 2; ++ new_y = ((gint)screen_height - event->height) / 2; ++ /* printf("screen %dx%d, window %dx%d, place %dx%d\n", (int)screen_width, (int)screen_height, event->width, event->height, new_x, new_y); */ ++ gtk_window_move (conf_window, new_x, new_y); ++ memcpy(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure)); ++ } ++ ++ /* Act as if we aren't there / aren't hooked up */ ++ return FALSE; ++} ++#endif ++ + GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) + { + GtkWidget *header; +@@ -145,7 +173,18 @@ + + + /* parameters */ +- gtk_window_set_position (conf_window, ++#ifdef XF86_VIDMODE ++ if (gcompris_get_properties()->fullscreen && ++ !gcompris_get_properties()->noxf86vm) ++ { ++ memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); ++ gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); ++ gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", ++ GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); ++ } ++ else ++#endif ++ gtk_window_set_position (conf_window, + GTK_WIN_POS_CENTER_ALWAYS); + + gtk_widget_show(GTK_WIDGET(conf_window)); +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-11 09:42:22.000000000 +0200 +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen and not Prop.noxf86vm): ++ gtk.gdk.pointer_ungrab() + + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) + + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -221,6 +226,10 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen and ++ not gcompris.get_properties().noxf86vm): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-11 09:42:18.000000000 +0200 +@@ -72,8 +72,8 @@ + return Py_False; + } + } +- if(strcmp(name,"noxrandr")==0){ +- if(self->cdata->noxrandr){ ++ if(strcmp(name,"noxf86vm")==0){ ++ if(self->cdata->noxf86vm){ + Py_INCREF(Py_True); + return Py_True; + } else { +--- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-11 09:42:18.000000000 +0200 +@@ -2008,7 +2008,7 @@ + case 1: + fleur = gdk_cursor_new(get_resize_cursor(anchor)); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, + GDK_POINTER_MOTION_MASK | + GDK_BUTTON_RELEASE_MASK, + fleur, +@@ -2031,7 +2031,7 @@ + case GDK_BUTTON_RELEASE: + if(dragging) + { +- gnome_canvas_item_ungrab(item, event->button.time); ++ gcompris_canvas_item_ungrab(item, event->button.time); + dragging = FALSE; + draggingItem = NULL; + } +@@ -2179,7 +2179,7 @@ + + fleur = gdk_cursor_new(GDK_FLEUR); + +- gnome_canvas_item_grab(item, ++ gcompris_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -262,7 +595,7 @@ draggingItem = NULL; --- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-11 09:42:18.000000000 +0200 @@ -472,7 +472,7 @@ gnome_canvas_item_raise_to_top(data->item); @@ -282,7 +615,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 -+++ gcompris-7.4/src/boards/clockgame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-11 09:42:18.000000000 +0200 @@ -663,7 +663,7 @@ y = item_y; @@ -302,7 +635,7 @@ } break; --- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-11 09:42:18.000000000 +0200 @@ -645,7 +645,7 @@ gnome_canvas_item_raise_to_top(data->item_text); @@ -322,7 +655,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 -+++ gcompris-7.4/src/boards/chess.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-11 09:42:18.000000000 +0200 @@ -839,7 +839,7 @@ fleur = gdk_cursor_new(GDK_FLEUR); @@ -342,7 +675,7 @@ position_display(position); --- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 -+++ gcompris-7.4/src/boards/shapegame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-11 09:42:18.000000000 +0200 @@ -1103,7 +1103,7 @@ gnome_canvas_item_raise_to_top(shape_list_root_item); gnome_canvas_item_raise_to_top(item); @@ -380,7 +713,7 @@ dragging = FALSE; --- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 -+++ gcompris-7.4/src/boards/planegame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-11 09:42:18.000000000 +0200 @@ -578,7 +578,7 @@ y = item_y; @@ -400,7 +733,7 @@ } break; --- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 -+++ gcompris-7.4/src/boards/enumerate.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-11 09:42:18.000000000 +0200 @@ -522,7 +522,7 @@ gnome_canvas_item_raise_to_top(item); @@ -420,7 +753,7 @@ } break; --- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 -+++ gcompris-7.4/src/boards/clickgame.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-11 09:42:18.000000000 +0200 @@ -598,7 +598,7 @@ y = item_y; @@ -440,7 +773,7 @@ } break; --- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 -+++ gcompris-7.4/src/boards/traffic.c 2006-05-09 12:35:04.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-11 09:42:18.000000000 +0200 @@ -417,7 +417,7 @@ cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); else @@ -468,493 +801,220 @@ hit=0; moving=FALSE; } ---- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 -+++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-09 19:51:55.000000000 +0200 -@@ -103,6 +103,11 @@ - options.append('--nostampcontrols') - - gcompris.sound.close() -+ -+ # release pointergrab if running fullscreen, tuxpaint wants to grab the -+ # pointer itself -+ if (Prop.fullscreen): -+ gtk.gdk.pointer_ungrab() - - #self.window.set_property("accept-focus", 0) - #self.window.set_keep_below(False) -@@ -115,7 +120,7 @@ - gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) - return - -- gcompris.child_watch_add(pid, child_callback, None) -+ gcompris.child_watch_add(pid, child_callback, self) - - gcompris.bar_set(0) - gcompris.bar_hide(1) -@@ -221,6 +226,9 @@ - return default_config_dict +--- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-11 09:42:18.000000000 +0200 +@@ -1094,7 +1094,7 @@ + --disable-sdltest Do not try to compile and run a test SDL program + --disable-glibtest do not try to compile and run a test GLIB program + --disable-rpath do not hardcode runtime library paths +- --disable-xrandr Turn off xrandr ++ --disable-xf86vidmode Turn off xf86vidmode + --enable-debug Turn on debugging messages + --disable-sqlite Turn off sqlite (will disable profile) + --enable-py-build-only Skip python modules tests. (Useful if you just need +@@ -23630,7 +23630,7 @@ + /usr/openwin/share/include' - def child_callback(fd, cond, data): -+ # restore pointergrab if running fullscreen -+ if (gcompris.get_properties().fullscreen): -+ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) - #global board - #board.window.set_property("accept-focus", 1) - #board.window.set_keep_above(False) ---- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-09 19:51:54.000000000 +0200 -@@ -159,6 +159,12 @@ - - void gcompris_confirm_stop (void); + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23638,7 +23638,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -23665,7 +23665,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime); -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); -+ - /* Trace Log */ - #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" - #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" ---- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-09 20:51:10.000000000 +0200 -@@ -33,12 +33,13 @@ + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -23686,11 +23686,11 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -23769,23 +23769,23 @@ + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi - #include "cursor.h" +-# Check whether --enable-xrandr or --disable-xrandr was given. +-if test "${enable_xrandr+set}" = set; then +- enableval="$enable_xrandr" +- USE_XRANDR="$enableval" ++# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. ++if test "${enable_xf86vidmode+set}" = set; then ++ enableval="$enable_xf86vidmode" ++ USE_XF86VM="$enableval" + else +- USE_XRANDR="yes" ++ USE_XF86VM="yes" + fi; +-found_randr=no +-if test "x$USE_XRANDR" == "xyes" ; then +- RANDR_LIBS= +- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 +-echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then ++found_xf86vidmode=no ++if test "x$USE_XF86VM" == "xyes" ; then ++ XF86VM_LIBS= ++ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ++echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 ++if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" ++LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23799,11 +23799,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char XRRSetScreenConfigAndRate (); ++char XF86VidModeQueryExtension (); + int + main () + { +-XRRSetScreenConfigAndRate (); ++XF86VidModeQueryExtension (); + ; + return 0; + } +@@ -23830,23 +23830,23 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes ++ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 --/* For XRANDR Support */ --#ifdef XRANDR -+/* For XF86_VIDMODE Support */ -+#ifdef XF86_VIDMODE - #include +-ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no ++ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 +-if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then +- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +-echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +-if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 ++if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then ++ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 ++if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -23857,7 +23857,7 @@ + /* end confdefs.h. */ #include + -#include --#include -+#include -+#include -+#include - #endif ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -23881,38 +23881,38 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_header_X11_extensions_Xrandr_h=yes ++ ac_cv_header_X11_extensions_xf86vmode_h=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 - #if defined _WIN32 || defined __WIN32__ -@@ -104,7 +105,7 @@ - static int popt_aalias = FALSE; - static int popt_difficulty_filter = FALSE; - static int popt_debug = FALSE; --static int popt_noxrandr = FALSE; -+static int popt_noxf86vm = FALSE; - static char *popt_root_menu = NULL; - static char *popt_local_activity = NULL; - static int popt_administration = FALSE; -@@ -139,8 +140,8 @@ - N_("Print the version of " PACKAGE), NULL}, - {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, - N_("Use the antialiased canvas (slower)."), NULL}, -- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, -- N_("Disable XRANDR (No screen resolution change)."), NULL}, -+ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, -+ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, - {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, - N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, - {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, -@@ -184,29 +185,19 @@ - }; +-ac_cv_header_X11_extensions_Xrandr_h=no ++ac_cv_header_X11_extensions_xf86vmode_h=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +-if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then +- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes ++echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 ++if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then ++ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes + fi - /* XRandr Stuff */ --#ifdef XRANDR --typedef struct -+#ifdef XF86_VIDMODE -+static struct - { -- gboolean xr_lock_updates; -+ int vidmode_available; -+ XF86VidModeModeInfo orig_mode; -+ int orig_viewport_x; -+ int orig_viewport_y; -+ int width; -+ int height; -+} XF86VidModeData = { 0, { 0 }, 0, 0 }; -- XRRScreenConfiguration *xr_screen_conf; -- -- XRRScreenSize *xr_sizes; -- int xr_nsize; -- SizeID xr_current_size; -- -- Rotation xr_rotations; -- Rotation xr_current_rotation; -- --} XRANDRData; -- --static SizeID xr_previous_size; --static gboolean xr_previous_size_set = FALSE; --static XRANDRData *xrandr = NULL; -- --static void xrandr_init ( XRANDRData *xrandr ); --static void xrandr_get_config ( XRANDRData *xrandr ); --static void xrandr_set_config( XRANDRData *xrandr ); -+static void xf86_vidmode_init( void ); -+static void xf86_vidmode_set_fullscreen( int state ); - #endif + fi - /****************************************************************************/ -@@ -441,8 +432,8 @@ - gint screen_height, screen_width; - GtkWidget *vbox; --#ifdef XRANDR -- xrandr = g_new0 (XRANDRData, 1); -+#ifdef XF86_VIDMODE -+ xf86_vidmode_init(); - #endif +- if test "x$found_randr" = "xno"; then +- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 +-echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} ++ if test "x$found_xf86vidmode" = "xno"; then ++ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 ++echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} + else - gcompris_set_fullscreen(properties->fullscreen); -@@ -450,10 +441,10 @@ - screen_height = gdk_screen_height(); - screen_width = gdk_screen_width(); - --#ifdef XRANDR -- if(properties->fullscreen && !properties->noxrandr) { -- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; -- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; -+#ifdef XF86_VIDMODE -+ if(properties->fullscreen && !properties->noxf86vm) { -+ screen_width = XF86VidModeData.width; -+ screen_height = XF86VidModeData.height; - } - #endif - -@@ -811,39 +802,11 @@ - */ - void gcompris_set_fullscreen(gboolean state) - { -- -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(state); -+#endif - if(state) - { --#ifdef XRANDR -- gint i; -- /* Search the 800x600 Resolution */ -- if(properties->fullscreen && !properties->noxrandr) { -- -- g_warning("XRANDR Is compiled in. Searching a good resolution"); -- -- /* Check if XRANDR is available */ -- if (!properties->noxrandr) { -- xrandr_get_config ( xrandr ); -- xr_previous_size = (SizeID)xrandr->xr_current_size; -- for (i = 0; i < xrandr->xr_nsize; i++) { -- if(xrandr->xr_sizes[i].width == BOARDWIDTH && -- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) -- { -- xrandr->xr_current_size = (SizeID)i; -- xr_previous_size_set = TRUE; -- break; -- } -- } -- } -- -- /* Set the Fullscreen now */ -- if(xr_previous_size_set) -- { -- if(is_mapped) -- xrandr_set_config( xrandr ); -- } -- } --#endif - gdk_window_set_decorations (window->window, 0); - gdk_window_set_functions (window->window, 0); - gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +814,6 @@ - } - else - { --#ifdef XRANDR -- /* Set back the original screen size */ -- if(xr_previous_size_set && !properties->noxrandr) -- { -- /* Need to refresh our config or xrandr api will reject us */ -- if(xrandr) -- { -- xrandr_get_config ( xrandr ); -- xrandr->xr_current_size = (SizeID)xr_previous_size; -- xrandr_set_config( xrandr ); -- } -- } -- xr_previous_size_set = FALSE; --#endif - /* The hide must be done at least for KDE */ - gtk_widget_hide (window); - gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -876,6 +825,42 @@ - - } + cat >>confdefs.h <<_ACEOF +-#define XRANDR 1 ++#define XF86_VIDMODE 1 + _ACEOF -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime) -+{ -+ int retval; -+ -+ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); -+ if (retval != GDK_GRAB_SUCCESS) -+ return retval; -+ -+#ifdef XF86_VIDMODE -+ /* When fullscreen override mouse grab with our own which -+ confines the cursor to our fullscreen window */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, -+ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+ -+ return retval; -+} -+ -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) -+{ -+ gnome_canvas_item_ungrab(item, etime); -+#ifdef XF86_VIDMODE -+ /* When fullscreen restore the normal mouse grab which avoids -+ scrolling the virtual desktop */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+} -+ - void gcompris_exit() - { - /* Do not loopback in exit */ -@@ -1044,68 +1029,129 @@ - g_printerr ("%s: %s\n\n", "gcompris", message); - } + fi + fi --#ifdef XRANDR -+#ifdef XF86_VIDMODE - /* -- * XRANDR STUFF -- * ------------ -+ * XF86VidMode STUFF -+ * ----------------- - */ - static void --xrandr_init ( XRANDRData *data ) -+xf86_vidmode_init ( void ) - { -- if(data==NULL) -+ int i,j; -+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) -+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); -+ -+ if (properties->noxf86vm) - return; -- -- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); -- -- if (data->xr_screen_conf == NULL) -+ -+ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, -+ &XF86VidModeData.orig_viewport_x)) -+ properties->noxf86vm = TRUE; -+ -+ if (properties->noxf86vm) -+ g_warning("XF86VidMode not available"); -+ else - { -- g_warning("XRANDR not available"); -- properties->noxrandr = TRUE; -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ g_warning("XF86VidMode support enabled"); - } -- else -- g_warning("XRANDR support enabled"); -- } -- --static void --xrandr_get_config ( XRANDRData *data ) --{ -- if(data==NULL) -- return; -- -- xrandr_init (data); -- -- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, -- &data->xr_current_rotation); -- -- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); -- -- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, -- &data->xr_current_rotation); - } +-LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" ++LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" -+ - static void --xrandr_set_config( XRANDRData *data ) -+xf86_vidmode_set_fullscreen ( int state ) - { -- Status status = RRSetConfigFailed; -+ int i; -+ XF86VidModeModeLine mode; + ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" -- if(data==NULL) -+ if (properties->noxf86vm) - return; +@@ -28651,7 +28651,7 @@ + echo "SDL LIBS = found" + fi -- if (data->xr_lock_updates) return; -- -- status = XRRSetScreenConfig (GDK_DISPLAY(), -- data->xr_screen_conf, -- GDK_ROOT_WINDOW(), -- data->xr_current_size, -- data->xr_current_rotation, -- CurrentTime); -- -- if(status) { -- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", -- (int)status); -- } -- return; -- -+ if (state) -+ { -+ XF86VidModeModeInfo **modes; -+ int mode_count; -+ -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode)) -+ { -+ /* If we can't get the currentmode force setting of a new mode. */ -+ mode.hdisplay = 0; -+ } -+ -+ /* Do we need to switch? */ -+ if ((mode.hdisplay != BOARDWIDTH) || -+ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ mode_count = 0; -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot switch resolution"); -+ break; -+ } -+ } -+ if (i == mode_count) -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ if (mode_count) -+ XFree(modes); -+ } -+ /* We need to grab the pointer before setting the viewport otherwise -+ setviewport may get "canceled" by the pointer being outside the -+ current viewport. */ -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+ -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), 0, 0)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else -+ { -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode) || -+ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || -+ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) -+ { -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot restore original resolution"); -+ -+ } -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); -+ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, -+ XF86VidModeData.orig_viewport_y)) -+ g_warning("XF86VidMode couldnot restore original viewport"); -+ } - } - #endif +-echo "XRANDR option (--enable-xrandr) = $found_randr" ++echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" -@@ -1185,9 +1231,9 @@ - properties->fullscreen = TRUE; - } + echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" -- if (popt_noxrandr) -+ if (popt_noxf86vm) - { -- properties->noxrandr = TRUE; -+ properties->noxf86vm = TRUE; - } +--- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-11 09:42:18.000000000 +0200 +@@ -141,5 +141,5 @@ + /* Version number of package */ + #undef VERSION - if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-09 19:51:54.000000000 +0200 -@@ -160,7 +160,7 @@ - tmp->fx = 1; - tmp->screensize = 1; - tmp->fullscreen = 1; -- tmp->noxrandr = FALSE; -+ tmp->noxf86vm = FALSE; - tmp->timer = 1; - tmp->skin = "babytoy"; - tmp->key = "default"; -@@ -244,8 +244,8 @@ - } else if(!strcmp(value.v_identifier, "fullscreen")) { - if(!scan_get_int(scanner, &tmp->fullscreen)) - g_warning("Config file parsing error on token %s", token); -- } else if(!strcmp(value.v_identifier, "noxrandr")) { -- if(!scan_get_int(scanner, &tmp->noxrandr)) -+ } else if(!strcmp(value.v_identifier, "noxf86vm")) { -+ if(!scan_get_int(scanner, &tmp->noxf86vm)) - g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "timer")) { - if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-09 19:51:54.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-09 19:51:54.000000000 +0200 -@@ -28,7 +28,7 @@ - gint music; - gint fx; - gint fullscreen; -- gint noxrandr; -+ gint noxf86vm; - gint screensize; - gint defaultcursor; - gint timer; +-/* XRANDR Available */ +-#undef XRANDR ++/* XF86VidMode Available */ ++#undef XF86_VIDMODE --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-09 19:51:54.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-11 09:42:18.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gcompris.spec 9 May 2006 19:18:43 -0000 1.6 +++ gcompris.spec 11 May 2006 14:44:54 -0000 1.7 @@ -1,6 +1,6 @@ Name: gcompris Version: 7.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL @@ -21,6 +21,7 @@ Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess Requires: gnuchess gnucap tuxpaint gcompris-flags Requires: gnome-python2-canvas python-sqlite2 +Requires: %{name}-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -71,7 +72,7 @@ %package devel Summary: Development libraries and headers for gcompris-lib Group: Development/Libraries -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} Requires: libgnomecanvas-devel pkgconfig %description devel @@ -479,6 +480,11 @@ %changelog +* Thu May 11 2006 Hans de Goede 7.4-10 +- Add a hard Requires on gcompris-libs version-release to the base package + because upstream doesn't bump the soname version when the abi changes. +- Fix 2 more bugs introduced by the fix for bug 190918 (sigh, sorry). + * Tue May 9 2006 Hans de Goede 7.4-9 - Fix 2 bugs introduced by the fix for bug 190918, see the bug for details. From fedora-extras-commits at redhat.com Thu May 11 14:44:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 07:44:59 -0700 Subject: extras-buildsys/builder Builder.py,1.7,1.8 Message-ID: <200605111444.k4BEixYU018315@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18288/builder Modified Files: Builder.py Log Message: Reformat long line 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 10 May 2006 14:28:12 -0000 1.7 +++ Builder.py 11 May 2006 14:44:56 -0000 1.8 @@ -387,7 +387,8 @@ try: cmd_stream = Commands.serialize_to_command_stream(self._cmds) self.response = self._server.request(cmd_stream) - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): + except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, + OpenSSL.SSL.Error, xmlrpclib.ProtocolError), exc: self.failed = True except xmlrpclib.Fault, exc: print "Builder Error (%s) in request(): server replied '%s'" % (self._address, exc) From fedora-extras-commits at redhat.com Thu May 11 14:45:36 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 07:45:36 -0700 Subject: extras-buildsys/client client.py,1.35,1.36 Message-ID: <200605111445.k4BEjaSW018388@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18370/client Modified Files: client.py Log Message: Fix list_builders command Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- client.py 26 Feb 2006 16:51:34 -0000 1.35 +++ client.py 11 May 2006 14:45:34 -0000 1.36 @@ -332,8 +332,8 @@ for arch in builder['arches']: string = string + arch + " " alive = 'unavailable' - if builder['alive']: - alive = 'alive' + if builder['available']: + alive = 'available' string = string + " " + alive print string print "" From fedora-extras-commits at redhat.com Thu May 11 14:46:39 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 07:46:39 -0700 Subject: extras-buildsys/server PackageJob.py,1.48,1.49 Message-ID: <200605111446.k4BEkdwW018425@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18407/server Modified Files: PackageJob.py Log Message: Only print hostname, not IP Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- PackageJob.py 9 May 2006 19:10:57 -0000 1.48 +++ PackageJob.py 11 May 2006 14:46:37 -0000 1.49 @@ -673,7 +673,9 @@ t.start() self._archjobs_lock.release() - log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, job.builder().address(), job.jobid)) + # Only want hostname, not both IP and hostname + addr = job.builder().address()[1] + log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, addr, job.jobid)) def remove_arch_job(self, job): """ Removes an arch job when its builder is no longer responding """ From fedora-extras-commits at redhat.com Thu May 11 14:57:23 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 07:57:23 -0700 Subject: rpms/libgda/devel libgda.spec,1.12,1.13 Message-ID: <200605111457.k4BEvPcF018593@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18574 Modified Files: libgda.spec Log Message: * Thu May 11 2006 Hans de Goede 1:1.9.100-6 - Move Obsoletes and Provides for plugins out of the plugins %description, so that they actually Obsolete and Provide instead of showing up in rpm -qi (bug 191213). Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgda.spec 4 May 2006 21:12:41 -0000 1.12 +++ libgda.spec 11 May 2006 14:57:23 -0000 1.13 @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -109,100 +109,100 @@ %package sqlite Summary: libgda SQLite Provider Group: System Environment/Libraries -%description sqlite -This package includes the libgda SQLite provider. Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release} Provides: gda-sqlite = %{epoch}:%{version}-%{release} +%description sqlite +This package includes the libgda SQLite provider. %if %{FREETDS} %package freetds Summary: libgda FreeTDS Provider Group: System Environment/Libraries -%description freetds -This package includes the libgda FreeTDS provider. Obsoletes: gda-freetds < %{epoch}:%{version}-%{release} Provides: gda-freetds = %{epoch}:%{version}-%{release} +%description freetds +This package includes the libgda FreeTDS provider. %endif %if %{IBMDB2} %package ibmdb2 Summary: libgda IBM DB2 Provider Group: System Environment/Libraries -%description ibmdb2 -This package includes the libgda IBM DB2 provider. Obsoletes: gda-ibmdb2 < %{epoch}:%{version}-%{release} Provides: gda-ibmdb2 = %{epoch}:%{version}-%{release} +%description ibmdb2 +This package includes the libgda IBM DB2 provider. %endif %if %{MYSQL} %package mysql Summary: libgda MySQL Provider Group: System Environment/Libraries -%description mysql -This package includes the libgda MySQL provider. Obsoletes: gda-mysql < %{epoch}:%{version}-%{release} Provides: gda-mysql = %{epoch}:%{version}-%{release} +%description mysql +This package includes the libgda MySQL provider. %endif %if %{ODBC} %package odbc Summary: libgda ODBC Provider Group: System Environment/Libraries -%description odbc -This package includes the libgda ODBC provider. Obsoletes: gda-odbc < %{epoch}:%{version}-%{release} Provides: gda-odbc = %{epoch}:%{version}-%{release} +%description odbc +This package includes the libgda ODBC provider. %endif %if %{ORACLE} %package oracle Summary: libgda Oracle Provider Group: System Environment/Libraries -%description oracle -This package includes the libgda Oracle provider. Obsoletes: gda-oracle < %{epoch}:%{version}-%{release} Provides: gda-oracle = %{epoch}:%{version}-%{release} +%description oracle +This package includes the libgda Oracle provider. %endif %if %{POSTGRES} %package postgres Summary: libgda PostgreSQL Provider Group: System Environment/Libraries -%description postgres -This package includes the libgda PostgreSQL provider. Obsoletes: gda-postgres < %{epoch}:%{version}-%{release} Provides: gda-postgres = %{epoch}:%{version}-%{release} +%description postgres +This package includes the libgda PostgreSQL provider. %endif %if %{SYBASE} %package sybase Summary: libgda Sybase Provider Group: System Environment/Libraries -%description sybase -This package includes the libgda Sybase provider. Obsoletes: gda-sybase < %{epoch}:%{version}-%{release} Provides: gda-sybase = %{epoch}:%{version}-%{release} +%description sybase +This package includes the libgda Sybase provider. %endif %if %{MDB} %package mdb Summary: libgda MDB Provider Group: System Environment/Libraries -%description mdb -This package includes the libgda MDB provider. Obsoletes: gda-mdb < %{epoch}:%{version}-%{release} Provides: gda-mdb = %{epoch}:%{version}-%{release} +%description mdb +This package includes the libgda MDB provider. %endif %if %{LDAP} %package ldap Summary: libgda LDAP Provider Group: System Environment/Libraries -%description ldap -This package includes the libgda LDAP provider. Obsoletes: gda-ldap < %{epoch}:%{version}-%{release} Provides: gda-ldap = %{epoch}:%{version}-%{release} +%description ldap +This package includes the libgda LDAP provider. %endif @@ -399,6 +399,11 @@ %changelog +* Thu May 11 2006 Hans de Goede 1:1.9.100-6 +- Move Obsoletes and Provides for plugins out of the plugins %%description, + so that they actually Obsolete and Provide instead of showing up in rpm -qi + (bug 191213). + * Thu May 4 2006 Hans de Goede 1:1.9.100-5 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) From fedora-extras-commits at redhat.com Thu May 11 14:58:55 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 07:58:55 -0700 Subject: rpms/libgda/FC-5 libgda.spec,1.12,1.13 Message-ID: <200605111458.k4BEwvxB018659@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18642 Modified Files: libgda.spec Log Message: * Thu May 11 2006 Hans de Goede 1:1.9.100-6 - Move Obsoletes and Provides for plugins out of the plugins %description, so that they actually Obsolete and Provide instead of showing up in rpm -qi (bug 191213). Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/FC-5/libgda.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgda.spec 4 May 2006 21:13:34 -0000 1.12 +++ libgda.spec 11 May 2006 14:58:54 -0000 1.13 @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -109,100 +109,100 @@ %package sqlite Summary: libgda SQLite Provider Group: System Environment/Libraries -%description sqlite -This package includes the libgda SQLite provider. Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release} Provides: gda-sqlite = %{epoch}:%{version}-%{release} +%description sqlite +This package includes the libgda SQLite provider. %if %{FREETDS} %package freetds Summary: libgda FreeTDS Provider Group: System Environment/Libraries -%description freetds -This package includes the libgda FreeTDS provider. Obsoletes: gda-freetds < %{epoch}:%{version}-%{release} Provides: gda-freetds = %{epoch}:%{version}-%{release} +%description freetds +This package includes the libgda FreeTDS provider. %endif %if %{IBMDB2} %package ibmdb2 Summary: libgda IBM DB2 Provider Group: System Environment/Libraries -%description ibmdb2 -This package includes the libgda IBM DB2 provider. Obsoletes: gda-ibmdb2 < %{epoch}:%{version}-%{release} Provides: gda-ibmdb2 = %{epoch}:%{version}-%{release} +%description ibmdb2 +This package includes the libgda IBM DB2 provider. %endif %if %{MYSQL} %package mysql Summary: libgda MySQL Provider Group: System Environment/Libraries -%description mysql -This package includes the libgda MySQL provider. Obsoletes: gda-mysql < %{epoch}:%{version}-%{release} Provides: gda-mysql = %{epoch}:%{version}-%{release} +%description mysql +This package includes the libgda MySQL provider. %endif %if %{ODBC} %package odbc Summary: libgda ODBC Provider Group: System Environment/Libraries -%description odbc -This package includes the libgda ODBC provider. Obsoletes: gda-odbc < %{epoch}:%{version}-%{release} Provides: gda-odbc = %{epoch}:%{version}-%{release} +%description odbc +This package includes the libgda ODBC provider. %endif %if %{ORACLE} %package oracle Summary: libgda Oracle Provider Group: System Environment/Libraries -%description oracle -This package includes the libgda Oracle provider. Obsoletes: gda-oracle < %{epoch}:%{version}-%{release} Provides: gda-oracle = %{epoch}:%{version}-%{release} +%description oracle +This package includes the libgda Oracle provider. %endif %if %{POSTGRES} %package postgres Summary: libgda PostgreSQL Provider Group: System Environment/Libraries -%description postgres -This package includes the libgda PostgreSQL provider. Obsoletes: gda-postgres < %{epoch}:%{version}-%{release} Provides: gda-postgres = %{epoch}:%{version}-%{release} +%description postgres +This package includes the libgda PostgreSQL provider. %endif %if %{SYBASE} %package sybase Summary: libgda Sybase Provider Group: System Environment/Libraries -%description sybase -This package includes the libgda Sybase provider. Obsoletes: gda-sybase < %{epoch}:%{version}-%{release} Provides: gda-sybase = %{epoch}:%{version}-%{release} +%description sybase +This package includes the libgda Sybase provider. %endif %if %{MDB} %package mdb Summary: libgda MDB Provider Group: System Environment/Libraries -%description mdb -This package includes the libgda MDB provider. Obsoletes: gda-mdb < %{epoch}:%{version}-%{release} Provides: gda-mdb = %{epoch}:%{version}-%{release} +%description mdb +This package includes the libgda MDB provider. %endif %if %{LDAP} %package ldap Summary: libgda LDAP Provider Group: System Environment/Libraries -%description ldap -This package includes the libgda LDAP provider. Obsoletes: gda-ldap < %{epoch}:%{version}-%{release} Provides: gda-ldap = %{epoch}:%{version}-%{release} +%description ldap +This package includes the libgda LDAP provider. %endif @@ -399,6 +399,11 @@ %changelog +* Thu May 11 2006 Hans de Goede 1:1.9.100-6 +- Move Obsoletes and Provides for plugins out of the plugins %%description, + so that they actually Obsolete and Provide instead of showing up in rpm -qi + (bug 191213). + * Thu May 4 2006 Hans de Goede 1:1.9.100-5 - Add patch3 fixing a couple of x86_64 bugs (bz 190366) From fedora-extras-commits at redhat.com Thu May 11 15:10:01 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 11 May 2006 08:10:01 -0700 Subject: rpms/python-clientform/devel python-clientform.spec,1.7,1.8 Message-ID: <200605111510.k4BFA34G021003@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20986 Modified Files: python-clientform.spec Log Message: * Thu May 11 2006 Luke Macken 0.2.2-4 - Install with --single-version-externally-managed flag - Add a few more docs Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/devel/python-clientform.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-clientform.spec 11 May 2006 14:44:24 -0000 1.7 +++ python-clientform.spec 11 May 2006 15:10:01 -0000 1.8 @@ -2,7 +2,7 @@ Name: python-clientform Version: 0.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages @@ -30,7 +30,8 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --single-version-externally-managed -O1 \ + --skip-build --root $RPM_BUILD_ROOT %clean @@ -39,12 +40,15 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README.txt -%{python_sitelib}/ClientForm.py -%{python_sitelib}/ClientForm.pyc +%doc COPYING.txt GeneralFAQ.html README.txt README.html examples +%{python_sitelib}/* %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 11 2006 Luke Macken 0.2.2-4 +- Install with --single-version-externally-managed flag +- Add a few more docs + * Thu May 11 2006 Luke Macken 0.2.2-3 - Add python-setuptools to BuildRequires From fedora-extras-commits at redhat.com Thu May 11 15:32:14 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 08:32:14 -0700 Subject: rpms/perl-IPC-Run/FC-4 .cvsignore, 1.3, 1.4 perl-IPC-Run.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200605111532.k4BFWGTh021290@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IPC-Run/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21237/FC-4 Modified Files: .cvsignore perl-IPC-Run.spec sources Log Message: * Thu May 11 2006 Ville Skytt?? - 0.80-1 - 0.80, fine tune build dependencies. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 17:46:46 -0000 1.3 +++ .cvsignore 11 May 2006 15:32:14 -0000 1.4 @@ -1 +1 @@ -IPC-Run-0.79.tar.gz +IPC-Run-0.80.tar.gz Index: perl-IPC-Run.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-4/perl-IPC-Run.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-IPC-Run.spec 10 Apr 2005 17:09:46 -0000 1.10 +++ perl-IPC-Run.spec 11 May 2006 15:32:14 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-IPC-Run -Version: 0.79 -Release: 2 +Version: 0.80 +Release: 1%{?dist} Summary: Perl module for interacting with child processes License: GPL or Artistic @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IO::Tty) +BuildRequires: perl(IO::Pty) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -25,6 +25,7 @@ %prep %setup -q -n IPC-Run-%{version} chmod 644 lib/IPC/*.pm lib/IPC/Run/*.pm Changes eg/* +%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' eg/run_daemon %build @@ -38,9 +39,11 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* +rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/IPC/Run/Win32*.pm +rm -f $RPM_BUILD_ROOT%{_mandir}/man3/IPC::Run::Win32*.3* -%check || : +%check # https://rt.cpan.org/NoAuth/Bug.html?id=11129 [ ! -d /dev/pts ] || IPCRUNDEBUG=2 make test @@ -53,12 +56,16 @@ %defattr(-,root,root,-) %doc Changes TODO eg/ %{perl_vendorlib}/IPC/ -%exclude %{perl_vendorlib}/IPC/Run/Win32*.pm %{_mandir}/man3/IPC::Run*.3* -%exclude %{_mandir}/man3/IPC::Run::Win32*.3* %changelog +* Thu May 11 2006 Ville Skytt?? - 0.80-1 +- 0.80, fine tune build dependencies. + +* Tue Jan 17 2006 Ville Skytt?? - 0.79-3 +- Rebuild, cosmetic cleanups. + * Sun Apr 10 2005 Ville Skytt?? - 0.79-2 - Exclude Win32 specific modules. - Include more docs. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 17:46:46 -0000 1.3 +++ sources 11 May 2006 15:32:14 -0000 1.4 @@ -1 +1 @@ -a1044306a9669b376f58315884c13392 IPC-Run-0.79.tar.gz +a867e694862afd4a3c429124618fc15e IPC-Run-0.80.tar.gz From fedora-extras-commits at redhat.com Thu May 11 15:32:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 08:32:16 -0700 Subject: rpms/perl-IPC-Run/devel .cvsignore, 1.3, 1.4 perl-IPC-Run.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605111532.k4BFWIdF021302@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IPC-Run/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21237/devel Modified Files: .cvsignore perl-IPC-Run.spec sources Log Message: * Thu May 11 2006 Ville Skytt?? - 0.80-1 - 0.80, fine tune build dependencies. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 17:46:46 -0000 1.3 +++ .cvsignore 11 May 2006 15:32:16 -0000 1.4 @@ -1 +1 @@ -IPC-Run-0.79.tar.gz +IPC-Run-0.80.tar.gz Index: perl-IPC-Run.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-IPC-Run.spec 17 Jan 2006 21:43:32 -0000 1.11 +++ perl-IPC-Run.spec 11 May 2006 15:32:16 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-IPC-Run -Version: 0.79 -Release: 3%{?dist} +Version: 0.80 +Release: 1%{?dist} Summary: Perl module for interacting with child processes License: GPL or Artistic @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IO::Tty) +BuildRequires: perl(IO::Pty) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -60,6 +60,9 @@ %changelog +* Thu May 11 2006 Ville Skytt?? - 0.80-1 +- 0.80, fine tune build dependencies. + * Tue Jan 17 2006 Ville Skytt?? - 0.79-3 - Rebuild, cosmetic cleanups. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 17:46:46 -0000 1.3 +++ sources 11 May 2006 15:32:16 -0000 1.4 @@ -1 +1 @@ -a1044306a9669b376f58315884c13392 IPC-Run-0.79.tar.gz +a867e694862afd4a3c429124618fc15e IPC-Run-0.80.tar.gz From fedora-extras-commits at redhat.com Thu May 11 15:32:15 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 08:32:15 -0700 Subject: rpms/perl-IPC-Run/FC-5 .cvsignore, 1.3, 1.4 perl-IPC-Run.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <200605111532.k4BFWHKm021296@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IPC-Run/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21237/FC-5 Modified Files: .cvsignore perl-IPC-Run.spec sources Log Message: * Thu May 11 2006 Ville Skytt?? - 0.80-1 - 0.80, fine tune build dependencies. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 17:46:46 -0000 1.3 +++ .cvsignore 11 May 2006 15:32:15 -0000 1.4 @@ -1 +1 @@ -IPC-Run-0.79.tar.gz +IPC-Run-0.80.tar.gz Index: perl-IPC-Run.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-5/perl-IPC-Run.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-IPC-Run.spec 17 Jan 2006 21:43:32 -0000 1.11 +++ perl-IPC-Run.spec 11 May 2006 15:32:15 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-IPC-Run -Version: 0.79 -Release: 3%{?dist} +Version: 0.80 +Release: 1%{?dist} Summary: Perl module for interacting with child processes License: GPL or Artistic @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IO::Tty) +BuildRequires: perl(IO::Pty) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -60,6 +60,9 @@ %changelog +* Thu May 11 2006 Ville Skytt?? - 0.80-1 +- 0.80, fine tune build dependencies. + * Tue Jan 17 2006 Ville Skytt?? - 0.79-3 - Rebuild, cosmetic cleanups. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Run/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 17:46:46 -0000 1.3 +++ sources 11 May 2006 15:32:15 -0000 1.4 @@ -1 +1 @@ -a1044306a9669b376f58315884c13392 IPC-Run-0.79.tar.gz +a867e694862afd4a3c429124618fc15e IPC-Run-0.80.tar.gz From fedora-extras-commits at redhat.com Thu May 11 15:43:41 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 08:43:41 -0700 Subject: extras-buildsys/builder BuilderMock.py,1.4,1.5 Message-ID: <200605111543.k4BFhfsO021855@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21835/builder Modified Files: BuilderMock.py Log Message: Remove duplicated code Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BuilderMock.py 9 May 2006 06:04:48 -0000 1.4 +++ BuilderMock.py 11 May 2006 15:43:39 -0000 1.5 @@ -174,8 +174,6 @@ self._log("Starting step 'building' with command:\n") if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) - if not os.path.exists(self._result_dir): - os.makedirs(self._result_dir) # Set up build process arguments args = [] From fedora-extras-commits at redhat.com Thu May 11 15:49:14 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Thu, 11 May 2006 08:49:14 -0700 Subject: rpms/ctapi-cyberjack/FC-4 ctapi-cyberjack.spec,1.1,1.2 Message-ID: <200605111549.k4BFnGev021915@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/ctapi-cyberjack/FC-4 Modified Files: ctapi-cyberjack.spec Log Message: change marks to build for FC4 Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-4/ctapi-cyberjack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack.spec 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack.spec 11 May 2006 15:49:14 -0000 1.2 @@ -4,9 +4,9 @@ Release: 13%{?dist} Requires: %{_libdir}/ctapi #For FC>4 -BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 +#BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 #For FC4 -#BuildRequires: libusb-devel readline-devel +BuildRequires: libusb-devel readline-devel URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.8/ctapi-cyberjack-2.0.8.tar.bz2 License: LGPL @@ -17,9 +17,9 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #for FC4 -#%%define readers_dir %{_libdir}/readers +%define readers_dir %{_libdir}/readers #for FC>4 -%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir) +#%%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir) %package devel Summary: Development files for libctapi-cyberjack @@ -69,7 +69,7 @@ etc/reader.conf #fix reader.conf for FC>4 - sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf + #sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf %patch0 -p1 %patch1 -p1 From fedora-extras-commits at redhat.com Thu May 11 15:52:28 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 08:52:28 -0700 Subject: extras-buildsys ChangeLog,1.193,1.194 Message-ID: <200605111552.k4BFqS7b022089@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058 Modified Files: ChangeLog Log Message: 2006-05-11 Dan Williams * builder/Builder.py - Make Builder::cleanup() work again - Sleep in ActiveBuilder::stop() until the thread is actually stopped Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- ChangeLog 10 May 2006 14:28:12 -0000 1.193 +++ ChangeLog 11 May 2006 15:52:25 -0000 1.194 @@ -1,3 +1,9 @@ +2006-05-11 Dan Williams + + * builder/Builder.py + - Make Builder::cleanup() work again + - Sleep in ActiveBuilder::stop() until the thread is actually stopped + 2006-05-10 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Thu May 11 15:52:28 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 08:52:28 -0700 Subject: extras-buildsys/builder Builder.py,1.8,1.9 Message-ID: <200605111552.k4BFqSHZ022095@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22058/builder Modified Files: Builder.py Log Message: 2006-05-11 Dan Williams * builder/Builder.py - Make Builder::cleanup() work again - Sleep in ActiveBuilder::stop() until the thread is actually stopped 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 11 May 2006 14:44:56 -0000 1.8 +++ Builder.py 11 May 2006 15:52:26 -0000 1.9 @@ -60,10 +60,6 @@ pass return max_jobs -def log(string): - sys.stdout.write(string + "\n") - sys.stdout.flush() - class Builder(object): """ Abstract builder base object """ @@ -92,9 +88,12 @@ build_arches.append(arch) self._log("Available architectures: [%s]" % string.join(build_arches, ", ")) - def _log(self, string): + def _log(self, msg, newline=True): if self._cfg.get_bool("General", "debug"): - log(string) + if newline: + msg = msg + "\n" + sys.stdout.write(msg) + sys.stdout.flush() def new_builder(cfg, btype): if btype == 'passive': @@ -109,19 +108,18 @@ pass def cleanup(self): - return - (building_jobs, free) = bcs.building_jobs() - for jobid in building_jobs.keys(): - bcs.die(jobid) + self._building_jobs_lock.acquire() + for job in self._building_jobs: + job.die() + self._building_jobs_lock.release() # wait for the jobs to clean up before quitting - self._log("Waiting for running jobs to stop...") + self._log("Waiting for running jobs to stop...", newline=False) while True: - (building_jobs, free) = bcs.building_jobs() - if len(building_jobs.keys()) == 0: + if len(self._building_jobs) == 0: break try: - self._log(".") + self._log(".", newline=False) time.sleep(0.5) except KeyboardInterrupt: break @@ -405,6 +403,7 @@ def __init__(self, cfg): Builder.__init__(self, cfg) self._stop = False + self._stopped = False self._last_comm = time.time() - self._SERVER_CONTACT_INTERVAL - 1 self._queued_cmds = [] self._xmlrpc_address = self._get_server_address(cfg.get_str("Active", "xmlrpc_port")) @@ -554,6 +553,12 @@ resp = self._send_commands() self._process_server_response(resp) time.sleep(1) + self._stopped = True def stop(self): self._stop = True + while not self._stopped: + try: + time.sleep(0.2) + except KeyboardInterrupt: + pass From fedora-extras-commits at redhat.com Thu May 11 16:07:42 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 May 2006 09:07:42 -0700 Subject: extras-buildsys/utils extras-repobuild.py,1.16,1.17 Message-ID: <200605111607.k4BG7gxf024498@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24480 Modified Files: extras-repobuild.py Log Message: put *debuginfo* glob in quotes Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- extras-repobuild.py 11 May 2006 10:54:11 -0000 1.16 +++ extras-repobuild.py 11 May 2006 16:07:40 -0000 1.17 @@ -71,9 +71,9 @@ print 'Creating repository metadata' if os.path.exists(compspath): - cmd = '/usr/bin/createrepo -c %s -q -g %s -x *debuginfo* %s' % (cachedir, compsname, repodir) + cmd = '/usr/bin/createrepo -c %s -q -g %s -x \'*debuginfo*\' %s' % (cachedir, compsname, repodir) else: - cmd = '/usr/bin/createrepo -c %s -q -x *debuginfo* %s' % (cachedir, repodir) + cmd = '/usr/bin/createrepo -c %s -q -x \'*debuginfo*\' %s' % (cachedir, repodir) run_and_check(cmd) From fedora-extras-commits at redhat.com Thu May 11 16:17:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 09:17:03 -0700 Subject: rpms/perl-Config-Tiny/FC-4 .cvsignore, 1.7, 1.8 perl-Config-Tiny.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200605111617.k4BGH5dG024705@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24666/FC-4 Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Update to 2.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Apr 2006 21:07:33 -0000 1.7 +++ .cvsignore 11 May 2006 16:17:03 -0000 1.8 @@ -1 +1 @@ -Config-Tiny-2.06.tar.gz +Config-Tiny-2.07.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/perl-Config-Tiny.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Config-Tiny.spec 22 Apr 2006 21:07:33 -0000 1.11 +++ perl-Config-Tiny.spec 11 May 2006 16:17:03 -0000 1.12 @@ -1,5 +1,5 @@ Name: perl-Config-Tiny -Version: 2.06 +Version: 2.07 Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files @@ -54,6 +54,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 2.07-1 +- Updated to 2.07. + * Sat Apr 22 2006 Jose Pedro Oliveira - 2.06-1 - Updated to 2.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Apr 2006 21:07:33 -0000 1.7 +++ sources 11 May 2006 16:17:03 -0000 1.8 @@ -1 +1 @@ -40b5ce184ee6307b5a9ce1f588f824d6 Config-Tiny-2.06.tar.gz +19cb3091a01baed531ac2dc7d7eee629 Config-Tiny-2.07.tar.gz From fedora-extras-commits at redhat.com Thu May 11 16:17:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 09:17:04 -0700 Subject: rpms/perl-Config-Tiny/FC-5 .cvsignore, 1.8, 1.9 perl-Config-Tiny.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200605111617.k4BGH69u024711@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24666/FC-5 Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Update to 2.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Apr 2006 21:07:34 -0000 1.8 +++ .cvsignore 11 May 2006 16:17:03 -0000 1.9 @@ -1 +1 @@ -Config-Tiny-2.06.tar.gz +Config-Tiny-2.07.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/perl-Config-Tiny.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Config-Tiny.spec 22 Apr 2006 21:07:34 -0000 1.13 +++ perl-Config-Tiny.spec 11 May 2006 16:17:03 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-Config-Tiny -Version: 2.06 +Version: 2.07 Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files @@ -54,6 +54,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 2.07-1 +- Updated to 2.07. + * Sat Apr 22 2006 Jose Pedro Oliveira - 2.06-1 - Updated to 2.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Apr 2006 21:07:34 -0000 1.8 +++ sources 11 May 2006 16:17:03 -0000 1.9 @@ -1 +1 @@ -40b5ce184ee6307b5a9ce1f588f824d6 Config-Tiny-2.06.tar.gz +19cb3091a01baed531ac2dc7d7eee629 Config-Tiny-2.07.tar.gz From fedora-extras-commits at redhat.com Thu May 11 16:19:26 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 09:19:26 -0700 Subject: rpms/perl-PPI/FC-5 .cvsignore, 1.2, 1.3 perl-PPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605111619.k4BGJSjl024828@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24807 Modified Files: .cvsignore perl-PPI.spec sources Log Message: Update to 1.113. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 May 2006 12:38:07 -0000 1.2 +++ .cvsignore 11 May 2006 16:19:26 -0000 1.3 @@ -1 +1 @@ -PPI-1.112.tar.gz +PPI-1.113.tar.gz Index: perl-PPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/FC-5/perl-PPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-PPI.spec 2 May 2006 12:38:07 -0000 1.1 +++ perl-PPI.spec 11 May 2006 16:19:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-PPI -Version: 1.112 +Version: 1.113 Release: 1%{?dist} Summary: Parse, Analyze and Manipulate Perl @@ -61,6 +61,9 @@ %changelog +* Wed May 10 2006 Jose Pedro Oliveira - 1.113-1 +- Update to 1.113. + * Tue Apr 25 2006 Jose Pedro Oliveira - 1.112-1 - Update to 1.112. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PPI/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 May 2006 12:38:07 -0000 1.2 +++ sources 11 May 2006 16:19:26 -0000 1.3 @@ -1 +1 @@ -a629d953e0002813061c4308c64993f6 PPI-1.112.tar.gz +8e06ad1a96244618fbebdd346791067c PPI-1.113.tar.gz From fedora-extras-commits at redhat.com Thu May 11 16:20:50 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 09:20:50 -0700 Subject: owners owners.list,1.975,1.976 Message-ID: <200605111620.k4BGKrgd024890@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24873/owners Modified Files: owners.list Log Message: add childsplay Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.975 retrieving revision 1.976 diff -u -r1.975 -r1.976 --- owners.list 11 May 2006 14:09:22 -0000 1.975 +++ owners.list 11 May 2006 16:20:50 -0000 1.976 @@ -134,6 +134,7 @@ Fedora Extras|cgoban|X board for playing go|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|childsplay|Suite of educational games for young children|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 16:34:27 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 09:34:27 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo.spec,1.19,1.20 Message-ID: <200605111634.k4BGYTmU025014@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24981/FC-5 Modified Files: xemacs-sumo.spec Log Message: Yet another try at finding out the xemacs-nox version; the previous one worked fine locally and in mach and mock, but not in the buildsys. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xemacs-sumo.spec 10 May 2006 21:21:46 -0000 1.19 +++ xemacs-sumo.spec 11 May 2006 16:34:27 -0000 1.20 @@ -1,7 +1,7 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox | cut -d' ' -f 1) +%define xemver %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) From fedora-extras-commits at redhat.com Thu May 11 16:34:28 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 May 2006 09:34:28 -0700 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.19,1.20 Message-ID: <200605111634.k4BGYUDv025018@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24981/devel Modified Files: xemacs-sumo.spec Log Message: Yet another try at finding out the xemacs-nox version; the previous one worked fine locally and in mach and mock, but not in the buildsys. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xemacs-sumo.spec 10 May 2006 21:21:46 -0000 1.19 +++ xemacs-sumo.spec 11 May 2006 16:34:28 -0000 1.20 @@ -1,7 +1,7 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(rpm -q --qf=%%{VERSION} xemacs-nox | cut -d' ' -f 1) +%define xemver %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v) Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) From fedora-extras-commits at redhat.com Thu May 11 16:45:51 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 09:45:51 -0700 Subject: rpms/bzflag/devel .cvsignore, 1.4, 1.5 bzflag.spec, 1.21, 1.22 sources, 1.4, 1.5 Message-ID: <200605111645.k4BGjrwG025140@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25119 Modified Files: .cvsignore bzflag.spec sources Log Message: version 2.0.6 add disttag remove upstreamed stringdos patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Nov 2005 11:03:11 -0000 1.4 +++ .cvsignore 11 May 2006 16:45:51 -0000 1.5 @@ -1 +1 @@ -bzflag-2.0.4.20050930.tar.bz2 +bzflag-2.0.6.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bzflag.spec 17 Feb 2006 15:08:48 -0000 1.21 +++ bzflag.spec 11 May 2006 16:45:51 -0000 1.22 @@ -2,19 +2,18 @@ %define _modular_X 0%{!?_without_modular_x:1} %define desktop_vendor fedora -%define date 20050930 +#define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.4 -Release: 3 +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://bzflag.org -Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 +Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch1: bzflag-2.0.4-stringdos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %_modular_X BuildRequires: libXi-devel @@ -49,7 +48,6 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch1 -p1 -b .stringdos %build # Use PIE because bzflag/bzfs are networked server applications @@ -94,6 +92,11 @@ %{_mandir}/man*/* %changelog +* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +- version 2.0.6 +- add disttag +- remove upstreamed stringdos patch + * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Nov 2005 11:03:11 -0000 1.4 +++ sources 11 May 2006 16:45:51 -0000 1.5 @@ -1 +1 @@ -b91444c788996902b799f9b64efddd8f bzflag-2.0.4.20050930.tar.bz2 +5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 From fedora-extras-commits at redhat.com Thu May 11 16:47:15 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 09:47:15 -0700 Subject: rpms/bzflag/devel bzflag-2.0.4-stringdos.patch,1.1,NONE Message-ID: <200605111647.k4BGlH6g025208@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25192 Removed Files: bzflag-2.0.4-stringdos.patch Log Message: version 2.0.6 add disttag remove upstreamed stringdos patch --- bzflag-2.0.4-stringdos.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 11 16:49:01 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 May 2006 09:49:01 -0700 Subject: extras-buildsys/utils extras-push-new,1.8,1.9 Message-ID: <200605111649.k4BGn1EJ025320@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25302 Modified Files: extras-push-new Log Message: syncing twice is nice in theory, but since extras-repobuild.py kills repoview data, it is not so good unless we improve extras-repobuild.py to backup/reinstall repoview data Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- extras-push-new 11 May 2006 10:54:11 -0000 1.8 +++ extras-push-new 11 May 2006 16:48:59 -0000 1.9 @@ -53,7 +53,7 @@ 'setumask' : True, 'signkeycheck' : True, 'mail' : True, - 'doublesync' : True, + 'doublesync' : False, 'force' : False } From fedora-extras-commits at redhat.com Thu May 11 16:54:47 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 09:54:47 -0700 Subject: rpms/bzflag/FC-5 .cvsignore, 1.4, 1.5 bzflag.spec, 1.21, 1.22 sources, 1.4, 1.5 bzflag-2.0.4-stringdos.patch, 1.1, NONE Message-ID: <200605111654.k4BGsnC5025433@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25412 Modified Files: .cvsignore bzflag.spec sources Removed Files: bzflag-2.0.4-stringdos.patch Log Message: version 2.0.6 add disttag remove upstreamed stringdos patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Nov 2005 11:03:11 -0000 1.4 +++ .cvsignore 11 May 2006 16:54:47 -0000 1.5 @@ -1 +1 @@ -bzflag-2.0.4.20050930.tar.bz2 +bzflag-2.0.6.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bzflag.spec 17 Feb 2006 15:08:48 -0000 1.21 +++ bzflag.spec 11 May 2006 16:54:47 -0000 1.22 @@ -2,19 +2,18 @@ %define _modular_X 0%{!?_without_modular_x:1} %define desktop_vendor fedora -%define date 20050930 +#define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.4 -Release: 3 +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://bzflag.org -Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 +Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch1: bzflag-2.0.4-stringdos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %_modular_X BuildRequires: libXi-devel @@ -49,7 +48,6 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch1 -p1 -b .stringdos %build # Use PIE because bzflag/bzfs are networked server applications @@ -94,6 +92,11 @@ %{_mandir}/man*/* %changelog +* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +- version 2.0.6 +- add disttag +- remove upstreamed stringdos patch + * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Nov 2005 11:03:11 -0000 1.4 +++ sources 11 May 2006 16:54:47 -0000 1.5 @@ -1 +1 @@ -b91444c788996902b799f9b64efddd8f bzflag-2.0.4.20050930.tar.bz2 +5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 --- bzflag-2.0.4-stringdos.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 11 16:57:04 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 09:57:04 -0700 Subject: rpms/bzflag/FC-4 .cvsignore, 1.4, 1.5 bzflag.spec, 1.18, 1.19 sources, 1.4, 1.5 bzflag-2.0.4-stringdos.patch, 1.1, NONE Message-ID: <200605111657.k4BGv6tr025504@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25483 Modified Files: .cvsignore bzflag.spec sources Removed Files: bzflag-2.0.4-stringdos.patch Log Message: version 2.0.6 add disttag remove upstreamed stringdos patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Nov 2005 11:59:40 -0000 1.4 +++ .cvsignore 11 May 2006 16:57:04 -0000 1.5 @@ -1 +1 @@ -bzflag-2.0.4.20050930.tar.bz2 +bzflag-2.0.6.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bzflag.spec 28 Dec 2005 12:28:39 -0000 1.18 +++ bzflag.spec 11 May 2006 16:57:04 -0000 1.19 @@ -1,20 +1,19 @@ -# Use --with modular_x to rebuild with modular X deps -%define _modular_X 0%{?_with_modular_x:1} +# Use --without modular_X to rebuild without modular X deps +%define _modular_X 0%{!?_without_modular_x:1} %define desktop_vendor fedora -%define date 20050930 +#define date 20050930 Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.4 -Release: 0.fc4.3 +Version: 2.0.6 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://bzflag.org -Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 +Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch1: bzflag-2.0.4-stringdos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %_modular_X BuildRequires: libXi-devel @@ -48,7 +47,7 @@ %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} -%patch0 -p1 -b .stringdos +%patch0 -p1 -b .lookup %build # Use PIE because bzflag/bzfs are networked server applications @@ -93,15 +92,17 @@ %{_mandir}/man*/* %changelog -* Wed Dec 28 2005 Nils Philippsen 2.0.4-0.fc4.3 -- don't crash on maliciously formed callsign, etc. strings (#176626, patch - backported from upstream CVS) +* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +- version 2.0.6 +- add disttag +- remove upstreamed stringdos patch -* Tue Nov 29 2005 Nils Philippsen 2.0.4-0.fc4.2 -- bump release to make build system build +* Fri Feb 17 2006 Nils Philippsen 2.0.4-3 +- rebuild -* Tue Nov 29 2005 Nils Philippsen 2.0.4-0.fc4.1 -- rebuild for FC4 +* Wed Dec 28 2005 Nils Philippsen 2.0.4-2 +- don't crash on maliciously formed callsign, etc. strings (#176626, patch + backported from upstream CVS) * Mon Nov 21 2005 Nils Philippsen 2.0.4-1 - version 2.0.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Nov 2005 11:59:40 -0000 1.4 +++ sources 11 May 2006 16:57:04 -0000 1.5 @@ -1 +1 @@ -b91444c788996902b799f9b64efddd8f bzflag-2.0.4.20050930.tar.bz2 +5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 --- bzflag-2.0.4-stringdos.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 11 17:33:59 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 10:33:59 -0700 Subject: rpms/bzflag/devel bzflag.spec,1.22,1.23 Message-ID: <200605111734.k4BHY1Z9027906@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27889 Modified Files: bzflag.spec Log Message: adapt %files Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- bzflag.spec 11 May 2006 16:45:51 -0000 1.22 +++ bzflag.spec 11 May 2006 17:33:59 -0000 1.23 @@ -81,11 +81,6 @@ %{_bindir}/bzadmin %{_bindir}/bzflag %{_bindir}/bzfs -%exclude %{_includedir}/bzflag/ -%dir %{_libdir}/bzflag/ -%exclude %{_libdir}/bzflag/*.a -%exclude %{_libdir}/bzflag/*.la -%{_libdir}/bzflag/*.so %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %{_datadir}/bzflag %{_datadir}/pixmaps/bzflag.xpm @@ -96,6 +91,7 @@ - version 2.0.6 - add disttag - remove upstreamed stringdos patch +- adapt %%files * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild From fedora-extras-commits at redhat.com Thu May 11 17:35:27 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 10:35:27 -0700 Subject: rpms/bzflag/FC-5 bzflag.spec,1.22,1.23 Message-ID: <200605111735.k4BHZTdW027965@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27948 Modified Files: bzflag.spec Log Message: adapt %files Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- bzflag.spec 11 May 2006 16:54:47 -0000 1.22 +++ bzflag.spec 11 May 2006 17:35:27 -0000 1.23 @@ -81,11 +81,6 @@ %{_bindir}/bzadmin %{_bindir}/bzflag %{_bindir}/bzfs -%exclude %{_includedir}/bzflag/ -%dir %{_libdir}/bzflag/ -%exclude %{_libdir}/bzflag/*.a -%exclude %{_libdir}/bzflag/*.la -%{_libdir}/bzflag/*.so %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %{_datadir}/bzflag %{_datadir}/pixmaps/bzflag.xpm @@ -96,6 +91,7 @@ - version 2.0.6 - add disttag - remove upstreamed stringdos patch +- adapt %%files * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild From fedora-extras-commits at redhat.com Thu May 11 17:36:24 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Thu, 11 May 2006 10:36:24 -0700 Subject: rpms/bzflag/FC-4 bzflag.spec,1.19,1.20 Message-ID: <200605111736.k4BHaQaK028022@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28005 Modified Files: bzflag.spec Log Message: adapt %files Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bzflag.spec 11 May 2006 16:57:04 -0000 1.19 +++ bzflag.spec 11 May 2006 17:36:24 -0000 1.20 @@ -81,11 +81,6 @@ %{_bindir}/bzadmin %{_bindir}/bzflag %{_bindir}/bzfs -%exclude %{_includedir}/bzflag/ -%dir %{_libdir}/bzflag/ -%exclude %{_libdir}/bzflag/*.a -%exclude %{_libdir}/bzflag/*.la -%{_libdir}/bzflag/*.so %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop %{_datadir}/bzflag %{_datadir}/pixmaps/bzflag.xpm @@ -96,6 +91,7 @@ - version 2.0.6 - add disttag - remove upstreamed stringdos patch +- adapt %%files * Fri Feb 17 2006 Nils Philippsen 2.0.4-3 - rebuild From fedora-extras-commits at redhat.com Thu May 11 18:06:28 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:06:28 -0700 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.17, 1.18 abcm2ps.spec, 1.18, 1.19 sources, 1.17, 1.18 Message-ID: <200605111807.k4BI700x030454@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30379/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Apr 2006 08:09:02 -0000 1.17 +++ .cvsignore 11 May 2006 18:06:28 -0000 1.18 @@ -1,2 +1,2 @@ -abcm2ps-4.12.15.tar.gz +abcm2ps-4.12.17.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- abcm2ps.spec 28 Apr 2006 08:09:02 -0000 1.18 +++ abcm2ps.spec 11 May 2006 18:06:28 -0000 1.19 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.15 +Version: 4.12.17 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.12.15.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.17.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 4.12.17-1 +- new version 4.12.17 + * Fri Apr 28 2006 Gerard Milmeister - 4.12.15-1 - new version 4.12.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Apr 2006 08:09:02 -0000 1.17 +++ sources 11 May 2006 18:06:28 -0000 1.18 @@ -1,2 +1,2 @@ -ebea415b7d1b82d054227343e027f820 abcm2ps-4.12.15.tar.gz +99040c25175e4aae58a39f42d75ed79e abcm2ps-4.12.17.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu May 11 18:06:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:06:29 -0700 Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.17, 1.18 abcm2ps.spec, 1.19, 1.20 sources, 1.17, 1.18 Message-ID: <200605111807.k4BI71hv030459@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30379/FC-5 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Apr 2006 08:09:03 -0000 1.17 +++ .cvsignore 11 May 2006 18:06:29 -0000 1.18 @@ -1,2 +1,2 @@ -abcm2ps-4.12.15.tar.gz +abcm2ps-4.12.17.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/abcm2ps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- abcm2ps.spec 28 Apr 2006 08:09:03 -0000 1.19 +++ abcm2ps.spec 11 May 2006 18:06:29 -0000 1.20 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.15 +Version: 4.12.17 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.12.15.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.17.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 4.12.17-1 +- new version 4.12.17 + * Fri Apr 28 2006 Gerard Milmeister - 4.12.15-1 - new version 4.12.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Apr 2006 08:09:03 -0000 1.17 +++ sources 11 May 2006 18:06:29 -0000 1.18 @@ -1,2 +1,2 @@ -ebea415b7d1b82d054227343e027f820 abcm2ps-4.12.15.tar.gz +99040c25175e4aae58a39f42d75ed79e abcm2ps-4.12.17.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu May 11 18:06:28 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:06:28 -0700 Subject: rpms/abcm2ps/FC-3 abcm2ps.spec,1.12,1.13 Message-ID: <200605111807.k4BI70cj030449@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30379/FC-3 Modified Files: abcm2ps.spec Log Message: new version 4.12.17 Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- abcm2ps.spec 13 Feb 2006 11:37:35 -0000 1.12 +++ abcm2ps.spec 11 May 2006 18:06:28 -0000 1.13 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.8 +Version: 4.12.17 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.12.8.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.17.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 4.12.17-1 +- new version 4.12.17 + * Mon Feb 13 2006 Gerard Milmeister - 4.12.8-1 - new version 4.12.8 From fedora-extras-commits at redhat.com Thu May 11 18:06:30 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:06:30 -0700 Subject: rpms/abcm2ps/devel .cvsignore, 1.17, 1.18 abcm2ps.spec, 1.19, 1.20 sources, 1.17, 1.18 Message-ID: <200605111807.k4BI72Wo030464@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30379/devel Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Apr 2006 08:07:24 -0000 1.17 +++ .cvsignore 11 May 2006 18:06:30 -0000 1.18 @@ -1,2 +1,2 @@ -abcm2ps-4.12.15.tar.gz +abcm2ps-4.12.17.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- abcm2ps.spec 28 Apr 2006 08:07:24 -0000 1.19 +++ abcm2ps.spec 11 May 2006 18:06:30 -0000 1.20 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.15 +Version: 4.12.17 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript Group: Applications/Multimedia License: GPL URL: http://moinejf.free.fr -Source0: http://moinejf.free.fr/abcm2ps-4.12.15.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.17.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +52,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 4.12.17-1 +- new version 4.12.17 + * Fri Apr 28 2006 Gerard Milmeister - 4.12.15-1 - new version 4.12.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 28 Apr 2006 08:07:24 -0000 1.17 +++ sources 11 May 2006 18:06:30 -0000 1.18 @@ -1,2 +1,2 @@ -ebea415b7d1b82d054227343e027f820 abcm2ps-4.12.15.tar.gz +99040c25175e4aae58a39f42d75ed79e abcm2ps-4.12.17.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu May 11 18:13:22 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 11:13:22 -0700 Subject: rpms/abcm2ps/FC-3 .cvsignore,1.12,1.13 sources,1.12,1.13 Message-ID: <200605111813.k4BIDOCs030654@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30635/FC-3 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 11:37:35 -0000 1.12 +++ .cvsignore 11 May 2006 18:13:22 -0000 1.13 @@ -1,2 +1,2 @@ -abcm2ps-4.12.8.tar.gz +abcm2ps-4.12.17.tar.gz abcplus_en-1.0.4.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 11:37:35 -0000 1.12 +++ sources 11 May 2006 18:13:22 -0000 1.13 @@ -1,2 +1,2 @@ -119acfaf7c93ea0a83a69d4c6ae5c9ac abcm2ps-4.12.8.tar.gz +99040c25175e4aae58a39f42d75ed79e abcm2ps-4.12.17.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu May 11 18:17:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:17:44 -0700 Subject: rpms/childsplay_plugins - New directory Message-ID: <200605111817.k4BIHkX6030734@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30707/childsplay_plugins Log Message: Directory /cvs/extras/rpms/childsplay_plugins added to the repository From fedora-extras-commits at redhat.com Thu May 11 18:17:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:17:44 -0700 Subject: rpms/childsplay_plugins/devel - New directory Message-ID: <200605111817.k4BIHk2U030737@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30707/childsplay_plugins/devel Log Message: Directory /cvs/extras/rpms/childsplay_plugins/devel added to the repository From fedora-extras-commits at redhat.com Thu May 11 18:17:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:17:57 -0700 Subject: rpms/childsplay_plugins Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605111817.k4BIHxS1030782@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754 Added Files: Makefile import.log Log Message: Setup of module childsplay_plugins --- NEW FILE Makefile --- # Top level Makefile for module childsplay_plugins all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu May 11 18:17:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:17:58 -0700 Subject: rpms/childsplay_plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605111818.k4BII0tQ030785@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module childsplay_plugins --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu May 11 18:18:46 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:18:46 -0700 Subject: rpms/childsplay_plugins import.log,1.1,1.2 Message-ID: <200605111818.k4BIImJm030859@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825 Modified Files: import.log Log Message: auto-import childsplay_plugins-0.80.7-3 on branch devel from childsplay_plugins-0.80.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 May 2006 18:17:57 -0000 1.1 +++ import.log 11 May 2006 18:18:46 -0000 1.2 @@ -0,0 +1 @@ +childsplay_plugins-0_80_7-3:HEAD:childsplay_plugins-0.80.7-3.src.rpm:1147371540 From fedora-extras-commits at redhat.com Thu May 11 18:18:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:18:47 -0700 Subject: rpms/childsplay_plugins/devel childsplay_plugins-0.80.7-alphabet-sounds.patch, NONE, 1.1 childsplay_plugins.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605111818.k4BIInZK030866@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30825/devel Modified Files: .cvsignore sources Added Files: childsplay_plugins-0.80.7-alphabet-sounds.patch childsplay_plugins.spec Log Message: auto-import childsplay_plugins-0.80.7-3 on branch devel from childsplay_plugins-0.80.7-3.src.rpm childsplay_plugins-0.80.7-alphabet-sounds.patch: --- NEW FILE childsplay_plugins-0.80.7-alphabet-sounds.patch --- --- childsplay_plugins-0.80.7/lib/findsound2.py.alphabet 2006-04-09 11:12:39.000000000 +0200 +++ childsplay_plugins-0.80.7/lib/findsound2.py 2006-05-05 20:16:56.000000000 +0200 @@ -97,10 +97,10 @@ def _setup(self): """ Set all the stuff we need""" #self.sounddir = os.path.join(self.libdir,'Findsound2Data',get_locale()[:2]) - if _FSDEBUG: print "Looking for ",os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language) - self.sounddir = os.path.join(DATADIR,'AlphabetSounds',ChildsplayGoodies.language) + if _FSDEBUG: print "Looking for ", os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet') + self.sounddir = os.path.join('/usr/share/gcompris/boards/sounds',ChildsplayGoodies.language,'alphabet') if not os.path.exists(self.sounddir): - self.sounddir = os.path.join(DATADIR,'AlphabetSounds','en') + self.sounddir = '/usr/share/gcompris/boards/sounds/en/alphabet' img = load_image(os.path.join\ (self.libdir,'Findsound2Data','Data','soundbut.png'),1) @@ -127,7 +127,10 @@ else: fsize = 88 img = char2surf(c,fsize,(255,0,0)) - snd = os.path.join(snddir,c.lower()+'.ogg') + if c == '10': + snd = os.path.join(snddir, c.lower()+'.ogg') + else: + snd = os.path.join(snddir, 'U%04X.ogg'%ord(c.lower())) if _FSDEBUG: print "char,snd",c.lower(),snd objects.append(ImageObject(img,snd)) if _FSDEBUG: print "objects",objects --- childsplay_plugins-0.80.7/lib/packid.py.alphabet 2006-04-09 11:12:39.000000000 +0200 +++ childsplay_plugins-0.80.7/lib/packid.py 2006-05-05 20:15:26.000000000 +0200 @@ -473,7 +473,7 @@ # Look for alphabet sounds for this locale. # If all fails we fall back to the "old" wahoo sound. - alphabetdir = os.path.join(DATADIR,'AlphabetSounds',wordsloc) + alphabetdir = os.path.join('/usr/share/gcompris/boards/sounds',wordsloc,'alphabet') if not os.path.exists(alphabetdir): print >> sys.stderr, "Can't find",alphabetdir alphabetdir = None @@ -741,7 +741,7 @@ pygame.display.update(self.screen.blit(Img.pac_smile,self.packid.rect)) if self.alphabetdir: try: - char = obj.char.lower()+'.ogg' + char = 'U%04X.ogg' % ord(obj.char.lower()) pygame.time.wait(500) load_music(os.path.join(self.alphabetdir,char)).play() except Exception,info: --- NEW FILE childsplay_plugins.spec --- Name: childsplay_plugins Version: 0.80.7 Release: 3%{?dist} Summary: Plugins for childsplay (educational games for young children) Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ Source: http://download.sourceforge.net/childsplay/%{name}-%{version}.tgz Patch0: childsplay_plugins-0.80.7-alphabet-sounds.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: childsplay >= 0.81.4 %description Plugins (games) for Childsplay a suite of educational games for young children. The aim is to be educational and at the same time be fun to play. %prep %setup -q # no backups otherwise the backups endup in the rpm. %patch0 -p1 # the translation is merged into the assetml file, so don't ship it seperatly rm -r assetml/childsplay/sounds-misc/po %build # Only python code, no so nothing to build. %install rm -rf $RPM_BUILD_ROOT # INSTALL.sh is seriously borked, so DIY mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins mkdir -p $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml cp -a Data/*.icon.png $RPM_BUILD_ROOT%{_datadir}/childsplay/Data/icons cp -a lib/* $RPM_BUILD_ROOT%{_datadir}/childsplay/plugins cp -a assetml/childsplay/* $RPM_BUILD_ROOT%{_datadir}/childsplay mv $RPM_BUILD_ROOT%{_datadir}/childsplay/*/*.assetml \ $RPM_BUILD_ROOT%{_datadir}/assetml %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, -) %doc README* %dir %{_datadir}/childsplay %dir %{_datadir}/childsplay/plugins %{_datadir}/childsplay/plugins/*.py %{_datadir}/childsplay/plugins/*.pyc %ghost %{_datadir}/childsplay/plugins/*.pyo %{_datadir}/childsplay/plugins/*Data %{_datadir}/childsplay/plugins/SoundMemory %{_datadir}/childsplay/Data %{_datadir}/childsplay/sounds-misc %{_datadir}/assetml/* %changelog * Thu May 11 2006 Hans de Goede 0.80.7-3 - Own /usr/share/childsplay and subdirs to guarantee correct uninstall (bz 190878). - Fix Source0 to point to the main sourceforge download instead of to the mirror selection page. * Wed May 10 2006 Hans de Goede 0.80.7-2 - Ghost .pyo files - Don't create backups for the alphabet patch, the backups end up getting installed * Fri May 5 2006 Hans de Goede 0.80.7-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 May 2006 18:17:58 -0000 1.1 +++ .cvsignore 11 May 2006 18:18:46 -0000 1.2 @@ -0,0 +1 @@ +childsplay_plugins-0.80.7.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 May 2006 18:17:58 -0000 1.1 +++ sources 11 May 2006 18:18:46 -0000 1.2 @@ -0,0 +1 @@ +d3ea05d2a1fb373d9c4836845b199a76 childsplay_plugins-0.80.7.tgz From fedora-extras-commits at redhat.com Thu May 11 18:24:53 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:24:53 -0700 Subject: owners owners.list,1.976,1.977 Message-ID: <200605111824.k4BIOt6h031013@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30996/owners Modified Files: owners.list Log Message: add childsplay_plugins Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.976 retrieving revision 1.977 diff -u -r1.976 -r1.977 --- owners.list 11 May 2006 16:20:50 -0000 1.976 +++ owners.list 11 May 2006 18:24:53 -0000 1.977 @@ -135,6 +135,7 @@ Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|childsplay|Suite of educational games for young children|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|childsplay_plugins|Plugins for childsplay (educational games for young children)|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 18:29:59 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 11:29:59 -0700 Subject: comps comps-fe6.xml.in,1.11,1.12 Message-ID: <200605111830.k4BIU1TF031205@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31185/comps Modified Files: comps-fe6.xml.in Log Message: add childsplay_plugins Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- comps-fe6.xml.in 9 May 2006 22:15:42 -0000 1.11 +++ comps-fe6.xml.in 11 May 2006 18:29:59 -0000 1.12 @@ -206,6 +206,7 @@ bzflag celestia cgoban + childsplay crystal-stacker crystal-stacker-themes csmash From fedora-extras-commits at redhat.com Thu May 11 19:15:36 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 12:15:36 -0700 Subject: rpms/perl-Net-SSLeay/FC-3 perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch, NONE, 1.1 perl-Net-SSLeay.spec, 1.1, 1.2 Message-ID: <200605111915.k4BJFcKC003761@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726/FC-3 Modified Files: perl-Net-SSLeay.spec Added Files: perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch Log Message: CVE-2005-0106 (#191351) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch: --- NEW FILE perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch --- --- Net_SSLeay.pm-1.25/SSLeay.pm.cve-2005-0106 2006-01-25 12:37:11.540102265 -0700 +++ Net_SSLeay.pm-1.25/SSLeay.pm 2006-01-25 12:38:16.994260984 -0700 @@ -1853,8 +1853,8 @@ my ($rn_seed_file, $seed, $egd_path) = @_; my $rnsf = defined($rn_seed_file) && -r $rn_seed_file; + $egd_path = ''; $egd_path = $ENV{'EGD_PATH'} if $ENV{'EGD_PATH'}; - $egd_path = '/tmp/entropy' unless $egd_path; RAND_seed(rand() + $$); # Stir it with time and pid @@ -1865,7 +1865,7 @@ RAND_load_file($rn_seed_file, -s _) if $rnsf; RAND_seed($seed) if $seed; RAND_seed($ENV{RND_SEED}) if $ENV{RND_SEED}; - RAND_egd($egd_path) if -S $egd_path; + RAND_egd($egd_path) if -e $egd_path && -S $egd_path; RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8) if -r $Net::SSLeay::random_device; } Index: perl-Net-SSLeay.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-3/perl-Net-SSLeay.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-SSLeay.spec 20 Dec 2004 17:25:07 -0000 1.1 +++ perl-Net-SSLeay.spec 11 May 2006 19:15:36 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-Net-SSLeay Version: 1.26 -Release: 1 +Release: 2%{?dist} Epoch: 0 Summary: Perl extension for using OpenSSL @@ -11,10 +11,12 @@ URL: http://search.cpan.org/dist/Net_SSLeay.pm/ Source0: http://www.fas.harvard.edu/~behrooz/Net_SSLeay.pm-1.26.tar.gz Patch0: %{name}-test14.patch +Patch1: perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1, openssl-devel -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1 +BuildRequires: openssl-devel +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl-Net_SSLeay = %{epoch}:%{version}-%{release} %description @@ -28,8 +30,10 @@ %prep %setup -q -n Net_SSLeay.pm-%{version} %patch0 -p0 +%patch1 -p1 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle -chmod 644 examples/* +chmod -c 644 examples/* +%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl iconv -f iso-8859-1 -t utf-8 SSLeay.pm > SSLeay.pm.utf8 mv SSLeay.pm.utf8 SSLeay.pm @@ -59,13 +63,16 @@ %files %defattr(-,root,root,-) -%doc Changes* Credits QuickRef README examples -%{perl_vendorarch}/auto/Net -%{perl_vendorarch}/Net +%doc Changes* Credits QuickRef README examples/ +%{perl_vendorarch}/auto/Net/ +%{perl_vendorarch}/Net/ %{_mandir}/man3/Net::SSLeay*.3* %changelog +* Thu May 11 2006 Jose Pedro Oliveira - 0:1.26-2 +- CVE-2005-0106 (#191351). + * Mon Dec 20 2004 Ville Skytt?? - 0:1.26-1 - Drop fedora.us release prefix and suffix. From fedora-extras-commits at redhat.com Thu May 11 19:15:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 11 May 2006 12:15:37 -0700 Subject: rpms/perl-Net-SSLeay/FC-4 perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch, NONE, 1.1 perl-Net-SSLeay.spec, 1.4, 1.5 Message-ID: <200605111915.k4BJFdmx003767@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726/FC-4 Modified Files: perl-Net-SSLeay.spec Added Files: perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch Log Message: CVE-2005-0106 (#191351) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch: --- NEW FILE perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch --- --- Net_SSLeay.pm-1.25/SSLeay.pm.cve-2005-0106 2006-01-25 12:37:11.540102265 -0700 +++ Net_SSLeay.pm-1.25/SSLeay.pm 2006-01-25 12:38:16.994260984 -0700 @@ -1853,8 +1853,8 @@ my ($rn_seed_file, $seed, $egd_path) = @_; my $rnsf = defined($rn_seed_file) && -r $rn_seed_file; + $egd_path = ''; $egd_path = $ENV{'EGD_PATH'} if $ENV{'EGD_PATH'}; - $egd_path = '/tmp/entropy' unless $egd_path; RAND_seed(rand() + $$); # Stir it with time and pid @@ -1865,7 +1865,7 @@ RAND_load_file($rn_seed_file, -s _) if $rnsf; RAND_seed($seed) if $seed; RAND_seed($ENV{RND_SEED}) if $ENV{RND_SEED}; - RAND_egd($egd_path) if -S $egd_path; + RAND_egd($egd_path) if -e $egd_path && -S $egd_path; RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8) if -r $Net::SSLeay::random_device; } Index: perl-Net-SSLeay.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-4/perl-Net-SSLeay.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Net-SSLeay.spec 6 Apr 2005 22:13:07 -0000 1.4 +++ perl-Net-SSLeay.spec 11 May 2006 19:15:36 -0000 1.5 @@ -1,9 +1,11 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} +# +# Rebuild switch: +# --with testsuite enable test suite +# Name: perl-Net-SSLeay Version: 1.26 -Release: 2 - +Release: 3%{?dist} Summary: Perl extension for using OpenSSL Group: Development/Libraries @@ -11,10 +13,12 @@ URL: http://search.cpan.org/dist/Net_SSLeay.pm/ Source0: http://www.fas.harvard.edu/~behrooz/Net_SSLeay.pm-1.26.tar.gz Patch0: %{name}-test14.patch +Patch1: perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1, openssl-devel -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1 +BuildRequires: openssl-devel +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl-Net_SSLeay = %{version}-%{release} %description @@ -28,29 +32,32 @@ %prep %setup -q -n Net_SSLeay.pm-%{version} %patch0 -p0 +%patch1 -p1 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle -chmod 644 examples/* +chmod -c 644 examples/* +%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl iconv -f iso-8859-1 -t utf-8 SSLeay.pm > SSLeay.pm.utf8 mv SSLeay.pm.utf8 SSLeay.pm %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" +%{__perl} Makefile.PL -- INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -a \( -name .packlist -o -name ptrtstrun.pl \ - -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' -a -size 0 -exec rm -f {} ';' +rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Net/ptrtstrun.pl find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -%check || : -# make test # spawns servers, contacts external sites... +%check +# spawns servers, contacts external sites... +%{?_with_testsuite:make test} %clean @@ -59,14 +66,17 @@ %files %defattr(-,root,root,-) -%doc Changes* Credits QuickRef README examples -%{perl_vendorarch}/auto/Net -%{perl_vendorarch}/Net +%doc Changes* Credits QuickRef README examples/ +%{perl_vendorarch}/auto/Net/ +%{perl_vendorarch}/Net/ %{_mandir}/man3/Net::SSLeay*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu May 11 2006 Jose Pedro Oliveira - 1.26-3 +- CVE-2005-0106 (#191351). + +* Fri Apr 7 2005 Michael Schwendt - 1.26-2 - rebuilt * Mon Dec 20 2004 Ville Skytt?? - 0:1.26-1 From fedora-extras-commits at redhat.com Thu May 11 19:15:42 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:15:42 -0700 Subject: rpms/gpa/devel gpa-0.7.3-dt.patch, 1.1, 1.2 gpa.spec, 1.8, 1.9 gpa-keyservers.patch, 1.1, NONE gpa.desktop, 1.2, NONE Message-ID: <200605111915.k4BJFibL003793@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3771 Modified Files: gpa-0.7.3-dt.patch gpa.spec Removed Files: gpa-keyservers.patch gpa.desktop Log Message: * Thu May 11 2006 Rex Dieter 0.7.3-2 - cleanup .dt patch - update URL:, Source: tags gpa-0.7.3-dt.patch: Index: gpa-0.7.3-dt.patch =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/gpa-0.7.3-dt.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpa-0.7.3-dt.patch 22 Mar 2006 16:10:20 -0000 1.1 +++ gpa-0.7.3-dt.patch 11 May 2006 19:15:41 -0000 1.2 @@ -1,8 +1,11 @@ --- gpa-0.7.3/gpa.desktop.dt 2005-10-06 10:17:35.000000000 -0500 -+++ gpa-0.7.3/gpa.desktop 2006-03-22 10:03:33.000000000 -0600 -@@ -2,7 +2,7 @@ - Name=GNU Privacy Assistant - Name[en_US.ISO8859-1]=GNU Privacy Assistant ++++ gpa-0.7.3/gpa.desktop 2006-05-11 14:07:53.000000000 -0500 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=GNU Privacy Assistant +-Name[en_US.ISO8859-1]=GNU Privacy Assistant ++Name=GPA ++Comment=GNU Privacy Assistant Exec=gpa -Icon=gpa.png +Icon=gpa Index: gpa.spec =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/gpa.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gpa.spec 22 Mar 2006 16:11:33 -0000 1.8 +++ gpa.spec 11 May 2006 19:15:42 -0000 1.9 @@ -2,12 +2,13 @@ Name: gpa Summary: Graphical user interface for GnuPG Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System -URL: http://www.gnupg.org/related_software/gpa/ +#URL: http://www.gnupg.org/related_software/gpa/ #Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz +URL: http://gpa.wald.intevation.org/ Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2 Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -15,11 +16,11 @@ Patch1: gpa-0.7.3-keyservers.patch Patch2: gpa-0.7.3-dt.patch -BuildRequires: gtk2-devel -BuildRequires: zlib-devel -BuildRequires: desktop-file-utils -BuildRequires: gpgme-devel -BuildRequires: gettext +BuildRequires: gtk2-devel +BuildRequires: zlib-devel +BuildRequires: desktop-file-utils +BuildRequires: gpgme-devel +BuildRequires: gettext %description GNU Privacy Assistant (GPA) is a graphical frontend for the GNU @@ -47,7 +48,7 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --vendor fedora --add-category X-Fedora \ + --vendor="fedora" --add-category="X-Fedora" \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop @@ -80,8 +81,12 @@ %changelog +* Thu May 11 2006 Rex Dieter 0.7.3-2 +- cleanup .dt patch +- update URL:, Source: tags + * Wed Mar 22 2006 Rex Dieter 0.7.3-1 -- 0.7.3 (development release) +- 0.7.3 * Mon Feb 27 2006 Rex Dieter 0.7.0-5 - follow fdo icon spec --- gpa-keyservers.patch DELETED --- --- gpa.desktop DELETED --- From fedora-extras-commits at redhat.com Thu May 11 19:21:11 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:21:11 -0700 Subject: rpms/gpa/FC-4 gpa-0.7.3-dt.patch, NONE, 1.1 gpa-0.7.3-keyservers.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gpa.spec, 1.7, 1.8 sources, 1.2, 1.3 gpa-keyservers.patch, 1.1, NONE gpa-keytable-init.patch, 1.1, NONE gpa.desktop, 1.2, NONE Message-ID: <200605111921.k4BJLDtu003996@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3969 Modified Files: .cvsignore gpa.spec sources Added Files: gpa-0.7.3-dt.patch gpa-0.7.3-keyservers.patch Removed Files: gpa-keyservers.patch gpa-keytable-init.patch gpa.desktop Log Message: * Thu May 11 2006 Rex Dieter 0.7.3-2 - cleanup .dt patch - update URL:, Source: tags gpa-0.7.3-dt.patch: --- NEW FILE gpa-0.7.3-dt.patch --- --- gpa-0.7.3/gpa.desktop.dt 2005-10-06 10:17:35.000000000 -0500 +++ gpa-0.7.3/gpa.desktop 2006-05-11 14:07:53.000000000 -0500 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=GNU Privacy Assistant -Name[en_US.ISO8859-1]=GNU Privacy Assistant +Name=GPA +Comment=GNU Privacy Assistant Exec=gpa -Icon=gpa.png +Icon=gpa Terminal=false Encoding=UTF-8 Type=Application gpa-0.7.3-keyservers.patch: --- NEW FILE gpa-0.7.3-keyservers.patch --- --- gpa-0.7.3/src/keyserver.c.pgp.mit.edu 2006-01-30 03:37:34.000000000 -0600 +++ gpa-0.7.3/src/keyserver.c 2006-03-22 09:54:31.000000000 -0600 @@ -179,6 +179,7 @@ add_server (&serverlist, "hkp://subkeys.pgp.net"); add_server (&serverlist, "ldap://keyserver.pgp.com"); + add_server (&serverlist, "hkp://pgp.mit.edu"); } return rc; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:28:52 -0000 1.2 +++ .cvsignore 11 May 2006 19:21:11 -0000 1.3 @@ -1 +1,2 @@ -gpa-0.7.0.tar.gz +gpa-0.7.3.tar.bz2 +gpa-0.7.3.tar.bz2.sig Index: gpa.spec =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-4/gpa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gpa.spec 27 Feb 2006 21:17:27 -0000 1.7 +++ gpa.spec 11 May 2006 19:21:11 -0000 1.8 @@ -1,24 +1,26 @@ -Name: gpa -Summary: Graphical user interface for GnuPG -Version: 0.7.0 -Release: 5%{?dist} - -License: GPL -Group: Applications/System -URL: http://www.gnupg.org/related_software/gpa/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-0.7.0.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source1: gpa.desktop -Patch0: gpa-keyservers.patch -Patch1: gpa-keytable-init.patch - -BuildRequires: gtk2-devel -BuildRequires: zlib-devel -BuildRequires: desktop-file-utils -BuildRequires: gpgme-devel -BuildRequires: gettext +Name: gpa +Summary: Graphical user interface for GnuPG +Version: 0.7.3 +Release: 2%{?dist} + +License: GPL +Group: Applications/System +#URL: http://www.gnupg.org/related_software/gpa/ +#Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz +URL: http://gpa.wald.intevation.org/ +Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2 +Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: gpa-0.7.3-keyservers.patch +Patch2: gpa-0.7.3-dt.patch + +BuildRequires: gtk2-devel +BuildRequires: zlib-devel +BuildRequires: desktop-file-utils +BuildRequires: gpgme-devel +BuildRequires: gettext %description GNU Privacy Assistant (GPA) is a graphical frontend for the GNU @@ -29,8 +31,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p1 +%patch1 -p1 -b .keyservers +%patch2 -p1 -b .dt %build @@ -44,12 +46,14 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE1} + --vendor="fedora" --add-category="X-Fedora" \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop -install -p -m644 -D gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +install -p -m644 -D gpa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gpa.png %find_lang %{name} @@ -77,6 +81,13 @@ %changelog +* Thu May 11 2006 Rex Dieter 0.7.3-2 +- cleanup .dt patch +- update URL:, Source: tags + +* Wed Mar 22 2006 Rex Dieter 0.7.3-1 +- 0.7.3 + * Mon Feb 27 2006 Rex Dieter 0.7.0-5 - follow fdo icon spec - drop superfluous BR: gnupg Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:28:52 -0000 1.2 +++ sources 11 May 2006 19:21:11 -0000 1.3 @@ -1 +1,2 @@ -44cb60cba64a48837588ed27f8db08b2 gpa-0.7.0.tar.gz +a3626266f9dda506445c7297c4172a65 gpa-0.7.3.tar.bz2 +68d7cafe71c21a386109878c206e4016 gpa-0.7.3.tar.bz2.sig --- gpa-keyservers.patch DELETED --- --- gpa-keytable-init.patch DELETED --- --- gpa.desktop DELETED --- From fedora-extras-commits at redhat.com Thu May 11 19:21:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:21:32 -0700 Subject: rpms/gpa/FC-5 gpa-0.7.3-dt.patch, NONE, 1.1 gpa-0.7.3-keyservers.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gpa.spec, 1.7, 1.8 sources, 1.2, 1.3 gpa-keyservers.patch, 1.1, NONE gpa-keytable-init.patch, 1.1, NONE gpa.desktop, 1.2, NONE Message-ID: <200605111921.k4BJLYpN004068@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4040 Modified Files: .cvsignore gpa.spec sources Added Files: gpa-0.7.3-dt.patch gpa-0.7.3-keyservers.patch Removed Files: gpa-keyservers.patch gpa-keytable-init.patch gpa.desktop Log Message: * Thu May 11 2006 Rex Dieter 0.7.3-2 - cleanup .dt patch - update URL:, Source: tags gpa-0.7.3-dt.patch: --- NEW FILE gpa-0.7.3-dt.patch --- --- gpa-0.7.3/gpa.desktop.dt 2005-10-06 10:17:35.000000000 -0500 +++ gpa-0.7.3/gpa.desktop 2006-05-11 14:07:53.000000000 -0500 @@ -1,8 +1,8 @@ [Desktop Entry] -Name=GNU Privacy Assistant -Name[en_US.ISO8859-1]=GNU Privacy Assistant +Name=GPA +Comment=GNU Privacy Assistant Exec=gpa -Icon=gpa.png +Icon=gpa Terminal=false Encoding=UTF-8 Type=Application gpa-0.7.3-keyservers.patch: --- NEW FILE gpa-0.7.3-keyservers.patch --- --- gpa-0.7.3/src/keyserver.c.pgp.mit.edu 2006-01-30 03:37:34.000000000 -0600 +++ gpa-0.7.3/src/keyserver.c 2006-03-22 09:54:31.000000000 -0600 @@ -179,6 +179,7 @@ add_server (&serverlist, "hkp://subkeys.pgp.net"); add_server (&serverlist, "ldap://keyserver.pgp.com"); + add_server (&serverlist, "hkp://pgp.mit.edu"); } return rc; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:28:52 -0000 1.2 +++ .cvsignore 11 May 2006 19:21:32 -0000 1.3 @@ -1 +1,2 @@ -gpa-0.7.0.tar.gz +gpa-0.7.3.tar.bz2 +gpa-0.7.3.tar.bz2.sig Index: gpa.spec =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-5/gpa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gpa.spec 27 Feb 2006 21:01:01 -0000 1.7 +++ gpa.spec 11 May 2006 19:21:32 -0000 1.8 @@ -1,24 +1,26 @@ -Name: gpa -Summary: Graphical user interface for GnuPG -Version: 0.7.0 -Release: 5%{?dist} - -License: GPL -Group: Applications/System -URL: http://www.gnupg.org/related_software/gpa/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-0.7.0.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source1: gpa.desktop -Patch0: gpa-keyservers.patch -Patch1: gpa-keytable-init.patch - -BuildRequires: gtk2-devel -BuildRequires: zlib-devel -BuildRequires: desktop-file-utils -BuildRequires: gpgme-devel -BuildRequires: gettext +Name: gpa +Summary: Graphical user interface for GnuPG +Version: 0.7.3 +Release: 2%{?dist} + +License: GPL +Group: Applications/System +#URL: http://www.gnupg.org/related_software/gpa/ +#Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz +URL: http://gpa.wald.intevation.org/ +Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2 +Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: gpa-0.7.3-keyservers.patch +Patch2: gpa-0.7.3-dt.patch + +BuildRequires: gtk2-devel +BuildRequires: zlib-devel +BuildRequires: desktop-file-utils +BuildRequires: gpgme-devel +BuildRequires: gettext %description GNU Privacy Assistant (GPA) is a graphical frontend for the GNU @@ -29,8 +31,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p1 +%patch1 -p1 -b .keyservers +%patch2 -p1 -b .dt %build @@ -44,12 +46,14 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE1} + --vendor="fedora" --add-category="X-Fedora" \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop -install -p -m644 -D gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +install -p -m644 -D gpa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gpa.png %find_lang %{name} @@ -77,6 +81,13 @@ %changelog +* Thu May 11 2006 Rex Dieter 0.7.3-2 +- cleanup .dt patch +- update URL:, Source: tags + +* Wed Mar 22 2006 Rex Dieter 0.7.3-1 +- 0.7.3 + * Mon Feb 27 2006 Rex Dieter 0.7.0-5 - follow fdo icon spec - drop superfluous BR: gnupg Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpa/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:28:52 -0000 1.2 +++ sources 11 May 2006 19:21:32 -0000 1.3 @@ -1 +1,2 @@ -44cb60cba64a48837588ed27f8db08b2 gpa-0.7.0.tar.gz +a3626266f9dda506445c7297c4172a65 gpa-0.7.3.tar.bz2 +68d7cafe71c21a386109878c206e4016 gpa-0.7.3.tar.bz2.sig --- gpa-keyservers.patch DELETED --- --- gpa-keytable-init.patch DELETED --- --- gpa.desktop DELETED --- From fedora-extras-commits at redhat.com Thu May 11 19:34:16 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:34:16 -0700 Subject: rpms/gpgme/devel gpgme-1.1.2-config_extras.patch, NONE, 1.1 gpgme.spec, 1.15, 1.16 Message-ID: <200605111934.k4BJYIQw004191@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4170 Modified Files: gpgme.spec Added Files: gpgme-1.1.2-config_extras.patch Log Message: * Mon Mar 6 2006 Rex Dieter 1.1.2-3 - add back support for gpgme-config --thread=pthread gpgme-1.1.2-config_extras.patch: --- NEW FILE gpgme-1.1.2-config_extras.patch --- --- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras 2005-11-18 17:03:28.000000000 -0600 +++ gpgme-1.1.2/gpgme/gpgme-config.in 2006-03-06 08:50:57.000000000 -0600 @@ -16,15 +16,19 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" -gpg_error_libs="@GPG_ERROR_LIBS@" +#gpg_error_libs="@GPG_ERROR_LIBS@" # Configure thread packages. thread_modules="" @HAVE_PTH_TRUE at thread_modules="$thread_modules pth" -libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" +#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" cflags_pth="@PTH_CFLAGS@" + at HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" +#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@" +cflags_pthread="@PTHREAD_CFLAGS@" + # Configure glib. libs_glib="@GLIB_LIBS@" cflags_glib="@GLIB_CFLAGS@" Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gpgme.spec 3 Mar 2006 13:00:38 -0000 1.15 +++ gpgme.spec 11 May 2006 19:34:16 -0000 1.16 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 1%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/System @@ -11,6 +11,8 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: gpgme-1.1.2-config_extras.patch + BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 BuildRequires: libgpg-error-devel >= 0.5 @@ -41,6 +43,8 @@ %prep %setup -q +%patch1 -p1 -b .config_extras + %build %configure \ @@ -95,6 +99,12 @@ %changelog +* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +- add back support for gpgme-config --thread=pthread + +* Mon Mar 6 2006 Rex Dieter 1.1.2-2 +- drop extraneous libs from gpgme-config + * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch From fedora-extras-commits at redhat.com Thu May 11 19:35:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:35:06 -0700 Subject: rpms/gpgme/FC-5 gpgme.spec,1.15,1.16 Message-ID: <200605111935.k4BJZ82I004259@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4242 Modified Files: gpgme.spec Log Message: * Mon Mar 6 2006 Rex Dieter 1.1.2-3 - add back support for gpgme-config --thread=pthread Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-5/gpgme.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gpgme.spec 3 Mar 2006 13:00:38 -0000 1.15 +++ gpgme.spec 11 May 2006 19:35:05 -0000 1.16 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 1%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/System @@ -11,6 +11,8 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: gpgme-1.1.2-config_extras.patch + BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 BuildRequires: libgpg-error-devel >= 0.5 @@ -41,6 +43,8 @@ %prep %setup -q +%patch1 -p1 -b .config_extras + %build %configure \ @@ -95,6 +99,12 @@ %changelog +* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +- add back support for gpgme-config --thread=pthread + +* Mon Mar 6 2006 Rex Dieter 1.1.2-2 +- drop extraneous libs from gpgme-config + * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch From fedora-extras-commits at redhat.com Thu May 11 19:38:48 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:38:48 -0700 Subject: rpms/gpgme/FC-4 gpgme-1.1.2-config_extras.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gpgme.spec, 1.11, 1.12 sources, 1.4, 1.5 gpgme-1.0.2-macro.patch, 1.1, NONE gpgme-1.0.3-tests.patch, 1.1, NONE gpgme-1.1.0-tests.patch, 1.1, NONE Message-ID: <200605111938.k4BJcoss004359@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4333 Modified Files: .cvsignore gpgme.spec sources Added Files: gpgme-1.1.2-config_extras.patch Removed Files: gpgme-1.0.2-macro.patch gpgme-1.0.3-tests.patch gpgme-1.1.0-tests.patch Log Message: * Mon Mar 6 2006 Rex Dieter 1.1.2-4 - add back support for gpgme-config --thread=pthread * Mon Mar 6 2006 Rex Dieter 1.1.2-2 - drop extraneous libs from gpgme-config * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch gpgme-1.1.2-config_extras.patch: --- NEW FILE gpgme-1.1.2-config_extras.patch --- --- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras 2005-11-18 17:03:28.000000000 -0600 +++ gpgme-1.1.2/gpgme/gpgme-config.in 2006-03-06 08:50:57.000000000 -0600 @@ -16,15 +16,19 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" -gpg_error_libs="@GPG_ERROR_LIBS@" +#gpg_error_libs="@GPG_ERROR_LIBS@" # Configure thread packages. thread_modules="" @HAVE_PTH_TRUE at thread_modules="$thread_modules pth" -libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" +#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" cflags_pth="@PTH_CFLAGS@" + at HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" +#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@" +cflags_pthread="@PTHREAD_CFLAGS@" + # Configure glib. libs_glib="@GLIB_LIBS@" cflags_glib="@GLIB_CFLAGS@" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Dec 2005 13:43:53 -0000 1.4 +++ .cvsignore 11 May 2006 19:38:48 -0000 1.5 @@ -1,2 +1,2 @@ -gpgme-1.0.3.tar.bz2 -gpgme-1.0.3.tar.bz2.sig +gpgme-1.1.2.tar.bz2 +gpgme-1.1.2.tar.bz2.sig Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-4/gpgme.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gpgme.spec 6 Dec 2005 14:05:39 -0000 1.11 +++ gpgme.spec 11 May 2006 19:38:48 -0000 1.12 @@ -1,8 +1,8 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.1.2 +Release: 4%{?dist} License: LGPL Group: Applications/System @@ -11,8 +11,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gpgme-1.0.2-macro.patch -Patch1: gpgme-1.0.3-tests.patch +Patch1: gpgme-1.1.2-config_extras.patch BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 @@ -44,8 +43,7 @@ %prep %setup -q -%patch0 -p0 -b .macro -%patch1 -p1 -b .tests +%patch1 -p1 -b .config_extras %build @@ -65,7 +63,8 @@ %check || : -make check +# expect 1(+?) errors with gnupg < 1.2.4 +make check %clean @@ -100,8 +99,24 @@ %changelog -* Tue Dec 06 2005 Rex Dieter 1.0.3-2 -- tests.patch so 'make check' passes +* Mon Mar 6 2006 Rex Dieter 1.1.2-4 +- add back support for gpgme-config --thread=pthread + +* Mon Mar 6 2006 Rex Dieter 1.1.2-2 +- drop extraneous libs from gpgme-config + +* Fri Mar 3 2006 Rex Dieter 1.1.2-1 +- 1.1.2 +- drop upstreamed gpgme-1.1.0-tests.patch + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Wed Nov 30 2005 Rex Dieter - 1.1.0-3 +- (re)build against (newer) libksba/gnupg2 + +* Thu Oct 06 2005 Rex Dieter - 1.1.0-2 +- 1.1.0 * Mon Aug 8 2005 Rex Dieter - 1.0.3-1 - 1.0.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Dec 2005 13:43:53 -0000 1.4 +++ sources 11 May 2006 19:38:48 -0000 1.5 @@ -1,2 +1,2 @@ -84f85671d63164fb1d338c23010f023d gpgme-1.0.3.tar.bz2 -f91f3a341c0070aef7cec52e3cb4d770 gpgme-1.0.3.tar.bz2.sig +7c2333679035a5f37e99630a156a40ca gpgme-1.1.2.tar.bz2 +5b786d78d322ea0778eea5ae67c087b4 gpgme-1.1.2.tar.bz2.sig --- gpgme-1.0.2-macro.patch DELETED --- --- gpgme-1.0.3-tests.patch DELETED --- --- gpgme-1.1.0-tests.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 11 19:40:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 11 May 2006 12:40:20 -0700 Subject: rpms/gpgme/FC-5 gpgme-1.1.2-config_extras.patch, NONE, 1.1 gpgme.spec, 1.16, 1.17 Message-ID: <200605111940.k4BJeMVR004440@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4420 Modified Files: gpgme.spec Added Files: gpgme-1.1.2-config_extras.patch Log Message: respin for missing patch gpgme-1.1.2-config_extras.patch: --- NEW FILE gpgme-1.1.2-config_extras.patch --- --- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras 2005-11-18 17:03:28.000000000 -0600 +++ gpgme-1.1.2/gpgme/gpgme-config.in 2006-03-06 08:50:57.000000000 -0600 @@ -16,15 +16,19 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" -gpg_error_libs="@GPG_ERROR_LIBS@" +#gpg_error_libs="@GPG_ERROR_LIBS@" # Configure thread packages. thread_modules="" @HAVE_PTH_TRUE at thread_modules="$thread_modules pth" -libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" +#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@" cflags_pth="@PTH_CFLAGS@" + at HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" +#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@" +cflags_pthread="@PTHREAD_CFLAGS@" + # Configure glib. libs_glib="@GLIB_LIBS@" cflags_glib="@GLIB_CFLAGS@" Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/FC-5/gpgme.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gpgme.spec 11 May 2006 19:35:05 -0000 1.16 +++ gpgme.spec 11 May 2006 19:40:20 -0000 1.17 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: Applications/System @@ -99,7 +99,7 @@ %changelog -* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +* Mon Mar 6 2006 Rex Dieter 1.1.2-4 - add back support for gpgme-config --thread=pthread * Mon Mar 6 2006 Rex Dieter 1.1.2-2 From fedora-extras-commits at redhat.com Thu May 11 20:21:20 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 11 May 2006 13:21:20 -0700 Subject: rpms/netcdf/FC-4 netcdf.spec,1.12,1.13 Message-ID: <200605112021.k4BKLqmF006927@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6880/FC-4 Modified Files: netcdf.spec Log Message: add missing BuildRequires for the g77 interface Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/FC-4/netcdf.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- netcdf.spec 22 Apr 2006 02:32:55 -0000 1.12 +++ netcdf.spec 11 May 2006 20:21:20 -0000 1.13 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +BuildRequires: compat-gcc-32-g77 %package devel Summary: Development files for netcdf-3 @@ -120,6 +121,9 @@ %changelog +* Thu May 11 2006 Ed Hill - 3.6.1-2 +- add missing BuildRequires for the g77 interface + * Fri Apr 21 2006 Ed Hill - 3.6.1-1 - update to upstream 3.6.1 From fedora-extras-commits at redhat.com Thu May 11 20:21:22 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 11 May 2006 13:21:22 -0700 Subject: rpms/netcdf/devel netcdf.spec,1.14,1.15 Message-ID: <200605112021.k4BKLs58006933@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6880/devel Modified Files: netcdf.spec Log Message: add missing BuildRequires for the g77 interface Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- netcdf.spec 22 Apr 2006 02:32:57 -0000 1.14 +++ netcdf.spec 11 May 2006 20:21:22 -0000 1.15 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +BuildRequires: compat-gcc-32-g77 %package devel Summary: Development files for netcdf-3 @@ -120,6 +121,9 @@ %changelog +* Thu May 11 2006 Ed Hill - 3.6.1-2 +- add missing BuildRequires for the g77 interface + * Fri Apr 21 2006 Ed Hill - 3.6.1-1 - update to upstream 3.6.1 From fedora-extras-commits at redhat.com Thu May 11 20:21:21 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 11 May 2006 13:21:21 -0700 Subject: rpms/netcdf/FC-5 netcdf.spec,1.14,1.15 Message-ID: <200605112021.k4BKLr4b006930@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/netcdf/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6880/FC-5 Modified Files: netcdf.spec Log Message: add missing BuildRequires for the g77 interface Index: netcdf.spec =================================================================== RCS file: /cvs/extras/rpms/netcdf/FC-5/netcdf.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- netcdf.spec 22 Apr 2006 02:32:56 -0000 1.14 +++ netcdf.spec 11 May 2006 20:21:21 -0000 1.15 @@ -1,6 +1,6 @@ Name: netcdf Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) Group: Applications/Engineering @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +BuildRequires: compat-gcc-32-g77 %package devel Summary: Development files for netcdf-3 @@ -120,6 +121,9 @@ %changelog +* Thu May 11 2006 Ed Hill - 3.6.1-2 +- add missing BuildRequires for the g77 interface + * Fri Apr 21 2006 Ed Hill - 3.6.1-1 - update to upstream 3.6.1 From fedora-extras-commits at redhat.com Thu May 11 21:19:47 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 11 May 2006 14:19:47 -0700 Subject: rpms/apt/devel apt.spec,1.27,1.28 Message-ID: <200605112119.k4BLJniJ009472@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9455 Modified Files: apt.spec Log Message: Remove bogus final s from default(s).conf (Ville) Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- apt.spec 9 May 2006 18:10:38 -0000 1.27 +++ apt.spec 11 May 2006 21:19:47 -0000 1.28 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 2%{?dist} +Release: 2.1%{?dist} Group: System Environment/Base URL: http://apt-rpm.laiskiainen.org/ License: GPL @@ -237,7 +237,7 @@ %dir %{_sysconfdir}/apt/apt.conf.d/ # NOTE: no noreplace because we WANT to be able to change the defaults # without user intervention! -%config %{_sysconfdir}/apt/apt.conf.d/defaults.conf +%config %{_sysconfdir}/apt/apt.conf.d/default.conf %dir %{_sysconfdir}/apt/sources.list.d/ %dir %{_sysconfdir}/apt/vendors.list.d/ @@ -292,6 +292,9 @@ %changelog +* Thu May 11 2006 Axel Thimm - 0.5.15lorg3-2.1 +- Remove bogus final s from default(s).conf (Ville). + * Mon May 8 2006 Axel Thimm - 0.5.15lorg3-2 - Split off configuration files from apt. From fedora-extras-commits at redhat.com Thu May 11 21:26:08 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 14:26:08 -0700 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.32,1.33 Message-ID: <200605112126.k4BLQAk2009555@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9532 Modified Files: TeXmacs.spec Log Message: rebuilt for guile 1.8 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- TeXmacs.spec 20 Mar 2006 11:32:58 -0000 1.32 +++ TeXmacs.spec 11 May 2006 21:26:08 -0000 1.33 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -153,6 +153,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 1.0.6-7 +- rebuilt for guile-1.8 + * Mon Mar 20 2006 Gerard Milmeister - 1.0.6-6 - fix problems with gcc41 (TeXmacs-gcc41.patch) From fedora-extras-commits at redhat.com Thu May 11 21:26:06 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Thu, 11 May 2006 14:26:06 -0700 Subject: rpms/torque/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torque.spec, 1.4, 1.5 Message-ID: <200605112126.k4BLQ8jI009536@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9512 Modified Files: .cvsignore sources torque.spec Log Message: * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Apr 2006 01:54:37 -0000 1.4 +++ .cvsignore 11 May 2006 21:26:06 -0000 1.5 @@ -1 +1 @@ -torque-2.1.0p0-snap.200604251602.tar.gz +torque-2.1.0p0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torque/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Apr 2006 01:54:37 -0000 1.4 +++ sources 11 May 2006 21:26:06 -0000 1.5 @@ -1 +1 @@ -e5172ea8627be8797664967cc3e66625 torque-2.1.0p0-snap.200604251602.tar.gz +4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torque.spec 26 Apr 2006 01:54:37 -0000 1.4 +++ torque.spec 11 May 2006 21:26:06 -0000 1.5 @@ -2,8 +2,8 @@ # comment out snap if building a real release %define name torque %define version 2.1.0p0 -%define snap 200604251602 -%define release 11 +#%%define snap 200604251602 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -423,6 +423,9 @@ %changelog +* Thu May 11 2006 Garrick Staples 2.1.0p0-1 +- bump to final release + * Tue Apr 25 2006 Garrick Staples 2.1.0p0-0.11.200604251602cvs - bump to fix "mem" job resources for non-serial jobs - rm.h is now installed From fedora-extras-commits at redhat.com Thu May 11 21:34:26 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 May 2006 14:34:26 -0700 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.33,1.34 Message-ID: <200605112134.k4BLYSHn009717@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9700 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- TeXmacs.spec 11 May 2006 21:26:08 -0000 1.33 +++ TeXmacs.spec 11 May 2006 21:34:26 -0000 1.34 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -13,7 +13,10 @@ Patch3: TeXmacs-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript -Buildrequires: guile-devel, desktop-file-utils, tetex +Buildrequires: guile-devel +Buildrequires: gmp-devel +Buildrequires: desktop-file-utils +Buildrequires: tetex Buildrequires: freetype-devel BuildRequires: libICE-devel BuildRequires: libSM-devel @@ -153,6 +156,9 @@ %changelog +* Thu May 11 2006 Gerard Milmeister - 1.0.6-8 +- added buildreq for gmp-devel + * Thu May 11 2006 Gerard Milmeister - 1.0.6-7 - rebuilt for guile-1.8 From fedora-extras-commits at redhat.com Thu May 11 21:40:04 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 11 May 2006 14:40:04 -0700 Subject: rpms/gtkterm/devel gtkterm.spec,1.8,1.9 Message-ID: <200605112140.k4BLe6f8009799@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gtkterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9782 Modified Files: gtkterm.spec Log Message: * Thu May 11 2006 Hans de Goede 0.99.5-2 - Rebuild for new vte release. Index: gtkterm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkterm.spec 31 Mar 2006 20:44:46 -0000 1.8 +++ gtkterm.spec 11 May 2006 21:40:04 -0000 1.9 @@ -1,6 +1,6 @@ Name: gtkterm Version: 0.99.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Serial port terminal Group: Applications/Communications License: GPL @@ -72,6 +72,9 @@ %changelog +* Thu May 11 2006 Hans de Goede 0.99.5-2 +- Rebuild for new vte release. + * Fri Mar 31 2006 Hans de Goede 0.99.5-1 - Taking over as new FE maintainer - Bump to new upstream 0.99.5 From fedora-extras-commits at redhat.com Thu May 11 21:58:12 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Thu, 11 May 2006 14:58:12 -0700 Subject: rpms/torque/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torque.spec, 1.4, 1.5 Message-ID: <200605112158.k4BLwE4b009961@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9940 Modified Files: .cvsignore sources torque.spec Log Message: * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Apr 2006 01:56:22 -0000 1.4 +++ .cvsignore 11 May 2006 21:58:11 -0000 1.5 @@ -1 +1 @@ -torque-2.1.0p0-snap.200604251602.tar.gz +torque-2.1.0p0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torque/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Apr 2006 01:56:22 -0000 1.4 +++ sources 11 May 2006 21:58:11 -0000 1.5 @@ -1 +1 @@ -e5172ea8627be8797664967cc3e66625 torque-2.1.0p0-snap.200604251602.tar.gz +4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torque.spec 26 Apr 2006 01:56:22 -0000 1.4 +++ torque.spec 11 May 2006 21:58:11 -0000 1.5 @@ -2,8 +2,8 @@ # comment out snap if building a real release %define name torque %define version 2.1.0p0 -%define snap 200604251602 -%define release 11 +#%%define snap 200604251602 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -423,6 +423,9 @@ %changelog +* Thu May 11 2006 Garrick Staples 2.1.0p0-1 +- bump to final release + * Tue Apr 25 2006 Garrick Staples 2.1.0p0-0.11.200604251602cvs - bump to fix "mem" job resources for non-serial jobs - rm.h is now installed From fedora-extras-commits at redhat.com Thu May 11 21:58:50 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Thu, 11 May 2006 14:58:50 -0700 Subject: rpms/torque/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torque.spec, 1.4, 1.5 Message-ID: <200605112158.k4BLwqjD010031@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10008 Modified Files: .cvsignore sources torque.spec Log Message: * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Apr 2006 01:56:49 -0000 1.4 +++ .cvsignore 11 May 2006 21:58:50 -0000 1.5 @@ -1 +1 @@ -torque-2.1.0p0-snap.200604251602.tar.gz +torque-2.1.0p0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torque/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Apr 2006 01:56:49 -0000 1.4 +++ sources 11 May 2006 21:58:50 -0000 1.5 @@ -1 +1 @@ -e5172ea8627be8797664967cc3e66625 torque-2.1.0p0-snap.200604251602.tar.gz +4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torque.spec 26 Apr 2006 01:56:49 -0000 1.4 +++ torque.spec 11 May 2006 21:58:50 -0000 1.5 @@ -2,8 +2,8 @@ # comment out snap if building a real release %define name torque %define version 2.1.0p0 -%define snap 200604251602 -%define release 11 +#%%define snap 200604251602 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -423,6 +423,9 @@ %changelog +* Thu May 11 2006 Garrick Staples 2.1.0p0-1 +- bump to final release + * Tue Apr 25 2006 Garrick Staples 2.1.0p0-0.11.200604251602cvs - bump to fix "mem" job resources for non-serial jobs - rm.h is now installed From fedora-extras-commits at redhat.com Thu May 11 21:59:12 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Thu, 11 May 2006 14:59:12 -0700 Subject: rpms/torque/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 torque.spec, 1.4, 1.5 Message-ID: <200605112159.k4BLxE4s010100@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10078 Modified Files: .cvsignore sources torque.spec Log Message: * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Apr 2006 01:57:17 -0000 1.4 +++ .cvsignore 11 May 2006 21:59:12 -0000 1.5 @@ -1 +1 @@ -torque-2.1.0p0-snap.200604251602.tar.gz +torque-2.1.0p0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/torque/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Apr 2006 01:57:17 -0000 1.4 +++ sources 11 May 2006 21:59:12 -0000 1.5 @@ -1 +1 @@ -e5172ea8627be8797664967cc3e66625 torque-2.1.0p0-snap.200604251602.tar.gz +4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torque.spec 26 Apr 2006 01:57:17 -0000 1.4 +++ torque.spec 11 May 2006 21:59:12 -0000 1.5 @@ -2,8 +2,8 @@ # comment out snap if building a real release %define name torque %define version 2.1.0p0 -%define snap 200604251602 -%define release 11 +#%%define snap 200604251602 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -423,6 +423,9 @@ %changelog +* Thu May 11 2006 Garrick Staples 2.1.0p0-1 +- bump to final release + * Tue Apr 25 2006 Garrick Staples 2.1.0p0-0.11.200604251602cvs - bump to fix "mem" job resources for non-serial jobs - rm.h is now installed From fedora-extras-commits at redhat.com Thu May 11 22:19:17 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 11 May 2006 15:19:17 -0700 Subject: rpms/Terminal/devel Terminal.spec,1.7,1.8 Message-ID: <200605112219.k4BMJJ9W012473@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/Terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12456 Modified Files: Terminal.spec Log Message: Rebuild against new vte version Index: Terminal.spec =================================================================== RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Terminal.spec 17 Feb 2006 03:56:47 -0000 1.7 +++ Terminal.spec 11 May 2006 22:19:17 -0000 1.8 @@ -1,7 +1,7 @@ Summary: X Terminal Emulator Name: Terminal Version: 0.2.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL URL: http://terminal.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/Terminal-0.2.4.tar.bz2 @@ -49,6 +49,9 @@ %{_libexecdir}/TerminalHelp %changelog +* Thu May 11 2006 Kevin Fenzi - 0.2.4-8 +- Rebuild against new vte version + * Thu Feb 16 2006 Kevin Fenzi - 0.2.4-7.fc5 - Add libSM-devel BuildRequires From fedora-extras-commits at redhat.com Thu May 11 22:23:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 May 2006 15:23:35 -0700 Subject: rpms/xbindkeys/devel xbindkeys.spec,1.8,1.9 Message-ID: <200605112223.k4BMNbWX012541@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/xbindkeys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12524 Modified Files: xbindkeys.spec Log Message: rebuild Index: xbindkeys.spec =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/devel/xbindkeys.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xbindkeys.spec 22 Feb 2006 08:11:25 -0000 1.8 +++ xbindkeys.spec 11 May 2006 22:23:35 -0000 1.9 @@ -1,6 +1,6 @@ Name: xbindkeys Version: 1.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Binds keys or mouse buttons to shell commands under X. License: GPL @@ -39,6 +39,9 @@ %attr(0644, root, root) %{_mandir}/man?/* %changelog +* Fri May 12 2006 Aurelien Bompard 1.7.2-5 +- rebuild + * Wed Feb 22 2006 Aurelien Bompard 1.7.2-4 - fix dependencies for modular Xorg From fedora-extras-commits at redhat.com Thu May 11 23:01:52 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:01:52 -0700 Subject: owners owners.list,1.977,1.978 Message-ID: <200605112302.k4BN2Soo014895@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14832 Modified Files: owners.list Log Message: Added cowbell, maintained by me Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.977 retrieving revision 1.978 diff -u -r1.977 -r1.978 --- owners.list 11 May 2006 18:24:53 -0000 1.977 +++ owners.list 11 May 2006 23:01:52 -0000 1.978 @@ -163,6 +163,7 @@ Fedora Extras|contacts|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|cowbell|Music Organizer|foolish at guezz.net|extras-qa at fedoraproject.org| Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|cpanspec|RPM spec file generation utility|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 11 23:06:50 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:06:50 -0700 Subject: rpms/cowbell - New directory Message-ID: <200605112306.k4BN6q4f015025@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14999/cowbell Log Message: Directory /cvs/extras/rpms/cowbell added to the repository From fedora-extras-commits at redhat.com Thu May 11 23:06:51 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:06:51 -0700 Subject: rpms/cowbell/devel - New directory Message-ID: <200605112306.k4BN6rVM015026@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14999/cowbell/devel Log Message: Directory /cvs/extras/rpms/cowbell/devel added to the repository From fedora-extras-commits at redhat.com Thu May 11 23:08:11 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:08:11 -0700 Subject: rpms/cowbell Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605112308.k4BN8Dsm015074@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15046 Added Files: Makefile import.log Log Message: Setup of module cowbell --- NEW FILE Makefile --- # Top level Makefile for module cowbell all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 11 23:08:12 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:08:12 -0700 Subject: rpms/cowbell/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605112308.k4BN8EPv015077@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15046/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cowbell --- NEW 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 May 11 23:09:44 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:09:44 -0700 Subject: rpms/cowbell import.log,1.1,1.2 Message-ID: <200605112309.k4BN9kFv015160@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15127 Modified Files: import.log Log Message: auto-import cowbell-0.2.7.1-2 on branch devel from cowbell-0.2.7.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cowbell/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 May 2006 23:08:11 -0000 1.1 +++ import.log 11 May 2006 23:09:44 -0000 1.2 @@ -0,0 +1 @@ +cowbell-0_2_7_1-2:HEAD:cowbell-0.2.7.1-2.src.rpm:1147388970 From fedora-extras-commits at redhat.com Thu May 11 23:09:45 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 11 May 2006 16:09:45 -0700 Subject: rpms/cowbell/devel cowbell.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605112309.k4BN9lmo015165@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/cowbell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15127/devel Modified Files: .cvsignore sources Added Files: cowbell.spec Log Message: auto-import cowbell-0.2.7.1-2 on branch devel from cowbell-0.2.7.1-2.src.rpm --- NEW FILE cowbell.spec --- %define _libdir /usr/lib Name: cowbell Version: 0.2.7.1 Release: 2%{?dist} Summary: Music organazier Group: Applications/Multimedia License: GPL URL: http://more-cowbell.org/ Source0: http://more-cowbell.org/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2, gtk-sharp2-gapi BuildRequires: taglib-devel BuildRequires: scrollkeeper, desktop-file-utils Requires: mono-core, gtk-sharp2 Requires(post): scrollkeeper, desktop-file-utils Requires(postun): scrollkeeper, desktop-file-utils %description Cowbell is an elegant, album-based, music organizer written by Brad Taylor in C# for Gtk+. Using TagLib, it supports many audio formats including: Mp3, Ogg Vorbis and MusePack %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun scrollkeeper-update -q || : update-desktop-database &> /dev/null ||: touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_bindir}/cowbell %{_libdir}/cowbell %{_datadir}/icons/hicolor/48x48/apps/cowbell.png %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/scalable/apps/cowbell.svg %changelog * Thu May 11 2006 Sindre Pedersen Bj??rdal - 0.2.7.1-2 - Add missing mono-core and gtk-sharp2 Requires - Add scriplets for gtk+ icon cache - Removed ChangeLog from %doc - Don't include static library - Remove gettext BuildRequires * Tue May 09 2006 Sindre Pedersen Bj??rdal - 0.2.7.1-1 - New release, 0.2.7.1 - Define libdir like suggested in the wiki * Mon Apr 24 2006 John Mahowald - 0.2.7-1 - 0.2.7 * Sun Apr 02 2006 Sindre Pedersen Bj??rdal - 0.2.6.1-2 - Fix x86_64 build issue by replacing %{_libdir} * Sat Apr 01 2006 Sindre Pedersen Bj??rdal - 0.2.6.1-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cowbell/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 May 2006 23:08:11 -0000 1.1 +++ .cvsignore 11 May 2006 23:09:45 -0000 1.2 @@ -0,0 +1 @@ +cowbell-0.2.7.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cowbell/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 May 2006 23:08:11 -0000 1.1 +++ sources 11 May 2006 23:09:45 -0000 1.2 @@ -0,0 +1 @@ +fcf32bcf60be2ca204519192eb26bacc cowbell-0.2.7.1.tar.gz From fedora-extras-commits at redhat.com Fri May 12 01:19:26 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 11 May 2006 18:19:26 -0700 Subject: fedora-security/audit fe4,1.20,1.21 Message-ID: <200605120119.k4C1JQQk022599@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22581 Modified Files: fe4 Log Message: Note perl-Net-SSLeay fix. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fe4 11 May 2006 02:54:20 -0000 1.20 +++ fe4 12 May 2006 01:19:23 -0000 1.21 @@ -75,4 +75,4 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) -CVE-2005-0106 VULNERABLE (perl-Net-SSLeay) bz#191351 +CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.26-3) bz#191351 From fedora-extras-commits at redhat.com Fri May 12 02:35:14 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 11 May 2006 19:35:14 -0700 Subject: rpms/perl-SOAP-Lite/FC-5 perl-SOAP-Lite.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605120235.k4C2ZGSZ025087@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25068 Modified Files: perl-SOAP-Lite.spec sources Log Message: Upstream has released a new version - also I'm the new maintainer Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-5/perl-SOAP-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SOAP-Lite.spec 26 Oct 2005 18:23:25 -0000 1.2 +++ perl-SOAP-Lite.spec 12 May 2006 02:35:14 -0000 1.3 @@ -1,73 +1,78 @@ -Name: perl-SOAP-Lite -Version: 0.60a -Release: 3%{?dist} -Summary: Provides the Simple Object Access Protocol (SOAP) - -Group: Development/Libraries -License: GPL or Artistic -URL: http://search.cpan.org/dist/SOAP-Lite/ -Source0: http://www.cpan.org/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-0.60a.tar.gz -Source1: filter-requires.sh -Patch0: SOAP-Lite-0.60a-paths.patch +Name: perl-SOAP-Lite +Version: 0.67 +Release: 2%{?dist} +Summary: Client and server side SOAP implementation +License: GPL or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/SOAP-Lite/ +Source0: http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-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)) - -%define __perl_requires %{SOURCE1} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl-XML-Parser +BuildArch: noarch + +%define bogusreqs 'perl(MQClient::MQSeries)\ +perl(MQSeries)\ +perl(MQSeries::Message)\ +perl(MQSeries::Queue)\ +perl(MQSeries::QueueManager)\ +perl(Net::Jabber)' +%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" +%define __perl_requires %{reqfilt} %description -SOAP::Lite for Perl is a collection of Perl modules which provides a simple -and lightweight interface to the Simple Object Access Protocol (SOAP) both -on client and server side. - -This version of SOAP::Lite supports a subset of the SOAP 1.1 specification -and has initial support for SOAP 1.2 specification. - +SOAP::Lite is a collection of Perl modules which provides a simple and +lightweight interface to the Simple Object Access Protocol (SOAP) both on +client and server side. %prep -%setup -q -n SOAP-Lite-0.60 # Upstream tar is inconsistent. -%patch0 -p1 - -# avoid dependencies -find examples -type f | xargs chmod 644 - +%setup -q -n SOAP-Lite-%{version} %build -# Despite the --noprompt, it prompts for a enter.... -%{__perl} Makefile.PL INSTALLDIRS=vendor --noprompt << EOL - -EOL +%{__perl} Makefile.PL --noprompt 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 -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 d -depth -exec rmdir {} 2>/dev/null ';' +#Items not yet in Extras +#find $RPM_BUILD_ROOT -type f -name JABBER* -exec rm -f {} ';' +#find $RPM_BUILD_ROOT -type f -name MQ* -exec rm -f {} ';' -%check || : -make test - +chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT +%check +make test %files %defattr(-,root,root,-) -%doc README Changes examples -%{_bindir}/* -%{perl_vendorlib}/* -%{_mandir}/man1/*.1* -%{_mandir}/man3/*.3* - +# For license text(s), see the perl package. +%doc Changes README ReleaseNotes.txt +%{_bindir}/*pl +%{perl_vendorlib}/SOAP +%{perl_vendorlib}/Apache +%{perl_vendorlib}/IO +%{perl_vendorlib}/UDDI +%{perl_vendorlib}/OldDocs +%{perl_vendorlib}/XML +%{perl_vendorlib}/XMLRPC +%{_mandir}/man3/* +%{_mandir}/man1/* %changelog +* Mon Mar 20 2006 Mike McGrath - 0.67-2 +- Removed perl requirements that do not yet exist in Extras + +* Sat Mar 18 2006 Mike McGrath - 0.67-1 +- New Owner and new spec file + * Wed Oct 26 2005 Ville Skytt?? - 0.60a-3 - Fix build, doc permissions (#169821). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Apr 2005 22:42:45 -0000 1.2 +++ sources 12 May 2006 02:35:14 -0000 1.3 @@ -1 +1 @@ -aed9f8e9c4cf180d15c6e15aedc484d7 SOAP-Lite-0.60a.tar.gz +2473030e75838e86529ca57a49f9104f SOAP-Lite-0.67.tar.gz From fedora-extras-commits at redhat.com Fri May 12 02:36:28 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 11 May 2006 19:36:28 -0700 Subject: rpms/perl-SOAP-Lite/FC-4 perl-SOAP-Lite.spec,1.2,1.3 Message-ID: <200605120236.k4C2aUna025148@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25131 Modified Files: perl-SOAP-Lite.spec Log Message: New upstream version and new maintainer. Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-4/perl-SOAP-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SOAP-Lite.spec 26 Oct 2005 18:23:20 -0000 1.2 +++ perl-SOAP-Lite.spec 12 May 2006 02:36:28 -0000 1.3 @@ -1,73 +1,78 @@ -Name: perl-SOAP-Lite -Version: 0.60a -Release: 3%{?dist} -Summary: Provides the Simple Object Access Protocol (SOAP) - -Group: Development/Libraries -License: GPL or Artistic -URL: http://search.cpan.org/dist/SOAP-Lite/ -Source0: http://www.cpan.org/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-0.60a.tar.gz -Source1: filter-requires.sh -Patch0: SOAP-Lite-0.60a-paths.patch +Name: perl-SOAP-Lite +Version: 0.67 +Release: 2%{?dist} +Summary: Client and server side SOAP implementation +License: GPL or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/SOAP-Lite/ +Source0: http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-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)) - -%define __perl_requires %{SOURCE1} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl-XML-Parser +BuildArch: noarch + +%define bogusreqs 'perl(MQClient::MQSeries)\ +perl(MQSeries)\ +perl(MQSeries::Message)\ +perl(MQSeries::Queue)\ +perl(MQSeries::QueueManager)\ +perl(Net::Jabber)' +%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" +%define __perl_requires %{reqfilt} %description -SOAP::Lite for Perl is a collection of Perl modules which provides a simple -and lightweight interface to the Simple Object Access Protocol (SOAP) both -on client and server side. - -This version of SOAP::Lite supports a subset of the SOAP 1.1 specification -and has initial support for SOAP 1.2 specification. - +SOAP::Lite is a collection of Perl modules which provides a simple and +lightweight interface to the Simple Object Access Protocol (SOAP) both on +client and server side. %prep -%setup -q -n SOAP-Lite-0.60 # Upstream tar is inconsistent. -%patch0 -p1 - -# avoid dependencies -find examples -type f | xargs chmod 644 - +%setup -q -n SOAP-Lite-%{version} %build -# Despite the --noprompt, it prompts for a enter.... -%{__perl} Makefile.PL INSTALLDIRS=vendor --noprompt << EOL - -EOL +%{__perl} Makefile.PL --noprompt 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 -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 d -depth -exec rmdir {} 2>/dev/null ';' +#Items not yet in Extras +#find $RPM_BUILD_ROOT -type f -name JABBER* -exec rm -f {} ';' +#find $RPM_BUILD_ROOT -type f -name MQ* -exec rm -f {} ';' -%check || : -make test - +chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT +%check +make test %files %defattr(-,root,root,-) -%doc README Changes examples -%{_bindir}/* -%{perl_vendorlib}/* -%{_mandir}/man1/*.1* -%{_mandir}/man3/*.3* - +# For license text(s), see the perl package. +%doc Changes README ReleaseNotes.txt +%{_bindir}/*pl +%{perl_vendorlib}/SOAP +%{perl_vendorlib}/Apache +%{perl_vendorlib}/IO +%{perl_vendorlib}/UDDI +%{perl_vendorlib}/OldDocs +%{perl_vendorlib}/XML +%{perl_vendorlib}/XMLRPC +%{_mandir}/man3/* +%{_mandir}/man1/* %changelog +* Mon Mar 20 2006 Mike McGrath - 0.67-2 +- Removed perl requirements that do not yet exist in Extras + +* Sat Mar 18 2006 Mike McGrath - 0.67-1 +- New Owner and new spec file + * Wed Oct 26 2005 Ville Skytt?? - 0.60a-3 - Fix build, doc permissions (#169821). From fedora-extras-commits at redhat.com Fri May 12 02:39:23 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 11 May 2006 19:39:23 -0700 Subject: rpms/perl-SOAP-Lite/FC-4 sources,1.2,1.3 Message-ID: <200605120239.k4C2dP6e025229@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25212 Modified Files: sources Log Message: forgot to commit sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Apr 2005 22:42:45 -0000 1.2 +++ sources 12 May 2006 02:39:23 -0000 1.3 @@ -1 +1 @@ -aed9f8e9c4cf180d15c6e15aedc484d7 SOAP-Lite-0.60a.tar.gz +2473030e75838e86529ca57a49f9104f SOAP-Lite-0.67.tar.gz From fedora-extras-commits at redhat.com Fri May 12 02:40:19 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 11 May 2006 19:40:19 -0700 Subject: rpms/perl-SOAP-Lite/FC-4 perl-SOAP-Lite.spec,1.3,1.4 Message-ID: <200605120240.k4C2eLWO025252@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25235 Modified Files: perl-SOAP-Lite.spec Log Message: Release increment Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/FC-4/perl-SOAP-Lite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-SOAP-Lite.spec 12 May 2006 02:36:28 -0000 1.3 +++ perl-SOAP-Lite.spec 12 May 2006 02:40:19 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-SOAP-Lite Version: 0.67 -Release: 2%{?dist} +Release: 2.1%{?dist} Summary: Client and server side SOAP implementation License: GPL or Artistic Group: Development/Libraries From fedora-extras-commits at redhat.com Fri May 12 04:04:07 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 21:04:07 -0700 Subject: extras-buildsys ChangeLog,1.194,1.195 Message-ID: <200605120404.k4C447j0029965@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29934 Modified Files: ChangeLog Log Message: 2006-05-12 Dan Williams * common/Commands.py - pylint cleanups - Add the KillJob command Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- ChangeLog 11 May 2006 15:52:25 -0000 1.194 +++ ChangeLog 12 May 2006 04:04:04 -0000 1.195 @@ -1,3 +1,9 @@ +2006-05-12 Dan Williams + + * common/Commands.py + - pylint cleanups + - Add the KillJob command + 2006-05-11 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Fri May 12 04:04:07 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 21:04:07 -0700 Subject: extras-buildsys/common Commands.py,1.6,1.7 Message-ID: <200605120404.k4C447we029971@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29934/common Modified Files: Commands.py Log Message: 2006-05-12 Dan Williams * common/Commands.py - pylint cleanups - Add the KillJob command Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Commands.py 9 May 2006 19:10:56 -0000 1.6 +++ Commands.py 12 May 2006 04:04:05 -0000 1.7 @@ -34,6 +34,7 @@ CMD_NAME_JOB_STATUS_ACK = "JobStatusAck" CMD_NAME_JOB_FILES_REQ = "JobFiles" CMD_NAME_JOB_FILES_ACK = "JobFilesAck" +CMD_NAME_KILL_JOB = "KillJob" class SequenceGenerator(object): @@ -111,8 +112,8 @@ name = cmd_stream['name'] args = cmd_stream['args'] seq = cmd_stream['sequence'] - except (KeyError, TypeError), e: - print "PlgCommand deserialize error: %s" % e + except (KeyError, TypeError), exc: + print "PlgCommand deserialize error: %s" % exc return None # Create the specific command object from the command's name @@ -138,6 +139,8 @@ cmd = PlgCommandJobFilesAck._deserialize(args) elif name == CMD_NAME_UNLOCK_REPO: cmd = PlgCommandUnlockRepo._deserialize(args) + elif name == CMD_NAME_KILL_JOB: + cmd = PlgCommandKillJob._deserialize(args) # If command creation was successful, set the sequence # number from the command stream on the command. We don't @@ -195,7 +198,7 @@ def _deserialize_acked_seq(args): try: acked_seq = args['acked_seq'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'acked_seq' argument found.") return acked_seq @@ -230,7 +233,7 @@ def _deserialize(args): try: reason = args['reason'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'reason' argument found.") return PlgCommandError(reason) @@ -257,11 +260,11 @@ def _deserialize(args): try: free = args['free'] - except ValueError, TypeError: + except (ValueError, TypeError): raise ValueError("No 'free' argument found.") try: maximum = args['max'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'max' argument found.") return PlgCommandSlots(free, maximum) @@ -291,7 +294,7 @@ def _deserialize(args): try: targets = args['targets'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'targets' argument found.") # Sanity checking on targets argument @@ -304,8 +307,8 @@ basearch = target['arch'] repo = target['repo'] suparch = target['supported_arches'] - except KeyError, e: - raise ValueError("Required item '%s' not found in a target." % e) + except KeyError, exc: + raise ValueError("Required item '%s' not found in a target." % exc) return PlgCommandTargets(targets) @@ -336,11 +339,11 @@ def _deserialize(args): try: target_dict = args['target_dict'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'target_dict' argument found.") try: srpm_url = args['srpm_url'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'srpm_url' argument found.") return PlgCommandNewJobReq(None, target_dict, srpm_url) @@ -376,7 +379,7 @@ try: archjob_id = args['archjob_id'] msg = args['msg'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") req_seq = PlgCommandAck._deserialize_acked_seq(args) return PlgCommandNewJobAck(archjob_id, msg, req_seq) @@ -404,7 +407,7 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except ValueError, TypeError: + except (ValueError, TypeError): raise ValueError("No 'archjob_id' argument found.") return PlgCommandUnlockRepo(archjob_id) @@ -430,7 +433,7 @@ def _deserialize(args): try: jobs = args['jobs'] - except ValueError, TypeError: + except (ValueError, TypeError): raise ValueError("No 'jobs' argument found.") # Basic sanity @@ -441,7 +444,7 @@ for job in jobs: archjob_id = job['archjob_id'] status = job['status'] - except KeyError, e: + except KeyError: raise ValueError("Required item '%s' wasn't found in jobs item.") cmd = PlgCommandBuildingJobs() @@ -480,7 +483,7 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") return PlgCommandJobStatus(archjob_id) @@ -508,11 +511,11 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") try: status = args['status'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'status' argument found.") req_seq = PlgCommandAck._deserialize_acked_seq(args) return PlgCommandJobStatusAck(archjob_id, status, req_seq) @@ -543,7 +546,7 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") return PlgCommandJobFiles(archjob_id) @@ -574,11 +577,11 @@ def _deserialize(args): try: archjob_id = args['archjob_id'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'archjob_id' argument found.") try: files = args['files'] - except KeyError, TypeError: + except (KeyError, TypeError): raise ValueError("No 'files' argument found.") if type(files) != type([]): raise ValueError("The 'files' argument was of the wrong type.") @@ -599,3 +602,32 @@ def files(self): return self._files + + +class PlgCommandKillJob(PlgCommand): + def __init__(self, archjob_id, seq=0): + PlgCommand.__init__(self, CMD_NAME_KILL_JOB, seq) + self._archjob_id = archjob_id + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except (KeyError, TypeError): + raise ValueError("No 'archjob_id' argument found.") + + return PlgCommandKillJob(archjob_id) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def __str__(self): + return "%s(seq: %d, archjob_id: %s)" % (self._name, self._seq, self._archjob_id) + + From fedora-extras-commits at redhat.com Fri May 12 04:10:48 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 21:10:48 -0700 Subject: extras-buildsys ChangeLog,1.195,1.196 Message-ID: <200605120410.k4C4AmYC030041@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30010 Modified Files: ChangeLog Log Message: 2006-05-12 Dan Williams * builder/Builder.py - Handle job kill command Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- ChangeLog 12 May 2006 04:04:04 -0000 1.195 +++ ChangeLog 12 May 2006 04:10:45 -0000 1.196 @@ -1,5 +1,10 @@ 2006-05-12 Dan Williams + * builder/Builder.py + - Handle job kill command + +2006-05-12 Dan Williams + * common/Commands.py - pylint cleanups - Add the KillJob command From fedora-extras-commits at redhat.com Fri May 12 04:10:48 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 May 2006 21:10:48 -0700 Subject: extras-buildsys/builder Builder.py,1.9,1.10 Message-ID: <200605120410.k4C4Am42030047@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30010/builder Modified Files: Builder.py Log Message: 2006-05-12 Dan Williams * builder/Builder.py - Handle job kill command 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 11 May 2006 15:52:26 -0000 1.9 +++ Builder.py 12 May 2006 04:10:46 -0000 1.10 @@ -242,6 +242,14 @@ pass return reply + def _handle_kill_job_command(self, cmd): + try: + uniqid = cmd.archjob_id() + job = self._all_jobs[uniqid] + job.die() + except KeyError: + pass + class PassiveBuilderRequestHandler: def __init__(self, cfg, builder): @@ -531,6 +539,8 @@ reply = self._handle_job_files_request(cmd) if reply: self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandKillJob): + self._handle_kill_job_command(cmd) def _process_server_response(self, response): """Process the server's response command stream.""" From fedora-extras-commits at redhat.com Fri May 12 08:03:35 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 12 May 2006 01:03:35 -0700 Subject: rpms/grip/devel grip.spec,1.11,1.12 Message-ID: <200605120803.k4C83bSU007109@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7092 Modified Files: grip.spec Log Message: * Fri May 12 2006 Adrian Reber - 1:3.2.0-11 - rebuilt for new vte Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- grip.spec 13 Feb 2006 21:05:19 -0000 1.11 +++ grip.spec 12 May 2006 08:03:35 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -72,6 +72,9 @@ %{_mandir}/man1/* %changelog +* Fri May 12 2006 Adrian Reber - 1:3.2.0-11 +- rebuilt for new vte + * Mon Feb 13 2006 Adrian Reber - 1:3.2.0-10 - rebuilt From fedora-extras-commits at redhat.com Fri May 12 08:26:52 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 12 May 2006 01:26:52 -0700 Subject: rpms/bzflag/FC-5 bzflag.spec,1.23,1.24 Message-ID: <200605120826.k4C8QsZG007226@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7209 Modified Files: bzflag.spec Log Message: automatically decide between modular/traditional X depending on %fedora Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- bzflag.spec 11 May 2006 17:35:27 -0000 1.23 +++ bzflag.spec 12 May 2006 08:26:51 -0000 1.24 @@ -1,5 +1,17 @@ -# Use --without modular_X to rebuild without modular X deps +# Use --with/--without modular_X to rebuild with/without modular X deps + +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 %define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif %define desktop_vendor fedora #define date 20050930 @@ -87,7 +99,10 @@ %{_mandir}/man*/* %changelog -* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +- automatically decide between modular/traditional X depending on %%fedora + +* Thu May 11 2006 Nils Philippsen - version 2.0.6 - add disttag - remove upstreamed stringdos patch From fedora-extras-commits at redhat.com Fri May 12 08:27:59 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 12 May 2006 01:27:59 -0700 Subject: rpms/bzflag/FC-4 bzflag.spec,1.20,1.21 Message-ID: <200605120828.k4C8S1tN007294@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7273 Modified Files: bzflag.spec Log Message: automatically decide between modular/traditional X depending on %fedora Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bzflag.spec 11 May 2006 17:36:24 -0000 1.20 +++ bzflag.spec 12 May 2006 08:27:59 -0000 1.21 @@ -1,5 +1,17 @@ -# Use --without modular_X to rebuild without modular X deps +# Use --with/--without modular_X to rebuild with/without modular X deps + +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 %define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif %define desktop_vendor fedora #define date 20050930 @@ -87,7 +99,10 @@ %{_mandir}/man*/* %changelog -* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +- automatically decide between modular/traditional X depending on %%fedora + +* Thu May 11 2006 Nils Philippsen - version 2.0.6 - add disttag - remove upstreamed stringdos patch From fedora-extras-commits at redhat.com Fri May 12 08:31:32 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 12 May 2006 01:31:32 -0700 Subject: rpms/bzflag/devel bzflag.spec,1.23,1.24 Message-ID: <200605120831.k4C8VYJd007376@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7359 Modified Files: bzflag.spec Log Message: automatically decide between modular/traditional X depending on %fedora Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- bzflag.spec 11 May 2006 17:33:59 -0000 1.23 +++ bzflag.spec 12 May 2006 08:31:31 -0000 1.24 @@ -1,5 +1,17 @@ -# Use --without modular_X to rebuild without modular X deps +# Use --with/--without modular_X to rebuild with/without modular X deps + +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 %define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif %define desktop_vendor fedora #define date 20050930 @@ -87,7 +99,10 @@ %{_mandir}/man*/* %changelog -* Thu May 11 2006 Nils Philippsen 2.0.6-1%{?dist} +* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +- automatically decide between modular/traditional X depending on %%fedora + +* Thu May 11 2006 Nils Philippsen - version 2.0.6 - add disttag - remove upstreamed stringdos patch From fedora-extras-commits at redhat.com Fri May 12 10:12:10 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Fri, 12 May 2006 03:12:10 -0700 Subject: fedora-security/audit fc4,1.242,1.243 fc5,1.155,1.156 Message-ID: <200605121012.k4CACAPq012611@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12591/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-1859 and CVE-2006-1860 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- fc4 11 May 2006 14:15:42 -0000 1.242 +++ fc4 12 May 2006 10:12:07 -0000 1.243 @@ -35,6 +35,8 @@ CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 version (kernel, fixed 2.6.16.14) [since FEDORA-2006-517] CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] +CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) +CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- fc5 11 May 2006 14:15:42 -0000 1.155 +++ fc5 12 May 2006 10:12:07 -0000 1.156 @@ -36,6 +36,8 @@ CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] +CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) +CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1790 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] From fedora-extras-commits at redhat.com Fri May 12 11:15:22 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 12 May 2006 04:15:22 -0700 Subject: rpms/ncftp/devel ncftp-3.1.9-dirlist.patch, NONE, 1.1 ncftp.spec, 1.7, 1.8 Message-ID: <200605121115.k4CBFO7F015648@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15590/devel Modified Files: ncftp.spec Added Files: ncftp-3.1.9-dirlist.patch Log Message: Fix directory listing crash (#187605). ncftp-3.1.9-dirlist.patch: --- NEW FILE ncftp-3.1.9-dirlist.patch --- diff -u -r ncftp-3.1.9/ncftp/ls.c ncftp-3.1.9.fix/ncftp/ls.c --- ncftp-3.1.9/ncftp/ls.c Sat Jan 1 15:23:38 2005 +++ ncftp-3.1.9.fix/ncftp/ls.c Wed May 10 15:39:23 2006 @@ -53,13 +53,13 @@ struct tm lt; int i; + memset(gLsMon, 0, sizeof(gLsMon)); (void) Localtime(0, <); lt.tm_mday = 15; lt.tm_hour = 12; for (i=0; i<12; i++) { lt.tm_mon = i; - (void) strftime(gLsMon[i], sizeof(gLsMon[i]), "%b", <); - gLsMon[i][sizeof(gLsMon[i]) - 1] = '\0'; + (void) strftime(gLsMon[i], sizeof(gLsMon[i]) - 1, "%b", <); } (void) strcpy(gLsMon[i], "BUG"); } /* InitLsMonths */ @@ -251,26 +251,36 @@ * old (or future) date string (i.e. "Oct 27 1996"). */ void -LsDate(char *dstr, time_t ts) +LsDate(char *dstr, size_t dsiz, time_t ts) { struct tm t; if (ts == kModTimeUnknown) { - (void) strcpy(dstr, " "); + (void) Strncpy(dstr, " ", dsiz); return; } if (Localtime(ts, &t) == NULL) { - (void) strcpy(dstr, "Jan 0 1900"); + (void) Strncpy(dstr, "Jan 0 1900", dsiz); return; } if ((ts > gNowPlus1Hr) || (ts < gNowMinus6Mon)) { - (void) sprintf(dstr, "%s %2d %4d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %4d", gLsMon[t.tm_mon], t.tm_mday, t.tm_year + 1900 ); } else { - (void) sprintf(dstr, "%s %2d %02d:%02d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %02d:%02d", gLsMon[t.tm_mon], t.tm_mday, t.tm_hour, @@ -292,7 +302,7 @@ char fTail[2]; int fType; const char *l1, *l2; - char datestr[16]; + char datestr[32]; char sizestr[32]; char plugspec[16]; char plugstr[64]; @@ -353,7 +363,7 @@ l2 = ""; } - LsDate(datestr, diritemp->mdtm); + LsDate(datestr, sizeof(datestr), diritemp->mdtm); if (diritemp->size == kSizeUnknown) { *sizestr = '\0'; diff -u -r ncftp-3.1.9/ncftp/ls.h ncftp-3.1.9.fix/ncftp/ls.h --- ncftp-3.1.9/ncftp/ls.h Tue Jan 6 15:39:45 2004 +++ ncftp-3.1.9.fix/ncftp/ls.h Wed May 10 15:38:54 2006 @@ -22,7 +22,7 @@ void InitLs(void); void FlushLsCache(void); int LsCacheLookup(const char *const); -void LsDate(char *, time_t); +void LsDate(char *, size_t, time_t); void LsL(FTPFileInfoListPtr, int, int, FILE *); void Ls1(FTPFileInfoListPtr, int, FILE *); void Ls(const char *const, int, const char *const, FILE *); Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ncftp.spec 6 Mar 2006 15:22:30 -0000 1.7 +++ ncftp.spec 12 May 2006 11:15:21 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Improved console FTP client Name: ncftp Version: 3.1.9 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet @@ -15,6 +15,7 @@ Patch6: ncftp-3.1.5-ncursesw.patch Patch7: ncftp-3.1.6-rh1.patch Patch8: ncftp-3.1.8-epsv.patch +Patch9: ncftp-3.1.9-dirlist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ncurses-devel @@ -34,6 +35,7 @@ %patch6 -p1 -b .ncursesw #patch7 -p1 -b .ask_save %patch8 -p1 -b .epsv +%patch9 -p1 -b .dirlist %build @@ -71,6 +73,10 @@ %changelog +* Fri May 12 2006 Matthias Saou 2:3.1.9-4 +- Include dirlist patch from Mike Gleason to fix bug #187605 reported by + Lauri Nurmi when using fi_FI.UTF-8 locale. + * Mon Mar 6 2006 Matthias Saou 2:3.1.9-3 - FC5 rebuild. From fedora-extras-commits at redhat.com Fri May 12 11:15:15 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 12 May 2006 04:15:15 -0700 Subject: rpms/ncftp/FC-4 ncftp-3.1.9-dirlist.patch, NONE, 1.1 ncftp.spec, 1.5, 1.6 Message-ID: <200605121115.k4CBFlPd015651@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15590/FC-4 Modified Files: ncftp.spec Added Files: ncftp-3.1.9-dirlist.patch Log Message: Fix directory listing crash (#187605). ncftp-3.1.9-dirlist.patch: --- NEW FILE ncftp-3.1.9-dirlist.patch --- diff -u -r ncftp-3.1.9/ncftp/ls.c ncftp-3.1.9.fix/ncftp/ls.c --- ncftp-3.1.9/ncftp/ls.c Sat Jan 1 15:23:38 2005 +++ ncftp-3.1.9.fix/ncftp/ls.c Wed May 10 15:39:23 2006 @@ -53,13 +53,13 @@ struct tm lt; int i; + memset(gLsMon, 0, sizeof(gLsMon)); (void) Localtime(0, <); lt.tm_mday = 15; lt.tm_hour = 12; for (i=0; i<12; i++) { lt.tm_mon = i; - (void) strftime(gLsMon[i], sizeof(gLsMon[i]), "%b", <); - gLsMon[i][sizeof(gLsMon[i]) - 1] = '\0'; + (void) strftime(gLsMon[i], sizeof(gLsMon[i]) - 1, "%b", <); } (void) strcpy(gLsMon[i], "BUG"); } /* InitLsMonths */ @@ -251,26 +251,36 @@ * old (or future) date string (i.e. "Oct 27 1996"). */ void -LsDate(char *dstr, time_t ts) +LsDate(char *dstr, size_t dsiz, time_t ts) { struct tm t; if (ts == kModTimeUnknown) { - (void) strcpy(dstr, " "); + (void) Strncpy(dstr, " ", dsiz); return; } if (Localtime(ts, &t) == NULL) { - (void) strcpy(dstr, "Jan 0 1900"); + (void) Strncpy(dstr, "Jan 0 1900", dsiz); return; } if ((ts > gNowPlus1Hr) || (ts < gNowMinus6Mon)) { - (void) sprintf(dstr, "%s %2d %4d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %4d", gLsMon[t.tm_mon], t.tm_mday, t.tm_year + 1900 ); } else { - (void) sprintf(dstr, "%s %2d %02d:%02d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %02d:%02d", gLsMon[t.tm_mon], t.tm_mday, t.tm_hour, @@ -292,7 +302,7 @@ char fTail[2]; int fType; const char *l1, *l2; - char datestr[16]; + char datestr[32]; char sizestr[32]; char plugspec[16]; char plugstr[64]; @@ -353,7 +363,7 @@ l2 = ""; } - LsDate(datestr, diritemp->mdtm); + LsDate(datestr, sizeof(datestr), diritemp->mdtm); if (diritemp->size == kSizeUnknown) { *sizestr = '\0'; diff -u -r ncftp-3.1.9/ncftp/ls.h ncftp-3.1.9.fix/ncftp/ls.h --- ncftp-3.1.9/ncftp/ls.h Tue Jan 6 15:39:45 2004 +++ ncftp-3.1.9.fix/ncftp/ls.h Wed May 10 15:38:54 2006 @@ -22,7 +22,7 @@ void InitLs(void); void FlushLsCache(void); int LsCacheLookup(const char *const); -void LsDate(char *, time_t); +void LsDate(char *, size_t, time_t); void LsL(FTPFileInfoListPtr, int, int, FILE *); void Ls1(FTPFileInfoListPtr, int, FILE *); void Ls(const char *const, int, const char *const, FILE *); Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/FC-4/ncftp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ncftp.spec 2 May 2005 18:56:41 -0000 1.5 +++ ncftp.spec 12 May 2006 11:15:15 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Improved console FTP client Name: ncftp Version: 3.1.9 -Release: 1 +Release: 4%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet @@ -15,6 +15,7 @@ Patch6: ncftp-3.1.5-ncursesw.patch Patch7: ncftp-3.1.6-rh1.patch Patch8: ncftp-3.1.8-epsv.patch +Patch9: ncftp-3.1.9-dirlist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ncurses-devel @@ -34,22 +35,23 @@ %patch6 -p1 -b .ncursesw #patch7 -p1 -b .ask_save %patch8 -p1 -b .epsv +%patch9 -p1 -b .dirlist %build %configure --enable-signals --enable-ipv6 -make STRIPFLAG="" -rm -f README.v6.ipv6 +%{__make} STRIPFLAG="" +%{__rm} -f README.v6.ipv6 %install -rm -rf %{buildroot} -mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1} +%{__rm} -rf %{buildroot} +%{__mkdir_p} %{buildroot}{%{_bindir},%{_mandir}/man1} %makeinstall BINDIR=%{buildroot}%{_bindir} %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %files @@ -71,6 +73,16 @@ %changelog +* Fri May 12 2006 Matthias Saou 2:3.1.9-4 +- Include dirlist patch from Mike Gleason to fix bug #187605 reported by + Lauri Nurmi when using fi_FI.UTF-8 locale. + +* Mon Mar 6 2006 Matthias Saou 2:3.1.9-3 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 2:3.1.9-2 +- Rebuild for new gcc/glibc. + * Thu Apr 21 2005 Matthias Saou 2:3.1.9-1 - Update to 3.1.9. - Update IPv6 KAME patch to ncftp-319-v6-20050419.diff. From fedora-extras-commits at redhat.com Fri May 12 11:15:16 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 12 May 2006 04:15:16 -0700 Subject: rpms/ncftp/FC-5 ncftp-3.1.9-dirlist.patch, NONE, 1.1 ncftp.spec, 1.7, 1.8 Message-ID: <200605121115.k4CBFmEJ015654@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15590/FC-5 Modified Files: ncftp.spec Added Files: ncftp-3.1.9-dirlist.patch Log Message: Fix directory listing crash (#187605). ncftp-3.1.9-dirlist.patch: --- NEW FILE ncftp-3.1.9-dirlist.patch --- diff -u -r ncftp-3.1.9/ncftp/ls.c ncftp-3.1.9.fix/ncftp/ls.c --- ncftp-3.1.9/ncftp/ls.c Sat Jan 1 15:23:38 2005 +++ ncftp-3.1.9.fix/ncftp/ls.c Wed May 10 15:39:23 2006 @@ -53,13 +53,13 @@ struct tm lt; int i; + memset(gLsMon, 0, sizeof(gLsMon)); (void) Localtime(0, <); lt.tm_mday = 15; lt.tm_hour = 12; for (i=0; i<12; i++) { lt.tm_mon = i; - (void) strftime(gLsMon[i], sizeof(gLsMon[i]), "%b", <); - gLsMon[i][sizeof(gLsMon[i]) - 1] = '\0'; + (void) strftime(gLsMon[i], sizeof(gLsMon[i]) - 1, "%b", <); } (void) strcpy(gLsMon[i], "BUG"); } /* InitLsMonths */ @@ -251,26 +251,36 @@ * old (or future) date string (i.e. "Oct 27 1996"). */ void -LsDate(char *dstr, time_t ts) +LsDate(char *dstr, size_t dsiz, time_t ts) { struct tm t; if (ts == kModTimeUnknown) { - (void) strcpy(dstr, " "); + (void) Strncpy(dstr, " ", dsiz); return; } if (Localtime(ts, &t) == NULL) { - (void) strcpy(dstr, "Jan 0 1900"); + (void) Strncpy(dstr, "Jan 0 1900", dsiz); return; } if ((ts > gNowPlus1Hr) || (ts < gNowMinus6Mon)) { - (void) sprintf(dstr, "%s %2d %4d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %4d", gLsMon[t.tm_mon], t.tm_mday, t.tm_year + 1900 ); } else { - (void) sprintf(dstr, "%s %2d %02d:%02d", +#ifdef HAVE_SNPRINTF + (void) snprintf(dstr, dsiz, +#else + (void) sprintf(dstr, +#endif + "%s %2d %02d:%02d", gLsMon[t.tm_mon], t.tm_mday, t.tm_hour, @@ -292,7 +302,7 @@ char fTail[2]; int fType; const char *l1, *l2; - char datestr[16]; + char datestr[32]; char sizestr[32]; char plugspec[16]; char plugstr[64]; @@ -353,7 +363,7 @@ l2 = ""; } - LsDate(datestr, diritemp->mdtm); + LsDate(datestr, sizeof(datestr), diritemp->mdtm); if (diritemp->size == kSizeUnknown) { *sizestr = '\0'; diff -u -r ncftp-3.1.9/ncftp/ls.h ncftp-3.1.9.fix/ncftp/ls.h --- ncftp-3.1.9/ncftp/ls.h Tue Jan 6 15:39:45 2004 +++ ncftp-3.1.9.fix/ncftp/ls.h Wed May 10 15:38:54 2006 @@ -22,7 +22,7 @@ void InitLs(void); void FlushLsCache(void); int LsCacheLookup(const char *const); -void LsDate(char *, time_t); +void LsDate(char *, size_t, time_t); void LsL(FTPFileInfoListPtr, int, int, FILE *); void Ls1(FTPFileInfoListPtr, int, FILE *); void Ls(const char *const, int, const char *const, FILE *); Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/FC-5/ncftp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ncftp.spec 6 Mar 2006 15:22:30 -0000 1.7 +++ ncftp.spec 12 May 2006 11:15:16 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Improved console FTP client Name: ncftp Version: 3.1.9 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet @@ -15,6 +15,7 @@ Patch6: ncftp-3.1.5-ncursesw.patch Patch7: ncftp-3.1.6-rh1.patch Patch8: ncftp-3.1.8-epsv.patch +Patch9: ncftp-3.1.9-dirlist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: ncurses-devel @@ -34,6 +35,7 @@ %patch6 -p1 -b .ncursesw #patch7 -p1 -b .ask_save %patch8 -p1 -b .epsv +%patch9 -p1 -b .dirlist %build @@ -71,6 +73,10 @@ %changelog +* Fri May 12 2006 Matthias Saou 2:3.1.9-4 +- Include dirlist patch from Mike Gleason to fix bug #187605 reported by + Lauri Nurmi when using fi_FI.UTF-8 locale. + * Mon Mar 6 2006 Matthias Saou 2:3.1.9-3 - FC5 rebuild. From fedora-extras-commits at redhat.com Fri May 12 12:54:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 05:54:15 -0700 Subject: rpms/perl-Test-SubCalls/FC-5 .cvsignore, 1.2, 1.3 perl-Test-SubCalls.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605121254.k4CCsHi3020779@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-SubCalls/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20742/FC-5 Modified Files: .cvsignore perl-Test-SubCalls.spec sources Log Message: Update to 1.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2006 15:35:17 -0000 1.2 +++ .cvsignore 12 May 2006 12:54:15 -0000 1.3 @@ -1 +1 @@ -Test-SubCalls-0.05.tar.gz +Test-SubCalls-1.06.tar.gz Index: perl-Test-SubCalls.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/FC-5/perl-Test-SubCalls.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-SubCalls.spec 25 Apr 2006 15:35:17 -0000 1.1 +++ perl-Test-SubCalls.spec 12 May 2006 12:54:15 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-SubCalls -Version: 0.05 +Version: 1.06 Release: 1%{?dist} Summary: Track the number of times subs are called @@ -55,5 +55,8 @@ %changelog +* Fri May 12 2006 Jose Pedro Oliveira - 1.06-1 +- Update to 1.06. + * Tue Apr 25 2006 Jose Pedro Oliveira - 0.05-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 15:35:17 -0000 1.2 +++ sources 12 May 2006 12:54:15 -0000 1.3 @@ -1 +1 @@ -23ae21fea8a30477aba508b4a6f785b5 Test-SubCalls-0.05.tar.gz +207801b2f5b109cfe804289f066ba896 Test-SubCalls-1.06.tar.gz From fedora-extras-commits at redhat.com Fri May 12 12:54:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 05:54:16 -0700 Subject: rpms/perl-Test-SubCalls/devel .cvsignore, 1.2, 1.3 perl-Test-SubCalls.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605121254.k4CCsImV020785@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-SubCalls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20742/devel Modified Files: .cvsignore perl-Test-SubCalls.spec sources Log Message: Update to 1.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2006 15:35:17 -0000 1.2 +++ .cvsignore 12 May 2006 12:54:16 -0000 1.3 @@ -1 +1 @@ -Test-SubCalls-0.05.tar.gz +Test-SubCalls-1.06.tar.gz Index: perl-Test-SubCalls.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/perl-Test-SubCalls.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-SubCalls.spec 25 Apr 2006 15:35:17 -0000 1.1 +++ perl-Test-SubCalls.spec 12 May 2006 12:54:16 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-SubCalls -Version: 0.05 +Version: 1.06 Release: 1%{?dist} Summary: Track the number of times subs are called @@ -55,5 +55,8 @@ %changelog +* Fri May 12 2006 Jose Pedro Oliveira - 1.06-1 +- Update to 1.06. + * Tue Apr 25 2006 Jose Pedro Oliveira - 0.05-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2006 15:35:17 -0000 1.2 +++ sources 12 May 2006 12:54:16 -0000 1.3 @@ -1 +1 @@ -23ae21fea8a30477aba508b4a6f785b5 Test-SubCalls-0.05.tar.gz +207801b2f5b109cfe804289f066ba896 Test-SubCalls-1.06.tar.gz From fedora-extras-commits at redhat.com Fri May 12 13:42:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 12 May 2006 06:42:21 -0700 Subject: owners owners.list,1.978,1.979 Message-ID: <200605121342.k4CDgNlq023327@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23310 Modified Files: owners.list Log Message: add gtk+ Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.978 retrieving revision 1.979 diff -u -r1.978 -r1.979 --- owners.list 11 May 2006 23:01:52 -0000 1.978 +++ owners.list 12 May 2006 13:42:21 -0000 1.979 @@ -443,6 +443,7 @@ Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org| +Fedora Extras|gtk+|The GIMP ToolKit|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 12 14:03:50 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Fri, 12 May 2006 07:03:50 -0700 Subject: rpms/par2cmdline/FC-5 par2cmdline.spec,1.3,1.4 Message-ID: <200605121403.k4CE3q7N025661@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25615/FC-5 Modified Files: par2cmdline.spec Log Message: s/%/%%/ in %changelog Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/FC-5/par2cmdline.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- par2cmdline.spec 10 May 2006 15:13:39 -0000 1.3 +++ par2cmdline.spec 12 May 2006 14:03:50 -0000 1.4 @@ -1,7 +1,7 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Laurent Rineau - 0.4-10 +- New %%changelog. Quote percent signs. + * Wed May 10 2006 Laurent Rineau - 0.4-9 - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 @@ -59,12 +62,12 @@ * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. -- Add %check section +- Add %%check section * Thu Apr 27 2006 Laurent Rineau - 0.4-6 -- chmod 644 several files, in %build +- chmod 644 several files, in %%build - fix the Source: tag. -- new %description +- new %%description - changed the buildroot to the one recommanded for Fedora Extras * Wed Apr 12 2006 Laurent Rineau - 0.4-5 @@ -76,7 +79,7 @@ * Tue Apr 11 2006 Laurent Rineau - 0.4-3 - updated for Fedora Core 4 - obsolete parchive 1.1.4 -- provides parchive = 1.1.4.0.par2.%{version} +- provides parchive = 1.1.4.0.par2.%%{version} * Tue May 11 2004 - Thibaut Cousin - updated to version 0.4 for SUSE 9.1 From fedora-extras-commits at redhat.com Fri May 12 14:03:51 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Fri, 12 May 2006 07:03:51 -0700 Subject: rpms/par2cmdline/devel par2cmdline.spec,1.3,1.4 Message-ID: <200605121403.k4CE3rHo025665@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25615/devel Modified Files: par2cmdline.spec Log Message: s/%/%%/ in %changelog Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/devel/par2cmdline.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- par2cmdline.spec 10 May 2006 15:13:45 -0000 1.3 +++ par2cmdline.spec 12 May 2006 14:03:50 -0000 1.4 @@ -1,7 +1,7 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Laurent Rineau - 0.4-10 +- New %%changelog. Quote percent signs. + * Wed May 10 2006 Laurent Rineau - 0.4-9 - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 @@ -59,12 +62,12 @@ * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. -- Add %check section +- Add %%check section * Thu Apr 27 2006 Laurent Rineau - 0.4-6 -- chmod 644 several files, in %build +- chmod 644 several files, in %%build - fix the Source: tag. -- new %description +- new %%description - changed the buildroot to the one recommanded for Fedora Extras * Wed Apr 12 2006 Laurent Rineau - 0.4-5 @@ -76,7 +79,7 @@ * Tue Apr 11 2006 Laurent Rineau - 0.4-3 - updated for Fedora Core 4 - obsolete parchive 1.1.4 -- provides parchive = 1.1.4.0.par2.%{version} +- provides parchive = 1.1.4.0.par2.%%{version} * Tue May 11 2004 - Thibaut Cousin - updated to version 0.4 for SUSE 9.1 From fedora-extras-commits at redhat.com Fri May 12 14:03:49 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Fri, 12 May 2006 07:03:49 -0700 Subject: rpms/par2cmdline/FC-4 par2cmdline.spec,1.3,1.4 Message-ID: <200605121404.k4CE4LFA025668@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/par2cmdline/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25615/FC-4 Modified Files: par2cmdline.spec Log Message: s/%/%%/ in %changelog Index: par2cmdline.spec =================================================================== RCS file: /cvs/extras/rpms/par2cmdline/FC-4/par2cmdline.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- par2cmdline.spec 10 May 2006 15:13:39 -0000 1.3 +++ par2cmdline.spec 12 May 2006 14:03:49 -0000 1.4 @@ -1,7 +1,7 @@ Summary: PAR 2.0 compatible file verification and repair tool Name: par2cmdline Version: 0.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Archiving Source: http://dl.sourceforge.net/parchive/%{name}-%{version}.tar.gz @@ -50,6 +50,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Laurent Rineau - 0.4-10 +- New %%changelog. Quote percent signs. + * Wed May 10 2006 Laurent Rineau - 0.4-9 - Remove PORTING and ROADMAP from doc files. - Patch2: Remove explicit linking with -lstdc++ in Makefile.am, what required to call aclocal-1.9 and automake-1.9 @@ -59,12 +62,12 @@ * Fri Apr 28 2006 Laurent Rineau - 0.4-7 - Change the description. Thanks to Jason Tibbitts (tibbs at math.uh.edu) for his help. -- Add %check section +- Add %%check section * Thu Apr 27 2006 Laurent Rineau - 0.4-6 -- chmod 644 several files, in %build +- chmod 644 several files, in %%build - fix the Source: tag. -- new %description +- new %%description - changed the buildroot to the one recommanded for Fedora Extras * Wed Apr 12 2006 Laurent Rineau - 0.4-5 @@ -76,7 +79,7 @@ * Tue Apr 11 2006 Laurent Rineau - 0.4-3 - updated for Fedora Core 4 - obsolete parchive 1.1.4 -- provides parchive = 1.1.4.0.par2.%{version} +- provides parchive = 1.1.4.0.par2.%%{version} * Tue May 11 2004 - Thibaut Cousin - updated to version 0.4 for SUSE 9.1 From fedora-extras-commits at redhat.com Fri May 12 14:14:53 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 07:14:53 -0700 Subject: rpms/glpk/devel .cvsignore, 1.3, 1.4 glpk.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605121414.k4CEEthV026332@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26311 Modified Files: .cvsignore glpk.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 20:07:24 -0000 1.3 +++ .cvsignore 12 May 2006 14:14:52 -0000 1.4 @@ -1 +1 @@ -glpk-4.9.tar.gz +glpk-4.10.tar.gz Index: glpk.spec =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glpk.spec 14 Feb 2006 20:25:59 -0000 1.5 +++ glpk.spec 12 May 2006 14:14:52 -0000 1.6 @@ -1,6 +1,6 @@ Name: glpk -Version: 4.9 -Release: 2%{?dist} +Version: 4.10 +Release: 1%{?dist} Summary: GNU Linear Programming Kit Group: System Environment/Libraries @@ -86,6 +86,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Quentin Spencer 4.10-1 +- New release. + * Tue Feb 14 2006 Quentin Spencer 4.9-2 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 20:07:24 -0000 1.3 +++ sources 12 May 2006 14:14:52 -0000 1.4 @@ -1 +1 @@ -e1aecaf58adaaf155d178a95e46f8d77 glpk-4.9.tar.gz +a1ae21f2ddf2f71aa1af9385ebfd7b74 glpk-4.10.tar.gz From fedora-extras-commits at redhat.com Fri May 12 14:17:36 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 07:17:36 -0700 Subject: rpms/glpk/FC-5 .cvsignore, 1.3, 1.4 glpk.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605121417.k4CEHcLX026451@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26430 Modified Files: .cvsignore glpk.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 20:07:24 -0000 1.3 +++ .cvsignore 12 May 2006 14:17:36 -0000 1.4 @@ -1 +1 @@ -glpk-4.9.tar.gz +glpk-4.10.tar.gz Index: glpk.spec =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-5/glpk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glpk.spec 14 Feb 2006 20:25:59 -0000 1.5 +++ glpk.spec 12 May 2006 14:17:36 -0000 1.6 @@ -1,6 +1,6 @@ Name: glpk -Version: 4.9 -Release: 2%{?dist} +Version: 4.10 +Release: 1%{?dist} Summary: GNU Linear Programming Kit Group: System Environment/Libraries @@ -86,6 +86,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Quentin Spencer 4.10-1 +- New release. + * Tue Feb 14 2006 Quentin Spencer 4.9-2 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 20:07:24 -0000 1.3 +++ sources 12 May 2006 14:17:36 -0000 1.4 @@ -1 +1 @@ -e1aecaf58adaaf155d178a95e46f8d77 glpk-4.9.tar.gz +a1ae21f2ddf2f71aa1af9385ebfd7b74 glpk-4.10.tar.gz From fedora-extras-commits at redhat.com Fri May 12 14:25:49 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 07:25:49 -0700 Subject: rpms/glpk/FC-4 .cvsignore, 1.3, 1.4 glpk.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605121425.k4CEPpi7026553@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532 Modified Files: .cvsignore glpk.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 20:12:40 -0000 1.3 +++ .cvsignore 12 May 2006 14:25:49 -0000 1.4 @@ -1 +1 @@ -glpk-4.9.tar.gz +glpk-4.10.tar.gz Index: glpk.spec =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-4/glpk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glpk.spec 14 Feb 2006 20:22:44 -0000 1.5 +++ glpk.spec 12 May 2006 14:25:49 -0000 1.6 @@ -1,5 +1,5 @@ Name: glpk -Version: 4.9 +Version: 4.10 Release: 1%{?dist} Summary: GNU Linear Programming Kit @@ -86,6 +86,9 @@ %{_bindir}/* %changelog +* Fri May 12 2006 Quentin Spencer 4.10-1 +- New release. + * Tue Feb 14 2006 Quentin Spencer 4.9-1 - New release. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpk/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 20:12:40 -0000 1.3 +++ sources 12 May 2006 14:25:49 -0000 1.4 @@ -1 +1 @@ -e1aecaf58adaaf155d178a95e46f8d77 glpk-4.9.tar.gz +a1ae21f2ddf2f71aa1af9385ebfd7b74 glpk-4.10.tar.gz From fedora-extras-commits at redhat.com Fri May 12 14:35:02 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 12 May 2006 07:35:02 -0700 Subject: rpms/azureus/devel azureus-MessageSlideShell-swt-3.1.patch, NONE, 1.1 azureus-nativetabs.patch, NONE, 1.1 azureus-no-update-manager-MainStatusBar.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 azureus-no-install-remove-plugins.patch, 1.1, 1.2 azureus-no-update-manager-AzureusCoreImpl.patch, 1.1, 1.2 azureus-no-update-manager-CoreUpdateChecker.patch, 1.1, 1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.1, 1.2 azureus-themed.patch, 1.2, 1.3 azureus.spec, 1.19, 1.20 sources, 1.4, 1.5 Message-ID: <200605121435.k4CEZ59k026772@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26710 Modified Files: .cvsignore azureus-no-install-remove-plugins.patch azureus-no-update-manager-AzureusCoreImpl.patch azureus-no-update-manager-CoreUpdateChecker.patch azureus-no-update-manager-UpdateMonitor.patch azureus-themed.patch azureus.spec sources Added Files: azureus-MessageSlideShell-swt-3.1.patch azureus-nativetabs.patch azureus-no-update-manager-MainStatusBar.patch Log Message: Sync with newer FC5 version. azureus-MessageSlideShell-swt-3.1.patch: --- NEW FILE azureus-MessageSlideShell-swt-3.1.patch --- --- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~ 2006-03-20 23:10:27.000000000 -0800 +++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-03-25 17:30:47.000000000 -0800 @@ -269,13 +269,7 @@ // Create shell & widgets shell = new Shell(display, SWT.ON_TOP); - if (USE_SWT32_BG_SET) { - try { - shell.setBackgroundMode(SWT.INHERIT_DEFAULT); - } catch (NoSuchMethodError e) { - // Ignore - } - } + Utils.setShellIcon(shell); shell.setText(popupParams.title); @@ -507,13 +501,6 @@ gc.dispose(); boolean bAlternateDrawing = true; - if (USE_SWT32_BG_SET) { - try { - shell.setBackgroundImage(imgBackground); - bAlternateDrawing = false; - } catch (NoSuchMethodError e) { - } - } if (bAlternateDrawing) { // Drawing of BG Image for pre SWT 3.2 azureus-nativetabs.patch: --- NEW FILE azureus-nativetabs.patch --- --- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-04-17 16:00:58.000000000 +0200 +++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-04-17 16:01:21.000000000 +0200 @@ -78,8 +78,8 @@ cLook.setLayout(layout); BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab", - true, MSG_PREFIX + "useCustomTabs"); - Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true, + false, MSG_PREFIX + "useCustomTabs"); + Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false, MSG_PREFIX + "useFancyTabs").getControl(); Control[] controls = { cFancyTab }; --- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig 2006-04-17 17:25:18.000000000 +0200 +++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-04-17 17:26:19.000000000 +0200 @@ -154,7 +154,7 @@ def.put("User Mode", new Long(0)); - def.put("useCustomTab",TRUE); + def.put("useCustomTab",FALSE); def.put("GUI Refresh",new Long(1000)); def.put("Graphics Update",new Long(4)); def.put("ReOrder Delay",new Long(0)); @@ -167,7 +167,7 @@ def.put("Use default data dir", FALSE); def.put("Default save path", "" ); - def.put("GUI_SWT_bFancyTab", TRUE); + def.put("GUI_SWT_bFancyTab", FALSE); def.put("GUI_SWT_bAlternateTablePainting", FALSE); def.put("update.start",TRUE); def.put("update.periodic",TRUE); azureus-no-update-manager-MainStatusBar.patch: --- NEW FILE azureus-no-update-manager-MainStatusBar.patch --- --- org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java.~1.1.~ 2006-03-20 23:21:17.000000000 -0800 +++ org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java 2006-03-25 18:13:47.000000000 -0800 @@ -544,8 +544,6 @@ }); statusDown.setMenu(menuDownSpeed); - addUpdateListener(); - return statusBar; } @@ -619,16 +617,6 @@ } } - private void addUpdateListener() { - azureusCore.getPluginManager().getDefaultPluginInterface() - .getUpdateManager().addListener(new UpdateManagerListener() { - public void checkInstanceCreated(UpdateCheckInstance instance) { - - new updateStatusChanger(instance); - } - }); - } - protected class updateStatusChanger { UpdateCheckInstance instance; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Feb 2006 17:00:46 -0000 1.4 +++ .cvsignore 12 May 2006 14:35:02 -0000 1.5 @@ -1,3 +1,3 @@ +azureus2-cvs-20060325.tar.gz azplugins_1.8.8.jar -azureus2-cvs-20060209.tar.gz bdcc_2.2.2.zip azureus-no-install-remove-plugins.patch: Index: azureus-no-install-remove-plugins.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-install-remove-plugins.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-install-remove-plugins.patch 9 Feb 2006 08:45:07 -0000 1.1 +++ azureus-no-install-remove-plugins.patch 12 May 2006 14:35:02 -0000 1.2 @@ -1,8 +1,8 @@ ---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.~1.58.~ 2006-01-31 14:43:47.000000000 -0500 -+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-02-09 00:05:11.000000000 -0500 +--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-03-28 04:35:35.000000000 -0800 ++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-03-28 04:41:30.000000000 -0800 @@ -347,26 +347,6 @@ - menu_plugin.setMenu(pluginMenu); - if(notMainWindow) {performOneTimeDisable(menu_plugin, true);} + menu_plugin_logViews.setMenu(pluginLogsMenu); + menu_plugin_logViews.setData("EOL", "1"); - new MenuItem(pluginMenu, SWT.SEPARATOR); - @@ -38,7 +38,7 @@ - help_checkupdate.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - mainWindow.getShell().setFocus(); -- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(); +- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true); - } - }); - } azureus-no-update-manager-AzureusCoreImpl.patch: Index: azureus-no-update-manager-AzureusCoreImpl.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-AzureusCoreImpl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-AzureusCoreImpl.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-AzureusCoreImpl.patch 12 May 2006 14:35:02 -0000 1.2 @@ -1,6 +1,6 @@ ---- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig 2006-02-09 23:23:01.000000000 -0500 -+++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java 2006-02-09 23:23:19.000000000 -0500 -@@ -391,13 +391,6 @@ +--- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig 2006-03-25 14:17:49.000000000 -0800 ++++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java 2006-03-25 15:14:01.000000000 -0800 +@@ -584,14 +584,6 @@ if (Logger.isEnabled()) Logger.log(new LogEvent(LOGID, "Stop operation completes")); @@ -11,6 +11,7 @@ - - AzureusRestarterFactory.create( this ).restart( true ); - } - }finally{ - - stopping_sem.releaseForever(); +- + try{ + ThreadGroup tg = Thread.currentThread().getThreadGroup(); + azureus-no-update-manager-CoreUpdateChecker.patch: Index: azureus-no-update-manager-CoreUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-CoreUpdateChecker.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-CoreUpdateChecker.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-CoreUpdateChecker.patch 12 May 2006 14:35:02 -0000 1.2 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-02-09 23:27:55.000000000 -0500 -+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-02-09 23:28:47.000000000 -0500 -@@ -124,8 +124,6 @@ +--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-03-25 14:18:45.000000000 -0800 ++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-03-25 17:19:32.000000000 -0800 +@@ -122,8 +122,6 @@ props.setProperty( "plugin.version", plugin_interface.getAzureusVersion()); rdf = plugin_interface.getUtilities().getResourceDownloaderFactory(); @@ -9,7 +9,7 @@ } public String -@@ -144,178 +142,9 @@ +@@ -142,155 +140,9 @@ checkForUpdate( final UpdateChecker checker ) { @@ -17,15 +17,7 @@ - String current_version = plugin_interface.getAzureusVersion(); - - log.log( "Update check starts: current = " + current_version ); -- -- boolean TESTING = false; // !!!!TODO: REMOVE THIS -- -- if ( TESTING ){ -- -- System.out.println( "CoreUpdater: !!!! Testing mode !!!!" ); -- -- } -- +- - Map decoded = VersionCheckClient.getSingleton().getVersionCheckInfo( - first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC); - @@ -61,26 +53,11 @@ - - log.log( msg ); - -- boolean latest_is_cvs = Constants.isCVSVersion( latest_version ); -- String latest_base = Constants.getBaseVersion( latest_version ); -- -- String current_base = Constants.getBaseVersion(); -- -- // currently we upgrade from, for example -- // 1) 2.0.8.4 -> 2.0.8.6 -- // 2) 2.0.8.5_CVS -> 2.0.8.6 -- // but not to a CVS version (also currently never reported as latest...) -- -- if ( latest_is_cvs && !TESTING ){ +- if ( !shouldUpdate( current_version, latest_version )){ - - return; - } -- -- if ( Constants.compareVersions( current_base, latest_base ) >= 0 && !TESTING){ - -- return; -- } -- - final String f_latest_version = latest_version; - final String f_latest_file_name = latest_file_name; - azureus-no-update-manager-UpdateMonitor.patch: Index: azureus-no-update-manager-UpdateMonitor.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-UpdateMonitor.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-UpdateMonitor.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-UpdateMonitor.patch 12 May 2006 14:35:02 -0000 1.2 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-02-09 23:25:26.000000000 -0500 -+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-02-09 23:26:30.000000000 -0500 -@@ -87,147 +87,18 @@ +--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-03-28 04:35:36.000000000 -0800 ++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-03-28 04:44:37.000000000 -0800 +@@ -88,149 +88,19 @@ { azureus_core = _azureus_core; @@ -49,12 +49,14 @@ { - boolean check_at_start = false; - boolean check_periodic = false; +- boolean bOldSWT = SWT.getVersion() < 3139; - - // no update checks for java web start - - if ( !SystemProperties.isJavaWebStartInstance()){ - -- check_at_start = COConfigurationManager.getBooleanParameter( "update.start", true ); +- // force check when SWT is really old +- check_at_start = COConfigurationManager.getBooleanParameter( "update.start", true ) || bOldSWT; - check_periodic = COConfigurationManager.getBooleanParameter( "update.periodic", true ); - } - @@ -65,7 +67,7 @@ - if ( ( check_at_start && start_of_day) || - ( check_periodic && !start_of_day )){ - -- performCheck(); // this will implicitly do usage stats +- performCheck(bOldSWT); // this will implicitly do usage stats - - }else{ - @@ -84,10 +86,11 @@ - } - }); - } ++ } public void - performCheck() + performCheck(final boolean bForce) { - if ( SystemProperties.isJavaWebStartInstance()){ - @@ -135,7 +138,7 @@ - - current_update_instance = - um.createUpdateCheckInstance( -- UpdateCheckInstance.UCI_UPDATE, +- bForce ? UpdateCheckInstance.UCI_INSTALL : UpdateCheckInstance.UCI_UPDATE, - "update.instance.update" ); - - current_update_instance.start(); azureus-themed.patch: Index: azureus-themed.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-themed.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-themed.patch 9 Feb 2006 08:45:07 -0000 1.2 +++ azureus-themed.patch 12 May 2006 14:35:02 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/ImageRepository.java~ 2006-01-25 20:28:17.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-01-25 20:28:27.000000000 -0800 -@@ -16,6 +16,8 @@ +--- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-22 17:48:33.000000000 +0200 ++++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java 2006-04-22 17:50:33.000000000 +0200 +@@ -32,6 +32,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; @@ -9,7 +9,7 @@ import java.util.*; /** -@@ -43,6 +45,25 @@ +@@ -59,6 +61,25 @@ loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash"); } @@ -22,9 +22,9 @@ + if (iconTheme == null) + iconTheme = org.gnu.gtk.IconTheme.getDefault(); + -+ return iconTheme.lookupIcon (name, 24, -+ org.gnu.gtk.IconLookupFlags.NO_SVG) -+ .getFilename(); ++ org.gnu.gtk.IconInfo icon = iconTheme.lookupIcon (name, 24, ++ org.gnu.gtk.IconLookupFlags.NO_SVG); ++ return icon != null ? icon.getFilename() : def; + } + catch (Exception ex) + { @@ -35,7 +35,7 @@ public static void loadImages(Display display) { loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32"); loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64"); -@@ -87,20 +108,44 @@ +@@ -103,20 +124,44 @@ //ToolBar Icons loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open"); @@ -92,7 +92,7 @@ //Status icons loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok"); -@@ -139,6 +184,16 @@ +@@ -157,6 +202,16 @@ Image im = getImage(name,false); if(null == im) { InputStream is = loader.getResourceAsStream(res); @@ -109,3 +109,10 @@ if(null != is) { try { if(alpha == 255) { +@@ -453,4 +508,4 @@ + + return key; + } +-} +\ Kein Zeilenumbruch am Dateiende. ++} Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- azureus.spec 14 Feb 2006 04:48:03 -0000 1.19 +++ azureus.spec 12 May 2006 14:35:02 -0000 1.20 @@ -1,49 +1,52 @@ -Name: azureus -Version: 2.4.0.0 -Release: 0.20060209cvs_1%{?dist} -Summary: A BitTorrent Client - -Group: Applications/Internet -License: GPL -URL: http://azureus.sourceforge.net +Name: azureus +Version: 2.4.0.3 +Release: 0.20060328cvs_5%{?dist} +Summary: A BitTorrent Client + +Group: Applications/Internet +License: GPL +URL: http://azureus.sourceforge.net # A cvs snapshot with the build and bouncycastle directories # removed. -Source0: azureus2-cvs-20060209.tar.gz +Source0: azureus2-cvs-20060325.tar.gz -Source1: azureus.script -Source2: Azureus.desktop -Source3: azureus.applications -Source4: azureus-License.txt -Source5: azureus-ChangeLog.txt +Source1: azureus.script +Source2: Azureus.desktop +Source3: azureus.applications +Source4: azureus-License.txt +Source5: azureus-ChangeLog.txt Source6: azplugins_1.8.8.jar Source7: bdcc_2.2.2.zip -Patch0: azureus-remove-win32-osx-platforms.patch -Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch -Patch2: azureus-cache-size.patch -Patch3: azureus-remove-manifest-classpath.patch -Patch4: azureus-ConfigSectionPlugins-swt-3.1.patch -Patch5: azureus-Messages-swt-3.1.patch -Patch6: azureus-TableView-swt-3.1.patch -Patch7: azureus-themed.patch -Patch8: azureus-rh-bugzilla-180418.patch -Patch9: azureus-no-shared-plugins.patch -Patch10: azureus-no-install-remove-plugins.patch -Patch11: azureus-no-restart.patch -Patch12: azureus-no-updates-PluginInitializer.patch -Patch13: azureus-no-updates-PluginInterfaceImpl.patch -Patch14: azureus-no-update-manager-AzureusCoreImpl.patch -Patch15: azureus-no-update-manager-CorePatchChecker.patch -Patch16: azureus-no-update-manager-CoreUpdateChecker.patch -Patch17: azureus-no-update-manager-MainWindow.patch -Patch18: azureus-no-update-manager-PluginInstallerImpl.patch -Patch19: azureus-no-update-manager-PluginUpdatePlugin.patch -Patch20: azureus-no-update-manager-SWTUpdateChecker.patch -#Patch21: azureus-no-update-manager-TableView.patch -Patch22: azureus-no-update-manager-UpdateMonitor.patch -Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch +Patch0: azureus-remove-win32-osx-platforms.patch +Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch +Patch2: azureus-cache-size.patch +Patch3: azureus-remove-manifest-classpath.patch +Patch4: azureus-ConfigSectionPlugins-swt-3.1.patch +Patch5: azureus-Messages-swt-3.1.patch +Patch6: azureus-TableView-swt-3.1.patch +Patch7: azureus-themed.patch +Patch8: azureus-rh-bugzilla-180418.patch +Patch9: azureus-no-shared-plugins.patch +Patch10: azureus-no-install-remove-plugins.patch +Patch11: azureus-no-restart.patch +Patch12: azureus-no-updates-PluginInitializer.patch +Patch13: azureus-no-updates-PluginInterfaceImpl.patch +Patch14: azureus-no-update-manager-AzureusCoreImpl.patch +Patch15: azureus-no-update-manager-CorePatchChecker.patch +Patch16: azureus-no-update-manager-CoreUpdateChecker.patch +Patch17: azureus-no-update-manager-MainWindow.patch +Patch18: azureus-no-update-manager-PluginInstallerImpl.patch +Patch19: azureus-no-update-manager-PluginUpdatePlugin.patch +Patch20: azureus-no-update-manager-SWTUpdateChecker.patch +#Patch21: azureus-no-update-manager-TableView.patch +Patch22: azureus-no-update-manager-UpdateMonitor.patch +Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch +Patch24: azureus-MessageSlideShell-swt-3.1.patch +Patch25: azureus-no-update-manager-MainStatusBar.patch +Patch26: azureus-nativetabs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,7 +77,7 @@ %patch4 -p0 %patch5 -p0 %patch6 -p0 -%patch7 -p0 +%patch7 -p1 %patch8 -p0 %patch9 -p0 %patch10 -p0 @@ -84,20 +87,23 @@ %patch14 -p0 %patch15 -p0 %patch16 -p0 -%patch17 -p0 +#%patch17 -p0 %patch18 -p0 %patch19 -p0 %patch20 -p0 #%patch21 -p0 %patch22 -p0 %patch23 -p0 +%patch24 -p0 +%patch25 -p0 +%patch26 -p1 cp %{SOURCE4} License.txt cp %{SOURCE5} ChangeLog.txt %build mkdir -p build/libs build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2 -ln -s /usr/share/java/gcj-endorsed/bcprov-131.jar build/libs +ln -s /usr/share/java/gcj-endorsed/bcprov-1.31.jar build/libs find ./ -name osx | xargs rm -r find ./ -name macosx | xargs rm -r find ./ -name [Ww]in32\* | xargs rm -r @@ -130,6 +136,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus +sed --in-place "s:/usr/lib:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins install -pm 644 plugins/azplugins/azplugins_1.8.8.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_1.8.8.jar @@ -199,6 +206,24 @@ %{_libdir}/gcj/* %changelog +* Mon Apr 24 2006 Anthony Green - 2.4.0.3-0.20060328cvs_5 +- Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and +an updated azureus-themed.patch to work around GCC PR 27271. + +* Thu Apr 06 2006 Anthony Green - 2.4.0.3-0.20060328cvs_4 +- Yet another correction to LD_LIBRARY_PATH. Bugzilla #186152. + +* Mon Apr 03 2006 Anthony Green - 2.4.0.3-0.20060328cvs_3 +- One more correction to LD_LIBRARY_PATH. Bugzilla #186152. + +* Sat Apr 01 2006 Anthony Green - 2.4.0.3-0.20060328cvs_2 +- Set LD_LIBRARY_PATH for Sun java alternative. Bugzilla #186152. +- Remove pushd/popd noise from startup script. + +* Tue Mar 28 2006 Anthony Green - 2.4.0.3-0.20060328cvs_1 +- Update sources. +- Fix bcprov jar file reference. + * Mon Feb 13 2006 Anthony Green - 2.4.0.0-0.20060207cvs_1 - Remove absolute path from azureus-no-updates-PluginInterfaceImpl.patch. Index: sources =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Feb 2006 17:00:46 -0000 1.4 +++ sources 12 May 2006 14:35:02 -0000 1.5 @@ -1,3 +1,3 @@ +a1827e2041841940c4ca16fdf240afac azureus2-cvs-20060325.tar.gz 28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar -ed4b5f0e19ad6632198731baeb48aac5 azureus2-cvs-20060209.tar.gz 0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip From fedora-extras-commits at redhat.com Fri May 12 15:41:41 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:41:41 -0700 Subject: rpms/pypoker-eval - New directory Message-ID: <200605121541.k4CFfhC3029698@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29677/pypoker-eval Log Message: Directory /cvs/extras/rpms/pypoker-eval added to the repository From fedora-extras-commits at redhat.com Fri May 12 15:41:42 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:41:42 -0700 Subject: rpms/pypoker-eval/devel - New directory Message-ID: <200605121541.k4CFfiEY029701@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29677/pypoker-eval/devel Log Message: Directory /cvs/extras/rpms/pypoker-eval/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 15:42:05 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:42:05 -0700 Subject: rpms/pypoker-eval Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605121542.k4CFg7Jw029755@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722 Added Files: Makefile import.log Log Message: Setup of module pypoker-eval --- NEW FILE Makefile --- # Top level Makefile for module pypoker-eval all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri May 12 15:42:06 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:42:06 -0700 Subject: rpms/pypoker-eval/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605121542.k4CFg877029758@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pypoker-eval --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri May 12 15:42:45 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:42:45 -0700 Subject: rpms/pypoker-eval import.log,1.1,1.2 Message-ID: <200605121543.k4CFhH50029822@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788 Modified Files: import.log Log Message: auto-import pypoker-eval-131.0-3 on branch devel from pypoker-eval-131.0-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 15:42:05 -0000 1.1 +++ import.log 12 May 2006 15:42:45 -0000 1.2 @@ -0,0 +1 @@ +pypoker-eval-131_0-3:HEAD:pypoker-eval-131.0-3.src.rpm:1147448556 From fedora-extras-commits at redhat.com Fri May 12 15:42:46 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:42:46 -0700 Subject: rpms/pypoker-eval/devel pypoker-eval.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605121543.k4CFhIWo029826@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29788/devel Modified Files: .cvsignore sources Added Files: pypoker-eval.spec Log Message: auto-import pypoker-eval-131.0-3 on branch devel from pypoker-eval-131.0-3.src.rpm --- NEW FILE pypoker-eval.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: pypoker-eval Version: 131.0 Release: 3%{?dist} Summary: Python interface to poker-eval Group: Development/Libraries License: GPL URL: http://pokersource.org/pypoker-eval Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRequires: python-devel BuildRequires: poker-eval-devel >= 124.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package is python adaptor for the poker-eval toolkit for writing programs which simulate or analyze poker games. %package devel Summary: Files needed for developing programs which use pypoker-eval Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains files required to build applications that use pypoker-eval. %prep %setup -q # make examples directory for devel %doc mkdir -p tmp/examples && cp test.py tmp/examples %build %configure --disable-static make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %check %{__python} test.py %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{python_sitearch}/*.so.* %{python_sitearch}/*.py %{python_sitearch}/*.pyc %ghost %{python_sitearch}/*.pyo %files devel %defattr(-,root,root,-) %doc tmp/examples %{python_sitearch}/*.so %{_libdir}/pkgconfig/%{name}.pc %exclude %{python_sitearch}/*.la %changelog * Fri May 12 2006 Christopher Stone 131.0-3 - Place unversioned .so link in -devel package * Sun Apr 23 2006 Christopher Stone 131.0-2 - Updated URL and Source0 links - Added %%check section - Include test.py in devel %%doc - Updated Summary and %%description - Removed unneeded BuildRequires and Requires * Wed Mar 29 2006 Loic Dachary - 131.0-1 - upstream sync * Sun Mar 26 2006 Christopher Stone 130.0-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 15:42:06 -0000 1.1 +++ .cvsignore 12 May 2006 15:42:46 -0000 1.2 @@ -0,0 +1 @@ +pypoker-eval-131.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 15:42:06 -0000 1.1 +++ sources 12 May 2006 15:42:46 -0000 1.2 @@ -0,0 +1 @@ +2ec8a95a5d0880e99ad4695ec113b799 pypoker-eval-131.0.tar.gz From fedora-extras-commits at redhat.com Fri May 12 15:46:37 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Fri, 12 May 2006 08:46:37 -0700 Subject: owners owners.list,1.979,1.980 Message-ID: <200605121546.k4CFkdVx029896@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29879 Modified Files: owners.list Log Message: Add pypoker-eval Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.979 retrieving revision 1.980 diff -u -r1.979 -r1.980 --- owners.list 12 May 2006 13:42:21 -0000 1.979 +++ owners.list 12 May 2006 15:46:37 -0000 1.980 @@ -1298,6 +1298,7 @@ Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|pypoker-eval|Python interface to poker-eval|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 12 15:50:57 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 12 May 2006 08:50:57 -0700 Subject: fedora-security/audit fc5,1.156,1.157 Message-ID: <200605121550.k4CFov7N029945@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29924 Modified Files: fc5 Log Message: Note the firefox update. Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- fc5 12 May 2006 10:12:07 -0000 1.156 +++ fc5 12 May 2006 15:50:54 -0000 1.157 @@ -18,7 +18,7 @@ CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] -CVE-2006-1993 VULNERABLE (firefox) #190124 +CVE-2006-1993 version (firefox, fixed 1.5.0.3) #190124 [since FEDORA-2006-547] CVE-2006-1991 VULNERABLE (php) #190034 CVE-2006-1990 VULNERABLE (php) #190034 CVE-2006-1942 ** firefox From fedora-extras-commits at redhat.com Fri May 12 16:56:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:56:30 -0700 Subject: rpms/perl-Devel-Cover - New directory Message-ID: <200605121656.k4CGuWXA032546@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32520/perl-Devel-Cover Log Message: Directory /cvs/extras/rpms/perl-Devel-Cover added to the repository From fedora-extras-commits at redhat.com Fri May 12 16:56:31 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:56:31 -0700 Subject: rpms/perl-Devel-Cover/devel - New directory Message-ID: <200605121656.k4CGuX0Y032549@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32520/perl-Devel-Cover/devel Log Message: Directory /cvs/extras/rpms/perl-Devel-Cover/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 16:56:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:56:47 -0700 Subject: rpms/perl-Devel-Cover Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605121656.k4CGunfE032598@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32565 Added Files: Makefile import.log Log Message: Setup of module perl-Devel-Cover --- NEW FILE Makefile --- # Top level Makefile for module perl-Devel-Cover all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 12 16:56:48 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:56:48 -0700 Subject: rpms/perl-Devel-Cover/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605121656.k4CGuo6p032601@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32565/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Devel-Cover --- NEW 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 May 12 16:57:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:57:17 -0700 Subject: rpms/perl-Devel-Cover import.log,1.1,1.2 Message-ID: <200605121657.k4CGvnHL032663@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32629 Modified Files: import.log Log Message: auto-import perl-Devel-Cover-0.55-2 on branch devel from perl-Devel-Cover-0.55-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cover/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 16:56:47 -0000 1.1 +++ import.log 12 May 2006 16:57:17 -0000 1.2 @@ -0,0 +1 @@ +perl-Devel-Cover-0_55-2:HEAD:perl-Devel-Cover-0.55-2.src.rpm:1147453029 From fedora-extras-commits at redhat.com Fri May 12 16:57:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 09:57:18 -0700 Subject: rpms/perl-Devel-Cover/devel perl-Devel-Cover.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605121657.k4CGvoBl032667@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32629/devel Modified Files: .cvsignore sources Added Files: perl-Devel-Cover.spec Log Message: auto-import perl-Devel-Cover-0.55-2 on branch devel from perl-Devel-Cover-0.55-2.src.rpm --- NEW FILE perl-Devel-Cover.spec --- Name: perl-Devel-Cover Version: 0.55 Release: 2%{?dist} Summary: Code coverage metrics for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Devel-Cover/ Source0: http://www.cpan.org/authors/id/P/PJ/PJCJ/Devel-Cover-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Template) BuildRequires: perl(Pod::Coverage) BuildRequires: perl(Test::Differences) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Pod::Coverage) Requires: perl(Test::Differences) %description This module provides code coverage metrics for Perl. %prep %setup -q -n Devel-Cover-%{version} chmod -c a-x buildperl %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc BUGS CHANGES README TODO all_versions buildperl cpancover create_gold session.vim %{_bindir}/* %{perl_vendorarch}/Devel/ %{perl_vendorarch}/auto/Devel/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3pm* %changelog * Fri May 12 2006 Jose Pedro Oliveira - 0.55-2 - Removed dependencies pulled in by a documentation file (#191110). * Thu May 04 2006 Jose Pedro Oliveira - 0.55-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cover/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 16:56:48 -0000 1.1 +++ .cvsignore 12 May 2006 16:57:18 -0000 1.2 @@ -0,0 +1 @@ +Devel-Cover-0.55.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cover/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 16:56:48 -0000 1.1 +++ sources 12 May 2006 16:57:18 -0000 1.2 @@ -0,0 +1 @@ +6bb9ddcd7a9e4d87c02b8bbea7ad3c4a Devel-Cover-0.55.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:01:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 May 2006 10:01:17 -0700 Subject: owners owners.list,1.980,1.981 Message-ID: <200605121701.k4CH1oGm002494@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2451 Modified Files: owners.list Log Message: New package: perl-Devel-Cover (#191110) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.980 retrieving revision 1.981 diff -u -r1.980 -r1.981 --- owners.list 12 May 2006 15:46:37 -0000 1.980 +++ owners.list 12 May 2006 17:01:17 -0000 1.981 @@ -982,6 +982,7 @@ Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DBM-Deep|A pure perl multi-level hash/array DBM|andreas at bawue.net|extras-qa at fedoraproject.org| +Fedora Extras|perl-Devel-Cover|Code coverage metrics for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 12 17:08:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 10:08:10 -0700 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.9, 1.10 perl-Module-Build.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200605121708.k4CH8CZu002604@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-serv2583 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.28. Epoch bump to make 0.28 > 0.2612. Various spec cleanups to closer match cpanspec output. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Mar 2006 02:14:33 -0000 1.9 +++ .cvsignore 12 May 2006 17:08:10 -0000 1.10 @@ -1 +1 @@ -Module-Build-0.2612.tar.gz +Module-Build-0.28.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Module-Build.spec 16 Mar 2006 01:54:11 -0000 1.15 +++ perl-Module-Build.spec 12 May 2006 17:08:10 -0000 1.16 @@ -1,26 +1,35 @@ Name: perl-Module-Build -Version: 0.2612 -Release: 2%{?dist} +Version: 0.28 +Release: 1%{?dist} +Epoch: 1 Summary: Perl module for building and installing Perl modules -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Tar) >= 1.08 -BuildRequires: perl(ExtUtils::CBuilder) >= 0.02 -BuildRequires: perl(ExtUtils::ParseXS) >= 2.02 -BuildRequires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.15 +BuildRequires: perl(ExtUtils::ParseXS) >= 1.02 +BuildRequires: perl(YAML) +BuildRequires: perl(Pod::Readme) >= 0.04 Requires: perl(Archive::Tar) >= 1.08 -Requires: perl(ExtUtils::CBuilder) >= 0.02 -Requires: perl(ExtUtils::ParseXS) >= 2.02 -Requires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +Requires: perl(ExtUtils::CBuilder) >= 0.15 +Requires: perl(ExtUtils::ParseXS) >= 1.02 +Requires: perl(Pod::Readme) >= 0.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -Perl module for building and installing Perl modules, a replacement to -ExtUtils::MakeMaker. +Module::Build is a system for building, testing, and installing Perl +modules. It is meant to be an alternative to ExtUtils::MakeMaker. +Developers may alter the behavior of the module through subclassing in a +much more straightforward way than with MakeMaker. It also does not require +a make on your system - most of the Module::Build code is pure-perl and +written in a very cross-platform way. In fact, you don't even need a shell, +so even platforms like MacOS (traditional) can use it fairly easily. Its +only prerequisites are modules that are included with perl 5.6.0, and it +works fine on perl 5.005 if you can install a few additional modules. %prep %setup -q -n Module-Build-%{version} @@ -33,14 +42,10 @@ rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 - find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check ./Build test @@ -49,13 +54,18 @@ %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{_bindir}/config_data %{perl_vendorlib}/Module %{_mandir}/man1/config_data.1* %{_mandir}/man3/Module::Build*.3* %changelog +* Fri May 12 2006 Steven Pritchard - 1:0.28-1 +- Update to 0.28. +- Epoch bump to make 0.28 > 0.2612. +- Various spec cleanups to closer match cpanspec output. + * Wed Mar 15 2006 Steven Pritchard - 0.2612-2 - Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and ExtUtils::ParseXS. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Mar 2006 02:14:33 -0000 1.9 +++ sources 12 May 2006 17:08:10 -0000 1.10 @@ -1 +1 @@ -fa1504741e9c931f75e804953c1d5417 Module-Build-0.2612.tar.gz +8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:09:07 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:09:07 -0700 Subject: rpms/perl-Authen-DigestMD5/devel - New directory Message-ID: <200605121709.k4CH9912002663@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2634/perl-Authen-DigestMD5/devel Log Message: Directory /cvs/extras/rpms/perl-Authen-DigestMD5/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 17:09:06 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:09:06 -0700 Subject: rpms/perl-Authen-DigestMD5 - New directory Message-ID: <200605121709.k4CH98wD002660@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2634/perl-Authen-DigestMD5 Log Message: Directory /cvs/extras/rpms/perl-Authen-DigestMD5 added to the repository From fedora-extras-commits at redhat.com Fri May 12 17:09:28 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:09:28 -0700 Subject: rpms/perl-Authen-DigestMD5 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605121709.k4CH9UBB002712@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2679 Added Files: Makefile import.log Log Message: Setup of module perl-Authen-DigestMD5 --- NEW FILE Makefile --- # Top level Makefile for module perl-Authen-DigestMD5 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 12 17:09:29 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:09:29 -0700 Subject: rpms/perl-Authen-DigestMD5/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605121709.k4CH9V3K002715@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2679/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Authen-DigestMD5 --- NEW 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 May 12 17:10:35 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:10:35 -0700 Subject: rpms/perl-Authen-DigestMD5 import.log,1.1,1.2 Message-ID: <200605121710.k4CHAbT8003184@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3151 Modified Files: import.log Log Message: auto-import perl-Authen-DigestMD5-0.04-1 on branch devel from perl-Authen-DigestMD5-0.04-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Authen-DigestMD5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 17:09:28 -0000 1.1 +++ import.log 12 May 2006 17:10:35 -0000 1.2 @@ -0,0 +1 @@ +perl-Authen-DigestMD5-0_04-1:HEAD:perl-Authen-DigestMD5-0.04-1.src.rpm:1147453801 From fedora-extras-commits at redhat.com Fri May 12 17:10:35 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:10:35 -0700 Subject: rpms/perl-Authen-DigestMD5/devel perl-Authen-DigestMD5.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605121710.k4CHAbdS003190@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Authen-DigestMD5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3151/devel Modified Files: .cvsignore sources Added Files: perl-Authen-DigestMD5.spec Log Message: auto-import perl-Authen-DigestMD5-0.04-1 on branch devel from perl-Authen-DigestMD5-0.04-1.src.rpm --- NEW FILE perl-Authen-DigestMD5.spec --- Summary: SASL DIGEST-MD5 authentication (RFC2831) Name: perl-Authen-DigestMD5 Version: 0.04 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Authen-DigestMD5/ Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Authen-DigestMD5-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch %description This module supports DIGEST-MD5 SASL authentication as defined in RFC-2831. %prep %setup -q -n Authen-DigestMD5-%{version} # Fix wrong script interpreter, and set permissions to avoid extra deps %{__sed} -i -e 's,/usr/local/bin/perl,%{__perl},' digest-md5-auth.pl %{__chmod} 644 digest-md5-auth.pl # Fix character encoding %{__mv} DigestMD5.pm DigestMD5.pm.not-utf8 /usr/bin/iconv -f iso8859-1 -t utf8 -o DigestMD5.pm DigestMD5.pm.not-utf8 %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %{__rm} -rf %{buildroot} %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';' /usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* # Get rid of sample code that introduces additional dep on perl(OpenLDAP) %{__rm} -f %{buildroot}%{perl_vendorlib}/Authen/digest-md5-auth.pl %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,0755) %doc Changes README digest-md5-auth.pl %{perl_vendorlib}/Authen/ %{_mandir}/man3/Authen::DigestMD5.3pm* %changelog * Fri May 12 2006 Paul Howarth 0.04-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Authen-DigestMD5/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 17:09:28 -0000 1.1 +++ .cvsignore 12 May 2006 17:10:35 -0000 1.2 @@ -0,0 +1 @@ +Authen-DigestMD5-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Authen-DigestMD5/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 17:09:28 -0000 1.1 +++ sources 12 May 2006 17:10:35 -0000 1.2 @@ -0,0 +1 @@ +f96d3ccc55c4bf551baf59fd8cb51421 Authen-DigestMD5-0.04.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:15:33 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 12 May 2006 10:15:33 -0700 Subject: owners owners.list,1.981,1.982 Message-ID: <200605121715.k4CHFZEd003311@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3294 Modified Files: owners.list Log Message: perl-Authen-DigestMD5 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.981 retrieving revision 1.982 diff -u -r1.981 -r1.982 --- owners.list 12 May 2006 17:01:17 -0000 1.981 +++ owners.list 12 May 2006 17:15:33 -0000 1.982 @@ -901,6 +901,7 @@ Fedora Extras|perl-Archive-Extract|A generic archive extracting mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Authen-DigestMD5|SASL DIGEST-MD5 authentication (RFC2831)|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-Radius|Perl Authen::Radius modules|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 12 17:32:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:32:40 -0700 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.26,1.27 Message-ID: <200605121732.k4CHWgB3003724@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3692/FC-4 Modified Files: TeXmacs.spec Log Message: new version 1.0.6.1 Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- TeXmacs.spec 31 Dec 2005 18:49:34 -0000 1.26 +++ TeXmacs.spec 12 May 2006 17:32:40 -0000 1.27 @@ -1,13 +1,12 @@ Name: TeXmacs -Version: 1.0.6 +Version: 1.0.6.1 Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz -Patch0: TeXmacs-maxima.patch +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-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 @@ -37,13 +36,11 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch0 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in %build %configure -perl -pi -e "s|^CXXOPTIMIZE =.*|CXXOPTIMIZE = $RPM_OPT_FLAGS|" src/common.makefile make %{?_smp_mflags} @@ -139,6 +136,9 @@ %changelog +* Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 +- new version 1.0.6.1 + * Sat Dec 31 2005 Gerard Milmeister - 1.0.6-1 - New Version 1.0.6 From fedora-extras-commits at redhat.com Fri May 12 17:32:41 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:32:41 -0700 Subject: rpms/TeXmacs/FC-5 TeXmacs-1.0.6.1-gcc41.patch, NONE, 1.1 TeXmacs.spec, 1.32, 1.33 Message-ID: <200605121732.k4CHWh1O003730@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3692/FC-5 Modified Files: TeXmacs.spec Added Files: TeXmacs-1.0.6.1-gcc41.patch Log Message: new version 1.0.6.1 TeXmacs-1.0.6.1-gcc41.patch: --- NEW FILE TeXmacs-1.0.6.1-gcc41.patch --- --- TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp.gcc41 2006-05-12 17:43:03.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp 2006-05-12 17:43:27.000000000 +0200 @@ -326,7 +326,7 @@ struct textat_box_rep: public move_box_rep { textat_box_rep (path ip, box b, SI x, SI y): move_box_rep (ip, b, x, y, false, false) {} - gr_selections textat_box_rep::graphical_select (SI x, SI y, SI dist); + gr_selections graphical_select (SI x, SI y, SI dist); operator tree () { return tree (TUPLE, "textat", (tree) bs[0]); } }; Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- TeXmacs.spec 20 Mar 2006 11:31:06 -0000 1.32 +++ TeXmacs.spec 12 May 2006 17:32:41 -0000 1.33 @@ -1,19 +1,23 @@ Name: TeXmacs -Version: 1.0.6 -Release: 6%{?dist} +Version: 1.0.6.1 +Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6-src.tar.gz -Patch0: TeXmacs-maxima.patch +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch +Patch4: TeXmacs-1.0.6.1-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tetex, tetex-fonts, ghostscript -Buildrequires: guile-devel, desktop-file-utils, tetex +Requires: tetex +Requires: tetex-fonts +Requires: ghostscript +Buildrequires: guile-devel +Buildrequires: desktop-file-utils +Buildrequires: tetex Buildrequires: freetype-devel BuildRequires: libICE-devel BuildRequires: libSM-devel @@ -49,10 +53,10 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -153,6 +157,9 @@ %changelog +* Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 +- new version 1.0.6.1 + * Mon Mar 20 2006 Gerard Milmeister - 1.0.6-6 - fix problems with gcc41 (TeXmacs-gcc41.patch) From fedora-extras-commits at redhat.com Fri May 12 17:36:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:36:59 -0700 Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.17, 1.18 TeXmacs.spec, 1.27, 1.28 sources, 1.19, 1.20 Message-ID: <200605121737.k4CHb1Ug003988@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3951/FC-4 Modified Files: .cvsignore TeXmacs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 31 Dec 2005 18:49:34 -0000 1.17 +++ .cvsignore 12 May 2006 17:36:59 -0000 1.18 @@ -1 +1 @@ -TeXmacs-1.0.6-src.tar.gz +TeXmacs-1.0.6.1-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- TeXmacs.spec 12 May 2006 17:32:40 -0000 1.27 +++ TeXmacs.spec 12 May 2006 17:36:59 -0000 1.28 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 31 Dec 2005 18:49:34 -0000 1.19 +++ sources 12 May 2006 17:36:59 -0000 1.20 @@ -1 +1 @@ -7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz +7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:36:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:36:59 -0700 Subject: rpms/TeXmacs/FC-5 .cvsignore, 1.18, 1.19 TeXmacs.spec, 1.33, 1.34 sources, 1.19, 1.20 Message-ID: <200605121737.k4CHb1Q0003994@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3951/FC-5 Modified Files: .cvsignore TeXmacs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 31 Dec 2005 18:52:17 -0000 1.18 +++ .cvsignore 12 May 2006 17:36:59 -0000 1.19 @@ -1 +1 @@ -TeXmacs-1.0.6-src.tar.gz +TeXmacs-1.0.6.1-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- TeXmacs.spec 12 May 2006 17:32:41 -0000 1.33 +++ TeXmacs.spec 12 May 2006 17:36:59 -0000 1.34 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 31 Dec 2005 18:52:17 -0000 1.19 +++ sources 12 May 2006 17:36:59 -0000 1.20 @@ -1 +1 @@ -7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz +7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:39:05 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:39:05 -0700 Subject: rpms/TeXmacs/devel TeXmacs-1.0.6.1-gcc41.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 TeXmacs.spec, 1.34, 1.35 sources, 1.19, 1.20 Message-ID: <200605121739.k4CHd8AH004111@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4087 Modified Files: .cvsignore TeXmacs.spec sources Added Files: TeXmacs-1.0.6.1-gcc41.patch Log Message: TeXmacs-1.0.6.1-gcc41.patch: --- NEW FILE TeXmacs-1.0.6.1-gcc41.patch --- --- TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp.gcc41 2006-05-12 17:43:03.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Typeset/Boxes/Modifier/change_boxes.cpp 2006-05-12 17:43:27.000000000 +0200 @@ -326,7 +326,7 @@ struct textat_box_rep: public move_box_rep { textat_box_rep (path ip, box b, SI x, SI y): move_box_rep (ip, b, x, y, false, false) {} - gr_selections textat_box_rep::graphical_select (SI x, SI y, SI dist); + gr_selections graphical_select (SI x, SI y, SI dist); operator tree () { return tree (TUPLE, "textat", (tree) bs[0]); } }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 31 Dec 2005 18:52:17 -0000 1.18 +++ .cvsignore 12 May 2006 17:39:05 -0000 1.19 @@ -1 +1 @@ -TeXmacs-1.0.6-src.tar.gz +TeXmacs-1.0.6.1-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- TeXmacs.spec 11 May 2006 21:34:26 -0000 1.34 +++ TeXmacs.spec 12 May 2006 17:39:05 -0000 1.35 @@ -1,18 +1,20 @@ Name: TeXmacs -Version: 1.0.6 -Release: 8%{?dist} +Version: 1.0.6.1 +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.6-src.tar.gz -Patch0: TeXmacs-maxima.patch +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch +Patch4: TeXmacs-1.0.6.1-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tetex, tetex-fonts, ghostscript +Requires: tetex +Requires: tetex-fonts +Requires: ghostscript Buildrequires: guile-devel Buildrequires: gmp-devel Buildrequires: desktop-file-utils @@ -56,6 +58,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -156,6 +159,9 @@ %changelog +* Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 +- new version 1.0.6.1 + * Thu May 11 2006 Gerard Milmeister - 1.0.6-8 - added buildreq for gmp-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 31 Dec 2005 18:52:17 -0000 1.19 +++ sources 12 May 2006 17:39:05 -0000 1.20 @@ -1 +1 @@ -7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz +7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz From fedora-extras-commits at redhat.com Fri May 12 17:42:38 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 10:42:38 -0700 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.35,1.36 Message-ID: <200605121742.k4CHge6M004202@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4184 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- TeXmacs.spec 12 May 2006 17:39:05 -0000 1.35 +++ TeXmacs.spec 12 May 2006 17:42:37 -0000 1.36 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -54,7 +54,6 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 From fedora-extras-commits at redhat.com Fri May 12 17:49:30 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 10:49:30 -0700 Subject: rpms/octave/FC-4 octave-2.9.5-config.patch, NONE, 1.1 octave-2.9.5-lex.patch, NONE, 1.1 octave-2.9.5-sparse.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave.spec, 1.28, 1.29 sources, 1.6, 1.7 octave-2.1.72-freqz.patch, 1.1, NONE Message-ID: <200605121749.k4CHnWJE004344@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4312 Modified Files: .cvsignore octave.spec sources Added Files: octave-2.9.5-config.patch octave-2.9.5-lex.patch octave-2.9.5-sparse.patch Removed Files: octave-2.1.72-freqz.patch Log Message: Upgrade to 2.9.x series (bug 190646) octave-2.9.5-config.patch: --- NEW FILE octave-2.9.5-config.patch --- --- configure.orig 2006-04-18 08:22:38.000000000 -0500 +++ configure 2006-04-18 08:30:46.000000000 -0500 @@ -3291,7 +3291,7 @@ echo "$as_me:$LINENO: result: defining localfcnfiledir to be $localfcnfiledir" >&5 echo "${ECHO_T}defining localfcnfiledir to be $localfcnfiledir" >&6 -: ${localapifcnfiledir='$(datadir)/octave/site/$(apiversion)/m'} +: ${localapifcnfiledir='$(datadir)/octave/site/$(api_version)/m'} echo "$as_me:$LINENO: result: defining localapifcnfiledir to be $localapifcnfiledir" >&5 echo "${ECHO_T}defining localapifcnfiledir to be $localapifcnfiledir" >&6 @@ -3327,7 +3327,7 @@ echo "$as_me:$LINENO: result: defining localoctfiledir to be $localoctfiledir" >&5 echo "${ECHO_T}defining localoctfiledir to be $localoctfiledir" >&6 -: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(apiversion)/$(canonical_host_type)'} +: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)'} echo "$as_me:$LINENO: result: defining localapioctfiledir to be $localapioctfiledir" >&5 echo "${ECHO_T}defining localapioctfiledir to be $localapioctfiledir" >&6 octave-2.9.5-lex.patch: --- NEW FILE octave-2.9.5-lex.patch --- src/ChangeLog: 2006-05-02 John W. Eaton * lex.l ({CCHAR}): Exit rawcommand mode if returning '\n' token. Index: src/lex.l =================================================================== RCS file: /cvs/octave/src/lex.l,v retrieving revision 1.232 diff -u -r1.232 lex.l --- src/lex.l 24 Apr 2006 19:13:08 -0000 1.232 +++ src/lex.l 2 May 2006 23:31:14 -0000 @@ -696,7 +696,10 @@ BEGIN (INITIAL); if (nesting_level.none ()) - COUNT_TOK_AND_RETURN ('\n'); + { + lexer_flags.doing_rawcommand = false; + COUNT_TOK_AND_RETURN ('\n'); + } else if (nesting_level.is_bracket_or_brace ()) COUNT_TOK_AND_RETURN (';'); } octave-2.9.5-sparse.patch: --- NEW FILE octave-2.9.5-sparse.patch --- Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseCmplxQR.h 23 Mar 2006 18:22:51 -0000 1.3 @@ -137,6 +137,23 @@ #endif }; + +// Publish externally used friend functions. + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, + const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); #endif /* Index: liboctave/SparseQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseQR.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseQR.h 23 Mar 2006 18:22:51 -0000 1.3 @@ -133,6 +133,22 @@ #endif }; + +// Publish externally used friend functions. + +extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); + #endif /* Index: liboctave/CMatrix.cc =================================================================== RCS file: /cvs/octave/liboctave/CMatrix.cc,v retrieving revision 1.114 diff -u -r1.114 CMatrix.cc --- liboctave/CMatrix.cc 2 Mar 2006 03:40:00 -0000 1.114 +++ liboctave/CMatrix.cc 24 Mar 2006 18:53:58 -0000 @@ -889,27 +889,6 @@ return retval; } -ComplexRowVector -ComplexMatrix::row (char *s) const -{ - if (! s) - { - (*current_liboctave_error_handler) ("invalid row selection"); - return ComplexRowVector (); - } - - char c = *s; - if (c == 'f' || c == 'F') - return row (static_cast(0)); - else if (c == 'l' || c == 'L') - return row (rows () - 1); - else - { - (*current_liboctave_error_handler) ("invalid row selection"); - return ComplexRowVector (); - } -} - ComplexColumnVector ComplexMatrix::column (octave_idx_type i) const { @@ -927,27 +906,6 @@ return retval; } -ComplexColumnVector -ComplexMatrix::column (char *s) const -{ - if (! s) - { - (*current_liboctave_error_handler) ("invalid column selection"); - return ComplexColumnVector (); - } - - char c = *s; - if (c == 'f' || c == 'F') - return column (static_cast(0)); - else if (c == 'l' || c == 'L') - return column (cols () - 1); - else - { - (*current_liboctave_error_handler) ("invalid column selection"); - return ComplexColumnVector (); - } -} - ComplexMatrix ComplexMatrix::inverse (void) const { Index: liboctave/CMatrix.h =================================================================== RCS file: /cvs/octave/liboctave/CMatrix.h,v retrieving revision 1.55 diff -u -r1.55 CMatrix.h --- liboctave/CMatrix.h 26 Oct 2005 15:24:08 -0000 1.55 +++ liboctave/CMatrix.h 24 Mar 2006 18:53:58 -0000 @@ -130,10 +130,8 @@ // extract row or column i. ComplexRowVector row (octave_idx_type i) const; - ComplexRowVector row (char *s) const; ComplexColumnVector column (octave_idx_type i) const; - ComplexColumnVector column (char *s) const; ComplexMatrix inverse (void) const; ComplexMatrix inverse (octave_idx_type& info) const; Index: liboctave/dMatrix.cc =================================================================== RCS file: /cvs/octave/liboctave/dMatrix.cc,v retrieving revision 1.120 diff -u -r1.120 dMatrix.cc --- liboctave/dMatrix.cc 2 Mar 2006 03:40:01 -0000 1.120 +++ liboctave/dMatrix.cc 24 Mar 2006 18:53:59 -0000 @@ -559,27 +559,6 @@ return retval; } -RowVector -Matrix::row (char *s) const -{ - if (! s) - { - (*current_liboctave_error_handler) ("invalid row selection"); - return RowVector (); - } - - char c = *s; - if (c == 'f' || c == 'F') - return row ( static_cast(0) ); - else if (c == 'l' || c == 'L') - return row (rows () - 1); - else - { - (*current_liboctave_error_handler) ("invalid row selection"); - return RowVector (); - } -} - ColumnVector Matrix::column (octave_idx_type i) const { @@ -597,27 +576,6 @@ return retval; } -ColumnVector -Matrix::column (char *s) const -{ - if (! s) - { - (*current_liboctave_error_handler) ("invalid column selection"); - return ColumnVector (); - } - - char c = *s; - if (c == 'f' || c == 'F') - return column (static_cast (0)); - else if (c == 'l' || c == 'L') - return column (cols () - 1); - else - { - (*current_liboctave_error_handler) ("invalid column selection"); - return ColumnVector (); - } -} - Matrix Matrix::inverse (void) const { Index: liboctave/dMatrix.h =================================================================== RCS file: /cvs/octave/liboctave/dMatrix.h,v retrieving revision 1.61 diff -u -r1.61 dMatrix.h --- liboctave/dMatrix.h 26 Oct 2005 15:24:08 -0000 1.61 +++ liboctave/dMatrix.h 24 Mar 2006 18:53:59 -0000 @@ -102,10 +102,8 @@ // extract row or column i. RowVector row (octave_idx_type i) const; - RowVector row (char *s) const; ColumnVector column (octave_idx_type i) const; - ColumnVector column (char *s) const; Matrix inverse (void) const; Matrix inverse (octave_idx_type& info) const; Index: liboctave/dSparse.cc =================================================================== RCS file: /cvs/octave/liboctave/dSparse.cc,v retrieving revision 1.21 diff -u -r1.21 dSparse.cc --- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 +++ liboctave/dSparse.cc 24 Mar 2006 18:54:00 -0000 @@ -4404,7 +4404,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4540,7 +4540,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4678,7 +4678,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4851,7 +4851,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5031,7 +5031,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5208,7 +5208,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5379,7 +5379,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5586,7 +5586,7 @@ Array z (3 * nr); double *pz = z.fortran_vec (); Array iz (nr); - int *piz = iz.fortran_vec (); + octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON, (F77_CONST_CHAR_ARG2 (&job, 1), Index: src/ov-cell.cc =================================================================== RCS file: /cvs/octave/src/ov-cell.cc,v retrieving revision 1.58 diff -u -r1.58 ov-cell.cc --- src/ov-cell.cc 24 Mar 2006 16:42:44 -0000 1.58 +++ src/ov-cell.cc 24 Mar 2006 19:14:32 -0000 @@ -783,10 +783,12 @@ for (octave_idx_type i = 0; i < dv.numel (); i++) { - char s[20]; - sprintf (s, "_%d", i); + OSSTREAM buf; + buf << "_" << i << OSSTREAM_ENDS; + std::string s = OSSTREAM_STR (buf); + OSSTREAM_FREEZE (buf); - if (! add_hdf5_data(data_hid, tmp.elem (i), s, "", false, + if (! add_hdf5_data(data_hid, tmp.elem (i), s.c_str (), "", false, save_as_floats)) { H5Gclose (data_hid); Index: src/ov-list.cc =================================================================== RCS file: /cvs/octave/src/ov-list.cc,v retrieving revision 1.44 diff -u -r1.44 ov-list.cc --- src/ov-list.cc 26 Apr 2005 19:24:33 -0000 1.44 +++ src/ov-list.cc 24 Mar 2006 19:14:32 -0000 @@ -536,9 +536,13 @@ for (int i = 0; i < lst.length (); ++i) { // should we use lst.name_tags () to label the elements? - char s[20]; - sprintf (s, "_%d", i); - bool b = save_ascii_data (os, lst (i), s, infnan_warned, + + OSSTREAM buf; + buf << "_" << i << OSSTREAM_ENDS; + std::string s = OSSTREAM_STR (buf); + OSSTREAM_FREEZE (buf); + + bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned, strip_nan_and_inf, 0, 0); if (! b) @@ -607,11 +611,15 @@ for (int i = 0; i < lst.length (); i++) { // should we use lst.name_tags () to label the elements? - char s[20]; - sprintf (s, "_%d", i); + + OSSTREAM buf; + buf << "_" << i << OSSTREAM_ENDS; + std::string s = OSSTREAM_STR (buf); + OSSTREAM_FREEZE (buf); // Recurse to print sub-value. - bool b = save_binary_data (os, lst(i), s, "", 0, save_as_floats); + bool b = save_binary_data (os, lst(i), s.c_str (), "", 0, + save_as_floats); if (! b) return false; @@ -683,9 +691,13 @@ for (octave_idx_type i = 0; i < lst.length (); ++i) { // should we use lst.name_tags () to label the elements? - char s[20]; - sprintf (s, "_%d", i); - bool retval2 = add_hdf5_data (data_hid, lst (i), s, "", + + OSSTREAM buf; + buf << "_" << i << OSSTREAM_ENDS; + std::string s = OSSTREAM_STR (buf); + OSSTREAM_FREEZE (buf); + + bool retval2 = add_hdf5_data (data_hid, lst (i), s.c_str (), "", false, save_as_floats); if (! retval2) break; Index: src/DLD-FUNCTIONS/spchol.cc =================================================================== RCS file: /cvs/octave/src/DLD-FUNCTIONS/spchol.cc,v retrieving revision 1.7 diff -u -r1.7 spchol.cc --- src/DLD-FUNCTIONS/spchol.cc 22 Mar 2006 22:58:12 -0000 1.7 +++ src/DLD-FUNCTIONS/spchol.cc 24 Mar 2006 19:55:38 -0000 @@ -607,7 +607,7 @@ for (octave_idx_type k = 0 ; k < n ; k++) { // get the kth row of L and store in the columns of L - cholmod_row_subtree (A1, A2, k, Parent, R, cm) ; + CHOLMOD_NAME (row_subtree) (A1, A2, k, Parent, R, cm) ; for (octave_idx_type p = 0 ; p < Rp [1] ; p++) L.xridx (W [Ri [p]]++) = k ; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Mar 2006 14:45:31 -0000 1.6 +++ .cvsignore 12 May 2006 17:49:30 -0000 1.7 @@ -1 +1 @@ -octave-2.1.73.tar.bz2 +octave-2.9.5.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- octave.spec 23 Mar 2006 14:45:31 -0000 1.28 +++ octave.spec 12 May 2006 17:49:30 -0000 1.29 @@ -1,5 +1,5 @@ Name: octave -Version: 2.1.73 +Version: 2.9.5 Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -7,19 +7,22 @@ Group: Applications/Engineering License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 -Patch0: octave-2.1.72-freqz.patch +Patch0: octave-2.9.5-sparse.patch +Patch1: octave-2.9.5-config.patch +Patch2: octave-2.9.5-lex.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info Requires(postun): /sbin/ldconfig Requires(post): /sbin/ldconfig Requires(preun): /sbin/install-info -BuildRequires: gnuplot bison flex less tetex gcc-gfortran -BuildRequires: lapack-devel blas-devel +BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildRequires: ncurses-devel zlib-devel libtermcap-devel hdf5-devel -BuildRequires: readline-devel glibc-devel fftw-devel gperf +BuildRequires: readline-devel glibc-devel fftw-devel autoconf gperf +BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description GNU Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for @@ -50,39 +53,54 @@ %prep %setup -q %patch0 -p0 +%patch1 -p0 +%patch2 -p0 %build -%configure --enable-shared --disable-static -make %{?_smp_mflags} - +%ifarch x86_64 +%define enable64 yes +%else +%define enable64 no +%endif +export CPPFLAGS=-I%{_includedir}/glpk +%configure --enable-shared --disable-static --enable-64=%enable64 +make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}" -#empty -rm -f interpreter/octave.{ky,pg,tp} %install rm -rf $RPM_BUILD_ROOT -%makeinstall -rm -f doc/interpreter/munge-texi doc/interpreter/*.o -strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct +make install DESTDIR=$RPM_BUILD_ROOT +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R +# Remove RPM_BUILD_ROOT from ls-R files +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R + +# Clean doc directory +pushd doc + make distclean + rm -f *.in */*.in */*.cc refcard/*.tex +popd + +# Create desktop file +rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop +desktop-file-install --vendor fedora --add-category X-Fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop -# XXX Nuke unpackaged files -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/install-info --info-dir=%{_infodir}/ --section="Programming:" --entry="* Octave:(octave). Interactive language for numerical computations." %{_infodir}/octave.info.gz +/sbin/install-info --info-dir=%{_infodir} --section="Programming:" \ + --entry="* Octave:(%{name}). %{summary}." %{_infodir}/octave.info.gz %preun if [ "$1" = "0" ]; then @@ -95,8 +113,8 @@ %files %defattr(-,root,root) %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP -%doc SENDING-PATCHES THANKS -%doc doc/faq doc/liboctave doc/refcard emacs examples +%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p* +%doc doc/faq doc/interpreter/HTML doc/refcard %{_bindir}/octave %{_bindir}/octave-%{version} %config(noreplace) /etc/ld.so.conf.d/* @@ -105,9 +123,11 @@ %{_libexecdir}/octave %{_mandir}/man*/octave* %{_infodir}/octave.info* +%{_datadir}/applications/* %files devel %defattr(-,root,root) +%doc doc/liboctave %{_bindir}/mkoctfile* %{_bindir}/octave-bug* %{_bindir}/octave-config* @@ -116,6 +136,9 @@ %changelog +* Fri May 12 2006 Quentin Spencer 2.9.5-1 +- Upgrade to 2.9.x releases (in response to bug #190646). + * Thu Mar 23 2006 Quentin Spencer 2.1.73-1 - New upstream release. - Make sure /usr/libexec/octave is owned by octave. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Mar 2006 14:45:31 -0000 1.6 +++ sources 12 May 2006 17:49:30 -0000 1.7 @@ -1 +1 @@ -c356475aa06d81a10f8bf27f1a1d27a0 octave-2.1.73.tar.bz2 +09eff7b2319383778db7bb5e50619bf9 octave-2.9.5.tar.bz2 --- octave-2.1.72-freqz.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 12 18:35:06 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 11:35:06 -0700 Subject: rpms/octave-forge/FC-4 octave-forge-2006.03.17-octcdf.patch, NONE, 1.1 octave-forge-2006.03.17-zplane.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave-forge.spec, 1.23, 1.24 sources, 1.6, 1.7 Message-ID: <200605121835.k4CIZ8sQ006901@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6874 Modified Files: .cvsignore octave-forge.spec sources Added Files: octave-forge-2006.03.17-octcdf.patch octave-forge-2006.03.17-zplane.patch Log Message: Updates for compilation with octave 2.9.5. octave-forge-2006.03.17-octcdf.patch: --- NEW FILE octave-forge-2006.03.17-octcdf.patch --- Index: main/octcdf/Makefile =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- main/octcdf/Makefile 19 Apr 2006 19:09:51 -0000 1.6 +++ main/octcdf/Makefile 28 Apr 2006 17:51:17 -0000 @@ -34,7 +34,7 @@ RM = rm -f endif -NCTARGET = ov-netcdf.oct +NCTARGET = netcdf.oct NCSOURCES = ov-netcdf.cc ov-ncfile.cc ov-ncvar.cc ov-ncatt.cc ov-ncdim.cc OBJECTS = $(patsubst %.cc,%.o,$(NCSOURCES)) Index: main/octcdf/configure.add =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/configure.add,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main/octcdf/configure.add 15 Dec 2005 22:13:52 -0000 1.2 +++ main/octcdf/configure.add 25 Apr 2006 16:35:01 -0000 1.3 @@ -11,34 +11,29 @@ OCTCDF_LIBS="$LDFLAGS" OCTCDF_CFLAGS="$CPPFLAGS" - dnl checking for opendap support + dnl first checking for opendap support - AC_MSG_CHECKING([for nc-dap]) + AC_MSG_CHECKING([for nc-dap]) - if ncdap-config --version > /dev/null 2>&1; then + if ncdap-config --version > /dev/null 2>&1; then + AC_MSG_RESULT([yes]) OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`" OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`" - HAVE_NCDAP=yes - AC_MSG_RESULT([yes]) - else - HAVE_NCDAP=no - AC_MSG_RESULT([no]) - fi - - dnl Checking if the NetCDF library exists. + HAVE_NETCDF=yes + else + AC_MSG_RESULT([no]) - AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,) + dnl if no opendap, checking if the NetCDF library exists. - if test $HAVE_NETCDF = yes ; then - OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf" - fi + AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,) - dnl if we don't have nc-dap then we have to check for netcdf.h - dnl otherwise it is already given by ncdap-config --cflags + if test $HAVE_NETCDF = yes ; then + OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf" - if test $HAVE_NCDAP = no ; then - AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no) + dnl we have the libraries, no we have also the headers? + AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no) + fi fi if test $HAVE_NETCDF = yes ; then octave-forge-2006.03.17-zplane.patch: --- NEW FILE octave-forge-2006.03.17-zplane.patch --- Index: main/signal/zplane.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/signal/zplane.m,v retrieving revision 1.4 diff -u -r1.4 zplane.m --- main/signal/zplane.m 7 Jan 2006 05:23:27 -0000 1.4 +++ main/signal/zplane.m 3 May 2006 15:37:01 -0000 @@ -83,9 +83,12 @@ catch eleo = 0; end; ##= 2.1.69 ImageMagick -BuildRequires: octave-devel tetex gcc-gfortran ginac-devel -BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel pcre-devel -BuildRequires: ncurses-devel libtermcap-devel gsl-devel qhull-devel +Requires: octave >= 2.9.5 ImageMagick +BuildRequires: octave-devel tetex gcc-gfortran ginac-devel qhull-devel +BuildRequires: ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel +BuildRequires: libjpeg-devel libpng-devel ncurses-devel libtermcap-devel +BuildRequires: autoconf %description Octave-forge is a community project for collaborative development of @@ -32,9 +36,15 @@ %prep %setup -q - +%patch0 -p1 +# The following patch requires regenerating the configure script +%patch1 -p0 +%patch2 -p0 +# The sparse matrix functions are in octave 2.9.x so don't install them +touch main/sparse/NOINSTALL %build +./autogen.sh %configure make %{?_smp_mflags} @@ -65,6 +75,9 @@ %changelog +* Fri May 12 2006 Quentin Spencer 2001.03.17-3 +- Rebuild with various changes for octave-2.9.5 + * Mon Mar 27 2006 Quentin Spencer 2001.03.17-2 - Rebuild (apparently needed for new octave release, fixes bug #186964). Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Mar 2006 16:25:24 -0000 1.6 +++ sources 12 May 2006 18:35:05 -0000 1.7 @@ -1 +1,2 @@ a1e76ab52fb9894586d6a7a0dc15e603 octave-forge-2006.03.17.patched.tar.gz +c50919d0790c7873a82c2da09d419142 octave-forge-system.patch.gz From fedora-extras-commits at redhat.com Fri May 12 18:53:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 12 May 2006 11:53:24 -0700 Subject: rpms/geomview/devel .cvsignore, 1.3, 1.4 geomview.desktop, 1.2, 1.3 geomview.spec, 1.8, 1.9 sources, 1.3, 1.4 geomview.png, 1.1, NONE Message-ID: <200605121853.k4CIrQwV007044@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/geomview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7021 Modified Files: .cvsignore geomview.desktop geomview.spec sources Removed Files: geomview.png Log Message: * Fri May 12 2006 Rex Dieter 1.8.2-0.3.cvs20040221 - updated (transparent) icon (rh bug #190218) - drop deprecated BR: libGL.so.1,libGLU.so.1 bits - ExcludeArch: x86_64 (#182625) - .desktop: MimeType: application/x-geomview Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Jan 2006 14:43:54 -0000 1.3 +++ .cvsignore 12 May 2006 18:53:24 -0000 1.4 @@ -1,3 +1,4 @@ maniview-2.0.0.tar.gz orrery-0.9.3.tar.gz geomview-snapshot-2004-02-21.tar.gz +geomview.png Index: geomview.desktop =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/geomview.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geomview.desktop 3 Jan 2006 14:43:54 -0000 1.2 +++ geomview.desktop 12 May 2006 18:53:24 -0000 1.3 @@ -3,7 +3,7 @@ Comment=An interactive 3D viewing program Exec=geomview Icon=geomview -#MimeType=application/x-geomview +MimeType=application/x-geomview Type=Application Encoding=UTF-8 Categories=Application;Graphics;Scientific;Education;Math; Index: geomview.spec =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- geomview.spec 1 Mar 2006 16:45:28 -0000 1.8 +++ geomview.spec 12 May 2006 18:53:24 -0000 1.9 @@ -9,7 +9,7 @@ Name: geomview Summary: Interactive 3D viewing program Version: 1.8.2 -Release: 0.2.cvs%{cvs}%{?dist}.3 +Release: 0.3.cvs%{cvs}%{?dist} License: LGPL Url: http://www.geomview.org/ @@ -18,6 +18,8 @@ #Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# http://bugzilla.redhat.com/bugzilla/182625 +ExcludeArch: x86_64 Obsoletes: %{name}-plugins < %{version}-%{release} Provides: %{name}-plugins = %{version}-%{release} @@ -41,11 +43,7 @@ BuildRequires: openmotif-devel BuildRequires: xforms-devel ## X/GL support -%if "%{?fedora}" > "3" BuildRequires: libGL-devel libGLU-devel -%else -BuildRequires: libGL.so.1 libGLU.so.1 -%endif Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -173,12 +171,11 @@ rm -rf $RPM_BUILD_ROOT -%POST +%post /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||: -for icon_theme in hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: %preun if [ $1 -eq 0 ] ;then @@ -186,10 +183,9 @@ fi %postun -for icon_theme in hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: %files @@ -249,6 +245,12 @@ %changelog +* Fri May 12 2006 Rex Dieter 1.8.2-0.3.cvs20040221 +- updated (transparent) icon (rh bug #190218) +- drop deprecated BR: libGL.so.1,libGLU.so.1 bits +- ExcludeArch: x86_64 (#182625) +- .desktop: MimeType: application/x-geomview + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jan 2006 14:43:54 -0000 1.3 +++ sources 12 May 2006 18:53:24 -0000 1.4 @@ -1,3 +1,4 @@ 776c3acefac602c422dacd45119f3560 geomview-snapshot-2004-02-21.tar.gz 109909e66ed37c678af4286cc6e620e2 maniview-2.0.0.tar.gz 8f68b4bd7ae8b207456fbed0650a8330 orrery-0.9.3.tar.gz +f5588be3402850ed4cc9ef0dac48013a geomview.png From fedora-extras-commits at redhat.com Fri May 12 18:58:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 12 May 2006 11:58:43 -0700 Subject: rpms/gpgme/devel gpgme.spec,1.16,1.17 Message-ID: <200605121858.k4CIwjZL007114@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7097 Modified Files: gpgme.spec Log Message: respin Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gpgme.spec 11 May 2006 19:34:16 -0000 1.16 +++ gpgme.spec 12 May 2006 18:58:43 -0000 1.17 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: Applications/System @@ -99,7 +99,7 @@ %changelog -* Mon Mar 6 2006 Rex Dieter 1.1.2-3 +* Mon Mar 6 2006 Rex Dieter 1.1.2-4 - add back support for gpgme-config --thread=pthread * Mon Mar 6 2006 Rex Dieter 1.1.2-2 From fedora-extras-commits at redhat.com Fri May 12 19:21:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:21:44 -0700 Subject: rpms/perl-Test-Portability-Files - New directory Message-ID: <200605121921.k4CJLk79009499@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9478/perl-Test-Portability-Files Log Message: Directory /cvs/extras/rpms/perl-Test-Portability-Files added to the repository From fedora-extras-commits at redhat.com Fri May 12 19:21:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:21:44 -0700 Subject: rpms/perl-Test-Portability-Files/devel - New directory Message-ID: <200605121921.k4CJLkn6009502@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9478/perl-Test-Portability-Files/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Portability-Files/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 19:22:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:22:12 -0700 Subject: rpms/perl-Test-Portability-Files Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605121922.k4CJMEmh009551@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9523 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Portability-Files --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Portability-Files all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 12 19:22:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:22:12 -0700 Subject: rpms/perl-Test-Portability-Files/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605121922.k4CJMEYc009554@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9523/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Portability-Files --- NEW 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 May 12 19:23:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:23:02 -0700 Subject: rpms/perl-Test-Portability-Files import.log,1.1,1.2 Message-ID: <200605121923.k4CJN407009624@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9589 Modified Files: import.log Log Message: auto-import perl-Test-Portability-Files-0.05-1 on branch devel from perl-Test-Portability-Files-0.05-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 19:22:12 -0000 1.1 +++ import.log 12 May 2006 19:23:02 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Portability-Files-0_05-1:HEAD:perl-Test-Portability-Files-0.05-1.src.rpm:1147461768 From fedora-extras-commits at redhat.com Fri May 12 19:23:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:23:03 -0700 Subject: rpms/perl-Test-Portability-Files/devel perl-Test-Portability-Files.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605121923.k4CJN5dw009629@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9589/devel Modified Files: .cvsignore sources Added Files: perl-Test-Portability-Files.spec Log Message: auto-import perl-Test-Portability-Files-0.05-1 on branch devel from perl-Test-Portability-Files-0.05-1.src.rpm --- NEW FILE perl-Test-Portability-Files.spec --- Name: perl-Test-Portability-Files Version: 0.05 Release: 1%{?dist} Summary: Check file names portability License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Portability-Files/ Source0: http://www.cpan.org/authors/id/S/SA/SAPER/Test-Portability-Files-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is used to check the portability across operating systems of the names of the files present in the distribution of a module. The tests use the advices given in "Files and Filesystems" in perlport. The author of a distribution can select which tests to execute. %prep %setup -q -n Test-Portability-Files-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE LICENSE.Artistic LICENSE.GPL README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri May 12 2006 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.66. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 19:22:12 -0000 1.1 +++ .cvsignore 12 May 2006 19:23:03 -0000 1.2 @@ -0,0 +1 @@ +Test-Portability-Files-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 19:22:12 -0000 1.1 +++ sources 12 May 2006 19:23:03 -0000 1.2 @@ -0,0 +1 @@ +2ede77af4d3b82ffb39cd28fda6857e5 Test-Portability-Files-0.05.tar.gz From fedora-extras-commits at redhat.com Fri May 12 19:24:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 12:24:48 -0700 Subject: owners owners.list,1.982,1.983 Message-ID: <200605121924.k4CJOocc009695@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9678 Modified Files: owners.list Log Message: Add perl-Test-Portability-Files. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.982 retrieving revision 1.983 diff -u -r1.982 -r1.983 --- owners.list 12 May 2006 17:15:33 -0000 1.982 +++ owners.list 12 May 2006 19:24:48 -0000 1.983 @@ -1188,6 +1188,7 @@ Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Portability-Files|Check file names portability|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Prereq|Check if Makefile.PL has the right pre-requisites|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-SubCalls|Track the number of times subs are called|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 12 20:18:55 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 12 May 2006 13:18:55 -0700 Subject: rpms/perl-Module-Signature/FC-5 .cvsignore, 1.7, 1.8 perl-Module-Signature.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200605122018.k4CKIv3i012389@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-Signature/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12352/FC-5 Modified Files: .cvsignore perl-Module-Signature.spec sources Log Message: * Fri May 12 2006 Ville Skytt?? - 0.54-1 - 0.54, license changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 Feb 2006 20:43:25 -0000 1.7 +++ .cvsignore 12 May 2006 20:18:54 -0000 1.8 @@ -1 +1 @@ -Module-Signature-0.53.tar.gz +Module-Signature-0.54.tar.gz Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-5/perl-Module-Signature.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Module-Signature.spec 1 Feb 2006 20:43:25 -0000 1.7 +++ perl-Module-Signature.spec 12 May 2006 20:18:54 -0000 1.8 @@ -1,17 +1,10 @@ -# Must use expand to ensure mktemp is run only once -%{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)} - -# Yep, this is a noarch package, but this is to avoid debug*.list which -# interfere with some of the signature tests. -%define debug_package %{nil} - Name: perl-Module-Signature -Version: 0.53 +Version: 0.54 Release: 1%{?dist} Summary: CPAN signature management utilities and modules Group: Development/Libraries -License: GPL or Artistic +License: MIT URL: http://search.cpan.org/dist/Module-Signature/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,12 +24,11 @@ %prep %setup -q -n Module-Signature-%{version} +%{__perl} -pi -e 's/ if want_openpgp\(\);/ if 0;/' Makefile.PL %build -mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg -PERL_AUTOINSTALL=--skipdeps \ -%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null +PERL_AUTOINSTALL=--skipdeps %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -49,12 +41,11 @@ %check -export GNUPGHOME=%{mytempdir}/_gnupg -make test %{!?_with_livetests:TEST_FILES=t/1-basic.t} +make test %clean -rm -rf $RPM_BUILD_ROOT %{mytempdir} +rm -rf $RPM_BUILD_ROOT %files @@ -66,6 +57,9 @@ %changelog +* Fri May 12 2006 Ville Skytt?? - 0.54-1 +- 0.54, license changed to MIT. + * Wed Feb 1 2006 Ville Skytt?? - 0.53-1 - 0.53. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Feb 2006 20:43:25 -0000 1.7 +++ sources 12 May 2006 20:18:54 -0000 1.8 @@ -1 +1 @@ -245d8ed867615e3f15a2a7f36b4d2f89 Module-Signature-0.53.tar.gz +f77964f0d5deb98ea7c1050a8b6a21a5 Module-Signature-0.54.tar.gz From fedora-extras-commits at redhat.com Fri May 12 20:18:55 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 12 May 2006 13:18:55 -0700 Subject: rpms/perl-Module-Signature/devel .cvsignore, 1.7, 1.8 perl-Module-Signature.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200605122019.k4CKIvXM012395@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-Signature/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12352/devel Modified Files: .cvsignore perl-Module-Signature.spec sources Log Message: * Fri May 12 2006 Ville Skytt?? - 0.54-1 - 0.54, license changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 Feb 2006 20:43:25 -0000 1.7 +++ .cvsignore 12 May 2006 20:18:55 -0000 1.8 @@ -1 +1 @@ -Module-Signature-0.53.tar.gz +Module-Signature-0.54.tar.gz Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Module-Signature.spec 1 Feb 2006 20:43:25 -0000 1.7 +++ perl-Module-Signature.spec 12 May 2006 20:18:55 -0000 1.8 @@ -1,17 +1,10 @@ -# Must use expand to ensure mktemp is run only once -%{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)} - -# Yep, this is a noarch package, but this is to avoid debug*.list which -# interfere with some of the signature tests. -%define debug_package %{nil} - Name: perl-Module-Signature -Version: 0.53 +Version: 0.54 Release: 1%{?dist} Summary: CPAN signature management utilities and modules Group: Development/Libraries -License: GPL or Artistic +License: MIT URL: http://search.cpan.org/dist/Module-Signature/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,12 +24,11 @@ %prep %setup -q -n Module-Signature-%{version} +%{__perl} -pi -e 's/ if want_openpgp\(\);/ if 0;/' Makefile.PL %build -mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg -PERL_AUTOINSTALL=--skipdeps \ -%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null +PERL_AUTOINSTALL=--skipdeps %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -49,12 +41,11 @@ %check -export GNUPGHOME=%{mytempdir}/_gnupg -make test %{!?_with_livetests:TEST_FILES=t/1-basic.t} +make test %clean -rm -rf $RPM_BUILD_ROOT %{mytempdir} +rm -rf $RPM_BUILD_ROOT %files @@ -66,6 +57,9 @@ %changelog +* Fri May 12 2006 Ville Skytt?? - 0.54-1 +- 0.54, license changed to MIT. + * Wed Feb 1 2006 Ville Skytt?? - 0.53-1 - 0.53. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Feb 2006 20:43:25 -0000 1.7 +++ sources 12 May 2006 20:18:55 -0000 1.8 @@ -1 +1 @@ -245d8ed867615e3f15a2a7f36b4d2f89 Module-Signature-0.53.tar.gz +f77964f0d5deb98ea7c1050a8b6a21a5 Module-Signature-0.54.tar.gz From fedora-extras-commits at redhat.com Fri May 12 20:23:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:03 -0700 Subject: rpms/perl-Pod-Readme - New directory Message-ID: <200605122023.k4CKN5OO012530@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12503/perl-Pod-Readme Log Message: Directory /cvs/extras/rpms/perl-Pod-Readme added to the repository From fedora-extras-commits at redhat.com Fri May 12 20:23:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:04 -0700 Subject: rpms/perl-Pod-Readme/devel - New directory Message-ID: <200605122023.k4CKN6tu012533@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12503/perl-Pod-Readme/devel Log Message: Directory /cvs/extras/rpms/perl-Pod-Readme/devel added to the repository From fedora-extras-commits at redhat.com Fri May 12 20:23:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:22 -0700 Subject: rpms/perl-Pod-Readme Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605122023.k4CKNOWj012592@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12558 Added Files: Makefile import.log Log Message: Setup of module perl-Pod-Readme --- NEW FILE Makefile --- # Top level Makefile for module perl-Pod-Readme all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 12 20:23:23 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:23 -0700 Subject: rpms/perl-Pod-Readme/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605122023.k4CKNPj1012595@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12558/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Pod-Readme --- NEW 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 May 12 20:23:38 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:38 -0700 Subject: owners owners.list,1.983,1.984 Message-ID: <200605122023.k4CKNelm012629@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12607 Modified Files: owners.list Log Message: Add perl-Pod-Readme. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.983 retrieving revision 1.984 diff -u -r1.983 -r1.984 --- owners.list 12 May 2006 19:24:48 -0000 1.983 +++ owners.list 12 May 2006 20:23:38 -0000 1.984 @@ -1146,6 +1146,7 @@ Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Pod-Readme|Convert POD to README file|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 12 20:23:57 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 13:23:57 -0700 Subject: rpms/fig2ps/devel fig2ps.spec,1.3,1.4 Message-ID: <200605122023.k4CKNxV8012698@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12680 Modified Files: fig2ps.spec Log Message: Add missing dependency. Index: fig2ps.spec =================================================================== RCS file: /cvs/extras/rpms/fig2ps/devel/fig2ps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fig2ps.spec 16 Jan 2006 21:23:15 -0000 1.3 +++ fig2ps.spec 12 May 2006 20:23:57 -0000 1.4 @@ -1,6 +1,6 @@ Name: fig2ps Version: 1.3.5 -Release: 1 +Release: 2%{?dist} Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing @@ -9,7 +9,7 @@ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: tetex-latex tetex-dvips ghostscript transfig +Requires: tetex-latex tetex-dvips ghostscript gv transfig %description fig2ps is a perl script which converts xfig files to postscript or @@ -43,6 +43,10 @@ %config(noreplace) /etc/fig2ps %changelog +* Fri May 12 2006 Quentin Spencer 1.3.5-2 +- Add gv as a dependency. +- Add dist tag. + * Mon Jan 16 2006 Quentin Spencer 1.3.5-1 - New upstream release From fedora-extras-commits at redhat.com Fri May 12 20:23:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:53 -0700 Subject: rpms/perl-Pod-Readme import.log,1.1,1.2 Message-ID: <200605122024.k4CKOQIw012750@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12649 Modified Files: import.log Log Message: auto-import perl-Pod-Readme-0.081-1 on branch devel from perl-Pod-Readme-0.081-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 May 2006 20:23:22 -0000 1.1 +++ import.log 12 May 2006 20:23:53 -0000 1.2 @@ -0,0 +1 @@ +perl-Pod-Readme-0_081-1:HEAD:perl-Pod-Readme-0.081-1.src.rpm:1147465426 From fedora-extras-commits at redhat.com Fri May 12 20:23:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 13:23:54 -0700 Subject: rpms/perl-Pod-Readme/devel perl-Pod-Readme.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605122024.k4CKOQpT012754@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12649/devel Modified Files: .cvsignore sources Added Files: perl-Pod-Readme.spec Log Message: auto-import perl-Pod-Readme-0.081-1 on branch devel from perl-Pod-Readme-0.081-1.src.rpm --- NEW FILE perl-Pod-Readme.spec --- Name: perl-Pod-Readme Version: 0.081 Release: 1%{?dist} Summary: Convert POD to README file License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Pod-Readme/ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Pod-Readme-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) # Core module that appears to be out of date. #BuildRequires: perl(Pod::Text) >= 3.0 Requires: perl(Test::Pod) >= 1.00 Requires: perl(Test::Pod::Coverage) Requires: perl(Test::Portability::Files) # Core module that appears to be out of date. #Requires: perl(Pod::Text) >= 3.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module is a subclass of Pod::PlainText which provides additional POD markup for generating README files. %prep %setup -q -n Pod-Readme-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check DEVEL_TESTS=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{_bindir}/* %{perl_vendorlib}/* %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Fri May 12 2006 Steven Pritchard 0.081-1 - Specfile autogenerated by cpanspec 1.66. - Remove explicit perl dep. - Set DEVEL_TESTS for "Build test". - Add bindir and man1 to file list. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 May 2006 20:23:23 -0000 1.1 +++ .cvsignore 12 May 2006 20:23:54 -0000 1.2 @@ -0,0 +1 @@ +Pod-Readme-0.081.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 May 2006 20:23:23 -0000 1.1 +++ sources 12 May 2006 20:23:54 -0000 1.2 @@ -0,0 +1 @@ +ea05b9a09ad65fbbc1864ef3b2396e64 Pod-Readme-0.081.tar.gz From fedora-extras-commits at redhat.com Fri May 12 20:25:08 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 13:25:08 -0700 Subject: rpms/fig2ps/FC-5 fig2ps.spec,1.3,1.4 Message-ID: <200605122025.k4CKPAf5012849@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12806 Modified Files: fig2ps.spec Log Message: Add missing dependency. Index: fig2ps.spec =================================================================== RCS file: /cvs/extras/rpms/fig2ps/FC-5/fig2ps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fig2ps.spec 16 Jan 2006 21:23:15 -0000 1.3 +++ fig2ps.spec 12 May 2006 20:25:08 -0000 1.4 @@ -1,6 +1,6 @@ Name: fig2ps Version: 1.3.5 -Release: 1 +Release: 2%{?dist} Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing @@ -9,7 +9,7 @@ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: tetex-latex tetex-dvips ghostscript transfig +Requires: tetex-latex tetex-dvips ghostscript gv transfig %description fig2ps is a perl script which converts xfig files to postscript or @@ -43,6 +43,10 @@ %config(noreplace) /etc/fig2ps %changelog +* Fri May 12 2006 Quentin Spencer 1.3.5-2 +- Add gv as a dependency. +- Add dist tag. + * Mon Jan 16 2006 Quentin Spencer 1.3.5-1 - New upstream release From fedora-extras-commits at redhat.com Fri May 12 20:27:26 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 12 May 2006 13:27:26 -0700 Subject: rpms/fig2ps/FC-4 fig2ps.spec,1.3,1.4 Message-ID: <200605122027.k4CKRSvK012941@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/fig2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12924 Modified Files: fig2ps.spec Log Message: Add missing dependency. Index: fig2ps.spec =================================================================== RCS file: /cvs/extras/rpms/fig2ps/FC-4/fig2ps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fig2ps.spec 16 Jan 2006 21:26:19 -0000 1.3 +++ fig2ps.spec 12 May 2006 20:27:26 -0000 1.4 @@ -1,6 +1,6 @@ Name: fig2ps Version: 1.3.5 -Release: 1 +Release: 2%{?dist} Summary: Utility for converting xfig pictures to PS/PDF Group: Applications/Publishing @@ -9,7 +9,7 @@ Source0: http://prdownloads.sourceforge.net/fig2ps/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: tetex-latex tetex-dvips ghostscript transfig +Requires: tetex-latex tetex-dvips ghostscript gv transfig %description fig2ps is a perl script which converts xfig files to postscript or @@ -43,8 +43,10 @@ %config(noreplace) /etc/fig2ps %changelog -* Mon Jan 16 2006 Quentin Spencer 1.3.5-1 +* Fri May 12 2006 Quentin Spencer 1.3.5-1 - New upstream release +- Add gv as a dependency. +- Add dist tag. * Wed Sep 21 2005 Quentin Spencer 1.3.3-2 - fix make install command From fedora-extras-commits at redhat.com Fri May 12 20:48:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 12 May 2006 13:48:10 -0700 Subject: fedora-security/audit fe4,1.21,1.22 fe5,1.19,1.20 Message-ID: <200605122048.k4CKmARW013189@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13168 Modified Files: fe4 fe5 Log Message: awstats issues fixed. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fe4 12 May 2006 01:19:23 -0000 1.21 +++ fe4 12 May 2006 20:48:08 -0000 1.22 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2237 VULNERABLE (awstats) bz#190924 +CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fe5 11 May 2006 00:05:54 -0000 1.19 +++ fe5 12 May 2006 20:48:08 -0000 1.20 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2237 VULNERABLE (awstats) bz#190923 +CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 From fedora-extras-commits at redhat.com Fri May 12 20:56:32 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 12 May 2006 13:56:32 -0700 Subject: mock mock.py,1.43,1.44 Message-ID: <200605122056.k4CKuWbm013399@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13379 Modified Files: mock.py Log Message: commit michael brown's multiple srpms on the command line patch Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- mock.py 8 May 2006 16:39:53 -0000 1.43 +++ mock.py 12 May 2006 20:56:30 -0000 1.44 @@ -810,36 +810,46 @@ else: if args[0] == 'rebuild': if len(args) > 1: - srpm = args[1] + srpms = args[1:] else: error("No package specified to rebuild command.") sys.exit(50) else: - srpm = args[0] + srpms = args[0:] - ts = rpmUtils.transaction.initReadOnlyTransaction() - try: - hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) - except rpmUtils.RpmUtilsError, e: - error("Specified srpm %s cannot be found/opened" % srpm) - sys.exit(50) - - if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: - error("Specified srpm isn't a srpm! Can't go on") - sys.exit(50) + for srpm in srpms: + ts = rpmUtils.transaction.initReadOnlyTransaction() + try: + hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) + except rpmUtils.RpmUtilsError, e: + error("Specified srpm %s cannot be found/opened" % srpm) + sys.exit(50) + if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: + error("Specified srpm isn't a srpm! Can't go on") + sys.exit(50) + + # Prep build root + my = None # if Root() fails, my will be undefined so we force it to None try: - my = None # if Root() fails, my will be undefined so we force it to None my = Root(config_opts) os.umask(0022) # set a umask- protects from paranoid whackjobs with an 002 umask - my.prep() - my.build(srpm) except Error, e: error(e) if my: my.close() sys.exit(e.resultcode) - + + for srpm in srpms: + try: + my.prep() + my.build(srpm) + except Error, e: + error(e) + if my: + my.close() + sys.exit(e.resultcode) + my.close() print "Results and/or logs in: %s" % my.resultdir From fedora-extras-commits at redhat.com Fri May 12 20:57:06 2006 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Fri, 12 May 2006 13:57:06 -0700 Subject: mock mock.py,1.44,1.45 Message-ID: <200605122057.k4CKv6sA013450@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13432 Modified Files: mock.py Log Message: added interactive "shell" command for examining chroots Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- mock.py 12 May 2006 20:56:30 -0000 1.44 +++ mock.py 12 May 2006 20:57:03 -0000 1.45 @@ -800,13 +800,28 @@ print 'Finished initializing root' elif args[0] == 'chroot': + # catch-all for executing arbitrary commands in the chroot config_opts['clean'] = config_opts['quiet'] = False - my= Root(config_opts) + my = Root(config_opts) + cmd = ' '.join(args[1:]) + my.debug("executing: %s" % cmd) my._mount() - my.do_chroot(' '.join(args[1:]), True) + my.do_chroot(cmd, True) my.close() - print 'Finished chroot command' + my.debug('finished chroot command') + elif args[0] == 'shell': + # debugging tool for interactive poking around in the chroot + config_opts['clean'] = config_opts['quiet'] = False + my = Root(config_opts) + cmd = "PS1='mock-chroot> ' %s %s /bin/bash" % (config_opts['chroot'], + my.rootdir) + my.debug("executing: %s" % cmd) + my._mount() + ret = os.system(cmd) + my.close() + my.debug("finished shell with retval %d" % ret) + else: if args[0] == 'rebuild': if len(args) > 1: From fedora-extras-commits at redhat.com Fri May 12 20:57:53 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Fri, 12 May 2006 13:57:53 -0700 Subject: rpms/mercurial/devel .cvsignore, 1.7, 1.8 mercurial.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200605122057.k4CKvtCl013499@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13476 Modified Files: .cvsignore mercurial.spec sources Log Message: Upgrading to mercurial 0.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Apr 2006 19:20:25 -0000 1.7 +++ .cvsignore 12 May 2006 20:57:53 -0000 1.8 @@ -1 +1 @@ -mercurial-0.8.1.tar.gz +mercurial-0.9.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mercurial.spec 10 Apr 2006 19:20:25 -0000 1.9 +++ mercurial.spec 12 May 2006 20:57:53 -0000 1.10 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.8.1 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -44,6 +44,9 @@ %changelog +* Fri May 12 2006 Mihai Ibanescu - 0.9-1 +- update to 0.9 + * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 19:20:25 -0000 1.7 +++ sources 12 May 2006 20:57:53 -0000 1.8 @@ -1 +1 @@ -ffa37810cf9c48608f5172a622bef2f5 mercurial-0.8.1.tar.gz +d4154d12dcbda78251750c2a18eae940 mercurial-0.9.tar.gz From fedora-extras-commits at redhat.com Fri May 12 20:58:00 2006 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Fri, 12 May 2006 13:58:00 -0700 Subject: mock/src mock-helper.c,1.7,1.8 Message-ID: <200605122058.k4CKw0e1013521@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13503 Modified Files: mock-helper.c Log Message: added PS1 to allowed environment (to display special prompt when inside chroot) Index: mock-helper.c =================================================================== RCS file: /cvs/fedora/mock/src/mock-helper.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mock-helper.c 14 Jul 2005 18:00:26 -0000 1.7 +++ mock-helper.c 12 May 2006 20:57:57 -0000 1.8 @@ -25,7 +25,7 @@ static char const * const ALLOWED_ENV[] = { "dist", - "ftp_proxy", "http_proxy", "https_proxy", "no_proxy" + "ftp_proxy", "http_proxy", "https_proxy", "no_proxy", "PS1", }; #define ALLOWED_ENV_SIZE (sizeof (ALLOWED_ENV) / sizeof (ALLOWED_ENV[0])) From fedora-extras-commits at redhat.com Fri May 12 21:01:50 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 12 May 2006 14:01:50 -0700 Subject: rpms/qof/devel qof-gnc-date-test.patch, NONE, 1.1 qof.spec, 1.15, 1.16 qof-gnc-date-char.patch, 1.1, NONE Message-ID: <200605122102.k4CL2OZ7015854@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15826 Modified Files: qof.spec Added Files: qof-gnc-date-test.patch Removed Files: qof-gnc-date-char.patch Log Message: - After talking with upstream it was decided that the supposed char problem was a problem with the test suite. New patch fixes an overflow in the tests. qof-gnc-date-test.patch: --- NEW FILE qof-gnc-date-test.patch --- --- qof-0.6.4/qof/test/test-date.c.bak 2006-05-11 20:47:02.000000000 -0700 +++ qof-0.6.4/qof/test/test-date.c 2006-05-11 23:38:01.000000000 -0700 @@ -370,7 +370,11 @@ srand(time(0)); + /* Get a random time that won't overflow a signed 32bit int durng testing */ ts = *get_random_timespec (); + while (ts.tv_sec >= ((2^31) - (10000*10800))) { + ts = *get_random_timespec(); + }; for (i = 0; i < 10000; i++) { Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- qof.spec 30 Apr 2006 17:34:54 -0000 1.15 +++ qof.spec 12 May 2006 21:01:50 -0000 1.16 @@ -1,6 +1,6 @@ Name: qof Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries @@ -8,7 +8,7 @@ URL: http://qof.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: qof-x86_64.patch -Patch1: qof-gnc-date-char.patch +Patch1: qof-gnc-date-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -116,6 +116,11 @@ %doc html %changelog +* Fri May 12 2006 Toshio Kuratomi - 0.6.4-4 +- After talking with upstream it was decided that the supposed char problem + was a problem with the test suite. New patch fixes an overflow in the + tests. + * Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-3 - Fix stupid in a hurry typo. --- qof-gnc-date-char.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 12 21:05:57 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 12 May 2006 14:05:57 -0700 Subject: rpms/abiword/FC-5 abiword-2.4.4-fontcrash.patch, NONE, 1.1 abiword.spec, 1.35, 1.36 Message-ID: <200605122105.k4CL5xbp015972@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15952 Modified Files: abiword.spec Added Files: abiword-2.4.4-fontcrash.patch Log Message: Fix 182399 abiword-2.4.4-fontcrash.patch: --- NEW FILE abiword-2.4.4-fontcrash.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp 2005-07-05 16:08:20.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp 2006-05-12 21:44:57.000000000 +0200 @@ -133,11 +133,11 @@ { DELETEP(m_pUnixToolbarIcons); + delete m_fontManager; + #if FC_MINOR > 2 FcFini(); #endif - - delete m_fontManager; } bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- abiword.spec 8 May 2006 01:01:29 -0000 1.35 +++ abiword.spec 12 May 2006 21:05:57 -0000 1.36 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -45,6 +45,7 @@ Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.4-docbuild.patch Patch3: abiword-2.4.4-x86_64.patch +Patch4: abiword-2.4.4-fontcrash.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -56,6 +57,7 @@ %patch1 -p1 -b .desktop %patch2 -p1 -b .docbuild %patch3 -p1 -b .x86_64 +%patch4 -p1 -b .fontcrash %build cd abi @@ -137,6 +139,9 @@ %{_datadir}/icons/*png %changelog +* Fri May 12 2006 Marc Maurer - 1:2.4.4-4.fc5 +- Fix bug 182399 - Abiword crashes on exit + * Mon May 08 2006 Marc Maurer - 1:2.4.4-3.fc5 - Fix bug 190591 - crash on x86_64 machines when saving a document From fedora-extras-commits at redhat.com Fri May 12 21:07:01 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Fri, 12 May 2006 14:07:01 -0700 Subject: status-report-scripts parseBZbugList,1.33,1.34 Message-ID: <200605122107.k4CL71gf016039@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16021 Modified Files: parseBZbugList Log Message: Show 25 top reviewers and highlight sponsors. Index: parseBZbugList =================================================================== RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- parseBZbugList 27 Apr 2006 15:45:48 -0000 1.33 +++ parseBZbugList 12 May 2006 21:06:59 -0000 1.34 @@ -85,6 +85,8 @@ = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel"; $main::bzid = "http://fedoraproject.org/wiki/Extras/UsefulScripts?action=AttachFile&do=get&target=bzId_pkg.txt"; +$main::members + = "https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=txt"; $main::cvsDir = "/export/scratch/extras"; $main::currel = 5; $main::firstrel = 1; @@ -123,6 +125,7 @@ my %OWN; my %OWN_DUP; my %OWN_CVS_RECENT; +my %MEMBER; my %CVS_NO_OWNER; my %DISCARD; my %FC_INTEGRATED; @@ -145,6 +148,17 @@ } close IN; } +if ($main::members ne "") { + local *IN; + open IN, "wget -nv -O - --no-check-certificate \"$main::members\"|" + or die "Failed to wget members list : $!"; + while ( ) { + s/\s+$//; + my @F = split /,/; + $MEMBER{$F[1]} = \@F; + } + close IN; +} if ($main::discarded ne "") { local *IN; open IN, "wget -nv -O - \"$main::discarded\"|" @@ -554,15 +568,34 @@ } sub displayOwnerCntWiki { - my ($a, $c, $aref) = @_; - for my $i (0 .. 9) { + my ($a, $c, $aref, $count, $mark) = @_; + if (defined $count) { + $count -= 1; + } else { + $count = 9; + } + for my $i (0 .. $count) { my $n = $$a[$i]; + my $sponsor = 0; $n =~ s/["]//g; - $n =~ s/\@/ at /; - $n =~ s/\./ dot /g; + if (defined $MEMBER{$n}) { + my $a = $MEMBER{$n}; + $n = $$a[2]; + if ($mark == 1 + && ($$a[3] eq "sponsor" || $$a[3] eq "administrator")) { + $sponsor = 1; + } + } else { + $n =~ s/\@/ at /; + $n =~ s/\./ dot /g; + } my $aa = $c->{$$a[$i]}; $aa = $$aa[$aref] if defined $aref; - print "||$n||$aa||\n"; + if ($sponsor == 1) { + print "|| $n||$aa||\n"; + } else { + print "||$n||$aa||\n"; + } } print "\n"; } @@ -728,8 +761,10 @@ print "\nWe have $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n"; print "\n=== Top 10 BZ review requests submitters ===\n"; &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT, undef); - print "\n=== Top 10 BZ review requests reviewers ===\n"; - &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, \%BZREV_CNT, undef); + print "\n=== Top 25 BZ review requests reviewers ===\n"; + print "Sponsors are highlighted in green.\n"; + &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, + \%BZREV_CNT, undef, 25, 1); print "\n\n=== Potential problems ===\n"; if ($COUNT_LIST{"missing"} > 0) { print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ", From fedora-extras-commits at redhat.com Fri May 12 21:24:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 12 May 2006 14:24:44 -0700 Subject: owners owners.list,1.984,1.985 Message-ID: <200605122124.k4CLOk2G016217@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16199/owners Modified Files: owners.list Log Message: Add raidem-music Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.984 retrieving revision 1.985 diff -u -r1.984 -r1.985 --- owners.list 12 May 2006 20:23:38 -0000 1.984 +++ owners.list 12 May 2006 21:24:44 -0000 1.985 @@ -1391,6 +1391,7 @@ Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|raidem-music|Background music for the game raidem|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|rapidsvn|Graphical interface for the Subversion revision control system|rpm at timj.co.uk|extras-qa at fedoraproject.org| Fedora Extras|raptor|Raptor RDF Parser Toolkit for Redland|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 12 21:50:30 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 12 May 2006 14:50:30 -0700 Subject: rpms/qof/FC-5 qof-gnc-date-test.patch, NONE, 1.1 qof.spec, 1.14, 1.15 qof-gnc-date-char.patch, 1.1, NONE Message-ID: <200605122150.k4CLoWBm016388@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16368 Modified Files: qof.spec Added Files: qof-gnc-date-test.patch Removed Files: qof-gnc-date-char.patch Log Message: - After talking with upstream it was decided that the supposed char problem was a problem with the test suite. New patch fixes an overflow in the tests. qof-gnc-date-test.patch: --- NEW FILE qof-gnc-date-test.patch --- --- qof-0.6.4/qof/test/test-date.c.bak 2006-05-11 20:47:02.000000000 -0700 +++ qof-0.6.4/qof/test/test-date.c 2006-05-11 23:38:01.000000000 -0700 @@ -370,7 +370,11 @@ srand(time(0)); + /* Get a random time that won't overflow a signed 32bit int durng testing */ ts = *get_random_timespec (); + while (ts.tv_sec >= ((2^31) - (10000*10800))) { + ts = *get_random_timespec(); + }; for (i = 0; i < 10000; i++) { Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/FC-5/qof.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- qof.spec 30 Apr 2006 20:02:06 -0000 1.14 +++ qof.spec 12 May 2006 21:50:30 -0000 1.15 @@ -1,6 +1,6 @@ Name: qof Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries @@ -8,7 +8,7 @@ URL: http://qof.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: qof-x86_64.patch -Patch1: qof-gnc-date-char.patch +Patch1: qof-gnc-date-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -116,6 +116,11 @@ %doc html %changelog +* Fri May 12 2006 Toshio Kuratomi - 0.6.4-4 +- After talking with upstream it was decided that the supposed char problem + was a problem with the test suite. New patch fixes an overflow in the + tests. + * Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-3 - Fix stupid in a hurry typo. --- qof-gnc-date-char.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 12 21:52:05 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Fri, 12 May 2006 14:52:05 -0700 Subject: rpms/qof/FC-4 qof-gnc-date-test.patch, NONE, 1.1 qof.spec, 1.11, 1.12 qof-gnc-date-char.patch, 1.1, NONE Message-ID: <200605122152.k4CLq7RP016532@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16511 Modified Files: qof.spec Added Files: qof-gnc-date-test.patch Removed Files: qof-gnc-date-char.patch Log Message: - After talking with upstream it was decided that the supposed char problem was a problem with the test suite. New patch fixes an overflow in the tests. qof-gnc-date-test.patch: --- NEW FILE qof-gnc-date-test.patch --- --- qof-0.6.4/qof/test/test-date.c.bak 2006-05-11 20:47:02.000000000 -0700 +++ qof-0.6.4/qof/test/test-date.c 2006-05-11 23:38:01.000000000 -0700 @@ -370,7 +370,11 @@ srand(time(0)); + /* Get a random time that won't overflow a signed 32bit int durng testing */ ts = *get_random_timespec (); + while (ts.tv_sec >= ((2^31) - (10000*10800))) { + ts = *get_random_timespec(); + }; for (i = 0; i < 10000; i++) { Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/FC-4/qof.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qof.spec 1 May 2006 01:17:17 -0000 1.11 +++ qof.spec 12 May 2006 21:52:05 -0000 1.12 @@ -1,6 +1,6 @@ Name: qof Version: 0.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries @@ -8,7 +8,7 @@ URL: http://qof.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: qof-x86_64.patch -Patch1: qof-gnc-date-char.patch +Patch1: qof-gnc-date-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -116,6 +116,11 @@ %doc html %changelog +* Fri May 12 2006 Toshio Kuratomi - 0.6.4-4 +- After talking with upstream it was decided that the supposed char problem + was a problem with the test suite. New patch fixes an overflow in the + tests. + * Sun Apr 30 2006 Toshio Kuratomi - 0.6.4-3 - Fix stupid in a hurry typo. --- qof-gnc-date-char.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 12 22:22:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 12 May 2006 15:22:07 -0700 Subject: owners owners.list,1.985,1.986 Message-ID: <200605122222.k4CMM9Op018923@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18906 Modified Files: owners.list Log Message: removed drscheme and orphaned inti Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.985 retrieving revision 1.986 diff -u -r1.985 -r1.986 --- owners.list 12 May 2006 21:24:44 -0000 1.985 +++ owners.list 12 May 2006 22:22:07 -0000 1.986 @@ -222,7 +222,6 @@ Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|driftnet|Network image sniffer|bnocera at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| @@ -512,7 +511,7 @@ Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org| -Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 12 22:28:17 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 12 May 2006 15:28:17 -0700 Subject: rpms/python-clientform/FC-4 .cvsignore, 1.2, 1.3 python-clientform.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605122228.k4CMSJPH019020@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18983/FC-4 Modified Files: .cvsignore python-clientform.spec sources Log Message: Bump FC5 and FC4 branches to 0.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Nov 2005 13:45:32 -0000 1.2 +++ .cvsignore 12 May 2006 22:28:17 -0000 1.3 @@ -1 +1 @@ -ClientForm-0.1.17.tar.gz +ClientForm-0.2.2.tar.gz Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-4/python-clientform.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-clientform.spec 2 Nov 2005 13:45:32 -0000 1.1 +++ python-clientform.spec 12 May 2006 22:28:17 -0000 1.2 @@ -1,18 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-clientform -Version: 0.1.17 -Release: 3%{?dist} +Version: 0.2.2 +Release: 4%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages License: BSD URL: http://wwwsearch.sourceforge.net/ClientForm/ -Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-0.1.17.tar.gz +Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python, python-setuptools %description ClientForm is a Python module for handling HTML forms on the client side, @@ -30,7 +30,8 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --single-version-externally-managed -O1 \ + --skip-build --root $RPM_BUILD_ROOT %clean @@ -39,12 +40,27 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README.txt -%{python_sitelib}/ClientForm.py -%{python_sitelib}/ClientForm.pyc +%doc COPYING.txt GeneralFAQ.html README.txt README.html examples +%{python_sitelib}/* %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 11 2006 Luke Macken 0.2.2-4 +- Install with --single-version-externally-managed flag +- Add a few more docs + +* Thu May 11 2006 Luke Macken 0.2.2-3 +- Add python-setuptools to BuildRequires + +* Thu May 11 2006 Luke Macken 0.2.2-2 +- Fix version in Source0 + +* Thu May 11 2006 Luke Macken 0.2.2-1 +- Bump to 0.2.2 + +* Tue Feb 14 2006 Josh Boyer 0.1.17-4 +- Bump for FE5 rebuild + * Sun Oct 30 2005 Josh Boyer 0.1.17-3 - Fix up review comments Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Nov 2005 13:45:32 -0000 1.2 +++ sources 12 May 2006 22:28:17 -0000 1.3 @@ -1 +1 @@ -0aa01b3ebcdf800d7ec07c86c7e60b38 ClientForm-0.1.17.tar.gz +2aaff3f85450120b0d3875a221b3cc6e ClientForm-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri May 12 22:28:18 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 12 May 2006 15:28:18 -0700 Subject: rpms/python-clientform/FC-5 .cvsignore, 1.2, 1.3 python-clientform.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605122228.k4CMSKvM019026@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-clientform/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18983/FC-5 Modified Files: .cvsignore python-clientform.spec sources Log Message: Bump FC5 and FC4 branches to 0.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Nov 2005 13:45:32 -0000 1.2 +++ .cvsignore 12 May 2006 22:28:18 -0000 1.3 @@ -1 +1 @@ -ClientForm-0.1.17.tar.gz +ClientForm-0.2.2.tar.gz Index: python-clientform.spec =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-5/python-clientform.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-clientform.spec 15 Feb 2006 03:48:53 -0000 1.2 +++ python-clientform.spec 12 May 2006 22:28:18 -0000 1.3 @@ -1,18 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-clientform -Version: 0.1.17 +Version: 0.2.2 Release: 4%{?dist} Summary: Python module for client-side HTML forms Group: Development/Languages License: BSD URL: http://wwwsearch.sourceforge.net/ClientForm/ -Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-0.1.17.tar.gz +Source0: http://wwwsearch.sourceforge.net/ClientForm/src/ClientForm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python, python-setuptools %description ClientForm is a Python module for handling HTML forms on the client side, @@ -30,7 +30,8 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --single-version-externally-managed -O1 \ + --skip-build --root $RPM_BUILD_ROOT %clean @@ -39,12 +40,24 @@ %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README.txt -%{python_sitelib}/ClientForm.py -%{python_sitelib}/ClientForm.pyc +%doc COPYING.txt GeneralFAQ.html README.txt README.html examples +%{python_sitelib}/* %ghost %{python_sitelib}/ClientForm.pyo %changelog +* Thu May 11 2006 Luke Macken 0.2.2-4 +- Install with --single-version-externally-managed flag +- Add a few more docs + +* Thu May 11 2006 Luke Macken 0.2.2-3 +- Add python-setuptools to BuildRequires + +* Thu May 11 2006 Luke Macken 0.2.2-2 +- Fix version in Source0 + +* Thu May 11 2006 Luke Macken 0.2.2-1 +- Bump to 0.2.2 + * Tue Feb 14 2006 Josh Boyer 0.1.17-4 - Bump for FE5 rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-clientform/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Nov 2005 13:45:32 -0000 1.2 +++ sources 12 May 2006 22:28:18 -0000 1.3 @@ -1 +1 @@ -0aa01b3ebcdf800d7ec07c86c7e60b38 ClientForm-0.1.17.tar.gz +2aaff3f85450120b0d3875a221b3cc6e ClientForm-0.2.2.tar.gz From fedora-extras-commits at redhat.com Fri May 12 22:56:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 15:56:04 -0700 Subject: rpms/perl-Test-Portability-Files/devel perl-Test-Portability-Files.spec, 1.1, 1.2 Message-ID: <200605122256.k4CMu69m019375@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19358 Modified Files: perl-Test-Portability-Files.spec Log Message: Use Makefile.PL temporarily to work around Module::Build breakage. Index: perl-Test-Portability-Files.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/devel/perl-Test-Portability-Files.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Portability-Files.spec 12 May 2006 19:23:03 -0000 1.1 +++ perl-Test-Portability-Files.spec 12 May 2006 22:56:04 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Portability-Files Version: 0.05 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Check file names portability License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/S/SA/SAPER/Test-Portability-Files-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Module::Build) +#BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,19 +21,24 @@ %setup -q -n Test-Portability-Files-%{version} %build -%{__perl} Build.PL installdirs=vendor -./Build +#%{__perl} Build.PL installdirs=vendor +%{__perl} Makefile.PL INSTALLDIRS=vendor +#./Build +make %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -./Build test +#./Build test +make test %clean rm -rf $RPM_BUILD_ROOT @@ -45,5 +50,8 @@ %{_mandir}/man3/* %changelog +* Fri May 12 2006 Steven Pritchard 0.05-2 +- Use Makefile.PL temporarily to work around Module::Build breakage. + * Fri May 12 2006 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.66. From fedora-extras-commits at redhat.com Fri May 12 23:16:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 12 May 2006 16:16:27 -0700 Subject: rpms/perl-Pod-Readme/devel perl-Pod-Readme.spec,1.1,1.2 Message-ID: <200605122316.k4CNGTu2021762@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21745 Modified Files: perl-Pod-Readme.spec Log Message: Use Makefile.PL temporarily to work around Module::Build breakage. Index: perl-Pod-Readme.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/devel/perl-Pod-Readme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Pod-Readme.spec 12 May 2006 20:23:54 -0000 1.1 +++ perl-Pod-Readme.spec 12 May 2006 23:16:27 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Pod-Readme Version: 0.081 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert POD to README file License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Pod-Readme-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Module::Build) +#BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) @@ -29,19 +29,24 @@ %setup -q -n Pod-Readme-%{version} %build -%{__perl} Build.PL installdirs=vendor -./Build +#%{__perl} Build.PL installdirs=vendor +%{__perl} Makefile.PL INSTALLDIRS=vendor +#./Build +make %install rm -rf $RPM_BUILD_ROOT -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -DEVEL_TESTS=1 ./Build test +#DEVEL_TESTS=1 ./Build test +DEVEL_TESTS=1 make test %clean rm -rf $RPM_BUILD_ROOT @@ -55,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Fri May 12 2006 Steven Pritchard 0.081-2 +- Use Makefile.PL temporarily to work around Module::Build breakage. + * Fri May 12 2006 Steven Pritchard 0.081-1 - Specfile autogenerated by cpanspec 1.66. - Remove explicit perl dep. From fedora-extras-commits at redhat.com Sat May 13 00:13:43 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 12 May 2006 17:13:43 -0700 Subject: extras-repoclosure rc-run.py,1.1,1.2 yum.repoclosure.conf,1.1,NONE Message-ID: <200605130013.k4D0DhZd024248@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229 Modified Files: rc-run.py Removed Files: yum.repoclosure.conf Log Message: create yum conffile on-the-fly Index: rc-run.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rc-run.py 30 Apr 2006 11:11:51 -0000 1.1 +++ rc-run.py 13 May 2006 00:13:40 -0000 1.2 @@ -5,6 +5,7 @@ import fcntl, os, sys import datetime, time +import tempfile allreleases = [ '3', '4', '5', 'development' ] @@ -17,14 +18,63 @@ repos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'], '4' : ['fedora-core','fedora-core-updates','fedora-extras'], '5' : ['fedora-core','fedora-core-updates','fedora-extras'], - 'development' : ['fedora-core','fedora-extras'] + 'development' : ['fedora-core-development','fedora-extras'] } +reponames = { 'fedora-core' : 'Fedora Core', + 'fedora-core-development' : 'Fedora Core Development Tree', + 'fedora-core-updates' : 'Fedora Core Released Updates', + 'fedora-extras' : 'Fedora Extras' + } + +# (%s, %s) = (release, arch) +baseurls = { 'fedora-core' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/os/', + 'fedora-core-development' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/', + 'fedora-core-updates' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/updates/%s/%s/', + 'fedora-extras' : 'file:///srv/rpmbuild/extras/tree/extras/%s/%s/' + } + targetarchs = { 'i386' : 'i686', 'x86_64' : 'x86_64', 'ppc' : 'ppc' } +def generateConfig(): + try: + (fd, conffile) = tempfile.mkstemp() + except: + conffile = tempfile.mktemp() + fd = os.open(conffile,os.O_RDWR|os.O_CREAT) + confheader = """[main] +cachedir=/var/cache/yum +debuglevel=2 +logfile=/var/log/yum.log +pkgpolicy=newest +distroverpkg=fedora-release +reposdir=/dev/null +exactarch=1 +obsoletes=1 +retries=20 + +""" + os.write(fd,confheader) + for release in allreleases: + for repo in repos[release]: + for arch in archs[release]: + reposection = """[%s-%s-%s] +name=%s %s - %s +baseurl=%s +enabled=0 + +""" % (repo, release, arch, + reponames[repo], release, arch, + baseurls[repo] % (release,arch)) + os.write(fd,reposection) + + os.close(fd) + return conffile + + def makereport(): try: os.remove(logfilename) @@ -36,7 +86,7 @@ repoid = '%s-%s-%s' % (r,release,arch) rcargs += ('-r %s ' % repoid) # -n, --newest : yum-utils 0.5 - rc = os.system('./rc-modified -q -n -c ./yum.repoclosure.conf %s >> %s' % (rcargs,logfilename)) + rc = os.system('./rc-modified -q -n -c %s %s >> %s' % (conffile,rcargs,logfilename)) if rc: return False return True @@ -77,6 +127,8 @@ sys.exit(22) releases = [release] +conffile = generateConfig() + goodlogs = [] badlogs = [] for release in releases: --- yum.repoclosure.conf DELETED --- From fedora-extras-commits at redhat.com Sat May 13 01:32:42 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:32:42 -0700 Subject: rpms/fedora-package-config-apt - New directory Message-ID: <200605130132.k4D1WioN026947@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26920/fedora-package-config-apt Log Message: Directory /cvs/extras/rpms/fedora-package-config-apt added to the repository From fedora-extras-commits at redhat.com Sat May 13 01:32:43 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:32:43 -0700 Subject: rpms/fedora-package-config-apt/devel - New directory Message-ID: <200605130132.k4D1Wj0A026951@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26920/fedora-package-config-apt/devel Log Message: Directory /cvs/extras/rpms/fedora-package-config-apt/devel added to the repository From fedora-extras-commits at redhat.com Sat May 13 01:33:02 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:33:02 -0700 Subject: rpms/fedora-package-config-apt Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605130133.k4D1X4j4027013@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26979 Added Files: Makefile import.log Log Message: Setup of module fedora-package-config-apt --- NEW FILE Makefile --- # Top level Makefile for module fedora-package-config-apt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 13 01:33:03 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:33:03 -0700 Subject: rpms/fedora-package-config-apt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605130133.k4D1X5fO027014@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26979/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fedora-package-config-apt --- NEW 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 May 13 01:34:06 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:34:06 -0700 Subject: rpms/fedora-package-config-apt import.log,1.1,1.2 Message-ID: <200605130134.k4D1Y8X8027128@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27092 Modified Files: import.log Log Message: auto-import fedora-package-config-apt-5.89-3 on branch devel from fedora-package-config-apt-5.89-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 May 2006 01:33:02 -0000 1.1 +++ import.log 13 May 2006 01:34:06 -0000 1.2 @@ -0,0 +1 @@ +fedora-package-config-apt-5_89-3:HEAD:fedora-package-config-apt-5.89-3.src.rpm:1147484035 From fedora-extras-commits at redhat.com Sat May 13 01:34:07 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:34:07 -0700 Subject: rpms/fedora-package-config-apt/devel fedora-core.list, NONE, 1.1 fedora-extras.list, NONE, 1.1 fedora-package-config-apt.spec, NONE, 1.1 fedora-updates.list, NONE, 1.1 fedora-vendor.list, NONE, 1.1 fedora.conf, NONE, 1.1 Message-ID: <200605130134.k4D1Y9JC027131@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27092/devel Added Files: fedora-core.list fedora-extras.list fedora-package-config-apt.spec fedora-updates.list fedora-vendor.list fedora.conf Log Message: auto-import fedora-package-config-apt-5.89-3 on branch devel from fedora-package-config-apt-5.89-3.src.rpm --- NEW FILE fedora-core.list --- # Fedora Core repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/os/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/debug/ # sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/source/SRPMS/ --- NEW FILE fedora-extras.list --- # Fedora Extras repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/debug/ # Sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/SRPMS/ --- NEW FILE fedora-package-config-apt.spec --- Summary: Fedora configuration files for the apt-rpm package manager Name: fedora-package-config-apt Version: 5.89 Release: 3 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ # 100-149 for sources.list.d Source100: fedora-core.list Source101: fedora-extras.list Source102: fedora-updates.list # 150-199 for apt.conf.d # additional "factory defaults" for fedora Source150: fedora.conf # 200-249 for additional trusted gpg keys # 250-299 for vendor.list.d Source250: fedora-vendor.list BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch # We need an apt that speaks repo-md Requires: apt >= 0.5.15lorg3 Provides: apt-config %description This package contains apt-rpm configuration files for Fedora (Core, Updates and Extras). %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d # install config parts install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/ # Fedora Extras fingerprint install -pm 644 %{SOURCE250} \ %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list # Default source list entries for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/ done %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) # NOTE: no noreplace because we WANT to be able to change the defaults # without user intervention! %config %{_sysconfdir}/apt/apt.conf.d/fedora.conf %config %{_sysconfdir}/apt/sources.list.d/* %config %{_sysconfdir}/apt/vendors.list.d/* %changelog * Thu May 11 2006 Axel Thimm - 5.89-3 - Apply comments from review #191040c3 (by Ville). - Fix summary and description - Config files are arch-independent, so we should become noarch - Create versioned dependency on apt (make sure it's repo-md capable) This creates a circular dependency which should not impose any issues. * Tue May 9 2006 Axel Thimm - 5.89-2 - Fix whitespace (by Panu in bug #191040c1). * Mon May 8 2006 Axel Thimm - 5.89-1 - Split off configuration files from apt. --- NEW FILE fedora-updates.list --- # Fedora Core repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/ # Debug packages #repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/debug/ # sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/SRPMS/ --- NEW FILE fedora-vendor.list --- simple-key "extras" { Fingerprint "5389DD00C5BC516812B4327282ED95041AC70CE6"; Name "Fedora Project "; } --- NEW FILE fedora.conf --- // // These are "factory defaults", DO NOT CHANGE! // APT { // Options for apt-get DistroVerPkg "fedora-release"; }; // Options for the downloading routines Acquire { http::User-Agent "Fedora APT-HTTP/1.3"; }; From fedora-extras-commits at redhat.com Sat May 13 01:35:49 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Fri, 12 May 2006 18:35:49 -0700 Subject: owners owners.list,1.986,1.987 Message-ID: <200605130135.k4D1ZpuF027215@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27189 Modified Files: owners.list Log Message: Add fedora-package-config-apt Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.986 retrieving revision 1.987 diff -u -r1.986 -r1.987 --- owners.list 12 May 2006 22:22:07 -0000 1.986 +++ owners.list 13 May 2006 01:35:49 -0000 1.987 @@ -262,6 +262,7 @@ Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org| +Fedora Extras|fedora-package-config-apt|Fedora configuration files for the apt-rpm package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org| Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 13 05:10:32 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Fri, 12 May 2006 22:10:32 -0700 Subject: rpms/torque/devel torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6 Message-ID: <200605130510.k4D5AY8P004278@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4256 Modified Files: torque.spec Added Files: torque-2.1.0p0-mom_sync_jobs-fixes.patch Log Message: * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled torque-2.1.0p0-mom_sync_jobs-fixes.patch: --- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch --- Index: src/server/node_manager.c =================================================================== RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v retrieving revision 1.64 retrieving revision 1.66 diff -r1.64 -r1.66 736,738c736 < if ((pjob == NULL) || < ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) && < (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING))) --- > if (pjob == NULL) 740c738 < /* job is reported by mom but server has no record of job on node */ --- > /* job is reported by mom but server has no record of job */ 742c740 < sprintf(log_buffer,"stray job %s found on %s (substate=%d)", --- > sprintf(log_buffer,"stray job %s found on %s", 744,745c742 < np->nd_name, < (pjob != NULL) ? pjob->ji_qs.ji_substate : -1); --- > np->nd_name); 749,755d745 < if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) < { < log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); < < break; < } < 762c752,772 < strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); --- > if (conn >= 0) > { > if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) > { > log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); > > svr_disconnect(conn); > } > else > { > strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); > > if (issue_Drequest(conn,preq,release_req,0) != 0) > { > /* release_req will free preq and close connection if successful */ > free_br(preq); > > svr_disconnect(conn); > } > } > } 764,766c774 < issue_Drequest(conn,preq,release_req,0); < < /* release_req will free preq and close connection */ --- > DIS_rpp_reset(); Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torque.spec 11 May 2006 21:26:06 -0000 1.5 +++ torque.spec 13 May 2006 05:10:31 -0000 1.6 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -91,6 +91,7 @@ Source4: xpbs.png Source5: xpbsmon.png Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -119,6 +120,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p0 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -423,6 +425,9 @@ %changelog +* Fri May 12 2006 Garrick Staples 2.1.0p0-2 +- fix pbs_server segfault when mom_job_sync is enabled + * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release From fedora-extras-commits at redhat.com Sat May 13 05:13:20 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Fri, 12 May 2006 22:13:20 -0700 Subject: rpms/torque/FC-5 torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6 Message-ID: <200605130513.k4D5DMiI004366@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346 Modified Files: torque.spec Added Files: torque-2.1.0p0-mom_sync_jobs-fixes.patch Log Message: * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled torque-2.1.0p0-mom_sync_jobs-fixes.patch: --- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch --- Index: src/server/node_manager.c =================================================================== RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v retrieving revision 1.64 retrieving revision 1.66 diff -r1.64 -r1.66 736,738c736 < if ((pjob == NULL) || < ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) && < (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING))) --- > if (pjob == NULL) 740c738 < /* job is reported by mom but server has no record of job on node */ --- > /* job is reported by mom but server has no record of job */ 742c740 < sprintf(log_buffer,"stray job %s found on %s (substate=%d)", --- > sprintf(log_buffer,"stray job %s found on %s", 744,745c742 < np->nd_name, < (pjob != NULL) ? pjob->ji_qs.ji_substate : -1); --- > np->nd_name); 749,755d745 < if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) < { < log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); < < break; < } < 762c752,772 < strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); --- > if (conn >= 0) > { > if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) > { > log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); > > svr_disconnect(conn); > } > else > { > strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); > > if (issue_Drequest(conn,preq,release_req,0) != 0) > { > /* release_req will free preq and close connection if successful */ > free_br(preq); > > svr_disconnect(conn); > } > } > } 764,766c774 < issue_Drequest(conn,preq,release_req,0); < < /* release_req will free preq and close connection */ --- > DIS_rpp_reset(); Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torque.spec 11 May 2006 21:58:11 -0000 1.5 +++ torque.spec 13 May 2006 05:13:20 -0000 1.6 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -91,6 +91,7 @@ Source4: xpbs.png Source5: xpbsmon.png Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -119,6 +120,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p0 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -423,6 +425,9 @@ %changelog +* Fri May 12 2006 Garrick Staples 2.1.0p0-2 +- fix pbs_server segfault when mom_job_sync is enabled + * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release From fedora-extras-commits at redhat.com Sat May 13 05:14:04 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Fri, 12 May 2006 22:14:04 -0700 Subject: rpms/torque/FC-4 torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6 Message-ID: <200605130514.k4D5E62r004442@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4422 Modified Files: torque.spec Added Files: torque-2.1.0p0-mom_sync_jobs-fixes.patch Log Message: * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled torque-2.1.0p0-mom_sync_jobs-fixes.patch: --- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch --- Index: src/server/node_manager.c =================================================================== RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v retrieving revision 1.64 retrieving revision 1.66 diff -r1.64 -r1.66 736,738c736 < if ((pjob == NULL) || < ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) && < (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING))) --- > if (pjob == NULL) 740c738 < /* job is reported by mom but server has no record of job on node */ --- > /* job is reported by mom but server has no record of job */ 742c740 < sprintf(log_buffer,"stray job %s found on %s (substate=%d)", --- > sprintf(log_buffer,"stray job %s found on %s", 744,745c742 < np->nd_name, < (pjob != NULL) ? pjob->ji_qs.ji_substate : -1); --- > np->nd_name); 749,755d745 < if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) < { < log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); < < break; < } < 762c752,772 < strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); --- > if (conn >= 0) > { > if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) > { > log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); > > svr_disconnect(conn); > } > else > { > strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); > > if (issue_Drequest(conn,preq,release_req,0) != 0) > { > /* release_req will free preq and close connection if successful */ > free_br(preq); > > svr_disconnect(conn); > } > } > } 764,766c774 < issue_Drequest(conn,preq,release_req,0); < < /* release_req will free preq and close connection */ --- > DIS_rpp_reset(); Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torque.spec 11 May 2006 21:58:50 -0000 1.5 +++ torque.spec 13 May 2006 05:14:04 -0000 1.6 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -91,6 +91,7 @@ Source4: xpbs.png Source5: xpbsmon.png Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -119,6 +120,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p0 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -423,6 +425,9 @@ %changelog +* Fri May 12 2006 Garrick Staples 2.1.0p0-2 +- fix pbs_server segfault when mom_job_sync is enabled + * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release From fedora-extras-commits at redhat.com Sat May 13 05:14:47 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Fri, 12 May 2006 22:14:47 -0700 Subject: rpms/torque/FC-3 torque-2.1.0p0-mom_sync_jobs-fixes.patch, NONE, 1.1 torque.spec, 1.5, 1.6 Message-ID: <200605130514.k4D5En9a004518@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4498 Modified Files: torque.spec Added Files: torque-2.1.0p0-mom_sync_jobs-fixes.patch Log Message: * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled torque-2.1.0p0-mom_sync_jobs-fixes.patch: --- NEW FILE torque-2.1.0p0-mom_sync_jobs-fixes.patch --- Index: src/server/node_manager.c =================================================================== RCS file: /usr/local/nfs/src/cvs_repository/torque/src/server/node_manager.c,v retrieving revision 1.64 retrieving revision 1.66 diff -r1.64 -r1.66 736,738c736 < if ((pjob == NULL) || < ((pjob->ji_qs.ji_substate != JOB_SUBSTATE_SUSPEND) && < (pjob->ji_qs.ji_substate != JOB_SUBSTATE_RUNNING))) --- > if (pjob == NULL) 740c738 < /* job is reported by mom but server has no record of job on node */ --- > /* job is reported by mom but server has no record of job */ 742c740 < sprintf(log_buffer,"stray job %s found on %s (substate=%d)", --- > sprintf(log_buffer,"stray job %s found on %s", 744,745c742 < np->nd_name, < (pjob != NULL) ? pjob->ji_qs.ji_substate : -1); --- > np->nd_name); 749,755d745 < if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) < { < log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); < < break; < } < 762c752,772 < strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); --- > if (conn >= 0) > { > if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL) > { > log_err(-1,id,"unable to allocate DeleteJob request - big trouble!"); > > svr_disconnect(conn); > } > else > { > strcpy(preq->rq_ind.rq_delete.rq_objname,jobidstr); > > if (issue_Drequest(conn,preq,release_req,0) != 0) > { > /* release_req will free preq and close connection if successful */ > free_br(preq); > > svr_disconnect(conn); > } > } > } 764,766c774 < issue_Drequest(conn,preq,release_req,0); < < /* release_req will free preq and close connection */ --- > DIS_rpp_reset(); Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torque.spec 11 May 2006 21:59:12 -0000 1.5 +++ torque.spec 13 May 2006 05:14:47 -0000 1.6 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 1 +%define release 2 # The following options are supported: # --with server_name=hostname @@ -91,6 +91,7 @@ Source4: xpbs.png Source5: xpbsmon.png Patch1: torque-2.1.0-remove-rpath.path +Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) Group: System Environment/Daemons URL: http://www.clusterresources.com/products/torque/ @@ -119,6 +120,7 @@ %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} %patch1 -p1 +%patch2 -p0 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -423,6 +425,9 @@ %changelog +* Fri May 12 2006 Garrick Staples 2.1.0p0-2 +- fix pbs_server segfault when mom_job_sync is enabled + * Thu May 11 2006 Garrick Staples 2.1.0p0-1 - bump to final release From fedora-extras-commits at redhat.com Sat May 13 07:17:40 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 13 May 2006 00:17:40 -0700 Subject: comps comps-fe5.xml.in,1.48,1.49 Message-ID: <200605130717.k4D7Hgjq009445@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9428/comps Modified Files: comps-fe5.xml.in Log Message: add childsplay Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- comps-fe5.xml.in 9 May 2006 22:15:42 -0000 1.48 +++ comps-fe5.xml.in 13 May 2006 07:17:39 -0000 1.49 @@ -206,6 +206,7 @@ bzflag celestia cgoban + childsplay crystal-stacker crystal-stacker-themes csmash From fedora-extras-commits at redhat.com Sat May 13 07:18:37 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 13 May 2006 00:18:37 -0700 Subject: comps comps-fe5.xml.in,1.49,1.50 comps-fe6.xml.in,1.12,1.13 Message-ID: <200605130718.k4D7IdfJ009476@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9457/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: move childsplay from Games to Educational Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- comps-fe5.xml.in 13 May 2006 07:17:39 -0000 1.49 +++ comps-fe5.xml.in 13 May 2006 07:18:37 -0000 1.50 @@ -206,7 +206,6 @@ bzflag celestia cgoban - childsplay crystal-stacker crystal-stacker-themes csmash @@ -272,6 +271,7 @@ false true + childsplay drgeo drgeo-doc gcompris Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- comps-fe6.xml.in 11 May 2006 18:29:59 -0000 1.12 +++ comps-fe6.xml.in 13 May 2006 07:18:37 -0000 1.13 @@ -206,7 +206,6 @@ bzflag celestia cgoban - childsplay crystal-stacker crystal-stacker-themes csmash @@ -272,6 +271,7 @@ false true + childsplay drgeo drgeo-doc gcompris From fedora-extras-commits at redhat.com Sat May 13 09:15:44 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 13 May 2006 02:15:44 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo.spec,1.20,1.21 Message-ID: <200605130915.k4D9Fkic014761@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14728/FC-5 Modified Files: xemacs-sumo.spec Log Message: *sigh* Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xemacs-sumo.spec 11 May 2006 16:34:27 -0000 1.20 +++ xemacs-sumo.spec 13 May 2006 09:15:44 -0000 1.21 @@ -1,11 +1,15 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v) +%if "%fedora" >= "6" +%define xemver 21.5 +%else +%define xemver 21.4 +%endif Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 1%{?dist} +Release: 2%{?dist} Summary: XEmacs lisp packages Group: Applications/Editors @@ -128,7 +132,7 @@ rmdir mule-packages/{etc,lisp,man}/skk # not needed (and unusable) with >= 21.5 -if [ "%{xemver}" '>' "21.5." ] ; then +if [ ! "%{xemver}" '<' "21.5" ] ; then %{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" rm -rf mule-packages/{etc,lisp,man}/mule-ucs @@ -224,6 +228,9 @@ %changelog +* Sat May 13 2006 Ville Skytt?? - 20060510-2 +- Try to work around build system quirks in finding the XEmacs version. + * Wed May 10 2006 Ville Skytt?? - 20060510-1 - 2006-05-10; pydoc and latin-unity patches applied upstream. - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). From fedora-extras-commits at redhat.com Sat May 13 09:15:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 13 May 2006 02:15:45 -0700 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.20,1.21 Message-ID: <200605130915.k4D9FlX6014767@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14728/devel Modified Files: xemacs-sumo.spec Log Message: *sigh* Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xemacs-sumo.spec 11 May 2006 16:34:28 -0000 1.20 +++ xemacs-sumo.spec 13 May 2006 09:15:45 -0000 1.21 @@ -1,11 +1,15 @@ %define sumo 2006-05-10 %define pkgdir %{_datadir}/xemacs %define xemacsb xemacs-nox -batch -vanilla -%define xemver %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v) +%if "%fedora" >= "6" +%define xemver 21.5 +%else +%define xemver 21.4 +%endif Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 1%{?dist} +Release: 2%{?dist} Summary: XEmacs lisp packages Group: Applications/Editors @@ -128,7 +132,7 @@ rmdir mule-packages/{etc,lisp,man}/skk # not needed (and unusable) with >= 21.5 -if [ "%{xemver}" '>' "21.5." ] ; then +if [ ! "%{xemver}" '<' "21.5" ] ; then %{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")" rm -rf mule-packages/{etc,lisp,man}/mule-ucs @@ -224,6 +228,9 @@ %changelog +* Sat May 13 2006 Ville Skytt?? - 20060510-2 +- Try to work around build system quirks in finding the XEmacs version. + * Wed May 10 2006 Ville Skytt?? - 20060510-1 - 2006-05-10; pydoc and latin-unity patches applied upstream. - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151). From fedora-extras-commits at redhat.com Sat May 13 09:43:28 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 13 May 2006 02:43:28 -0700 Subject: rpms/fedora-package-config-smart/FC-4 fedora-package-config-smart.spec, 1.3, 1.4 Message-ID: <200605130943.k4D9hUDE016061@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016/FC-4 Modified Files: fedora-package-config-smart.spec Log Message: Fix #191580 and several other syncs with the apt sibling Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/fedora-package-config-smart.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-package-config-smart.spec 20 Apr 2006 14:02:46 -0000 1.3 +++ fedora-package-config-smart.spec 13 May 2006 09:43:28 -0000 1.4 @@ -1,16 +1,18 @@ -Summary: Configuration files for the smart package manager +Summary: Fedora configuration files for the smart package manager Name: fedora-package-config-smart Version: 4 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires: smart Provides: smart-config %description -This package contains configuration files for smart. +This package contains smart configuration files for Fedora (Core, +Updates and Extras). %prep %setup -q @@ -36,6 +38,9 @@ %config(noreplace) %{_sysconfdir}/smart/channels/*.channel %changelog +* Sat May 13 2006 Axel Thimm - 4-5 +- Sync with fedora-package-config-apt, see also #191580. + * Thu Apr 20 2006 Axel Thimm - 4-4 - Add virtual smart-config provides (#175630 comment 13). From fedora-extras-commits at redhat.com Sat May 13 09:43:29 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 13 May 2006 02:43:29 -0700 Subject: rpms/fedora-package-config-smart/FC-5 fedora-package-config-smart.spec, 1.2, 1.3 Message-ID: <200605130943.k4D9hV5G016063@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016/FC-5 Modified Files: fedora-package-config-smart.spec Log Message: Fix #191580 and several other syncs with the apt sibling Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-5/fedora-package-config-smart.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-package-config-smart.spec 20 Apr 2006 14:02:49 -0000 1.2 +++ fedora-package-config-smart.spec 13 May 2006 09:43:29 -0000 1.3 @@ -1,16 +1,18 @@ -Summary: Configuration files for the smart package manager +Summary: Fedora configuration files for the smart package manager Name: fedora-package-config-smart Version: 5 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires: smart Provides: smart-config %description -This package contains configuration files for smart. +This package contains smart configuration files for Fedora (Core, +Updates and Extras). %prep %setup -q @@ -36,6 +38,9 @@ %config(noreplace) %{_sysconfdir}/smart/channels/*.channel %changelog +* Sat May 13 2006 Axel Thimm - 5-6 +- Sync with fedora-package-config-apt, see also #191580. + * Thu Apr 20 2006 Axel Thimm - 5-5 - Add virtual smart-config provides (#175630 comment 13). From fedora-extras-commits at redhat.com Sat May 13 09:43:29 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 13 May 2006 02:43:29 -0700 Subject: rpms/fedora-package-config-smart/devel fedora-package-config-smart.spec, 1.2, 1.3 Message-ID: <200605130943.k4D9hVa1016067@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-smart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016/devel Modified Files: fedora-package-config-smart.spec Log Message: Fix #191580 and several other syncs with the apt sibling Index: fedora-package-config-smart.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/fedora-package-config-smart.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-package-config-smart.spec 20 Apr 2006 14:03:00 -0000 1.2 +++ fedora-package-config-smart.spec 13 May 2006 09:43:29 -0000 1.3 @@ -1,16 +1,18 @@ -Summary: Configuration files for the smart package manager +Summary: Fedora configuration files for the smart package manager Name: fedora-package-config-smart Version: 5.89 -Release: 6 +Release: 7 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires: smart Provides: smart-config %description -This package contains configuration files for smart. +This package contains smart configuration files for Fedora (Core, +Updates and Extras). %prep %setup -q @@ -36,6 +38,9 @@ %config(noreplace) %{_sysconfdir}/smart/channels/*.channel %changelog +* Sat May 13 2006 Axel Thimm - 5.89-7 +- Sync with fedora-package-config-apt, see also #191580. + * Thu Apr 20 2006 Axel Thimm - 5.89-6 - Update to rawhide config. From fedora-extras-commits at redhat.com Sat May 13 10:49:19 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sat, 13 May 2006 03:49:19 -0700 Subject: rpms/abiword/FC-4 abiword-2.4.4-fontcrash.patch, NONE, 1.1 abiword.spec, 1.24, 1.25 Message-ID: <200605131049.k4DAnL3o018786@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18765 Modified Files: abiword.spec Added Files: abiword-2.4.4-fontcrash.patch Log Message: Fix crash on exit abiword-2.4.4-fontcrash.patch: --- NEW FILE abiword-2.4.4-fontcrash.patch --- diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp --- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp 2005-07-05 16:08:20.000000000 +0200 +++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp 2006-05-12 21:44:57.000000000 +0200 @@ -133,11 +133,11 @@ { DELETEP(m_pUnixToolbarIcons); + delete m_fontManager; + #if FC_MINOR > 2 FcFini(); #endif - - delete m_fontManager; } bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- abiword.spec 8 May 2006 11:15:20 -0000 1.24 +++ abiword.spec 13 May 2006 10:49:19 -0000 1.25 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -44,6 +44,7 @@ Patch1: abiword-2.4.4-desktop.patch Patch2: abiword-2.4.4-docbuild.patch Patch3: abiword-2.4.4-x86_64.patch +Patch4: abiword-2.4.4-fontcrash.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -55,6 +56,7 @@ %patch1 -p1 -b .desktop %patch2 -p1 -b .docbuild %patch3 -p1 -b .x86_64 +%patch4 -p1 -b .fontcrash %build cd abi @@ -138,6 +140,9 @@ %{_datadir}/icons/*png %changelog +* Sat May 13 2006 Marc Maurer - 1:2.4.4-4.fc4 +- Fix bug 182399 - Abiword crashes on exit + * Mon May 08 2006 Marc Maurer - 1:2.4.4-3.fc4 - Fix bug 190591 - crash on x86_64 machines when saving a document From fedora-extras-commits at redhat.com Sat May 13 12:38:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 13 May 2006 05:38:58 -0700 Subject: rpms/gcompris/devel gcompris-7.4-xf86vidmode.patch,1.3,1.4 Message-ID: <200605131239.k4DCd0Km024123@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24103 Modified Files: gcompris-7.4-xf86vidmode.patch Log Message: Minor patch cleanup gcompris-7.4-xf86vidmode.patch: Index: gcompris-7.4-xf86vidmode.patch =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris-7.4-xf86vidmode.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcompris-7.4-xf86vidmode.patch 11 May 2006 14:43:20 -0000 1.3 +++ gcompris-7.4-xf86vidmode.patch 13 May 2006 12:38:57 -0000 1.4 @@ -1,550 +1,217 @@ ---- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-11 09:42:18.000000000 +0200 -@@ -159,6 +159,12 @@ +--- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 ++++ gcompris-7.4/configure 2006-05-13 14:16:46.000000000 +0200 +@@ -1094,7 +1094,7 @@ + --disable-sdltest Do not try to compile and run a test SDL program + --disable-glibtest do not try to compile and run a test GLIB program + --disable-rpath do not hardcode runtime library paths +- --disable-xrandr Turn off xrandr ++ --disable-xf86vidmode Turn off xf86vidmode + --enable-debug Turn on debugging messages + --disable-sqlite Turn off sqlite (will disable profile) + --enable-py-build-only Skip python modules tests. (Useful if you just need +@@ -23630,7 +23630,7 @@ + /usr/openwin/share/include' - void gcompris_confirm_stop (void); + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23638,7 +23638,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -23665,7 +23665,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime); -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); -+ - /* Trace Log */ - #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" - #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" ---- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 -+++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-11 09:42:18.000000000 +0200 -@@ -33,12 +33,13 @@ + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -23686,11 +23686,11 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -23769,23 +23769,23 @@ + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi - #include "cursor.h" +-# Check whether --enable-xrandr or --disable-xrandr was given. +-if test "${enable_xrandr+set}" = set; then +- enableval="$enable_xrandr" +- USE_XRANDR="$enableval" ++# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. ++if test "${enable_xf86vidmode+set}" = set; then ++ enableval="$enable_xf86vidmode" ++ USE_XF86VM="$enableval" + else +- USE_XRANDR="yes" ++ USE_XF86VM="yes" + fi; +-found_randr=no +-if test "x$USE_XRANDR" == "xyes" ; then +- RANDR_LIBS= +- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 +-echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then ++found_xf86vidmode=no ++if test "x$USE_XF86VM" == "xyes" ; then ++ XF86VM_LIBS= ++ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ++echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 ++if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" ++LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23799,11 +23799,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char XRRSetScreenConfigAndRate (); ++char XF86VidModeQueryExtension (); + int + main () + { +-XRRSetScreenConfigAndRate (); ++XF86VidModeQueryExtension (); + ; + return 0; + } +@@ -23830,23 +23830,23 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes ++ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 --/* For XRANDR Support */ --#ifdef XRANDR -+/* For XF86_VIDMODE Support */ -+#ifdef XF86_VIDMODE - #include +-ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no ++ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 +-if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then +- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +-echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +-if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 ++if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then ++ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 ++if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -23857,7 +23857,7 @@ + /* end confdefs.h. */ #include + -#include --#include -+#include -+#include -+#include - #endif ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -23881,38 +23881,38 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_header_X11_extensions_Xrandr_h=yes ++ ac_cv_header_X11_extensions_xf86vmode_h=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 - #if defined _WIN32 || defined __WIN32__ -@@ -104,7 +105,7 @@ - static int popt_aalias = FALSE; - static int popt_difficulty_filter = FALSE; - static int popt_debug = FALSE; --static int popt_noxrandr = FALSE; -+static int popt_noxf86vm = FALSE; - static char *popt_root_menu = NULL; - static char *popt_local_activity = NULL; - static int popt_administration = FALSE; -@@ -139,8 +140,8 @@ - N_("Print the version of " PACKAGE), NULL}, - {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, - N_("Use the antialiased canvas (slower)."), NULL}, -- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, -- N_("Disable XRANDR (No screen resolution change)."), NULL}, -+ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, -+ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, - {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, - N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, - {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, -@@ -184,29 +185,19 @@ - }; +-ac_cv_header_X11_extensions_Xrandr_h=no ++ac_cv_header_X11_extensions_xf86vmode_h=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +-if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then +- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes ++echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 ++if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then ++ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes + fi - /* XRandr Stuff */ --#ifdef XRANDR --typedef struct -+#ifdef XF86_VIDMODE -+static struct - { -- gboolean xr_lock_updates; -+ int vidmode_available; -+ XF86VidModeModeInfo orig_mode; -+ int orig_viewport_x; -+ int orig_viewport_y; -+ int width; -+ int height; -+} XF86VidModeData = { 0, { 0 }, 0, 0 }; -- XRRScreenConfiguration *xr_screen_conf; -- -- XRRScreenSize *xr_sizes; -- int xr_nsize; -- SizeID xr_current_size; -- -- Rotation xr_rotations; -- Rotation xr_current_rotation; -- --} XRANDRData; -- --static SizeID xr_previous_size; --static gboolean xr_previous_size_set = FALSE; --static XRANDRData *xrandr = NULL; -- --static void xrandr_init ( XRANDRData *xrandr ); --static void xrandr_get_config ( XRANDRData *xrandr ); --static void xrandr_set_config( XRANDRData *xrandr ); -+static void xf86_vidmode_init( void ); -+static void xf86_vidmode_set_fullscreen( int state ); - #endif + fi - /****************************************************************************/ -@@ -441,8 +432,8 @@ - gint screen_height, screen_width; - GtkWidget *vbox; --#ifdef XRANDR -- xrandr = g_new0 (XRANDRData, 1); -+#ifdef XF86_VIDMODE -+ xf86_vidmode_init(); - #endif +- if test "x$found_randr" = "xno"; then +- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 +-echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} ++ if test "x$found_xf86vidmode" = "xno"; then ++ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 ++echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} + else - gcompris_set_fullscreen(properties->fullscreen); -@@ -450,10 +441,10 @@ - screen_height = gdk_screen_height(); - screen_width = gdk_screen_width(); + cat >>confdefs.h <<_ACEOF +-#define XRANDR 1 ++#define XF86_VIDMODE 1 + _ACEOF --#ifdef XRANDR -- if(properties->fullscreen && !properties->noxrandr) { -- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; -- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; -+#ifdef XF86_VIDMODE -+ if(properties->fullscreen && !properties->noxf86vm) { -+ screen_width = XF86VidModeData.width; -+ screen_height = XF86VidModeData.height; - } - #endif + fi + fi -@@ -811,39 +802,11 @@ - */ - void gcompris_set_fullscreen(gboolean state) - { -- -+#ifdef XF86_VIDMODE -+ xf86_vidmode_set_fullscreen(state); -+#endif - if(state) - { --#ifdef XRANDR -- gint i; -- /* Search the 800x600 Resolution */ -- if(properties->fullscreen && !properties->noxrandr) { -- -- g_warning("XRANDR Is compiled in. Searching a good resolution"); -- -- /* Check if XRANDR is available */ -- if (!properties->noxrandr) { -- xrandr_get_config ( xrandr ); -- xr_previous_size = (SizeID)xrandr->xr_current_size; -- for (i = 0; i < xrandr->xr_nsize; i++) { -- if(xrandr->xr_sizes[i].width == BOARDWIDTH && -- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) -- { -- xrandr->xr_current_size = (SizeID)i; -- xr_previous_size_set = TRUE; -- break; -- } -- } -- } -- -- /* Set the Fullscreen now */ -- if(xr_previous_size_set) -- { -- if(is_mapped) -- xrandr_set_config( xrandr ); -- } -- } --#endif - gdk_window_set_decorations (window->window, 0); - gdk_window_set_functions (window->window, 0); - gtk_widget_set_uposition (window, 0, 0); -@@ -851,20 +814,6 @@ - } - else - { --#ifdef XRANDR -- /* Set back the original screen size */ -- if(xr_previous_size_set && !properties->noxrandr) -- { -- /* Need to refresh our config or xrandr api will reject us */ -- if(xrandr) -- { -- xrandr_get_config ( xrandr ); -- xrandr->xr_current_size = (SizeID)xr_previous_size; -- xrandr_set_config( xrandr ); -- } -- } -- xr_previous_size_set = FALSE; --#endif - /* The hide must be done at least for KDE */ - gtk_widget_hide (window); - gdk_window_set_decorations (window->window, GDK_DECOR_ALL); -@@ -876,6 +825,42 @@ +-LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" ++LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" - } + ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" -+/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab -+ handling. */ -+int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, -+ GdkCursor *cursor, guint32 etime) -+{ -+ int retval; -+ -+ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); -+ if (retval != GDK_GRAB_SUCCESS) -+ return retval; -+ -+#ifdef XF86_VIDMODE -+ /* When fullscreen override mouse grab with our own which -+ confines the cursor to our fullscreen window */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, -+ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+ -+ return retval; -+} -+ -+void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) -+{ -+ gnome_canvas_item_ungrab(item, etime); -+#ifdef XF86_VIDMODE -+ /* When fullscreen restore the normal mouse grab which avoids -+ scrolling the virtual desktop */ -+ if (properties->fullscreen && !properties->noxf86vm) -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ etime+1) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+#endif -+} -+ - void gcompris_exit() - { - /* Do not loopback in exit */ -@@ -1044,68 +1029,131 @@ - g_printerr ("%s: %s\n\n", "gcompris", message); - } +@@ -28651,7 +28651,7 @@ + echo "SDL LIBS = found" + fi --#ifdef XRANDR -+#ifdef XF86_VIDMODE - /* -- * XRANDR STUFF -- * ------------ -+ * XF86VidMode STUFF -+ * ----------------- - */ - static void --xrandr_init ( XRANDRData *data ) -+xf86_vidmode_init ( void ) - { -- if(data==NULL) -+ int i,j; -+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) -+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); -+ -+ if (properties->noxf86vm) - return; -- -- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); -- -- if (data->xr_screen_conf == NULL) -+ -+ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) -+ properties->noxf86vm = TRUE; -+ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, -+ &XF86VidModeData.orig_viewport_x)) -+ properties->noxf86vm = TRUE; -+ -+ if (properties->noxf86vm) -+ g_warning("XF86VidMode not available"); -+ else - { -- g_warning("XRANDR not available"); -- properties->noxrandr = TRUE; -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ g_warning("XF86VidMode support enabled"); - } -- else -- g_warning("XRANDR support enabled"); -- } -- --static void --xrandr_get_config ( XRANDRData *data ) --{ -- if(data==NULL) -- return; -- -- xrandr_init (data); -- -- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, -- &data->xr_current_rotation); -- -- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); -- -- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, -- &data->xr_current_rotation); - } +-echo "XRANDR option (--enable-xrandr) = $found_randr" ++echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" -+ - static void --xrandr_set_config( XRANDRData *data ) -+xf86_vidmode_set_fullscreen ( int state ) - { -- Status status = RRSetConfigFailed; -+ int i; -+ XF86VidModeModeLine mode; + echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" -- if(data==NULL) -+ if (properties->noxf86vm) - return; +--- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 ++++ gcompris-7.4/config.h.in 2006-05-13 14:16:46.000000000 +0200 +@@ -141,5 +141,5 @@ + /* Version number of package */ + #undef VERSION -- if (data->xr_lock_updates) return; -- -- status = XRRSetScreenConfig (GDK_DISPLAY(), -- data->xr_screen_conf, -- GDK_ROOT_WINDOW(), -- data->xr_current_size, -- data->xr_current_rotation, -- CurrentTime); -- -- if(status) { -- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", -- (int)status); -- } -- return; -- -+ if (state) -+ { -+ XF86VidModeModeInfo **modes; -+ int mode_count; -+ gint x,y; -+ -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode)) -+ { -+ /* If we can't get the currentmode force setting of a new mode. */ -+ mode.hdisplay = 0; -+ } -+ -+ /* Do we need to switch? */ -+ if ((mode.hdisplay != BOARDWIDTH) || -+ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &mode_count, &modes)) -+ mode_count = 0; -+ -+ for (i = 0; i < mode_count; i++) -+ { -+ if ((modes[i]->hdisplay == BOARDWIDTH) && -+ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), modes[i])) -+ { -+ XF86VidModeData.width = modes[i]->hdisplay; -+ XF86VidModeData.height = modes[i]->vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot switch resolution"); -+ break; -+ } -+ } -+ if (i == mode_count) -+ g_warning("XF86VidMode couldnot find a suitable resolution"); -+ if (mode_count) -+ XFree(modes); -+ } -+ /* We need to grab the pointer before setting the viewport otherwise -+ setviewport may get "canceled" by the pointer being outside the -+ current viewport. */ -+ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, -+ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) -+ g_warning("Pointer grab failed"); -+ -+ gdk_window_get_position(window->window, &x, &y); -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), -+ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), x, y)) -+ g_warning("XF86VidMode couldnot change viewport"); -+ } -+ else -+ { -+ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &i, &mode) || -+ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || -+ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) -+ { -+ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) -+ { -+ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; -+ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; -+ } -+ else -+ g_warning("XF86VidMode couldnot restore original resolution"); -+ -+ } -+ gdk_pointer_ungrab(GDK_CURRENT_TIME); -+ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) -+ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( -+ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, -+ XF86VidModeData.orig_viewport_y)) -+ g_warning("XF86VidMode couldnot restore original viewport"); -+ } - } - #endif - -@@ -1185,9 +1233,9 @@ - properties->fullscreen = TRUE; - } - -- if (popt_noxrandr) -+ if (popt_noxf86vm) - { -- properties->noxrandr = TRUE; -+ properties->noxf86vm = TRUE; - } - - if (popt_window) ---- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.c 2006-05-11 09:42:18.000000000 +0200 -@@ -160,7 +160,7 @@ - tmp->fx = 1; - tmp->screensize = 1; - tmp->fullscreen = 1; -- tmp->noxrandr = FALSE; -+ tmp->noxf86vm = FALSE; - tmp->timer = 1; - tmp->skin = "babytoy"; - tmp->key = "default"; -@@ -244,8 +244,8 @@ - } else if(!strcmp(value.v_identifier, "fullscreen")) { - if(!scan_get_int(scanner, &tmp->fullscreen)) - g_warning("Config file parsing error on token %s", token); -- } else if(!strcmp(value.v_identifier, "noxrandr")) { -- if(!scan_get_int(scanner, &tmp->noxrandr)) -+ } else if(!strcmp(value.v_identifier, "noxf86vm")) { -+ if(!scan_get_int(scanner, &tmp->noxf86vm)) - g_warning("Config file parsing error on token %s", token); - } else if(!strcmp(value.v_identifier, "timer")) { - if(!scan_get_int(scanner, &tmp->timer)) ---- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-11 09:42:17.000000000 +0200 -+++ gcompris-7.4/src/gcompris/properties.h 2006-05-11 09:42:18.000000000 +0200 -@@ -28,7 +28,7 @@ - gint music; - gint fx; - gint fullscreen; -- gint noxrandr; -+ gint noxf86vm; - gint screensize; - gint defaultcursor; - gint timer; ---- gcompris-7.4/src/gcompris/board_config.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 -+++ gcompris-7.4/src/gcompris/board_config.c 2006-05-11 12:04:27.000000000 +0200 -@@ -125,6 +125,34 @@ - - } - -+#ifdef XF86_VIDMODE -+static GdkEventConfigure gcompris_last_configure_event; -+ -+static gint gcompris_conf_window_configured(GtkWindow *window, -+ GdkEventConfigure *event, gpointer param) -+{ -+ gint new_x, new_y; -+ double screen_width, screen_height; -+ /* Because we call gtk_window_move, we cause a configure event. Filter out -+ identical events to avoid looping. */ -+ if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) -+ { -+ gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( -+ gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); -+ /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ -+ screen_height -= 30; -+ new_x = ((gint)screen_width - event->width) / 2; -+ new_y = ((gint)screen_height - event->height) / 2; -+ /* printf("screen %dx%d, window %dx%d, place %dx%d\n", (int)screen_width, (int)screen_height, event->width, event->height, new_x, new_y); */ -+ gtk_window_move (conf_window, new_x, new_y); -+ memcpy(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure)); -+ } -+ -+ /* Act as if we aren't there / aren't hooked up */ -+ return FALSE; -+} -+#endif -+ - GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) - { - GtkWidget *header; -@@ -145,7 +173,18 @@ - - - /* parameters */ -- gtk_window_set_position (conf_window, -+#ifdef XF86_VIDMODE -+ if (gcompris_get_properties()->fullscreen && -+ !gcompris_get_properties()->noxf86vm) -+ { -+ memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); -+ gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); -+ gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", -+ GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); -+ } -+ else -+#endif -+ gtk_window_set_position (conf_window, - GTK_WIN_POS_CENTER_ALWAYS); - - gtk_widget_show(GTK_WIDGET(conf_window)); ---- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 -+++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-11 09:42:22.000000000 +0200 -@@ -103,6 +103,11 @@ - options.append('--nostampcontrols') - - gcompris.sound.close() -+ -+ # release pointergrab if running fullscreen, tuxpaint wants to grab the -+ # pointer itself -+ if (Prop.fullscreen and not Prop.noxf86vm): -+ gtk.gdk.pointer_ungrab() - - #self.window.set_property("accept-focus", 0) - #self.window.set_keep_below(False) -@@ -115,7 +120,7 @@ - gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) - return - -- gcompris.child_watch_add(pid, child_callback, None) -+ gcompris.child_watch_add(pid, child_callback, self) - - gcompris.bar_set(0) - gcompris.bar_hide(1) -@@ -221,6 +226,10 @@ - return default_config_dict - - def child_callback(fd, cond, data): -+ # restore pointergrab if running fullscreen -+ if (gcompris.get_properties().fullscreen and -+ not gcompris.get_properties().noxf86vm): -+ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) - #global board - #board.window.set_property("accept-focus", 1) - #board.window.set_keep_above(False) ---- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-11 09:42:17.000000000 +0200 -+++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-11 09:42:18.000000000 +0200 +-/* XRANDR Available */ +-#undef XRANDR ++/* XF86VidMode Available */ ++#undef XF86_VIDMODE +--- gcompris-7.4/src/boards/py-gcompris-properties.c.xf86vm 2006-05-13 14:16:46.000000000 +0200 ++++ gcompris-7.4/src/boards/py-gcompris-properties.c 2006-05-13 14:16:46.000000000 +0200 @@ -72,8 +72,8 @@ return Py_False; } @@ -557,7 +224,7 @@ return Py_True; } else { --- gcompris-7.4/src/boards/draw.c.xf86vm 2006-04-04 00:00:43.000000000 +0200 -+++ gcompris-7.4/src/boards/draw.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/draw.c 2006-05-13 14:16:46.000000000 +0200 @@ -2008,7 +2008,7 @@ case 1: fleur = gdk_cursor_new(get_resize_cursor(anchor)); @@ -595,7 +262,7 @@ draggingItem = NULL; --- gcompris-7.4/src/boards/hanoi_real.c.xf86vm 2006-01-22 22:49:31.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi_real.c 2006-05-13 14:16:46.000000000 +0200 @@ -472,7 +472,7 @@ gnome_canvas_item_raise_to_top(data->item); @@ -615,7 +282,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/clockgame.c.xf86vm 2006-04-05 01:16:11.000000000 +0200 -+++ gcompris-7.4/src/boards/clockgame.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/clockgame.c 2006-05-13 14:16:46.000000000 +0200 @@ -663,7 +663,7 @@ y = item_y; @@ -635,7 +302,7 @@ } break; --- gcompris-7.4/src/boards/hanoi.c.xf86vm 2005-11-18 23:48:28.000000000 +0100 -+++ gcompris-7.4/src/boards/hanoi.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/hanoi.c 2006-05-13 14:16:46.000000000 +0200 @@ -645,7 +645,7 @@ gnome_canvas_item_raise_to_top(data->item_text); @@ -655,7 +322,7 @@ /* Search the column (x) where this item is ungrabbed */ --- gcompris-7.4/src/boards/chess.c.xf86vm 2006-04-03 23:59:47.000000000 +0200 -+++ gcompris-7.4/src/boards/chess.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/chess.c 2006-05-13 14:16:46.000000000 +0200 @@ -839,7 +839,7 @@ fleur = gdk_cursor_new(GDK_FLEUR); @@ -675,7 +342,7 @@ position_display(position); --- gcompris-7.4/src/boards/shapegame.c.xf86vm 2006-04-04 00:05:12.000000000 +0200 -+++ gcompris-7.4/src/boards/shapegame.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/shapegame.c 2006-05-13 14:16:46.000000000 +0200 @@ -1103,7 +1103,7 @@ gnome_canvas_item_raise_to_top(shape_list_root_item); gnome_canvas_item_raise_to_top(item); @@ -713,7 +380,7 @@ dragging = FALSE; --- gcompris-7.4/src/boards/planegame.c.xf86vm 2005-10-15 16:54:30.000000000 +0200 -+++ gcompris-7.4/src/boards/planegame.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/planegame.c 2006-05-13 14:16:46.000000000 +0200 @@ -578,7 +578,7 @@ y = item_y; @@ -733,7 +400,7 @@ } break; --- gcompris-7.4/src/boards/enumerate.c.xf86vm 2005-11-18 23:48:12.000000000 +0100 -+++ gcompris-7.4/src/boards/enumerate.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/enumerate.c 2006-05-13 14:16:46.000000000 +0200 @@ -522,7 +522,7 @@ gnome_canvas_item_raise_to_top(item); @@ -753,7 +420,7 @@ } break; --- gcompris-7.4/src/boards/clickgame.c.xf86vm 2005-10-10 00:21:56.000000000 +0200 -+++ gcompris-7.4/src/boards/clickgame.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/clickgame.c 2006-05-13 14:16:46.000000000 +0200 @@ -598,7 +598,7 @@ y = item_y; @@ -773,7 +440,7 @@ } break; --- gcompris-7.4/src/boards/traffic.c.xf86vm 2006-04-04 00:06:09.000000000 +0200 -+++ gcompris-7.4/src/boards/traffic.c 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/src/boards/traffic.c 2006-05-13 14:16:46.000000000 +0200 @@ -417,7 +417,7 @@ cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); else @@ -801,220 +468,579 @@ hit=0; moving=FALSE; } ---- gcompris-7.4/configure.xf86vm 2006-04-12 01:13:49.000000000 +0200 -+++ gcompris-7.4/configure 2006-05-11 09:42:18.000000000 +0200 -@@ -1094,7 +1094,7 @@ - --disable-sdltest Do not try to compile and run a test SDL program - --disable-glibtest do not try to compile and run a test GLIB program - --disable-rpath do not hardcode runtime library paths -- --disable-xrandr Turn off xrandr -+ --disable-xf86vidmode Turn off xf86vidmode - --enable-debug Turn on debugging messages - --disable-sqlite Turn off sqlite (will disable profile) - --enable-py-build-only Skip python modules tests. (Useful if you just need -@@ -23630,7 +23630,7 @@ - /usr/openwin/share/include' +--- gcompris-7.4/src/boards/python/tuxpaint.py.xf86vm 2006-01-22 23:20:06.000000000 +0100 ++++ gcompris-7.4/src/boards/python/tuxpaint.py 2006-05-13 14:16:46.000000000 +0200 +@@ -17,7 +17,7 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # + import gnome +-import gnome.canvas ++import gnomecanvas + import gcompris + import gcompris.utils + import gcompris.bonus +@@ -69,7 +69,7 @@ + self.config_dict.update(gcompris.get_board_conf()) + + self.rootitem = self.gcomprisBoard.canvas.root().add( +- gnome.canvas.CanvasGroup, ++ gnomecanvas.CanvasGroup, + x=0.0, + y=0.0 + ) +@@ -103,6 +103,11 @@ + options.append('--nostampcontrols') + + gcompris.sound.close() ++ ++ # release pointergrab if running fullscreen, tuxpaint wants to grab the ++ # pointer itself ++ if (Prop.fullscreen and not Prop.noxf86vm): ++ gtk.gdk.pointer_ungrab() - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23638,7 +23638,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -23665,7 +23665,7 @@ - sed 's/^/| /' conftest.$ac_ext >&5 + #self.window.set_property("accept-focus", 0) + #self.window.set_keep_below(False) +@@ -115,7 +120,7 @@ + gcompris.utils.dialog(_("Cannot find Tuxpaint.\nInstall it to use this activity !"),stop_board) + return + +- gcompris.child_watch_add(pid, child_callback, None) ++ gcompris.child_watch_add(pid, child_callback, self) - for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -23686,11 +23686,11 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - int - main () - { --XtMalloc (0) -+XrmInitialize () - ; - return 0; - } -@@ -23769,23 +23769,23 @@ - echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 - fi + gcompris.bar_set(0) + gcompris.bar_hide(1) +@@ -124,7 +129,7 @@ + gcompris.skin.image_to_skin("gcompris-bg.jpg")) --# Check whether --enable-xrandr or --disable-xrandr was given. --if test "${enable_xrandr+set}" = set; then -- enableval="$enable_xrandr" -- USE_XRANDR="$enableval" -+# Check whether --enable-xf86vidmode or --disable-xf86vidmode was given. -+if test "${enable_xf86vidmode+set}" = set; then -+ enableval="$enable_xf86vidmode" -+ USE_XF86VM="$enableval" - else -- USE_XRANDR="yes" -+ USE_XF86VM="yes" - fi; --found_randr=no --if test "x$USE_XRANDR" == "xyes" ; then -- RANDR_LIBS= -- echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5 --echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6 --if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then -+found_xf86vidmode=no -+if test "x$USE_XF86VM" == "xyes" ; then -+ XF86VM_LIBS= -+ echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 -+echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6 -+if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lXrandr -L$x_libraries $ALL_X_LIBS $LIBS" -+LIBS="-lXxf86vm -L$x_libraries $ALL_X_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23799,11 +23799,11 @@ + textItem = self.rootitem.add( +- gnome.canvas.CanvasText, ++ gnomecanvas.CanvasText, + text = _("Waiting for Tuxpaint to finish"), + x = gcompris.BOARD_WIDTH/2, + y = 185, +@@ -221,6 +226,10 @@ + return default_config_dict + + def child_callback(fd, cond, data): ++ # restore pointergrab if running fullscreen ++ if (gcompris.get_properties().fullscreen and ++ not gcompris.get_properties().noxf86vm): ++ gtk.gdk.pointer_grab(data.window.window, True, 0, data.window.window) + #global board + #board.window.set_property("accept-focus", 1) + #board.window.set_keep_above(False) +--- gcompris-7.4/src/gcompris/gcompris.h.xf86vm 2006-03-02 00:02:09.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.h 2006-05-13 14:16:46.000000000 +0200 +@@ -159,6 +159,12 @@ + + void gcompris_confirm_stop (void); + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime); ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); ++ + /* Trace Log */ + #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" + #define GCOMPRIS_LOG_STATUS_FAILED "FAILED" +--- gcompris-7.4/src/gcompris/gcompris.c.xf86vm 2006-03-02 00:47:10.000000000 +0100 ++++ gcompris-7.4/src/gcompris/gcompris.c 2006-05-13 14:20:00.000000000 +0200 +@@ -33,12 +33,12 @@ + + #include "cursor.h" + +-/* For XRANDR Support */ +-#ifdef XRANDR ++/* For XF86_VIDMODE Support */ ++#ifdef XF86_VIDMODE + #include + #include +-#include +-#include ++#include ++#include #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char XRRSetScreenConfigAndRate (); -+char XF86VidModeQueryExtension (); - int - main () + + #if defined _WIN32 || defined __WIN32__ +@@ -104,7 +104,7 @@ + static int popt_aalias = FALSE; + static int popt_difficulty_filter = FALSE; + static int popt_debug = FALSE; +-static int popt_noxrandr = FALSE; ++static int popt_noxf86vm = FALSE; + static char *popt_root_menu = NULL; + static char *popt_local_activity = NULL; + static int popt_administration = FALSE; +@@ -139,8 +139,8 @@ + N_("Print the version of " PACKAGE), NULL}, + {"antialiased", '\0', POPT_ARG_NONE, &popt_aalias, 0, + N_("Use the antialiased canvas (slower)."), NULL}, +- {"noxrandr", 'x', POPT_ARG_NONE, &popt_noxrandr, 0, +- N_("Disable XRANDR (No screen resolution change)."), NULL}, ++ {"noxf86vm", 'x', POPT_ARG_NONE, &popt_noxf86vm, 0, ++ N_("Disable XF86VidMode (No screen resolution change)."), NULL}, + {"root-menu", 'l', POPT_ARG_STRING, &popt_root_menu, 0, + N_("Run gcompris with local menu (e.g -l /reading will let you play only activities in the reading directory, -l /boards/connect4 only the connect4 activity)"), NULL}, + {"local-activity", 'L', POPT_ARG_STRING, &popt_local_activity, 0, +@@ -184,29 +184,19 @@ + }; + + /* XRandr Stuff */ +-#ifdef XRANDR +-typedef struct ++#ifdef XF86_VIDMODE ++static struct { --XRRSetScreenConfigAndRate (); -+XF86VidModeQueryExtension (); - ; - return 0; - } -@@ -23830,23 +23830,23 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=yes -+ ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 +- gboolean xr_lock_updates; ++ int vidmode_available; ++ XF86VidModeModeInfo orig_mode; ++ int orig_viewport_x; ++ int orig_viewport_y; ++ int width; ++ int height; ++} XF86VidModeData = { 0, { 0 }, 0, 0 }; --ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no -+ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5 --echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6 --if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then -- echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 --echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 --if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6 -+if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then -+ echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 -+echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 -+if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -23857,7 +23857,7 @@ - /* end confdefs.h. */ - #include +- XRRScreenConfiguration *xr_screen_conf; +- +- XRRScreenSize *xr_sizes; +- int xr_nsize; +- SizeID xr_current_size; +- +- Rotation xr_rotations; +- Rotation xr_current_rotation; +- +-} XRANDRData; +- +-static SizeID xr_previous_size; +-static gboolean xr_previous_size_set = FALSE; +-static XRANDRData *xrandr = NULL; +- +-static void xrandr_init ( XRANDRData *xrandr ); +-static void xrandr_get_config ( XRANDRData *xrandr ); +-static void xrandr_set_config( XRANDRData *xrandr ); ++static void xf86_vidmode_init( void ); ++static void xf86_vidmode_set_fullscreen( int state ); + #endif --#include -+#include - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -23881,38 +23881,38 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_header_X11_extensions_Xrandr_h=yes -+ ac_cv_header_X11_extensions_xf86vmode_h=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 + /****************************************************************************/ +@@ -441,8 +431,8 @@ + gint screen_height, screen_width; + GtkWidget *vbox; --ac_cv_header_X11_extensions_Xrandr_h=no -+ac_cv_header_X11_extensions_xf86vmode_h=no - fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 --echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 --if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then -- RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes -+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 -+if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then -+ XF86VM_LIBS="-L$x_libraries -lXxf86vm" found_xf86vidmode=yes - fi +-#ifdef XRANDR +- xrandr = g_new0 (XRANDRData, 1); ++#ifdef XF86_VIDMODE ++ xf86_vidmode_init(); + #endif + gcompris_set_fullscreen(properties->fullscreen); +@@ -450,10 +440,10 @@ + screen_height = gdk_screen_height(); + screen_width = gdk_screen_width(); - fi +-#ifdef XRANDR +- if(properties->fullscreen && !properties->noxrandr) { +- screen_height = xrandr->xr_sizes[xrandr->xr_current_size].height; +- screen_width = xrandr->xr_sizes[xrandr->xr_current_size].width; ++#ifdef XF86_VIDMODE ++ if(properties->fullscreen && !properties->noxf86vm) { ++ screen_width = XF86VidModeData.width; ++ screen_height = XF86VidModeData.height; + } + #endif +@@ -811,39 +801,11 @@ + */ + void gcompris_set_fullscreen(gboolean state) + { +- ++#ifdef XF86_VIDMODE ++ xf86_vidmode_set_fullscreen(state); ++#endif + if(state) + { +-#ifdef XRANDR +- gint i; +- /* Search the 800x600 Resolution */ +- if(properties->fullscreen && !properties->noxrandr) { +- +- g_warning("XRANDR Is compiled in. Searching a good resolution"); +- +- /* Check if XRANDR is available */ +- if (!properties->noxrandr) { +- xrandr_get_config ( xrandr ); +- xr_previous_size = (SizeID)xrandr->xr_current_size; +- for (i = 0; i < xrandr->xr_nsize; i++) { +- if(xrandr->xr_sizes[i].width == BOARDWIDTH && +- xrandr->xr_sizes[i].height == BOARDHEIGHT+BARHEIGHT) +- { +- xrandr->xr_current_size = (SizeID)i; +- xr_previous_size_set = TRUE; +- break; +- } +- } +- } +- +- /* Set the Fullscreen now */ +- if(xr_previous_size_set) +- { +- if(is_mapped) +- xrandr_set_config( xrandr ); +- } +- } +-#endif + gdk_window_set_decorations (window->window, 0); + gdk_window_set_functions (window->window, 0); + gtk_widget_set_uposition (window, 0, 0); +@@ -851,20 +813,6 @@ + } + else + { +-#ifdef XRANDR +- /* Set back the original screen size */ +- if(xr_previous_size_set && !properties->noxrandr) +- { +- /* Need to refresh our config or xrandr api will reject us */ +- if(xrandr) +- { +- xrandr_get_config ( xrandr ); +- xrandr->xr_current_size = (SizeID)xr_previous_size; +- xrandr_set_config( xrandr ); +- } +- } +- xr_previous_size_set = FALSE; +-#endif + /* The hide must be done at least for KDE */ + gtk_widget_hide (window); + gdk_window_set_decorations (window->window, GDK_DECOR_ALL); +@@ -876,6 +824,42 @@ + + } + ++/* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab ++ handling. */ ++int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, ++ GdkCursor *cursor, guint32 etime) ++{ ++ int retval; ++ ++ retval = gnome_canvas_item_grab(item, event_mask, cursor, etime); ++ if (retval != GDK_GRAB_SUCCESS) ++ return retval; ++ ++#ifdef XF86_VIDMODE ++ /* When fullscreen override mouse grab with our own which ++ confines the cursor to our fullscreen window */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(item->canvas->layout.bin_window, FALSE, event_mask, ++ window->window, cursor, etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++ ++ return retval; ++} ++ ++void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) ++{ ++ gnome_canvas_item_ungrab(item, etime); ++#ifdef XF86_VIDMODE ++ /* When fullscreen restore the normal mouse grab which avoids ++ scrolling the virtual desktop */ ++ if (properties->fullscreen && !properties->noxf86vm) ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ etime+1) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++#endif ++} ++ + void gcompris_exit() + { + /* Do not loopback in exit */ +@@ -1044,68 +1028,131 @@ + g_printerr ("%s: %s\n\n", "gcompris", message); + } + +-#ifdef XRANDR ++#ifdef XF86_VIDMODE + /* +- * XRANDR STUFF +- * ------------ ++ * XF86VidMode STUFF ++ * ----------------- + */ + static void +-xrandr_init ( XRANDRData *data ) ++xf86_vidmode_init ( void ) + { +- if(data==NULL) ++ int i,j; ++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) ++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); ++ ++ if (properties->noxf86vm) + return; +- +- data->xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY(), GDK_ROOT_WINDOW()); +- +- if (data->xr_screen_conf == NULL) ++ ++ if (!XF86VidModeQueryVersion(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeQueryExtension(GDK_DISPLAY(), &i, &j)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode.dotclock, l)) ++ properties->noxf86vm = TRUE; ++ else if (!XF86VidModeGetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_viewport_x, ++ &XF86VidModeData.orig_viewport_y)) ++ properties->noxf86vm = TRUE; ++ ++ if (properties->noxf86vm) ++ g_warning("XF86VidMode not available"); ++ else + { +- g_warning("XRANDR not available"); +- properties->noxrandr = TRUE; ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ g_warning("XF86VidMode support enabled"); + } +- else +- g_warning("XRANDR support enabled"); +- } +- +-static void +-xrandr_get_config ( XRANDRData *data ) +-{ +- if(data==NULL) +- return; +- +- xrandr_init (data); +- +- data->xr_current_size = XRRConfigCurrentConfiguration (data->xr_screen_conf, +- &data->xr_current_rotation); +- +- data->xr_sizes = XRRConfigSizes(data->xr_screen_conf, &data->xr_nsize); +- +- data->xr_rotations = XRRConfigRotations(data->xr_screen_conf, +- &data->xr_current_rotation); + } -- if test "x$found_randr" = "xno"; then -- { echo "$as_me:$LINENO: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&5 --echo "$as_me: \"Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen.\"" >&6;} -+ if test "x$found_xf86vidmode" = "xno"; then -+ { echo "$as_me:$LINENO: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&5 -+echo "$as_me: \"Suitable XF86VidMode extension library not found - Will not use xf86vidmode for fullscreen.\"" >&6;} - else ++ + static void +-xrandr_set_config( XRANDRData *data ) ++xf86_vidmode_set_fullscreen ( int state ) + { +- Status status = RRSetConfigFailed; ++ int i; ++ XF86VidModeModeLine mode; - cat >>confdefs.h <<_ACEOF --#define XRANDR 1 -+#define XF86_VIDMODE 1 - _ACEOF +- if(data==NULL) ++ if (properties->noxf86vm) + return; - fi - fi +- if (data->xr_lock_updates) return; +- +- status = XRRSetScreenConfig (GDK_DISPLAY(), +- data->xr_screen_conf, +- GDK_ROOT_WINDOW(), +- data->xr_current_size, +- data->xr_current_rotation, +- CurrentTime); +- +- if(status) { +- g_error("ERROR: Failed to set back the original resolution XRRSetScreenConfig returned status = %d\n", +- (int)status); +- } +- return; +- ++ if (state) ++ { ++ XF86VidModeModeInfo **modes; ++ int mode_count; ++ gint x,y; ++ ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode)) ++ { ++ /* If we can't get the currentmode force setting of a new mode. */ ++ mode.hdisplay = 0; ++ } ++ ++ /* Do we need to switch? */ ++ if ((mode.hdisplay != BOARDWIDTH) || ++ (mode.vdisplay != BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (!XF86VidModeGetAllModeLines(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &mode_count, &modes)) ++ mode_count = 0; ++ ++ for (i = 0; i < mode_count; i++) ++ { ++ if ((modes[i]->hdisplay == BOARDWIDTH) && ++ (modes[i]->vdisplay == BOARDHEIGHT+BARHEIGHT)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), modes[i])) ++ { ++ XF86VidModeData.width = modes[i]->hdisplay; ++ XF86VidModeData.height = modes[i]->vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot switch resolution"); ++ break; ++ } ++ } ++ if (i == mode_count) ++ g_warning("XF86VidMode couldnot find a suitable resolution"); ++ if (mode_count) ++ XFree(modes); ++ } ++ /* We need to grab the pointer before setting the viewport otherwise ++ setviewport may get "canceled" by the pointer being outside the ++ current viewport. */ ++ if (gdk_pointer_grab(window->window, TRUE, 0, window->window, NULL, ++ GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) ++ g_warning("Pointer grab failed"); ++ ++ gdk_window_get_position(window->window, &x, &y); ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), ++ GDK_SCREEN_XNUMBER(gdk_screen_get_default()), x, y)) ++ g_warning("XF86VidMode couldnot change viewport"); ++ } ++ else ++ { ++ if (!XF86VidModeGetModeLine(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &i, &mode) || ++ (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || ++ (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) ++ { ++ if (XF86VidModeSwitchToMode(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), &XF86VidModeData.orig_mode)) ++ { ++ XF86VidModeData.width = XF86VidModeData.orig_mode.hdisplay; ++ XF86VidModeData.height = XF86VidModeData.orig_mode.vdisplay; ++ } ++ else ++ g_warning("XF86VidMode couldnot restore original resolution"); ++ ++ } ++ gdk_pointer_ungrab(GDK_CURRENT_TIME); ++ if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) ++ if (!XF86VidModeSetViewPort(GDK_DISPLAY(), GDK_SCREEN_XNUMBER( ++ gdk_screen_get_default()), XF86VidModeData.orig_viewport_x, ++ XF86VidModeData.orig_viewport_y)) ++ g_warning("XF86VidMode couldnot restore original viewport"); ++ } + } + #endif --LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" -+LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" +@@ -1185,9 +1232,9 @@ + properties->fullscreen = TRUE; + } - ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr at Latn sv tr vi wa zh_CN zh_TW" +- if (popt_noxrandr) ++ if (popt_noxf86vm) + { +- properties->noxrandr = TRUE; ++ properties->noxf86vm = TRUE; + } -@@ -28651,7 +28651,7 @@ - echo "SDL LIBS = found" - fi + if (popt_window) +--- gcompris-7.4/src/gcompris/properties.c.xf86vm 2006-05-13 14:16:46.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.c 2006-05-13 14:16:46.000000000 +0200 +@@ -160,7 +160,7 @@ + tmp->fx = 1; + tmp->screensize = 1; + tmp->fullscreen = 1; +- tmp->noxrandr = FALSE; ++ tmp->noxf86vm = FALSE; + tmp->timer = 1; + tmp->skin = "babytoy"; + tmp->key = "default"; +@@ -244,8 +244,8 @@ + } else if(!strcmp(value.v_identifier, "fullscreen")) { + if(!scan_get_int(scanner, &tmp->fullscreen)) + g_warning("Config file parsing error on token %s", token); +- } else if(!strcmp(value.v_identifier, "noxrandr")) { +- if(!scan_get_int(scanner, &tmp->noxrandr)) ++ } else if(!strcmp(value.v_identifier, "noxf86vm")) { ++ if(!scan_get_int(scanner, &tmp->noxf86vm)) + g_warning("Config file parsing error on token %s", token); + } else if(!strcmp(value.v_identifier, "timer")) { + if(!scan_get_int(scanner, &tmp->timer)) +--- gcompris-7.4/src/gcompris/properties.h.xf86vm 2006-05-13 14:16:46.000000000 +0200 ++++ gcompris-7.4/src/gcompris/properties.h 2006-05-13 14:16:46.000000000 +0200 +@@ -28,7 +28,7 @@ + gint music; + gint fx; + gint fullscreen; +- gint noxrandr; ++ gint noxf86vm; + gint screensize; + gint defaultcursor; + gint timer; +--- gcompris-7.4/src/gcompris/board_config.c.xf86vm 2006-05-13 14:16:46.000000000 +0200 ++++ gcompris-7.4/src/gcompris/board_config.c 2006-05-13 14:16:46.000000000 +0200 +@@ -125,6 +125,34 @@ --echo "XRANDR option (--enable-xrandr) = $found_randr" -+echo "XF86VM option (--enable-xf86vidmode) = $found_xf86vidmode" + } - echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)" ++#ifdef XF86_VIDMODE ++static GdkEventConfigure gcompris_last_configure_event; ++ ++static gint gcompris_conf_window_configured(GtkWindow *window, ++ GdkEventConfigure *event, gpointer param) ++{ ++ gint new_x, new_y; ++ double screen_width, screen_height; ++ /* Because we call gtk_window_move, we cause a configure event. Filter out ++ identical events to avoid looping. */ ++ if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) ++ { ++ gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( ++ gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); ++ /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ ++ screen_height -= 30; ++ new_x = ((gint)screen_width - event->width) / 2; ++ new_y = ((gint)screen_height - event->height) / 2; ++ /* printf("screen %dx%d, window %dx%d, place %dx%d\n", (int)screen_width, (int)screen_height, event->width, event->height, new_x, new_y); */ ++ gtk_window_move (conf_window, new_x, new_y); ++ memcpy(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure)); ++ } ++ ++ /* Act as if we aren't there / aren't hooked up */ ++ return FALSE; ++} ++#endif ++ + GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) + { + GtkWidget *header; +@@ -145,7 +173,18 @@ + ---- gcompris-7.4/config.h.in.xf86vm 2006-04-12 01:16:12.000000000 +0200 -+++ gcompris-7.4/config.h.in 2006-05-11 09:42:18.000000000 +0200 -@@ -141,5 +141,5 @@ - /* Version number of package */ - #undef VERSION + /* parameters */ +- gtk_window_set_position (conf_window, ++#ifdef XF86_VIDMODE ++ if (gcompris_get_properties()->fullscreen && ++ !gcompris_get_properties()->noxf86vm) ++ { ++ memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); ++ gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); ++ gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", ++ GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); ++ } ++ else ++#endif ++ gtk_window_set_position (conf_window, + GTK_WIN_POS_CENTER_ALWAYS); --/* XRANDR Available */ --#undef XRANDR -+/* XF86VidMode Available */ -+#undef XF86_VIDMODE + gtk_widget_show(GTK_WIDGET(conf_window)); --- gcompris-7.4/configure.in.xf86vm 2006-04-12 01:06:34.000000000 +0200 -+++ gcompris-7.4/configure.in 2006-05-11 09:42:18.000000000 +0200 ++++ gcompris-7.4/configure.in 2006-05-13 14:16:46.000000000 +0200 @@ -81,30 +81,30 @@ AM_ICONV From fedora-extras-commits at redhat.com Sat May 13 14:03:32 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 07:03:32 -0700 Subject: rpms/perl-Sub-Uplevel/FC-5 .cvsignore, 1.3, 1.4 perl-Sub-Uplevel.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605131403.k4DE3Y3G029013@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28959/FC-5 Modified Files: .cvsignore perl-Sub-Uplevel.spec sources Log Message: Update to 0.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 15:31:06 -0000 1.3 +++ .cvsignore 13 May 2006 14:03:31 -0000 1.4 @@ -1 +1 @@ -Sub-Uplevel-0.10.tar.gz +Sub-Uplevel-0.12.tar.gz Index: perl-Sub-Uplevel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/perl-Sub-Uplevel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Sub-Uplevel.spec 21 Apr 2006 15:31:06 -0000 1.8 +++ perl-Sub-Uplevel.spec 13 May 2006 14:03:31 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Sub-Uplevel -Version: 0.10 +Version: 0.12 Release: 1%{?dist} Summary: Run a perl function in an upper stack frame @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -24,20 +24,18 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -make test +./Build test %clean @@ -46,12 +44,16 @@ %files %defattr(-,root,root,-) -%doc Changes +%doc Changes README %{perl_vendorlib}/Sub/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Sat May 13 2006 Jose Pedro Oliveira - 0.12-1 +- Update to 0.12. +- Makefile.PL -> Build.PL. + * Fri Apr 21 2006 Jose Pedro Oliveira - 0.10-1 - Update to 0.10. - New upstream maintainer. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 15:31:06 -0000 1.3 +++ sources 13 May 2006 14:03:31 -0000 1.4 @@ -1 +1 @@ -1dcde4e58ee1eb623b7ee974f5d7d6da Sub-Uplevel-0.10.tar.gz +1cf578951ee9f5b02108017658e703ba Sub-Uplevel-0.12.tar.gz From fedora-extras-commits at redhat.com Sat May 13 14:03:32 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 07:03:32 -0700 Subject: rpms/perl-Sub-Uplevel/devel .cvsignore, 1.3, 1.4 perl-Sub-Uplevel.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605131403.k4DE3Yn7029019@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28959/devel Modified Files: .cvsignore perl-Sub-Uplevel.spec sources Log Message: Update to 0.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 15:15:02 -0000 1.3 +++ .cvsignore 13 May 2006 14:03:32 -0000 1.4 @@ -1 +1 @@ -Sub-Uplevel-0.10.tar.gz +Sub-Uplevel-0.12.tar.gz Index: perl-Sub-Uplevel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Sub-Uplevel.spec 21 Apr 2006 15:15:03 -0000 1.8 +++ perl-Sub-Uplevel.spec 13 May 2006 14:03:32 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Sub-Uplevel -Version: 0.10 +Version: 0.12 Release: 1%{?dist} Summary: Run a perl function in an upper stack frame @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -24,20 +24,18 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -make test +./Build test %clean @@ -46,12 +44,16 @@ %files %defattr(-,root,root,-) -%doc Changes +%doc Changes README %{perl_vendorlib}/Sub/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Sat May 13 2006 Jose Pedro Oliveira - 0.12-1 +- Update to 0.12. +- Makefile.PL -> Build.PL. + * Fri Apr 21 2006 Jose Pedro Oliveira - 0.10-1 - Update to 0.10. - New upstream maintainer. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 15:15:03 -0000 1.3 +++ sources 13 May 2006 14:03:32 -0000 1.4 @@ -1 +1 @@ -1dcde4e58ee1eb623b7ee974f5d7d6da Sub-Uplevel-0.10.tar.gz +1cf578951ee9f5b02108017658e703ba Sub-Uplevel-0.12.tar.gz From fedora-extras-commits at redhat.com Sat May 13 14:03:31 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 07:03:31 -0700 Subject: rpms/perl-Sub-Uplevel/FC-4 .cvsignore, 1.3, 1.4 perl-Sub-Uplevel.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605131404.k4DE43qX029025@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28959/FC-4 Modified Files: .cvsignore perl-Sub-Uplevel.spec sources Log Message: Update to 0.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 15:34:26 -0000 1.3 +++ .cvsignore 13 May 2006 14:03:31 -0000 1.4 @@ -1 +1 @@ -Sub-Uplevel-0.10.tar.gz +Sub-Uplevel-0.12.tar.gz Index: perl-Sub-Uplevel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/perl-Sub-Uplevel.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Sub-Uplevel.spec 21 Apr 2006 15:34:26 -0000 1.5 +++ perl-Sub-Uplevel.spec 13 May 2006 14:03:31 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Sub-Uplevel -Version: 0.10 +Version: 0.12 Release: 1%{?dist} Summary: Run a perl function in an upper stack frame @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -24,20 +24,18 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -make test +./Build test %clean @@ -46,12 +44,16 @@ %files %defattr(-,root,root,-) -%doc Changes +%doc Changes README %{perl_vendorlib}/Sub/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Sat May 13 2006 Jose Pedro Oliveira - 0.12-1 +- Update to 0.12. +- Makefile.PL -> Build.PL. + * Fri Apr 21 2006 Jose Pedro Oliveira - 0.10-1 - Update to 0.10. - New upstream maintainer. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 15:34:26 -0000 1.3 +++ sources 13 May 2006 14:03:31 -0000 1.4 @@ -1 +1 @@ -1dcde4e58ee1eb623b7ee974f5d7d6da Sub-Uplevel-0.10.tar.gz +1cf578951ee9f5b02108017658e703ba Sub-Uplevel-0.12.tar.gz From fedora-extras-commits at redhat.com Sat May 13 14:53:09 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:09 -0700 Subject: rpms/python-ctypes - New directory Message-ID: <200605131453.k4DErBCQ029412@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29386/python-ctypes Log Message: Directory /cvs/extras/rpms/python-ctypes added to the repository From fedora-extras-commits at redhat.com Sat May 13 14:53:10 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:10 -0700 Subject: rpms/python-ctypes/devel - New directory Message-ID: <200605131453.k4DErCBD029415@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29386/python-ctypes/devel Log Message: Directory /cvs/extras/rpms/python-ctypes/devel added to the repository From fedora-extras-commits at redhat.com Sat May 13 14:53:22 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:22 -0700 Subject: rpms/python-ctypes Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605131453.k4DErODI029464@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29431 Added Files: Makefile import.log Log Message: Setup of module python-ctypes --- NEW FILE Makefile --- # Top level Makefile for module python-ctypes all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 13 14:53:23 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:23 -0700 Subject: rpms/python-ctypes/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605131453.k4DErPHp029467@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29431/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-ctypes --- NEW 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 May 13 14:53:55 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:55 -0700 Subject: rpms/python-ctypes import.log,1.1,1.2 Message-ID: <200605131453.k4DErvSx029536@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503 Modified Files: import.log Log Message: auto-import python-ctypes-0.9.9.6-1 on branch devel from python-ctypes-0.9.9.6-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-ctypes/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 May 2006 14:53:22 -0000 1.1 +++ import.log 13 May 2006 14:53:55 -0000 1.2 @@ -0,0 +1 @@ +python-ctypes-0_9_9_6-1:HEAD:python-ctypes-0.9.9.6-1.src.rpm:1147532034 From fedora-extras-commits at redhat.com Sat May 13 14:53:56 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:53:56 -0700 Subject: rpms/python-ctypes/devel python-ctypes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605131453.k4DErwM1029541@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/python-ctypes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503/devel Modified Files: .cvsignore sources Added Files: python-ctypes.spec Log Message: auto-import python-ctypes-0.9.9.6-1 on branch devel from python-ctypes-0.9.9.6-1.src.rpm --- NEW FILE python-ctypes.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-ctypes Version: 0.9.9.6 Release: 1%{?dist} Summary: Advanced Foreign Function Interface for Python Group: Development/Languages License: MIT URL: http://starship.python.net/crew/theller/ctypes/ Source0: http://download.sourceforge.net/ctypes/ctypes-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description ctypes is an advanced ffi (Foreign Function Interface) package for Python 2.3 and higher. ctypes allows to call functions exposed from dlls/shared libraries and has extensive facilities to create, access and manipulate simple and complicated C data types in Python - in other words: wrap libraries in pure Python. It is even possible to implement C callback functions in pure Python. %prep %setup -q -n ctypes-%{version} %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT # Clean up temp and build for debuginfo %{__python} setup.py clean %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt docs # Include files and dirs below %{python_sitelib} (for noarch packages) and # %{python_sitearch} (for arch-dependent packages) as appropriate, and mark # *.pyo as %ghost (do not include in package). %{python_sitearch}/*.so %dir %{python_sitearch}/ctypes %{python_sitearch}/ctypes/*.py %{python_sitearch}/ctypes/*.pyc %ghost %{python_sitearch}/ctypes/*.pyo %dir %{python_sitearch}/ctypes/macholib %{python_sitearch}/ctypes/macholib/*.py %{python_sitearch}/ctypes/macholib/*.pyc %ghost %{python_sitearch}/ctypes/macholib/*.pyo #Don't package the test suite %exclude %{python_sitearch}/ctypes/test %changelog * Thu Apr 27 2006 Paul Nasrat - 0.9.9.6-1 - Update to latest release * Sat Jan 14 2006 Konstantin Ryabitsev - 0.9.6-1 - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-ctypes/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2006 14:53:23 -0000 1.1 +++ .cvsignore 13 May 2006 14:53:56 -0000 1.2 @@ -0,0 +1 @@ +ctypes-0.9.9.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-ctypes/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 May 2006 14:53:23 -0000 1.1 +++ sources 13 May 2006 14:53:56 -0000 1.2 @@ -0,0 +1 @@ +6c7240608d564018ef8254721fde0012 ctypes-0.9.9.6.tar.gz From fedora-extras-commits at redhat.com Sat May 13 14:56:56 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Sat, 13 May 2006 07:56:56 -0700 Subject: owners owners.list,1.987,1.988 Message-ID: <200605131456.k4DEuww5029604@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29585 Modified Files: owners.list Log Message: Add python-ctypes Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.987 retrieving revision 1.988 diff -u -r1.987 -r1.988 --- owners.list 13 May 2006 01:35:49 -0000 1.987 +++ owners.list 13 May 2006 14:56:56 -0000 1.988 @@ -1319,6 +1319,7 @@ Fedora Extras|python-clientform|Python module for client-side HTML forms|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-cpio|A Python module for accessing cpio archives|ivazquez at ivazquez.net|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-ctypes| Advanced Foreign Function Interface for Python|pnasrat at redhat.com|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| From fedora-extras-commits at redhat.com Sat May 13 15:37:13 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sat, 13 May 2006 08:37:13 -0700 Subject: rpms/directfb/FC-5 .cvsignore, 1.4, 1.5 directfb.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605131537.k4DFbF5r032053@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/directfb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32032 Modified Files: .cvsignore directfb.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 00:07:23 -0000 1.4 +++ .cvsignore 13 May 2006 15:37:13 -0000 1.5 @@ -1 +1 @@ -DirectFB-0.9.24.tar.gz +DirectFB-0.9.25.1.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-5/directfb.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- directfb.spec 5 Mar 2006 13:52:07 -0000 1.10 +++ directfb.spec 13 May 2006 15:37:13 -0000 1.11 @@ -1,6 +1,6 @@ Name: directfb -Version: 0.9.24 -Release: 5%{?dist} +Version: 0.9.25.1 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -52,7 +52,7 @@ --enable-video4linux2 \ --with-gfxdrivers=\ ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\ -savage,tdfx,unichrome,sis315,r200 +savage,tdfx,unichrome,sis315 make %{?_smp_mflags} @@ -79,12 +79,17 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} -%{_datadir}/%{name}-%{version} +#%{_libdir}/directfb-%{version} +#%{_datadir}/%{name}-%{version} +# grrr, I hate it when projects do brown paper bag releases in a dirty way ... +%{_libdir}/directfb-0.9.25 +%{_datadir}/%{name}-0.9.25 %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo +%{_bindir}/dfbinput %{_bindir}/dfblayer +%{_bindir}/dfbpenmount %{_bindir}/dfbscreen %{_bindir}/dfbsummon %{_mandir}/man1/dfbg.1* @@ -107,6 +112,10 @@ %{_libdir}/libfusion.so %changelog +* Sat May 13 2006 Thomas Vander Stichele +- 0.9.25.1-1 +- new upstream version + * Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 - rebuild for fedora extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 00:02:39 -0000 1.4 +++ sources 13 May 2006 15:37:13 -0000 1.5 @@ -1 +1 @@ -1f4b56b20d4e6f5c6ceb15c1c4fd2ecd DirectFB-0.9.24.tar.gz +b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 15:39:55 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 13 May 2006 08:39:55 -0700 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.16,1.17 Message-ID: <200605131539.k4DFdvt0032128@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-serv32111 Modified Files: perl-Module-Build.spec Log Message: bump Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Module-Build.spec 12 May 2006 17:08:10 -0000 1.16 +++ perl-Module-Build.spec 13 May 2006 15:39:54 -0000 1.17 @@ -1,6 +1,6 @@ Name: perl-Module-Build Version: 0.28 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Perl module for building and installing Perl modules License: GPL or Artistic @@ -61,6 +61,9 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Sat May 13 2006 Steven Pritchard - 1:0.28-2 +- Rebuild. + * Fri May 12 2006 Steven Pritchard - 1:0.28-1 - Update to 0.28. - Epoch bump to make 0.28 > 0.2612. From fedora-extras-commits at redhat.com Sat May 13 16:36:13 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sat, 13 May 2006 09:36:13 -0700 Subject: rpms/directfb/devel .cvsignore, 1.4, 1.5 directfb.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605131636.k4DGaFuM002182@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/directfb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2161 Modified Files: .cvsignore directfb.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 00:07:23 -0000 1.4 +++ .cvsignore 13 May 2006 16:36:12 -0000 1.5 @@ -1 +1 @@ -DirectFB-0.9.24.tar.gz +DirectFB-0.9.25.1.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/directfb.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- directfb.spec 5 Mar 2006 13:52:07 -0000 1.10 +++ directfb.spec 13 May 2006 16:36:12 -0000 1.11 @@ -1,6 +1,6 @@ Name: directfb -Version: 0.9.24 -Release: 5%{?dist} +Version: 0.9.25.1 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -52,7 +52,7 @@ --enable-video4linux2 \ --with-gfxdrivers=\ ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\ -savage,tdfx,unichrome,sis315,r200 +savage,tdfx,unichrome,sis315 make %{?_smp_mflags} @@ -79,12 +79,17 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} -%{_datadir}/%{name}-%{version} +#%{_libdir}/directfb-%{version} +#%{_datadir}/%{name}-%{version} +# grrr, I hate it when projects do brown paper bag releases in a dirty way ... +%{_libdir}/directfb-0.9.25 +%{_datadir}/%{name}-0.9.25 %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo +%{_bindir}/dfbinput %{_bindir}/dfblayer +%{_bindir}/dfbpenmount %{_bindir}/dfbscreen %{_bindir}/dfbsummon %{_mandir}/man1/dfbg.1* @@ -107,6 +112,10 @@ %{_libdir}/libfusion.so %changelog +* Sat May 13 2006 Thomas Vander Stichele +- 0.9.25.1-1 +- new upstream version + * Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 - rebuild for fedora extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 00:02:39 -0000 1.4 +++ sources 13 May 2006 16:36:12 -0000 1.5 @@ -1 +1 @@ -1f4b56b20d4e6f5c6ceb15c1c4fd2ecd DirectFB-0.9.24.tar.gz +b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 17:18:05 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 13 May 2006 10:18:05 -0700 Subject: rpms/lyx/devel lyx.spec,1.33,1.34 Message-ID: <200605131718.k4DHI7Gg004715@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4698 Modified Files: lyx.spec Log Message: * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- lyx.spec 11 Apr 2006 14:40:06 -0000 1.33 +++ lyx.spec 13 May 2006 17:18:05 -0000 1.34 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -45,13 +45,15 @@ Requires(post): tetex-fonts Requires(postun): tetex-fonts +Requires: %{name}-frontend = %{version} Requires: tetex-latex Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript Requires: htmlview -Requires: %{name}-frontend = %{version} - +## Soft dependancies +# add support for lyx's Document->Change Tracking +Requires(hint): tetex-dvipost %description LyX is a modern approach to writing documents which breaks with the @@ -199,6 +201,10 @@ %changelog +* Fri Apr 28 2006 Rex Dieter 1.4.1-3 +- Requires(hint): tetex-dvipost + adds support for lyx's Document->Change Tracking + * Tue Apr 11 2006 Rex Dieter 1.4.1-2 - 1.4.1 From fedora-extras-commits at redhat.com Sat May 13 17:18:57 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 13 May 2006 10:18:57 -0700 Subject: rpms/lyx/FC-5 lyx.spec,1.32,1.33 Message-ID: <200605131719.k4DHIxF0004781@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4764 Modified Files: lyx.spec Log Message: * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- lyx.spec 11 Apr 2006 14:42:36 -0000 1.32 +++ lyx.spec 13 May 2006 17:18:57 -0000 1.33 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -45,13 +45,15 @@ Requires(post): tetex-fonts Requires(postun): tetex-fonts +Requires: %{name}-frontend = %{version} Requires: tetex-latex Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript Requires: htmlview -Requires: %{name}-frontend = %{version} - +## Soft dependancies +# add support for lyx's Document->Change Tracking +Requires(hint): tetex-dvipost %description LyX is a modern approach to writing documents which breaks with the @@ -199,6 +201,10 @@ %changelog +* Fri Apr 28 2006 Rex Dieter 1.4.1-3 +- Requires(hint): tetex-dvipost + adds support for lyx's Document->Change Tracking + * Tue Apr 11 2006 Rex Dieter 1.4.1-2 - 1.4.1 From fedora-extras-commits at redhat.com Sat May 13 17:19:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 13 May 2006 10:19:24 -0700 Subject: rpms/lyx/FC-4 lyx.spec,1.19,1.20 Message-ID: <200605131719.k4DHJQ6P004853@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4836 Modified Files: lyx.spec Log Message: * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- lyx.spec 11 Apr 2006 15:53:34 -0000 1.19 +++ lyx.spec 13 May 2006 17:19:24 -0000 1.20 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -45,13 +45,15 @@ Requires(post): tetex-fonts Requires(postun): tetex-fonts +Requires: %{name}-frontend = %{version} Requires: tetex-latex Requires: tetex-dvips Requires: mathml-fonts Requires: ghostscript Requires: htmlview -Requires: %{name}-frontend = %{version} - +## Soft dependancies +# add support for lyx's Document->Change Tracking +Requires(hint): tetex-dvipost %description LyX is a modern approach to writing documents which breaks with the @@ -199,6 +201,10 @@ %changelog +* Fri Apr 28 2006 Rex Dieter 1.4.1-3 +- Requires(hint): tetex-dvipost + adds support for lyx's Document->Change Tracking + * Tue Apr 11 2006 Rex Dieter 1.4.1-2 - 1.4.1 From fedora-extras-commits at redhat.com Sat May 13 17:35:23 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sat, 13 May 2006 10:35:23 -0700 Subject: rpms/directfb/FC-4 .cvsignore, 1.4, 1.5 directfb.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605131735.k4DHZPJh005005@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/directfb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4984 Modified Files: .cvsignore directfb.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Nov 2005 12:12:25 -0000 1.4 +++ .cvsignore 13 May 2006 17:35:23 -0000 1.5 @@ -1 +1 @@ -DirectFB-0.9.24.tar.gz +DirectFB-0.9.25.1.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-4/directfb.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- directfb.spec 25 Nov 2005 12:12:25 -0000 1.5 +++ directfb.spec 13 May 2006 17:35:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: directfb -Version: 0.9.24 -Release: 4%{?dist} +Version: 0.9.25.1 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -52,7 +52,7 @@ --enable-video4linux2 \ --with-gfxdrivers=\ ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\ -savage,tdfx,unichrome,sis315,r200 +savage,tdfx,unichrome,sis315 make %{?_smp_mflags} @@ -79,12 +79,17 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} -%{_datadir}/%{name}-%{version} +#%{_libdir}/directfb-%{version} +#%{_datadir}/%{name}-%{version} +# grrr, I hate it when projects do brown paper bag releases in a dirty way ... +%{_libdir}/directfb-0.9.25 +%{_datadir}/%{name}-0.9.25 %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo +%{_bindir}/dfbinput %{_bindir}/dfblayer +%{_bindir}/dfbpenmount %{_bindir}/dfbscreen %{_bindir}/dfbsummon %{_mandir}/man1/dfbg.1* @@ -107,6 +112,13 @@ %{_libdir}/libfusion.so %changelog +* Sat May 13 2006 Thomas Vander Stichele +- 0.9.25.1-1 +- new upstream version + +* Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 +- rebuild for fedora extras 5 + * Fri Nov 25 2005 Hans de Goede 0.9.24-4 - Merge FC-4 and devel specfiles for easier maintainance and consistence. - Incorperate improvements suggested by Ville Skytt?? in bug 162358. Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Nov 2005 12:12:25 -0000 1.4 +++ sources 13 May 2006 17:35:23 -0000 1.5 @@ -1 +1 @@ -1f4b56b20d4e6f5c6ceb15c1c4fd2ecd DirectFB-0.9.24.tar.gz +b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 17:36:34 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sat, 13 May 2006 10:36:34 -0700 Subject: rpms/directfb/FC-3 .cvsignore, 1.3, 1.4 directfb.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605131736.k4DHaaMh005084@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/directfb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5063 Modified Files: .cvsignore directfb.spec sources Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Nov 2005 18:00:00 -0000 1.3 +++ .cvsignore 13 May 2006 17:36:34 -0000 1.4 @@ -1 +1 @@ -DirectFB-0.9.24.tar.gz +DirectFB-0.9.25.1.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-3/directfb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- directfb.spec 28 Nov 2005 18:00:00 -0000 1.2 +++ directfb.spec 13 May 2006 17:36:34 -0000 1.3 @@ -1,6 +1,6 @@ Name: directfb -Version: 0.9.24 -Release: 4%{?dist} +Version: 0.9.25.1 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -52,7 +52,7 @@ --enable-video4linux2 \ --with-gfxdrivers=\ ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\ -savage,tdfx,unichrome,sis315,r200 +savage,tdfx,unichrome,sis315 make %{?_smp_mflags} @@ -79,12 +79,17 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} -%{_datadir}/%{name}-%{version} +#%{_libdir}/directfb-%{version} +#%{_datadir}/%{name}-%{version} +# grrr, I hate it when projects do brown paper bag releases in a dirty way ... +%{_libdir}/directfb-0.9.25 +%{_datadir}/%{name}-0.9.25 %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo +%{_bindir}/dfbinput %{_bindir}/dfblayer +%{_bindir}/dfbpenmount %{_bindir}/dfbscreen %{_bindir}/dfbsummon %{_mandir}/man1/dfbg.1* @@ -107,6 +112,13 @@ %{_libdir}/libfusion.so %changelog +* Sat May 13 2006 Thomas Vander Stichele +- 0.9.25.1-1 +- new upstream version + +* Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 +- rebuild for fedora extras 5 + * Fri Nov 25 2005 Hans de Goede 0.9.24-4 - Merge FC-4 and devel specfiles for easier maintainance and consistence. - Incorperate improvements suggested by Ville Skytt?? in bug 162358. Index: sources =================================================================== RCS file: /cvs/extras/rpms/directfb/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2005 18:00:00 -0000 1.3 +++ sources 13 May 2006 17:36:34 -0000 1.4 @@ -1 +1 @@ -1f4b56b20d4e6f5c6ceb15c1c4fd2ecd DirectFB-0.9.24.tar.gz +b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 21:36:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:36:35 -0700 Subject: rpms/tiger - New directory Message-ID: <200605132136.k4DLabbI015210@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15188/tiger Log Message: Directory /cvs/extras/rpms/tiger added to the repository From fedora-extras-commits at redhat.com Sat May 13 21:36:35 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:36:35 -0700 Subject: rpms/tiger/devel - New directory Message-ID: <200605132136.k4DLabjB015213@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15188/tiger/devel Log Message: Directory /cvs/extras/rpms/tiger/devel added to the repository From fedora-extras-commits at redhat.com Sat May 13 21:36:55 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:36:55 -0700 Subject: rpms/tiger Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605132136.k4DLavp7015269@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15236 Added Files: Makefile import.log Log Message: Setup of module tiger --- NEW FILE Makefile --- # Top level Makefile for module tiger all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 13 21:36:56 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:36:56 -0700 Subject: rpms/tiger/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605132136.k4DLawjM015272@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15236/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tiger --- NEW 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 May 13 21:38:59 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:38:59 -0700 Subject: rpms/tiger import.log,1.1,1.2 Message-ID: <200605132139.k4DLd1wj015403@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15359 Modified Files: import.log Log Message: auto-import tiger-3.2.1-4 on branch devel from tiger-3.2.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tiger/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 May 2006 21:36:55 -0000 1.1 +++ import.log 13 May 2006 21:38:58 -0000 1.2 @@ -0,0 +1 @@ +tiger-3_2_1-4:HEAD:tiger-3.2.1-4.src.rpm:1147556318 From fedora-extras-commits at redhat.com Sat May 13 21:38:59 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:38:59 -0700 Subject: rpms/tiger/devel tiger-3.2.1-autotools.patch, NONE, 1.1 tiger-3.2.1-config.patch, NONE, 1.1 tiger-3.2.1-doc.patch, NONE, 1.1 tiger-3.2.1-fixes.patch, NONE, 1.1 tiger-3.2.1-gcc4.patch, NONE, 1.1 tiger-3.2.1-scripts.patch, NONE, 1.1 tiger-3.2.1.tar.gz.sig, NONE, 1.1 tiger.README, NONE, 1.1 tiger.cron, NONE, 1.1 tiger.ignore, NONE, 1.1 tiger.ignore.server, NONE, 1.1 tiger.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605132139.k4DLd1kl015420@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/tiger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15359/devel Modified Files: .cvsignore sources Added Files: tiger-3.2.1-autotools.patch tiger-3.2.1-config.patch tiger-3.2.1-doc.patch tiger-3.2.1-fixes.patch tiger-3.2.1-gcc4.patch tiger-3.2.1-scripts.patch tiger-3.2.1.tar.gz.sig tiger.README tiger.cron tiger.ignore tiger.ignore.server tiger.spec Log Message: auto-import tiger-3.2.1-4 on branch devel from tiger-3.2.1-4.src.rpm tiger-3.2.1-autotools.patch: --- NEW FILE tiger-3.2.1-autotools.patch --- --- tiger-3.2.1.orig/c/Makefile +++ tiger-3.2.1/c/Makefile @@ -1,3 +1,4 @@ +# Generated automatically from Makefile.in by configure. # Makefile for tiger binaries # # @@ -22,15 +23,17 @@ # been added later) BINLIST=getpermit snefru md5 testsuid realpath COPTS= -DNEEDGETWD +INSTALL=/usr/bin/install -c +CC=gcc all: ${BINLIST} install: all - cp ${BINLIST} ../bin/ + $(INSTALL) -m0755 ${BINLIST} ../bin/ % : %.c - gcc ${COPTS} -o $@ $< + $(CC) $(CFLAGS) ${COPTS} -o $@ $< clean: -rm -f ${BINLIST} --- tiger-3.2.1.orig/c/Makefile.in +++ tiger-3.2.1/c/Makefile.in @@ -0,0 +1,40 @@ +# Makefile for tiger binaries +# +# +# Makefile for tiger binaries - A UN*X security checking system +# Copyright (C) 2002 Javier Fernandez-Sanguino Pen~a +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 1, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# Please see the file `COPYING' for the complete copyright notice. +# + +# For some reason snefru and md5 were received wrongly +# and they could not be compiled at first (they have +# been added later) +BINLIST=getpermit snefru md5 testsuid realpath +COPTS= -DNEEDGETWD +INSTALL=@INSTALL@ +CC=@CC@ + +all: ${BINLIST} + +install: all + $(INSTALL) -m0755 ${BINLIST} ../bin/ + + +% : %.c + $(CC) $(CFLAGS) ${COPTS} -o $@ $< + +clean: + -rm -f ${BINLIST} + +distclean: clean --- tiger-3.2.1.orig/configure +++ tiger-3.2.1/configure @@ -532,6 +532,312 @@ +# Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:539: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:569: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:620: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:652: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 663 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:694: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:699: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:727: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi + +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# ./install, which can be erroneously created by make from ./install.sh. +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:789: checking for a BSD compatible install" >&5 +if test -z "$INSTALL"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_save_IFS" + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi +fi +echo "$ac_t""$INSTALL" 1>&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + test "x$prefix" != "xNONE" || prefix=/usr/local # Check whether --with-tigerhome or --without-tigerhome was given. @@ -608,6 +914,7 @@ + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -719,8 +1026,10 @@ done ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile + c/Makefile man/tiger.8 man/tigercron.8" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -754,6 +1063,11 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@CC@%$CC%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@install@%$install%g s%@tigerhome@%$tigerhome%g s%@tigerwork@%$tigerwork%g s%@tigerlog@%$tigerlog%g @@ -805,6 +1119,7 @@ cat >> $CONFIG_STATUS < $ac_file fi; done rm -f conftest.s* --- tiger-3.2.1.orig/configure.in +++ tiger-3.2.1/configure.in @@ -4,6 +4,9 @@ dnl for to make sure it's in the right directory. AC_INIT(tiger) +AC_PROG_CC +AC_PROG_INSTALL + test "x$prefix" != "xNONE" || prefix=/usr/local AC_ARG_WITH(tigerhome, [ --with-tigerhome=LOCATION Location of all Tiger files], @@ -42,6 +45,7 @@ tigerlogdir=`eval echo $tigerlog` tigerconfigdir=`eval echo $tigerconfig` tigerhomedir=`eval echo $tigerhome` +AC_SUBST(install) AC_SUBST(tigerhome) AC_SUBST(tigerwork) AC_SUBST(tigerlog) @@ -52,5 +56,6 @@ AC_SUBST(tigerconfigdir) AC_SUBST(tigerhomedir) AC_OUTPUT(Makefile + c/Makefile man/tiger.8 man/tigercron.8) --- tiger-3.2.1.orig/Makefile.in +++ tiger-3.2.1/Makefile.in @@ -21,6 +21,9 @@ mandir=@mandir@ # To avoid troubles with some systems.. SHELL = /bin/sh +# Installation program +INSTALL=@INSTALL@ +CC=@CC@ # This directory will contain the 'tiger', 'tigercron', 'tigexp' # scripts, config files, the 'scripts' subdirectory which will @@ -54,6 +57,10 @@ # TIGERCONFIG=@tigerconfig@ # +# Where do manpages go to +# +TIGERMANDIR=@mandir@ +# #------------------------------------------------------------------------ # # End of user customization... @@ -61,7 +68,7 @@ #------------------------------------------------------------------------ # -PLATFORM_SCRIPTS=$(shell find ./systems/ -type f) +PLATFORM_SCRIPTS=$$(find ./systems/ -type f) BINARIES=./tiger \ ./tigexp \ @@ -89,6 +96,8 @@ ./scripts/check_netrc \ ./scripts/check_network \ ./scripts/check_nisplus \ + ./scripts/check_ntp \ + ./scripts/check_omniback \ ./scripts/check_passwd \ ./scripts/check_passwdformat \ ./scripts/check_path \ @@ -116,11 +125,13 @@ $(PLATFORM_SCRIPTS) CONFIGFILES=./tigerrc \ - ./cronrc \ + ./cronrc MISCFILES=./initdefs \ - ./check.tbl \ ./syslist \ + ./check.d/README \ + ./util/buildbins \ + ./util/buildconf \ ./util/difflogs \ ./util/flogit \ ./util/genmsgidx \ @@ -130,19 +141,29 @@ ./util/getfs-std \ ./util/gethostinfo \ ./util/getnetgroup \ + ./util/getpermit \ + ./util/installsig \ ./util/logit \ + ./util/mkfilelst \ + ./util/mksig \ ./util/setsh \ ./util/sgrep MISCDIRS=./bin \ + ./check.d \ ./doc \ ./html \ - ./man \ ./scripts/sub \ ./systems all: + @if [ ! -d bin ]; then \ + mkdir bin; \ + fi cd c && $(MAKE) install + @if [ ! -d html ]; then \ + mkdir html; \ + fi cd util && sh doc2html ./util/genmsgidx @@ -182,6 +203,19 @@ mkdir -p $(DESTDIR)$(TIGERCONFIG); \ chmod 700 $(DESTDIR)$(TIGERCONFIG); \ fi + @echo "Creating $(TIGERMANDIR)..." + @if [ ! -d $(DESTDIR)$(TIGERMANDIR) ]; then \ + mkdir -p $(DESTDIR)$(TIGERMANDIR); \ + mkdir -p $(DESTDIR)$(TIGERMANDIR)/man8; \ + chmod 755 $(DESTDIR)$(TIGERMANDIR); \ + chmod 755 $(DESTDIR)$(TIGERMANDIR)/man8; \ + fi + +installmanpages: + @echo "Copying manpages..." + $(INSTALL) -m 0444 man/tiger.8 $(DESTDIR)$(TIGERMANDIR)/man8 + $(INSTALL) -m 0444 man/tigexp.8 $(DESTDIR)$(TIGERMANDIR)/man8 + $(INSTALL) -m 0444 man/tigercron.8 $(DESTDIR)$(TIGERMANDIR)/man8 installbinaries: @echo "Copying binaries..." @@ -198,8 +232,7 @@ installconfig: @echo "Copying configuration files..." @for file in $(CONFIGFILES); do \ - cp $$file $(DESTDIR)$(TIGERCONFIG)/$$file; \ - chmod 640 $(DESTDIR)$(TIGERCONFIG)/$$file; \ + $(INSTALL) -m 0640 $$file $(DESTDIR)$(TIGERCONFIG)/$$file; \ done @echo "Copying general configuration..." @sed -e 's%^TigerLogDir=.*$$%TigerLogDir="'$(TIGERLOGS)'"%' \ @@ -210,13 +243,13 @@ ./config >$(DESTDIR)$(TIGERHOME)/config @chmod 644 $(DESTDIR)$(TIGERHOME)/config -install: installdirs installbinaries installconfig +install: installdirs installbinaries installconfig installmanpages cd c && $(MAKE) install - @echo "Copying miscellaneus dirs..." + @echo "Copying miscellaneous dirs..." @for dir in $(MISCDIRS); do \ tar cf - $$dir | (cd $(DESTDIR)$(TIGERHOME); tar xpf -); \ done - @echo "Copying miscellaneus files..." + @echo "Copying miscellaneous files..." @for file in $(MISCFILES); do \ cp -p $$file $(DESTDIR)$(TIGERHOME)/$$file; \ done --- tiger-3.2.1.orig/install.sh +++ tiger-3.2.1/install.sh @@ -0,0 +1,312 @@ +## +## install -- Install a program, script or datafile +## Copyright (c) 1997-2004 Ralf S. Engelschall +## +## This file is part of shtool and 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 file 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, or contact Ralf S. Engelschall . +## + +str_tool="install" +str_usage="[-v|--verbose] [-t|--trace] [-d|--mkdir] [-c|--copy] [-C|--compare-copy] [-s|--strip] [-m|--mode ] [-o|--owner ] [-g|--group ] [-e|--exec ] [ ...] " +arg_spec="1+" +opt_spec="v.t.d.c.C.s.m:o:g:e+" +opt_alias="v:verbose,t:trace,d:mkdir,c:copy,C:compare-copy,s:strip,m:mode,o:owner,g:group,e:exec" +opt_v=no +opt_t=no +opt_d=no +opt_c=no +opt_C=no +opt_s=no +opt_m="0755" +opt_o="" +opt_g="" +opt_e="" + +. ./sh.common + +# special case: "shtool install -d

    [...]" internally +# maps to "shtool mkdir -f -p -m 755 [...]" +if [ "$opt_d" = yes ]; then + cmd="$0 mkdir -f -p -m 755" + if [ ".$opt_o" != . ]; then + cmd="$cmd -o '$opt_o'" + fi + if [ ".$opt_g" != . ]; then + cmd="$cmd -g '$opt_g'" + fi + if [ ".$opt_v" = .yes ]; then + cmd="$cmd -v" + fi + if [ ".$opt_t" = .yes ]; then + cmd="$cmd -t" + fi + for dir in "$@"; do + eval "$cmd $dir" || shtool_exit $? + done + shtool_exit 0 +fi + +# determine source(s) and destination +argc=$# +srcs="" +while [ $# -gt 1 ]; do + srcs="$srcs $1" + shift +done +dstpath="$1" + +# type check for destination +dstisdir=0 +if [ -d $dstpath ]; then + dstpath=`echo "$dstpath" | sed -e 's:/$::'` + dstisdir=1 +fi + +# consistency check for destination +if [ $argc -gt 2 ] && [ $dstisdir = 0 ]; then + echo "$msgprefix:Error: multiple sources require destination to be directory" 1>&2 + shtool_exit 1 +fi + +# iterate over all source(s) +for src in $srcs; do + dst=$dstpath + + # if destination is a directory, append the input filename + if [ $dstisdir = 1 ]; then + dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'` + dst="$dst/$dstfile" + fi + + # check for correct arguments + if [ ".$src" = ".$dst" ]; then + echo "$msgprefix:Warning: source and destination are the same - skipped" 1>&2 + continue + fi + if [ -d "$src" ]; then + echo "$msgprefix:Warning: source \`$src' is a directory - skipped" 1>&2 + continue + fi + + # make a temp file name in the destination directory + dsttmp=`echo $dst |\ + sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;' \ + -e "s;\$;/#INST@$$#;"` + + # verbosity + if [ ".$opt_v" = .yes ]; then + echo "$src -> $dst" 1>&2 + fi + + # copy or move the file name to the temp name + # (because we might be not allowed to change the source) + if [ ".$opt_C" = .yes ]; then + opt_c=yes + fi + if [ ".$opt_c" = .yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "cp $src $dsttmp" 1>&2 + fi + cp $src $dsttmp || shtool_exit $? + else + if [ ".$opt_t" = .yes ]; then + echo "mv $src $dsttmp" 1>&2 + fi + mv $src $dsttmp || shtool_exit $? + fi + + # adjust the target file + if [ ".$opt_e" != . ]; then + sed='sed' + OIFS="$IFS"; IFS="$ASC_NL"; set -- $opt_e; IFS="$OIFS" + for e + do + sed="$sed -e '$e'" + done + cp $dsttmp $dsttmp.old + chmod u+w $dsttmp + eval "$sed <$dsttmp.old >$dsttmp" || shtool_exit $? + rm -f $dsttmp.old + fi + if [ ".$opt_s" = .yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "strip $dsttmp" 1>&2 + fi + strip $dsttmp || shtool_exit $? + fi + if [ ".$opt_o" != . ]; then + if [ ".$opt_t" = .yes ]; then + echo "chown $opt_o $dsttmp" 1>&2 + fi + chown $opt_o $dsttmp || shtool_exit $? + fi + if [ ".$opt_g" != . ]; then + if [ ".$opt_t" = .yes ]; then + echo "chgrp $opt_g $dsttmp" 1>&2 + fi + chgrp $opt_g $dsttmp || shtool_exit $? + fi + if [ ".$opt_m" != ".-" ]; then + if [ ".$opt_t" = .yes ]; then + echo "chmod $opt_m $dsttmp" 1>&2 + fi + chmod $opt_m $dsttmp || shtool_exit $? + fi + + # determine whether to do a quick install + # (has to be done _after_ the strip was already done) + quick=no + if [ ".$opt_C" = .yes ]; then + if [ -r $dst ]; then + if cmp -s $src $dst; then + quick=yes + fi + fi + fi + + # finally, install the file to the real destination + if [ $quick = yes ]; then + if [ ".$opt_t" = .yes ]; then + echo "rm -f $dsttmp" 1>&2 + fi + rm -f $dsttmp + else + if [ ".$opt_t" = .yes ]; then + echo "rm -f $dst && mv $dsttmp $dst" 1>&2 + fi + rm -f $dst && mv $dsttmp $dst + fi +done + +shtool_exit 0 + +## +## manual page +## + +=pod + +=head1 NAME + +B - B install(1) command + +=head1 SYNOPSIS + +B +[B<-v>|B<--verbose>] +[B<-t>|B<--trace>] +[B<-d>|B<--mkdir>] +[B<-c>|B<--copy>] +[B<-C>|B<--compare-copy>] +[B<-s>|B<--strip>] +[B<-m>|B<--mode> I] +[B<-o>|B<--owner> I] +[B<-g>|B<--group> I] +[B<-e>|B<--exec> I] +I [I ...] +I + +=head1 DESCRIPTION + +This command installs a one or more Is to a given target I +providing all important options of the BSD install(1) command. +The trick is that the functionality is provided in a portable way. + +=head1 OPTIONS + +The following command line options are available. + +=over 4 + +=item B<-v>, B<--verbose> + +Display some processing information. + +=item B<-t>, B<--trace> + +Enable the output of the essential shell commands which are executed. + +=item B<-d>, B<--mkdir> + +To maximize BSD compatiblity, the BSD "B C" usage is +internally mapped to the "B C" command. + +=item B<-c>, B<--copy> + +Copy the I to the target I. Default is to move. + +=item B<-C>, B<--compare-copy> + +Same as B<-c> except if the destination file already exists and is +identical to the source file, no installation is done and the target +remains untouched. + +=item B<-s>, B<--strip> + +This option strips program executables during the installation, see +strip(1). Default is to install verbatim. + +=item B<-m>, B<--mode> I + +The file mode applied to the target, see chmod(1). Setting mode to +"C<->" skips this step and leaves the operating system default which is +usually based on umask(1). Some file modes require superuser privileges +to be set. Default is 0755. + +=item B<-o>, B<--owner> I + +The file owner name or id applied to the target, see chown(1). This +option requires superuser privileges to execute. Default is to skip this +step and leave the operating system default which is usually based on +the executing uid or the parent setuid directory. + +=item B<-g>, B<--group> I + +The file group name or id applied to the target, see chgrp(1). This +option requires superuser privileges to execute to the fullest extend, +otherwise the choice of I is limited on most operating systems. +Default is to skip this step and leave the operating system default +which is usually based on the executing gid or the parent setgid +directory. + +=item B<-e>, B<--exec> I + +This option can be used one or multiple times to apply one or more +sed(1) commands to the file contents during installation. + +=back + +=head1 EXAMPLE + + # Makefile + install: + : + shtool install -c -s -m 4755 foo $(bindir)/ + shtool install -c -m 644 foo.man $(mandir)/man1/foo.1 + shtool install -c -m 644 -e "s/@p@/$prefix/g" foo.conf $(etcdir)/ + +=head1 HISTORY + +The B B command was originally written by Ralf S. +Engelschall Erse at engelschall.comE in 1997 for B. It +was prompted by portability issues in the installation procedures of +B libraries. + +=head1 SEE ALSO + +shtool(1), umask(1), chmod(1), chown(1), chgrp(1), strip(1), sed(1). + +=cut + tiger-3.2.1-config.patch: --- NEW FILE tiger-3.2.1-config.patch --- --- ./site-sample.config 2003-09-03 14:09:14.000000000 +0200 +++ ./site-sample 2005-08-07 17:12:40.000000000 +0200 @@ -86,4 +86,4 @@ # # Define where Integrit is installed (if you use it) # -#INTEGRIT=/usr/local/bin/aide +#INTEGRIT=/usr/local/bin/integrit --- ./tigerrc-TAMU.config 2002-06-14 10:51:31.000000000 +0200 +++ ./tigerrc-TAMU 2005-08-07 17:12:40.000000000 +0200 @@ -15,6 +15,7 @@ # you don't want performed. # Tiger_Check_PASSWD=Y # Fast +Tiger_Check_PASSWD_FORMAT=N # Fast - not needed if on systems with pwck Tiger_Check_GROUP=Y # Fast Tiger_Check_ACCOUNTS=Y # Time varies on # of users Tiger_Check_RHOSTS=Y # Time varies on # of users @@ -141,6 +142,11 @@ # Tiger_Crack_Local=N # +# Who sends output from 'tigercron'? +# Default is "root@$HOSTNAME" (gets expanded by tigercron) +# +# Tiger_Mail_FROM="root@`uname -n`" +# # Who gets output from 'tigercron'? # Tiger_Mail_RCPT=root --- ./cronrc.config 2003-09-19 16:24:41.000000000 +0200 +++ ./cronrc 2005-08-07 17:12:40.000000000 +0200 @@ -28,7 +28,16 @@ # ---------------------------------------------------------------------- # Check for known intrusion signs every 8 hours # -0,8,16 * * check_known check_rootkit check_finddeleted check_logfiles check_runprocs check_rootdir check_root +0,8,16 * * check_known check_rootkit check_logfiles check_runprocs check_rootdir check_root +# [experimental] +# Check_finddeleted is very verbose and needs to be adjusted so we run +# it less often, admins that want to run it more often are suggested +# to look up how does the ignore mechanism works. In busy servers many +# false positives might appear because of normal user access. +# Some applications might generate false positives too due to the +# way they behave. Also, this script requires LSOF, so only enable +# it if you have it installed. +#1 * * check_finddeleted # ---------------------------------------------------------------------- # Make system-specific checks every day at 1 am # Notice: System specific checks can be enabled in the @@ -68,7 +77,7 @@ # ---------------------------------------------------------------------- # Check for system configuration once a month # -1 2 * check_services check_signatures check_umask check_ftpusers check_embedded check_exrc +1 2 * check_services check_umask check_ftpusers check_embedded check_exrc # # ---------------------------------------------------------------------- # Run a password cracker against the local passwords once a month --- ./tigerrc-dist.config 2003-05-05 15:14:34.000000000 +0200 +++ ./tigerrc-dist 2005-08-07 17:12:40.000000000 +0200 @@ -9,6 +9,7 @@ # TigerNoBuild=Y # C files are corrupted (ouch.) Tiger_Check_PASSWD=Y # Fast +Tiger_Check_PASSWD_FORMAT=N # Fast - not needed if on systems with pwck Tiger_Check_PASSWD_SHADOW=Y # Time varies on # of users Tiger_Check_PASSWD_NIS=N # Time varies on # of users Tiger_Check_GROUP=Y # Fast @@ -209,6 +210,11 @@ # Tiger_Crack_Local=Y # +# Who sends output from 'tigercron'? +# Default is "root@$HOSTNAME" (gets expanded by tigercron) +# +# Tiger_Mail_FROM="root@`uname -n`" +# # Who gets output from 'tigercron'? # Tiger_Mail_RCPT=root --- ./check.tbl.config 2002-06-14 10:51:31.000000000 +0200 +++ ./check.tbl 2005-08-07 17:12:40.000000000 +0200 @@ -22,4 +22,4 @@ # Add other checks that should be attempted for all systems # here. One script name per line. # -check_sendmail +#check_sendmail --- ./tigerrc.config 2003-10-07 00:18:12.000000000 +0200 +++ ./tigerrc 2005-08-07 17:13:26.000000000 +0200 @@ -7,8 +7,16 @@ # Select checks to perform. Specify 'N' (uppercase) for checks # you don't want performed. # +# Notice this does not affect which checks will be performed through +# the cron job (Tiger's cronrc file governs that, usually under +# /usr/local/etc/tiger or /etc/tiger), it only affects which +# checks will be performed when running the full security checks +# (i.e. 'tiger') +# +# TigerNoBuild=Y # C files are corrupted (ouch.) Tiger_Check_PASSWD=Y # Fast +Tiger_Check_PASSWD_FORMAT=N # Fast - not needed if on systems with pwck Tiger_Check_PASSWD_SHADOW=Y # Time varies on # of users Tiger_Check_PASSWD_NIS=N # Time varies on # of users Tiger_Check_GROUP=Y # Fast @@ -19,11 +27,11 @@ Tiger_Check_CRON=Y # Fast Tiger_Check_ANONFTP=Y # Fast Tiger_Check_EXPORTS=Y # Fast -Tiger_Check_INETD=Y # Fast +Tiger_Check_INETD=Y # Fast for inetd, Varies on xinetd Tiger_Check_SERVICES=Y # Could be faster, not bad though Tiger_Check_KNOWN=Y # Fast Tiger_Check_PERMS=Y # Could be faster, not bad though -Tiger_Check_SIGNATURES=Y # Several minutes +Tiger_Check_SIGNATURES=N # Several minutes Tiger_Check_FILESYSTEM=Y # Time varies on disk space... can be hours Tiger_Check_ROOTDIR=Y # Fast, only 2 checks Tiger_Check_ROOT_ACCESS=Y # Fast @@ -37,7 +45,7 @@ Tiger_Check_LISTENING=Y # Fast Tiger_Check_SYSTEM=Y # Depends on the specific system checks Tiger_Check_RUNPROC=N # Fast, needs to be customized per system -Tiger_Check_DELETED=Y # Depends on the number of processes on the +Tiger_Check_DELETED=N # Depends on the number of processes on the # system Tiger_Check_APACHE=N # Fast Tiger_Check_SSH=Y # Fast @@ -46,6 +54,9 @@ Tiger_Check_EXRC=N # Depends on the size of the filesystem Tiger_Check_ROOTKIT=Y # Slow if chkrootkit is available Tiger_Check_FTPUSERS=Y # Fast +Tiger_Check_OMNIBACK=N # Fast +Tiger_Check_NTP=Y # Fast + # OS specific checks # You can comment them if they are not appropiate to your system but # they will not run if you are running a different OS @@ -181,7 +192,7 @@ # What accounts are considered administrative (beyond root) # (likely to not be used by humans, and therefore have impossible passwords) # List of usernames separated by '|'... no whitespaces -Tiger_Admin_Accounts='adm|bin|daemon|games|lp|mail|news|operator|sync|sys|uucp|man|proxy|majordom|postgres|www-data|operator|irc|gnats' +Tiger_Admin_Accounts='bin|daemon|adm|lp|sync|shutdown|halt|mail|news|uucp|operator|games|gopher|ftp|nobody|dbus|vcsa|nscd|rpm|haldaemon|netdump|sshd|rpc|rpcuser|nfsnobody|mailnull|smmsp|pcap|apache|xfs|ntp|gdm|postfix|cacti|mach|mysql|named|clamav|zope|openvpn|dovecot' # # If an embedded pathname refers to an executable file, this executable # will in turn be checked. This will continue "recursively" until @@ -219,7 +230,7 @@ # Who do you allow to own system files. # List of usernames separated by '|'... no whitespace # -Tiger_Embedded_OK_Owners='root|bin|uucp|sys|daemon' +Tiger_Embedded_OK_Owners='root|bin|uucp|sys|daemon|rpm' #Tiger_Embedded_OK_Owners=root # # What groups can have write access to system files? @@ -238,7 +249,7 @@ # Who can own executables in 'root's PATH? # List of usernames separated by '|'... no whitespace # -Tiger_ROOT_PATH_OK_Owners='root|uucp|bin|news|sys|daemon' +Tiger_ROOT_PATH_OK_Owners='root|uucp|bin|news|sys|daemon|rpm' # If you are paranoid: #Tiger_ROOT_PATH_OK_Owners='root' # If you are running HP-UX @@ -253,13 +264,13 @@ # Who can own things in other users PATH? # List of usernames separated by '|'... no whitespace # -Tiger_PATH_OK_Owners='root|bin|daemon|uucp|sys|adm' +Tiger_PATH_OK_Owners=$Tiger_ROOT_PATH_OK_Owners # # What groups can have write access to executables in non-root user PATH? # List of group names separated by '|'... no whitespace. # No value means no groups should have write access. # -Tiger_PATH_OK_Group_Write= +eval Tiger_PATH_OK_Group_Write='$Tiger_ROOT_PATH_OK_Group_Write' # # Should 'tiger' wait for Crack to finish? If set to 'Y' it will wait # until it finishes. If set to 'N', it will collect the output if @@ -274,6 +285,11 @@ # Tiger_Crack_Local=Y # +# Who sends output from 'tigercron'? +# Default is "root@$HOSTNAME" (gets expanded by tigercron) +# +# Tiger_Mail_FROM="root@`uname -n`" +# # Who gets output from 'tigercron'? # Tiger_Mail_RCPT=root @@ -285,12 +301,12 @@ # # File system scan - things to look for # -Tiger_FSScan_Setuid=Y # Setuid executables -Tiger_FSScan_Setgid=Y # Setgid executables +Tiger_FSScan_Setuid=N # Setuid executables +Tiger_FSScan_Setgid=N # Setgid executables Tiger_FSScan_Devs=Y # device files Tiger_FSScan_SymLinks=Y # strange symbolic links Tiger_FSScan_ofNote=Y # weird filenames -Tiger_FSScan_WDIR=Y # world writable directories +Tiger_FSScan_WDIR=N # world writable directories Tiger_FSScan_Unowned=Y # files with undefined owners/groups # # Should we scan read-only filesystems @@ -303,7 +319,7 @@ # Note that .rhosts and .netrc need not appear here, as they will # be checked by scan_rhosts or scan_netrc. # -USERDOTFILES=".alias .kshrc .cshrc .profile .login .mailrc .exrc .emacs .forward .tcshrc .zshenv .zshrc .zlogin .zprofile .rcrc .bashrc .bash_profile .inputrc .xinitrc .fvwm2rc .Xsession .Xclients .less" +USERDOTFILES=".alias .kshrc .cshrc .profile .login .mailrc .exrc .emacs .forward .tcshrc .zshenv .zshrc .zlogin .zprofile .rcrc .bashrc .bash_profile .bash_logout .inputrc .xinitrc .fvwm2rc .Xsession .Xclients .less .kde" # # Rhost sites which are expected to be in the .rhosts files. # Anything that doesn't match will be reported. The patterns @@ -316,7 +332,8 @@ # Debian GNU/Linux: default is 999, users are generated over 1000 # Solaris: default should be 99, users are generated over 100 # HP-UX (?): default should be 499, users are generated over 500 -Tiger_Accounts_Trust=999 +# Fedora : default should be 499, users are generated over 500 +Tiger_Accounts_Trust=499 # # These SSH directive variables are used to specify "allowed" values # for the SSH Daemon. @@ -324,7 +341,7 @@ # be left blank to ignore the check. Tiger_SSH_Protocol='1|2' Tiger_SSH_RhostsAuthentication='no' -Tiger_SSH_PasswordAuthentication='no' +Tiger_SSH_PasswordAuthentication='yes|no' # # Should we give warnings on services that listen on all interfaces? # (i.e. those that have not been configured to listen only on one) @@ -353,10 +370,16 @@ # seen in the process table will generate a FAIL: # # The process list below is just an example (useful for Linux) -# change it to suit your needs -# Tiger_Running_Procs='syslogd cron atd klogd' +# change it to suit your needs. You can use either the process name +# or the full path name +Tiger_Running_Procs='syslogd crond atd klogd' +# or +# Tiger_Running_Procs='/sbin/syslogd /usr/sbin/atd /usr/sbin/crond /sbin/klogd' # # Should we optimize DPKG checks? (by not using dpkg but looking on # the file database at /var/lib/dpkg?) # Tiger_DPKG_Optimize=Y + +# Devices are not only in /dev when udev is enabled : +FS_DEVDIRS="/dev /etc/udev/devices" --- ./tigerrc-all.config 2003-10-07 00:02:56.000000000 +0200 +++ ./tigerrc-all 2005-08-07 17:12:40.000000000 +0200 @@ -9,6 +9,7 @@ # TigerNoBuild=Y # C files are corrupted (ouch.) Tiger_Check_PASSWD=Y # Fast +Tiger_Check_PASSWD_FORMAT=N # Fast - not needed if on systems with pwck Tiger_Check_PASSWD_SHADOW=Y # Time varies on # of users Tiger_Check_PASSWD_NIS=N # Time varies on # of users Tiger_Check_GROUP=Y # Fast @@ -274,6 +275,11 @@ # Tiger_Crack_Local=Y # +# Who sends output from 'tigercron'? +# Default is "root@$HOSTNAME" (gets expanded by tigercron) +# +# Tiger_Mail_FROM="root@`uname -n`" +# # Who gets output from 'tigercron'? # Tiger_Mail_RCPT=root tiger-3.2.1-doc.patch: --- NEW FILE tiger-3.2.1-doc.patch --- --- tiger-3.2.1.orig/CHANGES +++ tiger-3.2.1/CHANGES @@ -1,6 +1,15 @@ NOTE: To read changes made to the Debian package (since August 23rd 2001) see the changelog.Debian file +Changes (v 3.2.2) +(Unreleased) +---------------- +- Applied patches from Ryan Bradetich to fix Makefiles in HPUX +- Fixed bashisms in scripts +- Fixed YPCAT calls +[TODO: write more of the changes done here] + + Changes (v 3.2.1) ---------------- - New checks: --- tiger-3.2.1.orig/TODO.checks +++ tiger-3.2.1/TODO.checks @@ -0,0 +1,181 @@ +This TODO details things that need to be done to improve the current +security checks implemented in Tiger. + + +IMPROVEMENTS +------------ +- Modify the rhosts check so that it will check for shosts files too + (or create a new check_shosts file) + +- Modify check_network to include hosts.lpd in the tests + +- Add .bash_profile into check_path + +- Add more information to the messages outputed for inetd services which + might expose password information (Unix CERT configuration list item #2.4) + +- check_rootkit should also consider analysing modification times of + important system files (binaries as well as logfiles). + Mtime, atime and ctime should not be in the future and mtime/ctime + of binaries should be similar to the time the system was installed + (unless it has been patched). Similarly, logfiles should not have + similar (almost equal) ctimes. This needs to be carefully planned in + order to avoid confusion of logfile rotation vs. a log cleaner though. + +- check_patches for Solaris should generate better messages for security + and/or recommended patches (|R|S|). The check needs to be tested for + Solaris 9 too. + Also check_patches should only output information for packages installed. + +- check_known should be improved to detect for symlink attacks and + hard links in user writable directories (/tmp, /var/tmp and, in + some systems, /var/spool/mail too, the directory list might be + defined in tigerrc or extracted by parsing the file system) + + +NEW CHECKS +----------- +- Create the following (generic) scripts: + + - Check root $HOME files (might be redundant with check_path's) + - Do alias give the same as check_aliases? + - writable/executable check + word writable? (in find_files) + - Check for SAMBA configuration (checklist #20 SANS): + . encrypted passwords. + . 600 /etc/smbpasswd or /etc/samba/smbpasswd + . shares enabled/disabled + . guest access + . create mask (770) + - Check newer FTP (/etc/ftpaccess in newer Linux systems, ftpusers + is deprecated) see checklist #22 of SANS. + (DONE)- The check_inetd script should be improved to warn if echo/chargen.. + services are enabled (SANS unix checklist #3 and Linux #4) + - SANS unix checklist #18 + . Solaris /etc/system (noexec stack) + . Solaris locked accounts (#18 and #21) + . Solaris default/login + . Solaris /etc/default/kbd + - Partition checks (in Linux /etc/fstab, in Solaris /etc/vfstab), + if there is a /usr, /opt then read-only, if /var + or /tmp suggest nosuid (maybe noexec, although it's not a real + improvement). Separate partitions for /var, /usr, /tmp, /home + (boot?) so that no hard links attacks are possible. + In general user writable directories should be separated from + from system directories to avoid (hard) symlink attacks and + local DoS due to partitions being full. + In some installations /var/log or /var/spool (or /var/mail) might + make sense to be separated. + - Solaris /etc/notrouter to disable + + - Suggested by Bob Hall: + * Check if any local file systems are being exported to + 'localhost'. Also check if the local host is in a netgroups + entry in its own exports file. + * Look for (unexpected) normal files under /dev. + (Note: included in 'check_devices', done?) + * Check for user startup files that call 'umask' with weak + settings. (Should be 022 or 027.) + (Note: included in 'check_umask' using GENPASSWDSETS, done?) + * Check that '-' is not the first character in a /etc/hosts.equiv + /etc/hosts.lpd, or .rhosts files. Also check for a '+' entry in + hosts.lpd file. + (Note: included in 'check_rhosts'?) + * If a system allows it, check for an /etc/shells file and look + if the permitted shells are in the system directories. + References: + http://www.cert.org/tech_tips/usc20.html + http://www.cert.org/advisories/CA-2001-30.html + http://www.ciac.org/ciac/bulletins/b-37.shtml + http://www.nswc.navy.mil/ISSEC/Docs/Ref/GeneralInfo/unixsecurity.nrl.txt + + - Detect promiscous mode (DONE) + - Rootkits check, like chkrootkit (DONE) + Reference: + http://linux.oreillynet.com/pub/a/linux/2002/02/07/rootkits.html + +- Implement a check for configuration files for user's password policies + and other sensible configuration such as /etc/login.access, /etc/login.defs, + /etc/login.conf + +- Implement a generic script to test package management systems + (i.e. run 'rpm -Va' in RedHat, 'pkgchk' in Solaris). Most of these check: + md5sums, permissions, size, user/group ownerships... + These can be useful to detect trivial rootkits but might be redundant + when using also integrity checkers. + Note: The Debian deb_checkmd5sums only covers part of that (using + debsums), dpkg does not have a verify mode (see Debian Bug #187019) + References: + RedHat: http://www.rpm.org/max-rpm/ch-rpm-verify.html + http://www.rpm.org/max-rpm/s1-rpm-verify-what-to-verify.html + +- Convert scripts/check_network (RedHat-based) into a number of tests. + This is a script provided by Bryan Gartner from HP + It currently checks for: + - Inetd configuration files (are xinetd or inetd files writable? + are they owned by the proper user? does inetd use -l? does + xinetd have filelog or syslog?) + (Note: some checks moved to check_tcpd) + - Does /etc/securetty exist? Does it have other entries besides vc/tty? + Is ownership of the file ok? + - Is ip forwarding enabled? + - Which version of DNS/Wu-ftpd is it running? + (Note: this might not be completely feasible since the check_network + scripts connects to the server to retrieve the banner which is + something that Tiger should leave to other, remote, VA tools) + - PermitRooLogin or Rhosts in sshd? + - EXPN/VRFY support in mail host? + Necessary services: + - Is syslog running? + - Is omniback running? + Not allowed (per policy): + - Is fingerd running? + - Is identd runnig? + - Are inetd internal services running? + - Is a routing daemon enabled? + - R-commands? + - X server + - Tftpd + - NIS + - UUCP + - R-exd? + - NFS + Note: some of this is already done in check_inetd and check_xinetd so + many might be redundant. + +INTEGRATION CHECKS +------------------ +(checks related to other tools that integrate them in the Tiger framework) + +- Tripwire: the 'tripwire_run' script has not been tested thoroughly + (mainly because in Debian it is already configured to execute + regular checks standalone) + +- Crack: same for 'crack_run' (for the same reason as for tripwire + it has not been tested thoroughly yet) + +- Other integrity checkers: aide, samhain, integrit... + (Note: done for aide and integrit for the moment) + +- Other password crackers: john + +- Logcheckers: swatch, logcheck, loganalysis, snort-logcheck + Note: Tiger currently does not do any log checking (see below) + I'm not sure if Tiger should provide a new one or re-use + existing ones and include them as an 'external' program to run + through a Tiger module. The benefit of using an accepted and use + log analysis tool is that Tiger can benefit from the database of + signatures of known attacks/non-issues. The problem is that the + sysadmin has to install yet another tool (if he is not using an OS + that already includes them) and, probably, some other stuff + (usually Perl) on which the tool itself is based. + +- User analysis: sac, hostsentry (part of Abacus, but non-free) + +- Network checks: Arpwatch, Snort + +(DONE)- Other tools: chkrootkit + +--- Javier Fernandez-Sanguino Pen~a [...4962 lines suppressed...] Note: the up-to-date TODO list is maintained through Savannah's Task Manager (http://savannah.nongnu.org/pm/?group=tiger) this list is provided for the commodity of those browsing the source code @@ -43,12 +42,12 @@ the code of some checks or new checks written for them . Integrated the secaudit database manager patch provided by the Center for Information Technology, National Institutes of Health - . Integration of checks/bug fixes from TARA 3.0.3 version. NOTE: Mostly done for all checks (except for check_sendmail) Other utilities, such as buildbins changes, need to be checked. . Full documentation and user manual describing checks, policy (BS-7799) compliance and comparison with other tools and checks. + - Include tigerrc and cronrc manpages . Provide other logging mechanisms (syslog, snmp) if tools are available. . Checks for SANS's Top 10 (generic) and Top 20 (UNIX) vulnerabilities @@ -57,8 +56,9 @@ NOTE: Already included an annotated CERT list which determines which are done and which are lacking . Redhat (rpm) packages - NOTE: The spec file provided as a patched is now included but it has - not been tested (by me) to build RPM packages. + NOTE: The spec file provided as a patched is now included, I have tested + it to build RPM packages but I have not tested the RPM packages + themselves. Released: - Version 3.2 (stable): major bug fix version @@ -84,38 +84,6 @@ (such as http://lists.insecure.org/lists/bugtraq/1998/Jun/0160.html from Marc Heuse dated Fri Jun 26 1998 - 08:24:17 BST) -- Convert scripts/check_network (RedHat based) into a number of tests. - This is a script provided by Bryan Gartner from HP - It currently checks for: - - Inetd configuration files (are xinetd or inetd files writable? - are they owned by the proper user? does inetd use -l? does - xinetd have filelog or syslog?) - (Note: some checks moved to check_tcpd) - - Does /etc/securetty exist? Does it have other entries besides vc/tty? - Is ownership of the file ok? - - Is ip forwarding enabled? - - Which version of DNS/Wu-ftpd is it running? - (Note: this might not be completely feasible since the check_network - scripts connects to the server to retrieve the banner which is - something that Tiger should leave to other, remote, VA tools) - - PermitRooLogin or Rhosts in sshd? - - EXPN/VRFY support in mail host? - Necessary services: - - Is syslog running? - - Is omniback running? - Not allowed (per policy): - - Is fingerd running? - - Is identd runnig? - - Are inetd internal services running? - - Is a routing daemon enabled? - - R-commands? - - X server - - Tftpd - - NIS - - UUCP - - R-exd? - - NFS - - Update signatures using TAMU's (and maybe knowngoods.org's) signature database. See http://savannah.nongnu.org/pm/task.php?group_project_id=472&group_id=2247&func=browse @@ -123,88 +91,6 @@ - Improve support non-Linux OSs https://savannah.nongnu.org/pm/task.php?group_id=2247&group_project_id=632 -- Modified the rhosts check so that it will check for shosts files too - (or create a new check_shosts file) - -- Modify check_network to include hosts.lpd in the tests - -- Add .bash_profile into check_path - -- Create the following scripts: - - Detect promiscous mode - - Check root $HOME files (might be redundant with check_path's) - - Do alias give the same as check_aliases? - - writable/executable check + word writable? (in find_files) - - Check for SAMBA configuration (checklist #20 SANS): - . encrypted passwords. - . 600 /etc/smbpasswd or /etc/samba/smbpasswd - . shares enabled/disabled - . guest access - . create mask (770) - - Check newer FTP (/etc/ftpaccess in newer Linux systems, ftpusers - is deprecated) see checklist #22 of SANS. - - The check_inetd script should be improved to warn if echo/chargen.. - services are enabled (SANS unix checklist #3 and Linux #4) - - SANS unix checklist #18 - . Solaris /etc/system (noexec stack) - . Solaris locked accounts (#18 and #21) - . Solaris default/login - . Solaris /etc/default/kbd - - Partition checks (in Linux /etc/fstab, in Solars /etc/vfstab, - if there is a /usr, /opt then read-only, if /var - or /tmp nosuid. Separate /var,/usr,/tmp from / - - Solaris /etc/notrouter to disable - - Rootkits check, like chkrootkit - Note: partially done - Reference: - http://linux.oreillynet.com/pub/a/linux/2002/02/07/rootkits.html - - - Suggested by Bob Hall: - * Check if any local file systems are being exported to - 'localhost'. Also check if the local host is in a netgroups - entry in its own exports file. - * Look for (unexpected) normal files under /dev. - (Note: include in 'check_devices') - * Check for user startup files that call 'umask' with weak - settings. (Should be 022 or 027.) - (Note: include in 'check_umask' using GENPASSWDSETS) - * Check that '-' is not the first character in a /etc/hosts.equiv - /etc/hosts.lpd, or .rhosts files. Also check for a '+' entry in - hosts.lpd file. - (Note: include in 'check_rhosts') - * If a system allows it, check for an /etc/shells file and look - if the permitted shells are in the system directories. - References: - http://www.cert.org/tech_tips/usc20.html - http://www.cert.org/advisories/CA-2001-30.html - http://www.ciac.org/ciac/bulletins/b-37.shtml - http://www.nswc.navy.mil/ISSEC/Docs/Ref/GeneralInfo/unixsecurity.nrl.txt - - -- Possible integration with other security tools: - - Tripwire: the 'tripwire_run' script has not been tested thoroughly - (mainly because in Debian it is already configured to execute - regular checks standalone) - - Crack: same for 'crack_run' (for the same reason as for tripwire - it has not been tested thoroughly yet) - - Other integrity checkers: aide, samhain, integrit... - (Note: done for aide and integrit for the moment) - - Other password crackers: john - - Logcheckers: swatch, logcheck, loganalysis, snort-logcheck - Tiger currently does not do any log checking (see below) - I'm not sure if Tiger should provide a new one or re-use - existing ones and include them as an 'external' program to run - through a Tiger module. The benefit of using an accepted and use - log analysis tool is that Tiger can benefit from the database of - signatures of known attacks/non-issues. The problem is that the - sysadmin has to install yet another tool (if he is not using an OS - that already includes them) and, probably, some other stuff - (like Perl) on which the tool itself is based. - - - User anaylisis: sac, hostsentry (part of Abacus, but non-free) - - Network checks: Arpwatch, Snort - - Other tools: chkrootkit - - Compare checks against other tools' - Bastille/Titan: verify that each thing that they 'fix' (harden) is checked by Tiger. Provide a relationship of modules in @@ -218,8 +104,6 @@ to make simple checks than if using other monolythic tools (like CIS's, OpenBSD's or SuSE's) -- Implement logging to syslog (TARA 3.0.3 does it through logger) - - Implement IDMEF to send message on alerts. Consider the use of the XML library available at http://www.silicondefense.com/idwg/snort-idmef/ or Prelude's libprelude @@ -237,12 +121,16 @@ - IDEA http://idea-arch.sourceforge.net/ - Prelude http://www.prelude-ids.org/ -- Implement a check for configuration files for user's password policies - and other sensible configuration such as /etc/login.access, /etc/login.defs, - /etc/login.conf +(DONE)- Implement logging to syslog (TARA 3.0.3 does it through logger) + +BUGS +---- -- Add more information to the messages outputed for inetd services which - might expose password information (Unix CERT configuration list item #2.4) +- Gen_passwd_sets (all systems) sorts the passwd/shadow before joining, + if there are "similar" userfields with non-word characters (*, !) sorting + might not work as expected and the join will not show some of the users. + This needs to be fixed by sorting the userfield first and then using that + sort to sort the passwd fileS --- Javier Fernandez-Sanguino Pen~a --- tiger-3.2.1.orig/USING +++ tiger-3.2.1/USING @@ -72,7 +72,7 @@ there *is* new information. This can be helpful to make Tiger behave as a Host Intrusion Detection -System (HIDS) but it has some caveats, make sure to read README.hids +System (HIDS) but it has some caveats, make sure to read README.hostids if your intention is to use Tiger in this way. ------------------------------------------------------------------------ tiger-3.2.1-fixes.patch: --- NEW FILE tiger-3.2.1-fixes.patch --- --- ./config.fixes 2003-09-19 02:46:26.000000000 +0200 +++ ./config 2005-08-07 16:14:27.000000000 +0200 @@ -17,6 +17,16 @@ # # config (top level) - 06/14/93 # +# 06/22/2005 jfs Abort signature generation if the user does not +# have permissions to change the directories signatures are +# stored in. +# 01/21/2005 jfs Safer creation of $WORKDIR if undefined +# 08/13/2004 jfs Setup all locales as 'C' (Debian bug #270108) +# 04/28/2004 jfs Changed -f RCFILE check to -r to allow use through ssh +# as suggested by Falk Siemonsmeier: +# cat /etc/tiger/tigerrc | ssh tiger -c /dev/stdin +# 01/13/2004 jfs Added check when running with -f since on some (unconfigured) +# systems this might fail. # 08/19/2003 jfs tara -> Tiger in the usage # 08/13/2003 jfs Added some of ARSC changes including: # - support for signature generation (enhanced with also @@ -47,8 +57,8 @@ # This is important to avoid problems with commands that are # dependant on the defined language environment LANG="C" -LC_TIME="C" -export LANG LC_TIME +LC_ALL="C" +export LANG LC_ALL error_siggen() { dir=$1 @@ -70,7 +80,7 @@ if [ ! -d "$BASEDIR/systems/$OS/$REV/$ARCH/" ] then printf "Creating the directory $BASEDIR/systems/$OS/$REV/$ARCH/ where signatures will be stored..." - mkdir -p "$BASEDIR/systems/$OS/$REV/$ARCH/" + mkdir -p "$BASEDIR/systems/$OS/$REV/$ARCH/" || { echo "Cannot create directory '$BASEDIR/systems/$OS/$REV/$ARCH/'!" >&2; exit 1; } echo "...created" fi # NOTE: I'm not sure it's ok to create the directory since @@ -92,7 +102,7 @@ then printf "Generating and installing file access lists..." $BASEDIR/util/mkfilelst - mv "file_access_list.$OS-$REV-$ARCH" $BASEDIR/systems/$OS/$REV/$ARCH/file_access_list + mv "file_access_list.$OS-$REV-$ARCH" $BASEDIR/systems/$OS/$REV/$ARCH/file_access_list || { echo "Cannot move files to '$BASEDIR/systems/$OS/$REV/$ARCH/'!" >&2; exit 1; } echo "...done" else error_siggen "$PWD" "file_access_list.$OS-$REV-$ARCH" "$WORKDIR" @@ -104,13 +114,22 @@ do_usage() { echo "Tiger, version $TIGERVERSION" -echo "Usage: ./tiger [-B dir] [-d dir|@host] [-w dir] [-b dir] [-e|-E] [-GH] [-q]" +echo "Usage: ./tiger [-vthqGSH] [-B dir] [-l dir|@host] [-w dir] [-b dir] [-e|-E] [-c config] [-A arch] [-O os] [-R release]" +echo "" +echo " -v Show the Tiger version." +echo "" +echo " -t Run in test mode." +echo "" +echo " -h Show usage (this help)." +echo "" +echo " -q Supress messages to be as quiet as possible, only " +echo " security messages will be shown." echo "" echo " -B name" echo " Specify the directory where tiger is installed. If" echo " not specified, '$BASEDIR' is used." echo "" -echo " -d name" +echo " -l name" echo " Specify the name of the directory where Tiger will" echo " write the security report. This defaults to " echo " '$LOGDIR'. The filename of the report will be of " @@ -159,8 +178,16 @@ echo " same time. The checks will not be as in depth as" echo " they would be if run on the client itself." echo "" -echo " -q Supress messages to be as quiet as possible, only " -echo " security messages will be shown." +echo "Overrides for values detected by the configuration system:" +echo " -A arch" +echo " Specify an alternate architecture for tiger" +echo "" +echo " -O os" +echo " Specify an alternate operating system for tiger" +echo "" +echo " -R release" +echo " Specify an alternate operating system release " +echo " for tiger" echo "" echo "Report bugs at http://savannah.nongnu.org/projects/tiger" } @@ -203,7 +230,7 @@ fi LOGDIR=${TigerLogDir:=.} - WORKDIR=${TigerWorkDir:=${TMPDIR:=/tmp}} + WORKDIR="$TigerWorkDir" RCFILE=${TigerConfigDir:=.}/tigerrc IGNORE_FILE=${TigerConfigDir:=.}/tiger.ignore TIGERHOMEDIR="$BASEDIR" @@ -241,7 +268,6 @@ shift; done - TIGERVERSION="`/bin/cat $TIGERHOMEDIR/version.h 2>/dev/null`" [ ! -n "$TIGERVERSION" ] && TIGERVERSION="undetermined" export TIGERVERSION @@ -251,6 +277,19 @@ exit 0 } + if [ -z "$WORKDIR" ] ; then + WORKDIR=${TMPDIR:=/tmp} + ( umask 077; mkdir $WORKDIR/tiger.$$ ) || { echo "$0: Cannot create temporary directory" >&2; exit 1; } + WORKDIR="$WORKDIR/tiger.$$" + fi + # TODO: WORKDIR should be removed on exit if it is located in a temporary + # directory + if [ ! -d "$WORKDIR" ] ; then + echo "Configured working directory $WORKDIR does not exist" >&2 + exit 1 + fi + + [ "$QUIET" != "Y" ] && echo "Configuring..." set X `$BASEDIR/util/gethostinfo` unknown unknown unknown @@ -336,8 +375,8 @@ done } - [ -n "$RCFILE" -a ! -f "$RCFILE" ] && { - echo "Control file "$RCFILE" not found... exiting..." + [ -n "$RCFILE" -a ! -r "$RCFILE" ] && { + echo "Control file "$RCFILE" not defined or not readable... exiting..." exit 1 } @@ -345,7 +384,7 @@ # Preprocess the RC file, to export variables to environment # - [ -n "$RCFILE" -a -f $RCFILE ] && { + [ -n "$RCFILE" -a -r $RCFILE ] && { $GREP -v '^#' $RCFILE | $SED -e 's/^\(.*\)=/export \1; \1=/' > $WORKDIR/rcfile.$$ . $WORKDIR/rcfile.$$ @@ -357,7 +396,9 @@ then # Linux hostname has the -f option for FQDN... (jfs) # (others?) - HOSTNAME=`$GETHOSTNAME -f` + HOSTNAME=`$GETHOSTNAME -f 2>/dev/null` +# But sometimes this will fail.... (if the system is not properly setup) + [ $? -ne 0 ] && HOSTNAME=`$GETHOSTNAME` fi for file in './site-$HOSTNAME' '$BASEDIR/site-$HOSTNAME' './site' '$BASEDIR/site' @@ -388,4 +429,8 @@ . $WORKDIR/tigercmds.$$ $RM -f $WORKDIR/tigercmds.$$ } + + # set the PATH + PATH=/sbin:/usr/sbin:/bin:/usr/bin + export PATH } --- ./tigercron.in.fixes 2003-08-19 18:34:27.000000000 +0200 +++ ./tigercron.in 2005-08-07 16:14:27.000000000 +0200 @@ -248,6 +248,7 @@ done >> $WORKDIR/tigcron.diff.$$ [ ! -n "$Tiger_Mail_RCPT" ] && Tiger_Mail_RCPT="root" +[ ! -n "$Tiger_Mail_FROM" ] && Tiger_Mail_FROM="root@$HOSTNAME" length=1 if [ ! -n "$EGREP" ] ; then @@ -257,13 +258,13 @@ [ -s "$WORKDIR/tigcron.diff.$$" -a $length -gt 0 ] && { send="Y" [ "$Tiger_Cron_SendOKReports" = "N" ] && - [ -z "`grep ERR $WORKDIR/tigcron.diff.$$`" ] && + [ -z "`grep ERR $WORKDIR/tigcron.diff.$$`" ] && [ -z "`grep WARN $WORKDIR/tigcron.diff.$$`" ] && { send="N" } haveallcmds MAILER && [ "$send" = "Y" ] && { # Mail header (so it does not just say it's root - echo "From: Tiger automatic auditor at $HOSTNAME " + echo "From: \"Tiger automatic auditor at $HOSTNAME\" <$Tiger_Mail_FROM>" echo "Subject: Tiger Auditing Report for $HOSTNAME" echo cat $WORKDIR/tigcron.diff.$$ --- ./tigercron.fixes 2003-08-19 19:37:42.000000000 +0200 +++ ./tigercron 2005-08-07 16:14:27.000000000 +0200 @@ -256,6 +256,7 @@ done >> $WORKDIR/tigcron.diff.$$ [ ! -n "$Tiger_Mail_RCPT" ] && Tiger_Mail_RCPT="root" +[ ! -n "$Tiger_Mail_FROM" ] && Tiger_Mail_FROM="root@$HOSTNAME" length=1 if [ ! -n "$EGREP" ] ; then @@ -271,7 +272,8 @@ } haveallcmds MAILER && [ "$send" = "Y" ] && { # Mail header (so it does not just say it's root - echo "From: Tiger automatic auditor at $HOSTNAME " + echo "From: \"Tiger automatic auditor at $HOSTNAME\" <$Tiger_Mail_FROM>" + echo "To: $Tiger_Mail_RCPT" echo "Subject: Tiger Auditing Report for $HOSTNAME" echo cat $WORKDIR/tigcron.diff.$$ --- ./initdefs.fixes 2003-10-10 19:05:48.000000000 +0200 +++ ./initdefs 2005-08-07 16:14:27.000000000 +0200 @@ -16,6 +16,13 @@ # # initdefs - 06/14/93 # +# initdefs - 01/10/2005 - cslater - Modified ignore function so that +# filtering can also be done on msgid and level +# initdefs - 08/01/2004 - jfs - Allow removal from LOGDIR so that tiger -e +# works as expected +# initdefs - 10/15/2003 - jfs - Quoted $__File in deleted() in order +# for the check_rootkit check to work properly. +# (Debian bug #215882) # initdefs - 10/10/2003 - jfs - Improved check so that it will not # remove files created by a different user and # warn if files to be deleted do not exist @@ -117,14 +124,14 @@ do if [ -n "$LS" ] then - if [ -z "`$LS $__file 2>/dev/null`" ] + if [ -z "`$LS \"$__file\" 2>/dev/null`" ] then # echo "--ERROR-- [post001e] File \`$__file' will not be removed since it does not exist" goahead=0 fi if [ $goahead -eq 1 -a -n "$AWK" -a -n "$UUID" ] then - if [ "$UUID" != "`$LS -nl $__file | $AWK '{print $3}'`" ] + if [ "$UUID" != "`$LS -nl \"$__file\" | $AWK '{print $3}'`" ] then echo "--ERROR-- [post001e] File \`$__file' will not be removed since it has not been created by the current user (symlink attack?)." goahead=0 @@ -134,6 +141,7 @@ [ $goahead -eq 1 ] && { eval "case \"\$__file\" in $WORKDIR*) $RM -f \"\$__file\";; + $LOGDIR*) $RM -f \"\$__file\";; *) echo \"--ERROR-- [post001e] File \\\`\$__file' not removed.\";; esac" } @@ -164,7 +172,7 @@ __len=${Tiger_Output_Width:=79} # If the message should be ignore it is removed - ignore_message "$_mesg" && return + ignore_message "$_level $_msgid $_mesg" && return [ "$HTML" = "N" ] && { @@ -505,15 +513,15 @@ if [ $__script_owner -eq $UUID ]; then $__script_run else - echo "--ERROR-- [misc024w] The $__script_run script will not be run since it is owned by a user ($__script_owner) different than the one running Tiger ($UUID)" + echo "--ERROR-- [misc024e] The $__script_run script will not be run since it is owned by a user ($__script_owner) different than the one running Tiger ($UUID)" __error=1 fi else - echo "--ERROR-- [misc025w] The $__script_run will not be run since it is not executable" + echo "--ERROR-- [misc025e] The $__script_run will not be run since it is not executable" __error=1 fi else - echo "--ERROR-- [misc005w] Can't find '$script'..." + echo "--ERROR-- [misc005e] Can't find '$script'..." __error=1 fi done --- ./c/getpermit.c.fixes 2002-06-14 10:51:31.000000000 +0200 +++ ./c/getpermit.c 2005-08-07 16:14:27.000000000 +0200 @@ -3,6 +3,7 @@ #include #include #include +#include /* tiger - A UN*X security checking system Copyright (C) 1993 Douglas Lee Schales, David K. Hess, David R. Safford --- ./tiger.fixes 2003-10-07 00:20:24.000000000 +0200 +++ ./tiger 2005-08-07 16:14:27.000000000 +0200 @@ -21,6 +21,11 @@ # all the checks configured for your system in the tigerrc configuration # file. # +# 05/14/2005 jfs Patch from Nicolas Fran??ois which fixes aide output handling +# 01/25/2005 cslater Added separate config variable for +# check_passwdformat. +# 01/15/2003 jfs Check should use INETDCONF (and not INETDFILE). +# (Temporary fix: defined it if undefined) # 09/03/2003 jfs Included check_ssh to the checks # 08/19/2003 jfs check_cron is now check_crontabs # 08/15/2003 jfs Integrated ARSC log to syslog mechanism but modified @@ -43,7 +48,7 @@ echo "Tiger UN*X security checking system" echo " Developed by Texas A&M University, 1994" echo " Updated by the Advanced Research Corporation, 1999-2002" -echo " Further updated by Javier Fernandez-Sanguino, 2001-2003" +echo " Further updated by Javier Fernandez-Sanguino, 2001-2005" echo " Covered by the GNU General Public License (GPL)" echo TigerInstallDir="." @@ -195,7 +200,7 @@ run_script find_files >> $logtmp else echo "`$TIMECMD`> Starting file systems scans in background..." - $SCRIPTDIR/find_files > $WORKDIR/fsscan.log$$ & + $SCRIPTDIR/find_files > $WORKDIR/fsscan.log$$ 2>/dev/null & fspid=$! fi } @@ -243,6 +248,9 @@ [ "$Tiger_Check_PASSWD" != 'N' ] && { echo "`$TIMECMD`> Checking password files..." run_script check_passwd >> $logtmp +} + +[ "$Tiger_Check_PASSWD_FORMAT" != 'N' ] && { echo "`$TIMECMD`> Checking password format..." run_script check_passwdformat >> $logtmp } @@ -301,10 +309,21 @@ } [ "$Tiger_Check_INETD" != 'N' ] && { - echo "`$TIMECMD`> Checking 'inetd' configuration..." - run_script check_inetd >> $logtmp - echo "`$TIMECMD`> Checking 'tcpd' configuration..." - run_script check_tcpd >> $logtmp + # Temporary definition until all the config files (and gen_inetd + # scripts) are updated. + [ -z "$INETDCONF" ] && INETDCONF="/etc/inetd.conf" + [ -z "$XINETDCONF" ] && XINETDCONF="/etc/xinetd.conf" + + [ -n "$INETDCONF" ] && [ -f "$INETDCONF" ] && { + echo "`$TIMECMD`> Checking 'inetd' configuration..." + run_script check_inetd >> $logtmp + echo "`$TIMECMD`> Checking 'tcpd' configuration..." + run_script check_tcpd >> $logtmp + } + [ -n "$XINETDCONF" ] && [ -f "$XINETDCONF" ] && { + echo "`$TIMECMD`> Checking 'xinetd' configuration..." + run_script check_xinetd >> $logtmp + } } [ "$Tiger_Check_SERVICES" != 'N' ] && { @@ -427,6 +446,16 @@ run_script check_ftpusers >> $logtmp } +[ "$Tiger_Check_OMNIBACK" != 'N' ] && { + echo "`$TIMECMD`> Checking omniback configuration..." + run_script check_omniback >> $logtmp +} + +[ "$Tiger_Check_NTP" != 'N' ] && { + echo "`$TIMECMD`> Checking NTP configuration..." + run_script check_ntp >> $logtmp +} + # # When not doing checks of all setuid executables, we can do # embedded checks while the file system scans are running. @@ -480,8 +509,8 @@ [ -n "$aidepid" ] && { echo "`$TIMECMD`> Waiting for Aide to finish..." wait $aidepid - $CAT $tripout >> $logtmp - delete $tripout + $CAT $aideout >> $logtmp + delete $aideout } 2>/dev/null #echo "`$TIMECMD`> Security report completed for ${HOSTNAME}." --- ./util/getfs-nfs.fixes 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getfs-nfs 2005-08-07 16:14:27.000000000 +0200 @@ -58,7 +58,3 @@ done # exit 0 -# -exit 0 -# -exit 0 --- ./util/getfs-amd.fixes 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getfs-amd 2005-08-07 16:14:48.000000000 +0200 @@ -63,7 +63,7 @@ $SORT > $WORKDIR/gfsa2.$$ if [ -s $WORKDIR/gfsa2.$$ ]; then - $JOIN -a1 -j 1 -o 1.2 1.3 2.2 $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ | + $JOIN -a1 -j 1 -o "1.2 1.3 2.2" $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ | while read user dir location do echo $user $dir ${location:=$HOSTNAME} @@ -79,7 +79,3 @@ $RM -f $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ # exit 0 -# -exit 0 -# -exit 0 --- ./util/getfs-std.fixes 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getfs-std 2005-08-07 16:14:27.000000000 +0200 @@ -20,6 +20,8 @@ #----------------------------------------------------------------------------- # +[ -z "$SED" ] && SED=`which sed` + haveallof() { retval=0 @@ -44,7 +46,3 @@ # exit 0 -# -exit 0 -# -exit 0 --- ./util/getfs-automount.fixes 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getfs-automount 2005-08-07 16:15:17.000000000 +0200 @@ -62,7 +62,7 @@ $SORT > $WORKDIR/gfsa2.$$ if [ -s $WORKDIR/gfsa2.$$ ]; then - $JOIN -a1 -j 1 -o 1.2 1.3 2.2 $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ | + $JOIN -a1 -j 1 -o "1.2 1.3 2.2" $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ | while read user dir location do if [ ! -n "$location" ]; then @@ -86,7 +86,3 @@ $RM -f $WORKDIR/gfsa1.$$ $WORKDIR/gfsa2.$$ # exit 0 -# -exit 0 -# -exit 0 --- ./config.in.fixes 2003-08-19 18:34:00.000000000 +0200 +++ ./config.in 2005-08-07 16:14:27.000000000 +0200 @@ -24,6 +24,7 @@ # 04/15/2003 jfs Modified to support -B to work in the local dir # 04/21/2003 jfs Modified to only use hostname -f for Linux _and_ # moved hostname check after RCFILE parsing! +# 08/13/2004 jfs Setup all locales as 'C' (Debian bug #270108) # #----------------------------------------------------------------------------- # @@ -38,8 +39,8 @@ # This is important to avoid problems with commands that are # dependant on the defined language environment LANG="C" -LC_TIME="C" -export LANG LC_TIME +LC_ALL="C" +export LANG LC_ALL checkfile() { @@ -79,7 +80,7 @@ fi LOGDIR=${TigerLogDir:=.} - WORKDIR=${TigerWorkDir:=${TMPDIR:=/tmp/}} + WORKDIR="$TigerWorkDir" RCFILE=${TigerConfigDir:=.}/tigerrc IGNORE_FILE=${TigerConfigDir:=.}/tiger.ignore TIGERHOMEDIR="$BASEDIR" @@ -124,6 +125,19 @@ exit 0 } + if [ -z "$WORKDIR" ] ; then + WORKDIR=${TMPDIR:=/tmp} + ( umask 077; mkdir $WORKDIR/tiger.$$ ) || { echo "$0: Cannot create temporary directory" >&2; exit 1; } + WORKDIR="$WORKDIR/tiger.$$" + fi + # TODO: WORKDIR should be removed on exit if it is located in a temporary + # directory + if [ ! -d "$WORKDIR" ] ; then + echo "Configured working directory $WORKDIR does not exist" >&2 + exit 1 + fi + + echo "Configuring..." set X `$BASEDIR/util/gethostinfo` unknown unknown unknown tiger-3.2.1-gcc4.patch: --- NEW FILE tiger-3.2.1-gcc4.patch --- --- ./c/realpath.c.gcc4 2005-08-06 23:54:13.000000000 +0200 +++ ./c/realpath.c 2005-08-07 00:04:17.000000000 +0200 @@ -55,8 +55,8 @@ #endif #ifdef __STDC__ -extern char *getwd(char * const); -extern int readlink(char * const, char * const, const size_t); +//extern char *getwd(char * const); +//extern int readlink(char * const, char * const, const size_t); extern char *my_realpath(const char *, char [], int); extern char *_realpath(char [], int); #else @@ -109,7 +109,7 @@ int linkcount = 0; if(path[0] != '/'){ - getwd(buffer); + getwd(buffer, sizeof(buffer)); prevslash = buffer+strlen(buffer); strcpy(prevslash,"/"); strcpy(prevslash+1,path); tiger-3.2.1-scripts.patch: --- NEW FILE tiger-3.2.1-scripts.patch --- --- ./scripts/sub/check_devs.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_devs 2006-05-01 10:21:40.000000000 +0200 @@ -69,7 +69,7 @@ eval $greps | $GREP -v '^'/hw> $WORKDIR/dev.list.$$ [ -s $WORKDIR/dev.list.$$ ] && { - message WARN fsys006a "" "Unexpected device files found:" + message ALERT fsys006a "" "Unexpected device files found:" $SORT $WORKDIR/dev.list.$$ | while read file do --- ./scripts/sub/check_names.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_names 2006-05-01 10:21:40.000000000 +0200 @@ -53,10 +53,10 @@ file="`$BASENAME \"$pathname\"`" case "$file" in .FSP*) - echo "--WARN-- [fsys009w] FSP server control file found:" + message WARN fsys009w "" "FSP server control file found:" $LS $LSGROUP -ld "$pathname";; *) - echo "--ALERT-- [fsys005a] Unusual filename \`$file' found:" + message ALERT fsys005a "" "Unusual filename \`$file' found:" $LS $LSGROUP -ld "$pathname";; esac done --- ./scripts/sub/check_suid.scripts 2002-10-28 17:22:46.000000000 +0100 +++ ./scripts/sub/check_suid 2006-05-01 10:21:40.000000000 +0200 @@ -18,6 +18,10 @@ # sub/check_suid - 06/14/93 # #----------------------------------------------------------------------------- +# TODO +# - Consider fixing the Tiger_Admin_Accounts check so that it takes into +# account Tiger_Accounts_Trust too +#----------------------------------------------------------------------------- # This script is not runnable directly. # inputfile="$1" @@ -65,6 +69,18 @@ $LS $LSGROUP -ld "$file" } + getpermit "$file" 2>/dev/null | + while read _file owner group ur uw ux gr gw gx or ow ox suid sgid stk + do + eval "case \"$owner\" in + \"$Tiger_Admin_Accounts\"|root) + ;; + *) + message FAIL fsys0012w \"\" \"File $file is not owned by an administrative user.\" + $LS $LSGROUP -ld \"$file\" + esac" + done + case "$file" in *xterm) { message WARN misc013w "" "$file: see CERT Advisory CA-93:17 about a security hole in xterm (does not apply to HP-UX)." @@ -162,7 +178,7 @@ haveallcmds LS AWK && { [ -s $WORKDIR/suid.list.$$ ] && { - message INFO fsys004i "" 'The following setuid programs are non-standard:' + message ALERT fsys004a "" 'The following setuid programs are non-standard:' while read file do $LS $LSGROUP -ld "$file" --- ./scripts/sub/check_wdir.scripts 2002-10-28 17:22:46.000000000 +0100 +++ ./scripts/sub/check_wdir 2006-05-01 10:21:40.000000000 +0200 @@ -78,7 +78,7 @@ eval $greps > $WORKDIR/wdir.tmp.$$ [ -s $WORKDIR/wdir.tmp.$$ ] && { - echo "--INFO-- [fsys008i] The following directories are world writable:" + message FAIL fsys008f "" 'The following directories are world writable:' $SORT $WORKDIR/wdir.tmp.$$ } --- ./scripts/sub/check_sgid.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_sgid 2006-05-01 10:21:40.000000000 +0200 @@ -89,7 +89,7 @@ haveallcmds LS AWK && { [ -s $WORKDIR/sgid.list.$$ ] && { - message INFO fsys011i "" 'The following setgid programs are non-standard:' + message ALERT fsys011a "" 'The following setgid programs are non-standard:' while read file do $LS $LSGROUP -ld "$file" --- ./scripts/sub/check_embed.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_embed 2006-05-01 10:21:40.000000000 +0200 @@ -184,7 +184,7 @@ } done 2>/dev/null | $SORT -u | - $JOIN -o 1.2 2.1 2.2 - $oldfile | + $JOIN -o "1.2 2.1 2.2" - $oldfile | $AWK '{ if($3 != "") printf("%s %s->%s\n", $1, $2, $3); @@ -222,14 +222,14 @@ fi done | $SORT -u | - $JOIN -o 2.1 2.2 - $WORKDIR/scr.$$ + $JOIN -o "2.1 2.2" - $WORKDIR/scr.$$ > $oldfile [ -s $newfile ] && { $SORT -u $newfile $record > $record.new $SORT -u $newfile | - $JOIN -o 2.1 2.2 - $WORKDIR/scr.$$ | + $JOIN -o "2.1 2.2" - $WORKDIR/scr.$$ | $SORT -u > $oldfile } @@ -282,9 +282,5 @@ done delete $newfile $oldfile $record $WORKDIR/tmp1.$$ -# -exit 0 -# -exit 0 -# + exit 0 --- ./scripts/sub/check_links.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./scripts/sub/check_links 2006-05-01 10:23:12.000000000 +0200 @@ -49,17 +49,17 @@ haveallfiles WORKDIR || exit 1 $REALPATH < $file | -$SORT +1 > $WORKDIR/link.tmp.$$ +$SORT -k 1 > $WORKDIR/link.tmp.$$ $GREP -v '^#' $FILE_ACL | $SORT | -$JOIN -j2 2 -o 2.1 2.2 1.1 - $WORKDIR/link.tmp.$$ | +$JOIN -2 2 -o "2.1 2.2 1.1" - $WORKDIR/link.tmp.$$ | while read file realfile facl do $LS -ld $LSGROUP "$file" | { read p l owner group s a b c f [ "$owner" != 'root' -a "$owner" != 'bin' ] && { - echo "--INFO-- [fsys007i] Symbolic link \`$file' points to \`$realfile'." + message INFO fsys007i "" "Symbolic link \`$file' points to \`$realfile'." } } done --- ./scripts/check_ftpusers.scripts 2003-10-07 00:24:00.000000000 +0200 +++ ./scripts/check_ftpusers 2006-05-01 10:21:40.000000000 +0200 @@ -20,6 +20,8 @@ # Analyses the system's /etc/ftpusers and determines if the administrative # users are in that file. # +# 03/31/2005 jfs Allow FTPUSERS to be customised (some OS have it +# in alternate locations) # 10/01/2003 jfs Removed passwd files if not used any longer. # # 07/25/2002 jfs Added a sanity check for password files. @@ -90,9 +92,13 @@ Tiger_Accounts_Trust = 999 export Tiger_Accounts_Trust } +FTPUSERS=/etc/ftpusers +if [ "$OS" = "SunOS" -a ! -e "$FTPUSERS" ] ; then + FTPUSERS=/etc/ftpd/ftpusers +fi # Do this only if ftpusers exists -if [ -f /etc/ftpusers ]; then +if [ -f "$FTPUSERS" ]; then if [ -n "$Tiger_PasswdFiles" ]; then [ -f $Tiger_PasswdFiles ] && $CAT "$Tiger_PasswdFiles" > $WORKDIR/pass.list.$$ @@ -111,14 +117,14 @@ # user=`echo $line | $AWK -F: '($3 <= $Tiger_Accounts_Trust) { print $1 }'` # Note: root is removed since it is checked for in check_root - [ -n "$user" -a "$user" != "root" ] && [ -z "`$GREP \"^$user\" /etc/ftpusers`" ] && - message FAIL netw018f "" "Administrative user $user allowed access in /etc/ftpusers" + [ -n "$user" -a "$user" != "root" ] && [ -z "`$GREP \"^$user\" $FTPUSERS`" ] && + message FAIL netw018f "" "Administrative user $user allowed access in $FTPUSERS" done [ ! -n "$Tiger_PasswdFiles" ] && delete $passwd_set $passwd_set.src done else - message FAIL netw020f "" "There is no /etc/ftpusers file." + message FAIL netw020f "" "There is no $FTPUSERS file." fi --- ./scripts/check_printcap.scripts 2003-05-01 19:47:06.000000000 +0200 +++ ./scripts/check_printcap 2006-05-01 10:21:40.000000000 +0200 @@ -19,6 +19,9 @@ # [...11883 lines suppressed...] - $RM -f $WORKDIR/p.$$ + $RM $WORKDIR/u.$$ + $RM $WORKDIR/p.$$ + $RM $WORKDIR/s.$$ else - echo "--FAIL-- [run001e] The file /etc/shadow is available but not readable by the user running Tiger." + echo "--ERROR-- [run001e] The file /etc/shadow is available but not readable by the user running Tiger." fi else @@ -135,20 +168,40 @@ echo "--WARN-- [miscxxxx] The '+' key in the /etc/passwd file should only be used in nsswitch 'compat' mode." } - [ "$source" = compat ] && [ -n "$YP" ] && { - $YPCAT passwd > $WORKDIR/nis_passwd.$$ + [ "$source" = "compat" ] && [ -n "$YPCAT" ] && { + $YPCAT passwd > $WORKDIR/nis_passwd.$$ 2>/dev/null + if [ $? -eq 0 ] ; then echo "NIS" > $WORKDIR/nis_passwd.$$.src echo $WORKDIR/nis_passwd.$$ >> $outfile + else + # Ypcat has not succeeded, remove the temporary file + $RM $WORKDIR/nis_passwd.$$ + fi } ;; - nis) [ "$local" != 1 ] && { - $YPCAT passwd > $WORKDIR/nis_passwd.$$ + nis) [ "$local" != 1 ] && [ -n "$YPCAT" ] && { + $YPCAT passwd > $WORKDIR/nis_passwd.$$ 2>/dev/null + $YPCAT passwd > $WORKDIR/nis_passwd.$$ 2>/dev/null + if [ $? -eq 0 ] ; then echo "NIS" > $WORKDIR/nis_passwd.$$.src echo $WORKDIR/nis_passwd.$$ >> $outfile + else + # Ypcat has not succeeded, remove the temporary file + $RM $WORKDIR/nis_passwd.$$ + fi } ;; -# This is from SunOS, what do to do for Linux? + ldap) [ "$local" != 1 ] && [ -n "$GETENT" ] && { + $GETENT passwd > $WORKDIR/ldap_passwd.$$ 2>/dev/null + if [ $? -eq 0 ] ; then + echo $WORKDIR/ldap_passwd.$$ >> $outfile + else + $RM $WORKDIR/ldap_passwd.$$ + fi + } + ;; +# This is from SunOS, what should we do here for Linux? (if anything) # nisplus) [ "$local" != 1 ] && { # $NISCAT passwd.org_dir > $WORKDIR/nisplus_passwd.$$ # echo "NIS+" > $WORKDIR/nisplus_passwd.$$.src @@ -161,4 +214,4 @@ done - +exit 0 --- ./systems/default/gendlclients.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gendlclients 2006-05-01 10:21:41.000000000 +0200 @@ -16,6 +16,8 @@ # Please see the file `COPYING' for the complete copyright notice. # # default/gendlclients - MM/DD/YY +# 05/02/2004 jfs Try to avoid eval problems if handling variables with +# special characters (such as space) # #----------------------------------------------------------------------------- # @@ -49,5 +51,5 @@ $SORT -u | while read client server filesys do - eval "case $server in $HOSTNAMESLIST) echo $client $filesys;; esac" + eval "case \"$server\" in $HOSTNAMESLIST) echo \"$client $filesys\";; esac" done --- ./systems/default/gen_bootparam_sets.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_bootparam_sets 2006-05-01 10:21:41.000000000 +0200 @@ -41,7 +41,7 @@ echo "$WORKDIR/etc_bootparams.$$" } -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT bootparams > $WORKDIR/nis_bootparams.$$ echo "NIS" > $WORKDIR/nis_bootparams.$$.src echo "$WORKDIR/nis_bootparams.$$" --- ./systems/default/gen_services.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_services 2006-05-01 10:21:41.000000000 +0200 @@ -28,7 +28,7 @@ echo "/etc/services" > $WORKDIR/etc_services.$$.src echo $WORKDIR/etc_services.$$ -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT services > $WORKDIR/nis_services.$$ echo "NIS" > $WORKDIR/nis_services.$$.src echo $WORKDIR/nis_services.$$ --- ./systems/default/gen_alias_sets.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_alias_sets 2006-05-01 10:21:41.000000000 +0200 @@ -53,7 +53,7 @@ echo $WORKDIR/etc_aliases.$$ } -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT -k aliases | $SED -e 's/ /:/' | $SORT | --- ./systems/default/check_ndd.scripts 2003-08-09 12:32:45.000000000 +0200 +++ ./systems/default/check_ndd 2006-05-01 10:21:41.000000000 +0200 @@ -23,6 +23,8 @@ # # 07/11/2003 rbradetich at uswest.net - Initial version. # +# 05/02/2004 jfs Try to avoid eval problems if handling variables with +# special characters (such as space) # 08/09/2003 jfs - Placed in the generic default directory for Unix systems # so that systems can run them using 'check' # @@ -87,7 +89,7 @@ do ([ -z "$dev" ] || [[ $dev = \#* ]]) && continue val=`$NDD -get $dev $parm 2>/dev/null` - eval "case $val in + eval "case \"$val\" in $good) ;; *) --- ./systems/default/gen_group_sets.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_group_sets 2006-05-01 10:21:41.000000000 +0200 @@ -31,7 +31,7 @@ echo "/etc/group" > $WORKDIR/etc_group.$$.src echo $WORKDIR/etc_group.$$ -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT group | $SORT | $COMM -23 - $WORKDIR/etc_group.$$ > $WORKDIR/nis_group.$$ --- ./systems/default/gen_passwd_sets.scripts 2002-06-14 10:51:31.000000000 +0200 +++ ./systems/default/gen_passwd_sets 2006-05-01 10:21:41.000000000 +0200 @@ -17,9 +17,23 @@ # # default/gen_passwd_sets - 06/14/93 # +# 11/18/2003 - jfs - Check if YPCAT is available before calling it. Also +# sanity checks for other commands. +# #----------------------------------------------------------------------------- # +[ ! -n "$SORT" ] && SORT=`which sort` +[ ! -n "$GREP" ] && GREP=`which grep` +[ ! -n "$AWK" ] && AWK=`which awk` +[ ! -n "$JOIN" ] && JOIN=`which join` +[ ! -n "$CAT" ] && CAT=`which cat` +[ ! -n "$RM" ] && RM=`which rm` +[ ! -n "$SED" ] && SED=`which sed` +[ ! -n "$YPCAT" ] && YPCAT=`which ypcat` +[ ! -n "$NISCAT" ] && NISCAT=`which niscat` +[ ! -n "$WORKDIR" ] && WORKDIR=/tmp + local=0 for parm do @@ -34,7 +48,7 @@ echo "/etc/passwd" > $WORKDIR/etc_passwd.$$.src echo $WORKDIR/etc_passwd.$$ >> $outfile -[ -n "$YP" ] && { +[ -n "$YPCAT" ] && { $YPCAT passwd > $WORKDIR/nis_passwd.$$ echo "NIS" > $WORKDIR/nis_passwd.$$.src echo $WORKDIR/nis_passwd.$$ >> $outfile --- ./util/getnetgroup.scripts 2003-04-21 10:02:04.000000000 +0200 +++ ./util/getnetgroup 2006-05-01 10:21:41.000000000 +0200 @@ -25,7 +25,7 @@ done } -[ "$YP" = "" ] && { +[ "$YPCAT" = "" ] && { echo "$targets" exit 0 } --- ./util/buildconf.scripts 2003-08-15 00:20:41.000000000 +0200 +++ ./util/buildconf 2006-05-01 10:21:41.000000000 +0200 @@ -126,7 +126,6 @@ GETFS mount GETHOSTNAME hostname GREP grep -GROUPC groups GROUPSS groups HEAD head ID id --- NEW FILE tiger-3.2.1.tar.gz.sig --- ?? --- NEW FILE tiger.README --- Tiger for Fedora ---------------- PLEASE NOTE: Some of the checks do not apply completely to Fedora systems or Fedora's defaults are somewhat different. This might lead to somethings being reported as a security issue when they really aren't (known in the security field as 'false positives') In some cases this might be Tiger's problem (of it being an old UNIX auditing program) or it might be Fedora's. If you feel a security report is not appropriate to your system discuss it in the fedora-extras-list at redhat.com mailing list. If you really think it's a BUG of Tiger, then send a bug-report for the package at https://bugzilla.redhat.com. Please make sure you look at current (open) bugs there. This package is in its first versions, and there is a lot of room for improvement, so please report what you find inappropriate. Configuration ------------- First of all make sure to read, understand and customize /etc/tiger/tigerrc and /etc/tiger/cronrc to adapt to your local security policy, as the warning on installation says "You cannot expect to tiger to work fully to your needs without adapting it". Bugs regarding false positives which can be fixed by the proper configuration and/or use of templates (see below) will be set to "wishlist", even if the bug submitter thinks they are "serious". Using Templates --------------- Tiger in Fedora can compare against "templates" when running through a cron job. That is, you can take a given log from a previous run (at /var/log/tiger) rename it with a ".template" instead of a ".[number]" and place it under /etc/tiger/templates. Tiger checks will compare against it. That way Tiger will only report issues when they changed from the template (if configured in /etc/tiger/tigerrc). Another (less secure) method is to have Tiger only report changes from previous runs, please note that in this setup problems will only be reported *once* in cron jobs, regardless of importance. This is the default behavior, that is, this will work just after installation. KNOWN ISSUES ------------ (these are *not* BUGS) - shells on default users. It should check if the services are enabled (i.e. the user is useful here). TODO ---- - Possible new checks: . check all files and see if they are of the same user/group as their root dir . look for files with no uid in /etc/passwd and gid in /etc/group - Warn about updates with "yum check-update" - Use rpm -V to check which files have changed TESTING ------- . Check for files not in /usr/local and /home not owned by any package (easy with rpm -qf) (Note: Currently looks only in binary paths /bin /usr/bin... not in all the filesystem) Debian-specific adaptations made by Javier Fernandez-Sanguino Pe?a Imported and adapted for Fedora by Aurelien Bompard --- NEW FILE tiger.cron --- # # Regular cron jobs for the tiger package # 0 * * * * root test -x /usr/sbin/tigercron && /usr/sbin/tigercron -q --- NEW FILE tiger.ignore --- # Fedora uses a "mail" group to allow some access to /var/spool/mail. Login ID mail's home directory \(/var/spool/mail\) has group `mail' write access. # Fedora uses a "gdm" group to allow GDM to write ti /var/gdm Login ID gdm's home directory \(/var/gdm\) has group `gdm' write access. # nfsnobody is not a real user account, thus it does not have shell init file in its homedir Login ID nfsnobody may be missing a shell initialization file /var/lib/nfs/.nologinrc. # Standard perm in Fedora: 664 Log file /var/log/wtmp permission should be 644 /var/log/wtmp should not have group write. # Standard perm in Fedora: 600 Log file /var/log/btmp permission should be 660 # Standard perm in Fedora: 664 Log file /var/run/utmp permission should be 644 # Does not exist in Fedora Log file /var/log/loginlog does not exist # Standard perm in Fedora: 600 Log file /var/log/messages permission should be 640 # Does not exist by default in Fedora Root crontab does not exist # Standard service ports in Fedora The port for service fsp is also assigned to service ftp. The port for service whois is also assigned to service nicname. The port for service www is also assigned to service http. The port for service snmp-trap is also assigned to service snmptrap. The port for service z3950 is also assigned to service z39.50. The port for service ulistserv is also assigned to service ulistproc. The port for service route is also assigned to service router. The port for service font-service is also assigned to service xfs. The port for service kerberos4 is also assigned to service kerberos-iv. The port for service krb_prop is also assigned to service krb5_prop. The port for service ssmtp is also assigned to service smtps. The port for service rmtcfg is also assigned to service bvcontrol. The port for service zebrasrv is also assigned to service hpstgmgr. The port for service zebra is also assigned to service discp-client. The port for service ripd is also assigned to service discp-server. The port for service ripngd is also assigned to service servicemeter. The port for service ospfd is also assigned to service nsc-ccs. The port for service bgpd is also assigned to service nsc-posa. The port for service ospf6d is also assigned to service netmon. The port for service kpasswd is also assigned to service rxe. The port for service kx is also assigned to service dsatp. The port for service moira_db is also assigned to service entomb. The port for service moira_update is also assigned to service multiling-http. The port for service predict is also assigned to service eoss. The port for service xtelw is also assigned to service pdps. The port for service ndtp is also assigned to service search. The port for service afmbackup is also assigned to service zarkov. The port for service pcrd is also assigned to service esri_sde. The port for service mrtd is also assigned to service hyperscsi-port. The port for service bgpsim is also assigned to service v5ua. The port for service sane is also assigned to service sane-port. The port for service omniorb is also assigned to service radan-http. # Set in /etc/bashrc There are no umask entries in /etc/profile # Set in /etc/csh/cshrc There are no umask entries in /etc/csh.login # Standard perm in Fedora: 4666 /dev/log has world permissions # Standard perm in Fedora: 644 /dev/rtc has world permissions # Standard perm in Fedora: 666 /dev/ptmx has world permissions # Normal in Fedora The directory /dev/snd resides in a device directory. # Standard perm in Fedora: 644 /etc/xinetd.conf permissions are not 600. # Standard perm in Fedora: 644 /etc/xinetd.d/.* permissions are not 600. # Normal in Fedora Group root\(0\) has got the following members: root # Normal in Fedora Group bin\(1\) has got the following members: root,bin,daemon # Normal in Fedora Group daemon\(2\) has got the following members: root,bin,daemon # Normal in Fedora Login halt has a group id of 0 which should be reserved for root # Normal in Fedora Login operator has a group id of 0 which should be reserved for root # Normal in Fedora Login shutdown has a group id of 0 which should be reserved for root # Normal in Fedora Login sync has a group id of 0 which should be reserved for root --- NEW FILE tiger.ignore.server --- # Mysql database server Program mysqld \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /var/log/mysql/mysql\.err\.[[:digit:]]+ \(deleted\) Program mysqld \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /tmp/.* \(deleted\) and is a a server listening on port\(s\) mysql # Apache web server Server /usr/sbin/apache \(pid [[:digit:]]+\) is using deleted files Program apache \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /tmp/session_mm_apache0.sem \(deleted\) The parent process of server /usr/sbin/apache \(pid [[:digit:]]+\) is using deleted files # Cupds printer daemon Server /usr/sbin/cupsd \(pid [[:digit:]]+\) is using deleted files Program cupsd \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /var/log/cupsd/error_log\..* \(deleted\) #Mailman list manager Program python \(pid [[:digit:]]+, parent [[:digit:]]+\) is using a deleted file: .* /var/log/mailman/.* \(deleted\) # Squid proxy Server \(squid\) .* \(pid [[:digit:]]+\) is using deleted files # SSH users accessing remotely with X11 forwarding 'on' The process `sshd' is listening on socket 6[[:digit:]]+ (TCP on loopback interface) is run by .* --- NEW FILE tiger.spec --- Name: tiger Version: 3.2.1 Release: 4%{?dist} Summary: Security auditing on UNIX systems Group: Applications/System License: GPL URL: http://www.nongnu.org/tiger/ Source0: http://savannah.nongnu.org/download/tiger/tiger-3.2.1.tar.gz Source1: http://savannah.nongnu.org/download/tiger/tiger-3.2.1.tar.gz.sig Source2: tiger.cron Source3: tiger.ignore Source4: tiger.ignore.server Source5: tiger.README Patch0: tiger-3.2.1-autotools.patch # Default configuration Patch1: tiger-3.2.1-config.patch # Mainly typos Patch2: tiger-3.2.1-doc.patch # Fixes in the checking scripts and additional scripts Patch3: tiger-3.2.1-scripts.patch # Various fixes Patch4: tiger-3.2.1-fixes.patch # Fix for one small C program Patch5: tiger-3.2.1-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, recode Requires: bash, vixie-cron %description TIGER, or the "tiger" scripts, is a set of Bourne shell scripts, C programs and data files which are used to perform a security audit of UNIX systems. It is designed to hopefully be easy to use, easy to understand and easy to enhance. %prep %setup -q -n tiger %patch0 -p1 -b .autotools %patch1 -p1 -b .config # No backup, or the files will be copied in the buildroot #%patch2 -p1 -b .doc #%patch3 -p1 -b .scripts %patch2 -p1 %patch3 -p1 %patch4 -p1 -b .fixes %patch5 -p1 -b .gcc4 find . -name "*.rpmorig" | xargs rm -f find . -name "*.orig" | xargs rm -f find . -name "*.old" | xargs rm -f recode ISO-8859-1..UTF-8 man/tiger.8.in install -p -m 644 %{SOURCE5} README.Fedora # Remove CVS dirs find . -type d -name CVS | xargs rm -rf %build autoconf %configure \ --with-tigerhome=%{_libdir}/tiger \ --with-tigerwork=%{_localstatedir}/run/tiger/work \ --with-tigerlog=%{_localstatedir}/log/tiger \ --with-tigerbin=%{_sbindir} \ --with-tigerconfig=%{_sysconfdir}/tiger make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tiger/templates install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/tiger install -p -m 600 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tiger/tiger.ignore install -p -m 644 version.h $RPM_BUILD_ROOT%{_libdir}/tiger for system in AIX HPUX IRIX NeXT SunOS UNICOS UNICOSMK Tru64 MacOSX; do rm -rf $RPM_BUILD_ROOT%{_libdir}/tiger/systems/${system}; done ln -s %{_sbindir}/tigexp $RPM_BUILD_ROOT%{_libdir}/tiger/tigexp mkdir examples cp -p cronrc tigerrc tigerrc-all tigerrc-dist tigerrc-TAMU \ site-sample site-saturn %{SOURCE4} examples chmod 644 examples/* # Perm fixes chmod +x $RPM_BUILD_ROOT%{_libdir}/tiger/systems/Linux/2/check_* # Documentation (in %%doc) rm -rf $RPM_BUILD_ROOT%{_libdir}/tiger/html %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc USING BUGS.EXTERN DESCRIPTION CREDITS README README.1st README.hostids %doc README.ignore README.linux README.signatures README.sources %doc README.time README.unsupported README.writemodules TODO README.Fedora %doc COPYING examples html %{_mandir}/man*/* %{_sbindir}/* %{_libdir}/tiger %{_localstatedir}/run/tiger %{_localstatedir}/log/tiger %config(noreplace) %{_sysconfdir}/tiger %config %{_sysconfdir}/cron.d/tiger %changelog * Sat May 13 2006 Aurelien Bompard 3.2.1-4 - include the COPYING file - put HTML doc in %%doc - drop useless logos - fix %%description - remove CVS dirs in %%prep - Thanks to Hans de Goede in bug 165311 * Sat Apr 22 2006 Aurelien Bompard 3.2.1-3 - don't backup some patches, or the files will be copied in the buildroot - set conf files to noreplace - fix manpage encoding * Sun Apr 02 2006 Aurelien Bompard 3.2.1-2 - fix arguments for "sort" and "tail" in patch3 * Sat Aug 06 2005 Aurelien Bompard 3.2.1-1 - initial package, importing Debian's fixes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tiger/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 May 2006 21:36:56 -0000 1.1 +++ .cvsignore 13 May 2006 21:38:59 -0000 1.2 @@ -0,0 +1 @@ +tiger-3.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tiger/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 May 2006 21:36:56 -0000 1.1 +++ sources 13 May 2006 21:38:59 -0000 1.2 @@ -0,0 +1 @@ +7c4d6dc7c56b3b6f8fa349eca7f8e41d tiger-3.2.1.tar.gz From fedora-extras-commits at redhat.com Sat May 13 21:45:59 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 13 May 2006 14:45:59 -0700 Subject: owners owners.list,1.988,1.989 Message-ID: <200605132146.k4DLk1G8015497@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15478 Modified Files: owners.list Log Message: add tiger (bug 165311) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.988 retrieving revision 1.989 diff -u -r1.988 -r1.989 --- owners.list 13 May 2006 14:56:56 -0000 1.988 +++ owners.list 13 May 2006 21:45:59 -0000 1.989 @@ -1566,6 +1566,7 @@ Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|tiger|Security auditing tool for UNIX systems|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|tile|Modernized widgets for Tk|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com From fedora-extras-commits at redhat.com Sat May 13 22:35:55 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Sat, 13 May 2006 15:35:55 -0700 Subject: rpms/poker-eval/devel poker-eval.spec,1.7,1.8 Message-ID: <200605132235.k4DMZvMi017933@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17916 Modified Files: poker-eval.spec Log Message: New upstream release Index: poker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- poker-eval.spec 23 Apr 2006 19:59:53 -0000 1.7 +++ poker-eval.spec 13 May 2006 22:35:55 -0000 1.8 @@ -1,11 +1,11 @@ Name: poker-eval -Version: 130.0 -Release: 5%{?dist} +Version: 131.0 +Release: 1%{?dist} Summary: Poker hand evaluator library Group: Development/Libraries License: GPL -URL: http://pokersource.org/poker-eval/ -Source0: http://download.gna.org/pokersource/%{name}-%{version}.tar.gz +URL: http://pokersource.org/poker-eval +Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,9 +24,6 @@ %prep %setup -q -# rpmlint fix -chmod -x examples/five_card_hands.c - # use examples/ directory for devel package %doc section mkdir -p tmp/examples && cp examples/*.c tmp/examples rm -f tmp/examples/getopt_w32.c @@ -62,6 +59,10 @@ %exclude %{_libdir}/*.la %changelog +* Sat May 13 2006 Christopher Stone 131.0-1 +- upstream sync +- Remove rpmlint fix since it's no longer needed + * Sun Apr 23 2006 Christopher Stone 130.0-5 - Update URL to new permanent URL From fedora-extras-commits at redhat.com Sun May 14 02:20:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 19:20:03 -0700 Subject: rpms/perl-Test-Differences/FC-5 perl-Test-Differences.spec,1.1,1.2 Message-ID: <200605140220.k4E2K5CR027619@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570/FC-5 Modified Files: perl-Test-Differences.spec Log Message: Bumping release due to repodata inconsistency. Index: perl-Test-Differences.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/FC-5/perl-Test-Differences.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Differences.spec 7 May 2006 02:07:02 -0000 1.1 +++ perl-Test-Differences.spec 14 May 2006 02:20:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Differences Version: 0.47 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test strings and data structures and show differences if not ok Group: Development/Libraries @@ -52,5 +52,8 @@ %changelog +* Sun May 14 2006 Jose Pedro Oliveira - 0.47-2 +- Bumping release (repodata checksum inconsistency for previous release). + * Mon May 01 2006 Jose Pedro Oliveira - 0.47-1 - First build. From fedora-extras-commits at redhat.com Sun May 14 02:20:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 19:20:04 -0700 Subject: rpms/perl-Test-Differences/devel perl-Test-Differences.spec, 1.1, 1.2 Message-ID: <200605140220.k4E2K6p3027623@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570/devel Modified Files: perl-Test-Differences.spec Log Message: Bumping release due to repodata inconsistency. Index: perl-Test-Differences.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/devel/perl-Test-Differences.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Differences.spec 7 May 2006 02:07:02 -0000 1.1 +++ perl-Test-Differences.spec 14 May 2006 02:20:04 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Differences Version: 0.47 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test strings and data structures and show differences if not ok Group: Development/Libraries @@ -52,5 +52,8 @@ %changelog +* Sun May 14 2006 Jose Pedro Oliveira - 0.47-2 +- Bumping release (repodata checksum inconsistency for previous release). + * Mon May 01 2006 Jose Pedro Oliveira - 0.47-1 - First build. From fedora-extras-commits at redhat.com Sun May 14 02:20:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 May 2006 19:20:02 -0700 Subject: rpms/perl-Test-Differences/FC-4 perl-Test-Differences.spec,1.1,1.2 Message-ID: <200605140220.k4E2KYI5027631@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Differences/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27570/FC-4 Modified Files: perl-Test-Differences.spec Log Message: Bumping release due to repodata inconsistency. Index: perl-Test-Differences.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Differences/FC-4/perl-Test-Differences.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Differences.spec 7 May 2006 02:07:02 -0000 1.1 +++ perl-Test-Differences.spec 14 May 2006 02:20:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Test-Differences Version: 0.47 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test strings and data structures and show differences if not ok Group: Development/Libraries @@ -52,5 +52,8 @@ %changelog +* Sun May 14 2006 Jose Pedro Oliveira - 0.47-2 +- Bumping release (repodata checksum inconsistency for previous release). + * Mon May 01 2006 Jose Pedro Oliveira - 0.47-1 - First build. From fedora-extras-commits at redhat.com Sun May 14 03:28:31 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:28:31 -0700 Subject: rpms/liblrdf - New directory Message-ID: <200605140328.k4E3SXOV030211@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30185/liblrdf Log Message: Directory /cvs/extras/rpms/liblrdf added to the repository From fedora-extras-commits at redhat.com Sun May 14 03:28:32 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:28:32 -0700 Subject: rpms/liblrdf/devel - New directory Message-ID: <200605140328.k4E3SYRM030214@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30185/liblrdf/devel Log Message: Directory /cvs/extras/rpms/liblrdf/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 03:28:54 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:28:54 -0700 Subject: rpms/liblrdf Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605140328.k4E3Su6O030258@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30230 Added Files: Makefile import.log Log Message: Setup of module liblrdf --- NEW FILE Makefile --- # Top level Makefile for module liblrdf all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 14 03:28:55 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:28:55 -0700 Subject: rpms/liblrdf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605140329.k4E3SvNv030261@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30230/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module liblrdf --- NEW 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 May 14 03:29:58 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:29:58 -0700 Subject: rpms/liblrdf import.log,1.1,1.2 Message-ID: <200605140330.k4E3U0D8030347@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30311 Modified Files: import.log Log Message: auto-import liblrdf-0.4.0-6 on branch devel from liblrdf-0.4.0-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liblrdf/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 03:28:54 -0000 1.1 +++ import.log 14 May 2006 03:29:58 -0000 1.2 @@ -0,0 +1 @@ +liblrdf-0_4_0-6:HEAD:liblrdf-0.4.0-6.src.rpm:1147577404 From fedora-extras-commits at redhat.com Sun May 14 03:29:59 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:29:59 -0700 Subject: rpms/liblrdf/devel liblrdf-README.fedora, NONE, 1.1 liblrdf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605140330.k4E3U1s9030353@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30311/devel Modified Files: .cvsignore sources Added Files: liblrdf-README.fedora liblrdf.spec Log Message: auto-import liblrdf-0.4.0-6 on branch devel from liblrdf-0.4.0-6.src.rpm --- NEW FILE liblrdf-README.fedora --- See the liblrdf SRPM for example source code. --- NEW FILE liblrdf.spec --- Summary: Library for manipulating RDF files describing LADSPA plugins Name: liblrdf Version: 0.4.0 Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://lrdf.sourceforge.net/ Source0: http://download.sourceforge.net/lrdf/liblrdf-0.4.0.tar.gz Source1: liblrdf-README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, ladspa-devel, raptor-devel %description liblrdf is a library to make it easy to manipulate RDF files describing LADSPA plugins. %package devel Summary: Library for manipulating RDF files describing LADSPA plugins Group: Development/Libraries Requires: liblrdf = %{version}-%{release} Requires: raptor-devel %description devel This is a library to make it easy to manipulate RDF files describing LADSPA plugins. This package includes the development tools. %prep %setup -q cp %{SOURCE1} README.fedora %build %configure --disable-static %install rm -rf $RPM_BUILD_ROOT %makeinstall %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL NEWS README README.fedora %{_libdir}/liblrdf.so.* %exclude %{_datadir}/ladspa/rdf/ladspa.rdfs %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/liblrdf.so %exclude %{_libdir}/liblrdf.la %{_libdir}/pkgconfig/* %changelog * Sat May 13 2006 Anthony Green 0.4.0-6 - Exclude ladspa.rdfs. - Don't use %{__rm} or %{__make} macros. - Standardize on $RPM_BUILD_ROOT from %{buildroot}. * Mon Apr 24 2006 Anthony Green 0.4.0-5 - Clean up BuildRequires based on raptor mods. * Sun Apr 23 2006 Anthony Green 0.4.0-4 - Remove examples dir. Add README.fedora. - Configure with --disable-static. * Sun Apr 23 2006 Anthony Green 0.4.0-3 - Update URLs. - Remove gcc-c++ from BuildRequires. * Tue Apr 18 2006 Anthony Green 0.4.0-2 - Minor tweaks. Build for Fedora Extras. * Wed Dec 22 2004 Fernando Lopez-Lezcano 0.4.0-1 - updated to 0.4.0 * Fri Dec 16 2004 Fernando Lopez-Lezcano - spec file tweaks * Thu Apr 15 2004 Fernando Lopez-Lezcano 0.3.7-1 - updated to 0.3.7, added proper build requirements * Wed Feb 18 2004 Fernando Lopez-Lezcano 0.3.5-1 - updated to 0.3.5 * Wed Feb 4 2004 Fernando Lopez-Lezcano 0.3.4-1 - updated to 0.3.4 * Fri Nov 7 2003 Fernando Lopez-Lezcano 0.3.2-1 - updated to 0.3.2 * Tue May 6 2003 Fernando Lopez-Lezcano 0.3.1-1 - updated to 0.3.1 * Thu Mar 6 2003 Fernando Lopez-Lezcano 0.2.4-1 - added ldconfig, pkgconfig file to devel file list * Wed Feb 19 2003 Fernando Lopez-Lezcano 0.2.3-2 - added raptor-devel dependency to liblrdf-devel * Fri Feb 14 2003 Fernando Lopez-Lezcano 0.2.3-1 - updated to 0.2.3 * Wed Feb 11 2003 Fernando Lopez-Lezcano 0.2.2-1 - updated to 0.2.2 * Mon Jan 13 2003 Fernando Lopez-Lezcano 0.2.1-1 - updated to 0.2.1 * Thu Jan 9 2003 Fernando Lopez-Lezcano 0.1.3-1 - Initial build, fix missing symbolic links to the shared library Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liblrdf/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 03:28:55 -0000 1.1 +++ .cvsignore 14 May 2006 03:29:59 -0000 1.2 @@ -0,0 +1 @@ +liblrdf-0.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/liblrdf/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 03:28:55 -0000 1.1 +++ sources 14 May 2006 03:29:59 -0000 1.2 @@ -0,0 +1 @@ +327a5674f671c4b360c6353800226877 liblrdf-0.4.0.tar.gz From fedora-extras-commits at redhat.com Sun May 14 03:34:47 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sat, 13 May 2006 20:34:47 -0700 Subject: owners owners.list,1.989,1.990 Message-ID: <200605140334.k4E3Ynrk030456@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30439 Modified Files: owners.list Log Message: Add liblrdf. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.989 retrieving revision 1.990 diff -u -r1.989 -r1.990 --- owners.list 13 May 2006 21:45:59 -0000 1.989 +++ owners.list 14 May 2006 03:34:46 -0000 1.990 @@ -642,6 +642,7 @@ Fedora Extras|libkexif|Allow Kipi plugins to extract EXIF information|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libkipi|Common plugin infrastructure for KDE image applications|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|liblrdf|Library for manipulating RDF files describing LADSPA plugins|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 14 04:12:20 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 13 May 2006 21:12:20 -0700 Subject: rpms/pan/devel pan-0.97-crash-on-shutdown.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 pan.spec, 1.14, 1.15 sources, 1.7, 1.8 pan-0.96-upstream-sort_segfault.patch, 1.1, NONE pan-0.96-upstream-subscribed_group.patch, 1.1, NONE Message-ID: <200605140412.k4E4CMFA000323@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32763 Modified Files: .cvsignore pan.spec sources Added Files: pan-0.97-crash-on-shutdown.patch Removed Files: pan-0.96-upstream-sort_segfault.patch pan-0.96-upstream-subscribed_group.patch Log Message: Update to 0.97 development snapshot pan-0.97-crash-on-shutdown.patch: --- NEW FILE pan-0.97-crash-on-shutdown.patch --- --- pan/gui/pan.cc.bak 2006-05-13 22:29:33.000000000 -0500 +++ pan/gui/pan.cc 2006-05-13 22:29:39.000000000 -0500 @@ -44,6 +44,12 @@ gtk_main_quit (); } + gboolean delete_event_cb (GtkWidget *w, GdkEvent *e, gpointer user_data) + { + gtk_main_quit (); + return true; + } + struct DataAndQueue { Data * data; @@ -219,6 +225,7 @@ GtkWidget * w (pane->root()); gtk_widget_show_all (w); g_signal_connect (G_OBJECT(w), "destroy", G_CALLBACK(destroy_cb), 0); + g_signal_connect (G_OBJECT(w), "delete-event", G_CALLBACK(delete_event_cb), 0); gtk_main (); } else { GMainLoop * main_loop = g_main_loop_new (NULL, false); @@ -236,6 +243,7 @@ gtk_window_set_resizable (GTK_WINDOW(window), true); gtk_window_set_icon (GTK_WINDOW(window), pixbuf); g_signal_connect (G_OBJECT(window), "destroy", G_CALLBACK(destroy_cb), 0); + g_signal_connect (G_OBJECT(window), "delete-event", G_CALLBACK(delete_event_cb), 0); g_object_unref (pixbuf); run_pan_in_window (cache, data, queue, prefs, GTK_WINDOW(window)); } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 May 2006 19:19:31 -0000 1.7 +++ .cvsignore 14 May 2006 04:12:20 -0000 1.8 @@ -3,3 +3,4 @@ pan-0.94.tar.bz2 pan-0.95.tar.bz2 pan-0.96.tar.bz2 +pan-0.97.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- pan.spec 9 May 2006 00:59:08 -0000 1.14 +++ pan.spec 14 May 2006 04:12:20 -0000 1.15 @@ -1,13 +1,12 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.96 -Release: 2%{?dist} +Version: 0.97 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 -Patch0: pan-0.96-upstream-sort_segfault.patch -Patch1: pan-0.96-upstream-subscribed_group.patch +Patch0: pan-0.97-crash-on-shutdown.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -29,7 +28,6 @@ %prep %setup -q %patch0 -p0 -%patch1 -p0 echo "StartupNotify=true" >> pan.desktop @@ -74,6 +72,10 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Sat May 13 2006 Michael A. Peters - 1:0.97-1 +- Update to 0.97 (previous patches no longer needed) +- Patch pan-0.97-crash-on-shutdown.patch from upstream added + * Mon May 08 2006 Michael A. Peters - 1:0.96-2 - Two patches from upstream (pan-0.96-upstream-sort_segfault.patch - and pan-0.96-upstream-subscribed_group.patch) Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 6 May 2006 19:19:31 -0000 1.7 +++ sources 14 May 2006 04:12:20 -0000 1.8 @@ -1,2 +1,2 @@ -3a0cff7a3bc8b77ad19af4a492859804 pan-0.95.tar.bz2 b4e355553cd502add3e599d1e867da9e pan-0.96.tar.bz2 +32dd572f582b1bfd708d4eb755c215e4 pan-0.97.tar.bz2 --- pan-0.96-upstream-sort_segfault.patch DELETED --- --- pan-0.96-upstream-subscribed_group.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 14 04:48:19 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:48:19 -0700 Subject: mock/etc defaults.cfg,NONE,1.1 Message-ID: <200605140448.k4E4mJ3L000489@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv456/etc Added Files: defaults.cfg Log Message: check in global defaults patch from Andreas Thienemann --- NEW FILE defaults.cfg --- # mock defaults # # Define default values here. # These values are overwritten in the /etc/mock/CHROOT.cfg files. # # Example: # # config_opts['foo'] = bar From fedora-extras-commits at redhat.com Sun May 14 04:48:14 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:48:14 -0700 Subject: mock mock.py,1.45,1.46 Message-ID: <200605140448.k4E4miAs000492@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv456 Modified Files: mock.py Log Message: check in global defaults patch from Andreas Thienemann Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mock.py 12 May 2006 20:57:03 -0000 1.45 +++ mock.py 14 May 2006 04:48:11 -0000 1.46 @@ -735,6 +735,14 @@ if options.configdir: config_path = options.configdir + # Read in the default values which can be overwritten + # with the more specific config being loaded below. + cfg = os.path.join(config_path, 'defaults.cfg') + if os.path.exists(cfg): + execfile(cfg) + else: + pass # not finding the defaults.cfg file is no error + # read in the config file by chroot name if options.chroot.endswith('.cfg'): cfg = '%s/%s' % (config_path, options.chroot) From fedora-extras-commits at redhat.com Sun May 14 04:49:59 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:49:59 -0700 Subject: mock mock.py,1.46,1.47 Message-ID: <200605140449.k4E4nxZ3000516@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv498 Modified Files: mock.py Log Message: commit Hans Ulrich Niedermann and Andreas Thienemann patch for the crack-y more buildreq feature. Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mock.py 14 May 2006 04:48:11 -0000 1.46 +++ mock.py 14 May 2006 04:49:57 -0000 1.47 @@ -289,7 +289,7 @@ hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) # get text buildreqs - buildreqs = self._text_requires_from_hdr(hdr) + buildreqs = self._text_requires_from_hdr(hdr, srpm) arg_string = "" for item in buildreqs: @@ -495,7 +495,7 @@ return (ret, output) - def _text_requires_from_hdr(self, hdr): + def _text_requires_from_hdr(self, hdr, srpm): """take a header and hand back a unique'd list of the requires as strings""" @@ -513,6 +513,23 @@ req = rpmUtils.miscutils.formatRequire(n, v, f) reqlist.append(req) + # Extract SRPM name components - still not nice, shouldn't this + # be somewhere in the "hdr" parameter? + fname = os.path.split(str(srpm))[1] + name, ver, rel, epoch, arch = rpmUtils.miscutils.splitFilename(fname) + + # Add the 'more_buildreqs' for this SRPM (if defined) + for this_srpm in ['-'.join([name,ver,rel]), + '-'.join([name,ver]), + '-'.join([name]),]: + if self.config['more_buildreqs'].has_key(this_srpm): + more_reqs = self.config['more_buildreqs'][this_srpm] + if type(more_reqs) in (type(u''), type(''),): + more_reqs = [more_reqs] # be nice if we get a string + for req in more_reqs: + reqlist.append(req) + break + return rpmUtils.miscutils.unique(reqlist) def _prep_install(self): @@ -722,6 +739,7 @@ """ % config_opts['chroothome'] + config_opts['more_buildreqs'] = {} config_opts['files']['/etc/resolv.conf'] = "nameserver 192.168.1.1\n" config_opts['files']['/etc/hosts'] = "127.0.0.1 localhost localhost.localdomain\n" From fedora-extras-commits at redhat.com Sun May 14 04:53:41 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:53:41 -0700 Subject: mock mock.py,1.47,1.48 Message-ID: <200605140453.k4E4rfGU000574@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv543 Modified Files: mock.py Log Message: make prep install command configurable and set default in defaults.cfg Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- mock.py 14 May 2006 04:49:57 -0000 1.47 +++ mock.py 14 May 2006 04:53:38 -0000 1.48 @@ -209,7 +209,7 @@ self._prep_install() if self.config['clean']: - cmd = 'install %s' % self.config['chroot_dep_package'] + cmd = '%s' % self.config['chroot_setup_cmd'] else: cmd = 'update' @@ -721,7 +721,7 @@ config_opts['mknod'] = '/usr/sbin/mock-helper mknod' config_opts['yum'] = '/usr/sbin/mock-helper yum' config_opts['runuser'] = '/sbin/runuser' - config_opts['chroot_dep_package'] = 'buildsys-build' + config_opts['chroot_setup_cmd'] = 'install buildsys-build' config_opts['chrootuser'] = 'mockbuild' config_opts['chrootgroup'] = 'mockbuild' config_opts['chrootuid'] = 500 From fedora-extras-commits at redhat.com Sun May 14 04:53:41 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 13 May 2006 21:53:41 -0700 Subject: mock/etc defaults.cfg,1.1,1.2 Message-ID: <200605140453.k4E4rfqX000580@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv543/etc Modified Files: defaults.cfg Log Message: make prep install command configurable and set default in defaults.cfg Index: defaults.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/defaults.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- defaults.cfg 14 May 2006 04:48:12 -0000 1.1 +++ defaults.cfg 14 May 2006 04:53:39 -0000 1.2 @@ -6,3 +6,5 @@ # Example: # # config_opts['foo'] = bar +config_opts['chroot_setup_cmd'] = 'install buildsys-build' +#config_opts['chroot_setup_cmd'] = 'groupinstall build build-minimal build-base' From fedora-extras-commits at redhat.com Sun May 14 05:43:08 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 13 May 2006 22:43:08 -0700 Subject: extras-buildsys ChangeLog,1.196,1.197 Message-ID: <200605140543.k4E5h8oM003029@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2964 Modified Files: ChangeLog Log Message: 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning PackageJob object, and only one is spawned for the lifetime of the PackageJob for each architecture (previously one was spawned for each individual build job on the builder). Archjob UIDs are generated on the server now rather than the builder. * Correctly handle builders going away before they've had a chance to notify the server that they have started an archjob. Previously, these jobs would just be lost. This is the real reason for the rework of the archjob handling above. * On the builder, don't use die() to end jobs that have failed; do it properly and upload files to the server if we weren't killed * Deal with active builders whose hostnames can't be resolved when the server starts * Kill any existing jobs on builders when the server starts up * Consolidate and simplify logging functions in PackageJob * More pylint-induced cleanups Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- ChangeLog 12 May 2006 04:10:45 -0000 1.196 +++ ChangeLog 14 May 2006 05:43:05 -0000 1.197 @@ -1,3 +1,28 @@ +2006-05-14 Dan Williams + + * Rework archjob handling. They are now processed from the owning + PackageJob object, and only one is spawned for the lifetime of the + PackageJob for each architecture (previously one was spawned for each + individual build job on the builder). Archjob UIDs are generated on + the server now rather than the builder. + + * Correctly handle builders going away before they've had a chance to + notify the server that they have started an archjob. Previously, these + jobs would just be lost. This is the real reason for the rework of the + archjob handling above. + + * On the builder, don't use die() to end jobs that have failed; do it + properly and upload files to the server if we weren't killed + + * Deal with active builders whose hostnames can't be resolved when + the server starts + + * Kill any existing jobs on builders when the server starts up + + * Consolidate and simplify logging functions in PackageJob + + * More pylint-induced cleanups + 2006-05-12 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Sun May 14 05:43:09 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 13 May 2006 22:43:09 -0700 Subject: extras-buildsys/common Commands.py,1.7,1.8 Message-ID: <200605140543.k4E5h9Uu003043@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2964/common Modified Files: Commands.py Log Message: 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning PackageJob object, and only one is spawned for the lifetime of the PackageJob for each architecture (previously one was spawned for each individual build job on the builder). Archjob UIDs are generated on the server now rather than the builder. * Correctly handle builders going away before they've had a chance to notify the server that they have started an archjob. Previously, these jobs would just be lost. This is the real reason for the rework of the archjob handling above. * On the builder, don't use die() to end jobs that have failed; do it properly and upload files to the server if we weren't killed * Deal with active builders whose hostnames can't be resolved when the server starts * Kill any existing jobs on builders when the server starts up * Consolidate and simplify logging functions in PackageJob * More pylint-induced cleanups Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Commands.py 12 May 2006 04:04:05 -0000 1.7 +++ Commands.py 14 May 2006 05:43:06 -0000 1.8 @@ -330,11 +330,19 @@ _need_ack = True - def __init__(self, parent_job, target_dict, srpm_url, seq=0): + def __init__(self, archjob, target_dict=None, srpm_url=None, archjob_id=None, seq=0): PlgCommand.__init__(self, CMD_NAME_NEW_JOB_REQ, seq) - self._parent_job = parent_job # doesn't get serialized - self._target_dict = target_dict - self._srpm_url = srpm_url + self._archjob = archjob # doesn't get serialized + if archjob: + self._target_dict = archjob.target_dict() + self._srpm_url = archjob.srpm_url() + self._archjob_id = archjob.archjob_id() + else: + if not target_dict or not srpm_url or not archjob_id: + raise Exception("Need a target_dict, an srpm_url, and an archjob_id.") + self._target_dict = target_dict + self._srpm_url = srpm_url + self._archjob_id = archjob_id def _deserialize(args): try: @@ -345,8 +353,12 @@ srpm_url = args['srpm_url'] except (KeyError, TypeError): raise ValueError("No 'srpm_url' argument found.") + try: + archjob_id = args['archjob_id'] + except (KeyError, TypeError): + raise ValueError("No 'archjob_id' argument found.") - return PlgCommandNewJobReq(None, target_dict, srpm_url) + return PlgCommandNewJobReq(None, target_dict, srpm_url, archjob_id) _deserialize = staticmethod(_deserialize) @@ -354,10 +366,11 @@ args = {} args['target_dict'] = self._target_dict args['srpm_url'] = self._srpm_url + args['archjob_id'] = self._archjob_id return PlgCommand._serialize(self, args) - def parent_job(self): - return self._parent_job + def archjob(self): + return self._archjob def target_dict(self): return self._target_dict @@ -365,8 +378,12 @@ def srpm_url(self): return self._srpm_url + def archjob_id(self): + return self._archjob_id + def __str__(self): - return "%s(seq: %d, target_dict: %s, srpm_url: %s)" % (self._name, self._seq, self._target_dict, self._srpm_url) + return "%s(seq: %d, target_dict: %s, srpm_url: %s, archjob_id: %s)" % (self._name, + self._seq, self._target_dict, self._srpm_url, self._archjob_id) class PlgCommandNewJobAck(PlgCommandAck): From fedora-extras-commits at redhat.com Sun May 14 05:43:09 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 13 May 2006 22:43:09 -0700 Subject: extras-buildsys/server ArchJob.py, 1.31, 1.32 BuildMaster.py, 1.40, 1.41 Builder.py, 1.40, 1.41 BuilderManager.py, 1.24, 1.25 PackageJob.py, 1.49, 1.50 main.py, 1.21, 1.22 Message-ID: <200605140543.k4E5h91W003049@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2964/server Modified Files: ArchJob.py BuildMaster.py Builder.py BuilderManager.py PackageJob.py main.py Log Message: 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning PackageJob object, and only one is spawned for the lifetime of the PackageJob for each architecture (previously one was spawned for each individual build job on the builder). Archjob UIDs are generated on the server now rather than the builder. * Correctly handle builders going away before they've had a chance to notify the server that they have started an archjob. Previously, these jobs would just be lost. This is the real reason for the rework of the archjob handling above. * On the builder, don't use die() to end jobs that have failed; do it properly and upload files to the server if we weren't killed * Deal with active builders whose hostnames can't be resolved when the server starts * Kill any existing jobs on builders when the server starts up * Consolidate and simplify logging functions in PackageJob * More pylint-induced cleanups Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ArchJob.py 9 May 2006 19:10:57 -0000 1.31 +++ ArchJob.py 14 May 2006 05:43:07 -0000 1.32 @@ -15,36 +15,80 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import time -import socket import os import threading import urllib -import OpenSSL from plague import FileTransfer +import sha +def _generate_uniqid(parent_jobid, start_time, target_dict, srpm_url): + distro = target_dict['distro'] + repo = target_dict['repo'] + target = target_dict['target'] + arch = target_dict['arch'] + hash_string = "%d%d%s%s%s%s%s" % (parent_jobid, start_time, distro, + target, arch, repo, srpm_url) + sha_hash = sha.new() + sha_hash.update(hash_string) + return sha_hash.hexdigest() + + +AJ_STATUS_QUEUED = 'queued' +AJ_STATUS_WAITING = 'waiting' +AJ_STATUS_REPO_WAIT = 'repo_wait' +AJ_STATUS_REPO_UNLOCK = 'repo_unlock' +AJ_STATUS_RUNNING = 'running' +AJ_STATUS_DOWNLOADING = 'downloading' +AJ_STATUS_DONE = 'done' + class ArchJob: """ Tracks a single build instance for a single arch on a builder """ - def __init__(self, builder, par_job, jobid, target_dict): - self.par_job = par_job - self._builder = builder - self._repo = par_job.repo() - self.jobid = jobid - self._status = 'starting' + def __init__(self, parent, target_dict, srpm_url): + self._parent = parent + self._builder = None + self._repo = parent.repo() + self._starttime = time.time() + self._endtime = 0 + self._id = _generate_uniqid(parent.uid, self._starttime, target_dict, + srpm_url) + self._status = AJ_STATUS_QUEUED self._builder_status = '' self._failure_noticed = False self._download_failed = False self._internal_failure = False self._target_dict = target_dict - self._builder_gone = False + self._srpm_url = srpm_url self._result_files = {} - self._starttime = time.time() - self._endtime = 0 self._die = False self._die_user_requested = False self._die_lock = threading.Lock() self._prepping = False + self._orphaned = False + + def builder_suspend_cb(self, builder, reason, msg): + self.unclaim(builder) + if not self._is_done_status(): + self._parent.log(self.arch(), "Builder disappeared. Requeuing arch...") + + def set_builder_status(self, builder, builder_status): + if builder != self._builder: + return + + # The job has just started on the builder + if self._builder_status == '': + addr = builder.address() + self._parent.log(self.arch(), "%s - UID is %s" % (addr, self._id)) + # Notify our parent PackageJob that we've started + self._parent.archjob_started_cb(self) + + oldstatus = self._builder_status + self._builder_status = builder_status + if oldstatus != self._builder_status: + attrdict = self._to_dict() + self._parent.bm.queue_archjob_status_update(self._id, attrdict) + del attrdict def failure_noticed(self): return self._failure_noticed @@ -74,86 +118,115 @@ def arch(self): return self._target_dict['arch'] + def target_dict(self): + return self._target_dict + + def srpm_url(self): + return self._srpm_url + + def archjob_id(self): + return self._id + def builder(self): return self._builder + def orphaned(self): + return self._orphaned + + def claim(self, builder): + """Called by the Builder via the BuilderManager when the builder + agrees to build this archjob.""" + if self._status != AJ_STATUS_QUEUED: + return + self._set_status(AJ_STATUS_WAITING) + self._builder = builder + builder.add_suspend_listener(self) + + def unclaim(self, builder): + builder.remove_suspend_listener(self) + self._builder = None + if not self._is_done_status(): + self._orphaned = True + self._builder_status = '' + # Mark ourselves as available for building again + self._set_status(AJ_STATUS_QUEUED) + def _to_dict(self): attrdict = {} - attrdict['jobid'] = self.jobid - attrdict['parent_uid'] = self.par_job.uid + attrdict['jobid'] = self._id + attrdict['parent_uid'] = self._parent.uid attrdict['arch'] = self._target_dict['arch'] - (ip, 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 + if self._builder: + name = self._builder.address() + # for some reason, splithost doesn't like the protocol + # method, you have to give it a string starting with "//" + if name.startswith("http"): + idx = name.find('//') + name = name[idx:] + host_port, path = urllib.splithost(name) + host, port = urllib.splitport(host_port) + attrdict['builder_addr'] = host + else: + attrdict['builder_addr'] = "" attrdict['status'] = self._status attrdict['builder_status'] = self._builder_status attrdict['starttime'] = self._starttime attrdict['endtime'] = self._endtime return attrdict - def set_builder_job_status(self, builder_status): - oldstatus = self._builder_status - self._builder_status = builder_status - if oldstatus != self._builder_status: - attrdict = self._to_dict() - self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) - del attrdict - - if builder_status == 'killed' or builder_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) + self._parent.bm.queue_archjob_status_update(self._id, attrdict) del attrdict def _is_done_status(self): - if self._status == 'done': + if self._status == AJ_STATUS_DONE: return True return False - def _status_starting(self): + def _set_done(self): + self._builder.remove_suspend_listener(self) + self._set_status(AJ_STATUS_DONE) + + def _status_queued(self): + pass + + def _status_waiting(self): # 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': - self._set_status('repo_wait') + self._set_status(AJ_STATUS_REPO_WAIT) self._repo.request_unlock(self) def _status_repo_wait(self): pass def repo_unlocked_callback(self): - if self._status == 'repo_wait': - self._set_status('repo_unlock') + if self._status == AJ_STATUS_REPO_WAIT: + self._set_status(AJ_STATUS_REPO_UNLOCK) def _status_repo_unlock(self): # Builder will be in 'downloaded' state until # it notices that the repo has been unlocked - self._builder.unlock_repo_for_job(self.jobid) self._prepping = True + self._builder.unlock_repo_for_job(self._id) if self._builder_status != 'downloaded': - self._set_status('running') + self._set_status(AJ_STATUS_RUNNING) def _status_running(self): if self._builder_status != 'prepping': self._prepping = False if self._builder_finished(): - self._set_status('downloading') - self._builder.request_job_files(self.jobid) + self._set_status(AJ_STATUS_DOWNLOADING) + self._builder.request_job_files(self._id) def get_result_files_dir(self): - result_dir = os.path.join(self.par_job.get_stage_dir(), self._target_dict['arch']) + result_dir = os.path.join(self._parent.get_stage_dir(), self._target_dict['arch']) if not os.path.exists(result_dir): os.makedirs(result_dir) return result_dir @@ -169,13 +242,16 @@ if fname != files.keys()[nresults - 1]: file_string = file_string + ", " - print "%s (%s/%s): Build result files - [ %s ]" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], file_string) + print "%s (%s/%s): Build result files - [ %s ]" % (self._parent.uid, + self._parent.package, self._target_dict['arch'], file_string) def download_cb(self, files): """Called by the Builder to notify us that our job's files are available. The files argument should be a list of _filenames_, not paths. All files are assumed to be in the directory returned by get_result_files_dir.""" + if self._is_done_status(): + return + if len(files.keys()) == 0: self._download_failed = True else: @@ -186,13 +262,21 @@ self._print_downloaded_files(self._result_files) self._endtime = time.time() - self._set_status('done') - self.par_job.wake() + self._set_done() def _status_downloading(self): # Wait to be notified that our files are downloaded pass + def _handle_death(self, user_requested): + self._builder.request_kill_for_job(self._id) + if self._status == AJ_STATUS_REPO_WAIT: + self._repo.cancel_unlock_request(self) + self._set_done() + if user_requested: + print "%s (%s/%s): %s - killed." % (self._parent.uid, self._parent.package, + self._target_dict['arch'], self._id) + def process(self): if self._is_done_status(): return @@ -203,32 +287,23 @@ user_requested = self._die_user_requested self._die_lock.release() if should_die: - try: - self._server.die(self.jobid) - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error): - pass - if self._status == 'repo_wait': - self._repo.cancel_unlock_request(self) - self._set_status('done') - if user_requested: - print "%s (%s/%s): %s - killed." % (self.par_job.uid, self.par_job.package, - self._target_dict['arch'], self.jobid) + self._handle_death(user_requested) return status_func = None try: status_func = getattr(self, "_status_%s" % self._status) except AttributeError: - print "%s (%s/%s): %s - internal archjob inconsistency. Unknown status '%s'." % (self.par_job.uid, self.par_job.package, - self._target_dict['arch'], self.jobid, self._status) - self._set_status('done') + print "%s (%s/%s): %s - internal archjob inconsistency. Unknown status '%s'." % (self._parent.uid, + self._parent.package, self._target_dict['arch'], self._id, self._status) + self._set_done() self._internal_failure = True return # Do the actual work for this status status_func() - def get_status(self): + def status(self): return self._status def get_files(self): @@ -239,21 +314,17 @@ files.append(fname) return files - def builder_gone(self): - if self._status != 'done': - self._builder_status = 'orphaned' - self._set_status('done') - self.par_job.remove_arch_job(self) - def die(self, user_requested=False): # Can be called from other threads - if self._status == 'running' or self._status == 'repo_wait' or self._status == 'starting' or self._status == 'repo_unlock': - self._die_lock.acquire() - self._die = True - self._die_user_requested = user_requested - self._die_lock.release() - if user_requested: - print "%s (%s/%s): %s - kill requested by parent job" % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], self.jobid) + if self._is_done_status(): + return + + self._die_lock.acquire() + self._die = True + self._die_user_requested = user_requested + self._die_lock.release() + if user_requested: + print "%s (%s/%s): %s - kill requested by parent job" % (self._parent.uid, + self._parent.package, self._target_dict['arch'], self._id) Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- BuildMaster.py 28 Apr 2006 03:17:41 -0000 1.40 +++ BuildMaster.py 14 May 2006 05:43:07 -0000 1.41 @@ -18,9 +18,7 @@ import time import PackageJob -import DBManager import threading -import os import Repo import copy import Config @@ -144,7 +142,7 @@ for repo in self._repos.values(): repo.stop() - def create_job_request(self, email, package, source, target_dict, buildreq, time): + def create_job_request(self, email, package, source, target_dict, buildreq, ctime): req = {} req['email'] = email req['package'] = package @@ -152,7 +150,7 @@ req['target_target'] = target_dict['target'] req['target_repo'] = target_dict['repo'] req['buildreq'] = buildreq - req['time'] = time + req['time'] = ctime req['source'] = source req['uid_avail'] = False req['uid'] = -1 @@ -226,8 +224,8 @@ # Update job end time try: self._cursor.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (job.endtime, uid)) - except StandardError, e: - print "DB Error: could not access jobs database. Reason: '%s'" % e + except StandardError, exc: + print "DB Error: could not access jobs database. Reason: '%s'" % exc self._dbcx.commit() print "%s (%s): Job finished." % (uid, job.package) @@ -253,8 +251,8 @@ sql = 'UPDATE jobs SET ' + sql + ' WHERE uid=%d' % uid try: self._cursor.execute(sql) - except StandardError, e: - print "DB Error: could not access jobs database. Reason: '%s'" % e + except StandardError, exc: + print "DB Error: could not access jobs database. Reason: '%s'" % exc self._dbcx.commit() def _write_archjob_status_to_db(self, uid, attrdict): @@ -266,15 +264,15 @@ "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 StandardError, e: - print "DB Error: could not access jobs database. Reason: '%s'" % e + except StandardError, exc: + print "DB Error: could not access jobs database. Reason: '%s'" % exc else: try: self._cursor.execute("UPDATE archjobs SET status='%s', builder_status='%s', endtime=%d " \ "WHERE jobid='%s' AND parent_uid=%d" % (attrdict['status'], attrdict['builder_status'], attrdict['endtime'], uid, attrdict['parent_uid'])) - except StandardError, e: - print "DB Error: could not access jobs database. Reason: '%s'" % e + except StandardError, exc: + print "DB Error: could not access jobs database. Reason: '%s'" % exc self._dbcx.commit() def _save_job_status(self): Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- Builder.py 9 May 2006 19:10:57 -0000 1.40 +++ Builder.py 14 May 2006 05:43:07 -0000 1.41 @@ -15,7 +15,6 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import time -import string import xmlrpclib import socket import os @@ -60,19 +59,27 @@ self._seq_gen = Commands.SequenceGenerator() self._lock = threading.Lock() self._cmd_queue = [] + self._suspend_listeners = [] + self._status_listeners = [] + self._ip = None + + uri, rest = urllib.splittype(address) + host, ignore = urllib.splithost(rest) + self._host, port = urllib.splitport(host) - try: - type, rest = urllib.splittype(address) - host, ignore = urllib.splithost(rest) - host, port = urllib.splitport(host) - self._ip = socket.gethostbyname(host) - except Exception, e: - print "Builder Error(%s): couldn't lookup builder's IP address." % address - raise Exception(e) + self._get_ip() threading.Thread.__init__(self) self.setName("Builder: %s" % address) + def _get_ip(self): + try: + self._ip = socket.gethostbyname(self._host) + return True + except Exception: + pass + return False + def _match_target_dict(self, td1, td2): if td1['distro'] == td2['distro']: if td1['target'] == td2['target']: @@ -81,24 +88,28 @@ return False def arches(self, target_dict): - for td in self._target_list: - if self._match_target_dict(td, target_dict): + for tdict in self._target_list: + if self._match_target_dict(tdict, target_dict): arches = [] - for arch in td['supported_arches']: + for arch in tdict['supported_arches']: if not arch in arches: arches.append(arch) return arches return None - def can_build_for_target(self, target_dict): + def can_build_arch_job(self, archjob): + target_dict = archjob.target_dict() for td in self._target_list: if self._match_target_dict(td, target_dict): - if target_dict['arch'] in td['supported_arches']: + if archjob.arch() in td['supported_arches']: return True return False def address(self): - return (self._ip, self._address) + return self._address + + def ip(self): + return self._ip def available(self): """ Is the builder responding to requests? """ @@ -123,17 +134,32 @@ pass return None + def add_suspend_listener(self, listener): + listeners = self._suspend_listeners[:] + if listener not in listeners: + self._suspend_listeners.append(listener) + + def remove_suspend_listener(self, listener): + if listener in self._suspend_listeners: + self._suspend_listeners.remove(listener) + + def _notify_suspend_listeners(self, reason, msg): + # Must copy the list since it can be modified from + # the listener during our iteration of it + listeners = self._suspend_listeners[:] + for listener in listeners: + listener.builder_suspend_cb(self, reason, msg) + del listeners + def _handle_builder_suspend(self, reason, msg): - for jobid in self._jobs.keys(): - job = self._jobs[jobid] - job.builder_gone() - del self._jobs[jobid] - self._jobs = {} self._available = False self._suspend_reason = reason self._unavail_count = 0 self._prepping_jobs = False self._when_died = time.time() + self._jobs = {} + + self._notify_suspend_listeners(reason, msg) # Notify admins print "Suspending builder '%s'. Reason: %s - %s." % (self._address, reason, msg) @@ -178,8 +204,8 @@ builder_dict['address'] = host arches = [] - for td in self._target_list: - for arch in td['supported_arches']: + for tdict in self._target_list: + for arch in tdict['supported_arches']: if not arch in arches: arches.append(arch) builder_dict['arches'] = arches @@ -197,7 +223,7 @@ (uniqid, status) = cmd.get_job(item) try: job = self._jobs[uniqid] - job.set_builder_job_status(status) + job.set_builder_status(self, status) reported_uniqids.append(uniqid) except KeyError: pass @@ -208,11 +234,10 @@ # removed from the building job list before we # were able to know that it was done. HACK self._prepping_jobs = False - for jobid in self._jobs.keys(): + for jobid, job in self._jobs.items(): # If the builder didn't report this job as building, # and its not done, explicitly get its status - job = self._jobs[jobid] - if jobid not in reported_uniqids and job.get_status() != 'done': + if jobid not in reported_uniqids and job.status() != 'done': new_cmds.append(Commands.PlgCommandJobStatus(jobid, self._seq_gen.next())) # Check for prepping jobs @@ -243,11 +268,15 @@ old_cmd = self._find_and_remove_cmd_for_ack(ack, Commands.PlgCommandNewJobReq) if old_cmd: - parent = old_cmd.parent_job() - archjob_id = ack.archjob_id() - archjob = ArchJob.ArchJob(self, parent, archjob_id, old_cmd.target_dict()) - self._jobs[archjob_id] = archjob - parent.add_arch_job(archjob) + archjob = old_cmd.archjob() + archjob_id = archjob.archjob_id() + ack_archjob_id = ack.archjob_id() + if archjob_id != ack_archjob_id: + print "Builder Error (%s): returned archjob_id (%s) " \ + "doesn't match expected (%s)." % (self._address, ack_archjob_id, archjob_id) + archjob.unclaim(self) + else: + self._jobs[archjob_id] = archjob def _handle_job_status_ack(self, ack): """Handle a job status ack by setting telling the job object @@ -258,7 +287,7 @@ archjob_id = ack.archjob_id() status = ack.status() job = self._jobs[archjob_id] - job.set_builder_job_status(status) + job.set_builder_status(self, status) def _decompose_job_files_ack(self, ack): """Handle a job files ack by finding the archjob it's for, then @@ -305,6 +334,28 @@ self._cmd_queue.append(cmd) self._lock.release() + def request_kill_for_job(self, uniqid): + cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + + def unlock_repo_for_job(self, uniqid): + """Called by an archjob to request the sending of a RepoUnlocked + command to the builder for a particular archjob.""" + + self._lock.acquire() + found = False + for cmd in self._cmd_queue: + if isinstance(cmd, Commands.PlgCommandUnlockRepo): + if cmd.archjob_id() == uniqid: + found = True + break + if not found: + cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) + self._cmd_queue.append(cmd) + self._lock.release() + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt @@ -326,8 +377,8 @@ (jobs, free_slots) = self._server.building_jobs() except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): self.failed = True - except xmlrpclib.Fault, e: - print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self._address, e) + except xmlrpclib.Fault, exc: + print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self._address, exc) self.failed = True self.jobs = jobs self.free_slots = free_slots @@ -374,14 +425,13 @@ alive = True except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): alive = False - except xmlrpclib.Fault, e: - print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, e) + except xmlrpclib.Fault, exc: + print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, exc) alive = False return (alive, target_list) def _init_builder(self, target_list): self._target_list = target_list - # Kill any jobs currently running on the builder jobs = self._building_jobs() for jobid in jobs.keys(): @@ -398,8 +448,8 @@ num_slots = self._server.num_slots() except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): pass - except xmlrpclib.Fault, e: - print "Builder Error (%s) in _get_num_slots(): builder replied '%s'" % (self._address, e) + except xmlrpclib.Fault, exc: + print "Builder Error (%s) in _get_num_slots(): builder replied '%s'" % (self._address, exc) return num_slots def _building_jobs(self): @@ -444,26 +494,29 @@ self._ping_timeout = 0 self._init_builder(target_list) - def start_job(self, par_job, target_dict, srpm_url): + def start_job(self, req): if not self.available(): raise RuntimeError - if not self.can_build_for_target(target_dict): + if not self.can_build_request(req): raise RuntimeError self._server_lock.acquire() try: # Builder will return jobid of 0 if it can't start the job for some reason - jobid = self._server.start_new_job(target_dict, srpm_url) + srpm_url = req.srpm_url() + target_dict = req.target_dict() + jobid = self._server.start_new_job(target_dict, req.srpm_url()) except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, \ - OpenSSL.SSL.Error, xmlrpclib.ProtocolError, xmlrpclib.Fault), e: - error_class = str(e.__class__) - error_string = str(e) + OpenSSL.SSL.Error, xmlrpclib.ProtocolError, xmlrpclib.Fault), exc: + error_class = str(exc.__class__) + error_string = str(exc) jobarch = target_dict['arch'] - print "%s (%s/%s): %s exception '%s' starting job on %s" % (par_job.uid, \ - par_job.package, jobarch, error_class, error_string, \ + parent = req.parent() + print "%s (%s/%s): %s exception '%s' starting job on %s" % (parent.uid, \ + parent.package, jobarch, error_class, error_string, \ self._address) # Check for hard errors, for which we suspend the builder - if string.find(error_string, "OSError") >= 0 and string.find(error_string, "Errno") >= 0: + if error_string.find("OSError") >= 0 and error_string.find("Errno") >= 0: self._handle_builder_suspend(SUSPEND_HARD_ERROR, error_string) time.sleep(0.5) jobid = 0 @@ -472,7 +525,7 @@ self._server_lock.release() raise RuntimeError - job = ArchJob.ArchJob(self, self._server_cfg, self._server, par_job, jobid, target_dict) + job = ArchJob.ArchJob(self, self._server_cfg, self._server, parent, jobid, target_dict) self._jobs[jobid] = job self._update_building_jobs() self._server_lock.release() @@ -488,7 +541,7 @@ try: job = self._jobs[jobid] status = jobs[jobid] - job.set_builder_job_status(status) + job.set_builder_status(self, status) builder_jobs.append(jobid) except KeyError: pass @@ -503,10 +556,10 @@ # If the builder didn't report this job as building, # and its not done, explicitly grab its status job = self._jobs[jobid] - if jobid not in builder_jobs and job.get_status() != 'done': + if jobid not in builder_jobs and job.status() != 'done': status = self._get_builder_job_status(jobid) if status: - job.set_builder_job_status(status) + job.set_builder_status(self, status) # Check for prepping jobs if job.prepping(): @@ -573,22 +626,6 @@ def _init_builder(self, target_list): self._target_list = target_list - def unlock_repo_for_job(self, uniqid): - """Called by an archjob to request the sending of a RepoUnlocked - command to the builder for a particular archjob.""" - - self._lock.acquire() - found = False - for cmd in self._cmd_queue: - if isinstance(cmd, Commands.PlgCommandUnlockRepo): - if cmd.archjob_id() == uniqid: - found = True - break - if not found: - cmd = Commands.PlgCommandUnlockRepo(uniqid, self._seq_gen.next()) - self._cmd_queue.append(cmd) - self._lock.release() - def _handle_job_files_ack(self, cmd): (archjob, urls) = self._decompose_job_files_ack(cmd) if not archjob: @@ -644,10 +681,10 @@ # Grab some work for the builder if any is available new_cmds = [] if self._free_slots > 0: - req = self._manager.claim_arch_job(self) - if req: + archjob = self._manager.claim_arch_job(self) + if archjob: next_seq = self._seq_gen.next() - cmd = Commands.PlgCommandNewJobReq(req['parent'], req['target_dict'], req['srpm_url'], next_seq) + cmd = Commands.PlgCommandNewJobReq(archjob, seq=next_seq) new_cmds.append(cmd) self._lock.acquire() @@ -667,6 +704,11 @@ self._lock.release() return cmd_list + def ip(self): + if not self._ip: + self._get_ip() + return Builder.ip(self) + _SLEEP_INTERVAL = 10 def run(self): """Main builder loop. Since the builder contacts us, @@ -675,28 +717,24 @@ DebugUtils.registerThreadName(self) while not self._stop: - if not self._available: - time.sleep(self._SLEEP_INTERVAL) - continue - - process_jobs = True - self._lock.acquire() - if self._unavail_count > 2: - self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") - process_jobs = False - elif self._last_contact + self._REQUIRED_CONTACT_INTERVAL < time.time(): - self._unavail_count = self._unavail_count + 1 - self._lock.release() - - if process_jobs: - for j in self._jobs.values(): - j.process() + if self._available: + self._lock.acquire() + if self._unavail_count > 2: + self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") + elif self._last_contact + self._REQUIRED_CONTACT_INTERVAL < time.time(): + self._unavail_count = self._unavail_count + 1 + self._lock.release() time.sleep(self._SLEEP_INTERVAL) def _handle_builder_suspend(self, reason, msg): Builder._handle_builder_suspend(self, reason, msg) self._last_contact = 0 + self._ip = None + + # Clear out the command queue; we start clean when the + # builder contacts us again + self._cmd_queue = [] def _handle_builder_reactivate(self, cmd_list): # Grab an updated target list from the command stream when @@ -705,6 +743,14 @@ for cmd in cmd_list: if isinstance(cmd, Commands.PlgCommandTargets): target_list = cmd.targets() + elif isinstance(cmd, Commands.PlgCommandBuildingJobs): + # Tell the builder to kill all jobs it might be building + # right now. Think server restart here. + for item in cmd.jobs(): + (uniqid, status) = cmd.get_job(item) + cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) + self._cmd_queue.append(cmd) + if not target_list: target_list = self._target_list Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- BuilderManager.py 9 May 2006 19:10:57 -0000 1.24 +++ BuilderManager.py 14 May 2006 05:43:07 -0000 1.25 @@ -15,34 +15,31 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import time -import string -import xmlrpclib -import sys import socket import os import threading import Builder -import EmailUtils -import Config -import time from plague import DebugUtils from plague import AuthedXMLRPCServer from plague import HTTPServer from plague import Commands +import ArchJob class AddrCache(object): + _ENTRY_EXPIRE_TIME = 3600 + def __init__(self): self._cache = {} def get(self, name): # Expire cache entry if one exists and is old - time = ip = None + ip = None try: - (time, ip) = self._cache[name] - if time < time.time() - (60 * 60): + (itime, ip) = self._cache[name] + if itime < time.time() - self._ENTRY_EXPIRE_TIME: del self._cache[name] - time = ip = None + itime = ip = None except KeyError: pass @@ -127,14 +124,18 @@ hostname = cfg.get_str("General", "hostname") port = cfg.get_int("Active Builders", "xmlrpc_server_port") - if cfg.get_bool("Builders", "use_ssl") == True: - certs = {} - certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") - certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._server = AuthedSSLBuilderServer((hostname, port), certs, self._bm) - else: - self._server = AuthedBuilderServer((hostname, port), self._bm) + try: + if cfg.get_bool("Builders", "use_ssl") == True: + certs = {} + certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") + certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") + certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") + self._server = AuthedSSLBuilderServer((hostname, port), certs, self._bm) + else: + self._server = AuthedBuilderServer((hostname, port), self._bm) + except socket.gaierror, exc: + raise socket.gaierror(exc[0], "Couldn't bind to address %s:%d (%s)" % (hostname, + port, exc[1])) self._dispatcher = BuilderDispatcher() self._server.register_instance(self._dispatcher) @@ -145,10 +146,10 @@ def stop(self): self._server.stop() - t = time.time() + tm = time.time() while not self._stopped: try: - if time.time() > t + 2: + if time.time() > tm + 2: break except KeyboardInterrupt: pass @@ -163,7 +164,6 @@ self._builders = [] any_active = self._load_builders() - self._print_builders() self._queue_lock = threading.Lock() self._queue = [] @@ -190,10 +190,12 @@ self._fileserver.set_POST_handler('/upload', self.upload_callback) self._fileserver.start() + self._print_builders() + def upload_callback(self, request_handler, fs): # Ensure we know this builder - addr = request_handler.client_address[0] - builder = self.get_builder(addr, addr) + ip = request_handler.client_address[0] + builder = self.get_builder(ip, ip) if not builder: request_handler.send_error(403, "Unauthorized") return @@ -236,7 +238,7 @@ print "\nAuthorized Builders:" print "-" * 90 for builder in self._builders: - (ip, addr) = builder.address() + addr = builder.address() string = " " + addr string = string + " " * (40 - len(addr)) builder_dict = builder.to_dict() @@ -269,7 +271,7 @@ # If the address is already in our _builders list, skip it skip = False for builder in self._builders: - (ip, addr) = builder.address() + addr = builder.address() if address == addr: skip = True break @@ -301,21 +303,23 @@ return builder_list def get_builder(self, cert_ip, con_ip): + """Return the Builder object, if any, that matches the specified + IP address. Performs basic checking on the address too.""" self._builders_lock.acquire() - builder = None + ret_builder = None # Ensure builder's certificate (if SSL) and # the remote address of its connection are the same if cert_ip == con_ip: # Find matching builder in our authorized builders list - for b in self._builders: - (ip, addr) = b.address() - if cert_ip == ip: - builder = b + for builder in self._builders: + ip = builder.ip() + if ip and cert_ip == ip: + ret_builder = builder break self._builders_lock.release() - return builder + return ret_builder def _builder_cmp_func(self, builder1, builder2): # If both builders have at least one free slot, sort on @@ -341,29 +345,36 @@ return 1 def claim_arch_job(self, builder): + """Called by a Builder instance to find a job for the builder to build.""" archjob = None self._queue_lock.acquire() - for req in self._queue: - if builder.can_build_for_target(req['target_dict']): - self._queue.remove(req) - archjob = req + + # First pass: look for orphaned jobs + for job in self._queue: + if job.status() != ArchJob.AJ_STATUS_QUEUED: + continue + if job.orphaned() and builder.can_build_arch_job(job): + job.claim(builder) + archjob = job break + + # Second pass: just pick any job + if not archjob: + for job in self._queue: + if job.status() != ArchJob.AJ_STATUS_QUEUED: + continue + if builder.can_build_arch_job(job): + job.claim(builder) + archjob = job + break + self._queue_lock.release() return archjob - def request_arch_job(self, par_job, target_dict, srpm_url, orphaned): - req = {} - req['parent'] = par_job - req['target_dict'] = target_dict - req['srpm_url'] = srpm_url - req['time_queued'] = time.time() - + def request_arch_job(self, archjob): + """Called by the PackageJob instance to queue new arch-specific build jobs.""" self._queue_lock.acquire() - if orphaned: - # insert orphaned requests at the front of the queue - self._queue.insert(0, req) - else: - self._queue.append(req) + self._queue.append(archjob) self._queue_lock.release() def any_prepping_builders(self): @@ -373,4 +384,3 @@ return True return False - Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- PackageJob.py 11 May 2006 14:46:37 -0000 1.49 +++ PackageJob.py 14 May 2006 05:43:07 -0000 1.50 @@ -27,9 +27,6 @@ import copy import string import EmailUtils -import xmlrpclib -import socket -import BuilderManager import ArchJob from plague import ArchUtils from plague import DebugUtils @@ -47,9 +44,6 @@ if DEBUG: print stuff -def log(stuff=''): - print stuff - class PrepError(exceptions.Exception): pass class DepError(exceptions.Exception): pass @@ -72,6 +66,7 @@ "build" stage. This class provides the actual running thread. """ def __init__(self, pkg_job, start_stage, end_stage): + self._stop = False self._pkg_job = pkg_job if not end_stage: end_stage = 'aaaaa' @@ -82,9 +77,11 @@ def run(self): DebugUtils.registerThreadName(self) - while not self._pkg_job.is_done() and not self._pkg_job.cur_stage() == self._end_stage: + while not self._stop and not self._pkg_job.is_done() and not self._pkg_job.cur_stage() == self._end_stage: self._pkg_job.process() + def stop(self): + self._stop = True def is_package_job_stage_valid(stage): """ Validate a job stage """ @@ -118,9 +115,9 @@ def make_job_log_url(base_url, target_str, uid, name, ver, release): if target_str and uid and name and ver and release: if base_url.endswith('/'): - slash='' + slash = '' else: - slash='/' + slash = '/' return "%s%s%s/%s-%s-%s-%s/" % (base_url, slash, target_str, uid, name, ver, release) return None @@ -158,9 +155,10 @@ self._depsolve_dir = None self._last_depsolve_error = None self._depsolve_first_try = False + self._checkout_tmpdir = None self.repofiles = {} - self.archjobs = {} + self._archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() self._killer = None @@ -175,6 +173,12 @@ pjc = PackageJobController(self, first_stage, 'waiting') pjc.start() + def log(self, arch=None, msg=None): + archstring = "" + if arch: + archstring = "/%s" % arch + print "%s (%s%s): %s" % (self.uid, self.package, archstring, msg) + def cur_stage(self): return self._curstage @@ -374,7 +378,7 @@ for line in lines: if line.find('..........') == -1 and len(line) > 0: output_lines.append(line) - o = string.join(output_lines, '\n') + o = string.join(output_lines, ('\n')) msg = "Error: could not make srpm for %s - output was:\n\n%s" % (self._source, o) raise PrepError(msg) @@ -413,11 +417,11 @@ self.epoch = '0' self.ver = hdr['version'] self.release = hdr['release'] - (self.archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr) + (self._archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr) del hdr del ts - if len(self.archjobs) == 0: + if len(self._archjobs) == 0: msg = """Package %s does not build on any architectures this build system supports. Package: %s Build System: %s @@ -426,7 +430,7 @@ if self._server_cfg.get_bool("General", "depsolve_jobs"): self._set_cur_stage('depsolve_wait') - log("%s (%s): Requesting depsolve..." % (self.uid, self.package)) + self.log(msg="Requesting depsolve...") self._repo.request_depsolve(self, first_try=True) return True # sleep until the Repo wakes us up for depsolve else: @@ -445,9 +449,9 @@ config_lines = [] job_yum_dir = os.path.join(self._depsolve_dir, arch) for line in config_opts['yum.conf'].split('\n'): - if string.find(line, "cachedir=") >= 0: + if line.find("cachedir=") >= 0: line = "cachedir=cache" - elif string.find(line, "logfile=") >= 0: + elif line.find("logfile=") >= 0: line = "logfile=yum.log" config_lines.append(line+'\n') del config_opts @@ -483,8 +487,8 @@ base.log = Logger(threshold=threshold, file_object=sys.stdout) try: base.doRepoSetup() - except yum.Errors.RepoError, e: - raise DepError(str(e)) + except yum.Errors.RepoError, exc: + raise DepError(str(exc)) archlist = ['src', 'noarch'] if ArchUtils.supported_arches.has_key(arch): @@ -495,27 +499,27 @@ ts = rpmUtils.transaction.initReadOnlyTransaction() try: srpm = yum.packages.YumLocalPackage(ts, self._srpm_path) - except yum.Errors.MiscError, e: + except yum.Errors.MiscError, exc: del ts - raise DepError(str(e)) + raise DepError(str(exc)) del ts try: base.doSackSetup(archlist) - except yum.Errors.RepoError, e: - raise DepError(str(e)) + except yum.Errors.RepoError, exc: + raise DepError(str(exc)) for dep in srpm.requiresList(): if dep.startswith("rpmlib("): continue try: pkg = base.returnPackageByDep(dep) - except repomd.mdErrors.PackageSackError, e: - raise DepError(str(e)) - except yum.Errors.YumBaseError, e: - raise DepError(str(e)) - except DepError, e: - self._last_depsolve_error = str(e) - print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(e)) + except repomd.mdErrors.PackageSackError, exc: + raise DepError(str(exc)) + except yum.Errors.YumBaseError, exc: + raise DepError(str(exc)) + except DepError, exc: + self._last_depsolve_error = str(exc) + print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(exc)) success = False if base: @@ -530,8 +534,8 @@ self.wake() def _stage_depsolve(self): - """ Depsolve all arches, only if all pass do we proceed """ - """ to queue up the actual archjobs for building """ + """Depsolve all arches, only if all pass do we proceed + to queue up the actual archjobs for building.""" # If the job's waited more than 8 hours for deps to be # solved, kill the job and make some human figure it out @@ -551,18 +555,18 @@ self._archjobs_lock.acquire() unsolved_deps = False - archlist = self.archjobs.keys() + archlist = self._archjobs.keys() # noarch jobs are a bit special here. Since we don't know # what arch they will actually build on, we have to make # sure all arches the target supports will work - if len(self.archjobs.keys()) == 1 and self.archjobs.keys()[0] == 'noarch': + if len(self._archjobs.keys()) == 1 and self._archjobs.keys()[0] == 'noarch': archlist = self._target_cfg.basearches() for arch in self._target_cfg.optarches(): if arch not in archlist: archlist.append(arch) - log("%s (%s): Starting depsolve for arches: %s." % (self.uid, self.package, archlist)) + self.log(msg="Starting depsolve for arches: %s." % archlist) failed_arch = None for arch in archlist: @@ -588,10 +592,10 @@ # Go to sleep until the repo changes self._set_cur_stage('depsolve_wait') self._repo.request_depsolve(self, first_try=False) - log("%s (%s): Finished depsolve (unsuccessful), trying again later." % (self.uid, self.package)) + self.log(msg="Finished depsolve (unsuccessful), trying again later.") return True - log("%s (%s): Finished depsolve (successful), requesting archjobs." % (self.uid, self.package)) + self.log(msg="Finished depsolve (successful), requesting archjobs.") # Success, all deps are solved. Kill the depsolve dir shutil.rmtree(self._depsolve_dir, ignore_errors=True) @@ -603,7 +607,7 @@ # Make some directories we need work_dir = self._server_cfg.get_str("Directories", "server_work_dir") self._result_dir = self._make_stage_dir(work_dir) - for arch in self.archjobs.keys(): + for arch in self._archjobs.keys(): thisdir = os.path.join(self._result_dir, arch) if not os.path.exists(thisdir): os.makedirs(thisdir) @@ -620,7 +624,7 @@ # Queue up archjobs self._set_cur_stage('waiting') - self._request_arch_jobs() + self._create_arch_jobs() return False def _stage_depsolve_wait(self): @@ -636,58 +640,34 @@ os.makedirs(stage_dir) return stage_dir - def _request_one_arch_job(self, arch, orphaned): - # Construct SPRM URL - srpm_http_base = self._srpm_http_path[len(self.http_dir):] - method = "http" - if self._server_cfg.get_bool("Builders", "use_ssl") == True: - method = "https" - hostname = self._server_cfg.get_str("General", "hostname") - port = self._server_cfg.get_int("Active Builders", "file_server_port") - srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base) - target_dict = self._target_cfg.target_dict(arch) - self.bm.builder_manager.request_arch_job(self, target_dict, srpm_url, orphaned) - - def _request_arch_jobs(self): - # Queue requests for build jobs + def _create_arch_jobs(self): self._archjobs_lock.acquire() - for arch in self.archjobs.keys(): - if self.archjobs[arch]: - continue - self._request_one_arch_job(arch, False) + for arch in self._archjobs.keys(): + # Construct the SRPM URL + srpm_http_base = self._srpm_http_path[len(self.http_dir):] + method = "http" + if self._server_cfg.get_bool("Builders", "use_ssl") == True: + method = "https" + hostname = self._server_cfg.get_str("General", "hostname") + port = self._server_cfg.get_int("Active Builders", "file_server_port") + srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base) + + # Create and queue the archjob + target_dict = self._target_cfg.target_dict(arch) + archjob = ArchJob.ArchJob(self, target_dict, srpm_url) + self._archjobs[arch] = archjob + self.bm.builder_manager.request_arch_job(archjob) 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() - jobarch = job.arch() - if self.archjobs[jobarch] != None: - log("%s (%s/%s): Already have archjob for this arch (%s). New job UID is %s." % (self.uid, \ - self.package, jobarch, self.archjobs[jobarch].jobid, job.jobid)) - self.archjobs[jobarch] = job - + def archjob_started_cb(self, archjob): # 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() - # Only want hostname, not both IP and hostname - addr = job.builder().address()[1] - log("%s (%s/%s): %s - UID is %s" % (self.uid, self.package, jobarch, addr, job.jobid)) - - def remove_arch_job(self, job): - """ Removes an arch job when its builder is no longer responding """ - self._archjobs_lock.acquire() - jobarch = job.arch() - log("%s (%s/%s): Builder disappeared. Requeuing arch..." % (self.uid, self.package, jobarch)) - self.archjobs[jobarch] = None - self._request_one_arch_job(jobarch, True) - self._archjobs_lock.release() - def is_done(self): - if self._curstage == 'needsign' or self._curstage == 'failed' or self._curstage == 'finished': + if self._curstage in ['needsign', 'failed', 'finished']: return True return False @@ -695,8 +675,7 @@ self._killer = username self._die = True - log("%s (%s): Job kill request from %s" % (self.uid, self.package, username)) - self._archjobs_lock.acquire() + self.log(msg="Job kill request from %s" % username) if self._curstage == 'waiting': # In 'waiting' stage, we have no controller thread. So to get # the job killed immediately, we have to start one @@ -705,14 +684,14 @@ else: # Otherwise, wake up the existing controller thread self.wake() - self._archjobs_lock.release() def _handle_death(self): - resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self._target_str, self._killer) + result_start = "%s (%s): " % (self.uid, self.name) + resultstring = "Build on target %s was killed by %s." % (self._target_str, self._killer) self._result = 'killed' self._set_cur_stage('finished', resultstring) - self.email_result(self.username, resultstring) - log(resultstring) + self.email_result(self.username, result_start + resultstring) + self.log(msg=resultstring) # Kill any building jobs self._kill_all_archjobs(True) @@ -726,19 +705,14 @@ def _kill_all_archjobs(self, user_requested=False): self._archjobs_lock.acquire() - for job in self.archjobs.values(): - if job: - job.die(user_requested) - self.archjobs = {} + for job in self._archjobs.values(): + job.die(user_requested) self._archjobs_lock.release() def wake(self): self._event.set() def process(self): - if self.is_done(): - return - if self._die: self._handle_death() return @@ -750,24 +724,24 @@ while not self._event.isSet(): self._event.wait() self._event.clear() - except PrepError, e: + except PrepError, exc: if self.use_cvs == True: shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) - msg = str(e) + msg = str(exc) subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str) self.email_result(self.username, resultstring=msg, subject=subj) self._stage_failed(msg) - except DepError, e: - msg = str(e) + except DepError, exc: + msg = str(exc) subj = 'Dependencies Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str) self.email_result(self.username, resultstring=msg, subject=subj) self._stage_failed(msg) - except BuildError, e: + except BuildError, exc: subj = 'Build Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str) base_url = self._server_cfg.get_str("UI", "log_url") log_url = make_job_log_url(base_url, self._target_str, 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 Build logs may be found at %s\n\n" % (exc.msg, log_url) + logtail = self._get_log_tail(exc.arch) msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail) self.email_result(self.username, resultstring=msg, subject=subj) @@ -776,44 +750,46 @@ if self._target_cfg.testing() == False: # Kill remaining jobs on other arches self._kill_all_archjobs(False) - self._stage_failed(e.msg) + self._stage_failed(exc.msg) def _stage_building(self): - # Count failed and completed jobs completed_jobs = 0 failed_jobs = 0 self._archjobs_lock.acquire() - for job in self.archjobs.values(): - if not job: - continue - if job.get_status() is 'done': - completed_jobs = completed_jobs + 1 - - if job.builder_failed() or job.download_failed() or job.internal_failure(): - failed_jobs = failed_jobs + 1 + for job in self._archjobs.values(): + # If the archjob is running, give it some time + if job.status() is not ArchJob.AJ_STATUS_DONE: + job.process() - # Normal jobs will just stop when a single archjob fails, but - # testing targets don't kill the build when one fails. However, - # even for testing targets, we still want to notify the user if - # a particular arch fails. - if not job.failure_noticed(): - job.set_failure_noticed() - jobarch = job.arch() - msg = "Job failed." - if job.builder_failed(): - msg = "Job failed on arch %s\n" % jobarch - elif job.download_failed(): - msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \ - "Please contact the build system administrator." % (jobarch, job.builder().address()) - elif job.internal_failure(): - msg = "Job failed on arch %s: there was an internal build system failure.\n " \ - "Please contact the build system administrator." % jobarch - self._archjobs_lock.release() - raise BuildError(msg, jobarch) + # If the archjob is still running, go to next archjob + if job.status() is not ArchJob.AJ_STATUS_DONE: + continue + completed_jobs = completed_jobs + 1 + if job.builder_failed() or job.download_failed() or job.internal_failure(): + failed_jobs = failed_jobs + 1 + + # Normal jobs will just stop when a single archjob fails, but + # testing targets don't kill the build when one fails. However, + # even for testing targets, we still want to notify the user if + # a particular arch fails. + if not job.failure_noticed(): + job.set_failure_noticed() + jobarch = job.arch() + msg = "Job failed." + if job.builder_failed(): + msg = "Job failed on arch %s\n" % jobarch + elif job.download_failed(): + msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \ + "Please contact the build system administrator." % (jobarch, job.builder().address()) + elif job.internal_failure(): + msg = "Job failed on arch %s: there was an internal build system failure.\n " \ + "Please contact the build system administrator." % jobarch + self._archjobs_lock.release() + raise BuildError(msg, jobarch) self._archjobs_lock.release() - if completed_jobs == len(self.archjobs): + if completed_jobs == len(self._archjobs): # Testing targets don't contribute packages to the repo if self._target_cfg.testing() == True: if failed_jobs > 0: @@ -824,7 +800,8 @@ self._set_cur_stage('add_to_repo') return False # Don't want to wait - return True + time.sleep(5) + return False def get_stage_dir(self): return self._result_dir @@ -848,9 +825,7 @@ srpm_file = os.path.join(self._result_dir, os.path.basename(self._srpm_http_path)) # Delete any RPMs in the arch dirs - for job in self.archjobs.values(): - if not job: - continue + for job in self._archjobs.values(): job_result_dir = job.get_result_files_dir() for f in job.get_files(): if not f.endswith(".rpm"): @@ -874,9 +849,7 @@ # Create a list of files that the repo should copy to # the repo dir repo_dir = self._server_cfg.get_str("Directories", "repo_dir") - for job in self.archjobs.values(): - if not job: - continue + for job in self._archjobs.values(): job_result_dir = job.get_result_files_dir() for f in job.get_files(): if not f.endswith(".rpm"): Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- main.py 28 Apr 2006 03:17:41 -0000 1.21 +++ main.py 14 May 2006 05:43:07 -0000 1.22 @@ -91,7 +91,7 @@ ret=daemonize.createDaemon() if ret: print "Daemonizing failed!" - sys.exit(2) + os._exit(2) if opts.pidfile: open(opts.pidfile, 'w').write('%d\n' % os.getpid()) @@ -107,7 +107,7 @@ cfg.load_target_configs() if len(cfg.targets()) == 0: print "You need at least one target to do anything useful." - sys.exit(3) + os._exit(3) hostname = cfg.get_str("General", "hostname") @@ -125,7 +125,11 @@ dbm = DBManager.DBManager(cfg) # Create the BuildMaster thread - builder_manager = BuilderManager.BuilderManager(cfg) + try: + builder_manager = BuilderManager.BuilderManager(cfg) + except Exception, exc: + print "Couldn't create BuilderManager: %s" % exc + os._exit(4) bm = BuildMaster.BuildMaster(builder_manager, dbm, cfg) bm.start() @@ -143,10 +147,10 @@ else: ui = UserInterfaceNoAuth(builder_manager, bm, dbm, cfg) bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port)) - except socket.error, e: - if e[0] == 98: # Address already in use + except socket.error, exc: + if exc[0] == 98: # Address already in use print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, port) - os._exit(1) + os._exit(4) bm_server.register_instance(ui) # Create dummy thread just to register main thread's name From fedora-extras-commits at redhat.com Sun May 14 05:43:08 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 13 May 2006 22:43:08 -0700 Subject: extras-buildsys/builder Builder.py, 1.10, 1.11 BuilderMock.py, 1.5, 1.6 main.py, 1.2, 1.3 Message-ID: <200605140543.k4E5h8YT003036@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2964/builder Modified Files: Builder.py BuilderMock.py main.py Log Message: 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning PackageJob object, and only one is spawned for the lifetime of the PackageJob for each architecture (previously one was spawned for each individual build job on the builder). Archjob UIDs are generated on the server now rather than the builder. * Correctly handle builders going away before they've had a chance to notify the server that they have started an archjob. Previously, these jobs would just be lost. This is the real reason for the rework of the archjob handling above. * On the builder, don't use die() to end jobs that have failed; do it properly and upload files to the server if we weren't killed * Deal with active builders whose hostnames can't be resolved when the server starts * Kill any existing jobs on builders when the server starts up * Consolidate and simplify logging functions in PackageJob * More pylint-induced cleanups 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 12 May 2006 04:10:46 -0000 1.10 +++ Builder.py 14 May 2006 05:43:06 -0000 1.11 @@ -46,7 +46,7 @@ return '' return socket.gethostname() -def determine_max_jobs(cfg): +def determine_max_jobs(): """ Simple max job calculator based on number of CPUs """ import commands @@ -65,7 +65,7 @@ """ Abstract builder base object """ def __init__(self, cfg): self._cfg = cfg - self._max_slots = determine_max_jobs(cfg) + self._max_slots = determine_max_jobs() self._seq_gen = Commands.SequenceGenerator() self._building_jobs_lock = threading.Lock() @@ -162,7 +162,7 @@ return target_cfg - def _new_job_for_arch(self, target_cfg, buildarch, srpm_url): + def _new_job_for_arch(self, target_cfg, buildarch, srpm_url, uniqid): """Creates a new mock build job given a particular build architecture.""" if buildarch != 'noarch' and not BuilderMock.BuilderClassDict.has_key(buildarch): @@ -177,30 +177,31 @@ builder_class = BuilderMock.BuilderClassDict[buildarch] # We'll throw a TypeError here if there's no available builder_class for this arch - return builder_class(self, target_cfg, buildarch, srpm_url) + return builder_class(self, target_cfg, buildarch, srpm_url, uniqid) - def _start_new_job(self, target_dict, srpm_url): + def _start_new_job(self, cmd): + target_dict = cmd.target_dict() + srpm_url = cmd.srpm_url() + uniqid = cmd.archjob_id() target_str = Config.make_target_string(target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo']) - uniqid = -1 msg = "Success" (free_slots, max_slots) = self.slots() if free_slots <= 0: msg = "Error: Tried to build '%s' on target %s when already building" \ " maximum (%d) jobs" % (srpm_url, target_str, max_slots) self._log(msg) - return (uniqid, msg) + return (-1, msg) target_cfg = self._get_target_cfg(target_dict) if not target_cfg: msg = "Error: Tried to build '%s' on target %s which isn't supported" % (srpm_url, target_str) self._log(msg) - return (uniqid, msg) + return (-1, msg) archjob = None try: - archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], srpm_url) - uniqid = archjob.uniqid() + archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], srpm_url, uniqid) self._all_jobs[uniqid] = archjob self._building_jobs_lock.acquire() self._building_jobs.append(archjob) @@ -259,9 +260,9 @@ self._building_jobs = [] self._cfg = cfg - def _log(self, string): + def _log(self, msg): if self._cfg.get_bool("General", "debug"): - print string + print msg def die(self, uniqid): try: @@ -526,7 +527,7 @@ """Process a single command from the server.""" if isinstance(cmd, Commands.PlgCommandNewJobReq): - (uniqid, msg) = self._start_new_job(cmd.target_dict(), cmd.srpm_url()) + (uniqid, msg) = self._start_new_job(cmd) ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) self._queued_cmds.append(ack) elif isinstance(cmd, Commands.PlgCommandUnlockRepo): Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BuilderMock.py 11 May 2006 15:43:39 -0000 1.5 +++ BuilderMock.py 14 May 2006 05:43:06 -0000 1.6 @@ -26,8 +26,8 @@ import urllib import errno import exceptions -import sha import time +import Builder from plague import ExecUtils from plague import FileDownloader @@ -47,27 +47,22 @@ method = "https://" else: method = "http://" - hostname = get_hostname(cfg, False) + hostname = Builder.get_hostname(cfg, False) full_url = "%s%s:%s/%s" % (method, hostname, port, file_part) return urllib.quote(full_url) -def _generate_uniqid(target_str, srpm_url): - sha_hash = sha.new() - sha_hash.update('%d %s %s' % (time.time(), target_str, srpm_url)) - return sha_hash.hexdigest() - class BuilderMock(threading.Thread): """puts things together for an arch - baseclass for handling builds for other arches""" - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self._controller = controller self._buildarch = buildarch self._starttime = time.time() self._endtime = 0 self._mockstarttime = 0 - self._uniqid = _generate_uniqid(str(target_cfg), srpm_url) + self._uniqid = uniqid self._status = 'init' self._die = False self._repo_locked = True @@ -131,14 +126,14 @@ try: # Kill all members of the child's process group os.kill(child_pgroup, 9) - except OSError, e: - self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e)) + except OSError, exc: + self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, exc)) else: # Ensure child process is reaped self._log("Waiting for mock process %d to exit...\n" % self._childpid) try: (pid, status) = os.waitpid(self._childpid, 0) - except OSError, e: + except OSError: pass self._log("Mock process %d exited.\n" % self._childpid) self._childpid = 0 @@ -261,8 +256,8 @@ try: f.seek(0, 0) mockstat = f.read(4) - except OSError, e: - if e.errno == errno.EAGAIN: + except OSError, exc: + if exc.errno == errno.EAGAIN: try: time.sleep(0.25) except KeyboardInterrupt: @@ -299,8 +294,9 @@ # If job was cancelled, just return if self.is_done_status(): return - self._status = 'failed' + self._done_status = 'failed' self._log("ERROR: Failed to retrieve %s.\n" % url) + self._post_cleanup() elif dl_status == FileTransfer.FT_RESULT_CANCELED: # Ignore cancelation pass @@ -313,10 +309,11 @@ try: self._downloader = self._controller.download_srpm(self._srpm_url, target_dir, self.dl_callback, self._srpm_url) - except FileDownloader.FileNameException, e: - self._status = 'failed' - self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (e, self._srpm_url)) - + except FileDownloader.FileNameException, exc: + self._done_status = 'failed' + self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (exc, self._srpm_url)) + self._post_cleanup() + def _status_downloading(self): pass @@ -334,8 +331,9 @@ # Kill a job in 'downloaded' state after 30 minutes because # it's likely orphaned if time.time() > (self._repo_wait_start + (60 * 30)): + self._done_status = 'failed' self._log("Job waited too long for repo to unlock. Killing it...\n") - self.die() + self._post_cleanup() def _watch_mock(self, good_exit, bad_exit): (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG) @@ -364,8 +362,9 @@ # something is wrong if mock takes more than 15s to write the status file if time.time() > self._mockstarttime + 15: self._mockstarttime = 0 + self._done_status = 'failed' self._log("ERROR: Timed out waiting for the mock status file! %s\n" % mockstatusfile) - self.die() + self._post_cleanup() else: if not self._mock_config and self._mock_is_prepping(): self._mock_config = self._read_mock_config() @@ -400,15 +399,23 @@ try: self._log("Waiting for child process %d to exit.\n" % self._childpid) (pid, status) = os.waitpid(self._childpid, 0) - except OSError, e: + except OSError: self._childpid = 0 pass - self._copy_mock_output_to_log() - self._files = self._find_files() - self._uploader = self._controller.upload_files(self._uniqid, self._files, - self.ul_callback, None) - self._status = "uploading" + if self._done_status is not 'killed': + self._copy_mock_output_to_log() + + self._post_cleanup() + + def _post_cleanup(self): + if self._done_status is not 'killed': + self._files = self._find_files() + self._uploader = self._controller.upload_files(self._uniqid, self._files, + self.ul_callback, None) + self._status = "uploading" + else: + self._status = self._done_status def ul_callback(self, status, cb_data, msg): if status == FileTransfer.FT_RESULT_SUCCESS: @@ -450,9 +457,10 @@ try: srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm']) self._srpm_path = os.path.join(self._work_dir, self._uniqid, "source", srpm_filename) - except FileDownloader.FileNameException, e: - self._log("ERROR: SRPM file name was invalid. Message: '%s'\n" % e) - self._status = 'failed' + except FileDownloader.FileNameException, exc: + self._done_status = 'failed' + self._log("ERROR: SRPM file name was invalid. Message: '%s'\n" % exc) + self._post_cleanup() # Main build job work loop while not self.is_done_status(): @@ -463,8 +471,9 @@ try: func = getattr(self, "_status_%s" % self._status) except AttributeError: + self._done_status = 'failed' self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'.\n" % self._status) - self._status = 'failed' + self._post_cleanup() else: func() time.sleep(3) @@ -524,34 +533,34 @@ class InvalidTargetError(exceptions.Exception): pass class i386Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '/usr/bin/setarch i686' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class x86_64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class PPCArch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '/usr/bin/setarch ppc32' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class PPC64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class SparcArch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '/usr/bin/sparc32' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) class Sparc64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url): + def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): self.arch_command = '/usr/bin/sparc64' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url) + BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) BuilderClassDict = { Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/main.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main.py 10 May 2006 14:28:12 -0000 1.2 +++ main.py 14 May 2006 05:43:06 -0000 1.3 @@ -202,7 +202,10 @@ log("Shutting down...\n") builder.stop() builder.cleanup() - time.sleep(2) + try: + time.sleep(2) + except KeyboardInterrupt: + pass log(" done.\n"); sys.stdout.flush() From fedora-extras-commits at redhat.com Sun May 14 06:04:16 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 13 May 2006 23:04:16 -0700 Subject: rpms/mftrace/devel .cvsignore, 1.2, 1.3 mftrace.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605140604.k4E64IXQ006341@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6316 Modified Files: .cvsignore mftrace.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Apr 2006 00:39:02 -0000 1.2 +++ .cvsignore 14 May 2006 06:04:16 -0000 1.3 @@ -1 +1 @@ -mftrace-1.1.19.tar.gz +mftrace-1.2.4.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/mftrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mftrace.spec 26 Apr 2006 00:47:34 -0000 1.2 +++ mftrace.spec 14 May 2006 06:04:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.1.19 -Release: 3%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -46,10 +46,12 @@ %{_bindir}/* %{_mandir}/man1/%{name}* %{_datadir}/%{name} -%ghost %{_datadir}/%{name}/*.pyo %changelog +* Sat May 13 2006 Quentin Spencer 1.2.4-1 +- New upstream release. + * Tue Apr 25 2006 Quentin Spencer 1.1.19-3 - Update description Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Apr 2006 00:39:02 -0000 1.2 +++ sources 14 May 2006 06:04:16 -0000 1.3 @@ -1 +1 @@ -89d5f70cdfad6ed7be146dd1b548cec1 mftrace-1.1.19.tar.gz +8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz From fedora-extras-commits at redhat.com Sun May 14 06:12:39 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 13 May 2006 23:12:39 -0700 Subject: rpms/mftrace/FC-5 .cvsignore, 1.2, 1.3 mftrace.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605140612.k4E6Cf3e007261@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7236 Modified Files: .cvsignore mftrace.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Apr 2006 00:39:02 -0000 1.2 +++ .cvsignore 14 May 2006 06:12:39 -0000 1.3 @@ -1 +1 @@ -mftrace-1.1.19.tar.gz +mftrace-1.2.4.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/mftrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mftrace.spec 26 Apr 2006 00:47:34 -0000 1.2 +++ mftrace.spec 14 May 2006 06:12:39 -0000 1.3 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.1.19 -Release: 3%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -46,10 +46,12 @@ %{_bindir}/* %{_mandir}/man1/%{name}* %{_datadir}/%{name} -%ghost %{_datadir}/%{name}/*.pyo %changelog +* Sat May 13 2006 Quentin Spencer 1.2.4-1 +- New upstream release. + * Tue Apr 25 2006 Quentin Spencer 1.1.19-3 - Update description Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Apr 2006 00:39:02 -0000 1.2 +++ sources 14 May 2006 06:12:39 -0000 1.3 @@ -1 +1 @@ -89d5f70cdfad6ed7be146dd1b548cec1 mftrace-1.1.19.tar.gz +8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz From fedora-extras-commits at redhat.com Sun May 14 06:26:22 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 13 May 2006 23:26:22 -0700 Subject: rpms/mftrace/FC-4 .cvsignore, 1.2, 1.3 mftrace.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605140626.k4E6QOqr008721@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8696 Modified Files: .cvsignore mftrace.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Apr 2006 00:39:02 -0000 1.2 +++ .cvsignore 14 May 2006 06:26:22 -0000 1.3 @@ -1 +1 @@ -mftrace-1.1.19.tar.gz +mftrace-1.2.4.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-4/mftrace.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mftrace.spec 26 Apr 2006 00:47:34 -0000 1.2 +++ mftrace.spec 14 May 2006 06:26:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.1.19 -Release: 3%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -46,10 +46,12 @@ %{_bindir}/* %{_mandir}/man1/%{name}* %{_datadir}/%{name} -%ghost %{_datadir}/%{name}/*.pyo %changelog +* Sat May 13 2006 Quentin Spencer 1.2.4-1 +- New upstream release. + * Tue Apr 25 2006 Quentin Spencer 1.1.19-3 - Update description Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Apr 2006 00:39:02 -0000 1.2 +++ sources 14 May 2006 06:26:22 -0000 1.3 @@ -1 +1 @@ -89d5f70cdfad6ed7be146dd1b548cec1 mftrace-1.1.19.tar.gz +8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz From fedora-extras-commits at redhat.com Sun May 14 07:42:07 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:42:07 -0700 Subject: rpms/libnetfilter_conntrack - New directory Message-ID: <200605140742.k4E7g9dr012093@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12072/libnetfilter_conntrack Log Message: Directory /cvs/extras/rpms/libnetfilter_conntrack added to the repository From fedora-extras-commits at redhat.com Sun May 14 07:42:08 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:42:08 -0700 Subject: rpms/libnetfilter_conntrack/devel - New directory Message-ID: <200605140742.k4E7gAj2012096@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12072/libnetfilter_conntrack/devel Log Message: Directory /cvs/extras/rpms/libnetfilter_conntrack/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 07:42:50 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:42:50 -0700 Subject: rpms/libnetfilter_conntrack Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605140742.k4E7gqt6012154@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12121 Added Files: Makefile import.log Log Message: Setup of module libnetfilter_conntrack --- NEW FILE Makefile --- # Top level Makefile for module libnetfilter_conntrack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 14 07:42:50 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:42:50 -0700 Subject: rpms/libnetfilter_conntrack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605140742.k4E7gqMd012157@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12121/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libnetfilter_conntrack --- NEW 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 May 14 07:44:05 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:44:05 -0700 Subject: rpms/libnetfilter_conntrack import.log,1.1,1.2 Message-ID: <200605140744.k4E7i7fd012220@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12187 Modified Files: import.log Log Message: auto-import libnetfilter_conntrack-0.0.30-2 on branch devel from libnetfilter_conntrack-0.0.30-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 07:42:49 -0000 1.1 +++ import.log 14 May 2006 07:44:05 -0000 1.2 @@ -0,0 +1 @@ +libnetfilter_conntrack-0_0_30-2:HEAD:libnetfilter_conntrack-0.0.30-2.src.rpm:1147592629 From fedora-extras-commits at redhat.com Sun May 14 07:44:05 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 00:44:05 -0700 Subject: rpms/libnetfilter_conntrack/devel libnetfilter_conntrack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605140744.k4E7i73U012225@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/libnetfilter_conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12187/devel Modified Files: .cvsignore sources Added Files: libnetfilter_conntrack.spec Log Message: auto-import libnetfilter_conntrack-0.0.30-2 on branch devel from libnetfilter_conntrack-0.0.30-2.src.rpm --- NEW FILE libnetfilter_conntrack.spec --- Name: libnetfilter_conntrack Version: 0.0.30 Release: 2%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/libnetfilter_conntrack/files/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel %description libnetfilter_conntrack is a userspace library providing a programming interface (API) to the in-kernel connection tracking state table. %package devel Summary: Netfilter conntrack userspace library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel libnetfilter_conntrack is a userspace library providing a programming interface (API) to the in-kernel connection tracking state table. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/*.so.* %{_libdir}/libnetfilter_conntrack/*.so %{_bindir}/ctnl_test %files devel %defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/libnetfilter_conntrack/*.h %changelog * Mon May 8 2006 Paul P Komkoff Jr - 0.0.30-2 - Include COPYING in %doc * Sun Mar 26 2006 Paul P Komkoff Jr - 0.0.30-1 - Preparing for submission to fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 07:42:50 -0000 1.1 +++ .cvsignore 14 May 2006 07:44:05 -0000 1.2 @@ -0,0 +1 @@ +libnetfilter_conntrack-0.0.30.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 07:42:50 -0000 1.1 +++ sources 14 May 2006 07:44:05 -0000 1.2 @@ -0,0 +1 @@ +e07f3d159a869900fbf23f5df12aaf3e libnetfilter_conntrack-0.0.30.tar.bz2 From fedora-extras-commits at redhat.com Sun May 14 10:20:38 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Sun, 14 May 2006 03:20:38 -0700 Subject: owners owners.list,1.990,1.991 Message-ID: <200605141020.k4EAKeXV019642@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443 Modified Files: owners.list Log Message: libnetfilter_conntrack - Netfilter conntrack userspace library Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.990 retrieving revision 1.991 diff -u -r1.990 -r1.991 --- owners.list 14 May 2006 03:34:46 -0000 1.990 +++ owners.list 14 May 2006 10:20:38 -0000 1.991 @@ -654,6 +654,7 @@ Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|libnetfilter_conntrack|Netfilter conntrack userspace library|i at stingr.net|extras-qa at fedoraproject.org| Fedora Extras|libnfnetlink|Netfilter netlink userspace library|i at stingr.net|extras-qa at fedoraproject.org| Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 14 15:56:36 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 14 May 2006 08:56:36 -0700 Subject: rpms/xsp import.log,1.2,1.3 Message-ID: <200605141557.k4EFv8Wl032138@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32104 Modified Files: import.log Log Message: auto-import xsp-1.1.15-1 on branch devel from xsp-1.1.15-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xsp/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 9 May 2006 21:40:12 -0000 1.2 +++ import.log 14 May 2006 15:56:35 -0000 1.3 @@ -1 +1,2 @@ xsp-1_1_13-3:HEAD:xsp-1.1.13-3.src.rpm:1147210802 +xsp-1_1_15-1:HEAD:xsp-1.1.15-1.src.rpm:1147622162 From fedora-extras-commits at redhat.com Sun May 14 15:56:37 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 14 May 2006 08:56:37 -0700 Subject: rpms/xsp/devel .cvsignore,1.2,1.3 sources,1.2,1.3 xsp.spec,1.1,1.2 Message-ID: <200605141557.k4EFv9MF032143@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/xsp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32104/devel Modified Files: .cvsignore sources xsp.spec Log Message: auto-import xsp-1.1.15-1 on branch devel from xsp-1.1.15-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 May 2006 21:40:13 -0000 1.2 +++ .cvsignore 14 May 2006 15:56:37 -0000 1.3 @@ -1 +1 @@ -xsp-1.1.13.tar.gz +xsp-1.1.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 May 2006 21:40:13 -0000 1.2 +++ sources 14 May 2006 15:56:37 -0000 1.3 @@ -1 +1 @@ -58facfdb9d13d48f9e8ad5069500081d xsp-1.1.13.tar.gz +2becc73f015bb5f1740427d982930e6f xsp-1.1.15.tar.gz Index: xsp.spec =================================================================== RCS file: /cvs/extras/rpms/xsp/devel/xsp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsp.spec 9 May 2006 21:40:13 -0000 1.1 +++ xsp.spec 14 May 2006 15:56:37 -0000 1.2 @@ -1,8 +1,8 @@ %define _libdir /usr/lib Name: xsp -Version: 1.1.13 -Release: 3%{?dist} +Version: 1.1.15 +Release: 1%{?dist} License: BSD BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.mono-project.com/ASP.NET#XSP @@ -38,12 +38,16 @@ %{_bindir}/* %{_libdir}/pkgconfig/xsp.pc %{_libdir}/pkgconfig/xsp-2.pc -%{_libdir}/%{name}/1.0/* -%{_libdir}/%{name}/2.0/* -%{_libdir}/%{name}/test/* +%{_libdir}/%{name}/ %{_mandir}/man1/* %changelog +* Sun May 14 2006 Paul F. Johnson 1.1.15-1 +- bump to new version + +* Sun May 14 2006 Paul F. Johnson 1.1.13-4 +- minor alteration to the spec file + * Mon May 08 2006 Paul F. Johnson 1.1.13-3 - Fixes to the spec file - Added clean From fedora-extras-commits at redhat.com Sun May 14 16:10:37 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 May 2006 09:10:37 -0700 Subject: extras-buildsys/www builders.psp,1.11,1.12 Message-ID: <200605141610.k4EGAblC002080@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2062 Modified Files: builders.psp Log Message: Fixup for recent builder changes. Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- builders.psp 31 Oct 2005 17:39:47 -0000 1.11 +++ builders.psp 14 May 2006 16:10:35 -0000 1.12 @@ -46,7 +46,7 @@ # endfor unavail_color = '' - if builder['alive'] == False: + if builder['available'] == False: unavail_color = 'color="#ff4444"' slots_text = "unavailable" else: From fedora-extras-commits at redhat.com Sun May 14 16:12:03 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:03 -0700 Subject: rpms/vorbisgain - New directory Message-ID: <200605141612.k4EGC51G002163@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2137/vorbisgain Log Message: Directory /cvs/extras/rpms/vorbisgain added to the repository From fedora-extras-commits at redhat.com Sun May 14 16:12:04 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:04 -0700 Subject: rpms/vorbisgain/devel - New directory Message-ID: <200605141612.k4EGC6GZ002166@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2137/vorbisgain/devel Log Message: Directory /cvs/extras/rpms/vorbisgain/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 16:12:23 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:23 -0700 Subject: rpms/vorbisgain Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605141612.k4EGCPuS002215@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2187 Added Files: Makefile import.log Log Message: Setup of module vorbisgain --- NEW FILE Makefile --- # Top level Makefile for module vorbisgain all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 14 16:12:24 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:24 -0700 Subject: rpms/vorbisgain/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605141612.k4EGCQPF002218@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2187/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module vorbisgain --- NEW 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 May 14 16:13:09 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 May 2006 09:13:09 -0700 Subject: extras-buildsys/builder Builder.py,1.11,1.12 Message-ID: <200605141613.k4EGD9rY002306@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2288/builder Modified Files: Builder.py Log Message: Fix errors in passive builder code (patch from Andreas Thienemann ) 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 14 May 2006 05:43:06 -0000 1.11 +++ Builder.py 14 May 2006 16:13:06 -0000 1.12 @@ -330,14 +330,15 @@ # Start up the HTTP server thread which the build server # pulls completed RPMs from hostname = get_hostname(self._cfg, True) - port = cfg.get_int("Passive", "fileserver_port") + port = self._cfg.get_int("Passive", "fileserver_port") + work_dir = self._cfg.get_str("Directories", "builder_work_dir") self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs) self._http_server.start() self._log("Binding to address '%s'\n" % hostname) - xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port") + xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") try: - if cfg.get_bool("SSL", "use_ssl") == True: + if self._cfg.get_bool("SSL", "use_ssl") == True: self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) else: self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) @@ -346,7 +347,7 @@ raise BuilderInitException("Error: couldn't bind to address '%s:%s'. " \ "Is the builder already running?\n" % (hostname, xmlrpc_port)) - brh = PassiveBuilderRequestHandler(cfg, self) + brh = PassiveBuilderRequestHandler(self._cfg, self) self._xmlrpc_server.register_instance(brh) def work(self): From fedora-extras-commits at redhat.com Sun May 14 16:12:54 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:54 -0700 Subject: rpms/vorbisgain import.log,1.1,1.2 Message-ID: <200605141613.k4EGDQoM002309@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2251 Modified Files: import.log Log Message: auto-import vorbisgain-0.34-1.fc5 on branch devel from vorbisgain-0.34-1.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/vorbisgain/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 16:12:23 -0000 1.1 +++ import.log 14 May 2006 16:12:54 -0000 1.2 @@ -0,0 +1 @@ +vorbisgain-0_34-1_fc5:HEAD:vorbisgain-0.34-1.fc5.src.rpm:1147623166 From fedora-extras-commits at redhat.com Sun May 14 16:12:55 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:12:55 -0700 Subject: rpms/vorbisgain/devel vorbisgain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605141613.k4EGDRCP002313@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2251/devel Modified Files: .cvsignore sources Added Files: vorbisgain.spec Log Message: auto-import vorbisgain-0.34-1.fc5 on branch devel from vorbisgain-0.34-1.fc5.src.rpm --- NEW FILE vorbisgain.spec --- Name: vorbisgain Version: 0.34 Release: 1%{?dist} Summary: Adds tags to Ogg Vorbis files to adjust the volume Group: Applications/Multimedia License: LGPL URL: http://sjeng.org/vorbisgain.html Source0: http://sjeng.org/ftp/vorbis/vorbisgain-0.34.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libvorbis-devel libogg-devel %description VorbisGain is a utility that uses a psychoacoustic method to correct the volume of an Ogg Vorbis file to a predefined standardized loudness. It needs player support to work. Non-supporting players will play back the files without problems, but you'll miss out on the benefits. Nowadays most good players such as ogg123, xmms and mplayer are already compatible. %prep %setup -q %build chmod 755 configure %configure --enable-recursive make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %_bindir/* %doc NEWS README %_mandir/man1/* %changelog * Sat May 13 2006 Noa Resare 0.34-1 - Initial spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vorbisgain/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 16:12:23 -0000 1.1 +++ .cvsignore 14 May 2006 16:12:55 -0000 1.2 @@ -0,0 +1 @@ +vorbisgain-0.34.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/vorbisgain/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 16:12:23 -0000 1.1 +++ sources 14 May 2006 16:12:55 -0000 1.2 @@ -0,0 +1 @@ +ee62352b74c610bb3eeddda038819fc8 vorbisgain-0.34.zip From fedora-extras-commits at redhat.com Sun May 14 16:16:21 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Sun, 14 May 2006 09:16:21 -0700 Subject: owners owners.list,1.991,1.992 Message-ID: <200605141616.k4EGGNV5002443@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2424 Modified Files: owners.list Log Message: added noa at resare.com as contact for vorbiscomment Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.991 retrieving revision 1.992 diff -u -r1.991 -r1.992 --- owners.list 14 May 2006 10:20:38 -0000 1.991 +++ owners.list 14 May 2006 16:16:21 -0000 1.992 @@ -1625,6 +1625,7 @@ Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|vorbisgain|Adds tags to Ogg Vorbis files to adjust the volume|noa at resare.com|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-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 14 17:35:26 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 14 May 2006 10:35:26 -0700 Subject: rpms/pure-ftpd/devel pure-ftpd.README.SELinux, NONE, 1.1 pure-ftpd.pureftpd.te, NONE, 1.1 pure-ftpd.init, 1.3, 1.4 pure-ftpd.spec, 1.8, 1.9 Message-ID: <200605141735.k4EHZSo9006259@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/pure-ftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6236 Modified Files: pure-ftpd.init pure-ftpd.spec Added Files: pure-ftpd.README.SELinux pure-ftpd.pureftpd.te Log Message: - add SELinux support - prevent the init script from displaying the config on startup --- NEW FILE pure-ftpd.README.SELinux --- ============================= SELinux support for Pure-FTPd ============================= With this package, Pure-FTPd is now protected in the same way VSFTPd and ProFTPd are in Fedora. Read Access ----------- To allow files to be accessed by Pure-FTPd, you need either : - to place them in /var/ftp - to label them with the public_content_t. To do that, you can use:: chcon -t public_content_t file_to_publish Write Access ------------ If you wish to grant write access, you have to use the public_content_rw_t type, for example with this command:: chcon -t public_content_rw_t file_to_publish and you have to turn on the allow_ftpd_anon_write boolean using system-config-securitylevel, or using the following command:: setsebool -P allow_ftpd_anon_write 1 Access to home directories -------------------------- If you want to publish files in a user's home directory, you have to turn on the ftp_home_dir boolean, using system-config-securitylevel, or using the following command:: setsebool -P ftp_home_dir 1 --- NEW FILE pure-ftpd.pureftpd.te --- policy_module(pureftpd, 1.0) require { type ftpd_t; }; # Read /var/run/utmp init_read_utmp(ftpd_t) init_dontaudit_write_utmp(ftpd_t) ### Allow connect to mysql # Network connect corenet_tcp_connect_mysqld_port(ftpd_t) # Socket file connect mysql_stream_connect(ftpd_t); mysql_rw_db_sockets(ftpd_t) ### Allow connect to postgresql # Network connect corenet_tcp_connect_postgresql_port(ftpd_t) # Socket file connect postgresql_stream_connect(ftpd_t) # Allow connect to ldap sysnet_use_ldap(ftpd_t) Index: pure-ftpd.init =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pure-ftpd.init 13 Nov 2005 17:41:27 -0000 1.3 +++ pure-ftpd.init 14 May 2006 17:35:26 -0000 1.4 @@ -30,7 +30,7 @@ start() { echo -n $"Starting $prog: " - daemon $pure_launch_script $pure_config --daemonize + daemon "$pure_launch_script $pure_config --daemonize > /dev/null" RETVAL=$? [ $RETVAL = 0 ] && touch /var/lock/subsys/pure-ftpd echo Index: pure-ftpd.spec =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pure-ftpd.spec 9 Apr 2006 15:39:18 -0000 1.8 +++ pure-ftpd.spec 14 May 2006 17:35:26 -0000 1.9 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -12,6 +12,8 @@ Source3: pure-ftpd.xinetd Source4: pure-ftpd.pure-ftpwho.pam Source5: pure-ftpd.pure-ftpwho.consoleapp +Source6: pure-ftpd.README.SELinux +Source7: pure-ftpd.pureftpd.te Patch0: pure-ftpd-1.0.21-config.patch Patch1: pure-ftpd-1.0.20-libdir.patch Provides: ftpserver @@ -21,6 +23,7 @@ %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} +BuildRequires: selinux-policy Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -45,10 +48,28 @@ --without tls disable SSL/TLS +%package selinux +Summary: SELinux support for Pure-FTPD +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(post): policycoreutils, initscripts, %{name} +Requires(preun): policycoreutils, initscripts, %{name} +Requires(postun): policycoreutils + +%description selinux +This package adds SELinux enforcement to Pure-FTPD. Install it if you want +Pure-FTPd to be protected in the same way other FTP servers are in Fedora +(e.g. VSFTPd and ProFTPd) + + + %prep %setup -q %patch0 -p0 -b .config %patch1 -p0 -b .libdir +cp -p %{SOURCE6} README.SELinux +mkdir selinux +cp -p %{SOURCE7} selinux/pureftpd.te %build @@ -83,6 +104,7 @@ make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -135,13 +157,22 @@ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho +# SELinux support +cd selinux +echo "%{_sbindir}/pure-ftpd system_u:object_r:ftpd_exec_t:s0" > pureftpd.fc +echo '%{_localstatedir}/log/pureftpd.log system_u:object_r:xferlog_t:s0' >> pureftpd.fc +touch pureftpd.if +make -f %{_datadir}/selinux/devel/Makefile +install -p -m 644 -D pureftpd.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/pureftpd.pp + + %clean rm -rf $RPM_BUILD_ROOT %post -if [ "$1" -le "1" ]; then +if [ "$1" -le "1" ]; then # fist install /sbin/chkconfig --add pure-ftpd fi @@ -151,12 +182,35 @@ /sbin/chkconfig --del pure-ftpd fi -%postun +%postun if [ "$1" -ge "1" ]; then /sbin/service pure-ftpd condrestart > /dev/null 2>&1 fi +%post selinux +if [ "$1" -le "1" ]; then # Fist install + semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || : + fixfiles -R pure-ftpd restore + /sbin/service pure-ftpd condrestart > /dev/null 2>&1 +fi + +%preun selinux +if [ "$1" -lt "1" ]; then # Final removal + semodule -r pureftpd 2>/dev/null || : + fixfiles -R pure-ftpd restore + /sbin/service pure-ftpd condrestart > /dev/null 2>&1 +fi + +%postun selinux +if [ "$1" -ge "1" ]; then # Upgrade + # Replaces the module if it is already loaded + semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || : + # no need to restart the daemon +fi + + + %files %defattr(-, root, root, -) %doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README @@ -177,7 +231,17 @@ %dir /var/ftp/ +%files selinux +%defattr(-, root, root, -) +%doc README.SELinux +%{_datadir}/selinux/packages/%{name}/pureftpd.pp + + %changelog +* Sun May 14 2006 Aurelien Bompard 1.0.21-4 +- add SELinux support +- prevent the init script from displaying the config on startup + * Sun Apr 09 2006 Aurelien Bompard 1.0.21-3 - fix mysql socket location (bug 188426) From fedora-extras-commits at redhat.com Sun May 14 17:38:55 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 14 May 2006 10:38:55 -0700 Subject: rpms/pure-ftpd/FC-5 pure-ftpd.README.SELinux, NONE, 1.1 pure-ftpd.pureftpd.te, NONE, 1.1 pure-ftpd.init, 1.3, 1.4 pure-ftpd.spec, 1.8, 1.9 Message-ID: <200605141738.k4EHcvNb006348@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/pure-ftpd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6327/FC-5 Modified Files: pure-ftpd.init pure-ftpd.spec Added Files: pure-ftpd.README.SELinux pure-ftpd.pureftpd.te Log Message: - add SELinux support - prevent the init script from displaying the config on startup --- NEW FILE pure-ftpd.README.SELinux --- ============================= SELinux support for Pure-FTPd ============================= With this package, Pure-FTPd is now protected in the same way VSFTPd and ProFTPd are in Fedora. Read Access ----------- To allow files to be accessed by Pure-FTPd, you need either : - to place them in /var/ftp - to label them with the public_content_t. To do that, you can use:: chcon -t public_content_t file_to_publish Write Access ------------ If you wish to grant write access, you have to use the public_content_rw_t type, for example with this command:: chcon -t public_content_rw_t file_to_publish and you have to turn on the allow_ftpd_anon_write boolean using system-config-securitylevel, or using the following command:: setsebool -P allow_ftpd_anon_write 1 Access to home directories -------------------------- If you want to publish files in a user's home directory, you have to turn on the ftp_home_dir boolean, using system-config-securitylevel, or using the following command:: setsebool -P ftp_home_dir 1 --- NEW FILE pure-ftpd.pureftpd.te --- policy_module(pureftpd, 1.0) require { type ftpd_t; }; # Read /var/run/utmp init_read_utmp(ftpd_t) init_dontaudit_write_utmp(ftpd_t) ### Allow connect to mysql # Network connect corenet_tcp_connect_mysqld_port(ftpd_t) # Socket file connect mysql_stream_connect(ftpd_t); mysql_rw_db_sockets(ftpd_t) ### Allow connect to postgresql # Network connect corenet_tcp_connect_postgresql_port(ftpd_t) # Socket file connect postgresql_stream_connect(ftpd_t) # Allow connect to ldap sysnet_use_ldap(ftpd_t) Index: pure-ftpd.init =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pure-ftpd.init 13 Nov 2005 17:41:27 -0000 1.3 +++ pure-ftpd.init 14 May 2006 17:38:54 -0000 1.4 @@ -30,7 +30,7 @@ start() { echo -n $"Starting $prog: " - daemon $pure_launch_script $pure_config --daemonize + daemon "$pure_launch_script $pure_config --daemonize > /dev/null" RETVAL=$? [ $RETVAL = 0 ] && touch /var/lock/subsys/pure-ftpd echo Index: pure-ftpd.spec =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pure-ftpd.spec 9 Apr 2006 15:39:17 -0000 1.8 +++ pure-ftpd.spec 14 May 2006 17:38:54 -0000 1.9 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -12,6 +12,8 @@ Source3: pure-ftpd.xinetd Source4: pure-ftpd.pure-ftpwho.pam Source5: pure-ftpd.pure-ftpwho.consoleapp +Source6: pure-ftpd.README.SELinux +Source7: pure-ftpd.pureftpd.te Patch0: pure-ftpd-1.0.21-config.patch Patch1: pure-ftpd-1.0.20-libdir.patch Provides: ftpserver @@ -21,6 +23,7 @@ %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} +BuildRequires: selinux-policy Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -45,10 +48,28 @@ --without tls disable SSL/TLS +%package selinux +Summary: SELinux support for Pure-FTPD +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(post): policycoreutils, initscripts, %{name} +Requires(preun): policycoreutils, initscripts, %{name} +Requires(postun): policycoreutils + +%description selinux +This package adds SELinux enforcement to Pure-FTPD. Install it if you want +Pure-FTPd to be protected in the same way other FTP servers are in Fedora +(e.g. VSFTPd and ProFTPd) + + + %prep %setup -q %patch0 -p0 -b .config %patch1 -p0 -b .libdir +cp -p %{SOURCE6} README.SELinux +mkdir selinux +cp -p %{SOURCE7} selinux/pureftpd.te %build @@ -83,6 +104,7 @@ make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -135,13 +157,22 @@ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho +# SELinux support +cd selinux +echo "%{_sbindir}/pure-ftpd system_u:object_r:ftpd_exec_t:s0" > pureftpd.fc +echo '%{_localstatedir}/log/pureftpd.log system_u:object_r:xferlog_t:s0' >> pureftpd.fc +touch pureftpd.if +make -f %{_datadir}/selinux/devel/Makefile +install -p -m 644 -D pureftpd.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/pureftpd.pp + + %clean rm -rf $RPM_BUILD_ROOT %post -if [ "$1" -le "1" ]; then +if [ "$1" -le "1" ]; then # fist install /sbin/chkconfig --add pure-ftpd fi @@ -151,12 +182,35 @@ /sbin/chkconfig --del pure-ftpd fi -%postun +%postun if [ "$1" -ge "1" ]; then /sbin/service pure-ftpd condrestart > /dev/null 2>&1 fi +%post selinux +if [ "$1" -le "1" ]; then # Fist install + semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || : + fixfiles -R pure-ftpd restore + /sbin/service pure-ftpd condrestart > /dev/null 2>&1 +fi + +%preun selinux +if [ "$1" -lt "1" ]; then # Final removal + semodule -r pureftpd 2>/dev/null || : + fixfiles -R pure-ftpd restore + /sbin/service pure-ftpd condrestart > /dev/null 2>&1 +fi + +%postun selinux +if [ "$1" -ge "1" ]; then # Upgrade + # Replaces the module if it is already loaded + semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || : + # no need to restart the daemon +fi + + + %files %defattr(-, root, root, -) %doc FAQ THANKS README.Authentication-Modules README.Virtual-Users README @@ -177,7 +231,17 @@ %dir /var/ftp/ +%files selinux +%defattr(-, root, root, -) +%doc README.SELinux +%{_datadir}/selinux/packages/%{name}/pureftpd.pp + + %changelog +* Sun May 14 2006 Aurelien Bompard 1.0.21-4 +- add SELinux support +- prevent the init script from displaying the config on startup + * Sun Apr 09 2006 Aurelien Bompard 1.0.21-3 - fix mysql socket location (bug 188426) From fedora-extras-commits at redhat.com Sun May 14 18:12:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 14 May 2006 11:12:47 -0700 Subject: rpms/pure-ftpd/FC-5 pure-ftpd.spec,1.9,1.10 Message-ID: <200605141812.k4EICnAt008788@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/pure-ftpd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8757/FC-5 Modified Files: pure-ftpd.spec Log Message: add missing BuildRequires Index: pure-ftpd.spec =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pure-ftpd.spec 14 May 2006 17:38:54 -0000 1.9 +++ pure-ftpd.spec 14 May 2006 18:12:47 -0000 1.10 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -23,7 +23,7 @@ %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} -BuildRequires: selinux-policy +BuildRequires: selinux-policy, selinux-policy-targeted, checkpolicy Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -238,6 +238,9 @@ %changelog +* Sun May 14 2006 Aurelien Bompard 1.0.21-5 +- add missing BuildRequires + * Sun May 14 2006 Aurelien Bompard 1.0.21-4 - add SELinux support - prevent the init script from displaying the config on startup From fedora-extras-commits at redhat.com Sun May 14 18:12:48 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 14 May 2006 11:12:48 -0700 Subject: rpms/pure-ftpd/devel pure-ftpd.spec,1.9,1.10 Message-ID: <200605141812.k4EICohN008792@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/pure-ftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8757/devel Modified Files: pure-ftpd.spec Log Message: add missing BuildRequires Index: pure-ftpd.spec =================================================================== RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pure-ftpd.spec 14 May 2006 17:35:26 -0000 1.9 +++ pure-ftpd.spec 14 May 2006 18:12:48 -0000 1.10 @@ -1,6 +1,6 @@ Name: pure-ftpd Version: 1.0.21 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons @@ -23,7 +23,7 @@ %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} -BuildRequires: selinux-policy +BuildRequires: selinux-policy, selinux-policy-targeted, checkpolicy Requires(post): chkconfig Requires(preun): chkconfig, initscripts @@ -238,6 +238,9 @@ %changelog +* Sun May 14 2006 Aurelien Bompard 1.0.21-5 +- add missing BuildRequires + * Sun May 14 2006 Aurelien Bompard 1.0.21-4 - add SELinux support - prevent the init script from displaying the config on startup From fedora-extras-commits at redhat.com Sun May 14 21:08:11 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:11 -0700 Subject: rpms/python-mechanize - New directory Message-ID: <200605142108.k4EL8D0v016330@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304a/python-mechanize Log Message: Directory /cvs/extras/rpms/python-mechanize added to the repository From fedora-extras-commits at redhat.com Sun May 14 21:08:20 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:20 -0700 Subject: rpms/python-mechanize/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605142108.k4EL8M2m016385@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16349/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-mechanize --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun May 14 21:08:11 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:11 -0700 Subject: rpms/python-mechanize/devel - New directory Message-ID: <200605142108.k4EL8DLL016333@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304a/python-mechanize/devel Log Message: Directory /cvs/extras/rpms/python-mechanize/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 21:08:19 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:19 -0700 Subject: rpms/python-mechanize Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605142108.k4EL8M8r016382@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16349 Added Files: Makefile import.log Log Message: Setup of module python-mechanize --- NEW FILE Makefile --- # Top level Makefile for module python-mechanize all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun May 14 21:08:37 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:37 -0700 Subject: rpms/python-mechanize import.log,1.1,1.2 Message-ID: <200605142108.k4EL8dCJ016448@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16415 Modified Files: import.log Log Message: auto-import python-mechanize-0.1.1a-2 on branch devel from python-mechanize-0.1.1a-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-mechanize/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 21:08:19 -0000 1.1 +++ import.log 14 May 2006 21:08:37 -0000 1.2 @@ -0,0 +1 @@ +python-mechanize-0_1_1a-2:HEAD:python-mechanize-0.1.1a-2.src.rpm:1147641113 From fedora-extras-commits at redhat.com Sun May 14 21:08:38 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:08:38 -0700 Subject: rpms/python-mechanize/devel python-mechanize.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605142108.k4EL8eW6016453@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16415/devel Modified Files: .cvsignore sources Added Files: python-mechanize.spec Log Message: auto-import python-mechanize-0.1.1a-2 on branch devel from python-mechanize-0.1.1a-2.src.rpm --- NEW FILE python-mechanize.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-mechanize Version: 0.1.1a Release: 2%{?dist} Summary: Stateful programmatic web browsing Group: System Environment/Libraries License: BSD URL: http://wwwsearch.sourceforge.net/mechanize Source0: http://wwwsearch.sourceforge.net/mechanize/src/mechanize-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools Requires: python-clientform Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description Stateful programmatic web browsing, after Andy Lester's Perl module WWW::Mechanize. The library is layered: mechanize.Browser (stateful web browser), mechanize.UserAgent (configurable URL opener), plus urllib2 handlers. Features include: ftp:, http: and file: URL schemes, browser history, high-level hyperlink and HTML form support, HTTP cookies, HTTP-EQUIV and Refresh, Referer [sic] header, robots.txt, redirections, proxies, and Basic and Digest HTTP authentication. mechanize's response objects are (lazily-) .seek()able and still work after .close(). Much of the code originally derived from Perl code by Gisle Aas (libwww-perl), Johnny Lee (MSIE Cookie support) and last but not least Andy Lester (WWW::Mechanize). urllib2 was written by Jeremy Hylton. %prep %setup -q -n mechanize-%{version} %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --single-version-externally-managed \ -O1 --root=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING.txt README.txt README.html GeneralFAQ.html doc.html examples %{python_sitelib}/* %changelog * Sun May 14 2006 Luke Macken - 0.1.1a-2 - Add python-abi Requires - Remove noarch * Thu May 11 2006 Luke Macken - 0.1.1a-1 - Packaged for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-mechanize/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 21:08:20 -0000 1.1 +++ .cvsignore 14 May 2006 21:08:38 -0000 1.2 @@ -0,0 +1 @@ +mechanize-0.1.1a.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-mechanize/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 21:08:20 -0000 1.1 +++ sources 14 May 2006 21:08:38 -0000 1.2 @@ -0,0 +1 @@ +23259f64e065a5c49b8fea233fe31f0c mechanize-0.1.1a.tar.gz From fedora-extras-commits at redhat.com Sun May 14 21:11:00 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 14 May 2006 14:11:00 -0700 Subject: owners owners.list,1.992,1.993 Message-ID: <200605142111.k4ELB2iT016550@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16533 Modified Files: owners.list Log Message: Add python-mechanize Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.992 retrieving revision 1.993 diff -u -r1.992 -r1.993 --- owners.list 14 May 2006 16:16:21 -0000 1.992 +++ owners.list 14 May 2006 21:11:00 -0000 1.993 @@ -1341,6 +1341,7 @@ Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-lxml|ElementTree-like Python bindings for libxml2 and libxslt|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org| +Fedora Extras|python-mechanize|Stateful programmatic web browsing|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-myghty|A Python-based templating system derived from HTML::Mason|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-nltk|Python-based Natural Language Toolkit|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|python-nose|A discovery-based unittest extension for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 14 21:18:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 14 May 2006 14:18:44 -0700 Subject: rpms/childsplay_plugins/devel childsplay_plugins-0.80.8-assetml.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 childsplay_plugins.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605142118.k4ELIkqU016655@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16631 Modified Files: .cvsignore childsplay_plugins.spec sources Added Files: childsplay_plugins-0.80.8-assetml.patch Log Message: * Sun May 14 2006 Hans de Goede 0.80.8-1 - New upstream release 0.80.8 - Fix a SoundMemory crash (Patch1, bz 191643), thanks Chien-Chung Yeh. childsplay_plugins-0.80.8-assetml.patch: --- NEW FILE childsplay_plugins-0.80.8-assetml.patch --- --- childsplay_plugins-0.80.8/lib/soundmemory.py.00 2006-04-09 17:12:39.000000000 +0800 +++ childsplay_plugins-0.80.8/lib/soundmemory.py 2006-05-14 20:25:09.000000000 +0800 @@ -136,9 +136,9 @@ class Game: raise MyError,text # create two assetmlSDL instances one for parsing memory sounds and one for CP sounds self.Assets_snd = pyassetmlSDL.AssetmlSDL() - self.Assets_snd.set_mldir('childsplay/sounds-misc/sounds-misc.assetml') + self.Assets_snd.set_mldir('sounds-misc.assetml') self.Assets_cpsnd = pyassetmlSDL.AssetmlSDL() - self.Assets_cpsnd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') + self.Assets_cpsnd.set_mldir('childsplay-sounds.assetml') # number of items y, number of items y, x offset, y offset self.gamelevels = [(2,3,200,100),(2,4,180,100),(3,4,180,60),(4,6,50,20)] Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 May 2006 18:18:46 -0000 1.2 +++ .cvsignore 14 May 2006 21:18:44 -0000 1.3 @@ -1 +1 @@ -childsplay_plugins-0.80.7.tgz +childsplay_plugins-0.80.8.tgz Index: childsplay_plugins.spec =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/childsplay_plugins.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay_plugins.spec 11 May 2006 18:18:46 -0000 1.1 +++ childsplay_plugins.spec 14 May 2006 21:18:44 -0000 1.2 @@ -1,12 +1,13 @@ Name: childsplay_plugins -Version: 0.80.7 -Release: 3%{?dist} +Version: 0.80.8 +Release: 1%{?dist} Summary: Plugins for childsplay (educational games for young children) Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ Source: http://download.sourceforge.net/childsplay/%{name}-%{version}.tgz Patch0: childsplay_plugins-0.80.7-alphabet-sounds.patch +Patch1: childsplay_plugins-0.80.8-assetml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: childsplay >= 0.81.4 @@ -20,6 +21,7 @@ %setup -q # no backups otherwise the backups endup in the rpm. %patch0 -p1 +%patch1 -p1 # the translation is merged into the assetml file, so don't ship it seperatly rm -r assetml/childsplay/sounds-misc/po @@ -60,6 +62,10 @@ %{_datadir}/assetml/* %changelog +* Sun May 14 2006 Hans de Goede 0.80.8-1 +- New upstream release 0.80.8 +- Fix a SoundMemory crash (Patch1, bz 191643), thanks Chien-Chung Yeh. + * Thu May 11 2006 Hans de Goede 0.80.7-3 - Own /usr/share/childsplay and subdirs to guarantee correct uninstall (bz 190878). Index: sources =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 May 2006 18:18:46 -0000 1.2 +++ sources 14 May 2006 21:18:44 -0000 1.3 @@ -1 +1 @@ -d3ea05d2a1fb373d9c4836845b199a76 childsplay_plugins-0.80.7.tgz +0758183302dfe1fe2bb5103f9442bac9 childsplay_plugins-0.80.8.tgz From fedora-extras-commits at redhat.com Sun May 14 21:19:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 14 May 2006 14:19:43 -0700 Subject: rpms/childsplay_plugins/FC-5 childsplay_plugins-0.80.8-assetml.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 childsplay_plugins.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605142119.k4ELJji6016763@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay_plugins/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736 Modified Files: .cvsignore childsplay_plugins.spec sources Added Files: childsplay_plugins-0.80.8-assetml.patch Log Message: * Sun May 14 2006 Hans de Goede 0.80.8-1 - New upstream release 0.80.8 - Fix a SoundMemory crash (Patch1, bz 191643), thanks Chien-Chung Yeh. childsplay_plugins-0.80.8-assetml.patch: --- NEW FILE childsplay_plugins-0.80.8-assetml.patch --- --- childsplay_plugins-0.80.8/lib/soundmemory.py.00 2006-04-09 17:12:39.000000000 +0800 +++ childsplay_plugins-0.80.8/lib/soundmemory.py 2006-05-14 20:25:09.000000000 +0800 @@ -136,9 +136,9 @@ class Game: raise MyError,text # create two assetmlSDL instances one for parsing memory sounds and one for CP sounds self.Assets_snd = pyassetmlSDL.AssetmlSDL() - self.Assets_snd.set_mldir('childsplay/sounds-misc/sounds-misc.assetml') + self.Assets_snd.set_mldir('sounds-misc.assetml') self.Assets_cpsnd = pyassetmlSDL.AssetmlSDL() - self.Assets_cpsnd.set_mldir('childsplay/childsplay-sounds/childsplay-sounds.assetml') + self.Assets_cpsnd.set_mldir('childsplay-sounds.assetml') # number of items y, number of items y, x offset, y offset self.gamelevels = [(2,3,200,100),(2,4,180,100),(3,4,180,60),(4,6,50,20)] Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 May 2006 18:18:46 -0000 1.2 +++ .cvsignore 14 May 2006 21:19:42 -0000 1.3 @@ -1 +1 @@ -childsplay_plugins-0.80.7.tgz +childsplay_plugins-0.80.8.tgz Index: childsplay_plugins.spec =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/childsplay_plugins.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay_plugins.spec 11 May 2006 18:18:46 -0000 1.1 +++ childsplay_plugins.spec 14 May 2006 21:19:42 -0000 1.2 @@ -1,12 +1,13 @@ Name: childsplay_plugins -Version: 0.80.7 -Release: 3%{?dist} +Version: 0.80.8 +Release: 1%{?dist} Summary: Plugins for childsplay (educational games for young children) Group: Amusements/Games License: GPL URL: http://childsplay.sourceforge.net/ Source: http://download.sourceforge.net/childsplay/%{name}-%{version}.tgz Patch0: childsplay_plugins-0.80.7-alphabet-sounds.patch +Patch1: childsplay_plugins-0.80.8-assetml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: childsplay >= 0.81.4 @@ -20,6 +21,7 @@ %setup -q # no backups otherwise the backups endup in the rpm. %patch0 -p1 +%patch1 -p1 # the translation is merged into the assetml file, so don't ship it seperatly rm -r assetml/childsplay/sounds-misc/po @@ -60,6 +62,10 @@ %{_datadir}/assetml/* %changelog +* Sun May 14 2006 Hans de Goede 0.80.8-1 +- New upstream release 0.80.8 +- Fix a SoundMemory crash (Patch1, bz 191643), thanks Chien-Chung Yeh. + * Thu May 11 2006 Hans de Goede 0.80.7-3 - Own /usr/share/childsplay and subdirs to guarantee correct uninstall (bz 190878). Index: sources =================================================================== RCS file: /cvs/extras/rpms/childsplay_plugins/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 May 2006 18:18:46 -0000 1.2 +++ sources 14 May 2006 21:19:42 -0000 1.3 @@ -1 +1 @@ -d3ea05d2a1fb373d9c4836845b199a76 childsplay_plugins-0.80.7.tgz +0758183302dfe1fe2bb5103f9442bac9 childsplay_plugins-0.80.8.tgz From fedora-extras-commits at redhat.com Sun May 14 21:20:05 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:20:05 -0700 Subject: rpms/liblo - New directory Message-ID: <200605142120.k4ELK7tF016832@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16811/liblo Log Message: Directory /cvs/extras/rpms/liblo added to the repository From fedora-extras-commits at redhat.com Sun May 14 21:20:06 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:20:06 -0700 Subject: rpms/liblo/devel - New directory Message-ID: <200605142120.k4ELK8j2016835@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16811/liblo/devel Log Message: Directory /cvs/extras/rpms/liblo/devel added to the repository From fedora-extras-commits at redhat.com Sun May 14 21:20:29 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:20:29 -0700 Subject: rpms/liblo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605142120.k4ELKV7A016891@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16857 Added Files: Makefile import.log Log Message: Setup of module liblo --- NEW FILE Makefile --- # Top level Makefile for module liblo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 14 21:20:29 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:20:29 -0700 Subject: rpms/liblo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605142120.k4ELKV9F016894@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16857/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module liblo --- NEW 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 May 14 21:21:19 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:21:19 -0700 Subject: rpms/liblo import.log,1.1,1.2 Message-ID: <200605142121.k4ELLLJG016955@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16922 Modified Files: import.log Log Message: auto-import liblo-0.23-4 on branch devel from liblo-0.23-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/liblo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 May 2006 21:20:28 -0000 1.1 +++ import.log 14 May 2006 21:21:19 -0000 1.2 @@ -0,0 +1 @@ +liblo-0_23-4:HEAD:liblo-0.23-4.src.rpm:1147641688 From fedora-extras-commits at redhat.com Sun May 14 21:21:19 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:21:19 -0700 Subject: rpms/liblo/devel liblo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605142121.k4ELLLxp016960@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16922/devel Modified Files: .cvsignore sources Added Files: liblo.spec Log Message: auto-import liblo-0.23-4 on branch devel from liblo-0.23-4.src.rpm --- NEW FILE liblo.spec --- Summary: Open Sound Control library Name: liblo Version: 0.23 Release: 4%{?dist} License: GPL Group: System Environment/Libraries URL: http://liblo.sourceforge.net Source0: http://www.ecs.soton.ac.uk/~njh/liblo/liblo-0.23.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen %description liblo is an implementation of the Open Sound Control protocol for POSIX systems developed by Steve Harris. %package devel Summary: Libraries, includes, etc to develop liblo applications Group: Development/Libraries Requires: liblo = %{version}-%{release} %description devel Libraries, include files, etc you can use to develop liblo based Open Sound Control applications. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install # install man pages by hand mkdir -p %{buildroot}%{_mandir}/man3/ install -m 0664 doc/man/man3/*.3 %{buildroot}%{_mandir}/man3/ %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL README %doc doc/html doc/latex %{_libdir}/liblo.so.* %files devel %defattr(-,root,root) %exclude %{_libdir}/liblo.la %{_libdir}/liblo.so %{_includedir}/lo %{_libdir}/pkgconfig/liblo.pc %{_mandir}/man3/* %changelog * Sat Apr 29 2006 Anthony Green 0.23-4 - Stop using command macros like __rm, __make, __mkdir and __install. * Tue Apr 25 2006 Anthony Green 0.23-3 - Don't install empty NEWS file. * Sat Apr 22 2006 Anthony Green 0.23-2 - Minor spec file improvements. * Tue Apr 18 2006 Anthony Green 0.23-1 - Update to 0.23. Build for Fedora Extras. * Wed Mar 2 2005 Fernando Lopez-Lezcano 0.22-1 - updated to 0.22 * Wed Mar 2 2005 Fernando Lopez-Lezcano 0.18-1 - updated to 0.18 * Wed Feb 23 2005 Fernando Lopez-Lezcano 0.17-1 - updated to 0.17 * Mon Jan 24 2005 Fernando Lopez-Lezcano 0.16-1 - updated to 0.16 * Tue Dec 21 2004 Fernando Lopez-Lezcano - spec file cleanup * Wed Nov 24 2004 Fernando Lopez-Lezcano 0.15-1 - updated to 0.15, exclude .la file, .a file no longer created by default build * Thu Aug 19 2004 Fernando Lopez-Lezcano 0.9-1 - updated to 0.9 * Mon Aug 9 2004 Fernando Lopez-Lezcano 0.8-1 - updated to 0.8 * Thu Apr 15 2004 Fernando Lopez-Lezcano 0.5-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liblo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 May 2006 21:20:29 -0000 1.1 +++ .cvsignore 14 May 2006 21:21:19 -0000 1.2 @@ -0,0 +1 @@ +liblo-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/liblo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 May 2006 21:20:29 -0000 1.1 +++ sources 14 May 2006 21:21:19 -0000 1.2 @@ -0,0 +1 @@ +e14c9f4fae7ed8d9622d126f6fb9c1d7 liblo-0.23.tar.gz From fedora-extras-commits at redhat.com Sun May 14 21:27:29 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Sun, 14 May 2006 14:27:29 -0700 Subject: owners owners.list,1.993,1.994 Message-ID: <200605142127.k4ELRV5A017068@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17051 Modified Files: owners.list Log Message: Add liblo. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.993 retrieving revision 1.994 diff -u -r1.993 -r1.994 --- owners.list 14 May 2006 21:11:00 -0000 1.993 +++ owners.list 14 May 2006 21:27:29 -0000 1.994 @@ -642,6 +642,7 @@ Fedora Extras|libkexif|Allow Kipi plugins to extract EXIF information|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libkipi|Common plugin infrastructure for KDE image applications|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|liblo|Open Sound Control library|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|liblrdf|Library for manipulating RDF files describing LADSPA plugins|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 00:58:06 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Sun, 14 May 2006 17:58:06 -0700 Subject: rpms/shorewall/FC-5 .cvsignore, 1.13, 1.14 shorewall.spec, 1.19, 1.20 sources, 1.13, 1.14 Message-ID: <200605150058.k4F0w8ku024627@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24606 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 31 Mar 2006 15:28:48 -0000 1.13 +++ .cvsignore 15 May 2006 00:58:05 -0000 1.14 @@ -1 +1 @@ -shorewall-3.0.6.tar.bz2 +shorewall-3.0.7.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/shorewall.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- shorewall.spec 31 Mar 2006 15:28:48 -0000 1.19 +++ shorewall.spec 15 May 2006 00:58:05 -0000 1.20 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -7,7 +7,7 @@ Group: Applications/System License: GPL URL: http://www.shorewall.net/ -Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2 +Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-3.0.7/shorewall-3.0.7.tar.bz2 Patch0: shorewall-3.0.3-init.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -80,6 +80,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Sun May 14 2006 Robert Marcano - 3.0.7-1 +- Update to upstream 3.0.7 + * Fri Mar 31 2006 Robert Marcano - 3.0.6-1 - Update to upstream 3.0.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 31 Mar 2006 15:28:48 -0000 1.13 +++ sources 15 May 2006 00:58:05 -0000 1.14 @@ -1 +1 @@ -6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 +e2fccdbea4bb33507d0d3c236b6eaaeb shorewall-3.0.7.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 01:03:01 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Sun, 14 May 2006 18:03:01 -0700 Subject: rpms/shorewall/devel .cvsignore, 1.14, 1.15 shorewall.spec, 1.20, 1.21 sources, 1.14, 1.15 Message-ID: <200605150103.k4F134m7026916@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26892 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.0-Beta7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 14 Apr 2006 04:26:17 -0000 1.14 +++ .cvsignore 15 May 2006 01:03:01 -0000 1.15 @@ -1 +1 @@ -shorewall-3.2.0-Beta4.tar.bz2 +shorewall-3.2.0-Beta7.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- shorewall.spec 14 Apr 2006 04:26:17 -0000 1.20 +++ shorewall.spec 15 May 2006 01:03:01 -0000 1.21 @@ -1,4 +1,4 @@ -%define beta_release Beta4 +%define beta_release Beta7 Name: shorewall Version: 3.2.0 @@ -9,8 +9,8 @@ Group: Applications/System License: GPL URL: http://www.shorewall.net/ -#Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2 -Source: http://www.shorewall.net/pub/shorewall/development/3.2/shorewall-%{version}-%{beta_release}/shorewall-%{version}-%{beta_release}.tar.bz2 +#Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-3.2.0/shorewall-3.2.0.tar.bz2 +Source: http://www.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-Beta7/shorewall-3.2.0-Beta7.tar.bz2 Patch0: shorewall-3.0.3-init.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -86,6 +86,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Sun May 14 2006 Robert Marcano - 3.2.0-0.1.Beta7 +- Update to upstream 3.2.0-Beta7 + * Fri Apr 14 2006 Robert Marcano - 3.2.0-0.1.Beta4 - Update to upstream 3.2.0-Beta4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 14 Apr 2006 04:26:17 -0000 1.14 +++ sources 15 May 2006 01:03:01 -0000 1.15 @@ -1 +1 @@ -37984d2c8e6f4ee220fca99ab1c451e4 shorewall-3.2.0-Beta4.tar.bz2 +7841e555192ff32562d6d97b488eec53 shorewall-3.2.0-Beta7.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 01:11:06 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Sun, 14 May 2006 18:11:06 -0700 Subject: rpms/shorewall/FC-4 .cvsignore, 1.7, 1.8 shorewall.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200605150111.k4F1B8BA027049@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27027 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 31 Mar 2006 15:28:48 -0000 1.7 +++ .cvsignore 15 May 2006 01:11:06 -0000 1.8 @@ -1 +1 @@ -shorewall-3.0.6.tar.bz2 +shorewall-3.0.7.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- shorewall.spec 31 Mar 2006 15:28:48 -0000 1.14 +++ shorewall.spec 15 May 2006 01:11:06 -0000 1.15 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.6 +Version: 3.0.7 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -7,7 +7,7 @@ Group: Applications/System License: GPL URL: http://www.shorewall.net/ -Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2 +Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-3.0.7/shorewall-3.0.7.tar.bz2 Patch0: shorewall-3.0.3-init.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -80,6 +80,9 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog +* Sun May 14 2006 Robert Marcano - 3.0.7-1 +- Update to upstream 3.0.7 + * Fri Mar 31 2006 Robert Marcano - 3.0.6-1 - Update to upstream 3.0.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 31 Mar 2006 15:28:48 -0000 1.7 +++ sources 15 May 2006 01:11:06 -0000 1.8 @@ -1 +1 @@ -6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 +e2fccdbea4bb33507d0d3c236b6eaaeb shorewall-3.0.7.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 01:26:11 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 18:26:11 -0700 Subject: rpms/darcs/devel .cvsignore, 1.5, 1.6 darcs.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605150126.k4F1QDNY027171@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27150 Modified Files: .cvsignore darcs.spec sources Log Message: - update to 1.0.7 - fix typo of propagate in description (#189651) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Mar 2006 09:25:22 -0000 1.5 +++ .cvsignore 15 May 2006 01:26:11 -0000 1.6 @@ -1 +1 @@ -darcs-1.0.6.tar.gz +darcs-1.0.7.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- darcs.spec 2 Mar 2006 09:25:22 -0000 1.8 +++ darcs.spec 15 May 2006 01:26:11 -0000 1.9 @@ -1,5 +1,5 @@ Name: darcs -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} Summary: David's advanced revision control system @@ -18,7 +18,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -35,7 +35,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -84,6 +84,10 @@ %changelog +* Sun May 14 2006 Jens Petersen - 1.0.7-1 +- update to 1.0.7 +- fix typo of propagate in description (#189651) + * Thu Mar 2 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 - darcs-createrepo is gone Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2006 09:25:22 -0000 1.5 +++ sources 15 May 2006 01:26:11 -0000 1.6 @@ -1 +1 @@ -8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz +5fe4e4e7b049c095995b9a57ea6aeece darcs-1.0.7.tar.gz From fedora-extras-commits at redhat.com Mon May 15 03:17:58 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:17:58 -0700 Subject: rpms/gtk2hs - New directory Message-ID: <200605150318.k4F3I0AS032192@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32166/gtk2hs Log Message: Directory /cvs/extras/rpms/gtk2hs added to the repository From fedora-extras-commits at redhat.com Mon May 15 03:17:58 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:17:58 -0700 Subject: rpms/gtk2hs/devel - New directory Message-ID: <200605150318.k4F3I03r032195@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32166/gtk2hs/devel Log Message: Directory /cvs/extras/rpms/gtk2hs/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 03:18:12 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:18:12 -0700 Subject: rpms/gtk2hs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605150318.k4F3IFXQ032244@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32211 Added Files: Makefile import.log Log Message: Setup of module gtk2hs --- NEW FILE Makefile --- # Top level Makefile for module gtk2hs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 03:18:13 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:18:13 -0700 Subject: rpms/gtk2hs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605150318.k4F3IFTb032247@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32211/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtk2hs --- NEW 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 May 15 03:18:55 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:18:55 -0700 Subject: rpms/gtk2hs/devel gtk2hs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605150319.k4F3JRXO032315@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32275/devel Modified Files: .cvsignore sources Added Files: gtk2hs.spec Log Message: auto-import gtk2hs-0.9.10-1 on branch devel from gtk2hs-0.9.10-1.src.rpm --- NEW FILE gtk2hs.spec --- %define ghc_version 6.4.2 %define ghcver ghc642 %define mozver 37:1.7.13 %define build_mozembed 1 %define build_cairo 1 Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs Version: 0.9.10 Release: 1%{?dist} License: LGPL Group: Development/Libraries Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz URL: http://gtk2hs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc = %{ghc_version} BuildRequires: haddock BuildRequires: gtk2-devel BuildRequires: gtksourceview-devel BuildRequires: libglade2-devel BuildRequires: GConf2-devel %if %{build_mozembed} BuildRequires: mozilla-devel = %{mozver} %endif %if %{build_cairo} BuildRequires: cairo-devel %endif %description A Gtk+ binding for the functional language Haskell featuring automatic memory management, unicode support, and wide coverage of Gtk+ 2 widgets. %package -n ghc-%{name} Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Group: Development/Libraries Requires: ghc = %{ghc_version} Requires: %{ghcver}-%{name} = %{version}-%{release} %description -n ghc-%{name} A Gtk+ binding for the functional language Haskell featuring automatic memory management, unicode support, and wide coverage of Gtk+ 2 widgets. %package -n %{ghcver}-%{name} Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Group: Development/Libraries Requires: %{ghcver} Requires: gtk2-devel Requires: GConf2-devel Requires: libglade2-devel Requires: gtksourceview-devel PreReq: %{_bindir}/ghc-pkg-%{ghc_version} %description -n %{ghcver}-%{name} A Gtk+ binding for the functional language Haskell featuring automatic memory management, unicode support, and wide coverage of Gtk+ 2 widgets. This package also includes the bindings for cairo, gconf, glade, glib, and sourceview, and the mogul wrapper library. The libraries are compiled for ghc-%{ghc_version}. %package doc Summary: Haskell Gtk+ GUI library documentation Group: Development/Libraries %description doc A Gtk+ binding for the functional language Haskell featuring automatic memory management, unicode support, and wide coverage of Gtk+ 2 widgets. This package contains the gtk2hs documentation. %if %{build_mozembed} %package -n %{ghcver}-%{name}-mozembed Summary: Haskell binding for gtkembedmoz Group: Development/Libraries Requires: %{ghcver} Requires: %{ghcver}-%{name} = %{version}-%{release} Requires: mozilla-devel = %{mozver} PreReq: %{_bindir}/ghc-pkg-%{ghc_version} %description -n %{ghcver}-%{name}-mozembed A Haskell binding of GtkEmbedMoz for gtk2hs. %endif # the debuginfo subpackage is currently empty anyway, so don't generate it %define debug_package %{nil} %define __spec_install_post /usr/lib/rpm/brp-compress %define ghclibdir %{_libdir}/ghc/%{ghc_version} %define gtk2hsdir %{ghclibdir}/%{name} %prep %setup -q -n %{name}-%{version} %build %configure \ --with-hc=ghc-%{ghc_version} \ --prefix=%{_prefix} \ --libdir=%{ghclibdir} \ --enable-packager-mode \ --enable-docs \ --enable-libglade \ --enable-gconf \ --enable-sourceview \ %if %{build_mozembed} --enable-mozilla \ %endif %if %{build_cairo} --enable-cairo %endif LANG=C make all %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install # make ghost files for i in gconf glade glib gtk mogul sourceview \ %if %{build_cairo} cairo \ %endif %if %{build_mozembed} mozembed \ %endif ; do touch %{buildroot}%{gtk2hsdir}/HS${i}.o done # remove installed docdir files rm -rf %{buildroot}%{_defaultdocdir}/%{name} %clean rm -rf %{buildroot} %define ghcpkg_inst() ghc-pkg-%{ghc_version} update --auto-ghci-libs %{gtk2hsdir}/%{1}.package.conf &>/dev/null %define ghcpkg_uninst() ghc-pkg-%{ghc_version} unregister %{1} &>/dev/null || : %post -n %{ghcver}-%{name} for i in glib \ %if %{build_cairo} cairo \ %endif gtk \ mogul \ gconf \ glade \ sourceview \ ; do %{ghcpkg_inst $i} done %if %{build_mozembed} %post -n %{ghcver}-%{name}-mozembed %{ghcpkg_inst mozembed} %endif %preun -n %{ghcver}-%{name} if [ "$1" = 0 ]; then for i in \ gconf \ glade \ sourceview \ mogul \ gtk \ %if %{build_cairo} cairo \ %endif glib \ ; do %{ghcpkg_uninst $i} done fi %if %{build_mozembed} %preun -n %{ghcver}-%{name}-mozembed if [ "$1" = 0 ]; then %{ghcpkg_uninst mozembed} fi %endif %files -n ghc-%{name} %defattr(-,root,root) %files -n %{ghcver}-%{name} %defattr(-,root,root) %doc AUTHORS COPYING.LIB %dir %{_libdir}/ghc %dir %{ghclibdir} %dir %{gtk2hsdir} %{gtk2hsdir}/gtk.package.conf %{gtk2hsdir}/libHSgtk.a %ghost %{gtk2hsdir}/HSgtk.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/gtk %if %{build_cairo} %{gtk2hsdir}/cairo.package.conf %{gtk2hsdir}/libHScairo.a %ghost %{gtk2hsdir}/HScairo.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/cairo %endif %{gtk2hsdir}/gconf.package.conf %{gtk2hsdir}/libHSgconf.a %ghost %{gtk2hsdir}/HSgconf.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/gconf %{gtk2hsdir}/glade.package.conf %{gtk2hsdir}/libHSglade.a %ghost %{gtk2hsdir}/HSglade.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/glade %{gtk2hsdir}/glib.package.conf %{gtk2hsdir}/libHSglib.a %ghost %{gtk2hsdir}/HSglib.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/glib %dir %{gtk2hsdir}/include %{gtk2hsdir}/include/gtk2hs-config.h %{gtk2hsdir}/mogul.package.conf %{gtk2hsdir}/libHSmogul.a %ghost %{gtk2hsdir}/HSmogul.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/mogul %{gtk2hsdir}/sourceview.package.conf %{gtk2hsdir}/libHSsourceview.a %ghost %{gtk2hsdir}/HSsourceview.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/sourceview %files doc %defattr(-,root,root) %doc docs/reference %doc ChangeLog TODO demo %if %{build_mozembed} %files -n %{ghcver}-%{name}-mozembed %{gtk2hsdir}/mozembed.package.conf %{gtk2hsdir}/libHSmozembed.a %ghost %{gtk2hsdir}/HSmozembed.o %dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/mozembed %endif %changelog * Mon May 15 2006 Jens Petersen - 0.9.10-1 - rework packaging to keep all the ghc packages together except mozembed - update mozilla version to 1.7.13 * Mon May 1 2006 G??rard Milmeister - spec file cleanup - ghost the .o files generated at install time - move the docs to a versioned dir and include the demos - make all subpackages own %%{_libdir}/ghc * Tue Apr 25 2006 Jens Petersen - use module names for the subpackages - subpackage mogul - own the include dir * Sat Apr 22 2006 Jens Petersen - initial packaging for Fedora Extras - define ghcpkg_inst and ghcpkg_uninst for post and preun scripts and silence ghc-pkg - own include/ * Wed Oct 26 2005 Jens Petersen - 0.9.9.7-0 - rc * Wed Sep 21 2005 Jens Petersen - 0.9.9-2 - build with ghc-6.4.1 * Sat Jul 30 2005 Jens Petersen - 0.9.8-3 - drop old conflicts * Tue Jul 5 2005 Jens Petersen - 0.9.8-2 - use %%configure to configure for arch to avoid gclosure ghci-6.4 linking problems on i386 * Wed Jun 22 2005 Jens Petersen - 0.9.8-1 - update to 0.9.8 - use new --enable-packager-mode and --enable-* configure options * Thu Jun 9 2005 Jens Petersen - 0.9.7.91 - update to rc1 - add build_mozembed macro and use it * Mon May 9 2005 Jens Petersen - 0.9.7-2 - add gtk2hs-0.9.7-ghc64.patch and build with ghc-6.4 (Duncan Coutts) - .pkg files are now .cabal files * Tue Jan 18 2005 Duncan Coutts - cleanup requirements, summaries, descriptions, and configure invocation - update preun scripts * Thu Aug 19 2004 Jens Petersen - use suffix -ghc621 instead of -ghc6.2.1 and conflict with old packages - buildrequire ghc-doc and gtk2hs-doc-ghc621 requires ghc-doc - move docs and demo files to %{_defaultdocdir}/gtk2hs * Mon Aug 16 2004 Jens Petersen - update to 0.9.6 * Thu Jul 22 2004 Jens Petersen - split sourceview and glade into separate subpackages - require -devel packages rather than lib pkg for gtk2, gtksourceview, and libglade2 * Wed Mar 24 2004 Jens Petersen - enable gtksourceview and glade configure options - use mkdir -p instead of mkdirhier - update file locations in %%post and %%preun scripts - buildrequire libglade2-devel * Tue Nov 11 2003 Jens Petersen - use %%c2hs instead of "--with c2hs" to configure c2hs program - clean demo to avoid binary files in docs dir * Mon Nov 3 2003 Jens Petersen - add sourceview package to %%post and %%preun - install gtksourceview haskell.lang language-spec * Thu Jul 31 2003 Jens Petersen - build with ghc-6.0.1 - put demo dir in docs dir rather than individual source files * Thu Jul 10 2003 Jens Petersen - build with ghc-6.0 - name ghc subpackage "ghc%%{ghc_version}" * Wed Jun 18 2003 Jens Petersen - require and buildrequire %{_bindir}/ghc-%%{ghc_version} * Wed May 21 2003 Jens Petersen - add -g option to ghc-pkg -u so that ghci object gets generated - delete them when uninstalling - build and include mogul documentation * Thu May 15 2003 Jens Petersen - use new DESTDIR make variable, so no longer need to fix config files in post - remove buildroot before install - build and include gtk docs * Fri Jan 10 2003 Jens Petersen - made into .spec.in file - let configure set the version - update description - introduce --with-c2hs rpmbuild option - use perl to remove buildroot traces from package conf files - simplify ghc-pkg update commands * Tue Dec 17 2002 Jens Petersen - latest cvs with ghc 5.04.2 * Thu Sep 26 2002 Jens Petersen - build with ghc-5.04.1 * Fri Aug 2 2002 Jens Petersen - only include demo source in doc dir * Fri Jul 26 2002 Jens Petersen - build with ghc-5.04 - cvs update * Wed Jul 10 2002 Jens Petersen - my current branch * Wed May 1 2002 Jens Petersen - patch TreeViewColumn.chs to make it usable * Tue Apr 23 2002 Jens Petersen - 0.9.0 - update gtk2 and mogul ghc-pkg entries on upgrade * Fri Apr 12 2002 Jens Petersen - adapt for gtk2hs - fix mk files for buildroot install - post and postun scriptlets for pkg config * Tue Mar 12 2002 Manuel Chakravarty - require a specific Haskell compiler (namely, the one for which the packages was compiled) * Sat Feb 17 2001 Manuel Chakravarty - derived from C->Haskell's .spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 03:18:13 -0000 1.1 +++ .cvsignore 15 May 2006 03:18:55 -0000 1.2 @@ -0,0 +1 @@ +gtk2hs-0.9.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 03:18:13 -0000 1.1 +++ sources 15 May 2006 03:18:55 -0000 1.2 @@ -0,0 +1 @@ +13d300e07153f37ba5893ac336b078bc gtk2hs-0.9.10.tar.gz From fedora-extras-commits at redhat.com Mon May 15 03:18:54 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 20:18:54 -0700 Subject: rpms/gtk2hs import.log,1.1,1.2 Message-ID: <200605150319.k4F3JQcC032311@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32275 Modified Files: import.log Log Message: auto-import gtk2hs-0.9.10-1 on branch devel from gtk2hs-0.9.10-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 03:18:12 -0000 1.1 +++ import.log 15 May 2006 03:18:54 -0000 1.2 @@ -0,0 +1 @@ +gtk2hs-0_9_10-1:HEAD:gtk2hs-0.9.10-1.src.rpm:1147663127 From fedora-extras-commits at redhat.com Mon May 15 05:15:52 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 14 May 2006 22:15:52 -0700 Subject: owners owners.list,1.994,1.995 Message-ID: <200605150515.k4F5FsNc004785@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4768 Modified Files: owners.list Log Message: add gtk2hs Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.994 retrieving revision 1.995 diff -u -r1.994 -r1.995 --- owners.list 14 May 2006 21:27:29 -0000 1.994 +++ owners.list 15 May 2006 05:15:51 -0000 1.995 @@ -449,6 +449,7 @@ Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| +Fedora Extras|gtk2hs|A Haskell binding of the Gtk+ toolkit|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 06:00:31 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:00:31 -0700 Subject: rpms/hspell/FC-5 hspell.spec,1.3,1.4 Message-ID: <200605150600.k4F60X9O005001@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4984 Modified Files: hspell.spec Log Message: bump to upcoming hspell v1.0 Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/hspell.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hspell.spec 28 Feb 2006 18:30:56 -0000 1.3 +++ hspell.spec 15 May 2006 06:00:31 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell -Version: 0.9 -Release: 7%{?dist} +Version: 1.0 +Release: 1%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -18,21 +18,20 @@ morphological analizer (-l), that prints all known meanings of a Hebrew string. -Note: it is a fully working Hebrew spellchecker, not a toy release. On typical -documents it should recognize the majority of correct words. However, users -of this release must take into account that it still will not recognize *all* -the correct words; The dictionary is still admittedly not complete, and this -situation will continue to improve in the next releases. On the other hand, -barring bugs Hspell should not recognize incorrect words - extreme attention -has been given to the correctness and consistency of the dictionary. +On typical documents Hspell recognizes the majority of correct words. However, +users must take into account that it still will not recognize *all* the correct +words; The dictionary is still not complete, and this situation will continue +to improve in the next releases. On the other hand, barring bugs Hspell should +not recognize incorrect words - extreme attention has been given to the +correctness and consistency of the dictionary. %description -l he -Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ?????? -??????? ???????? ????. ?? ???? ?????, ???? ??? ????? ???? ????? - ????? ?????? -???? ???? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ???? *??* ????? -?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(. ??? ??, -Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ?? ????????? -???????? ?? ?????? ?????? ?????. +Hspell ?????? ?????????? ????????, ?????????? (??????????????) ???????? ????????-spell - ???????? ?????????? ???? ???????????? +?????????????? ???????????????? ????????. ?????????? ???????????? ???????? ??????????, ???????? ?????? ?????????? ???????? ?????????? - ???? +?????????? ???????????? ?????????? ???????????? ?????? ?????????????? ??????????????. ???????????? ???????? ????-?????? ???????????? ???????? +*????* ???????? ???????????? ?????????? ????-???? ???????? ?????????????? ???????????? ?????????? ?????? ?????????? )"???????? ??????"(. +?????? ????, Hspell ???????? (-l) ???????? ?????????????????? ???????? (????-???? ???? ??????) ?????? ?????????? ???? ???? +?????????????????? ???????????????? ???? ???????????? ???????????? ??????????. %package devel Summary: Library and include files for Hspell, the hebrew spell checker @@ -43,7 +42,7 @@ Library and include files for applications that want to use Hspell. %description -l he devel -?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell. +???????????? ???????????? ?????????? ???????? ?????????????? ???????????? ???????????? ??-Hspell. %prep %setup -q @@ -75,6 +74,9 @@ %{_mandir}/man3/hspell.3* %changelog +* Sun May 15 2006 Dan Kenigsberg 1.0-1 +- new upstream release. +- Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 - Rebuild for Fedora Extras 5 * Mon Sep 26 2005 Dan Kenigsberg 0.9-6 From fedora-extras-commits at redhat.com Mon May 15 06:03:32 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:03:32 -0700 Subject: rpms/hspell/FC-4 hspell.spec,1.2,1.3 Message-ID: <200605150603.k4F63Yw0007294@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7277/FC-4 Modified Files: hspell.spec Log Message: hspell v1.0 Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hspell.spec 27 Sep 2005 16:34:38 -0000 1.2 +++ hspell.spec 15 May 2006 06:03:31 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell -Version: 0.9 -Release: 6.fc4 +Version: 1.0 +Release: 1%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -18,21 +18,20 @@ morphological analizer (-l), that prints all known meanings of a Hebrew string. -Note: it is a fully working Hebrew spellchecker, not a toy release. On typical -documents it should recognize the majority of correct words. However, users -of this release must take into account that it still will not recognize *all* -the correct words; The dictionary is still admittedly not complete, and this -situation will continue to improve in the next releases. On the other hand, -barring bugs Hspell should not recognize incorrect words - extreme attention -has been given to the correctness and consistency of the dictionary. +On typical documents Hspell recognizes the majority of correct words. However, +users must take into account that it still will not recognize *all* the correct +words; The dictionary is still not complete, and this situation will continue +to improve in the next releases. On the other hand, barring bugs Hspell should +not recognize incorrect words - extreme attention has been given to the +correctness and consistency of the dictionary. %description -l he -Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ?????? -??????? ???????? ????. ?? ???? ?????, ???? ??? ????? ???? ????? - ????? ?????? -???? ???? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ???? *??* ????? -?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(. ??? ??, -Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ?? ????????? -???????? ?? ?????? ?????? ?????. +Hspell ?????? ?????????? ????????, ?????????? (??????????????) ???????? ????????-spell - ???????? ?????????? ???? ???????????? +?????????????? ???????????????? ????????. ?????????? ???????????? ???????? ??????????, ???????? ?????? ?????????? ???????? ?????????? - ???? +?????????? ???????????? ?????????? ???????????? ?????? ?????????????? ??????????????. ???????????? ???????? ????-?????? ???????????? ???????? +*????* ???????? ???????????? ?????????? ????-???? ???????? ?????????????? ???????????? ?????????? ?????? ?????????? )"???????? ??????"(. +?????? ????, Hspell ???????? (-l) ???????? ?????????????????? ???????? (????-???? ???? ??????) ?????? ?????????? ???? ???? +?????????????????? ???????????????? ???? ???????????? ???????????? ??????????. %package devel Summary: Library and include files for Hspell, the hebrew spell checker @@ -43,7 +42,7 @@ Library and include files for applications that want to use Hspell. %description -l he devel -?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell. +???????????? ???????????? ?????????? ???????? ?????????????? ???????????? ???????????? ??-Hspell. %prep %setup -q @@ -75,7 +74,12 @@ %{_mandir}/man3/hspell.3* %changelog -* Mon Sep 26 2005 Dan Kenigsberg 0.9-6.fc4 +* Sun May 15 2006 Dan Kenigsberg 1.0-1 +- new upstream release. +- Hebrew description converted to utf8. +* Tue Feb 28 2006 Dan Kenigsberg 0.9-7 +- Rebuild for Fedora Extras 5 +* Mon Sep 26 2005 Dan Kenigsberg 0.9-6 - Add the text of the GPL to the binary package. It seems that I'll do anything to make my sponsor Tom happy. * Thu Sep 23 2005 Dan Kenigsberg 0.9-5 From fedora-extras-commits at redhat.com Mon May 15 06:06:17 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:06:17 -0700 Subject: rpms/hspell/devel hspell.spec,1.3,1.4 Message-ID: <200605150606.k4F66JOt007358@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7339 Modified Files: hspell.spec Log Message: hspell v1.0 Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/hspell.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hspell.spec 28 Feb 2006 18:30:56 -0000 1.3 +++ hspell.spec 15 May 2006 06:06:17 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell -Version: 0.9 -Release: 7%{?dist} +Version: 1.0 +Release: 1%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -18,21 +18,20 @@ morphological analizer (-l), that prints all known meanings of a Hebrew string. -Note: it is a fully working Hebrew spellchecker, not a toy release. On typical -documents it should recognize the majority of correct words. However, users -of this release must take into account that it still will not recognize *all* -the correct words; The dictionary is still admittedly not complete, and this -situation will continue to improve in the next releases. On the other hand, -barring bugs Hspell should not recognize incorrect words - extreme attention -has been given to the correctness and consistency of the dictionary. +On typical documents Hspell recognizes the majority of correct words. However, +users must take into account that it still will not recognize *all* the correct +words; The dictionary is still not complete, and this situation will continue +to improve in the next releases. On the other hand, barring bugs Hspell should +not recognize incorrect words - extreme attention has been given to the +correctness and consistency of the dictionary. %description -l he -Hspell ??? ????? ????, ????? (???????) ???? ????-spell - ???? ????? ?? ?????? -??????? ???????? ????. ?? ???? ?????, ???? ??? ????? ???? ????? - ????? ?????? -???? ???? ?????? ??? ??????? ???????. ?????? ???? ??-??? ?????? ???? *??* ????? -?????? ????? ??-?? ???? ??????? ?????? ????? ??? ????? )"???? ???"(. ??? ??, -Hspell ???? (-l) ???? ????????? ???? (??-?? ?? ???) ??? ????? ?? ?? ????????? -???????? ?? ?????? ?????? ?????. +Hspell ?????? ?????????? ????????, ?????????? (??????????????) ???????? ????????-spell - ???????? ?????????? ???? ???????????? +?????????????? ???????????????? ????????. ?????????? ???????????? ???????? ??????????, ???????? ?????? ?????????? ???????? ?????????? - ???? +?????????? ???????????? ?????????? ???????????? ?????? ?????????????? ??????????????. ???????????? ???????? ????-?????? ???????????? ???????? +*????* ???????? ???????????? ?????????? ????-???? ???????? ?????????????? ???????????? ?????????? ?????? ?????????? )"???????? ??????"(. +?????? ????, Hspell ???????? (-l) ???????? ?????????????????? ???????? (????-???? ???? ??????) ?????? ?????????? ???? ???? +?????????????????? ???????????????? ???? ???????????? ???????????? ??????????. %package devel Summary: Library and include files for Hspell, the hebrew spell checker @@ -43,7 +42,7 @@ Library and include files for applications that want to use Hspell. %description -l he devel -?????? ?????? ????? ???? ??????? ?????? ?????? ?-Hspell. +???????????? ???????????? ?????????? ???????? ?????????????? ???????????? ???????????? ??-Hspell. %prep %setup -q @@ -75,6 +74,9 @@ %{_mandir}/man3/hspell.3* %changelog +* Sun May 15 2006 Dan Kenigsberg 1.0-1 +- new upstream release. +- Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 - Rebuild for Fedora Extras 5 * Mon Sep 26 2005 Dan Kenigsberg 0.9-6 From fedora-extras-commits at redhat.com Mon May 15 06:28:20 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:28:20 -0700 Subject: rpms/hspell/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605150628.k4F6SMNG007469@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7450 Modified Files: .cvsignore sources Log Message: new tarball uploaded Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:18:54 -0000 1.2 +++ .cvsignore 15 May 2006 06:28:20 -0000 1.3 @@ -1 +1 @@ -hspell-0.9.tar.gz +hspell-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:18:54 -0000 1.2 +++ sources 15 May 2006 06:28:20 -0000 1.3 @@ -1 +1 @@ -6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz +3e12fa383c2cfd430918d115f33f9841 hspell-1.0.tar.gz From fedora-extras-commits at redhat.com Mon May 15 06:30:30 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:30:30 -0700 Subject: rpms/hspell/FC-4 hspell.spec,1.3,1.4 Message-ID: <200605150630.k4F6UWJa007548@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7521 Modified Files: hspell.spec Log Message: force another build. previously I forgot to upload the new tarball Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hspell.spec 15 May 2006 06:03:31 -0000 1.3 +++ hspell.spec 15 May 2006 06:30:30 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -74,7 +74,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Sun May 15 2006 Dan Kenigsberg 1.0-1 +* Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 From fedora-extras-commits at redhat.com Mon May 15 06:32:07 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:32:07 -0700 Subject: rpms/hspell/FC-4 hspell.spec,1.4,1.5 Message-ID: <200605150632.k4F6W9Uq007609@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7588 Modified Files: hspell.spec Log Message: I probably should have tried the cvs in a sandbox... Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hspell.spec 15 May 2006 06:30:30 -0000 1.4 +++ hspell.spec 15 May 2006 06:32:07 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -74,7 +74,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Sun May 15 2006 Dan Kenigsberg 1.0-2 +* Sun May 15 2006 Dan Kenigsberg 1.0-3 - new upstream release. - Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 From fedora-extras-commits at redhat.com Mon May 15 06:54:43 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sun, 14 May 2006 23:54:43 -0700 Subject: rpms/hspell/FC-5 .cvsignore, 1.2, 1.3 hspell.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200605150654.k4F6sj4I007726@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7705 Modified Files: .cvsignore hspell.spec sources Log Message: force rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:18:54 -0000 1.2 +++ .cvsignore 15 May 2006 06:54:42 -0000 1.3 @@ -1 +1 @@ -hspell-0.9.tar.gz +hspell-1.0.tar.gz Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/hspell.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hspell.spec 15 May 2006 06:00:31 -0000 1.4 +++ hspell.spec 15 May 2006 06:54:42 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -74,7 +74,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Sun May 15 2006 Dan Kenigsberg 1.0-1 +* Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:18:54 -0000 1.2 +++ sources 15 May 2006 06:54:42 -0000 1.3 @@ -1 +1 @@ -6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz +3e12fa383c2cfd430918d115f33f9841 hspell-1.0.tar.gz From fedora-extras-commits at redhat.com Mon May 15 07:00:50 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 15 May 2006 00:00:50 -0700 Subject: rpms/bzflag/devel bzflag.spec,1.24,1.25 Message-ID: <200605150700.k4F70qfu007853@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7813 Modified Files: bzflag.spec Log Message: delete blank line Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- bzflag.spec 12 May 2006 08:31:31 -0000 1.24 +++ bzflag.spec 15 May 2006 07:00:50 -0000 1.25 @@ -1,5 +1,4 @@ # Use --with/--without modular_X to rebuild with/without modular X deps - %if 0%{?fedora} %if 0%{?fedora} < 5 # default to non-modular X on FC < 5 From fedora-extras-commits at redhat.com Mon May 15 07:00:49 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 15 May 2006 00:00:49 -0700 Subject: rpms/hspell/devel .cvsignore, 1.2, 1.3 hspell.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200605150700.k4F70p9W007849@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7809 Modified Files: .cvsignore hspell.spec sources Log Message: rebuild hspell v1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 17:18:54 -0000 1.2 +++ .cvsignore 15 May 2006 07:00:49 -0000 1.3 @@ -1 +1,2 @@ hspell-0.9.tar.gz +hspell-1.0.tar.gz Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/hspell.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hspell.spec 15 May 2006 06:06:17 -0000 1.4 +++ hspell.spec 15 May 2006 07:00:49 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -74,7 +74,7 @@ %{_mandir}/man3/hspell.3* %changelog -* Sun May 15 2006 Dan Kenigsberg 1.0-1 +* Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. * Tue Feb 28 2006 Dan Kenigsberg 0.9-7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 17:18:54 -0000 1.2 +++ sources 15 May 2006 07:00:49 -0000 1.3 @@ -1 +1,2 @@ 6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz +3e12fa383c2cfd430918d115f33f9841 hspell-1.0.tar.gz From fedora-extras-commits at redhat.com Mon May 15 07:05:57 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 15 May 2006 00:05:57 -0700 Subject: rpms/aspell-he/FC-5 .cvsignore, 1.2, 1.3 aspell-he.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605150705.k4F75xN8010176@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/aspell-he/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10155 Modified Files: .cvsignore aspell-he.spec sources Log Message: for hspell v1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aspell-he/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2006 22:08:10 -0000 1.2 +++ .cvsignore 15 May 2006 07:05:57 -0000 1.3 @@ -1 +1,2 @@ aspell6-he-0.9-0.tar.bz2 +aspell6-he-1.0-0.tar.bz2 Index: aspell-he.spec =================================================================== RCS file: /cvs/extras/rpms/aspell-he/FC-5/aspell-he.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aspell-he.spec 23 Apr 2006 22:08:10 -0000 1.1 +++ aspell-he.spec 15 May 2006 07:05:57 -0000 1.2 @@ -2,8 +2,8 @@ %define langrelease 0 Summary: Hebrew dictionary for Aspell Name: aspell-%{lang} -Version: 0.9 -Release: 2%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -52,6 +52,8 @@ %{_libdir}/aspell-0.60/* %changelog +* Mon May 15 2006 Dan Kenigsberg 1.0-1 +- new Hspell version. * Sun Apr 23 2006 Dan Kenigsberg 0.9-2 - Cleaned the spec file according to Bug 189157. - Added a comment explaining why the rpmlint gives Errors for this package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/aspell-he/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2006 22:08:10 -0000 1.2 +++ sources 15 May 2006 07:05:57 -0000 1.3 @@ -1 +1,2 @@ f453989e1df364af9479e893c16ac9d8 aspell6-he-0.9-0.tar.bz2 +71791e0299787391d2ace1c850b5b434 aspell6-he-1.0-0.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 07:08:23 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Mon, 15 May 2006 00:08:23 -0700 Subject: rpms/aspell-he/devel .cvsignore, 1.2, 1.3 aspell-he.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605150708.k4F78PSM010273@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/aspell-he/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10252 Modified Files: .cvsignore aspell-he.spec sources Log Message: for hspell v1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aspell-he/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2006 22:08:10 -0000 1.2 +++ .cvsignore 15 May 2006 07:08:23 -0000 1.3 @@ -1 +1,2 @@ aspell6-he-0.9-0.tar.bz2 +aspell6-he-1.0-0.tar.bz2 Index: aspell-he.spec =================================================================== RCS file: /cvs/extras/rpms/aspell-he/devel/aspell-he.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aspell-he.spec 23 Apr 2006 22:08:10 -0000 1.1 +++ aspell-he.spec 15 May 2006 07:08:23 -0000 1.2 @@ -2,8 +2,8 @@ %define langrelease 0 Summary: Hebrew dictionary for Aspell Name: aspell-%{lang} -Version: 0.9 -Release: 2%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -52,6 +52,8 @@ %{_libdir}/aspell-0.60/* %changelog +* Mon May 15 2006 Dan Kenigsberg 1.0-1 +- new Hspell version. * Sun Apr 23 2006 Dan Kenigsberg 0.9-2 - Cleaned the spec file according to Bug 189157. - Added a comment explaining why the rpmlint gives Errors for this package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/aspell-he/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2006 22:08:10 -0000 1.2 +++ sources 15 May 2006 07:08:23 -0000 1.3 @@ -1 +1,2 @@ f453989e1df364af9479e893c16ac9d8 aspell6-he-0.9-0.tar.bz2 +71791e0299787391d2ace1c850b5b434 aspell6-he-1.0-0.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 07:22:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 00:22:54 -0700 Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 sylpheed-claws.spec, 1.41, 1.42 Message-ID: <200605150722.k4F7Mu9Y010431@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/FC-5 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 21 Apr 2006 22:38:25 -0000 1.17 +++ .cvsignore 15 May 2006 07:22:54 -0000 1.18 @@ -1 +1 @@ -sylpheed-claws-2.1.1.tar.bz2 +sylpheed-claws-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 21 Apr 2006 22:38:25 -0000 1.18 +++ sources 15 May 2006 07:22:54 -0000 1.19 @@ -1 +1 @@ -8d7b1d01c4f236a5e7d3e139bf43cd5a sylpheed-claws-2.1.1.tar.bz2 +4a047d028327c0e7b3ef0b058bd62d91 sylpheed-claws-2.2.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sylpheed-claws.spec 21 Apr 2006 22:38:25 -0000 1.41 +++ sylpheed-claws.spec 15 May 2006 07:22:54 -0000 1.42 @@ -1,11 +1,11 @@ Name: sylpheed-claws -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.2.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -155,6 +155,10 @@ %{_libdir}/sylpheed-claws/plugins/pgp*.so %changelog +* Mon May 08 2006 Andreas Bierfert +2.2.0-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 2.1.1-1 - split plugins from main package to ease requirements (#189113) From fedora-extras-commits at redhat.com Mon May 15 07:22:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 00:22:53 -0700 Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 sylpheed-claws.spec, 1.34, 1.35 Message-ID: <200605150723.k4F7MtYN010427@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-serv10371/FC-4 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 21 Apr 2006 22:38:24 -0000 1.14 +++ .cvsignore 15 May 2006 07:22:53 -0000 1.15 @@ -1 +1 @@ -sylpheed-claws-2.1.1.tar.bz2 +sylpheed-claws-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 21 Apr 2006 22:38:24 -0000 1.15 +++ sources 15 May 2006 07:22:53 -0000 1.16 @@ -1 +1 @@ -8d7b1d01c4f236a5e7d3e139bf43cd5a sylpheed-claws-2.1.1.tar.bz2 +4a047d028327c0e7b3ef0b058bd62d91 sylpheed-claws-2.2.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sylpheed-claws.spec 22 Apr 2006 00:05:09 -0000 1.34 +++ sylpheed-claws.spec 15 May 2006 07:22:53 -0000 1.35 @@ -1,13 +1,13 @@ %define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi ) Name: sylpheed-claws -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.2.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -163,6 +163,9 @@ %{_libdir}/sylpheed-claws/plugins/pgp*.so %changelog +* Mon May 15 2006 Andreas Bierfert +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert - split plugins from main package to ease requirements (#189113) - version upgrade (#183357) From fedora-extras-commits at redhat.com Mon May 15 07:22:55 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 00:22:55 -0700 Subject: rpms/sylpheed-claws/devel .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 sylpheed-claws.spec, 1.41, 1.42 Message-ID: <200605150723.k4F7MvNE010438@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/devel Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 21 Apr 2006 22:38:25 -0000 1.17 +++ .cvsignore 15 May 2006 07:22:54 -0000 1.18 @@ -1 +1 @@ -sylpheed-claws-2.1.1.tar.bz2 +sylpheed-claws-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 21 Apr 2006 22:38:25 -0000 1.18 +++ sources 15 May 2006 07:22:55 -0000 1.19 @@ -1 +1 @@ -8d7b1d01c4f236a5e7d3e139bf43cd5a sylpheed-claws-2.1.1.tar.bz2 +4a047d028327c0e7b3ef0b058bd62d91 sylpheed-claws-2.2.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sylpheed-claws.spec 21 Apr 2006 22:38:25 -0000 1.41 +++ sylpheed-claws.spec 15 May 2006 07:22:55 -0000 1.42 @@ -1,11 +1,11 @@ Name: sylpheed-claws -Version: 2.1.1 +Version: 2.2.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.2.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -155,6 +155,10 @@ %{_libdir}/sylpheed-claws/plugins/pgp*.so %changelog +* Mon May 08 2006 Andreas Bierfert +2.2.0-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 2.1.1-1 - split plugins from main package to ease requirements (#189113) From fedora-extras-commits at redhat.com Mon May 15 07:26:08 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:26:08 -0700 Subject: rpms/adplug - New directory Message-ID: <200605150726.k4F7QAtr010522@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501/adplug Log Message: Directory /cvs/extras/rpms/adplug added to the repository From fedora-extras-commits at redhat.com Mon May 15 07:26:08 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:26:08 -0700 Subject: rpms/adplug/devel - New directory Message-ID: <200605150726.k4F7QAvW010525@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501/adplug/devel Log Message: Directory /cvs/extras/rpms/adplug/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 07:26:29 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:26:29 -0700 Subject: rpms/adplug Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605150726.k4F7QV78010576@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10548 Added Files: Makefile import.log Log Message: Setup of module adplug --- NEW FILE Makefile --- # Top level Makefile for module adplug all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 07:26:29 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:26:29 -0700 Subject: rpms/adplug/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605150726.k4F7QVpK010579@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10548/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module adplug --- NEW 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 May 15 07:29:04 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:29:04 -0700 Subject: rpms/adplug import.log,1.1,1.2 Message-ID: <200605150729.k4F7T61i010662@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10628 Modified Files: import.log Log Message: auto-import adplug-2.0-2 on branch devel from adplug-2.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/adplug/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 07:26:28 -0000 1.1 +++ import.log 15 May 2006 07:29:04 -0000 1.2 @@ -0,0 +1 @@ +adplug-2_0-2:HEAD:adplug-2.0-2.src.rpm:1147678133 From fedora-extras-commits at redhat.com Mon May 15 07:29:05 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 May 2006 00:29:05 -0700 Subject: rpms/adplug/devel adplug-1.5.1-texinfo.patch, NONE, 1.1 adplug.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605150729.k4F7T7qm010669@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/adplug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10628/devel Modified Files: .cvsignore sources Added Files: adplug-1.5.1-texinfo.patch adplug.spec Log Message: auto-import adplug-2.0-2 on branch devel from adplug-2.0-2.src.rpm adplug-1.5.1-texinfo.patch: --- NEW FILE adplug-1.5.1-texinfo.patch --- diff -ur adplug-1.5.1.orig/doc/libadplug.texi adplug-1.5.1/doc/libadplug.texi --- adplug-1.5.1.orig/doc/libadplug.texi 2006-01-01 23:49:53.000000000 +0100 +++ adplug-1.5.1/doc/libadplug.texi 2006-01-01 23:50:04.000000000 +0100 @@ -1,7 +1,6 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @setfilename libadplug.info - at include version.texi @settitle AdPlug Core Library @value{VERSION} Manual @c %**end of header --- NEW FILE adplug.spec --- # SPEC file for AdPlug, primary target is the Fedora Extras # RPM repository. Name: adplug Version: 2.0 Release: 2%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplug.db Patch0: adplug-1.5.1-texinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig BuildRequires: texinfo # This is to resolve the endless disputes of the shared data for this # package. Whenever _sharedstatedir contains something acceptable to # Fedora that can be used instead. %define shareddata %{_localstatedir}/lib %description AdPlug is a free software, cross-platform, hardware independent AdLib sound player library, mainly written in C++ and released under the LGPL. AdPlug plays sound data, originally created for the AdLib (OPL2) audio board, directly from its original format on top of an OPL2 emulator or by using the real hardware. No OPL chip is required for playback. It supports various audio formats from MS-DOS AdLib trackers. %package devel Summary: Development files for AdPlug Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: libbinio-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description devel This package contains development files for the AdPlug AdLib (OPL2) emulator. %prep %setup -q # This removes the version.texi dependency %patch0 -p1 %build %configure --disable-static --sharedstatedir=%{shareddata} --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name} install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{shareddata}/%{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel /sbin/install-info %{_infodir}/libadplug.info.gz %{_infodir}/dir || : %preun devel if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/libadplug.info.gz %{_infodir}/dir || : fi %files %defattr(-, root, root) %{_libdir}/*.so.* %dir %{shareddata}/%{name}/ %config(noreplace) %{shareddata}/%{name}/adplug.db %{_bindir}/adplugdb %{_mandir}/man1/adplugdb.1* %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO %files devel %defattr(-, root, root) %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_infodir}/*.gz %changelog * Mon May 15 2006 Linus Walleij 2.0-2 - Tell package to avoid rpath, import to FE after review by John Mahowald. * Sat May 6 2006 Linus Walleij 2.0-1 - Upstream release the stuff they've been working on for some time now! * Thu Apr 6 2006 Linus Walleij 1.5.1-8.20060323cvs - Realize that /var/adplug/adplug.db is a real nice place to keep the database actually. And it is obviously OK to create and own directories under /var/lib as opposed to /var. * Thu Mar 31 2006 Linus Walleij 1.5.1-7.20060323cvs - Patching to move database from /var/adplug to just /var since FHS does not like creation of directories under /var. * Thu Mar 23 2006 Linus Walleij 1.5.1-6.20060323cvs - Hardcoding the place to store adplugdb since the dispute regarding its location never seem to resolve. /var/adplug should be acceptable for this package atleast. Also getting a bugfix from CVS. * Sat Mar 4 2006 Linus Walleij 1.5.1-5.20060228cvs - Include adplug.db too, everyone will want it anyway * Tue Feb 28 2006 Linus Walleij 1.5.1-4.20060228cvs - Pushed upstream to move adplugdb to sharedstatedir /usr/com * Sun Jan 15 2006 Linus Walleij 1.5.1-3.20060101cvs - Fixed scriptlet problems under non-shell environments. - Make adplug-devel require libbinio-devel. * Sun Jan 09 2006 Linus Walleij 1.5.1-2.20060101cvs - Did a clean-up rollercoaster ride. * Sun Jan 01 2006 Linus Walleij 1.5.1-1.20060101cvs - We need the CVS version to get going (fixes were initialized in upstream by ourselves so we should eat our own dogfood). * Tue Oct 11 2005 Linus Walleij 1.5.1-1 - First try at an AdPlug RPM. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adplug/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 07:26:29 -0000 1.1 +++ .cvsignore 15 May 2006 07:29:04 -0000 1.2 @@ -0,0 +1,2 @@ +adplug-2.0.tar.bz2 +adplug.db Index: sources =================================================================== RCS file: /cvs/extras/rpms/adplug/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 07:26:29 -0000 1.1 +++ sources 15 May 2006 07:29:04 -0000 1.2 @@ -0,0 +1,2 @@ +48c1bb7c8618c45596d79767dec2e962 adplug-2.0.tar.bz2 +5cbd3df5537700f28c350dbe08695c28 adplug.db From fedora-extras-commits at redhat.com Mon May 15 08:13:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 01:13:53 -0700 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wine-docs.spec, 1.12, 1.13 Message-ID: <200605150814.k4F8EP9F013290@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13216/FC-3 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Apr 2006 22:10:08 -0000 1.9 +++ .cvsignore 15 May 2006 08:13:53 -0000 1.10 @@ -1 +1 @@ -wine-docs-0.9.12.tar.bz2 +wine-docs-0.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Apr 2006 22:10:08 -0000 1.9 +++ sources 15 May 2006 08:13:53 -0000 1.10 @@ -1 +1 @@ -cc53497878f78681e85219eff2bf67ae wine-docs-0.9.12.tar.bz2 +e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- wine-docs.spec 16 Apr 2006 22:10:08 -0000 1.12 +++ wine-docs.spec 15 May 2006 08:13:53 -0000 1.13 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Fri Apr 14 2006 Andreas Bierfert 0.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Mon May 15 08:13:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 01:13:53 -0700 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wine-docs.spec, 1.13, 1.14 Message-ID: <200605150814.k4F8EPoB013295@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13216/FC-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Apr 2006 22:10:09 -0000 1.9 +++ .cvsignore 15 May 2006 08:13:53 -0000 1.10 @@ -1 +1 @@ -wine-docs-0.9.12.tar.bz2 +wine-docs-0.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Apr 2006 22:10:09 -0000 1.9 +++ sources 15 May 2006 08:13:53 -0000 1.10 @@ -1 +1 @@ -cc53497878f78681e85219eff2bf67ae wine-docs-0.9.12.tar.bz2 +e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wine-docs.spec 16 Apr 2006 22:10:09 -0000 1.13 +++ wine-docs.spec 15 May 2006 08:13:53 -0000 1.14 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.12 +Version: 0.9.13 Release: 0.1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -46,6 +46,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-0.1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-0.1 - version upgrade From fedora-extras-commits at redhat.com Mon May 15 08:13:59 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 01:13:59 -0700 Subject: rpms/wine-docs/FC-5 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wine-docs.spec, 1.9, 1.10 Message-ID: <200605150814.k4F8EVeX013300@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13216/FC-5 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Apr 2006 22:10:10 -0000 1.9 +++ .cvsignore 15 May 2006 08:13:59 -0000 1.10 @@ -1 +1 @@ -wine-docs-0.9.12.tar.bz2 +wine-docs-0.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Apr 2006 22:10:10 -0000 1.9 +++ sources 15 May 2006 08:13:59 -0000 1.10 @@ -1 +1 @@ -cc53497878f78681e85219eff2bf67ae wine-docs-0.9.12.tar.bz2 +e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-docs.spec 16 Apr 2006 22:10:10 -0000 1.9 +++ wine-docs.spec 15 May 2006 08:13:59 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Fri Apr 14 2006 Andreas Bierfert 0.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Mon May 15 08:14:00 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 May 2006 01:14:00 -0700 Subject: rpms/wine-docs/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wine-docs.spec, 1.9, 1.10 Message-ID: <200605150814.k4F8EWCu013305@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13216/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Apr 2006 22:10:10 -0000 1.9 +++ .cvsignore 15 May 2006 08:13:59 -0000 1.10 @@ -1 +1 @@ -wine-docs-0.9.12.tar.bz2 +wine-docs-0.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Apr 2006 22:10:10 -0000 1.9 +++ sources 15 May 2006 08:13:59 -0000 1.10 @@ -1 +1 @@ -cc53497878f78681e85219eff2bf67ae wine-docs-0.9.12.tar.bz2 +e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-docs.spec 16 Apr 2006 22:10:10 -0000 1.9 +++ wine-docs.spec 15 May 2006 08:13:59 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Fri Apr 14 2006 Andreas Bierfert 0.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Mon May 15 09:40:15 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 15 May 2006 02:40:15 -0700 Subject: rpms/spamass-milter/devel spamass-milter.spec,1.8,1.9 Message-ID: <200605150940.k4F9eHkL015919@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15902 Modified Files: spamass-milter.spec Log Message: Use upstream default settings (#191602) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/devel/spamass-milter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- spamass-milter.spec 7 May 2006 10:43:19 -0000 1.8 +++ spamass-milter.spec 15 May 2006 09:40:15 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -68,7 +68,7 @@ ### Default variables SOCKET="%{_localstatedir}/run/spamass-milter/spamass-milter.sock" -EXTRA_FLAGS="-m -r 15" +EXTRA_FLAGS="" SYSCONFIG="%{_sysconfdir}/sysconfig/spamass-milter" ### Read configuration @@ -176,6 +176,15 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Mon May 15 2006 Paul Howarth - 0.3.1-3 +- Use upstream default settings (#191602) + This change re-enables by default Subject/Content-Type header modification + (which may have a performance impact for large messages) and disables by + default the rejection of emails with a spam score of 15 or more. To re-enable + these options, uncomment the line: + EXTRA_FLAGS="-m -r 15" + in %{_sysconfdir}/sysconfig/spamass-milter + * Sun May 7 2006 Paul Howarth - 0.3.1-2 - Fix race condition in "stop" clause of initscript (#190894) From fedora-extras-commits at redhat.com Mon May 15 09:41:16 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 15 May 2006 02:41:16 -0700 Subject: rpms/spamass-milter/FC-5 spamass-milter.spec,1.8,1.9 Message-ID: <200605150941.k4F9fIgE015993@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15973 Modified Files: spamass-milter.spec Log Message: Use upstream default settings (#191602) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-5/spamass-milter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- spamass-milter.spec 7 May 2006 10:44:51 -0000 1.8 +++ spamass-milter.spec 15 May 2006 09:41:16 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -68,7 +68,7 @@ ### Default variables SOCKET="%{_localstatedir}/run/spamass-milter/spamass-milter.sock" -EXTRA_FLAGS="-m -r 15" +EXTRA_FLAGS="" SYSCONFIG="%{_sysconfdir}/sysconfig/spamass-milter" ### Read configuration @@ -176,6 +176,15 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Mon May 15 2006 Paul Howarth - 0.3.1-3 +- Use upstream default settings (#191602) + This change re-enables by default Subject/Content-Type header modification + (which may have a performance impact for large messages) and disables by + default the rejection of emails with a spam score of 15 or more. To re-enable + these options, uncomment the line: + EXTRA_FLAGS="-m -r 15" + in %{_sysconfdir}/sysconfig/spamass-milter + * Sun May 7 2006 Paul Howarth - 0.3.1-2 - Fix race condition in "stop" clause of initscript (#190894) From fedora-extras-commits at redhat.com Mon May 15 09:41:57 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 15 May 2006 02:41:57 -0700 Subject: rpms/spamass-milter/FC-4 spamass-milter.spec,1.7,1.8 Message-ID: <200605150942.k4F9g0G6016057@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16040 Modified Files: spamass-milter.spec Log Message: Use upstream default settings (#191602) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-4/spamass-milter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spamass-milter.spec 7 May 2006 10:45:48 -0000 1.7 +++ spamass-milter.spec 15 May 2006 09:41:57 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -68,7 +68,7 @@ ### Default variables SOCKET="%{_localstatedir}/run/spamass-milter/spamass-milter.sock" -EXTRA_FLAGS="-m -r 15" +EXTRA_FLAGS="" SYSCONFIG="%{_sysconfdir}/sysconfig/spamass-milter" ### Read configuration @@ -176,6 +176,15 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Mon May 15 2006 Paul Howarth - 0.3.1-3 +- Use upstream default settings (#191602) + This change re-enables by default Subject/Content-Type header modification + (which may have a performance impact for large messages) and disables by + default the rejection of emails with a spam score of 15 or more. To re-enable + these options, uncomment the line: + EXTRA_FLAGS="-m -r 15" + in %{_sysconfdir}/sysconfig/spamass-milter + * Sun May 7 2006 Paul Howarth - 0.3.1-2 - Fix race condition in "stop" clause of initscript (#190894) From fedora-extras-commits at redhat.com Mon May 15 09:42:40 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 15 May 2006 02:42:40 -0700 Subject: rpms/spamass-milter/FC-3 spamass-milter.spec,1.7,1.8 Message-ID: <200605150942.k4F9gg97016119@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16101 Modified Files: spamass-milter.spec Log Message: Use upstream default settings (#191602) Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-3/spamass-milter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- spamass-milter.spec 7 May 2006 10:46:58 -0000 1.7 +++ spamass-milter.spec 15 May 2006 09:42:40 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ @@ -68,7 +68,7 @@ ### Default variables SOCKET="%{_localstatedir}/run/spamass-milter/spamass-milter.sock" -EXTRA_FLAGS="-m -r 15" +EXTRA_FLAGS="" SYSCONFIG="%{_sysconfdir}/sysconfig/spamass-milter" ### Read configuration @@ -176,6 +176,15 @@ %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog +* Mon May 15 2006 Paul Howarth - 0.3.1-3 +- Use upstream default settings (#191602) + This change re-enables by default Subject/Content-Type header modification + (which may have a performance impact for large messages) and disables by + default the rejection of emails with a spam score of 15 or more. To re-enable + these options, uncomment the line: + EXTRA_FLAGS="-m -r 15" + in %{_sysconfdir}/sysconfig/spamass-milter + * Sun May 7 2006 Paul Howarth - 0.3.1-2 - Fix race condition in "stop" clause of initscript (#190894) From fedora-extras-commits at redhat.com Mon May 15 10:46:54 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:46:54 -0700 Subject: rpms/gnome-telnet/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE gnome-telnet-2.5-default-font.patch, 1.1, NONE gnome-telnet.spec, 1.7, NONE sources, 1.2, NONE Message-ID: <200605151046.k4FAkugG019098@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gnome-telnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065/gnome-telnet/devel Added Files: dead.package Removed Files: .cvsignore Makefile gnome-telnet-2.5-default-font.patch gnome-telnet.spec sources Log Message: add a file 'dead.package' for these retired packages --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- gnome-telnet-2.5-default-font.patch DELETED --- --- gnome-telnet.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:46:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:46:53 -0700 Subject: rpms/elmo/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE elmo.spec, 1.8, NONE sources, 1.2, NONE Message-ID: <200605151046.k4FAktA6019094@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/elmo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065/elmo/devel Added Files: dead.package Removed Files: .cvsignore Makefile elmo.spec sources Log Message: add a file 'dead.package' for these retired packages --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- elmo.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:47:00 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:47:00 -0700 Subject: rpms/rpmproc/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE rpmproc-unique-script.patch, 1.1, NONE rpmproc-upload-dirs.patch, 1.1, NONE rpmproc.spec, 1.5, NONE sources, 1.2, NONE Message-ID: <200605151047.k4FAl2sW019130@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/rpmproc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065/rpmproc/devel Added Files: dead.package Removed Files: .cvsignore Makefile rpmproc-unique-script.patch rpmproc-upload-dirs.patch rpmproc.spec sources Log Message: add a file 'dead.package' for these retired packages --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- rpmproc-unique-script.patch DELETED --- --- rpmproc-upload-dirs.patch DELETED --- --- rpmproc.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:47:00 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:47:00 -0700 Subject: rpms/sodipodi/devel dead.package,NONE,1.1 Message-ID: <200605151047.k4FAl2WE019133@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sodipodi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19065/sodipodi/devel Added Files: dead.package Log Message: add a file 'dead.package' for these retired packages --- NEW FILE dead.package --- From fedora-extras-commits at redhat.com Mon May 15 10:54:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:32 -0700 Subject: rpms/configure-thinkpad/devel dead.package, NONE, 1.1 .cvsignore, 1.6, NONE Makefile, 1.2, NONE configure-thinkpad-desktop.patch, 1.1, NONE configure-thinkpad.spec, 1.10, NONE sources, 1.6, NONE Message-ID: <200605151054.k4FAsYda019385@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/configure-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/configure-thinkpad/devel Added Files: dead.package Removed Files: .cvsignore Makefile configure-thinkpad-desktop.patch configure-thinkpad.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- configure-thinkpad-desktop.patch DELETED --- --- configure-thinkpad.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:32 -0700 Subject: rpms/cvsup/devel dead.package, NONE, 1.1 .cvsignore, 1.4, NONE Makefile, 1.2, NONE cvsup-contrib.patch, 1.1, NONE cvsup-gcc4.patch, 1.1, NONE cvsup-no-rpath.diff, 1.1, NONE cvsup-ppc.patch, 1.1, NONE cvsup.spec, 1.10, NONE cvsupd.conf, 1.1, NONE cvsupd.logrotate, 1.1, NONE cvsupd.rc, 1.1, NONE ezm3-1.2-PPC-setjmp-bootstrap.patch, 1.1, NONE ezm3-1.2-PPC-setjmp.patch, 1.1, NONE ezm3-1.2-ppc-jmpbufsize.patch, 1.1, NONE sources, 1.4, NONE Message-ID: <200605151054.k4FAsYLo019398@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/cvsup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/cvsup/devel Added Files: dead.package Removed Files: .cvsignore Makefile cvsup-contrib.patch cvsup-gcc4.patch cvsup-no-rpath.diff cvsup-ppc.patch cvsup.spec cvsupd.conf cvsupd.logrotate cvsupd.rc ezm3-1.2-PPC-setjmp-bootstrap.patch ezm3-1.2-PPC-setjmp.patch ezm3-1.2-ppc-jmpbufsize.patch sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- cvsup-contrib.patch DELETED --- --- cvsup-gcc4.patch DELETED --- --- cvsup-no-rpath.diff DELETED --- --- cvsup-ppc.patch DELETED --- --- cvsup.spec DELETED --- --- cvsupd.conf DELETED --- --- cvsupd.logrotate DELETED --- --- cvsupd.rc DELETED --- --- ezm3-1.2-PPC-setjmp-bootstrap.patch DELETED --- --- ezm3-1.2-PPC-setjmp.patch DELETED --- --- ezm3-1.2-ppc-jmpbufsize.patch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:34 -0700 Subject: rpms/gktools/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE gktools.spec, 1.6, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsabM019411@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gktools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/gktools/devel Added Files: dead.package Removed Files: .cvsignore Makefile gktools.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- gktools.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:34 -0700 Subject: rpms/gnofract4d/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE gnofract4d.spec, 1.7, NONE sources, 1.3, NONE Message-ID: <200605151054.k4FAsaD2019414@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/gnofract4d/devel Added Files: dead.package Removed Files: .cvsignore Makefile gnofract4d.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- gnofract4d.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:31 -0700 Subject: rpms/cksfv/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE cksfv-1.3-print.c.patch, 1.1, NONE cksfv.spec, 1.9, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsXrF019368@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/cksfv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/cksfv/devel Added Files: dead.package Removed Files: .cvsignore Makefile cksfv-1.3-print.c.patch cksfv.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- cksfv-1.3-print.c.patch DELETED --- --- cksfv.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:33 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:33 -0700 Subject: rpms/diag-ether/devel dead.package,NONE,1.1 Message-ID: <200605151054.k4FAsZNn019408@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/diag-ether/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/diag-ether/devel Added Files: dead.package Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- From fedora-extras-commits at redhat.com Mon May 15 10:54:41 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:41 -0700 Subject: rpms/inti/devel dead.package,NONE,1.1 Message-ID: <200605151054.k4FAshMt019483@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/inti/devel Added Files: dead.package Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- From fedora-extras-commits at redhat.com Mon May 15 10:54:41 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:41 -0700 Subject: rpms/ks3switch/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE ks3switch-desktop.patch, 1.2, NONE ks3switch-exec.patch, 1.1, NONE ks3switch.spec, 1.3, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAshf2019488@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/ks3switch/devel Added Files: dead.package Removed Files: .cvsignore Makefile ks3switch-desktop.patch ks3switch-exec.patch ks3switch.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- ks3switch-desktop.patch DELETED --- --- ks3switch-exec.patch DELETED --- --- ks3switch.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:43 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:43 -0700 Subject: rpms/manedit/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE manedit-0.5.11-bzip2.patch, 1.1, NONE manedit-0.5.11-gcc4.patch, 1.1, NONE manedit-0.5.11-multilib.patch, 1.1, NONE manedit-0.5.11-nostrip.patch, 1.1, NONE manedit.desktop, 1.1, NONE manedit.spec, 1.12, NONE sources, 1.3, NONE Message-ID: <200605151054.k4FAsjxS019492@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/manedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/manedit/devel Added Files: dead.package Removed Files: .cvsignore Makefile manedit-0.5.11-bzip2.patch manedit-0.5.11-gcc4.patch manedit-0.5.11-multilib.patch manedit-0.5.11-nostrip.patch manedit.desktop manedit.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- manedit-0.5.11-bzip2.patch DELETED --- --- manedit-0.5.11-gcc4.patch DELETED --- --- manedit-0.5.11-multilib.patch DELETED --- --- manedit-0.5.11-nostrip.patch DELETED --- --- manedit.desktop DELETED --- --- manedit.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:48 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:48 -0700 Subject: rpms/mknbi/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE mknbi-1.4.4-gcc4.patch, 1.1, NONE mknbi-1.4.4-makefile-optflags.patch, 1.1, NONE mknbi.spec, 1.10, NONE sources, 1.3, NONE Message-ID: <200605151054.k4FAsoYf019538@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/mknbi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/mknbi/devel Added Files: dead.package Removed Files: .cvsignore Makefile mknbi-1.4.4-gcc4.patch mknbi-1.4.4-makefile-optflags.patch mknbi.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- mknbi-1.4.4-gcc4.patch DELETED --- --- mknbi-1.4.4-makefile-optflags.patch DELETED --- --- mknbi.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:40 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:40 -0700 Subject: rpms/htb-util/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE htb-util-0.2.4pre1-FC2.patch, 1.1, NONE htb-util-0.2.4pre1-init.d.patch, 1.1, NONE htb-util.spec, 1.6, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsgvY019471@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/htb-util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/htb-util/devel Added Files: dead.package Removed Files: .cvsignore Makefile htb-util-0.2.4pre1-FC2.patch htb-util-0.2.4pre1-init.d.patch htb-util.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- htb-util-0.2.4pre1-FC2.patch DELETED --- --- htb-util-0.2.4pre1-init.d.patch DELETED --- --- htb-util.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:42 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:42 -0700 Subject: rpms/libzvt/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE libzvt.spec, 1.8, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsicW019491@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/libzvt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/libzvt/devel Added Files: dead.package Removed Files: .cvsignore Makefile libzvt.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- libzvt.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:50 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:50 -0700 Subject: rpms/netdiag/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE etherwake.8, 1.1, NONE netdiag-2.4-multi-line-string.patch, 1.1, NONE netdiag-2.4-weak-declarations.patch, 1.1, NONE netdiag.spec, 1.10, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAsqEK019542@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/netdiag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/netdiag/devel Added Files: dead.package Removed Files: .cvsignore Makefile etherwake.8 netdiag-2.4-multi-line-string.patch netdiag-2.4-weak-declarations.patch netdiag.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- etherwake.8 DELETED --- --- netdiag-2.4-multi-line-string.patch DELETED --- --- netdiag-2.4-weak-declarations.patch DELETED --- --- netdiag.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:49 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:49 -0700 Subject: rpms/nabi/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE nabi.spec, 1.4, NONE sources, 1.2, NONE themeRemoval.sh, 1.1, NONE xinput.d-nabi, 1.1, NONE Message-ID: <200605151054.k4FAspbX019541@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nabi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/nabi/devel Added Files: dead.package Removed Files: .cvsignore Makefile nabi.spec sources themeRemoval.sh xinput.d-nabi Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- nabi.spec DELETED --- --- sources DELETED --- --- themeRemoval.sh DELETED --- --- xinput.d-nabi DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:55 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:55 -0700 Subject: rpms/nget/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE nget.spec, 1.8, NONE sources, 1.3, NONE Message-ID: <200605151054.k4FAsvsv019573@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/nget/devel Added Files: dead.package Removed Files: .cvsignore Makefile nget.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- nget.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:03 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:03 -0700 Subject: rpms/perl-Net-SCP/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE perl-Net-SCP.spec, 1.7, NONE sources, 1.2, NONE Message-ID: <200605151055.k4FAt5nK019637@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Net-SCP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/perl-Net-SCP/devel Added Files: dead.package Removed Files: .cvsignore Makefile perl-Net-SCP.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- perl-Net-SCP.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:54:56 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:54:56 -0700 Subject: rpms/parchive/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE parchive.spec, 1.9, NONE sources, 1.2, NONE Message-ID: <200605151054.k4FAswEB019576@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/parchive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/parchive/devel Added Files: dead.package Removed Files: .cvsignore Makefile parchive.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- parchive.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:02 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:02 -0700 Subject: rpms/perl-Chart/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.1, NONE perl-Chart.spec, 1.4, NONE sources, 1.3, NONE Message-ID: <200605151055.k4FAt4Ta019633@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/perl-Chart/devel Added Files: dead.package Removed Files: .cvsignore Makefile perl-Chart.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- perl-Chart.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:04 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:04 -0700 Subject: rpms/perl-Net-SSH/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE perl-Net-SSH.spec, 1.8, NONE sources, 1.3, NONE Message-ID: <200605151055.k4FAt68n019640@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Net-SSH/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/perl-Net-SSH/devel Added Files: dead.package Removed Files: .cvsignore Makefile perl-Net-SSH.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- perl-Net-SSH.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:09 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:09 -0700 Subject: rpms/s3switch/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE s3switch-lrmi.patch, 1.1, NONE s3switch-thinkpad-t23.patch, 1.2, NONE s3switch-virgegx2.patch, 1.1, NONE s3switch.consoleapp, 1.1, NONE s3switch.pam, 1.1, NONE s3switch.spec, 1.8, NONE sources, 1.3, NONE Message-ID: <200605151055.k4FAtBCP019669@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/s3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/s3switch/devel Added Files: dead.package Removed Files: .cvsignore Makefile s3switch-lrmi.patch s3switch-thinkpad-t23.patch s3switch-virgegx2.patch s3switch.consoleapp s3switch.pam s3switch.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- s3switch-lrmi.patch DELETED --- --- s3switch-thinkpad-t23.patch DELETED --- --- s3switch-virgegx2.patch DELETED --- --- s3switch.consoleapp DELETED --- --- s3switch.pam DELETED --- --- s3switch.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:10 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:10 -0700 Subject: rpms/sirius/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE sirius.spec, 1.10, NONE sources, 1.3, NONE Message-ID: <200605151055.k4FAtCq4019672@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sirius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/sirius/devel Added Files: dead.package Removed Files: .cvsignore Makefile sirius.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sirius.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:16 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:16 -0700 Subject: rpms/tdl/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE sources, 1.3, NONE tdl.spec, 1.10, NONE Message-ID: <200605151055.k4FAtIAt019727@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tdl/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tdl.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tdl.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:16 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:16 -0700 Subject: rpms/tetex-arabtex/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources, 1.2, NONE tetex-arabtex.spec, 1.7, NONE Message-ID: <200605151055.k4FAtIXa019732@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-arabtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tetex-arabtex/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tetex-arabtex.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tetex-arabtex.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:17 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:17 -0700 Subject: rpms/tetex-armtex/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources, 1.2, NONE tetex-armtex.spec, 1.5, NONE Message-ID: <200605151055.k4FAtJRp019735@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-armtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tetex-armtex/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tetex-armtex.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tetex-armtex.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:02 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:02 -0700 Subject: rpms/perl-Net-Netmask/devel dead.package, NONE, 1.1 .cvsignore, 1.4, NONE Makefile, 1.2, NONE perl-Net-Netmask.spec, 1.8, NONE sources, 1.4, NONE Message-ID: <200605151055.k4FAt4BG019636@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Net-Netmask/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/perl-Net-Netmask/devel Added Files: dead.package Removed Files: .cvsignore Makefile perl-Net-Netmask.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- perl-Net-Netmask.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:18 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:18 -0700 Subject: rpms/tetex-font-tipa/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources, 1.2, NONE tetex-font-tipa.spec, 1.8, NONE Message-ID: <200605151055.k4FAtKdW019738@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-font-tipa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tetex-font-tipa/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tetex-font-tipa.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tetex-font-tipa.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:24 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:24 -0700 Subject: rpms/thinkpad-kmod/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.1, NONE kmodtool, 1.5, NONE sources, 1.3, NONE thinkpad-kmod-5.9-build.patch, 1.1, NONE thinkpad-kmod.spec, 1.8, NONE Message-ID: <200605151055.k4FAtQeN019803@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/thinkpad-kmod/devel Added Files: dead.package Removed Files: .cvsignore Makefile kmodtool sources thinkpad-kmod-5.9-build.patch thinkpad-kmod.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- kmodtool DELETED --- --- sources DELETED --- --- thinkpad-kmod-5.9-build.patch DELETED --- --- thinkpad-kmod.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:25 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:25 -0700 Subject: rpms/thinkpad-kmod-common/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.1, NONE sources, 1.3, NONE thinkpad-kmod-common-console.perms, 1.1, NONE thinkpad-kmod-common.modules, 1.1, NONE thinkpad-kmod-common.spec, 1.3, NONE Message-ID: <200605151055.k4FAtRnD019810@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/thinkpad-kmod-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/thinkpad-kmod-common/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources thinkpad-kmod-common-console.perms thinkpad-kmod-common.modules thinkpad-kmod-common.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- thinkpad-kmod-common-console.perms DELETED --- --- thinkpad-kmod-common.modules DELETED --- --- thinkpad-kmod-common.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:25 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:25 -0700 Subject: rpms/tpb/devel dead.package, NONE, 1.1 .cvsignore, 1.4, NONE Makefile, 1.2, NONE sources, 1.4, NONE tpb-defaultconfig.patch, 1.4, NONE tpb.spec, 1.11, NONE Message-ID: <200605151055.k4FAtRIk019813@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tpb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tpb/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tpb-defaultconfig.patch tpb.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tpb-defaultconfig.patch DELETED --- --- tpb.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:26 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:26 -0700 Subject: rpms/tpctl/devel dead.package, NONE, 1.1 .cvsignore, 1.6, NONE Makefile, 1.2, NONE sources, 1.6, NONE tpctl-optflags.patch, 1.2, NONE tpctl-rpm.patch, 1.2, NONE tpctl.apmiser.init, 1.2, NONE tpctl.spec, 1.9, NONE Message-ID: <200605151055.k4FAtSfo019814@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tpctl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tpctl/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources tpctl-optflags.patch tpctl-rpm.patch tpctl.apmiser.init tpctl.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- tpctl-optflags.patch DELETED --- --- tpctl-rpm.patch DELETED --- --- tpctl.apmiser.init DELETED --- --- tpctl.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:24 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:24 -0700 Subject: rpms/tetex-lgrind/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE lgrind-3.67-buffersize.patch, 1.1, NONE lgrind-3.67-options.patch, 1.1, NONE lgrind-3.67-parsevartab.patch, 1.1, NONE sources, 1.2, NONE tetex-lgrind.spec, 1.14, NONE Message-ID: <200605151055.k4FAtQaF019793@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tetex-lgrind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tetex-lgrind/devel Added Files: dead.package Removed Files: .cvsignore Makefile lgrind-3.67-buffersize.patch lgrind-3.67-options.patch lgrind-3.67-parsevartab.patch sources tetex-lgrind.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- lgrind-3.67-buffersize.patch DELETED --- --- lgrind-3.67-options.patch DELETED --- --- lgrind-3.67-parsevartab.patch DELETED --- --- sources DELETED --- --- tetex-lgrind.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:32 -0700 Subject: rpms/tripwire/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Latest-Changes, 1.2, NONE License-Issues, 1.2, NONE Makefile, 1.2, NONE README.RPM.in, 1.1, NONE pipedmailmessage.patch, 1.1, NONE sources, 1.2, NONE tripwire-2.3.0-50-rfc822.patch, 1.1, NONE tripwire-2.3.1-gcc3.new.patch, 1.1, NONE tripwire-mkstemp.patch, 1.1, NONE tripwire-setup-keyfiles.in, 1.1, NONE tripwire-siggen-man8.patch, 1.1, NONE tripwire.cron.in, 1.1, NONE tripwire.gif, 1.1, NONE tripwire.spec, 1.6, NONE tripwire.txt, 1.1, NONE tw-20030919.patch, 1.1, NONE twcfg.txt.in, 1.1, NONE twpol.txt.in, 1.2, NONE Message-ID: <200605151055.k4FAtYaG019871@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/tripwire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/tripwire/devel Added Files: dead.package Removed Files: .cvsignore Latest-Changes License-Issues Makefile README.RPM.in pipedmailmessage.patch sources tripwire-2.3.0-50-rfc822.patch tripwire-2.3.1-gcc3.new.patch tripwire-mkstemp.patch tripwire-setup-keyfiles.in tripwire-siggen-man8.patch tripwire.cron.in tripwire.gif tripwire.spec tripwire.txt tw-20030919.patch twcfg.txt.in twpol.txt.in Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Latest-Changes DELETED --- --- License-Issues DELETED --- --- Makefile DELETED --- --- README.RPM.in DELETED --- --- pipedmailmessage.patch DELETED --- --- sources DELETED --- --- tripwire-2.3.0-50-rfc822.patch DELETED --- --- tripwire-2.3.1-gcc3.new.patch DELETED --- --- tripwire-mkstemp.patch DELETED --- --- tripwire-setup-keyfiles.in DELETED --- --- tripwire-siggen-man8.patch DELETED --- --- tripwire.cron.in DELETED --- --- tripwire.spec DELETED --- --- tripwire.txt DELETED --- --- tw-20030919.patch DELETED --- --- twcfg.txt.in DELETED --- --- twpol.txt.in DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:33 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:33 -0700 Subject: rpms/wbxml2/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE sources, 1.2, NONE wbxml2-0.9.0-am_cflags.patch, 1.1, NONE wbxml2.spec, 1.7, NONE Message-ID: <200605151055.k4FAtZnh019876@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wbxml2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/wbxml2/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources wbxml2-0.9.0-am_cflags.patch wbxml2.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- wbxml2-0.9.0-am_cflags.patch DELETED --- --- wbxml2.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:34 -0700 Subject: rpms/whowatch/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE sources, 1.3, NONE whowatch-debian-patches.patch, 1.1, NONE whowatch-gcc4.patch, 1.1, NONE whowatch.spec, 1.9, NONE Message-ID: <200605151055.k4FAtakZ019879@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/whowatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/whowatch/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources whowatch-debian-patches.patch whowatch-gcc4.patch whowatch.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- whowatch-debian-patches.patch DELETED --- --- whowatch-gcc4.patch DELETED --- --- whowatch.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 10:55:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 03:55:34 -0700 Subject: rpms/xtide/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE Makefile, 1.2, NONE sources, 1.3, NONE xtide-2.8.for_x86_64.patch, 1.1, NONE xtide.desktop, 1.1, NONE xtide.spec, 1.10, NONE Message-ID: <200605151055.k4FAtaGB019882@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/xtide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291/xtide/devel Added Files: dead.package Removed Files: .cvsignore Makefile sources xtide-2.8.for_x86_64.patch xtide.desktop xtide.spec Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- xtide-2.8.for_x86_64.patch DELETED --- --- xtide.desktop DELETED --- --- xtide.spec DELETED --- From fedora-extras-commits at redhat.com Mon May 15 11:55:04 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 15 May 2006 04:55:04 -0700 Subject: fedora-security/audit fc4,1.243,1.244 fc5,1.157,1.158 Message-ID: <200605151155.k4FBt4dg022786@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22766 Modified Files: fc4 fc5 Log Message: Catch up a few days, squirrelmail Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- fc4 12 May 2006 10:12:07 -0000 1.243 +++ fc4 15 May 2006 11:55:01 -0000 1.244 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060510 -Up to date FC4 as of 20060510 +Up to date CVE as of CVE email 20060514 +Up to date FC4 as of 20060514 ** are items that need attention +CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) @@ -328,7 +329,7 @@ CVE-2005-3356 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2005-3353 backport (php) [since FEDORA-2005-1062] CVE-2005-3352 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052] -CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066] +CVE-2005-3351 version (spamassassin, fixed 3.0.5) [since FEDORA-2006-545] was backport since FEDORA-2005-1066 CVE-2005-3350 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046] CVE-2005-3322 version (squid, not upstream) SUSE only CVE-2005-3319 ignore (mod_php) no security consequence Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- fc5 12 May 2006 15:50:54 -0000 1.157 +++ fc5 15 May 2006 11:55:01 -0000 1.158 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060510 -Up to date FC5 as of 20060510 +Up to date CVE as of CVE email 20060514 +Up to date FC5 as of 20060514 ** are items that need attention +CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) CVE-2006-2274 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Mon May 15 12:18:48 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:18:48 -0700 Subject: rpms/GeoIP/devel .cvsignore, 1.3, 1.4 GeoIP.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605151218.k4FCIoSi025120@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25099 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.3.17-1 - New upstream release (minor fixes) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 06:59:28 -0000 1.3 +++ .cvsignore 15 May 2006 12:18:48 -0000 1.4 @@ -1 +1 @@ -GeoIP-1.3.16.tar.gz +GeoIP-1.3.17.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GeoIP.spec 1 May 2006 06:59:28 -0000 1.2 +++ GeoIP.spec 15 May 2006 12:18:48 -0000 1.3 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.3.16 +Version: 1.3.17 Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries @@ -71,6 +71,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 15 2006 Michael Fleming 1.3.17-1 +- New upstream release (minor fixes) + * Mon May 1 2006 Michael Fleming 1.3.16-1 - New upstream release - Add INSTALL document to package. Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 06:59:28 -0000 1.3 +++ sources 15 May 2006 12:18:48 -0000 1.4 @@ -1 +1 @@ -f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz +36ee129b4dce5990cea1cfda122dae93 GeoIP-1.3.17.tar.gz From fedora-extras-commits at redhat.com Mon May 15 12:31:04 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:31:04 -0700 Subject: rpms/mod_security/devel .cvsignore, 1.5, 1.6 mod_security.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200605151231.k4FCV6dV025240@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25217 Modified Files: .cvsignore mod_security.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Apr 2006 10:42:57 -0000 1.5 +++ .cvsignore 15 May 2006 12:31:04 -0000 1.6 @@ -1 +1 @@ -modsecurity-apache_1.9.3.tar.gz +modsecurity-apache_1.9.4.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_security.spec 11 Apr 2006 10:42:57 -0000 1.13 +++ mod_security.spec 15 May 2006 12:31:04 -0000 1.14 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,6 +40,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %changelog +* Mon May 15 2006 Michael Fleming 1.9.4-1 +- New upstream release + * Tue Apr 11 2006 Michael Fleming 1.9.3-1 - New upstream release - Trivial spec tweaks Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Apr 2006 10:42:57 -0000 1.6 +++ sources 15 May 2006 12:31:04 -0000 1.7 @@ -1 +1 @@ -cd5585488e2499c4218a4b13419c3065 modsecurity-apache_1.9.3.tar.gz +74d2317781bab619cd7b6b376b978107 modsecurity-apache_1.9.4.tar.gz From fedora-extras-commits at redhat.com Mon May 15 12:33:59 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:33:59 -0700 Subject: rpms/mod_security/FC-5 .cvsignore, 1.5, 1.6 mod_security.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200605151234.k4FCY15k025316@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25295 Modified Files: .cvsignore mod_security.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Apr 2006 11:00:32 -0000 1.5 +++ .cvsignore 15 May 2006 12:33:59 -0000 1.6 @@ -1 +1 @@ -modsecurity-apache_1.9.3.tar.gz +modsecurity-apache_1.9.4.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-5/mod_security.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_security.spec 11 Apr 2006 11:00:32 -0000 1.14 +++ mod_security.spec 15 May 2006 12:33:59 -0000 1.15 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,12 +40,12 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %changelog -* Tue Apr 11 2006 Michael Fleming 1.9.3-1 +* Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release -- Trivial spec tweaks -* Sat Mar 18 2006 Michael Fleming 1.9.2-4 -- Bump for FC5 final +* Tue Apr 11 2006 Michael Fleming 1.9.3-1 +- New upstream release +- Trivial spec tweaks * Wed Mar 1 2006 Michael Fleming 1.9.2-3 - Bump for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Apr 2006 11:00:32 -0000 1.6 +++ sources 15 May 2006 12:33:59 -0000 1.7 @@ -1 +1 @@ -cd5585488e2499c4218a4b13419c3065 modsecurity-apache_1.9.3.tar.gz +74d2317781bab619cd7b6b376b978107 modsecurity-apache_1.9.4.tar.gz From fedora-extras-commits at redhat.com Mon May 15 12:35:58 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:35:58 -0700 Subject: rpms/mod_security/FC-4 .cvsignore, 1.6, 1.7 mod_security.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200605151236.k4FCa0ep025387@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-serv25366 Modified Files: .cvsignore mod_security.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 11 Apr 2006 11:03:43 -0000 1.6 +++ .cvsignore 15 May 2006 12:35:57 -0000 1.7 @@ -1 +1 @@ -modsecurity-apache_1.9.3.tar.gz +modsecurity-apache_1.9.4.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_security.spec 11 Apr 2006 11:03:43 -0000 1.7 +++ mod_security.spec 15 May 2006 12:35:57 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ @@ -40,10 +40,19 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %changelog +* Mon May 15 2006 Michael Fleming 1.9.4-1 +- New upstream release + * Tue Apr 11 2006 Michael Fleming 1.9.3-1 - New upstream release - Trivial spec tweaks +* Wed Mar 1 2006 Michael Fleming 1.9.2-3 +- Bump for FC5 + +* Fri Feb 10 2006 Michael Fleming 1.9.2-2 +- Bump for newer gcc/glibc + * Wed Jan 18 2006 Michael Fleming 1.9.2-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 11 Apr 2006 11:03:43 -0000 1.6 +++ sources 15 May 2006 12:35:57 -0000 1.7 @@ -1 +1 @@ -cd5585488e2499c4218a4b13419c3065 modsecurity-apache_1.9.3.tar.gz +74d2317781bab619cd7b6b376b978107 modsecurity-apache_1.9.4.tar.gz From fedora-extras-commits at redhat.com Mon May 15 12:37:22 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 15 May 2006 05:37:22 -0700 Subject: rpms/mod_security/FC-3 .cvsignore, 1.5, 1.6 mod_security.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200605151237.k4FCbO3I025458@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25437 Modified Files: .cvsignore mod_security.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.9.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Apr 2006 12:16:30 -0000 1.5 +++ .cvsignore 15 May 2006 12:37:22 -0000 1.6 @@ -1 +1 @@ -modsecurity-apache_1.9.3.tar.gz +modsecurity-apache_1.9.4.tar.gz Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mod_security.spec 15 Apr 2006 12:22:31 -0000 1.11 +++ mod_security.spec 15 May 2006 12:37:22 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Security module for the Apache HTTP Server Name: mod_security -Version: 1.9.3 -Release: 2%{?dist} +Version: 1.9.4 +Release: 1%{?dist} License: GPL URL: http://www.modsecurity.org/ Group: System Environment/Daemons @@ -40,6 +40,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %changelog +* Mon May 15 2006 Michael Fleming 1.9.4-1 +- New upstream release + * Sat Apr 15 2006 Michael Fleming 1.9.3-2 - New upstream release - Minor spec tweaks. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Apr 2006 12:16:30 -0000 1.6 +++ sources 15 May 2006 12:37:22 -0000 1.7 @@ -1 +1 @@ -cd5585488e2499c4218a4b13419c3065 modsecurity-apache_1.9.3.tar.gz +74d2317781bab619cd7b6b376b978107 modsecurity-apache_1.9.4.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:09:50 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 15 May 2006 06:09:50 -0700 Subject: rpms/phpldapadmin/devel .cvsignore, 1.6, 1.7 phpldapadmin.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200605151309.k4FD9qnW028557@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28534 Modified Files: .cvsignore phpldapadmin.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Mar 2006 12:12:16 -0000 1.6 +++ .cvsignore 15 May 2006 13:09:49 -0000 1.7 @@ -1 +1 @@ -phpldapadmin-0.9.8.2.tar.gz +phpldapadmin-0.9.8.3.tar.gz Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phpldapadmin.spec 14 Mar 2006 12:12:16 -0000 1.10 +++ phpldapadmin.spec 15 May 2006 13:09:49 -0000 1.11 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.2 +Version: 0.9.8.3 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Mon May 15 2006 Dmitry Butskoy - 0.9.8.3-1 +- update to 0.9.8.3 + * Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 - update to 0.9.8.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Mar 2006 12:12:16 -0000 1.7 +++ sources 15 May 2006 13:09:49 -0000 1.8 @@ -1 +1 @@ -a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz +1bb495a36cee3582dc0957880118d3ec phpldapadmin-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:10:57 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 15 May 2006 06:10:57 -0700 Subject: rpms/phpldapadmin/FC-5 phpldapadmin.spec,1.10,1.11 sources,1.7,1.8 Message-ID: <200605151310.k4FDAxPm028620@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28601 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-5/phpldapadmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phpldapadmin.spec 14 Mar 2006 12:12:16 -0000 1.10 +++ phpldapadmin.spec 15 May 2006 13:10:56 -0000 1.11 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.2 +Version: 0.9.8.3 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Mon May 15 2006 Dmitry Butskoy - 0.9.8.3-1 +- update to 0.9.8.3 + * Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 - update to 0.9.8.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Mar 2006 12:12:16 -0000 1.7 +++ sources 15 May 2006 13:10:56 -0000 1.8 @@ -1 +1 @@ -a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz +1bb495a36cee3582dc0957880118d3ec phpldapadmin-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:11:23 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 15 May 2006 06:11:23 -0700 Subject: rpms/phpldapadmin/FC-4 phpldapadmin.spec,1.11,1.12 sources,1.6,1.7 Message-ID: <200605151311.k4FDBPFV028674@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28655 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- phpldapadmin.spec 14 Mar 2006 12:27:01 -0000 1.11 +++ phpldapadmin.spec 15 May 2006 13:11:23 -0000 1.12 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.2 +Version: 0.9.8.3 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Mon May 15 2006 Dmitry Butskoy - 0.9.8.3-1 +- update to 0.9.8.3 + * Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 - update to 0.9.8.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 12:27:01 -0000 1.6 +++ sources 15 May 2006 13:11:23 -0000 1.7 @@ -1 +1 @@ -a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz +1bb495a36cee3582dc0957880118d3ec phpldapadmin-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:11:52 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Mon, 15 May 2006 06:11:52 -0700 Subject: rpms/phpldapadmin/FC-3 phpldapadmin.spec,1.10,1.11 sources,1.6,1.7 Message-ID: <200605151311.k4FDBsZf028732@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28713 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phpldapadmin.spec 14 Mar 2006 12:28:04 -0000 1.10 +++ phpldapadmin.spec 15 May 2006 13:11:52 -0000 1.11 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.2 +Version: 0.9.8.3 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Mon May 15 2006 Dmitry Butskoy - 0.9.8.3-1 +- update to 0.9.8.3 + * Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 - update to 0.9.8.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Mar 2006 12:28:04 -0000 1.6 +++ sources 15 May 2006 13:11:52 -0000 1.7 @@ -1 +1 @@ -a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz +1bb495a36cee3582dc0957880118d3ec phpldapadmin-0.9.8.3.tar.gz From fedora-extras-commits at redhat.com Mon May 15 13:57:41 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 06:57:41 -0700 Subject: rpms/python-adns/devel adns-python-srv.patch, NONE, 1.1 python-adns.spec, 1.7, 1.8 Message-ID: <200605151357.k4FDvhLF029155@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/python-adns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29135 Modified Files: python-adns.spec Added Files: adns-python-srv.patch Log Message: Adding patch for SRV RRs adns-python-srv.patch: --- NEW FILE adns-python-srv.patch --- --- adns-python-1.1.0/adnsmodule.c.orig 2006-05-08 16:23:21.000000000 -0400 +++ adns-python-1.1.0/adnsmodule.c 2006-05-09 11:35:15.000000000 -0400 @@ -88,9 +88,10 @@ }; static _constant_class adns_rr[] = { - { "typemask", adns__rrt_typemask }, + { "typemask", adns_rrt_typemask }, { "deref", adns__qtf_deref }, { "mail822", adns__qtf_mail822 }, + { "unknown", adns_r_unknown }, { "none", adns_r_none }, { "A", adns_r_a }, { "NSraw", adns_r_ns_raw }, @@ -106,6 +107,8 @@ { "TXT", adns_r_txt }, { "RPraw", adns_r_rp_raw }, { "RP", adns_r_rp }, + { "SRVraw", adns_r_srv_raw }, + { "SRV", adns_r_srv }, { "ADDR", adns_r_addr }, { NULL, 0 } }; @@ -176,6 +179,17 @@ addrs); return o; } + +static PyObject * +interpret_srv( + adns_rr_srvraw *srvrr + ) +{ + PyObject *o; + o = Py_BuildValue("iiis", srvrr->priority, srvrr->weight, srvrr->port, + srvrr->host); + return o; +} static PyObject * interpret_answer( @@ -184,7 +198,7 @@ { PyObject *o, *rrs; int i; - adns_rrtype t = answer->type & adns__rrt_typemask; + adns_rrtype t = answer->type & adns_rrt_typemask; adns_rrtype td = answer->type & adns__qtf_deref; rrs = PyTuple_New(answer->nrrs); @@ -273,6 +287,9 @@ a = Py_BuildValue("ss", v->array[0], v->array[1]); } break; + case adns_r_srv_raw: + a = interpret_srv((answer->rrs.srvraw+i)); + break; default: a = Py_None; Py_INCREF(a); Index: python-adns.spec =================================================================== RCS file: /cvs/extras/rpms/python-adns/devel/python-adns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-adns.spec 13 Apr 2005 01:25:11 -0000 1.7 +++ python-adns.spec 15 May 2006 13:57:41 -0000 1.8 @@ -4,16 +4,17 @@ Name: python-adns Version: 1.1.0 -Release: 1 +Release: 2 Summary: Python interface for the GNU adns library Group: Development/Languages License: GPL URL: http://dustman.net/andy/python/adns-python Source0: http://dustman.net/andy/python/adns-python/1.1.0/adns-python-1.1.0.tar.gz +Patch0: adns-python-srv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, adns-devel +BuildRequires: python-devel, adns-devel >= 1.2 Requires: python >= %{pyver}, python < %{pynext} %description @@ -22,6 +23,7 @@ %prep %setup -q -n %{srcname}-%{version} +%patch0 -p1 -b .srv %build env CFLAGS="$RPM_OPT_FLAGS" python setup.py build @@ -41,6 +43,11 @@ %ghost %{_libdir}/python%{pyver}/site-packages/*.pyo %changelog +* Tue May 9 2006 Mihai Ibanescu 1.1.0-2 +- added patch to make it compile with adns >= 1.2 (adns__rrt_typemask was + renamed to adns_rrt_typemask). The patch also adds support for SRV records + (adns 1.2 has that, just need them exposed in the bindings). + * Wed Apr 13 2005 Colin Charles - 1.1.0-1 - new upstream 1.1.0 release From fedora-extras-commits at redhat.com Mon May 15 13:59:37 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 06:59:37 -0700 Subject: rpms/python-adns/devel python-adns.spec,1.8,1.9 Message-ID: <200605151359.k4FDxdjw029285@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/python-adns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29268 Modified Files: python-adns.spec Log Message: Added dist to release Index: python-adns.spec =================================================================== RCS file: /cvs/extras/rpms/python-adns/devel/python-adns.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-adns.spec 15 May 2006 13:57:41 -0000 1.8 +++ python-adns.spec 15 May 2006 13:59:36 -0000 1.9 @@ -4,7 +4,7 @@ Name: python-adns Version: 1.1.0 -Release: 2 +Release: 3%{?dist} Summary: Python interface for the GNU adns library Group: Development/Languages @@ -43,7 +43,7 @@ %ghost %{_libdir}/python%{pyver}/site-packages/*.pyo %changelog -* Tue May 9 2006 Mihai Ibanescu 1.1.0-2 +* Tue May 9 2006 Mihai Ibanescu 1.1.0-3 - added patch to make it compile with adns >= 1.2 (adns__rrt_typemask was renamed to adns_rrt_typemask). The patch also adds support for SRV records (adns 1.2 has that, just need them exposed in the bindings). From fedora-extras-commits at redhat.com Mon May 15 14:00:30 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 07:00:30 -0700 Subject: rpms/python-adns/FC-5 adns-python-srv.patch, NONE, 1.1 python-adns.spec, 1.7, 1.8 Message-ID: <200605151400.k4FE0WKV029363@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/python-adns/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29343 Modified Files: python-adns.spec Added Files: adns-python-srv.patch Log Message: Building for FC-5 adns-python-srv.patch: --- NEW FILE adns-python-srv.patch --- --- adns-python-1.1.0/adnsmodule.c.orig 2006-05-08 16:23:21.000000000 -0400 +++ adns-python-1.1.0/adnsmodule.c 2006-05-09 11:35:15.000000000 -0400 @@ -88,9 +88,10 @@ }; static _constant_class adns_rr[] = { - { "typemask", adns__rrt_typemask }, + { "typemask", adns_rrt_typemask }, { "deref", adns__qtf_deref }, { "mail822", adns__qtf_mail822 }, + { "unknown", adns_r_unknown }, { "none", adns_r_none }, { "A", adns_r_a }, { "NSraw", adns_r_ns_raw }, @@ -106,6 +107,8 @@ { "TXT", adns_r_txt }, { "RPraw", adns_r_rp_raw }, { "RP", adns_r_rp }, + { "SRVraw", adns_r_srv_raw }, + { "SRV", adns_r_srv }, { "ADDR", adns_r_addr }, { NULL, 0 } }; @@ -176,6 +179,17 @@ addrs); return o; } + +static PyObject * +interpret_srv( + adns_rr_srvraw *srvrr + ) +{ + PyObject *o; + o = Py_BuildValue("iiis", srvrr->priority, srvrr->weight, srvrr->port, + srvrr->host); + return o; +} static PyObject * interpret_answer( @@ -184,7 +198,7 @@ { PyObject *o, *rrs; int i; - adns_rrtype t = answer->type & adns__rrt_typemask; + adns_rrtype t = answer->type & adns_rrt_typemask; adns_rrtype td = answer->type & adns__qtf_deref; rrs = PyTuple_New(answer->nrrs); @@ -273,6 +287,9 @@ a = Py_BuildValue("ss", v->array[0], v->array[1]); } break; + case adns_r_srv_raw: + a = interpret_srv((answer->rrs.srvraw+i)); + break; default: a = Py_None; Py_INCREF(a); Index: python-adns.spec =================================================================== RCS file: /cvs/extras/rpms/python-adns/FC-5/python-adns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-adns.spec 13 Apr 2005 01:25:11 -0000 1.7 +++ python-adns.spec 15 May 2006 14:00:30 -0000 1.8 @@ -4,16 +4,17 @@ Name: python-adns Version: 1.1.0 -Release: 1 +Release: 3%{?dist} Summary: Python interface for the GNU adns library Group: Development/Languages License: GPL URL: http://dustman.net/andy/python/adns-python Source0: http://dustman.net/andy/python/adns-python/1.1.0/adns-python-1.1.0.tar.gz +Patch0: adns-python-srv.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, adns-devel +BuildRequires: python-devel, adns-devel >= 1.2 Requires: python >= %{pyver}, python < %{pynext} %description @@ -22,6 +23,7 @@ %prep %setup -q -n %{srcname}-%{version} +%patch0 -p1 -b .srv %build env CFLAGS="$RPM_OPT_FLAGS" python setup.py build @@ -41,6 +43,11 @@ %ghost %{_libdir}/python%{pyver}/site-packages/*.pyo %changelog +* Tue May 9 2006 Mihai Ibanescu 1.1.0-3 +- added patch to make it compile with adns >= 1.2 (adns__rrt_typemask was + renamed to adns_rrt_typemask). The patch also adds support for SRV records + (adns 1.2 has that, just need them exposed in the bindings). + * Wed Apr 13 2005 Colin Charles - 1.1.0-1 - new upstream 1.1.0 release From fedora-extras-commits at redhat.com Mon May 15 14:13:05 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 07:13:05 -0700 Subject: rpms/adns/devel adns-autoconf-noexpand.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 adns.spec, 1.6, 1.7 adns-1.1-parsedomain.patch, 1.1, NONE adns-1.1-semicolon.patch, 1.1, NONE Message-ID: <200605151413.k4FED7HB031711@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/adns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31689 Modified Files: .cvsignore adns.spec Added Files: adns-autoconf-noexpand.patch Removed Files: adns-1.1-parsedomain.patch adns-1.1-semicolon.patch Log Message: Upgraded to 1.2 adns-autoconf-noexpand.patch: --- NEW FILE adns-autoconf-noexpand.patch --- --- adns-1.2/settings.make.in.noexpand 2006-05-08 10:24:44.000000000 -0400 +++ adns-1.2/settings.make.in 2006-05-08 10:25:46.000000000 -0400 @@ -47,9 +47,9 @@ prefix= @prefix@ exec_prefix= @exec_prefix@ -bin_dir= $(exec_prefix)/bin -lib_dir= $(exec_prefix)/lib -include_dir= $(prefix)/include +bin_dir= @bindir@ +lib_dir= @libdir@ +include_dir= @includedir@ AC_INSTALL= @INSTALL@ ifeq ($(AC_INSTALL),./install-sh -c) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adns/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:00:46 -0000 1.2 +++ .cvsignore 15 May 2006 14:13:05 -0000 1.3 @@ -1 +1,2 @@ adns-1.1.tar.gz +adns-1.2.tar.gz Index: adns.spec =================================================================== RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- adns.spec 6 Apr 2005 22:10:47 -0000 1.6 +++ adns.spec 15 May 2006 14:13:05 -0000 1.7 @@ -1,18 +1,16 @@ Name: adns -Version: 1.1 -Release: 5 +Version: 1.2 +Release: 2%{?dist} Summary: Advanced, easy to use, asynchronous-capable DNS client library Group: System Environment/Libraries License: GPL URL: http://www.chiark.greenend.org.uk/~ian/adns/ -Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-1.1.tar.gz -Patch0: %{name}-DESTDIR.patch -Patch1: %{name}-ac_fix.patch -Patch2: adns-1.1-semicolon.patch -Patch3: adns-1.1-parsedomain.patch -BuildRequires: autoconf213 automake15 +Source0: ftp://ftp.chiark.greenend.org.uk/users/ian/adns/%{name}-%{version}.tar.gz +Patch1: %{name}-ac_fix.patch +Patch2: %{name}-autoconf-noexpand.patch +#BuildRequires: autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -72,23 +70,23 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .semicolon -%patch3 -p1 -b .parsedomain +%patch1 -p1 -b .ac_fix +%patch2 -p1 -b .noexpand %build #aclocal #%{__autoconf} -aclocal-1.5 -autoconf-2.13 +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" %configure --enable-dynamic make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -ln -sf libadns.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libadns.so +make install \ + prefix=$RPM_BUILD_ROOT/usr \ + bin_dir=$RPM_BUILD_ROOT%{_bindir} \ + include_dir=$RPM_BUILD_ROOT%{_includedir} \ + lib_dir=$RPM_BUILD_ROOT%{_libdir} %clean rm -fr $RPM_BUILD_ROOT @@ -112,6 +110,16 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Tue May 9 2006 Mihai Ibanescu 1.2-2 +- Dropped the DESTDIR patch since it was not accepted upstream. +- Added -fPIC in the compiled flags, otherwise we won't be able to link + against this library. + +* Mon May 8 2006 Mihai Ibanescu 1.2-1 +- Updated to 1.2, some of the patches were already upstream +- Removed dependency on autoconf/automake since it builds just fine without + that + * Fri Apr 7 2005 Michael Schwendt - rebuilt --- adns-1.1-parsedomain.patch DELETED --- --- adns-1.1-semicolon.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 15 14:15:22 2006 From: fedora-extras-commits at redhat.com (Mihai Ibanescu (misa)) Date: Mon, 15 May 2006 07:15:22 -0700 Subject: rpms/adns/devel adns.spec,1.7,1.8 sources,1.2,1.3 Message-ID: <200605151415.k4FEFOdR031805@cvs-int.fedora.redhat.com> Author: misa Update of /cvs/extras/rpms/adns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31786 Modified Files: adns.spec sources Log Message: grr, forgot to update the sources file Index: adns.spec =================================================================== RCS file: /cvs/extras/rpms/adns/devel/adns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- adns.spec 15 May 2006 14:13:05 -0000 1.7 +++ adns.spec 15 May 2006 14:15:22 -0000 1.8 @@ -1,6 +1,6 @@ Name: adns Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced, easy to use, asynchronous-capable DNS client library @@ -110,6 +110,9 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Mon May 15 2006 Mihai Ibanescu 1.2-3 +- Rebuilt in the devel branch + * Tue May 9 2006 Mihai Ibanescu 1.2-2 - Dropped the DESTDIR patch since it was not accepted upstream. - Added -fPIC in the compiled flags, otherwise we won't be able to link Index: sources =================================================================== RCS file: /cvs/extras/rpms/adns/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:00:46 -0000 1.2 +++ sources 15 May 2006 14:15:22 -0000 1.3 @@ -1 +1 @@ -891956e305acf5fc83b099333bf3ffd9 adns-1.1.tar.gz +4d9ad052125ddd295ee75ea608b992b7 adns-1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 15 15:03:46 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 May 2006 08:03:46 -0700 Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.5, 1.6 NetworkManager-vpnc.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200605151503.k4FF3mFG001810@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1789 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Mon May 15 2006 Dan Williams 0.6.2-1 - New release for NM 0.6.2 compat Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Mar 2006 21:34:47 -0000 1.5 +++ .cvsignore 15 May 2006 15:03:46 -0000 1.6 @@ -2,3 +2,4 @@ NetworkManager-vpnc-0.3.tar.gz NetworkManager-vpnc-0.5.0.tar.gz NetworkManager-vpnc-0.6.0.tar.gz +NetworkManager-vpnc-0.6.2.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- NetworkManager-vpnc.spec 21 Apr 2006 14:34:17 -0000 1.9 +++ NetworkManager-vpnc.spec 15 May 2006 15:03:46 -0000 1.10 @@ -1,4 +1,4 @@ -%define nm_version 0.6.0 +%define nm_version 0.6.2 %define dbus_version 0.60 %define gtk2_version 2.6.0 %define vpnc_version 0.3.3-3 @@ -6,8 +6,8 @@ Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.6.0 -Release: 3%{?dist} +Version: 0.6.2 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -53,7 +53,7 @@ rm -f %{buildroot}%{_libdir}/lib*.la rm -f %{buildroot}%{_libdir}/lib*.a -#%find_lang %{name} +%find_lang %{name} %clean rm -rf %{buildroot} @@ -72,8 +72,7 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor fi -#%files -f %{name}.lang -%files +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README @@ -88,6 +87,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Mon May 15 2006 Dan Williams 0.6.2-1 +- New release for NM 0.6.2 compat + * Fri Apr 21 2006 Dan Williams 0.6.0-3 - Add dist tag to RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Mar 2006 21:34:47 -0000 1.5 +++ sources 15 May 2006 15:03:46 -0000 1.6 @@ -1 +1 @@ -ca50e94e775243965b5df36a26c45d42 NetworkManager-vpnc-0.6.0.tar.gz +638045ff8bb5b587a59e579bd036cc1a NetworkManager-vpnc-0.6.2.tar.gz From fedora-extras-commits at redhat.com Mon May 15 15:04:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 May 2006 08:04:58 -0700 Subject: rpms/NetworkManager-vpnc/FC-5 NetworkManager-vpnc.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605151505.k4FF50VD001878@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1859 Modified Files: NetworkManager-vpnc.spec sources Log Message: * Mon May 15 2006 Dan Williams 0.6.2-1 - New release for NM 0.6.2 compat Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-5/NetworkManager-vpnc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- NetworkManager-vpnc.spec 21 Apr 2006 14:33:19 -0000 1.8 +++ NetworkManager-vpnc.spec 15 May 2006 15:04:58 -0000 1.9 @@ -1,4 +1,4 @@ -%define nm_version 0.6.0 +%define nm_version 0.6.2 %define dbus_version 0.60 %define gtk2_version 2.6.0 %define vpnc_version 0.3.3-3 @@ -6,8 +6,8 @@ Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.6.0 -Release: 3%{?dist} +Version: 0.6.2 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -53,7 +53,7 @@ rm -f %{buildroot}%{_libdir}/lib*.la rm -f %{buildroot}%{_libdir}/lib*.a -#%find_lang %{name} +%find_lang %{name} %clean rm -rf %{buildroot} @@ -72,8 +72,7 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor fi -#%files -f %{name}.lang -%files +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README @@ -88,6 +87,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Mon May 15 2006 Dan Williams 0.6.2-1 +- New release for NM 0.6.2 compat + * Fri Apr 21 2006 Dan Williams 0.6.0-3 - Add dist tag to RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Mar 2006 21:34:47 -0000 1.5 +++ sources 15 May 2006 15:04:58 -0000 1.6 @@ -1 +1 @@ -ca50e94e775243965b5df36a26c45d42 NetworkManager-vpnc-0.6.0.tar.gz +638045ff8bb5b587a59e579bd036cc1a NetworkManager-vpnc-0.6.2.tar.gz From fedora-extras-commits at redhat.com Mon May 15 15:11:11 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 08:11:11 -0700 Subject: rpms/duplicity/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.2, NONE duplicity.spec, 1.6, NONE sources, 1.2, NONE Message-ID: <200605151511.k4FFBD0m002023@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/duplicity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1993/duplicity/devel Added Files: dead.package Removed Files: .cvsignore Makefile duplicity.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- duplicity.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 15:11:12 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 08:11:12 -0700 Subject: rpms/ots/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE ots-0.2.0-nodocs.patch, 1.1, NONE ots-0.4.2-gcc4.patch, 1.1, NONE ots.spec, 1.4, NONE sources, 1.2, NONE Message-ID: <200605151511.k4FFBE2C002026@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1993/ots/devel Added Files: dead.package Removed Files: .cvsignore Makefile ots-0.2.0-nodocs.patch ots-0.4.2-gcc4.patch ots.spec sources Log Message: remove orphans from devel tree + add a file 'dead.package' as a marker --- NEW FILE dead.package --- --- .cvsignore DELETED --- --- Makefile DELETED --- --- ots-0.2.0-nodocs.patch DELETED --- --- ots-0.4.2-gcc4.patch DELETED --- --- ots.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Mon May 15 15:31:07 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 15 May 2006 08:31:07 -0700 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.16,1.17 Message-ID: <200605151531.k4FFV9n2002142@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2125 Modified Files: python-matplotlib.spec Log Message: Rebuild for new numpy Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-matplotlib.spec 16 Mar 2006 16:29:16 -0000 1.16 +++ python-matplotlib.spec 15 May 2006 15:31:06 -0000 1.17 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.87.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -90,6 +90,9 @@ %{python_sitearch}/matplotlib/backends/_tkagg.so %changelog +* Mon May 15 2006 Orion Poplawski 0.87.2-2 +- Rebuild for new numpy + * Tue Mar 7 2006 Orion Poplawski 0.87.2-1 - Update to 0.87.2 From fedora-extras-commits at redhat.com Mon May 15 15:32:00 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 15 May 2006 08:32:00 -0700 Subject: rpms/python-matplotlib/FC-5 python-matplotlib.spec,1.16,1.17 Message-ID: <200605151532.k4FFW2Js002209@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192 Modified Files: python-matplotlib.spec Log Message: Rebuild for new numpy Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-5/python-matplotlib.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- python-matplotlib.spec 16 Mar 2006 16:29:16 -0000 1.16 +++ python-matplotlib.spec 15 May 2006 15:32:00 -0000 1.17 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.87.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -90,6 +90,9 @@ %{python_sitearch}/matplotlib/backends/_tkagg.so %changelog +* Mon May 15 2006 Orion Poplawski 0.87.2-2 +- Rebuild for new numpy + * Tue Mar 7 2006 Orion Poplawski 0.87.2-1 - Update to 0.87.2 @@ -110,7 +113,7 @@ * Thu Dec 22 2005 Orion Poplawski 0.85-2 - Rebuild -* Sun Nov 20 2005 Orion Poplawski 0.85-1 + Sun Nov 20 2005 Orion Poplawski 0.85-1 - New upstream version 0.85 * Mon Sep 19 2005 Orion Poplawski 0.84-1 From fedora-extras-commits at redhat.com Mon May 15 15:46:48 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:46:48 -0700 Subject: rpms/gprolog - New directory Message-ID: <200605151546.k4FFkol5002373@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2347/gprolog Log Message: Directory /cvs/extras/rpms/gprolog added to the repository From fedora-extras-commits at redhat.com Mon May 15 15:46:48 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:46:48 -0700 Subject: rpms/gprolog/devel - New directory Message-ID: <200605151546.k4FFkowp002376@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2347/gprolog/devel Log Message: Directory /cvs/extras/rpms/gprolog/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 15:47:10 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:47:10 -0700 Subject: rpms/gprolog Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151547.k4FFlCOf002425@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2392 Added Files: Makefile import.log Log Message: Setup of module gprolog --- NEW FILE Makefile --- # Top level Makefile for module gprolog all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 15:47:10 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:47:10 -0700 Subject: rpms/gprolog/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151547.k4FFlCnr002428@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2392/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gprolog --- NEW 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 May 15 15:48:38 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:48:38 -0700 Subject: rpms/gprolog/devel gprolog-1.2.19-gcc4.patch, NONE, 1.1 gprolog-1.2.19-noexecstack.patch, NONE, 1.1 gprolog-1.2.19-test.patch, NONE, 1.1 gprolog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151548.k4FFme1b002518@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2471/devel Modified Files: .cvsignore sources Added Files: gprolog-1.2.19-gcc4.patch gprolog-1.2.19-noexecstack.patch gprolog-1.2.19-test.patch gprolog.spec Log Message: auto-import gprolog-1.2.19-5 on branch devel from gprolog-1.2.19-5.src.rpm gprolog-1.2.19-gcc4.patch: --- NEW FILE gprolog-1.2.19-gcc4.patch --- --- gprolog-1.2.19.orig/src/BipsFD/fd_bool_c.c 2005-06-14 03:40:09.000000000 +1200 +++ gprolog-1.2.19/src/BipsFD/fd_bool_c.c 2006-01-23 09:46:19.000000000 +1300 @@ -201,6 +201,8 @@ static void Fd_Bool_Initializer(void) { + SET_OBJ_CHAIN_STOP; + bool_tbl[NOT] = Functor_Arity(Create_Atom("#\\"), 1); bool_tbl[EQUIV] = Functor_Arity(Create_Atom("#<=>"), 2); --- gprolog-1.2.19.orig/src/BipsFD/math_supp.c 2005-06-14 03:40:10.000000000 +1200 +++ gprolog-1.2.19/src/BipsFD/math_supp.c 2006-01-23 09:46:39.000000000 +1300 @@ -206,6 +206,8 @@ static void Math_Supp_Initializer(void) { + SET_OBJ_CHAIN_STOP; + arith_tbl[PLUS_1] = Functor_Arity(ATOM_CHAR('+'), 1); arith_tbl[PLUS_2] = Functor_Arity(ATOM_CHAR('+'), 2); arith_tbl[MINUS_1] = Functor_Arity(ATOM_CHAR('-'), 1); --- gprolog-1.2.19.orig/src/BipsPl/all_solut_c.c 2005-06-14 03:40:10.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/all_solut_c.c 2006-01-23 09:47:09.000000000 +1300 @@ -123,6 +123,8 @@ static void All_Solut_Initializer(void) { + SET_OBJ_CHAIN_STOP; + exist_2 = Functor_Arity(ATOM_CHAR('^'), 2); } --- gprolog-1.2.19.orig/src/BipsPl/arith_inl_c.c 2005-06-14 03:40:10.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/arith_inl_c.c 2006-01-23 09:47:20.000000000 +1300 @@ -99,6 +99,8 @@ static void Arith_Initializer(void) { + SET_OBJ_CHAIN_STOP; + ArithInf arith_info; arith_tbl = Hash_Alloc_Table(START_ARITH_TBL_SIZE, sizeof(ArithInf)); --- gprolog-1.2.19.orig/src/BipsPl/bc_supp.c 2005-06-14 03:40:10.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/bc_supp.c 2006-01-23 09:47:35.000000000 +1300 @@ -283,6 +283,8 @@ static void Byte_Code_Initializer(void) { + SET_OBJ_CHAIN_STOP; + BCWord *p = op_tbl; Op_In_Tbl("get_variable", GET_X_VARIABLE); --- gprolog-1.2.19.orig/src/BipsPl/debugger_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/debugger_c.c 2006-01-23 09:47:53.000000000 +1300 @@ -164,6 +164,8 @@ static void Debug_Initializer(void) { + SET_OBJ_CHAIN_STOP; + New_Object(My_System_Directives, NULL); } --- gprolog-1.2.19.orig/src/BipsPl/dynam_supp.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/dynam_supp.c 2006-01-23 09:20:39.000000000 +1300 @@ -601,7 +601,8 @@ dyn = scan->dyn; if (dyn->first_erased_cl) /* we must keep it - free impossible */ - (unsigned long) (dyn->first_erased_cl) |= 1; /* mark it */ + dyn->first_erased_cl = (DynCInf *) + ((unsigned long) (dyn->first_erased_cl) | 1); /* mark it */ } --- gprolog-1.2.19.orig/src/BipsPl/error_supp.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/error_supp.c 2006-01-23 09:48:04.000000000 +1300 @@ -117,6 +117,8 @@ static void Error_Supp_Initializer(void) { + SET_OBJ_CHAIN_STOP; + type_atom = Create_Atom("atom"); type_atomic = Create_Atom("atomic"); type_byte = Create_Atom("byte"); --- gprolog-1.2.19.orig/src/BipsPl/expand_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/expand_c.c 2006-01-23 09:48:16.000000000 +1300 @@ -92,6 +92,8 @@ static void Expand_Initializer(void) { + SET_OBJ_CHAIN_STOP; + int atom_dcg; atom_dcg = Create_Atom("-->"); --- gprolog-1.2.19.orig/src/BipsPl/flag_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/flag_c.c 2006-01-23 09:48:33.000000000 +1300 @@ -77,7 +77,6 @@ static int atom_on; static int atom_off; -static int atom_error; static int atom_warning; static int atom_fail; @@ -118,6 +117,8 @@ static void Flag_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_flag_tbl[FLAG_BOUNDED] = Create_Atom("bounded"); atom_flag_tbl[FLAG_MAX_INTEGER] = Create_Atom("max_integer"); atom_flag_tbl[FLAG_MIN_INTEGER] = Create_Atom("min_integer"); --- gprolog-1.2.19.orig/src/BipsPl/foreign_supp.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/foreign_supp.c 2006-01-23 09:48:42.000000000 +1300 @@ -98,6 +98,8 @@ static void Foreign_Initializer(void) { + SET_OBJ_CHAIN_STOP; + goal_H = H; H = H + MAX_ARITY + 1; --- gprolog-1.2.19.orig/src/BipsPl/g_var_inl_c.c 2005-06-16 05:04:06.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/g_var_inl_c.c 2006-01-23 09:49:06.000000000 +1300 @@ -167,6 +167,8 @@ static void G_Var_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_g_array = Create_Atom("g_array"); atom_g_array_auto = Create_Atom("g_array_auto"); atom_g_array_extend = Create_Atom("g_array_extend"); --- gprolog-1.2.19.orig/src/BipsPl/oper_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/oper_c.c 2006-01-23 09:49:19.000000000 +1300 @@ -86,6 +86,8 @@ static void Oper_Initializer(void) { + SET_OBJ_CHAIN_STOP; + char *a[7] = { "fx", "fy", "xf", "yf", "xfx", "xfy", "yfx" }; int i; --- gprolog-1.2.19.orig/src/BipsPl/os_interf_c.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/os_interf_c.c 2006-01-23 09:49:33.000000000 +1300 @@ -94,8 +94,6 @@ static int atom_dt; -static int atom_read; -static int atom_write; static int atom_execute; static int atom_search; @@ -138,6 +136,8 @@ static void Os_Interf_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_dt = Create_Atom("dt"); atom_read = Create_Atom("read"); --- gprolog-1.2.19.orig/src/BipsPl/parse_supp.c 2005-06-14 03:40:11.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/parse_supp.c 2006-01-23 09:49:53.000000000 +1300 @@ -124,6 +124,8 @@ static void Parse_Supp_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_var = Create_Atom("var"); atom_string = Create_Atom("string"); atom_punct = Create_Atom("punct"); --- gprolog-1.2.19.orig/src/BipsPl/pretty_c.c 2005-06-14 03:40:12.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/pretty_c.c 2006-01-23 09:50:07.000000000 +1300 @@ -112,6 +112,8 @@ static void Pretty_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_clause = Create_Atom(":-"); atom_dcg = Create_Atom("-->"); atom_if = Create_Atom("->"); --- gprolog-1.2.19.orig/src/BipsPl/sockets_c.c 2005-06-14 03:40:12.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/sockets_c.c 2006-01-23 09:50:20.000000000 +1300 @@ -100,6 +100,8 @@ static void Socket_Initializer(void) { + SET_OBJ_CHAIN_STOP; + #ifdef _WIN32 WORD versReqstd = MAKEWORD( 2, 2); // Current Winsock 2 DLL's WSADATA wsaData; --- gprolog-1.2.19.orig/src/BipsPl/sort_c.c 2005-06-14 03:40:12.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/sort_c.c 2006-01-23 09:50:31.000000000 +1300 @@ -68,6 +68,8 @@ static void Sort_Initializer(void) { + SET_OBJ_CHAIN_STOP; + minus_2 = Functor_Arity(ATOM_CHAR('-'), 2); } --- gprolog-1.2.19.orig/src/BipsPl/write_supp.c 2005-06-14 03:40:12.000000000 +1200 +++ gprolog-1.2.19/src/BipsPl/write_supp.c 2006-01-23 09:50:54.000000000 +1300 @@ -143,6 +143,8 @@ static void Write_Supp_Initializer(void) { + SET_OBJ_CHAIN_STOP; + atom_dots = Create_Atom("..."); curly_brackets_1 = Functor_Arity(atom_curly_brackets, 1); --- gprolog-1.2.19.orig/src/EngineFD/fd_inst.h 2005-06-14 03:40:14.000000000 +1200 +++ gprolog-1.2.19/src/EngineFD/fd_inst.h 2006-01-23 09:52:35.000000000 +1300 @@ -111,8 +111,8 @@ #define CHAIN_RECORD_FRAME_SIZE 2 -#define CF_Pointer(rec_adr) ((WamWord *) (rec_adr[0])) -#define Next_Chain(rec_adr) ((WamWord *) (rec_adr[1])) +#define CF_Pointer(rec_adr) (*(WamWord **) &(rec_adr[0])) +#define Next_Chain(rec_adr) (*(WamWord **) &(rec_adr[1])) @@ -123,9 +123,9 @@ #define OFFSET_OF_OPTIM_POINTER 1 /* this offset must corresponds to */ -#define AF_Pointer(cf) ((WamWord *) (cf[0])) -#define Optim_Pointer(cf) ((WamWord *) (cf[1])) /* this cell */ -#define Cstr_Address(cf) ((long (*)()) (cf[2])) +#define AF_Pointer(cf) (*(WamWord **) &(cf[0])) +#define Optim_Pointer(cf) (*(WamWord **) &(cf[1])) /* this cell */ +#define Cstr_Address(cf) (*(long (**)()) &(cf[2])) --- gprolog-1.2.19.orig/src/EnginePl/obj_chain.c 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/obj_chain.c 2006-01-23 09:40:36.000000000 +1300 @@ -24,6 +24,8 @@ /* $Id: gprolog-1.2.19-gcc4.patch,v 1.1 2006/03/21 08:28:26 keri Exp $ */ +#define OBJ_CHAIN 1 + #include #include "obj_chain.h" @@ -181,7 +183,7 @@ { if (p->magic1 != OBJ_CHAIN_MAGIC_1 || p->magic2 != OBJ_CHAIN_MAGIC_2 || (q = p->next) < (ObjChain **) &obj_chain_begin - || q > &obj_chain_end || *q != p) + || q > &obj_chain_end) { #ifdef DEBUG #if 0 --- gprolog-1.2.19.orig/src/EnginePl/obj_chain.h 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/obj_chain.h 2006-01-23 09:31:49.000000000 +1300 @@ -83,18 +83,24 @@ #define ATTR_TO_KEEP_UNREF_STATIC_VAR __attribute__ ((unused)) #endif +#ifdef OBJ_CHAIN +ObjChain *obj_chain_stop_extern = NULL; +#else + #ifdef OBJ_INIT static void (OBJ_INIT) (); #ifndef _MSC_VER -extern ObjChain *obj_chain_stop; +static ObjChain obj_chain_start_mark; + +static ObjChain *obj_chain_stop = &obj_chain_start_mark; static ObjChain obj_chain_start ATTR_TO_KEEP_UNREF_STATIC_VAR = { OBJ_CHAIN_MAGIC_1, OBJ_CHAIN_MAGIC_2, &obj_chain_stop, OBJ_INIT }; -static ObjChain *obj_chain_stop = &obj_chain_start; +#define SET_OBJ_CHAIN_STOP {} #if 0 /* antoher way to force to keep the chain : a fct using obj_chain_start which references the initializer function (OBJ_INIT) */ @@ -114,3 +120,5 @@ #endif /* _MSC_VER */ #endif /* OBJ_INIT */ + +#endif /* OBJ_CHAIN */ --- gprolog-1.2.19.orig/src/EnginePl/test_oc_defs.h 2005-06-14 03:13:43.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/test_oc_defs.h 2006-01-23 09:45:21.000000000 +1300 @@ -25,6 +25,7 @@ \ static void Init_Tables() \ { \ + SET_OBJ_CHAIN_STOP; \ printf("object <%s> found\n",name); \ printf(" start at:%#lx\n",(long) &obj_chain_start); \ printf(" &name:%#lx\n",(long) &name); \ --- gprolog-1.2.19.orig/src/EnginePl/wam_inst.h 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/wam_inst.h 2006-01-23 09:16:11.000000000 +1300 @@ -67,10 +67,10 @@ #define ENVIR_STATIC_SIZE 3 -#define CPE(e) ((WamCont) (e[-1])) -#define BCIE(e) ((WamWord) (e[-2])) -#define EE(e) ((WamWord *) (e[-3])) -#define Y(e, y) ((WamWord) (e[-4 - (y)])) +#define CPE(e) (*(WamCont *) &(e[-1])) +#define BCIE(e) (*(WamWord *) &(e[-2])) +#define EE(e) (*(WamWord **) &(e[-3])) +#define Y(e, y) (*(WamWord *) &(e[-4 - (y)])) #define ENVIR_NAMES {"CPE", "BCIE", "EE"} @@ -81,15 +81,15 @@ #define CHOICE_STATIC_SIZE 8 -#define ALTB(b) ((CodePtr) (b[-1])) -#define CPB(b) ((WamCont) (b[-2])) -#define BCIB(b) ((WamWord) (b[-3])) -#define EB(b) ((WamWord *) (b[-4])) -#define BB(b) ((WamWord *) (b[-5])) -#define HB(b) ((WamWord *) (b[-6])) -#define TRB(b) ((WamWord *) (b[-7])) -#define CSB(b) ((WamWord *) (b[-8])) -#define AB(b, a) ((WamWord) (b[-9 - (a)])) +#define ALTB(b) (*(CodePtr *) &(b[-1])) +#define CPB(b) (*(WamCont *) &(b[-2])) +#define BCIB(b) (*(WamWord *) &(b[-3])) +#define EB(b) (*(WamWord **) &(b[-4])) +#define BB(b) (*(WamWord **) &(b[-5])) +#define HB(b) (*(WamWord **) &(b[-6])) +#define TRB(b) (*(WamWord **) &(b[-7])) +#define CSB(b) (*(WamWord **) &(b[-8])) +#define AB(b, a) (*(WamWord *) &(b[-9 - (a)])) #define CHOICE_NAMES {"ALTB", "CPB", "BCIB", "EB", "BB", \ "HB", "TRB", "CSB"} gprolog-1.2.19-noexecstack.patch: --- NEW FILE gprolog-1.2.19-noexecstack.patch --- --- gprolog-1.2.19.orig/src/Ma2Asm/ix86_any.c 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/Ma2Asm/ix86_any.c 2006-03-05 09:26:21.000000000 +1300 @@ -164,6 +164,9 @@ void Asm_Stop(void) { + Label_Printf("#ifdef __ELF__"); + Label_Printf(".section .note.GNU-stack,\"\", at progbits"); + Label_Printf("#endif"); } --- gprolog-1.2.19.orig/src/Ma2Asm/powerpc_any.c 2005-06-14 03:40:22.000000000 +1200 +++ gprolog-1.2.19/src/Ma2Asm/powerpc_any.c 2006-03-05 09:40:34.000000000 +1300 @@ -161,6 +161,9 @@ void Asm_Stop(void) { + Label_Printf("#ifdef __ELF__"); + Label_Printf(".section .note.GNU-stack,\"\", at progbits"); + Label_Printf("#endif"); } gprolog-1.2.19-test.patch: --- NEW FILE gprolog-1.2.19-test.patch --- --- gprolog-1.2.19.orig/src/Makefile.in 2005-06-14 03:13:45.000000000 +1200 +++ gprolog-1.2.19/src/Makefile.in 2006-01-23 11:52:07.000000000 +1300 @@ -145,7 +145,8 @@ # --- CHECKS --- # check: - @echo "No checks implemented (yet)." + (cd EnginePl; $(MAKE) test_oc) || exit 1 + . ./SETVARS; (cd Ma2Asm; $(MAKE) check) || exit 1 # --- CLEAN --- # --- gprolog-1.2.19.orig/src/EnginePl/Makefile.in 2005-06-14 03:13:43.000000000 +1200 +++ gprolog-1.2.19/src/EnginePl/Makefile.in 2006-01-23 15:37:43.000000000 +1300 @@ -134,6 +134,7 @@ $(CC) @CC_EXE_NAME_OPT at test_oc@EXE_SUFFIX@ obj_begin1 at OBJ_SUFFIX@ \ $(TEST_OC_OBJS) obj_chain1 at OBJ_SUFFIX@ test_oc at OBJ_SUFFIX@ \ obj_end1 at OBJ_SUFFIX@ + ./test_oc || exit 1 clean-test_oc: rm -f obj_begin1 at OBJ_SUFFIX@ obj_chain1 at OBJ_SUFFIX@ obj_end1 at OBJ_SUFFIX@ \ --- gprolog-1.2.19.orig/src/Ma2Asm/Makefile.in 2005-06-14 03:13:45.000000000 +1200 +++ gprolog-1.2.19/src/Ma2Asm/Makefile.in 2006-01-23 13:21:58.000000000 +1300 @@ -46,19 +46,17 @@ FC=-DFAST check at OBJ_SUFFIX@: check.c - if [ "$$FC" = "Y" ]; then FCFLAGS='-DFAST'; fi; \ - $(GPLC) -C "$(CFLAGS) $$FCFLAGS" -c check.c + $(GPLC) -C "$(CFLAGS)" -c check.c check_ma at ASM_SUFFIX@: check_ma.ma ma2asm at EXE_SUFFIX@ - if [ "$$FC" = "Y" ]; then cp check_ma.ma tmp.ma; \ - else sed -e 's/ fast / /' check_ma.ma >tmp.ma; fi; \ - $(GPLC) -S --comment tmp.ma -o check_ma at ASM_SUFFIX@ + $(GPLC) -S --comment check_ma.ma -o check_ma at ASM_SUFFIX@ check_ma at OBJ_SUFFIX@: check_ma at ASM_SUFFIX@ $(GPLC) -c check_ma at ASM_SUFFIX@ check at EXE_SUFFIX@: $(CHECK_OBJS) $(CC) $(CFLAGS) @CC_EXE_NAME_OPT at check@EXE_SUFFIX@ $(CHECK_OBJS) + ./check || exit 1 clean-check: rm -f check at OBJ_SUFFIX@ check_ma at ASM_SUFFIX@ check_ma at OBJ_SUFFIX@ check at EXE_SUFFIX@ --- gprolog-1.2.19.orig/src/Ma2Asm/check.c 2005-06-14 03:40:15.000000000 +1200 +++ gprolog-1.2.19/src/Ma2Asm/check.c 2006-01-23 21:20:11.000000000 +1300 @@ -30,24 +30,11 @@ #define IF_NO_FD_FILE #include "engine_pl.h" -#ifndef FAST /* see Makefile */ - -#ifdef FC_USED_TO_COMPILE_CORE -#warning NO FC +#ifndef FC_USED_TO_COMPILE_CORE #undef FC #define FC #endif -#elif !defined(FC_USED_TO_COMPILE_CORE) - -#error FAST defined but cannot compile for FC - -#else - -#warning WITH FC - -#endif - /*---------------------------------* * Constants * *---------------------------------*/ @@ -272,7 +259,7 @@ -void +void FC Allocate(int x) /* only to update the register for E */ { } @@ -398,7 +385,7 @@ void FC test_call_c1(void); -void +void FC test_call_c1(void) { x++; @@ -456,7 +443,7 @@ void FC test_arg_int1(int a, int b, int c, int d); -void +void FC test_arg_int1(int a, int b, int c, int d) { if (a != 12 || b != -1 || c != 4095 || d != 123456789) @@ -480,7 +467,7 @@ void FC test_arg_double1(double a, double b, double c); -void +void FC test_arg_double1(double a, double b, double c) { if (a != 12.456 || b != -1.3e-102 || c != -3.141593) @@ -504,7 +491,7 @@ void FC test_arg_string1(char *a, char *b); -void +void FC test_arg_string1(char *a, char *b) { #ifdef DEBUG @@ -533,7 +520,7 @@ void FC test_arg_mem_l1(long a, long b, long *c, long d, long e, long *f); -void +void FC test_arg_mem_l1(long a, long b, long *c, long d, long e, long *f) { if (a != 128 || b != 12345 || c != (long *) test_arg_mem_l @@ -560,7 +547,7 @@ void FC test_arg_x1(WamWord a, WamWord *b, WamWord c, WamWord *d); -void +void FC test_arg_x1(WamWord a, WamWord *b, WamWord c, WamWord *d) { if (a != 123987 || b != &X(0) || c != 987654321 || d != &X(128)) @@ -586,7 +573,7 @@ void FC test_arg_y1(WamWord a, WamWord *b, WamWord c, WamWord *d); -void +void FC test_arg_y1(WamWord a, WamWord *b, WamWord c, WamWord *d) { if (a != 1928374 || b != &Y(E, 0) || c != 456789 || d != &Y(E, 6)) @@ -613,7 +600,7 @@ void FC test_arg_fl_array1(long a, long b, long *c, long *d); -void +void FC test_arg_fl_array1(long a, long b, long *c, long *d) { #ifdef DEBUG @@ -645,7 +632,7 @@ void FC test_arg_fd_array1(double a, double b, double *c, double *d); -void +void FC test_arg_fd_array1(double a, double b, double *c, double *d) { if (a != 1.2e30 || b != -1.234567 || c != foreign_double @@ -684,7 +671,7 @@ WamWord k, WamWord *l, WamWord m, WamWord *n, double o); -void +void FC test_call_c_lot_args1(WamWord n0, WamWord n1, WamWord n2, WamWord n3, WamWord n4, WamWord n5, void (*a) (), long b, int c, int d, double e, char *f, @@ -716,7 +703,7 @@ long FC test_jump_ret1(long addr); -long +long FC test_jump_ret1(long addr) { #ifdef DEBUG @@ -733,7 +720,7 @@ void FC test_jump_ret2(void); -void +void FC test_jump_ret2(void) { #ifdef DEBUG @@ -762,7 +749,7 @@ int FC test_fail_ret1(void); -int +int FC test_fail_ret1(void) { x++; @@ -816,7 +803,7 @@ long FC test_move_ret_x1(void); -long +long FC test_move_ret_x1(void) { x++; @@ -843,7 +830,7 @@ long FC test_move_ret_y1(void); -long +long FC test_move_ret_y1(void) { x++; @@ -870,7 +857,7 @@ long FC test_move_ret_fl1(void); -long +long FC test_move_ret_fl1(void) { x++; @@ -897,7 +884,7 @@ double FC test_move_ret_fd1(void); -double +double FC test_move_ret_fd1(void) { x++; @@ -922,7 +909,7 @@ long FC test_switch_ret1(void); -long +long FC test_switch_ret1(void) { return swt[i]; @@ -931,7 +918,7 @@ void FC test_switch_ret2(int k); -void +void FC test_switch_ret2(int k) { if (k != i) @@ -968,13 +955,13 @@ Fd_Init_Engine(void) { } -int +int FC Create_Atom(char *name) { return 1; } -PredInf * +PredInf * FC Lookup_Pred(int func, int arity) { return NULL; @@ -985,7 +972,7 @@ { } AtomInf atom_tbl[1]; -void +void FC Create_Choice_Point(CodePtr codep_alt, int arity) { } --- NEW FILE gprolog.spec --- Name: gprolog Version: 1.2.19 Release: 5%{?dist} Summary: GNU Prolog is a free Prolog compiler Group: Development/Languages License: GPL URL: http://gprolog.inria.fr Source: ftp://ftp.inria.fr/INRIA/Projects/contraintes/gprolog/unstable/gprolog-1.2.19.tar.gz # the patches comming from the gentoo project. Patch1: gprolog-1.2.19-gcc4.patch Patch2: gprolog-1.2.19-noexecstack.patch Patch3: gprolog-1.2.19-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD) developed by Daniel Diaz (http://loco.inria.fr/~diaz). GNU Prolog is a very efficient native compiler producing (small) stand-alone executables. GNU-Prolog also offers a classical top-level+debugger. GNU Prolog conforms to the ISO standard for Prolog but also includes a lot of extensions (global variables, DCG, sockets, OS interface,...). GNU Prolog also includes a powerful constraint solver over finite domains with many predefined constraints+heuristics. %package examples Summary: Examples for GNU Prolog Group: Development/Languages Requires: %{name} = %{version}-%{release} %description examples Examples for GNU Prolog. %package docs Summary: Documentation for GNU Prolog Group: Documentation Requires: %{name} = %{version}-%{release} %description docs Documentation for GNU Prolog. %prep %setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 %build cd src # gprolog only acccept -O0 and don't like -fomit-frame-pointer CFLG="$(echo $RPM_OPT_FLAGS | sed -e "s/\-O2/-O0/" | \ sed -e "s/\-fomit-frame-pointer//")" # sed -i -e "s:TXT_FILES = @TXT_FILES@:TXT_FILES=:" Makefile.in ./configure \ --with-install-dir=$RPM_BUILD_ROOT%{_libdir}/gprolog-%{version} \ --without-links-dir --without-examples-dir \ --disable-fast-call --with-doc-dir=dist-doc \ --with-c-flags="$CFLG" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT cd src ( make install mkdir $RPM_BUILD_ROOT%{_bindir} cd $RPM_BUILD_ROOT%{_libdir}/gprolog-%{version}/bin for i in *; do ln -s ../lib/gprolog-%{version}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i done ) rm -f dist-doc/*.{chm,dvi,ps} rm -f dist-doc/compil-scheme.pdf rm -f dist-doc/debug-box.pdf for file in ChangeLog COPYING NEWS VERSION do rm -f $RPM_BUILD_ROOT%{_libdir}/gprolog-%{version}/$file done cd ../ExamplesPl rm -rf BINPROLOG CIAO SICSTUS rm -rf SWI WAMCC XSB YAP %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING ChangeLog NEWS PROBLEMS VERSION %{_bindir}/* %{_libdir}/gprolog-%{version} %files examples %defattr(-,root,root,-) %doc ExamplesC ExamplesFD ExamplesPl %files docs %defattr(-,root,root,-) %doc src/dist-doc/* %changelog * Mon May 15 2006 Jochen Schmitt 1.2.19-5 - Remove compil-scheme.pdf and debug-box.pdf from the docs package * Wed Apr 19 2006 Jochen Schmitt 1.2.19-3 - Delete unnecessaries files from ExamplesPI * Thu Mar 30 2006 Jochen Schmitt 1.2.19-2 - Remove sed-command - Correct typo about usable compiler options - Add comment about the source of the patches * Wed Mar 29 2006 Jochen Schmitt 1.2.19-1 - Initial RPM package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gprolog/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 15:47:10 -0000 1.1 +++ .cvsignore 15 May 2006 15:48:38 -0000 1.2 @@ -0,0 +1 @@ +gprolog-1.2.19.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gprolog/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 15:47:10 -0000 1.1 +++ sources 15 May 2006 15:48:38 -0000 1.2 @@ -0,0 +1 @@ +f884e48b48a73c0785f2e6441bf5b4d7 gprolog-1.2.19.tar.gz From fedora-extras-commits at redhat.com Mon May 15 15:48:37 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:48:37 -0700 Subject: rpms/gprolog import.log,1.1,1.2 Message-ID: <200605151548.k4FFmduq002507@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/gprolog In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2471 Modified Files: import.log Log Message: auto-import gprolog-1.2.19-5 on branch devel from gprolog-1.2.19-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gprolog/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 15:47:09 -0000 1.1 +++ import.log 15 May 2006 15:48:37 -0000 1.2 @@ -0,0 +1 @@ +gprolog-1_2_19-5:HEAD:gprolog-1.2.19-5.src.rpm:1147708114 From fedora-extras-commits at redhat.com Mon May 15 15:57:33 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 08:57:33 -0700 Subject: owners owners.list,1.995,1.996 Message-ID: <200605151557.k4FFvZ2Q002694@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2675 Modified Files: owners.list Log Message: Add grplog Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.995 retrieving revision 1.996 diff -u -r1.995 -r1.996 --- owners.list 15 May 2006 05:15:51 -0000 1.995 +++ owners.list 15 May 2006 15:57:33 -0000 1.996 @@ -423,6 +423,7 @@ Fedora Extras|gphpedit|A PHP source editor for GNOME 2|rpm at timj.co.uk|extras-qa at fedoraproject.org| Fedora Extras|gpp|Gnome Photo Printer|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|gprolog|GNU Prolog Compiler|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|gpsd|Service daemon for mediating access to a GPS|matt at truch.net|extras-qa at fedoraproject.org| Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 16:00:49 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 15 May 2006 09:00:49 -0700 Subject: comps comps-fe5.xml.in,1.50,1.51 comps-fe6.xml.in,1.13,1.14 Message-ID: <200605151600.k4FG0pU5002738@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2719 Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: Add gprolog Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- comps-fe5.xml.in 13 May 2006 07:18:37 -0000 1.50 +++ comps-fe5.xml.in 15 May 2006 16:00:49 -0000 1.51 @@ -42,6 +42,7 @@ gforth ghc git + gprolog highlight lightning hugs98 Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- comps-fe6.xml.in 13 May 2006 07:18:37 -0000 1.13 +++ comps-fe6.xml.in 15 May 2006 16:00:49 -0000 1.14 @@ -42,6 +42,7 @@ gforth ghc git + gprolog highlight hugs98 lightning From fedora-extras-commits at redhat.com Mon May 15 16:14:15 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 15 May 2006 09:14:15 -0700 Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.9,1.10 Message-ID: <200605151614.k4FGEHUc005063@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5037/FC-3 Modified Files: dnsmasq.spec Log Message: Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dnsmasq.spec 8 May 2006 17:05:40 -0000 1.9 +++ dnsmasq.spec 15 May 2006 16:14:15 -0000 1.10 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.31 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -11,7 +11,7 @@ Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" BuildRequires: dbus-devel %endif @@ -34,7 +34,7 @@ %prep %setup -q %patch0 -p1 -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif @@ -51,7 +51,7 @@ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/ %endif install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq @@ -79,7 +79,7 @@ %defattr(-,root,root,-) %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf -%if "%{dist}" != ".fc3" +%if "%fedora" > "3" || "%aurora" > "2" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %endif %{_initrddir}/dnsmasq @@ -88,6 +88,9 @@ %changelog +* Mon May 15 2006 Patrick "Jima" Laughton 2.31-1.fc3.1 +- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux + * Mon May 8 2006 Patrick "Jima" Laughton 2.31-1 - Removed dbus config patch (now provided upstream) - Patched in init script (no longer provided upstream) From fedora-extras-commits at redhat.com Mon May 15 16:45:36 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Mon, 15 May 2006 09:45:36 -0700 Subject: rpms/dejavu-fonts/devel .cvsignore, 1.13, 1.14 dejavu-fonts.spec, 1.20, 1.21 sources, 1.13, 1.14 Message-ID: <200605151645.k4FGjcBF005352@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.6.0-1.fc6 on branch devel from dejavu-fonts-2.6.0-1.fc6.src.rpm 2.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 23 Apr 2006 17:11:24 -0000 1.13 +++ .cvsignore 15 May 2006 16:45:36 -0000 1.14 @@ -1 +1 @@ -dejavu-sfd-2.5.tar.gz +dejavu-sfd-2.6.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- dejavu-fonts.spec 23 Apr 2006 17:11:24 -0000 1.20 +++ dejavu-fonts.spec 15 May 2006 16:45:36 -0000 1.21 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion 2.5 +%define archiveversion 2.6 %define fontdir %{_datadir}/fonts/%{name} %define xsldir %{_datadir}/xml/%{name} @@ -9,7 +9,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.5.0 +Version: 2.6.0 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -161,6 +161,9 @@ %changelog +* Mon May 15 2006 Nicolas Mailhot - 2.6.0-1 +- 2.6.0 + * Sun Apr 23 2006 Nicolas Mailhot - 2.5.0-1 - 2.5.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 23 Apr 2006 17:11:25 -0000 1.13 +++ sources 15 May 2006 16:45:36 -0000 1.14 @@ -1 +1 @@ -402d2f846caa83c8067e281b3c5fa8c0 dejavu-sfd-2.5.tar.gz +aae0e562be59e57e791cd1a7273bfb8c dejavu-sfd-2.6.tar.gz From fedora-extras-commits at redhat.com Mon May 15 16:45:35 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Mon, 15 May 2006 09:45:35 -0700 Subject: rpms/dejavu-fonts import.log,1.49,1.50 Message-ID: <200605151645.k4FGjbtg005342@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5309 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.6.0-1.fc6 on branch devel from dejavu-fonts-2.6.0-1.fc6.src.rpm 2.6.0 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- import.log 23 Apr 2006 18:18:43 -0000 1.49 +++ import.log 15 May 2006 16:45:35 -0000 1.50 @@ -46,3 +46,4 @@ dejavu-fonts-2_5_0-1_fc5:FC-5:dejavu-fonts-2.5.0-1.fc5.src.rpm:1145812342 dejavu-fonts-2_5_0-1_fc4:FC-4:dejavu-fonts-2.5.0-1.fc4.src.rpm:1145812549 dejavu-fonts-2_5_0-2_fc5:FC-5:dejavu-fonts-2.5.0-2.fc5.src.rpm:1145816306 +dejavu-fonts-2_6_0-1_fc6:HEAD:dejavu-fonts-2.6.0-1.fc6.src.rpm:1147711519 From fedora-extras-commits at redhat.com Mon May 15 16:49:49 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:49:49 -0700 Subject: rpms/perl-CSS-Tiny - New directory Message-ID: <200605151649.k4FGnphS005468@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5447/perl-CSS-Tiny Log Message: Directory /cvs/extras/rpms/perl-CSS-Tiny added to the repository From fedora-extras-commits at redhat.com Mon May 15 16:49:50 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:49:50 -0700 Subject: rpms/perl-CSS-Tiny/devel - New directory Message-ID: <200605151649.k4FGnqW4005471@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5447/perl-CSS-Tiny/devel Log Message: Directory /cvs/extras/rpms/perl-CSS-Tiny/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 16:50:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:50:13 -0700 Subject: rpms/perl-CSS-Tiny Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151650.k4FGoFSp005520@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5492 Added Files: Makefile import.log Log Message: Setup of module perl-CSS-Tiny --- NEW FILE Makefile --- # Top level Makefile for module perl-CSS-Tiny all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 16:50:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:50:14 -0700 Subject: rpms/perl-CSS-Tiny/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151650.k4FGoGfH005523@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5492/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-CSS-Tiny --- NEW 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 May 15 16:50:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:50:56 -0700 Subject: rpms/perl-CSS-Tiny import.log,1.1,1.2 Message-ID: <200605151651.k4FGpSuq005590@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556 Modified Files: import.log Log Message: auto-import perl-CSS-Tiny-1.11-1 on branch devel from perl-CSS-Tiny-1.11-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-CSS-Tiny/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 16:50:13 -0000 1.1 +++ import.log 15 May 2006 16:50:56 -0000 1.2 @@ -0,0 +1 @@ +perl-CSS-Tiny-1_11-1:HEAD:perl-CSS-Tiny-1.11-1.src.rpm:1147711845 From fedora-extras-commits at redhat.com Mon May 15 16:50:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:50:57 -0700 Subject: rpms/perl-CSS-Tiny/devel perl-CSS-Tiny.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151651.k4FGpTEf005596@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-CSS-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556/devel Modified Files: .cvsignore sources Added Files: perl-CSS-Tiny.spec Log Message: auto-import perl-CSS-Tiny-1.11-1 on branch devel from perl-CSS-Tiny-1.11-1.src.rpm --- NEW FILE perl-CSS-Tiny.spec --- Name: perl-CSS-Tiny Version: 1.11 Release: 1%{?dist} Summary: Read/Write .css files with as little code as possible Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/CSS-Tiny/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/CSS-Tiny-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Clone) BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Clone) %description CSS::Tiny is a perl class to read and write .css stylesheets with as little code as possible, reducing load time and memory overhead. %prep %setup -q -n CSS-Tiny-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README test.css %{perl_vendorlib}/CSS/ %{_mandir}/man3/*.3pm* %changelog * Sat May 13 2006 Jose Pedro Oliveira - 1.11-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-CSS-Tiny/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 16:50:14 -0000 1.1 +++ .cvsignore 15 May 2006 16:50:57 -0000 1.2 @@ -0,0 +1 @@ +CSS-Tiny-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-CSS-Tiny/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 16:50:14 -0000 1.1 +++ sources 15 May 2006 16:50:57 -0000 1.2 @@ -0,0 +1 @@ +66fac70597a4e6628f1875037d1d2a94 CSS-Tiny-1.11.tar.gz From fedora-extras-commits at redhat.com Mon May 15 16:52:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:52:56 -0700 Subject: rpms/perl-PPI-HTML - New directory Message-ID: <200605151652.k4FGqwEs005697@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5671/perl-PPI-HTML Log Message: Directory /cvs/extras/rpms/perl-PPI-HTML added to the repository From fedora-extras-commits at redhat.com Mon May 15 16:52:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:52:56 -0700 Subject: rpms/perl-PPI-HTML/devel - New directory Message-ID: <200605151652.k4FGqwnb005700@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5671/perl-PPI-HTML/devel Log Message: Directory /cvs/extras/rpms/perl-PPI-HTML/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 16:53:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:53:12 -0700 Subject: rpms/perl-PPI-HTML Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151653.k4FGrEGq005750@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5716 Added Files: Makefile import.log Log Message: Setup of module perl-PPI-HTML --- NEW FILE Makefile --- # Top level Makefile for module perl-PPI-HTML all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 16:53:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:53:13 -0700 Subject: rpms/perl-PPI-HTML/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151653.k4FGrFY4005754@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5716/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-PPI-HTML --- NEW 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 May 15 16:53:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:53:42 -0700 Subject: rpms/perl-PPI-HTML import.log,1.1,1.2 Message-ID: <200605151653.k4FGri3o005815@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5782 Modified Files: import.log Log Message: auto-import perl-PPI-HTML-1.07-1 on branch devel from perl-PPI-HTML-1.07-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-PPI-HTML/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 16:53:12 -0000 1.1 +++ import.log 15 May 2006 16:53:42 -0000 1.2 @@ -0,0 +1 @@ +perl-PPI-HTML-1_07-1:HEAD:perl-PPI-HTML-1.07-1.src.rpm:1147712014 From fedora-extras-commits at redhat.com Mon May 15 16:53:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:53:43 -0700 Subject: rpms/perl-PPI-HTML/devel perl-PPI-HTML.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151653.k4FGrjM3005820@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI-HTML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5782/devel Modified Files: .cvsignore sources Added Files: perl-PPI-HTML.spec Log Message: auto-import perl-PPI-HTML-1.07-1 on branch devel from perl-PPI-HTML-1.07-1.src.rpm --- NEW FILE perl-PPI-HTML.spec --- Name: perl-PPI-HTML Version: 1.07 Release: 1%{?dist} Summary: Generate syntax-hightlighted HTML for Perl using PPI Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/PPI-HTML/ Source0: http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-HTML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(CSS::Tiny) BuildRequires: perl(Params::Util) => 0.05 BuildRequires: perl(PPI) BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description PPI::HTML converts Perl documents into syntax highlighted HTML pages. %prep %setup -q -n PPI-HTML-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README %{_bindir}/* %{perl_vendorlib}/PPI/ %{_mandir}/man3/*.3pm* %changelog * Sat May 13 2006 Jose Pedro Oliveira - 1.07-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PPI-HTML/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 16:53:13 -0000 1.1 +++ .cvsignore 15 May 2006 16:53:43 -0000 1.2 @@ -0,0 +1 @@ +PPI-HTML-1.07.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PPI-HTML/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 16:53:13 -0000 1.1 +++ sources 15 May 2006 16:53:43 -0000 1.2 @@ -0,0 +1 @@ +c2858d87c0e12ab87845606957bcd122 PPI-HTML-1.07.tar.gz From fedora-extras-commits at redhat.com Mon May 15 16:58:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 15 May 2006 09:58:03 -0700 Subject: owners owners.list,1.996,1.997 Message-ID: <200605151658.k4FGw5os005928@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5911 Modified Files: owners.list Log Message: New packages: perl-CSS-Tiny (#191619), perl-PPI-HTML (#191620) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.996 retrieving revision 1.997 diff -u -r1.996 -r1.997 --- owners.list 15 May 2006 15:57:33 -0000 1.996 +++ owners.list 15 May 2006 16:58:03 -0000 1.997 @@ -972,6 +972,7 @@ Fedora Extras|perl-Crypt-Random|Cryptographically Secure, True Random Number Generator|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-RSA|RSA public-key cryptosystem|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-CSS-Tiny|Read/Write .css files with as little code as possible|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Curses|Perl bindings for ncurses|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1155,6 +1156,7 @@ Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PPI|Parse, Analyze and Manipulate Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-PPI-HTML|Generate syntax-hightlighted HTML for Perl using PPI|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Readonly|Facility for creating read-only scalars, arrays, hashes|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 15 17:10:37 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 15 May 2006 10:10:37 -0700 Subject: fedora-security/audit fc4,1.244,1.245 fc5,1.158,1.159 Message-ID: <200605151710.k4FHAbWB008346@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8326 Modified Files: fc4 fc5 Log Message: Note a new vnc issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- fc4 15 May 2006 11:55:01 -0000 1.244 +++ fc4 15 May 2006 17:10:35 -0000 1.245 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- fc5 15 May 2006 11:55:01 -0000 1.158 +++ fc5 15 May 2006 17:10:35 -0000 1.159 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Mon May 15 17:14:25 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:14:25 -0700 Subject: rpms/swaks - New directory Message-ID: <200605151714.k4FHER1D008462@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8441/swaks Log Message: Directory /cvs/extras/rpms/swaks added to the repository From fedora-extras-commits at redhat.com Mon May 15 17:14:26 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:14:26 -0700 Subject: rpms/swaks/devel - New directory Message-ID: <200605151714.k4FHESxj008468@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8441/swaks/devel Log Message: Directory /cvs/extras/rpms/swaks/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 17:14:38 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:14:38 -0700 Subject: rpms/swaks Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151714.k4FHEebf008545@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8517 Added Files: Makefile import.log Log Message: Setup of module swaks --- NEW FILE Makefile --- # Top level Makefile for module swaks all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 17:14:38 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:14:38 -0700 Subject: rpms/swaks/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151714.k4FHEeYJ008548@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8517/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module swaks --- NEW 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 May 15 17:15:01 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:15:01 -0700 Subject: rpms/swaks import.log,1.1,1.2 Message-ID: <200605151715.k4FHF31G008623@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8584 Modified Files: import.log Log Message: auto-import swaks-20050709.1-5 on branch devel from swaks-20050709.1-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/swaks/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 17:14:38 -0000 1.1 +++ import.log 15 May 2006 17:15:00 -0000 1.2 @@ -0,0 +1 @@ +swaks-20050709_1-5:HEAD:swaks-20050709.1-5.src.rpm:1147713294 From fedora-extras-commits at redhat.com Mon May 15 17:15:01 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 10:15:01 -0700 Subject: rpms/swaks/devel swaks.20050709.1,NONE,1.1 swaks.spec,NONE,1.1 Message-ID: <200605151715.k4FHF3Ci008626@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8584/devel Added Files: swaks.20050709.1 swaks.spec Log Message: auto-import swaks-20050709.1-5 on branch devel from swaks-20050709.1-5.src.rpm --- NEW FILE swaks.20050709.1 --- #!/usr/bin/perl use strict; use IO::Socket; use Sys::Hostname; use Getopt::Long; use Time::Local; my($p_name) = $0 =~ m|/?([^/]+)$|; my $p_version = "20050709.1"; my $p_usage = "Usage: $p_name [--help|--version] (see --help for details)"; my $p_cp = < 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 EOM ext_usage(); # before we do anything else, check for --help my %O = (); my $user = get_username(); my $hostname = get_hostname(); $| = 1; Getopt::Long::Configure("bundling_override"); GetOptions( 'l|input-file=s' => \$O{option_file}, # (l)ocation of input data 'f|from:s' => \$O{mail_from}, # envelope-(f)rom address 't|to:s' => \$O{mail_to}, # envelope-(t)o address 'h|helo|ehlo:s' => \$O{mail_helo}, # (h)elo string 's|server:s' => \$O{mail_server}, # (s)erver to use 'p|port:i' => \$O{mail_port}, # (p)ort to use 'd|data:s' => \$O{mail_data}, # (d)ata portion ('\n' for newlines) 'timeout:s' => \$O{timeout}, # timeout for each trans (def 30s) 'g' => \$O{data_on_stdin}, # (g)et data on stdin 'm' => \$O{emulate_mail}, # emulate (M)ail command 'q|quit|quit-after=s' => \$O{quit_after}, # (q)uit after 'n|suppress-data' => \$O{supress_data}, # do (n)ot print data portion 'a|auth:s' => \$O{auth}, # force auth, exit if not supported 'au|auth-user:s' => \$O{auth_user}, # user for auth 'ap|auth-password:s' => \$O{auth_pass}, # pass for auth 'am|auth-map=s' => \$O{auth_map}, # auth type map 'ahp|auth-hide-password' => \$O{auth_hidepw}, # hide passwords when possible 'apt|auth-plaintext' => \$O{auth_showpt}, # translate base64 strings 'ao|auth-optional:s' => \$O{auth_optional}, # auth optional (ignore failure) 'support' => \$O{get_support}, # report capabilties 'li|local-interface:s' => \$O{lint}, # local interface to use 'tls' => \$O{tls}, # use TLS 'tlso|tls-optional' => \$O{tls_optional}, # use tls if available 'tlsc|tls-on-connect' => \$O{tls_on_connect}, # use tls if available 'S|silent+' => \$O{silent}, # suppress output to varying degrees 'nsf|no-strip-from' => \$O{no_strip_from}, # Don't strip From_ line from DATA 'nth|no-hints' => \$O{no_hints}, # Don't show transaction hints 'hr|hide-receive' => \$O{hide_receive}, # Don't show reception lines 'hs|hide-send' => \$O{hide_send}, # Don't show sending lines 'stl|show-time-lapse:s' => \$O{show_time_lapse}, # print lapse for send/recv 'ndf|no-data-fixup' => \$O{no_data_fixup}, # don't touch the data 'pipe:s' => \$O{pipe_cmd}, # command to communicate with 'socket:s' => \$O{socket}, # unix doain socket to talk to 'dump' => \$O{dump_args} # build options and dump ) || exit(1); load_modules({ 'Basic AUTH' => ['MIME::Base64'], 'AUTH CRAM-MD5' => ['Digest::MD5'], 'AUTH NTLM' => ['Authen::NTLM'], 'AUTH DIGEST-MD5' => ['Authen::DigestMD5'], 'MX lookups' => ['Net::DNS'], 'High resolution timing' => ['Time::HiRes'], 'TLS' => ['Net::SSLeay'], }, \%G::modules); exit(0) if ($O{get_support}); # --support means report capabilities only # We need to fix things up a bit and set a couple of global options my $opts = process_args(\%O); if ($G::dump_args) { print "type = $G::link{type}\n"; print "server = $G::link{server}\n"; print "socket = $G::link{socket}\n"; print "process = $G::link{process}\n"; print "from = $opts->{from}\n"; print "to = $opts->{to}\n"; print "helo = $opts->{helo}\n"; print "port = $G::link{port}\n"; print "tls = "; if ($G::tls) { print "starttls (", $G::tls_optional ? 'optional' : 'required', ")\n"; } elsif ($G::tls_on_connect) { print "on connect (required)\n"; } else { print "no\n"; } print "auth = "; if ($opts->{a_type}) { print $G::auth_optional ? 'optional' : 'yes', " type='$opts->{a_type}' ", "user='$opts->{a_user}' pass='$opts->{a_pass}'\n"; } else { print "no\n"; } print "quit after = $G::quit_after\n"; print "local int = $G::link{lint}\n"; print "timeout = $G::link{timeout}\n"; print "data = <<.\n$opts->{data}\n"; exit(0); } # we're going to abstract away the actual connection layer from the mail # process, so move the act of connecting into its own sub. The sub will # set info in global hash %G::link # XXX instead of passing raw data, have processs_opts create a link_data # XXX hash that we can pass verbatim here open_link(); sendmail($opts->{from}, $opts->{to}, $opts->{helo}, $opts->{data}, $opts->{a_user}, $opts->{a_pass}, $opts->{a_type}); teardown_link(); exit(0); sub teardown_link { if ($G::link{type} eq 'socket-inet' || $G::link{type} eq 'socket-unix') { # XXX need anything special for tls teardown? close($G::link{sock}); print_transaction(11, "Connection closed by foreign host."); } elsif ($G::link{type} eq 'pipe') { delete($SIG{PIPE}); $SIG{CHLD} = 'IGNORE'; close($G::link{sock}{wr}); close($G::link{sock}{re}); print_transaction(11, "Connection closed with child process."); } } sub open_link { if ($G::link{type} eq 'socket-inet') { print_transaction(11, "Trying $G::link{server}:$G::link{port}..."); $@ = ""; $G::link{sock} = IO::Socket::INET->new(PeerAddr => $G::link{server}, PeerPort => $G::link{port}, Proto => 'tcp', Timeout => $G::link{timeout}, LocalAddr => $G::link{lint}); if ($@) { print_transaction(12, "Error connecting $G::link{lint} " . "to $G::link{server}:$G::link{port}:\n\t$@"); exit(2); } print_transaction(11, "Connected to $G::link{server}."); } elsif ($G::link{type} eq 'socket-unix') { print_transaction(11, "Trying $G::link{sockfile}..."); $@ = ""; $G::link{sock} = IO::Socket::UNIX->new(Peer => $G::link{sockfile}, Timeout => $G::link{timeout}, Type => SOCK_STREAM); if ($@) { print_transaction(12, "Error connecting to $G::link{sockfile}:\n\t$@"); exit(2); } print_transaction(11, "Connected to $G::link{sockfile}."); } elsif ($G::link{type} eq 'pipe') { $SIG{PIPE} = sub { print_transaction(12, "Child process went away unexpectedly, exiting"); exit(4); }; $SIG{CHLD} = sub { print_transaction(12, "Problem with child process, exiting"); exit(5); }; print_transaction(11, "Trying pipe to $G::link{process}..."); if (!try_load("IPC::Open3")) { print_transaction(12, "Couldn't load IPC::Open3 for pipe, exiting"); exit(2); } eval{ open3($G::link{sock}{wr},$G::link{sock}{re}, 0, $G::link{process}); }; if ($@) { # =~ /open3/) { print_transaction(12, "Error connecting to $G::link{process}:\n\t$@"); exit(2); } print_transaction(11, "Connected to $G::link{process}."); } else { print_transaction(12, "Unknown or unimplemented connection type " . "$G::link{type}"); exit(3); } } sub sendmail { my $from = shift; # envelope-from my $to = shift; # envelope-to my $helo = shift; # who am I? my $data = shift; # body of message (content after DATA command) my $a_user = shift; # what user to auth with? my $a_pass = shift; # what pass to auth with my $a_type = shift; # what kind of auth (this must be set to to attempt) my $ehlo = {}; # If server is esmtp, save advertised features here # start up tls if -tlsc specified if ($G::tls_on_connect) { if (start_tls()) { print_transaction(11, "TLS started w/ cipher $G::link{tls}{cipher}"); } else { print_transaction(12, "TLS startup failed ($G::link{tls}{res})"); exit(29); } } # read the server's 220 banner do_smtp_gen(undef, '220') || do_smtp_quit(1, 21); # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'connect'); # Send a HELO string do_smtp_helo($helo, $ehlo) || do_smtp_quit(1, 22); # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'first-helo'); # handle TLS here if user has requested it if ($G::tls) { do_smtp_quit(1, 29) if (!do_smtp_tls($ehlo) && !$G::tls_optional); } # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'tls'); if ($G::link{tls}{active} && $ehlo->{STARTTLS}) { # According to RFC3207, we need to forget state info and re-EHLO here $ehlo = {}; do_smtp_helo($helo, $ehlo) || do_smtp_quit(1, 32); } # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'helo'); # handle auth here if user has requested it if ($a_type) { do_smtp_quit(1, 28) if (!do_smtp_auth($ehlo, $a_type, $a_user, $a_pass) && !$G::auth_optional); } # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'auth'); # send MAIL do_smtp_gen("MAIL FROM:<$from>", '250') || do_smtp_quit(1, 23); # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'mail'); # send RCPT my $num_accepted = 0; foreach my $r (split(/,/, $to)) { $num_accepted++ if (do_smtp_rcpt($r)); } do_smtp_quit(1, 24) if (!$num_accepted); # QUIT here if the user has asked us to do so do_smtp_quit(1, 0) if ($G::quit_after eq 'rcpt'); # send DATA do_smtp_gen('DATA', '354') || do_smtp_quit(1, 25); # send the actual data do_smtp_gen($data, '250', undef, $O{supress_data}) || do_smtp_quit(1, 26); # send QUIT do_smtp_quit(0) || do_smtp_quit(1, 27); } sub start_tls { my %t = (); # This is a convenience var to access $G::link{tls}{...} $G::link{tls} = \%t; Net::SSLeay::load_error_strings(); Net::SSLeay::SSLeay_add_ssl_algorithms(); Net::SSLeay::randomize(); $t{con} = Net::SSLeay::CTX_new() || return(0); Net::SSLeay::CTX_set_options($t{con}, &Net::SSLeay::OP_ALL); # error check $t{ssl} = Net::SSLeay::new($t{con}) || return(0); Net::SSLeay::set_fd($t{ssl}, fileno($G::link{sock})); # error check? $t{active} = Net::SSLeay::connect($t{ssl}) == 1 ? 1 : 0; $t{res} = Net::SSLeay::ERR_error_string(Net::SSLeay::ERR_get_error()) if (!$t{active}); $t{cipher} = Net::SSLeay::get_cipher($t{ssl}); return($t{active}); } sub print_transaction { my $c = shift; # transaction flag my $m = shift; # message to print my $b = shift; # be brief in what we print my $o = \*STDOUT; my $f; return if (($O{hide_send} && int($c/10) == 2) || ($O{hide_receive} && int($c/10) == 3)); # global option silent controls what we echo to the terminal # 0 - print everything # 1 - don't show anything until you hit an error, then show everything # received after that (done by setting option to 0 on first error) # 2 - don't show anything but errors # >=3 - don't print anything if ($O{silent} > 0) { return if ($O{silent} >= 3); return if ($O{silent} == 2 && $c%2 != 0); if ($O{silent} == 1) { if ($c%2 != 0) { return(); } else { $O{silent} = 0; } } } # 1x is program messages # 2x is smtp send # 3x is smtp recv # x = 1 is info/normal # x = 2 is error # program info if ($c == 11) { $f = '==='; } # program error elsif ($c == 12) { $f = '***'; $o = \*STDERR; } # smtp send info elsif ($c == 21) { $f = $G::link{tls}{active} ? ' ~>' : ' ->'; } # smtp send error elsif ($c == 22) { $f = $G::link{tls}{active} ? '*~>' : '**>'; } # smtp recv info elsif ($c == 31) { $f = $G::link{tls}{active} ? '<~ ' : '<- '; } # smtp recv error elsif ($c == 32) { $f = $G::link{tls}{active} ? '<~*' : '<**'; } # something went unexpectedly else { $c = '???'; } $f .= ' '; $f = '' if ($O{no_hints} && int($c/10) != 1); if ($b) { # split to tmp list to prevent -w gripe my @t = split(/\n/ms, $m); $m = scalar(@t) . " lines sent"; } $m =~ s/\n/\n$f/msg; print $o "$f$m\n"; } sub do_smtp_quit { my $exit = shift; my $err = shift; $SIG{CHLD} = 'IGNORE'; # XXX kludge. there's a chicken and egg problem here my $r = do_smtp_gen('QUIT', '221'); if ($exit) { teardown_link(); exit $err; } return($r); } sub do_smtp_tls { my $e = shift; # ehlo config hash if (!$e->{STARTTLS}) { print_transaction(12, "STARTTLS not supported"); return $G::tls_optional ? 1 : 0; } elsif (!do_smtp_gen("STARTTLS", '220')) { return $G::tls_optional ? 1 : 0; } elsif (!start_tls()) { print_transaction(12, "TLS startup failed ($G::link{tls}{res})"); return $G::tls_optional ? 1 : 0; } print_transaction(11, "TLS started w/ cipher $G::link{tls}{cipher}"); return(1); } sub do_smtp_auth { my $e = shift; # ehlo config hash my $at = shift; # auth type my $au = shift; # auth user my $ap = shift; # auth password # the auth_optional stuff is handled higher up, so tell the truth about # failing here if (($at ne 'ANY' && !$e->{AUTH}{$at}) || !$e->{AUTH}) { print_transaction(12, "$at authentication not supported"); return(0); } if ($G::modules{"Digest::MD5"}) { foreach my $type (@{$G::auth_map_t{'CRAM-MD5'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_cram($au, $ap, $type)); } } } if ($G::modules{"Authen::DigestMD5"}) { foreach my $type (@{$G::auth_map_t{'DIGEST-MD5'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_digest($au, $ap, $type)); } } } if ($G::modules{"Authen::NTLM"}) { foreach my $type (@{$G::auth_map_t{'NTLM'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_ntlm($au, $ap, $type)); } } } foreach my $type (@{$G::auth_map_t{'PLAIN'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_plain($au, $ap, $type)); } } foreach my $type (@{$G::auth_map_t{'LOGIN'}}) { if (($at eq $type || $at eq 'ANY') && $e->{AUTH}{$type}) { return(1) if (do_smtp_auth_login($au, $ap, $type)); } } print_transaction(12, "No authentication type succeeded"); return(0); } sub do_smtp_auth_ntlm { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth type (since NTLM might be SPA or MSN) my $r = ''; # will store smtp response my $domain; ($u,$domain) = split(/%/, $u); my $auth_string = "AUTH $as"; do_smtp_gen($auth_string, '334') || return(0); my $d = decode_base64(Authen::NTLM::ntlm()); $auth_string = encode_base64("$d", ''); do_smtp_gen($auth_string, '334', \$r, '', $G::auth_showpt ? "$d" : '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $r =~ s/^....//; # maybe something a little better here? Authen::NTLM::ntlm_domain($domain); Authen::NTLM::ntlm_user($u); Authen::NTLM::ntlm_password($p); $d = decode_base64(Authen::NTLM::ntlm($r)); $auth_string = encode_base64("$d", ''); do_smtp_gen($auth_string, '235', \$r, '', $G::auth_showpt ? "$d" : '') || return(0); return(1); } sub do_smtp_auth_digest { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth string my $r = ''; # will store smtp response my $auth_string = "AUTH $as"; do_smtp_gen($auth_string, '334', \$r, '', '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $r =~ s/^....//; # maybe something a little better here? $r = decode_base64($r); my $req = Authen::DigestMD5::Request->new($r); my $res = Authen::DigestMD5::Response->new(); $res->got_request($req); # XXX using link{server} here is probably a bug, but I don;t know what else # XXX to use yet on a non-inet-socket connection $res->set('username' => $u, 'realm' => '', 'digest-uri' => "smtp/$G::link{server}"); $res->add_digest(password => $p); my $d = $res->output(); $auth_string = encode_base64("$d", ''); do_smtp_gen($auth_string, '334', \$r, '', $G::auth_showpt ? "$d" : '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $r =~ s/^....//; # maybe something a little better here? $r = decode_base64($r); $req->input($r); return(0) if (!$req->auth_ok); do_smtp_gen("", '235', undef, '', $G::auth_showpt ? "" : '') || return(0); return(1); } sub do_smtp_auth_cram { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth string my $r = ''; # will store smtp response my $auth_string = "AUTH $as"; do_smtp_gen($auth_string, '334', \$r, '', '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $r =~ s/^....//; # maybe something a little better here? my $d = get_digest($p, $r); $auth_string = encode_base64("$u $d", ''); do_smtp_gen($auth_string, '235', undef, '', $G::auth_showpt ? "$u $d" : '') || return(0); return(1); } sub do_smtp_auth_login { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth string my $z = ''; my $auth_string = "AUTH $as"; do_smtp_gen($auth_string, '334', undef, '', '', $G::auth_showpt ? \&unencode_smtp : '') || return(0); $auth_string = encode_base64($u, ''); $z = $u if ($G::auth_showpt); do_smtp_gen($auth_string, '334', undef, '', $z, $G::auth_showpt ? \&unencode_smtp : '') || return(0); $auth_string = encode_base64($p, ''); $z = $p if ($G::auth_showpt); do_smtp_gen($auth_string, '235', undef, '', $z) || return(0); return(1); } sub do_smtp_auth_plain { my $u = shift; # auth user my $p = shift; # auth password my $as = shift; # auth string my $auth_string = "AUTH $as " . encode_base64("\0$u\0$p", ''); my $z = ''; if ($G::auth_showpt) { $z = "AUTH $as \\0$u\\0$p"; } return(do_smtp_gen($auth_string, '235', undef, '', $z)); } sub do_smtp_helo { my $h = shift; # helo string to use my $e = shift; # this is a hashref that will be populated w/ server options my $r = ''; # this'll be populated by do_smtp_gen if (do_smtp_gen("EHLO $h", '250', \$r)) { # $ehlo is designed to hold the advertised options, but I'm not sure how # to store them all - for instance, SIZE is a simple key/value pair, but # AUTH lends itself more towards a multilevel hash. What I'm going to do # is come here and add each key in the way that makes most sense in each # case. I only need auth for now. # XXX I don't think I'm handling AUTH=LOGIN right. I think it just means # LOGIN and the = is not important - something to check if it's a problem. foreach my $l (split(/\n/, $r)) { $l =~ s/^....//; if ($l =~ /^AUTH(.*)$/) { map { $e->{AUTH}{$_} = 1 } (split(' ', $1)); } elsif ($l =~ /^STARTTLS$/) { $e->{STARTTLS} = 1; } } return(1); } elsif (do_smtp_gen("HELO $h", '250')) { return(1); } return(0); } sub do_smtp_rcpt { my $m = shift; # string of comma separated recipients my $f = 0; # The number of failures we've experienced my @a = split(/,/, $m); foreach my $addr (@a) { $f++ if (!do_smtp_gen("RCPT TO:<$addr>", '250')); } # if at least one addr succeeded, we can proceed, else we stop here return $f == scalar(@a) ? 0 : 1; } sub do_smtp_gen { my $m = shift; # string to send my $e = shift; # String we're expecting to get back my $p = shift; # this is a scalar ref, assign the server return string to it my $b = shift; # be brief in the data we send my $x = shift; # if this is populated, print this instead of $m my $c = shift; # if this is a code ref, call it on the return value b4 print my $r = ''; # This'll be the return value from transact() my $time; print_transaction(21, $x ? $x : $m, $b) if (defined($m)); if ($G::show_time_lapse) { if ($G::show_time_hires) { $time = [Time::HiRes::gettimeofday()] } else { $time = time() if ($G::show_time_lapse); } } $r = transact($m, ''); $$p = $r; if ($G::show_time_lapse) { if ($G::show_time_hires) { $time = sprintf("%0.03f", Time::HiRes::tv_interval($time, [Time::HiRes::gettimeofday()])); } else { $time = time() - $time; } print_transaction(11, "response in ${time}s"); } $r = &$c($r) if (ref($c) eq 'CODE'); if ($r !~ /^$e /m) { print_transaction(32, $r); return(0); } else { print_transaction(31, $r); return(1); } } sub transact { my $send = shift; # This is the string to send my $buff = shift; # we will store and manipulate the return value here. my $s = $G::link{sock}; # This is my IO::Socket object my($wr,$re) = ($s->{wr},$s->{re}) if ($G::link{type} eq 'pipe'); eval { local $SIG{'ALRM'} = sub { $buff = "Timeout ($G::link{timeout} secs) waiting for server response"; die; }; if (defined($send)) { if ($G::link{tls}{active}) { my $res = Net::SSLeay::write($G::link{tls}{ssl}, "$send\r\n"); } else { if ($G::link{type} eq 'pipe') { print $wr $send, "\r\n"; } else { print $s $send, "\r\n"; } } } alarm($G::link{timeout}); if ($buff) { $buff = ''; } else { # The 'do' allows for multi-line responses if ($G::link{tls}{active}) { do { $buff .= Net::SSLeay::read($G::link{tls}{ssl}); } while ($buff !~ /^\d\d\d /m); } else { do { if ($G::link{type} eq 'pipe') { $buff .= <$re>; } else { $buff .= <$s>; } } while ($buff !~ /^\d\d\d /m); } $buff =~ s/\r//msg; chomp($buff); } alarm(0); }; return($buff); } sub unencode_smtp { my $t = shift; my @t = split(' ', $t); return("$t[0] " . decode_base64($t[1])); } sub process_file { my $f = shift; my $h = shift; if (! -e "$f") { print_transaction(12, "File $f does not exist, skipping"); return; } elsif (! -f "$f") { print_transaction(12, "File $f is not a file, skipping"); return; } elsif (!open(I, "<$f")) { print_transaction(12, "Couldn't open $f, skipping... ($!)"); return; } while () { chomp; next if (/^#?\s*$/); # skip blank lines and those that start w/ '#' my($key,$value) = split(' ', $_, 2); $h->{uc($key)} = $value; } return; } sub interact { my($prompt) = shift; my($regexp) = shift; my($continue) = shift; my($response) = ''; do { print "$prompt"; chomp($response = ); } while ($regexp ne 'SKIP' && $response !~ /$regexp/); return($response); } sub get_hostname { # in some cases hostname returns value but gethostbyname doesn't. my $h = hostname(); return("") if (!$h); my $l = (gethostbyname($h))[0]; return($l || $h); } sub get_server { my $addr = shift; my $pref = -1; my $server = "localhost"; if ($addr =~ /\@\[(\d+\.\d+\.\d+\.\d+)\]$/) { # handle automatic routing of domain literals (user@[1.2.3.4]) return($1); } elsif ($addr =~ /\@\#(\d+)$/) { # handle automatic routing of decimal domain literals (user@#16909060) $addr = $1; return(($addr/(2**24))%(2**8) . '.' . ($addr/(2**16))%(2**8) . '.' .($addr/(2**8))%(2**8) . '.' . ($addr/(2**0))%(2**8)); } if (!$G::modules{"Net::DNS"}) { print_transaction(12, "MX requirement Net::DNS not installed, using $server as mail server"); return($server); } my $res = new Net::DNS::Resolver; return($server) if ($addr !~ /\@/); $addr =~ s/^.*\@([^\@]*)$/$1/; return($server) if (!$addr); $server = $addr; my @mx = mx($res, $addr); foreach my $rr (@mx) { if ($rr->preference < $pref || $pref == -1) { $pref = $rr->preference; $server = $rr->exchange; } } return($server); } sub try_load { my $mod = shift; eval("use $mod"); return $@ ? 0 : 1; } sub get_digest { my $secr = shift; my $chal = shift; my $retr = ''; my $ipad = chr(0x36); my $opad = chr(0x5c); my($isec, $osec) = undef; if ($chal !~ /^ 64) { $secr = Digest::MD5::md5($secr); } else { $secr .= chr(0) x (64 - length($secr)); } foreach my $char (split(//, $secr)) { $isec .= $char ^ $ipad; $osec .= $char ^ $opad; } map { $retr .= sprintf("%02x", ord($_)) } split(//,Digest::MD5::md5($osec.Digest::MD5::md5($isec . $chal))); return($retr); } sub load_modules { my $s = shift; my $l = shift; foreach my $act (keys %$s) { my @failed = (); foreach my $m (@{$s->{$act}}) { if (try_load($m)) { $l->{$m}++; } else { push(@failed, $m); } } if ($O{get_support}) { if (scalar(@failed) > 0) { print_transaction(12, "$act not available: requires " . join(', ', @failed)); } else { print_transaction(11, "$act supported"); } } } } sub time_to_seconds { my $t = shift || 30; if ($t !~ /^(\d+)([hms])?/i) { return(30); # error condition - just use default value } else { my $r = $1; my $u = lc($2); if ($u eq 'h') { return($r * 3600); } elsif ($u eq 'm') { return($r * 60); } else { return($r); } } } # A couple of global options are set in here, they will be in the G:: namespace sub process_args { my $o = shift; # This is the args we got from command line my %n = (); # This is the hash we will return w/ the fixed-up args my $fconf = {}; # Hold config info from -l file if specified # load the $fconf hash if user has specified a -l file process_file($o->{option_file}, $fconf) if ($o->{option_file}); $G::dump_args = 1 if ($o->{dump_args}); # set global option of -q option if ($o->{quit_after}) { $G::quit_after = lc($o->{quit_after}); if ($G::quit_after eq 'ehlo') { $G::quit_after = 'helo'; } elsif ($G::quit_after eq 'first-ehlo') { $G::quit_after = 'first-helo'; } elsif ($G::quit_after eq 'starttls') { $G::quit_after = 'tls'; } elsif ($G::quit_after eq 'from') { $G::quit_after = 'mail'; } elsif ($G::quit_after eq 'to') { $G::quit_after = 'rcpt'; } elsif ($G::quit_after ne 'connect' && $G::quit_after ne 'first-helo' && $G::quit_after ne 'tls' && $G::quit_after ne 'helo' && $G::quit_after ne 'auth' && $G::quit_after ne 'mail' && $G::quit_after ne 'rcpt') { print_transaction(12, "Unknown quit value $G::quit_after, exiting"); exit(1); } # only rcpt _requires_ a to address $G::server_only = 1 if ($G::quit_after ne 'rcpt'); } else { $G::quit_after = ''; } # set global flag for -stl flag $G::show_time_lapse = time() if (defined($o->{show_time_lapse})); $G::show_time_hires = 1 if ($G::modules{'Time::HiRes'} && $o->{show_time_lapse} !~ /^i/i); if ($o->{emulate_mail}) { # set up for -m option $n{to} = shift if (!defined($o->{mail_to})); $o->{mail_data} = ''; # define it here so we get it on stdin later } # pipe command, if one is specified $G::link{process} = $o->{pipe_cmd} || interact("Pipe: ", '^.+$') if (defined($o->{pipe_cmd})); $G::link{process} ||= $fconf->{PIPE} || ""; if ($G::link{process}) { $G::link{type} = 'pipe'; } else { delete($G::link{process}); } # socket file, if one is specified $G::link{sockfile} = $o->{socket} || interact("Socket File: ", '^.+$') if (defined($o->{socket})); $G::link{sockfile} ||= $fconf->{SOCKET} || ""; if ($G::link{sockfile}) { $G::link{type} = 'socket-unix'; } else { delete($G::link{sockfile}); } # SMTP mail from $n{from} = $o->{mail_from} || interact("From: ", '^.*$') if (defined($o->{mail_from})); $n{from} ||= $fconf->{FROM} || ($hostname ? "$user\@$hostname" : interact("From: ", '^.*$')); $n{from} = '' if ($n{from} eq '<>'); # SMTP helo/ehlo $n{helo} = $o->{mail_helo} || interact("Helo: ", '^.*$') if (defined($o->{mail_helo})); $n{helo} ||= $fconf->{HELO} || ($hostname ? $hostname : interact("Helo: ", '^.*$')); # SMTP server and rcpt to are interdependant, so they are handled together $G::link{server} = $o->{mail_server} || interact("Server: ", '^.*$') if (defined($o->{mail_server})); $G::link{server} ||= $fconf->{SERVER}; $n{to} = $o->{mail_to} || interact("To: ", '^.*$') if (defined($o->{mail_to})); $n{to} ||= $fconf->{TO}; $n{to} = interact("To: ", '^.*$') if (!$n{to} && !($G::server_only && $G::link{server})); if (!$G::link{type}) { $G::link{server} = get_server($n{to}) if (!$G::link{server}); $G::link{type} = "socket-inet"; } # local interface to connect from $G::link{lint} = $o->{lint} || interact("Interface: ", '^.*$') if (defined($o->{lint})); $G::link{lint} ||= $fconf->{INTERFACE} || '0.0.0.0'; # SMTP timeout $o->{timeout} = '0s' if ($o->{timeout} eq '0'); # used 'eq' on purpose $G::link{timeout} = $o->{timeout} || interact("Timeout: ", '^\d+[hHmMsS]?$') if (defined($o->{timeout})); $G::link{timeout} ||= $fconf->{TIMEOUT} || '30s'; $G::link{timeout} = time_to_seconds($G::link{timeout}); # SMTP DATA # a '-' arg to -d is the same as setting -g if ($o->{mail_data} eq '-') { undef($o->{mail_data}); $o->{data_on_stdin} = 1; } if (defined($o->{mail_data}) && !defined($o->{data_on_stdin})) { if (defined($o->{emulate_mail})) { $n{data} = "Subject: " . interact("Subject: ", 'SKIP') . "\n\n"; do { $n{data} .= interact('', 'SKIP') . "\n"; } while ($n{data} !~ /\n\.\n$/ms); $n{data} =~ s/\n\.\n$//ms; } else { $n{data} = $o->{mail_data} || interact("Data: ", '^.*$'); } } $n{data} ||= $fconf->{DATA} || 'Date: %D\nTo: %T\nFrom: %F\nSubject: test %D\n' ."X-Mailer: swaks v$p_version jetmore.org/john/code/#swaks".'\n\n' .'This is a test mailing\n'; # The -g option trumps all other methods of getting the data $n{data} = join('', ) if ($o->{data_on_stdin}); if (!$o->{no_data_fixup}) { $n{data} =~ s/\\n/\r\n/g; $n{data} =~ s/%F/$n{from}/g; $n{data} =~ s/%T/$n{to}/g; $n{data} =~ s/%D/get_date_string()/eg; $n{data} =~ s/^From [^\n]*\n// if (!$O{no_strip_from}); $n{data} =~ s/\r?\n\.\r?\n?$//s; # If there was a trailing dot, remove it $n{data} =~ s/\n\./\n../g; # quote any other leading dots # translate line endings - run twice to get consecutive \n correctly $n{data} =~ s/([^\r])\n/$1\r\n/gs; $n{data} =~ s/([^\r])\n/$1\r\n/gs; # this identical call not a bug $n{data} .= "\r\n."; # add a trailing dot } # Handle TLS options $G::tls_optional = 1 if (defined($o->{tls_optional})); $G::tls = 1 if (defined($o->{tls}) || $G::tls_optional); $G::tls_on_connect = 1 if (defined($o->{tls_on_connect})); $G::link{tls}{active} = 0; if ($G::tls || $G::tls_on_connect) { if (!$G::modules{'Net::SSLeay'}) { if ($G::tls_optional) { $G::tls = undef; # so we won't try it later print_transaction(12, 'TLS requirement Net::SSLeay not installed, skipping optional TLS'); } else { print_transaction(12, 'TLS requirement Net::SSLeay not installed, exiting'); exit(10); } } } # SMTP port $G::link{port} = $o->{mail_port} || interact("Port: ", '^\d+$') if (defined($o->{mail_port})); $G::link{port} ||= $fconf->{PORT} || ($G::tls_on_connect ? 465 : 25); # Handle AUTH options $G::auth_optional = 1 if (defined($o->{auth_optional})); $o->{auth} = uc($o->{auth}) if ($o->{auth}); $o->{auth} = uc($o->{auth_optional}) if ($o->{auth_optional} && !$o->{auth}); $o->{auth} = 'ANY' if (!$o->{auth} && (defined($o->{auth_user}) || defined($o->{auth_pass}) || $G::auth_optional)); $o->{auth} = 'ANY' if (defined($o->{auth}) && !$o->{auth}); if ($o->{auth}) { foreach (split(/\s+,\s+/, $o->{auth_map}),"PLAIN=PLAIN","LOGIN=LOGIN", "CRAM-MD5=CRAM-MD5","DIGEST-MD5=DIGEST-MD5","NTLM=NTLM", "SPA=NTLM","MSN=NTLM") { my($alias,$type) = split(/=/, uc($_), 2); $G::auth_map_f{$alias} = $type; $G::auth_map_t{$type} ||= []; push(@{$G::auth_map_t{$type}}, $alias); } if (!$G::modules{"MIME::Base64"}) { if ($G::auth_optional) { $n{a_type} = ''; # So we won't attempt it later print_transaction(12, 'AUTH requirement MIME::Base64 not installed, skipping optional AUTH'); } else { print_transaction(12, 'AUTH requirement MIME::Base64 not installed, exiting'); exit(10); } } elsif (!$G::modules{"Digest::MD5"} && $G::auth_map_f{$o->{auth}} eq 'CRAM-MD5') { if ($G::auth_optional) { $n{a_type} = ''; # So we won't attempt it later print_transaction(12, 'AUTH:CRAM-MD5 requirement Digest::MD5 not installed, ' . 'skipping optional AUTH:CRAM-MD5'); } else { print_transaction(12, 'AUTH:CRAM-MD5 requirement Digest::MD5 not installed, exiting'); exit(10); } } elsif (!$G::modules{"Authen::NTLM"} && $G::auth_map_f{$o->{auth}} eq 'NTLM') { if ($G::auth_optional) { $n{a_type} = ''; # So we won't attempt it later print_transaction(12, 'AUTH:NTLM requirement Authen::NTLM not installed, ' . 'skipping optional AUTH:NTLM'); } else { print_transaction(12, 'AUTH:NTLM requirement Authen::NTLM not installed, exiting'); exit(10); } } elsif (!$G::modules{"Authen::DIGEST-MD5"} && $G::auth_map_f{$o->{auth}} eq 'DIGEST-MD5') { if ($G::auth_optional) { $n{a_type} = ''; # So we won't attempt it later print_transaction(12, 'AUTH:DIGEST-MD5 requirement Authen::DigestMD5 not installed, ' . 'skipping optional AUTH:DIGEST-MD5'); } else { print_transaction(12, 'AUTH:DIGEST-MD5 requirement Authen::DigestMD5 not installed, ' . 'exiting'); exit(10); } } else { $n{a_user} = $o->{auth_user} if (defined($o->{auth_user})); $n{a_user} ||= $fconf->{USER}; $n{a_user} ||= interact("Username: ", 'SKIP'); $n{a_user} = '' if ($n{a_user} eq '<>'); $n{a_pass} = $o->{auth_pass} if (defined($o->{auth_pass})); $n{a_pass} ||= $fconf->{PASS}; $n{a_pass} ||= interact("Password: ", 'SKIP'); $n{a_pass} = '' if ($n{a_pass} eq '<>'); $n{a_type} = $o->{auth}; $G::auth_showpt = 1 if (defined($o->{auth_showpt})); # This option is designed to hide passwords - turn echo off when # supplying at PW prompt, star out the PW strings in AUTH transactions. # Not implementing right now - the echo might be a portability issue, # and starring out is hard because the smtp transaction is abstracted # beyond where this is easy to do. Maybe sometime in the future #$G::auth_hidepw = 1 if (defined($o->{auth_hidepw})); } } return(\%n); } sub get_username { if ($^O eq 'MSWin32') { require Win32; return Win32::LoginName(); } return getpwuid($<); } sub get_date_string { return($G::date_string) if (length($G::date_string) > 0); my @l = localtime(); my @g = gmtime(); $G::date_string = sprintf("%s, %02d %s %d %02d:%02d:%02d %+05d", (qw(Sun Mon Tue Wed Thu Fri Sat))[$l[6]], $l[3], (qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec))[$l[4]], $l[5]+1900, $l[2], $l[1], $l[0], (timelocal(@l) - timelocal(@g))/36 ); } sub ext_usage { if ($ARGV[0] =~ /^--help$/i) { require Config; $ENV{PATH} .= ":" unless $ENV{PATH} eq ""; $ENV{PATH} = "$ENV{PATH}$Config::Config{'installscript'}"; $< = $> = 1 if ($> == 0 || $< == 0); exec("perldoc", $0) || exit(1); # make parser happy %Config::Config = (); } elsif ($ARGV[0] =~ /^--version$/i) { print "$p_name version $p_version\n\n$p_cp\n"; } else { return; } exit(0); } __END__ =head1 NAME swaks - SMTP transaction tester =head1 USAGE swaks [--help|--version] | (see description of options below) =head1 OPTIONS =over 4 =item --pipe This option takes as its argument a program and the program's arguments. If this option is present, swaks opens a pipe to the program and enters an SMTP transaction over that pipe rather than connecting to a remote server. Some MTAs have testing modes using stdin/stdout. This option allows you to tie into those options. For example, if you implemented DNSBL checking with exim and you wanted to make sure it was working, you could run 'swaks --pipe "exim -bh 127.0.0.2"'. =item --socket This option takes as its argument a unix domain socket file. If this option is present, swaks enters an SMTP transaction over over the unix domains socket rather than over an internet domain socket. I think this option has uses when combined with a (yet unwritten) LMTP mode, but to be honest at this point I just implemented it because I could. =item -l, --input-file Argument to -l must be a path to a file containing TOKEN->VALUE pairs. The TOKEN and VALUE must be separated by whitespace. These tokens set values which would otherwise be set by command line arguments. See the description of the corresponding command line argument for details of each token. Valid tokens are FROM (-f), TO (-t), SERVER (-s), DATA (-d), HELO (-h), PORT (-p), INTERFACE (-li), and TIMEOUT (-to). =item -t, --to Use argument as "RCPT TO" address, or prompt user if no argument specified. Overridden by -l token TO. Multiple recipients can be specified by supplying as one comma-delimited argument. There is no default for this option. If no to addess is specified with -t or TO token, user will be prompted for To: address on STDIN. =item -f, --from Use argument as "MAIL FROM" address, or prompt user if no argument specified. Overridden by -l token FROM. If no from address is specified, default is user at host, where user is the best guess at user currently running program, and host is best guess at DNS hostname of local host. The string <> can be supplied to mean the null sender. =item -s, --server Use argument as mail server to which to connect, or prompt user if no argument specified. Overridden by -l token SERVER. If unspecified, swaks tries to determine primary MX of destination address. If Net::DNS module is not available, tries to connect to A record for recipient's domain. =item -p, --port Use argument as port to connect to on server, or prompt user if no argument is specified. Overridden by -l token PORT. If unspecified, swaks will try to connect to port 25. =item -h, --helo, --ehlo Use argument as argument to SMTP EHLO/HELO command, or prompt use if no argument is specified. Overridden by -l token HELO. If unspecified, swaks uses best guess at DNS hostname of local host. =item -d, --data Use argument as DATA portion of SMTP transaction, or prompt user if no argument specified. Overridden by -l token DATA. This string should be on one single line, with a literal \n representing where line breaks should be placed. Leading dots will be quoted. Closing dot is not required but is allowed. Very basic token parsing is done. %F is replaced with the value that will be used for "MAIL FROM", %T is replaced with "RCPT TO" values, and %D is replaced with a timestamp. Default value for this option is "Date: %D\nTo: %T\nFrom: %F\nSubject: test %D\nX-Mailer: swaks v$p_version jetmore.org/john/code/#swaks\n\nThis is a test mailing\n". =item --timeout Use argument as the SMTP transaction timeout, or prompt user if no argument given. Overridden by the -l token TIMEOUT. Argument can either be a pure digit, which will be interpretted as seconds, or can have a specifier s or m (5s = 5 seconds, 3m = 180 seconds). As a special case, 0 means don't timeout the transactions. Default value is 30s. =item -li, --local-interface Use argument as the local interface for the SMTP connection, or prompt user if no argument given. Overridden by the -l token INTERFACE. Argument can be an IP or a hostname. Default action is to let OS choose local interface. =item -g If specified, swaks will read the DATA value for the mail from STDIN. If there is a From_ line in the email, it will be removed (but see -nsf option). Useful for delivering real message (stored in files) instead of using example messages. =item -nsf, --no-strip-from Don't strip the From_ line from the DATA portion, if present. =item -n, --suppress-data If this option is specified, swaks summarizes the DATA portion of the SMTP transaction instead of printing every line. =item -q, --quit-after The argument to this option is used as an indicator of where to quit the SMTP transaction. It can be thought of as "quit after", with valid arguments CONNECT, FISRT-HELO, TLS, HELO, AUTH, MAIL, and RCPT. In a non-STARTTLS session, FIRST-HELO and HELO behave the same way. In a STARTTLS session, FIRST-HELO quits after the first HELO sent, while HELO quits after the second HELO is sent. =item -m Emulate Mail command. Least used option in swaks. =item --support Cause swaks to print its capabilities and exit. Certain features require non-standard perl modules. This options evaluates whether these modules are present and lets you know which functionality is present. =item -S, --silent Cause swaks to be silent. "-S" causes swaks to print no output until an error occurs, after which all output is shown. "-S -S" causes swaks to only show error conditions. "-S -S -S" shows no output. =item -tls Require connection to use STARTTLS. Exit if TLS not available for any reason (not advertised, negotiations failed, etc). =item -tlso, --tls-optional Attempt to use STARTTLS if possible, continue t/ normal transaction if TLS unavailable. =item -tlsc, --tls-on-connect Initiate a TLS connection immediately on connection. Use to test smtps/ssmtp servers. If this options is specified, the default port changes from 25 to 465, though this can still be overridden with the -p option. =item -a, --auth Require authentication. If Authentication fails or is unavailable, stop transaction. -a can take an argument specifying which type of authentication to use. swaks currently supports PLAIN, LOGIN, and CRAM-MD5. If no argument is given any available authentication type is used. If neither password (-ap) or username (-au) is supplied on command line, swaks will prompt on STDIN. SPA (NTLM/MSN) authentication is now supported. Tested as a client against Exim and Stalker's CommuniGate, but implementation may be incomplete. Authen::NTLM is currently required. Note that CPAN hosts two different Authen::NTLM modules. Current implementation requires Mark Bush's implementation (Authen/NTLM-1.02.tar.gz). Plan to reimplement directly at some point to avoid confusion. DIGEST-MD5 is now supported. Tested as a client only against Stalker's Communigate, so implementation may be incomplete. Requires Authen::DigestMD5 module. =item -ao, --auth-optional Same as -a, but if authentication is unavailable or fails, attempts to continue transaction. =item -au, --auth-user Supply the username for authentication. The string <> can be supplied to mean an empty username. For SPA authentication, a "domain" can be specified after the regular username with a % seperator. For instance, if "-ap user at example.com%NTDOM" is passed, "user at example.com" is the username and "NTDOM" is the domain. NOTE: I don't actually have access to a mail server where the domain isn't ignored, so this may be implemented incorrectly. =item -ap, --auth-password Supply the password for authentication. The string <> can be supplied to mean an empty password. =item -am --auth-map Provides a way to map alternate names onto base authentication types. Useful for any sites that use alternate names for common types. This functionality is actually used internally to map types SPA and MSN onto the base type NTLM. The command line argument to simulate this would be "--auth-map SPA=NTLM,MSN=NTLM". The base types supported are LOGIN, PLAIN, CRAM-MD5, DIGEST-MD5, and NTLM. SPA and MSN are mapped on to NTLM automatically. =item -apt, --auth-plaintext Instead of showing AUTH strings literally (in base64), translate them to plaintext before printing on screen. =item -nth, --no-hints Don't show transaction hints. (Useful in conjunction with -hr to create copy/paste-able transactions =item -hr, --hide-receive Don't display reception lines =item -hs, --hide-send Don't display sending lines =item -stl, --show-time-lapse Display time lapse between send/receive pairs. If 'i' is provided as argument or the Time::HiRes module is unavailable the time lapse will be integer only, otherwise it will be to the thousandth of a second. =item --help This screen. =item --version Version info. =back =head1 EXAMPLES =over 4 =item swaks prompt user for to address and send a default email. =item cat mailfile | swaks -g -n -t user at example.com -tlso -a -au user -ap password send the contents of "mailfile" to user at example.com, using TLS if available, requiring authentication, using user/password as authentication information. =back =head1 COMMENTS This program was written because I was testing a new MTA on an alternate port. I did so much testing that using interactive telnet grew tiresome. Over the next several years this program was fleshed out and every single option was added as a direct need of some testing I was doing as the mail admin of a medium sized ISP, with the exception of TLS support which was added on a whim. As such, all options are reasonably well thought out and fairly well tested (though TLS could use more testing). =head1 REQUIRES =over 4 =item IO::Socket, Sys::Hostname, Getop::Long, Time::Local These modules are all required for the program to run at all. This shouldn't be an issue as I believe these are all core modules. =item Net::DNS This module is required to look up MX records for domains. If unavailable the -s option can be used to statically route the message. =item Net::SSLeay This module is required for TLS sessions. STARTTLS will not be supported if module is unavailable. =item MIME::Base64 This module is required for all SMTP AUTH transactions. If it is unavailable no AUTH methods will be supported. =item Digest::MD5 This module is required for CRAM-MD5 authentication. =item Authen::NTLM This module is required for SPA/MSN/NTLM authentication. Note that there are two modules using the Authen::NTLM namespace on CPAN. The Mark Bush implementation (Authen/NTLM-1.02.tar.gz) is the version required here. =item Authen::DigestMD5 This module is required for DIGEST-MD5 authentication. =item Time::HiRes This module is required for high resolution timing. If unavailable only integer timing is available. =back =head1 PORTABILITY =over 4 =item Operating Systems This program was primarily intended for use on unix-like operating systems, and it should work on any reasonable version thereof. It has been developed and tested on Solaris, Linux, and Mac OS X and is feature complete on all of these. This program is known to demonstrate basic functionality on Windows using ActiveState's Perl. It has not been fully tested. Known to work are basic SMTP functionality and the LOGIN, PLAIN, and CRAM-MD5 auth types. Unknown is any TLS functionality and the NTLM/SPA and Digest-MD5 auth types. Because this program should work anywhere Perl works, I would appreciate knowing about any new operating systems you've thoroughly used swaks on as well as any problems encountered on a new OS. =item Mail Servers This program was almost exclusively developed against Exim mail servers. It was been used casually by the author, though not thoroughly tested, with sendmail, smail, and Communigate. Because all functionality in swaks is based off of known standards it should work with any fairly modern mail server. If a problem is found, please alert the author at the address below. =back =head1 EXIT CODES =over 4 =item 0 no errors occurred =item 1 error parsing command line options =item 2 error connecting to remote server =item 3 unknown connection type =item 4 while running with connection type of "pipe", fatal problem writing to or reading from the child process =item 5 while running with connection type of "pipe", child process died unexpectedly. This can mean that the program specified with --pipe doesn't exist. =item 10 error in prerequisites (needed module not available) =item 21 error reading initial banner from server =item 22 error in HELO transaction =item 23 error in MAIL transaction =item 24 no RCPTs accepted =item 25 server returned error to DATA request =item 26 server did not accept mail following data =item 27 server returned error after normal-session quit request =item 28 error in AUTH transaction =item 29 error in TLS transaction =item 32 error in EHLO following TLS negotiation =back =head1 CONTACT =over 4 =item proj-swaks at jetmore.net =back =cut --- NEW FILE swaks.spec --- Name: swaks Version: 20050709.1 Release: 5%{?dist} Summary: Command-line SMTP transaction tester Group: Applications/Internet License: GPL URL: http://www.jetmore.org/john/code/#swaks Source0: http://www.jetmore.org/john/code/swaks.%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(Authen:DigestMD5) Requires: perl(Net::DNS) Requires: perl(Net::SSLeay) Requires: perl(Time::HiRes) %description Swiss Army Knife SMTP: A command line SMTP tester. Swaks can test various aspects of your SMTP server, including TLS and AUTH. %prep %build %install rm -rf $RPM_BUILD_ROOT install -D -p -m 0755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/swaks mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 /usr/bin/pod2man %{SOURCE0} > $RPM_BUILD_ROOT%{_mandir}/man1/swaks.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/swaks %{_mandir}/man1/* %changelog * Mon May 15 2006 Jason L Tibbitts III - 20050709.1-5 - Add Authen::DigestMD5 requirement now that it's in Extras. * Wed Mar 29 2006 Jason L Tibbitts III - 20050709.1-4 - Cleanups from package review * Sun Feb 12 2006 Jason L Tibbitts III - 20050709.1-3 - Use versioned source file URL * Sat Jan 28 2006 Jason L Tibbitts III - 20050709.1-2 - Change group. * Sat Jan 28 2006 Jason L Tibbitts III - 20050709.1-1 - Initial attempt From fedora-extras-commits at redhat.com Mon May 15 17:26:52 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 May 2006 10:26:52 -0700 Subject: extras-buildsys/builder Builder.py, 1.12, 1.13 BuilderMock.py, 1.6, 1.7 Config.py, 1.3, 1.4 Message-ID: <200605151726.k4FHQqTK008781@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8745/builder Modified Files: Builder.py BuilderMock.py Config.py Log Message: 2006-05-15 Dan Williams * builder/Builder.py builder/BuilderMock.py - (untested) Make passive builders work on the builder side 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 14 May 2006 16:13:06 -0000 1.12 +++ Builder.py 15 May 2006 17:26:45 -0000 1.13 @@ -24,12 +24,15 @@ import string import xmlrpclib import OpenSSL +import shutil from plague import Commands -from plague import AuthedXMLRPCServer +from plague.AuthedXMLRPCServer import AuthedSSLXMLRPCServer +from plague.AuthedXMLRPCServer import AuthedXMLRPCServer from plague import HTTPServer from plague import XMLRPCServerProxy from plague import FileDownloader from plague import FileUploader +from plague import FileTransfer import Config import BuilderMock @@ -38,15 +41,17 @@ class BuilderInitException(Exception): pass -def get_hostname(cfg, bind_all): - cfg_hostname = cfg.get_str("Passive", "hostname") +def get_hostname(cfg, bind_all=False): + """Get the builder's hostname, optionally returning a hostname + suitable for binding to all active interfaces.""" + cfg_hostname = cfg.get_str("General", "hostname") if cfg_hostname and len(cfg_hostname): return cfg_hostname elif bind_all: return '' return socket.gethostname() -def determine_max_jobs(): +def _determine_max_jobs(): """ Simple max job calculator based on number of CPUs """ import commands @@ -61,25 +66,51 @@ return max_jobs +def prefix_url(url, use_ssl): + """Convenience function to add correct URL method + for the security method we're using.""" + if use_ssl: + return "https://" + url + return "http://" + url + + class Builder(object): """ Abstract builder base object """ def __init__(self, cfg): self._cfg = cfg - self._max_slots = determine_max_jobs() + self._max_slots = _determine_max_jobs() self._seq_gen = Commands.SequenceGenerator() + self._queued_cmds = [] + + self._stop = False + self._stopped = False self._building_jobs_lock = threading.Lock() self._building_jobs = [] self._all_jobs = {} + # Decompose hostname to just get the hostname + name = cfg.get_str("General", "server") + slash_idx = name.find("//") + if slash_idx > 0: + name = name[slash_idx + 2:] + slash_idx = name.find("/") + if slash_idx > 0: + name = name[:slash_idx] + self._server_hostname = name + + self._server_ip = None + self._get_server_ip() + self._certs = None - if cfg.get_bool("SSL", "use_ssl"): - hostname = get_hostname(self._cfg, False) - key_file = os.path.join(cfg.get_str("SSL", "builder_key_and_cert_dir"), "%s.pem" % hostname) + self._use_ssl = cfg.get_bool("SSL", "use_ssl") + if self._use_ssl: self._certs = {} - self._certs['key_and_cert'] = key_file + hostname = get_hostname(self._cfg) + builder_cert = cfg.get_str("SSL", "builder_key_and_cert_dir") + self._certs['key_and_cert'] = os.path.join(builder_cert, "%s.pem" % hostname) self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._certs['peer_ca_cert'] = self._certs['ca_cert'] + self._certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") build_arches = [] for target in self._cfg.targets(): @@ -88,6 +119,14 @@ build_arches.append(arch) self._log("Available architectures: [%s]" % string.join(build_arches, ", ")) + def _get_server_ip(self): + try: + self._server_ip = socket.gethostbyname(self._server_hostname) + return True + except Exception: + pass + return False + def _log(self, msg, newline=True): if self._cfg.get_bool("General", "debug"): if newline: @@ -96,6 +135,7 @@ sys.stdout.flush() def new_builder(cfg, btype): + """Create and return a new builder object of the requested type.""" if btype == 'passive': return PassiveBuilder(cfg) elif btype == 'active': @@ -104,10 +144,19 @@ return None new_builder = staticmethod(new_builder) - def stop(self): - pass + def work(self): + """Builder work loop, starts the builder object's thread + and sleeps until it's done.""" + self.start() + try: + while not self._stop: + time.sleep(60) + except KeyboardInterrupt: + pass def cleanup(self): + """Clean up the builder by killing all running jobs and waiting + for them to complete.""" self._building_jobs_lock.acquire() for job in self._building_jobs: job.die() @@ -162,6 +211,58 @@ return target_cfg + def _get_default_commands(self): + """Return a python list of serialized commands that the builder + sends to the server every time it contacts the server.""" + + defcmds = [] + + # always send a target list + next_seq = self._seq_gen.next() + cmd = Commands.PlgCommandTargets(self.supported_targets(), next_seq) + defcmds.append(cmd) + + # always send free & max slots + next_seq = self._seq_gen.next() + (free_slots, max_slots) = self.slots() + cmd = Commands.PlgCommandSlots(free_slots, max_slots, next_seq) + defcmds.append(cmd) + + defcmds.append(self._get_building_jobs_cmd()) + + return defcmds + + def _dispatch_server_command(self, cmd): + """Process a single command from the server.""" + + if isinstance(cmd, Commands.PlgCommandNewJobReq): + (uniqid, msg) = self._start_new_job(cmd) + ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) + self._queued_cmds.append(ack) + elif isinstance(cmd, Commands.PlgCommandUnlockRepo): + self._handle_unlock_repo_request(cmd) + elif isinstance(cmd, Commands.PlgCommandJobStatus): + reply = self._handle_job_status_request(cmd) + if reply: + self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandJobFiles): + reply = self._handle_job_files_request(cmd) + if reply: + self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandKillJob): + self._handle_kill_job_command(cmd) + + def _process_server_commands(self, cmd_list): + """Process the server's command stream.""" + + if not cmd_list: + # Something went wrong... + return + + cmds = Commands.deserialize_command_stream(cmd_list) + for cmd in cmds: + self._dispatch_server_command(cmd) + def _new_job_for_arch(self, target_cfg, buildarch, srpm_url, uniqid): """Creates a new mock build job given a particular build architecture.""" @@ -252,130 +353,184 @@ pass -class PassiveBuilderRequestHandler: - def __init__(self, cfg, builder): - self._builder = builder - self._all_jobs = {} # unique id => awclass instance - self._building_jobs_lock = threading.Lock() - self._building_jobs = [] - self._cfg = cfg - - def _log(self, msg): - if self._cfg.get_bool("General", "debug"): - print msg - - def die(self, uniqid): - try: - job = self._all_jobs[uniqid] - job.die() - except KeyError: - pass - return 0 - - def files(self, uniqid): - try: - job = self._all_jobs[uniqid] - return job.files() - except KeyError: - pass - return [] - - def repo_unlocked(self, uniqid): - try: - job = self._all_jobs[uniqid] - job.unlock_repo() - except KeyError: - pass - return 0 - - def building_jobs(self): - jobs = {} - self._building_jobs_lock.acquire() - building = 0 - for job in self._building_jobs: - jobs[job.uniqid()] = job.status() - building = building + 1 - free = self._max_jobs - building - self._building_jobs_lock.release() - return (jobs, free) - - def num_slots(self): - (free_slots, max_slots) = self._builder.slots() - return max_slots - - def job_status(self, uniqid): - try: - job = self._all_jobs[uniqid] - return job.status() - except KeyError: - pass - return '' - - def supported_targets(self): - return self._builder.supported_targets() - - -class PassiveBuilder(Builder): +class PassiveBuilder(Builder, threading.Thread): """ Passive builders initiate no communication of their own. They wait for the build server to contact them, and therefore may not be used behind a firewall without holes being punched through it. + + The class structure here is somewhat convoluted, since PassiveBuilder + is actually an XML-RPC request handler as well as a subclass of Builder. + It's still it's own thread for housekeeping purposes, but most of it's + functions get called from a thread spawned by the XML-RPC server to handle + requests. """ def __init__(self, cfg): Builder.__init__(self, cfg) self._http_server = None self._xmlrpc_server = None + self._work_dir = os.path.abspath(cfg.get_str("Directories", "builder_work_dir")) + threading.Thread.__init__(self) - def _start_servers(self): - # Start up the HTTP server thread which the build server - # pulls completed RPMs from - hostname = get_hostname(self._cfg, True) - port = self._cfg.get_int("Passive", "fileserver_port") - work_dir = self._cfg.get_str("Directories", "builder_work_dir") - self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs) - self._http_server.start() + self._init_servers() + def _init_servers(self): + """Startup HTTP and XML-RPC servers which the build server uses + to talk to us.""" + hostname = get_hostname(self._cfg, bind_all=True) self._log("Binding to address '%s'\n" % hostname) + + port = self._cfg.get_int("Passive", "fileserver_port") + self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), + self._work_dir, self._certs) + self._http_server.set_POST_handler('/upload', self.upload_callback) + xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") try: - if self._cfg.get_bool("SSL", "use_ssl") == True: - self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) + if self._use_ssl: + self._xmlrpc_server = AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) else: - self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) + self._xmlrpc_server = AuthedXMLRPCServer((hostname, xmlrpc_port), None) except socket.error, exc: if exc[0] == 98: raise BuilderInitException("Error: couldn't bind to address '%s:%s'. " \ "Is the builder already running?\n" % (hostname, xmlrpc_port)) - brh = PassiveBuilderRequestHandler(self._cfg, self) - self._xmlrpc_server.register_instance(brh) + self._xmlrpc_server.register_instance(self) - def work(self): - self._start_servers() - try: - self._xmlrpc_server.serve_forever() - except KeyboardInterrupt: - pass + def _get_workdir_for_job(self, archjob_id): + return os.path.join(self._work_dir, archjob_id) - def download_srpm(self, url, target_dir, dl_callback, cb_data): - """For passive builders, the server uploads the RPM to the builder. - Therefore, we already have it. Move it from the HTTP server's upload - directory to the requested target_dir, if the SRPM exists.""" - pass + def upload_callback(self, request_handler, fs): + """Handle SRPM uploads from the server.""" + # Ensure we know the server + if not self._server_ip: + self._get_server_ip() + ip = request_handler.client_address[0] + if not self._server_ip or self._server_ip != ip: + request_handler.send_error(403, "Unauthorized") + return + + # Search for filename + fslist = [fs] + if not fs.name and not fs.filename and fs.value: + fslist = fs.value + jobid = filename = tmpfile = None + for item in fslist: + if item.name == 'archjob_id': + try: + jobid = urllib.unquote(str(item.value)) + # Ensure archjob_id is only as long as a sha1 hash + if len(jobid) is not 40: + jobid = None + except ValueError: + pass + elif item.name == 'filedata': + filename = item.filename + tmpfile = item.file + + if jobid and filename and tmpfile: + upload_dir = os.path.join(self._get_workdir_for_job(jobid), "source") + destpath = os.path.join(upload_dir, urllib.unquote(filename)) + dest = file(destpath, "w+b") + shutil.copyfileobj(tmpfile, dest) + dest.close() + request_handler.send_response(200, "Success") + request_handler.send_header("Content-type", "text/html") + request_handler.end_headers() + request_handler.wfile.write("Success!") + else: + request_handler.send_error(400, "Invalid request for %s" % request_handler.path) - def _stop_servers(self): + def run(self): + """Main builder loop. Sit around and serve requests.""" + self._http_server.start() + # We sit in serve_forever() until stopped + # FIXME: how do we stop this? server_close() doesn't seem to + self._xmlrpc_server.serve_forever() + self._stopped = True + + def stop(self): + """Tear down HTTP and XML-RPC servers and cleanup their resources.""" self._http_server.stop() self._xmlrpc_server.stop() - try: - time.sleep(1) - except KeyboardInterrupt: - pass self._xmlrpc_server.server_close() + # FIXME: server_close() doesn't seem to stop the serve_forever() + return - def stop(self): - Builder.stop(self) - self._stop_servers() + while not self._stopped: + try: + time.sleep(0.2) + except KeyboardInterrupt: + pass + + ################################################################### + # Code below called by XML-RPC request handler from request thread + ################################################################### + + def request(self, cmd_list): + """Main XML-RPC handler, called by the build server. Dispatches + the build server's requests and returns our response.""" + cmds = Commands.deserialize_command_stream(cmd_list) + self._process_server_commands(cmds) + cmds_for_server = self._get_default_commands() + cmds_for_server = cmds_for_server + self._queued_cmds + self._queued_cmds = [] + cmd_stream = Commands.serialize_to_command_stream(cmds_for_server) + return cmd_stream + + def download_srpm(self, archjob_id, url, target_dir, dl_callback, cb_data=None): + """For passive builders, the server uploads the RPM to the builder. + Therefore, we already have it. Move it from the HTTP server's upload + directory to the requested target_dir, if the SRPM exists.""" + + filename = os.path.basename(urllib.unquote(url)) + source_dir = os.path.join(self._get_workdir_for_job(archjob_id), "source") + target_file = os.path.join(target_dir, filename) + + result = FileTransfer.FT_RESULT_FAILED + msg = "Failed" + + # Usually the upload dir will be the same as the archjob's target dir, + # but if it's not, copy the file over + if source_dir != target_dir: + try: + shutil.move(os.path.join(source_dir, filename), target_file) + result = FileTransfer.FT_RESULT_SUCCESS + except IOError, exc: + msg = str(exc) + elif os.access(target_file, os.R_OK): + # Otherwise make sure the files where the archjob wants it + result = FileTransfer.FT_RESULT_SUCCESS + + if result == FileTransfer.FT_RESULT_SUCCESS: + msg = "Success" + dl_callback(result, cb_data, msg) + return None + + def upload_files(self, archjob_id, files, ul_callback, cb_data=None): + """For passive builders, the build server retrieves the result + files from the builder. So we pretty much do nothing here, since + the work_dir is already the HTTP download dir.""" + work_dir = self._get_workdir_for_job(archjob_id) + result = FileTransfer.FT_RESULT_FAILED + msg = "Failed" + for fpath in files: + if fpath.startswith(work_dir): + continue + last_part = fpath[len(work_dir):] + new_path = os.path.join(work_dir, last_part) + try: + shutil.move(fpath, new_path) + result = FileTransfer.FT_RESULT_SUCCESS + except IOError, exc: + msg = str(exc) + break + if result == FileTransfer.FT_RESULT_SUCCESS: + msg = "Success" + ul_callback(result, cb_data, msg) + return None # HACK: This class is a hack to work around SSL hanging issues, @@ -412,35 +567,16 @@ def __init__(self, cfg): Builder.__init__(self, cfg) - self._stop = False - self._stopped = False self._last_comm = time.time() - self._SERVER_CONTACT_INTERVAL - 1 - self._queued_cmds = [] self._xmlrpc_address = self._get_server_address(cfg.get_str("Active", "xmlrpc_port")) self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._xmlrpc_address, self._certs, timeout=20) threading.Thread.__init__(self) def _get_server_address(self, port): - addr = self._cfg.get_str("Active", "server") - if addr.startswith("http://"): - addr = addr[7:] - elif addr.startswith("https://"): - addr = addr[8:] - if self._cfg.get_bool("SSL", "use_ssl"): - addr = "https://" + addr - else: - addr = "http://" + addr + addr = prefix_url(self._server_hostname, self._use_ssl) return addr + ":" + port - def work(self): - self.start() - try: - while not self._stop: - time.sleep(60) - except KeyboardInterrupt: - pass - - def download_srpm(self, url, target_dir, dl_callback, cb_data=None): + def download_srpm(self, archjob_id, url, target_dir, dl_callback, cb_data=None): """Download an SRPM from the build server. Only used by BuilderMock objects.""" downloader = FileDownloader.FileDownloader(url, target_dir, ['.src.rpm'], @@ -450,14 +586,9 @@ return downloader def upload_files(self, archjob_id, files, ul_callback, cb_data=None): - server = self._cfg.get_str("Active", "server") - (urltype, urlrest) = urllib.splittype(server) - (ignore, server) = urllib.splithost(urlrest) - if self._cfg.get_bool("SSL", "use_ssl"): - url = "https://" + server - else: - url = "http://" + server - url = url + ":%d/upload" % self._cfg.get_int("Active", "fileserver_port") + port = self._cfg.get_int("Active", "fileserver_port") + url = "%s:%d/upload" % (self._server_hostname, port) + url = prefix_url(url, self._use_ssl) data = [("archjob_id", archjob_id)] uploader = FileUploader.FileUploader(url, files, 'filedata', data, self._certs) @@ -479,27 +610,6 @@ urls.append("file:///%s" % os.path.basename(fpath)) return Commands.PlgCommandJobFilesAck(archjob_id, urls, cmd.seq(), self._seq_gen.next()) - def _get_default_commands(self): - """Return a python list of serialized commands that the builder - sends to the server every time it contacts the server.""" - - defcmds = [] - - # always send a target list - next_seq = self._seq_gen.next() - cmd = Commands.PlgCommandTargets(self.supported_targets(), next_seq) - defcmds.append(cmd) - - # always send free & max slots - next_seq = self._seq_gen.next() - (free_slots, max_slots) = self.slots() - cmd = Commands.PlgCommandSlots(free_slots, max_slots, next_seq) - defcmds.append(cmd) - - defcmds.append(self._get_building_jobs_cmd()) - - return defcmds - def _send_commands(self): """Send default commands, and any commands that we've queued up since the last time we sent commands to the server.""" @@ -524,37 +634,6 @@ return req.response return None - def _dispatch_server_command(self, cmd): - """Process a single command from the server.""" - - if isinstance(cmd, Commands.PlgCommandNewJobReq): - (uniqid, msg) = self._start_new_job(cmd) - ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) - self._queued_cmds.append(ack) - elif isinstance(cmd, Commands.PlgCommandUnlockRepo): - self._handle_unlock_repo_request(cmd) - elif isinstance(cmd, Commands.PlgCommandJobStatus): - reply = self._handle_job_status_request(cmd) - if reply: - self._queued_cmds.append(reply) - elif isinstance(cmd, Commands.PlgCommandJobFiles): - reply = self._handle_job_files_request(cmd) - if reply: - self._queued_cmds.append(reply) - elif isinstance(cmd, Commands.PlgCommandKillJob): - self._handle_kill_job_command(cmd) - - def _process_server_response(self, response): - """Process the server's response command stream.""" - - if not response: - # Something went wrong... - return - - cmds = Commands.deserialize_command_stream(response) - for cmd in cmds: - self._dispatch_server_command(cmd) - def run(self): """Main builder loop, send commands to and receive commands from the server every so often.""" @@ -563,7 +642,7 @@ if self._last_comm < time.time() - self._SERVER_CONTACT_INTERVAL: self._last_comm = time.time() resp = self._send_commands() - self._process_server_response(resp) + self._process_server_commands(resp) time.sleep(1) self._stopped = True Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- BuilderMock.py 14 May 2006 05:43:06 -0000 1.6 +++ BuilderMock.py 15 May 2006 17:26:45 -0000 1.7 @@ -27,7 +27,9 @@ import errno import exceptions import time + import Builder +import Config from plague import ExecUtils from plague import FileDownloader @@ -43,12 +45,9 @@ return None file_part = file_path[len(work_dir) + 1:] port = "%s" % cfg.get_int("Network", "fileserver_port") - if cfg.get_bool("SSL", "use_ssl"): - method = "https://" - else: - method = "http://" - hostname = Builder.get_hostname(cfg, False) - full_url = "%s%s:%s/%s" % (method, hostname, port, file_part) + hostname = Builder.get_hostname(cfg) + full_url = "%s:%s/%s" % (hostname, port, file_part) + full_url = Builder.prefix_url(full_url, cfg.get_bool("SSL", "use_ssl")) return urllib.quote(full_url) @@ -82,7 +81,12 @@ self._uploader = None self.arch_command = "" - self._work_dir = self._builder_cfg.get_str("Directories", "builder_work_dir") + self._work_dir = os.path.abspath(self._builder_cfg.get_str("Directories", "builder_work_dir")) + + self._source_dir = os.path.join(self._work_dir, self._uniqid, "source") + if not os.path.exists(self._source_dir): + os.makedirs(self._source_dir) + self._result_dir = os.path.join(self._work_dir, self._uniqid, "result") if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) @@ -286,29 +290,27 @@ return contents def dl_callback(self, dl_status, cb_data, err_msg=None): - url = cb_data - if dl_status == FileTransfer.FT_RESULT_SUCCESS: - self._status = 'downloaded' - self._log("Retrieved %s.\n" % url) - elif dl_status == FileTransfer.FT_RESULT_FAILED: - # If job was cancelled, just return - if self.is_done_status(): - return - self._done_status = 'failed' - self._log("ERROR: Failed to retrieve %s.\n" % url) - self._post_cleanup() - elif dl_status == FileTransfer.FT_RESULT_CANCELED: - # Ignore cancelation - pass + if not self.is_done_status(): + url = cb_data + if dl_status == FileTransfer.FT_RESULT_SUCCESS: + self._status = 'downloaded' + self._log("Retrieved %s.\n" % url) + elif dl_status == FileTransfer.FT_RESULT_FAILED: + self._done_status = 'failed' + self._log("ERROR: Failed to retrieve '%s' because: %s\n" % (url, err_msg)) + self._post_cleanup() + elif dl_status == FileTransfer.FT_RESULT_CANCELED: + # Ignore cancelation + pass self._downloader = None def _status_init(self): self._log("Starting download of %s.\n" % self._srpm_url) self._status = 'downloading' - target_dir = os.path.dirname(self._srpm_path) try: - self._downloader = self._controller.download_srpm(self._srpm_url, - target_dir, self.dl_callback, self._srpm_url) + target_dir = os.path.dirname(self._srpm_path) + self._downloader = self._controller.download_srpm(self._uniqid, + self._srpm_url, target_dir, self.dl_callback, self._srpm_url) except FileDownloader.FileNameException, exc: self._done_status = 'failed' self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (exc, self._srpm_url)) @@ -410,10 +412,10 @@ def _post_cleanup(self): if self._done_status is not 'killed': + self._status = "uploading" self._files = self._find_files() self._uploader = self._controller.upload_files(self._uniqid, self._files, self.ul_callback, None) - self._status = "uploading" else: self._status = self._done_status @@ -445,18 +447,18 @@ def run(self): # Print out a nice message at the start of the job - target_dict = self._target_cfg.target_dict() - target_str = "%s-%s-%s-%s" % (target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo']) + target_str = Config.make_target_string_from_dict(self._target_cfg.target_dict()) + time_str = time.asctime(time.localtime(self._starttime)) self._log("""Starting job: Time: %s Target: %s UID: %s Architecture: %s - SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self._buildarch, self._srpm_url)) + SRPM: %s\n\n""" % (time_str, target_str, self._uniqid, self._buildarch, self._srpm_url)) try: srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm']) - self._srpm_path = os.path.join(self._work_dir, self._uniqid, "source", srpm_filename) + self._srpm_path = os.path.join(self._source_dir, srpm_filename) except FileDownloader.FileNameException, exc: self._done_status = 'failed' self._log("ERROR: SRPM file name was invalid. Message: '%s'\n" % exc) 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 28 Apr 2006 03:17:35 -0000 1.3 +++ Config.py 15 May 2006 17:26:45 -0000 1.4 @@ -25,6 +25,8 @@ def make_target_string(distro, target, arch, repo): return "%s-%s-%s-%s" % (distro, target, arch, repo) +def make_target_string_from_dict(target_dict): + return make_target_string(target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo']) class BuilderConfig(BaseConfig.BaseConfig): def __init__(self, filename): @@ -82,18 +84,18 @@ self.set_option("General", "builder_cmd", "/usr/bin/mock") self.set_option("General", "builder_user", "plague-builder") self.set_option("General", "comm_type", "active") + self.set_option("General", "hostname", "localhost") + self.set_option("General", "server", "") self.add_section("Directories") self.set_option("Directories", "builder_work_dir", "/tmp/builder_work") self.set_option("Directories", "target_configs_dir", "/etc/plague/builder/targets") self.add_section("Active") - self.set_option("Active", "server", "") self.set_option("Active", "xmlrpc_port", "8886") self.set_option("Active", "fileserver_port", "8887") self.add_section("Passive") - self.set_option("Passive", "hostname", "") self.set_option("Passive", "xmlrpc_port", "8888") self.set_option("Passive", "fileserver_port", "8889") From fedora-extras-commits at redhat.com Mon May 15 17:26:47 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 May 2006 10:26:47 -0700 Subject: extras-buildsys ChangeLog,1.197,1.198 Message-ID: <200605151727.k4FHRH87008786@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8745 Modified Files: ChangeLog Log Message: 2006-05-15 Dan Williams * builder/Builder.py builder/BuilderMock.py - (untested) Make passive builders work on the builder side Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- ChangeLog 14 May 2006 05:43:05 -0000 1.197 +++ ChangeLog 15 May 2006 17:26:44 -0000 1.198 @@ -1,3 +1,9 @@ +2006-05-15 Dan Williams + + * builder/Builder.py + builder/BuilderMock.py + - (untested) Make passive builders work on the builder side + 2006-05-14 Dan Williams * Rework archjob handling. They are now processed from the owning From fedora-extras-commits at redhat.com Mon May 15 18:14:26 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 15 May 2006 11:14:26 -0700 Subject: fedora-security/audit fc4,1.245,1.246 fc5,1.159,1.160 Message-ID: <200605151814.k4FIEQSa011256@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11230 Modified Files: fc4 fc5 Log Message: Note some freetype issues. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- fc4 15 May 2006 17:10:35 -0000 1.245 +++ fc4 15 May 2006 18:14:23 -0000 1.246 @@ -37,6 +37,7 @@ CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 version (kernel, fixed 2.6.16.14) [since FEDORA-2006-517] CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] +CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] @@ -154,6 +155,7 @@ CVE-2006-0748 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-0748 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8) +CVE-2006-0747 VULNERABLE (freetype, fixed 2.2.1) #183677 CVE-2006-0746 VULNERABLE (kpdf) #184308 CVE-2006-0745 version (xorg-x11) not fc4 CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- fc5 15 May 2006 17:10:35 -0000 1.159 +++ fc5 15 May 2006 18:14:23 -0000 1.160 @@ -38,6 +38,7 @@ CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] +CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] @@ -156,6 +157,7 @@ CVE-2006-0748 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-0748 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] CVE-2006-0748 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-0747 VULNERABLE (freetype, fixed 2.2.1) #183677 CVE-2006-0746 version (kdegraphics, fixed 3.4) CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172] CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421] From fedora-extras-commits at redhat.com Mon May 15 18:48:39 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:48:39 -0700 Subject: rpms/xarchon - New directory Message-ID: <200605151848.k4FImf7R011567@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541/xarchon Log Message: Directory /cvs/extras/rpms/xarchon added to the repository From fedora-extras-commits at redhat.com Mon May 15 18:48:39 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:48:39 -0700 Subject: rpms/xarchon/devel - New directory Message-ID: <200605151848.k4FImfMZ011570@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541/xarchon/devel Log Message: Directory /cvs/extras/rpms/xarchon/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 18:48:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:48:58 -0700 Subject: rpms/xarchon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151849.k4FIn00K011626@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11590/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xarchon --- NEW 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 May 15 18:48:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:48:58 -0700 Subject: rpms/xarchon Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151849.k4FIn04g011623@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11590 Added Files: Makefile import.log Log Message: Setup of module xarchon --- NEW FILE Makefile --- # Top level Makefile for module xarchon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 18:49:42 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:49:42 -0700 Subject: rpms/xarchon import.log,1.1,1.2 Message-ID: <200605151850.k4FIoEJr011724@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11678 Modified Files: import.log Log Message: auto-import xarchon-0.50-2 on branch devel from xarchon-0.50-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xarchon/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 18:48:57 -0000 1.1 +++ import.log 15 May 2006 18:49:42 -0000 1.2 @@ -0,0 +1 @@ +xarchon-0_50-2:HEAD:xarchon-0.50-2.src.rpm:1147718998 From fedora-extras-commits at redhat.com Mon May 15 18:49:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 11:49:43 -0700 Subject: rpms/xarchon/devel xarchon-0.50-extraqual.patch, NONE, 1.1 xarchon-destdir.patch, NONE, 1.1 xarchon-fonts.patch, NONE, 1.1 xarchon.desktop, NONE, 1.1 xarchon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151850.k4FIoFt8011728@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xarchon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11678/devel Modified Files: .cvsignore sources Added Files: xarchon-0.50-extraqual.patch xarchon-destdir.patch xarchon-fonts.patch xarchon.desktop xarchon.spec Log Message: auto-import xarchon-0.50-2 on branch devel from xarchon-0.50-2.src.rpm xarchon-0.50-extraqual.patch: --- NEW FILE xarchon-0.50-extraqual.patch --- --- src/Xarchon_Genetic.hpp~ 1999-10-09 20:00:56.000000000 +0300 +++ src/Xarchon_Genetic.hpp 2006-03-14 23:46:15.000000000 +0200 @@ -82,8 +82,8 @@ Xarchon_Genetic_Generation *gg; public: Xarchon_Evolution(char *test,char *pop,int num); - Genetic_Population *Xarchon_Evolution::Operate(Genetic_Population *p); - Genetic_Population *Xarchon_Evolution::Operate(void); + Genetic_Population *Operate(Genetic_Population *p); + Genetic_Population *Operate(void); virtual ~Xarchon_Evolution(void); }; xarchon-destdir.patch: --- NEW FILE xarchon-destdir.patch --- --- data/Makefile.am~ 1999-10-16 01:33:45.000000000 +0300 +++ data/Makefile.am 2003-09-14 14:32:25.000000000 +0300 @@ -7,8 +7,8 @@ echo "--> Installing theme '$$theme'"; \ THEME_DIRS=`find $$theme -type d`; \ for p in $$THEME_DIRS; do \ - echo "mkdir $(pkgdatadir)/$$p"; \ - mkdir $(pkgdatadir)/$$p; \ + echo "mkdir $(DESTDIR)$(pkgdatadir)/$$p"; \ + mkdir $(DESTDIR)$(pkgdatadir)/$$p; \ done; \ THEME_FILES=`find $$theme -type f`; \ for p in $$THEME_FILES; do \ --- data/Makefile.in~ 1999-12-03 19:12:06.000000000 +0200 +++ data/Makefile.in 2003-09-14 14:43:46.000000000 +0300 @@ -210,8 +210,8 @@ echo "--> Installing theme '$$theme'"; \ THEME_DIRS=`find $$theme -type d`; \ for p in $$THEME_DIRS; do \ - echo "mkdir $(pkgdatadir)/$$p"; \ - mkdir $(pkgdatadir)/$$p; \ + echo "mkdir $(DESTDIR)$(pkgdatadir)/$$p"; \ + mkdir $(DESTDIR)$(pkgdatadir)/$$p; \ done; \ THEME_FILES=`find $$theme -type f`; \ for p in $$THEME_FILES; do \ xarchon-fonts.patch: --- NEW FILE xarchon-fonts.patch --- --- xarchon-0.50/src/board.c.orig 2002-09-26 08:28:46.000000000 -0400 +++ xarchon-0.50/src/board.c 2002-09-26 08:29:02.000000000 -0400 @@ -27,7 +27,7 @@ #define FLOOR_DARK 0 /* steppings for light and dark */ #define FLOOR_LIGHT 7 /* outside luminance cycle */ -#define FONT_NAME "-misc-fixed-medium-*-normal-*-15-0-*-*-*-*-iso8859-1" +#define FONT_NAME "-misc-fixed-medium-*-normal-*-*-*-*-*-*-*-iso8859-1" #define V_CELL_YSIZE 40 /* revive cell height */ --- xarchon-0.50/src/field.c.orig 2002-09-26 08:22:45.000000000 -0400 +++ xarchon-0.50/src/field.c 2002-09-26 08:23:11.000000000 -0400 @@ -20,7 +20,7 @@ /* defines */ /*--------------------------------------------------------------------------*/ -#define FONT_NAME "-misc-fixed-medium-*-normal-*-40-0-*-*-*-*-iso8859-1" +#define FONT_NAME "-misc-fixed-medium-*-normal-*-*-*-*-*-*-*-iso8859-1" #define NUM_ROCKS 12 #define ROCK_DELAY 2 /* rocks delay time in frames */ --- NEW FILE xarchon.desktop --- [Desktop Entry] Name=XArchon Comment=Arcade board game Exec=xarchon Icon=xarchon Terminal=false Type=Application Encoding=UTF-8 Categories=Application;Game;ArcadeGame;BoardGame; --- NEW FILE xarchon.spec --- Name: xarchon Version: 0.50 Release: 2%{?dist} Summary: Arcade board game Group: Amusements/Games License: GPL URL: http://xarchon.seul.org/ Source0: http://xarchon.seul.org/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: %{name}-fonts.patch Patch1: %{name}-destdir.patch Patch2: http://ftp.debian.org/debian/pool/main/x/%{name}/%{name}_0.50-9.diff.gz Patch3: %{name}-0.50-extraqual.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel esound-devel libXpm-devel BuildRequires: desktop-file-utils ImageMagick %description XArchon is a chess with a twist board game. It is modelled after the golden oldie Archon game created by Freefall Associates. %prep %setup -q %patch0 -p1 %patch1 -p0 %patch2 -p1 %patch3 -p0 %build %configure make %{?_smp_mflags} convert data/icon.xpm %{name}.png %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_mandir}/man6/%{name}.6.gz %changelog * Sat May 13 2006 Hans de Goede 0.50-2 - consistent use of %%{name} (everywhere). - Add BR: libXPM-devel - Drop NEWS from %%doc as it contains no relevant information. * Thu May 11 2006 Hans de Goede 0.50-1 - Pick xarchon up from Ville and submit it for Review as Ville doens't have the time for this. * Tue Mar 14 2006 Ville Skytt?? - 0.50-0.2 - Fix build with gcc >= 3.4 (partially from Debian). - Install icon to %%{_datadir}/icons/hicolor. * Sat May 28 2005 Ville Skytt?? - 0.50-0.1 - Rebuild for FC4. * Sun Sep 14 2003 Ville Skytt?? - 0:0.50-0.fdr.3 - Install data into %%{_datadir}/games/xarchon. - Remove #---- section markers. * Sun Jun 1 2003 Ville Skytt?? - 0:0.50-0.fdr.2 - Spec cleanups. * Sat Mar 22 2003 Ville Skytt?? - 0:0.50-0.fdr.1 - Update to current Fedora guidelines. * Fri Feb 7 2003 Ville Skytt?? - 0.50-1.fedora.1 - First Fedora release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xarchon/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 18:48:58 -0000 1.1 +++ .cvsignore 15 May 2006 18:49:42 -0000 1.2 @@ -0,0 +1,2 @@ +xarchon-0.50.tar.gz +xarchon_0.50-9.diff.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xarchon/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 18:48:58 -0000 1.1 +++ sources 15 May 2006 18:49:42 -0000 1.2 @@ -0,0 +1,2 @@ +491dea5b4e61ed13cd988d1c184a8ef0 xarchon-0.50.tar.gz +903d8e4a90d24ac006d654e5a224076a xarchon_0.50-9.diff.gz From fedora-extras-commits at redhat.com Mon May 15 19:00:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 12:00:19 -0700 Subject: owners owners.list,1.997,1.998 Message-ID: <200605151900.k4FJ0LAK011925@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908/owners Modified Files: owners.list Log Message: add xarchon Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.997 retrieving revision 1.998 diff -u -r1.997 -r1.998 --- owners.list 15 May 2006 16:58:03 -0000 1.997 +++ owners.list 15 May 2006 19:00:18 -0000 1.998 @@ -1662,6 +1662,7 @@ Fedora Extras|wxPython|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org| Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org| Fedora Extras|x3270|An X Window System based IBM 3278/3279 terminal emulator|karsten at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|xarchon|Arcade board game|j.w.r.degoede at hhs.nl|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|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 19:03:05 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 May 2006 12:03:05 -0700 Subject: comps comps-fe6.xml.in,1.14,1.15 Message-ID: <200605151903.k4FJ37vh014175@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14154/comps Modified Files: comps-fe6.xml.in Log Message: add xarchon Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- comps-fe6.xml.in 15 May 2006 16:00:49 -0000 1.14 +++ comps-fe6.xml.in 15 May 2006 19:03:04 -0000 1.15 @@ -257,6 +257,7 @@ viruskiller wesnoth worminator + xarchon xboard xpilot-ng xplanet From fedora-extras-commits at redhat.com Mon May 15 19:22:06 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:22:06 -0700 Subject: rpms/gauche-gtk - New directory Message-ID: <200605151922.k4FJM8bv014376@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14350/gauche-gtk Log Message: Directory /cvs/extras/rpms/gauche-gtk added to the repository From fedora-extras-commits at redhat.com Mon May 15 19:22:06 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:22:06 -0700 Subject: rpms/gauche-gtk/devel - New directory Message-ID: <200605151922.k4FJM800014379@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14350/gauche-gtk/devel Log Message: Directory /cvs/extras/rpms/gauche-gtk/devel added to the repository From fedora-extras-commits at redhat.com Mon May 15 19:22:34 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:22:34 -0700 Subject: rpms/gauche-gtk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605151922.k4FJMaeW014428@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14395 Added Files: Makefile import.log Log Message: Setup of module gauche-gtk --- NEW FILE Makefile --- # Top level Makefile for module gauche-gtk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 15 19:22:34 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:22:34 -0700 Subject: rpms/gauche-gtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605151922.k4FJMaKx014431@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14395/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gauche-gtk --- NEW 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 May 15 19:23:41 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:23:41 -0700 Subject: rpms/gauche-gtk import.log,1.1,1.2 Message-ID: <200605151924.k4FJODdc014515@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14473 Modified Files: import.log Log Message: auto-import gauche-gtk-0.4.1-7 on branch devel from gauche-gtk-0.4.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gauche-gtk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 May 2006 19:22:34 -0000 1.1 +++ import.log 15 May 2006 19:23:40 -0000 1.2 @@ -0,0 +1 @@ +gauche-gtk-0_4_1-7:HEAD:gauche-gtk-0.4.1-7.src.rpm:1147721011 From fedora-extras-commits at redhat.com Mon May 15 19:23:41 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:23:41 -0700 Subject: rpms/gauche-gtk/devel Gauche-gtk-gtk28.patch, NONE, 1.1 gauche-gtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605151924.k4FJODT0014519@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14473/devel Modified Files: .cvsignore sources Added Files: Gauche-gtk-gtk28.patch gauche-gtk.spec Log Message: auto-import gauche-gtk-0.4.1-7 on branch devel from gauche-gtk-0.4.1-7.src.rpm Gauche-gtk-gtk28.patch: --- NEW FILE Gauche-gtk-gtk28.patch --- --- Gauche-gtk-0.4.1/src/gtktexttag.stub.gtk28 2006-03-24 19:57:53.000000000 +0100 +++ Gauche-gtk-0.4.1/src/gtktexttag.stub 2006-03-24 19:58:05.000000000 +0100 @@ -36,7 +36,6 @@ (language-set :type ) (pad1 :type ) (pad2 :type ) - (pad3 :type ) ) (allocator (c "Scm_GtkObjectAllocate")) ) --- Gauche-gtk-0.4.1/src/gtktoolbar.stub.gtk28 2006-03-24 19:58:22.000000000 +0100 +++ Gauche-gtk-0.4.1/src/gtktoolbar.stub 2006-03-24 19:59:09.000000000 +0100 @@ -51,8 +51,6 @@ (tooltips :type ) (button-maxw :type ) (button-maxh :type ) - (style-set-connection :type ) - (icon-size-connection :type ) (style-set :type ) (icon-size-set :type ) ) --- NEW FILE gauche-gtk.spec --- %define gauche_version 0.8.7 Name: gauche-gtk Version: 0.4.1 Release: 7%{?dist} Summary: Gauche extension module to use GTK Group: Development/Languages License: BSD URL: http://www.shiro.dreamhost.com/scheme/gauche Source: http://download.sourceforge.net/gauche/Gauche-gtk-0.4.1.tgz Patch0: Gauche-gtk-gtk28.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gauche-devel = %{gauche_version} BuildRequires: gtk2-devel BuildRequires: gtkglext-devel BuildRequires: libX11-devel BuildRequires: libXt-devel BuildRequires: libICE-devel Requires: gauche = %{gauche_version} Requires: gauche-gl %description Gauche extension module to use GTK. %prep %setup -q -n Gauche-gtk-%{version} %patch0 -p1 %build CFLAGS="`pkg-config --cflags freetype2` -fPIC" %configure --enable-gtkgl --enable-glgd --enable-glgd-pango make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT`gauche-config --syslibdir` mkdir -p $RPM_BUILD_ROOT`gauche-config --sysarchdir` make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.so' -exec chmod 0755 '{}' ';' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_libdir}/gauche %{_datadir}/gauche %doc COPYING README VERSION examples %changelog * Fri May 5 2006 Gerard Milmeister - 0.4.1-7 - Added include flags for freetype - Added -fPIC flag * Wed Feb 23 2005 Gerard Milmeister - 0:0.4.1-1 - New Version 0.4.1 * Fri Mar 19 2004 Gerard Milmeister - 0:0.4-0.fdr.1 - New Version 0.4 * Fri Mar 19 2004 Gerard Milmeister - 0:0.3.2-0.fdr.1 - New Version 0.3.2 * Mon Nov 10 2003 Gerard Milmeister - 0:0.3.1-0.fdr.1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gauche-gtk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 May 2006 19:22:34 -0000 1.1 +++ .cvsignore 15 May 2006 19:23:41 -0000 1.2 @@ -0,0 +1 @@ +Gauche-gtk-0.4.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gauche-gtk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 May 2006 19:22:34 -0000 1.1 +++ sources 15 May 2006 19:23:41 -0000 1.2 @@ -0,0 +1 @@ +18356efab446b9524be8371a3b852a6a Gauche-gtk-0.4.1.tgz From fedora-extras-commits at redhat.com Mon May 15 19:28:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 12:28:14 -0700 Subject: owners owners.list,1.998,1.999 Message-ID: <200605151928.k4FJSGYk014653@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14636 Modified Files: owners.list Log Message: added gauche-gtk Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.998 retrieving revision 1.999 diff -u -r1.998 -r1.999 --- owners.list 15 May 2006 19:00:18 -0000 1.998 +++ owners.list 15 May 2006 19:28:14 -0000 1.999 @@ -324,6 +324,7 @@ Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|gauche|Scheme script interpreter with multibyte character handling|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gauche-gl|OpenGL binding for Gauche|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|gauche-gtk|Gauche extension module to use GTK|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 19:31:03 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 15 May 2006 12:31:03 -0700 Subject: fedora-security/audit fc4,1.246,1.247 fc5,1.160,1.161 Message-ID: <200605151931.k4FJV4GY014702@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14682 Modified Files: fc4 fc5 Log Message: Note a new CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- fc4 15 May 2006 18:14:23 -0000 1.246 +++ fc4 15 May 2006 19:31:01 -0000 1.247 @@ -4,6 +4,7 @@ ** are items that need attention CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 +CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- fc5 15 May 2006 18:14:23 -0000 1.160 +++ fc5 15 May 2006 19:31:01 -0000 1.161 @@ -4,6 +4,7 @@ ** are items that need attention CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 +CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 VULNERABLE (kernel, fixed 2.6.16.15) From fedora-extras-commits at redhat.com Mon May 15 19:48:29 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:29 -0700 Subject: rpms/lirc-kmod-common/FC-5 lirc-kmod-common.spec,1.1,1.2 Message-ID: <200605151948.k4FJmVtL016892@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod-common/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/lirc-kmod-common/FC-5 Modified Files: lirc-kmod-common.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: lirc-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod-common/FC-5/lirc-kmod-common.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lirc-kmod-common.spec 26 Jan 2006 22:29:32 -0000 1.1 +++ lirc-kmod-common.spec 15 May 2006 19:48:28 -0000 1.2 @@ -4,7 +4,7 @@ Name: %{kmod_name}-kmod-common Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Common files for LIRC kernel modules Group: System Environment/Kernel @@ -14,7 +14,7 @@ BuildArch: noarch Requires: lirc = %{version} -Requires: kmod-%{kmod_name} = %{version} +Requires: %{kmod_name}-kmod >= %{version} Requires: udev %description @@ -39,6 +39,9 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 0.8.0-3 +- Require *-kmod >= instead of kmod-* = to fix upgrade problems. + * Wed Dec 28 2005 Ville Skytt?? - 0.8.0-2 - Remove kmod-config(lirc) provision. From fedora-extras-commits at redhat.com Mon May 15 19:48:28 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:28 -0700 Subject: rpms/lirc-kmod/devel kmodtool,1.5,1.6 lirc-kmod.spec,1.7,1.8 Message-ID: <200605151948.k4FJmUu4016888@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/lirc-kmod/devel Modified Files: kmodtool lirc-kmod.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kmodtool 27 Apr 2006 16:47:45 -0000 1.5 +++ kmodtool 15 May 2006 19:48:28 -0000 1.6 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.7" +myver="0.10.9" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-modules = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lirc-kmod.spec 27 Apr 2006 16:47:45 -0000 1.7 +++ lirc-kmod.spec 15 May 2006 19:48:28 -0000 1.8 @@ -5,7 +5,7 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2096_FC5} +%{?kversion: %define kversion 2.6.16-1.2111_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 6.%(echo %{kverrel} | tr - _) +Release: 7.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,10 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 0.8.0-7 +- Require version >= of lirc-kmod-common. +- Provide lirc-kmod instead of kmod-lirc to fix upgrade problems. + * Thu Apr 27 2006 Ville Skytt?? - 0.8.0-6 - Provide "kernel-modules" instead of "kernel-module" to match yum's config. - s/%%{kver}/%%{kversion}/ for consistency with other vars. From fedora-extras-commits at redhat.com Mon May 15 19:48:29 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:29 -0700 Subject: rpms/lirc-kmod-common/devel lirc-kmod-common.spec,1.1,1.2 Message-ID: <200605151948.k4FJmVJj016896@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/lirc-kmod-common/devel Modified Files: lirc-kmod-common.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: lirc-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod-common/devel/lirc-kmod-common.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lirc-kmod-common.spec 26 Jan 2006 22:29:32 -0000 1.1 +++ lirc-kmod-common.spec 15 May 2006 19:48:29 -0000 1.2 @@ -4,7 +4,7 @@ Name: %{kmod_name}-kmod-common Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Common files for LIRC kernel modules Group: System Environment/Kernel @@ -14,7 +14,7 @@ BuildArch: noarch Requires: lirc = %{version} -Requires: kmod-%{kmod_name} = %{version} +Requires: %{kmod_name}-kmod >= %{version} Requires: udev %description @@ -39,6 +39,9 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 0.8.0-3 +- Require *-kmod >= instead of kmod-* = to fix upgrade problems. + * Wed Dec 28 2005 Ville Skytt?? - 0.8.0-2 - Remove kmod-config(lirc) provision. From fedora-extras-commits at redhat.com Mon May 15 19:48:21 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:21 -0700 Subject: rpms/thinkpad-kmod/FC-5 kmodtool, 1.4, 1.5 thinkpad-kmod.spec, 1.8, 1.9 Message-ID: <200605151948.k4FJmrkm016907@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/thinkpad-kmod/FC-5 Modified Files: kmodtool thinkpad-kmod.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/kmodtool,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kmodtool 27 Apr 2006 16:45:40 -0000 1.4 +++ kmodtool 15 May 2006 19:48:21 -0000 1.5 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.7" +myver="0.10.9" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-modules = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- thinkpad-kmod.spec 27 Apr 2006 16:45:40 -0000 1.8 +++ thinkpad-kmod.spec 15 May 2006 19:48:21 -0000 1.9 @@ -3,7 +3,7 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2096_FC5} +%{?kversion: %define kversion 2.6.16-1.2111_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -19,7 +19,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 5.%(echo %{kverrel} | tr - _) +Release: 6.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -65,6 +65,10 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 5.9-6 +- Require version >= of thinkpad-kmod-common. +- Provide thinkpad-kmod instead of kmod-thinkpad to fix upgrade problems. + * Thu Apr 27 2006 Ville Skytt?? - 5.9-5 - Provide "kernel-modules" instead of "kernel-module" to match yum's config. - s/%%{kver}/%%{kversion}/ for consistency with other vars. From fedora-extras-commits at redhat.com Mon May 15 19:48:22 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:22 -0700 Subject: rpms/thinkpad-kmod-common/FC-5 thinkpad-kmod-common.spec,1.3,1.4 Message-ID: <200605151948.k4FJmsEI016910@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod-common/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/thinkpad-kmod-common/FC-5 Modified Files: thinkpad-kmod-common.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: thinkpad-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/FC-5/thinkpad-kmod-common.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thinkpad-kmod-common.spec 13 Mar 2006 21:20:41 -0000 1.3 +++ thinkpad-kmod-common.spec 15 May 2006 19:48:21 -0000 1.4 @@ -3,7 +3,7 @@ Name: %{kmod_name}-kmod-common Version: 5.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common files for supplemental ThinkPad?? kernel modules License: GPL @@ -13,7 +13,7 @@ Source1: %{name}-console.perms Source2: %{name}.modules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: kmod-%{kmod_name} = %{version} +Requires: %{kmod_name}-kmod >= %{version} Requires: pam >= 0.79-8 Requires: initscripts >= 8.08-1 @@ -56,6 +56,9 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 5.9-2 +- Require *-kmod >= instead of kmod-* = to fix upgrade problems. + * Sat Feb 25 2006 Ville Skytt?? - 5.9-1 - 5.9. From fedora-extras-commits at redhat.com Mon May 15 19:48:22 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 12:48:22 -0700 Subject: rpms/lirc-kmod/FC-5 kmodtool,1.4,1.5 lirc-kmod.spec,1.7,1.8 Message-ID: <200605151948.k4FJmsJA016914@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16794/lirc-kmod/FC-5 Modified Files: kmodtool lirc-kmod.spec Log Message: Sync with latest kmod doc, fixes some upgrade issues. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/kmodtool,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kmodtool 27 Apr 2006 16:47:45 -0000 1.4 +++ kmodtool 15 May 2006 19:48:22 -0000 1.5 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.7" +myver="0.10.9" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-modules = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lirc-kmod.spec 27 Apr 2006 16:47:45 -0000 1.7 +++ lirc-kmod.spec 15 May 2006 19:48:22 -0000 1.8 @@ -5,7 +5,7 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2096_FC5} +%{?kversion: %define kversion 2.6.16-1.2111_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 6.%(echo %{kverrel} | tr - _) +Release: 7.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,10 @@ %changelog +* Mon May 15 2006 Ville Skytt?? - 0.8.0-7 +- Require version >= of lirc-kmod-common. +- Provide lirc-kmod instead of kmod-lirc to fix upgrade problems. + * Thu Apr 27 2006 Ville Skytt?? - 0.8.0-6 - Provide "kernel-modules" instead of "kernel-module" to match yum's config. - s/%%{kver}/%%{kversion}/ for consistency with other vars. From fedora-extras-commits at redhat.com Mon May 15 20:26:36 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 15 May 2006 13:26:36 -0700 Subject: owners owners.list,1.999,1.1000 Message-ID: <200605152026.k4FKQcdZ019584@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19567 Modified Files: owners.list Log Message: new owner of pork: Ryan McCabe Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.999 retrieving revision 1.1000 diff -u -r1.999 -r1.1000 --- owners.list 15 May 2006 19:28:14 -0000 1.999 +++ owners.list 15 May 2006 20:26:36 -0000 1.1000 @@ -1287,7 +1287,7 @@ Fedora Extras|polyxmass-data|Contains configuration files describing polymer chemistry|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|polyxmass-doc|Documentation for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|pop-before-smtp|Watch log for POP/IMAP auth, notify MTA to allow relay|wtogami at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|pork|Console based AIM client that looks like ircII|lmacken at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|pork|Console based AIM client that looks like ircII|rmccabe at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|portaudio|Free, cross platform, open-source, audio I/O library|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|powermanga|Arcade 2D shoot-them-up game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ppracer|3D racing game featuring Tux|nphilipp at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 20:36:49 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 13:36:49 -0700 Subject: extras-buildsys/utils extras-repobuild.py,1.17,1.18 Message-ID: <200605152036.k4FKandI019744@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19726 Modified Files: extras-repobuild.py Log Message: "grep -v" stuff we don't want to repomanage (kmods for now) while waiting for https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=604 Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- extras-repobuild.py 11 May 2006 16:07:40 -0000 1.17 +++ extras-repobuild.py 15 May 2006 20:36:46 -0000 1.18 @@ -35,6 +35,12 @@ '5':['ppc','x86_64', 'i386'], 'development':['ppc','x86_64','i386'], } +# packages to exclude from being repomanaged: dist => shell quoted path regexp +keepdict = {'3': "'/\([^/]\+-\)\?kmod-'", + '4': "'/\([^/]\+-\)\?kmod-'", + '5': "'/\([^/]\+-\)\?kmod-'", + 'development': "'/\([^/]\+-\)\?kmod-'", + } ts = rpmUtils.transaction.initReadOnlyTransaction() @@ -56,7 +62,7 @@ sys.exit(result) -def do_repo_stuff(repodir, keep=2): +def do_repo_stuff(repodir, keep=2, nomanage=None): compspath = os.path.join(repodir, compsname) rpdata = os.path.join(repodir, 'repodata') debugprint('removing tree %s' % rpdata) @@ -66,7 +72,11 @@ print 'processing: %s' % repodir print 'Cleaning up older packages (keeping %d latest)' % (keep) - cmd = '/usr/bin/repomanage -c -k%d -o %s | xargs rm -f' % (keep, repodir) + repomanage = '/usr/bin/repomanage -c -k%d -o %s' % (keep, repodir) + if nomanage: + cmd = '%s | grep -v %s | xargs rm -f' % (repomanage, nomanage) + else: + cmd = '%s | xargs rm -f' % repomanage run_and_check(cmd) print 'Creating repository metadata' @@ -102,12 +112,12 @@ print "Making Repository Metadata" - do_repo_stuff(os.path.join(destdir, 'SRPMS'), keep) + do_repo_stuff(os.path.join(destdir, 'SRPMS'), keep, keepdict.get(dist)) # arch repo creation for arch in archdict[dist]: repodir = os.path.join(destdir, arch) - do_repo_stuff(repodir, keep) + do_repo_stuff(repodir, keep, keepdict.get(dist)) if __name__ == '__main__': me = os.getcwd() From fedora-extras-commits at redhat.com Mon May 15 20:40:39 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Mon, 15 May 2006 13:40:39 -0700 Subject: owners owners.list,1.1000,1.1001 Message-ID: <200605152040.k4FKefu5019783@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19766 Modified Files: owners.list Log Message: Take over orphan tpb, xosd, and lrmi Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1000 retrieving revision 1.1001 diff -u -r1.1000 -r1.1001 --- owners.list 15 May 2006 20:26:36 -0000 1.1000 +++ owners.list 15 May 2006 20:40:39 -0000 1.1001 @@ -729,7 +729,7 @@ Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|lrmi|Library for calling real mode BIOS routines|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|lrmi|Library for calling real mode BIOS routines|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|fedora at soeterbroek.com|extras-qa at fedoraproject.org| Fedora Extras|lua|A powerful light-weight programming language|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org| @@ -1593,7 +1593,7 @@ Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|torque|Tera-scale Open-source Resource and QUEue manager|garrick at usc.edu|extras-qa at fedoraproject.org| Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|tpb|IBM ThinkPad button support utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|tpb|IBM ThinkPad button support utility|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|tpctl|IBM ThinkPad configuration tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org| Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| @@ -1740,7 +1740,7 @@ Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|xosd|On-screen display library for X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|xosd|On-screen display library for X|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|xpilot-ng|Space arcade game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 15 21:22:07 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 14:22:07 -0700 Subject: fedora-rpmdevtools fedora-rpmdevtools.spec,1.93,1.94 Message-ID: <200605152122.k4FLM720022450@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22432 Modified Files: fedora-rpmdevtools.spec Log Message: 1.6. Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- fedora-rpmdevtools.spec 2 Apr 2006 22:08:11 -0000 1.93 +++ fedora-rpmdevtools.spec 15 May 2006 21:22:05 -0000 1.94 @@ -3,7 +3,7 @@ %define spectool_version 1.0.7 Name: fedora-rpmdevtools -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Fedora RPM Development Tools @@ -127,7 +127,7 @@ %changelog -* Mon Apr 3 2006 Ville Skytt?? +* Tue May 16 2006 Ville Skytt?? - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). * Sun Feb 26 2006 Ville Skytt?? - 1.5-1 From fedora-extras-commits at redhat.com Mon May 15 21:28:34 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 14:28:34 -0700 Subject: rpms/fedora-rpmdevtools/FC-4 .cvsignore, 1.12, 1.13 fedora-rpmdevtools.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <200605152128.k4FLSa5g022549@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-serv22496/FC-4 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: * Tue May 16 2006 Ville Skytt?? - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Feb 2006 16:09:18 -0000 1.12 +++ .cvsignore 15 May 2006 21:28:34 -0000 1.13 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.5.tar.bz2 spectool-1.0.7.tar.bz2 +fedora-rpmdevtools-1.6.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/fedora-rpmdevtools.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fedora-rpmdevtools.spec 26 Feb 2006 16:09:18 -0000 1.15 +++ fedora-rpmdevtools.spec 15 May 2006 21:28:34 -0000 1.16 @@ -3,7 +3,7 @@ %define spectool_version 1.0.7 Name: fedora-rpmdevtools -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Fedora RPM Development Tools @@ -127,6 +127,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 1.6-1 +- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). + * Sun Feb 26 2006 Ville Skytt?? - 1.5-1 - Improve diffarchive and extract error messages. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Feb 2006 16:09:18 -0000 1.12 +++ sources 15 May 2006 21:28:34 -0000 1.13 @@ -1,2 +1,2 @@ -8b9e391f9da90a78ccb62db05e961bc3 fedora-rpmdevtools-1.5.tar.bz2 e2b1668f39c085807cae5a770c252dd5 spectool-1.0.7.tar.bz2 +519d4a9be78b7bcccbfa7a4390c735ed fedora-rpmdevtools-1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 21:28:35 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 14:28:35 -0700 Subject: rpms/fedora-rpmdevtools/FC-5 .cvsignore, 1.12, 1.13 fedora-rpmdevtools.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <200605152128.k4FLSbEa022555@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22496/FC-5 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: * Tue May 16 2006 Ville Skytt?? - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Feb 2006 16:09:25 -0000 1.12 +++ .cvsignore 15 May 2006 21:28:35 -0000 1.13 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.5.tar.bz2 spectool-1.0.7.tar.bz2 +fedora-rpmdevtools-1.6.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-5/fedora-rpmdevtools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fedora-rpmdevtools.spec 26 Feb 2006 16:09:25 -0000 1.16 +++ fedora-rpmdevtools.spec 15 May 2006 21:28:35 -0000 1.17 @@ -3,7 +3,7 @@ %define spectool_version 1.0.7 Name: fedora-rpmdevtools -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Fedora RPM Development Tools @@ -127,6 +127,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 1.6-1 +- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). + * Sun Feb 26 2006 Ville Skytt?? - 1.5-1 - Improve diffarchive and extract error messages. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Feb 2006 16:09:25 -0000 1.12 +++ sources 15 May 2006 21:28:35 -0000 1.13 @@ -1,2 +1,2 @@ -8b9e391f9da90a78ccb62db05e961bc3 fedora-rpmdevtools-1.5.tar.bz2 e2b1668f39c085807cae5a770c252dd5 spectool-1.0.7.tar.bz2 +519d4a9be78b7bcccbfa7a4390c735ed fedora-rpmdevtools-1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 21:28:36 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 May 2006 14:28:36 -0700 Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.12, 1.13 fedora-rpmdevtools.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <200605152128.k4FLScwZ022561@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22496/devel Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: * Tue May 16 2006 Ville Skytt?? - 1.6-1 - Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Feb 2006 16:09:25 -0000 1.12 +++ .cvsignore 15 May 2006 21:28:36 -0000 1.13 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.5.tar.bz2 spectool-1.0.7.tar.bz2 +fedora-rpmdevtools-1.6.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fedora-rpmdevtools.spec 26 Feb 2006 16:09:25 -0000 1.16 +++ fedora-rpmdevtools.spec 15 May 2006 21:28:36 -0000 1.17 @@ -3,7 +3,7 @@ %define spectool_version 1.0.7 Name: fedora-rpmdevtools -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Fedora RPM Development Tools @@ -127,6 +127,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 1.6-1 +- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams). + * Sun Feb 26 2006 Ville Skytt?? - 1.5-1 - Improve diffarchive and extract error messages. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 26 Feb 2006 16:09:25 -0000 1.12 +++ sources 15 May 2006 21:28:36 -0000 1.13 @@ -1,2 +1,2 @@ -8b9e391f9da90a78ccb62db05e961bc3 fedora-rpmdevtools-1.5.tar.bz2 e2b1668f39c085807cae5a770c252dd5 spectool-1.0.7.tar.bz2 +519d4a9be78b7bcccbfa7a4390c735ed fedora-rpmdevtools-1.6.tar.bz2 From fedora-extras-commits at redhat.com Mon May 15 21:33:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 May 2006 14:33:07 -0700 Subject: rpms/gauche-gtk/FC-4 gauche-gtk.spec,1.1,1.2 Message-ID: <200605152133.k4FLX93b022742@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gauche-gtk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22720 Modified Files: gauche-gtk.spec Log Message: Index: gauche-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/gauche-gtk/FC-4/gauche-gtk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gauche-gtk.spec 15 May 2006 19:23:41 -0000 1.1 +++ gauche-gtk.spec 15 May 2006 21:33:07 -0000 1.2 @@ -2,7 +2,7 @@ Name: gauche-gtk Version: 0.4.1 -Release: 7%{?dist} +Release: 7%{?dist}.1 Summary: Gauche extension module to use GTK Group: Development/Languages @@ -14,9 +14,7 @@ BuildRequires: gauche-devel = %{gauche_version} BuildRequires: gtk2-devel BuildRequires: gtkglext-devel -BuildRequires: libX11-devel -BuildRequires: libXt-devel -BuildRequires: libICE-devel +BuildRequires: xorg-x11-devel Requires: gauche = %{gauche_version} Requires: gauche-gl From fedora-extras-commits at redhat.com Mon May 15 21:33:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 14:33:22 -0700 Subject: rpms/perl-Test-Portability-Files/FC-5 perl-Test-Portability-Files.spec, 1.2, 1.3 Message-ID: <200605152133.k4FLXOP8022833@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22813 Modified Files: perl-Test-Portability-Files.spec Log Message: Roll back to 0.05-1. Index: perl-Test-Portability-Files.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/FC-5/perl-Test-Portability-Files.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-Portability-Files.spec 12 May 2006 22:56:04 -0000 1.2 +++ perl-Test-Portability-Files.spec 15 May 2006 21:33:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-Portability-Files Version: 0.05 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Check file names portability License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/S/SA/SAPER/Test-Portability-Files-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,24 +21,19 @@ %setup -q -n Test-Portability-Files-%{version} %build -#%{__perl} Build.PL installdirs=vendor -%{__perl} Makefile.PL INSTALLDIRS=vendor -#./Build -make +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -#./Build test -make test +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -50,8 +45,5 @@ %{_mandir}/man3/* %changelog -* Fri May 12 2006 Steven Pritchard 0.05-2 -- Use Makefile.PL temporarily to work around Module::Build breakage. - * Fri May 12 2006 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.66. From fedora-extras-commits at redhat.com Mon May 15 21:34:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 14:34:22 -0700 Subject: rpms/perl-Test-Portability-Files/FC-4 perl-Test-Portability-Files.spec, 1.2, 1.3 Message-ID: <200605152134.k4FLYO67023044@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Portability-Files/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23019 Modified Files: perl-Test-Portability-Files.spec Log Message: Roll back to 0.05-1. Index: perl-Test-Portability-Files.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Portability-Files/FC-4/perl-Test-Portability-Files.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-Portability-Files.spec 12 May 2006 22:56:04 -0000 1.2 +++ perl-Test-Portability-Files.spec 15 May 2006 21:34:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-Portability-Files Version: 0.05 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Check file names portability License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/S/SA/SAPER/Test-Portability-Files-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,24 +21,19 @@ %setup -q -n Test-Portability-Files-%{version} %build -#%{__perl} Build.PL installdirs=vendor -%{__perl} Makefile.PL INSTALLDIRS=vendor -#./Build -make +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -#./Build test -make test +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -50,8 +45,5 @@ %{_mandir}/man3/* %changelog -* Fri May 12 2006 Steven Pritchard 0.05-2 -- Use Makefile.PL temporarily to work around Module::Build breakage. - * Fri May 12 2006 Steven Pritchard 0.05-1 - Specfile autogenerated by cpanspec 1.66. From fedora-extras-commits at redhat.com Mon May 15 21:51:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 14:51:39 -0700 Subject: rpms/perl-Pod-Readme/FC-5 perl-Pod-Readme.spec,1.2,1.3 Message-ID: <200605152151.k4FLpfZk023565@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23548 Modified Files: perl-Pod-Readme.spec Log Message: Roll back to 0.081-1. Index: perl-Pod-Readme.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/FC-5/perl-Pod-Readme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Pod-Readme.spec 12 May 2006 23:16:27 -0000 1.2 +++ perl-Pod-Readme.spec 15 May 2006 21:51:39 -0000 1.3 @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Pod-Readme-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) @@ -29,24 +29,19 @@ %setup -q -n Pod-Readme-%{version} %build -#%{__perl} Build.PL installdirs=vendor -%{__perl} Makefile.PL INSTALLDIRS=vendor -#./Build -make +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -#DEVEL_TESTS=1 ./Build test -DEVEL_TESTS=1 make test +DEVEL_TESTS=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -60,9 +55,6 @@ %{_mandir}/man3/* %changelog -* Fri May 12 2006 Steven Pritchard 0.081-2 -- Use Makefile.PL temporarily to work around Module::Build breakage. - * Fri May 12 2006 Steven Pritchard 0.081-1 - Specfile autogenerated by cpanspec 1.66. - Remove explicit perl dep. From fedora-extras-commits at redhat.com Mon May 15 21:52:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 14:52:24 -0700 Subject: rpms/perl-Pod-Readme/FC-4 perl-Pod-Readme.spec,1.2,1.3 Message-ID: <200605152152.k4FLqQJB023631@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pod-Readme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23614 Modified Files: perl-Pod-Readme.spec Log Message: Roll back to 0.081-1. Index: perl-Pod-Readme.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Pod-Readme/FC-4/perl-Pod-Readme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Pod-Readme.spec 12 May 2006 23:16:27 -0000 1.2 +++ perl-Pod-Readme.spec 15 May 2006 21:52:24 -0000 1.3 @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/R/RR/RRWO/Pod-Readme-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Portability::Files) @@ -29,24 +29,19 @@ %setup -q -n Pod-Readme-%{version} %build -#%{__perl} Build.PL installdirs=vendor -%{__perl} Makefile.PL INSTALLDIRS=vendor -#./Build -make +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -#./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -#DEVEL_TESTS=1 ./Build test -DEVEL_TESTS=1 make test +DEVEL_TESTS=1 ./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -60,9 +55,6 @@ %{_mandir}/man3/* %changelog -* Fri May 12 2006 Steven Pritchard 0.081-2 -- Use Makefile.PL temporarily to work around Module::Build breakage. - * Fri May 12 2006 Steven Pritchard 0.081-1 - Specfile autogenerated by cpanspec 1.66. - Remove explicit perl dep. From fedora-extras-commits at redhat.com Mon May 15 22:31:10 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 15 May 2006 15:31:10 -0700 Subject: rpms/rogue/devel rogue-5.4-setgid.patch,1.1,1.2 rogue.spec,1.4,1.5 Message-ID: <200605152231.k4FMVCNZ026311@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26285 Modified Files: rogue-5.4-setgid.patch rogue.spec Log Message: More improved setgid handling. rogue-5.4-setgid.patch: Index: rogue-5.4-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue-5.4-setgid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue-5.4-setgid.patch 11 Apr 2006 01:50:23 -0000 1.1 +++ rogue-5.4-setgid.patch 15 May 2006 22:31:10 -0000 1.2 @@ -1,4 +1,4 @@ -diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c +diff -Naur rogue/extern.c rogue.new/extern.c --- rogue/extern.c 2006-01-03 16:17:29.000000000 -0800 +++ rogue.new/extern.c 2006-03-30 13:24:12.000000000 -0800 @@ -111,7 +111,7 @@ @@ -10,7 +10,7 @@ int food_left; /* Amount of food in hero's stomach */ int lastscore = -1; /* Score before this turn */ int no_command = 0; /* Number of turns asleep */ -diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h +diff -Naur rogue/extern.h rogue.new/extern.h --- rogue/extern.h 2006-03-19 11:22:14.000000000 -0800 +++ rogue.new/extern.h 2006-03-30 13:24:22.000000000 -0800 @@ -50,7 +50,7 @@ @@ -22,7 +22,7 @@ #ifdef TIOCGLTC extern struct ltchars ltc; -diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c +diff -Naur rogue/mach_dep.c rogue.new/mach_dep.c --- rogue/mach_dep.c 2006-01-30 08:36:21.000000000 -0800 +++ rogue.new/mach_dep.c 2006-04-01 19:26:15.000000000 -0800 @@ -45,7 +45,9 @@ @@ -87,7 +87,7 @@ md_normaluser(); } -diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c +diff -Naur rogue/main.c rogue.new/main.c --- rogue/main.c 2006-01-29 16:11:32.000000000 -0800 +++ rogue.new/main.c 2006-03-30 13:40:16.000000000 -0800 @@ -24,6 +24,13 @@ @@ -112,9 +112,9 @@ if (argc == 2) if (strcmp(argv[1], "-s") == 0) { -diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c +diff -Naur rogue/mdport.c rogue.new/mdport.c --- rogue/mdport.c 2006-01-29 18:24:39.000000000 -0800 -+++ rogue.new/mdport.c 2006-04-01 19:26:16.000000000 -0800 ++++ rogue.new/mdport.c 2006-04-11 19:26:43.000000000 -0700 @@ -193,8 +193,17 @@ md_normaluser() { @@ -135,49 +135,54 @@ #endif } -@@ -397,22 +406,31 @@ - char * - md_getroguedir() - { -- static char path[1024]; -+ static char path[PATH_MAX]; - char *end,*home; - - if ( (home = getenv("ROGUEHOME")) != NULL) - { - if (*home) - { -- strncpy(path, home, PATH_MAX - 20); -- -- end = &path[strlen(path)-1]; -- -- while( (end >= path) && ((*end == '/') || (*end == '\\'))) -- *end-- = '\0'; -- -- if (directory_exists(path)) -- return(path); -+ if (strlen(home) > PATH_MAX-20) { +@@ -397,22 +406,35 @@ + char * + md_getroguedir() + { +- static char path[1024]; ++ static char path[PATH_MAX]; + char *end,*home; + +- if ( (home = getenv("ROGUEHOME")) != NULL) ++ /* Disable the use of ROGUEHOME to prevent users from ++ * maliciously overwriting save files from other setgid games. ++ */ ++ if ( (home = getenv("ROGUEHOME")) != NULL && 0) + { + if (*home) + { +- strncpy(path, home, PATH_MAX - 20); +- +- end = &path[strlen(path)-1]; +- +- while( (end >= path) && ((*end == '/') || (*end == '\\'))) +- *end-- = '\0'; +- +- if (directory_exists(path)) +- return(path); ++ /* The magic number 20 is used to guarantee that the save/lock ++ * filenames (which are much shorter than 20 characters) can ++ * be appended to this buffer. ++ */ ++ if (strlen(home) >= PATH_MAX-20) { + fprintf(stderr, "ROGUEHOME path is too long. Ignoring.\n"); + } else { -+ strncpy(path, home, PATH_MAX-20); -+ /* Ensure that we have a terminating NULL character. -+ */ -+ path[PATH_MAX-1] = (char)NULL; -+ -+ end = &path[strlen(path)-1]; -+ ++ strcpy(path, home); ++ ++ end = &path[strlen(path)-1]; ++ + /* Strip off any trailing path separators from the path. + */ -+ while( (end >= path) && ((*end == '/') || (*end == '\\'))) -+ *end-- = '\0'; -+ -+ if (directory_exists(path)) -+ return(path); ++ while( (end >= path) && ((*end == '/') || (*end == '\\'))) ++ *end-- = '\0'; ++ ++ if (directory_exists(path)) ++ return(path); + } - } - } - -diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c + } + } + +diff -Naur rogue/rip.c rogue.new/rip.c --- rogue/rip.c 2006-01-03 16:17:29.000000000 -0800 +++ rogue.new/rip.c 2006-03-30 13:32:17.000000000 -0800 @@ -60,7 +60,6 @@ @@ -239,7 +244,7 @@ } /* -diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c +diff -Naur rogue/save.c rogue.new/save.c --- rogue/save.c 2006-01-30 08:05:35.000000000 -0800 +++ rogue.new/save.c 2006-03-30 13:33:45.000000000 -0800 @@ -335,7 +335,40 @@ @@ -302,7 +307,7 @@ sscanf(scoreline, " %u %hu %u %hu %hu %lx \n", &top_ten[i].sc_uid, &top_ten[i].sc_score, &top_ten[i].sc_flags, &top_ten[i].sc_monster, -diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c +diff -Naur rogue/state.c rogue.new/state.c --- rogue/state.c 2006-01-03 16:17:29.000000000 -0800 +++ rogue.new/state.c 2006-03-30 13:09:46.000000000 -0800 @@ -2138,7 +2138,8 @@ Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rogue.spec 11 Apr 2006 01:50:23 -0000 1.4 +++ rogue.spec 15 May 2006 22:31:10 -0000 1.5 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -78,6 +78,9 @@ %changelog +* Mon May 15 2006 Wart 5.4.2-5 +- Better setuid/setgid handling (again) (BZ #187392) + * Thu Mar 30 2006 Wart 5.4.2-4 - Better setuid/setgid handling (BZ #187392) - Resize desktop icon to match directory name From fedora-extras-commits at redhat.com Mon May 15 22:49:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 15 May 2006 15:49:02 -0700 Subject: rpms/rogue/devel rogue-5.4-setgid.patch,1.2,1.3 Message-ID: <200605152249.k4FMn5wV026726@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26705 Modified Files: rogue-5.4-setgid.patch Log Message: Fix patch to apply cleanly. rogue-5.4-setgid.patch: Index: rogue-5.4-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue-5.4-setgid.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rogue-5.4-setgid.patch 15 May 2006 22:31:10 -0000 1.2 +++ rogue-5.4-setgid.patch 15 May 2006 22:49:02 -0000 1.3 @@ -1,6 +1,6 @@ diff -Naur rogue/extern.c rogue.new/extern.c --- rogue/extern.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/extern.c 2006-03-30 13:24:12.000000000 -0800 ++++ rogue.new/extern.c 2006-05-15 15:43:43.000000000 -0700 @@ -111,7 +111,7 @@ }; @@ -11,8 +11,8 @@ int lastscore = -1; /* Score before this turn */ int no_command = 0; /* Number of turns asleep */ diff -Naur rogue/extern.h rogue.new/extern.h ---- rogue/extern.h 2006-03-19 11:22:14.000000000 -0800 -+++ rogue.new/extern.h 2006-03-30 13:24:22.000000000 -0800 +--- rogue/extern.h 2006-05-15 15:43:15.000000000 -0700 ++++ rogue.new/extern.h 2006-05-15 15:43:43.000000000 -0700 @@ -50,7 +50,7 @@ extern char fruit[], orig_dsusp, prbuf[], whoami[]; @@ -24,7 +24,7 @@ extern struct ltchars ltc; diff -Naur rogue/mach_dep.c rogue.new/mach_dep.c --- rogue/mach_dep.c 2006-01-30 08:36:21.000000000 -0800 -+++ rogue.new/mach_dep.c 2006-04-01 19:26:15.000000000 -0800 ++++ rogue.new/mach_dep.c 2006-05-15 15:43:43.000000000 -0700 @@ -45,7 +45,9 @@ #include #include @@ -89,7 +89,7 @@ diff -Naur rogue/main.c rogue.new/main.c --- rogue/main.c 2006-01-29 16:11:32.000000000 -0800 -+++ rogue.new/main.c 2006-03-30 13:40:16.000000000 -0800 ++++ rogue.new/main.c 2006-05-15 15:43:43.000000000 -0700 @@ -24,6 +24,13 @@ char *env; int lowtime; @@ -114,7 +114,7 @@ { diff -Naur rogue/mdport.c rogue.new/mdport.c --- rogue/mdport.c 2006-01-29 18:24:39.000000000 -0800 -+++ rogue.new/mdport.c 2006-04-11 19:26:43.000000000 -0700 ++++ rogue.new/mdport.c 2006-05-15 15:45:21.000000000 -0700 @@ -193,8 +193,17 @@ md_normaluser() { @@ -136,30 +136,30 @@ } @@ -397,22 +406,35 @@ - char * - md_getroguedir() - { -- static char path[1024]; -+ static char path[PATH_MAX]; - char *end,*home; - -- if ( (home = getenv("ROGUEHOME")) != NULL) + char * + md_getroguedir() + { +- static char path[1024]; ++ static char path[PATH_MAX]; + char *end,*home; + +- if ( (home = getenv("ROGUEHOME")) != NULL) + /* Disable the use of ROGUEHOME to prevent users from + * maliciously overwriting save files from other setgid games. + */ + if ( (home = getenv("ROGUEHOME")) != NULL && 0) - { - if (*home) - { -- strncpy(path, home, PATH_MAX - 20); -- -- end = &path[strlen(path)-1]; -- -- while( (end >= path) && ((*end == '/') || (*end == '\\'))) -- *end-- = '\0'; -- -- if (directory_exists(path)) -- return(path); + { + if (*home) + { +- strncpy(path, home, PATH_MAX - 20); +- +- end = &path[strlen(path)-1]; +- +- while( (end >= path) && ((*end == '/') || (*end == '\\'))) +- *end-- = '\0'; +- +- if (directory_exists(path)) +- return(path); + /* The magic number 20 is used to guarantee that the save/lock + * filenames (which are much shorter than 20 characters) can + * be appended to this buffer. @@ -179,12 +179,12 @@ + if (directory_exists(path)) + return(path); + } - } - } - + } + } + diff -Naur rogue/rip.c rogue.new/rip.c --- rogue/rip.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/rip.c 2006-03-30 13:32:17.000000000 -0800 ++++ rogue.new/rip.c 2006-05-15 15:43:43.000000000 -0700 @@ -60,7 +60,6 @@ int i; SCORE *sc2; @@ -246,7 +246,7 @@ /* diff -Naur rogue/save.c rogue.new/save.c --- rogue/save.c 2006-01-30 08:05:35.000000000 -0800 -+++ rogue.new/save.c 2006-03-30 13:33:45.000000000 -0800 ++++ rogue.new/save.c 2006-05-15 15:43:43.000000000 -0700 @@ -335,7 +335,40 @@ /* @@ -309,7 +309,7 @@ &top_ten[i].sc_flags, &top_ten[i].sc_monster, diff -Naur rogue/state.c rogue.new/state.c --- rogue/state.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/state.c 2006-03-30 13:09:46.000000000 -0800 ++++ rogue.new/state.c 2006-05-15 15:43:43.000000000 -0700 @@ -2138,7 +2138,8 @@ rs_write_int(savef, no_food); rs_write_ints(savef,a_class,MAXARMORS); From fedora-extras-commits at redhat.com Mon May 15 23:08:15 2006 From: fedora-extras-commits at redhat.com (Garrick Staples (garrick)) Date: Mon, 15 May 2006 16:08:15 -0700 Subject: rpms/torque/devel README-localhost,NONE,1.1 torque.spec,1.6,1.7 Message-ID: <200605152308.k4FN8HZn029102@cvs-int.fedora.redhat.com> Author: garrick Update of /cvs/extras/rpms/torque/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29084 Modified Files: torque.spec Added Files: README-localhost Log Message: * Mon May 15 2006 Garrick Staples 2.1.0p0-3 - get rid of the annoying "localhost only" package --- NEW FILE README-localhost --- To setup a basic single-node localhost-only batch system, install the torque-server, torque-mom, and torque-scheduler packages, and do something like this: /sbin/chkconfig pbs_mom on /sbin/chkconfig pbs_server on /sbin/chkconfig pbs_sched on /bin/hostname --long > %{torquehomedir}/server_priv/nodes /bin/hostname --long > %{torquehomedir}/server_name service pbs_server start qmgr -c "s s scheduling=true" qmgr -c "c q batch queue_type=execution" qmgr -c "s q batch started=true" qmgr -c "s q batch enabled=true" qmgr -c "s q batch resources_default.nodes=1" qmgr -c "s q batch resources_default.walltime=3600" qmgr -c "s s default_queue=batch" service pbs_mom restart service pbs_sched restart Index: torque.spec =================================================================== RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- torque.spec 13 May 2006 05:10:31 -0000 1.6 +++ torque.spec 15 May 2006 23:08:15 -0000 1.7 @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 2 +%define release 3 # The following options are supported: # --with server_name=hostname @@ -90,6 +90,7 @@ Source3: xpbsmon.desktop Source4: xpbs.png Source5: xpbsmon.png +Source6: README-localhost Patch1: torque-2.1.0-remove-rpath.path Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) @@ -99,6 +100,7 @@ Provides: pbs BuildRequires: desktop-file-utils Conflicts: pbspro, openpbs, openpbs-oscar +Obsoletes: torque-localhost %if %use_tcl BuildRequires: tcl-devel @@ -122,7 +124,7 @@ %patch1 -p1 %patch2 -p0 -%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . +%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} . %build @@ -194,7 +196,7 @@ %files %defattr(-, root, root) -%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt +%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost %config(noreplace) %{torquehomedir}/pbs_environment %config(noreplace) %{torquehomedir}/server_name %{torquehomedir}/aux @@ -350,45 +352,6 @@ %endif -%package localhost -Group: Applications/System -Summary: Installs and configures a minimal localhost-only batch queue system -Requires(post): %{name}-mom %{name}-server %{name}-client %{name}-scheduler - -%description localhost -%shared_description -This package installs and configures a minimal localhost-only batch queue -system. - -%files localhost -%defattr(-, root, root) -%pre localhost -if [ -f %{torquehomedir}/server_priv/serverdb ];then - echo "This package wipes out the existing server configuration. Remove" 1>&2 - echo "%{torquehomedir}/server_priv/serverdb if you really want this." 1>&2 - exit 1 -fi -%post localhost -/sbin/chkconfig pbs_mom on -/sbin/chkconfig pbs_server on -/sbin/chkconfig pbs_sched on -/bin/hostname --long > %{torquehomedir}/server_priv/nodes -/bin/hostname --long > %{torquehomedir}/server_name -/bin/hostname --long > %{torquehomedir}/mom_priv/config -pbs_server -t create -qmgr -c "s s scheduling=true" -qmgr -c "c q batch queue_type=execution" -qmgr -c "s q batch started=true" -qmgr -c "s q batch enabled=true" -qmgr -c "s q batch resources_default.nodes=1" -qmgr -c "s q batch resources_default.walltime=3600" -qmgr -c "s s default_queue=batch" -%{_initrddir}/pbs_mom restart -%{_initrddir}/pbs_sched restart -%{_initrddir}/pbs_server restart -qmgr -c "s n `/bin/hostname --long` state=free" -e - - %package -n lib%{name} Summary: Run-time libs for programs which will use the %{name} library Group: Development/Libraries @@ -425,6 +388,9 @@ %changelog +* Mon May 15 2006 Garrick Staples 2.1.0p0-3 +- get rid of the annoying "localhost only" package + * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled From fedora-extras-commits at redhat.com Mon May 15 23:29:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 May 2006 16:29:10 -0700 Subject: rpms/perl-Module-Build/FC-5 .cvsignore, 1.9, 1.10 perl-Module-Build.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200605152329.k4FNTDeu029308@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29287 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Mar 2006 02:14:33 -0000 1.9 +++ .cvsignore 15 May 2006 23:29:10 -0000 1.10 @@ -1 +1 @@ -Module-Build-0.2612.tar.gz +Module-Build-0.28.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/perl-Module-Build.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Module-Build.spec 16 Mar 2006 01:54:11 -0000 1.15 +++ perl-Module-Build.spec 15 May 2006 23:29:10 -0000 1.16 @@ -1,26 +1,35 @@ Name: perl-Module-Build -Version: 0.2612 +Version: 0.28 Release: 2%{?dist} +Epoch: 1 Summary: Perl module for building and installing Perl modules -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Tar) >= 1.08 -BuildRequires: perl(ExtUtils::CBuilder) >= 0.02 -BuildRequires: perl(ExtUtils::ParseXS) >= 2.02 -BuildRequires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.15 +BuildRequires: perl(ExtUtils::ParseXS) >= 1.02 +BuildRequires: perl(YAML) +BuildRequires: perl(Pod::Readme) >= 0.04 Requires: perl(Archive::Tar) >= 1.08 -Requires: perl(ExtUtils::CBuilder) >= 0.02 -Requires: perl(ExtUtils::ParseXS) >= 2.02 -Requires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +Requires: perl(ExtUtils::CBuilder) >= 0.15 +Requires: perl(ExtUtils::ParseXS) >= 1.02 +Requires: perl(Pod::Readme) >= 0.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -Perl module for building and installing Perl modules, a replacement to -ExtUtils::MakeMaker. +Module::Build is a system for building, testing, and installing Perl +modules. It is meant to be an alternative to ExtUtils::MakeMaker. +Developers may alter the behavior of the module through subclassing in a +much more straightforward way than with MakeMaker. It also does not require +a make on your system - most of the Module::Build code is pure-perl and +written in a very cross-platform way. In fact, you don't even need a shell, +so even platforms like MacOS (traditional) can use it fairly easily. Its +only prerequisites are modules that are included with perl 5.6.0, and it +works fine on perl 5.005 if you can install a few additional modules. %prep %setup -q -n Module-Build-%{version} @@ -33,14 +42,10 @@ rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 - find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check ./Build test @@ -49,13 +54,21 @@ %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{_bindir}/config_data %{perl_vendorlib}/Module %{_mandir}/man1/config_data.1* %{_mandir}/man3/Module::Build*.3* %changelog +* Sat May 13 2006 Steven Pritchard - 1:0.28-2 +- Rebuild. + +* Fri May 12 2006 Steven Pritchard - 1:0.28-1 +- Update to 0.28. +- Epoch bump to make 0.28 > 0.2612. +- Various spec cleanups to closer match cpanspec output. + * Wed Mar 15 2006 Steven Pritchard - 0.2612-2 - Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and ExtUtils::ParseXS. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Mar 2006 02:14:33 -0000 1.9 +++ sources 15 May 2006 23:29:10 -0000 1.10 @@ -1 +1 @@ -fa1504741e9c931f75e804953c1d5417 Module-Build-0.2612.tar.gz +8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz From fedora-extras-commits at redhat.com Mon May 15 23:50:04 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 15 May 2006 16:50:04 -0700 Subject: rpms/gtk2hs/FC-4 gtk2hs.spec,1.1,1.2 Message-ID: <200605152350.k4FNo6fO029919@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29898 Modified Files: gtk2hs.spec Log Message: turn off cairo Index: gtk2hs.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/FC-4/gtk2hs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk2hs.spec 15 May 2006 03:18:55 -0000 1.1 +++ gtk2hs.spec 15 May 2006 23:50:04 -0000 1.2 @@ -3,7 +3,7 @@ %define mozver 37:1.7.13 %define build_mozembed 1 -%define build_cairo 1 +%define build_cairo 0 Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs From fedora-extras-commits at redhat.com Tue May 16 00:23:18 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 May 2006 17:23:18 -0700 Subject: extras-repoclosure rc-report.py,1.1,1.2 Message-ID: <200605160023.k4G0NIEZ000676@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv657 Modified Files: rc-report.py Log Message: Include reports for packages with owners missing in owners.list Index: rc-report.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rc-report.py 30 Apr 2006 11:11:51 -0000 1.1 +++ rc-report.py 16 May 2006 00:23:15 -0000 1.2 @@ -268,10 +268,9 @@ ownedby = owners.GetOwner(name) if ownedby == '': + ownedby = 'UNKNOWN OWNER' x = 'ERROR: %s not in owners.list\nERROR: source rpm is %s' % ( name, srcrpm ) - summail += x + '\n' - inbody = False - continue + summail += x + '\n\n' # name EVR.arch summary.append ( ' '.join( ['\t', w[1], ' ', w[3], repoid] ) ) repoids[repoid] = 1 @@ -323,7 +322,7 @@ mailtext = 'This is an automated mail created by an experimental script.\nYour following packages in the repository contain broken dependencies:\n\n' mailtext += body - if domail: + if domail and toaddr != 'UNKNOWN OWNER': mailsplit( srv, fromaddr, toaddr, replytoaddr, subject, mailtext ) if len(oldproblems): From fedora-extras-commits at redhat.com Tue May 16 01:18:09 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 15 May 2006 18:18:09 -0700 Subject: rpms/darcs/FC-5 .cvsignore, 1.5, 1.6 darcs.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200605160118.k4G1IBqn003359@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3337 Modified Files: .cvsignore darcs.spec sources Log Message: - update to 1.0.7 - fix typo of propagate in description (#189651) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Mar 2006 09:25:22 -0000 1.5 +++ .cvsignore 16 May 2006 01:18:09 -0000 1.6 @@ -1 +1 @@ -darcs-1.0.6.tar.gz +darcs-1.0.7.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/darcs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- darcs.spec 22 Mar 2006 07:23:38 -0000 1.10 +++ darcs.spec 16 May 2006 01:18:09 -0000 1.11 @@ -1,6 +1,6 @@ Name: darcs -Version: 1.0.6 -Release: 2%{?dist} +Version: 1.0.7 +Release: 1%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -18,7 +18,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -35,7 +35,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -84,6 +84,10 @@ %changelog +* Sun May 14 2006 Jens Petersen - 1.0.7-1 +- update to 1.0.7 +- fix typo of propagate in description (#189651) + * Wed Mar 22 2006 Jens Petersen - 1.0.6-2 - build with rebuilt ghc Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2006 09:25:22 -0000 1.5 +++ sources 16 May 2006 01:18:09 -0000 1.6 @@ -1 +1 @@ -8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz +5fe4e4e7b049c095995b9a57ea6aeece darcs-1.0.7.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:39:08 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 15 May 2006 18:39:08 -0700 Subject: rpms/darcs/FC-4 .cvsignore, 1.4, 1.5 darcs.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605160139.k4G1dAis003477@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3456 Modified Files: .cvsignore darcs.spec sources Log Message: - update to 1.0.7 - fix typo of propagate in description (#189651) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Mar 2006 08:14:51 -0000 1.4 +++ .cvsignore 16 May 2006 01:39:08 -0000 1.5 @@ -1 +1 @@ -darcs-1.0.6.tar.gz +darcs-1.0.7.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- darcs.spec 22 Mar 2006 08:14:51 -0000 1.8 +++ darcs.spec 16 May 2006 01:39:08 -0000 1.9 @@ -1,5 +1,5 @@ Name: darcs -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} Summary: David's advanced revision control system @@ -18,7 +18,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -35,7 +35,7 @@ Darcs is a revision control system, along the lines of CVS or arch. That means that it keeps track of various revisions and branches of your project, allows for changes to -propogate from one branch to another. Darcs is intended to +propagate from one branch to another. Darcs is intended to be an ``advanced'' revision control system. Darcs has two particularly distinctive features which differ from other revision control systems: 1) each copy of the source is a @@ -84,6 +84,10 @@ %changelog +* Sun May 14 2006 Jens Petersen - 1.0.7-1 +- update to 1.0.7 +- fix typo of propagate in description (#189651) + * Wed Mar 22 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 - darcs-createrepo is gone Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 08:14:51 -0000 1.5 +++ sources 16 May 2006 01:39:08 -0000 1.6 @@ -1 +1 @@ -8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz +5fe4e4e7b049c095995b9a57ea6aeece darcs-1.0.7.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:50:03 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:50:03 -0700 Subject: rpms/nagios/FC-4 sources,1.6,1.7 Message-ID: <200605160150.k4G1o5uH003602@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3556/FC-4 Modified Files: sources Log Message: Added new upstream source nagios-2.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 May 2006 03:36:31 -0000 1.6 +++ sources 16 May 2006 01:50:02 -0000 1.7 @@ -1 +1 @@ -6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz +22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:50:03 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:50:03 -0700 Subject: rpms/nagios/FC-5 sources,1.5,1.6 Message-ID: <200605160150.k4G1o506003606@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3556/FC-5 Modified Files: sources Log Message: Added new upstream source nagios-2.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 May 2006 03:36:32 -0000 1.5 +++ sources 16 May 2006 01:50:03 -0000 1.6 @@ -1 +1 @@ -6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz +22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:50:04 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:50:04 -0700 Subject: rpms/nagios/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200605160150.k4G1o64F003611@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3556/devel Modified Files: .cvsignore sources Log Message: Added new upstream source nagios-2.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 May 2006 03:35:36 -0000 1.6 +++ .cvsignore 16 May 2006 01:50:04 -0000 1.7 @@ -1 +1 @@ -nagios-2.3.tar.gz +nagios-2.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 May 2006 03:35:36 -0000 1.6 +++ sources 16 May 2006 01:50:04 -0000 1.7 @@ -1 +1 @@ -6d0a01ed778f81cc49d402884d25a933 nagios-2.3.tar.gz +22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz From fedora-extras-commits at redhat.com Tue May 16 01:51:12 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:51:12 -0700 Subject: rpms/nagios/devel nagios.spec,1.19,1.20 Message-ID: <200605160151.k4G1pEhH003669@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3617/devel Modified Files: nagios.spec Log Message: Updates for new upstream version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nagios.spec 9 May 2006 23:59:24 -0000 1.19 +++ nagios.spec 16 May 2006 01:51:12 -0000 1.20 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.3 -Release: 3%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -117,8 +117,10 @@ %{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || : %preun -/sbin/service nagios stop > /dev/null 2>&1 || : -/sbin/chkconfig --del %{name} || : +if [ $1 = 0 ]; then + /sbin/service nagios stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : +fi %post /sbin/chkconfig --add %{name} || : @@ -157,6 +159,10 @@ %{_includedir}/%{name} %changelog +* Mon May 15 2006 Mike McGrath 2.3.1-1 +- Bug fix for HTTP content_length header integer overflow in CGIs +- Updates no longer remove Nagios from starting up on reboot + * Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down From fedora-extras-commits at redhat.com Tue May 16 01:51:06 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:51:06 -0700 Subject: rpms/nagios/FC-4 nagios.spec,1.13,1.14 Message-ID: <200605160151.k4G1pcLZ003674@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3617/FC-4 Modified Files: nagios.spec Log Message: Updates for new upstream version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nagios.spec 9 May 2006 23:59:23 -0000 1.13 +++ nagios.spec 16 May 2006 01:51:06 -0000 1.14 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.3 -Release: 3%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -117,8 +117,10 @@ %{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || : %preun -/sbin/service nagios stop > /dev/null 2>&1 || : -/sbin/chkconfig --del %{name} || : +if [ $1 = 0 ]; then + /sbin/service nagios stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : +fi %post /sbin/chkconfig --add %{name} || : @@ -157,6 +159,10 @@ %{_includedir}/%{name} %changelog +* Mon May 15 2006 Mike McGrath 2.3.1-1 +- Bug fix for HTTP content_length header integer overflow in CGIs +- Updates no longer remove Nagios from starting up on reboot + * Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down From fedora-extras-commits at redhat.com Tue May 16 01:51:07 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 15 May 2006 18:51:07 -0700 Subject: rpms/nagios/FC-5 nagios.spec,1.13,1.14 Message-ID: <200605160151.k4G1pdIL003677@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/nagios/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3617/FC-5 Modified Files: nagios.spec Log Message: Updates for new upstream version Index: nagios.spec =================================================================== RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nagios.spec 9 May 2006 23:59:24 -0000 1.13 +++ nagios.spec 16 May 2006 01:51:07 -0000 1.14 @@ -1,6 +1,6 @@ Name: nagios -Version: 2.3 -Release: 3%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: Host/service/network monitoring program Group: Applications/System @@ -117,8 +117,10 @@ %{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || : %preun -/sbin/service nagios stop > /dev/null 2>&1 || : -/sbin/chkconfig --del %{name} || : +if [ $1 = 0 ]; then + /sbin/service nagios stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : +fi %post /sbin/chkconfig --add %{name} || : @@ -157,6 +159,10 @@ %{_includedir}/%{name} %changelog +* Mon May 15 2006 Mike McGrath 2.3.1-1 +- Bug fix for HTTP content_length header integer overflow in CGIs +- Updates no longer remove Nagios from starting up on reboot + * Tue May 09 2006 Mike McGrath 2.3-3 - updates to the init script that prevented nagios from shutting down From fedora-extras-commits at redhat.com Tue May 16 02:01:43 2006 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Mon, 15 May 2006 19:01:43 -0700 Subject: owners owners.list,1.1001,1.1002 Message-ID: <200605160202.k4G22ID9006070@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6052 Modified Files: owners.list Log Message: my new email address Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1001 retrieving revision 1.1002 diff -u -r1.1001 -r1.1002 --- owners.list 15 May 2006 20:40:39 -0000 1.1001 +++ owners.list 16 May 2006 02:01:43 -0000 1.1002 @@ -769,7 +769,7 @@ Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|mm|Shared memory allocation library|andreas at bawue.net|extras-qa at fedoraproject.org| -Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org| +Fedora Extras|mmv|Move/copy/append/link multiple files|zing at fastmail.fm|extras-qa at fedoraproject.org| Fedora Extras|MochiKit|A lightweight JavaScript library|ivazquez at ivazquez.net|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| @@ -1243,7 +1243,7 @@ Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|zing at fastmail.fm|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1489,7 +1489,7 @@ Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|snort|An intrusion detection system|dennis at ausil.us|extras-qa at fedoraproject.org| -Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org| +Fedora Extras|snownews|A RSS/RDF news aggregator|zing at fastmail.fm|extras-qa at fedoraproject.org| Fedora Extras|SOAPpy|Full-featured SOAP library for Python|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|sodipodi|Vector-based drawing program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 02:41:34 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 May 2006 19:41:34 -0700 Subject: owners owners.list,1.1002,1.1003 Message-ID: <200605160241.k4G2famI008154@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8125 Modified Files: owners.list Log Message: Add swaks. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1002 retrieving revision 1.1003 diff -u -r1.1002 -r1.1003 --- owners.list 16 May 2006 02:01:43 -0000 1.1002 +++ owners.list 16 May 2006 02:41:34 -0000 1.1003 @@ -1520,6 +1520,7 @@ Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| +Fedora Extras|swaks|Command-line SMTP transaction tester|tibbs at math.uh.edu|extras-qa at fedoraproject.org| Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|swh-plugins|A set of audio plugins for LADSPA|green at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 04:15:50 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Mon, 15 May 2006 21:15:50 -0700 Subject: mock mock.py,1.48,1.49 Message-ID: <200605160415.k4G4FoUF018744@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18684 Modified Files: mock.py Log Message: applied tab-fix and a slimming of main patches from Michael E. Brown. Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- mock.py 14 May 2006 04:53:38 -0000 1.48 +++ mock.py 16 May 2006 04:15:48 -0000 1.49 @@ -630,7 +630,7 @@ cmd = "mkdir -p %s/%s" % (self.builddir, subdir) self.do_chroot(cmd, fatal = True) - # change ownership so we can write to build home dir + # change ownership so we can write to build home dir cmd = "chown -R %s.%s %s" % (self.config['chrootuser'], self.config['chrootgroup'], self.homedir) self.do_chroot(cmd, fatal = True) @@ -687,32 +687,8 @@ default=False, help="quiet down output") return parser.parse_args() - -def main(): - # before we go on, make sure the user is a member of the 'mock' group. - member = False - for item in os.getgroups(): - try: - grptup = grp.getgrgid(item) - except KeyError, e: - continue - if grptup[0] == 'mock': - member = True - - if not member: - print "You need to be a member of the mock group for this to work" - sys.exit(1) - # and make sure they're not root - if os.geteuid() == 0: - error("Don't try to run mock as root!") - sys.exit(1) - - # config path - config_path='/etc/mock' - - # defaults - config_opts = {} +def setup_default_config_opts(config_opts): 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' @@ -742,6 +718,119 @@ config_opts['more_buildreqs'] = {} config_opts['files']['/etc/resolv.conf'] = "nameserver 192.168.1.1\n" config_opts['files']['/etc/hosts'] = "127.0.0.1 localhost localhost.localdomain\n" + +def set_config_opts_per_cmdline(config_opts, options): + # do some other options and stuff + if options.arch: + config_opts['target_arch'] = options.arch + + if options.dirty: + config_opts['clean'] = False + else: + config_opts['clean'] = True + + config_opts['debug'] = options.debug + config_opts['quiet'] = options.quiet + + if options.resultdir: + config_opts['resultdir'] = options.resultdir + + if options.statedir: + config_opts['statedir'] = options.statedir + + if options.uniqueext: + config_opts['unique-ext'] = options.uniqueext + +def do_clean(config_opts, init=0): + my = None + try: + my = Root(config_opts) + if init: my.prep() + except Error, e: + print e + if my: + my.close() + sys.exit(100) + + my.close() + if init: + print 'Finished initializing root' + else: + print 'Finished cleaning root' + +def do_run_cmd(config_opts, cmd, raw_chroot=0): + my = Root(config_opts) + my.debug("executing: %s" % cmd) + my._mount() + if raw_chroot: + cmd = '%s %s %s' % (config_opts['chroot'], my.rootdir, cmd) + os.system(cmd) + else: + my.do_chroot(cmd, True) + my.close() + my.debug('finished chroot command') + +def ensure_filetype_srpm(srpms): + for srpm in srpms: + ts = rpmUtils.transaction.initReadOnlyTransaction() + try: + hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) + except rpmUtils.RpmUtilsError, e: + error("Specified srpm %s cannot be found/opened" % srpm) + sys.exit(50) + + if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: + error("Specified srpm isn't a srpm! Can't go on") + sys.exit(50) + +def do_rebuild(config_opts, srpms): + # Prep build root + my = None # if Root() fails, my will be undefined so we force it to None + try: + my = Root(config_opts) + os.umask(0022) # set a umask- protects from paranoid whackjobs with an 002 umask + except Error, e: + error(e) + if my: + my.close() + sys.exit(e.resultcode) + + for srpm in srpms: + try: + my.prep() + my.build(srpm) + except Error, e: + error(e) + if my: + my.close() + sys.exit(e.resultcode) + + my.close() + print "Results and/or logs in: %s" % my.resultdir + +def main(): + # before we go on, make sure the user is a member of the 'mock' group. + member = False + for item in os.getgroups(): + try: + grptup = grp.getgrgid(item) + except KeyError, e: + continue + if grptup[0] == 'mock': + member = True + + if not member: + print "You need to be a member of the mock group for this to work" + sys.exit(1) + + # and make sure they're not root + if os.geteuid() == 0: + error("Don't try to run mock as root!") + sys.exit(1) + + # defaults + config_opts = {} + setup_default_config_opts(config_opts) # cli option parsing (options, args) = command_parse() @@ -750,6 +839,8 @@ error("No srpm or command specified - nothing to do") sys.exit(50) + # config path -- can be overridden on cmdline + config_path='/etc/mock' if options.configdir: config_path = options.configdir @@ -773,80 +864,29 @@ error("Could not find config file %s for chroot %s" % (cfg, options.chroot)) sys.exit(1) - # do some other options and stuff - if options.arch: - config_opts['target_arch'] = options.arch - - if options.dirty: - config_opts['clean'] = False - else: - config_opts['clean'] = True - - config_opts['debug'] = options.debug - config_opts['quiet'] = options.quiet - - if options.resultdir: - config_opts['resultdir'] = options.resultdir - - if options.statedir: - config_opts['statedir'] = options.statedir - - if options.uniqueext: - config_opts['unique-ext'] = options.uniqueext - + # cmdline options override config options + set_config_opts_per_cmdline(config_opts, options) # do whatever we're here to do if args[0] == 'clean': # unset a --no-clean config_opts['clean'] = True - try: - my = None - my = Root(config_opts) - except Error, e: - print e - if my: - my.close() - sys.exit(100) - - my.close() - print 'Finished cleaning root' + do_clean(config_opts, init=0) elif args[0] == 'init': - try: - my = None - my = Root(config_opts) - my.prep() - except Error, e: - print e - if my: - my.close() - sys.exit(100) - - my.close() - print 'Finished initializing root' + do_clean(config_opts, init=1) elif args[0] == 'chroot': # catch-all for executing arbitrary commands in the chroot config_opts['clean'] = config_opts['quiet'] = False - my = Root(config_opts) cmd = ' '.join(args[1:]) - my.debug("executing: %s" % cmd) - my._mount() - my.do_chroot(cmd, True) - my.close() - my.debug('finished chroot command') + do_run_cmd(config_opts, cmd, raw_chroot=0) elif args[0] == 'shell': # debugging tool for interactive poking around in the chroot config_opts['clean'] = config_opts['quiet'] = False - my = Root(config_opts) - cmd = "PS1='mock-chroot> ' %s %s /bin/bash" % (config_opts['chroot'], - my.rootdir) - my.debug("executing: %s" % cmd) - my._mount() - ret = os.system(cmd) - my.close() - my.debug("finished shell with retval %d" % ret) + os.environ['PS1'] = "mock-chroot> " + do_run_cmd(config_opts, "/bin/bash", raw_chroot=1) else: if args[0] == 'rebuild': @@ -858,42 +898,10 @@ else: srpms = args[0:] - for srpm in srpms: - ts = rpmUtils.transaction.initReadOnlyTransaction() - try: - hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm) - except rpmUtils.RpmUtilsError, e: - error("Specified srpm %s cannot be found/opened" % srpm) - sys.exit(50) - - if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1: - error("Specified srpm isn't a srpm! Can't go on") - sys.exit(50) - - # Prep build root - my = None # if Root() fails, my will be undefined so we force it to None - try: - my = Root(config_opts) - os.umask(0022) # set a umask- protects from paranoid whackjobs with an 002 umask - except Error, e: - error(e) - if my: - my.close() - sys.exit(e.resultcode) - - for srpm in srpms: - try: - my.prep() - my.build(srpm) - except Error, e: - error(e) - if my: - my.close() - sys.exit(e.resultcode) - - my.close() - print "Results and/or logs in: %s" % my.resultdir + # exit here if everything isn't kosher + ensure_filetype_srpm(srpms) + do_rebuild(config_opts, srpms) if __name__ == '__main__': main() From fedora-extras-commits at redhat.com Tue May 16 07:08:35 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Tue, 16 May 2006 00:08:35 -0700 Subject: owners owners.list,1.1003,1.1004 Message-ID: <200605160708.k4G78b4Y003725@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3706 Modified Files: owners.list Log Message: Added adplug. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1003 retrieving revision 1.1004 diff -u -r1.1003 -r1.1004 --- owners.list 16 May 2006 02:41:34 -0000 1.1003 +++ owners.list 16 May 2006 07:08:34 -0000 1.1004 @@ -20,6 +20,7 @@ Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|adime|Allegro Dialogs Made Easy|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|adplug|AdLib OPL sound emulation library|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 07:53:21 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Tue, 16 May 2006 00:53:21 -0700 Subject: rpms/git/devel .cvsignore, 1.27, 1.28 git.spec, 1.15, 1.16 sources, 1.27, 1.28 Message-ID: <200605160753.k4G7rNSR003873@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3852 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 19:44:23 -0000 1.27 +++ .cvsignore 16 May 2006 07:53:21 -0000 1.28 @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/devel/git.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git.spec 4 May 2006 19:44:23 -0000 1.15 +++ git.spec 16 May 2006 07:53:21 -0000 1.16 @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 May 2006 19:44:23 -0000 1.27 +++ sources 16 May 2006 07:53:21 -0000 1.28 @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 08:11:59 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Tue, 16 May 2006 01:11:59 -0700 Subject: rpms/git/FC-5 .cvsignore, 1.27, 1.28 git.spec, 1.15, 1.16 sources, 1.27, 1.28 Message-ID: <200605160812.k4G8C13Z006238@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6217 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 19:45:50 -0000 1.27 +++ .cvsignore 16 May 2006 08:11:58 -0000 1.28 @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git.spec 4 May 2006 19:45:50 -0000 1.15 +++ git.spec 16 May 2006 08:11:58 -0000 1.16 @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-5/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 May 2006 19:45:50 -0000 1.27 +++ sources 16 May 2006 08:11:58 -0000 1.28 @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 08:12:44 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Tue, 16 May 2006 01:12:44 -0700 Subject: rpms/git/FC-4 .cvsignore, 1.27, 1.28 git.spec, 1.15, 1.16 sources, 1.27, 1.28 Message-ID: <200605160812.k4G8CknX006314@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6293 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 19:46:49 -0000 1.27 +++ .cvsignore 16 May 2006 08:12:44 -0000 1.28 @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git.spec 4 May 2006 19:46:49 -0000 1.15 +++ git.spec 16 May 2006 08:12:44 -0000 1.16 @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-4/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 May 2006 19:46:49 -0000 1.27 +++ sources 16 May 2006 08:12:44 -0000 1.28 @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 08:13:29 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Tue, 16 May 2006 01:13:29 -0700 Subject: rpms/git/FC-3 .cvsignore, 1.27, 1.28 git.spec, 1.15, 1.16 sources, 1.27, 1.28 Message-ID: <200605160813.k4G8DVGb006393@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6371 Modified Files: .cvsignore git.spec sources Log Message: Update to git-1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 19:48:01 -0000 1.27 +++ .cvsignore 16 May 2006 08:13:29 -0000 1.28 @@ -1 +1 @@ -git-1.3.2.tar.gz +git-1.3.3.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- git.spec 4 May 2006 19:48:01 -0000 1.15 +++ git.spec 16 May 2006 08:13:29 -0000 1.16 @@ -1,7 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation -# Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -10,7 +9,7 @@ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk %description This is a stupid (but extremely fast) directory content manager. It @@ -57,14 +56,12 @@ %description arch Git tools for importing Arch repositories. -%if %{?_with_email:1}0 %package email Summary: Git tools for sending email Group: Development/Tools Requires: git-core = %{version}-%{release} %description email Git tools for sending email. -%endif %package -n gitk Summary: Git revision tree visualiser ('gitk') @@ -77,18 +74,18 @@ %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \ +make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean @@ -118,14 +115,12 @@ %{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %doc Documentation/*arch*.html } -%if %{?_with_email:1}0 %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } -%endif %files -n gitk %defattr(-,root,root) @@ -141,6 +136,10 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu May 4 2006 Chris Wright 1.3.3-1 +- git-1.3.3 +- enable git-email building, prereqs have been relaxed + * Thu May 4 2006 Chris Wright 1.3.2-1 - git-1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git/FC-3/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 May 2006 19:48:01 -0000 1.27 +++ sources 16 May 2006 08:13:29 -0000 1.28 @@ -1 +1 @@ -df1405d45cb90114620007823b9e7658 git-1.3.2.tar.gz +e8bb8020d6336abd2d777549201d8c33 git-1.3.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 08:15:55 2006 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Tue, 16 May 2006 01:15:55 -0700 Subject: devel/x3270 x3270.spec,1.18,1.19 Message-ID: <200605160815.k4G8FvpW006464@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/x3270 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6447 Modified Files: x3270.spec Log Message: - rebuild Index: x3270.spec =================================================================== RCS file: /cvs/extras/devel/x3270/x3270.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- x3270.spec 17 Feb 2006 17:07:20 -0000 1.18 +++ x3270.spec 16 May 2006 08:15:55 -0000 1.19 @@ -5,7 +5,7 @@ Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 Version: 3.3.4p6 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: Applications/Internet URL: http://www.geocities.com/SiliconValley/Peaks/7814 @@ -203,7 +203,10 @@ %{_mandir}/man1/c3270* %changelog -* Fri Feb 17 2006 Karsten Hopp 3.3.4p6-5%{?dist} +* Tue May 16 2006 Karsten Hopp 3.3.4p6-6 +- rebuild + +* Fri Feb 17 2006 Karsten Hopp 3.3.4p6-5 - rebuild * Mon Dec 19 2005 Karsten Hopp 3.3.4p6-4 From fedora-extras-commits at redhat.com Tue May 16 08:37:39 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 16 May 2006 01:37:39 -0700 Subject: fedora-security/audit fc4,1.247,1.248 fc5,1.161,1.162 Message-ID: <200605160837.k4G8bdD8006639@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6619 Modified Files: fc4 fc5 Log Message: Cups move to new upstream changes many entries Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- fc4 15 May 2006 19:31:01 -0000 1.247 +++ fc4 16 May 2006 08:37:37 -0000 1.248 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060514 -Up to date FC4 as of 20060514 +Up to date CVE as of CVE email 20060515 +Up to date FC4 as of 20060515 ** are items that need attention Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- fc5 15 May 2006 19:31:01 -0000 1.161 +++ fc5 16 May 2006 08:37:37 -0000 1.162 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060514 -Up to date FC5 as of 20060514 +Up to date CVE as of CVE email 20060515 +Up to date FC5 as of 20060515 ** are items that need attention @@ -299,27 +299,27 @@ CVE-2005-3628 version (kdegraphics, fixed 3.5.1) CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch -CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3628 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3627 version (poppler, fixed 0.4.4) CVE-2005-3627 version (kdegraphics, fixed 3.5.1) CVE-2005-3627 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3627 backport (tetex) -CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3627 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3626 version (poppler, fixed 0.4.4) CVE-2005-3626 version (kdegraphics, fixed 3.5.1) CVE-2005-3626 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3626 backport (tetex) -CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3626 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3625 version (poppler, fixed 0.4.4) CVE-2005-3625 version (kdegraphics, fixed 3.5.1) CVE-2005-3625 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3625 backport (tetex) -CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3625 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3624 version (poppler, fixed 0.4.4) CVE-2005-3624 version (kdegraphics, fixed 3.5.1) CVE-2005-3624 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3624 backport (tetex) -CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3624 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3623 version (kernel, fixed 2.6.14.5) CVE-2005-3582 version (ImageMagick) gentoo only CVE-2005-3573 version (mailman, fixed 2.1.7) @@ -361,17 +361,17 @@ CVE-2005-3193 version (kdegraphics, fixed 3.5.1) CVE-2005-3193 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch -CVE-2005-3193 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3193 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3192 version (poppler, fixed 0.4.4) CVE-2005-3192 version (kdegraphics, fixed 3.5.1) CVE-2005-3192 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch -CVE-2005-3192 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3192 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3191 version (poppler, fixed 0.4.4) CVE-2005-3191 version (kdegraphics, fixed 3.5.1) CVE-2005-3191 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch -CVE-2005-3191 backport (cups) cups-CVE-2005-3625,6,7.patch +CVE-2005-3191 version (cups, fixed 1.2.0) [since FEDORA-2006-252] was backport since GA CVE-2005-3186 version (gtk2, fixed 2.8.7 at least) CVE-2005-3186 backport (gdk-pixbuf) CVE-2005-3185 version (wget, fixed 1.10.2 at least) @@ -545,7 +545,7 @@ CVE-2005-2099 version (kernel, fixed 2.6.12.5) CVE-2005-2098 version (kernel, fixed 2.6.12.5) CVE-2005-2097 version (xpdf, fixed 3.0.1) -CVE-2005-2097 backport (cups) cups-CAN-2005-2097.patch +CVE-2005-2097 version (cups) [since FEDORA-2006-252] was backport since GA CVE-2005-2096 version (rpm, fixed 4.4.2) CVE-2005-2096 backport (zlib, fixed 1.2.2.4) CVE-2005-2095 version (squirrelmail, fixed 1.4.5) @@ -1100,7 +1100,7 @@ CVE-2004-0888 version (xpdf, fixed 3.0.1) CVE-2004-0888 version (tetex, fixed 3.0) CVE-2004-0888 version (kpdegraphics, not 3.4) -CVE-2004-0888 backport (cups) cups-CAN-2004-0888.patch +CVE-2004-0888 version (cups) [since FEDORA-2006-252] was backport since GA CVE-2004-0887 version (kernel, fixed 2.6.10) CVE-2004-0886 version (libtiff, fixed 3.7.1 at least) CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109) From fedora-extras-commits at redhat.com Tue May 16 10:57:22 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 16 May 2006 03:57:22 -0700 Subject: rpms/pan/devel pan-0.97-tree-expanders.patch, NONE, 1.1 pan.spec, 1.15, 1.16 Message-ID: <200605161057.k4GAvO5p011678@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11658 Modified Files: pan.spec Added Files: pan-0.97-tree-expanders.patch Log Message: patch from upstream pan-0.97-tree-expanders.patch: --- NEW FILE pan-0.97-tree-expanders.patch --- diff -u pan/gui-bak/group-pane.cc pan/gui/group-pane.cc --- pan/gui-bak/group-pane.cc 2006-05-15 14:22:21.000000000 -0500 +++ pan/gui/group-pane.cc 2006-05-15 14:22:41.000000000 -0500 @@ -251,13 +251,56 @@ g_idle_add (on_row_activated_idle, pane_g); } +namespace +{ + bool row_collapsed_or_expanded (false); + + void row_collapsed_or_expanded_cb (GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path, gpointer unused) + { + row_collapsed_or_expanded = true; + } + + struct Blah + { + GtkTreeView * view; + GtkTreePath * path; + GtkTreeViewColumn * col; + }; + + gboolean maybe_activate_on_idle_idle (gpointer blah_gpointer) + { + Blah * blah = (Blah*) blah_gpointer; + if (!row_collapsed_or_expanded) + gtk_tree_view_row_activated (blah->view, blah->path, blah->col); + gtk_tree_path_free (blah->path); + g_free (blah); + return false; + } + + /** + * There doesn't seem to be any way to see if a mouse click in a tree view + * happened on the expander or elsewhere in a row, so when deciding whether or + * not to activate a row on single click, let's wait and see if a row expands or + * collapses. + */ + void maybe_activate_on_idle (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *col) + { + row_collapsed_or_expanded = false; + Blah * blah = (Blah*) g_new (Blah, 1); + blah->view = view; + blah->path = path; + blah->col = col; + g_idle_add (maybe_activate_on_idle_idle, blah); + } +} + gboolean GroupPane :: on_button_pressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata) { GroupPane * pane (static_cast(userdata)); // single click with the right mouse button? - if (event->type == GDK_BUTTON_PRESS && event->button == 3) + if (event->type == GDK_BUTTON_PRESS && event->button == 3) { GtkTreeSelection * selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); GtkTreePath * path; @@ -271,20 +314,21 @@ do_popup_menu (treeview, event, userdata); return true; } - else if (pane->_prefs.get_flag("single-click-activates-group", true) - && event->type == GDK_BUTTON_PRESS - && event->button == 1) + else if (pane->_prefs.get_flag("single-click-activates-group",true) + && (event->type == GDK_BUTTON_RELEASE) + && (event->button == 1) + && (event->send_event == false) + && (event->window == gtk_tree_view_get_bin_window (GTK_TREE_VIEW(treeview))) + && !(event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK))) { GtkTreePath * path; GtkTreeViewColumn * col; + gint cell_x(0), cell_y(0); if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview), - (gint) event->x, + (gint) event->x, (gint) event->y, - &path, &col, NULL, NULL)) - { - gtk_tree_view_row_activated (GTK_TREE_VIEW(treeview), path, col); - gtk_tree_path_free(path); - } + &path, &col, &cell_x, &cell_y)) + maybe_activate_on_idle (GTK_TREE_VIEW(treeview), path, col); } return false; @@ -704,7 +748,10 @@ gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(_tree_view), true); #endif + g_signal_connect (_tree_view, "row_collapsed", G_CALLBACK(row_collapsed_or_expanded_cb), 0); + g_signal_connect (_tree_view, "row_expanded", G_CALLBACK(row_collapsed_or_expanded_cb), 0); g_signal_connect (_tree_view, "button-press-event", G_CALLBACK(on_button_pressed), this); + g_signal_connect (_tree_view, "button-release-event", G_CALLBACK(on_button_pressed), this); g_signal_connect (_tree_view, "popup-menu", G_CALLBACK(on_popup_menu), this); g_signal_connect (_tree_view, "row-activated", G_CALLBACK(on_row_activated), this); g_object_unref (G_OBJECT(_tree_store)); diff -u pan/gui-bak/header-pane.cc pan/gui/header-pane.cc --- pan/gui-bak/header-pane.cc 2006-05-15 14:22:22.000000000 -0500 +++ pan/gui/header-pane.cc 2006-05-15 14:27:50.000000000 -0500 @@ -1013,7 +1013,48 @@ return true; } } +namespace +{ + bool row_collapsed_or_expanded (false); + + void row_collapsed_or_expanded_cb (GtkTreeView *view, GtkTreeIter *iter, GtkTreePath *path, gpointer unused) + { + row_collapsed_or_expanded = true; + } + + struct Blah + { + GtkTreeView * view; + GtkTreePath * path; + GtkTreeViewColumn * col; + }; + gboolean maybe_activate_on_idle_idle (gpointer blah_gpointer) + { + Blah * blah = (Blah*) blah_gpointer; + if (!row_collapsed_or_expanded) + gtk_tree_view_row_activated (blah->view, blah->path, blah->col); + gtk_tree_path_free (blah->path); + g_free (blah); + return false; + } + + /** + * There doesn't seem to be any way to see if a mouse click in a tree view + * happened on the expander or elsewhere in a row, so when deciding whether or + * not to activate a row on single click, let's wait and see if a row expands or + * collapses. + */ + void maybe_activate_on_idle (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *col) + { + row_collapsed_or_expanded = false; + Blah * blah = (Blah*) g_new (Blah, 1); + blah->view = view; + blah->path = path; + blah->col = col; + g_idle_add (maybe_activate_on_idle_idle, blah); + } +} gboolean HeaderPane :: on_button_pressed (GtkWidget * treeview, GdkEventButton *event, gpointer userdata) @@ -1044,6 +1085,7 @@ && (event->type == GDK_BUTTON_RELEASE) && (event->button == 1) && (event->window == gtk_tree_view_get_bin_window (GTK_TREE_VIEW(treeview))) + && (event->send_event == false) && !(event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK))) { GtkTreePath * path; @@ -1053,14 +1095,7 @@ (gint) event->x, (gint) event->y, &path, &col, &cell_x, &cell_y)) - { - // get the cell area to make sure they didn't click on an expander. - // GdkRectangle rect; - // gtk_tree_view_get_cell_area (GTK_TREE_VIEW(treeview), path, col, &rect); - // if (rect.x<=cell_x && cell_x<(rect.x+rect.width) && rect.y<=cell_y && cell_y<(rect.y+rect.height)) - gtk_tree_view_row_activated (GTK_TREE_VIEW(treeview), path, col); - gtk_tree_path_free(path); - } + maybe_activate_on_idle (GTK_TREE_VIEW(treeview), path, col); } return false; @@ -1602,6 +1637,8 @@ g_signal_connect (_tree_view, "button-release-event", G_CALLBACK(on_button_pressed), this); g_signal_connect (_tree_view, "button-press-event", G_CALLBACK(on_button_pressed), this); + g_signal_connect (_tree_view, "row-collapsed", G_CALLBACK(row_collapsed_or_expanded_cb), NULL); + g_signal_connect (_tree_view, "row-expanded", G_CALLBACK(row_collapsed_or_expanded_cb), NULL); g_signal_connect (_tree_view, "popup-menu", G_CALLBACK(on_popup_menu), this); g_signal_connect (_tree_view, "row-activated", G_CALLBACK(on_row_activated), this); GtkWidget * scroll = gtk_scrolled_window_new (0, 0); Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pan.spec 14 May 2006 04:12:20 -0000 1.15 +++ pan.spec 16 May 2006 10:57:22 -0000 1.16 @@ -1,12 +1,13 @@ Summary: A GNOME/GTK+ news reader for X Name: pan Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 Patch0: pan-0.97-crash-on-shutdown.patch +Patch1: pan-0.97-tree-expanders.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -28,6 +29,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p0 echo "StartupNotify=true" >> pan.desktop @@ -72,6 +74,9 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Tue May 16 2006 Michael A. Peters - 1:0.97-2 +- Added pan-0.97-tree-expanders.patch from upstream + * Sat May 13 2006 Michael A. Peters - 1:0.97-1 - Update to 0.97 (previous patches no longer needed) - Patch pan-0.97-crash-on-shutdown.patch from upstream added From fedora-extras-commits at redhat.com Tue May 16 10:57:59 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 16 May 2006 03:57:59 -0700 Subject: rpms/bzflag/devel .cvsignore, 1.5, 1.6 bzflag.spec, 1.25, 1.26 sources, 1.5, 1.6 Message-ID: <200605161058.k4GAw1JB011747@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11724 Modified Files: .cvsignore bzflag.spec sources Log Message: version 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 May 2006 16:45:51 -0000 1.5 +++ .cvsignore 16 May 2006 10:57:59 -0000 1.6 @@ -1 +1 @@ -bzflag-2.0.6.tar.bz2 +bzflag-2.0.8.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- bzflag.spec 15 May 2006 07:00:50 -0000 1.25 +++ bzflag.spec 16 May 2006 10:57:59 -0000 1.26 @@ -1,4 +1,7 @@ +#### options: # Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: %if 0%{?fedora} %if 0%{?fedora} < 5 # default to non-modular X on FC < 5 @@ -17,7 +20,7 @@ Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.6 +Version: 2.0.8 Release: 1%{?dist} License: GPL Group: Amusements/Games @@ -98,7 +101,10 @@ %{_mandir}/man*/* %changelog -* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +* Tue May 16 2006 Nils Philippsen 2.0.8-1 +- version 2.0.8 + +* Fri May 12 2006 Nils Philippsen 2.0.6-1 - automatically decide between modular/traditional X depending on %%fedora * Thu May 11 2006 Nils Philippsen Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 May 2006 16:45:51 -0000 1.5 +++ sources 16 May 2006 10:57:59 -0000 1.6 @@ -1 +1 @@ -5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 +7963cc1de7144e76a9426b6f23d7c2c8 bzflag-2.0.8.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 10:59:20 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 16 May 2006 03:59:20 -0700 Subject: rpms/bzflag/FC-5 .cvsignore, 1.5, 1.6 bzflag.spec, 1.24, 1.25 sources, 1.5, 1.6 Message-ID: <200605161059.k4GAxMWO011821@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11798 Modified Files: .cvsignore bzflag.spec sources Log Message: version 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 May 2006 16:54:47 -0000 1.5 +++ .cvsignore 16 May 2006 10:59:20 -0000 1.6 @@ -1 +1 @@ -bzflag-2.0.6.tar.bz2 +bzflag-2.0.8.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- bzflag.spec 12 May 2006 08:26:51 -0000 1.24 +++ bzflag.spec 16 May 2006 10:59:20 -0000 1.25 @@ -1,5 +1,7 @@ +#### options: # Use --with/--without modular_X to rebuild with/without modular X deps +#### default options: %if 0%{?fedora} %if 0%{?fedora} < 5 # default to non-modular X on FC < 5 @@ -18,7 +20,7 @@ Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.6 +Version: 2.0.8 Release: 1%{?dist} License: GPL Group: Amusements/Games @@ -99,7 +101,10 @@ %{_mandir}/man*/* %changelog -* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +* Tue May 16 2006 Nils Philippsen 2.0.8-1 +- version 2.0.8 + +* Fri May 12 2006 Nils Philippsen 2.0.6-1 - automatically decide between modular/traditional X depending on %%fedora * Thu May 11 2006 Nils Philippsen Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 May 2006 16:54:47 -0000 1.5 +++ sources 16 May 2006 10:59:20 -0000 1.6 @@ -1 +1 @@ -5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 +7963cc1de7144e76a9426b6f23d7c2c8 bzflag-2.0.8.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 10:59:50 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 16 May 2006 03:59:50 -0700 Subject: rpms/bzflag/FC-4 .cvsignore, 1.5, 1.6 bzflag.spec, 1.21, 1.22 sources, 1.5, 1.6 Message-ID: <200605161059.k4GAxqNL011886@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/bzflag/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11865 Modified Files: .cvsignore bzflag.spec sources Log Message: version 2.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 May 2006 16:57:04 -0000 1.5 +++ .cvsignore 16 May 2006 10:59:50 -0000 1.6 @@ -1 +1 @@ -bzflag-2.0.6.tar.bz2 +bzflag-2.0.8.tar.bz2 Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bzflag.spec 12 May 2006 08:27:59 -0000 1.21 +++ bzflag.spec 16 May 2006 10:59:50 -0000 1.22 @@ -1,5 +1,7 @@ +#### options: # Use --with/--without modular_X to rebuild with/without modular X deps +#### default options: %if 0%{?fedora} %if 0%{?fedora} < 5 # default to non-modular X on FC < 5 @@ -18,7 +20,7 @@ Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.0.6 +Version: 2.0.8 Release: 1%{?dist} License: GPL Group: Amusements/Games @@ -99,7 +101,10 @@ %{_mandir}/man*/* %changelog -* Fri May 12 2006 Nils Philippsen 2.0.6-1%{?dist} +* Tue May 16 2006 Nils Philippsen 2.0.8-1 +- version 2.0.8 + +* Fri May 12 2006 Nils Philippsen 2.0.6-1 - automatically decide between modular/traditional X depending on %%fedora * Thu May 11 2006 Nils Philippsen Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzflag/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 May 2006 16:57:04 -0000 1.5 +++ sources 16 May 2006 10:59:50 -0000 1.6 @@ -1 +1 @@ -5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 +7963cc1de7144e76a9426b6f23d7c2c8 bzflag-2.0.8.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 14:03:32 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 16 May 2006 07:03:32 -0700 Subject: rpms/kchmviewer/devel kchmviewer.spec,1.1,1.2 Message-ID: <200605161403.k4GE3YRI022125@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22108 Modified Files: kchmviewer.spec Log Message: * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kchmviewer.spec 1 May 2006 08:35:31 -0000 1.1 +++ kchmviewer.spec 16 May 2006 14:03:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: kchmviewer Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: CHM viewer Group: Applications/Publishing @@ -64,7 +64,8 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - kio-msits/kchmviewer.desktop + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop %clean @@ -84,10 +85,12 @@ %{_datadir}/pixmaps/* %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la -%{_datadir}/applnk/kchmviewer.desktop %{_datadir}/services/msits.protocol %changelog +* Tue May 16 2006 Patrice Dumas 2.0-4 +- remove the old menu entry file from /usr/share/applnk/ + * Mon Mar 13 2006 Patrice Dumas 2.0-3 - use update-desktop-database From fedora-extras-commits at redhat.com Tue May 16 15:09:12 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 16 May 2006 08:09:12 -0700 Subject: rpms/stellarium/FC-4 stellarium.spec,1.15,1.16 Message-ID: <200605161509.k4GF9EfG025733@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25716 Modified Files: stellarium.spec Log Message: bump release caused by demaged binary RPM Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- stellarium.spec 8 May 2006 17:18:36 -0000 1.15 +++ stellarium.spec 16 May 2006 15:09:11 -0000 1.16 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -78,6 +78,9 @@ %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf %changelog +* Tue May 16 2006 Jochen Schmitt 0.8.0-3 +- Rebuilt + * Mon May 8 2006 Jochen Schmitt 0.8.0-2 - New upstream release From fedora-extras-commits at redhat.com Tue May 16 15:41:59 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:41:59 -0700 Subject: rpms/gaim-gaym - New directory Message-ID: <200605161542.k4GFg1Ax026268@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26242/gaim-gaym Log Message: Directory /cvs/extras/rpms/gaim-gaym added to the repository From fedora-extras-commits at redhat.com Tue May 16 15:41:59 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:41:59 -0700 Subject: rpms/gaim-gaym/devel - New directory Message-ID: <200605161542.k4GFg1Ni026271@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26242/gaim-gaym/devel Log Message: Directory /cvs/extras/rpms/gaim-gaym/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 15:42:13 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:42:13 -0700 Subject: rpms/gaim-gaym Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161542.k4GFgFFo026322@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26287 Added Files: Makefile import.log Log Message: Setup of module gaim-gaym --- NEW FILE Makefile --- # Top level Makefile for module gaim-gaym all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 15:42:13 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:42:13 -0700 Subject: rpms/gaim-gaym/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161542.k4GFgFPd026325@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26287/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gaim-gaym --- NEW 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 May 16 15:43:15 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:43:15 -0700 Subject: rpms/gaim-gaym import.log,1.1,1.2 Message-ID: <200605161543.k4GFhlrH026396@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26360 Modified Files: import.log Log Message: auto-import gaim-gaym-0.96-2.fc5 on branch devel from gaim-gaym-0.96-2.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 15:42:12 -0000 1.1 +++ import.log 16 May 2006 15:43:15 -0000 1.2 @@ -0,0 +1 @@ +gaim-gaym-0_96-2_fc5:HEAD:gaim-gaym-0.96-2.fc5.src.rpm:1147794192 From fedora-extras-commits at redhat.com Tue May 16 15:43:16 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:43:16 -0700 Subject: rpms/gaim-gaym/devel gaim-gaym.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161543.k4GFhmXT026400@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26360/devel Modified Files: .cvsignore sources Added Files: gaim-gaym.spec Log Message: auto-import gaim-gaym-0.96-2.fc5 on branch devel from gaim-gaym-0.96-2.fc5.src.rpm --- NEW FILE gaim-gaym.spec --- # $Id$ # make sure we require the correct versions of gaim %define gaim_min 1:%(pkg-config --modversion gaim | awk -F- '{ print $1 }') %define gaim_max 1:2.0.0 Name: gaim-gaym Version: 0.96 Release: 2%{?dist} Summary: A gay.com protocol plugin for gaim Group: Applications/Internet License: GPL URL: http://groups.yahoo.com/group/gaymplugin/ Source0: http://download.berlios.de/qrc/qrc-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim < %{gaim_max}, gtk2-devel Requires: gaim >= %{gaim_min}, gaim < %{gaim_max} %description This package provides a protocol plugin for the popular instant messaging program, gaim. If you want to be able to chat on gay.com via gaim, install this package. This package will work with gaim versions greater than or equal to %{gaim_min} and less than %{gaim_max}. %prep %setup -q -n qrc-%{version} %build %configure --enable-display_options make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) # AUTHORS and NEWS left out, as they're empty in this version # README.svn and README.mingw pertain to devel & win32 issues %doc ChangeLog COPYING INSTALL README TODO %{_libdir}/gaim/*.so %{_datadir}/pixmaps/gaim/gaym %{_datadir}/pixmaps/gaim/status/default/* %exclude %{_libdir}/gaim/*.la %changelog * Mon May 8 2006 Chris Weyl 0.96-2 - dropped explicit requires: gtk2 * Sat May 6 2006 Chris Weyl 0.96-1 - new spec file from f-e template Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 15:42:13 -0000 1.1 +++ .cvsignore 16 May 2006 15:43:16 -0000 1.2 @@ -0,0 +1 @@ +qrc-0.96.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 15:42:13 -0000 1.1 +++ sources 16 May 2006 15:43:16 -0000 1.2 @@ -0,0 +1 @@ +f846fdc07c2e38e74f8e27c58cdde37a qrc-0.96.tgz From fedora-extras-commits at redhat.com Tue May 16 15:44:45 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:44:45 -0700 Subject: extras-buildsys/common SSLCommon.py,1.13,1.14 Message-ID: <200605161544.k4GFijgw026452@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26434/common Modified Files: SSLCommon.py Log Message: Remove unused import Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- SSLCommon.py 12 Mar 2006 05:44:24 -0000 1.13 +++ SSLCommon.py 16 May 2006 15:44:42 -0000 1.14 @@ -15,7 +15,6 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import os, sys -import CommonErrors from OpenSSL import SSL import SSLConnection import httplib From fedora-extras-commits at redhat.com Tue May 16 15:47:21 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:47:21 -0700 Subject: extras-buildsys/common XMLRPCServerProxy.py,1.9,1.10 Message-ID: <200605161547.k4GFlLk1026562@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26503/common Modified Files: XMLRPCServerProxy.py Log Message: 2006-05-16 Dan Williams * common/XMLRPCServerProxy.py - Add cancellation ability to requests Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- XMLRPCServerProxy.py 15 Feb 2006 17:07:07 -0000 1.9 +++ XMLRPCServerProxy.py 16 May 2006 15:47:13 -0000 1.10 @@ -28,6 +28,7 @@ def __init__(self, ssl_context, timeout=None): self.ssl_ctx=ssl_context self._timeout = timeout + self._https = None def make_connection(self, host): # Handle username and password. @@ -37,17 +38,44 @@ # Yay for Python 2.2 pass _host, _port = urllib.splitport(host) - return SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout) + self._https = SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout) + return self._https + + def close(self): + if self._https: + self._https.close() + self._https = None + + +class Plg_ClosableTransport(xmlrpclib.Transport): + """Override make_connection so we can close it.""" + def __init__(self): + self._http = None + + def make_connection(self, host): + # create a HTTP connection object from a host descriptor + import httplib + host, extra_headers, x509 = self.get_host_info(host) + self._http = httplib.HTTP(host) + return self._http + + def close(self): + if self._http: + self._http.close() + self._http = None class PlgXMLRPCServerProxy(xmlrpclib.ServerProxy): def __init__(self, uri, certs, timeout=None): if certs and len(certs) > 0: self.ctx = SSLCommon.CreateSSLContext(certs) - xmlrpclib.ServerProxy.__init__(self, uri, PlgSSL_Transport(ssl_context=self.ctx, timeout=timeout)) + self._transport = PlgSSL_Transport(ssl_context=self.ctx, timeout=timeout) else: - xmlrpclib.ServerProxy.__init__(self, uri) + self._transport = Plg_ClosableTransport() + xmlrpclib.ServerProxy.__init__(self, uri, transport=self._transport) + def cancel(self): + self._transport.close() ########################################################### From fedora-extras-commits at redhat.com Tue May 16 15:47:15 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:47:15 -0700 Subject: extras-buildsys ChangeLog,1.198,1.199 Message-ID: <200605161547.k4GFlkY9026565@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26503 Modified Files: ChangeLog Log Message: 2006-05-16 Dan Williams * common/XMLRPCServerProxy.py - Add cancellation ability to requests Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- ChangeLog 15 May 2006 17:26:44 -0000 1.198 +++ ChangeLog 16 May 2006 15:47:13 -0000 1.199 @@ -1,3 +1,8 @@ +2006-05-16 Dan Williams + + * common/XMLRPCServerProxy.py + - Add cancellation ability to requests + 2006-05-15 Dan Williams * builder/Builder.py From fedora-extras-commits at redhat.com Tue May 16 15:48:29 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:48:29 -0700 Subject: extras-buildsys/builder main.py,1.3,1.4 Message-ID: <200605161548.k4GFmTp6026589@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26571/builder Modified Files: main.py Log Message: Catch exceptions creating builder objects Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/main.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- main.py 14 May 2006 05:43:06 -0000 1.3 +++ main.py 16 May 2006 15:48:26 -0000 1.4 @@ -20,6 +20,7 @@ import time import sys import signal +import socket from plague import ArchUtils from plague import daemonize from optparse import OptionParser @@ -194,7 +195,11 @@ signal.signal(signal.SIGTERM, exit_handler) global builder - builder = Builder.Builder.new_builder(cfg, btype) + try: + builder = Builder.Builder.new_builder(cfg, btype) + except socket.error, exc: + print exc[1] + os._exit(1) # Start doing stuff builder.work() From fedora-extras-commits at redhat.com Tue May 16 15:49:33 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 08:49:33 -0700 Subject: owners owners.list,1.1004,1.1005 Message-ID: <200605161549.k4GFnZAX026614@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597 Modified Files: owners.list Log Message: Added entry for package gaim-gaym Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1004 retrieving revision 1.1005 diff -u -r1.1004 -r1.1005 --- owners.list 16 May 2006 07:08:34 -0000 1.1004 +++ owners.list 16 May 2006 15:49:33 -0000 1.1005 @@ -316,6 +316,7 @@ Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|gaim-gaym|gay.com protocol plugin for GAIM|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org| Fedora Extras|gaim-guifications|Guifications plugin for GAIM|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xtdnet.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 15:49:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:49:58 -0700 Subject: extras-buildsys/builder Builder.py, 1.13, 1.14 BuilderMock.py, 1.7, 1.8 Message-ID: <200605161549.k4GFnwah026675@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26625/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-16 Dan Williams * Make passive builders work somewhat more; there are still some bugs in command processing though. 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 15 May 2006 17:26:45 -0000 1.13 +++ Builder.py 16 May 2006 15:49:50 -0000 1.14 @@ -235,7 +235,9 @@ def _dispatch_server_command(self, cmd): """Process a single command from the server.""" - if isinstance(cmd, Commands.PlgCommandNewJobReq): + if isinstance(cmd, Commands.PlgCommandKillJob): + self._handle_kill_job_command(cmd) + elif isinstance(cmd, Commands.PlgCommandNewJobReq): (uniqid, msg) = self._start_new_job(cmd) ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next()) self._queued_cmds.append(ack) @@ -249,8 +251,6 @@ reply = self._handle_job_files_request(cmd) if reply: self._queued_cmds.append(reply) - elif isinstance(cmd, Commands.PlgCommandKillJob): - self._handle_kill_job_command(cmd) def _process_server_commands(self, cmd_list): """Process the server's command stream.""" @@ -347,8 +347,12 @@ def _handle_kill_job_command(self, cmd): try: uniqid = cmd.archjob_id() - job = self._all_jobs[uniqid] - job.die() + archjob = self._all_jobs[uniqid] + archjob.die() + self._building_jobs_lock.acquire() + if archjob in self._building_jobs: + self._building_jobs.remove(archjob) + self._building_jobs_lock.release() except KeyError: pass @@ -378,14 +382,18 @@ """Startup HTTP and XML-RPC servers which the build server uses to talk to us.""" hostname = get_hostname(self._cfg, bind_all=True) - self._log("Binding to address '%s'\n" % hostname) + xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") + + self._log("Binding to address '%s:%d'\n" % (hostname, xmlrpc_port)) port = self._cfg.get_int("Passive", "fileserver_port") - self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), - self._work_dir, self._certs) + try: + self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), + self._work_dir, self._certs) + except socket.error, exc: + raise socket.error(exc[0], "Couldn't create server for %s:%s: '%s'" % (hostname, port, exc[1])) self._http_server.set_POST_handler('/upload', self.upload_callback) - xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") try: if self._use_ssl: self._xmlrpc_server = AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) @@ -471,8 +479,7 @@ def request(self, cmd_list): """Main XML-RPC handler, called by the build server. Dispatches the build server's requests and returns our response.""" - cmds = Commands.deserialize_command_stream(cmd_list) - self._process_server_commands(cmds) + self._process_server_commands(cmd_list) cmds_for_server = self._get_default_commands() cmds_for_server = cmds_for_server + self._queued_cmds self._queued_cmds = [] @@ -532,6 +539,27 @@ ul_callback(result, cb_data, msg) return None + def _handle_job_files_request(self, cmd): + """Return a list of urls of the result files of this job.""" + archjob_id = cmd.archjob_id() + try: + job = self._all_jobs[archjob_id] + except KeyError: + return None + + # url-ify the file list + urls = [] + work_dir = self._get_workdir_for_job(job.uniqid()) + port = "%s" % self._cfg.get_int("Network", "fileserver_port") + host = prefix_url(get_hostname(self._cfg)) + for fpath in job.files(): + if not fpath.startswith(work_dir): + return None + file_part = urllib.quote(fpath[len(work_dir) + 1:]) + full_url = "%s:%s/%s" % (host, port, file_part) + urls.append(full_url) + return Commands.PlgCommandJobFilesAck(archjob_id, urls, cmd.seq(), self._seq_gen.next()) + # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- BuilderMock.py 15 May 2006 17:26:45 -0000 1.7 +++ BuilderMock.py 16 May 2006 15:49:50 -0000 1.8 @@ -36,21 +36,6 @@ from plague import FileTransfer -def get_url_for_file(cfg, file_path): - """ Return a URL pointing to a particular file in our work dir """ - - # Ensure the file we're turning into a URL lives in our builder work dir - work_dir = cfg.get_str("Directories", "builder_work_dir") - if not file_path.startswith(work_dir): - return None - file_part = file_path[len(work_dir) + 1:] - port = "%s" % cfg.get_int("Network", "fileserver_port") - hostname = Builder.get_hostname(cfg) - full_url = "%s:%s/%s" % (hostname, port, file_part) - full_url = Builder.prefix_url(full_url, cfg.get_bool("SSL", "use_ssl")) - return urllib.quote(full_url) - - class BuilderMock(threading.Thread): """puts things together for an arch - baseclass for handling builds for other arches""" From fedora-extras-commits at redhat.com Tue May 16 15:49:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:49:59 -0700 Subject: extras-buildsys/server Builder.py, 1.41, 1.42 BuilderManager.py, 1.25, 1.26 Message-ID: <200605161550.k4GFnxpK026681@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26625/server Modified Files: Builder.py BuilderManager.py Log Message: 2006-05-16 Dan Williams * Make passive builders work somewhat more; there are still some bugs in command processing though. Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Builder.py 14 May 2006 05:43:07 -0000 1.41 +++ Builder.py 16 May 2006 15:49:56 -0000 1.42 @@ -62,6 +62,7 @@ self._suspend_listeners = [] self._status_listeners = [] self._ip = None + self._last_contact = 0 uri, rest = urllib.splittype(address) host, ignore = urllib.splithost(rest) @@ -359,31 +360,37 @@ # HACK: This class is a hack to work around SSL hanging issues, # which cause the whole server to grind to a halt -class BuildingJobsCheck(threading.Thread): - def __init__(self, server, address): - self._server = server +class PassiveBuilderRequest(threading.Thread): + def __init__(self, address, certs, cmds): self._address = address - + self._certs = certs + self._cmds = cmds self.done = False - self.failed = False - + self.failed = True + self.response = None + self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, self._certs, timeout=20) threading.Thread.__init__(self) def run(self): - self.setName("BuildingJobsCheck: %s" % self._address) - jobs = {} - free_slots = 0 + self.setName("PassiveBuilderRequest: %s" % self._address) try: - (jobs, free_slots) = self._server.building_jobs() - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): - self.failed = True - except xmlrpclib.Fault, exc: - print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self._address, exc) - self.failed = True - self.jobs = jobs - self.free_slots = free_slots + cmd_stream = Commands.serialize_to_command_stream(self._cmds) + self.response = self._server.request(cmd_stream) + self.failed = False + except (socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, + xmlrpclib.ProtocolError, xmlrpclib.Fault), exc: + print "PassiveBuilder(%s) Error in request(): '%s'" % (self._address, exc) + except socket.error, exc: + if exc[0] != 111: + print "PassiveBuilder(%s) Error in request(): '%s'" % (self._address, exc) self.done = True + def close(self): + try: + self._server.close() + except: + pass + class PassiveBuilder(Builder): """ Passive builders are ones that do not initiate connections. They @@ -391,223 +398,165 @@ a firewall without having holes punched through it. """ - _BUILDER_PING_INTERVAL = 60 * 5 # In seconds + # How often we try to contact unavailable builders + _BUILDER_UNAVAIL_PING_INTERVAL = 300 # 5 minutes (in seconds) - def __init__(self, manager, cfg, address, weight, btype): - Builder.__init__(self, manager, cfg, address, weight, btype) + # How often we try to contact available builders + _BUILDER_AVAIL_PING_INTERVAL = 20 - self._ping_timeout = 0 - self._cur_ping_interval = self._BUILDER_PING_INTERVAL - self._ping_now = False + def __init__(self, manager, cfg, address, weight): + Builder.__init__(self, manager, cfg, address, weight, TYPE_PASSIVE) + # Builder will get pinged immediately since self._last_contact == 0 + self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL - certs = None + self._certs = None if self._server_cfg.get_bool("Builders", "use_ssl"): - certs = {} - certs['key_and_cert'] = self._server_cfg.get_str("SSL", "server_key_and_cert") - certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") - certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") - - self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20) - self._server_lock = threading.Lock() - - (self._available, target_list) = self._ping_builder() - if self._available: - self._init_builder(target_list) - else: - # Treat the builder as timed out and ping it periodically - self._ping_timeout = time.time() - self._suspend_reason = SUSPEND_TIMEOUT - - def _ping_builder(self): - target_list = [] - try: - target_list = self._server.supported_targets() - alive = True - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): - alive = False - except xmlrpclib.Fault, exc: - print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, exc) - alive = False - return (alive, target_list) - - def _init_builder(self, target_list): - self._target_list = target_list - # Kill any jobs currently running on the builder - jobs = self._building_jobs() - for jobid in jobs.keys(): - try: - self._server.die(jobid) - except: - pass - - self._num_slots = self._get_num_slots() + self._certs = {} + self._certs['key_and_cert'] = self._server_cfg.get_str("SSL", "server_key_and_cert") + self._certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + self._certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + + def _send_commands(self): + """Send queued commands to the builder, and then get it's list + of reply commands.""" - def _get_num_slots(self): - num_slots = self._num_slots - try: - num_slots = self._server.num_slots() - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError): - pass - except xmlrpclib.Fault, exc: - print "Builder Error (%s) in _get_num_slots(): builder replied '%s'" % (self._address, exc) - return num_slots + # Grab some work for the builder if any is available + new_cmds = [] + if self._free_slots > 0: + archjob = self._manager.claim_arch_job(self) + if archjob: + next_seq = self._seq_gen.next() + cmd = Commands.PlgCommandNewJobReq(archjob, seq=next_seq) + new_cmds.append(cmd) - def _building_jobs(self): - bjc = BuildingJobsCheck(self._server, self._address) + # Copy command queue + self._lock.acquire() + self._cmd_queue = self._cmd_queue + new_cmds + cmd_list = self._cmd_queue + # FIXME: deal with keeping ack-requiring cmds around + self._cmd_queue = [] + self._lock.release() + # The actual XML-RPC request runs in a different thread because SSL + # calls sometimes hang + req = PassiveBuilderRequest(self._address, self._certs, cmd_list) curtime = time.time() - bjc.start() + req.start() - # Give the check 10s, otherwise screw it - while time.time() - curtime < 10: - if bjc.done: + # Give the request 10s, otherwise forget about it + while time.time() < curtime + 10: + if req.done: break time.sleep(0.5) - if bjc.done: - if not bjc.failed: - self._unavail_count = 0 - self._available = True - self._free_slots = bjc.free_slots - return bjc.jobs - else: - # Error of some kind - self._unavail_count = self._unavail_count + 1 + # If the request isn't done yet, force-close it to + # minimize chances of the commands getting through + # to the builder + if not req.done: + req.cancel() + + response = None + if req.failed: + # Put all the commands back at the front of the queue + self._lock.acquire() + self._cmd_queue = cmd_list + self._cmd_queue + self._lock.release() else: - self._unavail_count = self._unavail_count + 1 - - return {} - - def ping_asap(self): - # Reduce the ping interval to ping the builder right away - self._cur_ping_interval = 0 - self._ping_now = True + response = req.response + return response - def _handle_builder_suspend(self, reason, msg): - Builder._handle_builder_suspend(self, reason, msg) - # Reset current ping interval to default - self._cur_ping_interval = self._BUILDER_PING_INTERVAL - self._ping_timeout = time.time() - - def _handle_builder_reactivate(self): - Builder._handle_builder_reactivate(self) - self._ping_timeout = 0 - self._init_builder(target_list) + def _dispatch_command(self, cmd, first_contact): + """Dispatch one command. We let the superclass dispatch the common + commands, and handle only those that need action specific to the + Passive builder type.""" - def start_job(self, req): - if not self.available(): - raise RuntimeError - if not self.can_build_request(req): - raise RuntimeError + # The first time we contact the builder, we need to tell it to kill + # all jobs that are building on it. So don't let the superclass + # handle the first BuildingJobs command we get + handled = False + if first_contact and isinstance(cmd, Commands.PlgCommandBuildingJobs): + # Tell the builder to kill all jobs it might be building + # right now. Think server restart here. + for item in cmd.jobs(): + (uniqid, status) = cmd.get_job(item) + cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) + self._cmd_queue.append(cmd) + handled = True - self._server_lock.acquire() - try: - # Builder will return jobid of 0 if it can't start the job for some reason - srpm_url = req.srpm_url() - target_dict = req.target_dict() - jobid = self._server.start_new_job(target_dict, req.srpm_url()) - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, \ - OpenSSL.SSL.Error, xmlrpclib.ProtocolError, xmlrpclib.Fault), exc: - error_class = str(exc.__class__) - error_string = str(exc) - jobarch = target_dict['arch'] - parent = req.parent() - print "%s (%s/%s): %s exception '%s' starting job on %s" % (parent.uid, \ - parent.package, jobarch, error_class, error_string, \ - self._address) - # Check for hard errors, for which we suspend the builder - if error_string.find("OSError") >= 0 and error_string.find("Errno") >= 0: - self._handle_builder_suspend(SUSPEND_HARD_ERROR, error_string) - time.sleep(0.5) - jobid = 0 + # Let the superclass handle what's left + if not handled: + handled = self._dispatch_common_command(cmd) - if jobid == 0: - self._server_lock.release() - raise RuntimeError - - job = ArchJob.ArchJob(self, self._server_cfg, self._server, parent, jobid, target_dict) - self._jobs[jobid] = job - self._update_building_jobs() - self._server_lock.release() - return job - - def _update_building_jobs(self): - jobs = self._building_jobs() - - # Update status for all jobs on this builder - if self._unavail_count == 0: - builder_jobs = [] - for jobid in jobs.keys(): - try: - job = self._jobs[jobid] - status = jobs[jobid] - job.set_builder_status(self, status) - builder_jobs.append(jobid) - except KeyError: - pass - - # We have to check jobs that weren't reported - # as 'building' by the builder, since the job - # may have finished on the builder and was - # removed from the building job list before we - # were able to know that it was done. HACK - self._prepping_jobs = False - for jobid in self._jobs.keys(): - # If the builder didn't report this job as building, - # and its not done, explicitly grab its status - job = self._jobs[jobid] - if jobid not in builder_jobs and job.status() != 'done': - status = self._get_builder_job_status(jobid) - if status: - job.set_builder_status(self, status) - - # Check for prepping jobs - if job.prepping(): - self._prepping_jobs = True - - def _get_builder_job_status(self, jobid): - """ Get the status of one job on the builder """ - status = None - try: - status = self._server.job_status(jobid) - except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error): - pass - except (xmlrpclib.Fault, xmlrpclib.ProtocolError): - pass - return status + # The we handle what the superclass didn't + if not handled: + if isinstance(cmd, Commands.PlgCommandJobFilesAck): + self._handle_job_files_ack(cmd) + handled = True + elif isinstance(cmd, Commands.PlgCommandTargets): + if not self._target_list: + self._target_list = cmd.targets() + + if not handled: + print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) + _SLEEP_INTERVAL = 5 def run(self): + """foobar""" DebugUtils.registerThreadName(self) while not self._stop: - self._server_lock.acquire() - - if self._available: - self._update_building_jobs() + if self._last_contact < time.time() - self._ping_interval: + # Ensure the builder's IP is up-to-date + self._get_ip() + + # Try to talk to the builder + print "builder contact" + cmd_list = self._send_commands() + if cmd_list: + # Builder is alive + first_contact = False + if not self._available: + self._handle_builder_reactivate() + first_contact = True + self._unavail_count = 0 - if self._unavail_count > 2: - # Kill all jobs on the client if it went away - self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") + # process builder's response + cmds = Commands.deserialize_command_stream(cmd_list) + for cmd in cmds: + self._dispatch_command(cmd, first_contact) else: - # Update status of all archjobs on this builder - for j in self._jobs.values(): - j.process() - elif not self._available and (self._suspend_reason == SUSPEND_TIMEOUT or self._ping_now): - # Ping the builder every so often to see if it responds again - if time.time() > (self._ping_timeout + self._cur_ping_interval): - (alive, target_list) = self._ping_builder() - if alive: - self._handle_builder_reactivate() - else: - # Wait and ping again - self._ping_timeout = time.time() + # Builder didn't respond + self._lock.acquire() + self._unavail_count = self._unavail_count + 1 + if self._available and self._unavail_count > 2: + self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out") + self._lock.release() + self._last_contact = time.time() - # Reset current ping interval to default - self._cur_ping_interval = self._BUILDER_PING_INTERVAL - self._ping_now = False + time.sleep(self._SLEEP_INTERVAL) - self._server_lock.release() + def _handle_builder_suspend(self, reason, msg): + Builder._handle_builder_suspend(self, reason, msg) + self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL + self._ip = None + self._target_list = None + # Set free slots to zero so we don't send the + # builder a job on first contact + self._free_slots = 0 - time.sleep(20) + # Clear out the command queue; we start clean + self._cmd_queue = [] + + def _handle_builder_reactivate(self): + mail = True + if self._suspend_reason == SUSPEND_NONE: + # Don't send mail saying the builder has been reactivated if + # this is the first time the builder has contacted us + mail = False + + self._ping_interval = self._BUILDER_AVAIL_PING_INTERVAL + self._lock.acquire() + Builder._handle_builder_reactivate(self, mail=mail) + self._lock.release() class ActiveBuilder(Builder): @@ -619,9 +568,8 @@ _REQUIRED_CONTACT_INTERVAL = 25 - def __init__(self, manager, cfg, address, weight, btype): - Builder.__init__(self, manager, cfg, address, weight, btype) - self._last_contact = 0 + def __init__(self, manager, cfg, address, weight): + Builder.__init__(self, manager, cfg, address, weight, TYPE_ACTIVE) def _init_builder(self, target_list): self._target_list = target_list Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- BuilderManager.py 14 May 2006 05:43:07 -0000 1.25 +++ BuilderManager.py 16 May 2006 15:49:56 -0000 1.26 @@ -280,9 +280,9 @@ # Add the builder to our build list if btype == Builder.TYPE_ACTIVE: - builder = Builder.ActiveBuilder(self, self._cfg, address, weight, btype) + builder = Builder.ActiveBuilder(self, self._cfg, address, weight) else: - builder = Builder.PassiveBuilder(self, self._cfg, address, weight, btype) + builder = Builder.PassiveBuilder(self, self._cfg, address, weight) builder.start() self._builders.append(builder) self._builders_lock.release() From fedora-extras-commits at redhat.com Tue May 16 15:49:52 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 16 May 2006 08:49:52 -0700 Subject: extras-buildsys ChangeLog,1.199,1.200 Message-ID: <200605161550.k4GFoMlL026690@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26625 Modified Files: ChangeLog Log Message: 2006-05-16 Dan Williams * Make passive builders work somewhat more; there are still some bugs in command processing though. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- ChangeLog 16 May 2006 15:47:13 -0000 1.199 +++ ChangeLog 16 May 2006 15:49:50 -0000 1.200 @@ -1,5 +1,10 @@ 2006-05-16 Dan Williams + * Make passive builders work somewhat more; there are still some bugs + in command processing though. + +2006-05-16 Dan Williams + * common/XMLRPCServerProxy.py - Add cancellation ability to requests From fedora-extras-commits at redhat.com Tue May 16 15:51:33 2006 From: fedora-extras-commits at redhat.com (Noa Resare (noa)) Date: Tue, 16 May 2006 08:51:33 -0700 Subject: rpms/vorbisgain/FC-5 vorbisgain.spec,1.1,1.2 Message-ID: <200605161551.k4GFpZ8E026740@cvs-int.fedora.redhat.com> Author: noa Update of /cvs/extras/rpms/vorbisgain/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26723 Modified Files: vorbisgain.spec Log Message: bumped version to satisfy the build system Index: vorbisgain.spec =================================================================== RCS file: /cvs/extras/rpms/vorbisgain/FC-5/vorbisgain.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vorbisgain.spec 14 May 2006 16:12:55 -0000 1.1 +++ vorbisgain.spec 16 May 2006 15:51:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: vorbisgain Version: 0.34 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Adds tags to Ogg Vorbis files to adjust the volume Group: Applications/Multimedia @@ -43,5 +43,8 @@ %_mandir/man1/* %changelog +* Tue May 16 2006 Noa Resare 0.34-2 +- bumped release to make the wonderful build system happy + * Sat May 13 2006 Noa Resare 0.34-1 - Initial spec From fedora-extras-commits at redhat.com Tue May 16 15:52:34 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 May 2006 08:52:34 -0700 Subject: rpms/php-pecl-pdo/devel .cvsignore, 1.3, NONE Makefile, 1.1, NONE php-pecl-pdo.spec, 1.4, NONE sources, 1.3, NONE Message-ID: <200605161552.k4GFqaM9026841@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-pdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719/php-pecl-pdo/devel Removed Files: .cvsignore Makefile php-pecl-pdo.spec sources Log Message: Remove php-pecl-pdo and php-pecl-pdo-sqlite devel branches since they have been included as part of PHP since 5.1.x (see bug #181863). --- .cvsignore DELETED --- --- Makefile DELETED --- --- php-pecl-pdo.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue May 16 15:52:34 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 May 2006 08:52:34 -0700 Subject: rpms/php-pecl-pdo-sqlite/devel .cvsignore, 1.2, NONE Makefile, 1.1, NONE php-pecl-pdo-sqlite.spec, 1.4, NONE sources, 1.2, NONE Message-ID: <200605161552.k4GFqa41026845@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-pdo-sqlite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719/php-pecl-pdo-sqlite/devel Removed Files: .cvsignore Makefile php-pecl-pdo-sqlite.spec sources Log Message: Remove php-pecl-pdo and php-pecl-pdo-sqlite devel branches since they have been included as part of PHP since 5.1.x (see bug #181863). --- .cvsignore DELETED --- --- Makefile DELETED --- --- php-pecl-pdo-sqlite.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Tue May 16 16:14:24 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:14:24 -0700 Subject: rpms/gtklp - New directory Message-ID: <200605161614.k4GGEQXv029510@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29484/gtklp Log Message: Directory /cvs/extras/rpms/gtklp added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:14:25 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:14:25 -0700 Subject: rpms/gtklp/devel - New directory Message-ID: <200605161614.k4GGERlZ029513@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29484/gtklp/devel Log Message: Directory /cvs/extras/rpms/gtklp/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:14:46 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:14:46 -0700 Subject: rpms/gtklp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161614.k4GGEmv2029563@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29530 Added Files: Makefile import.log Log Message: Setup of module gtklp --- NEW FILE Makefile --- # Top level Makefile for module gtklp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 16:14:47 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:14:47 -0700 Subject: rpms/gtklp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161614.k4GGEnQU029566@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29530/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtklp --- NEW 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 May 16 16:16:11 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:16:11 -0700 Subject: rpms/gtklp import.log,1.1,1.2 Message-ID: <200605161616.k4GGGhbN029715@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640 Modified Files: import.log Log Message: auto-import gtklp-1.2.1-2 on branch devel from gtklp-1.2.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtklp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 16:14:46 -0000 1.1 +++ import.log 16 May 2006 16:16:11 -0000 1.2 @@ -0,0 +1 @@ +gtklp-1_2_1-2:HEAD:gtklp-1.2.1-2.src.rpm:1147796160 From fedora-extras-commits at redhat.com Tue May 16 16:16:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:16:12 -0700 Subject: rpms/gtklp/devel gtklp.png, NONE, 1.1 gtklp.spec, NONE, 1.1 gtklpq.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161616.k4GGGirn029719@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640/devel Modified Files: .cvsignore sources Added Files: gtklp.png gtklp.spec gtklpq.png Log Message: auto-import gtklp-1.2.1-2 on branch devel from gtklp-1.2.1-2.src.rpm --- NEW FILE gtklp.spec --- Name: gtklp Version: 1.2.1 Release: 2%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.1.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-devel BuildRequires: gtk2-devel BuildRequires: desktop-file-utils BuildRequires: gnutls-devel Requires: cups %description GtkLP for CUPS is a frontend for the lpr that comes with CUPS. It is written to make it easy to use nearly all the options from CUPS without knowing them by name. For print-admins, there is also an pretty simple queue tool implemented. %prep %setup -q %build %configure make %{_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications # remove some incorrect locales rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/cz rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/chs rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/cht %find_lang %{name} cat > gtklp.desktop < gtklpq.desktop < - 1.2.1-2 - cleaned up buildrequires - added %%{_smp_mflags} * Tue Mar 14 2006 Gerard Milmeister - 1.2.1-1 - new version 1.2.1 * Mon Feb 20 2006 Gerard Milmeister - 1.2.0-1 - new version 1.2.0 * Sun Dec 18 2005 Gerard Milmeister - 1.1.0-1 - New Version 1.1.0 * Mon Jun 20 2005 Gerard Milmeister - 1.0f-1 - New Version 1.0f * Sun Mar 13 2005 Gerard Milmeister - 1.0c-1 - New Version 1.0c * Wed Nov 17 2004 Gerard Milmeister - 0:1.0-0.fdr.1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 16:14:47 -0000 1.1 +++ .cvsignore 16 May 2006 16:16:12 -0000 1.2 @@ -0,0 +1 @@ +gtklp-1.2.1.src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 16:14:47 -0000 1.1 +++ sources 16 May 2006 16:16:12 -0000 1.2 @@ -0,0 +1 @@ +374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz From fedora-extras-commits at redhat.com Tue May 16 16:19:51 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 16 May 2006 09:19:51 -0700 Subject: rpms/gaim-gaym/FC-5 gaim-gaym.spec,1.1,1.2 Message-ID: <200605161619.k4GGJrrO029984@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29967 Modified Files: gaim-gaym.spec Log Message: Bump rel Index: gaim-gaym.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/FC-5/gaim-gaym.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gaim-gaym.spec 16 May 2006 15:43:16 -0000 1.1 +++ gaim-gaym.spec 16 May 2006 16:19:50 -0000 1.2 @@ -6,7 +6,7 @@ Name: gaim-gaym Version: 0.96 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A gay.com protocol plugin for gaim Group: Applications/Internet @@ -56,6 +56,9 @@ %changelog +* Tue May 16 2006 Chris Weyl 0.96-3 +- bump release for proper cvs taggage + * Mon May 8 2006 Chris Weyl 0.96-2 - dropped explicit requires: gtk2 From fedora-extras-commits at redhat.com Tue May 16 16:26:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 16 May 2006 09:26:25 -0700 Subject: rpms/lyx/devel lyx.spec,1.34,1.35 Message-ID: <200605161626.k4GGQRJI030075@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30058 Modified Files: lyx.spec Log Message: * Tue May 16 2006 Rex Dieter 1.4.1-4 - add generic app icon (rh #191944) Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- lyx.spec 13 May 2006 17:18:05 -0000 1.34 +++ lyx.spec 16 May 2006 16:26:25 -0000 1.35 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -142,21 +142,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "X-Fedora" \ - %{SOURCE21} %{SOURCE22} +# .desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category="X-Fedora" --vendor="fedora" \ + %{SOURCE21} %{SOURCE22} + +# generic/hicolor icon +install -p -D -m644 lib/images/lyx.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm %find_lang %{name} || touch %{name}.lang %post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: @@ -183,6 +191,7 @@ %{_bindir}/lyxclient %{_bindir}/tex2lyx %{_mandir}/man1/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ %{_datadir}/texmf/tex/latex/lyx/ %verify(not md5 size mtime) %{_datadir}/lyx/*.lst @@ -201,6 +210,9 @@ %changelog +* Tue May 16 2006 Rex Dieter 1.4.1-4 +- add generic app icon (rh #191944) + * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking From fedora-extras-commits at redhat.com Tue May 16 16:39:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 16 May 2006 09:39:14 -0700 Subject: rpms/kchmviewer/FC-4 kchmviewer.spec,1.1,1.2 Message-ID: <200605161639.k4GGdkZV030215@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30183/FC-4 Modified Files: kchmviewer.spec Log Message: * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-4/kchmviewer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kchmviewer.spec 1 May 2006 08:35:31 -0000 1.1 +++ kchmviewer.spec 16 May 2006 16:39:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: kchmviewer Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: CHM viewer Group: Applications/Publishing @@ -64,7 +64,8 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - kio-msits/kchmviewer.desktop + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop %clean @@ -84,10 +85,12 @@ %{_datadir}/pixmaps/* %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la -%{_datadir}/applnk/kchmviewer.desktop %{_datadir}/services/msits.protocol %changelog +* Tue May 16 2006 Patrice Dumas 2.0-4 +- remove the old menu entry file from /usr/share/applnk/ + * Mon Mar 13 2006 Patrice Dumas 2.0-3 - use update-desktop-database From fedora-extras-commits at redhat.com Tue May 16 16:39:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 16 May 2006 09:39:14 -0700 Subject: rpms/kchmviewer/FC-5 kchmviewer.spec,1.1,1.2 Message-ID: <200605161639.k4GGdkS9030218@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30183/FC-5 Modified Files: kchmviewer.spec Log Message: * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-5/kchmviewer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kchmviewer.spec 1 May 2006 08:35:31 -0000 1.1 +++ kchmviewer.spec 16 May 2006 16:39:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: kchmviewer Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: CHM viewer Group: Applications/Publishing @@ -64,7 +64,8 @@ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - kio-msits/kchmviewer.desktop + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop %clean @@ -84,10 +85,12 @@ %{_datadir}/pixmaps/* %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la -%{_datadir}/applnk/kchmviewer.desktop %{_datadir}/services/msits.protocol %changelog +* Tue May 16 2006 Patrice Dumas 2.0-4 +- remove the old menu entry file from /usr/share/applnk/ + * Mon Mar 13 2006 Patrice Dumas 2.0-3 - use update-desktop-database From fedora-extras-commits at redhat.com Tue May 16 16:41:25 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:41:25 -0700 Subject: rpms/crossfire-client Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161641.k4GGfRoG030351@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30318 Added Files: Makefile import.log Log Message: Setup of module crossfire-client --- NEW FILE Makefile --- # Top level Makefile for module crossfire-client all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 16:41:25 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:41:25 -0700 Subject: rpms/crossfire-client/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161641.k4GGfRYF030354@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30318/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module crossfire-client --- NEW 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 May 16 16:42:03 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:42:03 -0700 Subject: rpms/crossfire-client/devel crossfire-client.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161642.k4GGg5kY030429@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30387/devel Modified Files: .cvsignore sources Added Files: crossfire-client.spec Log Message: auto-import crossfire-client-1.9.0-2 on branch devel from crossfire-client-1.9.0-2.src.rpm --- NEW FILE crossfire-client.spec --- Name: crossfire-client Version: 1.9.0 Release: 2 Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPL URL: http://crossfire.real-time.com Source0: http://dl.sourceforge.net/crossfire/%{name}-%{version}.tar.gz BuildRequires: SDL-devel SDL_image-devel BuildRequires: gtk+-devel gtk2-devel libpng-devel BuildRequires: desktop-file-utils # Disabled sound for Fedora until it's working again #BuildRequires: alsa-lib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Crossfire is a graphical role-playing adventure game with characteristics reminiscent of rogue, nethack, omega, and gauntlet. It has multiplayer capability and presently runs under X11. Client for playing the new client/server based version of Crossfire. This package allows you to connect to crossfire servers around the world. You do not need install the crossfire program in order to use this package. %prep %setup -q %build chmod 755 configure # Disable sound for Fedora until it's working again. %configure --datadir=%{_datadir}/crossfire \ --disable-sound \ --disable-dmalloc make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/apps install -d $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps %makeinstall mandir=$RPM_BUILD_ROOT%{_mandir} install -m 644 pixmaps/16x16.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/crossfire-client.png install -m 644 pixmaps/32x32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/crossfire-client.png install -m 644 pixmaps/48x48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/crossfire-client.png install -m 644 pixmaps/16x16.png \ $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps/crossfire-client.png install -m 644 pixmaps/32x32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/apps/crossfire-client.png install -m 644 pixmaps/48x48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps/crossfire-client.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Game \ --add-category Application \ gtk/crossfire-client.desktop %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %{_bindir}/cfclient %{_bindir}/gcfclient %{_bindir}/gcfclient2 # Sound support is too broken to use in Fedora right now. #%{_bindir}/cfsndserv #%{_bindir}/cfsndserv_alsa9 %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/locolor/16x16/apps/%{name}.png %{_datadir}/icons/locolor/32x32/apps/%{name}.png %{_datadir}/icons/locolor/48x48/apps/%{name}.png %{_mandir}/man6/gcfclient.6* %{_mandir}/man6/cfclient.6* %doc ChangeLog COPYING License NOTES README TODO %changelog * Thu Mar 9 2006 Wart 1.9.0-2 - Initial spec file following Fedora Extras conventions Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 16:41:25 -0000 1.1 +++ .cvsignore 16 May 2006 16:42:03 -0000 1.2 @@ -0,0 +1 @@ +crossfire-client-1.9.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 16:41:25 -0000 1.1 +++ sources 16 May 2006 16:42:03 -0000 1.2 @@ -0,0 +1 @@ +62a9ac007700d1d811fa097fe6790f7a crossfire-client-1.9.0.tar.gz From fedora-extras-commits at redhat.com Tue May 16 16:44:04 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:44:04 -0700 Subject: rpms/crossfire-maps/devel - New directory Message-ID: <200605161644.k4GGi67W030578@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30549/crossfire-maps/devel Log Message: Directory /cvs/extras/rpms/crossfire-maps/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:44:04 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:44:04 -0700 Subject: rpms/crossfire-maps - New directory Message-ID: <200605161644.k4GGi6Kw030575@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30549/crossfire-maps Log Message: Directory /cvs/extras/rpms/crossfire-maps added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:44:13 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:44:13 -0700 Subject: rpms/crossfire-maps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161644.k4GGiFQb030627@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30594 Added Files: Makefile import.log Log Message: Setup of module crossfire-maps --- NEW FILE Makefile --- # Top level Makefile for module crossfire-maps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 16:44:13 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:44:13 -0700 Subject: rpms/crossfire-maps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161644.k4GGiFwZ030630@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30594/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module crossfire-maps --- NEW 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 May 16 16:45:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 09:45:14 -0700 Subject: owners owners.list,1.1005,1.1006 Message-ID: <200605161645.k4GGjGbD030677@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30660 Modified Files: owners.list Log Message: added gtklp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1005 retrieving revision 1.1006 diff -u -r1.1005 -r1.1006 --- owners.list 16 May 2006 15:49:33 -0000 1.1005 +++ owners.list 16 May 2006 16:45:14 -0000 1.1006 @@ -458,6 +458,7 @@ Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|gtkhtml36|GtkHTML 3.6 Compatibility Library|mpeters at mac.com|extras-qa at fedoraproject.org| +Fedora Extras|gtklp|A GTK frontend to CUPS|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 16:53:46 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:53:46 -0700 Subject: rpms/crossfire-maps import.log,1.1,1.2 Message-ID: <200605161653.k4GGrmln030781@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30748 Modified Files: import.log Log Message: auto-import crossfire-maps-1.9.0-1 on branch devel from crossfire-maps-1.9.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 16:44:13 -0000 1.1 +++ import.log 16 May 2006 16:53:46 -0000 1.2 @@ -0,0 +1 @@ +crossfire-maps-1_9_0-1:HEAD:crossfire-maps-1.9.0-1.src.rpm:1147798422 From fedora-extras-commits at redhat.com Tue May 16 16:53:47 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:53:47 -0700 Subject: rpms/crossfire-maps/devel crossfire-maps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161653.k4GGrneN030786@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-maps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30748/devel Modified Files: .cvsignore sources Added Files: crossfire-maps.spec Log Message: auto-import crossfire-maps-1.9.0-1 on branch devel from crossfire-maps-1.9.0-1.src.rpm --- NEW FILE crossfire-maps.spec --- Name: crossfire-maps Version: 1.9.0 Release: 1%{?dist} Summary: Map files for the crossfire server Group: Amusements/Games License: GPL URL: http://crossfire.real-time.com Source0: http://dl.sourceforge.net/crossfire/crossfire-%{version}-1.maps.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description Map files for the crossfire server. %package devel Summary: Development tools for writing crossfire maps Group: Development/Libraries Requires: %{name} = %{version} %description devel Development tools for writing crossfire maps. %prep %setup -q -c -n %{name}-%{version} chmod -x maps/python/IPO/README chmod -x maps/python/IPO/*.py chmod -x maps/scorn/misc/beginners2 chmod -x maps/styles/monsterstyles/sylvan/* chmod -x maps/planes/* chmod -x maps/unlinked/casino/* chmod -x maps/pup_land/s_f/* chmod -x maps/pup_land/ancient/castle/* chmod -x maps/pup_land/ancient/volcano/* chmod -x maps/pup_land/ancient/mountain/* chmod -x maps/pup_land/lone_town/cave/* chmod -x maps/templates/keep/*.tpl chmod -x maps/templates/guild/bigchest %{__sed} -i 's/\r//' maps/templates/keep/keep1.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep2.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep3.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep_b.tpl %{__sed} -i 's/\r//' maps/templates/keep/keep_roof.tpl rm -f maps/:! %build # Nothing to build! %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire cp -a maps $RPM_BUILD_ROOT%{_datadir}/crossfire/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_datadir}/crossfire/maps %exclude %{_datadir}/crossfire/maps/Info %exclude %{_datadir}/crossfire/maps/templates %files devel %defattr(-,root,root,-) %{_datadir}/crossfire/maps/Info %{_datadir}/crossfire/maps/templates %changelog * Thu Mar 9 2006 Wart 1.9.0-1 - Initial spec file following Fedora Extras conventions Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 16:44:13 -0000 1.1 +++ .cvsignore 16 May 2006 16:53:47 -0000 1.2 @@ -0,0 +1 @@ +crossfire-1.9.0-1.maps.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire-maps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 16:44:13 -0000 1.1 +++ sources 16 May 2006 16:53:47 -0000 1.2 @@ -0,0 +1 @@ +265c4dfdbdedaa2c565ea831f5f74a0c crossfire-1.9.0-1.maps.tar.gz From fedora-extras-commits at redhat.com Tue May 16 16:56:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 16 May 2006 09:56:21 -0700 Subject: rpms/lyx/FC-5 lyx.spec,1.33,1.34 Message-ID: <200605161656.k4GGuNlJ030843@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30826 Modified Files: lyx.spec Log Message: * Tue May 16 2006 Rex Dieter 1.4.1-4 - add generic app icon (rh #191944) Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- lyx.spec 13 May 2006 17:18:57 -0000 1.33 +++ lyx.spec 16 May 2006 16:56:20 -0000 1.34 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -142,21 +142,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "X-Fedora" \ - %{SOURCE21} %{SOURCE22} +# .desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category="X-Fedora" --vendor="fedora" \ + %{SOURCE21} %{SOURCE22} + +# generic/hicolor icon +install -p -D -m644 lib/images/lyx.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm %find_lang %{name} || touch %{name}.lang %post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: @@ -183,6 +191,7 @@ %{_bindir}/lyxclient %{_bindir}/tex2lyx %{_mandir}/man1/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ %{_datadir}/texmf/tex/latex/lyx/ %verify(not md5 size mtime) %{_datadir}/lyx/*.lst @@ -201,6 +210,9 @@ %changelog +* Tue May 16 2006 Rex Dieter 1.4.1-4 +- add generic app icon (rh #191944) + * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking From fedora-extras-commits at redhat.com Tue May 16 16:56:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 16 May 2006 09:56:36 -0700 Subject: rpms/lyx/FC-4 lyx.spec,1.20,1.21 Message-ID: <200605161656.k4GGuclB030906@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30887 Modified Files: lyx.spec Log Message: * Tue May 16 2006 Rex Dieter 1.4.1-4 - add generic app icon (rh #191944) Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- lyx.spec 13 May 2006 17:19:24 -0000 1.20 +++ lyx.spec 16 May 2006 16:56:36 -0000 1.21 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -142,21 +142,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "X-Fedora" \ - %{SOURCE21} %{SOURCE22} +# .desktop +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category="X-Fedora" --vendor="fedora" \ + %{SOURCE21} %{SOURCE22} + +# generic/hicolor icon +install -p -D -m644 lib/images/lyx.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm %find_lang %{name} || touch %{name}.lang %post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: @@ -183,6 +191,7 @@ %{_bindir}/lyxclient %{_bindir}/tex2lyx %{_mandir}/man1/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ %{_datadir}/texmf/tex/latex/lyx/ %verify(not md5 size mtime) %{_datadir}/lyx/*.lst @@ -201,6 +210,9 @@ %changelog +* Tue May 16 2006 Rex Dieter 1.4.1-4 +- add generic app icon (rh #191944) + * Fri Apr 28 2006 Rex Dieter 1.4.1-3 - Requires(hint): tetex-dvipost adds support for lyx's Document->Change Tracking From fedora-extras-commits at redhat.com Tue May 16 17:20:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 10:20:42 -0700 Subject: owners owners.list,1.1006,1.1007 Message-ID: <200605161720.k4GHKihe000858@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv841 Modified Files: owners.list Log Message: Added crossfire-client and crossfire-maps Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1006 retrieving revision 1.1007 diff -u -r1.1006 -r1.1007 --- owners.list 16 May 2006 16:45:14 -0000 1.1006 +++ owners.list 16 May 2006 17:20:42 -0000 1.1007 @@ -170,6 +170,8 @@ Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| +Fedora Extras|crossfire-client|Crossfire game client|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|crossfire-maps|Crossfire game server maps|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 16:42:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:42:02 -0700 Subject: rpms/crossfire-client import.log,1.1,1.2 Message-ID: <200605161642.k4GGg4xq030423@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30387 Modified Files: import.log Log Message: auto-import crossfire-client-1.9.0-2 on branch devel from crossfire-client-1.9.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 16:41:25 -0000 1.1 +++ import.log 16 May 2006 16:42:02 -0000 1.2 @@ -0,0 +1 @@ +crossfire-client-1_9_0-2:HEAD:crossfire-client-1.9.0-2.src.rpm:1147797718 From fedora-extras-commits at redhat.com Tue May 16 16:41:11 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:41:11 -0700 Subject: rpms/crossfire-client - New directory Message-ID: <200605161641.k4GGfDqk030297@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/crossfire-client Log Message: Directory /cvs/extras/rpms/crossfire-client added to the repository From fedora-extras-commits at redhat.com Tue May 16 16:41:11 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 09:41:11 -0700 Subject: rpms/crossfire-client/devel - New directory Message-ID: <200605161641.k4GGfD8w030300@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/crossfire-client/devel Log Message: Directory /cvs/extras/rpms/crossfire-client/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 17:47:48 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:47:48 -0700 Subject: rpms/libgalago - New directory Message-ID: <200605161747.k4GHloli001065@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1039/libgalago Log Message: Directory /cvs/extras/rpms/libgalago added to the repository From fedora-extras-commits at redhat.com Tue May 16 17:47:49 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:47:49 -0700 Subject: rpms/libgalago/devel - New directory Message-ID: <200605161747.k4GHlpZE001068@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1039/libgalago/devel Log Message: Directory /cvs/extras/rpms/libgalago/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 17:47:57 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:47:57 -0700 Subject: rpms/libgalago Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161747.k4GHlxle001117@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1084 Added Files: Makefile import.log Log Message: Setup of module libgalago --- NEW FILE Makefile --- # Top level Makefile for module libgalago all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 17:47:57 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:47:57 -0700 Subject: rpms/libgalago/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161748.k4GHlxv2001120@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1084/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libgalago --- NEW 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 May 16 17:48:25 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:48:25 -0700 Subject: rpms/libgalago import.log,1.1,1.2 Message-ID: <200605161748.k4GHmR0B001181@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148 Modified Files: import.log Log Message: auto-import libgalago-0.5.0-1 on branch devel from libgalago-0.5.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libgalago/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 17:47:57 -0000 1.1 +++ import.log 16 May 2006 17:48:25 -0000 1.2 @@ -0,0 +1 @@ +libgalago-0_5_0-1:HEAD:libgalago-0.5.0-1.src.rpm:1147801701 From fedora-extras-commits at redhat.com Tue May 16 17:48:26 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:48:26 -0700 Subject: rpms/libgalago/devel libgalago.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161748.k4GHmSlR001186@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148/devel Modified Files: .cvsignore sources Added Files: libgalago.spec Log Message: auto-import libgalago-0.5.0-1 on branch devel from libgalago-0.5.0-1.src.rpm --- NEW FILE libgalago.spec --- Name: libgalago Version: 0.5.0 Release: 1%{?dist} Summary: Galago presence library Group: System Environment/Libraries License: LGPL URL: http://www.galago-project.org/ Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: dbus-glib BuildRequires: check-devel %description Galago is a D-BUS-based desktop presence framework used to provide account, person, and presence information for users on IM services and other communication networks for use in other desktop applications, such as e-mail clients or address books. %package devel Summary: Development libraries and headers for libgalago Group: Development/Libraries Requires: dbus-devel Requires: dbus-glib Requires: %{name} = %{version}-%{release} %description devel Libararies and header file for developing against libgalago. %prep %setup -q %build %configure --enable-static=no make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_datadir}/autopackage/skeletons/@galago.info/%{name}/skeleton.1 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog %{_libdir}/%{name}.so.* %files devel %defattr(-,root,root,-) %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/%{name}/ %changelog * Fri Apr 21 2006 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 17:47:57 -0000 1.1 +++ .cvsignore 16 May 2006 17:48:26 -0000 1.2 @@ -0,0 +1 @@ +libgalago-0.5.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 17:47:57 -0000 1.1 +++ sources 16 May 2006 17:48:26 -0000 1.2 @@ -0,0 +1 @@ +3e6fbc2f27c957cb50f08ceeb574cb5e libgalago-0.5.0.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 17:50:58 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 10:50:58 -0700 Subject: owners owners.list,1.1007,1.1008 Message-ID: <200605161751.k4GHp0oI001254@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237 Modified Files: owners.list Log Message: Add libgalago Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1007 retrieving revision 1.1008 diff -u -r1.1007 -r1.1008 --- owners.list 16 May 2006 17:20:42 -0000 1.1007 +++ owners.list 16 May 2006 17:50:57 -0000 1.1008 @@ -631,6 +631,7 @@ Fedora Extras|libeXosip2|A library that hides the complexity of using the SIP protocol|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libfwbuilder|Firewall Builder API|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| +Fedora Extras|libgalago|Galago presence library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 18:08:00 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 16 May 2006 11:08:00 -0700 Subject: fedora-security/audit fc4,1.248,1.249 fc5,1.162,1.163 Message-ID: <200605161808.k4GI80Ah003608@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3588 Modified Files: fc4 fc5 Log Message: Note the vnc and php updates. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- fc4 16 May 2006 08:37:37 -0000 1.248 +++ fc4 16 May 2006 18:07:57 -0000 1.249 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 +CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 @@ -125,6 +125,7 @@ CVE-2006-1517 VULNERABLE (mysql, fixed 4.1.19) #190868 CVE-2006-1516 VULNERABLE (mysql, fixed 4.1.19) #190866 CVE-2006-1494 VULNERABLE (php) #189592 +CVE-2006-1490 VULNERABLE (php, fixed 5.1.4) CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1354 VULNERABLE (freeradius) #186084 CVE-2006-1343 VULNERABLE (kernel) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- fc5 16 May 2006 08:37:37 -0000 1.162 +++ fc5 16 May 2006 18:07:57 -0000 1.163 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-2369 VULNERABLE (vnc, fixed 4.1.2) #191692 +CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 @@ -125,6 +125,7 @@ CVE-2006-1517 VULNERABLE (mysql, fixed 5.0.21) #190868 CVE-2006-1516 VULNERABLE (mysql, fixed 5.0.21) #190866 CVE-2006-1494 VULNERABLE (php)#189592 +CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289] CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 VULNERABLE (kernel) @@ -148,7 +149,7 @@ CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe -CVE-2006-0996 VULNERABLE (php) bz#187511 +CVE-2006-0996 version (php, fixed 5.1.4) bz#187511 [since FEDORA-2006-289] CVE-2006-0903 VULNERABLE (mysql) #183261 low/not upstream yet CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) From fedora-extras-commits at redhat.com Tue May 16 18:30:55 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 11:30:55 -0700 Subject: rpms/rogue/devel rogue.spec,1.5,1.6 Message-ID: <200605161830.k4GIUvRv003709@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3690 Modified Files: rogue.spec Log Message: Add empty initial scoreboard file. Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rogue.spec 15 May 2006 22:31:10 -0000 1.5 +++ rogue.spec 16 May 2006 18:30:55 -0000 1.6 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -49,6 +49,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ +touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr + %clean rm -rf $RPM_BUILD_ROOT @@ -73,11 +75,15 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/rogue.png %dir %attr(0775,games,games) %{_var}/games/roguelike +%config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog +* Tue May 16 2006 Wart 5.4.2-6 +- Added empty initial scoreboard file. + * Mon May 15 2006 Wart 5.4.2-5 - Better setuid/setgid handling (again) (BZ #187392) From fedora-extras-commits at redhat.com Tue May 16 18:46:32 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 11:46:32 -0700 Subject: rpms/contact-lookup-applet/devel .cvsignore, 1.7, 1.8 contact-lookup-applet.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200605161846.k4GIkYlB003985@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-serv3964 Modified Files: .cvsignore contact-lookup-applet.spec sources Log Message: * Tue May 16 2006 Brian Pepple - 0.14-3 - Update to 0.14. - Drop BR on gettext. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Jul 2005 22:06:58 -0000 1.7 +++ .cvsignore 16 May 2006 18:46:32 -0000 1.8 @@ -1 +1 @@ -contact-lookup-applet-0.13.tar.gz +contact-lookup-applet-0.14.tar.gz Index: contact-lookup-applet.spec =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- contact-lookup-applet.spec 16 Feb 2006 16:19:48 -0000 1.17 +++ contact-lookup-applet.spec 16 May 2006 18:46:32 -0000 1.18 @@ -1,6 +1,6 @@ Name: contact-lookup-applet -Version: 0.13 -Release: 9%{?dist} +Version: 0.14 +Release: 3%{?dist} Summary: Contact Lookup Applet Group: Applications/Communications @@ -11,28 +11,33 @@ BuildRequires: gnome-panel-devel >= 2.9.4 BuildRequires: evolution-data-server-devel >= 1.2.0 -BuildRequires: gettext + %description This applet allows you to search your Evolution 2 address book for people. To use, simply add it to your panel (Add to Panel -> Accessories -> Address book Lookup), type a name into the field, and hit [return] or Search. + %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 AUTHORS COPYING ChangeLog NEWS README TODO @@ -42,7 +47,12 @@ %{_datadir}/lookup-applet/*.xml %{_datadir}/lookup-applet/%{name}.glade + %changelog +* Tue May 16 2006 Brian Pepple - 0.14-3 +- Update to 0.14. +- Drop BR on gettext. + * Thu Feb 16 2006 Brian Pepple - 0.13-9 - Drop unnecessary BR (libgnomeui-devel). Index: sources =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Jul 2005 22:06:58 -0000 1.7 +++ sources 16 May 2006 18:46:32 -0000 1.8 @@ -1 +1 @@ -8b4b4dbc2778b571e05e583e614ae5a7 contact-lookup-applet-0.13.tar.gz +53b7d3a55ce7f50dae06f2c896cb1677 contact-lookup-applet-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 16 18:47:50 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 May 2006 11:47:50 -0700 Subject: owners owners.list,1.1008,1.1009 Message-ID: <200605161847.k4GIlqDd004097@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4031 Modified Files: owners.list Log Message: bugzilla.redhat.com/186283 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1008 retrieving revision 1.1009 diff -u -r1.1008 -r1.1009 --- owners.list 16 May 2006 17:50:57 -0000 1.1008 +++ owners.list 16 May 2006 18:47:50 -0000 1.1009 @@ -1757,7 +1757,7 @@ Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|yadex|A DOOM level editor|wart at kobold.org|extras-qa at fedoraproject.org| -Fedora Extras|yakuake|A Quake-like terminal application|dreadyman at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|yakuake|A Quake-like terminal application|extras-orphan at fedoraproject.org|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| Fedora Extras|ytalk|A chat program for multiple users|imlinux at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 16 18:49:05 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 May 2006 11:49:05 -0700 Subject: rpms/contact-lookup-applet/FC-5 .cvsignore, 1.7, 1.8 contact-lookup-applet.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200605161849.k4GIn74f004192@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/contact-lookup-applet/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167 Modified Files: .cvsignore contact-lookup-applet.spec sources Log Message: * Tue May 16 2006 Brian Pepple - 0.14-2 - Update to 0.14. - Drop BR on gettext. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Jul 2005 22:06:58 -0000 1.7 +++ .cvsignore 16 May 2006 18:49:05 -0000 1.8 @@ -1 +1 @@ -contact-lookup-applet-0.13.tar.gz +contact-lookup-applet-0.14.tar.gz Index: contact-lookup-applet.spec =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-5/contact-lookup-applet.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- contact-lookup-applet.spec 16 Feb 2006 16:19:48 -0000 1.17 +++ contact-lookup-applet.spec 16 May 2006 18:49:05 -0000 1.18 @@ -1,6 +1,6 @@ Name: contact-lookup-applet -Version: 0.13 -Release: 9%{?dist} +Version: 0.14 +Release: 2%{?dist} Summary: Contact Lookup Applet Group: Applications/Communications @@ -11,28 +11,33 @@ BuildRequires: gnome-panel-devel >= 2.9.4 BuildRequires: evolution-data-server-devel >= 1.2.0 -BuildRequires: gettext + %description This applet allows you to search your Evolution 2 address book for people. To use, simply add it to your panel (Add to Panel -> Accessories -> Address book Lookup), type a name into the field, and hit [return] or Search. + %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 AUTHORS COPYING ChangeLog NEWS README TODO @@ -42,7 +47,12 @@ %{_datadir}/lookup-applet/*.xml %{_datadir}/lookup-applet/%{name}.glade + %changelog +* Tue May 16 2006 Brian Pepple - 0.14-2 +- Update to 0.14. +- Drop BR on gettext. + * Thu Feb 16 2006 Brian Pepple - 0.13-9 - Drop unnecessary BR (libgnomeui-devel). Index: sources =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Jul 2005 22:06:58 -0000 1.7 +++ sources 16 May 2006 18:49:05 -0000 1.8 @@ -1 +1 @@ -8b4b4dbc2778b571e05e583e614ae5a7 contact-lookup-applet-0.13.tar.gz +53b7d3a55ce7f50dae06f2c896cb1677 contact-lookup-applet-0.14.tar.gz From fedora-extras-commits at redhat.com Tue May 16 18:49:35 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 16 May 2006 11:49:35 -0700 Subject: fedora-security/audit fc4,1.249,1.250 fc5,1.163,1.164 Message-ID: <200605161849.k4GInZqP004269@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4241 Modified Files: fc4 fc5 Log Message: Add some missed CVE ids. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- fc4 16 May 2006 18:07:57 -0000 1.249 +++ fc4 16 May 2006 18:49:32 -0000 1.250 @@ -14,7 +14,7 @@ CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] -CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-473] +CVE-2006-2073 VULNERABLE (bind) CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423] CVE-2006-2057 ** firefox @@ -165,6 +165,7 @@ CVE-2006-0741 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) +CVE-2006-0670 VULNERABLE (bluez-hcidump) CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] CVE-2006-0591 version (postgresql, fixed 8.0.6) #180537 [since FEDORA-2005-021] CVE-2006-0576 VULNERABLE (oprofile) #180724 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- fc5 16 May 2006 18:07:57 -0000 1.163 +++ fc5 16 May 2006 18:49:32 -0000 1.164 @@ -14,7 +14,7 @@ CVE-2006-2224 VULNERABLE (quagga) #191085 CVE-2006-2223 VULNERABLE (quagga) #191081 CVE-2006-2120 backport (libtiff) #189976 [since FEDORA-2006-473] -CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189976 [since FEDORA-2006-474] +CVE-2006-2073 VULNERABLE (bind) CVE-2006-2083 VULNERABLE (rsync, fixed 2.6.8) #190208 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421] CVE-2006-2057 ** firefox @@ -167,6 +167,7 @@ CVE-2006-0741 version (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 ignore (postgresql) we don't build --enable-cassert +CVE-2006-0670 VULNERABLE (bluez-hcidump) CVE-2006-0645 version (gnutls, fixed 1.2.10) CVE-2006-0591 version (postgresql, fixed 8.0.6) CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch From fedora-extras-commits at redhat.com Tue May 16 18:54:23 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:54:23 -0700 Subject: rpms/perl-Expect/devel - New directory Message-ID: <200605161854.k4GIsPMP004379@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/perl-Expect/devel Log Message: Directory /cvs/extras/rpms/perl-Expect/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 18:54:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:54:22 -0700 Subject: rpms/perl-Expect - New directory Message-ID: <200605161854.k4GIsOMr004375@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/perl-Expect Log Message: Directory /cvs/extras/rpms/perl-Expect added to the repository From fedora-extras-commits at redhat.com Tue May 16 18:54:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:54:41 -0700 Subject: rpms/perl-Expect Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605161854.k4GIshCd004427@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397 Added Files: Makefile import.log Log Message: Setup of module perl-Expect --- NEW FILE Makefile --- # Top level Makefile for module perl-Expect all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 18:54:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:54:41 -0700 Subject: rpms/perl-Expect/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605161854.k4GIsh9J004430@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Expect --- NEW 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 May 16 18:55:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:55:21 -0700 Subject: rpms/perl-Expect import.log,1.1,1.2 Message-ID: <200605161855.k4GItNMP004496@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4463 Modified Files: import.log Log Message: auto-import perl-Expect-1.16-2 on branch devel from perl-Expect-1.16-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 18:54:41 -0000 1.1 +++ import.log 16 May 2006 18:55:21 -0000 1.2 @@ -0,0 +1 @@ +perl-Expect-1_16-2:HEAD:perl-Expect-1.16-2.src.rpm:1147805711 From fedora-extras-commits at redhat.com Tue May 16 18:55:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 11:55:22 -0700 Subject: rpms/perl-Expect/devel perl-Expect.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605161855.k4GItOAJ004501@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4463/devel Modified Files: .cvsignore sources Added Files: perl-Expect.spec Log Message: auto-import perl-Expect-1.16-2 on branch devel from perl-Expect-1.16-2.src.rpm --- NEW FILE perl-Expect.spec --- Name: perl-Expect Version: 1.16 Release: 2%{?dist} Summary: Expect for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Expect/ Source0: http://www.cpan.org/authors/id/R/RG/RGIERSIG/Expect-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(IO::Pty) >= 1.03 BuildRequires: perl(IO::Tty) >= 1.03 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides Expect-like functionality to Perl. Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, tip, etc. %prep %setup -q -n Expect-%{version} %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' examples/kibitz/kibitz tutorial/[2-6].* chmod a-x examples/kibitz/kibitz tutorial/[2-6].* %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README examples/ tutorial/ %{perl_vendorlib}/Expect.* %{_mandir}/man3/*.3pm* %changelog * Tue May 16 2006 Jose Pedro Oliveira - 1.16-2 - Description improved as suggested in #191622. * Mon May 08 2006 Jose Pedro Oliveira - 1.16-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 18:54:41 -0000 1.1 +++ .cvsignore 16 May 2006 18:55:21 -0000 1.2 @@ -0,0 +1 @@ +Expect-1.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 18:54:41 -0000 1.1 +++ sources 16 May 2006 18:55:21 -0000 1.2 @@ -0,0 +1 @@ +f5f0ea179c6f19d9f08e22c6a0072292 Expect-1.16.tar.gz From fedora-extras-commits at redhat.com Tue May 16 19:04:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 16 May 2006 12:04:04 -0700 Subject: owners owners.list,1.1009,1.1010 Message-ID: <200605161904.k4GJ469o006873@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6856 Modified Files: owners.list Log Message: New package: perl-Expect (#191622) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1009 retrieving revision 1.1010 diff -u -r1.1009 -r1.1010 --- owners.list 16 May 2006 18:47:50 -0000 1.1009 +++ owners.list 16 May 2006 19:04:03 -0000 1.1010 @@ -1012,6 +1012,7 @@ Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Expect|Expect for Perl|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-AutoInstall|Automatic install of dependencies via CPAN|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-CBuilder|Compile and link C code for Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 16 19:09:50 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:09:50 -0700 Subject: rpms/ccache/FC-5 ccache.spec,1.11,1.12 Message-ID: <200605161910.k4GJAMsw006945@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ccache/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913/FC-5 Modified Files: ccache.spec Log Message: * Tue May 16 2006 Ville Skytt?? - 2.4-5 - Add auto-symlink support for g++-libstdc++-so_7. Index: ccache.spec =================================================================== RCS file: /cvs/extras/rpms/ccache/FC-5/ccache.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ccache.spec 18 Feb 2006 11:43:08 -0000 1.11 +++ ccache.spec 16 May 2006 19:09:50 -0000 1.12 @@ -1,9 +1,9 @@ -%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 -%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++ +%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 +%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, libstdc++so7-devel Name: ccache Version: 2.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C/C++ compiler cache Group: Development/Tools @@ -83,6 +83,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 2.4-5 +- Add auto-symlink support for g++-libstdc++-so_7. + * Sat Nov 26 2005 Ville Skytt?? - 2.4-4 - Drop "bin" from compiler symlink path. - Make profile.d snippets non-executable (#35714). From fedora-extras-commits at redhat.com Tue May 16 19:09:50 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:09:50 -0700 Subject: rpms/ccache/devel ccache.spec,1.11,1.12 Message-ID: <200605161910.k4GJANQf006948@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ccache/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913/devel Modified Files: ccache.spec Log Message: * Tue May 16 2006 Ville Skytt?? - 2.4-5 - Add auto-symlink support for g++-libstdc++-so_7. Index: ccache.spec =================================================================== RCS file: /cvs/extras/rpms/ccache/devel/ccache.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ccache.spec 18 Feb 2006 11:43:08 -0000 1.11 +++ ccache.spec 16 May 2006 19:09:50 -0000 1.12 @@ -1,9 +1,9 @@ -%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 -%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++ +%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 +%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, libstdc++so7-devel Name: ccache Version: 2.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C/C++ compiler cache Group: Development/Tools @@ -83,6 +83,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 2.4-5 +- Add auto-symlink support for g++-libstdc++-so_7. + * Sat Nov 26 2005 Ville Skytt?? - 2.4-4 - Drop "bin" from compiler symlink path. - Make profile.d snippets non-executable (#35714). From fedora-extras-commits at redhat.com Tue May 16 19:16:36 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:16:36 -0700 Subject: rpms/xemacs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xemacs.spec, 1.25, 1.26 xemacs-21.5.25-find-paths-pkgdir.patch, 1.1, NONE xemacs-21.5.26-maximize.patch, 1.1, NONE Message-ID: <200605161916.k4GJGchv007106@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7084 Modified Files: .cvsignore sources xemacs.spec Removed Files: xemacs-21.5.25-find-paths-pkgdir.patch xemacs-21.5.26-maximize.patch Log Message: * Tue May 16 2006 Ville Skytt?? - 21.5.27-1 - 21.5.27, maximize patch included upstream. - Drop no longer needed find-paths patch. - Fix alternatives setup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Apr 2006 16:27:53 -0000 1.5 +++ .cvsignore 16 May 2006 19:16:36 -0000 1.6 @@ -1 +1 @@ -xemacs-21.5.26.tar.gz +xemacs-21.5.27.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Apr 2006 16:27:53 -0000 1.5 +++ sources 16 May 2006 19:16:36 -0000 1.6 @@ -1 +1 @@ -e0cd4521e8857a16f6cd675bb4c1039b xemacs-21.5.26.tar.gz +c415348d58eb18a9f4ed57d97e2acc62 xemacs-21.5.27.tar.gz Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xemacs.spec 7 May 2006 20:36:57 -0000 1.25 +++ xemacs.spec 16 May 2006 19:16:36 -0000 1.26 @@ -19,8 +19,8 @@ %define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') Name: xemacs -Version: 21.5.26 -Release: 5%{?dist} +Version: 21.5.27 +Release: 1%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -35,14 +35,11 @@ Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch -# TODO: patch2 still needed with --with-system-packages??? -Patch2: %{name}-21.5.25-find-paths-pkgdir.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch -Patch7: %{name}-21.5.26-maximize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -175,15 +172,14 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch0 -p1 %patch1 -p1 -%patch2 -p1 -sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el lisp/setup-paths.el %patch3 -p1 %ifarch ia64 %patch4 -p1 %endif %patch5 -p1 %patch6 -p1 -%patch7 -p0 + +sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el for f in man/lispref/mule.texi man/xemacs-faq.texi ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f @@ -386,9 +382,12 @@ %{_bindir}/xemacs-%{xver} 80 || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : +# bugfix for 21.5.26, to be removed later +%{_sbindir}/alternatives --remove xemacs \ + %{_bindir}/xemacs-21.5-b26 &>/dev/null || : %postun -[ $1 -ne 0 ] || \ +[ -e %{_bindir}/xemacs-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : @@ -398,9 +397,12 @@ rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-nox-%{xver} 40 || : +# bugfix for 21.5.26, to be removed later +%{_sbindir}/alternatives --remove xemacs \ + %{_bindir}/xemacs-nox-21.5-b26 &>/dev/null || : %postun nox -[ $1 -ne 0 ] || \ +[ -e %{_bindir}/xemacs-nox-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : %post common @@ -493,6 +495,11 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 21.5.27-1 +- 21.5.27, maximize patch included upstream. +- Drop no longer needed find-paths patch. +- Fix alternatives setup. + * Sun May 7 2006 Ville Skytt?? - 21.5.26-5 - Apply upstream fix for window maximization problems (#111225). --- xemacs-21.5.25-find-paths-pkgdir.patch DELETED --- --- xemacs-21.5.26-maximize.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 16 19:25:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:25:39 -0700 Subject: rpms/upx/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 upx.spec, 1.8, 1.9 upx-nostrip.patch, 1.1, NONE upx-optflags.patch, 1.1, NONE Message-ID: <200605161925.k4GJPg6d007265@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/upx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7244 Modified Files: .cvsignore sources upx.spec Removed Files: upx-nostrip.patch upx-optflags.patch Log Message: * Tue May 16 2006 Ville Skytt?? - 2.00-1 - 2.00. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/upx/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:30:12 -0000 1.2 +++ .cvsignore 16 May 2006 19:25:39 -0000 1.3 @@ -1 +1 @@ -upx-1.25-src.tar.gz +upx-2.00-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/upx/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:30:12 -0000 1.2 +++ sources 16 May 2006 19:25:39 -0000 1.3 @@ -1 +1 @@ -6f20a62999a46a1864652454b3c8a5d8 upx-1.25-src.tar.gz +ce412e9ef82f4474531d66ce7e5a7950 upx-2.00-src.tar.gz Index: upx.spec =================================================================== RCS file: /cvs/extras/rpms/upx/devel/upx.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- upx.spec 15 Feb 2006 21:03:23 -0000 1.8 +++ upx.spec 16 May 2006 19:25:39 -0000 1.9 @@ -1,14 +1,12 @@ Name: upx -Version: 1.25 -Release: 5%{?dist} +Version: 2.00 +Release: 1%{?dist} Summary: Ultimate Packer for eXecutables Group: Applications/Archiving License: GPL URL: http://upx.sourceforge.net/ Source0: http://upx.sourceforge.net/download/%{name}-%{version}-src.tar.gz -Patch0: %{name}-optflags.patch -Patch1: %{name}-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ucl-devel >= 1.01 @@ -22,19 +20,14 @@ %prep -%setup -q -%patch0 -p0 -%patch1 -p0 +%setup -q -n %{name}-%{version}-src +sed -i -e 's/ -O2 / /' -e 's/ -Werror//' src/Makefile %build +export CXXFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} -C src CXX=%{__cxx} UCLDIR=%{_prefix} exeext= make -C doc -make %{?_smp_mflags} -C src \ - target=linux \ - CXX=%{__cxx} \ - CCARCH= \ - UCLDIR=%{_prefix} \ - STUBEDIT_EXE=: %install @@ -49,13 +42,15 @@ %files %defattr(-,root,root,-) -%doc BUGS COPYING LICENSE NEWS PROJECTS README THANKS -%doc doc/loader.txt doc/upx.html +%doc BUGS COPYING LICENSE NEWS PROJECTS README README.1ST THANKS TODO doc/*.txt %{_bindir}/upx %{_mandir}/man1/upx.1* %changelog +* Tue May 16 2006 Ville Skytt?? - 2.00-1 +- 2.00. + * Wed Feb 15 2006 Ville Skytt?? - 1.25-5 - Rebuild. --- upx-nostrip.patch DELETED --- --- upx-optflags.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 16 19:31:25 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 16 May 2006 12:31:25 -0700 Subject: rpms/php-Smarty/devel .cvsignore, 1.2, 1.3 php-Smarty.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605161931.k4GJVRTW007370@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/php-Smarty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7349 Modified Files: .cvsignore php-Smarty.spec sources Log Message: Update to 2.6.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Nov 2005 16:45:09 -0000 1.2 +++ .cvsignore 16 May 2006 19:31:25 -0000 1.3 @@ -1 +1 @@ -Smarty-2.6.10.tar.gz +Smarty-2.6.13.tar.gz Index: php-Smarty.spec =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/php-Smarty.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-Smarty.spec 1 Nov 2005 16:45:09 -0000 1.1 +++ php-Smarty.spec 16 May 2006 19:31:25 -0000 1.2 @@ -1,7 +1,7 @@ Name: php-Smarty Summary: Template/Presentation Framework for PHP -Version: 2.6.10 -Release: 2%{?dist} +Version: 2.6.13 +Release: 1%{?dist} Source0: http://smarty.php.net/distributions/Smarty-%{version}.tar.gz License: LGPL @@ -25,11 +25,9 @@ %prep %setup -q -n Smarty-%{version} + %build -# fix dir perms -#find . -type d | xargs chmod 755 -# fix file perms -#find . -type f | xargs chmod 644 + %install rm -rf $RPM_BUILD_ROOT @@ -40,16 +38,22 @@ install -d $RPM_BUILD_ROOT%{_var}/www/icons install -m644 misc/smarty_icon.gif $RPM_BUILD_ROOT%{_var}/www/icons/ + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %doc BUGS ChangeLog COPYING.lib demo FAQ NEWS QUICK_START README RELEASE_NOTES TODO %{_datadir}/Smarty/ %{_var}/www/icons/* + %changelog +* Tue May 16 2006 Orion Poplawski 2.6.13-1 +- Update to 2.6.13 + * Tue Nov 1 2005 Orion Poplawski 2.6.10-2 - Fix Source0 URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Nov 2005 16:45:09 -0000 1.2 +++ sources 16 May 2006 19:31:25 -0000 1.3 @@ -1 +1 @@ -0c31105a157547bafcff8c13bb64c6a3 Smarty-2.6.10.tar.gz +2ca9bf476cf0920b9d4fee69633f6f65 Smarty-2.6.13.tar.gz From fedora-extras-commits at redhat.com Tue May 16 19:32:56 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 16 May 2006 12:32:56 -0700 Subject: rpms/php-Smarty/FC-5 .cvsignore, 1.2, 1.3 php-Smarty.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605161932.k4GJWwdC007441@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/php-Smarty/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7420 Modified Files: .cvsignore php-Smarty.spec sources Log Message: Update to 2.6.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Nov 2005 16:45:09 -0000 1.2 +++ .cvsignore 16 May 2006 19:32:56 -0000 1.3 @@ -1 +1 @@ -Smarty-2.6.10.tar.gz +Smarty-2.6.13.tar.gz Index: php-Smarty.spec =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-5/php-Smarty.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-Smarty.spec 1 Nov 2005 16:45:09 -0000 1.1 +++ php-Smarty.spec 16 May 2006 19:32:56 -0000 1.2 @@ -1,7 +1,7 @@ Name: php-Smarty Summary: Template/Presentation Framework for PHP -Version: 2.6.10 -Release: 2%{?dist} +Version: 2.6.13 +Release: 1%{?dist} Source0: http://smarty.php.net/distributions/Smarty-%{version}.tar.gz License: LGPL @@ -25,11 +25,9 @@ %prep %setup -q -n Smarty-%{version} + %build -# fix dir perms -#find . -type d | xargs chmod 755 -# fix file perms -#find . -type f | xargs chmod 644 + %install rm -rf $RPM_BUILD_ROOT @@ -40,16 +38,22 @@ install -d $RPM_BUILD_ROOT%{_var}/www/icons install -m644 misc/smarty_icon.gif $RPM_BUILD_ROOT%{_var}/www/icons/ + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %doc BUGS ChangeLog COPYING.lib demo FAQ NEWS QUICK_START README RELEASE_NOTES TODO %{_datadir}/Smarty/ %{_var}/www/icons/* + %changelog +* Tue May 16 2006 Orion Poplawski 2.6.13-1 +- Update to 2.6.13 + * Tue Nov 1 2005 Orion Poplawski 2.6.10-2 - Fix Source0 URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Nov 2005 16:45:09 -0000 1.2 +++ sources 16 May 2006 19:32:56 -0000 1.3 @@ -1 +1 @@ -0c31105a157547bafcff8c13bb64c6a3 Smarty-2.6.10.tar.gz +2ca9bf476cf0920b9d4fee69633f6f65 Smarty-2.6.13.tar.gz From fedora-extras-commits at redhat.com Tue May 16 19:33:36 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 16 May 2006 12:33:36 -0700 Subject: rpms/php-Smarty/FC-4 .cvsignore, 1.2, 1.3 php-Smarty.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605161933.k4GJXcbh007512@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/php-Smarty/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7491 Modified Files: .cvsignore php-Smarty.spec sources Log Message: Update to 2.6.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Nov 2005 16:45:09 -0000 1.2 +++ .cvsignore 16 May 2006 19:33:36 -0000 1.3 @@ -1 +1 @@ -Smarty-2.6.10.tar.gz +Smarty-2.6.13.tar.gz Index: php-Smarty.spec =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-4/php-Smarty.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-Smarty.spec 1 Nov 2005 16:45:09 -0000 1.1 +++ php-Smarty.spec 16 May 2006 19:33:36 -0000 1.2 @@ -1,7 +1,7 @@ Name: php-Smarty Summary: Template/Presentation Framework for PHP -Version: 2.6.10 -Release: 2%{?dist} +Version: 2.6.13 +Release: 1%{?dist} Source0: http://smarty.php.net/distributions/Smarty-%{version}.tar.gz License: LGPL @@ -25,11 +25,9 @@ %prep %setup -q -n Smarty-%{version} + %build -# fix dir perms -#find . -type d | xargs chmod 755 -# fix file perms -#find . -type f | xargs chmod 644 + %install rm -rf $RPM_BUILD_ROOT @@ -40,16 +38,22 @@ install -d $RPM_BUILD_ROOT%{_var}/www/icons install -m644 misc/smarty_icon.gif $RPM_BUILD_ROOT%{_var}/www/icons/ + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %doc BUGS ChangeLog COPYING.lib demo FAQ NEWS QUICK_START README RELEASE_NOTES TODO %{_datadir}/Smarty/ %{_var}/www/icons/* + %changelog +* Tue May 16 2006 Orion Poplawski 2.6.13-1 +- Update to 2.6.13 + * Tue Nov 1 2005 Orion Poplawski 2.6.10-2 - Fix Source0 URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-Smarty/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Nov 2005 16:45:09 -0000 1.2 +++ sources 16 May 2006 19:33:36 -0000 1.3 @@ -1 +1 @@ -0c31105a157547bafcff8c13bb64c6a3 Smarty-2.6.10.tar.gz +2ca9bf476cf0920b9d4fee69633f6f65 Smarty-2.6.13.tar.gz From fedora-extras-commits at redhat.com Tue May 16 19:45:41 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 12:45:41 -0700 Subject: rpms/upx/devel upx.spec,1.9,1.10 Message-ID: <200605161945.k4GJjhRp007631@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/upx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7614 Modified Files: upx.spec Log Message: * Tue May 16 2006 Ville Skytt?? - 2.00-2 - BR: zlib-devel. Index: upx.spec =================================================================== RCS file: /cvs/extras/rpms/upx/devel/upx.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- upx.spec 16 May 2006 19:25:39 -0000 1.9 +++ upx.spec 16 May 2006 19:45:41 -0000 1.10 @@ -1,6 +1,6 @@ Name: upx Version: 2.00 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ultimate Packer for eXecutables Group: Applications/Archiving @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ucl-devel >= 1.01 +BuildRequires: zlib-devel BuildRequires: perl %description @@ -48,6 +49,9 @@ %changelog +* Tue May 16 2006 Ville Skytt?? - 2.00-2 +- BR: zlib-devel. + * Tue May 16 2006 Ville Skytt?? - 2.00-1 - 2.00. From fedora-extras-commits at redhat.com Tue May 16 20:38:54 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 16 May 2006 13:38:54 -0700 Subject: fedora-security/audit fc4,1.250,1.251 fc5,1.164,1.165 Message-ID: <200605162038.k4GKcsu5010208@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10187 Modified Files: fc4 fc5 Log Message: Note a new dovecot CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- fc4 16 May 2006 18:49:32 -0000 1.250 +++ fc4 16 May 2006 20:38:52 -0000 1.251 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- fc5 16 May 2006 18:49:32 -0000 1.164 +++ fc5 16 May 2006 20:38:52 -0000 1.165 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox From fedora-extras-commits at redhat.com Tue May 16 20:51:56 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 13:51:56 -0700 Subject: rpms/wine/devel .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 wine.spec, 1.25, 1.26 Message-ID: <200605162051.k4GKpwGc010384@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10310/devel Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 19 Apr 2006 22:20:07 -0000 1.14 +++ .cvsignore 16 May 2006 20:51:56 -0000 1.15 @@ -1 +1 @@ -wine-0.9.12-fe.tar.bz2 +wine-0.9.13-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Apr 2006 22:20:07 -0000 1.15 +++ sources 16 May 2006 20:51:56 -0000 1.16 @@ -1 +1 @@ -1751147723999f1efd73d1aaba910360 wine-0.9.12-fe.tar.bz2 +985f671f503684d2c95a9e4cb74ad453 wine-0.9.13-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- wine.spec 19 Apr 2006 22:20:07 -0000 1.25 +++ wine.spec 16 May 2006 20:51:56 -0000 1.26 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -11,7 +11,7 @@ # special fedora tarball without winemp3 stuff Patch0: wine-prefixfonts.patch Patch1: wine-rpath.patch -Source0: wine-0.9.12-fe.tar.bz2 +Source0: wine-0.9.13-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -394,6 +394,7 @@ %{_libdir}/wine/eject.exe.so %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so +%{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so %{_libdir}/wine/iccvid.dll.so @@ -416,7 +417,7 @@ %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so %{_libdir}/wine/mciseq.dll.so -%{_libdir}/wine/mciwave.drv.so +%{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so @@ -424,9 +425,10 @@ %{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so +%{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm.dll16 -%{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so +%{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so %{_libdir}/wine/msftedit.dll.so @@ -478,6 +480,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -651,6 +654,10 @@ %{_libdir}/wine/*.def %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-1 - fix rpath issues (#187429,#188905) From fedora-extras-commits at redhat.com Tue May 16 20:51:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 13:51:49 -0700 Subject: rpms/wine/FC-3 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 wine.spec, 1.19, 1.20 Message-ID: <200605162052.k4GKqLr6010394@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10310/FC-3 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 19 Apr 2006 22:20:05 -0000 1.12 +++ .cvsignore 16 May 2006 20:51:49 -0000 1.13 @@ -1 +1 @@ -wine-0.9.12-fe.tar.bz2 +wine-0.9.13-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 19 Apr 2006 22:20:05 -0000 1.13 +++ sources 16 May 2006 20:51:49 -0000 1.14 @@ -1 +1 @@ -1751147723999f1efd73d1aaba910360 wine-0.9.12-fe.tar.bz2 +985f671f503684d2c95a9e4cb74ad453 wine-0.9.13-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- wine.spec 19 Apr 2006 22:20:05 -0000 1.19 +++ wine.spec 16 May 2006 20:51:49 -0000 1.20 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.12-fe.tar.bz2 +Source0: wine-0.9.13-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -381,6 +381,7 @@ %{_libdir}/wine/eject.exe.so %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so +%{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so %{_libdir}/wine/iccvid.dll.so @@ -403,7 +404,7 @@ %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so %{_libdir}/wine/mciseq.dll.so -%{_libdir}/wine/mciwave.drv.so +%{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so @@ -411,8 +412,9 @@ %{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so +%{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm.dll16 -%{_libdir}/wine/msacm.drv.so +%{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so @@ -465,6 +467,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -638,6 +641,10 @@ %{_libdir}/wine/*.def %changelog +* Tue May 16 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-1 - fix rpath issues (#187429,#188905) From fedora-extras-commits at redhat.com Tue May 16 20:51:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 13:51:50 -0700 Subject: rpms/wine/FC-4 .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 wine.spec, 1.21, 1.22 Message-ID: <200605162052.k4GKqMGs010399@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10310/FC-4 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 19 Apr 2006 22:20:06 -0000 1.13 +++ .cvsignore 16 May 2006 20:51:50 -0000 1.14 @@ -1 +1 @@ -wine-0.9.12-fe.tar.bz2 +wine-0.9.13-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 19 Apr 2006 22:20:06 -0000 1.14 +++ sources 16 May 2006 20:51:50 -0000 1.15 @@ -1 +1 @@ -1751147723999f1efd73d1aaba910360 wine-0.9.12-fe.tar.bz2 +985f671f503684d2c95a9e4cb74ad453 wine-0.9.13-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine.spec 19 Apr 2006 22:20:06 -0000 1.21 +++ wine.spec 16 May 2006 20:51:50 -0000 1.22 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.12-fe.tar.bz2 +Source0: wine-0.9.13-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -381,6 +381,7 @@ %{_libdir}/wine/eject.exe.so %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so +%{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so %{_libdir}/wine/iccvid.dll.so @@ -403,7 +404,7 @@ %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so %{_libdir}/wine/mciseq.dll.so -%{_libdir}/wine/mciwave.drv.so +%{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so @@ -411,8 +412,9 @@ %{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so +%{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm.dll16 -%{_libdir}/wine/msacm.drv.so +%{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so @@ -465,6 +467,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -638,6 +641,10 @@ %{_libdir}/wine/*.def %changelog +* Tue May 16 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-1 - fix rpath issues (#187429,#188905) From fedora-extras-commits at redhat.com Tue May 16 20:51:51 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 13:51:51 -0700 Subject: rpms/wine/FC-5 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 wine.spec, 1.25, 1.26 Message-ID: <200605162052.k4GKqNL2010404@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10310/FC-5 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 19 Apr 2006 22:20:06 -0000 1.14 +++ .cvsignore 16 May 2006 20:51:51 -0000 1.15 @@ -1 +1 @@ -wine-0.9.12-fe.tar.bz2 +wine-0.9.13-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Apr 2006 22:20:06 -0000 1.15 +++ sources 16 May 2006 20:51:51 -0000 1.16 @@ -1 +1 @@ -1751147723999f1efd73d1aaba910360 wine-0.9.12-fe.tar.bz2 +985f671f503684d2c95a9e4cb74ad453 wine-0.9.13-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- wine.spec 19 Apr 2006 22:20:06 -0000 1.25 +++ wine.spec 16 May 2006 20:51:51 -0000 1.26 @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.12 +Version: 0.9.13 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -11,7 +11,7 @@ # special fedora tarball without winemp3 stuff Patch0: wine-prefixfonts.patch Patch1: wine-rpath.patch -Source0: wine-0.9.12-fe.tar.bz2 +Source0: wine-0.9.13-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -394,6 +394,7 @@ %{_libdir}/wine/eject.exe.so %{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so +%{_libdir}/wine/gphoto2.ds.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so %{_libdir}/wine/iccvid.dll.so @@ -416,7 +417,7 @@ %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so %{_libdir}/wine/mciseq.dll.so -%{_libdir}/wine/mciwave.drv.so +%{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so @@ -424,9 +425,10 @@ %{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so +%{_libdir}/wine/mprapi.dll.so %{_libdir}/wine/msacm.dll16 -%{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so +%{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so %{_libdir}/wine/msftedit.dll.so @@ -478,6 +480,7 @@ %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so +%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -651,6 +654,10 @@ %{_libdir}/wine/*.def %changelog +* Mon May 15 2006 Andreas Bierfert +0.9.13-1 +- version upgrade + * Sat Apr 15 2006 Andreas Bierfert 0.9.12-1 - fix rpath issues (#187429,#188905) From fedora-extras-commits at redhat.com Tue May 16 21:19:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 14:19:47 -0700 Subject: rpms/pcsc-perl/FC-5 .cvsignore, 1.3, 1.4 pcsc-perl.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605162119.k4GLJnvh013070@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13033/FC-5 Modified Files: .cvsignore pcsc-perl.spec sources Log Message: * Wed May 17 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Mar 2006 15:43:20 -0000 1.3 +++ .cvsignore 16 May 2006 21:19:47 -0000 1.4 @@ -1 +1 @@ -pcsc-perl-1.4.1.tar.gz +pcsc-perl-1.4.3.tar.gz Index: pcsc-perl.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/FC-5/pcsc-perl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pcsc-perl.spec 6 Mar 2006 15:43:20 -0000 1.8 +++ pcsc-perl.spec 16 May 2006 21:19:47 -0000 1.9 @@ -2,7 +2,7 @@ %define pcsclib %{_libdir}/libpcsclite.so.1 Name: pcsc-perl -Version: 1.4.1 +Version: 1.4.3 Release: 1%{?dist} Summary: Perl interface to the PC/SC smart card library @@ -60,6 +60,9 @@ %changelog +* Wed May 17 2006 Ville Skytt?? - 1.4.3-1 +- 1.4.3. + * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-1 - 1.4.1. - Don't hardcode required pcsc-lite-libs version, use shared lib file instead. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 15:43:20 -0000 1.3 +++ sources 16 May 2006 21:19:47 -0000 1.4 @@ -1 +1 @@ -0a432f4fd6414aa3122b53a091b47064 pcsc-perl-1.4.1.tar.gz +d248e412270b7e4f0a2a40bd010955f9 pcsc-perl-1.4.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 21:19:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 16 May 2006 14:19:47 -0700 Subject: rpms/pcsc-perl/devel .cvsignore, 1.3, 1.4 pcsc-perl.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605162119.k4GLJnIO013076@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13033/devel Modified Files: .cvsignore pcsc-perl.spec sources Log Message: * Wed May 17 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Mar 2006 15:43:20 -0000 1.3 +++ .cvsignore 16 May 2006 21:19:47 -0000 1.4 @@ -1 +1 @@ -pcsc-perl-1.4.1.tar.gz +pcsc-perl-1.4.3.tar.gz Index: pcsc-perl.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pcsc-perl.spec 6 Mar 2006 15:43:20 -0000 1.8 +++ pcsc-perl.spec 16 May 2006 21:19:47 -0000 1.9 @@ -2,7 +2,7 @@ %define pcsclib %{_libdir}/libpcsclite.so.1 Name: pcsc-perl -Version: 1.4.1 +Version: 1.4.3 Release: 1%{?dist} Summary: Perl interface to the PC/SC smart card library @@ -60,6 +60,9 @@ %changelog +* Wed May 17 2006 Ville Skytt?? - 1.4.3-1 +- 1.4.3. + * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-1 - 1.4.1. - Don't hardcode required pcsc-lite-libs version, use shared lib file instead. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 15:43:20 -0000 1.3 +++ sources 16 May 2006 21:19:47 -0000 1.4 @@ -1 +1 @@ -0a432f4fd6414aa3122b53a091b47064 pcsc-perl-1.4.1.tar.gz +d248e412270b7e4f0a2a40bd010955f9 pcsc-perl-1.4.3.tar.gz From fedora-extras-commits at redhat.com Tue May 16 21:59:21 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 14:59:21 -0700 Subject: rpms/conntrack - New directory Message-ID: <200605162159.k4GLxNXd013348@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322/conntrack Log Message: Directory /cvs/extras/rpms/conntrack added to the repository From fedora-extras-commits at redhat.com Tue May 16 21:59:22 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 14:59:22 -0700 Subject: rpms/conntrack/devel - New directory Message-ID: <200605162159.k4GLxO6k013351@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13322/conntrack/devel Log Message: Directory /cvs/extras/rpms/conntrack/devel added to the repository From fedora-extras-commits at redhat.com Tue May 16 21:59:46 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 14:59:46 -0700 Subject: rpms/conntrack Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605162159.k4GLxmGR013395@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367 Added Files: Makefile import.log Log Message: Setup of module conntrack --- NEW FILE Makefile --- # Top level Makefile for module conntrack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 16 21:59:46 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 14:59:46 -0700 Subject: rpms/conntrack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605162159.k4GLxmAT013398@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13367/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module conntrack --- NEW 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 May 16 22:00:52 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 15:00:52 -0700 Subject: rpms/conntrack import.log,1.1,1.2 Message-ID: <200605162200.k4GM0sJX013472@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13439 Modified Files: import.log Log Message: auto-import conntrack-1.0-0.1.beta1 on branch devel from conntrack-1.0-0.1.beta1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/conntrack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 May 2006 21:59:45 -0000 1.1 +++ import.log 16 May 2006 22:00:52 -0000 1.2 @@ -0,0 +1 @@ +conntrack-1_0-0_1_beta1:HEAD:conntrack-1.0-0.1.beta1.src.rpm:1147816837 From fedora-extras-commits at redhat.com Tue May 16 22:00:52 2006 From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray)) Date: Tue, 16 May 2006 15:00:52 -0700 Subject: rpms/conntrack/devel conntrack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605162201.k4GM0s3j013477@cvs-int.fedora.redhat.com> Author: stingray Update of /cvs/extras/rpms/conntrack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13439/devel Modified Files: .cvsignore sources Added Files: conntrack.spec Log Message: auto-import conntrack-1.0-0.1.beta1 on branch devel from conntrack-1.0-0.1.beta1.src.rpm --- NEW FILE conntrack.spec --- Name: conntrack Version: 1.0 Release: 0.1.beta1%{?dist} Summary: Tool to manipulate netfilter connection tracking table Group: System Environment/Base License: GPL URL: http://netfilter.org Source0: http://netfilter.org/projects/conntrack/files/conntrack-1.00beta1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel libnetfilter_conntrack-devel %description conntrack is used to search, list, inspect and maintain the netfilter connection tracking subsystem of the Linux kernel. Using conntrack , you can dump a list of all (or a filtered selection of) currently tracked connections, delete connections from the state table, and even add new ones. In addition, you can also monitor connection tracking events, e.g. show an event message (one line) per newly established connection. %prep %setup -q -n conntrack-1.00beta1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog COPYING AUTHORS %{_libdir}/conntrack/*.so %{_sbindir}/conntrack %{_mandir}/man8/* %changelog * Mon May 15 2006 Paul P Komkoff Jr - 1.0-0.1.beta1 - Preparing for submission to fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/conntrack/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 May 2006 21:59:46 -0000 1.1 +++ .cvsignore 16 May 2006 22:00:52 -0000 1.2 @@ -0,0 +1 @@ +conntrack-1.00beta1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/conntrack/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 May 2006 21:59:46 -0000 1.1 +++ sources 16 May 2006 22:00:52 -0000 1.2 @@ -0,0 +1 @@ +7491f914a9ebce180df88cbef0d994b3 conntrack-1.00beta1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 16 23:03:13 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 May 2006 16:03:13 -0700 Subject: rpms/TeXmacs/devel TeXmacs-1.0.6.1-guile18.patch, NONE, 1.1 TeXmacs.spec, 1.36, 1.37 Message-ID: <200605162303.k4GN3j6W018275@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206 Modified Files: TeXmacs.spec Added Files: TeXmacs-1.0.6.1-guile18.patch Log Message: TeXmacs-1.0.6.1-guile18.patch: --- NEW FILE TeXmacs-1.0.6.1-guile18.patch --- --- TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.hpp.guile18 2006-05-16 21:16:49.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.hpp 2006-05-16 22:11:06.000000000 +0200 @@ -32,7 +32,6 @@ SCM path_to_scm (path p); SCM url_to_scm (url u); SCM scheme_tree_to_scm (scheme_tree t); -bool scm_to_bool (SCM obj); int scm_to_int (SCM obj); string scm_to_string (SCM obj); string scm_to_symbol (SCM obj); --- TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.cpp.guile18 2006-05-16 21:37:04.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Guile/Glue/glue.cpp 2006-05-16 22:58:35.000000000 +0200 @@ -110,11 +110,6 @@ return scm_bool2scm (flag); } -bool -scm_to_bool (SCM flag) { - return scm_scm2bool (flag); -} - /****************************************************************************** * Integers ******************************************************************************/ @@ -144,11 +139,6 @@ return scm_double2scm (i); } -static double -scm_to_double (SCM i) { - return scm_scm2double (i); -} - /****************************************************************************** * Strings ******************************************************************************/ @@ -246,7 +236,7 @@ SCM tree_smob; SCM_NEWCELL (tree_smob); SCM_SETCDR (tree_smob, (SCM) ((void*) (new tree (t)))); - SCM_SETCAR (tree_smob, tree_tag); + SCM_SETCAR (tree_smob, (SCM)tree_tag); return tree_smob; } @@ -434,7 +424,7 @@ SCM observer_smob; SCM_NEWCELL (observer_smob); SCM_SETCDR (observer_smob, (SCM) ((void*) (new observer (o)))); - SCM_SETCAR (observer_smob, observer_tag); + SCM_SETCAR (observer_smob, (SCM)observer_tag); return observer_smob; } @@ -485,7 +475,7 @@ SCM display_smob; SCM_NEWCELL (display_smob); SCM_SETCDR (display_smob, (SCM) ((void*) (new display (dis)))); - SCM_SETCAR (display_smob, display_tag); + SCM_SETCAR (display_smob, (SCM) display_tag); return display_smob; } @@ -541,7 +531,7 @@ SCM widget_smob; SCM_NEWCELL (widget_smob); SCM_SETCDR (widget_smob, (SCM) ((void*) (new widget (wid)))); - SCM_SETCAR (widget_smob, widget_tag); + SCM_SETCAR (widget_smob, (SCM) widget_tag); return widget_smob; } @@ -593,7 +583,7 @@ SCM make_widget_smob; SCM_NEWCELL (make_widget_smob); SCM_SETCDR (make_widget_smob, (SCM) ((void*) (new make_widget (mw)))); - SCM_SETCAR (make_widget_smob, make_widget_tag); + SCM_SETCAR (make_widget_smob, (SCM) make_widget_tag); return make_widget_smob; } @@ -645,7 +635,7 @@ SCM command_smob; SCM_NEWCELL (command_smob); SCM_SETCDR (command_smob, (SCM) ((void*) (new command (cmd)))); - SCM_SETCAR (command_smob, command_tag); + SCM_SETCAR (command_smob, (SCM) command_tag); return command_smob; } @@ -701,7 +691,7 @@ SCM url_smob; SCM_NEWCELL (url_smob); SCM_SETCDR (url_smob, (SCM) ((void*) (new url (u)))); - SCM_SETCAR (url_smob, url_tag); + SCM_SETCAR (url_smob, (SCM) url_tag); return url_smob; } --- TeXmacs-1.0.6.1-src/src/Guile/guile.hpp.guile18 2006-05-16 20:52:03.000000000 +0200 +++ TeXmacs-1.0.6.1-src/src/Guile/guile.hpp 2006-05-16 22:09:58.000000000 +0200 @@ -21,8 +21,6 @@ #ifdef GUILE_A #define scm_is_bool gh_boolean_p #define scm_is_int SCM_INUMP -#define scm_is_string gh_string_p -#define scm_is_symbol gh_symbol_p #define scm_is_null gh_null_p #define scm_is_pair gh_pair_p #define scm_is_list gh_list_p @@ -51,12 +49,7 @@ #endif #ifdef GUILE_B -#define scm_is_bool(x) SCM_NFALSEP(scm_boolean_p(x)) #define scm_is_int SCM_INUMP -#define scm_is_string(x) SCM_NFALSEP(scm_string_p(x)) -#define scm_is_symbol(x) SCM_NFALSEP(scm_symbol_p(x)) -#define scm_is_null(x) SCM_NFALSEP(scm_null_p(x)) -#define scm_is_pair(x) SCM_NFALSEP(scm_pair_p(x)) #define scm_is_list(x) SCM_NFALSEP(scm_list_p(x)) #define scm_bool2scm SCM_BOOL Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- TeXmacs.spec 12 May 2006 17:42:37 -0000 1.36 +++ TeXmacs.spec 16 May 2006 23:03:10 -0000 1.37 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -11,6 +11,7 @@ Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch Patch4: TeXmacs-1.0.6.1-gcc41.patch +Patch5: TeXmacs-1.0.6.1-guile18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex Requires: tetex-fonts @@ -29,6 +30,7 @@ BuildRequires: libXmu-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel +BuildRequires: libtool-ltdl-devel Requires: fig2ps Requires(post): shared-mime-info, desktop-file-utils Requires(postun): shared-mime-info, desktop-file-utils @@ -58,6 +60,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -70,9 +73,8 @@ rm -fr $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install export GUILE_DATA_PATH=`guile-config info pkgdatadir` -export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d | grep ice-9` +export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d -name ice-9` cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs -chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/* chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info @@ -158,6 +160,11 @@ %changelog +* Tue May 16 2006 Gerard Milmeister - 1.0.6.1-4 +- added patch for new guile-1.8 +- added buildreq for libtool-ltdl-devel +- fixed command to find ice-9 directory + * Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 - new version 1.0.6.1 From fedora-extras-commits at redhat.com Tue May 16 23:16:49 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 16 May 2006 16:16:49 -0700 Subject: owners owners.list,1.1010,1.1011 Message-ID: <200605162316.k4GNGpLb018386@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18369 Modified Files: owners.list Log Message: add kchmviewer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1010 retrieving revision 1.1011 diff -u -r1.1010 -r1.1011 --- owners.list 16 May 2006 19:04:03 -0000 1.1010 +++ owners.list 16 May 2006 23:16:49 -0000 1.1011 @@ -560,6 +560,7 @@ Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org| +Fedora Extras|kchmviewer|CHM viewer|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|kdemultimedia-extras|Extras for KDE multimedia applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 17 01:11:50 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 16 May 2006 18:11:50 -0700 Subject: rpms/darcs/devel darcs.spec,1.9,1.10 Message-ID: <200605170111.k4H1Bqej023705@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23684 Modified Files: darcs.spec Log Message: disable "make check" for now since it chokes in buildsystem Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- darcs.spec 15 May 2006 01:26:11 -0000 1.9 +++ darcs.spec 17 May 2006 01:11:49 -0000 1.10 @@ -54,7 +54,7 @@ %build %configure --libexecdir=%{_localstatedir}/www make all -make check +#make check %install @@ -87,6 +87,7 @@ * Sun May 14 2006 Jens Petersen - 1.0.7-1 - update to 1.0.7 - fix typo of propagate in description (#189651) +- disable "make check" for now since it chokes in buildsystem * Thu Mar 2 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 From fedora-extras-commits at redhat.com Wed May 17 03:26:32 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:26:32 -0700 Subject: rpms/crossfire - New directory Message-ID: <200605170326.k4H3QY9s028665@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644/crossfire Log Message: Directory /cvs/extras/rpms/crossfire added to the repository From fedora-extras-commits at redhat.com Wed May 17 03:26:32 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:26:32 -0700 Subject: rpms/crossfire/devel - New directory Message-ID: <200605170326.k4H3QYn9028668@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644/crossfire/devel Log Message: Directory /cvs/extras/rpms/crossfire/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 03:26:46 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:26:46 -0700 Subject: rpms/crossfire/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605170326.k4H3QmAP028728@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28692/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module crossfire --- NEW 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 May 17 03:26:46 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:26:46 -0700 Subject: rpms/crossfire Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605170326.k4H3Qmog028725@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28692 Added Files: Makefile import.log Log Message: Setup of module crossfire --- NEW FILE Makefile --- # Top level Makefile for module crossfire all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 17 03:30:30 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:30:30 -0700 Subject: rpms/crossfire import.log,1.1,1.2 Message-ID: <200605170331.k4H3V2w3028836@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28796 Modified Files: import.log Log Message: auto-import crossfire-1.9.0-4 on branch devel from crossfire-1.9.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/crossfire/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 03:26:45 -0000 1.1 +++ import.log 17 May 2006 03:30:30 -0000 1.2 @@ -0,0 +1 @@ +crossfire-1_9_0-4:HEAD:crossfire-1.9.0-4.src.rpm:1147836626 From fedora-extras-commits at redhat.com Wed May 17 03:30:31 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:30:31 -0700 Subject: rpms/crossfire/devel crossfire-1.9.0-plugin-io.patch, NONE, 1.1 crossfire.init, NONE, 1.1 crossfire.logrotate, NONE, 1.1 crossfire.spec, NONE, 1.1 crossfire.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605170331.k4H3V3SU028840@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28796/devel Modified Files: .cvsignore sources Added Files: crossfire-1.9.0-plugin-io.patch crossfire.init crossfire.logrotate crossfire.spec crossfire.sysconfig Log Message: auto-import crossfire-1.9.0-4 on branch devel from crossfire-1.9.0-4.src.rpm crossfire-1.9.0-plugin-io.patch: --- NEW FILE crossfire-1.9.0-plugin-io.patch --- --- plugins/cfpython/cfpython.c 2006-01-30 21:44:56.000000000 -0800 +++ plugins/cfpython/cfpython.c.new 2006-05-16 15:59:29.000000000 -0700 @@ -673,7 +673,7 @@ scriptfile = fopen(context->script, "r"); if (scriptfile == NULL) { if (!silent) - printf( "cfpython - The Script file %s can't be opened\n", context->script); + LOG(llevError, "cfpython - The Script file %s can't be opened\n", context->script); return 0; } pushContext(context); @@ -705,7 +705,7 @@ PyObject *m, *d; int i; gethook = gethooksptr; - printf("CFPython 2.0a init\n"); + LOG(llevDebug, "CFPython 2.0a init\n"); Py_Initialize(); Crossfire_ObjectType.tp_new = PyType_GenericNew; @@ -795,7 +795,7 @@ rv = 0; if (current_command < 0) { - printf("Illegal call of runPluginCommand, call find_plugin_command first.\n"); + LOG(llevError, "Illegal call of runPluginCommand, call find_plugin_command first.\n"); return 1; } snprintf(buf, sizeof(buf), "%s.py", cf_get_maps_directory(CustomCommand[current_command].script)); @@ -831,7 +831,7 @@ int rtype = 0; FILE* scriptfile; - printf("CFPython 2.0a post init\n"); + LOG(llevDebug, "CFPython 2.0a post init\n"); registerGlobalEvent = gethook(&rtype, hooktype, "cfapi_system_register_global_event"); unregisterGlobalEvent = gethook(&rtype, hooktype, "cfapi_system_unregister_global_event"); systemDirectory = gethook(&rtype, hooktype, "cfapi_system_directory"); @@ -890,7 +890,7 @@ strcpy(context->options, ""); switch(context->event_code) { case EVENT_CRASH: - printf( "Unimplemented for now\n"); + LOG(llevDebug, "Unimplemented for now\n"); break; case EVENT_BORN: op = va_arg(args, object*); @@ -1044,7 +1044,7 @@ CF_PLUGIN int closePlugin() { - printf("CFPython 2.0a closing\n"); + LOG(llevDebug, "CFPython 2.0a closing\n"); Py_Finalize(); return 0; } --- plugins/cfpython/cfpython_map.c 2006-02-14 23:24:11.000000000 -0800 +++ plugins/cfpython/cfpython_map.c.new 2006-05-16 15:59:40.000000000 -0700 @@ -176,7 +176,7 @@ /* make sure the map is swapped in */ if (map->map->in_memory != MAP_IN_MEMORY) { - printf("MAP AIN'T READY !\n"); + LOG(llevError, "MAP AIN'T READY !\n"); } mflags = cf_map_get_flags(map->map, &(map->map), (sint16)x, (sint16)y, &nx, &ny); --- NEW FILE crossfire.init --- #!/bin/sh # # crossfire This shell script takes care of starting and stopping # the crossfire game server. # # chkconfig: - 15 85 # description: The crossfire server supports playing networked \ # multi-player games. # processname: crossfire # config: /etc/sysconfig/crossfire # pidfile: /var/run/crossfire.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/bin/crossfire" prog=$(basename $exec) pidfile=/var/run/$prog.pid [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { echo -n $"Starting Crossfire game server: " if [ -n "`/sbin/pidof $prog`" ]; then echo -n $"$prog already running" failure echo return 1 fi daemon --user crossfire $exec $CROSSFIRE_OPTIONS -detach -log /var/log/crossfire/crossfire.log retval=$? if [ $retval -eq 0 ]; then success touch $lockfile pidofproc $prog > $pidfile else failure fi echo return $retval } stop() { echo -n $"Stopping Crossfire 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 --- NEW FILE crossfire.logrotate --- /var/log/crossfire/crossfire.log { copytruncate notifempty missingok } --- NEW FILE crossfire.spec --- Name: crossfire Version: 1.9.0 Release: 4%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games License: GPL URL: http://crossfire.real-time.com Source0: http://dl.sourceforge.net/crossfire/%{name}-%{version}.tar.gz Source1: http://dl.sourceforge.net/crossfire/%{name}-%{version}.arch.tar.gz Source2: crossfire.init Source3: crossfire.sysconfig Source4: crossfire.logrotate Patch0: crossfire-1.9.0-plugin-io.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: crossfire-maps # BuildRequires necessary for the map editor BuildRequires: python-devel %if "%fedora" <= "4" BuildRequires: xorg-x11-devel %else BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXaw-devel %endif Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service Requires(pre): fedora-usermgmt Requires(postun): fedora-usermgmt %description Crossfire is a highly graphical role-playing adventure game with characteristics reminiscent of rogue, nethack, omega, and gauntlet. It has multiplayer capability and presently runs under X11. This package contains the server for hosting crossfire games over a public or private network. %package doc Summary: Documentation files for Crossfire Group: Documentation # Don't require the base package. The docs can be used without the # base package, and in fact include docs for both the client and # server packages. %description doc Documentation files for the crossfire game. %package devel Summary: Development files for writing crossfire plugins Group: Development/Libraries Requires: %{name} = %{version} %description devel Development files for writing crossfire plugins. %package plugins Summary: Plugin modules for the crossfire game server Group: Amusements/Games Requires: %{name} = %{version} %description plugins Plugin modules for the crossfire game server. %package client-images Summary: Image cache for crossfire clients Group: Amusements/Games # crossfire-client provides a directory needed by the images. # No version dependency for the client since the images are pretty # ignorant of the client version. Requires: crossfire-client %description client-images Image files that can be used with the crossfire clients so that they don't have to be downloaded from the server. %prep %setup -q %setup -q -a 1 %patch0 mv arch/ lib/ %{__sed} -i 's#\r##' utils/player_dl.pl.in # Don't use a hardcoded /tmp directory for building the image archive %{__sed} -i "s#^\$TMPDIR=.*#\$TMPDIR=\"`pwd`\";#" lib/adm/collect_images.pl # Don't map stdio streams to / %{__sed} -i 's# (void) open ("/", O_RDONLY);# (void) open ("/var/log/crossfire/crossfire.log", O_RDONLY);#' server/daemon.c %build # Change the localstatedir so that the variable data files are # put in /var/games/crossfire instead of /var/crossfire. This is # in agreement with the FHS. %configure --localstatedir=%{_var}/games --disable-static make %{?_smp_mflags} # This will create a tarball of the images for the client. cd lib && adm/collect_images.pl -archive %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Install the client images mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}-client tar xf %{name}-images.tar -C $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}-client # Nuke the installation instructions for the image archive. rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}-client/README install -pD -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/crossfire # Move some rarely-used binaries out of /usr/bin and into a # tools directory. mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # This utility restarts crossfire at periodic intervals. mv $RPM_BUILD_ROOT%{_bindir}/crossloop.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # This submits core files to the developers. mv $RPM_BUILD_ROOT%{_bindir}/crossloop.web $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # Allows players to download their player files from a web # server. This feature relies on a properly configured web server # which is not handled by this rpm release. mv $RPM_BUILD_ROOT%{_bindir}/player_dl.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # Binary for running a crossfire metaserver. Requires interaction with # a web server, so we disable this for now. rm $RPM_BUILD_ROOT%{_libdir}/%{name}/metaserver.pl # I have no idea what this is for. mv $RPM_BUILD_ROOT%{_libdir}/%{name}/mktable.script $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # This is not needed anymore based on comments at the top of # the file itself. rm $RPM_BUILD_ROOT%{_libdir}/%{name}/add_throw.perl # /usr/bin is a better place for the standalone random map generator mv $RPM_BUILD_ROOT%{_libdir}/%{name}/random_map $RPM_BUILD_ROOT%{_bindir}/cross_random_map rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la # Create the log directory mkdir -p $RPM_BUILD_ROOT%{_var}/log/%{name} install -p -D -m 644 %{SOURCE3} \ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name} install -p -D -m 644 %{SOURCE4} \ $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name} %pre user_uid=`id -u crossfire 2>/dev/null` if [ x"$user_uid" = x ] ; then %{_sbindir}/fedora-useradd 27 -r -s /sbin/nologin \ -d %{_datadir}/%{name} -M -c 'Crossfire Server' \ crossfire >/dev/null || : fi %post /sbin/chkconfig --add crossfire %preun if [ "$1" = "0" ]; then /sbin/service crossfire stop > /dev/null 2>&1 /sbin/chkconfig --del crossfire fi %postun if [ "$1" -ge "1" ]; then /sbin/service crossfire restart >/dev/null 2>&1 fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/crossedit %{_bindir}/crossfire %{_bindir}/crossloop %{_bindir}/cross_random_map %{_datadir}/%{name} %exclude %{_datadir}/%{name}/%{name}-client %dir %{_libdir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/ban_file %config(noreplace) %{_sysconfdir}/%{name}/dm_file %config(noreplace) %{_sysconfdir}/%{name}/exp_table %config(noreplace) %{_sysconfdir}/%{name}/forbid %config(noreplace) %{_sysconfdir}/%{name}/motd %config(noreplace) %{_sysconfdir}/%{name}/news %config(noreplace) %{_sysconfdir}/%{name}/rules %config(noreplace) %{_sysconfdir}/%{name}/settings %attr(-,crossfire,root) %{_var}/games/%{name} %attr(-,crossfire,root) %{_var}/log/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man6/* %{_initrddir}/%{name} %doc README NEWS DEVELOPERS AUTHORS COPYING %files doc %defattr(-,root,root,-) %doc doc/*.doc doc/*.ps doc/SurvivalGuide %doc doc/PlayerStats doc/RunTimeCommands doc/spellcasters_guide_to_runes %files devel %defattr(-,root,root,-) %{_bindir}/crossfire-config %doc doc/plugins %files plugins %defattr(-,root,root,-) %{_libdir}/%{name}/plugins %files client-images %defattr(-,root,root,-) %{_datadir}/%{name}/%{name}-client %changelog * Tue May 16 2006 Wart 1.9.0-4 - Added -doc subpackage - Own /etc/crossfire - Add crossfire-client dependency for crossfire-client-images * Tue May 16 2006 Wart 1.9.0-3 - Added patch to fix missing stdout problem with python plugin. * Mon May 15 2006 Wart 1.9.0-2 - Generate the -client-images subpackage here instead of relying on upstream's missing -client-images tarball. * Thu Mar 9 2006 Wart 1.9.0-1 - Initial spec file following Fedora Extras conventions --- NEW FILE crossfire.sysconfig --- # # crossfire(6) options. Pick a custom port here if needed, for example. # # The default options for crossfire are usually just fine. Read # the crossfire(6) manpage to see what you can set here. CROSSFIRE_OPTIONS="" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 03:26:46 -0000 1.1 +++ .cvsignore 17 May 2006 03:30:31 -0000 1.2 @@ -0,0 +1,2 @@ +crossfire-1.9.0.arch.tar.gz +crossfire-1.9.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/crossfire/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 03:26:46 -0000 1.1 +++ sources 17 May 2006 03:30:31 -0000 1.2 @@ -0,0 +1,2 @@ +7685cc806a02a3f14336095de6066128 crossfire-1.9.0.arch.tar.gz +43240af83a4414d2dcc19fff3af31a63 crossfire-1.9.0.tar.gz From fedora-extras-commits at redhat.com Wed May 17 03:35:07 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 16 May 2006 20:35:07 -0700 Subject: owners owners.list,1.1011,1.1012 Message-ID: <200605170335.k4H3Z9ZW028900@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28883 Modified Files: owners.list Log Message: Added crossfire Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1011 retrieving revision 1.1012 diff -u -r1.1011 -r1.1012 --- owners.list 16 May 2006 23:16:49 -0000 1.1011 +++ owners.list 17 May 2006 03:35:07 -0000 1.1012 @@ -170,6 +170,7 @@ Fedora Extras|cppunit|C++ unit testing framework|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| +Fedora Extras|crossfire|Crossfire game server|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|crossfire-client|Crossfire game client|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|crossfire-maps|Crossfire game server maps|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 17 05:27:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 22:27:47 -0700 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.35,1.36 Message-ID: <200605170527.k4H5RniO001346@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-serv1313 Modified Files: sylpheed-claws.spec Log Message: - version Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sylpheed-claws.spec 15 May 2006 07:22:53 -0000 1.35 +++ sylpheed-claws.spec 17 May 2006 05:27:47 -0000 1.36 @@ -164,6 +164,7 @@ %changelog * Mon May 15 2006 Andreas Bierfert +2.2.0-1 - version upgrade * Sat Apr 22 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Wed May 17 06:46:29 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:46:29 -0700 Subject: rpms/nessus-libraries/FC-4 .cvsignore, 1.2, 1.3 nessus-libraries.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605170646.k4H6kVC4003973@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3920/FC-4 Modified Files: .cvsignore nessus-libraries.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Mar 2006 08:47:02 -0000 1.2 +++ .cvsignore 17 May 2006 06:46:29 -0000 1.3 @@ -1 +1 @@ -nessus-libraries-2.2.6.tar.gz +nessus-libraries-2.2.7.tar.gz Index: nessus-libraries.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-4/nessus-libraries.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-libraries.spec 14 Mar 2006 08:47:02 -0000 1.1 +++ nessus-libraries.spec 17 May 2006 06:46:29 -0000 1.2 @@ -1,12 +1,12 @@ Name: nessus-libraries -Version: 2.2.6 -Release: 2%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Support libraries for nessus Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-libraries-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-libraries-2.2.7.tar.gz Patch0: nessus-libraries-config.patch Patch1: nessus-libraries-2.2.4.Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,10 @@ %{_bindir}/nessus-config %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - include patch for localstatedir Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Mar 2006 08:47:02 -0000 1.2 +++ sources 17 May 2006 06:46:29 -0000 1.3 @@ -1 +1 @@ -ac027cd2dfa149a44a6dbb748eb93ce9 nessus-libraries-2.2.6.tar.gz +740d9f2d97c495a52663a15a0fe5e6cd nessus-libraries-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:46:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:46:30 -0700 Subject: rpms/nessus-libraries/devel .cvsignore, 1.2, 1.3 nessus-libraries.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605170646.k4H6kWT8003985@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3920/devel Modified Files: .cvsignore nessus-libraries.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Mar 2006 08:47:02 -0000 1.2 +++ .cvsignore 17 May 2006 06:46:30 -0000 1.3 @@ -1 +1 @@ -nessus-libraries-2.2.6.tar.gz +nessus-libraries-2.2.7.tar.gz Index: nessus-libraries.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/nessus-libraries.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-libraries.spec 14 Mar 2006 08:47:02 -0000 1.1 +++ nessus-libraries.spec 17 May 2006 06:46:30 -0000 1.2 @@ -1,12 +1,12 @@ Name: nessus-libraries -Version: 2.2.6 -Release: 2%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Support libraries for nessus Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-libraries-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-libraries-2.2.7.tar.gz Patch0: nessus-libraries-config.patch Patch1: nessus-libraries-2.2.4.Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,10 @@ %{_bindir}/nessus-config %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - include patch for localstatedir Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Mar 2006 08:47:02 -0000 1.2 +++ sources 17 May 2006 06:46:30 -0000 1.3 @@ -1 +1 @@ -ac027cd2dfa149a44a6dbb748eb93ce9 nessus-libraries-2.2.6.tar.gz +740d9f2d97c495a52663a15a0fe5e6cd nessus-libraries-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:46:29 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:46:29 -0700 Subject: rpms/nessus-libraries/FC-5 .cvsignore, 1.2, 1.3 nessus-libraries.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605170646.k4H6kWFZ003979@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3920/FC-5 Modified Files: .cvsignore nessus-libraries.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Mar 2006 08:47:02 -0000 1.2 +++ .cvsignore 17 May 2006 06:46:29 -0000 1.3 @@ -1 +1 @@ -nessus-libraries-2.2.6.tar.gz +nessus-libraries-2.2.7.tar.gz Index: nessus-libraries.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-5/nessus-libraries.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-libraries.spec 14 Mar 2006 08:47:02 -0000 1.1 +++ nessus-libraries.spec 17 May 2006 06:46:29 -0000 1.2 @@ -1,12 +1,12 @@ Name: nessus-libraries -Version: 2.2.6 -Release: 2%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Support libraries for nessus Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-libraries-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-libraries-2.2.7.tar.gz Patch0: nessus-libraries-config.patch Patch1: nessus-libraries-2.2.4.Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,10 @@ %{_bindir}/nessus-config %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - include patch for localstatedir Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Mar 2006 08:47:02 -0000 1.2 +++ sources 17 May 2006 06:46:29 -0000 1.3 @@ -1 +1 @@ -ac027cd2dfa149a44a6dbb748eb93ce9 nessus-libraries-2.2.6.tar.gz +740d9f2d97c495a52663a15a0fe5e6cd nessus-libraries-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:48:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:48:32 -0700 Subject: rpms/libnasl/devel libnasl-CVE-2006-2093.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libnasl.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605170648.k4H6mYl4004173@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4109/devel Modified Files: .cvsignore libnasl.spec sources Added Files: libnasl-CVE-2006-2093.patch Log Message: - version upgrade - CVE-2006-2093 patch libnasl-CVE-2006-2093.patch: --- NEW FILE libnasl-CVE-2006-2093.patch --- --- nasl/nasl_text_utils.c.orig 2006-05-17 07:48:57.000000000 +0200 +++ nasl/nasl_text_utils.c 2006-05-17 07:52:08.000000000 +0200 @@ -964,7 +964,15 @@ sep = get_str_local_var_by_name(lexic, "sep"); if (sep != NULL) + { sep_len = get_var_size_by_name(lexic, "sep"); + if(sep_len == 0) + { + nasl_perror(lexic, "split: invalid 'sep' argument value\n"); + return NULL; + } + } + keep = get_int_local_var_by_name(lexic, "keep", 1); retc = alloc_tree_cell(0, NULL); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Mar 2006 08:54:36 -0000 1.2 +++ .cvsignore 17 May 2006 06:48:31 -0000 1.3 @@ -1 +1 @@ -libnasl-2.2.6.tar.gz +libnasl-2.2.7.tar.gz Index: libnasl.spec =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/libnasl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnasl.spec 18 Mar 2006 08:57:45 -0000 1.2 +++ libnasl.spec 17 May 2006 06:48:31 -0000 1.3 @@ -1,14 +1,15 @@ Name: libnasl -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/libnasl-2.2.7.tar.gz Patch0: libnasl-config.patch Patch1: libnasl-2.2.4.pki.patch +Patch2: libnasl-CVE-2006-2093.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison @@ -44,6 +45,7 @@ %setup -q -n %{name} %patch0 %patch1 -p1 +%patch2 %build %configure --enable-shared --disable-static --with-pic @@ -82,6 +84,11 @@ %{_mandir}/man1/nasl-config.1* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade +- add CVE-2006-2093 patch + * Sat Mar 18 2006 Andreas Bierfert 2.2.6-3 - fix BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Mar 2006 08:54:36 -0000 1.2 +++ sources 17 May 2006 06:48:31 -0000 1.3 @@ -1 +1 @@ -06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz +37f6f0db022dad1e218371909de3e8af libnasl-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:48:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:48:25 -0700 Subject: rpms/libnasl/FC-4 libnasl-CVE-2006-2093.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libnasl.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605170648.k4H6mvnC004178@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4109/FC-4 Modified Files: .cvsignore libnasl.spec sources Added Files: libnasl-CVE-2006-2093.patch Log Message: - version upgrade - CVE-2006-2093 patch libnasl-CVE-2006-2093.patch: --- NEW FILE libnasl-CVE-2006-2093.patch --- --- nasl/nasl_text_utils.c.orig 2006-05-17 07:48:57.000000000 +0200 +++ nasl/nasl_text_utils.c 2006-05-17 07:52:08.000000000 +0200 @@ -964,7 +964,15 @@ sep = get_str_local_var_by_name(lexic, "sep"); if (sep != NULL) + { sep_len = get_var_size_by_name(lexic, "sep"); + if(sep_len == 0) + { + nasl_perror(lexic, "split: invalid 'sep' argument value\n"); + return NULL; + } + } + keep = get_int_local_var_by_name(lexic, "keep", 1); retc = alloc_tree_cell(0, NULL); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Mar 2006 08:54:36 -0000 1.2 +++ .cvsignore 17 May 2006 06:48:25 -0000 1.3 @@ -1 +1 @@ -libnasl-2.2.6.tar.gz +libnasl-2.2.7.tar.gz Index: libnasl.spec =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-4/libnasl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnasl.spec 18 Mar 2006 08:57:45 -0000 1.2 +++ libnasl.spec 17 May 2006 06:48:25 -0000 1.3 @@ -1,14 +1,15 @@ Name: libnasl -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/libnasl-2.2.7.tar.gz Patch0: libnasl-config.patch Patch1: libnasl-2.2.4.pki.patch +Patch2: libnasl-CVE-2006-2093.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison @@ -44,6 +45,7 @@ %setup -q -n %{name} %patch0 %patch1 -p1 +%patch2 %build %configure --enable-shared --disable-static --with-pic @@ -82,6 +84,11 @@ %{_mandir}/man1/nasl-config.1* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade +- add CVE-2006-2093 patch + * Sat Mar 18 2006 Andreas Bierfert 2.2.6-3 - fix BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Mar 2006 08:54:36 -0000 1.2 +++ sources 17 May 2006 06:48:25 -0000 1.3 @@ -1 +1 @@ -06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz +37f6f0db022dad1e218371909de3e8af libnasl-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 06:48:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 May 2006 23:48:26 -0700 Subject: rpms/libnasl/FC-5 libnasl-CVE-2006-2093.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libnasl.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605170648.k4H6mwKO004183@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4109/FC-5 Modified Files: .cvsignore libnasl.spec sources Added Files: libnasl-CVE-2006-2093.patch Log Message: - version upgrade - CVE-2006-2093 patch libnasl-CVE-2006-2093.patch: --- NEW FILE libnasl-CVE-2006-2093.patch --- --- nasl/nasl_text_utils.c.orig 2006-05-17 07:48:57.000000000 +0200 +++ nasl/nasl_text_utils.c 2006-05-17 07:52:08.000000000 +0200 @@ -964,7 +964,15 @@ sep = get_str_local_var_by_name(lexic, "sep"); if (sep != NULL) + { sep_len = get_var_size_by_name(lexic, "sep"); + if(sep_len == 0) + { + nasl_perror(lexic, "split: invalid 'sep' argument value\n"); + return NULL; + } + } + keep = get_int_local_var_by_name(lexic, "keep", 1); retc = alloc_tree_cell(0, NULL); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Mar 2006 08:54:36 -0000 1.2 +++ .cvsignore 17 May 2006 06:48:26 -0000 1.3 @@ -1 +1 @@ -libnasl-2.2.6.tar.gz +libnasl-2.2.7.tar.gz Index: libnasl.spec =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-5/libnasl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnasl.spec 18 Mar 2006 08:57:45 -0000 1.2 +++ libnasl.spec 17 May 2006 06:48:26 -0000 1.3 @@ -1,14 +1,15 @@ Name: libnasl -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/libnasl-2.2.7.tar.gz Patch0: libnasl-config.patch Patch1: libnasl-2.2.4.pki.patch +Patch2: libnasl-CVE-2006-2093.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison @@ -44,6 +45,7 @@ %setup -q -n %{name} %patch0 %patch1 -p1 +%patch2 %build %configure --enable-shared --disable-static --with-pic @@ -82,6 +84,11 @@ %{_mandir}/man1/nasl-config.1* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade +- add CVE-2006-2093 patch + * Sat Mar 18 2006 Andreas Bierfert 2.2.6-3 - fix BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnasl/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Mar 2006 08:54:36 -0000 1.2 +++ sources 17 May 2006 06:48:26 -0000 1.3 @@ -1 +1 @@ -06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz +37f6f0db022dad1e218371909de3e8af libnasl-2.2.7.tar.gz From fedora-extras-commits at redhat.com Wed May 17 07:01:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 May 2006 00:01:08 -0700 Subject: rpms/nessus-core/FC-4 nessus-core-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nessus-core.spec, 1.1, 1.2 sources, 1.2, 1.3 nessus-core-2.2.4.Makefile.patch, 1.1, NONE Message-ID: <200605170701.k4H71eRg006627@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4351/FC-4 Modified Files: .cvsignore nessus-core.spec sources Added Files: nessus-core-Makefile.patch Removed Files: nessus-core-2.2.4.Makefile.patch Log Message: - version upgrade nessus-core-Makefile.patch: --- NEW FILE nessus-core-Makefile.patch --- --- nessus-core/Makefile.orig 2006-05-17 08:35:04.000000000 +0200 +++ nessus-core/Makefile 2006-05-17 08:36:27.000000000 +0200 @@ -34,11 +34,11 @@ test -d $(DESTDIR)${localstatedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir} test -d $(DESTDIR)${NESSUSD_STATEDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/users || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/users - test -d $(DESTDIR)${NESSUSD_STATEDIR}/logs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/logs + test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} - $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${NESSUSD_STATEDIR}/ + $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${sysconfdir}/nessus $(INSTALL) -c -m 0444 include/config.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/ntcompat.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2006 06:21:26 -0000 1.2 +++ .cvsignore 17 May 2006 07:01:08 -0000 1.3 @@ -1 +1 @@ -nessus-core-2.2.6.tar.gz +nessus-core-2.2.7.tar.gz Index: nessus-core.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-4/nessus-core.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-core.spec 7 Apr 2006 06:21:26 -0000 1.1 +++ nessus-core.spec 17 May 2006 07:01:08 -0000 1.2 @@ -1,19 +1,19 @@ Name: nessus-core -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Network vulnerability scanner Group: Applications/System License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-core-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-core-2.2.7.tar.gz Source1: nessusd.init Source2: nessusd.log Source3: nessus.desktop # force nessus into fedora dir structure # and use system gd # Thanks to Dawid Gajownik for providing these patches =) -Patch0: nessus-core-2.2.4.Makefile.patch +Patch0: nessus-core-Makefile.patch Patch1: nessus-core-2.2.4.config.h.in.patch Patch2: nessus-core-2.2.4.configure.in.patch Patch3: nessus-core-2.2.4.configure.patch @@ -218,6 +218,10 @@ %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Mon Apr 03 2006 Andreas Bierfert 2.2.6-3 - fix description Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2006 06:21:26 -0000 1.2 +++ sources 17 May 2006 07:01:08 -0000 1.3 @@ -1 +1 @@ -616dd7727b90df1ac978b5e736c0a960 nessus-core-2.2.6.tar.gz +2dd8c116b435d3ec698d3caed0b48859 nessus-core-2.2.7.tar.gz --- nessus-core-2.2.4.Makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 17 07:01:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 May 2006 00:01:09 -0700 Subject: rpms/nessus-core/FC-5 nessus-core-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nessus-core.spec, 1.1, 1.2 sources, 1.2, 1.3 nessus-core-2.2.4.Makefile.patch, 1.1, NONE Message-ID: <200605170701.k4H71hFM006630@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-core/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4351/FC-5 Modified Files: .cvsignore nessus-core.spec sources Added Files: nessus-core-Makefile.patch Removed Files: nessus-core-2.2.4.Makefile.patch Log Message: - version upgrade nessus-core-Makefile.patch: --- NEW FILE nessus-core-Makefile.patch --- --- nessus-core/Makefile.orig 2006-05-17 08:35:04.000000000 +0200 +++ nessus-core/Makefile 2006-05-17 08:36:27.000000000 +0200 @@ -34,11 +34,11 @@ test -d $(DESTDIR)${localstatedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir} test -d $(DESTDIR)${NESSUSD_STATEDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/users || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/users - test -d $(DESTDIR)${NESSUSD_STATEDIR}/logs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/logs + test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} - $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${NESSUSD_STATEDIR}/ + $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${sysconfdir}/nessus $(INSTALL) -c -m 0444 include/config.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/ntcompat.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2006 06:21:26 -0000 1.2 +++ .cvsignore 17 May 2006 07:01:09 -0000 1.3 @@ -1 +1 @@ -nessus-core-2.2.6.tar.gz +nessus-core-2.2.7.tar.gz Index: nessus-core.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-5/nessus-core.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-core.spec 7 Apr 2006 06:21:26 -0000 1.1 +++ nessus-core.spec 17 May 2006 07:01:09 -0000 1.2 @@ -1,19 +1,19 @@ Name: nessus-core -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Network vulnerability scanner Group: Applications/System License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-core-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-core-2.2.7.tar.gz Source1: nessusd.init Source2: nessusd.log Source3: nessus.desktop # force nessus into fedora dir structure # and use system gd # Thanks to Dawid Gajownik for providing these patches =) -Patch0: nessus-core-2.2.4.Makefile.patch +Patch0: nessus-core-Makefile.patch Patch1: nessus-core-2.2.4.config.h.in.patch Patch2: nessus-core-2.2.4.configure.in.patch Patch3: nessus-core-2.2.4.configure.patch @@ -218,6 +218,10 @@ %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Mon Apr 03 2006 Andreas Bierfert 2.2.6-3 - fix description Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2006 06:21:26 -0000 1.2 +++ sources 17 May 2006 07:01:09 -0000 1.3 @@ -1 +1 @@ -616dd7727b90df1ac978b5e736c0a960 nessus-core-2.2.6.tar.gz +2dd8c116b435d3ec698d3caed0b48859 nessus-core-2.2.7.tar.gz --- nessus-core-2.2.4.Makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 17 07:01:14 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 May 2006 00:01:14 -0700 Subject: rpms/nessus-core/devel nessus-core-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nessus-core.spec, 1.1, 1.2 sources, 1.2, 1.3 nessus-core-2.2.4.Makefile.patch, 1.1, NONE Message-ID: <200605170701.k4H71k7J006633@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4351/devel Modified Files: .cvsignore nessus-core.spec sources Added Files: nessus-core-Makefile.patch Removed Files: nessus-core-2.2.4.Makefile.patch Log Message: - version upgrade nessus-core-Makefile.patch: --- NEW FILE nessus-core-Makefile.patch --- --- nessus-core/Makefile.orig 2006-05-17 08:35:04.000000000 +0200 +++ nessus-core/Makefile 2006-05-17 08:36:27.000000000 +0200 @@ -34,11 +34,11 @@ test -d $(DESTDIR)${localstatedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir} test -d $(DESTDIR)${NESSUSD_STATEDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/users || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/users - test -d $(DESTDIR)${NESSUSD_STATEDIR}/logs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/logs + test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR} - $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${NESSUSD_STATEDIR}/ + $(INSTALL) -c -m 0444 nessus-services $(DESTDIR)${sysconfdir}/nessus $(INSTALL) -c -m 0444 include/config.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/ntcompat.h $(DESTDIR)${includedir}/nessus $(INSTALL) -c -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-core/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2006 06:21:26 -0000 1.2 +++ .cvsignore 17 May 2006 07:01:13 -0000 1.3 @@ -1 +1 @@ -nessus-core-2.2.6.tar.gz +nessus-core-2.2.7.tar.gz Index: nessus-core.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-core/devel/nessus-core.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nessus-core.spec 7 Apr 2006 06:21:26 -0000 1.1 +++ nessus-core.spec 17 May 2006 07:01:13 -0000 1.2 @@ -1,19 +1,19 @@ Name: nessus-core -Version: 2.2.6 -Release: 3%{?dist} +Version: 2.2.7 +Release: 1%{?dist} Summary: Network vulnerability scanner Group: Applications/System License: GPL URL: http://www.nessus.org -Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-core-2.2.6.tar.gz +Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.7/src/nessus-core-2.2.7.tar.gz Source1: nessusd.init Source2: nessusd.log Source3: nessus.desktop # force nessus into fedora dir structure # and use system gd # Thanks to Dawid Gajownik for providing these patches =) -Patch0: nessus-core-2.2.4.Makefile.patch +Patch0: nessus-core-Makefile.patch Patch1: nessus-core-2.2.4.config.h.in.patch Patch2: nessus-core-2.2.4.configure.in.patch Patch3: nessus-core-2.2.4.configure.patch @@ -218,6 +218,10 @@ %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/* %changelog +* Wed May 17 2006 Andreas Bierfert +2.2.7-1 +- version upgrade + * Mon Apr 03 2006 Andreas Bierfert 2.2.6-3 - fix description Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-core/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2006 06:21:26 -0000 1.2 +++ sources 17 May 2006 07:01:13 -0000 1.3 @@ -1 +1 @@ -616dd7727b90df1ac978b5e736c0a960 nessus-core-2.2.6.tar.gz +2dd8c116b435d3ec698d3caed0b48859 nessus-core-2.2.7.tar.gz --- nessus-core-2.2.4.Makefile.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 17 07:46:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 May 2006 00:46:27 -0700 Subject: rpms/nessus-core/FC-4 nessus-core.spec,1.2,1.3 Message-ID: <200605170746.k4H7kT8d007076@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7059 Modified Files: nessus-core.spec Log Message: - fix BR for FC4 Index: nessus-core.spec =================================================================== RCS file: /cvs/extras/rpms/nessus-core/FC-4/nessus-core.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nessus-core.spec 17 May 2006 07:01:08 -0000 1.2 +++ nessus-core.spec 17 May 2006 07:46:27 -0000 1.3 @@ -30,7 +30,7 @@ BuildRequires: libnasl-devel BuildRequires: gtk2-devel BuildRequires: glib2-devel -BuildRequires: libICE-devel +BuildRequires: xorg-x11-devel BuildRequires: gd-devel BuildRequires: tcp_wrappers BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Wed May 17 08:20:35 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 17 May 2006 01:20:35 -0700 Subject: fedora-security/audit fc5,1.165,1.166 Message-ID: <200605170820.k4H8KZgl009511@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9493 Modified Files: fc5 Log Message: The php update fixed some extra things too. Jorton confirmed: Bug(s): 187231 187511 187891 189592 190034 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- fc5 16 May 2006 20:38:52 -0000 1.165 +++ fc5 17 May 2006 08:20:33 -0000 1.166 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060515 -Up to date FC5 as of 20060515 +Up to date CVE as of CVE email 20060516 +Up to date FC5 as of 20060516 ** are items that need attention @@ -23,8 +23,8 @@ CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473] CVE-2006-1993 version (firefox, fixed 1.5.0.3) #190124 [since FEDORA-2006-547] -CVE-2006-1991 VULNERABLE (php) #190034 -CVE-2006-1990 VULNERABLE (php) #190034 +CVE-2006-1991 version (php) #190034 [since FEDORA-2006-289] +CVE-2006-1990 version (php) #190034 [since FEDORA-2006-289] CVE-2006-1942 ** firefox CVE-2006-1940 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] CVE-2006-1939 version (ethereal, fixed 0.99.0) #189909 [since FEDORA-2006-456] @@ -40,7 +40,7 @@ CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] -CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 +CVE-2006-1861 VULNERABLE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] @@ -125,7 +125,7 @@ CVE-2006-1518 VULNERABLE (mysql, fixed 5.0.21) #190870 CVE-2006-1517 VULNERABLE (mysql, fixed 5.0.21) #190868 CVE-2006-1516 VULNERABLE (mysql, fixed 5.0.21) #190866 -CVE-2006-1494 VULNERABLE (php)#189592 +CVE-2006-1494 version (php) #189592 [since FEDORA-2006-289] CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289] CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 @@ -218,7 +218,7 @@ CVE-2006-0292 version (thunderbird, fixed 1.5) CVE-2006-0292 version (firefox, fixed 1.5.1) CVE-2006-0292 backport (mozilla) mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch -CVE-2006-0254 backport (tomcat5, fixed 5.5.16) #178179 **check this** +CVE-2006-0254 backport (tomcat5, fixed 5.5.16) #178179 **check this CVE-2006-0236 ignore (thunderbird) windows only CVE-2006-0225 version (openssh, fixed 4.3p2) CVE-2006-0208 version (php, fixed 5.1.2) @@ -235,7 +235,7 @@ CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193] CVE-2006-0052 version (mailman, fixed 2.1.6) CVE-2006-0049 version (gnupg, fixed 1.4.2.2) -CVE-2006-0040 ** VULNERABLE (gtkhtml) #183680 no upstream fix +CVE-2006-0040 VULNERABLE (gtkhtml) #183680 no upstream fix CVE-2006-0037 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] From fedora-extras-commits at redhat.com Wed May 17 09:58:56 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 17 May 2006 02:58:56 -0700 Subject: extras-buildsys/utils extras-push-new,1.9,1.10 Message-ID: <200605170958.k4H9wuET012163@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12145 Modified Files: extras-push-new Log Message: fix rather harmless typo in exit condition Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- extras-push-new 11 May 2006 16:48:59 -0000 1.9 +++ extras-push-new 17 May 2006 09:58:53 -0000 1.10 @@ -116,7 +116,7 @@ try: self.rc = fcntl.flock(self.file, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError: - print 'ERROR: script locked via lockfile %s - it seems to be running already' % name + print 'ERROR: script locked via lockfile %s - it seems to be running already' % self.name sys.exit(11) From fedora-extras-commits at redhat.com Wed May 17 13:02:53 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 17 May 2006 06:02:53 -0700 Subject: rpms/cernlib/devel cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib.spec, 1.30, 1.31 cernlib_2005.05.09.dfsg-5.diff, 1.1, NONE Message-ID: <200605171303.k4HD3Qm5022288@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22230 Modified Files: 112-remove-nonexistent-prototypes-from-gen.h.dpatch 805-expunge-missing-mathlib-kernlib-symbols.dpatch cernlib.spec Added Files: cernlib_2005.05.09.dfsg-6.diff Removed Files: cernlib_2005.05.09.dfsg-5.diff Log Message: * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 cernlib_2005.05.09.dfsg-6.diff: --- NEW FILE cernlib_2005.05.09.dfsg-6.diff --- --- cernlib-2005.05.09.dfsg.orig/debian/control +++ cernlib-2005.05.09.dfsg/debian/control @@ -0,0 +1,896 @@ +Source: cernlib +Maintainer: Kevin B. McCarty +Standards-Version: 3.7.2 +Priority: optional +Section: science +Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin + +Package: cernlib-base +Architecture: all +Section: devel +Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev +Description: script to determine Cernlib library dependencies + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This package includes the "cernlib" script that lists the command-line + options needed for linking against Cernlib libraries. The script has + been rewritten from the upstream version to calculate + dependencies recursively. Also included are a README.Debian with a summary + of changes made to Cernlib to fit it into Debian packaging practices, + and a contributed set of Autoconf macros to test for Cernlib libraries. + +Package: cernlib-core-dev +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit +Description: Cernlib development headers, tools, and static libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the header files and static libraries likely to be + wanted by developers using the Cern libraries who are not interested + specifically in high energy physics. It also provides the Cernlib + development tools DZedit and KUIPC. Cernlib analysis programs may be + obtained by installing the cernlib-core metapackage. + +Package: cernlib-core +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos +Description: Cernlib main libraries and programs + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the libraries and analysis tools (e.g. PAW) likely + to be wanted by most users of the Cern libraries who are not interested + specifically in high energy physics. You cannot do program development by + installing only this metapackage; development libraries and tools may + be obtained by installing the cernlib-core-dev metapackage or individual + lib*-dev packages. + +Package: cernlib-extras +Architecture: all +Priority: extra +Section: science +Depends: cernlib-base (= ${Source-Version}), pawserv, zftp +Description: miscellaneous Cernlib programs unlikely to be used by many + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides a few additional Cernlib programs not included + in any other Cernlib metapackage. Very few people are likely to be + interested in them; currently they include zftp, pawserv and zserv. + Notice that the latter two programs run as daemons through inetd and may + reduce your system's security! + . + Installing this package along with the "cernlib" metapackage will supply + a complete set of all Cernlib programs and libraries included in Debian. + +Package: cernlib-montecarlo +Architecture: all +Section: science +Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev +Recommends: libisajet758-2-dev +Description: Cernlib Monte Carlo libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides various Monte Carlo libraries included in Cernlib + (both shared and static). Likely only physicists will be interested in + these packages. Note that the Geant 3.21 program is not included, but it may + be obtained by also installing the geant321 Debian package. + . + Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are + not available within Debian due to licensing issues; see the README.Debian + file in the montecarlo-base package for information on obtaining them. + . + Additionally, the Isajet library is not available on the m68k architecture + due to a compiler flaw. + +Package: cernlib +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev +Description: almost complete set of Debian Cernlib packages + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides almost all of the programs and libraries contained + in Cernlib. Most people will likely want only a subset of these. A few + extra Cernlib programs, not of interest to many people, may be obtained via + the cernlib-extras metapackage. + +Package: dzedit +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libpacklib1-dev +Description: Cernlib's ZEBRA documentation editor + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system + developed at CERN. ZEBRA, part of the Packlib library, permits a developer to + create complex data structures in the FORTRAN 77 language; the DZDOC system + allows the developer to generate and maintain documentation of ZEBRA data + structures. + +Package: geant321-data +Architecture: all +Section: science +Depends: cernlib-base +Description: [Physics] Data for Geant 3.21 detector simulator + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes data files for use by Geant. + +Package: geant321-doc +Architecture: all +Section: doc +Depends: cernlib-base +Description: [Physics] Documentation for Geant 3.21 + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes some documentation about Geant. + +Package: geant321 +Architecture: all +Section: science +Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77 +Suggests: kxterm, geant321-doc +Description: [Physics] Particle detector description and simulation tool + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes gxint, the script used to perform this linking step. + +Package: kuipc +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, cernlib-base +Recommends: libpacklib1-dev +Suggests: libpacklib1-lesstif-dev +Description: Cernlib's Kit for a User Interface Package (KUIP) compiler + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify + the writing of a program's user interface code. It takes as + input a Command Definition File (CDF) that describes the + commands to be understood by the program, and outputs C or FORTRAN code that + makes the appropriate function calls to set up the user interface. This + code can then be compiled and linked with the rest of the program. Since + the generated code uses KUIP routines, the program must also be linked + against the Packlib library that contains them. + . + KUIPC is no longer actively developed, so aside from its use in the build + process of Cernlib, it is of mainly historical interest. + +Package: kxterm +Architecture: any +Section: science +Depends: ${shlibs:Depends}, cernlib-base +Description: Cernlib's KUIP terminal emulator + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KXterm is a terminal emulator which combines the best features from + the (now defunct) Apollo DM pads (like: input and transcript [...21456 lines suppressed...] +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ./pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, C??? hai" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd" + +#. Type: select +#. Description +#: ./pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po +++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-05-26 16:05-0300\n" +"Last-Translator: Andr? Lu?s Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a serem executados a partir do inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos " +"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv " +"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP " +"do CERN). Esses servidores s?o executados a partir do inetd; voc? " +"pode habilitar cada um deles separadamente ou ambos. A menos que voc? " +"possua necessidades bastante especializadas, voc? provavelmente ir? " +"desejar habilitar somente o pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po +++ cernlib-2005.05.09.dfsg/debian/po/sv.po @@ -0,0 +1,53 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib 2005.05.09-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-10-06 23:50+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, B?da" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servrar som ska k?ras fr?n inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att " +"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem " +"att logga in med CERN's ZFTP-protokoll). Dessa servrar k?rs fr?n inetd; du m?ste " +"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott " +"om pawserv aktiveras." + --- cernlib-2005.05.09.dfsg.orig/debian/po/es.po +++ cernlib-2005.05.09.dfsg/debian/po/es.po @@ -0,0 +1,55 @@ +# cernlib po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the cernlib package. +# +# Changes: +# - Initial translation +# C??sar G??mez Mart??n +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentaci??n de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducci??n de Debian al espa??ol +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducci??n en +# http://www.debian.org/intl/spanish/notas +# +# - La gu??a de traducci??n de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-09-01 17:49+0100\n" +"Last-Translator: C??sar G??mez Mart??n \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a ejecutar desde inetd" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol). These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv." +msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++) y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv." + Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 112-remove-nonexistent-prototypes-from-gen.h.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch 17 May 2006 13:02:50 -0000 1.2 @@ -68,19 +68,6 @@ PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT) #define FREQ(A2) CCALLSFFUN1(FREQ,freq,FLOAT,A2) -@@ -255,10 +255,10 @@ - - PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE) - #define DFRSIN(A2) CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2) -- -+/* - PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV) - #define FUN(A2,A3) CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3) -- -+*/ - PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT) - #define G116F1(A2) CCALLSFFUN1(G116F1,g116f1,FLOAT,A2) - @@ -270,10 +270,10 @@ PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT) Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 805-expunge-missing-mathlib-kernlib-symbols.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch 17 May 2006 13:02:50 -0000 1.2 @@ -5,9 +5,9 @@ ## DP: Remove some unreferenced symbols from mathlib and kernlib. @DPATCH@ -diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile ---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2005-06-13 11:20:33.838151240 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:37.545106161 -0400 ++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:48.094863874 -0400 @@ -1,6 +1,8 @@ #ifndef CERNLIB_VAXVMS @@ -18,9 +18,9 @@ readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\ tmproi.F toslat.F unlinkf.F -diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:12:24.894703741 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:16:54.864966246 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:38.432917462 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:48.095863661 -0400 @@ -2,20 +2,22 @@ #include "pilot.h" @@ -50,25 +50,29 @@ #if defined(CERNLIB_DOUBLE) SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\ -diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 2005-06-13 11:19:42.456136998 -0400 -@@ -1,9 +1,12 @@ --SRCS_F= addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\ -- bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\ -- dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\ -- grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ -- newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ -- quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ -+/* Some files deleted from the below list since they depend upon the -+ lepto63 library, which cannot be included in Debian for licensing reasons. */ -+ -+SRCS_F= addbnd.F bfgs.F bndtst.F bounds.F bucmve.F \ @@\ -+ delbnd.F delete.F dvcopy.F dvdot.F \ @@\ -+ dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F \ @@\ -+ ldlsol.F modchl.F mxstep.F \ @@\ -+ newptq.F nmdchl.F nodaud.F orthvc.F quad.F \ @@\ -+ quasi.F ranums.F rlen.F settol.F shrnk.F \ @@\ - treaud.F tredmp.F tstext.F usrint.F usrtrm.F +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile 2006-05-09 17:00:05.429179570 -0400 +@@ -4,7 +4,7 @@ + grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ + newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ + quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ +- treaud.F tredmp.F tstext.F usrint.F usrtrm.F ++ treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F FORTRANSAVEOPTION = FortranSaveFlags + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F 1969-12-31 19:00:00.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F 2006-05-09 17:01:10.196413696 -0400 +@@ -0,0 +1,10 @@ ++C----------------------------------------------------------------------- ++ FUNCTION DFUN(ND,X) ++C----------------------------------------------------------------------- ++C DUMMY FUNCTION ++C----------------------------------------------------------------------- ++ DOUBLE PRECISION DFUN, X(ND) ++ WRITE (6,10) ++ 10 FORMAT(/10X,'DFUN CALLED BUT NOT LINKED') ++ STOP ++ END Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- cernlib.spec 13 Apr 2006 22:53:56 -0000 1.30 +++ cernlib.spec 17 May 2006 13:02:50 -0000 1.31 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 19%{?dist} +Release: 20%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -28,6 +28,7 @@ %endif # for patchy build scripts BuildRequires: tcsh +BuildRequires: gawk # there are missing f2c intrinsics in gfortran so gfortran cannot be used to # build the cernlib BuildRequires: /usr/bin/g77 @@ -81,7 +82,7 @@ Source201: cernlib-deadpool.txt # debian patchset -Patch0: cernlib_2005.05.09.dfsg-5.diff +Patch0: cernlib_2005.05.09.dfsg-6.diff # change file to directory to DATADIR Patch1100: cernlib-enforce-FHS.diff Patch1: 001-fix-missing-fluka.dpatch @@ -744,7 +745,6 @@ %doc cernlib.README copyright %doc debian/debhelper/geant321.README.debian %doc debian/debhelper/libpdflib804-2-dev.README.debian -%doc debian/debhelper/libmathlib2.README.debian %doc debian/debhelper/montecarlo-base.README.debian # the utils and devel are separated to have the possibility to install @@ -830,6 +830,9 @@ %changelog +* Wed May 17 2006 Patrice Dumas - 2005-20 +- use new debian patchset. Fix 191631 + * Tue Apr 13 2006 Patrice Dumas - 2005-19 - add a patch to yexpand, to avoid using $HOME. --- cernlib_2005.05.09.dfsg-5.diff DELETED --- From fedora-extras-commits at redhat.com Wed May 17 13:23:00 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 17 May 2006 06:23:00 -0700 Subject: fedora-security/audit fe4,1.22,1.23 fe5,1.20,1.21 Message-ID: <200605171323.k4HDN0hf022384@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22364 Modified Files: fe4 fe5 Log Message: Note a new clamav CVE id. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fe4 12 May 2006 20:48:08 -0000 1.22 +++ fe4 17 May 2006 13:22:57 -0000 1.23 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2427 VULNERABLE (clamav) bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fe5 12 May 2006 20:48:08 -0000 1.20 +++ fe5 17 May 2006 13:22:57 -0000 1.21 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2427 VULNERABLE (clamav) bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 From fedora-extras-commits at redhat.com Wed May 17 13:23:45 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 17 May 2006 06:23:45 -0700 Subject: rpms/swaks/devel swaks.spec,1.1,1.2 Message-ID: <200605171323.k4HDNlGb022416@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22399 Modified Files: swaks.spec Log Message: * Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 - Correct Authen:DigestMD5 typo. Index: swaks.spec =================================================================== RCS file: /cvs/extras/rpms/swaks/devel/swaks.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- swaks.spec 15 May 2006 17:15:01 -0000 1.1 +++ swaks.spec 17 May 2006 13:23:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: swaks Version: 20050709.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command-line SMTP transaction tester Group: Applications/Internet @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(Authen:DigestMD5) +Requires: perl(Authen::DigestMD5) Requires: perl(Net::DNS) Requires: perl(Net::SSLeay) Requires: perl(Time::HiRes) @@ -40,6 +40,9 @@ %{_mandir}/man1/* %changelog +* Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 +- Correct Authen:DigestMD5 typo. + * Mon May 15 2006 Jason L Tibbitts III - 20050709.1-5 - Add Authen::DigestMD5 requirement now that it's in Extras. From fedora-extras-commits at redhat.com Wed May 17 13:30:20 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 17 May 2006 06:30:20 -0700 Subject: rpms/swaks/FC-5 swaks.spec,1.1,1.2 Message-ID: <200605171330.k4HDUMxx022507@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22490 Modified Files: swaks.spec Log Message: * Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 - Correct Authen:DigestMD5 typo. Index: swaks.spec =================================================================== RCS file: /cvs/extras/rpms/swaks/FC-5/swaks.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- swaks.spec 15 May 2006 17:15:01 -0000 1.1 +++ swaks.spec 17 May 2006 13:30:19 -0000 1.2 @@ -1,6 +1,6 @@ Name: swaks Version: 20050709.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command-line SMTP transaction tester Group: Applications/Internet @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(Authen:DigestMD5) +Requires: perl(Authen::DigestMD5) Requires: perl(Net::DNS) Requires: perl(Net::SSLeay) Requires: perl(Time::HiRes) @@ -40,6 +40,9 @@ %{_mandir}/man1/* %changelog +* Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 +- Correct Authen:DigestMD5 typo. + * Mon May 15 2006 Jason L Tibbitts III - 20050709.1-5 - Add Authen::DigestMD5 requirement now that it's in Extras. From fedora-extras-commits at redhat.com Wed May 17 13:33:05 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 17 May 2006 06:33:05 -0700 Subject: rpms/swaks/FC-4 swaks.spec,1.1,1.2 Message-ID: <200605171333.k4HDX7xB022581@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/swaks/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22564 Modified Files: swaks.spec Log Message: * Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 - Correct Authen:DigestMD5 typo. Index: swaks.spec =================================================================== RCS file: /cvs/extras/rpms/swaks/FC-4/swaks.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- swaks.spec 15 May 2006 17:15:01 -0000 1.1 +++ swaks.spec 17 May 2006 13:33:04 -0000 1.2 @@ -1,6 +1,6 @@ Name: swaks Version: 20050709.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command-line SMTP transaction tester Group: Applications/Internet @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(Authen:DigestMD5) +Requires: perl(Authen::DigestMD5) Requires: perl(Net::DNS) Requires: perl(Net::SSLeay) Requires: perl(Time::HiRes) @@ -40,6 +40,9 @@ %{_mandir}/man1/* %changelog +* Wed May 17 2006 Jason L Tibbitts III - 20050709.1-6 +- Correct Authen:DigestMD5 typo. + * Mon May 15 2006 Jason L Tibbitts III - 20050709.1-5 - Add Authen::DigestMD5 requirement now that it's in Extras. From fedora-extras-commits at redhat.com Wed May 17 13:41:14 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 17 May 2006 06:41:14 -0700 Subject: extras-repoclosure rc-run.py,1.2,1.3 Message-ID: <200605171341.k4HDfECj022716@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22698 Modified Files: rc-run.py Log Message: make it possible that one job interrupts a running job gracefully Index: rc-run.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rc-run.py 13 May 2006 00:13:40 -0000 1.2 +++ rc-run.py 17 May 2006 13:41:11 -0000 1.3 @@ -7,6 +7,9 @@ import datetime, time import tempfile +workdir = '/srv/rpmbuild/extras-repoclosure' +breakfile = 'rc-run.breakfile' + allreleases = [ '3', '4', '5', 'development' ] archs = { '3' : ['i386','x86_64'], @@ -75,24 +78,43 @@ return conffile +def checkbreakfile(): + # If the breakfile exists, we terminate prematurely, so another job + # can take over (= clumsy restart without killing metadata processing). + f = os.path.join(workdir,breakfile) + if not os.path.exists(f): + return + try: + os.remove(f) + except: + print 'ERROR: Removing breakfile %s failed!' % f + pass + sys.exit(1) + + def makereport(): try: os.remove(logfilename) except: pass for arch in archs[release]: + print '%s (%s)' % (release,arch) rcargs = ('-a %s ' % targetarchs[arch]) for r in repos[release]: repoid = '%s-%s-%s' % (r,release,arch) rcargs += ('-r %s ' % repoid) # -n, --newest : yum-utils 0.5 rc = os.system('./rc-modified -q -n -c %s %s >> %s' % (conffile,rcargs,logfilename)) + checkbreakfile() if rc: return False return True # Main. +cwd = os.getcwd() +os.chdir(workdir) + # Delete old log files. import glob now = time.time() @@ -106,12 +128,16 @@ today = datetime.date.today() releases = [] -f = open('rc-run.lockfile','w') +lockfilename = 'rc-run.lockfile' +f = open(lockfilename,'w') try: - rc = fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB) + print "Trying to acquire lock file:", + sys.stdout.flush() + rc = fcntl.flock(f, fcntl.LOCK_EX) f.write( ('%s' % today) ) -except IOError: - print 'ERROR: script locked via lockfile - it seems to be running already' + print "OK" +except IOError (errno, strerr): + print 'ERROR: %s: %s' % (strerr,lockfilename) sys.exit(11) if sys.argv[0].endswith('rc-run-all.py'): # process all releases @@ -149,4 +175,5 @@ fcntl.flock(f, fcntl.LOCK_UN) f.close() +os.chdir(cwd) sys.exit(0) From fedora-extras-commits at redhat.com Wed May 17 14:00:38 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 17 May 2006 07:00:38 -0700 Subject: extras-buildsys/server Repo.py,1.23,1.24 Message-ID: <200605171400.k4HE0c1p022806@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22788 Modified Files: Repo.py Log Message: Fix debuginfo rpm glob (Patch from Michael Schwendt ) Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Repo.py 24 Mar 2006 01:34:48 -0000 1.23 +++ Repo.py 17 May 2006 14:00:35 -0000 1.24 @@ -225,7 +225,7 @@ 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)) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*-debuginfo-*" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: print "Repo Error (%s): createrepo failed with exit status %d! Output: '%s'" % (self._target_cfg.target_string(), s, o) From fedora-extras-commits at redhat.com Wed May 17 14:02:00 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 17 May 2006 07:02:00 -0700 Subject: extras-buildsys/server Repo.py,1.16.2.3,1.16.2.4 Message-ID: <200605171402.k4HE20ZL025044@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25028/server Modified Files: Tag: STABLE_0_4 Repo.py Log Message: Fix debuginfo rpm glob (Patch from Michael Schwendt ) Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.16.2.3 retrieving revision 1.16.2.4 diff -u -r1.16.2.3 -r1.16.2.4 --- Repo.py 29 Nov 2005 06:36:44 -0000 1.16.2.3 +++ Repo.py 17 May 2006 14:01:46 -0000 1.16.2.4 @@ -118,7 +118,7 @@ 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)) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*-debuginfo-*" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: print "Error: createrepo failed with exit status %d! Output: '%s'" % (s, o) From fedora-extras-commits at redhat.com Wed May 17 14:29:29 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:29:29 -0700 Subject: rpms/perl-Expect-Simple - New directory Message-ID: <200605171429.k4HETV9h025287@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25261/perl-Expect-Simple Log Message: Directory /cvs/extras/rpms/perl-Expect-Simple added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:29:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:29:30 -0700 Subject: rpms/perl-Expect-Simple/devel - New directory Message-ID: <200605171429.k4HETW32025290@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25261/perl-Expect-Simple/devel Log Message: Directory /cvs/extras/rpms/perl-Expect-Simple/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:29:46 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:29:46 -0700 Subject: rpms/perl-Expect-Simple Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605171429.k4HETmLl025336@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25306 Added Files: Makefile import.log Log Message: Setup of module perl-Expect-Simple --- NEW FILE Makefile --- # Top level Makefile for module perl-Expect-Simple all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed May 17 14:29:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:29:47 -0700 Subject: rpms/perl-Expect-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605171429.k4HETnfH025340@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25306/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Expect-Simple --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed May 17 14:30:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:30:19 -0700 Subject: rpms/perl-Expect-Simple import.log,1.1,1.2 Message-ID: <200605171430.k4HEULj1025419@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25384 Modified Files: import.log Log Message: auto-import perl-Expect-Simple-0.02-1 on branch devel from perl-Expect-Simple-0.02-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Expect-Simple/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 14:29:46 -0000 1.1 +++ import.log 17 May 2006 14:30:18 -0000 1.2 @@ -0,0 +1 @@ +perl-Expect-Simple-0_02-1:HEAD:perl-Expect-Simple-0.02-1.src.rpm:1147876210 From fedora-extras-commits at redhat.com Wed May 17 14:30:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:30:19 -0700 Subject: rpms/perl-Expect-Simple/devel perl-Expect-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605171430.k4HEULO4025424@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25384/devel Modified Files: .cvsignore sources Added Files: perl-Expect-Simple.spec Log Message: auto-import perl-Expect-Simple-0.02-1 on branch devel from perl-Expect-Simple-0.02-1.src.rpm --- NEW FILE perl-Expect-Simple.spec --- Name: perl-Expect-Simple Version: 0.02 Release: 1%{?dist} Summary: Wrapper around the Expect module Group: Development/Libraries License: GPL URL: http://search.cpan.org/dist/Expect-Simple/ Source0: http://www.cpan.org/authors/id/D/DJ/DJERIUS/Expect-Simple-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Expect) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Expect::Simple is a wrapper around the Expect module which should suffice for simple applications. It hides most of the Expect machinery; the Expect object is available for tweaking if need be. %prep %setup -q -n Expect-Simple-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE README %{perl_vendorlib}/Expect/ %{_mandir}/man3/*.3pm* %changelog * Wed May 10 2006 Jose Pedro Oliveira - 0.02-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Expect-Simple/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 14:29:46 -0000 1.1 +++ .cvsignore 17 May 2006 14:30:19 -0000 1.2 @@ -0,0 +1 @@ +Expect-Simple-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Expect-Simple/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 14:29:46 -0000 1.1 +++ sources 17 May 2006 14:30:19 -0000 1.2 @@ -0,0 +1 @@ +23c72fa4461f07522eb8c8511bad5d43 Expect-Simple-0.02.tar.gz From fedora-extras-commits at redhat.com Wed May 17 14:31:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:19 -0700 Subject: rpms/perl-Test-Expect - New directory Message-ID: <200605171431.k4HEVLUh025539@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25513/perl-Test-Expect Log Message: Directory /cvs/extras/rpms/perl-Test-Expect added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:31:20 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:20 -0700 Subject: rpms/perl-Test-Expect/devel - New directory Message-ID: <200605171431.k4HEVMRt025542@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25513/perl-Test-Expect/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Expect/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:31:36 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:36 -0700 Subject: rpms/perl-Test-Expect Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605171431.k4HEVcnp025588@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25558 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Expect --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Expect all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 17 14:31:37 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:37 -0700 Subject: rpms/perl-Test-Expect/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605171431.k4HEVdTG025591@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25558/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Expect --- NEW 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 May 17 14:31:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:31:47 -0700 Subject: owners owners.list,1.1012,1.1013 Message-ID: <200605171431.k4HEVnOp025627@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25606 Modified Files: owners.list Log Message: New packages: perl-Expect-Simple (#191623) and perl-Text-Expect (#191624) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1012 retrieving revision 1.1013 diff -u -r1.1012 -r1.1013 --- owners.list 17 May 2006 03:35:07 -0000 1.1012 +++ owners.list 17 May 2006 14:31:47 -0000 1.1013 @@ -1015,6 +1015,7 @@ Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Expect|Expect for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Expect-Simple|Wrapper around the Expect 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-AutoInstall|Automatic install of dependencies via CPAN|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-CBuilder|Compile and link C code for Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1197,6 +1198,7 @@ Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Differences|Test strings and data structures and show differences if not ok|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-Expect|Automated driving and testing of terminal-based programs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Inline|Test::Inline Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Manifest|Test case module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed May 17 14:32:08 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:32:08 -0700 Subject: rpms/perl-Test-Expect import.log,1.1,1.2 Message-ID: <200605171432.k4HEWARY025684@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25651 Modified Files: import.log Log Message: auto-import perl-Test-Expect-0.30-1 on branch devel from perl-Test-Expect-0.30-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Expect/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 14:31:36 -0000 1.1 +++ import.log 17 May 2006 14:32:08 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Expect-0_30-1:HEAD:perl-Test-Expect-0.30-1.src.rpm:1147876320 From fedora-extras-commits at redhat.com Wed May 17 14:32:09 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 07:32:09 -0700 Subject: rpms/perl-Test-Expect/devel perl-Test-Expect.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605171432.k4HEWBM2025690@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25651/devel Modified Files: .cvsignore sources Added Files: perl-Test-Expect.spec Log Message: auto-import perl-Test-Expect-0.30-1 on branch devel from perl-Test-Expect-0.30-1.src.rpm --- NEW FILE perl-Test-Expect.spec --- Name: perl-Test-Expect Version: 0.30 Release: 1%{?dist} Summary: Automated driving and testing of terminal-based programs Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Expect/ Source0: http://www.cpan.org/authors/id/L/LB/LBROCARD/Test-Expect-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) BuildRequires: perl(Class::Accessor::Chained::Fast) BuildRequires: perl(Expect::Simple) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Test::Expect is a module for automated driving and testing of terminal-based programs. It is handy for testing interactive programs which have a prompt, and is based on the same concepts as the Tcl Expect tool. As in Expect::Simple, the Expect object is made available for tweaking. Test::Expect is intended for use in a test script. %prep %setup -q -n Test-Expect-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/Test/ %{_mandir}/man3/*.3pm* %changelog * Wed May 10 2006 Jose Pedro Oliveira - 0.30-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Expect/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 14:31:36 -0000 1.1 +++ .cvsignore 17 May 2006 14:32:08 -0000 1.2 @@ -0,0 +1 @@ +Test-Expect-0.30.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Expect/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 14:31:36 -0000 1.1 +++ sources 17 May 2006 14:32:08 -0000 1.2 @@ -0,0 +1 @@ +b22cb4575d910bb2d36e506a958da300 Test-Expect-0.30.tar.gz From fedora-extras-commits at redhat.com Wed May 17 14:44:35 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:44:35 -0700 Subject: rpms/goupil/devel - New directory Message-ID: <200605171444.k4HEibeR025890@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25861/goupil/devel Log Message: Directory /cvs/extras/rpms/goupil/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:44:35 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:44:35 -0700 Subject: rpms/goupil - New directory Message-ID: <200605171444.k4HEibDF025887@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25861/goupil Log Message: Directory /cvs/extras/rpms/goupil added to the repository From fedora-extras-commits at redhat.com Wed May 17 14:44:52 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:44:52 -0700 Subject: rpms/goupil/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605171444.k4HEiskY025944@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25908/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module goupil --- NEW 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 May 17 14:44:51 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:44:51 -0700 Subject: rpms/goupil Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605171444.k4HEirKW025941@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25908 Added Files: Makefile import.log Log Message: Setup of module goupil --- NEW FILE Makefile --- # Top level Makefile for module goupil all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 17 14:45:53 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:45:53 -0700 Subject: rpms/goupil import.log,1.1,1.2 Message-ID: <200605171445.k4HEjtPX026007@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25974 Modified Files: import.log Log Message: auto-import goupil-0.1.0-1 on branch devel from goupil-0.1.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/goupil/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 14:44:51 -0000 1.1 +++ import.log 17 May 2006 14:45:53 -0000 1.2 @@ -0,0 +1 @@ +goupil-0_1_0-1:HEAD:goupil-0.1.0-1.src.rpm:1147877173 From fedora-extras-commits at redhat.com Wed May 17 14:45:54 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:45:54 -0700 Subject: rpms/goupil/devel goupil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605171445.k4HEju8x026012@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/goupil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25974/devel Modified Files: .cvsignore sources Added Files: goupil.spec Log Message: auto-import goupil-0.1.0-1 on branch devel from goupil-0.1.0-1.src.rpm --- NEW FILE goupil.spec --- Name: goupil Version: 0.1.0 Release: 1%{?dist} Summary: An association membership management tool for the GNOME environment Group: Applications/Databases License: GPL URL: http://goupil.tuxfamily.org/ Source0: http://goupil.tuxfamily.org/downloads/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, evolution-data-server-devel, gtkmm24-devel, libglademm24-devel, gnome-vfsmm26-devel, sqlite-devel %description Goupil is A GNOME desktop application to manages your association or foundation memberships. Goupil helps you manage the memberships of your associations. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYRIGHT INSTALL NEWS README %{_bindir}/%{name} %{_libdir}/* %{_datadir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png %{_includedir}/* %changelog * Sun Apr 14 2006 Damien Durand - 0.1.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/goupil/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 14:44:52 -0000 1.1 +++ .cvsignore 17 May 2006 14:45:54 -0000 1.2 @@ -0,0 +1 @@ +goupil-0.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/goupil/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 14:44:52 -0000 1.1 +++ sources 17 May 2006 14:45:54 -0000 1.2 @@ -0,0 +1 @@ +38f338340731b729cde6e8a0afc9ea71 goupil-0.1.0.tar.gz From fedora-extras-commits at redhat.com Wed May 17 14:49:36 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Wed, 17 May 2006 07:49:36 -0700 Subject: owners owners.list,1.1013,1.1014 Message-ID: <200605171449.k4HEncTU026075@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058 Modified Files: owners.list Log Message: Add goupil Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1013 retrieving revision 1.1014 diff -u -r1.1013 -r1.1014 --- owners.list 17 May 2006 14:31:47 -0000 1.1013 +++ owners.list 17 May 2006 14:49:36 -0000 1.1014 @@ -420,6 +420,7 @@ Fedora Extras|goffice|Goffice support libraries|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gonvert|Units conversion utility|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|goupil|An association membership management tool for the GNOME environment|splinux at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|gpa|Graphical user interface for GnuPG|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 17 15:12:38 2006 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Wed, 17 May 2006 08:12:38 -0700 Subject: mock mock.py,1.49,1.50 Message-ID: <200605171512.k4HFCc8j028457@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28439 Modified Files: mock.py Log Message: Michael E. Brown's patch for getting PS1 down to chroot shell Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- mock.py 16 May 2006 04:15:48 -0000 1.49 +++ mock.py 17 May 2006 15:12:36 -0000 1.50 @@ -758,12 +758,12 @@ else: print 'Finished cleaning root' -def do_run_cmd(config_opts, cmd, raw_chroot=0): +def do_run_cmd(config_opts, cmd, env='', raw_chroot=0): my = Root(config_opts) my.debug("executing: %s" % cmd) my._mount() if raw_chroot: - cmd = '%s %s %s' % (config_opts['chroot'], my.rootdir, cmd) + cmd = '%s %s %s %s' % (env, config_opts['chroot'], my.rootdir, cmd) os.system(cmd) else: my.do_chroot(cmd, True) @@ -885,8 +885,7 @@ elif args[0] == 'shell': # debugging tool for interactive poking around in the chroot config_opts['clean'] = config_opts['quiet'] = False - os.environ['PS1'] = "mock-chroot> " - do_run_cmd(config_opts, "/bin/bash", raw_chroot=1) + do_run_cmd(config_opts, "/bin/bash", env='PS1="mock-chroot> "', raw_chroot=1) else: if args[0] == 'rebuild': From fedora-extras-commits at redhat.com Wed May 17 15:14:46 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 17 May 2006 08:14:46 -0700 Subject: fedora-security/audit fc4,1.251,1.252 fc5,1.166,1.167 Message-ID: <200605171514.k4HFEkaJ028488@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28468 Modified Files: fc4 fc5 Log Message: Note an openobex issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- fc4 16 May 2006 20:38:52 -0000 1.251 +++ fc4 17 May 2006 15:14:44 -0000 1.252 @@ -5,6 +5,7 @@ CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] +CVE-2006-2366 VULNERABLE (openobex) #192087 CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- fc5 17 May 2006 08:20:33 -0000 1.166 +++ fc5 17 May 2006 15:14:44 -0000 1.167 @@ -5,6 +5,7 @@ CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] +CVE-2006-2366 VULNERABLE (openobex) #192087 CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox CVE-2006-2276 VULNERABLE (quagga) #191377 From fedora-extras-commits at redhat.com Wed May 17 15:26:45 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 17 May 2006 08:26:45 -0700 Subject: comps comps-fe6.xml,1.2,1.3 Message-ID: <200605171526.k4HFQlsf028568@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28546 Modified Files: comps-fe6.xml Log Message: Added crossfire client Index: comps-fe6.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- comps-fe6.xml 9 May 2006 22:13:55 -0000 1.2 +++ comps-fe6.xml 17 May 2006 15:26:45 -0000 1.3 @@ -200,6 +200,7 @@ bzflag celestia cgoban + crossfire-client crystal-stacker crystal-stacker-themes csmash @@ -813,4 +814,4 @@ network-server - \ No newline at end of file + From fedora-extras-commits at redhat.com Wed May 17 15:35:10 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 17 May 2006 08:35:10 -0700 Subject: rpms/cernlib/FC-5 211-fix-comis-on-ia64-alpha.dpatch, NONE, 1.1 319-work-around-imake-segfaults.dpatch, NONE, 1.1 cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 patchy-case.patch, NONE, 1.1 patchy-fcasplit.patch, NONE, 1.1 patchy-insecure_tmp_use.diff, NONE, 1.1 patchy-p4comp.patch, NONE, 1.1 patchy-perror.patch, NONE, 1.1 patchy-rceta.patch, NONE, 1.1 patchy-unpack-rceta, NONE, 1.1 patchy-yexpand.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 307-use-canonical-cfortran.dpatch, 1.2, 1.3 800-implement-shared-library-rules-in-Imake.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib-gfortran.diff, 1.1, 1.2 cernlib.spec, 1.19, 1.20 paw.README, 1.3, 1.4 sources, 1.3, 1.4 211-fix-comis-on-ia64.dpatch, 1.1, NONE cernlib_2005.05.09.dfsg-3.diff, 1.1, NONE Message-ID: <200605171535.k4HFZCHw028719@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28654 Modified Files: .cvsignore 112-remove-nonexistent-prototypes-from-gen.h.dpatch 307-use-canonical-cfortran.dpatch 800-implement-shared-library-rules-in-Imake.dpatch 805-expunge-missing-mathlib-kernlib-symbols.dpatch cernlib-gfortran.diff cernlib.spec paw.README sources Added Files: 211-fix-comis-on-ia64-alpha.dpatch 319-work-around-imake-segfaults.dpatch cernlib_2005.05.09.dfsg-6.diff patchy-case.patch patchy-fcasplit.patch patchy-insecure_tmp_use.diff patchy-p4comp.patch patchy-perror.patch patchy-rceta.patch patchy-unpack-rceta patchy-yexpand.diff Removed Files: 211-fix-comis-on-ia64.dpatch cernlib_2005.05.09.dfsg-3.diff Log Message: sync with devel branch --- NEW FILE 211-fix-comis-on-ia64-alpha.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 211-fix-comis-on-ia64-alpha.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Further patch building on Harald Vogt's amd64 patch attempting to ## DP: fix PAW on Itanium/Alpha Linux. This does not yet work completely... @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:45.236828642 -0500 @@ -39,12 +39,45 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *nn; { int i,n; char *a,*b; n=*nn; a=*ja; b=*jb; +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *nn; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:51:18.796348318 -0500 @@ -74,6 +74,24 @@ /* printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else double (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:51:05.440199025 -0500 @@ -67,6 +67,24 @@ /* printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else int (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:50:47.519024096 -0500 @@ -89,6 +89,24 @@ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; double r; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else float (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:45.236828642 -0500 @@ -42,6 +42,27 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *na, *nb; @@ -56,6 +77,18 @@ { a=*jb; b=*ja; la=*nb; lb=*na; k=-1; } +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *na, *nb; --- NEW FILE 319-work-around-imake-segfaults.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 319-work-around-imake-segfaults.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: If at first Imake doesn't succeed, try, try again. ## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.) @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules --- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:35:09.050384887 -0500 +++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:38:18.693611381 -0500 @@ -1296,7 +1296,11 @@ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - imakeflags -f $< + imakeflags -f $< || \ @@\ + $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + imakeflags -f $< || exit 1 #endif /* BuildMakefileTarget */ @@ -2127,7 +2131,11 @@ ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ - -DPackageName=$(PACKAGE_NAME); \ @@\ + -DPackageName=$(PACKAGE_NAME) || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) || exit 1; \ @@\ fi; \ @@\ $(MAKE) $(MFLAGS) Makefiles; \ @@\ cd $$newtop; \ @@\ @@ -2322,7 +2330,12 @@ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - -f $$imakefile; \ @@\ + -f $$imakefile || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + -f $$imakefile || exit 1; \ @@\ fi; \ @@\ fi; #endif cernlib_2005.05.09.dfsg-6.diff: --- NEW FILE cernlib_2005.05.09.dfsg-6.diff --- --- cernlib-2005.05.09.dfsg.orig/debian/control +++ cernlib-2005.05.09.dfsg/debian/control @@ -0,0 +1,896 @@ +Source: cernlib +Maintainer: Kevin B. McCarty +Standards-Version: 3.7.2 +Priority: optional +Section: science +Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin + +Package: cernlib-base +Architecture: all +Section: devel +Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev +Description: script to determine Cernlib library dependencies + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This package includes the "cernlib" script that lists the command-line + options needed for linking against Cernlib libraries. The script has + been rewritten from the upstream version to calculate + dependencies recursively. Also included are a README.Debian with a summary + of changes made to Cernlib to fit it into Debian packaging practices, + and a contributed set of Autoconf macros to test for Cernlib libraries. + +Package: cernlib-core-dev +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit +Description: Cernlib development headers, tools, and static libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the header files and static libraries likely to be + wanted by developers using the Cern libraries who are not interested + specifically in high energy physics. It also provides the Cernlib + development tools DZedit and KUIPC. Cernlib analysis programs may be + obtained by installing the cernlib-core metapackage. + +Package: cernlib-core +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos +Description: Cernlib main libraries and programs + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the libraries and analysis tools (e.g. PAW) likely + to be wanted by most users of the Cern libraries who are not interested + specifically in high energy physics. You cannot do program development by + installing only this metapackage; development libraries and tools may + be obtained by installing the cernlib-core-dev metapackage or individual + lib*-dev packages. + +Package: cernlib-extras +Architecture: all +Priority: extra +Section: science +Depends: cernlib-base (= ${Source-Version}), pawserv, zftp +Description: miscellaneous Cernlib programs unlikely to be used by many + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides a few additional Cernlib programs not included + in any other Cernlib metapackage. Very few people are likely to be + interested in them; currently they include zftp, pawserv and zserv. + Notice that the latter two programs run as daemons through inetd and may + reduce your system's security! + . + Installing this package along with the "cernlib" metapackage will supply + a complete set of all Cernlib programs and libraries included in Debian. + +Package: cernlib-montecarlo +Architecture: all +Section: science +Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev +Recommends: libisajet758-2-dev +Description: Cernlib Monte Carlo libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides various Monte Carlo libraries included in Cernlib + (both shared and static). Likely only physicists will be interested in + these packages. Note that the Geant 3.21 program is not included, but it may + be obtained by also installing the geant321 Debian package. + . + Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are + not available within Debian due to licensing issues; see the README.Debian + file in the montecarlo-base package for information on obtaining them. + . + Additionally, the Isajet library is not available on the m68k architecture + due to a compiler flaw. + +Package: cernlib +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev +Description: almost complete set of Debian Cernlib packages + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides almost all of the programs and libraries contained + in Cernlib. Most people will likely want only a subset of these. A few + extra Cernlib programs, not of interest to many people, may be obtained via + the cernlib-extras metapackage. + +Package: dzedit +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libpacklib1-dev +Description: Cernlib's ZEBRA documentation editor + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system + developed at CERN. ZEBRA, part of the Packlib library, permits a developer to + create complex data structures in the FORTRAN 77 language; the DZDOC system + allows the developer to generate and maintain documentation of ZEBRA data + structures. + +Package: geant321-data +Architecture: all +Section: science +Depends: cernlib-base +Description: [Physics] Data for Geant 3.21 detector simulator + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes data files for use by Geant. + +Package: geant321-doc +Architecture: all +Section: doc +Depends: cernlib-base +Description: [Physics] Documentation for Geant 3.21 + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes some documentation about Geant. + +Package: geant321 +Architecture: all +Section: science +Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77 +Suggests: kxterm, geant321-doc +Description: [Physics] Particle detector description and simulation tool + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes gxint, the script used to perform this linking step. + +Package: kuipc +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, cernlib-base +Recommends: libpacklib1-dev +Suggests: libpacklib1-lesstif-dev +Description: Cernlib's Kit for a User Interface Package (KUIP) compiler + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify + the writing of a program's user interface code. It takes as + input a Command Definition File (CDF) that describes the + commands to be understood by the program, and outputs C or FORTRAN code that + makes the appropriate function calls to set up the user interface. This + code can then be compiled and linked with the rest of the program. Since + the generated code uses KUIP routines, the program must also be linked + against the Packlib library that contains them. + . + KUIPC is no longer actively developed, so aside from its use in the build + process of Cernlib, it is of mainly historical interest. + +Package: kxterm +Architecture: any +Section: science +Depends: ${shlibs:Depends}, cernlib-base +Description: Cernlib's KUIP terminal emulator + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KXterm is a terminal emulator which combines the best features from + the (now defunct) Apollo DM pads (like: input and transcript [...21456 lines suppressed...] +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ./pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, C??? hai" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd" + +#. Type: select +#. Description +#: ./pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po +++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-05-26 16:05-0300\n" +"Last-Translator: Andr? Lu?s Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a serem executados a partir do inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos " +"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv " +"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP " +"do CERN). Esses servidores s?o executados a partir do inetd; voc? " +"pode habilitar cada um deles separadamente ou ambos. A menos que voc? " +"possua necessidades bastante especializadas, voc? provavelmente ir? " +"desejar habilitar somente o pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po +++ cernlib-2005.05.09.dfsg/debian/po/sv.po @@ -0,0 +1,53 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib 2005.05.09-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-10-06 23:50+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, B?da" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servrar som ska k?ras fr?n inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att " +"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem " +"att logga in med CERN's ZFTP-protokoll). Dessa servrar k?rs fr?n inetd; du m?ste " +"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott " +"om pawserv aktiveras." + --- cernlib-2005.05.09.dfsg.orig/debian/po/es.po +++ cernlib-2005.05.09.dfsg/debian/po/es.po @@ -0,0 +1,55 @@ +# cernlib po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the cernlib package. +# +# Changes: +# - Initial translation +# C??sar G??mez Mart??n +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentaci??n de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducci??n de Debian al espa??ol +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducci??n en +# http://www.debian.org/intl/spanish/notas +# +# - La gu??a de traducci??n de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-09-01 17:49+0100\n" +"Last-Translator: C??sar G??mez Mart??n \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a ejecutar desde inetd" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol). These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv." +msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++) y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv." + patchy-case.patch: --- NEW FILE patchy-case.patch --- --- 2004.orig/src/patchy/Imakefile 2006-04-13 11:15:58.000000000 +0200 +++ 2004/src/patchy/Imakefile 2006-04-13 11:27:07.000000000 +0200 @@ -54,7 +54,7 @@ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile ypatchy - p5lib p5lib TTY .go - fcasplit p5lib.f + ./fcasplit p5lib.f RemoveFile(p5lib.f) cat p5lib.libmake >> p5lib.mkfca $(MAKE) -f p5lib.mkfca $@ @@ -79,8 +79,8 @@ @ ln -s $< $@ %.f: $(LDIR)%.cra $(LDIR)patchy.car - ypatchy - $@ $< TTY .go - + ypatchy - :$@ :$< TTY .go + .f.o: $(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $< @@ -92,9 +92,9 @@ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \ ysearch yshift ytobcd ytobin ytoceta -P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)) +P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)) -$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)): +$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)): cd $(dir $@); \ @@\ if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\ ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\ patchy-fcasplit.patch: --- NEW FILE patchy-fcasplit.patch --- --- patchy/fcasplit.f.orig 2006-04-10 01:06:32.000000000 +0200 +++ patchy/fcasplit.f 2006-04-10 01:16:05.000000000 +0200 @@ -23,7 +23,7 @@ PARAMETER (CHIDA = ';DECK I' ) PARAMETER (CHOVER= 'UNKNOWN') - PARAMETER (CHPOF = '-c -O2 -Nx800 -Nc200') + PARAMETER (CHPOF = '-c -O2') PARAMETER (CHPOC = '-c -O2 -posix') PARAMETER (CHPOA = ' ') patchy-insecure_tmp_use.diff: --- NEW FILE patchy-insecure_tmp_use.diff --- diff -u patchy-orig/yindex patchy/yindex --- patchy-orig/yindex 2006-04-11 10:33:39.000000000 +0200 +++ patchy/yindex 2006-04-11 10:44:10.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: yindex-orig diff -u patchy-orig/ylist patchy/ylist --- patchy-orig/ylist 2006-04-11 10:33:48.000000000 +0200 +++ patchy/ylist 2006-04-11 10:40:17.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: ylist-orig patchy-p4comp.patch: --- NEW FILE patchy-p4comp.patch --- --- patchy/p4comp.fca.orig 2006-04-08 12:46:17.000000000 +0200 +++ patchy/p4comp.fca 2006-04-08 12:47:34.000000000 +0200 @@ -11458,7 +11458,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 12 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 12 CONTINUE NWTK = KDNWT NCH = 80 @@ -12383,7 +12383,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 13 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 13 CONTINUE NWTK = KDNWT NCHCCT = 80 @@ -14260,7 +14260,7 @@ C-------------- END CDE -------------- C DIMENSION MM(10), ITP(9) A8M DIMENSION MM(6), ITP(9) -A8M - PARAMETER ( NBLANK = '20202000'X ) + PARAMETER ( NBLANK = X'20202000' ) IT = ITP(1) JARTPX = 0 @@ -14430,7 +14430,7 @@ 24 JLOW = JCH - MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X) + MV(JCH) = AND (MV(JCH), X'FFFFFFDF') 49 CONTINUE JCCLOW = MAX (JCCLOW,JLOW) @@ -14465,8 +14465,8 @@ - DATA ACTION/'HOLD ','RESUME','EOF ','REWIND','ATTACH','DETACH' - +, 'EOFREW','CLOSE ' / + DATA ACTION/6HHOLD ,6HRESUME,6HEOF ,6HREWIND,6HATTACH,6HDETACH + +, 6HEOFREW,6HCLOSE / C------ CODE BITS IN IOTALL, IOTOFF, IOTON, IOTYP @@ -14801,7 +14801,7 @@ DO 31 JC=1,NCD J = J+1 DO 19 JJ=1,KDNWT1 - IF (AND(MV(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(MV(J),X'FF000000').EQ.0) GO TO 31 19 J = J+1 31 CONTINUE @@ -14825,7 +14825,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -14855,7 +14855,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -17316,6 +17316,8 @@ /*> ROUTINE ABEND CERN PROGLIB# Z035 ABEND .VERSION KERNFOR 4.31 911111 */ +#include + void abend_() { exit(7); @@ -17430,7 +17432,7 @@ char *fname; int *lgname; { - char *malloc(); + void *malloc(); char *ptalc, *pttext; int fchput(); int nalc; @@ -17664,7 +17666,7 @@ char *ftext; int lgtext; { - char *malloc(); + void *malloc(); char *ptalc, *ptuse; char *utext; int nalc; patchy-perror.patch: --- NEW FILE patchy-perror.patch --- --- 2005/src/patchy/patchy.car.orig 1996-07-15 13:46:22.000000000 +0200 +++ 2005/src/patchy/patchy.car 2006-04-09 02:18:17.000000000 +0200 @@ -3708,7 +3708,7 @@ 38 WRITE (IQTYPE,9038) CHLIFI(1:NN) +SELF, IF=QS_UNIX. - IF (LUNOLD.NE.0) CALL PERRORF (' System msg') + IF (LUNOLD.NE.0) CALL PERROR (' System msg') +SELF. IF (NQINIT.EQ.0) THEN IF (IQPRNT.NE.IQTYPE) WRITE (IQPRNT,9038) CHLIFI(1:NN) @@ -4399,7 +4399,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF (' Perror has') + CALL PERROR (' Perror has') +SELF. CALL P_KILL (MSG) END @@ -4446,7 +4446,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF ('Perror has') + CALL PERROR ('Perror has') +SELF. CALL P_FATAL (MSG) END @@ -15112,7 +15112,7 @@ +DECK, SEGVIOL, T=JOIN, IF=QDIAG, IF=QS_UNIX. SUBROUTINE SEGVIOL - CALL PERRORF ('perrorf has') + CALL PERROR ('perror has') CALL P_KILL ('SEGVIOL reached') END patchy-rceta.patch: --- NEW FILE patchy-rceta.patch --- --- patchy/rceta.sh.orig 1995-05-04 21:23:45.000000000 +0200 +++ patchy/rceta.sh 2006-04-08 12:20:26.000000000 +0200 @@ -225,8 +225,8 @@ RETURN END \\ - fort77 -o rceta rceta.f - rceta <<\\ + f77 -g -O2 -o rceta rceta.f + ./rceta <<\\ CODE INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX CODE CARD 1 IN HOLLERITH FOR CETA VALUES 1 - 47 CODE CARD 2 IN HOLLERITH FOR CETA VALUES 65 - 90 --- NEW FILE patchy-unpack-rceta --- #! /bin/bash set -e cd . file=patchy script=rceta.sh archive=$file.tar.gz echo "Unpacking from $archive" tar xzf $archive echo "patching script" sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script pushd $file ./$script popd echo "Repacking $archive" tar czf $archive $file exit 0 patchy-yexpand.diff: --- NEW FILE patchy-yexpand.diff --- --- 2004.orig/src/patchy/yexpand.script 2006-04-14 00:29:48.000000000 +0200 +++ 2004/src/patchy/yexpand.script 2006-04-14 00:35:13.000000000 +0200 @@ -26,8 +26,8 @@ # CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT - tfile="$HOME/$tfile.yexp" - echo "#!/bin/sh" >$tfile + tfile="./$tfile.yexp" + echo "#! /bin/sh" >$tfile echo " cat <>$tfile cat <$ifile >>$tfile cc=$? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Nov 2005 22:01:01 -0000 1.3 +++ .cvsignore 17 May 2006 15:35:10 -0000 1.4 @@ -13,3 +13,4 @@ src_graflib.tar.gz src_packlib.tar.gz xsneut95.dat +patchy.tar.gz Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 112-remove-nonexistent-prototypes-from-gen.h.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch 17 May 2006 15:35:10 -0000 1.2 @@ -68,19 +68,6 @@ PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT) #define FREQ(A2) CCALLSFFUN1(FREQ,freq,FLOAT,A2) -@@ -255,10 +255,10 @@ - - PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE) - #define DFRSIN(A2) CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2) -- -+/* - PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV) - #define FUN(A2,A3) CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3) -- -+*/ - PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT) - #define G116F1(A2) CCALLSFFUN1(G116F1,g116f1,FLOAT,A2) - @@ -270,10 +270,10 @@ PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT) Index: 307-use-canonical-cfortran.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/307-use-canonical-cfortran.dpatch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 307-use-canonical-cfortran.dpatch 14 Dec 2005 16:52:26 -0000 1.2 +++ 307-use-canonical-cfortran.dpatch 17 May 2006 15:35:10 -0000 1.3 @@ -7,8 +7,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 17:17:09.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 12:17:09.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-27 11:33:41.183131708 -0500 @@ -195,13 +195,13 @@ HP9000> f77 -c cfortex.f HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest @@ -79,24 +79,25 @@ - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA (E.G. TAPE, DISK, COMPUTER, PAPER.) diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 17:05:51.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 13:05:51.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-19 08:29:41.000000000 -0500 @@ -1,4 +1,4 @@ -/* cfortran.h 4.4_cernlib2002 */ +/* cfortran.h 4.4 */ /* http://www-zeus.desy.de/~burow/cfortran/ */ /* Burkhard Burow burow at desy.de 1990 - 2002. */ -@@ -11,6 +11,35 @@ +@@ -11,6 +11,38 @@ MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE. */ +/* The following modifications were made by the authors of CFITSIO or by me. -+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)". ++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY. + * PDW = Peter Wilson + * DM = Doug Mink -+ * LEB = ?? -+ * -- Kevin McCarty, for Debian (11/29/2003) */ ++ * LEB = Lee E Brotzman ++ * MR = Martin Reinecke ++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */ + +/******* + Modifications: @@ -118,12 +119,14 @@ + Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN + returning "double" in C. This was one of the items on + Burkhard's TODO list. (KMCCARTY) ++ Dec 2005: Modifications to support 8-byte integers. (MR) ++ USE AT YOUR OWN RISK! + *******/ + /* Avoid symbols already used by compilers and system *.h: __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c -@@ -75,7 +104,8 @@ +@@ -75,7 +107,8 @@ /* Remainder of cfortran.h depends on the Fortran compiler. */ @@ -133,7 +136,7 @@ #define f2cFortran #endif -@@ -90,6 +120,27 @@ +@@ -90,6 +123,27 @@ Support f2c or f77 with gcc, vcc with f2c. f77 with vcc works, missing link magic for f77 I/O.*/ #endif @@ -161,7 +164,7 @@ #if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */ #define hpuxFortran /* Should also allow hp9000s7/800 use.*/ #endif -@@ -131,6 +182,7 @@ +@@ -131,6 +185,7 @@ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ @@ -169,7 +172,7 @@ - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \ - VAX VMS CC 3.1 and FORTRAN 5.4. \ -@@ -151,7 +203,8 @@ +@@ -151,7 +206,8 @@ - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran \ - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ - Absoft Pro Fortran: Use #define AbsoftProFortran \ @@ -179,7 +182,7 @@ /* Compiler must throw us out at this point! */ #endif #endif -@@ -164,7 +217,8 @@ +@@ -164,7 +220,8 @@ /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ @@ -189,7 +192,7 @@ #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else -@@ -268,7 +322,8 @@ +@@ -268,7 +325,8 @@ #endif #ifndef apolloFortran @@ -199,7 +202,7 @@ #define CF_NULL_PROTO #else /* HP doesn't understand #elif. */ /* Without ANSI prototyping, Apollo promotes float functions to double. */ -@@ -512,7 +567,7 @@ +@@ -512,7 +570,7 @@ *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO) ), \ (F).dsc$a_a0 = ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length ,(F)) @@ -208,8 +211,14 @@ #define _NUM_ELEMS -1 #define _NUM_ELEM_ARG -2 #define NUM_ELEMS(A) A,_NUM_ELEMS -@@ -540,7 +595,8 @@ +@@ -538,9 +596,14 @@ + if (i==(unsigned)num_term) break; + else strv += elem_len-i; } ++if (0) { /* to prevent not used warnings in gcc (added by ROOT) */ ++ c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0); ++ vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0); ++} return (int)num; } -#endif @@ -218,7 +227,53 @@ /*-------------------------------------------------------------------------*/ /* UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS */ -@@ -1451,7 +1507,12 @@ +@@ -1318,6 +1381,7 @@ + #define INTVVVVVVV_cfTYPE int + #define LOGICALVVVVVVV_cfTYPE int + #define LONGVVVVVVV_cfTYPE long ++#define LONGLONGVVVVVVV_cfTYPE long long /* added by MR December 2005 */ + #define SHORTVVVVVVV_cfTYPE short + #define PBYTE_cfTYPE INTEGER_BYTE + #define PDOUBLE_cfTYPE DOUBLE_PRECISION +@@ -1325,6 +1389,7 @@ + #define PINT_cfTYPE int + #define PLOGICAL_cfTYPE int + #define PLONG_cfTYPE long ++#define PLONGLONG_cfTYPE long long /* added by MR December 2005 */ + #define PSHORT_cfTYPE short + + #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A) +@@ -1342,6 +1407,7 @@ + #define INT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LOGICAL_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) ++#define LONGLONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define PBYTE_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0) +@@ -1349,6 +1415,7 @@ + #define PINT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLOGICAL_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) ++#define PLONGLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define PSHORT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define BYTEV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define BYTEVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) +@@ -1392,6 +1459,13 @@ + #define LONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) ++#define LONGLONGV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORTV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define SHORTVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) + #define SHORTVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) +@@ -1451,7 +1525,12 @@ #define BYTE_cfPU(A) CFextern INTEGER_BYTE FCALLSC_QUALIFIER A #define DOUBLE_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -231,7 +286,80 @@ #else #define FLOAT_cfPU(A) CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A #endif -@@ -2088,7 +2149,12 @@ +@@ -1589,6 +1668,7 @@ + #define INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E) + #define LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1632,6 +1712,13 @@ + #define LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1645,6 +1732,7 @@ + #define PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E) + #define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E) + #define PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E) +@@ -1957,6 +2045,7 @@ + #define INT_cfT(M,I,A,B,D) *A + #define LOGICAL_cfT(M,I,A,B,D) F2CLOGICAL(*A) + #define LONG_cfT(M,I,A,B,D) *A ++#define LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */ + #define SHORT_cfT(M,I,A,B,D) *A + #define BYTEV_cfT(M,I,A,B,D) A + #define DOUBLEV_cfT(M,I,A,B,D) A +@@ -1964,6 +2053,7 @@ + #define INTV_cfT(M,I,A,B,D) A + #define LOGICALV_cfT(M,I,A,B,D) A + #define LONGV_cfT(M,I,A,B,D) A ++#define LONGLONGV_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define SHORTV_cfT(M,I,A,B,D) A + #define BYTEVV_cfT(M,I,A,B,D) (void *)A /* We have to cast to void *,*/ + #define BYTEVVV_cfT(M,I,A,B,D) (void *)A /* since we don't know the */ +@@ -2001,6 +2091,12 @@ + #define LONGVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVVV_cfT(M,I,A,B,D) (void *)A ++#define LONGLONGVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ + #define SHORTVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVVV_cfT(M,I,A,B,D) (void *)A +@@ -2013,6 +2109,7 @@ + #define PINT_cfT(M,I,A,B,D) A + #define PLOGICAL_cfT(M,I,A,B,D) ((*A=F2CLOGICAL(*A)),A) + #define PLONG_cfT(M,I,A,B,D) A ++#define PLONGLONG_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define PSHORT_cfT(M,I,A,B,D) A + #define PVOID_cfT(M,I,A,B,D) A + #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) +@@ -2083,12 +2180,18 @@ + #define INT_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LOGICAL_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LONG_cfFZ(UN,LN) long FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#define LONGLONG_cfFZ(UN,LN) long long FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */ + #define SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define VOID_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)( #ifndef __CF__KnR /* The void is req'd by the Apollo, to make this an ANSI function declaration. The Apollo promotes K&R float functions to double. */ @@ -245,7 +373,7 @@ #ifdef vmsFortran #define STRING_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS #else -@@ -2104,7 +2170,12 @@ +@@ -2104,7 +2207,12 @@ #endif #else #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -258,7 +386,7 @@ #else #define FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)( #endif -@@ -2118,7 +2189,12 @@ +@@ -2118,13 +2226,19 @@ #define BYTE_cfF(UN,LN) BYTE_cfFZ(UN,LN) #define DOUBLE_cfF(UN,LN) DOUBLE_cfFZ(UN,LN) #ifndef __CF_KnR @@ -271,3 +399,18 @@ #else #define FLOAT_cfF(UN,LN) FLOAT_cfFZ(UN,LN) #endif + #define INT_cfF(UN,LN) INT_cfFZ(UN,LN) + #define LOGICAL_cfF(UN,LN) LOGICAL_cfFZ(UN,LN) + #define LONG_cfF(UN,LN) LONG_cfFZ(UN,LN) ++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */ + #define SHORT_cfF(UN,LN) SHORT_cfFZ(UN,LN) + #define VOID_cfF(UN,LN) VOID_cfFZ(UN,LN) + #define STRING_cfF(UN,LN) STRING_cfFZ(UN,LN), +@@ -2187,6 +2301,7 @@ + #define LOGICAL_cfI return C2FLOGICAL(A0); + #endif + #define LONG_cfI return A0; ++#define LONGLONG_cfI return A0; /* added by MR December 2005 */ + #define SHORT_cfI return A0; + #define STRING_cfI return ; + #define VOID_cfI return ; Index: 800-implement-shared-library-rules-in-Imake.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/800-implement-shared-library-rules-in-Imake.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 800-implement-shared-library-rules-in-Imake.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 800-implement-shared-library-rules-in-Imake.dpatch 17 May 2006 15:35:10 -0000 1.2 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules ---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2005-11-29 17:07:32.035570303 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2005-11-29 17:07:40.003888782 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:42:00.576902424 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:42:08.484202137 -0500 @@ -904,6 +904,8 @@ * InstallSharedLibrary - generate rules to install the indicated sharable * Library @@ -27,7 +27,7 @@ /* * InstallLinkKitLibrary - rule to install Link Kit library. -@@ -1963,6 +1966,15 @@ +@@ -1967,6 +1970,15 @@ #endif /* InstallSubdirs */ /* @@ -43,7 +43,7 @@ * InstallBinSubdirs - generate rules to recursively install programs and * scripts */ -@@ -2341,9 +2353,12 @@ +@@ -2354,9 +2366,12 @@ */ #ifndef DefinePackageLibrary #define DefinePackageLibrary(locallib) \ @@ -57,8 +57,8 @@ override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB) @@\ @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules ---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 10:51:01.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2005-11-29 17:09:29.336812562 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 06:51:01.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -227,7 +227,7 @@ RanLibrary($@) #endif @@ -120,8 +120,8 @@ #ifndef SharedLibraryBuild #define SharedLibraryBuild(libname,version) @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules ---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 15:26:45.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2005-11-29 17:07:40.004888571 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 10:26:45.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -43,6 +43,9 @@ #ifndef PositionIndependentCplusplusFlags #define PositionIndependentCplusplusFlags -fPIC Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 805-expunge-missing-mathlib-kernlib-symbols.dpatch 30 Nov 2005 22:01:01 -0000 1.1 +++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch 17 May 2006 15:35:10 -0000 1.2 @@ -5,9 +5,9 @@ ## DP: Remove some unreferenced symbols from mathlib and kernlib. @DPATCH@ -diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile ---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2005-06-13 11:20:33.838151240 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:37.545106161 -0400 ++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:48.094863874 -0400 @@ -1,6 +1,8 @@ #ifndef CERNLIB_VAXVMS @@ -18,9 +18,9 @@ readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\ tmproi.F toslat.F unlinkf.F -diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:12:24.894703741 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:16:54.864966246 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:38.432917462 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:48.095863661 -0400 @@ -2,20 +2,22 @@ #include "pilot.h" @@ -50,25 +50,29 @@ #if defined(CERNLIB_DOUBLE) SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\ -diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 2005-06-13 11:19:42.456136998 -0400 -@@ -1,9 +1,12 @@ --SRCS_F= addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\ -- bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\ -- dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\ -- grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ -- newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ -- quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ -+/* Some files deleted from the below list since they depend upon the -+ lepto63 library, which cannot be included in Debian for licensing reasons. */ -+ -+SRCS_F= addbnd.F bfgs.F bndtst.F bounds.F bucmve.F \ @@\ -+ delbnd.F delete.F dvcopy.F dvdot.F \ @@\ -+ dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F \ @@\ -+ ldlsol.F modchl.F mxstep.F \ @@\ -+ newptq.F nmdchl.F nodaud.F orthvc.F quad.F \ @@\ -+ quasi.F ranums.F rlen.F settol.F shrnk.F \ @@\ - treaud.F tredmp.F tstext.F usrint.F usrtrm.F +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile 2006-05-09 17:00:05.429179570 -0400 +@@ -4,7 +4,7 @@ + grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ + newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ + quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ +- treaud.F tredmp.F tstext.F usrint.F usrtrm.F ++ treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F FORTRANSAVEOPTION = FortranSaveFlags + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F 1969-12-31 19:00:00.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F 2006-05-09 17:01:10.196413696 -0400 +@@ -0,0 +1,10 @@ ++C----------------------------------------------------------------------- ++ FUNCTION DFUN(ND,X) ++C----------------------------------------------------------------------- ++C DUMMY FUNCTION ++C----------------------------------------------------------------------- ++ DOUBLE PRECISION DFUN, X(ND) ++ WRITE (6,10) ++ 10 FORMAT(/10X,'DFUN CALLED BUT NOT LINKED') ++ STOP ++ END cernlib-gfortran.diff: Index: cernlib-gfortran.diff =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/cernlib-gfortran.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cernlib-gfortran.diff 16 Nov 2005 23:34:07 -0000 1.1 +++ cernlib-gfortran.diff 17 May 2006 15:35:10 -0000 1.2 @@ -1,6 +1,6 @@ ---- src/config/linux.cf.old 2005-06-16 21:11:15.000000000 +0200 -+++ src/config/linux.cf 2005-06-16 21:09:23.000000000 +0200 -@@ -216,7 +216,7 @@ +--- 2005/src/config/linux.cf-old 2006-03-15 11:32:47.000000000 +0100 ++++ 2005/src/config/linux.cf 2006-03-15 11:33:52.000000000 +0100 +@@ -478,7 +478,7 @@ variable=value @@\ endif @@\ @@ -9,16 +9,20 @@ /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */ /* Adapted to CERN style GF. 20-Sep-96 */ -@@ -227,10 +227,10 @@ - # define OptimizedCDebugFlags -O1 -fomit-frame-pointer +@@ -498,14 +498,13 @@ + #endif #define f2cFortran YES --#define FortranCmd g77 -+#define FortranCmd gfortran +-#define FortranCmd g77 -g ++#define FortranCmd gfortran -g #define XargsCmd xargs #define FortranSaveFlags /* */ /* Everything static !? */ --#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex -+#define DefaultFCOptions -fno-second-underscore - #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC - - # endif + #define OptimisedFortranFlags OptimizedCDebugFlags -funroll-loops + /* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */ + #ifndef DefaultFCOptions +-# define DefaultFCOptions -fno-automatic -fno-second-underscore \ +- -fugly-complex ++# define DefaultFCOptions -fno-automatic -fno-second-underscore + #endif + #define CernlibSystem CernlibDefaultDefines CernlibMachineDefines \ + CernlibLocalDefines Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/cernlib.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cernlib.spec 16 Feb 2006 22:00:29 -0000 1.19 +++ cernlib.spec 17 May 2006 15:35:10 -0000 1.20 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 13%{?dist} +Release: 20%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -12,19 +12,27 @@ #BuildRequires: gcc-g77 #Requires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel # fedora core -# fc 3 -#BuildRequires: xorg-x11-devel lapack blas openmotif-devel -# fc 4 -#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel -# fc devel -BuildRequires: imake lapack-devel blas-devel openmotif-devel +BuildRequires: openmotif-devel +%if "%fedora" <= "3" +BuildRequires: lapack blas +%else +BuildRequires: lapack-devel blas-devel +%endif + +%if "%fedora" <= "4" +BuildRequires: xorg-x11-devel +%else +BuildRequires: imake # workaround #173530 BuildRequires: libXau-devel +%endif +# for patchy build scripts +BuildRequires: tcsh +BuildRequires: gawk # there are missing f2c intrinsics in gfortran so gfortran cannot be used to # build the cernlib BuildRequires: /usr/bin/g77 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: x86_64 # these sources are different from the upstream sources as files with # GPL incompatible licences are removed. You can use cernlib-remove-deadpool @@ -45,11 +53,18 @@ Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz Source11: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_phtools.tar.gz Source12: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_scripts.tar.gz -# actually patchy isn't built, for the reason stated in -# see http://borex.princeton.edu/~kmccarty/faq.html#36 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat +# The patchy version 4 sources +Source17: patchy.tar.gz +# this is modified with regard with what Mattias gave me. Indeed the file +# containing some other files (p4inceta) was in fortran unformatted format, +# I believe it is what caused a segfault of rceta on the ppc platform. +# I have recreated the patchy.tar.gz from Mattias tarball by running +# sh patchy-unpack-rceta +Source203: patchy-unpack-rceta + # Shell scripts that go in /etc/profile.d Source100: cernlib.sh.in Source105: cernlib.csh.in @@ -67,7 +82,7 @@ Source201: cernlib-deadpool.txt # debian patchset -Patch0: cernlib_2005.05.09.dfsg-3.diff +Patch0: cernlib_2005.05.09.dfsg-6.diff # change file to directory to DATADIR Patch1100: cernlib-enforce-FHS.diff Patch1: 001-fix-missing-fluka.dpatch @@ -108,7 +123,7 @@ Patch210: 210-improve-cfortran-header-files.dpatch # split in newer debian patchset Patch2110: 211-fix-comis-on-amd64.dpatch -Patch2111: 211-fix-comis-on-ia64.dpatch +Patch2111: 211-fix-comis-on-ia64-alpha.dpatch Patch300: 300-skip-duplicate-lenocc.dpatch # Use another approach, see cernlib-enforce-FHS # Patch33: 301-datafiles-comply-with-FHS.dpatch @@ -135,6 +150,8 @@ Patch314: 314-permit-using-regcomp-for-re_comp.dpatch Patch315: 315-fixes-for-MacOSX.dpatch Patch318: 318-additional-gcc-3.4-fixes.dpatch +# certainly not needed, but who knows? +Patch319: 319-work-around-imake-segfaults.dpatch Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch Patch701: 701-patch-hbook-comis-Imakefiles.dpatch @@ -149,8 +166,8 @@ Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch Patch802: 802-create-shared-libraries.dpatch # in the original cernlib kxterm is built with the C compiler, which cause -# a failure if compiled with de cernlib debian script as -lg2c isn't found. -# It is corrected by +# a failure if compiled with the cernlib debian script as -lg2c isn't found. +# It is corrected in Patch803: 803-link-binaries-dynamically.dpatch # 803 depends on # 208-fix-redundant-packlib-dependencies.dpatch @@ -190,6 +207,20 @@ Patch1205: cernlib-gfortran.diff Patch1207: cernlib-v107z0_X_before_string.diff +# patchy 4 +# not applied as it has allready been done by the sed one-liner in +# patchy-unpack-rceta +Patch1500: patchy-rceta.patch + +Patch1501: patchy-insecure_tmp_use.diff +Patch1502: patchy-fcasplit.patch +Patch1503: patchy-p4comp.patch + +# patchy 5 (included in cernlib) +Patch1504: patchy-case.patch +Patch1505: patchy-perror.patch +Patch1506: patchy-yexpand.diff + %description CERN program library is a large collection of general purpose libraries and modules maintained and offered on the CERN. Most of these programs @@ -203,9 +234,17 @@ %package devel Summary: General purpose CERN library static libraries and headers -Requires: lapack-devel blas-devel openmotif-devel +Requires: openmotif-devel +%if "%fedora" <= "3" +Requires: lapack blas +%else +Requires: lapack-devel blas-devel +%endif + +%if "%fedora" > "4" # workaround #173530 Requires: libXau-devel +%endif Requires: %{name} = %{version}-%{release} Group: Development/Libraries @@ -279,6 +318,13 @@ According to the responsible of the cernlib debian package, some of these utilities may have security flaws. +%package -n patchy +Group: Applications/Archiving +Summary: The patchy utilities + +%description -n patchy +Utilities for extracting sources from patchy cards and cradles. + %prep %setup -c @@ -295,6 +341,24 @@ %setup -T -D -a 12 %setup -T -D -a 14 %setup -T -D -a 15 +%setup -T -D -a 17 + +# patch patchy 4 installer fortran generator script +# avtually it is unusefull, because the unpacking has been done +# offline, see comment above. +#%patch -P 1500 + +%patch -P 1501 + +# unpack the patchy version 4 sources is done offline, +# see comment above +#pushd patchy +# ./rceta.sh +#popd + +%patch -P 1502 +%patch -P 1503 + %patch -p1 cd %{version} @@ -355,6 +419,7 @@ cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/ %patch -P 318 -p1 +%patch -P 319 -p1 # move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch) mv src/packlib/kernlib src/kernlib @@ -458,13 +523,16 @@ %patch -P 805 -p1 %patch -P 806 -p1 +%patch -P 1504 -p1 +%patch -P 1505 -p1 +%patch -P 1506 -p1 %patch -P 1200 %patch -P 1201 %patch -P 1203 %patch -P 1204 # use gfortran -#%patch -P 1205 +#%patch -P 1205 -p1 # workaround gfortran bug %patch -P 1207 @@ -518,7 +586,8 @@ # substitude the right defaults in the scripts sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \ - src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script + src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \ + ../patchy/ylist ../patchy/yindex # substitute version in gxint with the right version # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f @@ -528,6 +597,9 @@ sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \ src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F +# substitute bindir in ylist and yindex to conform to FHS +sed -i -e 's:\$CERN/patchy/\$PATCHY_VERSION/bin:%{_bindir}:' ../patchy/ylist ../patchy/yindex + # Create the build directory structure mkdir -p build bin lib shlib @@ -546,6 +618,16 @@ cp %{SOURCE104} bin/ chmod a+x bin/mkdirhier +PATHSAVE=$PATH +# Build patchy version 4 +pushd ../patchy +# export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" + export PATH=".:..:$PATH" + p4boot.sh 0 +popd +find ../patchy -name y* -a -perm -755 -exec install {} bin ';' +export PATH=$PATHSAVE + # Create the top level Makefile with imake cd $CERN_ROOT/build @@ -556,6 +638,7 @@ # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin make %{?_smp_mflags} bin/kuipc +make patchy/Makefile make scripts/Makefile cd scripts make install.bin @@ -576,6 +659,13 @@ cd $CERN_ROOT/build/packlib make %{?_smp_mflags} install.bin +# Build npatchy +# The build of patchy is completly messed up on ppc +%ifnarch ppc +cd $CERN_ROOT/build/patchy +make %{?_smp_mflags} install.bin +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -610,7 +700,6 @@ # to preserve symlinks (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) -#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -) rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier @@ -656,7 +745,6 @@ %doc cernlib.README copyright %doc debian/debhelper/geant321.README.debian %doc debian/debhelper/libpdflib804-2-dev.README.debian -%doc debian/debhelper/libmathlib2.README.debian %doc debian/debhelper/montecarlo-base.README.debian # the utils and devel are separated to have the possibility to install @@ -711,7 +799,57 @@ %{_bindir}/zftp %doc debian/debhelper/zftp.README.debian +%files -n patchy +%defattr(-,root,root,-) +%ifnarch ppc +%{_bindir}/fcasplit +%{_bindir}/nycheck +%{_bindir}/nydiff +%{_bindir}/nyindex +%{_bindir}/nylist +%{_bindir}/nymerge +%{_bindir}/nypatchy +%{_bindir}/nyshell +%{_bindir}/nysynopt +%{_bindir}/nytidy +%{_bindir}/yexpand +%endif +%{_bindir}/ycompar +%{_bindir}/yedit +%{_bindir}/yfrceta +%{_bindir}/yindex +%{_bindir}/yindexb +%{_bindir}/ylist +%{_bindir}/ylistb +%{_bindir}/ypatchy +%{_bindir}/ysearch +%{_bindir}/yshift +%{_bindir}/ytobcd +%{_bindir}/ytobin +%{_bindir}/ytoceta + + %changelog +* Wed May 17 2006 Patrice Dumas - 2005-20 +- use new debian patchset. Fix 191631 + +* Tue Apr 13 2006 Patrice Dumas - 2005-19 +- add a patch to yexpand, to avoid using $HOME. + +* Tue Apr 13 2006 Patrice Dumas - 2005-17 +- npatchy don't build on ppc. + +* Wed Apr 12 2006 Patrice Dumas - 2005-16 +- unpack patchy offline because the files are within an unformatted + fortran file which won't be right on all the arches. + +* Tue Apr 11 2006 Patrice Dumas - 2005-15.1 +- add conditionals in spec to have only one for all fedora versions. + +* Tue Apr 11 2006 Patrice Dumas - 2005-14 +- add patchy version 4 and build cernlib patchy. From Mattias Ellert. +- update to newer debian patchset + * Thu Feb 16 2006 Patrice Dumas - 2005-13 - rebuild for fc5 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/paw.README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- paw.README 14 Dec 2005 16:52:26 -0000 1.3 +++ paw.README 17 May 2006 15:35:10 -0000 1.4 @@ -41,6 +41,11 @@ to the beginning of them. +5) Shared libs + +PAW is linked dynamically, therefore the pawlib used is selected by the +/etc/ld.so.conf or $LD_LIBRARY_PATH settings. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by Index: sources =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Nov 2005 22:01:01 -0000 1.3 +++ sources 17 May 2006 15:35:10 -0000 1.4 @@ -13,3 +13,4 @@ 67228b011eac13b44499c50219e21545 src_graflib.tar.gz 4fdcdc9f819ebbb9c6d3a04f339cdcf8 src_packlib.tar.gz eecb52159458ead0ee6b0d00b90aab66 xsneut95.dat +b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz --- 211-fix-comis-on-ia64.dpatch DELETED --- --- cernlib_2005.05.09.dfsg-3.diff DELETED --- From fedora-extras-commits at redhat.com Wed May 17 16:25:57 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Wed, 17 May 2006 09:25:57 -0700 Subject: rpms/gnotime/devel gnotime.spec,1.16,1.17 Message-ID: <200605171625.k4HGPxH5031292@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/gnotime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31253 Modified Files: gnotime.spec Log Message: - Remove the libXt fake BR: as it shouldn't be needed on FC5+. - Attempt rebuild for new guile. Index: gnotime.spec =================================================================== RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnotime.spec 13 Feb 2006 20:23:42 -0000 1.16 +++ gnotime.spec 17 May 2006 16:25:57 -0000 1.17 @@ -1,6 +1,6 @@ Name: gnotime Version: 2.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tracks and reports time spent Group: Applications/Productivity @@ -16,9 +16,6 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: qof-devel >= 0.6.0 -# libxt-devel is required to work around autoconf brokenness. Remove when fixed -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176379 -BuildRequires: libXt-devel # Patch0 modifies configure.in so we need autoconf BuildRequires: autoconf # To get rid of rpath, we need to use a fedora libtool @@ -111,6 +108,10 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Fri May 12 2006 Toshio Kuratomi - 2.2.2-5 +- Remove the libXt fake BR: as it shouldn't be needed on FC5+. +- Attempt rebuild for new guile. + * Mon Feb 13 2006 Toshio Kuratomi - 2.2.2-4 - Bump and rebuild for FC5. From fedora-extras-commits at redhat.com Wed May 17 17:19:25 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:19:25 -0700 Subject: rpms/scrip - New directory Message-ID: <200605171719.k4HHJRac004118@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4095/scrip Log Message: Directory /cvs/extras/rpms/scrip added to the repository From fedora-extras-commits at redhat.com Wed May 17 17:19:26 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:19:26 -0700 Subject: rpms/scrip/devel - New directory Message-ID: <200605171719.k4HHJSbx004121@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4095/scrip/devel Log Message: Directory /cvs/extras/rpms/scrip/devel added to the repository From fedora-extras-commits at redhat.com Wed May 17 17:19:39 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:19:39 -0700 Subject: rpms/scrip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605171719.k4HHJfmt004181@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4145/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scrip --- NEW 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 May 17 17:19:38 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:19:38 -0700 Subject: rpms/scrip Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605171719.k4HHJerR004178@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4145 Added Files: Makefile import.log Log Message: Setup of module scrip --- NEW FILE Makefile --- # Top level Makefile for module scrip all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 17 17:20:01 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:20:01 -0700 Subject: rpms/scrip import.log,1.1,1.2 Message-ID: <200605171720.k4HHKXpx004265@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4215 Modified Files: import.log Log Message: auto-import scrip-1.4-4 on branch devel from scrip-1.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scrip/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 May 2006 17:19:38 -0000 1.1 +++ import.log 17 May 2006 17:20:01 -0000 1.2 @@ -0,0 +1 @@ +scrip-1_4-4:HEAD:scrip-1.4-4.src.rpm:1147886357 From fedora-extras-commits at redhat.com Wed May 17 17:20:02 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 10:20:02 -0700 Subject: rpms/scrip/devel copyright.html, NONE, 1.1 scrip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605171720.k4HHKYTk004269@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4215/devel Modified Files: .cvsignore sources Added Files: copyright.html scrip.spec Log Message: auto-import scrip-1.4-4 on branch devel from scrip-1.4-4.src.rpm --- NEW FILE copyright.html --- SCRIP Copyright

    COPYRIGHT NOTICE

    Copyright © 1997, 1998 the Regents of the University of California.

    This software and ancillary information (herein called SOFTWARE) called SCRIP is made available under the terms described here. The SOFTWARE has been approved for release with associated LA-CC Number 98-45. Unless otherwise indicated, this SOFTWARE has been authored by an employee or employees of the University of California, operator of Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with the United States Department of Energy. The United States Government has rights to use, reproduce, and distribute this SOFTWARE. The public may copy, distribute, prepare derivative works and publicly display this SOFTWARE without charge, provided that this Notice and any statement of authorship are reproduced on all copies. Neither the Government nor the University makes any warranty, express or implied, or assumes any liability or responsibility for the use of this SOFTWARE. If SOFTWARE is modified to produce derivative works, such modified SOFTWARE should be clearly marked, so as not to confuse it with the version available from Los Alamos National Laboratory. --- NEW FILE scrip.spec --- Name: scrip Version: 1.4 Release: 4%{?dist} Summary: Spherical Coordinate Remapping and Interpolation Package (SCRIP) Group: Applications/Engineering License: BSD URL: http://climate.lanl.gov/Software/SCRIP/index.htm Source0: http://climate.lanl.gov/Software/SCRIP/scrip1.4.tar.gz Source1: http://climate.lanl.gov/Software/SCRIP/copyright.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: netcdf-devel %description SCRIP is a software package which computes addresses and weights for remapping and interpolating fields between grids in spherical coordinates. It was written originally for remapping fields to other grids in a coupled climate model, but is sufficiently general that it can be used in other applications as well. The package should work for any grid on the surface of a sphere. %prep %setup -q -n SCRIP cd ${RPM_BUILD_DIR}/SCRIP %{__cp} %SOURCE1 . %build cd source %{__make} COMPILE=gfortran FLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/netcdf-3" LIB="-L%{_libdir}/netcdf-3 -lnetcdf" %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_bindir} %{__cp} scrip ${RPM_BUILD_ROOT}%{_bindir} %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc copyright.html doc/SCRIPusers.pdf %{_bindir}/* %changelog * Wed May 17 2006 Ed Hill - 1.4-4 - make should respect rpm flags (thanks to Patrice Dumas) * Tue May 16 2006 Ed Hill - 1.4-3 - add netcdf-devel buildrequires * Tue May 16 2006 Ed Hill - 1.4-2 - remove redundant source and add netcdf-devel BR * Mon May 15 2006 Ed Hill - 1.4-1 - initial package creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scrip/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 May 2006 17:19:39 -0000 1.1 +++ .cvsignore 17 May 2006 17:20:01 -0000 1.2 @@ -0,0 +1 @@ +scrip1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scrip/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 May 2006 17:19:39 -0000 1.1 +++ sources 17 May 2006 17:20:01 -0000 1.2 @@ -0,0 +1 @@ +c2aec0bed18318e5eaea393a0a426481 scrip1.4.tar.gz From fedora-extras-commits at redhat.com Wed May 17 17:47:02 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 17 May 2006 10:47:02 -0700 Subject: rpms/libgalago/devel libgalago.spec,1.1,1.2 Message-ID: <200605171747.k4HHl4Yb004583@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4565 Modified Files: libgalago.spec Log Message: * Wed May 17 2006 Brian Pepple - 0.5.0-2 - Bump. Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgalago.spec 16 May 2006 17:48:26 -0000 1.1 +++ libgalago.spec 17 May 2006 17:47:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: libgalago Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Galago presence library Group: System Environment/Libraries @@ -76,6 +76,9 @@ %changelog +* Wed May 17 2006 Brian Pepple - 0.5.0-2 +- Bump. + * Fri Apr 21 2006 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec. From fedora-extras-commits at redhat.com Wed May 17 18:14:20 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 17 May 2006 11:14:20 -0700 Subject: fedora-security/audit fe4,1.23,1.24 fe5,1.21,1.22 Message-ID: <200605171814.k4HIEKtJ007035@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4740 Modified Files: fe4 fe5 Log Message: Note a graphvis old CVE id. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fe4 17 May 2006 13:22:57 -0000 1.23 +++ fe4 17 May 2006 18:14:18 -0000 1.24 @@ -76,4 +76,5 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) +CVE-2005-4803 version (graphviz, fixed 2.2.1) CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.26-3) bz#191351 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fe5 17 May 2006 13:22:57 -0000 1.21 +++ fe5 17 May 2006 18:14:18 -0000 1.22 @@ -78,4 +78,5 @@ CVE-2006-0071 ignore (pinentry, Gentoo-specific problem) CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) +CVE-2005-4803 version (graphviz, fixed 2.2.1) CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.30-3) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch From fedora-extras-commits at redhat.com Wed May 17 19:02:45 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 17 May 2006 12:02:45 -0700 Subject: rpms/cernlib/FC-4 211-fix-comis-on-ia64-alpha.dpatch, NONE, 1.1 319-work-around-imake-segfaults.dpatch, NONE, 1.1 cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 patchy-case.patch, NONE, 1.1 patchy-fcasplit.patch, NONE, 1.1 patchy-insecure_tmp_use.diff, NONE, 1.1 patchy-p4comp.patch, NONE, 1.1 patchy-perror.patch, NONE, 1.1 patchy-rceta.patch, NONE, 1.1 patchy-unpack-rceta, NONE, 1.1 patchy-yexpand.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 307-use-canonical-cfortran.dpatch, 1.2, 1.3 800-implement-shared-library-rules-in-Imake.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib-gfortran.diff, 1.1, 1.2 cernlib.spec, 1.23, 1.24 paw.README, 1.3, 1.4 sources, 1.5, 1.6 211-fix-comis-on-ia64.dpatch, 1.1, NONE cernlib_2005.05.09.dfsg-3.diff, 1.1, NONE Message-ID: <200605171903.k4HJ3GmR009765@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9678 Modified Files: .cvsignore 112-remove-nonexistent-prototypes-from-gen.h.dpatch 307-use-canonical-cfortran.dpatch 800-implement-shared-library-rules-in-Imake.dpatch 805-expunge-missing-mathlib-kernlib-symbols.dpatch cernlib-gfortran.diff cernlib.spec paw.README sources Added Files: 211-fix-comis-on-ia64-alpha.dpatch 319-work-around-imake-segfaults.dpatch cernlib_2005.05.09.dfsg-6.diff patchy-case.patch patchy-fcasplit.patch patchy-insecure_tmp_use.diff patchy-p4comp.patch patchy-perror.patch patchy-rceta.patch patchy-unpack-rceta patchy-yexpand.diff Removed Files: 211-fix-comis-on-ia64.dpatch cernlib_2005.05.09.dfsg-3.diff Log Message: sync with devel branch --- NEW FILE 211-fix-comis-on-ia64-alpha.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 211-fix-comis-on-ia64-alpha.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Further patch building on Harald Vogt's amd64 patch attempting to ## DP: fix PAW on Itanium/Alpha Linux. This does not yet work completely... @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:45.236828642 -0500 @@ -39,12 +39,45 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *nn; { int i,n; char *a,*b; n=*nn; a=*ja; b=*jb; +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *nn; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:51:18.796348318 -0500 @@ -74,6 +74,24 @@ /* printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else double (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:51:05.440199025 -0500 @@ -67,6 +67,24 @@ /* printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else int (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:50:47.519024096 -0500 @@ -89,6 +89,24 @@ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; double r; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else float (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:45.236828642 -0500 @@ -42,6 +42,27 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *na, *nb; @@ -56,6 +77,18 @@ { a=*jb; b=*ja; la=*nb; lb=*na; k=-1; } +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *na, *nb; --- NEW FILE 319-work-around-imake-segfaults.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 319-work-around-imake-segfaults.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: If at first Imake doesn't succeed, try, try again. ## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.) @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules --- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:35:09.050384887 -0500 +++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:38:18.693611381 -0500 @@ -1296,7 +1296,11 @@ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - imakeflags -f $< + imakeflags -f $< || \ @@\ + $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + imakeflags -f $< || exit 1 #endif /* BuildMakefileTarget */ @@ -2127,7 +2131,11 @@ ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ - -DPackageName=$(PACKAGE_NAME); \ @@\ + -DPackageName=$(PACKAGE_NAME) || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) || exit 1; \ @@\ fi; \ @@\ $(MAKE) $(MFLAGS) Makefiles; \ @@\ cd $$newtop; \ @@\ @@ -2322,7 +2330,12 @@ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - -f $$imakefile; \ @@\ + -f $$imakefile || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + -f $$imakefile || exit 1; \ @@\ fi; \ @@\ fi; #endif cernlib_2005.05.09.dfsg-6.diff: --- NEW FILE cernlib_2005.05.09.dfsg-6.diff --- --- cernlib-2005.05.09.dfsg.orig/debian/control +++ cernlib-2005.05.09.dfsg/debian/control @@ -0,0 +1,896 @@ +Source: cernlib +Maintainer: Kevin B. McCarty +Standards-Version: 3.7.2 +Priority: optional +Section: science +Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin + +Package: cernlib-base +Architecture: all +Section: devel +Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev +Description: script to determine Cernlib library dependencies + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This package includes the "cernlib" script that lists the command-line + options needed for linking against Cernlib libraries. The script has + been rewritten from the upstream version to calculate + dependencies recursively. Also included are a README.Debian with a summary + of changes made to Cernlib to fit it into Debian packaging practices, + and a contributed set of Autoconf macros to test for Cernlib libraries. + +Package: cernlib-core-dev +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit +Description: Cernlib development headers, tools, and static libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the header files and static libraries likely to be + wanted by developers using the Cern libraries who are not interested + specifically in high energy physics. It also provides the Cernlib + development tools DZedit and KUIPC. Cernlib analysis programs may be + obtained by installing the cernlib-core metapackage. + +Package: cernlib-core +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos +Description: Cernlib main libraries and programs + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the libraries and analysis tools (e.g. PAW) likely + to be wanted by most users of the Cern libraries who are not interested + specifically in high energy physics. You cannot do program development by + installing only this metapackage; development libraries and tools may + be obtained by installing the cernlib-core-dev metapackage or individual + lib*-dev packages. + +Package: cernlib-extras +Architecture: all +Priority: extra +Section: science +Depends: cernlib-base (= ${Source-Version}), pawserv, zftp +Description: miscellaneous Cernlib programs unlikely to be used by many + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides a few additional Cernlib programs not included + in any other Cernlib metapackage. Very few people are likely to be + interested in them; currently they include zftp, pawserv and zserv. + Notice that the latter two programs run as daemons through inetd and may + reduce your system's security! + . + Installing this package along with the "cernlib" metapackage will supply + a complete set of all Cernlib programs and libraries included in Debian. + +Package: cernlib-montecarlo +Architecture: all +Section: science +Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev +Recommends: libisajet758-2-dev +Description: Cernlib Monte Carlo libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides various Monte Carlo libraries included in Cernlib + (both shared and static). Likely only physicists will be interested in + these packages. Note that the Geant 3.21 program is not included, but it may + be obtained by also installing the geant321 Debian package. + . + Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are + not available within Debian due to licensing issues; see the README.Debian + file in the montecarlo-base package for information on obtaining them. + . + Additionally, the Isajet library is not available on the m68k architecture + due to a compiler flaw. + +Package: cernlib +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev +Description: almost complete set of Debian Cernlib packages + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides almost all of the programs and libraries contained + in Cernlib. Most people will likely want only a subset of these. A few + extra Cernlib programs, not of interest to many people, may be obtained via + the cernlib-extras metapackage. + +Package: dzedit +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libpacklib1-dev +Description: Cernlib's ZEBRA documentation editor + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system + developed at CERN. ZEBRA, part of the Packlib library, permits a developer to + create complex data structures in the FORTRAN 77 language; the DZDOC system + allows the developer to generate and maintain documentation of ZEBRA data + structures. + +Package: geant321-data +Architecture: all +Section: science +Depends: cernlib-base +Description: [Physics] Data for Geant 3.21 detector simulator + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes data files for use by Geant. + +Package: geant321-doc +Architecture: all +Section: doc +Depends: cernlib-base +Description: [Physics] Documentation for Geant 3.21 + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes some documentation about Geant. + +Package: geant321 +Architecture: all +Section: science +Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77 +Suggests: kxterm, geant321-doc +Description: [Physics] Particle detector description and simulation tool + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes gxint, the script used to perform this linking step. + +Package: kuipc +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, cernlib-base +Recommends: libpacklib1-dev +Suggests: libpacklib1-lesstif-dev +Description: Cernlib's Kit for a User Interface Package (KUIP) compiler + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify + the writing of a program's user interface code. It takes as + input a Command Definition File (CDF) that describes the + commands to be understood by the program, and outputs C or FORTRAN code that + makes the appropriate function calls to set up the user interface. This + code can then be compiled and linked with the rest of the program. Since + the generated code uses KUIP routines, the program must also be linked + against the Packlib library that contains them. + . + KUIPC is no longer actively developed, so aside from its use in the build + process of Cernlib, it is of mainly historical interest. + +Package: kxterm +Architecture: any +Section: science +Depends: ${shlibs:Depends}, cernlib-base +Description: Cernlib's KUIP terminal emulator + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KXterm is a terminal emulator which combines the best features from + the (now defunct) Apollo DM pads (like: input and transcript [...21456 lines suppressed...] +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ./pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, C??? hai" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd" + +#. Type: select +#. Description +#: ./pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po +++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-05-26 16:05-0300\n" +"Last-Translator: Andr? Lu?s Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a serem executados a partir do inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos " +"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv " +"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP " +"do CERN). Esses servidores s?o executados a partir do inetd; voc? " +"pode habilitar cada um deles separadamente ou ambos. A menos que voc? " +"possua necessidades bastante especializadas, voc? provavelmente ir? " +"desejar habilitar somente o pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po +++ cernlib-2005.05.09.dfsg/debian/po/sv.po @@ -0,0 +1,53 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib 2005.05.09-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-10-06 23:50+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, B?da" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servrar som ska k?ras fr?n inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att " +"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem " +"att logga in med CERN's ZFTP-protokoll). Dessa servrar k?rs fr?n inetd; du m?ste " +"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott " +"om pawserv aktiveras." + --- cernlib-2005.05.09.dfsg.orig/debian/po/es.po +++ cernlib-2005.05.09.dfsg/debian/po/es.po @@ -0,0 +1,55 @@ +# cernlib po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the cernlib package. +# +# Changes: +# - Initial translation +# C??sar G??mez Mart??n +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentaci??n de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducci??n de Debian al espa??ol +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducci??n en +# http://www.debian.org/intl/spanish/notas +# +# - La gu??a de traducci??n de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-09-01 17:49+0100\n" +"Last-Translator: C??sar G??mez Mart??n \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a ejecutar desde inetd" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol). These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv." +msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++) y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv." + patchy-case.patch: --- NEW FILE patchy-case.patch --- --- 2004.orig/src/patchy/Imakefile 2006-04-13 11:15:58.000000000 +0200 +++ 2004/src/patchy/Imakefile 2006-04-13 11:27:07.000000000 +0200 @@ -54,7 +54,7 @@ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile ypatchy - p5lib p5lib TTY .go - fcasplit p5lib.f + ./fcasplit p5lib.f RemoveFile(p5lib.f) cat p5lib.libmake >> p5lib.mkfca $(MAKE) -f p5lib.mkfca $@ @@ -79,8 +79,8 @@ @ ln -s $< $@ %.f: $(LDIR)%.cra $(LDIR)patchy.car - ypatchy - $@ $< TTY .go - + ypatchy - :$@ :$< TTY .go + .f.o: $(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $< @@ -92,9 +92,9 @@ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \ ysearch yshift ytobcd ytobin ytoceta -P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)) +P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)) -$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)): +$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)): cd $(dir $@); \ @@\ if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\ ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\ patchy-fcasplit.patch: --- NEW FILE patchy-fcasplit.patch --- --- patchy/fcasplit.f.orig 2006-04-10 01:06:32.000000000 +0200 +++ patchy/fcasplit.f 2006-04-10 01:16:05.000000000 +0200 @@ -23,7 +23,7 @@ PARAMETER (CHIDA = ';DECK I' ) PARAMETER (CHOVER= 'UNKNOWN') - PARAMETER (CHPOF = '-c -O2 -Nx800 -Nc200') + PARAMETER (CHPOF = '-c -O2') PARAMETER (CHPOC = '-c -O2 -posix') PARAMETER (CHPOA = ' ') patchy-insecure_tmp_use.diff: --- NEW FILE patchy-insecure_tmp_use.diff --- diff -u patchy-orig/yindex patchy/yindex --- patchy-orig/yindex 2006-04-11 10:33:39.000000000 +0200 +++ patchy/yindex 2006-04-11 10:44:10.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: yindex-orig diff -u patchy-orig/ylist patchy/ylist --- patchy-orig/ylist 2006-04-11 10:33:48.000000000 +0200 +++ patchy/ylist 2006-04-11 10:40:17.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: ylist-orig patchy-p4comp.patch: --- NEW FILE patchy-p4comp.patch --- --- patchy/p4comp.fca.orig 2006-04-08 12:46:17.000000000 +0200 +++ patchy/p4comp.fca 2006-04-08 12:47:34.000000000 +0200 @@ -11458,7 +11458,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 12 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 12 CONTINUE NWTK = KDNWT NCH = 80 @@ -12383,7 +12383,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 13 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 13 CONTINUE NWTK = KDNWT NCHCCT = 80 @@ -14260,7 +14260,7 @@ C-------------- END CDE -------------- C DIMENSION MM(10), ITP(9) A8M DIMENSION MM(6), ITP(9) -A8M - PARAMETER ( NBLANK = '20202000'X ) + PARAMETER ( NBLANK = X'20202000' ) IT = ITP(1) JARTPX = 0 @@ -14430,7 +14430,7 @@ 24 JLOW = JCH - MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X) + MV(JCH) = AND (MV(JCH), X'FFFFFFDF') 49 CONTINUE JCCLOW = MAX (JCCLOW,JLOW) @@ -14465,8 +14465,8 @@ - DATA ACTION/'HOLD ','RESUME','EOF ','REWIND','ATTACH','DETACH' - +, 'EOFREW','CLOSE ' / + DATA ACTION/6HHOLD ,6HRESUME,6HEOF ,6HREWIND,6HATTACH,6HDETACH + +, 6HEOFREW,6HCLOSE / C------ CODE BITS IN IOTALL, IOTOFF, IOTON, IOTYP @@ -14801,7 +14801,7 @@ DO 31 JC=1,NCD J = J+1 DO 19 JJ=1,KDNWT1 - IF (AND(MV(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(MV(J),X'FF000000').EQ.0) GO TO 31 19 J = J+1 31 CONTINUE @@ -14825,7 +14825,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -14855,7 +14855,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -17316,6 +17316,8 @@ /*> ROUTINE ABEND CERN PROGLIB# Z035 ABEND .VERSION KERNFOR 4.31 911111 */ +#include + void abend_() { exit(7); @@ -17430,7 +17432,7 @@ char *fname; int *lgname; { - char *malloc(); + void *malloc(); char *ptalc, *pttext; int fchput(); int nalc; @@ -17664,7 +17666,7 @@ char *ftext; int lgtext; { - char *malloc(); + void *malloc(); char *ptalc, *ptuse; char *utext; int nalc; patchy-perror.patch: --- NEW FILE patchy-perror.patch --- --- 2005/src/patchy/patchy.car.orig 1996-07-15 13:46:22.000000000 +0200 +++ 2005/src/patchy/patchy.car 2006-04-09 02:18:17.000000000 +0200 @@ -3708,7 +3708,7 @@ 38 WRITE (IQTYPE,9038) CHLIFI(1:NN) +SELF, IF=QS_UNIX. - IF (LUNOLD.NE.0) CALL PERRORF (' System msg') + IF (LUNOLD.NE.0) CALL PERROR (' System msg') +SELF. IF (NQINIT.EQ.0) THEN IF (IQPRNT.NE.IQTYPE) WRITE (IQPRNT,9038) CHLIFI(1:NN) @@ -4399,7 +4399,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF (' Perror has') + CALL PERROR (' Perror has') +SELF. CALL P_KILL (MSG) END @@ -4446,7 +4446,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF ('Perror has') + CALL PERROR ('Perror has') +SELF. CALL P_FATAL (MSG) END @@ -15112,7 +15112,7 @@ +DECK, SEGVIOL, T=JOIN, IF=QDIAG, IF=QS_UNIX. SUBROUTINE SEGVIOL - CALL PERRORF ('perrorf has') + CALL PERROR ('perror has') CALL P_KILL ('SEGVIOL reached') END patchy-rceta.patch: --- NEW FILE patchy-rceta.patch --- --- patchy/rceta.sh.orig 1995-05-04 21:23:45.000000000 +0200 +++ patchy/rceta.sh 2006-04-08 12:20:26.000000000 +0200 @@ -225,8 +225,8 @@ RETURN END \\ - fort77 -o rceta rceta.f - rceta <<\\ + f77 -g -O2 -o rceta rceta.f + ./rceta <<\\ CODE INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX CODE CARD 1 IN HOLLERITH FOR CETA VALUES 1 - 47 CODE CARD 2 IN HOLLERITH FOR CETA VALUES 65 - 90 --- NEW FILE patchy-unpack-rceta --- #! /bin/bash set -e cd . file=patchy script=rceta.sh archive=$file.tar.gz echo "Unpacking from $archive" tar xzf $archive echo "patching script" sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script pushd $file ./$script popd echo "Repacking $archive" tar czf $archive $file exit 0 patchy-yexpand.diff: --- NEW FILE patchy-yexpand.diff --- --- 2004.orig/src/patchy/yexpand.script 2006-04-14 00:29:48.000000000 +0200 +++ 2004/src/patchy/yexpand.script 2006-04-14 00:35:13.000000000 +0200 @@ -26,8 +26,8 @@ # CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT - tfile="$HOME/$tfile.yexp" - echo "#!/bin/sh" >$tfile + tfile="./$tfile.yexp" + echo "#! /bin/sh" >$tfile echo " cat <>$tfile cat <$ifile >>$tfile cc=$? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Nov 2005 10:43:24 -0000 1.4 +++ .cvsignore 17 May 2006 19:02:42 -0000 1.5 @@ -13,3 +13,4 @@ src_graflib.tar.gz src_packlib.tar.gz xsneut95.dat +patchy.tar.gz Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 112-remove-nonexistent-prototypes-from-gen.h.dpatch 9 Dec 2005 16:09:19 -0000 1.1 +++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch 17 May 2006 19:02:42 -0000 1.2 @@ -68,19 +68,6 @@ PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT) #define FREQ(A2) CCALLSFFUN1(FREQ,freq,FLOAT,A2) -@@ -255,10 +255,10 @@ - - PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE) - #define DFRSIN(A2) CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2) -- -+/* - PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV) - #define FUN(A2,A3) CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3) -- -+*/ - PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT) - #define G116F1(A2) CCALLSFFUN1(G116F1,g116f1,FLOAT,A2) - @@ -270,10 +270,10 @@ PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT) Index: 307-use-canonical-cfortran.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/307-use-canonical-cfortran.dpatch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 307-use-canonical-cfortran.dpatch 14 Dec 2005 16:15:57 -0000 1.2 +++ 307-use-canonical-cfortran.dpatch 17 May 2006 19:02:42 -0000 1.3 @@ -7,8 +7,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 17:17:09.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 12:17:09.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-27 11:33:41.183131708 -0500 @@ -195,13 +195,13 @@ HP9000> f77 -c cfortex.f HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest @@ -79,24 +79,25 @@ - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA (E.G. TAPE, DISK, COMPUTER, PAPER.) diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 17:05:51.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 13:05:51.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-19 08:29:41.000000000 -0500 @@ -1,4 +1,4 @@ -/* cfortran.h 4.4_cernlib2002 */ +/* cfortran.h 4.4 */ /* http://www-zeus.desy.de/~burow/cfortran/ */ /* Burkhard Burow burow at desy.de 1990 - 2002. */ -@@ -11,6 +11,35 @@ +@@ -11,6 +11,38 @@ MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE. */ +/* The following modifications were made by the authors of CFITSIO or by me. -+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)". ++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY. + * PDW = Peter Wilson + * DM = Doug Mink -+ * LEB = ?? -+ * -- Kevin McCarty, for Debian (11/29/2003) */ ++ * LEB = Lee E Brotzman ++ * MR = Martin Reinecke ++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */ + +/******* + Modifications: @@ -118,12 +119,14 @@ + Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN + returning "double" in C. This was one of the items on + Burkhard's TODO list. (KMCCARTY) ++ Dec 2005: Modifications to support 8-byte integers. (MR) ++ USE AT YOUR OWN RISK! + *******/ + /* Avoid symbols already used by compilers and system *.h: __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c -@@ -75,7 +104,8 @@ +@@ -75,7 +107,8 @@ /* Remainder of cfortran.h depends on the Fortran compiler. */ @@ -133,7 +136,7 @@ #define f2cFortran #endif -@@ -90,6 +120,27 @@ +@@ -90,6 +123,27 @@ Support f2c or f77 with gcc, vcc with f2c. f77 with vcc works, missing link magic for f77 I/O.*/ #endif @@ -161,7 +164,7 @@ #if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */ #define hpuxFortran /* Should also allow hp9000s7/800 use.*/ #endif -@@ -131,6 +182,7 @@ +@@ -131,6 +185,7 @@ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ @@ -169,7 +172,7 @@ - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \ - VAX VMS CC 3.1 and FORTRAN 5.4. \ -@@ -151,7 +203,8 @@ +@@ -151,7 +206,8 @@ - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran \ - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ - Absoft Pro Fortran: Use #define AbsoftProFortran \ @@ -179,7 +182,7 @@ /* Compiler must throw us out at this point! */ #endif #endif -@@ -164,7 +217,8 @@ +@@ -164,7 +220,8 @@ /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ @@ -189,7 +192,7 @@ #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else -@@ -268,7 +322,8 @@ +@@ -268,7 +325,8 @@ #endif #ifndef apolloFortran @@ -199,7 +202,7 @@ #define CF_NULL_PROTO #else /* HP doesn't understand #elif. */ /* Without ANSI prototyping, Apollo promotes float functions to double. */ -@@ -512,7 +567,7 @@ +@@ -512,7 +570,7 @@ *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO) ), \ (F).dsc$a_a0 = ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length ,(F)) @@ -208,8 +211,14 @@ #define _NUM_ELEMS -1 #define _NUM_ELEM_ARG -2 #define NUM_ELEMS(A) A,_NUM_ELEMS -@@ -540,7 +595,8 @@ +@@ -538,9 +596,14 @@ + if (i==(unsigned)num_term) break; + else strv += elem_len-i; } ++if (0) { /* to prevent not used warnings in gcc (added by ROOT) */ ++ c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0); ++ vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0); ++} return (int)num; } -#endif @@ -218,7 +227,53 @@ /*-------------------------------------------------------------------------*/ /* UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS */ -@@ -1451,7 +1507,12 @@ +@@ -1318,6 +1381,7 @@ + #define INTVVVVVVV_cfTYPE int + #define LOGICALVVVVVVV_cfTYPE int + #define LONGVVVVVVV_cfTYPE long ++#define LONGLONGVVVVVVV_cfTYPE long long /* added by MR December 2005 */ + #define SHORTVVVVVVV_cfTYPE short + #define PBYTE_cfTYPE INTEGER_BYTE + #define PDOUBLE_cfTYPE DOUBLE_PRECISION +@@ -1325,6 +1389,7 @@ + #define PINT_cfTYPE int + #define PLOGICAL_cfTYPE int + #define PLONG_cfTYPE long ++#define PLONGLONG_cfTYPE long long /* added by MR December 2005 */ + #define PSHORT_cfTYPE short + + #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A) +@@ -1342,6 +1407,7 @@ + #define INT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LOGICAL_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) ++#define LONGLONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define PBYTE_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0) +@@ -1349,6 +1415,7 @@ + #define PINT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLOGICAL_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) ++#define PLONGLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define PSHORT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define BYTEV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define BYTEVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) +@@ -1392,6 +1459,13 @@ + #define LONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) ++#define LONGLONGV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORTV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define SHORTVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) + #define SHORTVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) +@@ -1451,7 +1525,12 @@ #define BYTE_cfPU(A) CFextern INTEGER_BYTE FCALLSC_QUALIFIER A #define DOUBLE_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -231,7 +286,80 @@ #else #define FLOAT_cfPU(A) CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A #endif -@@ -2088,7 +2149,12 @@ +@@ -1589,6 +1668,7 @@ + #define INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E) + #define LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1632,6 +1712,13 @@ + #define LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1645,6 +1732,7 @@ + #define PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E) + #define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E) + #define PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E) +@@ -1957,6 +2045,7 @@ + #define INT_cfT(M,I,A,B,D) *A + #define LOGICAL_cfT(M,I,A,B,D) F2CLOGICAL(*A) + #define LONG_cfT(M,I,A,B,D) *A ++#define LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */ + #define SHORT_cfT(M,I,A,B,D) *A + #define BYTEV_cfT(M,I,A,B,D) A + #define DOUBLEV_cfT(M,I,A,B,D) A +@@ -1964,6 +2053,7 @@ + #define INTV_cfT(M,I,A,B,D) A + #define LOGICALV_cfT(M,I,A,B,D) A + #define LONGV_cfT(M,I,A,B,D) A ++#define LONGLONGV_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define SHORTV_cfT(M,I,A,B,D) A + #define BYTEVV_cfT(M,I,A,B,D) (void *)A /* We have to cast to void *,*/ + #define BYTEVVV_cfT(M,I,A,B,D) (void *)A /* since we don't know the */ +@@ -2001,6 +2091,12 @@ + #define LONGVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVVV_cfT(M,I,A,B,D) (void *)A ++#define LONGLONGVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ + #define SHORTVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVVV_cfT(M,I,A,B,D) (void *)A +@@ -2013,6 +2109,7 @@ + #define PINT_cfT(M,I,A,B,D) A + #define PLOGICAL_cfT(M,I,A,B,D) ((*A=F2CLOGICAL(*A)),A) + #define PLONG_cfT(M,I,A,B,D) A ++#define PLONGLONG_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define PSHORT_cfT(M,I,A,B,D) A + #define PVOID_cfT(M,I,A,B,D) A + #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) +@@ -2083,12 +2180,18 @@ + #define INT_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LOGICAL_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LONG_cfFZ(UN,LN) long FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#define LONGLONG_cfFZ(UN,LN) long long FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */ + #define SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define VOID_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)( #ifndef __CF__KnR /* The void is req'd by the Apollo, to make this an ANSI function declaration. The Apollo promotes K&R float functions to double. */ @@ -245,7 +373,7 @@ #ifdef vmsFortran #define STRING_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS #else -@@ -2104,7 +2170,12 @@ +@@ -2104,7 +2207,12 @@ #endif #else #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -258,7 +386,7 @@ #else #define FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)( #endif -@@ -2118,7 +2189,12 @@ +@@ -2118,13 +2226,19 @@ #define BYTE_cfF(UN,LN) BYTE_cfFZ(UN,LN) #define DOUBLE_cfF(UN,LN) DOUBLE_cfFZ(UN,LN) #ifndef __CF_KnR @@ -271,3 +399,18 @@ #else #define FLOAT_cfF(UN,LN) FLOAT_cfFZ(UN,LN) #endif + #define INT_cfF(UN,LN) INT_cfFZ(UN,LN) + #define LOGICAL_cfF(UN,LN) LOGICAL_cfFZ(UN,LN) + #define LONG_cfF(UN,LN) LONG_cfFZ(UN,LN) ++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */ + #define SHORT_cfF(UN,LN) SHORT_cfFZ(UN,LN) + #define VOID_cfF(UN,LN) VOID_cfFZ(UN,LN) + #define STRING_cfF(UN,LN) STRING_cfFZ(UN,LN), +@@ -2187,6 +2301,7 @@ + #define LOGICAL_cfI return C2FLOGICAL(A0); + #endif + #define LONG_cfI return A0; ++#define LONGLONG_cfI return A0; /* added by MR December 2005 */ + #define SHORT_cfI return A0; + #define STRING_cfI return ; + #define VOID_cfI return ; Index: 800-implement-shared-library-rules-in-Imake.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/800-implement-shared-library-rules-in-Imake.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 800-implement-shared-library-rules-in-Imake.dpatch 9 Dec 2005 16:09:19 -0000 1.1 +++ 800-implement-shared-library-rules-in-Imake.dpatch 17 May 2006 19:02:42 -0000 1.2 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules ---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2005-11-29 17:07:32.035570303 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2005-11-29 17:07:40.003888782 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:42:00.576902424 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:42:08.484202137 -0500 @@ -904,6 +904,8 @@ * InstallSharedLibrary - generate rules to install the indicated sharable * Library @@ -27,7 +27,7 @@ /* * InstallLinkKitLibrary - rule to install Link Kit library. -@@ -1963,6 +1966,15 @@ +@@ -1967,6 +1970,15 @@ #endif /* InstallSubdirs */ /* @@ -43,7 +43,7 @@ * InstallBinSubdirs - generate rules to recursively install programs and * scripts */ -@@ -2341,9 +2353,12 @@ +@@ -2354,9 +2366,12 @@ */ #ifndef DefinePackageLibrary #define DefinePackageLibrary(locallib) \ @@ -57,8 +57,8 @@ override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB) @@\ @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules ---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 10:51:01.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2005-11-29 17:09:29.336812562 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 06:51:01.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -227,7 +227,7 @@ RanLibrary($@) #endif @@ -120,8 +120,8 @@ #ifndef SharedLibraryBuild #define SharedLibraryBuild(libname,version) @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules ---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 15:26:45.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2005-11-29 17:07:40.004888571 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 10:26:45.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -43,6 +43,9 @@ #ifndef PositionIndependentCplusplusFlags #define PositionIndependentCplusplusFlags -fPIC Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 805-expunge-missing-mathlib-kernlib-symbols.dpatch 9 Dec 2005 16:09:19 -0000 1.1 +++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch 17 May 2006 19:02:42 -0000 1.2 @@ -5,9 +5,9 @@ ## DP: Remove some unreferenced symbols from mathlib and kernlib. @DPATCH@ -diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile ---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2005-06-13 11:20:33.838151240 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:37.545106161 -0400 ++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:48.094863874 -0400 @@ -1,6 +1,8 @@ #ifndef CERNLIB_VAXVMS @@ -18,9 +18,9 @@ readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\ tmproi.F toslat.F unlinkf.F -diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:12:24.894703741 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:16:54.864966246 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:38.432917462 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:48.095863661 -0400 @@ -2,20 +2,22 @@ #include "pilot.h" @@ -50,25 +50,29 @@ #if defined(CERNLIB_DOUBLE) SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\ -diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 2005-06-13 11:19:42.456136998 -0400 -@@ -1,9 +1,12 @@ --SRCS_F= addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\ -- bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\ -- dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\ -- grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ -- newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ -- quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ -+/* Some files deleted from the below list since they depend upon the -+ lepto63 library, which cannot be included in Debian for licensing reasons. */ -+ -+SRCS_F= addbnd.F bfgs.F bndtst.F bounds.F bucmve.F \ @@\ -+ delbnd.F delete.F dvcopy.F dvdot.F \ @@\ -+ dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F \ @@\ -+ ldlsol.F modchl.F mxstep.F \ @@\ -+ newptq.F nmdchl.F nodaud.F orthvc.F quad.F \ @@\ -+ quasi.F ranums.F rlen.F settol.F shrnk.F \ @@\ - treaud.F tredmp.F tstext.F usrint.F usrtrm.F +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile 2006-05-09 17:00:05.429179570 -0400 +@@ -4,7 +4,7 @@ + grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ + newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ + quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ +- treaud.F tredmp.F tstext.F usrint.F usrtrm.F ++ treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F FORTRANSAVEOPTION = FortranSaveFlags + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F 1969-12-31 19:00:00.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F 2006-05-09 17:01:10.196413696 -0400 +@@ -0,0 +1,10 @@ ++C----------------------------------------------------------------------- ++ FUNCTION DFUN(ND,X) ++C----------------------------------------------------------------------- ++C DUMMY FUNCTION ++C----------------------------------------------------------------------- ++ DOUBLE PRECISION DFUN, X(ND) ++ WRITE (6,10) ++ 10 FORMAT(/10X,'DFUN CALLED BUT NOT LINKED') ++ STOP ++ END cernlib-gfortran.diff: Index: cernlib-gfortran.diff =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib-gfortran.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cernlib-gfortran.diff 16 Nov 2005 23:34:07 -0000 1.1 +++ cernlib-gfortran.diff 17 May 2006 19:02:42 -0000 1.2 @@ -1,6 +1,6 @@ ---- src/config/linux.cf.old 2005-06-16 21:11:15.000000000 +0200 -+++ src/config/linux.cf 2005-06-16 21:09:23.000000000 +0200 -@@ -216,7 +216,7 @@ +--- 2005/src/config/linux.cf-old 2006-03-15 11:32:47.000000000 +0100 ++++ 2005/src/config/linux.cf 2006-03-15 11:33:52.000000000 +0100 +@@ -478,7 +478,7 @@ variable=value @@\ endif @@\ @@ -9,16 +9,20 @@ /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */ /* Adapted to CERN style GF. 20-Sep-96 */ -@@ -227,10 +227,10 @@ - # define OptimizedCDebugFlags -O1 -fomit-frame-pointer +@@ -498,14 +498,13 @@ + #endif #define f2cFortran YES --#define FortranCmd g77 -+#define FortranCmd gfortran +-#define FortranCmd g77 -g ++#define FortranCmd gfortran -g #define XargsCmd xargs #define FortranSaveFlags /* */ /* Everything static !? */ --#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex -+#define DefaultFCOptions -fno-second-underscore - #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC - - # endif + #define OptimisedFortranFlags OptimizedCDebugFlags -funroll-loops + /* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */ + #ifndef DefaultFCOptions +-# define DefaultFCOptions -fno-automatic -fno-second-underscore \ +- -fugly-complex ++# define DefaultFCOptions -fno-automatic -fno-second-underscore + #endif + #define CernlibSystem CernlibDefaultDefines CernlibMachineDefines \ + CernlibLocalDefines Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cernlib.spec 16 Feb 2006 21:56:41 -0000 1.23 +++ cernlib.spec 17 May 2006 19:02:42 -0000 1.24 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 12%{?dist} +Release: 20%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -12,18 +12,27 @@ #BuildRequires: gcc-g77 #Requires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel # fedora core -# fc 3 -#BuildRequires: xorg-x11-devel lapack blas openmotif-devel -# fc 4 -BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel -# fc devel -#BuildRequires: imake lapack-devel blas-devel openmotif-devel +BuildRequires: openmotif-devel +%if "%fedora" <= "3" +BuildRequires: lapack blas +%else +BuildRequires: lapack-devel blas-devel +%endif + +%if "%fedora" <= "4" +BuildRequires: xorg-x11-devel +%else +BuildRequires: imake +# workaround #173530 +BuildRequires: libXau-devel +%endif +# for patchy build scripts +BuildRequires: tcsh +BuildRequires: gawk # there are missing f2c intrinsics in gfortran so gfortran cannot be used to # build the cernlib BuildRequires: /usr/bin/g77 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# f771 segfaults on x86_64 -ExcludeArch: x86_64 # these sources are different from the upstream sources as files with # GPL incompatible licences are removed. You can use cernlib-remove-deadpool @@ -44,11 +53,18 @@ Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz Source11: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_phtools.tar.gz Source12: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_scripts.tar.gz -# actually patchy isn't built, for the reason stated in -# see http://borex.princeton.edu/~kmccarty/faq.html#36 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat +# The patchy version 4 sources +Source17: patchy.tar.gz +# this is modified with regard with what Mattias gave me. Indeed the file +# containing some other files (p4inceta) was in fortran unformatted format, +# I believe it is what caused a segfault of rceta on the ppc platform. +# I have recreated the patchy.tar.gz from Mattias tarball by running +# sh patchy-unpack-rceta +Source203: patchy-unpack-rceta + # Shell scripts that go in /etc/profile.d Source100: cernlib.sh.in Source105: cernlib.csh.in @@ -66,7 +82,7 @@ Source201: cernlib-deadpool.txt # debian patchset -Patch0: cernlib_2005.05.09.dfsg-3.diff +Patch0: cernlib_2005.05.09.dfsg-6.diff # change file to directory to DATADIR Patch1100: cernlib-enforce-FHS.diff Patch1: 001-fix-missing-fluka.dpatch @@ -107,7 +123,7 @@ Patch210: 210-improve-cfortran-header-files.dpatch # split in newer debian patchset Patch2110: 211-fix-comis-on-amd64.dpatch -Patch2111: 211-fix-comis-on-ia64.dpatch +Patch2111: 211-fix-comis-on-ia64-alpha.dpatch Patch300: 300-skip-duplicate-lenocc.dpatch # Use another approach, see cernlib-enforce-FHS # Patch33: 301-datafiles-comply-with-FHS.dpatch @@ -134,6 +150,8 @@ Patch314: 314-permit-using-regcomp-for-re_comp.dpatch Patch315: 315-fixes-for-MacOSX.dpatch Patch318: 318-additional-gcc-3.4-fixes.dpatch +# certainly not needed, but who knows? +Patch319: 319-work-around-imake-segfaults.dpatch Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch Patch701: 701-patch-hbook-comis-Imakefiles.dpatch @@ -148,8 +166,8 @@ Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch Patch802: 802-create-shared-libraries.dpatch # in the original cernlib kxterm is built with the C compiler, which cause -# a failure if compiled with de cernlib debian script as -lg2c isn't found. -# It is corrected by +# a failure if compiled with the cernlib debian script as -lg2c isn't found. +# It is corrected in Patch803: 803-link-binaries-dynamically.dpatch # 803 depends on # 208-fix-redundant-packlib-dependencies.dpatch @@ -189,6 +207,20 @@ Patch1205: cernlib-gfortran.diff Patch1207: cernlib-v107z0_X_before_string.diff +# patchy 4 +# not applied as it has allready been done by the sed one-liner in +# patchy-unpack-rceta +Patch1500: patchy-rceta.patch + +Patch1501: patchy-insecure_tmp_use.diff +Patch1502: patchy-fcasplit.patch +Patch1503: patchy-p4comp.patch + +# patchy 5 (included in cernlib) +Patch1504: patchy-case.patch +Patch1505: patchy-perror.patch +Patch1506: patchy-yexpand.diff + %description CERN program library is a large collection of general purpose libraries and modules maintained and offered on the CERN. Most of these programs @@ -202,7 +234,17 @@ %package devel Summary: General purpose CERN library static libraries and headers -Requires: lapack-devel blas-devel openmotif-devel +Requires: openmotif-devel +%if "%fedora" <= "3" +Requires: lapack blas +%else +Requires: lapack-devel blas-devel +%endif + +%if "%fedora" > "4" +# workaround #173530 +Requires: libXau-devel +%endif Requires: %{name} = %{version}-%{release} Group: Development/Libraries @@ -276,6 +318,13 @@ According to the responsible of the cernlib debian package, some of these utilities may have security flaws. +%package -n patchy +Group: Applications/Archiving +Summary: The patchy utilities + +%description -n patchy +Utilities for extracting sources from patchy cards and cradles. + %prep %setup -c @@ -292,6 +341,24 @@ %setup -T -D -a 12 %setup -T -D -a 14 %setup -T -D -a 15 +%setup -T -D -a 17 + +# patch patchy 4 installer fortran generator script +# avtually it is unusefull, because the unpacking has been done +# offline, see comment above. +#%patch -P 1500 + +%patch -P 1501 + +# unpack the patchy version 4 sources is done offline, +# see comment above +#pushd patchy +# ./rceta.sh +#popd + +%patch -P 1502 +%patch -P 1503 + %patch -p1 cd %{version} @@ -352,6 +419,7 @@ cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/ %patch -P 318 -p1 +%patch -P 319 -p1 # move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch) mv src/packlib/kernlib src/kernlib @@ -455,13 +523,16 @@ %patch -P 805 -p1 %patch -P 806 -p1 +%patch -P 1504 -p1 +%patch -P 1505 -p1 +%patch -P 1506 -p1 %patch -P 1200 %patch -P 1201 %patch -P 1203 %patch -P 1204 # use gfortran -#%patch -P 1205 +#%patch -P 1205 -p1 # workaround gfortran bug %patch -P 1207 @@ -515,7 +586,8 @@ # substitude the right defaults in the scripts sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \ - src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script + src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \ + ../patchy/ylist ../patchy/yindex # substitute version in gxint with the right version # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f @@ -525,6 +597,9 @@ sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \ src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F +# substitute bindir in ylist and yindex to conform to FHS +sed -i -e 's:\$CERN/patchy/\$PATCHY_VERSION/bin:%{_bindir}:' ../patchy/ylist ../patchy/yindex + # Create the build directory structure mkdir -p build bin lib shlib @@ -543,6 +618,16 @@ cp %{SOURCE104} bin/ chmod a+x bin/mkdirhier +PATHSAVE=$PATH +# Build patchy version 4 +pushd ../patchy +# export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" + export PATH=".:..:$PATH" + p4boot.sh 0 +popd +find ../patchy -name y* -a -perm -755 -exec install {} bin ';' +export PATH=$PATHSAVE + # Create the top level Makefile with imake cd $CERN_ROOT/build @@ -553,6 +638,7 @@ # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin make %{?_smp_mflags} bin/kuipc +make patchy/Makefile make scripts/Makefile cd scripts make install.bin @@ -573,6 +659,13 @@ cd $CERN_ROOT/build/packlib make %{?_smp_mflags} install.bin +# Build npatchy +# The build of patchy is completly messed up on ppc +%ifnarch ppc +cd $CERN_ROOT/build/patchy +make %{?_smp_mflags} install.bin +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -607,7 +700,6 @@ # to preserve symlinks (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) -#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -) rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier @@ -653,7 +745,6 @@ %doc cernlib.README copyright %doc debian/debhelper/geant321.README.debian %doc debian/debhelper/libpdflib804-2-dev.README.debian -%doc debian/debhelper/libmathlib2.README.debian %doc debian/debhelper/montecarlo-base.README.debian # the utils and devel are separated to have the possibility to install @@ -708,9 +799,62 @@ %{_bindir}/zftp %doc debian/debhelper/zftp.README.debian +%files -n patchy +%defattr(-,root,root,-) +%ifnarch ppc +%{_bindir}/fcasplit +%{_bindir}/nycheck +%{_bindir}/nydiff +%{_bindir}/nyindex +%{_bindir}/nylist +%{_bindir}/nymerge +%{_bindir}/nypatchy +%{_bindir}/nyshell +%{_bindir}/nysynopt +%{_bindir}/nytidy +%{_bindir}/yexpand +%endif +%{_bindir}/ycompar +%{_bindir}/yedit +%{_bindir}/yfrceta +%{_bindir}/yindex +%{_bindir}/yindexb +%{_bindir}/ylist +%{_bindir}/ylistb +%{_bindir}/ypatchy +%{_bindir}/ysearch +%{_bindir}/yshift +%{_bindir}/ytobcd +%{_bindir}/ytobin +%{_bindir}/ytoceta + + %changelog -* Thu Feb 16 2006 Patrice Dumas - 2005-12 -- new cernlib.m4 +* Wed May 17 2006 Patrice Dumas - 2005-20 +- use new debian patchset. Fix 191631 + +* Tue Apr 13 2006 Patrice Dumas - 2005-19 +- add a patch to yexpand, to avoid using $HOME. + +* Tue Apr 13 2006 Patrice Dumas - 2005-17 +- npatchy don't build on ppc. + +* Wed Apr 12 2006 Patrice Dumas - 2005-16 +- unpack patchy offline because the files are within an unformatted + fortran file which won't be right on all the arches. + +* Tue Apr 11 2006 Patrice Dumas - 2005-15.1 +- add conditionals in spec to have only one for all fedora versions. + +* Tue Apr 11 2006 Patrice Dumas - 2005-14 +- add patchy version 4 and build cernlib patchy. From Mattias Ellert. +- update to newer debian patchset + +* Thu Feb 16 2006 Patrice Dumas - 2005-13 +- rebuild for fc5 + +* Tue Jan 17 2006 Patrice Dumas - 2005-12.1 +- attempt a rebuild against newer openmotif * Tue Dec 20 2005 Patrice Dumas - 2005-11.4 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11 @@ -719,35 +863,29 @@ * Tue Dec 20 2005 Patrice Dumas - 2005-10 - add file in /etc/ld.so.conf.d required for dynamic linking -* Wed Dec 14 2005 Patrice Dumas - 2005-9.2 +* Wed Dec 14 2005 Patrice Dumas - 2005-9.1 - use new debian patchset -* Fri Dec 9 2005 Patrice Dumas - 2005-8.3 +* Fri Dec 9 2005 Patrice Dumas - 2005-8.1 - use new debian patchset - enable 64 bit fixes patch + +* Fri Dec 2 2005 Patrice Dumas - 2005-7 +- use updated beta debian patchset - remove the BSD in the licence because there is no library nor binary under a BSD licence and someone could get the idea that there is some dual BSD/GPL licenced binaries or libraries. The LGPL is kept because of cfortran + +* Tue Nov 29 2005 Patrice Dumas - 2005-6.1 - update with newer debian patchset for cernlib, fix licence issues +- don't use the include.tar.gz source, instead get include files from + the source files - build shared libraries - simplify the scripts modifications +- add BuildRequires: libXau-devel to workaround #173530 -* Fri Nov 25 2005 Patrice Dumas - 2005-4.8 -- use debian patches of the cernlib 2005 patchset for the files removal -- move kernlib out of packlib -- don't use includes.tar.gz, but instead get the include files from the - sources - -* Mon Nov 21 2005 Patrice Dumas - 2005-4.7 -- add debian patch for MacOSX that could have fixed the PPC build -- add associated patch for use of regcomp instead of regcmp -- add a patch that comment out the CERNLIB_SHIFT define for ppc - and allows to use motif -- exclude x86_64 as f771 segfaults on that target -- modify or remove debian patchs that requires the new imake rules - -* Tue Nov 15 2005 Patrice Dumas - 2005-4.1 +* Tue Nov 15 2005 Patrice Dumas - 2005-4 - add a .csh file - correct defaults in cernlib scripts Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/paw.README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- paw.README 14 Dec 2005 16:15:57 -0000 1.3 +++ paw.README 17 May 2006 19:02:42 -0000 1.4 @@ -41,6 +41,11 @@ to the beginning of them. +5) Shared libs + +PAW is linked dynamically, therefore the pawlib used is selected by the +/etc/ld.so.conf or $LD_LIBRARY_PATH settings. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by Index: sources =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Dec 2005 16:09:19 -0000 1.5 +++ sources 17 May 2006 19:02:42 -0000 1.6 @@ -13,3 +13,4 @@ 67228b011eac13b44499c50219e21545 src_graflib.tar.gz 4fdcdc9f819ebbb9c6d3a04f339cdcf8 src_packlib.tar.gz eecb52159458ead0ee6b0d00b90aab66 xsneut95.dat +b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz --- 211-fix-comis-on-ia64.dpatch DELETED --- --- cernlib_2005.05.09.dfsg-3.diff DELETED --- From fedora-extras-commits at redhat.com Wed May 17 19:10:23 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 17 May 2006 12:10:23 -0700 Subject: kadischi/livecd_generator install-boot.sh, 1.4, 1.5 livecd-mkinitrd.sh, 1.8, 1.9 Message-ID: <200605171910.k4HJANuJ009900@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9869/kadischi/livecd_generator Modified Files: install-boot.sh livecd-mkinitrd.sh Log Message: FC4-compatibility and optional bootsplash modification Index: install-boot.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- install-boot.sh 30 Mar 2006 05:46:06 -0000 1.4 +++ install-boot.sh 17 May 2006 19:10:21 -0000 1.5 @@ -9,6 +9,23 @@ . /etc/kadischi/kadischi.conf +nobootsplash() { + cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ +default linux +prompt 1 +timeout 600 +label linux + kernel vmlinuz + append initrd=initrd.img quiet $kernel_params +label debug + kernel vmlinuz + append initrd=initrd.img INITRD_DBG=x +_EOF_ + + exit 0 + +} + if [ -x $sysdir/usr/bin/rhgb ]; then kernel_params="$kernel_params rhgb" fi @@ -18,7 +35,12 @@ cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/ if [ ! $kernel_is_xen ]; then -cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/ + if [ -d $INSTALLDIR/bootsplash ]; then + cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/ + else + echo "Nothing found for bootsplashing." + nobootsplash + fi cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ default linux prompt 1 @@ -39,7 +61,12 @@ append - _EOF_ else -cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/ + if [ -d $INSTALLDIR/bootsplash ]; then + cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/ + else + echo "Nothing found for bootsplashing." + nobootsplash + fi cp $sysdir/boot/xen.gz-$kernel_version_proper $csysdir/boot/isolinux/xen.gz cp /usr/lib/syslinux/mboot.c32 $csysdir/boot/isolinux/ cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- livecd-mkinitrd.sh 11 Apr 2006 08:26:22 -0000 1.8 +++ livecd-mkinitrd.sh 17 May 2006 19:10:21 -0000 1.9 @@ -253,7 +253,11 @@ inst $rootdir/sbin/MAKEDEV "$MNTIMAGE/sbin/MAKEDEV" fi -inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist" +if [ -f $rootdir/etc/modprobe.conf.dist ]; then + inst $rootdir/etc/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.conf.dist" +else + inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist" +fi inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep" MODULES=$(findmodules drivers/parport drivers/block/loop.ko fs/squashfs) From fedora-extras-commits at redhat.com Wed May 17 19:10:24 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 17 May 2006 12:10:24 -0700 Subject: kadischi/post_install_scripts 01prelink.sh,1.2,1.3 Message-ID: <200605171910.k4HJAOrj009906@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9869/kadischi/post_install_scripts Modified Files: 01prelink.sh Log Message: FC4-compatibility and optional bootsplash modification Index: 01prelink.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/01prelink.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 01prelink.sh 30 Mar 2006 05:46:06 -0000 1.2 +++ 01prelink.sh 17 May 2006 19:10:22 -0000 1.3 @@ -8,9 +8,9 @@ if [ -f $CHROOTDIR/etc/prelink.conf ]; then echo "Prelinking.. " - chroot $CHROOTDIR /bin/mount -t proc /proc /proc || exit 1 + chroot $CHROOTDIR /bin/mount -t proc /proc /proc || sleep 1 chroot $CHROOTDIR /usr/sbin/prelink --all >/dev/null 2>&1 - chroot $CHROOTDIR /bin/umount /proc || exit 1 + chroot $CHROOTDIR /bin/umount /proc || sleep 1 exit 0 else echo "No prelink.conf found.. won't prelink." From fedora-extras-commits at redhat.com Wed May 17 19:14:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 May 2006 12:14:33 -0700 Subject: rpms/perl-YAML/devel perl-YAML-testmore054.patch, 1.2, 1.3 perl-YAML.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200605171914.k4HJEZUN009971@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9947 Modified Files: perl-YAML.spec sources Added Files: perl-YAML-testmore054.patch Log Message: Revert to 0.39 temporarily. perl-YAML-testmore054.patch: Index: perl-YAML-testmore054.patch =================================================================== RCS file: perl-YAML-testmore054.patch diff -N perl-YAML-testmore054.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ perl-YAML-testmore054.patch 17 May 2006 19:14:32 -0000 1.3 @@ -0,0 +1,15 @@ +--- t/20load.t~ 2005-03-31 05:18:43.000000000 +0300 ++++ t/20load.t 2005-04-13 17:35:47.000000000 +0300 +@@ -1,7 +1,11 @@ + use lib 'lib', 't'; + use TestChunks; + plan tests => number_of_tests; +-test_load; ++SKIP: { ++ Test::More::skip "This test hangs with Test::More < 0.54", number_of_tests ++ unless $Test::More::VERSION && $Test::More::VERSION >= 0.54; ++ test_load; ++}; + + __DATA__ + === Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-YAML.spec 9 May 2006 17:19:22 -0000 1.9 +++ perl-YAML.spec 17 May 2006 19:14:32 -0000 1.10 @@ -1,15 +1,18 @@ Name: perl-YAML -Version: 0.58 +Version: 0.39 Release: 2%{?dist} Summary: YAML Ain't Markup Language (tm) -License: GPL or Artistic + Group: Development/Libraries +License: GPL or Artistic URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz +Patch0: %{name}-testmore054.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildArch: noarch -BuildRequires: perl(Test::Base) >= 0.49 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The YAML.pm module implements a YAML Loader and Dumper based on the @@ -20,48 +23,43 @@ For information on the YAML syntax, please refer to the YAML specification. + %prep %setup -q -n YAML-%{version} +%patch0 -p0 + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; - -chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check +%check || : make test + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc Changes README %{_bindir}/ysh %{perl_vendorlib}/YAML* -%{perl_vendorlib}/Test/YAML* %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* -%{_mandir}/man3/Test::YAML*.3* -%changelog -* Tue May 09 2006 Steven Pritchard 0.58-2 -- Drop testmore patch. -- Catch Test::YAML module and man page in file list. - -* Thu May 04 2006 Steven Pritchard 0.58-1 -- Update to 0.58. -- Small spec cleanups. +%changelog * Thu Apr 14 2005 Ville Skytt?? - 0.39-2 - 0.39. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 May 2006 16:32:39 -0000 1.4 +++ sources 17 May 2006 19:14:32 -0000 1.5 @@ -1 +1 @@ -aa5ac653057914ca995dd74de8212ebc YAML-0.58.tar.gz +b8a49f49cb0ee6d9698807fb3f606922 YAML-0.39.tar.gz From fedora-extras-commits at redhat.com Wed May 17 19:24:11 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 17 May 2006 12:24:11 -0700 Subject: rpms/scrip/devel scrip.spec,1.1,1.2 Message-ID: <200605171924.k4HJODlV010138@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/scrip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10121 Modified Files: scrip.spec Log Message: fix license name Index: scrip.spec =================================================================== RCS file: /cvs/extras/rpms/scrip/devel/scrip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scrip.spec 17 May 2006 17:20:01 -0000 1.1 +++ scrip.spec 17 May 2006 19:24:10 -0000 1.2 @@ -1,10 +1,12 @@ Name: scrip Version: 1.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Spherical Coordinate Remapping and Interpolation Package (SCRIP) Group: Applications/Engineering -License: BSD +# The license is very similar to BSD with one exception: modified +# sources cannot be redistributed using the "SCRIP" name. +License: SCRIP License URL: http://climate.lanl.gov/Software/SCRIP/index.htm Source0: http://climate.lanl.gov/Software/SCRIP/scrip1.4.tar.gz Source1: http://climate.lanl.gov/Software/SCRIP/copyright.html @@ -40,10 +42,13 @@ %files %defattr(-,root,root,-) -%doc copyright.html doc/SCRIPusers.pdf +%doc copyright.html doc/SCRIPusers.pdf bugs %{_bindir}/* %changelog +* Wed May 17 2006 Ed Hill - 1.4-5 +- fix license name + * Wed May 17 2006 Ed Hill - 1.4-4 - make should respect rpm flags (thanks to Patrice Dumas) From fedora-extras-commits at redhat.com Wed May 17 19:33:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 May 2006 12:33:47 -0700 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.17,1.18 Message-ID: <200605171933.k4HJXnex010247@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-serv10230 Modified Files: perl-Module-Build.spec Log Message: Call this version 0.2800 to avoid an epoch bump. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Module-Build.spec 13 May 2006 15:39:54 -0000 1.17 +++ perl-Module-Build.spec 17 May 2006 19:33:47 -0000 1.18 @@ -1,12 +1,13 @@ +%define module_version 0.28 + Name: perl-Module-Build -Version: 0.28 -Release: 2%{?dist} -Epoch: 1 +Version: 0.2800 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{module_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Tar) >= 1.08 @@ -32,7 +33,7 @@ works fine on perl 5.005 if you can install a few additional modules. %prep -%setup -q -n Module-Build-%{version} +%setup -q -n Module-Build-%{module_version} %build %{__perl} Build.PL installdirs=vendor @@ -61,12 +62,8 @@ %{_mandir}/man3/Module::Build*.3* %changelog -* Sat May 13 2006 Steven Pritchard - 1:0.28-2 -- Rebuild. - -* Fri May 12 2006 Steven Pritchard - 1:0.28-1 -- Update to 0.28. -- Epoch bump to make 0.28 > 0.2612. +* Wed May 17 2006 Steven Pritchard 0.2800-1 +- Update to 0.28, but call it 0.2800 to avoid an epoch bump. - Various spec cleanups to closer match cpanspec output. * Wed Mar 15 2006 Steven Pritchard - 0.2612-2 From fedora-extras-commits at redhat.com Wed May 17 21:00:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 17 May 2006 14:00:14 -0700 Subject: rpms/cernlib/FC-3 211-fix-comis-on-ia64-alpha.dpatch, NONE, 1.1 319-work-around-imake-segfaults.dpatch, NONE, 1.1 cernlib_2005.05.09.dfsg-6.diff, NONE, 1.1 patchy-case.patch, NONE, 1.1 patchy-fcasplit.patch, NONE, 1.1 patchy-insecure_tmp_use.diff, NONE, 1.1 patchy-p4comp.patch, NONE, 1.1 patchy-perror.patch, NONE, 1.1 patchy-rceta.patch, NONE, 1.1 patchy-unpack-rceta, NONE, 1.1 patchy-yexpand.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 112-remove-nonexistent-prototypes-from-gen.h.dpatch, 1.1, 1.2 307-use-canonical-cfortran.dpatch, 1.2, 1.3 800-implement-shared-library-rules-in-Imake.dpatch, 1.1, 1.2 805-expunge-missing-mathlib-kernlib-symbols.dpatch, 1.1, 1.2 cernlib-gfortran.diff, 1.1, 1.2 cernlib.m4, 1.2, 1.3 cernlib.spec, 1.17, 1.18 paw.README, 1.3, 1.4 sources, 1.4, 1.5 211-fix-comis-on-ia64.dpatch, 1.1, NONE cernlib_2005.05.09.dfsg-3.diff, 1.1, NONE Message-ID: <200605172100.k4HL0GAR014619@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14547 Modified Files: .cvsignore 112-remove-nonexistent-prototypes-from-gen.h.dpatch 307-use-canonical-cfortran.dpatch 800-implement-shared-library-rules-in-Imake.dpatch 805-expunge-missing-mathlib-kernlib-symbols.dpatch cernlib-gfortran.diff cernlib.m4 cernlib.spec paw.README sources Added Files: 211-fix-comis-on-ia64-alpha.dpatch 319-work-around-imake-segfaults.dpatch cernlib_2005.05.09.dfsg-6.diff patchy-case.patch patchy-fcasplit.patch patchy-insecure_tmp_use.diff patchy-p4comp.patch patchy-perror.patch patchy-rceta.patch patchy-unpack-rceta patchy-yexpand.diff Removed Files: 211-fix-comis-on-ia64.dpatch cernlib_2005.05.09.dfsg-3.diff Log Message: sync with devel branch --- NEW FILE 211-fix-comis-on-ia64-alpha.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 211-fix-comis-on-ia64-alpha.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Further patch building on Harald Vogt's amd64 patch attempting to ## DP: fix PAW on Itanium/Alpha Linux. This does not yet work completely... @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c 2006-03-24 15:36:45.236828642 -0500 @@ -39,12 +39,45 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *nn; { int i,n; char *a,*b; n=*nn; a=*ja; b=*jb; +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *nn; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c 2006-03-24 15:51:18.796348318 -0500 @@ -74,6 +74,24 @@ /* printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else double (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:36:37.723420777 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c 2006-03-24 15:51:05.440199025 -0500 @@ -67,6 +67,24 @@ /* printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else int (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c 2006-03-24 15:50:47.519024096 -0500 @@ -89,6 +89,24 @@ long p[16]; int count; for ( count=0; count<16; count++ ) p[count] = pin[count]; double r; + +/* See relevant comments in cstrcmp.c regarding this hideous hack */ +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L; + for (count = 0; count < 16; count++) + if (p[count]) + if (autotest(p[count])) + p[count] += autobase; + else + p[count] += staticbase; +# endif #else float (type_of_call *(*name)) (); int *n; diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c --- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:37.724420566 -0500 +++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c 2006-03-24 15:36:45.236828642 -0500 @@ -42,6 +42,27 @@ * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005) */ +/* For Itanium and Alpha, the situation is even worse. Itanium architecture + * has the data section starts at 0x6000000000000000. The stack is + * supposed to be between 0x80...0 and 0xa0...0 starting at the high end + * and growing downwards, although on a test machine (merulo.debian.org) + * it seemed instead to start at 0x6000100000000000 and grow downwards. + * The addresses we actually get are truncated to the lowest 32 bits, + * so we assume that those greater than 0x80000000 are in the stack. + * + * Constant strings are in the text section starting at 0x40...0; we hope + * this function doesn't receive any. + * + * On Alpha, on the other hand, I couldn't find any docs for the Linux + * segmentation for virtual memory. Judging by a test machine + * (escher.debian.org), the data section starts slightly above 0x120010000. + * On the other hand the stack grows downward from 0x120000000. Here it + * seems safe to suppose that the variable is in the stack if the uint32 + * truncated address received is less than 0x20000000. + * + * -- Kevin McCarty + */ + #if defined(CERNLIB_QMLXIA64) int *ja, *jb; int *na, *nb; @@ -56,6 +77,18 @@ { a=*jb; b=*ja; la=*nb; lb=*na; k=-1; } +# if defined (__ia64__) || defined (__alpha__) +# if defined (__ia64__) +# define autotest(_var) ((unsigned long)(_var) > 0x80000000) +# else /* __alpha__ */ +# define autotest(_var) ((unsigned long)(_var) < 0x20000000) +# endif + static int dummy = 0; + unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L; + unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L; + a = (unsigned long)a + (autotest(a) ? autobase : staticbase); + b = (unsigned long)b + (autotest(b) ? autobase : staticbase); +# endif #else char **ja, **jb; int *na, *nb; --- NEW FILE 319-work-around-imake-segfaults.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## 319-work-around-imake-segfaults.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: If at first Imake doesn't succeed, try, try again. ## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.) @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules --- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:35:09.050384887 -0500 +++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:38:18.693611381 -0500 @@ -1296,7 +1296,11 @@ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - imakeflags -f $< + imakeflags -f $< || \ @@\ + $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + imakeflags -f $< || exit 1 #endif /* BuildMakefileTarget */ @@ -2127,7 +2131,11 @@ ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ - -DPackageName=$(PACKAGE_NAME); \ @@\ + -DPackageName=$(PACKAGE_NAME) || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) || exit 1; \ @@\ fi; \ @@\ $(MAKE) $(MFLAGS) Makefiles; \ @@\ cd $$newtop; \ @@\ @@ -2322,7 +2330,12 @@ -DCURDIR=$$curdir$$i \ @@\ -DPackageTop=$(PACKAGETOP) \ @@\ -DPackageName=$(PACKAGE_NAME) \ @@\ - -f $$imakefile; \ @@\ + -f $$imakefile || \ @@\ + ImakeSubCmdHelper -DTOPDIR=$$imaketop \ @@\ + -DCURDIR=$$curdir$$i \ @@\ + -DPackageTop=$(PACKAGETOP) \ @@\ + -DPackageName=$(PACKAGE_NAME) \ @@\ + -f $$imakefile || exit 1; \ @@\ fi; \ @@\ fi; #endif cernlib_2005.05.09.dfsg-6.diff: --- NEW FILE cernlib_2005.05.09.dfsg-6.diff --- --- cernlib-2005.05.09.dfsg.orig/debian/control +++ cernlib-2005.05.09.dfsg/debian/control @@ -0,0 +1,896 @@ +Source: cernlib +Maintainer: Kevin B. McCarty +Standards-Version: 3.7.2 +Priority: optional +Section: science +Build-Depends: gcc-4.0 (>= 4.0.2-4) | gcc (<< 4:4.0), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), g77, cfortran (>= 4.4-8), x-dev, libxt-dev, libx11-dev, lesstif2-dev, refblas3-dev | libblas-3.so, lapack3-dev | liblapack-3.so, tetex-bin + +Package: cernlib-base +Architecture: all +Section: devel +Conflicts: libcojets1-dev, libgeant1-dev, libherwig59-dev, libisajet758-dev, libkuipx11-1-dev, libmathlib1-dev, libpaw1-dev, libpdflib804-dev, libphtools1-dev, blas2-dev, lapack2-dev +Description: script to determine Cernlib library dependencies + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This package includes the "cernlib" script that lists the command-line + options needed for linking against Cernlib libraries. The script has + been rewritten from the upstream version to calculate + dependencies recursively. Also included are a README.Debian with a summary + of changes made to Cernlib to fit it into Debian packaging practices, + and a contributed set of Autoconf macros to test for Cernlib libraries. + +Package: cernlib-core-dev +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), libgraflib1-dev, libgrafx11-1-dev, libkernlib1-dev, libpacklib1-lesstif-dev, libmathlib2-dev, libpacklib1-dev, libpawlib2-dev, libpawlib2-lesstif-dev, kuipc, dzedit +Description: Cernlib development headers, tools, and static libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the header files and static libraries likely to be + wanted by developers using the Cern libraries who are not interested + specifically in high energy physics. It also provides the Cernlib + development tools DZedit and KUIPC. Cernlib analysis programs may be + obtained by installing the cernlib-core metapackage. + +Package: cernlib-core +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), kxterm, paw++, paw, paw-common, paw-demos +Description: Cernlib main libraries and programs + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides the libraries and analysis tools (e.g. PAW) likely + to be wanted by most users of the Cern libraries who are not interested + specifically in high energy physics. You cannot do program development by + installing only this metapackage; development libraries and tools may + be obtained by installing the cernlib-core-dev metapackage or individual + lib*-dev packages. + +Package: cernlib-extras +Architecture: all +Priority: extra +Section: science +Depends: cernlib-base (= ${Source-Version}), pawserv, zftp +Description: miscellaneous Cernlib programs unlikely to be used by many + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides a few additional Cernlib programs not included + in any other Cernlib metapackage. Very few people are likely to be + interested in them; currently they include zftp, pawserv and zserv. + Notice that the latter two programs run as daemons through inetd and may + reduce your system's security! + . + Installing this package along with the "cernlib" metapackage will supply + a complete set of all Cernlib programs and libraries included in Debian. + +Package: cernlib-montecarlo +Architecture: all +Section: science +Depends: cernlib-base, montecarlo-base (= ${Source-Version}), libcojets2-dev, libeurodec1-dev, libherwig59-2-dev, libpdflib804-2-dev, libphotos202-dev, libphtools2-dev +Recommends: libisajet758-2-dev +Description: Cernlib Monte Carlo libraries + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides various Monte Carlo libraries included in Cernlib + (both shared and static). Likely only physicists will be interested in + these packages. Note that the Geant 3.21 program is not included, but it may + be obtained by also installing the geant321 Debian package. + . + Be aware that the libraries of Ariadne, Fritiof, Jetset, Lepto, and Pythia are + not available within Debian due to licensing issues; see the README.Debian + file in the montecarlo-base package for information on obtaining them. + . + Additionally, the Isajet library is not available on the m68k architecture + due to a compiler flaw. + +Package: cernlib +Architecture: all +Section: science +Depends: cernlib-base (= ${Source-Version}), cernlib-core, cernlib-core-dev, cernlib-montecarlo, geant321-data, geant321-doc, geant321, libgeant321-2, libgeant321-2-dev +Description: almost complete set of Debian Cernlib packages + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + This metapackage provides almost all of the programs and libraries contained + in Cernlib. Most people will likely want only a subset of these. A few + extra Cernlib programs, not of interest to many people, may be obtained via + the cernlib-extras metapackage. + +Package: dzedit +Architecture: any +Section: devel +Depends: ${shlibs:Depends} +Recommends: libpacklib1-dev +Description: Cernlib's ZEBRA documentation editor + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + DZedit is an interactive interface to the DZDOC (ZEBRA documentation) system + developed at CERN. ZEBRA, part of the Packlib library, permits a developer to + create complex data structures in the FORTRAN 77 language; the DZDOC system + allows the developer to generate and maintain documentation of ZEBRA data + structures. + +Package: geant321-data +Architecture: all +Section: science +Depends: cernlib-base +Description: [Physics] Data for Geant 3.21 detector simulator + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes data files for use by Geant. + +Package: geant321-doc +Architecture: all +Section: doc +Depends: cernlib-base +Description: [Physics] Documentation for Geant 3.21 + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes some documentation about Geant. + +Package: geant321 +Architecture: all +Section: science +Depends: libgeant321-2-dev, geant321-data, cernlib-base, g77 +Suggests: kxterm, geant321-doc +Description: [Physics] Particle detector description and simulation tool + Geant simulates the passage of subatomic particles through matter, for + instance, particle detectors. For maximum flexibility, Geant simulations + are performed by linking Fortran code supplied by the user with the Geant + libraries, then running the resulting executable. + . + This package includes gxint, the script used to perform this linking step. + +Package: kuipc +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, cernlib-base +Recommends: libpacklib1-dev +Suggests: libpacklib1-lesstif-dev +Description: Cernlib's Kit for a User Interface Package (KUIP) compiler + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify + the writing of a program's user interface code. It takes as + input a Command Definition File (CDF) that describes the + commands to be understood by the program, and outputs C or FORTRAN code that + makes the appropriate function calls to set up the user interface. This + code can then be compiled and linked with the rest of the program. Since + the generated code uses KUIP routines, the program must also be linked + against the Packlib library that contains them. + . + KUIPC is no longer actively developed, so aside from its use in the build + process of Cernlib, it is of mainly historical interest. + +Package: kxterm +Architecture: any +Section: science +Depends: ${shlibs:Depends}, cernlib-base +Description: Cernlib's KUIP terminal emulator + Cernlib is a suite of data analysis tools and libraries created for + use in physics experiments, but also with applications to other + fields such as the biological sciences. + . + KXterm is a terminal emulator which combines the best features from + the (now defunct) Apollo DM pads (like: input and transcript [...21456 lines suppressed...] +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ./pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, C??? hai" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "M??y ph???c v??? c???n ch???y t??? tr??nh inetd" + +#. Type: select +#. Description +#: ./pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "G??i tin n??y bao g???m c??? hai tr??nh n???n (d??mon) pawserv (m?? cho ph??p m??y t??? xa ?????c t???p tin ?????a ph????ng trong khi ch???y PAW/Paw++) v?? tr??nh n???n zserv (m?? cho ph??p m??y t??? xa ????ng nh???p d??ng giao th???c ZFTP c???a CERN). C??? hai tr??nh ph???c v??? n??y ???????c ch???y t??? tr??nh n???n inetd; b???n c?? th??? hi???u l???c m???t hay c??? hai ??i???u. Tuy nhi??n, tr??? b???n c???n thi???t l??m vi???c r???t ?????c bi???t, r???t c?? th??? l?? b???n s??? mu???n hi???u l???c ch??? tr??nh pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/pt_BR.po +++ cernlib-2005.05.09.dfsg/debian/po/pt_BR.po @@ -0,0 +1,55 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese at lists.debian.org\n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-05-26 16:05-0300\n" +"Last-Translator: Andr? Lu?s Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a serem executados a partir do inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Este pacote inclui ambos o daemon pawserv (permitindo hosts remotos " +"lerem arquivos locais enquanto executando PAW/Paw++) e o daemon zerv " +"(permitindo hosts remotos a se autenticarem usando o protocolo ZFTP " +"do CERN). Esses servidores s?o executados a partir do inetd; voc? " +"pode habilitar cada um deles separadamente ou ambos. A menos que voc? " +"possua necessidades bastante especializadas, voc? provavelmente ir? " +"desejar habilitar somente o pawserv." --- cernlib-2005.05.09.dfsg.orig/debian/po/sv.po +++ cernlib-2005.05.09.dfsg/debian/po/sv.po @@ -0,0 +1,53 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib 2005.05.09-4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-10-06 23:50+0200\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit" + +#. Type: select +#. Choices +#. Note to translators: only the English word "Both" below should be translated +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, B?da" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servrar som ska k?ras fr?n inetd" + +#. Type: select +#. Description +#: ../pawserv.templates.master:6 +msgid "" +"This package includes both the pawserv daemon (permitting remote hosts to " +"read local files while running PAW/Paw++) and the zserv daemon (allowing " +"remote hosts to log in using CERN's ZFTP protocol). These servers are run " +"from inetd; you may enable either or both of them. Unless you have very " +"specialized requirements, most likely you only want to enable pawserv." +msgstr "" +"Detta paket inkluderar b?de pawserver-daemonen (till?ter fj?rrsystem att " +"l?sa lokala filer n?r PAW/Paw++ k?rs) och zserv-daemonen (till?ter fj?rrsystem " +"att logga in med CERN's ZFTP-protokoll). Dessa servrar k?rs fr?n inetd; du m?ste " +"aktivera n?gon eller b?da av dom. Om du inte har speciella krav s? r?cker det gott " +"om pawserv aktiveras." + --- cernlib-2005.05.09.dfsg.orig/debian/po/es.po +++ cernlib-2005.05.09.dfsg/debian/po/es.po @@ -0,0 +1,55 @@ +# cernlib po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the cernlib package. +# +# Changes: +# - Initial translation +# C??sar G??mez Mart??n +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentaci??n de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducci??n al espa??ol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducci??n de Debian al espa??ol +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducci??n en +# http://www.debian.org/intl/spanish/notas +# +# - La gu??a de traducci??n de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: cernlib\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-25 17:23-0500\n" +"PO-Revision-Date: 2005-09-01 17:49+0100\n" +"Last-Translator: C??sar G??mez Mart??n \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#: ../pawserv.templates.master:4 +msgid "Pawserv, Zserv, Both" +msgstr "Pawserv, Zserv, Ambos" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "Servers to be run from inetd" +msgstr "Servidores a ejecutar desde inetd" + +#. Type: select +#: ../pawserv.templates.master:6 +msgid "This package includes both the pawserv daemon (permitting remote hosts to read local files while running PAW/Paw++) and the zserv daemon (allowing remote hosts to log in using CERN's ZFTP protocol). These servers are run from inetd; you may enable either or both of them. Unless you have very specialized requirements, most likely you only want to enable pawserv." +msgstr "Este paquete incluye el demonio pawserv (permite a las m??quinas remotas leer ficheros locales mientras se ejecuta PAW/Paw++) y el demonio zserv (permite a las m??quinas remotas conectarse a trav??s del protocolo ZFTP del CERN). Estos servidores se ejecutan desde inetd; puede habilitar cualquiera de ellos o los dos. A no ser que tenga algunos requisitos muy especializados, lo m??s probable es que s??lo quiera habilitar pawserv." + patchy-case.patch: --- NEW FILE patchy-case.patch --- --- 2004.orig/src/patchy/Imakefile 2006-04-13 11:15:58.000000000 +0200 +++ 2004/src/patchy/Imakefile 2006-04-13 11:27:07.000000000 +0200 @@ -54,7 +54,7 @@ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile ypatchy - p5lib p5lib TTY .go - fcasplit p5lib.f + ./fcasplit p5lib.f RemoveFile(p5lib.f) cat p5lib.libmake >> p5lib.mkfca $(MAKE) -f p5lib.mkfca $@ @@ -79,8 +79,8 @@ @ ln -s $< $@ %.f: $(LDIR)%.cra $(LDIR)patchy.car - ypatchy - $@ $< TTY .go - + ypatchy - :$@ :$< TTY .go + .f.o: $(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $< @@ -92,9 +92,9 @@ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \ ysearch yshift ytobcd ytobin ytoceta -P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)) +P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)) -$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)): +$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)): cd $(dir $@); \ @@\ if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\ ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\ patchy-fcasplit.patch: --- NEW FILE patchy-fcasplit.patch --- --- patchy/fcasplit.f.orig 2006-04-10 01:06:32.000000000 +0200 +++ patchy/fcasplit.f 2006-04-10 01:16:05.000000000 +0200 @@ -23,7 +23,7 @@ PARAMETER (CHIDA = ';DECK I' ) PARAMETER (CHOVER= 'UNKNOWN') - PARAMETER (CHPOF = '-c -O2 -Nx800 -Nc200') + PARAMETER (CHPOF = '-c -O2') PARAMETER (CHPOC = '-c -O2 -posix') PARAMETER (CHPOA = ' ') patchy-insecure_tmp_use.diff: --- NEW FILE patchy-insecure_tmp_use.diff --- diff -u patchy-orig/yindex patchy/yindex --- patchy-orig/yindex 2006-04-11 10:33:39.000000000 +0200 +++ patchy/yindex 2006-04-11 10:44:10.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: yindex-orig diff -u patchy-orig/ylist patchy/ylist --- patchy-orig/ylist 2006-04-11 10:33:48.000000000 +0200 +++ patchy/ylist 2006-04-11 10:40:17.000000000 +0200 @@ -11,7 +11,7 @@ [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15" PATCHY=$CERN/patchy/$PATCHY_VERSION/bin -ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ +#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$ if [ $# -eq 0 ] ; then cat << EoI @@ -45,6 +45,8 @@ exit 1 fi +exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$ +ftmp="$file-$exttmp" if [ "$ext" != "pam" ] ; then echo " Preparing temporary binary PAM file, ...wait" ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO > /dev/null Seulement dans patchy: ylist-orig patchy-p4comp.patch: --- NEW FILE patchy-p4comp.patch --- --- patchy/p4comp.fca.orig 2006-04-08 12:46:17.000000000 +0200 +++ patchy/p4comp.fca 2006-04-08 12:47:34.000000000 +0200 @@ -11458,7 +11458,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 12 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 12 CONTINUE NWTK = KDNWT NCH = 80 @@ -12383,7 +12383,7 @@ IF (JCARD.GE.NTOTCC) RETURN LE = LTK + KDNWT1 - 1 DO 13 L=LTK,LE - IF (AND(IQ(L),'FF000000'X).EQ.0) GO TO 14 + IF (AND(IQ(L),X'FF000000').EQ.0) GO TO 14 13 CONTINUE NWTK = KDNWT NCHCCT = 80 @@ -14260,7 +14260,7 @@ C-------------- END CDE -------------- C DIMENSION MM(10), ITP(9) A8M DIMENSION MM(6), ITP(9) -A8M - PARAMETER ( NBLANK = '20202000'X ) + PARAMETER ( NBLANK = X'20202000' ) IT = ITP(1) JARTPX = 0 @@ -14430,7 +14430,7 @@ 24 JLOW = JCH - MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X) + MV(JCH) = AND (MV(JCH), X'FFFFFFDF') 49 CONTINUE JCCLOW = MAX (JCCLOW,JLOW) @@ -14465,8 +14465,8 @@ - DATA ACTION/'HOLD ','RESUME','EOF ','REWIND','ATTACH','DETACH' - +, 'EOFREW','CLOSE ' / + DATA ACTION/6HHOLD ,6HRESUME,6HEOF ,6HREWIND,6HATTACH,6HDETACH + +, 6HEOFREW,6HCLOSE / C------ CODE BITS IN IOTALL, IOTOFF, IOTON, IOTYP @@ -14801,7 +14801,7 @@ DO 31 JC=1,NCD J = J+1 DO 19 JJ=1,KDNWT1 - IF (AND(MV(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(MV(J),X'FF000000').EQ.0) GO TO 31 19 J = J+1 31 CONTINUE @@ -14825,7 +14825,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -14855,7 +14855,7 @@ DO 16 J=1,KDNWT1 KIMA(J)= MV(J) - IF (AND(KIMA(J),'FF000000'X).EQ.0) GO TO 31 + IF (AND(KIMA(J),X'FF000000').EQ.0) GO TO 31 16 CONTINUE J = KDNWT KIMA(J)= MV(J) @@ -17316,6 +17316,8 @@ /*> ROUTINE ABEND CERN PROGLIB# Z035 ABEND .VERSION KERNFOR 4.31 911111 */ +#include + void abend_() { exit(7); @@ -17430,7 +17432,7 @@ char *fname; int *lgname; { - char *malloc(); + void *malloc(); char *ptalc, *pttext; int fchput(); int nalc; @@ -17664,7 +17666,7 @@ char *ftext; int lgtext; { - char *malloc(); + void *malloc(); char *ptalc, *ptuse; char *utext; int nalc; patchy-perror.patch: --- NEW FILE patchy-perror.patch --- --- 2005/src/patchy/patchy.car.orig 1996-07-15 13:46:22.000000000 +0200 +++ 2005/src/patchy/patchy.car 2006-04-09 02:18:17.000000000 +0200 @@ -3708,7 +3708,7 @@ 38 WRITE (IQTYPE,9038) CHLIFI(1:NN) +SELF, IF=QS_UNIX. - IF (LUNOLD.NE.0) CALL PERRORF (' System msg') + IF (LUNOLD.NE.0) CALL PERROR (' System msg') +SELF. IF (NQINIT.EQ.0) THEN IF (IQPRNT.NE.IQTYPE) WRITE (IQPRNT,9038) CHLIFI(1:NN) @@ -4399,7 +4399,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF (' Perror has') + CALL PERROR (' Perror has') +SELF. CALL P_KILL (MSG) END @@ -4446,7 +4446,7 @@ CHARACTER MSG*(*) +SELF, IF=QS_UNIX. - CALL PERRORF ('Perror has') + CALL PERROR ('Perror has') +SELF. CALL P_FATAL (MSG) END @@ -15112,7 +15112,7 @@ +DECK, SEGVIOL, T=JOIN, IF=QDIAG, IF=QS_UNIX. SUBROUTINE SEGVIOL - CALL PERRORF ('perrorf has') + CALL PERROR ('perror has') CALL P_KILL ('SEGVIOL reached') END patchy-rceta.patch: --- NEW FILE patchy-rceta.patch --- --- patchy/rceta.sh.orig 1995-05-04 21:23:45.000000000 +0200 +++ patchy/rceta.sh 2006-04-08 12:20:26.000000000 +0200 @@ -225,8 +225,8 @@ RETURN END \\ - fort77 -o rceta rceta.f - rceta <<\\ + f77 -g -O2 -o rceta rceta.f + ./rceta <<\\ CODE INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX CODE CARD 1 IN HOLLERITH FOR CETA VALUES 1 - 47 CODE CARD 2 IN HOLLERITH FOR CETA VALUES 65 - 90 --- NEW FILE patchy-unpack-rceta --- #! /bin/bash set -e cd . file=patchy script=rceta.sh archive=$file.tar.gz echo "Unpacking from $archive" tar xzf $archive echo "patching script" sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script pushd $file ./$script popd echo "Repacking $archive" tar czf $archive $file exit 0 patchy-yexpand.diff: --- NEW FILE patchy-yexpand.diff --- --- 2004.orig/src/patchy/yexpand.script 2006-04-14 00:29:48.000000000 +0200 +++ 2004/src/patchy/yexpand.script 2006-04-14 00:35:13.000000000 +0200 @@ -26,8 +26,8 @@ # CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT - tfile="$HOME/$tfile.yexp" - echo "#!/bin/sh" >$tfile + tfile="./$tfile.yexp" + echo "#! /bin/sh" >$tfile echo " cat <>$tfile cat <$ifile >>$tfile cc=$? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Dec 2005 15:57:06 -0000 1.3 +++ .cvsignore 17 May 2006 21:00:13 -0000 1.4 @@ -13,3 +13,4 @@ src_graflib.tar.gz src_packlib.tar.gz xsneut95.dat +patchy.tar.gz Index: 112-remove-nonexistent-prototypes-from-gen.h.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/112-remove-nonexistent-prototypes-from-gen.h.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 112-remove-nonexistent-prototypes-from-gen.h.dpatch 9 Dec 2005 15:57:06 -0000 1.1 +++ 112-remove-nonexistent-prototypes-from-gen.h.dpatch 17 May 2006 21:00:13 -0000 1.2 @@ -68,19 +68,6 @@ PROTOCCALLSFFUN1(FLOAT,FREQ,freq,FLOAT) #define FREQ(A2) CCALLSFFUN1(FREQ,freq,FLOAT,A2) -@@ -255,10 +255,10 @@ - - PROTOCCALLSFFUN1(DOUBLE,DFRSIN,dfrsin,DOUBLE) - #define DFRSIN(A2) CCALLSFFUN1(DFRSIN,dfrsin,DOUBLE,A2) -- -+/* - PROTOCCALLSFFUN2(FLOAT,FUN,fun,INT,FLOATV) - #define FUN(A2,A3) CCALLSFFUN2(FUN,fun,INT,FLOATV,A2,A3) -- -+*/ - PROTOCCALLSFFUN1(FLOAT,G116F1,g116f1,FLOAT) - #define G116F1(A2) CCALLSFFUN1(G116F1,g116f1,FLOAT,A2) - @@ -270,10 +270,10 @@ PROTOCCALLSFFUN1(FLOAT,GAMMA,gamma,FLOAT) Index: 307-use-canonical-cfortran.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/307-use-canonical-cfortran.dpatch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 307-use-canonical-cfortran.dpatch 15 Dec 2005 12:07:03 -0000 1.2 +++ 307-use-canonical-cfortran.dpatch 17 May 2006 21:00:13 -0000 1.3 @@ -7,8 +7,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 17:17:09.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 12:17:09.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2005-12-27 11:33:41.183131708 -0500 @@ -195,13 +195,13 @@ HP9000> f77 -c cfortex.f HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest @@ -79,24 +79,25 @@ - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA (E.G. TAPE, DISK, COMPUTER, PAPER.) diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 17:05:51.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-09 18:01:09.000000000 +0000 +--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 13:05:51.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2005-12-19 08:29:41.000000000 -0500 @@ -1,4 +1,4 @@ -/* cfortran.h 4.4_cernlib2002 */ +/* cfortran.h 4.4 */ /* http://www-zeus.desy.de/~burow/cfortran/ */ /* Burkhard Burow burow at desy.de 1990 - 2002. */ -@@ -11,6 +11,35 @@ +@@ -11,6 +11,38 @@ MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE. */ +/* The following modifications were made by the authors of CFITSIO or by me. -+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)". ++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY. + * PDW = Peter Wilson + * DM = Doug Mink -+ * LEB = ?? -+ * -- Kevin McCarty, for Debian (11/29/2003) */ ++ * LEB = Lee E Brotzman ++ * MR = Martin Reinecke ++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */ + +/******* + Modifications: @@ -118,12 +119,14 @@ + Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN + returning "double" in C. This was one of the items on + Burkhard's TODO list. (KMCCARTY) ++ Dec 2005: Modifications to support 8-byte integers. (MR) ++ USE AT YOUR OWN RISK! + *******/ + /* Avoid symbols already used by compilers and system *.h: __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c -@@ -75,7 +104,8 @@ +@@ -75,7 +107,8 @@ /* Remainder of cfortran.h depends on the Fortran compiler. */ @@ -133,7 +136,7 @@ #define f2cFortran #endif -@@ -90,6 +120,27 @@ +@@ -90,6 +123,27 @@ Support f2c or f77 with gcc, vcc with f2c. f77 with vcc works, missing link magic for f77 I/O.*/ #endif @@ -161,7 +164,7 @@ #if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */ #define hpuxFortran /* Should also allow hp9000s7/800 use.*/ #endif -@@ -131,6 +182,7 @@ +@@ -131,6 +185,7 @@ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ @@ -169,7 +172,7 @@ - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \ - VAX VMS CC 3.1 and FORTRAN 5.4. \ -@@ -151,7 +203,8 @@ +@@ -151,7 +206,8 @@ - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran \ - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ - Absoft Pro Fortran: Use #define AbsoftProFortran \ @@ -179,7 +182,7 @@ /* Compiler must throw us out at this point! */ #endif #endif -@@ -164,7 +217,8 @@ +@@ -164,7 +220,8 @@ /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ @@ -189,7 +192,7 @@ #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else -@@ -268,7 +322,8 @@ +@@ -268,7 +325,8 @@ #endif #ifndef apolloFortran @@ -199,7 +202,7 @@ #define CF_NULL_PROTO #else /* HP doesn't understand #elif. */ /* Without ANSI prototyping, Apollo promotes float functions to double. */ -@@ -512,7 +567,7 @@ +@@ -512,7 +570,7 @@ *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO) ), \ (F).dsc$a_a0 = ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length ,(F)) @@ -208,8 +211,14 @@ #define _NUM_ELEMS -1 #define _NUM_ELEM_ARG -2 #define NUM_ELEMS(A) A,_NUM_ELEMS -@@ -540,7 +595,8 @@ +@@ -538,9 +596,14 @@ + if (i==(unsigned)num_term) break; + else strv += elem_len-i; } ++if (0) { /* to prevent not used warnings in gcc (added by ROOT) */ ++ c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0); ++ vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0); ++} return (int)num; } -#endif @@ -218,7 +227,53 @@ /*-------------------------------------------------------------------------*/ /* UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS */ -@@ -1451,7 +1507,12 @@ +@@ -1318,6 +1381,7 @@ + #define INTVVVVVVV_cfTYPE int + #define LOGICALVVVVVVV_cfTYPE int + #define LONGVVVVVVV_cfTYPE long ++#define LONGLONGVVVVVVV_cfTYPE long long /* added by MR December 2005 */ + #define SHORTVVVVVVV_cfTYPE short + #define PBYTE_cfTYPE INTEGER_BYTE + #define PDOUBLE_cfTYPE DOUBLE_PRECISION +@@ -1325,6 +1389,7 @@ + #define PINT_cfTYPE int + #define PLOGICAL_cfTYPE int + #define PLONG_cfTYPE long ++#define PLONGLONG_cfTYPE long long /* added by MR December 2005 */ + #define PSHORT_cfTYPE short + + #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A) +@@ -1342,6 +1407,7 @@ + #define INT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LOGICAL_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) ++#define LONGLONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define PBYTE_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0) +@@ -1349,6 +1415,7 @@ + #define PINT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLOGICAL_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) ++#define PLONGLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define PSHORT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define BYTEV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define BYTEVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) +@@ -1392,6 +1459,13 @@ + #define LONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) ++#define LONGLONGV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORTV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define SHORTVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) + #define SHORTVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) +@@ -1451,7 +1525,12 @@ #define BYTE_cfPU(A) CFextern INTEGER_BYTE FCALLSC_QUALIFIER A #define DOUBLE_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -231,7 +286,80 @@ #else #define FLOAT_cfPU(A) CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A #endif -@@ -2088,7 +2149,12 @@ +@@ -1589,6 +1668,7 @@ + #define INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E) + #define LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1632,6 +1712,13 @@ + #define LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1645,6 +1732,7 @@ + #define PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E) + #define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E) + #define PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E) +@@ -1957,6 +2045,7 @@ + #define INT_cfT(M,I,A,B,D) *A + #define LOGICAL_cfT(M,I,A,B,D) F2CLOGICAL(*A) + #define LONG_cfT(M,I,A,B,D) *A ++#define LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */ + #define SHORT_cfT(M,I,A,B,D) *A + #define BYTEV_cfT(M,I,A,B,D) A + #define DOUBLEV_cfT(M,I,A,B,D) A +@@ -1964,6 +2053,7 @@ + #define INTV_cfT(M,I,A,B,D) A + #define LOGICALV_cfT(M,I,A,B,D) A + #define LONGV_cfT(M,I,A,B,D) A ++#define LONGLONGV_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define SHORTV_cfT(M,I,A,B,D) A + #define BYTEVV_cfT(M,I,A,B,D) (void *)A /* We have to cast to void *,*/ + #define BYTEVVV_cfT(M,I,A,B,D) (void *)A /* since we don't know the */ +@@ -2001,6 +2091,12 @@ + #define LONGVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVVV_cfT(M,I,A,B,D) (void *)A ++#define LONGLONGVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ + #define SHORTVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVVV_cfT(M,I,A,B,D) (void *)A +@@ -2013,6 +2109,7 @@ + #define PINT_cfT(M,I,A,B,D) A + #define PLOGICAL_cfT(M,I,A,B,D) ((*A=F2CLOGICAL(*A)),A) + #define PLONG_cfT(M,I,A,B,D) A ++#define PLONGLONG_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define PSHORT_cfT(M,I,A,B,D) A + #define PVOID_cfT(M,I,A,B,D) A + #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) +@@ -2083,12 +2180,18 @@ + #define INT_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LOGICAL_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LONG_cfFZ(UN,LN) long FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#define LONGLONG_cfFZ(UN,LN) long long FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */ + #define SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define VOID_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)( #ifndef __CF__KnR /* The void is req'd by the Apollo, to make this an ANSI function declaration. The Apollo promotes K&R float functions to double. */ @@ -245,7 +373,7 @@ #ifdef vmsFortran #define STRING_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS #else -@@ -2104,7 +2170,12 @@ +@@ -2104,7 +2207,12 @@ #endif #else #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -258,7 +386,7 @@ #else #define FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)( #endif -@@ -2118,7 +2189,12 @@ +@@ -2118,13 +2226,19 @@ #define BYTE_cfF(UN,LN) BYTE_cfFZ(UN,LN) #define DOUBLE_cfF(UN,LN) DOUBLE_cfFZ(UN,LN) #ifndef __CF_KnR @@ -271,3 +399,18 @@ #else #define FLOAT_cfF(UN,LN) FLOAT_cfFZ(UN,LN) #endif + #define INT_cfF(UN,LN) INT_cfFZ(UN,LN) + #define LOGICAL_cfF(UN,LN) LOGICAL_cfFZ(UN,LN) + #define LONG_cfF(UN,LN) LONG_cfFZ(UN,LN) ++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */ + #define SHORT_cfF(UN,LN) SHORT_cfFZ(UN,LN) + #define VOID_cfF(UN,LN) VOID_cfFZ(UN,LN) + #define STRING_cfF(UN,LN) STRING_cfFZ(UN,LN), +@@ -2187,6 +2301,7 @@ + #define LOGICAL_cfI return C2FLOGICAL(A0); + #endif + #define LONG_cfI return A0; ++#define LONGLONG_cfI return A0; /* added by MR December 2005 */ + #define SHORT_cfI return A0; + #define STRING_cfI return ; + #define VOID_cfI return ; Index: 800-implement-shared-library-rules-in-Imake.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/800-implement-shared-library-rules-in-Imake.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 800-implement-shared-library-rules-in-Imake.dpatch 9 Dec 2005 15:57:06 -0000 1.1 +++ 800-implement-shared-library-rules-in-Imake.dpatch 17 May 2006 21:00:13 -0000 1.2 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules ---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2005-11-29 17:07:32.035570303 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2005-11-29 17:07:40.003888782 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules 2006-01-02 10:42:00.576902424 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules 2006-01-02 10:42:08.484202137 -0500 @@ -904,6 +904,8 @@ * InstallSharedLibrary - generate rules to install the indicated sharable * Library @@ -27,7 +27,7 @@ /* * InstallLinkKitLibrary - rule to install Link Kit library. -@@ -1963,6 +1966,15 @@ +@@ -1967,6 +1970,15 @@ #endif /* InstallSubdirs */ /* @@ -43,7 +43,7 @@ * InstallBinSubdirs - generate rules to recursively install programs and * scripts */ -@@ -2341,9 +2353,12 @@ +@@ -2354,9 +2366,12 @@ */ #ifndef DefinePackageLibrary #define DefinePackageLibrary(locallib) \ @@ -57,8 +57,8 @@ override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB) @@\ @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules ---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 10:51:01.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2005-11-29 17:09:29.336812562 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules 2000-04-19 06:51:01.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/config/biglib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -227,7 +227,7 @@ RanLibrary($@) #endif @@ -120,8 +120,8 @@ #ifndef SharedLibraryBuild #define SharedLibraryBuild(libname,version) @@\ diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules ---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 15:26:45.000000000 +0000 -+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2005-11-29 17:07:40.004888571 +0000 +--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules 1995-12-20 10:26:45.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules 2006-01-02 10:42:08.485201922 -0500 @@ -43,6 +43,9 @@ #ifndef PositionIndependentCplusplusFlags #define PositionIndependentCplusplusFlags -fPIC Index: 805-expunge-missing-mathlib-kernlib-symbols.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/805-expunge-missing-mathlib-kernlib-symbols.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 805-expunge-missing-mathlib-kernlib-symbols.dpatch 9 Dec 2005 15:57:06 -0000 1.1 +++ 805-expunge-missing-mathlib-kernlib-symbols.dpatch 17 May 2006 21:00:13 -0000 1.2 @@ -5,9 +5,9 @@ ## DP: Remove some unreferenced symbols from mathlib and kernlib. @DPATCH@ -diff -urNad cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile ---- cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/kernlib/kerngen/ccgen/Imakefile 2005-06-13 11:20:33.838151240 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile +--- cernlib-2005.05.09.dfsg~/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:37.545106161 -0400 ++++ cernlib-2005.05.09.dfsg/src/kernlib/kerngen/ccgen/Imakefile 2006-05-09 16:59:48.094863874 -0400 @@ -1,6 +1,8 @@ #ifndef CERNLIB_VAXVMS @@ -18,9 +18,9 @@ readlnf.F renamef.F setenvf.F statf.F systemf.F tmpro.F \ @@\ tmproi.F toslat.F unlinkf.F -diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:12:24.894703741 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-13 11:16:54.864966246 -0400 +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:38.432917462 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/d/Imakefile 2006-05-09 16:59:48.095863661 -0400 @@ -2,20 +2,22 @@ #include "pilot.h" @@ -50,25 +50,29 @@ #if defined(CERNLIB_DOUBLE) SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\ -diff -urNad cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile ---- cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 -+++ /tmp/dpep.Thtt1b/cernlib-2005.05.09/src/mathlib/gen/divon/Imakefile 2005-06-13 11:19:42.456136998 -0400 -@@ -1,9 +1,12 @@ --SRCS_F= addbnd.F bfgs.F bndopt.F bndtst.F bounds.F bucmve.F \ @@\ -- bufopt.F delbnd.F delete.F delslv.F divon.F dvcopy.F dvdot.F \ @@\ -- dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F fun.F genpnt.F \ @@\ -- grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ -- newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ -- quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ -+/* Some files deleted from the below list since they depend upon the -+ lepto63 library, which cannot be included in Debian for licensing reasons. */ -+ -+SRCS_F= addbnd.F bfgs.F bndtst.F bounds.F bucmve.F \ @@\ -+ delbnd.F delete.F dvcopy.F dvdot.F \ @@\ -+ dvnbkd.F dvnopt.F exmbuc.F feasmv.F feqn.F \ @@\ -+ ldlsol.F modchl.F mxstep.F \ @@\ -+ newptq.F nmdchl.F nodaud.F orthvc.F quad.F \ @@\ -+ quasi.F ranums.F rlen.F settol.F shrnk.F \ @@\ - treaud.F tredmp.F tstext.F usrint.F usrtrm.F +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/Imakefile 1996-05-01 09:21:53.000000000 -0400 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/Imakefile 2006-05-09 17:00:05.429179570 -0400 +@@ -4,7 +4,7 @@ + grdcmp.F intgrl.F ldlsol.F locsch.F modchl.F mulchk.F mxstep.F \ @@\ + newptq.F nmdchl.F nocut.F nodaud.F orthvc.F partn.F quad.F \ @@\ + quasi.F ranums.F recpar.F rlen.F settol.F shrnk.F split.F \ @@\ +- treaud.F tredmp.F tstext.F usrint.F usrtrm.F ++ treaud.F tredmp.F tstext.F usrint.F usrtrm.F dfun.F FORTRANSAVEOPTION = FortranSaveFlags + +diff -urNad cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F +--- cernlib-2005.05.09.dfsg~/src/mathlib/gen/divon/dfun.F 1969-12-31 19:00:00.000000000 -0500 ++++ cernlib-2005.05.09.dfsg/src/mathlib/gen/divon/dfun.F 2006-05-09 17:01:10.196413696 -0400 +@@ -0,0 +1,10 @@ ++C----------------------------------------------------------------------- ++ FUNCTION DFUN(ND,X) ++C----------------------------------------------------------------------- ++C DUMMY FUNCTION ++C----------------------------------------------------------------------- ++ DOUBLE PRECISION DFUN, X(ND) ++ WRITE (6,10) ++ 10 FORMAT(/10X,'DFUN CALLED BUT NOT LINKED') ++ STOP ++ END cernlib-gfortran.diff: Index: cernlib-gfortran.diff =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib-gfortran.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cernlib-gfortran.diff 16 Nov 2005 23:34:07 -0000 1.1 +++ cernlib-gfortran.diff 17 May 2006 21:00:13 -0000 1.2 @@ -1,6 +1,6 @@ ---- src/config/linux.cf.old 2005-06-16 21:11:15.000000000 +0200 -+++ src/config/linux.cf 2005-06-16 21:09:23.000000000 +0200 -@@ -216,7 +216,7 @@ +--- 2005/src/config/linux.cf-old 2006-03-15 11:32:47.000000000 +0100 ++++ 2005/src/config/linux.cf 2006-03-15 11:33:52.000000000 +0100 +@@ -478,7 +478,7 @@ variable=value @@\ endif @@\ @@ -9,16 +9,20 @@ /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */ /* Adapted to CERN style GF. 20-Sep-96 */ -@@ -227,10 +227,10 @@ - # define OptimizedCDebugFlags -O1 -fomit-frame-pointer +@@ -498,14 +498,13 @@ + #endif #define f2cFortran YES --#define FortranCmd g77 -+#define FortranCmd gfortran +-#define FortranCmd g77 -g ++#define FortranCmd gfortran -g #define XargsCmd xargs #define FortranSaveFlags /* */ /* Everything static !? */ --#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex -+#define DefaultFCOptions -fno-second-underscore - #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC - - # endif + #define OptimisedFortranFlags OptimizedCDebugFlags -funroll-loops + /* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */ + #ifndef DefaultFCOptions +-# define DefaultFCOptions -fno-automatic -fno-second-underscore \ +- -fugly-complex ++# define DefaultFCOptions -fno-automatic -fno-second-underscore + #endif + #define CernlibSystem CernlibDefaultDefines CernlibMachineDefines \ + CernlibLocalDefines Index: cernlib.m4 =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cernlib.m4 15 Dec 2005 12:07:03 -0000 1.2 +++ cernlib.m4 17 May 2006 21:00:13 -0000 1.3 @@ -16,7 +16,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl A basic axample of the macro usage: +dnl A basic example of the macro usage: dnl dnl AC_LIB_CERNLIB(kernlib,CLTOU, dnl [ @@ -33,15 +33,15 @@ dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is dnl assumed that a static linking using the information reported by that dnl script is wanted. -dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the -dnl location of the static library. +dnl - otherwise if the environment variable CERNLIB exists it is assumed to +dnl be the location of the static library. dnl - otherwise if the environment variable CERN_ROOT exists it is assumed dnl that CERN_ROOT/lib is the location of the static library. dnl - otherwise a simple linking is performed. dnl dnl If a dynamic linking is selected: -dnl - if the binary program 'cernlib' is in the path it is assumed that it is the -dnl debian script and it is called with -dy. +dnl - if the binary program 'cernlib' is in the path it is assumed that it +dnl is the debian script and it is called with -dy. dnl - otherwise a simple linking is performed. dnl dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND], @@ -57,7 +57,9 @@ # AC_CERNLIB check for cernlib location and whether it should be # statically linked or not. AC_DEFUN([AC_CERNLIB], [ +CERNLIB_PATH= CERNLIB_LIB_PATH= +CERNLIB_BIN_PATH= CERNLIB_STATIC=yes AC_ARG_WITH(static_cernlib, [ --with-static-cernlib link statically with the cernlib], @@ -65,16 +67,25 @@ AC_ARG_WITH(cernlib, [ --with-cernlib cernlib location], -[ CERNLIB_LIB_PATH=$withval ]) +[ CERNLIB_PATH=$withval + CERNLIB_LIB_PATH=$CERNLIB_PATH/lib + CERNLIB_BIN_PATH=$CERNLIB_PATH/bin +]) +CERNLIB_BIN= if test "z$CERNLIB_STATIC" != "zno"; then CERNLIB_STATIC=yes - if test "z$CERNLIB_LIB_PATH" = z; then + if test "z$CERNLIB_PATH" = z; then AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no) if test $CERNLIB_BIN = no; then AC_PATH_PROG(CERNLIB_BIN, cernlib, no) fi + else + AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no, [$CERNLIB_BIN_PATH:$PATH]) + if test $CERNLIB_BIN = no; then + AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH]) + fi if test $CERNLIB_BIN = no; then if test "z$CERNLIB" != z -a -d "$CERNLIB"; then CERNLIB_LIB_PATH=$CERNLIB @@ -86,8 +97,10 @@ fi fi else - AC_PATH_PROG(CERNLIB_BIN, cernlib, no) - if test "z$CERNLIB_LIB_PATH" != z; then + if test "z$CERNLIB_PATH" = z; then + AC_PATH_PROG(CERNLIB_BIN, cernlib, no) + else + AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH]) LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH" fi fi Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- cernlib.spec 22 Dec 2005 09:38:53 -0000 1.17 +++ cernlib.spec 17 May 2006 21:00:13 -0000 1.18 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 11%{?dist}.4 +Release: 20%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -12,15 +12,25 @@ #BuildRequires: gcc-g77 #Requires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel # fedora core -# fc 3 -BuildRequires: xorg-x11-devel lapack blas openmotif-devel -# fc 4 -#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel -# fc devel -#BuildRequires: imake lapack-devel blas-devel openmotif-devel +BuildRequires: openmotif-devel +%if "%fedora" <= "3" +BuildRequires: lapack blas +%else +BuildRequires: lapack-devel blas-devel +%endif + +%if "%fedora" <= "4" +BuildRequires: xorg-x11-devel +%else +BuildRequires: imake +# workaround #173530 +BuildRequires: libXau-devel +%endif +# for patchy build scripts +BuildRequires: tcsh +BuildRequires: gawk # there are missing f2c intrinsics in gfortran so gfortran cannot be used to # build the cernlib -#BuildRequires: imake lapack-devel blas-devel openmotif-devel BuildRequires: /usr/bin/g77 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,11 +53,18 @@ Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz Source11: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_phtools.tar.gz Source12: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_scripts.tar.gz -# actually patchy isn't built, for the reason stated in -# see http://borex.princeton.edu/~kmccarty/faq.html#36 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat +# The patchy version 4 sources +Source17: patchy.tar.gz +# this is modified with regard with what Mattias gave me. Indeed the file +# containing some other files (p4inceta) was in fortran unformatted format, +# I believe it is what caused a segfault of rceta on the ppc platform. +# I have recreated the patchy.tar.gz from Mattias tarball by running +# sh patchy-unpack-rceta +Source203: patchy-unpack-rceta + # Shell scripts that go in /etc/profile.d Source100: cernlib.sh.in Source105: cernlib.csh.in @@ -65,7 +82,7 @@ Source201: cernlib-deadpool.txt # debian patchset -Patch0: cernlib_2005.05.09.dfsg-3.diff +Patch0: cernlib_2005.05.09.dfsg-6.diff # change file to directory to DATADIR Patch1100: cernlib-enforce-FHS.diff Patch1: 001-fix-missing-fluka.dpatch @@ -106,7 +123,7 @@ Patch210: 210-improve-cfortran-header-files.dpatch # split in newer debian patchset Patch2110: 211-fix-comis-on-amd64.dpatch -Patch2111: 211-fix-comis-on-ia64.dpatch +Patch2111: 211-fix-comis-on-ia64-alpha.dpatch Patch300: 300-skip-duplicate-lenocc.dpatch # Use another approach, see cernlib-enforce-FHS # Patch33: 301-datafiles-comply-with-FHS.dpatch @@ -133,6 +150,8 @@ Patch314: 314-permit-using-regcomp-for-re_comp.dpatch Patch315: 315-fixes-for-MacOSX.dpatch Patch318: 318-additional-gcc-3.4-fixes.dpatch +# certainly not needed, but who knows? +Patch319: 319-work-around-imake-segfaults.dpatch Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch Patch701: 701-patch-hbook-comis-Imakefiles.dpatch @@ -147,8 +166,8 @@ Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch Patch802: 802-create-shared-libraries.dpatch # in the original cernlib kxterm is built with the C compiler, which cause -# a failure if compiled with de cernlib debian script as -lg2c isn't found. -# It is corrected by +# a failure if compiled with the cernlib debian script as -lg2c isn't found. +# It is corrected in Patch803: 803-link-binaries-dynamically.dpatch # 803 depends on # 208-fix-redundant-packlib-dependencies.dpatch @@ -188,6 +207,20 @@ Patch1205: cernlib-gfortran.diff Patch1207: cernlib-v107z0_X_before_string.diff +# patchy 4 +# not applied as it has allready been done by the sed one-liner in +# patchy-unpack-rceta +Patch1500: patchy-rceta.patch + +Patch1501: patchy-insecure_tmp_use.diff +Patch1502: patchy-fcasplit.patch +Patch1503: patchy-p4comp.patch + +# patchy 5 (included in cernlib) +Patch1504: patchy-case.patch +Patch1505: patchy-perror.patch +Patch1506: patchy-yexpand.diff + %description CERN program library is a large collection of general purpose libraries and modules maintained and offered on the CERN. Most of these programs @@ -201,7 +234,17 @@ %package devel Summary: General purpose CERN library static libraries and headers -Requires: lapack blas openmotif-devel +Requires: openmotif-devel +%if "%fedora" <= "3" +Requires: lapack blas +%else +Requires: lapack-devel blas-devel +%endif + +%if "%fedora" > "4" +# workaround #173530 +Requires: libXau-devel +%endif Requires: %{name} = %{version}-%{release} Group: Development/Libraries @@ -275,6 +318,13 @@ According to the responsible of the cernlib debian package, some of these utilities may have security flaws. +%package -n patchy +Group: Applications/Archiving +Summary: The patchy utilities + +%description -n patchy +Utilities for extracting sources from patchy cards and cradles. + %prep %setup -c @@ -291,6 +341,24 @@ %setup -T -D -a 12 %setup -T -D -a 14 %setup -T -D -a 15 +%setup -T -D -a 17 + +# patch patchy 4 installer fortran generator script +# avtually it is unusefull, because the unpacking has been done +# offline, see comment above. +#%patch -P 1500 + +%patch -P 1501 + +# unpack the patchy version 4 sources is done offline, +# see comment above +#pushd patchy +# ./rceta.sh +#popd + +%patch -P 1502 +%patch -P 1503 + %patch -p1 cd %{version} @@ -351,6 +419,7 @@ cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/ %patch -P 318 -p1 +%patch -P 319 -p1 # move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch) mv src/packlib/kernlib src/kernlib @@ -454,13 +523,16 @@ %patch -P 805 -p1 %patch -P 806 -p1 +%patch -P 1504 -p1 +%patch -P 1505 -p1 +%patch -P 1506 -p1 %patch -P 1200 %patch -P 1201 %patch -P 1203 %patch -P 1204 # use gfortran -#%patch -P 1205 +#%patch -P 1205 -p1 # workaround gfortran bug %patch -P 1207 @@ -514,7 +586,8 @@ # substitude the right defaults in the scripts sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \ - src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script + src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \ + ../patchy/ylist ../patchy/yindex # substitute version in gxint with the right version # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f @@ -524,6 +597,9 @@ sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \ src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F +# substitute bindir in ylist and yindex to conform to FHS +sed -i -e 's:\$CERN/patchy/\$PATCHY_VERSION/bin:%{_bindir}:' ../patchy/ylist ../patchy/yindex + # Create the build directory structure mkdir -p build bin lib shlib @@ -542,6 +618,16 @@ cp %{SOURCE104} bin/ chmod a+x bin/mkdirhier +PATHSAVE=$PATH +# Build patchy version 4 +pushd ../patchy +# export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" + export PATH=".:..:$PATH" + p4boot.sh 0 +popd +find ../patchy -name y* -a -perm -755 -exec install {} bin ';' +export PATH=$PATHSAVE + # Create the top level Makefile with imake cd $CERN_ROOT/build @@ -552,6 +638,7 @@ # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin make %{?_smp_mflags} bin/kuipc +make patchy/Makefile make scripts/Makefile cd scripts make install.bin @@ -572,6 +659,13 @@ cd $CERN_ROOT/build/packlib make %{?_smp_mflags} install.bin +# Build npatchy +# The build of patchy is completly messed up on ppc +%ifnarch ppc +cd $CERN_ROOT/build/patchy +make %{?_smp_mflags} install.bin +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -606,7 +700,6 @@ # to preserve symlinks (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -) -#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -) rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier @@ -652,7 +745,6 @@ %doc cernlib.README copyright %doc debian/debhelper/geant321.README.debian %doc debian/debhelper/libpdflib804-2-dev.README.debian -%doc debian/debhelper/libmathlib2.README.debian %doc debian/debhelper/montecarlo-base.README.debian # the utils and devel are separated to have the possibility to install @@ -707,7 +799,63 @@ %{_bindir}/zftp %doc debian/debhelper/zftp.README.debian +%files -n patchy +%defattr(-,root,root,-) +%ifnarch ppc +%{_bindir}/fcasplit +%{_bindir}/nycheck +%{_bindir}/nydiff +%{_bindir}/nyindex +%{_bindir}/nylist +%{_bindir}/nymerge +%{_bindir}/nypatchy +%{_bindir}/nyshell +%{_bindir}/nysynopt +%{_bindir}/nytidy +%{_bindir}/yexpand +%endif +%{_bindir}/ycompar +%{_bindir}/yedit +%{_bindir}/yfrceta +%{_bindir}/yindex +%{_bindir}/yindexb +%{_bindir}/ylist +%{_bindir}/ylistb +%{_bindir}/ypatchy +%{_bindir}/ysearch +%{_bindir}/yshift +%{_bindir}/ytobcd +%{_bindir}/ytobin +%{_bindir}/ytoceta + + %changelog +* Wed May 17 2006 Patrice Dumas - 2005-20 +- use new debian patchset. Fix 191631 + +* Tue Apr 13 2006 Patrice Dumas - 2005-19 +- add a patch to yexpand, to avoid using $HOME. + +* Tue Apr 13 2006 Patrice Dumas - 2005-17 +- npatchy don't build on ppc. + +* Wed Apr 12 2006 Patrice Dumas - 2005-16 +- unpack patchy offline because the files are within an unformatted + fortran file which won't be right on all the arches. + +* Tue Apr 11 2006 Patrice Dumas - 2005-15.1 +- add conditionals in spec to have only one for all fedora versions. + +* Tue Apr 11 2006 Patrice Dumas - 2005-14 +- add patchy version 4 and build cernlib patchy. From Mattias Ellert. +- update to newer debian patchset + +* Thu Feb 16 2006 Patrice Dumas - 2005-13 +- rebuild for fc5 + +* Tue Jan 17 2006 Patrice Dumas - 2005-12.1 +- attempt a rebuild against newer openmotif + * Tue Dec 20 2005 Patrice Dumas - 2005-11.4 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11 - fix gxint @@ -715,24 +863,27 @@ * Tue Dec 20 2005 Patrice Dumas - 2005-10 - add file in /etc/ld.so.conf.d required for dynamic linking -* Wed Dec 14 2005 Patrice Dumas - 2005-9 +* Wed Dec 14 2005 Patrice Dumas - 2005-9.1 - use new debian patchset -* Fri Dec 9 2005 Patrice Dumas - 2005-8.4 -- update with newer debian patchset for cernlib, fix licence issues +* Fri Dec 9 2005 Patrice Dumas - 2005-8.1 +- use new debian patchset - enable 64 bit fixes patch + +* Fri Dec 2 2005 Patrice Dumas - 2005-7 +- use updated beta debian patchset - remove the BSD in the licence because there is no library nor binary under a BSD licence and someone could get the idea that there is some dual BSD/GPL licenced binaries or libraries. The LGPL is kept because of cfortran + +* Tue Nov 29 2005 Patrice Dumas - 2005-6.1 +- update with newer debian patchset for cernlib, fix licence issues - don't use the include.tar.gz source, instead get include files from the source files - build shared libraries - simplify the scripts modifications - -* Thu Nov 17 2005 Patrice Dumas - 2005-4.2 -- on fc-3 there is no lapack-devel and blas-devel, but instead blas - and lapack +- add BuildRequires: libXau-devel to workaround #173530 * Tue Nov 15 2005 Patrice Dumas - 2005-4 - add a .csh file Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- paw.README 15 Dec 2005 12:07:04 -0000 1.3 +++ paw.README 17 May 2006 21:00:13 -0000 1.4 @@ -41,6 +41,11 @@ to the beginning of them. +5) Shared libs + +PAW is linked dynamically, therefore the pawlib used is selected by the +/etc/ld.so.conf or $LD_LIBRARY_PATH settings. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by Index: sources =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Dec 2005 15:57:06 -0000 1.4 +++ sources 17 May 2006 21:00:13 -0000 1.5 @@ -13,3 +13,4 @@ 67228b011eac13b44499c50219e21545 src_graflib.tar.gz 4fdcdc9f819ebbb9c6d3a04f339cdcf8 src_packlib.tar.gz eecb52159458ead0ee6b0d00b90aab66 xsneut95.dat +b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz --- 211-fix-comis-on-ia64.dpatch DELETED --- --- cernlib_2005.05.09.dfsg-3.diff DELETED --- From fedora-extras-commits at redhat.com Wed May 17 21:49:03 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Wed, 17 May 2006 14:49:03 -0700 Subject: rpms/php-pear-DB/devel php-pear-DB.spec,1.2,1.3 Message-ID: <200605172149.k4HLn5wJ017586@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/php-pear-DB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17569 Modified Files: php-pear-DB.spec Log Message: Moved package XML file to %{peardir}/.pkgxml (see bug #190252) Removed some -fs on rm's to avoid masking possible errors Abstracted package XML directory Index: php-pear-DB.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-DB/devel/php-pear-DB.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-DB.spec 10 Feb 2006 14:32:55 -0000 1.2 +++ php-pear-DB.spec 17 May 2006 21:49:03 -0000 1.3 @@ -1,9 +1,10 @@ %define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear) +%define xmldir %{peardir}/.pkgxml Summary: PEAR: Database Abstraction Layer Name: php-pear-DB Version: 1.7.6 -Release: 4 +Release: 5 License: The PHP License Group: Development/Libraries Source0: http://pear.php.net/get/DB-%{version}.tgz @@ -54,27 +55,28 @@ pear -c pearrc install --nodeps -R %{buildroot} %{SOURCE0} # Clean up unnecessary files -rm -f pearrc -rm -f %{buildroot}%{peardir}/.filemap -rm -f %{buildroot}%{peardir}/.lock +rm pearrc +rm %{buildroot}%{peardir}/.filemap +rm %{buildroot}%{peardir}/.lock rm -rf %{buildroot}%{peardir}/.registry rm -rf %{buildroot}%{peardir}/.channels -rm -rf %{buildroot}%{peardir}/.depdb* +rm %{buildroot}%{peardir}/.depdb +rm %{buildroot}%{peardir}/.depdblock # Sort out documentation mv %{buildroot}/docs/DB/* . rm -rf %{buildroot}/docs # Install XML package description -mkdir -p %{buildroot}%{_libdir}/php/pear +mkdir -p %{buildroot}%{xmldir} tar -xzf %{SOURCE0} package.xml -cp -p package.xml %{buildroot}%{_libdir}/php/pear/DB.xml +cp -p package.xml %{buildroot}%{xmldir}/DB.xml %clean rm -rf %{buildroot} %post -pear install --nodeps --soft --force --register-only %{_libdir}/php/pear/DB.xml >/dev/null +pear install --nodeps --soft --force --register-only %{xmldir}/DB.xml >/dev/null %postun if [ "$1" -eq "0" ]; then @@ -84,12 +86,17 @@ %files %defattr(-,root,root) %doc doc/IDEAS doc/MAINTAINERS doc/STATUS doc/TESTERS -%{_libdir}/php/pear/DB.xml +%{xmldir}/DB.xml %{peardir}/tests/DB %{peardir}/DB.php %{peardir}/DB %changelog +* Wed May 17 2006 Tim Jackson 1.7.6-5 +- Moved package XML file to %{peardir}/.pkgxml (see bug #190252) +- Abstracted package XML directory +- Removed some "-f"s on rm's to avoid masking possible errors + * Tue Jan 24 2006 Tim Jackson 1.7.6-4 - Move package XML file to _libdir/php/pear rather than _var/lib/pear From fedora-extras-commits at redhat.com Thu May 18 00:16:45 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 17 May 2006 17:16:45 -0700 Subject: rpms/net6/devel .cvsignore, 1.6, 1.7 net6.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200605180016.k4I0GlC9024937@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/net6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24916 Modified Files: .cvsignore net6.spec sources Log Message: 1.3.0rc2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/net6/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Apr 2006 19:14:52 -0000 1.6 +++ .cvsignore 18 May 2006 00:16:45 -0000 1.7 @@ -1 +1 @@ -net6-1.3.0rc1.tar.gz +net6-1.3.0rc2.tar.gz Index: net6.spec =================================================================== RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- net6.spec 15 Apr 2006 21:18:51 -0000 1.9 +++ net6.spec 18 May 2006 00:16:45 -0000 1.10 @@ -1,8 +1,8 @@ -%define _rc rc1 +%define _rc rc2 Name: net6 Version: 1.3.0 -Release: 2.rc1%{?dist} +Release: 2.%{_rc}%{?dist} Summary: A TCP protocol abstraction for library C++ Group: Development/Libraries @@ -73,6 +73,9 @@ %changelog +* Wed May 17 2006 Luke Macken - 1.3.0-3.rc2 +- 1.3.0rc2 + * Sat Apr 15 2006 Luke Macken - 1.3.0-2.rc1 - Add gnutls-devel to BuildRequires for -devel package Index: sources =================================================================== RCS file: /cvs/extras/rpms/net6/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Apr 2006 19:14:52 -0000 1.6 +++ sources 18 May 2006 00:16:45 -0000 1.7 @@ -1 +1 @@ -45511815c3be246cda11a2234cc4fa7b net6-1.3.0rc1.tar.gz +072ff64096fbe43e16763f33e4dd8d32 net6-1.3.0rc2.tar.gz From fedora-extras-commits at redhat.com Thu May 18 00:20:53 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 17 May 2006 17:20:53 -0700 Subject: rpms/python-mechanize/devel python-mechanize.spec,1.1,1.2 Message-ID: <200605180020.k4I0KtBL025045@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25028 Modified Files: python-mechanize.spec Log Message: add BuildArch: noarch back (bug #192155) Index: python-mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/python-mechanize/devel/python-mechanize.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-mechanize.spec 14 May 2006 21:08:38 -0000 1.1 +++ python-mechanize.spec 18 May 2006 00:20:53 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-mechanize Version: 0.1.1a -Release: 2%{?dist} +Release: 3%{?dist} Summary: Stateful programmatic web browsing Group: System Environment/Libraries @@ -10,6 +10,7 @@ URL: http://wwwsearch.sourceforge.net/mechanize Source0: http://wwwsearch.sourceforge.net/mechanize/src/mechanize-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: python-setuptools Requires: python-clientform @@ -60,6 +61,9 @@ %changelog +* Wed May 17 2006 Luke Macken - 0.1.1a-3 +- Add BuildArch: noarch (bug #192155) + * Sun May 14 2006 Luke Macken - 0.1.1a-2 - Add python-abi Requires - Remove noarch From fedora-extras-commits at redhat.com Thu May 18 00:29:06 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:29:06 -0700 Subject: rpms/dvb-apps/devel .cvsignore, 1.3, 1.4 dvb-apps-optflags.patch, 1.1, 1.2 dvb-apps.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605180029.k4I0T8fb025144@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25118 Modified Files: .cvsignore dvb-apps-optflags.patch dvb-apps.spec sources Log Message: 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jul 2005 16:24:42 -0000 1.3 +++ .cvsignore 18 May 2006 00:29:06 -0000 1.4 @@ -1,2 +1,2 @@ -linuxtv-dvb-apps-1.1.0.tar.bz2 +linuxtv-dvb-apps-1.1.1.tar.bz2 COPYING dvb-apps-optflags.patch: Index: dvb-apps-optflags.patch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps-optflags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvb-apps-optflags.patch 17 Jul 2005 16:16:42 -0000 1.1 +++ dvb-apps-optflags.patch 18 May 2006 00:29:06 -0000 1.2 @@ -67,14 +67,13 @@ 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 @@ +@@ -1,5 +1,5 @@ CC = gcc --CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib -+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib +-CFLAGS = -MD -g -Wall -O2 -I../../include ++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include 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 Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dvb-apps.spec 21 Feb 2006 19:40:39 -0000 1.3 +++ dvb-apps.spec 18 May 2006 00:29:06 -0000 1.4 @@ -1,6 +1,6 @@ Name: dvb-apps -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel -BuildRequires: glibc-kernheaders >= 2.4-9.1.94 +BuildRequires: kernel-headers >= 2.6.16 %description %{summary}. @@ -73,6 +73,10 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-1 +- Update to dvb-apps 1.1.1 (add ATSC functionality) +- Fix kernel-headers BR + * Tue Feb 21 2006 Ville Skytt?? - 1.1.0-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jul 2005 16:24:42 -0000 1.3 +++ sources 18 May 2006 00:29:06 -0000 1.4 @@ -1,2 +1,2 @@ -987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 +de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2 eb723b61539feef013de476e68b5c50a COPYING From fedora-extras-commits at redhat.com Thu May 18 00:30:24 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:30:24 -0700 Subject: rpms/dvb-apps/FC-5 dvb-apps-optflags.patch, 1.1, 1.2 dvb-apps.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605180030.k4I0UQUa025225@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25201 Modified Files: dvb-apps-optflags.patch dvb-apps.spec sources Log Message: 1.1.1 dvb-apps-optflags.patch: Index: dvb-apps-optflags.patch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/dvb-apps-optflags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvb-apps-optflags.patch 17 Jul 2005 16:16:42 -0000 1.1 +++ dvb-apps-optflags.patch 18 May 2006 00:30:24 -0000 1.2 @@ -67,14 +67,13 @@ 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 @@ +@@ -1,5 +1,5 @@ CC = gcc --CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib -+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib +-CFLAGS = -MD -g -Wall -O2 -I../../include ++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include 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 Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/dvb-apps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dvb-apps.spec 21 Feb 2006 19:40:39 -0000 1.3 +++ dvb-apps.spec 18 May 2006 00:30:24 -0000 1.4 @@ -1,6 +1,6 @@ Name: dvb-apps -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel -BuildRequires: glibc-kernheaders >= 2.4-9.1.94 +BuildRequires: kernel-headers >= 2.6.16 %description %{summary}. @@ -73,6 +73,10 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-1 +- Update to dvb-apps 1.1.1 (add ATSC functionality) +- Fix kernel-headers BR + * Tue Feb 21 2006 Ville Skytt?? - 1.1.0-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jul 2005 16:24:42 -0000 1.3 +++ sources 18 May 2006 00:30:24 -0000 1.4 @@ -1,2 +1,2 @@ -987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 +de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2 eb723b61539feef013de476e68b5c50a COPYING From fedora-extras-commits at redhat.com Thu May 18 00:35:22 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:35:22 -0700 Subject: rpms/dvb-apps/FC-5 dvb-apps.spec,1.4,1.5 Message-ID: <200605180035.k4I0ZO9W025309@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25292 Modified Files: dvb-apps.spec Log Message: can't require kernel-headers in FC5 Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/dvb-apps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dvb-apps.spec 18 May 2006 00:30:24 -0000 1.4 +++ dvb-apps.spec 18 May 2006 00:35:22 -0000 1.5 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel -BuildRequires: kernel-headers >= 2.6.16 %description %{summary}. @@ -73,6 +72,9 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-2 +- Remove kernel-headers BR + * Thu May 18 2006 David Woodhouse - 1.1.1-1 - Update to dvb-apps 1.1.1 (add ATSC functionality) - Fix kernel-headers BR From fedora-extras-commits at redhat.com Thu May 18 00:37:23 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:37:23 -0700 Subject: rpms/dvb-apps/FC-4 branch, 1.1, 1.2 dvb-apps-optflags.patch, 1.1, 1.2 dvb-apps.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605180037.k4I0bPsP025381@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25355 Modified Files: branch dvb-apps-optflags.patch dvb-apps.spec sources Log Message: 1.1.1 Index: branch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/branch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branch 17 Jul 2005 21:29:15 -0000 1.1 +++ branch 18 May 2006 00:37:23 -0000 1.2 @@ -1 +1 @@ -FC-4 +FC-5 dvb-apps-optflags.patch: Index: dvb-apps-optflags.patch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/dvb-apps-optflags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvb-apps-optflags.patch 17 Jul 2005 16:16:42 -0000 1.1 +++ dvb-apps-optflags.patch 18 May 2006 00:37:23 -0000 1.2 @@ -67,14 +67,13 @@ 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 @@ +@@ -1,5 +1,5 @@ CC = gcc --CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib -+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib +-CFLAGS = -MD -g -Wall -O2 -I../../include ++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include 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 Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/dvb-apps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dvb-apps.spec 17 Jul 2005 16:24:42 -0000 1.2 +++ dvb-apps.spec 18 May 2006 00:37:23 -0000 1.3 @@ -1,6 +1,6 @@ Name: dvb-apps -Version: 1.1.0 -Release: 1%{?dist} +Version: 1.1.1 +Release: 2%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,7 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel -BuildRequires: glibc-kernheaders >= 2.4-9.1.94 %description %{summary}. @@ -73,6 +72,16 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-2 +- Remove kernel-headers BR + +* Thu May 18 2006 David Woodhouse - 1.1.1-1 +- Update to dvb-apps 1.1.1 (add ATSC functionality) +- Fix kernel-headers BR + +* Tue Feb 21 2006 Ville Skytt?? - 1.1.0-2 +- Rebuild. + * Sun Jul 17 2005 Ville Skytt?? - 1.1.0-1 - Include a copy of the GPL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jul 2005 16:24:42 -0000 1.3 +++ sources 18 May 2006 00:37:23 -0000 1.4 @@ -1,2 +1,2 @@ -987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 +de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2 eb723b61539feef013de476e68b5c50a COPYING From fedora-extras-commits at redhat.com Thu May 18 00:38:45 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:38:45 -0700 Subject: rpms/dvb-apps/FC-4 branch,1.2,1.3 Message-ID: <200605180038.k4I0cl3E025460@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25443 Modified Files: branch Log Message: oops Index: branch =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/branch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- branch 18 May 2006 00:37:23 -0000 1.2 +++ branch 18 May 2006 00:38:45 -0000 1.3 @@ -1 +1 @@ -FC-5 +FC-4 From fedora-extras-commits at redhat.com Thu May 18 00:40:30 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:40:30 -0700 Subject: rpms/dvb-apps/devel dvb-apps.spec,1.4,1.5 Message-ID: <200605180040.k4I0eWRP025512@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25495 Modified Files: dvb-apps.spec Log Message: rebuild Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dvb-apps.spec 18 May 2006 00:29:06 -0000 1.4 +++ dvb-apps.spec 18 May 2006 00:40:30 -0000 1.5 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -73,6 +73,9 @@ %changelog +* Thu May 18 2006 David Woodhouse - 1.1.1-2 +- Rebuild (to unfix kernel-headers on older distros) + * Thu May 18 2006 David Woodhouse - 1.1.1-1 - Update to dvb-apps 1.1.1 (add ATSC functionality) - Fix kernel-headers BR From fedora-extras-commits at redhat.com Thu May 18 00:44:40 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:44:40 -0700 Subject: rpms/unifdef/devel Makefile, 1.1, NONE sources, 1.2, NONE unifdef.spec, 1.2, NONE Message-ID: <200605180044.k4I0ignd025603@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25588 Removed Files: Makefile sources unifdef.spec Log Message: Remove devel branch --- Makefile DELETED --- --- sources DELETED --- --- unifdef.spec DELETED --- From fedora-extras-commits at redhat.com Thu May 18 00:45:10 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 17 May 2006 17:45:10 -0700 Subject: rpms/unifdef/devel .cvsignore,1.2,NONE Message-ID: <200605180045.k4I0jCUl025633@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/unifdef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25618 Removed Files: .cvsignore Log Message: Remove devel branch --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Thu May 18 01:15:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 18:15:43 -0700 Subject: rpms/perl-File-Find-Rule-PPI/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE perl-File-Find-Rule-PPI.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <200605180115.k4I1Fj8l028029@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-File-Find-Rule-PPI/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28012 Removed Files: .cvsignore Makefile branch perl-File-Find-Rule-PPI.spec sources Log Message: Removal of FC-4 branch (requested by mistake) --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- perl-File-Find-Rule-PPI.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu May 18 01:17:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 17 May 2006 18:17:13 -0700 Subject: rpms/perl-PPI/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE perl-PPI.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <200605180117.k4I1HFd1028080@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PPI/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28063 Removed Files: .cvsignore Makefile branch perl-PPI.spec sources Log Message: Removal of FC-4 branch (requested by mistake) --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- perl-PPI.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu May 18 06:59:13 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 17 May 2006 23:59:13 -0700 Subject: rpms/rafkill - New directory Message-ID: <200605180659.k4I6xFrG008053@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8027/rafkill Log Message: Directory /cvs/extras/rpms/rafkill added to the repository From fedora-extras-commits at redhat.com Thu May 18 06:59:14 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 17 May 2006 23:59:14 -0700 Subject: rpms/rafkill/devel - New directory Message-ID: <200605180659.k4I6xGYJ008056@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8027/rafkill/devel Log Message: Directory /cvs/extras/rpms/rafkill/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 06:59:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 17 May 2006 23:59:28 -0700 Subject: rpms/rafkill Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605180659.k4I6xUjt008102@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8074 Added Files: Makefile import.log Log Message: Setup of module rafkill --- NEW FILE Makefile --- # Top level Makefile for module rafkill all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 06:59:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 17 May 2006 23:59:28 -0700 Subject: rpms/rafkill/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605180659.k4I6xU9V008105@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8074/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rafkill --- NEW 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 May 18 07:01:06 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:01:06 -0700 Subject: rpms/rafkill import.log,1.1,1.2 Message-ID: <200605180701.k4I718Qn010398@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10154 Modified Files: import.log Log Message: auto-import rafkill-1.2.1-1 on branch devel from rafkill-1.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rafkill/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 06:59:28 -0000 1.1 +++ import.log 18 May 2006 07:01:06 -0000 1.2 @@ -0,0 +1 @@ +rafkill-1_2_1-1:HEAD:rafkill-1.2.1-1.src.rpm:1147935683 From fedora-extras-commits at redhat.com Thu May 18 07:01:07 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:01:07 -0700 Subject: rpms/rafkill/devel COPYING, NONE, 1.1 license-confirmation.txt, NONE, 1.1 rafkill-1.2.1-debian.patch, NONE, 1.1 rafkill-1.2.1-options.patch, NONE, 1.1 rafkill.6, NONE, 1.1 rafkill.desktop, NONE, 1.1 rafkill.png, NONE, 1.1 rafkill.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605180701.k4I719eI010409@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/rafkill/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10154/devel Modified Files: .cvsignore sources Added Files: COPYING license-confirmation.txt rafkill-1.2.1-debian.patch rafkill-1.2.1-options.patch rafkill.6 rafkill.desktop rafkill.png rafkill.spec Log Message: auto-import rafkill-1.2.1-1 on branch devel from rafkill-1.2.1-1.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 license-confirmation.txt --- Rafkill is licensed under the GPL, however the latest upstream package comes without any license info. The previous verison 1.2.0 did include a GPL license notice and so does the CVS tree. To make really sure rafkill is still licensed under the GPL I asked the Author to confirm this, and it still is. The mail exchange confirming this is below: Message-ID: <446649EA.60605 at hhs.nl> Date: Sat, 13 May 2006 23:04:42 +0200 From: Hans de Goede User-Agent: Thunderbird 1.5.0.2 (X11/20060420) MIME-Version: 1.0 To: Jon Rafkind Subject: Re: Raptor References: <4423D4EE.1050301 at hhs.nl> <4423F583.3090705 at ccs.neu.edu> <442A35E8.2050303 at hhs.nl> <4456012C.9040605 at ccs.neu.edu> <445631A2.3000203 at hhs.nl> <445E96C4.4000807 at ccs.neu.edu> In-Reply-To: <445E96C4.4000807 at ccs.neu.edu> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, I'm in the process of packaging rafkill and now I noticed that there with 1.2.1 there no longer is COPYING file in the tarbal. Rafkill is still licensed under the GPL, correct? Could you please include the full text of the GPL in your next release? Thanks, Hans Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 47284811 for j.w.r.degoede at hhs.nl; Sun, 14 May 2006 00:56:53 +0200 Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.62) (envelope-from ) id 1Ff32Y-0005JV-KX for j.w.r.degoede at hhs.nl; Sun, 14 May 2006 00:56:53 +0200 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.1.0 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.62) (envelope-from ) id 1Ff32Y-0005JS-H7 for j.w.r.degoede at hhs.nl; Sun, 14 May 2006 00:56:50 +0200 Received: from [129.10.116.51] (port=51410 helo=amber.ccs.neu.edu) by koko.hhs.nl with esmtp (Exim 4.62) (envelope-from ) id 1Ff32Y-0005JN-6z for j.w.r.degoede at hhs.nl; Sun, 14 May 2006 00:56:50 +0200 Received: from amber.ccs.neu.edu ([129.10.116.51] helo=[127.0.0.1]) by amber.ccs.neu.edu with esmtp (Exim 4.50) id 1Ff32W-0005Lz-Gn for j.w.r.degoede at hhs.nl; Sat, 13 May 2006 18:56:48 -0400 Message-ID: <44666431.1040207 at ccs.neu.edu> Date: Sat, 13 May 2006 18:56:49 -0400 From: Jon Rafkind User-Agent: Mozilla Thunderbird 1.0.7 (X11/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Hans de Goede Subject: Re: Raptor References: <4423D4EE.1050301 at hhs.nl> <4423F583.3090705 at ccs.neu.edu> <442A35E8.2050303 at hhs.nl> <4456012C.9040605 at ccs.neu.edu> <445631A2.3000203 at hhs.nl> <445E96C4.4000807 at ccs.neu.edu> <446649EA.60605 at hhs.nl> In-Reply-To: <446649EA.60605 at hhs.nl> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 14052006 #181931, status: clean Yes, rafklll is still under the GPL. I must have forgot to include the COPYING file in my tarball script. Im sure you have added one for now. Thanks for pointing it out. Hans de Goede wrote: >Hi, > >I'm in the process of packaging rafkill and now I noticed that there >with 1.2.1 there no longer is COPYING file in the tarbal. > >Rafkill is still licensed under the GPL, correct? Could you please >include the full text of the GPL in your next release? > >Thanks, > >Hans > > > > rafkill-1.2.1-debian.patch: --- NEW FILE rafkill-1.2.1-debian.patch --- diff -ur rafkill-1.2.1.orig/README rafkill-1.2.1/README --- rafkill-1.2.1.orig/README 2006-05-07 18:08:46.000000000 +0200 +++ rafkill-1.2.1/README 2006-05-14 23:42:25.000000000 +0200 @@ -15,7 +15,7 @@ In the game you can change whether to show a background and the speed of the game. Getting rid of the background should significantly increase the fps if less than desired rate. -Changing the speed of the game to much may cuase the game to crash, so please be wary. +Changing the speed of the game too much may cause the game to crash, so please be wary. HOW TO PLAY: @@ -27,7 +27,7 @@ Your job is to shoot the enemies! How simple! Killing enemies gives you money( score ). If you kill a group of enemies, -which you can kind of tell becuase they move in the same pattern and are +which you can kind of tell because they move in the same pattern and are close to each other, you might get a handy coin which gives you more score! There are other powerups, so look for them too. The score lets you buy more weapons and hull parts. There are 5 weapon groups and a few weapons in each diff -ur rafkill-1.2.1.orig/src/defs.cpp rafkill-1.2.1/src/defs.cpp --- rafkill-1.2.1.orig/src/defs.cpp 2006-05-06 22:50:35.000000000 +0200 +++ rafkill-1.2.1/src/defs.cpp 2006-05-14 23:40:10.000000000 +0200 @@ -234,7 +234,7 @@ if ( g1 > 255 ) g1 = 255; if ( b1 > 255 ) b1 = 255; - printf("C1 = %d. C2 = %d. New color = %d\n", c1, c2, makecol(r1,g1,b1) ); + /* printf("C1 = %d. C2 = %d. New color = %d\n", c1, c2, makecol(r1,g1,b1) ); */ return makecol(r1,g1,b1); diff -ur rafkill-1.2.1.orig/src/rfield.cpp rafkill-1.2.1/src/rfield.cpp --- rafkill-1.2.1.orig/src/rfield.cpp 2006-05-02 05:14:19.000000000 +0200 +++ rafkill-1.2.1/src/rfield.cpp 2006-05-14 23:40:48.000000000 +0200 @@ -91,7 +91,7 @@ //**// RField_Name::RField_Name( Font * f_font, char * name, bool selectable, bool perm, int return_val, RMenu * who, int number, int sound ): RField( selectable, perm, return_val, who, number, sound ) { - handle = name; + handle = strdup( name ); field_font = f_font; } rafkill-1.2.1-options.patch: --- NEW FILE rafkill-1.2.1-options.patch --- diff -ur rafkill-1.2.1.orig/src/bitmap.cpp rafkill-1.2.1/src/bitmap.cpp --- rafkill-1.2.1.orig/src/bitmap.cpp 2006-05-07 18:05:38.000000000 +0200 +++ rafkill-1.2.1/src/bitmap.cpp 2006-05-15 20:50:47.000000000 +0200 @@ -22,7 +22,7 @@ const int Bitmap::MODE_TRANS = 0; const int Bitmap::MODE_SOLID = 1; -Bitmap * Bitmap::Screen; +Bitmap * Bitmap::Screen = NULL; Bitmap::Bitmap(): error( false ){ @@ -475,11 +475,19 @@ } int Bitmap::setGfxModeFullscreen( int x, int y ){ - return ::set_gfx_mode( GFX_AUTODETECT_FULLSCREEN, x, y, 0, 0 ); + int ret = ::set_gfx_mode( GFX_AUTODETECT_FULLSCREEN, x, y, 0, 0 ); + if (Bitmap::Screen) + delete Bitmap::Screen; + Bitmap::Screen = new Bitmap( screen ); + return ret; } int Bitmap::setGfxModeWindowed( int x, int y ){ - return ::set_gfx_mode( GFX_AUTODETECT_WINDOWED, x, y, 0, 0 ); + int ret = ::set_gfx_mode( GFX_AUTODETECT_WINDOWED, x, y, 0, 0 ); + if (Bitmap::Screen) + delete Bitmap::Screen; + Bitmap::Screen = new Bitmap( screen ); + return ret; } int Bitmap::makeColor( int r, int g, int b ){ diff -ur rafkill-1.2.1.orig/src/drawer.h rafkill-1.2.1/src/drawer.h --- rafkill-1.2.1.orig/src/drawer.h 2006-04-30 04:26:39.000000000 +0200 +++ rafkill-1.2.1/src/drawer.h 2006-05-15 20:52:23.000000000 +0200 @@ -32,6 +32,10 @@ drawTrans = false; } + inline void setDrawLand(bool value){ + draw_land = value; + } + ~Drawer(); protected: diff -ur rafkill-1.2.1.orig/src/init.cpp rafkill-1.2.1/src/init.cpp --- rafkill-1.2.1.orig/src/init.cpp 2006-05-02 05:04:14.000000000 +0200 +++ rafkill-1.2.1/src/init.cpp 2006-05-15 20:50:47.000000000 +0200 @@ -9,7 +9,7 @@ END_OF_FUNCTION( inc_speed_counter ); -void init( int mode, int GAME_SPEED ) { +void init( int window_mode, int GAME_SPEED ) { allegro_init(); srand( time( NULL ) ); @@ -23,25 +23,12 @@ } */ - int gfx = GFX_AUTODETECT_WINDOWED; - switch ( mode ){ - case 0 : { - gfx = GFX_AUTODETECT_FULLSCREEN; - break; - } - case 1 : { - gfx = GFX_AUTODETECT_WINDOWED; - break; - } - } - set_color_depth( 16 ); - if ( set_gfx_mode( gfx, GRAPHICS_X, GRAPHICS_Y, 0, 0 ) != 0 ){ - if ( set_gfx_mode( GFX_AUTODETECT, GRAPHICS_X, GRAPHICS_Y, 0, 0 ) != 0 ) { - allegro_message( "Could not initialize a graphics mode.. bailing" ); - exit( 1 ); - } - } + if (window_mode) + Bitmap::setGfxModeWindowed( GRAPHICS_X, GRAPHICS_Y ); + else + Bitmap::setGfxModeFullscreen( GRAPHICS_X, GRAPHICS_Y ); + // text_mode( -1 ); reserve_voices (8, -1); set_volume_per_voice( 0 ); @@ -59,8 +46,4 @@ Util::sound_vol = 1.0; //max volume to begin with // music_vol = 0.50; dumb_resampling_quality = get_config_int( "sound", "dumb_resampling_quality", 1 ); - - /* set up global screen variable */ - Bitmap::Screen = new Bitmap( screen ); } - diff -ur rafkill-1.2.1.orig/src/raptor.cpp rafkill-1.2.1/src/raptor.cpp --- rafkill-1.2.1.orig/src/raptor.cpp 2006-05-07 06:20:00.000000000 +0200 +++ rafkill-1.2.1/src/raptor.cpp 2006-05-15 20:56:20.000000000 +0200 @@ -45,8 +45,7 @@ static const int INC_RATE = 10; static const int DEC_RATE = 11; static const int INIT_HELP = 12; -static const int INIT_SCREEN_FULL = 13; -static const int INIT_SCREEN_WINDOW = 14; +static const int INIT_SCREEN = 13; static const int SOUND_INC = 15; static const int SOUND_DEC = 16; static const int MUSIC_INC = 17; @@ -54,6 +53,8 @@ static const int DIFFICULT_MENU = 1000; static Font * normalFont = NULL; +static int window_mode = 0; +static bool dl = true; extern void init( int GFX, int GAME_SPEED ); @@ -257,7 +258,7 @@ // destroy_bitmap( sell_screen ); } -int intro_screen( int & frames, int window_mode, bool & dl, SpaceObject ** player, DATAFILE * sound ){ +static int intro_screen( int & frames, SpaceObject ** player, DATAFILE * sound ){ //RGB * crap = new RGB[256]; // char * file_name_pcx = Util::data_file( "logosmoot.pcx" ); @@ -314,11 +315,10 @@ option_menu.addTitle( strdup("Options"), normalFont ); char * numnum = int2str( frames ); // option_menu.addMenu( append("Frame rate ",numnum), normalFont, true,244,&frame_menu,select_smp); - //if ( window_mode == GFX_AUTODETECT ) - // option_menu->addMenu( strdup("Windowed"),Util::raptor_font,true,INIT_SCREEN,option_menu,select_smp); - //else option_menu->addMenu( strdup("Fullscreen"),Util::raptor_font,true,INIT_SCREEN,option_menu,select_smp); - option_menu.addMenu( strdup("Windowed"), normalFont, true,INIT_SCREEN_WINDOW,&option_menu,select_smp); - option_menu.addMenu( strdup("Fullscreen"), normalFont, true,INIT_SCREEN_FULL,&option_menu,select_smp); + if ( window_mode ) + option_menu.addMenu( strdup("Fullscreen off"), normalFont, true,INIT_SCREEN,&option_menu,select_smp); + else + option_menu.addMenu( strdup("Fullscreen on"), normalFont, true,INIT_SCREEN,&option_menu,select_smp); if ( dl ) option_menu.addMenu( strdup("Background on"), normalFont, true,INIT_BACK,&option_menu,select_smp); else option_menu.addMenu( strdup("Background off"), normalFont, true,INIT_BACK,&option_menu,select_smp); @@ -447,38 +447,21 @@ do_credits(); break; } - /* - case INIT_SCREEN : { - if ( window_mode == GFX_AUTODETECT_FULLSCREEN ) - window_mode = GFX_AUTODETECT_WINDOWED; - else window_mode = GFX_AUTODETECT_FULLSCREEN; - if ( window_mode == GFX_AUTODETECT_WINDOWED ) - option_menu->replace( 3, strdup("Windowed"), Util::raptor_font,true, INIT_SCREEN, option_menu, select_smp ); - else option_menu->replace( 3, strdup("Fullscreen"), Util::raptor_font,true, INIT_SCREEN, option_menu, select_smp ); - printf("Setting gfx mode to %d - Status ",window_mode); - int cap = set_gfx_mode( window_mode, GRAPHICS_X, GRAPHICS_Y, 0, 0 ); - printf("%d\n",cap ); - if ( cap == -1 ) { - printf("Allegro error: %s\n", allegro_error ); - set_gfx_mode(GFX_AUTODETECT,GRAPHICS_X,GRAPHICS_Y,0,0); - option_menu->replace(3,strdup("Error with gfx set"), Util::raptor_font,false, INIT_SCREEN, option_menu, select_smp ); - } - - break; - } - */ - case INIT_SCREEN_FULL : { - Bitmap::setGfxModeFullscreen( GRAPHICS_X, GRAPHICS_Y ); - break; - } - case INIT_SCREEN_WINDOW : { - Bitmap::setGfxModeWindowed( GRAPHICS_X, GRAPHICS_Y ); + case INIT_SCREEN : { + window_mode = !window_mode; + if ( window_mode ) { + Bitmap::setGfxModeWindowed( GRAPHICS_X, GRAPHICS_Y ); + option_menu.replace(2, strdup("Fullscreen off"), normalFont, true,INIT_SCREEN,&option_menu,select_smp); + } else { + Bitmap::setGfxModeFullscreen( GRAPHICS_X, GRAPHICS_Y ); + option_menu.replace(2, strdup("Fullscreen on"), normalFont, true,INIT_SCREEN,&option_menu,select_smp); + } break; } case INIT_BACK : { if ( dl ) dl = false;else dl=true; - if ( dl ) option_menu.replace( 5, strdup("Background ON"), &menuFont, true, INIT_BACK, &option_menu, select_smp ); else - option_menu.replace( 5, strdup("Background off"), &menuFont, true, INIT_BACK, &option_menu, select_smp ); + if ( dl ) option_menu.replace( 3, strdup("Background on"), &menuFont, true, INIT_BACK, &option_menu, select_smp ); else + option_menu.replace( 3, strdup("Background off"), &menuFont, true, INIT_BACK, &option_menu, select_smp ); break; } @@ -708,6 +691,7 @@ Drawer draw; Logic logic; LevelCreator level( file_level, player ); + draw.setDrawLand(dl); /* stop loading screen */ endLoadingScreen(); @@ -851,8 +835,6 @@ //******************************MAIN************************** int rafkill( int argc, char ** argv ) { - int window = 0; - bool dl = true; int gameSpeed = 40; printf("raptor -h for help screen\n"); @@ -862,7 +844,7 @@ return 0; } if ( strcmp( argv[q], "-w" ) == 0 ){ - window = 1; + window_mode = 1; } else if ( strcmp( argv[q], "-l" ) == 0 ){ dl = false; } else if ( strlen( argv[q] ) > 2 ){ @@ -877,8 +859,8 @@ } cout << "Running game at " << gameSpeed << endl; - cout << "Using mode " << window << endl; - init( window, gameSpeed ); + cout << "Using mode " << window_mode << endl; + init( window_mode, gameSpeed ); cout << "OS " << Util::getOS() << endl; Util::loadGlobals(); @@ -914,7 +896,7 @@ bool quit; // int real_level = 1; int geti; - while ( (geti = intro_screen( gameSpeed, window, dl, &player, Util::global_snd ) ) != INIT_QUIT ) { + while ( (geti = intro_screen( gameSpeed, &player, Util::global_snd ) ) != INIT_QUIT ) { quit = geti == INIT_QUIT; while ( ! quit ) { --- NEW FILE rafkill.6 --- .\" 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 RAFKILL 6 "24 April 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 Rafkill \- a vertical shoot'em-up .SH SYNOPSIS .B rafkill [ -l ] [ -w ] [ -g ] [ -h ] .SH DESCRIPTION .B Rafkill is a clone of Raptor: Call of the Shadows, a classic shoot'em-up game. You have a bird's eye view of the playing field, which is an alien world, and your job is to destroy the enemies that are flying towards you shooting bullets. The score lets you buy life, shield, better weapons or even new spaceships. Killing enemies gives you money, or score. If you kill a group of enemies, you might get a handy coin which gives you more score. There are other powerups, so look for them too. The score lets you buy more weapons and hull parts. There are 5 weapon groups and a few weapons in each group, but you can only have one weapon per group except for the accessory weapons in which you can have up to 3 weapons. Once you buy 3, you cannot buy any more. There are 3 hulls, which have each higher life and shield than the previous one and gives you access to a new set of weapons. Buying a new hull does not throw away your weapons, but it does throw away your accessory weapons. .SH OPTIONS .TP \fB\-l\fR run the game without displaying the background .TP \fB\-w\fR run the game in windowed mode instead of full screen .TP \fB\-g\fR run the game at a different speed (default is 40) .TP \fB\-h, \-help, \-\-help\fR display help message and exit .SH KEYS .TP .B Left, Right, Up, Down move the ship across the screen .TP .B Space or Enter fire the main weapon .TP .B Alt switch between alternate weapons .TP .B Esc return to the game menu .BR .SH AUTHOR Rafkill was written by Jon Rafkind . This manual page was written by Sam Hocevar , for the Debian GNU/Linux system (but may be used by others). --- NEW FILE rafkill.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Rafkill Comment=Top-down shooter with powerups Exec=rafkill Icon=rafkill.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; --- NEW FILE rafkill.spec --- Name: rafkill Version: 1.2.1 Release: 1%{?dist} Summary: Top-down shooter with powerups Group: Amusements/Games License: GPL URL: http://raptorv2.sourceforge.net/ Source0: http://download.sourceforge.net/raptorv2/%{name}-%{version}.tar.gz Source1: rafkill.desktop Source2: rafkill.6 Source3: COPYING Source4: license-confirmation.txt Source5: rafkill.png Patch0: rafkill-1.2.1-debian.patch Patch1: rafkill-1.2.1-options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel dumb-devel scons desktop-file-utils %description Rafkill is a vertical scrolling shoot-em up game. You can collect powerups during gameplay and you can goto the store with your spaceship and buy powerups or even a complete new ship with the points you've earned sofar. %prep %setup -q %patch0 -p1 -z .debian %patch1 -p1 -z .options cp %{SOURCE3} %{SOURCE4} . # sigh hack hack hack FLAGS="" for i in $RPM_OPT_FLAGS; do FLAGS="$FLAGS '$i'," done FLAGS="$FLAGS '-DINSTALL_DIR=\\\\\\\\\"%{_datadir}\\\\\\\\\"'" %{__sed} -i "s!flags = .*!flags = [ $FLAGS ];!" SConstruct %build export CCFLAGS="$RPM_OPT_FLAGS" scons prefix=%{_datadir} %install rm -rf $RPM_BUILD_ROOT #scons won't install into a buildroot, only into the real root so DIY mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} $RPM_BUILD_ROOT%{_bindir} install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} cp -a data music $RPM_BUILD_ROOT%{_datadir}/%{name} rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*/.sconsign rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/*.h # manpage courtesy of Debian mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 %{SOURCE5} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc README COPYING license-confirmation.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog * Sat May 13 2006 Hans de Goede 1.2.1-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rafkill/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 06:59:28 -0000 1.1 +++ .cvsignore 18 May 2006 07:01:07 -0000 1.2 @@ -0,0 +1 @@ +rafkill-1.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/rafkill/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 06:59:28 -0000 1.1 +++ sources 18 May 2006 07:01:07 -0000 1.2 @@ -0,0 +1 @@ +e27a24d5a0c2e92ba13815d8d6638a6b rafkill-1.2.1.tar.gz From fedora-extras-commits at redhat.com Thu May 18 07:03:46 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:03:46 -0700 Subject: owners owners.list,1.1014,1.1015 Message-ID: <200605180703.k4I73mf6010615@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10582/owners Modified Files: owners.list Log Message: add rafkill Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1014 retrieving revision 1.1015 diff -u -r1.1014 -r1.1015 --- owners.list 17 May 2006 14:49:36 -0000 1.1014 +++ owners.list 18 May 2006 07:03:46 -0000 1.1015 @@ -1412,6 +1412,7 @@ Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| +Fedora Extras|rafkill|Top-down shooter with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|raidem-music|Background music for the game raidem|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|rapidsvn|Graphical interface for the Subversion revision control system|rpm at timj.co.uk|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 07:03:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:03:47 -0700 Subject: comps comps-fe6.xml.in,1.15,1.16 Message-ID: <200605180703.k4I73nwK010619@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10582/comps Modified Files: comps-fe6.xml.in Log Message: add rafkill Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- comps-fe6.xml.in 15 May 2006 19:03:04 -0000 1.15 +++ comps-fe6.xml.in 18 May 2006 07:03:47 -0000 1.16 @@ -241,6 +241,7 @@ ppracer qascade qqo + rafkill raidem rocksndiamonds rogue From fedora-extras-commits at redhat.com Thu May 18 07:05:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 18 May 2006 00:05:33 -0700 Subject: comps comps-fe5.xml.in,1.51,1.52 Message-ID: <200605180705.k4I75ZMM010692@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10675/comps Modified Files: comps-fe5.xml.in Log Message: add xarchon Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- comps-fe5.xml.in 15 May 2006 16:00:49 -0000 1.51 +++ comps-fe5.xml.in 18 May 2006 07:05:33 -0000 1.52 @@ -257,6 +257,7 @@ viruskiller wesnoth worminator + xarchon xboard xpilot-ng xplanet From fedora-extras-commits at redhat.com Thu May 18 07:17:46 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:17:46 -0700 Subject: rpms/utrac/devel utrac.spec,1.2,1.3 Message-ID: <200605180717.k4I7Hmnf010749@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10732 Modified Files: utrac.spec Log Message: Honor Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/devel/utrac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- utrac.spec 8 Nov 2005 08:58:09 -0000 1.2 +++ utrac.spec 18 May 2006 07:17:46 -0000 1.3 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -53,6 +53,8 @@ %patch0 %patch1 -p1 %patch2 +%{__sed} -i -e 's/^\(CFLAGS.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile +%{__sed} -i -e '/^\s*strip /d' Makefile %build make %{?_smp_mflags} @@ -91,6 +93,10 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-6 + - Honor $RPM_OPT_FLAGS flags. + Contribution of Ville Skytt?? . + * Tue Nov 8 2005 Alain Portal 0.3.0-5 - Patch to change prefix. Fix #172601 From fedora-extras-commits at redhat.com Thu May 18 07:26:48 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:26:48 -0700 Subject: rpms/utrac/FC-3 utrac.spec,1.2,1.3 Message-ID: <200605180726.k4I7Qo3X010857@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10840 Modified Files: utrac.spec Log Message: Honor Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/FC-3/utrac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- utrac.spec 8 Nov 2005 12:02:35 -0000 1.2 +++ utrac.spec 18 May 2006 07:26:48 -0000 1.3 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -53,6 +53,8 @@ %patch0 %patch1 -p1 %patch2 +%{__sed} -i -e 's/^\(CFLAGS.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile +%{__sed} -i -e '/^\s*strip /d' Makefile %build make %{?_smp_mflags} @@ -91,6 +93,10 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-6 + - Honor $RPM_OPT_FLAGS flags. + Contribution of Ville Skytt?? . + * Tue Nov 8 2005 Alain Portal 0.3.0-5 - Patch to change prefix. Fix #172601 From fedora-extras-commits at redhat.com Thu May 18 07:28:10 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:28:10 -0700 Subject: rpms/utrac/FC-4 utrac.spec,1.2,1.3 Message-ID: <200605180728.k4I7SCgf010910@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10893 Modified Files: utrac.spec Log Message: Honor Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/FC-4/utrac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- utrac.spec 8 Nov 2005 12:04:42 -0000 1.2 +++ utrac.spec 18 May 2006 07:28:10 -0000 1.3 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -53,6 +53,8 @@ %patch0 %patch1 -p1 %patch2 +%{__sed} -i -e 's/^\(CFLAGS.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile +%{__sed} -i -e '/^\s*strip /d' Makefile %build make %{?_smp_mflags} @@ -91,6 +93,10 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-6 + - Honor $RPM_OPT_FLAGS flags. + Contribution of Ville Skytt?? . + * Tue Nov 8 2005 Alain Portal 0.3.0-5 - Patch to change prefix. Fix #172601 From fedora-extras-commits at redhat.com Thu May 18 07:28:39 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:28:39 -0700 Subject: rpms/utrac/FC-5 utrac.spec,1.2,1.3 Message-ID: <200605180728.k4I7SfHJ010971@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10954 Modified Files: utrac.spec Log Message: Honor Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/FC-5/utrac.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- utrac.spec 8 Nov 2005 08:58:09 -0000 1.2 +++ utrac.spec 18 May 2006 07:28:39 -0000 1.3 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -53,6 +53,8 @@ %patch0 %patch1 -p1 %patch2 +%{__sed} -i -e 's/^\(CFLAGS.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile +%{__sed} -i -e '/^\s*strip /d' Makefile %build make %{?_smp_mflags} @@ -91,6 +93,10 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-6 + - Honor $RPM_OPT_FLAGS flags. + Contribution of Ville Skytt?? . + * Tue Nov 8 2005 Alain Portal 0.3.0-5 - Patch to change prefix. Fix #172601 From fedora-extras-commits at redhat.com Thu May 18 07:59:45 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 18 May 2006 00:59:45 -0700 Subject: rpms/utrac/FC-3 utrac.spec,1.3,1.4 Message-ID: <200605180759.k4I7xln6011400@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/utrac/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11383 Modified Files: utrac.spec Log Message: Increase release to fix a cvs error. Index: utrac.spec =================================================================== RCS file: /cvs/extras/rpms/utrac/FC-3/utrac.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- utrac.spec 18 May 2006 07:26:48 -0000 1.3 +++ utrac.spec 18 May 2006 07:59:45 -0000 1.4 @@ -1,6 +1,6 @@ Name: utrac Version: 0.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Universal Text Recognizer and Converter Summary(fr): Reconnaisseur et convertisseur universel de texte @@ -93,6 +93,9 @@ %{_includedir}/* %changelog +* Thu May 18 2006 Alain Portal 0.3.0-7 + - Increase release to fix a cvs error. + * Thu May 18 2006 Alain Portal 0.3.0-6 - Honor $RPM_OPT_FLAGS flags. Contribution of Ville Skytt?? . From fedora-extras-commits at redhat.com Thu May 18 09:04:20 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:04:20 -0700 Subject: rpms/perl-Net-SNMP - New directory Message-ID: <200605180904.k4I94M3F016188@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16167/perl-Net-SNMP Log Message: Directory /cvs/extras/rpms/perl-Net-SNMP added to the repository From fedora-extras-commits at redhat.com Thu May 18 09:04:20 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:04:20 -0700 Subject: rpms/perl-Net-SNMP/devel - New directory Message-ID: <200605180904.k4I94MK2016191@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16167/perl-Net-SNMP/devel Log Message: Directory /cvs/extras/rpms/perl-Net-SNMP/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 09:04:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:04:42 -0700 Subject: rpms/perl-Net-SNMP Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605180904.k4I94isE016245@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212 Added Files: Makefile import.log Log Message: Setup of module perl-Net-SNMP --- NEW FILE Makefile --- # Top level Makefile for module perl-Net-SNMP all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 09:04:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:04:42 -0700 Subject: rpms/perl-Net-SNMP/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605180904.k4I94itL016248@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Net-SNMP --- NEW 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 May 18 09:05:11 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:05:11 -0700 Subject: rpms/perl-Net-SNMP import.log,1.1,1.2 Message-ID: <200605180905.k4I95DK4016309@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16276 Modified Files: import.log Log Message: auto-import perl-Net-SNMP-5.2.0-1 on branch devel from perl-Net-SNMP-5.2.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SNMP/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 09:04:41 -0000 1.1 +++ import.log 18 May 2006 09:05:11 -0000 1.2 @@ -0,0 +1 @@ +perl-Net-SNMP-5_2_0-1:HEAD:perl-Net-SNMP-5.2.0-1.src.rpm:1147943103 From fedora-extras-commits at redhat.com Thu May 18 09:07:37 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 18 May 2006 02:07:37 -0700 Subject: rpms/GeoIP/FC-5 .cvsignore, 1.3, 1.4 GeoIP.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605180907.k4I97dan016395@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16374 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.3.17-1 - New upstream release (minor fixes) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 08:37:50 -0000 1.3 +++ .cvsignore 18 May 2006 09:07:37 -0000 1.4 @@ -1 +1 @@ -GeoIP-1.3.16.tar.gz +GeoIP-1.3.17.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- GeoIP.spec 1 May 2006 08:37:50 -0000 1.3 +++ GeoIP.spec 18 May 2006 09:07:37 -0000 1.4 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.3.16 +Version: 1.3.17 Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO INSTALL +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,11 +71,12 @@ %{_libdir}/libGeoIPUpdate.so %changelog -* Mon May 1 2006 Michael Fleming 1.3.16-1 -- New upstream release +* Mon May 15 2006 Michael Fleming 1.3.17-1 +- New upstream release (minor fixes) -* Sat Mar 18 2006 Michael Fleming 1.3.14-4 -- Build for FC5 +* Mon May 1 2006 Michael Fleming 1.3.16-1 +- New upstream release +- Add INSTALL document to package. * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 08:37:50 -0000 1.3 +++ sources 18 May 2006 09:07:37 -0000 1.4 @@ -1 +1 @@ -f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz +36ee129b4dce5990cea1cfda122dae93 GeoIP-1.3.17.tar.gz From fedora-extras-commits at redhat.com Thu May 18 09:07:46 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:07:46 -0700 Subject: owners owners.list,1.1015,1.1016 Message-ID: <200605180907.k4I97mOW016420@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16401 Modified Files: owners.list Log Message: New package: perl-Net-SNMP (#191628) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1015 retrieving revision 1.1016 diff -u -r1.1015 -r1.1016 --- owners.list 18 May 2006 07:03:46 -0000 1.1015 +++ owners.list 18 May 2006 09:07:46 -0000 1.1016 @@ -1146,6 +1146,7 @@ Fedora Extras|perl-Net-Patricia|Patricia Trie perl module for fast IP address lookups|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-SNMP|Object oriented interface to SNMP|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH-Perl|SSH (Secure Shell) client|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu May 18 09:08:36 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 18 May 2006 02:08:36 -0700 Subject: rpms/GeoIP/FC-4 .cvsignore, 1.3, 1.4 GeoIP.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605180908.k4I98cOd016493@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16472 Modified Files: .cvsignore GeoIP.spec sources Log Message: * Mon May 15 2006 Michael Fleming 1.3.17-1 - New upstream release (minor fixes) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 08:40:53 -0000 1.3 +++ .cvsignore 18 May 2006 09:08:36 -0000 1.4 @@ -1 +1 @@ -GeoIP-1.3.16.tar.gz +GeoIP-1.3.17.tar.gz Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/GeoIP.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GeoIP.spec 1 May 2006 08:40:53 -0000 1.2 +++ GeoIP.spec 18 May 2006 09:08:36 -0000 1.3 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.3.16 +Version: 1.3.17 Release: 1%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries @@ -51,7 +51,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO INSTALL +%doc AUTHORS COPYING ChangeLog README TODO INSTALL %{_libdir}/libGeoIP.so.* %{_libdir}/libGeoIPUpdate.so.* %{_bindir}/geoiplookup @@ -71,8 +71,12 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Mon May 15 2006 Michael Fleming 1.3.17-1 +- New upstream release (minor fixes) + * Mon May 1 2006 Michael Fleming 1.3.16-1 -- New upstream release +- New upstream release +- Add INSTALL document to package. * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 May 2006 08:40:53 -0000 1.3 +++ sources 18 May 2006 09:08:36 -0000 1.4 @@ -1 +1 @@ -f3e2afcb08b5fb4162a00ac87207f989 GeoIP-1.3.16.tar.gz +36ee129b4dce5990cea1cfda122dae93 GeoIP-1.3.17.tar.gz From fedora-extras-commits at redhat.com Thu May 18 09:22:51 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 18 May 2006 02:22:51 -0700 Subject: rpms/darcs/FC-5 darcs.spec,1.11,1.12 Message-ID: <200605180922.k4I9MrsV016663@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16646 Modified Files: darcs.spec Log Message: disable "make check" for now since it chokes in buildsystem Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/darcs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- darcs.spec 16 May 2006 01:18:09 -0000 1.11 +++ darcs.spec 18 May 2006 09:22:51 -0000 1.12 @@ -54,7 +54,7 @@ %build %configure --libexecdir=%{_localstatedir}/www make all -make check +#make check %install @@ -87,9 +87,7 @@ * Sun May 14 2006 Jens Petersen - 1.0.7-1 - update to 1.0.7 - fix typo of propagate in description (#189651) - -* Wed Mar 22 2006 Jens Petersen - 1.0.6-2 -- build with rebuilt ghc +- disable "make check" for now since it chokes in buildsystem * Thu Mar 2 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 From fedora-extras-commits at redhat.com Thu May 18 09:05:11 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 02:05:11 -0700 Subject: rpms/perl-Net-SNMP/devel perl-Net-SNMP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605180905.k4I95DLD016314@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Net-SNMP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16276/devel Modified Files: .cvsignore sources Added Files: perl-Net-SNMP.spec Log Message: auto-import perl-Net-SNMP-5.2.0-1 on branch devel from perl-Net-SNMP-5.2.0-1.src.rpm --- NEW FILE perl-Net-SNMP.spec --- Name: perl-Net-SNMP Version: 5.2.0 Release: 1%{?dist} Summary: Object oriented interface to SNMP Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Net-SNMP/ Source0: http://www.cpan.org/authors/id/D/DT/DTOWN/Net-SNMP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Crypt::DES) BuildRequires: perl(Digest::HMAC) BuildRequires: perl(Digest::SHA1) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) #Requires: perl(Crypt::Rijndael) #Requires: perl(Socket6) %description The Net::SNMP module implements an object oriented interface to the Simple Network Management Protocol. Perl applications can use the module to retrieve or update information on a remote host using the SNMP protocol. The module supports SNMP version-1, SNMP version-2c (Community-Based SNMPv2), and SNMP version-3. The Net::SNMP module assumes that the user has a basic understanding of the Simple Network Management Protocol and related network management concepts. %prep %setup -q -n Net-SNMP-%{version} %{__perl} -pi -e 's|^#!\s+/usr/local/bin/perl|#!%{__perl}|' examples/*.pl chmod -c a-x examples/*.pl # Requirements: exclude perl(Socket6) cat <<__EOF__ > %{name}-perlreq #!/bin/sh /usr/lib/rpm/perl.req \$* | grep -v '^perl(Socket6)' __EOF__ %define __perl_requires %{_builddir}/Net-SNMP-%{version}/%{name}-perlreq chmod +x %{__perl_requires} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -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 examples/ %{_bindir}/* %{perl_vendorlib}/Net/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3pm* %changelog * Sat May 13 2006 Jose Pedro Oliveira - 5.2.0-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SNMP/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 09:04:42 -0000 1.1 +++ .cvsignore 18 May 2006 09:05:11 -0000 1.2 @@ -0,0 +1 @@ +Net-SNMP-5.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SNMP/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 09:04:42 -0000 1.1 +++ sources 18 May 2006 09:05:11 -0000 1.2 @@ -0,0 +1 @@ +0e717723f843ab22a93248833f3ebff7 Net-SNMP-5.2.0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 10:00:18 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 18 May 2006 03:00:18 -0700 Subject: fedora-security/audit fc4,1.252,1.253 fc5,1.167,1.168 Message-ID: <200605181000.k4IA0IdB016802@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16782 Modified Files: fc4 fc5 Log Message: Deal with mysql Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- fc4 17 May 2006 15:14:44 -0000 1.252 +++ fc4 18 May 2006 10:00:15 -0000 1.253 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060515 -Up to date FC4 as of 20060515 +Up to date CVE as of CVE email 20060517 +Up to date FC4 as of 20060517 ** are items that need attention @@ -124,8 +124,8 @@ CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423] CVE-2006-1518 ignore (mysql) 5.x only -CVE-2006-1517 VULNERABLE (mysql, fixed 4.1.19) #190868 -CVE-2006-1516 VULNERABLE (mysql, fixed 4.1.19) #190866 +CVE-2006-1517 version (mysql, fixed 4.1.19) #190868 [since FEDORA-2006-554] +CVE-2006-1516 version (mysql, fixed 4.1.19) #190866 [since FEDORA-2006-554] CVE-2006-1494 VULNERABLE (php) #189592 CVE-2006-1490 VULNERABLE (php, fixed 5.1.4) CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] @@ -150,7 +150,7 @@ CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0996 VULNERABLE (php) #187511 -CVE-2006-0903 VULNERABLE (mysql) #183261 +CVE-2006-0903 version (mysql, fixed 4.1.19) #183261 [since FEDORA-2006-554] CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0749 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- fc5 17 May 2006 15:14:44 -0000 1.167 +++ fc5 18 May 2006 10:00:15 -0000 1.168 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060516 -Up to date FC5 as of 20060516 +Up to date CVE as of CVE email 20060517 +Up to date FC5 as of 20060517 ** are items that need attention @@ -123,9 +123,9 @@ CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421] CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421] CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421] -CVE-2006-1518 VULNERABLE (mysql, fixed 5.0.21) #190870 -CVE-2006-1517 VULNERABLE (mysql, fixed 5.0.21) #190868 -CVE-2006-1516 VULNERABLE (mysql, fixed 5.0.21) #190866 +CVE-2006-1518 version (mysql, fixed 5.0.21) #190870 [since FEDORA-2006-553] +CVE-2006-1517 version (mysql, fixed 5.0.21) #190870 [since FEDORA-2006-553] +CVE-2006-1516 version (mysql, fixed 5.0.21) #190870 [since FEDORA-2006-553] CVE-2006-1494 version (php) #189592 [since FEDORA-2006-289] CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289] CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] @@ -152,7 +152,7 @@ CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0996 version (php, fixed 5.1.4) bz#187511 [since FEDORA-2006-289] -CVE-2006-0903 VULNERABLE (mysql) #183261 low/not upstream yet +CVE-2006-0903 version (mysql, 4.1.19) #183261 [since FEDORA-2006-553] CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) CVE-2006-0749 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] From fedora-extras-commits at redhat.com Thu May 18 10:31:09 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 03:31:09 -0700 Subject: owners owners.list,1.1016,1.1017 Message-ID: <200605181031.k4IAVBgQ019181@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19162 Modified Files: owners.list Log Message: add qt4 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1016 retrieving revision 1.1017 diff -u -r1.1016 -r1.1017 --- owners.list 18 May 2006 09:07:46 -0000 1.1016 +++ owners.list 18 May 2006 10:31:09 -0000 1.1017 @@ -1400,6 +1400,7 @@ Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|qscintilla|A Scintilla port to Qt|icon at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|qt4|Qt is a GUI software toolkit|than at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|quadkonsole|Embeds Konsole kparts in a grid layout|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 10:46:45 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 03:46:45 -0700 Subject: rpms/kchmviewer/devel kchmviewer-2.5-iconstorage.h.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kchmviewer.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605181046.k4IAkmqd019274@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19250 Modified Files: .cvsignore kchmviewer.spec sources Added Files: kchmviewer-2.5-iconstorage.h.patch Log Message: * Thu May 18 2006 Patrice Dumas 2.5-1 - update to 2.5 - patch from Jose Pedro Oliveira (jpo) kchmviewer-2.5-iconstorage.h.patch: --- NEW FILE kchmviewer-2.5-iconstorage.h.patch --- diff -ruN kchmviewer-2.5-orig/src/iconstorage.h kchmviewer-2.5/src/iconstorage.h --- kchmviewer-2.5-orig/src/iconstorage.h 2006-04-02 03:09:14.000000000 +0100 +++ kchmviewer-2.5/src/iconstorage.h 2006-05-18 01:05:57.000000000 +0100 @@ -57,7 +57,7 @@ const QPixmap * getBookIconPixmap (unsigned int id); const QPixmap * getToolbarPixmap (pixmap_index_t pix); const QPixmap * getApplicationIcon(); - const QPixmap * KCHMIconStorage::getCloseWindowIcon(); + const QPixmap * getCloseWindowIcon(); private: const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 May 2006 08:35:31 -0000 1.2 +++ .cvsignore 18 May 2006 10:46:45 -0000 1.3 @@ -1 +1 @@ -kchmviewer-2.0.tar.gz +kchmviewer-2.5.tar.gz Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kchmviewer.spec 16 May 2006 14:03:31 -0000 1.2 +++ kchmviewer.spec 18 May 2006 10:46:45 -0000 1.3 @@ -1,14 +1,15 @@ Name: kchmviewer -Version: 2.0 -Release: 4%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: CHM viewer Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ -Source0: http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff +Patch1: kchmviewer-2.5-iconstorage.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel @@ -48,6 +49,7 @@ %prep %setup -q %patch +%patch1 -p1 chmod -x kio-msits/msits.* @@ -86,8 +88,13 @@ %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la %{_datadir}/services/msits.protocol +%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %changelog +* Thu May 18 2006 Patrice Dumas 2.5-1 +- update to 2.5 +- patch from Jose Pedro Oliveira (jpo) + * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 May 2006 08:35:31 -0000 1.2 +++ sources 18 May 2006 10:46:45 -0000 1.3 @@ -1 +1 @@ -94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz +31aa10f89b92ec5323fef7c26b1e1eed kchmviewer-2.5.tar.gz From fedora-extras-commits at redhat.com Thu May 18 11:10:14 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 18 May 2006 04:10:14 -0700 Subject: rpms/darcs/FC-4 darcs.spec,1.9,1.10 Message-ID: <200605181110.k4IBAGrQ022090@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059 Modified Files: darcs.spec Log Message: disable "make check" for now since it chokes in buildsystem Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- darcs.spec 16 May 2006 01:39:08 -0000 1.9 +++ darcs.spec 18 May 2006 11:10:13 -0000 1.10 @@ -54,7 +54,7 @@ %build %configure --libexecdir=%{_localstatedir}/www make all -make check +#make check %install @@ -87,6 +87,7 @@ * Sun May 14 2006 Jens Petersen - 1.0.7-1 - update to 1.0.7 - fix typo of propagate in description (#189651) +- disable "make check" for now since it chokes in buildsystem * Wed Mar 22 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 From fedora-extras-commits at redhat.com Thu May 18 11:24:57 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 04:24:57 -0700 Subject: rpms/kchmviewer/FC-4 kchmviewer-2.5-iconstorage.h.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kchmviewer.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605181124.k4IBOxSg022327@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22286/FC-4 Modified Files: .cvsignore kchmviewer.spec sources Added Files: kchmviewer-2.5-iconstorage.h.patch Log Message: * Thu May 18 2006 Patrice Dumas 2.5-1 - update to 2.5 - patch from Jose Pedro Oliveira (jpo) kchmviewer-2.5-iconstorage.h.patch: --- NEW FILE kchmviewer-2.5-iconstorage.h.patch --- diff -ruN kchmviewer-2.5-orig/src/iconstorage.h kchmviewer-2.5/src/iconstorage.h --- kchmviewer-2.5-orig/src/iconstorage.h 2006-04-02 03:09:14.000000000 +0100 +++ kchmviewer-2.5/src/iconstorage.h 2006-05-18 01:05:57.000000000 +0100 @@ -57,7 +57,7 @@ const QPixmap * getBookIconPixmap (unsigned int id); const QPixmap * getToolbarPixmap (pixmap_index_t pix); const QPixmap * getApplicationIcon(); - const QPixmap * KCHMIconStorage::getCloseWindowIcon(); + const QPixmap * getCloseWindowIcon(); private: const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 May 2006 08:35:31 -0000 1.2 +++ .cvsignore 18 May 2006 11:24:57 -0000 1.3 @@ -1 +1 @@ -kchmviewer-2.0.tar.gz +kchmviewer-2.5.tar.gz Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-4/kchmviewer.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kchmviewer.spec 16 May 2006 16:39:14 -0000 1.2 +++ kchmviewer.spec 18 May 2006 11:24:57 -0000 1.3 @@ -1,14 +1,15 @@ Name: kchmviewer -Version: 2.0 -Release: 4%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: CHM viewer Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ -Source0: http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff +Patch1: kchmviewer-2.5-iconstorage.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel @@ -48,6 +49,7 @@ %prep %setup -q %patch +%patch1 -p1 chmod -x kio-msits/msits.* @@ -86,8 +88,13 @@ %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la %{_datadir}/services/msits.protocol +%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %changelog +* Thu May 18 2006 Patrice Dumas 2.5-1 +- update to 2.5 +- patch from Jose Pedro Oliveira (jpo) + * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 May 2006 08:35:31 -0000 1.2 +++ sources 18 May 2006 11:24:57 -0000 1.3 @@ -1 +1 @@ -94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz +31aa10f89b92ec5323fef7c26b1e1eed kchmviewer-2.5.tar.gz From fedora-extras-commits at redhat.com Thu May 18 11:24:58 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 04:24:58 -0700 Subject: rpms/kchmviewer/FC-5 kchmviewer-2.5-iconstorage.h.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kchmviewer.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605181125.k4IBP0mW022335@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/kchmviewer/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22286/FC-5 Modified Files: .cvsignore kchmviewer.spec sources Added Files: kchmviewer-2.5-iconstorage.h.patch Log Message: * Thu May 18 2006 Patrice Dumas 2.5-1 - update to 2.5 - patch from Jose Pedro Oliveira (jpo) kchmviewer-2.5-iconstorage.h.patch: --- NEW FILE kchmviewer-2.5-iconstorage.h.patch --- diff -ruN kchmviewer-2.5-orig/src/iconstorage.h kchmviewer-2.5/src/iconstorage.h --- kchmviewer-2.5-orig/src/iconstorage.h 2006-04-02 03:09:14.000000000 +0100 +++ kchmviewer-2.5/src/iconstorage.h 2006-05-18 01:05:57.000000000 +0100 @@ -57,7 +57,7 @@ const QPixmap * getBookIconPixmap (unsigned int id); const QPixmap * getToolbarPixmap (pixmap_index_t pix); const QPixmap * getApplicationIcon(); - const QPixmap * KCHMIconStorage::getCloseWindowIcon(); + const QPixmap * getCloseWindowIcon(); private: const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 May 2006 08:35:31 -0000 1.2 +++ .cvsignore 18 May 2006 11:24:57 -0000 1.3 @@ -1 +1 @@ -kchmviewer-2.0.tar.gz +kchmviewer-2.5.tar.gz Index: kchmviewer.spec =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-5/kchmviewer.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kchmviewer.spec 16 May 2006 16:39:14 -0000 1.2 +++ kchmviewer.spec 18 May 2006 11:24:57 -0000 1.3 @@ -1,14 +1,15 @@ Name: kchmviewer -Version: 2.0 -Release: 4%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: CHM viewer Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ -Source0: http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz # fix the desktop file Patch0: kchmviewer-desktop.diff +Patch1: kchmviewer-2.5-iconstorage.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel chmlib-devel @@ -48,6 +49,7 @@ %prep %setup -q %patch +%patch1 -p1 chmod -x kio-msits/msits.* @@ -86,8 +88,13 @@ %{_libdir}/kde3/kio_msits.so %{_libdir}/kde3/kio_msits.la %{_datadir}/services/msits.protocol +%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %changelog +* Thu May 18 2006 Patrice Dumas 2.5-1 +- update to 2.5 +- patch from Jose Pedro Oliveira (jpo) + * Tue May 16 2006 Patrice Dumas 2.0-4 - remove the old menu entry file from /usr/share/applnk/ Index: sources =================================================================== RCS file: /cvs/extras/rpms/kchmviewer/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 May 2006 08:35:31 -0000 1.2 +++ sources 18 May 2006 11:24:57 -0000 1.3 @@ -1 +1 @@ -94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz +31aa10f89b92ec5323fef7c26b1e1eed kchmviewer-2.5.tar.gz From fedora-extras-commits at redhat.com Thu May 18 11:31:21 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:31:21 -0700 Subject: rpms/qt4 - New directory Message-ID: <200605181131.k4IBVNeZ022514@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22488/qt4 Log Message: Directory /cvs/extras/rpms/qt4 added to the repository From fedora-extras-commits at redhat.com Thu May 18 11:31:21 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:31:21 -0700 Subject: rpms/qt4/devel - New directory Message-ID: <200605181131.k4IBVNaS022517@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22488/qt4/devel Log Message: Directory /cvs/extras/rpms/qt4/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 11:31:40 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:31:40 -0700 Subject: rpms/qt4 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605181131.k4IBVg0A022566@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533 Added Files: Makefile import.log Log Message: Setup of module qt4 --- NEW FILE Makefile --- # Top level Makefile for module qt4 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 11:31:41 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:31:41 -0700 Subject: rpms/qt4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605181131.k4IBVhqj022569@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qt4 --- NEW 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 May 18 11:33:28 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:33:28 -0700 Subject: rpms/qt4 import.log,1.1,1.2 Message-ID: <200605181133.k4IBXUL8022647@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22613 Modified Files: import.log Log Message: auto-import qt4-4.1.2-1 on branch devel from qt4-4.1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qt4/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 11:31:40 -0000 1.1 +++ import.log 18 May 2006 11:33:28 -0000 1.2 @@ -0,0 +1 @@ +qt4-4_1_2-1:HEAD:qt4-4.1.2-1.src.rpm:1147952000 From fedora-extras-commits at redhat.com Thu May 18 11:33:28 2006 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Thu, 18 May 2006 04:33:28 -0700 Subject: rpms/qt4/devel qt4.spec, NONE, 1.1 qtrc, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605181133.k4IBXU1t022652@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22613/devel Modified Files: .cvsignore sources Added Files: qt4.spec qtrc Log Message: auto-import qt4-4.1.2-1 on branch devel from qt4-4.1.2-1.src.rpm --- NEW FILE qt4.spec --- %define smp 1 %define modular_x 1 %define desktop_file 1 %define redhat_artwork 1 %define desktop_file_utils_version 0.2.93 %define ver 4.1.2 %define qt_dirname qt-4.1 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/qt-devel-%{ver} # build Motif extention %define motif_extention 0 # install manuals %define installman 0 # buildmysql: Build MySQL plugins %define buildmysql 1 # buildpsql: Build Postgres plugins %define buildpsql 1 # buildodbc: Build ODBC plugins %define buildodbc 1 # buildodbc: Build sqlite plugins %define buildsqlite 1 # visibility %define enable_hidden_visibility 0 %define debug 0 %define sover %{ver} Summary: The shared library for the Qt GUI toolkit. Name: qt4 Version: %{ver} Release: 1 Epoch: 1 License: GPL/QPL Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Url: http://www.troll.no Source: ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz Source1: qtrc Prefix: %{qtdir} Prereq: /sbin/ldconfig Prereq: fileutils Requires: fontconfig >= 2.0 Requires: /etc/ld.so.conf.d BuildRequires: gcc-c++ BuildRequires: libstdc++-devel BuildRequires: libmng-devel BuildRequires: glibc-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: libungif-devel BuildRequires: perl BuildRequires: sed BuildRequires: findutils BuildRequires: cups-devel BuildRequires: tar %if %{modular_x} BuildRequires: freetype-devel BuildRequires: fontconfig-devel BuildRequires: libXrender-devel BuildRequires: libXrandr-devel BuildRequires: libXcursor-devel BuildRequires: libXinerama-devel BuildRequires: libXft-devel BuildRequires: libXext-devel BuildRequires: libX11-devel BuildRequires: libSM-devel BuildRequires: libICE-devel %else BuildRequires: xorg-x11-devel %endif %if %{motif_extention} BuildRequires: openmotif-devel >= 2.2.2 %endif %if %{desktop_file} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %endif %if %{buildmysql} BuildRequires: mysql-devel %endif %if %{buildpsql} BuildRequires: postgresql-devel %endif %if %{buildodbc} BuildRequires: unixODBC-devel %endif %if %{buildsqlite} BuildRequires: sqlite-devel %endif BuildRequires: fontconfig-devel >= 2.0 %package config Summary: Grapical configuration tool for programs using Qt Group: User Interface/Desktops Requires: %{name} = %{epoch}:%{version}-%{release} %package devel Summary: Development files for the Qt GUI toolkit. Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %if %{modular_x} Requires: freetype-devel Requires: fontconfig-devel Requires: libXrender-devel Requires: libXrandr-devel Requires: libXcursor-devel Requires: libXinerama-devel Requires: libXft-devel Requires: libXext-devel Requires: libX11-devel Requires: libSM-devel Requires: libICE-devel %else Requires: xorg-x11-devel %endif Requires: libpng-devel Requires: libjpeg-devel Requires: libmng-devel %package devel-docs Summary: Documentation for the Qt GUI toolkit. Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %package Xt Summary: An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %package styles Summary: Extra styles for the Qt GUI toolkit. Group: User Interface/Desktops Requires: %{name} = %{epoch}:%{version}-%{release} %if %{buildodbc} %package ODBC Summary: ODBC drivers for Qt's SQL classes. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %endif %if %{buildmysql} %package MySQL Summary: MySQL drivers for Qt's SQL classes. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %endif %if %{buildpsql} %package PostgreSQL Summary: PostgreSQL drivers for Qt's SQL classes. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %endif %if %{buildsqlite} %package SQLite Summary: SQLite drivers for Qt's SQL classes. Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %endif %package static Summary: Version of the Qt GUI toolkit for static linking Group: Development/Libraries Requires: %{name}-devel = %{epoch}:%{version}-%{release} %package designer Summary: Interface designer (IDE) for the Qt toolkit Group: Development/Tools Requires: %{name}-devel = %{epoch}:%{version}-%{release} %description Qt is a GUI software toolkit which simplifies the task of writing and maintaining GUI (Graphical User Interface) applications for the X Window System. Qt is written in C++ and is fully object-oriented. This package contains the shared library needed to run qt applications, as well as the README files for qt. %description config Qt is a GUI software toolkit which simplifies the task of writing and maintaining GUI (Graphical User Interface) applications for the X Window System. Qt is written in C++ and is fully object-oriented. This package contains a grapical configuration tool for programs using Qt. %description devel The qt-devel package contains the files necessary to develop applications using the Qt GUI toolkit: the header files, the Qt meta object compiler. Install qt-devel if you want to develop GUI applications using the Qt toolkit. %description devel-docs The qt-devel-docs package contains the man pages, the HTML documentation and example programs. Install qt-devel-docs if you want to develop GUI applications using the Qt toolkit. %description Xt An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit. %description static Version of the Qt library for static linking %description styles Extra styles (themes) for the Qt GUI toolkit. %if %{buildodbc} %description ODBC ODBC driver for Qt's SQL classes (QSQL) %endif %if %{buildmysql} %description MySQL MySQL driver for Qt's SQL classes (QSQL) %endif %if %{buildpsql} %description PostgreSQL PostgreSQL driver for Qt's SQL classes (QSQL) %endif %if %{buildsqlite} %description SQLite SQLite driver for Qt's SQL classes (QSQL) %endif %description designer The qt-designer package contains an User Interface designer tool for the Qt toolkit. %prep %setup -q -n qt-x11-opensource-src-%{version} %build export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" export QTDEST=%{qtdir} %if %{smp} export SMP_MFLAGS="%{?_smp_mflags}" %endif # set correct FLAGS perl -pi -e "s|-O2|$INCLUDES $RPM_OPT_FLAGS|g" mkspecs/*/qmake.conf # set correct lib path if [ "%{_lib}" == "lib64" ] ; then perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test fi # build shared, threaded (default) libraries echo yes | ./configure -v \ -no-rpath \ -prefix $QTDEST \ -docdir %{qt_docdir} \ -examplesdir %{qt_docdir}/examples \ -demosdir %{qt_docdir}/demos \ %if %{_lib} == lib64 -platform linux-g++-64 \ %else -platform linux-g++ \ %endif %if %{debug} -debug \ %else -release \ %endif -shared \ -largefile \ -qt-gif \ -system-zlib \ -system-libpng \ -system-libjpeg \ %if %{buildmysql} -plugin-sql-mysql \ -I%{_includedir}/mysql \ -L%{_libdir}/mysql \ %endif %if %{buildpsql} -plugin-sql-psql \ %endif %if %{buildodbc} -plugin-sql-odbc \ %endif %if %{buildsqlite} -plugin-sql-sqlite \ %endif -stl \ -cups \ -sm \ -xinerama \ -xrender \ -xkb \ -fontconfig make $SMP_MFLAGS sub-src make $SMP_MFLAGS sub-tools %install rm -rf %{buildroot} export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" export QTDEST=%{qtdir} make install INSTALL_ROOT=%{buildroot} mkdir -p %{buildroot}%{_libdir}/pkgconfig pushd %{buildroot}%{_libdir}/pkgconfig ln -sf ../%{qt_dirname}/lib/*.pc . popd # install man pages %if %{installman} mkdir -p %{buildroot}%{_mandir} cp -fR doc/man/* %{buildroot}%{_mandir}/ %endif # clean up make -C examples clean # Make sure the examples can be built outside the source tree. # Our binaries fulfill all requirements, so... perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` # don't include Makefiles of qt examples/tutorials find examples -name "Makefile" | xargs rm -f find examples -name "*.obj" | xargs rm -rf find examples -name "*.moc" | xargs rm -rf find tutorial -name "Makefile" | xargs rm -f for a in */*/Makefile ; do sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 mv -v ${a}.2 $a done mkdir -p %{buildroot}/etc/profile.d cat > %{buildroot}/etc/profile.d/%{name}.sh < %{buildroot}/etc/profile.d/%{name}.csh <%{buildroot}%{_datadir}/applications/%{name}-designer.desktop <%{buildroot}%{_datadir}/applnk/Development/designer4.desktop <%{buildroot}%{qtdir}/etc/settings/qtrc <<"EOF" [General] libraryPath=%{_libdir}/kde4/plugins style=Highcolor [KDE] contrast=7 EOF %endif # remove broken links rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* rm -f %{buildroot}%{qtdir}/lib/*.la mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE* README* changes* OPENSOURCE-NOTICE.TXT %dir %{qtdir} %dir %{qtdir}/bin %dir %{qtdir}/lib %dir %{qtdir}/plugins /etc/ld.so.conf.d/* %if ! %{redhat_artwork} %{qtdir}/etc/settings/qtrc %endif %{qtdir}/lib/lib*.so.* %{qtdir}/plugins/imageformats %{qtdir}/plugins/codecs %{qtdir}/plugins/accessible %{qtdir}/plugins/arthurplugin %{qtdir}/plugins/inputmethods %{qtdir}/translations %files config %defattr(-,root,root,-) %{qtdir}/bin/qtconfig %if 0 %{_bindir}/qtconfig* %endif %files devel %defattr(-,root,root,-) %attr(0755,root,root) %config /etc/profile.d/* %{qtdir}/bin/* %exclude %{qtdir}/bin/designer %exclude %{qtdir}/bin/qtconfig %{qtdir}/include %{qtdir}/mkspecs %{qtdir}/lib/*.so %{qtdir}/lib/*.a %{qtdir}/lib/*.prl %{qtdir}/phrasebooks %if 0 %{_bindir}/* %exclude %{_bindir}/designer %exclude %{_bindir}/qtconfig %endif %{_libdir}/pkgconfig/* %{qtdir}/lib/*.pc %{qtdir}/q3porting.xml %files devel-docs %defattr(-,root,root,-) %doc %{qt_docdir} %if %{installman} %{_mandir}/*/* %endif %if %{buildodbc} %files ODBC %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc* %endif %if %{buildpsql} %files PostgreSQL %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql* %endif %if %{buildmysql} %files MySQL %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql* %endif %if %{buildsqlite} %files SQLite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite* %endif %files designer %defattr(-,root,root,-) %if 0 %{_bindir}/designer* %endif %{qtdir}/plugins/designer %{qtdir}/bin/designer %if %{desktop_file} %{_datadir}/applications/*.desktop %else %{_datadir}/applnk/Development/* %endif %changelog * Fri May 12 2006 Than Ngo 1:4.1.2-1 - update to 4.1.2 - add subpackage qt-devel-docs * Mon Feb 27 2006 Than Ngo 1:4.1.1-0.1 - update to 4.1.1 * Tue Dec 20 2005 Than Ngo 1:4.1.0-0.1 - update to 4.1.0 * Fri Sep 09 2005 Than Ngo 1:4.0.1-0.1 - update to 4.0.1 * Mon Aug 22 2005 Than Ngo 1:3.3.4-22 - apply upstream patch to fix kmail folder selector #166430 * Mon Aug 15 2005 Than Ngo 1:3.3.4-21 - fix gcc4 build problem * Wed Aug 10 2005 Than Ngo 1:3.3.4-20 - apply missing patches * Wed Aug 10 2005 Than Ngo 1:3.3.4-19 - apply patch to fix wrong K menu width, #165510 * Mon Aug 01 2005 Than Ngo 1:3.3.4-18 - add visibility patch * Wed Jul 20 2005 Than Ngo 1:3.3.4-17 - fix German translation of the Qt Assistent #161558 * Mon Jun 27 2005 Than Ngo 1:3.3.4-16 - apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504 * Tue May 24 2005 Than Ngo 1:3.3.4-15 - add better fix for #156977, thanks to trolltech - apply patch to fix keyReleaseEvent problem #156572 * Wed May 18 2005 Than Ngo 1:3.3.4-14 - apply patch to use ecvt, fcvt (thanks to Jakub) - fix a bug in printing of postscript #156977 * Wed May 18 2005 Than Ngo 1:3.3.4-13 - rebuild * Thu Apr 14 2005 Than Ngo 1:3.3.4-12 - fix bad symlink #154086 * Wed Apr 13 2005 Than Ngo 1:3.3.4-11 - remove bad symlink #154086 - built with PostgresSQL 8.0.2 * Wed Mar 23 2005 Than Ngo 1:3.3.4-10 - add GtkStyle patch from Peter Backlund #141125 * Fri Mar 04 2005 Than Ngo 1:3.3.4-9 - fix buildkey issue with gcc-4 * Fri Mar 04 2005 Than Ngo 1:3.3.4-8 - rebuilt against gcc-4.0.0-0.31 * Tue Mar 01 2005 Than Ngo 1:3.3.4-7 - fix build problem with gcc4 * Mon Feb 28 2005 Than Ngo 1:3.3.4-6 - rebuilt against gcc-4 * Tue Feb 22 2005 Than Ngo 1:3.3.4-5 - fix application crash when input methode not available (bug #140658) - remove .moc/.obj - add qt-copy patch to fix KDE #80072 * Fri Feb 11 2005 Than Ngo 1:3.3.4-4 - update qt-x11-immodule-unified patch * Thu Feb 10 2005 Than Ngo 1:3.3.4-3 - fix rpm file conflict * Wed Feb 02 2005 Than Ngo 1:3.3.4-2 - remove useless doc files #143949 - fix build problem if installman is disable #146311 - add missing html/examples/tutorial symlinks * Fri Jan 28 2005 Than Ngo 1:3.3.4-1 - update to 3.3.4 - adapt many patches to qt-3.3.4 - drop qt-x11-free-3.3.0-freetype, qt-x11-free-3.3.3-qmake, qt-x11-free-3.3.1-lib64 qt-x11-free-3.3.3-qimage, which are included in new upstream * Tue Nov 30 2004 Than Ngo 1:3.3.3-16 - add sql macro * Mon Nov 29 2004 Than Ngo 1:3.3.3-15 - convert qdial.3qt to UTF-8 bug #140946 * Tue Nov 23 2004 Than Ngo 1:3.3.3-14 - add missing lupdate and lrelease #140230 * Fri Nov 19 2004 Than Ngo 1:3.3.3-13 - apply patch to fix qinputcontext * Thu Nov 11 2004 Than Ngo 1:3.3.3-12 - link against MySQL 3 - fix rpm conflict * Wed Nov 10 2004 Than Ngo 1:3.3.3-11 - apply patch to fix fullscreen problem - remove html documents duplicate #135696 * Tue Nov 02 2004 Than Ngo 1:3.3.3-10 - rebuilt * Tue Nov 02 2004 Than Ngo 1:3.3.3-9 - remove unused patch - set XIMInputStyle=On The Spot - require xorg-x11-devel instead XFree86-devel * Thu Oct 14 2004 Than Ngo 1:3.3.3-8 - don't compress examples/tutorial * Thu Oct 07 2004 Than Ngo 1:3.3.3-7 - fix build problem without qt immodule #134918 * Tue Sep 28 2004 Than Ngo 1:3.3.3-6 - fix font problem, bz #133578 * Tue Sep 14 2004 Than Ngo 1:3.3.3-4 - update new immodule patch - fix multilib problem #132516 * Wed Aug 18 2004 Than Ngo 1:3.3.3-3 - add patch to fix dlopen issue (#126422) - add image handling fix * Thu Aug 12 2004 Than Ngo 1:3.3.3-2 - fix qmake broken link (#129723) * Wed Aug 11 2004 Than Ngo 1:3.3.3-1 - update to 3.3.3 release * Thu Jul 01 2004 Than Ngo 1:3.3.2-10 - add immodule for Qt * Tue Jun 29 2004 Than Ngo 1:3.3.2-9 - add sub package config, allow multi lib installation (#126643) * Thu Jun 24 2004 Than Ngo 1:3.3.2-8 - add fontconfig fix for qfontdatabase, #123868 - fix some buildrequires problem, #125289 - fix dangling symlink, #125351 - get rid of backup files * Tue Jun 15 2004 Elliot Lee 1:3.3.2-7 - rebuilt * Tue May 25 2004 Than Ngo 1:3.3.2-5 - add missing qembed tool #124052, #124052 - get rid of unused trigger - add qt.conf in ld.so.conf.d -> don't change ld.so.conf #124080 * Wed May 12 2004 Than Ngo 1:3.3.2-4 - backport some qt patches, Symbol font works again * Mon May 10 2004 Than Ngo 1:3.3.2-3 - fixed annoying warning * Tue May 04 2004 Than Ngo 1:3.3.2-2 - fix broken symlink at qt document, bug #121652 * Thu Apr 29 2004 Than Ngo 3.3.2-1 - update to 3.3.2 * Thu Apr 22 2004 Than Ngo 3.3.1-1 - add cvs backport - fix lib64 issue, #121052 - fix CJK font display, bug #121017, #120542, thanks to Leon Ho - compress tutorial/examples * Fri Mar 26 2004 Than Ngo 3.3.1-0.8 - fixed symlinks issue, #117572 * Thu Mar 25 2004 Than Ngo 3.3.1-0.7 - add Trolltech patch, fix dpi setting issue * Tue Mar 23 2004 Than Ngo 3.3.1-0.6 - add 0034-qclipboard_recursion_fix.patch from CVS, #118368 - add better qt-x11-free-3.3.1-fontdatabase.patch * Sun Mar 07 2004 Than Ngo 1:3.3.1-0.5 - disable smpflags * Fri Mar 05 2004 Than Ngo 1:3.3.1-0.4 - fix font alias * Thu Mar 04 2004 Than Ngo 1:3.3.1-0.3 - add fontdatabase fix from Trolltech * Thu Mar 04 2004 Than Ngo 1:3.3.1-0.2 - fix wrong symlink #117451 * Tue Mar 02 2004 Elliot Lee - rebuilt * Mon Mar 01 2004 Than Ngo 3.3.1-0.1 - update to 3.3.1 * Mon Feb 23 2004 Than Ngo 3.3.0-0.4 - add fix for building with freetype 2.1.7 or newer * Tue Feb 17 2004 Than Ngo 3.3.0-0.3 - enable IPv6 support - use dlopen, instead of linking with OpenGL libraries directly - don't install backup files * Thu Feb 05 2004 Than Ngo 1:3.3.0-0.2 - fix fontdatabase - don't use strip in install script - fix qt default setting * Wed Feb 04 2004 Than Ngo 1:3.3.0-0.1 - 3.3.0 * Fri Jan 30 2004 Than Ngo 1:3.2.3-0.4 - add mouse patch from CVS, bug #114647 * Tue Jan 20 2004 Than Ngo 1:3.2.3-0.3 - rebuild * Tue Dec 2 2003 Than Ngo 1:3.2.3-0.2 - Added missing prl files, (report from trolltech) - Fixed description - include requires XFree86-devel on qt-devel * Fri Nov 14 2003 Than Ngo 1:3.2.3-0.1 - 3.2.3 release * Thu Oct 30 2003 Than Ngo 1:3.2.2-0.4 - fix encoding problem * Sat Oct 18 2003 Than Ngo 1:3.2.2-0.3 - fix encoding problem * Fri Oct 17 2003 Than Ngo 1:3.2.2-0.2 - add font alias patch file, thanks to Leon Ho - clean up monospace.patch from Leon Ho - remove some unneeded patch files * Thu Oct 16 2003 Than Ngo 1:3.2.2-0.1 - 3.2.2 release - remove a patch file, which is included in 3.2.2 * Tue Oct 14 2003 Than Ngo 1:3.2.1-1.3 - remove some unneeded patch files - don't load XLFDs if XFT2 is used * Mon Sep 08 2003 Than Ngo 1:3.2.1-1.2 - fixed rpm file list * Tue Sep 02 2003 Than Ngo 1:3.2.1-1.1 - fix for the khtml form lineedit bug from CVS * Wed Aug 27 2003 Than Ngo 1:3.2.1-1 - 3.2.1 release * Wed Jul 23 2003 Than Ngo 1:3.2.0-1 - 3.2.0 release * Mon Jun 23 2003 Than Ngo 3.2.0b2-0.1 - 3.2.0b2 - add missing templates for designer * Wed Jun 18 2003 Than Ngo 3.2.0b1-0.2 - clean up specfile * Wed Jun 18 2003 Than Ngo 3.2.0b1-0.1 - 3.2.0b1 * Tue Jun 17 2003 Than Ngo 3.1.2-12 - rebuilt * Tue Jun 17 2003 Than Ngo 3.1.2-10 - add missing translations * Wed Jun 11 2003 Elliot Lee - rebuilt * Wed Jun 04 2003 Elliot Lee - rebuilt * Mon May 19 2003 Than Ngo 3.1.2-7 - add some patches from KDE CVS qt-copy, thanks to Alexei Podtelezhnikov * Mon May 5 2003 Than Ngo 3.1.2-5.1 - set correct permission config scripts * Tue Apr 29 2003 Than Ngo 3.1.2-4 - fix typo bug in font loader * Wed Apr 9 2003 Than Ngo 3.1.2-2 - add xrandr extension * Mon Mar 3 2003 Than Ngo 3.1.2-1 - 3.1.2 release * Mon Feb 17 2003 Elliot Lee 3.1.1-7 - ppc64 support * Wed Jan 29 2003 Than Ngo 3.1.1-6 - add missing Categories section in qt designer #82920 * Wed Jan 22 2003 Tim Powers - rebuilt * Mon Dec 30 2002 Florian La Roche - Change qmlined.h to not include an attic header that is also not shipped with Red Hat Linux. This also fixes building unixODBC, that includes this header (apparently also without needing it). * Thu Dec 19 2002 Than Ngo 3.1.1-3 - add monospace patch file from Leon Ho (bug #79949) - add small patch file from Sysoltsev Slawa (bug #79731) * Tue Dec 17 2002 Than Ngo 3.1.1-2 - don't require XFree86, it's not needed * Tue Dec 17 2002 Than Ngo 3.1.1-1 - update to 3.1.1 * Thu Nov 28 2002 Than Ngo 3.1.0-1.3 - don't write Date into created moc files * Mon Nov 18 2002 Than Ngo 3.1.0-1.2 - add missing libs - remove workaround for ppc * Sun Nov 17 2002 Than Ngo 3.1.0-1.1 - adjust qfontdatabase_x11 for 3.1.0 - fix lib64 issue - add workaround to build on ppc * Wed Nov 13 2002 Than Ngo 3.1.0-1 - update to 3.1.0 - adjust some patch files for 3.1.0 - clean up specfile - remove some Xft2 patch files, which are now in 3.1.0 - add qwidget_x11.cpp.diff from Trolltech - install qt in %%{_libdir}/qt-3.1 (bug #77706) - don't use rpath - enable large file support - use system Xinerama - remove unneeded cups patch file - fix to build against new XFree86 * Tue Nov 5 2002 Than Ngo 3.0.5-19 - examples misconfigured (bug #76083) - don't include pkg-config (bug #74621) - fix build problem with new XFree86 * Tue Sep 17 2002 Than Ngo 3.0.5-18 - Fixed binaries symlinks * Mon Sep 9 2002 Than Ngo 3.0.5-17hammer - clean up spec file for 64bit machine * Thu Aug 29 2002 Than Ngo 3.0.5-17 - Fixed rpath issue (bug #69692, #69575) - Removed dlopen patch - Added monospace alias patch from Leon Ho (bug #72811) - Added man pages * Sun Aug 25 2002 Than Ngo 3.0.5-16 - Added missing catagory in qt designer - Added small gb18030 patch file from Leon Ho * Thu Aug 22 2002 Bernhard Rosenkraenzer 3.0.5-15 - Prereq fileutils (#71500) * Tue Aug 20 2002 Bernhard Rosenkraenzer 3.0.5-14 - Don't link to libstdc++, it isn't used - Work around s390 compiler bug (fpic/fPIC coexistance) - Do away with the "Feature Bluecurve already defined" warning message - Remove qmake cache files from the package * Wed Aug 14 2002 Than Ngo 3.0.5-13 - Added fix to use VT100 graphic characters (bug #71364) - Added fontdatabase fix from llch at redhat.com (bug #68353) * Mon Aug 12 2002 Bernhard Rosenkraenzer [not built] - Fix default qtrc * Mon Aug 12 2002 Bernhard Rosenkraenzer 3.0.5-12 - Fix CJK Printing (#71123) * Sun Aug 11 2002 Bernhard Rosenkraenzer 3.0.5-11 - Move qtconfig from qt-devel to qt, it's generally useful - Use -fno-use-cxa-atexit - Some tweaks to allow building Qt/Embedded with the same spec file - Apply the GB18030 patch even if xft2 isn't set * Fri Aug 9 2002 Than Ngo 3.0.5-10 - Added XIM patch from llch at redhat.com (bug #70411) * Sun Aug 4 2002 Than Ngo 3.0.5-9 - add a missing patch file (closelock/openlock) * Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-8 - Define QT_INSTALL_PREFIX in qmake * Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-7 - Find correct location of qmake mkspecs even if QTDIR isn't set * Thu Jul 25 2002 Than Ngo 3.0.5-6 - Check file descriptor before closelock * Thu Jul 25 2002 Than Ngo 3.0.5-5 - Fixed a bug in openlock * Wed Jul 24 2002 Than Ngo 3.0.5-4 - Tiny tweaks to qt3 patch * Tue Jul 23 2002 Owen Taylor - Tiny fix to qt3.diff to not add '0' as a test character (#68964) * Mon Jul 22 2002 Tim Powers 3.0.5-2 - rebuild using gcc-3.2-0.1 * Mon Jul 22 2002 Than Ngo 3.0.5-1 - 3.0.5 - Fixed dependencies issue * Thu Jul 18 2002 Than Ngo 3.0.4-12 - Added qt-clipfix from Harald Hoyer (bug #67648) * Tue Jul 16 2002 Than Ngo 3.0.4-11 - get rid of qt resource, it's now in redhat-artworks - add some define to build for 7.3 * Thu Jul 11 2002 Than Ngo 3.0.4-10 - add missing Buildprequires desktop-file-utils - add patches for GB18030 (llch at redhat.com) bug #68430 * Tue Jul 09 2002 Than Ngo 3.0.4-9 - add new desktop file for qt designer * Fri Jul 5 2002 Jakub Jelinek 3.0.4-8 - compile libXinerama.a with -fpic in Qt until XFree86 is fixed - make %%xft2 work even if old Xft headers aren't installed * Fri Jun 21 2002 Tim Powers - automated rebuild * Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-6 - Re-enable Xft2 now that fontconfig is fixed - Require a version of fontconfig that works - Use -fPIC rather than -fpic on alpha * Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-5 - Revert to Xft1 for now, Xft2 is too unstable - Exclude alpha for now to work around binutils bugs * Tue Jun 11 2002 Bernhard Rosenkraenzer 3.0.4-4 - Add (and fix up) fontconfig patch * Mon Jun 3 2002 Bernhard Rosenkraenzer 3.0.4-3 - Remove the glweak patch, it isn't needed after dropping XFree86 3.x * Thu May 23 2002 Tim Powers - automated rebuild * Sun May 5 2002 Bernhard Rosenkraenzer 3.0.4-1 - 3.0.4 - Make SQL plugins optional (buildtime) - Register with pkgconfig * Thu May 02 2002 Than Ngo 3.0.3-12 - qtdir /usr/lib/qt3 - build against gcc-3.1-0.26 - add qt-3.0.3-glweak.patch * Wed Apr 17 2002 Bernhard Rosenkraenzer 3.0.3-11 - qt3-gcc2.96 should be in qt, not qt-devel * Mon Apr 15 2002 Bernhard Rosenkraenzer 3.0.3-10 - Tweaks to allow parallel installations of Qt 3.x (gcc 2.96) and Qt 3.x (gcc 3.1) - Fix up debug spewage at Qt designer startup * Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-9 - Spec file fixes * Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-8 - Get rid of non-threaded version, dlopen()'ing threaded code (like plugins) from non-threaded code is dangerous - Add some fixes from qt-copy, fixing the ksplash crash some people have noticed on a first login - Add translation fixes from CVS - Patch example .pro files to build outside the Qt source tree (#63023) - Fix various bugs * Thu Apr 04 2002 Leon Ho 3.0.3-7 - fixes for CJK - qpsprinter - fixes for CJK - gb18030 * Fri Mar 29 2002 Bernhard Rosenkraenzer 3.0.3-6 - Make sure it builds with both gcc 2.96 and 3.1 * Wed Mar 28 2002 Leon Ho 3.0.3-5 - fixes for CJK - qpsprinter * Wed Mar 27 2002 Bernhard Rosenkraenzer 3.0.3-4 - Add CJK patches * Tue Mar 26 2002 Than Ngo 3.0.3-3 - fix loading kde styles * Tue Mar 19 2002 Bernhard Rosenkraenzer 3.0.3-1 - Update to 3.0.3 final * Thu Mar 14 2002 Bernhard Rosenkraenzer 3.0.3-0.cvs20020314.1 - Update to 3.0.3-pre, required for KDE3 - force -fPIC usage - Remove conflict with qt2 < 2.3.2-1, the new qt2 2.3.1 is fixed and qt 2.3.2 is broken - Ship the qmake config files (so qmake works for building any 3rd party stuff, e.g. aethera) * Wed Mar 6 2002 Bernhard Rosenkraenzer 3.0.2-2 - Add some fixes from KDE's qt-copy CVS - Pluginize image formats * Mon Feb 25 2002 Bernhard Rosenkraenzer 3.0.2-1 - 3.0.2 final * Tue Feb 19 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.3 - Add GB18030 codec patch, #60034 - Force-build jpeg support, fixing #59775 and #59795 * Sat Jan 26 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.2 - Build with CUPS support * Fri Jan 18 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.1 - Fix up /usr/bin/moc links, they should point to qt3 * Mon Jan 14 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020114.1 - Build styles directly into the main library for now, there's too much broken code out there depending on this ATM. * Wed Jan 9 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020109.1 - Stop excluding alpha, gcc has been fixed * Tue Jan 8 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020108.1 - Add fixes from CVS; this fixes the "Alt + F1, arrow up, arrow up doesn't work in KDE" bug * Mon Dec 17 2001 Bernhard Rosenkraenzer 3.0.1-2 - Fix up settings search path - Add default qtrc allowing to use KDE 3.x Qt plugins - Make sure QLibrary uses RTLD_GLOBAL when dlopen()ing libraries * Thu Dec 13 2001 Bernhard Rosenkraenzer 3.1.0-1 - Work around gcc bug #57467 * Wed Dec 12 2001 Bernhard Rosenkraenzer - 3.0.1 final * Mon Dec 10 2001 Bernhard Rosenkraenzer 3.0.1-0.cvs20011210.1 - Update to current (needed by KDE 3.x) - Rebuild with current libstdc++ - Temporarily disable building on alpha - Fix build with PostgreSQL 7.2 * Mon Nov 26 2001 Bernhard Rosenkraenzer 3.0.0-5 - Fix up glweak * Mon Nov 5 2001 Bernhard Rosenkraenzer 3.0.0-4 - Give designer, uic, moc, etc. their real names - the qt2 versions have been renamed in qt2-2.3.2-1. Conflict with qt2 < 2.3.2-1. * Thu Oct 25 2001 Bernhard Rosenkraenzer 3.0.0-3 - Add symlink /usr/lib/qt-3.0.0 -> /usr/lib/qt3 and set QTDIR to the symlink, allowing to update to 3.0.1 without breaking rpath'ed binaries * Tue Oct 16 2001 Bernhard Rosenkraenzer 3.0.0-1 - 3.0.0 final - fix some minor specfile bugs - Modularize some more (image format plugins) - Build codecs * Tue Sep 18 2001 Bernhard Rosenkraenzer 3.0.0-0.beta5.1 - beta5 - Share more code between qt-x11 and qt-embedded builds * Wed Aug 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta4.1 - beta4 - build the Motif style directly into Qt rather than as a plugin - Qt should always have at least one style... - replace the designer3 symlink with a shell script that sets QTDIR correctly before launching designer - Add desktop file for designer * Mon Aug 6 2001 Tim Powers 3.0.0-0.beta3.4 - explicitly include qm2ts, qmake, qtconfig in the devel package file list to avoid dangling symlinks * Thu Aug 2 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.3 - Try yet another workaround for buildsystem breakages * Tue Jul 31 2001 Bernhard Rosenkraenzer - Add another ugly workaround for build system problems, this should finally get rid of the dangling symlinks * Tue Jul 31 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.2 - Rephrase parts of the spec file, hopefully pleasing the build system * Sun Jul 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.1 - beta3 - Fix dangling symlinks * Sun Jun 24 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.2 - Fix up QSQL Postgres classes for Postgres 7.1.x - Fix various bugs: - QtMultilineEdit and QtTableView should actually compile - Link libqsqlpsql with libpq - Don't link the base library with libmysqlclient, linking the MySQL module with it is sufficient - Add missing const qualifier - move the SQL drivers to separate packages to avoid dependencies - build and install designer plugins - converting glade files to Qt is fun. ;) - handle RPM_OPT_FLAGS * Tue May 22 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.1 - 3.0 beta 1 * Wed May 16 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010516.1 - Update, remove conflicts with Qt 2.x * Mon May 14 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010514.1 - Initial build of 3.0 branch * Fri Apr 27 2001 Bernhard Rosenkraenzer 2.3.0-6 - Fix crashes on ia64, Patch from Bill Nottingham - Allow building qt-nox * Fri Apr 20 2001 Bernhard Rosenkraenzer 2.3.0-5 - Make sure uic and designer use the libqui from the source tree, not a previously installed one. Linking uic-x11 against libqui-embedded is definitely not a feature. ;) - The qclipboard fix is needed for qt-x11 only, don't apply it if we're building qt-embedded * Sat Apr 14 2001 Bernhard Rosenkraenzer - Handle LPRng specific constructs in printcap, Bug #35937 * Sun Mar 25 2001 Florian La Roche - add qfont patch from Trolltech * Tue Mar 13 2001 Harald Hoyer - added patch for '@euro' language settings * Tue Mar 6 2001 Bernhard Rosenkraenzer - 2.3.0 final - BuildRequires XFree86-devel >= 4.0.2 (#30486) * Mon Feb 26 2001 Than Ngo - fix check_env function, so that qt does not crash if QT_XFT is not set - fix symlinks * Mon Feb 26 2001 Bernhard Rosenkraenzer - 2.3.0b1 - Add a patch to qpsprinter that handles TrueType fonts even if they come from xfs * Tue Feb 13 2001 Preston Brown - japanese input and clipboard fixes applied. Changes have been sent upstream by patch authors. * Fri Feb 9 2001 Bernhard Rosenkraenzer - Rebuild with new Mesa to get rid of pthreads linkage - Add Xft fix from KDE CVS * Wed Feb 7 2001 Bernhard Rosenkraenzer - Add printing bugfix patch from Trolltech * Sat Feb 3 2001 Bernhard Rosenkraenzer - 2.2.4 - Qt Embedded: Add QVfb and VNC support * Tue Jan 16 2001 Bernhard Rosenkraenzer - Don't segfault when running Qt/Embedded applications as root - Improve the Qt/Embedded sparc patch so we don't need the specfile hacks anymore - Fix a bug in QPrintDialog (causing KDE Bug #18608) * Thu Jan 11 2001 Bernhard Rosenkraenzer - bzip2 source to save space - Qt/Embedded 2.2.3 - Fix qte build on sparc * Wed Dec 20 2000 Bernhard Rosenkraenzer - Run ldconfig in %%post and %%postun for qt-Xt * Sun Dec 17 2000 Bernhard Rosenkraenzer - Build with the Xrender extension (Patch from Keith Packard ) * Wed Dec 13 2000 Bernhard Rosenkraenzer - 2.2.3 * Tue Dec 12 2000 Bernhard Rosenkraenzer - Rebuild to fix permissions on doc dir - Don't exclude ia64 anymore * Fri Nov 17 2000 Bernhard Rosenkraenzer - Fix up uic (Patch from trolltech) * Wed Nov 15 2000 Bernhard Rosenkraenzer - Build qt-embedded changes to base: fix build, fix ISO C99 compliance, fix 64bit support * Mon Nov 13 2000 Bernhard Rosenkraenzer - 2.2.2 * Tue Oct 24 2000 Than Ngo - call ldconfig for updating (Bug #19687) - added patch from Trolltech, thanks to Rainer * Wed Oct 18 2000 Bernhard Rosenkraenzer - Add missing msg2qm, msgmerge, qconfig tools (Bug #18997), introduced by broken Makefiles in base - fix up %%install so it works both with old-style and new-style fileutils (fileutils <= 4.0z don't know about -L) * Fri Oct 13 2000 Bernhard Rosenkraenzer - Disable exception handling; this speeds up KDE 2.x and reduces its memory footprint by 20 MB. * Tue Oct 10 2000 Bernhard Rosenkraenzer - dereference symlinks in include * Sun Oct 8 2000 Bernhard Rosenkraenzer - fix -devel - update to the new version of 2.2.1 on trolltech.com; the initial tarball contained broken docs * Thu Oct 5 2000 Bernhard Rosenkraenzer - 2.2.1 * Mon Sep 25 2000 Bernhard Rosenkraenzer - Add missing uic * Thu Sep 21 2000 Bernhard Rosenkraenzer - Move Qt designer to a different source RPM to get rid of a circular dependency (kdelibs2->qt, qt->kdelibs2) - Enable MNG support - Don't compile (just include) examples and tutorials - move the static libraries to a separate package (qt-static). They're HUGE, and most people won't ever need them. - clean up spec file - fix up dependencies (-devel requires base, -static requires devel, Xt requires base) - add BuildRequires line * Tue Sep 12 2000 Than Ngo - update release 2.2.0 - changed copyright to GPL - added missing static libraries - made symbolic link for designer to load the help files correct - made designer and designer-kde2 as sub packages - added missing templates for designer - remove jakub patch, since the release 2.2.0 already contains this patch. - fixed qt again to compile with gcc-2.96 - use make -j for building * Wed Aug 23 2000 Bernhard Rosenkraenzer - Work around compiler bugs (Patch from Jakub) - Use relative symlinks (Bug #16750) * Mon Aug 21 2000 Bernhard Rosenkraenzer - beta2 * Mon Aug 14 2000 Bernhard Rosenkraenzer - new qt-copy from KDE2 CVS * Wed Aug 9 2000 Bernhard Rosenkraenzer - official beta 1 * Thu Aug 3 2000 Than Ngo - rebuilt against the libpng-1.0.8 * Thu Jul 27 2000 Bernhard Rosenkraenzer - rebuild (so we have it on all arches) * Tue Jul 25 2000 Bernhard Rosenkraenzer - move man pages to a more reasonable place (this fixes Bug #14126) - exclude ia64 for now (compiler problems!!!) * Mon Jul 24 2000 Harald Hoyer - modified connect patch to fit qt 2.2.0 beta. * Thu Jul 20 2000 Bernhard Rosenkraenzer - update to current qt-copy; this is now a qt 2.2.0 beta. * Mon Jul 17 2000 Bernhard Rosenkraenzer - update to current qt-copy in kde CVS, required * Wed Jul 12 2000 Prospector - automatic rebuild * Sun Jul 11 2000 Harald Hoyer - made patch smaller and binary compatible when recompiled with 6.2 - modified connect and moc to cope with the new g++ class layout * Sun Jul 09 2000 Than Ngo - rebuilt qt with gcc-2.96-34 * Fri Jul 07 2000 Than Ngo - rebuilt qt with c++ 2.96 * Mon Jul 3 2000 Bernhard Rosenkraenzer - Fix dependancies * Sun Jul 2 2000 Bernhard Rosenkraenzer - Use egcs++ for now ** FIXME * Wed Jun 28 2000 Preston Brown - fix up qt.sh * Sun Jun 25 2000 Bernhard Rosenkraenzer - Build in jpeg and threading support - Fix a bug in clipboard pasting code * Wed Jun 07 2000 Preston Brown - fix qt.{sh,csh} - use new rpm macro paths - package man pages * Fri Jun 2 2000 Bill Nottingham - build without optimization on ia64 * Mon May 29 2000 Bernhard Rosenkraenzer - 2.1.1 * Thu May 18 2000 Florian La Roche - recompile with correct libstdc++ * Thu Apr 13 2000 Bernhard Rosenkraenzer - 2.1.0 final * Wed Apr 5 2000 Bernhard Rosenkraenzer - beta4 - depend on libGL.so.1 rather than Mesa - XFree86 4.0 provides that lib, too * Wed Mar 22 2000 Bernhard Rosenkraenzer - beta3 * Tue Mar 7 2000 Bernhard Rosenkraenzer - beta2 - fix compilation of the NSPlugin add-on * Fri Mar 3 2000 Bill Nottingham - fix %postun script * Fri Feb 18 2000 Bernhard Rosenkr?nzer - beta1 - get rid of qt-ImageIO, the functionality is now in the main Qt library - remove qt-Network, the functionality is now in the main Qt library - add changes-2.1.0 to %doc * Thu Feb 17 2000 Preston Brown - no refcount check on postun script, we want it to happen even on upgrades * Thu Feb 10 2000 Bernhard Rosenkraenzer - new snapshot, should fix QWhatsThisButton - remove executable permissions from *.pro files * Mon Feb 07 2000 Preston Brown - strip binaries in examples, tutorial * Mon Jan 31 2000 Bernhard Rosenkraenzer - new snapshot - should fix the hotkey bug - Fix up the Makefiles so it compiles * Tue Jan 18 2000 Bernhard Rosenkraenzer - new snapshot - we need those QVariant fixes * Thu Jan 13 2000 Bernhard Rosenkraenzer - switch from glxMesa to Mesa for the GL addon * Wed Jan 5 2000 Bernhard Rosenkr?nzer - Fix up dependencies - new snapshot * Mon Jan 3 2000 Ngo Than - new snapshot for Red Hat Linux 6.2 - increase version number * Mon Dec 20 1999 Bernhard Rosenkraenzer - new snapshot - handle RPM_OPT_FLAGS * Mon Dec 13 1999 Bernhard Rosenkraenzer - new snapshot - -GL requires libGL.so.1 instead of Mesa (might as well be glxMesa or some commercial OpenGL) - -GL BuildPrereqs /usr/X11R6/include/GL/gl.h instead of Mesa-devel (might as well be glxMesa or some commercial OpenGL) * Sun Dec 05 1999 Bernhard Rosenkraenzer - update to current RSYNC version - remove compilation patch - it finally works out of the box * Wed Oct 27 1999 Bernhard Rosenkraenzer - update to current CVS snapshot - build extensions - add patch to fix QNetwork compilation * Sun Oct 24 1999 Bernhard Rosenkraenzer - current CVS snapshot - fix compilation with gcc 2.95.x - use install -c rather than just install to make BSD install happy * Mon Oct 11 1999 Bernhard Rosenkraenzer - 2.1.0 snapshot (for KDE2) - Fix typo in spec * Thu Sep 23 1999 Preston Brown - don't ship tutorial or example binaries * Tue Sep 21 1999 Preston Brown - substitution in tutorial and examples so that dependencies are correct and they can be successfully rebuilt. - switched to completely using QTDIR. trying to coexist with links into /usr/{include,lib} and still compile with qt 1.x is very hard for configure scripts to cope with. * Thu Aug 19 1999 Preston Brown - implemented QTDIR compatibility. * Tue Jul 20 1999 Preston Brown - qt 2.0.1 packaged. * Wed Jul 14 1999 Preston Brown - Qt 2.00 packaged. - examples, html documentation, tutorial moved to /usr/doc * Sat Apr 17 1999 Preston Brown - static library supplied in dev package. * Wed Apr 07 1999 Preston Brown - turn on internal GIF reading support * Tue Apr 06 1999 Preston Brown - strip binaries * Mon Mar 15 1999 Preston Brown - upgrade to qt 1.44. * Wed Feb 24 1999 Preston Brown - Injected new description and group. * Tue Jan 19 1999 Preston Brown - moved includes to /usr/include/qt * Mon Jan 04 1999 Preston Brown - made setup phase silent. * Fri Dec 04 1998 Preston Brown - upgraded to qt 1.42, released today. * Tue Dec 01 1998 Preston Brown - took Arnts RPM and made some minor changes for Red Hat. --- NEW FILE qtrc --- [3.3] libraryPath=/usr/lib/qt-3.3/plugins:/usr/lib/kde3/plugins [General] XIMInputStyle=On The Spot cursorFlashTime=1000 doubleClickInterval=400 embedFonts=true enableXft=true font=Sans,10,-1,5,48,0,0,0,0,0 fontPath=\0 globalStrut=0^e0^e resolveSymlinks=true style=Bluecurve useRtlExtensions=false useXft=true wheelScrollLines=3 [KDE] contrast=7 kdeAddedLibraryPaths=~/.kde/lib/kde3/plugins/^e/usr/lib/kde3/plugins/^e [KWinPalette] activeBackground=#dcdcdc activeBlend=#c8c8c8 activeForeground=#ffffff activeTitleBtnBg=#dcdcdc frame=#dcdcdc inactiveBackground=#dcdcdc inactiveBlend=#c8c8c8 inactiveForeground=#6e6e6e inactiveFrame=#dcdcdc inactiveTitleBtnBg=#dcdcdc [Palette] active=#000000^e#e6f0f9^e#ffffff^e#f2f7fc^e#73787c^e#9aa0a6^e#000000^e#ffffff^e#000000^e#ffffff^e#eeeaee^e#000000^e#547098^e#ffffff^e#0000ff^e#ff00ff^e disabled=#808080^e#e6f0f9^e#ffffff^e#ffffff^e#73787c^e#9aa0a6^e#808080^e#ffffff^e#808080^e#ffffff^e#eeeaee^e#000000^e#547098^e#808080^e#0000ff^e#ff00ff^e inactive=#000000^e#e6f0f9^e#ffffff^e#ffffff^e#73787c^e#9aa0a6^e#000000^e#ffffff^e#000000^e#ffffff^e#eeeaee^e#000000^e#547098^e#ffffff^e#0000ff^e#ff00ff^e Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 11:31:41 -0000 1.1 +++ .cvsignore 18 May 2006 11:33:28 -0000 1.2 @@ -0,0 +1 @@ +qt-x11-opensource-src-4.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 11:31:41 -0000 1.1 +++ sources 18 May 2006 11:33:28 -0000 1.2 @@ -0,0 +1 @@ +18bca010d09b98e94210710047baca0a qt-x11-opensource-src-4.1.2.tar.gz From fedora-extras-commits at redhat.com Thu May 18 11:45:51 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 18 May 2006 04:45:51 -0700 Subject: fedora-security/audit fe4,1.24,1.25 fe5,1.22,1.23 Message-ID: <200605181145.k4IBjpfD022773@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22753 Modified Files: fe4 fe5 Log Message: Our clamav maintainer says this isn't an issue. I agree. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fe4 17 May 2006 18:14:18 -0000 1.24 +++ fe4 18 May 2006 11:45:48 -0000 1.25 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2427 VULNERABLE (clamav) bz#192076 +CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fe5 17 May 2006 18:14:18 -0000 1.22 +++ fe5 18 May 2006 11:45:48 -0000 1.23 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2427 VULNERABLE (clamav) bz#192076 +CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 From fedora-extras-commits at redhat.com Thu May 18 12:41:47 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 18 May 2006 05:41:47 -0700 Subject: fedora-security/audit fe4,1.25,1.26 Message-ID: <200605181241.k4ICfl2o025292@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25274 Modified Files: fe4 Log Message: Note a kphone CVE id. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- fe4 18 May 2006 11:45:48 -0000 1.25 +++ fe4 18 May 2006 12:41:44 -0000 1.26 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2442 VULNERABLE (kphone) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn From fedora-extras-commits at redhat.com Thu May 18 12:48:52 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 18 May 2006 05:48:52 -0700 Subject: rpms/tin/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tin.spec, 1.10, 1.11 Message-ID: <200605181248.k4ICmsVW025353@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/tin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25332 Modified Files: .cvsignore sources tin.spec Log Message: * Sun Mar 13 2006 Adrian Reber - 1.8.1-1 - updated to 1.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tin/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2004 05:27:38 -0000 1.4 +++ .cvsignore 18 May 2006 12:48:52 -0000 1.5 @@ -1 +1,2 @@ -tin-1.6.2.tar.bz2 +tin-1.8.1.tar.bz2 +tin-1.8.1.tar.bz2.sign Index: sources =================================================================== RCS file: /cvs/extras/rpms/tin/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2004 05:27:38 -0000 1.4 +++ sources 18 May 2006 12:48:52 -0000 1.5 @@ -1 +1,2 @@ -3ab61ba7c7d3b7a3596ba199c570c4e4 tin-1.6.2.tar.bz2 +efeecdf72683213d9e705c28de87ea2e tin-1.8.1.tar.bz2 +4f7dd48ddd79d79203dc0094f692999f tin-1.8.1.tar.bz2.sign Index: tin.spec =================================================================== RCS file: /cvs/extras/rpms/tin/FC-4/tin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tin.spec 22 May 2005 23:43:22 -0000 1.10 +++ tin.spec 18 May 2006 12:48:52 -0000 1.11 @@ -1,12 +1,12 @@ Name: tin -Version: 1.6.2 -Release: 4 - +Version: 1.8.1 +Release: 1%{?dist} Summary: Basic Internet news reader Group: Applications/Internet License: Distributable URL: http://www.tin.org/ -Source: ftp://ftp.tin.org/pub/news/clients/tin/v1.6/tin-1.6.2.tar.bz2 +Source0: ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2 +Source1: ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2.sign BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel @@ -78,6 +78,7 @@ %{_bindir}/metamutt %{_bindir}/opt-case.pl %{_bindir}/w2r.pl +%{_bindir}/tinews.pl %{_mandir}/man1/* %{_mandir}/man5/* /usr/share/locale/*/*/* @@ -85,6 +86,9 @@ %changelog +* Sun Mar 13 2006 Adrian Reber - 1.8.1-1 +- updated to 1.8.1 + * Sun May 22 2005 Jeremy Katz - 1.6.2-4 - rebuild on all arches From fedora-extras-commits at redhat.com Thu May 18 13:45:28 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 06:45:28 -0700 Subject: rpms/docbook2X/devel .cvsignore, 1.3, 1.4 docbook2X.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605181345.k4IDjUMu027873@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/docbook2X/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27852 Modified Files: .cvsignore docbook2X.spec sources Log Message: * Thu May 18 2006 Patrice Dumas - 0.8.7-1 - update to 0.8.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook2X/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Apr 2006 17:41:01 -0000 1.3 +++ .cvsignore 18 May 2006 13:45:28 -0000 1.4 @@ -1 +1 @@ -docbook2X-0.8.6.tar.gz +docbook2X-0.8.7.tar.gz Index: docbook2X.spec =================================================================== RCS file: /cvs/extras/rpms/docbook2X/devel/docbook2X.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook2X.spec 10 Apr 2006 17:41:01 -0000 1.3 +++ docbook2X.spec 18 May 2006 13:45:28 -0000 1.4 @@ -1,12 +1,12 @@ Name: docbook2X -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text License: BSD URL: http://docbook2x.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz # modify Makefile.in to replace make install_perl by make install_vendor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %changelog +* Thu May 18 2006 Patrice Dumas - 0.8.7-1 +- update to 0.8.7 + * Fri Feb 17 2006 Patrice Dumas - 0.8.6-1 - update to 0.8.6 - drop patch as SGMLSpl.pm is included in the scripts, not distributed Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook2X/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Apr 2006 17:41:01 -0000 1.3 +++ sources 18 May 2006 13:45:28 -0000 1.4 @@ -1 +1 @@ -fd5efad56674cfb22ea4831845c3c937 docbook2X-0.8.6.tar.gz +bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz From fedora-extras-commits at redhat.com Thu May 18 14:03:00 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 07:03:00 -0700 Subject: rpms/docbook2X/FC-3 .cvsignore, 1.3, 1.4 docbook2X.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605181403.k4IE3XTZ030291@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/docbook2X/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-3 Modified Files: .cvsignore docbook2X.spec sources Log Message: * Thu May 18 2006 Patrice Dumas - 0.8.7-1 - update to 0.8.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Apr 2006 18:04:38 -0000 1.3 +++ .cvsignore 18 May 2006 14:03:00 -0000 1.4 @@ -1 +1 @@ -docbook2X-0.8.6.tar.gz +docbook2X-0.8.7.tar.gz Index: docbook2X.spec =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-3/docbook2X.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook2X.spec 10 Apr 2006 18:04:38 -0000 1.3 +++ docbook2X.spec 18 May 2006 14:03:00 -0000 1.4 @@ -1,12 +1,12 @@ Name: docbook2X -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text License: BSD URL: http://docbook2x.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz # modify Makefile.in to replace make install_perl by make install_vendor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %changelog +* Thu May 18 2006 Patrice Dumas - 0.8.7-1 +- update to 0.8.7 + * Fri Feb 17 2006 Patrice Dumas - 0.8.6-1 - update to 0.8.6 - drop patch as SGMLSpl.pm is included in the scripts, not distributed Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Apr 2006 18:04:38 -0000 1.3 +++ sources 18 May 2006 14:03:00 -0000 1.4 @@ -1 +1 @@ -fd5efad56674cfb22ea4831845c3c937 docbook2X-0.8.6.tar.gz +bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz From fedora-extras-commits at redhat.com Thu May 18 14:03:04 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 07:03:04 -0700 Subject: rpms/docbook2X/FC-4 .cvsignore, 1.3, 1.4 docbook2X.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605181403.k4IE3a3x030296@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/docbook2X/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-4 Modified Files: .cvsignore docbook2X.spec sources Log Message: * Thu May 18 2006 Patrice Dumas - 0.8.7-1 - update to 0.8.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Apr 2006 18:04:39 -0000 1.3 +++ .cvsignore 18 May 2006 14:03:04 -0000 1.4 @@ -1 +1 @@ -docbook2X-0.8.6.tar.gz +docbook2X-0.8.7.tar.gz Index: docbook2X.spec =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-4/docbook2X.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook2X.spec 10 Apr 2006 18:04:39 -0000 1.3 +++ docbook2X.spec 18 May 2006 14:03:04 -0000 1.4 @@ -1,12 +1,12 @@ Name: docbook2X -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text License: BSD URL: http://docbook2x.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz # modify Makefile.in to replace make install_perl by make install_vendor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %changelog +* Thu May 18 2006 Patrice Dumas - 0.8.7-1 +- update to 0.8.7 + * Fri Feb 17 2006 Patrice Dumas - 0.8.6-1 - update to 0.8.6 - drop patch as SGMLSpl.pm is included in the scripts, not distributed Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Apr 2006 18:04:39 -0000 1.3 +++ sources 18 May 2006 14:03:04 -0000 1.4 @@ -1 +1 @@ -fd5efad56674cfb22ea4831845c3c937 docbook2X-0.8.6.tar.gz +bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz From fedora-extras-commits at redhat.com Thu May 18 14:03:08 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 18 May 2006 07:03:08 -0700 Subject: rpms/docbook2X/FC-5 .cvsignore, 1.3, 1.4 docbook2X.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605181403.k4IE3eQH030301@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/docbook2X/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-5 Modified Files: .cvsignore docbook2X.spec sources Log Message: * Thu May 18 2006 Patrice Dumas - 0.8.7-1 - update to 0.8.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Apr 2006 18:04:40 -0000 1.3 +++ .cvsignore 18 May 2006 14:03:07 -0000 1.4 @@ -1 +1 @@ -docbook2X-0.8.6.tar.gz +docbook2X-0.8.7.tar.gz Index: docbook2X.spec =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-5/docbook2X.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook2X.spec 10 Apr 2006 18:04:40 -0000 1.3 +++ docbook2X.spec 18 May 2006 14:03:07 -0000 1.4 @@ -1,12 +1,12 @@ Name: docbook2X -Version: 0.8.6 +Version: 0.8.7 Release: 1%{?dist} Summary: Convert docbook into man and Texinfo Group: Applications/Text License: BSD URL: http://docbook2x.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz +Source0: http://ovh.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz # modify Makefile.in to replace make install_perl by make install_vendor BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,6 +74,9 @@ %changelog +* Thu May 18 2006 Patrice Dumas - 0.8.7-1 +- update to 0.8.7 + * Fri Feb 17 2006 Patrice Dumas - 0.8.6-1 - update to 0.8.6 - drop patch as SGMLSpl.pm is included in the scripts, not distributed Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook2X/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Apr 2006 18:04:40 -0000 1.3 +++ sources 18 May 2006 14:03:07 -0000 1.4 @@ -1 +1 @@ -fd5efad56674cfb22ea4831845c3c937 docbook2X-0.8.6.tar.gz +bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz From fedora-extras-commits at redhat.com Thu May 18 15:11:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 18 May 2006 08:11:17 -0700 Subject: comps comps-fe6.xml.in,1.16,1.17 Message-ID: <200605181511.k4IFBJCJ000507@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv490 Modified Files: comps-fe6.xml.in Log Message: Added crossfire-client Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- comps-fe6.xml.in 18 May 2006 07:03:47 -0000 1.16 +++ comps-fe6.xml.in 18 May 2006 15:11:17 -0000 1.17 @@ -207,6 +207,7 @@ bzflag celestia cgoban + crossfire-client crystal-stacker crystal-stacker-themes csmash From fedora-extras-commits at redhat.com Thu May 18 17:22:40 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:22:40 -0700 Subject: rpms/exiv2 - New directory Message-ID: <200605181722.k4IHMgR8005648@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5622/exiv2 Log Message: Directory /cvs/extras/rpms/exiv2 added to the repository From fedora-extras-commits at redhat.com Thu May 18 17:22:40 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:22:40 -0700 Subject: rpms/exiv2/devel - New directory Message-ID: <200605181722.k4IHMgEv005651@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5622/exiv2/devel Log Message: Directory /cvs/extras/rpms/exiv2/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 17:22:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:22:54 -0700 Subject: rpms/exiv2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605181722.k4IHMuJP005695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5667 Added Files: Makefile import.log Log Message: Setup of module exiv2 --- NEW FILE Makefile --- # Top level Makefile for module exiv2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 17:22:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:22:54 -0700 Subject: rpms/exiv2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605181722.k4IHMucD005698@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5667/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module exiv2 --- NEW 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 May 18 17:23:17 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:23:17 -0700 Subject: rpms/exiv2 import.log,1.1,1.2 Message-ID: <200605181723.k4IHNJww005776@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5741 Modified Files: import.log Log Message: auto-import exiv2-0.9.1-3 on branch devel from exiv2-0.9.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/exiv2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 17:22:53 -0000 1.1 +++ import.log 18 May 2006 17:23:17 -0000 1.2 @@ -0,0 +1 @@ +exiv2-0_9_1-3:HEAD:exiv2-0.9.1-3.src.rpm:1147972994 From fedora-extras-commits at redhat.com Thu May 18 17:23:18 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:23:18 -0700 Subject: rpms/exiv2/devel exiv2-0.9.1-deps.patch, NONE, 1.1 exiv2-0.9.1-no_rpath.patch, NONE, 1.1 exiv2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605181723.k4IHNKJj005785@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5741/devel Modified Files: .cvsignore sources Added Files: exiv2-0.9.1-deps.patch exiv2-0.9.1-no_rpath.patch exiv2.spec Log Message: auto-import exiv2-0.9.1-3 on branch devel from exiv2-0.9.1-3.src.rpm exiv2-0.9.1-deps.patch: --- NEW FILE exiv2-0.9.1-deps.patch --- --- exiv2-0.9.1/src/Makefile.deps 2006-01-20 02:45:59.000000000 -0600 +++ exiv2-0.9.1/src/Makefile 2006-05-18 09:10:11.000000000 -0500 @@ -156,6 +156,10 @@ @$(LIBTOOL) --mode=compile $(COMPILE.cc) -o $@ $< @$(MAKEDEPEND) @$(POSTDEPEND) +# The dependancies here are wrong. It generates .lo output, +# so things are rebuilt *every* time 'make' is called. +# Let's try a quick-n-dirty hack -- Rex + touch $@ $(COBJ): %.o: %.c @$(LIBTOOL) --mode=compile $(COMPILE.c) -o $@ $< exiv2-0.9.1-no_rpath.patch: --- NEW FILE exiv2-0.9.1-no_rpath.patch --- --- exiv2-0.9.1/src/Makefile.no_rpath 2006-05-18 08:41:02.000000000 -0500 +++ exiv2-0.9.1/src/Makefile 2006-05-18 09:10:11.000000000 -0500 @@ -148,7 +148,7 @@ # Compilation shortcuts COMPILE.cc = $(CXX) $(CXXFLAGS) $(CXXDEFS) $(CXXINCS) -c COMPILE.c = $(CC) $(CFLAGS) $(DEFS) $(INCS) -c -LINK.cc = $(CXX) $(CXXFLAGS) $(LDLIBS) $(LDFLAGS) -rpath $(libdir) +LINK.cc = $(CXX) $(CXXFLAGS) $(LDLIBS) $(LDFLAGS) #-rpath $(libdir) # ****************************************************************************** # Rules @@ -203,7 +203,7 @@ bin: lib $(BINARY) $(EXIV2BIN) $(MCBIN) path-test lib: $(OBJ) - $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -rpath $(libdir) -release $(EXIV2_VERSION) + $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -release $(EXIV2_VERSION) -rpath $(libdir) @touch lib path-test: path-test.o utils.o --- NEW FILE exiv2.spec --- Summary: Exif and Iptc metadata manipulation library and tools Name: exiv2 Version: 0.9.1 Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://home.arcor.de/ahuggel/exiv2/ Source: http://home.arcor.de/ahuggel/exiv2/exiv2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: exiv2-0.9.1-no_rpath.patch Patch2: exiv2-0.9.1-deps.patch %description Exiv2 comprises of a C++ library and a command line utility to access image metadata. Exiv2 supports full read and write access to the Exif and Iptc metadata, Exif MakerNote support, extract and delete methods for Exif thumbnails, classes to access Ifd and so on. The command line utility allows you to: * print the Exif metadata of Jpeg images as summary info, interpreted values, or the plain data for each tag * print the Iptc metadata of Jpeg images * print the Jpeg comment of Jpeg images * set, add and delete Exif and Iptc metadata of Jpeg images * adjust the Exif timestamp (that's how it all started...) * rename Exif image files according to the Exif timestamp * extract, insert and delete Exif metadata (including thumbnails), Iptc metadata and Jpeg comments %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel %{summary}. %prep %setup -q %patch1 -p1 -b .no_rpath %patch2 -p1 -b .deps %build %configure --disable-static make -C src %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make -C src install DESTDIR=$RPM_BUILD_ROOT # Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la # set eXecute bit on installed lib chmod a+x $RPM_BUILD_ROOT%{_libdir}/libexiv2-*.so %clean rm -rf $FPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/exiv2 %{_libdir}/libexiv2-*.so %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %doc doc/html %{_bindir}/exiv2-config %{_includedir}/exiv2/ %{_libdir}/libexiv2.so %changelog * Wed May 17 2006 Rex Dieter 0.9.1-3 - cleanup %%description - set eXecute bit on installed lib. - no_rpath patch - deps patch (items get (re)compiled on *every* call to 'make') * Wed May 17 2006 Rex Dieter 0.9.1-2 - %%post/%%postun: /sbin/ldconfig * Tue May 16 2006 Rex Dieter 0.9.1-1 - first try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exiv2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 17:22:54 -0000 1.1 +++ .cvsignore 18 May 2006 17:23:18 -0000 1.2 @@ -0,0 +1 @@ +exiv2-0.9.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/exiv2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 17:22:54 -0000 1.1 +++ sources 18 May 2006 17:23:18 -0000 1.2 @@ -0,0 +1 @@ +4c6593751368f5e9235d85e0d4058e67 exiv2-0.9.1.tar.gz From fedora-extras-commits at redhat.com Thu May 18 17:28:02 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:28:02 -0700 Subject: owners owners.list,1.1017,1.1018 Message-ID: <200605181728.k4IHS49b005848@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5831 Modified Files: owners.list Log Message: +exiv2 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1017 retrieving revision 1.1018 diff -u -r1.1017 -r1.1018 --- owners.list 18 May 2006 10:31:09 -0000 1.1017 +++ owners.list 18 May 2006 17:28:01 -0000 1.1018 @@ -259,6 +259,7 @@ Fedora Extras|evas|A hardware-accelerated canvas API|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|exiv2|Exif and Iptc metadata manipulation library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|ez-ipupdate|Client for Dynamic DNS Services|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|f2py|Fortran to Python interface generator|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 17:31:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 10:31:36 -0700 Subject: rpms/exiv2/devel exiv2.spec,1.1,1.2 Message-ID: <200605181731.k4IHVcHa005890@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/exiv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873 Modified Files: exiv2.spec Log Message: touchup Summary Index: exiv2.spec =================================================================== RCS file: /cvs/extras/rpms/exiv2/devel/exiv2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- exiv2.spec 18 May 2006 17:23:18 -0000 1.1 +++ exiv2.spec 18 May 2006 17:31:35 -0000 1.2 @@ -1,5 +1,5 @@ -Summary: Exif and Iptc metadata manipulation library and tools +Summary: Exif and Iptc metadata manipulation library Name: exiv2 Version: 0.9.1 Release: 3%{?dist} @@ -14,7 +14,6 @@ Patch2: exiv2-0.9.1-deps.patch - %description Exiv2 comprises of a C++ library and a command line utility to access image metadata. Exiv2 supports full read and write access to the Exif and Iptc From fedora-extras-commits at redhat.com Thu May 18 18:28:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 11:28:30 -0700 Subject: rpms/perl-GDGraph/devel .cvsignore, 1.5, 1.6 perl-GDGraph.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605181828.k4IISW4b008537@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GDGraph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8516 Modified Files: .cvsignore perl-GDGraph.spec sources Log Message: Update to 1.4308. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2006 19:41:16 -0000 1.5 +++ .cvsignore 18 May 2006 18:28:29 -0000 1.6 @@ -1 +1 @@ -GDGraph-1.4307.tar.gz +GDGraph-1.4308.tar.gz Index: perl-GDGraph.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/perl-GDGraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-GDGraph.spec 20 Feb 2006 19:41:16 -0000 1.8 +++ perl-GDGraph.spec 18 May 2006 18:28:29 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-GDGraph -Version: 1.4307 +Version: 1.4308 Release: 1%{?dist} Summary: Graph generation package for Perl @@ -22,7 +22,7 @@ %setup -q -n GDGraph-%{version} %{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl %{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl -chmod a-x CHANGES README +chmod -c a-x CHANGES README Graph/bars.pm %build @@ -51,10 +51,13 @@ %defattr(-,root,root,-) %doc CHANGES README samples/ %{perl_vendorlib}/GD/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Thu May 18 2006 Jose Pedro Oliveira - 1.4308-1 +- Update to 1.4308. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.4307-1 - Update to 1.4307. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Feb 2006 19:41:16 -0000 1.5 +++ sources 18 May 2006 18:28:29 -0000 1.6 @@ -1 +1 @@ -ac5d4aa5db492ac5a0af08a57c4db2c9 GDGraph-1.4307.tar.gz +fcdd34d5e09ae917b5d264887734b3b1 GDGraph-1.4308.tar.gz From fedora-extras-commits at redhat.com Thu May 18 18:31:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 11:31:14 -0700 Subject: rpms/perl-GDGraph/FC-4 .cvsignore, 1.5, 1.6 perl-GDGraph.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605181831.k4IIVkOa008705@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GDGraph/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8659/FC-4 Modified Files: .cvsignore perl-GDGraph.spec sources Log Message: Update to 1.4308. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2006 19:41:10 -0000 1.5 +++ .cvsignore 18 May 2006 18:31:14 -0000 1.6 @@ -1 +1 @@ -GDGraph-1.4307.tar.gz +GDGraph-1.4308.tar.gz Index: perl-GDGraph.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/perl-GDGraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-GDGraph.spec 20 Feb 2006 19:41:10 -0000 1.8 +++ perl-GDGraph.spec 18 May 2006 18:31:14 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-GDGraph -Version: 1.4307 +Version: 1.4308 Release: 1%{?dist} Summary: Graph generation package for Perl @@ -22,7 +22,7 @@ %setup -q -n GDGraph-%{version} %{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl %{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl -chmod a-x CHANGES README +chmod -c a-x CHANGES README Graph/bars.pm %build @@ -51,10 +51,13 @@ %defattr(-,root,root,-) %doc CHANGES README samples/ %{perl_vendorlib}/GD/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Thu May 18 2006 Jose Pedro Oliveira - 1.4308-1 +- Update to 1.4308. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.4307-1 - Update to 1.4307. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Feb 2006 19:41:10 -0000 1.5 +++ sources 18 May 2006 18:31:14 -0000 1.6 @@ -1 +1 @@ -ac5d4aa5db492ac5a0af08a57c4db2c9 GDGraph-1.4307.tar.gz +fcdd34d5e09ae917b5d264887734b3b1 GDGraph-1.4308.tar.gz From fedora-extras-commits at redhat.com Thu May 18 18:31:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 18 May 2006 11:31:15 -0700 Subject: rpms/perl-GDGraph/FC-5 .cvsignore, 1.5, 1.6 perl-GDGraph.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200605181831.k4IIVlN2008710@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GDGraph/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8659/FC-5 Modified Files: .cvsignore perl-GDGraph.spec sources Log Message: Update to 1.4308. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2006 19:41:16 -0000 1.5 +++ .cvsignore 18 May 2006 18:31:15 -0000 1.6 @@ -1 +1 @@ -GDGraph-1.4307.tar.gz +GDGraph-1.4308.tar.gz Index: perl-GDGraph.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-5/perl-GDGraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-GDGraph.spec 20 Feb 2006 19:41:16 -0000 1.8 +++ perl-GDGraph.spec 18 May 2006 18:31:15 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-GDGraph -Version: 1.4307 +Version: 1.4308 Release: 1%{?dist} Summary: Graph generation package for Perl @@ -22,7 +22,7 @@ %setup -q -n GDGraph-%{version} %{__perl} -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' samples/sample1A.pl %{__perl} -pi -e 's/\r\n/\n/' samples/sample64.pl -chmod a-x CHANGES README +chmod -c a-x CHANGES README Graph/bars.pm %build @@ -51,10 +51,13 @@ %defattr(-,root,root,-) %doc CHANGES README samples/ %{perl_vendorlib}/GD/ -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3pm* %changelog +* Thu May 18 2006 Jose Pedro Oliveira - 1.4308-1 +- Update to 1.4308. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.4307-1 - Update to 1.4307. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GDGraph/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Feb 2006 19:41:16 -0000 1.5 +++ sources 18 May 2006 18:31:15 -0000 1.6 @@ -1 +1 @@ -ac5d4aa5db492ac5a0af08a57c4db2c9 GDGraph-1.4307.tar.gz +fcdd34d5e09ae917b5d264887734b3b1 GDGraph-1.4308.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:00:49 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 18 May 2006 12:00:49 -0700 Subject: fedora-security/audit fc4,1.253,1.254 fc5,1.168,1.169 Message-ID: <200605181900.k4IJ0nEj009002@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8972 Modified Files: fc4 fc5 Log Message: Note a new ImageMagick issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- fc4 18 May 2006 10:00:15 -0000 1.253 +++ fc4 18 May 2006 19:00:46 -0000 1.254 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] CVE-2006-2366 VULNERABLE (openobex) #192087 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- fc5 18 May 2006 10:00:15 -0000 1.168 +++ fc5 18 May 2006 19:00:46 -0000 1.169 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] CVE-2006-2366 VULNERABLE (openobex) #192087 From fedora-extras-commits at redhat.com Thu May 18 19:33:27 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:33:27 -0700 Subject: rpms/galago-daemon - New directory Message-ID: <200605181933.k4IJXTaM012350@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/galago-daemon Log Message: Directory /cvs/extras/rpms/galago-daemon added to the repository From fedora-extras-commits at redhat.com Thu May 18 19:33:27 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:33:27 -0700 Subject: rpms/galago-daemon/devel - New directory Message-ID: <200605181933.k4IJXTns012353@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/galago-daemon/devel Log Message: Directory /cvs/extras/rpms/galago-daemon/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 19:33:55 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:33:55 -0700 Subject: rpms/galago-daemon Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605181933.k4IJXvoh012404@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375 Added Files: Makefile import.log Log Message: Setup of module galago-daemon --- NEW FILE Makefile --- # Top level Makefile for module galago-daemon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 19:33:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:33:56 -0700 Subject: rpms/galago-daemon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605181933.k4IJXwXG012408@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12375/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module galago-daemon --- NEW 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 May 18 19:35:03 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:35:03 -0700 Subject: rpms/galago-daemon import.log,1.1,1.2 Message-ID: <200605181935.k4IJZ5aG012478@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443 Modified Files: import.log Log Message: auto-import galago-daemon-0.5.0-2 on branch devel from galago-daemon-0.5.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 19:33:55 -0000 1.1 +++ import.log 18 May 2006 19:35:03 -0000 1.2 @@ -0,0 +1 @@ +galago-daemon-0_5_0-2:HEAD:galago-daemon-0.5.0-2.src.rpm:1147980887 From fedora-extras-commits at redhat.com Thu May 18 19:35:03 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:35:03 -0700 Subject: rpms/galago-daemon/devel galago-daemon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605181935.k4IJZ6ix012483@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443/devel Modified Files: .cvsignore sources Added Files: galago-daemon.spec Log Message: auto-import galago-daemon-0.5.0-2 on branch devel from galago-daemon-0.5.0-2.src.rpm --- NEW FILE galago-daemon.spec --- Name: galago-daemon Version: 0.5.0 Release: 2%{?dist} Summary: Galago presence daemon Group: System Environment/Daemons License: GPL URL: http://galago.sourceforge.net/ Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgalago-devel BuildRequires: check-devel %description The Galago presence daemon, which is the center of all presence transactions for Galago. This service is automatically launched by D-BUS when needed. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING ChangeLog NEWS %{_datadir}/dbus-1/services/*.service %config %{_sysconfdir}/dbus-1/system.d/%{name}.conf %{_libexecdir}/%{name} %changelog * Thu May 18 2006 Brian Pepple - 0.5.0-2 - Mark file as %%config. * Fri Apr 21 2006 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 19:33:56 -0000 1.1 +++ .cvsignore 18 May 2006 19:35:03 -0000 1.2 @@ -0,0 +1 @@ +galago-daemon-0.5.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 19:33:56 -0000 1.1 +++ sources 18 May 2006 19:35:03 -0000 1.2 @@ -0,0 +1 @@ +bc74c3ac8c18f4c1a44e43504c59a08f galago-daemon-0.5.0.tar.bz2 From fedora-extras-commits at redhat.com Thu May 18 19:35:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 18 May 2006 12:35:59 -0700 Subject: rpms/cpanspec/devel .cvsignore, 1.8, 1.9 cpanspec.spec, 1.8, 1.9 sources, 1.8, 1.9 cpanspec-1.65-regex.patch, 1.1, NONE Message-ID: <200605181936.k4IJa1O8012551@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12530 Modified Files: .cvsignore cpanspec.spec sources Removed Files: cpanspec-1.65-regex.patch Log Message: Update to 1.66. Drop regex patch. cpanspec now uses repoquery. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Apr 2006 21:23:42 -0000 1.8 +++ .cvsignore 18 May 2006 19:35:59 -0000 1.9 @@ -1 +1 @@ -cpanspec-1.65.tar.gz +cpanspec-1.66.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cpanspec.spec 4 May 2006 16:16:35 -0000 1.8 +++ cpanspec.spec 18 May 2006 19:35:59 -0000 1.9 @@ -1,17 +1,17 @@ Name: cpanspec -Version: 1.65 -Release: 2%{?dist} +Version: 1.66 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz -Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: /usr/bin/wget +Requires: /usr/bin/repoquery %description cpanspec generates spec files for Perl modules from CPAN for Fedora @@ -23,7 +23,6 @@ %prep %setup -q -%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -53,6 +52,11 @@ %{_mandir}/man1/* %changelog +* Thu May 18 2006 Steven Pritchard 1.66-1 +- Update to 1.66. +- Drop regex patch. +- cpanspec now uses repoquery. + * Thu May 04 2006 Steven Pritchard 1.65-2 - Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Apr 2006 21:23:42 -0000 1.8 +++ sources 18 May 2006 19:35:59 -0000 1.9 @@ -1 +1 @@ -cf3704304f5a4cb80f97881b72c2a6d3 cpanspec-1.65.tar.gz +fa269fb9c648edccaba4f16e4ec46d97 cpanspec-1.66.tar.gz --- cpanspec-1.65-regex.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 18 19:36:13 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:36:13 -0700 Subject: rpms/erlang/FC-5 .cvsignore, 1.5, 1.6 erlang.spec, 1.12, 1.13 otp-links.patch, 1.1, 1.2 sources, 1.5, 1.6 Message-ID: <200605181936.k4IJaG5r012592@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12564 Modified Files: .cvsignore erlang.spec otp-links.patch sources Log Message: new version R11B-0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 15:58:48 -0000 1.5 +++ .cvsignore 18 May 2006 19:36:13 -0000 1.6 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-10.tar.gz -otp_doc_man_R10B-10.tar.gz -otp_src_R10B-10.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/erlang.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- erlang.spec 3 May 2006 22:01:05 -0000 1.12 +++ erlang.spec 18 May 2006 19:36:13 -0000 1.13 @@ -1,19 +1,18 @@ Name: erlang -Version: R10B -Release: 10.3%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-glibc24.patch Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,13 +42,12 @@ %prep -%setup -q -n otp_src_R10B-10 -%patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -103,6 +101,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Wed May 3 2006 Gerard Milmeister - R10B-10.3 - added patch for run_erl by Knut-H??vard Aksnes otp-links.patch: Index: otp-links.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/otp-links.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-links.patch 18 May 2006 19:36:13 -0000 1.2 @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 15:58:48 -0000 1.5 +++ sources 18 May 2006 19:36:13 -0000 1.6 @@ -1,3 +1,3 @@ -d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz -207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz -c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:37:38 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 18 May 2006 12:37:38 -0700 Subject: owners owners.list,1.1018,1.1019 Message-ID: <200605181937.k4IJbelE012735@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12718 Modified Files: owners.list Log Message: Add galago-daemon Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1018 retrieving revision 1.1019 diff -u -r1.1018 -r1.1019 --- owners.list 18 May 2006 17:28:01 -0000 1.1018 +++ owners.list 18 May 2006 19:37:38 -0000 1.1019 @@ -325,6 +325,7 @@ 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|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|galago-daemon|Galago presence daemon|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|galculator|GTK 2 based scientific calculator|tmraz at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 19:41:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:41:36 -0700 Subject: rpms/erlang/FC-4 .cvsignore, 1.5, 1.6 erlang.spec, 1.8, 1.9 otp-links.patch, 1.1, 1.2 sources, 1.5, 1.6 Message-ID: <200605181941.k4IJfcgo012823@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12797 Modified Files: .cvsignore erlang.spec otp-links.patch sources Log Message: new version R11B-0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 08:56:45 -0000 1.5 +++ .cvsignore 18 May 2006 19:41:35 -0000 1.6 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-10.tar.gz -otp_doc_man_R10B-10.tar.gz -otp_src_R10B-10.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- erlang.spec 3 May 2006 22:01:04 -0000 1.8 +++ erlang.spec 18 May 2006 19:41:36 -0000 1.9 @@ -1,15 +1,15 @@ Name: erlang -Version: R10B -Release: 10.3%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch @@ -42,12 +42,12 @@ %prep -%setup -q -n otp_src_R10B-10 -%patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch5 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -101,6 +101,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Wed May 3 2006 Gerard Milmeister - R10B-10.3 - added patch for run_erl by Knut-H??vard Aksnes otp-links.patch: Index: otp-links.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/otp-links.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-links.patch 18 May 2006 19:41:36 -0000 1.2 @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 08:56:45 -0000 1.5 +++ sources 18 May 2006 19:41:36 -0000 1.6 @@ -1,3 +1,3 @@ -d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz -207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz -c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:42:51 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:42:51 -0700 Subject: rpms/erlang/devel .cvsignore, 1.5, 1.6 erlang.spec, 1.12, 1.13 otp-links.patch, 1.1, 1.2 sources, 1.5, 1.6 Message-ID: <200605181942.k4IJgr33012956@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12930 Modified Files: .cvsignore erlang.spec otp-links.patch sources Log Message: new version R11B-0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 15:58:48 -0000 1.5 +++ .cvsignore 18 May 2006 19:42:50 -0000 1.6 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-10.tar.gz -otp_doc_man_R10B-10.tar.gz -otp_src_R10B-10.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- erlang.spec 3 May 2006 22:01:07 -0000 1.12 +++ erlang.spec 18 May 2006 19:42:50 -0000 1.13 @@ -1,19 +1,18 @@ Name: erlang -Version: R10B -Release: 10.3%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch -Patch4: otp-glibc24.patch Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,13 +42,12 @@ %prep -%setup -q -n otp_src_R10B-10 -%patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -103,6 +101,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Wed May 3 2006 Gerard Milmeister - R10B-10.3 - added patch for run_erl by Knut-H??vard Aksnes otp-links.patch: Index: otp-links.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/otp-links.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-links.patch 18 May 2006 19:42:50 -0000 1.2 @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 15:58:48 -0000 1.5 +++ sources 18 May 2006 19:42:50 -0000 1.6 @@ -1,3 +1,3 @@ -d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz -207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz -c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:44:51 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:44:51 -0700 Subject: rpms/kphotoalbum - New directory Message-ID: <200605181944.k4IJirSg013099@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13077/kphotoalbum Log Message: Directory /cvs/extras/rpms/kphotoalbum added to the repository From fedora-extras-commits at redhat.com Thu May 18 19:44:51 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:44:51 -0700 Subject: rpms/kphotoalbum/devel - New directory Message-ID: <200605181944.k4IJir5D013103@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13077/kphotoalbum/devel Log Message: Directory /cvs/extras/rpms/kphotoalbum/devel added to the repository From fedora-extras-commits at redhat.com Thu May 18 19:45:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:45:03 -0700 Subject: rpms/kphotoalbum/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605181945.k4IJj5EL013165@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13128/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kphotoalbum --- NEW 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 May 18 19:45:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:45:03 -0700 Subject: rpms/kphotoalbum Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605181945.k4IJj5hd013162@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13128 Added Files: Makefile import.log Log Message: Setup of module kphotoalbum --- NEW FILE Makefile --- # Top level Makefile for module kphotoalbum all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 18 19:44:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:44:42 -0700 Subject: rpms/erlang/FC-3 otp-run_erl.patch, NONE, 1.1 otp-sslrpath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 erlang.spec, 1.4, 1.5 otp-links.patch, 1.1, 1.2 sources, 1.3, 1.4 Message-ID: <200605181945.k4IJjE4J013185@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13024 Modified Files: .cvsignore erlang.spec otp-links.patch sources Added Files: otp-run_erl.patch otp-sslrpath.patch Log Message: new version R11B-0 otp-run_erl.patch: --- NEW FILE otp-run_erl.patch --- --- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 +++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 @@ -42,6 +42,8 @@ #include #include #include +#include +#include #if !defined(NO_SYSLOG) #include #endif @@ -803,6 +805,7 @@ static int open_pty_master(char **ptyslave) { int mfd; + int sfd; char *major, *minor; static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; @@ -818,6 +821,15 @@ /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ { + static char ttyname[] = " "; + if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { + close(sfd); + *ptyslave = ttyname; + return mfd; + } + } + + { /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ static char ptyname[] = "/dev/pty/mX"; --- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 +++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 @@ -241,7 +241,7 @@ $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o + $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c otp-sslrpath.patch: --- NEW FILE otp-sslrpath.patch --- --- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100 +++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100 @@ -95,7 +95,7 @@ endif endif -CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ +CC_R_FLAG= ifeq ($(findstring @,$(CC_R_FLAG)),@) # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; # we try our best here instead... Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Oct 2005 22:34:14 -0000 1.3 +++ .cvsignore 18 May 2006 19:44:42 -0000 1.4 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-8.tar.gz -otp_doc_man_R10B-8.tar.gz -otp_src_R10B-8.tar.gz +otp_src_R11B-0.tar.gz +otp_doc_html_R11B-0.tar.gz +otp_doc_man_R11B-0.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-3/erlang.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- erlang.spec 29 Oct 2005 22:34:15 -0000 1.4 +++ erlang.spec 18 May 2006 19:44:42 -0000 1.5 @@ -1,21 +1,28 @@ Name: erlang -Version: R10B -Release: 8.2%{?dist} +Version: R11B +Release: 0.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-8.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-8.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-8.tar.gz -Patch: otp-links.patch +Source: http://www.erlang.org/download/otp_src_R11B-0.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R11B-0.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R11B-0.tar.gz +Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch +Patch3: otp-sslrpath.patch +Patch5: otp-run_erl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, openssl-devel, flex, unixODBC-devel -BuildRequires: tcl-devel, tk-devel + +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: unixODBC-devel +BuildRequires: tcl-devel +BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel +BuildRequires: flex Requires: tk @@ -35,10 +42,12 @@ %prep -%setup -q -n otp_src_R10B-8 -%patch -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n otp_src_R11B-0 +%patch0 -p1 -b .links +%patch1 -p1 -b .install +%patch2 -p1 -b .rpath +%patch3 -p1 -b .sslrpath +%patch5 -p1 -b .run_erl %build @@ -88,10 +97,13 @@ %post -%{_libdir}/erlang/Install -minimal %{_libdir}/erlang > /dev/null +%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null %changelog +* Thu May 18 2006 Gerard Milmeister - R11B-0.1 +- new version R11B-0 + * Sat Oct 29 2005 Gerard Milmeister - R10B-8.2 - updated rpath patch otp-links.patch: Index: otp-links.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-3/otp-links.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otp-links.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-links.patch 18 May 2006 19:44:42 -0000 1.2 @@ -1,17 +1,13 @@ ---- otp_src_R9C-0/Makefile.in.links 2003-10-17 12:49:41.000000000 +0200 -+++ otp_src_R9C-0/Makefile.in 2003-10-17 12:50:07.000000000 +0200 -@@ -505,14 +505,6 @@ - # Erlang base public files +--- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 ++++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 +@@ -545,10 +545,6 @@ + # Install erlang base public files # install.bin: -- rm -f $(BINDIR)/erl $(BINDIR)/erlc \ -- $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -- ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl -- ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc -- ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc -- ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink -- ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear -- ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done # # Directories needed before we can install Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Oct 2005 22:34:15 -0000 1.3 +++ sources 18 May 2006 19:44:42 -0000 1.4 @@ -1,3 +1,3 @@ -d4d3f448c311cd3fc3a44e06e4145bcb otp_doc_html_R10B-8.tar.gz -c0760f24ae789fda248e978430aefe38 otp_doc_man_R10B-8.tar.gz -75cd5ad53b66baad9ebc802b8a1f6043 otp_src_R10B-8.tar.gz +367d9d3ba979cd278b78d6d0393982ba otp_src_R11B-0.tar.gz +8d163f4d16c98ba2e979688842a55a9f otp_doc_html_R11B-0.tar.gz +172591538db42e81b814a77f30da4fa4 otp_doc_man_R11B-0.tar.gz From fedora-extras-commits at redhat.com Thu May 18 19:45:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:45:43 -0700 Subject: rpms/kphotoalbum import.log,1.1,1.2 Message-ID: <200605181946.k4IJkGjK013287@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249 Modified Files: import.log Log Message: auto-import kphotoalbum-2.2-1 on branch devel from kphotoalbum-2.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kphotoalbum/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 May 2006 19:45:02 -0000 1.1 +++ import.log 18 May 2006 19:45:43 -0000 1.2 @@ -0,0 +1 @@ +kphotoalbum-2_2-1:HEAD:kphotoalbum-2.2-1.src.rpm:1147981540 From fedora-extras-commits at redhat.com Thu May 18 19:45:44 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:45:44 -0700 Subject: rpms/kphotoalbum/devel kphotoalbum.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605181946.k4IJkGYJ013291@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/devel Modified Files: .cvsignore sources Added Files: kphotoalbum.spec Log Message: auto-import kphotoalbum-2.2-1 on branch devel from kphotoalbum-2.2-1.src.rpm --- NEW FILE kphotoalbum.spec --- Summary: KDE Photo Album Name: kphotoalbum Version: 2.2 Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.kphotoalbum.org/ Source: http://www.kphotoalbum.org/download/kphotoalbum-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: kimdaba < %{version} BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libkipi-devel BuildRequires: qt-devel BuildRequires: kdelibs-devel BuildRequires: exiv2-devel ## Optional, not strictly required. #Requires(hint): kipi-plugins %description A photo almbum tool. focuses on three key points: * It must be easy to describe a number of images at a time. * It must be easy to search for images. * It must be easy to browse and View the images. Can (optionally) use kipi-plugins %prep %setup -q -n %{name}-%{version}%{?beta} %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-rpath \ --disable-gcc-hidden-visibility \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependancy-tracking --disable-final make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category "X-Fedora" --vendor="" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do if [ -d $lang_dir ]; then lang=$(basename $lang_dir) echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang # replace absolute symlinks with relative ones pushd $lang_dir for i in *; do [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common done popd fi done fi %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files -f %{name}.lang %defattr(-,root,root) %doc ChangeLog COPYING README TODO %{_bindir}/* %{_datadir}/apps/kphotoalbum/ %{_datadir}/applications/kde/*.desktop %config %{_datadir}/config/*rc %{_datadir}/icons/hicolor/*/*/* %{_datadir}/mimelnk/*/*.desktop %changelog * Tue May 16 2006 Rex Dieter 2.2-1 - renamed kphotoalbum * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 2.1-6 - relative symlinks - simplify configure * Sat Oct 22 2005 Rex Dieter 2.1-4 - --add-category Application * Sat Oct 22 2005 Rex Dieter 2.1-3 - %%doc: COPYING - Req(post,postun): update-desktop-database - gtk-update-icon-cache - remove unused crud (kde-redhat bits) - Group: Applications/Multimedia - drop %%{?debug_package} conditionals * Sat Oct 22 2005 Rex Dieter 2.1-2 - icon/mime spec * Tue May 3 2005 Rex Dieter 2.1-1 - real-deal 2.1 release (including -i18n bits) * Mon May 2 2005 Rex Dieter 2.1-0 - 2.1 (pre) release * Mon Nov 15 2004 Rex Dieter 2.0-0.fdr.1 - 2.0 * Fri Feb 27 2004 Rex Dieter 0:1.1-0.fdr.0 - first try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kphotoalbum/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 May 2006 19:45:03 -0000 1.1 +++ .cvsignore 18 May 2006 19:45:44 -0000 1.2 @@ -0,0 +1 @@ +kphotoalbum-2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kphotoalbum/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 May 2006 19:45:03 -0000 1.1 +++ sources 18 May 2006 19:45:44 -0000 1.2 @@ -0,0 +1 @@ +0584b3d5f54d8a2e19cd7bc40967c026 kphotoalbum-2.2.tar.bz2 From fedora-extras-commits at redhat.com Thu May 18 19:46:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 18 May 2006 12:46:28 -0700 Subject: rpms/cpanspec/FC-5 .cvsignore, 1.8, 1.9 cpanspec.spec, 1.8, 1.9 sources, 1.8, 1.9 cpanspec-1.65-regex.patch, 1.1, NONE Message-ID: <200605181946.k4IJkUBF013340@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13286 Modified Files: .cvsignore cpanspec.spec sources Removed Files: cpanspec-1.65-regex.patch Log Message: Update to 1.66. Drop regex patch. cpanspec now uses repoquery. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Apr 2006 23:07:56 -0000 1.8 +++ .cvsignore 18 May 2006 19:46:28 -0000 1.9 @@ -1 +1 @@ -cpanspec-1.65.tar.gz +cpanspec-1.66.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cpanspec.spec 4 May 2006 16:36:13 -0000 1.8 +++ cpanspec.spec 18 May 2006 19:46:28 -0000 1.9 @@ -1,17 +1,17 @@ Name: cpanspec -Version: 1.65 -Release: 2%{?dist} +Version: 1.66 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz -Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: /usr/bin/wget +Requires: /usr/bin/repoquery %description cpanspec generates spec files for Perl modules from CPAN for Fedora @@ -23,7 +23,6 @@ %prep %setup -q -%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -53,6 +52,11 @@ %{_mandir}/man1/* %changelog +* Thu May 18 2006 Steven Pritchard 1.66-1 +- Update to 1.66. +- Drop regex patch. +- cpanspec now uses repoquery. + * Thu May 04 2006 Steven Pritchard 1.65-2 - Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Apr 2006 23:07:56 -0000 1.8 +++ sources 18 May 2006 19:46:28 -0000 1.9 @@ -1 +1 @@ -cf3704304f5a4cb80f97881b72c2a6d3 cpanspec-1.65.tar.gz +fa269fb9c648edccaba4f16e4ec46d97 cpanspec-1.66.tar.gz --- cpanspec-1.65-regex.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 18 19:48:00 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 18 May 2006 12:48:00 -0700 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.8, 1.9 cpanspec.spec, 1.8, 1.9 sources, 1.8, 1.9 cpanspec-1.65-regex.patch, 1.1, NONE Message-ID: <200605181948.k4IJm25O013432@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13411 Modified Files: .cvsignore cpanspec.spec sources Removed Files: cpanspec-1.65-regex.patch Log Message: Update to 1.66. Drop regex patch. cpanspec now uses repoquery. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Apr 2006 23:09:00 -0000 1.8 +++ .cvsignore 18 May 2006 19:47:59 -0000 1.9 @@ -1 +1 @@ -cpanspec-1.65.tar.gz +cpanspec-1.66.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cpanspec.spec 4 May 2006 16:37:46 -0000 1.8 +++ cpanspec.spec 18 May 2006 19:47:59 -0000 1.9 @@ -1,17 +1,17 @@ Name: cpanspec -Version: 1.65 -Release: 2%{?dist} +Version: 1.66 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools URL: http://cpanspec.sourceforge.net/ Source0: http://dl.sourceforge.net/cpanspec/cpanspec-%{version}.tar.gz -Patch0: cpanspec-1.65-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: /usr/bin/wget +Requires: /usr/bin/repoquery %description cpanspec generates spec files for Perl modules from CPAN for Fedora @@ -23,7 +23,6 @@ %prep %setup -q -%patch0 -p0 %build perl Build.PL installdirs=vendor @@ -53,6 +52,11 @@ %{_mandir}/man1/* %changelog +* Thu May 18 2006 Steven Pritchard 1.66-1 +- Update to 1.66. +- Drop regex patch. +- cpanspec now uses repoquery. + * Thu May 04 2006 Steven Pritchard 1.65-2 - Add cpanspec-1.65-regex.patch (fix broken regex, from 1.66 CVS). Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Apr 2006 23:09:00 -0000 1.8 +++ sources 18 May 2006 19:47:59 -0000 1.9 @@ -1 +1 @@ -cf3704304f5a4cb80f97881b72c2a6d3 cpanspec-1.65.tar.gz +fa269fb9c648edccaba4f16e4ec46d97 cpanspec-1.66.tar.gz --- cpanspec-1.65-regex.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 18 19:48:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:48:33 -0700 Subject: rpms/kphotoalbum/devel kphotoalbum.spec,1.1,1.2 Message-ID: <200605181948.k4IJmZnR013503@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kphotoalbum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13486 Modified Files: kphotoalbum.spec Log Message: * Thu May 18 2006 Rex Dieter 2.2-2 - (temporarily) add Provides: kimdaba = %version Index: kphotoalbum.spec =================================================================== RCS file: /cvs/extras/rpms/kphotoalbum/devel/kphotoalbum.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kphotoalbum.spec 18 May 2006 19:45:44 -0000 1.1 +++ kphotoalbum.spec 18 May 2006 19:48:33 -0000 1.2 @@ -2,7 +2,7 @@ Summary: KDE Photo Album Name: kphotoalbum Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: kimdaba < %{version} +Provides: kimdaba = %{version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -107,6 +108,9 @@ %changelog +* Thu May 18 2006 Rex Dieter 2.2-2 +- (temporarily) add Provides: kimdaba = %%version + * Tue May 16 2006 Rex Dieter 2.2-1 - renamed kphotoalbum From fedora-extras-commits at redhat.com Thu May 18 19:48:38 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 12:48:38 -0700 Subject: rpms/erlang-esdl/FC-5 esdl-refc.patch, NONE, 1.1 erlang-esdl.spec, 1.2, 1.3 Message-ID: <200605181948.k4IJmew8013563@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang-esdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13538 Modified Files: erlang-esdl.spec Added Files: esdl-refc.patch Log Message: rebuilt esdl-refc.patch: --- NEW FILE esdl-refc.patch --- --- esdl-0.95.0630/c_src/esdl_driver.c.refc 2006-05-18 21:31:41.000000000 +0200 +++ esdl-0.95.0630/c_src/esdl_driver.c 2006-05-18 21:33:02.000000000 +0200 @@ -224,7 +224,7 @@ return sdl_getbuff(sd, size); } else { ErlDrvBinary* bin = (ErlDrvBinary *) sd->temp_bin; - bin->refc++; + driver_binary_inc_refc(bin); sd->buff = bin; sd->len = size; return bin->orig_bytes; @@ -253,7 +253,7 @@ sd->bin[i].base = ev->iov[1].iov_base; sd->bin[i].size = ev->iov[1].iov_len; bin = ev->binv[1]; - bin->refc++; /* Otherwise it could get deallocated */ + driver_binary_inc_refc(bin); sd->bin[i].bin = bin; sd->next_bin++; } Index: erlang-esdl.spec =================================================================== RCS file: /cvs/extras/rpms/erlang-esdl/FC-5/erlang-esdl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- erlang-esdl.spec 25 Apr 2006 21:34:08 -0000 1.2 +++ erlang-esdl.spec 18 May 2006 19:48:38 -0000 1.3 @@ -1,12 +1,13 @@ Name: erlang-esdl Version: 0.95.0630 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Erlang OpenGL/SDL api and utilities Group: Development/Libraries License: Distributable URL: http://esdl.sourceforge.net Source: http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz +Patch0: esdl-refc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: libGL-devel @@ -32,6 +33,7 @@ %prep %setup -q -n esdl-%{version} +%patch0 -p1 -b .refc perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile find . -name '*.c' -or -name '*.h' | xargs chmod 0644 @@ -76,6 +78,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.95.0630-6 +- rebuilt for erlang R11B-0 + * Tue Apr 25 2006 Gerard Milmeister - 0.95.0630-4 - removed c_src directory From fedora-extras-commits at redhat.com Thu May 18 19:50:23 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 May 2006 12:50:23 -0700 Subject: owners owners.list,1.1019,1.1020 Message-ID: <200605181950.k4IJoPe6013700@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13679 Modified Files: owners.list Log Message: +kphotoalbum Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1019 retrieving revision 1.1020 diff -u -r1.1019 -r1.1020 --- owners.list 18 May 2006 19:37:38 -0000 1.1019 +++ owners.list 18 May 2006 19:50:23 -0000 1.1020 @@ -586,6 +586,7 @@ 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|dennis at ausil.us|extras-qa at fedoraproject.org| +Fedora Extras|kphotoalbum|KDE Photo Album|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org| Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 20:14:15 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 18 May 2006 13:14:15 -0700 Subject: rpms/xfce4-appfinder/devel xfce4-appfinder-4.2.3-infocrash.patch, NONE, 1.1 xfce4-appfinder.spec, 1.6, 1.7 Message-ID: <200605182014.k4IKEHF9016683@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-appfinder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16663 Modified Files: xfce4-appfinder.spec Added Files: xfce4-appfinder-4.2.3-infocrash.patch Log Message: Add patch to fix crash in information selection (fixes #192195) xfce4-appfinder-4.2.3-infocrash.patch: --- NEW FILE xfce4-appfinder-4.2.3-infocrash.patch --- diff -ruN xfce4-appfinder-4.2.3.orig/src/callbacks.c xfce4-appfinder-4.2.3/src/callbacks.c --- xfce4-appfinder-4.2.3.orig/src/callbacks.c 2005-11-05 18:04:23.000000000 +0100 +++ xfce4-appfinder-4.2.3/src/callbacks.c 2006-05-18 12:05:05.000000000 +0200 @@ -266,7 +266,7 @@ xfce_desktop_entry_get_string (dentry, _("Comment"), TRUE, &comment); if (!comment) { - comment = _("N/A"); + comment = g_strdup( _("N/A") ); } dlg->comment = gtk_label_new(NULL); @@ -280,7 +280,7 @@ xfce_desktop_entry_get_string (dentry, "Categories", TRUE, &cats); if (!cats) { - cats = _("N/A"); + cats = g_strdup( _("N/A") ); } else { @@ -300,7 +300,7 @@ xfce_desktop_entry_get_string (dentry, "Exec", TRUE, &exec); if (!exec) { - exec = _("N/A"); + exec = g_strdup( _("N/A") ); } dlg->exec = gtk_label_new(NULL); gtk_label_set_markup (GTK_LABEL(dlg->exec), g_strconcat(_("Command: "), exec, NULL)); Index: xfce4-appfinder.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce4-appfinder.spec 17 Feb 2006 00:24:16 -0000 1.6 +++ xfce4-appfinder.spec 18 May 2006 20:14:15 -0000 1.7 @@ -1,10 +1,11 @@ Summary: Appfinder for the Xfce4 Desktop Environment Name: xfce4-appfinder Version: 4.2.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-appfinder-4.2.3.tar.gz +Patch0: xfce4-appfinder-4.2.3-infocrash.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libxfcegui4 >= 4.2.3 @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p1 -b .infocrash %build %configure @@ -42,6 +44,9 @@ %{_datadir}/xfce4/doc/he %changelog +* Thu May 18 2006 Kevin Fenzi - 4.2.3-3 +- Add patch to fix crash in information selection (fixes #192195) + * Thu Feb 16 2006 Kevin Fenzi - 4.2.3-2.fc5 - Rebuild for fc5 From fedora-extras-commits at redhat.com Thu May 18 20:20:22 2006 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 18 May 2006 13:20:22 -0700 Subject: owners owners.list,1.1020,1.1021 Message-ID: <200605182020.k4IKKOCG016782@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16765/owners Modified Files: owners.list Log Message: add scrip Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1020 retrieving revision 1.1021 diff -u -r1.1020 -r1.1021 --- owners.list 18 May 2006 19:50:23 -0000 1.1020 +++ owners.list 18 May 2006 20:20:22 -0000 1.1021 @@ -1482,6 +1482,7 @@ Fedora Extras|scribes|A sleek, simple, and powerful text editor for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org|mystilleef at gmail.com Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|scribus-templates|This package includes additional templates for Scribus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|scrip|Spherical Coordinate Remapping and Interpolation Package|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 18 20:40:11 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 18 May 2006 13:40:11 -0700 Subject: rpms/xfce4-appfinder/FC-5 xfce4-appfinder-4.2.3-infocrash.patch, NONE, 1.1 xfce4-appfinder.spec, 1.6, 1.7 Message-ID: <200605182040.k4IKeDHe017082@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/xfce4-appfinder/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17062 Modified Files: xfce4-appfinder.spec Added Files: xfce4-appfinder-4.2.3-infocrash.patch Log Message: Add patch to fix crash in information selection (fixes #192195) xfce4-appfinder-4.2.3-infocrash.patch: --- NEW FILE xfce4-appfinder-4.2.3-infocrash.patch --- diff -ruN xfce4-appfinder-4.2.3.orig/src/callbacks.c xfce4-appfinder-4.2.3/src/callbacks.c --- xfce4-appfinder-4.2.3.orig/src/callbacks.c 2005-11-05 18:04:23.000000000 +0100 +++ xfce4-appfinder-4.2.3/src/callbacks.c 2006-05-18 12:05:05.000000000 +0200 @@ -266,7 +266,7 @@ xfce_desktop_entry_get_string (dentry, _("Comment"), TRUE, &comment); if (!comment) { - comment = _("N/A"); + comment = g_strdup( _("N/A") ); } dlg->comment = gtk_label_new(NULL); @@ -280,7 +280,7 @@ xfce_desktop_entry_get_string (dentry, "Categories", TRUE, &cats); if (!cats) { - cats = _("N/A"); + cats = g_strdup( _("N/A") ); } else { @@ -300,7 +300,7 @@ xfce_desktop_entry_get_string (dentry, "Exec", TRUE, &exec); if (!exec) { - exec = _("N/A"); + exec = g_strdup( _("N/A") ); } dlg->exec = gtk_label_new(NULL); gtk_label_set_markup (GTK_LABEL(dlg->exec), g_strconcat(_("Command: "), exec, NULL)); Index: xfce4-appfinder.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-5/xfce4-appfinder.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xfce4-appfinder.spec 17 Feb 2006 00:24:16 -0000 1.6 +++ xfce4-appfinder.spec 18 May 2006 20:40:11 -0000 1.7 @@ -1,10 +1,11 @@ Summary: Appfinder for the Xfce4 Desktop Environment Name: xfce4-appfinder Version: 4.2.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-appfinder-4.2.3.tar.gz +Patch0: xfce4-appfinder-4.2.3-infocrash.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libxfcegui4 >= 4.2.3 @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p1 -b .infocrash %build %configure @@ -42,6 +44,9 @@ %{_datadir}/xfce4/doc/he %changelog +* Thu May 18 2006 Kevin Fenzi - 4.2.3-3 +- Add patch to fix crash in information selection (fixes #192195) + * Thu Feb 16 2006 Kevin Fenzi - 4.2.3-2.fc5 - Rebuild for fc5 From fedora-extras-commits at redhat.com Thu May 18 20:42:42 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 18 May 2006 13:42:42 -0700 Subject: rpms/drgeo import.log,1.10,1.11 Message-ID: <200605182042.k4IKgi62017204@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/drgeo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17173 Modified Files: import.log Log Message: auto-import drgeo-1.1.0-8 on branch devel from drgeo-1.1.0-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/drgeo/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 14 Feb 2006 21:45:59 -0000 1.10 +++ import.log 18 May 2006 20:42:42 -0000 1.11 @@ -7,3 +7,4 @@ drgeo-1_1_0-4:FC-4:drgeo-1.1.0-4.src.rpm:1131042012 drgeo-1_1_0-6:HEAD:drgeo-1.1.0-6.src.rpm:1139600901 drgeo-1_1_0-7:HEAD:drgeo-1.1.0-7.src.rpm:1139953549 +drgeo-1_1_0-8:HEAD:drgeo-1.1.0-8.src.rpm:1147984990 From fedora-extras-commits at redhat.com Thu May 18 20:42:43 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 18 May 2006 13:42:43 -0700 Subject: rpms/drgeo/devel drgeo.spec,1.6,1.7 Message-ID: <200605182042.k4IKgjp7017208@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/drgeo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17173/devel Modified Files: drgeo.spec Log Message: auto-import drgeo-1.1.0-8 on branch devel from drgeo-1.1.0-8.src.rpm Index: drgeo.spec =================================================================== RCS file: /cvs/extras/rpms/drgeo/devel/drgeo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- drgeo.spec 14 Feb 2006 21:46:05 -0000 1.6 +++ drgeo.spec 18 May 2006 20:42:43 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Interactive educational geometry software Name: drgeo Version: 1.1.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Engineering URL: http://www.ofset.org/drgeo @@ -61,6 +61,9 @@ %{_datadir}/applications/fedora-drgeo.desktop %changelog +* Tue May 18 2006 Eric Tanguy - 1.1.0-8 +- Rebuild for devel + * Tue Feb 14 2006 Eric Tanguy - 1.1.0-7 - Rebuild for FC5 From fedora-extras-commits at redhat.com Thu May 18 20:56:23 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 May 2006 13:56:23 -0700 Subject: rpms/dvb-apps/devel dvb-apps.spec,1.5,1.6 Message-ID: <200605182056.k4IKuPH6017513@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17496 Modified Files: dvb-apps.spec Log Message: * Thu May 18 2006 Ville Skytt?? - 1.1.1-4 - Include ATSC initial tuning data files. Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dvb-apps.spec 18 May 2006 00:40:30 -0000 1.5 +++ dvb-apps.spec 18 May 2006 20:56:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -34,6 +34,7 @@ cd .. rm -rf include install -pm 644 %{SOURCE2} COPYING +sed -i -e 's/\r//' util/scan/atsc/us-NY-TWC-NYC %build @@ -55,7 +56,7 @@ 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} +cp -pR scan/dvb-? scan/atsc $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 .. @@ -73,6 +74,9 @@ %changelog +* Thu May 18 2006 Ville Skytt?? - 1.1.1-4 +- Include ATSC initial tuning data files. + * Thu May 18 2006 David Woodhouse - 1.1.1-2 - Rebuild (to unfix kernel-headers on older distros) From fedora-extras-commits at redhat.com Thu May 18 20:58:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 May 2006 13:58:10 -0700 Subject: rpms/dvb-apps/FC-4 dvb-apps.spec,1.3,1.4 Message-ID: <200605182058.k4IKwgc8017570@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17538/FC-4 Modified Files: dvb-apps.spec Log Message: * Thu May 18 2006 Ville Skytt?? - 1.1.1-3 - Reintroduce versioned glibc-kernheaders BR for explicitness. - Include ATSC initial tuning data files. Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-4/dvb-apps.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dvb-apps.spec 18 May 2006 00:37:23 -0000 1.3 +++ dvb-apps.spec 18 May 2006 20:58:10 -0000 1.4 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel +BuildRequires: glibc-kernheaders >= 2.4-9.1.94 %description %{summary}. @@ -33,6 +34,7 @@ cd .. rm -rf include install -pm 644 %{SOURCE2} COPYING +sed -i -e 's/\r//' util/scan/atsc/us-NY-TWC-NYC %build @@ -54,7 +56,7 @@ 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} +cp -pR scan/dvb-? scan/atsc $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 .. @@ -72,6 +74,10 @@ %changelog +* Thu May 18 2006 Ville Skytt?? - 1.1.1-3 +- Reintroduce versioned glibc-kernheaders BR for explicitness. +- Include ATSC initial tuning data files. + * Thu May 18 2006 David Woodhouse - 1.1.1-2 - Remove kernel-headers BR From fedora-extras-commits at redhat.com Thu May 18 20:58:10 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 May 2006 13:58:10 -0700 Subject: rpms/dvb-apps/FC-5 dvb-apps.spec,1.5,1.6 Message-ID: <200605182058.k4IKwg9g017573@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17538/FC-5 Modified Files: dvb-apps.spec Log Message: * Thu May 18 2006 Ville Skytt?? - 1.1.1-3 - Reintroduce versioned glibc-kernheaders BR for explicitness. - Include ATSC initial tuning data files. Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/FC-5/dvb-apps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dvb-apps.spec 18 May 2006 00:35:22 -0000 1.5 +++ dvb-apps.spec 18 May 2006 20:58:10 -0000 1.6 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel +BuildRequires: glibc-kernheaders >= 2.4-9.1.94 %description %{summary}. @@ -33,6 +34,7 @@ cd .. rm -rf include install -pm 644 %{SOURCE2} COPYING +sed -i -e 's/\r//' util/scan/atsc/us-NY-TWC-NYC %build @@ -54,7 +56,7 @@ 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} +cp -pR scan/dvb-? scan/atsc $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 .. @@ -72,6 +74,10 @@ %changelog +* Thu May 18 2006 Ville Skytt?? - 1.1.1-3 +- Reintroduce versioned glibc-kernheaders BR for explicitness. +- Include ATSC initial tuning data files. + * Thu May 18 2006 David Woodhouse - 1.1.1-2 - Remove kernel-headers BR From fedora-extras-commits at redhat.com Thu May 18 21:19:38 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:19:38 -0700 Subject: rpms/erlang-esdl/devel esdl-refc.patch, NONE, 1.1 erlang-esdl.spec, 1.1, 1.2 Message-ID: <200605182119.k4ILJel5020042@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang-esdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19989/devel Modified Files: erlang-esdl.spec Added Files: esdl-refc.patch Log Message: rebuilt esdl-refc.patch: --- NEW FILE esdl-refc.patch --- --- esdl-0.95.0630/c_src/esdl_driver.c.refc 2006-05-18 21:31:41.000000000 +0200 +++ esdl-0.95.0630/c_src/esdl_driver.c 2006-05-18 21:33:02.000000000 +0200 @@ -224,7 +224,7 @@ return sdl_getbuff(sd, size); } else { ErlDrvBinary* bin = (ErlDrvBinary *) sd->temp_bin; - bin->refc++; + driver_binary_inc_refc(bin); sd->buff = bin; sd->len = size; return bin->orig_bytes; @@ -253,7 +253,7 @@ sd->bin[i].base = ev->iov[1].iov_base; sd->bin[i].size = ev->iov[1].iov_len; bin = ev->binv[1]; - bin->refc++; /* Otherwise it could get deallocated */ + driver_binary_inc_refc(bin); sd->bin[i].bin = bin; sd->next_bin++; } Index: erlang-esdl.spec =================================================================== RCS file: /cvs/extras/rpms/erlang-esdl/devel/erlang-esdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- erlang-esdl.spec 25 Apr 2006 16:54:12 -0000 1.1 +++ erlang-esdl.spec 18 May 2006 21:19:38 -0000 1.2 @@ -1,18 +1,19 @@ Name: erlang-esdl Version: 0.95.0630 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Erlang OpenGL/SDL api and utilities Group: Development/Libraries License: Distributable URL: http://esdl.sourceforge.net Source: http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz +Patch0: esdl-refc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel -BuildRequires: erlang -Requires: erlang +BuildRequires: erlang >= R11B +Requires: erlang >= R11B Provides: esdl = %{version}-%{release} @@ -32,6 +33,7 @@ %prep %setup -q -n esdl-%{version} +%patch0 -p1 -b .refc perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile find . -name '*.c' -or -name '*.h' | xargs chmod 0644 @@ -76,6 +78,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.95.0630-6 +- rebuilt for erlang R11B-0 + * Tue Apr 25 2006 Gerard Milmeister - 0.95.0630-4 - removed c_src directory From fedora-extras-commits at redhat.com Thu May 18 21:19:32 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:19:32 -0700 Subject: rpms/erlang-esdl/FC-4 esdl-refc.patch, NONE, 1.1 erlang-esdl.spec, 1.1, 1.2 Message-ID: <200605182120.k4ILK4KE020047@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang-esdl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19989/FC-4 Modified Files: erlang-esdl.spec Added Files: esdl-refc.patch Log Message: rebuilt esdl-refc.patch: --- NEW FILE esdl-refc.patch --- --- esdl-0.95.0630/c_src/esdl_driver.c.refc 2006-05-18 21:31:41.000000000 +0200 +++ esdl-0.95.0630/c_src/esdl_driver.c 2006-05-18 21:33:02.000000000 +0200 @@ -224,7 +224,7 @@ return sdl_getbuff(sd, size); } else { ErlDrvBinary* bin = (ErlDrvBinary *) sd->temp_bin; - bin->refc++; + driver_binary_inc_refc(bin); sd->buff = bin; sd->len = size; return bin->orig_bytes; @@ -253,7 +253,7 @@ sd->bin[i].base = ev->iov[1].iov_base; sd->bin[i].size = ev->iov[1].iov_len; bin = ev->binv[1]; - bin->refc++; /* Otherwise it could get deallocated */ + driver_binary_inc_refc(bin); sd->bin[i].bin = bin; sd->next_bin++; } Index: erlang-esdl.spec =================================================================== RCS file: /cvs/extras/rpms/erlang-esdl/FC-4/erlang-esdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- erlang-esdl.spec 25 Apr 2006 16:54:12 -0000 1.1 +++ erlang-esdl.spec 18 May 2006 21:19:32 -0000 1.2 @@ -1,18 +1,19 @@ Name: erlang-esdl Version: 0.95.0630 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Erlang OpenGL/SDL api and utilities Group: Development/Libraries License: Distributable URL: http://esdl.sourceforge.net Source: http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz +Patch0: esdl-refc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel -BuildRequires: erlang -Requires: erlang +BuildRequires: erlang >= R11B +Requires: erlang >= R11B Provides: esdl = %{version}-%{release} @@ -32,6 +33,7 @@ %prep %setup -q -n esdl-%{version} +%patch0 -p1 -b .refc perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile find . -name '*.c' -or -name '*.h' | xargs chmod 0644 @@ -76,6 +78,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.95.0630-6 +- rebuilt for erlang R11B-0 + * Tue Apr 25 2006 Gerard Milmeister - 0.95.0630-4 - removed c_src directory From fedora-extras-commits at redhat.com Thu May 18 21:19:32 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:19:32 -0700 Subject: rpms/erlang-esdl/FC-5 erlang-esdl.spec,1.3,1.4 Message-ID: <200605182120.k4ILK4vx020050@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang-esdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19989/FC-5 Modified Files: erlang-esdl.spec Log Message: rebuilt Index: erlang-esdl.spec =================================================================== RCS file: /cvs/extras/rpms/erlang-esdl/FC-5/erlang-esdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- erlang-esdl.spec 18 May 2006 19:48:38 -0000 1.3 +++ erlang-esdl.spec 18 May 2006 21:19:32 -0000 1.4 @@ -12,8 +12,8 @@ BuildRequires: SDL-devel BuildRequires: libGL-devel BuildRequires: libGLU-devel -BuildRequires: erlang -Requires: erlang +BuildRequires: erlang >= R11B +Requires: erlang >= R11B Provides: esdl = %{version}-%{release} From fedora-extras-commits at redhat.com Thu May 18 21:30:34 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:30:34 -0700 Subject: rpms/wings/FC-4 wings.spec,1.1,1.2 Message-ID: <200605182130.k4ILUa3s020263@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218/FC-4 Modified Files: wings.spec Log Message: rebuilt Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/FC-4/wings.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wings.spec 28 Apr 2006 08:03:26 -0000 1.1 +++ wings.spec 18 May 2006 21:30:34 -0000 1.2 @@ -1,6 +1,6 @@ Name: wings Version: 0.98.32b -Release: 5%{?dist} +Release: 7%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -108,6 +108,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.98.32b-7 +- rebuilt for erlang R11B + * Thu Apr 27 2006 Gerard Milmeister - 0.98.32b-5 - split off docs package From fedora-extras-commits at redhat.com Thu May 18 21:30:35 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:30:35 -0700 Subject: rpms/wings/FC-5 wings.spec,1.2,1.3 Message-ID: <200605182130.k4ILUbWd020267@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218/FC-5 Modified Files: wings.spec Log Message: rebuilt Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/FC-5/wings.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wings.spec 28 Apr 2006 19:05:19 -0000 1.2 +++ wings.spec 18 May 2006 21:30:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: wings Version: 0.98.32b -Release: 6%{?dist} +Release: 7%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -108,6 +108,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.98.32b-7 +- rebuilt for erlang R11B + * Thu Apr 27 2006 Gerard Milmeister - 0.98.32b-5 - split off docs package From fedora-extras-commits at redhat.com Thu May 18 21:30:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 May 2006 14:30:36 -0700 Subject: rpms/wings/devel wings.spec,1.1,1.2 Message-ID: <200605182130.k4ILUcUH020271@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/wings/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218/devel Modified Files: wings.spec Log Message: rebuilt Index: wings.spec =================================================================== RCS file: /cvs/extras/rpms/wings/devel/wings.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wings.spec 28 Apr 2006 08:03:26 -0000 1.1 +++ wings.spec 18 May 2006 21:30:36 -0000 1.2 @@ -1,6 +1,6 @@ Name: wings Version: 0.98.32b -Release: 5%{?dist} +Release: 7%{?dist} Summary: 3D Subdivision Modeler Group: Applications/Multimedia @@ -108,6 +108,9 @@ %changelog +* Thu May 18 2006 Gerard Milmeister - 0.98.32b-7 +- rebuilt for erlang R11B + * Thu Apr 27 2006 Gerard Milmeister - 0.98.32b-5 - split off docs package From fedora-extras-commits at redhat.com Thu May 18 22:33:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 18 May 2006 15:33:05 -0700 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.18,1.19 Message-ID: <200605182233.k4IMX7MB022924@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-serv22907 Modified Files: perl-Module-Build.spec Log Message: Take input from /dev/zero during "Build test" to avoid test failure. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Module-Build.spec 17 May 2006 19:33:47 -0000 1.18 +++ perl-Module-Build.spec 18 May 2006 22:33:05 -0000 1.19 @@ -2,7 +2,7 @@ Name: perl-Module-Build Version: 0.2800 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,7 +48,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -./Build test +# 0.28 builds fail in the build system due +# to no stdin in t/extend, so we cheat. +./Build test < /dev/zero %clean rm -rf $RPM_BUILD_ROOT @@ -62,6 +64,9 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Thu May 18 2006 Steven Pritchard 0.2800-2 +- Take input from /dev/zero during "Build test" to avoid test failure. + * Wed May 17 2006 Steven Pritchard 0.2800-1 - Update to 0.28, but call it 0.2800 to avoid an epoch bump. - Various spec cleanups to closer match cpanspec output. From fedora-extras-commits at redhat.com Thu May 18 22:49:38 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Thu, 18 May 2006 15:49:38 -0700 Subject: fedora-security/audit fe4,1.26,1.27 fe5,1.23,1.24 Message-ID: <200605182249.k4IMncw8023032@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23010 Modified Files: fe4 fe5 Log Message: libnasl fix for nessus pushed Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- fe4 18 May 2006 12:41:44 -0000 1.26 +++ fe4 18 May 2006 22:49:36 -0000 1.27 @@ -8,7 +8,7 @@ CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190614 -CVE-2006-2093 VULNERABLE (nessus) bz#191053 +CVE-2006-2093 version (nessus, fixed 2.2.7) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) CVE-2006-1989 version (clamav, fixed 0.88.2) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fe5 18 May 2006 11:45:48 -0000 1.23 +++ fe5 18 May 2006 22:49:36 -0000 1.24 @@ -7,7 +7,7 @@ CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 CVE-2006-2162 VULNERABLE (nagios) bz#190612 -CVE-2006-2093 VULNERABLE (nessus) bz#191053 +CVE-2006-2093 version (nessus, fixed 2.2.7) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) CVE-2006-1989 version (clamav, fixed 0.88.2) From fedora-extras-commits at redhat.com Thu May 18 22:59:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 18 May 2006 15:59:39 -0700 Subject: rpms/wine/FC-5 wine.spec,1.26,1.27 Message-ID: <200605182259.k4IMxfOv023115@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23098 Modified Files: wine.spec Log Message: - enable hal/dbus support Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- wine.spec 16 May 2006 20:51:51 -0000 1.26 +++ wine.spec 18 May 2006 22:59:38 -0000 1.27 @@ -2,7 +2,7 @@ Name: wine Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -52,12 +52,13 @@ BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: libXxf86dga-devel libXxf86vm-devel BuildRequires: libXrandr-devel libXrender-devel libXext-devel - BuildRequires: fontconfig-devel BuildRequires: giflib-devel BuildRequires: cups-devel BuildRequires: libXmu-devel BuildRequires: libXi-devel +# dbus/hal >= FC5 +BuildRequires: dbus-devel hal-devel Requires: %{_bindir}/xmessage @@ -654,6 +655,10 @@ %{_libdir}/wine/*.def %changelog +* Fri May 19 2006 Andreas Bierfert +0.9.13-2 +- enable dbus/hal support + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Fri May 19 00:18:46 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 May 2006 17:18:46 -0700 Subject: extras-buildsys/utils extras-push-new,1.10,1.11 Message-ID: <200605190018.k4J0IkCL027978@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27960 Modified Files: extras-push-new Log Message: - Add code which prunes old unwanted builds from the needsign queue prior to pushing. - Turn DEBUG on again, although I'm confident this works. Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- extras-push-new 17 May 2006 09:58:53 -0000 1.10 +++ extras-push-new 19 May 2006 00:18:43 -0000 1.11 @@ -15,13 +15,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import fcntl +import fcntl, fnmatch import os, sys import rpmUtils import shutil import string -DEBUG = False +DEBUG = True signersgid = 100581 # extras_signers group @@ -47,15 +47,15 @@ """ smtp_server = '' -config = { 'repoview' : True, - 'repoclosure' : False, - 'gidcheck' : True, - 'setumask' : True, - 'signkeycheck' : True, - 'mail' : True, - 'doublesync' : False, - 'force' : False - } +class opts: + repoview = True + repoclosure = False + gidcheck = True + setumask = True + signkeycheck = True + mail = True + doublesync = False + force = False alldists = [ 'development', '5', '4', '3' ] @@ -158,6 +158,69 @@ # ==================================================================== + +def find_srcrpms(rootpath): + """returns a list of source rpm path names in given tree""" + srcrpms = [] + if not os.path.isdir(rootpath): + return srcrpms + for root, dirs, files in os.walk(rootpath): + for f in fnmatch.filter(files,'*.src.rpm'): + srcrpms.append(os.path.join(root,f)) + return srcrpms + + +def prune_needsign_tree(repodir): + # The root dir contains a directory for every pushed package "name". + pkgnames = os.listdir(repodir) + try: + pkgnames.remove('repodata') + except: + pass + + for name in pkgnames: + pkgroot = os.path.join(repodir,name) + if not os.path.isdir(pkgroot): + continue + # Every version-release is stored in an own sub-dir. + pkgreldirs = os.listdir(pkgroot) + debugprint( '%s releases for %s: %s' % (len(pkgreldirs),name,' '.join(pkgreldirs)) ) + if len(pkgreldirs) < 2: # only one release + continue + # We assume this release to be the newest. + relroot = os.path.join(pkgroot,pkgreldirs[0]) + # There can be only one src.rpm in this dir, since relroot + # and src.rpm filename are unique (due to NVR). + srcrpms = find_srcrpms(relroot) + # Currently, directories can be empty though, unless we clean up + # the repodir regularly. + if not len(srcrpms): + continue + srcrpm = srcrpms[0] + (n,a,e,v,r) = naevr(srcrpm) + # Now compare with the other releases. + for vr in pkgreldirs[1:]: + nextrelroot = os.path.join(pkgroot,vr) + nextsrcrpms = find_srcrpms(nextrelroot) + if not len(nextsrcrpms): + continue + nextsrcrpm = nextsrcrpms[0] + (nextn,nexta,nexte,nextv,nextr) = naevr(nextsrcrpm) + # 1 means: e,v,r is higher than nexte,nextv,nextr + if rpmUtils.miscutils.compareEVR((e,v,r),(nexte,nextv,nextr)) == 1: + debugprint('Removing: %s' % nextrelroot) + if not DEBUG: + shutil.rmtree(nextrelroot) + else: + debugprint('Removing: %s' % relroot) + if not DEBUG: + shutil.rmtree(relroot) + # Make this the next newest package for ongoing comparison. + relroot = nextrelroot + (n,a,e,v,r) = (nextn,nexta,nexte,nextv,nextr) + + +# ==================================================================== # (previously in extras-sign-move.py) # get the path to where to look for the packages to be signed @@ -251,6 +314,7 @@ distdir = '%s-%s-%s' % (distro, dist, project) needsign = os.path.join(stagesdir, distdir) + #prune_needsign_tree(needsign) files = find_files(needsign) rpms = files['rpm'] + files['srpm'] + files['debuginfo'] rpms.sort() @@ -417,22 +481,22 @@ # ==================================================================== if __name__ == '__main__': - if config['gidcheck']: + if opts.gidcheck: if os.getgid() != signersgid: print 'ERROR: Change into extras_signers group before running this! Use "newgrp extras_signers".' sys.exit(13) - if config['signkeycheck']: + if opts.signkeycheck: if 'extras at fedoraproject.org' != os.popen('rpm --eval %_gpg_name','r').read().rstrip(): print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!' sys.exit(13) - if config['setumask']: + if opts.setumask: os.umask(0002) if '-f' in sys.argv[1:]: sys.argv.remove('-f') - config['force'] = True + opts.force = True if len(sys.argv) < 2: print 'SYNTAX: %s [dist]...' % sys.argv[0] @@ -453,7 +517,7 @@ # If we are called as 'extras-sign-move.py' we simulate old # behaviour and only do: sign, move, repobuild, sync if sys.argv[0].endswith('extras-sign-move.py'): - config['repoview'] = False + opts.repoview = False if not os.path.exists(rundir): os.makedirs(rundir) @@ -470,27 +534,27 @@ # Option -f re-runs repobuild/repoview for all dists, even if # no new packages have been pushed for a dist. changed = dists - if config['force']: + if opts.force: changed = alldists # len(getlinesfromrunfile(dist)) is the number of packages # per dist which have been pushed. for dist in changed: - if config['force'] or len( getlinesfromrunfile(dist) ): + if opts.force or len( getlinesfromrunfile(dist) ): run_and_check('extras-repobuild.py %s' % dist) - if config['doublesync']: + if opts.doublesync: run_and_check('extras-sync') for dist in changed: - if config['force'] or len( getlinesfromrunfile(dist) ): - if config['repoview']: + if opts.force or len( getlinesfromrunfile(dist) ): + if opts.repoview: run_and_check('extras-repoview.py %s' % dist) run_and_check('extras-sync') - if config['mail']: + if opts.mail: for dist in dists: email_list( getlinesfromrunfile(dist), dist ) emptyrunfile(dist) From fedora-extras-commits at redhat.com Fri May 19 00:20:59 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 May 2006 17:20:59 -0700 Subject: extras-buildsys/utils extras-push-new,1.11,1.12 Message-ID: <200605190020.k4J0KxWZ028008@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27990 Modified Files: extras-push-new Log Message: enable prune feature Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- extras-push-new 19 May 2006 00:18:43 -0000 1.11 +++ extras-push-new 19 May 2006 00:20:57 -0000 1.12 @@ -314,7 +314,7 @@ distdir = '%s-%s-%s' % (distro, dist, project) needsign = os.path.join(stagesdir, distdir) - #prune_needsign_tree(needsign) + prune_needsign_tree(needsign) files = find_files(needsign) rpms = files['rpm'] + files['srpm'] + files['debuginfo'] rpms.sort() From fedora-extras-commits at redhat.com Fri May 19 01:01:16 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Thu, 18 May 2006 18:01:16 -0700 Subject: kadischi kadischi.spec,1.4,1.5 Message-ID: <200605190101.k4J11GeW030411@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30375/kadischi Modified Files: kadischi.spec Log Message: Bump version in spec for FC4 compatibility and new ks cfg files Index: kadischi.spec =================================================================== RCS file: /cvs/devel/kadischi/kadischi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kadischi.spec 13 Apr 2006 09:45:45 -0000 1.4 +++ kadischi.spec 19 May 2006 01:01:14 -0000 1.5 @@ -2,7 +2,7 @@ Name: kadischi Version: 0.1 -Release: 8.%{alphatag} +Release: 9.%{alphatag} Summary: LiveCD generation utility Group: Applications/System @@ -59,6 +59,7 @@ %{_datadir}/%{name}/initrd/find-live-cd %{_datadir}/%{name}/initrd/livecd-linuxrc %{_datadir}/%{name}/ks_examples/minimal-livecd.cfg +%{_datadir}/%{name}/ks_examples/standard-livecd.cfg %{_datadir}/%{name}/patches/*.patch %{_datadir}/%{name}/install/readonly-root %{_datadir}/%{name}/install/rc.readonly-livecd @@ -77,6 +78,11 @@ %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo %changelog +* Thu May 18 2006 +- Support FC4 target installations +- Added standard-livecd.cfg + + * Tue Apr 11 2006 Jasper Hartline - Handle UP and SMP kernels on SMP and UP hosts - Drop filesystem option and use SquashFS exclusively From fedora-extras-commits at redhat.com Fri May 19 03:02:45 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:02:45 -0700 Subject: rpms/liblo/FC-5 liblo.spec,1.1,1.2 Message-ID: <200605190303.k4J33H4w002946@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2896 Modified Files: liblo.spec Log Message: Don't install INSTALL file. Index: liblo.spec =================================================================== RCS file: /cvs/extras/rpms/liblo/FC-5/liblo.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblo.spec 14 May 2006 21:21:19 -0000 1.1 +++ liblo.spec 19 May 2006 03:02:44 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Open Sound Control library Name: liblo Version: 0.23 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: System Environment/Libraries URL: http://liblo.sourceforge.net @@ -47,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL README +%doc AUTHORS ChangeLog COPYING README %doc doc/html doc/latex %{_libdir}/liblo.so.* @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Thu May 18 2006 Anthony Green 0.23-5 +- Don't install generic INSTALL documentation. + * Sat Apr 29 2006 Anthony Green 0.23-4 - Stop using command macros like __rm, __make, __mkdir and __install. From fedora-extras-commits at redhat.com Fri May 19 03:03:53 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:03:53 -0700 Subject: rpms/liblo/FC-5 liblo.spec,1.2,1.3 Message-ID: <200605190303.k4J33tco003012@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2995 Modified Files: liblo.spec Log Message: Update rev to -6. Index: liblo.spec =================================================================== RCS file: /cvs/extras/rpms/liblo/FC-5/liblo.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liblo.spec 19 May 2006 03:02:44 -0000 1.2 +++ liblo.spec 19 May 2006 03:03:53 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Open Sound Control library Name: liblo Version: 0.23 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://liblo.sourceforge.net @@ -60,7 +60,7 @@ %{_mandir}/man3/* %changelog -* Thu May 18 2006 Anthony Green 0.23-5 +* Thu May 18 2006 Anthony Green 0.23-6 - Don't install generic INSTALL documentation. * Sat Apr 29 2006 Anthony Green 0.23-4 From fedora-extras-commits at redhat.com Fri May 19 03:07:10 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Thu, 18 May 2006 20:07:10 -0700 Subject: rpms/gnonlin/devel .cvsignore, 1.3, 1.4 gnonlin.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605190307.k4J37CFf003083@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/gnonlin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3060 Modified Files: .cvsignore gnonlin.spec sources Log Message: Updated gnonlin to 0.10.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Apr 2006 02:47:27 -0000 1.3 +++ .cvsignore 19 May 2006 03:07:10 -0000 1.4 @@ -1 +1 @@ -gnonlin-0.10.3.tar.gz +gnonlin-0.10.4.tar.gz Index: gnonlin.spec =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnonlin.spec 26 Apr 2006 21:16:38 -0000 1.6 +++ gnonlin.spec 19 May 2006 03:07:10 -0000 1.7 @@ -2,8 +2,8 @@ %define gst_plugins_base_req 0.10.2 Name: gnonlin -Version: 0.10.3 -Release: 2 +Version: 0.10.4 +Release: 1 Summary: GStreamer extension library for non-linear editing Group: System Environment/Libraries @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gstreamer-devel >= %{gst_req} gstreamer-plugins-base-devel >= %{gst_plugins_base_req} +Obsoletes: gnonlin-devel %description Gnonlin is a library built on top of GStreamer (http://gstreamer.net) @@ -41,6 +42,10 @@ %{_libdir}/gstreamer-0.10/libgnl* %changelog +* Thu May 18 2006 W. Michael Petullo 0.10.4-1 +- updated package to 0.10.4 +- add Obsoletes: gnonlin-devel + * Wed Apr 26 2006 W. Michael Petullo 0.10.3-2 - simplified install - require gstreamer-plugins-base-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnonlin/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Apr 2006 02:47:27 -0000 1.3 +++ sources 19 May 2006 03:07:10 -0000 1.4 @@ -1 +1 @@ -4fa1cebf048243e47cd590d4afed6dc6 gnonlin-0.10.3.tar.gz +7346b4d42b2980e88c191c44deff7d8c gnonlin-0.10.4.tar.gz From fedora-extras-commits at redhat.com Fri May 19 03:07:25 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:07:25 -0700 Subject: rpms/liblo/devel liblo.spec,1.1,1.2 Message-ID: <200605190307.k4J37Rsv003112@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3089 Modified Files: liblo.spec Log Message: Don't install INSTALL. Rev to -6. Index: liblo.spec =================================================================== RCS file: /cvs/extras/rpms/liblo/devel/liblo.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblo.spec 14 May 2006 21:21:19 -0000 1.1 +++ liblo.spec 19 May 2006 03:07:25 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Open Sound Control library Name: liblo Version: 0.23 -Release: 4%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://liblo.sourceforge.net @@ -47,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL README +%doc AUTHORS ChangeLog COPYING README %doc doc/html doc/latex %{_libdir}/liblo.so.* @@ -60,6 +60,9 @@ %{_mandir}/man3/* %changelog +* Thu May 18 2006 Anthony Green 0.23-6 +- Don't install generic INSTALL documentation. + * Sat Apr 29 2006 Anthony Green 0.23-4 - Stop using command macros like __rm, __make, __mkdir and __install. From fedora-extras-commits at redhat.com Fri May 19 03:10:33 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:10:33 -0700 Subject: rpms/liblrdf/FC-5 liblrdf.spec,1.1,1.2 Message-ID: <200605190310.k4J3AZTm003257@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3232 Modified Files: liblrdf.spec Log Message: Don't install INSTALL. Index: liblrdf.spec =================================================================== RCS file: /cvs/extras/rpms/liblrdf/FC-5/liblrdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblrdf.spec 14 May 2006 03:29:59 -0000 1.1 +++ liblrdf.spec 19 May 2006 03:10:33 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Library for manipulating RDF files describing LADSPA plugins Name: liblrdf Version: 0.4.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Libraries URL: http://lrdf.sourceforge.net/ @@ -44,7 +44,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README README.fedora +%doc AUTHORS ChangeLog COPYING NEWS README README.fedora %{_libdir}/liblrdf.so.* %exclude %{_datadir}/ladspa/rdf/ladspa.rdfs @@ -56,6 +56,9 @@ %{_libdir}/pkgconfig/* %changelog +* Thu May 18 2006 Anthony Green 0.4.0-7 +- Don't install generic INSTALL documentation. + * Sat May 13 2006 Anthony Green 0.4.0-6 - Exclude ladspa.rdfs. - Don't use %{__rm} or %{__make} macros. From fedora-extras-commits at redhat.com Fri May 19 03:11:23 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 18 May 2006 20:11:23 -0700 Subject: rpms/liblrdf/devel liblrdf.spec,1.1,1.2 Message-ID: <200605190311.k4J3BPZx003332@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/liblrdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3311 Modified Files: liblrdf.spec Log Message: Don't install INSTALL. Index: liblrdf.spec =================================================================== RCS file: /cvs/extras/rpms/liblrdf/devel/liblrdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- liblrdf.spec 14 May 2006 03:29:59 -0000 1.1 +++ liblrdf.spec 19 May 2006 03:11:23 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Library for manipulating RDF files describing LADSPA plugins Name: liblrdf Version: 0.4.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Libraries URL: http://lrdf.sourceforge.net/ @@ -44,7 +44,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README README.fedora +%doc AUTHORS ChangeLog COPYING NEWS README README.fedora %{_libdir}/liblrdf.so.* %exclude %{_datadir}/ladspa/rdf/ladspa.rdfs @@ -56,6 +56,9 @@ %{_libdir}/pkgconfig/* %changelog +* Thu May 18 2006 Anthony Green 0.4.0-7 +- Don't install generic INSTALL documentation. + * Sat May 13 2006 Anthony Green 0.4.0-6 - Exclude ladspa.rdfs. - Don't use %{__rm} or %{__make} macros. From fedora-extras-commits at redhat.com Fri May 19 04:36:21 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:36:21 -0700 Subject: rpms/kphone/FC-5 kphone-perms.patch,NONE,1.1 kphone.spec,1.24,1.25 Message-ID: <200605190436.k4J4aNR6005831@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5808 Modified Files: kphone.spec Added Files: kphone-perms.patch Log Message: apply patch for CVE-2006-2442 kphone-perms.patch: --- NEW FILE kphone-perms.patch --- --- kphone-orig/kphone/kphone.cpp 2005-06-21 06:14:49.000000000 -0500 +++ kphone/kphone/kphone.cpp 2006-05-18 23:27:09.000000000 -0500 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -32,6 +35,8 @@ userPrefix = "_" + prefix + "_"; } QSettings settings; + + umask(077); Sip::setLocalAddress( settings.readEntry( "/kphone/dissipate_addr", Sip::getLocalAddress() ) ); QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-5/kphone.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- kphone.spec 15 Feb 2006 01:48:41 -0000 1.24 +++ kphone.spec 19 May 2006 04:36:21 -0000 1.25 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -14,6 +14,7 @@ Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch Patch5: kphone-4.2-configure.patch +Patch6: kphone-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -31,6 +32,7 @@ %patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 %patch5 -p1 -b .configure +%patch6 -p1 -b .perms %build unset QTDIR || : ; . /etc/profile.d/qt.sh From fedora-extras-commits at redhat.com Fri May 19 04:39:15 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:39:15 -0700 Subject: rpms/kphone/FC-3 kphone-perms.patch,NONE,1.1 kphone.spec,1.15,1.16 Message-ID: <200605190439.k4J4dHGB005907@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5887 Modified Files: kphone.spec Added Files: kphone-perms.patch Log Message: patch for CVE-2006-2442 kphone-perms.patch: --- NEW FILE kphone-perms.patch --- --- kphone-orig/kphone/kphone.cpp 2005-06-21 06:14:49.000000000 -0500 +++ kphone/kphone/kphone.cpp 2006-05-18 23:27:09.000000000 -0500 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -32,6 +35,8 @@ userPrefix = "_" + prefix + "_"; } QSettings settings; + + umask(077); Sip::setLocalAddress( settings.readEntry( "/kphone/dissipate_addr", Sip::getLocalAddress() ) ); QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kphone.spec 5 Feb 2006 21:34:36 -0000 1.15 +++ kphone.spec 19 May 2006 04:39:15 -0000 1.16 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 6%{?dist} +Release: 9%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -14,6 +14,7 @@ Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch Patch5: kphone-4.2-configure.patch +Patch6: kphone-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -31,11 +32,12 @@ %patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 %patch5 -p1 -b .configure +%patch6 -p1 -b .perms %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure +%configure make %{?_smp_mflags} %install @@ -64,6 +66,12 @@ %{_datadir}/pixmaps/*.png %changelog +* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +- disable srtp we dont have the deps was testing + +* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +- rebuild for fc5 + * Sun Feb 05 2006 Dennis Gilmore 4.2-6 - patch configure so we use standard CFLAGS - reapply STUN patch From fedora-extras-commits at redhat.com Fri May 19 04:40:03 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:40:03 -0700 Subject: rpms/kphone/FC-4 kphone-perms.patch,NONE,1.1 kphone.spec,1.19,1.20 Message-ID: <200605190440.k4J4e5aR005978@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5956 Modified Files: kphone.spec Added Files: kphone-perms.patch Log Message: Apply patch for CVE-2006-2442 kphone-perms.patch: --- NEW FILE kphone-perms.patch --- --- kphone-orig/kphone/kphone.cpp 2005-06-21 06:14:49.000000000 -0500 +++ kphone/kphone/kphone.cpp 2006-05-18 23:27:09.000000000 -0500 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -32,6 +35,8 @@ userPrefix = "_" + prefix + "_"; } QSettings settings; + + umask(077); Sip::setLocalAddress( settings.readEntry( "/kphone/dissipate_addr", Sip::getLocalAddress() ) ); QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- kphone.spec 5 Feb 2006 21:36:44 -0000 1.19 +++ kphone.spec 19 May 2006 04:40:03 -0000 1.20 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 6%{?dist} +Release: 9%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -14,6 +14,7 @@ Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch Patch5: kphone-4.2-configure.patch +Patch6: kphone-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -31,11 +32,12 @@ %patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 %patch5 -p1 -b .configure +%patch6 -p1 -b .perms %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure +%configure make %{?_smp_mflags} %install @@ -64,6 +66,12 @@ %{_datadir}/pixmaps/*.png %changelog +* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +- disable srtp we dont have the deps was testing + +* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +- rebuild for fc5 + * Sun Feb 05 2006 Dennis Gilmore 4.2-6 - patch configure so we use standard CFLAGS - reapply STUN patch From fedora-extras-commits at redhat.com Fri May 19 04:40:42 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:40:42 -0700 Subject: rpms/kphone/devel kphone-perms.patch, NONE, 1.1 kphone.spec, 1.24, 1.25 Message-ID: <200605190440.k4J4eiCn006049@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6027 Modified Files: kphone.spec Added Files: kphone-perms.patch Log Message: apply patch for CVE-2006-2442 kphone-perms.patch: --- NEW FILE kphone-perms.patch --- --- kphone-orig/kphone/kphone.cpp 2005-06-21 06:14:49.000000000 -0500 +++ kphone/kphone/kphone.cpp 2006-05-18 23:27:09.000000000 -0500 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -32,6 +35,8 @@ userPrefix = "_" + prefix + "_"; } QSettings settings; + + umask(077); Sip::setLocalAddress( settings.readEntry( "/kphone/dissipate_addr", Sip::getLocalAddress() ) ); QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- kphone.spec 15 Feb 2006 01:48:41 -0000 1.24 +++ kphone.spec 19 May 2006 04:40:42 -0000 1.25 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -14,6 +14,7 @@ Patch3: kphone-4.2-callaudio-stun-init.patch Patch4: kphone-gcc41.patch Patch5: kphone-4.2-configure.patch +Patch6: kphone-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel alsa-lib-devel desktop-file-utils openssl-devel @@ -31,6 +32,7 @@ %patch3 -p1 -b .stun %patch4 -p1 -b .gcc41 %patch5 -p1 -b .configure +%patch6 -p1 -b .perms %build unset QTDIR || : ; . /etc/profile.d/qt.sh From fedora-extras-commits at redhat.com Fri May 19 04:53:35 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 21:53:35 -0700 Subject: fedora-security/audit fe4,1.27,1.28 fe5,1.24,1.25 Message-ID: <200605190453.k4J4rZXa006171@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6151 Modified Files: fe4 fe5 Log Message: Fix of CVE-2006-2442 Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- fe4 18 May 2006 22:49:36 -0000 1.27 +++ fe4 19 May 2006 04:53:33 -0000 1.28 @@ -2,7 +2,7 @@ ** are items that need attention -CVE-2006-2442 VULNERABLE (kphone) bz#192202 +CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fe5 18 May 2006 22:49:36 -0000 1.24 +++ fe5 19 May 2006 04:53:33 -0000 1.25 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn From fedora-extras-commits at redhat.com Fri May 19 05:13:44 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 18 May 2006 22:13:44 -0700 Subject: rpms/obby/devel .cvsignore, 1.5, 1.6 obby.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200605190513.k4J5Dk2Q008512@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/obby/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8490 Modified Files: .cvsignore obby.spec sources Log Message: 0.4.0rc2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/obby/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Apr 2006 20:00:23 -0000 1.5 +++ .cvsignore 19 May 2006 05:13:44 -0000 1.6 @@ -1 +1 @@ -obby-0.4.0rc1.tar.gz +obby-0.4.0rc2.tar.gz Index: obby.spec =================================================================== RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- obby.spec 15 Apr 2006 20:00:23 -0000 1.15 +++ obby.spec 19 May 2006 05:13:44 -0000 1.16 @@ -1,8 +1,8 @@ -%define _rc rc1 +%define _rc rc2 Name: obby Version: 0.4.0 -Release: 1.%{_rc}%{?dist} +Release: 2.%{_rc}%{?dist} Summary: A library which provides synced document buffers Group: Development/Libraries @@ -67,6 +67,9 @@ %changelog +* Fri May 19 2006 Luke Macken - 0.4.0-2.rc2 +- 0.4.0rc2 + * Sat Apr 15 2006 Luke Macken - 0.4.0-1.rc1 - 0.4.0rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/obby/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Apr 2006 20:00:23 -0000 1.5 +++ sources 19 May 2006 05:13:44 -0000 1.6 @@ -1 +1 @@ -cd7d8755a7854ad8d29c6d2b0457fa8f obby-0.4.0rc1.tar.gz +5dbc7054ee31eca614d44761aeddee49 obby-0.4.0rc2.tar.gz From fedora-extras-commits at redhat.com Fri May 19 05:16:13 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:16:13 -0700 Subject: rpms/kphone/devel kphone.spec,1.25,1.26 Message-ID: <200605190516.k4J5GFhX008579@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8562 Modified Files: kphone.spec Log Message: fill in changelog Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- kphone.spec 19 May 2006 04:40:42 -0000 1.25 +++ kphone.spec 19 May 2006 05:16:13 -0000 1.26 @@ -66,7 +66,13 @@ %{_datadir}/pixmaps/*.png %changelog -* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +* Thu May 19 2006 Dennis Gilmore 4.2-10 +- Fill in changelog :( + +* Thu May 19 2006 Dennis Gilmore 4.2-9 +- CVE-2006-2442 + +* Tue Feb 14 2006 Dennis Gilmore 4.2-8 - disable srtp we dont have the deps was testing * Tue Feb 14 2006 Dennis Gilmore 4.2-7 From fedora-extras-commits at redhat.com Fri May 19 05:17:15 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:17:15 -0700 Subject: rpms/kphone/devel kphone.spec,1.26,1.27 Message-ID: <200605190517.k4J5HHvK008638@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8621 Modified Files: kphone.spec Log Message: fill in changelog :( Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- kphone.spec 19 May 2006 05:16:13 -0000 1.26 +++ kphone.spec 19 May 2006 05:17:14 -0000 1.27 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications From fedora-extras-commits at redhat.com Fri May 19 05:19:52 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:19:52 -0700 Subject: rpms/kphone/FC-3 kphone.spec,1.16,1.17 Message-ID: <200605190519.k4J5JsLv008720@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8703 Modified Files: kphone.spec Log Message: update changelog :( Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kphone.spec 19 May 2006 04:39:15 -0000 1.16 +++ kphone.spec 19 May 2006 05:19:52 -0000 1.17 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -66,7 +66,13 @@ %{_datadir}/pixmaps/*.png %changelog -* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +* Thu May 19 2006 Dennis Gilmore 4.2-10 +- Fill in changelog :( + +* Thu May 19 2006 Dennis Gilmore 4.2-9 +- CVE-2006-2442 + +* Tue Feb 14 2006 Dennis Gilmore 4.2-8 - disable srtp we dont have the deps was testing * Tue Feb 14 2006 Dennis Gilmore 4.2-7 From fedora-extras-commits at redhat.com Fri May 19 05:20:30 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:20:30 -0700 Subject: rpms/kphone/FC-4 kphone.spec,1.20,1.21 Message-ID: <200605190520.k4J5KW8b008783@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8764 Modified Files: kphone.spec Log Message: update changelog :( bad me Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- kphone.spec 19 May 2006 04:40:03 -0000 1.20 +++ kphone.spec 19 May 2006 05:20:30 -0000 1.21 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -66,7 +66,13 @@ %{_datadir}/pixmaps/*.png %changelog -* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +* Thu May 19 2006 Dennis Gilmore 4.2-10 +- Fill in changelog :( + +* Thu May 19 2006 Dennis Gilmore 4.2-9 +- CVE-2006-2442 + +* Tue Feb 14 2006 Dennis Gilmore 4.2-8 - disable srtp we dont have the deps was testing * Tue Feb 14 2006 Dennis Gilmore 4.2-7 From fedora-extras-commits at redhat.com Fri May 19 05:20:59 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 18 May 2006 22:20:59 -0700 Subject: rpms/kphone/FC-5 kphone.spec,1.25,1.26 Message-ID: <200605190521.k4J5L1Lk008846@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8829 Modified Files: kphone.spec Log Message: update changelog Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-5/kphone.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- kphone.spec 19 May 2006 04:36:21 -0000 1.25 +++ kphone.spec 19 May 2006 05:20:59 -0000 1.26 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -66,7 +66,13 @@ %{_datadir}/pixmaps/*.png %changelog -* Tue Feb 14 2006 Dennis Gilmore 4.2-7 +* Thu May 19 2006 Dennis Gilmore 4.2-10 +- Fill in changelog :( + +* Thu May 19 2006 Dennis Gilmore 4.2-9 +- CVE-2006-2442 + +* Tue Feb 14 2006 Dennis Gilmore 4.2-8 - disable srtp we dont have the deps was testing * Tue Feb 14 2006 Dennis Gilmore 4.2-7 From fedora-extras-commits at redhat.com Fri May 19 07:10:07 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 May 2006 00:10:07 -0700 Subject: rpms/wine/devel wine.spec,1.26,1.27 Message-ID: <200605190710.k4J7A9dF013673@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652 Modified Files: wine.spec Log Message: - enable hal/dbus support Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- wine.spec 16 May 2006 20:51:56 -0000 1.26 +++ wine.spec 19 May 2006 07:10:07 -0000 1.27 @@ -2,7 +2,7 @@ Name: wine Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -52,12 +52,13 @@ BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: libXxf86dga-devel libXxf86vm-devel BuildRequires: libXrandr-devel libXrender-devel libXext-devel - BuildRequires: fontconfig-devel BuildRequires: giflib-devel BuildRequires: cups-devel BuildRequires: libXmu-devel BuildRequires: libXi-devel +# dbus/hal >= FC5 +BuildRequires: dbus-devel hal-devel Requires: %{_bindir}/xmessage @@ -654,6 +655,10 @@ %{_libdir}/wine/*.def %changelog +* Fri May 19 2006 Andreas Bierfert +0.9.13-2 +- enable dbus/hal support + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Fri May 19 10:16:31 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 19 May 2006 03:16:31 -0700 Subject: rpms/paps/devel .cvsignore, 1.7, 1.8 paps.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200605191016.k4JAGXBi022216@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22194 Modified Files: .cvsignore paps.spec sources Log Message: * Fri May 19 2006 Akira TAGOH - 0.6.6-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Apr 2006 08:38:31 -0000 1.7 +++ .cvsignore 19 May 2006 10:16:31 -0000 1.8 @@ -7,3 +7,4 @@ paps-0.6.2.tar.gz paps-0.6.3.tar.gz paps-0.6.5.tar.gz +paps-0.6.6.tar.gz Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- paps.spec 17 Apr 2006 08:38:31 -0000 1.9 +++ paps.spec 19 May 2006 10:16:31 -0000 1.10 @@ -1,5 +1,5 @@ Name: paps -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} License: LGPL @@ -47,6 +47,9 @@ %changelog +* Fri May 19 2006 Akira TAGOH - 0.6.6-1 +- New upstream release. + * Mon Apr 17 2006 Akira TAGOH - 0.6.5-1 - New upstream release. - paps-0.6.3-fix-pagesize.patch: removed. it has been merged in upstream. Index: sources =================================================================== RCS file: /cvs/extras/rpms/paps/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Apr 2006 08:38:31 -0000 1.7 +++ sources 19 May 2006 10:16:31 -0000 1.8 @@ -1 +1 @@ -5bb91f6358218f5cbba520376f3e3c1e paps-0.6.5.tar.gz +cc0975e70fe1e704e16f2fb08c71cee2 paps-0.6.6.tar.gz From fedora-extras-commits at redhat.com Fri May 19 11:01:52 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Fri, 19 May 2006 04:01:52 -0700 Subject: rpms/libapreq2/devel .cvsignore, 1.8, 1.9 libapreq2.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200605191102.k4JB2POj025453@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310 Modified Files: .cvsignore libapreq2.spec sources Log Message: Bump up to 2.08-RC1 for Rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Feb 2006 21:11:26 -0000 1.8 +++ .cvsignore 19 May 2006 11:01:52 -0000 1.9 @@ -1 +1 @@ -libapreq2-2.07.tar.gz +libapreq2-2.08-RC1.tar.gz Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libapreq2.spec 28 Feb 2006 18:38:07 -0000 1.10 +++ libapreq2.spec 19 May 2006 11:01:52 -0000 1.11 @@ -1,15 +1,14 @@ %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}} Name: libapreq2 -Version: 2.07 -Release: 1.1%{?dist} +Version: 2.08 +Release: 0.rc1.1%{?dist} Summary: Apache HTTP 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}.tar.gz -Source0: http://people.apache.org/~joes/libapreq2-2.07.tar.gz +Source0: http://people.apache.org/~pgollucci/apreq2/libapreq2-2.08-RC1.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-build.patch Patch1: %{name}-2.07-rc3-ldflags.patch @@ -62,7 +61,6 @@ #!/bin/sh %{__perl_provides} $* \ | grep -v 'perl(APR::\(Request\(::\(Apache2\|CGI\|Error\)\)\?\))$' \ -| grep -v 'perl(Apache2::\(Cookie\|Request\|Upload\))$' EOF %define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl-prov chmod +x %{__perl_provides} @@ -147,22 +145,24 @@ %defattr(-,root,root,-) %doc glue/perl/README %{perl_vendorarch}/auto/APR/ -%{perl_vendorarch}/Apache2/ %{perl_vendorarch}/APR/ %{_mandir}/man3/A*::*.3* %changelog -* Wed Mar 01 2006 Bojan Smojver - 2.07-1.1 +* Fri May 19 2006 Bojan Smojver - 2.08-0.rc1.1 +- bump up to 2.08-RC1 for Rawhide + +* Wed Mar 01 2006 Bojan Smojver - 2.07-1.1 - rebuild -* Mon Feb 13 2006 Bojan Smojver - 2.07-1 +* Mon Feb 13 2006 Bojan Smojver - 2.07-1 - bump up to 2.07 -* Fri Feb 03 2006 Bojan Smojver - 2.07-0.2.rc4 +* Fri Feb 03 2006 Bojan Smojver - 2.07-0.2.rc4 - re-tag for rebuild -* Fri Feb 03 2006 Bojan Smojver - 2.07-0.1.rc4 +* Fri Feb 03 2006 Bojan Smojver - 2.07-0.1.rc4 - bump up to 2.07-rc4 * Sat Dec 10 2005 Ville Skytt?? - 2.07-0.2.rc3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Feb 2006 21:11:26 -0000 1.8 +++ sources 19 May 2006 11:01:52 -0000 1.9 @@ -1 +1 @@ -6f2e5e4a14e8b190dead0fe91fc13080 libapreq2-2.07.tar.gz +4604dcb53dc913a4484d4d263c0105f5 libapreq2-2.08-RC1.tar.gz From fedora-extras-commits at redhat.com Fri May 19 11:23:04 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 May 2006 04:23:04 -0700 Subject: extras-buildsys/utils extras-push-new,1.12,1.13 Message-ID: <200605191123.k4JBN4gM026335@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26254 Modified Files: extras-push-new Log Message: - turn off DEBUG - use errno at least in some places - remove the extras-sign-move.py alias feature, since repobuild kills repoview (with the currently used createrepo) Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- extras-push-new 19 May 2006 00:20:57 -0000 1.12 +++ extras-push-new 19 May 2006 11:23:01 -0000 1.13 @@ -15,13 +15,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +import errno import fcntl, fnmatch import os, sys import rpmUtils import shutil import string -DEBUG = True +DEBUG = False signersgid = 100581 # extras_signers group @@ -33,8 +34,8 @@ # Where we store mails to be sent, lockfiles. rundir = '/srv/rpmbuild/extras-push-rundir' -cachedir = '/tmp/repomd-cache' -compsname = 'comps.xml' +cachedir = '/tmp/repomd-cache' # UNUSED: copied from extras-sign-move.py +compsname = 'comps.xml' # UNUSED: copied from extras-sign-move.py project_hr = 'Fedora Extras' mail_from = 'buildsys at fedoraproject.org' @@ -42,7 +43,7 @@ mail_footer = """ For more information about the built packages please see the repository -or the fedora Info Feed: http://fedoraproject.org/infofeed/ +or the Fedora Info Feed: http://fedoraproject.org/infofeed/ """ smtp_server = '' @@ -117,7 +118,7 @@ self.rc = fcntl.flock(self.file, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError: print 'ERROR: script locked via lockfile %s - it seems to be running already' % self.name - sys.exit(11) + sys.exit(errno.EAGAIN) def unlock(self): @@ -148,7 +149,7 @@ def emptyrunfile(dist): runfilename = getrunfilename(dist) - if not os.path.isfile(runfilename): + if not os.path.exists(runfilename): return try: os.remove(runfilename) @@ -484,12 +485,12 @@ if opts.gidcheck: if os.getgid() != signersgid: print 'ERROR: Change into extras_signers group before running this! Use "newgrp extras_signers".' - sys.exit(13) + sys.exit(errno.EPERM) if opts.signkeycheck: if 'extras at fedoraproject.org' != os.popen('rpm --eval %_gpg_name','r').read().rstrip(): print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!' - sys.exit(13) + sys.exit(errno.EPERM) if opts.setumask: os.umask(0002) @@ -500,7 +501,7 @@ if len(sys.argv) < 2: print 'SYNTAX: %s [dist]...' % sys.argv[0] - sys.exit(22) + sys.exit(errno.EINVAL) dists = [] # the list of distribution release we want to push for d in sys.argv[1:]: @@ -514,11 +515,6 @@ dists.append(d) debugprint(dists) - # If we are called as 'extras-sign-move.py' we simulate old - # behaviour and only do: sign, move, repobuild, sync - if sys.argv[0].endswith('extras-sign-move.py'): - opts.repoview = False - if not os.path.exists(rundir): os.makedirs(rundir) From fedora-extras-commits at redhat.com Fri May 19 12:31:56 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Fri, 19 May 2006 05:31:56 -0700 Subject: status-report-scripts parseBZbugList,1.34,1.35 Message-ID: <200605191231.k4JCVuTA029616@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29598 Modified Files: parseBZbugList Log Message: Colorize 25 top submitters. Fix an off by 1 bug. Change some wording. Index: parseBZbugList =================================================================== RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- parseBZbugList 12 May 2006 21:06:59 -0000 1.34 +++ parseBZbugList 19 May 2006 12:31:53 -0000 1.35 @@ -759,8 +759,10 @@ print "\n\n== About FE-ACCEPT packages ==\n"; print "\n\n=== Package count ===\n"; print "\nWe have $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n"; - print "\n=== Top 10 BZ review requests submitters ===\n"; - &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT, undef); + print "\n=== Top 25 BZ review requests submitters ===\n"; + print "Sponsors are highlighted in green.\n"; + &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, + \%BZOWN_CNT, undef, 25, 1); print "\n=== Top 25 BZ review requests reviewers ===\n"; print "Sponsors are highlighted in green.\n"; &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, @@ -776,7 +778,7 @@ "find the package in the owners file:\n"; &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ, 5); } - if ($COUNT_LIST{"acceptOpenInactive"} >= 0) { + if ($COUNT_LIST{"acceptOpenInactive"} > 0) { print "\n\n=== Inactivity notice ===\n"; print "\nWe have $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks\n"; &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ, 5); @@ -801,7 +803,7 @@ print STDERR " - $COUNT_LIST{'missingOwner'} accepted, closed package reviews not in owners\n"; } - if ($COUNT_LIST{"acceptOpenInactive"} >= 0) { + if ($COUNT_LIST{"acceptOpenInactive"} > 0) { print STDERR " - $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks;\n"; } @@ -836,7 +838,7 @@ } $BUG_LIST{"acceptOpenInDevel"} = \@BL; $BUG_LIST{"acceptOpenInactive"} = \@LATE; - $COUNT_LIST{"acceptOpenInactive"} = $#LATE; + $COUNT_LIST{"acceptOpenInactive"} = $#LATE + 1; } sub countOpen { @@ -1085,8 +1087,8 @@ print join("\n", @A), "}}}\n"; } if ($COUNT_LIST{'CVSinCore'} > 0) { - print "\n=== Packages appearing in Core but still present in CVS devel ===\n"; - print "\nWe have $COUNT_LIST{'CVSinCore'} packages in CVS devel which appear to have moved to Core: {{{\n"; + print "\n=== Packages appearing in Core and also present in CVS devel ===\n"; + print "\nWe have $COUNT_LIST{'CVSinCore'} packages in CVS devel which appear to have moved to/from Core: {{{\n"; my $a = $PKG_LIST{"CVSinCore"}; print join("\n", @$a), "}}}\n"; } From fedora-extras-commits at redhat.com Fri May 19 13:14:15 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 19 May 2006 06:14:15 -0700 Subject: rpms/tinyerp/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.5, 1.6 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.16, 1.17 tinyerp-server-pidlog.patch, 1.1, NONE Message-ID: <200605191314.k4JDEHjm032086@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32051 Modified Files: .cvsignore sources tinyerp-client.patch tinyerp-server.patch tinyerp.desktop tinyerp.spec Removed Files: tinyerp-server-pidlog.patch Log Message: - updated to upstream version 3.3.0 - updated the client and server patches - removed the pidlog patch as it was integrated upstream - unified the spec file for FC < 5 and FC >= 5 - used a new icon in the desktop file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 13:56:00 -0000 1.6 +++ .cvsignore 19 May 2006 13:14:15 -0000 1.7 @@ -1,2 +1,2 @@ -tinyerp-client-3.2.1.tgz -tinyerp-server-3.2.1.tgz +tinyerp-client-3.3.0.tar.gz +tinyerp-server-3.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 13:56:00 -0000 1.6 +++ sources 19 May 2006 13:14:15 -0000 1.7 @@ -1,2 +1,2 @@ -5e588d39d139f6b66c9f66e59e089d4c tinyerp-client-3.2.1.tgz -4acbbd8e8fac798ea3e9da08e076b465 tinyerp-server-3.2.1.tgz +93364c3aae7c64dd71ced12133a16574 tinyerp-client-3.3.0.tar.gz +ece14c707f91f2b5b4b46906899e6d9d tinyerp-server-3.3.0.tar.gz tinyerp-client.patch: Index: tinyerp-client.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-client.patch 30 Jan 2006 13:56:00 -0000 1.4 +++ tinyerp-client.patch 19 May 2006 13:14:15 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py ---- client.orig/bin/tinyerp-client.py 2006-01-27 11:50:28.000000000 +0100 -+++ client/bin/tinyerp-client.py 2006-01-30 14:22:52.000000000 +0100 +diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py +--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py 2006-05-18 18:06:39.000000000 +0200 ++++ tinyerp-client-3.3.0/bin/tinyerp-client.py 2006-05-19 13:15:25.000000000 +0200 @@ -73,14 +73,13 @@ import pango @@ -20,15 +20,3 @@ import options -diff -Nru client.orig/setup.py client/setup.py ---- client.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ client/setup.py 2006-01-30 14:22:58.000000000 +0100 -@@ -18,7 +18,7 @@ - opj = os.path.join - - name = 'tinyerp-client' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyerp-server.patch 18 Mar 2006 14:09:22 -0000 1.5 +++ tinyerp-server.patch 19 May 2006 13:14:15 -0000 1.6 @@ -1,23 +1,27 @@ -diff -Nru server.orig/setup.py server/setup.py ---- server.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ server/setup.py 2006-01-30 14:23:25.000000000 +0100 -@@ -21,14 +21,16 @@ - opj = os.path.join +diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py +--- tinyerp-server-3.3.0.orig/setup.py 2006-05-19 10:56:54.000000000 +0200 ++++ tinyerp-server-3.3.0/setup.py 2006-05-19 13:21:04.000000000 +0200 +@@ -28,11 +28,18 @@ - name = 'tinyerp-server' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] - --included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter', -+included_addons = ['account', 'audittrail', 'base', 'base_partner_relation', -+ 'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter', - 'marketing', 'mrp', -- 'network', 'product', 'project', 'purchase', 'sale', -+ 'network', 'product', 'product_electronic', 'product_expiry', -+ 'project', 'purchase', 'sale', 'scrum', - 'stock', 'subscription'] + included_addons = [ + 'account', 'account_followup', 'airport', 'audittrail', +- 'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale', +- 'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce', +- 'product','product_electronic', 'product_expiry', 'product_extended', +- 'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum', +- 'stock', 'subscription', 'travel', ++ 'base','base_partner_relation', ++ 'crm', 'custom', ++ 'delivery', ++ 'edi', 'esale', ++ 'hr', 'hr_timesheet', 'hr_timesheet_project', ++ 'letter', ++ 'marketing', 'mrp', ++ 'network', ++ 'oscommerce', ++ 'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase', ++ 'sale', 'sandwich', 'scrum', 'stock', 'subscription', ++ 'travel', + 'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',] required_modules = [('psycopg', 'PostgreSQL module'), Index: tinyerp.desktop =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp.desktop 20 Nov 2005 18:25:32 -0000 1.2 +++ tinyerp.desktop 19 May 2006 13:14:15 -0000 1.3 @@ -4,7 +4,7 @@ GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client -Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png +Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png StartupNotify=true Terminal=false Type=Application Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tinyerp.spec 18 Mar 2006 14:09:22 -0000 1.16 +++ tinyerp.spec 19 May 2006 13:14:15 -0000 1.17 @@ -1,15 +1,33 @@ +#### options: +# Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 +%define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif + %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: tinyerp -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org -Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz -Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz +Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz +Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop Source3: tinyerp-server.conf Source4: tinyerp-server @@ -19,11 +37,16 @@ BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python, pydot BuildRequires: desktop-file-utils +%if %_modular_X BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base +%define _xvfb /usr/bin/Xvfb +%else +BuildRequires: xorg-x11-Xvfb +%define _xvfb /usr/X11R6/bin/Xvfb +%endif Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch -Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -51,22 +74,20 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 -%patch2 %build -cd client -mv bin/po/cz.po bin/po/cs.po -/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT -cd client -/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client @@ -79,7 +100,7 @@ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client -for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do +for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/tinyerp-client/$i $i done @@ -139,6 +160,12 @@ %changelog +* Fri May 19 2006 Dan Horak 3.3.0-1 +- update to upstream tinyerp 3.3.0 +- the pidlog patch was integrated into upstream +- unified the specfile for FC < 5 and FC >=5 +- used new icon in the desktop file + * Sat Mar 18 2006 Dan Horak 3.2.1-3 - new config file with only default values (#184505) - added a patch for handling the pid and log file in the server (#184502) --- tinyerp-server-pidlog.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 13:27:30 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 19 May 2006 06:27:30 -0700 Subject: rpms/tinyerp/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.5, 1.6 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.16, 1.17 tinyerp-server-pidlog.patch, 1.1, NONE Message-ID: <200605191327.k4JDRWvN032240@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32207 Modified Files: .cvsignore sources tinyerp-client.patch tinyerp-server.patch tinyerp.desktop tinyerp.spec Removed Files: tinyerp-server-pidlog.patch Log Message: - updated to upstream version 3.3.0 - updated the client and server patches - removed the pidlog patch as it was integrated upstream - unified the spec file for FC < 5 and FC >= 5 - used a new icon in the desktop file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 13:56:00 -0000 1.6 +++ .cvsignore 19 May 2006 13:27:30 -0000 1.7 @@ -1,2 +1,2 @@ -tinyerp-client-3.2.1.tgz -tinyerp-server-3.2.1.tgz +tinyerp-client-3.3.0.tar.gz +tinyerp-server-3.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 13:56:00 -0000 1.6 +++ sources 19 May 2006 13:27:30 -0000 1.7 @@ -1,2 +1,2 @@ -5e588d39d139f6b66c9f66e59e089d4c tinyerp-client-3.2.1.tgz -4acbbd8e8fac798ea3e9da08e076b465 tinyerp-server-3.2.1.tgz +93364c3aae7c64dd71ced12133a16574 tinyerp-client-3.3.0.tar.gz +ece14c707f91f2b5b4b46906899e6d9d tinyerp-server-3.3.0.tar.gz tinyerp-client.patch: Index: tinyerp-client.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-client.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-client.patch 30 Jan 2006 13:56:00 -0000 1.4 +++ tinyerp-client.patch 19 May 2006 13:27:30 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py ---- client.orig/bin/tinyerp-client.py 2006-01-27 11:50:28.000000000 +0100 -+++ client/bin/tinyerp-client.py 2006-01-30 14:22:52.000000000 +0100 +diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py +--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py 2006-05-18 18:06:39.000000000 +0200 ++++ tinyerp-client-3.3.0/bin/tinyerp-client.py 2006-05-19 13:15:25.000000000 +0200 @@ -73,14 +73,13 @@ import pango @@ -20,15 +20,3 @@ import options -diff -Nru client.orig/setup.py client/setup.py ---- client.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ client/setup.py 2006-01-30 14:22:58.000000000 +0100 -@@ -18,7 +18,7 @@ - opj = os.path.join - - name = 'tinyerp-client' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyerp-server.patch 18 Mar 2006 14:43:35 -0000 1.5 +++ tinyerp-server.patch 19 May 2006 13:27:30 -0000 1.6 @@ -1,23 +1,27 @@ -diff -Nru server.orig/setup.py server/setup.py ---- server.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ server/setup.py 2006-01-30 14:23:25.000000000 +0100 -@@ -21,14 +21,16 @@ - opj = os.path.join +diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py +--- tinyerp-server-3.3.0.orig/setup.py 2006-05-19 10:56:54.000000000 +0200 ++++ tinyerp-server-3.3.0/setup.py 2006-05-19 13:21:04.000000000 +0200 +@@ -28,11 +28,18 @@ - name = 'tinyerp-server' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] - --included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter', -+included_addons = ['account', 'audittrail', 'base', 'base_partner_relation', -+ 'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter', - 'marketing', 'mrp', -- 'network', 'product', 'project', 'purchase', 'sale', -+ 'network', 'product', 'product_electronic', 'product_expiry', -+ 'project', 'purchase', 'sale', 'scrum', - 'stock', 'subscription'] + included_addons = [ + 'account', 'account_followup', 'airport', 'audittrail', +- 'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale', +- 'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce', +- 'product','product_electronic', 'product_expiry', 'product_extended', +- 'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum', +- 'stock', 'subscription', 'travel', ++ 'base','base_partner_relation', ++ 'crm', 'custom', ++ 'delivery', ++ 'edi', 'esale', ++ 'hr', 'hr_timesheet', 'hr_timesheet_project', ++ 'letter', ++ 'marketing', 'mrp', ++ 'network', ++ 'oscommerce', ++ 'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase', ++ 'sale', 'sandwich', 'scrum', 'stock', 'subscription', ++ 'travel', + 'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',] required_modules = [('psycopg', 'PostgreSQL module'), Index: tinyerp.desktop =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp.desktop 20 Nov 2005 18:25:32 -0000 1.2 +++ tinyerp.desktop 19 May 2006 13:27:30 -0000 1.3 @@ -4,7 +4,7 @@ GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client -Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png +Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png StartupNotify=true Terminal=false Type=Application Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tinyerp.spec 18 Mar 2006 14:43:35 -0000 1.16 +++ tinyerp.spec 19 May 2006 13:27:30 -0000 1.17 @@ -1,15 +1,33 @@ +#### options: +# Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 +%define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif + %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: tinyerp -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org -Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz -Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz +Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz +Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop Source3: tinyerp-server.conf Source4: tinyerp-server @@ -19,11 +37,16 @@ BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python, pydot BuildRequires: desktop-file-utils +%if %_modular_X BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base +%define _xvfb /usr/bin/Xvfb +%else +BuildRequires: xorg-x11-Xvfb +%define _xvfb /usr/X11R6/bin/Xvfb +%endif Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch -Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -51,22 +74,20 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 -%patch2 %build -cd client -mv bin/po/cz.po bin/po/cs.po -/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT -cd client -/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client @@ -79,7 +100,7 @@ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client -for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do +for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/tinyerp-client/$i $i done @@ -139,6 +160,12 @@ %changelog +* Fri May 19 2006 Dan Horak 3.3.0-1 +- update to upstream tinyerp 3.3.0 +- the pidlog patch was integrated into upstream +- unified the specfile for FC < 5 and FC >=5 +- used new icon in the desktop file + * Sat Mar 18 2006 Dan Horak 3.2.1-3 - new config file with only default values (#184505) - added a patch for handling the pid and log file in the server (#184502) --- tinyerp-server-pidlog.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 13:28:37 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 19 May 2006 06:28:37 -0700 Subject: rpms/tinyerp/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.6, 1.7 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.14, 1.15 tinyerp-server-pidlog.patch, 1.1, NONE Message-ID: <200605191328.k4JDSdOc032319@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32285 Modified Files: .cvsignore sources tinyerp-client.patch tinyerp-server.patch tinyerp.desktop tinyerp.spec Removed Files: tinyerp-server-pidlog.patch Log Message: - updated to upstream version 3.3.0 - updated the client and server patches - removed the pidlog patch as it was integrated upstream - unified the spec file for FC < 5 and FC >= 5 - used a new icon in the desktop file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 13:52:51 -0000 1.6 +++ .cvsignore 19 May 2006 13:28:37 -0000 1.7 @@ -1,2 +1,2 @@ -tinyerp-client-3.2.1.tgz -tinyerp-server-3.2.1.tgz +tinyerp-client-3.3.0.tar.gz +tinyerp-server-3.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 13:52:51 -0000 1.6 +++ sources 19 May 2006 13:28:37 -0000 1.7 @@ -1,2 +1,2 @@ -5e588d39d139f6b66c9f66e59e089d4c tinyerp-client-3.2.1.tgz -4acbbd8e8fac798ea3e9da08e076b465 tinyerp-server-3.2.1.tgz +93364c3aae7c64dd71ced12133a16574 tinyerp-client-3.3.0.tar.gz +ece14c707f91f2b5b4b46906899e6d9d tinyerp-server-3.3.0.tar.gz tinyerp-client.patch: Index: tinyerp-client.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-client.patch 30 Jan 2006 13:52:51 -0000 1.4 +++ tinyerp-client.patch 19 May 2006 13:28:37 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py ---- client.orig/bin/tinyerp-client.py 2006-01-27 11:50:28.000000000 +0100 -+++ client/bin/tinyerp-client.py 2006-01-30 14:22:52.000000000 +0100 +diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py +--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py 2006-05-18 18:06:39.000000000 +0200 ++++ tinyerp-client-3.3.0/bin/tinyerp-client.py 2006-05-19 13:15:25.000000000 +0200 @@ -73,14 +73,13 @@ import pango @@ -20,15 +20,3 @@ import options -diff -Nru client.orig/setup.py client/setup.py ---- client.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ client/setup.py 2006-01-30 14:22:58.000000000 +0100 -@@ -18,7 +18,7 @@ - opj = os.path.join - - name = 'tinyerp-client' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tinyerp-server.patch 18 Mar 2006 14:41:46 -0000 1.6 +++ tinyerp-server.patch 19 May 2006 13:28:37 -0000 1.7 @@ -1,23 +1,27 @@ -diff -Nru server.orig/setup.py server/setup.py ---- server.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ server/setup.py 2006-01-30 14:23:25.000000000 +0100 -@@ -21,14 +21,16 @@ - opj = os.path.join +diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py +--- tinyerp-server-3.3.0.orig/setup.py 2006-05-19 10:56:54.000000000 +0200 ++++ tinyerp-server-3.3.0/setup.py 2006-05-19 13:21:04.000000000 +0200 +@@ -28,11 +28,18 @@ - name = 'tinyerp-server' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] - --included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter', -+included_addons = ['account', 'audittrail', 'base', 'base_partner_relation', -+ 'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter', - 'marketing', 'mrp', -- 'network', 'product', 'project', 'purchase', 'sale', -+ 'network', 'product', 'product_electronic', 'product_expiry', -+ 'project', 'purchase', 'sale', 'scrum', - 'stock', 'subscription'] + included_addons = [ + 'account', 'account_followup', 'airport', 'audittrail', +- 'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale', +- 'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce', +- 'product','product_electronic', 'product_expiry', 'product_extended', +- 'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum', +- 'stock', 'subscription', 'travel', ++ 'base','base_partner_relation', ++ 'crm', 'custom', ++ 'delivery', ++ 'edi', 'esale', ++ 'hr', 'hr_timesheet', 'hr_timesheet_project', ++ 'letter', ++ 'marketing', 'mrp', ++ 'network', ++ 'oscommerce', ++ 'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase', ++ 'sale', 'sandwich', 'scrum', 'stock', 'subscription', ++ 'travel', + 'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',] required_modules = [('psycopg', 'PostgreSQL module'), Index: tinyerp.desktop =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp.desktop 20 Nov 2005 18:40:53 -0000 1.2 +++ tinyerp.desktop 19 May 2006 13:28:37 -0000 1.3 @@ -4,7 +4,7 @@ GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client -Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png +Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png StartupNotify=true Terminal=false Type=Application Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- tinyerp.spec 18 Mar 2006 14:41:46 -0000 1.14 +++ tinyerp.spec 19 May 2006 13:28:37 -0000 1.15 @@ -1,15 +1,33 @@ +#### options: +# Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 +%define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif + %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: tinyerp -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org -Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz -Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz +Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz +Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop Source3: tinyerp-server.conf Source4: tinyerp-server @@ -18,11 +36,17 @@ BuildArch: noarch BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python, pydot -BuildRequires: desktop-file-utils, xorg-x11-Xvfb +BuildRequires: desktop-file-utils +%if %_modular_X +BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base +%define _xvfb /usr/bin/Xvfb +%else +BuildRequires: xorg-x11-Xvfb +%define _xvfb /usr/X11R6/bin/Xvfb +%endif Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch -Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -50,23 +74,20 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 -%patch2 %build -cd client -# fix filename for the czech translation -mv bin/po/cz.po bin/po/cs.po -/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT -cd client -/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client @@ -79,7 +100,7 @@ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client -for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do +for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/tinyerp-client/$i $i done @@ -139,20 +160,35 @@ %changelog -* Sat Mar 18 2006 Dan Horak 3.2.1-2 +* Fri May 19 2006 Dan Horak 3.3.0-1 +- update to upstream tinyerp 3.3.0 +- the pidlog patch was integrated into upstream +- unified the specfile for FC < 5 and FC >=5 +- used new icon in the desktop file + +* Sat Mar 18 2006 Dan Horak 3.2.1-3 - new config file with only default values (#184505) - added a patch for handling the pid and log file in the server (#184502) +* Tue Feb 14 2006 Dan Horak 3.2.1-2 +- rebuild for Fedora Extras 5 + * Mon Jan 30 2006 Dan Horak 3.2.1-1 - update to upstream tinyerp 3.2.1 - fixed filename for the czech translation +* Wed Jan 25 2006 Dan Horak 3.2.0-2 +- add updated server patch + * Wed Jan 25 2006 Dan Horak 3.2.0-1 - update to upstream tinyerp 3.2.0 - fixed status function in the init.d script - fixed using localization for the client - include all distributed addons +* Wed Jan 4 2006 Dan Horak 3.1.1-6 +- added new Xorg dependencies + * Sun Dec 18 2005 Dan Horak 3.1.1-5 - added Requires(postun) to the -server package (Ville Skytt??) - improved startup script, suggested by Enrico Scholz --- tinyerp-server-pidlog.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 13:30:01 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 19 May 2006 06:30:01 -0700 Subject: rpms/tinyerp/FC-3 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tinyerp-client.patch, 1.4, 1.5 tinyerp-server.patch, 1.6, 1.7 tinyerp.desktop, 1.2, 1.3 tinyerp.spec, 1.12, 1.13 tinyerp-server-pidlog.patch, 1.1, NONE Message-ID: <200605191330.k4JDU3Dj032409@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32369 Modified Files: .cvsignore sources tinyerp-client.patch tinyerp-server.patch tinyerp.desktop tinyerp.spec Removed Files: tinyerp-server-pidlog.patch Log Message: - updated to upstream version 3.3.0 - updated the client and server patches - removed the pidlog patch as it was integrated upstream - unified the spec file for FC < 5 and FC >= 5 - used a new icon in the desktop file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 30 Jan 2006 13:42:31 -0000 1.6 +++ .cvsignore 19 May 2006 13:30:01 -0000 1.7 @@ -1,2 +1,2 @@ -tinyerp-client-3.2.1.tgz -tinyerp-server-3.2.1.tgz +tinyerp-client-3.3.0.tar.gz +tinyerp-server-3.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 30 Jan 2006 13:42:31 -0000 1.6 +++ sources 19 May 2006 13:30:01 -0000 1.7 @@ -1,2 +1,2 @@ -5e588d39d139f6b66c9f66e59e089d4c tinyerp-client-3.2.1.tgz -4acbbd8e8fac798ea3e9da08e076b465 tinyerp-server-3.2.1.tgz +93364c3aae7c64dd71ced12133a16574 tinyerp-client-3.3.0.tar.gz +ece14c707f91f2b5b4b46906899e6d9d tinyerp-server-3.3.0.tar.gz tinyerp-client.patch: Index: tinyerp-client.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-client.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-client.patch 30 Jan 2006 13:42:31 -0000 1.4 +++ tinyerp-client.patch 19 May 2006 13:30:01 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py ---- client.orig/bin/tinyerp-client.py 2006-01-27 11:50:28.000000000 +0100 -+++ client/bin/tinyerp-client.py 2006-01-30 14:22:52.000000000 +0100 +diff -Nru tinyerp-client-3.3.0.orig/bin/tinyerp-client.py tinyerp-client-3.3.0/bin/tinyerp-client.py +--- tinyerp-client-3.3.0.orig/bin/tinyerp-client.py 2006-05-18 18:06:39.000000000 +0200 ++++ tinyerp-client-3.3.0/bin/tinyerp-client.py 2006-05-19 13:15:25.000000000 +0200 @@ -73,14 +73,13 @@ import pango @@ -20,15 +20,3 @@ import options -diff -Nru client.orig/setup.py client/setup.py ---- client.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ client/setup.py 2006-01-30 14:22:58.000000000 +0100 -@@ -18,7 +18,7 @@ - opj = os.path.join - - name = 'tinyerp-client' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tinyerp-server.patch 18 Mar 2006 14:39:57 -0000 1.6 +++ tinyerp-server.patch 19 May 2006 13:30:01 -0000 1.7 @@ -1,23 +1,27 @@ -diff -Nru server.orig/setup.py server/setup.py ---- server.orig/setup.py 2006-01-23 10:43:47.000000000 +0100 -+++ server/setup.py 2006-01-30 14:23:25.000000000 +0100 -@@ -21,14 +21,16 @@ - opj = os.path.join +diff -Nru tinyerp-server-3.3.0.orig/setup.py tinyerp-server-3.3.0/setup.py +--- tinyerp-server-3.3.0.orig/setup.py 2006-05-19 10:56:54.000000000 +0200 ++++ tinyerp-server-3.3.0/setup.py 2006-05-19 13:21:04.000000000 +0200 +@@ -28,11 +28,18 @@ - name = 'tinyerp-server' --version = '3.2.0' -+version = '3.2.1' - - # get python short version - py_short_version = '%s.%s' % sys.version_info[:2] - --included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter', -+included_addons = ['account', 'audittrail', 'base', 'base_partner_relation', -+ 'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter', - 'marketing', 'mrp', -- 'network', 'product', 'project', 'purchase', 'sale', -+ 'network', 'product', 'product_electronic', 'product_expiry', -+ 'project', 'purchase', 'sale', 'scrum', - 'stock', 'subscription'] + included_addons = [ + 'account', 'account_followup', 'airport', 'audittrail', +- 'base','base_partner_relation', 'crm', 'custom', 'delivery', 'edi', 'esale', +- 'hr', 'hr_timesheet', 'marketing', 'mrp', 'network', 'oscommerce', +- 'product','product_electronic', 'product_expiry', 'product_extended', +- 'productivity_analysis', 'project', 'purchase', 'sale', 'sandwich', 'scrum', +- 'stock', 'subscription', 'travel', ++ 'base','base_partner_relation', ++ 'crm', 'custom', ++ 'delivery', ++ 'edi', 'esale', ++ 'hr', 'hr_timesheet', 'hr_timesheet_project', ++ 'letter', ++ 'marketing', 'mrp', ++ 'network', ++ 'oscommerce', ++ 'product','product_electronic', 'product_expiry', 'product_extended', 'productivity_analysis', 'project', 'purchase', ++ 'sale', 'sandwich', 'scrum', 'stock', 'subscription', ++ 'travel', + 'l10n_be', 'l10n_ca-qc', 'l10n_ch', 'l10n_fr', 'l10n_se', 'l10n_simple',] required_modules = [('psycopg', 'PostgreSQL module'), Index: tinyerp.desktop =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp.desktop 27 Nov 2005 09:26:58 -0000 1.2 +++ tinyerp.desktop 19 May 2006 13:30:01 -0000 1.3 @@ -4,7 +4,7 @@ GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client -Icon=/usr/share/pixmaps/tinyerp-client/tinyerp.png +Icon=/usr/share/pixmaps/tinyerp-client/tinyerp_icon.png StartupNotify=true Terminal=false Type=Application Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- tinyerp.spec 18 Mar 2006 14:39:57 -0000 1.12 +++ tinyerp.spec 19 May 2006 13:30:01 -0000 1.13 @@ -1,15 +1,33 @@ +#### options: +# Use --with/--without modular_X to rebuild with/without modular X deps + +#### default options: +%if 0%{?fedora} +%if 0%{?fedora} < 5 +# default to non-modular X on FC < 5 +%define _modular_X 0%{?_with_modular_x:1} +%else +# default to modular X on FC >= 5 +%define _modular_X 0%{!?_without_modular_x:1} +%endif +%else +# default to modular X elsewhere +%define _modular_X 0%{!?_without_modular_x:1} +%endif + %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: tinyerp -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.3.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org -Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz -Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz +Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz +Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop Source3: tinyerp-server.conf Source4: tinyerp-server @@ -18,11 +36,17 @@ BuildArch: noarch BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python, pydot -BuildRequires: desktop-file-utils, xorg-x11-Xvfb +BuildRequires: desktop-file-utils +%if %_modular_X +BuildRequires: xorg-x11-server-Xvfb, xorg-x11-fonts-base +%define _xvfb /usr/bin/Xvfb +%else +BuildRequires: xorg-x11-Xvfb +%define _xvfb /usr/X11R6/bin/Xvfb +%endif Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch -Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -50,23 +74,20 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 -%patch2 %build -cd client -# fix filename for the czech translation -mv bin/po/cz.po bin/po/cs.po -/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT -cd client -/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & +cd tinyerp-client-%{version} +%{_xvfb} :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT -cd ../server +cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client @@ -79,7 +100,7 @@ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp-client -for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do +for i in tinyerp.png tinyerp_icon.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/tinyerp-client/$i $i done @@ -139,20 +160,35 @@ %changelog -* Sat Mar 18 2006 Dan Horak 3.2.1-2 +* Fri May 19 2006 Dan Horak 3.3.0-1 +- update to upstream tinyerp 3.3.0 +- the pidlog patch was integrated into upstream +- unified the specfile for FC < 5 and FC >=5 +- used new icon in the desktop file + +* Sat Mar 18 2006 Dan Horak 3.2.1-3 - new config file with only default values (#184505) - added a patch for handling the pid and log file in the server (#184502) +* Tue Feb 14 2006 Dan Horak 3.2.1-2 +- rebuild for Fedora Extras 5 + * Mon Jan 30 2006 Dan Horak 3.2.1-1 - update to upstream tinyerp 3.2.1 - fixed filename for the czech translation +* Wed Jan 25 2006 Dan Horak 3.2.0-2 +- add updated server patch + * Wed Jan 25 2006 Dan Horak 3.2.0-1 - update to upstream tinyerp 3.2.0 - fixed status function in the init.d script - fixed using localization for the client - include all distributed addons +* Wed Jan 4 2006 Dan Horak 3.1.1-6 +- added new Xorg dependencies + * Sun Dec 18 2005 Dan Horak 3.1.1-5 - added Requires(postun) to the -server package (Ville Skytt??) - improved startup script, suggested by Enrico Scholz --- tinyerp-server-pidlog.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 13:51:39 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 19 May 2006 06:51:39 -0700 Subject: rpms/mercurial/FC-5 mercurial.spec,1.9,1.10 sources,1.7,1.8 Message-ID: <200605191351.k4JDpfTw032562@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32543 Modified Files: mercurial.spec sources Log Message: * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-5/mercurial.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mercurial.spec 10 Apr 2006 19:20:57 -0000 1.9 +++ mercurial.spec 19 May 2006 13:51:39 -0000 1.10 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.8.1 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -44,6 +44,9 @@ %changelog +* Fri May 12 2006 Mihai Ibanescu - 0.9-1 +- update to 0.9 + * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 19:20:57 -0000 1.7 +++ sources 19 May 2006 13:51:39 -0000 1.8 @@ -1 +1 @@ -ffa37810cf9c48608f5172a622bef2f5 mercurial-0.8.1.tar.gz +d4154d12dcbda78251750c2a18eae940 mercurial-0.9.tar.gz From fedora-extras-commits at redhat.com Fri May 19 13:56:44 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 19 May 2006 06:56:44 -0700 Subject: rpms/mercurial/FC-4 mercurial.spec,1.6,1.7 sources,1.7,1.8 Message-ID: <200605191356.k4JDukGV032644@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32625 Modified Files: mercurial.spec sources Log Message: * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mercurial.spec 10 Apr 2006 19:21:11 -0000 1.6 +++ mercurial.spec 19 May 2006 13:56:44 -0000 1.7 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.8.1 +Version: 0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -44,6 +44,9 @@ %changelog +* Fri May 12 2006 Mihai Ibanescu - 0.9-1 +- update to 0.9 + * Mon Apr 10 2006 Jeremy Katz - 0.8.1-1 - update to 0.8.1 - add man pages (#188144) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 19:21:11 -0000 1.7 +++ sources 19 May 2006 13:56:44 -0000 1.8 @@ -1 +1 @@ -ffa37810cf9c48608f5172a622bef2f5 mercurial-0.8.1.tar.gz +d4154d12dcbda78251750c2a18eae940 mercurial-0.9.tar.gz From fedora-extras-commits at redhat.com Fri May 19 14:00:02 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:00:02 -0700 Subject: rpms/isic - New directory Message-ID: <200605191400.k4JE04ib000301@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32736/isic Log Message: Directory /cvs/extras/rpms/isic added to the repository From fedora-extras-commits at redhat.com Fri May 19 14:00:02 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:00:02 -0700 Subject: rpms/isic/devel - New directory Message-ID: <200605191400.k4JE04jn000306@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32736/isic/devel Log Message: Directory /cvs/extras/rpms/isic/devel added to the repository From fedora-extras-commits at redhat.com Fri May 19 14:00:51 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:00:51 -0700 Subject: rpms/isic Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605191400.k4JE0r25000375@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv342 Added Files: Makefile import.log Log Message: Setup of module isic --- NEW FILE Makefile --- # Top level Makefile for module isic all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 19 14:00:51 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:00:51 -0700 Subject: rpms/isic/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605191400.k4JE0rSH000378@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv342/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module isic --- NEW 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 May 19 14:02:13 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:02:13 -0700 Subject: rpms/isic import.log,1.1,1.2 Message-ID: <200605191402.k4JE2kHV002696@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2656 Modified Files: import.log Log Message: auto-import isic-0.06-2 on branch devel from isic-0.06-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/isic/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 May 2006 14:00:50 -0000 1.1 +++ import.log 19 May 2006 14:02:13 -0000 1.2 @@ -0,0 +1 @@ +isic-0_06-2:HEAD:isic-0.06-2.src.rpm:1148047311 From fedora-extras-commits at redhat.com Fri May 19 14:02:17 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:02:17 -0700 Subject: rpms/isic/devel isic-0.06-gcc4.patch, NONE, 1.1 isic-0.06-make.patch, NONE, 1.1 isic.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605191402.k4JE2oEO002698@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/rpms/isic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2656/devel Modified Files: .cvsignore sources Added Files: isic-0.06-gcc4.patch isic-0.06-make.patch isic.spec Log Message: auto-import isic-0.06-2 on branch devel from isic-0.06-2.src.rpm isic-0.06-gcc4.patch: --- NEW FILE isic-0.06-gcc4.patch --- diff -urNad isic-0.06~/icmpsic.c isic-0.06/icmpsic.c --- isic-0.06~/icmpsic.c 2004-11-06 21:11:11.000000000 +0100 +++ isic-0.06/icmpsic.c 2005-10-18 00:29:41.000000000 +0200 @@ -265,7 +265,7 @@ payload = (short int *)((u_char *) icmp + 4); for(cx = 0; cx <= (payload_s >> 1); cx+=1) - (u_short) payload[cx] = rand() & 0xffff; + payload[cx] = rand() & 0xffff; if ( rand() <= (RAND_MAX * ICMPCksm) ) diff -urNad isic-0.06~/isic.c isic-0.06/isic.c --- isic-0.06~/isic.c 2004-11-06 21:11:14.000000000 +0100 +++ isic-0.06/isic.c 2005-10-18 00:29:41.000000000 +0200 @@ -229,8 +229,8 @@ payload = (short int *)(buf + IP_H); for(cx = 0; cx <= (payload_s >> 1); cx+=1) - (u_int16_t) payload[cx] = rand() & 0xffff; - (u_int16_t) payload[payload_s] = rand() & 0xffff; + payload[cx] = rand() & 0xffff; + payload[payload_s] = rand() & 0xffff; if ( printout ) { printf("%s ->", diff -urNad isic-0.06~/tcpsic.c isic-0.06/tcpsic.c --- isic-0.06~/tcpsic.c 2004-11-06 21:11:16.000000000 +0100 +++ isic-0.06/tcpsic.c 2005-10-18 00:29:41.000000000 +0200 @@ -317,7 +317,7 @@ payload = (short int *)((u_char *) tcp + 20); for(cx = 0; cx <= (payload_s >> 1); cx+=1) - (u_int16_t) payload[cx] = rand() & 0xffff; + payload[cx] = rand() & 0xffff; if ( rand() <= (RAND_MAX * TCPCksm) ) libnet_do_checksum(l, (u_int8_t *)buf, IPPROTO_TCP, (tcp->th_off << 2) diff -urNad isic-0.06~/udpsic.c isic-0.06/udpsic.c --- isic-0.06~/udpsic.c 2004-11-06 21:11:20.000000000 +0100 +++ isic-0.06/udpsic.c 2005-10-18 00:29:41.000000000 +0200 @@ -292,7 +292,7 @@ payload = (short int *)((u_char *) udp + UDP_H); for(cx = 0; cx <= (payload_s >> 1); cx+=1) - (u_int16_t) payload[cx] = rand() & 0xffff; + payload[cx] = rand() & 0xffff; if ( printout ) { printf("%s,%i ->", isic-0.06-make.patch: --- NEW FILE isic-0.06-make.patch --- --- Makefile.in.orig 2006-05-18 14:43:37.000000000 -0400 +++ Makefile.in 2006-05-18 14:48:07.000000000 -0400 @@ -2,7 +2,7 @@ # To build for Trinux, add '-static' to LDFLAGS # and 'strip *sic' after they compile -PREFIX ?= /usr/local +PREFIX ?= @prefix@ CC = @CC@ DEFS = @DEFS@ `libnet-config --defines` @@ -48,5 +48,5 @@ tar -czvf isic-$(VERSION).tgz isic-$(VERSION)/* ) install: $(BINS) - $(INSTALL) -m 0755 -d ${PREFIX}/bin - $(INSTALL) -m 0755 -c $(BINS) ${PREFIX}/bin + $(INSTALL) -m 0755 -d $(DESTDIR)${PREFIX}/bin + $(INSTALL) -m 0755 -c $(BINS) $(DESTDIR)${PREFIX}/bin --- NEW FILE isic.spec --- Name: isic Version: 0.06 Release: 2%{?dist} Summary: IP Stack Integrity Checker Group: Applications/Internet License: BSD Url: http://www.packetfactory.net/projects/ISIC/ Source0: http://www.packetfactory.net/projects/ISIC/%{name}-%{version}.tgz Patch1: isic-0.06-gcc4.patch Patch2: isic-0.06-make.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libnet >= 1.1.0 BuildRequires: libnet-devel >= 1.1.0 %description ISIC is a suite of utilities to exercise the stability of an IP Stack and its component stacks (TCP, UDP, ICMP et. al.) It generates piles of pseudo random packets of the target protocol. The packets be given tendancies to conform to. Ie 50% of the packets generated can have IP Options. 25% of the packets can be IP fragments... But the percentages are arbitrary and most of the packet fields have a configurable tendancy. The packets are then sent against the target machine to either penetrate its firewall rules or find bugs in the IP stack. ISIC also contains a utility generate raw ether frames to examine hardware implementations. %prep %setup -q %patch1 -p1 -b .gcc4 %patch2 -p0 -b .make chmod 644 wrapper.sh %build %configure --prefix=/usr --libdir=/usr/%{_lib} --mandir=/usr/share/man make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/esic %{_bindir}/icmpsic %{_bindir}/isic %{_bindir}/tcpsic %{_bindir}/udpsic %doc README ChangeLog INSTALL wrapper.sh %changelog * Thu May 18 2006 Jarod Wilson 0.06-2 - make wrapper.sh chmod 644 * Thu May 18 2006 Jarod Wilson 0.06-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/isic/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 May 2006 14:00:51 -0000 1.1 +++ .cvsignore 19 May 2006 14:02:17 -0000 1.2 @@ -0,0 +1 @@ +isic-0.06.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/isic/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 May 2006 14:00:51 -0000 1.1 +++ sources 19 May 2006 14:02:17 -0000 1.2 @@ -0,0 +1 @@ +289304088b6bd34008449ec20b3af423 isic-0.06.tgz From fedora-extras-commits at redhat.com Fri May 19 14:12:07 2006 From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson)) Date: Fri, 19 May 2006 07:12:07 -0700 Subject: owners owners.list,1.1021,1.1022 Message-ID: <200605191412.k4JECAR3002815@cvs-int.fedora.redhat.com> Author: jwilson Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796 Modified Files: owners.list Log Message: Add isic to list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1021 retrieving revision 1.1022 diff -u -r1.1021 -r1.1022 --- owners.list 18 May 2006 20:20:22 -0000 1.1021 +++ owners.list 19 May 2006 14:12:07 -0000 1.1022 @@ -535,6 +535,7 @@ Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|ircd-hybrid|Internet Relay Chat Server|eric.tanguy at univ-nantes.fr|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|isic|IP Stack Integrity Checker|jwilson at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|istanbul|Desktop Session Recorder|jspaleta at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|itcl|Object oriented extension to Tcl|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|itext|A Free Java-PDF library|green at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 19 15:44:02 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 19 May 2006 08:44:02 -0700 Subject: rpms/galago-daemon/devel galago-daemon.spec,1.1,1.2 Message-ID: <200605191544.k4JFi4lK005499@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5480 Modified Files: galago-daemon.spec Log Message: * Fri May 19 2006 Brian Pepple - 0.5.0-3 - Bump. Index: galago-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/devel/galago-daemon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- galago-daemon.spec 18 May 2006 19:35:03 -0000 1.1 +++ galago-daemon.spec 19 May 2006 15:44:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: galago-daemon Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Galago presence daemon Group: System Environment/Daemons @@ -45,6 +45,9 @@ %changelog +* Fri May 19 2006 Brian Pepple - 0.5.0-3 +- Bump. + * Thu May 18 2006 Brian Pepple - 0.5.0-2 - Mark file as %%config. From fedora-extras-commits at redhat.com Fri May 19 16:11:10 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Fri, 19 May 2006 09:11:10 -0700 Subject: owners owners.list,1.1022,1.1023 Message-ID: <200605191611.k4JGBCkr007970@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7953 Modified Files: owners.list Log Message: Changed my email address (also done in bugzilla) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1022 retrieving revision 1.1023 diff -u -r1.1022 -r1.1023 --- owners.list 19 May 2006 14:12:07 -0000 1.1022 +++ owners.list 19 May 2006 16:11:10 -0000 1.1023 @@ -159,7 +159,7 @@ Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org| -Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org| +Fedora Extras|conserver|Serial console server daemon/client|jima at beer.tclug.org|extras-qa at fedoraproject.org| Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|contacts|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org| @@ -216,7 +216,7 @@ Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com -Fedora Extras|dnsmasq|A lightweight DHCP/caching DNS server|jima at auroralinux.org|extras-qa at fedoraproject.org| +Fedora Extras|dnsmasq|A lightweight DHCP/caching DNS server|jima at beer.tclug.org|extras-qa at fedoraproject.org| Fedora Extras|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|doctorj|Java source code analyzer|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org| @@ -1649,7 +1649,7 @@ Fedora Extras|uw-imap|UW Server daemons for IMAP and POP network mail protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at auroralinux.org|extras-qa at fedoraproject.org| +Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at beer.tclug.org|extras-qa at fedoraproject.org| Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 19 16:12:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 19 May 2006 09:12:42 -0700 Subject: rpms/rogue/FC-5 rogue-5.4-setgid.patch,1.1,1.2 rogue.spec,1.4,1.5 Message-ID: <200605191613.k4JGDEK6008024@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7976/FC-5 Modified Files: rogue-5.4-setgid.patch rogue.spec Log Message: - Added empty initial scoreboard file. - Better setuid/setgid handling (BZ #187392) rogue-5.4-setgid.patch: Index: rogue-5.4-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/rogue/FC-5/rogue-5.4-setgid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue-5.4-setgid.patch 11 Apr 2006 02:04:46 -0000 1.1 +++ rogue-5.4-setgid.patch 19 May 2006 16:12:41 -0000 1.2 @@ -1,6 +1,6 @@ -diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c +diff -Naur rogue/extern.c rogue.new/extern.c --- rogue/extern.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/extern.c 2006-03-30 13:24:12.000000000 -0800 ++++ rogue.new/extern.c 2006-05-15 15:43:43.000000000 -0700 @@ -111,7 +111,7 @@ }; @@ -10,9 +10,9 @@ int food_left; /* Amount of food in hero's stomach */ int lastscore = -1; /* Score before this turn */ int no_command = 0; /* Number of turns asleep */ -diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h ---- rogue/extern.h 2006-03-19 11:22:14.000000000 -0800 -+++ rogue.new/extern.h 2006-03-30 13:24:22.000000000 -0800 +diff -Naur rogue/extern.h rogue.new/extern.h +--- rogue/extern.h 2006-05-15 15:43:15.000000000 -0700 ++++ rogue.new/extern.h 2006-05-15 15:43:43.000000000 -0700 @@ -50,7 +50,7 @@ extern char fruit[], orig_dsusp, prbuf[], whoami[]; @@ -22,9 +22,9 @@ #ifdef TIOCGLTC extern struct ltchars ltc; -diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c +diff -Naur rogue/mach_dep.c rogue.new/mach_dep.c --- rogue/mach_dep.c 2006-01-30 08:36:21.000000000 -0800 -+++ rogue.new/mach_dep.c 2006-04-01 19:26:15.000000000 -0800 ++++ rogue.new/mach_dep.c 2006-05-15 15:43:43.000000000 -0700 @@ -45,7 +45,9 @@ #include #include @@ -87,9 +87,9 @@ md_normaluser(); } -diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c +diff -Naur rogue/main.c rogue.new/main.c --- rogue/main.c 2006-01-29 16:11:32.000000000 -0800 -+++ rogue.new/main.c 2006-03-30 13:40:16.000000000 -0800 ++++ rogue.new/main.c 2006-05-15 15:43:43.000000000 -0700 @@ -24,6 +24,13 @@ char *env; int lowtime; @@ -112,9 +112,9 @@ if (argc == 2) if (strcmp(argv[1], "-s") == 0) { -diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c +diff -Naur rogue/mdport.c rogue.new/mdport.c --- rogue/mdport.c 2006-01-29 18:24:39.000000000 -0800 -+++ rogue.new/mdport.c 2006-04-01 19:26:16.000000000 -0800 ++++ rogue.new/mdport.c 2006-05-15 15:45:21.000000000 -0700 @@ -193,8 +193,17 @@ md_normaluser() { @@ -135,7 +135,7 @@ #endif } -@@ -397,22 +406,31 @@ +@@ -397,22 +406,35 @@ char * md_getroguedir() { @@ -143,7 +143,11 @@ + static char path[PATH_MAX]; char *end,*home; - if ( (home = getenv("ROGUEHOME")) != NULL) +- if ( (home = getenv("ROGUEHOME")) != NULL) ++ /* Disable the use of ROGUEHOME to prevent users from ++ * maliciously overwriting save files from other setgid games. ++ */ ++ if ( (home = getenv("ROGUEHOME")) != NULL && 0) { if (*home) { @@ -156,30 +160,31 @@ - - if (directory_exists(path)) - return(path); -+ if (strlen(home) > PATH_MAX-20) { ++ /* The magic number 20 is used to guarantee that the save/lock ++ * filenames (which are much shorter than 20 characters) can ++ * be appended to this buffer. ++ */ ++ if (strlen(home) >= PATH_MAX-20) { + fprintf(stderr, "ROGUEHOME path is too long. Ignoring.\n"); + } else { -+ strncpy(path, home, PATH_MAX-20); -+ /* Ensure that we have a terminating NULL character. -+ */ -+ path[PATH_MAX-1] = (char)NULL; -+ -+ end = &path[strlen(path)-1]; -+ ++ strcpy(path, home); ++ ++ end = &path[strlen(path)-1]; ++ + /* Strip off any trailing path separators from the path. + */ -+ while( (end >= path) && ((*end == '/') || (*end == '\\'))) -+ *end-- = '\0'; -+ -+ if (directory_exists(path)) -+ return(path); ++ while( (end >= path) && ((*end == '/') || (*end == '\\'))) ++ *end-- = '\0'; ++ ++ if (directory_exists(path)) ++ return(path); + } } } -diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c +diff -Naur rogue/rip.c rogue.new/rip.c --- rogue/rip.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/rip.c 2006-03-30 13:32:17.000000000 -0800 ++++ rogue.new/rip.c 2006-05-15 15:43:43.000000000 -0700 @@ -60,7 +60,6 @@ int i; SCORE *sc2; @@ -239,9 +244,9 @@ } /* -diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c +diff -Naur rogue/save.c rogue.new/save.c --- rogue/save.c 2006-01-30 08:05:35.000000000 -0800 -+++ rogue.new/save.c 2006-03-30 13:33:45.000000000 -0800 ++++ rogue.new/save.c 2006-05-15 15:43:43.000000000 -0700 @@ -335,7 +335,40 @@ /* @@ -302,9 +307,9 @@ sscanf(scoreline, " %u %hu %u %hu %hu %lx \n", &top_ten[i].sc_uid, &top_ten[i].sc_score, &top_ten[i].sc_flags, &top_ten[i].sc_monster, -diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c +diff -Naur rogue/state.c rogue.new/state.c --- rogue/state.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/state.c 2006-03-30 13:09:46.000000000 -0800 ++++ rogue.new/state.c 2006-05-15 15:43:43.000000000 -0700 @@ -2138,7 +2138,8 @@ rs_write_int(savef, no_food); rs_write_ints(savef,a_class,MAXARMORS); Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/FC-5/rogue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rogue.spec 11 Apr 2006 02:02:20 -0000 1.4 +++ rogue.spec 19 May 2006 16:12:41 -0000 1.5 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -49,6 +49,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ +touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr + %clean rm -rf $RPM_BUILD_ROOT @@ -73,11 +75,16 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/rogue.png %dir %attr(0775,games,games) %{_var}/games/roguelike +%config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog +* Fri May 19 2006 Wart 5.4.2-5 +- Added empty initial scoreboard file. +- Better setuid/setgid handling (again) (BZ #187392) + * Thu Mar 30 2006 Wart 5.4.2-4 - Better setuid/setgid handling (BZ #187392) - Resize desktop icon to match directory name From fedora-extras-commits at redhat.com Fri May 19 16:12:41 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 19 May 2006 09:12:41 -0700 Subject: rpms/rogue/FC-4 rogue-5.4-setgid.patch,1.1,1.2 rogue.spec,1.4,1.5 Message-ID: <200605191613.k4JGDDnb008020@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7976/FC-4 Modified Files: rogue-5.4-setgid.patch rogue.spec Log Message: - Added empty initial scoreboard file. - Better setuid/setgid handling (BZ #187392) rogue-5.4-setgid.patch: Index: rogue-5.4-setgid.patch =================================================================== RCS file: /cvs/extras/rpms/rogue/FC-4/rogue-5.4-setgid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue-5.4-setgid.patch 11 Apr 2006 02:05:19 -0000 1.1 +++ rogue-5.4-setgid.patch 19 May 2006 16:12:41 -0000 1.2 @@ -1,6 +1,6 @@ -diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c +diff -Naur rogue/extern.c rogue.new/extern.c --- rogue/extern.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/extern.c 2006-03-30 13:24:12.000000000 -0800 ++++ rogue.new/extern.c 2006-05-15 15:43:43.000000000 -0700 @@ -111,7 +111,7 @@ }; @@ -10,9 +10,9 @@ int food_left; /* Amount of food in hero's stomach */ int lastscore = -1; /* Score before this turn */ int no_command = 0; /* Number of turns asleep */ -diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h ---- rogue/extern.h 2006-03-19 11:22:14.000000000 -0800 -+++ rogue.new/extern.h 2006-03-30 13:24:22.000000000 -0800 +diff -Naur rogue/extern.h rogue.new/extern.h +--- rogue/extern.h 2006-05-15 15:43:15.000000000 -0700 ++++ rogue.new/extern.h 2006-05-15 15:43:43.000000000 -0700 @@ -50,7 +50,7 @@ extern char fruit[], orig_dsusp, prbuf[], whoami[]; @@ -22,9 +22,9 @@ #ifdef TIOCGLTC extern struct ltchars ltc; -diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c +diff -Naur rogue/mach_dep.c rogue.new/mach_dep.c --- rogue/mach_dep.c 2006-01-30 08:36:21.000000000 -0800 -+++ rogue.new/mach_dep.c 2006-04-01 19:26:15.000000000 -0800 ++++ rogue.new/mach_dep.c 2006-05-15 15:43:43.000000000 -0700 @@ -45,7 +45,9 @@ #include #include @@ -87,9 +87,9 @@ md_normaluser(); } -diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c +diff -Naur rogue/main.c rogue.new/main.c --- rogue/main.c 2006-01-29 16:11:32.000000000 -0800 -+++ rogue.new/main.c 2006-03-30 13:40:16.000000000 -0800 ++++ rogue.new/main.c 2006-05-15 15:43:43.000000000 -0700 @@ -24,6 +24,13 @@ char *env; int lowtime; @@ -112,9 +112,9 @@ if (argc == 2) if (strcmp(argv[1], "-s") == 0) { -diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c +diff -Naur rogue/mdport.c rogue.new/mdport.c --- rogue/mdport.c 2006-01-29 18:24:39.000000000 -0800 -+++ rogue.new/mdport.c 2006-04-01 19:26:16.000000000 -0800 ++++ rogue.new/mdport.c 2006-05-15 15:45:21.000000000 -0700 @@ -193,8 +193,17 @@ md_normaluser() { @@ -135,7 +135,7 @@ #endif } -@@ -397,22 +406,31 @@ +@@ -397,22 +406,35 @@ char * md_getroguedir() { @@ -143,7 +143,11 @@ + static char path[PATH_MAX]; char *end,*home; - if ( (home = getenv("ROGUEHOME")) != NULL) +- if ( (home = getenv("ROGUEHOME")) != NULL) ++ /* Disable the use of ROGUEHOME to prevent users from ++ * maliciously overwriting save files from other setgid games. ++ */ ++ if ( (home = getenv("ROGUEHOME")) != NULL && 0) { if (*home) { @@ -156,30 +160,31 @@ - - if (directory_exists(path)) - return(path); -+ if (strlen(home) > PATH_MAX-20) { ++ /* The magic number 20 is used to guarantee that the save/lock ++ * filenames (which are much shorter than 20 characters) can ++ * be appended to this buffer. ++ */ ++ if (strlen(home) >= PATH_MAX-20) { + fprintf(stderr, "ROGUEHOME path is too long. Ignoring.\n"); + } else { -+ strncpy(path, home, PATH_MAX-20); -+ /* Ensure that we have a terminating NULL character. -+ */ -+ path[PATH_MAX-1] = (char)NULL; -+ -+ end = &path[strlen(path)-1]; -+ ++ strcpy(path, home); ++ ++ end = &path[strlen(path)-1]; ++ + /* Strip off any trailing path separators from the path. + */ -+ while( (end >= path) && ((*end == '/') || (*end == '\\'))) -+ *end-- = '\0'; -+ -+ if (directory_exists(path)) -+ return(path); ++ while( (end >= path) && ((*end == '/') || (*end == '\\'))) ++ *end-- = '\0'; ++ ++ if (directory_exists(path)) ++ return(path); + } } } -diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c +diff -Naur rogue/rip.c rogue.new/rip.c --- rogue/rip.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/rip.c 2006-03-30 13:32:17.000000000 -0800 ++++ rogue.new/rip.c 2006-05-15 15:43:43.000000000 -0700 @@ -60,7 +60,6 @@ int i; SCORE *sc2; @@ -239,9 +244,9 @@ } /* -diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c +diff -Naur rogue/save.c rogue.new/save.c --- rogue/save.c 2006-01-30 08:05:35.000000000 -0800 -+++ rogue.new/save.c 2006-03-30 13:33:45.000000000 -0800 ++++ rogue.new/save.c 2006-05-15 15:43:43.000000000 -0700 @@ -335,7 +335,40 @@ /* @@ -302,9 +307,9 @@ sscanf(scoreline, " %u %hu %u %hu %hu %lx \n", &top_ten[i].sc_uid, &top_ten[i].sc_score, &top_ten[i].sc_flags, &top_ten[i].sc_monster, -diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c +diff -Naur rogue/state.c rogue.new/state.c --- rogue/state.c 2006-01-03 16:17:29.000000000 -0800 -+++ rogue.new/state.c 2006-03-30 13:09:46.000000000 -0800 ++++ rogue.new/state.c 2006-05-15 15:43:43.000000000 -0700 @@ -2138,7 +2138,8 @@ rs_write_int(savef, no_food); rs_write_ints(savef,a_class,MAXARMORS); Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/FC-4/rogue.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rogue.spec 11 Apr 2006 02:05:19 -0000 1.4 +++ rogue.spec 19 May 2006 16:12:41 -0000 1.5 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -49,6 +49,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ +touch $RPM_BUILD_ROOT%{_var}/games/roguelike/rogue54.scr + %clean rm -rf $RPM_BUILD_ROOT @@ -73,11 +75,16 @@ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/rogue.png %dir %attr(0775,games,games) %{_var}/games/roguelike +%config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog +* Fri May 19 2006 Wart 5.4.2-5 +- Added empty initial scoreboard file. +- Better setuid/setgid handling (again) (BZ #187392) + * Thu Mar 30 2006 Wart 5.4.2-4 - Better setuid/setgid handling (BZ #187392) - Resize desktop icon to match directory name From fedora-extras-commits at redhat.com Fri May 19 17:14:19 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 10:14:19 -0700 Subject: owners owners.list,1.1023,1.1024 Message-ID: <200605191714.k4JHEJCk010756@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10733 Modified Files: owners.list Log Message: Warren Togami takes ownership of perl-Net-Netmask in order to revive pop-before-smtp. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1023 retrieving revision 1.1024 diff -u -r1.1023 -r1.1024 --- owners.list 19 May 2006 16:11:10 -0000 1.1023 +++ owners.list 19 May 2006 17:14:19 -0000 1.1024 @@ -1146,7 +1146,7 @@ Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Patricia|Patricia Trie perl module for fast IP address lookups|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 19 18:54:17 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 19 May 2006 11:54:17 -0700 Subject: rpms/python-kid/devel .cvsignore, 1.8, 1.9 python-kid.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605191854.k4JIsJWC025397@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25342/devel Modified Files: .cvsignore python-kid.spec sources Log Message: Version 0.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 18:15:09 -0000 1.8 +++ .cvsignore 19 May 2006 18:54:17 -0000 1.9 @@ -1 +1 @@ -kid-0.9.tar.gz +kid-0.9.1.tar.gz Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/python-kid.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-kid.spec 29 Mar 2006 04:03:12 -0000 1.8 +++ python-kid.spec 19 May 2006 18:54:17 -0000 1.9 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-kid -Version: 0.9 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -12,9 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-setuptools -BuildRequires: python-elementtree -Requires: python-elementtree, python-setuptools +BuildRequires: python-setuptools, python-docutils, python-elementtree +Requires: python-elementtree %description @@ -29,6 +28,10 @@ %build %{__python} setup.py build +pushd doc +sed -i -e 's|rst2html\.py|rst2html|' makefile +make +popd %install @@ -36,8 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test -# Do not rely on egg requires -- we'll do a better job -rm -f $RPM_BUILD_ROOT%{python_sitelib}/kid*egg-info/requires.txt + %clean rm -rf $RPM_BUILD_ROOT @@ -45,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc COPYING HISTORY README doc/*.txt doc/*.css doc/html test +%doc COPYING HISTORY README doc/*.txt doc/*.css doc/*.html test %dir %{python_sitelib}/kid %{python_sitelib}/kid/*.py %{python_sitelib}/kid/*.pyc @@ -55,9 +57,8 @@ %changelog -* Tue Mar 28 2006 Konstantin Ryabitsev - 0.9-2 -- Require python-setuptools -- Do not rely on python egg requires.txt (#186296) +* Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 +- Version 0.9.1 * Mon Feb 27 2006 Konstantin Ryabitsev - 0.9-1 - Version 0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 18:15:09 -0000 1.8 +++ sources 19 May 2006 18:54:17 -0000 1.9 @@ -1 +1 @@ -b9dcbebc61f65f7da0d5906b3bbc2b6e kid-0.9.tar.gz +7a8ccde54f4e1bfe78220dfb8e04f2ba kid-0.9.1.tar.gz From fedora-extras-commits at redhat.com Fri May 19 18:54:10 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 19 May 2006 11:54:10 -0700 Subject: rpms/python-kid/FC-4 .cvsignore, 1.8, 1.9 python-kid.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605191854.k4JIsgRt025423@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25342/FC-4 Modified Files: .cvsignore python-kid.spec sources Log Message: Version 0.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 18:15:03 -0000 1.8 +++ .cvsignore 19 May 2006 18:54:10 -0000 1.9 @@ -1 +1 @@ -kid-0.9.tar.gz +kid-0.9.1.tar.gz Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/python-kid.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-kid.spec 29 Mar 2006 04:03:11 -0000 1.8 +++ python-kid.spec 19 May 2006 18:54:10 -0000 1.9 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-kid -Version: 0.9 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -12,9 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-setuptools -BuildRequires: python-elementtree -Requires: python-elementtree, python-setuptools +BuildRequires: python-setuptools, python-docutils, python-elementtree +Requires: python-elementtree %description @@ -29,6 +28,10 @@ %build %{__python} setup.py build +pushd doc +sed -i -e 's|rst2html\.py|rst2html|' makefile +make +popd %install @@ -36,8 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test -# Do not rely on egg requires -- we'll do a better job -rm -f $RPM_BUILD_ROOT%{python_sitelib}/kid*egg-info/requires.txt + %clean rm -rf $RPM_BUILD_ROOT @@ -45,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc COPYING HISTORY README doc/*.txt doc/*.css doc/html test +%doc COPYING HISTORY README doc/*.txt doc/*.css doc/*.html test %dir %{python_sitelib}/kid %{python_sitelib}/kid/*.py %{python_sitelib}/kid/*.pyc @@ -55,9 +57,8 @@ %changelog -* Tue Mar 28 2006 Konstantin Ryabitsev - 0.9-2 -- Require python-setuptools -- Do not rely on python egg requires.txt (#186296) +* Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 +- Version 0.9.1 * Mon Feb 27 2006 Konstantin Ryabitsev - 0.9-1 - Version 0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 18:15:03 -0000 1.8 +++ sources 19 May 2006 18:54:10 -0000 1.9 @@ -1 +1 @@ -b9dcbebc61f65f7da0d5906b3bbc2b6e kid-0.9.tar.gz +7a8ccde54f4e1bfe78220dfb8e04f2ba kid-0.9.1.tar.gz From fedora-extras-commits at redhat.com Fri May 19 18:54:11 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 19 May 2006 11:54:11 -0700 Subject: rpms/python-kid/FC-5 .cvsignore, 1.8, 1.9 python-kid.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200605191854.k4JIshRK025428@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25342/FC-5 Modified Files: .cvsignore python-kid.spec sources Log Message: Version 0.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 18:15:09 -0000 1.8 +++ .cvsignore 19 May 2006 18:54:11 -0000 1.9 @@ -1 +1 @@ -kid-0.9.tar.gz +kid-0.9.1.tar.gz Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/python-kid.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-kid.spec 29 Mar 2006 04:03:12 -0000 1.8 +++ python-kid.spec 19 May 2006 18:54:11 -0000 1.9 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-kid -Version: 0.9 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -12,9 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-setuptools -BuildRequires: python-elementtree -Requires: python-elementtree, python-setuptools +BuildRequires: python-setuptools, python-docutils, python-elementtree +Requires: python-elementtree %description @@ -29,6 +28,10 @@ %build %{__python} setup.py build +pushd doc +sed -i -e 's|rst2html\.py|rst2html|' makefile +make +popd %install @@ -36,8 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test -# Do not rely on egg requires -- we'll do a better job -rm -f $RPM_BUILD_ROOT%{python_sitelib}/kid*egg-info/requires.txt + %clean rm -rf $RPM_BUILD_ROOT @@ -45,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc COPYING HISTORY README doc/*.txt doc/*.css doc/html test +%doc COPYING HISTORY README doc/*.txt doc/*.css doc/*.html test %dir %{python_sitelib}/kid %{python_sitelib}/kid/*.py %{python_sitelib}/kid/*.pyc @@ -55,9 +57,8 @@ %changelog -* Tue Mar 28 2006 Konstantin Ryabitsev - 0.9-2 -- Require python-setuptools -- Do not rely on python egg requires.txt (#186296) +* Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 +- Version 0.9.1 * Mon Feb 27 2006 Konstantin Ryabitsev - 0.9-1 - Version 0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 18:15:09 -0000 1.8 +++ sources 19 May 2006 18:54:11 -0000 1.9 @@ -1 +1 @@ -b9dcbebc61f65f7da0d5906b3bbc2b6e kid-0.9.tar.gz +7a8ccde54f4e1bfe78220dfb8e04f2ba kid-0.9.1.tar.gz From fedora-extras-commits at redhat.com Fri May 19 18:56:14 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 11:56:14 -0700 Subject: rpms/perl-Net-Netmask/devel .cvsignore, 1.5, 1.6 Makefile, 1.3, 1.4 perl-Net-Netmask.spec, 1.9, 1.10 sources, 1.5, 1.6 dead.package, 1.1, NONE Message-ID: <200605191856.k4JIuEvM025525@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Net-Netmask/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504 Added Files: .cvsignore Makefile perl-Net-Netmask.spec sources Removed Files: dead.package Log Message: rebuild perl-Net-Netmask for FE6 Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 19 May 2006 18:56:14 -0000 1.6 @@ -0,0 +1 @@ +Net-Netmask-1.9012.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 19 May 2006 18:56:14 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: perl-Net-Netmask +# $Id$ +NAME := perl-Net-Netmask +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: perl-Net-Netmask.spec =================================================================== RCS file: perl-Net-Netmask.spec diff -N perl-Net-Netmask.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ perl-Net-Netmask.spec 19 May 2006 18:56:14 -0000 1.10 @@ -0,0 +1,76 @@ +Name: perl-Net-Netmask +Version: 1.9012 +Release: 2%{?dist} +Summary: Perl module for manipulation and lookup of IP network blocks + +Group: Development/Libraries +License: Artistic +URL: http://search.cpan.org/dist/Net-Netmask/ +Source0: http://www.cpan.org/authors/id/M/MU/MUIR/modules/Net-Netmask-%{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 +Net::Netmask parses and understands IPv4 CIDR blocks. It's built with +an object-oriented interface. Nearly all functions are methods that +operate on a Net::Netmask object. + + +%prep +%setup -q -n Net-Netmask-%{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}/Net/ +%{_mandir}/man3/*.3* + + +%changelog +* Fri May 20 2005 Ville Skytt?? - 1.9012-2 +- 1.9012, use canonical CPAN URL in Source0. + +* Fri Apr 7 2005 Michael Schwendt - 1.9011-2 +- rebuilt + +* Sun Aug 15 2004 Ville Skytt?? - 0:1.9011-1 +- Update to 1.9011. +- Bring up to date with current fedora.us Perl spec template. + +* Sun Feb 8 2004 Ville Skytt?? - 0:1.9007-0.fdr.2 +- Reduce directory ownership bloat. +- Run tests in the %%check section. + +* Sat Feb 07 2004 Warren Togami - 0:1.9007-0.fdr.1 +- upgrade to 1.9007 + +* Thu Nov 13 2003 Ville Skytt?? - 0:1.9004-0.fdr.2 +- Specfile rewrite. + +* Fri Sep 19 2003 Warren Togami - 1.9004-0.fdr.1 +- Specfile autogenerated. Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 19 May 2006 18:56:14 -0000 1.6 @@ -0,0 +1 @@ +3d81d214e0203863dbc170029f2d3502 Net-Netmask-1.9012.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Fri May 19 19:07:44 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 19 May 2006 12:07:44 -0700 Subject: rpms/wmx/FC-5 wmx.spec,1.4,1.5 Message-ID: <200605191907.k4JJ7kli028057@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/wmx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28008/FC-5 Modified Files: wmx.spec Log Message: Don't strip binary during install to preserve debuginfo (bugzilla #192435) Index: wmx.spec =================================================================== RCS file: /cvs/extras/rpms/wmx/FC-5/wmx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wmx.spec 17 Feb 2006 02:06:46 -0000 1.4 +++ wmx.spec 19 May 2006 19:07:44 -0000 1.5 @@ -1,6 +1,6 @@ Name: wmx Version: 6pl1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A really simple window manager for X License: BSD Group: User Interface/X @@ -35,7 +35,7 @@ %install %{__rm} -rf %{buildroot} -%{__install} -s -D -m 0755 wmx %{buildroot}%{_bindir}/wmx +%{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name} %{__install} -m 0755 wmx-defaults/* %{buildroot}%{_datadir}/%{name} %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup @@ -53,6 +53,9 @@ %{_sysconfdir}/X11/xinit/Xclients.d/* %changelog +* Fri May 19 2006 Gabriel Somlo 6pl1-8 +- Don't strip binary during install to preserve debuginfo (bugzilla #192435) + * Thu Feb 16 2006 Ignacio Vazquez-Abrams - Fixed 64-bit build From fedora-extras-commits at redhat.com Fri May 19 19:07:43 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 19 May 2006 12:07:43 -0700 Subject: rpms/wmx/FC-4 wmx.spec,1.3,1.4 Message-ID: <200605191907.k4JJ7j2W028055@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/wmx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28008/FC-4 Modified Files: wmx.spec Log Message: Don't strip binary during install to preserve debuginfo (bugzilla #192435) Index: wmx.spec =================================================================== RCS file: /cvs/extras/rpms/wmx/FC-4/wmx.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wmx.spec 17 Feb 2006 02:05:44 -0000 1.3 +++ wmx.spec 19 May 2006 19:07:43 -0000 1.4 @@ -1,6 +1,6 @@ Name: wmx Version: 6pl1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A really simple window manager for X License: BSD Group: User Interface/X @@ -35,7 +35,7 @@ %install %{__rm} -rf %{buildroot} -%{__install} -s -D -m 0755 wmx %{buildroot}%{_bindir}/wmx +%{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name} %{__install} -m 0755 wmx-defaults/* %{buildroot}%{_datadir}/%{name} %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup @@ -53,6 +53,9 @@ %{_sysconfdir}/X11/xinit/Xclients.d/* %changelog +* Fri May 19 2006 Gabriel Somlo 6pl1-8 +- Don't strip binary during install to preserve debuginfo (bugzilla #192435) + * Thu Feb 16 2006 Ignacio Vazquez-Abrams - Fixed 64-bit build From fedora-extras-commits at redhat.com Fri May 19 19:07:45 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 19 May 2006 12:07:45 -0700 Subject: rpms/wmx/devel wmx.spec,1.4,1.5 Message-ID: <200605191907.k4JJ7lqv028061@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/wmx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28008/devel Modified Files: wmx.spec Log Message: Don't strip binary during install to preserve debuginfo (bugzilla #192435) Index: wmx.spec =================================================================== RCS file: /cvs/extras/rpms/wmx/devel/wmx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wmx.spec 17 Feb 2006 02:06:46 -0000 1.4 +++ wmx.spec 19 May 2006 19:07:44 -0000 1.5 @@ -1,6 +1,6 @@ Name: wmx Version: 6pl1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A really simple window manager for X License: BSD Group: User Interface/X @@ -35,7 +35,7 @@ %install %{__rm} -rf %{buildroot} -%{__install} -s -D -m 0755 wmx %{buildroot}%{_bindir}/wmx +%{__install} -D -m 0755 wmx %{buildroot}%{_bindir}/wmx %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name} %{__install} -m 0755 wmx-defaults/* %{buildroot}%{_datadir}/%{name} %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/startup @@ -53,6 +53,9 @@ %{_sysconfdir}/X11/xinit/Xclients.d/* %changelog +* Fri May 19 2006 Gabriel Somlo 6pl1-8 +- Don't strip binary during install to preserve debuginfo (bugzilla #192435) + * Thu Feb 16 2006 Ignacio Vazquez-Abrams - Fixed 64-bit build From fedora-extras-commits at redhat.com Fri May 19 19:33:21 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 19 May 2006 12:33:21 -0700 Subject: rpms/tpb/devel Makefile, 1.3, 1.4 sources, 1.5, 1.6 tpb-defaultconfig.patch, 1.5, 1.6 tpb.spec, 1.12, 1.13 Message-ID: <200605191933.k4JJXNPg028820@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tpb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28794 Added Files: Makefile sources tpb-defaultconfig.patch tpb.spec Log Message: Bring back from Attic and build for devel Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 19 May 2006 19:33:21 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: tpb +# $Id$ +NAME := tpb +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 19 May 2006 19:33:21 -0000 1.6 @@ -0,0 +1,2 @@ +563b544fbedcc1763130a0bca1ad63b6 tpb-0.6.4.tar.gz +96965b2e52a40f18a377d482f83eedab tpb-0.6.4.tar.gz.sig tpb-defaultconfig.patch: Index: tpb-defaultconfig.patch =================================================================== RCS file: tpb-defaultconfig.patch diff -N tpb-defaultconfig.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tpb-defaultconfig.patch 19 May 2006 19:33:21 -0000 1.6 @@ -0,0 +1,57 @@ +--- doc/tpbrc.orig 2004-08-18 16:57:32.000000000 +0300 ++++ doc/tpbrc 2005-05-16 01:09:41.000000000 +0300 +@@ -27,19 +27,19 @@ + # String with command and options that should be executed when Home button is + # pressed (only available on A and S series). By default no command is executed. + # +-#HOME /usr/bin/mozilla ++#HOME /usr/bin/htmlview + + ## SEARCH + # String with command and options that should be executed when Search button is + # pressed (only available on A and S series). By default no command is executed. + # +-#SEARCH /usr/bin/mozilla http://www.google.com ++#SEARCH /usr/bin/htmlview http://www.google.com + + ## MAIL + # String with command and options that should be executed when Mail button is + # pressed(only available on A and S series). By default no command is executed. + # +-#MAIL /usr/bin/X11/xterm -T mutt -geometry 140x40 -e mutt ++#MAIL /usr/bin/evolution + + ## WIRELESS + # String with command and options that should be executed when Wireless button is +@@ -181,13 +181,13 @@ + # Defines the font for the on-screen display. You may use "xfontsel" to choose + # one. Default is the default font of the xosd library. + # +-#OSDFONT -*-lucidatypewriter-*-*-*-*-*-240-*-*-*-*-*-* ++OSDFONT -*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-* + + ## OSDCOLOR + # Defines the color of the on-screen display. You may use "xcolors" to choose + # one. Default is BLUE. + # +-#OSDCOLOR Blue ++OSDCOLOR Green + + ## OSDTIMEOUT + # Defines how long (in seconds) the on-screen display is shown after the last +@@ -225,13 +225,13 @@ + ## OSDVERTICAL + # Defines the offset from the top or bottom of the screen in pixels. Default is 25. + # +-#OSDVERTICAL 25 ++OSDVERTICAL 60 + + ## OSDHORIZONTAL + # Defines the offset from the left or right of the screen in pixels. Only + # supported by xosd 2.0.0 and above. Default is 25. + # +-#OSDHORIZONTAL 25 ++OSDHORIZONTAL 60 + + ## OSDPOS + # Defines where the osd is shown. Possible values are top, middle and bottom. Index: tpb.spec =================================================================== RCS file: tpb.spec diff -N tpb.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tpb.spec 19 May 2006 19:33:21 -0000 1.13 @@ -0,0 +1,173 @@ +Name: tpb +Version: 0.6.4 +Release: 4%{?dist} +Summary: ThinkPad button support utility + +Group: System Environment/Base +License: GPL +URL: http://www.nongnu.org/tpb/ +Source0: http://savannah.nongnu.org/download/tpb/%{name}-%{version}.tar.gz +Source1: http://savannah.nongnu.org/download/tpb/%{name}-%{version}.tar.gz.sig +Patch0: %{name}-defaultconfig.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +ExclusiveArch: %{ix86} +BuildRequires: xosd-devel >= 2.0.0 +BuildRequires: libX11-devel +BuildRequires: libXt-devel +BuildRequires: gettext +Requires: udev >= 050-6 +Requires: MAKEDEV +Requires: xorg-x11-xinit + +%description +With TPB it is possible to bind a program to the ThinkPad, Mail, Home +and Search buttons. TPB can also run a callback program on each state +change with the changed state and the new state as options. So it is +possible to trigger several actions on different events. TPB has a +on-screen display (OSD) to show volume, mute, brightness and some +other information. Furthermore TPB supports a software mixer, as the +R series ThinkPads have no hardware mixer to change the volume. + + +%prep +%setup -q +%patch0 -p0 + +# Start tpb at X startup: +cat < %{name}.xinit +#!/bin/sh +%{_bindir}/tpb -d +EOF + +# For the initial MAKEDEV at post-install time, and possibly later: +cat < %{name}.makedev +# Custom permissions for nvram for use with tpb(1). +c 664 root root 10 144 1 1 nvram +EOF + +# To get the /dev entry created at boot: +cat < %{name}.nodes +# /dev/nvram, needed by tpb(1), needs to be created manually. +nvram +EOF + +# Permissions fixup: +cat < %{name}.rules +# Custom permissions for nvram for use with tpb(1). +KERNEL=="nvram", MODE="0664" +EOF + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +install -Dm 755 %{name}.xinit \ + $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh +install -Dpm 644 %{name}.rules \ + $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-%{name}.rules +install -Dpm 644 %{name}.nodes \ + $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/90-%{name}.nodes +install -Dpm 644 %{name}.makedev \ + $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/zz_%{name} +%find_lang %{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +/sbin/MAKEDEV nvram >/dev/null || : + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc ChangeLog COPYING CREDITS README doc/callback_example.sh doc/nvram.txt +%{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh +%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules +%config(noreplace) %{_sysconfdir}/udev/makedev.d/*-%{name}.nodes +%config(noreplace) %{_sysconfdir}/makedev.d/*%{name} +%config(noreplace) %{_sysconfdir}/tpbrc +%{_bindir}/tpb +%{_mandir}/man1/tpb.1* + + +%changelog +* Fri May 19 2006 Kevin Fenzi - 0.6.4-4 +- Bring back from Attic and build for devel + +* Sun Mar 12 2006 Ville Skytt?? - 0.6.4-3 +- Rebuild. + +* Thu Nov 17 2005 Ville Skytt?? - 0.6.4-2 +- Adapt to modular X packaging. + +* Thu Oct 20 2005 Ville Skytt?? - 0.6.4-1 +- 0.6.4. + +* Mon May 16 2005 Ville Skytt?? - 0.6.3-4 +- Adapt to work with FC4's udev configuration. +- Improve default OSD placement. + +* Thu Mar 24 2005 Colin Charles - 0:0.6.3-3 +- add ExclusiveArch x86 only + +* Wed Feb 9 2005 Ville Skytt?? - 0:0.6.3-2 +- Add udev-awareness to /dev/nvram handling (#147306, Matthew Saltzman). +- Change default OSD font to "luxi sans", "sans" doesn't work early enough. + +* Tue Aug 24 2004 Ville Skytt?? - 0:0.6.3-0.fdr.1 +- Update to 0.6.3. +- Further small improvements to default config. + +* Wed Jun 2 2004 Ville Skytt?? - 0:0.6.2-0.fdr.2 +- Rename xinit scriptlet to tpb.sh (bug 1227, bugzilla.redhat.com/122869). + +* Wed May 19 2004 Ville Skytt?? - 0:0.6.2-0.fdr.1 +- Update to 0.6.2. +- Improve default configuration. +- Remove LD_ASSUME_KERNEL hack. + +* Mon Jan 19 2004 Ville Skytt?? - 0:0.6.1-0.fdr.1 +- Update to 0.6.1. + +* Mon Nov 24 2003 Ville Skytt?? - 0:0.6.0-0.fdr.3 +- Don't use MAKEDEV to create /dev/nvram. + +* Wed Oct 22 2003 Ville Skytt?? - 0:0.6.0-0.fdr.2 +- Add LD_ASSUME_KERNEL=2.4.1 workaround to xinit script. + http://savannah.nongnu.org/bugs/?func=detailbug&bug_id=3260&group_id=2320 + +* Mon Aug 11 2003 Ville Skytt?? - 0:0.6.0-0.fdr.1 +- Update to 0.6.0. + +* Tue May 27 2003 Ville Skytt?? - 0:0.5.1-0.fdr.4 +- Make /dev/nvram readable again (#296). + +* Sun May 18 2003 Ville Skytt?? - 0:0.5.1-0.fdr.3 +- Use MAKEDEV for creating the nvram device node and own it. +- Mark xinit file as config to make rpmlint happy. +- %%{buildroot} -> $RPM_BUILD_ROOT. +- Make the build honor $RPM_OPT_FLAGS. + +* Sat Apr 19 2003 Ville Skytt?? - 0:0.5.1-0.fdr.2 +- Don't require tpctl (#177). + +* Fri Apr 11 2003 Ville Skytt?? - 0:0.5.1-0.fdr.1 +- Update to 0.5.1. + +* Sun Apr 6 2003 Ville Skytt?? - 0:0.5.0-0.fdr.1 +- Update to 0.5.0. +- Save .spec in UTF-8. + +* Sun Mar 30 2003 Ville Skytt?? - 0:0.4.2-0.fdr.1 +- Rebuild according to Fedora RC3 guidelines. + +* Sat Feb 8 2003 Ville Skytt?? - 0.4.2-1.fedora.1 +- First Fedora release. From fedora-extras-commits at redhat.com Fri May 19 19:34:33 2006 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 19 May 2006 12:34:33 -0700 Subject: rpms/tpb/devel dead.package,1.1,NONE Message-ID: <200605191934.k4JJYZ9j028859@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/tpb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28844 Removed Files: dead.package Log Message: Bring back from Attic and build for devel --- dead.package DELETED --- From fedora-extras-commits at redhat.com Fri May 19 19:37:42 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 12:37:42 -0700 Subject: rpms/pop-before-smtp/devel .cvsignore, 1.2, 1.3 pop-before-smtp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605191937.k4JJbgoM028999@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28976 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: - update to 1.41 - remove perl cut which wasn't working anyway due to a typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 +++ .cvsignore 19 May 2006 19:37:42 -0000 1.3 @@ -1 +1 @@ -pop-before-smtp-1.36.tar.gz +pop-before-smtp-1.41.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/pop-before-smtp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pop-before-smtp.spec 6 Apr 2005 22:13:29 -0000 1.2 +++ pop-before-smtp.spec 19 May 2006 19:37:42 -0000 1.3 @@ -1,9 +1,9 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.36 -Release: 2 +Version: 1.41 +Release: 1%{?dist} -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons @@ -23,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.36 +%setup -q -n pop-before-smtp-1.41 %build echo Nothing to build... @@ -35,7 +35,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null -perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp @@ -62,6 +61,10 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Mon May 8 2006 Warren Togami 1.41-1 +- update to 1.41 +- remove perl cut which wasn't working anyway due to a typo + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 07:23:24 -0000 1.2 +++ sources 19 May 2006 19:37:42 -0000 1.3 @@ -1 +1 @@ -f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz +59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:38:37 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 12:38:37 -0700 Subject: rpms/pop-before-smtp/FC-5 .cvsignore, 1.2, 1.3 pop-before-smtp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605191938.k4JJcbL5029144@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29117 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: - update to 1.41 - remove perl cut which wasn't working anyway due to a typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 +++ .cvsignore 19 May 2006 19:38:37 -0000 1.3 @@ -1 +1 @@ -pop-before-smtp-1.36.tar.gz +pop-before-smtp-1.41.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-5/pop-before-smtp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pop-before-smtp.spec 6 Apr 2005 22:13:29 -0000 1.2 +++ pop-before-smtp.spec 19 May 2006 19:38:37 -0000 1.3 @@ -1,9 +1,9 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.36 -Release: 2 +Version: 1.41 +Release: 1%{?dist} -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons @@ -23,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.36 +%setup -q -n pop-before-smtp-1.41 %build echo Nothing to build... @@ -35,7 +35,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null -perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp @@ -62,6 +61,10 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Mon May 8 2006 Warren Togami 1.41-1 +- update to 1.41 +- remove perl cut which wasn't working anyway due to a typo + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 07:23:24 -0000 1.2 +++ sources 19 May 2006 19:38:37 -0000 1.3 @@ -1 +1 @@ -f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz +59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:40:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:40:14 -0700 Subject: rpms/perl-Socket6 - New directory Message-ID: <200605191940.k4JJeG25029407@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29380/perl-Socket6 Log Message: Directory /cvs/extras/rpms/perl-Socket6 added to the repository From fedora-extras-commits at redhat.com Fri May 19 19:40:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:40:14 -0700 Subject: rpms/perl-Socket6/devel - New directory Message-ID: <200605191940.k4JJeGF9029410@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29380/perl-Socket6/devel Log Message: Directory /cvs/extras/rpms/perl-Socket6/devel added to the repository From fedora-extras-commits at redhat.com Fri May 19 19:40:10 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 12:40:10 -0700 Subject: rpms/pop-before-smtp/FC-4 .cvsignore, 1.2, 1.3 pop-before-smtp.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605191940.k4JJeARl029359@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29326 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: - update to 1.41 - remove perl cut which wasn't working anyway due to a typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 +++ .cvsignore 19 May 2006 19:40:10 -0000 1.3 @@ -1 +1 @@ -pop-before-smtp-1.36.tar.gz +pop-before-smtp-1.41.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-4/pop-before-smtp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pop-before-smtp.spec 6 Apr 2005 22:13:29 -0000 1.2 +++ pop-before-smtp.spec 19 May 2006 19:40:10 -0000 1.3 @@ -1,9 +1,9 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.36 -Release: 2 +Version: 1.41 +Release: 1%{?dist} -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons @@ -23,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.36 +%setup -q -n pop-before-smtp-1.41 %build echo Nothing to build... @@ -35,7 +35,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null -perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp @@ -62,6 +61,10 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Mon May 8 2006 Warren Togami 1.41-1 +- update to 1.41 +- remove perl cut which wasn't working anyway due to a typo + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 07:23:24 -0000 1.2 +++ sources 19 May 2006 19:40:10 -0000 1.3 @@ -1 +1 @@ -f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz +59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:40:31 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:40:31 -0700 Subject: rpms/perl-Socket6 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605191940.k4JJeXdQ029528@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29477 Added Files: Makefile import.log Log Message: Setup of module perl-Socket6 --- NEW FILE Makefile --- # Top level Makefile for module perl-Socket6 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 19 19:40:32 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:40:32 -0700 Subject: rpms/perl-Socket6/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605191940.k4JJeYcY029531@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29477/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Socket6 --- NEW 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 May 19 19:41:00 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:41:00 -0700 Subject: rpms/perl-Socket6 import.log,1.1,1.2 Message-ID: <200605191941.k4JJf2Ok029640@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29589 Modified Files: import.log Log Message: auto-import perl-Socket6-0.19-2 on branch devel from perl-Socket6-0.19-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Socket6/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 May 2006 19:40:31 -0000 1.1 +++ import.log 19 May 2006 19:41:00 -0000 1.2 @@ -0,0 +1 @@ +perl-Socket6-0_19-2:HEAD:perl-Socket6-0.19-2.src.rpm:1148067651 From fedora-extras-commits at redhat.com Fri May 19 19:41:05 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 May 2006 12:41:05 -0700 Subject: rpms/pop-before-smtp/FC-3 .cvsignore, 1.2, 1.3 pop-before-smtp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605191941.k4JJf5Yd029654@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/pop-before-smtp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29615 Modified Files: .cvsignore pop-before-smtp.spec sources Log Message: - update to 1.41 - remove perl cut which wasn't working anyway due to a typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 07:23:24 -0000 1.2 +++ .cvsignore 19 May 2006 19:41:05 -0000 1.3 @@ -1 +1 @@ -pop-before-smtp-1.36.tar.gz +pop-before-smtp-1.41.tar.gz Index: pop-before-smtp.spec =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-3/pop-before-smtp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pop-before-smtp.spec 7 Jan 2005 07:23:24 -0000 1.1 +++ pop-before-smtp.spec 19 May 2006 19:41:05 -0000 1.2 @@ -1,8 +1,9 @@ Summary: Watch log for POP/IMAP auth, notify MTA to allow relay Name: pop-before-smtp -Version: 1.36 -Release: 1 -Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.36.tar.gz +Version: 1.41 +Release: 1%{?dist} + +Source: http://download.sourceforge.net/sourceforge/popbsmtp/pop-before-smtp-1.41.tar.gz URL: http://popbsmtp.sourceforge.net/ License: GPL or Artistic Group: System Environment/Daemons @@ -22,7 +23,7 @@ people who have recently downloaded their email. %prep -%setup -q -n pop-before-smtp-1.36 +%setup -q -n pop-before-smtp-1.41 %build echo Nothing to build... @@ -34,7 +35,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install pop-before-smtp $RPM_BUILD_ROOT%{_sbindir} pod2man pop-before-smtp >$RPM_BUILD_ROOT%{_mandir}/man8/pop-before-smtp.8 2>/dev/null -perl -i -e 'undef $/; $_ = <>; s/\n=head1.*\n=cut//s; print' $RPM_BUILD_ROOT%_sbindir}/pop-before-smtp install pop-before-smtp-conf.pl $RPM_BUILD_ROOT%{_sysconfdir} install pop-before-smtp.init $RPM_BUILD_ROOT%{_initrddir}/pop-before-smtp @@ -61,6 +61,13 @@ /sbin/chkconfig --del pop-before-smtp %changelog +* Mon May 8 2006 Warren Togami 1.41-1 +- update to 1.41 +- remove perl cut which wasn't working anyway due to a typo + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Thu Jan 06 2005 Warren Togami 1.36-1 - 1.36 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pop-before-smtp/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 07:23:24 -0000 1.2 +++ sources 19 May 2006 19:41:05 -0000 1.3 @@ -1 +1 @@ -f437144b4730072416459e4e51614759 pop-before-smtp-1.36.tar.gz +59985b9f5affe849061adf65ab441d72 pop-before-smtp-1.41.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:41:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:41:01 -0700 Subject: rpms/perl-Socket6/devel perl-Socket6.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605191941.k4JJf3kr029645@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Socket6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29589/devel Modified Files: .cvsignore sources Added Files: perl-Socket6.spec Log Message: auto-import perl-Socket6-0.19-2 on branch devel from perl-Socket6-0.19-2.src.rpm --- NEW FILE perl-Socket6.spec --- Name: perl-Socket6 Version: 0.19 Release: 2%{?dist} Summary: IPv6 related part of the C socket.h defines and structure manipulators Group: Development/Libraries License: BSD URL: http://search.cpan.org/dist/Socket6/ Source0: http://www.cpan.org/authors/id/U/UM/UMEMOTO/Socket6-%{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 supports getaddrinfo() and getnameinfo() to intend to enable protocol independent programing. If your environment supports IPv6, IPv6 related defines such as AF_INET6 are included. %prep %setup -q -n Socket6-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorarch}/Socket6* %{perl_vendorarch}/auto/Socket6/ %changelog * Thu May 18 2006 Jose Pedro Oliveira - 0.19-2 - License: BSD (http://www.opensource.org/licenses/bsd-license.php). * Sat May 13 2006 Jose Pedro Oliveira - 0.19-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Socket6/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 May 2006 19:40:31 -0000 1.1 +++ .cvsignore 19 May 2006 19:41:00 -0000 1.2 @@ -0,0 +1 @@ +Socket6-0.19.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Socket6/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 May 2006 19:40:31 -0000 1.1 +++ sources 19 May 2006 19:41:00 -0000 1.2 @@ -0,0 +1 @@ +35e4bb7e09ca3154a44bcaa8959780a2 Socket6-0.19.tar.gz From fedora-extras-commits at redhat.com Fri May 19 19:46:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 19 May 2006 12:46:13 -0700 Subject: owners owners.list,1.1024,1.1025 Message-ID: <200605191946.k4JJkFps029849@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29832 Modified Files: owners.list Log Message: New package: perl-Socket6 (#192164) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1024 retrieving revision 1.1025 diff -u -r1.1024 -r1.1025 --- owners.list 19 May 2006 17:14:19 -0000 1.1024 +++ owners.list 19 May 2006 19:46:13 -0000 1.1025 @@ -1182,6 +1182,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-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Socket6|IPv6 related part of the C socket.h defines and structure manipulators|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spiffy|Framework for doing object oriented (OO) programming in Perl|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri May 19 20:45:29 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 19 May 2006 13:45:29 -0700 Subject: rpms/celestia/devel celestia.spec,1.15,1.16 Message-ID: <200605192045.k4JKjVc1032413@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/celestia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32396 Modified Files: celestia.spec Log Message: Include accidentally dropped 3ds models. Index: celestia.spec =================================================================== RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- celestia.spec 7 Apr 2006 23:40:43 -0000 1.15 +++ celestia.spec 19 May 2006 20:45:29 -0000 1.16 @@ -1,6 +1,6 @@ Name: celestia Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenGL real-time visual space simulation Group: Amusements/Graphics License: GPL @@ -59,6 +59,8 @@ ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ #rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual +install -p -m 644 -D models/*.3ds $RPM_BUILD_ROOT%{_datadir}/%{name}/models/ + rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop desktop-file-install \ @@ -100,6 +102,9 @@ %changelog +* Fri May 19 2006 Steven Pritchard 1.4.1-2 +- Include accidentally dropped 3ds models. + * Tue Mar 28 2006 Steven Pritchard 1.4.1-1 - Update to 1.4.1 - Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of From fedora-extras-commits at redhat.com Fri May 19 20:49:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 19 May 2006 13:49:47 -0700 Subject: rpms/celestia/FC-5 celestia.spec,1.15,1.16 Message-ID: <200605192049.k4JKnnMd032503@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/celestia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32486 Modified Files: celestia.spec Log Message: Include accidentally dropped 3ds models. Index: celestia.spec =================================================================== RCS file: /cvs/extras/rpms/celestia/FC-5/celestia.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- celestia.spec 8 Apr 2006 01:03:06 -0000 1.15 +++ celestia.spec 19 May 2006 20:49:47 -0000 1.16 @@ -1,6 +1,6 @@ Name: celestia Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenGL real-time visual space simulation Group: Amusements/Graphics License: GPL @@ -59,6 +59,8 @@ ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ #rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual +install -p -m 644 -D models/*.3ds $RPM_BUILD_ROOT%{_datadir}/%{name}/models/ + rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop desktop-file-install \ @@ -100,6 +102,9 @@ %changelog +* Fri May 19 2006 Steven Pritchard 1.4.1-2 +- Include accidentally dropped 3ds models. + * Tue Mar 28 2006 Steven Pritchard 1.4.1-1 - Update to 1.4.1 - Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of From fedora-extras-commits at redhat.com Fri May 19 20:57:30 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Fri, 19 May 2006 13:57:30 -0700 Subject: rpms/spicctrl/devel spicctrl.spec,1.2,1.3 Message-ID: <200605192057.k4JKvW6t032617@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/spicctrl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32600 Modified Files: spicctrl.spec Log Message: * Sat May 20 2006 Roozbeh Pournader 1.9-4 - Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct man page permissions (Ville Skytt??) Index: spicctrl.spec =================================================================== RCS file: /cvs/extras/rpms/spicctrl/devel/spicctrl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- spicctrl.spec 14 Feb 2006 10:05:40 -0000 1.2 +++ spicctrl.spec 19 May 2006 20:57:30 -0000 1.3 @@ -1,6 +1,6 @@ Name: spicctrl Version: 1.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Sony Vaio laptop SPIC control program Group: Applications/System @@ -19,6 +19,7 @@ %prep %setup -q +%{__sed} -i 's/ -O2 / $(RPM_OPT_FLAGS) /' Makefile %build @@ -29,8 +30,8 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install spicctrl $RPM_BUILD_ROOT%{_sbindir} -install spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m755 spicctrl $RPM_BUILD_ROOT%{_sbindir} +install -p -m644 spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean @@ -55,10 +56,15 @@ %files %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE +%{_sbindir}/spicctrl %{_mandir}/man1/spicctrl.1.gz -%attr(0755,root,root) /usr/sbin/spicctrl + %changelog +* Sat May 20 2006 Roozbeh Pournader 1.9-4 +- Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct + man page permissions (Ville Skytt??) + * Tue Feb 14 2006 Roozbeh Pournader 1.9-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Fri May 19 21:04:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 19 May 2006 14:04:47 -0700 Subject: rpms/amarok/FC-5 .cvsignore, 1.21, 1.22 amarok.spec, 1.47, 1.48 sources, 1.21, 1.22 Message-ID: <200605192105.k4JL5Jv1002564@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2520/FC-5 Modified Files: .cvsignore amarok.spec sources Log Message: update to 1.4 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 14 Apr 2006 07:29:14 -0000 1.21 +++ .cvsignore 19 May 2006 21:04:47 -0000 1.22 @@ -1 +1 @@ -amarok-1.4-beta3c.tar.bz2 +amarok-1.4.0a.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- amarok.spec 14 Apr 2006 08:30:44 -0000 1.47 +++ amarok.spec 19 May 2006 21:04:47 -0000 1.48 @@ -1,15 +1,14 @@ Name: amarok Summary: Media player for KDE -Version: 1.4 -Release: 0.12.beta3%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2 -Patch0: amarok-1.4beta1-gst10.patch -Patch1: amarok-1.4-gstreamer.patch -Patch2: amarok-1.4-engines-cfg.patch +Source0: http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2 +#Patch1: amarok-1.4-gstreamer.patch +#Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -26,7 +25,8 @@ #BuildRequires: akode-devel BuildRequires: libifp-devel, libusb-devel %if "%fedora" >= "5" -BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel +# gstreamer disabled in version 1.4 final (not ready yet) +#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel BuildRequires: libgpod-devel %else BuildRequires: gstreamer-plugins-devel >= 0.8.4 @@ -35,6 +35,9 @@ BuildRequires: HelixPlayer %endif +# Lyrics scripts +Requires: ruby + Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -69,11 +72,11 @@ %prep -%setup -q -n %{name}-%{version}-beta3c +%setup -q # Make Gstreamer a sufficient engine as well (only engine available on x86_64) -%patch1 -p1 -b .gstreamer +#%patch1 -p1 -b .gstreamer # Gstreamer default sink should be autoaudiosink -%patch2 -p1 -b .engines-cfg +#%patch2 -p1 -b .engines-cfg %build @@ -168,24 +171,26 @@ %{_datadir}/applications/kde/*.desktop %{_datadir}/services/amarok_void-engine_plugin.desktop %{_datadir}/services/amarok_ifp-mediadevice.desktop -%{_datadir}/services/amarok_vfat-mediadevice.desktop -%{_datadir}/services/amarok_ipod-mediadevice.desktop %{_datadir}/servicetypes/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop %{_libdir}/kde3/libamarok_void-engine_plugin.* %{_libdir}/kde3/libamarok_ifp-mediadevice.* -%{_libdir}/kde3/libamarok_vfat-mediadevice.* -%{_libdir}/kde3/libamarok_ipod-mediadevice.* %{_libdir}/kde3/konqsidebar_universalamarok.* %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg -# Gstreamer engine +# IPod support +%{_datadir}/services/amarok_ipod-mediadevice.desktop +%{_libdir}/kde3/libamarok_ipod-mediadevice.* +# VFAT device support +%{_datadir}/services/amarok_generic-mediadevice.desktop +%{_libdir}/kde3/libamarok_generic-mediadevice.* +# Gstreamer engine - disabled in 1.4 final %if "%fedora" >= "5" -%{_datadir}/services/amarok_gst10engine_plugin.desktop -%{_libdir}/kde3/libamarok_gst10engine_plugin.* +#%{_datadir}/services/amarok_gst10engine_plugin.desktop +#%{_libdir}/kde3/libamarok_gst10engine_plugin.* %else %{_datadir}/services/amarok_gstengine_plugin.desktop %{_libdir}/kde3/libamarok_gstengine_plugin.* @@ -200,6 +205,7 @@ %endif + %files visualisation %defattr(-,root,root) %{_bindir}/amarok_libvisual @@ -208,6 +214,12 @@ %changelog +* Mon May 15 2006 Aurelien Bompard 1.4-1 +- version 1.4 final + +* Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 +- rc1 + * Fri Apr 14 2006 Aurelien Bompard 1.4-0.12.beta3 - add patch to make Gstreamer sufficient to build (only engine available on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 14 Apr 2006 07:29:14 -0000 1.21 +++ sources 19 May 2006 21:04:47 -0000 1.22 @@ -1 +1 @@ -b92433b46005f0b2fc31e0ce0bf4cb3a amarok-1.4-beta3c.tar.bz2 +3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 From fedora-extras-commits at redhat.com Fri May 19 21:04:48 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 19 May 2006 14:04:48 -0700 Subject: rpms/amarok/devel .cvsignore, 1.21, 1.22 amarok.spec, 1.46, 1.47 sources, 1.21, 1.22 Message-ID: <200605192105.k4JL5K9Z002569@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2520/devel Modified Files: .cvsignore amarok.spec sources Log Message: update to 1.4 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 14 Apr 2006 07:29:15 -0000 1.21 +++ .cvsignore 19 May 2006 21:04:47 -0000 1.22 @@ -1 +1 @@ -amarok-1.4-beta3c.tar.bz2 +amarok-1.4.0a.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- amarok.spec 14 Apr 2006 08:30:45 -0000 1.46 +++ amarok.spec 19 May 2006 21:04:47 -0000 1.47 @@ -1,15 +1,14 @@ Name: amarok Summary: Media player for KDE -Version: 1.4 -Release: 0.12.beta3%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2 -Patch0: amarok-1.4beta1-gst10.patch -Patch1: amarok-1.4-gstreamer.patch -Patch2: amarok-1.4-engines-cfg.patch +Source0: http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2 +#Patch1: amarok-1.4-gstreamer.patch +#Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -26,7 +25,8 @@ #BuildRequires: akode-devel BuildRequires: libifp-devel, libusb-devel %if "%fedora" >= "5" -BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel +# gstreamer disabled in version 1.4 final (not ready yet) +#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel BuildRequires: libgpod-devel %else BuildRequires: gstreamer-plugins-devel >= 0.8.4 @@ -35,6 +35,9 @@ BuildRequires: HelixPlayer %endif +# Lyrics scripts +Requires: ruby + Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -69,11 +72,11 @@ %prep -%setup -q -n %{name}-%{version}-beta3c +%setup -q # Make Gstreamer a sufficient engine as well (only engine available on x86_64) -%patch1 -p1 -b .gstreamer +#%patch1 -p1 -b .gstreamer # Gstreamer default sink should be autoaudiosink -%patch2 -p1 -b .engines-cfg +#%patch2 -p1 -b .engines-cfg %build @@ -168,24 +171,26 @@ %{_datadir}/applications/kde/*.desktop %{_datadir}/services/amarok_void-engine_plugin.desktop %{_datadir}/services/amarok_ifp-mediadevice.desktop -%{_datadir}/services/amarok_vfat-mediadevice.desktop -%{_datadir}/services/amarok_ipod-mediadevice.desktop %{_datadir}/servicetypes/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop %{_libdir}/kde3/libamarok_void-engine_plugin.* %{_libdir}/kde3/libamarok_ifp-mediadevice.* -%{_libdir}/kde3/libamarok_vfat-mediadevice.* -%{_libdir}/kde3/libamarok_ipod-mediadevice.* %{_libdir}/kde3/konqsidebar_universalamarok.* %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg -# Gstreamer engine +# IPod support +%{_datadir}/services/amarok_ipod-mediadevice.desktop +%{_libdir}/kde3/libamarok_ipod-mediadevice.* +# VFAT device support +%{_datadir}/services/amarok_generic-mediadevice.desktop +%{_libdir}/kde3/libamarok_generic-mediadevice.* +# Gstreamer engine - disabled in 1.4 final %if "%fedora" >= "5" -%{_datadir}/services/amarok_gst10engine_plugin.desktop -%{_libdir}/kde3/libamarok_gst10engine_plugin.* +#%{_datadir}/services/amarok_gst10engine_plugin.desktop +#%{_libdir}/kde3/libamarok_gst10engine_plugin.* %else %{_datadir}/services/amarok_gstengine_plugin.desktop %{_libdir}/kde3/libamarok_gstengine_plugin.* @@ -200,6 +205,7 @@ %endif + %files visualisation %defattr(-,root,root) %{_bindir}/amarok_libvisual @@ -208,6 +214,12 @@ %changelog +* Mon May 15 2006 Aurelien Bompard 1.4-1 +- version 1.4 final + +* Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 +- rc1 + * Fri Apr 14 2006 Aurelien Bompard 1.4-0.12.beta3 - add patch to make Gstreamer sufficient to build (only engine available on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 14 Apr 2006 07:29:15 -0000 1.21 +++ sources 19 May 2006 21:04:47 -0000 1.22 @@ -1 +1 @@ -b92433b46005f0b2fc31e0ce0bf4cb3a amarok-1.4-beta3c.tar.bz2 +3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 From fedora-extras-commits at redhat.com Fri May 19 22:50:20 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 May 2006 15:50:20 -0700 Subject: extras-repoclosure rc-modified, 1.1, 1.2 repoclosure.patch, 1.1, 1.2 rc-run.py, 1.3, 1.4 Message-ID: <200605192250.k4JMoKOU005423@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5394 Modified Files: rc-modified repoclosure.patch rc-run.py Log Message: - add -d/--cachedir option to modified repoclosure Index: rc-modified =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rc-modified 30 Apr 2006 11:11:51 -0000 1.1 +++ rc-modified 19 May 2006 22:50:18 -0000 1.2 @@ -43,6 +43,8 @@ help="specify repo ids to query, can be specified multiple times (default is all enabled)") parser.add_option("-t", "--tempcache", default=False, action="store_true", help="Use a temp dir for storing/accessing yum-cache") + parser.add_option("-d", "--cachedir", default='', + help="specify a custom directory for storing/accessing yum-cache") parser.add_option("-q", "--quiet", default=0, action="store_true", help="quiet (no output to stderr)") parser.add_option("-n", "--newest", default=0, action="store_true", @@ -147,8 +149,11 @@ else: repo.enable() - if os.geteuid() != 0 or opts.tempcache: - cachedir = getCacheDir() + if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '': + if opts.cachedir != '': + cachedir = opts.cachedir + else: + cachedir = getCacheDir() if cachedir is None: print "Error: Could not make cachedir, exiting" sys.exit(50) repoclosure.patch: Index: repoclosure.patch =================================================================== RCS file: /cvs/fedora/extras-repoclosure/repoclosure.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- repoclosure.patch 30 Apr 2006 11:11:51 -0000 1.1 +++ repoclosure.patch 19 May 2006 22:50:18 -0000 1.2 @@ -1,8 +1,15 @@ -Against yum-utils-0.5: - ---- /usr/bin/repoclosure 2006-02-23 18:06:16.000000000 +0100 -+++ rc-modified 2006-04-30 13:02:35.000000000 +0200 -@@ -88,7 +88,10 @@ +--- /usr/bin/repoclosure 2006-05-07 04:20:57.000000000 +0200 ++++ rc-modified 2006-05-20 00:43:58.000000000 +0200 +@@ -43,6 +43,8 @@ + help="specify repo ids to query, can be specified multiple times (default is all enabled)") + parser.add_option("-t", "--tempcache", default=False, action="store_true", + help="Use a temp dir for storing/accessing yum-cache") ++ parser.add_option("-d", "--cachedir", default='', ++ help="specify a custom directory for storing/accessing yum-cache") + parser.add_option("-q", "--quiet", default=0, action="store_true", + help="quiet (no output to stderr)") + parser.add_option("-n", "--newest", default=0, action="store_true", +@@ -88,7 +90,10 @@ unresolved = {} resolved = {} if newest: @@ -14,7 +21,21 @@ else: pkgs = self.pkgSack -@@ -167,7 +170,11 @@ +@@ -144,8 +149,11 @@ + else: + repo.enable() + +- if os.geteuid() != 0 or opts.tempcache: +- cachedir = getCacheDir() ++ if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '': ++ if opts.cachedir != '': ++ cachedir = opts.cachedir ++ else: ++ cachedir = getCacheDir() + if cachedir is None: + print "Error: Could not make cachedir, exiting" + sys.exit(50) +@@ -167,7 +175,11 @@ baddeps = my.getBrokenDeps(opts.newest) if opts.newest: @@ -27,7 +48,7 @@ else: num = len(my.pkgSack) -@@ -182,7 +189,8 @@ +@@ -182,7 +194,8 @@ pkgs = baddeps.keys() pkgs.sort() for pkg in pkgs: @@ -37,7 +58,7 @@ for (n, f, v) in baddeps[pkg]: req = '%s' % n if f: -@@ -192,6 +200,7 @@ +@@ -192,6 +205,7 @@ req = '%s %s' % (req, v) print ' %s' % req Index: rc-run.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rc-run.py 17 May 2006 13:41:11 -0000 1.3 +++ rc-run.py 19 May 2006 22:50:18 -0000 1.4 @@ -8,6 +8,8 @@ import tempfile workdir = '/srv/rpmbuild/extras-repoclosure' +cachedir = '/var/tmp/extras-repoclosure-mdcache' +#cachedir = '/srv/rpmbuild/extras-repoclosure/mdcache' breakfile = 'rc-run.breakfile' allreleases = [ '3', '4', '5', 'development' ] @@ -104,7 +106,8 @@ repoid = '%s-%s-%s' % (r,release,arch) rcargs += ('-r %s ' % repoid) # -n, --newest : yum-utils 0.5 - rc = os.system('./rc-modified -q -n -c %s %s >> %s' % (conffile,rcargs,logfilename)) + # -d : modified version only + rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename)) checkbreakfile() if rc: return False From fedora-extras-commits at redhat.com Fri May 19 22:53:14 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 May 2006 15:53:14 -0700 Subject: extras-repoclosure repoclosure.patch,1.2,1.3 rc-modified,1.2,1.3 Message-ID: <200605192253.k4JMrEj1005456@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433 Modified Files: repoclosure.patch rc-modified Log Message: safer indentation repoclosure.patch: Index: repoclosure.patch =================================================================== RCS file: /cvs/fedora/extras-repoclosure/repoclosure.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repoclosure.patch 19 May 2006 22:50:18 -0000 1.2 +++ repoclosure.patch 19 May 2006 22:53:12 -0000 1.3 @@ -1,5 +1,5 @@ --- /usr/bin/repoclosure 2006-05-07 04:20:57.000000000 +0200 -+++ rc-modified 2006-05-20 00:43:58.000000000 +0200 ++++ rc-modified 2006-05-20 00:53:04.000000000 +0200 @@ -43,6 +43,8 @@ help="specify repo ids to query, can be specified multiple times (default is all enabled)") parser.add_option("-t", "--tempcache", default=False, action="store_true", @@ -21,20 +21,26 @@ else: pkgs = self.pkgSack -@@ -144,8 +149,11 @@ +@@ -144,11 +149,14 @@ else: repo.enable() - if os.geteuid() != 0 or opts.tempcache: - cachedir = getCacheDir() +- if cachedir is None: +- print "Error: Could not make cachedir, exiting" +- sys.exit(50) + if os.geteuid() != 0 or opts.tempcache or opts.cachedir != '': + if opts.cachedir != '': + cachedir = opts.cachedir + else: + cachedir = getCacheDir() - if cachedir is None: - print "Error: Could not make cachedir, exiting" - sys.exit(50) ++ if cachedir is None: ++ print "Error: Could not make cachedir, exiting" ++ sys.exit(50) + + my.repos.setCacheDir(cachedir) + @@ -167,7 +175,11 @@ baddeps = my.getBrokenDeps(opts.newest) Index: rc-modified =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rc-modified 19 May 2006 22:50:18 -0000 1.2 +++ rc-modified 19 May 2006 22:53:12 -0000 1.3 @@ -154,9 +154,9 @@ cachedir = opts.cachedir else: cachedir = getCacheDir() - if cachedir is None: - print "Error: Could not make cachedir, exiting" - sys.exit(50) + if cachedir is None: + print "Error: Could not make cachedir, exiting" + sys.exit(50) my.repos.setCacheDir(cachedir) From fedora-extras-commits at redhat.com Fri May 19 23:34:15 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 16:34:15 -0700 Subject: rpms/rsnapshot import.log,1.5,1.6 Message-ID: <200605192334.k4JNYHVS008002@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968 Modified Files: import.log Log Message: auto-import rsnapshot-1.2.3-2 on branch devel from rsnapshot-1.2.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 12 Apr 2005 13:11:37 -0000 1.5 +++ import.log 19 May 2006 23:34:15 -0000 1.6 @@ -2,3 +2,4 @@ rsnapshot-1_2_1-1:HEAD:rsnapshot-1.2.1-1.src.rpm:1113303958 rsnapshot-1_2_1-2:HEAD:rsnapshot-1.2.1-2.src.rpm:1113306763 rsnapshot-1_2_1-3:HEAD:rsnapshot-1.2.1-3.src.rpm:1113311399 +rsnapshot-1_2_3-2:HEAD:rsnapshot-1.2.3-2.src.rpm:1148081651 From fedora-extras-commits at redhat.com Fri May 19 23:34:16 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 16:34:16 -0700 Subject: rpms/rsnapshot/devel rsnapshot.conf.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rsnapshot.spec, 1.5, 1.6 sources, 1.3, 1.4 rsnapshot.patch, 1.1, NONE Message-ID: <200605192334.k4JNYINV008010@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968/devel Modified Files: .cvsignore rsnapshot.spec sources Added Files: rsnapshot.conf.patch Removed Files: rsnapshot.patch Log Message: auto-import rsnapshot-1.2.3-2 on branch devel from rsnapshot-1.2.3-2.src.rpm rsnapshot.conf.patch: --- NEW FILE rsnapshot.conf.patch --- --- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 +++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 @@ -40,7 +40,7 @@ # # See the README file or the man page for more details. # -#@CMD_CP@ + at CMD_CP@ # uncomment this to use the rm program instead of the built-in perl routine. @CMD_RM@ @@ -55,7 +55,7 @@ @CMD_LOGGER@ # Uncomment this to specify a path to "du" for disk usage checks. -#@CMD_DU@ + at CMD_DU@ ######################################### # BACKUP INTERVALS # @@ -94,7 +94,7 @@ # If you enable this, data will be written to the file you specify. The # amount of data written is controlled by the "loglevel" parameter. -#logfile /var/log/rsnapshot +logfile /var/log/rsnapshot # The include and exclude parameters, if enabled, simply get passed directly # to rsync. If you have multiple include/exclude patterns, put each one on a @@ -138,7 +138,7 @@ # If you enable this, make sure the lockfile directory is not world # writable. Otherwise anyone can prevent the program from running. # -#lockfile /var/run/rsnapshot.pid +lockfile /var/run/rsnapshot.pid # If enabled, rsnapshot will move the oldest directory for each interval # to [interval_name].delete, then it will delete that directory as a Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Apr 2005 11:07:19 -0000 1.3 +++ .cvsignore 19 May 2006 23:34:16 -0000 1.4 @@ -1 +1 @@ -rsnapshot-1.2.1.tar.gz +rsnapshot-1.2.3.tar.gz Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rsnapshot.spec 12 Apr 2005 14:15:38 -0000 1.5 +++ rsnapshot.spec 19 May 2006 23:34:16 -0000 1.6 @@ -1,88 +1,134 @@ +# +# Specfile for rsnapshot +# + Name: rsnapshot +Version: 1.2.3 +Release: 2 Summary: Local and remote filesystem snapshot utility -Version: 1.2.1 -Release: 3 -License: GPL + Group: Applications/System -Url: http://www.rsnapshot.org -Source0: http://www.rsnapshot.org/downloads/rsnapshot-1.2.1.tar.gz -Patch0: rsnapshot.patch -BuildArch: noarch +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildrequires: perl, openssh-clients -Requires: perl, openssh-clients, rsync, coreutils, util-linux -AutoReqProv: no + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ %description -This is a remote backup program that uses rsync -to take backup snapshots of filesystems. -It uses hard links to save space on disk. +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ %prep -%setup -q -%{__perl} -pi.orig -e 's|/usr/local|/usr|g' rsnapshot.1 -%{__perl} -pi.orig -e 's|/usr/local|/usr|g' README +%setup -q %patch +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + %build -%configure \ - --with-rsync=%{_bindir}/rsync \ - --with-ssh=%{_bindir}/ssh \ - --with-logger=%{_bindir}/logger \ - --with-du=%{_bindir}/du - -%install -rm -rf %{buildroot} -install -d %{buildroot}/%{_bindir} -install -p -m 755 rsnapshot %{buildroot}/%{_bindir}/rsnapshot - -install -d %{buildroot}/%{_mandir}/man1 -install -p -m 644 rsnapshot.1 %{buildroot}/%{_mandir}/man1/ - -install -d %{buildroot}/%{_sysconfdir} -install -p -m 644 rsnapshot.conf.default %{buildroot}/%{_sysconfdir}/rsnapshot.conf.default -install -p -m 600 rsnapshot.conf.default %{buildroot}/%{_sysconfdir}/rsnapshot.conf +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ %post -# -# upgrade rsnapshot config file -# -RSNAPSHOT_CONFIG_VERSION=`%{_bindir}/rsnapshot check-config-version` -if test $? != 0; then - echo "Error upgrading %{_sysconfdir}/rsnapshot.conf" -fi - -if test "$RSNAPSHOT_CONFIG_VERSION" = "1.2"; then - # already latest version - exit 0 -fi - -if test "$RSNAPSHOT_CONFIG_VERSION" = "unknown"; then - %{_bindir}/rsnapshot upgrade-config-file - RETVAL=$? - exit $RETVAL -fi -echo "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" -exit 1 +%define logmsg logger -t %{name}/rpm +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ %clean -rm -rf %{buildroot} + +rm -rf $RPM_BUILD_ROOT + +################################################################################ %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README TODO -%config %{_sysconfdir}/rsnapshot.conf.default +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ %config(noreplace) %{_sysconfdir}/rsnapshot.conf -%{_bindir}/rsnapshot -%{_mandir}/man1/rsnapshot.1* +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ %changelog -* Tue Apr 12 2005 Gavin Henry -- Cleaned up a lot and reimported to Fedora Extras + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines * Sun Jan 29 2005 Nathan Rosenquist - Added upgrade script Index: sources =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Apr 2005 11:07:19 -0000 1.3 +++ sources 19 May 2006 23:34:16 -0000 1.4 @@ -1 +1 @@ -b126ae490889e5514f4a5d14a1128897 rsnapshot-1.2.1.tar.gz +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz --- rsnapshot.patch DELETED --- From fedora-extras-commits at redhat.com Fri May 19 23:36:07 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 16:36:07 -0700 Subject: owners owners.list,1.1025,1.1026 Message-ID: <200605192336.k4JNa9iB008072@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8055 Modified Files: owners.list Log Message: claiming ownershop of the rsnapshot package (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191603) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1025 retrieving revision 1.1026 diff -u -r1.1025 -r1.1026 --- owners.list 19 May 2006 19:46:13 -0000 1.1025 +++ owners.list 19 May 2006 23:36:07 -0000 1.1026 @@ -1447,7 +1447,7 @@ Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|lists at forevermore.net|extras-qa at fedoraproject.org| Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 00:07:09 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:09 -0700 Subject: rpms/orpie/devel - New directory Message-ID: <200605200007.k4K07Boe010512@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10483/orpie/devel Log Message: Directory /cvs/extras/rpms/orpie/devel added to the repository From fedora-extras-commits at redhat.com Sat May 20 00:07:08 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:08 -0700 Subject: rpms/orpie - New directory Message-ID: <200605200007.k4K07Aka010509@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10483/orpie Log Message: Directory /cvs/extras/rpms/orpie added to the repository From fedora-extras-commits at redhat.com Sat May 20 00:07:17 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:17 -0700 Subject: rpms/orpie/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605200007.k4K07JFP010564@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10528/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module orpie --- NEW 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 May 20 00:07:17 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:17 -0700 Subject: rpms/orpie Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605200007.k4K07JGp010561@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10528 Added Files: Makefile import.log Log Message: Setup of module orpie --- NEW FILE Makefile --- # Top level Makefile for module orpie all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 20 00:07:37 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:37 -0700 Subject: rpms/orpie import.log,1.1,1.2 Message-ID: <200605200007.k4K07dH5010625@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10592 Modified Files: import.log Log Message: auto-import orpie-1.4.3-3 on branch devel from orpie-1.4.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/orpie/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 May 2006 00:07:17 -0000 1.1 +++ import.log 20 May 2006 00:07:37 -0000 1.2 @@ -0,0 +1 @@ +orpie-1_4_3-3:HEAD:orpie-1.4.3-3.src.rpm:1148083653 From fedora-extras-commits at redhat.com Sat May 20 00:07:38 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:07:38 -0700 Subject: rpms/orpie/devel orpie.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605200007.k4K07eff010630@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10592/devel Modified Files: .cvsignore sources Added Files: orpie.spec Log Message: auto-import orpie-1.4.3-3 on branch devel from orpie-1.4.3-3.src.rpm --- NEW FILE orpie.spec --- # # Specfile for Orpie, a curses-based RPN calculator # Name: orpie Version: 1.4.3 Release: 3 Summary: A fullscreen console-based RPN calculator application Group: Applications/Engineering License: GPL URL: http://www.eecs.umich.edu/~pelzlpj/orpie/ ################################################################################ Source: http://www.eecs.umich.edu/~pelzlpj/orpie/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ################################################################################ BuildRequires: camlp4 BuildRequires: gsl-devel BuildRequires: ncurses-devel Requires: ocaml >= 3.07 Requires: gsl >= 1.4 Requires: camlp4 ################################################################################ %description Orpie is a fullscreen console-based RPN calculator that uses the curses library. Its operation is similar to that of modern HP calculators, but data entry has been optimized for efficiency on a PC keyboard. Its features include extensive scientific calculator functionality, command completion, and a visible interactive stack. ################################################################################ %prep %setup -q # Replace static lib paths with %{_lib} so we build properly on x86_64 # systems, where the libs are actually in lib64. sed -i -e 's#/lib/#/%{_lib}/#' configure sed -i -e 's#/lib'\''#/%{_lib}'\''#' configure ################################################################################ %build %configure make %{?_smp_mflags} ################################################################################ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ################################################################################ %clean rm -rf $RPM_BUILD_ROOT ################################################################################ %files %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/orpierc %doc doc/manual.html doc/manual.pdf doc/manual.tex.in doc/TODO README COPYING ChangeLog %{_bindir}/* %{_mandir}/man[^3]/* ################################################################################ %changelog * Sun May 14 2006 Chris Petersen 1.4.3-3 - Fix a few dependencies as suggested during the fedora review process * Thu May 11 2006 Chris Petersen 1.4.3-1 - Update spec to match fedora guidelines * Mon Aug 2 2004 Chris Petersen - Minor changes to spec format for better consistency and readability * Tue Jun 15 2004 Chris Petersen - Update RPM for 1.2rc1, and include orpie-curses-keys man info * Tue Apr 6 2004 Chris Petersen - Built initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/orpie/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 May 2006 00:07:17 -0000 1.1 +++ .cvsignore 20 May 2006 00:07:38 -0000 1.2 @@ -0,0 +1 @@ +orpie-1.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/orpie/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 May 2006 00:07:17 -0000 1.1 +++ sources 20 May 2006 00:07:38 -0000 1.2 @@ -0,0 +1 @@ +1c9d87cf3f8d982a9a3662d48e13de55 orpie-1.4.3.tar.gz From fedora-extras-commits at redhat.com Sat May 20 00:11:38 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:11:38 -0700 Subject: owners owners.list,1.1026,1.1027 Message-ID: <200605200011.k4K0BeC8010698@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10681 Modified Files: owners.list Log Message: add orpie calculator: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191452 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1026 retrieving revision 1.1027 diff -u -r1.1026 -r1.1027 --- owners.list 19 May 2006 23:36:07 -0000 1.1026 +++ owners.list 20 May 2006 00:11:38 -0000 1.1027 @@ -884,6 +884,7 @@ Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|orpie|A fullscreen console-based RPN calculator|lists at forevermore.net|extras-qa at fedoraproject.org| Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|otrs|The Open Ticket Request System|imlinux at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 00:14:40 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Fri, 19 May 2006 17:14:40 -0700 Subject: rpms/orpie/devel orpie.spec,1.1,1.2 Message-ID: <200605200014.k4K0Eghb010738@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10721 Modified Files: orpie.spec Log Message: Change the summary to remove a redundant word Index: orpie.spec =================================================================== RCS file: /cvs/extras/rpms/orpie/devel/orpie.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- orpie.spec 20 May 2006 00:07:38 -0000 1.1 +++ orpie.spec 20 May 2006 00:14:40 -0000 1.2 @@ -4,8 +4,8 @@ Name: orpie Version: 1.4.3 -Release: 3 -Summary: A fullscreen console-based RPN calculator application +Release: 4 +Summary: A fullscreen console-based RPN calculator Group: Applications/Engineering License: GPL @@ -81,6 +81,9 @@ %changelog +* Fri May 19 2006 Chris Petersen 1.4.3-4 +- Change the summary to remove a redundant word + * Sun May 14 2006 Chris Petersen 1.4.3-3 - Fix a few dependencies as suggested during the fedora review process From fedora-extras-commits at redhat.com Sat May 20 04:36:34 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 19 May 2006 21:36:34 -0700 Subject: rpms/scim-skk/FC-5 scim-skk.spec,1.11,1.12 Message-ID: <200605200436.k4K4aaGN023845@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23827 Modified Files: scim-skk.spec Log Message: Update the specfile against libstdc++so7 0:4.2.0-0.3.20060428.fc5.1 Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-5/scim-skk.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim-skk.spec 13 Feb 2006 06:31:14 -0000 1.11 +++ scim-skk.spec 20 May 2006 04:36:33 -0000 1.12 @@ -2,7 +2,7 @@ Name: scim-skk Version: 0.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SCIM IMEngine module for skk Group: System Environment/Libraries @@ -62,6 +62,9 @@ %changelog +* Sat Mar 20 2006 Ryo Dairiki - 0.5.2-4 +- rebuild against libstdc++so7 (0:4.2.0-0.3.20060428.fc5.1) + * Mon Feb 13 2006 Jens Petersen - 0.5.2-3 - build conditionally with libstdc++so7 preview library (#166041) - add with_libstdc_preview switch and tweak libtool to link against it From fedora-extras-commits at redhat.com Sat May 20 04:52:55 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Fri, 19 May 2006 21:52:55 -0700 Subject: rpms/ytalk/FC-5 ytalk.spec,1.2,1.3 Message-ID: <200605200453.k4K4rRja023958@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908/FC-5 Modified Files: ytalk.spec Log Message: Changed %build to allow rpmbuild remove debug info instead of doing it manually. Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/FC-5/ytalk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ytalk.spec 21 Feb 2006 10:28:13 -0000 1.2 +++ ytalk.spec 20 May 2006 04:52:55 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -22,13 +22,13 @@ %build %configure -make +make %{?_smp_mflags} %install -%makeinstall-strip - +#%makeinstall +make install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -38,6 +38,9 @@ %config(noreplace) /etc/ytalkrc %changelog +* Fri May 19 2006 Mike McGrath 3.3.0-4 +- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} + * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 - Upstream maintainer changed (from http://www.metawire.org/) From fedora-extras-commits at redhat.com Sat May 20 04:52:55 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Fri, 19 May 2006 21:52:55 -0700 Subject: rpms/ytalk/FC-4 ytalk.spec,1.2,1.3 Message-ID: <200605200453.k4K4rRou023955@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908/FC-4 Modified Files: ytalk.spec Log Message: Changed %build to allow rpmbuild remove debug info instead of doing it manually. Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/FC-4/ytalk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ytalk.spec 21 Feb 2006 10:28:07 -0000 1.2 +++ ytalk.spec 20 May 2006 04:52:54 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -22,13 +22,13 @@ %build %configure -make +make %{?_smp_mflags} %install -%makeinstall-strip - +#%makeinstall +make install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -38,6 +38,9 @@ %config(noreplace) /etc/ytalkrc %changelog +* Fri May 19 2006 Mike McGrath 3.3.0-4 +- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} + * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 - Upstream maintainer changed (from http://www.metawire.org/) From fedora-extras-commits at redhat.com Sat May 20 04:52:56 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Fri, 19 May 2006 21:52:56 -0700 Subject: rpms/ytalk/devel ytalk.spec,1.2,1.3 Message-ID: <200605200453.k4K4rSGa023961@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23908/devel Modified Files: ytalk.spec Log Message: Changed %build to allow rpmbuild remove debug info instead of doing it manually. Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ytalk.spec 21 Feb 2006 10:28:13 -0000 1.2 +++ ytalk.spec 20 May 2006 04:52:56 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -22,13 +22,13 @@ %build %configure -make +make %{?_smp_mflags} %install -%makeinstall-strip - +#%makeinstall +make install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -38,6 +38,9 @@ %config(noreplace) /etc/ytalkrc %changelog +* Fri May 19 2006 Mike McGrath 3.3.0-4 +- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} + * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 - Upstream maintainer changed (from http://www.metawire.org/) From fedora-extras-commits at redhat.com Sat May 20 05:07:33 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:07:33 -0700 Subject: extras-buildsys/server main.py,1.22,1.23 Message-ID: <200605200507.k4K57XHI026426@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26404/server Modified Files: main.py Log Message: Don't hang on Ctrl+C Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- main.py 14 May 2006 05:43:07 -0000 1.22 +++ main.py 20 May 2006 05:07:30 -0000 1.23 @@ -180,7 +180,10 @@ if opts.pidfile: os.unlink(opts.pidfile) - time.sleep(2) + try: + time.sleep(2) + except KeyboardInterrupt: + pass print "Done." os._exit(0) From fedora-extras-commits at redhat.com Sat May 20 05:07:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:07:59 -0700 Subject: extras-buildsys/builder BuilderMock.py,1.8,1.9 Message-ID: <200605200507.k4K57xK1026450@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26432/builder Modified Files: BuilderMock.py Log Message: Cosmetic newline Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- BuilderMock.py 16 May 2006 15:49:50 -0000 1.8 +++ BuilderMock.py 20 May 2006 05:07:56 -0000 1.9 @@ -409,7 +409,7 @@ pass elif status == FileTransfer.FT_RESULT_FAILED: self._done_status = 'failed' - self._log("Job failed because files could not be uploaded: %s" % msg) + self._log("Job failed because files could not be uploaded: %s\n" % msg) self._status = self._done_status self._uploader = None From fedora-extras-commits at redhat.com Sat May 20 05:10:10 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:10:10 -0700 Subject: extras-buildsys/builder Builder.py,1.14,1.15 Message-ID: <200605200510.k4K5AAqG026515@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26467/builder Modified Files: Builder.py Log Message: 2006-05-20 Dan Williams * server/Builder.py builder/Builder.py - Make passive builders work more - Consolidate some code into base Builder object in the server - Don't hang a job if it fails before we've had a chance to contact the builder after starting it 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 16 May 2006 15:49:50 -0000 1.14 +++ Builder.py 20 May 2006 05:10:02 -0000 1.15 @@ -66,14 +66,6 @@ return max_jobs -def prefix_url(url, use_ssl): - """Convenience function to add correct URL method - for the security method we're using.""" - if use_ssl: - return "https://" + url - return "http://" + url - - class Builder(object): """ Abstract builder base object """ def __init__(self, cfg): @@ -134,6 +126,13 @@ sys.stdout.write(msg) sys.stdout.flush() + def _prefix_url(self, url): + """Convenience function to add correct URL method + for the security method we're using.""" + if self._use_ssl: + return "https://" + url + return "http://" + url + def new_builder(cfg, btype): """Create and return a new builder object of the requested type.""" if btype == 'passive': @@ -374,6 +373,7 @@ self._http_server = None self._xmlrpc_server = None self._work_dir = os.path.abspath(cfg.get_str("Directories", "builder_work_dir")) + self._fileserver_port = self._cfg.get_int("Passive", "fileserver_port") threading.Thread.__init__(self) self._init_servers() @@ -386,12 +386,12 @@ self._log("Binding to address '%s:%d'\n" % (hostname, xmlrpc_port)) - port = self._cfg.get_int("Passive", "fileserver_port") try: - self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), + self._http_server = HTTPServer.PlgHTTPServerManager((hostname, self._fileserver_port), self._work_dir, self._certs) except socket.error, exc: - raise socket.error(exc[0], "Couldn't create server for %s:%s: '%s'" % (hostname, port, exc[1])) + raise socket.error(exc[0], "Couldn't create server for %s:%s: '%s'" % (hostname, + self._fileserver_port, exc[1])) self._http_server.set_POST_handler('/upload', self.upload_callback) try: @@ -549,14 +549,12 @@ # url-ify the file list urls = [] - work_dir = self._get_workdir_for_job(job.uniqid()) - port = "%s" % self._cfg.get_int("Network", "fileserver_port") - host = prefix_url(get_hostname(self._cfg)) + host = self._prefix_url(get_hostname(self._cfg)) for fpath in job.files(): - if not fpath.startswith(work_dir): + if not fpath.startswith(self._work_dir): return None - file_part = urllib.quote(fpath[len(work_dir) + 1:]) - full_url = "%s:%s/%s" % (host, port, file_part) + file_part = urllib.quote(fpath[len(self._work_dir) + 1:]) + full_url = "%s:%d/%s" % (host, self._fileserver_port, file_part) urls.append(full_url) return Commands.PlgCommandJobFilesAck(archjob_id, urls, cmd.seq(), self._seq_gen.next()) @@ -601,7 +599,7 @@ threading.Thread.__init__(self) def _get_server_address(self, port): - addr = prefix_url(self._server_hostname, self._use_ssl) + addr = self._prefix_url(self._server_hostname) return addr + ":" + port def download_srpm(self, archjob_id, url, target_dir, dl_callback, cb_data=None): @@ -616,7 +614,7 @@ def upload_files(self, archjob_id, files, ul_callback, cb_data=None): port = self._cfg.get_int("Active", "fileserver_port") url = "%s:%d/upload" % (self._server_hostname, port) - url = prefix_url(url, self._use_ssl) + url = self._prefix_url(url) data = [("archjob_id", archjob_id)] uploader = FileUploader.FileUploader(url, files, 'filedata', data, self._certs) From fedora-extras-commits at redhat.com Sat May 20 05:10:10 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:10:10 -0700 Subject: extras-buildsys/server ArchJob.py,1.32,1.33 Builder.py,1.42,1.43 Message-ID: <200605200510.k4K5ABVB026524@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26467/server Modified Files: ArchJob.py Builder.py Log Message: 2006-05-20 Dan Williams * server/Builder.py builder/Builder.py - Make passive builders work more - Consolidate some code into base Builder object in the server - Don't hang a job if it fails before we've had a chance to contact the builder after starting it Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ArchJob.py 14 May 2006 05:43:07 -0000 1.32 +++ ArchJob.py 20 May 2006 05:10:08 -0000 1.33 @@ -191,6 +191,10 @@ self._builder.remove_suspend_listener(self) self._set_status(AJ_STATUS_DONE) + def _handle_builder_finished(self): + self._set_status(AJ_STATUS_DOWNLOADING) + self._builder.request_job_files(self._id) + def _status_queued(self): pass @@ -201,7 +205,10 @@ if self._builder_status == 'downloaded': self._set_status(AJ_STATUS_REPO_WAIT) self._repo.request_unlock(self) - + + if self._builder_finished(): + self._handle_builder_finished() + def _status_repo_wait(self): pass @@ -217,13 +224,15 @@ if self._builder_status != 'downloaded': self._set_status(AJ_STATUS_RUNNING) + if self._builder_finished(): + self._handle_builder_finished() + def _status_running(self): if self._builder_status != 'prepping': self._prepping = False if self._builder_finished(): - self._set_status(AJ_STATUS_DOWNLOADING) - self._builder.request_job_files(self._id) + self._handle_builder_finished() def get_result_files_dir(self): result_dir = os.path.join(self._parent.get_stage_dir(), self._target_dict['arch']) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- Builder.py 16 May 2006 15:49:56 -0000 1.42 +++ Builder.py 20 May 2006 05:10:08 -0000 1.43 @@ -59,6 +59,7 @@ self._seq_gen = Commands.SequenceGenerator() self._lock = threading.Lock() self._cmd_queue = [] + self._ack_pending_list = [] self._suspend_listeners = [] self._status_listeners = [] self._ip = None @@ -159,6 +160,10 @@ self._prepping_jobs = False self._when_died = time.time() self._jobs = {} + self._cmd_queue = [] + self._ack_pending_list = [] + self._free_slots = 0 + self._ip = None self._notify_suspend_listeners(reason, msg) @@ -255,10 +260,10 @@ old_cmd = None self._lock.acquire() - for queued_cmd in self._cmd_queue: - if queued_cmd.seq() == ack.acked_seq() and isinstance(queued_cmd, old_cmd_type): - old_cmd = queued_cmd - self._cmd_queue.remove(queued_cmd) + for cmd in self._ack_pending_list[:]: + if cmd.seq() == ack.acked_seq() and isinstance(cmd, old_cmd_type): + old_cmd = cmd + self._ack_pending_list.remove(cmd) break self._lock.release() return old_cmd @@ -416,6 +421,46 @@ self._certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") self._certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + def _download_cb(self, result, (archjob, urls), msg): + """Notify archjob of the result of its download request.""" + if result == FileTransfer.FT_RESULT_FAILED: + print "Builder Error (%s): result files download failed for %s (%s). " \ + " '%s'" % (self._address, archjob.archjob_id(), archjob.arch(), msg) + + files = {} + result_files_dir = archjob.get_result_files_dir() + for url in urls: + try: + fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) + except FileDownloader.FileNameException, exc: + print "Error in JobFilesAck for %s: %s" % (url, exc) + continue + if result == FileTransfer.FT_RESULT_SUCCESS: + fpath = os.path.join(result_files_dir, fname) + if os.path.exists(fpath): + files[fname] = FileTransfer.FT_RESULT_SUCCESS + else: + files[fname] = FileTransfer.FT_RESULT_FAILED + else: + files[fname] = FileTransfer.FT_RESULT_FAILED + archjob.download_cb(files) + + def _handle_job_files_ack(self, cmd): + (archjob, urls) = self._decompose_job_files_ack(cmd) + if not archjob: + return + + if not urls or not len(urls): + archjob.download_cb({}) + return + + # Basic sanity checks; whether the files exist, etc + result_files_dir = archjob.get_result_files_dir() + downloader = FileDownloader.FileDownloader(urls, result_files_dir, + ['.rpm', '.log'], self._certs) + downloader.set_callback(self._download_cb, (archjob, urls)) + downloader.start() + def _send_commands(self): """Send queued commands to the builder, and then get it's list of reply commands.""" @@ -432,13 +477,15 @@ # Copy command queue self._lock.acquire() self._cmd_queue = self._cmd_queue + new_cmds - cmd_list = self._cmd_queue - # FIXME: deal with keeping ack-requiring cmds around + cmd_list = self._cmd_queue[:] + for cmd in self._cmd_queue: + if cmd.need_ack(): + self._ack_pending_list.append(cmd) self._cmd_queue = [] self._lock.release() # The actual XML-RPC request runs in a different thread because SSL - # calls sometimes hang + # calls sometimes hang req = PassiveBuilderRequest(self._address, self._certs, cmd_list) curtime = time.time() req.start() @@ -509,7 +556,6 @@ self._get_ip() # Try to talk to the builder - print "builder contact" cmd_list = self._send_commands() if cmd_list: # Builder is alive @@ -537,14 +583,7 @@ def _handle_builder_suspend(self, reason, msg): Builder._handle_builder_suspend(self, reason, msg) self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL - self._ip = None self._target_list = None - # Set free slots to zero so we don't send the - # builder a job on first contact - self._free_slots = 0 - - # Clear out the command queue; we start clean - self._cmd_queue = [] def _handle_builder_reactivate(self): mail = True @@ -571,9 +610,6 @@ def __init__(self, manager, cfg, address, weight): Builder.__init__(self, manager, cfg, address, weight, TYPE_ACTIVE) - def _init_builder(self, target_list): - self._target_list = target_list - def _handle_job_files_ack(self, cmd): (archjob, urls) = self._decompose_job_files_ack(cmd) if not archjob: @@ -641,13 +677,11 @@ self._cmd_queue = self._cmd_queue + new_cmds cmd_list = self._cmd_queue[:] - # Remove commands that don't require an ack, - # since we don't need to keep track of those - tmp_cmd_queue = [] + # Keep around commands that need an ack for cmd in self._cmd_queue: if cmd.need_ack(): - tmp_cmd_queue.append(cmd) - self._cmd_queue = tmp_cmd_queue + self._ack_pending_list.append(cmd) + self._cmd_queue = [] self._lock.release() return cmd_list @@ -678,11 +712,6 @@ def _handle_builder_suspend(self, reason, msg): Builder._handle_builder_suspend(self, reason, msg) self._last_contact = 0 - self._ip = None - - # Clear out the command queue; we start clean when the - # builder contacts us again - self._cmd_queue = [] def _handle_builder_reactivate(self, cmd_list): # Grab an updated target list from the command stream when @@ -710,5 +739,5 @@ self._lock.acquire() Builder._handle_builder_reactivate(self, mail=mail) - self._init_builder(target_list) + self._target_list = target_list self._lock.release() From fedora-extras-commits at redhat.com Sat May 20 05:10:04 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 May 2006 22:10:04 -0700 Subject: extras-buildsys ChangeLog,1.200,1.201 Message-ID: <200605200510.k4K5AYd8026532@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26467 Modified Files: ChangeLog Log Message: 2006-05-20 Dan Williams * server/Builder.py builder/Builder.py - Make passive builders work more - Consolidate some code into base Builder object in the server - Don't hang a job if it fails before we've had a chance to contact the builder after starting it Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- ChangeLog 16 May 2006 15:49:50 -0000 1.200 +++ ChangeLog 20 May 2006 05:10:02 -0000 1.201 @@ -1,3 +1,12 @@ +2006-05-20 Dan Williams + + * server/Builder.py + builder/Builder.py + - Make passive builders work more + - Consolidate some code into base Builder object in the server + - Don't hang a job if it fails before we've had a chance to contact + the builder after starting it + 2006-05-16 Dan Williams * Make passive builders work somewhat more; there are still some bugs From fedora-extras-commits at redhat.com Sat May 20 06:03:40 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 19 May 2006 23:03:40 -0700 Subject: rpms/scim-tomoe/FC-5 scim-tomoe.spec,1.9,1.10 Message-ID: <200605200603.k4K63ggD028942@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28925 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-5/scim-tomoe.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-tomoe.spec 1 Mar 2006 14:41:15 -0000 1.9 +++ scim-tomoe.spec 20 May 2006 06:03:40 -0000 1.10 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -64,6 +64,9 @@ %changelog +* Sat May 20 2006 Ryo Dairiki - 0.2-4 +- rebuild against new libstdc++so7 + * Wed Mar 1 2006 Ryo Dairiki - 0.2-3 - update to 0.2 From fedora-extras-commits at redhat.com Sat May 20 06:05:11 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 19 May 2006 23:05:11 -0700 Subject: rpms/scim-tomoe/FC-5 scim-tomoe.spec,1.10,1.11 Message-ID: <200605200605.k4K65DOx029007@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28990 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-5/scim-tomoe.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-tomoe.spec 20 May 2006 06:03:40 -0000 1.10 +++ scim-tomoe.spec 20 May 2006 06:05:11 -0000 1.11 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -64,7 +64,7 @@ %changelog -* Sat May 20 2006 Ryo Dairiki - 0.2-4 +* Sat May 20 2006 Ryo Dairiki - 0.2-5 - rebuild against new libstdc++so7 * Wed Mar 1 2006 Ryo Dairiki - 0.2-3 From fedora-extras-commits at redhat.com Sat May 20 06:37:54 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:37:54 -0700 Subject: rpms/lilypond - New directory Message-ID: <200605200637.k4K6buSQ029196@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29170/lilypond Log Message: Directory /cvs/extras/rpms/lilypond added to the repository From fedora-extras-commits at redhat.com Sat May 20 06:37:55 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:37:55 -0700 Subject: rpms/lilypond/devel - New directory Message-ID: <200605200637.k4K6bvcI029199@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29170/lilypond/devel Log Message: Directory /cvs/extras/rpms/lilypond/devel added to the repository From fedora-extras-commits at redhat.com Sat May 20 06:38:04 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:38:04 -0700 Subject: rpms/lilypond Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605200638.k4K6c6tt029248@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29215 Added Files: Makefile import.log Log Message: Setup of module lilypond --- NEW FILE Makefile --- # Top level Makefile for module lilypond all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 20 06:38:05 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:38:05 -0700 Subject: rpms/lilypond/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605200638.k4K6c71O029251@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29215/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lilypond --- NEW 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 May 20 06:40:15 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:40:15 -0700 Subject: rpms/lilypond import.log,1.1,1.2 Message-ID: <200605200640.k4K6eHa4029318@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29285 Modified Files: import.log Log Message: auto-import lilypond-2.8.3-1 on branch devel from lilypond-2.8.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lilypond/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 May 2006 06:38:04 -0000 1.1 +++ import.log 20 May 2006 06:40:15 -0000 1.2 @@ -0,0 +1 @@ +lilypond-2_8_3-1:HEAD:lilypond-2.8.3-1.src.rpm:1148107220 From fedora-extras-commits at redhat.com Sat May 20 06:40:16 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:40:16 -0700 Subject: rpms/lilypond/devel lilypond.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605200640.k4K6eInd029323@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29285/devel Modified Files: .cvsignore sources Added Files: lilypond.spec Log Message: auto-import lilypond-2.8.3-1 on branch devel from lilypond-2.8.3-1.src.rpm --- NEW FILE lilypond.spec --- Name: lilypond Version: 2.8.3 Release: 1%{?dist} Summary: A typesetting system for music notation Group: Applications/Publishing License: GPL URL: http://www.lilypond.org Source0: http://www.lilypond.org/download/v2.8/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ghostscript >= 8.15 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Buildrequires: t1utils bison flex mftrace ImageMagick BuildRequires: gettext python-devel tetex BuildRequires: texinfo >= 4.7 BuildRequires: guile-devel >= 1.6.4 BuildRequires: ghostscript >= 8.15 BuildRequires: pango-devel >= 1.6.0 %description LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. %prep %setup -q %build %configure --without-kpathsea --disable-checking \ --with-ncsb-dir=%{_datadir}/fonts/default/Type1 make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT package_infodir=%{_infodir} \ vimdir=%{_datadir}/vim/vim70e chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/python/midi.so # Symlink lilypond-init.el in emacs' site-start.d directory pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir site-start.d ln -s ../lilypond-init.el site-start.d popd # Change encoding to UTF8 pushd $RPM_BUILD_ROOT%{_infodir} iconv -f iso-8859-1 -t utf-8 music-glossary.info > music-glossary.info.utf8 mv music-glossary.info.utf8 music-glossary.info popd rm -f $RPM_BUILD_ROOT%{_infodir}/dir %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz %preun /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/lilypond.info.gz /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/music-glossary.info.gz %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS.txt COPYING DEDICATION HACKING INSTALL.txt %doc NEWS.txt README.txt ROADMAP THANKS VERSION %{_bindir}/* %{_libdir}/lilypond %{_datadir}/lilypond %{_datadir}/emacs/site-lisp %{_datadir}/vim/vim* %{_infodir}/*.gz %{_mandir}/man1/* %{_datadir}/omf/lilypond %ghost %{_datadir}/lilypond/%{version}/python/*.pyo %changelog * Sat May 20 2006 Quentin Spencer 2.8.3-1 - New upstream, remove patch. - Put docs in separate SRPM. * Mon May 15 2006 Quentin Spencer 2.8.2-3 - Fixes to dependencies, encoding of info files. - Add docs as separate tarball (building them fails without ghostscript 8.50). * Mon May 15 2006 Quentin Spencer 2.8.2-2 - Patch to fix segfault in fontconfig. * Sat May 13 2006 Quentin Spencer 2.8.2-1 - New release. * Tue May 2 2006 Quentin Spencer 2.8.1-4 - Add missing BuildRequires. - Specify location of NCSB fonts to configure script. - Disable parallel build. * Tue Apr 25 2006 Quentin Spencer 2.8.1-3 - Make .so file executable. * Tue Apr 25 2006 Quentin Spencer 2.8.1-2 - Use gettext. * Mon Apr 10 2006 Quentin Spencer 2.8.1-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 May 2006 06:38:05 -0000 1.1 +++ .cvsignore 20 May 2006 06:40:16 -0000 1.2 @@ -0,0 +1 @@ +lilypond-2.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 May 2006 06:38:05 -0000 1.1 +++ sources 20 May 2006 06:40:16 -0000 1.2 @@ -0,0 +1 @@ +3ca497670b1ff372f85a371ef3b8cd91 lilypond-2.8.3.tar.gz From fedora-extras-commits at redhat.com Sat May 20 06:52:50 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:52:50 -0700 Subject: rpms/mftrace/devel mftrace.spec,1.3,1.4 Message-ID: <200605200652.k4K6qq6g029450@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29433 Modified Files: mftrace.spec Log Message: Make sure are used Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/mftrace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mftrace.spec 14 May 2006 06:04:16 -0000 1.3 +++ mftrace.spec 20 May 2006 06:52:50 -0000 1.4 @@ -1,6 +1,6 @@ Name: mftrace Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -24,6 +24,7 @@ %prep %setup -q +sed -i -e "s/-Wall -O2/$RPM_OPT_FLAGS/" GNUmakefile.in %build @@ -49,6 +50,9 @@ %changelog +* Sat May 20 2006 Quentin Spencer 1.2.4-2 +- Make sure $RPM_OPT_FLAGS are used + * Sat May 13 2006 Quentin Spencer 1.2.4-1 - New upstream release. From fedora-extras-commits at redhat.com Sat May 20 06:54:39 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:54:39 -0700 Subject: rpms/mftrace/FC-5 mftrace.spec,1.3,1.4 Message-ID: <200605200654.k4K6sfh7029528@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29511 Modified Files: mftrace.spec Log Message: Make sure are used Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/mftrace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mftrace.spec 14 May 2006 06:12:39 -0000 1.3 +++ mftrace.spec 20 May 2006 06:54:39 -0000 1.4 @@ -1,6 +1,6 @@ Name: mftrace Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -24,6 +24,7 @@ %prep %setup -q +sed -i -e "s/-Wall -O2/$RPM_OPT_FLAGS/" GNUmakefile.in %build @@ -49,6 +50,9 @@ %changelog +* Sat May 20 2006 Quentin Spencer 1.2.4-2 +- Make sure $RPM_OPT_FLAGS are used + * Sat May 13 2006 Quentin Spencer 1.2.4-1 - New upstream release. From fedora-extras-commits at redhat.com Sat May 20 06:55:50 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 19 May 2006 23:55:50 -0700 Subject: rpms/mftrace/FC-4 mftrace.spec,1.3,1.4 Message-ID: <200605200655.k4K6tqmH029604@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29587 Modified Files: mftrace.spec Log Message: Make sure are used Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-4/mftrace.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mftrace.spec 14 May 2006 06:26:22 -0000 1.3 +++ mftrace.spec 20 May 2006 06:55:50 -0000 1.4 @@ -1,6 +1,6 @@ Name: mftrace Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -24,6 +24,7 @@ %prep %setup -q +sed -i -e "s/-Wall -O2/$RPM_OPT_FLAGS/" GNUmakefile.in %build @@ -49,6 +50,9 @@ %changelog +* Sat May 20 2006 Quentin Spencer 1.2.4-2 +- Make sure $RPM_OPT_FLAGS are used + * Sat May 13 2006 Quentin Spencer 1.2.4-1 - New upstream release. From fedora-extras-commits at redhat.com Sat May 20 07:02:33 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 00:02:33 -0700 Subject: owners owners.list,1.1027,1.1028 Message-ID: <200605200703.k4K737qG031927@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31907 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1027 retrieving revision 1.1028 diff -u -r1.1027 -r1.1028 --- owners.list 20 May 2006 00:11:38 -0000 1.1027 +++ owners.list 20 May 2006 07:02:33 -0000 1.1028 @@ -727,6 +727,7 @@ Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lightning|GNU Lightning|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|lilypond|A typesetting system for music notation|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 07:38:03 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 20 May 2006 00:38:03 -0700 Subject: rpms/libkexif/FC-5 .cvsignore, 1.4, 1.5 libkexif.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605200738.k4K7c6Od032218@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkexif/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32181/FC-5 Modified Files: .cvsignore libkexif.spec sources Log Message: update to 0.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkexif/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Oct 2005 07:14:10 -0000 1.4 +++ .cvsignore 20 May 2006 07:38:03 -0000 1.5 @@ -1 +1 @@ -libkexif-0.2.2.tar.bz2 +libkexif-0.2.3.tar.bz2 Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/FC-5/libkexif.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libkexif.spec 21 Feb 2006 17:26:19 -0000 1.12 +++ libkexif.spec 20 May 2006 07:38:03 -0000 1.13 @@ -1,13 +1,13 @@ Name: libkexif -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: Allow Kipi plugins to extract EXIF information Group: System Environment/Libraries License: GPL URL: http://extragear.kde.org/apps/kipi -Source0: http://dl.sf.net/digikam/libkexif-0.2.2.tar.bz2 +Source0: http://dl.sf.net/kipi/libkexif-0.2.3.tar.bz2 Patch0: libkexif-0.2.1-qcombobox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ %changelog +* Sat May 20 2006 Aurelien Bompard 0.2.3-1 +- version 0.2.3 + * Tue Feb 21 2006 Aurelien Bompard 0.2.2-4 - rebuild for fc5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkexif/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Oct 2005 07:14:10 -0000 1.4 +++ sources 20 May 2006 07:38:03 -0000 1.5 @@ -1 +1 @@ -3adf724e84da04fa0ee6f92ac9516468 libkexif-0.2.2.tar.bz2 +5d25cd7bf9f05dfa0611d32129980f97 libkexif-0.2.3.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 07:38:04 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 20 May 2006 00:38:04 -0700 Subject: rpms/libkexif/devel .cvsignore, 1.4, 1.5 libkexif.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200605200738.k4K7c6wC032224@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkexif/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32181/devel Modified Files: .cvsignore libkexif.spec sources Log Message: update to 0.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Oct 2005 07:14:10 -0000 1.4 +++ .cvsignore 20 May 2006 07:38:04 -0000 1.5 @@ -1 +1 @@ -libkexif-0.2.2.tar.bz2 +libkexif-0.2.3.tar.bz2 Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libkexif.spec 21 Feb 2006 17:26:19 -0000 1.12 +++ libkexif.spec 20 May 2006 07:38:04 -0000 1.13 @@ -1,13 +1,13 @@ Name: libkexif -Version: 0.2.2 -Release: 4%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: Allow Kipi plugins to extract EXIF information Group: System Environment/Libraries License: GPL URL: http://extragear.kde.org/apps/kipi -Source0: http://dl.sf.net/digikam/libkexif-0.2.2.tar.bz2 +Source0: http://dl.sf.net/kipi/libkexif-0.2.3.tar.bz2 Patch0: libkexif-0.2.1-qcombobox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ %changelog +* Sat May 20 2006 Aurelien Bompard 0.2.3-1 +- version 0.2.3 + * Tue Feb 21 2006 Aurelien Bompard 0.2.2-4 - rebuild for fc5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Oct 2005 07:14:10 -0000 1.4 +++ sources 20 May 2006 07:38:04 -0000 1.5 @@ -1 +1 @@ -3adf724e84da04fa0ee6f92ac9516468 libkexif-0.2.2.tar.bz2 +5d25cd7bf9f05dfa0611d32129980f97 libkexif-0.2.3.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 07:43:45 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 20 May 2006 00:43:45 -0700 Subject: rpms/libkipi/FC-5 .cvsignore, 1.4, 1.5 libkipi.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605200743.k4K7hlfB032371@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkipi/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32334/FC-5 Modified Files: .cvsignore libkipi.spec sources Log Message: update to 0.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkipi/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Oct 2005 07:15:56 -0000 1.4 +++ .cvsignore 20 May 2006 07:43:45 -0000 1.5 @@ -1 +1 @@ -libkipi-0.1.2.tar.bz2 +libkipi-0.1.4.tar.bz2 Index: libkipi.spec =================================================================== RCS file: /cvs/extras/rpms/libkipi/FC-5/libkipi.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libkipi.spec 22 Feb 2006 15:17:54 -0000 1.10 +++ libkipi.spec 20 May 2006 07:43:45 -0000 1.11 @@ -1,12 +1,12 @@ Name: libkipi -Version: 0.1.2 -Release: 5%{?dist} +Version: 0.1.4 +Release: 1%{?dist} Summary: Common plugin infrastructure for KDE image applications Group: System Environment/Libraries License: LGPL URL: http://extragear.kde.org/apps/kipi -Source0: http://dl.sf.net/digikam/libkipi-0.1.2.tar.bz2 +Source0: http://dl.sf.net/kipi/libkipi-0.1.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:3.0 @@ -83,6 +83,9 @@ %changelog +* Sat May 20 2006 Aurelien Bompard 0.1.4-1 +- version 0.1.4 + * Wed Feb 22 2006 Aurelien Bompard 0.1.2-5 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkipi/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Oct 2005 07:15:56 -0000 1.4 +++ sources 20 May 2006 07:43:45 -0000 1.5 @@ -1 +1 @@ -2fc68328b1331039861fca6f9354d635 libkipi-0.1.2.tar.bz2 +2d8b8da064b85b0e53a98b4a7510392e libkipi-0.1.4.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 07:43:46 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 20 May 2006 00:43:46 -0700 Subject: rpms/libkipi/devel .cvsignore, 1.4, 1.5 libkipi.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605200743.k4K7hmZt032377@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkipi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32334/devel Modified Files: .cvsignore libkipi.spec sources Log Message: update to 0.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Oct 2005 07:15:56 -0000 1.4 +++ .cvsignore 20 May 2006 07:43:46 -0000 1.5 @@ -1 +1 @@ -libkipi-0.1.2.tar.bz2 +libkipi-0.1.4.tar.bz2 Index: libkipi.spec =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/libkipi.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libkipi.spec 22 Feb 2006 15:17:54 -0000 1.10 +++ libkipi.spec 20 May 2006 07:43:46 -0000 1.11 @@ -1,12 +1,12 @@ Name: libkipi -Version: 0.1.2 -Release: 5%{?dist} +Version: 0.1.4 +Release: 1%{?dist} Summary: Common plugin infrastructure for KDE image applications Group: System Environment/Libraries License: LGPL URL: http://extragear.kde.org/apps/kipi -Source0: http://dl.sf.net/digikam/libkipi-0.1.2.tar.bz2 +Source0: http://dl.sf.net/kipi/libkipi-0.1.4.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:3.0 @@ -83,6 +83,9 @@ %changelog +* Sat May 20 2006 Aurelien Bompard 0.1.4-1 +- version 0.1.4 + * Wed Feb 22 2006 Aurelien Bompard 0.1.2-5 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libkipi/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Oct 2005 07:15:56 -0000 1.4 +++ sources 20 May 2006 07:43:46 -0000 1.5 @@ -1 +1 @@ -2fc68328b1331039861fca6f9354d635 libkipi-0.1.2.tar.bz2 +2d8b8da064b85b0e53a98b4a7510392e libkipi-0.1.4.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 09:44:13 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 02:44:13 -0700 Subject: fedora-security/audit fe5,1.25,1.26 Message-ID: <200605200944.k4K9iDlG004920@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4900 Modified Files: fe5 Log Message: CVE-2006-2480: dia Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- fe5 19 May 2006 04:53:33 -0000 1.25 +++ fe5 20 May 2006 09:44:10 -0000 1.26 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2480 VULNERABLE (dia) bz#192535 CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 From fedora-extras-commits at redhat.com Sat May 20 09:55:20 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 02:55:20 -0700 Subject: fedora-security/audit fe4,1.28,1.29 fe5,1.26,1.27 Message-ID: <200605200955.k4K9tK9C005040@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5020 Modified Files: fe4 fe5 Log Message: Note CVE-2006-2162, CVE-2006-2489 nagios version fixes. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- fe4 19 May 2006 04:53:33 -0000 1.28 +++ fe4 20 May 2006 09:55:18 -0000 1.29 @@ -2,12 +2,13 @@ ** are items that need attention +CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-3) bz#190924 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 -CVE-2006-2162 VULNERABLE (nagios) bz#190614 +CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190614 CVE-2006-2093 version (nessus, fixed 2.2.7) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- fe5 20 May 2006 09:44:10 -0000 1.26 +++ fe5 20 May 2006 09:55:18 -0000 1.27 @@ -2,13 +2,14 @@ ** are items that need attention +CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2480 VULNERABLE (dia) bz#192535 CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 CVE-2006-2237 backport (awstats, fixed 6.5-5) bz#190923 CVE-2006-2229 ** openvpn CVE-2006-2169 ** rt3 -CVE-2006-2162 VULNERABLE (nagios) bz#190612 +CVE-2006-2162 version (nagios, fixed 2.3.1) bz#190612 CVE-2006-2093 version (nessus, fixed 2.2.7) bz#191053 CVE-2006-2017 version (dnsmasq, fixed 2.30) CVE-2006-2016 version (phpldapadmin, fixed 0.9.8.1) From fedora-extras-commits at redhat.com Sat May 20 10:53:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 03:53:23 -0700 Subject: rpms/htop/devel .cvsignore, 1.4, 1.5 htop.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605201053.k4KArPNO007536@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7515 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 May 2006 14:40:27 -0000 1.4 +++ .cvsignore 20 May 2006 10:53:23 -0000 1.5 @@ -1 +1 @@ -htop-0.6.1.tar.gz +htop-0.6.2.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/devel/htop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- htop.spec 10 May 2006 15:03:57 -0000 1.6 +++ htop.spec 20 May 2006 10:53:23 -0000 1.7 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -22,7 +22,8 @@ %build -%configure +%configure \ + --disable-dependency-tracking make %{?_smp_mflags} @@ -53,6 +54,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 +- Update to 0.6.2 + * Wed May 10 2006 Dawid Gajownik - 0.6.1-2 - Add missing BR: desktop-file-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 May 2006 14:40:27 -0000 1.5 +++ sources 20 May 2006 10:53:23 -0000 1.6 @@ -1 +1 @@ -f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz +995e76b7fd18c05fb7fb5ef10a2166ca htop-0.6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 10:54:53 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 03:54:53 -0700 Subject: rpms/htop/FC-5 .cvsignore, 1.4, 1.5 htop.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605201054.k4KAstRr007614@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7593 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 May 2006 14:42:23 -0000 1.4 +++ .cvsignore 20 May 2006 10:54:53 -0000 1.5 @@ -1 +1 @@ -htop-0.6.1.tar.gz +htop-0.6.2.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/htop.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- htop.spec 10 May 2006 15:05:34 -0000 1.6 +++ htop.spec 20 May 2006 10:54:53 -0000 1.7 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -22,7 +22,8 @@ %build -%configure +%configure \ + --disable-dependency-tracking make %{?_smp_mflags} @@ -53,6 +54,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 +- Update to 0.6.2 + * Wed May 10 2006 Dawid Gajownik - 0.6.1-2 - Add missing BR: desktop-file-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 May 2006 14:42:23 -0000 1.5 +++ sources 20 May 2006 10:54:53 -0000 1.6 @@ -1 +1 @@ -f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz +995e76b7fd18c05fb7fb5ef10a2166ca htop-0.6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 10:56:53 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 03:56:53 -0700 Subject: rpms/htop/FC-4 .cvsignore, 1.4, 1.5 htop.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200605201056.k4KAut6F007695@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/htop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7674 Modified Files: .cvsignore htop.spec sources Log Message: Update to 0.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 May 2006 14:49:10 -0000 1.4 +++ .cvsignore 20 May 2006 10:56:53 -0000 1.5 @@ -1 +1 @@ -htop-0.6.1.tar.gz +htop-0.6.2.tar.gz Index: htop.spec =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/htop.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- htop.spec 10 May 2006 15:06:57 -0000 1.5 +++ htop.spec 20 May 2006 10:56:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: htop -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -22,7 +22,8 @@ %build -%configure +%configure \ + --disable-dependency-tracking make %{?_smp_mflags} @@ -53,6 +54,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 +- Update to 0.6.2 + * Wed May 10 2006 Dawid Gajownik - 0.6.1-2 - Add missing BR: desktop-file-utils Index: sources =================================================================== RCS file: /cvs/extras/rpms/htop/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 May 2006 14:49:10 -0000 1.5 +++ sources 20 May 2006 10:56:53 -0000 1.6 @@ -1 +1 @@ -f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz +995e76b7fd18c05fb7fb5ef10a2166ca htop-0.6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 11:10:47 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sat, 20 May 2006 04:10:47 -0700 Subject: rpms/bmp-flac2/devel .cvsignore, 1.3, 1.4 bmp-flac2.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605201110.k4KBAndb010455@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/bmp-flac2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10434 Modified Files: .cvsignore bmp-flac2.spec sources Log Message: Update to 008 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2005 16:07:07 -0000 1.3 +++ .cvsignore 20 May 2006 11:10:47 -0000 1.4 @@ -1 +1 @@ -bmp-flac2-007.tar.gz +bmp-flac2-008.tar.gz Index: bmp-flac2.spec =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/bmp-flac2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bmp-flac2.spec 21 Feb 2006 15:17:33 -0000 1.3 +++ bmp-flac2.spec 20 May 2006 11:10:47 -0000 1.4 @@ -1,8 +1,8 @@ %define bmp_input_plugin_dir %(pkg-config --variable=input_plugin_dir bmp 2>/dev/null || echo %{_libdir}/bmp/Input) Name: bmp-flac2 -Version: 007 -Release: 2%{?dist} +Version: 008 +Release: 1%{?dist} Summary: Plugin to enable FLAC playback in the Beep Media Player Group: Applications/Multimedia @@ -56,6 +56,9 @@ %changelog +* Sat Mar 20 2006 Ralf Ertzinger 008-1.fc6 +- Update to 008 + * Tue Feb 21 2006 Ralf Ertzinger 007-2.fc5 - Bump and rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2005 16:07:07 -0000 1.3 +++ sources 20 May 2006 11:10:47 -0000 1.4 @@ -1 +1 @@ -c40c01602ded3690a6c853e5cbe8fda3 bmp-flac2-007.tar.gz +9e71943104e23231e834964f1c6c979f bmp-flac2-008.tar.gz From fedora-extras-commits at redhat.com Sat May 20 12:20:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 20 May 2006 05:20:57 -0700 Subject: rpms/dia/devel dia-0.95-CVE-2006-2480.patch, NONE, 1.1 dia.spec, 1.9, 1.10 Message-ID: <200605201220.k4KCKxku013081@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13061 Modified Files: dia.spec Added Files: dia-0.95-CVE-2006-2480.patch Log Message: * Sat May 20 2006 Hans de Goede 1:0.95-2 - Fix CVE-2006-2480 (bz 192535, 192538). dia-0.95-CVE-2006-2480.patch: --- NEW FILE dia-0.95-CVE-2006-2480.patch --- --- lib/message.c +++ lib/message.c @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dia.spec 25 Apr 2006 20:15:35 -0000 1.9 +++ dia.spec 20 May 2006 12:20:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -10,6 +10,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch +Patch4: dia-0.95-CVE-2006-2480.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -28,6 +29,7 @@ %patch1 -p1 -b .dtd %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons +%patch4 -p0 -b .cve-2006-2480 %build @@ -97,6 +99,9 @@ %changelog +* Sat May 20 2006 Hans de Goede 1:0.95-2 +- Fix CVE-2006-2480 (bz 192535, 192538). + * Tue Apr 25 2006 Hans de Goede 1:0.95-1 - New upstream version 0.95 (final) - Cleanup spec even more, correctly install the desktop file and icons, From fedora-extras-commits at redhat.com Sat May 20 12:23:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 20 May 2006 05:23:43 -0700 Subject: rpms/dia/FC-5 dia-0.95-CVE-2006-2480.patch, NONE, 1.1 dia.spec, 1.10, 1.11 Message-ID: <200605201223.k4KCNjXK013166@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13146 Modified Files: dia.spec Added Files: dia-0.95-CVE-2006-2480.patch Log Message: * Sat May 20 2006 Hans de Goede 1:0.95-2 - Fix CVE-2006-2480 (bz 192535, 192538). dia-0.95-CVE-2006-2480.patch: --- NEW FILE dia-0.95-CVE-2006-2480.patch --- --- lib/message.c +++ lib/message.c @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dia.spec 25 Apr 2006 20:18:06 -0000 1.10 +++ dia.spec 20 May 2006 12:23:43 -0000 1.11 @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -10,6 +10,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch +Patch4: dia-0.95-CVE-2006-2480.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -28,6 +29,7 @@ %patch1 -p1 -b .dtd %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons +%patch4 -p0 -b .cve-2006-2480 %build @@ -97,6 +99,9 @@ %changelog +* Sat May 20 2006 Hans de Goede 1:0.95-2 +- Fix CVE-2006-2480 (bz 192535, 192538). + * Tue Apr 25 2006 Hans de Goede 1:0.95-1 - New upstream version 0.95 (final) - Cleanup spec even more, correctly install the desktop file and icons, From fedora-extras-commits at redhat.com Sat May 20 12:33:06 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sat, 20 May 2006 05:33:06 -0700 Subject: rpms/bmp-flac2/devel .cvsignore, 1.4, 1.5 bmp-flac2.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605201233.k4KCX8QI013262@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/bmp-flac2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13241 Modified Files: .cvsignore bmp-flac2.spec sources Log Message: Update to 009 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 May 2006 11:10:47 -0000 1.4 +++ .cvsignore 20 May 2006 12:33:06 -0000 1.5 @@ -1 +1 @@ -bmp-flac2-008.tar.gz +bmp-flac2-009.tar.gz Index: bmp-flac2.spec =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/bmp-flac2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bmp-flac2.spec 20 May 2006 11:10:47 -0000 1.4 +++ bmp-flac2.spec 20 May 2006 12:33:06 -0000 1.5 @@ -1,7 +1,7 @@ %define bmp_input_plugin_dir %(pkg-config --variable=input_plugin_dir bmp 2>/dev/null || echo %{_libdir}/bmp/Input) Name: bmp-flac2 -Version: 008 +Version: 009 Release: 1%{?dist} Summary: Plugin to enable FLAC playback in the Beep Media Player @@ -56,8 +56,8 @@ %changelog -* Sat Mar 20 2006 Ralf Ertzinger 008-1.fc6 -- Update to 008 +* Sat Mar 20 2006 Ralf Ertzinger 009-1.fc6 +- Update to 009 * Tue Feb 21 2006 Ralf Ertzinger 007-2.fc5 - Bump and rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 May 2006 11:10:47 -0000 1.4 +++ sources 20 May 2006 12:33:06 -0000 1.5 @@ -1 +1 @@ -9e71943104e23231e834964f1c6c979f bmp-flac2-008.tar.gz +4e1793a0748f64e34ca70e9ce551c8d3 bmp-flac2-009.tar.gz From fedora-extras-commits at redhat.com Sat May 20 12:40:00 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Sat, 20 May 2006 05:40:00 -0700 Subject: fedora-security/audit fc4,1.254,1.255 Message-ID: <200605201240.k4KCe0Ym013363@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13345 Modified Files: fc4 Log Message: Note the dia issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- fc4 18 May 2006 19:00:46 -0000 1.254 +++ fc4 20 May 2006 12:39:57 -0000 1.255 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-2480 VULNERABLE (dia) #192538 CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] From fedora-extras-commits at redhat.com Sat May 20 12:49:27 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Sat, 20 May 2006 05:49:27 -0700 Subject: rpms/bmp-flac2/FC-5 .cvsignore, 1.3, 1.4 bmp-flac2.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200605201249.k4KCnTMd013419@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/bmp-flac2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13398 Modified Files: .cvsignore bmp-flac2.spec sources Log Message: Update to 009 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2005 16:07:07 -0000 1.3 +++ .cvsignore 20 May 2006 12:49:27 -0000 1.4 @@ -1 +1 @@ -bmp-flac2-007.tar.gz +bmp-flac2-009.tar.gz Index: bmp-flac2.spec =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/FC-5/bmp-flac2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bmp-flac2.spec 21 Feb 2006 15:17:33 -0000 1.3 +++ bmp-flac2.spec 20 May 2006 12:49:27 -0000 1.4 @@ -1,8 +1,8 @@ %define bmp_input_plugin_dir %(pkg-config --variable=input_plugin_dir bmp 2>/dev/null || echo %{_libdir}/bmp/Input) Name: bmp-flac2 -Version: 007 -Release: 2%{?dist} +Version: 009 +Release: 1%{?dist} Summary: Plugin to enable FLAC playback in the Beep Media Player Group: Applications/Multimedia @@ -56,6 +56,9 @@ %changelog +* Sat Mar 20 2006 Ralf Ertzinger 009-1.fc5 +- Update to 009 + * Tue Feb 21 2006 Ralf Ertzinger 007-2.fc5 - Bump and rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bmp-flac2/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2005 16:07:07 -0000 1.3 +++ sources 20 May 2006 12:49:27 -0000 1.4 @@ -1 +1 @@ -c40c01602ded3690a6c853e5cbe8fda3 bmp-flac2-007.tar.gz +4e1793a0748f64e34ca70e9ce551c8d3 bmp-flac2-009.tar.gz From fedora-extras-commits at redhat.com Sat May 20 14:28:37 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Sat, 20 May 2006 07:28:37 -0700 Subject: fedora-security/audit fc4,1.255,1.256 fc5,1.169,1.170 Message-ID: <200605201428.k4KESb08019283@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19263 Modified Files: fc4 fc5 Log Message: Missing updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- fc4 20 May 2006 12:39:57 -0000 1.255 +++ fc4 20 May 2006 14:28:34 -0000 1.256 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060517 -Up to date FC4 as of 20060517 +Up to date CVE as of CVE email 20060519 +Up to date FC4 as of 20060519 ** are items that need attention +CVE-2006-2493 ** freetype CVE-2006-2480 VULNERABLE (dia) #192538 CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only @@ -45,6 +46,8 @@ CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) +CVE-2006-1856 ** (kernel) +CVE-2006-1855 ** (kernel, fixed 2.6.11.12) CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410] CVE-2006-1790 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-488] @@ -119,6 +122,7 @@ CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8) CVE-2006-1529 version (thunderbird, fixed 1.0.8) [since FEDORA-2006-489] CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8) +CVE-2006-1528 ** (kernel, fixed 2.6.13) CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-500] CVE-2006-1526 backport (xorg-x11) #189802 [since FEDORA-2006-484] CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423] @@ -236,6 +240,7 @@ CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) #187421 CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) +CVE-2006-0039 ** kernel CVE-2006-0037 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2006-0036 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077 CVE-2006-0035 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-077 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- fc5 18 May 2006 19:00:46 -0000 1.169 +++ fc5 20 May 2006 14:28:34 -0000 1.170 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060517 -Up to date FC5 as of 20060517 +Up to date CVE as of CVE email 20060519 +Up to date FC5 as of 20060519 ** are items that need attention +CVE-2006-2493 ** freetype CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] @@ -45,6 +46,8 @@ CVE-2006-1861 VULNERABLE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 VULNERABLE (kernel, fixed 2.6.16.16) CVE-2006-1859 VULNERABLE (kernel, fixed 2.6.16.16) +CVE-2006-1856 ** (kernel) +CVE-2006-1855 ** (kernel, fixed 2.6.11.12) CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1790 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1790 version (mozilla, fixed 1.7.13) [since FEDORA-2006-487] @@ -118,6 +121,7 @@ CVE-2006-1530 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] CVE-2006-1529 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490] CVE-2006-1529 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411] +CVE-2006-1528 ** (kernel, fixed 2.6.13) CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499] CVE-2006-1526 backport (xorg-x11) bz#189802 [since FEDORA-2006-483] CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421] @@ -238,6 +242,7 @@ CVE-2006-0052 version (mailman, fixed 2.1.6) CVE-2006-0049 version (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) #183680 no upstream fix +CVE-2006-0039 ** kernel CVE-2006-0037 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233] From fedora-extras-commits at redhat.com Sat May 20 14:34:30 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 May 2006 07:34:30 -0700 Subject: extras-buildsys/utils extras-push-new,1.13,1.14 Message-ID: <200605201434.k4KEYUUC019344@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19326 Modified Files: extras-push-new Log Message: only rename list "dists" to "diststopush" as the initial naming was unfortunate Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- extras-push-new 19 May 2006 11:23:01 -0000 1.13 +++ extras-push-new 20 May 2006 14:34:28 -0000 1.14 @@ -503,17 +503,17 @@ print 'SYNTAX: %s [dist]...' % sys.argv[0] sys.exit(errno.EINVAL) - dists = [] # the list of distribution release we want to push + diststopush = [] for d in sys.argv[1:]: if d == 'all': - dists = alldists + diststopush = alldists continue if d not in alldists: print "ERROR: No Distribution named '%s' found" % d sys.exit(1) - if d not in dists: - dists.append(d) - debugprint(dists) + if d not in diststopush: + diststopush.append(d) + debugprint(diststopush) if not os.path.exists(rundir): os.makedirs(rundir) @@ -522,14 +522,14 @@ lock = LockFile(lockfile) lock.lock() - for dist in dists: + for dist in diststopush: result = sign_move(dist) if result and result != 4: # 4 = no packages to sign sys.exit(result) # Option -f re-runs repobuild/repoview for all dists, even if # no new packages have been pushed for a dist. - changed = dists + changed = diststopush if opts.force: changed = alldists @@ -551,7 +551,7 @@ run_and_check('extras-sync') if opts.mail: - for dist in dists: + for dist in diststopush: email_list( getlinesfromrunfile(dist), dist ) emptyrunfile(dist) From fedora-extras-commits at redhat.com Sat May 20 14:37:54 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 07:37:54 -0700 Subject: rpms/yakuake/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yakuake.spec, 1.1, 1.2 Message-ID: <200605201437.k4KEbuTG019382@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19361 Modified Files: .cvsignore sources yakuake.spec Log Message: - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options - Include translations Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yakuake/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Nov 2005 17:57:05 -0000 1.2 +++ .cvsignore 20 May 2006 14:37:53 -0000 1.3 @@ -1 +1 @@ -yakuake-2.7.3.tar.bz2 +29153-yakuake-2.7.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yakuake/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Nov 2005 17:57:05 -0000 1.2 +++ sources 20 May 2006 14:37:53 -0000 1.3 @@ -1 +1 @@ -98576f75c94f75756ef4acb18ef93a5e yakuake-2.7.3.tar.bz2 +6905f9a6d448c7bfc818cd2d7c88cab4 29153-yakuake-2.7.5.tar.bz2 Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yakuake.spec 10 Nov 2005 17:57:05 -0000 1.1 +++ yakuake.spec 20 May 2006 14:37:53 -0000 1.2 @@ -1,15 +1,17 @@ Name: yakuake -Version: 2.7.3 -Release: 4 +Version: 2.7.5 +Release: 1 Summary: Terminal emulator for KDE Group: User Interface/Desktops License: GPL -URL: http://yakuake.uv.ro/ -Source0: http://download.softpedia.com/linux/yakuake-%{version}.tar.bz2 +URL: http://extragear.kde.org/apps/yakuake/ +Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs-devel %description Yakuake is a "Quake console" like terminal emulator for KDE. @@ -20,26 +22,32 @@ %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure --disable-rpath --disable-debug +%configure \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-final make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Utility \ --add-category KDE \ --add-category Qt \ --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/yakuake.desktop -chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/apps/yakuake/default/install.sh + %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop +chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh + +%find_lang %{name} %post @@ -57,19 +65,25 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog TODO %{_bindir}/yakuake -%{_datadir}/applications/fedora-yakuake.desktop -%{_datadir}/apps/yakuake +%{_datadir}/applications/*yakuake.desktop +%{_datadir}/apps/yakuake/ %{_datadir}/icons/hicolor/16x16/apps/yakuake.png %{_datadir}/icons/hicolor/32x32/apps/yakuake.png -%doc AUTHORS COPYING + %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-1 +- Update to 2.7.5 +- Add `--disable-dependency-tracking' and `--enable-final' options +- Include translations + * Mon Oct 24 2005 Mickael - initial release From fedora-extras-commits at redhat.com Sat May 20 14:40:31 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 07:40:31 -0700 Subject: owners owners.list,1.1028,1.1029 Message-ID: <200605201440.k4KEeY2T019418@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19399 Modified Files: owners.list Log Message: Taking over yakuake :) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1028 retrieving revision 1.1029 diff -u -r1.1028 -r1.1029 --- owners.list 20 May 2006 07:02:33 -0000 1.1028 +++ owners.list 20 May 2006 14:40:31 -0000 1.1029 @@ -1774,7 +1774,7 @@ Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|yadex|A DOOM level editor|wart at kobold.org|extras-qa at fedoraproject.org| -Fedora Extras|yakuake|A Quake-like terminal application|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|yakuake|A Quake-like terminal application|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ytalk|A chat program for multiple users|imlinux at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 15:19:32 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 20 May 2006 08:19:32 -0700 Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.13, 1.14 dejavu-fonts.spec, 1.20, 1.21 sources, 1.13, 1.14 Message-ID: <200605201519.k4KFJYbL022002@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21963/FC-5 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.6.0-1.fc5 on branch FC-5 from dejavu-fonts-2.6.0-1.fc5.src.rpm 2.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 23 Apr 2006 17:12:44 -0000 1.13 +++ .cvsignore 20 May 2006 15:19:32 -0000 1.14 @@ -1 +1 @@ -dejavu-sfd-2.5.tar.gz +dejavu-sfd-2.6.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- dejavu-fonts.spec 23 Apr 2006 18:18:44 -0000 1.20 +++ dejavu-fonts.spec 20 May 2006 15:19:32 -0000 1.21 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion 2.5 +%define archiveversion 2.6 %define fontdir %{_datadir}/fonts/%{name} %define xsldir %{_datadir}/xml/%{name} @@ -9,8 +9,8 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.5.0 -Release: 2%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions @@ -161,6 +161,9 @@ %changelog +* Mon May 15 2006 Nicolas Mailhot - 2.6.0-1 +- 2.6.0 + * Sun Apr 23 2006 Nicolas Mailhot - 2.5.0-1 - 2.5.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 23 Apr 2006 17:12:44 -0000 1.13 +++ sources 20 May 2006 15:19:32 -0000 1.14 @@ -1 +1 @@ -402d2f846caa83c8067e281b3c5fa8c0 dejavu-sfd-2.5.tar.gz +aae0e562be59e57e791cd1a7273bfb8c dejavu-sfd-2.6.tar.gz From fedora-extras-commits at redhat.com Sat May 20 15:19:31 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 20 May 2006 08:19:31 -0700 Subject: rpms/dejavu-fonts import.log,1.50,1.51 Message-ID: <200605201519.k4KFJXU1021996@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21963 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.6.0-1.fc5 on branch FC-5 from dejavu-fonts-2.6.0-1.fc5.src.rpm 2.6.0 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- import.log 15 May 2006 16:45:35 -0000 1.50 +++ import.log 20 May 2006 15:19:31 -0000 1.51 @@ -47,3 +47,4 @@ dejavu-fonts-2_5_0-1_fc4:FC-4:dejavu-fonts-2.5.0-1.fc4.src.rpm:1145812549 dejavu-fonts-2_5_0-2_fc5:FC-5:dejavu-fonts-2.5.0-2.fc5.src.rpm:1145816306 dejavu-fonts-2_6_0-1_fc6:HEAD:dejavu-fonts-2.6.0-1.fc6.src.rpm:1147711519 +dejavu-fonts-2_6_0-1_fc5:FC-5:dejavu-fonts-2.6.0-1.fc5.src.rpm:1148138354 From fedora-extras-commits at redhat.com Sat May 20 15:29:58 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 20 May 2006 08:29:58 -0700 Subject: rpms/dejavu-fonts import.log,1.51,1.52 Message-ID: <200605201530.k4KFU0ps022157@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22124 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.6.0-1.fc4 on branch FC-4 from dejavu-fonts-2.6.0-1.fc4.src.rpm 2.6.0 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- import.log 20 May 2006 15:19:31 -0000 1.51 +++ import.log 20 May 2006 15:29:58 -0000 1.52 @@ -48,3 +48,4 @@ dejavu-fonts-2_5_0-2_fc5:FC-5:dejavu-fonts-2.5.0-2.fc5.src.rpm:1145816306 dejavu-fonts-2_6_0-1_fc6:HEAD:dejavu-fonts-2.6.0-1.fc6.src.rpm:1147711519 dejavu-fonts-2_6_0-1_fc5:FC-5:dejavu-fonts-2.6.0-1.fc5.src.rpm:1148138354 +dejavu-fonts-2_6_0-1_fc4:FC-4:dejavu-fonts-2.6.0-1.fc4.src.rpm:1148138984 From fedora-extras-commits at redhat.com Sat May 20 15:29:59 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 20 May 2006 08:29:59 -0700 Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.13, 1.14 dejavu-fonts.spec, 1.14, 1.15 sources, 1.13, 1.14 Message-ID: <200605201530.k4KFU1IN022164@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-serv22124/FC-4 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.6.0-1.fc4 on branch FC-4 from dejavu-fonts-2.6.0-1.fc4.src.rpm 2.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 23 Apr 2006 17:16:06 -0000 1.13 +++ .cvsignore 20 May 2006 15:29:59 -0000 1.14 @@ -1 +1 @@ -dejavu-sfd-2.5.tar.gz +dejavu-sfd-2.6.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dejavu-fonts.spec 23 Apr 2006 17:16:06 -0000 1.14 +++ dejavu-fonts.spec 20 May 2006 15:29:59 -0000 1.15 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion 2.5 +%define archiveversion 2.6 %define fontdir %{_datadir}/fonts/%{name} # Let the perl Maintainer worry about Unicode.org data files (updates, licensing) @@ -8,7 +8,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.5.0 +Version: 2.6.0 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -127,6 +127,9 @@ %changelog +* Sat May 20 2006 Nicolas Mailhot - 2.6.0-1 +- 2.6.0 + * Sun Apr 23 2006 Nicolas Mailhot - 2.5.0-1 - 2.5.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 23 Apr 2006 17:16:06 -0000 1.13 +++ sources 20 May 2006 15:29:59 -0000 1.14 @@ -1 +1 @@ -402d2f846caa83c8067e281b3c5fa8c0 dejavu-sfd-2.5.tar.gz +aae0e562be59e57e791cd1a7273bfb8c dejavu-sfd-2.6.tar.gz From fedora-extras-commits at redhat.com Sat May 20 15:32:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 08:32:02 -0700 Subject: rpms/perl-Module-Build/FC-5 perl-Module-Build.spec,1.16,1.17 Message-ID: <200605201532.k4KFW4Rj022232@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22215 Modified Files: perl-Module-Build.spec Log Message: Sync with devel. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/perl-Module-Build.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Module-Build.spec 15 May 2006 23:29:10 -0000 1.16 +++ perl-Module-Build.spec 20 May 2006 15:32:02 -0000 1.17 @@ -1,12 +1,13 @@ +%define module_version 0.28 + Name: perl-Module-Build -Version: 0.28 +Version: 0.2800 Release: 2%{?dist} -Epoch: 1 Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{module_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Archive::Tar) >= 1.08 @@ -32,7 +33,7 @@ works fine on perl 5.005 if you can install a few additional modules. %prep -%setup -q -n Module-Build-%{version} +%setup -q -n Module-Build-%{module_version} %build %{__perl} Build.PL installdirs=vendor @@ -47,7 +48,9 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -./Build test +# 0.28 builds fail in the build system due +# to no stdin in t/extend, so we cheat. +./Build test < /dev/zero %clean rm -rf $RPM_BUILD_ROOT @@ -61,12 +64,11 @@ %{_mandir}/man3/Module::Build*.3* %changelog -* Sat May 13 2006 Steven Pritchard - 1:0.28-2 -- Rebuild. +* Thu May 18 2006 Steven Pritchard 0.2800-2 +- Take input from /dev/zero during "Build test" to avoid test failure. -* Fri May 12 2006 Steven Pritchard - 1:0.28-1 -- Update to 0.28. -- Epoch bump to make 0.28 > 0.2612. +* Wed May 17 2006 Steven Pritchard 0.2800-1 +- Update to 0.28, but call it 0.2800 to avoid an epoch bump. - Various spec cleanups to closer match cpanspec output. * Wed Mar 15 2006 Steven Pritchard - 0.2612-2 From fedora-extras-commits at redhat.com Sat May 20 15:34:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 08:34:28 -0700 Subject: rpms/qtparted/devel qtparted.spec,1.13,1.14 Message-ID: <200605201534.k4KFYUOO022300@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/qtparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22283 Modified Files: qtparted.spec Log Message: Rebuild. Index: qtparted.spec =================================================================== RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- qtparted.spec 15 Apr 2006 23:09:05 -0000 1.13 +++ qtparted.spec 20 May 2006 15:34:28 -0000 1.14 @@ -2,7 +2,7 @@ Name: qtparted Version: 0.4.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Partition Magic clone written in C++ using the Qt toolkit Group: Applications/System @@ -107,6 +107,9 @@ %changelog +* Sat May 20 2006 Steven Pritchard - 0.4.5-6 +- Rebuild. + * Fri Apr 14 2006 Steven Pritchard - 0.4.5-5 - Rebuild. From fedora-extras-commits at redhat.com Sat May 20 16:15:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 09:15:23 -0700 Subject: rpms/yakuake/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yakuake.spec, 1.1, 1.2 Message-ID: <200605201615.k4KGFPG7024827@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24783 Modified Files: .cvsignore sources yakuake.spec Log Message: - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options - Include translations Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Nov 2005 17:57:05 -0000 1.2 +++ .cvsignore 20 May 2006 16:15:22 -0000 1.3 @@ -1 +1 @@ -yakuake-2.7.3.tar.bz2 +29153-yakuake-2.7.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Nov 2005 17:57:05 -0000 1.2 +++ sources 20 May 2006 16:15:22 -0000 1.3 @@ -1 +1 @@ -98576f75c94f75756ef4acb18ef93a5e yakuake-2.7.3.tar.bz2 +6905f9a6d448c7bfc818cd2d7c88cab4 29153-yakuake-2.7.5.tar.bz2 Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/yakuake.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yakuake.spec 10 Nov 2005 17:57:05 -0000 1.1 +++ yakuake.spec 20 May 2006 16:15:22 -0000 1.2 @@ -1,15 +1,17 @@ Name: yakuake -Version: 2.7.3 -Release: 4 +Version: 2.7.5 +Release: 1 Summary: Terminal emulator for KDE Group: User Interface/Desktops License: GPL -URL: http://yakuake.uv.ro/ -Source0: http://download.softpedia.com/linux/yakuake-%{version}.tar.bz2 +URL: http://extragear.kde.org/apps/yakuake/ +Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs-devel %description Yakuake is a "Quake console" like terminal emulator for KDE. @@ -20,26 +22,32 @@ %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure --disable-rpath --disable-debug +%configure \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-final make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Utility \ --add-category KDE \ --add-category Qt \ --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/yakuake.desktop -chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/apps/yakuake/default/install.sh + %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop +chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh + +%find_lang %{name} %post @@ -57,19 +65,25 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog TODO %{_bindir}/yakuake -%{_datadir}/applications/fedora-yakuake.desktop -%{_datadir}/apps/yakuake +%{_datadir}/applications/*yakuake.desktop +%{_datadir}/apps/yakuake/ %{_datadir}/icons/hicolor/16x16/apps/yakuake.png %{_datadir}/icons/hicolor/32x32/apps/yakuake.png -%doc AUTHORS COPYING + %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-1 +- Update to 2.7.5 +- Add `--disable-dependency-tracking' and `--enable-final' options +- Include translations + * Mon Oct 24 2005 Mickael - initial release From fedora-extras-commits at redhat.com Sat May 20 16:33:12 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 09:33:12 -0700 Subject: rpms/yakuake/FC-5 yakuake.spec,1.2,1.3 Message-ID: <200605201633.k4KGXEVE024976@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24959 Modified Files: yakuake.spec Log Message: Add dist tag Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/yakuake.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yakuake.spec 20 May 2006 16:15:22 -0000 1.2 +++ yakuake.spec 20 May 2006 16:33:12 -0000 1.3 @@ -1,6 +1,6 @@ Name: yakuake Version: 2.7.5 -Release: 1 +Release: 2%{?dist} Summary: Terminal emulator for KDE Group: User Interface/Desktops @@ -79,6 +79,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-2 +- Add dist tag + * Sat May 20 2006 Dawid Gajownik - 2.7.5-1 - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options From fedora-extras-commits at redhat.com Sat May 20 16:34:45 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 09:34:45 -0700 Subject: rpms/yakuake/devel yakuake.spec,1.2,1.3 Message-ID: <200605201634.k4KGYl07025048@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25031 Modified Files: yakuake.spec Log Message: Add dist tag Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yakuake.spec 20 May 2006 14:37:53 -0000 1.2 +++ yakuake.spec 20 May 2006 16:34:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: yakuake Version: 2.7.5 -Release: 1 +Release: 2%{?dist} Summary: Terminal emulator for KDE Group: User Interface/Desktops @@ -79,6 +79,9 @@ %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-2 +- Add dist tag + * Sat May 20 2006 Dawid Gajownik - 2.7.5-1 - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options From fedora-extras-commits at redhat.com Sat May 20 16:36:34 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sat, 20 May 2006 09:36:34 -0700 Subject: rpms/yakuake/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yakuake.spec, 1.2, 1.3 Message-ID: <200605201636.k4KGaaL6025128@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25106 Modified Files: .cvsignore sources yakuake.spec Log Message: Add dist tag Update to 2.7.5 Add `--disable-dependency-tracking' and `--enable-final' options Include translations Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Nov 2005 17:57:05 -0000 1.2 +++ .cvsignore 20 May 2006 16:36:34 -0000 1.3 @@ -1 +1 @@ -yakuake-2.7.3.tar.bz2 +29153-yakuake-2.7.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Nov 2005 17:57:05 -0000 1.2 +++ sources 20 May 2006 16:36:34 -0000 1.3 @@ -1 +1 @@ -98576f75c94f75756ef4acb18ef93a5e yakuake-2.7.3.tar.bz2 +6905f9a6d448c7bfc818cd2d7c88cab4 29153-yakuake-2.7.5.tar.bz2 Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-4/yakuake.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yakuake.spec 11 Nov 2005 00:08:36 -0000 1.2 +++ yakuake.spec 20 May 2006 16:36:34 -0000 1.3 @@ -1,15 +1,17 @@ Name: yakuake -Version: 2.7.3 -Release: 4%{?dist} +Version: 2.7.5 +Release: 2%{?dist} Summary: Terminal emulator for KDE Group: User Interface/Desktops License: GPL -URL: http://yakuake.uv.ro/ -Source0: http://download.softpedia.com/linux/yakuake-%{version}.tar.bz2 +URL: http://extragear.kde.org/apps/yakuake/ +Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs-devel %description Yakuake is a "Quake console" like terminal emulator for KDE. @@ -20,26 +22,32 @@ %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure --disable-rpath --disable-debug +%configure \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-final make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Utility \ --add-category KDE \ --add-category Qt \ --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/yakuake.desktop -chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/apps/yakuake/default/install.sh + %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop +chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh + +%find_lang %{name} %post @@ -57,19 +65,28 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog TODO %{_bindir}/yakuake -%{_datadir}/applications/fedora-yakuake.desktop -%{_datadir}/apps/yakuake +%{_datadir}/applications/*yakuake.desktop +%{_datadir}/apps/yakuake/ %{_datadir}/icons/hicolor/16x16/apps/yakuake.png %{_datadir}/icons/hicolor/32x32/apps/yakuake.png -%doc AUTHORS COPYING + %changelog +* Sat May 20 2006 Dawid Gajownik - 2.7.5-2 +- Add dist tag + +* Sat May 20 2006 Dawid Gajownik - 2.7.5-1 +- Update to 2.7.5 +- Add `--disable-dependency-tracking' and `--enable-final' options +- Include translations + * Mon Oct 24 2005 Mickael - initial release From fedora-extras-commits at redhat.com Sat May 20 16:36:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 09:36:43 -0700 Subject: rpms/celestia/FC-4 celestia.spec,1.10,1.11 Message-ID: <200605201636.k4KGaj2p025155@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/celestia/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25134 Modified Files: celestia.spec Log Message: Include accidentally dropped 3ds models. Index: celestia.spec =================================================================== RCS file: /cvs/extras/rpms/celestia/FC-4/celestia.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- celestia.spec 9 Apr 2006 01:39:12 -0000 1.10 +++ celestia.spec 20 May 2006 16:36:43 -0000 1.11 @@ -1,6 +1,6 @@ Name: celestia Version: 1.4.1 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: OpenGL real-time visual space simulation Group: Amusements/Graphics License: GPL @@ -57,6 +57,8 @@ ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ #rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual +install -p -m 644 -D models/*.3ds $RPM_BUILD_ROOT%{_datadir}/%{name}/models/ + rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop desktop-file-install \ @@ -98,6 +100,9 @@ %changelog +* Fri May 19 2006 Steven Pritchard 1.4.1-0.2 +- Include accidentally dropped 3ds models. + * Sat Apr 08 2006 Steven Pritchard 1.4.1-0.1 - Sync with devel branch (mostly) From fedora-extras-commits at redhat.com Sat May 20 16:46:19 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 20 May 2006 09:46:19 -0700 Subject: rpms/xchat-gnome/devel xchat-gnome.spec, 1.23, 1.24 xchat-gnome-libnotify.patch, 1.2, NONE Message-ID: <200605201646.k4KGkLWr025331@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25314 Modified Files: xchat-gnome.spec Removed Files: xchat-gnome-libnotify.patch Log Message: * Sat May 20 2006 Brian Pepple - 0.11-3 - Drop patch for libnotify. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xchat-gnome.spec 5 Apr 2006 04:38:31 -0000 1.23 +++ xchat-gnome.spec 20 May 2006 16:46:19 -0000 1.24 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -11,7 +11,6 @@ URL: http://%{name}.navi.cx/ Source0: http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-config.patch -Patch2: %{name}-libnotify.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -53,7 +52,6 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .config -%patch2 -p1 -b .libnotify %build @@ -143,6 +141,9 @@ %changelog +* Sat May 20 2006 Brian Pepple - 0.11-3 +- Drop patch for libnotify. + * Tue Apr 4 2006 Brian Pepple - 0.11-2 - Update to 0.11 - Drop screensaver patch. --- xchat-gnome-libnotify.patch DELETED --- From fedora-extras-commits at redhat.com Sat May 20 16:55:17 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 20 May 2006 09:55:17 -0700 Subject: rpms/apt/devel .cvsignore, 1.10, 1.11 apt.spec, 1.28, 1.29 default.conf, 1.9, 1.10 sources, 1.10, 1.11 Message-ID: <200605201655.k4KGtJu7025489@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/apt/devel Modified Files: .cvsignore apt.spec default.conf sources Log Message: Upgrade apt to latest rc, move some config bits from apt to f-p-c-a. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 25 Apr 2006 18:47:24 -0000 1.10 +++ .cvsignore 20 May 2006 16:55:17 -0000 1.11 @@ -1 +1 @@ -apt-0.5.15lorg3.tar.bz2 +apt-0.5.15lorg3.1-rc2.tar.bz2 Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- apt.spec 11 May 2006 21:19:47 -0000 1.28 +++ apt.spec 20 May 2006 16:55:17 -0000 1.29 @@ -5,13 +5,14 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt -Version: 0.5.15lorg3 -Release: 2.1%{?dist} +Version: 0.5.15lorg3.1 +Release: 3_rc2%{?dist} Group: System Environment/Base URL: http://apt-rpm.laiskiainen.org/ License: GPL -Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2 +#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2 +Source0: http://apt-rpm.org/testing/%{name}-%{version}-rc2.tar.bz2 # user editable template configs Source1: apt.conf @@ -23,13 +24,7 @@ Source5: rpmpriorities Source19: comps2prio.xsl -# nightly updater scripts & config -Source20: apt.init -Source21: apt.cron -Source22: apt.sysconfig - # Sources 50-99 are for Lua-scripts not in contrib/ -Source50: preserve-conf.lua Source51: upgradevirt.lua # 150-199 for apt.conf.d @@ -114,7 +109,7 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}-rc2 # fix docs to reference correct paths perl -pi -e \ @@ -178,7 +173,7 @@ # Lua scripts mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts -for script in %{SOURCE50} %{SOURCE51} ; do +for script in %{SOURCE51} ; do install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts done @@ -189,9 +184,9 @@ touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo # Nightly updater scripts & default config -install -Dpm 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt -install -Dpm 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron -install -Dpm 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt +install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt +install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron +install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt # GPG checker from contrib install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts @@ -262,7 +257,6 @@ %dir %{_datadir}/apt/scripts/ %{_datadir}/apt/scripts/gpg-check.lua %{_datadir}/apt/scripts/gpg-import.lua -%{_datadir}/apt/scripts/preserve-conf.lua %{_datadir}/apt/scripts/upgradevirt.lua %{_localstatedir}/cache/apt/ %{_localstatedir}/lib/apt/ @@ -292,6 +286,11 @@ %changelog +* Sat May 20 2006 Axel Thimm +- Update to 0.5.15lorg3.1-rc2. +- Move some FC specific config bits to fedora-package-config-apt. +- Remove some sources that can be found in upstream now. + * Thu May 11 2006 Axel Thimm - 0.5.15lorg3-2.1 - Remove bogus final s from default(s).conf (Ville). Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- default.conf 9 May 2006 18:10:38 -0000 1.9 +++ default.conf 20 May 2006 16:55:17 -0000 1.10 @@ -9,43 +9,12 @@ // Options for apt-get Get { - Download-Only "false"; - Show-Upgraded "true"; Show-Versions "true"; - }; - Cache - { - AllNames "false"; - } + } }; RPM { - // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades) - Order "true"; - // Completely ignore GnuPG signature packages (introduced in rpm 4.1) - Ignore { "gpg-pubkey"; }; - // Allow multiple kernel and kernel-related packages to be installed - Allow-Duplicated { - "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$"; - "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; - "^kmod-.+$"; - "^gpg-pubkey$"; - }; - // XXX: not used currently - //Allow-Duplicated-Upgrade { - // "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$"; - // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; - // "^kmod-.+$"; - // "^gpg-pubkey$"; - //}; - // "Upgrade" allow-duplicated packages as well - Upgrade-Virtual "true"; - // Enable source rebuilds - Source - { - Build-Command "rpmbuild --rebuild"; - }; // Always check GPG keys and automatically import new ones GPG-Check "true"; GPG-Import "true"; Index: sources =================================================================== RCS file: /cvs/extras/rpms/apt/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 25 Apr 2006 18:47:24 -0000 1.10 +++ sources 20 May 2006 16:55:17 -0000 1.11 @@ -1 +1 @@ -167cfdf8dea5eb1a9873a53ff546bf6a apt-0.5.15lorg3.tar.bz2 +8194eb59fb5fc0fe2680ab4272a3dc04 apt-0.5.15lorg3.1-rc2.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 16:55:18 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 20 May 2006 09:55:18 -0700 Subject: rpms/fedora-package-config-apt/devel fedora-package-config-apt.spec, 1.1, 1.2 fedora.conf, 1.1, 1.2 Message-ID: <200605201655.k4KGtKdS025494@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/fedora-package-config-apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/fedora-package-config-apt/devel Modified Files: fedora-package-config-apt.spec fedora.conf Log Message: Upgrade apt to latest rc, move some config bits from apt to f-p-c-a. Index: fedora-package-config-apt.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora-package-config-apt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-package-config-apt.spec 13 May 2006 01:34:07 -0000 1.1 +++ fedora-package-config-apt.spec 20 May 2006 16:55:18 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Fedora configuration files for the apt-rpm package manager Name: fedora-package-config-apt Version: 5.89 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base URL: http://fedora.redhat.com/ @@ -62,6 +62,9 @@ %changelog +* Sat May 20 2006 Axel Thimm +- Move some FC specific config bits from apt. + * Thu May 11 2006 Axel Thimm - 5.89-3 - Apply comments from review #191040c3 (by Ville). - Fix summary and description Index: fedora.conf =================================================================== RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora.conf 13 May 2006 01:34:07 -0000 1.1 +++ fedora.conf 20 May 2006 16:55:18 -0000 1.2 @@ -13,3 +13,24 @@ { http::User-Agent "Fedora APT-HTTP/1.3"; }; + +RPM +{ + // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades) + Order "true"; + // Allow multiple kernel and kernel-related packages to be installed + Allow-Duplicated { + "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$"; + "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; + "^kmod-.+$"; + }; + // XXX: not used currently + //Allow-Duplicated-Upgrade { + // "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$"; + // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; + // "^kmod-.+$"; + // "^gpg-pubkey$"; + //}; + // "Upgrade" allow-duplicated packages as well + Upgrade-Virtual "true"; +} From fedora-extras-commits at redhat.com Sat May 20 17:01:01 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 20 May 2006 10:01:01 -0700 Subject: rpms/gossip/devel gossip.spec,1.17,1.18 Message-ID: <200605201701.k4KH137M027438@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25617 Modified Files: gossip.spec Log Message: * Sat May 20 2006 Brian Pepple - 0.11-4 - Build with libnotify support. Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gossip.spec 1 May 2006 23:27:20 -0000 1.17 +++ gossip.spec 20 May 2006 17:01:01 -0000 1.18 @@ -2,7 +2,7 @@ Name: gossip Version: 0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -17,6 +17,7 @@ BuildRequires: libXScrnSaver-devel BuildRequires: libXt-devel BuildRequires: xorg-x11-proto-devel +BuildRequires: libnotify-devel BuildRequires: desktop-file-utils BuildRequires: aspell-devel BuildRequires: gettext @@ -130,6 +131,9 @@ %changelog +* Sat May 20 2006 Brian Pepple - 0.11-4 +- Build with libnotify support. + * Mon May 1 2006 Brian Pepple - 0.11-3 - Update to 0.11. - Add scriptlets for gtk+ icon cache. From fedora-extras-commits at redhat.com Sat May 20 17:09:21 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 20 May 2006 10:09:21 -0700 Subject: rpms/synaptic/devel synaptic.spec,1.16,1.17 Message-ID: <200605201709.k4KH9NhW027988@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27971 Modified Files: synaptic.spec Log Message: synaptic meets repomd. Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- synaptic.spec 14 Dec 2005 17:51:18 -0000 1.16 +++ synaptic.spec 20 May 2006 17:09:21 -0000 1.17 @@ -3,19 +3,24 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz Patch0: synaptic-0.57-desktop.patch Patch1: synaptic-0.57-firefox.patch +# Patches from apt-rpm maintainer for gcc 4.1 support, repomd support +# and progress meter fixes +Patch2: http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch +Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch +Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 +BuildRequires: apt-devel >= 0.5.15lorg3.1, rpm-devel >= 4.0 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser @@ -31,6 +36,9 @@ %setup -q %patch0 -p1 -b .dt %patch1 -p1 -b .firefox +%patch2 -p1 -b .gcc41 +%patch3 -p1 -b .repomd +%patch4 -p1 -b .showprog %build %configure --disable-dependency-tracking @@ -99,6 +107,10 @@ %{_mandir}/man8/%{name}.8* %changelog +* Sat May 20 2006 Axel Thimm - 0.57.2-4 +- Add repomd support, gcc 4.1 build support, progress meter fixes (all + from apt-rpm upstream). + * Wed Dec 14 2005 Deji Akingunola - 0.57.2-3 - Rebuild for new openssl and apt in devel. From fedora-extras-commits at redhat.com Sat May 20 17:12:45 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sat, 20 May 2006 10:12:45 -0700 Subject: rpms/synaptic/devel synaptic-0.57.2-gcc41.patch, NONE, 1.1 synaptic-0.57.2-repomd-1.patch, NONE, 1.1 synaptic-0.57.2-showprog.patch, NONE, 1.1 Message-ID: <200605201712.k4KHClKo028064@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28023 Added Files: synaptic-0.57.2-gcc41.patch synaptic-0.57.2-repomd-1.patch synaptic-0.57.2-showprog.patch Log Message: synaptic meets repomd part II. Now with patches, too. synaptic-0.57.2-gcc41.patch: --- NEW FILE synaptic-0.57.2-gcc41.patch --- --- synaptic-0.57.2/common/rcdscanner.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rcdscanner.h 2006-05-09 18:16:56.000000000 +0300 @@ -48,6 +48,7 @@ }; virtual void update(string text, int current) = 0; + virtual ~RCDScanProgress() {}; }; class RCDScanner { --- synaptic-0.57.2/common/rinstallprogress.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rinstallprogress.h 2006-05-09 18:16:56.000000000 +0300 @@ -63,6 +63,7 @@ RInstallProgress():_donePackagesTotal(0), _numPackagesTotal(0),_updateFinished(false) {}; + virtual ~RInstallProgress() {}; }; --- synaptic-0.57.2/common/indexcopy.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/indexcopy.h 2006-05-09 18:19:00.000000000 +0300 @@ -39,6 +39,7 @@ public: bool CopyPackages(string CDROM, string Name, vector &List); + virtual ~IndexCopy() {}; }; class PackageCopy:public IndexCopy { @@ -54,6 +55,7 @@ }; public: + virtual ~PackageCopy() {}; }; class SourceCopy:public IndexCopy { @@ -69,6 +71,7 @@ }; public: + virtual ~SourceCopy() {}; }; #endif --- synaptic-0.57.2/common/rpackagelister.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual void notifyChange(RPackage *pkg) = 0; virtual void notifyPreFilteredChange() = 0; virtual void notifyPostFilteredChange() = 0; + virtual ~RPackageObserver() {}; }; class RCacheObserver { @@ -71,6 +72,7 @@ virtual void notifyCacheOpen() = 0; virtual void notifyCachePreChange() = 0; virtual void notifyCachePostChange() = 0; + virtual ~RCacheObserver() {}; }; // base sort class --- synaptic-0.57.2/common/rpackagefilter.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagefilter.h 2006-05-09 18:16:56.000000000 +0300 @@ -130,7 +130,7 @@ bool and_mode; // patterns are applied in "AND" mode if true, "OR" if false inline bool filterName(Pattern pat, RPackage *pkg); - inline bool RPatternPackageFilter::filterVersion(Pattern pat, RPackage *pkg); + inline bool filterVersion(Pattern pat, RPackage *pkg); inline bool filterDescription(Pattern pat, RPackage *pkg); inline bool filterMaintainer(Pattern pat, RPackage *pkg); inline bool filterDepends(Pattern pat, RPackage *pkg, --- synaptic-0.57.2/common/rpackage.cc.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackage.cc 2006-05-09 18:16:56.000000000 +0300 @@ -848,7 +848,6 @@ void RPackage::setPinned(bool flag) { - FILE *out; struct stat stat_buf; string File =RStateDir() + "/preferences"; @@ -945,8 +944,8 @@ } } - return true; #endif + return true; } // format: first version, second archives --- synaptic-0.57.2/common/rpackagelister.cc.gcc41 2005-06-14 20:37:18.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.cc 2006-05-09 18:16:56.000000000 +0300 @@ -607,7 +607,7 @@ bool _ascent; RPackageStatus _status; public: - supportedSortFunc::supportedSortFunc(bool ascent, RPackageStatus &s) + supportedSortFunc(bool ascent, RPackageStatus &s) : _ascent(ascent), _status(s) {}; bool operator() (RPackage *x, RPackage *y) { if(_ascent) --- synaptic-0.57.2/common/ruserdialog.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/ruserdialog.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual bool showErrors(); + virtual ~RUserDialog() {}; }; #endif synaptic-0.57.2-repomd-1.patch: --- NEW FILE synaptic-0.57.2-repomd-1.patch --- --- synaptic-0.57.2/common/rsources.cc.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.cc 2006-05-09 20:38:03.000000000 +0300 @@ -352,8 +352,13 @@ Type |= RpmDir; else if (S == "rpm-src-dir") Type |= RpmSrcDir; + else if (S == "repomd") + Type |= Repomd; + else if (S == "repomd-src") + Type |= RepomdSrc; else return false; + cout << S << " settype " << (Type | Repomd) << endl; return true; } @@ -371,6 +376,11 @@ return "rpm-dir"; else if ((Type & RpmSrcDir) != 0) return "rpm-src-dir"; + else if ((Type & Repomd) != 0) + return "repomd"; + else if ((Type & RepomdSrc) != 0) + return "repomd-src"; + cout << "type " << (Type & Repomd) << endl; return "unknown"; } @@ -382,6 +392,7 @@ return false; S = SubstVar(S, "$(ARCH)", _config->Find("APT::Architecture")); + S = SubstVar(S, "$(VERSION)", _config->Find("APT::DistroVersion")); URI = S; // append a / to the end if one is not already there @@ -522,6 +533,10 @@ os << "RpmDir"; if ((rec.Type & SourcesList::RpmSrcDir) != 0) os << "RpmSrcDir"; + if ((rec.Type & SourcesList::Repomd) != 0) + os << "Repomd"; + if ((rec.Type & SourcesList::RepomdSrc) != 0) + os << "RepomdSrc"; os << endl; os << "SourceFile: " << rec.SourceFile << endl; os << "VendorID: " << rec.VendorID << endl; --- synaptic-0.57.2/common/rsources.h.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.h 2006-05-09 20:39:23.000000000 +0300 @@ -41,11 +41,13 @@ Disabled = 1 << 4, Comment = 1 << 5, RpmDir = 1 << 6, - RpmSrcDir = 1 << 7 + RpmSrcDir = 1 << 7, + Repomd = 1 << 8, + RepomdSrc = 1 << 9 }; struct SourceRecord { - unsigned char Type; + unsigned int Type; string VendorID; string URI; string Dist; --- synaptic-0.57.2/gtk/rgrepositorywin.cc.repomd 2005-05-20 21:24:35.000000000 +0300 +++ synaptic-0.57.2/gtk/rgrepositorywin.cc 2006-05-09 18:17:15.000000000 +0300 @@ -39,6 +39,8 @@ ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC, ITEM_TYPE_DEB, ITEM_TYPE_DEBSRC }; @@ -48,7 +50,9 @@ ITEM_TYPE_RPM, ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, - ITEM_TYPE_RPMSRCDIR + ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC }; #endif @@ -235,6 +239,16 @@ gtk_menu_append(GTK_MENU(_optTypeMenu), item); gtk_widget_show(item); gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_RPMSRCDIR); + + item = gtk_menu_item_new_with_label("repomd"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMD); + + item = gtk_menu_item_new_with_label("repomd-src"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMDSRC); #else item = gtk_menu_item_new_with_label(_("Binary (deb)")); gtk_menu_append(GTK_MENU(_optTypeMenu), item); @@ -512,6 +526,12 @@ case ITEM_TYPE_RPMSRCDIR: rec->Type |= SourcesList::RpmSrcDir; break; + case ITEM_TYPE_REPOMD: + rec->Type |= SourcesList::Repomd; + break; + case ITEM_TYPE_REPOMDSRC: + rec->Type |= SourcesList::RepomdSrc; + break; default: _userDialog->error(_("Unknown source type")); return; @@ -642,6 +662,10 @@ id = ITEM_TYPE_RPMDIR; else if (rec->Type & SourcesList::RpmSrcDir) id = ITEM_TYPE_RPMSRCDIR; + else if (rec->Type & SourcesList::Repomd) + id = ITEM_TYPE_REPOMD; + else if (rec->Type & SourcesList::RepomdSrc) + id = ITEM_TYPE_REPOMDSRC; gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optType), id); gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optVendor), synaptic-0.57.2-showprog.patch: --- NEW FILE synaptic-0.57.2-showprog.patch --- --- synaptic-0.57.2/gtk/rgfetchprogress.cc.showprog 2006-05-09 19:14:11.000000000 +0300 +++ synaptic-0.57.2/gtk/rgfetchprogress.cc 2006-05-09 19:13:35.000000000 +0300 @@ -337,6 +337,7 @@ //cout << "RGFetchProgress::Start()" << endl; pkgAcquireStatus::Start(); _cancelled = false; + show(); RGFlushInterface(); } From fedora-extras-commits at redhat.com Sat May 20 17:12:45 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Sat, 20 May 2006 10:12:45 -0700 Subject: owners owners.list,1.1029,1.1030 Message-ID: <200605201712.k4KHClEh028057@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28022 Modified Files: owners.list Log Message: Fix my email address. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1029 retrieving revision 1.1030 diff -u -r1.1029 -r1.1030 --- owners.list 20 May 2006 14:40:31 -0000 1.1029 +++ owners.list 20 May 2006 17:12:45 -0000 1.1030 @@ -901,7 +901,7 @@ Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fc_extra at normalesup.org|extras-qa at fedoraproject.org| +Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org| Fedora Extras|paraview|Parallel visualization application|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 17:20:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 10:20:19 -0700 Subject: rpms/xmms-alarm/FC-5 xmms-alarm-0.3.7-optflags.patch, NONE, 1.1 xmms-alarm.spec, 1.10, 1.11 Message-ID: <200605201720.k4KHKLSc028158@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms-alarm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28123/FC-5 Modified Files: xmms-alarm.spec Added Files: xmms-alarm-0.3.7-optflags.patch Log Message: * Sat May 20 2006 Ville Skytt?? - 0.3.7-4 - Honor $RPM_OPT_FLAGS. xmms-alarm-0.3.7-optflags.patch: --- NEW FILE xmms-alarm-0.3.7-optflags.patch --- --- xmms-alarm-0.3.7/configure.ac~ 2005-03-26 22:28:54.000000000 +0200 +++ xmms-alarm-0.3.7/configure.ac 2006-05-20 20:07:59.000000000 +0300 @@ -13,3 +13,3 @@ -CFLAGS="-I../include" +CFLAGS="$CFLAGS -I../include" --- xmms-alarm-0.3.7/configure~ 2005-04-09 02:27:29.000000000 +0300 +++ xmms-alarm-0.3.7/configure 2006-05-20 20:07:49.000000000 +0300 @@ -19071,3 +19071,3 @@ -CFLAGS="-I../include" +CFLAGS="$CFLAGS -I../include" Index: xmms-alarm.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-alarm/FC-5/xmms-alarm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xmms-alarm.spec 13 Apr 2006 13:28:47 -0000 1.10 +++ xmms-alarm.spec 20 May 2006 17:20:18 -0000 1.11 @@ -2,13 +2,14 @@ Name: xmms-alarm Version: 0.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plugin for using XMMS as an alarm clock License: GPL Group: Applications/Multimedia URL: http://www.snika.uklinux.net/?p=xmms-alarm Source: http://www.snika.uklinux.net/xmms-alarm/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.3.7-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmms-devel @@ -22,6 +23,8 @@ %prep %setup -q +%patch0 -p1 +touch -r aclocal.m4 configure.ac %build @@ -46,6 +49,9 @@ %changelog +* Sat May 20 2006 Ville Skytt?? - 0.3.7-4 +- Honor $RPM_OPT_FLAGS. + * Thu Apr 6 2006 Ville Skytt?? - 0.3.7-3 - Add dependency on the main xmms package. From fedora-extras-commits at redhat.com Sat May 20 17:20:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 10:20:19 -0700 Subject: rpms/xmms-alarm/devel xmms-alarm-0.3.7-optflags.patch, NONE, 1.1 xmms-alarm.spec, 1.10, 1.11 Message-ID: <200605201720.k4KHKLJ6028164@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms-alarm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28123/devel Modified Files: xmms-alarm.spec Added Files: xmms-alarm-0.3.7-optflags.patch Log Message: * Sat May 20 2006 Ville Skytt?? - 0.3.7-4 - Honor $RPM_OPT_FLAGS. xmms-alarm-0.3.7-optflags.patch: --- NEW FILE xmms-alarm-0.3.7-optflags.patch --- --- xmms-alarm-0.3.7/configure.ac~ 2005-03-26 22:28:54.000000000 +0200 +++ xmms-alarm-0.3.7/configure.ac 2006-05-20 20:07:59.000000000 +0300 @@ -13,3 +13,3 @@ -CFLAGS="-I../include" +CFLAGS="$CFLAGS -I../include" --- xmms-alarm-0.3.7/configure~ 2005-04-09 02:27:29.000000000 +0300 +++ xmms-alarm-0.3.7/configure 2006-05-20 20:07:49.000000000 +0300 @@ -19071,3 +19071,3 @@ -CFLAGS="-I../include" +CFLAGS="$CFLAGS -I../include" Index: xmms-alarm.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-alarm/devel/xmms-alarm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xmms-alarm.spec 6 Apr 2006 20:59:14 -0000 1.10 +++ xmms-alarm.spec 20 May 2006 17:20:19 -0000 1.11 @@ -2,13 +2,14 @@ Name: xmms-alarm Version: 0.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plugin for using XMMS as an alarm clock License: GPL Group: Applications/Multimedia URL: http://www.snika.uklinux.net/?p=xmms-alarm Source: http://www.snika.uklinux.net/xmms-alarm/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.3.7-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmms-devel @@ -22,6 +23,8 @@ %prep %setup -q +%patch0 -p1 +touch -r aclocal.m4 configure.ac %build @@ -46,6 +49,9 @@ %changelog +* Sat May 20 2006 Ville Skytt?? - 0.3.7-4 +- Honor $RPM_OPT_FLAGS. + * Thu Apr 6 2006 Ville Skytt?? - 0.3.7-3 - Add dependency on the main xmms package. From fedora-extras-commits at redhat.com Sat May 20 17:58:22 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sat, 20 May 2006 10:58:22 -0700 Subject: rpms/hspell/devel sources,1.3,1.4 Message-ID: <200605201758.k4KHwOL7028458@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28440 Modified Files: sources Log Message: no need for the 0.9 tarball Index: sources =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 May 2006 07:00:49 -0000 1.3 +++ sources 20 May 2006 17:58:22 -0000 1.4 @@ -1,2 +1 @@ -6ebae9cfe721c6563075095fa73f69ac hspell-0.9.tar.gz 3e12fa383c2cfd430918d115f33f9841 hspell-1.0.tar.gz From fedora-extras-commits at redhat.com Sat May 20 18:07:07 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sat, 20 May 2006 11:07:07 -0700 Subject: rpms/hspell/devel hspell.spec,1.5,1.6 Message-ID: <200605201807.k4KI79hS030802@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30785 Modified Files: hspell.spec Log Message: do not strip binary package, create a useful debuginfo Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/devel/hspell.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hspell.spec 15 May 2006 07:00:49 -0000 1.5 +++ hspell.spec 20 May 2006 18:07:07 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -46,6 +46,7 @@ %prep %setup -q +sed -i -e '/^\s\+strip\s/d' Makefile.in %build %configure --enable-fatverb --enable-linginfo @@ -74,6 +75,8 @@ %{_mandir}/man3/hspell.3* %changelog +* Sat May 20 2006 Dan Kenigsberg 1.0-3 +- do not strip the binary, create useful defuginfo package (Bug #192437). * Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. From fedora-extras-commits at redhat.com Sat May 20 19:07:50 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sat, 20 May 2006 12:07:50 -0700 Subject: rpms/hspell/FC-4 hspell.spec,1.5,1.6 Message-ID: <200605201907.k4KJ7qD7000993@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv974 Modified Files: hspell.spec Log Message: create a useful debbuginfo package Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-4/hspell.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hspell.spec 15 May 2006 06:32:07 -0000 1.5 +++ hspell.spec 20 May 2006 19:07:50 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -46,6 +46,7 @@ %prep %setup -q +sed -i -e '/^\s\+strip\s/d' Makefile.in %build %configure --enable-fatverb --enable-linginfo @@ -74,6 +75,8 @@ %{_mandir}/man3/hspell.3* %changelog +* Sat May 20 2006 Dan Kenigsberg 1.0-4 +- do not strip the binary, create useful defuginfo package. * Sun May 15 2006 Dan Kenigsberg 1.0-3 - new upstream release. - Hebrew description converted to utf8. From fedora-extras-commits at redhat.com Sat May 20 19:12:15 2006 From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken)) Date: Sat, 20 May 2006 12:12:15 -0700 Subject: rpms/hspell/FC-5 hspell.spec,1.5,1.6 Message-ID: <200605201912.k4KJCH9E001087@cvs-int.fedora.redhat.com> Author: danken Update of /cvs/extras/rpms/hspell/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1066 Modified Files: hspell.spec Log Message: create a useful debuginfo package Index: hspell.spec =================================================================== RCS file: /cvs/extras/rpms/hspell/FC-5/hspell.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hspell.spec 15 May 2006 06:54:42 -0000 1.5 +++ hspell.spec 20 May 2006 19:12:15 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A Hebrew spell checker Name: hspell Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://ivrix.org.il/projects/spell-checker/ Source: http://ivrix.org.il/projects/spell-checker/hspell-%{version}.tar.gz License: GPL @@ -46,6 +46,7 @@ %prep %setup -q +sed -i -e '/^\s\+strip\s/d' Makefile.in %build %configure --enable-fatverb --enable-linginfo @@ -74,6 +75,8 @@ %{_mandir}/man3/hspell.3* %changelog +* Sat May 20 2006 Dan Kenigsberg 1.0-3 +- do not strip the binary, create useful defuginfo package (Bug #192437). * Sun May 15 2006 Dan Kenigsberg 1.0-2 - new upstream release. - Hebrew description converted to utf8. From fedora-extras-commits at redhat.com Sat May 20 19:58:27 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 12:58:27 -0700 Subject: rpms/lilypond-doc - New directory Message-ID: <200605201958.k4KJwTaw001349@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1328/lilypond-doc Log Message: Directory /cvs/extras/rpms/lilypond-doc added to the repository From fedora-extras-commits at redhat.com Sat May 20 19:58:27 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 12:58:27 -0700 Subject: rpms/lilypond-doc/devel - New directory Message-ID: <200605201958.k4KJwTOp001352@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1328/lilypond-doc/devel Log Message: Directory /cvs/extras/rpms/lilypond-doc/devel added to the repository From fedora-extras-commits at redhat.com Sat May 20 19:58:38 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 12:58:38 -0700 Subject: rpms/lilypond-doc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605201958.k4KJwekc001409@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lilypond-doc --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat May 20 19:58:38 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 12:58:38 -0700 Subject: rpms/lilypond-doc Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605201958.k4KJweN1001406@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373 Added Files: Makefile import.log Log Message: Setup of module lilypond-doc --- NEW FILE Makefile --- # Top level Makefile for module lilypond-doc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat May 20 20:04:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 13:04:03 -0700 Subject: rpms/perl-Module-Build/FC-4 .cvsignore, 1.8, 1.9 perl-Module-Build.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200605202004.k4KK45FG003785@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3764 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 10 Jan 2006 21:14:21 -0000 1.8 +++ .cvsignore 20 May 2006 20:04:03 -0000 1.9 @@ -1 +1 @@ -Module-Build-0.2611.tar.gz +Module-Build-0.28.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/perl-Module-Build.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-Module-Build.spec 10 Jan 2006 21:14:21 -0000 1.12 +++ perl-Module-Build.spec 20 May 2006 20:04:03 -0000 1.13 @@ -1,23 +1,39 @@ +%define module_version 0.28 + Name: perl-Module-Build -Version: 0.2611 +Version: 0.2800 Release: 2%{?dist} Summary: Perl module for building and installing Perl modules -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Build/ -Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{module_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 -Requires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 +BuildRequires: perl(Archive::Tar) >= 1.08 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.15 +BuildRequires: perl(ExtUtils::ParseXS) >= 1.02 +BuildRequires: perl(YAML) +BuildRequires: perl(Pod::Readme) >= 0.04 +Requires: perl(Archive::Tar) >= 1.08 +Requires: perl(ExtUtils::CBuilder) >= 0.15 +Requires: perl(ExtUtils::ParseXS) >= 1.02 +Requires: perl(Pod::Readme) >= 0.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -Perl module for building and installing Perl modules, a replacement to -ExtUtils::MakeMaker. +Module::Build is a system for building, testing, and installing Perl +modules. It is meant to be an alternative to ExtUtils::MakeMaker. +Developers may alter the behavior of the module through subclassing in a +much more straightforward way than with MakeMaker. It also does not require +a make on your system - most of the Module::Build code is pure-perl and +written in a very cross-platform way. In fact, you don't even need a shell, +so even platforms like MacOS (traditional) can use it fairly easily. Its +only prerequisites are modules that are included with perl 5.6.0, and it +works fine on perl 5.005 if you can install a few additional modules. %prep -%setup -q -n Module-Build-%{version} +%setup -q -n Module-Build-%{module_version} %build %{__perl} Build.PL installdirs=vendor @@ -27,29 +43,41 @@ rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 - find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check -./Build test +# 0.28 builds fail in the build system due +# to no stdin in t/extend, so we cheat. +./Build test < /dev/zero %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{_bindir}/config_data %{perl_vendorlib}/Module %{_mandir}/man1/config_data.1* %{_mandir}/man3/Module::Build*.3* %changelog +* Thu May 18 2006 Steven Pritchard 0.2800-2 +- Take input from /dev/zero during "Build test" to avoid test failure. + +* Wed May 17 2006 Steven Pritchard 0.2800-1 +- Update to 0.28, but call it 0.2800 to avoid an epoch bump. +- Various spec cleanups to closer match cpanspec output. + +* Wed Mar 15 2006 Steven Pritchard - 0.2612-2 +- Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and + ExtUtils::ParseXS. + +* Sat Mar 11 2006 Steven Pritchard - 0.2612-1 +- Update to 0.2612. + * Mon Sep 05 2005 Steven Pritchard - 0.2611-2 - Minor spec cleanup. - Add COPYING and Artistic. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 10 Jan 2006 21:14:21 -0000 1.8 +++ sources 20 May 2006 20:04:03 -0000 1.9 @@ -1 +1 @@ -d0fa9a7917ed43d1c1f8b707e86b6061 Module-Build-0.2611.tar.gz +8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:14:19 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 13:14:19 -0700 Subject: rpms/lilypond-doc import.log,1.1,1.2 Message-ID: <200605202014.k4KKELx2003931@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3898 Modified Files: import.log Log Message: auto-import lilypond-doc-2.8.3-1 on branch devel from lilypond-doc-2.8.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lilypond-doc/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 May 2006 19:58:38 -0000 1.1 +++ import.log 20 May 2006 20:14:19 -0000 1.2 @@ -0,0 +1 @@ +lilypond-doc-2_8_3-1:HEAD:lilypond-doc-2.8.3-1.src.rpm:1148156063 From fedora-extras-commits at redhat.com Sat May 20 20:14:20 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 13:14:20 -0700 Subject: rpms/lilypond-doc/devel lilypond-doc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605202014.k4KKEMOT003936@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond-doc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3898/devel Modified Files: .cvsignore sources Added Files: lilypond-doc.spec Log Message: auto-import lilypond-doc-2.8.3-1 on branch devel from lilypond-doc-2.8.3-1.src.rpm --- NEW FILE lilypond-doc.spec --- Name: lilypond-doc Version: 2.8.3 Release: 1%{?dist} Summary: HTML documentation for LilyPond Group: Applications/Publishing License: GPL URL: http://www.lilypond.org Source0: http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-1.documentation.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. This package contains the HTML documentation for LilyPond. %prep %setup -q -c %build # Remove empty files rm -f input/mutopia/E.Satie/petite-ouverture-a-danser.png rm -f input/mutopia/J.S.Bach/wtk1-fugue2.png rm -f input/mutopia/W.A.Mozart/mozart-hrn-3.png %install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc *.html input Documentation %changelog * Fri May 19 2006 Quentin Spencer 2.8.3-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond-doc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 May 2006 19:58:38 -0000 1.1 +++ .cvsignore 20 May 2006 20:14:20 -0000 1.2 @@ -0,0 +1 @@ +lilypond-2.8.3-1.documentation.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond-doc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 May 2006 19:58:38 -0000 1.1 +++ sources 20 May 2006 20:14:20 -0000 1.2 @@ -0,0 +1 @@ +45622b94aba72994277d6a0d4fcf706c lilypond-2.8.3-1.documentation.tar.bz2 From fedora-extras-commits at redhat.com Sat May 20 20:18:34 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Sat, 20 May 2006 13:18:34 -0700 Subject: owners owners.list,1.1030,1.1031 Message-ID: <200605202018.k4KKIaOU004064@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4046 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1030 retrieving revision 1.1031 diff -u -r1.1030 -r1.1031 --- owners.list 20 May 2006 17:12:45 -0000 1.1030 +++ owners.list 20 May 2006 20:18:34 -0000 1.1031 @@ -728,6 +728,7 @@ Fedora Extras|lightning|GNU Lightning|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lilypond|A typesetting system for music notation|qspencer at ieee.org|extras-qa at fedoraproject.org| +Fedora Extras|lilypond-doc|HTML documentation for LilyPond|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 20 20:20:38 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 20 May 2006 13:20:38 -0700 Subject: rpms/python-kid/devel python-kid.spec,1.9,1.10 Message-ID: <200605202020.k4KKKe23004129@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4081/devel Modified Files: python-kid.spec Log Message: Update project URL Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/python-kid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-kid.spec 19 May 2006 18:54:17 -0000 1.9 +++ python-kid.spec 20 May 2006 20:20:38 -0000 1.10 @@ -2,12 +2,12 @@ Name: python-kid Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing License: MIT -URL: http://www.lesscode.org/projects/kid +URL: http://kid.lesscode.org/trac/ Source0: http://lesscode.org/dist/kid/kid-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -57,6 +57,9 @@ %changelog +* Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 +- Update project URL + * Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 - Version 0.9.1 From fedora-extras-commits at redhat.com Sat May 20 20:20:31 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 20 May 2006 13:20:31 -0700 Subject: rpms/python-kid/FC-4 python-kid.spec,1.9,1.10 Message-ID: <200605202021.k4KKL3HR004135@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4081/FC-4 Modified Files: python-kid.spec Log Message: Update project URL Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/python-kid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-kid.spec 19 May 2006 18:54:10 -0000 1.9 +++ python-kid.spec 20 May 2006 20:20:31 -0000 1.10 @@ -2,12 +2,12 @@ Name: python-kid Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing License: MIT -URL: http://www.lesscode.org/projects/kid +URL: http://kid.lesscode.org/trac/ Source0: http://lesscode.org/dist/kid/kid-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -57,6 +57,9 @@ %changelog +* Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 +- Update project URL + * Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 - Version 0.9.1 From fedora-extras-commits at redhat.com Sat May 20 20:20:32 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sat, 20 May 2006 13:20:32 -0700 Subject: rpms/python-kid/FC-5 python-kid.spec,1.9,1.10 Message-ID: <200605202021.k4KKL4fT004138@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4081/FC-5 Modified Files: python-kid.spec Log Message: Update project URL Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/python-kid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-kid.spec 19 May 2006 18:54:11 -0000 1.9 +++ python-kid.spec 20 May 2006 20:20:32 -0000 1.10 @@ -2,12 +2,12 @@ Name: python-kid Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing License: MIT -URL: http://www.lesscode.org/projects/kid +URL: http://kid.lesscode.org/trac/ Source0: http://lesscode.org/dist/kid/kid-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -57,6 +57,9 @@ %changelog +* Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 +- Update project URL + * Fri May 19 2006 Konstantin Ryabitsev - 0.9.1-1 - Version 0.9.1 From fedora-extras-commits at redhat.com Sat May 20 20:27:15 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:27:15 -0700 Subject: rpms/ots/devel .cvsignore, 1.3, 1.4 Makefile, 1.2, 1.3 ots.spec, 1.5, 1.6 sources, 1.3, 1.4 dead.package, 1.1, NONE Message-ID: <200605202027.k4KKRHqq004354@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298/devel Added Files: .cvsignore Makefile ots.spec sources Removed Files: dead.package Log Message: taking ownership of ots, importing back into devel Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 20 May 2006 20:27:15 -0000 1.4 @@ -0,0 +1 @@ +ots-0.4.2.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 20 May 2006 20:27:15 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: ots +# $Id$ +NAME := ots +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: ots.spec =================================================================== RCS file: ots.spec diff -N ots.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ots.spec 20 May 2006 20:27:15 -0000 1.6 @@ -0,0 +1,133 @@ +Name: ots +Summary: A text summarizer +Version: 0.4.2 +Release: 8%{?dist} +License: GPL +URL: http://libots.sourceforge.net/ +Group: System Environment/Libraries +Source0: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz +Patch0: ots-0.4.2-gcc4.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: glib2 >= 2.0 +BuildRequires: glib2-devel >= 2.0, libxml2-devel >= 2.4.23, pkgconfig >= 0.8 + +%description +The open text summarizer is an open source tool for summarizing texts. +The program reads a text and decides which sentences are important and +which are not. + +%package devel +Summary: Libraries and include files for developing with libots. +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: pkgconfig >= 0.8, glib2 >= 2.0, glib2-devel >= 2.0 + +%description devel +This package provides the necessary development libraries and include +files to allow you to develop with libots. + +%prep +%setup -q +%patch0 -p1 -b .gcc4 + +%build + +%configure --disable-gtk-doc \ + --with-html-dir=%{buildroot}%{_datadir}/gtk-doc/html/ots +make + +%install +rm -rf %{buildroot} +%makeinstall +# Currently, ots generates empty API docs. +rm -rf %{buildroot}/%{_datadir}/gtk-doc +rm -f %{buildroot}%{_libdir}/*.la + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) +%doc AUTHORS COPYING ChangeLog NEWS README TODO +%{_bindir}/ots +%{_libdir}/*.so.* +%{_mandir}/*/* +%{_datadir}/ots + +%files devel +%defattr(-,root,root) +%{_libdir}/*.a +%{_libdir}/*.so +%{_includedir}/libots-1 +%{_libdir}/pkgconfig/*.pc + +%changelog +* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +- rebuild and spec tidy + +* Sun May 22 2005 Jeremy Katz - 0.4.2-7 +- rebuild on all arches + +* Wed Mar 16 2005 Toshio Kuratomi - 0.4.2-5 +- Reenable man page. +- Disable rebuilding documentation via configure switch instead of an automake + requiring patch. +- Remove the API documentation for now as it is just a placeholder. + +* Wed Mar 2 2005 Caolan McNamara - 0.4.2-4 +- rebuild with gcc4 +- small lvalue assign patch + +* Wed Feb 09 2005 Caolan McNamara - 0.4.2-3 +- rebuilt + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Thu Feb 19 2004 Jeremy Katz - 0.4.2-1 +- 0.4.2 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Nov 28 2003 Jeremy Katz +- add some buildrequires (#111158) + +* Mon Sep 15 2003 Jeremy Katz 0.4.1-1 +- 0.4.1 + +* Mon Aug 4 2003 Jeremy Katz 0.4.0-1 +- 0.4.0 + +* Tue Jul 22 2003 Jeremy Katz 0.3.0-1 +- update to 0.3.0 + +* Sat Jul 12 2003 Jeremy Katz 0.2.0-2 +- forcibly disable gtk-doc (openjade is busted on s390) + +* Mon Jul 7 2003 Jeremy Katz 0.2.0-1 +- update to 0.2.0 +- ldconfig in %%post/%%postun +- libtoolize +- clean up spec file a little, build gtk-doc +- fix libtool versioning + +* Thu Jun 05 2003 Rui Miguel Silva Seabra +- fix spec +- disable gtk-doc (it's not building in RH 9, + maybe it's broken for some reason) + +* Fri May 02 2003 Rui Miguel Silva Seabra +- define a longer description from the README file +- explicitly set file permissions + +* Wed Apr 30 2003 Dom Lachowicz +- created this thing Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 20 May 2006 20:27:15 -0000 1.4 @@ -0,0 +1 @@ +bb02a56a3bf2d5ebf9ffd064992d0ae4 ots-0.4.2.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat May 20 20:27:09 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:27:09 -0700 Subject: rpms/ots/FC-4 ots.spec,1.4,1.5 Message-ID: <200605202027.k4KKRfmD004360@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298/FC-4 Modified Files: ots.spec Log Message: taking ownership of ots, importing back into devel Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/FC-4/ots.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ots.spec 9 Jun 2005 01:50:26 -0000 1.4 +++ ots.spec 20 May 2006 20:27:09 -0000 1.5 @@ -1,16 +1,16 @@ -Name: ots -Summary: A text summarizer -Version: 0.4.2 -Release: 6.1 -License: GPL -Group: System Environment/Libraries -Source: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz -Patch1: ots-0.4.2-gcc4.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pkgconfig >= 0.8 -Requires: glib2 >= 2.0 -BuildRequires: glib2-devel >= 2.0 -BuildRequires: libxml2-devel >= 2.4.23 +Name: ots +Summary: A text summarizer +Version: 0.4.2 +Release: 8%{?dist} +License: GPL +URL: http://libots.sourceforge.net/ +Group: System Environment/Libraries +Source0: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz +Patch0: ots-0.4.2-gcc4.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: glib2 >= 2.0 +BuildRequires: glib2-devel >= 2.0, libxml2-devel >= 2.4.23, pkgconfig >= 0.8 %description The open text summarizer is an open source tool for summarizing texts. @@ -18,13 +18,10 @@ which are not. %package devel -Summary: Libraries and include files for developing with libots. -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: pkgconfig >= 0.8 -Requires: glib2 >= 2.0 -Requires: glib2-devel >= 2.0 - +Summary: Libraries and include files for developing with libots. +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: pkgconfig >= 0.8, glib2 >= 2.0, glib2-devel >= 2.0 %description devel This package provides the necessary development libraries and include @@ -32,23 +29,23 @@ %prep %setup -q -%patch1 -p1 -b .gcc4 +%patch0 -p1 -b .gcc4 %build %configure --disable-gtk-doc \ - --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/ots + --with-html-dir=%{buildroot}%{_datadir}/gtk-doc/html/ots make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %makeinstall # Currently, ots generates empty API docs. -rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -rf %{buildroot}/%{_datadir}/gtk-doc +rm -f %{buildroot}%{_libdir}/*.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -70,7 +67,10 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun May 22 2005 Jeremy Katz - 0.4.2-6.1 +* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +- rebuild and spec tidy + +* Sun May 22 2005 Jeremy Katz - 0.4.2-7 - rebuild on all arches * Wed Mar 16 2005 Toshio Kuratomi - 0.4.2-5 From fedora-extras-commits at redhat.com Sat May 20 20:27:10 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:27:10 -0700 Subject: rpms/ots/FC-5 ots.spec,1.4,1.5 Message-ID: <200605202027.k4KKRgml004363@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298/FC-5 Modified Files: ots.spec Log Message: taking ownership of ots, importing back into devel Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/FC-5/ots.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ots.spec 9 Jun 2005 01:35:54 -0000 1.4 +++ ots.spec 20 May 2006 20:27:09 -0000 1.5 @@ -1,16 +1,16 @@ -Name: ots -Summary: A text summarizer -Version: 0.4.2 -Release: 7 -License: GPL -Group: System Environment/Libraries -Source: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz -Patch1: ots-0.4.2-gcc4.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pkgconfig >= 0.8 -Requires: glib2 >= 2.0 -BuildRequires: glib2-devel >= 2.0 -BuildRequires: libxml2-devel >= 2.4.23 +Name: ots +Summary: A text summarizer +Version: 0.4.2 +Release: 8%{?dist} +License: GPL +URL: http://libots.sourceforge.net/ +Group: System Environment/Libraries +Source0: http://prdownloads.sourceforge.net/libots/ots-%{version}.tar.gz +Patch0: ots-0.4.2-gcc4.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: glib2 >= 2.0 +BuildRequires: glib2-devel >= 2.0, libxml2-devel >= 2.4.23, pkgconfig >= 0.8 %description The open text summarizer is an open source tool for summarizing texts. @@ -18,13 +18,10 @@ which are not. %package devel -Summary: Libraries and include files for developing with libots. -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: pkgconfig >= 0.8 -Requires: glib2 >= 2.0 -Requires: glib2-devel >= 2.0 - +Summary: Libraries and include files for developing with libots. +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: pkgconfig >= 0.8, glib2 >= 2.0, glib2-devel >= 2.0 %description devel This package provides the necessary development libraries and include @@ -32,23 +29,23 @@ %prep %setup -q -%patch1 -p1 -b .gcc4 +%patch0 -p1 -b .gcc4 %build %configure --disable-gtk-doc \ - --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/ots + --with-html-dir=%{buildroot}%{_datadir}/gtk-doc/html/ots make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %makeinstall # Currently, ots generates empty API docs. -rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -rf %{buildroot}/%{_datadir}/gtk-doc +rm -f %{buildroot}%{_libdir}/*.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -70,6 +67,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +- rebuild and spec tidy + * Sun May 22 2005 Jeremy Katz - 0.4.2-7 - rebuild on all arches From fedora-extras-commits at redhat.com Sat May 20 20:30:34 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:30:34 -0700 Subject: rpms/ots/devel ots-0.4.2-gcc4.patch,1.2,1.3 Message-ID: <200605202030.k4KKUaDT004454@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4434 Added Files: ots-0.4.2-gcc4.patch Log Message: include gcc4 patch ots-0.4.2-gcc4.patch: Index: ots-0.4.2-gcc4.patch =================================================================== RCS file: ots-0.4.2-gcc4.patch diff -N ots-0.4.2-gcc4.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ots-0.4.2-gcc4.patch 20 May 2006 20:30:34 -0000 1.3 @@ -0,0 +1,11 @@ +--- ots-0.4.2/src/article.c.orig 2005-03-02 19:42:19.479330826 +0000 ++++ ots-0.4.2/src/article.c 2005-03-02 19:42:43.967625287 +0000 +@@ -35,7 +35,7 @@ + ots_new_sentence (void) + { + OtsSentence *aLine = g_new0 (OtsSentence, 1); +- (GList *) aLine->words = NULL; ++ aLine->words = NULL; + aLine->wc = 0; + aLine->selected = 0; + aLine->score = 0; From fedora-extras-commits at redhat.com Sat May 20 20:31:24 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:31:24 -0700 Subject: rpms/ots/FC-4 ots.spec,1.5,1.6 Message-ID: <200605202031.k4KKVuip004511@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/FC-4 Modified Files: ots.spec Log Message: release bump Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/FC-4/ots.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ots.spec 20 May 2006 20:27:09 -0000 1.5 +++ ots.spec 20 May 2006 20:31:23 -0000 1.6 @@ -1,7 +1,7 @@ Name: ots Summary: A text summarizer Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL URL: http://libots.sourceforge.net/ Group: System Environment/Libraries @@ -67,7 +67,7 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +* Sun May 21 2006 Michael J. Knox - 0.4.2-9 - rebuild and spec tidy * Sun May 22 2005 Jeremy Katz - 0.4.2-7 From fedora-extras-commits at redhat.com Sat May 20 20:31:24 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:31:24 -0700 Subject: rpms/ots/FC-5 ots.spec,1.5,1.6 Message-ID: <200605202031.k4KKVuTn004514@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/FC-5 Modified Files: ots.spec Log Message: release bump Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/FC-5/ots.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ots.spec 20 May 2006 20:27:09 -0000 1.5 +++ ots.spec 20 May 2006 20:31:24 -0000 1.6 @@ -1,7 +1,7 @@ Name: ots Summary: A text summarizer Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL URL: http://libots.sourceforge.net/ Group: System Environment/Libraries @@ -67,7 +67,7 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +* Sun May 21 2006 Michael J. Knox - 0.4.2-9 - rebuild and spec tidy * Sun May 22 2005 Jeremy Katz - 0.4.2-7 From fedora-extras-commits at redhat.com Sat May 20 20:31:25 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:31:25 -0700 Subject: rpms/ots/devel ots.spec,1.6,1.7 Message-ID: <200605202031.k4KKVv14004517@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/ots/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462/devel Modified Files: ots.spec Log Message: release bump Index: ots.spec =================================================================== RCS file: /cvs/extras/rpms/ots/devel/ots.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ots.spec 20 May 2006 20:27:15 -0000 1.6 +++ ots.spec 20 May 2006 20:31:25 -0000 1.7 @@ -1,7 +1,7 @@ Name: ots Summary: A text summarizer Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL URL: http://libots.sourceforge.net/ Group: System Environment/Libraries @@ -67,7 +67,7 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Sun May 21 2006 Michael J. Knox - 0.4.2-8 +* Sun May 21 2006 Michael J. Knox - 0.4.2-9 - rebuild and spec tidy * Sun May 22 2005 Jeremy Katz - 0.4.2-7 From fedora-extras-commits at redhat.com Sat May 20 20:34:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 13:34:05 -0700 Subject: rpms/perl-YAML/devel perl-YAML.spec,1.10,1.11 sources,1.5,1.6 Message-ID: <200605202034.k4KKY7mE004658@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4639 Modified Files: perl-YAML.spec sources Log Message: Go back to 0.58. Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-YAML.spec 17 May 2006 19:14:32 -0000 1.10 +++ perl-YAML.spec 20 May 2006 20:34:05 -0000 1.11 @@ -1,18 +1,15 @@ Name: perl-YAML -Version: 0.39 +Version: 0.58 Release: 2%{?dist} Summary: YAML Ain't Markup Language (tm) - -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz -Patch0: %{name}-testmore054.patch 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)) +BuildRequires: perl(Test::Base) >= 0.49 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The YAML.pm module implements a YAML Loader and Dumper based on the @@ -23,43 +20,48 @@ For information on the YAML syntax, please refer to the YAML specification. - %prep %setup -q -n YAML-%{version} -%patch0 -p0 - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT + make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w $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 \; -%check || : -make test +chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%check +make test %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc Changes README %{_bindir}/ysh %{perl_vendorlib}/YAML* +%{perl_vendorlib}/Test/YAML* %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* - +%{_mandir}/man3/Test::YAML*.3* %changelog +* Tue May 09 2006 Steven Pritchard 0.58-2 +- Drop testmore patch. +- Catch Test::YAML module and man page in file list. + +* Thu May 04 2006 Steven Pritchard 0.58-1 +- Update to 0.58. +- Small spec cleanups. + * Thu Apr 14 2005 Ville Skytt?? - 0.39-2 - 0.39. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 May 2006 19:14:32 -0000 1.5 +++ sources 20 May 2006 20:34:05 -0000 1.6 @@ -1 +1 @@ -b8a49f49cb0ee6d9698807fb3f606922 YAML-0.39.tar.gz +aa5ac653057914ca995dd74de8212ebc YAML-0.58.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:35:36 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 May 2006 13:35:36 -0700 Subject: rpms/perl-YAML/devel perl-YAML.spec,1.11,1.12 Message-ID: <200605202035.k4KKZc0x004715@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-YAML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4696 Modified Files: perl-YAML.spec Log Message: Rebuild. Index: perl-YAML.spec =================================================================== RCS file: /cvs/extras/rpms/perl-YAML/devel/perl-YAML.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-YAML.spec 20 May 2006 20:34:05 -0000 1.11 +++ perl-YAML.spec 20 May 2006 20:35:35 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-YAML Version: 0.58 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML Ain't Markup Language (tm) License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/Test::YAML*.3* %changelog +* Sat May 20 2006 Steven Pritchard 0.58-3 +- Rebuild. + * Tue May 09 2006 Steven Pritchard 0.58-2 - Drop testmore patch. - Catch Test::YAML module and man page in file list. From fedora-extras-commits at redhat.com Sat May 20 20:38:00 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:38:00 -0700 Subject: rpms/duplicity/devel .cvsignore, 1.3, 1.4 Makefile, 1.3, 1.4 duplicity.spec, 1.7, 1.8 sources, 1.3, 1.4 dead.package, 1.1, NONE Message-ID: <200605202038.k4KKc2AK004838@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/duplicity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/devel Added Files: .cvsignore Makefile duplicity.spec sources Removed Files: dead.package Log Message: taking ownership and updated package Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 20 May 2006 20:38:00 -0000 1.4 @@ -0,0 +1 @@ +duplicity-0.4.2.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 20 May 2006 20:38:00 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: duplicity +# $Id$ +NAME := duplicity +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: duplicity.spec =================================================================== RCS file: duplicity.spec diff -N duplicity.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ duplicity.spec 20 May 2006 20:38:00 -0000 1.8 @@ -0,0 +1,69 @@ +%define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],') +%define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),') + +Version: 0.4.2 +Summary: Untrusted/encrypted backup using rsync algorithm +Name: duplicity +Release: 1%{?dist} +URL: http://www.nongnu.org/duplicity/ +Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz +License: GPL +Group: Applications/Archiving +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 +BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 + +%description +Duplicity incrementally backs up files and directory by encrypting +tar-format volumes with GnuPG and uploading them to a remote (or +local) file server. In theory many remote backends are possible; +right now local, ssh/scp, ftp, and rsync backends are written. +Because duplicity uses librsync, the incremental archives are space +efficient and only record the parts of files that have changed since +the last backup. Currently duplicity supports deleted files, full +unix permissions, directories, symbolic links, fifos, etc., but not +hard links. + +%prep +%setup -q + +%build +python setup.py build + +%install +python setup.py install --root $RPM_BUILD_ROOT +# Produce .pyo files for %ghost directive later +python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity'")' + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc CHANGELOG COPYING README +%{_bindir}/rdiffdir +%{_bindir}/duplicity +%{_mandir}/man1/duplicity* +%{_mandir}/man1/rdiffdir* +%dir %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity +%{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.py +%{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.so +%{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyc +%ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyo + +%changelog +* Tue May 16 2006 Michael J. Knox - 0.4.2-1 +- verion bump + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Sun Oct 05 2003 Ben Escoto - 0:0.4.1-0.fdr.3 +- More hints from Fedora QA (ville.skytta at iki.fi) + +* Sat Aug 09 2003 Ben Escoto - 0:0.4.1-0.fdr.2 +- Repackaging for Fedora + +* Sun Aug 30 2002 Ben Escoto +- Initial RPM Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 20 May 2006 20:38:00 -0000 1.4 @@ -0,0 +1 @@ +a9fd4094f23bb36c82cc1dc2816a5b7d duplicity-0.4.2.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat May 20 20:37:54 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:37:54 -0700 Subject: rpms/duplicity/FC-4 .cvsignore, 1.2, 1.3 duplicity.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200605202038.k4KKcQI1004843@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/duplicity/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/FC-4 Modified Files: .cvsignore duplicity.spec sources Log Message: taking ownership and updated package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:14:50 -0000 1.2 +++ .cvsignore 20 May 2006 20:37:54 -0000 1.3 @@ -1 +1 @@ -duplicity-0.4.1.tar.gz +duplicity-0.4.2.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-4/duplicity.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- duplicity.spec 6 Apr 2005 22:11:36 -0000 1.6 +++ duplicity.spec 20 May 2006 20:37:54 -0000 1.7 @@ -1,18 +1,18 @@ %define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],') %define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),') -Version: 0.4.1 -Summary: Untrusted/encrypted backup using rsync algorithm -Name: duplicity -Release: 4 - -URL: http://www.nongnu.org/duplicity/ -Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz -License: GPL -Group: Applications/Archiving -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 -BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 +Version: 0.4.2 +Summary: Untrusted/encrypted backup using rsync algorithm +Name: duplicity +Release: 1%{?dist} +URL: http://www.nongnu.org/duplicity/ +Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz +License: GPL +Group: Applications/Archiving +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 +BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 %description Duplicity incrementally backs up files and directory by encrypting @@ -41,6 +41,7 @@ %files %defattr(-,root,root) +%doc CHANGELOG COPYING README %{_bindir}/rdiffdir %{_bindir}/duplicity %{_mandir}/man1/duplicity* @@ -50,9 +51,11 @@ %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.so %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyc %ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyo -%doc CHANGELOG COPYING README %changelog +* Tue May 16 2006 Michael J. Knox - 0.4.2-1 +- verion bump + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:14:50 -0000 1.2 +++ sources 20 May 2006 20:37:54 -0000 1.3 @@ -1 +1 @@ -c91933a10f97057b899ba97673ad8a63 duplicity-0.4.1.tar.gz +a9fd4094f23bb36c82cc1dc2816a5b7d duplicity-0.4.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:37:54 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:37:54 -0700 Subject: rpms/duplicity/FC-5 .cvsignore, 1.2, 1.3 duplicity.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200605202038.k4KKcQgN004848@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/duplicity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/FC-5 Modified Files: .cvsignore duplicity.spec sources Log Message: taking ownership and updated package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:14:50 -0000 1.2 +++ .cvsignore 20 May 2006 20:37:54 -0000 1.3 @@ -1 +1 @@ -duplicity-0.4.1.tar.gz +duplicity-0.4.2.tar.gz Index: duplicity.spec =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-5/duplicity.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- duplicity.spec 6 Apr 2005 22:11:36 -0000 1.6 +++ duplicity.spec 20 May 2006 20:37:54 -0000 1.7 @@ -1,18 +1,18 @@ %define PYTHON_VERSION %(python -c 'import sys; print sys.version[:3],') %define NEXT_PYTHON_VERSION %(python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1]+1),') -Version: 0.4.1 -Summary: Untrusted/encrypted backup using rsync algorithm -Name: duplicity -Release: 4 - -URL: http://www.nongnu.org/duplicity/ -Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz -License: GPL -Group: Applications/Archiving -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 -BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 +Version: 0.4.2 +Summary: Untrusted/encrypted backup using rsync algorithm +Name: duplicity +Release: 1%{?dist} +URL: http://www.nongnu.org/duplicity/ +Source: http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz +License: GPL +Group: Applications/Archiving +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}, gnupg >= 1.0.6 +BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6 %description Duplicity incrementally backs up files and directory by encrypting @@ -41,6 +41,7 @@ %files %defattr(-,root,root) +%doc CHANGELOG COPYING README %{_bindir}/rdiffdir %{_bindir}/duplicity %{_mandir}/man1/duplicity* @@ -50,9 +51,11 @@ %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.so %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyc %ghost %{_libdir}/python%{PYTHON_VERSION}/site-packages/duplicity/*.pyo -%doc CHANGELOG COPYING README %changelog +* Tue May 16 2006 Michael J. Knox - 0.4.2-1 +- verion bump + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/duplicity/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:14:50 -0000 1.2 +++ sources 20 May 2006 20:37:54 -0000 1.3 @@ -1 +1 @@ -c91933a10f97057b899ba97673ad8a63 duplicity-0.4.1.tar.gz +a9fd4094f23bb36c82cc1dc2816a5b7d duplicity-0.4.2.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:49:08 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:49:08 -0700 Subject: rpms/gnofract4d/devel .cvsignore, 1.4, 1.5 Makefile, 1.3, 1.4 gnofract4d.spec, 1.8, 1.9 sources, 1.4, 1.5 dead.package, 1.1, NONE Message-ID: <200605202049.k4KKnAwb005107@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/devel Added Files: .cvsignore Makefile gnofract4d.spec sources Removed Files: dead.package Log Message: taking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bump Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 20 May 2006 20:49:08 -0000 1.5 @@ -0,0 +1 @@ +gnofract4d-2.14.tar.gz Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 20 May 2006 20:49:08 -0000 1.4 @@ -0,0 +1,21 @@ +# Makefile for source rpm: gnofract4d +# $Id$ +NAME := gnofract4d +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) Index: gnofract4d.spec =================================================================== RCS file: gnofract4d.spec diff -N gnofract4d.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnofract4d.spec 20 May 2006 20:49:08 -0000 1.9 @@ -0,0 +1,105 @@ +Name: gnofract4d +Version: 2.14 +Release: 1%{?dist} +Summary: Gnofract 4D is a Gnome-based program to draw fractals +Group: Amusements/Graphics +License: GPL +URL: http://gnofract4d.sourceforge.net/ +Source0: http//dl.sf.net/gnofract4d/gnofract4d-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: scrollkeeper, python, gcc-c++, pkgconfig +BuildRequires: gtk2-devel, python-devel +BuildRequires: desktop-file-utils, GConf2-devel + +Requires(post): scrollkeeper + +%description +Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from +other fractal programs (and makes it "4D") is the way that it treats the +Mandelbrot and Julia sets as different views of the same four-dimensional +fractal object. This allows you to generate images which are a cross between +the two sets and explore their inter-relationships. + +%prep + +%setup -q +%ifarch x86_64 + sed -i 's|/usr/lib/|%{_libdir}/|g' setup.cfg +%endif + +%build +python setup.py build + +%install +%{__rm} -rf %{buildroot} +python setup.py install --root="%{buildroot}" + +%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/ +desktop-file-install --vendor fedora \ + --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + %{buildroot}%{_datadir}/gnofract4d/gnofract4d.desktop + +%post +scrollkeeper-update -q || : + +%postun +scrollkeeper-update -q || : + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-, root, root, 0755) +%doc COPYING README +%doc %{_datadir}/gnome/help/gnofract4d/ +%{_bindir}/gnofract4d +%dir %{_datadir}/maps/ +%{_datadir}/maps/gnofract4d/ +%{_datadir}/mime/packages/gnofract4d-mime.xml +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/gnofract4d/ +%{_datadir}/pixmaps/gnofract4d-logo.png +%{_prefix}/lib/gnofract4d-%{version}/ +%{_datadir}/formulas/gnofract4d/ + +%changelog +* Wed May 17 2006 Michael J. Knox - 2.14-1 +- version bump and spec clean + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Sun Feb 13 2005 Throsten Leemhuis 0:2.6-2 +- "sed -i s|/usr/lib/|%%{_libdir}|g setup.cfg" on x86_64 + +* Tue Feb 01 2005 Panu Matilainen 0:2.6-1 +- update to 2.6 +- drop epoch 0 and fedora.us release tag +- run update-desktop-database on post+postun + +* Sun Oct 03 2004 Panu Matilainen 0:2.1-0.fdr.1 +- update to 2.1 + +* Tue Jul 06 2004 Panu Matilainen 0:2.0-0.fdr.1 +- update to 2.0 +- quite a few dependency changes because of switch to python etc + +* Mon May 31 2004 Panu Matilainen 0:1.9-0.fdr.3 +- fix build against newer gtk (gtk-buildfix patch) + +* Tue Dec 23 2003 Panu Matilainen 0:1.9-0.fdr.2 +- address issues in #1114 +- huh, this requires g++ to run... + +* Mon Dec 15 2003 Panu Matilainen 0:1.9-0.fdr.1 +- update to 1.9 +- drop patch (no longer needed to build) +- add translations now that there is one + + +* Sun Dec 07 2003 Panu Matilainen 0:1.8-0.fdr.1 +- Initial Fedora packaging. Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 20 May 2006 20:49:08 -0000 1.5 @@ -0,0 +1 @@ +34170bb139eb30dfd7d1c1bc647d2578 gnofract4d-2.14.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Sat May 20 20:49:07 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:49:07 -0700 Subject: rpms/gnofract4d/FC-4 .cvsignore, 1.3, 1.4 gnofract4d.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605202049.k4KKn9A7005094@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/FC-4 Modified Files: .cvsignore gnofract4d.spec sources Log Message: taking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bump Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 22:41:14 -0000 1.3 +++ .cvsignore 20 May 2006 20:49:07 -0000 1.4 @@ -1 +1 @@ -gnofract4d-2.6.tar.gz +gnofract4d-2.14.tar.gz Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-4/gnofract4d.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnofract4d.spec 6 Apr 2005 22:11:38 -0000 1.6 +++ gnofract4d.spec 20 May 2006 20:49:07 -0000 1.7 @@ -1,20 +1,19 @@ Name: gnofract4d -Version: 2.6 -Release: 3 - -Summary: Gnofract 4D is a Gnome-based program to draw fractals. - +Version: 2.14 +Release: 1%{?dist} +Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL URL: http://gnofract4d.sourceforge.net/ Source0: http//dl.sf.net/gnofract4d/gnofract4d-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: scrollkeeper, python, gcc-c++, pkgconfig +BuildRequires: gtk2-devel, python-devel +BuildRequires: desktop-file-utils, GConf2-devel + Requires(post): scrollkeeper -Requires(postun): scrollkeeper -# This *really* requires gcc at runtime! -Requires: gcc -BuildRequires: desktop-file-utils, python-devel -BuildRequires: scrollkeeper, libgnomeui-devel %description Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from @@ -24,6 +23,7 @@ the two sets and explore their inter-relationships. %prep + %setup -q %ifarch x86_64 sed -i 's|/usr/lib/|%{_libdir}/|g' setup.cfg @@ -33,47 +33,43 @@ python setup.py build %install -rm -rf $RPM_BUILD_ROOT -#sed -i "s/Terminal=0/Terminal=false/" %{name}.desktop -python setup.py install -O1 --root=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' - - -desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --vendor fedora \ - --add-category X-Fedora \ - --add-category Graphics \ - --add-category Application \ - --delete-original \ - $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Graphics/gnofract4d.desktop -rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome/apps - -%clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} +python setup.py install --root="%{buildroot}" +%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/ +desktop-file-install --vendor fedora \ + --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + %{buildroot}%{_datadir}/gnofract4d/gnofract4d.desktop %post -/usr/bin/scrollkeeper-update 2> /dev/null -/usr/bin/update-desktop-database %{_datadir}/applications +scrollkeeper-update -q || : %postun -/usr/bin/scrollkeeper-update 2> /dev/null -/usr/bin/update-desktop-database %{_datadir}/applications +scrollkeeper-update -q || : + +%clean +%{__rm} -rf %{buildroot} %files -%defattr(-,root,root,-) -%doc COPYING -%{_bindir}/* -%{_libdir}/%{name}-%{version} -%{_datadir}/maps -%{_datadir}/formulas -%{_datadir}/gnome/help/%{name} -%{_datadir}/pixmaps/%{name} -%{_datadir}/applications/* +%defattr(-, root, root, 0755) +%doc COPYING README +%doc %{_datadir}/gnome/help/gnofract4d/ +%{_bindir}/gnofract4d +%dir %{_datadir}/maps/ +%{_datadir}/maps/gnofract4d/ +%{_datadir}/mime/packages/gnofract4d-mime.xml +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/gnofract4d/ +%{_datadir}/pixmaps/gnofract4d-logo.png +%{_prefix}/lib/gnofract4d-%{version}/ +%{_datadir}/formulas/gnofract4d/ %changelog +* Wed May 17 2006 Michael J. Knox - 2.14-1 +- version bump and spec clean + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 22:41:14 -0000 1.3 +++ sources 20 May 2006 20:49:07 -0000 1.4 @@ -1 +1 @@ -4fb185f967003ecd6c752cbd2b89961f gnofract4d-2.6.tar.gz +34170bb139eb30dfd7d1c1bc647d2578 gnofract4d-2.14.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:49:07 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:49:07 -0700 Subject: rpms/gnofract4d/FC-5 .cvsignore, 1.3, 1.4 gnofract4d.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200605202049.k4KKn9md005100@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5040/FC-5 Modified Files: .cvsignore gnofract4d.spec sources Log Message: taking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bumptaking ownership and small version bump Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 22:41:14 -0000 1.3 +++ .cvsignore 20 May 2006 20:49:07 -0000 1.4 @@ -1 +1 @@ -gnofract4d-2.6.tar.gz +gnofract4d-2.14.tar.gz Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-5/gnofract4d.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnofract4d.spec 4 Mar 2006 13:26:48 -0000 1.7 +++ gnofract4d.spec 20 May 2006 20:49:07 -0000 1.8 @@ -1,20 +1,19 @@ Name: gnofract4d -Version: 2.6 -Release: 3 - -Summary: Gnofract 4D is a Gnome-based program to draw fractals. - +Version: 2.14 +Release: 1%{?dist} +Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL URL: http://gnofract4d.sourceforge.net/ Source0: http//dl.sf.net/gnofract4d/gnofract4d-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: scrollkeeper, python, gcc-c++, pkgconfig +BuildRequires: gtk2-devel, python-devel +BuildRequires: desktop-file-utils, GConf2-devel + Requires(post): scrollkeeper -Requires(postun): scrollkeeper -# This *really* requires gcc at runtime! -Requires: gcc -BuildRequires: desktop-file-utils, python-devel -BuildRequires: scrollkeeper, libgnomeui-devel %description Gnofract 4D is a Gnome-based program to draw fractals. What sets it apart from @@ -24,12 +23,6 @@ the two sets and explore their inter-relationships. %prep -cat< /dev/null -/usr/bin/update-desktop-database %{_datadir}/applications +scrollkeeper-update -q || : %postun -/usr/bin/scrollkeeper-update 2> /dev/null -/usr/bin/update-desktop-database %{_datadir}/applications +scrollkeeper-update -q || : + +%clean +%{__rm} -rf %{buildroot} %files -%defattr(-,root,root,-) -%doc COPYING -%{_bindir}/* -%{_libdir}/%{name}-%{version} -%{_datadir}/maps -%{_datadir}/formulas -%{_datadir}/gnome/help/%{name} -%{_datadir}/pixmaps/%{name} -%{_datadir}/applications/* +%defattr(-, root, root, 0755) +%doc COPYING README +%doc %{_datadir}/gnome/help/gnofract4d/ +%{_bindir}/gnofract4d +%dir %{_datadir}/maps/ +%{_datadir}/maps/gnofract4d/ +%{_datadir}/mime/packages/gnofract4d-mime.xml +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/gnofract4d/ +%{_datadir}/pixmaps/gnofract4d-logo.png +%{_prefix}/lib/gnofract4d-%{version}/ +%{_datadir}/formulas/gnofract4d/ %changelog +* Wed May 17 2006 Michael J. Knox - 2.14-1 +- version bump and spec clean + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 22:41:14 -0000 1.3 +++ sources 20 May 2006 20:49:07 -0000 1.4 @@ -1 +1 @@ -4fb185f967003ecd6c752cbd2b89961f gnofract4d-2.6.tar.gz +34170bb139eb30dfd7d1c1bc647d2578 gnofract4d-2.14.tar.gz From fedora-extras-commits at redhat.com Sat May 20 20:58:14 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:58:14 -0700 Subject: rpms/gnofract4d/FC-4 gnofract4d.spec,1.7,1.8 Message-ID: <200605202058.k4KKwG1X005287@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5242/FC-4 Modified Files: gnofract4d.spec Log Message: fixed files list for x86_64 Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-4/gnofract4d.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnofract4d.spec 20 May 2006 20:49:07 -0000 1.7 +++ gnofract4d.spec 20 May 2006 20:58:14 -0000 1.8 @@ -1,6 +1,6 @@ Name: gnofract4d Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL @@ -63,10 +63,13 @@ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/gnofract4d/ %{_datadir}/pixmaps/gnofract4d-logo.png -%{_prefix}/lib/gnofract4d-%{version}/ +%{_libdir}/gnofract4d-%{version}/ %{_datadir}/formulas/gnofract4d/ %changelog +* Sun May 21 2006 Michael J. Knox - 2.14-2 +- fixed files list for x86_64 builds + * Wed May 17 2006 Michael J. Knox - 2.14-1 - version bump and spec clean From fedora-extras-commits at redhat.com Sat May 20 20:58:15 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:58:15 -0700 Subject: rpms/gnofract4d/FC-5 gnofract4d.spec,1.8,1.9 Message-ID: <200605202058.k4KKwHn7005291@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5242/FC-5 Modified Files: gnofract4d.spec Log Message: fixed files list for x86_64 Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/FC-5/gnofract4d.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnofract4d.spec 20 May 2006 20:49:07 -0000 1.8 +++ gnofract4d.spec 20 May 2006 20:58:15 -0000 1.9 @@ -1,6 +1,6 @@ Name: gnofract4d Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL @@ -63,10 +63,13 @@ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/gnofract4d/ %{_datadir}/pixmaps/gnofract4d-logo.png -%{_prefix}/lib/gnofract4d-%{version}/ +%{_libdir}/gnofract4d-%{version}/ %{_datadir}/formulas/gnofract4d/ %changelog +* Sun May 21 2006 Michael J. Knox - 2.14-2 +- fixed files list for x86_64 builds + * Wed May 17 2006 Michael J. Knox - 2.14-1 - version bump and spec clean From fedora-extras-commits at redhat.com Sat May 20 20:58:16 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 13:58:16 -0700 Subject: rpms/gnofract4d/devel gnofract4d.spec,1.9,1.10 Message-ID: <200605202058.k4KKwIif005295@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5242/devel Modified Files: gnofract4d.spec Log Message: fixed files list for x86_64 Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/devel/gnofract4d.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnofract4d.spec 20 May 2006 20:49:08 -0000 1.9 +++ gnofract4d.spec 20 May 2006 20:58:16 -0000 1.10 @@ -1,6 +1,6 @@ Name: gnofract4d Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnofract 4D is a Gnome-based program to draw fractals Group: Amusements/Graphics License: GPL @@ -63,10 +63,13 @@ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/gnofract4d/ %{_datadir}/pixmaps/gnofract4d-logo.png -%{_prefix}/lib/gnofract4d-%{version}/ +%{_libdir}/gnofract4d-%{version}/ %{_datadir}/formulas/gnofract4d/ %changelog +* Sun May 21 2006 Michael J. Knox - 2.14-2 +- fixed files list for x86_64 builds + * Wed May 17 2006 Michael J. Knox - 2.14-1 - version bump and spec clean From fedora-extras-commits at redhat.com Sat May 20 21:16:51 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:16:51 -0700 Subject: rpms/perl-PadWalker - New directory Message-ID: <200605202116.k4KLGrh4007803@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7777/perl-PadWalker Log Message: Directory /cvs/extras/rpms/perl-PadWalker added to the repository From fedora-extras-commits at redhat.com Sat May 20 21:16:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:16:52 -0700 Subject: rpms/perl-PadWalker/devel - New directory Message-ID: <200605202116.k4KLGs2M007806@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7777/perl-PadWalker/devel Log Message: Directory /cvs/extras/rpms/perl-PadWalker/devel added to the repository From fedora-extras-commits at redhat.com Sat May 20 21:17:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:17:07 -0700 Subject: rpms/perl-PadWalker Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605202117.k4KLH91F007855@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7822 Added Files: Makefile import.log Log Message: Setup of module perl-PadWalker --- NEW FILE Makefile --- # Top level Makefile for module perl-PadWalker all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 20 21:17:08 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:17:08 -0700 Subject: rpms/perl-PadWalker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605202117.k4KLHA31007858@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7822/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-PadWalker --- NEW 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 May 20 21:17:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:17:41 -0700 Subject: rpms/perl-PadWalker import.log,1.1,1.2 Message-ID: <200605202117.k4KLHh80007920@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7887 Modified Files: import.log Log Message: auto-import perl-PadWalker-1.0-1 on branch devel from perl-PadWalker-1.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-PadWalker/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 May 2006 21:17:07 -0000 1.1 +++ import.log 20 May 2006 21:17:40 -0000 1.2 @@ -0,0 +1 @@ +perl-PadWalker-1_0-1:HEAD:perl-PadWalker-1.0-1.src.rpm:1148159852 From fedora-extras-commits at redhat.com Sat May 20 21:17:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:17:41 -0700 Subject: rpms/perl-PadWalker/devel perl-PadWalker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605202117.k4KLHhxf007925@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-PadWalker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7887/devel Modified Files: .cvsignore sources Added Files: perl-PadWalker.spec Log Message: auto-import perl-PadWalker-1.0-1 on branch devel from perl-PadWalker-1.0-1.src.rpm --- NEW FILE perl-PadWalker.spec --- Name: perl-PadWalker Version: 1.0 Release: 1%{?dist} Summary: Play with other peoples' lexical variables Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/PadWalker/ Source0: http://www.cpan.org/authors/id/R/RO/ROBIN/PadWalker-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description PadWalker is a module which allows you to inspect (and even change!) lexical variables in any subroutine which called you. It will only show those variables which are in scope at the point of the call. %prep %setup -q -n PadWalker-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/PadWalker* %{perl_vendorarch}/auto/PadWalker/ %{_mandir}/man3/*.3pm* %changelog * Fri May 19 2006 Jose Pedro Oliveira - 1.0-1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-PadWalker/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 May 2006 21:17:08 -0000 1.1 +++ .cvsignore 20 May 2006 21:17:41 -0000 1.2 @@ -0,0 +1 @@ +PadWalker-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-PadWalker/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 May 2006 21:17:08 -0000 1.1 +++ sources 20 May 2006 21:17:41 -0000 1.2 @@ -0,0 +1 @@ +05d684ce2f17ef4f058ec2e912b5f95c PadWalker-1.0.tar.gz From fedora-extras-commits at redhat.com Sat May 20 21:21:09 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 20 May 2006 14:21:09 -0700 Subject: owners owners.list,1.1031,1.1032 Message-ID: <200605202121.k4KLLB8h008032@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8015 Modified Files: owners.list Log Message: New package: perl-PadWalker (#192475) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1031 retrieving revision 1.1032 diff -u -r1.1031 -r1.1032 --- owners.list 20 May 2006 20:18:34 -0000 1.1031 +++ owners.list 20 May 2006 21:21:09 -0000 1.1032 @@ -1160,6 +1160,7 @@ Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Object-Accessor|Perl module that allows per object accessors|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-PadWalker|Play with other peoples' lexical variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 20 21:29:53 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Sat, 20 May 2006 14:29:53 -0700 Subject: owners owners.list,1.1032,1.1033 Message-ID: <200605202129.k4KLTt2b008083@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8063 Modified Files: owners.list Log Message: taking ownership of ots, duplicity and gnofract4d Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1032 retrieving revision 1.1033 diff -u -r1.1032 -r1.1033 --- owners.list 20 May 2006 21:21:09 -0000 1.1032 +++ owners.list 20 May 2006 21:29:53 -0000 1.1033 @@ -228,7 +228,7 @@ Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -386,7 +386,7 @@ Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gnochm|CHM file viewer|pertusus at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|gnokii|Mobile phone management program|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-music|A GNOME panel applet to control various music players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| @@ -890,7 +890,7 @@ Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|otrs|The Open Ticket Request System|imlinux at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|ots|A text summarizer|michael at knox.net.nz|extras-qa at fedoraproject.org| Fedora Extras|overgod|Another Asteroid like game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|p0f|Versatile passive OS fingerprinting tool|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 21 01:46:00 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 20 May 2006 18:46:00 -0700 Subject: rpms/ytalk/devel ytalk.spec,1.3,1.4 Message-ID: <200605210146.k4L1k3XP018236@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18186/devel Modified Files: ytalk.spec Log Message: Removed macros from change log Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/devel/ytalk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ytalk.spec 20 May 2006 04:52:56 -0000 1.3 +++ ytalk.spec 21 May 2006 01:46:00 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -38,8 +38,11 @@ %config(noreplace) /etc/ytalkrc %changelog +* Sat May 20 2006 Mike McGrath 3.3.0-5 +- Removed macros from 3.3.0-4 changelog + * Fri May 19 2006 Mike McGrath 3.3.0-4 -- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} +- Changed makeinstall-strip to make install DESTDIR={buildroot} * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 From fedora-extras-commits at redhat.com Sun May 21 01:45:55 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 20 May 2006 18:45:55 -0700 Subject: rpms/ytalk/FC-5 ytalk.spec,1.3,1.4 Message-ID: <200605210146.k4L1kRfJ018242@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18186/FC-5 Modified Files: ytalk.spec Log Message: Removed macros from change log Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/FC-5/ytalk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ytalk.spec 20 May 2006 04:52:55 -0000 1.3 +++ ytalk.spec 21 May 2006 01:45:55 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -38,8 +38,11 @@ %config(noreplace) /etc/ytalkrc %changelog +* Sat May 20 2006 Mike McGrath 3.3.0-5 +- Removed macros from 3.3.0-4 changelog + * Fri May 19 2006 Mike McGrath 3.3.0-4 -- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} +- Changed makeinstall-strip to make install DESTDIR={buildroot} * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 From fedora-extras-commits at redhat.com Sun May 21 01:45:54 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sat, 20 May 2006 18:45:54 -0700 Subject: rpms/ytalk/FC-4 ytalk.spec,1.3,1.4 Message-ID: <200605210146.k4L1kQJJ018239@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/ytalk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18186/FC-4 Modified Files: ytalk.spec Log Message: Removed macros from change log Index: ytalk.spec =================================================================== RCS file: /cvs/extras/rpms/ytalk/FC-4/ytalk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ytalk.spec 20 May 2006 04:52:54 -0000 1.3 +++ ytalk.spec 21 May 2006 01:45:53 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A chat program for multiple users Name: ytalk Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://www.impul.se/ytalk/ @@ -38,8 +38,11 @@ %config(noreplace) /etc/ytalkrc %changelog +* Sat May 20 2006 Mike McGrath 3.3.0-5 +- Removed macros from 3.3.0-4 changelog + * Fri May 19 2006 Mike McGrath 3.3.0-4 -- Changed %makeinstall-strip to make install DESTDIR=%{buildroot} +- Changed makeinstall-strip to make install DESTDIR={buildroot} * Wed Dec 21 2005 Mike McGrath 3.3.0-3 - Updated to version 3.3.0 From fedora-extras-commits at redhat.com Sun May 21 03:41:15 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 20:41:15 -0700 Subject: rpms/rsnapshot/FC-4 Makefile, 1.1, NONE rsnapshot.patch, 1.1, NONE rsnapshot.spec, 1.5, NONE sources, 1.3, NONE Message-ID: <200605210341.k4L3fHMu023304@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23276/FC-4 Removed Files: Makefile rsnapshot.patch rsnapshot.spec sources Log Message: remove old package info from fc4/5 branches in preparation for pushing devel stuff out --- Makefile DELETED --- --- rsnapshot.patch DELETED --- --- rsnapshot.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sun May 21 03:41:16 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 20:41:16 -0700 Subject: rpms/rsnapshot/FC-5 Makefile, 1.1, NONE rsnapshot.patch, 1.1, NONE rsnapshot.spec, 1.5, NONE sources, 1.3, NONE Message-ID: <200605210341.k4L3fInW023307@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23276/FC-5 Removed Files: Makefile rsnapshot.patch rsnapshot.spec sources Log Message: remove old package info from fc4/5 branches in preparation for pushing devel stuff out --- Makefile DELETED --- --- rsnapshot.patch DELETED --- --- rsnapshot.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sun May 21 03:43:07 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 20:43:07 -0700 Subject: rpms/rsnapshot/FC-4 Makefile, 1.2, 1.3 rsnapshot-1.2.3.tar.gz, NONE, 1.1 rsnapshot.conf.patch, NONE, 1.1 rsnapshot.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605210343.k4L3h9Hl023372@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23328/FC-4 Added Files: Makefile rsnapshot-1.2.3.tar.gz rsnapshot.conf.patch rsnapshot.spec sources Log Message: Copied data from devel to branch directories Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 21 May 2006 03:43:07 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rsnapshot +# $Id$ +NAME := rsnapshot +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) --- NEW FILE rsnapshot-1.2.3.tar.gz --- ? AZ?e????? %??Ir7u??K ?h4????DE?LM????}?}???7????????O?/}__{??????g/?}????????`???T?&B???q??~?=?.?/?I*?_??%??C???r?????????k???? ???n?? ???????G??{??m??;?c?N????D????$nJmi<sW???d????k?fi????q??W???C?_??x????o?_???76^?????t??????G??JV?A?J?Nn?+}??|??????u??D?V2????4????? ?i /????`Dn^#??R??? ?@h???????|?????u?d????Y??D?y_G???R?~???B??G?? ?????? ?"P"?= '???PYZN??v_?????? ]??,?w????????8}p"????????x???#?#????????????*?OX?8?`<????q???B?]#9v!?H??r? ??A??????????8?(V?4 Y,????.??L;h#?D? ?[%?`?p?X??}x?PN??>?m??????x????C????g??????? ?&??h?34????i9??DBS0???? ????CgB5?|?K?Rb?[H??.???[ui~?? ?y??qK/?v???????g ??C???????????????????1??r 7?R????n?o?I7d??C?ZG>????J.?\?k?$?_.??/??????Eq:_U???,???8?5?v?1 ??V'???%????|?????V?+? ?]*n??????Z?a?U?z???.>mP?%???0???Lah0?3'??????K????'??????)???'???(??;??r? +}???NA???x??Y???AH?????/a???9??qk??-a????O??g?.?k?e@???l??? ?,?M? ??0S|?tx?'cN???,[ ?B???]?(Z??v?u??#?,?3?.??Wj+e??fZ???u.Z???/??? ??=i9??16?1s??g?B7Dt??"?,????Z ~???U ?????6k???T?l0??6mqN[L 7?,j$ m?b a=?x?????tN_+L?&?L?136-??c???P:o[?S0?9?re????A???Y???H???????T?????"?????'?`???s???????MJ??j?? ????W??PU(#???G?C????? $}? ?n?3U f??+?OB?n?M*?U????h??? q?&????u?i8w?n??Z????,u??'Ot???T?????f??????/f???@? E)?9?4?? ????u,I_?KF3?q;?h?rj???`H????&?o???????????IH?2:???wv? ??ZNk?,i1KQ-?&)??|3 ?????tj??5?@?3m?\=uKk9??Eb??????>?'?De????a???}???B???Q?>????Mre&?y??????$?b?(L?? a+?,G???? ??= ???O????+94$??D????N?p7k? @?Q?^ ? ??L)?$_?X?]????'pA?*%?*??nt??W ?????K l?\b?z?l??}j????}??\b??h?? x????M: ?-?????H??p?s?N)?????i6J??y?^?:&?2?#'I?So???j??dE(ia6?}P?6w? ????_ ?lA?A?h ?Tn???????????s?o%?7V]??{]?)??.?????????Cs)Q????? ?????? p1??@8 at G34I??';,?A?e?5?%?????dG4?< ??e}?-??????????????u?k?f7NN?6?? }~????{R?()?M ????$???Z?A???G2????^?UH|?3?I?????p\?9 ?0?u*F??_7r? ?~| ;??^?.???? ?m?4???3@???Hc?8p???????J;??|??+??M?e??z G?hN?*???p?iG<mA?9?i.??????H?At-?@?_)/@?????o????????. ?i?e$^l??6|#??g??>??f??FG??;? ?X?q?'n?4+}]?o??>?*???5w?m?*E7??jo(???p????+????BJi??? ?????XBz??????e?W????~8`CB??6?6x??$?G9xyN??]?0p?H???#;8??N???q]?aa(Ij????oS?o??0????U6?d~_{!???????.???7?????^??v+gB` ????uj[?q??&?Ur?n??M2?x?????R?(?v{????????~]???.?????VW??oe??Ut??7???????????(n?7E? ?2??wo??q???????? L?d?w?????9?&????F?, o???%C9?M?)'???#!J????b???'72?O???>?q????x?E'?b.x6??'>?J?SpJ???VB?Q????s? ??t???W>]~7?:]?^???t?p??%#??????[?.??????<2????].??????P???????%?rkw!?rA?*YY J?????{??C6Vimw??^/XZg??E???1?2|?F????????????j???I?=??w?pw?u??r?t;?[????s??/??n??s???)???????^?`s?'????+?????M????#?* I??e??z??$8?.S?8???P?Jt3*?????D??????\??5O{???0h??/??c?^Z?c??????!???? ??i??????V?@?? &?????X??????????vJ?????D?v???F???/??W?C?n???t\h? ?u????ia??Z?Q:?????L\I ?SP7?????M? ???? ,??=E?!N2?? A??????`?Ta???P86pX?:????a???E<_L0F???`x??P ?RuA3???Q?!?g:?bF????=??U??q!?/Z?B??Ok;p*?[??&?L[???=?(???+?z?*X???Xlc? +-E?S????n??n+?C?;BlZ?0?x?tUk??2?E0?Cu?q??`???r6+iD?????????R????N? 1????|J9"??Z?l???/?Dj?uc?(??'? ??5K????*S??LL???(7X???$b ?A?u,X??Xs??|!X????JQ???gw?M5aS???;{?H???iyW???o?ItiXQ??????/????Q?m7? *?f?????B\??d?jK? 1*sA???a?h??c????M?4?g?e???6??6?d?u V????m,?????4????M???@???(???R?h???vR???Le???????oY???]?x??O??{????c~??I?e???ud????g??US?8????? ????_?L??p????l??e??D??Y6 ??Z ????w?v??AbGEwj???1?&??i?$?&????"????????]}N&??????n/??~x7Y????iNu ??Y???s3?$???"^o???~<;8?????,??>'???(??tt?1r%!_x??3M|?`?(?y??E?? w?Y|?V?=?=Z5?X:???????~o???6s???3D?? ???[ ??4??));g+??i??$/????]?!?r???U?I?8?>J'9??g?J??iW -Kc6??M????F?? ?????FU2????2?? ??????=yL?r??s??-? ???7?' ??? >@????AY9?>vU7A?u?"5???_??q???????!?h??P??f!(?}?5J???u???_O??r????.?W?????? ?}????m??# l?X???Z?~??????D?????????n?,?`???J???9%?O `??NM???dj???4R????(M???Y-P?$?y????^6l1(?!??n?7+?>qo ?5| 8??(Y??'?J?4-?p??vvw??Z??@b+4??![0??.h?l9??7??3??z????R?u$?1EZn???c&???????.?t?L?(?$}!?{??w????/?j?wA? ?_8{??S?z_? ?q?V????????q+`??x>?Hq?c??Tb?????N?9J|N??;?(???g??h\??? ???Y???|?????????Qi???w???MD)0???A??+???? ????????Bm???J??4?X??????y/m??7[gv?l^?/7!???? O  @?FM???^R;)??9?%c/D?j!c?????d?????@g??2?Va'?#f? ????,?.Oo|??E??????Ki?0??D[]k4? d?JT???0^&?????,??????,?+????N??X???~?????\~?????0?t?|??V Q??Z???W??2?{??=?J9??AR???"rC? '????????^)?:?{k?????_6]_? ???gI??5? &??CQ?w??Q??? ??B???yi!??jD?2R?'Hf?u?@=B????iusE?'?C???&9??3???[?{\??nX????EP???A???+??=*Z?i??????~Zh?`????.?`?????????r???+?I?????7??j?tb?\6?"C+?4W??wu?F/??gh??&?b2???h?6q?3J? 9t?L?&?bZ? ??Hab?6;?,$?u?hl&?rF`? k??V??)?? gRL?q=??WBS at r}??/??????????\E?hd???j?o????O???????yV<^ ??{??EM4?? ?????^5????L?d%?YG&?h?@?!?FVw~>nP?Y???e??U?j?????}?U?4?$_?:TM?5??????-??I????-?L+?]???7JWQ?*???7???fC5??r????R`?7?C??@?????O??????? ^?-T_? ?F?l?$]???cF?r?PbP??d????5??+?6M ??~?????T?=~??0LEf?D?,T????A??????_?;-??WR?6?"?R???V??? O/?? ? ?HN?4s??[Rg?A9??6mH %??"??j??-L{??t?8?3 ?k?$?kM@U???~? q??y7i??T??H???42??R???s+?n? ??R>??a? ???H~?U????[t??.?+???????:???{???{??????????c?O;Go?E??P?j??,;?5l?????d?????@I9R??0?Rv?~?BS/??i??:%?|?b????vV)@???????h??8?? ?o?1B?m??????B Q?d????????:?J+ZJ.h?>$y? ??yfT-k(F??T>????p?V?{?s????????1????"??????????]WV??)P????i?????[??*???j^??/?KM?,:]??\D?h?%YkG???j?"??_ at dvd?~BgA ??B?+?x?)EQ?( ?HgUkt??iV??*?Gt???Z??)???8?y?,?R??"??_?Kg p?8E*? ???{S?1J???_????T1?L?v?????Z8?_?S?T??????? ?6d???????????{?K?~??|??2;??'??d}s??S???\*u????;_??'???n?????F??gB???#&?es? i%?z?h5?d?4j2(??*??X?l.?/:?,>'Csr???? W(??? W??A??ou???w r;?\)Dyp???????.????(???eR?X????a?l???\?6w?iA>????A????_?{?4???V_???7"?DEMyM+?S?nh??????Ii???? 0-??e?Wz?l?G3??0-P??'?~????R?b?3Pv?xV???0??vG??O???7???Vo????e???]?M?????3 ?o`??3?????ap??,??3?h?????r??B??%?Rn?6?,?????t??!?l??????d?PbWA+??|?RX?V4?????Z???G,?^5??H?-?py?????fp??.+???@U????<4m6mfe%?&] ????=j???O{??-c?????M5?/??i?n??n ??U??,nE5????/??D X?????>???~??^?6???Y?,AX?t??c?~c?s?? ??:?w??|-????= ?n??VkH ???s?2[?L??? ?? c?????T?s?????`P}8?Y??c7???>x:????G$?1T?Ne???Y??????m???????'?x^ ?sved*`h~&?z??t$??F??( .?\16{?A?"??????-u??????9U?x??.???z?\?E?~???????}x?* ??\???!?=B??d????f?PDNt?NO ???]e?)?P? w???/?i?#?ti0_r?HF?4w??%????@L ?u?Vn??N+a??0??S$,?G?Rr ?????-$3 ????9T$?)??;????]?_?xh?ux3????????????? ?5L??=6f^?0????h?T?+???j?8?Sb???> ?? |yU9???i??c???LL??P ?J?;z?=<4|??w??)??iW??(,??t??!<@????'>\??h?M???J?v??????EY??4??u/l.?Z#s@??9?$Tz???:?{2`V?? E?P?(Iu?? ?|?n???-b??\ B6-?28?=]????,X??a1Q?B?$}??????f?PO????(e-??B 7?u????6?1???#CSEJ]}?A~??7?????????@k-|@_?? kx,?B??????E??o_=C.??i????D?@?Cy??$?PF?)_@??Xmq??{U~?n??v9 ?4|??u????????*???Xf??R????? ??`Nz?l?i^?Jc????n??T?a?T&?!--???w??o???< =?$??Gh.-*??R?S$a?FLb???P?^}?-???8?;??O?pk???L???$x\'?z? ??',p:??????(i?F?????3???N???(7'?(??vU6p????"??_?:?}?PMB??]p?*^??X???] (?~???E? ~*???2?n=?[?C??n??y ?x??x?7??VZh????G??B?xA???4]Ga??_?????u,g>?&3?7?????r??99?????{????r??????d>?Z%??_?p?:???_A??????m 2???????*U??~Fk6l??B???V??U???T?????#? ??S?P????C6???DP.T [?m|??? ??-?Gm5??/~??? ?Y?5{??(??{I?? ?k????*M???XQ???&??1??i}???8??????h?/>?? ?a???L??!e????g?????????????E???gk?i?cg2??D??????'??????Gie?;??Tx?j?b???S?j%????s?M??????pr1M?g~=??|?? ???3|?Y?b?UwvL+??=???`d??.??????B????????7? ????'??j?zs?fRdS??E?? ??y[?g?Le?9??~3^??r?K??I??t\#? ?????S????????P??j?T???F????SZ%?????{7<}?L??????*?3????e?K??mp?????A?81?@??;?Po??? ?t?3??m?s? ??&??}???E?P?%???[(E?*?SH???VH F??m@??J?? w J?Mg^l??.9??jo???Z?n??1?ZZ??ee??G?mMOE???5I}M?q??????P??u?j'?#?S?-zZ?W?n??????au??3$'??]tA5P?k?+??HA??Ym?))??h?????1?????? ^s?p??G? ?"/j?d???????/?Wd??$B?? ;????F?_?l????Q???w 1?????????q? ?*??7?-? #}?J?[~in\??0?]???V'?vs?_??a49?KJ9?? ??M~??{?e?J???q?$??{????l/?)?sj?-8??8_???i?#?Pa?]@?A????t??,?/????#?"p?@]????)?{a.??a?G S\X at f???#??5wrf??y71#?"???????????! @?f???t????n?9?8?hQ+8??M?.?????89???%:4??1-9$?6?$?????^??V)??[VD??^?a????.B?8??6OA?H?P????1y??U??.0? y? ??0???1]V?R`???mP??&?H@?eQM?M?U/?YKg??P?6'd??_??????2?? .?1TB?"??U=??qc@??????????Q0??x(?V????vw??s-???z?9!IC$~f??a???W %??/X?q??|D??????????< ???< 7??,?`g??????s????*??( 6??,M????t8?f?t????lkb~??%??M>0?p?C????J1??j??&D|?9??6????(HK?``?y`?9???j9$?s????????t?|?TPE!??yAZ ?Mi???]C??k???3??p??B?w?? "? ?&??d???????????% ??? c?(?uL\ &??? ??f????!?????DN>a?O?;?5}m?N#OF? M?ED?????????!??? ?????????f???;?H#!?t?H????G????Z?l??.?r?%??0??S?? ?s$?{FA??86??z?O?~?i2?B2^???D? ju?*??b& >$?????/?)??:???@?EI??????????uD\?mNC??4???4????wdw?b'@b???0@|??< ???????H4??5??t29J?G?Y??,!3?b2?D? ??5yV???.?az? ??*????%$??o?????98?&2????????JyI?g??????Q?Gs?0&??t,FJ??0n?D????b?d??d???J|Gb?H????R??8?+???csA???w???K))???????az y????????,Hy??i???7$????J????????/????????:u?y??^?PV??????|'D?dtb$?????f?d????Juo?:?? 4?? L???1*?R? ?,???Dq f????c?1%??2H>???XC?i*??O?Y?6? "?m??P ?? \????????: ???? ???H?v}??rfR?6a&?????X??!q(??U???Rs?]? !????m???b??9?????L?Z?v??T?3'r?N???M?&g#e b ????(b?%?~?z?.? O????J??8m'&?*y???Y??_??b?.# ???9?o????8??H??????? 9??%S?? ?? ?R?f?????wU?6?q@??? b?Y?????i??????j?P???'???i??dl6?B?g?e Mi??`n?!??x?r>?+????j????}??k?Z?sz-?????9?????q?`hg?}??4??????4??*????3????i?(???>????"y??`?MK?C???Iu\B?,4,??????b???????????????]????~??t_|o~?j???/??,??u???XS?S??oS??H??B???? e????|w??)9v?}L?CNeK>?????*^?x?z???????????%]CC ???y???e??*_?604Ls\???g?)????2?? ???v=L?????Yw?Q8l?8??g6\F??@???$??F?0>`???,:?FN?"??f?/??a???B????6Z#D??.??? ?O????? ??(\??!8???]?o?????v????(???9?i??pk???gOI??0????SS??8??n?1?o????9????W;G{?^/~?o?[?G;??v???w???n'?? ??? ?c??[??????=~??mc ?@"?]??3??kf?zR??T>??1???????Hg?>? ??B??!?F???Z??Q? ?????3??????????4\?#\??6c9@??~)M3M {?'?p{????.??K@?????Z at C;??3>? -???????V+??HfQ??i:?"?aPe0???~?*?? ?!???????M8?b'?k??O @S???e?Z???????? n?VB??Hb?]?K???3o?$c????B??^?.s??A?C p??#s?L? b:?X4=J?????6?-?c?#/N???w?>?i????^KG?????+?,4H/??????PK??????|??2B???v?????L[???Coy?O???> %??????????[;?*??` ?bra?q?s2?:T&??&?aJ???sp??8>?|???v:????1 (?,??2L/q?.!?56??h??$?Q??.???:??%4?~?H??/??4?I??0?? ?? S?F???GsF???s?f? ?D????YX?????G2?;;?????MLx? ?^i???|??????fN^??Av#k???99???hJ??4??? f:;>????e??l?S?3?i?o?:?n???[m?g?DkL??H??N%??C???)???_M G???l?e??]s.?02???@t"????d????????8?c???I????h???/?\????7:O???^[?\[?:???y????????? 3?W)?!?^?????%?q???~A??U??? ?GN???n( T?a???} ??????D?????#|?{?>?}r??t??NG?? G6L?pp????YC??u???B^ n?a>?z???[$???????I ???{????v[???Fx?g?-?S????yo?????A???z??F?-?0?#???f???K??/?A?????Cf>??/???.Ew?????/?}????9t??:2?LH~I?? /?d.A.-K????&mw??V j???{*P,q?J?.???5??????3r/?????X???J#p??W?^kZ?B?G? r??K 5=?%H?T=ZV?f??? ???.*?C? ?A?;`??? ^d?? ??#?,?;u?0>$g,?????Y???id???^?????p^H?1?o?????g2??Ry?\3?8?H?iD E?k?l-?? ???V??&99?????H?=q ?_?gI?H*????n6?0c? ???`4T?&??C???W???Z??9??Mi?????~?>??df???q2??l_?M????L6??(+T}?D??xR??????"???B?b?E????9???????\??f??? ?!???E?6????5????\?{?#=??g?_[s?)4?????+=??????3???3%???B8?F?g?W~dF??(f???zo???Kc?"3?>??l?????t?|;q???????T? }??f?^??????0D 32??+xM ?A? ?L? ???Tb??\4?i??`d????e1????+2??????`?? ??????{;xS ?=Z ?A? ?M??@D?F???/!$?}??$p?B%N?????????Xi??!???"???R??[????)???]q????P??- ?????)??[???V?N?hGA???????lOco)??Kx4?CD??0??a?????M?}?Fy ?.???\9D?l?W???>>?h?A6EER??_A%g??r A?!?#????RCi?????P??!1?*??z??FO?????????+??W???? Zd??E?a???\?7??[?j}R%?dV??\W ?,??? ^?)?v????????N??,NK?f??-D??F???????Kk??R??(?L??k??Ayv? gi[????$Q???DN?&?????`?KQ8??NC^Dz?4L???????L/?s!?&?3????%????-?xz???v??4??.o}?4??Fn??????h?d)?????_=?e?D??(A??????f??CA?TZ?????n ?3aS_????d ?F,\N?k?|?R??????+???5b??zah97X??e????^I???????w?????*???d?eV???ZFV?IV.RU|N?=g43W?7S????" G?GT?Z???2t?????(????Q]??h??-,i+?f3?????Er?o?pR= r5k???|???X???H????4???g.????e at h_Ku?1"???^??'6?[+Nb*??x???[??g Y?x?+?w}a???c?`[?? J?????x?G ?ln???? A?Ak?Lk^c?? ?n OH???H??VAmp7k$]???)?;?q ???? ??:kk?x?%3?7 ???se#N2??3????J?? 5"?C???N???G?l[Z?E/\SZ;??lO9E+P\?F?qR8?-a??? ???dj6?DL?tk??3K?V???+??;D?S??Z???hPH????$w]?A?,??FI?AuK? ??????i3$I?zj?? Aa?? ????d?j? Hd??a-????q?????6 ????????????FF&???80?j^?I?????.s?( ??? ??g?K&??]??[?????,????e?O?!A?:k???egd???W(?D???l?k? j?j*??U???o?bD-?k????,G??*?????dZ? ?l?^??Cs???SB?2???????fFh??R??4'?{p???????N?????v2??4???? '??H?n??F*????x??B%V?Y 73?1???d?*$UR??d???5)???? @?o??G????.R?xV??y??????s?:'??"?W?????^?s2????O????3r??1???o:??????Y?P?v?ez?%~??P??? ???oS?I/???????(`y}??hi??? ??t>?t??C? ?+??a????n??? ?F???[LCo???o??[/vvw?:??W;G{?^O;x?H?n????????w?[?????????????sF\?)? ??`?;PWX?? ?B? ????????:????xU?Q???S0?~??fNFO\?L?uZd?q?k?P? ??o?????????MEW ??$??S u?>At??7?Z?????_???7}?vp7?A??f?fw?~4isQU?????i???? ?/W??H???????#???]?????X+ ??o?u???OT?????|???????^?X|??~??Y????????y???????^?pk7>x?bwg;6????u#~ $/????????m???QTR?7~??????Q?d5#??n?|???C??pDq??6?a=3?R?*?5 ??m?n?-PD???*?Z??=?3??\u???o??^?){n??RiI\?9%??Z?????X< ?9a??R1!}???rF^\??.? r?C%r????2dB???? v/a??c??5?h0?>E8c -?nv?Jc 3?`??J??0&i??? ?u???CT???7bfrA??? C;??8??6G???#S?R9eO??=???????6,Y,??E????S H6?2?-???W????P?Tc7c??(??1!4?xu????j?b, B?.??? %????t?x^?]Q,??7??a?$D?B????$*?:????jH????d??J? ?O&?(?BQd??K?$ ?\{B??2?C?2?hT???J"?J?_BQ?????]?????x? ?3 ???9~?4M%??b??4|?PGf??_?Z?Aq?:|??n???????????Af?Q rCv?D$??`?-r?]? 6???3??Q???.????I?4&D???8?U?????????}w3??Ik?!??,z??z?????A5G? ?%(?>? ? ???h$?^?6H?-?1[????_??V??a???Bk??????0j? c???Q??%|?*?4?H?E?S??l?`??6?????/?????q?????7???y???K??h???!???A[??GK$??%j?O}M?Q??=qp cT??VD?`?r9N?k??BtG???k?? A???9??5 ???4???0F?????+? U7????]3?_s ?F??????[???Ly? B?w???u? Y,?s??)??$???N???9?nlB?oO.?'??Km?A??(@????&?*RY?i?|{?=|????^???{/w??b/~??j??_???w^????????;?v?Q????.9V5????+?B??1H~@%?<=!9z?? ???3 h?\?dK?'????j?Pf`??E?W?u???hb???#W????[?????UI??T`?S??E?h???7?i?JA???%?|?N? ????B???!<~6L?Z?YKrB?9??4??(?b???y??j ?zGCs4??w7?(AI>p:C ??5??\?t,?IB?$?? ?LB???B(?? ??#??|??B????Hc???????mH???Q??=y%?du? ??X??? &????????@/?*j?dj%"h???8??2???t k??xq-?c?W =???,?H;,3 ;9<????Wpv&?? ??#?y??]h?|`?M?C???B]7??d?e?'?'?-w??S???R??]?3 ?W???????W??^|6??%o3 8???*!0????Rc???ZM?(g[?EN.K? ?aOT?(#Q?|???"? ?'Q\ ??Of??$?2,+2??%?D'v q^q+W????Y??`???#?KN(??gK??gnn6;?K?W Ih???k29k?????F??f??94L?0??dEp?D?;|??7???6T%????`????{j?$?? ? ?Z???v*???9/l]#?($?5M??? "@ZM??L??Qz)a?b0??????????-^????&h????K??bI?m!9???K?}?????D?*??ONQ?x=??a?eA???p:?`???i-%S????Y????aa??Y????3K?y?????d,X??\2Y?x^Wi???i ?M ??-??P??=?G???H?[? ???????X?|??Z{?P^? B4??` ???{?=h^?????D]~????B",u%b???p?% ?)??M????NN? ????j??me??QBU3???m?D?%???90???)? Ws?R??z=6???????}?t??4??Q???? ?%[/z??F????????$??$??Y??Kw*???]=? ?!??`?w@ ?DemG??=???/??p????????z??Jsx?????"?5ur??&x/?#|?!???r{f0??ng??U??*I??B???? @?3 ???????t*VD???kA+?r????)~???A??5-y????????l?-??Os?+?-?????YX*??2???p???B??.1K???M>m; ???3??l10 P ?????X???g???@|#Y? ,x??!?H???WX??~????M?? ?,}?sD^ ?6?q?L?Go??`?G?l? ???a??????P,[?tem?R?^??w?w??_??????v??'>??|xbk?+?E?q"?I?G??8b??Z??*Gd?Y?9???b;p[B????????{=?q???`=???C00mM?????R?mH??d:?!?H? }0???]X??1,???JC?W[c????2?z???r?A???"?? ?EL??-??????? ?Q?b?P 5? ???2?w+??????[?3???G?#???????>c&??L?????k? ?$?2>k?P?*??0?????QRY?~9?????B?,FK????T???;??,WZ*IDm?q??2??% ?nztz?6?Z=M~?,LH? WE??????PQi??%??E)? ?]K?.???;????N??#??a(;Y????? WyQjD?1??n?e:1s?r?~??d??"Ka at r?r?RY??e??e?????:p????U?y8a}O??l?Ue? ??I??q+uk??R[???[???????N?????t?NO?o?????:N?cOgS?????d?Z??Oxkdn7T???!?:?5?????F???? ????"}J%?J??jh?^?Z L?u*p?\???????z??~???S?q/c?b????,??t ??t???'HWR??C?q 1?i??? E? Q4?}?2??R&??`?@??!7??A??P????f? ??????.P3t8???????3$W ??(\?=?q!?c??) ??? ?h?cG???N6?4? ??NvV?0 X??B?????;F???"??>6??u?C?y????y1%?1F?|?k%??Y6???????P#? ?@\?J?R?1>%?r|?$p?B??Fj??9?:?>P?J??'???6$??????ba???=Q2e??(?IO#??E?*??u at w?????]?+?Bm???Ewp}??=?x????+????!O??p`S 1v??I??-|?i\?_f\E?ik???`?p?????^?5'VQ??,?J???L????>????j3?nJ?X???[,VR?RlM???????[?_r???????r%8?????OO?~?JT{ey??4h???5ch?????|K? ?j?SQ?l?W? {???>??????E??.Z? ??-q????[?????;q????7???9!???;?O?Y???Hx????mnJ?K????$, }Nc????u9? ??,?2???b?????? ??K.???????x??u{???Y??}@?t??????7????CN???????}??J?4???????~?{???~????]??@???G??h"&????x?w?u???????????o?3???sh??????e???E??#Q7?u???*??7???@N?A????9? ?s???9?T=f????u{c???%Ovsc,V:\?^?UYy)??*-b??.3mnl<}?~???\Wh?{K??)|?????@Z??P?J?`{?????a?2?e???/??e3?? ?G?0?Vy??[b?G?????&z-?e?????c???)L*?h??c????F-?_????,7?}???r ???(?d?c????2?vdZ?? u1?l?\???E[A?N?)???????v?)Y?? ?J?V???????%?)? ??|J(??kB[????6? ???Ht)Q%c????S?.????5???O????~??????????b????G?O?????????w??????D|g]? J?-qo?p?Y.?|??pa?????k?%X???#^?q?bH???t?~???J4^?_{?e3???MR/?b (M???|?R18b?? W?^??l:p^????????Vf?S??I????!M??? >J?D?T??K??*??s?m?ni??]?]3j???)I?Z?? ? ?E??DV?O???U-???k2N?U ????U?k!E??"??K-??M?1??p'?!?????om?;?ZBk??$ak?G?vI?Z#?'??lFE???? ??/R???2n? u?.????6????E7v?l#???w?f??j!9??`LqCl?R?????<????+@%?B}rG??pM???t????Or?&f???5?~X?F??{Yd????)????O???? ??Z?H>Q\A r????yy??????)??? IP??????II? L?6??H???????2??)u,X??[g2??????V4+??dE?&???R.6Ff??OVs??-o?K.|??9?'????MO V??A{U??5D???? ?=????JD?m?;9^n3X?QG/?CP?(?H???0?#????;????p?G?????g/j5n3j?k? gY?|Ly??(@K?9&????I$"gc??p??0????/h?H?_?_1J??:?|G?e?6???q1Hh-i?d ?????????????{/????????????0GH?D;????oxsO???Z??????Y? ???X1??d p??\??&?d??g12X?9V?!V"'??\????z?s2?ve?<]?7?-<6r?T????y?ha??? C (?#???Q]??x~,?F?o`?X%?y+??h????=?=??b????G???'~u?f?Si?*?w\???l{ ??B*q??????????K H???1%??9L????:q(??}??GK????4k#????c{N?e????;?;*n?4Y7A^??+??s?/-X>?Ql????8?my???????LHt?w9?}?[?t[?u??????V;????mLX?Z2Q1?%G?S?=?ViR?r?%&??h?k?q?F(??[j??@???????=??(??2?i?oD]\t???Q??(?$J?)`???H#??V??QJ??t???3yv?k?[z\x++??|?????.?l??s??????-:????_??c??;??e??????y?????????????/Dt\6_??????8f?"O???2nT.??>?d?C}e??^?&EzhQ "?;?D)k??s???l'?D?u"?P???8h ?D?Nt?*z????m??3? -?J???m???J???5???T=??TA???w? ????+?5???4??#?? ???)7?P?s???Sl7?|h? ?B????Y?l?6+??????9???]??/??T4EH?????t???o?9*?b?e:??A?C???=?[?=??@?H???gS*???C`????LI??\:|?l?*8HH???Gt?_)??9?o$???R ?^x??m???'Q?5??~[????? ??n?4???2l0B?F??G?A6?RD.,#LB-??? ?/? ?Q?~??=n]??a????R????H?F';?}<,????#gqw??O??:????4*?1????[`? ?)?Q??????N?IK$???,Mi?P?-? ???6,?, =V???[??OT e?H??b R?????G???/j?ShF?bwzq?J"P?X?(?"??A_ G?????????C2+?7????| ?-???o7???#???G?;?'??#??????? ??4^o?T?????L????A ?=???A??????7????vV7T??~z?A???I?^??F!P??y&2I?J?v.??$????2?dy|?1S??? ???# ?(_?? y8;??@-1??t{ I???9I?'??^UF??<g???r|???n??=???2??-?s??????s???s????[???w????y???|k?? -??8???6M62?G???A??I?2'??R?,?&aX???? ????B?\????f?????????$??n?j????~L9?v?_`?z~??D??(????*?1?8?C?????????d??????/X`n?os???j???|?H?c?y??Q &r???'??s?? ???h?b?&T?U?Q??M+ ?????2^v2???U#?s?F 0?-??Cd+:??AV/??F$9EQ+?? ??N??E)P??M??0?tI\?d?d?_5???S?Y9???.?f?T?O?? ???'?W?????\Z`??BQ?}s[;W??r?0e?o#?>???A:???6XI?N???~D&D?E??=?jTs?w????3???E????N?.`&??wA3??UY????F??Q???La????>T???!:?92s ?<9=tI=?-????????Q??jk?=s????????y?c$????3??z????J??Q=6??>OD??6?G5tE?cl??d?? ???$)N u?i??1?8????R?????"?????[M9I??fOS ?\4?V?VofUoe??s??s>?j;s??E5?F???Zi??? u?x????????P??l?Sh-?A??? T??0^????????0o.P??? ???;Fh$+?$?????? V?x??S????: ?-???7?|? U<,1???s?/1f??4?G????Zy?????,?F?wZr???`????Y?l?>?3l-S ??? Mw???,a?e?p$?L?D??g(a?&w?C5u?i?*?????=??+??\ ?N??? u?Js?Dw?^?&kA????e??J?F?MU?2?[`6q}??1P3?w?a????+??-?X??.s?aD?????*?H K????n????j????n??r??????@:(G?b?????????%YZ?7???D8??},\????wi?; t?6?3??g1??wo)???[z?????????6?04?Vw%/?VO47D?l5??j?~??X?(?Kf???Z9???)? ?#&"]H?P?G??????.?U?h???D????4???4?'o??K????K?6@??????w :Y??r??%??%-Y??3??-? hw @?Bj^???n; &~?? E?)E?? {??s??Q?e ?????-??J?_5??Q?i:?a?????F!)SE[77??of????rgK?*O?DoY??????wF ~??M??Y????:????????R??8ye??d?/YY??z???|?r0c???? ??????E????_k??????=?)sq?*XyZ5???j??????% ?,? ?g??c???r??QrYya5??i???"??v ??F5???E%?AT?b?E??{?)iX???J ?/5??05%?di???X?NpV\??M$3???[N??.??? ?F????J&????\#~???he?/???J? ??\?$????>lm?! Yjy???*^v?\S?x}???????c$%?????c?" ????tR???[ec?%sT??S??=u????*?-}j????>,f| T?k?(???,???}P???-v+?v???? ?iN?yud??iE? :~R^?R?v?j?*?H l?wi??????s?+n?K? ??????Y?? ???3?>?o[n?`?s8 z?Ue????/???&?W??bT?x????????g??:|????????{?M*???[????l??????o????6???X??A?Tt3?h ??jc-N4mv? ?f?????RV??v?X??2{???2g?m????&???????~iB?????t???v??????[???]??}??????? ?Q`#?' ?P%GgQ?9??&??:2????K)???I??( 54?iJ?,vS??.????|?eb?&??l?? ????qw????v?m?? ?vE ?????AW???b4]I|(??} J?l??x??z(?C??????U?b$?:??-!#m+_sM>?/T?`R???~???????TZ??0+??????????ru???m5?=?N???di?J??,V?g??U?%??????*S ?RCk0 :?Q?R?+?&?gw%!???$?N???Ih???>???NVr??Y?{Q???t? %}??N?????y????(?Y??49 /u?c??#??=da?,?? ?s????B? S?=E??Qv???^?;{n? ?v?e 8(???6??0??T@??)??r/?%???8 D?i?"b#A??w??`'??Bf?o@?x?[?OfY????B7?&?~|p?a???Lgx8?GQ?:????b???g???A?;>?/~??O???#?or9?`G??lp ???,??????5??????-X??k?j?#??>? ?? /-??6??????}?P<{?3??D?E8W|3?B?]#?Eo??b??Z-?<v??2-?_@ &?>?E???????d?9 ?????>f.??V?X.?????H$??n?3??????h:?j?????d?s3?0??=<_?mn?5??????h??*????G?s? ??!?D???????{??3??/?????c???????I?i??O???? N)?S????a?????U????Y??R??L0W>`U??!.M????D?x?="?U?d?R>?? ~?V???$?,?d??yX|?/?Q? 2????,L?-}k ?h'???r?#M??????u??m?7????TA?t??s?s??0uQ?nY?H?Q?a????M}wIm?hd??{?????????pN??[? ???o????l@???9Nb????)c? 9?`?[~?Z?v3??????^?LU??8=?+??CW?W?; n`9r?????6-{?%#????7&}?>5@?)??m?Z?E??? ?|}???BF??jxmo????BF]???^?? ?Y?7?{}??8D??%??"??2??pn??0 4?iB%U????T?H*Bv?CD?K$?}??KM?? >?$?8?d??e?? Wr+????!2e?d??c?ln?*;& X6YD>??63??????? ??????Qy??ZY3t??X???G??/????OVW??????????????O????h}?????l???U?y??hZ?Y?????3?sX???x?+??)? ????????c?L{?^? ?`?*g?(?? ?V+??'??? M0;??????V? ??mx??%?????/????X?BiY?? ?WM`?9??=7???l???kTyj???YsPU??F???J `\??U??2^#??8@???Q)V?????Y?Z????O0? ?[????R?zV????P?S ry?h N??????????O?~???????@?: ?P?/???2?V??~??p?b?qRWSS?j at 4qQ?????????zP8?c}k?c?????vj?5?df?@?g???o?C?P???+????; ?M?dmx3F???`??d??"7??7??????P?!??EA??_???H?t??cx????9w.??i_???D?-?62??????C?????????jOv????;?E?PowX?D?????0? Y?q?e???!DU?s? 7????[yf?? ???@?#?s?jj?*KvH??-??B{{?31??o??Y???}?5L_? ?l('??W.? 0;?7?}W=??w$???4????3??B3??&1??"ClH>_P??7? ??? W????TR+??X-?,?:????G?G?tjT? ??7?,^2?(??^?????R??S?`???2vt?@?Z???3 ?9? ?-????F??h????? {=?N?E??y*??B??Z?SP?Ji??v^??e??? ?W??mK?>???????5??Y?g??x\?/?E??=O???[eU??B_?0?Zy;'????!??u? @vF???>?_ ?? ??F ??.*??f??m??5?r)w?L?7???L? ?U[{J=??{????1??Xi???:IH_??????p\???Mi}?????7??v?_YE?X?'????`SM?R?gpj?[F)???g?n?k?k????K???)?1O?!? ~??S ???8FH#?K??Rm?#?>??Kz? ???? ?M????|? _a??|?!u??? 4uy<???V{W??,o-?H?N??? ???Ul??h???-?????!z{??Q?d,?K????ec?????I=????_)E?`Q+Z????W,0?? ??e??^lL???? ???j????????Y+7??j????z??$Hg???5 i???'qC?5????Li?JQ??Q5_???/??^e?-?Z ???QT?a? oj?| )??O????2s???z6?j?? ????@\&?l??z?w???>???h?u??????whc???8u???^tb?i?&?\$????)??Y11?-?_?+??j???>?? ?O?A???*?????~R?(?9?????@J>?G???????s?9?Iio???l |ta2???&^6??9???$S??O???? ???l??]T???m???{!\L?gZ?=?Vz2k"%???????/?? D????'e?;j^???????????????Z?Z ?O?A???0?? ??Q???/??y?O??? ?K??JLxu??3?n??z????????F??kQ?}? ;?KpP9?TZ??9?????????}??b I"???m+iN???????[??A)??f?0?pX??$???O:? *???|?+X?M& /?x??CF???P$[????J???sA???P????as6 ?Lk??1?????Hc????{??? ????`=?????? ??"{U?FfJ?9?!P;2?m51?????X?{?a?P3vF?s9?"??`X??`!??4O4?*.??h c??.p:ub??e???e-??;,?r?NRf?A[? ?c??H??3^??L??c?kr???g* XI|????L???N??W???5???}>?pvQtf??/A?;???d?uQ=5???@?? -???0??G3A???&?"eQ??w????|???????\.?NU? ?RD??A?\??b?n??S?71 #i ???? ???Q?E??` ?? +???U\??M?L?!??o??Q?X.(m???R????s??????5Q9?%^VE?????v??]??lk,] \?Q???????HN?D???W8????m?CZ???????EoP?j?h????A?? ?j???`?=????m-???8????)???????H `???z?02,?!?q??HT?{U$?8?W?6G??g?~UJ??O???T?????? ???#@?????4??v??K0X?p(?????????k5?|o??n???h+??J-??y?????,6c)?"2`?` ???~??N????m?x(??i????2|?????a.??????I?????t? 1,?????^?"?Q??V????Y?????a?T????3?fEE???+??N?pT?tGv.?~?!t??#?T????\????E$a?@????9???,y?C??????+?+Wd??A??P??? 4??5G?R??9g?R????lqK?? ??\EN??,M????Y}?9?????????m?6_R??Hu.??D????cV?jg$?v=UO??r???}W?zU??R?ZU*O?*j?B?????%X?9b?S???I??^???2??g?w"?,??I??X???? nj?q?w?zFv??/?V?s???F???r??l??TF?#?&?e??????A?E:o???#?%?Rs?#K(m??a??S?s??z??NZ2?y5??d??j???3??A?????+?6?m?Jv??v?l? ?X??Cj??W"?r?r,:9>?#iM?xhR j=???~??#0K??.+?J??9?j^X???%??x?1@%??|?eu>?y?p??R>` S?????ii????d?Y??P=?,????B???1?????e??n\v?Y??CG??z<??[tie_l ??[??7??T=?g??g??6????[??!w?????????B0?_???)?????l>????<0+P??G????Qb/???"??'????{?{_?? I?????????;v?N= ?P`*q???????0????y?;d{@?h??B ?????'????c'y?6???????X??2'?????.??@?.?]l+???S4?tb????c?(?(?~?????A????;??C????g5???? *?????`?#6?8V4???|`t?|????]??@O???LT?(????(V7??$Q ????J'??V#?g?lE2?????@I0????X9??????????????????B(< ??~7w:8?? X?.??q:G?o C????K??t??4 l`&?????v?lL(J???3pE(pV5h?=??y?! ?#??V^1???Q?M??????"??}?(Ghm @]D ?P ?@7nB?QFi??KA??R?????????g a??? ?on???gi?*????g}??D?$a,?1??<"G0 ^??#???=V E?;%+?z'?~??~?q?DtP???r ??+?9??V???W??$L?:-?ly??mJpSY?(?m?[ \?KJd??.?WWLM?>0?Tt???????????r?w?"hK$I?????p|/?@|??iv??9-?Y??i?oq???? v?go????????M,????E'??3?5\???6^7???$`?/= ???^&?? ^?? {??o????p ??????Z??H????=:{??6???i?????K?>]??????+?????n6?[[G??=?????????1}?{Y?5??D??>??1???o=;?!V]?V-w?*??t??[????????mz?????h?$???%Ik??P?F??_ ????sHx??? ???]??J???j????.???|?????{????5?n`|??????????? 3????eIDK0V?%?x??r???JtQJw?P H t??7*?????? ????(?" ??W?:?C`????????5uh&o?ri? y????`???*S??q?g????i??K=???:? k?w??d????r?B??b???i9%??-?1 ?v 4??X) ???/wv?^0jU?j4??B?;xs,??K???:)?_????"?]o?E)?~?p??l?o?H??bq??EU?S???[?R?..zx? ?????X}6xv?????????-^7??}??m/???g??????GXf?AW_F;?g???????wh?Je???c??Q???F??7z?\?? ?@3M?r??f?C????k-?9?M??la????_????????+?Y**????`?Y?Pc?|Q???????\???f<}??M?]g*?? ??g?g?wU???z???$??]?xK?@?????C8?7??? ??_?????B??????u?e#)?"?I?2h????????!??c??E% ?=?\??7!8^w.???$?a}????fT??hn-???c:!?Q??^a=J??H?.??v}?~?? ?????F?S???@?lXH)4G???)?dYD??2 ?YP????r?X?}??"????.{?[???[??N?^*+ J"+???D?d??;?#???K?r???J rn?-M?p(;+%?? f??D??1???? Ca????V???Q???z????K?G?)?oU?Gw?{- ?:????( ??`0R?"~???y6??I=?_??????????;?'yFS????X$B???Hu???Z?{B? ci?D=???H??XU?????I=?_?c? ?7?y?e?? ?[a7??}?j???????$??y?3?\??w????? F????y?Cp?b?? m?!EubCj????A7?= ??,c??????E#???N??+4?,???qc??|? C???? ???=???3????~??H"G6m?tv??????1??EV??? ~??y??L|???9???L????P??FrF???9K?? Z?????eJSE???M????2{?AsL??n%6??`??????`x?>????aq4???H2TQ?D??bLkX???BzD?^??]l??i:?"g??i?^?ES???>???(?"H??^Y??Us?2M1????q?Q??#([??&!?u?6??7???[x???{??q? G 8h??No `?????+????W?d@??k"?q?(?MR9????))???????WVFNH?{q??h????????tn??Yo:???H'??9RV?M?|?|it??NM?K9~??????t;?0?h^???????<?w?32X?b??KD?@?8 ?a Nt&??n?S??N??[?q[???=???,???2T ?I?[??f?q?l?u?y?9??Hg0/?;?P:??????)|??:??. ???}?????t???;/6??i?p??9?????a???????`?\?_Uf-?/f??Wl}s?`???F????????I?o{????>:?X!_?E??;?/??z????M??M??????G???M?A???????y???F?4N???[?????7?????NNN?'?+???????y1?{??{???4~?q-v??|9??;_? P? & -?MN\?9F`??????7(?X???I?2{???QWa&2?E?[?cR???Y???@?=??? L?? ?R?X(??l8a?? ?????J???lI?iX!???U ??K0?(????7?? ? [?0QD?6???k?qN?N?v???P?????6?7J???.0%?F??YE?GM???x? ?M?????)??]u??????9c????????s?,??GwDtr| ?r?????>O ?3;Nt??J?q{d????at?????j??L????N??%I???????V?2?@?????k???}c}?IB??9?`??+????d???n7?????????^ o?:? {j(N>u?G?>??A??z??t#??lo??Cz Fp?H5???(?[?????????? ???@??_(5????l??%9s# e?????????`py???????n???I'v?`?B??aP?.??E2???;?$?? ?EH??/??{3??????tu??*?L6 ?Y_???|'2^S???E???V???[?x.U??w???;v ?a?Q???_?l?>8n6~m?pm????62???9}>? ?Q:?V??jqk???=??R?h?s???T??K?<5???K???? ???+RbkX}4????xt??m????????[ ?2??~?????`?z????_?????:?XVf??{???'?F?????x???)c????/ &???8????Q?%{"qo?m??N???? Fs8D?R?????mU?[?x?lmq????? ?$?hU???!???_`|?KV?? ??( ?0p?FmX?%1C??=zz? F?V? ?=?? ?:? Y]_n???z??7?OS?"X?p??@?^?7???V?$????}`??1??2??J??4?-??Df?9??W%?r???W?????R?8?9; w?nA???????????3??}?B??i?????*U ???~????yx?9?>*??}???[>8?>?????mt???????????.??5?_??1? ?W?????[??2?????a?9?Qz??????k?^? J?+??Y???n?9M???#??f?[Z]Y~?^?Q"?,U???>f????deZ%??Gn??c)S?Z???R???? Z~???9?=q?Qm???????kZ?????z*O7_H?) ?rO????R????m??r[?*?}]?U????}??)K??6},?QyR?^?L????? ?w????1!bC+??X??&?O8?x???/;?Tw?n???x?e???[8Nw?z?G? (p?t??Je??s??????I[?$?at?~??5????9~??ZE?3z????????^??????????:j????????{y???.??;?z???????h4?ps{???W??8????N??D??c%??c????? '?|?????????>)??"????iy????????OtbyZ??F?+s?ql+?pqd d?G?f???4K4&?F??-'???O????2? nf??DS??n?VyW?V??+)??????a7(N?J=@?????8?R ?|?,?l????r?vb??}???$?:S.??G)???c8????m????j????Z?h??:?P?6GL?????M?\?{??%Y?L??????5h??,^???9?4 W??X/?^??c?P???10?.l?c?*P??%? ?< ?????Z???????a4???j3??kn??V?a?!?A????L|,??+?{?`????Q;v????????Ji??9??????uk?r????[???>5u??a? ?????p#??R???P???y?Zv??C???????VA)?`>????????????-?\]_3? d?? 4T??;}o ???U????W???? ???"?LV?? ?*??)??????K`??R??tF?&? ?#??r?4??q??8?v?#X??oRZ>R????R?kD?? ?????? ?%? Wg?#?f?????;Db??N???\2???P?'?m?w???q???????Z?? I?je???gV~Y?8?W71IIX??9 i?]???t??????n??z?pd?Kx?}??p/ ????Dl????]???20 4?U???Xir?@? ?? ?RfN?~??)x}X>Q?????-#?\7/?????%?@?H??????<;^??c??V??:h??2??e??6?????? Fd??N?\,??????\.?'?76????u/2?? Y?#?|?s? ??G??[Y??N??}???M???B??2????u";?K?????Z??2 ?I?qpr???b ??? ??&??;??8-7??b_>&?i??R?]3???#?P?!0h?A:Q,>"?? ???T????| ???XN?? ?G4@{??+ ??*&???&??nJ?@?O?????-?= ?????5-rw0\??R?NK9Z ?2?Q?5Ox????;?N R?w7??'?a?vrI k;???u????Y?*U?Pj??E????Jy? 4?Fv;-?.U??f?*?A?;Rvh?o??U??[}????=??/??.~??O?q?:h8:?X%q???????^\?U;&??i?$?`j????????^>?(~9?`?$.f??$???????A???????A??Jj1??????g??]G'}??$E??f??GW?nbJ?$e??????,)??H??EJ=/???????`BB????4???????uy?BSf??????g ?|k|Zsjr^??0???8?>??>^??~??*??????a??}X???M\?P:??Iy???D??????yF?7??!%U?0`(???8??????`r??P??~?uI\?9JZ"j@??qaR????p???R2??%+???????H???'T9v?LA???????0??&?^?`??n6????M?"?GK??|???^aD! ??m??0?"?????x?*?A?)??k????3?H?"?u@^???o??rI?Q??M????So??W?z?++?RL????de?*??????:bZ??k???????&?x{??~??f??P???????O r?M????N1 0V!?/?\"?1?JQBo?pt??????.?e???i?h?g??N~p$?n????W'x???????DH??J?-??????A???!????o??y?w???}???B,JZ?j8?N0???TD%?y6???|0?IFxr?G?a?U????????o?????:?n?+Z/?ze??ZY{)? @?U?Ia`??a?c"?r????{?1%?D?d?R$ r??S??u??(?} ?>?6?zd???;D????????X~??hBt??Ix????:??5E?-?D5???????)y??b.???V*+?????4 ??3B?@?w&???(\%?`[X????-????5j |?DM?Y?[b_9???E?"??xr??????W IK{~??/??wx?I??*1?z?????"????Z?;^X??V7?O???;? ??*?c?p?k???????????89?>*?????L??p6??G??P?}??eS???????z?? ? ?? ?haG ????U?????y#???????????9xQC?o7???.????v,??AE??1?????>???Qy??ZY???????????G??/?b?BP??:A?H[?X??J?x????05???? ???v@t_?pES??????%?56?&?~0?????;??? ?|?w?Y.Y?h?(TD?-@????0=p??J?rx2D ??f??????0?g ???????l;t??????RPh6??????U??L??F<?5?Q\AhHpn:?. ? U'???Z??p?#?h?jh/'?d??y?"0s???"???{?D?? `?c/e??m?n?J??:?Y?v ??{????u??8*n??w?_?)j????QH?g?O?70~?????8M??4i?Y.r3DB??0?:vIV?`\?t{?? j*???`M?+???Wc\W??Y?6???wzpx ?w??????[h???3?ww??Lfs?`??? ~ 3Eh?U?.)???+???^?9?a~s????RA?-?TK6,??,?x?>???v?????x??C???????q?k?O????`?? ??t*^R>????_S?????F????m???0??*&LA??;?# _? {??K? Fm?[?h????77w1??? ??U???vE;?f? ?`5?. N??p??kh??$????k??I??(7+{8??V?*?u ??V?I??'2G???~??|???uW(???:??`??gE?m'?? f???9?p???9??? yG?i?J??J?\-+0t#?????Ipp-??????H}R??????I?cB1 ????}`ow???Q???????????{??/l*n?'? ????'k?????5?A??????M&;???.#?B9???!??????Y?8?.??"??d7?H?c????&?+?8?? c ????^??|??I??Gy?.Wt? @ot?p61?9?????%B ?HrL#????j?tP?VB:?6b+ (??"???5is??-q?????/???G?qZ?B[?j: ?8g??? ??3?'?*???T?7??q????y$?Sp?joi(7w"Q(.???")B???1??!??6;?kV???i????V?1?G?W?r{??|p+.?o??????75??????P!?9K?h???:Sys?????`B??9t?Y???dN???IJ????2??u?@??ez%?,?\1qlH????y,???;?i?b??9?E??^o4A??a????L?a?'? ?9?=?(??????z7s??fb?>s?2+YJ?ZX?V?N??W?f- "???e?ql?Z?? +b??.{ ??-?i\????\??????? ?x??:s?+j??+&???? ???S?z????\?Y???P1?? >?o????fE????x8?2(G~?????.9IM?h???u??k??#j?ra ?????!???6#???Kw(v?? ?3]?)>???? .??????i+???J???T?^??? ????e??u6Q3?????c??S???\???]Y}??of?????t?????U??Lj???2qB]???>?????.??y???a%1???Nd???? Y???E??Vt?????N????A??0?u???? ?%>????H?I?a???=?Vy?rD??ZN:????????*#?Oky?%?|?????????/#-?????\?`?} ?q? ???s???3?`??RD?(??Oc!n??Y)???? ???s??l?Ox >E4???ELz1{?; ??8???????u????03_?r?ED???a???9jk?|????????uR??P???\?????V??\?mS?L??)?}????O+>f??h??b?<"D??4?g??>? ????#A?}Gdq??2k?e?J ?^s????&%6?4?g???*??L????[?,V???q8??JW???M_Q?M?=N???(??&D6?F?~????W'????E*M9?X?????i ?yO{"??????F|O??Q?_6??????Nz?????9?:?????????T?sffFS??~3????z3CD7?f??E5? ?\?+???'!F?Ec??M\??????q???? ??u??C???1u&g???r;,?J??]4 ?? MN ?hdH0?t?Me?hXb????????0?+?6??T?1??BgH?C?? hA?%? ?l?9Z?w????( ???O?w?x G!?R?z?@?0 | ?^??,??/???/~?`?k{]?,?????I? {L=?lmKK@???^0cH??4B???-?i???' tQ,??F"R?D?*?g{? K???Ku??)5?j??p?,???o5???F?S??vl??{"Kf$g`??J[h ???<x?>?9??/?Z;????G?:~?M??@??h??D? ?S=? ???????tE?????? ???y"4?`???E/??&)X?????????????'?r????\YJSH??k&???A??@m-US??? &?????? ??# 3??p??p4?G???>???????1K P? ???1???q????w&?!?LKlVG??>????????1V.eB???!K?????x?8???$@Y/N?T???I5 ?]??n?y??P;?[Qh,r? "A?H`?\H?3?????.)Da?????Pz!I0o?g????`^`? Y?>??^Y\|@?P???/???T?!?????H3??ax? +#???3?eU?J?HS5A???VD?X????/????}M?o?*??#??^?q???Td??? d" ?J????S?G????W????\?}8?4???A]?l?a????Y?6??%?????<|s????/[GG['?>??)K?g??? \fw??_B????^??????wr?{|???-?z??do????#???????]4F??"???t)?5??`A????B???+I[????????W7w"s? m?b?`?v??2.?????T???? ?e???N|d??????ar?= 1?$n@?S?r6?/? ?X???tn?? $??Kj?u????yym>??~??pE???N/:?@?+?(?Nf??(?i|?8?A?X(? ???mF??E?????y(2??`?)?0?4?????H?`\??!????SU???z_?z??????????^?n??=z?????/?{??R???Wa^?m9?>@???; \??Q?xp:?GqE 6?????????f?*R??&???tjn?][????h???Hj???'3?>??`4??7??D?B?vn?L?,?????4RE??4? O?R8M@? ??WX???KG~?Cb)9????] ???!??GL??uS?9T?G??? ?7 ?{& n=?8L n=&u?[??R#Lo?????D?> C5x??X?N,H&93?????h??% ????E>x??uE???H6???P?|[VU??????M?`?!??I?Z??I??+^fm??c???y????????&> ANF???????"?D?C?h???=cp?= I?????6?d?N???gT??U?????S???/v???73%?E?+?i????g?I??? >??a;(3?fI?v??6a!???J??????~?Z????}????m?`???3i????Gd:??L?????-?U?c?C?ZA????dD?=?.????(?B???ox ?Y|*?}o????????S/???%Y?????Hj? ][??:???)!&niw?Wd1m???c?"K??7??Q??1?b$? ?x` ??B?? E?R Yd?????D??7???C?!?C?Z???????M??_????@???b ???F??\T???4H4???H????.?q q?Zt??'?C? ?D?8?b 6???? ??.?*>???????!??[ bKR?E?GV?? =?????i???????N??????F?????????)?W?q??~3???V??{??.???????'??]m?M/\#??}? G at c??? ?????:?MX?PtX0?6???? /??o??1ZC????1?>'Q???d?Y?^\\T?? ?^?^??????a\?>??~/??M???z?J????????????#??;??G???x??? ?/??1???1ar???'#?_?H46?O?r ?Ga??`i????}z?Z?*??VU4E??- 0_l?6?h??u?X &?<:-???7??P?}6AK8bc?\? ?M|????????,M?]M????D?D??u???SU[??:?(n?? ?x??(%|???n??vS?+_\&?Z?07 GWCt??|]???????f??!O?]?/6?+5?????????=`?~ }0T?0??8A????G?????m':?~H??g?$???????????????U?;?q?????Z?????????sB?H??+Ts?`gk?|E ? hWa?vi??U?b??????????S???eR???????]y?k?????Kf?guMz????et5N?r????"1da??9c???s?/<?R?y??_?s???1=V??o???d??~?O??R?-0? :e????s??????????g? ?????r?5??Oy?? ?/J?^???e?D??$}?????ec ????St?uK"2T?7???wP?????>?_$?????]=nI??TjB%E]??M{?4???????7?#? ???m???B??(??2`%?[D??x? &??T?Tv?kpHA????1)Z??2??d?s?0 z???O?T??f4?????=????*)c?}????/??^? U?f0 `?????bg?lZ????7??gZ{g???Gl??^?]???L?j???p?{???????F??Z??+?ZA?e|?h)??:?}???NcfMXv?7??`?0??2? ???`?/??+d?hKg?@|T?&S?? "?O?.q??1^E?%?(??????>i'x???69l???36?*?6F&????n"6Y*????y???]??nSco???*???j5???@????[j?????tT?eT?'???????>???lI??????-VH ?V? rsnapshot.conf.patch: --- NEW FILE rsnapshot.conf.patch --- --- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 +++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 @@ -40,7 +40,7 @@ # # See the README file or the man page for more details. # -#@CMD_CP@ + at CMD_CP@ # uncomment this to use the rm program instead of the built-in perl routine. @CMD_RM@ @@ -55,7 +55,7 @@ @CMD_LOGGER@ # Uncomment this to specify a path to "du" for disk usage checks. -#@CMD_DU@ + at CMD_DU@ ######################################### # BACKUP INTERVALS # @@ -94,7 +94,7 @@ # If you enable this, data will be written to the file you specify. The # amount of data written is controlled by the "loglevel" parameter. -#logfile /var/log/rsnapshot +logfile /var/log/rsnapshot # The include and exclude parameters, if enabled, simply get passed directly # to rsync. If you have multiple include/exclude patterns, put each one on a @@ -138,7 +138,7 @@ # If you enable this, make sure the lockfile directory is not world # writable. Otherwise anyone can prevent the program from running. # -#lockfile /var/run/rsnapshot.pid +lockfile /var/run/rsnapshot.pid # If enabled, rsnapshot will move the oldest directory for each interval # to [interval_name].delete, then it will delete that directory as a Index: rsnapshot.spec =================================================================== RCS file: rsnapshot.spec diff -N rsnapshot.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.spec 21 May 2006 03:43:07 -0000 1.7 @@ -0,0 +1,161 @@ +# +# Specfile for rsnapshot +# + +Name: rsnapshot +Version: 1.2.3 +Release: 2 +Summary: Local and remote filesystem snapshot utility + +Group: Applications/System +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ + +%description +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ + +%prep + +%setup -q + +%patch + +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + +%build +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ + +%post + +%define logmsg logger -t %{name}/rpm + +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ + +%clean + +rm -rf $RPM_BUILD_ROOT + +################################################################################ + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ +%config(noreplace) %{_sysconfdir}/rsnapshot.conf +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ + +%changelog + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines + +* Sun Jan 29 2005 Nathan Rosenquist +- Added upgrade script + +* Sat Jan 22 2005 Nathan Rosenquist +- Added --with-du option + +* Thu Jan 15 2004 Nathan Rosenquist +- Added "AutoReqProv: no" for SuSE compatibility + +* Fri Dec 26 2003 Nathan Rosenquist +- Added util-linux dependency, and --with-logger= option + +* Fri Dec 19 2003 Nathan Rosenquist +- now fully support autoconf + +* Tue Dec 16 2003 Nathan Rosenquist +- changed rsnapshot.conf to rsnapshot.conf.default from the source tree + +* Wed Nov 05 2003 Nathan Rosenquist +- Removed fileutils dependency, added verification info + +* Tue Nov 04 2003 Nathan Rosenquist +- fixed anonymous rsync error + +* Thu Oct 30 2003 Nathan Rosenquist +- update to 1.0.3 + +* Tue Oct 28 2003 Carl Wilhelm Soderstrom +- created spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 21 May 2006 03:43:07 -0000 1.5 @@ -0,0 +1 @@ +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz From fedora-extras-commits at redhat.com Sun May 21 03:43:08 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 20:43:08 -0700 Subject: rpms/rsnapshot/FC-5 Makefile, 1.2, 1.3 rsnapshot-1.2.3.tar.gz, NONE, 1.1 rsnapshot.conf.patch, NONE, 1.1 rsnapshot.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605210343.k4L3hAKP023380@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23328/FC-5 Added Files: Makefile rsnapshot-1.2.3.tar.gz rsnapshot.conf.patch rsnapshot.spec sources Log Message: Copied data from devel to branch directories Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 21 May 2006 03:43:08 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rsnapshot +# $Id$ +NAME := rsnapshot +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) --- NEW FILE rsnapshot-1.2.3.tar.gz --- ? AZ?e????? %??Ir7u??K ?h4????DE?LM????}?}???7????????O?/}__{??????g/?}????????`???T?&B???q??~?=?.?/?I*?_??%??C???r?????????k???? ???n?? ???????G??{??m??;?c?N????D????$nJmi<sW???d????k?fi????q??W???C?_??x????o?_???76^?????t??????G??JV?A?J?Nn?+}??|??????u??D?V2????4????? ?i /????`Dn^#??R??? ?@h???????|?????u?d????Y??D?y_G???R?~???B??G?? ?????? ?"P"?= '???PYZN??v_?????? ]??,?w????????8}p"????????x???#?#????????????*?OX?8?`<????q???B?]#9v!?H??r? ??A??????????8?(V?4 Y,????.??L;h#?D? ?[%?`?p?X??}x?PN??>?m??????x????C????g??????? ?&??h?34????i9??DBS0???? ????CgB5?|?K?Rb?[H??.???[ui~?? ?y??qK/?v???????g ??C???????????????????1??r 7?R????n?o?I7d??C?ZG>????J.?\?k?$?_.??/??????Eq:_U???,???8?5?v?1 ??V'???%????|?????V?+? ?]*n??????Z?a?U?z???.>mP?%???0???Lah0?3'??????K????'??????)???'???(??;??r? +}???NA???x??Y???AH?????/a???9??qk??-a????O??g?.?k?e@???l??? ?,?M? ??0S|?tx?'cN???,[ ?B???]?(Z??v?u??#?,?3?.??Wj+e??fZ???u.Z???/??? ??=i9??16?1s??g?B7Dt??"?,????Z ~???U ?????6k???T?l0??6mqN[L 7?,j$ m?b a=?x?????tN_+L?&?L?136-??c???P:o[?S0?9?re????A???Y???H???????T?????"?????'?`???s???????MJ??j?? ????W??PU(#???G?C????? $}? ?n?3U f??+?OB?n?M*?U????h??? q?&????u?i8w?n??Z????,u??'Ot???T?????f??????/f???@? E)?9?4?? ????u,I_?KF3?q;?h?rj???`H????&?o???????????IH?2:???wv? ??ZNk?,i1KQ-?&)??|3 ?????tj??5?@?3m?\=uKk9??Eb??????>?'?De????a???}???B???Q?>????Mre&?y??????$?b?(L?? a+?,G???? ??= ???O????+94$??D????N?p7k? @?Q?^ ? ??L)?$_?X?]????'pA?*%?*??nt??W ?????K l?\b?z?l??}j????}??\b??h?? x????M: ?-?????H??p?s?N)?????i6J??y?^?:&?2?#'I?So???j??dE(ia6?}P?6w? ????_ ?lA?A?h ?Tn???????????s?o%?7V]??{]?)??.?????????Cs)Q????? ?????? p1??@8 at G34I??';,?A?e?5?%?????dG4?< ??e}?-??????????????u?k?f7NN?6?? }~????{R?()?M ????$???Z?A???G2????^?UH|?3?I?????p\?9 ?0?u*F??_7r? ?~| ;??^?.???? ?m?4???3@???Hc?8p???????J;??|??+??M?e??z G?hN?*???p?iG<mA?9?i.??????H?At-?@?_)/@?????o????????. ?i?e$^l??6|#??g??>??f??FG??;? ?X?q?'n?4+}]?o??>?*???5w?m?*E7??jo(???p????+????BJi??? ?????XBz??????e?W????~8`CB??6?6x??$?G9xyN??]?0p?H???#;8??N???q]?aa(Ij????oS?o??0????U6?d~_{!???????.???7?????^??v+gB` ????uj[?q??&?Ur?n??M2?x?????R?(?v{????????~]???.?????VW??oe??Ut??7???????????(n?7E? ?2??wo??q???????? L?d?w?????9?&????F?, o???%C9?M?)'???#!J????b???'72?O???>?q????x?E'?b.x6??'>?J?SpJ???VB?Q????s? ??t???W>]~7?:]?^???t?p??%#??????[?.??????<2????].??????P???????%?rkw!?rA?*YY J?????{??C6Vimw??^/XZg??E???1?2|?F????????????j???I?=??w?pw?u??r?t;?[????s??/??n??s???)???????^?`s?'????+?????M????#?* I??e??z??$8?.S?8???P?Jt3*?????D??????\??5O{???0h??/??c?^Z?c??????!???? ??i??????V?@?? &?????X??????????vJ?????D?v???F???/??W?C?n???t\h? ?u????ia??Z?Q:?????L\I ?SP7?????M? ???? ,??=E?!N2?? A??????`?Ta???P86pX?:????a???E<_L0F???`x??P ?RuA3???Q?!?g:?bF????=??U??q!?/Z?B??Ok;p*?[??&?L[???=?(???+?z?*X???Xlc? +-E?S????n??n+?C?;BlZ?0?x?tUk??2?E0?Cu?q??`???r6+iD?????????R????N? 1????|J9"??Z?l???/?Dj?uc?(??'? ??5K????*S??LL???(7X???$b ?A?u,X??Xs??|!X????JQ???gw?M5aS???;{?H???iyW???o?ItiXQ??????/????Q?m7? *?f?????B\??d?jK? 1*sA???a?h??c????M?4?g?e???6??6?d?u V????m,?????4????M???@???(???R?h???vR???Le???????oY???]?x??O??{????c~??I?e???ud????g??US?8????? ????_?L??p????l??e??D??Y6 ??Z ????w?v??AbGEwj???1?&??i?$?&????"????????]}N&??????n/??~x7Y????iNu ??Y???s3?$???"^o???~<;8?????,??>'???(??tt?1r%!_x??3M|?`?(?y??E?? w?Y|?V?=?=Z5?X:???????~o???6s???3D?? ???[ ??4??));g+??i??$/????]?!?r???U?I?8?>J'9??g?J??iW -Kc6??M????F?? ?????FU2????2?? ??????=yL?r??s??-? ???7?' ??? >@????AY9?>vU7A?u?"5???_??q???????!?h??P??f!(?}?5J???u???_O??r????.?W?????? ?}????m??# l?X???Z?~??????D?????????n?,?`???J???9%?O `??NM???dj???4R????(M???Y-P?$?y????^6l1(?!??n?7+?>qo ?5| 8??(Y??'?J?4-?p??vvw??Z??@b+4??![0??.h?l9??7??3??z????R?u$?1EZn???c&???????.?t?L?(?$}!?{??w????/?j?wA? ?_8{??S?z_? ?q?V????????q+`??x>?Hq?c??Tb?????N?9J|N??;?(???g??h\??? ???Y???|?????????Qi???w???MD)0???A??+???? ????????Bm???J??4?X??????y/m??7[gv?l^?/7!???? O  @?FM???^R;)??9?%c/D?j!c?????d?????@g??2?Va'?#f? ????,?.Oo|??E??????Ki?0??D[]k4? d?JT???0^&?????,??????,?+????N??X???~?????\~?????0?t?|??V Q??Z???W??2?{??=?J9??AR???"rC? '????????^)?:?{k?????_6]_? ???gI??5? &??CQ?w??Q??? ??B???yi!??jD?2R?'Hf?u?@=B????iusE?'?C???&9??3???[?{\??nX????EP???A???+??=*Z?i??????~Zh?`????.?`?????????r???+?I?????7??j?tb?\6?"C+?4W??wu?F/??gh??&?b2???h?6q?3J? 9t?L?&?bZ? ??Hab?6;?,$?u?hl&?rF`? k??V??)?? gRL?q=??WBS at r}??/??????????\E?hd???j?o????O???????yV<^ ??{??EM4?? ?????^5????L?d%?YG&?h?@?!?FVw~>nP?Y???e??U?j?????}?U?4?$_?:TM?5??????-??I????-?L+?]???7JWQ?*???7???fC5??r????R`?7?C??@?????O??????? ^?-T_? ?F?l?$]???cF?r?PbP??d????5??+?6M ??~?????T?=~??0LEf?D?,T????A??????_?;-??WR?6?"?R???V??? O/?? ? ?HN?4s??[Rg?A9??6mH %??"??j??-L{??t?8?3 ?k?$?kM@U???~? q??y7i??T??H???42??R???s+?n? ??R>??a? ???H~?U????[t??.?+???????:???{???{??????????c?O;Go?E??P?j??,;?5l?????d?????@I9R??0?Rv?~?BS/??i??:%?|?b????vV)@???????h??8?? ?o?1B?m??????B Q?d????????:?J+ZJ.h?>$y? ??yfT-k(F??T>????p?V?{?s????????1????"??????????]WV??)P????i?????[??*???j^??/?KM?,:]??\D?h?%YkG???j?"??_ at dvd?~BgA ??B?+?x?)EQ?( ?HgUkt??iV??*?Gt???Z??)???8?y?,?R??"??_?Kg p?8E*? ???{S?1J???_????T1?L?v?????Z8?_?S?T??????? ?6d???????????{?K?~??|??2;??'??d}s??S???\*u????;_??'???n?????F??gB???#&?es? i%?z?h5?d?4j2(??*??X?l.?/:?,>'Csr???? W(??? W??A??ou???w r;?\)Dyp???????.????(???eR?X????a?l???\?6w?iA>????A????_?{?4???V_???7"?DEMyM+?S?nh??????Ii???? 0-??e?Wz?l?G3??0-P??'?~????R?b?3Pv?xV???0??vG??O???7???Vo????e???]?M?????3 ?o`??3?????ap??,??3?h?????r??B??%?Rn?6?,?????t??!?l??????d?PbWA+??|?RX?V4?????Z???G,?^5??H?-?py?????fp??.+???@U????<4m6mfe%?&] ????=j???O{??-c?????M5?/??i?n??n ??U??,nE5????/??D X?????>???~??^?6???Y?,AX?t??c?~c?s?? ??:?w??|-????= ?n??VkH ???s?2[?L??? ?? c?????T?s?????`P}8?Y??c7???>x:????G$?1T?Ne???Y??????m???????'?x^ ?sved*`h~&?z??t$??F??( .?\16{?A?"??????-u??????9U?x??.???z?\?E?~???????}x?* ??\???!?=B??d????f?PDNt?NO ???]e?)?P? w???/?i?#?ti0_r?HF?4w??%????@L ?u?Vn??N+a??0??S$,?G?Rr ?????-$3 ????9T$?)??;????]?_?xh?ux3????????????? ?5L??=6f^?0????h?T?+???j?8?Sb???> ?? |yU9???i??c???LL??P ?J?;z?=<4|??w??)??iW??(,??t??!<@????'>\??h?M???J?v??????EY??4??u/l.?Z#s@??9?$Tz???:?{2`V?? E?P?(Iu?? ?|?n???-b??\ B6-?28?=]????,X??a1Q?B?$}??????f?PO????(e-??B 7?u????6?1???#CSEJ]}?A~??7?????????@k-|@_?? kx,?B??????E??o_=C.??i????D?@?Cy??$?PF?)_@??Xmq??{U~?n??v9 ?4|??u????????*???Xf??R????? ??`Nz?l?i^?Jc????n??T?a?T&?!--???w??o???< =?$??Gh.-*??R?S$a?FLb???P?^}?-???8?;??O?pk???L???$x\'?z? ??',p:??????(i?F?????3???N???(7'?(??vU6p????"??_?:?}?PMB??]p?*^??X???] (?~???E? ~*???2?n=?[?C??n??y ?x??x?7??VZh????G??B?xA???4]Ga??_?????u,g>?&3?7?????r??99?????{????r??????d>?Z%??_?p?:???_A??????m 2???????*U??~Fk6l??B???V??U???T?????#? ??S?P????C6???DP.T [?m|??? ??-?Gm5??/~??? ?Y?5{??(??{I?? ?k????*M???XQ???&??1??i}???8??????h?/>?? ?a???L??!e????g?????????????E???gk?i?cg2??D??????'??????Gie?;??Tx?j?b???S?j%????s?M??????pr1M?g~=??|?? ???3|?Y?b?UwvL+??=???`d??.??????B????????7? ????'??j?zs?fRdS??E?? ??y[?g?Le?9??~3^??r?K??I??t\#? ?????S????????P??j?T???F????SZ%?????{7<}?L??????*?3????e?K??mp?????A?81?@??;?Po??? ?t?3??m?s? ??&??}???E?P?%???[(E?*?SH???VH F??m@??J?? w J?Mg^l??.9??jo???Z?n??1?ZZ??ee??G?mMOE???5I}M?q??????P??u?j'?#?S?-zZ?W?n??????au??3$'??]tA5P?k?+??HA??Ym?))??h?????1?????? ^s?p??G? ?"/j?d???????/?Wd??$B?? ;????F?_?l????Q???w 1?????????q? ?*??7?-? #}?J?[~in\??0?]???V'?vs?_??a49?KJ9?? ??M~??{?e?J???q?$??{????l/?)?sj?-8??8_???i?#?Pa?]@?A????t??,?/????#?"p?@]????)?{a.??a?G S\X at f???#??5wrf??y71#?"???????????! @?f???t????n?9?8?hQ+8??M?.?????89???%:4??1-9$?6?$?????^??V)??[VD??^?a????.B?8??6OA?H?P????1y??U??.0? y? ??0???1]V?R`???mP??&?H@?eQM?M?U/?YKg??P?6'd??_??????2?? .?1TB?"??U=??qc@??????????Q0??x(?V????vw??s-???z?9!IC$~f??a???W %??/X?q??|D??????????< ???< 7??,?`g??????s????*??( 6??,M????t8?f?t????lkb~??%??M>0?p?C????J1??j??&D|?9??6????(HK?``?y`?9???j9$?s????????t?|?TPE!??yAZ ?Mi???]C??k???3??p??B?w?? "? ?&??d???????????% ??? c?(?uL\ &??? ??f????!?????DN>a?O?;?5}m?N#OF? M?ED?????????!??? ?????????f???;?H#!?t?H????G????Z?l??.?r?%??0??S?? ?s$?{FA??86??z?O?~?i2?B2^???D? ju?*??b& >$?????/?)??:???@?EI??????????uD\?mNC??4???4????wdw?b'@b???0@|??< ???????H4??5??t29J?G?Y??,!3?b2?D? ??5yV???.?az? ??*????%$??o?????98?&2????????JyI?g??????Q?Gs?0&??t,FJ??0n?D????b?d??d???J|Gb?H????R??8?+???csA???w???K))???????az y????????,Hy??i???7$????J????????/????????:u?y??^?PV??????|'D?dtb$?????f?d????Juo?:?? 4?? L???1*?R? ?,???Dq f????c?1%??2H>???XC?i*??O?Y?6? "?m??P ?? \????????: ???? ???H?v}??rfR?6a&?????X??!q(??U???Rs?]? !????m???b??9?????L?Z?v??T?3'r?N???M?&g#e b ????(b?%?~?z?.? O????J??8m'&?*y???Y??_??b?.# ???9?o????8??H??????? 9??%S?? ?? ?R?f?????wU?6?q@??? b?Y?????i??????j?P???'???i??dl6?B?g?e Mi??`n?!??x?r>?+????j????}??k?Z?sz-?????9?????q?`hg?}??4??????4??*????3????i?(???>????"y??`?MK?C???Iu\B?,4,??????b???????????????]????~??t_|o~?j???/??,??u???XS?S??oS??H??B???? e????|w??)9v?}L?CNeK>?????*^?x?z???????????%]CC ???y???e??*_?604Ls\???g?)????2?? ???v=L?????Yw?Q8l?8??g6\F??@???$??F?0>`???,:?FN?"??f?/??a???B????6Z#D??.??? ?O????? ??(\??!8???]?o?????v????(???9?i??pk???gOI??0????SS??8??n?1?o????9????W;G{?^/~?o?[?G;??v???w???n'?? ??? ?c??[??????=~??mc ?@"?]??3??kf?zR??T>??1???????Hg?>? ??B??!?F???Z??Q? ?????3??????????4\?#\??6c9@??~)M3M {?'?p{????.??K@?????Z at C;??3>? -???????V+??HfQ??i:?"?aPe0???~?*?? ?!???????M8?b'?k??O @S???e?Z???????? n?VB??Hb?]?K???3o?$c????B??^?.s??A?C p??#s?L? b:?X4=J?????6?-?c?#/N???w?>?i????^KG?????+?,4H/??????PK??????|??2B???v?????L[???Coy?O???> %??????????[;?*??` ?bra?q?s2?:T&??&?aJ???sp??8>?|???v:????1 (?,??2L/q?.!?56??h??$?Q??.???:??%4?~?H??/??4?I??0?? ?? S?F???GsF???s?f? ?D????YX?????G2?;;?????MLx? ?^i???|??????fN^??Av#k???99???hJ??4??? f:;>????e??l?S?3?i?o?:?n???[m?g?DkL??H??N%??C???)???_M G???l?e??]s.?02???@t"????d????????8?c???I????h???/?\????7:O???^[?\[?:???y????????? 3?W)?!?^?????%?q???~A??U??? ?GN???n( T?a???} ??????D?????#|?{?>?}r??t??NG?? G6L?pp????YC??u???B^ n?a>?z???[$???????I ???{????v[???Fx?g?-?S????yo?????A???z??F?-?0?#???f???K??/?A?????Cf>??/???.Ew?????/?}????9t??:2?LH~I?? /?d.A.-K????&mw??V j???{*P,q?J?.???5??????3r/?????X???J#p??W?^kZ?B?G? r??K 5=?%H?T=ZV?f??? ???.*?C? ?A?;`??? ^d?? ??#?,?;u?0>$g,?????Y???id???^?????p^H?1?o?????g2??Ry?\3?8?H?iD E?k?l-?? ???V??&99?????H?=q ?_?gI?H*????n6?0c? ???`4T?&??C???W???Z??9??Mi?????~?>??df???q2??l_?M????L6??(+T}?D??xR??????"???B?b?E????9???????\??f??? ?!???E?6????5????\?{?#=??g?_[s?)4?????+=??????3???3%???B8?F?g?W~dF??(f???zo???Kc?"3?>??l?????t?|;q???????T? }??f?^??????0D 32??+xM ?A? ?L? ???Tb??\4?i??`d????e1????+2??????`?? ??????{;xS ?=Z ?A? ?M??@D?F???/!$?}??$p?B%N?????????Xi??!???"???R??[????)???]q????P??- ?????)??[???V?N?hGA???????lOco)??Kx4?CD??0??a?????M?}?Fy ?.???\9D?l?W???>>?h?A6EER??_A%g??r A?!?#????RCi?????P??!1?*??z??FO?????????+??W???? Zd??E?a???\?7??[?j}R%?dV??\W ?,??? ^?)?v????????N??,NK?f??-D??F???????Kk??R??(?L??k??Ayv? gi[????$Q???DN?&?????`?KQ8??NC^Dz?4L???????L/?s!?&?3????%????-?xz???v??4??.o}?4??Fn??????h?d)?????_=?e?D??(A??????f??CA?TZ?????n ?3aS_????d ?F,\N?k?|?R??????+???5b??zah97X??e????^I???????w?????*???d?eV???ZFV?IV.RU|N?=g43W?7S????" G?GT?Z???2t?????(????Q]??h??-,i+?f3?????Er?o?pR= r5k???|???X???H????4???g.????e at h_Ku?1"???^??'6?[+Nb*??x???[??g Y?x?+?w}a???c?`[?? J?????x?G ?ln???? A?Ak?Lk^c?? ?n OH???H??VAmp7k$]???)?;?q ???? ??:kk?x?%3?7 ???se#N2??3????J?? 5"?C???N???G?l[Z?E/\SZ;??lO9E+P\?F?qR8?-a??? ???dj6?DL?tk??3K?V???+??;D?S??Z???hPH????$w]?A?,??FI?AuK? ??????i3$I?zj?? Aa?? ????d?j? Hd??a-????q?????6 ????????????FF&???80?j^?I?????.s?( ??? ??g?K&??]??[?????,????e?O?!A?:k???egd???W(?D???l?k? j?j*??U???o?bD-?k????,G??*?????dZ? ?l?^??Cs???SB?2???????fFh??R??4'?{p???????N?????v2??4???? '??H?n??F*????x??B%V?Y 73?1???d?*$UR??d???5)???? @?o??G????.R?xV??y??????s?:'??"?W?????^?s2????O????3r??1???o:??????Y?P?v?ez?%~??P??? ???oS?I/???????(`y}??hi??? ??t>?t??C? ?+??a????n??? ?F???[LCo???o??[/vvw?:??W;G{?^O;x?H?n????????w?[?????????????sF\?)? ??`?;PWX?? ?B? ????????:????xU?Q???S0?~??fNFO\?L?uZd?q?k?P? ??o?????????MEW ??$??S u?>At??7?Z?????_???7}?vp7?A??f?fw?~4isQU?????i???? ?/W??H???????#???]?????X+ ??o?u???OT?????|???????^?X|??~??Y????????y???????^?pk7>x?bwg;6????u#~ $/????????m???QTR?7~??????Q?d5#??n?|???C??pDq??6?a=3?R?*?5 ??m?n?-PD???*?Z??=?3??\u???o??^?){n??RiI\?9%??Z?????X< ?9a??R1!}???rF^\??.? r?C%r????2dB???? v/a??c??5?h0?>E8c -?nv?Jc 3?`??J??0&i??? ?u???CT???7bfrA??? C;??8??6G???#S?R9eO??=???????6,Y,??E????S H6?2?-???W????P?Tc7c??(??1!4?xu????j?b, B?.??? %????t?x^?]Q,??7??a?$D?B????$*?:????jH????d??J? ?O&?(?BQd??K?$ ?\{B??2?C?2?hT???J"?J?_BQ?????]?????x? ?3 ???9~?4M%??b??4|?PGf??_?Z?Aq?:|??n???????????Af?Q rCv?D$??`?-r?]? 6???3??Q???.????I?4&D???8?U?????????}w3??Ik?!??,z??z?????A5G? ?%(?>? ? ???h$?^?6H?-?1[????_??V??a???Bk??????0j? c???Q??%|?*?4?H?E?S??l?`??6?????/?????q?????7???y???K??h???!???A[??GK$??%j?O}M?Q??=qp cT??VD?`?r9N?k??BtG???k?? A???9??5 ???4???0F?????+? U7????]3?_s ?F??????[???Ly? B?w???u? Y,?s??)??$???N???9?nlB?oO.?'??Km?A??(@????&?*RY?i?|{?=|????^???{/w??b/~??j??_???w^????????;?v?Q????.9V5????+?B??1H~@%?<=!9z?? ???3 h?\?dK?'????j?Pf`??E?W?u???hb???#W????[?????UI??T`?S??E?h???7?i?JA???%?|?N? ????B???!<~6L?Z?YKrB?9??4??(?b???y??j ?zGCs4??w7?(AI>p:C ??5??\?t,?IB?$?? ?LB???B(?? ??#??|??B????Hc???????mH???Q??=y%?du? ??X??? &????????@/?*j?dj%"h???8??2???t k??xq-?c?W =???,?H;,3 ;9<????Wpv&?? ??#?y??]h?|`?M?C???B]7??d?e?'?'?-w??S???R??]?3 ?W???????W??^|6??%o3 8???*!0????Rc???ZM?(g[?EN.K? ?aOT?(#Q?|???"? ?'Q\ ??Of??$?2,+2??%?D'v q^q+W????Y??`???#?KN(??gK??gnn6;?K?W Ih???k29k?????F??f??94L?0??dEp?D?;|??7???6T%????`????{j?$?? ? ?Z???v*???9/l]#?($?5M??? "@ZM??L??Qz)a?b0??????????-^????&h????K??bI?m!9???K?}?????D?*??ONQ?x=??a?eA???p:?`???i-%S????Y????aa??Y????3K?y?????d,X??\2Y?x^Wi???i ?M ??-??P??=?G???H?[? ???????X?|??Z{?P^? B4??` ???{?=h^?????D]~????B",u%b???p?% ?)??M????NN? ????j??me??QBU3???m?D?%???90???)? Ws?R??z=6???????}?t??4??Q???? ?%[/z??F????????$??$??Y??Kw*???]=? ?!??`?w@ ?DemG??=???/??p????????z??Jsx?????"?5ur??&x/?#|?!???r{f0??ng??U??*I??B???? @?3 ???????t*VD???kA+?r????)~???A??5-y????????l?-??Os?+?-?????YX*??2???p???B??.1K???M>m; ???3??l10 P ?????X???g???@|#Y? ,x??!?H???WX??~????M?? ?,}?sD^ ?6?q?L?Go??`?G?l? ???a??????P,[?tem?R?^??w?w??_??????v??'>??|xbk?+?E?q"?I?G??8b??Z??*Gd?Y?9???b;p[B????????{=?q???`=???C00mM?????R?mH??d:?!?H? }0???]X??1,???JC?W[c????2?z???r?A???"?? ?EL??-??????? ?Q?b?P 5? ???2?w+??????[?3???G?#???????>c&??L?????k? ?$?2>k?P?*??0?????QRY?~9?????B?,FK????T???;??,WZ*IDm?q??2??% ?nztz?6?Z=M~?,LH? WE??????PQi??%??E)? ?]K?.???;????N??#??a(;Y????? WyQjD?1??n?e:1s?r?~??d??"Ka at r?r?RY??e??e?????:p????U?y8a}O??l?Ue? ??I??q+uk??R[???[???????N?????t?NO?o?????:N?cOgS?????d?Z??Oxkdn7T???!?:?5?????F???? ????"}J%?J??jh?^?Z L?u*p?\???????z??~???S?q/c?b????,??t ??t???'HWR??C?q 1?i??? E? Q4?}?2??R&??`?@??!7??A??P????f? ??????.P3t8???????3$W ??(\?=?q!?c??) ??? ?h?cG???N6?4? ??NvV?0 X??B?????;F???"??>6??u?C?y????y1%?1F?|?k%??Y6???????P#? ?@\?J?R?1>%?r|?$p?B??Fj??9?:?>P?J??'???6$??????ba???=Q2e??(?IO#??E?*??u at w?????]?+?Bm???Ewp}??=?x????+????!O??p`S 1v??I??-|?i\?_f\E?ik???`?p?????^?5'VQ??,?J???L????>????j3?nJ?X???[,VR?RlM???????[?_r???????r%8?????OO?~?JT{ey??4h???5ch?????|K? ?j?SQ?l?W? {???>??????E??.Z? ??-q????[?????;q????7???9!???;?O?Y???Hx????mnJ?K????$, }Nc????u9? ??,?2???b?????? ??K.???????x??u{???Y??}@?t??????7????CN???????}??J?4???????~?{???~????]??@???G??h"&????x?w?u???????????o?3???sh??????e???E??#Q7?u???*??7???@N?A????9? ?s???9?T=f????u{c???%Ovsc,V:\?^?UYy)??*-b??.3mnl<}?~???\Wh?{K??)|?????@Z??P?J?`{?????a?2?e???/??e3?? ?G?0?Vy??[b?G?????&z-?e?????c???)L*?h??c????F-?_????,7?}???r ???(?d?c????2?vdZ?? u1?l?\???E[A?N?)???????v?)Y?? ?J?V???????%?)? ??|J(??kB[????6? ???Ht)Q%c????S?.????5???O????~??????????b????G?O?????????w??????D|g]? J?-qo?p?Y.?|??pa?????k?%X???#^?q?bH???t?~???J4^?_{?e3???MR/?b (M???|?R18b?? W?^??l:p^????????Vf?S??I????!M??? >J?D?T??K??*??s?m?ni??]?]3j???)I?Z?? ? ?E??DV?O???U-???k2N?U ????U?k!E??"??K-??M?1??p'?!?????om?;?ZBk??$ak?G?vI?Z#?'??lFE???? ??/R???2n? u?.????6????E7v?l#???w?f??j!9??`LqCl?R?????<????+@%?B}rG??pM???t????Or?&f???5?~X?F??{Yd????)????O???? ??Z?H>Q\A r????yy??????)??? IP??????II? L?6??H???????2??)u,X??[g2??????V4+??dE?&???R.6Ff??OVs??-o?K.|??9?'????MO V??A{U??5D???? ?=????JD?m?;9^n3X?QG/?CP?(?H???0?#????;????p?G?????g/j5n3j?k? gY?|Ly??(@K?9&????I$"gc??p??0????/h?H?_?_1J??:?|G?e?6???q1Hh-i?d ?????????????{/????????????0GH?D;????oxsO???Z??????Y? ???X1??d p??\??&?d??g12X?9V?!V"'??\????z?s2?ve?<]?7?-<6r?T????y?ha??? C (?#???Q]??x~,?F?o`?X%?y+??h????=?=??b????G???'~u?f?Si?*?w\???l{ ??B*q??????????K H???1%??9L????:q(??}??GK????4k#????c{N?e????;?;*n?4Y7A^??+??s?/-X>?Ql????8?my???????LHt?w9?}?[?t[?u??????V;????mLX?Z2Q1?%G?S?=?ViR?r?%&??h?k?q?F(??[j??@???????=??(??2?i?oD]\t???Q??(?$J?)`???H#??V??QJ??t???3yv?k?[z\x++??|?????.?l??s??????-:????_??c??;??e??????y?????????????/Dt\6_??????8f?"O???2nT.??>?d?C}e??^?&EzhQ "?;?D)k??s???l'?D?u"?P???8h ?D?Nt?*z????m??3? -?J???m???J???5???T=??TA???w? ????+?5???4??#?? ???)7?P?s???Sl7?|h? ?B????Y?l?6+??????9???]??/??T4EH?????t???o?9*?b?e:??A?C???=?[?=??@?H???gS*???C`????LI??\:|?l?*8HH???Gt?_)??9?o$???R ?^x??m???'Q?5??~[????? ??n?4???2l0B?F??G?A6?RD.,#LB-??? ?/? ?Q?~??=n]??a????R????H?F';?}<,????#gqw??O??:????4*?1????[`? ?)?Q??????N?IK$???,Mi?P?-? ???6,?, =V???[??OT e?H??b R?????G???/j?ShF?bwzq?J"P?X?(?"??A_ G?????????C2+?7????| ?-???o7???#???G?;?'??#??????? ??4^o?T?????L????A ?=???A??????7????vV7T??~z?A???I?^??F!P??y&2I?J?v.??$????2?dy|?1S??? ???# ?(_?? y8;??@-1??t{ I???9I?'??^UF??<g???r|???n??=???2??-?s??????s???s????[???w????y???|k?? -??8???6M62?G???A??I?2'??R?,?&aX???? ????B?\????f?????????$??n?j????~L9?v?_`?z~??D??(????*?1?8?C?????????d??????/X`n?os???j???|?H?c?y??Q &r???'??s?? ???h?b?&T?U?Q??M+ ?????2^v2???U#?s?F 0?-??Cd+:??AV/??F$9EQ+?? ??N??E)P??M??0?tI\?d?d?_5???S?Y9???.?f?T?O?? ???'?W?????\Z`??BQ?}s[;W??r?0e?o#?>???A:???6XI?N???~D&D?E??=?jTs?w????3???E????N?.`&??wA3??UY????F??Q???La????>T???!:?92s ?<9=tI=?-????????Q??jk?=s????????y?c$????3??z????J??Q=6??>OD??6?G5tE?cl??d?? ???$)N u?i??1?8????R?????"?????[M9I??fOS ?\4?V?VofUoe??s??s>?j;s??E5?F???Zi??? u?x????????P??l?Sh-?A??? T??0^????????0o.P??? ???;Fh$+?$?????? V?x??S????: ?-???7?|? U<,1???s?/1f??4?G????Zy?????,?F?wZr???`????Y?l?>?3l-S ??? Mw???,a?e?p$?L?D??g(a?&w?C5u?i?*?????=??+??\ ?N??? u?Js?Dw?^?&kA????e??J?F?MU?2?[`6q}??1P3?w?a????+??-?X??.s?aD?????*?H K????n????j????n??r??????@:(G?b?????????%YZ?7???D8??},\????wi?; t?6?3??g1??wo)???[z?????????6?04?Vw%/?VO47D?l5??j?~??X?(?Kf???Z9???)? ?#&"]H?P?G??????.?U?h???D????4???4?'o??K????K?6@??????w :Y??r??%??%-Y??3??-? hw @?Bj^???n; &~?? E?)E?? {??s??Q?e ?????-??J?_5??Q?i:?a?????F!)SE[77??of????rgK?*O?DoY??????wF ~??M??Y????:????????R??8ye??d?/YY??z???|?r0c???? ??????E????_k??????=?)sq?*XyZ5???j??????% ?,? ?g??c???r??QrYya5??i???"??v ??F5???E%?AT?b?E??{?)iX???J ?/5??05%?di???X?NpV\??M$3???[N??.??? ?F????J&????\#~???he?/???J? ??\?$????>lm?! Yjy???*^v?\S?x}???????c$%?????c?" ????tR???[ec?%sT??S??=u????*?-}j????>,f| T?k?(???,???}P???-v+?v???? ?iN?yud??iE? :~R^?R?v?j?*?H l?wi??????s?+n?K? ??????Y?? ???3?>?o[n?`?s8 z?Ue????/???&?W??bT?x????????g??:|????????{?M*???[????l??????o????6???X??A?Tt3?h ??jc-N4mv? ?f?????RV??v?X??2{???2g?m????&???????~iB?????t???v??????[???]??}??????? ?Q`#?' ?P%GgQ?9??&??:2????K)???I??( 54?iJ?,vS??.????|?eb?&??l?? ????qw????v?m?? ?vE ?????AW???b4]I|(??} J?l??x??z(?C??????U?b$?:??-!#m+_sM>?/T?`R???~???????TZ??0+??????????ru???m5?=?N???di?J??,V?g??U?%??????*S ?RCk0 :?Q?R?+?&?gw%!???$?N???Ih???>???NVr??Y?{Q???t? %}??N?????y????(?Y??49 /u?c??#??=da?,?? ?s????B? S?=E??Qv???^?;{n? ?v?e 8(???6??0??T@??)??r/?%???8 D?i?"b#A??w??`'??Bf?o@?x?[?OfY????B7?&?~|p?a???Lgx8?GQ?:????b???g???A?;>?/~??O???#?or9?`G??lp ???,??????5??????-X??k?j?#??>? ?? /-??6??????}?P<{?3??D?E8W|3?B?]#?Eo??b??Z-?<v??2-?_@ &?>?E???????d?9 ?????>f.??V?X.?????H$??n?3??????h:?j?????d?s3?0??=<_?mn?5??????h??*????G?s? ??!?D???????{??3??/?????c???????I?i??O???? N)?S????a?????U????Y??R??L0W>`U??!.M????D?x?="?U?d?R>?? ~?V???$?,?d??yX|?/?Q? 2????,L?-}k ?h'???r?#M??????u??m?7????TA?t??s?s??0uQ?nY?H?Q?a????M}wIm?hd??{?????????pN??[? ???o????l@???9Nb????)c? 9?`?[~?Z?v3??????^?LU??8=?+??CW?W?; n`9r?????6-{?%#????7&}?>5@?)??m?Z?E??? ?|}???BF??jxmo????BF]???^?? ?Y?7?{}??8D??%??"??2??pn??0 4?iB%U????T?H*Bv?CD?K$?}??KM?? >?$?8?d??e?? Wr+????!2e?d??c?ln?*;& X6YD>??63??????? ??????Qy??ZY3t??X???G??/????OVW??????????????O????h}?????l???U?y??hZ?Y?????3?sX???x?+??)? ????????c?L{?^? ?`?*g?(?? ?V+??'??? M0;??????V? ??mx??%?????/????X?BiY?? ?WM`?9??=7???l???kTyj???YsPU??F???J `\??U??2^#??8@???Q)V?????Y?Z????O0? ?[????R?zV????P?S ry?h N??????????O?~???????@?: ?P?/???2?V??~??p?b?qRWSS?j at 4qQ?????????zP8?c}k?c?????vj?5?df?@?g???o?C?P???+????; ?M?dmx3F???`??d??"7??7??????P?!??EA??_???H?t??cx????9w.??i_???D?-?62??????C?????????jOv????;?E?PowX?D?????0? Y?q?e???!DU?s? 7????[yf?? ???@?#?s?jj?*KvH??-??B{{?31??o??Y???}?5L_? ?l('??W.? 0;?7?}W=??w$???4????3??B3??&1??"ClH>_P??7? ??? W????TR+??X-?,?:????G?G?tjT? ??7?,^2?(??^?????R??S?`???2vt?@?Z???3 ?9? ?-????F??h????? {=?N?E??y*??B??Z?SP?Ji??v^??e??? ?W??mK?>???????5??Y?g??x\?/?E??=O???[eU??B_?0?Zy;'????!??u? @vF???>?_ ?? ??F ??.*??f??m??5?r)w?L?7???L? ?U[{J=??{????1??Xi???:IH_??????p\???Mi}?????7??v?_YE?X?'????`SM?R?gpj?[F)???g?n?k?k????K???)?1O?!? ~??S ???8FH#?K??Rm?#?>??Kz? ???? ?M????|? _a??|?!u??? 4uy<???V{W??,o-?H?N??? ???Ul??h???-?????!z{??Q?d,?K????ec?????I=????_)E?`Q+Z????W,0?? ??e??^lL???? ???j????????Y+7??j????z??$Hg???5 i???'qC?5????Li?JQ??Q5_???/??^e?-?Z ???QT?a? oj?| )??O????2s???z6?j?? ????@\&?l??z?w???>???h?u??????whc???8u???^tb?i?&?\$????)??Y11?-?_?+??j???>?? ?O?A???*?????~R?(?9?????@J>?G???????s?9?Iio???l |ta2???&^6??9???$S??O???? ???l??]T???m???{!\L?gZ?=?Vz2k"%???????/?? D????'e?;j^???????????????Z?Z ?O?A???0?? ??Q???/??y?O??? ?K??JLxu??3?n??z????????F??kQ?}? ;?KpP9?TZ??9?????????}??b I"???m+iN???????[??A)??f?0?pX??$???O:? *???|?+X?M& /?x??CF???P$[????J???sA???P????as6 ?Lk??1?????Hc????{??? ????`=?????? ??"{U?FfJ?9?!P;2?m51?????X?{?a?P3vF?s9?"??`X??`!??4O4?*.??h c??.p:ub??e???e-??;,?r?NRf?A[? ?c??H??3^??L??c?kr???g* XI|????L???N??W???5???}>?pvQtf??/A?;???d?uQ=5???@?? -???0??G3A???&?"eQ??w????|???????\.?NU? ?RD??A?\??b?n??S?71 #i ???? ???Q?E??` ?? +???U\??M?L?!??o??Q?X.(m???R????s??????5Q9?%^VE?????v??]??lk,] \?Q???????HN?D???W8????m?CZ???????EoP?j?h????A?? ?j???`?=????m-???8????)???????H `???z?02,?!?q??HT?{U$?8?W?6G??g?~UJ??O???T?????? ???#@?????4??v??K0X?p(?????????k5?|o??n???h+??J-??y?????,6c)?"2`?` ???~??N????m?x(??i????2|?????a.??????I?????t? 1,?????^?"?Q??V????Y?????a?T????3?fEE???+??N?pT?tGv.?~?!t??#?T????\????E$a?@????9???,y?C??????+?+Wd??A??P??? 4??5G?R??9g?R????lqK?? ??\EN??,M????Y}?9?????????m?6_R??Hu.??D????cV?jg$?v=UO??r???}W?zU??R?ZU*O?*j?B?????%X?9b?S???I??^???2??g?w"?,??I??X???? nj?q?w?zFv??/?V?s???F???r??l??TF?#?&?e??????A?E:o???#?%?Rs?#K(m??a??S?s??z??NZ2?y5??d??j???3??A?????+?6?m?Jv??v?l? ?X??Cj??W"?r?r,:9>?#iM?xhR j=???~??#0K??.+?J??9?j^X???%??x?1@%??|?eu>?y?p??R>` S?????ii????d?Y??P=?,????B???1?????e??n\v?Y??CG??z<??[tie_l ??[??7??T=?g??g??6????[??!w?????????B0?_???)?????l>????<0+P??G????Qb/???"??'????{?{_?? I?????????;v?N= ?P`*q???????0????y?;d{@?h??B ?????'????c'y?6???????X??2'?????.??@?.?]l+???S4?tb????c?(?(?~?????A????;??C????g5???? *?????`?#6?8V4???|`t?|????]??@O???LT?(????(V7??$Q ????J'??V#?g?lE2?????@I0????X9??????????????????B(< ??~7w:8?? X?.??q:G?o C????K??t??4 l`&?????v?lL(J???3pE(pV5h?=??y?! ?#??V^1???Q?M??????"??}?(Ghm @]D ?P ?@7nB?QFi??KA??R?????????g a??? ?on???gi?*????g}??D?$a,?1??<"G0 ^??#???=V E?;%+?z'?~??~?q?DtP???r ??+?9??V???W??$L?:-?ly??mJpSY?(?m?[ \?KJd??.?WWLM?>0?Tt???????????r?w?"hK$I?????p|/?@|??iv??9-?Y??i?oq???? v?go????????M,????E'??3?5\???6^7???$`?/= ???^&?? ^?? {??o????p ??????Z??H????=:{??6???i?????K?>]??????+?????n6?[[G??=?????????1}?{Y?5??D??>??1???o=;?!V]?V-w?*??t??[????????mz?????h?$???%Ik??P?F??_ ????sHx??? ???]??J???j????.???|?????{????5?n`|??????????? 3????eIDK0V?%?x??r???JtQJw?P H t??7*?????? ????(?" ??W?:?C`????????5uh&o?ri? y????`???*S??q?g????i??K=???:? k?w??d????r?B??b???i9%??-?1 ?v 4??X) ???/wv?^0jU?j4??B?;xs,??K???:)?_????"?]o?E)?~?p??l?o?H??bq??EU?S???[?R?..zx? ?????X}6xv?????????-^7??}??m/???g??????GXf?AW_F;?g???????wh?Je???c??Q???F??7z?\?? ?@3M?r??f?C????k-?9?M??la????_????????+?Y**????`?Y?Pc?|Q???????\???f<}??M?]g*?? ??g?g?wU???z???$??]?xK?@?????C8?7??? ??_?????B??????u?e#)?"?I?2h????????!??c??E% ?=?\??7!8^w.???$?a}????fT??hn-???c:!?Q??^a=J??H?.??v}?~?? ?????F?S???@?lXH)4G???)?dYD??2 ?YP????r?X?}??"????.{?[???[??N?^*+ J"+???D?d??;?#???K?r???J rn?-M?p(;+%?? f??D??1???? Ca????V???Q???z????K?G?)?oU?Gw?{- ?:????( ??`0R?"~???y6??I=?_??????????;?'yFS????X$B???Hu???Z?{B? ci?D=???H??XU?????I=?_?c? ?7?y?e?? ?[a7??}?j???????$??y?3?\??w????? F????y?Cp?b?? m?!EubCj????A7?= ??,c??????E#???N??+4?,???qc??|? C???? ???=???3????~??H"G6m?tv??????1??EV??? ~??y??L|???9???L????P??FrF???9K?? Z?????eJSE???M????2{?AsL??n%6??`??????`x?>????aq4???H2TQ?D??bLkX???BzD?^??]l??i:?"g??i?^?ES???>???(?"H??^Y??Us?2M1????q?Q??#([??&!?u?6??7???[x???{??q? G 8h??No `?????+????W?d@??k"?q?(?MR9????))???????WVFNH?{q??h????????tn??Yo:???H'??9RV?M?|?|it??NM?K9~??????t;?0?h^???????<?w?32X?b??KD?@?8 ?a Nt&??n?S??N??[?q[???=???,???2T ?I?[??f?q?l?u?y?9??Hg0/?;?P:??????)|??:??. ???}?????t???;/6??i?p??9?????a???????`?\?_Uf-?/f??Wl}s?`???F????????I?o{????>:?X!_?E??;?/??z????M??M??????G???M?A???????y???F?4N???[?????7?????NNN?'?+???????y1?{??{???4~?q-v??|9??;_? P? & -?MN\?9F`??????7(?X???I?2{???QWa&2?E?[?cR???Y???@?=??? L?? ?R?X(??l8a?? ?????J???lI?iX!???U ??K0?(????7?? ? [?0QD?6???k?qN?N?v???P?????6?7J???.0%?F??YE?GM???x? ?M?????)??]u??????9c????????s?,??GwDtr| ?r?????>O ?3;Nt??J?q{d????at?????j??L????N??%I???????V?2?@?????k???}c}?IB??9?`??+????d???n7?????????^ o?:? {j(N>u?G?>??A??z??t#??lo??Cz Fp?H5???(?[?????????? ???@??_(5????l??%9s# e?????????`py???????n???I'v?`?B??aP?.??E2???;?$?? ?EH??/??{3??????tu??*?L6 ?Y_???|'2^S???E???V???[?x.U??w???;v ?a?Q???_?l?>8n6~m?pm????62???9}>? ?Q:?V??jqk???=??R?h?s???T??K?<5???K???? ???+RbkX}4????xt??m????????[ ?2??~?????`?z????_?????:?XVf??{???'?F?????x???)c????/ &???8????Q?%{"qo?m??N???? Fs8D?R?????mU?[?x?lmq????? ?$?hU???!???_`|?KV?? ??( ?0p?FmX?%1C??=zz? F?V? ?=?? ?:? Y]_n???z??7?OS?"X?p??@?^?7???V?$????}`??1??2??J??4?-??Df?9??W%?r???W?????R?8?9; w?nA???????????3??}?B??i?????*U ???~????yx?9?>*??}???[>8?>?????mt???????????.??5?_??1? ?W?????[??2?????a?9?Qz??????k?^? J?+??Y???n?9M???#??f?[Z]Y~?^?Q"?,U???>f????deZ%??Gn??c)S?Z???R???? Z~???9?=q?Qm???????kZ?????z*O7_H?) ?rO????R????m??r[?*?}]?U????}??)K??6},?QyR?^?L????? ?w????1!bC+??X??&?O8?x???/;?Tw?n???x?e???[8Nw?z?G? (p?t??Je??s??????I[?$?at?~??5????9~??ZE?3z????????^??????????:j????????{y???.??;?z???????h4?ps{???W??8????N??D??c%??c????? '?|?????????>)??"????iy????????OtbyZ??F?+s?ql+?pqd d?G?f???4K4&?F??-'???O????2? nf??DS??n?VyW?V??+)??????a7(N?J=@?????8?R ?|?,?l????r?vb??}???$?:S.??G)???c8????m????j????Z?h??:?P?6GL?????M?\?{??%Y?L??????5h??,^???9?4 W??X/?^??c?P???10?.l?c?*P??%? ?< ?????Z???????a4???j3??kn??V?a?!?A????L|,??+?{?`????Q;v????????Ji??9??????uk?r????[???>5u??a? ?????p#??R???P???y?Zv??C???????VA)?`>????????????-?\]_3? d?? 4T??;}o ???U????W???? ???"?LV?? ?*??)??????K`??R??tF?&? ?#??r?4??q??8?v?#X??oRZ>R????R?kD?? ?????? ?%? Wg?#?f?????;Db??N???\2???P?'?m?w???q???????Z?? I?je???gV~Y?8?W71IIX??9 i?]???t??????n??z?pd?Kx?}??p/ ????Dl????]???20 4?U???Xir?@? ?? ?RfN?~??)x}X>Q?????-#?\7/?????%?@?H??????<;^??c??V??:h??2??e??6?????? Fd??N?\,??????\.?'?76????u/2?? Y?#?|?s? ??G??[Y??N??}???M???B??2????u";?K?????Z??2 ?I?qpr???b ??? ??&??;??8-7??b_>&?i??R?]3???#?P?!0h?A:Q,>"?? ???T????| ???XN?? ?G4@{??+ ??*&???&??nJ?@?O?????-?= ?????5-rw0\??R?NK9Z ?2?Q?5Ox????;?N R?w7??'?a?vrI k;???u????Y?*U?Pj??E????Jy? 4?Fv;-?.U??f?*?A?;Rvh?o??U??[}????=??/??.~??O?q?:h8:?X%q???????^\?U;&??i?$?`j????????^>?(~9?`?$.f??$???????A???????A??Jj1??????g??]G'}??$E??f??GW?nbJ?$e??????,)??H??EJ=/???????`BB????4???????uy?BSf??????g ?|k|Zsjr^??0???8?>??>^??~??*??????a??}X???M\?P:??Iy???D??????yF?7??!%U?0`(???8??????`r??P??~?uI\?9JZ"j@??qaR????p???R2??%+???????H???'T9v?LA???????0??&?^?`??n6????M?"?GK??|???^aD! ??m??0?"?????x?*?A?)??k????3?H?"?u@^???o??rI?Q??M????So??W?z?++?RL????de?*??????:bZ??k???????&?x{??~??f??P???????O r?M????N1 0V!?/?\"?1?JQBo?pt??????.?e???i?h?g??N~p$?n????W'x???????DH??J?-??????A???!????o??y?w???}???B,JZ?j8?N0???TD%?y6???|0?IFxr?G?a?U????????o?????:?n?+Z/?ze??ZY{)? @?U?Ia`??a?c"?r????{?1%?D?d?R$ r??S??u??(?} ?>?6?zd???;D????????X~??hBt??Ix????:??5E?-?D5???????)y??b.???V*+?????4 ??3B?@?w&???(\%?`[X????-????5j |?DM?Y?[b_9???E?"??xr??????W IK{~??/??wx?I??*1?z?????"????Z?;^X??V7?O???;? ??*?c?p?k???????????89?>*?????L??p6??G??P?}??eS???????z?? ? ?? ?haG ????U?????y#???????????9xQC?o7???.????v,??AE??1?????>???Qy??ZY???????????G??/?b?BP??:A?H[?X??J?x????05???? ???v@t_?pES??????%?56?&?~0?????;??? ?|?w?Y.Y?h?(TD?-@????0=p??J?rx2D ??f??????0?g ???????l;t??????RPh6??????U??L??F<?5?Q\AhHpn:?. ? U'???Z??p?#?h?jh/'?d??y?"0s???"???{?D?? `?c/e??m?n?J??:?Y?v ??{????u??8*n??w?_?)j????QH?g?O?70~?????8M??4i?Y.r3DB??0?:vIV?`\?t{?? j*???`M?+???Wc\W??Y?6???wzpx ?w??????[h???3?ww??Lfs?`??? ~ 3Eh?U?.)???+???^?9?a~s????RA?-?TK6,??,?x?>???v?????x??C???????q?k?O????`?? ??t*^R>????_S?????F????m???0??*&LA??;?# _? {??K? Fm?[?h????77w1??? ??U???vE;?f? ?`5?. N??p??kh??$????k??I??(7+{8??V?*?u ??V?I??'2G???~??|???uW(???:??`??gE?m'?? f???9?p???9??? yG?i?J??J?\-+0t#?????Ipp-??????H}R??????I?cB1 ????}`ow???Q???????????{??/l*n?'? ????'k?????5?A??????M&;???.#?B9???!??????Y?8?.??"??d7?H?c????&?+?8?? c ????^??|??I??Gy?.Wt? @ot?p61?9?????%B ?HrL#????j?tP?VB:?6b+ (??"???5is??-q?????/???G?qZ?B[?j: ?8g??? ??3?'?*???T?7??q????y$?Sp?joi(7w"Q(.???")B???1??!??6;?kV???i????V?1?G?W?r{??|p+.?o??????75??????P!?9K?h???:Sys?????`B??9t?Y???dN???IJ????2??u?@??ez%?,?\1qlH????y,???;?i?b??9?E??^o4A??a????L?a?'? ?9?=?(??????z7s??fb?>s?2+YJ?ZX?V?N??W?f- "???e?ql?Z?? +b??.{ ??-?i\????\??????? ?x??:s?+j??+&???? ???S?z????\?Y???P1?? >?o????fE????x8?2(G~?????.9IM?h???u??k??#j?ra ?????!???6#???Kw(v?? ?3]?)>???? .??????i+???J???T?^??? ????e??u6Q3?????c??S???\???]Y}??of?????t?????U??Lj???2qB]???>?????.??y???a%1???Nd???? Y???E??Vt?????N????A??0?u???? ?%>????H?I?a???=?Vy?rD??ZN:????????*#?Oky?%?|?????????/#-?????\?`?} ?q? ???s???3?`??RD?(??Oc!n??Y)???? ???s??l?Ox >E4???ELz1{?; ??8???????u????03_?r?ED???a???9jk?|????????uR??P???\?????V??\?mS?L??)?}????O+>f??h??b?<"D??4?g??>? ????#A?}Gdq??2k?e?J ?^s????&%6?4?g???*??L????[?,V???q8??JW???M_Q?M?=N???(??&D6?F?~????W'????E*M9?X?????i ?yO{"??????F|O??Q?_6??????Nz?????9?:?????????T?sffFS??~3????z3CD7?f??E5? ?\?+???'!F?Ec??M\??????q???? ??u??C???1u&g???r;,?J??]4 ?? MN ?hdH0?t?Me?hXb????????0?+?6??T?1??BgH?C?? hA?%? ?l?9Z?w????( ???O?w?x G!?R?z?@?0 | ?^??,??/???/~?`?k{]?,?????I? {L=?lmKK@???^0cH??4B???-?i???' tQ,??F"R?D?*?g{? K???Ku??)5?j??p?,???o5???F?S??vl??{"Kf$g`??J[h ???<x?>?9??/?Z;????G?:~?M??@??h??D? ?S=? ???????tE?????? ???y"4?`???E/??&)X?????????????'?r????\YJSH??k&???A??@m-US??? &?????? ??# 3??p??p4?G???>???????1K P? ???1???q????w&?!?LKlVG??>????????1V.eB???!K?????x?8???$@Y/N?T???I5 ?]??n?y??P;?[Qh,r? "A?H`?\H?3?????.)Da?????Pz!I0o?g????`^`? Y?>??^Y\|@?P???/???T?!?????H3??ax? +#???3?eU?J?HS5A???VD?X????/????}M?o?*??#??^?q???Td??? d" ?J????S?G????W????\?}8?4???A]?l?a????Y?6??%?????<|s????/[GG['?>??)K?g??? \fw??_B????^??????wr?{|???-?z??do????#???????]4F??"???t)?5??`A????B???+I[????????W7w"s? m?b?`?v??2.?????T???? ?e???N|d??????ar?= 1?$n@?S?r6?/? ?X???tn?? $??Kj?u????yym>??~??pE???N/:?@?+?(?Nf??(?i|?8?A?X(? ???mF??E?????y(2??`?)?0?4?????H?`\??!????SU???z_?z??????????^?n??=z?????/?{??R???Wa^?m9?>@???; \??Q?xp:?GqE 6?????????f?*R??&???tjn?][????h???Hj???'3?>??`4??7??D?B?vn?L?,?????4RE??4? O?R8M@? ??WX???KG~?Cb)9????] ???!??GL??uS?9T?G??? ?7 ?{& n=?8L n=&u?[??R#Lo?????D?> C5x??X?N,H&93?????h??% ????E>x??uE???H6???P?|[VU??????M?`?!??I?Z??I??+^fm??c???y????????&> ANF???????"?D?C?h???=cp?= I?????6?d?N???gT??U?????S???/v???73%?E?+?i????g?I??? >??a;(3?fI?v??6a!???J??????~?Z????}????m?`???3i????Gd:??L?????-?U?c?C?ZA????dD?=?.????(?B???ox ?Y|*?}o????????S/???%Y?????Hj? ][??:???)!&niw?Wd1m???c?"K??7??Q??1?b$? ?x` ??B?? E?R Yd?????D??7???C?!?C?Z???????M??_????@???b ???F??\T???4H4???H????.?q q?Zt??'?C? ?D?8?b 6???? ??.?*>???????!??[ bKR?E?GV?? =?????i???????N??????F?????????)?W?q??~3???V??{??.???????'??]m?M/\#??}? G at c??? ?????:?MX?PtX0?6???? /??o??1ZC????1?>'Q???d?Y?^\\T?? ?^?^??????a\?>??~/??M???z?J????????????#??;??G???x??? ?/??1???1ar???'#?_?H46?O?r ?Ga??`i????}z?Z?*??VU4E??- 0_l?6?h??u?X &?<:-???7??P?}6AK8bc?\? ?M|????????,M?]M????D?D??u???SU[??:?(n?? ?x??(%|???n??vS?+_\&?Z?07 GWCt??|]???????f??!O?]?/6?+5?????????=`?~ }0T?0??8A????G?????m':?~H??g?$???????????????U?;?q?????Z?????????sB?H??+Ts?`gk?|E ? hWa?vi??U?b??????????S???eR???????]y?k?????Kf?guMz????et5N?r????"1da??9c???s?/<?R?y??_?s???1=V??o???d??~?O??R?-0? :e????s??????????g? ?????r?5??Oy?? ?/J?^???e?D??$}?????ec ????St?uK"2T?7???wP?????>?_$?????]=nI??TjB%E]??M{?4???????7?#? ???m???B??(??2`%?[D??x? &??T?Tv?kpHA????1)Z??2??d?s?0 z???O?T??f4?????=????*)c?}????/??^? U?f0 `?????bg?lZ????7??gZ{g???Gl??^?]???L?j???p?{???????F??Z??+?ZA?e|?h)??:?}???NcfMXv?7??`?0??2? ???`?/??+d?hKg?@|T?&S?? "?O?.q??1^E?%?(??????>i'x???69l???36?*?6F&????n"6Y*????y???]??nSco???*???j5???@????[j?????tT?eT?'???????>???lI??????-VH ?V? rsnapshot.conf.patch: --- NEW FILE rsnapshot.conf.patch --- --- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 +++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 @@ -40,7 +40,7 @@ # # See the README file or the man page for more details. # -#@CMD_CP@ + at CMD_CP@ # uncomment this to use the rm program instead of the built-in perl routine. @CMD_RM@ @@ -55,7 +55,7 @@ @CMD_LOGGER@ # Uncomment this to specify a path to "du" for disk usage checks. -#@CMD_DU@ + at CMD_DU@ ######################################### # BACKUP INTERVALS # @@ -94,7 +94,7 @@ # If you enable this, data will be written to the file you specify. The # amount of data written is controlled by the "loglevel" parameter. -#logfile /var/log/rsnapshot +logfile /var/log/rsnapshot # The include and exclude parameters, if enabled, simply get passed directly # to rsync. If you have multiple include/exclude patterns, put each one on a @@ -138,7 +138,7 @@ # If you enable this, make sure the lockfile directory is not world # writable. Otherwise anyone can prevent the program from running. # -#lockfile /var/run/rsnapshot.pid +lockfile /var/run/rsnapshot.pid # If enabled, rsnapshot will move the oldest directory for each interval # to [interval_name].delete, then it will delete that directory as a Index: rsnapshot.spec =================================================================== RCS file: rsnapshot.spec diff -N rsnapshot.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.spec 21 May 2006 03:43:08 -0000 1.7 @@ -0,0 +1,161 @@ +# +# Specfile for rsnapshot +# + +Name: rsnapshot +Version: 1.2.3 +Release: 2 +Summary: Local and remote filesystem snapshot utility + +Group: Applications/System +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ + +%description +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ + +%prep + +%setup -q + +%patch + +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + +%build +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ + +%post + +%define logmsg logger -t %{name}/rpm + +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ + +%clean + +rm -rf $RPM_BUILD_ROOT + +################################################################################ + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ +%config(noreplace) %{_sysconfdir}/rsnapshot.conf +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ + +%changelog + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines + +* Sun Jan 29 2005 Nathan Rosenquist +- Added upgrade script + +* Sat Jan 22 2005 Nathan Rosenquist +- Added --with-du option + +* Thu Jan 15 2004 Nathan Rosenquist +- Added "AutoReqProv: no" for SuSE compatibility + +* Fri Dec 26 2003 Nathan Rosenquist +- Added util-linux dependency, and --with-logger= option + +* Fri Dec 19 2003 Nathan Rosenquist +- now fully support autoconf + +* Tue Dec 16 2003 Nathan Rosenquist +- changed rsnapshot.conf to rsnapshot.conf.default from the source tree + +* Wed Nov 05 2003 Nathan Rosenquist +- Removed fileutils dependency, added verification info + +* Tue Nov 04 2003 Nathan Rosenquist +- fixed anonymous rsync error + +* Thu Oct 30 2003 Nathan Rosenquist +- update to 1.0.3 + +* Tue Oct 28 2003 Carl Wilhelm Soderstrom +- created spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 21 May 2006 03:43:08 -0000 1.5 @@ -0,0 +1 @@ +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz From fedora-extras-commits at redhat.com Sun May 21 04:06:36 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:06:36 -0700 Subject: rpms/rsnapshot/FC-4 Makefile, 1.3, NONE rsnapshot-1.2.3.tar.gz, 1.1, NONE rsnapshot.conf.patch, 1.1, NONE rsnapshot.spec, 1.7, NONE sources, 1.5, NONE Message-ID: <200605210406.k4L46ctE025819@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25791/FC-4 Removed Files: Makefile rsnapshot-1.2.3.tar.gz rsnapshot.conf.patch rsnapshot.spec sources Log Message: back out of previous commits -- still learning this stuff --- Makefile DELETED --- --- rsnapshot-1.2.3.tar.gz DELETED --- --- rsnapshot.conf.patch DELETED --- --- rsnapshot.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sun May 21 04:06:37 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:06:37 -0700 Subject: rpms/rsnapshot/FC-5 Makefile, 1.3, NONE rsnapshot-1.2.3.tar.gz, 1.1, NONE rsnapshot.conf.patch, 1.1, NONE rsnapshot.spec, 1.7, NONE sources, 1.5, NONE Message-ID: <200605210406.k4L46d58025822@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25791/FC-5 Removed Files: Makefile rsnapshot-1.2.3.tar.gz rsnapshot.conf.patch rsnapshot.spec sources Log Message: back out of previous commits -- still learning this stuff --- Makefile DELETED --- --- rsnapshot-1.2.3.tar.gz DELETED --- --- rsnapshot.conf.patch DELETED --- --- rsnapshot.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Sun May 21 04:14:28 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:14:28 -0700 Subject: rpms/rsnapshot/FC-5 Makefile, 1.4, 1.5 rsnapshot.conf.patch, 1.2, 1.3 rsnapshot.spec, 1.8, 1.9 sources, 1.6, 1.7 .cvsignore, 1.3, 1.4 Message-ID: <200605210414.k4L4EVuS025964@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25936 Modified Files: .cvsignore Added Files: Makefile rsnapshot.conf.patch rsnapshot.spec sources Log Message: second try to get 1.2.3 and an actual file put into fc5 Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 21 May 2006 04:14:28 -0000 1.5 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rsnapshot +# $Id$ +NAME := rsnapshot +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) rsnapshot.conf.patch: Index: rsnapshot.conf.patch =================================================================== RCS file: rsnapshot.conf.patch diff -N rsnapshot.conf.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.conf.patch 21 May 2006 04:14:28 -0000 1.3 @@ -0,0 +1,38 @@ +--- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 ++++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 +@@ -40,7 +40,7 @@ + # + # See the README file or the man page for more details. + # +-#@CMD_CP@ ++ at CMD_CP@ + + # uncomment this to use the rm program instead of the built-in perl routine. + @CMD_RM@ +@@ -55,7 +55,7 @@ + @CMD_LOGGER@ + + # Uncomment this to specify a path to "du" for disk usage checks. +-#@CMD_DU@ ++ at CMD_DU@ + + ######################################### + # BACKUP INTERVALS # +@@ -94,7 +94,7 @@ + + # If you enable this, data will be written to the file you specify. The + # amount of data written is controlled by the "loglevel" parameter. +-#logfile /var/log/rsnapshot ++logfile /var/log/rsnapshot + + # The include and exclude parameters, if enabled, simply get passed directly + # to rsync. If you have multiple include/exclude patterns, put each one on a +@@ -138,7 +138,7 @@ + # If you enable this, make sure the lockfile directory is not world + # writable. Otherwise anyone can prevent the program from running. + # +-#lockfile /var/run/rsnapshot.pid ++lockfile /var/run/rsnapshot.pid + + # If enabled, rsnapshot will move the oldest directory for each interval + # to [interval_name].delete, then it will delete that directory as a Index: rsnapshot.spec =================================================================== RCS file: rsnapshot.spec diff -N rsnapshot.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.spec 21 May 2006 04:14:28 -0000 1.9 @@ -0,0 +1,161 @@ +# +# Specfile for rsnapshot +# + +Name: rsnapshot +Version: 1.2.3 +Release: 2 +Summary: Local and remote filesystem snapshot utility + +Group: Applications/System +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ + +%description +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ + +%prep + +%setup -q + +%patch + +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + +%build +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ + +%post + +%define logmsg logger -t %{name}/rpm + +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ + +%clean + +rm -rf $RPM_BUILD_ROOT + +################################################################################ + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ +%config(noreplace) %{_sysconfdir}/rsnapshot.conf +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ + +%changelog + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines + +* Sun Jan 29 2005 Nathan Rosenquist +- Added upgrade script + +* Sat Jan 22 2005 Nathan Rosenquist +- Added --with-du option + +* Thu Jan 15 2004 Nathan Rosenquist +- Added "AutoReqProv: no" for SuSE compatibility + +* Fri Dec 26 2003 Nathan Rosenquist +- Added util-linux dependency, and --with-logger= option + +* Fri Dec 19 2003 Nathan Rosenquist +- now fully support autoconf + +* Tue Dec 16 2003 Nathan Rosenquist +- changed rsnapshot.conf to rsnapshot.conf.default from the source tree + +* Wed Nov 05 2003 Nathan Rosenquist +- Removed fileutils dependency, added verification info + +* Tue Nov 04 2003 Nathan Rosenquist +- fixed anonymous rsync error + +* Thu Oct 30 2003 Nathan Rosenquist +- update to 1.0.3 + +* Tue Oct 28 2003 Carl Wilhelm Soderstrom +- created spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 21 May 2006 04:14:28 -0000 1.7 @@ -0,0 +1 @@ +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Apr 2005 11:07:19 -0000 1.3 +++ .cvsignore 21 May 2006 04:14:28 -0000 1.4 @@ -1 +1 @@ -rsnapshot-1.2.1.tar.gz +rsnapshot-1.2.3.tar.gz From fedora-extras-commits at redhat.com Sun May 21 04:20:15 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:20:15 -0700 Subject: rpms/rsnapshot/devel rsnapshot.spec,1.6,1.7 Message-ID: <200605210420.k4L4KHZD026034@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26017 Modified Files: rsnapshot.spec Log Message: add %{?dist} macro Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rsnapshot.spec 19 May 2006 23:34:16 -0000 1.6 +++ rsnapshot.spec 21 May 2006 04:20:15 -0000 1.7 @@ -4,7 +4,7 @@ Name: rsnapshot Version: 1.2.3 -Release: 2 +Release: 2%{?dist} Summary: Local and remote filesystem snapshot utility Group: Applications/System From fedora-extras-commits at redhat.com Sun May 21 04:21:38 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:21:38 -0700 Subject: rpms/rsnapshot/FC-5 rsnapshot.spec,1.9,1.10 Message-ID: <200605210421.k4L4LeHs026100@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26083 Modified Files: rsnapshot.spec Log Message: add %{?dist} macro Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/FC-5/rsnapshot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rsnapshot.spec 21 May 2006 04:14:28 -0000 1.9 +++ rsnapshot.spec 21 May 2006 04:21:38 -0000 1.10 @@ -4,7 +4,7 @@ Name: rsnapshot Version: 1.2.3 -Release: 2 +Release: 2%{?dist} Summary: Local and remote filesystem snapshot utility Group: Applications/System From fedora-extras-commits at redhat.com Sun May 21 04:26:27 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:26:27 -0700 Subject: rpms/rsnapshot/FC-4 Makefile, 1.4, 1.5 rsnapshot.conf.patch, 1.2, 1.3 rsnapshot.spec, 1.8, 1.9 sources, 1.6, 1.7 .cvsignore, 1.3, 1.4 Message-ID: <200605210426.k4L4QTN6026197@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26169 Modified Files: .cvsignore Added Files: Makefile rsnapshot.conf.patch rsnapshot.spec sources Log Message: second try to get 1.2.3 and an actual file put into fc4 Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 21 May 2006 04:26:27 -0000 1.5 @@ -0,0 +1,21 @@ +# Makefile for source rpm: rsnapshot +# $Id$ +NAME := rsnapshot +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) rsnapshot.conf.patch: Index: rsnapshot.conf.patch =================================================================== RCS file: rsnapshot.conf.patch diff -N rsnapshot.conf.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.conf.patch 21 May 2006 04:26:27 -0000 1.3 @@ -0,0 +1,38 @@ +--- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 ++++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 +@@ -40,7 +40,7 @@ + # + # See the README file or the man page for more details. + # +-#@CMD_CP@ ++ at CMD_CP@ + + # uncomment this to use the rm program instead of the built-in perl routine. + @CMD_RM@ +@@ -55,7 +55,7 @@ + @CMD_LOGGER@ + + # Uncomment this to specify a path to "du" for disk usage checks. +-#@CMD_DU@ ++ at CMD_DU@ + + ######################################### + # BACKUP INTERVALS # +@@ -94,7 +94,7 @@ + + # If you enable this, data will be written to the file you specify. The + # amount of data written is controlled by the "loglevel" parameter. +-#logfile /var/log/rsnapshot ++logfile /var/log/rsnapshot + + # The include and exclude parameters, if enabled, simply get passed directly + # to rsync. If you have multiple include/exclude patterns, put each one on a +@@ -138,7 +138,7 @@ + # If you enable this, make sure the lockfile directory is not world + # writable. Otherwise anyone can prevent the program from running. + # +-#lockfile /var/run/rsnapshot.pid ++lockfile /var/run/rsnapshot.pid + + # If enabled, rsnapshot will move the oldest directory for each interval + # to [interval_name].delete, then it will delete that directory as a Index: rsnapshot.spec =================================================================== RCS file: rsnapshot.spec diff -N rsnapshot.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rsnapshot.spec 21 May 2006 04:26:27 -0000 1.9 @@ -0,0 +1,161 @@ +# +# Specfile for rsnapshot +# + +Name: rsnapshot +Version: 1.2.3 +Release: 2%{?dist} +Summary: Local and remote filesystem snapshot utility + +Group: Applications/System +License: GPL +URL: http://www.rsnapshot.org/ + +################################################################################ + +Source: http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch + +################################################################################ + +# This patch enables a few defaults in the config file that make sense to have +# enabled in linux. +Patch: rsnapshot.conf.patch + +################################################################################ + +BuildRequires: rsync +BuildRequires: openssh-clients + +Requires: openssh-clients +Requires: rsync + +################################################################################ + +%description +This is a remote backup program that uses rsync to take backup snapshots of +filesystems. It uses hard links to save space on disk. + +################################################################################ + +%prep + +%setup -q + +%patch + +# Disable the config-file testing during ./configure because it freaks out if +# you're building as non-root on a system that actually has rsnapshot installed. +sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure + +################################################################################ + +%build +%configure \ + --with-perl="%{__perl}" \ + --with-rsync="%{_bindir}/rsync" \ + --with-ssh="%{_bindir}/ssh" \ + --with-logger="%{_bindir}/logger" \ + --with-du="%{_bindir}/du" + +################################################################################ + +%install + +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Rename the installed .default config file to a usable name +mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf + +################################################################################ + +%post + +%define logmsg logger -t %{name}/rpm + +# Get the version of the current rsnapshot config file so we can see if it +# needs to be upgraded. + CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)" + if [ $? != 0 ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf." + fi + +# Old version in need of an upgrade + if [ "$CONF_VERSION" == "unknown" ]; then + %{_bindir}/rsnapshot upgrade-config-file + exit $? + fi + +# Latest version is 1.2, so anything else is not good. + if [ "$CONF_VERSION" != "1.2" ]; then + %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!" + exit 1 + fi + +################################################################################ + +%clean + +rm -rf $RPM_BUILD_ROOT + +################################################################################ + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL README TODO +%doc rsnapshot.conf.default +%doc utils/ +%config(noreplace) %{_sysconfdir}/rsnapshot.conf +%{_bindir}/* +%{_mandir}/man1/* + +################################################################################ + +%changelog + +* Wed May 17 2006 Chris Petersen 1.2.3-2 +- Add rsync and openssh-clients build requirements because the configure script checks for them. +- Remove perl requirement because it's detected by rpm. + +* Wed May 17 2006 Chris Petersen 1.2.3-1 +- Update to version 1.2.3 which is in the downloads directory but not linked on the site. +- Change openssh requirement to openssh-clients +- Update %post script with better info from the rpmforge spec and nifty logger reports +- Add utils/ to the %doc files + +* Sat May 13 2006 Chris Petersen 1.2.1-1 +- Update specfile to be compatible with fedora guidelines + +* Sun Jan 29 2005 Nathan Rosenquist +- Added upgrade script + +* Sat Jan 22 2005 Nathan Rosenquist +- Added --with-du option + +* Thu Jan 15 2004 Nathan Rosenquist +- Added "AutoReqProv: no" for SuSE compatibility + +* Fri Dec 26 2003 Nathan Rosenquist +- Added util-linux dependency, and --with-logger= option + +* Fri Dec 19 2003 Nathan Rosenquist +- now fully support autoconf + +* Tue Dec 16 2003 Nathan Rosenquist +- changed rsnapshot.conf to rsnapshot.conf.default from the source tree + +* Wed Nov 05 2003 Nathan Rosenquist +- Removed fileutils dependency, added verification info + +* Tue Nov 04 2003 Nathan Rosenquist +- fixed anonymous rsync error + +* Thu Oct 30 2003 Nathan Rosenquist +- update to 1.0.3 + +* Tue Oct 28 2003 Carl Wilhelm Soderstrom +- created spec file Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 21 May 2006 04:26:27 -0000 1.7 @@ -0,0 +1 @@ +b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Apr 2005 11:07:19 -0000 1.3 +++ .cvsignore 21 May 2006 04:26:27 -0000 1.4 @@ -1 +1 @@ -rsnapshot-1.2.1.tar.gz +rsnapshot-1.2.3.tar.gz From fedora-extras-commits at redhat.com Sun May 21 04:30:22 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Sat, 20 May 2006 21:30:22 -0700 Subject: rpms/orpie/devel orpie.spec,1.2,1.3 Message-ID: <200605210430.k4L4UO9E026284@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/orpie/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26267 Modified Files: orpie.spec Log Message: add %{?dist} to release tag Index: orpie.spec =================================================================== RCS file: /cvs/extras/rpms/orpie/devel/orpie.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- orpie.spec 20 May 2006 00:14:40 -0000 1.2 +++ orpie.spec 21 May 2006 04:30:22 -0000 1.3 @@ -4,7 +4,7 @@ Name: orpie Version: 1.4.3 -Release: 4 +Release: 4%{?dist} Summary: A fullscreen console-based RPN calculator Group: Applications/Engineering From fedora-extras-commits at redhat.com Sun May 21 05:36:26 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 20 May 2006 22:36:26 -0700 Subject: rpms/MochiKit/devel .cvsignore, 1.2, 1.3 MochiKit.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605210536.k4L5aSWA029030@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/MochiKit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29009 Modified Files: .cvsignore MochiKit.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/MochiKit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Feb 2006 02:51:34 -0000 1.2 +++ .cvsignore 21 May 2006 05:36:26 -0000 1.3 @@ -1 +1 @@ -MochiKit-1.2.zip +MochiKit-1.3.1.zip Index: MochiKit.spec =================================================================== RCS file: /cvs/extras/rpms/MochiKit/devel/MochiKit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MochiKit.spec 15 Feb 2006 02:51:34 -0000 1.1 +++ MochiKit.spec 21 May 2006 05:36:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: MochiKit -Version: 1.2 +Version: 1.3.1 Release: 1%{?dist} Summary: A lightweight JavaScript library @@ -41,5 +41,8 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %changelog +* Sun May 21 2006 Ignacio Vazquez-Abrams 1.3.1-1 +- Upstream update + * Sun Feb 12 2006 Ignacio Vazquez-Abrams 1.2-1 - Initial RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/MochiKit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Feb 2006 02:51:34 -0000 1.2 +++ sources 21 May 2006 05:36:26 -0000 1.3 @@ -1 +1 @@ -1a22e956ea2cabe04bad99878986b952 MochiKit-1.2.zip +4b744fb425a6dcf3f9e0a3bc8d1ebc7c MochiKit-1.3.1.zip From fedora-extras-commits at redhat.com Sun May 21 05:41:15 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:41:15 -0700 Subject: rpms/perl-Class-Inspector/devel .cvsignore, 1.4, 1.5 perl-Class-Inspector.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605210541.k4L5fH09029114@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29093 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 21 2006 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 May 2006 03:56:49 -0000 1.4 +++ .cvsignore 21 May 2006 05:41:15 -0000 1.5 @@ -1 +1 @@ -Class-Inspector-1.15.tar.gz +Class-Inspector-1.16.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/perl-Class-Inspector.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-Inspector.spec 8 May 2006 03:56:49 -0000 1.6 +++ perl-Class-Inspector.spec 21 May 2006 05:41:15 -0000 1.7 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.15 +Version: 1.16 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 21 2006 Ralf Cors??pius - 1.16-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2006 03:56:49 -0000 1.4 +++ sources 21 May 2006 05:41:15 -0000 1.5 @@ -1 +1 @@ -b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz +46eeeeb5a5df0da03f4e53229f7ed360 Class-Inspector-1.16.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:42:37 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:42:37 -0700 Subject: rpms/perl-Class-Inspector/FC-5 .cvsignore, 1.4, 1.5 perl-Class-Inspector.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605210542.k4L5gdHv029186@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29165 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 21 2006 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 May 2006 04:23:32 -0000 1.4 +++ .cvsignore 21 May 2006 05:42:36 -0000 1.5 @@ -1 +1 @@ -Class-Inspector-1.15.tar.gz +Class-Inspector-1.16.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/perl-Class-Inspector.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-Inspector.spec 8 May 2006 04:23:32 -0000 1.6 +++ perl-Class-Inspector.spec 21 May 2006 05:42:36 -0000 1.7 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.15 +Version: 1.16 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 21 2006 Ralf Cors??pius - 1.16-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2006 04:23:32 -0000 1.4 +++ sources 21 May 2006 05:42:36 -0000 1.5 @@ -1 +1 @@ -b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz +46eeeeb5a5df0da03f4e53229f7ed360 Class-Inspector-1.16.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:45:59 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:45:59 -0700 Subject: rpms/perl-Class-Inspector/FC-4 .cvsignore, 1.4, 1.5 perl-Class-Inspector.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605210546.k4L5k1m5029265@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Class-Inspector/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29244 Modified Files: .cvsignore perl-Class-Inspector.spec sources Log Message: * Mon May 21 2006 Ralf Cors??pius - 1.16-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 May 2006 04:25:33 -0000 1.4 +++ .cvsignore 21 May 2006 05:45:59 -0000 1.5 @@ -1 +1 @@ -Class-Inspector-1.15.tar.gz +Class-Inspector-1.16.tar.gz Index: perl-Class-Inspector.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/perl-Class-Inspector.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Class-Inspector.spec 8 May 2006 04:25:33 -0000 1.5 +++ perl-Class-Inspector.spec 21 May 2006 05:45:59 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Class-Inspector -Version: 1.15 +Version: 1.16 Release: 1%{?dist} Summary: Get information about a class and its structure License: GPL or Artistic @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Mon May 21 2006 Ralf Cors??pius - 1.16-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 1.15-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Inspector/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 May 2006 04:25:33 -0000 1.4 +++ sources 21 May 2006 05:45:59 -0000 1.5 @@ -1 +1 @@ -b906d71fcff688bd0c43b0052235ed16 Class-Inspector-1.15.tar.gz +46eeeeb5a5df0da03f4e53229f7ed360 Class-Inspector-1.16.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:53:04 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:53:04 -0700 Subject: rpms/perl-File-Find-Rule/devel .cvsignore, 1.2, 1.3 perl-File-Find-Rule.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605210553.k4L5r6hJ029353@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29331 Modified Files: .cvsignore perl-File-Find-Rule.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.29-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 +++ .cvsignore 21 May 2006 05:53:03 -0000 1.3 @@ -1 +1 @@ -File-Find-Rule-0.28.tar.gz +File-Find-Rule-0.29.tar.gz Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/perl-File-Find-Rule.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Find-Rule.spec 28 Feb 2006 22:36:27 -0000 1.3 +++ perl-File-Find-Rule.spec 21 May 2006 05:53:03 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule -Version: 0.28 -Release: 4%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.29-1 +- Upstream update. + * Tue Feb 28 2006 Ralf Cors??pius - 0.28-4 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Aug 2005 16:37:06 -0000 1.2 +++ sources 21 May 2006 05:53:03 -0000 1.3 @@ -1 +1 @@ -b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz +3342f3ead4f9470d391a3e3a90f9f5ce File-Find-Rule-0.29.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:55:01 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:55:01 -0700 Subject: rpms/perl-File-Find-Rule/FC-5 .cvsignore, 1.2, 1.3 perl-File-Find-Rule.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200605210555.k4L5t3dr029385@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29364 Modified Files: .cvsignore perl-File-Find-Rule.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.29-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 +++ .cvsignore 21 May 2006 05:55:00 -0000 1.3 @@ -1 +1 @@ -File-Find-Rule-0.28.tar.gz +File-Find-Rule-0.29.tar.gz Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-5/perl-File-Find-Rule.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Find-Rule.spec 28 Feb 2006 22:36:27 -0000 1.3 +++ perl-File-Find-Rule.spec 21 May 2006 05:55:00 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule -Version: 0.28 -Release: 4%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.29-1 +- Upstream update. + * Tue Feb 28 2006 Ralf Cors??pius - 0.28-4 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Aug 2005 16:37:06 -0000 1.2 +++ sources 21 May 2006 05:55:00 -0000 1.3 @@ -1 +1 @@ -b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz +3342f3ead4f9470d391a3e3a90f9f5ce File-Find-Rule-0.29.tar.gz From fedora-extras-commits at redhat.com Sun May 21 05:58:37 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 22:58:37 -0700 Subject: rpms/perl-File-Find-Rule/FC-4 .cvsignore, 1.2, 1.3 perl-File-Find-Rule.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605210558.k4L5wdw0029498@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29477 Modified Files: .cvsignore perl-File-Find-Rule.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.29-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 +++ .cvsignore 21 May 2006 05:58:36 -0000 1.3 @@ -1 +1 @@ -File-Find-Rule-0.28.tar.gz +File-Find-Rule-0.29.tar.gz Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-4/perl-File-Find-Rule.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-Find-Rule.spec 16 Aug 2005 16:41:28 -0000 1.2 +++ perl-File-Find-Rule.spec 21 May 2006 05:58:36 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule -Version: 0.28 -Release: 3%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.29-1 +- Upstream update. + * Tue Aug 16 2005 Ralf Corsepius - 0.28-3 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Aug 2005 16:37:06 -0000 1.2 +++ sources 21 May 2006 05:58:36 -0000 1.3 @@ -1 +1 @@ -b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz +3342f3ead4f9470d391a3e3a90f9f5ce File-Find-Rule-0.29.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:00:22 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 23:00:22 -0700 Subject: rpms/perl-File-Find-Rule/FC-3 .cvsignore, 1.2, 1.3 perl-File-Find-Rule.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605210600.k4L60OML029581@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29559 Modified Files: .cvsignore perl-File-Find-Rule.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.29-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 +++ .cvsignore 21 May 2006 06:00:22 -0000 1.3 @@ -1 +1 @@ -File-Find-Rule-0.28.tar.gz +File-Find-Rule-0.29.tar.gz Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-3/perl-File-Find-Rule.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-File-Find-Rule.spec 16 Aug 2005 16:41:28 -0000 1.2 +++ perl-File-Find-Rule.spec 21 May 2006 06:00:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule -Version: 0.28 -Release: 3%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.29-1 +- Upstream update. + * Tue Aug 16 2005 Ralf Corsepius - 0.28-3 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Aug 2005 16:37:06 -0000 1.2 +++ sources 21 May 2006 06:00:22 -0000 1.3 @@ -1 +1 @@ -b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz +3342f3ead4f9470d391a3e3a90f9f5ce File-Find-Rule-0.29.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:14:05 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 23:14:05 -0700 Subject: rpms/perl-Params-Util/devel .cvsignore, 1.9, 1.10 perl-Params-Util.spec, 1.9, 1.10 sources, 1.9, 1.10 Message-ID: <200605210614.k4L6E7K7031931@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31910 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.14-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 May 2006 04:00:18 -0000 1.9 +++ .cvsignore 21 May 2006 06:14:05 -0000 1.10 @@ -1 +1 @@ -Params-Util-0.13.tar.gz +Params-Util-0.14.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Params-Util.spec 8 May 2006 04:00:18 -0000 1.9 +++ perl-Params-Util.spec 21 May 2006 06:14:05 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.14-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 May 2006 04:00:18 -0000 1.9 +++ sources 21 May 2006 06:14:05 -0000 1.10 @@ -1 +1 @@ -1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz +683689462ebfa30609fb5641a2658a21 Params-Util-0.14.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:17:06 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 23:17:06 -0700 Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.9, 1.10 perl-Params-Util.spec, 1.9, 1.10 sources, 1.9, 1.10 Message-ID: <200605210617.k4L6H8Ke032016@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31995 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.14-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 May 2006 04:19:41 -0000 1.9 +++ .cvsignore 21 May 2006 06:17:06 -0000 1.10 @@ -1 +1 @@ -Params-Util-0.13.tar.gz +Params-Util-0.14.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Params-Util.spec 8 May 2006 04:19:41 -0000 1.9 +++ perl-Params-Util.spec 21 May 2006 06:17:06 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.14-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 May 2006 04:19:41 -0000 1.9 +++ sources 21 May 2006 06:17:06 -0000 1.10 @@ -1 +1 @@ -1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz +683689462ebfa30609fb5641a2658a21 Params-Util-0.14.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:19:07 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 20 May 2006 23:19:07 -0700 Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.9, 1.10 perl-Params-Util.spec, 1.8, 1.9 sources, 1.9, 1.10 Message-ID: <200605210619.k4L6J9QN032097@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32074 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.14-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 May 2006 04:20:46 -0000 1.9 +++ .cvsignore 21 May 2006 06:19:07 -0000 1.10 @@ -1 +1 @@ -Params-Util-0.13.tar.gz +Params-Util-0.14.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Params-Util.spec 8 May 2006 04:20:46 -0000 1.8 +++ perl-Params-Util.spec 21 May 2006 06:19:07 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.14-1 +- Upstream update. + * Mon May 08 2006 Ralf Cors??pius - 0.13-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 8 May 2006 04:20:46 -0000 1.9 +++ sources 21 May 2006 06:19:07 -0000 1.10 @@ -1 +1 @@ -1d924942642afd0cb18ffeb15de1dc5c Params-Util-0.13.tar.gz +683689462ebfa30609fb5641a2658a21 Params-Util-0.14.tar.gz From fedora-extras-commits at redhat.com Sun May 21 06:38:56 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 20 May 2006 23:38:56 -0700 Subject: fedora-security/audit fe4,1.29,1.30 fe5,1.27,1.28 Message-ID: <200605210638.k4L6cuhV032235@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32215 Modified Files: fe4 fe5 Log Message: Note CVE-2006-1695 (fbida, fixed). Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- fe4 20 May 2006 09:55:18 -0000 1.29 +++ fe4 21 May 2006 06:38:53 -0000 1.30 @@ -36,6 +36,7 @@ CVE-2006-1724 version (seamonkey, fixed 1.0.1) CVE-2006-1723 version (seamonkey, fixed 1.0.1) CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1695 patch (fbida, fixed 2.03-6) bz#189721 CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 CVE-2006-1615 version (clamav, fixed 0.88.1) bz#188286 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- fe5 20 May 2006 09:55:18 -0000 1.27 +++ fe5 21 May 2006 06:38:53 -0000 1.28 @@ -37,6 +37,7 @@ CVE-2006-1724 version (seamonkey, fixed 1.0.1) CVE-2006-1723 version (seamonkey, fixed 1.0.1) CVE-2006-1711 version (plone, fixed 2.1.2) bz#188886 +CVE-2006-1695 patch (fbida, fixed 2.03-11) bz#189721 CVE-2006-1656 version (util-vserver, fixed 0.30.210) CVE-2006-1630 version (clamav, fixed 0.88.1) bz#188286 CVE-2006-1629 version (openvpn, fixed 2.0.6) bz#188050 From fedora-extras-commits at redhat.com Sun May 21 07:54:44 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 21 May 2006 00:54:44 -0700 Subject: rpms/sylpheed-claws-plugins/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sylpheed-claws-plugins.spec, 1.12, 1.13 sylpheed-claws-plugins-smime.patch, 1.1, NONE Message-ID: <200605210754.k4L7skrZ002278@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2241/FC-5 Modified Files: .cvsignore sources sylpheed-claws-plugins.spec Removed Files: sylpheed-claws-plugins-smime.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Apr 2006 00:34:35 -0000 1.5 +++ .cvsignore 21 May 2006 07:54:44 -0000 1.6 @@ -1 +1 @@ -sylpheed-claws-extra-plugins-2.1.0.tar.bz2 +sylpheed-claws-extra-plugins-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Apr 2006 00:34:35 -0000 1.5 +++ sources 21 May 2006 07:54:44 -0000 1.6 @@ -1 +1 @@ -c15f7bd52ebed8c9c9163c8a8e593c5d sylpheed-claws-extra-plugins-2.1.0.tar.bz2 +118a3f23dc9b7898518cf515b2e6dc19 sylpheed-claws-extra-plugins-2.2.0.tar.bz2 Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sylpheed-claws-plugins.spec 22 Apr 2006 01:17:50 -0000 1.12 +++ sylpheed-claws-plugins.spec 21 May 2006 07:54:44 -0000 1.13 @@ -1,5 +1,5 @@ Name: sylpheed-claws-plugins -Version: 2.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: Additional plugins for sylpheed-claws @@ -7,7 +7,7 @@ License: GPL URL: http://claws.sylpheed.org Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2 -Patch0: sylpheed-claws-plugins-smime.patch +#Patch0: sylpheed-claws-plugins-smime.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sylpheed-claws-devel >= %{version} @@ -183,83 +183,81 @@ %prep %setup -q -n sylpheed-claws-extra-plugins-%{version} -%patch0 %build - #acpi_notifier -cd acpi_notifier-1.0 +cd acpi_notifier-1.0.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #att_remover -cd ../att_remover-1.0 +cd ../att_remover-1.0.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} # cachesaver -cd ../cachesaver-0.7 +cd ../cachesaver-0.8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #etpan-privacy -cd ../etpan-privacy-0.13 +cd ../etpan-privacy-0.14 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.12 +cd ../fetchinfo-plugin-0.4.13 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #gtkhtml2-viewer -cd ../gtkhtml2_viewer-0.8 +cd ../gtkhtml2_viewer-0.10 %configure --disable-static --disable-dependency-tracking --disable-rpath %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool #maildir -cd ../maildir-0.20 +cd ../maildir-0.22 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #mailmbox -cd ../mailmbox-1.11 +cd ../mailmbox-1.12 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #newmail -cd ../newmail-0.0.3 +cd ../newmail-0.0.4 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #notification-plugin -cd ../notification_plugin-0.1 +cd ../notification_plugin-0.1.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #perl -cd ../perl_plugin-0.9 +cd ../perl_plugin-0.9.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #rssyl -cd ../rssyl-0.4cvs6 +cd ../rssyl-0.4cvs8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool #smime -cd ../smime-0.5 +cd ../smime-0.5.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #synce -cd ../synce_plugin-0.6 +cd ../synce_plugin-0.6.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #vcalendar -cd ../vcalendar-1.71 +cd ../vcalendar-1.78 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -267,64 +265,79 @@ rm -rf $RPM_BUILD_ROOT # acpi_notifier -cd acpi_notifier-1.0 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd acpi_notifier-1.0.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + # att_remover -cd ../att_remover-1.0 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../att_remover-1.0.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + # cachesaver -cd ../cachesaver-0.7 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../cachesaver-0.8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #etpan-privacy -cd ../etpan-privacy-0.13 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../etpan-privacy-0.14 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.12 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../fetchinfo-plugin-0.4.13 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #gtkhtml2-viewer -cd ../gtkhtml2_viewer-0.8 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../gtkhtml2_viewer-0.10 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #maildir -cd ../maildir-0.20 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../maildir-0.22 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #mailmbox -cd ../mailmbox-1.11 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../mailmbox-1.12 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #newmail -cd ../newmail-0.0.3 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../newmail-0.0.4 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #notification-plugin -cd ../notification_plugin-0.1 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../notification_plugin-0.1.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #perl -cd ../perl_plugin-0.9 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../perl_plugin-0.9.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #rssyl -cd ../rssyl-0.4cvs6 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../rssyl-0.4cvs8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #smime -cd ../smime-0.5 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../smime-0.5.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #synce -cd ../synce_plugin-0.6 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../synce_plugin-0.6.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #vcalendar -cd ../vcalendar-1.71 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../vcalendar-1.78 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -337,11 +350,11 @@ %files acpi-notifier %defattr(-,root,root,-) -%doc acpi_notifier-1.0/ChangeLog -%doc acpi_notifier-1.0/COPYING -%doc acpi_notifier-1.0/NEWS -%doc acpi_notifier-1.0/AUTHORS -%doc acpi_notifier-1.0/README +%doc acpi_notifier-1.0.1/ChangeLog +%doc acpi_notifier-1.0.1/COPYING +%doc acpi_notifier-1.0.1/NEWS +%doc acpi_notifier-1.0.1/AUTHORS +%doc acpi_notifier-1.0.1/README %{_libdir}/sylpheed-claws/plugins/acpi_notifier* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo @@ -356,93 +369,94 @@ %files att-remover %defattr(-,root,root,-) -%doc att_remover-1.0/AUTHORS -%doc att_remover-1.0/ChangeLog -%doc att_remover-1.0/COPYING -%doc att_remover-1.0/NEWS -%doc att_remover-1.0/README +%doc att_remover-1.0.1/AUTHORS +%doc att_remover-1.0.1/ChangeLog +%doc att_remover-1.0.1/COPYING +%doc att_remover-1.0.1/NEWS +%doc att_remover-1.0.1/README %{_libdir}/sylpheed-claws/plugins/att_remover* %files cachesaver %defattr(-,root,root,-) -%doc cachesaver-0.7/AUTHORS -%doc cachesaver-0.7/ChangeLog -%doc cachesaver-0.7/COPYING +%doc cachesaver-0.8/AUTHORS +%doc cachesaver-0.8/ChangeLog +%doc cachesaver-0.8/COPYING %{_libdir}/sylpheed-claws/plugins/cachesaver* %files etpan-privacy %defattr(-,root,root,-) -%doc etpan-privacy-0.13/AUTHORS -%doc etpan-privacy-0.13/ChangeLog -%doc etpan-privacy-0.13/COPYING -%doc etpan-privacy-0.13/README +%doc etpan-privacy-0.14/AUTHORS +%doc etpan-privacy-0.14/ChangeLog +%doc etpan-privacy-0.14/COPYING +%doc etpan-privacy-0.14/README %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so %files fetchinfo %defattr(-,root,root,-) -%doc fetchinfo-plugin-0.4.12/ChangeLog -%doc fetchinfo-plugin-0.4.12/COPYING -%doc fetchinfo-plugin-0.4.12/README +%doc fetchinfo-plugin-0.4.13/ChangeLog +%doc fetchinfo-plugin-0.4.13/COPYING +%doc fetchinfo-plugin-0.4.13/README %{_libdir}/sylpheed-claws/plugins/fetchinfo* %files gtkhtml2-viewer %defattr(-,root,root,-) -%doc gtkhtml2_viewer-0.8/AUTHORS -%doc gtkhtml2_viewer-0.8/COPYING +%doc gtkhtml2_viewer-0.10/AUTHORS +%doc gtkhtml2_viewer-0.10/COPYING %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer* %lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo %files maildir %defattr(-,root,root,-) -%doc maildir-0.20/AUTHORS -%doc maildir-0.20/ChangeLog -%doc maildir-0.20/COPYING -%doc maildir-0.20/README -%doc maildir-0.20/doc/README.xml +%doc maildir-0.22/AUTHORS +%doc maildir-0.22/ChangeLog +%doc maildir-0.22/COPYING +%doc maildir-0.22/README +%doc maildir-0.22/doc/README.xml %{_libdir}/sylpheed-claws/plugins/maildir* %files mailmbox %defattr(-,root,root,-) -%doc mailmbox-1.11/AUTHORS -%doc mailmbox-1.11/ChangeLog -%doc mailmbox-1.11/COPYING -%doc mailmbox-1.11/README +%doc mailmbox-1.12/AUTHORS +%doc mailmbox-1.12/ChangeLog +%doc mailmbox-1.12/COPYING +%doc mailmbox-1.12/README %{_libdir}/sylpheed-claws/plugins/mailmbox* %files newmail %defattr(-,root,root,-) -%doc newmail-0.0.3/AUTHORS -%doc newmail-0.0.3/ChangeLog -%doc newmail-0.0.3/COPYING -%doc newmail-0.0.3/NEWS -%doc newmail-0.0.3/README +%doc newmail-0.0.4/AUTHORS +%doc newmail-0.0.4/ChangeLog +%doc newmail-0.0.4/COPYING +%doc newmail-0.0.4/NEWS +%doc newmail-0.0.4/README %{_libdir}/sylpheed-claws/plugins/newmail.so %files notification %defattr(-,root,root,-) -%doc notification_plugin-0.1/AUTHORS -%doc notification_plugin-0.1/ChangeLog -%doc notification_plugin-0.1/COPYING -%doc notification_plugin-0.1/README +%doc notification_plugin-0.1.2/AUTHORS +%doc notification_plugin-0.1.2/ChangeLog +%doc notification_plugin-0.1.2/COPYING +%doc notification_plugin-0.1.2/README %{_libdir}/sylpheed-claws/plugins/notification_plugin.so %files perl %defattr(-,root,root,-) -%doc perl_plugin-0.9/AUTHORS -%doc perl_plugin-0.9/ChangeLog -%doc perl_plugin-0.9/COPYING -%doc perl_plugin-0.9/README -%doc perl_plugin-0.9/sc_perl.pod +%doc perl_plugin-0.9.2/AUTHORS +%doc perl_plugin-0.9.2/ChangeLog +%doc perl_plugin-0.9.2/COPYING +%doc perl_plugin-0.9.2/README +%doc perl_plugin-0.9.2/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so %files rssyl %defattr(-,root,root,-) -%doc rssyl-0.4cvs6/AUTHORS -%doc rssyl-0.4cvs6/ChangeLog -%doc rssyl-0.4cvs6/COPYING -%doc rssyl-0.4cvs6/TODO +%doc rssyl-0.4cvs8/AUTHORS +%doc rssyl-0.4cvs8/ChangeLog +%doc rssyl-0.4cvs8/COPYING +%doc rssyl-0.4cvs8/TODO %{_libdir}/sylpheed-claws/plugins/rssyl* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo @@ -450,6 +464,7 @@ %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/rssyl.mo %lang(it) %{_datadir}/locale/it/LC_MESSAGES/rssyl.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/rssyl.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/rssyl.mo %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/rssyl.mo %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/rssyl.mo %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo @@ -457,25 +472,25 @@ %files smime %defattr(-,root,root,-) -%doc smime-0.5/ChangeLog -%doc smime-0.5/COPYING -%doc smime-0.5/NEWS +%doc smime-0.5.2/ChangeLog +%doc smime-0.5.2/COPYING +%doc smime-0.5.2/NEWS %{_libdir}/sylpheed-claws/plugins/smime.so %files synce %defattr(-,root,root,-) -%doc synce_plugin-0.6/AUTHORS -%doc synce_plugin-0.6/ChangeLog -%doc synce_plugin-0.6/COPYING -%doc synce_plugin-0.6/README +%doc synce_plugin-0.6.1/AUTHORS +%doc synce_plugin-0.6.1/ChangeLog +%doc synce_plugin-0.6.1/COPYING +%doc synce_plugin-0.6.1/README %{_libdir}/sylpheed-claws/plugins/synce* %files vcalendar %defattr(-,root,root,-) -%doc vcalendar-1.71/AUTHORS -%doc vcalendar-1.71/ChangeLog -%doc vcalendar-1.71/COPYING -%doc vcalendar-1.71/README +%doc vcalendar-1.78/AUTHORS +%doc vcalendar-1.78/ChangeLog +%doc vcalendar-1.78/COPYING +%doc vcalendar-1.78/README %{_libdir}/sylpheed-claws/plugins/vcalendar* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo @@ -483,12 +498,17 @@ %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/vcalendar.mo %lang(it) %{_datadir}/locale/it/LC_MESSAGES/vcalendar.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/vcalendar.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/vcalendar.mo %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/vcalendar.mo %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/vcalendar.mo %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/vcalendar.mo %exclude %{_includedir}/ical.h %changelog +* Tue May 16 2006 Andreas Bierfert +2.2.0-1 +- version upgrade + * Sat Apr 08 2006 Andreas Bierfert 2.1.0-1 - version upgrade --- sylpheed-claws-plugins-smime.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 21 07:54:45 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 21 May 2006 00:54:45 -0700 Subject: rpms/sylpheed-claws-plugins/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sylpheed-claws-plugins.spec, 1.12, 1.13 sylpheed-claws-plugins-smime.patch, 1.1, NONE Message-ID: <200605210754.k4L7slC9002284@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2241/devel Modified Files: .cvsignore sources sylpheed-claws-plugins.spec Removed Files: sylpheed-claws-plugins-smime.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Apr 2006 00:34:35 -0000 1.5 +++ .cvsignore 21 May 2006 07:54:44 -0000 1.6 @@ -1 +1 @@ -sylpheed-claws-extra-plugins-2.1.0.tar.bz2 +sylpheed-claws-extra-plugins-2.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Apr 2006 00:34:35 -0000 1.5 +++ sources 21 May 2006 07:54:44 -0000 1.6 @@ -1 +1 @@ -c15f7bd52ebed8c9c9163c8a8e593c5d sylpheed-claws-extra-plugins-2.1.0.tar.bz2 +118a3f23dc9b7898518cf515b2e6dc19 sylpheed-claws-extra-plugins-2.2.0.tar.bz2 Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sylpheed-claws-plugins.spec 22 Apr 2006 01:17:51 -0000 1.12 +++ sylpheed-claws-plugins.spec 21 May 2006 07:54:44 -0000 1.13 @@ -1,5 +1,5 @@ Name: sylpheed-claws-plugins -Version: 2.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: Additional plugins for sylpheed-claws @@ -7,7 +7,7 @@ License: GPL URL: http://claws.sylpheed.org Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2 -Patch0: sylpheed-claws-plugins-smime.patch +#Patch0: sylpheed-claws-plugins-smime.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sylpheed-claws-devel >= %{version} @@ -183,83 +183,81 @@ %prep %setup -q -n sylpheed-claws-extra-plugins-%{version} -%patch0 %build - #acpi_notifier -cd acpi_notifier-1.0 +cd acpi_notifier-1.0.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #att_remover -cd ../att_remover-1.0 +cd ../att_remover-1.0.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} # cachesaver -cd ../cachesaver-0.7 +cd ../cachesaver-0.8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #etpan-privacy -cd ../etpan-privacy-0.13 +cd ../etpan-privacy-0.14 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.12 +cd ../fetchinfo-plugin-0.4.13 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #gtkhtml2-viewer -cd ../gtkhtml2_viewer-0.8 +cd ../gtkhtml2_viewer-0.10 %configure --disable-static --disable-dependency-tracking --disable-rpath %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool #maildir -cd ../maildir-0.20 +cd ../maildir-0.22 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #mailmbox -cd ../mailmbox-1.11 +cd ../mailmbox-1.12 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #newmail -cd ../newmail-0.0.3 +cd ../newmail-0.0.4 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #notification-plugin -cd ../notification_plugin-0.1 +cd ../notification_plugin-0.1.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #perl -cd ../perl_plugin-0.9 +cd ../perl_plugin-0.9.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #rssyl -cd ../rssyl-0.4cvs6 +cd ../rssyl-0.4cvs8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool #smime -cd ../smime-0.5 +cd ../smime-0.5.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #synce -cd ../synce_plugin-0.6 +cd ../synce_plugin-0.6.1 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #vcalendar -cd ../vcalendar-1.71 +cd ../vcalendar-1.78 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool @@ -267,64 +265,79 @@ rm -rf $RPM_BUILD_ROOT # acpi_notifier -cd acpi_notifier-1.0 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd acpi_notifier-1.0.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + # att_remover -cd ../att_remover-1.0 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../att_remover-1.0.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + # cachesaver -cd ../cachesaver-0.7 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../cachesaver-0.8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #etpan-privacy -cd ../etpan-privacy-0.13 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../etpan-privacy-0.14 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #fetchinfo-plugin -cd ../fetchinfo-plugin-0.4.12 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../fetchinfo-plugin-0.4.13 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #gtkhtml2-viewer -cd ../gtkhtml2_viewer-0.8 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../gtkhtml2_viewer-0.10 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #maildir -cd ../maildir-0.20 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../maildir-0.22 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #mailmbox -cd ../mailmbox-1.11 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../mailmbox-1.12 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #newmail -cd ../newmail-0.0.3 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../newmail-0.0.4 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #notification-plugin -cd ../notification_plugin-0.1 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../notification_plugin-0.1.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #perl -cd ../perl_plugin-0.9 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../perl_plugin-0.9.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #rssyl -cd ../rssyl-0.4cvs6 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../rssyl-0.4cvs8 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #smime -cd ../smime-0.5 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../smime-0.5.2 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #synce -cd ../synce_plugin-0.6 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../synce_plugin-0.6.1 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + #vcalendar -cd ../vcalendar-1.71 -%{__make} install DESTDIR=$RPM_BUILD_ROOT +cd ../vcalendar-1.78 +%{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/ + find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -337,11 +350,11 @@ %files acpi-notifier %defattr(-,root,root,-) -%doc acpi_notifier-1.0/ChangeLog -%doc acpi_notifier-1.0/COPYING -%doc acpi_notifier-1.0/NEWS -%doc acpi_notifier-1.0/AUTHORS -%doc acpi_notifier-1.0/README +%doc acpi_notifier-1.0.1/ChangeLog +%doc acpi_notifier-1.0.1/COPYING +%doc acpi_notifier-1.0.1/NEWS +%doc acpi_notifier-1.0.1/AUTHORS +%doc acpi_notifier-1.0.1/README %{_libdir}/sylpheed-claws/plugins/acpi_notifier* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo @@ -356,93 +369,94 @@ %files att-remover %defattr(-,root,root,-) -%doc att_remover-1.0/AUTHORS -%doc att_remover-1.0/ChangeLog -%doc att_remover-1.0/COPYING -%doc att_remover-1.0/NEWS -%doc att_remover-1.0/README +%doc att_remover-1.0.1/AUTHORS +%doc att_remover-1.0.1/ChangeLog +%doc att_remover-1.0.1/COPYING +%doc att_remover-1.0.1/NEWS +%doc att_remover-1.0.1/README %{_libdir}/sylpheed-claws/plugins/att_remover* %files cachesaver %defattr(-,root,root,-) -%doc cachesaver-0.7/AUTHORS -%doc cachesaver-0.7/ChangeLog -%doc cachesaver-0.7/COPYING +%doc cachesaver-0.8/AUTHORS +%doc cachesaver-0.8/ChangeLog +%doc cachesaver-0.8/COPYING %{_libdir}/sylpheed-claws/plugins/cachesaver* %files etpan-privacy %defattr(-,root,root,-) -%doc etpan-privacy-0.13/AUTHORS -%doc etpan-privacy-0.13/ChangeLog -%doc etpan-privacy-0.13/COPYING -%doc etpan-privacy-0.13/README +%doc etpan-privacy-0.14/AUTHORS +%doc etpan-privacy-0.14/ChangeLog +%doc etpan-privacy-0.14/COPYING +%doc etpan-privacy-0.14/README %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so %files fetchinfo %defattr(-,root,root,-) -%doc fetchinfo-plugin-0.4.12/ChangeLog -%doc fetchinfo-plugin-0.4.12/COPYING -%doc fetchinfo-plugin-0.4.12/README +%doc fetchinfo-plugin-0.4.13/ChangeLog +%doc fetchinfo-plugin-0.4.13/COPYING +%doc fetchinfo-plugin-0.4.13/README %{_libdir}/sylpheed-claws/plugins/fetchinfo* %files gtkhtml2-viewer %defattr(-,root,root,-) -%doc gtkhtml2_viewer-0.8/AUTHORS -%doc gtkhtml2_viewer-0.8/COPYING +%doc gtkhtml2_viewer-0.10/AUTHORS +%doc gtkhtml2_viewer-0.10/COPYING %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer* %lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo %files maildir %defattr(-,root,root,-) -%doc maildir-0.20/AUTHORS -%doc maildir-0.20/ChangeLog -%doc maildir-0.20/COPYING -%doc maildir-0.20/README -%doc maildir-0.20/doc/README.xml +%doc maildir-0.22/AUTHORS +%doc maildir-0.22/ChangeLog +%doc maildir-0.22/COPYING +%doc maildir-0.22/README +%doc maildir-0.22/doc/README.xml %{_libdir}/sylpheed-claws/plugins/maildir* %files mailmbox %defattr(-,root,root,-) -%doc mailmbox-1.11/AUTHORS -%doc mailmbox-1.11/ChangeLog -%doc mailmbox-1.11/COPYING -%doc mailmbox-1.11/README +%doc mailmbox-1.12/AUTHORS +%doc mailmbox-1.12/ChangeLog +%doc mailmbox-1.12/COPYING +%doc mailmbox-1.12/README %{_libdir}/sylpheed-claws/plugins/mailmbox* %files newmail %defattr(-,root,root,-) -%doc newmail-0.0.3/AUTHORS -%doc newmail-0.0.3/ChangeLog -%doc newmail-0.0.3/COPYING -%doc newmail-0.0.3/NEWS -%doc newmail-0.0.3/README +%doc newmail-0.0.4/AUTHORS +%doc newmail-0.0.4/ChangeLog +%doc newmail-0.0.4/COPYING +%doc newmail-0.0.4/NEWS +%doc newmail-0.0.4/README %{_libdir}/sylpheed-claws/plugins/newmail.so %files notification %defattr(-,root,root,-) -%doc notification_plugin-0.1/AUTHORS -%doc notification_plugin-0.1/ChangeLog -%doc notification_plugin-0.1/COPYING -%doc notification_plugin-0.1/README +%doc notification_plugin-0.1.2/AUTHORS +%doc notification_plugin-0.1.2/ChangeLog +%doc notification_plugin-0.1.2/COPYING +%doc notification_plugin-0.1.2/README %{_libdir}/sylpheed-claws/plugins/notification_plugin.so %files perl %defattr(-,root,root,-) -%doc perl_plugin-0.9/AUTHORS -%doc perl_plugin-0.9/ChangeLog -%doc perl_plugin-0.9/COPYING -%doc perl_plugin-0.9/README -%doc perl_plugin-0.9/sc_perl.pod +%doc perl_plugin-0.9.2/AUTHORS +%doc perl_plugin-0.9.2/ChangeLog +%doc perl_plugin-0.9.2/COPYING +%doc perl_plugin-0.9.2/README +%doc perl_plugin-0.9.2/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so %files rssyl %defattr(-,root,root,-) -%doc rssyl-0.4cvs6/AUTHORS -%doc rssyl-0.4cvs6/ChangeLog -%doc rssyl-0.4cvs6/COPYING -%doc rssyl-0.4cvs6/TODO +%doc rssyl-0.4cvs8/AUTHORS +%doc rssyl-0.4cvs8/ChangeLog +%doc rssyl-0.4cvs8/COPYING +%doc rssyl-0.4cvs8/TODO %{_libdir}/sylpheed-claws/plugins/rssyl* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo @@ -450,6 +464,7 @@ %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/rssyl.mo %lang(it) %{_datadir}/locale/it/LC_MESSAGES/rssyl.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/rssyl.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/rssyl.mo %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/rssyl.mo %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/rssyl.mo %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo @@ -457,25 +472,25 @@ %files smime %defattr(-,root,root,-) -%doc smime-0.5/ChangeLog -%doc smime-0.5/COPYING -%doc smime-0.5/NEWS +%doc smime-0.5.2/ChangeLog +%doc smime-0.5.2/COPYING +%doc smime-0.5.2/NEWS %{_libdir}/sylpheed-claws/plugins/smime.so %files synce %defattr(-,root,root,-) -%doc synce_plugin-0.6/AUTHORS -%doc synce_plugin-0.6/ChangeLog -%doc synce_plugin-0.6/COPYING -%doc synce_plugin-0.6/README +%doc synce_plugin-0.6.1/AUTHORS +%doc synce_plugin-0.6.1/ChangeLog +%doc synce_plugin-0.6.1/COPYING +%doc synce_plugin-0.6.1/README %{_libdir}/sylpheed-claws/plugins/synce* %files vcalendar %defattr(-,root,root,-) -%doc vcalendar-1.71/AUTHORS -%doc vcalendar-1.71/ChangeLog -%doc vcalendar-1.71/COPYING -%doc vcalendar-1.71/README +%doc vcalendar-1.78/AUTHORS +%doc vcalendar-1.78/ChangeLog +%doc vcalendar-1.78/COPYING +%doc vcalendar-1.78/README %{_libdir}/sylpheed-claws/plugins/vcalendar* %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo @@ -483,12 +498,17 @@ %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/vcalendar.mo %lang(it) %{_datadir}/locale/it/LC_MESSAGES/vcalendar.mo %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/vcalendar.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/vcalendar.mo %lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/vcalendar.mo %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/vcalendar.mo %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/vcalendar.mo %exclude %{_includedir}/ical.h %changelog +* Tue May 16 2006 Andreas Bierfert +2.2.0-1 +- version upgrade + * Sat Apr 08 2006 Andreas Bierfert 2.1.0-1 - version upgrade --- sylpheed-claws-plugins-smime.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 21 08:48:32 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 May 2006 01:48:32 -0700 Subject: rpms/perl-Params-Validate/devel .cvsignore, 1.5, 1.6 perl-Params-Validate.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605210848.k4L8mY66004807@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4786 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.82-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Apr 2006 07:23:28 -0000 1.5 +++ .cvsignore 21 May 2006 08:48:32 -0000 1.6 @@ -1 +1 @@ -Params-Validate-0.81.tar.gz +Params-Validate-0.82.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Params-Validate.spec 4 Apr 2006 07:23:28 -0000 1.6 +++ perl-Params-Validate.spec 21 May 2006 08:48:32 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.81 +Version: 0.82 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.82-1 +- Upstream update. + * Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Apr 2006 07:23:28 -0000 1.5 +++ sources 21 May 2006 08:48:32 -0000 1.6 @@ -1 +1 @@ -033d043c4764b800722b9d7442bc4530 Params-Validate-0.81.tar.gz +f83a21a6674890f243d2c43f98fe236c Params-Validate-0.82.tar.gz From fedora-extras-commits at redhat.com Sun May 21 08:54:19 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 May 2006 01:54:19 -0700 Subject: rpms/perl-Params-Validate/FC-5 .cvsignore, 1.5, 1.6 perl-Params-Validate.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605210854.k4L8sLXu005288@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5267 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.82-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Apr 2006 17:13:10 -0000 1.5 +++ .cvsignore 21 May 2006 08:54:19 -0000 1.6 @@ -1 +1 @@ -Params-Validate-0.81.tar.gz +Params-Validate-0.82.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/perl-Params-Validate.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Params-Validate.spec 20 Apr 2006 17:13:10 -0000 1.6 +++ perl-Params-Validate.spec 21 May 2006 08:54:19 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.81 +Version: 0.82 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.82-1 +- Upstream update. + * Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Apr 2006 17:13:10 -0000 1.5 +++ sources 21 May 2006 08:54:19 -0000 1.6 @@ -1 +1 @@ -033d043c4764b800722b9d7442bc4530 Params-Validate-0.81.tar.gz +f83a21a6674890f243d2c43f98fe236c Params-Validate-0.82.tar.gz From fedora-extras-commits at redhat.com Sun May 21 08:56:21 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 May 2006 01:56:21 -0700 Subject: rpms/perl-Params-Validate/FC-4 .cvsignore, 1.5, 1.6 perl-Params-Validate.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200605210856.k4L8uNO9005363@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5342 Modified Files: .cvsignore perl-Params-Validate.spec sources Log Message: * Sun May 21 2006 Ralf Cors??pius - 0.82-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 May 2006 04:42:23 -0000 1.5 +++ .cvsignore 21 May 2006 08:56:21 -0000 1.6 @@ -1 +1 @@ -Params-Validate-0.81.tar.gz +Params-Validate-0.82.tar.gz Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/perl-Params-Validate.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Params-Validate.spec 8 May 2006 04:42:23 -0000 1.5 +++ perl-Params-Validate.spec 21 May 2006 08:56:21 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate -Version: 0.81 +Version: 0.82 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ %{_mandir}/man3/* %changelog +* Sun May 21 2006 Ralf Cors??pius - 0.82-1 +- Upstream update. + * Wed Apr 04 2006 Ralf Cors??pius - 0.81-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 May 2006 04:42:23 -0000 1.5 +++ sources 21 May 2006 08:56:21 -0000 1.6 @@ -1 +1 @@ -033d043c4764b800722b9d7442bc4530 Params-Validate-0.81.tar.gz +f83a21a6674890f243d2c43f98fe236c Params-Validate-0.82.tar.gz From fedora-extras-commits at redhat.com Sun May 21 11:05:29 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sun, 21 May 2006 04:05:29 -0700 Subject: rpms/acpitool/devel .cvsignore, 1.3, 1.4 acpitool.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605211105.k4LB5Vk5012782@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpitool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12761 Modified Files: .cvsignore acpitool.spec sources Log Message: * Thu Feb 16 2006 Patrice Dumas - 0.4.5-1 - update to 0.4.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/acpitool/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Feb 2006 20:50:40 -0000 1.3 +++ .cvsignore 21 May 2006 11:05:29 -0000 1.4 @@ -1 +1 @@ -acpitool-0.4.4.tar.gz +acpitool-0.4.5.tar.gz Index: acpitool.spec =================================================================== RCS file: /cvs/extras/rpms/acpitool/devel/acpitool.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acpitool.spec 16 Feb 2006 20:57:03 -0000 1.5 +++ acpitool.spec 21 May 2006 11:05:29 -0000 1.6 @@ -1,6 +1,6 @@ Name: acpitool -Version: 0.4.4 -Release: 1%{?dist}.1 +Version: 0.4.5 +Release: 1%{?dist} Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz Summary: A command line ACPI client for Linux @@ -38,6 +38,9 @@ %{_mandir}/man1/acpitool* %changelog +* Thu Feb 16 2006 Patrice Dumas - 0.4.5-1 +- update to 0.4.5 + * Thu Feb 16 2006 Patrice Dumas - 0.4.4-1.1 - new version - remove now unneeded patch @@ -51,4 +54,3 @@ * Tue Aug 24 2004 Robert Ambrose - Created .spec file. - Index: sources =================================================================== RCS file: /cvs/extras/rpms/acpitool/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Feb 2006 20:50:40 -0000 1.3 +++ sources 21 May 2006 11:05:29 -0000 1.4 @@ -1 +1 @@ -7e487ac3118f316876e9b441dec4e3ad acpitool-0.4.4.tar.gz +34647d800617cfa506c0db086c0d6195 acpitool-0.4.5.tar.gz From fedora-extras-commits at redhat.com Sun May 21 11:19:48 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:19:48 -0700 Subject: rpms/gtkglextmm - New directory Message-ID: <200605211119.k4LBJoZ1013343@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13315/gtkglextmm Log Message: Directory /cvs/extras/rpms/gtkglextmm added to the repository From fedora-extras-commits at redhat.com Sun May 21 11:19:49 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:19:49 -0700 Subject: rpms/gtkglextmm/devel - New directory Message-ID: <200605211119.k4LBJpVK013346@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13315/gtkglextmm/devel Log Message: Directory /cvs/extras/rpms/gtkglextmm/devel added to the repository From fedora-extras-commits at redhat.com Sun May 21 11:20:11 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:20:11 -0700 Subject: rpms/gtkglextmm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605211120.k4LBKDXd013393@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13365 Added Files: Makefile import.log Log Message: Setup of module gtkglextmm --- NEW FILE Makefile --- # Top level Makefile for module gtkglextmm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 21 11:20:12 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:20:12 -0700 Subject: rpms/gtkglextmm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605211120.k4LBKECw013396@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13365/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gtkglextmm --- NEW 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 May 21 11:20:52 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:20:52 -0700 Subject: rpms/gtkglextmm import.log,1.1,1.2 Message-ID: <200605211121.k4LBLONc013473@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13439 Modified Files: import.log Log Message: auto-import gtkglextmm-1.2.0-2 on branch devel from gtkglextmm-1.2.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 May 2006 11:20:11 -0000 1.1 +++ import.log 21 May 2006 11:20:52 -0000 1.2 @@ -0,0 +1 @@ +gtkglextmm-1_2_0-2:HEAD:gtkglextmm-1.2.0-2.src.rpm:1148210462 From fedora-extras-commits at redhat.com Sun May 21 11:20:53 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:20:53 -0700 Subject: rpms/gtkglextmm/devel gtkglextmm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605211121.k4LBLP3k013478@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13439/devel Modified Files: .cvsignore sources Added Files: gtkglextmm.spec Log Message: auto-import gtkglextmm-1.2.0-2 on branch devel from gtkglextmm-1.2.0-2.src.rpm --- NEW FILE gtkglextmm.spec --- %define gtkglext_major 1.0 %define gtkglextmm_major 1.2 %define gtkmm_major 2.4 Summary: C++ wrapper for GtkGlExt Name: gtkglextmm Version: 1.2.0 Release: 2 License: LGPL Group: System Environment/Libraries URL: http://gtkglext.sourceforge.net Source0: http://dl.sourceforge.net/sourceforge/gtkglext/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkglext-devel >= %{gtkglext_major} BuildRequires: gtkmm24-devel >= %{gtkmm_major} Requires(postun): /sbin/ldconfig Requires(post): /sbin/ldconfig %description gtkglextmm is a C++ wrapper for GtkGlExt, an OpenGL extension to GTK+. %package devel Summary: Development tools for gtkglextmm Group: Development/Libraries Requires: %{name} = %{version} Requires: gtkmm24-devel Requires: gtkglext-devel %description devel The gtkglextmm-devel package contains the header files, static libraries, and developer docs for gtkglextmm. %prep %setup -q -n gtkglextmm-%{version} %build %configure --disable-static %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT make install %clean %{__rm} -rf $RPM_BUILD_ROOT %post /sbin/ldconfig %postun /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog README TODO AUTHORS COPYING.LIB COPYING NEWS %{_libdir}/libgtkglextmm-x11-*so.* %{_libdir}/libgdkglextmm-x11-*so.* %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/%{name}-%{gtkglextmm_major} %{_libdir}/lib*la %{_libdir}/lib*so %{_libdir}/pkgconfig/* %{_datadir}/aclocal/* %doc %{_datadir}/doc/%{name}-%{gtkglextmm_major}/html/* %changelog * Fri May 17 2006 Gilles Gagniard 1.2.0-2 - Removed unnecessary dependencies * Fri May 12 2006 Gilles Gagniard 1.2.0-1 - First version of the package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 21 May 2006 11:20:12 -0000 1.1 +++ .cvsignore 21 May 2006 11:20:52 -0000 1.2 @@ -0,0 +1 @@ +gtkglextmm-1.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 21 May 2006 11:20:12 -0000 1.1 +++ sources 21 May 2006 11:20:52 -0000 1.2 @@ -0,0 +1 @@ +27c05f4d45c5fd07b6fb0f044add3056 gtkglextmm-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Sun May 21 11:26:13 2006 From: fedora-extras-commits at redhat.com (Gilles Gagniard (jaile)) Date: Sun, 21 May 2006 04:26:13 -0700 Subject: owners owners.list,1.1033,1.1034 Message-ID: <200605211126.k4LBQFdV013299@cvs-int.fedora.redhat.com> Author: jaile Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13282 Modified Files: owners.list Log Message: adding gtkglextmm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1033 retrieving revision 1.1034 diff -u -r1.1033 -r1.1034 --- owners.list 20 May 2006 21:29:53 -0000 1.1033 +++ owners.list 21 May 2006 11:26:13 -0000 1.1034 @@ -463,6 +463,7 @@ Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| +Fedora Extras|gtkglextmm|C++ binding for gtkglext|gilles.gagniard at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gtkhtml36|GtkHTML 3.6 Compatibility Library|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|gtklp|A GTK frontend to CUPS|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 21 12:42:42 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 21 May 2006 05:42:42 -0700 Subject: kadischi/livecd_generator movefiles.py,1.2,1.3 Message-ID: <200605211242.k4LCggx9015922@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15905/kadischi/livecd_generator Modified Files: movefiles.py Log Message: Keep udev directory and modprobe.conf during movefiles Index: movefiles.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/movefiles.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- movefiles.py 31 Mar 2006 21:03:36 -0000 1.2 +++ movefiles.py 21 May 2006 12:42:39 -0000 1.3 @@ -45,6 +45,8 @@ '/etc/fstab', '/etc/mtab', '/etc/makedev.d', + '/etc/udev', + '/etc/modprobe.conf', ] rootdir = sys.argv[1] From fedora-extras-commits at redhat.com Sun May 21 13:17:46 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 21 May 2006 06:17:46 -0700 Subject: rpms/amarok/FC-5 .cvsignore, 1.22, 1.23 amarok-1.4-gstreamer.patch, 1.1, 1.2 amarok.spec, 1.48, 1.49 sources, 1.22, 1.23 amarok-1.3.6-libtunepimp040.patch, 1.1, NONE amarok-1.4beta1-gst10.patch, 1.2, NONE Message-ID: <200605211318.k4LDIIpl018413@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/FC-5 Modified Files: .cvsignore amarok-1.4-gstreamer.patch amarok.spec sources Removed Files: amarok-1.3.6-libtunepimp040.patch amarok-1.4beta1-gst10.patch Log Message: version 1.4 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 19 May 2006 21:04:47 -0000 1.22 +++ .cvsignore 21 May 2006 13:17:46 -0000 1.23 @@ -1 +1,2 @@ amarok-1.4.0a.tar.bz2 +gst10-1.4beta3.tar.gz amarok-1.4-gstreamer.patch: Index: amarok-1.4-gstreamer.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok-1.4-gstreamer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4-gstreamer.patch 14 Apr 2006 08:30:44 -0000 1.1 +++ amarok-1.4-gstreamer.patch 21 May 2006 13:17:46 -0000 1.2 @@ -1,6 +1,222 @@ ---- ./configure.gstreamer 2006-04-09 23:08:39.000000000 +0200 -+++ ./configure 2006-04-14 10:23:09.000000000 +0200 -@@ -37922,7 +37922,7 @@ +--- ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop.gstreamer 2006-05-21 14:31:55.000000000 +0200 ++++ ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop 2006-05-21 14:32:05.000000000 +0200 +@@ -74,6 +74,6 @@ + X-KDE-amaroK-email=markey at web.de + X-KDE-amaroK-rank=254 + X-KDE-amaroK-version=1 +-X-KDE-amaroK-framework-version=20 ++X-KDE-amaroK-framework-version=23 + + +--- ./amarok/src/engine/Makefile.in.gstreamer 2006-05-14 22:05:27.000000000 +0200 ++++ ./amarok/src/engine/Makefile.in 2006-05-21 14:12:47.000000000 +0200 +@@ -365,9 +365,6 @@ + + + +-#if with_gst10 +-# GST10_ENGINE_SUBDIR = gst10 +-#endif + @with_nmm_TRUE at NMM_ENGINE_SUBDIR = nmm + + @with_xine_TRUE at XINE_ENGINE_SUBDIR = xine +@@ -388,7 +385,8 @@ + void \ + $(XINE_ENGINE_SUBDIR) \ + $(NMM_ENGINE_SUBDIR) \ +- $(HELIX_ENGINE_SUBDIR) ++ $(HELIX_ENGINE_SUBDIR) \ ++ gst10 + + subdir = amarok/src/engine + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +--- ./configure.gstreamer 2006-05-14 22:04:55.000000000 +0200 ++++ ./configure 2006-05-21 14:11:29.000000000 +0200 +@@ -32730,41 +32730,148 @@ + # BEGIN GSTREAMER-0.10 CHECK + ############################################################################### + +-#AC_ARG_WITH(gstreamer10, +-# AC_HELP_STRING([--with-gstreamer10],[build amaroK with GStreamer 0.10-engine]), +-# [build_gstreamer10=$withval], +-# [build_gstreamer10=no] +-#) +-# +-#if test "$build_gstreamer10" != "no"; then +-# if test "$PKGCONFIGFOUND" = "yes" ; then +-# # check for GStreamer +-# dnl Now we're ready to ask for gstreamer libs and cflags +-# dnl And we can also ask for the right version of gstreamer +-# have_gst10=no +-# +-# GST10_MAJORMINOR=0.10 +-# GST10_REQ=0.10.0 +-# +-# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR, +-# have_gst10=yes,have_gst10=no) +-# +-# dnl Give error if we don't have gstreamer +-# if test "x$have_gst10" = "xno"; then +-# LIB_GST10="" +-# CFLAGS_GST10="" +-# else +-# LIB_GST10=$GST10_LIBS +-# CFLAGS_GST10=$GST10_CFLAGS +-# AC_SUBST(LIB_GST10) +-# AC_SUBST(CFLAGS_GST10) +-# AC_SUBST(GST10_MAJORMINOR) +-# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10]) +-# fi +-# fi +-#fi +-# +-#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes]) ++# Check whether --with-gstreamer10 or --without-gstreamer10 was given. ++if test "${with_gstreamer10+set}" = set; then ++ withval="$with_gstreamer10" ++ build_gstreamer10=$withval ++else ++ build_gstreamer10=no ++ ++fi; ++ ++if test "$build_gstreamer10" != "no"; then ++ if test "$PKGCONFIGFOUND" = "yes" ; then ++ # check for GStreamer ++ have_gst10=no ++ ++ GST10_MAJORMINOR=0.10 ++ GST10_REQ=0.10.0 ++ ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++ ++if test -n "$PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo "$as_me:$LINENO: checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" >&5 ++echo $ECHO_N "checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR... $ECHO_C" >&6 ++ ++ if $PKG_CONFIG --exists "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" ; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ succeeded=yes ++ ++ echo "$as_me:$LINENO: checking GST10_CFLAGS" >&5 ++echo $ECHO_N "checking GST10_CFLAGS... $ECHO_C" >&6 ++ GST10_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ echo "$as_me:$LINENO: result: $GST10_CFLAGS" >&5 ++echo "${ECHO_T}$GST10_CFLAGS" >&6 ++ ++ echo "$as_me:$LINENO: checking GST10_LIBS" >&5 ++echo $ECHO_N "checking GST10_LIBS... $ECHO_C" >&6 ++ GST10_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ echo "$as_me:$LINENO: result: $GST10_LIBS" >&5 ++echo "${ECHO_T}$GST10_LIBS" >&6 ++ else ++ GST10_CFLAGS="" ++ GST10_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ GST10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ have_gst10=yes ++ else ++ have_gst10=no ++ fi ++ ++ ++ if test "x$have_gst10" = "xno"; then ++ LIB_GST10="" ++ CFLAGS_GST10="" ++ else ++ LIB_GST10=$GST10_LIBS ++ CFLAGS_GST10=$GST10_CFLAGS ++ ++ ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_GSTREAMER10 1 ++_ACEOF ++ ++ fi ++ fi ++fi ++ ++ ++ ++if test x$have_gst10 = xyes; then ++ with_gst10_TRUE= ++ with_gst10_FALSE='#' ++else ++ with_gst10_TRUE='#' ++ with_gst10_FALSE= ++fi ++ + + ############################################################################### + # END GSTREAMER-0.10 CHECK +@@ -37885,7 +37992,7 @@ # BEGIN DO_NOT_COMPILE CHECK ############################################################################### @@ -9,7 +225,44 @@ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" no_engine=yes -@@ -40316,7 +40316,7 @@ +@@ -38007,6 +38114,12 @@ + ac_config_files="$ac_config_files amarok/src/engine/void/Makefile" + + ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/config/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/equalizer/Makefile" + + ac_config_files="$ac_config_files amarok/src/images/Makefile" + +@@ -38913,6 +39026,9 @@ + "amarok/src/engine/nmm/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;; + "amarok/src/engine/void/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;; + "amarok/src/engine/xine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;; ++ "amarok/src/engine/gst10/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/Makefile" ;; ++ "amarok/src/engine/gst10/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/config/Makefile" ;; ++ "amarok/src/engine/gst10/equalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/equalizer/Makefile" ;; + "amarok/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;; + "amarok/src/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;; + "amarok/src/konquisidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;; +@@ -39314,6 +39430,13 @@ + s, at taglib_includes@,$taglib_includes,;t t + s, at taglib_libs@,$taglib_libs,;t t + s, at RUBY@,$RUBY,;t t ++s, at GST10_CFLAGS@,$GST10_CFLAGS,;t t ++s, at GST10_LIBS@,$GST10_LIBS,;t t ++s, at LIB_GST10@,$LIB_GST10,;t t ++s, at CFLAGS_GST10@,$CFLAGS_GST10,;t t ++s, at GST10_MAJORMINOR@,$GST10_MAJORMINOR,;t t ++s, at with_gst10_TRUE@,$with_gst10_TRUE,;t t ++s, at with_gst10_FALSE@,$with_gst10_FALSE,;t t + s, at XINE_CONFIG@,$XINE_CONFIG,;t t + s, at with_xine_TRUE@,$with_xine_TRUE,;t t + s, at with_xine_FALSE@,$with_xine_FALSE,;t t +@@ -40259,7 +40382,7 @@ echo " ==================================" echo " =" echo " = No suitable multimedia framework was detected. You need to install at least" @@ -18,3 +271,29 @@ echo " =" fi +@@ -40290,9 +40413,9 @@ + # echo " = - aKode-engine" + # fi + +-# if test x$have_gst10 != xyes; then +-# echo " = - GStreamer0.10-engine" +-# fi ++ if test x$have_gst10 != xyes; then ++ echo " = - GStreamer0.10-engine" ++ fi + + if test x$build_xine != xyes; then + echo " = - xine-engine" +@@ -40359,9 +40482,9 @@ + # echo " = + aKode-engine" + # fi + +-# if test x$have_gst10 = xyes; then +-# echo " = + GStreamer0.10-engine" +-# fi ++ if test x$have_gst10 = xyes; then ++ echo " = + GStreamer0.10-engine" ++ fi + + if test x$build_xine = xyes; then + echo " = + xine-engine" Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- amarok.spec 19 May 2006 21:04:47 -0000 1.48 +++ amarok.spec 21 May 2006 13:17:46 -0000 1.49 @@ -7,8 +7,10 @@ License: GPL Url: http://amarok.kde.org Source0: http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2 -#Patch1: amarok-1.4-gstreamer.patch -#Patch2: amarok-1.4-engines-cfg.patch +# Bring back the gstreamer engine from 1.4 beta3 +Source1: gst10-1.4beta3.tar.gz +Patch1: amarok-1.4-gstreamer.patch +Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -22,15 +24,15 @@ BuildRequires: libtunepimp-devel >= 0.4.0 BuildRequires: kdebase-devel BuildRequires: alsa-lib-devel -#BuildRequires: akode-devel BuildRequires: libifp-devel, libusb-devel -%if "%fedora" >= "5" -# gstreamer disabled in version 1.4 final (not ready yet) -#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel BuildRequires: libgpod-devel -%else -BuildRequires: gstreamer-plugins-devel >= 0.8.4 +# Akode engine +#BuildRequires: akode-devel +# Gstreamer engine +%ifarch ppc64 x86_64 s390 s390x ia64 +BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel %endif +# Helix engine %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif @@ -63,6 +65,8 @@ Summary: Visualisation plugins for Amarok Group: Applications/Multimedia Requires: %{name} = %{version} +# RPM CVS supports "Suggests": +#Requires(hint): libvisual-plugins %description visualisation Amarok can use visualisation plugins from different origins. @@ -72,11 +76,15 @@ %prep -%setup -q -# Make Gstreamer a sufficient engine as well (only engine available on x86_64) -#%patch1 -p1 -b .gstreamer +%setup -q -a 1 +%ifarch ppc64 x86_64 s390 s390x ia64 +# Bring Gstreamer back and make it a sufficient engine +# (only engine available if Helix in unavailable) +mv gst10 amarok/src/engine/ +%patch1 -p1 -b .gstreamer # Gstreamer default sink should be autoaudiosink -#%patch2 -p1 -b .engines-cfg +%patch2 -p1 -b .engines-cfg +%endif %build @@ -169,12 +177,8 @@ %exclude %{_datadir}/apps/%{name}/images/xine_logo.png %{_datadir}/icons/hicolor/*/* %{_datadir}/applications/kde/*.desktop -%{_datadir}/services/amarok_void-engine_plugin.desktop -%{_datadir}/services/amarok_ifp-mediadevice.desktop %{_datadir}/servicetypes/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop -%{_libdir}/kde3/libamarok_void-engine_plugin.* -%{_libdir}/kde3/libamarok_ifp-mediadevice.* %{_libdir}/kde3/konqsidebar_universalamarok.* %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop @@ -187,13 +191,16 @@ # VFAT device support %{_datadir}/services/amarok_generic-mediadevice.desktop %{_libdir}/kde3/libamarok_generic-mediadevice.* -# Gstreamer engine - disabled in 1.4 final -%if "%fedora" >= "5" -#%{_datadir}/services/amarok_gst10engine_plugin.desktop -#%{_libdir}/kde3/libamarok_gst10engine_plugin.* -%else -%{_datadir}/services/amarok_gstengine_plugin.desktop -%{_libdir}/kde3/libamarok_gstengine_plugin.* +# iRiver device support +%{_datadir}/services/amarok_ifp-mediadevice.desktop +%{_libdir}/kde3/libamarok_ifp-mediadevice.* +# Void engine (noop) +%{_datadir}/services/amarok_void-engine_plugin.desktop +%{_libdir}/kde3/libamarok_void-engine_plugin.* +# Gstreamer engine +%ifarch ppc64 x86_64 s390 s390x ia64 +%{_datadir}/services/amarok_gst10engine_plugin.desktop +%{_libdir}/kde3/libamarok_gst10engine_plugin.* %endif # Akode engine - disabled in beta3 #%{_datadir}/services/amarok_aKode-engine.desktop @@ -216,6 +223,8 @@ %changelog * Mon May 15 2006 Aurelien Bompard 1.4-1 - version 1.4 final +- gstreamer engine has been disabled, bring it back in SOURCE1 + where Helix is unavailable (only engine available) * Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 - rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 May 2006 21:04:47 -0000 1.22 +++ sources 21 May 2006 13:17:46 -0000 1.23 @@ -1 +1,2 @@ 3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 +78f329116089047704f32158e204ef4f gst10-1.4beta3.tar.gz --- amarok-1.3.6-libtunepimp040.patch DELETED --- --- amarok-1.4beta1-gst10.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 21 13:17:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 21 May 2006 06:17:47 -0700 Subject: rpms/amarok/devel .cvsignore, 1.22, 1.23 amarok-1.4-gstreamer.patch, 1.1, 1.2 amarok.spec, 1.47, 1.48 sources, 1.22, 1.23 amarok-1.3.6-libtunepimp040.patch, 1.1, NONE amarok-1.4beta1-gst10.patch, 1.2, NONE Message-ID: <200605211318.k4LDIJT5018422@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/devel Modified Files: .cvsignore amarok-1.4-gstreamer.patch amarok.spec sources Removed Files: amarok-1.3.6-libtunepimp040.patch amarok-1.4beta1-gst10.patch Log Message: version 1.4 final Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 19 May 2006 21:04:47 -0000 1.22 +++ .cvsignore 21 May 2006 13:17:47 -0000 1.23 @@ -1 +1,2 @@ amarok-1.4.0a.tar.bz2 +gst10-1.4beta3.tar.gz amarok-1.4-gstreamer.patch: Index: amarok-1.4-gstreamer.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.4-gstreamer.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4-gstreamer.patch 14 Apr 2006 08:30:45 -0000 1.1 +++ amarok-1.4-gstreamer.patch 21 May 2006 13:17:47 -0000 1.2 @@ -1,6 +1,222 @@ ---- ./configure.gstreamer 2006-04-09 23:08:39.000000000 +0200 -+++ ./configure 2006-04-14 10:23:09.000000000 +0200 -@@ -37922,7 +37922,7 @@ +--- ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop.gstreamer 2006-05-21 14:31:55.000000000 +0200 ++++ ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop 2006-05-21 14:32:05.000000000 +0200 +@@ -74,6 +74,6 @@ + X-KDE-amaroK-email=markey at web.de + X-KDE-amaroK-rank=254 + X-KDE-amaroK-version=1 +-X-KDE-amaroK-framework-version=20 ++X-KDE-amaroK-framework-version=23 + + +--- ./amarok/src/engine/Makefile.in.gstreamer 2006-05-14 22:05:27.000000000 +0200 ++++ ./amarok/src/engine/Makefile.in 2006-05-21 14:12:47.000000000 +0200 +@@ -365,9 +365,6 @@ + + + +-#if with_gst10 +-# GST10_ENGINE_SUBDIR = gst10 +-#endif + @with_nmm_TRUE at NMM_ENGINE_SUBDIR = nmm + + @with_xine_TRUE at XINE_ENGINE_SUBDIR = xine +@@ -388,7 +385,8 @@ + void \ + $(XINE_ENGINE_SUBDIR) \ + $(NMM_ENGINE_SUBDIR) \ +- $(HELIX_ENGINE_SUBDIR) ++ $(HELIX_ENGINE_SUBDIR) \ ++ gst10 + + subdir = amarok/src/engine + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +--- ./configure.gstreamer 2006-05-14 22:04:55.000000000 +0200 ++++ ./configure 2006-05-21 14:11:29.000000000 +0200 +@@ -32730,41 +32730,148 @@ + # BEGIN GSTREAMER-0.10 CHECK + ############################################################################### + +-#AC_ARG_WITH(gstreamer10, +-# AC_HELP_STRING([--with-gstreamer10],[build amaroK with GStreamer 0.10-engine]), +-# [build_gstreamer10=$withval], +-# [build_gstreamer10=no] +-#) +-# +-#if test "$build_gstreamer10" != "no"; then +-# if test "$PKGCONFIGFOUND" = "yes" ; then +-# # check for GStreamer +-# dnl Now we're ready to ask for gstreamer libs and cflags +-# dnl And we can also ask for the right version of gstreamer +-# have_gst10=no +-# +-# GST10_MAJORMINOR=0.10 +-# GST10_REQ=0.10.0 +-# +-# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR, +-# have_gst10=yes,have_gst10=no) +-# +-# dnl Give error if we don't have gstreamer +-# if test "x$have_gst10" = "xno"; then +-# LIB_GST10="" +-# CFLAGS_GST10="" +-# else +-# LIB_GST10=$GST10_LIBS +-# CFLAGS_GST10=$GST10_CFLAGS +-# AC_SUBST(LIB_GST10) +-# AC_SUBST(CFLAGS_GST10) +-# AC_SUBST(GST10_MAJORMINOR) +-# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10]) +-# fi +-# fi +-#fi +-# +-#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes]) ++# Check whether --with-gstreamer10 or --without-gstreamer10 was given. ++if test "${with_gstreamer10+set}" = set; then ++ withval="$with_gstreamer10" ++ build_gstreamer10=$withval ++else ++ build_gstreamer10=no ++ ++fi; ++ ++if test "$build_gstreamer10" != "no"; then ++ if test "$PKGCONFIGFOUND" = "yes" ; then ++ # check for GStreamer ++ have_gst10=no ++ ++ GST10_MAJORMINOR=0.10 ++ GST10_REQ=0.10.0 ++ ++ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++ ++if test -n "$PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo "$as_me:$LINENO: checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" >&5 ++echo $ECHO_N "checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR... $ECHO_C" >&6 ++ ++ if $PKG_CONFIG --exists "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" ; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ succeeded=yes ++ ++ echo "$as_me:$LINENO: checking GST10_CFLAGS" >&5 ++echo $ECHO_N "checking GST10_CFLAGS... $ECHO_C" >&6 ++ GST10_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ echo "$as_me:$LINENO: result: $GST10_CFLAGS" >&5 ++echo "${ECHO_T}$GST10_CFLAGS" >&6 ++ ++ echo "$as_me:$LINENO: checking GST10_LIBS" >&5 ++echo $ECHO_N "checking GST10_LIBS... $ECHO_C" >&6 ++ GST10_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ echo "$as_me:$LINENO: result: $GST10_LIBS" >&5 ++echo "${ECHO_T}$GST10_LIBS" >&6 ++ else ++ GST10_CFLAGS="" ++ GST10_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ GST10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"` ++ ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ have_gst10=yes ++ else ++ have_gst10=no ++ fi ++ ++ ++ if test "x$have_gst10" = "xno"; then ++ LIB_GST10="" ++ CFLAGS_GST10="" ++ else ++ LIB_GST10=$GST10_LIBS ++ CFLAGS_GST10=$GST10_CFLAGS ++ ++ ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_GSTREAMER10 1 ++_ACEOF ++ ++ fi ++ fi ++fi ++ ++ ++ ++if test x$have_gst10 = xyes; then ++ with_gst10_TRUE= ++ with_gst10_FALSE='#' ++else ++ with_gst10_TRUE='#' ++ with_gst10_FALSE= ++fi ++ + + ############################################################################### + # END GSTREAMER-0.10 CHECK +@@ -37885,7 +37992,7 @@ # BEGIN DO_NOT_COMPILE CHECK ############################################################################### @@ -9,7 +225,44 @@ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" no_engine=yes -@@ -40316,7 +40316,7 @@ +@@ -38007,6 +38114,12 @@ + ac_config_files="$ac_config_files amarok/src/engine/void/Makefile" + + ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/config/Makefile" ++ ++ ac_config_files="$ac_config_files amarok/src/engine/gst10/equalizer/Makefile" + + ac_config_files="$ac_config_files amarok/src/images/Makefile" + +@@ -38913,6 +39026,9 @@ + "amarok/src/engine/nmm/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;; + "amarok/src/engine/void/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;; + "amarok/src/engine/xine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;; ++ "amarok/src/engine/gst10/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/Makefile" ;; ++ "amarok/src/engine/gst10/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/config/Makefile" ;; ++ "amarok/src/engine/gst10/equalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/equalizer/Makefile" ;; + "amarok/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;; + "amarok/src/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;; + "amarok/src/konquisidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;; +@@ -39314,6 +39430,13 @@ + s, at taglib_includes@,$taglib_includes,;t t + s, at taglib_libs@,$taglib_libs,;t t + s, at RUBY@,$RUBY,;t t ++s, at GST10_CFLAGS@,$GST10_CFLAGS,;t t ++s, at GST10_LIBS@,$GST10_LIBS,;t t ++s, at LIB_GST10@,$LIB_GST10,;t t ++s, at CFLAGS_GST10@,$CFLAGS_GST10,;t t ++s, at GST10_MAJORMINOR@,$GST10_MAJORMINOR,;t t ++s, at with_gst10_TRUE@,$with_gst10_TRUE,;t t ++s, at with_gst10_FALSE@,$with_gst10_FALSE,;t t + s, at XINE_CONFIG@,$XINE_CONFIG,;t t + s, at with_xine_TRUE@,$with_xine_TRUE,;t t + s, at with_xine_FALSE@,$with_xine_FALSE,;t t +@@ -40259,7 +40382,7 @@ echo " ==================================" echo " =" echo " = No suitable multimedia framework was detected. You need to install at least" @@ -18,3 +271,29 @@ echo " =" fi +@@ -40290,9 +40413,9 @@ + # echo " = - aKode-engine" + # fi + +-# if test x$have_gst10 != xyes; then +-# echo " = - GStreamer0.10-engine" +-# fi ++ if test x$have_gst10 != xyes; then ++ echo " = - GStreamer0.10-engine" ++ fi + + if test x$build_xine != xyes; then + echo " = - xine-engine" +@@ -40359,9 +40482,9 @@ + # echo " = + aKode-engine" + # fi + +-# if test x$have_gst10 = xyes; then +-# echo " = + GStreamer0.10-engine" +-# fi ++ if test x$have_gst10 = xyes; then ++ echo " = + GStreamer0.10-engine" ++ fi + + if test x$build_xine = xyes; then + echo " = + xine-engine" Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- amarok.spec 19 May 2006 21:04:47 -0000 1.47 +++ amarok.spec 21 May 2006 13:17:47 -0000 1.48 @@ -7,8 +7,10 @@ License: GPL Url: http://amarok.kde.org Source0: http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2 -#Patch1: amarok-1.4-gstreamer.patch -#Patch2: amarok-1.4-engines-cfg.patch +# Bring back the gstreamer engine from 1.4 beta3 +Source1: gst10-1.4beta3.tar.gz +Patch1: amarok-1.4-gstreamer.patch +Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -22,15 +24,15 @@ BuildRequires: libtunepimp-devel >= 0.4.0 BuildRequires: kdebase-devel BuildRequires: alsa-lib-devel -#BuildRequires: akode-devel BuildRequires: libifp-devel, libusb-devel -%if "%fedora" >= "5" -# gstreamer disabled in version 1.4 final (not ready yet) -#BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel BuildRequires: libgpod-devel -%else -BuildRequires: gstreamer-plugins-devel >= 0.8.4 +# Akode engine +#BuildRequires: akode-devel +# Gstreamer engine +%ifarch ppc64 x86_64 s390 s390x ia64 +BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel %endif +# Helix engine %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif @@ -63,6 +65,8 @@ Summary: Visualisation plugins for Amarok Group: Applications/Multimedia Requires: %{name} = %{version} +# RPM CVS supports "Suggests": +#Requires(hint): libvisual-plugins %description visualisation Amarok can use visualisation plugins from different origins. @@ -72,11 +76,15 @@ %prep -%setup -q -# Make Gstreamer a sufficient engine as well (only engine available on x86_64) -#%patch1 -p1 -b .gstreamer +%setup -q -a 1 +%ifarch ppc64 x86_64 s390 s390x ia64 +# Bring Gstreamer back and make it a sufficient engine +# (only engine available if Helix in unavailable) +mv gst10 amarok/src/engine/ +%patch1 -p1 -b .gstreamer # Gstreamer default sink should be autoaudiosink -#%patch2 -p1 -b .engines-cfg +%patch2 -p1 -b .engines-cfg +%endif %build @@ -169,12 +177,8 @@ %exclude %{_datadir}/apps/%{name}/images/xine_logo.png %{_datadir}/icons/hicolor/*/* %{_datadir}/applications/kde/*.desktop -%{_datadir}/services/amarok_void-engine_plugin.desktop -%{_datadir}/services/amarok_ifp-mediadevice.desktop %{_datadir}/servicetypes/*.desktop %{_datadir}/apps/konqueror/servicemenus/*.desktop -%{_libdir}/kde3/libamarok_void-engine_plugin.* -%{_libdir}/kde3/libamarok_ifp-mediadevice.* %{_libdir}/kde3/konqsidebar_universalamarok.* %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop @@ -187,13 +191,16 @@ # VFAT device support %{_datadir}/services/amarok_generic-mediadevice.desktop %{_libdir}/kde3/libamarok_generic-mediadevice.* -# Gstreamer engine - disabled in 1.4 final -%if "%fedora" >= "5" -#%{_datadir}/services/amarok_gst10engine_plugin.desktop -#%{_libdir}/kde3/libamarok_gst10engine_plugin.* -%else -%{_datadir}/services/amarok_gstengine_plugin.desktop -%{_libdir}/kde3/libamarok_gstengine_plugin.* +# iRiver device support +%{_datadir}/services/amarok_ifp-mediadevice.desktop +%{_libdir}/kde3/libamarok_ifp-mediadevice.* +# Void engine (noop) +%{_datadir}/services/amarok_void-engine_plugin.desktop +%{_libdir}/kde3/libamarok_void-engine_plugin.* +# Gstreamer engine +%ifarch ppc64 x86_64 s390 s390x ia64 +%{_datadir}/services/amarok_gst10engine_plugin.desktop +%{_libdir}/kde3/libamarok_gst10engine_plugin.* %endif # Akode engine - disabled in beta3 #%{_datadir}/services/amarok_aKode-engine.desktop @@ -216,6 +223,8 @@ %changelog * Mon May 15 2006 Aurelien Bompard 1.4-1 - version 1.4 final +- gstreamer engine has been disabled, bring it back in SOURCE1 + where Helix is unavailable (only engine available) * Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 - rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 May 2006 21:04:47 -0000 1.22 +++ sources 21 May 2006 13:17:47 -0000 1.23 @@ -1 +1,2 @@ 3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 +78f329116089047704f32158e204ef4f gst10-1.4beta3.tar.gz --- amarok-1.3.6-libtunepimp040.patch DELETED --- --- amarok-1.4beta1-gst10.patch DELETED --- From fedora-extras-commits at redhat.com Sun May 21 13:19:33 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 21 May 2006 06:19:33 -0700 Subject: kmodtool - New directory Message-ID: <200605211319.k4LDJXbh018480@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/fedora/kmodtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18437/kmodtool Log Message: Directory /cvs/fedora/kmodtool added to the repository From fedora-extras-commits at redhat.com Sun May 21 13:21:03 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 21 May 2006 06:21:03 -0700 Subject: rpms/amarok/FC-5 amarok.spec,1.49,1.50 Message-ID: <200605211321.k4LDLZWK018582@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18545/FC-5 Modified Files: amarok.spec Log Message: forgot to bump release Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- amarok.spec 21 May 2006 13:17:46 -0000 1.49 +++ amarok.spec 21 May 2006 13:21:03 -0000 1.50 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL @@ -221,11 +221,13 @@ %changelog -* Mon May 15 2006 Aurelien Bompard 1.4-1 -- version 1.4 final +* Sun May 21 2006 Aurelien Bompard 1.4.0-2 - gstreamer engine has been disabled, bring it back in SOURCE1 where Helix is unavailable (only engine available) +* Mon May 15 2006 Aurelien Bompard 1.4-1 +- version 1.4 final + * Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 - rc1 From fedora-extras-commits at redhat.com Sun May 21 13:21:03 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 21 May 2006 06:21:03 -0700 Subject: rpms/amarok/devel amarok.spec,1.48,1.49 Message-ID: <200605211321.k4LDLZH9018585@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18545/devel Modified Files: amarok.spec Log Message: forgot to bump release Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- amarok.spec 21 May 2006 13:17:47 -0000 1.48 +++ amarok.spec 21 May 2006 13:21:03 -0000 1.49 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPL @@ -221,11 +221,13 @@ %changelog -* Mon May 15 2006 Aurelien Bompard 1.4-1 -- version 1.4 final +* Sun May 21 2006 Aurelien Bompard 1.4.0-2 - gstreamer engine has been disabled, bring it back in SOURCE1 where Helix is unavailable (only engine available) +* Mon May 15 2006 Aurelien Bompard 1.4-1 +- version 1.4 final + * Mon May 01 2006 Aurelien Bompard 1.4-0.13.rc1 - rc1 From fedora-extras-commits at redhat.com Sun May 21 13:22:29 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 21 May 2006 06:22:29 -0700 Subject: kmodtool kmodtool,NONE,1.1 Message-ID: <200605211322.k4LDMTae018613@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/fedora/kmodtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18596 Added Files: kmodtool Log Message: add the oldest kmodtool from lirc-kmod (1.1) --- NEW FILE kmodtool --- #!/bin/bash # kmodtool - Helper script for building kernel module RPMs # Copyright (c) 2003-2006 Ville Skytt?? , # Thorsten Leemhuis # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to # the following conditions: # # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" myver="0.10.3" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)' kmod_name= kver= verrel= variant= get_verrel () { verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" } print_verrel () { get_verrel $@ || return $? echo "${verrel}" } get_variant () { variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' } print_variant () { get_variant $@ || return $? echo "${variant}" } get_rpmtemplate () { local variant="${1}" local dashvariant="${variant:+-${variant}}" cat < /dev/null || : %postun -n kmod-${kmod_name}${dashvariant} /sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || : %files -n kmod-${kmod_name}${dashvariant} %defattr(644,root,root,755) /lib/modules/${verrel}${variant}/extra/${kmod_name}/ EOF } print_rpmtemplate () { kmod_name="${1}" shift kver="${1}" get_verrel "${1}" shift if [ -z "${kmod_name}" ] ; then echo "Please provide the kmodule-name as first parameter." >&2 exit 2 elif [ -z "${kver}" ] ; then echo "Please provide the kver as second parameter." >&2 exit 2 elif [ -z "${verrel}" ] ; then echo "Couldn't find out the verrel." >&2 exit 2 fi for variant in "$@" ; do get_rpmtemplate "${variant}" done } usage () { cat < $urishort has been marked as a thumbnail page."; $response->header(refresh => '5; url=javascript:window.close()'); - } elsif ($cmd eq ${Static::PROXY_SINGLE_THUMB} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_SINGLE_THUMB} ) { $thumbs->{$urishort} = 1; $content .= "$urishort (thumbnail) can now be accessed once."; $response->header(refresh => "1; $uri"); - } elsif ($cmd eq ${Static::PROXY_UNMARK_THUMB} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_THUMB} ) { delete $thumbs->{$urishort}; $content .= "$urishort has been removed from the thumbnail list."; - } elsif ($cmd eq ${Static::PROXY_MARK_PICTURE} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_PICTURE} ) { $pics->{$urishort} = 0; $content .= "$urishort has been marked as a picture page."; $response->header(refresh => '5; url=javascript:window.close()'); - } elsif ($cmd eq ${Static::PROXY_SINGLE_PICTURE} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_SINGLE_PICTURE} ) { $pics->{$urishort} = 1; $content .= "$urishort (picture) can now be accessed once."; $response->header(refresh => "1; $uri"); - } elsif ($cmd eq ${Static::PROXY_UNMARK_PICTURE} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_PICTURE} ) { delete $pics->{$urishort}; $content .= "$urishort has been removed from the picture list."; - } elsif ($cmd eq ${Static::PROXY_MARK_DOWNLOAD} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_DOWNLOAD} ) { $pics->{$urishort} = 0; $content .= "$urishort has been marked as a picture page.
    "; if (exists $downs->{$urishort}) { @@ -246,59 +246,59 @@ } $response->header(refresh => '5; url=javascript:window.close()'); - } elsif ($cmd eq ${Static::PROXY_UNMARK_DOWNLOAD} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_DOWNLOAD} ) { delete $downs->{$urishort}; $content .= "$urishort has been removed from the download list"; - } elsif ($cmd eq ${Static::PROXY_MARK_DOWNLOAD} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_DOWNLOAD} ) { $content .= '

    p0rn-proxy main menu

    "; + "
  • list thumbnail pages
    • " . + "
  • list picture pages
    • " . + "
  • list download pages
    • " . + "
    p0rn-proxy ${P0rn::Static::VERSION}/$CVSVERSION"; - } elsif ($cmd eq ${Static::PROXY_LIST_THUMB} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_THUMB} ) { $content .= '

    thumbnail pages

    '; foreach my $u (sort keys %{$thumbs}) { - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } - } elsif ($cmd eq ${Static::PROXY_LIST_PICTURE} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_PICTURE} ) { $content .= '

    picture pages

    '; foreach my $u (sort keys %{$pics}) { - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } - } elsif ($cmd eq ${Static::PROXY_LIST_DOWNLOAD} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_DOWNLOAD} ) { $content .= '

    download pages

    '; $content .= '

    queued

    '; foreach my $u (sort keys %{$downs}) { next unless $downs->{$u} == 0; - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } $content .= '

    running

    '; foreach my $u (sort keys %{$downs}) { next unless $downs->{$u} == 1; - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } $content .= '

    finished

    '; foreach my $u (sort keys %{$downs}) { next unless $downs->{$u} == 2; - $content .= "[del] $u
    "; + $content .= "[del] $u
    "; } - } elsif ($cmd eq ${Static::PROXY_GET_VERSION} ) { + } elsif ($cmd eq ${P0rn::Static::PROXY_GET_VERSION} ) { - $content .= "\nVERSION: ${Static::VERSION}/$CVSVERSION\n"; + $content .= "\nVERSION: ${P0rn::Static::VERSION}/$CVSVERSION\n"; } else { $content .= "unknown command $cmd: ".$request->uri().''; @@ -342,8 +342,8 @@ my $content = << "EOF"; thumbnail page $urishort is considered a thumbnail page and thus not displayed.
    [ -access once -| access always +access once +| access always ] EOF ; @@ -360,8 +360,8 @@ my $content = << "EOF"; already seen $urishort is considered an already seen picture page and thus not displayed.
    [ -access once -| access always +access once +| access always ] EOF ; @@ -389,10 +389,10 @@ my $content = $response->content(); my $linkline = '

    ' . - '[ th: mark as thumbnail page ' . - '| ad: proxy admin ' . - '| pi: mark as picture page ' . - '| do: mark as picture page and download ' . + '[ th: mark as thumbnail page ' . + '| ad: proxy admin ' . + '| pi: mark as picture page ' . + '| do: mark as picture page and download ' . ']

    '; $content =~ s/]*)>/$linkline/i; @@ -438,7 +438,7 @@ ######[ Main program ] # -print "this is p0rn-proxy ${Static::VERSION}/${CVSVERSION}\n"; +print "this is p0rn-proxy ${P0rn::Static::VERSION}/${CVSVERSION}\n"; # define configuration options my $config = AppConfig->new( { CASE => 1 } ); @@ -486,7 +486,7 @@ # create UserAgent $ua = LWP::UserAgent->new; -$ua->agent("p0rn-proxy ${Static::VERSION}/${CVSVERSION}"); +$ua->agent("p0rn-proxy ${P0rn::Static::VERSION}/${CVSVERSION}"); if ( defined $config->proxy() and $config->proxy() ne "" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 May 2006 20:23:46 -0000 1.1 +++ .cvsignore 22 May 2006 20:24:28 -0000 1.2 @@ -0,0 +1 @@ +p0rn-comfort-0.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 May 2006 20:23:46 -0000 1.1 +++ sources 22 May 2006 20:24:28 -0000 1.2 @@ -0,0 +1 @@ +08be31c527f7577765c4721d1bdf02f7 p0rn-comfort-0.0.4.tar.gz From fedora-extras-commits at redhat.com Mon May 22 21:08:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 14:08:22 -0700 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.10, 1.11 perl-Module-Build.spec, 1.19, 1.20 sources, 1.10, 1.11 Message-ID: <200605222108.k4ML8Paq022306@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-serv22285 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2801. Drop the /dev/zero hack. (Upstream fixed this problem.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 12 May 2006 17:08:10 -0000 1.10 +++ .cvsignore 22 May 2006 21:08:22 -0000 1.11 @@ -1 +1 @@ -Module-Build-0.28.tar.gz +Module-Build-0.2801.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- perl-Module-Build.spec 18 May 2006 22:33:05 -0000 1.19 +++ perl-Module-Build.spec 22 May 2006 21:08:22 -0000 1.20 @@ -1,8 +1,8 @@ -%define module_version 0.28 +%define module_version 0.2801 Name: perl-Module-Build -Version: 0.2800 -Release: 2%{?dist} +Version: 0.2801 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,9 +48,7 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -# 0.28 builds fail in the build system due -# to no stdin in t/extend, so we cheat. -./Build test < /dev/zero +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +62,10 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Mon May 22 2006 Steven Pritchard 0.2801-1 +- Update to 0.2801. +- Drop the /dev/zero hack. (Upstream fixed this problem.) + * Thu May 18 2006 Steven Pritchard 0.2800-2 - Take input from /dev/zero during "Build test" to avoid test failure. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 12 May 2006 17:08:10 -0000 1.10 +++ sources 22 May 2006 21:08:22 -0000 1.11 @@ -1 +1 @@ -8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz +fa10e5b53bc41e3948df56d4d115764d Module-Build-0.2801.tar.gz From fedora-extras-commits at redhat.com Mon May 22 21:25:54 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:25:54 -0700 Subject: rpms/emacs-common-muse - New directory Message-ID: <200605222125.k4MLPuGu022461@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22440/emacs-common-muse Log Message: Directory /cvs/extras/rpms/emacs-common-muse added to the repository From fedora-extras-commits at redhat.com Mon May 22 21:25:55 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:25:55 -0700 Subject: rpms/emacs-common-muse/devel - New directory Message-ID: <200605222125.k4MLPvMb022464@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22440/emacs-common-muse/devel Log Message: Directory /cvs/extras/rpms/emacs-common-muse/devel added to the repository From fedora-extras-commits at redhat.com Mon May 22 21:26:13 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:26:13 -0700 Subject: rpms/emacs-common-muse Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605222126.k4MLQFNQ022518@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22485 Added Files: Makefile import.log Log Message: Setup of module emacs-common-muse --- NEW FILE Makefile --- # Top level Makefile for module emacs-common-muse all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon May 22 21:26:13 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:26:13 -0700 Subject: rpms/emacs-common-muse/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605222126.k4MLQFxO022521@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22485/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module emacs-common-muse --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon May 22 21:26:50 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:26:50 -0700 Subject: rpms/emacs-common-muse import.log,1.1,1.2 Message-ID: <200605222126.k4MLQqZK022585@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22550 Modified Files: import.log Log Message: auto-import emacs-common-muse-3.02.6b-5 on branch devel from emacs-common-muse-3.02.6b-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 May 2006 21:26:12 -0000 1.1 +++ import.log 22 May 2006 21:26:50 -0000 1.2 @@ -0,0 +1 @@ +emacs-common-muse-3_02_6b-5:HEAD:emacs-common-muse-3.02.6b-5.src.rpm:1148333202 From fedora-extras-commits at redhat.com Mon May 22 21:26:50 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:26:50 -0700 Subject: rpms/emacs-common-muse/devel emacs-common-muse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605222126.k4MLQqAe022590@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22550/devel Modified Files: .cvsignore sources Added Files: emacs-common-muse.spec Log Message: auto-import emacs-common-muse-3.02.6b-5 on branch devel from emacs-common-muse-3.02.6b-5.src.rpm --- NEW FILE emacs-common-muse.spec --- %define pkg muse %define xemacs 0 %define emacs_sitelisp %{_datadir}/emacs/site-lisp %define emacs_ver 21.4 %if %{xemacs} %define xemacs_sitelisp %{_datadir}/xemacs/xemacs-packages/lisp %define xemacs_ver 21.4.18 %endif Name: emacs-common-muse Version: 3.02.6b Release: 5%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL URL: http://www.mwolson.org/projects/MuseMode.html BuildArch: noarch Source0: http://download.gna.org/muse-el/%{pkg}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs >= %{emacs_ver}, texinfo Requires: /sbin/install-info Obsoletes: muse = 3.02.6b %if %{xemacs} BuildRequires: xemacs >= %{xemacs_ver} %endif %description Muse is an authoring and publishing environment for (X)Emacs. It simplifies the process of writings documents and publishing them to various output formats. Muse uses a very simple Wiki-like format as input. Muse consists of two main parts: an enhanced text-mode for authoring documents and navigating within Muse projects, and a set of publishing styles for generating different kinds of output. This package contains the files common to both the Emacs and XEmacs installations of Muse. You need to install either (or both) of emacs-%{pkg} and xemacs-%{pkg} to use Muse. %package -n emacs-%{pkg} Summary: Compiled Muse lisp files for Emacs Group: Applications/Editors Requires: %{name} = %{version} Requires: emacs >= %{emacs_ver} Requires: tetex-latex %description -n emacs-%{pkg} This package contains the files required to use Muse with Emacs. %package -n emacs-%{pkg}-el Summary: Muse lisp source files for Emacs Group: Applications/Editors Requires: %{name} = %{version} Requires: emacs-%{pkg} = %{version} %description -n emacs-%{pkg}-el This package contains the source lisp files for Muse for Emacs. %if %{xemacs} %package -n xemacs-%{pkg} Summary: Compiled Muse lisp files for XEmacs Group: Applications/Editors Requires: %{name} = %{version} Requires: xemacs >= %{xemacs_ver} Requires: tetex-latex %description -n xemacs-%{pkg} This package contains the files required to use Muse with XEmacs. %package -n xemacs-%{pkg}-el Summary: Muse lisp source files for XEmacs Group: Applications/Editors Requires: %{name} = %{version} Requires: xemacs-%{pkg} = %{version} %description -n xemacs-%{pkg}-el This package contains the source lisp files for Muse for XEmacs. %endif %prep %setup -q -n %{pkg}-%{version} %build #Note that %{_smp_mflags} causes make to hang sometimes here. make all muse.html %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_infodir} make install \ PREFIX=%{buildroot}/%{_usr} \ INFODIR=%{buildroot}/%{_infodir} \ INSTALLINFO="/sbin/install-info --infodir=%{buildroot}/%{_infodir}" # Create startup file. mkdir -p %{buildroot}/%{emacs_sitelisp}/site-start.d cat > muse-init.el << EOF ;; Load muse-mode (require 'muse-mode) ;; Load publishing styles (require 'muse-html) (require 'muse-latex) (require 'muse-texinfo) (require 'muse-docbook) (require 'muse-wiki) (require 'muse-journal) EOF cp muse-init.el %{buildroot}/%{emacs_sitelisp}/site-start.d/ # Xemacs files %if %{xemacs} make clean make lisp EMACS=xemacs SITEFLAG=-no-site-file make install-bin ELISPDIR=%{buildroot}/%{xemacs_sitelisp}/%{pkg} mkdir -p %{buildroot}/%{xemacs_sitelisp}/site-start.d cp muse-init.el %{buildroot}/%{xemacs_sitelisp}/site-start.d/ %endif # Remove info dir creating by make install rm -f %{buildroot}/usr/share/info/dir %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) %doc README NEWS AUTHORS ChangeLog ChangeLog.2004 ChangeLog.main examples muse.html %doc %{_infodir}/* %files -n emacs-%{pkg} %defattr(-,root,root,-) %{emacs_sitelisp}/%{pkg}/*.elc %dir %{emacs_sitelisp}/%{pkg} %{emacs_sitelisp}/site-start.d/muse-init.el %files -n emacs-%{pkg}-el %defattr(-,root,root,-) %{emacs_sitelisp}/%{pkg}/*.el %if %{xemacs} %files -n xemacs-%{pkg} %defattr(-,root,root,-) %{xemacs_sitelisp}/%{pkg}/*.elc %dir %{xemacs_sitelisp}/%{pkg} %{xemacs_sitelisp}/site-start.d/muse-init.el %files -n xemacs-%{pkg}-el %defattr(-,root,root,-) %{xemacs_sitelisp}/%{pkg}/*.el %endif %changelog * Mon May 22 2006 Jonathan G. Underwood - 3.02.6b-5 - Rename package to emacs-common-muse * Sun Apr 23 2006 Jonathan Underwood - 3.02.6b-4 - Update to version 3.02.6b * Sun Mar 5 2006 Jonathan Underwood - 3.02.6a-3 - Added BuildRequires: texinfo - Remove info dir from buildroot (created by make install) * Fri Feb 10 2006 Jonathan Underwood - 3.02.6a-1 - Initial package build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 May 2006 21:26:13 -0000 1.1 +++ .cvsignore 22 May 2006 21:26:50 -0000 1.2 @@ -0,0 +1 @@ +muse-3.02.6b.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 May 2006 21:26:13 -0000 1.1 +++ sources 22 May 2006 21:26:50 -0000 1.2 @@ -0,0 +1 @@ +98fd1e6f5e6211f375561705854d4809 muse-3.02.6b.tar.gz From fedora-extras-commits at redhat.com Mon May 22 21:28:56 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 14:28:56 -0700 Subject: owners owners.list,1.1045,1.1046 Message-ID: <200605222128.k4MLSwr1022645@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22628 Modified Files: owners.list Log Message: Removed entry for package: muse Added entry for package: emacs-common-muse Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1045 retrieving revision 1.1046 diff -u -r1.1045 -r1.1046 --- owners.list 22 May 2006 20:21:39 -0000 1.1045 +++ owners.list 22 May 2006 21:28:56 -0000 1.1046 @@ -243,6 +243,7 @@ Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org| +Fedora Extras|emacs-common-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|embryo|A C like scripting language|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora.wickert at arcor.de|extras-qa at fedoraproject.org| Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org| @@ -808,7 +809,6 @@ Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org| Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org| -Fedora Extras|muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|musicbox|A simple one-file-at-a-time audio tag editor|splinux at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|nabi|Simple Hangul X Input Method|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 22 22:08:06 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 15:08:06 -0700 Subject: rpms/emacs-common-muse/FC-5 emacs-common-muse.spec,1.1,1.2 Message-ID: <200605222208.k4MM88JS025275@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256 Modified Files: emacs-common-muse.spec Log Message: Add XEmacs build Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-5/emacs-common-muse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-common-muse.spec 22 May 2006 21:26:50 -0000 1.1 +++ emacs-common-muse.spec 22 May 2006 22:08:06 -0000 1.2 @@ -1,5 +1,5 @@ %define pkg muse -%define xemacs 0 +%define xemacs 1 %define emacs_sitelisp %{_datadir}/emacs/site-lisp %define emacs_ver 21.4 From fedora-extras-commits at redhat.com Mon May 22 22:10:30 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 15:10:30 -0700 Subject: rpms/emacs-common-muse/FC-5 emacs-common-muse.spec,1.2,1.3 Message-ID: <200605222210.k4MMAWpg025343@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25326 Modified Files: emacs-common-muse.spec Log Message: Release tag bump Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-5/emacs-common-muse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emacs-common-muse.spec 22 May 2006 22:08:06 -0000 1.2 +++ emacs-common-muse.spec 22 May 2006 22:10:30 -0000 1.3 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.6b -Release: 5%{?dist} +Release: 6%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL From fedora-extras-commits at redhat.com Mon May 22 22:11:47 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 15:11:47 -0700 Subject: rpms/emacs-common-muse/FC-4 emacs-common-muse.spec,1.1,1.2 Message-ID: <200605222211.k4MMBnLR025414@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25389 Modified Files: emacs-common-muse.spec Log Message: Add XEmacs package build Bump release tag Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/FC-4/emacs-common-muse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-common-muse.spec 22 May 2006 21:26:50 -0000 1.1 +++ emacs-common-muse.spec 22 May 2006 22:11:47 -0000 1.2 @@ -1,5 +1,5 @@ %define pkg muse -%define xemacs 0 +%define xemacs 1 %define emacs_sitelisp %{_datadir}/emacs/site-lisp %define emacs_ver 21.4 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.6b -Release: 5%{?dist} +Release: 6%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL From fedora-extras-commits at redhat.com Mon May 22 22:12:40 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Mon, 22 May 2006 15:12:40 -0700 Subject: rpms/emacs-common-muse/devel emacs-common-muse.spec,1.1,1.2 Message-ID: <200605222212.k4MMCgi4025483@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-common-muse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25466 Modified Files: emacs-common-muse.spec Log Message: Bump release tag Index: emacs-common-muse.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-common-muse/devel/emacs-common-muse.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-common-muse.spec 22 May 2006 21:26:50 -0000 1.1 +++ emacs-common-muse.spec 22 May 2006 22:12:39 -0000 1.2 @@ -11,7 +11,7 @@ Name: emacs-common-muse Version: 3.02.6b -Release: 5%{?dist} +Release: 6%{?dist} Summary: Emacs Muse is an authoring and publishing environment for Emacs Group: Applications/Editors License: GPL From fedora-extras-commits at redhat.com Mon May 22 22:55:25 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Mon, 22 May 2006 15:55:25 -0700 Subject: rpms/apt/devel apt.spec,1.30,1.31 Message-ID: <200605222255.k4MMtR4H025774@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25727/devel Modified Files: apt.spec Log Message: Fix broken upgrade paths (thanks to Ville). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- apt.spec 22 May 2006 18:48:12 -0000 1.30 +++ apt.spec 22 May 2006 22:55:25 -0000 1.31 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ License: GPL @@ -36,7 +36,7 @@ # TODO: verify the required minimum Python version BuildRequires: python-devel >= 2.2 BuildRequires: libxml2-devel -BuildRequires: rpm-devel +BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: libstdc++-devel From fedora-extras-commits at redhat.com Mon May 22 22:55:19 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Mon, 22 May 2006 15:55:19 -0700 Subject: rpms/apt/FC-4 apt.spec,1.19,1.20 Message-ID: <200605222255.k4MMtpbb025782@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25727/FC-4 Modified Files: apt.spec Log Message: Fix broken upgrade paths (thanks to Ville). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/FC-4/apt.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apt.spec 22 May 2006 20:10:48 -0000 1.19 +++ apt.spec 22 May 2006 22:55:19 -0000 1.20 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3.1 -Release: 4.1%{?dist} +Release: 5%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ License: GPL From fedora-extras-commits at redhat.com Mon May 22 22:55:19 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Mon, 22 May 2006 15:55:19 -0700 Subject: rpms/apt/FC-5 apt.spec,1.19,1.20 Message-ID: <200605222255.k4MMtpQM025785@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/apt/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25727/FC-5 Modified Files: apt.spec Log Message: Fix broken upgrade paths (thanks to Ville). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/FC-5/apt.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apt.spec 22 May 2006 18:48:06 -0000 1.19 +++ apt.spec 22 May 2006 22:55:19 -0000 1.20 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ License: GPL @@ -36,7 +36,7 @@ # TODO: verify the required minimum Python version BuildRequires: python-devel >= 2.2 BuildRequires: libxml2-devel -BuildRequires: rpm-devel +BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel BuildRequires: libstdc++-devel From fedora-extras-commits at redhat.com Tue May 23 02:03:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:03:44 -0700 Subject: rpms/perl-IO-Null - New directory Message-ID: <200605230203.k4N23kHA003396@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3360/perl-IO-Null Log Message: Directory /cvs/extras/rpms/perl-IO-Null added to the repository From fedora-extras-commits at redhat.com Tue May 23 02:03:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:03:45 -0700 Subject: rpms/perl-IO-Null/devel - New directory Message-ID: <200605230203.k4N23lZi003399@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3360/perl-IO-Null/devel Log Message: Directory /cvs/extras/rpms/perl-IO-Null/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 02:04:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:04:02 -0700 Subject: rpms/perl-IO-Null Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605230204.k4N244XT003443@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3415 Added Files: Makefile import.log Log Message: Setup of module perl-IO-Null --- NEW FILE Makefile --- # Top level Makefile for module perl-IO-Null all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 23 02:04:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:04:03 -0700 Subject: rpms/perl-IO-Null/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605230204.k4N245d3003446@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3415/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-IO-Null --- NEW 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 May 23 02:04:38 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:04:38 -0700 Subject: rpms/perl-IO-Null/devel perl-IO-Null.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605230204.k4N24eRE003514@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3479/devel Modified Files: .cvsignore sources Added Files: perl-IO-Null.spec Log Message: auto-import perl-IO-Null-1.01-1 on branch devel from perl-IO-Null-1.01-1.src.rpm --- NEW FILE perl-IO-Null.spec --- Name: perl-IO-Null Version: 1.01 Release: 1%{?dist} Summary: Class for null filehandles License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Null/ Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/IO-Null-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description IO::Null is a class for null filehandles. Calling a constructor of this class always succeeds, returning a new null filehandle. Writing to any object of this class is always a no-operation, and returns true. Reading from any object of this class is always no-operation, and returns empty-string or empty-list, as appropriate. %prep %setup -q -n IO-Null-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Mar 09 2006 Steven Pritchard 1.01-1 - Specfile autogenerated. - Improve description and Summary. - Fix License. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Null/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 02:04:03 -0000 1.1 +++ .cvsignore 23 May 2006 02:04:38 -0000 1.2 @@ -0,0 +1 @@ +IO-Null-1.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Null/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 02:04:03 -0000 1.1 +++ sources 23 May 2006 02:04:38 -0000 1.2 @@ -0,0 +1 @@ +54d6084398f8b4e7062660b9ccc835a8 IO-Null-1.01.tar.gz From fedora-extras-commits at redhat.com Tue May 23 02:04:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:04:37 -0700 Subject: rpms/perl-IO-Null import.log,1.1,1.2 Message-ID: <200605230205.k4N259eE003525@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-Null In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3479 Modified Files: import.log Log Message: auto-import perl-IO-Null-1.01-1 on branch devel from perl-IO-Null-1.01-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Null/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 02:04:02 -0000 1.1 +++ import.log 23 May 2006 02:04:36 -0000 1.2 @@ -0,0 +1 @@ +perl-IO-Null-1_01-1:HEAD:perl-IO-Null-1.01-1.src.rpm:1148349868 From fedora-extras-commits at redhat.com Tue May 23 02:08:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:08:50 -0700 Subject: owners owners.list,1.1046,1.1047 Message-ID: <200605230208.k4N28qtn003591@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3570 Modified Files: owners.list Log Message: Add perl-IO-Null. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1046 retrieving revision 1.1047 diff -u -r1.1046 -r1.1047 --- owners.list 22 May 2006 21:28:56 -0000 1.1046 +++ owners.list 23 May 2006 02:08:50 -0000 1.1047 @@ -1086,6 +1086,7 @@ Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Interface|Perl extension for accessing network card configuration information|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-Null|Class for null filehandles|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 23 02:12:10 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:12:10 -0700 Subject: rpms/perl-Module-Build/FC-5 .cvsignore, 1.10, 1.11 perl-Module-Build.spec, 1.17, 1.18 sources, 1.10, 1.11 Message-ID: <200605230212.k4N2CCWb003667@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3645 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2801. Drop the /dev/zero hack. (Upstream fixed this problem.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 23:29:10 -0000 1.10 +++ .cvsignore 23 May 2006 02:12:10 -0000 1.11 @@ -1 +1 @@ -Module-Build-0.28.tar.gz +Module-Build-0.2801.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/perl-Module-Build.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-Module-Build.spec 20 May 2006 15:32:02 -0000 1.17 +++ perl-Module-Build.spec 23 May 2006 02:12:10 -0000 1.18 @@ -1,8 +1,8 @@ -%define module_version 0.28 +%define module_version 0.2801 Name: perl-Module-Build -Version: 0.2800 -Release: 2%{?dist} +Version: 0.2801 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,9 +48,7 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -# 0.28 builds fail in the build system due -# to no stdin in t/extend, so we cheat. -./Build test < /dev/zero +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +62,10 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Mon May 22 2006 Steven Pritchard 0.2801-1 +- Update to 0.2801. +- Drop the /dev/zero hack. (Upstream fixed this problem.) + * Thu May 18 2006 Steven Pritchard 0.2800-2 - Take input from /dev/zero during "Build test" to avoid test failure. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 23:29:10 -0000 1.10 +++ sources 23 May 2006 02:12:10 -0000 1.11 @@ -1 +1 @@ -8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz +fa10e5b53bc41e3948df56d4d115764d Module-Build-0.2801.tar.gz From fedora-extras-commits at redhat.com Tue May 23 02:13:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 22 May 2006 19:13:06 -0700 Subject: rpms/perl-Module-Build/FC-4 .cvsignore, 1.9, 1.10 perl-Module-Build.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200605230213.k4N2D8u6003744@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Build/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3723 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2801. Drop the /dev/zero hack. (Upstream fixed this problem.) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 May 2006 20:04:03 -0000 1.9 +++ .cvsignore 23 May 2006 02:13:05 -0000 1.10 @@ -1 +1 @@ -Module-Build-0.28.tar.gz +Module-Build-0.2801.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/perl-Module-Build.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Module-Build.spec 20 May 2006 20:04:03 -0000 1.13 +++ perl-Module-Build.spec 23 May 2006 02:13:05 -0000 1.14 @@ -1,8 +1,8 @@ -%define module_version 0.28 +%define module_version 0.2801 Name: perl-Module-Build -Version: 0.2800 -Release: 2%{?dist} +Version: 0.2801 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,9 +48,7 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check -# 0.28 builds fail in the build system due -# to no stdin in t/extend, so we cheat. -./Build test < /dev/zero +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +62,10 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Mon May 22 2006 Steven Pritchard 0.2801-1 +- Update to 0.2801. +- Drop the /dev/zero hack. (Upstream fixed this problem.) + * Thu May 18 2006 Steven Pritchard 0.2800-2 - Take input from /dev/zero during "Build test" to avoid test failure. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 May 2006 20:04:03 -0000 1.9 +++ sources 23 May 2006 02:13:05 -0000 1.10 @@ -1 +1 @@ -8b3d9cf3eadebdfbe5847d80ed3a2d0b Module-Build-0.28.tar.gz +fa10e5b53bc41e3948df56d4d115764d Module-Build-0.2801.tar.gz From fedora-extras-commits at redhat.com Tue May 23 04:37:24 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Mon, 22 May 2006 21:37:24 -0700 Subject: rpms/libapreq2/devel .cvsignore, 1.9, 1.10 libapreq2.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <200605230437.k4N4bQhv008898@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8877 Modified Files: .cvsignore libapreq2.spec sources Log Message: Bump up to libapreq2 2.08-RC2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 19 May 2006 11:01:52 -0000 1.9 +++ .cvsignore 23 May 2006 04:37:23 -0000 1.10 @@ -1 +1 @@ -libapreq2-2.08-RC1.tar.gz +libapreq2-2.08-RC2.tar.gz Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libapreq2.spec 19 May 2006 11:01:52 -0000 1.11 +++ libapreq2.spec 23 May 2006 04:37:23 -0000 1.12 @@ -2,13 +2,13 @@ Name: libapreq2 Version: 2.08 -Release: 0.rc1.1%{?dist} +Release: 0.rc2.1%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries License: Apache Software License URL: http://httpd.apache.org/apreq/ -Source0: http://people.apache.org/~pgollucci/apreq2/libapreq2-2.08-RC1.tar.gz +Source0: http://people.apache.org/~pgollucci/apreq2/libapreq2-2.08-RC2.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-build.patch Patch1: %{name}-2.07-rc3-ldflags.patch @@ -61,6 +61,7 @@ #!/bin/sh %{__perl_provides} $* \ | grep -v 'perl(APR::\(Request\(::\(Apache2\|CGI\|Error\)\)\?\))$' \ +| grep -v 'perl(Apache2::\(Cookie\|Request\|Upload\))$' EOF %define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl-prov chmod +x %{__perl_provides} @@ -146,10 +147,15 @@ %doc glue/perl/README %{perl_vendorarch}/auto/APR/ %{perl_vendorarch}/APR/ +%{perl_vendorarch}/Apache2/ %{_mandir}/man3/A*::*.3* %changelog +* Tue May 23 2006 Bojan Smojver - 2.08-0.rc2.1 +- bump up to 2.08-RC2 for Rawhide +- revert back some changes to spec file made for 2.08-RC1 + * Fri May 19 2006 Bojan Smojver - 2.08-0.rc1.1 - bump up to 2.08-RC1 for Rawhide Index: sources =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 May 2006 11:01:52 -0000 1.9 +++ sources 23 May 2006 04:37:23 -0000 1.10 @@ -1 +1 @@ -4604dcb53dc913a4484d4d263c0105f5 libapreq2-2.08-RC1.tar.gz +628be7e43c3ead0aa6f2356717c4632f libapreq2-2.08-RC2.tar.gz From fedora-extras-commits at redhat.com Tue May 23 07:48:17 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Tue, 23 May 2006 00:48:17 -0700 Subject: fedora-security/audit fc4,1.258,1.259 fc5,1.172,1.173 Message-ID: <200605230748.k4N7mHmY016576@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16550/audit Modified Files: fc4 fc5 Log Message: Add CVE-2006-2444 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- fc4 22 May 2006 14:54:41 -0000 1.258 +++ fc4 23 May 2006 07:48:14 -0000 1.259 @@ -5,6 +5,7 @@ CVE-2006-2493 ** freetype CVE-2006-2480 VULNERABLE (dia) #192538 +CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- fc5 22 May 2006 14:54:41 -0000 1.172 +++ fc5 23 May 2006 07:48:14 -0000 1.173 @@ -4,6 +4,7 @@ ** are items that need attention CVE-2006-2493 ** freetype +CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] From fedora-extras-commits at redhat.com Tue May 23 08:08:22 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Tue, 23 May 2006 01:08:22 -0700 Subject: fedora-security/audit fc4,1.259,1.260 fc5,1.173,1.174 Message-ID: <200605230808.k4N88Mpa018984@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18962/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-1242 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- fc4 23 May 2006 07:48:14 -0000 1.259 +++ fc4 23 May 2006 08:08:20 -0000 1.260 @@ -143,7 +143,7 @@ CVE-2006-1342 version (kernel, not 2.6) not vulnerable CVE-2006-1273 ignore (firefox) This is an IE only issue CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues -CVE-2006-1242 VULNERABLE (kernel) +CVE-2006-1242 version (kernel, fixed 2.6.16.1) [since FEDORA-2006-245] CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- fc5 23 May 2006 07:48:14 -0000 1.173 +++ fc5 23 May 2006 08:08:20 -0000 1.174 @@ -144,7 +144,7 @@ CVE-2006-1296 version (beagle, fixed 0.2.4) bz#185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188 CVE-2006-1273 ignore (firefox) this issue only affects IE CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues -CVE-2006-1242 VULNERABLE (kernel) +CVE-2006-1242 version (kernel, fixed 2.6.16.1) [since FEDORA-2006-233] CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability From fedora-extras-commits at redhat.com Tue May 23 09:07:32 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:07:32 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.18,1.19 Message-ID: <200605230907.k4N97Yhc021580@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21563 Modified Files: php-eaccelerator.spec Log Message: Rebuild against PHP 5.1.4. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- php-eaccelerator.spec 10 May 2006 09:36:50 -0000 1.18 +++ php-eaccelerator.spec 23 May 2006 09:07:32 -0000 1.19 @@ -1,7 +1,7 @@ # Useful defaults when building in chroots on systems where PHP is unavailable %define default_extdir %{_libdir}/php4 %define default_apiver 20041225 -%define default_version 5.1.3 +%define default_version 5.1.4 %define module_version 0.9.5 %define prever beta2 @@ -100,6 +100,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 +- Rebuild against PHP 5.1.4. + * Fri May 5 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 - Rework heavily the API version requirement detection, should work with chroots builds where PHP isn't installed outside. From fedora-extras-commits at redhat.com Tue May 23 09:12:27 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:12:27 -0700 Subject: rpms/php-eaccelerator/FC-5 eaccelerator-0.9.5-beta2-64bit_cast_warning.patch, NONE, 1.1 eaccelerator-0.9.5-beta2-compile.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 php-eaccelerator.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200605230912.k4N9CTH7021691@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656 Modified Files: .cvsignore php-eaccelerator.spec sources Added Files: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch eaccelerator-0.9.5-beta2-compile.patch Log Message: Backport all development changes : Update to 0.9.5beta2, include patches and enhance the versions detection in the spec file. eaccelerator-0.9.5-beta2-64bit_cast_warning.patch: --- NEW FILE eaccelerator-0.9.5-beta2-64bit_cast_warning.patch --- Index: opcodes.h =================================================================== --- opcodes.h (revision 202) +++ opcodes.h (working copy) @@ -85,7 +85,7 @@ #define OPS_STD EXT_STD | OP1_STD | OP2_STD | RES_STD #ifdef ZEND_ENGINE_2 -# define VAR_NUM(var) ((unsigned int)(((temp_variable *)(var))-((temp_variable *)NULL))) +# define VAR_NUM(var) ((unsigned int)(((temp_variable *)((intptr_t) var))-((temp_variable *)NULL))) # define VAR_VAL(var) ((unsigned int)((var)*sizeof(temp_variable))) #else # define VAR_NUM(var) ((unsigned int)(var)) Index: loader.c =================================================================== --- loader.c (revision 202) +++ loader.c (working copy) @@ -86,7 +86,7 @@ zend_bailout(); } #ifdef ZEND_ENGINE_2 - return (unsigned int)(((temp_variable*)NULL) + var); + return (unsigned int)((intptr_t) ((temp_variable*)NULL) + var); #else return var; #endif eaccelerator-0.9.5-beta2-compile.patch: --- NEW FILE eaccelerator-0.9.5-beta2-compile.patch --- Index: optimize.c =================================================================== --- optimize.c (revision 199) +++ optimize.c (working copy) @@ -1499,23 +1499,26 @@ if (!EAG(encoder) || (name_len == sizeof("false")-1 && strcmp(name,"false") == 0) || (name_len == sizeof("true")-1 && strcmp(name,"true") == 0)) { - zend_constant *c; + union { + zend_constant *v; + void *ptr; + } c; int retval; char *lookup_name = do_alloca(name_len+1); memcpy(lookup_name, name, name_len); lookup_name[name_len] = '\0'; - if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) { - *result = c; + if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, &c.ptr)==SUCCESS) { + *result = c.v; retval=1; } else { zend_str_tolower(lookup_name, name_len); - if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) { - if ((c->flags & CONST_CS) && (memcmp(c->name, name, name_len)!=0)) { + if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, &c.ptr)==SUCCESS) { + if ((c.v->flags & CONST_CS) && (memcmp(c.v->name, name, name_len)!=0)) { retval=0; } else { - *result = c; + *result = c.v; retval=1; } } else { @@ -2543,52 +2546,49 @@ #endif IS_DEFINED(op->op1)) { zend_op *x = DEFINED_OP(op->op1); - if ((x->opcode == ZEND_FETCH_W || x->opcode == ZEND_FETCH_RW) && - x->op1.op_type == IS_CONST && - x->op1.u.constant.type == IS_STRING) { + if ((x->opcode == ZEND_FETCH_W || x->opcode == ZEND_FETCH_RW) && + x->op1.op_type == IS_CONST && x->op1.u.constant.type == IS_STRING) { + union { + zend_op *v; + void *ptr; + } op_copy; char *s = emalloc(x->op1.u.constant.value.str.len+2); + op_copy.v = op; memcpy(s,x->op1.u.constant.value.str.val,x->op1.u.constant.value.str.len); s[x->op1.u.constant.value.str.len] = (char)FETCH_TYPE(x); s[x->op1.u.constant.value.str.len+1] = '\0'; - zend_hash_update(&assigns, - s, x->op1.u.constant.value.str.len+2, - (void**)&op, sizeof(void*), NULL); + zend_hash_update(&assigns, s, x->op1.u.constant.value.str.len+2, &op_copy.ptr, + sizeof(void*), NULL); efree(s); } } - } else if ((op->opcode == ZEND_FETCH_R || - op->opcode == ZEND_FETCH_IS) && - !global[VAR_NUM(op->result.u.var)] && - op->op1.op_type == IS_CONST && - op->op1.u.constant.type == IS_STRING) { - zend_op *x; + } else if ((op->opcode == ZEND_FETCH_R || op->opcode == ZEND_FETCH_IS) && + !global[VAR_NUM(op->result.u.var)] && op->op1.op_type == IS_CONST && + op->op1.u.constant.type == IS_STRING) { + union { + zend_op *v; + void *ptr; + } x; char *s = emalloc(op->op1.u.constant.value.str.len+2); memcpy(s,op->op1.u.constant.value.str.val,op->op1.u.constant.value.str.len); s[op->op1.u.constant.value.str.len] = (char)FETCH_TYPE(op); s[op->op1.u.constant.value.str.len+1] = '\0'; - if (zend_hash_find(&assigns, - s, op->op1.u.constant.value.str.len+2, - (void**)&x) == SUCCESS) { - x = *(zend_op**)x; -/* - if (x->opcode == ZEND_ASSIGN && x->op2.op_type == IS_CONST) { - zend_printf("possible const propogation in %s:%s (%s,%u:%u)
    \n",op_array->filename, op_array->function_name, op->op1.u.constant.value.str.val, x-op_array->opcodes, op-op_array->opcodes); - } -*/ - memcpy(&x->result, &op->result, sizeof(op->result)); - x->result.u.EA.type = 0; - SET_DEFINED(x); - zend_hash_del(&assigns, - s, op->op1.u.constant.value.str.len+2); + if (zend_hash_find(&assigns, s, op->op1.u.constant.value.str.len+2, + &x.ptr) == SUCCESS) { + x.v = *(zend_op**)x.v; + memcpy(&x.v->result, &op->result, sizeof(op->result)); + x.v->result.u.EA.type = 0; + SET_DEFINED(x.v); + zend_hash_del(&assigns, s, op->op1.u.constant.value.str.len+2); STR_FREE(op->op1.u.constant.value.str.val); SET_TO_NOP(op); } efree(s); } else if (op->opcode == ZEND_FETCH_DIM_R && - op->extended_value != ZEND_FETCH_ADD_LOCK && - op->op1.op_type == IS_VAR && - IS_DEFINED(op->op1)) { + op->extended_value != ZEND_FETCH_ADD_LOCK && + op->op1.op_type == IS_VAR && + IS_DEFINED(op->op1)) { zend_op *x = DEFINED_OP(op->op1); while ((x->opcode == ZEND_ASSIGN_REF || x->opcode == ZEND_ASSIGN || @@ -2609,32 +2609,35 @@ IS_DEFINED(x->op1)) { x = DEFINED_OP(x->op1); } - if ((x->opcode == ZEND_FETCH_R || - x->opcode == ZEND_FETCH_W || - x->opcode == ZEND_FETCH_RW) && - x->op1.op_type == IS_CONST && - x->op1.u.constant.type == IS_STRING) { - zend_op *y; + if ((x->opcode == ZEND_FETCH_R || x->opcode == ZEND_FETCH_W || + x->opcode == ZEND_FETCH_RW) && x->op1.op_type == IS_CONST && + x->op1.u.constant.type == IS_STRING) { + union { + zend_op *v; + void *ptr; + } y; + union { + zend_op *v; + void *ptr; + } op_copy; char *s = emalloc(x->op1.u.constant.value.str.len+2); + op_copy.v = op; memcpy(s,x->op1.u.constant.value.str.val,x->op1.u.constant.value.str.len); s[x->op1.u.constant.value.str.len] = (char)FETCH_TYPE(x); s[x->op1.u.constant.value.str.len+1] = '\0'; - if (zend_hash_find(&fetch_dim, - s, x->op1.u.constant.value.str.len+2, - (void**)&y) == SUCCESS) { - y = *(zend_op**)y; - y->extended_value = ZEND_FETCH_ADD_LOCK; - zend_hash_update(&fetch_dim, - s, x->op1.u.constant.value.str.len+2, - (void**)&op, sizeof(void*), NULL); + if (zend_hash_find(&fetch_dim, s, x->op1.u.constant.value.str.len+2, + &y.ptr) == SUCCESS) { + y.v = *(zend_op**)y.v; + y.v->extended_value = ZEND_FETCH_ADD_LOCK; + zend_hash_update(&fetch_dim, s, x->op1.u.constant.value.str.len+2, + &op_copy.ptr, sizeof(void*), NULL); SET_UNDEFINED(x->result); STR_FREE(x->op1.u.constant.value.str.val); SET_TO_NOP(x); - memcpy(&op->op1,&y->op1,sizeof(op->op1)); + memcpy(&op->op1, &y.v->op1, sizeof(op->op1)); } else { - zend_hash_update(&fetch_dim, - s, x->op1.u.constant.value.str.len+2, - (void**)&op, sizeof(void*), NULL); + zend_hash_update(&fetch_dim, s, x->op1.u.constant.value.str.len+2, + &op_copy.ptr, sizeof(void*), NULL); } efree(s); } @@ -3170,7 +3173,9 @@ void reassign_registers(zend_op_array *op_array, BB* p, char *global) { zend_uint i; zend_uint n = 0; +#ifndef ZEND_ENGINE_2 int uses_globals = 0; +#endif int* assigned = do_alloca(op_array->T * sizeof(int)); char* reg_pool = do_alloca(op_array->T * sizeof(char)); char* used = do_alloca(op_array->T * sizeof(char)); Index: Makefile.in =================================================================== --- Makefile.in (revision 199) +++ Makefile.in (working copy) @@ -2,6 +2,6 @@ LTLIBRARY_SOURCES = eaccelerator.c optimize.c encoder.c loader.c opcodes.c content.c mm.c session.c shm.c debug.c cache.c ea_restore.c ea_store.c ea_info.c ea_dasm.c LTLIBRARY_SHARED_NAME = eaccelerator.la -EXTRA_CFLAGS = -O2 +EXTRA_CFLAGS = -O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables include $(top_srcdir)/build/dynlib.mk Index: loader.c =================================================================== --- loader.c (revision 199) +++ loader.c (working copy) @@ -212,6 +212,7 @@ } } +#ifndef ZEND_ENGINE_2 static unsigned char* decode_pstr(char** p, unsigned int* l) { unsigned char c = decode(p, l); if (c == 0) { @@ -229,6 +230,7 @@ return str; } } +#endif static double decode_double(char** p, unsigned int* l) { unsigned char sign; @@ -250,7 +252,6 @@ typedef void* (*decode_bucket_t)(void* to, char**, unsigned int* TSRMLS_DC); #define decode_zval_hash(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr, p, l TSRMLS_CC) -#define decode_zval_hash_noref(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr_noref, p, l TSRMLS_CC) static HashTable* decode_hash(HashTable* to, int size, decode_bucket_t decode_bucket, char**p, unsigned int* l TSRMLS_DC); static zval* decode_zval_ptr(zval* to, char** p, unsigned int* l TSRMLS_DC); @@ -315,6 +316,8 @@ return to; } +#ifndef ZEND_ENGINE_2 +#define decode_zval_hash_noref(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr_noref, p, l TSRMLS_CC) static zval* decode_zval_ptr_noref(zval* to, char** p, unsigned int* l TSRMLS_DC) { if (to == NULL) { ALLOC_ZVAL(to); @@ -324,6 +327,7 @@ to->refcount = 1; return to; } +#endif static void decode_znode(znode* to, unsigned int vars_count, char** p, unsigned int* l TSRMLS_DC) { to->op_type = decode(p, l); @@ -615,14 +619,19 @@ to->scope = EAG(class_entry); to->fn_flags = decode32(p, l); scope_name = decode_lstr((unsigned int*)&scope_name_len, p, l); - if (to->scope == NULL && scope_name != NULL) { - if (zend_hash_find(CG(class_table), (void *)scope_name, - scope_name_len, (void **)&to->scope) == SUCCESS) { - to->scope = *(zend_class_entry**)to->scope; - } else { - to->scope = NULL; - } - } + if (to->scope == NULL && scope_name != NULL) { + union { + zend_class_entry *v; + void *ptr; + } scope; + scope.v = to->scope; + if (zend_hash_find(CG(class_table), (void *)scope_name, + scope_name_len, &scope.ptr) == SUCCESS) { + to->scope = *(zend_class_entry**)to->scope; + } else { + to->scope = NULL; + } + } #endif if (to->type == ZEND_INTERNAL_FUNCTION) { return to; Index: mm.c =================================================================== --- mm.c (revision 199) +++ mm.c (working copy) @@ -157,6 +157,7 @@ #undef MM_SHM_CAN_ATTACH +#if defined(MM_SEM_POSIX) || defined(MM_SEM_FCNTL) || defined(MM_SEM_FLOCK) || defined(MM_SEM_WIN32) || defined(MM_SHM_MMAP_POSIX) || defined(MM_SHM_MMAP_FILE) static int strxcat(char* dst, const char* src, int size) { int dst_len = strlen(dst); int src_len = strlen(src); @@ -169,6 +170,7 @@ return 0; } } +#endif #if defined(MM_SEM_SPINLOCK) @@ -191,9 +193,11 @@ spinlock_t spinlock; } mm_mutex; +/* not used static int mm_attach_lock(const char* key, mm_mutex* lock) { return 1; } +*/ static int mm_init_lock(const char* key, mm_mutex* lock) { spinlock_init(&lock->spinlock); Index: ea_restore.c =================================================================== --- ea_restore.c (revision 199) +++ ea_restore.c (working copy) @@ -465,7 +465,10 @@ zend_op_array *restore_op_array(zend_op_array * to, eaccelerator_op_array * from TSRMLS_DC) { - zend_function *function; + union { + zend_function *v; + void *ptr; + } function; #ifdef ZEND_ENGINE_2 int fname_len = 0; char *fname_lc = NULL; @@ -529,8 +532,13 @@ * am I right here ? ;-( */ if (from->scope_name != NULL) { + union { + zend_class_entry *v; + void *ptr; + } scope; char *from_scope_lc = zend_str_tolower_dup(from->scope_name, from->scope_name_len); - if (zend_hash_find (CG(class_table), (void *) from_scope_lc, from->scope_name_len + 1, (void **) &to->scope) != SUCCESS) { + scope.v = to->scope; + if (zend_hash_find (CG(class_table), (void *) from_scope_lc, from->scope_name_len + 1, &scope.ptr) != SUCCESS) { DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] can't find '%s' in class_table. use EAG(class_entry).\n", getpid(), from->scope_name)); to->scope = EAG(class_entry); @@ -548,11 +556,11 @@ for (p = EAG(class_entry)->parent; p; p = p->parent) { DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] checking parent '%s' have '%s'\n", getpid(), p->name, fname_lc)); - if (zend_hash_find(&p->function_table, fname_lc, fname_len + 1, (void **) &function) == SUCCESS) { + if (zend_hash_find(&p->function_table, fname_lc, fname_len + 1, &function.ptr) == SUCCESS) { DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] '%s' has '%s' of scope '%s'\n", - getpid(), p->name, fname_lc, function->common.scope->name)); - to->scope = function->common.scope; + getpid(), p->name, fname_lc, function.v->common.scope->name)); + to->scope = function.v->common.scope; break; } } @@ -582,10 +590,10 @@ #else to->function_name, strlen(to->function_name) + 1, #endif - (void **) &function) == SUCCESS && function->type == ZEND_INTERNAL_FUNCTION) { + &function.ptr) == SUCCESS && function.v->type == ZEND_INTERNAL_FUNCTION) { DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] found in function table\n", getpid())); - ((zend_internal_function *) (to))->handler = ((zend_internal_function *) function)->handler; + ((zend_internal_function *) (to))->handler = ((zend_internal_function *) function.v)->handler; } else { /* FIXME. I don't know how to fix handler. * TODO: must solve this somehow, to avoid returning damaged structure... @@ -805,7 +813,6 @@ eaccelerator_class_entry * from TSRMLS_DC) { zend_class_entry *old; - zend_function *f = NULL; DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC)); DBG(ea_debug_printf, (EA_DEBUG, "[%d] restore_class_entry: %s\n", getpid(), from->name ? from->name : "(top)")); Index: ea_dasm.c =================================================================== --- ea_dasm.c (revision 199) +++ ea_dasm.c (working copy) @@ -269,7 +269,7 @@ } else if (opline->extended_value == ZEND_ISEMPTY) { snprintf(buf, sizeof(buf), "ZEND_ISEMPTY"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } #ifdef ZEND_ENGINE_2 } else if ((op->ops & EXT_MASK) == EXT_ASSIGN) { @@ -278,7 +278,7 @@ } else if (opline->extended_value == ZEND_ASSIGN_DIM) { snprintf(buf, sizeof(buf), "ZEND_ASSIGN_DIM"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } #ifndef ZEND_ENGINE_2_1 } else if (opline->opcode == ZEND_UNSET_DIM_OBJ) { @@ -287,14 +287,14 @@ } else if (opline->extended_value == ZEND_UNSET_OBJ) { snprintf(buf, sizeof(buf), "ZEND_UNSET_OBJ"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } #endif #endif } else if (opline->extended_value != 0) { snprintf(buf, sizeof(buf), "%ld", opline->extended_value); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } add_assoc_string(el, "extended_value", buf, 1); @@ -314,7 +314,7 @@ snprintf(buf, sizeof(buf), "$class%u", VAR_NUM(opline->op1.u.var)); } else if ((op->ops & OP1_MASK) == OP1_UCLASS) { if (opline->op1.op_type == IS_UNUSED) { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } else { snprintf(buf, sizeof(buf), "$class%u", VAR_NUM(opline->op1.u.var)); } @@ -328,6 +328,7 @@ if (offset >= op_array->last_brk_cont) { goto brk_failed; } + jmp_to = &op_array->brk_cont_array[offset]; offset = jmp_to->parent; } while (--level > 0); snprintf(buf, sizeof(buf), "opline(%d)", jmp_to->brk); @@ -367,7 +368,7 @@ } else if (opline->op1.op_type == IS_VAR) { snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->op1.u.var)); } else if (opline->op1.op_type == IS_UNUSED) { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } else { snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->op1.op_type); } @@ -415,7 +416,7 @@ } else if (opline->op2.u.constant.value.lval == ZEND_REQUIRE_ONCE) { snprintf(buf, sizeof(buf), "ZEND_REQUIRE_ONCE"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } } else if ((op->ops & OP2_MASK) == OP2_ARG) { snprintf(buf, sizeof(buf), "arg(%u)", opline->op2.u.opline_num); @@ -425,7 +426,7 @@ } else if (opline->op2.u.constant.value.lval == ZEND_ISEMPTY) { snprintf(buf, sizeof(buf), "ZEND_ISEMPTY"); } else { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } } else { if (opline->op2.op_type == IS_CONST) { @@ -436,7 +437,7 @@ } else if (opline->op2.op_type == IS_VAR) { snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->op2.u.var)); } else if (opline->op2.op_type == IS_UNUSED) { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } else { snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->op2.op_type); } @@ -466,7 +467,7 @@ snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->result.u.var)); } } else if (opline->result.op_type == IS_UNUSED) { - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; } else { snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->result.op_type); } @@ -485,7 +486,7 @@ } break; case RES_UNUSED: - snprintf(buf, sizeof(buf), ""); + buf[0] = '\0'; break; default: snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->result.op_type); Index: ea_store.c =================================================================== --- ea_store.c (revision 199) +++ ea_store.c (working copy) @@ -85,11 +85,14 @@ #endif } + /* Calculate the size of a point to a class entry */ +/* not used static void calc_class_entry_ptr(zend_class_entry ** from TSRMLS_DC) { calc_class_entry(*from TSRMLS_CC); } +*/ #endif /* Calculate the size of an HashTable */ @@ -780,31 +783,37 @@ { zend_class_entry *from = from_ce; zend_class_entry *parent = from->parent; - zend_property_info *pinfo, *cinfo = NULL; - zval **pprop = NULL; - zval **cprop = p->pData; + union { + zend_property_info *v; + void *ptr; + } pinfo, cinfo; + union { + zval **v; + void *ptr; + } pprop, cprop; char *mname, *cname = NULL; + cprop.v = p->pData; /* Check if this is a parent class. If so, copy unconditionally */ if (parent) { /* unpack the \0classname\0membername\0 style property name to seperate vars */ zend_unmangle_property_name(p->arKey, &cname, &mname); /* lookup the member's info in parent and child */ - if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, (void**)&pinfo) == SUCCESS) && - (zend_hash_find(&from->properties_info, mname, strlen(mname)+1, (void**)&cinfo) == SUCCESS)) { + if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, &pinfo.ptr) == SUCCESS) && + (zend_hash_find(&from->properties_info, mname, strlen(mname)+1, &cinfo.ptr) == SUCCESS)) { /* don't copy this static property if protected in parent and static public in child. inheritance will handle this properly on restore */ - if(cinfo->flags & ZEND_ACC_STATIC && (pinfo->flags & ZEND_ACC_PROTECTED && cinfo->flags & ZEND_ACC_PUBLIC)) { + if(cinfo.v->flags & ZEND_ACC_STATIC && (pinfo.v->flags & ZEND_ACC_PROTECTED && cinfo.v->flags & ZEND_ACC_PUBLIC)) { return ZEND_HASH_APPLY_REMOVE; } /* If the static member points to the same value in parent and child, remove for proper inheritance during restore */ # ifdef ZEND_ENGINE_2_1 - if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) { + if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) { # else - if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) { + if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) { # endif - if(*pprop == *cprop) { + if(*pprop.v == *cprop.v) { return ZEND_HASH_APPLY_REMOVE; } } Index: cache.c =================================================================== --- cache.c (revision 199) +++ cache.c (working copy) @@ -278,7 +278,8 @@ q->next = q; hdr.crc32 = eaccelerator_crc32((const char *) q, q->size); if (write(f, &hdr, sizeof(hdr)) == sizeof(hdr)) { - write(f, q, q->size); + ssize_t result = 0; + result = write(f, q, q->size); EACCELERATOR_FLOCK(f, LOCK_UN); close(f); ret = 1; @@ -596,7 +597,7 @@ { unsigned int i, xlen; zval *list; - char *xkey; + char *xkey = ""; mm_user_cache_entry *p; time_t t = time(0); Index: content.c =================================================================== --- content.c (revision 199) +++ content.c (working copy) @@ -121,16 +121,19 @@ static int eaccelerator_is_not_modified(zval* return_value TSRMLS_DC) { char etag[256]; - zval **server_vars, **match; + union { + zval **v; + void *ptr; + } server_vars, match; if (!SG(headers_sent)) { sprintf(etag,"ETag: eaccelerator-%u",eaccelerator_crc32(Z_STRVAL_P(return_value),Z_STRLEN_P(return_value))); sapi_add_header(etag, strlen(etag), 1); - if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && - Z_TYPE_PP(server_vars) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_IF_NONE_MATCH", sizeof("HTTP_IF_NONE_MATCH"), (void **) &match)==SUCCESS && - Z_TYPE_PP(match) == IS_STRING) { - if (strcmp(etag+6,Z_STRVAL_PP(match)) == 0 && + if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS && + Z_TYPE_PP(server_vars.v) == IS_ARRAY && + zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_IF_NONE_MATCH", sizeof("HTTP_IF_NONE_MATCH"), &match.ptr)==SUCCESS && + Z_TYPE_PP(match.v) == IS_STRING) { + if (strcmp(etag+6,Z_STRVAL_PP(match.v)) == 0 && sapi_add_header("HTTP/1.0 304", sizeof("HTTP/1.0 304") - 1, 1) == SUCCESS && sapi_add_header("Status: 304 Not Modified", sizeof("Status: 304 Not Modified") - 1, 1) == SUCCESS) { zval_dtor(return_value); @@ -183,17 +186,19 @@ static int eaccelerator_get_page(const char* key, int key_len, zval* return_value TSRMLS_DC) { int ret = 0; zval cache_array; - zval **headers; - zval **content; + union { + zval **v; + void *ptr; + } headers, content; if (eaccelerator_get(key, key_len, &cache_array, eaccelerator_content_cache_place TSRMLS_CC)) { if (Z_TYPE(cache_array) == IS_ARRAY) { - if (zend_hash_find(Z_ARRVAL(cache_array),"content",sizeof("content"),(void**)&content) == SUCCESS && - Z_TYPE_PP(content) == IS_STRING) { - if (zend_hash_find(Z_ARRVAL(cache_array),"headers",sizeof("headers"),(void**)&headers) == SUCCESS && - Z_TYPE_PP(headers) == IS_ARRAY) { - zend_hash_apply(Z_ARRVAL_PP(headers), (apply_func_t)eaccelerator_send_header TSRMLS_CC); + if (zend_hash_find(Z_ARRVAL(cache_array),"content",sizeof("content"),&content.ptr) == SUCCESS && + Z_TYPE_PP(content.v) == IS_STRING) { + if (zend_hash_find(Z_ARRVAL(cache_array),"headers",sizeof("headers"),&headers.ptr) == SUCCESS && + Z_TYPE_PP(headers.v) == IS_ARRAY) { + zend_hash_apply(Z_ARRVAL_PP(headers.v), (apply_func_t)eaccelerator_send_header TSRMLS_CC); } - memcpy(return_value,*content, sizeof(zval)); + memcpy(return_value,*content.v, sizeof(zval)); zval_copy_ctor(return_value); ret = 1; } @@ -204,15 +209,18 @@ } static void eaccelerator_compress(char* key, int key_len, zval* return_value, time_t ttl TSRMLS_DC) { - zval **server_vars, **encoding; + union { + zval **v; + void *ptr; + } server_vars, encoding; if (EAG(compression_enabled) && EAG(compress_content) && !SG(headers_sent) && - zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && - Z_TYPE_PP(server_vars) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &encoding)==SUCCESS && - Z_TYPE_PP(encoding) == IS_STRING && + zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS && + Z_TYPE_PP(server_vars.v) == IS_ARRAY && + zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), &encoding.ptr)==SUCCESS && + Z_TYPE_PP(encoding.v) == IS_STRING && Z_TYPE_P(return_value) == IS_STRING && Z_STRLEN_P(return_value) >= EACCELERATOR_COMPRESS_MIN) { char* zkey = NULL; @@ -234,7 +242,7 @@ p = p->next; } - if (strstr(Z_STRVAL_PP(encoding),"x-gzip")) { + if (strstr(Z_STRVAL_PP(encoding.v),"x-gzip")) { zkey_len = sizeof("gzip_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"gzip_",sizeof("gzip_")-1); @@ -243,7 +251,7 @@ enc = "Content-Encoding: x-gzip"; params[0] = return_value; gzip = 1; - } else if (strstr(Z_STRVAL_PP(encoding),"gzip")) { + } else if (strstr(Z_STRVAL_PP(encoding.v),"gzip")) { zkey_len = sizeof("gzip_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"gzip_",sizeof("gzip_")-1); @@ -252,7 +260,7 @@ enc = "Content-Encoding: gzip"; params[0] = return_value; gzip = 1; - } else if (strstr(Z_STRVAL_PP(encoding),"deflate")) { + } else if (strstr(Z_STRVAL_PP(encoding.v),"deflate")) { zkey_len = sizeof("deflate_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"deflate_",sizeof("deflate_")-1); @@ -379,7 +387,10 @@ char* key; int key_len; long ttl = 0; - zval **server_vars, **encoding; + union { + zval **v; + void *ptr; + } server_vars, encoding; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &key, &key_len, &ttl) == FAILURE) { @@ -394,26 +405,26 @@ if (EAG(compression_enabled) && EAG(compress_content) && !SG(headers_sent) && - zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && - Z_TYPE_PP(server_vars) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &encoding)==SUCCESS && - Z_TYPE_PP(encoding) == IS_STRING) { + zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS && + Z_TYPE_PP(server_vars.v) == IS_ARRAY && + zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), &encoding.ptr)==SUCCESS && + Z_TYPE_PP(encoding.v) == IS_STRING) { char* zkey = NULL; char* enc = NULL; int zkey_len = 0; - if (strstr(Z_STRVAL_PP(encoding),"x-gzip")) { + if (strstr(Z_STRVAL_PP(encoding.v),"x-gzip")) { zkey_len = sizeof("gzip_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"gzip_",sizeof("gzip_")-1); memcpy(zkey+sizeof("gzip_")-1,key,key_len+1); enc = "Content-Encoding: x-gzip"; - } else if (strstr(Z_STRVAL_PP(encoding),"gzip")) { + } else if (strstr(Z_STRVAL_PP(encoding.v),"gzip")) { zkey_len = sizeof("gzip_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"gzip_",sizeof("gzip_")-1); memcpy(zkey+sizeof("gzip_")-1,key,key_len+1); enc = "Content-Encoding: gzip"; - } else if (strstr(Z_STRVAL_PP(encoding),"deflate")) { + } else if (strstr(Z_STRVAL_PP(encoding.v),"deflate")) { zkey_len = sizeof("deflate_") + key_len - 1; zkey = emalloc(zkey_len+1); memcpy(zkey,"deflate_",sizeof("deflate_")-1); Index: encoder.c =================================================================== --- encoder.c (revision 199) +++ encoder.c (working copy) @@ -249,26 +249,27 @@ } allow = 1; } else if (allow && ch == '_') { + size_t result = 0; label[0] = ch = fgetc(yyin); if (ch == EOF) {break;} if (ch == '_') { label[1] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,1,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,1,1,yyout); break;} if (IEQ('f')) { label[2] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,2,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,2,1,yyout); break;} if (IEQ('i')) { label[3] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,3,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,3,1,yyout); break;} if (IEQ('l')) { label[4] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,4,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,4,1,yyout); break;} if (IEQ('e')) { label[5] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,5,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,5,1,yyout); break;} if (ch == '_') { label[6] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,6,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,6,1,yyout); break;} if (ch == '_') { ch = fgetc(yyin); repeat = 1; @@ -277,40 +278,40 @@ (ch >= '0' && ch <= '9') || (ch >= '\x7f' && ch <= '\xff') || ch == '_') { - fwrite(label,7,1,yyout); + result = fwrite(label,7,1,yyout); } else { fputs("eaccelerator_loader_file()",yyout); } } else { - fwrite(label,7,1,yyout); + result = fwrite(label,7,1,yyout); } } else { - fwrite(label,6,1,yyout); + result = fwrite(label,6,1,yyout); } } else { - fwrite(label,5,1,yyout); + result = fwrite(label,5,1,yyout); } } else { - fwrite(label,4,1,yyout); + result = fwrite(label,4,1,yyout); } } else { - fwrite(label,3,1,yyout); + result = fwrite(label,3,1,yyout); } } else if (IEQ('l')) { label[2] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,2,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,2,1,yyout); break;} if (IEQ('i')) { label[3] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,3,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,3,1,yyout); break;} if (IEQ('n')) { label[4] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,4,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,4,1,yyout); break;} if (IEQ('e')) { label[5] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,5,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,5,1,yyout); break;} if (ch == '_') { label[6] = ch = fgetc(yyin); - if (ch == EOF) {fwrite(label,6,1,yyout); break;} + if (ch == EOF) {result = fwrite(label,6,1,yyout); break;} if (ch == '_') { ch = fgetc(yyin); repeat = 1; @@ -319,30 +320,30 @@ (ch >= '0' && ch <= '9') || (ch >= '\x7f' && ch <= '\xff') || ch == '_') { - fwrite(label,7,1,yyout); + result = fwrite(label,7,1,yyout); } else { fputs("eaccelerator_loader_line()",yyout); } } else { - fwrite(label,7,1,yyout); + result = fwrite(label,7,1,yyout); } } else { - fwrite(label,6,1,yyout); + result = fwrite(label,6,1,yyout); } } else { - fwrite(label,5,1,yyout); + result = fwrite(label,5,1,yyout); } } else { - fwrite(label,4,1,yyout); + result = fwrite(label,4,1,yyout); } } else { - fwrite(label,3,1,yyout); + result = fwrite(label,3,1,yyout); } } else { - fwrite(label,2,1,yyout); + result = fwrite(label,2,1,yyout); } } else { - fwrite(label,1,1,yyout); + result = fwrite(label,1,1,yyout); } allow = 0; } else if ((ch >= 'a' && ch <= 'z') || @@ -694,9 +695,11 @@ static void encode_class_entry(zend_class_entry* from); +/* not used static void encode_class_entry_ptr(zend_class_entry** from) { encode_class_entry(*from); } +*/ #endif static void encode_hash(HashTable* from, encode_bucket_t encode_bucket) { @@ -718,6 +721,7 @@ } } +/* not used #ifdef ZEND_ENGINE_2 #define encode_zval_hash_ex(from,p) encode_hash_ex(from, p, (encode_bucket_t)encode_zval_ptr) @@ -744,6 +748,7 @@ } } #endif +*/ static void encode_op(zend_op_array* from, zend_op* opline, unsigned int ops) { encode(opline->opcode); @@ -1182,11 +1187,12 @@ } if (prefix != NULL) { + size_t result = 0; prefix->type = IS_STRING; prefix->value.str.len = pos; prefix->value.str.val = emalloc(pos+1); rewind(src_fp); - fread(prefix->value.str.val, pos, 1, src_fp); + result = fread(prefix->value.str.val, pos, 1, src_fp); prefix->value.str.val[prefix->value.str.len] = '\000'; } } @@ -1203,9 +1209,10 @@ FILE *tmp_fp = tmpfile(); if (tmp_fp) { + size_t result = 0; if (pre_content_len > 0) { - fwrite(pre_content, pre_content_len, 1, tmp_fp); + result = fwrite(pre_content, pre_content_len, 1, tmp_fp); } #ifndef WITHOUT_FILE_FILTER filter_file(src_fp, tmp_fp TSRMLS_CC); @@ -1219,7 +1226,7 @@ #endif if (post_content_len > 0) { - fwrite(post_content, post_content_len, 1, tmp_fp); + result = fwrite(post_content, post_content_len, 1, tmp_fp); } rewind(tmp_fp); fclose(src_fp); Index: eaccelerator.c =================================================================== --- eaccelerator.c (revision 199) +++ eaccelerator.c (working copy) @@ -349,6 +349,7 @@ (v3 & 0xff); } +/* This function isn't used. So disable it for now static void decode_version(char *version, int v) { int t = (v & 0x000f00) >> 8; char c; @@ -363,7 +364,8 @@ (v & 0x0ff000) >> 12, c, (v & 0x0000ff)); -} +} +*/ #ifdef EACCELERATOR_USE_INODE static int eaccelerator_inode_key(char* s, dev_t dev, ino_t ino TSRMLS_DC) { @@ -1033,6 +1035,7 @@ return ok; } +#ifndef EACCELERATOR_USE_INODE static char* eaccelerator_realpath(const char* name, char* realname TSRMLS_DC) { /* ???TODO it is possibe to cache name->realname mapping to avoid lstat() calls */ #if ZEND_MODULE_API_NO >= 20001222 @@ -1041,6 +1044,7 @@ return V_REALPATH(name, realname); #endif } +#endif static int eaccelerator_stat(zend_file_handle *file_handle, char* realname, struct stat* buf TSRMLS_DC) { @@ -1226,7 +1230,9 @@ int nreloads; time_t compile_time; int stat_result = 0; +#ifdef DEBUG struct timeval tv_start; +#endif #ifdef EACCELERATOR_USE_INODE realname[0] = '\000'; @@ -2095,21 +2101,28 @@ /* Storing Host Name */ EAG(hostname)[0] = '\000'; { - zval **server_vars, **hostname; + union { + zval **v; + void *ptr; + } server_vars; + union { + zval **v; + void *ptr; + } hostname; - if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && - Z_TYPE_PP(server_vars) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(server_vars), "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &hostname)==SUCCESS && - Z_TYPE_PP(hostname) == IS_STRING && - Z_STRLEN_PP(hostname) > 0) + if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS && + Z_TYPE_PP(server_vars.v) == IS_ARRAY && + zend_hash_find(Z_ARRVAL_PP(server_vars.v), "SERVER_NAME", sizeof("SERVER_NAME"), &hostname.ptr)==SUCCESS && + Z_TYPE_PP(hostname.v) == IS_STRING && + Z_STRLEN_PP(hostname.v) > 0) { - if (sizeof(EAG(hostname)) > Z_STRLEN_PP(hostname)) + if (sizeof(EAG(hostname)) > Z_STRLEN_PP(hostname.v)) { - memcpy(EAG(hostname),Z_STRVAL_PP(hostname),Z_STRLEN_PP(hostname)+1); + memcpy(EAG(hostname),Z_STRVAL_PP(hostname.v),Z_STRLEN_PP(hostname.v)+1); } else { - memcpy(EAG(hostname),Z_STRVAL_PP(hostname),sizeof(EAG(hostname))-1); + memcpy(EAG(hostname),Z_STRVAL_PP(hostname.v),sizeof(EAG(hostname))-1); EAG(hostname)[sizeof(EAG(hostname))-1] = '\000'; } } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Mar 2006 11:05:06 -0000 1.5 +++ .cvsignore 23 May 2006 09:12:27 -0000 1.6 @@ -1 +1 @@ -eaccelerator-svn200603090012.tar.gz +eaccelerator-0.9.5-beta2.tar.bz2 Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/php-eaccelerator.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- php-eaccelerator.spec 14 Mar 2006 12:08:27 -0000 1.10 +++ php-eaccelerator.spec 23 May 2006 09:12:27 -0000 1.11 @@ -1,8 +1,14 @@ -%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) -%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.4.1)} - -%define module_version 0.9.3 -%define prever svn200603090012 +# Useful defaults when building in chroots on systems where PHP is unavailable +%define default_extdir %{_libdir}/php4 +%define default_apiver 20041225 +%define default_version 5.1.4 + +%define module_version 0.9.5 +%define prever beta2 + +%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir}) +%define php_apiver %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) +%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})} # This is the apache userid, only used for sysvipc semaphores which is the # default on ppc since spinlock is not detected @@ -11,19 +17,20 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 0.3%{?dist} +Release: 0.2.%{prever}%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ -#Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz -Source: http://snapshots.eaccelerator.net/eaccelerator-%{prever}.tar.gz +Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2 +Patch0: eaccelerator-0.9.5-beta2-compile.patch +Patch1: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: php = %{php_version} +Requires: php-api = %{php_apiver} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel # Required by phpize -BuildRequires: autoconf, automake, libtool, gcc-c++ +BuildRequires: autoconf, automake, libtool %description eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. @@ -32,8 +39,9 @@ %prep -#setup -n eaccelerator-%{module_version} -%setup -n eaccelerator-%{prever} +%setup -n eaccelerator-%{module_version}-%{prever} +%patch0 -p0 +%patch1 -p0 %build @@ -42,12 +50,7 @@ %ifarch ppc --with-eaccelerator-userid="%{userid}" %endif -# Set fcntl based semaphores to avoid ipc based locking issues on x86_64 -%ifarch x86_64 -%{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h -%{__perl} -pi -e 's|.*(MM_SEM_FCNTL).*|#define $1 1|g' config.h -%endif -# Compile! + %{__make} %{?_smp_mflags} @@ -97,6 +100,17 @@ %changelog +* Tue May 23 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 +- Rebuild against PHP 5.1.4. + +* Fri May 5 2006 Matthias Saou 5.1.x_0.9.5-0.2.beta2 +- Rework heavily the API version requirement detection, should work with + chroots builds where PHP isn't installed outside. +- Replace the CC way of getting the API version with php -i output. + +* Tue Apr 11 2006 Matthias Saou 5.1.x_0.9.5-0.1.beta2 +- Update to 0.9.5-beta2. + * Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.3 - Pass userid 48 to configure script on PPC for sysvipc semaphores. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Mar 2006 11:05:06 -0000 1.5 +++ sources 23 May 2006 09:12:27 -0000 1.6 @@ -1 +1 @@ -762cb56c56190186e5e9a46b2fd2798d eaccelerator-svn200603090012.tar.gz +2516b680ce372765d24e7b64003f1e64 eaccelerator-0.9.5-beta2.tar.bz2 From fedora-extras-commits at redhat.com Tue May 23 09:27:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:27:02 -0700 Subject: rpms/xvattr/FC-4 xvattr.spec,1.7,1.8 Message-ID: <200605230927.k4N9R4bL021824@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xvattr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21779/FC-4 Modified Files: xvattr.spec Log Message: Fix CFLAGS so that our optflags get used too (Ville, #192611). Index: xvattr.spec =================================================================== RCS file: /cvs/extras/rpms/xvattr/FC-4/xvattr.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xvattr.spec 22 May 2005 23:58:28 -0000 1.7 +++ xvattr.spec 23 May 2006 09:27:02 -0000 1.8 @@ -1,17 +1,19 @@ -# $Id$ -# Upstream: Bj?rn Englund - Summary: Utility for getting and setting Xv attributes Name: xvattr Version: 1.3 -Release: 7 - +Release: 10%{?dist} License: GPL Group: User Interface/X URL: http://www.dtek.chalmers.se/groups/dvd/ Source: http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: XFree86-devel, gtk+-devel +BuildRequires: gtk+-devel +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel, libXv-devel +%else +BuildRequires: xorg-x11-devel +%endif %description This program is used for getting and setting Xv attributes such as @@ -20,6 +22,8 @@ %prep %setup +# Append GTK CFLAGS to CFLAGS instead of overwriting CFLAGS (optflags get used) +%{__perl} -pi -e 's|^CFLAGS = (.*)|CFLAGS += $1|g' Makefile* %build @@ -44,6 +48,15 @@ %changelog +* Tue May 23 2006 Matthias Saou 1.3-10 +- Fix CFLAGS so that our optflags get used too (Ville, #192611). + +* Mon Mar 6 2006 Matthias Saou 1.3-9 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 1.3-8 +- Rebuild for new gcc/glibc and modular X. + * Sun May 22 2005 Jeremy Katz - 1.3-7 - rebuild on all arches From fedora-extras-commits at redhat.com Tue May 23 09:27:03 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:27:03 -0700 Subject: rpms/xvattr/FC-5 xvattr.spec,1.9,1.10 Message-ID: <200605230927.k4N9R5rK021828@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xvattr/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21779/FC-5 Modified Files: xvattr.spec Log Message: Fix CFLAGS so that our optflags get used too (Ville, #192611). Index: xvattr.spec =================================================================== RCS file: /cvs/extras/rpms/xvattr/FC-5/xvattr.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xvattr.spec 6 Mar 2006 17:24:49 -0000 1.9 +++ xvattr.spec 23 May 2006 09:27:03 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Utility for getting and setting Xv attributes Name: xvattr Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: User Interface/X URL: http://www.dtek.chalmers.se/groups/dvd/ @@ -22,6 +22,8 @@ %prep %setup +# Append GTK CFLAGS to CFLAGS instead of overwriting CFLAGS (optflags get used) +%{__perl} -pi -e 's|^CFLAGS = (.*)|CFLAGS += $1|g' Makefile* %build @@ -46,6 +48,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 1.3-10 +- Fix CFLAGS so that our optflags get used too (Ville, #192611). + * Mon Mar 6 2006 Matthias Saou 1.3-9 - FC5 rebuild. From fedora-extras-commits at redhat.com Tue May 23 09:27:04 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 02:27:04 -0700 Subject: rpms/xvattr/devel xvattr.spec,1.9,1.10 Message-ID: <200605230927.k4N9R6cN021832@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xvattr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21779/devel Modified Files: xvattr.spec Log Message: Fix CFLAGS so that our optflags get used too (Ville, #192611). Index: xvattr.spec =================================================================== RCS file: /cvs/extras/rpms/xvattr/devel/xvattr.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xvattr.spec 6 Mar 2006 17:24:49 -0000 1.9 +++ xvattr.spec 23 May 2006 09:27:04 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Utility for getting and setting Xv attributes Name: xvattr Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: User Interface/X URL: http://www.dtek.chalmers.se/groups/dvd/ @@ -22,6 +22,8 @@ %prep %setup +# Append GTK CFLAGS to CFLAGS instead of overwriting CFLAGS (optflags get used) +%{__perl} -pi -e 's|^CFLAGS = (.*)|CFLAGS += $1|g' Makefile* %build @@ -46,6 +48,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 1.3-10 +- Fix CFLAGS so that our optflags get used too (Ville, #192611). + * Mon Mar 6 2006 Matthias Saou 1.3-9 - FC5 rebuild. From fedora-extras-commits at redhat.com Tue May 23 10:44:00 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Tue, 23 May 2006 03:44:00 -0700 Subject: kadischi kadischi.spec,1.6,1.7 Message-ID: <200605231044.k4NAi0Cg024534@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/kadischi Modified Files: kadischi.spec Log Message: Fixed wording in description Index: kadischi.spec =================================================================== RCS file: /cvs/devel/kadischi/kadischi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kadischi.spec 22 May 2006 05:36:37 -0000 1.6 +++ kadischi.spec 23 May 2006 10:43:58 -0000 1.7 @@ -17,8 +17,9 @@ %description Kadischi is a LiveCD generation tool for Fedora Core systems. -Live media made with Kadischi can be written to a CD or DVD -and run without any prior installation of Fedora Core. +A Live ISO9660 compliant image file made with Kadischi can +be written to a CD or DVD and run without any prior installation +of Fedora Core. %prep %setup -q -n %{name} From fedora-extras-commits at redhat.com Tue May 23 10:44:53 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 03:44:53 -0700 Subject: rpms/linux_logo/FC-4 linux_logo-4.13-debug.patch, NONE, 1.1 linux_logo.spec, 1.10, 1.11 linux_logo-4.12-debug.patch, 1.1, NONE Message-ID: <200605231045.k4NAjPHZ024604@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/linux_logo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/FC-4 Modified Files: linux_logo.spec Added Files: linux_logo-4.13-debug.patch Removed Files: linux_logo-4.12-debug.patch Log Message: Update the debug patch to remove stripping of the binaries (Ville, #192442). linux_logo-4.13-debug.patch: --- NEW FILE linux_logo-4.13-debug.patch --- diff -Naupr linux_logo-4.13.orig/Makefile linux_logo-4.13/Makefile --- linux_logo-4.13.orig/Makefile 2006-01-11 18:29:57.000000000 +0100 +++ linux_logo-4.13/Makefile 2006-05-23 11:32:55.000000000 +0200 @@ -59,12 +59,10 @@ clean: linux_logo: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(L_OPTS) - @strip linux_logo linux_logo_shared: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo-dyn linux_logo.o vmw_string.o -L./$(LIBSYSINFO) -lsysinfo - @strip linux_logo-dyn ./$(LIBSYSINFO)/libsysinfo.a: cd $(LIBSYSINFO) && $(MAKE) @@ -88,7 +86,7 @@ linux_logo.o: linux_logo.c defaults.h lo $(CC) $(C_OPTS) -c linux_logo.c install: linux_logo - /usr/bin/install -s -m 755 $(PROGNAME) $(INSTALL_BINPATH) + /usr/bin/install -m 755 $(PROGNAME) $(INSTALL_BINPATH) /usr/bin/install -m 644 $(PROGNAME).1.gz $(INSTALL_MANPATH)/man1 cd po && $(MAKE) install Index: linux_logo.spec =================================================================== RCS file: /cvs/extras/rpms/linux_logo/FC-4/linux_logo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux_logo.spec 9 Feb 2006 15:42:56 -0000 1.10 +++ linux_logo.spec 23 May 2006 10:44:53 -0000 1.11 @@ -1,12 +1,12 @@ Summary: The linux logo - a colorful console penguin logo Name: linux_logo Version: 4.13 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.deater.net/weave/vmwprod/linux_logo/ Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz -Patch: linux_logo-4.12-debug.patch +Patch: linux_logo-4.13-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gettext @@ -52,6 +52,12 @@ %changelog +* Tue May 23 2006 Matthias Saou 4.13-3 +- Update the debug patch to remove stripping of the binaries (Ville, #192442). + +* Mon Mar 6 2006 Matthias Saou 4.13-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 4.13-1 - Update to 4.13. --- linux_logo-4.12-debug.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 10:44:54 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 03:44:54 -0700 Subject: rpms/linux_logo/FC-5 linux_logo-4.13-debug.patch, NONE, 1.1 linux_logo.spec, 1.11, 1.12 linux_logo-4.12-debug.patch, 1.1, NONE Message-ID: <200605231045.k4NAjQUJ024607@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/linux_logo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/FC-5 Modified Files: linux_logo.spec Added Files: linux_logo-4.13-debug.patch Removed Files: linux_logo-4.12-debug.patch Log Message: Update the debug patch to remove stripping of the binaries (Ville, #192442). linux_logo-4.13-debug.patch: --- NEW FILE linux_logo-4.13-debug.patch --- diff -Naupr linux_logo-4.13.orig/Makefile linux_logo-4.13/Makefile --- linux_logo-4.13.orig/Makefile 2006-01-11 18:29:57.000000000 +0100 +++ linux_logo-4.13/Makefile 2006-05-23 11:32:55.000000000 +0200 @@ -59,12 +59,10 @@ clean: linux_logo: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(L_OPTS) - @strip linux_logo linux_logo_shared: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo-dyn linux_logo.o vmw_string.o -L./$(LIBSYSINFO) -lsysinfo - @strip linux_logo-dyn ./$(LIBSYSINFO)/libsysinfo.a: cd $(LIBSYSINFO) && $(MAKE) @@ -88,7 +86,7 @@ linux_logo.o: linux_logo.c defaults.h lo $(CC) $(C_OPTS) -c linux_logo.c install: linux_logo - /usr/bin/install -s -m 755 $(PROGNAME) $(INSTALL_BINPATH) + /usr/bin/install -m 755 $(PROGNAME) $(INSTALL_BINPATH) /usr/bin/install -m 644 $(PROGNAME).1.gz $(INSTALL_MANPATH)/man1 cd po && $(MAKE) install Index: linux_logo.spec =================================================================== RCS file: /cvs/extras/rpms/linux_logo/FC-5/linux_logo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux_logo.spec 6 Mar 2006 15:25:08 -0000 1.11 +++ linux_logo.spec 23 May 2006 10:44:54 -0000 1.12 @@ -1,12 +1,12 @@ Summary: The linux logo - a colorful console penguin logo Name: linux_logo Version: 4.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.deater.net/weave/vmwprod/linux_logo/ Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz -Patch: linux_logo-4.12-debug.patch +Patch: linux_logo-4.13-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gettext @@ -52,6 +52,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 4.13-3 +- Update the debug patch to remove stripping of the binaries (Ville, #192442). + * Mon Mar 6 2006 Matthias Saou 4.13-2 - FC5 rebuild. --- linux_logo-4.12-debug.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 10:44:54 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 23 May 2006 03:44:54 -0700 Subject: rpms/linux_logo/devel linux_logo-4.13-debug.patch, NONE, 1.1 linux_logo.spec, 1.11, 1.12 linux_logo-4.12-debug.patch, 1.1, NONE Message-ID: <200605231045.k4NAjRs9024609@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/linux_logo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/devel Modified Files: linux_logo.spec Added Files: linux_logo-4.13-debug.patch Removed Files: linux_logo-4.12-debug.patch Log Message: Update the debug patch to remove stripping of the binaries (Ville, #192442). linux_logo-4.13-debug.patch: --- NEW FILE linux_logo-4.13-debug.patch --- diff -Naupr linux_logo-4.13.orig/Makefile linux_logo-4.13/Makefile --- linux_logo-4.13.orig/Makefile 2006-01-11 18:29:57.000000000 +0100 +++ linux_logo-4.13/Makefile 2006-05-23 11:32:55.000000000 +0200 @@ -59,12 +59,10 @@ clean: linux_logo: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(L_OPTS) - @strip linux_logo linux_logo_shared: linux_logo.o vmw_string.o ./$(LIBSYSINFO)/libsysinfo.a $(CC) $(C_OPTS) -o linux_logo-dyn linux_logo.o vmw_string.o -L./$(LIBSYSINFO) -lsysinfo - @strip linux_logo-dyn ./$(LIBSYSINFO)/libsysinfo.a: cd $(LIBSYSINFO) && $(MAKE) @@ -88,7 +86,7 @@ linux_logo.o: linux_logo.c defaults.h lo $(CC) $(C_OPTS) -c linux_logo.c install: linux_logo - /usr/bin/install -s -m 755 $(PROGNAME) $(INSTALL_BINPATH) + /usr/bin/install -m 755 $(PROGNAME) $(INSTALL_BINPATH) /usr/bin/install -m 644 $(PROGNAME).1.gz $(INSTALL_MANPATH)/man1 cd po && $(MAKE) install Index: linux_logo.spec =================================================================== RCS file: /cvs/extras/rpms/linux_logo/devel/linux_logo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux_logo.spec 6 Mar 2006 15:25:08 -0000 1.11 +++ linux_logo.spec 23 May 2006 10:44:54 -0000 1.12 @@ -1,12 +1,12 @@ Summary: The linux logo - a colorful console penguin logo Name: linux_logo Version: 4.13 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.deater.net/weave/vmwprod/linux_logo/ Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz -Patch: linux_logo-4.12-debug.patch +Patch: linux_logo-4.13-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gettext @@ -52,6 +52,9 @@ %changelog +* Tue May 23 2006 Matthias Saou 4.13-3 +- Update the debug patch to remove stripping of the binaries (Ville, #192442). + * Mon Mar 6 2006 Matthias Saou 4.13-2 - FC5 rebuild. --- linux_logo-4.12-debug.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 11:22:11 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 23 May 2006 04:22:11 -0700 Subject: rpms/dia/devel dia-0.95-formatstring.patch, NONE, 1.1 dia.spec, 1.10, 1.11 dia-0.95-CVE-2006-2480.patch, 1.1, NONE Message-ID: <200605231122.k4NBMDp8027830@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27810 Modified Files: dia.spec Added Files: dia-0.95-formatstring.patch Removed Files: dia-0.95-CVE-2006-2480.patch Log Message: * Tue May 23 2006 Hans de Goede 1:0.95-3 - Fix CVE-2006-2453. dia-0.95-formatstring.patch: --- NEW FILE dia-0.95-formatstring.patch --- Only in dia-0.95/app: .#filedlg.c diff -ur dia-0.95.orig/app/app_procs.c dia-0.95/app/app_procs.c --- dia-0.95.orig/app/app_procs.c 2006-02-27 22:29:02.000000000 +0100 +++ dia-0.95/app/app_procs.c 2006-05-22 22:22:37.000000000 +0200 @@ -1175,7 +1175,7 @@ # endif if (!g_option_context_parse (context, &argc, &argv, &error)) { if (error) { /* IMO !error here is a bug upstream, triggered with --gdk-debug=updates */ - g_print (error->message); + g_print ("%s", error->message); g_error_free (error); } else { g_print ("Invalid option?"); @@ -1273,22 +1273,22 @@ g_print(_("The original author of Dia was:\n\n")); for (i = 0; i < NUMBER_OF_ORIG_AUTHORS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nThe current maintainers of Dia are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS; i < NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nOther authors are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i < nauthors; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nDia is documented by:\n\n")); for (i = 0; i < ndocumentors; i++) { - g_print(documentors[i]); g_print("\n"); + g_print("%s\n", documentors[i]); } exit(0); Only in dia-0.95/app: app_procs.c~ diff -ur dia-0.95.orig/app/display.c dia-0.95/app/display.c --- dia-0.95.orig/app/display.c 2006-03-20 22:24:26.000000000 +0100 +++ dia-0.95/app/display.c 2006-05-23 09:39:40.000000000 +0200 @@ -1119,7 +1119,6 @@ Diagram *dia; GtkWidget *dialog, *button; gchar *fname; - gchar *msg; g_return_if_fail(ddisp != NULL); @@ -1134,10 +1133,6 @@ fname = dia->filename; if (!fname) fname = _(""); - msg = g_strdup_printf ( - _("The diagram '%s'\n" - "has not been saved. Save changes now?"), - fname); dialog = gtk_message_dialog_new(GTK_WINDOW (ddisp->shell), GTK_DIALOG_MODAL, @@ -1145,8 +1140,9 @@ GTK_BUTTONS_NONE, /* no standard buttons */ _("Closing diagram without saving"), NULL); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), msg); - g_free (msg); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The diagram '%s'\n" + "has not been saved. Save changes now?"), fname); gtk_window_set_title (GTK_WINDOW(dialog), _("Close Diagram")); button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); Only in dia-0.95/app: display.c~ diff -ur dia-0.95.orig/app/filedlg.c dia-0.95/app/filedlg.c --- dia-0.95.orig/app/filedlg.c 2006-02-05 14:42:09.000000000 +0100 +++ dia-0.95/app/filedlg.c 2006-05-23 09:41:29.000000000 +0200 @@ -299,7 +299,6 @@ if (stat(filename, &stat_struct) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; char *utf8filename = NULL; if (!g_utf8_validate(filename, -1, NULL)) { utf8filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL); @@ -310,16 +309,15 @@ } if (utf8filename == NULL) utf8filename = g_strdup(filename); - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), utf8filename); - g_free(utf8filename); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("File already exists")); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), buffer); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), utf8filename); + g_free(utf8filename); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) { @@ -552,17 +550,15 @@ if (stat(filename, &statbuf) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), dia_message_filename(filename)); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("File already exists")); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), buffer); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), dia_message_filename(filename)); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) { Only in dia-0.95/app: filedlg.c~ diff -ur dia-0.95.orig/app/interface.c dia-0.95/app/interface.c --- dia-0.95.orig/app/interface.c 2006-05-22 22:23:52.000000000 +0200 +++ dia-0.95/app/interface.c 2006-05-22 21:59:00.000000000 +0200 @@ -914,7 +914,7 @@ { Sheet *sheet = get_sheet_by_name(string); if (sheet == NULL) { - message_warning(g_strdup_printf(_("No sheet named %s"), string)); + message_warning(_("No sheet named %s"), string); } else { persistence_set_string("last-sheet-selected", string); fill_sheet_wbox(sheet); Only in dia-0.95/app: interface.c~ diff -ur dia-0.95.orig/app/load_save.c dia-0.95/app/load_save.c --- dia-0.95.orig/app/load_save.c 2006-02-11 23:48:06.000000000 +0100 +++ dia-0.95/app/load_save.c 2006-05-22 21:57:39.000000000 +0200 @@ -200,7 +200,7 @@ g_hash_table_foreach(unknown_hash, GHFuncUnknownObjects, unknown_str); - message_error(unknown_str->str); + message_error("%s", unknown_str->str); } g_hash_table_destroy(unknown_hash); g_string_free(unknown_str, TRUE); Only in dia-0.95/app: load_save.c~ diff -ur dia-0.95.orig/app/sheets.c dia-0.95/app/sheets.c --- dia-0.95.orig/app/sheets.c 2006-02-26 10:52:32.000000000 +0100 +++ dia-0.95/app/sheets.c 2006-05-22 21:56:44.000000000 +0200 @@ -340,7 +340,7 @@ gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap, mask, 1.0); gdk_pixbuf_unref(pixbuf); } else { - message_warning (error->message); + message_warning ("%s", error->message); g_error_free (error); *pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, Only in dia-0.95/app: sheets.c~ diff -ur dia-0.95.orig/lib/dia_image.c dia-0.95/lib/dia_image.c --- dia-0.95.orig/lib/dia_image.c 2005-11-03 23:22:03.000000000 +0100 +++ dia-0.95/lib/dia_image.c 2006-05-22 22:06:26.000000000 +0200 @@ -92,7 +92,7 @@ * only if there is something else wrong while loading it. */ if (g_file_test(filename, G_FILE_TEST_EXISTS)) - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); return NULL; } Only in dia-0.95/lib: dia_image.c~ diff -ur dia-0.95.orig/lib/message.c dia-0.95/lib/message.c --- dia-0.95.orig/lib/message.c 2006-05-22 22:24:18.000000000 +0200 +++ dia-0.95/lib/message.c 2006-05-22 21:55:02.000000000 +0200 @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; Only in dia-0.95: log diff -ur dia-0.95.orig/plug-ins/python/diamodule.c dia-0.95/plug-ins/python/diamodule.c --- dia-0.95.orig/plug-ins/python/diamodule.c 2005-08-29 07:17:51.000000000 +0200 +++ dia-0.95/plug-ins/python/diamodule.c 2006-05-22 22:04:37.000000000 +0200 @@ -393,11 +393,11 @@ return NULL; if (0 == type) - message_notice (text); + message_notice ("%s", text); else if (1 == type) - message_warning (text); + message_warning ("%s", text); else - message_error (text); + message_error ("%s", text); Py_INCREF(Py_None); return Py_None; Only in dia-0.95/plug-ins/python: diamodule.c~ diff -ur dia-0.95.orig/plug-ins/python/pydia-error.c dia-0.95/plug-ins/python/pydia-error.c --- dia-0.95.orig/plug-ins/python/pydia-error.c 2005-09-13 22:19:27.000000000 +0200 +++ dia-0.95/plug-ins/python/pydia-error.c 2006-05-22 22:04:02.000000000 +0200 @@ -46,7 +46,7 @@ PyFile_WriteObject (v, ef, 0); PyTraceBack_Print(tb, ef); if (((PyDiaError*)ef)->str && popup) - message_error (((PyDiaError*)ef)->str->str); + message_error ("%s", ((PyDiaError*)ef)->str->str); g_free (sLoc); Py_DECREF (ef); Py_XDECREF(exc); Only in dia-0.95/plug-ins/python: pydia-error.c~ diff -ur dia-0.95.orig/plug-ins/wmf/wmf.cpp dia-0.95/plug-ins/wmf/wmf.cpp --- dia-0.95.orig/plug-ins/wmf/wmf.cpp 2006-02-20 22:12:02.000000000 +0100 +++ dia-0.95/plug-ins/wmf/wmf.cpp 2006-05-22 22:23:00.000000000 +0200 @@ -223,7 +223,7 @@ va_end (args); //fprintf(renderer->file, string); - g_print(string); + g_print("%s", string); g_free(string); } Only in dia-0.95/plug-ins/wmf: wmf.cpp~ Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dia.spec 20 May 2006 12:20:57 -0000 1.10 +++ dia.spec 23 May 2006 11:22:11 -0000 1.11 @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -10,7 +10,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch -Patch4: dia-0.95-CVE-2006-2480.patch +Patch4: dia-0.95-formatstring.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -29,7 +29,7 @@ %patch1 -p1 -b .dtd %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons -%patch4 -p0 -b .cve-2006-2480 +%patch4 -p1 -b .formatstring %build @@ -99,6 +99,9 @@ %changelog +* Tue May 23 2006 Hans de Goede 1:0.95-3 +- Fix CVE-2006-2453. + * Sat May 20 2006 Hans de Goede 1:0.95-2 - Fix CVE-2006-2480 (bz 192535, 192538). --- dia-0.95-CVE-2006-2480.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 11:24:36 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 23 May 2006 04:24:36 -0700 Subject: rpms/dia/FC-5 dia-0.95-formatstring.patch, NONE, 1.1 dia.spec, 1.11, 1.12 dia-0.95-CVE-2006-2480.patch, 1.1, NONE Message-ID: <200605231124.k4NBOdBG027916@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27896 Modified Files: dia.spec Added Files: dia-0.95-formatstring.patch Removed Files: dia-0.95-CVE-2006-2480.patch Log Message: * Tue May 23 2006 Hans de Goede 1:0.95-3 - Fix CVE-2006-2453. dia-0.95-formatstring.patch: --- NEW FILE dia-0.95-formatstring.patch --- Only in dia-0.95/app: .#filedlg.c diff -ur dia-0.95.orig/app/app_procs.c dia-0.95/app/app_procs.c --- dia-0.95.orig/app/app_procs.c 2006-02-27 22:29:02.000000000 +0100 +++ dia-0.95/app/app_procs.c 2006-05-22 22:22:37.000000000 +0200 @@ -1175,7 +1175,7 @@ # endif if (!g_option_context_parse (context, &argc, &argv, &error)) { if (error) { /* IMO !error here is a bug upstream, triggered with --gdk-debug=updates */ - g_print (error->message); + g_print ("%s", error->message); g_error_free (error); } else { g_print ("Invalid option?"); @@ -1273,22 +1273,22 @@ g_print(_("The original author of Dia was:\n\n")); for (i = 0; i < NUMBER_OF_ORIG_AUTHORS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nThe current maintainers of Dia are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS; i < NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nOther authors are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i < nauthors; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nDia is documented by:\n\n")); for (i = 0; i < ndocumentors; i++) { - g_print(documentors[i]); g_print("\n"); + g_print("%s\n", documentors[i]); } exit(0); Only in dia-0.95/app: app_procs.c~ diff -ur dia-0.95.orig/app/display.c dia-0.95/app/display.c --- dia-0.95.orig/app/display.c 2006-03-20 22:24:26.000000000 +0100 +++ dia-0.95/app/display.c 2006-05-23 09:39:40.000000000 +0200 @@ -1119,7 +1119,6 @@ Diagram *dia; GtkWidget *dialog, *button; gchar *fname; - gchar *msg; g_return_if_fail(ddisp != NULL); @@ -1134,10 +1133,6 @@ fname = dia->filename; if (!fname) fname = _(""); - msg = g_strdup_printf ( - _("The diagram '%s'\n" - "has not been saved. Save changes now?"), - fname); dialog = gtk_message_dialog_new(GTK_WINDOW (ddisp->shell), GTK_DIALOG_MODAL, @@ -1145,8 +1140,9 @@ GTK_BUTTONS_NONE, /* no standard buttons */ _("Closing diagram without saving"), NULL); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), msg); - g_free (msg); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The diagram '%s'\n" + "has not been saved. Save changes now?"), fname); gtk_window_set_title (GTK_WINDOW(dialog), _("Close Diagram")); button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); Only in dia-0.95/app: display.c~ diff -ur dia-0.95.orig/app/filedlg.c dia-0.95/app/filedlg.c --- dia-0.95.orig/app/filedlg.c 2006-02-05 14:42:09.000000000 +0100 +++ dia-0.95/app/filedlg.c 2006-05-23 09:41:29.000000000 +0200 @@ -299,7 +299,6 @@ if (stat(filename, &stat_struct) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; char *utf8filename = NULL; if (!g_utf8_validate(filename, -1, NULL)) { utf8filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL); @@ -310,16 +309,15 @@ } if (utf8filename == NULL) utf8filename = g_strdup(filename); - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), utf8filename); - g_free(utf8filename); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("File already exists")); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), buffer); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), utf8filename); + g_free(utf8filename); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) { @@ -552,17 +550,15 @@ if (stat(filename, &statbuf) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), dia_message_filename(filename)); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("File already exists")); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), buffer); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), dia_message_filename(filename)); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) { Only in dia-0.95/app: filedlg.c~ diff -ur dia-0.95.orig/app/interface.c dia-0.95/app/interface.c --- dia-0.95.orig/app/interface.c 2006-05-22 22:23:52.000000000 +0200 +++ dia-0.95/app/interface.c 2006-05-22 21:59:00.000000000 +0200 @@ -914,7 +914,7 @@ { Sheet *sheet = get_sheet_by_name(string); if (sheet == NULL) { - message_warning(g_strdup_printf(_("No sheet named %s"), string)); + message_warning(_("No sheet named %s"), string); } else { persistence_set_string("last-sheet-selected", string); fill_sheet_wbox(sheet); Only in dia-0.95/app: interface.c~ diff -ur dia-0.95.orig/app/load_save.c dia-0.95/app/load_save.c --- dia-0.95.orig/app/load_save.c 2006-02-11 23:48:06.000000000 +0100 +++ dia-0.95/app/load_save.c 2006-05-22 21:57:39.000000000 +0200 @@ -200,7 +200,7 @@ g_hash_table_foreach(unknown_hash, GHFuncUnknownObjects, unknown_str); - message_error(unknown_str->str); + message_error("%s", unknown_str->str); } g_hash_table_destroy(unknown_hash); g_string_free(unknown_str, TRUE); Only in dia-0.95/app: load_save.c~ diff -ur dia-0.95.orig/app/sheets.c dia-0.95/app/sheets.c --- dia-0.95.orig/app/sheets.c 2006-02-26 10:52:32.000000000 +0100 +++ dia-0.95/app/sheets.c 2006-05-22 21:56:44.000000000 +0200 @@ -340,7 +340,7 @@ gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap, mask, 1.0); gdk_pixbuf_unref(pixbuf); } else { - message_warning (error->message); + message_warning ("%s", error->message); g_error_free (error); *pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, Only in dia-0.95/app: sheets.c~ diff -ur dia-0.95.orig/lib/dia_image.c dia-0.95/lib/dia_image.c --- dia-0.95.orig/lib/dia_image.c 2005-11-03 23:22:03.000000000 +0100 +++ dia-0.95/lib/dia_image.c 2006-05-22 22:06:26.000000000 +0200 @@ -92,7 +92,7 @@ * only if there is something else wrong while loading it. */ if (g_file_test(filename, G_FILE_TEST_EXISTS)) - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); return NULL; } Only in dia-0.95/lib: dia_image.c~ diff -ur dia-0.95.orig/lib/message.c dia-0.95/lib/message.c --- dia-0.95.orig/lib/message.c 2006-05-22 22:24:18.000000000 +0200 +++ dia-0.95/lib/message.c 2006-05-22 21:55:02.000000000 +0200 @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; Only in dia-0.95: log diff -ur dia-0.95.orig/plug-ins/python/diamodule.c dia-0.95/plug-ins/python/diamodule.c --- dia-0.95.orig/plug-ins/python/diamodule.c 2005-08-29 07:17:51.000000000 +0200 +++ dia-0.95/plug-ins/python/diamodule.c 2006-05-22 22:04:37.000000000 +0200 @@ -393,11 +393,11 @@ return NULL; if (0 == type) - message_notice (text); + message_notice ("%s", text); else if (1 == type) - message_warning (text); + message_warning ("%s", text); else - message_error (text); + message_error ("%s", text); Py_INCREF(Py_None); return Py_None; Only in dia-0.95/plug-ins/python: diamodule.c~ diff -ur dia-0.95.orig/plug-ins/python/pydia-error.c dia-0.95/plug-ins/python/pydia-error.c --- dia-0.95.orig/plug-ins/python/pydia-error.c 2005-09-13 22:19:27.000000000 +0200 +++ dia-0.95/plug-ins/python/pydia-error.c 2006-05-22 22:04:02.000000000 +0200 @@ -46,7 +46,7 @@ PyFile_WriteObject (v, ef, 0); PyTraceBack_Print(tb, ef); if (((PyDiaError*)ef)->str && popup) - message_error (((PyDiaError*)ef)->str->str); + message_error ("%s", ((PyDiaError*)ef)->str->str); g_free (sLoc); Py_DECREF (ef); Py_XDECREF(exc); Only in dia-0.95/plug-ins/python: pydia-error.c~ diff -ur dia-0.95.orig/plug-ins/wmf/wmf.cpp dia-0.95/plug-ins/wmf/wmf.cpp --- dia-0.95.orig/plug-ins/wmf/wmf.cpp 2006-02-20 22:12:02.000000000 +0100 +++ dia-0.95/plug-ins/wmf/wmf.cpp 2006-05-22 22:23:00.000000000 +0200 @@ -223,7 +223,7 @@ va_end (args); //fprintf(renderer->file, string); - g_print(string); + g_print("%s", string); g_free(string); } Only in dia-0.95/plug-ins/wmf: wmf.cpp~ Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dia.spec 20 May 2006 12:23:43 -0000 1.11 +++ dia.spec 23 May 2006 11:24:36 -0000 1.12 @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -10,7 +10,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch -Patch4: dia-0.95-CVE-2006-2480.patch +Patch4: dia-0.95-formatstring.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -29,7 +29,7 @@ %patch1 -p1 -b .dtd %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons -%patch4 -p0 -b .cve-2006-2480 +%patch4 -p1 -b .formatstring %build @@ -99,6 +99,9 @@ %changelog +* Tue May 23 2006 Hans de Goede 1:0.95-3 +- Fix CVE-2006-2453. + * Sat May 20 2006 Hans de Goede 1:0.95-2 - Fix CVE-2006-2480 (bz 192535, 192538). --- dia-0.95-CVE-2006-2480.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 13:30:24 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 23 May 2006 06:30:24 -0700 Subject: rpms/p0rn-comfort/FC-4 p0rn-comfort.spec, 1.1, 1.2 p0rn-modules.patch, 1.1, 1.2 Message-ID: <200605231330.k4NDUQGj002881@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/p0rn-comfort/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2826/FC-4 Modified Files: p0rn-comfort.spec p0rn-modules.patch Log Message: * Tue May 23 2006 Andreas Thienemann 0.0.4-3 - Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary Index: p0rn-comfort.spec =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/FC-4/p0rn-comfort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-comfort.spec 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-comfort.spec 23 May 2006 13:30:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: p0rn-comfort Version: 0.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support programs for browsing image-gallery sites License: GPL Group: Applications/Internet @@ -13,7 +13,6 @@ BuildArch: noarch Requires: lynx, wget, mmv Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Provides: perl(P0rn::DB), perl(P0rn::Static) %description p0rn-comfort consists of several support programs for browsing @@ -71,6 +70,9 @@ %changelog +* Tue May 23 2006 Andreas Thienemann 0.0.4-3 +- Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary + * Sun May 21 2006 Andreas Thienemann 0.0.4-2 - Modified p0rn-proxy to actually access P0rn::Static - Install some binaries into %%{_libexecdir} p0rn-modules.patch: Index: p0rn-modules.patch =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/FC-4/p0rn-modules.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-modules.patch 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-modules.patch 23 May 2006 13:30:24 -0000 1.2 @@ -1,20 +1,22 @@ -# This Patch fixes the Package-Name and adds a -# better path for the p0rn Database ---- p0rn-comfort-0.0.4/P0rn/Static.pm.orig 2006-04-28 01:22:36.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-04-28 01:23:48.000000000 +0200 +--- p0rn-comfort-0.0.4/P0rn/Static.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-05-23 15:26:30.000000000 +0200 @@ -7,7 +7,7 @@ use strict; -package Static; -+package P0rn; ++package P0rn::Static; our $PROXY_ADMIN = 'admin'; our $PROXY_CTRL_BASE = 'http://www.cgarbs.de/PROXYCONTROL'; ---- p0rn-comfort-0.0.4/P0rn/DB.pm.orig 2006-04-28 01:22:32.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-04-28 01:22:56.000000000 +0200 -@@ -7,7 +7,7 @@ +--- p0rn-comfort-0.0.4/P0rn/DB.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-05-23 15:27:02.000000000 +0200 +@@ -5,9 +5,11 @@ + # 2004 (C) by Christian Garbs + # Licensed under GNU GPL. See COPYING for details. ++package P0rn::DB; ++ use DBM::Deep; -my $dblocation = './p0rn.db'; From fedora-extras-commits at redhat.com Tue May 23 13:30:25 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 23 May 2006 06:30:25 -0700 Subject: rpms/p0rn-comfort/devel p0rn-comfort.spec, 1.1, 1.2 p0rn-modules.patch, 1.1, 1.2 Message-ID: <200605231330.k4NDUSZi002898@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/p0rn-comfort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2826/devel Modified Files: p0rn-comfort.spec p0rn-modules.patch Log Message: * Tue May 23 2006 Andreas Thienemann 0.0.4-3 - Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary Index: p0rn-comfort.spec =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/devel/p0rn-comfort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-comfort.spec 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-comfort.spec 23 May 2006 13:30:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: p0rn-comfort Version: 0.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support programs for browsing image-gallery sites License: GPL Group: Applications/Internet @@ -13,7 +13,6 @@ BuildArch: noarch Requires: lynx, wget, mmv Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Provides: perl(P0rn::DB), perl(P0rn::Static) %description p0rn-comfort consists of several support programs for browsing @@ -71,6 +70,9 @@ %changelog +* Tue May 23 2006 Andreas Thienemann 0.0.4-3 +- Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary + * Sun May 21 2006 Andreas Thienemann 0.0.4-2 - Modified p0rn-proxy to actually access P0rn::Static - Install some binaries into %%{_libexecdir} p0rn-modules.patch: Index: p0rn-modules.patch =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/devel/p0rn-modules.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-modules.patch 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-modules.patch 23 May 2006 13:30:25 -0000 1.2 @@ -1,20 +1,22 @@ -# This Patch fixes the Package-Name and adds a -# better path for the p0rn Database ---- p0rn-comfort-0.0.4/P0rn/Static.pm.orig 2006-04-28 01:22:36.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-04-28 01:23:48.000000000 +0200 +--- p0rn-comfort-0.0.4/P0rn/Static.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-05-23 15:26:30.000000000 +0200 @@ -7,7 +7,7 @@ use strict; -package Static; -+package P0rn; ++package P0rn::Static; our $PROXY_ADMIN = 'admin'; our $PROXY_CTRL_BASE = 'http://www.cgarbs.de/PROXYCONTROL'; ---- p0rn-comfort-0.0.4/P0rn/DB.pm.orig 2006-04-28 01:22:32.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-04-28 01:22:56.000000000 +0200 -@@ -7,7 +7,7 @@ +--- p0rn-comfort-0.0.4/P0rn/DB.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-05-23 15:27:02.000000000 +0200 +@@ -5,9 +5,11 @@ + # 2004 (C) by Christian Garbs + # Licensed under GNU GPL. See COPYING for details. ++package P0rn::DB; ++ use DBM::Deep; -my $dblocation = './p0rn.db'; From fedora-extras-commits at redhat.com Tue May 23 13:30:25 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 23 May 2006 06:30:25 -0700 Subject: rpms/p0rn-comfort/FC-5 p0rn-comfort.spec, 1.1, 1.2 p0rn-modules.patch, 1.1, 1.2 Message-ID: <200605231330.k4NDURsO002890@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/p0rn-comfort/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2826/FC-5 Modified Files: p0rn-comfort.spec p0rn-modules.patch Log Message: * Tue May 23 2006 Andreas Thienemann 0.0.4-3 - Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary Index: p0rn-comfort.spec =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/FC-5/p0rn-comfort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-comfort.spec 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-comfort.spec 23 May 2006 13:30:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: p0rn-comfort Version: 0.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support programs for browsing image-gallery sites License: GPL Group: Applications/Internet @@ -13,7 +13,6 @@ BuildArch: noarch Requires: lynx, wget, mmv Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Provides: perl(P0rn::DB), perl(P0rn::Static) %description p0rn-comfort consists of several support programs for browsing @@ -71,6 +70,9 @@ %changelog +* Tue May 23 2006 Andreas Thienemann 0.0.4-3 +- Fixed up P0rn::Static and P0rn::DB to make manual Provides unnecessary + * Sun May 21 2006 Andreas Thienemann 0.0.4-2 - Modified p0rn-proxy to actually access P0rn::Static - Install some binaries into %%{_libexecdir} p0rn-modules.patch: Index: p0rn-modules.patch =================================================================== RCS file: /cvs/extras/rpms/p0rn-comfort/FC-5/p0rn-modules.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p0rn-modules.patch 22 May 2006 20:24:28 -0000 1.1 +++ p0rn-modules.patch 23 May 2006 13:30:25 -0000 1.2 @@ -1,20 +1,22 @@ -# This Patch fixes the Package-Name and adds a -# better path for the p0rn Database ---- p0rn-comfort-0.0.4/P0rn/Static.pm.orig 2006-04-28 01:22:36.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-04-28 01:23:48.000000000 +0200 +--- p0rn-comfort-0.0.4/P0rn/Static.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-05-23 15:26:30.000000000 +0200 @@ -7,7 +7,7 @@ use strict; -package Static; -+package P0rn; ++package P0rn::Static; our $PROXY_ADMIN = 'admin'; our $PROXY_CTRL_BASE = 'http://www.cgarbs.de/PROXYCONTROL'; ---- p0rn-comfort-0.0.4/P0rn/DB.pm.orig 2006-04-28 01:22:32.000000000 +0200 -+++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-04-28 01:22:56.000000000 +0200 -@@ -7,7 +7,7 @@ +--- p0rn-comfort-0.0.4/P0rn/DB.pm.modules 2004-11-20 22:08:11.000000000 +0100 ++++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-05-23 15:27:02.000000000 +0200 +@@ -5,9 +5,11 @@ + # 2004 (C) by Christian Garbs + # Licensed under GNU GPL. See COPYING for details. ++package P0rn::DB; ++ use DBM::Deep; -my $dblocation = './p0rn.db'; From fedora-extras-commits at redhat.com Tue May 23 13:39:36 2006 From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg)) Date: Tue, 23 May 2006 06:39:36 -0700 Subject: rpms/pbzip2/devel pbzip2.spec,1.4,1.5 Message-ID: <200605231339.k4NDdchb003288@cvs-int.fedora.redhat.com> Author: jeffg Update of /cvs/extras/rpms/pbzip2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3271/pbzip2/devel Modified Files: pbzip2.spec Log Message: Updated to use $RPM_OPT_FLAGS Index: pbzip2.spec =================================================================== RCS file: /cvs/extras/rpms/pbzip2/devel/pbzip2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pbzip2.spec 28 Feb 2006 17:24:17 -0000 1.4 +++ pbzip2.spec 23 May 2006 13:39:35 -0000 1.5 @@ -1,6 +1,6 @@ Name: pbzip2 Version: 0.9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parallel implementation of bzip2 URL: http://www.compression.ca/pbzip2/ License: BSD @@ -19,6 +19,7 @@ %prep %setup -q +sed -i -e 's/ -O3 / %{optflags} /' Makefile %build @@ -43,6 +44,9 @@ %changelog +* Tue May 23 2006 Jeff Gilchrist - 0.9.6-3 +- Added support for $RPM_OPT_FLAGS thanks to Ville Skytta + * Tue Feb 28 2006 Jeff Gilchrist - 0.9.6-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Tue May 23 13:41:14 2006 From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg)) Date: Tue, 23 May 2006 06:41:14 -0700 Subject: rpms/pbzip2/FC-5 pbzip2.spec,1.4,1.5 Message-ID: <200605231341.k4NDfGDl003369@cvs-int.fedora.redhat.com> Author: jeffg Update of /cvs/extras/rpms/pbzip2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3344/pbzip2/FC-5 Modified Files: pbzip2.spec Log Message: Updated to support $RPM_OPT_FLAGS Index: pbzip2.spec =================================================================== RCS file: /cvs/extras/rpms/pbzip2/FC-5/pbzip2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pbzip2.spec 28 Feb 2006 17:24:17 -0000 1.4 +++ pbzip2.spec 23 May 2006 13:41:14 -0000 1.5 @@ -1,6 +1,6 @@ Name: pbzip2 Version: 0.9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parallel implementation of bzip2 URL: http://www.compression.ca/pbzip2/ License: BSD @@ -19,6 +19,7 @@ %prep %setup -q +sed -i -e 's/ -O3 / %{optflags} /' Makefile %build @@ -43,6 +44,9 @@ %changelog +* Tue May 23 2006 Jeff Gilchrist - 0.9.6-3 +- Added support for $RPM_OPT_FLAGS thanks to Ville Skytta + * Tue Feb 28 2006 Jeff Gilchrist - 0.9.6-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Tue May 23 14:29:07 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 23 May 2006 07:29:07 -0700 Subject: fedora-security/audit fc4,1.260,1.261 fe5,1.29,1.30 Message-ID: <200605231429.k4NET7pH005895@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873 Modified Files: fc4 fe5 Log Message: Note a new dia CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- fc4 23 May 2006 08:08:20 -0000 1.260 +++ fc4 23 May 2006 14:29:04 -0000 1.261 @@ -5,6 +5,7 @@ CVE-2006-2493 ** freetype CVE-2006-2480 VULNERABLE (dia) #192538 +CVE-2006-2453 VULNERABLE (dia) #192538 CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 VULNERABLE (ImageMagick) #192279 CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- fe5 22 May 2006 19:57:33 -0000 1.29 +++ fe5 23 May 2006 14:29:04 -0000 1.30 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-2453 VULNERABLE (dia) bz#192830 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2480 patch (dia, fixed 0.95-2) bz#192535 CVE-2006-2442 patch (kphone, fixed 4.2-9) bz#192202 From fedora-extras-commits at redhat.com Tue May 23 14:36:19 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Tue, 23 May 2006 07:36:19 -0700 Subject: fedora-security/audit fc4,1.261,1.262 fc5,1.174,1.175 Message-ID: <200605231436.k4NEaJI9006148@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6128/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-0558 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- fc4 23 May 2006 14:29:04 -0000 1.261 +++ fc4 23 May 2006 14:36:17 -0000 1.262 @@ -181,7 +181,7 @@ CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] CVE-2006-0591 version (postgresql, fixed 8.0.6) #180537 [since FEDORA-2005-021] CVE-2006-0576 VULNERABLE (oprofile) #180724 -CVE-2006-0558 * kernel +CVE-2006-0558 version (kernel, ** fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-0557 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 CVE-2006-0555 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 CVE-2006-0554 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- fc5 23 May 2006 08:08:20 -0000 1.174 +++ fc5 23 May 2006 14:36:17 -0000 1.175 @@ -181,7 +181,7 @@ CVE-2006-0645 version (gnutls, fixed 1.2.10) CVE-2006-0591 version (postgresql, fixed 8.0.6) CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch -CVE-2006-0558 * kernel +CVE-2006-0558 version (kernel, ** fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-0557 version (kernel, fixed 2.6.15.6) patch-2.6.16-rc6 [since FEDORA-2006-233] CVE-2006-0555 version (kernel, fixed 2.6.16) patch-2.6.16-rc6-git3 [since FEDORA-2006-233] CVE-2006-0554 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233] From fedora-extras-commits at redhat.com Tue May 23 14:55:29 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:55:29 -0700 Subject: rpms/bzrtools - New directory Message-ID: <200605231455.k4NEtVME006324@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6303/bzrtools Log Message: Directory /cvs/extras/rpms/bzrtools added to the repository From fedora-extras-commits at redhat.com Tue May 23 14:55:29 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:55:29 -0700 Subject: rpms/bzrtools/devel - New directory Message-ID: <200605231455.k4NEtVZl006327@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6303/bzrtools/devel Log Message: Directory /cvs/extras/rpms/bzrtools/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 14:55:43 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:55:43 -0700 Subject: rpms/bzrtools Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605231455.k4NEtjrJ006376@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6348 Added Files: Makefile import.log Log Message: Setup of module bzrtools --- NEW FILE Makefile --- # Top level Makefile for module bzrtools all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 23 14:55:43 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:55:43 -0700 Subject: rpms/bzrtools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605231455.k4NEtjts006379@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6348/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bzrtools --- NEW 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 May 23 14:56:03 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:56:03 -0700 Subject: rpms/bzrtools import.log,1.1,1.2 Message-ID: <200605231456.k4NEuZml006447@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413 Modified Files: import.log Log Message: auto-import bzrtools-0.8.1-3 on branch devel from bzrtools-0.8.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bzrtools/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 14:55:42 -0000 1.1 +++ import.log 23 May 2006 14:56:03 -0000 1.2 @@ -0,0 +1 @@ +bzrtools-0_8_1-3:HEAD:bzrtools-0.8.1-3.src.rpm:1148396160 From fedora-extras-commits at redhat.com Tue May 23 14:56:04 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:56:04 -0700 Subject: rpms/bzrtools/devel bzrtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605231456.k4NEuaF8006451@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413/devel Modified Files: .cvsignore sources Added Files: bzrtools.spec Log Message: auto-import bzrtools-0.8.1-3 on branch devel from bzrtools-0.8.1-3.src.rpm --- NEW FILE bzrtools.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzrtools Version: 0.8.1 Release: 3%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools License: GPL URL: http://bazaar-vcs.org/BzrTools Source0: http://panoramicfeedback.com/opensource/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: bzr = 0.8 %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included plugins are: * push - uses rsync to push local changes to a remote server * annotate - prints a file annotated with the revision next to each line * baz-import - (Requres PyBaz) import an arch archive losslessly into bzr * shelve/unshelve - allows you to undo some changes, commit, and restore * clean-tree - remove unknown, ignored-junk, or unversioned files from the tree * graph-ancestry - use dot to produce banch ancestry graphs * shell - a bzr command interpreter with command completion * patch - apply a patch to your tree from a file or URL %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT # remove shebangs from all files as none should be executable scripts sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README NEWS COPYING %dir %{python_sitelib}/bzrlib/plugins/bzrtools %{python_sitelib}/bzrlib/plugins/bzrtools/*.py %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc %ghost %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog * Tue May 16 2006 Shahms E. King 0.8.1-3 - BuildRequires python, rather than python-devel * Mon May 15 2006 Shahms E. King 0.8.1-2 - Fix rpmlint non-executable-script errors * Fri May 12 2006 Shahms E. King 0.8.1-1 - Add COPYING to %doc - Update to new upstream version - Require bzr 0.8 * Wed May 10 2006 Shahms E. King 0.8-1 - Update to new upstream version * Fri Apr 14 2006 Shahms E. King 0.7-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 14:55:43 -0000 1.1 +++ .cvsignore 23 May 2006 14:56:04 -0000 1.2 @@ -0,0 +1 @@ +bzrtools-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 14:55:43 -0000 1.1 +++ sources 23 May 2006 14:56:04 -0000 1.2 @@ -0,0 +1 @@ +d1b913b55d5249d3ff007c756042b0df bzrtools-0.8.1.tar.gz From fedora-extras-commits at redhat.com Tue May 23 14:57:21 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:21 -0700 Subject: rpms/python-sqlalchemy - New directory Message-ID: <200605231457.k4NEvNxJ006552@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/python-sqlalchemy Log Message: Directory /cvs/extras/rpms/python-sqlalchemy added to the repository From fedora-extras-commits at redhat.com Tue May 23 14:57:21 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:21 -0700 Subject: rpms/python-sqlalchemy/devel - New directory Message-ID: <200605231457.k4NEvNBa006555@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6531/python-sqlalchemy/devel Log Message: Directory /cvs/extras/rpms/python-sqlalchemy/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 14:57:33 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:33 -0700 Subject: rpms/python-sqlalchemy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605231457.k4NEvZ3F006609@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6576 Added Files: Makefile import.log Log Message: Setup of module python-sqlalchemy --- NEW FILE Makefile --- # Top level Makefile for module python-sqlalchemy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 23 14:57:33 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:33 -0700 Subject: rpms/python-sqlalchemy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605231457.k4NEvZ43006612@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6576/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-sqlalchemy --- NEW 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 May 23 14:57:50 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:50 -0700 Subject: rpms/python-sqlalchemy import.log,1.1,1.2 Message-ID: <200605231457.k4NEvqQg006676@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6643 Modified Files: import.log Log Message: auto-import python-sqlalchemy-0.1.7-1 on branch devel from python-sqlalchemy-0.1.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 14:57:32 -0000 1.1 +++ import.log 23 May 2006 14:57:50 -0000 1.2 @@ -0,0 +1 @@ +python-sqlalchemy-0_1_7-1:HEAD:python-sqlalchemy-0.1.7-1.src.rpm:1148396267 From fedora-extras-commits at redhat.com Tue May 23 14:57:51 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 07:57:51 -0700 Subject: rpms/python-sqlalchemy/devel python-sqlalchemy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605231457.k4NEvrBa006681@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6643/devel Modified Files: .cvsignore sources Added Files: python-sqlalchemy.spec Log Message: auto-import python-sqlalchemy-0.1.7-1 on branch devel from python-sqlalchemy-0.1.7-1.src.rpm --- NEW FILE python-sqlalchemy.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} %define srcname SQLAlchemy Name: python-sqlalchemy Version: 0.1.7 Release: 1%{?dist} Summary: Modular and flexible ORM library for python Group: Development/Libraries License: MIT URL: http://www.sqlalchemy.org/ Source0: http://download.sourceforge.net/sqlalchemy/%{srcname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python python-setuptools Requires: python-abi = %{pyver} %description SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible, high-level interface to SQL databases. Database and domain concepts are decoupled, allowing both sides maximum flexibility and power. SQLAlchemy provides a powerful mapping layer that can work as automatically or as manually as you choose, determining relationships based on foreign keys or letting you define the join conditions explicitly, to bridge the gap between database and domain. %prep %setup -q -n %{srcname}-%{version} %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed # remove unnecessary scripts for building documentation rm -rf doc/build %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE PKG-INFO doc examples %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info %dir %{python_sitelib}/sqlalchemy %{python_sitelib}/sqlalchemy/*.py %{python_sitelib}/sqlalchemy/*.pyc %ghost %{python_sitelib}/sqlalchemy/*.pyo %dir %{python_sitelib}/sqlalchemy/databases %{python_sitelib}/sqlalchemy/databases/*.py %{python_sitelib}/sqlalchemy/databases/*.pyc %ghost %{python_sitelib}/sqlalchemy/databases/*.pyo %dir %{python_sitelib}/sqlalchemy/ext %{python_sitelib}/sqlalchemy/ext/*.py %{python_sitelib}/sqlalchemy/ext/*.pyc %ghost %{python_sitelib}/sqlalchemy/ext/*.pyo %dir %{python_sitelib}/sqlalchemy/mapping %{python_sitelib}/sqlalchemy/mapping/*.py %{python_sitelib}/sqlalchemy/mapping/*.pyc %ghost %{python_sitelib}/sqlalchemy/mapping/*.pyo %dir %{python_sitelib}/sqlalchemy/mods %{python_sitelib}/sqlalchemy/mods/*.py %{python_sitelib}/sqlalchemy/mods/*.pyc %ghost %{python_sitelib}/sqlalchemy/mods/*.pyo %changelog * Tue May 16 2006 Shahms E. King 0.1.7-1 - Update to new upstream version - Point URL to direct link, not sourceforge redirect - Remove unnecessary document build scripts * Fri Apr 14 2006 Shahms E. King 0.1.6-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 14:57:33 -0000 1.1 +++ .cvsignore 23 May 2006 14:57:51 -0000 1.2 @@ -0,0 +1 @@ +SQLAlchemy-0.1.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 14:57:33 -0000 1.1 +++ sources 23 May 2006 14:57:51 -0000 1.2 @@ -0,0 +1 @@ +1c9c0124ad057c9fbcf8c4e16ecae960 SQLAlchemy-0.1.7.tar.gz From fedora-extras-commits at redhat.com Tue May 23 15:06:22 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 23 May 2006 08:06:22 -0700 Subject: extras-buildsys/common Commands.py,1.8,1.9 Message-ID: <200605231506.k4NF6M7p009068@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9032/common Modified Files: Commands.py Log Message: 2006-05-23 Dan Williams * common/Commands.py - Add a "JobSPRM" command for notifying builders that the job SRPM is available. Passive builders need to upload the SRPM so we have to split the srpm out of the NewJob command to give the server time to upload to a passive builder. Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Commands.py 14 May 2006 05:43:06 -0000 1.8 +++ Commands.py 23 May 2006 15:06:14 -0000 1.9 @@ -28,6 +28,7 @@ CMD_NAME_SLOTS = "Slots" CMD_NAME_NEW_JOB_REQ = "NewJob" CMD_NAME_NEW_JOB_ACK = "NewJobAck" +CMD_NAME_JOB_SRPM = "JobSRPM" CMD_NAME_UNLOCK_REPO = "UnlockRepo" CMD_NAME_BUILDING_JOBS = "BuildingJobs" CMD_NAME_JOB_STATUS_REQ = "JobStatus" @@ -127,6 +128,8 @@ cmd = PlgCommandNewJobReq._deserialize(args) elif name == CMD_NAME_NEW_JOB_ACK: cmd = PlgCommandNewJobAck._deserialize(args) + elif name == CMD_NAME_JOB_SRPM: + cmd = PlgCommandJobSRPM._deserialize(args) elif name == CMD_NAME_BUILDING_JOBS: cmd = PlgCommandBuildingJobs._deserialize(args) elif name == CMD_NAME_JOB_STATUS_REQ: @@ -416,6 +419,41 @@ return self._msg +class PlgCommandJobSRPM(PlgCommand): + def __init__(self, archjob_id, srpm_url, seq=0): + PlgCommand.__init__(self, CMD_NAME_JOB_SRPM, seq) + self._archjob_id = archjob_id + self._srpm_url = srpm_url + + def _deserialize(args): + try: + archjob_id = args['archjob_id'] + except (ValueError, TypeError): + raise ValueError("No 'archjob_id' argument found.") + try: + srpm_url = args['srpm_url'] + except (ValueError, TypeError): + raise ValueError("No 'srpm_url' argument found.") + return PlgCommandJobSRPM(archjob_id, srpm_url) + + _deserialize = staticmethod(_deserialize) + + def serialize(self): + args = {} + args['archjob_id'] = self._archjob_id + args['srpm_url'] = self._srpm_url + return PlgCommand._serialize(self, args) + + def archjob_id(self): + return self._archjob_id + + def srpm_url(self): + return self._srpm_url + + def __str__(self): + return "%s(seq: %d, archjob_id: %s, srpm_url: %s)" % (self._name, self._seq, self._archjob_id, self._srpm_url) + + class PlgCommandUnlockRepo(PlgCommand): def __init__(self, archjob_id, seq=0): PlgCommand.__init__(self, CMD_NAME_UNLOCK_REPO, seq) From fedora-extras-commits at redhat.com Tue May 23 15:06:16 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 23 May 2006 08:06:16 -0700 Subject: extras-buildsys ChangeLog,1.201,1.202 Message-ID: <200605231506.k4NF6kV2009076@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9032 Modified Files: ChangeLog Log Message: 2006-05-23 Dan Williams * common/Commands.py - Add a "JobSPRM" command for notifying builders that the job SRPM is available. Passive builders need to upload the SRPM so we have to split the srpm out of the NewJob command to give the server time to upload to a passive builder. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- ChangeLog 20 May 2006 05:10:02 -0000 1.201 +++ ChangeLog 23 May 2006 15:06:14 -0000 1.202 @@ -1,3 +1,11 @@ +2006-05-23 Dan Williams + + * common/Commands.py + - Add a "JobSPRM" command for notifying builders that the job SRPM is + available. Passive builders need to upload the SRPM so we have to + split the srpm out of the NewJob command to give the server time to + upload to a passive builder. + 2006-05-20 Dan Williams * server/Builder.py From fedora-extras-commits at redhat.com Tue May 23 15:07:04 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 08:07:04 -0700 Subject: owners owners.list,1.1047,1.1048 Message-ID: <200605231507.k4NF765g009103@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9086 Modified Files: owners.list Log Message: add python-sqlalchemy and bzrtools Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1047 retrieving revision 1.1048 diff -u -r1.1047 -r1.1048 --- owners.list 23 May 2006 02:08:50 -0000 1.1047 +++ owners.list 23 May 2006 15:07:04 -0000 1.1048 @@ -109,6 +109,7 @@ Fedora Extras|byzanz|A desktop recorder|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|bzr|A friendly distributed version control system|shahms at shahms.com|extras-qa at fedoraproject.org| +Fedora Extras|bzrtools|A collection of utilities and plugins for Bazaar-NG|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org| @@ -1388,6 +1389,7 @@ Fedora Extras|python-setuptools|Download, build, install, upgrade, and uninstall Python packages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org| +Fedora Extras|python-sqlalchemy|Modular and flexible ORM library for python|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|python-sqlite2|DB-API 2.0 interface for SQLite 3.x|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 23 15:22:37 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 08:22:37 -0700 Subject: rpms/bzr/FC-4 .cvsignore,1.3,1.4 bzr.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200605231522.k4NFMdeh009271@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9216/FC-4 Modified Files: .cvsignore bzr.spec sources Log Message: Update to new upstream version 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2006 22:40:31 -0000 1.3 +++ .cvsignore 23 May 2006 15:22:37 -0000 1.4 @@ -1 +1 @@ -bzr-0.8.tar.gz +bzr-0.8.2.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/bzr.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bzr.spec 10 May 2006 22:40:31 -0000 1.4 +++ bzr.spec 23 May 2006 15:22:37 -0000 1.5 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.8 -Release: 1%{dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -71,6 +71,11 @@ %{python_sitelib}/bzrlib/plugins/*.pyc %ghost %{python_sitelib}/bzrlib/plugins/*.pyo +%dir %{python_sitelib}/bzrlib/plugins/launchpad +%{python_sitelib}/bzrlib/plugins/launchpad/*.py +%{python_sitelib}/bzrlib/plugins/launchpad/*.pyc +%ghost %{python_sitelib}/bzrlib/plugins/launchpad/*.pyo + %dir %{python_sitelib}/bzrlib/util %{python_sitelib}/bzrlib/util/*.py %{python_sitelib}/bzrlib/util/*.pyc @@ -162,6 +167,10 @@ %ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo %changelog +* Tue May 23 2006 Shahms E. King 0.8.2-1 +- Update to new upstream version +- Fix dist tag + * Wed May 10 2006 Shahms E. King 0.8-1 - Update to new upstream version - Update bzr-sys-etree.patch for changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 May 2006 22:40:31 -0000 1.3 +++ sources 23 May 2006 15:22:37 -0000 1.4 @@ -1 +1 @@ -88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz +9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz From fedora-extras-commits at redhat.com Tue May 23 15:22:38 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 08:22:38 -0700 Subject: rpms/bzr/devel .cvsignore,1.3,1.4 bzr.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200605231522.k4NFMe1K009283@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9216/devel Modified Files: .cvsignore bzr.spec sources Log Message: Update to new upstream version 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2006 22:40:38 -0000 1.3 +++ .cvsignore 23 May 2006 15:22:38 -0000 1.4 @@ -1 +1 @@ -bzr-0.8.tar.gz +bzr-0.8.2.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bzr.spec 10 May 2006 22:40:38 -0000 1.4 +++ bzr.spec 23 May 2006 15:22:38 -0000 1.5 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.8 -Release: 1%{dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -71,6 +71,11 @@ %{python_sitelib}/bzrlib/plugins/*.pyc %ghost %{python_sitelib}/bzrlib/plugins/*.pyo +%dir %{python_sitelib}/bzrlib/plugins/launchpad +%{python_sitelib}/bzrlib/plugins/launchpad/*.py +%{python_sitelib}/bzrlib/plugins/launchpad/*.pyc +%ghost %{python_sitelib}/bzrlib/plugins/launchpad/*.pyo + %dir %{python_sitelib}/bzrlib/util %{python_sitelib}/bzrlib/util/*.py %{python_sitelib}/bzrlib/util/*.pyc @@ -162,6 +167,10 @@ %ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo %changelog +* Tue May 23 2006 Shahms E. King 0.8.2-1 +- Update to new upstream version +- Fix dist tag + * Wed May 10 2006 Shahms E. King 0.8-1 - Update to new upstream version - Update bzr-sys-etree.patch for changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 May 2006 22:40:38 -0000 1.3 +++ sources 23 May 2006 15:22:38 -0000 1.4 @@ -1 +1 @@ -88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz +9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz From fedora-extras-commits at redhat.com Tue May 23 15:22:38 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Tue, 23 May 2006 08:22:38 -0700 Subject: rpms/bzr/FC-5 .cvsignore,1.3,1.4 bzr.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200605231522.k4NFMeMm009277@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzr/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9216/FC-5 Modified Files: .cvsignore bzr.spec sources Log Message: Update to new upstream version 0.8.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2006 22:40:32 -0000 1.3 +++ .cvsignore 23 May 2006 15:22:38 -0000 1.4 @@ -1 +1 @@ -bzr-0.8.tar.gz +bzr-0.8.2.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/bzr.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bzr.spec 10 May 2006 22:40:32 -0000 1.4 +++ bzr.spec 23 May 2006 15:22:38 -0000 1.5 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.8 -Release: 1%{dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -71,6 +71,11 @@ %{python_sitelib}/bzrlib/plugins/*.pyc %ghost %{python_sitelib}/bzrlib/plugins/*.pyo +%dir %{python_sitelib}/bzrlib/plugins/launchpad +%{python_sitelib}/bzrlib/plugins/launchpad/*.py +%{python_sitelib}/bzrlib/plugins/launchpad/*.pyc +%ghost %{python_sitelib}/bzrlib/plugins/launchpad/*.pyo + %dir %{python_sitelib}/bzrlib/util %{python_sitelib}/bzrlib/util/*.py %{python_sitelib}/bzrlib/util/*.pyc @@ -162,6 +167,10 @@ %ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo %changelog +* Tue May 23 2006 Shahms E. King 0.8.2-1 +- Update to new upstream version +- Fix dist tag + * Wed May 10 2006 Shahms E. King 0.8-1 - Update to new upstream version - Update bzr-sys-etree.patch for changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 May 2006 22:40:32 -0000 1.3 +++ sources 23 May 2006 15:22:38 -0000 1.4 @@ -1 +1 @@ -88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz +9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz From fedora-extras-commits at redhat.com Tue May 23 15:59:39 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 23 May 2006 08:59:39 -0700 Subject: rpms/pan/devel .cvsignore, 1.8, 1.9 pan.spec, 1.16, 1.17 sources, 1.8, 1.9 pan-0.97-crash-on-shutdown.patch, 1.1, NONE pan-0.97-tree-expanders.patch, 1.1, NONE Message-ID: <200605231559.k4NFxfvx009694@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9673 Modified Files: .cvsignore pan.spec sources Removed Files: pan-0.97-crash-on-shutdown.patch pan-0.97-tree-expanders.patch Log Message: new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 May 2006 04:12:20 -0000 1.8 +++ .cvsignore 23 May 2006 15:59:38 -0000 1.9 @@ -1,6 +1 @@ -pan-0.14.2.91.tar.bz2 -pan-0.93.tar.bz2 -pan-0.94.tar.bz2 -pan-0.95.tar.bz2 -pan-0.96.tar.bz2 -pan-0.97.tar.bz2 +pan-0.98.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- pan.spec 16 May 2006 10:57:22 -0000 1.16 +++ pan.spec 23 May 2006 15:59:38 -0000 1.17 @@ -1,13 +1,11 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.97 -Release: 2%{?dist} +Version: 0.98 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Internet Source0: http://pan.rebelbase.com/download/%{version}/SOURCE/%{name}-%{version}.tar.bz2 -Patch0: pan-0.97-crash-on-shutdown.patch -Patch1: pan-0.97-tree-expanders.patch URL: http://pan.rebelbase.com/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -28,8 +26,6 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 echo "StartupNotify=true" >> pan.desktop @@ -74,6 +70,10 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Tue May 23 2006 Michael A. Peters - 1:0.98-1 +- Update to 0.98 +- previous patches not needed + * Tue May 16 2006 Michael A. Peters - 1:0.97-2 - Added pan-0.97-tree-expanders.patch from upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 May 2006 04:12:20 -0000 1.8 +++ sources 23 May 2006 15:59:38 -0000 1.9 @@ -1,2 +1 @@ -b4e355553cd502add3e599d1e867da9e pan-0.96.tar.bz2 -32dd572f582b1bfd708d4eb755c215e4 pan-0.97.tar.bz2 +004dd79036b726e666cadcfd080fd515 pan-0.98.tar.bz2 --- pan-0.97-crash-on-shutdown.patch DELETED --- --- pan-0.97-tree-expanders.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 17:00:12 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 23 May 2006 10:00:12 -0700 Subject: extras-buildsys/utils extras-push-new,1.14,1.15 Message-ID: <200605231700.k4NH0COf012337@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12317 Modified Files: extras-push-new Log Message: combine build reports into a single mail Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- extras-push-new 20 May 2006 14:34:28 -0000 1.14 +++ extras-push-new 23 May 2006 17:00:09 -0000 1.15 @@ -58,7 +58,7 @@ doublesync = False force = False -alldists = [ 'development', '5', '4', '3' ] +alldists = [ '5', '4', '3', 'development' ] # also the order in build reports archdict = { '3' : ['x86_64', 'i386'], '4' : ['ppc','x86_64', 'i386'], @@ -450,34 +450,40 @@ import smtplib from email.MIMEText import MIMEText -def email_list(pkglist, dist): +def email_list(distlist): """email mailing list with the new package listing""" - uniqued = rpmUtils.miscutils.unique(pkglist) - uniqued.sort() + body = '' + for dist in alldists: # we do this for sorting the dists + if not dist in distlist: + continue + uniqued = rpmUtils.miscutils.unique( getlinesfromrunfile(dist) ) + uniqued.sort() - output = "\nPackages built and released for %s %s: %s \n\n" % (project_hr, dist, len(uniqued)) - for pkg in uniqued: - add = '%s\n' % (pkg) - output = output + add + body += "\nPackages built and released for %s %s: %s \n\n" % (project_hr, dist, len(uniqued)) + for pkg in uniqued: + add = ' %s\n' % (pkg) + body += add + body += '\n' + body += mail_footer - output = output + mail_footer - msg = MIMEText(output) + msg = MIMEText(body) subject = '%s %s Package Build Report' % (project_hr, dist) msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to debugprint( msg.as_string() ) - if DEBUG: - return - s = smtplib.SMTP() - if smtp_server: - s.connect(smtp_server) - else: - s.connect() - s.sendmail(mail_from, [mail_to], msg.as_string()) - s.close() - + if not DEBUG: + s = smtplib.SMTP() + if smtp_server: + s.connect(smtp_server) + else: + s.connect() + s.sendmail(mail_from, [mail_to], msg.as_string()) + s.close() + + for dist in distlist: + emptyrunfile(dist) # ==================================================================== @@ -551,9 +557,7 @@ run_and_check('extras-sync') if opts.mail: - for dist in diststopush: - email_list( getlinesfromrunfile(dist), dist ) - emptyrunfile(dist) + email_list( diststopush ) lock.unlock() sys.exit(0) From fedora-extras-commits at redhat.com Tue May 23 17:06:49 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 23 May 2006 10:06:49 -0700 Subject: extras-buildsys/utils extras-push-new,1.15,1.16 Message-ID: <200605231706.k4NH6nWu014678@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14660 Modified Files: extras-push-new Log Message: combined/shortened mail subject for build report Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- extras-push-new 23 May 2006 17:00:09 -0000 1.15 +++ extras-push-new 23 May 2006 17:06:47 -0000 1.16 @@ -468,7 +468,7 @@ body += mail_footer msg = MIMEText(body) - subject = '%s %s Package Build Report' % (project_hr, dist) + subject = '%s Package Build Report' % (project_hr) msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to From fedora-extras-commits at redhat.com Tue May 23 19:25:26 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 23 May 2006 12:25:26 -0700 Subject: rpms/xmms/devel xmms-1.2.10-joycrash.patch, NONE, 1.1 xmms.spec, 1.20, 1.21 Message-ID: <200605231925.k4NJPSgR030185@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30156 Modified Files: xmms.spec Added Files: xmms-1.2.10-joycrash.patch Log Message: * Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 - Apply upstream fix for joystick plugin crashes. xmms-1.2.10-joycrash.patch: --- NEW FILE xmms-1.2.10-joycrash.patch --- =================================================================== RCS file: /cvs/xmms/General/joystick/joy.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- xmms/General/joystick/joy.c 2001/02/04 18:00:11 1.8 +++ xmms/General/joystick/joy.c 2004/07/17 21:54:55 1.9 @@ -177,8 +177,11 @@ static void init(void) /* ---------------------------------------------------------------------- */ static void cleanup(void) { - keep_going = FALSE; - pthread_join(joyapp_thread, NULL); + if (keep_going) + { + keep_going = FALSE; + pthread_join(joyapp_thread, NULL); + } if (joy_fd1 > 0) close(joy_fd1); if (joy_fd2 > 0) Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xmms.spec 6 Apr 2006 20:43:57 -0000 1.20 +++ xmms.spec 23 May 2006 19:25:25 -0000 1.21 @@ -4,7 +4,7 @@ Name: xmms Version: 1.2.10 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 1 Summary: The X MultiMedia System, a media player @@ -19,6 +19,8 @@ Source1: xmms.req Source2: xmms.xpm Source3: rh_mp3.c +# http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9 +Patch0: %{name}-1.2.10-joycrash.patch Patch1: %{name}-1.2.6-audio.patch Patch2: %{name}-1.2.6-lazy.patch Patch3: %{name}-1.2.8-default-skin.patch @@ -76,6 +78,8 @@ %prep %setup -q +# Fix joystick plugin crashes +%patch0 -p1 -b .joycrash # Set default output plugin to ALSA %patch1 -p1 -b .audio # Use RTLD_LAZY, not RTLD_NOW @@ -183,6 +187,9 @@ %changelog +* Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 +- Apply upstream fix for joystick plugin crashes. + * Thu Apr 6 2006 Ville Skytt?? - 1:1.2.10-23 - Split library and plugins to xmms-libs (#184606). - ALSA is ubiquitous, don't filter dependencies to it. From fedora-extras-commits at redhat.com Tue May 23 20:12:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 23 May 2006 13:12:03 -0700 Subject: rpms/lyx/devel lyx-1.4.1-defaults.patch, NONE, 1.1 lyxrc.defaults.custom, NONE, 1.1 lyx.spec, 1.36, 1.37 lyx-1.4.0-boost.patch, 1.3, NONE Message-ID: <200605232012.k4NKC5vQ008178@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8150 Modified Files: lyx.spec Added Files: lyx-1.4.1-defaults.patch lyxrc.defaults.custom Removed Files: lyx-1.4.0-boost.patch Log Message: * Tue May 23 2006 Rex Dieter 1.4.1-6 - set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) screen_font_roman "Serif" screen_font_sans "Sans" screen_font_typewriter "Monospace" screen_zoom 100 serverpipe "~/.lyx/pipe" lyx-1.4.1-defaults.patch: --- NEW FILE lyx-1.4.1-defaults.patch --- --- lyx-1.4.1/lib/configure.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure 2006-05-23 14:21:08.000000000 -0500 @@ -2027,3 +2027,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- lyx-1.4.1/lib/configure.m4.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure.m4 2006-05-23 14:20:55.000000000 -0500 @@ -727,3 +727,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- NEW FILE lyxrc.defaults.custom --- # -*- text -*- # file lyxrc.example # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. # author Lars Gullik Bj?nnes # author Jean-Marc Lasgouttes # author Jos? Matos # author Asger Alstrup Nielsen # author Ed Scott # author Lior Silberman # author Dekel Tsur # Full author contact details are available in file CREDITS. # The file lyxrc.example is a template to write your own lyxrc file. # If you copy/rename it to lyxrc in the current directory, it will # give global options for all LyX users. It is also possible to copy # this file to $HOME/.lyx/lyxrc so that the configuration applies to a # particular user. # # Several of these settings have defaults that are auto-detected when you use # the menu option Options->Reconfigure. You can see their value by looking at # the file $HOME/.lyx/lyxrc.defaults. Any setting in this file will override # the defaults. # # BIND SECTION ########################################################### # # Before defining your own key-bindings, select one of the available default # binding sets. These are resource files (like this one) that define a # large set of (keyboard) bindings. These files live in bind directory of # the LyX system directory and have in general the .bind suffix. # Currently, you can choose from the following flavors: # # cua.bind for Windows-, Mac- and Motif-like bindings # emacs.bind for Emacs-like bindings. # # The \bind_file command looks in the LyX bind directory for a file # of the given name, but a full path can also be given. If you have # a bind file in your ~/.lyx/bind/ directory, it will be preferred # over a system wide bind file. Default is `cua'. #\bind_file cua #\bind_file emacs # Based on the default, you can now change part or all of it with the # \bind command. For example, when you want the delete key to do the # backspace action, uncomment the following line: #\bind "Delete" "delete-backward" # However, if you're not at all happy with the default bindings, # the most logical thing to do would be to use one of the system # wide bind files as a template and place your own version in # ~/.lyx/bind/mine_is_best.bind and change the above \bind_file # to this instead: #\bind_file mine_is_best # By default, LyX takes over the handling of the dead keys (or accent # keys) that may be defined for your keyboard. While this allows you # to enter characters that would not be normally available, some # people dislike the different behaviour. You can use raw dead keys by # just uncommenting the next line #\override_x_deadkeys false # Tip: Use "lyx -dbg 4" to survey how LyX interprets your keybindings. # # MISC SECTION ########################################################### # # Set this to false if you don't want the startup banner. # Default is true. #\show_banner true # Set to false if you don't want the current selection to be replaced # automatically by what you type. Default is true. #\auto_region_delete false # This is the time interval between auto-saves (in seconds). # 0 means no auto-save, default is 300 for five minutes. #\autosave 600 # LyX asks for a second confirmation to exit if you exit with changed # documents that you don't want to save. You can turn this confirmation off # (LyX will still ask to save changed documents) with the following line. # We recommend to keep the confirmation, though. #\exit_confirmation false # This sets the behaviour if you want to be asked for a filename when # creating a new document or wait until you save it and be asked then. # The default for now is ask on save. # \new_ask_filename false # LyX continously displays names of last command executed, along with a list # of defined short-cuts for it in the minibuffer. # It requires some horsepower to function, so you can turn it off, if LyX # seems slow to you, by uncommenting this line: #\display_shortcuts false # \view_dvi_paper_option allows to specify a paper option to the dvi # viewer. By default LyX specifies the paper size of the document to # the dvi viewer via the command line option -paper size, where size # is one of "us","letter","a3","a4" and so on. The command # \view_dvi_paper_option allows the user to overwrite the name of the # command line flag, i.e. replace -paper with something else. If # specified and left empty, i.e. \view_dvi_paper_option "", LyX does # not append the -paper option to the dvi command at all. This case is # especially useful when viewing your documents on Windows with yap, # because yap does not allow a command line option for the paper size. #\view_dvi_paper_option "" # LyX assumes that the default papersize should be usletter. If this is not # true for your site, use the next line to specify usletter, legal, # executive, a3, a4, a5, or b5 as the default papersize. #\default_papersize "a4" # Define which program to use to run "chktex". # You should include options that turn different warnings on and off. # Default is "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38" # Check the ChkTeX documentation for info on what the flags mean. # Example: use this to ignore warnings about using "\ldots" instead of "..." #\chktex_command "chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38" # Keyboard Mapping. Use this to set the correct mapping file for your # keyboard, that is if you need one. You'll need one if you for instance # want to type German documents on an American keyboard. In that case, # uncomment these three lines: #\kbmap true #\kbmap_primary german #\kbmap_secondary american # The following keyboards are supported: american, czech, francais, # french, german, german-2, magyar, magyar-2, portuges, romanian, # slovak, slovene, transilvanian, turkish and turkish-f. Check # the lib/kbd directory if you want to write support for your language. # If you do, please submit it to lyx-devel at lists.lyx.org. # The Pause button is defined to be a three-way switch between primary # keyboard, secondary keyboard, and no keyboard mapping with the # following command. It is useful if you want to write in a language # not directly supported by your keyboard and you have defined a # custom keyboard mapping above. #\bind "Pause" "keymap-toggle" # This starts the lyxserver. The pipes get an additional extension # '.in' and '.out'. Only for advanced users. \serverpipe "~/.lyx/pipe" # Default format string for the date-insert command # # This accepts the normal strftime formats; see man strftime for full # details of the format. # #\date_insert_format "%A, %e. %B %Y" # Maximum number of words in the initialization string for a new label. # If it is set to 0, then the init. string will only contain the prefix # (e.g. "sec:"). If it is set to -1, the init. string will be empty. # This feature is disabled in 1.1.6. # #\label_init_length 0 # # SCREEN & FONTS SECTION ################################################# # # DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes # wrong, you can override the setting here: #\screen_dpi 100 # The zoom percentage for screen fonts. # A setting of 100% will make the fonts roughly the same size as on paper. # However, since a screen is wider than a piece of paper, the default setting # is 150%. \screen_zoom 100 # The wheel movement factor (for mice with wheels or five button mice) # Default is 100, about a page down. A value of 10 give me about a line and # a half #\wheel_jump 10 # LyX normally doesn't update the cursor position if you move the scrollbar. # If you scroll the cursor off the screen and then start typing LyX will # move you back to where the cursor was. If you'd prefer to always have the # cursor on screen, bounded by the topmost and bottommost visible lines # -- much like XEmacs for example -- then uncomment the next line. #\cursor_follows_scrollbar true # The screen fonts used to display the text while editing # The defaults are: \screen_font_roman "Serif" \screen_font_sans "Sans" \screen_font_typewriter "Monospace" # For some, this font looks better: #\screen_font_roman "-*-utopia" # Allow the use of scalable screen fonts? Default is true. # If you choose "false", LyX will use the closest existing size for a match. # Use this if the scalable fonts look bad and you have many fixed size fonts. #\screen_font_scalable false # Tip: Run lyx as "lyx -dbg 512" to learn which fonts are used. # The norm for the screen fonts. The default is iso8859-1, which is # the same as what LaTeX calls latin1. #\screen_font_encoding iso8859-2 # The norm for the popup fonts. The default is an empty string, which # causes to use the screen fonts norm (defined by \screen_font_encoding). #\popup_font_encoding iso8859-2 # The normal font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_font_name "-*-helvetica-medium-r" # The bold font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_bold_font "-*-helvetica-bold-r" # The font sizes used for calculating the scaling of the screen fonts. # You should only have to change these if the fonts on your screen look bad, # in which case you can fine tune the font selection size by size. LyX selects # font size according to this table, the monitor DPI setting and the current # zoom setting. # The format is: #\screen_font_sizes tiny smallest smaller small normal large larger largest huge huger # # This is the default in LyX (exactly what LaTeX does): #\screen_font_sizes 5.0 7.0 8.0 9.0 10.0 12.0 14.4 17.28 20.74 24.88 # To change the colors for footnotes: #\set_color footnote green # for mathed you may also want to change the coloring of lines and brackets: #\set_color math yellow #\set_color mathlines yellow # # UI SECTION ######################################################## # # Choose your UI (user interface) definition here. The .ui files are in the # directory "lib/ui" and contains the definition of the menu and the toolbar. #\ui_file "default" # # PRINTER SECTION ######################################################## # # The default printer to print on. If none is specified, LyX will use # the environment variable PRINTER. If that fails, the default is empty. #\printer "" # If you have setup (as we recommend you to do) your print program # (e.g. dvips) to take advantage of the particularities of the various # printers you have access to, then you should set the following to # true. Then LyX will pass the name of the destination printer to your # print command. # The default is false, because we have unfortunately to cope with # people who refuse to take the time to configure their system. # Note that you will probably have to change \print_spool_command below. #\print_adapt_output true # If you don't use dvips, you may specify your favorite print program # here. See other options at the end of this section to adapt LyX to # your print program. #\print_command dvips # Extra options to pass to printing program after everything # else, but before the filename of the DVI file to be printed. #\print_extra_options "" # When set, this printer option automatically prints to a file # and then calls a separate print spooling program on that file # with the given name and arguments. # This is set by default to 'lp' or 'lpr', depending on what your # system uses. # Set this to "" if you have set up dvips so that it sends # output to the right printer (remember to also use \print_adapt_output). #\print_spool_command "" # If you specify a printer name in the print dialog, # the following argument is prepended along with the printer name # after the spool command. The default is autodetected, along with # \print_spool_command determination. #\print_spool_printerprefix "" # Other print related options # The following options are only of interest to people who do not # use dvips as print command. You may safely skip to the end of this # section otherwise. # These specify the options to pass to the printer program to select the # corresponding features. These default to the options used for the dvips # program. Look at the man page for your favorite print program to learn # which options to use. # Normally you don't need to change this unless you use something other # than dvips. #\print_evenpage_flag -B #\print_oddpage_flag -A #\print_reverse_flag -r #\print_landscape_flag "-t landscape" #\print_pagerange_flag -pp #\print_copies_flag -c #\print_collcopies_flag -C #\print_paper_flag -t #\print_paper_dimension_flag -T # Option to pass to the print program to print on a specific printer. #\print_to_printer -P # Option to pass to the print program to print to a file. #\print_to_file -o # Extension of printer program output file. Usually .ps #\print_file_extension .ps # Sample configuration to use with dvilj4 for a HP Laserjet IV (or # better) printer [provided by Reuben Thomas ]: #\print_command dvilj4 #\print_extra_options -q #\print_evenpage_flag "-D2 -r" #\print_oddpage_flag -D1 #\print_reverse_flag -r #\print_landscape_flag -l #\print_pagerange_flag -p #\print_to_file -e #\print_file_extension .lj #\print_copies_flag -c #\print_collcopies_flag -c #\print_adapt_output false # # EXPORT SECTION ######################################################## # # The \converter command defines a converter between two formats. # LyX uses the defined converters for generating output in various formats, # or for importing. # The converter command has 4 arguments: The source format, the target format, # the command, and additional flags. # For example, the following defines a DVI->Postscript converter: #\converter dvi ps "dvips -o $$o $$i" "" # The variable name $$i is replaced with the name of the source file, # and $$o is replaced with the name of the target file. # The flags argument is a list of comma separated flags. # Known flags are # - * : copy the previously defined flags # - latex : The converter is latex or its derivatives (pdflatex). # - originaldir : The converter must be invoked in the directory of the lyx # file and not in the temporary directory. This is needed for tex->html # converters in order to be able to read the eps files. # - needaux : The converted uses the .aux file, so we need to call latex # before running the converter. # - resultdir=dir : The converter put all the files in dir. # Using "resultdir" is same as "resultdir=$$b". # Note: When exporting, the whole directory will be moved from the temporary # directory to the target directory. # - resultfile=file : Name of main file in the result directory, for example # "index.html" or "$$b.html" # If "resultfile" is omitted, the name of this file is assumed to be # "index.format" # - parselog=filtername : filtername is a name of a filter command that takes # the converter error log (from stderr), and converts it to a fake latex .log # file. # For example: #\converter latex html "latex2html -split 0 $$i" # "originaldir,needaux,resultdir" # # For literate programming, use something like #\converter literate latex "noweave -delay -index $$i >$$o" # "parselog=listerrors g" #\converter literate program "build-script $$i" # "originaldir,parselog=listerrors g" # The format command is used to define file formats. It has 4 arguments: # the format name, the extension, and "pretty name" and menu shortcut. # For example #\Format latex tex LaTeX L # The \viewer command is used to define viewers for new formats, # or to change the already defined viewers. # For example, to use xdvi as the viewer to dvi files use #\viewer dvi "xdvi" # It can get more involved. Expert users might prefer something like: #\viewer dvi "xdvi -s 2 -expert -geometry 1014x720+0+0 -keep -margins 1.5" # # TEX SECTION ########################################################### # # The font encoding used for the LaTeX2e fontenc package. # T1 is highly recommended for non-English languages. LyX uses T1 as a # default if you have the ec fonts installed on your system. #\font_encoding T1 # Choose "default" if T1 doesn't work for you for some reason: #\font_encoding default # # FILE SECTION ########################################################## # # The default path for your documents. # Default is $HOME #\document_path ~/Documents/ # The file where the last-files information should be stored. # Default is ~/.lyx/lastfiles #\lastfiles ~/.lyx_lastfiles # Maximal number of lastfiles. Up to nine can appear in the file menu. # Default is four. #\num_lastfiles 9 # Flag telling whether the lastfiles should be checked for existence. # Files that does not exist are left out of the lastfiles entries. # Default is true. If you use slow or removable media, such as networks # or floppy disks, you can speed up the starting time of LyX by disabling # this feature. #\check_lastfiles false # The path that LyX will set when offering you to choose a template. # Default is (System LyX dir)/templates #\template_path ~/.lyx/templates # The path that LyX will use to put temporary TeX outputs. # Default is /tmp/ # containing # If you set it, it will be /directory/ # (unless set to /tmp). #\tempdir_path /usr/tmp # If you set this flag, LyX will always use a temporary directory # to put TeX outputs into. It is enabled by default. # This directory is deleted when you quit LyX. # You might want to avoid using a temporary directory in several # cases: # - LaTeX cannot find some files it needs; # - you have a large number of include files, and you get messages # saying that some LaTeX buffers overflow. # Note that, even if tell LyX not to use a temporary directory, there # will be cases where it will be forced to: this happens for example # when typesetting a file in a read-only directory (documentation). #\use_tempdir false # This is the maximum line length of an exported ASCII file (LaTeX, # SGML or plain text). Default is 75. #\ascii_linelen 80 # Set to false if you don't want LyX to create backup files. # Default is true. #\make_backup true # The path for storing backup files. If it is the empty string, LyX will # store the backup file in the same directory of the original file. # Default is "". #\backupdir_path "~/Desktop/Trash/" # # ASCII EXPORT SECTION ################################################### # # The following entry can be used to define an external program to # render tables in the ASCII output. If you specify "none", a simple # internal routine is used. The default is auto-detected. # The following line will use groff and output using latin-1 encoding # (here $$FName is the input file and the output goes to stdout): #\ascii_roff_command "groff -t -Tlatin1 $$FName" # # SPELLCHECKER SECTION #################################################### # # What command runs the spellchecker? Default is "ispell" if it is # installed, "none" otherwise. # If you have aspell (http://metalab.unc.edu/kevina/aspell/) # installed and configured, you might want to uncomment the line below. #\spell_command aspell # Consider run-together words, such as "notthe" for "not the", as legal # words? Default is false. #\accept_compound true # Specify an alternate language. The default is to use the language of # document. Uncomment both to enable. #\use_alt_language true #\alternate_language dansk # Specify additional chars that can be part of a word. #\use_escape_chars true #\escape_chars "??????" # Specify an alternate personal dictionary file. If the file name does not # begin with "/", $HOME is prefixed. The default is to search for a personal # dictionary in both the current directory and $HOME, creating one in $HOME # if none is found. The preferred name is constructed by appending ".ispell_" # to the base name of the hash file. For example, if you use the English # dictionary, your personal dictionary would be named ".ispell_english". #\use_personal_dictionary true #\personal_dictionary .ispell_dansk # Specify whether to pass the -T input encoding option to ispell (only if the # language is different than "default".) Enable this if you can't spellcheck # words with international letters in them. There have been reports that this # does not work with all dictionaries, so this is disabled by default. #\use_input_encoding true # # LANGUAGE SUPPORT SECTION #################################################### # # Set to true to enable support of right-to-left languages (e.g. Hebrew, # Arabic). Default is false. #\rtl true # The latex command for loading the language package. # Default is \usepackage{babel}. #\language_package "\usepackage{omega}" # The latex command for changing the from the language of the document # to another language. $$lang is substituted by the name of the second # language. Default is \selectlanguage{$$lang}. #\language_command_begin "\begin{otherlanguage}{$$lang}" # The latex command for changing back the language to the language of # the document. Default is \selectlanguage{$$lang}. #\language_command_end "\end{otherlanguage}" # Set to false if a language switching command is needed at the beginning of # the document. Default is true. #\language_auto_begin false # Set to false if a language switching command is needed at the end of # the document. Default is true. #\language_auto_end false # Set mark_foreign_language to "false" to disable the highlighting of words # with a foreign language to the language of the documet. # Default is "true" #\mark_foreign_language false # It is possible to bind keys for changing the language inside a document. # For example, the following command will cause F12 to switch between French # and English in a French document, and in a document of other language it will # switch between that language and French. #\bind "F12" "language french" # # HEBREW SUPPORT SECTION #################################################### # # To enable the Hebrew support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary hebrew #\converter tex dvi elatex "" #\converter tex pdf pdfelatex "" #\font_encoding default # You also need to bind a key for switching between Hebrew and English. # For example, #\bind "F12" "language hebrew" # You might want ot disable the foreign language marking: #\mark_foreign_language false # Finally, you need to select iso8859-8 font encoding, and select screen fonts # (below are the default fonts. You need to replace them by Hebrew fonts) #\screen_font_encoding iso8859-8 #\screen_font_roman "-*-times" #\screen_font_sans "-*-helvetica" #\screen_font_typewriter "-*-courier" #\screen_font_popup "-*-helvetica-medium-r" #\screen_font_menu "-*-helvetica-bold-r" # # ARABIC SUPPORT SECTION #################################################### # # To enable the Arabic support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary arabic # You also need to bind a key for switching between Arabic and English. # For example, #\bind "F12" "language arabic" # If you use arabtex, uncomment the following lines #\language_auto_begin false #\language_auto_end false #\language_command_begin "\begin{arabtext}" #\language_command_end "\end{arabtext}" #\language_package "\usepackage{arabtex,iso88596}\setcode{iso8859-6}" # Finally, you need to select iso8859-6.8x font encoding, # and select screen fonts. # iso8859-6.8x fonts can be found at # http://www.langbox.com/AraMosaic/mozilla/fontXFE/ #\screen_font_encoding iso8859-6.8x #\screen_font_encoding_menu iso8859-1 #\screen_font_roman "-*-naskhi" Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- lyx.spec 22 May 2006 18:58:42 -0000 1.36 +++ lyx.spec 23 May 2006 20:12:03 -0000 1.37 @@ -2,18 +2,18 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.4.0-helpers.patch -Patch2: lyx-1.4.0-boost.patch +Patch2: lyx-1.4.1-defaults.patch +Source1: lyxrc.defaults.custom # app-wrapper for various frontends Source10: lyx.sh # .desktop files @@ -53,8 +53,10 @@ Requires: htmlview ## Soft dependancies # add support for lyx's Document->Change Tracking +%if "%{?fedora}" > "3" Requires(hint): tetex-dvipost Requires(hint): tetex-preview +%endif %description LyX is a modern approach to writing documents which breaks with the @@ -96,7 +98,7 @@ %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%{?_without_included_boost:%patch2 -p1 -b .boost} +%patch2 -p1 -b .defaults %build @@ -117,7 +119,6 @@ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ - %{?_without_included_boost} \ --without-warnings --disable-dependency-tracking \ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks @@ -135,6 +136,7 @@ install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms # misc/extras +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults.custom install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ # Set up the lyx-specific class files where TeX can see them @@ -194,10 +196,11 @@ %{_mandir}/man1/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ -%{_datadir}/texmf/tex/latex/lyx/ +%config(noreplace) %{_datadir}/lyx/lyxrc.defaults.custom %verify(not md5 size mtime) %{_datadir}/lyx/*.lst %verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults %verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx +%{_datadir}/texmf/tex/latex/lyx/ %files qt %defattr(-,root,root,-) @@ -211,6 +214,14 @@ %changelog +* Tue May 23 2006 Rex Dieter 1.4.1-6 +- set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) + screen_font_roman "Serif" + screen_font_sans "Sans" + screen_font_typewriter "Monospace" + screen_zoom 100 + serverpipe "~/.lyx/pipe" + * Mon May 22 2006 Rex Dieter 1.4.1-5 - Requires(hint): tetex-preview --- lyx-1.4.0-boost.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 23 21:07:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:07 -0700 Subject: rpms/perl-Data-Structure-Util - New directory Message-ID: <200605232107.k4NL79mE016709@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16685/perl-Data-Structure-Util Log Message: Directory /cvs/extras/rpms/perl-Data-Structure-Util added to the repository From fedora-extras-commits at redhat.com Tue May 23 21:07:08 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:08 -0700 Subject: rpms/perl-Data-Structure-Util/devel - New directory Message-ID: <200605232107.k4NL7APj016713@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16685/perl-Data-Structure-Util/devel Log Message: Directory /cvs/extras/rpms/perl-Data-Structure-Util/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 21:07:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:28 -0700 Subject: rpms/perl-Data-Structure-Util Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605232107.k4NL7Ugc016788@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16755 Added Files: Makefile import.log Log Message: Setup of module perl-Data-Structure-Util --- NEW FILE Makefile --- # Top level Makefile for module perl-Data-Structure-Util all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue May 23 21:07:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:28 -0700 Subject: rpms/perl-Data-Structure-Util/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605232107.k4NL7U7U016792@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16755/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Data-Structure-Util --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue May 23 21:07:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:53 -0700 Subject: owners owners.list,1.1048,1.1049 Message-ID: <200605232107.k4NL7tsw016870@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16840 Modified Files: owners.list Log Message: Add perl-Data-Structure-Util. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1048 retrieving revision 1.1049 diff -u -r1.1048 -r1.1049 --- owners.list 23 May 2006 15:07:04 -0000 1.1048 +++ owners.list 23 May 2006 21:07:53 -0000 1.1049 @@ -997,6 +997,7 @@ Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Data-Structure-Util|Change nature of data within a structure|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Pcalc|Gregorian calendar date calculations|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 23 21:07:58 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:58 -0700 Subject: rpms/perl-Data-Structure-Util import.log,1.1,1.2 Message-ID: <200605232108.k4NL8UAa016944@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16877 Modified Files: import.log Log Message: auto-import perl-Data-Structure-Util-0.11-1 on branch devel from perl-Data-Structure-Util-0.11-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Structure-Util/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 21:07:28 -0000 1.1 +++ import.log 23 May 2006 21:07:58 -0000 1.2 @@ -0,0 +1 @@ +perl-Data-Structure-Util-0_11-1:HEAD:perl-Data-Structure-Util-0.11-1.src.rpm:1148418470 From fedora-extras-commits at redhat.com Tue May 23 21:07:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:07:59 -0700 Subject: rpms/perl-Data-Structure-Util/devel perl-Data-Structure-Util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605232108.k4NL8VtH016949@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Data-Structure-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16877/devel Modified Files: .cvsignore sources Added Files: perl-Data-Structure-Util.spec Log Message: auto-import perl-Data-Structure-Util-0.11-1 on branch devel from perl-Data-Structure-Util-0.11-1.src.rpm --- NEW FILE perl-Data-Structure-Util.spec --- Name: perl-Data-Structure-Util Version: 0.11 Release: 1%{?dist} Summary: Change nature of data within a structure License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-Structure-Util/ Source0: http://www.cpan.org/authors/id/P/PD/PDENIS/Data-Structure-Util-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Clone) BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) BuildRequires: perl(File::Find::Rule) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Data::Structure::Util is a toolbox to manipulate the data inside a data structure. It can process an entire tree and perform the operation requested on each appropriate element. %prep %setup -q -n Data-Structure-Util-%{version} chmod 644 CHANGES README bin/packages.pl %build %{__perl} Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS" ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 rm -f $RPM_BUILD_ROOT%{_bindir}/packages.pl \ $RPM_BUILD_ROOT%{_mandir}/man1/packages.pl* find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README bin/packages.pl %{perl_vendorarch}/auto/* %{perl_vendorarch}/Data* %{_mandir}/man3/* %changelog * Sat May 20 2006 Steven Pritchard 0.11-1 - Specfile autogenerated by cpanspec 1.66. - Drop explicit BR: perl. - BR: File::Find::Rule (for tests). - Add packages.pl to doc list and fix the permissions for the docs. - Drop NINJA non-doc. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Structure-Util/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 21:07:28 -0000 1.1 +++ .cvsignore 23 May 2006 21:07:59 -0000 1.2 @@ -0,0 +1 @@ +Data-Structure-Util-0.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Structure-Util/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 21:07:28 -0000 1.1 +++ sources 23 May 2006 21:07:59 -0000 1.2 @@ -0,0 +1 @@ +3cbec998cd7c55b1244b3f782569b552 Data-Structure-Util-0.11.tar.gz From fedora-extras-commits at redhat.com Tue May 23 21:11:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:16 -0700 Subject: rpms/perl-File-Type - New directory Message-ID: <200605232111.k4NLBIAI017294@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17270/perl-File-Type Log Message: Directory /cvs/extras/rpms/perl-File-Type added to the repository From fedora-extras-commits at redhat.com Tue May 23 21:11:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:17 -0700 Subject: rpms/perl-File-Type/devel - New directory Message-ID: <200605232111.k4NLBJfS017297@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17270/perl-File-Type/devel Log Message: Directory /cvs/extras/rpms/perl-File-Type/devel added to the repository From fedora-extras-commits at redhat.com Tue May 23 21:11:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:34 -0700 Subject: rpms/perl-File-Type Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605232111.k4NLBaEl017370@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17334 Added Files: Makefile import.log Log Message: Setup of module perl-File-Type --- NEW FILE Makefile --- # Top level Makefile for module perl-File-Type all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue May 23 21:11:35 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:35 -0700 Subject: rpms/perl-File-Type/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605232111.k4NLBbHn017374@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17334/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-File-Type --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue May 23 21:11:09 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:09 -0700 Subject: owners owners.list,1.1049,1.1050 Message-ID: <200605232111.k4NLBfcp017386@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17224 Modified Files: owners.list Log Message: Add perl-File-Type. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1049 retrieving revision 1.1050 diff -u -r1.1049 -r1.1050 --- owners.list 23 May 2006 21:07:53 -0000 1.1049 +++ owners.list 23 May 2006 21:11:09 -0000 1.1050 @@ -1044,6 +1044,7 @@ Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-Type|Determine file type using magic|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Finance-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue May 23 21:11:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:11:59 -0700 Subject: rpms/perl-File-Type import.log,1.1,1.2 Message-ID: <200605232112.k4NLC1dh017462@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17425 Modified Files: import.log Log Message: auto-import perl-File-Type-0.22-2 on branch devel from perl-File-Type-0.22-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-File-Type/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 May 2006 21:11:34 -0000 1.1 +++ import.log 23 May 2006 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +perl-File-Type-0_22-2:HEAD:perl-File-Type-0.22-2.src.rpm:1148418713 From fedora-extras-commits at redhat.com Tue May 23 21:12:00 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 23 May 2006 14:12:00 -0700 Subject: rpms/perl-File-Type/devel perl-File-Type.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605232112.k4NLC2Mt017467@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-File-Type/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17425/devel Modified Files: .cvsignore sources Added Files: perl-File-Type.spec Log Message: auto-import perl-File-Type-0.22-2 on branch devel from perl-File-Type-0.22-2.src.rpm --- NEW FILE perl-File-Type.spec --- Name: perl-File-Type Version: 0.22 Release: 2%{?dist} Summary: Determine file type using magic License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/File-Type/ Source0: http://www.cpan.org/authors/id/P/PM/PMISON/File-Type-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file. %prep %setup -q -n File-Type-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon May 22 2006 Steven Pritchard 0.22-2 - Drop NINJA file. * Sat May 20 2006 Steven Pritchard 0.22-1 - Specfile autogenerated by cpanspec 1.66. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Type/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 May 2006 21:11:35 -0000 1.1 +++ .cvsignore 23 May 2006 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +File-Type-0.22.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Type/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 May 2006 21:11:35 -0000 1.1 +++ sources 23 May 2006 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +4be3b0b7000b325c60351fcc8a04815d File-Type-0.22.tar.gz From fedora-extras-commits at redhat.com Tue May 23 21:59:09 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 23 May 2006 14:59:09 -0700 Subject: rpms/python-kid/FC-4 python-kid.spec,1.10,1.11 Message-ID: <200605232159.k4NLxfZJ018243@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18194/FC-4 Modified Files: python-kid.spec Log Message: Fix "requires elementtree" regression (I hate .eggs) Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-4/python-kid.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-kid.spec 20 May 2006 20:20:31 -0000 1.10 +++ python-kid.spec 23 May 2006 21:59:09 -0000 1.11 @@ -2,7 +2,7 @@ Name: python-kid Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -39,6 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt %clean @@ -57,6 +58,9 @@ %changelog +* Tue May 23 2006 Konstantin Ryabitsev - 0.9.1-3 +- Fix 'elementtree requried' regression + * Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 - Update project URL From fedora-extras-commits at redhat.com Tue May 23 21:59:09 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 23 May 2006 14:59:09 -0700 Subject: rpms/python-kid/FC-5 python-kid.spec,1.10,1.11 Message-ID: <200605232159.k4NLxf87018246@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18194/FC-5 Modified Files: python-kid.spec Log Message: Fix "requires elementtree" regression (I hate .eggs) Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/FC-5/python-kid.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-kid.spec 20 May 2006 20:20:32 -0000 1.10 +++ python-kid.spec 23 May 2006 21:59:09 -0000 1.11 @@ -2,7 +2,7 @@ Name: python-kid Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -39,6 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt %clean @@ -57,6 +58,9 @@ %changelog +* Tue May 23 2006 Konstantin Ryabitsev - 0.9.1-3 +- Fix 'elementtree requried' regression + * Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 - Update project URL From fedora-extras-commits at redhat.com Tue May 23 21:59:10 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Tue, 23 May 2006 14:59:10 -0700 Subject: rpms/python-kid/devel python-kid.spec,1.10,1.11 Message-ID: <200605232159.k4NLxg0d018249@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-kid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18194/devel Modified Files: python-kid.spec Log Message: Fix "requires elementtree" regression (I hate .eggs) Index: python-kid.spec =================================================================== RCS file: /cvs/extras/rpms/python-kid/devel/python-kid.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-kid.spec 20 May 2006 20:20:38 -0000 1.10 +++ python-kid.spec 23 May 2006 21:59:10 -0000 1.11 @@ -2,7 +2,7 @@ Name: python-kid Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kid - A simple and pythonic XML template language Group: Applications/Publishing @@ -39,6 +39,7 @@ %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT \ --single-version-externally-managed rm -rf $RPM_BUILD_ROOT%{python_sitelib}/kid/test +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt %clean @@ -57,6 +58,9 @@ %changelog +* Tue May 23 2006 Konstantin Ryabitsev - 0.9.1-3 +- Fix 'elementtree requried' regression + * Sat May 20 2006 Konstantin Ryabitsev - 0.9.1-2 - Update project URL From fedora-extras-commits at redhat.com Wed May 24 02:14:03 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 19:14:03 -0700 Subject: rpms/lineakd/devel lineakd.spec,1.2,1.3 Message-ID: <200605240214.k4O2E5qJ023978@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineakd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23961 Modified Files: lineakd.spec Log Message: Add some Requires to the -devel package so plugins don't need to each BuildRequire them Index: lineakd.spec =================================================================== RCS file: /cvs/extras/rpms/lineakd/devel/lineakd.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lineakd.spec 22 May 2006 06:53:54 -0000 1.2 +++ lineakd.spec 24 May 2006 02:14:02 -0000 1.3 @@ -4,7 +4,7 @@ Name: lineakd Version: 0.8.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Linux support for Easy Access and Multimedia keyboards Group: User Interface/Desktops @@ -41,6 +41,8 @@ Group: Development/Libraries Summary: Development files for lineakd Requires: %{name} = %{version}-%{release} +Requires: libX11-devel +Requires: libXext-devel %description devel This package contains the header files and libraries for developing plugins @@ -118,6 +120,9 @@ %changelog +* Tue May 23 2006 Chris Petersen 0.8.4-5 +- Add some Requires to the -devel package so plugins don't need to each BuildRequire them + * Sun May 21 2006 Chris Petersen 0.8.4-4 - Add ppc_fix.patch to make this build properly on ppc arch - Make %{_sbindir}/* conditional on the buildarch From fedora-extras-commits at redhat.com Wed May 24 04:22:12 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:22:12 -0700 Subject: rpms/gnubiff - New directory Message-ID: <200605240422.k4O4MERp029066@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29040/gnubiff Log Message: Directory /cvs/extras/rpms/gnubiff added to the repository From fedora-extras-commits at redhat.com Wed May 24 04:22:13 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:22:13 -0700 Subject: rpms/gnubiff/devel - New directory Message-ID: <200605240422.k4O4MFU0029069@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29040/gnubiff/devel Log Message: Directory /cvs/extras/rpms/gnubiff/devel added to the repository From fedora-extras-commits at redhat.com Wed May 24 04:22:35 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:22:35 -0700 Subject: rpms/gnubiff Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605240422.k4O4Mbmb029113@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29085 Added Files: Makefile import.log Log Message: Setup of module gnubiff --- NEW FILE Makefile --- # Top level Makefile for module gnubiff all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 24 04:22:36 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:22:36 -0700 Subject: rpms/gnubiff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605240422.k4O4Mch5029116@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29085/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gnubiff --- NEW 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 May 24 04:23:47 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:23:47 -0700 Subject: rpms/gnubiff import.log,1.1,1.2 Message-ID: <200605240423.k4O4Nn2X029192@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29158 Modified Files: import.log Log Message: auto-import gnubiff-2.2.1-2.fc6 on branch devel from gnubiff-2.2.1-2.fc6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnubiff/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 May 2006 04:22:35 -0000 1.1 +++ import.log 24 May 2006 04:23:47 -0000 1.2 @@ -0,0 +1 @@ +gnubiff-2_2_1-2_fc6:HEAD:gnubiff-2.2.1-2.fc6.src.rpm:1148444627 From fedora-extras-commits at redhat.com Wed May 24 04:23:47 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:23:47 -0700 Subject: rpms/gnubiff/devel gnubiff.desktop, NONE, 1.1 gnubiff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605240423.k4O4NoEt029197@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29158/devel Modified Files: .cvsignore sources Added Files: gnubiff.desktop gnubiff.spec Log Message: auto-import gnubiff-2.2.1-2.fc6 on branch devel from gnubiff-2.2.1-2.fc6.src.rpm --- NEW FILE gnubiff.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Gnubiff GenericName=A mail notification program Comment=Check your emails Exec=gnubiff Icon=gnubiff.png Terminal=false Type=Application Categories=Application;Network; Version=2.2.1 --- NEW FILE gnubiff.spec --- Name: gnubiff Version: 2.2.1 Release: 2%{?dist} Summary: A mail notification program Group: Applications/Internet License: GPL URL: http://gnubiff.sourceforge.net/ Source0: http://belnet.dl.sourceforge.net/sourceforge/gnubiff/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gamin-devel, libglade2-devel, desktop-file-utils, gnome-panel-devel, openssl-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description Gnubiff is a mail notification program that periodically checks for mail and displays headers when new mail has arrived %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%{_datadir}/info/dir desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} %find_lang %{name} %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README THANKS TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_infodir}/*.info.gz %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png %{_datadir}/gnome-2.0/ui %{_libdir}/bonobo/servers %{_mandir}/man1/* %changelog * Wed Apr 24 2006 Damien Durand - 2.2.1-2 - Remove --prefix='pkg-config libpanelapplet-2.0 openssl --variable=prefix - Remove ABOUT-NLS & Changelog in %file section - Fixing %{_datadir}/info to {_infodir} * Tue Apr 23 2006 Damien Durand - 2.2.1-1 - Upgrade to 2.2.1 - Add --prefix='pkg-config libpanelapplet-2.0 openssl --variable=prefix in %configure section - Add gnome-panel-devel, openssl-devel in BuildRequires * Sun Apr 21 2006 Damien Durand - 2.2.0-2 - Add gettext-devel, remove gtk-devel in BuildRequires - Add %{_datadir}/info/*.info.gz in files section - Add %post and %preun sections * Wed Apr 19 2006 Damien Durand - 2.2.0-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnubiff/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 May 2006 04:22:36 -0000 1.1 +++ .cvsignore 24 May 2006 04:23:47 -0000 1.2 @@ -0,0 +1 @@ +gnubiff-2.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnubiff/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 May 2006 04:22:36 -0000 1.1 +++ sources 24 May 2006 04:23:47 -0000 1.2 @@ -0,0 +1 @@ +8d2ef679f42e7a593dc88b750d0cca4c gnubiff-2.2.1.tar.gz From fedora-extras-commits at redhat.com Wed May 24 04:27:10 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Tue, 23 May 2006 21:27:10 -0700 Subject: owners owners.list,1.1050,1.1051 Message-ID: <200605240427.k4O4RCD5029255@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29238 Modified Files: owners.list Log Message: Add gnubiff Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1050 retrieving revision 1.1051 diff -u -r1.1050 -r1.1051 --- owners.list 23 May 2006 21:11:09 -0000 1.1050 +++ owners.list 24 May 2006 04:27:10 -0000 1.1051 @@ -415,6 +415,7 @@ Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| +Fedora Extras|gnubiff|A mail notification program|splinux at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnucap|The Gnu Circuit Analysis Package|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|gnugo|Text based go program|michel.salim at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 24 05:39:21 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:21 -0700 Subject: rpms/lineak-defaultplugin - New directory Message-ID: <200605240539.k4O5dNF6031834@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31808/lineak-defaultplugin Log Message: Directory /cvs/extras/rpms/lineak-defaultplugin added to the repository From fedora-extras-commits at redhat.com Wed May 24 05:39:21 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:21 -0700 Subject: rpms/lineak-defaultplugin/devel - New directory Message-ID: <200605240539.k4O5dNcF031837@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31808/lineak-defaultplugin/devel Log Message: Directory /cvs/extras/rpms/lineak-defaultplugin/devel added to the repository From fedora-extras-commits at redhat.com Wed May 24 05:39:29 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:29 -0700 Subject: rpms/lineak-defaultplugin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605240539.k4O5dVmR031886@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31853 Added Files: Makefile import.log Log Message: Setup of module lineak-defaultplugin --- NEW FILE Makefile --- # Top level Makefile for module lineak-defaultplugin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 24 05:39:30 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:30 -0700 Subject: rpms/lineak-defaultplugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605240539.k4O5dWD3031889@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31853/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lineak-defaultplugin --- NEW 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 May 24 05:39:57 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:57 -0700 Subject: rpms/lineak-defaultplugin import.log,1.1,1.2 Message-ID: <200605240540.k4O5eTLP031957@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31917 Modified Files: import.log Log Message: auto-import lineak-defaultplugin-0.8.4-5 on branch devel from lineak-defaultplugin-0.8.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lineak-defaultplugin/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 May 2006 05:39:29 -0000 1.1 +++ import.log 24 May 2006 05:39:57 -0000 1.2 @@ -0,0 +1 @@ +lineak-defaultplugin-0_8_4-5:HEAD:lineak-defaultplugin-0.8.4-5.src.rpm:1148449194 From fedora-extras-commits at redhat.com Wed May 24 05:39:57 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:39:57 -0700 Subject: rpms/lineak-defaultplugin/devel lineak-defaultplugin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605240540.k4O5eT0o031961@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/lineak-defaultplugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31917/devel Modified Files: .cvsignore sources Added Files: lineak-defaultplugin.spec Log Message: auto-import lineak-defaultplugin-0.8.4-5 on branch devel from lineak-defaultplugin-0.8.4-5.src.rpm --- NEW FILE lineak-defaultplugin.spec --- # # Specfile for lineak_defaultplugin, default actions for lineakd # Name: lineak-defaultplugin Version: 0.8.4 Release: 5%{?dist} Summary: This is the default plugin for the lineakd keyboard daemon Group: User Interface/Desktops License: GPL URL: http://lineak.sourceforge.net ################################################################################ Source: http://dl.sourceforge.net/lineak/lineak_defaultplugin-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ################################################################################ BuildRequires: lineakd-devel = %{version} BuildRequires: libXtst-devel BuildRequires: libXt-devel BuildRequires: libxkbfile-devel Requires: lineakd = %{version} Obsoletes: lineak_defaultplugin <= %{version} Provides: lineak_defaultplugin = %{version} ################################################################################ %description This plugin contains the default lineakd macros, including EAK_MUTE, EAK_VOLUP, EAK_VOLDOWN, EAK_EJECT, EAK_MEDIADETECT and others. ################################################################################ %prep %setup -q -n lineak_defaultplugin-%{version} ################################################################################ %build %configure --with-lineak-plugindir=%{_libdir}/lineakd/plugins make %{?_smp_mflags} ################################################################################ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Remove the libtool archive files rm -f $RPM_BUILD_ROOT/%{_libdir}/lineakd/plugins/*.la ################################################################################ %clean rm -rf $RPM_BUILD_ROOT ################################################################################ %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %config(noreplace) %{_sysconfdir}/* %{_libdir}/lineakd/plugins/* %{_mandir}/man[^3]/* ################################################################################ %changelog * Tue May 23 2006 Chris Petersen 0.8.4-5 - Add BuildRequires: libxkbfile-devel * Tue May 23 2006 Chris Petersen 0.8.4-4 - Add a couple of BuildRequires * Mon May 22 2006 Chris Petersen 0.8.4-3 - Rename package with - instead of _, despite upstream use of _ - Add Obsoletes and Provides for the underscore version of the name * Fri May 20 2006 Chris Petersen 0.8.4-2 - Fix download link to point to direct download * Thu May 11 2006 Chris Petersen 0.8.4-1 - Update spec to match fedora guidelines * Mon Mar 14 2005 Chris Petersen - Change lineakd required version from >= to = * Wed Sep 15 2004 Chris Petersen - Rework how files are picked, and add paths to allow the makeinstall macro to work * Tue Mar 9 2004 Chris Petersen - Updated spec file to a better template Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lineak-defaultplugin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 May 2006 05:39:30 -0000 1.1 +++ .cvsignore 24 May 2006 05:39:57 -0000 1.2 @@ -0,0 +1 @@ +lineak_defaultplugin-0.8.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lineak-defaultplugin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 May 2006 05:39:30 -0000 1.1 +++ sources 24 May 2006 05:39:57 -0000 1.2 @@ -0,0 +1 @@ +336b4fa5aa40b1166c2aa5418740357b lineak_defaultplugin-0.8.4.tar.gz From fedora-extras-commits at redhat.com Wed May 24 05:41:39 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Tue, 23 May 2006 22:41:39 -0700 Subject: owners owners.list,1.1051,1.1052 Message-ID: <200605240541.k4O5ffq6032044@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32027 Modified Files: owners.list Log Message: add lineak-defaultplugin: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191605 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1051 retrieving revision 1.1052 diff -u -r1.1051 -r1.1052 --- owners.list 24 May 2006 04:27:10 -0000 1.1051 +++ owners.list 24 May 2006 05:41:39 -0000 1.1052 @@ -734,6 +734,7 @@ Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|lineakd|Linux support for Easy Access and Multimedia keyboards|lists at forevermore.net|extras-qa at fedoraproject.org| +Fedora Extras|lineak-defaultplugin|This is the default plugin for the lineakd keyboard daemon|lists at forevermore.net|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 24 07:13:02 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 24 May 2006 00:13:02 -0700 Subject: rpms/gtkglextmm/devel gtkglextmm.spec,1.1,1.2 Message-ID: <200605240713.k4O7D4eV009267@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglextmm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9246 Modified Files: gtkglextmm.spec Log Message: * Wed May 24 2006 Ralf Cors??pius 1.2.0-3 - Increment Release, add %{?dist}. Index: gtkglextmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/devel/gtkglextmm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkglextmm.spec 21 May 2006 11:20:52 -0000 1.1 +++ gtkglextmm.spec 24 May 2006 07:13:01 -0000 1.2 @@ -5,7 +5,7 @@ Summary: C++ wrapper for GtkGlExt Name: gtkglextmm Version: 1.2.0 -Release: 2 +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://gtkglext.sourceforge.net @@ -70,6 +70,9 @@ %doc %{_datadir}/doc/%{name}-%{gtkglextmm_major}/html/* %changelog +* Wed May 24 2006 Ralf Cors??pius 1.2.0-3 +- Increment Release, add %%{?dist}. + * Fri May 17 2006 Gilles Gagniard 1.2.0-2 - Removed unnecessary dependencies * Fri May 12 2006 Gilles Gagniard 1.2.0-1 From fedora-extras-commits at redhat.com Wed May 24 07:13:54 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 24 May 2006 00:13:54 -0700 Subject: rpms/gtkglextmm/FC-5 gtkglextmm.spec,1.1,1.2 Message-ID: <200605240713.k4O7Duhs009376@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglextmm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9358 Modified Files: gtkglextmm.spec Log Message: * Wed May 24 2006 Ralf Cors??pius 1.2.0-3 - Increment Release, add %{?dist}. Index: gtkglextmm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglextmm/FC-5/gtkglextmm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkglextmm.spec 21 May 2006 11:20:52 -0000 1.1 +++ gtkglextmm.spec 24 May 2006 07:13:54 -0000 1.2 @@ -5,7 +5,7 @@ Summary: C++ wrapper for GtkGlExt Name: gtkglextmm Version: 1.2.0 -Release: 2 +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://gtkglext.sourceforge.net @@ -70,6 +70,9 @@ %doc %{_datadir}/doc/%{name}-%{gtkglextmm_major}/html/* %changelog +* Wed May 24 2006 Ralf Cors??pius 1.2.0-3 +- Increment Release, add %%{?dist}. + * Fri May 17 2006 Gilles Gagniard 1.2.0-2 - Removed unnecessary dependencies * Fri May 12 2006 Gilles Gagniard 1.2.0-1 From fedora-extras-commits at redhat.com Wed May 24 08:05:48 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 24 May 2006 01:05:48 -0700 Subject: rpms/nedit/devel nedit.spec,1.6,1.7 Message-ID: <200605240805.k4O85oB6014818@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14789/nedit/devel Modified Files: nedit.spec Log Message: - don't strip binaries so that we have usable debuginfo nedit package (#192607) Index: nedit.spec =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nedit.spec 5 Mar 2006 10:09:07 -0000 1.6 +++ nedit.spec 24 May 2006 08:05:48 -0000 1.7 @@ -5,7 +5,7 @@ Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -49,7 +49,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_bindir} install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 mv source/nc source/nedit-client -install -s -m 755 source/nedit source/nedit-client $RPM_BUILD_ROOT%{_bindir} +install -m 755 source/nedit source/nedit-client $RPM_BUILD_ROOT%{_bindir} install -m 644 doc/nedit.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit.1x mv doc/nc.man doc/nedit-client.man install -m 644 doc/nedit-client.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit-client.1x @@ -82,6 +82,10 @@ %endif %changelog +* Wed May 24 2006 Jindrich Novy 5.5-8 +- don't strip binaries so that we have usable debuginfo + nedit package (#192607) + * Sun Mar 5 2006 Jindrich Novy 5.5-7 - rebuild From fedora-extras-commits at redhat.com Wed May 24 09:04:46 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 24 May 2006 02:04:46 -0700 Subject: fedora-security/audit fc4,1.262,1.263 fc5,1.175,1.176 Message-ID: <200605240904.k4O94kDY020760@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20728 Modified Files: fc4 fc5 Log Message: Updates from last few days Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- fc4 23 May 2006 14:36:17 -0000 1.262 +++ fc4 24 May 2006 09:04:44 -0000 1.263 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060519 -Up to date FC4 as of 20060519 +Up to date CVE as of CVE email 20060523 +Up to date FC4 as of 20060523 ** are items that need attention @@ -13,6 +13,8 @@ CVE-2006-2366 VULNERABLE (openobex) #192087 CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox +CVE-2006-2314 version (postgresql, fixed 8.0.8) [since FEODRA-2006-579] +CVE-2006-2313 version (postgresql, fixed 8.0.8) [since FEODRA-2006-579] CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 version (kernel, fixed 2.6.16.15) [since FEDORA-2006-573] CVE-2006-2274 version (kernel, fixed 2.6.16.15) [since FEDORA-2006-573] @@ -1599,6 +1601,7 @@ older, happened to deal with at same time: +CVE-2002-2211 **bind CVE-2002-2210 ignore (openoffice) binary install only (not rpm install) CVE-2002-2204 ignore (rpm) by design CVE-2002-2196 version (samba, fixed 2.2.5) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- fc5 23 May 2006 14:36:17 -0000 1.175 +++ fc5 24 May 2006 09:04:44 -0000 1.176 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060519 -Up to date FC5 as of 20060519 +Up to date CVE as of CVE email 20060523 +Up to date FC5 as of 20060523 ** are items that need attention @@ -11,6 +11,8 @@ CVE-2006-2366 VULNERABLE (openobex) #192087 CVE-2006-2362 ignore (binutils) minor crash (not exploitable) CVE-2006-2332 ** firefox +CVE-2006-2314 version (postgresql, fixed 8.1.4) [since FEODRA-2006-578] +CVE-2006-2313 version (postgresql, fixed 8.1.4) [since FEODRA-2006-578] CVE-2006-2276 VULNERABLE (quagga) #191377 CVE-2006-2275 version (kernel, fixed 2.6.16.15) [since FEDORA-2006-572] CVE-2006-2274 version (kernel, fixed 2.6.16.15) [since FEDORA-2006-572] @@ -1593,6 +1595,7 @@ older, happened to deal with at same time: +CVE-2002-2211 **bind CVE-2002-2210 ignore (openoffice) binary install only (not rpm install) CVE-2002-2204 ignore (rpm) by design CVE-2002-2196 version (samba, fixed 2.2.5) From fedora-extras-commits at redhat.com Wed May 24 10:17:56 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 24 May 2006 03:17:56 -0700 Subject: rpms/w3m-el/devel w3m-el.spec,1.3,1.4 Message-ID: <200605241017.k4OAHwSe026107@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/w3m-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26090 Modified Files: w3m-el.spec Log Message: * Wed May 24 2006 Akira TAGOH - 1.4.2-3 - packaged as noarch. (#192610) Index: w3m-el.spec =================================================================== RCS file: /cvs/extras/rpms/w3m-el/devel/w3m-el.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- w3m-el.spec 2 Mar 2006 07:46:14 -0000 1.3 +++ w3m-el.spec 24 May 2006 10:17:56 -0000 1.4 @@ -2,9 +2,10 @@ Name: w3m-el Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildPreReq: emacs BuildPreReq: xemacs >= %{xemacsver}, flim-xemacs @@ -132,6 +133,9 @@ %{_infodir}/* %changelog +* Wed May 24 2006 Akira TAGOH - 1.4.2-3 +- packaged as noarch. (#192610) + * Thu Mar 2 2006 Akira TAGOH - 1.4.2-2 - rebuilt From fedora-extras-commits at redhat.com Wed May 24 10:41:00 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 24 May 2006 03:41:00 -0700 Subject: rpms/amarok/devel amarok.spec,1.51,1.52 Message-ID: <200605241041.k4OAf2h1026204@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26169/devel Modified Files: amarok.spec Log Message: require the helix engine on archs where it is the only available engine, see bug 192802 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- amarok.spec 21 May 2006 17:14:03 -0000 1.51 +++ amarok.spec 24 May 2006 10:41:00 -0000 1.52 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Multimedia License: GPL @@ -32,13 +32,17 @@ %ifarch ppc64 x86_64 s390 s390x ia64 BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel %endif -# Helix engine +# Helix engine on archs where it is available %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif # Lyrics scripts Requires: ruby +# Only engine available except on these archs, where it's gstreamer +%ifnarch ppc64 x86_64 s390 s390x ia64 +Requires: HelixPlayer +%endif Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -224,6 +228,9 @@ %changelog +* Wed May 24 2006 Aurelien Bompard 1.4.0-5 +- Require HelixPlayer on archs where it is the only engine available + * Sun May 21 2006 Aurelien Bompard 1.4.0-4 - really fix building gst engine on x86_64 From fedora-extras-commits at redhat.com Wed May 24 10:40:59 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 24 May 2006 03:40:59 -0700 Subject: rpms/amarok/FC-5 amarok.spec,1.51,1.52 Message-ID: <200605241041.k4OAf168026200@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26169/FC-5 Modified Files: amarok.spec Log Message: require the helix engine on archs where it is the only available engine, see bug 192802 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- amarok.spec 21 May 2006 17:14:02 -0000 1.51 +++ amarok.spec 24 May 2006 10:40:59 -0000 1.52 @@ -1,7 +1,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Multimedia License: GPL @@ -32,13 +32,17 @@ %ifarch ppc64 x86_64 s390 s390x ia64 BuildRequires: gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel %endif -# Helix engine +# Helix engine on archs where it is available %ifnarch ppc64 x86_64 s390 s390x ia64 BuildRequires: HelixPlayer %endif # Lyrics scripts Requires: ruby +# Only engine available except on these archs, where it's gstreamer +%ifnarch ppc64 x86_64 s390 s390x ia64 +Requires: HelixPlayer +%endif Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -224,6 +228,9 @@ %changelog +* Wed May 24 2006 Aurelien Bompard 1.4.0-5 +- Require HelixPlayer on archs where it is the only engine available + * Sun May 21 2006 Aurelien Bompard 1.4.0-4 - really fix building gst engine on x86_64 From fedora-extras-commits at redhat.com Wed May 24 12:14:59 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 05:14:59 -0700 Subject: rpms/lyx/devel lyx.spec,1.37,1.38 lyxrc.defaults.custom,1.1,1.2 Message-ID: <200605241215.k4OCF1Rg001052@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1033 Modified Files: lyx.spec lyxrc.defaults.custom Log Message: * Wed May 24 2006 Rex Dieter 1.4.1-7 - use serverpipe "~/.lyx/lyxpipe" instead, that was the old default and what pybibliographer expects. Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- lyx.spec 23 May 2006 20:12:03 -0000 1.37 +++ lyx.spec 24 May 2006 12:14:59 -0000 1.38 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Publishing @@ -214,6 +214,10 @@ %changelog +* Wed May 24 2006 Rex Dieter 1.4.1-7 +- use serverpipe "~/.lyx/lyxpipe" instead, that was the old default + and what pybibliographer expects. + * Tue May 23 2006 Rex Dieter 1.4.1-6 - set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) screen_font_roman "Serif" Index: lyxrc.defaults.custom =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyxrc.defaults.custom,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lyxrc.defaults.custom 23 May 2006 20:12:03 -0000 1.1 +++ lyxrc.defaults.custom 24 May 2006 12:14:59 -0000 1.2 @@ -147,7 +147,7 @@ # This starts the lyxserver. The pipes get an additional extension # '.in' and '.out'. Only for advanced users. -\serverpipe "~/.lyx/pipe" +\serverpipe "~/.lyx/lyxpipe" # Default format string for the date-insert command # From fedora-extras-commits at redhat.com Wed May 24 12:38:36 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 24 May 2006 05:38:36 -0700 Subject: rpms/conserver/devel conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3 Message-ID: <200605241238.k4OCccK9001257@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/conserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1237/devel Modified Files: conserver.spec Added Files: conserver-8.1.14-oldkrb.patch Log Message: Fixing bug 192910 conserver-8.1.14-oldkrb.patch: --- NEW FILE conserver-8.1.14-oldkrb.patch --- diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure --- conserver-8.1.14/configure 2006-04-07 09:38:24.000000000 -0500 +++ conserver-8.1.14-nate/configure 2006-04-26 14:25:07.000000000 -0500 @@ -5847,6 +5847,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in --- conserver-8.1.14/configure.in 2006-04-07 09:30:22.000000000 -0500 +++ conserver-8.1.14-nate/configure.in 2006-04-26 14:24:53.000000000 -0500 @@ -456,6 +456,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" Index: conserver.spec =================================================================== RCS file: /cvs/extras/rpms/conserver/devel/conserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conserver.spec 26 Apr 2006 16:07:30 -0000 1.2 +++ conserver.spec 24 May 2006 12:38:36 -0000 1.3 @@ -1,14 +1,15 @@ Name: conserver Version: 8.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: Distributable URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch -Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch +Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch2: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, openssl-devel, tcp_wrappers @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -41,8 +43,7 @@ %{__mv} $f $f.orig %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f -%configure --with-uds \ - --with-libwrap \ +%configure --with-libwrap \ --with-openssl \ --with-pam @@ -114,6 +115,10 @@ %{_mandir}/man1/console.1.gz %changelog +* Wed May 24 2006 Patrick "Jima" Laughton 8.1.14-3 +- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910) +- Fix from Nate Straz: krb detection + * Wed Apr 26 2006 Patrick "Jima" Laughton 8.1.14-2 - Split 'console' out to -client subpackage, as suggested by Nate Straz From fedora-extras-commits at redhat.com Wed May 24 12:51:24 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 24 May 2006 05:51:24 -0700 Subject: rpms/conserver/FC-4 conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3 Message-ID: <200605241251.k4OCputO001432@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/conserver/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373/FC-4 Modified Files: conserver.spec Added Files: conserver-8.1.14-oldkrb.patch Log Message: Fixing bug 192910 conserver-8.1.14-oldkrb.patch: --- NEW FILE conserver-8.1.14-oldkrb.patch --- diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure --- conserver-8.1.14/configure 2006-04-07 09:38:24.000000000 -0500 +++ conserver-8.1.14-nate/configure 2006-04-26 14:25:07.000000000 -0500 @@ -5847,6 +5847,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in --- conserver-8.1.14/configure.in 2006-04-07 09:30:22.000000000 -0500 +++ conserver-8.1.14-nate/configure.in 2006-04-26 14:24:53.000000000 -0500 @@ -456,6 +456,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" Index: conserver.spec =================================================================== RCS file: /cvs/extras/rpms/conserver/FC-4/conserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conserver.spec 26 Apr 2006 16:07:23 -0000 1.2 +++ conserver.spec 24 May 2006 12:51:24 -0000 1.3 @@ -1,14 +1,15 @@ Name: conserver Version: 8.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: Distributable URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch -Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch +Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch2: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, openssl-devel, tcp_wrappers @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -41,8 +43,7 @@ %{__mv} $f $f.orig %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f -%configure --with-uds \ - --with-libwrap \ +%configure --with-libwrap \ --with-openssl \ --with-pam @@ -114,6 +115,10 @@ %{_mandir}/man1/console.1.gz %changelog +* Wed May 24 2006 Patrick "Jima" Laughton 8.1.14-3 +- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910) +- Fix from Nate Straz: krb detection + * Wed Apr 26 2006 Patrick "Jima" Laughton 8.1.14-2 - Split 'console' out to -client subpackage, as suggested by Nate Straz From fedora-extras-commits at redhat.com Wed May 24 12:51:25 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 24 May 2006 05:51:25 -0700 Subject: rpms/conserver/FC-5 conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3 Message-ID: <200605241251.k4OCpvUw001435@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/conserver/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373/FC-5 Modified Files: conserver.spec Added Files: conserver-8.1.14-oldkrb.patch Log Message: Fixing bug 192910 conserver-8.1.14-oldkrb.patch: --- NEW FILE conserver-8.1.14-oldkrb.patch --- diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure --- conserver-8.1.14/configure 2006-04-07 09:38:24.000000000 -0500 +++ conserver-8.1.14-nate/configure 2006-04-26 14:25:07.000000000 -0500 @@ -5847,6 +5847,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in --- conserver-8.1.14/configure.in 2006-04-07 09:30:22.000000000 -0500 +++ conserver-8.1.14-nate/configure.in 2006-04-26 14:24:53.000000000 -0500 @@ -456,6 +456,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" Index: conserver.spec =================================================================== RCS file: /cvs/extras/rpms/conserver/FC-5/conserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conserver.spec 26 Apr 2006 16:07:29 -0000 1.2 +++ conserver.spec 24 May 2006 12:51:25 -0000 1.3 @@ -1,14 +1,15 @@ Name: conserver Version: 8.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: Distributable URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch -Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch +Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch2: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, openssl-devel, tcp_wrappers @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -41,8 +43,7 @@ %{__mv} $f $f.orig %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f -%configure --with-uds \ - --with-libwrap \ +%configure --with-libwrap \ --with-openssl \ --with-pam @@ -114,6 +115,10 @@ %{_mandir}/man1/console.1.gz %changelog +* Wed May 24 2006 Patrick "Jima" Laughton 8.1.14-3 +- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910) +- Fix from Nate Straz: krb detection + * Wed Apr 26 2006 Patrick "Jima" Laughton 8.1.14-2 - Split 'console' out to -client subpackage, as suggested by Nate Straz From fedora-extras-commits at redhat.com Wed May 24 12:51:24 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Wed, 24 May 2006 05:51:24 -0700 Subject: rpms/conserver/FC-3 conserver-8.1.14-oldkrb.patch, NONE, 1.1 conserver.spec, 1.2, 1.3 Message-ID: <200605241251.k4OCpue8001429@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/conserver/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1373/FC-3 Modified Files: conserver.spec Added Files: conserver-8.1.14-oldkrb.patch Log Message: Fixing bug 192910 conserver-8.1.14-oldkrb.patch: --- NEW FILE conserver-8.1.14-oldkrb.patch --- diff -urN conserver-8.1.14/configure conserver-8.1.14-nate/configure --- conserver-8.1.14/configure 2006-04-07 09:38:24.000000000 -0500 +++ conserver-8.1.14-nate/configure 2006-04-26 14:25:07.000000000 -0500 @@ -5847,6 +5847,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" diff -urN conserver-8.1.14/configure.in conserver-8.1.14-nate/configure.in --- conserver-8.1.14/configure.in 2006-04-07 09:30:22.000000000 -0500 +++ conserver-8.1.14-nate/configure.in 2006-04-26 14:24:53.000000000 -0500 @@ -456,6 +456,9 @@ OPENSSLCPPFLAGS="" OPENSSLLDFLAGS="" fi + if test -e "/usr/kerberos/include/krb5.h"; then + OPENSSLCPPFLAGS="$OPENSSLCPPFLAGS -I/usr/kerberos/include" + fi oCPPFLAGS="$CPPFLAGS" oLDFLAGS="$LDFLAGS" Index: conserver.spec =================================================================== RCS file: /cvs/extras/rpms/conserver/FC-3/conserver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conserver.spec 26 Apr 2006 16:07:23 -0000 1.2 +++ conserver.spec 24 May 2006 12:51:23 -0000 1.3 @@ -1,14 +1,15 @@ Name: conserver Version: 8.1.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial console server daemon/client Group: System Environment/Daemons License: Distributable URL: http://www.conserver.com/ Source0: http://www.conserver.com/%{name}-%{version}.tar.gz -Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch -Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch0: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch +Patch1: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch +Patch2: http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-oldkrb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, openssl-devel, tcp_wrappers @@ -33,6 +34,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -41,8 +43,7 @@ %{__mv} $f $f.orig %{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f -%configure --with-uds \ - --with-libwrap \ +%configure --with-libwrap \ --with-openssl \ --with-pam @@ -114,6 +115,10 @@ %{_mandir}/man1/console.1.gz %changelog +* Wed May 24 2006 Patrick "Jima" Laughton 8.1.14-3 +- Fix from Nate Straz: UDS support (pre-emptively fixed bug 192910) +- Fix from Nate Straz: krb detection + * Wed Apr 26 2006 Patrick "Jima" Laughton 8.1.14-2 - Split 'console' out to -client subpackage, as suggested by Nate Straz From fedora-extras-commits at redhat.com Wed May 24 13:17:44 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 06:17:44 -0700 Subject: rpms/perl-Devel-Cycle/FC-5 .cvsignore, 1.4, 1.5 perl-Devel-Cycle.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605241317.k4ODHkIc004003@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cycle/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3966/FC-5 Modified Files: .cvsignore perl-Devel-Cycle.spec sources Log Message: Update to 1.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 May 2006 16:00:41 -0000 1.4 +++ .cvsignore 24 May 2006 13:17:44 -0000 1.5 @@ -1 +1 @@ -Devel-Cycle-1.05.tar.gz +Devel-Cycle-1.07.tar.gz Index: perl-Devel-Cycle.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/FC-5/perl-Devel-Cycle.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Devel-Cycle.spec 22 May 2006 16:00:41 -0000 1.7 +++ perl-Devel-Cycle.spec 24 May 2006 13:17:44 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Devel-Cycle -Version: 1.05 +Version: 1.07 Release: 1%{?dist} Summary: Find memory cycles in objects @@ -10,9 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(PadWalker) +BuildRequires: perl(PadWalker) >= 1.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(PadWalker) +Requires: perl(PadWalker) >= 1.0 %description This is a simple developer's tool for finding circular references in objects @@ -53,6 +53,10 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 1.07-1 +- Update to 1.07. +- Requirement version: perl(PadWalker) >= 1.0. + * Mon May 22 2006 Jose Pedro Oliveira - 1.05-1 - Update to 1.05. - New requirement: perl(PadWalker). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 May 2006 16:00:41 -0000 1.4 +++ sources 24 May 2006 13:17:44 -0000 1.5 @@ -1 +1 @@ -8e0ea5f779dc0fcab229f0ff4e1982eb Devel-Cycle-1.05.tar.gz +7d8a1e0ca88f8a66bb1344a217d21f1c Devel-Cycle-1.07.tar.gz From fedora-extras-commits at redhat.com Wed May 24 13:17:45 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 06:17:45 -0700 Subject: rpms/perl-Devel-Cycle/devel .cvsignore, 1.4, 1.5 perl-Devel-Cycle.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605241317.k4ODHlWe004009@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Devel-Cycle/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3966/devel Modified Files: .cvsignore perl-Devel-Cycle.spec sources Log Message: Update to 1.07. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 May 2006 15:48:53 -0000 1.4 +++ .cvsignore 24 May 2006 13:17:45 -0000 1.5 @@ -1 +1 @@ -Devel-Cycle-1.05.tar.gz +Devel-Cycle-1.07.tar.gz Index: perl-Devel-Cycle.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/perl-Devel-Cycle.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Devel-Cycle.spec 22 May 2006 15:48:53 -0000 1.7 +++ perl-Devel-Cycle.spec 24 May 2006 13:17:45 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-Devel-Cycle -Version: 1.05 +Version: 1.07 Release: 1%{?dist} Summary: Find memory cycles in objects @@ -10,9 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(PadWalker) +BuildRequires: perl(PadWalker) >= 1.0 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(PadWalker) +Requires: perl(PadWalker) >= 1.0 %description This is a simple developer's tool for finding circular references in objects @@ -53,6 +53,10 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 1.07-1 +- Update to 1.07. +- Requirement version: perl(PadWalker) >= 1.0. + * Mon May 22 2006 Jose Pedro Oliveira - 1.05-1 - Update to 1.05. - New requirement: perl(PadWalker). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 May 2006 15:48:53 -0000 1.4 +++ sources 24 May 2006 13:17:45 -0000 1.5 @@ -1 +1 @@ -8e0ea5f779dc0fcab229f0ff4e1982eb Devel-Cycle-1.05.tar.gz +7d8a1e0ca88f8a66bb1344a217d21f1c Devel-Cycle-1.07.tar.gz From fedora-extras-commits at redhat.com Wed May 24 13:58:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 06:58:28 -0700 Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.13,1.14 Message-ID: <200605241358.k4ODwU26004189@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kipi-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4172 Modified Files: kipi-plugins.spec Log Message: * Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 - Requires(hint): dcraw Index: kipi-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kipi-plugins.spec 22 May 2006 14:54:49 -0000 1.13 +++ kipi-plugins.spec 24 May 2006 13:58:27 -0000 1.14 @@ -4,7 +4,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.0 -Release: 0.8.%{beta}%{?dist} +Release: 0.9.%{beta}%{?dist} License: LGPL Group: Applications/Multimedia @@ -38,8 +38,8 @@ #Requires(hint): kdebase # cdarchiver plugin #Requires(hint): k3b -# rawconverter plugin (not yet available from Fedora Extras) -#Requires(hint): dcraw +# rawconverter plugin +Requires(hint): dcraw # mjpeg plugin #Requires(hint): mjpegtools >= 1.6.0 @@ -151,6 +151,9 @@ %changelog +* Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 +- Requires(hint): dcraw + * Mon May 22 2006 Rex Dieter 0.1.0-0.8.rc2 - 0.1.0-rc2 - BR: ImageMagick-c++-devel, libtiff-devel, libxslt-devel From fedora-extras-commits at redhat.com Wed May 24 13:59:02 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 06:59:02 -0700 Subject: rpms/kipi-plugins/FC-5 kipi-plugins.spec,1.13,1.14 Message-ID: <200605241359.k4ODx4hj004256@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kipi-plugins/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4239 Modified Files: kipi-plugins.spec Log Message: * Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 - Requires(hint): dcraw Index: kipi-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/kipi-plugins/FC-5/kipi-plugins.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kipi-plugins.spec 22 May 2006 15:19:22 -0000 1.13 +++ kipi-plugins.spec 24 May 2006 13:59:02 -0000 1.14 @@ -4,7 +4,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.0 -Release: 0.8.%{beta}%{?dist} +Release: 0.9.%{beta}%{?dist} License: LGPL Group: Applications/Multimedia @@ -38,8 +38,8 @@ #Requires(hint): kdebase # cdarchiver plugin #Requires(hint): k3b -# rawconverter plugin (not yet available from Fedora Extras) -#Requires(hint): dcraw +# rawconverter plugin +Requires(hint): dcraw # mjpeg plugin #Requires(hint): mjpegtools >= 1.6.0 @@ -151,6 +151,9 @@ %changelog +* Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 +- Requires(hint): dcraw + * Mon May 22 2006 Rex Dieter 0.1.0-0.8.rc2 - 0.1.0-rc2 - BR: ImageMagick-c++-devel, libtiff-devel, libxslt-devel From fedora-extras-commits at redhat.com Wed May 24 13:59:17 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 06:59:17 -0700 Subject: rpms/kipi-plugins/FC-4 kipi-plugins.spec,1.10,1.11 Message-ID: <200605241359.k4ODxJC6004317@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kipi-plugins/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4300 Modified Files: kipi-plugins.spec Log Message: * Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 - Requires(hint): dcraw Index: kipi-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/kipi-plugins/FC-4/kipi-plugins.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kipi-plugins.spec 22 May 2006 15:19:39 -0000 1.10 +++ kipi-plugins.spec 24 May 2006 13:59:17 -0000 1.11 @@ -4,7 +4,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.0 -Release: 0.8.%{beta}%{?dist} +Release: 0.9.%{beta}%{?dist} License: LGPL Group: Applications/Multimedia @@ -38,8 +38,8 @@ #Requires(hint): kdebase # cdarchiver plugin #Requires(hint): k3b -# rawconverter plugin (not yet available from Fedora Extras) -#Requires(hint): dcraw +# rawconverter plugin +Requires(hint): dcraw # mjpeg plugin #Requires(hint): mjpegtools >= 1.6.0 @@ -151,6 +151,9 @@ %changelog +* Wed May 24 2006 Rex Dieter 0.1.0-0.9.rc2 +- Requires(hint): dcraw + * Mon May 22 2006 Rex Dieter 0.1.0-0.8.rc2 - 0.1.0-rc2 - BR: ImageMagick-c++-devel, libtiff-devel, libxslt-devel From fedora-extras-commits at redhat.com Wed May 24 14:00:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:00:24 -0700 Subject: rpms/lyx/FC-5 lyx-1.4.1-defaults.patch, NONE, 1.1 lyxrc.defaults.custom, NONE, 1.1 .cvsignore, 1.11, 1.12 lyx.spec, 1.35, 1.36 lyx-1.4.0-boost.patch, 1.3, NONE Message-ID: <200605241400.k4OE0QWX004400@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4377 Modified Files: .cvsignore lyx.spec Added Files: lyx-1.4.1-defaults.patch lyxrc.defaults.custom Removed Files: lyx-1.4.0-boost.patch Log Message: * Wed May 24 2006 Rex Dieter 1.4.1-7 - use serverpipe "~/.lyx/lyxpipe" instead, that was the old default and what pybibliographer expects. * Tue May 23 2006 Rex Dieter 1.4.1-6 - set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) screen_font_roman "Serif" screen_font_sans "Sans" screen_font_typewriter "Monospace" screen_zoom 100 serverpipe "~/.lyx/pipe" lyx-1.4.1-defaults.patch: --- NEW FILE lyx-1.4.1-defaults.patch --- --- lyx-1.4.1/lib/configure.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure 2006-05-23 14:21:08.000000000 -0500 @@ -2027,3 +2027,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- lyx-1.4.1/lib/configure.m4.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure.m4 2006-05-23 14:20:55.000000000 -0500 @@ -727,3 +727,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- NEW FILE lyxrc.defaults.custom --- # -*- text -*- # file lyxrc.example # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. # author Lars Gullik Bj?nnes # author Jean-Marc Lasgouttes # author Jos? Matos # author Asger Alstrup Nielsen # author Ed Scott # author Lior Silberman # author Dekel Tsur # Full author contact details are available in file CREDITS. # The file lyxrc.example is a template to write your own lyxrc file. # If you copy/rename it to lyxrc in the current directory, it will # give global options for all LyX users. It is also possible to copy # this file to $HOME/.lyx/lyxrc so that the configuration applies to a # particular user. # # Several of these settings have defaults that are auto-detected when you use # the menu option Options->Reconfigure. You can see their value by looking at # the file $HOME/.lyx/lyxrc.defaults. Any setting in this file will override # the defaults. # # BIND SECTION ########################################################### # # Before defining your own key-bindings, select one of the available default # binding sets. These are resource files (like this one) that define a # large set of (keyboard) bindings. These files live in bind directory of # the LyX system directory and have in general the .bind suffix. # Currently, you can choose from the following flavors: # # cua.bind for Windows-, Mac- and Motif-like bindings # emacs.bind for Emacs-like bindings. # # The \bind_file command looks in the LyX bind directory for a file # of the given name, but a full path can also be given. If you have # a bind file in your ~/.lyx/bind/ directory, it will be preferred # over a system wide bind file. Default is `cua'. #\bind_file cua #\bind_file emacs # Based on the default, you can now change part or all of it with the # \bind command. For example, when you want the delete key to do the # backspace action, uncomment the following line: #\bind "Delete" "delete-backward" # However, if you're not at all happy with the default bindings, # the most logical thing to do would be to use one of the system # wide bind files as a template and place your own version in # ~/.lyx/bind/mine_is_best.bind and change the above \bind_file # to this instead: #\bind_file mine_is_best # By default, LyX takes over the handling of the dead keys (or accent # keys) that may be defined for your keyboard. While this allows you # to enter characters that would not be normally available, some # people dislike the different behaviour. You can use raw dead keys by # just uncommenting the next line #\override_x_deadkeys false # Tip: Use "lyx -dbg 4" to survey how LyX interprets your keybindings. # # MISC SECTION ########################################################### # # Set this to false if you don't want the startup banner. # Default is true. #\show_banner true # Set to false if you don't want the current selection to be replaced # automatically by what you type. Default is true. #\auto_region_delete false # This is the time interval between auto-saves (in seconds). # 0 means no auto-save, default is 300 for five minutes. #\autosave 600 # LyX asks for a second confirmation to exit if you exit with changed # documents that you don't want to save. You can turn this confirmation off # (LyX will still ask to save changed documents) with the following line. # We recommend to keep the confirmation, though. #\exit_confirmation false # This sets the behaviour if you want to be asked for a filename when # creating a new document or wait until you save it and be asked then. # The default for now is ask on save. # \new_ask_filename false # LyX continously displays names of last command executed, along with a list # of defined short-cuts for it in the minibuffer. # It requires some horsepower to function, so you can turn it off, if LyX # seems slow to you, by uncommenting this line: #\display_shortcuts false # \view_dvi_paper_option allows to specify a paper option to the dvi # viewer. By default LyX specifies the paper size of the document to # the dvi viewer via the command line option -paper size, where size # is one of "us","letter","a3","a4" and so on. The command # \view_dvi_paper_option allows the user to overwrite the name of the # command line flag, i.e. replace -paper with something else. If # specified and left empty, i.e. \view_dvi_paper_option "", LyX does # not append the -paper option to the dvi command at all. This case is # especially useful when viewing your documents on Windows with yap, # because yap does not allow a command line option for the paper size. #\view_dvi_paper_option "" # LyX assumes that the default papersize should be usletter. If this is not # true for your site, use the next line to specify usletter, legal, # executive, a3, a4, a5, or b5 as the default papersize. #\default_papersize "a4" # Define which program to use to run "chktex". # You should include options that turn different warnings on and off. # Default is "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38" # Check the ChkTeX documentation for info on what the flags mean. # Example: use this to ignore warnings about using "\ldots" instead of "..." #\chktex_command "chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38" # Keyboard Mapping. Use this to set the correct mapping file for your # keyboard, that is if you need one. You'll need one if you for instance # want to type German documents on an American keyboard. In that case, # uncomment these three lines: #\kbmap true #\kbmap_primary german #\kbmap_secondary american # The following keyboards are supported: american, czech, francais, # french, german, german-2, magyar, magyar-2, portuges, romanian, # slovak, slovene, transilvanian, turkish and turkish-f. Check # the lib/kbd directory if you want to write support for your language. # If you do, please submit it to lyx-devel at lists.lyx.org. # The Pause button is defined to be a three-way switch between primary # keyboard, secondary keyboard, and no keyboard mapping with the # following command. It is useful if you want to write in a language # not directly supported by your keyboard and you have defined a # custom keyboard mapping above. #\bind "Pause" "keymap-toggle" # This starts the lyxserver. The pipes get an additional extension # '.in' and '.out'. Only for advanced users. \serverpipe "~/.lyx/lyxpipe" # Default format string for the date-insert command # # This accepts the normal strftime formats; see man strftime for full # details of the format. # #\date_insert_format "%A, %e. %B %Y" # Maximum number of words in the initialization string for a new label. # If it is set to 0, then the init. string will only contain the prefix # (e.g. "sec:"). If it is set to -1, the init. string will be empty. # This feature is disabled in 1.1.6. # #\label_init_length 0 # # SCREEN & FONTS SECTION ################################################# # # DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes # wrong, you can override the setting here: #\screen_dpi 100 # The zoom percentage for screen fonts. # A setting of 100% will make the fonts roughly the same size as on paper. # However, since a screen is wider than a piece of paper, the default setting # is 150%. \screen_zoom 100 # The wheel movement factor (for mice with wheels or five button mice) # Default is 100, about a page down. A value of 10 give me about a line and # a half #\wheel_jump 10 # LyX normally doesn't update the cursor position if you move the scrollbar. # If you scroll the cursor off the screen and then start typing LyX will # move you back to where the cursor was. If you'd prefer to always have the # cursor on screen, bounded by the topmost and bottommost visible lines # -- much like XEmacs for example -- then uncomment the next line. #\cursor_follows_scrollbar true # The screen fonts used to display the text while editing # The defaults are: \screen_font_roman "Serif" \screen_font_sans "Sans" \screen_font_typewriter "Monospace" # For some, this font looks better: #\screen_font_roman "-*-utopia" # Allow the use of scalable screen fonts? Default is true. # If you choose "false", LyX will use the closest existing size for a match. # Use this if the scalable fonts look bad and you have many fixed size fonts. #\screen_font_scalable false # Tip: Run lyx as "lyx -dbg 512" to learn which fonts are used. # The norm for the screen fonts. The default is iso8859-1, which is # the same as what LaTeX calls latin1. #\screen_font_encoding iso8859-2 # The norm for the popup fonts. The default is an empty string, which # causes to use the screen fonts norm (defined by \screen_font_encoding). #\popup_font_encoding iso8859-2 # The normal font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_font_name "-*-helvetica-medium-r" # The bold font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_bold_font "-*-helvetica-bold-r" # The font sizes used for calculating the scaling of the screen fonts. # You should only have to change these if the fonts on your screen look bad, # in which case you can fine tune the font selection size by size. LyX selects # font size according to this table, the monitor DPI setting and the current # zoom setting. # The format is: #\screen_font_sizes tiny smallest smaller small normal large larger largest huge huger # # This is the default in LyX (exactly what LaTeX does): #\screen_font_sizes 5.0 7.0 8.0 9.0 10.0 12.0 14.4 17.28 20.74 24.88 # To change the colors for footnotes: #\set_color footnote green # for mathed you may also want to change the coloring of lines and brackets: #\set_color math yellow #\set_color mathlines yellow # # UI SECTION ######################################################## # # Choose your UI (user interface) definition here. The .ui files are in the # directory "lib/ui" and contains the definition of the menu and the toolbar. #\ui_file "default" # # PRINTER SECTION ######################################################## # # The default printer to print on. If none is specified, LyX will use # the environment variable PRINTER. If that fails, the default is empty. #\printer "" # If you have setup (as we recommend you to do) your print program # (e.g. dvips) to take advantage of the particularities of the various # printers you have access to, then you should set the following to # true. Then LyX will pass the name of the destination printer to your # print command. # The default is false, because we have unfortunately to cope with # people who refuse to take the time to configure their system. # Note that you will probably have to change \print_spool_command below. #\print_adapt_output true # If you don't use dvips, you may specify your favorite print program # here. See other options at the end of this section to adapt LyX to # your print program. #\print_command dvips # Extra options to pass to printing program after everything # else, but before the filename of the DVI file to be printed. #\print_extra_options "" # When set, this printer option automatically prints to a file # and then calls a separate print spooling program on that file # with the given name and arguments. # This is set by default to 'lp' or 'lpr', depending on what your # system uses. # Set this to "" if you have set up dvips so that it sends # output to the right printer (remember to also use \print_adapt_output). #\print_spool_command "" # If you specify a printer name in the print dialog, # the following argument is prepended along with the printer name # after the spool command. The default is autodetected, along with # \print_spool_command determination. #\print_spool_printerprefix "" # Other print related options # The following options are only of interest to people who do not # use dvips as print command. You may safely skip to the end of this # section otherwise. # These specify the options to pass to the printer program to select the # corresponding features. These default to the options used for the dvips # program. Look at the man page for your favorite print program to learn # which options to use. # Normally you don't need to change this unless you use something other # than dvips. #\print_evenpage_flag -B #\print_oddpage_flag -A #\print_reverse_flag -r #\print_landscape_flag "-t landscape" #\print_pagerange_flag -pp #\print_copies_flag -c #\print_collcopies_flag -C #\print_paper_flag -t #\print_paper_dimension_flag -T # Option to pass to the print program to print on a specific printer. #\print_to_printer -P # Option to pass to the print program to print to a file. #\print_to_file -o # Extension of printer program output file. Usually .ps #\print_file_extension .ps # Sample configuration to use with dvilj4 for a HP Laserjet IV (or # better) printer [provided by Reuben Thomas ]: #\print_command dvilj4 #\print_extra_options -q #\print_evenpage_flag "-D2 -r" #\print_oddpage_flag -D1 #\print_reverse_flag -r #\print_landscape_flag -l #\print_pagerange_flag -p #\print_to_file -e #\print_file_extension .lj #\print_copies_flag -c #\print_collcopies_flag -c #\print_adapt_output false # # EXPORT SECTION ######################################################## # # The \converter command defines a converter between two formats. # LyX uses the defined converters for generating output in various formats, # or for importing. # The converter command has 4 arguments: The source format, the target format, # the command, and additional flags. # For example, the following defines a DVI->Postscript converter: #\converter dvi ps "dvips -o $$o $$i" "" # The variable name $$i is replaced with the name of the source file, # and $$o is replaced with the name of the target file. # The flags argument is a list of comma separated flags. # Known flags are # - * : copy the previously defined flags # - latex : The converter is latex or its derivatives (pdflatex). # - originaldir : The converter must be invoked in the directory of the lyx # file and not in the temporary directory. This is needed for tex->html # converters in order to be able to read the eps files. # - needaux : The converted uses the .aux file, so we need to call latex # before running the converter. # - resultdir=dir : The converter put all the files in dir. # Using "resultdir" is same as "resultdir=$$b". # Note: When exporting, the whole directory will be moved from the temporary # directory to the target directory. # - resultfile=file : Name of main file in the result directory, for example # "index.html" or "$$b.html" # If "resultfile" is omitted, the name of this file is assumed to be # "index.format" # - parselog=filtername : filtername is a name of a filter command that takes # the converter error log (from stderr), and converts it to a fake latex .log # file. # For example: #\converter latex html "latex2html -split 0 $$i" # "originaldir,needaux,resultdir" # # For literate programming, use something like #\converter literate latex "noweave -delay -index $$i >$$o" # "parselog=listerrors g" #\converter literate program "build-script $$i" # "originaldir,parselog=listerrors g" # The format command is used to define file formats. It has 4 arguments: # the format name, the extension, and "pretty name" and menu shortcut. # For example #\Format latex tex LaTeX L # The \viewer command is used to define viewers for new formats, # or to change the already defined viewers. # For example, to use xdvi as the viewer to dvi files use #\viewer dvi "xdvi" # It can get more involved. Expert users might prefer something like: #\viewer dvi "xdvi -s 2 -expert -geometry 1014x720+0+0 -keep -margins 1.5" # # TEX SECTION ########################################################### # # The font encoding used for the LaTeX2e fontenc package. # T1 is highly recommended for non-English languages. LyX uses T1 as a # default if you have the ec fonts installed on your system. #\font_encoding T1 # Choose "default" if T1 doesn't work for you for some reason: #\font_encoding default # # FILE SECTION ########################################################## # # The default path for your documents. # Default is $HOME #\document_path ~/Documents/ # The file where the last-files information should be stored. # Default is ~/.lyx/lastfiles #\lastfiles ~/.lyx_lastfiles # Maximal number of lastfiles. Up to nine can appear in the file menu. # Default is four. #\num_lastfiles 9 # Flag telling whether the lastfiles should be checked for existence. # Files that does not exist are left out of the lastfiles entries. # Default is true. If you use slow or removable media, such as networks # or floppy disks, you can speed up the starting time of LyX by disabling # this feature. #\check_lastfiles false # The path that LyX will set when offering you to choose a template. # Default is (System LyX dir)/templates #\template_path ~/.lyx/templates # The path that LyX will use to put temporary TeX outputs. # Default is /tmp/ # containing # If you set it, it will be /directory/ # (unless set to /tmp). #\tempdir_path /usr/tmp # If you set this flag, LyX will always use a temporary directory # to put TeX outputs into. It is enabled by default. # This directory is deleted when you quit LyX. # You might want to avoid using a temporary directory in several # cases: # - LaTeX cannot find some files it needs; # - you have a large number of include files, and you get messages # saying that some LaTeX buffers overflow. # Note that, even if tell LyX not to use a temporary directory, there # will be cases where it will be forced to: this happens for example # when typesetting a file in a read-only directory (documentation). #\use_tempdir false # This is the maximum line length of an exported ASCII file (LaTeX, # SGML or plain text). Default is 75. #\ascii_linelen 80 # Set to false if you don't want LyX to create backup files. # Default is true. #\make_backup true # The path for storing backup files. If it is the empty string, LyX will # store the backup file in the same directory of the original file. # Default is "". #\backupdir_path "~/Desktop/Trash/" # # ASCII EXPORT SECTION ################################################### # # The following entry can be used to define an external program to # render tables in the ASCII output. If you specify "none", a simple # internal routine is used. The default is auto-detected. # The following line will use groff and output using latin-1 encoding # (here $$FName is the input file and the output goes to stdout): #\ascii_roff_command "groff -t -Tlatin1 $$FName" # # SPELLCHECKER SECTION #################################################### # # What command runs the spellchecker? Default is "ispell" if it is # installed, "none" otherwise. # If you have aspell (http://metalab.unc.edu/kevina/aspell/) # installed and configured, you might want to uncomment the line below. #\spell_command aspell # Consider run-together words, such as "notthe" for "not the", as legal # words? Default is false. #\accept_compound true # Specify an alternate language. The default is to use the language of # document. Uncomment both to enable. #\use_alt_language true #\alternate_language dansk # Specify additional chars that can be part of a word. #\use_escape_chars true #\escape_chars "??????" # Specify an alternate personal dictionary file. If the file name does not # begin with "/", $HOME is prefixed. The default is to search for a personal # dictionary in both the current directory and $HOME, creating one in $HOME # if none is found. The preferred name is constructed by appending ".ispell_" # to the base name of the hash file. For example, if you use the English # dictionary, your personal dictionary would be named ".ispell_english". #\use_personal_dictionary true #\personal_dictionary .ispell_dansk # Specify whether to pass the -T input encoding option to ispell (only if the # language is different than "default".) Enable this if you can't spellcheck # words with international letters in them. There have been reports that this # does not work with all dictionaries, so this is disabled by default. #\use_input_encoding true # # LANGUAGE SUPPORT SECTION #################################################### # # Set to true to enable support of right-to-left languages (e.g. Hebrew, # Arabic). Default is false. #\rtl true # The latex command for loading the language package. # Default is \usepackage{babel}. #\language_package "\usepackage{omega}" # The latex command for changing the from the language of the document # to another language. $$lang is substituted by the name of the second # language. Default is \selectlanguage{$$lang}. #\language_command_begin "\begin{otherlanguage}{$$lang}" # The latex command for changing back the language to the language of # the document. Default is \selectlanguage{$$lang}. #\language_command_end "\end{otherlanguage}" # Set to false if a language switching command is needed at the beginning of # the document. Default is true. #\language_auto_begin false # Set to false if a language switching command is needed at the end of # the document. Default is true. #\language_auto_end false # Set mark_foreign_language to "false" to disable the highlighting of words # with a foreign language to the language of the documet. # Default is "true" #\mark_foreign_language false # It is possible to bind keys for changing the language inside a document. # For example, the following command will cause F12 to switch between French # and English in a French document, and in a document of other language it will # switch between that language and French. #\bind "F12" "language french" # # HEBREW SUPPORT SECTION #################################################### # # To enable the Hebrew support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary hebrew #\converter tex dvi elatex "" #\converter tex pdf pdfelatex "" #\font_encoding default # You also need to bind a key for switching between Hebrew and English. # For example, #\bind "F12" "language hebrew" # You might want ot disable the foreign language marking: #\mark_foreign_language false # Finally, you need to select iso8859-8 font encoding, and select screen fonts # (below are the default fonts. You need to replace them by Hebrew fonts) #\screen_font_encoding iso8859-8 #\screen_font_roman "-*-times" #\screen_font_sans "-*-helvetica" #\screen_font_typewriter "-*-courier" #\screen_font_popup "-*-helvetica-medium-r" #\screen_font_menu "-*-helvetica-bold-r" # # ARABIC SUPPORT SECTION #################################################### # # To enable the Arabic support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary arabic # You also need to bind a key for switching between Arabic and English. # For example, #\bind "F12" "language arabic" # If you use arabtex, uncomment the following lines #\language_auto_begin false #\language_auto_end false #\language_command_begin "\begin{arabtext}" #\language_command_end "\end{arabtext}" #\language_package "\usepackage{arabtex,iso88596}\setcode{iso8859-6}" # Finally, you need to select iso8859-6.8x font encoding, # and select screen fonts. # iso8859-6.8x fonts can be found at # http://www.langbox.com/AraMosaic/mozilla/fontXFE/ #\screen_font_encoding iso8859-6.8x #\screen_font_encoding_menu iso8859-1 #\screen_font_roman "-*-naskhi" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 11 Apr 2006 14:42:36 -0000 1.11 +++ .cvsignore 24 May 2006 14:00:24 -0000 1.12 @@ -1,2 +1,3 @@ +clog beamer.layout lyx-1.4.1.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- lyx.spec 22 May 2006 18:59:26 -0000 1.35 +++ lyx.spec 24 May 2006 14:00:24 -0000 1.36 @@ -2,18 +2,18 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.4.0-helpers.patch -Patch2: lyx-1.4.0-boost.patch +Patch2: lyx-1.4.1-defaults.patch +Source1: lyxrc.defaults.custom # app-wrapper for various frontends Source10: lyx.sh # .desktop files @@ -39,7 +39,6 @@ BuildRequires: zlib-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0} # For texhash Requires(post): tetex-fonts @@ -52,9 +51,11 @@ Requires: ghostscript Requires: htmlview ## Soft dependancies -# add support for lyx's Document->Change Tracking +%if "%{?fedora}" > "3" +# dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost Requires(hint): tetex-preview +%endif %description LyX is a modern approach to writing documents which breaks with the @@ -96,7 +97,7 @@ %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%{?_without_included_boost:%patch2 -p1 -b .boost} +%patch2 -p1 -b .defaults %build @@ -117,7 +118,6 @@ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ - %{?_without_included_boost} \ --without-warnings --disable-dependency-tracking \ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks @@ -135,6 +135,7 @@ install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms # misc/extras +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults.custom install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ # Set up the lyx-specific class files where TeX can see them @@ -194,10 +195,11 @@ %{_mandir}/man1/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ -%{_datadir}/texmf/tex/latex/lyx/ +%config(noreplace) %{_datadir}/lyx/lyxrc.defaults.custom %verify(not md5 size mtime) %{_datadir}/lyx/*.lst %verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults %verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx +%{_datadir}/texmf/tex/latex/lyx/ %files qt %defattr(-,root,root,-) @@ -211,6 +213,18 @@ %changelog +* Wed May 24 2006 Rex Dieter 1.4.1-7 +- use serverpipe "~/.lyx/lyxpipe" instead, that was the old default + and what pybibliographer expects. + +* Tue May 23 2006 Rex Dieter 1.4.1-6 +- set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) + screen_font_roman "Serif" + screen_font_sans "Sans" + screen_font_typewriter "Monospace" + screen_zoom 100 + serverpipe "~/.lyx/pipe" + * Mon May 22 2006 Rex Dieter 1.4.1-5 - Requires(hint): tetex-preview --- lyx-1.4.0-boost.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:01:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:01:28 -0700 Subject: rpms/lyx/FC-4 lyx-1.4.1-defaults.patch, NONE, 1.1 lyxrc.defaults.custom, NONE, 1.1 .cvsignore, 1.5, 1.6 lyx.spec, 1.22, 1.23 lyx-1.4.0-boost.patch, 1.1, NONE Message-ID: <200605241402.k4OE21JN006717@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6684 Modified Files: .cvsignore lyx.spec Added Files: lyx-1.4.1-defaults.patch lyxrc.defaults.custom Removed Files: lyx-1.4.0-boost.patch Log Message: * Wed May 24 2006 Rex Dieter 1.4.1-7 - use serverpipe "~/.lyx/lyxpipe" instead, that was the old default and what pybibliographer expects. * Tue May 23 2006 Rex Dieter 1.4.1-6 - set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) screen_font_roman "Serif" screen_font_sans "Sans" screen_font_typewriter "Monospace" screen_zoom 100 serverpipe "~/.lyx/pipe" lyx-1.4.1-defaults.patch: --- NEW FILE lyx-1.4.1-defaults.patch --- --- lyx-1.4.1/lib/configure.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure 2006-05-23 14:21:08.000000000 -0500 @@ -2027,3 +2027,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- lyx-1.4.1/lib/configure.m4.defaults 2006-05-23 14:19:26.000000000 -0500 +++ lyx-1.4.1/lib/configure.m4 2006-05-23 14:20:55.000000000 -0500 @@ -727,3 +727,8 @@ rm -f chkconfig.sed chkconfig.vars wrap_chkconfig.* chklayouts.tex \ missfont.log fi + +# include local customizations/defaults +if [ -f ${outfile}.custom ]; then + cat ${outfile}.custom >> ${outfile} +fi --- NEW FILE lyxrc.defaults.custom --- # -*- text -*- # file lyxrc.example # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. # author Lars Gullik Bj?nnes # author Jean-Marc Lasgouttes # author Jos? Matos # author Asger Alstrup Nielsen # author Ed Scott # author Lior Silberman # author Dekel Tsur # Full author contact details are available in file CREDITS. # The file lyxrc.example is a template to write your own lyxrc file. # If you copy/rename it to lyxrc in the current directory, it will # give global options for all LyX users. It is also possible to copy # this file to $HOME/.lyx/lyxrc so that the configuration applies to a # particular user. # # Several of these settings have defaults that are auto-detected when you use # the menu option Options->Reconfigure. You can see their value by looking at # the file $HOME/.lyx/lyxrc.defaults. Any setting in this file will override # the defaults. # # BIND SECTION ########################################################### # # Before defining your own key-bindings, select one of the available default # binding sets. These are resource files (like this one) that define a # large set of (keyboard) bindings. These files live in bind directory of # the LyX system directory and have in general the .bind suffix. # Currently, you can choose from the following flavors: # # cua.bind for Windows-, Mac- and Motif-like bindings # emacs.bind for Emacs-like bindings. # # The \bind_file command looks in the LyX bind directory for a file # of the given name, but a full path can also be given. If you have # a bind file in your ~/.lyx/bind/ directory, it will be preferred # over a system wide bind file. Default is `cua'. #\bind_file cua #\bind_file emacs # Based on the default, you can now change part or all of it with the # \bind command. For example, when you want the delete key to do the # backspace action, uncomment the following line: #\bind "Delete" "delete-backward" # However, if you're not at all happy with the default bindings, # the most logical thing to do would be to use one of the system # wide bind files as a template and place your own version in # ~/.lyx/bind/mine_is_best.bind and change the above \bind_file # to this instead: #\bind_file mine_is_best # By default, LyX takes over the handling of the dead keys (or accent # keys) that may be defined for your keyboard. While this allows you # to enter characters that would not be normally available, some # people dislike the different behaviour. You can use raw dead keys by # just uncommenting the next line #\override_x_deadkeys false # Tip: Use "lyx -dbg 4" to survey how LyX interprets your keybindings. # # MISC SECTION ########################################################### # # Set this to false if you don't want the startup banner. # Default is true. #\show_banner true # Set to false if you don't want the current selection to be replaced # automatically by what you type. Default is true. #\auto_region_delete false # This is the time interval between auto-saves (in seconds). # 0 means no auto-save, default is 300 for five minutes. #\autosave 600 # LyX asks for a second confirmation to exit if you exit with changed # documents that you don't want to save. You can turn this confirmation off # (LyX will still ask to save changed documents) with the following line. # We recommend to keep the confirmation, though. #\exit_confirmation false # This sets the behaviour if you want to be asked for a filename when # creating a new document or wait until you save it and be asked then. # The default for now is ask on save. # \new_ask_filename false # LyX continously displays names of last command executed, along with a list # of defined short-cuts for it in the minibuffer. # It requires some horsepower to function, so you can turn it off, if LyX # seems slow to you, by uncommenting this line: #\display_shortcuts false # \view_dvi_paper_option allows to specify a paper option to the dvi # viewer. By default LyX specifies the paper size of the document to # the dvi viewer via the command line option -paper size, where size # is one of "us","letter","a3","a4" and so on. The command # \view_dvi_paper_option allows the user to overwrite the name of the # command line flag, i.e. replace -paper with something else. If # specified and left empty, i.e. \view_dvi_paper_option "", LyX does # not append the -paper option to the dvi command at all. This case is # especially useful when viewing your documents on Windows with yap, # because yap does not allow a command line option for the paper size. #\view_dvi_paper_option "" # LyX assumes that the default papersize should be usletter. If this is not # true for your site, use the next line to specify usletter, legal, # executive, a3, a4, a5, or b5 as the default papersize. #\default_papersize "a4" # Define which program to use to run "chktex". # You should include options that turn different warnings on and off. # Default is "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38" # Check the ChkTeX documentation for info on what the flags mean. # Example: use this to ignore warnings about using "\ldots" instead of "..." #\chktex_command "chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38" # Keyboard Mapping. Use this to set the correct mapping file for your # keyboard, that is if you need one. You'll need one if you for instance # want to type German documents on an American keyboard. In that case, # uncomment these three lines: #\kbmap true #\kbmap_primary german #\kbmap_secondary american # The following keyboards are supported: american, czech, francais, # french, german, german-2, magyar, magyar-2, portuges, romanian, # slovak, slovene, transilvanian, turkish and turkish-f. Check # the lib/kbd directory if you want to write support for your language. # If you do, please submit it to lyx-devel at lists.lyx.org. # The Pause button is defined to be a three-way switch between primary # keyboard, secondary keyboard, and no keyboard mapping with the # following command. It is useful if you want to write in a language # not directly supported by your keyboard and you have defined a # custom keyboard mapping above. #\bind "Pause" "keymap-toggle" # This starts the lyxserver. The pipes get an additional extension # '.in' and '.out'. Only for advanced users. \serverpipe "~/.lyx/lyxpipe" # Default format string for the date-insert command # # This accepts the normal strftime formats; see man strftime for full # details of the format. # #\date_insert_format "%A, %e. %B %Y" # Maximum number of words in the initialization string for a new label. # If it is set to 0, then the init. string will only contain the prefix # (e.g. "sec:"). If it is set to -1, the init. string will be empty. # This feature is disabled in 1.1.6. # #\label_init_length 0 # # SCREEN & FONTS SECTION ################################################# # # DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes # wrong, you can override the setting here: #\screen_dpi 100 # The zoom percentage for screen fonts. # A setting of 100% will make the fonts roughly the same size as on paper. # However, since a screen is wider than a piece of paper, the default setting # is 150%. \screen_zoom 100 # The wheel movement factor (for mice with wheels or five button mice) # Default is 100, about a page down. A value of 10 give me about a line and # a half #\wheel_jump 10 # LyX normally doesn't update the cursor position if you move the scrollbar. # If you scroll the cursor off the screen and then start typing LyX will # move you back to where the cursor was. If you'd prefer to always have the # cursor on screen, bounded by the topmost and bottommost visible lines # -- much like XEmacs for example -- then uncomment the next line. #\cursor_follows_scrollbar true # The screen fonts used to display the text while editing # The defaults are: \screen_font_roman "Serif" \screen_font_sans "Sans" \screen_font_typewriter "Monospace" # For some, this font looks better: #\screen_font_roman "-*-utopia" # Allow the use of scalable screen fonts? Default is true. # If you choose "false", LyX will use the closest existing size for a match. # Use this if the scalable fonts look bad and you have many fixed size fonts. #\screen_font_scalable false # Tip: Run lyx as "lyx -dbg 512" to learn which fonts are used. # The norm for the screen fonts. The default is iso8859-1, which is # the same as what LaTeX calls latin1. #\screen_font_encoding iso8859-2 # The norm for the popup fonts. The default is an empty string, which # causes to use the screen fonts norm (defined by \screen_font_encoding). #\popup_font_encoding iso8859-2 # The normal font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_font_name "-*-helvetica-medium-r" # The bold font for popups. It is set to # -*-*-*-?-*-*-*-*-. # The default is: #\popup_bold_font "-*-helvetica-bold-r" # The font sizes used for calculating the scaling of the screen fonts. # You should only have to change these if the fonts on your screen look bad, # in which case you can fine tune the font selection size by size. LyX selects # font size according to this table, the monitor DPI setting and the current # zoom setting. # The format is: #\screen_font_sizes tiny smallest smaller small normal large larger largest huge huger # # This is the default in LyX (exactly what LaTeX does): #\screen_font_sizes 5.0 7.0 8.0 9.0 10.0 12.0 14.4 17.28 20.74 24.88 # To change the colors for footnotes: #\set_color footnote green # for mathed you may also want to change the coloring of lines and brackets: #\set_color math yellow #\set_color mathlines yellow # # UI SECTION ######################################################## # # Choose your UI (user interface) definition here. The .ui files are in the # directory "lib/ui" and contains the definition of the menu and the toolbar. #\ui_file "default" # # PRINTER SECTION ######################################################## # # The default printer to print on. If none is specified, LyX will use # the environment variable PRINTER. If that fails, the default is empty. #\printer "" # If you have setup (as we recommend you to do) your print program # (e.g. dvips) to take advantage of the particularities of the various # printers you have access to, then you should set the following to # true. Then LyX will pass the name of the destination printer to your # print command. # The default is false, because we have unfortunately to cope with # people who refuse to take the time to configure their system. # Note that you will probably have to change \print_spool_command below. #\print_adapt_output true # If you don't use dvips, you may specify your favorite print program # here. See other options at the end of this section to adapt LyX to # your print program. #\print_command dvips # Extra options to pass to printing program after everything # else, but before the filename of the DVI file to be printed. #\print_extra_options "" # When set, this printer option automatically prints to a file # and then calls a separate print spooling program on that file # with the given name and arguments. # This is set by default to 'lp' or 'lpr', depending on what your # system uses. # Set this to "" if you have set up dvips so that it sends # output to the right printer (remember to also use \print_adapt_output). #\print_spool_command "" # If you specify a printer name in the print dialog, # the following argument is prepended along with the printer name # after the spool command. The default is autodetected, along with # \print_spool_command determination. #\print_spool_printerprefix "" # Other print related options # The following options are only of interest to people who do not # use dvips as print command. You may safely skip to the end of this # section otherwise. # These specify the options to pass to the printer program to select the # corresponding features. These default to the options used for the dvips # program. Look at the man page for your favorite print program to learn # which options to use. # Normally you don't need to change this unless you use something other # than dvips. #\print_evenpage_flag -B #\print_oddpage_flag -A #\print_reverse_flag -r #\print_landscape_flag "-t landscape" #\print_pagerange_flag -pp #\print_copies_flag -c #\print_collcopies_flag -C #\print_paper_flag -t #\print_paper_dimension_flag -T # Option to pass to the print program to print on a specific printer. #\print_to_printer -P # Option to pass to the print program to print to a file. #\print_to_file -o # Extension of printer program output file. Usually .ps #\print_file_extension .ps # Sample configuration to use with dvilj4 for a HP Laserjet IV (or # better) printer [provided by Reuben Thomas ]: #\print_command dvilj4 #\print_extra_options -q #\print_evenpage_flag "-D2 -r" #\print_oddpage_flag -D1 #\print_reverse_flag -r #\print_landscape_flag -l #\print_pagerange_flag -p #\print_to_file -e #\print_file_extension .lj #\print_copies_flag -c #\print_collcopies_flag -c #\print_adapt_output false # # EXPORT SECTION ######################################################## # # The \converter command defines a converter between two formats. # LyX uses the defined converters for generating output in various formats, # or for importing. # The converter command has 4 arguments: The source format, the target format, # the command, and additional flags. # For example, the following defines a DVI->Postscript converter: #\converter dvi ps "dvips -o $$o $$i" "" # The variable name $$i is replaced with the name of the source file, # and $$o is replaced with the name of the target file. # The flags argument is a list of comma separated flags. # Known flags are # - * : copy the previously defined flags # - latex : The converter is latex or its derivatives (pdflatex). # - originaldir : The converter must be invoked in the directory of the lyx # file and not in the temporary directory. This is needed for tex->html # converters in order to be able to read the eps files. # - needaux : The converted uses the .aux file, so we need to call latex # before running the converter. # - resultdir=dir : The converter put all the files in dir. # Using "resultdir" is same as "resultdir=$$b". # Note: When exporting, the whole directory will be moved from the temporary # directory to the target directory. # - resultfile=file : Name of main file in the result directory, for example # "index.html" or "$$b.html" # If "resultfile" is omitted, the name of this file is assumed to be # "index.format" # - parselog=filtername : filtername is a name of a filter command that takes # the converter error log (from stderr), and converts it to a fake latex .log # file. # For example: #\converter latex html "latex2html -split 0 $$i" # "originaldir,needaux,resultdir" # # For literate programming, use something like #\converter literate latex "noweave -delay -index $$i >$$o" # "parselog=listerrors g" #\converter literate program "build-script $$i" # "originaldir,parselog=listerrors g" # The format command is used to define file formats. It has 4 arguments: # the format name, the extension, and "pretty name" and menu shortcut. # For example #\Format latex tex LaTeX L # The \viewer command is used to define viewers for new formats, # or to change the already defined viewers. # For example, to use xdvi as the viewer to dvi files use #\viewer dvi "xdvi" # It can get more involved. Expert users might prefer something like: #\viewer dvi "xdvi -s 2 -expert -geometry 1014x720+0+0 -keep -margins 1.5" # # TEX SECTION ########################################################### # # The font encoding used for the LaTeX2e fontenc package. # T1 is highly recommended for non-English languages. LyX uses T1 as a # default if you have the ec fonts installed on your system. #\font_encoding T1 # Choose "default" if T1 doesn't work for you for some reason: #\font_encoding default # # FILE SECTION ########################################################## # # The default path for your documents. # Default is $HOME #\document_path ~/Documents/ # The file where the last-files information should be stored. # Default is ~/.lyx/lastfiles #\lastfiles ~/.lyx_lastfiles # Maximal number of lastfiles. Up to nine can appear in the file menu. # Default is four. #\num_lastfiles 9 # Flag telling whether the lastfiles should be checked for existence. # Files that does not exist are left out of the lastfiles entries. # Default is true. If you use slow or removable media, such as networks # or floppy disks, you can speed up the starting time of LyX by disabling # this feature. #\check_lastfiles false # The path that LyX will set when offering you to choose a template. # Default is (System LyX dir)/templates #\template_path ~/.lyx/templates # The path that LyX will use to put temporary TeX outputs. # Default is /tmp/ # containing # If you set it, it will be /directory/ # (unless set to /tmp). #\tempdir_path /usr/tmp # If you set this flag, LyX will always use a temporary directory # to put TeX outputs into. It is enabled by default. # This directory is deleted when you quit LyX. # You might want to avoid using a temporary directory in several # cases: # - LaTeX cannot find some files it needs; # - you have a large number of include files, and you get messages # saying that some LaTeX buffers overflow. # Note that, even if tell LyX not to use a temporary directory, there # will be cases where it will be forced to: this happens for example # when typesetting a file in a read-only directory (documentation). #\use_tempdir false # This is the maximum line length of an exported ASCII file (LaTeX, # SGML or plain text). Default is 75. #\ascii_linelen 80 # Set to false if you don't want LyX to create backup files. # Default is true. #\make_backup true # The path for storing backup files. If it is the empty string, LyX will # store the backup file in the same directory of the original file. # Default is "". #\backupdir_path "~/Desktop/Trash/" # # ASCII EXPORT SECTION ################################################### # # The following entry can be used to define an external program to # render tables in the ASCII output. If you specify "none", a simple # internal routine is used. The default is auto-detected. # The following line will use groff and output using latin-1 encoding # (here $$FName is the input file and the output goes to stdout): #\ascii_roff_command "groff -t -Tlatin1 $$FName" # # SPELLCHECKER SECTION #################################################### # # What command runs the spellchecker? Default is "ispell" if it is # installed, "none" otherwise. # If you have aspell (http://metalab.unc.edu/kevina/aspell/) # installed and configured, you might want to uncomment the line below. #\spell_command aspell # Consider run-together words, such as "notthe" for "not the", as legal # words? Default is false. #\accept_compound true # Specify an alternate language. The default is to use the language of # document. Uncomment both to enable. #\use_alt_language true #\alternate_language dansk # Specify additional chars that can be part of a word. #\use_escape_chars true #\escape_chars "??????" # Specify an alternate personal dictionary file. If the file name does not # begin with "/", $HOME is prefixed. The default is to search for a personal # dictionary in both the current directory and $HOME, creating one in $HOME # if none is found. The preferred name is constructed by appending ".ispell_" # to the base name of the hash file. For example, if you use the English # dictionary, your personal dictionary would be named ".ispell_english". #\use_personal_dictionary true #\personal_dictionary .ispell_dansk # Specify whether to pass the -T input encoding option to ispell (only if the # language is different than "default".) Enable this if you can't spellcheck # words with international letters in them. There have been reports that this # does not work with all dictionaries, so this is disabled by default. #\use_input_encoding true # # LANGUAGE SUPPORT SECTION #################################################### # # Set to true to enable support of right-to-left languages (e.g. Hebrew, # Arabic). Default is false. #\rtl true # The latex command for loading the language package. # Default is \usepackage{babel}. #\language_package "\usepackage{omega}" # The latex command for changing the from the language of the document # to another language. $$lang is substituted by the name of the second # language. Default is \selectlanguage{$$lang}. #\language_command_begin "\begin{otherlanguage}{$$lang}" # The latex command for changing back the language to the language of # the document. Default is \selectlanguage{$$lang}. #\language_command_end "\end{otherlanguage}" # Set to false if a language switching command is needed at the beginning of # the document. Default is true. #\language_auto_begin false # Set to false if a language switching command is needed at the end of # the document. Default is true. #\language_auto_end false # Set mark_foreign_language to "false" to disable the highlighting of words # with a foreign language to the language of the documet. # Default is "true" #\mark_foreign_language false # It is possible to bind keys for changing the language inside a document. # For example, the following command will cause F12 to switch between French # and English in a French document, and in a document of other language it will # switch between that language and French. #\bind "F12" "language french" # # HEBREW SUPPORT SECTION #################################################### # # To enable the Hebrew support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary hebrew #\converter tex dvi elatex "" #\converter tex pdf pdfelatex "" #\font_encoding default # You also need to bind a key for switching between Hebrew and English. # For example, #\bind "F12" "language hebrew" # You might want ot disable the foreign language marking: #\mark_foreign_language false # Finally, you need to select iso8859-8 font encoding, and select screen fonts # (below are the default fonts. You need to replace them by Hebrew fonts) #\screen_font_encoding iso8859-8 #\screen_font_roman "-*-times" #\screen_font_sans "-*-helvetica" #\screen_font_typewriter "-*-courier" #\screen_font_popup "-*-helvetica-medium-r" #\screen_font_menu "-*-helvetica-bold-r" # # ARABIC SUPPORT SECTION #################################################### # # To enable the Arabic support, uncommnet the following lines: #\rtl true #\kbmap true #\kbmap_primary null #\kbmap_secondary arabic # You also need to bind a key for switching between Arabic and English. # For example, #\bind "F12" "language arabic" # If you use arabtex, uncomment the following lines #\language_auto_begin false #\language_auto_end false #\language_command_begin "\begin{arabtext}" #\language_command_end "\end{arabtext}" #\language_package "\usepackage{arabtex,iso88596}\setcode{iso8859-6}" # Finally, you need to select iso8859-6.8x font encoding, # and select screen fonts. # iso8859-6.8x fonts can be found at # http://www.langbox.com/AraMosaic/mozilla/fontXFE/ #\screen_font_encoding iso8859-6.8x #\screen_font_encoding_menu iso8859-1 #\screen_font_roman "-*-naskhi" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Apr 2006 15:53:34 -0000 1.5 +++ .cvsignore 24 May 2006 14:01:28 -0000 1.6 @@ -1,2 +1,3 @@ +clog beamer.layout lyx-1.4.1.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- lyx.spec 22 May 2006 19:01:27 -0000 1.22 +++ lyx.spec 24 May 2006 14:01:28 -0000 1.23 @@ -2,18 +2,18 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.4.0-helpers.patch -Patch2: lyx-1.4.0-boost.patch +Patch2: lyx-1.4.1-defaults.patch +Source1: lyxrc.defaults.custom # app-wrapper for various frontends Source10: lyx.sh # .desktop files @@ -39,7 +39,6 @@ BuildRequires: zlib-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0} # For texhash Requires(post): tetex-fonts @@ -52,9 +51,11 @@ Requires: ghostscript Requires: htmlview ## Soft dependancies -# add support for lyx's Document->Change Tracking +%if "%{?fedora}" > "3" +# dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost Requires(hint): tetex-preview +%endif %description LyX is a modern approach to writing documents which breaks with the @@ -96,7 +97,7 @@ %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%{?_without_included_boost:%patch2 -p1 -b .boost} +%patch2 -p1 -b .defaults %build @@ -117,7 +118,6 @@ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ - %{?_without_included_boost} \ --without-warnings --disable-dependency-tracking \ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks @@ -135,6 +135,7 @@ install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms # misc/extras +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults.custom install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ # Set up the lyx-specific class files where TeX can see them @@ -194,10 +195,11 @@ %{_mandir}/man1/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/lyx/ -%{_datadir}/texmf/tex/latex/lyx/ +%config(noreplace) %{_datadir}/lyx/lyxrc.defaults.custom %verify(not md5 size mtime) %{_datadir}/lyx/*.lst %verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults %verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx +%{_datadir}/texmf/tex/latex/lyx/ %files qt %defattr(-,root,root,-) @@ -211,6 +213,18 @@ %changelog +* Wed May 24 2006 Rex Dieter 1.4.1-7 +- use serverpipe "~/.lyx/lyxpipe" instead, that was the old default + and what pybibliographer expects. + +* Tue May 23 2006 Rex Dieter 1.4.1-6 +- set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) + screen_font_roman "Serif" + screen_font_sans "Sans" + screen_font_typewriter "Monospace" + screen_zoom 100 + serverpipe "~/.lyx/pipe" + * Mon May 22 2006 Rex Dieter 1.4.1-5 - Requires(hint): tetex-preview --- lyx-1.4.0-boost.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:04:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:04:22 -0700 Subject: rpms/qt4 - New directory Message-ID: <200605241404.k4OE4OpN006869@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6847/qt4 Log Message: Directory /cvs/extras/rpms/qt4 added to the repository From fedora-extras-commits at redhat.com Wed May 24 14:04:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:04:22 -0700 Subject: rpms/qt4/devel - New directory Message-ID: <200605241404.k4OE4ODD006872@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6847/qt4/devel Log Message: Directory /cvs/extras/rpms/qt4/devel added to the repository From fedora-extras-commits at redhat.com Wed May 24 14:04:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:04:36 -0700 Subject: rpms/qt4 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605241404.k4OE4cqr006928@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6895 Added Files: Makefile import.log Log Message: Setup of module qt4 --- NEW FILE Makefile --- # Top level Makefile for module qt4 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 24 14:04:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:04:36 -0700 Subject: rpms/qt4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605241404.k4OE4cRd006931@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6895/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qt4 --- NEW 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 May 24 14:06:14 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:06:14 -0700 Subject: rpms/qt4 import.log,1.1,1.2 Message-ID: <200605241406.k4OE6kYm007040@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997 Modified Files: import.log Log Message: auto-import qt4-4.1.3-3 on branch devel from qt4-4.1.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qt4/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 May 2006 14:04:36 -0000 1.1 +++ import.log 24 May 2006 14:06:14 -0000 1.2 @@ -0,0 +1 @@ +qt4-4_1_3-3:HEAD:qt4-4.1.3-3.src.rpm:1148479570 From fedora-extras-commits at redhat.com Wed May 24 14:06:14 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:06:14 -0700 Subject: rpms/qt4/devel assistant.desktop, NONE, 1.1 designer.desktop, NONE, 1.1 linguist.desktop, NONE, 1.1 qt-x11-opensource-src-4.1.2-assistant4.patch, NONE, 1.1 qt4-wrapper.sh, NONE, 1.1 qt4.spec, NONE, 1.1 qtconfig.desktop, NONE, 1.1 qtdemo.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605241406.k4OE6k4H007044@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/devel Modified Files: .cvsignore sources Added Files: assistant.desktop designer.desktop linguist.desktop qt-x11-opensource-src-4.1.2-assistant4.patch qt4-wrapper.sh qt4.spec qtconfig.desktop qtdemo.desktop Log Message: auto-import qt4-4.1.3-3 on branch devel from qt4-4.1.3-3.src.rpm --- NEW FILE assistant.desktop --- [Desktop Entry] Name=Qt4 Assistant Comment=Add translations to Qt4 applications Exec=assistant4 Icon=assistant Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; --- NEW FILE designer.desktop --- [Desktop Entry] Name=Qt4 Designer GenericName=Interface Designer Comment=Design GUIs for Qt4 applications Exec=designer4 Icon=designer MimeType=application/x-designer; Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; --- NEW FILE linguist.desktop --- [Desktop Entry] Name=Qt4 Linguist Comment=Add translations to Qt4 applications Exec=linguist4 Icon=linguist MimeType=application/x-linguist; Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; qt-x11-opensource-src-4.1.2-assistant4.patch: --- NEW FILE qt-x11-opensource-src-4.1.2-assistant4.patch --- --- qt-x11-opensource-src-4.1.2/tools/assistant/lib/qassistantclient.cpp.assistant4 2006-03-20 07:04:38.000000000 -0600 +++ qt-x11-opensource-src-4.1.2/tools/assistant/lib/qassistantclient.cpp 2006-05-15 10:41:41.000000000 -0500 @@ -166,7 +166,7 @@ : QObject( parent ), host ( "localhost" ) { if ( path.isEmpty() ) - assistantCommand = "assistant"; + assistantCommand = "assistant4"; else { QFileInfo fi( path ); if ( fi.isDir() ) --- NEW FILE qt4-wrapper.sh --- #!/bin/sh if [ -z "$QT4DIR" ] ; then QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`" if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then PATH=${QT4DIR}/bin:${PATH} fi export QT4DIR PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} --- NEW FILE qt4.spec --- # Currently under review for Fedora Extras at # http://bugzilla.redhat.com/bugzilla/188180 Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 Release: 3%{?dist} License: GPL/QPL Group: System Environment/Libraries Url: http://www.trolltech.com/products/qt/ Source0: ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # search for assistant4 instead of (qt3's) assistant in $PATH Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch Source10: qt4-wrapper.sh Source20: assistant.desktop Source21: designer.desktop Source22: linguist.desktop Source23: qtdemo.desktop Source24: qtconfig.desktop ## Optional bits # Build mysql plugins %define mysql 1 # Build postgresql plugins %define psql 1 # Build ODBC plugins %define odbc 1 # Build sqlite plugins %define sqlite 1 %define qt_dirname qt4 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/%{name}-doc-%{version} Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d BuildRequires: desktop-file-utils BuildRequires: libmng-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: zlib-devel BuildRequires: libungif-devel BuildRequires: findutils BuildRequires: cups-devel BuildRequires: tar BuildRequires: freetype-devel BuildRequires: fontconfig-devel %define x_deps xorg-x11-devel libGL-devel libGLU-devel %if "%{?fedora}" > "4" %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel %endif BuildRequires: %{x_deps} %if %{mysql} # mysql-devel < 4 build fails, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") %global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql") %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g") %endif %if %{psql} BuildRequires: postgresql-devel %endif %if %{odbc} BuildRequires: unixODBC-devel %endif %if %{sqlite} BuildRequires: sqlite-devel %endif %description Qt is a GUI software toolkit which simplifies the task of writing and maintaining GUI (Graphical User Interface) applications for the X Window System. %package config Summary: Grapical configuration tool for programs using Qt Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} %description config %{summary}. %package devel Summary: Development files for the Qt GUI toolkit Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{x_deps} Requires: libpng-devel Requires: libjpeg-devel Requires: pkgconfig Obsoletes: %{name}-designer < %{version}-%{release} Provides: %{name}-designer = %{version}-%{release} %description devel This package contains the files necessary to develop applications using the Qt GUI toolkit. Includes: Qt Linguist %package doc Summary: API documentation, demos and example programs for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Provides: %{name}-assistant = %{version}_%{release} # For docs -> doc rename, temporary, since it was a short-lived subpkg Obsoletes: %{name}-docs < %{version}-%{release} Provides: %{name}-docs = %{version}-%{release} %description doc %{summary}. Includes: Qt Assistant, Qt Demo %package odbc Summary: ODBC driver for Qt's SQL classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-ODBC < %{version}-%{release} Provides: %{name}-ODBC = %{version}-%{release} %description odbc %{summary}. %package mysql Summary: MySQL driver for Qt's SQL classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-MySQL < %{version}-%{release} Provides: %{name}-MySQL = %{version}-%{release} %description mysql %{summary}. %package postgresql Summary: PostgreSQL driver for Qt's SQL classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-PostgreSQL < %{version}-%{release} Provides: %{name}-PostgreSQL = %{version}-%{release} %description postgresql %{summary}. %package sqlite Summary: SQLite driver for Qt's SQL classes Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-SQLite < %{version}-%{release} Provides: %{name}-SQLite = %{version}-%{release} %description sqlite %{summary}. %prep %setup -q -n qt-x11-opensource-src-%{version} %patch1 -p1 -b .assistant4 %build export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` # use $RPM_OPT_FLAGS for our platform %if "%{_lib}" == "lib64" %define platform linux-g++-64 %else %define platform linux-g++ %endif sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf # set correct lib path if [ "%{_lib}" == "lib64" ] ; then sed -i -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test sed -i -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test fi # build shared, threaded (default) libraries echo yes | ./configure -v \ -no-rpath \ -prefix %{qtdir} \ -libdir %{qtdir}/%{_lib} \ -docdir %{qt_docdir} \ -platform %{platform} \ -release \ -shared \ -no-exceptions \ -largefile \ -qt-gif \ -system-zlib \ -system-libpng \ -system-libjpeg \ %if %{mysql} -plugin-sql-mysql \ %{?mysql_include} \ %{?mysql_ldflags} \ %endif %if %{psql} -plugin-sql-psql \ %endif %if %{odbc} -plugin-sql-odbc \ %endif %if %{sqlite} -plugin-sql-sqlite \ %endif -cups \ -sm \ -stl \ -xcursor \ -xinerama \ -xshape \ -xrandr \ -xrender \ -xkb \ -fontconfig \ -tablet make %{?_smp_mflags} %install rm -rf %{buildroot} export QTDIR=`/bin/pwd` export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" export PATH="$QTDIR/bin:$PATH" make install INSTALL_ROOT=%{buildroot} ## pkg-config # strip extraneous dirs/libraries -- Rex # safe ones for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl done # not-so-safe, but we can try -- Rex for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl done sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ pushd %{buildroot}%{_libdir}/pkgconfig for i in ../%{qt_dirname}/%{_lib}/*.pc ; do [ -f "$i" ] && ln -s $i . done popd # -doc make symbolic link to qt_docdir rm -rf %{buildroot}%{qtdir}/doc ln -s ../../share/doc/%{name}-doc-%{version} %{buildroot}%{qtdir}/doc # put LICENSE.* files in %%qtdir, some apps' configure scripts expect to find them here install -p -m644 LICENSE.* %{buildroot}%{qtdir}/ # Make symlinks in %%_bindir mkdir -p %{buildroot}%{_bindir} pushd %{buildroot}%{qtdir}/bin for i in *; do case "$i" in qt3to4|uic3|rcc) LINK=$i ;; qtconfig) LINK=qt4config ;; qtdemo) LINK=qt4demo ;; *) LINK=${i}4 ;; esac # ln -s ../%{_lib}/%{qt_dirname}/bin/$i %{buildroot}%{_bindir}/${LINK} # or use qt4-wrapper.sh [ "$i" != "$LINK" ] && ln -s $i %{buildroot}%{qtdir}/bin/${LINK} install -p -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK} done popd # Add desktop file(s) desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ --vendor="%{name}" \ --add-category="X-Fedora" \ --remove-key=MapNotify \ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} # .la files, die, die, die. rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README* changes* OPENSOURCE-NOTICE.TXT %{qtdir}/LICENSE.* /etc/ld.so.conf.d/* %dir %{qtdir} %dir %{qtdir}/%{_lib}/ %{qtdir}/%{_lib}/lib*.so.* %dir %{qtdir}/plugins/ %{qtdir}/plugins/imageformats/ %{qtdir}/plugins/accessible/ %{qtdir}/plugins/inputmethods/ %{qtdir}/translations/ %files config %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/bin/ %{qtdir}/bin/qt*config* %{_bindir}/qt*config* %{_datadir}/applications/*qtconfig*.desktop %files devel %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/bin/ %{qtdir}/bin/lrelease* %{qtdir}/bin/lupdate* %{qtdir}/bin/moc* %{qtdir}/bin/qm2ts* %{qtdir}/bin/qmake* %{qtdir}/bin/qt3to4 %{qtdir}/bin/rcc* %{qtdir}/bin/uic* %{_bindir}/lrelease* %{_bindir}/lupdate* %{_bindir}/moc* %{_bindir}/qm2ts* %{_bindir}/qmake* %{_bindir}/qt3to4 %{_bindir}/rcc* %{_bindir}/uic* %{qtdir}/include/ %{qtdir}/mkspecs/ %dir %{qtdir}/%{_lib} %{qtdir}/%{_lib}/*.so %{qtdir}/%{_lib}/*.a %{qtdir}/%{_lib}/*.prl %{qtdir}/phrasebooks/ %{qtdir}/%{_lib}/*.pc %{_libdir}/pkgconfig/*.pc %{qtdir}/q3porting.xml # Qt designer %{_bindir}/designer* %{qtdir}/bin/designer* %dir %{qtdir}/plugins %{qtdir}/plugins/designer/ %{_datadir}/applications/*designer*.desktop # Qt Linguist %{qtdir}/bin/linguist* %{_bindir}/linguist* %{_datadir}/applications/*linguist*.desktop %files doc %defattr(-,root,root,-) %dir %{qt_docdir}/ %{qt_docdir}/html %dir %{qtdir} %dir %{qtdir}/bin/ %{qtdir}/doc %{qtdir}/demos/ %{qtdir}/examples/ # Qt Assistant %{qtdir}/bin/assistant* %{_bindir}/assistant* %{_datadir}/applications/*assistant*.desktop # Qt Demo %{qtdir}/bin/qt*demo* %{_bindir}/qt*demo* %{_datadir}/applications/*qtdemo*.desktop %if %{odbc} %files odbc %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/plugins %dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlodbc* %endif %if %{psql} %files postgresql %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/plugins %dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlpsql* %endif %if %{mysql} %files mysql %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/plugins %dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlmysql* %endif %if %{sqlite} %files sqlite %defattr(-,root,root,-) %dir %{qtdir} %dir %{qtdir}/plugins %dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlite* %endif %changelog * Sun May 21 2006 Rex Dieter 4.1.3-3 - fix %%mysql_libs macro * Sat May 20 2006 Rex Dieter 4.1.3-2 - -mysql: use mysql_config for setting cflags/ldflags. - -mysql: BR: mysql-devel > 4.0 * Sat May 20 2006 Laurent Rineau - Fix the last reference to %{qtdir}/lib: use %{_lib} instead of "lib". - Fix the ownership of subpackages: they need to own parents of directories they install files in. * Fri May 19 2006 Rex Dieter 4.1.3-1 - 4.1.3 - %%qtdir/lib/*.pc -> %%qtdir/%%_lib/*.pc (hopefully, the last hardcoded reference to %%qtdir/lib) * Fri May 19 2006 Rex Dieter 4.1.2-20 - fix some unowned dirs - try harder to purge %%builddir from .pc,.prl files - -docdir %%_docdir/%%name-doc-%%version, since we use %%doc macro in main pkg - -doc: own %%qt_docdir - use qt4-wrapper.sh to ensure launch of qt4 versions of apps that (may) overlap with those from qt3 - use %%qtdir/%%_lib in ld.so.conf.d/*.conf files too * Tue May 16 2006 Rex Dieter 4.1.2-19 - drop libQtAssistantClient,libQtUiTools shlib patches * Tue May 16 2006 Rex Dieter 4.1.2-18 - %%_bindir symlinks: qtconfig4 -> qt4config, qtdemo4 -> qt4demo - -libdir %%qtdir/%%_lib, simplifies %%_lib != lib case - -docdir %%_docdir/%%name-%%version - build shared versions of libQtAssistantClient,libQtUiTools too - strip extraneous -L paths, libs from *.prl files too * Tue May 16 2006 Rex Dieter 4.1.2-17 - .desktop: Qt -> Qt4, and Comment= (where missing) - -devel: include -designer here, Obsoletes/Provides: %%name-designer. It's small, simplifies things... one less subpkg to worry about. - -doc: include %%qtdir/doc symlink here - -docdir %%_docdir/%%name-doc-%%version * Mon May 15 2006 Rex Dieter 4.1.2-16 - set/use RPM_OPT_FLAGS only for our platform - (really) don't give %%_bindir symlink for qt3to4 another "4" suffix - don't add 4 suffix to uic3, rcc (they don't conflict with qt(3)-devel) - -devel: add linguist.desktop - -doc: move assistant here, Provides: %%{name}-assistant, add assistant.desktop - -doc: add qtdemo.desktop - -doc: Requires qt4 (instead of qt4-devel) - assistant4.patch: search for assistant4 instead of (qt3's) assistant in $PATH - -qtconfig: add qtconfig.desktop - updated %%sumaries to mention where (some) tools are, including assistant, linguist, qtdemo * Mon May 15 2006 Laurent Rineau - 4.1.2-15 - Rename -docs to -doc. - Files in the -doc subpackage are no longer in %%doc. - Move qtdemo to the subpackage -doc. - Fix symlinks in %%{_bindir}. - Only modify mkspecs/linux-g++*/qmake.conf, instead of all mkspecs/*/qmake.conf. * Sun May 14 2006 Rex Dieter 4.1.2-14 - remove MapNotify from .desktop file(s). - install -m644 LICENSE.* - -docs: don't mark examples as %doc - drop unused %%debug macro * Sat May 13 2006 Rex Dieter 4.1.2-13 - include unpackaged pkgconfig files * Sat May 13 2006 Rex Dieter 4.1.2-12 - fix typos so it actually builds. * Sat May 13 2006 Rex Dieter 4.1.2-11 - drop optional ld.so.conf.d usage, make mandatory - make %%_bindir symlinks to all %%qtdir/bin stuff (even qt3to4) - pkgconfig files: hardlinks -> relative symlinks, strip -L%{_libdir}/mysql and -L%%{_builddir}/qt-x11-opensource-src-%%version/lib - cleanup/simplify Summary/%%description entries - $RPM_BUILD_ROOT -> %%buildroot, $RPM_BUILD_DIR -> %%_builddir * Sat May 13 2006 Rex Dieter 4.1.2-10 - cleanup/simplify license bits, include LICENSE.QPL - drop unused -styles/-Xt subpkg reference - drop unused motif extention bits - drop initialpreference from .deskstop files * Fri May 12 2006 Rex Dieter 4.1.2-9 - drop reference to non-existent config.test/unix/checkavail * Fri May 12 2006 Rex Dieter 4.1.2-8 - simplify build* macros - lower-case all subpkgs (ie, -MySQL -> -mysql ) - drop BR: perl, sed * Thu May 11 2006 Rex Dieter 4.1.2-7 - rework %%post/%%postun, mostly to placate rpmlint - drop Prefix: - drop use of qt4.(sh|csh), they're empty atm anyway - use Source'd designer.desktop (instead of inline cat/echo) - symlinks to %%_bindir: qmake4, designer4, qtconfig4 - drop qtrc, qt4 doesn't use it. - -docs subpkg for API html docs, demos, examples. - BR: libXcursor-devel libXi-devel (fc5+) * Thu Apr 27 2006 Rex Dieter 4.1.2-6 - devel: Requires: pkgconfig * Sat Apr 15 2006 Simon Perreault 4.1.2-5 - Disable C++ exceptions. * Mon Apr 10 2006 Rex Dieter 4.1.2-4 - qt4.(sh|csh): place-holders only, don't define QTDIR (and QTLIB) as that (potentially) conflicts with qt-3.x. * Thu Apr 06 2006 Rex Dieter 4.1.2-2 - -devel: Drop (artificial) Conflicts: qt-devel - fix %%ld_so_conf_d usage - %%qtdir/%%_lib symlink * Wed Apr 05 2006 Rex Dieter 4.1.2-1 - drop Epoch - cleanup (a lot!) * Tue Dec 20 2005 Than Ngo 1:4.1.0-0.1 - update to 4.1.0 * Fri Sep 09 2005 Than Ngo 1:4.0.1-0.1 - update to 4.0.1 --- NEW FILE qtconfig.desktop --- [Desktop Entry] Name=Qt4 Config Comment=Configure Qt4 behavior, styles, fonts Exec=qt4config Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; --- NEW FILE qtdemo.desktop --- [Desktop Entry] Name=Qt4 Demo Comment=Show Qt4 demos and programming examples Exec=qt4demo Terminal=false Encoding=UTF-8 Type=Application Categories=Qt;Application;Development; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 May 2006 14:04:36 -0000 1.1 +++ .cvsignore 24 May 2006 14:06:14 -0000 1.2 @@ -0,0 +1 @@ +qt-x11-opensource-src-4.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 May 2006 14:04:36 -0000 1.1 +++ sources 24 May 2006 14:06:14 -0000 1.2 @@ -0,0 +1 @@ +c6fc6934bfca458dde6e6370a2ed0101 qt-x11-opensource-src-4.1.3.tar.gz From fedora-extras-commits at redhat.com Wed May 24 14:18:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:18:21 -0700 Subject: owners owners.list,1.1052,1.1053 Message-ID: <200605241418.k4OEINGO007142@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7125 Modified Files: owners.list Log Message: take over qt4 from than. (: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1052 retrieving revision 1.1053 diff -u -r1.1052 -r1.1053 --- owners.list 24 May 2006 05:41:39 -0000 1.1052 +++ owners.list 24 May 2006 14:18:21 -0000 1.1053 @@ -1419,7 +1419,7 @@ Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|qscintilla|A Scintilla port to Qt|icon at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|qt4|Qt is a GUI software toolkit|than at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|quadkonsole|Embeds Konsole kparts in a grid layout|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 24 14:19:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:19:33 -0700 Subject: rpms/uuid - New directory Message-ID: <200605241419.k4OEJZW1007217@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7191/uuid Log Message: Directory /cvs/extras/rpms/uuid added to the repository From fedora-extras-commits at redhat.com Wed May 24 14:19:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:19:34 -0700 Subject: rpms/uuid/devel - New directory Message-ID: <200605241419.k4OEJagl007220@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7191/uuid/devel Log Message: Directory /cvs/extras/rpms/uuid/devel added to the repository From fedora-extras-commits at redhat.com Wed May 24 14:19:46 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:19:46 -0700 Subject: rpms/uuid Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605241419.k4OEJm5K007269@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7236 Added Files: Makefile import.log Log Message: Setup of module uuid --- NEW FILE Makefile --- # Top level Makefile for module uuid all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 24 14:19:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:19:47 -0700 Subject: rpms/uuid/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605241419.k4OEJnjQ007272@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7236/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module uuid --- NEW 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 May 24 14:20:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:20:21 -0700 Subject: rpms/uuid import.log,1.1,1.2 Message-ID: <200605241420.k4OEKNYu007333@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7300 Modified Files: import.log Log Message: auto-import uuid-1.4.2-4 on branch devel from uuid-1.4.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/uuid/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 May 2006 14:19:46 -0000 1.1 +++ import.log 24 May 2006 14:20:21 -0000 1.2 @@ -0,0 +1 @@ +uuid-1_4_2-4:HEAD:uuid-1.4.2-4.src.rpm:1148480414 From fedora-extras-commits at redhat.com Wed May 24 14:20:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:20:21 -0700 Subject: rpms/uuid/devel uuid.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605241420.k4OEKNoU007338@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/uuid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7300/devel Modified Files: .cvsignore sources Added Files: uuid.spec Log Message: auto-import uuid-1.4.2-4 on branch devel from uuid-1.4.2-4.src.rpm --- NEW FILE uuid.spec --- Name: uuid Version: 1.4.2 Release: 4%{?dist} Summary: Universally Unique Identifier library License: MIT Group: System Environment/Libraries URL: http://www.ossp.org/pkg/lib/uuid/ Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /usr/bin/libtool %description OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node based), version 3 (name based, MD5), version 4 (random number based) and version 5 (name based, SHA-1). Additional API bindings are provided for the languages ISO-C++:1998, Perl:5 and PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl Data::UUID APIs. %package devel Summary: Development support for Universally Unique Identifier library Group: Development/Libraries Requires: %{_libdir}/pkgconfig Requires: %{name} = %{version}-%{release} %description devel Development headers and libraries for OSSP uuid. %package c++ Summary: C++ support for Universally Unique Identifier library Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description c++ C++ libraries for OSSP uuid. %package c++-devel Summary: C++ development support for Universally Unique Identifier library Group: Development/Libraries Requires: %{name}-c++ = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} %description c++-devel C++ development headers and libraries for OSSP uuid. %package perl Summary: Perl support for Universally Unique Identifier library Group: Development/Libraries Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: %{name} = %{version}-%{release} %description perl Perl OSSP uuid modules, which includes a Data::UUID replacement. %package php Summary: PHP support for Universally Unique Identifier library Group: Development/Libraries BuildRequires: /usr/bin/phpize Requires: %{_libdir}/php/modules Requires: %{name} = %{version}-%{release} %description php PHP OSSP uuid module. %package pgsql Summary: PostgreSQL support for Universally Unique Identifier library Group: Development/Libraries BuildRequires: /usr/bin/pg_config Requires: %{_libdir}/pgsql Requires: %{_datadir}/pgsql Requires: %{name} = %{version}-%{release} %description pgsql PostgreSQL OSSP uuid module. %package dce Summary: DCE support for Universally Unique Identifier library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description dce DCE OSSP uuid library. %package dce-devel Summary: DCE development support for Universally Unique Identifier library Group: Development/Libraries Requires: %{name}-dce = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} %description dce-devel DCE development headers and libraries for OSSP uuid. %prep %setup -q %build # Build the library. %configure \ --disable-static \ --without-perl \ --without-php \ --with-dce \ --with-cxx \ --with-pgsql make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} # Build the Perl module. pushd perl %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" COMPAT=1 %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} popd # Build the PHP module. pushd php phpize CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs" %configure --enable-uuid sed -i -e '/^LDFLAGS =/s/-Wl,-rpath,[^[:space:]]*//' Makefile make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} popd %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/*.a chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.* # Install the Perl modules. pushd perl make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name '*.bs' -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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* popd # Install the PHP module. pushd php make install INSTALL_ROOT=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a popd %check make check pushd perl LD_LIBRARY_PATH=../.libs make test popd pushd php LD_LIBRARY_PATH=../.libs make test popd %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %post c++ -p /sbin/ldconfig %post dce -p /sbin/ldconfig %postun -p /sbin/ldconfig %postun c++ -p /sbin/ldconfig %postun dce -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS %{_bindir}/uuid %{_libdir}/libuuid.so.* %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %{_bindir}/uuid-config %{_includedir}/uuid.h %{_libdir}/libuuid.so %{_libdir}/pkgconfig/uuid.pc %{_mandir}/man3/uuid.3* %files c++ %defattr(-,root,root,-) %{_libdir}/libuuid++.so.* %files c++-devel %defattr(-,root,root,-) %{_includedir}/uuid++.hh %{_libdir}/libuuid++.so %{_mandir}/man3/uuid++.3* %files perl %defattr(-,root,root,-) %{perl_vendorarch}/auto/* %{perl_vendorarch}/Data* %{perl_vendorarch}/OSSP* %{_mandir}/man3/Data::UUID.3* %{_mandir}/man3/OSSP::uuid.3* %files php %defattr(-,root,root,-) %{_libdir}/php/modules/* %files pgsql %defattr(-,root,root,-) %{_libdir}/pgsql/* %{_datadir}/pgsql/* %files dce %defattr(-,root,root,-) %{_libdir}/libuuid_dce.so.* %files dce-devel %defattr(-,root,root,-) %{_includedir}/uuid_dce.h %{_libdir}/libuuid_dce.so %changelog * Wed May 24 2006 Steven Pritchard 1.4.2-4 - Remove static php module. * Tue May 23 2006 Steven Pritchard 1.4.2-3 - Force use of system libtool. - Make libs executable. * Tue May 23 2006 Steven Pritchard 1.4.2-2 - License is MIT(-ish). * Fri May 19 2006 Steven Pritchard 1.4.2-1 - Initial packaging attempt. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uuid/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 May 2006 14:19:47 -0000 1.1 +++ .cvsignore 24 May 2006 14:20:21 -0000 1.2 @@ -0,0 +1 @@ +uuid-1.4.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uuid/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 May 2006 14:19:47 -0000 1.1 +++ sources 24 May 2006 14:20:21 -0000 1.2 @@ -0,0 +1 @@ +fdfe93bc134dfb73814456c3b444dda1 uuid-1.4.2.tar.gz From fedora-extras-commits at redhat.com Wed May 24 14:23:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 07:23:59 -0700 Subject: owners owners.list,1.1053,1.1054 Message-ID: <200605241424.k4OEO1G5007484@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7455 Modified Files: owners.list Log Message: Add uuid. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1053 retrieving revision 1.1054 diff -u -r1.1053 -r1.1054 --- owners.list 24 May 2006 14:18:21 -0000 1.1053 +++ owners.list 24 May 2006 14:23:59 -0000 1.1054 @@ -1662,6 +1662,7 @@ Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|wtogami at redhat.com Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|uudeview|Applications for uuencoding, uudecoding, ..|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|uuid|Universally Unique Identifier library|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|uw-imap|UW Server daemons for IMAP and POP network mail protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 24 14:24:42 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:24:42 -0700 Subject: rpms/gsview Makefile,1.1,NONE import.log,1.7,NONE Message-ID: <200605241424.k4OEOios007528@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7513/gsview Removed Files: Makefile import.log Log Message: remove remaining remnants from cvs --- Makefile DELETED --- --- import.log DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:25:35 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 24 May 2006 07:25:35 -0700 Subject: rpms/bzrtools/FC-5 bzrtools.spec,1.1,1.2 Message-ID: <200605241425.k4OEPbcD007632@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561/FC-5 Modified Files: bzrtools.spec Log Message: Fix bzr requires Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-5/bzrtools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzrtools.spec 23 May 2006 14:56:04 -0000 1.1 +++ bzrtools.spec 24 May 2006 14:25:35 -0000 1.2 @@ -2,7 +2,7 @@ Name: bzrtools Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: bzr = 0.8 +Requires: bzr >= 0.8 %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included @@ -57,6 +57,9 @@ %ghost %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog +* Wed May 24 2006 Shahms E. King 0.8.1-4 +- Require bzr >= 0.8, rather than only 0.8 + * Tue May 16 2006 Shahms E. King 0.8.1-3 - BuildRequires python, rather than python-devel From fedora-extras-commits at redhat.com Wed May 24 14:25:36 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 24 May 2006 07:25:36 -0700 Subject: rpms/bzrtools/devel bzrtools.spec,1.1,1.2 Message-ID: <200605241425.k4OEPcsL007637@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561/devel Modified Files: bzrtools.spec Log Message: Fix bzr requires Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzrtools.spec 23 May 2006 14:56:04 -0000 1.1 +++ bzrtools.spec 24 May 2006 14:25:36 -0000 1.2 @@ -2,7 +2,7 @@ Name: bzrtools Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: bzr = 0.8 +Requires: bzr >= 0.8 %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included @@ -57,6 +57,9 @@ %ghost %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog +* Wed May 24 2006 Shahms E. King 0.8.1-4 +- Require bzr >= 0.8, rather than only 0.8 + * Tue May 16 2006 Shahms E. King 0.8.1-3 - BuildRequires python, rather than python-devel From fedora-extras-commits at redhat.com Wed May 24 14:25:34 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 24 May 2006 07:25:34 -0700 Subject: rpms/bzrtools/FC-4 bzrtools.spec,1.1,1.2 Message-ID: <200605241425.k4OEPaCd007627@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bzrtools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7561/FC-4 Modified Files: bzrtools.spec Log Message: Fix bzr requires Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-4/bzrtools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bzrtools.spec 23 May 2006 14:56:04 -0000 1.1 +++ bzrtools.spec 24 May 2006 14:25:34 -0000 1.2 @@ -2,7 +2,7 @@ Name: bzrtools Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: bzr = 0.8 +Requires: bzr >= 0.8 %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included @@ -57,6 +57,9 @@ %ghost %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog +* Wed May 24 2006 Shahms E. King 0.8.1-4 +- Require bzr >= 0.8, rather than only 0.8 + * Tue May 16 2006 Shahms E. King 0.8.1-3 - BuildRequires python, rather than python-devel From fedora-extras-commits at redhat.com Wed May 24 14:26:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:20 -0700 Subject: rpms/gsview/devel .cvsignore, 1.4, NONE Makefile, 1.2, NONE sources, 1.4, NONE Message-ID: <200605241426.k4OEQMKU007855@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/devel Removed Files: .cvsignore Makefile sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:26:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:27 -0700 Subject: rpms/gsview/FC-4 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.4, NONE Message-ID: <200605241426.k4OEQTGr007918@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/FC-4 Removed Files: .cvsignore Makefile branch sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:26:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:21 -0700 Subject: rpms/gsview/FC-2 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.3, NONE Message-ID: <200605241426.k4OEQNBr007859@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/FC-2 Removed Files: .cvsignore Makefile branch sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:26:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:28 -0700 Subject: rpms/gsview/FC-5 .cvsignore, 1.4, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.4, NONE Message-ID: <200605241426.k4OEQUK1007922@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/FC-5 Removed Files: .cvsignore Makefile branch sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:26:26 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:26:26 -0700 Subject: rpms/gsview/FC-3 .cvsignore, 1.3, NONE Makefile, 1.2, NONE branch, 1.1, NONE sources, 1.4, NONE Message-ID: <200605241426.k4OEQS8v007914@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7823/gsview/FC-3 Removed Files: .cvsignore Makefile branch sources Log Message: remove remaining remnants --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed May 24 14:45:14 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 07:45:14 -0700 Subject: rpms/qt4/devel qt4.spec,1.1,1.2 Message-ID: <200605241445.k4OEjGqJ008229@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8212 Modified Files: qt4.spec Log Message: * Wed May 24 2006 Rex Dieter 4.1.3-4 - move (most) %dir ownership (back) to main pkg Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4.spec 24 May 2006 14:06:14 -0000 1.1 +++ qt4.spec 24 May 2006 14:45:14 -0000 1.2 @@ -1,11 +1,8 @@ -# Currently under review for Fedora Extras at -# http://bugzilla.redhat.com/bugzilla/188180 - Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -60,7 +57,7 @@ BuildRequires: %{x_deps} %if %{mysql} -# mysql-devel < 4 build fails, not sure why... yet. -- Rex +# mysql-devel < 4 build fails on 4.1.3+, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") @@ -321,26 +318,24 @@ %{qtdir}/LICENSE.* /etc/ld.so.conf.d/* %dir %{qtdir} +%dir %{qtdir}/bin/ %dir %{qtdir}/%{_lib}/ %{qtdir}/%{_lib}/lib*.so.* %dir %{qtdir}/plugins/ -%{qtdir}/plugins/imageformats/ %{qtdir}/plugins/accessible/ +%{qtdir}/plugins/imageformats/ %{qtdir}/plugins/inputmethods/ +%dir %{qtdir}/plugins/sqldrivers/ %{qtdir}/translations/ %files config %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/bin/ %{qtdir}/bin/qt*config* %{_bindir}/qt*config* %{_datadir}/applications/*qtconfig*.desktop %files devel %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/bin/ %{qtdir}/bin/lrelease* %{qtdir}/bin/lupdate* %{qtdir}/bin/moc* @@ -360,9 +355,10 @@ %{qtdir}/include/ %{qtdir}/mkspecs/ %dir %{qtdir}/%{_lib} -%{qtdir}/%{_lib}/*.so -%{qtdir}/%{_lib}/*.a -%{qtdir}/%{_lib}/*.prl +%{qtdir}/%{_lib}/lib*.so +# 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a +%{qtdir}/%{_lib}/lib*.a +%{qtdir}/%{_lib}/lib*.prl %{qtdir}/phrasebooks/ %{qtdir}/%{_lib}/*.pc %{_libdir}/pkgconfig/*.pc @@ -382,8 +378,6 @@ %defattr(-,root,root,-) %dir %{qt_docdir}/ %{qt_docdir}/html -%dir %{qtdir} -%dir %{qtdir}/bin/ %{qtdir}/doc %{qtdir}/demos/ %{qtdir}/examples/ @@ -399,41 +393,32 @@ %if %{odbc} %files odbc %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlodbc* %endif %if %{psql} %files postgresql %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlpsql* %endif %if %{mysql} %files mysql %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlmysql* %endif %if %{sqlite} %files sqlite %defattr(-,root,root,-) -%dir %{qtdir} -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers %{qtdir}/plugins/sqldrivers/libqsqlite* %endif %changelog +* Wed May 24 2006 Rex Dieter 4.1.3-4 +- move (most) %%dir ownership (back) to main pkg + * Sun May 21 2006 Rex Dieter 4.1.3-3 - fix %%mysql_libs macro From fedora-extras-commits at redhat.com Wed May 24 15:15:22 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 24 May 2006 08:15:22 -0700 Subject: mock mock.py,1.50,1.51 Message-ID: <200605241515.k4OFFMjc010700@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10669 Modified Files: mock.py Log Message: check in Michael Brown's lovely autocache creation patch. Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- mock.py 17 May 2006 15:12:36 -0000 1.50 +++ mock.py 24 May 2006 15:15:19 -0000 1.51 @@ -24,6 +24,8 @@ import shutil import types import grp +import stat +import time from exceptions import Exception from optparse import OptionParser @@ -112,6 +114,8 @@ self.rootdir = os.path.join(self.basedir, 'root') self.homedir = self.config['chroothome'] self.builddir = os.path.join(self.homedir, 'build') + self.cache_file = os.path.join(self.config['basedir'], + self.config['cache_topdir'], self.config['root'] + self.config['cache_ext']) if not self.config.has_key('resultdir'): self.resultdir = os.path.join(self.basedir, 'result') else: @@ -202,20 +206,50 @@ self.log(curstate) else: return self._state + + def unpack(self): + self.state('unpack cache') + cmd = '%s %s %s' % (self.config['unpack_cmd'], self.basedir, self.cache_file) + self.do(cmd) + + def pack(self): + self.state('create cache') + self._ensure_dir(os.path.join(self.config['basedir'], self.config['cache_topdir'])) + cmd = '%s %s %s root' % (self.config['pack_cmd'], self.basedir, self.cache_file) + self.do(cmd) def prep(self): self.state("prep") self.log("This may take a while") - - self._prep_install() - if self.config['clean']: - cmd = '%s' % self.config['chroot_setup_cmd'] - else: - cmd = 'update' + create_cache=0 + if self.config['use_cache']: + cache_exists = os.path.exists( self.cache_file ) + if cache_exists: + cache_mtime = os.stat(self.cache_file)[stat.ST_MTIME] + cache_age_days = (time.time() - cache_mtime) / (60 * 60 * 24) + if cache_age_days > self.config['max_cache_age_days']: + self.config["rebuild_cache"] = True + + if cache_exists and not self.config['rebuild_cache']: + if self.config['clean']: + self.unpack() + cmd = 'update' + else: + cmd = '%s' % self.config['chroot_setup_cmd'] + create_cache = 1 + else: + if self.config['clean']: + cmd = '%s' % self.config['chroot_setup_cmd'] + else: + cmd = 'update' + + self._prep_install() self.yum(cmd) self._prep_build() - + + if create_cache: + self.pack() def yum(self, cmd): """use yum to install packages/package groups into the chroot""" @@ -588,6 +622,10 @@ fo.close() # write in yum.conf into chroot + if os.path.exists( os.path.join(self.rootdir, 'etc', 'yum.conf')): + cmd = "chown %s.%s /etc/yum.conf" % (self.config['chrootuid'], + self.config['chrootgid']) + self.do_chroot(cmd, fatal = True) yumconf = os.path.join(self.rootdir, 'etc', 'yum.conf') yumconf_fo = open(yumconf, 'w') yumconf_content = self.config['yum.conf'] @@ -598,8 +636,8 @@ for key in filedict: # ensure permisssions if os.path.exists( "%s%s" % (self.rootdir, key) ): - cmd = "chown %s.%s %s" % (self.config['chrootuser'], - self.config['chrootgroup'], "%s" % key) + cmd = "chown %s.%s %s" % (self.config['chrootuid'], + self.config['chrootgid'], "%s" % key) self.do_chroot(cmd, fatal = True) # write file @@ -609,11 +647,39 @@ fo.close() def _make_our_user(self): + if not os.path.exists(os.path.join(self.rootdir, 'usr/sbin/useradd')): + raise RootError, "Could not find useradd in chroot, maybe the install failed?" # should check if the user exists first # make the buildusers/groups + need_add_user = 0 if not os.path.exists(self.rootdir + self.homedir): - if not os.path.exists(os.path.join(self.rootdir, 'usr/sbin/useradd')): - raise RootError, "Could not find useradd in chroot, maybe the install failed?" + need_add_user = 1 + else: + # check for the following conditions: + # -- using cache and current user is different from original cache creator + # -- using --no-clean and current user is different from original creator + curruid = self.config['chrootuid'] + chrootuid = None + passwd = os.path.join(self.rootdir, 'etc', 'passwd') + + # find UID used to set up buildroot + fd = open( passwd, "r" ) + while 1: + line = fd.readline() + if line == "": break + if line.startswith(self.config["chrootuser"]): + chrootuid = int(line.split(":")[2]) + + # do fixups if they are different + # if uid is different, assume we need to fix gid also + if chrootuid is not None and curruid != chrootuid: + need_add_user = 1 + self.do_chroot('/usr/sbin/userdel -r %s' % self.config["chrootuser"], fatal = False) + self.do_chroot('/usr/sbin/groupdel %s' % self.config["chrootgroup"], fatal = False) + self.do_chroot('chown -R %s.%s %s' % (self.config["chrootuid"], self.config["chrootgid"], self.config["chroothome"]), fatal = False) + # may need a few other chown here if there are other files that have to be edited + + if need_add_user: cmd = '/usr/sbin/useradd -m -u %s -d %s %s' % (self.config['chrootuid'], self.homedir, self.config['chrootuser']) self.do_chroot(cmd, fatal = True) @@ -669,8 +735,8 @@ parser.add_option("-r", action="store", type="string", dest="chroot", help="chroot name/config file name default: %default", default='default') - parser.add_option("--no-clean", action ="store_true", dest="dirty", - help="do not clean chroot before building") + parser.add_option("--no-clean", action ="store_false", dest="clean", + help="do not clean chroot before building", default=True) parser.add_option("--arch", action ="store", dest="arch", default=None, help="target build arch") parser.add_option("--debug", action ="store_true", dest="debug", @@ -685,6 +751,10 @@ help="Change where config files are found") parser.add_option("--quiet", action ="store_true", dest="quiet", default=False, help="quiet down output") + parser.add_option("--autocache", action ="store_true", dest="use_cache", + default=False, help="Turn on build-root caching") + parser.add_option("--rebuildcache", action ="store_true", dest="rebuild_cache", + default=False, help="Force rebuild of build-root cache") return parser.parse_args() @@ -719,18 +789,27 @@ config_opts['files']['/etc/resolv.conf'] = "nameserver 192.168.1.1\n" config_opts['files']['/etc/hosts'] = "127.0.0.1 localhost localhost.localdomain\n" + # caching-related config options + config_opts['rebuild_cache'] = False + config_opts['use_cache'] = False + config_opts['pack_cmd'] = "/usr/sbin/mock-helper pack" + config_opts['unpack_cmd'] = "/usr/sbin/mock-helper unpack" + config_opts['cache_ext'] = ".tar.gz" + config_opts['cache_topdir'] = "root-cache" + config_opts['max_cache_age_days'] = 15 + def set_config_opts_per_cmdline(config_opts, options): # do some other options and stuff if options.arch: config_opts['target_arch'] = options.arch - if options.dirty: - config_opts['clean'] = False - else: - config_opts['clean'] = True - + config_opts['clean'] = options.clean config_opts['debug'] = options.debug config_opts['quiet'] = options.quiet + config_opts['use_cache'] = options.use_cache + config_opts['rebuild_cache'] = options.rebuild_cache + if config_opts['rebuild_cache']: + config_opts['use_cache'] = True if options.resultdir: config_opts['resultdir'] = options.resultdir From fedora-extras-commits at redhat.com Wed May 24 15:15:22 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 24 May 2006 08:15:22 -0700 Subject: mock/src mock-helper.c,1.8,1.9 Message-ID: <200605241515.k4OFFMLS010706@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10669/src Modified Files: mock-helper.c Log Message: check in Michael Brown's lovely autocache creation patch. Index: mock-helper.c =================================================================== RCS file: /cvs/fedora/mock/src/mock-helper.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mock-helper.c 12 May 2006 20:57:57 -0000 1.8 +++ mock-helper.c 24 May 2006 15:15:20 -0000 1.9 @@ -14,6 +14,8 @@ #include #include #include +#include +#include #ifdef USE_SELINUX #include @@ -341,6 +343,84 @@ do_command ("/bin/mknod", &(argv[1]), 0); } +void +do_unpack(int argc, char *argv[]) +{ + char *new_argv[5]; + + if (argc < 4) + error ("not enough arguments"); + + check_dir_allowed (rootsdir, argv[2]); + + if (chdir(argv[2]) != 0) + error ("could not change dir"); + + new_argv[0] = "tar"; + new_argv[1] = "--same-owner"; + + /* select compression */ + if (strstr(argv[3], ".bz2")) + new_argv[2] = "-jxpf"; + else if (strstr(argv[3], ".gz")) + new_argv[2] = "-zxpf"; + else + new_argv[2] = "-xpf"; + + new_argv[3] = argv[3]; + new_argv[4] = NULL; + + do_command("/bin/tar", new_argv, 0); +} + + +void +do_pack(int argc, char *argv[]) +{ + char *new_argv[6]; + char *cache_dir = 0; + char *argv_copy = 0; + struct group *gr = 0; + + if (argc < 5) + error ("not enough arguments"); + + check_dir_allowed (rootsdir, argv[2]); + + if (chdir(argv[2]) != 0) + error ("could not change dir"); + + /* create root-cache dir with appropriate perms */ + gr = getgrnam("mock"); + argv_copy = strdup(argv[3]); + cache_dir = dirname(argv_copy); + + check_dir_allowed (rootsdir, cache_dir); + + mkdir(cache_dir, 0750); + if (gr) + chown(cache_dir, 0, gr->gr_gid); + free(argv_copy); + argv_copy = 0; + + new_argv[0] = "tar"; + new_argv[1] = "--one-file-system"; + + /* select compression */ + if (strstr(argv[3], ".bz2")) + new_argv[2] = "-jlcf"; + else if (strstr(argv[3], ".gz")) + new_argv[2] = "-zlcf"; + else + new_argv[2] = "-clf"; + + new_argv[3] = argv[3]; + new_argv[4] = argv[4]; + new_argv[5] = NULL; + + do_command("/bin/tar", new_argv, 0); +} + int main (int argc, char *argv[]) { @@ -363,6 +443,10 @@ do_mknod (argc, argv); else if (strncmp ("yum", argv[1], 3) == 0) do_yum (argc, argv); + else if (strncmp ("unpack", argv[1], 6) == 0) + do_unpack (argc, argv); + else if (strncmp ("pack", argv[1], 4) == 0) + do_pack (argc, argv); else { error ("Command %s not recognized !\n", argv[1]); From fedora-extras-commits at redhat.com Wed May 24 16:57:44 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 24 May 2006 09:57:44 -0700 Subject: fedora-security/audit fe4,1.30,1.31 fe5,1.30,1.31 Message-ID: <200605241657.k4OGviA1013611@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13591 Modified Files: fe4 fe5 Log Message: Add netpanzer issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- fe4 21 May 2006 06:38:53 -0000 1.30 +++ fe4 24 May 2006 16:57:42 -0000 1.31 @@ -2,6 +2,7 @@ ** are items that need attention +none VULNERABLE (netpanzer) bz#192983 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- fe5 23 May 2006 14:29:04 -0000 1.30 +++ fe5 24 May 2006 16:57:42 -0000 1.31 @@ -2,6 +2,7 @@ ** are items that need attention +none VULNERABLE (netpanzer) bz#192983 CVE-2006-2453 VULNERABLE (dia) bz#192830 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2480 patch (dia, fixed 0.95-2) bz#192535 From fedora-extras-commits at redhat.com Wed May 24 17:21:29 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 24 May 2006 10:21:29 -0700 Subject: fedora-security/audit fe4,1.31,1.32 fe5,1.31,1.32 Message-ID: <200605241721.k4OHLTLN016162@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16142 Modified Files: fe4 fe5 Log Message: Add another netpanzer issue. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fe4 24 May 2006 16:57:42 -0000 1.31 +++ fe4 24 May 2006 17:21:26 -0000 1.32 @@ -81,4 +81,5 @@ CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) CVE-2005-4803 version (graphviz, fixed 2.2.1) +CVE-2005-2295 VULNERABLE (netpanzer) bz#192990 CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.26-3) bz#191351 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fe5 24 May 2006 16:57:42 -0000 1.31 +++ fe5 24 May 2006 17:21:26 -0000 1.32 @@ -85,4 +85,5 @@ CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507 CVE-2006-0042 version (libapreq2, fixed 2.0.7) CVE-2005-4803 version (graphviz, fixed 2.2.1) +CVE-2005-2295 VULNERABLE (netpanzer) bz#192990 CVE-2005-0106 backport (perl-Net-SSLeay, fixed 1.30-3) perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch From fedora-extras-commits at redhat.com Wed May 24 17:56:51 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 24 May 2006 10:56:51 -0700 Subject: kmodtool kmodtool,1.6,1.7 Message-ID: <200605241756.k4OHupgs016883@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/kmodtool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16825 Modified Files: kmodtool Log Message: Recognize PAE (FC6) and largesmp (RHEL4) kernels. sed gave me a headache, so this change also gets rid of it and uses bash's (>= 2.x required) parameter expansion instead. Additionally, get_variant() is now implemented using get_verrel()'s results so things should stay better in sync. Index: kmodtool =================================================================== RCS file: /cvs/fedora/kmodtool/kmodtool,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kmodtool 21 May 2006 13:24:48 -0000 1.6 +++ kmodtool 24 May 2006 17:56:49 -0000 1.7 @@ -23,9 +23,11 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +shopt -s extglob + myprog="kmodtool" -myver="0.10.9" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' +myver="0.10.10" +knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)) kmod_name= kver= verrel= @@ -33,24 +35,27 @@ get_verrel () { - verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" + verrel=${1:-$(uname -r)} + verrel=${verrel%%$knownvariants} } print_verrel () { - get_verrel $@ || return $? + get_verrel $@ echo "${verrel}" } get_variant () { - variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" - [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' + get_verrel $@ + variant=${1:-$(uname -r)} + variant=${variant##$verrel} + variant=${variant:-'""'} } print_variant () { - get_variant $@ || return $? + get_variant $@ echo "${variant}" } From fedora-extras-commits at redhat.com Wed May 24 18:35:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 11:35:52 -0700 Subject: rpms/qt4/FC-5 .cvsignore,1.2,1.3 Message-ID: <200605241835.k4OIZsjd019738@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19721 Modified Files: .cvsignore Log Message: +clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2006 14:06:14 -0000 1.2 +++ .cvsignore 24 May 2006 18:35:52 -0000 1.3 @@ -1 +1,2 @@ +clog qt-x11-opensource-src-4.1.3.tar.gz From fedora-extras-commits at redhat.com Wed May 24 18:36:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 11:36:20 -0700 Subject: rpms/qt4/FC-5 qt4.spec,1.2,1.3 Message-ID: <200605241836.k4OIaM5G019799@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777 Modified Files: qt4.spec Log Message: micro respin Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt4.spec 24 May 2006 14:45:14 -0000 1.2 +++ qt4.spec 24 May 2006 18:36:20 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 4%{?dist} +Release: 4%{?dist}.1 License: GPL/QPL Group: System Environment/Libraries From fedora-extras-commits at redhat.com Wed May 24 18:36:48 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 24 May 2006 11:36:48 -0700 Subject: rpms/qt4/FC-4 .cvsignore,1.2,1.3 Message-ID: <200605241836.k4OIaoSf019862@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19845 Modified Files: .cvsignore Log Message: +clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2006 14:06:14 -0000 1.2 +++ .cvsignore 24 May 2006 18:36:48 -0000 1.3 @@ -1 +1,2 @@ +clog qt-x11-opensource-src-4.1.3.tar.gz From fedora-extras-commits at redhat.com Wed May 24 18:47:59 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 11:47:59 -0700 Subject: rpms/multitail/devel .cvsignore, 1.6, 1.7 multitail.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200605241848.k4OIm1EJ020007@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19986 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 4.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Apr 2006 20:36:14 -0000 1.6 +++ .cvsignore 24 May 2006 18:47:59 -0000 1.7 @@ -1 +1 @@ -multitail-4.0.3.tgz +multitail-4.0.4.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- multitail.spec 19 Apr 2006 20:36:14 -0000 1.5 +++ multitail.spec 24 May 2006 18:47:59 -0000 1.6 @@ -1,5 +1,5 @@ Name: multitail -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -17,7 +17,7 @@ matching the wildcard has a more recent modification date, it will automatically switch to that file. That way you can, for example, monitor a complete directory of files. Merging of 2 or even more -logfiles is possible. +logfiles is possible. It can also use colors while displaying the logfiles (through regular expressions), for faster recognition of what is important and what not. Multitail can also filter lines (again with regular expressions) and @@ -56,6 +56,9 @@ %changelog +* Wed May 24 2006 Folkert van Heuesden - 4.0.4-1 +- Updated to release 4.0.4. + * Wed Apr 19 2006 Folkert van Heuesden - 4.0.3-1 - Updated to release 4.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Apr 2006 20:36:14 -0000 1.6 +++ sources 24 May 2006 18:47:59 -0000 1.7 @@ -1 +1 @@ -b6017e19aa7cf7e2b4fddd75a596a1a7 multitail-4.0.3.tgz +86d675d8da0bac430f5800cbf0cbdd46 multitail-4.0.4.tgz From fedora-extras-commits at redhat.com Wed May 24 19:26:56 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 24 May 2006 12:26:56 -0700 Subject: devel/xboard xboard-4.2.7-nostrip.patch, NONE, 1.1 xboard.spec, 1.5, 1.6 Message-ID: <200605241926.k4OJQwcY022689@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/xboard In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22666 Modified Files: xboard.spec Added Files: xboard-4.2.7-nostrip.patch Log Message: fix debuginfo xboard-4.2.7-nostrip.patch: --- NEW FILE xboard-4.2.7-nostrip.patch --- --- xboard-4.2.7/Makefile.in.orig 2006-05-24 09:52:45.000000000 -0400 +++ xboard-4.2.7/Makefile.in 2006-05-24 09:53:08.000000000 -0400 @@ -63,8 +63,8 @@ all: default pseudosource info FAQ html dvi ps install: installdirs default - $(INSTALL_PROGRAM) -s xboard $(bindir)/xboard - $(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm + $(INSTALL_PROGRAM) xboard $(bindir)/xboard + $(INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm $(INSTALL_PROGRAM) cmail $(bindir)/cmail $(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext) Index: xboard.spec =================================================================== RCS file: /cvs/extras/devel/xboard/xboard.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xboard.spec 15 Feb 2006 15:31:34 -0000 1.5 +++ xboard.spec 24 May 2006 19:26:56 -0000 1.6 @@ -1,13 +1,14 @@ Summary: An X Window System graphical chessboard Name: xboard Version: 4.2.7 -Release: 12%{?dist} +Release: 13%{?dist} Group: Amusements/Games URL: http://www.tim-mann.org/xboard.html Source: ftp://ftp.gnu.org/pub/gnu/xboard/xboard-%{version}.tar.gz Source1: chess.png Source2: xboard.desktop Patch1: xboard-4.2.4-rh1.patch +Patch2: xboard-4.2.7-nostrip.patch Requires: chessprogram License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,6 +30,7 @@ %prep %setup -q %patch1 -p1 -b .rh1 +%patch2 -p1 -b .nostrip %build %configure @@ -79,6 +81,9 @@ %{_datadir}/applications/* %changelog +* Wed May 24 2006 Chris Ricker 4.2.7-13 +- correct debuginfo package generation (bz#192608) + * Wed Feb 15 2006 Chris Ricker 4.2.7-12 - Update for modular X From fedora-extras-commits at redhat.com Wed May 24 19:38:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:38:01 -0700 Subject: rpms/perl-Module-ScanDeps/FC-4 .cvsignore, 1.2, 1.3 perl-Module-ScanDeps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605241938.k4OJc3qA022917@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22864/FC-4 Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Update to 0.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 May 2006 21:14:51 -0000 1.2 +++ .cvsignore 24 May 2006 19:38:01 -0000 1.3 @@ -1 +1 @@ -Module-ScanDeps-0.59.tar.gz +Module-ScanDeps-0.60.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-4/perl-Module-ScanDeps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-ScanDeps.spec 7 May 2006 21:25:39 -0000 1.2 +++ perl-Module-ScanDeps.spec 24 May 2006 19:38:01 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Module-ScanDeps -Version: 0.59 -Release: 2%{?dist} +Version: 0.60 +Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 0.60-1 +- Update to 0.60. + * Sun May 7 2006 Jose Pedro Oliveira - 0.59-2 - Source URL corrected (failed to detect the maintainer change). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 May 2006 21:14:51 -0000 1.2 +++ sources 24 May 2006 19:38:01 -0000 1.3 @@ -1 +1 @@ -6e20e368ff101d8bc8f31eaa2d81c264 Module-ScanDeps-0.59.tar.gz +fb809a3a2964a880a584e3e10ce3a4bb Module-ScanDeps-0.60.tar.gz From fedora-extras-commits at redhat.com Wed May 24 19:38:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:38:02 -0700 Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.2, 1.3 perl-Module-ScanDeps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605241938.k4OJc40a022923@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22864/FC-5 Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Update to 0.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 May 2006 21:14:51 -0000 1.2 +++ .cvsignore 24 May 2006 19:38:02 -0000 1.3 @@ -1 +1 @@ -Module-ScanDeps-0.59.tar.gz +Module-ScanDeps-0.60.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/perl-Module-ScanDeps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-ScanDeps.spec 7 May 2006 21:25:39 -0000 1.2 +++ perl-Module-ScanDeps.spec 24 May 2006 19:38:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Module-ScanDeps -Version: 0.59 -Release: 2%{?dist} +Version: 0.60 +Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 0.60-1 +- Update to 0.60. + * Sun May 7 2006 Jose Pedro Oliveira - 0.59-2 - Source URL corrected (failed to detect the maintainer change). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 May 2006 21:14:51 -0000 1.2 +++ sources 24 May 2006 19:38:02 -0000 1.3 @@ -1 +1 @@ -6e20e368ff101d8bc8f31eaa2d81c264 Module-ScanDeps-0.59.tar.gz +fb809a3a2964a880a584e3e10ce3a4bb Module-ScanDeps-0.60.tar.gz From fedora-extras-commits at redhat.com Wed May 24 19:38:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:38:03 -0700 Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.2, 1.3 perl-Module-ScanDeps.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605241938.k4OJc5PB022929@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-ScanDeps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22864/devel Modified Files: .cvsignore perl-Module-ScanDeps.spec sources Log Message: Update to 0.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 May 2006 21:14:51 -0000 1.2 +++ .cvsignore 24 May 2006 19:38:02 -0000 1.3 @@ -1 +1 @@ -Module-ScanDeps-0.59.tar.gz +Module-ScanDeps-0.60.tar.gz Index: perl-Module-ScanDeps.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-ScanDeps.spec 7 May 2006 21:25:39 -0000 1.2 +++ perl-Module-ScanDeps.spec 24 May 2006 19:38:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Module-ScanDeps -Version: 0.59 -Release: 2%{?dist} +Version: 0.60 +Release: 1%{?dist} Summary: Recursively scan Perl code for dependencies Group: Development/Libraries @@ -54,6 +54,9 @@ %changelog +* Wed May 24 2006 Jose Pedro Oliveira - 0.60-1 +- Update to 0.60. + * Sun May 7 2006 Jose Pedro Oliveira - 0.59-2 - Source URL corrected (failed to detect the maintainer change). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 May 2006 21:14:51 -0000 1.2 +++ sources 24 May 2006 19:38:02 -0000 1.3 @@ -1 +1 @@ -6e20e368ff101d8bc8f31eaa2d81c264 Module-ScanDeps-0.59.tar.gz +fb809a3a2964a880a584e3e10ce3a4bb Module-ScanDeps-0.60.tar.gz From fedora-extras-commits at redhat.com Wed May 24 19:52:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:52:01 -0700 Subject: rpms/multitail/FC-4 .cvsignore, 1.5, 1.6 multitail.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200605241952.k4OJq3dW023216@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23179/FC-4 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 4.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Apr 2006 20:49:21 -0000 1.5 +++ .cvsignore 24 May 2006 19:52:00 -0000 1.6 @@ -1 +1 @@ -multitail-4.0.3.tgz +multitail-4.0.4.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/multitail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- multitail.spec 19 Apr 2006 20:49:21 -0000 1.4 +++ multitail.spec 24 May 2006 19:52:00 -0000 1.5 @@ -1,5 +1,5 @@ Name: multitail -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -17,7 +17,7 @@ matching the wildcard has a more recent modification date, it will automatically switch to that file. That way you can, for example, monitor a complete directory of files. Merging of 2 or even more -logfiles is possible. +logfiles is possible. It can also use colors while displaying the logfiles (through regular expressions), for faster recognition of what is important and what not. Multitail can also filter lines (again with regular expressions) and @@ -56,6 +56,9 @@ %changelog +* Wed May 24 2006 Folkert van Heuesden - 4.0.4-1 +- Updated to release 4.0.4. + * Wed Apr 19 2006 Folkert van Heuesden - 4.0.3-1 - Updated to release 4.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Apr 2006 20:49:21 -0000 1.5 +++ sources 24 May 2006 19:52:00 -0000 1.6 @@ -1 +1 @@ -b6017e19aa7cf7e2b4fddd75a596a1a7 multitail-4.0.3.tgz +86d675d8da0bac430f5800cbf0cbdd46 multitail-4.0.4.tgz From fedora-extras-commits at redhat.com Wed May 24 19:52:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 24 May 2006 12:52:01 -0700 Subject: rpms/multitail/FC-5 .cvsignore, 1.5, 1.6 multitail.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200605241952.k4OJq34c023222@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23179/FC-5 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 4.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Apr 2006 20:49:21 -0000 1.5 +++ .cvsignore 24 May 2006 19:52:01 -0000 1.6 @@ -1 +1 @@ -multitail-4.0.3.tgz +multitail-4.0.4.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/multitail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- multitail.spec 19 Apr 2006 20:49:21 -0000 1.4 +++ multitail.spec 24 May 2006 19:52:01 -0000 1.5 @@ -1,5 +1,5 @@ Name: multitail -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -17,7 +17,7 @@ matching the wildcard has a more recent modification date, it will automatically switch to that file. That way you can, for example, monitor a complete directory of files. Merging of 2 or even more -logfiles is possible. +logfiles is possible. It can also use colors while displaying the logfiles (through regular expressions), for faster recognition of what is important and what not. Multitail can also filter lines (again with regular expressions) and @@ -56,6 +56,9 @@ %changelog +* Wed May 24 2006 Folkert van Heuesden - 4.0.4-1 +- Updated to release 4.0.4. + * Wed Apr 19 2006 Folkert van Heuesden - 4.0.3-1 - Updated to release 4.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Apr 2006 20:49:21 -0000 1.5 +++ sources 24 May 2006 19:52:01 -0000 1.6 @@ -1 +1 @@ -b6017e19aa7cf7e2b4fddd75a596a1a7 multitail-4.0.3.tgz +86d675d8da0bac430f5800cbf0cbdd46 multitail-4.0.4.tgz From fedora-extras-commits at redhat.com Wed May 24 19:54:49 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 24 May 2006 12:54:49 -0700 Subject: fedora-release fedora-development.repo,1.6,1.7 Message-ID: <200605241954.k4OJsnY1023354@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23336 Modified Files: fedora-development.repo Log Message: Point to the new layout. Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedora-development.repo 29 Mar 2006 23:31:22 -0000 1.6 +++ fedora-development.repo 24 May 2006 19:54:47 -0000 1.7 @@ -25,7 +25,7 @@ [development] name=Fedora Core - Development -#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/os/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide enabled=1 gpgcheck=0 @@ -39,7 +39,7 @@ [development-source] name=Fedora Core - Development - Source -#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide-source enabled=0 gpgcheck=0 From fedora-extras-commits at redhat.com Wed May 24 19:58:55 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 24 May 2006 12:58:55 -0700 Subject: fedora-release fedora-release.spec,1.23,1.24 Message-ID: <200605241958.k4OJwtof023413@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23393 Modified Files: fedora-release.spec Log Message: Remove duplicate web files. Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fedora-release.spec 9 Mar 2006 20:54:31 -0000 1.23 +++ fedora-release.spec 24 May 2006 19:58:53 -0000 1.24 @@ -111,7 +111,6 @@ %dir /etc/yum.repos.d %config(noreplace) /etc/sysconfig/rhn/sources %config(noreplace) /etc/yum.repos.d/* -%doc R* stylesheet-images figs *.css %doc eula.txt GPL %doc about %config %attr(0644,root,root) /etc/issue From fedora-extras-commits at redhat.com Wed May 24 20:29:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 24 May 2006 13:29:31 -0700 Subject: extras-buildsys/utils extras-push-new,1.16,1.17 Message-ID: <200605242029.k4OKTVjW026026@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26008 Modified Files: extras-push-new Log Message: insert date in mail subject line Index: extras-push-new =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- extras-push-new 23 May 2006 17:06:47 -0000 1.16 +++ extras-push-new 24 May 2006 20:29:29 -0000 1.17 @@ -447,6 +447,7 @@ # ==================================================================== +import datetime import smtplib from email.MIMEText import MIMEText @@ -468,7 +469,7 @@ body += mail_footer msg = MIMEText(body) - subject = '%s Package Build Report' % (project_hr) + subject = '%s Package Build Report %s' % (project_hr,datetime.date.today()) msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to From fedora-extras-commits at redhat.com Wed May 24 20:40:55 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 13:40:55 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.10,1.11 Message-ID: <200605242040.k4OKevcl026248@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26185 Modified Files: emacs-auctex.spec Log Message: Revert change which created tetex-preview subpackage Main package both Provides and Obsolotes tetex-preview See bug 192960 Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- emacs-auctex.spec 21 May 2006 23:02:49 -0000 1.10 +++ emacs-auctex.spec 24 May 2006 20:40:55 -0000 1.11 @@ -1,83 +1,47 @@ -%define startupdir %{_datadir}/emacs/site-lisp/site-start.d/ -%define startupfile %{startupdir}/auctex-init.el +%define startupdir %{_datadir}/emacs/site-lisp/site-start.d/ +%define startupfile %{startupdir}/auctex-init.el -%define textree %{_datadir}/texmf/tex/ -%define previewdir %{textree}/latex/preview/ - -Summary: Enhanced TeX modes for Emacsen -Name: emacs-auctex -Version: 11.82 -Release: 10%{?dist} -License: GPL -Group: Applications/Editors -URL: http://www.gnu.org/software/auctex/ -Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: auctex -Provides: auctex -Conflicts: emacspeak < 18 -Requires: emacs emacs-common ghostscript -Requires: tetex-preview = %{version} -Requires: /sbin/install-info -BuildRequires: emacs tetex-latex texinfo ghostscript +Summary: Enhanced TeX modes for Emacsen +Name: emacs-auctex +Version: 11.82 +Release: 11%{?dist} +License: GPL +Group: Applications/Editors +URL: http://www.gnu.org/software/auctex/ +Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: auctex +Conflicts: emacspeak < 18 +Provides: auctex +Requires: emacs emacs-common ghostscript +Requires: tetex tetex-latex tetex-dvips tetex-xdvi +BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript + +# To deal with nasty bug 192960, don't export tetex-latex sub-package, and: +Obsolotes: tetex-preview +Provides: tetex-preview %description -AUCTeX is an extensible package that supports writing and formatting TeX files -for most variants of Emacs. +AUCTeX is an extensible package that supports writing and formatting +TeX files for most variants of Emacs. -AUCTeX supports many different TeX macro packages, including AMS-TeX, LaTeX, -Texinfo and basic support for ConTeXt. Documentation can be found under -/usr/share/doc, e.g. the reference card (tex-ref.pdf) and the FAQ. The AUCTeX -manual is available in Emacs info (C-h i d m AUCTeX RET). On the AUCTeX home -page, we provide manuals in various formats. - -AUCTeX includes preview-latex support which makes LaTeX a tightly integrated -component of your editing workflow by visualizing selected source chunks (such -as single formulas or graphics) directly as images in the source buffer. +AUCTeX supports many different TeX macro packages, including AMS-TeX, +LaTeX, Texinfo and basic support for ConTeXt. Documentation can be +found under /usr/share/doc, e.g. the reference card (tex-ref.pdf) and +the FAQ. The AUCTeX manual is available in Emacs info (C-h i d m +AUCTeX RET). On the AUCTeX home page, we provide manuals in various +formats. This package is for GNU Emacs. -%package el -Summary: Elisp source files for %{name} -Group: Applications/Editors -Requires: %{name} = %{version} - -%description el -This package contains the source Elisp files for AUCTeX for Emacs. - -%package -n tetex-preview -Summary: Preview style files for LaTeX -Group: Applications/Publishing -Requires: tetex-latex tetex-fonts ghostscript - -%description -n tetex-preview -The preview package for LaTeX allows for the processing of selected parts of a -LaTeX input file. This package extracts indicated pieces from a source file -(typically displayed equations, figures and graphics) and typesets with their -base point at the (1in,1in) magic location, shipping out the individual pieces -on separate pages without any page markup. You can produce either DVI or PDF -files, and options exist that will set the page size separately for each page. -In that manner, further processing (as with Ghostscript or dvipng) will be able -to work in a single pass. - -The main purpose of this package is the extraction of certain environments (most -notably displayed formulas) from La TeX sources as graphics. This works with DVI -files postprocessed by either Dvips and Ghostscript or dvipng, but it also works -when you are using PDFTeX for generating PDF files (usually also postprocessed -by Ghostscript). - -The tetex-preview package is generated from the AUCTeX package for Emacs. - %prep %setup -q -n auctex-%{version} %build -mkdir -p %{buildroot}%{previewdir} +mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview -%configure --with-emacs \ - --with-texmf-dir=%{buildroot}%{textree} \ - --with-tex-dir=%{buildroot}%{previewdir} +%configure --with-emacs --without-texmf-dir make @@ -87,11 +51,11 @@ %install rm -rf %{buildroot} +mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}} +%makeinstall mkdir -p %{buildroot}%{startupdir} -%makeinstall -# Startup file. cat < %{buildroot}%{startupfile} ;; This enables AUCTeX globally. ;; See (info "(auctex)Introduction") on how to disable AUCTeX. @@ -118,12 +82,6 @@ /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || : fi -%post -n tetex-preview -/usr/bin/texhash > /dev/null 2>&1 || : - -%postun -n tetex-preview -/usr/bin/texhash > /dev/null 2>&1 || : - %files %defattr(-,root,root,-) %doc RELEASE COPYING README TODO FAQ CHANGES @@ -131,24 +89,14 @@ %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{startupdir} -%{_datadir}/emacs/site-lisp/auctex/*.elc -%{_datadir}/emacs/site-lisp/auctex/style/*.elc -%{_datadir}/emacs/site-lisp/auctex/.nosearch -%{_datadir}/emacs/site-lisp/auctex/style/.nosearch -%{_datadir}/emacs/site-lisp/auctex/images +%{_datadir}/emacs/site-lisp/auctex %{_datadir}/emacs/site-lisp/tex-site.el -%files -n tetex-preview -%defattr(-,root,root,-) -%{previewdir} -%{textree}/doc/latex/styles/preview.dvi - -%files el -%defattr(-,root,root,-) -%{_datadir}/emacs/site-lisp/auctex/*.el -%{_datadir}/emacs/site-lisp/auctex/style/*.el - %changelog +* Wed May 24 2006 Jonathan G. Underwood - 11.82-11 +- Revert change to create tetex-preview subpackage +- Main package obsolotes and Provides tetex-preview + * Thu May 18 2006 Jonathan Underwood - 11.82-9 - Split out tetex-preview subpackage - Split out source elisp files From fedora-extras-commits at redhat.com Wed May 24 20:43:30 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 13:43:30 -0700 Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.11,1.12 Message-ID: <200605242043.k4OKhWws026321@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26301 Modified Files: emacs-auctex.spec Log Message: Correct spelling mistake "Obsolotes" Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- emacs-auctex.spec 24 May 2006 20:40:55 -0000 1.11 +++ emacs-auctex.spec 24 May 2006 20:43:30 -0000 1.12 @@ -19,7 +19,7 @@ BuildRequires: emacs tetex tetex-latex tetex-dvips texinfo ghostscript # To deal with nasty bug 192960, don't export tetex-latex sub-package, and: -Obsolotes: tetex-preview +Obsoletes: tetex-preview Provides: tetex-preview %description From fedora-extras-commits at redhat.com Wed May 24 21:00:36 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 14:00:36 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.14,1.15 Message-ID: <200605242100.k4OL0cg2026618@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597 Modified Files: emacs-auctex.spec Log Message: Clean up whitespace for Ed. Bump version number. Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- emacs-auctex.spec 21 May 2006 22:50:41 -0000 1.14 +++ emacs-auctex.spec 24 May 2006 21:00:36 -0000 1.15 @@ -4,23 +4,23 @@ %define textree %{_datadir}/texmf/tex/ %define previewdir %{textree}/latex/preview/ -Summary: Enhanced TeX modes for Emacsen -Name: emacs-auctex -Version: 11.82 -Release: 10%{?dist} -License: GPL -Group: Applications/Editors -URL: http://www.gnu.org/software/auctex/ -Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: auctex -Provides: auctex -Conflicts: emacspeak < 18 -Requires: emacs emacs-common ghostscript -Requires: tetex-preview = %{version} -Requires: /sbin/install-info -BuildRequires: emacs tetex-latex texinfo ghostscript +Summary: Enhanced TeX modes for Emacsen +Name: emacs-auctex +Version: 11.82 +Release: 11%{?dist} +License: GPL +Group: Applications/Editors +URL: http://www.gnu.org/software/auctex/ +Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: auctex +Provides: auctex +Conflicts: emacspeak < 18 +Requires: emacs emacs-common ghostscript +Requires: tetex-preview = %{version} +Requires: /sbin/install-info +BuildRequires: emacs tetex-latex texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting TeX files @@ -149,6 +149,9 @@ %{_datadir}/emacs/site-lisp/auctex/style/*.el %changelog +* Wed May 24 2006 Jonathan Underwood - 11.82-11 +- Fix up whitespace for Ed. Bump version number. + * Thu May 18 2006 Jonathan Underwood - 11.82-9 - Split out tetex-preview subpackage - Split out source elisp files From fedora-extras-commits at redhat.com Wed May 24 21:02:30 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 14:02:30 -0700 Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.15,1.16 Message-ID: <200605242103.k4OL33j7028954@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28927 Modified Files: emacs-auctex.spec Log Message: Bump version number. Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- emacs-auctex.spec 24 May 2006 21:00:36 -0000 1.15 +++ emacs-auctex.spec 24 May 2006 21:02:30 -0000 1.16 @@ -7,7 +7,7 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.82 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ @@ -149,6 +149,9 @@ %{_datadir}/emacs/site-lisp/auctex/style/*.el %changelog +* Wed May 24 2006 Jonathan Underwood - 11.82-12 +- Bump version number. + * Wed May 24 2006 Jonathan Underwood - 11.82-11 - Fix up whitespace for Ed. Bump version number. From fedora-extras-commits at redhat.com Wed May 24 21:04:15 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Wed, 24 May 2006 14:04:15 -0700 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.12,1.13 Message-ID: <200605242104.k4OL4HbP029052@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29033 Modified Files: emacs-auctex.spec Log Message: Bump version number. Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- emacs-auctex.spec 21 May 2006 23:04:36 -0000 1.12 +++ emacs-auctex.spec 24 May 2006 21:04:15 -0000 1.13 @@ -4,23 +4,23 @@ %define textree %{_datadir}/texmf/tex/ %define previewdir %{textree}/latex/preview/ -Summary: Enhanced TeX modes for Emacsen -Name: emacs-auctex -Version: 11.82 -Release: 10%{?dist} -License: GPL -Group: Applications/Editors -URL: http://www.gnu.org/software/auctex/ -Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: auctex -Provides: auctex -Conflicts: emacspeak < 18 -Requires: emacs emacs-common ghostscript -Requires: tetex-preview = %{version} -Requires: /sbin/install-info -BuildRequires: emacs tetex-latex texinfo ghostscript +Summary: Enhanced TeX modes for Emacsen +Name: emacs-auctex +Version: 11.82 +Release: 12%{?dist} +License: GPL +Group: Applications/Editors +URL: http://www.gnu.org/software/auctex/ +Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: auctex +Provides: auctex +Conflicts: emacspeak < 18 +Requires: emacs emacs-common ghostscript +Requires: tetex-preview = %{version} +Requires: /sbin/install-info +BuildRequires: emacs tetex-latex texinfo ghostscript %description AUCTeX is an extensible package that supports writing and formatting TeX files @@ -149,6 +149,12 @@ %{_datadir}/emacs/site-lisp/auctex/style/*.el %changelog +* Wed May 24 2006 Jonathan Underwood - 11.82-12 +- Bump version number. + +* Wed May 24 2006 Jonathan Underwood - 11.82-11 +- Fix up whitespace for Ed. Bump version number. + * Thu May 18 2006 Jonathan Underwood - 11.82-9 - Split out tetex-preview subpackage - Split out source elisp files From fedora-extras-commits at redhat.com Wed May 24 21:11:47 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 24 May 2006 14:11:47 -0700 Subject: rpms/cernlib/devel cernlib.spec,1.31,1.32 paw.README,1.4,1.5 Message-ID: <200605242111.k4OLBn1u029196@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29177 Modified Files: cernlib.spec paw.README Log Message: * Wed May 24 2006 Patrice Dumas - 2005-21 - compile paw statically against the cernlib (paw binaries dynamically compiled against the cernlib are still shiped). Fix 192866 Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- cernlib.spec 17 May 2006 13:02:50 -0000 1.31 +++ cernlib.spec 24 May 2006 21:11:47 -0000 1.32 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 20%{?dist} +Release: 21%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -651,9 +651,17 @@ make install.shlib chmod a+x ../shlib/*.so.* -# Build paw +# Build dynamic paw cd $CERN_ROOT/build/pawlib make %{?_smp_mflags} install.bin +cd $CERN_ROOT/ +mv bin/pawX11 bin/pawX11.dynamic +mv bin/paw++ bin/paw++.dynamic +# Build static paw +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \ + `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11 +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \ + `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++ # Build packlib cd $CERN_ROOT/build/packlib @@ -768,6 +776,8 @@ %{_bindir}/paw++ %{_bindir}/paw %{_bindir}/pawX11 +%{_bindir}/pawX11.dynamic +%{_bindir}/paw++.dynamic %dir %{_libdir}/cernlib/%{version}/bin %{_libdir}/cernlib/%{version}/bin/pawX11 %doc paw.README @@ -830,6 +840,10 @@ %changelog +* Wed May 24 2006 Patrice Dumas - 2005-21 +- compile paw statically against the cernlib (paw binaries dynamically + compiled against the cernlib are still shiped). Fix 192866 + * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/devel/paw.README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- paw.README 11 Apr 2006 22:45:34 -0000 1.4 +++ paw.README 24 May 2006 21:11:47 -0000 1.5 @@ -41,11 +41,20 @@ to the beginning of them. -5) Shared libs +5) Shared and static libs -PAW is linked dynamically, therefore the pawlib used is selected by the +There are 2 sets of binaries installed. In one set the binaries are +statically linked with the cernlib (but still dynamically linked with +the other libraries), these are the binaries used in the default case +(pawX11 and paw++). + +The other binaries are compiled dynamically (pawX11.dynamic and +paw++.dynamic), therefore the pawlib used is selected by the /etc/ld.so.conf or $LD_LIBRARY_PATH settings. +The statically compiled one are used in the default case because +dynamically linked one fail on some 64 bit architectures. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by From fedora-extras-commits at redhat.com Wed May 24 21:38:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:38:51 -0700 Subject: rpms/perl-Test-Prereq/devel .cvsignore, 1.2, 1.3 perl-Test-Prereq.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605242138.k4OLcrqb029923@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29900 Modified Files: .cvsignore perl-Test-Prereq.spec sources Log Message: Update to 1.031. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2006 18:54:21 -0000 1.2 +++ .cvsignore 24 May 2006 21:38:51 -0000 1.3 @@ -1 +1 @@ -Test-Prereq-1.030.tar.gz +Test-Prereq-1.031.tar.gz Index: perl-Test-Prereq.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/perl-Test-Prereq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Prereq.spec 6 May 2006 18:54:21 -0000 1.1 +++ perl-Test-Prereq.spec 24 May 2006 21:38:51 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-Prereq -Version: 1.030 +Version: 1.031 Release: 1%{?dist} Summary: Check if Makefile.PL has the right pre-requisites License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 1.031-1 +- Update to 1.031. + * Fri Mar 24 2006 Steven Pritchard 1.030-1 - Specfile autogenerated by cpanspec 1.64. - Fix License. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2006 18:54:21 -0000 1.2 +++ sources 24 May 2006 21:38:51 -0000 1.3 @@ -1 +1 @@ -9acb4eb0737bb041e9ece8ad08e127c3 Test-Prereq-1.030.tar.gz +b628554b4483b01231f9d82c2a5157a8 Test-Prereq-1.031.tar.gz From fedora-extras-commits at redhat.com Wed May 24 21:40:32 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:40:32 -0700 Subject: rpms/perl-Test-Prereq/FC-5 .cvsignore, 1.2, 1.3 perl-Test-Prereq.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605242140.k4OLeYO1030082@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30059 Modified Files: .cvsignore perl-Test-Prereq.spec sources Log Message: Update to 1.031. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2006 18:54:21 -0000 1.2 +++ .cvsignore 24 May 2006 21:40:32 -0000 1.3 @@ -1 +1 @@ -Test-Prereq-1.030.tar.gz +Test-Prereq-1.031.tar.gz Index: perl-Test-Prereq.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-5/perl-Test-Prereq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Prereq.spec 6 May 2006 18:54:21 -0000 1.1 +++ perl-Test-Prereq.spec 24 May 2006 21:40:32 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-Prereq -Version: 1.030 +Version: 1.031 Release: 1%{?dist} Summary: Check if Makefile.PL has the right pre-requisites License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 1.031-1 +- Update to 1.031. + * Fri Mar 24 2006 Steven Pritchard 1.030-1 - Specfile autogenerated by cpanspec 1.64. - Fix License. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2006 18:54:21 -0000 1.2 +++ sources 24 May 2006 21:40:32 -0000 1.3 @@ -1 +1 @@ -9acb4eb0737bb041e9ece8ad08e127c3 Test-Prereq-1.030.tar.gz +b628554b4483b01231f9d82c2a5157a8 Test-Prereq-1.031.tar.gz From fedora-extras-commits at redhat.com Wed May 24 21:41:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:41:24 -0700 Subject: rpms/perl-Test-Prereq/FC-4 .cvsignore, 1.2, 1.3 perl-Test-Prereq.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605242141.k4OLfQmf030201@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Test-Prereq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30177 Modified Files: .cvsignore perl-Test-Prereq.spec sources Log Message: Update to 1.031. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2006 18:54:21 -0000 1.2 +++ .cvsignore 24 May 2006 21:41:24 -0000 1.3 @@ -1 +1 @@ -Test-Prereq-1.030.tar.gz +Test-Prereq-1.031.tar.gz Index: perl-Test-Prereq.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-4/perl-Test-Prereq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-Prereq.spec 6 May 2006 18:54:21 -0000 1.1 +++ perl-Test-Prereq.spec 24 May 2006 21:41:24 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Test-Prereq -Version: 1.030 +Version: 1.031 Release: 1%{?dist} Summary: Check if Makefile.PL has the right pre-requisites License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 1.031-1 +- Update to 1.031. + * Fri Mar 24 2006 Steven Pritchard 1.030-1 - Specfile autogenerated by cpanspec 1.64. - Fix License. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Prereq/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2006 18:54:21 -0000 1.2 +++ sources 24 May 2006 21:41:24 -0000 1.3 @@ -1 +1 @@ -9acb4eb0737bb041e9ece8ad08e127c3 Test-Prereq-1.030.tar.gz +b628554b4483b01231f9d82c2a5157a8 Test-Prereq-1.031.tar.gz From fedora-extras-commits at redhat.com Wed May 24 21:52:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:52:43 -0700 Subject: rpms/perl-Module-Info/FC-4 perl-Module-Info.spec,1.1,1.2 Message-ID: <200605242152.k4OLqjem030529@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484/FC-4 Modified Files: perl-Module-Info.spec Log Message: Rebuild. Index: perl-Module-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/FC-4/perl-Module-Info.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Module-Info.spec 6 May 2006 18:47:34 -0000 1.1 +++ perl-Module-Info.spec 24 May 2006 21:52:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Module-Info Version: 0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Information about Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.30-3 +- Rebuild. + * Sat May 06 2006 Steven Pritchard 0.30-2 - Add BR: perl(Test::Pod) and perl(version). - Add Requires: perl(version). From fedora-extras-commits at redhat.com Wed May 24 21:52:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:52:43 -0700 Subject: rpms/perl-Module-Info/FC-5 perl-Module-Info.spec,1.1,1.2 Message-ID: <200605242152.k4OLqjWF030533@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484/FC-5 Modified Files: perl-Module-Info.spec Log Message: Rebuild. Index: perl-Module-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/FC-5/perl-Module-Info.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Module-Info.spec 6 May 2006 18:47:34 -0000 1.1 +++ perl-Module-Info.spec 24 May 2006 21:52:43 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Module-Info Version: 0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Information about Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.30-3 +- Rebuild. + * Sat May 06 2006 Steven Pritchard 0.30-2 - Add BR: perl(Test::Pod) and perl(version). - Add Requires: perl(version). From fedora-extras-commits at redhat.com Wed May 24 21:52:44 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:52:44 -0700 Subject: rpms/perl-Module-Info/devel perl-Module-Info.spec,1.1,1.2 Message-ID: <200605242152.k4OLqkQC030537@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Module-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484/devel Modified Files: perl-Module-Info.spec Log Message: Rebuild. Index: perl-Module-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Info/devel/perl-Module-Info.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Module-Info.spec 6 May 2006 18:47:34 -0000 1.1 +++ perl-Module-Info.spec 24 May 2006 21:52:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Module-Info Version: 0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Information about Perl modules License: GPL or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.30-3 +- Rebuild. + * Sat May 06 2006 Steven Pritchard 0.30-2 - Add BR: perl(Test::Pod) and perl(version). - Add Requires: perl(version). From fedora-extras-commits at redhat.com Wed May 24 21:55:41 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 14:55:41 -0700 Subject: rpms/perl-Apache-Session/devel .cvsignore, 1.3, 1.4 perl-Apache-Session.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605242155.k4OLthAX030702@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Apache-Session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30681 Modified Files: .cvsignore perl-Apache-Session.spec sources Log Message: Update to 1.81. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Apr 2006 15:54:10 -0000 1.3 +++ .cvsignore 24 May 2006 21:55:41 -0000 1.4 @@ -1 +1 @@ -Apache-Session-1.80.tar.gz +Apache-Session-1.81.tar.gz Index: perl-Apache-Session.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/perl-Apache-Session.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Apache-Session.spec 11 Apr 2006 15:54:10 -0000 1.2 +++ perl-Apache-Session.spec 24 May 2006 21:55:41 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Apache-Session -Version: 1.80 +Version: 1.81 Release: 1%{?dist} Summary: Persistence framework for session data License: Artistic @@ -52,6 +52,9 @@ %{_mandir}/man3/Apache* %changelog +* Wed May 24 2006 Steven Pritchard 1.81-1 +- Update to 1.81. + * Tue Apr 11 2006 Steven Pritchard 1.80-1 - Update to 1.80. - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Apr 2006 15:54:10 -0000 1.3 +++ sources 24 May 2006 21:55:41 -0000 1.4 @@ -1 +1 @@ -fbb26cc28250127efc24b9e745b934f3 Apache-Session-1.80.tar.gz +942788df6c5e743333cae5816551f203 Apache-Session-1.81.tar.gz From fedora-extras-commits at redhat.com Wed May 24 22:05:42 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Wed, 24 May 2006 15:05:42 -0700 Subject: rpms/cernlib/FC-5 211-fix-comis-on-amd64.dpatch, 1.1, 1.2 cernlib.spec, 1.20, 1.21 paw.README, 1.4, 1.5 Message-ID: <200605242205.k4OM5iF5000636@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv615 Modified Files: 211-fix-comis-on-amd64.dpatch cernlib.spec paw.README Log Message: * Wed May 24 2006 Patrice Dumas - 2005-21 - compile paw statically against the cernlib (paw binaries dynamically compiled against the cernlib are still shiped). Fix 192866 Index: 211-fix-comis-on-amd64.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/211-fix-comis-on-amd64.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 211-fix-comis-on-amd64.dpatch 14 Dec 2005 16:52:26 -0000 1.1 +++ 211-fix-comis-on-amd64.dpatch 24 May 2006 22:05:42 -0000 1.2 @@ -396,8 +396,8 @@ ITMPLEN=CSTMPD(CHPATH, 256) - CHF77 ='g77 -c' - CHCC ='cc -c' -+ CHF77 ='g77 -c -fPIC' -+ CHCC ='cc -c -fPIC' ++ CHF77 ='g77 -g -c -fPIC' ++ CHCC ='cc -g -c -fPIC' #endif #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL)) ITMPLEN=CSTMPD(CHPATH, 256) Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/cernlib.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cernlib.spec 17 May 2006 15:35:10 -0000 1.20 +++ cernlib.spec 24 May 2006 22:05:42 -0000 1.21 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 20%{?dist} +Release: 21%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -651,9 +651,17 @@ make install.shlib chmod a+x ../shlib/*.so.* -# Build paw +# Build dynamic paw cd $CERN_ROOT/build/pawlib make %{?_smp_mflags} install.bin +cd $CERN_ROOT/ +mv bin/pawX11 bin/pawX11.dynamic +mv bin/paw++ bin/paw++.dynamic +# Build static paw +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \ + `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11 +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \ + `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++ # Build packlib cd $CERN_ROOT/build/packlib @@ -768,6 +776,8 @@ %{_bindir}/paw++ %{_bindir}/paw %{_bindir}/pawX11 +%{_bindir}/pawX11.dynamic +%{_bindir}/paw++.dynamic %dir %{_libdir}/cernlib/%{version}/bin %{_libdir}/cernlib/%{version}/bin/pawX11 %doc paw.README @@ -830,6 +840,10 @@ %changelog +* Wed May 24 2006 Patrice Dumas - 2005-21 +- compile paw statically against the cernlib (paw binaries dynamically + compiled against the cernlib are still shiped). Fix 192866 + * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-5/paw.README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- paw.README 17 May 2006 15:35:10 -0000 1.4 +++ paw.README 24 May 2006 22:05:42 -0000 1.5 @@ -41,11 +41,20 @@ to the beginning of them. -5) Shared libs +5) Shared and static libs -PAW is linked dynamically, therefore the pawlib used is selected by the +There are 2 sets of binaries installed. In one set the binaries are +statically linked with the cernlib (but still dynamically linked with +the other libraries), these are the binaries used in the default case +(pawX11 and paw++). + +The other binaries are compiled dynamically (pawX11.dynamic and +paw++.dynamic), therefore the pawlib used is selected by the /etc/ld.so.conf or $LD_LIBRARY_PATH settings. +The statically compiled one are used in the default case because +dynamically linked one fail on some 64 bit architectures. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by From fedora-extras-commits at redhat.com Wed May 24 23:25:05 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 24 May 2006 16:25:05 -0700 Subject: fedora-security/audit fe4,1.32,1.33 fe5,1.32,1.33 Message-ID: <200605242325.k4ONP5YI003625@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3603 Modified Files: fe4 fe5 Log Message: Note a new netpanzer CVE id. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fe4 24 May 2006 17:21:26 -0000 1.32 +++ fe4 24 May 2006 23:25:02 -0000 1.33 @@ -2,7 +2,7 @@ ** are items that need attention -none VULNERABLE (netpanzer) bz#192983 +CVE-2006-2575 VULNERABLE (netpanzer) bz#192983 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2442 patch (kphone,fixed 4.2-9) bz#192202 CVE-2006-2427 ignore (clamav) not an issue bz#192076 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fe5 24 May 2006 17:21:26 -0000 1.32 +++ fe5 24 May 2006 23:25:02 -0000 1.33 @@ -2,7 +2,7 @@ ** are items that need attention -none VULNERABLE (netpanzer) bz#192983 +CVE-2006-2575 VULNERABLE (netpanzer) bz#192983 CVE-2006-2453 VULNERABLE (dia) bz#192830 CVE-2006-2489 version (nagios, fixed 2.3.1) CVE-2006-2480 patch (dia, fixed 0.95-2) bz#192535 From fedora-extras-commits at redhat.com Wed May 24 23:34:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 16:34:42 -0700 Subject: rpms/perl-DateTime/devel .cvsignore, 1.5, 1.6 perl-DateTime.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200605242334.k4ONYiL5003733@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-DateTime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3711 Modified Files: .cvsignore perl-DateTime.spec sources Log Message: Update DateTime to 0.31. Update DateTime::TimeZone to 0.46. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Feb 2006 16:49:48 -0000 1.5 +++ .cvsignore 24 May 2006 23:34:41 -0000 1.6 @@ -1,3 +1,3 @@ -DateTime-0.30.tar.gz +DateTime-0.31.tar.gz DateTime-Locale-0.22.tar.gz -DateTime-TimeZone-0.42.tar.gz +DateTime-TimeZone-0.46.tar.gz Index: perl-DateTime.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/perl-DateTime.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DateTime.spec 27 Feb 2006 16:49:48 -0000 1.4 +++ perl-DateTime.spec 24 May 2006 23:34:41 -0000 1.5 @@ -1,9 +1,9 @@ -%define DTTimeZone_version 0.42 +%define DTTimeZone_version 0.46 %define DTLocale_version 0.22 Name: perl-DateTime -Version: 0.30 -Release: 3%{?dist} +Version: 0.31 +Release: 1%{?dist} Epoch: 1 Summary: DateTime Perl module License: GPL or Artistic @@ -126,6 +126,10 @@ %{perl_vendorarch}/DateTime*.pm %changelog +* Wed May 24 2006 Steven Pritchard 1:0.31-1 +- Update DateTime to 0.31. +- Update DateTime::TimeZone to 0.46. + * Mon Feb 27 2006 Steven Pritchard 1:0.30-3 - Bump Epoch (argh, 0.2901 > 0.30 to rpm) - Update DateTime::TimeZone to 0.42 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Feb 2006 16:49:48 -0000 1.5 +++ sources 24 May 2006 23:34:41 -0000 1.6 @@ -1,3 +1,3 @@ -18cf4a7cece737e0a153c6585320730f DateTime-0.30.tar.gz +f5142045e7e68c02a310405e994f8233 DateTime-0.31.tar.gz bcf9fa78efa8d00fad1293b9d860ce75 DateTime-Locale-0.22.tar.gz -08979eba66aee3b7db2317729ea0787e DateTime-TimeZone-0.42.tar.gz +fe52d18c393d3e7841be0aba972e4e43 DateTime-TimeZone-0.46.tar.gz From fedora-extras-commits at redhat.com Thu May 25 00:17:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 17:17:53 -0700 Subject: rpms/perl-IO-All/devel .cvsignore, 1.2, 1.3 perl-IO-All.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605250017.k4P0Hth9006371@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6350 Modified Files: .cvsignore perl-IO-All.spec sources Log Message: Update to 0.35. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 01:22:22 -0000 1.2 +++ .cvsignore 25 May 2006 00:17:53 -0000 1.3 @@ -1 +1 @@ -IO-All-0.33.tar.gz +IO-All-0.35.tar.gz Index: perl-IO-All.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/perl-IO-All.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-IO-All.spec 10 Mar 2006 22:36:04 -0000 1.2 +++ perl-IO-All.spec 25 May 2006 00:17:53 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-IO-All -Version: 0.33 -Release: 3%{?dist} +Version: 0.35 +Release: 1%{?dist} Summary: IO::All Perl module License: GPL or Artistic Group: Development/Libraries @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.35-1 +- Update to 0.35. + * Fri Mar 10 2006 Steven Pritchard 0.33-3 - Change dep filter. - Various cleanups to match current cpanspec. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 01:22:22 -0000 1.2 +++ sources 25 May 2006 00:17:53 -0000 1.3 @@ -1 +1 @@ -7e9e83dc8ec4404d79ee73af08f6421f IO-All-0.33.tar.gz +feea9663b97eb78abac4d956dde72f08 IO-All-0.35.tar.gz From fedora-extras-commits at redhat.com Thu May 25 00:34:15 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 17:34:15 -0700 Subject: rpms/perl-Locale-Maketext-Simple/devel .cvsignore, 1.3, 1.4 perl-Locale-Maketext-Simple.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605250034.k4P0YHoF006601@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6579 Modified Files: .cvsignore perl-Locale-Maketext-Simple.spec sources Log Message: Update to 0.16. License has changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 20:16:46 -0000 1.3 +++ .cvsignore 25 May 2006 00:34:15 -0000 1.4 @@ -1 +1 @@ -Locale-Maketext-Simple-0.13.tar.gz +Locale-Maketext-Simple-0.16.tar.gz Index: perl-Locale-Maketext-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/perl-Locale-Maketext-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Locale-Maketext-Simple.spec 21 Apr 2006 20:16:46 -0000 1.2 +++ perl-Locale-Maketext-Simple.spec 25 May 2006 00:34:15 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Locale-Maketext-Simple -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Simple interface to Locale::Maketext::Lexicon -License: GPL or Artistic +License: MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Simple/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Simple-%{version}.tar.gz @@ -47,6 +47,10 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.16-1 +- Update to 0.16. +- License has changed to MIT. + * Fri Apr 21 2006 Steven Pritchard 0.13-1 - Update to 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 20:16:46 -0000 1.3 +++ sources 25 May 2006 00:34:15 -0000 1.4 @@ -1 +1 @@ -bedbbbd4ca43a1c053f11abfc1e6b2e1 Locale-Maketext-Simple-0.13.tar.gz +d6dd0e79802f30d0eef723ec23021f60 Locale-Maketext-Simple-0.16.tar.gz From fedora-extras-commits at redhat.com Thu May 25 00:47:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 17:47:52 -0700 Subject: rpms/perl-Locale-Maketext-Simple/FC-5 .cvsignore, 1.3, 1.4 perl-Locale-Maketext-Simple.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605250047.k4P0ls1Q006777@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6754 Modified Files: .cvsignore perl-Locale-Maketext-Simple.spec sources Log Message: Update to 0.16. License has changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 20:18:13 -0000 1.3 +++ .cvsignore 25 May 2006 00:47:52 -0000 1.4 @@ -1 +1 @@ -Locale-Maketext-Simple-0.13.tar.gz +Locale-Maketext-Simple-0.16.tar.gz Index: perl-Locale-Maketext-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/perl-Locale-Maketext-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Locale-Maketext-Simple.spec 21 Apr 2006 20:18:13 -0000 1.2 +++ perl-Locale-Maketext-Simple.spec 25 May 2006 00:47:52 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Locale-Maketext-Simple -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Simple interface to Locale::Maketext::Lexicon -License: GPL or Artistic +License: MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Simple/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Simple-%{version}.tar.gz @@ -47,6 +47,10 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.16-1 +- Update to 0.16. +- License has changed to MIT. + * Fri Apr 21 2006 Steven Pritchard 0.13-1 - Update to 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 20:18:13 -0000 1.3 +++ sources 25 May 2006 00:47:52 -0000 1.4 @@ -1 +1 @@ -bedbbbd4ca43a1c053f11abfc1e6b2e1 Locale-Maketext-Simple-0.13.tar.gz +d6dd0e79802f30d0eef723ec23021f60 Locale-Maketext-Simple-0.16.tar.gz From fedora-extras-commits at redhat.com Thu May 25 00:49:40 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 24 May 2006 17:49:40 -0700 Subject: rpms/perl-Locale-Maketext-Simple/FC-4 .cvsignore, 1.3, 1.4 perl-Locale-Maketext-Simple.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605250049.k4P0ngQg006850@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6828 Modified Files: .cvsignore perl-Locale-Maketext-Simple.spec sources Log Message: Update to 0.16. License has changed to MIT. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2006 20:18:44 -0000 1.3 +++ .cvsignore 25 May 2006 00:49:40 -0000 1.4 @@ -1 +1 @@ -Locale-Maketext-Simple-0.13.tar.gz +Locale-Maketext-Simple-0.16.tar.gz Index: perl-Locale-Maketext-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/perl-Locale-Maketext-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Locale-Maketext-Simple.spec 21 Apr 2006 20:18:44 -0000 1.2 +++ perl-Locale-Maketext-Simple.spec 25 May 2006 00:49:40 -0000 1.3 @@ -1,8 +1,8 @@ Name: perl-Locale-Maketext-Simple -Version: 0.13 +Version: 0.16 Release: 1%{?dist} Summary: Simple interface to Locale::Maketext::Lexicon -License: GPL or Artistic +License: MIT Group: Development/Libraries URL: http://search.cpan.org/dist/Locale-Maketext-Simple/ Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Simple-%{version}.tar.gz @@ -47,6 +47,10 @@ %{_mandir}/man3/* %changelog +* Wed May 24 2006 Steven Pritchard 0.16-1 +- Update to 0.16. +- License has changed to MIT. + * Fri Apr 21 2006 Steven Pritchard 0.13-1 - Update to 0.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2006 20:18:44 -0000 1.3 +++ sources 25 May 2006 00:49:40 -0000 1.4 @@ -1 +1 @@ -bedbbbd4ca43a1c053f11abfc1e6b2e1 Locale-Maketext-Simple-0.13.tar.gz +d6dd0e79802f30d0eef723ec23021f60 Locale-Maketext-Simple-0.16.tar.gz From fedora-extras-commits at redhat.com Thu May 25 01:01:03 2006 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Wed, 24 May 2006 18:01:03 -0700 Subject: CVSROOT avail,1.34,1.35 Message-ID: <200605250101.k4P113cG008847@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7001 Modified Files: avail Log Message: Now Eitch can publish translations himself, hoorah. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- avail 10 May 2006 13:48:44 -0000 1.34 +++ avail 25 May 2006 01:01:01 -0000 1.35 @@ -56,4 +56,4 @@ avail | pfrields,mjohnson | web/html/participate/documentation-quick-start avail | pfrields | web/html/participate/developers-guide avail | tchung | web/html/News -avail | elliss | web/html/docs +avail | elliss,eitch | web/html/docs From fedora-extras-commits at redhat.com Thu May 25 07:22:41 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Thu, 25 May 2006 00:22:41 -0700 Subject: rpms/rsnapshot/devel .cvsignore, 1.4, 1.5 rsnapshot.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605250722.k4P7Mh6X025912@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25891 Modified Files: .cvsignore rsnapshot.spec sources Log Message: new rsnapshot version: 1.2.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 May 2006 23:34:16 -0000 1.4 +++ .cvsignore 25 May 2006 07:22:41 -0000 1.5 @@ -1 +1 @@ -rsnapshot-1.2.3.tar.gz +rsnapshot-1.2.9.tar.gz Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rsnapshot.spec 21 May 2006 04:20:15 -0000 1.7 +++ rsnapshot.spec 25 May 2006 07:22:41 -0000 1.8 @@ -3,8 +3,8 @@ # Name: rsnapshot -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.2.9 +Release: 1%{?dist} Summary: Local and remote filesystem snapshot utility Group: Applications/System @@ -71,6 +71,9 @@ # Rename the installed .default config file to a usable name mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf +# Change the perms on the utils/ files so rpm doesn't pick up their dependencies +find utils/ -type f -print0 | xargs -r0 chmod 644 + ################################################################################ %post @@ -117,6 +120,9 @@ %changelog +* Sat May 21 2006 Chris Petersen 1.2.9-1 +- Preliminary build for 1.2.9 + * Wed May 17 2006 Chris Petersen 1.2.3-2 - Add rsync and openssh-clients build requirements because the configure script checks for them. - Remove perl requirement because it's detected by rpm. Index: sources =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 May 2006 23:34:16 -0000 1.4 +++ sources 25 May 2006 07:22:41 -0000 1.5 @@ -1 +1 @@ -b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz +68632bc6cdd9c149e0fdeb9e246622d3 rsnapshot-1.2.9.tar.gz From fedora-extras-commits at redhat.com Thu May 25 07:49:13 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 25 May 2006 00:49:13 -0700 Subject: rpms/paps/devel paps-0.6.6-encoding.patch, NONE, 1.1 paps-0.6.6-segfault.patch, NONE, 1.1 paps.spec, 1.10, 1.11 Message-ID: <200605250749.k4P7nFJA026150@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26127 Modified Files: paps.spec Added Files: paps-0.6.6-encoding.patch paps-0.6.6-segfault.patch Log Message: * Thu May 25 2006 Akira TAGOH - 0.6.6-2 - paps-0.6.6-encoding.patch: support --encoding option to be able to convert the input file to UTF-8. - paps-0.6.6-segfault.patch: fixed a possible segfault issue when reading is failed. paps-0.6.6-encoding.patch: --- NEW FILE paps-0.6.6-encoding.patch --- diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c --- paps-0.6.6.orig/src/paps.c 2006-05-25 13:23:07.000000000 +0900 +++ paps-0.6.6/src/paps.c 2006-05-25 14:55:03.000000000 +0900 @@ -105,7 +105,8 @@ /* Information passed in user data when drawing outlines */ GList *split_paragraphs_into_lines (GList *paragraphs); -static char *read_file (FILE *file); +static char *read_file (FILE *file, + GIConv *handle); static GList *split_text_into_paragraphs (PangoContext *pango_context, page_layout_t *page_layout, int paint_width, @@ -188,7 +189,7 @@ gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE, do_draw_header = FALSE; int num_columns = 1, font_scale = 12; int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36; - char *font_family = "Monospace"; + char *font_family = "Monospace", *encoding = NULL; GOptionContext *ctxt = g_option_context_new("[text file]"); GOptionEntry entries[] = { {"landscape", 0, 0, G_OPTION_ARG_NONE, &do_landscape, "Landscape output. (Default: portrait)", NULL}, @@ -205,6 +206,7 @@ {"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"}, {"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"}, {"header", 0, 0, G_OPTION_ARG_NONE, &do_draw_header, "Draw page header for each page.", NULL}, + {"encoding", 0, 0, G_OPTION_ARG_STRING, &encoding, "Assume the documentation encoding.", "ENCODING"}, {NULL} }; GError *error = NULL; @@ -228,6 +230,7 @@ gchar *paps_header = NULL; gchar *header_font_desc = "Monospace Bold 12"; int header_sep = 20; + GIConv *cvh = NULL; /* Prerequisite when using glib. */ g_type_init(); @@ -339,7 +342,21 @@ page_layout.filename = filename_in; page_layout.header_font_desc = header_font_desc; - text = read_file(IN); + if (encoding != NULL) + { + cvh = g_iconv_open ("UTF-8", encoding); + if (cvh == NULL) + { + fprintf(stderr, "%s: Invalid encoding: %s\n", g_get_prgname (), encoding); + exit(-1); + } + } + + text = read_file(IN, cvh); + + if (encoding != NULL && cvh != NULL) + g_iconv_close(cvh); + paragraphs = split_text_into_paragraphs(pango_context, &page_layout, page_layout.column_width * page_layout.pt_to_pixel, @@ -373,7 +390,8 @@ /* Read an entire file into a string */ static char * -read_file (FILE *file) +read_file (FILE *file, + GIConv *handle) { GString *inbuf; char *text; @@ -382,7 +400,9 @@ inbuf = g_string_new (NULL); while (1) { - char *bp = fgets (buffer, BUFSIZE-1, file); + char *ib, *ob, obuffer[BUFSIZE * 6], *bp = fgets (buffer, BUFSIZE-1, file); + gsize iblen, oblen; + if (ferror (file)) { fprintf(stderr, "%s: Error reading file.\n", g_get_prgname ()); @@ -392,7 +412,19 @@ else if (bp == NULL) break; - g_string_append (inbuf, buffer); + if (handle != NULL) + { + ib = bp; + iblen = strlen (ib); + ob = bp = obuffer; + oblen = BUFSIZE * 6 - 1; + if (g_iconv (handle, &ib, &iblen, &ob, &oblen) == -1) + { + fprintf (stderr, "%s: Error while converting strings.\n", g_get_prgname ()); + return NULL; + } + } + g_string_append (inbuf, bp); } fclose (file); paps-0.6.6-segfault.patch: --- NEW FILE paps-0.6.6-segfault.patch --- diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c --- paps-0.6.6.orig/src/paps.c 2006-05-25 15:12:02.000000000 +0900 +++ paps-0.6.6/src/paps.c 2006-05-25 15:15:58.000000000 +0900 @@ -453,7 +453,7 @@ GList *result = NULL; char *last_para = text; - while (*p) + while (p != NULL && *p) { wc = g_utf8_get_char (p); next = g_utf8_next_char (p); Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- paps.spec 19 May 2006 10:16:31 -0000 1.10 +++ paps.spec 25 May 2006 07:49:13 -0000 1.11 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -9,6 +9,8 @@ BuildRequires: pango-devel Patch0: paps-makefile.patch Patch2: paps-0.6.3-formfeed.patch +Patch3: paps-0.6.6-encoding.patch +Patch4: paps-0.6.6-segfault.patch Summary: Plain Text to PostScript converter Group: Applications/Publishing @@ -20,6 +22,8 @@ %setup -q %patch0 -p1 -b .makefile %patch2 -p1 -b .formfeed +%patch3 -p1 -b .encoding +%patch4 -p1 -b .segfault aclocal automake autoconf @@ -47,6 +51,12 @@ %changelog +* Thu May 25 2006 Akira TAGOH - 0.6.6-2 +- paps-0.6.6-encoding.patch: support --encoding option to be able to convert + the input file to UTF-8. +- paps-0.6.6-segfault.patch: fixed a possible segfault issue when reading is + failed. + * Fri May 19 2006 Akira TAGOH - 0.6.6-1 - New upstream release. From fedora-extras-commits at redhat.com Thu May 25 07:52:53 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 25 May 2006 00:52:53 -0700 Subject: rpms/w3m-el/devel w3m-el.spec,1.4,1.5 Message-ID: <200605250752.k4P7qtZP026550@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/w3m-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26525 Modified Files: w3m-el.spec Log Message: * Thu May 25 2006 Akira TAGOH - 1.4.2-4 - rebuilt to be correct dist tag. Index: w3m-el.spec =================================================================== RCS file: /cvs/extras/rpms/w3m-el/devel/w3m-el.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- w3m-el.spec 24 May 2006 10:17:56 -0000 1.4 +++ w3m-el.spec 25 May 2006 07:52:52 -0000 1.5 @@ -2,7 +2,7 @@ Name: w3m-el Version: 1.4.4 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ BuildArch: noarch @@ -133,6 +133,9 @@ %{_infodir}/* %changelog +* Thu May 25 2006 Akira TAGOH - 1.4.2-4 +- rebuilt to be correct dist tag. + * Wed May 24 2006 Akira TAGOH - 1.4.2-3 - packaged as noarch. (#192610) From fedora-extras-commits at redhat.com Thu May 25 09:09:57 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 25 May 2006 02:09:57 -0700 Subject: rpms/cernlib/FC-3 211-fix-comis-on-amd64.dpatch, 1.1, 1.2 cernlib.spec, 1.18, 1.19 paw.README, 1.4, 1.5 Message-ID: <200605250909.k4P99xYw001928@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1891/FC-3 Modified Files: 211-fix-comis-on-amd64.dpatch cernlib.spec paw.README Log Message: * Wed May 24 2006 Patrice Dumas - 2005-21 - compile paw statically against the cernlib (paw binaries dynamically compiled against the cernlib are still shiped). Fix 192866 Index: 211-fix-comis-on-amd64.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/211-fix-comis-on-amd64.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 211-fix-comis-on-amd64.dpatch 15 Dec 2005 12:07:03 -0000 1.1 +++ 211-fix-comis-on-amd64.dpatch 25 May 2006 09:09:57 -0000 1.2 @@ -396,8 +396,8 @@ ITMPLEN=CSTMPD(CHPATH, 256) - CHF77 ='g77 -c' - CHCC ='cc -c' -+ CHF77 ='g77 -c -fPIC' -+ CHCC ='cc -c -fPIC' ++ CHF77 ='g77 -g -c -fPIC' ++ CHCC ='cc -g -c -fPIC' #endif #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL)) ITMPLEN=CSTMPD(CHPATH, 256) Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- cernlib.spec 17 May 2006 21:00:13 -0000 1.18 +++ cernlib.spec 25 May 2006 09:09:57 -0000 1.19 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 20%{?dist} +Release: 21%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -651,9 +651,17 @@ make install.shlib chmod a+x ../shlib/*.so.* -# Build paw +# Build dynamic paw cd $CERN_ROOT/build/pawlib make %{?_smp_mflags} install.bin +cd $CERN_ROOT/ +mv bin/pawX11 bin/pawX11.dynamic +mv bin/paw++ bin/paw++.dynamic +# Build static paw +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \ + `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11 +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \ + `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++ # Build packlib cd $CERN_ROOT/build/packlib @@ -768,6 +776,8 @@ %{_bindir}/paw++ %{_bindir}/paw %{_bindir}/pawX11 +%{_bindir}/pawX11.dynamic +%{_bindir}/paw++.dynamic %dir %{_libdir}/cernlib/%{version}/bin %{_libdir}/cernlib/%{version}/bin/pawX11 %doc paw.README @@ -830,6 +840,10 @@ %changelog +* Wed May 24 2006 Patrice Dumas - 2005-21 +- compile paw statically against the cernlib (paw binaries dynamically + compiled against the cernlib are still shiped). Fix 192866 + * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- paw.README 17 May 2006 21:00:13 -0000 1.4 +++ paw.README 25 May 2006 09:09:57 -0000 1.5 @@ -41,11 +41,20 @@ to the beginning of them. -5) Shared libs +5) Shared and static libs -PAW is linked dynamically, therefore the pawlib used is selected by the +There are 2 sets of binaries installed. In one set the binaries are +statically linked with the cernlib (but still dynamically linked with +the other libraries), these are the binaries used in the default case +(pawX11 and paw++). + +The other binaries are compiled dynamically (pawX11.dynamic and +paw++.dynamic), therefore the pawlib used is selected by the /etc/ld.so.conf or $LD_LIBRARY_PATH settings. +The statically compiled one are used in the default case because +dynamically linked one fail on some 64 bit architectures. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by From fedora-extras-commits at redhat.com Thu May 25 09:09:57 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 25 May 2006 02:09:57 -0700 Subject: rpms/cernlib/FC-4 211-fix-comis-on-amd64.dpatch, 1.1, 1.2 cernlib.spec, 1.24, 1.25 paw.README, 1.4, 1.5 Message-ID: <200605250910.k4P99x7e001934@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/cernlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1891/FC-4 Modified Files: 211-fix-comis-on-amd64.dpatch cernlib.spec paw.README Log Message: * Wed May 24 2006 Patrice Dumas - 2005-21 - compile paw statically against the cernlib (paw binaries dynamically compiled against the cernlib are still shiped). Fix 192866 Index: 211-fix-comis-on-amd64.dpatch =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/211-fix-comis-on-amd64.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 211-fix-comis-on-amd64.dpatch 14 Dec 2005 16:15:57 -0000 1.1 +++ 211-fix-comis-on-amd64.dpatch 25 May 2006 09:09:57 -0000 1.2 @@ -396,8 +396,8 @@ ITMPLEN=CSTMPD(CHPATH, 256) - CHF77 ='g77 -c' - CHCC ='cc -c' -+ CHF77 ='g77 -c -fPIC' -+ CHCC ='cc -c -fPIC' ++ CHF77 ='g77 -g -c -fPIC' ++ CHCC ='cc -g -c -fPIC' #endif #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL)) ITMPLEN=CSTMPD(CHPATH, 256) Index: cernlib.spec =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- cernlib.spec 17 May 2006 19:02:42 -0000 1.24 +++ cernlib.spec 25 May 2006 09:09:57 -0000 1.25 @@ -1,6 +1,6 @@ Name: cernlib Version: 2005 -Release: 20%{?dist} +Release: 21%{?dist} Summary: General purpose CERN library and associated binaries Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -651,9 +651,17 @@ make install.shlib chmod a+x ../shlib/*.so.* -# Build paw +# Build dynamic paw cd $CERN_ROOT/build/pawlib make %{?_smp_mflags} install.bin +cd $CERN_ROOT/ +mv bin/pawX11 bin/pawX11.dynamic +mv bin/paw++ bin/paw++.dynamic +# Build static paw +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \ + `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11 +g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \ + `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++ # Build packlib cd $CERN_ROOT/build/packlib @@ -768,6 +776,8 @@ %{_bindir}/paw++ %{_bindir}/paw %{_bindir}/pawX11 +%{_bindir}/pawX11.dynamic +%{_bindir}/paw++.dynamic %dir %{_libdir}/cernlib/%{version}/bin %{_libdir}/cernlib/%{version}/bin/pawX11 %doc paw.README @@ -830,6 +840,10 @@ %changelog +* Wed May 24 2006 Patrice Dumas - 2005-21 +- compile paw statically against the cernlib (paw binaries dynamically + compiled against the cernlib are still shiped). Fix 192866 + * Wed May 17 2006 Patrice Dumas - 2005-20 - use new debian patchset. Fix 191631 Index: paw.README =================================================================== RCS file: /cvs/extras/rpms/cernlib/FC-4/paw.README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- paw.README 17 May 2006 19:02:42 -0000 1.4 +++ paw.README 25 May 2006 09:09:57 -0000 1.5 @@ -41,11 +41,20 @@ to the beginning of them. -5) Shared libs +5) Shared and static libs -PAW is linked dynamically, therefore the pawlib used is selected by the +There are 2 sets of binaries installed. In one set the binaries are +statically linked with the cernlib (but still dynamically linked with +the other libraries), these are the binaries used in the default case +(pawX11 and paw++). + +The other binaries are compiled dynamically (pawX11.dynamic and +paw++.dynamic), therefore the pawlib used is selected by the /etc/ld.so.conf or $LD_LIBRARY_PATH settings. +The statically compiled one are used in the default case because +dynamically linked one fail on some 64 bit architectures. + -- Kevin McCarty , Tue, 22 Nov 2005 Adapted to the rpm package by From fedora-extras-commits at redhat.com Thu May 25 10:21:45 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 25 May 2006 03:21:45 -0700 Subject: fedora-security/audit fc4,1.263,1.264 fc5,1.176,1.177 Message-ID: <200605251021.k4PALjOt004693@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4673 Modified Files: fc4 fc5 Log Message: CVE updates and FC releases yesterday Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- fc4 24 May 2006 09:04:44 -0000 1.263 +++ fc4 25 May 2006 10:21:42 -0000 1.264 @@ -1,13 +1,13 @@ -Up to date CVE as of CVE email 20060523 -Up to date FC4 as of 20060523 +Up to date CVE as of CVE email 20060524 +Up to date FC4 as of 20060524 ** are items that need attention CVE-2006-2493 ** freetype -CVE-2006-2480 VULNERABLE (dia) #192538 -CVE-2006-2453 VULNERABLE (dia) #192538 +CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] +CVE-2006-2453 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) -CVE-2006-2440 VULNERABLE (ImageMagick) #192279 +CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-587] CVE-2006-2414 version (dovecot, fixed 1.0.beta8) 1.X only CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-557] CVE-2006-2366 VULNERABLE (openobex) #192087 @@ -47,7 +47,8 @@ CVE-2006-1902 ignore (gcc) not a vulnerability CVE-2006-1864 version (kernel, fixed 2.6.16.14) [since FEDORA-2006-517] CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-500] -CVE-2006-1861 VULNERALBE (freetype, fixed 2.2.1) #191771 +CVE-2006-1862 ** kernel +CVE-2006-1861 VULNERABLE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 version (kernel, fixed 2.6.16.16) [since FEDORA-2006-573] CVE-2006-1859 version (kernel, fixed 2.6.16.16) [since FEDORA-2006-573] CVE-2006-1858 version (kernel, fixed 2.6.16.17) [since FEDORA-2006-573] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- fc5 24 May 2006 09:04:44 -0000 1.176 +++ fc5 25 May 2006 10:21:42 -0000 1.177 @@ -1,11 +1,11 @@ -Up to date CVE as of CVE email 20060523 -Up to date FC5 as of 20060523 +Up to date CVE as of CVE email 20060524 +Up to date FC5 as of 20060524 ** are items that need attention CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) -CVE-2006-2440 VULNERABLE (ImageMagick) #192279 +CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-588] CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue CVE-2006-2369 backport (vnc, fixed 4.1.2) #191692 [since FEDORA-2006-558] CVE-2006-2366 VULNERABLE (openobex) #192087 @@ -46,6 +46,7 @@ CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440] CVE-2006-1864 ignore (kernel, fixed 2.6.16.14) not compiled in CVE-2006-1863 version (kernel, fixed 2.6.16.11) [since FEDORA-2006-499] +CVE-2006-1862 ** kernel CVE-2006-1861 VULNERABLE (freetype, fixed 2.2.1) #191771 CVE-2006-1860 version (kernel, fixed 2.6.16.16) [since FEDORA-2006-572] CVE-2006-1859 version (kernel, fixed 2.6.16.16) [since FEDORA-2006-572] From fedora-extras-commits at redhat.com Thu May 25 11:55:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 25 May 2006 04:55:01 -0700 Subject: rpms/lyx/FC-4 lyx.spec,1.23,1.24 Message-ID: <200605251155.k4PBt3eG007831@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7814 Modified Files: lyx.spec Log Message: * Thu May 25 2006 Rex Dieter 1.4.1-7.1 - fc4: drop Requires: tetex-preview, it's not ready yet. Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- lyx.spec 24 May 2006 14:01:28 -0000 1.23 +++ lyx.spec 25 May 2006 11:55:01 -0000 1.24 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.1 -Release: 7%{?dist} +Release: 7%{?dist}.1 License: GPL Group: Applications/Publishing @@ -54,6 +54,9 @@ %if "%{?fedora}" > "3" # dvipost adds support for lyx's Document->Change Tracking feature Requires(hint): tetex-dvipost +%endif +# tetex-preview isn't ready for prime-time on FC-4, yet. -- Rex +%if "%{?fedora}" > "4" Requires(hint): tetex-preview %endif @@ -213,6 +216,9 @@ %changelog +* Thu May 25 2006 Rex Dieter 1.4.1-7.1 +- fc4: drop Requires: tetex-preview, it's not ready yet. + * Wed May 24 2006 Rex Dieter 1.4.1-7 - use serverpipe "~/.lyx/lyxpipe" instead, that was the old default and what pybibliographer expects. From fedora-extras-commits at redhat.com Thu May 25 11:55:44 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 04:55:44 -0700 Subject: rpms/synaptic/FC-4 synaptic.spec,1.12,1.13 Message-ID: <200605251155.k4PBtkZ6007918@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/FC-4 Modified Files: synaptic.spec Log Message: Enable 64-bit builds again (#193075) Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/synaptic.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- synaptic.spec 14 Jul 2005 06:26:51 -0000 1.12 +++ synaptic.spec 25 May 2006 11:55:44 -0000 1.13 @@ -3,24 +3,28 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 1%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz Patch0: synaptic-0.57-desktop.patch Patch1: synaptic-0.57-firefox.patch +# Patches from apt-rpm maintainer for gcc 4.1 support, repomd support +# and progress meter fixes +Patch2: http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch +Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch +Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 +BuildRequires: apt-devel >= 0.5.15lorg3.1, rpm-devel >= 4.0 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper -ExcludeArch: x86_64 ppc64 %description Synaptic is a graphical package management @@ -31,6 +35,9 @@ %setup -q %patch0 -p1 -b .dt %patch1 -p1 -b .firefox +%patch2 -p1 -b .gcc41 +%patch3 -p1 -b .repomd +%patch4 -p1 -b .showprog %build %configure --disable-dependency-tracking @@ -99,6 +106,19 @@ %{_mandir}/man8/%{name}.8* %changelog +* Thu May 25 2006 Axel Thimm +- Enable 64-bit builds again (#193075 by Deji Akingunola). + +* Sat May 20 2006 Axel Thimm - 0.57.2-4 +- Add repomd support, gcc 4.1 build support, progress meter fixes (all + from apt-rpm upstream). + +* Wed Dec 14 2005 Deji Akingunola - 0.57.2-3 +- Rebuild for new openssl and apt in devel. + +* Wed Aug 17 2005 Ville Skytt?? - 0.57.2-2 +- Rebuild for new libcairo in devel. + * Tue Jul 12 2005 Panu Matilainen 0.57.2-1 - remove explicit yelp dependency, add support for browsing help with firefox (#163036) From fedora-extras-commits at redhat.com Thu May 25 11:55:45 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 04:55:45 -0700 Subject: rpms/synaptic/FC-5 synaptic.spec,1.16,1.17 Message-ID: <200605251155.k4PBtluc007922@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/FC-5 Modified Files: synaptic.spec Log Message: Enable 64-bit builds again (#193075) Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-5/synaptic.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- synaptic.spec 14 Dec 2005 17:51:18 -0000 1.16 +++ synaptic.spec 25 May 2006 11:55:45 -0000 1.17 @@ -3,24 +3,28 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 3%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz Patch0: synaptic-0.57-desktop.patch Patch1: synaptic-0.57-firefox.patch +# Patches from apt-rpm maintainer for gcc 4.1 support, repomd support +# and progress meter fixes +Patch2: http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch +Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch +Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk Requires(post): scrollkeeper Requires(postun): scrollkeeper -BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 +BuildRequires: apt-devel >= 0.5.15lorg3.1, rpm-devel >= 4.0 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper -ExcludeArch: x86_64 ppc64 %description Synaptic is a graphical package management @@ -31,6 +35,9 @@ %setup -q %patch0 -p1 -b .dt %patch1 -p1 -b .firefox +%patch2 -p1 -b .gcc41 +%patch3 -p1 -b .repomd +%patch4 -p1 -b .showprog %build %configure --disable-dependency-tracking @@ -99,6 +106,13 @@ %{_mandir}/man8/%{name}.8* %changelog +* Thu May 25 2006 Axel Thimm +- Enable 64-bit builds again (#193075 by Deji Akingunola). + +* Sat May 20 2006 Axel Thimm - 0.57.2-4 +- Add repomd support, gcc 4.1 build support, progress meter fixes (all + from apt-rpm upstream). + * Wed Dec 14 2005 Deji Akingunola - 0.57.2-3 - Rebuild for new openssl and apt in devel. From fedora-extras-commits at redhat.com Thu May 25 11:55:45 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 04:55:45 -0700 Subject: rpms/synaptic/devel synaptic.spec,1.17,1.18 Message-ID: <200605251155.k4PBtlUM007926@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/devel Modified Files: synaptic.spec Log Message: Enable 64-bit builds again (#193075) Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- synaptic.spec 20 May 2006 17:09:21 -0000 1.17 +++ synaptic.spec 25 May 2006 11:55:45 -0000 1.18 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System @@ -25,7 +25,6 @@ BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser BuildRequires: scrollkeeper -ExcludeArch: x86_64 ppc64 %description Synaptic is a graphical package management @@ -107,6 +106,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Thu May 25 2006 Axel Thimm +- Enable 64-bit builds again (#193075 by Deji Akingunola). + * Sat May 20 2006 Axel Thimm - 0.57.2-4 - Add repomd support, gcc 4.1 build support, progress meter fixes (all from apt-rpm upstream). From fedora-extras-commits at redhat.com Thu May 25 12:18:46 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 25 May 2006 05:18:46 -0700 Subject: rpms/xemacs-sumo/FC-5 xemacs-sumo.spec,1.21,1.22 Message-ID: <200605251218.k4PCImA5010554@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10537 Modified Files: xemacs-sumo.spec Log Message: * Thu May 25 2006 Ville Skytt?? - 20060510-2.1 - Fix indentation in haskell-mode with XEmacs < 21.5 (#192481). Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-5/xemacs-sumo.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xemacs-sumo.spec 13 May 2006 09:15:44 -0000 1.21 +++ xemacs-sumo.spec 25 May 2006 12:18:46 -0000 1.22 @@ -9,7 +9,7 @@ Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: XEmacs lisp packages Group: Applications/Editors @@ -105,6 +105,11 @@ # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch15 -p0 +# fix indentation in haskell-mode with XEmacs < 21.5, #192481 +sed -i -e s/line-beginning-position/point-at-bol/g -e \ + s/line-end-position/point-at-eol/g \ + xemacs-packages/lisp/haskell-mode/haskell-*indent.el + sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \ xemacs-packages/etc/bbdb/*.pl @@ -228,6 +233,9 @@ %changelog +* Thu May 25 2006 Ville Skytt?? - 20060510-2.1 +- Fix indentation in haskell-mode with XEmacs < 21.5 (#192481). + * Sat May 13 2006 Ville Skytt?? - 20060510-2 - Try to work around build system quirks in finding the XEmacs version. From fedora-extras-commits at redhat.com Thu May 25 12:26:59 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 25 May 2006 05:26:59 -0700 Subject: rpms/xmms/devel xmms-1.2.10-multidevel.patch, NONE, 1.1 xmms.spec, 1.21, 1.22 xmms-1.2.10-extra_libs.patch, 1.1, NONE Message-ID: <200605251227.k4PCR173010649@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10629 Modified Files: xmms.spec Added Files: xmms-1.2.10-multidevel.patch Removed Files: xmms-1.2.10-extra_libs.patch Log Message: * Thu May 25 2006 Ville Skytt?? - 1:1.2.10-25 - Avoid multilib conflicts in -devel, introducing xmms.pc. - Include license text in -libs. xmms-1.2.10-multidevel.patch: --- NEW FILE xmms-1.2.10-multidevel.patch --- --- xmms-1.2.10/xmms-config.in~ 2001-04-06 03:35:49.000000000 +0300 +++ xmms-1.2.10/xmms-config.in 2006-05-25 00:22:21.000000000 +0300 @@ -18,24 +18,6 @@ data_dir="@datadir@/@PACKAGE@" version="@VERSION@" -include_dir="@includedir@" -xmms_include_dir="@includedir@/@PACKAGE@" -lib_dir="@libdir@" - -if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` - gtk_cflags=`gtk-config --cflags` -else - gtk_libs="@GTK_LIBS@" - gtk_cflags="@GTK_CFLAGS@" -fi - -plugin_dir="@plugindir@" -visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@" -input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@" -output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@" -effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@" -general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@" usage() { @@ -146,24 +128,12 @@ echo $exec_prefix fi -if test "$include_dir" != "/usr/include"; then - cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags" -else - cflags="-I$xmms_include_dir $gtk_cflags" -fi - -if test "$lib_dir" != "/usr/lib"; then - libs="-L$lib_dir $gtk_libs -lxmms" -else - libs="$gtk_libs -lxmms" -fi - if test "$echo_cflags" = "yes"; then - echo $cflags + pkg-config xmms --cflags fi if test "$echo_libs" = "yes"; then - echo $libs + pkg-config xmms --libs fi if test "$echo_data_dir" = "yes"; then @@ -171,25 +141,25 @@ fi if test "$echo_plugin_dir" = "yes"; then - echo $plugin_dir + pkg-config xmms --variable=plugin_dir fi if test "$echo_visualization_plugin_dir" = "yes"; then - echo $visualization_plugin_dir + pkg-config xmms --variable=visualization_plugin_dir fi if test "$echo_input_plugin_dir" = "yes"; then - echo $input_plugin_dir + pkg-config xmms --variable=input_plugin_dir fi if test "$echo_output_plugin_dir" = "yes"; then - echo $output_plugin_dir + pkg-config xmms --variable=output_plugin_dir fi if test "$echo_general_plugin_dir" = "yes"; then - echo $general_plugin_dir + pkg-config xmms --variable=general_plugin_dir fi if test "$echo_effect_plugin_dir" = "yes"; then - echo $effect_plugin_dir + pkg-config xmms --variable=effect_plugin_dir fi --- xmms-1.2.10/configure~ 2004-02-23 23:44:32.000000000 +0200 +++ xmms-1.2.10/configure 2006-05-24 23:55:50.000000000 +0300 @@ -19201,7 +19201,7 @@ - ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Ma! kefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" + ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms.pc xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_! scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19861,6 +19861,7 @@ "wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;; "xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;; "xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;; + "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;; "xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;; "xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;; "Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;; --- xmms-1.2.10/xmms.pc.in~ 2006-05-24 23:54:59.000000000 +0300 +++ xmms-1.2.10/xmms.pc.in 2006-05-24 23:54:48.000000000 +0300 @@ -0,0 +1,18 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +data_dir=@datadir@ +plugin_dir=@plugindir@ +visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@ +input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@ +output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@ +effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@ +general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@ + +Name: XMMS +Description: The X MultiMedia System, a media player +Version: @VERSION@ +Requires: gtk+ +Libs: -L${libdir} -lxmms +Cflags: -I${includedir} -I${includedir}/@PACKAGE@ Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xmms.spec 23 May 2006 19:25:25 -0000 1.21 +++ xmms.spec 25 May 2006 12:26:59 -0000 1.22 @@ -4,7 +4,7 @@ Name: xmms Version: 1.2.10 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 1 Summary: The X MultiMedia System, a media player @@ -28,11 +28,12 @@ Patch5: %{name}-1.2.8-arts.patch Patch6: %{name}-1.2.8-alsalib.patch Patch7: %{name}-cd-mountpoint.patch +# Patch8 on top of patch4 +Patch8: %{name}-1.2.10-multidevel.patch Patch9: %{name}-underquoted.patch Patch10: %{name}-alsa-backport.patch Patch11: %{name}-1.2.10-gcc4.patch Patch12: %{name}-1.2.10-crossfade-0.3.9.patch -Patch13: %{name}-1.2.10-extra_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel @@ -71,6 +72,7 @@ Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: gtk+-devel +Requires: pkgconfig %description devel Files needed for building plug-ins for the X MultiMedia System. @@ -94,6 +96,8 @@ %patch6 -p1 -b .alsalib # Use something that's more likely to work as the default cdrom mountpoint %patch7 -p0 -b .cd-mountpoint +# Avoid multilib devel conflicts +%patch8 -p1 -b .multidevel # Fix m4 underquoted warning %patch9 -p1 -b .underquoted # Backport for recent ALSA @@ -102,8 +106,6 @@ %patch11 -p1 -b .gcc4 # Fix for crossfade >= 0.3.9 to work properly %patch12 -p1 -b .crossfade -# Remove extra libs from xmms-config output (only needed for static linking) -%patch13 -p1 -b .extra_libs # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure @@ -143,6 +145,8 @@ install -Dpm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm +install -Dpm 644 xmms.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xmms.pc + %find_lang %{name} @@ -175,6 +179,7 @@ %files libs %defattr(-,root,root,-) +%doc COPYING %{_libdir}/libxmms.so.* %{_libdir}/xmms/ @@ -183,10 +188,15 @@ %{_bindir}/xmms-config %{_includedir}/xmms/ %{_libdir}/libxmms.so +%{_libdir}/pkgconfig/xmms.pc %{_datadir}/aclocal/xmms.m4 %changelog +* Thu May 25 2006 Ville Skytt?? - 1:1.2.10-25 +- Avoid multilib conflicts in -devel, introducing xmms.pc. +- Include license text in -libs. + * Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 - Apply upstream fix for joystick plugin crashes. --- xmms-1.2.10-extra_libs.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 25 16:29:25 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 25 May 2006 09:29:25 -0700 Subject: rpms/lvcool/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE lvcool-g++.patch, 1.1, NONE lvcool.spec, 1.10, NONE sources, 1.2, NONE Message-ID: <200605251629.k4PGTPp7023373@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/lvcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23352 Added Files: dead.package Removed Files: Makefile lvcool-g++.patch lvcool.spec sources Log Message: This package is irrelevant and obsolete. --- NEW FILE dead.package --- --- Makefile DELETED --- --- lvcool-g++.patch DELETED --- --- lvcool.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu May 25 17:08:15 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:08:15 -0700 Subject: rpms/milter-regex/devel - New directory Message-ID: <200605251708.k4PH8H5V025841@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25812/milter-regex/devel Log Message: Directory /cvs/extras/rpms/milter-regex/devel added to the repository From fedora-extras-commits at redhat.com Thu May 25 17:08:15 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:08:15 -0700 Subject: rpms/milter-regex - New directory Message-ID: <200605251708.k4PH8H5I025838@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25812/milter-regex Log Message: Directory /cvs/extras/rpms/milter-regex added to the repository From fedora-extras-commits at redhat.com Thu May 25 17:08:37 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:08:37 -0700 Subject: rpms/milter-regex Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605251708.k4PH8d1P025885@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25857 Added Files: Makefile import.log Log Message: Setup of module milter-regex --- NEW FILE Makefile --- # Top level Makefile for module milter-regex all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 25 17:08:37 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:08:37 -0700 Subject: rpms/milter-regex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605251708.k4PH8dgo025888@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25857/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module milter-regex --- NEW 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 May 25 17:09:36 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:09:36 -0700 Subject: rpms/milter-regex import.log,1.1,1.2 Message-ID: <200605251709.k4PH9c6x025968@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25933 Modified Files: import.log Log Message: auto-import milter-regex-1.6-5 on branch devel from milter-regex-1.6-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/milter-regex/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 May 2006 17:08:37 -0000 1.1 +++ import.log 25 May 2006 17:09:35 -0000 1.2 @@ -0,0 +1 @@ +milter-regex-1_6-5:HEAD:milter-regex-1.6-5.src.rpm:1148576963 From fedora-extras-commits at redhat.com Thu May 25 17:17:48 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:17:48 -0700 Subject: owners owners.list,1.1054,1.1055 Message-ID: <200605251717.k4PHHol4026091@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26072 Modified Files: owners.list Log Message: Add milter-regex Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1054 retrieving revision 1.1055 diff -u -r1.1054 -r1.1055 --- owners.list 24 May 2006 14:23:59 -0000 1.1054 +++ owners.list 25 May 2006 17:17:47 -0000 1.1055 @@ -783,6 +783,7 @@ 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|extras-qa at fedoraproject.org| +Fedora Extras|milter-regex|Sendmail milter plugin for regular expression filtering|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|mimetex|Easily embed LaTeX math in web pages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu May 25 17:26:47 2006 From: fedora-extras-commits at redhat.com (Chris Petersen (xris)) Date: Thu, 25 May 2006 10:26:47 -0700 Subject: rpms/rsnapshot/devel rsnapshot.conf.patch, 1.1, 1.2 rsnapshot.spec, 1.8, 1.9 Message-ID: <200605251726.k4PHQndx026138@cvs-int.fedora.redhat.com> Author: xris Update of /cvs/extras/rpms/rsnapshot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26116 Modified Files: rsnapshot.conf.patch rsnapshot.spec Log Message: update patch to work with 1.2.9 rsnapshot.conf.patch: Index: rsnapshot.conf.patch =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.conf.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rsnapshot.conf.patch 19 May 2006 23:34:16 -0000 1.1 +++ rsnapshot.conf.patch 25 May 2006 17:26:46 -0000 1.2 @@ -1,38 +1,43 @@ ---- rsnapshot.conf.default.in 2005-04-03 06:58:02.000000000 -0700 -+++ rsnapshot.conf.default.in.fedora 2005-04-03 06:58:11.000000000 -0700 -@@ -40,7 +40,7 @@ - # - # See the README file or the man page for more details. +--- rsnapshot.conf.default.in.orig 2006-05-25 10:21:10.000000000 -0700 ++++ rsnapshot.conf.default.in 2006-05-25 10:23:49.000000000 -0700 +@@ -39,13 +39,7 @@ + # LINUX USERS: Be sure to uncomment "cmd_cp". This gives you extra features. + # EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility. # +-# Note: Linux users with gnu cp/coreutils version > 5.3, should leave +-# cmd_cp commented out, since cp fails to create destination directories +-# with a trailing slash for versions 5.3 or later. +-# +-# See the README file or the man page for more details. +-# -#@CMD_CP@ + at CMD_CP@ # uncomment this to use the rm program instead of the built-in perl routine. - @CMD_RM@ -@@ -55,7 +55,7 @@ - @CMD_LOGGER@ - - # Uncomment this to specify a path to "du" for disk usage checks. + # +@@ -68,7 +62,7 @@ + # If you have an older version of "du", you may also want to check the + # "du_args" parameter below. + # -#@CMD_DU@ + at CMD_DU@ - ######################################### - # BACKUP INTERVALS # -@@ -94,7 +94,7 @@ - + # Uncomment this to specify the path to rsnapshot-diff. + # +@@ -117,14 +111,14 @@ # If you enable this, data will be written to the file you specify. The # amount of data written is controlled by the "loglevel" parameter. + # -#logfile /var/log/rsnapshot +logfile /var/log/rsnapshot - # The include and exclude parameters, if enabled, simply get passed directly - # to rsync. If you have multiple include/exclude patterns, put each one on a -@@ -138,7 +138,7 @@ + # If enabled, rsnapshot will write a lockfile to prevent two instances + # from running simultaneously (and messing up the snapshot_root). # If you enable this, make sure the lockfile directory is not world # writable. Otherwise anyone can prevent the program from running. # -#lockfile /var/run/rsnapshot.pid +lockfile /var/run/rsnapshot.pid - # If enabled, rsnapshot will move the oldest directory for each interval - # to [interval_name].delete, then it will delete that directory as a + # Default rsync args. All rsync commands have at least these options set. + # Index: rsnapshot.spec =================================================================== RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rsnapshot.spec 25 May 2006 07:22:41 -0000 1.8 +++ rsnapshot.spec 25 May 2006 17:26:46 -0000 1.9 @@ -4,7 +4,7 @@ Name: rsnapshot Version: 1.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Local and remote filesystem snapshot utility Group: Applications/System @@ -120,6 +120,9 @@ %changelog +* Thu May 25 2006 Chris Petersen 1.2.9-2 +- Update configfile patch to work with 1.2.9 + * Sat May 21 2006 Chris Petersen 1.2.9-1 - Preliminary build for 1.2.9 From fedora-extras-commits at redhat.com Thu May 25 17:09:36 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 25 May 2006 10:09:36 -0700 Subject: rpms/milter-regex/devel milter-regex-initscript, NONE, 1.1 milter-regex-options, NONE, 1.1 milter-regex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605251709.k4PH9cp7025973@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/milter-regex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25933/devel Modified Files: .cvsignore sources Added Files: milter-regex-initscript milter-regex-options milter-regex.spec Log Message: auto-import milter-regex-1.6-5 on branch devel from milter-regex-1.6-5.src.rpm --- NEW FILE milter-regex-initscript --- #!/bin/sh # # Startup script for milter-regex # # chkconfig: - 75 40 # description: Allows sendmail to filter mail using regular expressions # processname: milter-regex # config: /etc/mail/milter-regex.conf /etc/sysconfig/milter-regex # Source function library. . /etc/rc.d/init.d/functions # Source options file [ -f /etc/sysconfig/milter-regex ] && . /etc/sysconfig/milter-regex [ -f /usr/sbin/milter-regex ] || exit 0 prog="milter-regex" start() { echo -n $"Starting $prog: " daemon $prog $OPTIONS RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/milter-regex echo return $RETVAL } stop() { if test "x`pidof milter-regex`" != x; then echo -n $"Stopping $prog: " killproc milter-regex echo fi RETVAL=$? rm -f /var/lock/subsys/milter-regex return $RETVAL } case "$1" in start) start ;; stop) stop ;; status) status milter-regex ;; restart) stop start ;; condrestart|reload) if test "x`pidof milter-regex`" != x; then stop start fi ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" exit 1 esac exit $RETVAL --- NEW FILE milter-regex-options --- # -c configfile -u user -p fifo_file # Defaults # configfile: /etc/mail/milter-regex.conf # user: mregex # fifo: /var/spool/milter-regex/sock OPTIONS= --- NEW FILE milter-regex.spec --- Name: milter-regex Version: 1.6 Release: 5%{?dist} Summary: Sendmail milter plugin for regular expression filtering Group: System Environment/Daemons License: BSD URL: http://www.benzedrine.cx/milter-regex.html Source0: http://www.benzedrine.cx/milter-regex-%{version}.tar.gz Source1: milter-regex-initscript Source2: milter-regex-options Buildroot: %{_tmppath}/%{name}-%{release}-root-%(%{__id_u} -n) Buildrequires: sendmail-devel >= 8.13, byacc, groff Requires: sendmail Requires(pre): /usr/sbin/useradd Requires(post): /usr/sbin/useradd Requires(preun): /sbin/chkconfig, /sbin/service Requires(postun): /sbin/service %description Milter-regex is a milter based filter that makes it possible to filter emails using regular expressions. %prep %setup -q -n %{name} %{__perl} -pi -e 's+/etc/milter-regex\.conf+%{_sysconfdir}/mail/milter-regex.conf+' milter-regex.[8c] %{__perl} -pi -e 's+_milter-regex+mregex+' milter-regex.[8c] /usr/bin/head -n +31 milter-regex.c > LICENSE %build %{__make} %{?_smp_mflags} -f Makefile.linux CFLAGS="%{optflags}" %install %{__rm} -rf %{buildroot} %{__mkdir} -p %{buildroot}%{_sbindir} \ %{buildroot}%{_sysconfdir}/{rc.d/init.d,mail,sysconfig} \ %{buildroot}%{_mandir}/man8 \ %{buildroot}%{_localstatedir}/spool/milter-regex %{__cp} -p milter-regex %{buildroot}%{_sbindir} %{__cp} -p milter-regex.8 %{buildroot}%{_mandir}/man8 %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/milter-regex %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/milter-regex %{__cat} > %{buildroot}%{_sysconfdir}/mail/milter-regex.conf << EOF # Insert here Your milter-regex rules. # See manpage milter-regex for details. # You don't need to reload config; milter-regex reloads it when it changes. EOF # Create a ghost sock file so we can remove it on package deletion : > %{buildroot}%{_localstatedir}/spool/milter-regex/sock %pre /usr/sbin/useradd -r -M -d / -s /sbin/nologin -c "Regex Milter" mregex &> /dev/null || : %post /sbin/chkconfig --add milter-regex || : %preun if [ $1 -eq 0 ] ; then /sbin/service milter-regex stop &> /dev/null || : /sbin/chkconfig --del milter-regex || : fi %postun [ $1 -eq 0 ] && /sbin/service milter-regexp condrestart &> /dev/null || : %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root) %doc LICENSE %{_sbindir}/milter-regex %{_sysconfdir}/rc.d/init.d/milter-regex %config(noreplace) %{_sysconfdir}/sysconfig/milter-regex %config(noreplace) %{_sysconfdir}/mail/milter-regex.conf %dir %attr(755,mregex,mregex) %{_localstatedir}/spool/milter-regex %ghost %{_localstatedir}/spool/milter-regex/sock %{_mandir}/man8/milter-regex.8* %changelog * Thu May 25 2006 Paul Howarth - 1.6-5 - Address issues raised in review (#189611) - Add sendmail dependency - Honor %%{optflags} * Fri Apr 21 2006 Paul Howarth - 1.6-4 - Minor cosmetic changes for resubmission for Fedora Extras * Fri Nov 18 2005 Paul Howarth - 1.6-3 - Remove redundant ver_ and rel_ macros - Don't include package name in the summary - Use macros consistently - Generate LICENSE file in %%prep rather than %%install - Don't strip binary, so debuginfo package is useful - Combine groupadd+useradd into a single useradd command - Use /sbin/nologin for mregex shell instead of non-existent /bin/nologin - Don't delete user+group on package removal (see http://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) - Install initscript in %%{_sysconfdir} rather than /etc/init.d - Don't enable service by default on installation - Add scriptlet dependencies - Add buildreq groff - Use full URL for source - Edit username in man page as well as in code - Use install rather than cp to install %%{SOURCE1} and %%{SOURCE2} so that permissions don't need to be set in SRPM - Ghost the socket for clean package removal - Buildreq sendmail-devel >= 8.13.0 because of the use of SMFIF_QUARANTINE - Use dist tag * Tue Jan 25 2005 Victor Ramirez - 1.6-2 - Initial rpm release - Modified user and configuration file location. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/milter-regex/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 May 2006 17:08:37 -0000 1.1 +++ .cvsignore 25 May 2006 17:09:36 -0000 1.2 @@ -0,0 +1 @@ +milter-regex-1.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/milter-regex/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 May 2006 17:08:37 -0000 1.1 +++ sources 25 May 2006 17:09:36 -0000 1.2 @@ -0,0 +1 @@ +6b5dbc79b0c78cf186f9a19f8d4e3889 milter-regex-1.6.tar.gz From fedora-extras-commits at redhat.com Thu May 25 18:07:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:07:24 -0700 Subject: rpms/perl-Pipeline - New directory Message-ID: <200605251807.k4PI7Qvl028616@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28590/perl-Pipeline Log Message: Directory /cvs/extras/rpms/perl-Pipeline added to the repository From fedora-extras-commits at redhat.com Thu May 25 18:07:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:07:25 -0700 Subject: rpms/perl-Pipeline/devel - New directory Message-ID: <200605251807.k4PI7RCD028619@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28590/perl-Pipeline/devel Log Message: Directory /cvs/extras/rpms/perl-Pipeline/devel added to the repository From fedora-extras-commits at redhat.com Thu May 25 18:07:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:07:54 -0700 Subject: rpms/perl-Pipeline/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605251807.k4PI7uhR028666@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28635/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Pipeline --- NEW 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 May 25 18:07:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:07:53 -0700 Subject: rpms/perl-Pipeline Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605251807.k4PI7tSC028663@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28635 Added Files: Makefile import.log Log Message: Setup of module perl-Pipeline --- NEW FILE Makefile --- # Top level Makefile for module perl-Pipeline all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 25 18:08:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:08:54 -0700 Subject: rpms/perl-Pipeline import.log,1.1,1.2 Message-ID: <200605251808.k4PI8uDE028732@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28699 Modified Files: import.log Log Message: auto-import perl-Pipeline-3.12-1 on branch devel from perl-Pipeline-3.12-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Pipeline/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 May 2006 18:07:53 -0000 1.1 +++ import.log 25 May 2006 18:08:54 -0000 1.2 @@ -0,0 +1 @@ +perl-Pipeline-3_12-1:HEAD:perl-Pipeline-3.12-1.src.rpm:1148580518 From fedora-extras-commits at redhat.com Thu May 25 18:08:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:08:54 -0700 Subject: rpms/perl-Pipeline/devel perl-Pipeline.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605251808.k4PI8u9M028737@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28699/devel Modified Files: .cvsignore sources Added Files: perl-Pipeline.spec Log Message: auto-import perl-Pipeline-3.12-1 on branch devel from perl-Pipeline-3.12-1.src.rpm --- NEW FILE perl-Pipeline.spec --- Name: perl-Pipeline Version: 3.12 Release: 1%{?dist} Summary: Generic pipeline interface License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Pipeline/ Source0: http://www.cpan.org/authors/id/R/RC/RCLAMP/Pipeline-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Data::Structure::Util) >= 0.04 BuildRequires: perl(Data::UUID) >= 0.01 BuildRequires: perl(Error) >= 0.15 BuildRequires: perl(IO::Null) >= 0.01 BuildRequires: perl(IO::String) >= 0.01 Requires: perl(Data::Structure::Util) >= 0.04 Requires: perl(Data::UUID) >= 0.01 Requires: perl(Error) >= 0.15 Requires: perl(IO::Null) >= 0.01 Requires: perl(IO::String) >= 0.01 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Pipelines are a mechanism to process data. They are designed to be plugged together to make fairly complex operations act in a fairly straightforward manner, cleanly, and simply. %prep %setup -q -n Pipeline-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Fri Mar 24 2006 Steven Pritchard 3.12-1 - Specfile autogenerated by cpanspec 1.63. - Drop NINJA from docs. - Fix License. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Pipeline/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 May 2006 18:07:54 -0000 1.1 +++ .cvsignore 25 May 2006 18:08:54 -0000 1.2 @@ -0,0 +1 @@ +Pipeline-3.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Pipeline/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 May 2006 18:07:54 -0000 1.1 +++ sources 25 May 2006 18:08:54 -0000 1.2 @@ -0,0 +1 @@ +52cbc818aa18f7307dc00624741e5a73 Pipeline-3.12.tar.gz From fedora-extras-commits at redhat.com Thu May 25 18:40:59 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 11:40:59 -0700 Subject: rpms/perl-Pipeline/devel perl-Pipeline.spec,1.1,1.2 Message-ID: <200605251841.k4PIf1GM028892@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Pipeline/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28875 Modified Files: perl-Pipeline.spec Log Message: Add BR: File::Find::Rule for better test coverage. Index: perl-Pipeline.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Pipeline/devel/perl-Pipeline.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Pipeline.spec 25 May 2006 18:08:54 -0000 1.1 +++ perl-Pipeline.spec 25 May 2006 18:40:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Pipeline Version: 3.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generic pipeline interface License: GPL or Artistic Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: perl(Error) >= 0.15 BuildRequires: perl(IO::Null) >= 0.01 BuildRequires: perl(IO::String) >= 0.01 +BuildRequires: perl(File::Find::Rule) Requires: perl(Data::Structure::Util) >= 0.04 Requires: perl(Data::UUID) >= 0.01 Requires: perl(Error) >= 0.15 @@ -55,6 +56,9 @@ %{_mandir}/man3/* %changelog +* Thu May 25 2006 Steven Pritchard 3.12-2 +- Add BR: File::Find::Rule for better test coverage. + * Fri Mar 24 2006 Steven Pritchard 3.12-1 - Specfile autogenerated by cpanspec 1.63. - Drop NINJA from docs. From fedora-extras-commits at redhat.com Thu May 25 18:51:04 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 11:51:04 -0700 Subject: rpms/texmaker import.log,1.2,1.3 Message-ID: <200605251851.k4PIp6iq029038@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29003 Modified Files: import.log Log Message: auto-import texmaker-1.3-1 on branch devel from texmaker-1.3-1.src.rpm import version 1.3 update Index: import.log =================================================================== RCS file: /cvs/extras/rpms/texmaker/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 28 Oct 2005 16:32:07 -0000 1.2 +++ import.log 25 May 2006 18:51:04 -0000 1.3 @@ -1 +1,2 @@ texmaker-1_12-3:HEAD:texmaker-1.12-3.src.rpm:1130517113 +texmaker-1_3-1:HEAD:texmaker-1.3-1.src.rpm:1148582993 From fedora-extras-commits at redhat.com Thu May 25 18:51:05 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 11:51:05 -0700 Subject: rpms/texmaker/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 texmaker-desktop.patch, 1.1, 1.2 texmaker-tools.patch, 1.1, 1.2 texmaker.spec, 1.3, 1.4 texmaker-install.patch, 1.1, NONE Message-ID: <200605251851.k4PIp7Gf029052@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29003/devel Modified Files: .cvsignore sources texmaker-desktop.patch texmaker-tools.patch texmaker.spec Removed Files: texmaker-install.patch Log Message: auto-import texmaker-1.3-1 on branch devel from texmaker-1.3-1.src.rpm import version 1.3 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Oct 2005 16:32:27 -0000 1.2 +++ .cvsignore 25 May 2006 18:51:05 -0000 1.3 @@ -1 +1 @@ -texmaker-1.12.tar.bz2 +texmaker-1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Oct 2005 16:32:27 -0000 1.2 +++ sources 25 May 2006 18:51:05 -0000 1.3 @@ -1 +1 @@ -af243a0506a296216b51aad80b244c63 texmaker-1.12.tar.bz2 +17f91175a32827e9c9f45dc7a20a0c2b texmaker-1.3.tar.bz2 texmaker-desktop.patch: Index: texmaker-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker-desktop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-desktop.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-desktop.patch 25 May 2006 18:51:05 -0000 1.2 @@ -1,12 +1,12 @@ --- utilities/texmaker.desktop 2005-04-24 14:55:25.000000000 -0400 +++ utilities/texmaker.desktop.new 2005-10-28 10:15:46.000000000 -0400 -@@ -1,20 +1,15 @@ +@@ -1,20 +1,16 @@ [Desktop Entry] --Categories=Qt;KDE;Publishing; +-Categories=Application;Utility;TextEditor;Publishing; -Comment= -Comment[fr]= -DocPath= -+Categories=Application;Publishing;Qt; ++Categories=Application;Utility;TextEditor;Publishing;Qt; Encoding=UTF-8 Exec=texmaker GenericName=LaTeX Editor @@ -14,15 +14,13 @@ Icon=texmaker MimeType=text/x-tex -MiniIcon=texmaker --Name=Texmaker --Name[fr]=Texmaker +X-KDE-StartupNotify=true -+Name=Texmaker LaTeX Editor -+Name[fr]=Texmaker Editeur LaTeX + Name=Texmaker + Name[fr]=Texmaker Path= -StartupNotify=false +StartupNotify=true Terminal=false -TerminalOptions= Type=Application -- + texmaker-tools.patch: Index: texmaker-tools.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker-tools.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-tools.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-tools.patch 25 May 2006 18:51:05 -0000 1.2 @@ -1,13 +1,24 @@ --- texmaker.cpp 2005-04-24 17:40:58.000000000 -0400 +++ texmaker.cpp.new 2005-10-27 13:25:15.000000000 -0400 -@@ -4033,8 +4033,8 @@ +@@ -1759,7 +1759,7 @@ + metapost_command=config.value("Tools/Metapost","\"/usr/local/teTeX/bin/powerpc-apple-darwin-current/mpost\" --interaction nonstopmode ").toString(); + #else + latex_command=config.value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString(); +-dvips_command=config.value("Tools/Dvips","dvips -o %.ps %.dvi").toString(); ++dvips_command=config.value("Tools/Dvips","dvips -o -t %.ps %.dvi").toString(); + ps2pdf_command=config.value("Tools/Ps2pdf","ps2pdf %.ps").toString(); + makeindex_command=config.value("Tools/Makeindex","makeindex %.idx").toString(); + bibtex_command=config.value("Tools/Bibtex","bibtex %.aux").toString(); +@@ -1778,9 +1778,9 @@ + viewpdf_command=config.value("Tools/Pdf","\"C:/Program Files/Adobe/Acrobat 7.0/Reader/AcroRd32.exe\" %.pdf").toString(); #endif #ifdef Q_WS_X11 - viewdvi_command=config.readEntry("/Tools/Dvi","xdvi %.dvi"); --viewps_command=config.readEntry("/Tools/Ps","gv %.ps"); --viewpdf_command=config.readEntry("/Tools/Pdf","xpdf %.pdf"); -+viewps_command=config.readEntry("/Tools/Ps","evince %.ps"); -+viewpdf_command=config.readEntry("/Tools/Pdf","evince %.pdf"); +-viewdvi_command=config.value("Tools/Dvi","xdvi %.dvi").toString(); +-viewps_command=config.value("Tools/Ps","gv %.ps").toString(); +-viewpdf_command=config.value("Tools/Pdf","xpdf %.pdf").toString(); ++viewdvi_command=config.value("Tools/Dvi","evince %.dvi").toString(); ++viewps_command=config.value("Tools/Ps","evince %.ps").toString(); ++viewpdf_command=config.value("Tools/Pdf","evince %.pdf").toString(); #endif #ifdef Q_WS_MACX - viewdvi_command=config.readEntry("/Tools/Dvi","/Applications/Preview.app/Contents/MacOS/Preview %.dvi"); + viewdvi_command=config.value("Tools/Dvi","open %.dvi").toString(); Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- texmaker.spec 13 Feb 2006 21:03:38 -0000 1.3 +++ texmaker.spec 25 May 2006 18:51:05 -0000 1.4 @@ -1,20 +1,21 @@ Summary: LaTeX editor Name: texmaker -Version: 1.12 -Release: 4%{?dist} +Version: 1.3 +Release: 1%{?dist} +Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel +BuildRequires: qt4-devel BuildRequires: desktop-file-utils +Requires: tetex-latex, tetex-dvipost Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Patch0: %{name}-desktop.patch -Patch1: %{name}-install.patch # Patch to use default Fedora's document viewer -Patch2: %{name}-tools.patch +Patch1: %{name}-tools.patch %description Texmaker is a program, that integrates many tools needed to develop @@ -24,14 +25,12 @@ %prep %setup -q -%patch0 -p0 -b .desktop -%patch1 -p0 -b .install -%patch2 -p0 -b .tools +%patch0 -p0 -b .install +%patch1 -p0 -b .tools %build -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -${QTDIR}/bin/qmake -makefile -unix texmaker.pro +export QTDIR=%{_libdir}/qt4 +qmake4 -unix PREFIX=%{buildroot}%{_prefix} texmaker.pro make %{?_smp_mflags} @@ -78,12 +77,17 @@ %files %defattr(-, root, root, -) %doc utilities/AUTHORS utilities/COPYING -%_bindir/texmaker +%{_bindir}/texmaker %{_datadir}/texmaker/ %{_datadir}/applications/fedora-texmaker.desktop %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Thu May 25 2006 Deji Akingunola - 1.3-1 +- Updated to 1.3 - had to add epoch to facilitate an upgrade +- New version depends on qt4 +- Explicitly add tetex-dvips Requires + * Mon Feb 13 2006 Deji Akingunola - 1.12-4 - Rebuild for Fedora Extras 5 --- texmaker-install.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 25 19:03:47 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 12:03:47 -0700 Subject: rpms/texmaker import.log,1.3,1.4 Message-ID: <200605251903.k4PJ3n4Q031564@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31529 Modified Files: import.log Log Message: auto-import texmaker-1.3-1 on branch FC-5 from texmaker-1.3-1.src.rpm import version 1.3 update Index: import.log =================================================================== RCS file: /cvs/extras/rpms/texmaker/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 25 May 2006 18:51:04 -0000 1.3 +++ import.log 25 May 2006 19:03:47 -0000 1.4 @@ -1,2 +1,3 @@ texmaker-1_12-3:HEAD:texmaker-1.12-3.src.rpm:1130517113 texmaker-1_3-1:HEAD:texmaker-1.3-1.src.rpm:1148582993 +texmaker-1_3-1:FC-5:texmaker-1.3-1.src.rpm:1148583756 From fedora-extras-commits at redhat.com Thu May 25 19:03:48 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 12:03:48 -0700 Subject: rpms/texmaker/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 texmaker-desktop.patch, 1.1, 1.2 texmaker-tools.patch, 1.1, 1.2 texmaker.spec, 1.3, 1.4 texmaker-install.patch, 1.1, NONE Message-ID: <200605251903.k4PJ3o9T031578@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31529/FC-5 Modified Files: .cvsignore sources texmaker-desktop.patch texmaker-tools.patch texmaker.spec Removed Files: texmaker-install.patch Log Message: auto-import texmaker-1.3-1 on branch FC-5 from texmaker-1.3-1.src.rpm import version 1.3 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Oct 2005 16:32:27 -0000 1.2 +++ .cvsignore 25 May 2006 19:03:48 -0000 1.3 @@ -1 +1 @@ -texmaker-1.12.tar.bz2 +texmaker-1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Oct 2005 16:32:27 -0000 1.2 +++ sources 25 May 2006 19:03:48 -0000 1.3 @@ -1 +1 @@ -af243a0506a296216b51aad80b244c63 texmaker-1.12.tar.bz2 +17f91175a32827e9c9f45dc7a20a0c2b texmaker-1.3.tar.bz2 texmaker-desktop.patch: Index: texmaker-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker-desktop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-desktop.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-desktop.patch 25 May 2006 19:03:48 -0000 1.2 @@ -1,12 +1,12 @@ --- utilities/texmaker.desktop 2005-04-24 14:55:25.000000000 -0400 +++ utilities/texmaker.desktop.new 2005-10-28 10:15:46.000000000 -0400 -@@ -1,20 +1,15 @@ +@@ -1,20 +1,16 @@ [Desktop Entry] --Categories=Qt;KDE;Publishing; +-Categories=Application;Utility;TextEditor;Publishing; -Comment= -Comment[fr]= -DocPath= -+Categories=Application;Publishing;Qt; ++Categories=Application;Utility;TextEditor;Publishing;Qt; Encoding=UTF-8 Exec=texmaker GenericName=LaTeX Editor @@ -14,15 +14,13 @@ Icon=texmaker MimeType=text/x-tex -MiniIcon=texmaker --Name=Texmaker --Name[fr]=Texmaker +X-KDE-StartupNotify=true -+Name=Texmaker LaTeX Editor -+Name[fr]=Texmaker Editeur LaTeX + Name=Texmaker + Name[fr]=Texmaker Path= -StartupNotify=false +StartupNotify=true Terminal=false -TerminalOptions= Type=Application -- + texmaker-tools.patch: Index: texmaker-tools.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker-tools.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-tools.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-tools.patch 25 May 2006 19:03:48 -0000 1.2 @@ -1,13 +1,24 @@ --- texmaker.cpp 2005-04-24 17:40:58.000000000 -0400 +++ texmaker.cpp.new 2005-10-27 13:25:15.000000000 -0400 -@@ -4033,8 +4033,8 @@ +@@ -1759,7 +1759,7 @@ + metapost_command=config.value("Tools/Metapost","\"/usr/local/teTeX/bin/powerpc-apple-darwin-current/mpost\" --interaction nonstopmode ").toString(); + #else + latex_command=config.value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString(); +-dvips_command=config.value("Tools/Dvips","dvips -o %.ps %.dvi").toString(); ++dvips_command=config.value("Tools/Dvips","dvips -o -t %.ps %.dvi").toString(); + ps2pdf_command=config.value("Tools/Ps2pdf","ps2pdf %.ps").toString(); + makeindex_command=config.value("Tools/Makeindex","makeindex %.idx").toString(); + bibtex_command=config.value("Tools/Bibtex","bibtex %.aux").toString(); +@@ -1778,9 +1778,9 @@ + viewpdf_command=config.value("Tools/Pdf","\"C:/Program Files/Adobe/Acrobat 7.0/Reader/AcroRd32.exe\" %.pdf").toString(); #endif #ifdef Q_WS_X11 - viewdvi_command=config.readEntry("/Tools/Dvi","xdvi %.dvi"); --viewps_command=config.readEntry("/Tools/Ps","gv %.ps"); --viewpdf_command=config.readEntry("/Tools/Pdf","xpdf %.pdf"); -+viewps_command=config.readEntry("/Tools/Ps","evince %.ps"); -+viewpdf_command=config.readEntry("/Tools/Pdf","evince %.pdf"); +-viewdvi_command=config.value("Tools/Dvi","xdvi %.dvi").toString(); +-viewps_command=config.value("Tools/Ps","gv %.ps").toString(); +-viewpdf_command=config.value("Tools/Pdf","xpdf %.pdf").toString(); ++viewdvi_command=config.value("Tools/Dvi","evince %.dvi").toString(); ++viewps_command=config.value("Tools/Ps","evince %.ps").toString(); ++viewpdf_command=config.value("Tools/Pdf","evince %.pdf").toString(); #endif #ifdef Q_WS_MACX - viewdvi_command=config.readEntry("/Tools/Dvi","/Applications/Preview.app/Contents/MacOS/Preview %.dvi"); + viewdvi_command=config.value("Tools/Dvi","open %.dvi").toString(); Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- texmaker.spec 13 Feb 2006 21:03:38 -0000 1.3 +++ texmaker.spec 25 May 2006 19:03:48 -0000 1.4 @@ -1,20 +1,21 @@ Summary: LaTeX editor Name: texmaker -Version: 1.12 -Release: 4%{?dist} +Version: 1.3 +Release: 1%{?dist} +Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel +BuildRequires: qt4-devel BuildRequires: desktop-file-utils +Requires: tetex-latex, tetex-dvipost Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Patch0: %{name}-desktop.patch -Patch1: %{name}-install.patch # Patch to use default Fedora's document viewer -Patch2: %{name}-tools.patch +Patch1: %{name}-tools.patch %description Texmaker is a program, that integrates many tools needed to develop @@ -24,14 +25,12 @@ %prep %setup -q -%patch0 -p0 -b .desktop -%patch1 -p0 -b .install -%patch2 -p0 -b .tools +%patch0 -p0 -b .install +%patch1 -p0 -b .tools %build -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -${QTDIR}/bin/qmake -makefile -unix texmaker.pro +export QTDIR=%{_libdir}/qt4 +qmake4 -unix PREFIX=%{buildroot}%{_prefix} texmaker.pro make %{?_smp_mflags} @@ -78,12 +77,17 @@ %files %defattr(-, root, root, -) %doc utilities/AUTHORS utilities/COPYING -%_bindir/texmaker +%{_bindir}/texmaker %{_datadir}/texmaker/ %{_datadir}/applications/fedora-texmaker.desktop %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Thu May 25 2006 Deji Akingunola - 1.3-1 +- Updated to 1.3 - had to add epoch to facilitate an upgrade +- New version depends on qt4 +- Explicitly add tetex-dvips Requires + * Mon Feb 13 2006 Deji Akingunola - 1.12-4 - Rebuild for Fedora Extras 5 --- texmaker-install.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 25 19:04:38 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 12:04:38 -0700 Subject: rpms/texmaker/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 texmaker-desktop.patch, 1.1, 1.2 texmaker-tools.patch, 1.1, 1.2 texmaker.spec, 1.2, 1.3 texmaker-install.patch, 1.1, NONE Message-ID: <200605251904.k4PJ4eeU031703@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654/FC-4 Modified Files: .cvsignore sources texmaker-desktop.patch texmaker-tools.patch texmaker.spec Removed Files: texmaker-install.patch Log Message: auto-import texmaker-1.3-1 on branch FC-4 from texmaker-1.3-1.src.rpm import version 1.3 update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Oct 2005 16:32:27 -0000 1.2 +++ .cvsignore 25 May 2006 19:04:38 -0000 1.3 @@ -1 +1 @@ -texmaker-1.12.tar.bz2 +texmaker-1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Oct 2005 16:32:27 -0000 1.2 +++ sources 25 May 2006 19:04:38 -0000 1.3 @@ -1 +1 @@ -af243a0506a296216b51aad80b244c63 texmaker-1.12.tar.bz2 +17f91175a32827e9c9f45dc7a20a0c2b texmaker-1.3.tar.bz2 texmaker-desktop.patch: Index: texmaker-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker-desktop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-desktop.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-desktop.patch 25 May 2006 19:04:38 -0000 1.2 @@ -1,12 +1,12 @@ --- utilities/texmaker.desktop 2005-04-24 14:55:25.000000000 -0400 +++ utilities/texmaker.desktop.new 2005-10-28 10:15:46.000000000 -0400 -@@ -1,20 +1,15 @@ +@@ -1,20 +1,16 @@ [Desktop Entry] --Categories=Qt;KDE;Publishing; +-Categories=Application;Utility;TextEditor;Publishing; -Comment= -Comment[fr]= -DocPath= -+Categories=Application;Publishing;Qt; ++Categories=Application;Utility;TextEditor;Publishing;Qt; Encoding=UTF-8 Exec=texmaker GenericName=LaTeX Editor @@ -14,15 +14,13 @@ Icon=texmaker MimeType=text/x-tex -MiniIcon=texmaker --Name=Texmaker --Name[fr]=Texmaker +X-KDE-StartupNotify=true -+Name=Texmaker LaTeX Editor -+Name[fr]=Texmaker Editeur LaTeX + Name=Texmaker + Name[fr]=Texmaker Path= -StartupNotify=false +StartupNotify=true Terminal=false -TerminalOptions= Type=Application -- + texmaker-tools.patch: Index: texmaker-tools.patch =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker-tools.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- texmaker-tools.patch 28 Oct 2005 16:32:27 -0000 1.1 +++ texmaker-tools.patch 25 May 2006 19:04:38 -0000 1.2 @@ -1,13 +1,24 @@ --- texmaker.cpp 2005-04-24 17:40:58.000000000 -0400 +++ texmaker.cpp.new 2005-10-27 13:25:15.000000000 -0400 -@@ -4033,8 +4033,8 @@ +@@ -1759,7 +1759,7 @@ + metapost_command=config.value("Tools/Metapost","\"/usr/local/teTeX/bin/powerpc-apple-darwin-current/mpost\" --interaction nonstopmode ").toString(); + #else + latex_command=config.value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString(); +-dvips_command=config.value("Tools/Dvips","dvips -o %.ps %.dvi").toString(); ++dvips_command=config.value("Tools/Dvips","dvips -o -t %.ps %.dvi").toString(); + ps2pdf_command=config.value("Tools/Ps2pdf","ps2pdf %.ps").toString(); + makeindex_command=config.value("Tools/Makeindex","makeindex %.idx").toString(); + bibtex_command=config.value("Tools/Bibtex","bibtex %.aux").toString(); +@@ -1778,9 +1778,9 @@ + viewpdf_command=config.value("Tools/Pdf","\"C:/Program Files/Adobe/Acrobat 7.0/Reader/AcroRd32.exe\" %.pdf").toString(); #endif #ifdef Q_WS_X11 - viewdvi_command=config.readEntry("/Tools/Dvi","xdvi %.dvi"); --viewps_command=config.readEntry("/Tools/Ps","gv %.ps"); --viewpdf_command=config.readEntry("/Tools/Pdf","xpdf %.pdf"); -+viewps_command=config.readEntry("/Tools/Ps","evince %.ps"); -+viewpdf_command=config.readEntry("/Tools/Pdf","evince %.pdf"); +-viewdvi_command=config.value("Tools/Dvi","xdvi %.dvi").toString(); +-viewps_command=config.value("Tools/Ps","gv %.ps").toString(); +-viewpdf_command=config.value("Tools/Pdf","xpdf %.pdf").toString(); ++viewdvi_command=config.value("Tools/Dvi","evince %.dvi").toString(); ++viewps_command=config.value("Tools/Ps","evince %.ps").toString(); ++viewpdf_command=config.value("Tools/Pdf","evince %.pdf").toString(); #endif #ifdef Q_WS_MACX - viewdvi_command=config.readEntry("/Tools/Dvi","/Applications/Preview.app/Contents/MacOS/Preview %.dvi"); + viewdvi_command=config.value("Tools/Dvi","open %.dvi").toString(); Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- texmaker.spec 28 Oct 2005 17:29:24 -0000 1.2 +++ texmaker.spec 25 May 2006 19:04:38 -0000 1.3 @@ -1,20 +1,21 @@ Summary: LaTeX editor Name: texmaker -Version: 1.12 -Release: 3%{?dist} +Version: 1.3 +Release: 1%{?dist} +Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel +BuildRequires: qt4-devel BuildRequires: desktop-file-utils +Requires: tetex-latex, tetex-dvipost Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Patch0: %{name}-desktop.patch -Patch1: %{name}-install.patch # Patch to use default Fedora's document viewer -Patch2: %{name}-tools.patch +Patch1: %{name}-tools.patch %description Texmaker is a program, that integrates many tools needed to develop @@ -24,14 +25,12 @@ %prep %setup -q -%patch0 -p0 -b .desktop -%patch1 -p0 -b .install -%patch2 -p0 -b .tools +%patch0 -p0 -b .install +%patch1 -p0 -b .tools %build -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -${QTDIR}/bin/qmake -makefile -unix texmaker.pro +export QTDIR=%{_libdir}/qt4 +qmake4 -unix PREFIX=%{buildroot}%{_prefix} texmaker.pro make %{?_smp_mflags} @@ -78,12 +77,20 @@ %files %defattr(-, root, root, -) %doc utilities/AUTHORS utilities/COPYING -%_bindir/texmaker +%{_bindir}/texmaker %{_datadir}/texmaker/ %{_datadir}/applications/fedora-texmaker.desktop %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Thu May 25 2006 Deji Akingunola - 1.3-1 +- Updated to 1.3 - had to add epoch to facilitate an upgrade +- New version depends on qt4 +- Explicitly add tetex-dvips Requires + +* Mon Feb 13 2006 Deji Akingunola - 1.12-4 +- Rebuild for Fedora Extras 5 + * Fri Oct 28 2005 Deji Akingunola - 1.12-3 - Buildrequires qt-devel instead of kdelibs-devel - Fix typos in desktop file patch --- texmaker-install.patch DELETED --- From fedora-extras-commits at redhat.com Thu May 25 19:04:37 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 25 May 2006 12:04:37 -0700 Subject: rpms/texmaker import.log,1.4,1.5 Message-ID: <200605251904.k4PJ4du4031689@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654 Modified Files: import.log Log Message: auto-import texmaker-1.3-1 on branch FC-4 from texmaker-1.3-1.src.rpm import version 1.3 update Index: import.log =================================================================== RCS file: /cvs/extras/rpms/texmaker/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 25 May 2006 19:03:47 -0000 1.4 +++ import.log 25 May 2006 19:04:37 -0000 1.5 @@ -1,3 +1,4 @@ texmaker-1_12-3:HEAD:texmaker-1.12-3.src.rpm:1130517113 texmaker-1_3-1:HEAD:texmaker-1.3-1.src.rpm:1148582993 texmaker-1_3-1:FC-5:texmaker-1.3-1.src.rpm:1148583756 +texmaker-1_3-1:FC-4:texmaker-1.3-1.src.rpm:1148583805 From fedora-extras-commits at redhat.com Thu May 25 19:24:08 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 25 May 2006 12:24:08 -0700 Subject: owners owners.list,1.1055,1.1056 Message-ID: <200605251924.k4PJOA8h031932@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31914 Modified Files: owners.list Log Message: Add perl-Pipeline. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1055 retrieving revision 1.1056 diff -u -r1.1055 -r1.1056 --- owners.list 25 May 2006 17:17:47 -0000 1.1055 +++ owners.list 25 May 2006 19:24:08 -0000 1.1056 @@ -1178,6 +1178,7 @@ Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PBS|Perl binding for the Portable Batch System client library|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Pipeline|Generic pipeline interface|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu May 25 22:09:13 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 25 May 2006 15:09:13 -0700 Subject: rpms/pgp-tools/devel .cvsignore, 1.3, 1.4 pgp-tools.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605252209.k4PM9G9C007182@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7161 Modified Files: .cvsignore pgp-tools.spec sources Log Message: upgrade to 0.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 04:51:50 -0000 1.3 +++ .cvsignore 25 May 2006 22:09:13 -0000 1.4 @@ -1 +1 @@ -pgp-tools-0.4.4-20060212svn.tar.bz2 +pgp-tools-0.4.6-20060525svn.tar.bz2 Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pgp-tools.spec 13 Feb 2006 04:51:11 -0000 1.2 +++ pgp-tools.spec 25 May 2006 22:09:13 -0000 1.3 @@ -1,7 +1,7 @@ -%define alphatag 20060212svn +%define alphatag 20060525svn Name: pgp-tools -Version: 0.4.4 -Release: 3.%{alphatag}%{?dist} +Version: 0.4.6 +Release: 1.%{alphatag}%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System License: BSD, GPL @@ -68,6 +68,9 @@ %changelog +* Thu May 25 2006 Matt Domsch 0.4.6-1.20060525svn +- upgrade to lastest upstream + * Sun Feb 12 2006 Matt Domsch 0.4.4-3.20060212svn - upgrade to lastest upstream - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 04:51:50 -0000 1.3 +++ sources 25 May 2006 22:09:13 -0000 1.4 @@ -1 +1 @@ -e77dc370a32731cd60d0ceb47218db96 pgp-tools-0.4.4-20060212svn.tar.bz2 +4d3630eeb382c04476631841f874516d pgp-tools-0.4.6-20060525svn.tar.bz2 From fedora-extras-commits at redhat.com Thu May 25 22:10:22 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 25 May 2006 15:10:22 -0700 Subject: rpms/pgp-tools/FC-5 .cvsignore, 1.3, 1.4 pgp-tools.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200605252210.k4PMAO8I007239@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7217 Modified Files: .cvsignore pgp-tools.spec sources Log Message: upgrade to 0.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 04:51:50 -0000 1.3 +++ .cvsignore 25 May 2006 22:10:22 -0000 1.4 @@ -1 +1 @@ -pgp-tools-0.4.4-20060212svn.tar.bz2 +pgp-tools-0.4.6-20060525svn.tar.bz2 Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/pgp-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pgp-tools.spec 13 Feb 2006 04:51:11 -0000 1.2 +++ pgp-tools.spec 25 May 2006 22:10:22 -0000 1.3 @@ -1,7 +1,7 @@ -%define alphatag 20060212svn +%define alphatag 20060525svn Name: pgp-tools -Version: 0.4.4 -Release: 3.%{alphatag}%{?dist} +Version: 0.4.6 +Release: 1.%{alphatag}%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System License: BSD, GPL @@ -68,6 +68,9 @@ %changelog +* Thu May 25 2006 Matt Domsch 0.4.6-1.20060525svn +- upgrade to lastest upstream + * Sun Feb 12 2006 Matt Domsch 0.4.4-3.20060212svn - upgrade to lastest upstream - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 04:51:50 -0000 1.3 +++ sources 25 May 2006 22:10:22 -0000 1.4 @@ -1 +1 @@ -e77dc370a32731cd60d0ceb47218db96 pgp-tools-0.4.4-20060212svn.tar.bz2 +4d3630eeb382c04476631841f874516d pgp-tools-0.4.6-20060525svn.tar.bz2 From fedora-extras-commits at redhat.com Thu May 25 22:15:41 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 25 May 2006 15:15:41 -0700 Subject: rpms/pgp-tools/FC-4 .cvsignore, 1.2, 1.3 pgp-tools.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605252215.k4PMFhf7007309@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7288 Modified Files: .cvsignore pgp-tools.spec sources Log Message: upgrade to 0.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 29 Nov 2005 17:18:35 -0000 1.2 +++ .cvsignore 25 May 2006 22:15:41 -0000 1.3 @@ -1 +1 @@ -pgp-tools-0.4.4-20051123svn.tar.bz2 +pgp-tools-0.4.6-20060525svn.tar.bz2 Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/pgp-tools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pgp-tools.spec 29 Nov 2005 17:18:35 -0000 1.1 +++ pgp-tools.spec 25 May 2006 22:15:41 -0000 1.2 @@ -1,7 +1,7 @@ -%define alphatag 20051123svn +%define alphatag 20060525svn Name: pgp-tools -Version: 0.4.4 -Release: 3.%{alphatag}%{?dist} +Version: 0.4.6 +Release: 1.%{alphatag}%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System License: BSD, GPL @@ -68,6 +68,13 @@ %changelog +* Thu May 25 2006 Matt Domsch 0.4.6-1.20060525svn +- upgrade to lastest upstream + +* Sun Feb 12 2006 Matt Domsch 0.4.4-3.20060212svn +- upgrade to lastest upstream +- rebuild for FC5 + * Tue Nov 29 2005 Matt Domsch 0.4.4-3.20051123svn - require perl(Locale::Recode) for gpgsigs Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Nov 2005 17:18:35 -0000 1.2 +++ sources 25 May 2006 22:15:41 -0000 1.3 @@ -1 +1 @@ -0c92a17af63242b52c63ad46b2091e2a pgp-tools-0.4.4-20051123svn.tar.bz2 +4d3630eeb382c04476631841f874516d pgp-tools-0.4.6-20060525svn.tar.bz2 From fedora-extras-commits at redhat.com Thu May 25 23:05:55 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:05:55 -0700 Subject: rpms/synaptic/FC-5 synaptic-0.57.2-gcc41.patch, NONE, 1.1 synaptic-0.57.2-repomd-1.patch, NONE, 1.1 synaptic-0.57.2-showprog.patch, NONE, 1.1 Message-ID: <200605252305.k4PN5vGv010059@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10010/FC-5 Added Files: synaptic-0.57.2-gcc41.patch synaptic-0.57.2-repomd-1.patch synaptic-0.57.2-showprog.patch Log Message: Sync FC-4/FC-5 with devel synaptic-0.57.2-gcc41.patch: --- NEW FILE synaptic-0.57.2-gcc41.patch --- --- synaptic-0.57.2/common/rcdscanner.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rcdscanner.h 2006-05-09 18:16:56.000000000 +0300 @@ -48,6 +48,7 @@ }; virtual void update(string text, int current) = 0; + virtual ~RCDScanProgress() {}; }; class RCDScanner { --- synaptic-0.57.2/common/rinstallprogress.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rinstallprogress.h 2006-05-09 18:16:56.000000000 +0300 @@ -63,6 +63,7 @@ RInstallProgress():_donePackagesTotal(0), _numPackagesTotal(0),_updateFinished(false) {}; + virtual ~RInstallProgress() {}; }; --- synaptic-0.57.2/common/indexcopy.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/indexcopy.h 2006-05-09 18:19:00.000000000 +0300 @@ -39,6 +39,7 @@ public: bool CopyPackages(string CDROM, string Name, vector &List); + virtual ~IndexCopy() {}; }; class PackageCopy:public IndexCopy { @@ -54,6 +55,7 @@ }; public: + virtual ~PackageCopy() {}; }; class SourceCopy:public IndexCopy { @@ -69,6 +71,7 @@ }; public: + virtual ~SourceCopy() {}; }; #endif --- synaptic-0.57.2/common/rpackagelister.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual void notifyChange(RPackage *pkg) = 0; virtual void notifyPreFilteredChange() = 0; virtual void notifyPostFilteredChange() = 0; + virtual ~RPackageObserver() {}; }; class RCacheObserver { @@ -71,6 +72,7 @@ virtual void notifyCacheOpen() = 0; virtual void notifyCachePreChange() = 0; virtual void notifyCachePostChange() = 0; + virtual ~RCacheObserver() {}; }; // base sort class --- synaptic-0.57.2/common/rpackagefilter.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagefilter.h 2006-05-09 18:16:56.000000000 +0300 @@ -130,7 +130,7 @@ bool and_mode; // patterns are applied in "AND" mode if true, "OR" if false inline bool filterName(Pattern pat, RPackage *pkg); - inline bool RPatternPackageFilter::filterVersion(Pattern pat, RPackage *pkg); + inline bool filterVersion(Pattern pat, RPackage *pkg); inline bool filterDescription(Pattern pat, RPackage *pkg); inline bool filterMaintainer(Pattern pat, RPackage *pkg); inline bool filterDepends(Pattern pat, RPackage *pkg, --- synaptic-0.57.2/common/rpackage.cc.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackage.cc 2006-05-09 18:16:56.000000000 +0300 @@ -848,7 +848,6 @@ void RPackage::setPinned(bool flag) { - FILE *out; struct stat stat_buf; string File =RStateDir() + "/preferences"; @@ -945,8 +944,8 @@ } } - return true; #endif + return true; } // format: first version, second archives --- synaptic-0.57.2/common/rpackagelister.cc.gcc41 2005-06-14 20:37:18.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.cc 2006-05-09 18:16:56.000000000 +0300 @@ -607,7 +607,7 @@ bool _ascent; RPackageStatus _status; public: - supportedSortFunc::supportedSortFunc(bool ascent, RPackageStatus &s) + supportedSortFunc(bool ascent, RPackageStatus &s) : _ascent(ascent), _status(s) {}; bool operator() (RPackage *x, RPackage *y) { if(_ascent) --- synaptic-0.57.2/common/ruserdialog.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/ruserdialog.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual bool showErrors(); + virtual ~RUserDialog() {}; }; #endif synaptic-0.57.2-repomd-1.patch: --- NEW FILE synaptic-0.57.2-repomd-1.patch --- --- synaptic-0.57.2/common/rsources.cc.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.cc 2006-05-09 20:38:03.000000000 +0300 @@ -352,8 +352,13 @@ Type |= RpmDir; else if (S == "rpm-src-dir") Type |= RpmSrcDir; + else if (S == "repomd") + Type |= Repomd; + else if (S == "repomd-src") + Type |= RepomdSrc; else return false; + cout << S << " settype " << (Type | Repomd) << endl; return true; } @@ -371,6 +376,11 @@ return "rpm-dir"; else if ((Type & RpmSrcDir) != 0) return "rpm-src-dir"; + else if ((Type & Repomd) != 0) + return "repomd"; + else if ((Type & RepomdSrc) != 0) + return "repomd-src"; + cout << "type " << (Type & Repomd) << endl; return "unknown"; } @@ -382,6 +392,7 @@ return false; S = SubstVar(S, "$(ARCH)", _config->Find("APT::Architecture")); + S = SubstVar(S, "$(VERSION)", _config->Find("APT::DistroVersion")); URI = S; // append a / to the end if one is not already there @@ -522,6 +533,10 @@ os << "RpmDir"; if ((rec.Type & SourcesList::RpmSrcDir) != 0) os << "RpmSrcDir"; + if ((rec.Type & SourcesList::Repomd) != 0) + os << "Repomd"; + if ((rec.Type & SourcesList::RepomdSrc) != 0) + os << "RepomdSrc"; os << endl; os << "SourceFile: " << rec.SourceFile << endl; os << "VendorID: " << rec.VendorID << endl; --- synaptic-0.57.2/common/rsources.h.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.h 2006-05-09 20:39:23.000000000 +0300 @@ -41,11 +41,13 @@ Disabled = 1 << 4, Comment = 1 << 5, RpmDir = 1 << 6, - RpmSrcDir = 1 << 7 + RpmSrcDir = 1 << 7, + Repomd = 1 << 8, + RepomdSrc = 1 << 9 }; struct SourceRecord { - unsigned char Type; + unsigned int Type; string VendorID; string URI; string Dist; --- synaptic-0.57.2/gtk/rgrepositorywin.cc.repomd 2005-05-20 21:24:35.000000000 +0300 +++ synaptic-0.57.2/gtk/rgrepositorywin.cc 2006-05-09 18:17:15.000000000 +0300 @@ -39,6 +39,8 @@ ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC, ITEM_TYPE_DEB, ITEM_TYPE_DEBSRC }; @@ -48,7 +50,9 @@ ITEM_TYPE_RPM, ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, - ITEM_TYPE_RPMSRCDIR + ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC }; #endif @@ -235,6 +239,16 @@ gtk_menu_append(GTK_MENU(_optTypeMenu), item); gtk_widget_show(item); gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_RPMSRCDIR); + + item = gtk_menu_item_new_with_label("repomd"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMD); + + item = gtk_menu_item_new_with_label("repomd-src"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMDSRC); #else item = gtk_menu_item_new_with_label(_("Binary (deb)")); gtk_menu_append(GTK_MENU(_optTypeMenu), item); @@ -512,6 +526,12 @@ case ITEM_TYPE_RPMSRCDIR: rec->Type |= SourcesList::RpmSrcDir; break; + case ITEM_TYPE_REPOMD: + rec->Type |= SourcesList::Repomd; + break; + case ITEM_TYPE_REPOMDSRC: + rec->Type |= SourcesList::RepomdSrc; + break; default: _userDialog->error(_("Unknown source type")); return; @@ -642,6 +662,10 @@ id = ITEM_TYPE_RPMDIR; else if (rec->Type & SourcesList::RpmSrcDir) id = ITEM_TYPE_RPMSRCDIR; + else if (rec->Type & SourcesList::Repomd) + id = ITEM_TYPE_REPOMD; + else if (rec->Type & SourcesList::RepomdSrc) + id = ITEM_TYPE_REPOMDSRC; gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optType), id); gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optVendor), synaptic-0.57.2-showprog.patch: --- NEW FILE synaptic-0.57.2-showprog.patch --- --- synaptic-0.57.2/gtk/rgfetchprogress.cc.showprog 2006-05-09 19:14:11.000000000 +0300 +++ synaptic-0.57.2/gtk/rgfetchprogress.cc 2006-05-09 19:13:35.000000000 +0300 @@ -337,6 +337,7 @@ //cout << "RGFetchProgress::Start()" << endl; pkgAcquireStatus::Start(); _cancelled = false; + show(); RGFlushInterface(); } From fedora-extras-commits at redhat.com Thu May 25 23:05:54 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:05:54 -0700 Subject: rpms/synaptic/FC-4 synaptic-0.57.2-gcc41.patch, NONE, 1.1 synaptic-0.57.2-repomd-1.patch, NONE, 1.1 synaptic-0.57.2-showprog.patch, NONE, 1.1 Message-ID: <200605252305.k4PN5uwD010050@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10010/FC-4 Added Files: synaptic-0.57.2-gcc41.patch synaptic-0.57.2-repomd-1.patch synaptic-0.57.2-showprog.patch Log Message: Sync FC-4/FC-5 with devel synaptic-0.57.2-gcc41.patch: --- NEW FILE synaptic-0.57.2-gcc41.patch --- --- synaptic-0.57.2/common/rcdscanner.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rcdscanner.h 2006-05-09 18:16:56.000000000 +0300 @@ -48,6 +48,7 @@ }; virtual void update(string text, int current) = 0; + virtual ~RCDScanProgress() {}; }; class RCDScanner { --- synaptic-0.57.2/common/rinstallprogress.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rinstallprogress.h 2006-05-09 18:16:56.000000000 +0300 @@ -63,6 +63,7 @@ RInstallProgress():_donePackagesTotal(0), _numPackagesTotal(0),_updateFinished(false) {}; + virtual ~RInstallProgress() {}; }; --- synaptic-0.57.2/common/indexcopy.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/indexcopy.h 2006-05-09 18:19:00.000000000 +0300 @@ -39,6 +39,7 @@ public: bool CopyPackages(string CDROM, string Name, vector &List); + virtual ~IndexCopy() {}; }; class PackageCopy:public IndexCopy { @@ -54,6 +55,7 @@ }; public: + virtual ~PackageCopy() {}; }; class SourceCopy:public IndexCopy { @@ -69,6 +71,7 @@ }; public: + virtual ~SourceCopy() {}; }; #endif --- synaptic-0.57.2/common/rpackagelister.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual void notifyChange(RPackage *pkg) = 0; virtual void notifyPreFilteredChange() = 0; virtual void notifyPostFilteredChange() = 0; + virtual ~RPackageObserver() {}; }; class RCacheObserver { @@ -71,6 +72,7 @@ virtual void notifyCacheOpen() = 0; virtual void notifyCachePreChange() = 0; virtual void notifyCachePostChange() = 0; + virtual ~RCacheObserver() {}; }; // base sort class --- synaptic-0.57.2/common/rpackagefilter.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackagefilter.h 2006-05-09 18:16:56.000000000 +0300 @@ -130,7 +130,7 @@ bool and_mode; // patterns are applied in "AND" mode if true, "OR" if false inline bool filterName(Pattern pat, RPackage *pkg); - inline bool RPatternPackageFilter::filterVersion(Pattern pat, RPackage *pkg); + inline bool filterVersion(Pattern pat, RPackage *pkg); inline bool filterDescription(Pattern pat, RPackage *pkg); inline bool filterMaintainer(Pattern pat, RPackage *pkg); inline bool filterDepends(Pattern pat, RPackage *pkg, --- synaptic-0.57.2/common/rpackage.cc.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rpackage.cc 2006-05-09 18:16:56.000000000 +0300 @@ -848,7 +848,6 @@ void RPackage::setPinned(bool flag) { - FILE *out; struct stat stat_buf; string File =RStateDir() + "/preferences"; @@ -945,8 +944,8 @@ } } - return true; #endif + return true; } // format: first version, second archives --- synaptic-0.57.2/common/rpackagelister.cc.gcc41 2005-06-14 20:37:18.000000000 +0300 +++ synaptic-0.57.2/common/rpackagelister.cc 2006-05-09 18:16:56.000000000 +0300 @@ -607,7 +607,7 @@ bool _ascent; RPackageStatus _status; public: - supportedSortFunc::supportedSortFunc(bool ascent, RPackageStatus &s) + supportedSortFunc(bool ascent, RPackageStatus &s) : _ascent(ascent), _status(s) {}; bool operator() (RPackage *x, RPackage *y) { if(_ascent) --- synaptic-0.57.2/common/ruserdialog.h.gcc41 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/ruserdialog.h 2006-05-09 18:16:56.000000000 +0300 @@ -64,6 +64,7 @@ virtual bool showErrors(); + virtual ~RUserDialog() {}; }; #endif synaptic-0.57.2-repomd-1.patch: --- NEW FILE synaptic-0.57.2-repomd-1.patch --- --- synaptic-0.57.2/common/rsources.cc.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.cc 2006-05-09 20:38:03.000000000 +0300 @@ -352,8 +352,13 @@ Type |= RpmDir; else if (S == "rpm-src-dir") Type |= RpmSrcDir; + else if (S == "repomd") + Type |= Repomd; + else if (S == "repomd-src") + Type |= RepomdSrc; else return false; + cout << S << " settype " << (Type | Repomd) << endl; return true; } @@ -371,6 +376,11 @@ return "rpm-dir"; else if ((Type & RpmSrcDir) != 0) return "rpm-src-dir"; + else if ((Type & Repomd) != 0) + return "repomd"; + else if ((Type & RepomdSrc) != 0) + return "repomd-src"; + cout << "type " << (Type & Repomd) << endl; return "unknown"; } @@ -382,6 +392,7 @@ return false; S = SubstVar(S, "$(ARCH)", _config->Find("APT::Architecture")); + S = SubstVar(S, "$(VERSION)", _config->Find("APT::DistroVersion")); URI = S; // append a / to the end if one is not already there @@ -522,6 +533,10 @@ os << "RpmDir"; if ((rec.Type & SourcesList::RpmSrcDir) != 0) os << "RpmSrcDir"; + if ((rec.Type & SourcesList::Repomd) != 0) + os << "Repomd"; + if ((rec.Type & SourcesList::RepomdSrc) != 0) + os << "RepomdSrc"; os << endl; os << "SourceFile: " << rec.SourceFile << endl; os << "VendorID: " << rec.VendorID << endl; --- synaptic-0.57.2/common/rsources.h.repomd 2005-05-20 21:26:52.000000000 +0300 +++ synaptic-0.57.2/common/rsources.h 2006-05-09 20:39:23.000000000 +0300 @@ -41,11 +41,13 @@ Disabled = 1 << 4, Comment = 1 << 5, RpmDir = 1 << 6, - RpmSrcDir = 1 << 7 + RpmSrcDir = 1 << 7, + Repomd = 1 << 8, + RepomdSrc = 1 << 9 }; struct SourceRecord { - unsigned char Type; + unsigned int Type; string VendorID; string URI; string Dist; --- synaptic-0.57.2/gtk/rgrepositorywin.cc.repomd 2005-05-20 21:24:35.000000000 +0300 +++ synaptic-0.57.2/gtk/rgrepositorywin.cc 2006-05-09 18:17:15.000000000 +0300 @@ -39,6 +39,8 @@ ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC, ITEM_TYPE_DEB, ITEM_TYPE_DEBSRC }; @@ -48,7 +50,9 @@ ITEM_TYPE_RPM, ITEM_TYPE_RPMSRC, ITEM_TYPE_RPMDIR, - ITEM_TYPE_RPMSRCDIR + ITEM_TYPE_RPMSRCDIR, + ITEM_TYPE_REPOMD, + ITEM_TYPE_REPOMDSRC }; #endif @@ -235,6 +239,16 @@ gtk_menu_append(GTK_MENU(_optTypeMenu), item); gtk_widget_show(item); gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_RPMSRCDIR); + + item = gtk_menu_item_new_with_label("repomd"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMD); + + item = gtk_menu_item_new_with_label("repomd-src"); + gtk_menu_append(GTK_MENU(_optTypeMenu), item); + gtk_widget_show(item); + gtk_object_set_data(GTK_OBJECT(item), "id", (gpointer) ITEM_TYPE_REPOMDSRC); #else item = gtk_menu_item_new_with_label(_("Binary (deb)")); gtk_menu_append(GTK_MENU(_optTypeMenu), item); @@ -512,6 +526,12 @@ case ITEM_TYPE_RPMSRCDIR: rec->Type |= SourcesList::RpmSrcDir; break; + case ITEM_TYPE_REPOMD: + rec->Type |= SourcesList::Repomd; + break; + case ITEM_TYPE_REPOMDSRC: + rec->Type |= SourcesList::RepomdSrc; + break; default: _userDialog->error(_("Unknown source type")); return; @@ -642,6 +662,10 @@ id = ITEM_TYPE_RPMDIR; else if (rec->Type & SourcesList::RpmSrcDir) id = ITEM_TYPE_RPMSRCDIR; + else if (rec->Type & SourcesList::Repomd) + id = ITEM_TYPE_REPOMD; + else if (rec->Type & SourcesList::RepomdSrc) + id = ITEM_TYPE_REPOMDSRC; gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optType), id); gtk_option_menu_set_history(GTK_OPTION_MENU(me->_optVendor), synaptic-0.57.2-showprog.patch: --- NEW FILE synaptic-0.57.2-showprog.patch --- --- synaptic-0.57.2/gtk/rgfetchprogress.cc.showprog 2006-05-09 19:14:11.000000000 +0300 +++ synaptic-0.57.2/gtk/rgfetchprogress.cc 2006-05-09 19:13:35.000000000 +0300 @@ -337,6 +337,7 @@ //cout << "RGFetchProgress::Start()" << endl; pkgAcquireStatus::Start(); _cancelled = false; + show(); RGFlushInterface(); } From fedora-extras-commits at redhat.com Thu May 25 23:09:17 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:09:17 -0700 Subject: rpms/synaptic/FC-4 synaptic.spec,1.13,1.14 Message-ID: <200605252309.k4PN9Jet010196@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10151/FC-4 Modified Files: synaptic.spec Log Message: Last resort to convince th cvs/build to take the patches ... :/ Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/synaptic.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- synaptic.spec 25 May 2006 11:55:44 -0000 1.13 +++ synaptic.spec 25 May 2006 23:09:16 -0000 1.14 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 5%{?dist} +Release: 5.0%{?dist} License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu May 25 23:09:18 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:09:18 -0700 Subject: rpms/synaptic/devel synaptic.spec,1.18,1.19 Message-ID: <200605252309.k4PN9Khw010204@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10151/devel Modified Files: synaptic.spec Log Message: Last resort to convince th cvs/build to take the patches ... :/ Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- synaptic.spec 25 May 2006 11:55:45 -0000 1.18 +++ synaptic.spec 25 May 2006 23:09:18 -0000 1.19 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 5%{?dist} +Release: 5.0%{?dist} License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu May 25 23:09:17 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 25 May 2006 16:09:17 -0700 Subject: rpms/synaptic/FC-5 synaptic.spec,1.17,1.18 Message-ID: <200605252309.k4PN9JC3010200@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/synaptic/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10151/FC-5 Modified Files: synaptic.spec Log Message: Last resort to convince th cvs/build to take the patches ... :/ Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-5/synaptic.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- synaptic.spec 25 May 2006 11:55:45 -0000 1.17 +++ synaptic.spec 25 May 2006 23:09:17 -0000 1.18 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 5%{?dist} +Release: 5.0%{?dist} License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu May 25 23:53:22 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 16:53:22 -0700 Subject: rpms/libgalago/devel libgalago-gettext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libgalago.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200605252353.k4PNrOe3010443@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10419 Modified Files: .cvsignore libgalago.spec sources Added Files: libgalago-gettext.patch Log Message: * Thu May 25 2006 Brian Pepple - 0.5.1-2 - Update to 0.5.1. - Add patch to fix setup-gettext script. - Add BR for gtk-doc, and build documentation. - Change BR from check-devel to check. libgalago-gettext.patch: --- NEW FILE libgalago-gettext.patch --- diff -ur libgalago-0.5.1.OLD/setup-gettext libgalago-0.5.1/setup-gettext --- libgalago-0.5.1.OLD/setup-gettext 2006-05-17 03:53:26.000000000 -0400 +++ libgalago-0.5.1/setup-gettext 2006-05-25 17:55:59.000000000 -0400 @@ -179,7 +179,7 @@ echo n | autopoint --force || abort restore_m4 - if test $GETTEXT_MINOR_VERSION -ge 12 -a $GETTEXT_MINOR_VERSION -lt 14; then + if test $GETTEXT_MINOR_VERSION -ge 12; then cp po/Makefile.in.in po/.tmp-Makefile.in.in sed -e 's#echo "\$(top_builddir)/\$(MKINSTALLDIRS)" ;; esac#echo "\$(MKINSTALLDIRS)" ;; esac#1' < po/.tmp-Makefile.in.in > po/Makefile.in.in rm po/.tmp-Makefile.in.in Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 17:48:26 -0000 1.2 +++ .cvsignore 25 May 2006 23:53:22 -0000 1.3 @@ -1 +1 @@ -libgalago-0.5.0.tar.bz2 +libgalago-0.5.1.tar.bz2 Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgalago.spec 17 May 2006 17:47:02 -0000 1.2 +++ libgalago.spec 25 May 2006 23:53:22 -0000 1.3 @@ -1,5 +1,5 @@ Name: libgalago -Version: 0.5.0 +Version: 0.5.1 Release: 2%{?dist} Summary: Galago presence library @@ -7,11 +7,13 @@ License: LGPL URL: http://www.galago-project.org/ Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: dbus-glib -BuildRequires: check-devel +BuildRequires: check +BuildRequires: gtk-doc %description @@ -35,10 +37,11 @@ %prep %setup -q - +%patch0 -p1 -b .gettext +./autogen.sh %build -%configure --enable-static=no +%configure --enable-static=no --enable-gtk-doc make %{?_smp_mflags} @@ -73,9 +76,16 @@ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/%{name}/ +%{_datadir}/gtk-doc/html/%{name} %changelog +* Thu May 25 2006 Brian Pepple - 0.5.1-2 +- Update to 0.5.1. +- Add patch to fix setup-gettext script. +- Add BR for gtk-doc, and build documentation. +- Change BR from check-devel to check. + * Wed May 17 2006 Brian Pepple - 0.5.0-2 - Bump. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 17:48:26 -0000 1.2 +++ sources 25 May 2006 23:53:22 -0000 1.3 @@ -1 +1 @@ -3e6fbc2f27c957cb50f08ceeb574cb5e libgalago-0.5.0.tar.bz2 +9ace3f93505626773b852d2ebbc7d5d6 libgalago-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Thu May 25 23:58:40 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 16:58:40 -0700 Subject: rpms/libgalago/FC-5 libgalago-gettext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libgalago.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605252358.k4PNwgc3010533@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10509 Modified Files: .cvsignore libgalago.spec sources Added Files: libgalago-gettext.patch Log Message: * Thu May 25 2006 Brian Pepple - 0.5.1-1 - Update to 0.5.1. - Change BR from check-devel to check. - Add BR for gtk-doc, and build documentation. - Add patch to fix setup-gettext script. libgalago-gettext.patch: --- NEW FILE libgalago-gettext.patch --- diff -ur libgalago-0.5.1.OLD/setup-gettext libgalago-0.5.1/setup-gettext --- libgalago-0.5.1.OLD/setup-gettext 2006-05-17 03:53:26.000000000 -0400 +++ libgalago-0.5.1/setup-gettext 2006-05-25 17:55:59.000000000 -0400 @@ -179,7 +179,7 @@ echo n | autopoint --force || abort restore_m4 - if test $GETTEXT_MINOR_VERSION -ge 12 -a $GETTEXT_MINOR_VERSION -lt 14; then + if test $GETTEXT_MINOR_VERSION -ge 12; then cp po/Makefile.in.in po/.tmp-Makefile.in.in sed -e 's#echo "\$(top_builddir)/\$(MKINSTALLDIRS)" ;; esac#echo "\$(MKINSTALLDIRS)" ;; esac#1' < po/.tmp-Makefile.in.in > po/Makefile.in.in rm po/.tmp-Makefile.in.in Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgalago/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 17:48:26 -0000 1.2 +++ .cvsignore 25 May 2006 23:58:40 -0000 1.3 @@ -1 +1 @@ -libgalago-0.5.0.tar.bz2 +libgalago-0.5.1.tar.bz2 Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgalago.spec 16 May 2006 17:48:26 -0000 1.1 +++ libgalago.spec 25 May 2006 23:58:40 -0000 1.2 @@ -1,5 +1,5 @@ Name: libgalago -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: Galago presence library @@ -7,11 +7,13 @@ License: LGPL URL: http://www.galago-project.org/ Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel BuildRequires: dbus-glib -BuildRequires: check-devel +BuildRequires: check +BuildRequires: gtk-doc %description @@ -35,10 +37,12 @@ %prep %setup -q +%patch0 -p1 -b .gettext +./autogen.sh %build -%configure --enable-static=no +%configure --enable-static=no --enable-gtk-doc make %{?_smp_mflags} @@ -73,9 +77,16 @@ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/%{name}/ +%{_datadir}/gtk-doc/html/%{name} %changelog +* Thu May 25 2006 Brian Pepple - 0.5.1-1 +- Update to 0.5.1. +- Change BR from check-devel to check. +- Add BR for gtk-doc, and build documentation. +- Add patch to fix setup-gettext script. + * Fri Apr 21 2006 Brian Pepple - 0.5.0-1 - Initial Fedora Extras spec. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgalago/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 17:48:26 -0000 1.2 +++ sources 25 May 2006 23:58:40 -0000 1.3 @@ -1 +1 @@ -3e6fbc2f27c957cb50f08ceeb574cb5e libgalago-0.5.0.tar.bz2 +9ace3f93505626773b852d2ebbc7d5d6 libgalago-0.5.1.tar.bz2 From fedora-extras-commits at redhat.com Fri May 26 00:19:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 17:19:53 -0700 Subject: rpms/libgalago/devel libgalago.spec,1.3,1.4 Message-ID: <200605260019.k4Q0Jt9c012913@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12896 Modified Files: libgalago.spec Log Message: * Thu May 25 2006 Brian Pepple - 0.5.1-3 - Add BR for gettext-devel, since autogen.sh is being reran. - Add back BR on check-devel. Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/devel/libgalago.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libgalago.spec 25 May 2006 23:53:22 -0000 1.3 +++ libgalago.spec 26 May 2006 00:19:53 -0000 1.4 @@ -1,6 +1,6 @@ Name: libgalago Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Galago presence library Group: System Environment/Libraries @@ -12,9 +12,11 @@ BuildRequires: dbus-devel BuildRequires: dbus-glib -BuildRequires: check +BuildRequires: check-devel BuildRequires: gtk-doc +BuildRequires: gettext-devel + %description Galago is a D-BUS-based desktop presence framework used to provide account, @@ -80,6 +82,10 @@ %changelog +* Thu May 25 2006 Brian Pepple - 0.5.1-3 +- Add BR for gettext-devel, since autogen.sh is being reran. +- Add back BR on check-devel. + * Thu May 25 2006 Brian Pepple - 0.5.1-2 - Update to 0.5.1. - Add patch to fix setup-gettext script. From fedora-extras-commits at redhat.com Fri May 26 00:21:59 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 17:21:59 -0700 Subject: rpms/libgalago/FC-5 libgalago.spec,1.2,1.3 Message-ID: <200605260022.k4Q0M1vd012986@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/libgalago/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12969 Modified Files: libgalago.spec Log Message: * Thu May 25 2006 Brian Pepple - 0.5.1-2 - Add BR on gettext-devel, since autogen.sh is being reran. - Add back BR on check-devel. Index: libgalago.spec =================================================================== RCS file: /cvs/extras/rpms/libgalago/FC-5/libgalago.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgalago.spec 25 May 2006 23:58:40 -0000 1.2 +++ libgalago.spec 26 May 2006 00:21:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: libgalago Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Galago presence library Group: System Environment/Libraries @@ -12,9 +12,11 @@ BuildRequires: dbus-devel BuildRequires: dbus-glib -BuildRequires: check +BuildRequires: check-devel BuildRequires: gtk-doc +BuildRequires: gettext-devel + %description Galago is a D-BUS-based desktop presence framework used to provide account, @@ -81,6 +83,10 @@ %changelog +* Thu May 25 2006 Brian Pepple - 0.5.1-2 +- Add BR on gettext-devel, since autogen.sh is being reran. +- Add back BR on check-devel. + * Thu May 25 2006 Brian Pepple - 0.5.1-1 - Update to 0.5.1. - Change BR from check-devel to check. From fedora-extras-commits at redhat.com Fri May 26 00:32:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 17:32:56 -0700 Subject: rpms/galago-daemon/devel galago-daemon.spec,1.2,1.3 Message-ID: <200605260032.k4Q0WwsZ013100@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13083 Modified Files: galago-daemon.spec Log Message: * Thu May 25 2006 Brian Pepple - 0.5.0-4 - Rebuild for new libgalago. Index: galago-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/devel/galago-daemon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- galago-daemon.spec 19 May 2006 15:44:02 -0000 1.2 +++ galago-daemon.spec 26 May 2006 00:32:56 -0000 1.3 @@ -1,6 +1,6 @@ Name: galago-daemon Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Galago presence daemon Group: System Environment/Daemons @@ -45,6 +45,9 @@ %changelog +* Thu May 25 2006 Brian Pepple - 0.5.0-4 +- Rebuild for new libgalago. + * Fri May 19 2006 Brian Pepple - 0.5.0-3 - Bump. From fedora-extras-commits at redhat.com Fri May 26 00:34:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 17:34:53 -0700 Subject: rpms/galago-daemon/FC-5 galago-daemon.spec,1.1,1.2 Message-ID: <200605260034.k4Q0Yt5g013163@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/galago-daemon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13145 Modified Files: galago-daemon.spec Log Message: * Thu May 25 2006 Brian Pepple - 0.5.0-3 - Rebuild for new libgalago. Index: galago-daemon.spec =================================================================== RCS file: /cvs/extras/rpms/galago-daemon/FC-5/galago-daemon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- galago-daemon.spec 18 May 2006 19:35:03 -0000 1.1 +++ galago-daemon.spec 26 May 2006 00:34:53 -0000 1.2 @@ -1,6 +1,6 @@ Name: galago-daemon Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Galago presence daemon Group: System Environment/Daemons @@ -45,6 +45,9 @@ %changelog +* Thu May 25 2006 Brian Pepple - 0.5.0-3 +- Rebuild for new libgalago. + * Thu May 18 2006 Brian Pepple - 0.5.0-2 - Mark file as %%config. From fedora-extras-commits at redhat.com Fri May 26 02:54:55 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:54:55 -0700 Subject: rpms/daap-sharp - New directory Message-ID: <200605260254.k4Q2svr9018250@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18223/daap-sharp Log Message: Directory /cvs/extras/rpms/daap-sharp added to the repository From fedora-extras-commits at redhat.com Fri May 26 02:54:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:54:56 -0700 Subject: rpms/daap-sharp/devel - New directory Message-ID: <200605260254.k4Q2swCI018253@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18223/daap-sharp/devel Log Message: Directory /cvs/extras/rpms/daap-sharp/devel added to the repository From fedora-extras-commits at redhat.com Fri May 26 02:55:04 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:55:04 -0700 Subject: rpms/daap-sharp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605260255.k4Q2t6DW018297@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18269 Added Files: Makefile import.log Log Message: Setup of module daap-sharp --- NEW FILE Makefile --- # Top level Makefile for module daap-sharp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 26 02:55:04 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:55:04 -0700 Subject: rpms/daap-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605260255.k4Q2t6wM018300@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18269/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module daap-sharp --- NEW 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 May 26 02:55:30 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:55:30 -0700 Subject: rpms/daap-sharp import.log,1.1,1.2 Message-ID: <200605260256.k4Q2u2Cl018375@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18338 Modified Files: import.log Log Message: auto-import daap-sharp-0.3.3-3 on branch devel from daap-sharp-0.3.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/daap-sharp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 May 2006 02:55:04 -0000 1.1 +++ import.log 26 May 2006 02:55:30 -0000 1.2 @@ -0,0 +1 @@ +daap-sharp-0_3_3-3:HEAD:daap-sharp-0.3.3-3.src.rpm:1148612126 From fedora-extras-commits at redhat.com Fri May 26 02:55:31 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:55:31 -0700 Subject: rpms/daap-sharp/devel daap-sharp-build.patch, NONE, 1.1 daap-sharp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605260256.k4Q2u3ox018379@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18338/devel Modified Files: .cvsignore sources Added Files: daap-sharp-build.patch daap-sharp.spec Log Message: auto-import daap-sharp-0.3.3-3 on branch devel from daap-sharp-0.3.3-3.src.rpm daap-sharp-build.patch: --- NEW FILE daap-sharp-build.patch --- Only in daap-sharp-0.3.3/src/en: * diff -ur daap-sharp-0.3.3.OLD/src/Makefile.in daap-sharp-0.3.3/src/Makefile.in --- daap-sharp-0.3.3.OLD/src/Makefile.in 2006-04-07 21:34:45.000000000 -0400 +++ daap-sharp-0.3.3/src/Makefile.in 2006-05-09 16:36:07.000000000 -0400 @@ -156,7 +156,7 @@ target_vendor = @target_vendor@ DAAP_ASSEMBLY = daap-sharp.dll ASSEMBLIES = $(DAAP_ASSEMBLY) -daapdir = $(libdir)/daap-sharp +daapdir = $(prefix)/lib/daap-sharp daap_SCRIPTS = $(ASSEMBLIES) $(DAAP_ASSEMBLY).config $(DAAP_ASSEMBLY).mdb DAAPSOURCES = \ $(srcdir)/AuthenticationException.cs \ --- NEW FILE daap-sharp.spec --- Name: daap-sharp Version: 0.3.3 Release: 3%{?dist} Summary: DAAP (Digial Audio Access Protocol) implementation using Mono Group: System Environment/Libraries License: LGPL URL: http://www.snorp.net/log/daap-sharp/ Source0: http://www.snorp.net/files/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel BuildRequires: avahi-sharp Requires: mono-core %description daap-sharp is a DAAP (Digial Audio Access Protocol) implementation. It is used by Apple's iTunes software to share music. %package devel Summary: Development libraries and headers for daap-sharp Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Libararies and header file for developing against daap-sharp. %prep %setup -q %patch0 -p1 -b .build %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure make %install rm -rf $RPM_BUILD_ROOT export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package daap-sharp /gacdir %{_prefix}/lib /root $RPM_BUILD_ROOT%{_prefix}/lib" %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING %{_prefix}/lib/%{name} %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %changelog * Tue May 16 2006 Brian Pepple - 0.3.3-3 - Add devel package for *.pc file. - Add Req on mono-core. - Use cleaner URL. * Tue May 9 2006 Brian Pepple - 0.3.3-2 - Add patch to fix build on x86_64. * Sat May 6 2006 Brian Pepple - 0.3.3-1 - Initial FE RPM spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/daap-sharp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 May 2006 02:55:04 -0000 1.1 +++ .cvsignore 26 May 2006 02:55:30 -0000 1.2 @@ -0,0 +1 @@ +daap-sharp-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/daap-sharp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 May 2006 02:55:04 -0000 1.1 +++ sources 26 May 2006 02:55:30 -0000 1.2 @@ -0,0 +1 @@ +53feead0f3ef75cf5e34cbb4f1d37f30 daap-sharp-0.3.3.tar.gz From fedora-extras-commits at redhat.com Fri May 26 02:58:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 25 May 2006 19:58:56 -0700 Subject: owners owners.list,1.1056,1.1057 Message-ID: <200605260258.k4Q2wwWL018443@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426 Modified Files: owners.list Log Message: Add daap-sharp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1056 retrieving revision 1.1057 diff -u -r1.1056 -r1.1057 --- owners.list 25 May 2006 19:24:08 -0000 1.1056 +++ owners.list 26 May 2006 02:58:56 -0000 1.1057 @@ -190,6 +190,7 @@ 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|daap-sharp|DAAP implementation using Mono|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|dap-freeform_handler|FreeForm data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|dap-hdf4_handler|HDF4 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|dap-netcdf_handler|NetCDF 3 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 26 07:30:49 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 26 May 2006 00:30:49 -0700 Subject: fedora-security/audit fc4,1.264,1.265 fc5,1.177,1.178 Message-ID: <200605260730.k4Q7Un7v030538@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30518 Modified Files: fc4 fc5 Log Message: Yesterdays updates (we didn't get a CVE name in time for the libtiff issue) Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- fc4 25 May 2006 10:21:42 -0000 1.264 +++ fc4 26 May 2006 07:30:46 -0000 1.265 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] +CVE-2006-2613 ** firefox CVE-2006-2493 ** freetype CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2453 backport (dia) #192538 [since FEDORA-2006-580] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- fc5 25 May 2006 10:21:42 -0000 1.177 +++ fc5 26 May 2006 07:30:46 -0000 1.178 @@ -3,6 +3,8 @@ ** are items that need attention +CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] +CVE-2006-2613 ** firefox CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-588] From fedora-extras-commits at redhat.com Fri May 26 13:17:36 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 26 May 2006 06:17:36 -0700 Subject: fedora-security/audit fc4,1.265,1.266 fc5,1.178,1.179 Message-ID: <200605261317.k4QDHa2d013090@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13070 Modified Files: fc4 fc5 Log Message: Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- fc4 26 May 2006 07:30:46 -0000 1.265 +++ fc4 26 May 2006 13:17:33 -0000 1.266 @@ -5,6 +5,7 @@ CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] CVE-2006-2613 ** firefox +CVE-2006-2607 backport (vixie-cron) #178431 CVE-2006-2493 ** freetype CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2453 backport (dia) #192538 [since FEDORA-2006-580] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- fc5 26 May 2006 07:30:46 -0000 1.178 +++ fc5 26 May 2006 13:17:33 -0000 1.179 @@ -5,6 +5,7 @@ CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] CVE-2006-2613 ** firefox +CVE-2006-2607 backport (vixie-cron) #177476 CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-588] From fedora-extras-commits at redhat.com Fri May 26 14:48:37 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 26 May 2006 07:48:37 -0700 Subject: rpms/loudmouth/devel loudmouth-1.0.3-reentrancy.patch, NONE, 1.1 loudmouth.spec, 1.12, 1.13 Message-ID: <200605261448.k4QEmdB5015639@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15619 Modified Files: loudmouth.spec Added Files: loudmouth-1.0.3-reentrancy.patch Log Message: * Fri May 26 2006 Brian Pepple - 1.0.3-4 - Add patch to fix some reentrancy crashes. (Thanks, Havoc) loudmouth-1.0.3-reentrancy.patch: --- NEW FILE loudmouth-1.0.3-reentrancy.patch --- --- loudmouth-1.0.3/loudmouth/lm-connection.c.reentrancy 2006-04-03 12:14:31.000000000 -0400 +++ loudmouth-1.0.3/loudmouth/lm-connection.c 2006-05-21 23:14:22.000000000 -0400 @@ -82,9 +82,9 @@ LmCallback *open_cb; gboolean cancel_open; - LmCallback *close_cb; + LmCallback *close_cb; /* unused */ LmCallback *auth_cb; - LmCallback *register_cb; + LmCallback *register_cb; /* unused */ LmCallback *disconnect_cb; @@ -224,6 +224,13 @@ connection_do_close (connection); } + if (connection->open_cb) + _lm_utils_free_callback (connection->open_cb); + if (connection->auth_cb) + _lm_utils_free_callback (connection->auth_cb); + + lm_connection_set_disconnect_function (connection, NULL, NULL, NULL); + while ((m = g_queue_pop_head (connection->incoming_messages)) != NULL) { lm_message_unref (m); } @@ -253,9 +260,11 @@ const gchar *id; LmHandlerResult result = LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; + lm_connection_ref (connection); + if (lm_message_get_type (m) == LM_MESSAGE_TYPE_STREAM) { connection_stream_received (connection, m); - return; + goto out; } id = lm_message_node_get_attribute (m->node, "id"); @@ -271,7 +280,7 @@ } if (result == LM_HANDLER_RESULT_REMOVE_MESSAGE) { - return; + goto out; } for (l = connection->handlers[lm_message_get_type (m)]; @@ -283,6 +292,9 @@ connection, m); } + +out: + lm_connection_unref (connection); return; } @@ -447,11 +459,13 @@ if (connect_data->current_addr == NULL) { connection_do_close (connection); - if (connection->open_cb && connection->open_cb->func) { + if (connection->open_cb) { LmCallback *cb = connection->open_cb; + connection->open_cb = NULL; (* ((LmResultFunction) cb->func)) (connection, FALSE, cb->user_data); + _lm_utils_free_callback (cb); } freeaddrinfo (connect_data->resolved_addrs); @@ -467,7 +481,7 @@ { _lm_connection_failed_with_error (connect_data,errno); } - + static gboolean connection_connect_cb (GIOChannel *source, GIOCondition condition, @@ -1169,16 +1183,17 @@ lm_verbose ("AUTH reply: %d\n", result); - if (connection->auth_cb && connection->auth_cb->func) { - LmCallback *cb = connection->auth_cb; + if (connection->auth_cb) { + LmCallback *cb = connection->auth_cb; + connection->auth_cb = NULL; + + if (cb->func) + (* ((LmResultFunction) cb->func)) (connection, + result, cb->user_data); - (* ((LmResultFunction) cb->func)) (connection, - result, cb->user_data); + _lm_utils_free_callback (cb); } - _lm_utils_free_callback (connection->auth_cb); - connection->auth_cb = NULL; - return LM_HANDLER_RESULT_REMOVE_MESSAGE; } @@ -1203,15 +1218,16 @@ connection_start_keep_alive (connection); - if (connection->open_cb && connection->open_cb->func) { + if (connection->open_cb) { LmCallback *cb = connection->open_cb; + connection->open_cb = NULL; - (* ((LmResultFunction) cb->func)) (connection, result, - cb->user_data); + if (cb->func) + (* ((LmResultFunction) cb->func)) (connection, result, + cb->user_data); + + _lm_utils_free_callback (connection->open_cb); } - - _lm_utils_free_callback (connection->open_cb); - connection->open_cb = NULL; } static gint @@ -2129,9 +2145,12 @@ _lm_utils_free_callback (connection->disconnect_cb); } - connection->disconnect_cb = _lm_utils_new_callback (function, - user_data, - notify); + if (function) + connection->disconnect_cb = _lm_utils_new_callback (function, + user_data, + notify); + else + connection->disconnect_cb = NULL; } /** Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- loudmouth.spec 5 Apr 2006 16:56:51 -0000 1.12 +++ loudmouth.spec 26 May 2006 14:48:37 -0000 1.13 @@ -2,13 +2,14 @@ Name: loudmouth Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries License: LGPL URL: http://www.imendio.com/projects/loudmouth Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-reentrancy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.4.0 @@ -41,6 +42,7 @@ %prep %setup -q +%patch0 -p1 -b .reentrancy %build @@ -78,15 +80,19 @@ %doc ChangeLog NEWS README COPYING %{_libdir}/libloudmouth*.so.* + %files devel %defattr(-,root,root,-) %{_libdir}/libloudmouth*.so -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/%{name}-1.0.pc %{_includedir}/%{name}-1.0 %{_datadir}/gtk-doc/html/%{name} %changelog +* Fri May 26 2006 Brian Pepple - 1.0.3-4 +- Add patch to fix some reentrancy crashes. (Thanks, Havoc) + * Wed Apr 5 2006 Brian Pepple - 1.0.3-3 - Update to 1.0.3. - Add BR for gnutls-devel to devel package. From fedora-extras-commits at redhat.com Fri May 26 14:49:48 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 26 May 2006 07:49:48 -0700 Subject: rpms/loudmouth/FC-5 loudmouth-1.0.3-reentrancy.patch, NONE, 1.1 loudmouth.spec, 1.12, 1.13 Message-ID: <200605261449.k4QEnonf015687@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15667 Modified Files: loudmouth.spec Added Files: loudmouth-1.0.3-reentrancy.patch Log Message: * Fri May 26 2006 Brian Pepple - 1.0.3-3 - Add patch to fix some reentrancy crashes. (Thanks, Havoc) loudmouth-1.0.3-reentrancy.patch: --- NEW FILE loudmouth-1.0.3-reentrancy.patch --- --- loudmouth-1.0.3/loudmouth/lm-connection.c.reentrancy 2006-04-03 12:14:31.000000000 -0400 +++ loudmouth-1.0.3/loudmouth/lm-connection.c 2006-05-21 23:14:22.000000000 -0400 @@ -82,9 +82,9 @@ LmCallback *open_cb; gboolean cancel_open; - LmCallback *close_cb; + LmCallback *close_cb; /* unused */ LmCallback *auth_cb; - LmCallback *register_cb; + LmCallback *register_cb; /* unused */ LmCallback *disconnect_cb; @@ -224,6 +224,13 @@ connection_do_close (connection); } + if (connection->open_cb) + _lm_utils_free_callback (connection->open_cb); + if (connection->auth_cb) + _lm_utils_free_callback (connection->auth_cb); + + lm_connection_set_disconnect_function (connection, NULL, NULL, NULL); + while ((m = g_queue_pop_head (connection->incoming_messages)) != NULL) { lm_message_unref (m); } @@ -253,9 +260,11 @@ const gchar *id; LmHandlerResult result = LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; + lm_connection_ref (connection); + if (lm_message_get_type (m) == LM_MESSAGE_TYPE_STREAM) { connection_stream_received (connection, m); - return; + goto out; } id = lm_message_node_get_attribute (m->node, "id"); @@ -271,7 +280,7 @@ } if (result == LM_HANDLER_RESULT_REMOVE_MESSAGE) { - return; + goto out; } for (l = connection->handlers[lm_message_get_type (m)]; @@ -283,6 +292,9 @@ connection, m); } + +out: + lm_connection_unref (connection); return; } @@ -447,11 +459,13 @@ if (connect_data->current_addr == NULL) { connection_do_close (connection); - if (connection->open_cb && connection->open_cb->func) { + if (connection->open_cb) { LmCallback *cb = connection->open_cb; + connection->open_cb = NULL; (* ((LmResultFunction) cb->func)) (connection, FALSE, cb->user_data); + _lm_utils_free_callback (cb); } freeaddrinfo (connect_data->resolved_addrs); @@ -467,7 +481,7 @@ { _lm_connection_failed_with_error (connect_data,errno); } - + static gboolean connection_connect_cb (GIOChannel *source, GIOCondition condition, @@ -1169,16 +1183,17 @@ lm_verbose ("AUTH reply: %d\n", result); - if (connection->auth_cb && connection->auth_cb->func) { - LmCallback *cb = connection->auth_cb; + if (connection->auth_cb) { + LmCallback *cb = connection->auth_cb; + connection->auth_cb = NULL; + + if (cb->func) + (* ((LmResultFunction) cb->func)) (connection, + result, cb->user_data); - (* ((LmResultFunction) cb->func)) (connection, - result, cb->user_data); + _lm_utils_free_callback (cb); } - _lm_utils_free_callback (connection->auth_cb); - connection->auth_cb = NULL; - return LM_HANDLER_RESULT_REMOVE_MESSAGE; } @@ -1203,15 +1218,16 @@ connection_start_keep_alive (connection); - if (connection->open_cb && connection->open_cb->func) { + if (connection->open_cb) { LmCallback *cb = connection->open_cb; + connection->open_cb = NULL; - (* ((LmResultFunction) cb->func)) (connection, result, - cb->user_data); + if (cb->func) + (* ((LmResultFunction) cb->func)) (connection, result, + cb->user_data); + + _lm_utils_free_callback (connection->open_cb); } - - _lm_utils_free_callback (connection->open_cb); - connection->open_cb = NULL; } static gint @@ -2129,9 +2145,12 @@ _lm_utils_free_callback (connection->disconnect_cb); } - connection->disconnect_cb = _lm_utils_new_callback (function, - user_data, - notify); + if (function) + connection->disconnect_cb = _lm_utils_new_callback (function, + user_data, + notify); + else + connection->disconnect_cb = NULL; } /** Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/FC-5/loudmouth.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- loudmouth.spec 5 Apr 2006 17:08:13 -0000 1.12 +++ loudmouth.spec 26 May 2006 14:49:48 -0000 1.13 @@ -2,13 +2,14 @@ Name: loudmouth Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries License: LGPL URL: http://www.imendio.com/projects/loudmouth Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-reentrancy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.4.0 @@ -20,11 +21,13 @@ BuildRequires: libtasn1 >= 0.2.6 %endif + %description 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. + %package devel Summary: Development files for Loudmouth Group: Development/Libraries @@ -34,13 +37,16 @@ BuildRequires: gnutls-devel >= 1.0.0 %endif + %description devel 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. + %prep %setup -q +%patch0 -p1 -b .reentrancy %build @@ -78,15 +84,19 @@ %doc ChangeLog NEWS README COPYING %{_libdir}/libloudmouth*.so.* + %files devel %defattr(-,root,root,-) %{_libdir}/libloudmouth*.so -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/%{name}-1.0.pc %{_includedir}/%{name}-1.0 %{_datadir}/gtk-doc/html/%{name} %changelog +* Fri May 26 2006 Brian Pepple - 1.0.3-3 +- Add patch to fix some reentrancy crashes. (Thanks, Havoc) + * Wed Apr 5 2006 Brian Pepple - 1.0.3-2 - Update to 1.0.3. - Add BR for gnutls-devel to devel package. From fedora-extras-commits at redhat.com Fri May 26 17:13:58 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:13:58 -0700 Subject: rpms/jack-audio-connection-kit - New directory Message-ID: <200605261714.k4QHE0EY023400@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23374/jack-audio-connection-kit Log Message: Directory /cvs/extras/rpms/jack-audio-connection-kit added to the repository From fedora-extras-commits at redhat.com Fri May 26 17:13:59 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:13:59 -0700 Subject: rpms/jack-audio-connection-kit/devel - New directory Message-ID: <200605261714.k4QHE1RI023403@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23374/jack-audio-connection-kit/devel Log Message: Directory /cvs/extras/rpms/jack-audio-connection-kit/devel added to the repository From fedora-extras-commits at redhat.com Fri May 26 17:14:15 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:14:15 -0700 Subject: rpms/jack-audio-connection-kit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605261714.k4QHEHst023452@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23421/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jack-audio-connection-kit --- NEW 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 May 26 17:14:15 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:14:15 -0700 Subject: rpms/jack-audio-connection-kit Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200605261714.k4QHEHOk023449@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23421 Added Files: Makefile import.log Log Message: Setup of module jack-audio-connection-kit --- NEW FILE Makefile --- # Top level Makefile for module jack-audio-connection-kit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 26 17:15:12 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:15:12 -0700 Subject: rpms/jack-audio-connection-kit import.log,1.1,1.2 Message-ID: <200605261715.k4QHFiov023548@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23508 Modified Files: import.log Log Message: auto-import jack-audio-connection-kit-0.101.1-8 on branch devel from jack-audio-connection-kit-0.101.1-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 May 2006 17:14:14 -0000 1.1 +++ import.log 26 May 2006 17:15:11 -0000 1.2 @@ -0,0 +1 @@ +jack-audio-connection-kit-0_101_1-8:HEAD:jack-audio-connection-kit-0.101.1-8.src.rpm:1148663701 From fedora-extras-commits at redhat.com Fri May 26 17:15:12 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:15:12 -0700 Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit-README.Fedora, NONE, 1.1 jack-audio-connection-kit.spec, NONE, 1.1 jack-clock3.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605261715.k4QHFikn023552@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23508/devel Modified Files: .cvsignore sources Added Files: jack-audio-connection-kit-README.Fedora jack-audio-connection-kit.spec jack-clock3.patch Log Message: auto-import jack-audio-connection-kit-0.101.1-8 on branch devel from jack-audio-connection-kit-0.101.1-8.src.rpm --- NEW FILE jack-audio-connection-kit-README.Fedora --- Running JACK server in realtime mode. The JACK server jackd has the capability to run in a real-time mode which greatly decreases the chance of audio glitches. The real-time mode is enabled by passing the -R or --realtime option to jackd when starting the server. It is only possible to run jackd in real-time mode as a non-root user by modifying your PAM configuration, PAM stands for Pluggable Authentication Modules and is the primary authentification mechanism used on Fedora. The primary source of PAM documentation can be found at the following at http://www.kernel.org/pub/linux/libs/pam/ The specific PAM configuration file that needs to be modified is /etc/security/limits.conf and it controls the system resource limits. It is important to understand that modifying the resource limits configuration files can decrease the security of your system. Documentation specific to the resource limits PAM module can be found at http://www.kernel.org/pub/linux/libs/pam/Linux-PAM-html/pam-6.html#ss6.12 The resource limits that need to be changed to allow jackd to run in realtime mode are named rtprio and memlock. To increase the limits for a specific user named fred you would add the following to /etc/security/limits.conf fred - rtprio 20 fred - memlock 50000 The value of rtprio can be set in the range 0 - 99 where any value greater that 0 will allow the user to change the scheduling policy to "real-time". By default the JACK server requires a minimum rtprio setting of 20 but jackd will accept a command line parameter -P or --realtime-priority which will change the minimum required value of rtprio that is needed, but the default of 20 is nearly always sufficient. The appropriate value for memlock is dependent on the amount of memory present in the system but a minimum value of 50000(50MB) and a maximum value of half the available memory can be used as a rough guideline. To verify that the resource limits have been modified you can use the bash built-in ulimit command, for example: $ulimit -a core file size (blocks, -c) 0 data seg size (kbytes, -d) unlimited max nice (-e) 0 file size (blocks, -f) unlimited pending signals (-i) 8191 max locked memory (kbytes, -l) 50000 max memory size (kbytes, -m) unlimited open files (-n) 1024 pipe size (512 bytes, -p) 8 POSIX message queues (bytes, -q) 819200 max rt priority (-r) 20 stack size (kbytes, -s) 10240 cpu time (seconds, -t) unlimited max user processes (-u) 8191 virtual memory (kbytes, -v) unlimited file locks (-x) unlimited file locks (-x) unlimited Keep in mind that you may have to re-login before changes to limits.conf take effect. --- NEW FILE jack-audio-connection-kit.spec --- Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.101.1 Release: 8%{?dist} License: GPL/LGPL Group: System Environment/Daemons Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz Source1: %{name}-README.Fedora Patch0: http://lalists.stanford.edu/lad/2006/01/att-0167/jack-clock3.patch URL: http://jackit.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: libsndfile-devel >= 1.0.0 BuildRequires: pkgconfig BuildRequires: doxygen BuildRequires: readline-devel, libtermcap-devel, ncurses-devel %description JACK is a low-latency audio server, written primarily for the Linux operating system. It can connect a number of different applications to an audio device, as well as allowing them to share audio between themselves. Its clients can run in their own processes (ie. as a normal application), or can they can run within a JACK server (ie. a "plugin"). JACK is different from other audio server efforts in that it has been designed from the ground up to be suitable for professional audio work. This means that it focuses on two key areas: synchronous execution of all clients, and low latency operation. %package devel Summary: Header files for Jack Group: Development/Libraries Requires: %{name} = %{version} Requires: pkgconfig %description devel Header files for the Jack Audio Connection Kit. %package example-clients Summary: Example clients that use Jack Group: Applications/Multimedia Requires: %{name} = %{version} %description example-clients Small example clients that use the Jack Audio Connection Kit. %prep %setup -q %patch0 -p1 -b .clock3 %build # x86_64 issue reported by Rudolf Kastl (not checked, but not bad). # Also patch0 touches configure.ac. autoreconf --force --install %configure --enable-stripped-jackd \ --with-html-dir=%{_docdir} \ %ifarch i386 --enable-sse=no --enable-mmx=no \ %endif --disable-oss \ --disable-portaudio \ --enable-optimize \ --with-default-tmpdir=/dev/shm make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # can't use the makeinstall macro, jack needs DESTDIR and prefix gets # added to it and messes up part of the install make install DESTDIR=$RPM_BUILD_ROOT # prepare README.Fedora for documentation including cp -p %{SOURCE1} README.Fedora # remove extra install of the documentation rm -fr $RPM_BUILD_ROOT%{_docdir} # remove *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/jack/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS TODO COPYING* %doc README.Fedora %{_bindir}/jackd %{_bindir}/jack_load %{_bindir}/jack_unload %{_bindir}/jack_bufsize %{_bindir}/jack_freewheel %{_bindir}/jack_transport %{_libdir}/jack/ %{_mandir}/man1/jack*.1* %{_libdir}/libjack.so.* %files devel %defattr(-,root,root) %doc doc/reference %{_includedir}/jack/ %{_libdir}/libjack.so %{_libdir}/pkgconfig/jack.pc %files example-clients %defattr(-,root,root) %{_bindir}/jackrec %{_bindir}/jack_connect %{_bindir}/jack_disconnect %{_bindir}/jack_impulse_grabber %{_bindir}/jack_lsp %{_bindir}/jack_metro %{_bindir}/jack_showtime %{_bindir}/jack_monitor_client %{_bindir}/jack_simple_client %changelog * Fri May 19 2006 Andy Shevchenko 0.101.1-8 - uniform directories items at %files section * Wed May 17 2006 Andy Shevchenko 0.101.1-7 - change License tag to GPL/LGPL - remove --enable-shared (it should be default) - add a -p flag to the line that copies README.Fedora * Wed May 10 2006 Andy Shevchenko 0.101.1-6 - apply clock fix for AMD X2 CPUs (please, refer to http://sourceforge.net/mailarchive/forum.php?thread_id=8085535&forum_id=3040) * Wed May 03 2006 Andy Shevchenko 0.101.1-5 - adjust spec after reviewing * Thu Apr 27 2006 Andy Shevchenko 0.101.1-4 - reformatting README.Fedora to 72 symbols width * Wed Apr 26 2006 Andy Shevchenko 0.101.1-3 - add README.Fedora - remove useless BRs * Mon Apr 24 2006 Andy Shevchenko 0.101.1-2 - disable oss and portaudio engines - use /dev/shm as jack tmpdir - remove capabilities stuff * Tue Apr 04 2006 Andy Shevchenko 0.101.1-1 - update to 0.101.1 * Mon Mar 27 2006 Andy Shevchenko - update to 0.100.7 (#183912) - adjust BR (add versions) - replace files between examples and main packages - own jack tmpdir * Fri Mar 17 2006 Andy Shevchenko - no libs subpackage - From Fernando Lopez-Lezcano : - added configuration variable to build with/without capabilities - added --enable-optimize flag to configure script - disabled sse/mmx instructions in i386 build - create temporary directory as /var/lib/jack/tmp - create and erase tmp directory at install or uninstall - try to umount the temporary directory before uninstalling the package * Fri Mar 03 2006 Andy Shevchenko - fix spec for extras injection * Fri Nov 18 2005 Andy Shevchenko - exclude *.la files - use dist tag * Fri Oct 14 2005 Andy Shevchenko - 0.100.0 - no optimization * Tue Sep 28 2004 Andy Shevchenko - 0.99.1 * Fri Aug 20 2004 Andy Shevchenko - rebuild from Mandrake jack-clock3.patch: --- NEW FILE jack-clock3.patch --- diff -ur jack-audio-connection-kit-0.100.7/config/os/generic/time.h jack/config/os/generic/time.h --- jack-audio-connection-kit-0.100.7/config/os/generic/time.h 2004-04-07 07:52:58.000000000 +0300 +++ jack/config/os/generic/time.h 2005-12-06 12:24:03.000000000 +0200 @@ -1,5 +1,6 @@ /* Copyright (C) 2001-2004 Paul Davis, Tilman Linneweh + Copyright (C) 2005 Jussi Laako Generic version, overridden by OS-specific definition when needed. @@ -23,48 +24,24 @@ #define __jack_time_h__ #include +#include #include -#include - -/* This is a kludge. We need one global instantiation of this - * variable in each address space. So, libjack/client.c declares the - * actual storage. Other source files will see it as an extern. */ -#define JACK_TIME_GLOBAL_DECL jack_time_t __jack_cpu_mhz -extern JACK_TIME_GLOBAL_DECL; static inline jack_time_t jack_get_microseconds (void) { - return get_cycles() / __jack_cpu_mhz; -} + jack_time_t jackTime; + struct timeval time; -/* This function is inspired by similar code in MPLayer. - * It should be quite portable - */ -static inline jack_time_t -jack_get_mhz (void) -{ - jack_time_t tsc_start, tsc_end; - struct timeval tv_start, tv_end; - long usec_delay; - jack_time_t mhz; - - tsc_start = get_cycles(); - gettimeofday(&tv_start, NULL); - usleep(100000); - tsc_end = get_cycles(); - gettimeofday(&tv_end, NULL); - - usec_delay = 1000000 * (tv_end.tv_sec - tv_start.tv_sec) - + (tv_end.tv_usec - tv_start.tv_usec); - mhz = (tsc_end - tsc_start) / usec_delay; - return mhz; + gettimeofday(&time, NULL); + jackTime = (jack_time_t) time.tv_sec * 1e6 + + (jack_time_t) time.tv_usec; + return jackTime; } /* This should only be called ONCE per process. */ static inline void jack_init_time () { - __jack_cpu_mhz = jack_get_mhz (); } #endif /* __jack_time_h__ */ diff -ur jack-audio-connection-kit-0.100.7/config/os/gnu-linux/time.h jack/config/os/gnu-linux/time.h --- jack-audio-connection-kit-0.100.7/config/os/gnu-linux/time.h 2004-03-25 21:31:44.000000000 +0200 +++ jack/config/os/gnu-linux/time.h 2005-12-06 16:30:20.000000000 +0200 @@ -1,5 +1,6 @@ /* Copyright (C) 2001-2003 Paul Davis + Copyright (C) 2005 Jussi Laako This is the GNU/Linux version. @@ -23,18 +24,35 @@ #define __jack_time_h__ #include +#include +#include #include #include -/* This is a kludge. We need one global instantiation of this - * variable in each address space. So, libjack/client.c declares the - * actual storage. Other source files will see it as an extern. */ +/* This is a kludge. We need one global instantiation of these + * variables in each address space. So, libjack/client.c declares the + * actual storage. Other source files will see those as an externs. */ #define JACK_TIME_GLOBAL_DECL jack_time_t __jack_cpu_mhz +#define JACK_TIME_SOURCE_DECL int __jack_clock_source +#define JACK_TIME_FUNC_DECL jack_time_t (*jack_get_microseconds) (void) extern JACK_TIME_GLOBAL_DECL; +extern JACK_TIME_SOURCE_DECL; +extern JACK_TIME_FUNC_DECL; -static inline jack_time_t -jack_get_microseconds (void) { - return get_cycles() / __jack_cpu_mhz; +static jack_time_t +jack_get_microseconds0 (void) { + jack_time_t jackTime; + struct timespec time; + + clock_gettime(CLOCK_MONOTONIC, &time); + jackTime = (jack_time_t) time.tv_sec * 1e6 + + (jack_time_t) time.tv_nsec / 1e3; + return jackTime; +} + +static jack_time_t +jack_get_microseconds1 (void) { + return get_cycles() / __jack_cpu_mhz; } /* @@ -94,4 +112,21 @@ __jack_cpu_mhz = jack_get_mhz (); } +/* Set time function. */ +static inline void +jack_set_clock_source (int clocksrc) +{ + __jack_clock_source = clocksrc; + switch (__jack_clock_source) + { + case 1: + jack_get_microseconds = jack_get_microseconds1; + break; + case 0: + default: + jack_get_microseconds = jack_get_microseconds0; + break; + } +} + #endif /* __jack_time_h__ */ diff -ur jack-audio-connection-kit-0.100.7/configure.ac jack/configure.ac --- jack-audio-connection-kit-0.100.7/configure.ac 2005-10-30 13:01:31.000000000 +0200 +++ jack/configure.ac 2005-12-06 14:13:09.000000000 +0200 @@ -126,6 +126,7 @@ AC_CHECK_FUNCS(on_exit atexit) AC_CHECK_FUNCS(posix_memalign) AC_CHECK_LIB(m, sin) +AC_CHECK_FUNC(clock_gettime, [], AC_CHECK_LIB(rt, clock_gettime)) # should we use mlockall() on this platform? if test "x$JACK_DO_NOT_MLOCK" = "x"; then diff -ur jack-audio-connection-kit-0.100.7/jack/engine.h jack/jack/engine.h --- jack-audio-connection-kit-0.100.7/jack/engine.h 2004-12-19 20:41:28.000000000 +0200 +++ jack/jack/engine.h 2005-12-06 13:47:39.000000000 +0200 @@ -169,6 +169,8 @@ int jack_get_fifo_fd (jack_engine_t *engine, unsigned int which_fifo); +extern int clock_source; + extern jack_client_internal_t * jack_client_internal_by_id (jack_engine_t *engine, jack_client_id_t id); diff -ur jack-audio-connection-kit-0.100.7/jack/internal.h jack/jack/internal.h --- jack-audio-connection-kit-0.100.7/jack/internal.h 2005-08-22 23:48:24.000000000 +0300 +++ jack/jack/internal.h 2005-12-06 13:50:48.000000000 +0200 @@ -130,6 +130,7 @@ jack_time_t sync_time_left; jack_frame_timer_t frame_timer; int32_t internal; + int clock_source; pid_t engine_pid; jack_nframes_t buffer_size; int8_t real_time; diff -ur jack-audio-connection-kit-0.100.7/jackd/engine.c jack/jackd/engine.c --- jack-audio-connection-kit-0.100.7/jackd/engine.c 2005-06-15 12:18:40.000000000 +0300 +++ jack/jackd/engine.c 2005-12-06 16:21:50.000000000 +0200 @@ -78,6 +78,8 @@ dlhandle handle; } jack_driver_info_t; +int clock_source = 0; + static int jack_port_assign_buffer (jack_engine_t *, jack_port_internal_t *); static jack_port_internal_t *jack_get_port_by_name (jack_engine_t *, @@ -1679,6 +1681,13 @@ engine->control->xrun_delayed_usecs = 0; engine->control->max_delayed_usecs = 0; +#ifdef JACK_TIME_FUNC_DECL + jack_set_clock_source(clock_source); +#else + __jack_clock_source = clock_source; +#endif + engine->control->clock_source = clock_source; + engine->control->frame_timer.frames = 0; engine->control->frame_timer.reset_pending = 0; engine->control->frame_timer.current_wakeup = 0; diff -ur jack-audio-connection-kit-0.100.7/jackd/jackd.c jack/jackd/jackd.c --- jack-audio-connection-kit-0.100.7/jackd/jackd.c 2005-06-15 12:18:40.000000000 +0300 +++ jack/jackd/jackd.c 2005-12-06 13:52:15.000000000 +0200 @@ -368,6 +368,7 @@ " [ --verbose OR -v ]\n" " [ --silent OR -s ]\n" " [ --version OR -V ]\n" +" [ --clock-source OR -c ]\n" " -d driver [ ... driver args ... ]\n" " where driver can be `alsa', `coreaudio', `dummy',\n" " `oss' or `portaudio'\n\n" @@ -463,7 +464,7 @@ { jack_driver_desc_t * desc; - const char *options = "-ad:P:uvshVRTFl:t:mn:p:"; + const char *options = "-ad:P:uvshVRTFl:t:mn:p:c:"; struct option long_options[] = { { "driver", 1, 0, 'd' }, @@ -479,6 +480,7 @@ { "temporary", 0, 0, 'T' }, { "version", 0, 0, 'V' }, { "silent", 0, 0, 's' }, + { "clock-source", 1, 0, 'c' }, { 0, 0, 0, 0 } }; int opt = 0; @@ -586,6 +588,10 @@ show_version = 1; break; + case 'c': + clock_source = atoi (optarg); + break; + default: fprintf (stderr, "unknown option character %c\n", optopt); diff -ur jack-audio-connection-kit-0.100.7/libjack/client.c jack/libjack/client.c --- jack-audio-connection-kit-0.100.7/libjack/client.c 2005-09-11 02:58:43.000000000 +0300 +++ jack/libjack/client.c 2005-12-06 16:21:12.000000000 +0200 @@ -51,6 +51,10 @@ #include JACK_TIME_GLOBAL_DECL; /* One instance per process. */ +JACK_TIME_SOURCE_DECL; /* One instance per process. */ +#ifdef JACK_TIME_FUNC_DECL +JACK_TIME_FUNC_DECL; +#endif #include "local.h" @@ -959,6 +963,13 @@ client->engine = (jack_control_t *) jack_shm_addr (&client->engine_shm); + /* initialize clock source as early as possible */ +#ifdef JACK_TIME_FUNC_DECL + jack_set_clock_source(client->engine->clock_source); +#else + __jack_clock_source = client->engine->clock_source; +#endif + /* now attach the client control block */ client->control_shm = res.client_shm; if (jack_attach_shm (&client->control_shm)) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 May 2006 17:14:15 -0000 1.1 +++ .cvsignore 26 May 2006 17:15:12 -0000 1.2 @@ -0,0 +1 @@ +jack-audio-connection-kit-0.101.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 May 2006 17:14:15 -0000 1.1 +++ sources 26 May 2006 17:15:12 -0000 1.2 @@ -0,0 +1 @@ +bb25f7c1da5d488b70edcf39ff5a39b2 jack-audio-connection-kit-0.101.1.tar.gz From fedora-extras-commits at redhat.com Fri May 26 17:21:51 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Fri, 26 May 2006 10:21:51 -0700 Subject: owners owners.list,1.1057,1.1058 Message-ID: <200605261721.k4QHLrgT023666@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632/owners Modified Files: owners.list Log Message: Added andy at smile.org.ua as owner of jack-audio-connection-kit. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1057 retrieving revision 1.1058 diff -u -r1.1057 -r1.1058 --- owners.list 26 May 2006 02:58:56 -0000 1.1057 +++ owners.list 26 May 2006 17:21:51 -0000 1.1058 @@ -546,6 +546,7 @@ Fedora Extras|itk|Object oriented extension to Tk|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|iwidgets|A set of useful widgets based on itcl and itk|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|jack-audio-connection-kit|The Jack Audio Connection Kit|andy at smile.org.ua|extras-qa at fedoraproject.org| Fedora Extras|jakarta-commons-cli|Command Line Interface Library for Java|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|jam|Program construction tool, similar to make|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 26 17:22:39 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 26 May 2006 10:22:39 -0700 Subject: fedora-security/audit fc4,1.266,1.267 fc5,1.179,1.180 Message-ID: <200605261722.k4QHMdd8023698@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23647 Modified Files: fc4 fc5 Log Message: Add some notes for a firefox issue that doesn't affect us. It's no secret where firefox is installed on a FC system. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- fc4 26 May 2006 13:17:33 -0000 1.266 +++ fc4 26 May 2006 17:22:36 -0000 1.267 @@ -4,7 +4,7 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] -CVE-2006-2613 ** firefox +CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 CVE-2006-2493 ** freetype CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- fc5 26 May 2006 13:17:33 -0000 1.179 +++ fc5 26 May 2006 17:22:36 -0000 1.180 @@ -4,7 +4,7 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] -CVE-2006-2613 ** firefox +CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) From fedora-extras-commits at redhat.com Fri May 26 17:23:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:23:33 -0700 Subject: rpms/pari - New directory Message-ID: <200605261723.k4QHNZqu023773@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23752/pari Log Message: Directory /cvs/extras/rpms/pari added to the repository From fedora-extras-commits at redhat.com Fri May 26 17:23:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:23:33 -0700 Subject: rpms/pari/devel - New directory Message-ID: <200605261723.k4QHNZlI023776@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23752/pari/devel Log Message: Directory /cvs/extras/rpms/pari/devel added to the repository From fedora-extras-commits at redhat.com Fri May 26 17:23:52 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:23:52 -0700 Subject: rpms/pari Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605261723.k4QHNsWA023825@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23797 Added Files: Makefile import.log Log Message: Setup of module pari --- NEW FILE Makefile --- # Top level Makefile for module pari all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri May 26 17:23:52 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:23:52 -0700 Subject: rpms/pari/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605261723.k4QHNtLW023828@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23797/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pari --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri May 26 17:25:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:25:12 -0700 Subject: rpms/pari import.log,1.1,1.2 Message-ID: <200605261725.k4QHPEui023910@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23877 Modified Files: import.log Log Message: auto-import pari-2.3.0-2.fc5 on branch devel from pari-2.3.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pari/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 May 2006 17:23:52 -0000 1.1 +++ import.log 26 May 2006 17:25:11 -0000 1.2 @@ -0,0 +1 @@ +pari-2_3_0-2_fc5:HEAD:pari-2.3.0-2.src.rpm:1148664303 From fedora-extras-commits at redhat.com Fri May 26 17:25:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:25:12 -0700 Subject: rpms/pari/devel pari.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605261725.k4QHPEhQ023915@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23877/devel Modified Files: .cvsignore sources Added Files: pari.spec Log Message: auto-import pari-2.3.0-2.fc5 on branch devel from pari-2.3.0-2.src.rpm --- NEW FILE pari.spec --- Name: pari Version: 2.3.0 Release: 2%{?dist} Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries License: GPL URL: http://pari.math.u-bordeaux.fr Source: http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: readline-devel BuildRequires: gmp-devel BuildRequires: tetex BuildRequires: tetex-dvips BuildRequires: desktop-file-utils %if "%{?fedora}" > "4" BuildRequires: libX11-devel %else BuildRequires: xorg-x11-devel %endif Requires: tetex-xdvi %description PARI is a widely used computer algebra system designed for fast computations in number theory (factorizations, algebraic number theory, elliptic curves...), but also contains a large number of other useful functions to compute with mathematical entities such as matrices, polynomials, power series, algebraic numbers, etc., and a lot of transcendental functions. This package contains the shared libraries. The interactive calculator PARI/GP is in package %{name}-gp. %package devel Summary: Header files and libraries for PARI development Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Header files and libraries for PARI development. %package gp Summary: PARI calculator Group: Applications/Engineering Requires: gzip %description gp PARI/GP is an advanced programmable calculator, which computes symbolically as long as possible, numerically where needed, and contains a wealth of number-theoretic functions. %package emacs Summary: Emacs mode for PARI/GP Group: Applications/Engineering Requires: emacs-common Requires: %{name}-gp = %{version}-%{release} %description emacs Emacs mode for PARI/GP. %prep %setup -q perl -pi -e "s|runpathprefix='.*'|runpathprefix=''|" config/get_ld %build ./Configure \ --prefix=%{_prefix} \ --share-prefix=%{_datadir} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ --mandir=%{_mandir}/man1 \ --datadir=%{_datadir}/pari \ --includedir=%{_includedir} \ --with-gmp make %{?_smp_mflags} gp CFLAGS="-fPIC $RPM_OPT_FLAGS" %check make dobench make dotest-compat make dotest-intnum make dotest-qfbsolve make dotest-rfrac make dotest-round4 %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # we move pari.cfg to the docdir rm -fr $RPM_BUILD_ROOT%{_prefix}/lib/pari mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d cat > $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/pari-init.el < gp.desktop < - 2.3.0-2 - added %%check section - use gmp * Thu May 25 2006 Gerard Milmeister - 2.3.0-1 - new version 2.3.0 * Fri May 19 2006 Orion Poplawski - 2.1.7-4 - Fix shared library builds * Fri Dec 2 2005 Gerard Milmeister - 2.1.7-3 - Use none for architecture to guarantee working 64bit builds * Fri Oct 21 2005 Gerard Milmeister - 2.1.7-2 - some cleanup * Fri Sep 30 2005 Gerard Milmeister - 2.1.7-1 - New Version 2.1.7 * Sun Mar 6 2005 Gerard Milmeister - 2.1.6-1 - New Version 2.1.6 * Mon Nov 22 2004 Gerard Milmeister - 0:2.1.5-0.fdr.2 - Fixed problem with readline * Wed Nov 12 2003 Gerard Milmeister - 0:2.1.5-0.fdr.x - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pari/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 May 2006 17:23:52 -0000 1.1 +++ .cvsignore 26 May 2006 17:25:12 -0000 1.2 @@ -0,0 +1 @@ +pari-2.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pari/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 May 2006 17:23:52 -0000 1.1 +++ sources 26 May 2006 17:25:12 -0000 1.2 @@ -0,0 +1 @@ +ea685da18e015a4365965e82e6e2a2dd pari-2.3.0.tar.gz From fedora-extras-commits at redhat.com Fri May 26 17:50:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 10:50:07 -0700 Subject: rpms/pari/FC-5 pari.spec,1.1,1.2 Message-ID: <200605261750.k4QHo9MI024844@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24827 Modified Files: pari.spec Log Message: Index: pari.spec =================================================================== RCS file: /cvs/extras/rpms/pari/FC-5/pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pari.spec 26 May 2006 17:25:12 -0000 1.1 +++ pari.spec 26 May 2006 17:50:07 -0000 1.2 @@ -1,6 +1,6 @@ Name: pari Version: 2.3.0 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries From fedora-extras-commits at redhat.com Fri May 26 17:58:14 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 26 May 2006 10:58:14 -0700 Subject: rpms/daap-sharp/devel daap-sharp.spec,1.1,1.2 Message-ID: <200605261758.k4QHwGsS024973@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/daap-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24956 Modified Files: daap-sharp.spec Log Message: * Fri May 26 2006 Brian Pepple - 0.3.3-4 - Bump. Index: daap-sharp.spec =================================================================== RCS file: /cvs/extras/rpms/daap-sharp/devel/daap-sharp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- daap-sharp.spec 26 May 2006 02:55:30 -0000 1.1 +++ daap-sharp.spec 26 May 2006 17:58:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: daap-sharp Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: DAAP (Digial Audio Access Protocol) implementation using Mono Group: System Environment/Libraries @@ -63,6 +63,9 @@ %changelog +* Fri May 26 2006 Brian Pepple - 0.3.3-4 +- Bump. + * Tue May 16 2006 Brian Pepple - 0.3.3-3 - Add devel package for *.pc file. - Add Req on mono-core. From fedora-extras-commits at redhat.com Fri May 26 18:01:15 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 26 May 2006 11:01:15 -0700 Subject: rpms/qt4/devel .cvsignore,1.2,1.3 qt4.spec,1.2,1.3 Message-ID: <200605261801.k4QI1oQF027364@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27315 Modified Files: .cvsignore qt4.spec Log Message: * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %buildSQL macro - -libdir %qt_libdir Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2006 14:06:14 -0000 1.2 +++ .cvsignore 26 May 2006 18:01:15 -0000 1.3 @@ -1 +1,2 @@ +clog qt-x11-opensource-src-4.1.3.tar.gz Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt4.spec 24 May 2006 14:45:14 -0000 1.2 +++ qt4.spec 26 May 2006 18:01:15 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -22,18 +22,16 @@ Source24: qtconfig.desktop ## Optional bits -# Build mysql plugins -%define mysql 1 -# Build postgresql plugins -%define psql 1 -# Build ODBC plugins -%define odbc 1 -# Build sqlite plugins -%define sqlite 1 +# Build SQL plugins (mysql, unixodbc, postgresql, sqlite) +%define buildSQL 1 +# define to build sqlite2 plugin (FIXME/TODO) +#define sqlite2 1 %define qt_dirname qt4 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/%{name}-doc-%{version} +# Be careful about ever changing this, some 3rd-party libs install here -- Rex +%define qt_libdir %{qtdir}/%{_lib} Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d @@ -56,24 +54,20 @@ %endif BuildRequires: %{x_deps} -%if %{mysql} +%if %{buildSQL} +# mysql # mysql-devel < 4 build fails on 4.1.3+, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") %global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql") %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g") -%endif -%if %{psql} +# postgresql BuildRequires: postgresql-devel -%endif - -%if %{odbc} +# unixODBC BuildRequires: unixODBC-devel -%endif - -%if %{sqlite} +# sqlite BuildRequires: sqlite-devel %endif @@ -160,9 +154,6 @@ %build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -184,8 +175,8 @@ echo yes | ./configure -v \ -no-rpath \ -prefix %{qtdir} \ - -libdir %{qtdir}/%{_lib} \ -docdir %{qt_docdir} \ + -libdir %{qt_libdir} \ -platform %{platform} \ -release \ -shared \ @@ -195,18 +186,12 @@ -system-zlib \ -system-libpng \ -system-libjpeg \ -%if %{mysql} +%if %{buildSQL} -plugin-sql-mysql \ %{?mysql_include} \ %{?mysql_ldflags} \ -%endif -%if %{psql} -plugin-sql-psql \ -%endif -%if %{odbc} -plugin-sql-odbc \ -%endif -%if %{sqlite} -plugin-sql-sqlite \ %endif -cups \ @@ -227,27 +212,24 @@ %install rm -rf %{buildroot} -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" - make install INSTALL_ROOT=%{buildroot} ## pkg-config # strip extraneous dirs/libraries -- Rex # safe ones for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done # not-so-safe, but we can try -- Rex -for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl +# -L/usr/X11R6/%{_lib} +for dep in -lXrender -lXrandr -lXcursor -lXinerama -lXi -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done -sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl +sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ pushd %{buildroot}%{_libdir}/pkgconfig @@ -297,10 +279,10 @@ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} # .la files, die, die, die. -rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la +rm -f %{buildroot}%{qt_libdir}/lib*.la mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{qt_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean @@ -319,8 +301,8 @@ /etc/ld.so.conf.d/* %dir %{qtdir} %dir %{qtdir}/bin/ -%dir %{qtdir}/%{_lib}/ -%{qtdir}/%{_lib}/lib*.so.* +%dir %{qt_libdir} +%{qt_libdir}/lib*.so.* %dir %{qtdir}/plugins/ %{qtdir}/plugins/accessible/ %{qtdir}/plugins/imageformats/ @@ -354,13 +336,12 @@ %{_bindir}/uic* %{qtdir}/include/ %{qtdir}/mkspecs/ -%dir %{qtdir}/%{_lib} -%{qtdir}/%{_lib}/lib*.so +%{qt_libdir}/lib*.so # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a -%{qtdir}/%{_lib}/lib*.a -%{qtdir}/%{_lib}/lib*.prl +%{qt_libdir}/lib*.a +%{qt_libdir}/lib*.prl %{qtdir}/phrasebooks/ -%{qtdir}/%{_lib}/*.pc +%{qt_libdir}/*.pc %{_libdir}/pkgconfig/*.pc %{qtdir}/q3porting.xml # Qt designer @@ -390,25 +371,19 @@ %{_bindir}/qt*demo* %{_datadir}/applications/*qtdemo*.desktop -%if %{odbc} +%if %{buildSQL} %files odbc %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc* -%endif -%if %{psql} %files postgresql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql* -%endif -%if %{mysql} %files mysql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql* -%endif -%if %{sqlite} %files sqlite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite* @@ -416,6 +391,11 @@ %changelog +* Fri May 26 2006 Rex Dieter 4.1.3-5 +- strip -lXi from .pc files (#193258) +- simplify sql plugin builds via %%buildSQL macro +- -libdir %%qt_libdir + * Wed May 24 2006 Rex Dieter 4.1.3-4 - move (most) %%dir ownership (back) to main pkg From fedora-extras-commits at redhat.com Fri May 26 18:16:09 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:16:09 -0700 Subject: rpms/xscreensaver - New directory Message-ID: <200605261816.k4QIGB4n027558@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27537/xscreensaver Log Message: Directory /cvs/extras/rpms/xscreensaver added to the repository From fedora-extras-commits at redhat.com Fri May 26 18:16:09 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:16:09 -0700 Subject: rpms/xscreensaver/devel - New directory Message-ID: <200605261816.k4QIGBNR027561@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27537/xscreensaver/devel Log Message: Directory /cvs/extras/rpms/xscreensaver/devel added to the repository From fedora-extras-commits at redhat.com Fri May 26 18:16:45 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:16:45 -0700 Subject: rpms/xscreensaver Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605261816.k4QIGl4c027616@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583 Added Files: Makefile import.log Log Message: Setup of module xscreensaver --- NEW FILE Makefile --- # Top level Makefile for module xscreensaver all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 26 18:16:46 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:16:46 -0700 Subject: rpms/xscreensaver/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605261816.k4QIGmGB027619@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xscreensaver --- NEW 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 May 26 18:20:02 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:20:02 -0700 Subject: rpms/xscreensaver import.log,1.1,1.2 Message-ID: <200605261820.k4QIKYiM027737@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27680 Modified Files: import.log Log Message: auto-import xscreensaver-5.00-1 on branch devel from xscreensaver-5.00-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 May 2006 18:16:45 -0000 1.1 +++ import.log 26 May 2006 18:20:02 -0000 1.2 @@ -0,0 +1 @@ +xscreensaver-5_00-1:HEAD:xscreensaver-5.00-1.src.rpm:1148667575 From fedora-extras-commits at redhat.com Fri May 26 18:20:03 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:20:03 -0700 Subject: rpms/xscreensaver/devel xscreensaver-5.00-locale-safety.patch, NONE, 1.1 xscreensaver-5.00-matherr-utils.patch, NONE, 1.1 xscreensaver-5.00b5-change-defaults.patch, NONE, 1.1 xscreensaver-5.00b5-dont-allow-root.patch, NONE, 1.1 xscreensaver-5.00b5-include-directory.patch, NONE, 1.1 xscreensaver-5.00b5-sanitize-hacks.patch, NONE, 1.1 xscreensaver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605261820.k4QIKZLt027741@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27680/devel Modified Files: .cvsignore sources Added Files: xscreensaver-5.00-locale-safety.patch xscreensaver-5.00-matherr-utils.patch xscreensaver-5.00b5-change-defaults.patch xscreensaver-5.00b5-dont-allow-root.patch xscreensaver-5.00b5-include-directory.patch xscreensaver-5.00b5-sanitize-hacks.patch xscreensaver.spec Log Message: auto-import xscreensaver-5.00-1 on branch devel from xscreensaver-5.00-1.src.rpm xscreensaver-5.00-locale-safety.patch: --- NEW FILE xscreensaver-5.00-locale-safety.patch --- --- xscreensaver-5.00/hacks/screenhack.c.locale-safety 2006-05-24 07:09:58.000000000 +0900 +++ xscreensaver-5.00/hacks/screenhack.c 2006-05-26 01:53:18.000000000 +0900 @@ -170,6 +170,9 @@ const char *cmp_locale; int j = 0; + /* current_locale might be NULL */ + if (!current_locale || !*current_locale) return; + while ((cmp_locale = change_locale[j])) { if (!strncmp(current_locale, cmp_locale, strlen(cmp_locale))) xscreensaver-5.00-matherr-utils.patch: --- NEW FILE xscreensaver-5.00-matherr-utils.patch --- --- xscreensaver-5.00/utils/erase.c.matherr2 2006-03-28 16:07:37.000000000 +0900 +++ xscreensaver-5.00/utils/erase.c 2006-05-26 01:45:00.000000000 +0900 @@ -451,7 +451,7 @@ { st->cols = 10 + random() % 30; size = st->width / st->cols; - rows = (st->height / size) + 1; + rows = (size ? (st->height / size) : 0) + 1; st->nlines = st->cols * rows; st->lines = (int *) calloc (st->nlines, sizeof(*st->lines)); @@ -469,7 +469,7 @@ } size = st->width / st->cols; - rows = (st->height / size) + 1; + rows = (size ? (st->height / size) : 0) + 1; for (i = st->nlines * st->prev_ratio; i < st->nlines * st->ratio; xscreensaver-5.00b5-change-defaults.patch: --- NEW FILE xscreensaver-5.00b5-change-defaults.patch --- --- xscreensaver-5.00b5/driver/XScreenSaver.ad.in.change-defaults 2006-05-18 09:12:56.000000000 +0900 +++ xscreensaver-5.00b5/driver/XScreenSaver.ad.in 2006-05-18 15:05:31.000000000 +0900 @@ -37,24 +37,24 @@ *dpmsStandby: 2:00:00 *dpmsSuspend: 2:00:00 *dpmsOff: 4:00:00 -*grabDesktopImages: True +*grabDesktopImages: False *grabVideoFrames: False *chooseRandomImages: @DEFAULT_IMAGES_P@ *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ *nice: 10 *memoryLimit: 0 -*lock: False +*lock: True *verbose: False *timestamp: True *fade: True *unfade: False *fadeSeconds: 0:00:03 *fadeTicks: 20 -*splash: True +*splash: False *splashDuration: 0:00:05 *visualID: default *captureStderr: True -*ignoreUninstalledPrograms: False +*ignoreUninstalledPrograms: True *textMode: file *textLiteral: XScreenSaver @@ -74,7 +74,7 @@ ! Set this to True if you are experiencing longstanding XFree86 bug #421 ! (xscreensaver not covering the whole screen) -GetViewPortIsFullOfLies: False +GetViewPortIsFullOfLies: True ! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.) *demoCommand: xscreensaver-demo @@ -93,13 +93,11 @@ ! ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3) ! - at GNOME24@*loadURL: gnome-open '%s' @GNOME24@*manualCommand: gnome-terminal --title '%s manual' \ @GNOME24@ --command '/bin/sh -c "man %s; read foo"' ! ! Gnome 2.2: ! - at GNOME22@*loadURL: gnome-url-show '%s' @GNOME22@*manualCommand: gnome-terminal --title '%s manual' \ @GNOME22@ --command '/bin/sh -c "man %s; read foo"' ! @@ -110,10 +108,10 @@ ! ! non-Gnome systems: ! - at NOGNOME@*loadURL: firefox '%s' || mozilla '%s' || netscape '%s' @NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \ @NOGNOME@ -e /bin/sh -c 'man "%s" ; read foo' +*loadURL: htmlview '%s' ! The format used for printing the date and time in the password dialog box ! (see the strftime(3) manual page for details.) @@ -229,7 +227,7 @@ epicycle -root \n\ interference -root \n\ truchet -root \n\ - bsod -root \n\ +- bsod -root \n\ crystal -root \n\ discrete -root \n\ kumppa -root \n\ @@ -455,7 +453,7 @@ *Dialog.borderWidth: 1 *Dialog.shadowThickness: 2 -*passwd.heading.label: XScreenSaver %s +*passwd.heading.label: Screen Locked *passwd.body.label: Please enter your password. *passwd.login.label: New Login *passwd.user.label: Username: xscreensaver-5.00b5-dont-allow-root.patch: --- NEW FILE xscreensaver-5.00b5-dont-allow-root.patch --- --- xscreensaver-5.00b5/driver/passwd-pam.c.dont-allow-root 2006-05-17 11:14:58.000000000 +0900 +++ xscreensaver-5.00b5/driver/passwd-pam.c 2006-05-18 15:13:39.000000000 +0900 @@ -288,6 +288,7 @@ goto DONE; } +#if 0 /* If that didn't work, set the user to root, and try to authenticate again. */ if (user) free (user); @@ -300,6 +301,7 @@ if (status != PAM_SUCCESS) goto DONE; PAM_NO_DELAY(pamh); +#endif set = block_sigchld(); status = pam_authenticate (pamh, 0); xscreensaver-5.00b5-include-directory.patch: --- NEW FILE xscreensaver-5.00b5-include-directory.patch --- --- xscreensaver-5.00b5/hacks/glx/Makefile.in.include-dir 2006-05-18 09:22:21.000000000 +0900 +++ xscreensaver-5.00b5/hacks/glx/Makefile.in 2006-05-18 15:21:02.000000000 +0900 @@ -207,6 +207,7 @@ install-program:: $(EXES) @exes="$(HACK_EXES)" ; \ idir="$(install_prefix)$(HACKDIR)" ; \ + echo "Installing hack programs in the directory $(install_prefix)$(HACKDIR)" ;\ if [ "$$exes" != "" ]; then \ if [ ! -d $$idir ]; then \ $(INSTALL_DIRS) $$idir ; \ @@ -220,6 +221,7 @@ # the xscreensaver-gl-helper program, in $bindir install-program:: $(EXES) @exes="@GL_UTIL_EXES@" ; \ + echo "Installing gl-helper program in the directory $(install_prefix)$(bindir)" ;\ idir="$(install_prefix)$(bindir)" ; \ if [ "$$exes" != "" ]; then \ if [ ! -d $$idir ]; then \ @@ -246,6 +248,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ; \ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -266,6 +269,7 @@ install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing XML config files in the directory $(install_prefix)$(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ --- xscreensaver-5.00b5/hacks/Makefile.in.include-dir 2006-05-18 09:22:18.000000000 +0900 +++ xscreensaver-5.00b5/hacks/Makefile.in 2006-05-18 15:21:02.000000000 +0900 @@ -254,6 +254,7 @@ @if [ ! -d $(install_prefix)$(HACKDIR) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ; \ fi ; \ + echo "Installing hack programs in the directory $(install_prefix)$(HACKDIR)" ;\ for program in $(NEXES); do \ echo $(INSTALL_PROGRAM) $$program \ $(install_prefix)$(HACKDIR)/$$program ; \ @@ -327,6 +328,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ;\ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -347,6 +349,7 @@ install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing XML config documents in the directory $(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ --- xscreensaver-5.00b5/driver/Makefile.in.include-dir 2006-05-18 09:22:18.000000000 +0900 +++ xscreensaver-5.00b5/driver/Makefile.in 2006-05-18 15:21:02.000000000 +0900 @@ -26,6 +26,7 @@ GTK_DATADIR = @GTK_DATADIR@ GTK_APPDIR = $(GTK_DATADIR)/applications GTK_ICONDIR = $(GTK_DATADIR)/pixmaps +SAVER_DATADIR = $(GTK_DATADIR)/xscreensaver GTK_GLADEDIR = $(GTK_DATADIR)/xscreensaver/glade HACK_CONF_DIR = @HACK_CONF_DIR@ @@ -290,6 +291,7 @@ $$e "" ;\ fi ; \ fi ; \ + echo "Installing driver programs in the directory $(install_prefix)$(bindir)" ;\ echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver @for exe in xscreensaver-command xscreensaver-demo \ @@ -302,6 +304,7 @@ @if [ ! -d $(install_prefix)$(AD_DIR) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(AD_DIR) ; \ fi + @echo "Installing XScreenSaver.ad in the directory $(install_prefix)$(AD_DIR)" @-echo $(INSTALL_DATA) XScreenSaver.ad \ $(install_prefix)$(AD_DIR)/XScreenSaver ; \ if $(INSTALL_DATA) XScreenSaver.ad \ @@ -375,6 +378,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ; \ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -418,7 +422,15 @@ dir="$(install_prefix)$(PAM_DIR)" ; \ conf="$(PAM_CONF)" ; \ \ + \ + if [ ! -d $$dir -a ! -f $$conf ] ; then \ + echo $(INSTALL_DIRS) $$dir ; \ + $(INSTALL_DIRS) $$dir ; \ + fi ; \ + \ + \ if [ -d $$dir ] ; then \ + echo "Installing pam script file in the directory $(install_prefix)$(PAM_DIR)" ;\ \ if [ -f $$dir/xdm ]; then \ src2=$$dir/xdm ; \ @@ -491,6 +503,7 @@ # into /usr/share/applications/ install-gnome:: screensaver-properties.desktop @if [ "$(GTK_DATADIR)" != "" ]; then \ + echo "Installing desktop text in the directory $(install_prefix)$(GTK_APPDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ @@ -507,6 +520,7 @@ # into /usr/share/pixmaps/ install-gnome:: $(LOGO) @if [ "$(GTK_DATADIR)" != "" ]; then \ + echo "Installing X pixmap image file in the directory $(install_prefix)$(GTK_ICONDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_ICONDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ @@ -522,6 +536,15 @@ # into /usr/share/xscreensaver/glade/ install-gnome:: @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + \ + \ + echo "Creating the directory $(install_prefix)$(SAVER_DATADIR)" ;\ + if [ ! -d "$(install_prefix)$(SAVER_DATADIR)" ] ; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + fi ; \ + \ + echo "Installing PNG image file in the directory $(install_prefix)$(GTK_GLADEDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ @@ -539,6 +562,15 @@ # into /usr/share/xscreensaver/glade/ install-gnome:: xscreensaver-demo.glade2 @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + \ + \ + echo "Creating the directory $(install_prefix)$(SAVER_DATADIR)" ;\ + if [ ! -d "$(install_prefix)$(SAVER_DATADIR)" ] ; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + fi ; \ + \ + echo "Installing XML glade2 file in the directory $(install_prefix)$(GTK_GLADEDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ @@ -605,6 +637,7 @@ # /usr/share/xscreensaver/config/README install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing README text in the directory $(install_prefix)$(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ xscreensaver-5.00b5-sanitize-hacks.patch: --- NEW FILE xscreensaver-5.00b5-sanitize-hacks.patch --- --- xscreensaver-5.00b5/hacks/barcode.c.sanitize-hacks 2006-04-06 15:40:32.000000000 +0900 +++ xscreensaver-5.00b5/hacks/barcode.c 2006-05-18 15:09:13.000000000 +0900 @@ -117,8 +117,6 @@ "belly", "bliss", "bogosity", - "boobies", - "boobs", "booty", "bread", "bubba", @@ -131,7 +129,6 @@ "children", "chocolate", "CLONE", - "cock", "constriction", "contrition", "cop", @@ -171,7 +168,6 @@ "fear", "fever", "filth", - "flatulence", "fluff", "fnord", "freedom", @@ -188,9 +184,7 @@ "happiness", "hate", "helplessness", - "hemorrhoid", "hermaphrodite", - "heroin", "heroine", "hope", "hysteria", @@ -265,7 +259,6 @@ "punishment", "punk rock", "punk", - "pussy", "quagmire", "quarantine", "quartz", @@ -274,7 +267,6 @@ "rage", "readout", "reality", - "rectum", "reject", "rejection", "respect", @@ -333,8 +325,6 @@ "vegetarian", "venom", "verifiability", - "viagra", - "vibrator", "victim", "vignette", "villainy", --- xscreensaver-5.00b5/hacks/glx/glsnake.c.sanitize-hacks 2006-05-04 04:39:21.000000000 +0900 +++ xscreensaver-5.00b5/hacks/glx/glsnake.c 2006-05-18 15:09:13.000000000 +0900 @@ -535,7 +535,7 @@ PIN, ZERO, RIGHT, RIGHT, ZERO, PIN, PIN, ZERO, PIN, PIN, ZERO, RIGHT, ZERO } }, - { "k's turd", + { "caterpillar", { RIGHT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, ZERO } @@ -560,22 +560,22 @@ ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO } }, - { "kissy box", + { "ribbon", { PIN, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, PIN, ZERO } }, - { "erect penis", /* thanks benno */ + { "shuffle board", /* thanks benno */ { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO } }, - { "flaccid penis", + { "anchor", { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO } }, - { "vagina", + { "engagement ring", { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, PIN, RIGHT, ZERO } @@ -995,7 +995,7 @@ { "Parrot", { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } }, - { "Penis", + { "Shuttle", { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } }, { "PictureComingSoon", --- NEW FILE xscreensaver.spec --- %define name xscreensaver %define version 5.00 %define fedora_rel 1 %define default_text %{_datadir}/doc/fedora-release-5.89/RELEASE-NOTES Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Summary: X screen saver and locker Name: %{name} Version: %{version} Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: BSD Group: Amusements/Graphics URL: http://www.jwz.org/xscreensaver/ Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz Patch0: xscreensaver-5.00b5-change-defaults.patch Patch1: xscreensaver-5.00b5-sanitize-hacks.patch Patch5: xscreensaver-5.00b5-dont-allow-root.patch Patch8: xscreensaver-5.00b5-include-directory.patch Patch101: xscreensaver-5.00-locale-safety.patch Patch102: xscreensaver-5.00-matherr-utils.patch # find_lang BuildRequires: gettext BuildRequires: desktop-file-utils Requires: fedora-release %package base Summary: A minimal installation of xscreensaver Group: Amusements/Graphics BuildRequires: bc BuildRequires: pam-devel > 0.80-7 BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel BuildRequires: libXinerama-devel BuildRequires: libXmu-devel BuildRequires: libXpm-devel BuildRequires: libXt-devel BuildRequires: libXxf86misc-devel BuildRequires: libXxf86vm-devel BuildRequires: libjpeg-devel BuildRequires: gtk2-devel libglade2-devel Requires: /etc/pam.d/system-auth, htmlview, desktop-backgrounds-basic Provides: xscreensaver = %{epoch}:%{version}-%{release} Obsoletes: xscreensaver %package extras Summary: An enhanced set of screensavers Group: Amusements/Graphics %package gl-extras Summary: An enhanced set of screensavers that require OpenGL Group: Amusements/Graphics Provides: xscreensaver-gl = %{epoch}:%{version}-%{release} Obsoletes: xscreensaver-gl BuildRequires: libGLU-devel, libGL-devel %description A modular screen saver and locker for the X Window System. More than 200 display modes are included in this package. %description base A modular screen saver and locker for the X Window System. This package contains the bare minimum needed to blank and lock your screen. The graphical display modes are the "xscreensaver-extras" and "xscreensaver-gl-extras" packages. %description extras A modular screen saver and locker for the X Window System. This package contains a variety of graphical screen savers for your mind-numbing, ambition-eroding, time-wasting, hypnotized viewing pleasure. %description gl-extras A modular screen saver and locker for the X Window System. This package contains a variety of OpenGL-based (3D) screen savers for your mind-numbing, ambition-eroding, time-wasting, hypnotized viewing pleasure. %prep %setup -q %patch0 -p1 -b .change-defaults %patch1 -p1 -b .sanitize-hacks %patch5 -p1 -b .dont-allow-root %patch8 -p1 -b .include-dir %patch101 -p1 -b .locale-safety %patch102 -p1 -b .matherr2 sed -i -e 's|version [45].[0-9a-z][0-9a-z]*|version %{version}|' \ driver/XScreenSaver.ad.in eval sed \ -i -e \'s\|\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\|`LANG=C date -u +'%%d-%%b-%%Y'`\|g\' \ driver/XScreenSaver.ad.in cd utils eval sed \ -i -e \'s\|\(\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\)\|\(`LANG=C date -u +'%%d-%%b-%%Y'`\)\|g\' \ -i -e \'s\|\\\(5.\[0-9\]\[0-9\]\\\)[a-z]\[0-9\]\[0-9\]\*\|\\\1\|\' \ -i -e \'s\|5.\[0-9\]\[0-9\]\|%{version}-`echo %{release} | sed -e 's|\..*||g'`\|g\' \ version.h cd .. if [ -x %{_datadir}/libtool/config.guess ]; then # use system-wide copy cp -p %{_datadir}/libtool/config.{sub,guess} . fi %build ################################# # suppress rpmlint booing # suppress about pam config (although this is # not the fault of xscreensaver.pam ......) mv driver/xscreensaver.pam driver/xscreensaver.pam.rpmlint head -n 5 driver/xscreensaver.pam.rpmlint > driver/xscreensaver.pam chmod 644 driver/xscreensaver.pam ################################# autoconf archdir=`./config.guess` mkdir $archdir cd $archdir export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" CONFIG_OPTS="--prefix=/usr --with-pam --without-shadow --without-kerberos" CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks" CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}" CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults" # This is flaky: # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager" ln -s ../configure . %configure $CONFIG_OPTS rm -f configure make %install archdir=`./config.guess` cd $archdir rm -rf ${RPM_BUILD_ROOT} make install_prefix=$RPM_BUILD_ROOT install desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ --add-category X-Red-Hat-Base \ $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop # This function prints a list of things that get installed. # It does this by parsing the output of a dummy run of "make install". list_files() { make -s install_prefix=${RPM_BUILD_ROOT} INSTALL=true "$@" \ | sed -e 's|directory* \([^ ][^ ]*\)$|/%%dir\1|' \ | sed -n -e 's at .* \(/[^ ]*\)$@\1 at p' \ | sed -e "s@${RPM_BUILD_ROOT}@@" \ -e "s@/[a-z][a-z]*/\.\./@/@" \ | sed -e '/%%dir/!s@\(.*/man/.*\)@\1\*@' \ -e '/%%dir/!s@\(.*/pam\.d/\)@%%config(noreplace) \1@' \ -e 's|/%%dir\([^ ][^ ]*\)$|%%dir \1|' \ | sort \ | uniq } # Generate three lists of files for the three packages. # dd=%{_builddir}/%{name}-%{version} ( cd hacks ; list_files install ) > $dd/extras.files ( cd hacks/glx ; list_files install ) > $dd/gl-extras.files ( cd driver ; list_files install ) > $dd/base.files # Add documents pushd $dd &> /dev/null for f in README* ; do echo "%%doc $f" >> $dd/base.files done popd %find_lang %{name} cat %{name}.lang | uniq >> $dd/base.files ################################# # suppress rpmlint booing # remove directories explicitly included in filesystem rpm for f in %{_bindir} %{_datadir}/applications \ %{_mandir}/man[1-9] %{_datadir}/pixmaps ; do ff=`echo $f | sed -e 's|\/|\\\\\\\\\/|g'` for g in $dd/*.files ; do eval sed -i -e \/$ff\$\/d $g done done # sanitize path in script file for f in ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-getimage-* \ ${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver/vidwhacker \ ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-text ; do if [ -f $f ] ; then sed -i -e 's|/usr//bin/|/usr/bin/|g' $f fi done # Make sure all files are readable by all, and writable only by owner. # chmod -R a+r,u+w,og-w ${RPM_BUILD_ROOT} %clean rm -rf ${RPM_BUILD_ROOT} %files -f base.files base %defattr(-,root,root) %files -f extras.files extras %defattr(-,root,root) %files -f gl-extras.files gl-extras %defattr(-,root,root) %changelog * Fri May 26 2006 Mamoru Tasaka - 1:5.00-1 - Update to 5.00 - Switch to extras, don't remove anything. * Fri Mar 24 2006 Ray Strode - 1:4.24-2 - add patch from jwz to reap zombie processes (bug 185833) * Fri Feb 10 2006 Jesse Keating - 1:4.24-1.1 - bump again for double-long bug on ppc(64) * Tue Feb 07 2006 Jesse Keating - 1:4.23-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Jan 13 2006 Ray Strode 1:4.23-1 - update to 4.23 - add a BuildRequires on imake (spotted by Mamoru Tasaka) - add a lot of patches and fixes from Mamoru Tasaka * Sat Dec 17 2005 Jesse Keating - rebuilt * Mon Dec 5 2005 Ray Strode 1:4.22-21 - Update list_files function to fix ownership issues. Patch from Mamoru Tasaka (mtasaka at ioa.s.u-tokyo.ac.jp) (bug 161728). * Tue Nov 1 2005 Ray Strode 1:4.22-20 - Switch requires to modular X * Thu Oct 13 2005 Tomas Mraz 1:4.22-19 - use include instead of pam_stack in pam config * Wed Sep 28 2005 Ray Strode 1:4.22-18 - accept zero timeout values for suspend and off. Patch from Mamoru Tasaka (bug 157501). * Fri Sep 23 2005 Ray Strode 1:4.22-17 - remove explicit dependency on xscreensaver-base for extras and gl-extras packages * Fri Sep 16 2005 Ray Strode 1:4.22-16 - don't allow root to authenticate lock dialog when selinux is enabled (bug 157014). * Fri Sep 9 2005 Ray Strode 1:4.22-15 - take BSOD out of the default random list (bug 105388). * Thu Sep 08 2005 Florian La Roche - add version-release to the Provides: * Wed Sep 7 2005 Ray Strode 1:4.22-13 - Patch from Mamoru Tasaka to improve man page handling (bug 167708). * Tue Sep 6 2005 Ray Strode 1:4.22-12 - remove density option from squiral screensaver, Patch from Mamoru Tasaka (bug 167374). * Wed Aug 31 2005 Ray Strode 1:4.22-11 - ignore unprintable characters in password dialog (bug 135966). * Thu Aug 25 2005 Ray Strode 1:4.22-10 - Move man pages to section 6 (bug 166441). * Wed Aug 24 2005 Ray Strode 1:4.22-9 - The only legitimate way to call realpath is with NULL buffer (bug 165270). * Fri Aug 19 2005 Ray Strode 1:4.22-8 - Don't try to use an invalid tree iterator (bug 166299) * Tue Aug 16 2005 Warren Togami - 1:4.22-7 - rebuild for new cairo * Wed Aug 10 2005 Ray Strode 1:4.22-6 - Don't call printf in signal handler (might fix 126428) * Wed Aug 3 2005 Ray Strode 1:4.22-5 - Update to xscreensaver 4.22. * Sun Jun 19 2005 Ray Strode 1:4.21-5 - Add build requires for desktop-file-utils (bug 160980). * Wed May 11 2005 Ray Strode 1:4.21-4 - Allow configuration gui to support hacks with absolute paths (bug 157417). * Mon May 09 2005 Ray Strode 1:4.21-3 - Use @libexecdir@/xscreensaver instead of @HACKDIR@ in default configuration file so that the path gets expanded fully (bug 156906). * Tue May 03 2005 Ray Strode 1:4.21-2 - Use absolute filenames for screenhacks so we don't pull in screenhacks from PATH (bug 151677). - Don't try to ping in sonar screensaver (bug 139692). * Sun Mar 20 2005 Ray Strode 1:4.21-1 - Update to xscreensaver-4.21. - Update spec file to better match new upstream spec file. * Fri Feb 25 2005 Nalin Dahyabhai 1:4.18-19 - We don't patch configure.in, so we don't need to run 'autoconf'. - Add --without-kerberos to skip built-in Kerberos password verification, so that we'll always go through PAM (fixes 149731). * Mon Feb 21 2005 Ray Strode 1:4.18-18 - Install desktop files to /usr/share/applications instead of /usr/share/control-center-2.0 (should fix bug 149229). * Thu Jan 6 2005 Ray Strode 1:4.18-17 - Change lock dialog instructions to only ask for password and not username. * Tue Jan 4 2005 Ray Strode 1:4.18-16 - Add patch to spec file to change defaults * Tue Jan 4 2005 Ray Strode 1:4.18-15 - Remove xscreensaver-config-tool after some discussions with jwz. - Take out some additional screensavers * Wed Dec 1 2004 Ray Strode 1:4.18-14 - Add utility xscreensaver-config-tool to make changing settings easier (replaces the short lived xscreensaver-register-hack program). Use xscreensaver-config-tool to set default settings instead of using patches. - Split up xscreensaver (fixes 121693). - Make preferences dialog slightly more pretty - Make lock dialog slightly more pretty * Fri Nov 26 2004 Than Ngo 1:4.18-13 - add patch to fix vroot bug and make xscreensaver working in KDE again. - get rid of webcollage, which often download porn images * Wed Nov 10 2004 Ray Strode 1:4.18-10 - Get rid of unnecessary xloadimage requirement (bug 100641) * Wed Nov 10 2004 Ray Strode 1:4.18-9 - Call pam_acct_mgmt() (might fix bug 137195) * Tue Nov 9 2004 Ray Strode 1:4.18-8 - Give vidwhacker screensaver working defaults (bug 64518) * Tue Nov 9 2004 Ray Strode 1:4.18-7 - Get rid of old crufty %{_datadir}/control-center/ tree (bug 114692) * Wed Nov 3 2004 Ray Strode 1:4.18-6 - rebuild for rawhide * Wed Nov 3 2004 Ray Strode 1:4.18-5 - Don't allow screensavers access to desktop images by default (bug #126809) - Lock screen by default (bug #126809) * Tue Oct 19 2004 4.18-4 - Add xscreensaver-4.18-stuff-piecewise-leak.patch to stop piecewise from leaking (#135164). * Wed Sep 1 2004 Ray Strode 4.18-3 - remove superfluous line in the spec file * Wed Sep 1 2004 Ray Strode 4.18-2 - blank the screen by default * Tue Aug 24 2004 Ray Strode 4.18-1 - update to 4.18 (fixes bug 87745). * Sat Aug 14 2004 Ray Strode 4.16-4 - change titles of questionably named bar codes (fixes bug 129929). * Fri Aug 6 2004 Ray Strode 4.16-3 - change titles of questionably named shape formations (fixes bug 129335). * Wed Jun 23 2004 Ray Strode 4.16-2 - use htmlview for browsing help. * Mon Jun 21 2004 Ray Strode 4.16-1 - update to 4.16. Use desktop-file-install for desktop file. * Tue Jun 15 2004 Elliot Lee - rebuilt * Wed May 5 2004 Bill Nottingham 4.14-5 - config tweaks * Wed Mar 31 2004 Karsten Hopp 4.14-4 - fix fortune stand-in (#115369) * Fri Feb 13 2004 Elliot Lee - rebuilt * Mon Oct 27 2003 Bill Nottingham 1:4.14-1 - update to 4.14 * Tue Oct 7 2003 Bill Nottingham 1:4.13-1 - take out flag-with-logo, don't require redhat-logos (#106046) - update to 4.13 * Wed Aug 27 2003 Bill Nottingham 1:4.12-1 - update to 4.12 (fixes #101920) - re-add BSOD to the random list * Tue Jun 24 2003 Bill Nottingham 1:4.11-1 - update to 4.11 * Fri Jun 13 2003 Bill Nottingham 1:4.10-3 - fix some 64-bit arches (#97359) * Wed Jun 04 2003 Elliot Lee - rebuilt * Wed May 28 2003 Bill Nottingham 1:4.10-1 - update to 4.10 * Thu Mar 20 2003 Bill Nottingham 1:4.09-1 - update to 4.09, now with bouncing cows * Mon Feb 10 2003 Bill Nottingham 1:4.07-2 - oops, xloadimage *is* needed (#83676) * Thu Feb 6 2003 Bill Nottingham 1:4.07-1 - update to 4.07, fixes #76276, #75574 * Wed Jan 22 2003 Tim Powers - rebuilt * Fri Nov 29 2002 Tim Powers 1:4.06-4 - call autoconf instead of autoconf-2.53 * Mon Nov 11 2002 Bill Nottingham 4.06-3 - put glade tweaks back in - switch pam package to not specify directories, to work on multilib arches * Fri Nov 8 2002 Nalin Dahyabhai 4.06-1 - add a BuildPrereq on bc, which configure requires - replace use of fortune with an innocuous-and-editable stand-in script in %{stand_in_path} - define FORTUNE_PROGRAM at compile-time to force apps to use what's specified even if it doesn't happen to be installed at compile-time * Sun Sep 2 2002 Bill Nottingham 4.05-6 - fix typo (#73246) * Wed Aug 28 2002 Bill Nottingham 4.05-5 - revert to non-gtk unlock dialog - fix translations * Mon Aug 12 2002 Bill Nottingham 4.05-4 - twiddle titlebar (#67844) - fix extraneous text (#70975) - tweak desktop entry (#69502) * Fri Aug 9 2002 Yu Shao 4.05-3 - use GTK_IM_MODULE=gtk-im-context-simple in lock widget - to avoid CJK IM weirdness (#70655, #68216) - xscreensaver-rh-imcjk.patch * Wed Jul 17 2002 Elliot Lee 4.05-2 - Add fortune-mod to buildprereq to make beehive happy - Fix find_lang usage - install translations properly by specifying datadir * Tue Jun 11 2002 Bill Nottingham 4.05-1 - update to 4.05 - use gtk2 lock widget () - some Red Hat-ifications - fix critical (#63916) * Mon Jun 10 2002 Bill Nottingham 4.04-2 - remove no longer needed xloadimage dependency * Mon Jun 3 2002 Bill Nottingham 4.04-1 - update to 4.04, gtk2 property dialog is now mainline * Thu May 16 2002 Bill Nottingham 4.03-1 - update to 4.03 - use gtk2 properties dialog * Thu Mar 14 2002 Bill Nottingham 4.01-2 - don't show screensavers that aren't available * Sun Feb 24 2002 Bill Nottingham - update to 4.01 * Mon Feb 11 2002 Bill Nottingham - update to 4.00 * Wed Jan 09 2002 Tim Powers - automated rebuild * Thu Aug 23 2001 Bill Nottingham - fix segfault on ia64 (#52336) * Thu Aug 9 2001 Bill Nottingham - never mind, back to 3.33 (wheeee) - hack window-id back in for the time being - disable memlimit so GL works * Mon Jul 23 2001 Bill Nottingham - oops, back to 3.32 for now - remove optflags override (oops) - add pam-devel buildprereq * Mon Jul 16 2001 Bill Nottingham - update to 3.33, fix broken last build - fix build weirdness on some package sets (#48905) - don't document non-existent options for forest (#49139) * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. * Tue May 22 2001 Havoc Pennington - putting in tree for David * Tue May 22 2001 David Sainty - added DPMS options to command line help * Sun Apr 22 2001 Bill Nottingham - update to 3.32 - add patch to specify DPMS settings on the command line * Wed Apr 11 2001 Bill Nottingham - update to 3.31 * Wed Apr 4 2001 Bill Nottingham - fix extrusion exclusion (#34742) * Tue Apr 3 2001 Bill Nottingham - disable GL screensavers by default (bleah) * Mon Feb 19 2001 Bill Nottingham - update to 3.29 (#27437) * Tue Jan 23 2001 Bill Nottingham - update to 3.27 * Fri Dec 01 2000 Bill Nottingham - rebuild because of broken fileutils * Fri Nov 10 2000 Bill Nottingham - 3.26 * Fri Aug 11 2000 Jonathan Blandford - Up Epoch and release * Wed Jul 26 2000 Bill Nottingham - hey, vidmode works again * Fri Jul 21 2000 Bill Nottingham - update to 3.25 * Thu Jul 13 2000 Prospector - automatic rebuild * Sat Jun 17 2000 Bill Nottingham - xscreensaver.kss is not a %%config file. * Sun Jun 11 2000 Bill Nottingham - tweak kss module (#11872) * Thu Jun 1 2000 Nalin Dahyabhai - modify PAM configuration to use system-auth * Thu May 18 2000 Preston Brown - added Red Hat screensaver (waving flag has logo now). * Fri May 5 2000 Bill Nottingham - tweaks for ia64 * Mon Apr 10 2000 Bill Nottingham - turn off xf86vidmode ext, so that binaries built against XFree86 4.0 work on 3.x servers * Wed Apr 5 2000 Bill Nottingham - turn off gnome support for now * Mon Apr 3 2000 Bill Nottingham - update to 3.24 * Wed Feb 09 2000 Preston Brown - wmconfig entry gone. * Mon Jan 31 2000 Bill Nottingham - update to 3.23 * Fri Jan 14 2000 Bill Nottingham - rebuild to fix GL depdencies * Tue Dec 14 1999 Bill Nottingham - everyone in GL - single package again * Fri Dec 10 1999 Bill Nottingham - update to 3.22 - turn off xf86vmode on alpha * Tue Dec 7 1999 Bill Nottingham - mmm... hardware accelerated GL on i386. :) :) * Mon Nov 22 1999 Bill Nottingham - 3.21 - use shm on alpha, let's see what breaks * Tue Nov 16 1999 Bill Nottingham - update to 3.20 * Wed Nov 3 1999 Bill Nottingham - update to 3.19 * Thu Oct 14 1999 Bill Nottingham - update to 3.18 * Sat Sep 25 1999 Bill Nottingham - add a '-oneshot' single time lock option. * Mon Sep 20 1999 Bill Nottingham - take webcollage out of random list (for people who pay for bandwidth) * Fri Sep 10 1999 Bill Nottingham - patch webcollage to use xloadimage - in the random list, run petri with -size 2 to save memory - extend RPM silliness to man pages, too. * Mon Jul 19 1999 Bill Nottingham - update to 3.17 - add a little RPM silliness to package GL stuff if it's built * Thu Jun 24 1999 Bill Nottingham - update to 3.16 * Mon May 10 1999 Bill Nottingham - update to 3.12 * Tue May 4 1999 Bill Nottingham - remove security problem introduced earlier * Wed Apr 28 1999 Bill Nottingham - update to 3.10 * Thu Apr 15 1999 Bill Nottingham - kill setuid the Right Way(tm) * Mon Apr 12 1999 Bill Nottingham - fix xflame on alpha * Mon Apr 12 1999 Preston Brown - upgrade to 3.09, fixes vmware interaction problems. * Mon Apr 5 1999 Bill Nottingham - remove setuid bit. Really. I mean it. * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 3) * Fri Mar 19 1999 Bill Nottingham - kill setuid, since pam works OK * Tue Mar 16 1999 Bill Nottingham - update to 3.08 * Wed Feb 24 1999 Bill Nottingham - wmconfig returns, and no one is safe... * Tue Feb 23 1999 Bill Nottingham - remove bsod from random list because it's confusing people???? *sigh* * Tue Jan 12 1999 Cristian Gafton - call libtoolize to get it to compile cleanely on the arm * Tue Jan 5 1999 Bill Nottingham - update to 3.07 * Mon Nov 23 1998 Bill Nottingham - update to 3.06 * Tue Nov 17 1998 Bill Nottingham - update to 3.04 * Thu Nov 12 1998 Bill Nottingham - update to 3.02 - PAMify * Tue Oct 13 1998 Cristian Gafton - take out Noseguy module b/c of possible TMv - install modules in /usr/X11R6/lib/xscreensaver - don't compile support for xshm on the alpha - properly buildrooted - updated to version 2.34 * Fri Aug 7 1998 Bill Nottingham - update to 2.27 * Wed Jun 10 1998 Prospector System - translations modified for de * Mon Jun 08 1998 Erik Troan - added fix for argv0 buffer overflow * Fri Apr 24 1998 Prospector System - translations modified for de, fr, tr * Sat Apr 11 1998 Donnie Barnes - updated from 2.10 to 2.16 - added buildroot * Wed Oct 25 1997 Marc Ewing - wmconfig * Thu Oct 23 1997 Marc Ewing - new version, configure * Fri Aug 22 1997 Erik Troan - built against glibc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 May 2006 18:16:46 -0000 1.1 +++ .cvsignore 26 May 2006 18:20:03 -0000 1.2 @@ -0,0 +1 @@ +xscreensaver-5.00.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 May 2006 18:16:46 -0000 1.1 +++ sources 26 May 2006 18:20:03 -0000 1.2 @@ -0,0 +1 @@ +2c26877fb0acd508b9a726dce6a77f78 xscreensaver-5.00.tar.gz From fedora-extras-commits at redhat.com Fri May 26 18:26:31 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 26 May 2006 11:26:31 -0700 Subject: owners owners.list,1.1058,1.1059 Message-ID: <200605261826.k4QIQXSQ027800@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27783 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1058 retrieving revision 1.1059 diff -u -r1.1058 -r1.1059 --- owners.list 26 May 2006 17:21:51 -0000 1.1058 +++ owners.list 26 May 2006 18:26:30 -0000 1.1059 @@ -1787,6 +1787,7 @@ Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xscorch|A Scorched Earth clone|mgarski at post.pl|extras-qa at fedoraproject.org| +Fedora Extras|xscreensaver|X screen saver and locker|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org| Fedora Extras|xsp|ASP.NET page server|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri May 26 19:48:45 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 26 May 2006 12:48:45 -0700 Subject: rpms/banshee/FC-5 banshee.spec,1.8,1.9 sources,1.5,1.6 Message-ID: <200605261948.k4QJmleC030725@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30706 Modified Files: banshee.spec sources Log Message: * Tue May 2 2006 Christopher Aillon 0.10.10-1 - Update to 0.10.10 Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/FC-5/banshee.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- banshee.spec 16 Apr 2006 20:30:49 -0000 1.8 +++ banshee.spec 26 May 2006 19:48:45 -0000 1.9 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.9 -Release: 1.%{?dist} +Version: 0.10.10 +Release: 1%{?dist} Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -96,6 +96,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Tue May 2 2006 Christopher Aillon 0.10.10-1 +- Update to 0.10.10 + * Tue Mar 21 2006 Christopher Aillon 0.10.9-1 - Update to 0.10.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Apr 2006 20:30:49 -0000 1.5 +++ sources 26 May 2006 19:48:45 -0000 1.6 @@ -1 +1 @@ -86b67e399ea805f69a860b3e6fd4627f banshee-0.10.9.tar.gz +cb553f5bc6dc14b7afa44349d025bbdc banshee-0.10.10.tar.gz From fedora-extras-commits at redhat.com Fri May 26 19:53:57 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 12:53:57 -0700 Subject: rpms/pari/devel pari.spec,1.1,1.2 Message-ID: <200605261953.k4QJrxWS030797@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30780 Modified Files: pari.spec Log Message: Index: pari.spec =================================================================== RCS file: /cvs/extras/rpms/pari/devel/pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pari.spec 26 May 2006 17:25:12 -0000 1.1 +++ pari.spec 26 May 2006 19:53:56 -0000 1.2 @@ -1,6 +1,6 @@ Name: pari Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries @@ -20,7 +20,7 @@ BuildRequires: xorg-x11-devel %endif Requires: tetex-xdvi - +ExcludeArch: ppc %description PARI is a widely used computer algebra system designed for fast @@ -167,6 +167,9 @@ %changelog +* Fri May 26 2006 Gerard Milmeister - 2.3.0-3 +- Exclude ppc for now, since test fails + * Fri May 26 2006 Gerard Milmeister - 2.3.0-2 - added %%check section - use gmp From fedora-extras-commits at redhat.com Fri May 26 19:55:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 12:55:12 -0700 Subject: rpms/pari/FC-5 pari.spec,1.2,1.3 Message-ID: <200605261955.k4QJtE08030873@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30856 Modified Files: pari.spec Log Message: Index: pari.spec =================================================================== RCS file: /cvs/extras/rpms/pari/FC-5/pari.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pari.spec 26 May 2006 17:50:07 -0000 1.2 +++ pari.spec 26 May 2006 19:55:12 -0000 1.3 @@ -1,6 +1,6 @@ Name: pari Version: 2.3.0 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries @@ -20,7 +20,7 @@ BuildRequires: xorg-x11-devel %endif Requires: tetex-xdvi - +ExcludeArch: ppc %description PARI is a widely used computer algebra system designed for fast @@ -167,6 +167,9 @@ %changelog +* Fri May 26 2006 Gerard Milmeister - 2.3.0-3 +- Exclude ppc for now, since test fails + * Fri May 26 2006 Gerard Milmeister - 2.3.0-2 - added %%check section - use gmp From fedora-extras-commits at redhat.com Fri May 26 19:56:01 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 12:56:01 -0700 Subject: rpms/pari/FC-4 pari.spec,1.1,1.2 Message-ID: <200605261956.k4QJu3Fs030903@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pari/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30886 Modified Files: pari.spec Log Message: Index: pari.spec =================================================================== RCS file: /cvs/extras/rpms/pari/FC-4/pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pari.spec 26 May 2006 17:25:12 -0000 1.1 +++ pari.spec 26 May 2006 19:56:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: pari Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Number Theory-oriented Computer Algebra System Group: System Environment/Libraries @@ -20,7 +20,7 @@ BuildRequires: xorg-x11-devel %endif Requires: tetex-xdvi - +ExcludeArch: ppc %description PARI is a widely used computer algebra system designed for fast @@ -167,6 +167,9 @@ %changelog +* Fri May 26 2006 Gerard Milmeister - 2.3.0-3 +- Exclude ppc for now, since test fails + * Fri May 26 2006 Gerard Milmeister - 2.3.0-2 - added %%check section - use gmp From fedora-extras-commits at redhat.com Fri May 26 20:28:16 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 26 May 2006 13:28:16 -0700 Subject: owners owners.list,1.1059,1.1060 Message-ID: <200605262028.k4QKSIKh000957@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv940 Modified Files: owners.list Log Message: added pari Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1059 retrieving revision 1.1060 diff -u -r1.1059 -r1.1060 --- owners.list 26 May 2006 18:26:30 -0000 1.1059 +++ owners.list 26 May 2006 20:28:16 -0000 1.1060 @@ -913,6 +913,7 @@ Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org| Fedora Extras|paraview|Parallel visualization application|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|pari|Number Theory-oriented Computer Algebra System|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com From fedora-extras-commits at redhat.com Fri May 26 20:41:50 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 26 May 2006 13:41:50 -0700 Subject: rpms/qt4/FC-5 qt4.spec,1.3,1.4 Message-ID: <200605262041.k4QKfqgv001009@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv992 Modified Files: qt4.spec Log Message: * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %buildSQL macro - -libdir %qt_libdir Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qt4.spec 24 May 2006 18:36:20 -0000 1.3 +++ qt4.spec 26 May 2006 20:41:50 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 4%{?dist}.1 +Release: 5%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -22,18 +22,16 @@ Source24: qtconfig.desktop ## Optional bits -# Build mysql plugins -%define mysql 1 -# Build postgresql plugins -%define psql 1 -# Build ODBC plugins -%define odbc 1 -# Build sqlite plugins -%define sqlite 1 +# Build SQL plugins (mysql, unixodbc, postgresql, sqlite) +%define buildSQL 1 +# define to build sqlite2 plugin (FIXME/TODO) +#define sqlite2 1 %define qt_dirname qt4 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/%{name}-doc-%{version} +# Be careful about ever changing this, some 3rd-party libs install here -- Rex +%define qt_libdir %{qtdir}/%{_lib} Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d @@ -56,24 +54,20 @@ %endif BuildRequires: %{x_deps} -%if %{mysql} +%if %{buildSQL} +# mysql # mysql-devel < 4 build fails on 4.1.3+, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") %global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql") %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g") -%endif -%if %{psql} +# postgresql BuildRequires: postgresql-devel -%endif - -%if %{odbc} +# unixODBC BuildRequires: unixODBC-devel -%endif - -%if %{sqlite} +# sqlite BuildRequires: sqlite-devel %endif @@ -160,9 +154,6 @@ %build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -184,8 +175,8 @@ echo yes | ./configure -v \ -no-rpath \ -prefix %{qtdir} \ - -libdir %{qtdir}/%{_lib} \ -docdir %{qt_docdir} \ + -libdir %{qt_libdir} \ -platform %{platform} \ -release \ -shared \ @@ -195,18 +186,12 @@ -system-zlib \ -system-libpng \ -system-libjpeg \ -%if %{mysql} +%if %{buildSQL} -plugin-sql-mysql \ %{?mysql_include} \ %{?mysql_ldflags} \ -%endif -%if %{psql} -plugin-sql-psql \ -%endif -%if %{odbc} -plugin-sql-odbc \ -%endif -%if %{sqlite} -plugin-sql-sqlite \ %endif -cups \ @@ -227,27 +212,24 @@ %install rm -rf %{buildroot} -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" - make install INSTALL_ROOT=%{buildroot} ## pkg-config # strip extraneous dirs/libraries -- Rex # safe ones for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done # not-so-safe, but we can try -- Rex -for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl +# -L/usr/X11R6/%{_lib} +for dep in -lXrender -lXrandr -lXcursor -lXinerama -lXi -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done -sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl +sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ pushd %{buildroot}%{_libdir}/pkgconfig @@ -297,10 +279,10 @@ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} # .la files, die, die, die. -rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la +rm -f %{buildroot}%{qt_libdir}/lib*.la mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{qt_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean @@ -319,8 +301,8 @@ /etc/ld.so.conf.d/* %dir %{qtdir} %dir %{qtdir}/bin/ -%dir %{qtdir}/%{_lib}/ -%{qtdir}/%{_lib}/lib*.so.* +%dir %{qt_libdir} +%{qt_libdir}/lib*.so.* %dir %{qtdir}/plugins/ %{qtdir}/plugins/accessible/ %{qtdir}/plugins/imageformats/ @@ -354,13 +336,12 @@ %{_bindir}/uic* %{qtdir}/include/ %{qtdir}/mkspecs/ -%dir %{qtdir}/%{_lib} -%{qtdir}/%{_lib}/lib*.so +%{qt_libdir}/lib*.so # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a -%{qtdir}/%{_lib}/lib*.a -%{qtdir}/%{_lib}/lib*.prl +%{qt_libdir}/lib*.a +%{qt_libdir}/lib*.prl %{qtdir}/phrasebooks/ -%{qtdir}/%{_lib}/*.pc +%{qt_libdir}/*.pc %{_libdir}/pkgconfig/*.pc %{qtdir}/q3porting.xml # Qt designer @@ -390,25 +371,19 @@ %{_bindir}/qt*demo* %{_datadir}/applications/*qtdemo*.desktop -%if %{odbc} +%if %{buildSQL} %files odbc %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc* -%endif -%if %{psql} %files postgresql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql* -%endif -%if %{mysql} %files mysql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql* -%endif -%if %{sqlite} %files sqlite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite* @@ -416,6 +391,11 @@ %changelog +* Fri May 26 2006 Rex Dieter 4.1.3-5 +- strip -lXi from .pc files (#193258) +- simplify sql plugin builds via %%buildSQL macro +- -libdir %%qt_libdir + * Wed May 24 2006 Rex Dieter 4.1.3-4 - move (most) %%dir ownership (back) to main pkg From fedora-extras-commits at redhat.com Fri May 26 20:42:19 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 26 May 2006 13:42:19 -0700 Subject: rpms/qt4/FC-4 qt4.spec,1.2,1.3 Message-ID: <200605262042.k4QKgLla001071@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1054 Modified Files: qt4.spec Log Message: * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %buildSQL macro - -libdir %qt_libdir Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qt4.spec 24 May 2006 14:45:14 -0000 1.2 +++ qt4.spec 26 May 2006 20:42:19 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -22,18 +22,16 @@ Source24: qtconfig.desktop ## Optional bits -# Build mysql plugins -%define mysql 1 -# Build postgresql plugins -%define psql 1 -# Build ODBC plugins -%define odbc 1 -# Build sqlite plugins -%define sqlite 1 +# Build SQL plugins (mysql, unixodbc, postgresql, sqlite) +%define buildSQL 1 +# define to build sqlite2 plugin (FIXME/TODO) +#define sqlite2 1 %define qt_dirname qt4 %define qtdir %{_libdir}/%{qt_dirname} %define qt_docdir %{_docdir}/%{name}-doc-%{version} +# Be careful about ever changing this, some 3rd-party libs install here -- Rex +%define qt_libdir %{qtdir}/%{_lib} Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d @@ -56,24 +54,20 @@ %endif BuildRequires: %{x_deps} -%if %{mysql} +%if %{buildSQL} +# mysql # mysql-devel < 4 build fails on 4.1.3+, not sure why... yet. -- Rex BuildRequires: mysql-devel >= 4.0 # If we get mysql3 to work, use mysql_config --cflags instead -- Rex %global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql") %global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql") %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g") -%endif -%if %{psql} +# postgresql BuildRequires: postgresql-devel -%endif - -%if %{odbc} +# unixODBC BuildRequires: unixODBC-devel -%endif - -%if %{sqlite} +# sqlite BuildRequires: sqlite-devel %endif @@ -160,9 +154,6 @@ %build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -184,8 +175,8 @@ echo yes | ./configure -v \ -no-rpath \ -prefix %{qtdir} \ - -libdir %{qtdir}/%{_lib} \ -docdir %{qt_docdir} \ + -libdir %{qt_libdir} \ -platform %{platform} \ -release \ -shared \ @@ -195,18 +186,12 @@ -system-zlib \ -system-libpng \ -system-libjpeg \ -%if %{mysql} +%if %{buildSQL} -plugin-sql-mysql \ %{?mysql_include} \ %{?mysql_ldflags} \ -%endif -%if %{psql} -plugin-sql-psql \ -%endif -%if %{odbc} -plugin-sql-odbc \ -%endif -%if %{sqlite} -plugin-sql-sqlite \ %endif -cups \ @@ -227,27 +212,24 @@ %install rm -rf %{buildroot} -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" - make install INSTALL_ROOT=%{buildroot} ## pkg-config # strip extraneous dirs/libraries -- Rex # safe ones for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done # not-so-safe, but we can try -- Rex -for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||: - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc - sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl +# -L/usr/X11R6/%{_lib} +for dep in -lXrender -lXrandr -lXcursor -lXinerama -lXi -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||: + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc + sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done -sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl +sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ pushd %{buildroot}%{_libdir}/pkgconfig @@ -297,10 +279,10 @@ %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} # .la files, die, die, die. -rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la +rm -f %{buildroot}%{qt_libdir}/lib*.la mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf +echo "%{qt_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %clean @@ -319,8 +301,8 @@ /etc/ld.so.conf.d/* %dir %{qtdir} %dir %{qtdir}/bin/ -%dir %{qtdir}/%{_lib}/ -%{qtdir}/%{_lib}/lib*.so.* +%dir %{qt_libdir} +%{qt_libdir}/lib*.so.* %dir %{qtdir}/plugins/ %{qtdir}/plugins/accessible/ %{qtdir}/plugins/imageformats/ @@ -354,13 +336,12 @@ %{_bindir}/uic* %{qtdir}/include/ %{qtdir}/mkspecs/ -%dir %{qtdir}/%{_lib} -%{qtdir}/%{_lib}/lib*.so +%{qt_libdir}/lib*.so # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a -%{qtdir}/%{_lib}/lib*.a -%{qtdir}/%{_lib}/lib*.prl +%{qt_libdir}/lib*.a +%{qt_libdir}/lib*.prl %{qtdir}/phrasebooks/ -%{qtdir}/%{_lib}/*.pc +%{qt_libdir}/*.pc %{_libdir}/pkgconfig/*.pc %{qtdir}/q3porting.xml # Qt designer @@ -390,25 +371,19 @@ %{_bindir}/qt*demo* %{_datadir}/applications/*qtdemo*.desktop -%if %{odbc} +%if %{buildSQL} %files odbc %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlodbc* -%endif -%if %{psql} %files postgresql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlpsql* -%endif -%if %{mysql} %files mysql %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlmysql* -%endif -%if %{sqlite} %files sqlite %defattr(-,root,root,-) %{qtdir}/plugins/sqldrivers/libqsqlite* @@ -416,6 +391,11 @@ %changelog +* Fri May 26 2006 Rex Dieter 4.1.3-5 +- strip -lXi from .pc files (#193258) +- simplify sql plugin builds via %%buildSQL macro +- -libdir %%qt_libdir + * Wed May 24 2006 Rex Dieter 4.1.3-4 - move (most) %%dir ownership (back) to main pkg From fedora-extras-commits at redhat.com Fri May 26 21:34:26 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:34:26 -0700 Subject: rpms/crossfire-client/FC-5 crossfire-client.spec,1.1,1.2 Message-ID: <200605262134.k4QLYSuX004039@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4022 Modified Files: crossfire-client.spec Log Message: Create and own directory for client sounds and images Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/FC-5/crossfire-client.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crossfire-client.spec 16 May 2006 16:42:03 -0000 1.1 +++ crossfire-client.spec 26 May 2006 21:34:26 -0000 1.2 @@ -66,6 +66,9 @@ --add-category Application \ gtk/crossfire-client.desktop +# Create this directory that will be used by the client image and +# sound packages. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -90,6 +93,7 @@ # Sound support is too broken to use in Fedora right now. #%{_bindir}/cfsndserv #%{_bindir}/cfsndserv_alsa9 +%dir %{_datadir}/crossfire/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png From fedora-extras-commits at redhat.com Fri May 26 21:34:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:34:50 -0700 Subject: rpms/crossfire-client/FC-4 crossfire-client.spec,1.1,1.2 Message-ID: <200605262134.k4QLYqQl004068@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4045 Modified Files: crossfire-client.spec Log Message: Create and own directory for client sounds and images. Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/FC-4/crossfire-client.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crossfire-client.spec 16 May 2006 16:42:03 -0000 1.1 +++ crossfire-client.spec 26 May 2006 21:34:50 -0000 1.2 @@ -66,6 +66,9 @@ --add-category Application \ gtk/crossfire-client.desktop +# Create this directory that will be used by the client image and +# sound packages. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -90,6 +93,7 @@ # Sound support is too broken to use in Fedora right now. #%{_bindir}/cfsndserv #%{_bindir}/cfsndserv_alsa9 +%dir %{_datadir}/crossfire/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png From fedora-extras-commits at redhat.com Fri May 26 21:37:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:37:42 -0700 Subject: rpms/crossfire-client/devel crossfire-client.spec,1.1,1.2 Message-ID: <200605262137.k4QLbibF004196@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4179 Modified Files: crossfire-client.spec Log Message: Add dist tag. Create and own directory for client sounds and images. Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/devel/crossfire-client.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- crossfire-client.spec 16 May 2006 16:42:03 -0000 1.1 +++ crossfire-client.spec 26 May 2006 21:37:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: crossfire-client Version: 1.9.0 -Release: 2 +Release: 3%{?dist} Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPL @@ -66,6 +66,9 @@ --add-category Application \ gtk/crossfire-client.desktop +# Create this directory that will be used by the client image and +# sound packages. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -90,6 +93,7 @@ # Sound support is too broken to use in Fedora right now. #%{_bindir}/cfsndserv #%{_bindir}/cfsndserv_alsa9 +%dir %{_datadir}/crossfire/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png @@ -103,5 +107,8 @@ %changelog +* Fri May 9 2006 Wart 1.9.0-3 +- Create and own the directory for client sounds and images + * Thu Mar 9 2006 Wart 1.9.0-2 - Initial spec file following Fedora Extras conventions From fedora-extras-commits at redhat.com Fri May 26 21:38:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:38:17 -0700 Subject: rpms/crossfire-client/FC-4 crossfire-client.spec,1.2,1.3 Message-ID: <200605262138.k4QLcn1V004278@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4246/FC-4 Modified Files: crossfire-client.spec Log Message: Add dist tag Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/FC-4/crossfire-client.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- crossfire-client.spec 26 May 2006 21:34:50 -0000 1.2 +++ crossfire-client.spec 26 May 2006 21:38:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: crossfire-client Version: 1.9.0 -Release: 2 +Release: 2%{?dist} Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPL From fedora-extras-commits at redhat.com Fri May 26 21:38:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 26 May 2006 14:38:17 -0700 Subject: rpms/crossfire-client/FC-5 crossfire-client.spec,1.2,1.3 Message-ID: <200605262138.k4QLcnhm004281@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/crossfire-client/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4246/FC-5 Modified Files: crossfire-client.spec Log Message: Add dist tag Index: crossfire-client.spec =================================================================== RCS file: /cvs/extras/rpms/crossfire-client/FC-5/crossfire-client.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- crossfire-client.spec 26 May 2006 21:34:26 -0000 1.2 +++ crossfire-client.spec 26 May 2006 21:38:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: crossfire-client Version: 1.9.0 -Release: 2 +Release: 2%{?dist} Summary: Client for connecting to crossfire servers Group: Amusements/Games License: GPL From fedora-extras-commits at redhat.com Sat May 27 01:19:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 26 May 2006 18:19:52 -0700 Subject: owners owners.list,1.1060,1.1061 Message-ID: <200605270119.k4R1Js2E014433@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14416 Modified Files: owners.list Log Message: Someone had orphaned perl-XML-Simple Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1060 retrieving revision 1.1061 diff -u -r1.1060 -r1.1061 --- owners.list 26 May 2006 20:28:16 -0000 1.1060 +++ owners.list 27 May 2006 01:19:52 -0000 1.1061 @@ -1281,7 +1281,7 @@ Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|zing at fastmail.fm|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat May 27 06:11:51 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:11:51 -0700 Subject: rpms/tcltls/devel - New directory Message-ID: <200605270611.k4R6BrrB026956@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26927/tcltls/devel Log Message: Directory /cvs/extras/rpms/tcltls/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 06:11:50 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:11:50 -0700 Subject: rpms/tcltls - New directory Message-ID: <200605270611.k4R6Bqs5026953@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26927/tcltls Log Message: Directory /cvs/extras/rpms/tcltls added to the repository From fedora-extras-commits at redhat.com Sat May 27 06:12:08 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:12:08 -0700 Subject: rpms/tcltls Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605270612.k4R6CASX027007@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26974 Added Files: Makefile import.log Log Message: Setup of module tcltls --- NEW FILE Makefile --- # Top level Makefile for module tcltls all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 06:12:08 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:12:08 -0700 Subject: rpms/tcltls/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605270612.k4R6CAVI027010@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26974/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tcltls --- NEW 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 May 27 06:13:33 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:13:33 -0700 Subject: rpms/tcltls import.log,1.1,1.2 Message-ID: <200605270613.k4R6DZph027119@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27078 Modified Files: import.log Log Message: auto-import tcltls-1.5.0-10 on branch devel from tcltls-1.5.0-10.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tcltls/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 06:12:08 -0000 1.1 +++ import.log 27 May 2006 06:13:33 -0000 1.2 @@ -0,0 +1 @@ +tcltls-1_5_0-10:HEAD:tcltls-1.5.0-10.src.rpm:1148710402 From fedora-extras-commits at redhat.com Sat May 27 06:13:34 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:13:34 -0700 Subject: rpms/tcltls/devel tcltls-1.5-64bit.patch, NONE, 1.1 tcltls-1.5-ciphertest-KRB5.patch, NONE, 1.1 tcltls-1.5-pkgindex-version.patch, NONE, 1.1 tcltls-1.5-relpath.patch, NONE, 1.1 tcltls-1.5-rpmoptflags.patch, NONE, 1.1 tcltls-configurein.pkgname.patch, NONE, 1.1 tcltls-makefilein-soname.patch, NONE, 1.1 tcltls-tclm4-soname.patch, NONE, 1.1 tcltls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605270613.k4R6DaVw027140@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/tcltls/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27078/devel Modified Files: .cvsignore sources Added Files: tcltls-1.5-64bit.patch tcltls-1.5-ciphertest-KRB5.patch tcltls-1.5-pkgindex-version.patch tcltls-1.5-relpath.patch tcltls-1.5-rpmoptflags.patch tcltls-configurein.pkgname.patch tcltls-makefilein-soname.patch tcltls-tclm4-soname.patch tcltls.spec Log Message: auto-import tcltls-1.5.0-10 on branch devel from tcltls-1.5.0-10.src.rpm tcltls-1.5-64bit.patch: --- NEW FILE tcltls-1.5-64bit.patch --- diff -Naur tls1.5/config/tcl.m4 tls1.5.new/config/tcl.m4 --- tls1.5/config/tcl.m4 2006-03-28 12:17:43.000000000 -0800 +++ tls1.5.new/config/tcl.m4 2006-03-28 12:21:10.000000000 -0800 @@ -68,7 +68,9 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${prefix}/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` ; do if test -f "$i/tclConfig.sh" ; then diff -Naur tls1.5/configure tls1.5.new/configure --- tls1.5/configure 2006-03-28 12:20:15.000000000 -0800 +++ tls1.5.new/configure 2006-03-28 12:21:10.000000000 -0800 @@ -1362,7 +1362,9 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${prefix}/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` ; do if test -f "$i/tclConfig.sh" ; then tcltls-1.5-ciphertest-KRB5.patch: --- NEW FILE tcltls-1.5-ciphertest-KRB5.patch --- --- tls1.5/tests/ciphers.test~ 2006-03-27 20:44:22.000000000 +0200 +++ tls1.5/tests/ciphers.test 2006-03-27 20:48:40.000000000 +0200 @@ -95,6 +95,12 @@ EXP-DES-CBC-SHA EXP-EDH-DSS-DES-CBC-SHA EXP-EDH-RSA-DES-CBC-SHA +EXP-KRB5-DES-CBC-MD5 +EXP-KRB5-DES-CBC-SHA +EXP-KRB5-RC2-CBC-MD5 +EXP-KRB5-RC2-CBC-SHA +EXP-KRB5-RC4-MD5 +EXP-KRB5-RC4-SHA EXP-RC2-CBC-MD5 EXP-RC4-MD5 EXP1024-DES-CBC-SHA @@ -103,7 +109,12 @@ EXP1024-RC2-CBC-MD5 EXP1024-RC4-MD5 EXP1024-RC4-SHA -IDEA-CBC-SHA +KRB5-DES-CBC-MD5 +KRB5-DES-CBC-SHA +KRB5-DES-CBC3-MD5 +KRB5-DES-CBC3-SHA +KRB5-RC4-MD5 +KRB5-RC4-SHA RC4-MD5 RC4-SHA }] \n] @@ -133,6 +144,12 @@ EXP-DES-CBC-SHA EXP-EDH-DSS-DES-CBC-SHA EXP-EDH-RSA-DES-CBC-SHA +EXP-KRB5-DES-CBC-MD5 +EXP-KRB5-DES-CBC-SHA +EXP-KRB5-RC2-CBC-MD5 +EXP-KRB5-RC2-CBC-SHA +EXP-KRB5-RC4-MD5 +EXP-KRB5-RC4-SHA EXP-RC2-CBC-MD5 EXP-RC4-MD5 EXP1024-DES-CBC-SHA @@ -141,7 +158,12 @@ EXP1024-RC2-CBC-MD5 EXP1024-RC4-MD5 EXP1024-RC4-SHA -IDEA-CBC-SHA +KRB5-DES-CBC-MD5 +KRB5-DES-CBC-SHA +KRB5-DES-CBC3-MD5 +KRB5-DES-CBC3-SHA +KRB5-RC4-MD5 +KRB5-RC4-SHA RC4-MD5 RC4-SHA }] \n] tcltls-1.5-pkgindex-version.patch: --- NEW FILE tcltls-1.5-pkgindex-version.patch --- --- tls1.5/pkgIndex.tcl.in~ 2006-04-24 16:08:03.000000000 +0200 +++ tls1.5/pkgIndex.tcl.in 2006-04-24 16:09:06.000000000 +0200 @@ -5,5 +5,5 @@ # replace the original which didn't include the commands from "tls.tcl". # -package ifneeded tls 1.5 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]" +package ifneeded tls 1.50 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]" tcltls-1.5-relpath.patch: --- NEW FILE tcltls-1.5-relpath.patch --- diff -u tls1.5~/configure tls1.5/configure --- tls1.5~/configure 2002-02-04 23:46:09.000000000 +0100 +++ tls1.5/configure 2006-04-24 15:56:32.000000000 +0200 @@ -1297,7 +1297,7 @@ ;; *) CYGPATH=echo - RELPATH=".." + RELPATH="" ;; esac diff -u tls1.5~/configure.in tls1.5/configure.in --- tls1.5~/configure.in 2002-02-04 23:46:09.000000000 +0100 +++ tls1.5/configure.in 2006-04-24 15:56:56.000000000 +0200 @@ -227,7 +227,7 @@ ;; *) CYGPATH=echo - RELPATH=".." + RELPATH="" ;; esac tcltls-1.5-rpmoptflags.patch: --- NEW FILE tcltls-1.5-rpmoptflags.patch --- --- tls1.5/Makefile.in 2004-02-03 20:02:17.000000000 -0800 +++ tls1.5.new/Makefile.in 2006-03-28 12:23:54.000000000 -0800 @@ -170,7 +170,7 @@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ AR = ar -CFLAGS = @CFLAGS@ +CFLAGS = @TCL_EXTRA_CFLAGS@ @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ tcltls-configurein.pkgname.patch: --- NEW FILE tcltls-configurein.pkgname.patch --- --- tls1.5/configure.in~ 2006-03-24 09:51:35.000000000 +0100 +++ tls1.5/configure.in 2006-03-24 09:52:47.000000000 +0100 @@ -365,7 +365,7 @@ *) if test "${SHARED_BUILD}" = "1" ; then SHLIB_LD_LIBS="${TCL_STUB_LIB_SPEC} -L${SSL_LIB_DIR} -lssl -L${SSL_LIB_DIR} -lcrypto ${GCCPATH} ${GCCLIB}" - eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}" + eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}-${SHARED_LIB_SUFFIX}" RANLIB=: else eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}" diff -Naur tls1.5/configure tls1.5.new/configure --- tls1.5/configure 2002-02-04 14:46:09.000000000 -0800 +++ tls1.5.new/configure 2006-03-28 12:19:02.000000000 -0800 @@ -1796,7 +1796,7 @@ *) if test "${SHARED_BUILD}" = "1" ; then SHLIB_LD_LIBS="${TCL_STUB_LIB_SPEC} -L${SSL_LIB_DIR} -lssl -L${SSL_LIB_DIR} -lcrypto ${GCCPATH} ${GCCLIB}" - eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}" + eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}-${SHARED_LIB_SUFFIX}" RANLIB=: else eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}" tcltls-makefilein-soname.patch: --- NEW FILE tcltls-makefilein-soname.patch --- --- tls1.5/Makefile.in~ 2006-03-24 09:01:58.000000000 +0100 +++ tls1.5/Makefile.in 2006-03-24 09:03:11.000000000 +0100 @@ -136,7 +136,7 @@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ -SHLIB_LD = @SHLIB_LD@ +SHLIB_LD = @SHLIB_LD@ -Wl,-soname,${@} SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ STLIB_LD = @STLIB_LD@ tcltls-tclm4-soname.patch: --- NEW FILE tcltls-tclm4-soname.patch --- --- tls1.5/config/tcl.m4~ 2006-04-24 15:38:18.000000000 +0200 +++ tls1.5/config/tcl.m4 2006-04-24 15:39:00.000000000 +0200 @@ -826,7 +826,7 @@ CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" if test "$have_dl" = yes; then - SHLIB_LD="${CC} -shared" + SHLIB_LD='${CC} -shared -Wl,-soname,${@}' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="-rdynamic" --- NEW FILE tcltls.spec --- Name: tcltls Version: 1.5.0 Release: 10%{?dist} Summary: OpenSSL extension for Tcl Group: Development/Libraries License: BSD URL: http://tls.sourceforge.net/ Source0: http://dl.sourceforge.net/tls/tls%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, tcl-devel Patch1: tcltls-configurein.pkgname.patch Patch2: tcltls-1.5-rpmoptflags.patch Patch3: tcltls-1.5-64bit.patch Patch4: tcltls-makefilein-soname.patch Patch5: tcltls-tclm4-soname.patch Patch6: tcltls-1.5-relpath.patch Patch7: tcltls-1.5-pkgindex-version.patch Patch8: tcltls-1.5-ciphertest-KRB5.patch %description A TLS OpenSSL extension for Tcl %package devel Group: Development/Libraries Summary: Header files for the OpenSSL extension for Tcl Requires: %{name} = %{version}-%{release} %description devel The TLS OpenSSL extension to Tcl This package contains the development files for tls. %prep %setup -n tls1.5 -q %patch1 -p1 -b .1-pkgname %patch2 -p1 -b .2-rpmoptflags %patch3 -p1 -b .3-64bit %patch4 -p1 -b .4-soname %patch5 -p1 -b .5-soname %patch6 -p1 -b .6-relpath %patch7 -p1 -b .7-pkgindex-version %patch8 -p1 -b .8-ciphertest %build %configure --with-ssl-dir=%{_prefix} make %{?_smp_mflags} %check make test %install rm -rf $RPM_BUILD_ROOT make install libdir=${RPM_BUILD_ROOT}%{_libdir} includedir=${RPM_BUILD_ROOT}%{_includedir} #1.50 vs 1.5.0 mv $RPM_BUILD_ROOT/%{_libdir}/tls1.50 $RPM_BUILD_ROOT/%{_libdir}/tls%{version} mv $RPM_BUILD_ROOT/%{_libdir}/libtls-1.50.so $RPM_BUILD_ROOT/%{_libdir}/tls%{version}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README.txt ChangeLog license.terms %{_libdir}/tls%{version}/ %files devel %defattr(-,root,root,-) %{_includedir}/tls.h %changelog * Fri May 26 2006 Sander Hoentjen - 1.5.0-10 - reverted name change to tcltls * Fri May 26 2006 Sander Hoentjen - 1.5.0-9 - in reply to comment #39 from bug #186327 (review by wart) - changed name from tcltls to tcl-tls - changed lib dir from tls1.50 to tls1.5.0 - changed summary - removed some commented lines - use macro in configure instead of hardcoded /usr - changed group - removed inhereted tags in devel package * Tue Apr 24 2006 Sander Hoentjen - 1.5.0-8 - Source0 dl.sf.net instead of download.sf.net * Tue Apr 24 2006 Sander Hoentjen - 1.5.0-7 - source tarball has same md5sum as upstream now * Tue Apr 24 2006 Sander Hoentjen - 1.5.0-6 - added make test - no more enable-symbols * Tue Apr 24 2006 Sander Hoentjen - 1.5.0-5 patches from Wart (wart at kobold.org): - Patch1: tcltls-configurein.pkgname.patch - Patch2: tcltls-1.5-rpmoptflags.patch - Patch3: tcltls-1.5-64bit.patch Moved libtls out of /usr/lib into subdir * Tue Mar 28 2006 Sander Hoentjen - 1.5.0-4 * Tue Mar 28 2006 Sander Hoentjen - 1.5.0-3 * Thu Mar 23 2006 Sander Hoentjen - 1.5.0-2 - invalid-soname fixed - docs added (including license) - devel package has %defattr now * Tue Mar 21 2006 Sander Hoentjen - 1.5.0-1 - created Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tcltls/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 06:12:08 -0000 1.1 +++ .cvsignore 27 May 2006 06:13:34 -0000 1.2 @@ -0,0 +1 @@ +tls1.5.0-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tcltls/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 06:12:08 -0000 1.1 +++ sources 27 May 2006 06:13:34 -0000 1.2 @@ -0,0 +1 @@ +9eeab472475773b3810acc808ebec759 tls1.5.0-src.tar.gz From fedora-extras-commits at redhat.com Sat May 27 06:30:22 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Fri, 26 May 2006 23:30:22 -0700 Subject: owners owners.list,1.1061,1.1062 Message-ID: <200605270630.k4R6UOal027223@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27194 Modified Files: owners.list Log Message: added tcltls Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1061 retrieving revision 1.1062 diff -u -r1.1061 -r1.1062 --- owners.list 27 May 2006 01:19:52 -0000 1.1061 +++ owners.list 27 May 2006 06:30:22 -0000 1.1062 @@ -1588,6 +1588,7 @@ Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tclsoap|Tcl commands for SOAP remote procedure calls|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|tcltls|OpenSSL extension for Tcl|sander at hoentjen.eu|extras-qa at fedoraproject.org| Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 27 07:11:19 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:11:19 -0700 Subject: rpms/php-pear-Mail - New directory Message-ID: <200605270711.k4R7BLa4029747@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29721/php-pear-Mail Log Message: Directory /cvs/extras/rpms/php-pear-Mail added to the repository From fedora-extras-commits at redhat.com Sat May 27 07:11:20 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:11:20 -0700 Subject: rpms/php-pear-Mail/devel - New directory Message-ID: <200605270711.k4R7BM9J029750@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29721/php-pear-Mail/devel Log Message: Directory /cvs/extras/rpms/php-pear-Mail/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 07:11:52 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:11:52 -0700 Subject: rpms/php-pear-Mail Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605270711.k4R7Bsab029801@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29768 Added Files: Makefile import.log Log Message: Setup of module php-pear-Mail --- NEW FILE Makefile --- # Top level Makefile for module php-pear-Mail all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 07:11:52 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:11:52 -0700 Subject: rpms/php-pear-Mail/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605270711.k4R7BsJh029804@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29768/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-Mail --- NEW 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 May 27 07:13:03 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:13:03 -0700 Subject: rpms/php-pear-Mail import.log,1.1,1.2 Message-ID: <200605270713.k4R7D5eM029871@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29837 Modified Files: import.log Log Message: auto-import php-pear-Mail-1.1.10-4.fc5 on branch devel from php-pear-Mail-1.1.10-4.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-pear-Mail/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 07:11:52 -0000 1.1 +++ import.log 27 May 2006 07:13:03 -0000 1.2 @@ -0,0 +1 @@ +php-pear-Mail-1_1_10-4_fc5:HEAD:php-pear-Mail-1.1.10-4.fc5.src.rpm:1148714054 From fedora-extras-commits at redhat.com Sat May 27 07:13:04 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:13:04 -0700 Subject: rpms/php-pear-Mail/devel PHP-LICENSE-3.01, NONE, 1.1 php-pear-Mail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605270713.k4R7D6KL029876@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Mail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29837/devel Modified Files: .cvsignore sources Added Files: PHP-LICENSE-3.01 php-pear-Mail.spec Log Message: auto-import php-pear-Mail-1.1.10-4.fc5 on branch devel from php-pear-Mail-1.1.10-4.fc5.src.rpm --- NEW FILE PHP-LICENSE-3.01 --- -------------------------------------------------------------------- The PHP License, version 3.01 Copyright (c) 1999 - 2006 The PHP Group. All rights reserved. -------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name "PHP" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact group at php.net. 4. Products derived from this software may not be called "PHP", nor may "PHP" appear in their name, without prior written permission from group at php.net. You may indicate that your software works in conjunction with PHP by saying "Foo for PHP" instead of calling it "PHP Foo" or "phpfoo" 5. The PHP Group may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. Once covered code has been published under a particular version of the license, you may always continue to use it under the terms of that version. You may also choose to use such covered code under the terms of any subsequent version of the license published by the PHP Group. No one other than the PHP Group has the right to modify the terms applicable to covered code created under this License. 6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes PHP software, freely available from ". THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- This software consists of voluntary contributions made by many individuals on behalf of the PHP Group. The PHP Group can be contacted via Email at group at php.net. For more information on the PHP Group and the PHP project, please see . PHP includes the Zend Engine, freely available at . --- NEW FILE php-pear-Mail.spec --- %define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear) %define xmldir %{peardir}/.pkgxml Summary: PEAR: Class that provides multiple interfaces for sending emails Summary(fr): PEAR: Une Classe fournissant des interfaces pour envoyer des emails Name: php-pear-Mail Version: 1.1.10 Release: 4%{?dist} License: PHP License Group: Development/Libraries Source: http://pear.php.net/get/Mail-%{version}.tgz Source1: PHP-LICENSE-3.01 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://pear.php.net/package/Mail BuildRequires: php-pear(PEAR) >= 1.4.9 Provides: php-pear(Mail) = %{version} Requires: php-pear(PEAR) >= 1.4.9 # Requires(hint): php-pear(Net_SMTP) >= 1.1.0 Requires(post): php-pear Requires(postun): php-pear BuildArch: noarch %description PEAR's Mail package defines an interface for implementing mailers under the PEAR hierarchy. It also provides supporting functions useful to multiple mailer backends. Currently supported backends include: PHP's native mail() function, sendmail, and SMTP. This package also provides a RFC822 email address list validation utility class. php-pear-Mail can optionally use package "php-pear-Net-SMTP" (version >= 1.1.0). %description -l fr L'extension Mail d??finie une interfance permettant de construire des gestionnaires de courrier dans l'arborescence PEAR. Elle fournie aussi des fonctions utiles ?? l'utilisation de ces gestionnaires. Actuellement elle supporte la fonction PHP standard mail(), sendmail et SMTP. Cette extension contient aussi une classe permettant de v??rifer la conformit?? ?? la RFC822 des liste d'adresses de courrier. php-pear-Mail peut optionellement utiliser l'extension "php-pear-Net-SMTP" (version >= 1.1.0). %prep %setup -c -T # XXX Source files location is missing here in pear cmd pear -v -c pearrc \ -d php_dir=%{peardir} \ -d doc_dir=/docs \ -d bin_dir=%{_bindir} \ -d data_dir=%{peardir}/data \ -d test_dir=%{peardir}/test \ -d ext_dir=%{_libdir} \ -s %install rm -rf %{buildroot} pear -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0} rm pearrc rm %{buildroot}/%{peardir}/.filemap rm %{buildroot}/%{peardir}/.lock rm -rf %{buildroot}/%{peardir}/.registry rm -rf %{buildroot}/%{peardir}/.channels rm %{buildroot}/%{peardir}/.depdb rm %{buildroot}/%{peardir}/.depdblock %{__mkdir_p} %{buildroot}%{xmldir} tar -xzf %{SOURCE0} package.xml cp -p package.xml %{buildroot}%{xmldir}/Mail.xml %{__install} -m 644 -c %{SOURCE1} LICENSE %check # Sanity check lst=$(find %{buildroot}%{peardir} -exec grep -q %{buildroot} {} \; -print) [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1; %clean rm -rf %{buildroot} %post pear install --nodeps --soft --force --register-only %{xmldir}/Mail.xml >/dev/null %postun # if refcount = 0 then package has been removed (not upgraded) if [ "$1" -eq "0" ]; then pear uninstall --nodeps --ignore-errors --register-only Mail >/dev/null fi %files %defattr(-,root,root) %{peardir}/Mail.php %{peardir}/Mail %{peardir}/test/Mail %{xmldir}/Mail.xml %doc LICENSE %changelog * Mon May 15 2006 Remi Collet 1.1.10-4.fc5 - Require pear >= 1:1.4.9 - Requires(hint): php-pear(Net_SMTP) >= 1.1.0 (only comment actually) - bundle the v3.01 PHP LICENSE file - use --packagingroot (instead of -R) - check from install to check (as in php-pear) * Sun May 14 2006 Remi Collet 1.1.10-3.fc5 - License : PHP -> PHP License * Sat May 06 2006 Remi Collet 1.1.10-2.fc5 - new spec for extras - use %{_datadir}/pear/.pkgxml for XML (Bug #190252) * Thu Apr 27 2006 Remi Collet 1.1.10-1.fc5 - spec for extras * Wed Apr 26 2006 Remi Collet 1.1.10-1.fc{3,4,5}.remi - update to 1.1.10 * Thu Apr 06 2006 Remi Collet 1.1.9-2.fc{3,4,5}.remi - change /var/lib/pear to %{_libdir}/php/pear for XML (as in extras for FC5) - spec cleanning * Sat Jan 7 2006 Remi Collet 1.1.9-1.fc{3,4}.remi - initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Mail/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 07:11:52 -0000 1.1 +++ .cvsignore 27 May 2006 07:13:04 -0000 1.2 @@ -0,0 +1 @@ +Mail-1.1.10.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Mail/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 07:11:52 -0000 1.1 +++ sources 27 May 2006 07:13:04 -0000 1.2 @@ -0,0 +1 @@ +a1ea25fb8ef61062e178bd34ab15ba33 Mail-1.1.10.tgz From fedora-extras-commits at redhat.com Sat May 27 07:16:16 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Sat, 27 May 2006 00:16:16 -0700 Subject: owners owners.list,1.1062,1.1063 Message-ID: <200605270716.k4R7GI2R029939@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29920 Modified Files: owners.list Log Message: Adding php-pear-Mail Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1062 retrieving revision 1.1063 diff -u -r1.1062 -r1.1063 --- owners.list 27 May 2006 06:30:22 -0000 1.1062 +++ owners.list 27 May 2006 07:16:15 -0000 1.1063 @@ -1297,6 +1297,7 @@ Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.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-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org| +Fedora Extras|php-pear-Mail|PEAR: Class that provides multiple interfaces for sending emails|Fedora at FamilleCollet.com|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| From fedora-extras-commits at redhat.com Sat May 27 08:08:40 2006 From: fedora-extras-commits at redhat.com (Andy Shevchenko (andriy)) Date: Sat, 27 May 2006 01:08:40 -0700 Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec, 1.1, 1.2 Message-ID: <200605270808.k4R88gsA032356@cvs-int.fedora.redhat.com> Author: andriy Update of /cvs/extras/rpms/jack-audio-connection-kit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32339 Modified Files: jack-audio-connection-kit.spec Log Message: Remove optimization switcher. Index: jack-audio-connection-kit.spec =================================================================== RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jack-audio-connection-kit.spec 26 May 2006 17:15:12 -0000 1.1 +++ jack-audio-connection-kit.spec 27 May 2006 08:08:40 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 0.101.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL/LGPL Group: System Environment/Daemons Source0: http://dl.sourceforge.net/sourceforge/jackit/%{name}-%{version}.tar.gz @@ -54,14 +54,10 @@ # Also patch0 touches configure.ac. autoreconf --force --install -%configure --enable-stripped-jackd \ +%configure \ --with-html-dir=%{_docdir} \ -%ifarch i386 - --enable-sse=no --enable-mmx=no \ -%endif --disable-oss \ --disable-portaudio \ - --enable-optimize \ --with-default-tmpdir=/dev/shm make %{?_smp_mflags} @@ -123,6 +119,9 @@ %{_bindir}/jack_simple_client %changelog +* Sat May 27 2006 Andy Shevchenko 0.101.1-9 +- remove --enable-stripped-jackd and --enable-optimize (use default flags) + * Fri May 19 2006 Andy Shevchenko 0.101.1-8 - uniform directories items at %files section From fedora-extras-commits at redhat.com Sat May 27 11:10:21 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 04:10:21 -0700 Subject: rpms/gcfilms/FC-4 .cvsignore, 1.7, 1.8 gcfilms.spec, 1.7, 1.8 sources, 1.9, 1.10 Message-ID: <200605271110.k4RBANuq007980@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7944/FC-4 Modified Files: .cvsignore gcfilms.spec sources Log Message: auto-import gcfilms-6.2-1.fc4 on branch FC-4 from gcfilms-6.2-1.fc4.src.rpm New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 18 Feb 2006 13:34:26 -0000 1.7 +++ .cvsignore 27 May 2006 11:10:21 -0000 1.8 @@ -1 +1 @@ -gcfilms-6.1.tar.gz +gcfilms-6.2.tar.gz Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-4/gcfilms.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gcfilms.spec 27 Feb 2006 19:57:24 -0000 1.7 +++ gcfilms.spec 27 May 2006 11:10:21 -0000 1.8 @@ -1,6 +1,6 @@ Name: gcfilms -Version: 6.1 -Release: 2%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: Movies collection management Group: Applications/Databases @@ -97,11 +97,6 @@ %{_datadir}/mime/packages/%{name}.xml %changelog -* Mon Feb 27 2006 Tian - 6.1-2 - - New version because of a problem on build systems - (use of lib64 instead of lib on x86 systems) -* Sat Feb 18 2006 Tian - 6.1-1 - - New upstream version. * Sun Nov 20 2005 Tian - 6.0-1 - New upstream version. - Changed description to follow upstream conventions. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 Feb 2006 13:21:11 -0000 1.9 +++ sources 27 May 2006 11:10:21 -0000 1.10 @@ -1 +1 @@ -03da9f046268672f3f71c9887e2adbf3 gcfilms-6.1.tar.gz +933333293c4907aa33b3d52a7c022d9b gcfilms-6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 27 11:10:18 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 04:10:18 -0700 Subject: rpms/gcfilms import.log,1.7,1.8 Message-ID: <200605271110.k4RBAojN007983@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7944 Modified Files: import.log Log Message: auto-import gcfilms-6.2-1.fc4 on branch FC-4 from gcfilms-6.2-1.fc4.src.rpm New upstream version Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gcfilms/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 19 Nov 2005 17:17:09 -0000 1.7 +++ import.log 27 May 2006 11:10:18 -0000 1.8 @@ -4,3 +4,4 @@ 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 gcfilms-6_0-1_fc4:FC-4:gcfilms-6.0-1.fc4.src.rpm:1132420620 +gcfilms-6_2-1_fc4:FC-4:gcfilms-6.2-1.fc4.src.rpm:1148728209 From fedora-extras-commits at redhat.com Sat May 27 11:43:33 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 04:43:33 -0700 Subject: rpms/gcfilms/FC-4 gcfilms.spec,1.8,1.9 Message-ID: <200605271143.k4RBhZEm008133@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8116 Modified Files: gcfilms.spec Log Message: update changelog for 6.2 Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-4/gcfilms.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gcfilms.spec 27 May 2006 11:10:21 -0000 1.8 +++ gcfilms.spec 27 May 2006 11:43:33 -0000 1.9 @@ -97,6 +97,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat May 27 2006 Tian - 6.2-1 + - New upstream version. * Sun Nov 20 2005 Tian - 6.0-1 - New upstream version. - Changed description to follow upstream conventions. From fedora-extras-commits at redhat.com Sat May 27 11:48:00 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sat, 27 May 2006 04:48:00 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack_Bug_191515.patch, NONE, 1.1 ctapi-cyberjack.spec, 1.1, 1.2 ctapi-cyberjack_MakefileCtAPI.patch, 1.1, 1.2 ctapi-cyberjack_MakefilePCSC.patch, 1.1, 1.2 Message-ID: <200605271148.k4RBm2bt008183@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8147 Modified Files: ctapi-cyberjack.spec ctapi-cyberjack_MakefileCtAPI.patch ctapi-cyberjack_MakefilePCSC.patch Added Files: ctapi-cyberjack_Bug_191515.patch Log Message: - first test for the new version 2.0.10 of the driver - it need some testing because on some kernels sometimes the reader will not found ctapi-cyberjack_Bug_191515.patch: --- NEW FILE ctapi-cyberjack_Bug_191515.patch --- diff -Naur ctapi-cyberjack-2.0.10.org/makevars ctapi-cyberjack-2.0.10/makevars --- ctapi-cyberjack-2.0.10.org/makevars 2006-05-27 12:40:17.000000000 +0200 +++ ctapi-cyberjack-2.0.10/makevars 2006-05-27 12:43:51.000000000 +0200 @@ -23,7 +23,7 @@ CFLAGS+= -DHAVE_READLINE_HISTORY_H -DHAVE_READLINE_READLINE_H # include the known include folders -CFLAGS+= -I/usr/local/include -I/usr/include +CFLAGS+= -I/lib/modules/XX/source/include # the following is debugging stuff. If all works fine you want need this Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack.spec 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack.spec 27 May 2006 11:48:00 -0000 1.2 @@ -1,42 +1,46 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader -Version: 2.0.8 -Release: 13%{?dist} -Requires: %{_libdir}/ctapi -#For FC>4 -BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 -#For FC4 -#BuildRequires: libusb-devel readline-devel -URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.8/ctapi-cyberjack-2.0.8.tar.bz2 +Version: 2.0.10 +Release: 1_FC4 +BuildRequires: libusb, readline-devel, ncurses-devel, kernel-devel License: LGPL -Group: Development/Libraries +Group: System Environment/Libraries Source: %{name}-%{version}.tar.bz2 -Patch0: ctapi-cyberjack_MakefileCtAPI.patch -Patch1: ctapi-cyberjack_MakefilePCSC.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -#for FC4 -#%%define readers_dir %{_libdir}/readers -#for FC>4 -%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir) +Patch0: ctapi-cyberjack-2.0.4-rh73_old_libusb.patch +Buildroot: %{_tmppath}/ctapi-cyberjack-%{version}-%{release}-root + +#%define prefix /usr +#%define lib_dir %{prefix}/lib +%define readers_dir %{_libdir}/readers + +%package ifd-handler +Summary: cyberjack PC/SC IFD handler for pcsc-lite +Requires: %{name} = %{version} +Group: System Environment/Libraries + +%description ifd-handler +REINER SCT cyberJack pinpad/e-com USB user space driver + +This package includes the PC/SC IFD handler driver for the cyberJack +pinpad/e-com USB chipcard reader. + %package devel Summary: Development files for libctapi-cyberjack Requires: %{name} = %{version} Group: Development/Libraries -%package pcsc -Summary: PC/SC Module -Requires: pcsc-lite -Group: Development/Libraries - %description REINER SCT cyberJack pinpad/e-com USB user space driver This package includes the CT-API driver for the cyberJack pinpad/e-com USB chipcard reader. +This package changes the permissions of /dev/ttyUSB devices 0-3 to +2666. This gives the users the possibility to access the devices and +enables mandatory locking. + The kernel side driver is included in the official linux kernel starting with version 2.4.6. @@ -45,166 +49,111 @@ controllers. For more information about the reader, software updates and a shop see -http://www.reiner-sct.com - - WARNING -Use the tool ctsh only when you know what you are doing!!! -Or you can damage your SmartCard!!! - - Hint -When using the CT-API lib you must first stop the PC/SC daemon, -when you use it. +http://www.reiner-sct.com/ %description devel Development files for libctapi-cyberjack -%description pcsc -Files for the PC/SC system. - %prep %setup -q -n %{name}-%{version} -#fix path for the driver lib the config file - sed -i "s\/usr/lib/readers/libcyberjack_ifd.so\%{readers_dir}/libcyberjack_ifd.so\1" \ - etc/reader.conf - -#fix reader.conf for FC>4 - sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf - -%patch0 -p1 -%patch1 -p1 - %build -#make %{?_smp_mflags} will fail!!! -make +##Fedora korrektur +sed -e "s/CFLAGS+=\ -I\/usr\/local\/include\ -I\/usr\/include/CFLAGS+=\ -I\/usr\/local\/include\ -I\/lib\/modules\/$(uname -r)\/source\/include\ -I\/usr\/include/g" makevars >makevars.neu +mv makevars.neu makevars +make %install -rm -rf $RPM_BUILD_ROOT - +if [ -n "%{buildroot}" ] ; then + [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +fi # CT-API -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi -mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{_libdir}/ctapi/libctapi-cyberjack.so -install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h -install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/cjgeldkarte -install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ctsh - +mkdir -p %{buildroot}/%{readers_dir} +install -m 755 ctapi/libctapi-cyberjack.so %{buildroot}/%{readers_dir}/libctapi-cyberjack.so.%{version} +install -m 755 ctapi/libctapi-cyberjack.a %{buildroot}/%{readers_dir}/libctapi-cyberjack.a +( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so.%{version} libctapi-cyberjack.so ) +( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so libctapi.so ) +( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi.so libctapi.so ) +( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi-cyberjack.a libctapi-cyberjack.a ) +mkdir -p %{buildroot}/%{_includedir} +install -m 644 ctapi/include/ctapi.h %{buildroot}/%{_includedir}/ctapi.h +mkdir -p %{buildroot}/%{_bindir} +install -m 755 tools/cjgeldkarte %{buildroot}/%{_bindir}/cjgeldkarte +install -m 755 tools/ctsh %{buildroot}/%{_bindir}/ctsh # PC/SC -mkdir -p $RPM_BUILD_ROOT%{readers_dir} -install -m 755 pcsc/libcyberjack_ifd.so $RPM_BUILD_ROOT%{readers_dir}/libcyberjack_ifd.so -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d -install -m 444 etc/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/cyberjack.conf - -%post pcsc -#register PC/SC driver and restart daemon -/sbin/service pcscd condrestart||: - -%postun pcsc -#unregister PC/SC driver and restart daemon -/sbin/service pcscd condrestart||: - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +#mkdir -p %{buildroot}/%{readers_dir} +mkdir -p %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux +install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so %{buildroot}/%{readers_dir}/libcyberjack_ifd.so.%{version} +install -m 444 pcsc/ifd-cyberjack.bundle/Contents/Info.plist %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist +install -m 444 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo +( cd %{buildroot}/%{readers_dir}; ln -s libcyberjack_ifd.so.%{version} libcyberjack_ifd.so ) +( cd %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux; ln -s %{readers_dir}/libcyberjack_ifd.so cyberjack-ifd.so ) +mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d +install -m 644 etc/reader.conf %{buildroot}%{_sysconfdir}/reader.conf.d/cyberjack.conf + +%pre +groupadd -r cyberjack 2>/dev/null || : + +%post ifd-handler +/usr/sbin/update-reader.conf + +%post +if [ -e /dev/ttyUSB0 ] ; then + chmod 2666 /dev/ttyUSB0 +else + mknod -m 2666 /dev/ttyUSB0 c 188 0 +fi +if [ -e /dev/ttyUSB1 ] ; then + chmod 2666 /dev/ttyUSB1 +else + mknod -m 2666 /dev/ttyUSB1 c 188 1 +fi +if [ -e /dev/ttyUSB2 ] ; then + chmod 2666 /dev/ttyUSB2 +else + mknod -m 2666 /dev/ttyUSB2 c 188 2 +fi +if [ -e /dev/ttyUSB3 ] ; then + chmod 2666 /dev/ttyUSB3 +else + mknod -m 2666 /dev/ttyUSB3 c 188 3 +fi %clean -rm -rf $RPM_BUILD_ROOT +if [ -n "%{buildroot}" ] ; then + [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +fi %files -%doc COPYRIGHT* -%doc doc/README.txt -%doc doc/README.pdf -%doc doc/README.html - -%defattr(-,root,root,-) +%defattr(0644,root,root) +%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.pdf doc/README.html doc/README.txt MAKEUSBDEV tools/ctshrc.example # CT-API -%{_libdir}/ctapi/libctapi-cyberjack.so -%{_bindir}/cjgeldkarte -%{_bindir}/ctsh +%{readers_dir}/libctapi-cyberjack.so.%{version} +%{readers_dir}/libctapi-cyberjack.so +%{readers_dir}/libctapi.so +%{_libdir}/libctapi.so +%attr(0755,root,root) %{_bindir}/cjgeldkarte +%attr(0755,root,root) %{prefix}/bin/ctsh -%files pcsc # PC/SC -%defattr(755,root,root) +%files ifd-handler +/%{readers_dir}/libcyberjack_ifd.so.%{version} /%{readers_dir}/libcyberjack_ifd.so -%attr(644,root,root) %config(noreplace) %{_sysconfdir}/reader.conf.d/cyberjack.conf +%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo +%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist +%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux/cyberjack-ifd.so +%{_sysconfdir}/reader.conf.d/cyberjack.conf %files devel %defattr(0644,root,root) -%{_includedir}/ctapi-cyberjack/ctapi.h - -%changelog -* Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} -- rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to - libcyberjack_ifd.so -- fix place for the comments of /sbin/service pcscd condrestart - -* Wed May 10 2006 Frank B??ttner - 2.0.8-12%{?dist} -- fix comments for %%post/%%postun pcsc -- fix call of restart the PC/SC daemon -- move to the old version of dependency for the PC/SC package -- add -soname option in PS/SC driver - -* Tue May 9 2006 Frank B??ttner - 2.0.8-11%{?dist} -- remove comments at %%post and %%postun -- remove unneeded /usr/sbin/update-reader.conf call - -* Mon May 8 2006 Frank B??ttner - 2.0.8-10%{?dist} -- fix ldconfig for the PC/SC part -- fix dependency for the PC/SC package -- fix build dependency for the package. - -* Mon May 8 2006 Frank B??ttner - 2.0.8-9%{?dist} -- restart PC/SC daemon only when it run's -- fix CT-API version bug so that apps can find it in the ldcache via - libctapi-cyberjack.so -- add comment about using CT-API and PC/SC together - -* Sun May 7 2006 Frank B??ttner - 2.0.8-8%{?dist} -- add requirement of the ctapi dir under %{_libdir} -- the CT-API lib lives now under %{_libdir}/ctapi -- reenable link the ctapi driver static in the PC/SC part -- run ldconfig after install/uninstall - -* Mon May 1 2006 Frank B??ttner - 2.0.8-7%{?dist} -- fix permission of ctapi-cyberjack-2.0.8.tar.bz2 and ctapi-cyberjack.spec -- fix permisson of the PC/SC config file -- restart PC/SC daemon after remove the PS/SC driver - -* Sun Apr 30 2006 Frank B??ttner - 2.0.8-6%{?dist} -- replace if statements with comments -- replace german to english comments -- fix the makefile for the CT-API lib -- correct naming the libs CT-API and PS/SC -- rename package PS/SC to pcsc -- replace RPM_BUILD_ROOT -- fix doc -- add warning for the tool ctsh - -* Thu Apr 27 2006 Frank B??ttner - 2.0.8-5%{dist} -- fix owner of lib's -- add PC/SC fix for FC5 -- restart pcscd - -* Thu Apr 27 2006 Frank B??ttner - 2.0.8-4%{dist} -- change permisson of all lib's to 0755 -- rename lib files to support more reader's -- fix the path of the CT-API part and the devel file -- support FC4 and FC5 - -* Sat Apr 15 2006 Frank B??ttner - 2.0.8-3%{dist} -- remove makefile workaround - -* Sat Apr 15 2006 Frank B??ttner - 2.0.8-2%{dist} -- remove packager -- remove hardcodet Fedora Tag -- rename file from ctapi-cyberjack-version to ctapi-cyberjack -- modify source URL -- fix clean section - -* Sat Apr 08 2006 Frank B??ttner - 2.0.8-1.FC4 -- start for Fedora -- sepperate the PC/SC part +%{_includedir}/ctapi.h +%{readers_dir}/libctapi-cyberjack.a +%{_libdir}/libctapi-cyberjack.a + +%changelog -n ctapi-cyberjack +* Mon May 30 2005 - Harald Welte ++ ctapi-cyberjack-2.0.9-1 +- add pcsc-lite 'dropdir' compatible PC/SC driver * Wed Mar 02 2005 - Harald Welte + ctapi-cyberjack-2.0.8-1 ctapi-cyberjack_MakefileCtAPI.patch: Index: ctapi-cyberjack_MakefileCtAPI.patch =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack_MakefileCtAPI.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack_MakefileCtAPI.patch 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack_MakefileCtAPI.patch 27 May 2006 11:48:00 -0000 1.2 @@ -1,13 +1,12 @@ -diff -Naur ctapi-cyberjack-2.0.8.org/ctapi/Makefile ctapi-cyberjack-2.0.8/ctapi/Makefile ---- ctapi-cyberjack-2.0.8.org/ctapi/Makefile 2005-02-15 00:57:54.000000000 +0100 -+++ ctapi-cyberjack-2.0.8/ctapi/Makefile 2006-05-01 10:50:54.000000000 +0200 -@@ -22,7 +22,8 @@ +diff -Naur ctapi-cyberjack-2.0.10.org/ctapi/Makefile ctapi-cyberjack-2.0.10/ctapi/Makefile +--- ctapi-cyberjack-2.0.10.org/ctapi/Makefile 2006-05-27 12:40:17.000000000 +0200 ++++ ctapi-cyberjack-2.0.10/ctapi/Makefile 2006-05-27 13:17:09.000000000 +0200 +@@ -22,7 +22,7 @@ $(CC) $(CFLAGS) -o $@ -c $^ libso: $(OBJS) $(LIBS) - ld -x --shared -lusb -o libctapi-cyberjack.so $(OBJS) $(LIBS) -+ ld -x --shared -lusb -lc -soname libctapi-cyberjack.so -o libctapi-cyberjack.so \ -+ $(OBJS) $(LIBS) ++ ld -x --shared -lusb -lc -soname libctapi-cyberjack.so -o libctapi-cyberjack.so $(OBJS) $(LIBS) liba: $(OBJS) $(LIBS) mkdir tmp ctapi-cyberjack_MakefilePCSC.patch: Index: ctapi-cyberjack_MakefilePCSC.patch =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack_MakefilePCSC.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack_MakefilePCSC.patch 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack_MakefilePCSC.patch 27 May 2006 11:48:00 -0000 1.2 @@ -1,12 +1,12 @@ -diff -Naur ctapi-cyberjack-2.0.8.org/pcsc/Makefile ctapi-cyberjack-2.0.8/pcsc/Makefile ---- ctapi-cyberjack-2.0.8.org/pcsc/Makefile 2005-02-15 00:59:03.000000000 +0100 -+++ ctapi-cyberjack-2.0.8/pcsc/Makefile 2006-05-01 10:55:41.000000000 +0200 -@@ -20,7 +18,7 @@ - install -o root -g root libcyberjack_ifd.so $(INSTALL_PREFIX)/lib +diff -Naur ctapi-cyberjack-2.0.10.org/pcsc/Makefile ctapi-cyberjack-2.0.10/pcsc/Makefile +--- ctapi-cyberjack-2.0.10.org/pcsc/Makefile 2006-05-27 12:40:17.000000000 +0200 ++++ ctapi-cyberjack-2.0.10/pcsc/Makefile 2006-05-27 13:19:27.000000000 +0200 +@@ -24,7 +24,7 @@ + install -o root -g root $(PLUGDIR)/PkgInfo $(INSTALL_PREFIX)/lib/pcsc/drivers/$(PLUGDIR)/PkgInfo libso: $(OBJS) -- ld -x --shared -lusb -o libcyberjack_ifd.so $(OBJS) -+ ld -x --shared -lusb -lc -soname libcyberjack_ifd.so -o libcyberjack_ifd.so $(OBJS) +- ld -x --shared -lusb -o $(PLUGDIR)/Linux/ifd-cyberjack.so $(OBJS) ++ ld -x --shared -lusb -lc -soname ifd-cyberjack.so -o $(PLUGDIR)/Linux/ifd-cyberjack.so $(OBJS) liba: $(OBJS) ar r libcyberjack_ifd.a $(OBJS) $(CTOBJS) From fedora-extras-commits at redhat.com Sat May 27 11:48:56 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 04:48:56 -0700 Subject: rpms/gcfilms/FC-5 .cvsignore, 1.5, 1.6 gcfilms.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200605271148.k4RBmwto008210@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8189 Modified Files: .cvsignore gcfilms.spec sources Log Message: Preparation of 6.2 for FC-5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Feb 2006 13:37:13 -0000 1.5 +++ .cvsignore 27 May 2006 11:48:56 -0000 1.6 @@ -1 +1 @@ -gcfilms-6.1.tar.gz +gcfilms-6.2.tar.gz Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-5/gcfilms.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gcfilms.spec 27 Feb 2006 20:00:24 -0000 1.10 +++ gcfilms.spec 27 May 2006 11:48:56 -0000 1.11 @@ -1,6 +1,6 @@ Name: gcfilms -Version: 6.1 -Release: 2%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: Movies collection management Group: Applications/Databases @@ -97,6 +97,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat May 27 2006 Tian - 6.2-1 + - New upstream version. * Mon Feb 27 2006 Tian - 6.1-2 - New version because of a problem on build systems (use of lib64 instead of lib on x86 systems) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcfilms/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Feb 2006 13:23:14 -0000 1.7 +++ sources 27 May 2006 11:48:56 -0000 1.8 @@ -1 +1 @@ -03da9f046268672f3f71c9887e2adbf3 gcfilms-6.1.tar.gz +933333293c4907aa33b3d52a7c022d9b gcfilms-6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 27 11:56:44 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sat, 27 May 2006 04:56:44 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec,1.2,1.3 Message-ID: <200605271156.k4RBukqm008320@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8303 Modified Files: ctapi-cyberjack.spec Log Message: - wrong spec files was used:( Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ctapi-cyberjack.spec 27 May 2006 11:48:00 -0000 1.2 +++ ctapi-cyberjack.spec 27 May 2006 11:56:43 -0000 1.3 @@ -1,46 +1,46 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.10 -Release: 1_FC4 -BuildRequires: libusb, readline-devel, ncurses-devel, kernel-devel +Release: 2%{?dist} +Requires: %{_libdir}/ctapi +#kernel-devel needed for workaround bug 191515 +#For FC>4 +BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 kernel-devel +#For FC4 +#BuildRequires: libusb-devel readline-devel kernel-devel + +URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.10/ctapi-cyberjack-2.0.10.tar.bz2 License: LGPL -Group: System Environment/Libraries +Group: Development/Libraries Source: %{name}-%{version}.tar.bz2 -Patch0: ctapi-cyberjack-2.0.4-rh73_old_libusb.patch -Buildroot: %{_tmppath}/ctapi-cyberjack-%{version}-%{release}-root - -#%define prefix /usr -#%define lib_dir %{prefix}/lib -%define readers_dir %{_libdir}/readers - -%package ifd-handler -Summary: cyberjack PC/SC IFD handler for pcsc-lite -Requires: %{name} = %{version} -Group: System Environment/Libraries - -%description ifd-handler -REINER SCT cyberJack pinpad/e-com USB user space driver - -This package includes the PC/SC IFD handler driver for the cyberJack -pinpad/e-com USB chipcard reader. - +Patch0: ctapi-cyberjack_MakefileCtAPI.patch +Patch1: ctapi-cyberjack_MakefilePCSC.patch +Patch2: ctapi-cyberjack_Bug_191515.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +#for FC4 +#%%define readers_dir %{_libdir}/readers/ifd-cyberjack.bundle/Contents +#for FC>4 +%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir)/ifd-cyberjack.bundle/Contents %package devel Summary: Development files for libctapi-cyberjack Requires: %{name} = %{version} Group: Development/Libraries +%package pcsc +Summary: PC/SC Module +Requires: pcsc-lite +Group: Development/Libraries +Provides: pcsc-ifd-handler + %description REINER SCT cyberJack pinpad/e-com USB user space driver This package includes the CT-API driver for the cyberJack pinpad/e-com USB chipcard reader. -This package changes the permissions of /dev/ttyUSB devices 0-3 to -2666. This gives the users the possibility to access the devices and -enables mandatory locking. - The kernel side driver is included in the official linux kernel starting with version 2.4.6. @@ -49,111 +49,183 @@ controllers. For more information about the reader, software updates and a shop see -http://www.reiner-sct.com/ +http://www.reiner-sct.com + + WARNING +Use the tool ctsh only when you know what you are doing!!! +Or you can damage your SmartCard!!! + + Hint +When using the CT-API lib you must first stop the PC/SC daemon, +when you use it. %description devel Development files for libctapi-cyberjack +%description pcsc +Files for the PC/SC system. + %prep %setup -q -n %{name}-%{version} +#fix path for the driver lib the config file +# sed -i "s\/usr/lib/readers/libcyberjack_ifd.so\%{readers_dir}/libcyberjack_ifd.so\1" \ +# etc/reader.conf + +#fix reader.conf for FC>4 +# sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf + +%patch0 -p1 +%patch1 -p1 + +#fix for bug 191515 +%patch2 -p1 +sed -i "s|XX|%(uname -r)|1" makevars + %build -##Fedora korrektur -sed -e "s/CFLAGS+=\ -I\/usr\/local\/include\ -I\/usr\/include/CFLAGS+=\ -I\/usr\/local\/include\ -I\/lib\/modules\/$(uname -r)\/source\/include\ -I\/usr\/include/g" makevars >makevars.neu -mv makevars.neu makevars -make +#make %{?_smp_mflags} will fail!!! +make %install -if [ -n "%{buildroot}" ] ; then - [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -fi +rm -rf $RPM_BUILD_ROOT + # CT-API -mkdir -p %{buildroot}/%{readers_dir} -install -m 755 ctapi/libctapi-cyberjack.so %{buildroot}/%{readers_dir}/libctapi-cyberjack.so.%{version} -install -m 755 ctapi/libctapi-cyberjack.a %{buildroot}/%{readers_dir}/libctapi-cyberjack.a -( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so.%{version} libctapi-cyberjack.so ) -( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so libctapi.so ) -( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi.so libctapi.so ) -( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi-cyberjack.a libctapi-cyberjack.a ) -mkdir -p %{buildroot}/%{_includedir} -install -m 644 ctapi/include/ctapi.h %{buildroot}/%{_includedir}/ctapi.h -mkdir -p %{buildroot}/%{_bindir} -install -m 755 tools/cjgeldkarte %{buildroot}/%{_bindir}/cjgeldkarte -install -m 755 tools/ctsh %{buildroot}/%{_bindir}/ctsh +mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi +mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack +mkdir -p $RPM_BUILD_ROOT%{_bindir} +install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{_libdir}/ctapi/libctapi-cyberjack.so +install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h +install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/cjgeldkarte +install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ctsh + # PC/SC -#mkdir -p %{buildroot}/%{readers_dir} -mkdir -p %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux -install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so %{buildroot}/%{readers_dir}/libcyberjack_ifd.so.%{version} -install -m 444 pcsc/ifd-cyberjack.bundle/Contents/Info.plist %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist -install -m 444 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo -( cd %{buildroot}/%{readers_dir}; ln -s libcyberjack_ifd.so.%{version} libcyberjack_ifd.so ) -( cd %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux; ln -s %{readers_dir}/libcyberjack_ifd.so cyberjack-ifd.so ) -mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d -install -m 644 etc/reader.conf %{buildroot}%{_sysconfdir}/reader.conf.d/cyberjack.conf - -%pre -groupadd -r cyberjack 2>/dev/null || : - -%post ifd-handler -/usr/sbin/update-reader.conf - -%post -if [ -e /dev/ttyUSB0 ] ; then - chmod 2666 /dev/ttyUSB0 -else - mknod -m 2666 /dev/ttyUSB0 c 188 0 -fi -if [ -e /dev/ttyUSB1 ] ; then - chmod 2666 /dev/ttyUSB1 -else - mknod -m 2666 /dev/ttyUSB1 c 188 1 -fi -if [ -e /dev/ttyUSB2 ] ; then - chmod 2666 /dev/ttyUSB2 -else - mknod -m 2666 /dev/ttyUSB2 c 188 2 -fi -if [ -e /dev/ttyUSB3 ] ; then - chmod 2666 /dev/ttyUSB3 -else - mknod -m 2666 /dev/ttyUSB3 c 188 3 -fi +install -d -m 755 $RPM_BUILD_ROOT%{readers_dir}/Linux +install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so $RPM_BUILD_ROOT%{readers_dir}/Linux/ifd-cyberjack.so +install -m 644 pcsc/ifd-cyberjack.bundle/Contents/Info.plist $RPM_BUILD_ROOT%{readers_dir}/Info.plist +install -m 644 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo $RPM_BUILD_ROOT%{readers_dir}/PkgInfo + +#install -m 755 pcsc/libcyberjack_ifd.so $RPM_BUILD_ROOT%{readers_dir}/libcyberjack_ifd.so +#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d +#install -m 444 etc/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/cyberjack.conf + +%post pcsc +#register PC/SC driver and restart daemon +/sbin/service pcscd condrestart||: + +%postun pcsc +#unregister PC/SC driver and restart daemon +/sbin/service pcscd condrestart||: + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %clean -if [ -n "%{buildroot}" ] ; then - [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -fi +rm -rf $RPM_BUILD_ROOT %files -%defattr(0644,root,root) -%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.pdf doc/README.html doc/README.txt MAKEUSBDEV tools/ctshrc.example +%doc COPYRIGHT* +%doc doc/README.txt +%doc doc/README.pdf +%doc doc/README.html + +%defattr(-,root,root,-) # CT-API -%{readers_dir}/libctapi-cyberjack.so.%{version} -%{readers_dir}/libctapi-cyberjack.so -%{readers_dir}/libctapi.so -%{_libdir}/libctapi.so -%attr(0755,root,root) %{_bindir}/cjgeldkarte -%attr(0755,root,root) %{prefix}/bin/ctsh +%{_libdir}/ctapi/libctapi-cyberjack.so +%{_bindir}/cjgeldkarte +%{_bindir}/ctsh +%files pcsc # PC/SC -%files ifd-handler -/%{readers_dir}/libcyberjack_ifd.so.%{version} -/%{readers_dir}/libcyberjack_ifd.so -%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo -%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist -%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux/cyberjack-ifd.so -%{_sysconfdir}/reader.conf.d/cyberjack.conf +%defattr(755,root,root) +/%{readers_dir}/Linux/* +%attr(0644,root,root)/%{readers_dir}/Info.plist + %attr(0644,root,root)/%{readers_dir}/PkgInfo +#%attr(644,root,root) %config(noreplace) %{_sysconfdir}/reader.conf.d/cyberjack.conf %files devel %defattr(0644,root,root) -%{_includedir}/ctapi.h -%{readers_dir}/libctapi-cyberjack.a -%{_libdir}/libctapi-cyberjack.a - -%changelog -n ctapi-cyberjack -* Mon May 30 2005 - Harald Welte -+ ctapi-cyberjack-2.0.9-1 -- add pcsc-lite 'dropdir' compatible PC/SC driver +%{_includedir}/ctapi-cyberjack/ctapi.h + +%changelog +* Sat May 27 2006 Frank B??ttner - 2.0.10-2%{?dist} +- add "Provides:pcsc-ifd-handler" for the PC/SC part + +* Fri May 12 2006 Frank B??ttner - 2.0.10-1%{?dist} +- update driver to 2.0.10 +- readers.conf now unnessery + +* Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} +- rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to + libcyberjack_ifd.so +- fix place for the comments of /sbin/service pcscd condrestart + +* Wed May 10 2006 Frank B??ttner - 2.0.8-12%{?dist} +- fix comments for %%post/%%postun pcsc +- fix call of restart the PC/SC daemon +- move to the old version of dependency for the PC/SC package +- add -soname option in PS/SC driver + +* Tue May 9 2006 Frank B??ttner - 2.0.8-11%{?dist} +- remove comments at %%post and %%postun +- remove unneeded /usr/sbin/update-reader.conf call + +* Mon May 8 2006 Frank B??ttner - 2.0.8-10%{?dist} +- fix ldconfig for the PC/SC part +- fix dependency for the PC/SC package +- fix build dependency for the package. + +* Mon May 8 2006 Frank B??ttner - 2.0.8-9%{?dist} +- restart PC/SC daemon only when it run's +- fix CT-API version bug so that apps can find it in the ldcache via + libctapi-cyberjack.so +- add comment about using CT-API and PC/SC together + +* Sun May 7 2006 Frank B??ttner - 2.0.8-8%{?dist} +- add requirement of the ctapi dir under %{_libdir} +- the CT-API lib lives now under %{_libdir}/ctapi +- reenable link the ctapi driver static in the PC/SC part +- run ldconfig after install/uninstall + +* Mon May 1 2006 Frank B??ttner - 2.0.8-7%{?dist} +- fix permission of ctapi-cyberjack-2.0.8.tar.bz2 and ctapi-cyberjack.spec +- fix permisson of the PC/SC config file +- restart PC/SC daemon after remove the PS/SC driver + +* Sun Apr 30 2006 Frank B??ttner - 2.0.8-6%{?dist} +- replace if statements with comments +- replace german to english comments +- fix the makefile for the CT-API lib +- correct naming the libs CT-API and PS/SC +- rename package PS/SC to pcsc +- replace RPM_BUILD_ROOT +- fix doc +- add warning for the tool ctsh + +* Thu Apr 27 2006 Frank B??ttner - 2.0.8-5%{dist} +- fix owner of lib's +- add PC/SC fix for FC5 +- restart pcscd + +* Thu Apr 27 2006 Frank B??ttner - 2.0.8-4%{dist} +- change permisson of all lib's to 0755 +- rename lib files to support more reader's +- fix the path of the CT-API part and the devel file +- support FC4 and FC5 + +* Sat Apr 15 2006 Frank B??ttner - 2.0.8-3%{dist} +- remove makefile workaround + +* Sat Apr 15 2006 Frank B??ttner - 2.0.8-2%{dist} +- remove packager +- remove hardcodet Fedora Tag +- rename file from ctapi-cyberjack-version to ctapi-cyberjack +- modify source URL +- fix clean section + +* Sat Apr 08 2006 Frank B??ttner - 2.0.8-1.FC4 +- start for Fedora +- sepperate the PC/SC part * Wed Mar 02 2005 - Harald Welte + ctapi-cyberjack-2.0.8-1 From fedora-extras-commits at redhat.com Sat May 27 12:19:19 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sat, 27 May 2006 05:19:19 -0700 Subject: rpms/ctapi-cyberjack/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605271219.k4RCJLWo010766@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10747 Modified Files: .cvsignore sources Log Message: I hope that now the correct files will be used for the devel build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 May 2006 14:40:35 -0000 1.2 +++ .cvsignore 27 May 2006 12:19:19 -0000 1.3 @@ -1 +1 @@ -ctapi-cyberjack-2.0.8.tar.bz2 +ctapi-cyberjack-2.0.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 May 2006 14:40:35 -0000 1.2 +++ sources 27 May 2006 12:19:19 -0000 1.3 @@ -1 +1 @@ -01283c7e5495d045c00dcde0593dcc55 ctapi-cyberjack-2.0.8.tar.bz2 +339b4a1b2117550c0be92e5609f0729e ctapi-cyberjack-2.0.10.tar.bz2 From fedora-extras-commits at redhat.com Sat May 27 13:36:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:36:39 -0700 Subject: rpms/asymptote/devel - New directory Message-ID: <200605271336.k4RDafLk013403@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13374/asymptote/devel Log Message: Directory /cvs/extras/rpms/asymptote/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 13:36:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:36:39 -0700 Subject: rpms/asymptote - New directory Message-ID: <200605271336.k4RDaf4j013400@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13374/asymptote Log Message: Directory /cvs/extras/rpms/asymptote added to the repository From fedora-extras-commits at redhat.com Sat May 27 13:36:55 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:36:55 -0700 Subject: rpms/asymptote Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605271336.k4RDavUO013447@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13419 Added Files: Makefile import.log Log Message: Setup of module asymptote --- NEW FILE Makefile --- # Top level Makefile for module asymptote all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 13:36:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:36:56 -0700 Subject: rpms/asymptote/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605271336.k4RDawfe013450@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13419/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module asymptote --- NEW 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 May 27 13:37:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:37:39 -0700 Subject: rpms/asymptote import.log,1.1,1.2 Message-ID: <200605271337.k4RDbffF013529@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13494 Modified Files: import.log Log Message: auto-import asymptote-1.06-3 on branch devel from asymptote-1.06-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/asymptote/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 13:36:55 -0000 1.1 +++ import.log 27 May 2006 13:37:39 -0000 1.2 @@ -0,0 +1 @@ +asymptote-1_06-3:HEAD:asymptote-1.06-3.src.rpm:1148737051 From fedora-extras-commits at redhat.com Sat May 27 13:37:40 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:37:40 -0700 Subject: rpms/asymptote/devel asy-init.el, NONE, 1.1 asymptote-1.05-docdir.patch, NONE, 1.1 asymptote.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605271337.k4RDbgLs013536@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13494/devel Modified Files: .cvsignore sources Added Files: asy-init.el asymptote-1.05-docdir.patch asymptote.spec Log Message: auto-import asymptote-1.06-3 on branch devel from asymptote-1.06-3.src.rpm --- NEW FILE asy-init.el --- (autoload 'asy-mode "asy-mode.el" "Asymptote major mode." t) (add-to-list 'auto-mode-alist '("\\.asy$" . asy-mode)) asymptote-1.05-docdir.patch: --- NEW FILE asymptote-1.05-docdir.patch --- diff -ruN asymptote-1.05-orig/configure asymptote-1.05/configure --- asymptote-1.05-orig/configure 2006-05-19 05:58:44.000000000 +0100 +++ asymptote-1.05/configure 2006-05-22 18:45:18.000000000 +0100 @@ -1438,7 +1438,7 @@ cat >>confdefs.h <<_ACEOF -#define ASYMPTOTE_DOCDIR "$Datadir/doc/asymptote" +#define ASYMPTOTE_DOCDIR "$Datadir/doc/asymptote-$VERSION" _ACEOF diff -ruN asymptote-1.05-orig/configure.ac asymptote-1.05/configure.ac --- asymptote-1.05-orig/configure.ac 2006-05-19 05:58:42.000000000 +0100 +++ asymptote-1.05/configure.ac 2006-05-22 18:44:22.000000000 +0100 @@ -37,7 +37,7 @@ AC_SUBST(latexdir) AC_DEFINE_UNQUOTED(ASYMPTOTE_SYSDIR,"$Datadir/asymptote", [System directory for global .asy files]) -AC_DEFINE_UNQUOTED(ASYMPTOTE_DOCDIR,"$Datadir/doc/asymptote", +AC_DEFINE_UNQUOTED(ASYMPTOTE_DOCDIR,"$Datadir/doc/asymptote-$VERSION", [Directory for documentation]) AC_CONFIG_SRCDIR([absyn.cc]) diff -ruN asymptote-1.05-orig/Makefile.in asymptote-1.05/Makefile.in --- asymptote-1.05-orig/Makefile.in 2006-05-18 06:44:26.000000000 +0100 +++ asymptote-1.05/Makefile.in 2006-05-22 18:46:07.000000000 +0100 @@ -38,7 +38,7 @@ mandir = $(DESTDIR)@mandir@ datadir = $(DESTDIR)@datadir@ asydir = $(datadir)/asymptote -docdir = $(datadir)/doc/asymptote +docdir = $(datadir)/doc/asymptote- at VERSION@ exampledir = $(docdir)/examples animationsdir = $(exampledir)/animations latexdir = $(DESTDIR)@latexdir@ --- NEW FILE asymptote.spec --- %{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} %define emacs_sitelisp %{_datadir}/emacs/site-lisp %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote Version: 1.06 Release: 3%{?dist} Summary: Descriptive vector graphics language Group: Development/Tools License: GPL URL: http://asymptote.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.tar.gz Source1: asy-init.el Patch: asymptote-1.05-docdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: fftw-devel >= 3.0 BuildRequires: gc-devel >= 6.7 BuildRequires: gsl-devel BuildRequires: tetex-latex BuildRequires: ghostscript BuildRequires: texinfo Requires: tetex-latex Requires: tkinter Requires(post): /usr/bin/texhash Requires(postun): /usr/bin/texhash %define texpkgdir %{_texmf}/tex/latex/%{name} %description Asymptote is a powerful descriptive vector graphics language for technical drawings, inspired by MetaPost but with an improved C++-like syntax. Asymptote provides for figures the same high-quality level of typesetting that LaTeX does for scientific text. %prep %setup -q %patch -p1 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy %build %configure --enable-gc=system make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -p -m 644 BUGS ChangeLog LICENSE README ReleaseNotes TODO \ $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/ # Emacs/Xemacs mode and init files install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ for dir in %{emacs_sitelisp} %{xemacs_sitelisp} ; do install -dm 755 $RPM_BUILD_ROOT$dir/site-start.d ln -s %{_datadir}/%{name}/asy-mode.el $RPM_BUILD_ROOT$dir touch $RPM_BUILD_ROOT$dir/asy-mode.elc ln -s %{_datadir}/%{name}/asy-init.el $RPM_BUILD_ROOT$dir/site-start.d touch $RPM_BUILD_ROOT$dir/site-start.d/asy-init.elc done # Vim syntax file for vimver in 63 64 70 ; do install -dm 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax ln -s %{_datadir}/%{name}/asy.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax done %clean rm -rf $RPM_BUILD_ROOT %post texhash >/dev/null 2>&1 || : %postun texhash >/dev/null 2>&1 || : %triggerin -- emacs-common [ -d %{emacs_sitelisp} ] && \ ln -sf %{_datadir}/%{name}/asy-mode.el %{emacs_sitelisp} || : [ -d %{emacs_sitelisp}/site-start.d ] && \ ln -sf %{_datadir}/%{name}/asy-init.el %{emacs_sitelisp}/site-start.d || : %triggerin -- xemacs-common [ -d %{xemacs_sitelisp} ] && \ ln -sf %{_datadir}/%{name}/asy-mode.el %{xemacs_sitelisp} || : [ -d %{xemacs_sitelisp}/site-start.d ] && \ ln -sf %{_datadir}/%{name}/asy-init.el %{xemacs_sitelisp}/site-start.d || : %triggerun -- emacs-common [ $2 = 0 ] && rm -f %{emacs_sitelisp}/{asy-mode.el*,site-start.d/asy-init.el*} || : %triggerun -- xemacs-common [ $2 = 0 ] && rm -f %{xemacs_sitelisp}/{asy-mode.el*,site-start.d/asy-init.el*} || : %triggerin -- vim-common VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \ ln -sf %{_datadir}/%{name}/asy.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || : %triggerun -- vim-common VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` [ $2 = 0 ] && rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/asy.vim || : %triggerpostun -- vim-common VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'` if [ $1 = 1 ]; then rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/asy.vim || : [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \ ln -sf %{_datadir}/%{name}/asy.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || : fi %files %defattr(-,root,root,-) %doc %{_defaultdocdir}/%{name}-%{version}/ %{_bindir}/* %{_datadir}/%{name}/ %{texpkgdir}/ %{_mandir}/man1/*.1* %ghost %{_datadir}/*emacs %ghost %{_datadir}/vim/ %changelog * Sat May 27 2006 Jose Pedro Oliveira - 1.06-3 - Emacs/Xemacs init file (#193154 comment 6). * Fri May 26 2006 Jose Pedro Oliveira - 1.06-2 - Directories ownership (#193154). * Wed May 24 2006 Jose Pedro Oliveira - 1.06-1 - Update to 1.06. - Using triggers to install the Vim syntax file and the Emacs/Xemacs mode file. * Mon May 22 2006 Jose Pedro Oliveira - 1.05-1 - Update to 1.05. * Sun May 7 2006 Jose Pedro Oliveira - 1.04-1 - Update to 1.04. * Fri Mar 31 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. * Thu Mar 23 2006 Jose Pedro Oliveira - 1.02-1 - First build. # vim:set ai ts=4 sw=4 sts=4 et: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 13:36:55 -0000 1.1 +++ .cvsignore 27 May 2006 13:37:40 -0000 1.2 @@ -0,0 +1 @@ +asymptote-1.06.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 13:36:55 -0000 1.1 +++ sources 27 May 2006 13:37:40 -0000 1.2 @@ -0,0 +1 @@ +3dc87ce18034ee8c44e0cdbd49c126d2 asymptote-1.06.tar.gz From fedora-extras-commits at redhat.com Sat May 27 13:53:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:53:33 -0700 Subject: rpms/asymptote/devel asymptote.spec,1.1,1.2 Message-ID: <200605271353.k4RDrZCI013643@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13626 Modified Files: asymptote.spec Log Message: Group: Applications/Publishing Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- asymptote.spec 27 May 2006 13:37:40 -0000 1.1 +++ asymptote.spec 27 May 2006 13:53:33 -0000 1.2 @@ -5,10 +5,10 @@ Name: asymptote Version: 1.06 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Descriptive vector graphics language -Group: Development/Tools +Group: Applications/Publishing License: GPL URL: http://asymptote.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.tar.gz @@ -135,6 +135,9 @@ %changelog +* Sat May 27 2006 Jose Pedro Oliveira - 1.06-4 +- Group: Development/Tools -> Applications/Publishing (#193154). + * Sat May 27 2006 Jose Pedro Oliveira - 1.06-3 - Emacs/Xemacs init file (#193154 comment 6). From fedora-extras-commits at redhat.com Sat May 27 13:57:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 27 May 2006 06:57:01 -0700 Subject: owners owners.list,1.1063,1.1064 Message-ID: <200605271357.k4RDv3MP013732@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13715 Modified Files: owners.list Log Message: New package: asymptote (#193154) Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1063 retrieving revision 1.1064 diff -u -r1.1063 -r1.1064 --- owners.list 27 May 2006 07:16:15 -0000 1.1063 +++ owners.list 27 May 2006 13:57:01 -0000 1.1064 @@ -56,6 +56,7 @@ Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|aspell-he|Hebrew dictionary for Aspell (Hspell-based)|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| +Fedora Extras|asymptote|Descriptive vector graphics language|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat May 27 17:08:30 2006 From: fedora-extras-commits at redhat.com (Christian Jodar (tian)) Date: Sat, 27 May 2006 10:08:30 -0700 Subject: rpms/gcfilms/devel .cvsignore, 1.5, 1.6 gcfilms.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200605271708.k4RH8WFS023748@cvs-int.fedora.redhat.com> Author: tian Update of /cvs/extras/rpms/gcfilms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23727 Modified Files: .cvsignore gcfilms.spec sources Log Message: Updated to 6-2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Feb 2006 13:37:13 -0000 1.5 +++ .cvsignore 27 May 2006 17:08:30 -0000 1.6 @@ -1 +1 @@ -gcfilms-6.1.tar.gz +gcfilms-6.2.tar.gz Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/gcfilms.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gcfilms.spec 27 Feb 2006 20:00:24 -0000 1.10 +++ gcfilms.spec 27 May 2006 17:08:30 -0000 1.11 @@ -1,6 +1,6 @@ Name: gcfilms -Version: 6.1 -Release: 2%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: Movies collection management Group: Applications/Databases @@ -97,6 +97,8 @@ %{_datadir}/mime/packages/%{name}.xml %changelog +* Sat May 27 2006 Tian - 6.2-1 + - New upstream version. * Mon Feb 27 2006 Tian - 6.1-2 - New version because of a problem on build systems (use of lib64 instead of lib on x86 systems) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Feb 2006 13:23:14 -0000 1.7 +++ sources 27 May 2006 17:08:30 -0000 1.8 @@ -1 +1 @@ -03da9f046268672f3f71c9887e2adbf3 gcfilms-6.1.tar.gz +63a29b3f30c21a6116e41bf057ceb2e9 gcfilms-6.2.tar.gz From fedora-extras-commits at redhat.com Sat May 27 17:09:47 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 10:09:47 -0700 Subject: extras-repoclosure rc-run.py,1.4,1.5 Message-ID: <200605271709.k4RH9lM8023817@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-repoclosure In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23799 Modified Files: rc-run.py Log Message: adjust to new repository structure of Fedora Core Development Index: rc-run.py =================================================================== RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rc-run.py 19 May 2006 22:50:18 -0000 1.4 +++ rc-run.py 27 May 2006 17:09:45 -0000 1.5 @@ -23,18 +23,16 @@ repos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'], '4' : ['fedora-core','fedora-core-updates','fedora-extras'], '5' : ['fedora-core','fedora-core-updates','fedora-extras'], - 'development' : ['fedora-core-development','fedora-extras'] + 'development' : ['fedora-core','fedora-extras'] } reponames = { 'fedora-core' : 'Fedora Core', - 'fedora-core-development' : 'Fedora Core Development Tree', 'fedora-core-updates' : 'Fedora Core Released Updates', 'fedora-extras' : 'Fedora Extras' } # (%s, %s) = (release, arch) baseurls = { 'fedora-core' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/os/', - 'fedora-core-development' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/', 'fedora-core-updates' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/updates/%s/%s/', 'fedora-extras' : 'file:///srv/rpmbuild/extras/tree/extras/%s/%s/' } From fedora-extras-commits at redhat.com Sat May 27 20:39:44 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:39:44 -0700 Subject: rpms/perl-XML-Stream/devel - New directory Message-ID: <200605272039.k4RKdkM8031662@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633/perl-XML-Stream/devel Log Message: Directory /cvs/extras/rpms/perl-XML-Stream/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 20:39:44 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:39:44 -0700 Subject: rpms/perl-XML-Stream - New directory Message-ID: <200605272039.k4RKdkwc031659@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633/perl-XML-Stream Log Message: Directory /cvs/extras/rpms/perl-XML-Stream added to the repository From fedora-extras-commits at redhat.com Sat May 27 20:39:51 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:39:51 -0700 Subject: rpms/perl-XML-Stream Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605272039.k4RKdr0a031711@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31678 Added Files: Makefile import.log Log Message: Setup of module perl-XML-Stream --- NEW FILE Makefile --- # Top level Makefile for module perl-XML-Stream all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 20:39:52 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:39:52 -0700 Subject: rpms/perl-XML-Stream/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605272039.k4RKdsk9031714@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31678/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-XML-Stream --- NEW 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 May 27 20:40:19 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:40:19 -0700 Subject: rpms/perl-XML-Stream import.log,1.1,1.2 Message-ID: <200605272040.k4RKepJK031790@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31752 Modified Files: import.log Log Message: auto-import perl-XML-Stream-1.22-4.fc5 on branch devel from perl-XML-Stream-1.22-4.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 20:39:51 -0000 1.1 +++ import.log 27 May 2006 20:40:19 -0000 1.2 @@ -0,0 +1 @@ +perl-XML-Stream-1_22-4_fc5:HEAD:perl-XML-Stream-1.22-4.fc5.src.rpm:1148762416 From fedora-extras-commits at redhat.com Sat May 27 20:40:19 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:40:19 -0700 Subject: rpms/perl-XML-Stream/devel LICENSING.correspondance, NONE, 1.1 perl-XML-Stream.spec, NONE, 1.1 tests.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605272040.k4RKeqZZ031794@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31752/devel Modified Files: .cvsignore sources Added Files: LICENSING.correspondance perl-XML-Stream.spec tests.patch Log Message: auto-import perl-XML-Stream-1.22-4.fc5 on branch devel from perl-XML-Stream-1.22-4.fc5.src.rpm --- NEW FILE LICENSING.correspondance --- The licensing for this module is interesting -- the documentation of the module states that the license is Perl (aka GPL or Artistic), whereas the files have LGPL headers and the tarball includes the text of the LGPL itself. Given the author's response, my assessment is that this software is triple licensed: It may be used under the terms of the GPL, LGPL, or Artistic license, at your option. From: Ryan Eatmon To: Chris Weyl Date: May 22, 2006 6:03 PM Subject: Re: Net::XMPP license question Whatever. I don't actually care one way or the other. Go right ahead. Chris Weyl wrote: > Sorry to keep on bugging you, but would it be OK for me to strip out > the LGPL licensing statements? > > Or is this software triple licensed? e.g. Perl (GPL or Artistic), LGPL? > > Thanks :) > -Chris > > On 5/15/06, Chris Weyl wrote: >> If this code isn't meant to also be licensed under the LGPL, would it >> be ok with you for me to patch the LGPL statements out for the version >> released under fedora extras? >> >> -Chris >> >> On 5/14/06, Ryan Eatmon wrote: >> > >> > Yep. >> > >> > >> > Chris Weyl wrote: >> > > Hey Ryan-- >> > > >> > > Quick question. I'm in the middle of packaging up Net::XMPP (and for >> > > that matter, XML::Stream and Net::Jabber) for fedora extras, and it >> > > was pointed out to me that while Net/XMPP.pm states "COPYRIGHT: This >> > > module is free software, you can redistribute it and/or modify it >> > > under the same terms as Perl itself", the actual archive includes a >> > > LICENSE.LGPL. >> > > >> > > Are all three of these modules under "the same terms as Perl itself"? >> > > >> > > Thanks:) >> > > -Chris >> > >> > >> > -- >> > Ryan Eatmon >> > reatmon at jabber.org >> > >> >> >> -- >> Chris Weyl >> Ex astris, scientia >> > > -- Ryan Eatmon reatmon at jabber.org --- NEW FILE perl-XML-Stream.spec --- # $Id$ Name: perl-XML-Stream Version: 1.22 Release: 4%{?dist} Summary: XML::Stream - streaming XML library Group: Development/Libraries License: GPL or Artistic or LGPL URL: http://search.cpan.org/dist/XML-Stream/ Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/XML-Stream-%{version}.tar.gz Source1: LICENSING.correspondance Patch0: tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl, perl(Authen::SASL), perl(MIME::Base64) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides the user with methods to connect to a remote server, send a stream of XML to the server, and receive/parse an XML stream from the server. It is primarily based work for the Etherx XML router developed by the Jabber Development Team. For more information about this project visit http://etherx.jabber.org/stream/. XML::Stream gives the user the ability to define a central callback that will be used to handle the tags received from the server. These tags are passed in the format defined at instantiation time. the closing tag of an object is seen, the tree is finished and passed to the call back function. What the user does with it from there is up to them. For a detailed description of how this module works, and about the data structure that it returns, please view the source of Stream.pm and look at the detailed description at the end of the file. %prep %setup -q -n XML-Stream-%{version} %patch0 cp %{SOURCE1} . # generate our other two licenses... perldoc perlgpl > LICENSE.GPL perldoc perlartistic > LICENSE.Artistic %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w %{buildroot}/* #%check # builders are (or may be) firewalled #make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES README INFO LICENSE.* LICENSING* %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu May 25 2006 Chris Weyl 1.22-4 - include license text, including generated ones - include correspondance with the module's author * Wed May 24 2006 Chris Weyl 1.22-3 - update license to triple licensed, based on conversations with upstream * Mon May 15 2006 Chris Weyl 1.22-2 - add CHANGES, README, INFO to docs * Fri May 12 2006 Chris Weyl 1.22-1 - first f-e spec. - patched the tests to try to connect to the gtalk jabber servers, since the default one seemed to be "non-funct" tests.patch: --- NEW FILE tests.patch --- --- t/tcpip2ssl.t.orig 2006-05-12 09:42:01.727128761 -0700 +++ t/tcpip2ssl.t 2006-05-12 09:42:33.223423261 -0700 @@ -15,7 +15,7 @@ SKIP: { - my $status = $stream->Connect(hostname=>"obelisk.net", + my $status = $stream->Connect(hostname=>"talk.google.com", port=>5223, namespace=>"jabber:client", connectiontype=>"tcpip", Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 20:39:52 -0000 1.1 +++ .cvsignore 27 May 2006 20:40:19 -0000 1.2 @@ -0,0 +1 @@ +XML-Stream-1.22.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 20:39:52 -0000 1.1 +++ sources 27 May 2006 20:40:19 -0000 1.2 @@ -0,0 +1 @@ +ae09400fac17eaea4c9b12283db06881 XML-Stream-1.22.tar.gz From fedora-extras-commits at redhat.com Sat May 27 20:43:06 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 27 May 2006 13:43:06 -0700 Subject: rpms/perl-XML-Stream/devel perl-XML-Stream.spec,1.1,1.2 Message-ID: <200605272043.k4RKh8l3031862@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-XML-Stream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31845 Modified Files: perl-XML-Stream.spec Log Message: Bump release Index: perl-XML-Stream.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-Stream/devel/perl-XML-Stream.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-XML-Stream.spec 27 May 2006 20:40:19 -0000 1.1 +++ perl-XML-Stream.spec 27 May 2006 20:43:06 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-XML-Stream Version: 1.22 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML::Stream - streaming XML library Group: Development/Libraries @@ -76,6 +76,9 @@ %changelog +* Sat May 27 2006 Chris Weyl 1.22-5 +- bump release, to deal with cvs-import.sh being confused by .rpmmacros + * Thu May 25 2006 Chris Weyl 1.22-4 - include license text, including generated ones - include correspondance with the module's author From fedora-extras-commits at redhat.com Sat May 27 23:53:19 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:53:19 -0700 Subject: rpms/ctorrent - New directory Message-ID: <200605272353.k4RNrLT6007270@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7249/ctorrent Log Message: Directory /cvs/extras/rpms/ctorrent added to the repository From fedora-extras-commits at redhat.com Sat May 27 23:53:19 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:53:19 -0700 Subject: rpms/ctorrent/devel - New directory Message-ID: <200605272353.k4RNrLbg007273@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7249/ctorrent/devel Log Message: Directory /cvs/extras/rpms/ctorrent/devel added to the repository From fedora-extras-commits at redhat.com Sat May 27 23:53:41 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:53:41 -0700 Subject: rpms/ctorrent Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605272353.k4RNrhaw007327@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7294 Added Files: Makefile import.log Log Message: Setup of module ctorrent --- NEW FILE Makefile --- # Top level Makefile for module ctorrent all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 27 23:53:41 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:53:41 -0700 Subject: rpms/ctorrent/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605272353.k4RNrh2h007330@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7294/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ctorrent --- NEW 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 May 27 23:54:20 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:54:20 -0700 Subject: rpms/ctorrent import.log,1.1,1.2 Message-ID: <200605272354.k4RNsMGg007391@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7358 Modified Files: import.log Log Message: auto-import ctorrent-1.3.2-3 on branch devel from ctorrent-1.3.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ctorrent/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 May 2006 23:53:41 -0000 1.1 +++ import.log 27 May 2006 23:54:19 -0000 1.2 @@ -0,0 +1 @@ +ctorrent-1_3_2-3:HEAD:ctorrent-1.3.2-3.src.rpm:1148774111 From fedora-extras-commits at redhat.com Sat May 27 23:54:20 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 27 May 2006 16:54:20 -0700 Subject: rpms/ctorrent/devel ctorrent.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605272354.k4RNsMCG007396@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/ctorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7358/devel Modified Files: .cvsignore sources Added Files: ctorrent.spec Log Message: auto-import ctorrent-1.3.2-3 on branch devel from ctorrent-1.3.2-3.src.rpm --- NEW FILE ctorrent.spec --- Name: ctorrent Version: 1.3.2 Release: 3%{?dist} Summary: BitTorrent Client written in C Group: Applications/Internet License: GPL URL: http://ctorrent.sourceforge.net Source0: http://download.sourceforge.net/ctorrent/ctorrent-1.3.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel %description CTorrent is a BitTorrent Client written in C that doesn't require any graphical component, such as an X server. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/ctorrent %doc AUTHORS README NEWS %changelog * Wed May 24 2006 Andrea Veri 1.3.2-3 - Added openssl-devel to BR - Removed libc.so.6 libc.so.6(GLIBC_2.0), libc.so.6(GLIBC_2.1) in BR - Description Changed - Fixed URL * Sun Feb 1 2004 YuHong 1.3.2 - First Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctorrent/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 May 2006 23:53:41 -0000 1.1 +++ .cvsignore 27 May 2006 23:54:20 -0000 1.2 @@ -0,0 +1 @@ +ctorrent-1.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctorrent/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 May 2006 23:53:41 -0000 1.1 +++ sources 27 May 2006 23:54:20 -0000 1.2 @@ -0,0 +1 @@ +1bc787df91285a9cec8509617c3152d6 ctorrent-1.3.2.tar.gz From fedora-extras-commits at redhat.com Sun May 28 01:08:12 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 27 May 2006 18:08:12 -0700 Subject: rpms/commoncpp2/devel .cvsignore, 1.2, 1.3 commoncpp2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605280108.k4S18EeD012621@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/commoncpp2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12600 Modified Files: .cvsignore commoncpp2.spec sources Log Message: * Sun May 28 2006 Andreas Thienemann 1.4.1-1 - Updated to 1.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Feb 2006 21:47:33 -0000 1.2 +++ .cvsignore 28 May 2006 01:08:11 -0000 1.3 @@ -1 +1 @@ -commoncpp2-1.3.23.tar.gz +commoncpp2-1.4.1.tar.gz Index: commoncpp2.spec =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/devel/commoncpp2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- commoncpp2.spec 6 Feb 2006 21:47:33 -0000 1.1 +++ commoncpp2.spec 28 May 2006 01:08:11 -0000 1.2 @@ -1,6 +1,6 @@ Summary: GNU Common C++ class framework Name: commoncpp2 -Version: 1.3.23 +Version: 1.4.1 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -70,8 +70,8 @@ %files devel %defattr(-,root,root,-) %doc doc/html -%dir %{_includedir}/cc++2 -%{_includedir}/cc++2/* +%dir %{_includedir}/cc++ +%{_includedir}/cc++/* %{_bindir}/ccgnu2-config %{_libdir}/*.so %{_libdir}/pkgconfig/libccext2.pc @@ -80,6 +80,9 @@ %{_infodir}/commoncpp2.info* %changelog +* Sun May 28 2006 Andreas Thienemann 1.4.1-1 +- Updated to 1.4.1 + * Sun Feb 05 2006 Andreas Thienemann 1.3.23-1 - Incorporated suggestions for extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/commoncpp2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Feb 2006 21:47:33 -0000 1.2 +++ sources 28 May 2006 01:08:11 -0000 1.3 @@ -1 +1 @@ -7cf53157929876054cff3234f6ffaae7 commoncpp2-1.3.23.tar.gz +4946d8c771f5f96d2951791e8ca76e23 commoncpp2-1.4.1.tar.gz From fedora-extras-commits at redhat.com Sun May 28 03:58:01 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 27 May 2006 20:58:01 -0700 Subject: rpms/gtkglarea2/FC-4 gtkglarea2.spec,1.9,1.10 Message-ID: <200605280358.k4S3w3vM017838@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglarea2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17821 Modified Files: gtkglarea2.spec Log Message: * Sun May 28 2006 Ralf Corsepius - 0.1.99.0-2 - Append %{?dist} to Release. - Rebuild. Index: gtkglarea2.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglarea2/FC-4/gtkglarea2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtkglarea2.spec 6 Apr 2005 22:11:39 -0000 1.9 +++ gtkglarea2.spec 28 May 2006 03:58:01 -0000 1.10 @@ -1,7 +1,7 @@ Summary: OpenGL GTK widget Name: gtkglarea2 Version: 1.99.0 -Release: 2 +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -60,6 +60,10 @@ %{_libdir}/pkgconfig/gtkgl-2.0.pc %changelog +* Sun May 28 2006 Ralf Corsepius - 0.1.99.0-2 +- Append %%{?dist} to Release. +- Rebuild. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Sun May 28 10:50:38 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 28 May 2006 03:50:38 -0700 Subject: rpms/gtkwave/devel gtkwave.spec,1.12,1.13 Message-ID: <200605281050.k4SAoevq002333@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2316 Modified Files: gtkwave.spec Log Message: adding missing buildreq flex Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gtkwave.spec 10 May 2006 09:12:33 -0000 1.12 +++ gtkwave.spec 28 May 2006 10:50:37 -0000 1.13 @@ -1,13 +1,13 @@ Summary: Waveform Viewer Name: gtkwave Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Sun May 28 2006 Paul Howarth 3.0.2-2 +- adding missing buildreq flex + * Wed May 10 2006 Paul Howarth 3.0.2-1 - update to 3.0.2 From fedora-extras-commits at redhat.com Sun May 28 11:11:26 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 04:11:26 -0700 Subject: owners owners.list,1.1064,1.1065 Message-ID: <200605281111.k4SBBSEN005281@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4844 Modified Files: owners.list Log Message: Added ctorrent in owner.list cvs file. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1064 retrieving revision 1.1065 diff -u -r1.1064 -r1.1065 --- owners.list 27 May 2006 13:57:01 -0000 1.1064 +++ owners.list 28 May 2006 11:11:26 -0000 1.1065 @@ -181,6 +181,7 @@ Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org| +Fedora Extras|ctorrent|BitTorrent Client written in C|bluekuja at ubuntu.com|extras-qa at fedoraproject.org| Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 28 11:35:43 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sun, 28 May 2006 04:35:43 -0700 Subject: rpms/ctapi-cyberjack/FC-4 ctapi-cyberjack.spec,1.2,1.3 Message-ID: <200605281135.k4SBZjVa005054@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5037 Modified Files: ctapi-cyberjack.spec Log Message: fix Bug 193323 Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-4/ctapi-cyberjack.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ctapi-cyberjack.spec 11 May 2006 15:49:14 -0000 1.2 +++ ctapi-cyberjack.spec 28 May 2006 11:35:43 -0000 1.3 @@ -1,7 +1,7 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.8 -Release: 13%{?dist} +Release: 14%{?dist} Requires: %{_libdir}/ctapi #For FC>4 #BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 @@ -30,6 +30,7 @@ Summary: PC/SC Module Requires: pcsc-lite Group: Development/Libraries +Provides: pcsc-ifd-handler %description REINER SCT cyberJack pinpad/e-com USB user space driver @@ -134,6 +135,9 @@ %{_includedir}/ctapi-cyberjack/ctapi.h %changelog +* Sun May 28 2006 Frank B??ttner - 2.0.8-14%{?dist} +- Add "Provides: pcsc-ifd-handler" to the PC/SC part(Bug 193323). + * Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} - rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to libcyberjack_ifd.so From fedora-extras-commits at redhat.com Sun May 28 11:49:29 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sun, 28 May 2006 04:49:29 -0700 Subject: rpms/ctapi-cyberjack/FC-5 ctapi-cyberjack.spec,1.1,1.2 Message-ID: <200605281149.k4SBnVAw005149@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5132 Modified Files: ctapi-cyberjack.spec Log Message: fix Bug 193323 Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-5/ctapi-cyberjack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctapi-cyberjack.spec 11 May 2006 14:40:35 -0000 1.1 +++ ctapi-cyberjack.spec 28 May 2006 11:49:29 -0000 1.2 @@ -1,7 +1,7 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.8 -Release: 13%{?dist} +Release: 14%{?dist} Requires: %{_libdir}/ctapi #For FC>4 BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 @@ -30,6 +30,7 @@ Summary: PC/SC Module Requires: pcsc-lite Group: Development/Libraries +Provides: pcsc-ifd-handler %description REINER SCT cyberJack pinpad/e-com USB user space driver @@ -134,6 +135,9 @@ %{_includedir}/ctapi-cyberjack/ctapi.h %changelog +* Sun May 28 2006 Frank B??ttner - 2.0.8-14%{?dist} +- Add "Provides: pcsc-ifd-handler" to the PC/SC part(Bug 193323). + * Thu May 11 2006 Frank B??ttner - 2.0.8-13%{?dist} - rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to libcyberjack_ifd.so From fedora-extras-commits at redhat.com Sun May 28 12:05:56 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 28 May 2006 05:05:56 -0700 Subject: rpms/gtorrentviewer/devel gtorrentviewer.spec,1.5,1.6 Message-ID: <200605281205.k4SC5wpd007565@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtorrentviewer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7546 Modified Files: gtorrentviewer.spec Log Message: add missing buildreq intltool Index: gtorrentviewer.spec =================================================================== RCS file: /cvs/extras/rpms/gtorrentviewer/devel/gtorrentviewer.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gtorrentviewer.spec 14 Feb 2006 09:53:40 -0000 1.5 +++ gtorrentviewer.spec 28 May 2006 12:05:56 -0000 1.6 @@ -1,6 +1,6 @@ Name: gtorrentviewer Version: 0.2b -Release: 8%{?dist} +Release: 9%{?dist} Summary: A GTK2-based viewer and editor for BitTorrent meta files Group: Applications/Internet @@ -12,7 +12,7 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -BuildRequires: curl-devel, gtk2-devel >= 2.4, desktop-file-utils, gettext +BuildRequires: curl-devel, gtk2-devel >= 2.4, desktop-file-utils, gettext, intltool %description GTorrentViewer gives you the ability to see and modify all the possible @@ -59,6 +59,9 @@ %{_mandir}/man1/gtorrentviewer.1* %changelog +* Sun May 28 2006 Paul Howarth 0.2b-9 +- add missing buildreq intltool + * Tue Feb 14 2006 Paul Howarth 0.2b-8 - cosmetic tweak: use macros instead of variables - don't use macros in command paths, hardcode them instead From fedora-extras-commits at redhat.com Sun May 28 12:45:04 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Sun, 28 May 2006 05:45:04 -0700 Subject: fedora-security/audit fc4,1.267,1.268 fc5,1.180,1.181 Message-ID: <200605281245.k4SCj4IU007665@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643 Modified Files: fc4 fc5 Log Message: Weekend updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- fc4 26 May 2006 17:22:36 -0000 1.267 +++ fc4 28 May 2006 12:45:01 -0000 1.268 @@ -4,6 +4,8 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] +CVE-2006-2660 ** kernel, fixed 2.6.10 +CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 CVE-2006-2493 ** freetype Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- fc5 26 May 2006 17:22:36 -0000 1.180 +++ fc5 28 May 2006 12:45:01 -0000 1.181 @@ -4,6 +4,8 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] +CVE-2006-2660 ** kernel, fixed 2.6.10 +CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 CVE-2006-2493 ** freetype From fedora-extras-commits at redhat.com Sun May 28 12:51:13 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:13 -0700 Subject: rpms/python-dns - New directory Message-ID: <200605281251.k4SCpF6E007765@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739/python-dns Log Message: Directory /cvs/extras/rpms/python-dns added to the repository From fedora-extras-commits at redhat.com Sun May 28 12:51:13 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:13 -0700 Subject: rpms/python-dns/devel - New directory Message-ID: <200605281251.k4SCpFWl007768@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7739/python-dns/devel Log Message: Directory /cvs/extras/rpms/python-dns/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 12:51:25 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:25 -0700 Subject: rpms/python-dns Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605281251.k4SCpRlL007812@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784 Added Files: Makefile import.log Log Message: Setup of module python-dns --- NEW FILE Makefile --- # Top level Makefile for module python-dns all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 12:51:25 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:25 -0700 Subject: rpms/python-dns/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605281251.k4SCpRSu007815@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7784/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-dns --- NEW 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 May 28 12:51:57 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:57 -0700 Subject: rpms/python-dns import.log,1.1,1.2 Message-ID: <200605281252.k4SCqTlh007882@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7848 Modified Files: import.log Log Message: auto-import python-dns-1.3.5-1 on branch devel from python-dns-1.3.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-dns/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 12:51:24 -0000 1.1 +++ import.log 28 May 2006 12:51:57 -0000 1.2 @@ -0,0 +1 @@ +python-dns-1_3_5-1:HEAD:python-dns-1.3.5-1.src.rpm:1148819150 From fedora-extras-commits at redhat.com Sun May 28 12:51:57 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 05:51:57 -0700 Subject: rpms/python-dns/devel python-dns.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605281252.k4SCqTmo007886@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-dns/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7848/devel Modified Files: .cvsignore sources Added Files: python-dns.spec Log Message: auto-import python-dns-1.3.5-1 on branch devel from python-dns-1.3.5-1.src.rpm --- NEW FILE python-dns.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-dns Version: 1.3.5 Release: 1%{?dist} Summary: DNS toolkit for Python Group: Development/Languages License: BSD-like URL: http://www.dnspython.org/ Source0: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0. dnspython provides both high and low level access to DNS. The high level classes perform queries for data of a given name, type, and class, and return an answer set. The low level classes allow direct manipulation of DNS zones, messages, names, and records. %prep %setup -q -n dnspython-%{version} # strip executable permissions so that we don't pick up dependencies # from documentation find examples -type f | xargs chmod a-x %build CFLAGS="%{optflags}" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %check pushd tests # skip one test because it queries the network for py in *.py do if [ $py != resolver.py ] then PYTHONPATH=%{buildroot}%{python_sitelib} %{__python} $py fi done %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog LICENSE README TODO examples %dir %{python_sitelib}/dns %{python_sitelib}/dns/*.py %{python_sitelib}/dns/*.pyc %ghost %{python_sitelib}/dns/*.pyo %dir %{python_sitelib}/dns/rdtypes %{python_sitelib}/dns/rdtypes/*.py %{python_sitelib}/dns/rdtypes/*.pyc %ghost %{python_sitelib}/dns/rdtypes/*.pyo %dir %{python_sitelib}/dns/rdtypes/ANY %{python_sitelib}/dns/rdtypes/ANY/*.py %{python_sitelib}/dns/rdtypes/ANY/*.pyc %ghost %{python_sitelib}/dns/rdtypes/ANY/*.pyo %dir %{python_sitelib}/dns/rdtypes/IN %{python_sitelib}/dns/rdtypes/IN/*.py %{python_sitelib}/dns/rdtypes/IN/*.pyc %ghost %{python_sitelib}/dns/rdtypes/IN/*.pyo %changelog * Fri May 26 2006 Jeffrey C. Ollie - 1.3.5-1 - First version for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-dns/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 12:51:25 -0000 1.1 +++ .cvsignore 28 May 2006 12:51:57 -0000 1.2 @@ -0,0 +1 @@ +dnspython-1.3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-dns/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 12:51:25 -0000 1.1 +++ sources 28 May 2006 12:51:57 -0000 1.2 @@ -0,0 +1 @@ +d086b05b70f7ab1b6308f29f2427623b dnspython-1.3.5.tar.gz From fedora-extras-commits at redhat.com Sun May 28 13:07:11 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sun, 28 May 2006 06:07:11 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec,1.3,1.4 Message-ID: <200605281307.k4SD7DX4010339@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10322 Modified Files: ctapi-cyberjack.spec Log Message: no change only respect to cvs trouble Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ctapi-cyberjack.spec 27 May 2006 11:56:43 -0000 1.3 +++ ctapi-cyberjack.spec 28 May 2006 13:07:11 -0000 1.4 @@ -1,7 +1,7 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader Version: 2.0.10 -Release: 2%{?dist} +Release: 3%{?dist} Requires: %{_libdir}/ctapi #kernel-devel needed for workaround bug 191515 #For FC>4 @@ -148,6 +148,9 @@ %{_includedir}/ctapi-cyberjack/ctapi.h %changelog +* Sun May 28 Frank B??ttner - 2.0.10-3%{?dist} +- no change only respect to cvs trouble + * Sat May 27 2006 Frank B??ttner - 2.0.10-2%{?dist} - add "Provides:pcsc-ifd-handler" for the PC/SC part From fedora-extras-commits at redhat.com Sun May 28 13:07:52 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:07:52 -0700 Subject: rpms/v2strip - New directory Message-ID: <200605281307.k4SD7s4W010397@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/v2strip Log Message: Directory /cvs/extras/rpms/v2strip added to the repository From fedora-extras-commits at redhat.com Sun May 28 13:07:52 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:07:52 -0700 Subject: rpms/v2strip/devel - New directory Message-ID: <200605281307.k4SD7ss0010400@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10371/v2strip/devel Log Message: Directory /cvs/extras/rpms/v2strip/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 13:08:17 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:08:17 -0700 Subject: rpms/v2strip Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605281308.k4SD8JRL010451@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10418 Added Files: Makefile import.log Log Message: Setup of module v2strip --- NEW FILE Makefile --- # Top level Makefile for module v2strip all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 13:08:18 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:08:18 -0700 Subject: rpms/v2strip/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605281308.k4SD8KC7010454@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10418/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module v2strip --- NEW 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 May 28 13:08:29 2006 From: fedora-extras-commits at redhat.com (Frank Büttner (frankb)) Date: Sun, 28 May 2006 06:08:29 -0700 Subject: rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec,1.4,1.5 Message-ID: <200605281308.k4SD8V1a010482@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10462 Modified Files: ctapi-cyberjack.spec Log Message: no change only respect to cvs trouble Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ctapi-cyberjack.spec 28 May 2006 13:07:11 -0000 1.4 +++ ctapi-cyberjack.spec 28 May 2006 13:08:29 -0000 1.5 @@ -148,7 +148,7 @@ %{_includedir}/ctapi-cyberjack/ctapi.h %changelog -* Sun May 28 Frank B??ttner - 2.0.10-3%{?dist} +* Sun May 28 2006 Frank B??ttner - 2.0.10-3%{?dist} - no change only respect to cvs trouble * Sat May 27 2006 Frank B??ttner - 2.0.10-2%{?dist} From fedora-extras-commits at redhat.com Sun May 28 13:09:01 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:09:01 -0700 Subject: rpms/v2strip import.log,1.1,1.2 Message-ID: <200605281309.k4SD9X0f010581@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10542 Modified Files: import.log Log Message: auto-import v2strip-0.2.10-1 on branch devel from v2strip-0.2.10-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/v2strip/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 13:08:17 -0000 1.1 +++ import.log 28 May 2006 13:09:01 -0000 1.2 @@ -0,0 +1 @@ +v2strip-0_2_10-1:HEAD:v2strip-0.2.10-1.src.rpm:1148821648 From fedora-extras-commits at redhat.com Sun May 28 13:09:02 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:09:02 -0700 Subject: rpms/v2strip/devel v2strip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605281309.k4SD9YgK010585@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/rpms/v2strip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10542/devel Modified Files: .cvsignore sources Added Files: v2strip.spec Log Message: auto-import v2strip-0.2.10-1 on branch devel from v2strip-0.2.10-1.src.rpm --- NEW FILE v2strip.spec --- Name: v2strip Version: 0.2.10 Release: 1%{?dist} Summary: V2Strip ID3v2(Mp3 Files) tags remover Group: Applications/Shell License: GPL URL: http://www.geocities.com/matsp888/unix/ Source0: http://www.geocities.com/matsp888/unix/v2strip-0.2.10.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel %description Little utility that removes ID3v2 tags from MP3 files. The new ID3v2 tag format is nice in many ways, but it can cause confusion when parsed by certain MP3 players/utilities not yet supporting ID3v2 tags. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/v2strip %doc AUTHORS README NEWS %changelog * Sun May 28 2006 Andrea Veri 0.2.10-1 - First Package Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/v2strip/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 13:08:18 -0000 1.1 +++ .cvsignore 28 May 2006 13:09:01 -0000 1.2 @@ -0,0 +1 @@ +v2strip-0.2.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/v2strip/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 13:08:18 -0000 1.1 +++ sources 28 May 2006 13:09:01 -0000 1.2 @@ -0,0 +1 @@ +41c69d5d1138f609110bdae15e163317 v2strip-0.2.10.tar.gz From fedora-extras-commits at redhat.com Sun May 28 13:13:10 2006 From: fedora-extras-commits at redhat.com (Andrea Veri (bluekuja)) Date: Sun, 28 May 2006 06:13:10 -0700 Subject: owners owners.list,1.1065,1.1066 Message-ID: <200605281313.k4SDDCFu010640@cvs-int.fedora.redhat.com> Author: bluekuja Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10623 Modified Files: owners.list Log Message: Added v2strip in owner.list cvs file. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1065 retrieving revision 1.1066 diff -u -r1.1065 -r1.1066 --- owners.list 28 May 2006 11:11:26 -0000 1.1065 +++ owners.list 28 May 2006 13:13:09 -0000 1.1066 @@ -1681,6 +1681,7 @@ Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|vorbisgain|Adds tags to Ogg Vorbis files to adjust the volume|noa at resare.com|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|v2strip|ID3v2 tags remover|bluekuja at ubuntu.com|extras-qa at fedoraproject.org| Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 28 13:23:45 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:23:45 -0700 Subject: rpms/python-xmpp - New directory Message-ID: <200605281323.k4SDNlc0010878@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10852/python-xmpp Log Message: Directory /cvs/extras/rpms/python-xmpp added to the repository From fedora-extras-commits at redhat.com Sun May 28 13:23:45 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:23:45 -0700 Subject: rpms/python-xmpp/devel - New directory Message-ID: <200605281323.k4SDNlvo010881@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10852/python-xmpp/devel Log Message: Directory /cvs/extras/rpms/python-xmpp/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 13:24:04 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:24:04 -0700 Subject: rpms/python-xmpp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605281324.k4SDO673010926@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10898 Added Files: Makefile import.log Log Message: Setup of module python-xmpp --- NEW FILE Makefile --- # Top level Makefile for module python-xmpp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 13:24:04 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:24:04 -0700 Subject: rpms/python-xmpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605281324.k4SDO6ae010929@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10898/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-xmpp --- NEW 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 May 28 13:24:44 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:24:44 -0700 Subject: rpms/python-xmpp import.log,1.1,1.2 Message-ID: <200605281324.k4SDOkBk010997@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10964 Modified Files: import.log Log Message: auto-import python-xmpp-0.3.1-1 on branch devel from python-xmpp-0.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-xmpp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 13:24:03 -0000 1.1 +++ import.log 28 May 2006 13:24:44 -0000 1.2 @@ -0,0 +1 @@ +python-xmpp-0_3_1-1:HEAD:python-xmpp-0.3.1-1.src.rpm:1148822678 From fedora-extras-commits at redhat.com Sun May 28 13:24:44 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 06:24:44 -0700 Subject: rpms/python-xmpp/devel python-xmpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605281324.k4SDOkbU011002@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/python-xmpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10964/devel Modified Files: .cvsignore sources Added Files: python-xmpp.spec Log Message: auto-import python-xmpp-0.3.1-1 on branch devel from python-xmpp-0.3.1-1.src.rpm --- NEW FILE python-xmpp.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-xmpp Version: 0.3.1 Release: 1%{?dist} Summary: Python library for easy scripting with Jabber Group: Development/Languages License: GPL URL: http://xmpppy.sourceforge.net/ Source0: http://dl.sourceforge.net/xmpppy/xmpppy-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-dns %description xmpppy is a Python library that is targeted to provide easy scripting with Jabber. Similar projects are Twisted Words and jabber.py. This library was not designed from scratch. It inherits some code from jabberpy and have very similar API in many places. Though it is separate project since it have almost completely different architecture and primarily aims to work with jabberd2 - the new Open Source Jabber Server. %prep %setup -q -n xmpppy-%{version} # strip executable permissions so that dependencies aren't picked up # from documentation files. find doc -type f | xargs chmod a-x %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc ChangeLog README doc/* %dir %{python_sitelib}/xmpp %{python_sitelib}/xmpp/*.py %{python_sitelib}/xmpp/*.pyc %ghost %{python_sitelib}/xmpp/*.pyo %changelog * Fri May 26 2006 Jeffrey C. Ollie - 0.3.1-1 - First version for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-xmpp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 13:24:04 -0000 1.1 +++ .cvsignore 28 May 2006 13:24:44 -0000 1.2 @@ -0,0 +1 @@ +xmpppy-0.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-xmpp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 13:24:04 -0000 1.1 +++ sources 28 May 2006 13:24:44 -0000 1.2 @@ -0,0 +1 @@ +56e8df54288e57bd626cb53b31e2b41c xmpppy-0.3.1.tar.gz From fedora-extras-commits at redhat.com Sun May 28 16:21:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 28 May 2006 09:21:45 -0700 Subject: rpms/lirc-kmod/devel kmodtool,1.6,1.7 lirc-kmod.spec,1.8,1.9 Message-ID: <200605281622.k4SGMH2c021953@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/lirc-kmod/devel Modified Files: kmodtool lirc-kmod.spec Log Message: * Sun May 28 2006 Ville Skytt?? - Update kmodtool to 0.10.10, invoke it with bash instead of sh. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kmodtool 15 May 2006 19:48:28 -0000 1.6 +++ kmodtool 28 May 2006 16:21:45 -0000 1.7 @@ -23,9 +23,11 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +shopt -s extglob + myprog="kmodtool" -myver="0.10.9" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' +myver="0.10.10" +knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)) kmod_name= kver= verrel= @@ -33,24 +35,27 @@ get_verrel () { - verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" + verrel=${1:-$(uname -r)} + verrel=${verrel%%$knownvariants} } print_verrel () { - get_verrel $@ || return $? + get_verrel $@ echo "${verrel}" } get_variant () { - variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" - [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' + get_verrel $@ + variant=${1:-$(uname -r)} + variant=${variant##$verrel} + variant=${variant:-'""'} } print_variant () { - get_variant $@ || return $? + get_variant $@ echo "${variant}" } Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lirc-kmod.spec 15 May 2006 19:48:28 -0000 1.8 +++ lirc-kmod.spec 28 May 2006 16:21:45 -0000 1.9 @@ -2,10 +2,10 @@ # stuff to be implemented externally: Source10: kmodtool -%define kmodtool sh %{SOURCE10} +%define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2111_FC5} +%{?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 7.%(echo %{kverrel} | tr - _) +Release: 8.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,9 @@ %changelog +* Sun May 28 2006 Ville Skytt?? - 0.8.0-8 +- Update kmodtool to 0.10.10, invoke it with bash instead of sh. + * Mon May 15 2006 Ville Skytt?? - 0.8.0-7 - Require version >= of lirc-kmod-common. - Provide lirc-kmod instead of kmod-lirc to fix upgrade problems. From fedora-extras-commits at redhat.com Sun May 28 16:21:44 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 28 May 2006 09:21:44 -0700 Subject: rpms/thinkpad-kmod/FC-5 kmodtool, 1.5, 1.6 thinkpad-kmod.spec, 1.9, 1.10 Message-ID: <200605281622.k4SGMGmG021947@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/thinkpad-kmod/FC-5 Modified Files: kmodtool thinkpad-kmod.spec Log Message: * Sun May 28 2006 Ville Skytt?? - Update kmodtool to 0.10.10, invoke it with bash instead of sh. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/kmodtool,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kmodtool 15 May 2006 19:48:21 -0000 1.5 +++ kmodtool 28 May 2006 16:21:44 -0000 1.6 @@ -23,9 +23,11 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +shopt -s extglob + myprog="kmodtool" -myver="0.10.9" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' +myver="0.10.10" +knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)) kmod_name= kver= verrel= @@ -33,24 +35,27 @@ get_verrel () { - verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" + verrel=${1:-$(uname -r)} + verrel=${verrel%%$knownvariants} } print_verrel () { - get_verrel $@ || return $? + get_verrel $@ echo "${verrel}" } get_variant () { - variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" - [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' + get_verrel $@ + variant=${1:-$(uname -r)} + variant=${variant##$verrel} + variant=${variant:-'""'} } print_variant () { - get_variant $@ || return $? + get_variant $@ echo "${variant}" } Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- thinkpad-kmod.spec 15 May 2006 19:48:21 -0000 1.9 +++ thinkpad-kmod.spec 28 May 2006 16:21:44 -0000 1.10 @@ -1,9 +1,9 @@ # stuff to be implemented externally: Source10: kmodtool -%define kmodtool sh %{SOURCE10} +%define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2111_FC5} +%{?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -19,7 +19,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 6.%(echo %{kverrel} | tr - _) +Release: 7.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -65,6 +65,9 @@ %changelog +* Sun May 28 2006 Ville Skytt?? - 5.9-7 +- Update kmodtool to 0.10.10, invoke it with bash instead of sh. + * Mon May 15 2006 Ville Skytt?? - 5.9-6 - Require version >= of thinkpad-kmod-common. - Provide thinkpad-kmod instead of kmod-thinkpad to fix upgrade problems. From fedora-extras-commits at redhat.com Sun May 28 16:21:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 28 May 2006 09:21:45 -0700 Subject: rpms/lirc-kmod/FC-5 kmodtool,1.5,1.6 lirc-kmod.spec,1.8,1.9 Message-ID: <200605281622.k4SGMH26021951@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/lirc-kmod/FC-5 Modified Files: kmodtool lirc-kmod.spec Log Message: * Sun May 28 2006 Ville Skytt?? - Update kmodtool to 0.10.10, invoke it with bash instead of sh. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/kmodtool,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kmodtool 15 May 2006 19:48:22 -0000 1.5 +++ kmodtool 28 May 2006 16:21:45 -0000 1.6 @@ -23,9 +23,11 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +shopt -s extglob + myprog="kmodtool" -myver="0.10.9" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' +myver="0.10.10" +knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)) kmod_name= kver= verrel= @@ -33,24 +35,27 @@ get_verrel () { - verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')" + verrel=${1:-$(uname -r)} + verrel=${verrel%%$knownvariants} } print_verrel () { - get_verrel $@ || return $? + get_verrel $@ echo "${verrel}" } get_variant () { - variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')" - [ "${variant}" != "${1-$(uname -r)}" ] || variant='""' + get_verrel $@ + variant=${1:-$(uname -r)} + variant=${variant##$verrel} + variant=${variant:-'""'} } print_variant () { - get_variant $@ || return $? + get_variant $@ echo "${variant}" } Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lirc-kmod.spec 15 May 2006 19:48:22 -0000 1.8 +++ lirc-kmod.spec 28 May 2006 16:21:45 -0000 1.9 @@ -2,10 +2,10 @@ # stuff to be implemented externally: Source10: kmodtool -%define kmodtool sh %{SOURCE10} +%define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2111_FC5} +%{?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 7.%(echo %{kverrel} | tr - _) +Release: 8.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,9 @@ %changelog +* Sun May 28 2006 Ville Skytt?? - 0.8.0-8 +- Update kmodtool to 0.10.10, invoke it with bash instead of sh. + * Mon May 15 2006 Ville Skytt?? - 0.8.0-7 - Require version >= of lirc-kmod-common. - Provide lirc-kmod instead of kmod-lirc to fix upgrade problems. From fedora-extras-commits at redhat.com Sun May 28 16:27:02 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 28 May 2006 09:27:02 -0700 Subject: owners owners.list,1.1066,1.1067 Message-ID: <200605281627.k4SGR49K022023@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22006 Modified Files: owners.list Log Message: lirc-kmod* have been orphaned for a while, see Wiki (and ML soon) for more info Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1066 retrieving revision 1.1067 diff -u -r1.1066 -r1.1067 --- owners.list 28 May 2006 13:13:09 -0000 1.1066 +++ owners.list 28 May 2006 16:27:02 -0000 1.1067 @@ -745,8 +745,8 @@ Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org| Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|lirc-kmod|LIRC kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi +Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun May 28 17:52:04 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:52:04 -0700 Subject: owners owners.list,1.1067,1.1068 Message-ID: <200605281752.k4SHq6C7024601@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24584 Modified Files: owners.list Log Message: Add perl-XML-Stream Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1067 retrieving revision 1.1068 diff -u -r1.1067 -r1.1068 --- owners.list 28 May 2006 16:27:02 -0000 1.1067 +++ owners.list 28 May 2006 17:52:04 -0000 1.1068 @@ -1284,6 +1284,7 @@ Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-Stream|XML::Stream - streaming XML library|cweyl at alumni.drew.edu Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 28 17:54:43 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:54:43 -0700 Subject: rpms/perl-Net-XMPP - New directory Message-ID: <200605281754.k4SHsjtN024682@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24654/perl-Net-XMPP Log Message: Directory /cvs/extras/rpms/perl-Net-XMPP added to the repository From fedora-extras-commits at redhat.com Sun May 28 17:54:44 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:54:44 -0700 Subject: rpms/perl-Net-XMPP/devel - New directory Message-ID: <200605281754.k4SHskaO024685@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24654/perl-Net-XMPP/devel Log Message: Directory /cvs/extras/rpms/perl-Net-XMPP/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 17:54:51 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:54:51 -0700 Subject: rpms/perl-Net-XMPP Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605281754.k4SHsrXu024734@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24701 Added Files: Makefile import.log Log Message: Setup of module perl-Net-XMPP --- NEW FILE Makefile --- # Top level Makefile for module perl-Net-XMPP all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 17:54:52 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:54:52 -0700 Subject: rpms/perl-Net-XMPP/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605281754.k4SHssSc024737@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24701/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Net-XMPP --- NEW 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 May 28 17:55:10 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:55:10 -0700 Subject: rpms/perl-Net-XMPP import.log,1.1,1.2 Message-ID: <200605281755.k4SHtCTe024806@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24772 Modified Files: import.log Log Message: auto-import perl-Net-XMPP-1.0-4.fc5 on branch devel from perl-Net-XMPP-1.0-4.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Net-XMPP/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 17:54:51 -0000 1.1 +++ import.log 28 May 2006 17:55:09 -0000 1.2 @@ -0,0 +1 @@ +perl-Net-XMPP-1_0-4_fc5:HEAD:perl-Net-XMPP-1.0-4.fc5.src.rpm:1148838907 From fedora-extras-commits at redhat.com Sun May 28 17:55:10 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:55:10 -0700 Subject: rpms/perl-Net-XMPP/devel LICENSING.correspondance, NONE, 1.1 perl-Net-XMPP.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605281755.k4SHtCmh024811@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Net-XMPP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24772/devel Modified Files: .cvsignore sources Added Files: LICENSING.correspondance perl-Net-XMPP.spec Log Message: auto-import perl-Net-XMPP-1.0-4.fc5 on branch devel from perl-Net-XMPP-1.0-4.fc5.src.rpm --- NEW FILE LICENSING.correspondance --- The licensing for this module is interesting -- the documentation of the module states that the license is Perl (aka GPL or Artistic), whereas the files have LGPL headers and the tarball includes the text of the LGPL itself. Given the author's response, my assessment is that this software is triple licensed: It may be used under the terms of the GPL, LGPL, or Artistic license, at your option. From: Ryan Eatmon To: Chris Weyl Date: May 22, 2006 6:03 PM Subject: Re: Net::XMPP license question Whatever. I don't actually care one way or the other. Go right ahead. Chris Weyl wrote: > Sorry to keep on bugging you, but would it be OK for me to strip out > the LGPL licensing statements? > > Or is this software triple licensed? e.g. Perl (GPL or Artistic), LGPL? > > Thanks :) > -Chris > > On 5/15/06, Chris Weyl wrote: >> If this code isn't meant to also be licensed under the LGPL, would it >> be ok with you for me to patch the LGPL statements out for the version >> released under fedora extras? >> >> -Chris >> >> On 5/14/06, Ryan Eatmon wrote: >> > >> > Yep. >> > >> > >> > Chris Weyl wrote: >> > > Hey Ryan-- >> > > >> > > Quick question. I'm in the middle of packaging up Net::XMPP (and for >> > > that matter, XML::Stream and Net::Jabber) for fedora extras, and it >> > > was pointed out to me that while Net/XMPP.pm states "COPYRIGHT: This >> > > module is free software, you can redistribute it and/or modify it >> > > under the same terms as Perl itself", the actual archive includes a >> > > LICENSE.LGPL. >> > > >> > > Are all three of these modules under "the same terms as Perl itself"? >> > > >> > > Thanks:) >> > > -Chris >> > >> > >> > -- >> > Ryan Eatmon >> > reatmon at jabber.org >> > >> >> >> -- >> Chris Weyl >> Ex astris, scientia >> > > -- Ryan Eatmon reatmon at jabber.org --- NEW FILE perl-Net-XMPP.spec --- # $Id$ Name: perl-Net-XMPP Version: 1.0 Release: 4%{?dist} Summary: Net::XMPP - perl XMPP library Group: Development/Libraries License: GPL or Artistic or LGPL URL: http://search.cpan.org/dist/Net-XMPP/ Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/Net-XMPP-%{version}.tar.gz Source1: LICENSING.correspondance BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl, perl(XML::Stream), perl(Digest::SHA1) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Net::XMPP provides a Perl user with access to the Extensible Messaging and Presence Protocol (XMPP). For more information about XMPP visit: http://www.xmpp.org %prep %setup -q -n Net-XMPP-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} cp %{SOURCE1} . # generate our other two licenses... perldoc perlgpl > LICENSE.GPL perldoc perlartistic > LICENSE.Artistic %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w %{buildroot}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README CHANGES examples LICENSE.* LICENSING.* %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu May 25 2006 Chris Weyl 1.0-4 - include license text, including generated ones - include correspondance with the module's author * Wed May 24 2006 Chris Weyl 1.0-3 - update license to triple licensed, based on conversations with upstream * Mon May 15 2006 Chris Weyl 1.0-2 - include additional files as docs * Fri May 12 2006 Chris Weyl 1.0-1 - first f-e spec. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-XMPP/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 17:54:52 -0000 1.1 +++ .cvsignore 28 May 2006 17:55:10 -0000 1.2 @@ -0,0 +1 @@ +Net-XMPP-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-XMPP/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 17:54:52 -0000 1.1 +++ sources 28 May 2006 17:55:10 -0000 1.2 @@ -0,0 +1 @@ +6338484aa0d394e68c01666ca34e5241 Net-XMPP-1.0.tar.gz From fedora-extras-commits at redhat.com Sun May 28 17:57:19 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sun, 28 May 2006 10:57:19 -0700 Subject: owners owners.list,1.1068,1.1069 Message-ID: <200605281757.k4SHvLOV024888@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24871 Modified Files: owners.list Log Message: Add perl-Net-XMPP Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1068 retrieving revision 1.1069 diff -u -r1.1068 -r1.1069 --- owners.list 28 May 2006 17:52:04 -0000 1.1068 +++ owners.list 28 May 2006 17:57:19 -0000 1.1069 @@ -1171,6 +1171,7 @@ Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH-Perl|SSH (Secure Shell) client|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-XMPP|Net::XMPP - perl XMPP library|cweyl at alumni.drew.edu Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Object-Accessor|Perl module that allows per object accessors|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun May 28 21:36:47 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:36:47 -0700 Subject: rpms/blam - New directory Message-ID: <200605282136.k4SLanIA002624@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2597/blam Log Message: Directory /cvs/extras/rpms/blam added to the repository From fedora-extras-commits at redhat.com Sun May 28 21:36:48 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:36:48 -0700 Subject: rpms/blam/devel - New directory Message-ID: <200605282136.k4SLao5F002627@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2597/blam/devel Log Message: Directory /cvs/extras/rpms/blam/devel added to the repository From fedora-extras-commits at redhat.com Sun May 28 21:37:17 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:37:17 -0700 Subject: rpms/blam Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605282137.k4SLbJ3Y002676@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2643 Added Files: Makefile import.log Log Message: Setup of module blam --- NEW FILE Makefile --- # Top level Makefile for module blam all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 28 21:37:17 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:37:17 -0700 Subject: rpms/blam/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605282137.k4SLbJjZ002679@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2643/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module blam --- NEW 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 May 28 21:45:14 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:45:14 -0700 Subject: rpms/blam import.log,1.1,1.2 Message-ID: <200605282145.k4SLjG8X002801@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2766 Modified Files: import.log Log Message: auto-import blam-1.8.2-5 on branch devel from blam-1.8.2-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/blam/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 May 2006 21:37:16 -0000 1.1 +++ import.log 28 May 2006 21:45:14 -0000 1.2 @@ -0,0 +1 @@ +blam-1_8_2-5:HEAD:blam-1.8.2-5.src.rpm:1148852687 From fedora-extras-commits at redhat.com Sun May 28 21:45:15 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Sun, 28 May 2006 14:45:15 -0700 Subject: rpms/blam/devel blam-aclocal.m4-ngettext.patch, NONE, 1.1 blam-gtk-sharp2-gecko-sharp2.patch, NONE, 1.1 blam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605282145.k4SLjHIS002812@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/blam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2766/devel Modified Files: .cvsignore sources Added Files: blam-aclocal.m4-ngettext.patch blam-gtk-sharp2-gecko-sharp2.patch blam.spec Log Message: auto-import blam-1.8.2-5 on branch devel from blam-1.8.2-5.src.rpm blam-aclocal.m4-ngettext.patch: --- NEW FILE blam-aclocal.m4-ngettext.patch --- --- aclocal.m4.orig 2006-05-28 13:33:18.000000000 -0500 +++ aclocal.m4 2006-04-07 13:43:39.000000000 -0500 @@ -121,7 +121,7 @@ [AC_TRY_LINK([ #include ], - [return (int) ngettext ("","", 1)], + [return !ngettext ("","", 1)], gt_cv_func_ngettext_libc=yes, gt_cv_func_ngettext_libc=no) ]) @@ -131,7 +131,7 @@ [AC_TRY_LINK([ #include ], - [return (int) dgettext ("","")], + [return !dgettext ("","")], gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no) ]) blam-gtk-sharp2-gecko-sharp2.patch: --- NEW FILE blam-gtk-sharp2-gecko-sharp2.patch --- --- configure.in.orig 2006-05-18 14:37:06.000000000 -0500 +++ configure.in 2006-05-18 16:53:27.000000000 -0500 @@ -45,20 +45,20 @@ dnl Find mono MONO_REQUIRED_VERSION=1.1.4 -GTKSHARP_REQUIRED_VERSION=1.0 +GTKSHARP_REQUIRED_VERSION=2.0 GCONF_REQUIRED_VERSION=2.4 -GECKOSHARP_REQUIRED_VERSION=0.6 +GECKOSHARP_REQUIRED_VERSION=0.1 PKG_CHECK_MODULES(BASE_DEPENDENCIES, mono >= $MONO_REQUIRED_VERSION - gtk-sharp >= $GTKSHARP_REQUIRED_VERSION + gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION) PKG_CHECK_MODULES(BLAM, - gtk-sharp >= $GTKSHARP_REQUIRED_VERSION - gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION - gconf-sharp >= $GTKSHARP_REQUIRED_VERSION - glade-sharp >= $GTKSHARP_REQUIRED_VERSION) + gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION + gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION + glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(BLAM_LIBS) --- NEW FILE blam.spec --- %define _libdir %{_exec_prefix}/lib Name: blam Version: 1.8.2 Release: 5%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet License: GPL URL: http://developer.imendio.com/wiki/Blam Source0: http://ftp.imendio.com/pub/imendio/blam/src/blam-%{version}.tar.gz Patch0: blam-gtk-sharp2-gecko-sharp2.patch Patch1: blam-aclocal.m4-ngettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2-gapi, gtk-sharp2, gecko-sharp2 BuildRequires: mozilla-devel BuildRequires: libgnomeui-devel BuildRequires: desktop-file-utils, gettext BuildRequires: autoconf Requires(pre): GConf2 Requires(post): GConf2, desktop-file-utils Requires(preun): GConf2 Requires(postun): desktop-file-utils %description Blam is a tool that helps you keep track of the growing number of news feeds distributed as RSS. Blam lets you subscribe to any number of feeds and provides an easy to use and clean interface to stay up to date %prep %setup -q %patch0 -p0 %patch1 -p0 %build autoconf %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT # Do not need devel files rm $RPM_BUILD_ROOT%{_libdir}/blam/libblam.{a,la} %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post update-desktop-database &> /dev/null ||: export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %postun update-desktop-database &> /dev/null ||: %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %config %{_sysconfdir}/gconf/schemas/blam.schemas %{_bindir}/* %{_libdir}/blam %{_datadir}/blam %{_datadir}/applications/* %{_datadir}/pixmaps/* %changelog * Sun May 28 2006 John Mahowald - 1.8.2-5 - fix ngettext autoconf macro for x86_64 * Sun May 21 2006 John Mahowald - 1.8.2-4 - readd .so - reenable find_lang - mark gconf schemea as config * Thu May 18 2006 John Mahowald - 1.8.2-2 - gtk-sharp2 gecko-sharp2 - no .a, .la, .so * Tue Mar 23 2006 Sindre Pedersen Bj??rdal - 1.8.2-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/blam/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 May 2006 21:37:17 -0000 1.1 +++ .cvsignore 28 May 2006 21:45:15 -0000 1.2 @@ -0,0 +1 @@ +blam-1.8.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/blam/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 May 2006 21:37:17 -0000 1.1 +++ sources 28 May 2006 21:45:15 -0000 1.2 @@ -0,0 +1 @@ +8cb05faedf60d895d94a5ecf9d10eb8f blam-1.8.2.tar.gz From fedora-extras-commits at redhat.com Sun May 28 22:55:52 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 28 May 2006 15:55:52 -0700 Subject: rpms/scim-skk/FC-5 scim-skk.spec,1.12,1.13 Message-ID: <200605282255.k4SMtsVf005460@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5443 Modified Files: scim-skk.spec Log Message: rebuild required for libstdc++so7-devel-0:4.2.0-0.3.20060428.fc5.2 Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-5/scim-skk.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim-skk.spec 20 May 2006 04:36:33 -0000 1.12 +++ scim-skk.spec 28 May 2006 22:55:51 -0000 1.13 @@ -2,7 +2,7 @@ Name: scim-skk Version: 0.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: SCIM IMEngine module for skk Group: System Environment/Libraries @@ -62,6 +62,10 @@ %changelog +* Mon Mar 29 2006 Ryo Dairiki - 0.5.2-5 +- rebuild against libstdc++so7 (0:4.2.0-0.3.20060428.fc5.2) + + * Sat Mar 20 2006 Ryo Dairiki - 0.5.2-4 - rebuild against libstdc++so7 (0:4.2.0-0.3.20060428.fc5.1) From fedora-extras-commits at redhat.com Mon May 29 00:17:45 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 28 May 2006 17:17:45 -0700 Subject: rpms/scim-tomoe/FC-5 scim-tomoe.spec,1.11,1.12 Message-ID: <200605290017.k4T0Hl6H010423@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10404 Modified Files: scim-tomoe.spec Log Message: rebuilding, required by libstdc++ Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-5/scim-tomoe.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim-tomoe.spec 20 May 2006 06:05:11 -0000 1.11 +++ scim-tomoe.spec 29 May 2006 00:17:45 -0000 1.12 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -64,6 +64,9 @@ %changelog +* Mon Mar 29 2006 Ryo Dairiki - 0.2-6 +- rebuild against new libstdc++so7 + * Sat May 20 2006 Ryo Dairiki - 0.2-5 - rebuild against new libstdc++so7 From fedora-extras-commits at redhat.com Mon May 29 00:18:26 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 28 May 2006 17:18:26 -0700 Subject: rpms/scim-tomoe/FC-5 scim-tomoe.spec,1.12,1.13 Message-ID: <200605290018.k4T0ISds010451@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10434 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-5/scim-tomoe.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim-tomoe.spec 29 May 2006 00:17:45 -0000 1.12 +++ scim-tomoe.spec 29 May 2006 00:18:26 -0000 1.13 @@ -64,7 +64,7 @@ %changelog -* Mon Mar 29 2006 Ryo Dairiki - 0.2-6 +* Mon May 29 2006 Ryo Dairiki - 0.2-6 - rebuild against new libstdc++so7 * Sat May 20 2006 Ryo Dairiki - 0.2-5 From fedora-extras-commits at redhat.com Mon May 29 00:49:18 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 28 May 2006 17:49:18 -0700 Subject: rpms/scim-input-pad/FC-5 scim-input-pad.spec,1.5,1.6 Message-ID: <200605290049.k4T0nKFB010618@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-input-pad/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10601 Modified Files: scim-input-pad.spec Log Message: rebuild against new libstdc++-so_7 Index: scim-input-pad.spec =================================================================== RCS file: /cvs/extras/rpms/scim-input-pad/FC-5/scim-input-pad.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-input-pad.spec 13 Feb 2006 06:21:12 -0000 1.5 +++ scim-input-pad.spec 29 May 2006 00:49:18 -0000 1.6 @@ -2,7 +2,7 @@ Name: scim-input-pad Version: 0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: On-screen Input Pad for SCIM Group: System Environment/Libraries @@ -73,6 +73,9 @@ %changelog +* Mon Mar 29 2006 Ryo Dairiki - 0.1.1-5 +- build against new libstdc++so7 preview library + * Mon Feb 13 2006 Jens Petersen - 0.1.1-3 - build conditionally with libstdc++so7 preview library (#166041) - add with_libstdc_preview switch and tweak libtool to link against it From fedora-extras-commits at redhat.com Mon May 29 04:02:26 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Sun, 28 May 2006 21:02:26 -0700 Subject: rpms/qof/devel qof-gnc-date-test.patch,1.1,1.2 qof.spec,1.16,1.17 Message-ID: <200605290402.k4T42xUA020435@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20413 Modified Files: qof-gnc-date-test.patch qof.spec Log Message: - Use G_MAXINT32 for the test patch. - BR: gettext. qof-gnc-date-test.patch: Index: qof-gnc-date-test.patch =================================================================== RCS file: /cvs/extras/rpms/qof/devel/qof-gnc-date-test.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qof-gnc-date-test.patch 12 May 2006 21:01:50 -0000 1.1 +++ qof-gnc-date-test.patch 29 May 2006 04:02:21 -0000 1.2 @@ -6,7 +6,7 @@ + /* Get a random time that won't overflow a signed 32bit int durng testing */ ts = *get_random_timespec (); -+ while (ts.tv_sec >= ((2^31) - (10000*10800))) { ++ while (ts.tv_sec >= (G_MAXINT32 - (10000*10800))) { + ts = *get_random_timespec(); + }; Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- qof.spec 12 May 2006 21:01:50 -0000 1.16 +++ qof.spec 29 May 2006 04:02:22 -0000 1.17 @@ -1,6 +1,6 @@ Name: qof Version: 0.6.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Query engine library for C objects Group: System Environment/Libraries @@ -15,6 +15,7 @@ BuildRequires: glib2-devel BuildRequires: libgda-devel BuildRequires: intltool +BuildRequires: gettext # qof doesn't ship with pre-built documentation BuildRequires: doxygen @@ -116,6 +117,10 @@ %doc html %changelog +* Sun May 28 2006 Toshio Kuratomi - 0.6.4-5 +- Use G_MAXINT32 for the test patch. +- BR: gettext. + * Fri May 12 2006 Toshio Kuratomi - 0.6.4-4 - After talking with upstream it was decided that the supposed char problem was a problem with the test suite. New patch fixes an overflow in the From fedora-extras-commits at redhat.com Mon May 29 04:52:43 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 21:52:43 -0700 Subject: owners owners.list,1.1069,1.1070 Message-ID: <200605290452.k4T4qjmL020680@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20663 Modified Files: owners.list Log Message: Adding python-dns and python-xmpp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1069 retrieving revision 1.1070 diff -u -r1.1069 -r1.1070 --- owners.list 28 May 2006 17:57:19 -0000 1.1069 +++ owners.list 29 May 2006 04:52:43 -0000 1.1070 @@ -1371,6 +1371,7 @@ 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-dns|DNS toolkit for Python|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-elementtree|Fast XML parser and writer|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| @@ -1410,6 +1411,7 @@ Fedora Extras|python-TestGears|Unit testing for Python|ivazquez at ivazquez.net|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|python-xmpp|Python library for easy scripting with Jabber|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|PyX|Python graphics package|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|pyxdg|PyXDG is a python library to access freedesktop.org standards|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net From fedora-extras-commits at redhat.com Mon May 29 05:12:51 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 28 May 2006 22:12:51 -0700 Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.7, 1.8 NetworkManager-vpnc.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200605290512.k4T5CrkB023084@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23063 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Mon May 29 2006 Dan Williams - 0.7.0-0.cvs20060529 - Gnome.org #336913: HIG tweaks for vpn properties pages Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 May 2006 20:40:19 -0000 1.7 +++ .cvsignore 29 May 2006 05:12:51 -0000 1.8 @@ -4,3 +4,4 @@ NetworkManager-vpnc-0.6.0.tar.gz NetworkManager-vpnc-0.6.2.tar.gz NetworkManager-vpnc-0.7.0.cvs20060521.tar.gz +NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- NetworkManager-vpnc.spec 21 May 2006 20:40:19 -0000 1.11 +++ NetworkManager-vpnc.spec 29 May 2006 05:12:51 -0000 1.12 @@ -7,7 +7,7 @@ %define cvs_snapshot 1 %if %{cvs_snapshot} -%define nm_vpnc_cvs_version .cvs20060521 +%define nm_vpnc_cvs_version .cvs20060529 %endif Summary: NetworkManager VPN integration for vpnc @@ -90,6 +90,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Mon May 29 2006 Dan Williams - 0.7.0-0.cvs20060529 +- Gnome.org #336913: HIG tweaks for vpn properties pages + * Sun May 21 2006 Dan Williams 0.7.0-0.cvs20060521 - Update to CVS snapshot - Honor user-specified rekeying intervals Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 May 2006 20:40:19 -0000 1.7 +++ sources 29 May 2006 05:12:51 -0000 1.8 @@ -1 +1 @@ -ea25752ca514d5e6f6acf6a797d44b82 NetworkManager-vpnc-0.7.0.cvs20060521.tar.gz +e49518b7932079ceaf4b358d6b0a727e NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:13:03 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:13:03 -0700 Subject: rpms/libeXosip2/FC-5 .cvsignore, 1.4, 1.5 libeXosip2.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605290513.k4T5D5Zc023140@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/libeXosip2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23119 Modified Files: .cvsignore libeXosip2.spec sources Log Message: Update to 2.2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 04:57:22 -0000 1.4 +++ .cvsignore 29 May 2006 05:13:03 -0000 1.5 @@ -1 +1 @@ -libeXosip2-2.2.2.tar.gz +libeXosip2-2.2.3.tar.gz Index: libeXosip2.spec =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-5/libeXosip2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libeXosip2.spec 20 Feb 2006 14:58:50 -0000 1.6 +++ libeXosip2.spec 29 May 2006 05:13:03 -0000 1.7 @@ -1,8 +1,8 @@ Summary: A library that hides the complexity of using the SIP protocol Name: libeXosip2 -Version: 2.2.2 -Release: 4%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://savannah.nongnu.org/projects/eXosip @@ -69,6 +69,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 2.2.3-1 +- Update to 2.2.3 + * Mon Feb 20 2006 Jeffrey C. Ollie - 2.2.2-4 - Bump release for rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 04:57:22 -0000 1.4 +++ sources 29 May 2006 05:13:03 -0000 1.5 @@ -1 +1 @@ -3434df493dc780b4bae76467ce29d689 libeXosip2-2.2.2.tar.gz +837a35f085890eac3328ac402b24383b libeXosip2-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:15:21 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:15:21 -0700 Subject: rpms/libeXosip2/FC-4 .cvsignore, 1.4, 1.5 libeXosip2.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605290515.k4T5FNSm023227@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/libeXosip2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23206 Modified Files: .cvsignore libeXosip2.spec sources Log Message: Update to 2.2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 04:53:43 -0000 1.4 +++ .cvsignore 29 May 2006 05:15:20 -0000 1.5 @@ -1 +1 @@ -libeXosip2-2.2.2.tar.gz +libeXosip2-2.2.3.tar.gz Index: libeXosip2.spec =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-4/libeXosip2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libeXosip2.spec 5 Jan 2006 04:53:43 -0000 1.5 +++ libeXosip2.spec 29 May 2006 05:15:20 -0000 1.6 @@ -1,8 +1,8 @@ Summary: A library that hides the complexity of using the SIP protocol Name: libeXosip2 -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://savannah.nongnu.org/projects/eXosip @@ -69,6 +69,15 @@ %{_mandir}/man3/*.3* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 2.2.3-1 +- Update to 2.2.3 + +* Mon Feb 20 2006 Jeffrey C. Ollie - 2.2.2-4 +- Bump release for rebuild. + +* Mon Feb 13 2006 Jeffrey C. Ollie - 2.2.2-3 +- Bump release and rebuild for gcc 4.1 and glibc. + * Wed Jan 4 2006 Jeffrey C. Ollie - 2.2.2 - Update to 2.2.2. - Bump release because forgot to upload new source. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 04:53:43 -0000 1.4 +++ sources 29 May 2006 05:15:20 -0000 1.5 @@ -1 +1 @@ -3434df493dc780b4bae76467ce29d689 libeXosip2-2.2.2.tar.gz +837a35f085890eac3328ac402b24383b libeXosip2-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:18:01 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:18:01 -0700 Subject: rpms/libeXosip2/devel .cvsignore, 1.4, 1.5 libeXosip2.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200605290518.k4T5I3bL023330@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/libeXosip2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23309 Modified Files: .cvsignore libeXosip2.spec sources Log Message: Update to 2.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 04:57:22 -0000 1.4 +++ .cvsignore 29 May 2006 05:18:01 -0000 1.5 @@ -1 +1 @@ -libeXosip2-2.2.2.tar.gz +libeXosip2-2.2.3.tar.gz Index: libeXosip2.spec =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/devel/libeXosip2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libeXosip2.spec 20 Feb 2006 14:58:50 -0000 1.6 +++ libeXosip2.spec 29 May 2006 05:18:01 -0000 1.7 @@ -1,8 +1,8 @@ Summary: A library that hides the complexity of using the SIP protocol Name: libeXosip2 -Version: 2.2.2 -Release: 4%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://savannah.nongnu.org/projects/eXosip @@ -69,6 +69,9 @@ %{_mandir}/man3/*.3* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 2.2.3-1 +- Update to 2.2.3 + * Mon Feb 20 2006 Jeffrey C. Ollie - 2.2.2-4 - Bump release for rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libeXosip2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 04:57:22 -0000 1.4 +++ sources 29 May 2006 05:18:01 -0000 1.5 @@ -1 +1 @@ -3434df493dc780b4bae76467ce29d689 libeXosip2-2.2.2.tar.gz +837a35f085890eac3328ac402b24383b libeXosip2-2.2.3.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:55:43 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:55:43 -0700 Subject: rpms/byzanz/devel .cvsignore, 1.3, 1.4 byzanz.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605290555.k4T5tjfQ023512@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/byzanz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23491 Modified Files: .cvsignore byzanz.spec sources Log Message: Update to 0.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/byzanz/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Jan 2006 05:09:48 -0000 1.3 +++ .cvsignore 29 May 2006 05:55:43 -0000 1.4 @@ -1 +1 @@ -byzanz-0.1.0.tar.gz +byzanz-0.1.1.tar.gz Index: byzanz.spec =================================================================== RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- byzanz.spec 20 Feb 2006 14:44:57 -0000 1.8 +++ byzanz.spec 29 May 2006 05:55:43 -0000 1.9 @@ -1,7 +1,7 @@ Summary: A desktop recorder Name: byzanz -Version: 0.1.0 -Release: 6%{?dist} +Version: 0.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.freedesktop.org/~company/byzanz/ @@ -82,11 +82,15 @@ %{_libdir}/bonobo/servers/ByzanzApplet.server %{_libexecdir}/byzanz-applet %{_datadir}/gnome-2.0/ui/byzanzapplet.xml -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-area.png -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-screen.png -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png +%{_datadir}/icons/hicolor/*/apps/byzanz-record-area.* +%{_datadir}/icons/hicolor/*/apps/byzanz-record-desktop.* +%{_datadir}/icons/hicolor/*/apps/byzanz-record-window.* +%{_mandir}/man1/byzanz-record.1* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 0.1.1-1 +- Update to 1.1.1. + * Mon Feb 20 2006 Jeffrey C. Ollie - 0.1.0-6 - Bump for another rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/byzanz/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Jan 2006 05:09:48 -0000 1.3 +++ sources 29 May 2006 05:55:43 -0000 1.4 @@ -1 +1 @@ -3637e3a078aec602606ad053512b1209 byzanz-0.1.0.tar.gz +717c7a15320507a7deaa36eeb73270de byzanz-0.1.1.tar.gz From fedora-extras-commits at redhat.com Mon May 29 05:56:46 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Sun, 28 May 2006 22:56:46 -0700 Subject: rpms/byzanz/FC-5 .cvsignore, 1.3, 1.4 byzanz.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605290556.k4T5um3I023583@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/byzanz/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23562 Modified Files: .cvsignore byzanz.spec sources Log Message: Update to 0.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/byzanz/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Jan 2006 05:09:48 -0000 1.3 +++ .cvsignore 29 May 2006 05:56:46 -0000 1.4 @@ -1 +1 @@ -byzanz-0.1.0.tar.gz +byzanz-0.1.1.tar.gz Index: byzanz.spec =================================================================== RCS file: /cvs/extras/rpms/byzanz/FC-5/byzanz.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- byzanz.spec 20 Feb 2006 14:44:57 -0000 1.8 +++ byzanz.spec 29 May 2006 05:56:46 -0000 1.9 @@ -1,7 +1,7 @@ Summary: A desktop recorder Name: byzanz -Version: 0.1.0 -Release: 6%{?dist} +Version: 0.1.1 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.freedesktop.org/~company/byzanz/ @@ -82,11 +82,15 @@ %{_libdir}/bonobo/servers/ByzanzApplet.server %{_libexecdir}/byzanz-applet %{_datadir}/gnome-2.0/ui/byzanzapplet.xml -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-area.png -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-screen.png -%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png +%{_datadir}/icons/hicolor/*/apps/byzanz-record-area.* +%{_datadir}/icons/hicolor/*/apps/byzanz-record-desktop.* +%{_datadir}/icons/hicolor/*/apps/byzanz-record-window.* +%{_mandir}/man1/byzanz-record.1* %changelog +* Mon May 29 2006 Jeffrey C. Ollie - 0.1.1-1 +- Update to 1.1.1. + * Mon Feb 20 2006 Jeffrey C. Ollie - 0.1.0-6 - Bump for another rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/byzanz/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Jan 2006 05:09:48 -0000 1.3 +++ sources 29 May 2006 05:56:46 -0000 1.4 @@ -1 +1 @@ -3637e3a078aec602606ad053512b1209 byzanz-0.1.0.tar.gz +717c7a15320507a7deaa36eeb73270de byzanz-0.1.1.tar.gz From fedora-extras-commits at redhat.com Mon May 29 07:01:54 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 00:01:54 -0700 Subject: rpms/lua/devel .cvsignore, 1.3, 1.4 lua.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200605290702.k4T72S9T028437@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28415 Modified Files: .cvsignore lua.spec sources Log Message: include shored lib, added autotools patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 22:26:23 -0000 1.3 +++ .cvsignore 29 May 2006 07:01:54 -0000 1.4 @@ -1 +1 @@ -lua-5.1.tar.gz +lua-5.1-autotoolize-r1.patch.bz2 Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lua.spec 7 May 2006 22:52:05 -0000 1.13 +++ lua.spec 29 May 2006 07:01:54 -0000 1.14 @@ -1,12 +1,13 @@ Name: lua Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT URL: http://www.lua.org/ Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz +Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, ncurses-devel @@ -25,31 +26,21 @@ %prep %setup -q +%patch0 -p1 %build -make %{?_smp_mflags} \ - MYCFLAGS="$RPM_OPT_FLAGS -fPIC" \ - MYLDFLAGS="-Wl,-E" \ - LOADLIB=-DUSE_DLOPEN=1 \ - DLLIB=-ldl \ -%ifarch %{ix86} x86_64 - NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ -%endif - USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" \ - linux +# fix perms on auto files +chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing +./autogen.sh -%install -rm -rf %{buildroot} -make install \ - INSTALL_TOP=%{buildroot}/usr \ - INSTALL_LIB=%{buildroot}/%{_libdir} \ - INSTALL_MAN=%{buildroot}%{_mandir}/man1 +%configure --with-readline -%check -make test +make %{?_smp_mflags} +%install +rm -rf %{buildroot} +%makeinstall %clean rm -rf %{buildroot} @@ -61,11 +52,15 @@ %{_bindir}/lua* %{_includedir}/l*.h %{_includedir}/l*.hpp -%{_libdir}/liblua*.a +%{_libdir}/liblua*.* +%{_libdir}/pkgconfig/*.pc %{_mandir}/man1/lua*.1* %changelog +* Mon May 29 2006 Michael J. Knox - 5.1-3 +- added autotools patch from Petri Lehtinen, http://lua-users.org + * Mon May 08 2006 Michael J. Knox - 5.1-2 - fixed x86_64 builds Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 May 2006 22:26:23 -0000 1.4 +++ sources 29 May 2006 07:01:54 -0000 1.5 @@ -1 +1 @@ -3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz +9e6a9655694450e26aa4e01220dd3636 lua-5.1-autotoolize-r1.patch.bz2 From fedora-extras-commits at redhat.com Mon May 29 07:04:13 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 00:04:13 -0700 Subject: rpms/lua/devel sources,1.5,1.6 Message-ID: <200605290704.k4T74kET028499@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28480 Modified Files: sources Log Message: don't clobber all the source files Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 May 2006 07:01:54 -0000 1.5 +++ sources 29 May 2006 07:04:13 -0000 1.6 @@ -1 +1,2 @@ +3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz 9e6a9655694450e26aa4e01220dd3636 lua-5.1-autotoolize-r1.patch.bz2 From fedora-extras-commits at redhat.com Mon May 29 07:15:30 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 00:15:30 -0700 Subject: rpms/lua/FC-4 .cvsignore, 1.3, 1.4 lua.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200605290715.k4T7FWYv028594@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555/FC-4 Modified Files: .cvsignore lua.spec sources Log Message: include shared lib, added autotools patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 22:26:59 -0000 1.3 +++ .cvsignore 29 May 2006 07:15:30 -0000 1.4 @@ -1 +1 @@ -lua-5.1.tar.gz +lua-5.1-autotoolize-r1.patch.bz2 Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/lua.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lua.spec 7 May 2006 22:52:03 -0000 1.13 +++ lua.spec 29 May 2006 07:15:30 -0000 1.14 @@ -1,12 +1,13 @@ Name: lua Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT URL: http://www.lua.org/ Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz +Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, ncurses-devel @@ -25,31 +26,21 @@ %prep %setup -q +%patch0 -p1 %build -make %{?_smp_mflags} \ - MYCFLAGS="$RPM_OPT_FLAGS -fPIC" \ - MYLDFLAGS="-Wl,-E" \ - LOADLIB=-DUSE_DLOPEN=1 \ - DLLIB=-ldl \ -%ifarch %{ix86} x86_64 - NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ -%endif - USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" \ - linux +# fix perms on auto files +chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing +./autogen.sh -%install -rm -rf %{buildroot} -make install \ - INSTALL_TOP=%{buildroot}/usr \ - INSTALL_LIB=%{buildroot}/%{_libdir} \ - INSTALL_MAN=%{buildroot}%{_mandir}/man1 +%configure --with-readline -%check -make test +make %{?_smp_mflags} +%install +rm -rf %{buildroot} +%makeinstall %clean rm -rf %{buildroot} @@ -61,11 +52,15 @@ %{_bindir}/lua* %{_includedir}/l*.h %{_includedir}/l*.hpp -%{_libdir}/liblua*.a +%{_libdir}/liblua*.* +%{_libdir}/pkgconfig/*.pc %{_mandir}/man1/lua*.1* %changelog +* Mon May 29 2006 Michael J. Knox - 5.1-3 +- added autotools patch from Petri Lehtinen, http://lua-users.org + * Mon May 08 2006 Michael J. Knox - 5.1-2 - fixed x86_64 builds Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 May 2006 22:26:59 -0000 1.4 +++ sources 29 May 2006 07:15:30 -0000 1.5 @@ -1 +1,2 @@ 3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz +9e6a9655694450e26aa4e01220dd3636 lua-5.1-autotoolize-r1.patch.bz2 From fedora-extras-commits at redhat.com Mon May 29 07:15:31 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 00:15:31 -0700 Subject: rpms/lua/FC-5 .cvsignore, 1.3, 1.4 lua.spec, 1.13, 1.14 sources, 1.4, 1.5 Message-ID: <200605290715.k4T7FXxg028600@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555/FC-5 Modified Files: .cvsignore lua.spec sources Log Message: include shared lib, added autotools patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 May 2006 22:26:41 -0000 1.3 +++ .cvsignore 29 May 2006 07:15:31 -0000 1.4 @@ -1 +1 @@ -lua-5.1.tar.gz +lua-5.1-autotoolize-r1.patch.bz2 Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lua.spec 7 May 2006 22:52:04 -0000 1.13 +++ lua.spec 29 May 2006 07:15:31 -0000 1.14 @@ -1,12 +1,13 @@ Name: lua Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT URL: http://www.lua.org/ Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz +Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, ncurses-devel @@ -25,31 +26,21 @@ %prep %setup -q +%patch0 -p1 %build -make %{?_smp_mflags} \ - MYCFLAGS="$RPM_OPT_FLAGS -fPIC" \ - MYLDFLAGS="-Wl,-E" \ - LOADLIB=-DUSE_DLOPEN=1 \ - DLLIB=-ldl \ -%ifarch %{ix86} x86_64 - NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \ -%endif - USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \ - EXTRA_LIBS="-lm -lreadline -lncurses" \ - linux +# fix perms on auto files +chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing +./autogen.sh -%install -rm -rf %{buildroot} -make install \ - INSTALL_TOP=%{buildroot}/usr \ - INSTALL_LIB=%{buildroot}/%{_libdir} \ - INSTALL_MAN=%{buildroot}%{_mandir}/man1 +%configure --with-readline -%check -make test +make %{?_smp_mflags} +%install +rm -rf %{buildroot} +%makeinstall %clean rm -rf %{buildroot} @@ -61,11 +52,15 @@ %{_bindir}/lua* %{_includedir}/l*.h %{_includedir}/l*.hpp -%{_libdir}/liblua*.a +%{_libdir}/liblua*.* +%{_libdir}/pkgconfig/*.pc %{_mandir}/man1/lua*.1* %changelog +* Mon May 29 2006 Michael J. Knox - 5.1-3 +- added autotools patch from Petri Lehtinen, http://lua-users.org + * Mon May 08 2006 Michael J. Knox - 5.1-2 - fixed x86_64 builds Index: sources =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 May 2006 22:26:41 -0000 1.4 +++ sources 29 May 2006 07:15:31 -0000 1.5 @@ -1 +1,2 @@ 3e8dfe8be00a744cec2f9e766b2f2aee lua-5.1.tar.gz +9e6a9655694450e26aa4e01220dd3636 lua-5.1-autotoolize-r1.patch.bz2 From fedora-extras-commits at redhat.com Mon May 29 08:11:28 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:11:28 -0700 Subject: rpms/perl-Chart/devel .cvsignore, 1.4, 1.5 perl-Chart.spec, 1.5, 1.6 sources, 1.4, 1.5 dead.package, 1.1, NONE Message-ID: <200605290811.k4T8BVrA031180@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31159 Added Files: .cvsignore perl-Chart.spec sources Removed Files: dead.package Log Message: re-importing into devel Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 29 May 2006 08:11:28 -0000 1.5 @@ -0,0 +1 @@ +Chart-2.4.1.tar.gz Index: perl-Chart.spec =================================================================== RCS file: perl-Chart.spec diff -N perl-Chart.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ perl-Chart.spec 29 May 2006 08:11:28 -0000 1.6 @@ -0,0 +1,73 @@ +Name: perl-Chart +Version: 2.4.1 +Release: 2%{?dist} +Summary: Perl module for producing many types of charts + +Group: Development/Libraries +License: GPL or Artistic +URL: http://search.cpan.org/dist/Chart/ +Source0: http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: perl(GD) >= 1.20 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description +%{summary}. + + +%prep +%setup -q -n Chart-%{version} +chmod -c 644 Chart/*.pm TODO Documentation.pdf + + +%build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make pure_install PERL_INSTALL_ROOT=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w %{buildroot}/* + + +%check +make test + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc README TODO Documentation.pdf +%{perl_vendorlib}/Chart* +%{_mandir}/man3/Chart.3* + + +%changelog +* Mon May 29 2006 Michael J. Knox - 2.4.1-2 +- rebuilt and reimported in to devel + +* Wed Jan 25 2006 Ville Skytt?? - 2.4.1-1 +- 2.4.1. +- Don't ship rgb.txt in docs. +- Specfile cleanups. + +* Fri Apr 7 2005 Michael Schwendt - 2.3-3 +- rebuilt + +* Sun Jul 11 2004 Ville Skytt?? - 0:2.3-2 +- Bring up to date with current fedora.us Perl Spec template. + +* Thu Jan 15 2004 Ville Skytt?? - 0:2.3-0.fdr.1 +- Update to 2.3. +- Fix file permissions. + +* Sat Oct 11 2003 Ville Skytt?? - 0:2.2-0.fdr.1 +- First build. Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 29 May 2006 08:11:28 -0000 1.5 @@ -0,0 +1 @@ +5e7a80badfb8bf6e29b21879689bcc2f Chart-2.4.1.tar.gz --- dead.package DELETED --- From fedora-extras-commits at redhat.com Mon May 29 08:12:40 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:12:40 -0700 Subject: rpms/perl-Chart/devel Makefile,1.2,1.3 Message-ID: <200605290812.k4T8CgO0031208@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31191 Added Files: Makefile Log Message: and lets not forget the make file Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 29 May 2006 08:12:40 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: perl-Chart +# $Id$ +NAME := perl-Chart +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From fedora-extras-commits at redhat.com Mon May 29 08:15:26 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:15:26 -0700 Subject: rpms/perl-Chart/FC-5 perl-Chart.spec,1.4,1.5 Message-ID: <200605290815.k4T8FSq9031302@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31285 Modified Files: perl-Chart.spec Log Message: rebuild Index: perl-Chart.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/FC-5/perl-Chart.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Chart.spec 25 Jan 2006 16:34:46 -0000 1.4 +++ perl-Chart.spec 29 May 2006 08:15:26 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Chart Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module for producing many types of charts Group: Development/Libraries @@ -11,7 +11,7 @@ BuildArch: noarch BuildRequires: perl(GD) >= 1.20 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -28,11 +28,11 @@ %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/* +rm -rf %{buildroot} +make pure_install PERL_INSTALL_ROOT=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w %{buildroot}/* %check @@ -40,7 +40,7 @@ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -51,6 +51,9 @@ %changelog +* Mon May 29 2006 Michael J. Knox - 2.4.1-2 +- rebuilt and reimported in to devel + * Wed Jan 25 2006 Ville Skytt?? - 2.4.1-1 - 2.4.1. - Don't ship rgb.txt in docs. From fedora-extras-commits at redhat.com Mon May 29 08:19:18 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:19:18 -0700 Subject: rpms/perl-Chart/devel perl-Chart.spec,1.6,1.7 Message-ID: <200605290819.k4T8JKW4031403@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31368/devel Modified Files: perl-Chart.spec Log Message: bump release Index: perl-Chart.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/devel/perl-Chart.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Chart.spec 29 May 2006 08:11:28 -0000 1.6 +++ perl-Chart.spec 29 May 2006 08:19:18 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Chart Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for producing many types of charts Group: Development/Libraries @@ -51,7 +51,7 @@ %changelog -* Mon May 29 2006 Michael J. Knox - 2.4.1-2 +* Mon May 29 2006 Michael J. Knox - 2.4.1-3 - rebuilt and reimported in to devel * Wed Jan 25 2006 Ville Skytt?? - 2.4.1-1 From fedora-extras-commits at redhat.com Mon May 29 08:19:17 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:19:17 -0700 Subject: rpms/perl-Chart/FC-5 perl-Chart.spec,1.5,1.6 Message-ID: <200605290819.k4T8JJ0I031399@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/perl-Chart/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31368/FC-5 Modified Files: perl-Chart.spec Log Message: bump release Index: perl-Chart.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Chart/FC-5/perl-Chart.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Chart.spec 29 May 2006 08:15:26 -0000 1.5 +++ perl-Chart.spec 29 May 2006 08:19:17 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Chart Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for producing many types of charts Group: Development/Libraries @@ -51,7 +51,7 @@ %changelog -* Mon May 29 2006 Michael J. Knox - 2.4.1-2 +* Mon May 29 2006 Michael J. Knox - 2.4.1-3 - rebuilt and reimported in to devel * Wed Jan 25 2006 Ville Skytt?? - 2.4.1-1 From fedora-extras-commits at redhat.com Mon May 29 08:21:44 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 01:21:44 -0700 Subject: owners owners.list,1.1070,1.1071 Message-ID: <200605290821.k4T8LkHR031514@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31497 Modified Files: owners.list Log Message: take ownership of perl-Chart Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1070 retrieving revision 1.1071 diff -u -r1.1070 -r1.1071 --- owners.list 29 May 2006 04:52:43 -0000 1.1070 +++ owners.list 29 May 2006 08:21:44 -0000 1.1071 @@ -950,7 +950,7 @@ Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Chart|Perl modules for producing many types of charts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Chart|Perl modules for producing many types of charts|michael at knox.net.nz|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 29 09:02:51 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Mon, 29 May 2006 02:02:51 -0700 Subject: rpms/mod_cband/devel .cvsignore, 1.3, 1.4 mod_cband.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605290903.k4T93OfC001496@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1467 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 29 2006 Michael Fleming 0.9.7.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 09:34:06 -0000 1.3 +++ .cvsignore 29 May 2006 09:02:51 -0000 1.4 @@ -1 +1 @@ -mod-cband-0.9.7.3.tgz +mod-cband-0.9.7.4.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/mod_cband.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_cband.spec 1 May 2006 09:55:56 -0000 1.3 +++ mod_cband.spec 29 May 2006 09:02:51 -0000 1.4 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.3 -Release: 2%{?dist} +Version: 0.9.7.4 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 29 2006 Michael Fleming 0.9.7.4-1 +- New upstream release + * Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 May 2006 09:55:56 -0000 1.4 +++ sources 29 May 2006 09:02:51 -0000 1.5 @@ -1 +1 @@ -958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz +ff635d7b55bf7ca648d319247dfb45e3 mod-cband-0.9.7.4.tgz From fedora-extras-commits at redhat.com Mon May 29 10:52:05 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:52:05 -0700 Subject: rpms/rss-glx/devel - New directory Message-ID: <200605291052.k4TAq7TY004330@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301/rss-glx/devel Log Message: Directory /cvs/extras/rpms/rss-glx/devel added to the repository From fedora-extras-commits at redhat.com Mon May 29 10:52:04 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:52:04 -0700 Subject: rpms/rss-glx - New directory Message-ID: <200605291052.k4TAq6eX004327@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301/rss-glx Log Message: Directory /cvs/extras/rpms/rss-glx added to the repository From fedora-extras-commits at redhat.com Mon May 29 10:52:19 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:52:19 -0700 Subject: rpms/rss-glx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605291052.k4TAqL4u004377@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rss-glx --- NEW 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 May 29 10:52:19 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:52:19 -0700 Subject: rpms/rss-glx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605291052.k4TAqLRu004374@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346 Added Files: Makefile import.log Log Message: Setup of module rss-glx --- NEW FILE Makefile --- # Top level Makefile for module rss-glx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 29 10:53:53 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:53:53 -0700 Subject: rpms/rss-glx import.log,1.1,1.2 Message-ID: <200605291053.k4TArtRR004468@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4431 Modified Files: import.log Log Message: auto-import rss-glx-0.8.1.p-0.6 on branch devel from rss-glx-0.8.1.p-0.6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rss-glx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 May 2006 10:52:19 -0000 1.1 +++ import.log 29 May 2006 10:53:53 -0000 1.2 @@ -0,0 +1 @@ +rss-glx-0_8_1_p-0_6:HEAD:rss-glx-0.8.1.p-0.6.src.rpm:1148900026 From fedora-extras-commits at redhat.com Mon May 29 10:53:54 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:53:54 -0700 Subject: rpms/rss-glx/devel README.fedora, NONE, 1.1 rss-glx-0.8.1-0.8.1.p.diff, NONE, 1.1 rss-glx-0.8.1-freealut.patch, NONE, 1.1 rss-glx-rm-matrixview.sh, NONE, 1.1 rss-glx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605291053.k4TAruND004477@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4431/devel Modified Files: .cvsignore sources Added Files: README.fedora rss-glx-0.8.1-0.8.1.p.diff rss-glx-0.8.1-freealut.patch rss-glx-rm-matrixview.sh rss-glx.spec Log Message: auto-import rss-glx-0.8.1.p-0.6 on branch devel from rss-glx-0.8.1.p-0.6.src.rpm --- NEW FILE README.fedora --- The Fedora packages of rss-glx contain a patched tarball without the matrixview hack. To generate this patched tarball from upstream sources, simply run: sh ./rss-glx-rm-matrixview.sh with e.g.: orig_tarball: rss-glx_0.8.1.tar.bz2 diff_file: rss-glx-0.8.1-0.8.1.p.diff new_tarball: rss-glx-0.8.1.p.tar.bz2 rss-glx-0.8.1-0.8.1.p.diff: --- NEW FILE rss-glx-0.8.1-0.8.1.p.diff --- diff -ur rss-glx_0.8.1/ChangeLog rss-glx_0.8.1.p/ChangeLog --- rss-glx_0.8.1/ChangeLog 2006-02-25 23:02:11.000000000 +0100 +++ rss-glx_0.8.1.p/ChangeLog 2006-03-10 15:25:10.000000000 +0100 @@ -1,3 +1,7 @@ +****************************** Version 0.8.1.p ******************************** + + Removed matrixview + ******************************* Version 0.8.1 ********************************* Pulled in vroot.h patch from Ari Pollak's Debian package. diff -ur rss-glx_0.8.1/configure.in rss-glx_0.8.1.p/configure.in --- rss-glx_0.8.1/configure.in 2006-02-25 22:10:54.000000000 +0100 +++ rss-glx_0.8.1.p/configure.in 2006-03-10 15:38:37.000000000 +0100 @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. AC_INIT(src/driver.cpp) -AM_INIT_AUTOMAKE(rss-glx,0.7.3) +AM_INIT_AUTOMAKE(rss-glx,0.8.1.p) AM_CONFIG_HEADER(config.h) # Checks for programs. @@ -177,9 +177,6 @@ AC_CHECK_LIB([MesaGLU],[gluLookAt],,AC_MSG_ERROR(GLU library was not found.)) fi -# Check for ImageMagick. -PKG_CHECK_MODULES(Wand, Wand >= 6.2) - AC_CHECK_HEADERS([GL/glew.h]) if test "x$ac_cv_header_GL_glew_h" = "xyes" ; then diff -ur rss-glx_0.8.1/other_src/Makefile.am rss-glx_0.8.1.p/other_src/Makefile.am --- rss-glx_0.8.1/other_src/Makefile.am 2006-02-25 22:14:53.000000000 +0100 +++ rss-glx_0.8.1.p/other_src/Makefile.am 2006-03-10 15:21:57.000000000 +0100 @@ -1,35 +1,20 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -bin_PROGRAMS = biof busyspheres matrixview spirographx sundancer2 +bin_PROGRAMS = biof busyspheres spirographx sundancer2 biof_SOURCES = driver.c biof.c busyspheres_SOURCES = driver.c busyspheres.c -matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c spirographx_SOURCES = driver.c spirographx.c sundancer2_SOURCES = driver.c sundancer2.c if INSTALL_XSCREENSAVER_CONFIG_FILES -dist_config_DATA = biof.xml busyspheres.xml matrixview.xml spirographx.xml sundancer2.xml +dist_config_DATA = biof.xml busyspheres.xml spirographx.xml sundancer2.xml endif if INSTALL_KDE_CONFIG_FILES -dist_kdessconfig_DATA = biof.desktop busyspheres.desktop matrixview.desktop spirographx.desktop sundancer2.desktop +dist_kdessconfig_DATA = biof.desktop busyspheres.desktop spirographx.desktop sundancer2.desktop endif -man_MANS = biof.1 busyspheres.1 matrixview.1 spirographx.1 sundancer2.1 +man_MANS = biof.1 busyspheres.1 spirographx.1 sundancer2.1 EXTRA_DIST = $(man_MANS) - -noinst_PROGRAMS = stringify -stringify_LDADD = @BZIP2@ - -matrixview_LDADD = @BZIP2@ @Wand_LIBS@ -matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics - ./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c - -if WITHPTHREADS -matrixview_LDADD += @PTHREADS@ -endif - -CLEANFILES = matrixview_textures.c - diff -ur rss-glx_0.8.1/README rss-glx_0.8.1.p/README --- rss-glx_0.8.1/README 2006-02-25 22:47:58.000000000 +0100 +++ rss-glx_0.8.1.p/README 2006-03-10 15:38:44.000000000 +0100 @@ -1,6 +1,4 @@ Requirements: (1) Recent gcc/g++ (2.95.x, 3.x). (2) X11+GLX. - (3) ImageMagick >6.2 (4) OPTIONAL: OpenAL for sound. (skyrocket) - (5) OPTIONAL: pthreads for smoother image loading. (matrixview) diff -ur rss-glx_0.8.1/README.xscreensaver rss-glx_0.8.1.p/README.xscreensaver --- rss-glx_0.8.1/README.xscreensaver 2005-04-10 04:16:42.000000000 +0200 +++ rss-glx_0.8.1.p/README.xscreensaver 2006-03-10 15:25:26.000000000 +0100 @@ -28,6 +28,5 @@ GL: "BioF" biof --root \n\ GL: "BusySpheres" busyspheres --root \n\ GL: "SpirographX" spirographx --root \n\ - GL: "MatrixView" matrixview --root \n\ -- End Here -- diff -ur rss-glx_0.8.1/utils/rss-glx_install.pl rss-glx_0.8.1.p/utils/rss-glx_install.pl --- rss-glx_0.8.1/utils/rss-glx_install.pl 2005-04-10 04:09:41.000000000 +0200 +++ rss-glx_0.8.1.p/utils/rss-glx_install.pl 2006-03-10 15:24:13.000000000 +0100 @@ -26,7 +26,6 @@ $screensavers->{'biof'} = ' GL: "BioF" biof --root \\n\\'; $screensavers->{'busyspheres'} = ' GL: "BusySpheres" busyspheres --root \\n\\'; $screensavers->{'spirographx'} = ' GL: "SpirographX" spirographx --root \\n\\'; -$screensavers->{'matrixview'} = ' GL: "MatrixView" matrixview --root \\n\\'; open XSCREENSAVER, "$ENV{'HOME'}/.xscreensaver"; my @xscreensaver_config_file = ; rss-glx-0.8.1-freealut.patch: --- NEW FILE rss-glx-0.8.1-freealut.patch --- --- rss-glx_0.8.1.p/configure.in.freealut 2006-03-10 15:38:37.000000000 +0100 +++ rss-glx_0.8.1.p/configure.in 2006-03-28 17:38:02.000000000 +0200 @@ -114,14 +114,30 @@ if test "x$ac_cv_header_AL_alut_h" = "xyes" ; then # Check for OpenAL library AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, -lopenal) AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + alut_libs_sav="$LIBS" + if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then + echo "... checking with separate -lalut"; + unset ac_cv_lib_openal_alutInit + LIBS="$LIBS -lalut" + AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + fi + LIBS="$alut_libs_sav" if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then - libs_sav=$LIBS + libs_sav="$LIBS" LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS -L/usr/local/lib" echo "Hrm, maybe -lopenal is in /usr/local/lib"; unset ac_cv_lib_openal_alutInit AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, -lopenal) AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + alut_libs_sav="$LIBS" + if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then + echo "... checking with separate -lalut"; + unset ac_cv_lib_openal_alutInit + LIBS="$LIBS -lalut" + AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + fi + LIBS="$alut_libs_sav" if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then # For FreeBSD -current @@ -132,6 +148,12 @@ unset ac_cv_lib_openal_alutInit AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lc_r") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then + echo "... checking with separate -lalut"; + unset ac_cv_lib_openal_alutInit + LIBS="$LIBS -lalut" + AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut -lc_r") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.])) + fi LIBS=$libs_cr_sav --- NEW FILE rss-glx-rm-matrixview.sh --- #!/bin/bash MV_FILES="matrixview.1 matrixview.c matrixview.desktop matrixview_textures matrixview_textures.h matrixview.xml" mv_files= for i in $MV_FILES; do mv_files="$mv_files other_src/$i" done usage() { cat << EOF Usage: $0 original_tarball diff-file new_tarball E.g.: $0 rss-glx_0.8.1.tar.bz2 rss-glx-0.8.1-0.8.1.p.diff rss-glx_0.8.1.p.tar.bz2 Required tools for operation: mktemp patch aclocal automake autoconf tar EOF } tar_type() { local filename="$1" case "$filename" in *.tar.gz|*.tgz) echo -z ;; *.tar.bz2|*.tbz2) echo -j ;; *.tar) ;; *) usage exit 1 esac } tar_dir() { local filename="$1" local dirname="${filename##*/}" dirname="${dirname%.tar.bz2}" dirname="${dirname%.tbz2}" dirname="${dirname%.tar.gz}" dirname="${dirname%.tgz}" dirname="${dirname%.tar}" #dirname="${dirname/rss-glx_/rss-glx-}" echo "$dirname" } if [ "$#" -ne 3 ]; then usage exit 1 fi orig_tb="$1" if [ "$orig_tb" = "${orig_tb#/}" ]; then orig_tb="$PWD/$orig_tb" fi orig_tb_type="$(tar_type "$orig_tb")" orig_tb_dir="$(tar_dir "$orig_tb")" diff_file="$2" if [ "$diff_file" = "${diff_file#/}" ]; then diff_file="$PWD/$diff_file" fi new_tb="$3" if [ "$new_tb" = "${new_tb#/}" ]; then new_tb="$PWD/$new_tb" fi new_tb_type="$(tar_type "$new_tb")" new_tb_dir="$(tar_dir "$new_tb")" echo "Creating temporary directory." if ! TEMP_DIR="$(mktemp -d)"; then echo "mktemp failed to create a temporary directory. Aborting." exit 1 fi echo "Changing to temporary directory ${TEMP_DIR}." pushd "$TEMP_DIR" echo "Unpacking original tarball." set -x tar -x "$orig_tb_type" -f "$orig_tb" || exit 3 set +x pushd "$orig_tb_dir" echo "Removing files:" set -x for i in $mv_files; do rm -r "$i" || exit 4 done set +x echo "Applying diff file." patch -p1 < "$diff_file" || exit 5 echo 'Regenerating auto* files:' set -x aclocal || exit 6 automake || exit 7 autoconf || exit 8 rm -rf autom4te.cache || : set +x popd echo "Renaming directory:" set -x mv -f "$orig_tb_dir" "$new_tb_dir" || exit 9 set +x echo "Creating new tarball:" set -x tar -c "$new_tb_type" -f "$new_tb" "$new_tb_dir" || exit 10 set +x echo "Created ${new_tb}." popd echo "Removing temporary directory ${TEMP_DIR}." rm -rf "$TEMP_DIR" || exit 11 echo "Done." --- NEW FILE rss-glx.spec --- %define xssconfigdir %{_datadir}/xscreensaver/config %define xssbindir %{_libexecdir}/xscreensaver %define gssconfigdir %{_datadir}/gnome-screensaver/themes %define gssbindir %{_libexecdir}/gnome-screensaver %define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers %if 0%{?fedora} %if "%{fedora}" <= "4" %define modular_x 0%{?_with_modular_x:1} %define gss 0 %else %define modular_x 0%{!?_without_modular_x:1} %define gss 1 %endif %else %define modular_x 0%{?!_without_modular_x:1} %define gss 0%{?!_without_gss:1} %endif %define with_matrixview 0%{?_with_matrixview:1} %define patchext %{nil}%{?with_matrixview:.p} Summary: Really Slick Screensavers Name: rss-glx Version: 0.8.1%{patchext} Release: 0.6%{?dist} License: GPL Group: Amusements/Graphics URL: http://rss-glx.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2 Source1: README.fedora Source2: rss-glx-rm-matrixview.sh Source3: rss-glx-0.8.1-0.8.1.p.diff Patch0: rss-glx-0.8.1-freealut.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libGL-devel BuildRequires: libGLU-devel %if %modular_x BuildRequires: libICE-devel %if %with_matrixview BuildRequires: ImageMagick-devel >= 6.2.5.4 %endif BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel %endif BuildRequires: bzip2-devel BuildRequires: openal-devel BuildRequires: freealut-devel BuildRequires: autoconf %description A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. Note that this package contains only the display hacks themselves; you will need to install the appropriate subpackage for your desktop environment in order to use them as screensavers. %package xscreensaver Summary: Really Slick Screensavers Group: Amusements/Graphics Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: xscreensaver-base %description xscreensaver A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. This package contains files needed to use the hacks with xscreensaver. %if %gss %package gnome-screensaver Summary: Really Slick Screensavers Group: Amusements/Graphics Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gnome-screensaver %description gnome-screensaver A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. This package contains files needed to use the hacks with gnome-screensaver. %endif %package kde Summary: Really Slick Screensavers Group: Amusements/Graphics Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release} Requires: kdebase %description kde A port of the Really Slick Screensavers to GLX. Provides several visually impressive and graphically intensive screensavers. This package contains files needed to use the hacks with KDE. %prep cat << EOF Build settings: %if %modular_x - with modular X %else - with monolithic X %endif %if %gss - with gnome-screensaver support %else - without gnome-screensaver support %endif %if %with_matrixview - with matrixview hack %else - without matrixview hack %endif EOF %setup -q -n rss-glx_%{version} %patch0 -p1 -b .freealut %build autoconf %configure \ --with-configdir=%{xssconfigdir} \ --with-kdessconfigdir=%{kdessconfigdir} make %{?_smp_mflags} %install generate_fix_desktop_files_links () { local line name trycmd cmd desc while read line; do %if %gss # generate GNOME screensaver desktop files eval $(echo "$line" | awk -F?? '{print "name=\"" $1 "\"; cmd=\"" $2 "\"; desc=\"" $3 "\""}') trycmd="${cmd%%%% *}" cat << EOF > %{buildroot}%{gssconfigdir}/rss-glx-${cmd}.desktop [Desktop Entry] Encoding=UTF-8 Name=${name} Comment=${desc} TryExec=rss-glx-${trycmd} Exec=rss-glx-${cmd} -r StartupNotify=false Terminal=false Type=Application Categories=Screensaver EOF ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{gssbindir}/rss-glx-${trycmd}" %endif # fix KDE screensaver desktop files pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null mv -f "${trycmd}.desktop" "${trycmd}.desktop.orig" awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${trycmd}.desktop.orig" > "${trycmd}.desktop" rm -f "${trycmd}.desktop.orig" popd >& /dev/null # symlinks for XScreenSaver ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}" done } rm -rf %buildroot cp -dpf "%SOURCE1" "%SOURCE2" "%SOURCE3" . make DESTDIR=%{buildroot} install rm -f %{buildroot}%{_libdir}/lib*.{,l}a %{buildroot}%{_bindir}/rss-glx_install.pl %if %gss mkdir -p %{buildroot}%{gssconfigdir} mkdir -p %{buildroot}%{gssbindir} mkdir -p %{buildroot}%{xssbindir} %endif cat << EOF | generate_fix_desktop_files_links BioF??biof??This is an attempt to recreate some of the work of William Latham. Busy Spheres??busyspheres??Spheres made of dancing particles. Colorfire??colorfire??Burning colors. Cyclone??cyclone??A cyclone made of particles. Euphoria??euphoria??Psychedelic shapes. Fieldlines??fieldlines??A simulation of the electric field lines between charged particles. Flocks??flocks??Flocks of birds. Flux??flux??If you know anything about strange attractors, you might recognize the patterns created by this screensaver. Helios??helios??Throw together some attraction/repulsion particle effects and some smooth implicit surfaces and this is what you get. Hufo's Smoke??hufo_smoke??Smoke effect. Hufo's Tunnel??hufo_tunnel??Inside a tunnel. Hyperspace??hyperspace??Hyperspace. Lattice??lattice??Fly through an endless world of linked rings. %if %with_matrixview MatrixView??matrixview??The Matrix. %endif Plasma??plasma??Probably the second most psychedelic screensaver in existence. Skyrocket (silent)??skyrocket -v 0??The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version. Skyrocket??skyrocket??The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound. Solarwinds??solarwinds??This is a very mesmerizing particle effects saver. SpirographX??spirographx??Spirograph-like screensaver. Sundancer2??sundancer2??Rotating stack of quads. EOF %clean rm -rf %buildroot %files %defattr(-, root, root) %doc ChangeLog COPYING INSTALL README README.xscreensaver %doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.1-0.8.1.p.diff %{_bindir}/* %{_mandir}/*/* %files xscreensaver %defattr(-, root, root) %{xssconfigdir}/*.xml %dir %{xssbindir} %{xssbindir}/* %if %gss %files gnome-screensaver %defattr(-, root, root) %dir %{gssconfigdir} %{gssconfigdir}/*.desktop %dir %{gssbindir} %{gssbindir}/* %endif %files kde %defattr(-, root, root) %dir %{kdessconfigdir} %{kdessconfigdir}/*.desktop %changelog * Fri May 26 2006 Nils Philippsen 0.8.1.p-0.6 - symlink hacks to /usr/libexec/xscreensaver - own directories not included in filesystem * Wed May 24 2006 Nils Philippsen 0.8.1.p-0.5 - include %%{patchext} in version - fix excessively long line in %%description - make -kde require -xscreensaver - fix "Actions", add "X-KDE-Category" and "X-KDE-Type" to KDE desktop files * Tue May 23 2006 Nils Philippsen 0.8.1.p-0.4 - remove executable bit from doc files, change README.fedora accordingly - use %%buildroot consistently - don't ship rss-glx_install.pl - make %%description more understandable (Jason Tibbitts) * Mon May 22 2006 Nils Philippsen 0.8.1.p-0.3 - include README.fedora, rss-glx-rm-matrixview.sh, rss-glx-0.8.1-0.8.1.p.diff to be able to generate patched from upstream tarball - versionize %%changelog - don't obsolete rss_glx - don't distribute zero-length AUTHORS and NEWS files * Mon Apr 03 2006 Nils Philippsen 0.8.1.p-0.2 - add libXt-devel to modular X build requirements (#90133) * Tue Mar 28 2006 Nils Philippsen - use freealut when needed * Fri Mar 10 2006 Nils Philippsen - add build requirements for non-modular X, default determined by Fedora version - patch tarball to remove matrixview - don't build gnome-screensaver subpackage before FC5 * Thu Mar 09 2006 Nils Philippsen 0.8.1 - version 0.8.1 - include gnome-screensaver support - new build requirements for FC5 * Wed Jul 07 2004 Nils Philippsen - rebuild for FC2 * Wed Sep 10 2003 Nils Philippsen - version 0.7.6 - manage new matrixview and spirographx hacks in XScreensaver.ad * Fri Jul 04 2003 Nils Philippsen - version 0.7.4 - fix temp file issue in scripts - buildrequire OpenAL-devel - move stuff out of /usr/X11R6 - patch inline asm to work with new gcc versions - remove hacks from XScreensaver.ad in %%preun Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rss-glx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 May 2006 10:52:19 -0000 1.1 +++ .cvsignore 29 May 2006 10:53:54 -0000 1.2 @@ -0,0 +1 @@ +rss-glx_0.8.1.p.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/rss-glx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 May 2006 10:52:19 -0000 1.1 +++ sources 29 May 2006 10:53:54 -0000 1.2 @@ -0,0 +1 @@ +17870ad88d3a61ace94c04cb7677ddbf rss-glx_0.8.1.p.tar.bz2 From fedora-extras-commits at redhat.com Mon May 29 10:57:14 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 03:57:14 -0700 Subject: owners owners.list,1.1071,1.1072 Message-ID: <200605291057.k4TAvGNV004541@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4524 Modified Files: owners.list Log Message: Add rss-glx Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1071 retrieving revision 1.1072 diff -u -r1.1071 -r1.1072 --- owners.list 29 May 2006 08:21:44 -0000 1.1071 +++ owners.list 29 May 2006 10:57:13 -0000 1.1072 @@ -1474,6 +1474,7 @@ Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|lists at forevermore.net|extras-qa at fedoraproject.org| +Fedora Extras|rss-glx|Really Slick Screensavers|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon May 29 11:02:52 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Mon, 29 May 2006 04:02:52 -0700 Subject: fedora-security/audit fc4,1.268,1.269 fc5,1.181,1.182 Message-ID: <200605291102.k4TB2qGu006996@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6857/audit Modified Files: fc4 fc5 Log Message: It is CVE-2004-2660 and not CVE-2006-2660 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- fc4 28 May 2006 12:45:01 -0000 1.268 +++ fc4 29 May 2006 11:02:47 -0000 1.269 @@ -4,7 +4,6 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] -CVE-2006-2660 ** kernel, fixed 2.6.10 CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 @@ -921,6 +920,7 @@ CVE-2005-0004 version (mysql, fixed 4.1.10) CVE-2005-0003 version (kernel, fixed 2.6.10) CVE-2005-0001 version (kernel, fixed 2.6.10) +CVE-2004-2660 version (kernel, fixed 2.6.10) CVE-2004-2657 ignore (firefox) windows only CVE-2004-2655 version (xscreensaver) CVE-2004-2654 version (squid, fixed 2.6STABLE6) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- fc5 28 May 2006 12:45:01 -0000 1.181 +++ fc5 29 May 2006 11:02:47 -0000 1.182 @@ -4,7 +4,6 @@ ** are items that need attention CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] -CVE-2006-2660 ** kernel, fixed 2.6.10 CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 @@ -918,6 +917,7 @@ CVE-2005-0004 version (mysql, fixed 4.1.10) CVE-2005-0003 version (kernel, fixed 2.6.10) CVE-2005-0001 version (kernel, fixed 2.6.10) +CVE-2004-2660 version (kernel, fixed 2.6.10) CVE-2004-2657 ignore (firefox) windows only CVE-2004-2655 version (xscreensaver) CVE-2004-2654 version (squid, fixed 2.6STABLE6) From fedora-extras-commits at redhat.com Mon May 29 13:12:02 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 29 May 2006 06:12:02 -0700 Subject: rpms/perl-Crypt-DSA/devel perl-Crypt-DSA.spec,1.2,1.3 Message-ID: <200605291312.k4TDC43E013095@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Crypt-DSA/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13078 Modified Files: perl-Crypt-DSA.spec Log Message: Add missing buildreq: which Index: perl-Crypt-DSA.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Crypt-DSA.spec 9 May 2006 09:29:15 -0000 1.2 +++ perl-Crypt-DSA.spec 29 May 2006 13:12:02 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Perl module for DSA signatures and key generation Name: perl-Crypt-DSA Version: 0.14 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Crypt-DSA/ @@ -12,6 +12,7 @@ BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Convert::PEM) >= 0.07 BuildRequires: perl(Data::Buffer) >= 0.01 +BuildRequires: which %description Crypt::DSA is an implementation of the DSA (Digital Signature Algorithm) @@ -51,6 +52,9 @@ %{_mandir}/man3/Crypt::DSA::Util.3pm* %changelog +* Mon May 29 2006 Paul Howarth 0.14-2 +- Add missing buildreq: which + * Tue May 9 2006 Paul Howarth 0.14-1 - Update to 0.14 From fedora-extras-commits at redhat.com Mon May 29 13:22:20 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Mon, 29 May 2006 06:22:20 -0700 Subject: rpms/rss-glx/devel rss-glx.spec,1.1,1.2 Message-ID: <200605291322.k4TDMMS7013207@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/rss-glx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13190 Modified Files: rss-glx.spec Log Message: bump release Index: rss-glx.spec =================================================================== RCS file: /cvs/extras/rpms/rss-glx/devel/rss-glx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rss-glx.spec 29 May 2006 10:53:54 -0000 1.1 +++ rss-glx.spec 29 May 2006 13:22:20 -0000 1.2 @@ -23,7 +23,7 @@ Summary: Really Slick Screensavers Name: rss-glx Version: 0.8.1%{patchext} -Release: 0.6%{?dist} +Release: 1%{?dist} License: GPL Group: Amusements/Graphics URL: http://rss-glx.sourceforge.net/ @@ -228,6 +228,9 @@ %{kdessconfigdir}/*.desktop %changelog +* Mon May 29 2006 Nils Philippsen 0.8.1.p-1 +- bump release + * Fri May 26 2006 Nils Philippsen 0.8.1.p-0.6 - symlink hacks to /usr/libexec/xscreensaver - own directories not included in filesystem From fedora-extras-commits at redhat.com Mon May 29 14:02:42 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 07:02:42 -0700 Subject: rpms/asymptote/devel asymptote.spec,1.2,1.3 Message-ID: <200605291403.k4TE3EHP015681@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15661 Modified Files: asymptote.spec Log Message: Requires /usr/bin/texi2dvi instead of texinfo Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- asymptote.spec 27 May 2006 13:53:33 -0000 1.2 +++ asymptote.spec 29 May 2006 14:02:41 -0000 1.3 @@ -5,7 +5,7 @@ Name: asymptote Version: 1.06 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Descriptive vector graphics language Group: Applications/Publishing @@ -23,7 +23,8 @@ BuildRequires: gsl-devel BuildRequires: tetex-latex BuildRequires: ghostscript -BuildRequires: texinfo +# Fedora Core 6: the texinfo package produces two RPMS: texinfo and texinfo-tex. +BuildRequires: /usr/bin/texi2dvi Requires: tetex-latex Requires: tkinter @@ -135,6 +136,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 1.06-5 +- Fedora Core 6: the texinfo package has been splitted (texinfo + texinfo-tex). + * Sat May 27 2006 Jose Pedro Oliveira - 1.06-4 - Group: Development/Tools -> Applications/Publishing (#193154). From fedora-extras-commits at redhat.com Mon May 29 14:14:26 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 29 May 2006 07:14:26 -0700 Subject: rpms/liferea/FC-5 liferea-1.0.14-doc.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 liferea.spec, 1.39, 1.40 sources, 1.28, 1.29 Message-ID: <200605291414.k4TEESc9015851@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15827 Modified Files: .cvsignore liferea.spec sources Added Files: liferea-1.0.14-doc.patch Log Message: * Mon May 29 2006 Brian Pepple - 1.0.14-2 - Add patch to fix doc build. - Drop NEWS, since it doesn't contain any useful info. - Update to 1.0.14. liferea-1.0.14-doc.patch: --- NEW FILE liferea-1.0.14-doc.patch --- diff -ur liferea-1.0.14/configure liferea-1.0.14.NEW/configure --- liferea-1.0.14/configure 2006-05-28 21:04:10.000000000 -0400 +++ liferea-1.0.14.NEW/configure 2006-05-29 10:00:08.000000000 -0400 @@ -25798,7 +25798,7 @@ -ac_config_files="$ac_config_files Makefile src/Makefile src/mozilla/Makefile src/gtkhtml2/Makefile src/net/Makefile src/liferea doc/html/Makefile pixmaps/Makefile opml/Makefile po/Makefile.in liferea.spec liferea-SuSE.spec" +ac_config_files="$ac_config_files Makefile src/Makefile src/mozilla/Makefile src/gtkhtml2/Makefile src/net/Makefile src/liferea doc/Makefile doc/html/Makefile pixmaps/Makefile opml/Makefile po/Makefile.in liferea.spec liferea-SuSE.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -26450,6 +26450,7 @@ "src/gtkhtml2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gtkhtml2/Makefile" ;; "src/net/Makefile") CONFIG_FILES="$CONFIG_FILES src/net/Makefile" ;; "src/liferea") CONFIG_FILES="$CONFIG_FILES src/liferea" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;; "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;; "opml/Makefile") CONFIG_FILES="$CONFIG_FILES opml/Makefile" ;; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 13:08:59 -0000 1.27 +++ .cvsignore 29 May 2006 14:14:25 -0000 1.28 @@ -1 +1 @@ -liferea-1.0.11.tar.gz +liferea-1.0.14.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- liferea.spec 4 May 2006 13:08:59 -0000 1.39 +++ liferea.spec 29 May 2006 14:14:25 -0000 1.40 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.11 +Version: 1.0.14 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -9,6 +9,7 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-doc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -38,6 +39,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .doc %build @@ -92,11 +94,12 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc COPYING AUTHORS NEWS README ChangeLog +%doc COPYING AUTHORS README ChangeLog %{_mandir}/man1/%{name}.1.gz %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_bindir}/%{name}-bin +%{_bindir}/%{name}-add-feed %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -105,6 +108,11 @@ %changelog +* Mon May 29 2006 Brian Pepple - 1.0.14-2 +- Add patch to fix doc build. +- Drop NEWS, since it doesn't contain any useful info. +- Update to 1.0.14. + * Thu May 4 2006 Brian Pepple - 1.0.11-2 - Update to 1.0.11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 4 May 2006 13:08:59 -0000 1.28 +++ sources 29 May 2006 14:14:25 -0000 1.29 @@ -1 +1 @@ -6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz +066497fcfaa60472d4f6bea6ef85f132 liferea-1.0.14.tar.gz From fedora-extras-commits at redhat.com Mon May 29 14:18:05 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 29 May 2006 07:18:05 -0700 Subject: rpms/liferea/devel liferea-1.0.14-doc.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 liferea.spec, 1.39, 1.40 sources, 1.28, 1.29 Message-ID: <200605291418.k4TEI76B015975@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15950 Modified Files: .cvsignore liferea.spec sources Added Files: liferea-1.0.14-doc.patch Log Message: * Mon May 29 2006 Brian Pepple - 1.0.14-3 - Update to 1.0.14. - Add patch to fix doc build. - Drop NEWS, since it doesn't contain any useful info. liferea-1.0.14-doc.patch: --- NEW FILE liferea-1.0.14-doc.patch --- diff -ur liferea-1.0.14/configure liferea-1.0.14.NEW/configure --- liferea-1.0.14/configure 2006-05-28 21:04:10.000000000 -0400 +++ liferea-1.0.14.NEW/configure 2006-05-29 10:00:08.000000000 -0400 @@ -25798,7 +25798,7 @@ -ac_config_files="$ac_config_files Makefile src/Makefile src/mozilla/Makefile src/gtkhtml2/Makefile src/net/Makefile src/liferea doc/html/Makefile pixmaps/Makefile opml/Makefile po/Makefile.in liferea.spec liferea-SuSE.spec" +ac_config_files="$ac_config_files Makefile src/Makefile src/mozilla/Makefile src/gtkhtml2/Makefile src/net/Makefile src/liferea doc/Makefile doc/html/Makefile pixmaps/Makefile opml/Makefile po/Makefile.in liferea.spec liferea-SuSE.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -26450,6 +26450,7 @@ "src/gtkhtml2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gtkhtml2/Makefile" ;; "src/net/Makefile") CONFIG_FILES="$CONFIG_FILES src/net/Makefile" ;; "src/liferea") CONFIG_FILES="$CONFIG_FILES src/liferea" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;; "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;; "opml/Makefile") CONFIG_FILES="$CONFIG_FILES opml/Makefile" ;; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 May 2006 13:03:47 -0000 1.27 +++ .cvsignore 29 May 2006 14:18:05 -0000 1.28 @@ -1 +1 @@ -liferea-1.0.11.tar.gz +liferea-1.0.14.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- liferea.spec 4 May 2006 13:03:47 -0000 1.39 +++ liferea.spec 29 May 2006 14:18:05 -0000 1.40 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.11 +Version: 1.0.14 Release: 3%{?dist} Summary: An RSS/RDF feed reader @@ -9,6 +9,7 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-doc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -38,6 +39,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .doc %build @@ -92,11 +94,12 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc COPYING AUTHORS NEWS README ChangeLog +%doc COPYING AUTHORS README ChangeLog %{_mandir}/man1/%{name}.1.gz %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_bindir}/%{name}-bin +%{_bindir}/%{name}-add-feed %{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -105,6 +108,11 @@ %changelog +* Mon May 29 2006 Brian Pepple - 1.0.14-3 +- Update to 1.0.14. +- Add patch to fix doc build. +- Drop NEWS, since it doesn't contain any useful info. + * Wed May 3 2006 Brian Pepple - 1.0.11-3 - Update to 1.0.11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 4 May 2006 13:03:47 -0000 1.28 +++ sources 29 May 2006 14:18:05 -0000 1.29 @@ -1 +1 @@ -6a0bff2a9764b49c35a23d6a9551b79d liferea-1.0.11.tar.gz +066497fcfaa60472d4f6bea6ef85f132 liferea-1.0.14.tar.gz From fedora-extras-commits at redhat.com Mon May 29 16:00:04 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 29 May 2006 09:00:04 -0700 Subject: rpms/azureus/FC-5 .cvsignore, 1.5, 1.6 azureus-MessageSlideShell-swt-3.1.patch, 1.1, 1.2 azureus-nativetabs.patch, 1.1, 1.2 azureus-no-install-remove-plugins.patch, 1.2, 1.3 azureus-no-update-manager-CoreUpdateChecker.patch, 1.2, 1.3 azureus-no-update-manager-SWTUpdateChecker.patch, 1.1, 1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.2, 1.3 azureus-no-updates-PluginInterfaceImpl.patch, 1.2, 1.3 azureus-themed.patch, 1.3, 1.4 sources, 1.5, 1.6 azureus-ChangeLog.txt, 1.1, NONE Message-ID: <200605291600.k4TG07i5018642@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568 Modified Files: .cvsignore azureus-MessageSlideShell-swt-3.1.patch azureus-nativetabs.patch azureus-no-install-remove-plugins.patch azureus-no-update-manager-CoreUpdateChecker.patch azureus-no-update-manager-SWTUpdateChecker.patch azureus-no-update-manager-UpdateMonitor.patch azureus-no-updates-PluginInterfaceImpl.patch azureus-themed.patch sources Removed Files: azureus-ChangeLog.txt Log Message: Update sources. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Apr 2006 22:08:05 -0000 1.5 +++ .cvsignore 29 May 2006 16:00:04 -0000 1.6 @@ -1,3 +1,3 @@ -azureus2-cvs-20060325.tar.gz -azplugins_1.8.8.jar +azureus2-cvs-20060529.tar.bz2 bdcc_2.2.2.zip +azplugins_1.8.8.jar azureus-MessageSlideShell-swt-3.1.patch: Index: azureus-MessageSlideShell-swt-3.1.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-MessageSlideShell-swt-3.1.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-MessageSlideShell-swt-3.1.patch 1 Apr 2006 22:08:05 -0000 1.1 +++ azureus-MessageSlideShell-swt-3.1.patch 29 May 2006 16:00:04 -0000 1.2 @@ -1,9 +1,9 @@ ---- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~ 2006-03-20 23:10:27.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-03-25 17:30:47.000000000 -0800 +--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.orig 2006-05-26 09:16:25.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-05-26 09:28:39.000000000 -0700 @@ -269,13 +269,7 @@ - // Create shell & widgets - shell = new Shell(display, SWT.ON_TOP); + int style = SWT.ON_TOP; + shell = new Shell(display, style); - if (USE_SWT32_BG_SET) { - try { - shell.setBackgroundMode(SWT.INHERIT_DEFAULT); @@ -15,7 +15,7 @@ Utils.setShellIcon(shell); shell.setText(popupParams.title); -@@ -507,13 +501,6 @@ +@@ -515,13 +509,6 @@ gc.dispose(); boolean bAlternateDrawing = true; azureus-nativetabs.patch: Index: azureus-nativetabs.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-nativetabs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-nativetabs.patch 24 Apr 2006 20:25:10 -0000 1.1 +++ azureus-nativetabs.patch 29 May 2006 16:00:04 -0000 1.2 @@ -1,28 +1,17 @@ ---- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-04-17 16:00:58.000000000 +0200 -+++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-04-17 16:01:21.000000000 +0200 -@@ -78,8 +78,8 @@ - cLook.setLayout(layout); +--- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-02-15 05:36:31.000000000 -0800 ++++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-05-26 09:55:19.000000000 -0700 +@@ -79,7 +79,7 @@ BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab", -- true, MSG_PREFIX + "useCustomTabs"); + true, MSG_PREFIX + "useCustomTabs"); - Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true, -+ false, MSG_PREFIX + "useCustomTabs"); + Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false, MSG_PREFIX + "useFancyTabs").getControl(); Control[] controls = { cFancyTab }; ---- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig 2006-04-17 17:25:18.000000000 +0200 -+++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-04-17 17:26:19.000000000 +0200 -@@ -154,7 +154,7 @@ - - def.put("User Mode", new Long(0)); - -- def.put("useCustomTab",TRUE); -+ def.put("useCustomTab",FALSE); - def.put("GUI Refresh",new Long(1000)); - def.put("Graphics Update",new Long(4)); - def.put("ReOrder Delay",new Long(0)); -@@ -167,7 +167,7 @@ +--- org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.~1.196.~ 2006-05-26 09:16:13.000000000 -0700 ++++ org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-05-26 09:56:44.000000000 -0700 +@@ -174,7 +174,7 @@ def.put("Use default data dir", FALSE); def.put("Default save path", "" ); azureus-no-install-remove-plugins.patch: Index: azureus-no-install-remove-plugins.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-install-remove-plugins.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-install-remove-plugins.patch 1 Apr 2006 22:08:05 -0000 1.2 +++ azureus-no-install-remove-plugins.patch 29 May 2006 16:00:04 -0000 1.3 @@ -1,5 +1,5 @@ ---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-03-28 04:35:35.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-03-28 04:41:30.000000000 -0800 +--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-05-26 09:20:06.000000000 -0700 @@ -347,26 +347,6 @@ menu_plugin_logViews.setMenu(pluginLogsMenu); menu_plugin_logViews.setData("EOL", "1"); @@ -38,7 +38,7 @@ - help_checkupdate.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - mainWindow.getShell().setFocus(); -- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true); +- UpdateMonitor.getSingleton( mainWindow.getAzureusCore(), mainWindow).performCheck(true); - } - }); - } azureus-no-update-manager-CoreUpdateChecker.patch: Index: azureus-no-update-manager-CoreUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-CoreUpdateChecker.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-update-manager-CoreUpdateChecker.patch 1 Apr 2006 22:08:05 -0000 1.2 +++ azureus-no-update-manager-CoreUpdateChecker.patch 29 May 2006 16:00:04 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-03-25 14:18:45.000000000 -0800 -+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-03-25 17:19:32.000000000 -0800 -@@ -122,8 +122,6 @@ +--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-05-14 08:10:03.000000000 -0700 ++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-05-26 09:23:28.000000000 -0700 +@@ -123,8 +123,6 @@ props.setProperty( "plugin.version", plugin_interface.getAzureusVersion()); rdf = plugin_interface.getUtilities().getResourceDownloaderFactory(); @@ -9,7 +9,7 @@ } public String -@@ -142,155 +140,9 @@ +@@ -143,156 +141,9 @@ checkForUpdate( final UpdateChecker checker ) { @@ -101,19 +101,6 @@ - - top_downloader.getSize(); - -- top_downloader.addListener( -- new ResourceDownloaderAdapter() -- { -- public boolean -- completed( -- final ResourceDownloader downloader, -- InputStream data ) -- { -- installUpdate( checker, downloader, f_latest_version, data ); -- -- return( true ); -- } -- }); - - byte[] info_b = (byte[])decoded.get( "info" ); - @@ -141,13 +128,27 @@ - desc = new String[]{"Core Azureus Version", info }; - } - -- checker.addUpdate( +- final Update update = +- checker.addUpdate( - "Core Azureus Version", - desc, - latest_version, - top_downloader, - Update.RESTART_REQUIRED_YES ); - +- top_downloader.addListener( +- new ResourceDownloaderAdapter() +- { +- public boolean +- completed( +- final ResourceDownloader downloader, +- InputStream data ) +- { +- installUpdate( checker, update, downloader, f_latest_version, data ); +- +- return( true ); +- } +- }); - }catch( Throwable e ){ - - log.log( e ); azureus-no-update-manager-SWTUpdateChecker.patch: Index: azureus-no-update-manager-SWTUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-SWTUpdateChecker.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-SWTUpdateChecker.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-SWTUpdateChecker.patch 29 May 2006 16:00:04 -0000 1.2 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-02-09 23:23:47.000000000 -0500 -+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-02-09 23:25:02.000000000 -0500 -@@ -57,77 +57,14 @@ +--- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-05-26 09:25:21.000000000 -0700 +@@ -57,77 +57,13 @@ public static void initialize() { @@ -37,14 +37,6 @@ - downloaders.toArray(new ResourceDownloader[downloaders.size()]); - - swtDownloader = factory.getRandomDownloader(resourceDownloaders); -- -- swtDownloader.addListener(new ResourceDownloaderAdapter() { -- -- public boolean completed(ResourceDownloader downloader, InputStream data) { -- //On completion, process the InputStream to store temp files -- return processData(checker,data); -- } -- }); - - // get the size so its cached up - @@ -56,13 +48,21 @@ - Debug.printStackTrace( e ); - } - -- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(), -- new String[] {"SWT is the graphical library used by Azureus"}, -- "" + versionGetter.getLatestVersion(), -- swtDownloader, -- Update.RESTART_REQUIRED_YES +- final Update update = +- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(), +- new String[] {"SWT is the graphical library used by Azureus"}, +- "" + versionGetter.getLatestVersion(), +- swtDownloader, +- Update.RESTART_REQUIRED_YES - ); - +- swtDownloader.addListener(new ResourceDownloaderAdapter() { +- +- public boolean completed(ResourceDownloader downloader, InputStream data) { +- //On completion, process the InputStream to store temp files +- return processData(checker,update,downloader,data); +- } +- }); - } - }catch( Throwable e ){ - Logger.log(new LogAlert(LogAlert.UNREPEATABLE, @@ -71,7 +71,7 @@ - checker.failed(); - - }finally{ - +- checker.completed(); - } - azureus-no-update-manager-UpdateMonitor.patch: Index: azureus-no-update-manager-UpdateMonitor.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-UpdateMonitor.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-update-manager-UpdateMonitor.patch 1 Apr 2006 22:08:05 -0000 1.2 +++ azureus-no-update-manager-UpdateMonitor.patch 29 May 2006 16:00:04 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-03-28 04:35:36.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-03-28 04:44:37.000000000 -0800 -@@ -88,149 +88,19 @@ +--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-05-26 09:27:25.000000000 -0700 +@@ -90,206 +90,19 @@ { azureus_core = _azureus_core; @@ -17,6 +17,63 @@ - } - }); - +- um.addVerificationListener( +- new UpdateManagerVerificationListener() +- { +- public boolean +- acceptUnVerifiedUpdate( +- final Update update ) +- { +- final boolean accept[] = {false}; +- +- Utils.execSWTThread( +- new Runnable() +- { +- public void +- run() +- { +- accept[0] = MessageBoxWindow.open( +- "UpdateMonitor.messagebox.accept.unverified", +- SWT.YES | SWT.NO, +- SWT.NULL, +- false, +- _main_window.getDisplay(), +- MessageBoxWindow.ICON_WARNING, +- MessageText.getString( "UpdateMonitor.messagebox.accept.unverified.title" ), +- MessageText.getString( +- "UpdateMonitor.messagebox.accept.unverified.text", +- new String[]{ update.getName()})) == SWT.YES; +- +- } +- }, +- false ); +- +- return( accept[0] ); +- } +- +- public void +- verificationFailed( +- final Update update, +- final Throwable cause ) +- { +- final String cause_str = Debug.getNestedExceptionMessage( cause ); +- +- Utils.execSWTThread( +- new Runnable() +- { +- public void +- run() +- { +- Utils.openMessageBox( +- _main_window.getShell(), +- SWT.OK, +- "UpdateMonitor.messagebox.verification.failed", +- new String[]{ update.getName(), cause_str }); +- } +- }); +- } +- }); +- - SimpleTimer.addPeriodicEvent( - AUTO_UPDATE_CHECK_PERIOD, - new TimerEventPerformer() @@ -81,12 +138,11 @@ - if ( start_of_day ){ - MainWindow.getWindow().setStatusText(""); - } -- + - CoreUpdateChecker.doUsageStats(); - } - }); - } -+ } public void azureus-no-updates-PluginInterfaceImpl.patch: Index: azureus-no-updates-PluginInterfaceImpl.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-updates-PluginInterfaceImpl.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-updates-PluginInterfaceImpl.patch 14 Feb 2006 04:46:19 -0000 1.2 +++ azureus-no-updates-PluginInterfaceImpl.patch 29 May 2006 16:00:04 -0000 1.3 @@ -1,14 +1,14 @@ ---- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-02-09 23:03:10.000000000 -0500 -+++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-02-09 23:03:41.000000000 -0500 -@@ -47,7 +47,6 @@ +--- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-05-02 02:33:14.000000000 -0700 ++++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-05-12 09:58:07.000000000 -0700 +@@ -48,7 +48,6 @@ import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository; import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl; import org.gudy.azureus2.pluginsimpl.local.utils.*; -import org.gudy.azureus2.pluginsimpl.local.update.*; + import org.gudy.azureus2.plugins.ipc.IPCInterface; import org.gudy.azureus2.plugins.ipfilter.IPFilter; import org.gudy.azureus2.plugins.tracker.Tracker; - import org.gudy.azureus2.plugins.ui.config.Parameter; -@@ -409,7 +408,7 @@ +@@ -412,7 +411,7 @@ public UpdateManager getUpdateManager() { azureus-themed.patch: Index: azureus-themed.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-themed.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- azureus-themed.patch 24 Apr 2006 20:25:10 -0000 1.3 +++ azureus-themed.patch 29 May 2006 16:00:04 -0000 1.4 @@ -1,15 +1,15 @@ ---- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-22 17:48:33.000000000 +0200 -+++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java 2006-04-22 17:50:33.000000000 +0200 +--- org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-24 06:11:48.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-05-12 09:54:14.000000000 -0700 @@ -32,6 +32,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; + import java.lang.reflect.Method; import java.util.*; - /** -@@ -59,6 +61,25 @@ +@@ -61,6 +63,25 @@ loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash"); } @@ -35,7 +35,7 @@ public static void loadImages(Display display) { loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32"); loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64"); -@@ -103,20 +124,44 @@ +@@ -105,20 +126,44 @@ //ToolBar Icons loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open"); @@ -89,10 +89,10 @@ + loadImage(display, + getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), + "cb_publish"); + loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/sendto.png", "cb_send"); //Status icons - loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok"); -@@ -157,6 +202,16 @@ +@@ -167,6 +212,16 @@ Image im = getImage(name,false); if(null == im) { InputStream is = loader.getResourceAsStream(res); @@ -109,10 +109,10 @@ if(null != is) { try { if(alpha == 255) { -@@ -453,4 +508,4 @@ +@@ -483,4 +538,4 @@ return key; } -} -\ Kein Zeilenumbruch am Dateiende. +\ No newline at end of file +} Index: sources =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Apr 2006 22:08:05 -0000 1.5 +++ sources 29 May 2006 16:00:04 -0000 1.6 @@ -1,3 +1,3 @@ -a1827e2041841940c4ca16fdf240afac azureus2-cvs-20060325.tar.gz -28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar +086cf7f988efd91064b6da5ab78469a8 azureus2-cvs-20060529.tar.bz2 0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip +28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar --- azureus-ChangeLog.txt DELETED --- From fedora-extras-commits at redhat.com Mon May 29 16:00:47 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 29 May 2006 09:00:47 -0700 Subject: rpms/azureus/FC-5 azureus.spec,1.24,1.25 Message-ID: <200605291600.k4TG0nE8018667@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648 Modified Files: azureus.spec Log Message: Update sources. Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- azureus.spec 24 Apr 2006 20:25:10 -0000 1.24 +++ azureus.spec 29 May 2006 16:00:46 -0000 1.25 @@ -1,6 +1,6 @@ Name: azureus Version: 2.4.0.3 -Release: 0.20060328cvs_5%{?dist} +Release: 0.20060529cvs_1%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -9,16 +9,15 @@ # A cvs snapshot with the build and bouncycastle directories # removed. -Source0: azureus2-cvs-20060325.tar.gz +Source0: azureus2-cvs-20060529.tar.bz2 Source1: azureus.script Source2: Azureus.desktop Source3: azureus.applications Source4: azureus-License.txt -Source5: azureus-ChangeLog.txt -Source6: azplugins_1.8.8.jar -Source7: bdcc_2.2.2.zip +Source5: azplugins_1.8.8.jar +Source6: bdcc_2.2.2.zip Patch0: azureus-remove-win32-osx-platforms.patch Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch @@ -47,6 +46,8 @@ Patch24: azureus-MessageSlideShell-swt-3.1.patch Patch25: azureus-no-update-manager-MainStatusBar.patch Patch26: azureus-nativetabs.patch +#Patch27: azureus-debug3.patch +#Patch28: azureus-debug4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,7 +78,7 @@ %patch4 -p0 %patch5 -p0 %patch6 -p0 -%patch7 -p1 +%patch7 -p0 %patch8 -p0 %patch9 -p0 %patch10 -p0 @@ -96,9 +97,10 @@ %patch23 -p0 %patch24 -p0 %patch25 -p0 -%patch26 -p1 +%patch26 -p0 +#%patch27 -p0 +#%patch28 -p0 cp %{SOURCE4} License.txt -cp %{SOURCE5} ChangeLog.txt %build mkdir -p build/libs @@ -114,14 +116,14 @@ mkdir -p plugins/azplugins cd plugins/azplugins -unzip -q %{SOURCE6} +unzip -q %{SOURCE5} rm -f *.jar `find ./ -name \*class` find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.1.1`:../..:. find ./ -name \*java | xargs rm jar cvf azplugins_1.8.8.jar . cd ../.. -unzip -q %{SOURCE7} +unzip -q %{SOURCE6} cd plugins/bdcc unzip *.jar rm -f *.jar `find ./ -name \*class` @@ -206,6 +208,14 @@ %{_libdir}/gcj/* %changelog +* Wed May 29 2006 Anthony Green - 2.4.0.3-0.20060529cvs_1 +- Updated sources. +- Re-enable close button on tabs in nativetabs patch. +- Use proper ChangeLog.txt file. + +* Wed May 03 2006 Anthony Green - 2.4.0.3-0.20060503cvs_1 +- Updated sources. + * Mon Apr 24 2006 Anthony Green - 2.4.0.3-0.20060328cvs_5 - Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and an updated azureus-themed.patch to work around GCC PR 27271. From fedora-extras-commits at redhat.com Mon May 29 16:02:46 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Mon, 29 May 2006 09:02:46 -0700 Subject: rpms/azureus/devel .cvsignore, 1.5, 1.6 azureus-MessageSlideShell-swt-3.1.patch, 1.1, 1.2 azureus-nativetabs.patch, 1.1, 1.2 azureus-no-install-remove-plugins.patch, 1.2, 1.3 azureus-no-update-manager-CoreUpdateChecker.patch, 1.2, 1.3 azureus-no-update-manager-SWTUpdateChecker.patch, 1.1, 1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.2, 1.3 azureus-no-updates-PluginInterfaceImpl.patch, 1.2, 1.3 azureus-themed.patch, 1.3, 1.4 azureus.script, 1.7, 1.8 azureus.spec, 1.20, 1.21 sources, 1.5, 1.6 azureus-ChangeLog.txt, 1.1, NONE Message-ID: <200605291603.k4TG3J0I021090@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21008 Modified Files: .cvsignore azureus-MessageSlideShell-swt-3.1.patch azureus-nativetabs.patch azureus-no-install-remove-plugins.patch azureus-no-update-manager-CoreUpdateChecker.patch azureus-no-update-manager-SWTUpdateChecker.patch azureus-no-update-manager-UpdateMonitor.patch azureus-no-updates-PluginInterfaceImpl.patch azureus-themed.patch azureus.script azureus.spec sources Removed Files: azureus-ChangeLog.txt Log Message: Update sources. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 May 2006 14:35:02 -0000 1.5 +++ .cvsignore 29 May 2006 16:02:45 -0000 1.6 @@ -1,3 +1,3 @@ -azureus2-cvs-20060325.tar.gz -azplugins_1.8.8.jar +azureus2-cvs-20060529.tar.bz2 bdcc_2.2.2.zip +azplugins_1.8.8.jar azureus-MessageSlideShell-swt-3.1.patch: Index: azureus-MessageSlideShell-swt-3.1.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-MessageSlideShell-swt-3.1.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-MessageSlideShell-swt-3.1.patch 12 May 2006 14:35:02 -0000 1.1 +++ azureus-MessageSlideShell-swt-3.1.patch 29 May 2006 16:02:45 -0000 1.2 @@ -1,9 +1,9 @@ ---- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~ 2006-03-20 23:10:27.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-03-25 17:30:47.000000000 -0800 +--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.orig 2006-05-26 09:16:25.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-05-26 09:28:39.000000000 -0700 @@ -269,13 +269,7 @@ - // Create shell & widgets - shell = new Shell(display, SWT.ON_TOP); + int style = SWT.ON_TOP; + shell = new Shell(display, style); - if (USE_SWT32_BG_SET) { - try { - shell.setBackgroundMode(SWT.INHERIT_DEFAULT); @@ -15,7 +15,7 @@ Utils.setShellIcon(shell); shell.setText(popupParams.title); -@@ -507,13 +501,6 @@ +@@ -515,13 +509,6 @@ gc.dispose(); boolean bAlternateDrawing = true; azureus-nativetabs.patch: Index: azureus-nativetabs.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-nativetabs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-nativetabs.patch 12 May 2006 14:35:02 -0000 1.1 +++ azureus-nativetabs.patch 29 May 2006 16:02:45 -0000 1.2 @@ -1,28 +1,17 @@ ---- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-04-17 16:00:58.000000000 +0200 -+++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-04-17 16:01:21.000000000 +0200 -@@ -78,8 +78,8 @@ - cLook.setLayout(layout); +--- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-02-15 05:36:31.000000000 -0800 ++++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-05-26 09:55:19.000000000 -0700 +@@ -79,7 +79,7 @@ BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab", -- true, MSG_PREFIX + "useCustomTabs"); + true, MSG_PREFIX + "useCustomTabs"); - Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true, -+ false, MSG_PREFIX + "useCustomTabs"); + Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false, MSG_PREFIX + "useFancyTabs").getControl(); Control[] controls = { cFancyTab }; ---- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig 2006-04-17 17:25:18.000000000 +0200 -+++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-04-17 17:26:19.000000000 +0200 -@@ -154,7 +154,7 @@ - - def.put("User Mode", new Long(0)); - -- def.put("useCustomTab",TRUE); -+ def.put("useCustomTab",FALSE); - def.put("GUI Refresh",new Long(1000)); - def.put("Graphics Update",new Long(4)); - def.put("ReOrder Delay",new Long(0)); -@@ -167,7 +167,7 @@ +--- org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.~1.196.~ 2006-05-26 09:16:13.000000000 -0700 ++++ org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-05-26 09:56:44.000000000 -0700 +@@ -174,7 +174,7 @@ def.put("Use default data dir", FALSE); def.put("Default save path", "" ); azureus-no-install-remove-plugins.patch: Index: azureus-no-install-remove-plugins.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-install-remove-plugins.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-install-remove-plugins.patch 12 May 2006 14:35:02 -0000 1.2 +++ azureus-no-install-remove-plugins.patch 29 May 2006 16:02:45 -0000 1.3 @@ -1,5 +1,5 @@ ---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-03-28 04:35:35.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-03-28 04:41:30.000000000 -0800 +--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-05-26 09:20:06.000000000 -0700 @@ -347,26 +347,6 @@ menu_plugin_logViews.setMenu(pluginLogsMenu); menu_plugin_logViews.setData("EOL", "1"); @@ -38,7 +38,7 @@ - help_checkupdate.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - mainWindow.getShell().setFocus(); -- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true); +- UpdateMonitor.getSingleton( mainWindow.getAzureusCore(), mainWindow).performCheck(true); - } - }); - } azureus-no-update-manager-CoreUpdateChecker.patch: Index: azureus-no-update-manager-CoreUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-CoreUpdateChecker.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-update-manager-CoreUpdateChecker.patch 12 May 2006 14:35:02 -0000 1.2 +++ azureus-no-update-manager-CoreUpdateChecker.patch 29 May 2006 16:02:45 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-03-25 14:18:45.000000000 -0800 -+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-03-25 17:19:32.000000000 -0800 -@@ -122,8 +122,6 @@ +--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-05-14 08:10:03.000000000 -0700 ++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-05-26 09:23:28.000000000 -0700 +@@ -123,8 +123,6 @@ props.setProperty( "plugin.version", plugin_interface.getAzureusVersion()); rdf = plugin_interface.getUtilities().getResourceDownloaderFactory(); @@ -9,7 +9,7 @@ } public String -@@ -142,155 +140,9 @@ +@@ -143,156 +141,9 @@ checkForUpdate( final UpdateChecker checker ) { @@ -101,19 +101,6 @@ - - top_downloader.getSize(); - -- top_downloader.addListener( -- new ResourceDownloaderAdapter() -- { -- public boolean -- completed( -- final ResourceDownloader downloader, -- InputStream data ) -- { -- installUpdate( checker, downloader, f_latest_version, data ); -- -- return( true ); -- } -- }); - - byte[] info_b = (byte[])decoded.get( "info" ); - @@ -141,13 +128,27 @@ - desc = new String[]{"Core Azureus Version", info }; - } - -- checker.addUpdate( +- final Update update = +- checker.addUpdate( - "Core Azureus Version", - desc, - latest_version, - top_downloader, - Update.RESTART_REQUIRED_YES ); - +- top_downloader.addListener( +- new ResourceDownloaderAdapter() +- { +- public boolean +- completed( +- final ResourceDownloader downloader, +- InputStream data ) +- { +- installUpdate( checker, update, downloader, f_latest_version, data ); +- +- return( true ); +- } +- }); - }catch( Throwable e ){ - - log.log( e ); azureus-no-update-manager-SWTUpdateChecker.patch: Index: azureus-no-update-manager-SWTUpdateChecker.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-SWTUpdateChecker.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azureus-no-update-manager-SWTUpdateChecker.patch 10 Feb 2006 17:00:46 -0000 1.1 +++ azureus-no-update-manager-SWTUpdateChecker.patch 29 May 2006 16:02:45 -0000 1.2 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-02-09 23:23:47.000000000 -0500 -+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-02-09 23:25:02.000000000 -0500 -@@ -57,77 +57,14 @@ +--- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-05-26 09:25:21.000000000 -0700 +@@ -57,77 +57,13 @@ public static void initialize() { @@ -37,14 +37,6 @@ - downloaders.toArray(new ResourceDownloader[downloaders.size()]); - - swtDownloader = factory.getRandomDownloader(resourceDownloaders); -- -- swtDownloader.addListener(new ResourceDownloaderAdapter() { -- -- public boolean completed(ResourceDownloader downloader, InputStream data) { -- //On completion, process the InputStream to store temp files -- return processData(checker,data); -- } -- }); - - // get the size so its cached up - @@ -56,13 +48,21 @@ - Debug.printStackTrace( e ); - } - -- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(), -- new String[] {"SWT is the graphical library used by Azureus"}, -- "" + versionGetter.getLatestVersion(), -- swtDownloader, -- Update.RESTART_REQUIRED_YES +- final Update update = +- checker.addUpdate("SWT Library for " + versionGetter.getPlatform(), +- new String[] {"SWT is the graphical library used by Azureus"}, +- "" + versionGetter.getLatestVersion(), +- swtDownloader, +- Update.RESTART_REQUIRED_YES - ); - +- swtDownloader.addListener(new ResourceDownloaderAdapter() { +- +- public boolean completed(ResourceDownloader downloader, InputStream data) { +- //On completion, process the InputStream to store temp files +- return processData(checker,update,downloader,data); +- } +- }); - } - }catch( Throwable e ){ - Logger.log(new LogAlert(LogAlert.UNREPEATABLE, @@ -71,7 +71,7 @@ - checker.failed(); - - }finally{ - +- checker.completed(); - } - azureus-no-update-manager-UpdateMonitor.patch: Index: azureus-no-update-manager-UpdateMonitor.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-UpdateMonitor.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-update-manager-UpdateMonitor.patch 12 May 2006 14:35:02 -0000 1.2 +++ azureus-no-update-manager-UpdateMonitor.patch 29 May 2006 16:02:45 -0000 1.3 @@ -1,6 +1,6 @@ ---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-03-28 04:35:36.000000000 -0800 -+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-03-28 04:44:37.000000000 -0800 -@@ -88,149 +88,19 @@ +--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-05-14 08:10:01.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-05-26 09:27:25.000000000 -0700 +@@ -90,206 +90,19 @@ { azureus_core = _azureus_core; @@ -17,6 +17,63 @@ - } - }); - +- um.addVerificationListener( +- new UpdateManagerVerificationListener() +- { +- public boolean +- acceptUnVerifiedUpdate( +- final Update update ) +- { +- final boolean accept[] = {false}; +- +- Utils.execSWTThread( +- new Runnable() +- { +- public void +- run() +- { +- accept[0] = MessageBoxWindow.open( +- "UpdateMonitor.messagebox.accept.unverified", +- SWT.YES | SWT.NO, +- SWT.NULL, +- false, +- _main_window.getDisplay(), +- MessageBoxWindow.ICON_WARNING, +- MessageText.getString( "UpdateMonitor.messagebox.accept.unverified.title" ), +- MessageText.getString( +- "UpdateMonitor.messagebox.accept.unverified.text", +- new String[]{ update.getName()})) == SWT.YES; +- +- } +- }, +- false ); +- +- return( accept[0] ); +- } +- +- public void +- verificationFailed( +- final Update update, +- final Throwable cause ) +- { +- final String cause_str = Debug.getNestedExceptionMessage( cause ); +- +- Utils.execSWTThread( +- new Runnable() +- { +- public void +- run() +- { +- Utils.openMessageBox( +- _main_window.getShell(), +- SWT.OK, +- "UpdateMonitor.messagebox.verification.failed", +- new String[]{ update.getName(), cause_str }); +- } +- }); +- } +- }); +- - SimpleTimer.addPeriodicEvent( - AUTO_UPDATE_CHECK_PERIOD, - new TimerEventPerformer() @@ -81,12 +138,11 @@ - if ( start_of_day ){ - MainWindow.getWindow().setStatusText(""); - } -- + - CoreUpdateChecker.doUsageStats(); - } - }); - } -+ } public void azureus-no-updates-PluginInterfaceImpl.patch: Index: azureus-no-updates-PluginInterfaceImpl.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-updates-PluginInterfaceImpl.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- azureus-no-updates-PluginInterfaceImpl.patch 14 Feb 2006 04:46:19 -0000 1.2 +++ azureus-no-updates-PluginInterfaceImpl.patch 29 May 2006 16:02:45 -0000 1.3 @@ -1,14 +1,14 @@ ---- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-02-09 23:03:10.000000000 -0500 -+++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-02-09 23:03:41.000000000 -0500 -@@ -47,7 +47,6 @@ +--- org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java.orig 2006-05-02 02:33:14.000000000 -0700 ++++ org/gudy/azureus2/pluginsimpl/local/PluginInterfaceImpl.java 2006-05-12 09:58:07.000000000 -0700 +@@ -48,7 +48,6 @@ import org.gudy.azureus2.pluginsimpl.local.ui.config.ParameterRepository; import org.gudy.azureus2.pluginsimpl.local.ui.config.PluginConfigUIFactoryImpl; import org.gudy.azureus2.pluginsimpl.local.utils.*; -import org.gudy.azureus2.pluginsimpl.local.update.*; + import org.gudy.azureus2.plugins.ipc.IPCInterface; import org.gudy.azureus2.plugins.ipfilter.IPFilter; import org.gudy.azureus2.plugins.tracker.Tracker; - import org.gudy.azureus2.plugins.ui.config.Parameter; -@@ -409,7 +408,7 @@ +@@ -412,7 +411,7 @@ public UpdateManager getUpdateManager() { azureus-themed.patch: Index: azureus-themed.patch =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus-themed.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- azureus-themed.patch 12 May 2006 14:35:02 -0000 1.3 +++ azureus-themed.patch 29 May 2006 16:02:45 -0000 1.4 @@ -1,15 +1,15 @@ ---- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-22 17:48:33.000000000 +0200 -+++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java 2006-04-22 17:50:33.000000000 +0200 +--- org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-24 06:11:48.000000000 -0700 ++++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-05-12 09:54:14.000000000 -0700 @@ -32,6 +32,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; + import java.lang.reflect.Method; import java.util.*; - /** -@@ -59,6 +61,25 @@ +@@ -61,6 +63,25 @@ loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash"); } @@ -35,7 +35,7 @@ public static void loadImages(Display display) { loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32"); loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64"); -@@ -103,20 +124,44 @@ +@@ -105,20 +126,44 @@ //ToolBar Icons loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open"); @@ -89,10 +89,10 @@ + loadImage(display, + getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), + "cb_publish"); + loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/sendto.png", "cb_send"); //Status icons - loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok"); -@@ -157,6 +202,16 @@ +@@ -167,6 +212,16 @@ Image im = getImage(name,false); if(null == im) { InputStream is = loader.getResourceAsStream(res); @@ -109,10 +109,10 @@ if(null != is) { try { if(alpha == 255) { -@@ -453,4 +508,4 @@ +@@ -483,4 +538,4 @@ return key; } -} -\ Kein Zeilenumbruch am Dateiende. +\ No newline at end of file +} Index: azureus.script =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- azureus.script 10 Feb 2006 17:00:46 -0000 1.7 +++ azureus.script 29 May 2006 16:02:45 -0000 1.8 @@ -9,10 +9,10 @@ # Reconstruct the plugins dir. rm -rf $APPDIR/plugins mkdir -p $APPDIR/plugins -pushd $APPDIR/plugins +pushd $APPDIR/plugins > /dev/null 2>&1 for pdir in /usr/share/azureus/plugins/*; do ln -s $pdir .; done; -popd +popd > /dev/null 2>&1 -CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@" +LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@" Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- azureus.spec 12 May 2006 14:35:02 -0000 1.20 +++ azureus.spec 29 May 2006 16:02:45 -0000 1.21 @@ -1,6 +1,6 @@ Name: azureus Version: 2.4.0.3 -Release: 0.20060328cvs_5%{?dist} +Release: 0.20060529cvs_1%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -9,16 +9,15 @@ # A cvs snapshot with the build and bouncycastle directories # removed. -Source0: azureus2-cvs-20060325.tar.gz +Source0: azureus2-cvs-20060529.tar.bz2 Source1: azureus.script Source2: Azureus.desktop Source3: azureus.applications Source4: azureus-License.txt -Source5: azureus-ChangeLog.txt -Source6: azplugins_1.8.8.jar -Source7: bdcc_2.2.2.zip +Source5: azplugins_1.8.8.jar +Source6: bdcc_2.2.2.zip Patch0: azureus-remove-win32-osx-platforms.patch Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch @@ -47,6 +46,8 @@ Patch24: azureus-MessageSlideShell-swt-3.1.patch Patch25: azureus-no-update-manager-MainStatusBar.patch Patch26: azureus-nativetabs.patch +#Patch27: azureus-debug3.patch +#Patch28: azureus-debug4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,7 +78,7 @@ %patch4 -p0 %patch5 -p0 %patch6 -p0 -%patch7 -p1 +%patch7 -p0 %patch8 -p0 %patch9 -p0 %patch10 -p0 @@ -96,9 +97,10 @@ %patch23 -p0 %patch24 -p0 %patch25 -p0 -%patch26 -p1 +%patch26 -p0 +#%patch27 -p0 +#%patch28 -p0 cp %{SOURCE4} License.txt -cp %{SOURCE5} ChangeLog.txt %build mkdir -p build/libs @@ -114,14 +116,14 @@ mkdir -p plugins/azplugins cd plugins/azplugins -unzip -q %{SOURCE6} +unzip -q %{SOURCE5} rm -f *.jar `find ./ -name \*class` find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.1.1`:../..:. find ./ -name \*java | xargs rm jar cvf azplugins_1.8.8.jar . cd ../.. -unzip -q %{SOURCE7} +unzip -q %{SOURCE6} cd plugins/bdcc unzip *.jar rm -f *.jar `find ./ -name \*class` @@ -206,6 +208,14 @@ %{_libdir}/gcj/* %changelog +* Wed May 29 2006 Anthony Green - 2.4.0.3-0.20060529cvs_1 +- Updated sources. +- Re-enable close button on tabs in nativetabs patch. +- Use proper ChangeLog.txt file. + +* Wed May 03 2006 Anthony Green - 2.4.0.3-0.20060503cvs_1 +- Updated sources. + * Mon Apr 24 2006 Anthony Green - 2.4.0.3-0.20060328cvs_5 - Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and an updated azureus-themed.patch to work around GCC PR 27271. Index: sources =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 May 2006 14:35:02 -0000 1.5 +++ sources 29 May 2006 16:02:45 -0000 1.6 @@ -1,3 +1,3 @@ -a1827e2041841940c4ca16fdf240afac azureus2-cvs-20060325.tar.gz -28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar +086cf7f988efd91064b6da5ab78469a8 azureus2-cvs-20060529.tar.bz2 0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip +28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar --- azureus-ChangeLog.txt DELETED --- From fedora-extras-commits at redhat.com Mon May 29 16:10:18 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 29 May 2006 09:10:18 -0700 Subject: rpms/perl-Template-Toolkit/FC-4 perl-Template-Toolkit.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200605291610.k4TGAKb4021207@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157/FC-4 Modified Files: perl-Template-Toolkit.spec sources Log Message: Bump to 2.15 Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-4/perl-Template-Toolkit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Template-Toolkit.spec 7 Apr 2006 18:11:28 -0000 1.5 +++ perl-Template-Toolkit.spec 29 May 2006 16:10:18 -0000 1.6 @@ -1,13 +1,11 @@ Name: perl-Template-Toolkit -Version: 2.14 -Release: 8%{?dist} +Version: 2.15 +Release: 1%{?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 @@ -34,7 +32,6 @@ %prep %setup -q -n Template-Toolkit-%{version} -%patch0 -p0 find lib -type f | xargs chmod -c -x # Filter false positive provides. @@ -97,6 +94,10 @@ %{_datadir}/tt2/examples %changelog +* Mon May 29 2006 Tom "spot" Callaway - 2.15-1 +- bump to 2.15 +- gd test is gone, don't need to patch anything + * Tue Feb 28 2006 Tom "spot" Callaway - 2.14-8 - really resolve bug 173756 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jul 2005 17:41:38 -0000 1.2 +++ sources 29 May 2006 16:10:18 -0000 1.3 @@ -1 +1 @@ -0eed60763ef2465c50f9b6a33e51cc14 Template-Toolkit-2.14.tar.gz +26adb4e6d3f2f89e2b54a43f73b70a29 Template-Toolkit-2.15.tar.gz From fedora-extras-commits at redhat.com Mon May 29 16:10:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 29 May 2006 09:10:19 -0700 Subject: rpms/perl-Template-Toolkit/devel .cvsignore, 1.2, 1.3 perl-Template-Toolkit.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200605291610.k4TGALEZ021218@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-serv21157/devel Modified Files: .cvsignore perl-Template-Toolkit.spec sources Log Message: Bump to 2.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Jul 2005 17:41:38 -0000 1.2 +++ .cvsignore 29 May 2006 16:10:19 -0000 1.3 @@ -1 +1,2 @@ Template-Toolkit-2.14.tar.gz +Template-Toolkit-2.15.tar.gz Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Template-Toolkit.spec 7 Apr 2006 18:11:30 -0000 1.5 +++ perl-Template-Toolkit.spec 29 May 2006 16:10:19 -0000 1.6 @@ -1,13 +1,11 @@ Name: perl-Template-Toolkit -Version: 2.14 -Release: 8%{?dist} +Version: 2.15 +Release: 1%{?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 @@ -34,7 +32,6 @@ %prep %setup -q -n Template-Toolkit-%{version} -%patch0 -p0 find lib -type f | xargs chmod -c -x # Filter false positive provides. @@ -97,6 +94,10 @@ %{_datadir}/tt2/examples %changelog +* Mon May 29 2006 Tom "spot" Callaway - 2.15-1 +- bump to 2.15 +- gd test is gone, don't need to patch anything + * Tue Feb 28 2006 Tom "spot" Callaway - 2.14-8 - really resolve bug 173756 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jul 2005 17:41:38 -0000 1.2 +++ sources 29 May 2006 16:10:19 -0000 1.3 @@ -1 +1 @@ -0eed60763ef2465c50f9b6a33e51cc14 Template-Toolkit-2.14.tar.gz +26adb4e6d3f2f89e2b54a43f73b70a29 Template-Toolkit-2.15.tar.gz From fedora-extras-commits at redhat.com Mon May 29 16:10:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 29 May 2006 09:10:19 -0700 Subject: rpms/perl-Template-Toolkit/FC-5 perl-Template-Toolkit.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200605291610.k4TGALQK021212@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157/FC-5 Modified Files: perl-Template-Toolkit.spec sources Log Message: Bump to 2.15 Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-5/perl-Template-Toolkit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Template-Toolkit.spec 7 Apr 2006 18:11:29 -0000 1.5 +++ perl-Template-Toolkit.spec 29 May 2006 16:10:19 -0000 1.6 @@ -1,13 +1,11 @@ Name: perl-Template-Toolkit -Version: 2.14 -Release: 8%{?dist} +Version: 2.15 +Release: 1%{?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 @@ -34,7 +32,6 @@ %prep %setup -q -n Template-Toolkit-%{version} -%patch0 -p0 find lib -type f | xargs chmod -c -x # Filter false positive provides. @@ -97,6 +94,10 @@ %{_datadir}/tt2/examples %changelog +* Mon May 29 2006 Tom "spot" Callaway - 2.15-1 +- bump to 2.15 +- gd test is gone, don't need to patch anything + * Tue Feb 28 2006 Tom "spot" Callaway - 2.14-8 - really resolve bug 173756 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Jul 2005 17:41:38 -0000 1.2 +++ sources 29 May 2006 16:10:19 -0000 1.3 @@ -1 +1 @@ -0eed60763ef2465c50f9b6a33e51cc14 Template-Toolkit-2.14.tar.gz +26adb4e6d3f2f89e2b54a43f73b70a29 Template-Toolkit-2.15.tar.gz From fedora-extras-commits at redhat.com Mon May 29 16:33:07 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 29 May 2006 09:33:07 -0700 Subject: rpms/xmms/FC-5 xmms-1.2.10-joycrash.patch, NONE, 1.1 xmms-1.2.10-multidevel.patch, NONE, 1.1 xmms.spec, 1.20, 1.21 xmms-1.2.10-extra_libs.patch, 1.1, NONE Message-ID: <200605291633.k4TGX9Pw021457@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21434 Modified Files: xmms.spec Added Files: xmms-1.2.10-joycrash.patch xmms-1.2.10-multidevel.patch Removed Files: xmms-1.2.10-extra_libs.patch Log Message: * Thu May 25 2006 Ville Skytt?? - 1:1.2.10-25 - Avoid multilib conflicts in -devel, introducing xmms.pc. - Include license text in -libs. * Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 - Apply upstream fix for joystick plugin crashes. xmms-1.2.10-joycrash.patch: --- NEW FILE xmms-1.2.10-joycrash.patch --- =================================================================== RCS file: /cvs/xmms/General/joystick/joy.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- xmms/General/joystick/joy.c 2001/02/04 18:00:11 1.8 +++ xmms/General/joystick/joy.c 2004/07/17 21:54:55 1.9 @@ -177,8 +177,11 @@ static void init(void) /* ---------------------------------------------------------------------- */ static void cleanup(void) { - keep_going = FALSE; - pthread_join(joyapp_thread, NULL); + if (keep_going) + { + keep_going = FALSE; + pthread_join(joyapp_thread, NULL); + } if (joy_fd1 > 0) close(joy_fd1); if (joy_fd2 > 0) xmms-1.2.10-multidevel.patch: --- NEW FILE xmms-1.2.10-multidevel.patch --- --- xmms-1.2.10/xmms-config.in~ 2001-04-06 03:35:49.000000000 +0300 +++ xmms-1.2.10/xmms-config.in 2006-05-25 00:22:21.000000000 +0300 @@ -18,24 +18,6 @@ data_dir="@datadir@/@PACKAGE@" version="@VERSION@" -include_dir="@includedir@" -xmms_include_dir="@includedir@/@PACKAGE@" -lib_dir="@libdir@" - -if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` - gtk_cflags=`gtk-config --cflags` -else - gtk_libs="@GTK_LIBS@" - gtk_cflags="@GTK_CFLAGS@" -fi - -plugin_dir="@plugindir@" -visualization_plugin_dir="@plugindir@/@VISUALIZATION_PLUGIN_DIR@" -input_plugin_dir="@plugindir@/@INPUT_PLUGIN_DIR@" -output_plugin_dir="@plugindir@/@OUTPUT_PLUGIN_DIR@" -effect_plugin_dir="@plugindir@/@EFFECT_PLUGIN_DIR@" -general_plugin_dir="@plugindir@/@GENERAL_PLUGIN_DIR@" usage() { @@ -146,24 +128,12 @@ echo $exec_prefix fi -if test "$include_dir" != "/usr/include"; then - cflags="-I$include_dir -I$xmms_include_dir $gtk_cflags" -else - cflags="-I$xmms_include_dir $gtk_cflags" -fi - -if test "$lib_dir" != "/usr/lib"; then - libs="-L$lib_dir $gtk_libs -lxmms" -else - libs="$gtk_libs -lxmms" -fi - if test "$echo_cflags" = "yes"; then - echo $cflags + pkg-config xmms --cflags fi if test "$echo_libs" = "yes"; then - echo $libs + pkg-config xmms --libs fi if test "$echo_data_dir" = "yes"; then @@ -171,25 +141,25 @@ fi if test "$echo_plugin_dir" = "yes"; then - echo $plugin_dir + pkg-config xmms --variable=plugin_dir fi if test "$echo_visualization_plugin_dir" = "yes"; then - echo $visualization_plugin_dir + pkg-config xmms --variable=visualization_plugin_dir fi if test "$echo_input_plugin_dir" = "yes"; then - echo $input_plugin_dir + pkg-config xmms --variable=input_plugin_dir fi if test "$echo_output_plugin_dir" = "yes"; then - echo $output_plugin_dir + pkg-config xmms --variable=output_plugin_dir fi if test "$echo_general_plugin_dir" = "yes"; then - echo $general_plugin_dir + pkg-config xmms --variable=general_plugin_dir fi if test "$echo_effect_plugin_dir" = "yes"; then - echo $effect_plugin_dir + pkg-config xmms --variable=effect_plugin_dir fi --- xmms-1.2.10/configure~ 2004-02-23 23:44:32.000000000 +0200 +++ xmms-1.2.10/configure 2006-05-24 23:55:50.000000000 +0300 @@ -19201,7 +19201,7 @@ - ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Ma! kefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" + ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms.pc xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_! scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19861,6 +19861,7 @@ "wmxmms.1" ) CONFIG_FILES="$CONFIG_FILES wmxmms.1" ;; "xmms.spec" ) CONFIG_FILES="$CONFIG_FILES xmms.spec" ;; "xmms-config" ) CONFIG_FILES="$CONFIG_FILES xmms-config" ;; + "xmms.pc" ) CONFIG_FILES="$CONFIG_FILES xmms.pc" ;; "xmms/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/Makefile" ;; "xmms/defskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xmms/defskin/Makefile" ;; "Output/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/Makefile" ;; --- xmms-1.2.10/xmms.pc.in~ 2006-05-24 23:54:59.000000000 +0300 +++ xmms-1.2.10/xmms.pc.in 2006-05-24 23:54:48.000000000 +0300 @@ -0,0 +1,18 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +data_dir=@datadir@ +plugin_dir=@plugindir@ +visualization_plugin_dir=${plugin_dir}/@VISUALIZATION_PLUGIN_DIR@ +input_plugin_dir=${plugin_dir}/@INPUT_PLUGIN_DIR@ +output_plugin_dir=${plugin_dir}/@OUTPUT_PLUGIN_DIR@ +effect_plugin_dir=${plugin_dir}/@EFFECT_PLUGIN_DIR@ +general_plugin_dir=${plugin_dir}/@GENERAL_PLUGIN_DIR@ + +Name: XMMS +Description: The X MultiMedia System, a media player +Version: @VERSION@ +Requires: gtk+ +Libs: -L${libdir} -lxmms +Cflags: -I${includedir} -I${includedir}/@PACKAGE@ Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/FC-5/xmms.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xmms.spec 12 Apr 2006 19:58:53 -0000 1.20 +++ xmms.spec 29 May 2006 16:33:07 -0000 1.21 @@ -4,7 +4,7 @@ Name: xmms Version: 1.2.10 -Release: 23%{?dist} +Release: 25%{?dist} Epoch: 1 Summary: The X MultiMedia System, a media player @@ -19,6 +19,8 @@ Source1: xmms.req Source2: xmms.xpm Source3: rh_mp3.c +# http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9 +Patch0: %{name}-1.2.10-joycrash.patch Patch1: %{name}-1.2.6-audio.patch Patch2: %{name}-1.2.6-lazy.patch Patch3: %{name}-1.2.8-default-skin.patch @@ -26,11 +28,12 @@ Patch5: %{name}-1.2.8-arts.patch Patch6: %{name}-1.2.8-alsalib.patch Patch7: %{name}-cd-mountpoint.patch +# Patch8 on top of patch4 +Patch8: %{name}-1.2.10-multidevel.patch Patch9: %{name}-underquoted.patch Patch10: %{name}-alsa-backport.patch Patch11: %{name}-1.2.10-gcc4.patch Patch12: %{name}-1.2.10-crossfade-0.3.9.patch -Patch13: %{name}-1.2.10-extra_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel @@ -69,6 +72,7 @@ Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: gtk+-devel +Requires: pkgconfig %description devel Files needed for building plug-ins for the X MultiMedia System. @@ -76,6 +80,8 @@ %prep %setup -q +# Fix joystick plugin crashes +%patch0 -p1 -b .joycrash # Set default output plugin to ALSA %patch1 -p1 -b .audio # Use RTLD_LAZY, not RTLD_NOW @@ -90,6 +96,8 @@ %patch6 -p1 -b .alsalib # Use something that's more likely to work as the default cdrom mountpoint %patch7 -p0 -b .cd-mountpoint +# Avoid multilib devel conflicts +%patch8 -p1 -b .multidevel # Fix m4 underquoted warning %patch9 -p1 -b .underquoted # Backport for recent ALSA @@ -98,8 +106,6 @@ %patch11 -p1 -b .gcc4 # Fix for crossfade >= 0.3.9 to work properly %patch12 -p1 -b .crossfade -# Remove extra libs from xmms-config output (only needed for static linking) -%patch13 -p1 -b .extra_libs # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure @@ -139,6 +145,8 @@ install -Dpm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm +install -Dpm 644 xmms.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xmms.pc + %find_lang %{name} @@ -171,6 +179,7 @@ %files libs %defattr(-,root,root,-) +%doc COPYING %{_libdir}/libxmms.so.* %{_libdir}/xmms/ @@ -179,10 +188,18 @@ %{_bindir}/xmms-config %{_includedir}/xmms/ %{_libdir}/libxmms.so +%{_libdir}/pkgconfig/xmms.pc %{_datadir}/aclocal/xmms.m4 %changelog +* Thu May 25 2006 Ville Skytt?? - 1:1.2.10-25 +- Avoid multilib conflicts in -devel, introducing xmms.pc. +- Include license text in -libs. + +* Tue May 23 2006 Ville Skytt?? - 1:1.2.10-24 +- Apply upstream fix for joystick plugin crashes. + * Thu Apr 6 2006 Ville Skytt?? - 1:1.2.10-23 - Split library and plugins to xmms-libs (#184606). - ALSA is ubiquitous, don't filter dependencies to it. --- xmms-1.2.10-extra_libs.patch DELETED --- From fedora-extras-commits at redhat.com Mon May 29 17:22:16 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:22:16 -0700 Subject: rpms/TeXmacs/FC-5 TeXmacs.spec,1.34,1.35 Message-ID: <200605291722.k4THMI7V024174@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24157 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- TeXmacs.spec 12 May 2006 17:36:59 -0000 1.34 +++ TeXmacs.spec 29 May 2006 17:22:15 -0000 1.35 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.6.1 -Release: 2%{?dist} +Version: 1.0.6.2 +Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.2-src.tar.gz Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch @@ -53,10 +53,10 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +#%patch3 -p1 +#%patch4 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -157,6 +157,9 @@ %changelog +* Mon May 29 2006 Gerard Milmeister - 1.0.6.2-1 +- new version 1.0.6.2 + * Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 - new version 1.0.6.1 From fedora-extras-commits at redhat.com Mon May 29 17:23:04 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 10:23:04 -0700 Subject: rpms/perl-Cache-Cache/FC-4 .cvsignore, 1.4, 1.5 perl-Cache-Cache.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605291723.k4THNapb024300@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Cache-Cache/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229/FC-4 Modified Files: .cvsignore perl-Cache-Cache.spec sources Log Message: Update to 1.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Mar 2005 16:04:09 -0000 1.4 +++ .cvsignore 29 May 2006 17:23:04 -0000 1.5 @@ -1 +1 @@ -Cache-Cache-1.04.tar.gz +Cache-Cache-1.05.tar.gz Index: perl-Cache-Cache.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-4/perl-Cache-Cache.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Cache-Cache.spec 6 Apr 2005 22:12:43 -0000 1.7 +++ perl-Cache-Cache.spec 29 May 2006 17:23:04 -0000 1.8 @@ -1,21 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Cache-Cache -Version: 1.04 -Release: 2 - +Version: 1.05 +Release: 1%{?dist} Summary: Generic cache interface and implementations Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Cache-Cache/ -Source0: http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-1.04.tar.gz +Source0: http://www.cpan.org/authors/id/D/DC/DCLINTON/Cache-Cache-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Storable) +BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Digest::SHA1), perl(Error), perl(IPC::ShareLite) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -45,7 +42,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -61,7 +58,16 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon May 29 2006 Jose Pedro Oliveira - 1.05-1 +- Update to 1.05. + +* Mon Feb 20 2006 Jose Pedro Oliveira - 1.04-4 +- Rebuild for FC5 (perl 5.8.8). + +* Thu Dec 29 2005 Jose Pedro Oliveira - 1.04-3 +- Dist tag. + +* Fri Apr 7 2005 Michael Schwendt - 1.04-2 - rebuilt * Fri Mar 18 2005 Jose Pedro Oliveira - 1.04-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Mar 2005 16:04:10 -0000 1.4 +++ sources 29 May 2006 17:23:04 -0000 1.5 @@ -1 +1 @@ -60f79f31e74830dba1e0acda4d232d31 Cache-Cache-1.04.tar.gz +09e4d37979c8f8ce2518e1d1ccd10d99 Cache-Cache-1.05.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:23:04 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:23:04 -0700 Subject: rpms/TeXmacs/FC-5 TeXmacs.spec,1.35,1.36 Message-ID: <200605291723.k4THNaQ0024301@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24222 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- TeXmacs.spec 29 May 2006 17:22:15 -0000 1.35 +++ TeXmacs.spec 29 May 2006 17:23:04 -0000 1.36 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors From fedora-extras-commits at redhat.com Mon May 29 17:23:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 10:23:05 -0700 Subject: rpms/perl-Cache-Cache/devel .cvsignore, 1.4, 1.5 perl-Cache-Cache.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200605291723.k4THNbAA024311@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Cache-Cache/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229/devel Modified Files: .cvsignore perl-Cache-Cache.spec sources Log Message: Update to 1.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Mar 2005 16:04:09 -0000 1.4 +++ .cvsignore 29 May 2006 17:23:05 -0000 1.5 @@ -1 +1 @@ -Cache-Cache-1.04.tar.gz +Cache-Cache-1.05.tar.gz Index: perl-Cache-Cache.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/perl-Cache-Cache.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Cache-Cache.spec 20 Feb 2006 19:06:25 -0000 1.9 +++ perl-Cache-Cache.spec 29 May 2006 17:23:05 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Cache-Cache -Version: 1.04 -Release: 4%{?dist} +Version: 1.05 +Release: 1%{?dist} Summary: Generic cache interface and implementations Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 1.05-1 +- Update to 1.05. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.04-4 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Mar 2005 16:04:10 -0000 1.4 +++ sources 29 May 2006 17:23:05 -0000 1.5 @@ -1 +1 @@ -60f79f31e74830dba1e0acda4d232d31 Cache-Cache-1.04.tar.gz +09e4d37979c8f8ce2518e1d1ccd10d99 Cache-Cache-1.05.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:23:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 10:23:05 -0700 Subject: rpms/perl-Cache-Cache/FC-5 .cvsignore, 1.4, 1.5 perl-Cache-Cache.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200605291723.k4THNbiH024306@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Cache-Cache/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24229/FC-5 Modified Files: .cvsignore perl-Cache-Cache.spec sources Log Message: Update to 1.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Mar 2005 16:04:09 -0000 1.4 +++ .cvsignore 29 May 2006 17:23:04 -0000 1.5 @@ -1 +1 @@ -Cache-Cache-1.04.tar.gz +Cache-Cache-1.05.tar.gz Index: perl-Cache-Cache.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-5/perl-Cache-Cache.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Cache-Cache.spec 20 Feb 2006 19:06:25 -0000 1.9 +++ perl-Cache-Cache.spec 29 May 2006 17:23:04 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Cache-Cache -Version: 1.04 -Release: 4%{?dist} +Version: 1.05 +Release: 1%{?dist} Summary: Generic cache interface and implementations Group: Development/Libraries @@ -58,6 +58,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 1.05-1 +- Update to 1.05. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.04-4 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Cache/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Mar 2005 16:04:10 -0000 1.4 +++ sources 29 May 2006 17:23:04 -0000 1.5 @@ -1 +1 @@ -60f79f31e74830dba1e0acda4d232d31 Cache-Cache-1.04.tar.gz +09e4d37979c8f8ce2518e1d1ccd10d99 Cache-Cache-1.05.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:28:12 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:28:12 -0700 Subject: rpms/TeXmacs/FC-5 .cvsignore, 1.19, 1.20 TeXmacs.spec, 1.36, 1.37 sources, 1.20, 1.21 Message-ID: <200605291728.k4THSFqE024465@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24444 Modified Files: .cvsignore TeXmacs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 12 May 2006 17:36:59 -0000 1.19 +++ .cvsignore 29 May 2006 17:28:12 -0000 1.20 @@ -1 +1 @@ -TeXmacs-1.0.6.1-src.tar.gz +TeXmacs-1.0.6.2-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- TeXmacs.spec 29 May 2006 17:23:04 -0000 1.36 +++ TeXmacs.spec 29 May 2006 17:28:12 -0000 1.37 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 12 May 2006 17:36:59 -0000 1.20 +++ sources 29 May 2006 17:28:12 -0000 1.21 @@ -1 +1 @@ -7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz +9f38c2a547b9508b7b263eaf12b2ed97 TeXmacs-1.0.6.2-src.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:31:44 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:31:44 -0700 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.28,1.29 Message-ID: <200605291731.k4THVkMx024550@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24533 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- TeXmacs.spec 12 May 2006 17:36:59 -0000 1.28 +++ TeXmacs.spec 29 May 2006 17:31:44 -0000 1.29 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.6.1 -Release: 2%{?dist} +Version: 1.0.6.2 +Release: 1%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.2-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 @@ -136,6 +136,9 @@ %changelog +* Mon May 29 2006 Gerard Milmeister - 1.0.6.2-1 +- new version 1.0.6.2 + * Fri May 12 2006 Gerard Milmeister - 1.0.6.1-1 - new version 1.0.6.1 From fedora-extras-commits at redhat.com Mon May 29 17:41:26 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:41:26 -0700 Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.18, 1.19 TeXmacs.spec, 1.29, 1.30 branch, 1.1, 1.2 sources, 1.20, 1.21 Message-ID: <200605291741.k4THfSnJ024642@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24619 Modified Files: .cvsignore TeXmacs.spec branch sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 12 May 2006 17:36:59 -0000 1.18 +++ .cvsignore 29 May 2006 17:41:26 -0000 1.19 @@ -1 +1 @@ -TeXmacs-1.0.6.1-src.tar.gz +TeXmacs-1.0.6.2-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- TeXmacs.spec 29 May 2006 17:31:44 -0000 1.29 +++ TeXmacs.spec 29 May 2006 17:41:26 -0000 1.30 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: branch =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/branch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branch 31 May 2005 15:23:49 -0000 1.1 +++ branch 29 May 2006 17:41:26 -0000 1.2 @@ -1 +1 @@ -FC-4 +FC-5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 12 May 2006 17:36:59 -0000 1.20 +++ sources 29 May 2006 17:41:26 -0000 1.21 @@ -1 +1 @@ -7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz +9f38c2a547b9508b7b263eaf12b2ed97 TeXmacs-1.0.6.2-src.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:44:26 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:44:26 -0700 Subject: rpms/TeXmacs/devel .cvsignore, 1.19, 1.20 TeXmacs.spec, 1.37, 1.38 sources, 1.20, 1.21 Message-ID: <200605291744.k4THiS0v024795@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24774 Modified Files: .cvsignore TeXmacs.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 12 May 2006 17:39:05 -0000 1.19 +++ .cvsignore 29 May 2006 17:44:26 -0000 1.20 @@ -1 +1 @@ -TeXmacs-1.0.6.1-src.tar.gz +TeXmacs-1.0.6.2-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- TeXmacs.spec 16 May 2006 23:03:10 -0000 1.37 +++ TeXmacs.spec 29 May 2006 17:44:26 -0000 1.38 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.6.1 -Release: 4%{?dist} +Version: 1.0.6.2 +Release: 3%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors License: GPL URL: http://www.texmacs.org -Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.1-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.6.2-src.tar.gz Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch Patch3: TeXmacs-gcc41.patch @@ -56,10 +56,10 @@ %prep %setup -q -n TeXmacs-%{version}-src -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +#%patch3 -p1 +#%patch4 -p1 %patch5 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -73,8 +73,9 @@ rm -fr $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install export GUILE_DATA_PATH=`guile-config info pkgdatadir` -export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d -name ice-9` +export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d | grep ice-9` cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs +chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/* chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info @@ -160,6 +161,9 @@ %changelog +* Mon May 29 2006 Gerard Milmeister - 1.0.6.2-1 +- new version 1.0.6.2 + * Tue May 16 2006 Gerard Milmeister - 1.0.6.1-4 - added patch for new guile-1.8 - added buildreq for libtool-ltdl-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 12 May 2006 17:39:05 -0000 1.20 +++ sources 29 May 2006 17:44:26 -0000 1.21 @@ -1 +1 @@ -7bd4c93ef5204a8a27c064298869574e TeXmacs-1.0.6.1-src.tar.gz +9f38c2a547b9508b7b263eaf12b2ed97 TeXmacs-1.0.6.2-src.tar.gz From fedora-extras-commits at redhat.com Mon May 29 17:46:13 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 10:46:13 -0700 Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.30,1.31 branch,1.2,1.3 Message-ID: <200605291746.k4THkFAJ024899@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24880 Modified Files: TeXmacs.spec branch Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- TeXmacs.spec 29 May 2006 17:41:26 -0000 1.30 +++ TeXmacs.spec 29 May 2006 17:46:13 -0000 1.31 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors Index: branch =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/branch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- branch 29 May 2006 17:41:26 -0000 1.2 +++ branch 29 May 2006 17:46:13 -0000 1.3 @@ -1 +1 @@ -FC-5 +FC-4 From fedora-extras-commits at redhat.com Mon May 29 17:52:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 10:52:21 -0700 Subject: rpms/perl-Gtk2/devel .cvsignore, 1.13, 1.14 perl-Gtk2.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200605291752.k4THqNTf024975@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24954 Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Update to 1.122. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 11 Apr 2006 18:23:10 -0000 1.13 +++ .cvsignore 29 May 2006 17:52:21 -0000 1.14 @@ -1 +1 @@ -Gtk2-1.121.tar.gz +Gtk2-1.122.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-Gtk2.spec 1 May 2006 00:16:40 -0000 1.18 +++ perl-Gtk2.spec 29 May 2006 17:52:21 -0000 1.19 @@ -5,8 +5,8 @@ # Name: perl-Gtk2 -Version: 1.121 -Release: 2%{?dist} +Version: 1.122 +Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries @@ -86,6 +86,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 1.122-1 +- Update to 1.122. + * Mon May 1 2006 Jose Pedro Oliveira - 1.121-2 - Requires perl(Cairo) (distro >= FC-5). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 11 Apr 2006 18:23:10 -0000 1.13 +++ sources 29 May 2006 17:52:21 -0000 1.14 @@ -1 +1 @@ -90bd58334c49a4db9d812537de5b1620 Gtk2-1.121.tar.gz +b7c9fc25329f507d263899699dc7ff09 Gtk2-1.122.tar.gz From fedora-extras-commits at redhat.com Mon May 29 18:06:36 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 29 May 2006 11:06:36 -0700 Subject: rpms/TeXmacs/devel TeXmacs.spec,1.38,1.39 Message-ID: <200605291806.k4TI6cOK027546@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27529 Modified Files: TeXmacs.spec Log Message: Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- TeXmacs.spec 29 May 2006 17:44:26 -0000 1.38 +++ TeXmacs.spec 29 May 2006 18:06:36 -0000 1.39 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -73,9 +73,8 @@ rm -fr $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install export GUILE_DATA_PATH=`guile-config info pkgdatadir` -export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d | grep ice-9` +export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d -name ice-9` cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs -chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/* chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info From fedora-extras-commits at redhat.com Mon May 29 18:20:48 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 29 May 2006 11:20:48 -0700 Subject: owners owners.list,1.1072,1.1073 Message-ID: <200605291820.k4TIKoDq027715@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27696 Modified Files: owners.list Log Message: Add cc components.. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1072 retrieving revision 1.1073 diff -u -r1.1072 -r1.1073 --- owners.list 29 May 2006 10:57:13 -0000 1.1072 +++ owners.list 29 May 2006 18:20:48 -0000 1.1073 @@ -1171,7 +1171,7 @@ Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH-Perl|SSH (Secure Shell) client|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Net-XMPP|Net::XMPP - perl XMPP library|cweyl at alumni.drew.edu +Fedora Extras|perl-Net-XMPP|Net::XMPP - perl XMPP library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Object-Accessor|Perl module that allows per object accessors|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1285,7 +1285,7 @@ Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|orion at cora.nwra.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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-Stream|XML::Stream - streaming XML library|cweyl at alumni.drew.edu +Fedora Extras|perl-XML-Stream|XML::Stream - streaming XML library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon May 29 19:12:58 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 29 May 2006 12:12:58 -0700 Subject: rpms/qt4/devel qt4-wrapper.sh,1.1,1.2 qt4.spec,1.3,1.4 Message-ID: <200605291913.k4TJD0Wp030117@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30098 Modified Files: qt4-wrapper.sh qt4.spec Log Message: * Mon May 29 2006 Rex Dieter 4.1.3-6 - make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't installed (#193369) Index: qt4-wrapper.sh =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4-wrapper.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4-wrapper.sh 24 May 2006 14:06:14 -0000 1.1 +++ qt4-wrapper.sh 29 May 2006 19:12:58 -0000 1.2 @@ -1,13 +1,13 @@ #!/bin/sh if [ -z "$QT4DIR" ] ; then - QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`" - - if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then - PATH=${QT4DIR}/bin:${PATH} - fi + QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || rpm -q --eval "%{_libdir}/qt4"`" + export QT4DIR +fi - export QT4DIR PATH +if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then + PATH=${QT4DIR}/bin:${PATH} + export PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qt4.spec 26 May 2006 18:01:15 -0000 1.3 +++ qt4.spec 29 May 2006 19:12:58 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -391,6 +391,10 @@ %changelog +* Mon May 29 2006 Rex Dieter 4.1.3-6 +- make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't + installed (#193369) + * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %%buildSQL macro From fedora-extras-commits at redhat.com Mon May 29 19:33:00 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 12:33:00 -0700 Subject: rpms/gurlchecker/FC-4 .cvsignore, 1.3, 1.4 gurlchecker.spec, 1.12, 1.13 sources, 1.3, 1.4 gurlchecker-gcc4.patch, 1.1, NONE gurlchecker.desktop, 1.2, NONE Message-ID: <200605291933.k4TJX2s0030298@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gurlchecker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/FC-4 Modified Files: .cvsignore gurlchecker.spec sources Removed Files: gurlchecker-gcc4.patch gurlchecker.desktop Log Message: updated to currently upstream. Removed old patches and desktop files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Apr 2006 23:00:11 -0000 1.3 +++ .cvsignore 29 May 2006 19:33:00 -0000 1.4 @@ -1 +1 @@ -gurlchecker-0.8.3.tar.gz +gurlchecker-0.10.0.tar.gz Index: gurlchecker.spec =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gurlchecker.spec 28 Apr 2006 07:21:45 -0000 1.12 +++ gurlchecker.spec 29 May 2006 19:33:00 -0000 1.13 @@ -1,6 +1,6 @@ Name: gurlchecker -Version: 0.8.3 -Release: 4%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: A Gnome link validity checker @@ -48,6 +48,9 @@ %{_mandir}/man?/* %changelog +* Tue May 30 2006 Michael J. Knox - 0.10.0-1 +- updated to 0.10.0 + * Fri Apr 28 2006 Michael J. Knox - 0.8.3-4 - missed docbookutils Index: sources =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Apr 2006 23:00:11 -0000 1.3 +++ sources 29 May 2006 19:33:00 -0000 1.4 @@ -1 +1 @@ -2c4d1c74d8044ae41db980ba7ff27e98 gurlchecker-0.8.3.tar.gz +cb5fd08fb4afe14e588fde0bc2744428 gurlchecker-0.10.0.tar.gz --- gurlchecker-gcc4.patch DELETED --- --- gurlchecker.desktop DELETED --- From fedora-extras-commits at redhat.com Mon May 29 19:33:01 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 12:33:01 -0700 Subject: rpms/gurlchecker/FC-5 .cvsignore, 1.3, 1.4 gurlchecker.spec, 1.13, 1.14 sources, 1.3, 1.4 gurlchecker-gcc4.patch, 1.1, NONE gurlchecker.desktop, 1.2, NONE Message-ID: <200605291933.k4TJX32G030304@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gurlchecker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/FC-5 Modified Files: .cvsignore gurlchecker.spec sources Removed Files: gurlchecker-gcc4.patch gurlchecker.desktop Log Message: updated to currently upstream. Removed old patches and desktop files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Apr 2006 23:00:11 -0000 1.3 +++ .cvsignore 29 May 2006 19:33:01 -0000 1.4 @@ -1 +1 @@ -gurlchecker-0.8.3.tar.gz +gurlchecker-0.10.0.tar.gz Index: gurlchecker.spec =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gurlchecker.spec 28 Apr 2006 07:21:46 -0000 1.13 +++ gurlchecker.spec 29 May 2006 19:33:01 -0000 1.14 @@ -1,6 +1,6 @@ Name: gurlchecker -Version: 0.8.3 -Release: 4%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: A Gnome link validity checker @@ -48,6 +48,9 @@ %{_mandir}/man?/* %changelog +* Tue May 30 2006 Michael J. Knox - 0.10.0-1 +- updated to 0.10.0 + * Fri Apr 28 2006 Michael J. Knox - 0.8.3-4 - missed docbookutils Index: sources =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Apr 2006 23:00:11 -0000 1.3 +++ sources 29 May 2006 19:33:01 -0000 1.4 @@ -1 +1 @@ -2c4d1c74d8044ae41db980ba7ff27e98 gurlchecker-0.8.3.tar.gz +cb5fd08fb4afe14e588fde0bc2744428 gurlchecker-0.10.0.tar.gz --- gurlchecker-gcc4.patch DELETED --- --- gurlchecker.desktop DELETED --- From fedora-extras-commits at redhat.com Mon May 29 19:33:02 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Mon, 29 May 2006 12:33:02 -0700 Subject: rpms/gurlchecker/devel .cvsignore, 1.3, 1.4 gurlchecker.spec, 1.13, 1.14 sources, 1.3, 1.4 gurlchecker-gcc4.patch, 1.1, NONE gurlchecker.desktop, 1.2, NONE Message-ID: <200605291933.k4TJX4Ml030310@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/gurlchecker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245/devel Modified Files: .cvsignore gurlchecker.spec sources Removed Files: gurlchecker-gcc4.patch gurlchecker.desktop Log Message: updated to currently upstream. Removed old patches and desktop files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Apr 2006 23:00:12 -0000 1.3 +++ .cvsignore 29 May 2006 19:33:02 -0000 1.4 @@ -1 +1 @@ -gurlchecker-0.8.3.tar.gz +gurlchecker-0.10.0.tar.gz Index: gurlchecker.spec =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gurlchecker.spec 28 Apr 2006 07:21:47 -0000 1.13 +++ gurlchecker.spec 29 May 2006 19:33:02 -0000 1.14 @@ -1,6 +1,6 @@ Name: gurlchecker -Version: 0.8.3 -Release: 4%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: A Gnome link validity checker @@ -48,6 +48,9 @@ %{_mandir}/man?/* %changelog +* Tue May 30 2006 Michael J. Knox - 0.10.0-1 +- updated to 0.10.0 + * Fri Apr 28 2006 Michael J. Knox - 0.8.3-4 - missed docbookutils Index: sources =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Apr 2006 23:00:12 -0000 1.3 +++ sources 29 May 2006 19:33:02 -0000 1.4 @@ -1 +1 @@ -2c4d1c74d8044ae41db980ba7ff27e98 gurlchecker-0.8.3.tar.gz +cb5fd08fb4afe14e588fde0bc2744428 gurlchecker-0.10.0.tar.gz --- gurlchecker-gcc4.patch DELETED --- --- gurlchecker.desktop DELETED --- From fedora-extras-commits at redhat.com Mon May 29 20:06:22 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Mon, 29 May 2006 13:06:22 -0700 Subject: rpms/qps/devel .cvsignore,1.8,1.9 qps.spec,1.8,1.9 sources,1.8,1.9 Message-ID: <200605292006.k4TK6Oa0000466@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv436 Modified Files: .cvsignore qps.spec sources Log Message: - Update to 1.9.16 - Turn on optflags - Change e-mail address in ChangeLog entries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Apr 2006 20:55:51 -0000 1.8 +++ .cvsignore 29 May 2006 20:06:22 -0000 1.9 @@ -1 +1 @@ -qps-1.9.15.tar.gz +qps-1.9.16.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qps.spec 11 Apr 2006 20:55:51 -0000 1.8 +++ qps.spec 29 May 2006 20:06:22 -0000 1.9 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.15 +Version: 1.9.16 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz +Source0: http://kldp.net/frs/download.php/3375/qps-1.9.16.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,6 +19,10 @@ %prep %setup -q +# Turn on %optflags +sed -i -e ' +s/CONFIG += warn_off qt debug/CONFIG += warn_off qt release/' qps.pro + %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -52,32 +56,37 @@ %changelog -* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 +* Mon May 29 2006 Dawid Gajownik - 1.9.16-1 +- Update to 1.9.16 +- Turn on optflags +- Change e-mail address in ChangeLog entries + +* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 - Update to 1.9.15 -* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 - Update to 1.9.14 -* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 -* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 +* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Drop gcc41.patch (pushed upstream) -* Tue Feb 14 2006 Dawid Gajownik - 1.9.11-2.2 +* Tue Feb 14 2006 Dawid Gajownik - 1.9.11-2.2 - Rebuild for Fedora Extras 5 -* Sun Dec 18 2005 Dawid Gajownik - 1.9.11-2.1 +* Sun Dec 18 2005 Dawid Gajownik - 1.9.11-2.1 - Fix compilation with GCC 4.1 - Use funny release tag because tarball name contains `-' character - Add COPYING file -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 - Increase release tag (always do `cvs ci' before `make tag' ;) ) -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 - Update to 1.9.11. -* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 +* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 - Initial RPM release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Apr 2006 20:55:51 -0000 1.8 +++ sources 29 May 2006 20:06:22 -0000 1.9 @@ -1 +1 @@ -d4fd0c451598f12b8ff16e8bed58c07d qps-1.9.15.tar.gz +23aa2b9180e352b6e55e81bf5ab1af77 qps-1.9.16.tar.gz From fedora-extras-commits at redhat.com Mon May 29 20:09:00 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Mon, 29 May 2006 13:09:00 -0700 Subject: rpms/qps/FC-5 .cvsignore,1.8,1.9 qps.spec,1.8,1.9 sources,1.8,1.9 Message-ID: <200605292009.k4TK92OC000565@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv539 Modified Files: .cvsignore qps.spec sources Log Message: - Update to 1.9.16 - Turn on optflags - Change e-mail address in ChangeLog entries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Apr 2006 21:12:22 -0000 1.8 +++ .cvsignore 29 May 2006 20:09:00 -0000 1.9 @@ -1 +1 @@ -qps-1.9.15.tar.gz +qps-1.9.16.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/qps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qps.spec 11 Apr 2006 21:12:22 -0000 1.8 +++ qps.spec 29 May 2006 20:09:00 -0000 1.9 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.15 +Version: 1.9.16 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz +Source0: http://kldp.net/frs/download.php/3375/qps-1.9.16.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,6 +19,10 @@ %prep %setup -q +# Turn on %optflags +sed -i -e ' +s/CONFIG += warn_off qt debug/CONFIG += warn_off qt release/' qps.pro + %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -52,32 +56,37 @@ %changelog -* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 +* Mon May 29 2006 Dawid Gajownik - 1.9.16-1 +- Update to 1.9.16 +- Turn on optflags +- Change e-mail address in ChangeLog entries + +* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 - Update to 1.9.15 -* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 - Update to 1.9.14 -* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 -* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 +* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Drop gcc41.patch (pushed upstream) -* Tue Feb 14 2006 Dawid Gajownik - 1.9.11-2.2 +* Tue Feb 14 2006 Dawid Gajownik - 1.9.11-2.2 - Rebuild for Fedora Extras 5 -* Sun Dec 18 2005 Dawid Gajownik - 1.9.11-2.1 +* Sun Dec 18 2005 Dawid Gajownik - 1.9.11-2.1 - Fix compilation with GCC 4.1 - Use funny release tag because tarball name contains `-' character - Add COPYING file -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 - Increase release tag (always do `cvs ci' before `make tag' ;) ) -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 - Update to 1.9.11. -* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 +* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 - Initial RPM release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Apr 2006 21:12:22 -0000 1.8 +++ sources 29 May 2006 20:09:00 -0000 1.9 @@ -1 +1 @@ -d4fd0c451598f12b8ff16e8bed58c07d qps-1.9.15.tar.gz +23aa2b9180e352b6e55e81bf5ab1af77 qps-1.9.16.tar.gz From fedora-extras-commits at redhat.com Mon May 29 20:10:11 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 29 May 2006 13:10:11 -0700 Subject: rpms/qt4/FC-5 qt4-wrapper.sh,1.1,1.2 qt4.spec,1.4,1.5 Message-ID: <200605292010.k4TKADsJ000594@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv575 Modified Files: qt4-wrapper.sh qt4.spec Log Message: * Mon May 29 2006 Rex Dieter 4.1.3-6 - make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't installed (#193369) Index: qt4-wrapper.sh =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/qt4-wrapper.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4-wrapper.sh 24 May 2006 14:06:14 -0000 1.1 +++ qt4-wrapper.sh 29 May 2006 20:10:11 -0000 1.2 @@ -1,13 +1,13 @@ #!/bin/sh if [ -z "$QT4DIR" ] ; then - QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`" - - if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then - PATH=${QT4DIR}/bin:${PATH} - fi + QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || rpm -q --eval "%{_libdir}/qt4"`" + export QT4DIR +fi - export QT4DIR PATH +if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then + PATH=${QT4DIR}/bin:${PATH} + export PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qt4.spec 26 May 2006 20:41:50 -0000 1.4 +++ qt4.spec 29 May 2006 20:10:11 -0000 1.5 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -391,6 +391,10 @@ %changelog +* Mon May 29 2006 Rex Dieter 4.1.3-6 +- make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't + installed (#193369) + * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %%buildSQL macro From fedora-extras-commits at redhat.com Mon May 29 20:10:29 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 29 May 2006 13:10:29 -0700 Subject: rpms/qt4/FC-4 qt4-wrapper.sh,1.1,1.2 qt4.spec,1.3,1.4 Message-ID: <200605292010.k4TKAVaI000657@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qt4/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv638 Modified Files: qt4-wrapper.sh qt4.spec Log Message: * Mon May 29 2006 Rex Dieter 4.1.3-6 - make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't installed (#193369) Index: qt4-wrapper.sh =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-4/qt4-wrapper.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4-wrapper.sh 24 May 2006 14:06:14 -0000 1.1 +++ qt4-wrapper.sh 29 May 2006 20:10:28 -0000 1.2 @@ -1,13 +1,13 @@ #!/bin/sh if [ -z "$QT4DIR" ] ; then - QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`" - - if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then - PATH=${QT4DIR}/bin:${PATH} - fi + QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore 2>/dev/null || rpm -q --eval "%{_libdir}/qt4"`" + export QT4DIR +fi - export QT4DIR PATH +if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then + PATH=${QT4DIR}/bin:${PATH} + export PATH fi exec $QT4DIR/bin/`basename $0` ${1+"$@"} Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qt4.spec 26 May 2006 20:42:19 -0000 1.3 +++ qt4.spec 29 May 2006 20:10:28 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Qt GUI toolkit Name: qt4 Version: 4.1.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -391,6 +391,10 @@ %changelog +* Mon May 29 2006 Rex Dieter 4.1.3-6 +- make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't + installed (#193369) + * Fri May 26 2006 Rex Dieter 4.1.3-5 - strip -lXi from .pc files (#193258) - simplify sql plugin builds via %%buildSQL macro From fedora-extras-commits at redhat.com Mon May 29 20:14:04 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Mon, 29 May 2006 13:14:04 -0700 Subject: rpms/qps/FC-4 .cvsignore,1.7,1.8 qps.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <200605292014.k4TKE6iH000792@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv769 Modified Files: .cvsignore qps.spec sources Log Message: - Update to 1.9.16 - Turn on optflags - Change e-mail address in ChangeLog entries Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Apr 2006 21:19:30 -0000 1.7 +++ .cvsignore 29 May 2006 20:14:04 -0000 1.8 @@ -1 +1 @@ -qps-1.9.15.tar.gz +qps-1.9.16.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/qps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qps.spec 11 Apr 2006 21:19:30 -0000 1.7 +++ qps.spec 29 May 2006 20:14:04 -0000 1.8 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.15 +Version: 1.9.16 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz +Source0: http://kldp.net/frs/download.php/3375/qps-1.9.16.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,6 +19,10 @@ %prep %setup -q +# Turn on %optflags +sed -i -e ' +s/CONFIG += warn_off qt debug/CONFIG += warn_off qt release/' qps.pro + %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -52,24 +56,29 @@ %changelog -* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 +* Mon May 29 2006 Dawid Gajownik - 1.9.16-1 +- Update to 1.9.16 +- Turn on optflags +- Change e-mail address in ChangeLog entries + +* Tue Apr 11 2006 Dawid Gajownik - 1.9.15-1 - Update to 1.9.15 -* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 - Update to 1.9.14 -* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 -* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 +* Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Add COPYING file -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-2 - Increase release tag (always do `cvs ci' before `make tag' ;) ) -* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 +* Sat Nov 12 2005 Dawid Gajownik - 1.9.11-1 - Update to 1.9.11. -* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 +* Thu Aug 25 2005 Dawid Gajownik - 1.9.10-1 - Initial RPM release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Apr 2006 21:19:30 -0000 1.7 +++ sources 29 May 2006 20:14:04 -0000 1.8 @@ -1 +1 @@ -d4fd0c451598f12b8ff16e8bed58c07d qps-1.9.15.tar.gz +23aa2b9180e352b6e55e81bf5ab1af77 qps-1.9.16.tar.gz From fedora-extras-commits at redhat.com Mon May 29 20:26:45 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:26:45 -0700 Subject: extras-buildsys/server ArchJob.py, 1.33, 1.34 Builder.py, 1.43, 1.44 BuilderManager.py, 1.26, 1.27 PackageJob.py, 1.50, 1.51 Message-ID: <200605292026.k4TKQjEY000948@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv877/server Modified Files: ArchJob.py Builder.py BuilderManager.py PackageJob.py Log Message: 2006-05-29 Dan Williams * Make most everything work now; both Passive and Active builders will download/upload the SRPM from the server. The SRPM's URL is no longer passed to the builder in the initial job request, but comes along later once the SPRM is actually available to the builder (which might be after an upload to the builder in the case of Passive builders). * Pylint cleanups * Clean up logging on builders by consolidating newline handling is one place * Use the Targets command to pass back to the server any upload URL the builder might have (for passive builders) Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ArchJob.py 20 May 2006 05:10:08 -0000 1.33 +++ ArchJob.py 29 May 2006 20:26:38 -0000 1.34 @@ -22,13 +22,13 @@ import sha -def _generate_uniqid(parent_jobid, start_time, target_dict, srpm_url): +def _generate_uniqid(parent_jobid, start_time, target_dict, srpm): distro = target_dict['distro'] repo = target_dict['repo'] target = target_dict['target'] arch = target_dict['arch'] hash_string = "%d%d%s%s%s%s%s" % (parent_jobid, start_time, distro, - target, arch, repo, srpm_url) + target, arch, repo, srpm) sha_hash = sha.new() sha_hash.update(hash_string) return sha_hash.hexdigest() @@ -36,30 +36,36 @@ AJ_STATUS_QUEUED = 'queued' AJ_STATUS_WAITING = 'waiting' +AJ_STATUS_UPLOADING = 'uploading' AJ_STATUS_REPO_WAIT = 'repo_wait' AJ_STATUS_REPO_UNLOCK = 'repo_unlock' AJ_STATUS_RUNNING = 'running' AJ_STATUS_DOWNLOADING = 'downloading' AJ_STATUS_DONE = 'done' +AJ_FAILURE_NONE = '' +AJ_FAILURE_DOWNLOAD = 'download' +AJ_FAILURE_BUILDER = 'builder' +AJ_FAILURE_INTERNAL = 'internal' + class ArchJob: """ Tracks a single build instance for a single arch on a builder """ - def __init__(self, parent, target_dict, srpm_url): + def __init__(self, parent, target_dict, srpm_path): self._parent = parent self._builder = None self._repo = parent.repo() self._starttime = time.time() self._endtime = 0 self._id = _generate_uniqid(parent.uid, self._starttime, target_dict, - srpm_url) + srpm_path) self._status = AJ_STATUS_QUEUED + self._uploader = None self._builder_status = '' self._failure_noticed = False - self._download_failed = False - self._internal_failure = False + self._failure_type = AJ_FAILURE_NONE self._target_dict = target_dict - self._srpm_url = srpm_url + self._srpm_path = srpm_path self._result_files = {} self._die = False self._die_user_requested = False @@ -89,6 +95,9 @@ attrdict = self._to_dict() self._parent.bm.queue_archjob_status_update(self._id, attrdict) del attrdict + + if builder_status in ['killed', 'failed']: + self._failure_type = AJ_FAILURE_BUILDER def failure_noticed(self): return self._failure_noticed @@ -101,16 +110,8 @@ return True return False - def builder_failed(self): - if self._builder_status in ['killed', 'failed']: - return True - return False - - def download_failed(self): - return self._download_failed - - def internal_failure(self): - return self._internal_failure + def failure_type(self): + return self._failure_type def prepping(self): return self._prepping @@ -121,8 +122,8 @@ def target_dict(self): return self._target_dict - def srpm_url(self): - return self._srpm_url + def srpm_path(self): + return self._srpm_path def archjob_id(self): return self._id @@ -130,6 +131,9 @@ def builder(self): return self._builder + def parent(self): + return self._parent + def orphaned(self): return self._orphaned @@ -144,6 +148,12 @@ def unclaim(self, builder): builder.remove_suspend_listener(self) + if builder != self._builder: + return + + if self._uploader: + self._uploader.cancel() + self._uploader = None self._builder = None if not self._is_done_status(): self._orphaned = True @@ -192,13 +202,38 @@ self._set_status(AJ_STATUS_DONE) def _handle_builder_finished(self): + self._uploader = None self._set_status(AJ_STATUS_DOWNLOADING) self._builder.request_job_files(self._id) def _status_queued(self): pass + def _upload_srpm_cb(self, builder, result, msg, user_data=None): + """Callback from our controlling Builer object when it has uploaded the SRPM + to the remote builder.""" + if builder != self._builder: + return + self._uploader = None + if result == FileTransfer.FT_RESULT_FAILED: + srpm_path = user_data + print "%s (%s/%s): %s - SRPM upload failed for %s." % (self._parent.uid, + self._parent.package, self._target_dict['arch'], self._id, srpm_path) + # Unclaim the job and try for another builder + self.unclaim(self._builder) + def _status_waiting(self): + if self._builder_status == 'init': + # Ask our Builder object to send the SRPM to the remote builder + # (if Passive) or to notify the builder of the SRPM URL (if Active). + self._set_status(AJ_STATUS_UPLOADING) + self._uploader = self._builder.request_srpm_upload(self, + self._upload_srpm_cb, self._srpm_path, self._srpm_path) + + if self._builder_finished(): + self._handle_builder_finished() + + def _status_uploading(self): # 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. @@ -262,11 +297,11 @@ return if len(files.keys()) == 0: - self._download_failed = True + self._failure_type = AJ_FAILURE_DOWNLOAD else: for fname in files.keys(): if files[fname] == FileTransfer.FT_RESULT_FAILED: - self._download_failed = True + self._failure_type = AJ_FAILURE_DOWNLOAD self._result_files = files self._print_downloaded_files(self._result_files) @@ -278,7 +313,11 @@ pass def _handle_death(self, user_requested): - self._builder.request_kill_for_job(self._id) + if self._builder: + self._builder.request_kill_for_job(self._id) + if self._uploader: + self._uploader.cancel() + self._uploader = None if self._status == AJ_STATUS_REPO_WAIT: self._repo.cancel_unlock_request(self) self._set_done() @@ -306,7 +345,7 @@ print "%s (%s/%s): %s - internal archjob inconsistency. Unknown status '%s'." % (self._parent.uid, self._parent.package, self._target_dict['arch'], self._id, self._status) self._set_done() - self._internal_failure = True + self._failure_type = AJ_FAILURE_INTERNAL return # Do the actual work for this status Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- Builder.py 20 May 2006 05:10:08 -0000 1.43 +++ Builder.py 29 May 2006 20:26:38 -0000 1.44 @@ -20,12 +20,13 @@ import os import urllib import threading +import shutil from plague import Commands from plague import XMLRPCServerProxy from plague import FileDownloader +from plague import FileUploader from plague import FileTransfer import OpenSSL -import ArchJob import EmailUtils from plague import DebugUtils @@ -314,12 +315,6 @@ self._free_slots = cmd.free_slots() self._num_slots = cmd.max_slots() self._lock.release() - elif isinstance(cmd, Commands.PlgCommandTargets): - self._lock.acquire() - self._target_list = cmd.targets() - self._lock.release() - elif isinstance(cmd, Commands.PlgCommandNewJobAck): - self._handle_new_job_ack(cmd) elif isinstance(cmd, Commands.PlgCommandBuildingJobs): status_reqs = self._handle_building_jobs(cmd) # Add any additional status requests onto our pending command queue @@ -329,6 +324,8 @@ self._lock.release() elif isinstance(cmd, Commands.PlgCommandJobStatusAck): self._handle_job_status_ack(cmd) + elif isinstance(cmd, Commands.PlgCommandNewJobAck): + self._handle_new_job_ack(cmd) else: handled = False return handled @@ -390,7 +387,7 @@ print "PassiveBuilder(%s) Error in request(): '%s'" % (self._address, exc) self.done = True - def close(self): + def cancel(self): try: self._server.close() except: @@ -413,6 +410,7 @@ Builder.__init__(self, manager, cfg, address, weight, TYPE_PASSIVE) # Builder will get pinged immediately since self._last_contact == 0 self._ping_interval = self._BUILDER_UNAVAIL_PING_INTERVAL + self._upload_url = None self._certs = None if self._server_cfg.get_bool("Builders", "use_ssl"): @@ -421,6 +419,33 @@ self._certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") self._certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + def _upload_cb(self, result, cb_data, msg): + """Call the archjob's upload callback with the upload result.""" + (archjob_id, srpm_path, upload_cb, user_data) = cb_data + + # Notify the builder that the SRPM is uploaded + if result == FileTransfer.FT_RESULT_SUCCESS: + url = "file:///%s" % os.path.basename(srpm_path) + cmd = Commands.PlgCommandJobSRPM(archjob_id, url, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + + # Call the archjob's upload callback + upload_cb(self, result, msg, user_data) + + def request_srpm_upload(self, archjob, upload_cb, user_data, srpm_path): + """Called by the archjob to request an upload of the SRPM to the builder.""" + archjob_id = archjob.archjob_id() + + # Start uploading the job to the builder + data = [("archjob_id", archjob_id)] + uploader = FileUploader.FileUploader(self._upload_url, [srpm_path], 'filedata', data, + self._certs) + uploader.set_callback(self._upload_cb, (archjob_id, srpm_path, upload_cb, user_data)) + uploader.start() + return uploader + def _download_cb(self, result, (archjob, urls), msg): """Notify archjob of the result of its download request.""" if result == FileTransfer.FT_RESULT_FAILED: @@ -526,8 +551,8 @@ # right now. Think server restart here. for item in cmd.jobs(): (uniqid, status) = cmd.get_job(item) - cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) - self._cmd_queue.append(cmd) + new_cmd = Commands.PlgCommandKillJob(uniqid, self._seq_gen.next()) + self._cmd_queue.append(new_cmd) handled = True # Let the superclass handle what's left @@ -542,7 +567,9 @@ elif isinstance(cmd, Commands.PlgCommandTargets): if not self._target_list: self._target_list = cmd.targets() - + self._upload_url = cmd.upload_url() + handled = True + if not handled: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) @@ -610,6 +637,44 @@ def __init__(self, manager, cfg, address, weight): Builder.__init__(self, manager, cfg, address, weight, TYPE_ACTIVE) + def _request_srpm_upload(self, archjob, upload_cb, user_data, srpm_path): + """Called by the archjob to request that an SRPM be made available to the builder.""" + # Copy the SRPM to the correct upload location + http_dir = self._manager.http_dir() + srpm_dest_dir = archjob.parent().make_stage_dir(http_dir, delete=False) + srpm_dest = os.path.join(srpm_dest_dir, os.path.basename(srpm_path)) + + err_msg = "Failed" + result = FileTransfer.FT_RESULT_FAILED + if srpm_dest != srpm_path: + # Copy file if it's not already in the HTTP server's download dir + try: + shutil.copyfile(srpm_path, srpm_dest) + err_msg = "Success" + result = FileTransfer.FT_RESULT_SUCCESS + except IOError, exc: + err_msg = str(exc) + else: + # Make sure it's where it's supposed to be + if os.path.exists(srpm_dest): + err_msg = "Success" + result = FileTransfer.FT_RESULT_SUCCESS + else: + err_msg = "Candidate SRPM file %s didn't exist." % srpm_dest + + if result == FileTransfer.FT_RESULT_SUCCESS: + # Construct the download URL + archjob_id = archjob.archjob_id() + url = self._manager.get_http_url_base() + srpm_dest[len(http_dir):] + cmd = Commands.PlgCommandJobSRPM(archjob_id, url, self._seq_gen.next()) + self._lock.acquire() + self._cmd_queue.append(cmd) + self._lock.release() + + # Call the archjob's upload callback + upload_cb(self, result, err_msg, user_data) + return None + def _handle_job_files_ack(self, cmd): (archjob, urls) = self._decompose_job_files_ack(cmd) if not archjob: Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- BuilderManager.py 16 May 2006 15:49:56 -0000 1.26 +++ BuilderManager.py 29 May 2006 20:26:38 -0000 1.27 @@ -115,7 +115,7 @@ Can't block the main BuilderManager object by sitting in serve_forever(). """ - def __init__(self, cfg, bm): + def __init__(self, bm, cfg, use_ssl, certs): self._cfg = cfg self._bm = bm self._stopped = False @@ -125,11 +125,7 @@ hostname = cfg.get_str("General", "hostname") port = cfg.get_int("Active Builders", "xmlrpc_server_port") try: - if cfg.get_bool("Builders", "use_ssl") == True: - certs = {} - certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") - certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") + if use_ssl: self._server = AuthedSSLBuilderServer((hostname, port), certs, self._bm) else: self._server = AuthedBuilderServer((hostname, port), self._bm) @@ -168,30 +164,43 @@ self._queue_lock = threading.Lock() self._queue = [] + self._certs = None + self._use_ssl = cfg.get_bool("Builders", "use_ssl") + if self._use_ssl: + self._certs = {} + self._certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") + self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") + self._certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") + self._xmlrpc_server = None if any_active: # Builder XMLRPC server # Only start it when there are active-type builders listed # in the config file - self._xmlrpc_server = BuilderServerThread(cfg, self) + self._xmlrpc_server = BuilderServerThread(self, cfg, self._use_ssl, self._certs) self._xmlrpc_server.start() # Builder HTTP fileserver - hostname = cfg.get_str("General", "hostname") - port = cfg.get_int("Active Builders", "file_server_port") - http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir") - certs = {} - if cfg.get_bool("Builders", "use_ssl"): - certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") - certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") - certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") - self._fileserver = HTTPServer.PlgHTTPServerManager((hostname, port), http_dir, certs) + self._hostname = cfg.get_str("General", "hostname") + self._http_port = cfg.get_int("Active Builders", "file_server_port") + self._http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir") + self._fileserver = HTTPServer.PlgHTTPServerManager((self._hostname, self._http_port), self._http_dir, self._certs) if any_active: self._fileserver.set_POST_handler('/upload', self.upload_callback) self._fileserver.start() self._print_builders() + def get_http_url_base(self): + """Return the base HTTP server URL, taking port and SSL into account.""" + method = "http" + if self._use_ssl: + method = "https" + return "%s://%s:%d/" % (method, self._hostname, self._http_port) + + def http_dir(self): + return self._http_dir + def upload_callback(self, request_handler, fs): # Ensure we know this builder ip = request_handler.client_address[0] Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- PackageJob.py 14 May 2006 05:43:07 -0000 1.50 +++ PackageJob.py 29 May 2006 20:26:38 -0000 1.51 @@ -44,9 +44,11 @@ if DEBUG: print stuff -class PrepError(exceptions.Exception): pass +class PrepError(exceptions.Exception): + pass -class DepError(exceptions.Exception): pass +class DepError(exceptions.Exception): + pass class BuildError(exceptions.Exception): def __init__(self, msg, arch): @@ -164,8 +166,7 @@ self._killer = None self._die = False - self.http_dir = os.path.join(self._server_cfg.get_str("Directories", - "server_work_dir"), "srpm_http_dir") + self._base_work_dir = self._server_cfg.get_str("Directories", "server_work_dir") first_stage = 'initialize' if self.use_cvs == False: @@ -210,7 +211,7 @@ def get_uid(self): return self.uid - def arch_handling(self, hdr): + def arch_handling(self, ba, exclusive, exclude): # Grab additional allowed arches for this package, using # wildcard matching if needed addl_arches = self._target_cfg.addl_arches_for_pkg(self.name) @@ -230,13 +231,6 @@ if master_addl_arch not in base_arches: addl_arches.remove(arch) - # Grab arches the SRPM does/does not want to build for. If the package - # does use one or more of these tags in the specfile, hdr[''] will - # return an empty list, and we'll use defaults instead - ba = hdr['buildarchs'] - exclusive = hdr['exclusivearch'] - exclude = hdr['excludearch'] - build_arches = {} # If the SRPM is noarch, there's nothing left to do, since @@ -392,14 +386,14 @@ if not srpmpath: msg = "Error: could not find srpm for %s - output was:\n\n%s" % (self._source, o) raise PrepError(msg) - + self._srpm_path = srpmpath self._set_cur_stage('prep') return False def _stage_prep(self): - # In SRPM-only mode, cvs_tag is path to the SRPM to build + # In SRPM-only mode, 'source' is path to the SRPM to build if self.use_cvs == False: self._srpm_path = self._source @@ -417,9 +411,24 @@ self.epoch = '0' self.ver = hdr['version'] self.release = hdr['release'] - (self._archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr) - del hdr - del ts + + buildarchs = hdr['buildarchs'] + exclusive = hdr['exclusivearch'] + exclude = hdr['excludearch'] + del hdr, ts + + # copy the SRPM to our work directory + self._result_dir = self.make_stage_dir(self._base_work_dir) + dest = os.path.join(self._result_dir, os.path.basename(self._srpm_path)) + shutil.copy(self._srpm_path, dest) + self._srpm_path = dest + + # Remove CVS checkout dirs + if self.use_cvs == True: + shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + + # Find out what arches we're going to be building on + (self._archjobs, pkg_arches, allowed_arches) = self.arch_handling(buildarchs, exclusive, exclude) if len(self._archjobs) == 0: msg = """Package %s does not build on any architectures this build system supports. @@ -510,7 +519,8 @@ raise DepError(str(exc)) for dep in srpm.requiresList(): - if dep.startswith("rpmlib("): continue + if dep.startswith("rpmlib("): + continue try: pkg = base.returnPackageByDep(dep) except repomd.mdErrors.PackageSackError, exc: @@ -547,8 +557,7 @@ # Create the depsolve metadata cache dir if not self._depsolve_dir: - server_work_dir = self._server_cfg.get_str("Directories", "server_work_dir") - self._depsolve_dir = os.path.join(server_work_dir, "depsolve", "%s-%s" % (self.uid, self.name)) + self._depsolve_dir = os.path.join(self._base_work_dir, "depsolve", "%s-%s" % (self.uid, self.name)) if os.path.exists(self._depsolve_dir): shutil.rmtree(self._depsolve_dir, ignore_errors=True) os.makedirs(self._depsolve_dir) @@ -605,60 +614,43 @@ def _prepare_and_wait(self): # Make some directories we need - work_dir = self._server_cfg.get_str("Directories", "server_work_dir") - self._result_dir = self._make_stage_dir(work_dir) for arch in self._archjobs.keys(): thisdir = os.path.join(self._result_dir, arch) if not os.path.exists(thisdir): os.makedirs(thisdir) - # Copy SRPM to where the builder can access it - http_pkg_path = self._make_stage_dir(self.http_dir) - self._srpm_http_path = os.path.join(http_pkg_path, os.path.basename(self._srpm_path)) - shutil.copy(self._srpm_path, self._srpm_http_path) - self._srpm_path = None - - # Remove CVS checkout and make_srpm dirs - if self.use_cvs == True: - shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + self._set_cur_stage('waiting') # Queue up archjobs - self._set_cur_stage('waiting') - self._create_arch_jobs() + self._archjobs_lock.acquire() + for arch in self._archjobs.keys(): + # Create and queue a single archjob for one architecture + target_dict = self._target_cfg.target_dict(arch) + archjob = ArchJob.ArchJob(self, target_dict, self._srpm_path) + self._archjobs[arch] = archjob + self.bm.builder_manager.request_arch_job(archjob) + self._archjobs_lock.release() + return False def _stage_depsolve_wait(self): pass - def _make_stage_dir(self, rootdir): + def make_stage_dir(self, rootdir, delete=True): + """Given a root, creates a unique job-specific holding directory for + job files.""" # 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_str, pkgsubdir) - if os.path.exists(stage_dir): + if os.path.exists(stage_dir) and delete: shutil.rmtree(stage_dir, ignore_errors=True) - os.makedirs(stage_dir) + try: + os.makedirs(stage_dir) + except OSError, exc: + pass return stage_dir - def _create_arch_jobs(self): - self._archjobs_lock.acquire() - for arch in self._archjobs.keys(): - # Construct the SRPM URL - srpm_http_base = self._srpm_http_path[len(self.http_dir):] - method = "http" - if self._server_cfg.get_bool("Builders", "use_ssl") == True: - method = "https" - hostname = self._server_cfg.get_str("General", "hostname") - port = self._server_cfg.get_int("Active Builders", "file_server_port") - srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base) - - # Create and queue the archjob - target_dict = self._target_cfg.target_dict(arch) - archjob = ArchJob.ArchJob(self, target_dict, srpm_url) - self._archjobs[arch] = archjob - self.bm.builder_manager.request_arch_job(archjob) - self._archjobs_lock.release() - def archjob_started_cb(self, archjob): # If this is the first archjob, that means we are now building. # So we start up the second PackageJobController thread. @@ -725,7 +717,8 @@ self._event.wait() self._event.clear() except PrepError, exc: - if self.use_cvs == True: + # Clean up CVS checkout directory if it exists + if self.use_cvs == True and os.path.exists(self.checkout_tmpdir): shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) msg = str(exc) subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str) @@ -766,7 +759,8 @@ continue completed_jobs = completed_jobs + 1 - if job.builder_failed() or job.download_failed() or job.internal_failure(): + failure_type = job.failure_type() + if failure_type != ArchJob.AJ_FAILURE_NONE: failed_jobs = failed_jobs + 1 # Normal jobs will just stop when a single archjob fails, but @@ -777,12 +771,16 @@ job.set_failure_noticed() jobarch = job.arch() msg = "Job failed." - if job.builder_failed(): + if failure_type == ArchJob.AJ_FAILURE_BUILDER: msg = "Job failed on arch %s\n" % jobarch - elif job.download_failed(): + elif failure_type == ArchJob.AJ_FAILURE_DOWNLOAD: + addr = None + builder = job.builder() + if builder: + addr = job.builder().address() msg = "Job failed on arch %s: couldn't download result files from builder '%s'.\n " \ - "Please contact the build system administrator." % (jobarch, job.builder().address()) - elif job.internal_failure(): + "Please contact the build system administrator." % (jobarch, addr) + elif failure_type == ArchJob.AJ_FAILURE_INTERNAL: msg = "Job failed on arch %s: there was an internal build system failure.\n " \ "Please contact the build system administrator." % jobarch self._archjobs_lock.release() @@ -901,13 +899,11 @@ def _get_log_tail(self, arch): """ 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) - work_dir = self._server_cfg.get_str("Directories", "server_work_dir") - log_dir = os.path.join(work_dir, self._target_str, pkg_dir, arch) + log_dir = os.path.join(self._result_dir, arch) + build_log = os.path.join(log_dir, "build.log") + root_log = os.path.join(log_dir, "root.log") + job_log = os.path.join(log_dir, "job.log") final_log = None - build_log = "%s/%s" % (log_dir, "build.log") - root_log = "%s/%s" % (log_dir, "root.log") - job_log = "%s/%s" % (log_dir, "job.log") # Try the most relevant log file first if os.path.exists(build_log) and os.path.getsize(build_log) > 0: From fedora-extras-commits at redhat.com Mon May 29 20:26:34 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:26:34 -0700 Subject: extras-buildsys ChangeLog,1.202,1.203 Message-ID: <200605292027.k4TKR4lq000953@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv877 Modified Files: ChangeLog Log Message: 2006-05-29 Dan Williams * Make most everything work now; both Passive and Active builders will download/upload the SRPM from the server. The SRPM's URL is no longer passed to the builder in the initial job request, but comes along later once the SPRM is actually available to the builder (which might be after an upload to the builder in the case of Passive builders). * Pylint cleanups * Clean up logging on builders by consolidating newline handling is one place * Use the Targets command to pass back to the server any upload URL the builder might have (for passive builders) Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- ChangeLog 23 May 2006 15:06:14 -0000 1.202 +++ ChangeLog 29 May 2006 20:26:31 -0000 1.203 @@ -1,3 +1,15 @@ +2006-05-29 Dan Williams + + * Make most everything work now; both Passive and Active builders will + download/upload the SRPM from the server. The SRPM's URL is no longer + passed to the builder in the initial job request, but comes along later + once the SPRM is actually available to the builder (which might be after + an upload to the builder in the case of Passive builders). + * Pylint cleanups + * Clean up logging on builders by consolidating newline handling is one place + * Use the Targets command to pass back to the server any upload URL the builder + might have (for passive builders) + 2006-05-23 Dan Williams * common/Commands.py From fedora-extras-commits at redhat.com Mon May 29 20:26:39 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:26:39 -0700 Subject: extras-buildsys/builder Builder.py, 1.15, 1.16 BuilderMock.py, 1.9, 1.10 Message-ID: <200605292027.k4TKR94F000956@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv877/builder Modified Files: Builder.py BuilderMock.py Log Message: 2006-05-29 Dan Williams * Make most everything work now; both Passive and Active builders will download/upload the SRPM from the server. The SRPM's URL is no longer passed to the builder in the initial job request, but comes along later once the SPRM is actually available to the builder (which might be after an upload to the builder in the case of Passive builders). * Pylint cleanups * Clean up logging on builders by consolidating newline handling is one place * Use the Targets command to pass back to the server any upload URL the builder might have (for passive builders) 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 20 May 2006 05:10:02 -0000 1.15 +++ Builder.py 29 May 2006 20:26:32 -0000 1.16 @@ -94,6 +94,7 @@ self._server_ip = None self._get_server_ip() + self._upload_url = "" self._certs = None self._use_ssl = cfg.get_bool("SSL", "use_ssl") if self._use_ssl: @@ -218,7 +219,7 @@ # always send a target list next_seq = self._seq_gen.next() - cmd = Commands.PlgCommandTargets(self.supported_targets(), next_seq) + cmd = Commands.PlgCommandTargets(self.supported_targets(), self._upload_url, next_seq) defcmds.append(cmd) # always send free & max slots @@ -250,6 +251,8 @@ reply = self._handle_job_files_request(cmd) if reply: self._queued_cmds.append(reply) + elif isinstance(cmd, Commands.PlgCommandJobSRPM): + self._handle_job_srpm_command(cmd) def _process_server_commands(self, cmd_list): """Process the server's command stream.""" @@ -281,7 +284,7 @@ def _start_new_job(self, cmd): target_dict = cmd.target_dict() - srpm_url = cmd.srpm_url() + jobname = cmd.job_name() uniqid = cmd.archjob_id() target_str = Config.make_target_string(target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo']) @@ -289,29 +292,27 @@ (free_slots, max_slots) = self.slots() if free_slots <= 0: msg = "Error: Tried to build '%s' on target %s when already building" \ - " maximum (%d) jobs" % (srpm_url, target_str, max_slots) + " maximum (%d) jobs" % (jobname, target_str, max_slots) self._log(msg) return (-1, msg) target_cfg = self._get_target_cfg(target_dict) if not target_cfg: - msg = "Error: Tried to build '%s' on target %s which isn't supported" % (srpm_url, target_str) + msg = "Error: Tried to build '%s' on target %s which isn't supported" % (jobname, target_str) self._log(msg) return (-1, msg) - archjob = None try: - archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], srpm_url, uniqid) + archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], jobname, uniqid) self._all_jobs[uniqid] = archjob self._building_jobs_lock.acquire() self._building_jobs.append(archjob) self._building_jobs_lock.release() - filename = os.path.basename(srpm_url) - msg = "%s: started %s on %s arch %s at time %d" % (uniqid, filename, + msg = "%s: started %s on %s arch %s at time %d" % (uniqid, jobname, target_str, target_dict['arch'], archjob.starttime()) archjob.start() except (OSError, TypeError), exc: - msg = "Failed request for %s on %s: '%s'" % (srpm_url, + msg = "Failed request for %s on %s: '%s'" % (jobname, target_str, exc) self._log(msg) @@ -355,6 +356,14 @@ except KeyError: pass + def _handle_job_srpm_command(self, cmd): + try: + uniqid = cmd.archjob_id() + archjob = self._all_jobs[uniqid] + archjob.notify_srpm_url(cmd.srpm_url()) + except KeyError: + pass + class PassiveBuilder(Builder, threading.Thread): """ @@ -382,9 +391,7 @@ """Startup HTTP and XML-RPC servers which the build server uses to talk to us.""" hostname = get_hostname(self._cfg, bind_all=True) - xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") - - self._log("Binding to address '%s:%d'\n" % (hostname, xmlrpc_port)) + external_hostname = get_hostname(self._cfg) try: self._http_server = HTTPServer.PlgHTTPServerManager((hostname, self._fileserver_port), @@ -392,8 +399,15 @@ except socket.error, exc: raise socket.error(exc[0], "Couldn't create server for %s:%s: '%s'" % (hostname, self._fileserver_port, exc[1])) - self._http_server.set_POST_handler('/upload', self.upload_callback) + # Set up upload handlers and addresses + upload_loc = "/upload" + host = self._prefix_url(external_hostname) + self._http_server.set_POST_handler(upload_loc, self.upload_callback) + self._upload_url = "%s:%d%s" % (host, self._fileserver_port, upload_loc) + + xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port") + self._log("Binding to address '%s:%d'\n" % (external_hostname, xmlrpc_port)) try: if self._use_ssl: self._xmlrpc_server = AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs) @@ -428,8 +442,8 @@ if item.name == 'archjob_id': try: jobid = urllib.unquote(str(item.value)) - # Ensure archjob_id is only as long as a sha1 hash - if len(jobid) is not 40: + # ensure we know about this job already + if not jobid in self._all_jobs.keys(): jobid = None except ValueError: pass @@ -524,6 +538,7 @@ msg = "Failed" for fpath in files: if fpath.startswith(work_dir): + result = FileTransfer.FT_RESULT_SUCCESS continue last_part = fpath[len(work_dir):] new_path = os.path.join(work_dir, last_part) @@ -531,7 +546,7 @@ shutil.move(fpath, new_path) result = FileTransfer.FT_RESULT_SUCCESS except IOError, exc: - msg = str(exc) + msg = "Failed moving %s to %s: '%s'" % (fpath, new_path, str(exc)) break if result == FileTransfer.FT_RESULT_SUCCESS: @@ -569,6 +584,7 @@ self.done = False self.failed = False self.response = None + self.err_msg = '' threading.Thread.__init__(self) def run(self): @@ -578,9 +594,10 @@ self.response = self._server.request(cmd_stream) except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError), exc: + self.err_msg = "Builder Error (%s) in request(): network problem '%s'" % (self._address, exc) self.failed = True except xmlrpclib.Fault, exc: - print "Builder Error (%s) in request(): server replied '%s'" % (self._address, exc) + self.err_msg = "Builder Error (%s) in request(): server replied '%s'" % (self._address, exc) self.failed = True self.done = True @@ -605,6 +622,7 @@ def download_srpm(self, archjob_id, url, target_dir, dl_callback, cb_data=None): """Download an SRPM from the build server. Only used by BuilderMock objects.""" + self._log("%s: Starting download of %s.\n" % (archjob_id, url)) downloader = FileDownloader.FileDownloader(url, target_dir, ['.src.rpm'], self._certs) downloader.set_callback(dl_callback, url) @@ -655,9 +673,12 @@ break time.sleep(0.5) - if req.done and not req.failed: - self._queued_cmds = [] - return req.response + if req.done: + if not req.failed: + self._queued_cmds = [] + return req.response + else: + self._log(req.err_msg) return None def run(self): Index: BuilderMock.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/BuilderMock.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BuilderMock.py 20 May 2006 05:07:56 -0000 1.9 +++ BuilderMock.py 29 May 2006 20:26:32 -0000 1.10 @@ -40,9 +40,10 @@ """puts things together for an arch - baseclass for handling builds for other arches""" - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self._controller = controller self._buildarch = buildarch + self._jobname = jobname self._starttime = time.time() self._endtime = 0 self._mockstarttime = 0 @@ -55,8 +56,8 @@ self._childpid = 0 self._target_cfg = target_cfg self._builder_cfg = target_cfg.parent_cfg() - self._srpm_url = srpm_url - self._srpm_tries = 0 + self._srpm_path = None + self._srpm_wait_start = 0 self._log_fd = None self._mock_config = None self._done_status = '' @@ -100,7 +101,7 @@ def _handle_death(self): self._die = False self._done_status = 'killed' - self._log("Killing build process...\n") + self._log("Killing build process...") if self._downloader: self._downloader.cancel() @@ -116,30 +117,32 @@ # Kill all members of the child's process group os.kill(child_pgroup, 9) except OSError, exc: - self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, exc)) + self._log("ERROR: Couldn't kill child process group %d: %s" % (child_pgroup, exc)) else: # Ensure child process is reaped - self._log("Waiting for mock process %d to exit...\n" % self._childpid) + self._log("Waiting for mock process %d to exit..." % self._childpid) try: (pid, status) = os.waitpid(self._childpid, 0) except OSError: pass - self._log("Mock process %d exited.\n" % self._childpid) + self._log("Mock process %d exited." % self._childpid) self._childpid = 0 # Start cleanup up the job self._start_cleanup() - self._log("Killed.\n"); + self._log("Killed."); - def _log(self, msg): + def _log(self, msg, newline=True): if msg and self._log_fd: + if newline: + msg = msg + "\n" self._log_fd.write(msg) self._log_fd.flush() os.fsync(self._log_fd.fileno()) if self._builder_cfg.get_bool("General", "debug"): - s = "%s: " % self._uniqid - sys.stdout.write(s + msg) + logtext = "%s: %s" % (self._uniqid, msg) + sys.stdout.write(logtext) sys.stdout.flush() def _copy_mock_output_to_log(self): @@ -155,7 +158,7 @@ self._mock_log = None def _start_build(self): - self._log("Starting step 'building' with command:\n") + self._log("Starting step 'building' with command:") if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) @@ -177,7 +180,7 @@ args.append("--statedir=%s" % self._state_dir) args.append("--uniqueext=%s" % self._uniqid) args.append(self._srpm_path) - self._log(" %s\n" % string.join(args)) + self._log(" %s" % string.join(args)) self._mock_log = os.path.join(self._result_dir, "mock-output.log") self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, self._mock_log, self._mock_log) @@ -185,7 +188,7 @@ self._status = 'prepping' def _start_cleanup(self): - self._log("Cleaning up the buildroot...\n") + self._log("Cleaning up the buildroot...") args = [] builder_cmd = os.path.abspath(self._builder_cfg.get_str("General", "builder_cmd")) @@ -201,7 +204,7 @@ args.append("-r") args.append(self._buildroot) - self._log(" %s\n" % string.join(args)) + self._log(" %s" % string.join(args)) self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None) self._status = 'cleanup' @@ -274,32 +277,62 @@ f.close() return contents - def dl_callback(self, dl_status, cb_data, err_msg=None): - if not self.is_done_status(): - url = cb_data - if dl_status == FileTransfer.FT_RESULT_SUCCESS: - self._status = 'downloaded' - self._log("Retrieved %s.\n" % url) - elif dl_status == FileTransfer.FT_RESULT_FAILED: - self._done_status = 'failed' - self._log("ERROR: Failed to retrieve '%s' because: %s\n" % (url, err_msg)) - self._post_cleanup() - elif dl_status == FileTransfer.FT_RESULT_CANCELED: - # Ignore cancelation - pass + def _srpm_download_cb(self, dl_status, cb_data, err_msg=None): + # We might have been cancelled + if self.is_done_status(): + return + + url = cb_data + if dl_status == FileTransfer.FT_RESULT_SUCCESS: + self._status = 'downloaded' + self._log("Retrieved %s." % url) + elif dl_status == FileTransfer.FT_RESULT_FAILED: + self._log("ERROR: Failed to retrieve '%s' because: %s" % (url, err_msg)) + self._post_cleanup('failed') + elif dl_status == FileTransfer.FT_RESULT_CANCELED: + # Ignore cancelation + pass self._downloader = None def _status_init(self): - self._log("Starting download of %s.\n" % self._srpm_url) - self._status = 'downloading' + if not self._srpm_wait_start: + self._srpm_wait_start = time.time() + + # Kill a job that's waiting for its SRPM URL + # after 30 minutes because it's likely orphaned + if time.time() > (self._srpm_wait_start + (60 * 30)): + self._log("Job waited too long waiting for its SRPM URL. Killing it...") + self._post_cleanup('failed') + + def notify_srpm_url(self, srpm_url): + """Called by our controlling Builder object to tell us that the server + has sent our SRPM URL.""" + if self._status != "init": + return + + err_msg = None try: - target_dir = os.path.dirname(self._srpm_path) - self._downloader = self._controller.download_srpm(self._uniqid, - self._srpm_url, target_dir, self.dl_callback, self._srpm_url) + # Validate the SRPM URL and the SRPM's filename + srpm_filename = FileDownloader.get_base_filename_from_url(srpm_url, ['.src.rpm']) + self._srpm_path = os.path.join(self._source_dir, srpm_filename) + success = True except FileDownloader.FileNameException, exc: - self._done_status = 'failed' - self._log("ERROR: Failed to begin SRPM download. Error: '%s' URL: %s\n" % (exc, self._srpm_url)) - self._post_cleanup() + err_msg = "ERROR: SRPM file name was invalid. Message: '%s'" % exc + + if not err_msg: + # Ask our controlling builder to download it (if an Active builder) + # or to move it for us (if a Passive builder) + self._status = 'downloading' + try: + target_dir = os.path.dirname(self._srpm_path) + self._downloader = self._controller.download_srpm(self._uniqid, + srpm_url, target_dir, self._srpm_download_cb, srpm_url) + except FileDownloader.FileNameException, exc: + err_msg = "ERROR: Failed to begin SRPM download. Error: '%s' URL: %s" % (exc, srpm_url) + + if err_msg: + self._log(err_msg) + self._post_cleanup('failed') def _status_downloading(self): pass @@ -309,18 +342,18 @@ # server tells us the repo is unlocked. if not self._repo_locked: self._start_build() - else: - # Only show this message once - if self._repo_wait_start <= 0: - self._log("Waiting for repository to unlock before starting the build...\n") - self._repo_wait_start = time.time() - - # Kill a job in 'downloaded' state after 30 minutes because - # it's likely orphaned - if time.time() > (self._repo_wait_start + (60 * 30)): - self._done_status = 'failed' - self._log("Job waited too long for repo to unlock. Killing it...\n") - self._post_cleanup() + return + + # Only show this message once + if self._repo_wait_start <= 0: + self._log("Waiting for repository to unlock before starting the build...") + self._repo_wait_start = time.time() + + # Kill a job in 'downloaded' state after 30 minutes because + # it's likely orphaned + if time.time() > (self._repo_wait_start + (60 * 30)): + self._log("Job waited too long for repo to unlock. Killing it...") + self._post_cleanup('failed') def _watch_mock(self, good_exit, bad_exit): (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG) @@ -349,9 +382,8 @@ # something is wrong if mock takes more than 15s to write the status file if time.time() > self._mockstarttime + 15: self._mockstarttime = 0 - self._done_status = 'failed' - self._log("ERROR: Timed out waiting for the mock status file! %s\n" % mockstatusfile) - self._post_cleanup() + self._log("ERROR: Timed out waiting for the mock status file! %s" % mockstatusfile) + self._post_cleanup('failed') else: if not self._mock_config and self._mock_is_prepping(): self._mock_config = self._read_mock_config() @@ -364,8 +396,8 @@ def _status_cleanup(self): (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG) if aux_pid: - self._childpid = 0 # Mock exited + self._childpid = 0 if self._mock_config: if self._mock_config.has_key('rootdir'): mock_root_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../")) @@ -384,7 +416,7 @@ # Ensure child process is reaped if it's still around if self._childpid: try: - self._log("Waiting for child process %d to exit.\n" % self._childpid) + self._log("Waiting for child process %d to exit." % self._childpid) (pid, status) = os.waitpid(self._childpid, 0) except OSError: self._childpid = 0 @@ -395,21 +427,25 @@ self._post_cleanup() - def _post_cleanup(self): + def _post_cleanup(self, done_status=None): + if done_status: + self._done_status = done_status + + # If we're killed, we don't care about uploading logs to the build server if self._done_status is not 'killed': self._status = "uploading" self._files = self._find_files() self._uploader = self._controller.upload_files(self._uniqid, self._files, - self.ul_callback, None) + self._upload_cb, None) else: self._status = self._done_status - def ul_callback(self, status, cb_data, msg): + def _upload_cb(self, status, cb_data, msg): if status == FileTransfer.FT_RESULT_SUCCESS: pass elif status == FileTransfer.FT_RESULT_FAILED: self._done_status = 'failed' - self._log("Job failed because files could not be uploaded: %s\n" % msg) + self._log("Job failed because files could not be uploaded: %s" % msg) self._status = self._done_status self._uploader = None @@ -417,14 +453,14 @@ pass def _job_done(self): - self._log("-----------------------\n") + self._log("-----------------------") if self._status == 'done': - self._log("Job completed successfully.\n") + self._log("Job completed successfully.") elif self._status == 'failed': - self._log("Job failed due to build errors! Please see build logs.\n") + self._log("Job failed due to build errors! Please see build logs.") elif self._status == 'killed': - self._log("Job failed because it was killed.\n") - self._log("\n\n") + self._log("Job failed because it was killed.") + self._log("\n") if self._log_fd: self._log_fd.close() @@ -433,21 +469,12 @@ def run(self): # Print out a nice message at the start of the job target_str = Config.make_target_string_from_dict(self._target_cfg.target_dict()) - time_str = time.asctime(time.localtime(self._starttime)) - self._log("""Starting job: - Time: %s - Target: %s - UID: %s - Architecture: %s - SRPM: %s\n\n""" % (time_str, target_str, self._uniqid, self._buildarch, self._srpm_url)) - - try: - srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm']) - self._srpm_path = os.path.join(self._source_dir, srpm_filename) - except FileDownloader.FileNameException, exc: - self._done_status = 'failed' - self._log("ERROR: SRPM file name was invalid. Message: '%s'\n" % exc) - self._post_cleanup() + self._log("Starting job:") + self._log(" Name: %s" % self._jobname) + self._log(" UID: %s" % self._uniqid) + self._log(" Arch: %s" % self._buildarch) + self._log(" Time: %s" % time.asctime(time.localtime(self._starttime))) + self._log(" Target: %s" % target_str) # Main build job work loop while not self.is_done_status(): @@ -458,9 +485,8 @@ try: func = getattr(self, "_status_%s" % self._status) except AttributeError: - self._done_status = 'failed' - self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'.\n" % self._status) - self._post_cleanup() + self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'." % self._status) + self._post_cleanup('failed') else: func() time.sleep(3) @@ -476,8 +502,8 @@ files_in_dir = os.listdir(self._result_dir) file_list = [] self._log("\n") - self._log("Output File List:\n") - self._log("-----------------\n") + self._log("Output File List:") + self._log("-----------------") log_files = [] rpms = [] # sort into logs first, rpms later @@ -493,10 +519,10 @@ i = 1 num_files = len(file_list) for fpath in file_list: - self._log(" File (%d of %d): %s\n" % (i, num_files, + self._log(" File (%d of %d): %s" % (i, num_files, os.path.basename(fpath))) i = i + 1 - self._log("-----------------\n") + self._log("-----------------") return file_list def status(self): @@ -520,34 +546,34 @@ class InvalidTargetError(exceptions.Exception): pass class i386Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '/usr/bin/setarch i686' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class x86_64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class PPCArch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '/usr/bin/setarch ppc32' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class PPC64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class SparcArch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '/usr/bin/sparc32' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) class Sparc64Arch(BuilderMock): - def __init__(self, controller, target_cfg, buildarch, srpm_url, uniqid): + def __init__(self, controller, target_cfg, buildarch, jobname, uniqid): self.arch_command = '/usr/bin/sparc64' - BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url, uniqid) + BuilderMock.__init__(self, controller, target_cfg, buildarch, jobname, uniqid) BuilderClassDict = { From fedora-extras-commits at redhat.com Mon May 29 20:26:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:26:40 -0700 Subject: extras-buildsys/common Commands.py,1.9,1.10 Message-ID: <200605292027.k4TKRAGo000960@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv877/common Modified Files: Commands.py Log Message: 2006-05-29 Dan Williams * Make most everything work now; both Passive and Active builders will download/upload the SRPM from the server. The SRPM's URL is no longer passed to the builder in the initial job request, but comes along later once the SPRM is actually available to the builder (which might be after an upload to the builder in the case of Passive builders). * Pylint cleanups * Clean up logging on builders by consolidating newline handling is one place * Use the Targets command to pass back to the server any upload URL the builder might have (for passive builders) Index: Commands.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Commands.py 23 May 2006 15:06:14 -0000 1.9 +++ Commands.py 29 May 2006 20:26:37 -0000 1.10 @@ -19,7 +19,7 @@ import threading - +import os CMD_NAME_ERROR = "Error" @@ -290,15 +290,17 @@ class PlgCommandTargets(PlgCommand): - def __init__(self, targets, seq=0): + def __init__(self, targets, upload_url, seq=0): PlgCommand.__init__(self, CMD_NAME_TARGETS, seq) self._targets = targets + self._upload_url = upload_url def _deserialize(args): try: targets = args['targets'] - except (KeyError, TypeError): - raise ValueError("No 'targets' argument found.") + upload_url = args['upload_url'] + except (KeyError, TypeError), exc: + raise ValueError("No '%s' argument found." % exc) # Sanity checking on targets argument if type(targets) != type([]): @@ -313,62 +315,63 @@ except KeyError, exc: raise ValueError("Required item '%s' not found in a target." % exc) - return PlgCommandTargets(targets) + return PlgCommandTargets(targets, upload_url) _deserialize = staticmethod(_deserialize) def serialize(self): args = {} args['targets'] = self._targets + args['upload_url'] = self._upload_url return PlgCommand._serialize(self, args) def targets(self): return self._targets + def upload_url(self): + return self._upload_url + def __str__(self): - return "%s(seq: %d, targets: %s)" % (self._name, self._seq, self._targets) + return "%s(seq: %d, targets: %s, upload_url: %s)" % (self._name, self._seq, self._targets, self._upload_url) class PlgCommandNewJobReq(PlgCommand): _need_ack = True - def __init__(self, archjob, target_dict=None, srpm_url=None, archjob_id=None, seq=0): + _SRPM_EXT = ".src.rpm" + def __init__(self, archjob, target_dict=None, jobname=None, archjob_id=None, seq=0): PlgCommand.__init__(self, CMD_NAME_NEW_JOB_REQ, seq) self._archjob = archjob # doesn't get serialized if archjob: self._target_dict = archjob.target_dict() - self._srpm_url = archjob.srpm_url() + self._jobname = os.path.basename(archjob.srpm_path()) + if self._jobname.endswith(self._SRPM_EXT): + self._jobname = self._jobname[:len(self._jobname) - len(self._SRPM_EXT)] self._archjob_id = archjob.archjob_id() else: - if not target_dict or not srpm_url or not archjob_id: - raise Exception("Need a target_dict, an srpm_url, and an archjob_id.") + if not target_dict or not jobname or not archjob_id: + raise Exception("Need a target_dict, a jobname, and an archjob_id.") self._target_dict = target_dict - self._srpm_url = srpm_url + self._jobname = jobname self._archjob_id = archjob_id def _deserialize(args): try: target_dict = args['target_dict'] - except (KeyError, TypeError): - raise ValueError("No 'target_dict' argument found.") - try: - srpm_url = args['srpm_url'] - except (KeyError, TypeError): - raise ValueError("No 'srpm_url' argument found.") - try: + jobname = args['jobname'] archjob_id = args['archjob_id'] - except (KeyError, TypeError): - raise ValueError("No 'archjob_id' argument found.") + except (KeyError, TypeError), exc: + raise ValueError("No '%s' argument found." % exc) - return PlgCommandNewJobReq(None, target_dict, srpm_url, archjob_id) + return PlgCommandNewJobReq(None, target_dict, jobname, archjob_id) _deserialize = staticmethod(_deserialize) def serialize(self): args = {} args['target_dict'] = self._target_dict - args['srpm_url'] = self._srpm_url + args['jobname'] = self._jobname args['archjob_id'] = self._archjob_id return PlgCommand._serialize(self, args) @@ -378,15 +381,15 @@ def target_dict(self): return self._target_dict - def srpm_url(self): - return self._srpm_url + def job_name(self): + return self._jobname def archjob_id(self): return self._archjob_id def __str__(self): - return "%s(seq: %d, target_dict: %s, srpm_url: %s, archjob_id: %s)" % (self._name, - self._seq, self._target_dict, self._srpm_url, self._archjob_id) + return "%s(seq: %d, target_dict: %s, jobname: %s, archjob_id: %s)" % (self._name, + self._seq, self._target_dict, self._jobname, self._archjob_id) class PlgCommandNewJobAck(PlgCommandAck): From fedora-extras-commits at redhat.com Mon May 29 20:46:25 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 29 May 2006 13:46:25 -0700 Subject: extras-buildsys/server Builder.py,1.44,1.45 Message-ID: <200605292046.k4TKkPS4001046@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1028/server Modified Files: Builder.py Log Message: Small fixes for Active builders Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Builder.py 29 May 2006 20:26:38 -0000 1.44 +++ Builder.py 29 May 2006 20:46:22 -0000 1.45 @@ -637,7 +637,7 @@ def __init__(self, manager, cfg, address, weight): Builder.__init__(self, manager, cfg, address, weight, TYPE_ACTIVE) - def _request_srpm_upload(self, archjob, upload_cb, user_data, srpm_path): + def request_srpm_upload(self, archjob, upload_cb, user_data, srpm_path): """Called by the archjob to request that an SRPM be made available to the builder.""" # Copy the SRPM to the correct upload location http_dir = self._manager.http_dir() @@ -709,6 +709,12 @@ if isinstance(cmd, Commands.PlgCommandJobFilesAck): self._handle_job_files_ack(cmd) handled = True + elif isinstance(cmd, Commands.PlgCommandTargets): + if not self._target_list: + self._lock.acquire() + self._target_list = cmd.targets() + self._lock.release() + handled = True if not handled: print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name()) From fedora-extras-commits at redhat.com Mon May 29 21:47:45 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 29 May 2006 14:47:45 -0700 Subject: rpms/jpgraph/FC-5 .cvsignore, 1.6, 1.7 jpgraph.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200605292147.k4TLlliR003894@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/jpgraph/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3857/FC-5 Modified Files: .cvsignore jpgraph.spec sources Log Message: update to 2.1.2, explicitely require php >= 5.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jpgraph/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Feb 2006 12:10:01 -0000 1.6 +++ .cvsignore 29 May 2006 21:47:45 -0000 1.7 @@ -1 +1 @@ -jpgraph-2.1.1.tar.gz +jpgraph-2.1.2.tar.gz Index: jpgraph.spec =================================================================== RCS file: /cvs/extras/rpms/jpgraph/FC-5/jpgraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jpgraph.spec 22 Feb 2006 12:10:01 -0000 1.8 +++ jpgraph.spec 29 May 2006 21:47:45 -0000 1.9 @@ -1,18 +1,18 @@ Name: jpgraph Summary: Object oriented graph drawing class library for PHP -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} -Source0: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.1.1.tar.gz +Source0: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.1.2.tar.gz License: QPL URL: http://www.aditus.nu/jpgraph/ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: php-gd +Requires: php >= 5.0.0, php-gd %description -JpGraph is a OO Graph drawing library for PHP 4.0.2 and above. +JpGraph is a OO Graph drawing library for PHP 4.3.1 and above. Highlights of the available features are: text, linear, and log scales for both the X and Y axes, anti-aliasing of lines, color-gradient fills, support for GIF, JPG, and PNG formats, @@ -24,12 +24,15 @@ Extensive documentations are availible at: http://www.aditus.nu/jpgraph/ +Note: This version will only work with PHP5, not with PHP4 + + %package doc Summary: Documenation for %{name} Group: Documentation %description doc -JpGraph is a OO Graph drawing library for PHP 4.0.2 and above. +JpGraph is a OO Graph drawing library for PHP 4.3.1 and above. Highlights of the available features are: text, linear, and log scales for both the X and Y axes, anti-aliasing of lines, color-gradient fills, support for GIF, JPG, and PNG formats, @@ -40,6 +43,9 @@ This package contains the documenation for %{name}. +Note: This version will only work with PHP5, not with PHP4 + + %prep %setup -q @@ -63,6 +69,10 @@ %doc docs/* src/Examples %changelog +* Mon May 29 2006 Aurelien Bompard 2.1.2-1 +- version 2.1.2 +- explicitely require php >= 5.0.0 + * Wed Feb 22 2006 Aurelien Bompard 2.1.1-1 - version 2.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jpgraph/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Feb 2006 12:10:01 -0000 1.6 +++ sources 29 May 2006 21:47:45 -0000 1.7 @@ -1 +1 @@ -3adf3c51210044ee6f34ef28fb2f09ca jpgraph-2.1.1.tar.gz +af90ddff994629d3162192efff565179 jpgraph-2.1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 29 21:47:46 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 29 May 2006 14:47:46 -0700 Subject: rpms/jpgraph/devel .cvsignore, 1.6, 1.7 jpgraph.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200605292147.k4TLlmVK003900@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/jpgraph/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3857/devel Modified Files: .cvsignore jpgraph.spec sources Log Message: update to 2.1.2, explicitely require php >= 5.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jpgraph/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Feb 2006 12:10:01 -0000 1.6 +++ .cvsignore 29 May 2006 21:47:45 -0000 1.7 @@ -1 +1 @@ -jpgraph-2.1.1.tar.gz +jpgraph-2.1.2.tar.gz Index: jpgraph.spec =================================================================== RCS file: /cvs/extras/rpms/jpgraph/devel/jpgraph.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jpgraph.spec 22 Feb 2006 12:10:01 -0000 1.8 +++ jpgraph.spec 29 May 2006 21:47:45 -0000 1.9 @@ -1,18 +1,18 @@ Name: jpgraph Summary: Object oriented graph drawing class library for PHP -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} -Source0: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.1.1.tar.gz +Source0: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-2.1.2.tar.gz License: QPL URL: http://www.aditus.nu/jpgraph/ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: php-gd +Requires: php >= 5.0.0, php-gd %description -JpGraph is a OO Graph drawing library for PHP 4.0.2 and above. +JpGraph is a OO Graph drawing library for PHP 4.3.1 and above. Highlights of the available features are: text, linear, and log scales for both the X and Y axes, anti-aliasing of lines, color-gradient fills, support for GIF, JPG, and PNG formats, @@ -24,12 +24,15 @@ Extensive documentations are availible at: http://www.aditus.nu/jpgraph/ +Note: This version will only work with PHP5, not with PHP4 + + %package doc Summary: Documenation for %{name} Group: Documentation %description doc -JpGraph is a OO Graph drawing library for PHP 4.0.2 and above. +JpGraph is a OO Graph drawing library for PHP 4.3.1 and above. Highlights of the available features are: text, linear, and log scales for both the X and Y axes, anti-aliasing of lines, color-gradient fills, support for GIF, JPG, and PNG formats, @@ -40,6 +43,9 @@ This package contains the documenation for %{name}. +Note: This version will only work with PHP5, not with PHP4 + + %prep %setup -q @@ -63,6 +69,10 @@ %doc docs/* src/Examples %changelog +* Mon May 29 2006 Aurelien Bompard 2.1.2-1 +- version 2.1.2 +- explicitely require php >= 5.0.0 + * Wed Feb 22 2006 Aurelien Bompard 2.1.1-1 - version 2.1.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jpgraph/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Feb 2006 12:10:01 -0000 1.6 +++ sources 29 May 2006 21:47:45 -0000 1.7 @@ -1 +1 @@ -3adf3c51210044ee6f34ef28fb2f09ca jpgraph-2.1.1.tar.gz +af90ddff994629d3162192efff565179 jpgraph-2.1.2.tar.gz From fedora-extras-commits at redhat.com Mon May 29 21:48:09 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 29 May 2006 14:48:09 -0700 Subject: rpms/gossip/FC-5 .cvsignore, 1.7, 1.8 gossip.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200605292148.k4TLmBZZ003937@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3916 Modified Files: .cvsignore gossip.spec sources Log Message: * Mon May 29 2006 Brian Pepple - 0.11.1-2 - Update to 0.11.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 May 2006 23:59:38 -0000 1.7 +++ .cvsignore 29 May 2006 21:48:08 -0000 1.8 @@ -1 +1 @@ -gossip-0.11.tar.bz2 +gossip-0.11.1.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/gossip.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gossip.spec 1 May 2006 23:59:38 -0000 1.17 +++ gossip.spec 29 May 2006 21:48:08 -0000 1.18 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: gossip -Version: 0.11 +Version: 0.11.1 Release: 2%{?dist} Summary: Gnome Jabber Client @@ -130,6 +130,9 @@ %changelog +* Mon May 29 2006 Brian Pepple - 0.11.1-2 +- Update to 0.11.1. + * Mon May 1 2006 Brian Pepple - 0.11-2 - Update to 0.11. - Add scriptlets for gtk+ icon cache. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 May 2006 23:59:38 -0000 1.7 +++ sources 29 May 2006 21:48:08 -0000 1.8 @@ -1 +1 @@ -4b2720f96df77e9c35f5eb7abbb10dab gossip-0.11.tar.bz2 +814c4734b9df3979f3d9c63ca365b3df gossip-0.11.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 29 21:50:08 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 29 May 2006 14:50:08 -0700 Subject: rpms/gossip/devel .cvsignore, 1.7, 1.8 gossip.spec, 1.18, 1.19 sources, 1.7, 1.8 Message-ID: <200605292150.k4TLoAKe004018@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3997 Modified Files: .cvsignore gossip.spec sources Log Message: * Mon May 29 2006 Brian Pepple - 0.11.1-3 - Update to 0.11.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 May 2006 23:27:20 -0000 1.7 +++ .cvsignore 29 May 2006 21:50:07 -0000 1.8 @@ -1 +1 @@ -gossip-0.11.tar.bz2 +gossip-0.11.1.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gossip.spec 20 May 2006 17:01:01 -0000 1.18 +++ gossip.spec 29 May 2006 21:50:07 -0000 1.19 @@ -1,8 +1,8 @@ %define with_dbus 1 Name: gossip -Version: 0.11 -Release: 4%{?dist} +Version: 0.11.1 +Release: 3%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -131,6 +131,9 @@ %changelog +* Mon May 29 2006 Brian Pepple - 0.11.1-3 +- Update to 0.11.1. + * Sat May 20 2006 Brian Pepple - 0.11-4 - Build with libnotify support. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 May 2006 23:27:20 -0000 1.7 +++ sources 29 May 2006 21:50:07 -0000 1.8 @@ -1 +1 @@ -4b2720f96df77e9c35f5eb7abbb10dab gossip-0.11.tar.bz2 +814c4734b9df3979f3d9c63ca365b3df gossip-0.11.1.tar.bz2 From fedora-extras-commits at redhat.com Mon May 29 22:08:41 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 15:08:41 -0700 Subject: rpms/perl-GSSAPI/devel .cvsignore, 1.2, 1.3 perl-GSSAPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605292208.k4TM8hus006537@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GSSAPI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6516 Modified Files: .cvsignore perl-GSSAPI.spec sources Log Message: Update to 0.22. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 19:06:13 -0000 1.2 +++ .cvsignore 29 May 2006 22:08:40 -0000 1.3 @@ -1 +1 @@ -GSSAPI-0.21.tar.gz +GSSAPI-0.22.tar.gz Index: perl-GSSAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/perl-GSSAPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-GSSAPI.spec 21 Apr 2006 19:06:13 -0000 1.1 +++ perl-GSSAPI.spec 29 May 2006 22:08:40 -0000 1.2 @@ -5,7 +5,7 @@ # Name: perl-GSSAPI -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Perl extension providing access to the GSSAPIv2 library @@ -17,8 +17,8 @@ BuildRequires: perl BuildRequires: krb5-devel +BuildRequires: which BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -64,6 +64,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 0.22-1 +- Update to 0.22. + * Thu Apr 6 2006 Jose Pedro Oliveira - 0.21-1 - Update to 0.21. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 19:06:13 -0000 1.2 +++ sources 29 May 2006 22:08:40 -0000 1.3 @@ -1 +1 @@ -2779227c30afa412415680da54b98a10 GSSAPI-0.21.tar.gz +63ea55e46783c028ef6dac0ec2ca0887 GSSAPI-0.22.tar.gz From fedora-extras-commits at redhat.com Mon May 29 22:11:46 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 29 May 2006 15:11:46 -0700 Subject: rpms/xbindkeys/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xbindkeys.spec, 1.8, 1.9 Message-ID: <200605292211.k4TMBmp8006626@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/xbindkeys/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6589/FC-5 Modified Files: .cvsignore sources xbindkeys.spec Log Message: version 1.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 May 2005 17:30:22 -0000 1.3 +++ .cvsignore 29 May 2006 22:11:46 -0000 1.4 @@ -1 +1 @@ -xbindkeys-1.7.2.tar.gz +xbindkeys-1.7.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 May 2005 17:30:22 -0000 1.3 +++ sources 29 May 2006 22:11:46 -0000 1.4 @@ -1 +1 @@ -7aead9049d972221b879f22718528690 xbindkeys-1.7.2.tar.gz +eea2fe306e99274e8730e199b85706d5 xbindkeys-1.7.3.tar.gz Index: xbindkeys.spec =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/FC-5/xbindkeys.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xbindkeys.spec 22 Feb 2006 08:11:25 -0000 1.8 +++ xbindkeys.spec 29 May 2006 22:11:46 -0000 1.9 @@ -1,6 +1,6 @@ Name: xbindkeys -Version: 1.7.2 -Release: 4%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Binds keys or mouse buttons to shell commands under X. License: GPL @@ -27,7 +27,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -39,6 +39,12 @@ %attr(0644, root, root) %{_mandir}/man?/* %changelog +* Tue May 30 2006 Aurelien Bompard 1.7.3-1 +- version 1.7.3 + +* Fri May 12 2006 Aurelien Bompard 1.7.2-5 +- rebuild + * Wed Feb 22 2006 Aurelien Bompard 1.7.2-4 - fix dependencies for modular Xorg From fedora-extras-commits at redhat.com Mon May 29 22:11:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 29 May 2006 15:11:47 -0700 Subject: rpms/xbindkeys/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xbindkeys.spec, 1.9, 1.10 Message-ID: <200605292211.k4TMBnoI006632@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/xbindkeys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6589/devel Modified Files: .cvsignore sources xbindkeys.spec Log Message: version 1.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 May 2005 17:30:22 -0000 1.3 +++ .cvsignore 29 May 2006 22:11:47 -0000 1.4 @@ -1 +1 @@ -xbindkeys-1.7.2.tar.gz +xbindkeys-1.7.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 May 2005 17:30:22 -0000 1.3 +++ sources 29 May 2006 22:11:47 -0000 1.4 @@ -1 +1 @@ -7aead9049d972221b879f22718528690 xbindkeys-1.7.2.tar.gz +eea2fe306e99274e8730e199b85706d5 xbindkeys-1.7.3.tar.gz Index: xbindkeys.spec =================================================================== RCS file: /cvs/extras/rpms/xbindkeys/devel/xbindkeys.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xbindkeys.spec 11 May 2006 22:23:35 -0000 1.9 +++ xbindkeys.spec 29 May 2006 22:11:47 -0000 1.10 @@ -1,6 +1,6 @@ Name: xbindkeys -Version: 1.7.2 -Release: 5%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Binds keys or mouse buttons to shell commands under X. License: GPL @@ -27,7 +27,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -39,6 +39,9 @@ %attr(0644, root, root) %{_mandir}/man?/* %changelog +* Tue May 30 2006 Aurelien Bompard 1.7.3-1 +- version 1.7.3 + * Fri May 12 2006 Aurelien Bompard 1.7.2-5 - rebuild From fedora-extras-commits at redhat.com Mon May 29 22:26:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 15:26:21 -0700 Subject: rpms/perl-GSSAPI/FC-4 .cvsignore, 1.2, 1.3 perl-GSSAPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605292226.k4TMQNSO006765@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GSSAPI/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6728/FC-4 Modified Files: .cvsignore perl-GSSAPI.spec sources Log Message: Update to 0.22. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 19:06:13 -0000 1.2 +++ .cvsignore 29 May 2006 22:26:21 -0000 1.3 @@ -1 +1 @@ -GSSAPI-0.21.tar.gz +GSSAPI-0.22.tar.gz Index: perl-GSSAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-4/perl-GSSAPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-GSSAPI.spec 21 Apr 2006 19:06:13 -0000 1.1 +++ perl-GSSAPI.spec 29 May 2006 22:26:21 -0000 1.2 @@ -5,7 +5,7 @@ # Name: perl-GSSAPI -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Perl extension providing access to the GSSAPIv2 library @@ -17,8 +17,8 @@ BuildRequires: perl BuildRequires: krb5-devel +BuildRequires: which BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -64,6 +64,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 0.22-1 +- Update to 0.22. + * Thu Apr 6 2006 Jose Pedro Oliveira - 0.21-1 - Update to 0.21. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 19:06:13 -0000 1.2 +++ sources 29 May 2006 22:26:21 -0000 1.3 @@ -1 +1 @@ -2779227c30afa412415680da54b98a10 GSSAPI-0.21.tar.gz +63ea55e46783c028ef6dac0ec2ca0887 GSSAPI-0.22.tar.gz From fedora-extras-commits at redhat.com Mon May 29 22:26:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 29 May 2006 15:26:21 -0700 Subject: rpms/perl-GSSAPI/FC-5 .cvsignore, 1.2, 1.3 perl-GSSAPI.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605292226.k4TMQN6V006771@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GSSAPI/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6728/FC-5 Modified Files: .cvsignore perl-GSSAPI.spec sources Log Message: Update to 0.22. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 19:06:13 -0000 1.2 +++ .cvsignore 29 May 2006 22:26:21 -0000 1.3 @@ -1 +1 @@ -GSSAPI-0.21.tar.gz +GSSAPI-0.22.tar.gz Index: perl-GSSAPI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-5/perl-GSSAPI.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-GSSAPI.spec 21 Apr 2006 19:06:13 -0000 1.1 +++ perl-GSSAPI.spec 29 May 2006 22:26:21 -0000 1.2 @@ -5,7 +5,7 @@ # Name: perl-GSSAPI -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Perl extension providing access to the GSSAPIv2 library @@ -17,8 +17,8 @@ BuildRequires: perl BuildRequires: krb5-devel +BuildRequires: which BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -64,6 +64,9 @@ %changelog +* Mon May 29 2006 Jose Pedro Oliveira - 0.22-1 +- Update to 0.22. + * Thu Apr 6 2006 Jose Pedro Oliveira - 0.21-1 - Update to 0.21. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GSSAPI/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 19:06:13 -0000 1.2 +++ sources 29 May 2006 22:26:21 -0000 1.3 @@ -1 +1 @@ -2779227c30afa412415680da54b98a10 GSSAPI-0.21.tar.gz +63ea55e46783c028ef6dac0ec2ca0887 GSSAPI-0.22.tar.gz From fedora-extras-commits at redhat.com Mon May 29 22:52:38 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 29 May 2006 15:52:38 -0700 Subject: fedora-security/audit fc5,1.182,1.183 fc4,1.269,1.270 Message-ID: <200605292252.k4TMqc9q006940@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6920 Modified Files: fc5 fc4 Log Message: Mailman Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- fc5 29 May 2006 11:02:47 -0000 1.182 +++ fc5 29 May 2006 22:52:35 -0000 1.183 @@ -281,7 +281,7 @@ CVE-2005-4268 backport (cpio) also blocked by FORTIFY_SOURCE CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment CVE-2005-4154 ignore (php) don't install untrusted pear packages -CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch +CVE-2005-4153 version (mailman) [since FEDORA-2006-535] was backport mailman-2.1.5-date_overflows.patch since GA CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html CVE-2005-4134 backport (mozilla) mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch CVE-2005-4130 ignore (HelixPlayer) not verified Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- fc4 29 May 2006 11:02:47 -0000 1.269 +++ fc4 29 May 2006 22:52:35 -0000 1.270 @@ -248,7 +248,7 @@ CVE-2006-0095 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-102 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-194] -CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) #187421 +CVE-2006-0052 version (mailman, fixed 2.1.6) #187421 [since FEDORA-2006-534] CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0039 version (kernel, fixed 2.6.16.17) [since FEDORA-2006-573] @@ -280,7 +280,7 @@ CVE-2005-4268 blocked (cpio) #172669 by FORTIFY_SOURCE CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment CVE-2005-4154 ignore (php) don't install untrusted pear packages -CVE-2005-4153 VULNERABLE (mailman) +CVE-2005-4153 version (mailman) [since FEDORA-2006-534] CVE-2005-4134 backport (mozilla) [since FEDORA-2006-075] CVE-2005-4134 backport (firefox) [since FEDORA-2006-076] CVE-2005-4130 ignore (HelixPlayer) not verified @@ -341,7 +341,7 @@ CVE-2005-3624 backport (cups) [since FEDORA-2006-010] CVE-2005-3623 version (kernel, fixed 2.6.14.5) [since FEDORA-2006-077] was backport since FEDORA-2006-013 CVE-2005-3582 version (ImageMagick) gentoo only -CVE-2005-3573 VULNERABLE (mailman) +CVE-2005-3573 VULNERABLE (mailman) ** CVE-2005-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067] CVE-2005-3402 ignore (thunderbird) mozilla say by design CVE-2005-3392 ignore (php) safe mode isn't safe @@ -841,7 +841,7 @@ CVE-2005-0206 version (xpdf, only bad patch for 2004-0888) CVE-2005-0205 version (kdenetwork, not 3.3 onwards) CVE-2005-0204 version (kernel, didn't affect upstream) -CVE-2005-0202 backport (mailman, fixed 2.1.6) from srpm +CVE-2005-0202 version (mailman, fixed 2.1.6) [since FEDORA-2006-534] was backport since GA CVE-2005-0201 backport (dbus) [since FEDORA-2005-822] CVE-2005-0194 version (squid, fixed 2.5.STABLE8) CVE-2005-0180 version (kernel, fixed 2.6.11) @@ -1013,7 +1013,7 @@ CVE-2004-1184 backport (enscript) in srpm CVE-2004-1183 backport (libtiff) libtiff-3.5.7-dump.patch CVE-2004-1180 version (rwho, fixed 0.17) -CVE-2004-1177 backport (mailman, fixed 2.1.6) in srpm +CVE-2004-1177 version (mailman, fixed 2.1.6) [since FEDORA-2006-534] was backport since GA CVE-2004-1176 version (mc, fixed 4.6.0) CVE-2004-1175 version (mc, fixed 4.6.0) CVE-2004-1174 version (mc, fixed 4.6.0) From fedora-extras-commits at redhat.com Tue May 30 03:19:12 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 29 May 2006 20:19:12 -0700 Subject: rpms/kasumi/FC-4 .cvsignore, 1.4, 1.5 kasumi.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605300319.k4U3JEBJ019827@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kasumi/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19806 Modified Files: .cvsignore kasumi.spec sources Log Message: * Tue May 30 2006 Akira TAGOH - 2.0-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Dec 2005 12:11:10 -0000 1.4 +++ .cvsignore 30 May 2006 03:19:12 -0000 1.5 @@ -1,3 +1,4 @@ kasumi-0.9.tar.gz kasumi-0.10.tar.gz kasumi-1.0.tar.gz +kasumi-2.0.tar.gz Index: kasumi.spec =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/kasumi.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kasumi.spec 13 Dec 2005 12:11:10 -0000 1.4 +++ kasumi.spec 30 May 2006 03:19:12 -0000 1.5 @@ -1,5 +1,5 @@ Name: kasumi -Version: 1.0 +Version: 2.0 Release: 1%{?dist} License: GPL @@ -52,6 +52,9 @@ %changelog +* Tue May 30 2006 Akira TAGOH - 2.0-1 +- New upstream release. + * Mon Dec 12 2005 Akira TAGOH - 1.0-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Dec 2005 12:11:10 -0000 1.4 +++ sources 30 May 2006 03:19:12 -0000 1.5 @@ -1 +1 @@ -15314d8eaaf83abf5fd41b93be8ce91f kasumi-1.0.tar.gz +f2b080cbea0bac90fadcc8cfcc500460 kasumi-2.0.tar.gz From fedora-extras-commits at redhat.com Tue May 30 04:13:12 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 29 May 2006 21:13:12 -0700 Subject: rpms/kasumi/FC-4 kasumi-1.0-gcc41.patch, NONE, 1.1 kasumi.spec, 1.5, 1.6 Message-ID: <200605300413.k4U4DEQ2022300@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kasumi/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22280 Modified Files: kasumi.spec Added Files: kasumi-1.0-gcc41.patch Log Message: - kasumi-1.0-gcc41.patch: backport to build with gcc-4.1. kasumi-1.0-gcc41.patch: --- NEW FILE kasumi-1.0-gcc41.patch --- --- kasumi-1.0.orig/Makefile.am 2005-09-01 16:48:07.000000000 +0900 +++ kasumi-1.0/Makefile.am 2005-12-15 15:47:48.000000000 +0900 @@ -13,7 +13,7 @@ pkgdata_DATA = kasumi.png -AM_CPPFLAGS=-DLOCALEDIR='"$(localedir)"' +AM_CPPFLAGS=-DLOCALEDIR='"$(localedir)"' -ffriend-injection SUBDIRS = intl m4 po ACLOCAL_AMFLAGS = -I m4 Index: kasumi.spec =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/kasumi.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kasumi.spec 30 May 2006 03:19:12 -0000 1.5 +++ kasumi.spec 30 May 2006 04:13:12 -0000 1.6 @@ -8,6 +8,7 @@ BuildRequires: desktop-file-utils, gtk2-devel Source0: %{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch1: kasumi-1.0-gcc41.patch Summary: An anthy dictionary management tool. @@ -18,6 +19,10 @@ %prep %setup -q +%patch1 -p1 -b .gcc41 +aclocal +automake --add-missing +autoconf %build @@ -54,6 +59,7 @@ %changelog * Tue May 30 2006 Akira TAGOH - 2.0-1 - New upstream release. +- kasumi-1.0-gcc41.patch: backport to build with gcc-4.1. * Mon Dec 12 2005 Akira TAGOH - 1.0-1 - New upstream release. From fedora-extras-commits at redhat.com Tue May 30 06:44:18 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:44:18 -0700 Subject: rpms/scim-bridge - New directory Message-ID: <200605300644.k4U6iKfw027270@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27244/scim-bridge Log Message: Directory /cvs/extras/rpms/scim-bridge added to the repository From fedora-extras-commits at redhat.com Tue May 30 06:44:18 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:44:18 -0700 Subject: rpms/scim-bridge/devel - New directory Message-ID: <200605300644.k4U6iKMn027273@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27244/scim-bridge/devel Log Message: Directory /cvs/extras/rpms/scim-bridge/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 06:44:40 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:44:40 -0700 Subject: rpms/scim-bridge Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300644.k4U6ihcJ027317@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27289 Added Files: Makefile import.log Log Message: Setup of module scim-bridge --- NEW FILE Makefile --- # Top level Makefile for module scim-bridge all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 06:44:41 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:44:41 -0700 Subject: rpms/scim-bridge/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300644.k4U6ihSg027320@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27289/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scim-bridge --- NEW 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 May 30 06:45:21 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:45:21 -0700 Subject: rpms/scim-bridge import.log,1.1,1.2 Message-ID: <200605300645.k4U6jNFY027395@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361 Modified Files: import.log Log Message: auto-import scim-bridge-0.1.12-1 on branch devel from scim-bridge-0.1.12-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scim-bridge/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 06:44:40 -0000 1.1 +++ import.log 30 May 2006 06:45:21 -0000 1.2 @@ -0,0 +1 @@ +scim-bridge-0_1_12-1:HEAD:scim-bridge-0.1.12-1.src.rpm:1148971513 From fedora-extras-commits at redhat.com Tue May 30 06:45:21 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 29 May 2006 23:45:21 -0700 Subject: rpms/scim-bridge/devel scim-bridge.spec, NONE, 1.1 xinput-scim-bridge, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300645.k4U6jNok027400@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-bridge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361/devel Modified Files: .cvsignore sources Added Files: scim-bridge.spec xinput-scim-bridge Log Message: auto-import scim-bridge-0.1.12-1 on branch devel from scim-bridge-0.1.12-1.src.rpm --- NEW FILE scim-bridge.spec --- %define with_libstdc_preview 0 Name: scim-bridge Version: 0.1.12 Release: 1%{?dist} Summary: SCIM Bridge Group: System Environment/Libraries License: LGPL URL: http://shibatama.tea-nifty.com/blog/2006/02/scimbridge_has__e4eb.html Source0: http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz Source1: xinput-scim-bridge BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif Requires: scim, scim-bridge-gtkimm = %{version}-%{release} %description SCIM Bridge is a C implementation of a Gtk IM module for SCIM. %package gtkimm Summary: SCIM Bridge Gtk IM module Group: System Environment/Libraries # for update-gtk-immodules PreReq: gtk2 > 2.8 %if %{with_libstdc_preview} PreReq: libstdc++so7 %endif %description gtkimm This package provides the SCIM Bridge GTK input method module. %prep %setup -q %build %if %{with_libstdc_preview} export CXX=%{_bindir}/g++-libstdc++-so_7 %endif %configure --disable-static %if %{with_libstdc_preview} # tweak libtool for libstdc++-so7 sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool %endif make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %if %{with_libstdc_preview} export CXX=%{_bindir}/g++-libstdc++-so_7 %endif make install DESTDIR=$RPM_BUILD_ROOT mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim-bridge rm $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/immodules/im-scim-bridge.*a %clean rm -rf $RPM_BUILD_ROOT %post gtkimm %{_bindir}/update-gtk-immodules %{_target_platform} %postun gtkimm %{_bindir}/update-gtk-immodules %{_target_platform} %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/scim-bridge-agent %{_sysconfdir}/X11/xinit/xinput.d/scim-bridge %files gtkimm %defattr(-,root,root,-) %dir %{_libdir}/gtk-2.0/immodules %{_libdir}/gtk-2.0/immodules/im-scim-bridge.so %changelog * Tue May 30 2006 Jens Petersen - 0.1.12-1 - update to 0.1.12 * Tue May 16 2006 Jens Petersen - 0.1.8-1 - update to 0.1.8 * Thu May 11 2006 Jens Petersen - 0.1.7-1 - update to 0.1.7 release * Sat Apr 29 2006 Jens Petersen - package for Fedora Extras * Wed Mar 15 2006 Jens Petersen - cvs snapshot --- NEW FILE xinput-scim-bridge --- GTK_IM_MODULE=scim-bridge Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-bridge/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 06:44:41 -0000 1.1 +++ .cvsignore 30 May 2006 06:45:21 -0000 1.2 @@ -0,0 +1 @@ +scim-bridge-0.1.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-bridge/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 06:44:41 -0000 1.1 +++ sources 30 May 2006 06:45:21 -0000 1.2 @@ -0,0 +1 @@ +3439bdf3695fcfe53e6cce234dc985bf scim-bridge-0.1.12.tar.gz From fedora-extras-commits at redhat.com Tue May 30 07:27:36 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:27:36 -0700 Subject: rpms/koffice/FC-4 .cvsignore, 1.7, 1.8 koffice.spec, 1.13, 1.14 sources, 1.7, 1.8 Message-ID: <200605300728.k4U7S8Hr030118@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/FC-4 Modified Files: .cvsignore koffice.spec sources Log Message: - fix #191388 - add kexi forms patch - version upgrade - exclude x-raw.desktop again Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Apr 2006 22:05:51 -0000 1.7 +++ .cvsignore 30 May 2006 07:27:36 -0000 1.8 @@ -1 +1 @@ -koffice-1.5.0.tar.bz2 +koffice-1.5.1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- koffice.spec 22 Apr 2006 07:41:24 -0000 1.13 +++ koffice.spec 30 May 2006 07:27:36 -0000 1.14 @@ -1,23 +1,22 @@ Name: koffice -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-1.5.1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kexi-version.patch +Patch1: koffice-forms-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) BuildRequires: automake BuildRequires: autoconf >= 2.53 -BuildRequires: xorg-x11-devel BuildRequires: kdebase-devel BuildRequires: kdelibs-devel BuildRequires: freetype-devel @@ -56,6 +55,7 @@ BuildRequires: libxslt-devel BuildRequires: OpenEXR-devel BuildRequires: libexif-devel +BuildRequires: xorg-x11-devel BuildRequires: readline-devel BuildRequires: ruby ruby-devel @@ -226,8 +226,9 @@ %prep %setup -q %patch0 -p1 +cd kexi %patch1 - +cd .. # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -478,6 +479,8 @@ %{_libdir}/libkformulalib.so.* %{_libdir}/libkopalette.so.* %{_libdir}/libkoproperty.so.* +%{_libdir}/libkrossapi.so.* +%{_libdir}/libkrossmain.so.* %{_libdir}/kde3/kfile_koffice.* %{_libdir}/kde3/kfile_ooo.* %{_libdir}/kde3/kfile_abiword.* @@ -526,6 +529,7 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* +%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -703,7 +707,6 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* -%{_libdir}/kde3/kritaperftest.* %{_libdir}/kde3/krosskritacore.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop @@ -768,8 +771,6 @@ %{_libdir}/kde3/kexihandler_csv_importexport.* %{_libdir}/kde3/krosskexiapp.* %{_libdir}/kde3/krosskexidb.* -%{_libdir}/libkrossapi.so.* -%{_libdir}/libkrossmain.so.* %{_datadir}/config/kexirc %{_datadir}/config/magic/kexi.magic %{_datadir}/mimelnk/application/* @@ -910,6 +911,13 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Sun May 21 2006 Andreas Bierfert +1.5.1-1 +- fix #191388 +- add kexi forms patch +- version upgrade +- exclude x-raw.desktop again + * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 - split out kexi-drivers (#188746) and fix some related issues Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Apr 2006 22:05:51 -0000 1.7 +++ sources 30 May 2006 07:27:36 -0000 1.8 @@ -1 +1 @@ -220b6bde28b5ebd5c6621bc87ca2c05f koffice-1.5.0.tar.bz2 +50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 07:27:37 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:27:37 -0700 Subject: rpms/koffice/FC-5 koffice-forms-plugins.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 koffice.spec, 1.36, 1.37 sources, 1.10, 1.11 koffice-filters-krita-tiff.patch, 1.1, NONE koffice-kexi-version.patch, 1.1, NONE Message-ID: <200605300728.k4U7S97N030123@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/FC-5 Modified Files: .cvsignore koffice.spec sources Added Files: koffice-forms-plugins.patch Removed Files: koffice-filters-krita-tiff.patch koffice-kexi-version.patch Log Message: - fix #191388 - add kexi forms patch - version upgrade - exclude x-raw.desktop again koffice-forms-plugins.patch: --- NEW FILE koffice-forms-plugins.patch --- Index: plugins/forms/Makefile.am =================================================================== --- plugins/forms/Makefile.am (wersja 541836) +++ plugins/forms/Makefile.am (kopia robocza) @@ -23,9 +23,10 @@ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp -libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner Index: plugins/reports/Makefile.am =================================================================== --- plugins/reports/Makefile.am (wersja 541836) +++ plugins/reports/Makefile.am (kopia robocza) @@ -5,24 +5,29 @@ kexihandler_report_la_SOURCES = kexireports.cpp kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined kexihandler_report_la_LIBADD = ../../core/libkexicore.la \ - ../../widget/utils/libkexiguiutils.la \ - ../../widget/libkexiextendedwidgets.la \ - ../../formeditor/libkformdesigner.la \ - ../forms/libkexiformutils.la \ + $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ ./libkexireportutils.la kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ ./libkexireportutils.la lib_LTLIBRARIES = libkexireportutils.la libkexireportutils_la_SOURCES = \ kexireportpart.cpp kexireportview.cpp kexireportform.cpp -libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 16 Apr 2006 22:05:51 -0000 1.10 +++ .cvsignore 30 May 2006 07:27:37 -0000 1.11 @@ -1 +1 @@ -koffice-1.5.0.tar.bz2 +koffice-1.5.1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- koffice.spec 22 Apr 2006 07:41:24 -0000 1.36 +++ koffice.spec 30 May 2006 07:27:37 -0000 1.37 @@ -1,17 +1,17 @@ Name: koffice -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-1.5.1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kexi-version.patch +Patch1: koffice-forms-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -227,8 +227,9 @@ %prep %setup -q %patch0 -p1 +cd kexi %patch1 - +cd .. # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -479,6 +480,8 @@ %{_libdir}/libkformulalib.so.* %{_libdir}/libkopalette.so.* %{_libdir}/libkoproperty.so.* +%{_libdir}/libkrossapi.so.* +%{_libdir}/libkrossmain.so.* %{_libdir}/kde3/kfile_koffice.* %{_libdir}/kde3/kfile_ooo.* %{_libdir}/kde3/kfile_abiword.* @@ -527,6 +530,7 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* +%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -704,7 +708,6 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* -%{_libdir}/kde3/kritaperftest.* %{_libdir}/kde3/krosskritacore.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop @@ -769,8 +772,6 @@ %{_libdir}/kde3/kexihandler_csv_importexport.* %{_libdir}/kde3/krosskexiapp.* %{_libdir}/kde3/krosskexidb.* -%{_libdir}/libkrossapi.so.* -%{_libdir}/libkrossmain.so.* %{_datadir}/config/kexirc %{_datadir}/config/magic/kexi.magic %{_datadir}/mimelnk/application/* @@ -911,6 +912,13 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Sun May 21 2006 Andreas Bierfert +1.5.1-1 +- fix #191388 +- add kexi forms patch +- version upgrade +- exclude x-raw.desktop again + * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 - split out kexi-drivers (#188746) and fix some related issues Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Apr 2006 22:05:51 -0000 1.10 +++ sources 30 May 2006 07:27:37 -0000 1.11 @@ -1 +1 @@ -220b6bde28b5ebd5c6621bc87ca2c05f koffice-1.5.0.tar.bz2 +50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 --- koffice-filters-krita-tiff.patch DELETED --- --- koffice-kexi-version.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 07:27:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:27:38 -0700 Subject: rpms/koffice/devel koffice-forms-plugins.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 koffice.spec, 1.35, 1.36 sources, 1.10, 1.11 koffice-kexi-version.patch, 1.1, NONE Message-ID: <200605300728.k4U7SAic030128@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/devel Modified Files: .cvsignore koffice.spec sources Added Files: koffice-forms-plugins.patch Removed Files: koffice-kexi-version.patch Log Message: - fix #191388 - add kexi forms patch - version upgrade - exclude x-raw.desktop again koffice-forms-plugins.patch: --- NEW FILE koffice-forms-plugins.patch --- Index: plugins/forms/Makefile.am =================================================================== --- plugins/forms/Makefile.am (wersja 541836) +++ plugins/forms/Makefile.am (kopia robocza) @@ -23,9 +23,10 @@ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp -libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner Index: plugins/reports/Makefile.am =================================================================== --- plugins/reports/Makefile.am (wersja 541836) +++ plugins/reports/Makefile.am (kopia robocza) @@ -5,24 +5,29 @@ kexihandler_report_la_SOURCES = kexireports.cpp kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined kexihandler_report_la_LIBADD = ../../core/libkexicore.la \ - ../../widget/utils/libkexiguiutils.la \ - ../../widget/libkexiextendedwidgets.la \ - ../../formeditor/libkformdesigner.la \ - ../forms/libkexiformutils.la \ + $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ ./libkexireportutils.la kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ ./libkexireportutils.la lib_LTLIBRARIES = libkexireportutils.la libkexireportutils_la_SOURCES = \ kexireportpart.cpp kexireportview.cpp kexireportform.cpp -libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 16 Apr 2006 22:05:52 -0000 1.10 +++ .cvsignore 30 May 2006 07:27:38 -0000 1.11 @@ -1 +1 @@ -koffice-1.5.0.tar.bz2 +koffice-1.5.1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- koffice.spec 22 Apr 2006 07:41:25 -0000 1.35 +++ koffice.spec 30 May 2006 07:27:38 -0000 1.36 @@ -1,17 +1,17 @@ Name: koffice -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-1.5.1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kexi-version.patch +Patch1: koffice-forms-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -227,8 +227,9 @@ %prep %setup -q %patch0 -p1 +cd kexi %patch1 - +cd .. # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -479,6 +480,8 @@ %{_libdir}/libkformulalib.so.* %{_libdir}/libkopalette.so.* %{_libdir}/libkoproperty.so.* +%{_libdir}/libkrossapi.so.* +%{_libdir}/libkrossmain.so.* %{_libdir}/kde3/kfile_koffice.* %{_libdir}/kde3/kfile_ooo.* %{_libdir}/kde3/kfile_abiword.* @@ -527,6 +530,7 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* +%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -704,7 +708,6 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* -%{_libdir}/kde3/kritaperftest.* %{_libdir}/kde3/krosskritacore.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop @@ -769,8 +772,6 @@ %{_libdir}/kde3/kexihandler_csv_importexport.* %{_libdir}/kde3/krosskexiapp.* %{_libdir}/kde3/krosskexidb.* -%{_libdir}/libkrossapi.so.* -%{_libdir}/libkrossmain.so.* %{_datadir}/config/kexirc %{_datadir}/config/magic/kexi.magic %{_datadir}/mimelnk/application/* @@ -911,6 +912,13 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Sun May 21 2006 Andreas Bierfert +1.5.1-1 +- fix #191388 +- add kexi forms patch +- version upgrade +- exclude x-raw.desktop again + * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 - split out kexi-drivers (#188746) and fix some related issues Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Apr 2006 22:05:52 -0000 1.10 +++ sources 30 May 2006 07:27:38 -0000 1.11 @@ -1 +1 @@ -220b6bde28b5ebd5c6621bc87ca2c05f koffice-1.5.0.tar.bz2 +50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 --- koffice-kexi-version.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 07:43:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:43:53 -0700 Subject: rpms/scribus/devel .cvsignore, 1.9, 1.10 scribus.spec, 1.19, 1.20 sources, 1.9, 1.10 Message-ID: <200605300743.k4U7htPu030193@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30172 Modified Files: .cvsignore scribus.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Apr 2006 09:30:51 -0000 1.9 +++ .cvsignore 30 May 2006 07:43:53 -0000 1.10 @@ -1 +1 @@ -scribus-1.3.3.1.tar.bz2 +scribus-1.3.3.2.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- scribus.spec 22 Apr 2006 09:30:51 -0000 1.19 +++ scribus.spec 30 May 2006 07:43:53 -0000 1.20 @@ -1,5 +1,5 @@ Name: scribus -Version: 1.3.3.1 +Version: 1.3.3.2 Release: 1%{?dist} Summary: DeskTop Publishing application written in Qt @@ -7,7 +7,7 @@ Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://dl.sf.net/scribus/scribus-1.3.3.1.tar.bz2 +Source0: http://dl.sf.net/scribus/scribus-1.3.3.2.tar.bz2 Source1: scribus.xml Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -137,6 +137,10 @@ %changelog +* Tue May 30 2006 Andreas Bierfert +1.3.3.2-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 1.3.3.1-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Apr 2006 09:30:51 -0000 1.9 +++ sources 30 May 2006 07:43:53 -0000 1.10 @@ -1 +1 @@ -73864eea86de686904f4741ef35152ca scribus-1.3.3.1.tar.bz2 +fa5d0dbb675b41f3d56823943b06c84c scribus-1.3.3.2.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 07:44:31 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:44:31 -0700 Subject: rpms/koffice/FC-4 koffice-kexi-checkbox-data-saving.patch, NONE, 1.1 koffice.spec, 1.14, 1.15 Message-ID: <200605300744.k4U7iXP5030289@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30239/FC-4 Modified Files: koffice.spec Added Files: koffice-kexi-checkbox-data-saving.patch Log Message: - add kexi checkbox patch koffice-kexi-checkbox-data-saving.patch: --- NEW FILE koffice-kexi-checkbox-data-saving.patch --- Index: kexi/plugins/forms/kexidataprovider.cpp =================================================================== --- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) +++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) @@ -92,7 +92,8 @@ for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); it!=m_fieldNumbersForDataItems.constEnd(); ++it) { - kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; + kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() + << " data=" << row.at(it.data()) << endl; it.key()->setValue( row.at(it.data()) ); } } Index: kexi/plugins/forms/widgets/kexidbautofield.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) @@ -446,8 +446,11 @@ @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] (see doc/dev/settings.txt) */ if (!text.isEmpty()) { - realText = text[0].upper(); - realText += (text.mid(1) + ": "); + realText = text[0].upper() + text.mid(1); + if (m_widgetType!=Boolean) { +//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label + realText += ": "; + } } } else Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) @@ -27,7 +27,9 @@ : QCheckBox(text, parent, name), KexiFormDataItemInterface() { m_invalidState = false; +//! todo: tristate setTristate(true); + setFocusPolicy(QWidget::StrongFocus); connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); } @@ -56,13 +58,16 @@ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) { - setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); +// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); + setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); } QVariant KexiDBCheckBox::value() { - return QVariant( isChecked(), 3 ); + if (state()==NoChange) + return QVariant(); + return QVariant(state()==On, 1); } void KexiDBCheckBox::slotStateChanged(int ) Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- koffice.spec 30 May 2006 07:27:36 -0000 1.14 +++ koffice.spec 30 May 2006 07:44:31 -0000 1.15 @@ -12,6 +12,7 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch Patch1: koffice-forms-plugins.patch +Patch2: koffice-kexi-checkbox-data-saving.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -229,6 +230,8 @@ cd kexi %patch1 cd .. +%patch2 + # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -915,6 +918,7 @@ 1.5.1-1 - fix #191388 - add kexi forms patch +- add kexi checkbox patch - version upgrade - exclude x-raw.desktop again From fedora-extras-commits at redhat.com Tue May 30 07:44:31 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:44:31 -0700 Subject: rpms/koffice/FC-5 koffice-kexi-checkbox-data-saving.patch, NONE, 1.1 koffice.spec, 1.37, 1.38 Message-ID: <200605300744.k4U7iXvX030295@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30239/FC-5 Modified Files: koffice.spec Added Files: koffice-kexi-checkbox-data-saving.patch Log Message: - add kexi checkbox patch koffice-kexi-checkbox-data-saving.patch: --- NEW FILE koffice-kexi-checkbox-data-saving.patch --- Index: kexi/plugins/forms/kexidataprovider.cpp =================================================================== --- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) +++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) @@ -92,7 +92,8 @@ for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); it!=m_fieldNumbersForDataItems.constEnd(); ++it) { - kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; + kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() + << " data=" << row.at(it.data()) << endl; it.key()->setValue( row.at(it.data()) ); } } Index: kexi/plugins/forms/widgets/kexidbautofield.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) @@ -446,8 +446,11 @@ @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] (see doc/dev/settings.txt) */ if (!text.isEmpty()) { - realText = text[0].upper(); - realText += (text.mid(1) + ": "); + realText = text[0].upper() + text.mid(1); + if (m_widgetType!=Boolean) { +//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label + realText += ": "; + } } } else Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) @@ -27,7 +27,9 @@ : QCheckBox(text, parent, name), KexiFormDataItemInterface() { m_invalidState = false; +//! todo: tristate setTristate(true); + setFocusPolicy(QWidget::StrongFocus); connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); } @@ -56,13 +58,16 @@ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) { - setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); +// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); + setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); } QVariant KexiDBCheckBox::value() { - return QVariant( isChecked(), 3 ); + if (state()==NoChange) + return QVariant(); + return QVariant(state()==On, 1); } void KexiDBCheckBox::slotStateChanged(int ) Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- koffice.spec 30 May 2006 07:27:37 -0000 1.37 +++ koffice.spec 30 May 2006 07:44:31 -0000 1.38 @@ -12,6 +12,7 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch Patch1: koffice-forms-plugins.patch +Patch2: koffice-kexi-checkbox-data-saving.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -230,6 +231,8 @@ cd kexi %patch1 cd .. +%patch2 + # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -916,6 +919,7 @@ 1.5.1-1 - fix #191388 - add kexi forms patch +- add kexi checkbox patch - version upgrade - exclude x-raw.desktop again From fedora-extras-commits at redhat.com Tue May 30 07:44:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 00:44:32 -0700 Subject: rpms/koffice/devel koffice-kexi-checkbox-data-saving.patch, NONE, 1.1 koffice.spec, 1.36, 1.37 Message-ID: <200605300744.k4U7iYs8030299@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30239/devel Modified Files: koffice.spec Added Files: koffice-kexi-checkbox-data-saving.patch Log Message: - add kexi checkbox patch koffice-kexi-checkbox-data-saving.patch: --- NEW FILE koffice-kexi-checkbox-data-saving.patch --- Index: kexi/plugins/forms/kexidataprovider.cpp =================================================================== --- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) +++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) @@ -92,7 +92,8 @@ for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); it!=m_fieldNumbersForDataItems.constEnd(); ++it) { - kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; + kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() + << " data=" << row.at(it.data()) << endl; it.key()->setValue( row.at(it.data()) ); } } Index: kexi/plugins/forms/widgets/kexidbautofield.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) @@ -446,8 +446,11 @@ @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] (see doc/dev/settings.txt) */ if (!text.isEmpty()) { - realText = text[0].upper(); - realText += (text.mid(1) + ": "); + realText = text[0].upper() + text.mid(1); + if (m_widgetType!=Boolean) { +//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label + realText += ": "; + } } } else Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp =================================================================== --- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) +++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) @@ -27,7 +27,9 @@ : QCheckBox(text, parent, name), KexiFormDataItemInterface() { m_invalidState = false; +//! todo: tristate setTristate(true); + setFocusPolicy(QWidget::StrongFocus); connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); } @@ -56,13 +58,16 @@ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) { - setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); +// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); + setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); } QVariant KexiDBCheckBox::value() { - return QVariant( isChecked(), 3 ); + if (state()==NoChange) + return QVariant(); + return QVariant(state()==On, 1); } void KexiDBCheckBox::slotStateChanged(int ) Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- koffice.spec 30 May 2006 07:27:38 -0000 1.36 +++ koffice.spec 30 May 2006 07:44:32 -0000 1.37 @@ -12,6 +12,7 @@ # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch Patch1: koffice-forms-plugins.patch +Patch2: koffice-kexi-checkbox-data-saving.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -230,6 +231,8 @@ cd kexi %patch1 cd .. +%patch2 + # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -916,6 +919,7 @@ 1.5.1-1 - fix #191388 - add kexi forms patch +- add kexi checkbox patch - version upgrade - exclude x-raw.desktop again From fedora-extras-commits at redhat.com Tue May 30 07:57:20 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 30 May 2006 00:57:20 -0700 Subject: owners owners.list,1.1073,1.1074 Message-ID: <200605300757.k4U7vMWR030457@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30433 Modified Files: owners.list Log Message: add scim-bridge. tweak gtk2hs description. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1073 retrieving revision 1.1074 diff -u -r1.1073 -r1.1074 --- owners.list 29 May 2006 18:20:48 -0000 1.1073 +++ owners.list 30 May 2006 07:57:20 -0000 1.1074 @@ -463,7 +463,7 @@ Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| -Fedora Extras|gtk2hs|A Haskell binding of the Gtk+ toolkit|petersen at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|gtk2hs|A Haskell binding of Gtk+|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| @@ -1493,6 +1493,7 @@ Fedora Extras|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|scim-bridge|SCIM Bridge Gtk IM module|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|qshen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 30 08:08:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:08:39 -0700 Subject: rpms/koffice/FC-4 koffice-forms-plugins.patch,NONE,1.1 Message-ID: <200605300808.k4U88fUR000490@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv467 Added Files: koffice-forms-plugins.patch Log Message: - forgot forms patch koffice-forms-plugins.patch: --- NEW FILE koffice-forms-plugins.patch --- Index: plugins/forms/Makefile.am =================================================================== --- plugins/forms/Makefile.am (wersja 541836) +++ plugins/forms/Makefile.am (kopia robocza) @@ -23,9 +23,10 @@ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp -libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner Index: plugins/reports/Makefile.am =================================================================== --- plugins/reports/Makefile.am (wersja 541836) +++ plugins/reports/Makefile.am (kopia robocza) @@ -5,24 +5,29 @@ kexihandler_report_la_SOURCES = kexireports.cpp kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined kexihandler_report_la_LIBADD = ../../core/libkexicore.la \ - ../../widget/utils/libkexiguiutils.la \ - ../../widget/libkexiextendedwidgets.la \ - ../../formeditor/libkformdesigner.la \ - ../forms/libkexiformutils.la \ + $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ ./libkexireportutils.la kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ + $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ ./libkexireportutils.la lib_LTLIBRARIES = libkexireportutils.la libkexireportutils_la_SOURCES = \ kexireportpart.cpp kexireportview.cpp kexireportform.cpp -libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved +libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ + $(top_builddir)/kexi/formeditor/libkformdesigner.la \ + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la + $(top_builddir)/kexi/plugins/forms/libkexiformutils.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop From fedora-extras-commits at redhat.com Tue May 30 08:18:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:18:38 -0700 Subject: rpms/libpqxx/devel .cvsignore, 1.3, 1.4 libpqxx.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605300818.k4U8IeIu000774@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv718/devel Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 +++ .cvsignore 30 May 2006 08:18:38 -0000 1.4 @@ -1 +1 @@ -libpqxx-2.5.5.tar.gz +libpqxx-2.6.6.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libpqxx.spec 16 Feb 2006 22:49:57 -0000 1.6 +++ libpqxx.spec 30 May 2006 08:18:38 -0000 1.7 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.5 -Release: 7%{?dist} +Version: 2.6.6 +Release: 1%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD -URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz +URL: http://pqxx.org +Source0: http://thaiopensource.org/download/software/libpqxx/libpqxx-2.6.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -57,7 +57,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.5.so +%{_libdir}/libpqxx-2.6.6.so %files devel %doc README-UPGRADE @@ -67,6 +67,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Mon May 29 2006 Andreas Bierfert 2.6.6-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 2.5.5-7 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2005 20:54:43 -0000 1.3 +++ sources 30 May 2006 08:18:38 -0000 1.4 @@ -1 +1 @@ -db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz +65f6fd330b9f673eaac4408eb6ea58fa libpqxx-2.6.6.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:18:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:18:32 -0700 Subject: rpms/libpqxx/FC-4 .cvsignore, 1.3, 1.4 libpqxx.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605300819.k4U8J4GH000781@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv718/FC-4 Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 +++ .cvsignore 30 May 2006 08:18:31 -0000 1.4 @@ -1 +1 @@ -libpqxx-2.5.5.tar.gz +libpqxx-2.6.6.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libpqxx.spec 28 Sep 2005 14:51:25 -0000 1.4 +++ libpqxx.spec 30 May 2006 08:18:31 -0000 1.5 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.5 -Release: 5%{?dist} +Version: 2.6.6 +Release: 1%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz +Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.6.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -57,7 +57,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.5.so +%{_libdir}/libpqxx-2.6.6.so %files devel %doc README-UPGRADE @@ -67,6 +67,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue May 30 2006 Andreas Bierfert 2.6.6-1 +- version upgrade + * Wed Sep 28 2005 Andreas Bierfert 2.5.5-5 - fix #169441 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2005 20:54:43 -0000 1.3 +++ sources 30 May 2006 08:18:31 -0000 1.4 @@ -1 +1 @@ -db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz +65f6fd330b9f673eaac4408eb6ea58fa libpqxx-2.6.6.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:18:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:18:32 -0700 Subject: rpms/libpqxx/FC-5 .cvsignore, 1.3, 1.4 libpqxx.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200605300819.k4U8J4lt000786@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv718/FC-5 Modified Files: .cvsignore libpqxx.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Sep 2005 20:54:43 -0000 1.3 +++ .cvsignore 30 May 2006 08:18:32 -0000 1.4 @@ -1 +1 @@ -libpqxx-2.5.5.tar.gz +libpqxx-2.6.6.tar.gz Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-5/libpqxx.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libpqxx.spec 16 Feb 2006 22:49:57 -0000 1.6 +++ libpqxx.spec 30 May 2006 08:18:32 -0000 1.7 @@ -1,12 +1,12 @@ Name: libpqxx -Version: 2.5.5 -Release: 7%{?dist} +Version: 2.6.6 +Release: 1%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries License: BSD -URL: http://gborg.postgresql.org/project/libpqxx/projdisplay.php -Source0: ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-2.5.5.tar.gz +URL: http://pqxx.org +Source0: http://thaiopensource.org/download/software/libpqxx/libpqxx-2.6.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel @@ -57,7 +57,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION -%{_libdir}/libpqxx-2.5.5.so +%{_libdir}/libpqxx-2.6.6.so %files devel %doc README-UPGRADE @@ -67,6 +67,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Mon May 29 2006 Andreas Bierfert 2.6.6-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 2.5.5-7 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Sep 2005 20:54:43 -0000 1.3 +++ sources 30 May 2006 08:18:32 -0000 1.4 @@ -1 +1 @@ -db71975570ee31ecd0a11380dbaa8634 libpqxx-2.5.5.tar.gz +65f6fd330b9f673eaac4408eb6ea58fa libpqxx-2.6.6.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:23:49 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:23:49 -0700 Subject: rpms/python-ogg - New directory Message-ID: <200605300823.k4U8Np6H000908@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv882/python-ogg Log Message: Directory /cvs/extras/rpms/python-ogg added to the repository From fedora-extras-commits at redhat.com Tue May 30 08:23:50 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:23:50 -0700 Subject: rpms/python-ogg/devel - New directory Message-ID: <200605300823.k4U8NqWd000911@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv882/python-ogg/devel Log Message: Directory /cvs/extras/rpms/python-ogg/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 08:24:12 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:24:12 -0700 Subject: rpms/python-ogg Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300824.k4U8OEJV000955@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv927 Added Files: Makefile import.log Log Message: Setup of module python-ogg --- NEW FILE Makefile --- # Top level Makefile for module python-ogg all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 08:24:12 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:24:12 -0700 Subject: rpms/python-ogg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300824.k4U8OEMj000958@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv927/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-ogg --- NEW 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 May 30 08:25:08 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:25:08 -0700 Subject: rpms/python-ogg import.log,1.1,1.2 Message-ID: <200605300825.k4U8PAua001025@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv992 Modified Files: import.log Log Message: auto-import python-ogg-1.3-2 on branch devel from python-ogg-1.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-ogg/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 08:24:12 -0000 1.1 +++ import.log 30 May 2006 08:25:08 -0000 1.2 @@ -0,0 +1 @@ +python-ogg-1_3-2:HEAD:python-ogg-1.3-2.src.rpm:1148977948 From fedora-extras-commits at redhat.com Tue May 30 08:25:09 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:25:09 -0700 Subject: rpms/python-ogg/devel python-ogg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300825.k4U8PB0C001030@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-ogg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv992/devel Modified Files: .cvsignore sources Added Files: python-ogg.spec Log Message: auto-import python-ogg-1.3-2 on branch devel from python-ogg-1.3-2.src.rpm --- NEW FILE python-ogg.spec --- # Some informations on this spec were based on dries' work available in URL # http://dries.ulyssis.org/rpm/packages/python-ogg/info.html %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_incdir: %define python_incdir %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")} Name: python-ogg Version: 1.3 Release: 2%{?dist} Summary: A Python wrapper for the Ogg libraries Group: Development/Languages License: LGPL URL: http://www.andrewchatham.com/pyogg/ Source0: http://www.andrewchatham.com/pyogg/download/pyogg-1.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, libogg-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description An object-oriented Python binding for the Ogg libraries. Ogg is a multimedia bitstream format. With this you can write your own python applications to play and encode audio files in Ogg format. %package devel Summary: Development files for the Ogg Python Wrapper Group: Development/Libraries Requires: %{name} = %{version}-%{release}, libogg-devel %description devel This package contains headers and libraries required to build applications that use the python-ogg, a python wrapper for the Ogg libraries. %prep %setup -q -n pyogg-%{version} %build %{__python} config_unix.py 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 AUTHORS ChangeLog COPYING NEWS README # Include files and dirs below %{python_sitelib} (for noarch packages) and # %{python_sitearch} (for arch-dependent packages) as appropriate, and mark # *.pyo as %ghost (do not include in package). %ghost %{python_sitearch}/ogg/*.pyo %{python_sitearch}/ogg/*.pyc %{python_sitearch}/ogg/*.py %{python_sitearch}/ogg/_ogg.so %files devel %defattr(-,root,root,-) %{python_incdir}/pyogg/pyogg.h %changelog * Thu May 25 2006 Hugo Cisneiros 1.3-2 - Forked the package with a -devel one including the header. * Fri May 19 2006 Hugo Cisneiros 1.3-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-ogg/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 08:24:12 -0000 1.1 +++ .cvsignore 30 May 2006 08:25:09 -0000 1.2 @@ -0,0 +1 @@ +pyogg-1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-ogg/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 08:24:12 -0000 1.1 +++ sources 30 May 2006 08:25:09 -0000 1.2 @@ -0,0 +1 @@ +45a4ecc4d0600661199e4040a81ea3fe pyogg-1.3.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:26:52 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:26:52 -0700 Subject: rpms/python-vorbis - New directory Message-ID: <200605300826.k4U8Qsbl001171@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1145/python-vorbis Log Message: Directory /cvs/extras/rpms/python-vorbis added to the repository From fedora-extras-commits at redhat.com Tue May 30 08:26:52 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:26:52 -0700 Subject: rpms/python-vorbis/devel - New directory Message-ID: <200605300826.k4U8QssE001174@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1145/python-vorbis/devel Log Message: Directory /cvs/extras/rpms/python-vorbis/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 08:27:17 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:27:17 -0700 Subject: rpms/python-vorbis Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300827.k4U8RJ8c001249@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1194 Added Files: Makefile import.log Log Message: Setup of module python-vorbis --- NEW FILE Makefile --- # Top level Makefile for module python-vorbis all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 08:27:17 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:27:17 -0700 Subject: rpms/python-vorbis/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300827.k4U8RJZo001254@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1194/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-vorbis --- NEW 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 May 30 08:28:11 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:28:11 -0700 Subject: rpms/python-vorbis import.log,1.1,1.2 Message-ID: <200605300828.k4U8SDOr001327@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1294 Modified Files: import.log Log Message: auto-import python-vorbis-1.3-2 on branch devel from python-vorbis-1.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-vorbis/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 08:27:16 -0000 1.1 +++ import.log 30 May 2006 08:28:11 -0000 1.2 @@ -0,0 +1 @@ +python-vorbis-1_3-2:HEAD:python-vorbis-1.3-2.src.rpm:1148978131 From fedora-extras-commits at redhat.com Tue May 30 08:28:12 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:28:12 -0700 Subject: rpms/python-vorbis/devel python-vorbis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300828.k4U8SEaX001332@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/python-vorbis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1294/devel Modified Files: .cvsignore sources Added Files: python-vorbis.spec Log Message: auto-import python-vorbis-1.3-2 on branch devel from python-vorbis-1.3-2.src.rpm --- NEW FILE python-vorbis.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-vorbis Version: 1.3 Release: 2%{?dist} Summary: A Python wrapper for the Ogg Vorbis audio libraries Group: Development/Languages License: LGPL URL: http://www.andrewchatham.com/pyogg/ Source0: http://www.andrewchatham.com/pyogg/download/pyvorbis-1.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-ogg-devel, libvorbis-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description An object-oriented Python binding for the Ogg Vorbis libraries. Ogg is a multimedia bitstream format. With this you can write your own python applications to play and encode audio files in Ogg Vorbis format. %prep %setup -q -n pyvorbis-%{version} %build %{__python} config_unix.py 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 AUTHORS ChangeLog COPYING NEWS README # Include files and dirs below %{python_sitelib} (for noarch packages) and # %{python_sitearch} (for arch-dependent packages) as appropriate, and mark # *.pyo as %ghost (do not include in package). %{python_sitearch}/ogg/vorbis.so %changelog * Thu May 25 2006 Hugo Cisneiros 1.3-2 - Improvements in BuildRequires dependencies (point to python-ogg-devel) * Fri May 19 2006 Hugo Cisneiros 1.3-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-vorbis/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 08:27:17 -0000 1.1 +++ .cvsignore 30 May 2006 08:28:11 -0000 1.2 @@ -0,0 +1 @@ +pyvorbis-1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-vorbis/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 08:27:17 -0000 1.1 +++ sources 30 May 2006 08:28:11 -0000 1.2 @@ -0,0 +1 @@ +3ddd0dc996b57827c324910cc899d40b pyvorbis-1.3.tar.gz From fedora-extras-commits at redhat.com Tue May 30 08:37:12 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 01:37:12 -0700 Subject: owners owners.list,1.1074,1.1075 Message-ID: <200605300837.k4U8bEu5001462@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1441 Modified Files: owners.list Log Message: added python-ogg and python-vorbis packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1074 retrieving revision 1.1075 diff -u -r1.1074 -r1.1075 --- owners.list 30 May 2006 07:57:20 -0000 1.1074 +++ owners.list 30 May 2006 08:37:12 -0000 1.1075 @@ -1395,6 +1395,7 @@ Fedora Extras|python-nose|A discovery-based unittest extension for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-numarray|Python array manipulation and computational library|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|python-ogg|A Python wrapper for the Ogg libraries|hugo at devin.com.br|extras-qa at fedoraproject.org| Fedora Extras|python-paramiko|A SSH2 protocol library for python|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-protocols|PyProtocols 'adapt()' implementation|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-psyco|Python specializing compiler|shahms at shahms.com|extras-qa at fedoraproject.org| @@ -1411,6 +1412,7 @@ Fedora Extras|python-TestGears|Unit testing for Python|ivazquez at ivazquez.net|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|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org| Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|PyX|Python graphics package|mpeters at mac.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 30 08:37:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:37:25 -0700 Subject: rpms/koffice-langpack/FC-4 .cvsignore, 1.4, 1.5 koffice-langpack.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200605300837.k4U8bRil001517@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice-langpack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1460/FC-4 Modified Files: .cvsignore koffice-langpack.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Apr 2006 01:24:55 -0000 1.4 +++ .cvsignore 30 May 2006 08:37:24 -0000 1.5 @@ -46,3 +46,51 @@ koffice-l10n-uk-1.5.0.tar.bz2 koffice-l10n-uz-1.5.0.tar.bz2 koffice-l10n-zh_CN-1.5.0.tar.bz2 +koffice-l10n-af-1.5.1.tar.bz2 +koffice-l10n-ar-1.5.1.tar.bz2 +koffice-l10n-bg-1.5.1.tar.bz2 +koffice-l10n-br-1.5.1.tar.bz2 +koffice-l10n-bs-1.5.1.tar.bz2 +koffice-l10n-ca-1.5.1.tar.bz2 +koffice-l10n-cs-1.5.1.tar.bz2 +koffice-l10n-cy-1.5.1.tar.bz2 +koffice-l10n-da-1.5.1.tar.bz2 +koffice-l10n-de-1.5.1.tar.bz2 +koffice-l10n-el-1.5.1.tar.bz2 +koffice-l10n-en_GB-1.5.1.tar.bz2 +koffice-l10n-eo-1.5.1.tar.bz2 +koffice-l10n-es-1.5.1.tar.bz2 +koffice-l10n-et-1.5.1.tar.bz2 +koffice-l10n-eu-1.5.1.tar.bz2 +koffice-l10n-fi-1.5.1.tar.bz2 +koffice-l10n-fr-1.5.1.tar.bz2 +koffice-l10n-ga-1.5.1.tar.bz2 +koffice-l10n-he-1.5.1.tar.bz2 +koffice-l10n-hi-1.5.1.tar.bz2 +koffice-l10n-hu-1.5.1.tar.bz2 +koffice-l10n-is-1.5.1.tar.bz2 +koffice-l10n-it-1.5.1.tar.bz2 +koffice-l10n-ja-1.5.1.tar.bz2 +koffice-l10n-lt-1.5.1.tar.bz2 +koffice-l10n-mk-1.5.1.tar.bz2 +koffice-l10n-ms-1.5.1.tar.bz2 +koffice-l10n-nb-1.5.1.tar.bz2 +koffice-l10n-nl-1.5.1.tar.bz2 +koffice-l10n-nn-1.5.1.tar.bz2 +koffice-l10n-pl-1.5.1.tar.bz2 +koffice-l10n-pt-1.5.1.tar.bz2 +koffice-l10n-pt_BR-1.5.1.tar.bz2 +koffice-l10n-ro-1.5.1.tar.bz2 +koffice-l10n-ru-1.5.1.tar.bz2 +koffice-l10n-se-1.5.1.tar.bz2 +koffice-l10n-sk-1.5.1.tar.bz2 +koffice-l10n-sl-1.5.1.tar.bz2 +koffice-l10n-sr-1.5.1.tar.bz2 +koffice-l10n-sr at Latn-1.5.1.tar.bz2 +koffice-l10n-sv-1.5.1.tar.bz2 +koffice-l10n-ta-1.5.1.tar.bz2 +koffice-l10n-tg-1.5.1.tar.bz2 +koffice-l10n-tr-1.5.1.tar.bz2 +koffice-l10n-uk-1.5.1.tar.bz2 +koffice-l10n-uz-1.5.1.tar.bz2 +koffice-l10n-zh_CN-1.5.1.tar.bz2 Index: koffice-langpack.spec =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/koffice-langpack.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- koffice-langpack.spec 22 Apr 2006 01:24:55 -0000 1.4 +++ koffice-langpack.spec 30 May 2006 08:37:24 -0000 1.5 @@ -1,58 +1,59 @@ Name: koffice-langpack -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Language files for koffice Group: Applications/Productivity License: GPL URL: http://www.koffice.org -Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2 -Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2 -Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2 -Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2 -Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2 -Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2 -Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2 -Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2 -Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2 -Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2 -Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2 -Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2 -Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2 -Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2 -Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2 -Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2 -Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2 -Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2 -Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2 -Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2 -Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2 -Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2 -Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2 -Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2 -Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2 -Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2 -Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2 -Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2 -Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2 -Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2 -Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2 -Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2 -Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2 -Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2 -Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2 -Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2 -Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2 -Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2 -Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2 -Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2 -Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2 -Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2 -Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2 -Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2 -Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2 -Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2 -Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2 +Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-af-1.5.1.tar.bz2 +Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ar-1.5.1.tar.bz2 +Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bg-1.5.1.tar.bz2 +Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-br-1.5.1.tar.bz2 +Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bs-1.5.1.tar.bz2 +Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ca-1.5.1.tar.bz2 +Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cs-1.5.1.tar.bz2 +Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cy-1.5.1.tar.bz2 +Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-da-1.5.1.tar.bz2 +Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-de-1.5.1.tar.bz2 +Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-el-1.5.1.tar.bz2 +Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-en_GB-1.5.1.tar.bz2 +Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eo-1.5.1.tar.bz2 +Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-es-1.5.1.tar.bz2 +Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-et-1.5.1.tar.bz2 +Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eu-1.5.1.tar.bz2 +Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fi-1.5.1.tar.bz2 +Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fr-1.5.1.tar.bz2 +Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ga-1.5.1.tar.bz2 +Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-he-1.5.1.tar.bz2 +Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hi-1.5.1.tar.bz2 +Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hu-1.5.1.tar.bz2 +Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-is-1.5.1.tar.bz2 +Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-it-1.5.1.tar.bz2 +Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ja-1.5.1.tar.bz2 +Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-lt-1.5.1.tar.bz2 +Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-mk-1.5.1.tar.bz2 +Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nb-1.5.1.tar.bz2 +Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nl-1.5.1.tar.bz2 +Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nn-1.5.1.tar.bz2 +Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pl-1.5.1.tar.bz2 +Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt-1.5.1.tar.bz2 +Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt_BR-1.5.1.tar.bz2 +Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ro-1.5.1.tar.bz2 +Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ru-1.5.1.tar.bz2 +Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-se-1.5.1.tar.bz2 +Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sk-1.5.1.tar.bz2 +Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sl-1.5.1.tar.bz2 +Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr-1.5.1.tar.bz2 +Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.1.tar.bz2 +Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sv-1.5.1.tar.bz2 +Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ta-1.5.1.tar.bz2 +Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tg-1.5.1.tar.bz2 +Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tr-1.5.1.tar.bz2 +Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uk-1.5.1.tar.bz2 +Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uz-1.5.1.tar.bz2 +Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-zh_CN-1.5.1.tar.bz2 +Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ms-1.5.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -283,6 +284,14 @@ %description mk Provides additional macedonian translations for koffice +%package ms +Summary: Malay language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description ms +Provides additional malay translations for koffice + %package nb Summary: Bokmal language pack for koffice Group: Applications/Productivity @@ -426,6 +435,14 @@ %description uk Provides additional ukrainian translations for koffice +%package uz +Summary: Uzbek language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description uz +Provides additional uzbek translations for koffice + %package zh_CN Summary: Simplified Chinese language pack for koffice Group: Applications/Productivity @@ -485,12 +502,13 @@ %{__tar} xjvf %{SOURCE44} %{__tar} xjvf %{SOURCE45} %{__tar} xjvf %{SOURCE46} +%{__tar} xjvf %{SOURCE47} %build # dont work: et for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} %configure make %{?_smp_mflags} @@ -500,8 +518,8 @@ %install rm -rf $RPM_BUILD_ROOT for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} make install DESTDIR=$RPM_BUILD_ROOT done @@ -647,6 +665,10 @@ %defattr(-,root,root,-) %lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/* +%files ms +%defattr(-,root,root,-) +%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/* + %files nb %defattr(-,root,root,-) %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/* @@ -728,11 +750,19 @@ %defattr(-,root,root,-) %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/* +%files uz +%defattr(-,root,root,-) +%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/* + %files zh_CN %defattr(-,root,root,-) %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* %changelog +* Tue May 30 2006 Andreas Bierfert +1.5.1-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 1.5.0-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Apr 2006 01:24:55 -0000 1.4 +++ sources 30 May 2006 08:37:24 -0000 1.5 @@ -1,48 +1,48 @@ - -03217f2f39b1a21cc685a5aa85200247 koffice-l10n-af-1.5.0.tar.bz2 -922cdc3f2de8d350deaf54c32feab117 koffice-l10n-ar-1.5.0.tar.bz2 -5e24b5028de337c2cbda323fa69d56f2 koffice-l10n-bg-1.5.0.tar.bz2 -4c5c9d834f14defd87c5580092002e51 koffice-l10n-br-1.5.0.tar.bz2 -6086121e25b243d7b5543dc15ebaf3ee koffice-l10n-bs-1.5.0.tar.bz2 -cc24df3b6d3899b89776e2d2cabb3eb5 koffice-l10n-ca-1.5.0.tar.bz2 -193f7d66d9b5c945932ee9868721f9f1 koffice-l10n-cs-1.5.0.tar.bz2 -14c6069119fb491e6b430d6663e3a60f koffice-l10n-cy-1.5.0.tar.bz2 -fedd3f7c0c39a40940576fb86d7262f0 koffice-l10n-da-1.5.0.tar.bz2 -fe3334c31472b006907f59f47db6cb75 koffice-l10n-de-1.5.0.tar.bz2 -d7384ecf60617aa054ec3ded25cff1ea koffice-l10n-el-1.5.0.tar.bz2 -5f00c66613f2250babd4cb02590952df koffice-l10n-en_GB-1.5.0.tar.bz2 -79d73a7d8e5a284e1c997cbec6bc804c koffice-l10n-eo-1.5.0.tar.bz2 -0abef42c4ea3a0992b69933ad1e94287 koffice-l10n-es-1.5.0.tar.bz2 -149ba841f9dc322336b9c153b598dea5 koffice-l10n-et-1.5.0.tar.bz2 -af2a4e93887cd55ba0cda123362650d7 koffice-l10n-eu-1.5.0.tar.bz2 -e87c44fc8c7b10c4c44c76d90cb1ca7c koffice-l10n-fi-1.5.0.tar.bz2 -65b9b6fd7903050c4c170af11aa94fb2 koffice-l10n-fr-1.5.0.tar.bz2 -47b453c7444e404c19cc8dc85cf56d37 koffice-l10n-ga-1.5.0.tar.bz2 -1d0810b08947f072631615ffa3260bec koffice-l10n-he-1.5.0.tar.bz2 -82231d5c7e273d0384d04e80be228167 koffice-l10n-hi-1.5.0.tar.bz2 -9c1d2441a49eaf06a6adac3f61590076 koffice-l10n-hu-1.5.0.tar.bz2 -3fc01e0a34d0ce9a2988ef30df638f62 koffice-l10n-is-1.5.0.tar.bz2 -db8b9a1bb5114e69c3768508c09bde8d koffice-l10n-it-1.5.0.tar.bz2 -16435cf9fd545529bea61010fb35ad03 koffice-l10n-ja-1.5.0.tar.bz2 -c306e0bfdccd60fd9f11e93828475fac koffice-l10n-lt-1.5.0.tar.bz2 -b0469b72436e35a1101ee9ea4e981ae3 koffice-l10n-mk-1.5.0.tar.bz2 -8cffcf181366737bea12a1ae9a14c294 koffice-l10n-nb-1.5.0.tar.bz2 -f4bfc5952a2612c72443d266df034e7d koffice-l10n-nl-1.5.0.tar.bz2 -bb3444c52bcbc33aaaad542454048c69 koffice-l10n-nn-1.5.0.tar.bz2 -442946625f984e8eb9f977c39a57749d koffice-l10n-pl-1.5.0.tar.bz2 -285b5766d9955de0fd7c2599b25115ab koffice-l10n-pt-1.5.0.tar.bz2 -41373317668d2d7cbc20e4a5a188daf6 koffice-l10n-pt_BR-1.5.0.tar.bz2 -35fb855cb7c18b95a11602a7c8483d2d koffice-l10n-ro-1.5.0.tar.bz2 -f5842b78af8ba903129942dfa7f6d7d4 koffice-l10n-ru-1.5.0.tar.bz2 -d153416b1403f7e4cf8a03b5739ab6a9 koffice-l10n-se-1.5.0.tar.bz2 -400b547e0520fe769594d4f39c3ec769 koffice-l10n-sk-1.5.0.tar.bz2 -7e73b04ed5952631efa8ef9ed216ce3d koffice-l10n-sl-1.5.0.tar.bz2 -5b7f01f22ae97c8983411b043c41a689 koffice-l10n-sr-1.5.0.tar.bz2 -5bafc53a3c3b4f863fd28fc9f0a090f9 koffice-l10n-sr at Latn-1.5.0.tar.bz2 -810dd9311472f1e60f90c9fdfcc6c84c koffice-l10n-sv-1.5.0.tar.bz2 -2991caa710ad20da8925331a51026498 koffice-l10n-ta-1.5.0.tar.bz2 -3c9f50e64cc892cfcb840c424b2940e4 koffice-l10n-tg-1.5.0.tar.bz2 -411466bf3f0f7340431f2f6448332a89 koffice-l10n-tr-1.5.0.tar.bz2 -8e3294a78b9beab5122703d61d2e9a2c koffice-l10n-uk-1.5.0.tar.bz2 -ace68fe74216fb0a57024fb3b750fdaf koffice-l10n-uz-1.5.0.tar.bz2 -3b15bc617451461f9911ad316a264005 koffice-l10n-zh_CN-1.5.0.tar.bz2 +99f5fae8b0d15bcdec7daa3dfadfc20d koffice-l10n-af-1.5.1.tar.bz2 +3ace1a68c04d3cb3d0e2b45ab9a059d0 koffice-l10n-ar-1.5.1.tar.bz2 +8daaeb614b3439490c2dd64a5ca6a90d koffice-l10n-bg-1.5.1.tar.bz2 +bed06b1e8dc15ab3f0360d66ecb5eca8 koffice-l10n-br-1.5.1.tar.bz2 +f5e83bf3d981a433fe8470947ed22c0a koffice-l10n-bs-1.5.1.tar.bz2 +a9386b6c6049814d6f4a3f67a4cb51d8 koffice-l10n-ca-1.5.1.tar.bz2 +6f68790c56564626e42949979a4e1dba koffice-l10n-cs-1.5.1.tar.bz2 +780d5816865f60b88209059c6c2e7d02 koffice-l10n-cy-1.5.1.tar.bz2 +aa38e3e0f04a930e89543cfb79c6184d koffice-l10n-da-1.5.1.tar.bz2 +dcd8043ab5b5d2642e4302f1f89fc639 koffice-l10n-de-1.5.1.tar.bz2 +350963ba95241e2576c077d4558d7fcb koffice-l10n-el-1.5.1.tar.bz2 +b7ae8b4aee9810f2b78235962f7f1dc2 koffice-l10n-en_GB-1.5.1.tar.bz2 +71c42a69ea9c417494d1603bc3b646b8 koffice-l10n-eo-1.5.1.tar.bz2 +70b926928aa1a2facb3409f144191967 koffice-l10n-es-1.5.1.tar.bz2 +23311d668c05da159ea12240f950e763 koffice-l10n-et-1.5.1.tar.bz2 +39f2c93001a037b79eda7e3f9611ea8a koffice-l10n-eu-1.5.1.tar.bz2 +f72750aa5c9cd5aa3814715ff36acd33 koffice-l10n-fi-1.5.1.tar.bz2 +d63d63daa55fa32e5c93b72c902cd4d1 koffice-l10n-fr-1.5.1.tar.bz2 +42615504255afdbadcbaafb197a6adb4 koffice-l10n-ga-1.5.1.tar.bz2 +a20e78860f0975b65ed59720924591ca koffice-l10n-he-1.5.1.tar.bz2 +37de7254e2d6610ad395c260cb002201 koffice-l10n-hi-1.5.1.tar.bz2 +8a8d4f7adaaed89063c4971c9bbfbf43 koffice-l10n-hu-1.5.1.tar.bz2 +33cf09b995ffde0c28a794ce3f6c6d51 koffice-l10n-is-1.5.1.tar.bz2 +71cf4cad9272090e6469a96736bd785e koffice-l10n-it-1.5.1.tar.bz2 +8f7893e842afd51368bd18c37b221f57 koffice-l10n-ja-1.5.1.tar.bz2 +6ece374294c001730552883defb0a53c koffice-l10n-lt-1.5.1.tar.bz2 +6adad6081c79ac9dc3edcae7bb5a9494 koffice-l10n-mk-1.5.1.tar.bz2 +43f77ffa86d70b1fb42cf4bc2312e783 koffice-l10n-ms-1.5.1.tar.bz2 +ff774ceadd4c42b80ab138c4446d8843 koffice-l10n-nb-1.5.1.tar.bz2 +f76f2b7b8a65a528d3d0514f5f1a0cbf koffice-l10n-nl-1.5.1.tar.bz2 +12a451ca1384c776045a86aa3f0fecb5 koffice-l10n-nn-1.5.1.tar.bz2 +5580950ba10229b65563ae8b9c29e8c4 koffice-l10n-pl-1.5.1.tar.bz2 +549c4668a4ec2fbc71a2fadb9597ea8f koffice-l10n-pt-1.5.1.tar.bz2 +5882aeae172ccfebbf68bad8f4dc0ced koffice-l10n-pt_BR-1.5.1.tar.bz2 +b01b4652edcd49e2d1f77db8040a2552 koffice-l10n-ro-1.5.1.tar.bz2 +7a484f7d54125398516cf54a2139e84d koffice-l10n-ru-1.5.1.tar.bz2 +ae4b1cabf24dcf7a89fbef573b07301a koffice-l10n-se-1.5.1.tar.bz2 +11a9def76b738074d5a70bf81a5e5b4b koffice-l10n-sk-1.5.1.tar.bz2 +4520614986d6fb70b1d4b8eb117815a5 koffice-l10n-sl-1.5.1.tar.bz2 +a825f39361da5599bcd572907eb9d068 koffice-l10n-sr-1.5.1.tar.bz2 +0413072d626a8b6291f65504f76d93f6 koffice-l10n-sr at Latn-1.5.1.tar.bz2 +4afcc6585df0a171e90b595c3d3311ae koffice-l10n-sv-1.5.1.tar.bz2 +536e66f3b85923771f2af964b51a465e koffice-l10n-ta-1.5.1.tar.bz2 +a38ec98b0f6437ddb93196f369a09485 koffice-l10n-tg-1.5.1.tar.bz2 +0026e7f0b40b76a700792bf3a8a40427 koffice-l10n-tr-1.5.1.tar.bz2 +114018e8d5e5935c8d47c717dbb3523c koffice-l10n-uk-1.5.1.tar.bz2 +b4ce57436f31a2c5b63572b27b1c3582 koffice-l10n-uz-1.5.1.tar.bz2 +f691b1667472c36f8c8ec3fb69ac11ea koffice-l10n-zh_CN-1.5.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 08:37:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:37:25 -0700 Subject: rpms/koffice-langpack/FC-5 .cvsignore, 1.4, 1.5 koffice-langpack.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605300837.k4U8bRuQ001523@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice-langpack/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1460/FC-5 Modified Files: .cvsignore koffice-langpack.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Apr 2006 01:24:55 -0000 1.4 +++ .cvsignore 30 May 2006 08:37:25 -0000 1.5 @@ -46,3 +46,51 @@ koffice-l10n-uk-1.5.0.tar.bz2 koffice-l10n-uz-1.5.0.tar.bz2 koffice-l10n-zh_CN-1.5.0.tar.bz2 +koffice-l10n-af-1.5.1.tar.bz2 +koffice-l10n-ar-1.5.1.tar.bz2 +koffice-l10n-bg-1.5.1.tar.bz2 +koffice-l10n-br-1.5.1.tar.bz2 +koffice-l10n-bs-1.5.1.tar.bz2 +koffice-l10n-ca-1.5.1.tar.bz2 +koffice-l10n-cs-1.5.1.tar.bz2 +koffice-l10n-cy-1.5.1.tar.bz2 +koffice-l10n-da-1.5.1.tar.bz2 +koffice-l10n-de-1.5.1.tar.bz2 +koffice-l10n-el-1.5.1.tar.bz2 +koffice-l10n-en_GB-1.5.1.tar.bz2 +koffice-l10n-eo-1.5.1.tar.bz2 +koffice-l10n-es-1.5.1.tar.bz2 +koffice-l10n-et-1.5.1.tar.bz2 +koffice-l10n-eu-1.5.1.tar.bz2 +koffice-l10n-fi-1.5.1.tar.bz2 +koffice-l10n-fr-1.5.1.tar.bz2 +koffice-l10n-ga-1.5.1.tar.bz2 +koffice-l10n-he-1.5.1.tar.bz2 +koffice-l10n-hi-1.5.1.tar.bz2 +koffice-l10n-hu-1.5.1.tar.bz2 +koffice-l10n-is-1.5.1.tar.bz2 +koffice-l10n-it-1.5.1.tar.bz2 +koffice-l10n-ja-1.5.1.tar.bz2 +koffice-l10n-lt-1.5.1.tar.bz2 +koffice-l10n-mk-1.5.1.tar.bz2 +koffice-l10n-ms-1.5.1.tar.bz2 +koffice-l10n-nb-1.5.1.tar.bz2 +koffice-l10n-nl-1.5.1.tar.bz2 +koffice-l10n-nn-1.5.1.tar.bz2 +koffice-l10n-pl-1.5.1.tar.bz2 +koffice-l10n-pt-1.5.1.tar.bz2 +koffice-l10n-pt_BR-1.5.1.tar.bz2 +koffice-l10n-ro-1.5.1.tar.bz2 +koffice-l10n-ru-1.5.1.tar.bz2 +koffice-l10n-se-1.5.1.tar.bz2 +koffice-l10n-sk-1.5.1.tar.bz2 +koffice-l10n-sl-1.5.1.tar.bz2 +koffice-l10n-sr-1.5.1.tar.bz2 +koffice-l10n-sr at Latn-1.5.1.tar.bz2 +koffice-l10n-sv-1.5.1.tar.bz2 +koffice-l10n-ta-1.5.1.tar.bz2 +koffice-l10n-tg-1.5.1.tar.bz2 +koffice-l10n-tr-1.5.1.tar.bz2 +koffice-l10n-uk-1.5.1.tar.bz2 +koffice-l10n-uz-1.5.1.tar.bz2 +koffice-l10n-zh_CN-1.5.1.tar.bz2 Index: koffice-langpack.spec =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/koffice-langpack.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- koffice-langpack.spec 22 Apr 2006 01:24:55 -0000 1.5 +++ koffice-langpack.spec 30 May 2006 08:37:25 -0000 1.6 @@ -1,58 +1,59 @@ Name: koffice-langpack -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Language files for koffice Group: Applications/Productivity License: GPL URL: http://www.koffice.org -Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2 -Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2 -Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2 -Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2 -Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2 -Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2 -Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2 -Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2 -Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2 -Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2 -Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2 -Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2 -Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2 -Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2 -Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2 -Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2 -Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2 -Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2 -Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2 -Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2 -Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2 -Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2 -Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2 -Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2 -Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2 -Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2 -Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2 -Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2 -Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2 -Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2 -Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2 -Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2 -Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2 -Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2 -Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2 -Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2 -Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2 -Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2 -Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2 -Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2 -Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2 -Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2 -Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2 -Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2 -Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2 -Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2 -Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2 +Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-af-1.5.1.tar.bz2 +Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ar-1.5.1.tar.bz2 +Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bg-1.5.1.tar.bz2 +Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-br-1.5.1.tar.bz2 +Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bs-1.5.1.tar.bz2 +Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ca-1.5.1.tar.bz2 +Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cs-1.5.1.tar.bz2 +Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cy-1.5.1.tar.bz2 +Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-da-1.5.1.tar.bz2 +Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-de-1.5.1.tar.bz2 +Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-el-1.5.1.tar.bz2 +Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-en_GB-1.5.1.tar.bz2 +Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eo-1.5.1.tar.bz2 +Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-es-1.5.1.tar.bz2 +Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-et-1.5.1.tar.bz2 +Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eu-1.5.1.tar.bz2 +Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fi-1.5.1.tar.bz2 +Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fr-1.5.1.tar.bz2 +Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ga-1.5.1.tar.bz2 +Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-he-1.5.1.tar.bz2 +Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hi-1.5.1.tar.bz2 +Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hu-1.5.1.tar.bz2 +Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-is-1.5.1.tar.bz2 +Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-it-1.5.1.tar.bz2 +Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ja-1.5.1.tar.bz2 +Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-lt-1.5.1.tar.bz2 +Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-mk-1.5.1.tar.bz2 +Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nb-1.5.1.tar.bz2 +Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nl-1.5.1.tar.bz2 +Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nn-1.5.1.tar.bz2 +Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pl-1.5.1.tar.bz2 +Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt-1.5.1.tar.bz2 +Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt_BR-1.5.1.tar.bz2 +Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ro-1.5.1.tar.bz2 +Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ru-1.5.1.tar.bz2 +Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-se-1.5.1.tar.bz2 +Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sk-1.5.1.tar.bz2 +Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sl-1.5.1.tar.bz2 +Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr-1.5.1.tar.bz2 +Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.1.tar.bz2 +Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sv-1.5.1.tar.bz2 +Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ta-1.5.1.tar.bz2 +Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tg-1.5.1.tar.bz2 +Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tr-1.5.1.tar.bz2 +Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uk-1.5.1.tar.bz2 +Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uz-1.5.1.tar.bz2 +Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-zh_CN-1.5.1.tar.bz2 +Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ms-1.5.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -283,6 +284,14 @@ %description mk Provides additional macedonian translations for koffice +%package ms +Summary: Malay language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description ms +Provides additional malay translations for koffice + %package nb Summary: Bokmal language pack for koffice Group: Applications/Productivity @@ -426,6 +435,14 @@ %description uk Provides additional ukrainian translations for koffice +%package uz +Summary: Uzbek language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description uz +Provides additional uzbek translations for koffice + %package zh_CN Summary: Simplified Chinese language pack for koffice Group: Applications/Productivity @@ -485,12 +502,13 @@ %{__tar} xjvf %{SOURCE44} %{__tar} xjvf %{SOURCE45} %{__tar} xjvf %{SOURCE46} +%{__tar} xjvf %{SOURCE47} %build # dont work: et for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} %configure make %{?_smp_mflags} @@ -500,8 +518,8 @@ %install rm -rf $RPM_BUILD_ROOT for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} make install DESTDIR=$RPM_BUILD_ROOT done @@ -647,6 +665,10 @@ %defattr(-,root,root,-) %lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/* +%files ms +%defattr(-,root,root,-) +%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/* + %files nb %defattr(-,root,root,-) %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/* @@ -728,11 +750,19 @@ %defattr(-,root,root,-) %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/* +%files uz +%defattr(-,root,root,-) +%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/* + %files zh_CN %defattr(-,root,root,-) %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* %changelog +* Tue May 30 2006 Andreas Bierfert +1.5.1-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 1.5.0-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Apr 2006 01:24:55 -0000 1.4 +++ sources 30 May 2006 08:37:25 -0000 1.5 @@ -1,48 +1,48 @@ - -03217f2f39b1a21cc685a5aa85200247 koffice-l10n-af-1.5.0.tar.bz2 -922cdc3f2de8d350deaf54c32feab117 koffice-l10n-ar-1.5.0.tar.bz2 -5e24b5028de337c2cbda323fa69d56f2 koffice-l10n-bg-1.5.0.tar.bz2 -4c5c9d834f14defd87c5580092002e51 koffice-l10n-br-1.5.0.tar.bz2 -6086121e25b243d7b5543dc15ebaf3ee koffice-l10n-bs-1.5.0.tar.bz2 -cc24df3b6d3899b89776e2d2cabb3eb5 koffice-l10n-ca-1.5.0.tar.bz2 -193f7d66d9b5c945932ee9868721f9f1 koffice-l10n-cs-1.5.0.tar.bz2 -14c6069119fb491e6b430d6663e3a60f koffice-l10n-cy-1.5.0.tar.bz2 -fedd3f7c0c39a40940576fb86d7262f0 koffice-l10n-da-1.5.0.tar.bz2 -fe3334c31472b006907f59f47db6cb75 koffice-l10n-de-1.5.0.tar.bz2 -d7384ecf60617aa054ec3ded25cff1ea koffice-l10n-el-1.5.0.tar.bz2 -5f00c66613f2250babd4cb02590952df koffice-l10n-en_GB-1.5.0.tar.bz2 -79d73a7d8e5a284e1c997cbec6bc804c koffice-l10n-eo-1.5.0.tar.bz2 -0abef42c4ea3a0992b69933ad1e94287 koffice-l10n-es-1.5.0.tar.bz2 -149ba841f9dc322336b9c153b598dea5 koffice-l10n-et-1.5.0.tar.bz2 -af2a4e93887cd55ba0cda123362650d7 koffice-l10n-eu-1.5.0.tar.bz2 -e87c44fc8c7b10c4c44c76d90cb1ca7c koffice-l10n-fi-1.5.0.tar.bz2 -65b9b6fd7903050c4c170af11aa94fb2 koffice-l10n-fr-1.5.0.tar.bz2 -47b453c7444e404c19cc8dc85cf56d37 koffice-l10n-ga-1.5.0.tar.bz2 -1d0810b08947f072631615ffa3260bec koffice-l10n-he-1.5.0.tar.bz2 -82231d5c7e273d0384d04e80be228167 koffice-l10n-hi-1.5.0.tar.bz2 -9c1d2441a49eaf06a6adac3f61590076 koffice-l10n-hu-1.5.0.tar.bz2 -3fc01e0a34d0ce9a2988ef30df638f62 koffice-l10n-is-1.5.0.tar.bz2 -db8b9a1bb5114e69c3768508c09bde8d koffice-l10n-it-1.5.0.tar.bz2 -16435cf9fd545529bea61010fb35ad03 koffice-l10n-ja-1.5.0.tar.bz2 -c306e0bfdccd60fd9f11e93828475fac koffice-l10n-lt-1.5.0.tar.bz2 -b0469b72436e35a1101ee9ea4e981ae3 koffice-l10n-mk-1.5.0.tar.bz2 -8cffcf181366737bea12a1ae9a14c294 koffice-l10n-nb-1.5.0.tar.bz2 -f4bfc5952a2612c72443d266df034e7d koffice-l10n-nl-1.5.0.tar.bz2 -bb3444c52bcbc33aaaad542454048c69 koffice-l10n-nn-1.5.0.tar.bz2 -442946625f984e8eb9f977c39a57749d koffice-l10n-pl-1.5.0.tar.bz2 -285b5766d9955de0fd7c2599b25115ab koffice-l10n-pt-1.5.0.tar.bz2 -41373317668d2d7cbc20e4a5a188daf6 koffice-l10n-pt_BR-1.5.0.tar.bz2 -35fb855cb7c18b95a11602a7c8483d2d koffice-l10n-ro-1.5.0.tar.bz2 -f5842b78af8ba903129942dfa7f6d7d4 koffice-l10n-ru-1.5.0.tar.bz2 -d153416b1403f7e4cf8a03b5739ab6a9 koffice-l10n-se-1.5.0.tar.bz2 -400b547e0520fe769594d4f39c3ec769 koffice-l10n-sk-1.5.0.tar.bz2 -7e73b04ed5952631efa8ef9ed216ce3d koffice-l10n-sl-1.5.0.tar.bz2 -5b7f01f22ae97c8983411b043c41a689 koffice-l10n-sr-1.5.0.tar.bz2 -5bafc53a3c3b4f863fd28fc9f0a090f9 koffice-l10n-sr at Latn-1.5.0.tar.bz2 -810dd9311472f1e60f90c9fdfcc6c84c koffice-l10n-sv-1.5.0.tar.bz2 -2991caa710ad20da8925331a51026498 koffice-l10n-ta-1.5.0.tar.bz2 -3c9f50e64cc892cfcb840c424b2940e4 koffice-l10n-tg-1.5.0.tar.bz2 -411466bf3f0f7340431f2f6448332a89 koffice-l10n-tr-1.5.0.tar.bz2 -8e3294a78b9beab5122703d61d2e9a2c koffice-l10n-uk-1.5.0.tar.bz2 -ace68fe74216fb0a57024fb3b750fdaf koffice-l10n-uz-1.5.0.tar.bz2 -3b15bc617451461f9911ad316a264005 koffice-l10n-zh_CN-1.5.0.tar.bz2 +99f5fae8b0d15bcdec7daa3dfadfc20d koffice-l10n-af-1.5.1.tar.bz2 +3ace1a68c04d3cb3d0e2b45ab9a059d0 koffice-l10n-ar-1.5.1.tar.bz2 +8daaeb614b3439490c2dd64a5ca6a90d koffice-l10n-bg-1.5.1.tar.bz2 +bed06b1e8dc15ab3f0360d66ecb5eca8 koffice-l10n-br-1.5.1.tar.bz2 +f5e83bf3d981a433fe8470947ed22c0a koffice-l10n-bs-1.5.1.tar.bz2 +a9386b6c6049814d6f4a3f67a4cb51d8 koffice-l10n-ca-1.5.1.tar.bz2 +6f68790c56564626e42949979a4e1dba koffice-l10n-cs-1.5.1.tar.bz2 +780d5816865f60b88209059c6c2e7d02 koffice-l10n-cy-1.5.1.tar.bz2 +aa38e3e0f04a930e89543cfb79c6184d koffice-l10n-da-1.5.1.tar.bz2 +dcd8043ab5b5d2642e4302f1f89fc639 koffice-l10n-de-1.5.1.tar.bz2 +350963ba95241e2576c077d4558d7fcb koffice-l10n-el-1.5.1.tar.bz2 +b7ae8b4aee9810f2b78235962f7f1dc2 koffice-l10n-en_GB-1.5.1.tar.bz2 +71c42a69ea9c417494d1603bc3b646b8 koffice-l10n-eo-1.5.1.tar.bz2 +70b926928aa1a2facb3409f144191967 koffice-l10n-es-1.5.1.tar.bz2 +23311d668c05da159ea12240f950e763 koffice-l10n-et-1.5.1.tar.bz2 +39f2c93001a037b79eda7e3f9611ea8a koffice-l10n-eu-1.5.1.tar.bz2 +f72750aa5c9cd5aa3814715ff36acd33 koffice-l10n-fi-1.5.1.tar.bz2 +d63d63daa55fa32e5c93b72c902cd4d1 koffice-l10n-fr-1.5.1.tar.bz2 +42615504255afdbadcbaafb197a6adb4 koffice-l10n-ga-1.5.1.tar.bz2 +a20e78860f0975b65ed59720924591ca koffice-l10n-he-1.5.1.tar.bz2 +37de7254e2d6610ad395c260cb002201 koffice-l10n-hi-1.5.1.tar.bz2 +8a8d4f7adaaed89063c4971c9bbfbf43 koffice-l10n-hu-1.5.1.tar.bz2 +33cf09b995ffde0c28a794ce3f6c6d51 koffice-l10n-is-1.5.1.tar.bz2 +71cf4cad9272090e6469a96736bd785e koffice-l10n-it-1.5.1.tar.bz2 +8f7893e842afd51368bd18c37b221f57 koffice-l10n-ja-1.5.1.tar.bz2 +6ece374294c001730552883defb0a53c koffice-l10n-lt-1.5.1.tar.bz2 +6adad6081c79ac9dc3edcae7bb5a9494 koffice-l10n-mk-1.5.1.tar.bz2 +43f77ffa86d70b1fb42cf4bc2312e783 koffice-l10n-ms-1.5.1.tar.bz2 +ff774ceadd4c42b80ab138c4446d8843 koffice-l10n-nb-1.5.1.tar.bz2 +f76f2b7b8a65a528d3d0514f5f1a0cbf koffice-l10n-nl-1.5.1.tar.bz2 +12a451ca1384c776045a86aa3f0fecb5 koffice-l10n-nn-1.5.1.tar.bz2 +5580950ba10229b65563ae8b9c29e8c4 koffice-l10n-pl-1.5.1.tar.bz2 +549c4668a4ec2fbc71a2fadb9597ea8f koffice-l10n-pt-1.5.1.tar.bz2 +5882aeae172ccfebbf68bad8f4dc0ced koffice-l10n-pt_BR-1.5.1.tar.bz2 +b01b4652edcd49e2d1f77db8040a2552 koffice-l10n-ro-1.5.1.tar.bz2 +7a484f7d54125398516cf54a2139e84d koffice-l10n-ru-1.5.1.tar.bz2 +ae4b1cabf24dcf7a89fbef573b07301a koffice-l10n-se-1.5.1.tar.bz2 +11a9def76b738074d5a70bf81a5e5b4b koffice-l10n-sk-1.5.1.tar.bz2 +4520614986d6fb70b1d4b8eb117815a5 koffice-l10n-sl-1.5.1.tar.bz2 +a825f39361da5599bcd572907eb9d068 koffice-l10n-sr-1.5.1.tar.bz2 +0413072d626a8b6291f65504f76d93f6 koffice-l10n-sr at Latn-1.5.1.tar.bz2 +4afcc6585df0a171e90b595c3d3311ae koffice-l10n-sv-1.5.1.tar.bz2 +536e66f3b85923771f2af964b51a465e koffice-l10n-ta-1.5.1.tar.bz2 +a38ec98b0f6437ddb93196f369a09485 koffice-l10n-tg-1.5.1.tar.bz2 +0026e7f0b40b76a700792bf3a8a40427 koffice-l10n-tr-1.5.1.tar.bz2 +114018e8d5e5935c8d47c717dbb3523c koffice-l10n-uk-1.5.1.tar.bz2 +b4ce57436f31a2c5b63572b27b1c3582 koffice-l10n-uz-1.5.1.tar.bz2 +f691b1667472c36f8c8ec3fb69ac11ea koffice-l10n-zh_CN-1.5.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 08:37:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 01:37:26 -0700 Subject: rpms/koffice-langpack/devel .cvsignore, 1.4, 1.5 koffice-langpack.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200605300837.k4U8bSLf001529@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice-langpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1460/devel Modified Files: .cvsignore koffice-langpack.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Apr 2006 01:24:56 -0000 1.4 +++ .cvsignore 30 May 2006 08:37:26 -0000 1.5 @@ -46,3 +46,51 @@ koffice-l10n-uk-1.5.0.tar.bz2 koffice-l10n-uz-1.5.0.tar.bz2 koffice-l10n-zh_CN-1.5.0.tar.bz2 +koffice-l10n-af-1.5.1.tar.bz2 +koffice-l10n-ar-1.5.1.tar.bz2 +koffice-l10n-bg-1.5.1.tar.bz2 +koffice-l10n-br-1.5.1.tar.bz2 +koffice-l10n-bs-1.5.1.tar.bz2 +koffice-l10n-ca-1.5.1.tar.bz2 +koffice-l10n-cs-1.5.1.tar.bz2 +koffice-l10n-cy-1.5.1.tar.bz2 +koffice-l10n-da-1.5.1.tar.bz2 +koffice-l10n-de-1.5.1.tar.bz2 +koffice-l10n-el-1.5.1.tar.bz2 +koffice-l10n-en_GB-1.5.1.tar.bz2 +koffice-l10n-eo-1.5.1.tar.bz2 +koffice-l10n-es-1.5.1.tar.bz2 +koffice-l10n-et-1.5.1.tar.bz2 +koffice-l10n-eu-1.5.1.tar.bz2 +koffice-l10n-fi-1.5.1.tar.bz2 +koffice-l10n-fr-1.5.1.tar.bz2 +koffice-l10n-ga-1.5.1.tar.bz2 +koffice-l10n-he-1.5.1.tar.bz2 +koffice-l10n-hi-1.5.1.tar.bz2 +koffice-l10n-hu-1.5.1.tar.bz2 +koffice-l10n-is-1.5.1.tar.bz2 +koffice-l10n-it-1.5.1.tar.bz2 +koffice-l10n-ja-1.5.1.tar.bz2 +koffice-l10n-lt-1.5.1.tar.bz2 +koffice-l10n-mk-1.5.1.tar.bz2 +koffice-l10n-ms-1.5.1.tar.bz2 +koffice-l10n-nb-1.5.1.tar.bz2 +koffice-l10n-nl-1.5.1.tar.bz2 +koffice-l10n-nn-1.5.1.tar.bz2 +koffice-l10n-pl-1.5.1.tar.bz2 +koffice-l10n-pt-1.5.1.tar.bz2 +koffice-l10n-pt_BR-1.5.1.tar.bz2 +koffice-l10n-ro-1.5.1.tar.bz2 +koffice-l10n-ru-1.5.1.tar.bz2 +koffice-l10n-se-1.5.1.tar.bz2 +koffice-l10n-sk-1.5.1.tar.bz2 +koffice-l10n-sl-1.5.1.tar.bz2 +koffice-l10n-sr-1.5.1.tar.bz2 +koffice-l10n-sr at Latn-1.5.1.tar.bz2 +koffice-l10n-sv-1.5.1.tar.bz2 +koffice-l10n-ta-1.5.1.tar.bz2 +koffice-l10n-tg-1.5.1.tar.bz2 +koffice-l10n-tr-1.5.1.tar.bz2 +koffice-l10n-uk-1.5.1.tar.bz2 +koffice-l10n-uz-1.5.1.tar.bz2 +koffice-l10n-zh_CN-1.5.1.tar.bz2 Index: koffice-langpack.spec =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/devel/koffice-langpack.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- koffice-langpack.spec 22 Apr 2006 01:24:56 -0000 1.5 +++ koffice-langpack.spec 30 May 2006 08:37:26 -0000 1.6 @@ -1,58 +1,59 @@ Name: koffice-langpack -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Language files for koffice Group: Applications/Productivity License: GPL URL: http://www.koffice.org -Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2 -Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2 -Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2 -Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2 -Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2 -Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2 -Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2 -Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2 -Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2 -Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2 -Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2 -Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2 -Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2 -Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2 -Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2 -Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2 -Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2 -Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2 -Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2 -Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2 -Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2 -Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2 -Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2 -Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2 -Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2 -Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2 -Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2 -Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2 -Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2 -Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2 -Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2 -Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2 -Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2 -Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2 -Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2 -Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2 -Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2 -Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2 -Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2 -Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2 -Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2 -Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2 -Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2 -Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2 -Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2 -Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2 -Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2 +Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-af-1.5.1.tar.bz2 +Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ar-1.5.1.tar.bz2 +Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bg-1.5.1.tar.bz2 +Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-br-1.5.1.tar.bz2 +Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-bs-1.5.1.tar.bz2 +Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ca-1.5.1.tar.bz2 +Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cs-1.5.1.tar.bz2 +Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-cy-1.5.1.tar.bz2 +Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-da-1.5.1.tar.bz2 +Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-de-1.5.1.tar.bz2 +Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-el-1.5.1.tar.bz2 +Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-en_GB-1.5.1.tar.bz2 +Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eo-1.5.1.tar.bz2 +Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-es-1.5.1.tar.bz2 +Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-et-1.5.1.tar.bz2 +Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-eu-1.5.1.tar.bz2 +Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fi-1.5.1.tar.bz2 +Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-fr-1.5.1.tar.bz2 +Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ga-1.5.1.tar.bz2 +Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-he-1.5.1.tar.bz2 +Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hi-1.5.1.tar.bz2 +Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-hu-1.5.1.tar.bz2 +Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-is-1.5.1.tar.bz2 +Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-it-1.5.1.tar.bz2 +Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ja-1.5.1.tar.bz2 +Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-lt-1.5.1.tar.bz2 +Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-mk-1.5.1.tar.bz2 +Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nb-1.5.1.tar.bz2 +Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nl-1.5.1.tar.bz2 +Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-nn-1.5.1.tar.bz2 +Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pl-1.5.1.tar.bz2 +Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt-1.5.1.tar.bz2 +Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-pt_BR-1.5.1.tar.bz2 +Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ro-1.5.1.tar.bz2 +Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ru-1.5.1.tar.bz2 +Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-se-1.5.1.tar.bz2 +Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sk-1.5.1.tar.bz2 +Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sl-1.5.1.tar.bz2 +Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr-1.5.1.tar.bz2 +Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.1.tar.bz2 +Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-sv-1.5.1.tar.bz2 +Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ta-1.5.1.tar.bz2 +Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tg-1.5.1.tar.bz2 +Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-tr-1.5.1.tar.bz2 +Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uk-1.5.1.tar.bz2 +Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-uz-1.5.1.tar.bz2 +Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-zh_CN-1.5.1.tar.bz2 +Source47:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-l10n/koffice-l10n-ms-1.5.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -283,6 +284,14 @@ %description mk Provides additional macedonian translations for koffice +%package ms +Summary: Malay language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description ms +Provides additional malay translations for koffice + %package nb Summary: Bokmal language pack for koffice Group: Applications/Productivity @@ -426,6 +435,14 @@ %description uk Provides additional ukrainian translations for koffice +%package uz +Summary: Uzbek language pack for koffice +Group: Applications/Productivity +Requires: koffice-core >= %{version} + +%description uz +Provides additional uzbek translations for koffice + %package zh_CN Summary: Simplified Chinese language pack for koffice Group: Applications/Productivity @@ -485,12 +502,13 @@ %{__tar} xjvf %{SOURCE44} %{__tar} xjvf %{SOURCE45} %{__tar} xjvf %{SOURCE46} +%{__tar} xjvf %{SOURCE47} %build # dont work: et for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} %configure make %{?_smp_mflags} @@ -500,8 +518,8 @@ %install rm -rf $RPM_BUILD_ROOT for lang in af ar bg br bs ca cs cy da de el en_GB eo es et eu fi fr ga \ -he hi hu is it ja lt mk nb nl nn pl pt pt_BR ro ru se sk sl sr \ -sr at Latn sv ta tg tr uk zh_CN; do +he hi hu is it ja lt mk ms nb nl nn pl pt pt_BR ro ru se sk sl sr \ +sr at Latn sv ta tg tr uk uz zh_CN; do cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version} make install DESTDIR=$RPM_BUILD_ROOT done @@ -647,6 +665,10 @@ %defattr(-,root,root,-) %lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/* +%files ms +%defattr(-,root,root,-) +%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/* + %files nb %defattr(-,root,root,-) %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/* @@ -728,11 +750,19 @@ %defattr(-,root,root,-) %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/* +%files uz +%defattr(-,root,root,-) +%lang(uz) %{_datadir}/locale/uz/LC_MESSAGES/* + %files zh_CN %defattr(-,root,root,-) %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* %changelog +* Tue May 30 2006 Andreas Bierfert +1.5.1-1 +- version upgrade + * Sat Apr 22 2006 Andreas Bierfert 1.5.0-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Apr 2006 01:24:56 -0000 1.4 +++ sources 30 May 2006 08:37:26 -0000 1.5 @@ -1,48 +1,48 @@ - -03217f2f39b1a21cc685a5aa85200247 koffice-l10n-af-1.5.0.tar.bz2 -922cdc3f2de8d350deaf54c32feab117 koffice-l10n-ar-1.5.0.tar.bz2 -5e24b5028de337c2cbda323fa69d56f2 koffice-l10n-bg-1.5.0.tar.bz2 -4c5c9d834f14defd87c5580092002e51 koffice-l10n-br-1.5.0.tar.bz2 -6086121e25b243d7b5543dc15ebaf3ee koffice-l10n-bs-1.5.0.tar.bz2 -cc24df3b6d3899b89776e2d2cabb3eb5 koffice-l10n-ca-1.5.0.tar.bz2 -193f7d66d9b5c945932ee9868721f9f1 koffice-l10n-cs-1.5.0.tar.bz2 -14c6069119fb491e6b430d6663e3a60f koffice-l10n-cy-1.5.0.tar.bz2 -fedd3f7c0c39a40940576fb86d7262f0 koffice-l10n-da-1.5.0.tar.bz2 -fe3334c31472b006907f59f47db6cb75 koffice-l10n-de-1.5.0.tar.bz2 -d7384ecf60617aa054ec3ded25cff1ea koffice-l10n-el-1.5.0.tar.bz2 -5f00c66613f2250babd4cb02590952df koffice-l10n-en_GB-1.5.0.tar.bz2 -79d73a7d8e5a284e1c997cbec6bc804c koffice-l10n-eo-1.5.0.tar.bz2 -0abef42c4ea3a0992b69933ad1e94287 koffice-l10n-es-1.5.0.tar.bz2 -149ba841f9dc322336b9c153b598dea5 koffice-l10n-et-1.5.0.tar.bz2 -af2a4e93887cd55ba0cda123362650d7 koffice-l10n-eu-1.5.0.tar.bz2 -e87c44fc8c7b10c4c44c76d90cb1ca7c koffice-l10n-fi-1.5.0.tar.bz2 -65b9b6fd7903050c4c170af11aa94fb2 koffice-l10n-fr-1.5.0.tar.bz2 -47b453c7444e404c19cc8dc85cf56d37 koffice-l10n-ga-1.5.0.tar.bz2 -1d0810b08947f072631615ffa3260bec koffice-l10n-he-1.5.0.tar.bz2 -82231d5c7e273d0384d04e80be228167 koffice-l10n-hi-1.5.0.tar.bz2 -9c1d2441a49eaf06a6adac3f61590076 koffice-l10n-hu-1.5.0.tar.bz2 -3fc01e0a34d0ce9a2988ef30df638f62 koffice-l10n-is-1.5.0.tar.bz2 -db8b9a1bb5114e69c3768508c09bde8d koffice-l10n-it-1.5.0.tar.bz2 -16435cf9fd545529bea61010fb35ad03 koffice-l10n-ja-1.5.0.tar.bz2 -c306e0bfdccd60fd9f11e93828475fac koffice-l10n-lt-1.5.0.tar.bz2 -b0469b72436e35a1101ee9ea4e981ae3 koffice-l10n-mk-1.5.0.tar.bz2 -8cffcf181366737bea12a1ae9a14c294 koffice-l10n-nb-1.5.0.tar.bz2 -f4bfc5952a2612c72443d266df034e7d koffice-l10n-nl-1.5.0.tar.bz2 -bb3444c52bcbc33aaaad542454048c69 koffice-l10n-nn-1.5.0.tar.bz2 -442946625f984e8eb9f977c39a57749d koffice-l10n-pl-1.5.0.tar.bz2 -285b5766d9955de0fd7c2599b25115ab koffice-l10n-pt-1.5.0.tar.bz2 -41373317668d2d7cbc20e4a5a188daf6 koffice-l10n-pt_BR-1.5.0.tar.bz2 -35fb855cb7c18b95a11602a7c8483d2d koffice-l10n-ro-1.5.0.tar.bz2 -f5842b78af8ba903129942dfa7f6d7d4 koffice-l10n-ru-1.5.0.tar.bz2 -d153416b1403f7e4cf8a03b5739ab6a9 koffice-l10n-se-1.5.0.tar.bz2 -400b547e0520fe769594d4f39c3ec769 koffice-l10n-sk-1.5.0.tar.bz2 -7e73b04ed5952631efa8ef9ed216ce3d koffice-l10n-sl-1.5.0.tar.bz2 -5b7f01f22ae97c8983411b043c41a689 koffice-l10n-sr-1.5.0.tar.bz2 -5bafc53a3c3b4f863fd28fc9f0a090f9 koffice-l10n-sr at Latn-1.5.0.tar.bz2 -810dd9311472f1e60f90c9fdfcc6c84c koffice-l10n-sv-1.5.0.tar.bz2 -2991caa710ad20da8925331a51026498 koffice-l10n-ta-1.5.0.tar.bz2 -3c9f50e64cc892cfcb840c424b2940e4 koffice-l10n-tg-1.5.0.tar.bz2 -411466bf3f0f7340431f2f6448332a89 koffice-l10n-tr-1.5.0.tar.bz2 -8e3294a78b9beab5122703d61d2e9a2c koffice-l10n-uk-1.5.0.tar.bz2 -ace68fe74216fb0a57024fb3b750fdaf koffice-l10n-uz-1.5.0.tar.bz2 -3b15bc617451461f9911ad316a264005 koffice-l10n-zh_CN-1.5.0.tar.bz2 +99f5fae8b0d15bcdec7daa3dfadfc20d koffice-l10n-af-1.5.1.tar.bz2 +3ace1a68c04d3cb3d0e2b45ab9a059d0 koffice-l10n-ar-1.5.1.tar.bz2 +8daaeb614b3439490c2dd64a5ca6a90d koffice-l10n-bg-1.5.1.tar.bz2 +bed06b1e8dc15ab3f0360d66ecb5eca8 koffice-l10n-br-1.5.1.tar.bz2 +f5e83bf3d981a433fe8470947ed22c0a koffice-l10n-bs-1.5.1.tar.bz2 +a9386b6c6049814d6f4a3f67a4cb51d8 koffice-l10n-ca-1.5.1.tar.bz2 +6f68790c56564626e42949979a4e1dba koffice-l10n-cs-1.5.1.tar.bz2 +780d5816865f60b88209059c6c2e7d02 koffice-l10n-cy-1.5.1.tar.bz2 +aa38e3e0f04a930e89543cfb79c6184d koffice-l10n-da-1.5.1.tar.bz2 +dcd8043ab5b5d2642e4302f1f89fc639 koffice-l10n-de-1.5.1.tar.bz2 +350963ba95241e2576c077d4558d7fcb koffice-l10n-el-1.5.1.tar.bz2 +b7ae8b4aee9810f2b78235962f7f1dc2 koffice-l10n-en_GB-1.5.1.tar.bz2 +71c42a69ea9c417494d1603bc3b646b8 koffice-l10n-eo-1.5.1.tar.bz2 +70b926928aa1a2facb3409f144191967 koffice-l10n-es-1.5.1.tar.bz2 +23311d668c05da159ea12240f950e763 koffice-l10n-et-1.5.1.tar.bz2 +39f2c93001a037b79eda7e3f9611ea8a koffice-l10n-eu-1.5.1.tar.bz2 +f72750aa5c9cd5aa3814715ff36acd33 koffice-l10n-fi-1.5.1.tar.bz2 +d63d63daa55fa32e5c93b72c902cd4d1 koffice-l10n-fr-1.5.1.tar.bz2 +42615504255afdbadcbaafb197a6adb4 koffice-l10n-ga-1.5.1.tar.bz2 +a20e78860f0975b65ed59720924591ca koffice-l10n-he-1.5.1.tar.bz2 +37de7254e2d6610ad395c260cb002201 koffice-l10n-hi-1.5.1.tar.bz2 +8a8d4f7adaaed89063c4971c9bbfbf43 koffice-l10n-hu-1.5.1.tar.bz2 +33cf09b995ffde0c28a794ce3f6c6d51 koffice-l10n-is-1.5.1.tar.bz2 +71cf4cad9272090e6469a96736bd785e koffice-l10n-it-1.5.1.tar.bz2 +8f7893e842afd51368bd18c37b221f57 koffice-l10n-ja-1.5.1.tar.bz2 +6ece374294c001730552883defb0a53c koffice-l10n-lt-1.5.1.tar.bz2 +6adad6081c79ac9dc3edcae7bb5a9494 koffice-l10n-mk-1.5.1.tar.bz2 +43f77ffa86d70b1fb42cf4bc2312e783 koffice-l10n-ms-1.5.1.tar.bz2 +ff774ceadd4c42b80ab138c4446d8843 koffice-l10n-nb-1.5.1.tar.bz2 +f76f2b7b8a65a528d3d0514f5f1a0cbf koffice-l10n-nl-1.5.1.tar.bz2 +12a451ca1384c776045a86aa3f0fecb5 koffice-l10n-nn-1.5.1.tar.bz2 +5580950ba10229b65563ae8b9c29e8c4 koffice-l10n-pl-1.5.1.tar.bz2 +549c4668a4ec2fbc71a2fadb9597ea8f koffice-l10n-pt-1.5.1.tar.bz2 +5882aeae172ccfebbf68bad8f4dc0ced koffice-l10n-pt_BR-1.5.1.tar.bz2 +b01b4652edcd49e2d1f77db8040a2552 koffice-l10n-ro-1.5.1.tar.bz2 +7a484f7d54125398516cf54a2139e84d koffice-l10n-ru-1.5.1.tar.bz2 +ae4b1cabf24dcf7a89fbef573b07301a koffice-l10n-se-1.5.1.tar.bz2 +11a9def76b738074d5a70bf81a5e5b4b koffice-l10n-sk-1.5.1.tar.bz2 +4520614986d6fb70b1d4b8eb117815a5 koffice-l10n-sl-1.5.1.tar.bz2 +a825f39361da5599bcd572907eb9d068 koffice-l10n-sr-1.5.1.tar.bz2 +0413072d626a8b6291f65504f76d93f6 koffice-l10n-sr at Latn-1.5.1.tar.bz2 +4afcc6585df0a171e90b595c3d3311ae koffice-l10n-sv-1.5.1.tar.bz2 +536e66f3b85923771f2af964b51a465e koffice-l10n-ta-1.5.1.tar.bz2 +a38ec98b0f6437ddb93196f369a09485 koffice-l10n-tg-1.5.1.tar.bz2 +0026e7f0b40b76a700792bf3a8a40427 koffice-l10n-tr-1.5.1.tar.bz2 +114018e8d5e5935c8d47c717dbb3523c koffice-l10n-uk-1.5.1.tar.bz2 +b4ce57436f31a2c5b63572b27b1c3582 koffice-l10n-uz-1.5.1.tar.bz2 +f691b1667472c36f8c8ec3fb69ac11ea koffice-l10n-zh_CN-1.5.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 08:38:06 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 30 May 2006 01:38:06 -0700 Subject: rpms/kasumi/FC-4 kasumi.spec,1.6,1.7 Message-ID: <200605300838.k4U8c8sd001552@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kasumi/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1535 Modified Files: kasumi.spec Log Message: Index: kasumi.spec =================================================================== RCS file: /cvs/extras/rpms/kasumi/FC-4/kasumi.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kasumi.spec 30 May 2006 04:13:12 -0000 1.6 +++ kasumi.spec 30 May 2006 08:38:06 -0000 1.7 @@ -5,7 +5,7 @@ License: GPL URL: http://kasumi.sourceforge.jp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, gtk2-devel +BuildRequires: desktop-file-utils, gtk2-devel gettext-devel Source0: %{name}-%{version}.tar.gz Source1: %{name}.desktop Patch1: kasumi-1.0-gcc41.patch From fedora-extras-commits at redhat.com Tue May 30 08:59:42 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Tue, 30 May 2006 01:59:42 -0700 Subject: rpms/anjuta-gdl/devel .cvsignore, 1.2, 1.3 anjuta-gdl.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605300859.k4U8xiII001923@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/anjuta-gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1902 Modified Files: .cvsignore anjuta-gdl.spec sources Log Message: - update to 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Apr 2006 22:35:30 -0000 1.2 +++ .cvsignore 30 May 2006 08:59:41 -0000 1.3 @@ -1 +1 @@ -gdl-0.6.0.tar.gz +gdl-0.6.1.tar.gz Index: anjuta-gdl.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/devel/anjuta-gdl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- anjuta-gdl.spec 23 Apr 2006 22:35:30 -0000 1.1 +++ anjuta-gdl.spec 30 May 2006 08:59:41 -0000 1.2 @@ -1,7 +1,7 @@ Name: anjuta-gdl Summary: Components and library for GNOME development tools -Version: 0.6.0 -Release: 5%{?dist} +Version: 0.6.1 +Release: 1%{?dist} License: GPL Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/gdl/0.6/gdl-%{version}.tar.gz @@ -59,6 +59,9 @@ %{_libdir}/pkgconfig/gdl-1.0.pc %changelog +* Tue May 30 2006 Radek Vokal 0.6.1-1 +- update to 0.6.1 + * Sun Apr 23 2006 Paul F. Johnson 0.6.0-5 - added --disable-static and removed the .a delete line - very minor spec changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Apr 2006 22:35:30 -0000 1.2 +++ sources 30 May 2006 08:59:41 -0000 1.3 @@ -1 +1 @@ -527555a617fd670a0d4b7d03cae03dad gdl-0.6.0.tar.gz +6dfe748f15799f46cd8cfb8f80837ed0 gdl-0.6.1.tar.gz From fedora-extras-commits at redhat.com Tue May 30 09:05:18 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:05:18 -0700 Subject: rpms/kerry - New directory Message-ID: <200605300905.k4U95KHc004415@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4394/kerry Log Message: Directory /cvs/extras/rpms/kerry added to the repository From fedora-extras-commits at redhat.com Tue May 30 09:05:19 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:05:19 -0700 Subject: rpms/kerry/devel - New directory Message-ID: <200605300905.k4U95LRk004418@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4394/kerry/devel Log Message: Directory /cvs/extras/rpms/kerry/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 09:05:44 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:05:44 -0700 Subject: rpms/kerry Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300905.k4U95k4Y004476@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443 Added Files: Makefile import.log Log Message: Setup of module kerry --- NEW FILE Makefile --- # Top level Makefile for module kerry all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 09:05:45 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:05:45 -0700 Subject: rpms/kerry/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300905.k4U95lOV004479@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4443/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kerry --- NEW 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 May 30 09:06:57 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:06:57 -0700 Subject: rpms/kerry import.log,1.1,1.2 Message-ID: <200605300907.k4U97TP2004551@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4517 Modified Files: import.log Log Message: auto-import kerry-0.1.1-2 on branch devel from kerry-0.1.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kerry/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 09:05:44 -0000 1.1 +++ import.log 30 May 2006 09:06:57 -0000 1.2 @@ -0,0 +1 @@ +kerry-0_1_1-2:HEAD:kerry-0.1.1-2.src.rpm:1148980457 From fedora-extras-commits at redhat.com Tue May 30 09:06:58 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:06:58 -0700 Subject: rpms/kerry/devel kerry.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300907.k4U97U43004555@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/kerry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4517/devel Modified Files: .cvsignore sources Added Files: kerry.spec Log Message: auto-import kerry-0.1.1-2 on branch devel from kerry-0.1.1-2.src.rpm --- NEW FILE kerry.spec --- Name: kerry Version: 0.1.1 Release: 2%{?dist} Summary: Kerry Beagle is a KDE frontend for the Beagle desktop search Group: User Interface/Desktops License: GPL URL: http://www.kde-apps.org/content/show.php?content=36832 Source0: http://developer.kde.org/~binner/kerry/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, qt-devel, kdelibs-devel, kdebase-devel BuildRequires: desktop-file-utils, libbeagle-devel, glib-devel # We have an exception here, this application is not linked with beagle itself, # but depends on it for all its operation. Requires: beagle %description Kerry Beagle is a nice KDE frontend for the Beagle desktop search daemon, it uses indexed searched files from beagle and displays in a KDE way, integrating totally with the desktop, systray, and Konqueror. %prep %setup -q %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure --disable-rpath --disable-debug make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Removing libtool archive files #rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/kerry.la rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_kerry.la # Moving shutdown script mkdir -p $RPM_BUILD_ROOT%{_datadir}/shutdown mv $RPM_BUILD_ROOT%{_prefix}/shutdown/beagled-shutdown.sh \ $RPM_BUILD_ROOT%{_datadir}/shutdown rmdir $RPM_BUILD_ROOT%{_prefix}/shutdown # Install .desktop file using desktop-file-utils desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \ --add-category X-Fedora \ --add-category Application \ --add-category Core \ --add-category Utility \ --add-category Filesystem \ --add-category KDE \ --add-category Qt \ --add-only-show-in=KDE \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kerry.desktop # Uh-oh, a version number in locale files! %find_lang %{name}-%{version} %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{version}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO %{_bindir}/kerry %{_libdir}/kde3/kerry.so %{_libdir}/kde3/kerry.la %{_libdir}/libkdeinit_kerry.so %{_datadir}/autostart/beagled.desktop %{_datadir}/autostart/kerry.autostart.desktop %{_datadir}/applications/kde/fedora-kerry.desktop %{_datadir}/icons/hicolor/*/apps/kerry.png %{_datadir}/shutdown/beagled-shutdown.sh %changelog * Thu May 25 2006 Hugo Cisneiros 0.1.1-2 - Added kerry.la to libdir/kde3 as KDE applications requires - Updated desktop-file-install with '--only-show-in=KDE' - Added beagle as a dependency since kerry requires it * Wed May 24 2006 Hugo Cisneiros 0.1.1-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kerry/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 09:05:45 -0000 1.1 +++ .cvsignore 30 May 2006 09:06:57 -0000 1.2 @@ -0,0 +1 @@ +kerry-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kerry/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 09:05:45 -0000 1.1 +++ sources 30 May 2006 09:06:57 -0000 1.2 @@ -0,0 +1 @@ +fedb001d73ad80d90ecb850dab19a709 kerry-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 09:29:53 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:29:53 -0700 Subject: rpms/knemo - New directory Message-ID: <200605300929.k4U9TtRs004799@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4771/knemo Log Message: Directory /cvs/extras/rpms/knemo added to the repository From fedora-extras-commits at redhat.com Tue May 30 09:29:54 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:29:54 -0700 Subject: rpms/knemo/devel - New directory Message-ID: <200605300930.k4U9TuSG004802@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4771/knemo/devel Log Message: Directory /cvs/extras/rpms/knemo/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 09:30:21 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:30:21 -0700 Subject: rpms/knemo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605300930.k4U9UN1r004858@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4821/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module knemo --- NEW 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 May 30 09:30:21 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:30:21 -0700 Subject: rpms/knemo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605300930.k4U9UNwN004855@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4821 Added Files: Makefile import.log Log Message: Setup of module knemo --- NEW FILE Makefile --- # Top level Makefile for module knemo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 09:31:45 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:31:45 -0700 Subject: rpms/knemo import.log,1.1,1.2 Message-ID: <200605300931.k4U9VlMn004929@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4895 Modified Files: import.log Log Message: auto-import knemo-0.4.0-4 on branch devel from knemo-0.4.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/knemo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 09:30:20 -0000 1.1 +++ import.log 30 May 2006 09:31:45 -0000 1.2 @@ -0,0 +1 @@ +knemo-0_4_0-4:HEAD:knemo-0.4.0-4.src.rpm:1148981945 From fedora-extras-commits at redhat.com Tue May 30 09:31:46 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 02:31:46 -0700 Subject: rpms/knemo/devel knemo-desktop-file-fix.patch, NONE, 1.1 knemo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605300931.k4U9VmAw004936@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/rpms/knemo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4895/devel Modified Files: .cvsignore sources Added Files: knemo-desktop-file-fix.patch knemo.spec Log Message: auto-import knemo-0.4.0-4 on branch devel from knemo-0.4.0-4.src.rpm knemo-desktop-file-fix.patch: --- NEW FILE knemo-desktop-file-fix.patch --- --- src/kcm/kcm_knemo.desktop.orig 2006-05-20 16:23:00.000000000 -0300 +++ src/kcm/kcm_knemo.desktop 2006-05-20 16:23:47.000000000 -0300 @@ -61,16 +61,4 @@ Comment[xx]=xxMonitor network interfacesxx Comment[zh_CN]=?????????????????? -Keywords=knemo,network monitor,wlan monitor,wifi monitor,ethernet monitor,wireless monitor,systray -Keywords[da]=knemo,netv??rksoverv??gning,WLAN-overv??gning,WIFI-overv??gning,Ethernet-overv??gning,tr??dl??s overv??gning,statusfelt -Keywords[el]=knemo,?????????????? ??????????????,?????????????? wlan,?????????????? wifi,?????????????? ethernet, ?????????????? wireless,?????????????? ???????????????????? -Keywords[es]=knemo,monitor de red,monitor de wlan,monitor wifi,monitor de ethernet,monitor inal??mbrico,bandeja del sistema -Keywords[et]=knemo,v??rgumonitor,wlan monitor,wifi monitor,ethernet monitor,traadita v??rgu monitor,s??steemne salv -Keywords[it]=knemo,monitor di rete,wlan monitor,monitor senza fili,ethernet monitor,vassoio di sistema -Keywords[nl]=knemo,netwerkmonitor,wlan-monitor,wifi-monitor,ethernetmonitor,wireless-monitor,systeemvak -Keywords[pt]=knemo,monitor da rede,monitor de wlan,monitor wifi,monitor de ethernet,monitor sem-fios,bandeja do sistema -Keywords[pt_BR]=knemo,monitor da rede,monitor de wlan,monitor wifi,monitor de ethernet,monitor sem-fios,bandeja do sistema -Keywords[sv]=knemo,n??tverks??vervakning,WLAN-??vervakning,WIFI-??vervakning,Ethernet-??vervakning,tr??dl??s ??vervakning,systembricka -Keywords[xx]=xxknemo,network monitor,wlan monitor,wifi monitor,ethernet monitor,wireless monitor,systrayxx - -Categories=Qt;KDE;X-KDE-settings-network +Categories=Qt;KDE;X-KDE-settings-network; --- NEW FILE knemo.spec --- Name: knemo Version: 0.4.0 Release: 4%{?dist} Summary: A KDE network monitoring tool Group: Applications/Internet License: GPL URL: http://extragear.kde.org/apps/knemo/ Source0: http://www.eris23.de/knemo/%{name}-%{version}.tar.bz2 Patch0: knemo-desktop-file-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, qt-devel, kdelibs-devel, desktop-file-utils BuildRequires: wireless-tools net-tools Requires: kdebase %description KNemo displays for every network interface an icon in the systray. Tooltips and an info dialog provide further information about the interface. Passive popups inform about interface changes. A traffic plotter is also integrated. It polls the network interface status every second using the ifconfig, route and iwconfig tools. %prep %setup -q %patch0 -p0 %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure --disable-rpath --disable-debug make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT #rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la desktop-file-install --vendor="" \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \ --add-category X-Fedora \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kcm_knemo.desktop desktop-file-install --vendor="" \ --dir ${RPM_BUILD_ROOT}%{_datadir}/services/kded \ --add-category X-Fedora \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/services/kded/knemod.desktop %find_lang kcm_knemo kcm_knemo.lang %find_lang knemod knemod.lang cat kcm_knemo.lang knemod.lang > knemo.lang %post touch --no-create %{_datadir}/icons/crystalsvg || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : fi %postun touch --no-create %{_datadir}/icons/crystalsvg || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : fi %clean rm -rf $RPM_BUILD_ROOT # *.la files are usually not necessary (as Extras Guidelines say) and should not # be packaged. But KDE and KControl needs it to work, so we'll make an exception # here %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/kde3/*.so %{_libdir}/kde3/*.la %{_datadir}/applications/kde/kcm_knemo.desktop %{_datadir}/services/kded/knemod.desktop %{_datadir}/apps/knemo %{_datadir}/icons/crystalsvg/16x16/apps/knemo.png %{_datadir}/icons/crystalsvg/22x22/actions/*.png %{_datadir}/icons/crystalsvg/32x32/apps/knemo.png %changelog * Tue May 30 2006 Hugo Cisneiros 0.4.0-4 - Created BuildRequires for the ifconfig and iwconfig commands, as knemo utilizes it for monitoring. - Removed addition of categories in desktop-file-install command * Thu May 25 2006 Hugo Cisneiros 0.4.0-3 - Removed vendor option from desktop-file-install (no renaming) * Sat May 20 2006 Hugo Cisneiros 0.4.0-2 - Installed .desktop files now use desktop-file-install * Sat May 20 2006 Hugo Cisneiros 0.4.0-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/knemo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 09:30:21 -0000 1.1 +++ .cvsignore 30 May 2006 09:31:45 -0000 1.2 @@ -0,0 +1 @@ +knemo-0.4.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/knemo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 09:30:21 -0000 1.1 +++ sources 30 May 2006 09:31:45 -0000 1.2 @@ -0,0 +1 @@ +a849c490844f33206027d8780bc2d218 knemo-0.4.0.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 09:36:29 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:36:29 -0700 Subject: rpms/gtkwave/devel gtkwave.spec,1.13,1.14 Message-ID: <200605300936.k4U9aVFW005042@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5025 Modified Files: gtkwave.spec Log Message: update to 3.0.3 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gtkwave.spec 28 May 2006 10:50:37 -0000 1.13 +++ gtkwave.spec 30 May 2006 09:36:28 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.2 -Release: 2%{?dist} +Version: 3.0.3 +Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ @@ -81,6 +81,9 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 30 2006 Paul Howarth 3.0.3-1 +- update to 3.0.3 + * Sun May 28 2006 Paul Howarth 3.0.2-2 - adding missing buildreq flex From fedora-extras-commits at redhat.com Tue May 30 09:36:47 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:36:47 -0700 Subject: rpms/gtkwave/devel .cvsignore,1.12,1.13 sources,1.12,1.13 Message-ID: <200605300936.k4U9anRh005067@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5048 Modified Files: .cvsignore sources Log Message: update to 3.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 May 2006 09:12:33 -0000 1.12 +++ .cvsignore 30 May 2006 09:36:47 -0000 1.13 @@ -1 +1 @@ -gtkwave-3.0.2.tgz +gtkwave-3.0.3.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 May 2006 09:12:33 -0000 1.12 +++ sources 30 May 2006 09:36:47 -0000 1.13 @@ -1 +1 @@ -2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz +4f9a61bbec20c307ce6f874313b05b69 gtkwave-3.0.3.tgz From fedora-extras-commits at redhat.com Tue May 30 09:38:33 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:38:33 -0700 Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.12, 1.13 sources, 1.12, 1.13 .cvsignore, 1.12, 1.13 Message-ID: <200605300938.k4U9cZcc005142@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5121 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gtkwave.spec 10 May 2006 09:13:45 -0000 1.12 +++ gtkwave.spec 30 May 2006 09:38:33 -0000 1.13 @@ -1,13 +1,13 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -81,6 +81,12 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 30 2006 Paul Howarth 3.0.3-1 +- update to 3.0.3 + +* Sun May 28 2006 Paul Howarth 3.0.2-2 +- adding missing buildreq flex + * Wed May 10 2006 Paul Howarth 3.0.2-1 - update to 3.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 May 2006 09:13:45 -0000 1.12 +++ sources 30 May 2006 09:38:33 -0000 1.13 @@ -1 +1 @@ -2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz +4f9a61bbec20c307ce6f874313b05b69 gtkwave-3.0.3.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 May 2006 09:13:45 -0000 1.12 +++ .cvsignore 30 May 2006 09:38:33 -0000 1.13 @@ -1 +1 @@ -gtkwave-3.0.2.tgz +gtkwave-3.0.3.tgz From fedora-extras-commits at redhat.com Tue May 30 09:39:36 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:39:36 -0700 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.11, 1.12 sources, 1.12, 1.13 .cvsignore, 1.12, 1.13 Message-ID: <200605300939.k4U9dcYJ005214@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5193 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtkwave.spec 10 May 2006 09:14:54 -0000 1.11 +++ gtkwave.spec 30 May 2006 09:39:35 -0000 1.12 @@ -1,13 +1,13 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -81,6 +81,12 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 30 2006 Paul Howarth 3.0.3-1 +- update to 3.0.3 + +* Sun May 28 2006 Paul Howarth 3.0.2-2 +- adding missing buildreq flex + * Wed May 10 2006 Paul Howarth 3.0.2-1 - update to 3.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 10 May 2006 09:14:54 -0000 1.12 +++ sources 30 May 2006 09:39:35 -0000 1.13 @@ -1 +1 @@ -2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz +4f9a61bbec20c307ce6f874313b05b69 gtkwave-3.0.3.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 May 2006 09:14:54 -0000 1.12 +++ .cvsignore 30 May 2006 09:39:35 -0000 1.13 @@ -1 +1 @@ -gtkwave-3.0.2.tgz +gtkwave-3.0.3.tgz From fedora-extras-commits at redhat.com Tue May 30 09:40:34 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 30 May 2006 02:40:34 -0700 Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.10, 1.11 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Message-ID: <200605300940.k4U9eav9005287@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5264 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtkwave.spec 10 May 2006 09:16:03 -0000 1.10 +++ gtkwave.spec 30 May 2006 09:40:34 -0000 1.11 @@ -1,13 +1,13 @@ Summary: Waveform Viewer Name: gtkwave -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering URL: http://home.nc.rr.com/gtkwave/ Source0: http://www.ibiblio.org/pub/Linux/Incoming/gtkwave-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf +BuildRequires: gtk2-devel, bzip2-devel, zlib-devel, gperf, flex %description GTKWave is a waveform viewer that can view VCD files produced by most Verilog @@ -81,6 +81,12 @@ %{_mandir}/man5/gtkwaverc.5* %changelog +* Tue May 30 2006 Paul Howarth 3.0.3-1 +- update to 3.0.3 + +* Sun May 28 2006 Paul Howarth 3.0.2-2 +- adding missing buildreq flex + * Wed May 10 2006 Paul Howarth 3.0.2-1 - update to 3.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 10 May 2006 09:16:03 -0000 1.11 +++ sources 30 May 2006 09:40:34 -0000 1.12 @@ -1 +1 @@ -2d65cf58d463f3f79ddefb3b01f69f83 gtkwave-3.0.2.tgz +4f9a61bbec20c307ce6f874313b05b69 gtkwave-3.0.3.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 10 May 2006 09:16:03 -0000 1.11 +++ .cvsignore 30 May 2006 09:40:34 -0000 1.12 @@ -1 +1 @@ -gtkwave-3.0.2.tgz +gtkwave-3.0.3.tgz From fedora-extras-commits at redhat.com Tue May 30 10:14:48 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 30 May 2006 03:14:48 -0700 Subject: rpms/sylpheed/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 sylpheed.spec, 1.29, 1.30 Message-ID: <200605301014.k4UAEoP3007784@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7763 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Tue May 30 2006 Michael Schwendt - 2.2.5-1 - Update to 2.2.5 (includes more "bold" fixes, too). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 31 Mar 2006 01:33:31 -0000 1.17 +++ .cvsignore 30 May 2006 10:14:48 -0000 1.18 @@ -1,2 +1 @@ -sylpheed-2.2.4.tar.bz2.asc -sylpheed-2.2.4.tar.bz2 +sylpheed-2.2.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 31 Mar 2006 01:33:31 -0000 1.17 +++ sources 30 May 2006 10:14:48 -0000 1.18 @@ -1,2 +1 @@ -6f60a04132f85161f8b3e44af2b63a98 sylpheed-2.2.4.tar.bz2.asc -4e5608e63d4ea413bf4a0fa3abb4223f sylpheed-2.2.4.tar.bz2 +6e20522180ba0346d3f85de160076560 sylpheed-2.2.5.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sylpheed.spec 31 Mar 2006 01:33:31 -0000 1.29 +++ sylpheed.spec 30 May 2006 10:14:48 -0000 1.30 @@ -4,7 +4,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.2.4 +Version: 2.2.5 Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ @@ -82,6 +82,9 @@ %{_mandir}/man1/* %changelog +* Tue May 30 2006 Michael Schwendt - 2.2.5-1 +- Update to 2.2.5 (includes more "bold" fixes, too). + * Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 - Update to 2.2.4. From fedora-extras-commits at redhat.com Tue May 30 10:15:57 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 30 May 2006 03:15:57 -0700 Subject: rpms/sylpheed/FC-5 sylpheed-2.2.3-defs.h.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 sylpheed.spec, 1.27, 1.28 sylpheed-default-browser.patch, 1.1, NONE Message-ID: <200605301015.k4UAFxNx007860@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7836 Modified Files: .cvsignore sources sylpheed.spec Added Files: sylpheed-2.2.3-defs.h.patch Removed Files: sylpheed-default-browser.patch Log Message: * Tue May 30 2006 Michael Schwendt - 2.2.5-1 - Update to 2.2.5 (includes more "bold" fixes, too). * Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 - Update to 2.2.4. * Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 - Update to 2.2.3. - Update external commands (defs.h) patch. * Sat Feb 18 2006 Michael Schwendt - 2.2.0-1 - Update to 2.2.0 (new stable series). - BR gtkspell-devel. sylpheed-2.2.3-defs.h.patch: --- NEW FILE sylpheed-2.2.3-defs.h.patch --- diff -Nur sylpheed-2.2.3-orig/libsylph/defs.h sylpheed-2.2.3/libsylph/defs.h --- sylpheed-2.2.3-orig/libsylph/defs.h 2006-01-10 09:18:15.000000000 +0100 +++ sylpheed-2.2.3/libsylph/defs.h 2006-03-19 22:45:40.000000000 +0100 @@ -87,12 +87,12 @@ #else # define DEFAULT_SIGNATURE ".signature" #endif -#define DEFAULT_INC_PATH "/usr/bin/mh/inc" +#define DEFAULT_INC_PATH "/usr/bin/inc" #define DEFAULT_INC_PROGRAM "inc" /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ /* #define DEFAULT_INC_PROGRAM "imget" */ #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i" -#define DEFAULT_BROWSER_CMD "mozilla-firefox -remote 'openURL(%s,new-window)'" +#define DEFAULT_BROWSER_CMD "gnome-open '%s'" #ifdef _PATH_MAILDIR # define DEFAULT_SPOOL_PATH _PATH_MAILDIR Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 11 Nov 2005 11:03:34 -0000 1.15 +++ .cvsignore 30 May 2006 10:15:57 -0000 1.16 @@ -1,2 +1 @@ -sylpheed-2.0.4.tar.bz2.asc -sylpheed-2.0.4.tar.bz2 +sylpheed-2.2.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Nov 2005 11:03:35 -0000 1.15 +++ sources 30 May 2006 10:15:57 -0000 1.16 @@ -1,2 +1 @@ -f4dc5a59840a59d92d432e297f7b5106 sylpheed-2.0.4.tar.bz2.asc -c9f1c4cf2b3933ebbb58519ba3b77887 sylpheed-2.0.4.tar.bz2 +6e20522180ba0346d3f85de160076560 sylpheed-2.2.5.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/sylpheed.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sylpheed.spec 15 Feb 2006 02:16:00 -0000 1.27 +++ sylpheed.spec 30 May 2006 10:15:57 -0000 1.28 @@ -4,8 +4,8 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.0.4 -Release: 2%{?dist} +Version: 2.2.5 +Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,11 +16,12 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 +BuildRequires: gtkspell-devel +Source0: http://sylpheed.good-day.net/sylpheed/v2.2/%{name}-%{version}.tar.bz2 Source1: sylpheed.1 -Patch2: sylpheed-default-browser.patch -Patch3: sylpheed-1.9.10-desktop.patch +Patch1: sylpheed-2.2.3-defs.h.patch +Patch2: sylpheed-1.9.10-desktop.patch %description This program is an X based fast email client which has features @@ -39,8 +40,8 @@ %prep %setup -q -%patch2 -p1 -b .default-browser -%patch3 -p1 -b .desktop +%patch1 -p1 -b .defs.h +%patch2 -p1 -b .desktop %build %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \ @@ -75,12 +76,26 @@ %doc COPYING ChangeLog README INSTALL TODO %doc ChangeLog.ja README.ja INSTALL.ja TODO.ja %{_bindir}/sylpheed -%{_datadir}/sylpheed +%{_datadir}/sylpheed/ %{_datadir}/applications/* %{_datadir}/pixmaps/* -%{_mandir}/man1 +%{_mandir}/man1/* %changelog +* Tue May 30 2006 Michael Schwendt - 2.2.5-1 +- Update to 2.2.5 (includes more "bold" fixes, too). + +* Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 +- Update to 2.2.4. + +* Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 +- Update to 2.2.3. +- Update external commands (defs.h) patch. + +* Sat Feb 18 2006 Michael Schwendt - 2.2.0-1 +- Update to 2.2.0 (new stable series). +- BR gtkspell-devel. + * Wed Feb 15 2006 Michael Schwendt - 2.0.4-2 - rebuilt for FC5 --- sylpheed-default-browser.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 11:55:40 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Tue, 30 May 2006 04:55:40 -0700 Subject: rpms/mail-notification/devel mail-notification-evolution.patch, 1.2, 1.3 mail-notification.spec, 1.18, 1.19 Message-ID: <200605301155.k4UBtgGR023068@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23038 Modified Files: mail-notification-evolution.patch mail-notification.spec Log Message: - fixed for evolution 2.7 mail-notification-evolution.patch: Index: mail-notification-evolution.patch =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-evolution.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mail-notification-evolution.patch 17 Jan 2006 18:07:25 -0000 1.2 +++ mail-notification-evolution.patch 30 May 2006 11:55:40 -0000 1.3 @@ -17,13 +17,13 @@ elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 -+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 -+ ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ++ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.8 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 ++ ($PKG_CONFIG --exists "evolution-plugin-2.8 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` -+ pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null` ++ pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.8 $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -33,13 +33,13 @@ elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 -+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 -+ ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ++ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.8 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 ++ ($PKG_CONFIG --exists "evolution-plugin-2.8 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` -+ pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null` ++ pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.8 $evolution_plugin_min_version" 2>/dev/null` else pkg_failed=yes fi @@ -48,7 +48,7 @@ if test $pkg_failed = yes; then - EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"` -+ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.6 $evolution_plugin_min_version"` ++ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.8 $evolution_plugin_min_version"` # Put the nasty error message in config.log where it belongs echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5 @@ -57,7 +57,7 @@ echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5 echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6 - evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null` -+ evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.6 2>/dev/null` ++ evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.8 2>/dev/null` if test -n "$evolution_plugindir"; then echo "$as_me:$LINENO: result: $evolution_plugindir" >&5 echo "${ECHO_T}$evolution_plugindir" >&6 Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mail-notification.spec 28 Apr 2006 14:17:37 -0000 1.18 +++ mail-notification.spec 30 May 2006 11:55:40 -0000 1.19 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -26,7 +26,7 @@ BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libicu-devel >= 2.6 BuildRequires: gob2 -BuildRequires: evolution-devel >= 2.5 +BuildRequires: evolution-devel >= 2.7 BuildRequires: evolution-data-server-devel >= 1.5 @@ -52,7 +52,7 @@ %build export LDFLAGS="-Wl,--export-dynamic" -%configure --disable-schemas-install --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.6 +%configure --disable-schemas-install --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.8 make %{?_smp_mflags} @@ -113,13 +113,16 @@ %{_datadir}/applications/fedora-mail-notification.desktop %{_datadir}/applications/fedora-mail-notification-properties.desktop %{_datadir}/gnome/help/mail-notification/ -%{_libdir}/evolution/2.6/plugins/* +%{_libdir}/evolution/2.8/plugins/* %dir %{_datadir}/omf/mail-notification/ %{_datadir}/omf/mail-notification/mail-notification-C.omf %{_datadir}/pixmaps/mail-notification.png %changelog +* Tue May 30 2006 Radek Vokal 2.0-13 +- fixed for evolution 2.7 + * Thu Apr 27 2006 Paul Clifford 2.0-12 - Added patch for IMAP authentication problem from project homepage (#190137) From fedora-extras-commits at redhat.com Tue May 30 13:31:24 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 06:31:24 -0700 Subject: rpms/koffice/FC-5 koffice.spec,1.38,1.39 Message-ID: <200605301331.k4UDVQvr029959@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29942 Modified Files: koffice.spec Log Message: - hm seems like the buildsys does not look for x-raw.desktop Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- koffice.spec 30 May 2006 07:44:31 -0000 1.38 +++ koffice.spec 30 May 2006 13:31:23 -0000 1.39 @@ -533,7 +533,6 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -921,7 +920,6 @@ - add kexi forms patch - add kexi checkbox patch - version upgrade -- exclude x-raw.desktop again * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 From fedora-extras-commits at redhat.com Tue May 30 13:47:45 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 06:47:45 -0700 Subject: rpms/libqalculate/devel libqalculate.spec,1.8,1.9 Message-ID: <200605301347.k4UDllfC030107@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/libqalculate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30090 Modified Files: libqalculate.spec Log Message: * Tue Apr 30 2006 Deji Akingunola - 0.9.3-2 - More BRs from Paul Howarth (#193481) Index: libqalculate.spec =================================================================== RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libqalculate.spec 30 Mar 2006 19:59:49 -0000 1.8 +++ libqalculate.spec 30 May 2006 13:47:45 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Multi-purpose calculator library Name: libqalculate Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://qalculate.sourceforge.net/ @@ -10,6 +10,7 @@ BuildRequires: glib2-devel, cln-devel BuildRequires: libxml2-devel >= 2.3.8 BuildRequires: readline-devel, ncurses-devel +BuildRequires: perl(XML::Parser), gettext %description This library underpins the Qalculate! multi-purpose desktop calculator for @@ -73,6 +74,9 @@ %{_bindir}/qalc %changelog +* Tue Apr 30 2006 Deji Akingunola - 0.9.3-2 +- More BRs from Paul Howarth (#193481) + * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version From fedora-extras-commits at redhat.com Tue May 30 14:04:12 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 07:04:12 -0700 Subject: rpms/nautilus-actions/devel nautilus-actions.spec,1.5,1.6 Message-ID: <200605301404.k4UE4EM1032541@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/nautilus-actions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32524 Modified Files: nautilus-actions.spec Log Message: * Tue May 30 2006 Deji Akingunola - 1.2-2 - Add gettext and perl(XML::Parser) to BRs Index: nautilus-actions.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-actions/devel/nautilus-actions.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nautilus-actions.spec 1 May 2006 16:27:37 -0000 1.5 +++ nautilus-actions.spec 30 May 2006 14:04:12 -0000 1.6 @@ -1,14 +1,14 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: User Interface/Desktops License: GPL URL: http://www.grumz.net/node/8 Source0: http://www.grumz.net/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel, libglade2-devel, nautilus -BuildRequires: e2fsprogs-devel +BuildRequires: e2fsprogs-devel, gettext, perl(XML::Parser) BuildRequires: desktop-file-utils Requires(pre): GConf2 Requires(preun): GConf2 @@ -91,6 +91,9 @@ %{_datadir}/applications/fedora-nact.desktop %changelog +* Tue May 30 2006 Deji Akingunola - 1.2-2 +- Add gettext and perl(XML::Parser) to BRs + * Mon May 01 2006 Deji Akingunola - 1.2-1 - Update to version 1.2 - Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors From fedora-extras-commits at redhat.com Tue May 30 14:50:52 2006 From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch)) Date: Tue, 30 May 2006 07:50:52 -0700 Subject: owners owners.list,1.1075,1.1076 Message-ID: <200605301450.k4UEosNx000352@cvs-int.fedora.redhat.com> Author: eitch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv335 Modified Files: owners.list Log Message: added kerry and knemo packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1075 retrieving revision 1.1076 diff -u -r1.1075 -r1.1076 --- owners.list 30 May 2006 08:37:12 -0000 1.1075 +++ owners.list 30 May 2006 14:50:52 -0000 1.1076 @@ -578,6 +578,7 @@ Fedora Extras|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|kerry|Kerry Beagle is a KDE frontend for the Beagle desktop search|hugo at devin.com.br|extras-qa at fedoraproject.org| Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org| Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org| @@ -587,6 +588,7 @@ Fedora Extras|kipi-plugins|Plugins to use with Kipi|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kismet|WLAN detector, sniffer and IDS|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|kmymoney2|Personal finance|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|knemo|A KDE network monitoring tool|hugo at devin.com.br|extras-qa at fedoraproject.org| Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue May 30 15:17:36 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 08:17:36 -0700 Subject: rpms/Coin2/devel .cvsignore, 1.8, 1.9 Coin2.spec, 1.29, 1.30 sources, 1.8, 1.9 Message-ID: <200605301517.k4UFHcLR002861@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2834 Modified Files: .cvsignore Coin2.spec sources Log Message: * Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 - Upstream update. - Drop gcc-4.1 patch. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Sep 2005 03:10:21 -0000 1.8 +++ .cvsignore 30 May 2006 15:17:36 -0000 1.9 @@ -1 +1 @@ -Coin-2.4.4.tar.gz +Coin-2.4.5.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Coin2.spec 22 Feb 2006 16:23:33 -0000 1.29 +++ Coin2.spec 30 May 2006 15:17:36 -0000 1.30 @@ -12,8 +12,8 @@ Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.4 -Release: 10%{?dist} +Version: 2.4.5 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -23,7 +23,6 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: Coin-2.4.4-gcc-4.1.diff Patch5: coin-2.3.0-man3.diff BuildRequires: libGLU-devel @@ -60,7 +59,6 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch5 -p1 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ @@ -119,6 +117,11 @@ %doc %{coin_htmldir} %changelog +* Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 +- Upstream update. +- Drop gcc-4.1 patch. +- Spec file cleanup. + * Wed Feb 22 2006 Ralf Cors??pius - 2.4.4-10 - Rename man3 manpages to .3sim (PR 182212). @@ -154,38 +157,3 @@ * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. - -* Tue May 10 2005 Ralf Corsepius - 0:2.3.0-9 -- Introduce %%{coin_includedir} %%{coin_htmldir}. -- Misc. spec cleanup. - -* Fri May 06 2005 Ralf Corsepius - 0:2.3.0-8 -- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead - SONAME handling. - -* Tue May 03 2005 Ralf Corsepius - 0:2.3.0-7 -- Minor spec changes. - -* Tue Feb 22 2005 Ralf Corsepius - 0:2.3.0-5 -- Include simacros. -- Regenerate configure from simacros and FC3 libtool for x86_64. -- Don't install bogusly generated manpages for dirs. - -* Sun Jul 4 2004 Ralf Corsepius - 0:2.3.0-0.fdr.4 -- Let Coin-devel Require: bzip2-devel, zlib-devel. -- Use @XX@ patterns in soname sed calls. -- Remove Mesa from BuildRequires. - -* Sat Jul 3 2004 Ralf Corsepius - 0:2.3.0-0.fdr.3 -- Disable run-time linkage for GLU, bzip2, zlib. -- Add SONAME-hacks to simage, openal, freetype. -- Enable static libs. - -* Fri Jun 25 2004 Ralf Corsepius - 0:2.3.0-0.fdr.2 -- Fix package description. -- Initial submission to Fedora Extra. - -* Thu Jun 24 2004 Ralf Corsepius - 0:2.3.0-0.fdr.1 -- Update to 2.3.0 -- Install html docs to default installation dir (%%{_datadir}/html). -- Remove dependency to simage. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Sep 2005 03:10:21 -0000 1.8 +++ sources 30 May 2006 15:17:36 -0000 1.9 @@ -1 +1 @@ -7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz +99b83c5189c3755fd5f08fcad0994a7b Coin-2.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 30 15:18:15 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 08:18:15 -0700 Subject: rpms/Coin2/devel Coin-2.4.4-gcc-4.1.diff,1.1,NONE Message-ID: <200605301518.k4UFIHAs002934@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2915 Removed Files: Coin-2.4.4-gcc-4.1.diff Log Message: Remove --- Coin-2.4.4-gcc-4.1.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 15:53:07 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 08:53:07 -0700 Subject: rpms/Coin2/FC-5 .cvsignore, 1.8, 1.9 Coin2.spec, 1.29, 1.30 sources, 1.8, 1.9 Message-ID: <200605301553.k4UFr92F003284@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3257 Modified Files: .cvsignore Coin2.spec sources Log Message: * Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 - Upstream update. - Drop gcc-4.1 patch. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Sep 2005 03:10:21 -0000 1.8 +++ .cvsignore 30 May 2006 15:53:07 -0000 1.9 @@ -1 +1 @@ -Coin-2.4.4.tar.gz +Coin-2.4.5.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-5/Coin2.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Coin2.spec 22 Feb 2006 16:23:33 -0000 1.29 +++ Coin2.spec 30 May 2006 15:53:07 -0000 1.30 @@ -12,8 +12,8 @@ Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.4 -Release: 10%{?dist} +Version: 2.4.5 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -23,7 +23,6 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: Coin-2.4.4-gcc-4.1.diff Patch5: coin-2.3.0-man3.diff BuildRequires: libGLU-devel @@ -60,7 +59,6 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch5 -p1 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ @@ -119,6 +117,11 @@ %doc %{coin_htmldir} %changelog +* Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 +- Upstream update. +- Drop gcc-4.1 patch. +- Spec file cleanup. + * Wed Feb 22 2006 Ralf Cors??pius - 2.4.4-10 - Rename man3 manpages to .3sim (PR 182212). @@ -154,38 +157,3 @@ * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. - -* Tue May 10 2005 Ralf Corsepius - 0:2.3.0-9 -- Introduce %%{coin_includedir} %%{coin_htmldir}. -- Misc. spec cleanup. - -* Fri May 06 2005 Ralf Corsepius - 0:2.3.0-8 -- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead - SONAME handling. - -* Tue May 03 2005 Ralf Corsepius - 0:2.3.0-7 -- Minor spec changes. - -* Tue Feb 22 2005 Ralf Corsepius - 0:2.3.0-5 -- Include simacros. -- Regenerate configure from simacros and FC3 libtool for x86_64. -- Don't install bogusly generated manpages for dirs. - -* Sun Jul 4 2004 Ralf Corsepius - 0:2.3.0-0.fdr.4 -- Let Coin-devel Require: bzip2-devel, zlib-devel. -- Use @XX@ patterns in soname sed calls. -- Remove Mesa from BuildRequires. - -* Sat Jul 3 2004 Ralf Corsepius - 0:2.3.0-0.fdr.3 -- Disable run-time linkage for GLU, bzip2, zlib. -- Add SONAME-hacks to simage, openal, freetype. -- Enable static libs. - -* Fri Jun 25 2004 Ralf Corsepius - 0:2.3.0-0.fdr.2 -- Fix package description. -- Initial submission to Fedora Extra. - -* Thu Jun 24 2004 Ralf Corsepius - 0:2.3.0-0.fdr.1 -- Update to 2.3.0 -- Install html docs to default installation dir (%%{_datadir}/html). -- Remove dependency to simage. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Sep 2005 03:10:21 -0000 1.8 +++ sources 30 May 2006 15:53:07 -0000 1.9 @@ -1 +1 @@ -7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz +99b83c5189c3755fd5f08fcad0994a7b Coin-2.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 30 15:54:02 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 08:54:02 -0700 Subject: rpms/Coin2/FC-5 Coin-2.4.4-gcc-4.1.diff,1.1,NONE Message-ID: <200605301554.k4UFs4wx003314@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3299 Removed Files: Coin-2.4.4-gcc-4.1.diff Log Message: Remove. --- Coin-2.4.4-gcc-4.1.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 16:07:32 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 30 May 2006 09:07:32 -0700 Subject: fedora-security/audit fe4,1.33,1.34 fe5,1.33,1.34 Message-ID: <200605301607.k4UG7W6g005757@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5737 Modified Files: fe4 fe5 Log Message: CVE-2006-0847 version (python-cherrypy, fixed 2.1.1) Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- fe4 24 May 2006 23:25:02 -0000 1.33 +++ fe4 30 May 2006 16:07:30 -0000 1.34 @@ -56,6 +56,7 @@ CVE-2006-1079 VULNERABLE (thttpd) bz#191095 CVE-2006-1078 VULNERABLE (thttpd) bz#191095 CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7) +CVE-2006-0847 version (python-cherrypy, fixed 2.1.1) CVE-2006-0841 VULNERABLE (mantis) bz#191089 CVE-2006-0840 VULNERABLE (mantis) bz#191089 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- fe5 24 May 2006 23:25:02 -0000 1.33 +++ fe5 30 May 2006 16:07:30 -0000 1.34 @@ -60,6 +60,7 @@ CVE-2006-1079 VULNERABLE (thttpd) bz#191095 CVE-2006-1078 VULNERABLE (thttpd) bz#191095 CVE-2006-0855 patch (zoo, patched in OpenSUSE "upstream", fixed 2.10-7) +CVE-2006-0847 version (python-cherrypy, fixed 2.1.1) CVE-2006-0841 version (mantis, fixed 1.0.1) CVE-2006-0840 version (mantis, fixed 1.0.1) CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297 From fedora-extras-commits at redhat.com Tue May 30 16:13:52 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 09:13:52 -0700 Subject: rpms/koffice/devel koffice.spec,1.37,1.38 Message-ID: <200605301613.k4UGDsFm005787@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5770 Modified Files: koffice.spec Log Message: - don't need exclude on buildsys Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- koffice.spec 30 May 2006 07:44:32 -0000 1.37 +++ koffice.spec 30 May 2006 16:13:52 -0000 1.38 @@ -533,7 +533,6 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -921,7 +920,6 @@ - add kexi forms patch - add kexi checkbox patch - version upgrade -- exclude x-raw.desktop again * Fri Apr 14 2006 Andreas Bierfert 1.5.0-1 From fedora-extras-commits at redhat.com Tue May 30 16:16:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 09:16:30 -0700 Subject: rpms/koffice/FC-4 koffice.spec,1.15,1.16 Message-ID: <200605301616.k4UGGWcU005872@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5855 Modified Files: koffice.spec Log Message: - don't need exclude on buildsys Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- koffice.spec 30 May 2006 07:44:31 -0000 1.15 +++ koffice.spec 30 May 2006 16:16:30 -0000 1.16 @@ -532,7 +532,6 @@ %{_datadir}/apps/kross %{_libdir}/kde3/krosspython.* %{_libdir}/kde3/krossruby.* -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* From fedora-extras-commits at redhat.com Tue May 30 17:28:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:28:52 -0700 Subject: rpms/dbus-qt - New directory Message-ID: <200605301728.k4UHSs2W008679@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8653/dbus-qt Log Message: Directory /cvs/extras/rpms/dbus-qt added to the repository From fedora-extras-commits at redhat.com Tue May 30 17:28:53 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:28:53 -0700 Subject: rpms/dbus-qt/devel - New directory Message-ID: <200605301729.k4UHSt2Q008682@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8653/dbus-qt/devel Log Message: Directory /cvs/extras/rpms/dbus-qt/devel added to the repository From fedora-extras-commits at redhat.com Tue May 30 17:29:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:29:06 -0700 Subject: rpms/dbus-qt Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605301729.k4UHT8qw008731@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8698 Added Files: Makefile import.log Log Message: Setup of module dbus-qt --- NEW FILE Makefile --- # Top level Makefile for module dbus-qt all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 30 17:29:07 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:29:07 -0700 Subject: rpms/dbus-qt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605301729.k4UHT9rr008734@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8698/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dbus-qt --- NEW 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 May 30 17:29:31 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:29:31 -0700 Subject: rpms/dbus-qt import.log,1.1,1.2 Message-ID: <200605301729.k4UHTXkI008795@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8762 Modified Files: import.log Log Message: auto-import dbus-qt-0.61-3 on branch devel from dbus-qt-0.61-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 May 2006 17:29:06 -0000 1.1 +++ import.log 30 May 2006 17:29:31 -0000 1.2 @@ -0,0 +1 @@ +dbus-qt-0_61-3:HEAD:dbus-qt-0.61-3.src.rpm:1149010167 From fedora-extras-commits at redhat.com Tue May 30 17:29:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:29:32 -0700 Subject: rpms/dbus-qt/devel dbus-qt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605301729.k4UHTY7i008802@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8762/devel Modified Files: .cvsignore sources Added Files: dbus-qt.spec Log Message: auto-import dbus-qt-0.61-3 on branch devel from dbus-qt-0.61-3.src.rpm --- NEW FILE dbus-qt.spec --- # For FC-5 -- Rex Summary: Qt-based library for using D-BUS Name: dbus-qt Version: 0.61 Release: 3%{?dist} License: AFL/GPL URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/dbus-%{version}.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel BuildRequires: libxml2-devel Provides: dbus-qt3 = %{version}-%{release} Requires: dbus = %{version} %description D-BUS add-on library to integrate the standard D-BUS library with the Qt3 thread abstraction and main loop. %package devel Summary: Libraries and headers for D-BUS Group: Development/Libraries Provides: dbus-qt3-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: dbus-devel Requires: qt-devel %description devel %{summary}. %prep %setup -q -n dbus-%{version} %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-tests --disable-verbose-mode --disable-asserts \ --disable-static \ --enable-qt3 \ --disable-qt \ --disable-libaudit --enable-selinux=no \ --disable-glib --disable-gtk make %{?_smp_mflags} -C dbus make %{?_smp_mflags} -C qt3 %install rm -rf $RPM_BUILD_ROOT make -C dbus install DESTDIR=$RPM_BUILD_ROOT make -C qt3 install DESTDIR=$RPM_BUILD_ROOT make -C dbus uninstall DESTDIR=$RPM_BUILD_ROOT # Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/libdbus-qt-*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/dbus-1.0/dbus/* %{_libdir}/libdbus-qt-*.so %changelog * Tue May 30 2006 Rex Dieter 0.61-3 - Requires: dbus = %%version * Mon May 29 2006 Rex Dieter 0.61-2 - %%post/%%postun: /sbin/ldconfig * Mon May 15 2006 Rex Dieter 0.61-1 - first try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 May 2006 17:29:06 -0000 1.1 +++ .cvsignore 30 May 2006 17:29:32 -0000 1.2 @@ -0,0 +1 @@ +dbus-0.61.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 May 2006 17:29:06 -0000 1.1 +++ sources 30 May 2006 17:29:32 -0000 1.2 @@ -0,0 +1 @@ +cfd4f26004e4304e0dace4d82894e50b dbus-0.61.tar.gz From fedora-extras-commits at redhat.com Tue May 30 17:30:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:30:28 -0700 Subject: rpms/dbus-qt/devel dbus-qt.spec,1.1,1.2 Message-ID: <200605301730.k4UHUUg6008866@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dbus-qt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8849 Modified Files: dbus-qt.spec Log Message: remove FC-5 comment Index: dbus-qt.spec =================================================================== RCS file: /cvs/extras/rpms/dbus-qt/devel/dbus-qt.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dbus-qt.spec 30 May 2006 17:29:32 -0000 1.1 +++ dbus-qt.spec 30 May 2006 17:30:28 -0000 1.2 @@ -1,6 +1,4 @@ -# For FC-5 -- Rex - Summary: Qt-based library for using D-BUS Name: dbus-qt Version: 0.61 From fedora-extras-commits at redhat.com Tue May 30 17:35:10 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:35:10 -0700 Subject: rpms/freehdl import.log,1.8,1.9 Message-ID: <200605301735.k4UHZC59008996@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8963 Modified Files: import.log Log Message: auto-import freehdl-0.0.2-1 on branch devel from freehdl-0.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freehdl/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 16 Feb 2006 17:10:06 -0000 1.8 +++ import.log 30 May 2006 17:35:09 -0000 1.9 @@ -5,3 +5,4 @@ freehdl-0_0_1-3:HEAD:freehdl-0.0.1-3.src.rpm:1140109517 freehdl-0_0_1-3:FC-4:freehdl-0.0.1-3.src.rpm:1140109656 freehdl-0_0_1-3:FC-3:freehdl-0.0.1-3.src.rpm:1140109781 +freehdl-0_0_2-1:HEAD:freehdl-0.0.2-1.src.rpm:1149010505 From fedora-extras-commits at redhat.com Tue May 30 17:35:10 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:35:10 -0700 Subject: rpms/freehdl/devel .cvsignore, 1.2, 1.3 freehdl.spec, 1.3, 1.4 sources, 1.2, 1.3 freehdl.diff, 1.1, NONE Message-ID: <200605301735.k4UHZCJZ009002@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8963/devel Modified Files: .cvsignore freehdl.spec sources Removed Files: freehdl.diff Log Message: auto-import freehdl-0.0.2-1 on branch devel from freehdl-0.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freehdl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2006 09:35:07 -0000 1.2 +++ .cvsignore 30 May 2006 17:35:10 -0000 1.3 @@ -1 +1 @@ -freehdl-0.0.1.tar.gz +freehdl-0.0.2.tar.gz Index: freehdl.spec =================================================================== RCS file: /cvs/extras/rpms/freehdl/devel/freehdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freehdl.spec 16 Feb 2006 17:06:09 -0000 1.3 +++ freehdl.spec 30 May 2006 17:35:10 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GPLed free VHDL Name: freehdl -Version: 0.0.1 -Release: 3%{?dist} +Version: 0.0.2 +Release: 1%{?dist} License: GPL Group: Applications/Engineering -Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz -Patch0: freehdl.diff +Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz +#Patch0: freehdl.diff URL: http://www.freehdl.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info /sbin/ldconfig @@ -16,7 +16,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure \ @@ -55,6 +55,9 @@ %{_mandir}/man5/* %changelog +* Mon May 29 2006 Eric Tanguy 0.0.2-1 +- Update to 0.0.2 + * Mon Feb 13 2006 Eric Tanguy 0.0.1-3 - Add Requires : gcc-c++ Index: sources =================================================================== RCS file: /cvs/extras/rpms/freehdl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2006 09:35:07 -0000 1.2 +++ sources 30 May 2006 17:35:10 -0000 1.3 @@ -1 +1 @@ -a88be93ac3eed4452cc64c86b4573013 freehdl-0.0.1.tar.gz +abe93550e5c2a0e7062d3ff4ea8deb09 freehdl-0.0.2.tar.gz --- freehdl.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 17:36:41 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:36:41 -0700 Subject: rpms/freehdl import.log,1.9,1.10 Message-ID: <200605301736.k4UHahnB009102@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9069 Modified Files: import.log Log Message: auto-import freehdl-0.0.2-1 on branch FC-5 from freehdl-0.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freehdl/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 30 May 2006 17:35:09 -0000 1.9 +++ import.log 30 May 2006 17:36:41 -0000 1.10 @@ -6,3 +6,4 @@ freehdl-0_0_1-3:FC-4:freehdl-0.0.1-3.src.rpm:1140109656 freehdl-0_0_1-3:FC-3:freehdl-0.0.1-3.src.rpm:1140109781 freehdl-0_0_2-1:HEAD:freehdl-0.0.2-1.src.rpm:1149010505 +freehdl-0_0_2-1:FC-5:freehdl-0.0.2-1.src.rpm:1149010597 From fedora-extras-commits at redhat.com Tue May 30 17:36:41 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:36:41 -0700 Subject: rpms/freehdl/FC-5 .cvsignore, 1.2, 1.3 freehdl.spec, 1.3, 1.4 sources, 1.2, 1.3 freehdl.diff, 1.1, NONE Message-ID: <200605301736.k4UHahIf009108@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9069/FC-5 Modified Files: .cvsignore freehdl.spec sources Removed Files: freehdl.diff Log Message: auto-import freehdl-0.0.2-1 on branch FC-5 from freehdl-0.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2006 09:35:07 -0000 1.2 +++ .cvsignore 30 May 2006 17:36:41 -0000 1.3 @@ -1 +1 @@ -freehdl-0.0.1.tar.gz +freehdl-0.0.2.tar.gz Index: freehdl.spec =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-5/freehdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freehdl.spec 16 Feb 2006 17:06:09 -0000 1.3 +++ freehdl.spec 30 May 2006 17:36:41 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GPLed free VHDL Name: freehdl -Version: 0.0.1 -Release: 3%{?dist} +Version: 0.0.2 +Release: 1%{?dist} License: GPL Group: Applications/Engineering -Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz -Patch0: freehdl.diff +Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz +#Patch0: freehdl.diff URL: http://www.freehdl.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info /sbin/ldconfig @@ -16,7 +16,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure \ @@ -55,6 +55,9 @@ %{_mandir}/man5/* %changelog +* Mon May 29 2006 Eric Tanguy 0.0.2-1 +- Update to 0.0.2 + * Mon Feb 13 2006 Eric Tanguy 0.0.1-3 - Add Requires : gcc-c++ Index: sources =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2006 09:35:07 -0000 1.2 +++ sources 30 May 2006 17:36:41 -0000 1.3 @@ -1 +1 @@ -a88be93ac3eed4452cc64c86b4573013 freehdl-0.0.1.tar.gz +abe93550e5c2a0e7062d3ff4ea8deb09 freehdl-0.0.2.tar.gz --- freehdl.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 17:37:45 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:37:45 -0700 Subject: rpms/freehdl import.log,1.10,1.11 Message-ID: <200605301737.k4UHblHE009208@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9175 Modified Files: import.log Log Message: auto-import freehdl-0.0.2-1 on branch FC-4 from freehdl-0.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freehdl/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 30 May 2006 17:36:41 -0000 1.10 +++ import.log 30 May 2006 17:37:45 -0000 1.11 @@ -7,3 +7,4 @@ freehdl-0_0_1-3:FC-3:freehdl-0.0.1-3.src.rpm:1140109781 freehdl-0_0_2-1:HEAD:freehdl-0.0.2-1.src.rpm:1149010505 freehdl-0_0_2-1:FC-5:freehdl-0.0.2-1.src.rpm:1149010597 +freehdl-0_0_2-1:FC-4:freehdl-0.0.2-1.src.rpm:1149010661 From fedora-extras-commits at redhat.com Tue May 30 17:37:46 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:37:46 -0700 Subject: rpms/freehdl/FC-4 .cvsignore, 1.2, 1.3 freehdl.spec, 1.3, 1.4 sources, 1.2, 1.3 freehdl.diff, 1.1, NONE Message-ID: <200605301737.k4UHbmu7009214@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9175/FC-4 Modified Files: .cvsignore freehdl.spec sources Removed Files: freehdl.diff Log Message: auto-import freehdl-0.0.2-1 on branch FC-4 from freehdl-0.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2006 09:35:07 -0000 1.2 +++ .cvsignore 30 May 2006 17:37:46 -0000 1.3 @@ -1 +1 @@ -freehdl-0.0.1.tar.gz +freehdl-0.0.2.tar.gz Index: freehdl.spec =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-4/freehdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freehdl.spec 16 Feb 2006 17:08:20 -0000 1.3 +++ freehdl.spec 30 May 2006 17:37:46 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GPLed free VHDL Name: freehdl -Version: 0.0.1 -Release: 3%{?dist} +Version: 0.0.2 +Release: 1%{?dist} License: GPL Group: Applications/Engineering -Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz -Patch0: freehdl.diff +Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz +#Patch0: freehdl.diff URL: http://www.freehdl.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info /sbin/ldconfig @@ -16,7 +16,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure \ @@ -55,6 +55,9 @@ %{_mandir}/man5/* %changelog +* Mon May 29 2006 Eric Tanguy 0.0.2-1 +- Update to 0.0.2 + * Mon Feb 13 2006 Eric Tanguy 0.0.1-3 - Add Requires : gcc-c++ Index: sources =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2006 09:35:07 -0000 1.2 +++ sources 30 May 2006 17:37:46 -0000 1.3 @@ -1 +1 @@ -a88be93ac3eed4452cc64c86b4573013 freehdl-0.0.1.tar.gz +abe93550e5c2a0e7062d3ff4ea8deb09 freehdl-0.0.2.tar.gz --- freehdl.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 17:38:47 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:38:47 -0700 Subject: rpms/freehdl import.log,1.11,1.12 Message-ID: <200605301738.k4UHcngL009331@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9298 Modified Files: import.log Log Message: auto-import freehdl-0.0.2-1 on branch FC-3 from freehdl-0.0.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freehdl/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 30 May 2006 17:37:45 -0000 1.11 +++ import.log 30 May 2006 17:38:47 -0000 1.12 @@ -8,3 +8,4 @@ freehdl-0_0_2-1:HEAD:freehdl-0.0.2-1.src.rpm:1149010505 freehdl-0_0_2-1:FC-5:freehdl-0.0.2-1.src.rpm:1149010597 freehdl-0_0_2-1:FC-4:freehdl-0.0.2-1.src.rpm:1149010661 +freehdl-0_0_2-1:FC-3:freehdl-0.0.2-1.src.rpm:1149010723 From fedora-extras-commits at redhat.com Tue May 30 17:38:48 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:38:48 -0700 Subject: rpms/freehdl/FC-3 .cvsignore, 1.2, 1.3 freehdl.spec, 1.3, 1.4 sources, 1.2, 1.3 freehdl.diff, 1.1, NONE Message-ID: <200605301738.k4UHcorP009337@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/freehdl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9298/FC-3 Modified Files: .cvsignore freehdl.spec sources Removed Files: freehdl.diff Log Message: auto-import freehdl-0.0.2-1 on branch FC-3 from freehdl-0.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Feb 2006 09:35:07 -0000 1.2 +++ .cvsignore 30 May 2006 17:38:48 -0000 1.3 @@ -1 +1 @@ -freehdl-0.0.1.tar.gz +freehdl-0.0.2.tar.gz Index: freehdl.spec =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-3/freehdl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freehdl.spec 16 Feb 2006 17:10:12 -0000 1.3 +++ freehdl.spec 30 May 2006 17:38:48 -0000 1.4 @@ -1,11 +1,11 @@ Summary: GPLed free VHDL Name: freehdl -Version: 0.0.1 -Release: 3%{?dist} +Version: 0.0.2 +Release: 1%{?dist} License: GPL Group: Applications/Engineering -Source0: http://cran.mit.edu/~enaroska/%{name}-%{version}.tar.gz -Patch0: freehdl.diff +Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz +#Patch0: freehdl.diff URL: http://www.freehdl.seul.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info /sbin/ldconfig @@ -16,7 +16,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %build %configure \ @@ -55,6 +55,9 @@ %{_mandir}/man5/* %changelog +* Mon May 29 2006 Eric Tanguy 0.0.2-1 +- Update to 0.0.2 + * Mon Feb 13 2006 Eric Tanguy 0.0.1-3 - Add Requires : gcc-c++ Index: sources =================================================================== RCS file: /cvs/extras/rpms/freehdl/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Feb 2006 09:35:07 -0000 1.2 +++ sources 30 May 2006 17:38:48 -0000 1.3 @@ -1 +1 @@ -a88be93ac3eed4452cc64c86b4573013 freehdl-0.0.1.tar.gz +abe93550e5c2a0e7062d3ff4ea8deb09 freehdl-0.0.2.tar.gz --- freehdl.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 17:40:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:40:28 -0700 Subject: rpms/kmymoney2/FC-4 .cvsignore,1.5,1.6 Message-ID: <200605301740.k4UHeUFO009491@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kmymoney2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9444/FC-4 Modified Files: .cvsignore Log Message: cosmetics Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmymoney2/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2006 11:38:02 -0000 1.5 +++ .cvsignore 30 May 2006 17:40:28 -0000 1.6 @@ -1 +1,2 @@ +clog kmymoney2-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 17:40:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:40:30 -0700 Subject: rpms/kmymoney2/devel .cvsignore,1.5,1.6 Message-ID: <200605301740.k4UHeWq5009499@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kmymoney2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9444/devel Modified Files: .cvsignore Log Message: cosmetics Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmymoney2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2006 01:36:07 -0000 1.5 +++ .cvsignore 30 May 2006 17:40:30 -0000 1.6 @@ -1 +1,2 @@ +clog kmymoney2-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 17:40:29 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 10:40:29 -0700 Subject: rpms/kmymoney2/FC-5 .cvsignore,1.5,1.6 Message-ID: <200605301740.k4UHeV5Q009495@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kmymoney2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9444/FC-5 Modified Files: .cvsignore Log Message: cosmetics Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmymoney2/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 May 2006 11:38:37 -0000 1.5 +++ .cvsignore 30 May 2006 17:40:29 -0000 1.6 @@ -1 +1,2 @@ +clog kmymoney2-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 17:42:22 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:42:22 -0700 Subject: rpms/qucs import.log,1.12,1.13 Message-ID: <200605301742.k4UHgOP5009561@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9528 Modified Files: import.log Log Message: auto-import qucs-0.0.9-1 on branch devel from qucs-0.0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qucs/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 14 Feb 2006 21:32:31 -0000 1.12 +++ import.log 30 May 2006 17:42:22 -0000 1.13 @@ -9,3 +9,4 @@ qucs-0_0_8-1:HEAD:qucs-0.0.8-1.src.rpm:1139867738 qucs-0_0_8-1:FC-4:qucs-0.0.8-1.src.rpm:1139952604 qucs-0_0_8-1:FC-3:qucs-0.0.8-1.src.rpm:1139952725 +qucs-0_0_9-1:HEAD:qucs-0.0.9-1.src.rpm:1149010939 From fedora-extras-commits at redhat.com Tue May 30 17:42:23 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:42:23 -0700 Subject: rpms/qucs/devel .cvsignore, 1.3, 1.4 qucs.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605301742.k4UHgPS1009567@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9528/devel Modified Files: .cvsignore qucs.spec sources Log Message: auto-import qucs-0.0.9-1 on branch devel from qucs-0.0.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 21:55:53 -0000 1.3 +++ .cvsignore 30 May 2006 17:42:22 -0000 1.4 @@ -1 +1 @@ -qucs-0.0.8.tar.gz +qucs-0.0.9.tar.gz Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/qucs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qucs.spec 13 Feb 2006 21:55:53 -0000 1.5 +++ qucs.spec 30 May 2006 17:42:22 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_mandir}/man1/* %changelog +* Mon May 29 2006 Eric Tanguy - 0.0.9-1 +- Update to 0.0.9 + * Mon Jan 23 2006 Eric Tanguy - 0.0.8-1 - Update to 0.0.8 - Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 21:55:53 -0000 1.3 +++ sources 30 May 2006 17:42:22 -0000 1.4 @@ -1 +1 @@ -0b280090e4b7ff390c6cc4458b3387a8 qucs-0.0.8.tar.gz +863eba475f35d006325f9d49671a2031 qucs-0.0.9.tar.gz From fedora-extras-commits at redhat.com Tue May 30 17:43:30 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:43:30 -0700 Subject: rpms/qucs import.log,1.13,1.14 Message-ID: <200605301743.k4UHhWCX009661@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628 Modified Files: import.log Log Message: auto-import qucs-0.0.9-1 on branch FC-5 from qucs-0.0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qucs/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 30 May 2006 17:42:22 -0000 1.13 +++ import.log 30 May 2006 17:43:29 -0000 1.14 @@ -10,3 +10,4 @@ qucs-0_0_8-1:FC-4:qucs-0.0.8-1.src.rpm:1139952604 qucs-0_0_8-1:FC-3:qucs-0.0.8-1.src.rpm:1139952725 qucs-0_0_9-1:HEAD:qucs-0.0.9-1.src.rpm:1149010939 +qucs-0_0_9-1:FC-5:qucs-0.0.9-1.src.rpm:1149011007 From fedora-extras-commits at redhat.com Tue May 30 17:43:30 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:43:30 -0700 Subject: rpms/qucs/FC-5 .cvsignore, 1.3, 1.4 qucs.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200605301743.k4UHhWKW009667@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628/FC-5 Modified Files: .cvsignore qucs.spec sources Log Message: auto-import qucs-0.0.9-1 on branch FC-5 from qucs-0.0.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 21:55:53 -0000 1.3 +++ .cvsignore 30 May 2006 17:43:30 -0000 1.4 @@ -1 +1 @@ -qucs-0.0.8.tar.gz +qucs-0.0.9.tar.gz Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-5/qucs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qucs.spec 13 Feb 2006 21:55:53 -0000 1.5 +++ qucs.spec 30 May 2006 17:43:30 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_mandir}/man1/* %changelog +* Mon May 29 2006 Eric Tanguy - 0.0.9-1 +- Update to 0.0.9 + * Mon Jan 23 2006 Eric Tanguy - 0.0.8-1 - Update to 0.0.8 - Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 21:55:53 -0000 1.3 +++ sources 30 May 2006 17:43:30 -0000 1.4 @@ -1 +1 @@ -0b280090e4b7ff390c6cc4458b3387a8 qucs-0.0.8.tar.gz +863eba475f35d006325f9d49671a2031 qucs-0.0.9.tar.gz From fedora-extras-commits at redhat.com Tue May 30 17:44:42 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:44:42 -0700 Subject: rpms/qucs import.log,1.14,1.15 Message-ID: <200605301745.k4UHjE6Y009766@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9730 Modified Files: import.log Log Message: auto-import qucs-0.0.9-1 on branch FC-4 from qucs-0.0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qucs/import.log,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import.log 30 May 2006 17:43:29 -0000 1.14 +++ import.log 30 May 2006 17:44:41 -0000 1.15 @@ -11,3 +11,4 @@ qucs-0_0_8-1:FC-3:qucs-0.0.8-1.src.rpm:1139952725 qucs-0_0_9-1:HEAD:qucs-0.0.9-1.src.rpm:1149010939 qucs-0_0_9-1:FC-5:qucs-0.0.9-1.src.rpm:1149011007 +qucs-0_0_9-1:FC-4:qucs-0.0.9-1.src.rpm:1149011079 From fedora-extras-commits at redhat.com Tue May 30 17:44:42 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:44:42 -0700 Subject: rpms/qucs/FC-4 .cvsignore, 1.3, 1.4 qucs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605301745.k4UHjElw009771@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9730/FC-4 Modified Files: .cvsignore qucs.spec sources Log Message: auto-import qucs-0.0.9-1 on branch FC-4 from qucs-0.0.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 21:30:32 -0000 1.3 +++ .cvsignore 30 May 2006 17:44:42 -0000 1.4 @@ -1 +1 @@ -qucs-0.0.8.tar.gz +qucs-0.0.9.tar.gz Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-4/qucs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qucs.spec 14 Feb 2006 21:30:32 -0000 1.4 +++ qucs.spec 30 May 2006 17:44:42 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_mandir}/man1/* %changelog +* Mon May 29 2006 Eric Tanguy - 0.0.9-1 +- Update to 0.0.9 + * Mon Jan 23 2006 Eric Tanguy - 0.0.8-1 - Update to 0.0.8 - Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 21:30:32 -0000 1.3 +++ sources 30 May 2006 17:44:42 -0000 1.4 @@ -1 +1 @@ -0b280090e4b7ff390c6cc4458b3387a8 qucs-0.0.8.tar.gz +863eba475f35d006325f9d49671a2031 qucs-0.0.9.tar.gz From fedora-extras-commits at redhat.com Tue May 30 17:46:23 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:46:23 -0700 Subject: rpms/qucs import.log,1.15,1.16 Message-ID: <200605301746.k4UHktG6009867@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9833 Modified Files: import.log Log Message: auto-import qucs-0.0.9-1 on branch FC-3 from qucs-0.0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qucs/import.log,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- import.log 30 May 2006 17:44:41 -0000 1.15 +++ import.log 30 May 2006 17:46:23 -0000 1.16 @@ -12,3 +12,4 @@ qucs-0_0_9-1:HEAD:qucs-0.0.9-1.src.rpm:1149010939 qucs-0_0_9-1:FC-5:qucs-0.0.9-1.src.rpm:1149011007 qucs-0_0_9-1:FC-4:qucs-0.0.9-1.src.rpm:1149011079 +qucs-0_0_9-1:FC-3:qucs-0.0.9-1.src.rpm:1149011181 From fedora-extras-commits at redhat.com Tue May 30 17:46:24 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Tue, 30 May 2006 10:46:24 -0700 Subject: rpms/qucs/FC-3 .cvsignore, 1.3, 1.4 qucs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605301746.k4UHku4f009872@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/qucs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9833/FC-3 Modified Files: .cvsignore qucs.spec sources Log Message: auto-import qucs-0.0.9-1 on branch FC-3 from qucs-0.0.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Feb 2006 21:32:38 -0000 1.3 +++ .cvsignore 30 May 2006 17:46:24 -0000 1.4 @@ -1 +1 @@ -qucs-0.0.8.tar.gz +qucs-0.0.9.tar.gz Index: qucs.spec =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-3/qucs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qucs.spec 14 Feb 2006 21:32:38 -0000 1.4 +++ qucs.spec 30 May 2006 17:46:24 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Source0: http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -55,6 +55,9 @@ %{_mandir}/man1/* %changelog +* Mon May 29 2006 Eric Tanguy - 0.0.9-1 +- Update to 0.0.9 + * Mon Jan 23 2006 Eric Tanguy - 0.0.8-1 - Update to 0.0.8 - Add -ffriend-injection to $RPM_OPT_FLAGS for building against gcc-4.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qucs/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Feb 2006 21:32:38 -0000 1.3 +++ sources 30 May 2006 17:46:24 -0000 1.4 @@ -1 +1 @@ -0b280090e4b7ff390c6cc4458b3387a8 qucs-0.0.8.tar.gz +863eba475f35d006325f9d49671a2031 qucs-0.0.9.tar.gz From fedora-extras-commits at redhat.com Tue May 30 18:09:04 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 30 May 2006 11:09:04 -0700 Subject: fedora-security/audit fc4,1.270,1.271 fc5,1.183,1.184 Message-ID: <200605301809.k4UI94nb012658@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12638 Modified Files: fc4 fc5 Log Message: Note the tiffsplit CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- fc4 29 May 2006 22:52:35 -0000 1.270 +++ fc4 30 May 2006 18:09:01 -0000 1.271 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-591] +CVE-2006-2656 backport (libtiff) [since FEDORA-2006-591] CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- fc5 29 May 2006 22:52:35 -0000 1.183 +++ fc5 30 May 2006 18:09:01 -0000 1.184 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-XXXX-XXXX backport (libtiff) [since FEDORA-2006-592] +CVE-2006-2656 backport (libtiff) [since FEDORA-2006-592] CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 From fedora-extras-commits at redhat.com Tue May 30 18:21:47 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 11:21:47 -0700 Subject: rpms/Coin2/FC-4 .cvsignore, 1.7, 1.8 Coin2.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200605301821.k4UILnMf012735@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12714 Modified Files: .cvsignore Coin2.spec sources Log Message: * Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 - Upstream update. - Drop gcc-4.1 patch. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Sep 2005 07:06:10 -0000 1.7 +++ .cvsignore 30 May 2006 18:21:47 -0000 1.8 @@ -1 +1 @@ -Coin-2.4.4.tar.gz +Coin-2.4.5.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Coin2.spec 22 Feb 2006 16:26:58 -0000 1.16 +++ Coin2.spec 30 May 2006 18:21:47 -0000 1.17 @@ -12,8 +12,8 @@ Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.4 -Release: 3.2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -23,7 +23,6 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: Coin-2.4.4-gcc-4.1.diff Patch5: coin-2.3.0-man3.diff BuildRequires: xorg-x11-Mesa-libGL @@ -35,7 +34,6 @@ BuildRequires: freetype-devel BuildRequires: doxygen BuildRequires: /usr/bin/rename - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -58,7 +56,6 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch5 -p1 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ @@ -117,6 +114,11 @@ %doc %{coin_htmldir} %changelog +* Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 +- Upstream update. +- Drop gcc-4.1 patch. +- Spec file cleanup. + * Wed Feb 22 2006 Ralf Cors??pius - 2.4.4-3.2 - Rename man3 manpages to .3sim (PR 182212). @@ -137,19 +139,3 @@ * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. - -* Tue May 10 2005 Ralf Corsepius - 0:2.3.0-9 -- Introduce %%{coin_includedir} %%{coin_htmldir}. -- Misc. spec cleanup. - -* Fri May 06 2005 Ralf Corsepius - 0:2.3.0-8 -- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead - SONAME handling. - -* Tue May 03 2005 Ralf Corsepius - 0:2.3.0-7 -- Minor spec changes. - -* Tue Feb 22 2005 Ralf Corsepius - 0:2.3.0-5 -- Include simacros. -- Regenerate configure from simacros and FC3 libtool for x86_64. -- Don't install bogusly generated manpages for dirs. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Sep 2005 07:31:34 -0000 1.8 +++ sources 30 May 2006 18:21:47 -0000 1.9 @@ -1 +1 @@ -7976fcf2d1154bc8574d75b99bab45ee Coin-2.4.4.tar.gz +99b83c5189c3755fd5f08fcad0994a7b Coin-2.4.5.tar.gz From fedora-extras-commits at redhat.com Tue May 30 18:22:48 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 11:22:48 -0700 Subject: rpms/Coin2/FC-4 Coin-2.4.4-gcc-4.1.diff,1.1,NONE Message-ID: <200605301822.k4UIMoXc012790@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12775 Removed Files: Coin-2.4.4-gcc-4.1.diff Log Message: Remove. --- Coin-2.4.4-gcc-4.1.diff DELETED --- From fedora-extras-commits at redhat.com Tue May 30 19:45:34 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Tue, 30 May 2006 12:45:34 -0700 Subject: rpms/vpnc/FC-5 vpnc.spec,1.12,1.13 Message-ID: <200605301945.k4UJjaUY015423@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/vpnc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404 Modified Files: vpnc.spec Log Message: * Tue May 30 2006 Tomas Mraz 0.3.3-7.1 - drop -fstack-protector from x86_64 build (workaround for #172145) Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/FC-5/vpnc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vpnc.spec 9 Mar 2006 17:42:53 -0000 1.12 +++ vpnc.spec 30 May 2006 19:45:34 -0000 1.13 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.3 -Release: 7 +Release: 7.1 Summary: IPSec VPN client compatible with Cisco equipment @@ -35,6 +35,9 @@ %patch4 -p1 -b .rekeying %build +%ifarch x86_64 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed s/-f-stack-protector//g) +%endif make PREFIX=/usr %install @@ -65,6 +68,9 @@ %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup %changelog +* Tue May 30 2006 Tomas Mraz 0.3.3-7.1 +- drop -fstack-protector from x86_64 build (workaround for #172145) + * Thu Mar 9 2006 Tomas Mraz 0.3.3-7 - add basic rekeying support (the patch includes NAT keepalive support by Brian Downing) From fedora-extras-commits at redhat.com Tue May 30 19:50:35 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Tue, 30 May 2006 12:50:35 -0700 Subject: rpms/pan/devel .cvsignore, 1.9, 1.10 pan.spec, 1.17, 1.18 sources, 1.9, 1.10 Message-ID: <200605301950.k4UJobh7015512@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15489 Modified Files: .cvsignore pan.spec sources Log Message: new upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 May 2006 15:59:38 -0000 1.9 +++ .cvsignore 30 May 2006 19:50:35 -0000 1.10 @@ -1 +1,2 @@ pan-0.98.tar.bz2 +pan-0.99.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pan.spec 23 May 2006 15:59:38 -0000 1.17 +++ pan.spec 30 May 2006 19:50:35 -0000 1.18 @@ -1,6 +1,6 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.98 +Version: 0.99 Release: 1%{?dist} Epoch: 1 License: GPL @@ -70,6 +70,9 @@ %{_datadir}/applications/fedora-pan.desktop %changelog +* Tue May 30 2006 Michael A. Peters - 1:0.99-1 +- Update to 0.99 + * Tue May 23 2006 Michael A. Peters - 1:0.98-1 - Update to 0.98 - previous patches not needed Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 May 2006 15:59:38 -0000 1.9 +++ sources 30 May 2006 19:50:35 -0000 1.10 @@ -1 +1,2 @@ 004dd79036b726e666cadcfd080fd515 pan-0.98.tar.bz2 +d67316c696298e37471bd3638828de67 pan-0.99.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 19:50:52 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Tue, 30 May 2006 12:50:52 -0700 Subject: rpms/vpnc/devel vpnc-0.3.3-rekeying.patch, 1.1, 1.2 vpnc.spec, 1.12, 1.13 Message-ID: <200605301950.k4UJosxa015569@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15520 Modified Files: vpnc-0.3.3-rekeying.patch vpnc.spec Log Message: * Tue May 30 2006 Tomas Mraz 0.3.3-8 - drop -fstack-protector from x86_64 build (workaround for #172145) - make rekeying a little bit better vpnc-0.3.3-rekeying.patch: Index: vpnc-0.3.3-rekeying.patch =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc-0.3.3-rekeying.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vpnc-0.3.3-rekeying.patch 9 Mar 2006 17:42:53 -0000 1.1 +++ vpnc-0.3.3-rekeying.patch 30 May 2006 19:50:52 -0000 1.2 @@ -1,5 +1,5 @@ ---- vpnc-0.3.3/vpnc.c.rekeying 2006-03-09 18:33:04.000000000 +0100 -+++ vpnc-0.3.3/vpnc.c 2006-03-09 18:33:40.000000000 +0100 +--- vpnc-0.3.3/vpnc.c.rekeying 2006-03-14 22:53:00.000000000 +0100 ++++ vpnc-0.3.3/vpnc.c 2006-03-14 22:54:16.000000000 +0100 @@ -60,15 +60,13 @@ static uint8_t r_packet[2048]; static ssize_t r_length; @@ -50,7 +50,39 @@ } /* Wait at least 2s for a response or 4 times the time it took -@@ -1882,7 +1886,7 @@ +@@ -396,6 +400,31 @@ + return recvsize; + } + ++static void ++flushrecv(void) ++{ ++ struct pollfd pfd; ++ int recvsize = -1; ++ struct sockaddr_in recvaddr; ++ socklen_t recvaddr_size = sizeof(recvaddr); ++ uint8_t r_packet[2048]; ++ ++ pfd.fd = sockfd; ++ pfd.events = POLLIN; ++ ++ for (;;) { ++ int pollresult; ++ ++ pollresult = poll(&pfd, 1, 0); ++ ++ if (pollresult <= 0) ++ return; ++ ++ recvsize = recvfrom(sockfd, r_packet, sizeof(r_packet), 0, ++ (struct sockaddr *)&recvaddr, &recvaddr_size); ++ } ++} ++ + int isakmp_crypt(struct sa_block *s, uint8_t * block, size_t blocklen, int enc) + { + unsigned char *new_iv, *iv = NULL; +@@ -1882,7 +1911,7 @@ return r; } @@ -59,7 +91,7 @@ { struct isakmp_payload *rp, *us, *ke = NULL, *them, *nonce_r = NULL; struct isakmp_packet *r; -@@ -1893,6 +1897,8 @@ +@@ -1893,6 +1922,8 @@ size_t p_size = 0; uint8_t nonce[20], *dh_public = NULL; int ipsec_cry_algo = 0, ipsec_hash_algo = 0, i; @@ -68,15 +100,30 @@ DEBUG(2, printf("S7.1\n")); /* Set up the Diffie-Hellman stuff. */ -@@ -1944,6 +1950,7 @@ - memcpy(realiv_msgid, s->current_iv_msgid, 4); - } +@@ -1934,6 +1965,11 @@ + msgid = 1; + + DEBUG(2, printf("S7.2\n")); ++ ++ if(rekey) { ++ flushrecv(); ++ } ++ + for (i = 0; i < 4; i++) { + sendrecv_phase2(s, rp, ISAKMP_EXCHANGE_IKE_QUICK, + msgid, 0, &p_flat, &p_size, 0, 0, 0, 0); +@@ -1946,12 +1982,24 @@ -+again: DEBUG(2, printf("S7.3\n")); reject = unpack_verify_phase2(s, r_packet, r_length, &r, nonce, sizeof(nonce)); ++ if (reject != 0 && reject != ISAKMP_N_AUTHENTICATION_FAILED) { ++ DEBUG(2, printf("ignoring bad packet, retrying\n")); ++ r_length = sendrecv(r_packet, sizeof(*r_packet), NULL, 0, 0); ++ continue; ++ } -@@ -1952,6 +1959,13 @@ + DEBUG(2, printf("S7.4\n")); + if (((reject == 0) || (reject == ISAKMP_N_AUTHENTICATION_FAILED)) && r->exchange_type == ISAKMP_EXCHANGE_INFORMATIONAL) { /* handle notifie responder-lifetime (ignore) */ /* (broken hash => ignore AUTHENTICATION_FAILED) */ @@ -84,13 +131,13 @@ + && r->payload->next->type == ISAKMP_PAYLOAD_D && rekey) { + DEBUG(2, printf("ignoring delete old ESP SA notify\n")); + r_length = sendrecv(r_packet, sizeof(*r_packet), NULL, 0, 0); -+ goto again; ++ continue; + } + if (reject == 0 && r->payload->next->type != ISAKMP_PAYLOAD_N) reject = ISAKMP_N_INVALID_PAYLOAD_TYPE; -@@ -2122,51 +2136,20 @@ +@@ -2122,51 +2170,20 @@ nonce_r->u.nonce.data, nonce_r->u.nonce.length); DEBUG(2, printf("S7.7\n")); @@ -149,7 +196,7 @@ if (dh_grp) { /* Determine the shared secret. */ dh_shared_secret = xallocc(dh_getlen(dh_grp)); -@@ -2186,21 +2169,66 @@ +@@ -2186,21 +2203,66 @@ nonce, sizeof(nonce), nonce_r->u.nonce.data, nonce_r->u.nonce.length); memcpy(&tous_dest, dest_addr, sizeof(tous_dest)); if (opt_udpencap && s->peer_udpencap_port) { @@ -184,7 +231,7 @@ + s->tun_fd, ipsec_hash_algo, ipsec_cry_algo, em, tunnelfd, config[CONFIG_PID_FILE]); + rekey = reject == 0; - } ++ } + + DEBUG(2, printf("S7.10\n")); + /* Create and send the delete payload. */ @@ -219,12 +266,12 @@ + sendrecv_phase2(s, d_ipsec, ISAKMP_EXCHANGE_INFORMATIONAL, + del_msgid, 1, NULL, NULL, + NULL, 0, NULL, 0); -+ } + } + return reject; } int main(int argc, char **argv) -@@ -2239,7 +2267,9 @@ +@@ -2239,7 +2301,9 @@ do_load_balance = do_phase_2_config(oursa); } while (do_load_balance); DEBUG(2, printf("S7\n")); @@ -236,7 +283,7 @@ setenv("reason", "disconnect", 1); system(config[CONFIG_SCRIPT]); --- vpnc-0.3.3/config.c.rekeying 2005-05-01 22:06:36.000000000 +0200 -+++ vpnc-0.3.3/config.c 2006-03-09 18:33:04.000000000 +0100 ++++ vpnc-0.3.3/config.c 2006-03-14 22:53:00.000000000 +0100 @@ -56,6 +56,8 @@ int opt_1des; int opt_udpencap; @@ -294,7 +341,7 @@ if (opt_debug >= 99) { --- vpnc-0.3.3/tunip.c.rekeying 2005-05-05 12:25:00.000000000 +0200 -+++ vpnc-0.3.3/tunip.c 2006-03-09 18:33:04.000000000 +0100 ++++ vpnc-0.3.3/tunip.c 2006-03-14 22:53:00.000000000 +0100 @@ -333,18 +333,14 @@ return 1; } @@ -457,7 +504,7 @@ + return vpnc_main_loop(&vpnpeer, &meth, tun_fd, (!opt_nd) ? pidfile : NULL); } --- vpnc-0.3.3/config.h.rekeying 2005-05-01 22:06:45.000000000 +0200 -+++ vpnc-0.3.3/config.h 2006-03-09 18:33:04.000000000 +0100 ++++ vpnc-0.3.3/config.h 2006-03-14 22:53:00.000000000 +0100 @@ -44,6 +44,8 @@ CONFIG_UDP_ENCAP, CONFIG_UDP_ENCAP_PORT, @@ -477,7 +524,7 @@ #define DEBUG(lvl, a) do {if (opt_debug >= (lvl)) {a;}} while (0) --- vpnc-0.3.3/vpnc.h.rekeying 2004-11-22 01:11:55.000000000 +0100 -+++ vpnc-0.3.3/vpnc.h 2006-03-09 18:33:04.000000000 +0100 ++++ vpnc-0.3.3/vpnc.h 2006-03-14 22:53:00.000000000 +0100 @@ -46,8 +46,6 @@ uint8_t *current_iv; uint8_t our_address[4], our_netmask[4]; Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vpnc.spec 9 Mar 2006 17:42:53 -0000 1.12 +++ vpnc.spec 30 May 2006 19:50:52 -0000 1.13 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.3 -Release: 7 +Release: 8 Summary: IPSec VPN client compatible with Cisco equipment @@ -35,6 +35,9 @@ %patch4 -p1 -b .rekeying %build +%ifarch x86_64 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed s/-f-stack-protector//g) +%endif make PREFIX=/usr %install @@ -65,6 +68,10 @@ %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup %changelog +* Tue May 30 2006 Tomas Mraz 0.3.3-8 +- drop -fstack-protector from x86_64 build (workaround for #172145) +- make rekeying a little bit better + * Thu Mar 9 2006 Tomas Mraz 0.3.3-7 - add basic rekeying support (the patch includes NAT keepalive support by Brian Downing) From fedora-extras-commits at redhat.com Tue May 30 20:15:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 13:15:32 -0700 Subject: rpms/sbcl/devel sbcl-0.9.13-LIB_DIR.patch, NONE, 1.1 sbcl.spec, 1.43, 1.44 sbcl-0.9.10-make-config-ppc.patch, 1.1, NONE sbcl-0.9.4-LIB_DIR.patch, 1.3, NONE Message-ID: <200605302015.k4UKFYq2018086@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18064 Modified Files: sbcl.spec Added Files: sbcl-0.9.13-LIB_DIR.patch Removed Files: sbcl-0.9.10-make-config-ppc.patch sbcl-0.9.4-LIB_DIR.patch Log Message: * Tue May 30 2006 Rex Dieter 0.9.13-1 - 0.9.13 sbcl-0.9.13-LIB_DIR.patch: --- NEW FILE sbcl-0.9.13-LIB_DIR.patch --- --- sbcl-0.9.13/install.sh.LIB_DIR 2006-05-17 07:06:08.000000000 -0500 +++ sbcl-0.9.13/install.sh 2006-05-30 15:09:38.000000000 -0500 @@ -23,10 +23,11 @@ MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man} INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info} DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl} +LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib} # Does the environment look sane? SBCL_SOURCE=`pwd` -if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then +if [ -n "$SBCL_HOME" -a "$LIB_DIR/sbcl" != "$SBCL_HOME" ];then echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT. echo Aborting installation. Unset one or reset the other, then try again echo INSTALL_ROOT="$INSTALL_ROOT" @@ -47,10 +48,10 @@ exit 1 fi -SBCL_HOME=$INSTALL_ROOT/lib/sbcl +SBCL_HOME=$LIB_DIR/sbcl export SBCL_HOME INSTALL_ROOT ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \ - $BUILD_ROOT$INSTALL_ROOT/lib \ + $BUILD_ROOT$LIB_DIR \ $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \ $BUILD_ROOT$INFO_DIR $BUILD_ROOT$DOC_DIR \ $BUILD_ROOT$DOC_DIR/html \ @@ -87,7 +88,7 @@ echo echo "SBCL has been installed:" echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/$RUNTIME" -echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/" +echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" # Installing manual & misc bits of documentation # Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sbcl.spec 28 Apr 2006 14:32:32 -0000 1.43 +++ sbcl.spec 30 May 2006 20:15:31 -0000 1.44 @@ -9,8 +9,8 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.12 -Release: 2%{?dist} +Version: 0.9.13 +Release: 1%{?dist} License: BSD/MIT Group: Development/Languages @@ -56,8 +56,8 @@ Patch1: sbcl-0.8.18-default-sbcl-home.patch Patch2: sbcl-0.9.5-personality.patch Patch3: sbcl-0.9.5-optflags.patch -Patch4: sbcl-0.9.4-LIB_DIR.patch -#Patch5: sbcl-0.9.10-make-config-ppc.patch +Patch4: sbcl-0.9.13-LIB_DIR.patch + Patch6: sbcl-0.9.5-verbose-build.patch # Allow override of contrib test failure(s) Patch7: sbcl-0.9.9-permissive.patch @@ -216,6 +216,9 @@ %changelog +* Tue May 30 2006 Rex Dieter 0.9.13-1 +- 0.9.13 + * Mon Apr 26 2006 Rex Dieter 0.9.12-2 - respin, using new ppc bootstrap --- sbcl-0.9.10-make-config-ppc.patch DELETED --- --- sbcl-0.9.4-LIB_DIR.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 20:15:48 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 13:15:48 -0700 Subject: rpms/wine-docs/FC-5 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wine-docs.spec, 1.10, 1.11 Message-ID: <200605302015.k4UKFo2p018164@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18090/FC-5 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 08:13:59 -0000 1.10 +++ .cvsignore 30 May 2006 20:15:48 -0000 1.11 @@ -1 +1 @@ -wine-docs-0.9.13.tar.bz2 +wine-docs-0.9.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 08:13:59 -0000 1.10 +++ sources 30 May 2006 20:15:48 -0000 1.11 @@ -1 +1 @@ -e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 +3798d7e4472abc0f29e9b239dc68e9d5 wine-docs-0.9.14.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wine-docs.spec 15 May 2006 08:13:59 -0000 1.10 +++ wine-docs.spec 30 May 2006 20:15:48 -0000 1.11 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.13 +Version: 0.9.14 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue May 30 2006 Andreas Bierfert +0.9.14-1 +- version upgrade + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Tue May 30 20:15:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 13:15:49 -0700 Subject: rpms/wine-docs/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wine-docs.spec, 1.10, 1.11 Message-ID: <200605302015.k4UKFpg8018170@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18090/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 08:13:59 -0000 1.10 +++ .cvsignore 30 May 2006 20:15:48 -0000 1.11 @@ -1 +1 @@ -wine-docs-0.9.13.tar.bz2 +wine-docs-0.9.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 08:13:59 -0000 1.10 +++ sources 30 May 2006 20:15:48 -0000 1.11 @@ -1 +1 @@ -e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 +3798d7e4472abc0f29e9b239dc68e9d5 wine-docs-0.9.14.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wine-docs.spec 15 May 2006 08:13:59 -0000 1.10 +++ wine-docs.spec 30 May 2006 20:15:48 -0000 1.11 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.13 +Version: 0.9.14 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue May 30 2006 Andreas Bierfert +0.9.14-1 +- version upgrade + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Tue May 30 20:15:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 13:15:47 -0700 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wine-docs.spec, 1.14, 1.15 Message-ID: <200605302015.k4UKFn5e018160@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18090/FC-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 08:13:53 -0000 1.10 +++ .cvsignore 30 May 2006 20:15:47 -0000 1.11 @@ -1 +1 @@ -wine-docs-0.9.13.tar.bz2 +wine-docs-0.9.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 08:13:53 -0000 1.10 +++ sources 30 May 2006 20:15:47 -0000 1.11 @@ -1 +1 @@ -e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 +3798d7e4472abc0f29e9b239dc68e9d5 wine-docs-0.9.14.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wine-docs.spec 15 May 2006 08:13:53 -0000 1.14 +++ wine-docs.spec 30 May 2006 20:15:47 -0000 1.15 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.13 +Version: 0.9.14 Release: 0.1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -46,6 +46,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue May 30 2006 Andreas Bierfert +0.9.14-0.1 +- version upgrade + * Mon May 15 2006 Andreas Bierfert 0.9.13-0.1 - version upgrade From fedora-extras-commits at redhat.com Tue May 30 20:15:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 30 May 2006 13:15:46 -0700 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wine-docs.spec, 1.13, 1.14 Message-ID: <200605302016.k4UKGJuL018177@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18090/FC-3 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 May 2006 08:13:53 -0000 1.10 +++ .cvsignore 30 May 2006 20:15:46 -0000 1.11 @@ -1 +1 @@ -wine-docs-0.9.13.tar.bz2 +wine-docs-0.9.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 May 2006 08:13:53 -0000 1.10 +++ sources 30 May 2006 20:15:46 -0000 1.11 @@ -1 +1 @@ -e980a30739031ea5e5039480e96cd2cb wine-docs-0.9.13.tar.bz2 +3798d7e4472abc0f29e9b239dc68e9d5 wine-docs-0.9.14.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wine-docs.spec 15 May 2006 08:13:53 -0000 1.13 +++ wine-docs.spec 30 May 2006 20:15:46 -0000 1.14 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.13 +Version: 0.9.14 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.13.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Tue May 30 2006 Andreas Bierfert +0.9.14-1 +- version upgrade + * Mon May 15 2006 Andreas Bierfert 0.9.13-1 - version upgrade From fedora-extras-commits at redhat.com Tue May 30 20:24:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 13:24:54 -0700 Subject: rpms/sbcl/devel .cvsignore, 1.12, 1.13 sbcl.spec, 1.44, 1.45 sources, 1.14, 1.15 Message-ID: <200605302024.k4UKOulM018431@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18409 Modified Files: .cvsignore sbcl.spec sources Log Message: respin for missing sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Apr 2006 18:51:33 -0000 1.12 +++ .cvsignore 30 May 2006 20:24:54 -0000 1.13 @@ -1,4 +1,4 @@ -sbcl-0.9.12-source.tar.bz2 +sbcl-0.9.13-source.tar.bz2 sbcl-0.9.11-x86-64-linux-binary.tar.bz2 sbcl-0.9.11-x86-linux-binary.tar.bz2 sbcl-0.9.8-powerpc-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sbcl.spec 30 May 2006 20:15:31 -0000 1.44 +++ sbcl.spec 30 May 2006 20:24:54 -0000 1.45 @@ -10,7 +10,7 @@ Name: sbcl Summary: Steel Bank Common Lisp Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD/MIT Group: Development/Languages @@ -216,7 +216,7 @@ %changelog -* Tue May 30 2006 Rex Dieter 0.9.13-1 +* Tue May 30 2006 Rex Dieter 0.9.13-2 - 0.9.13 * Mon Apr 26 2006 Rex Dieter 0.9.12-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 28 Apr 2006 14:32:32 -0000 1.14 +++ sources 30 May 2006 20:24:54 -0000 1.15 @@ -1 +1 @@ -82eef4f47d6a72a36d4484bf503fc7db sbcl-0.9.12-source.tar.bz2 +1423210cc88b6c373f1db3dccc76acf6 sbcl-0.9.13-source.tar.bz2 From fedora-extras-commits at redhat.com Tue May 30 20:46:00 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 30 May 2006 13:46:00 -0700 Subject: fedora-security/audit fc4,1.271,1.272 fc5,1.184,1.185 Message-ID: <200605302046.k4UKk0QY018566@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18533 Modified Files: fc4 fc5 Log Message: * Note a new freetype CVE id. * Remove a dupe CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- fc4 30 May 2006 18:09:01 -0000 1.271 +++ fc4 30 May 2006 20:45:57 -0000 1.272 @@ -3,11 +3,11 @@ ** are items that need attention +CVE-2006-2661 VULNERABLE (freetype, fixed 2.2.1) #183677 CVE-2006-2656 backport (libtiff) [since FEDORA-2006-591] CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #178431 -CVE-2006-2493 ** freetype CVE-2006-2480 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2453 backport (dia) #192538 [since FEDORA-2006-580] CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- fc5 30 May 2006 18:09:01 -0000 1.184 +++ fc5 30 May 2006 20:45:57 -0000 1.185 @@ -3,11 +3,11 @@ ** are items that need attention +CVE-2006-2661 VULNERABLE (freetype, fixed 2.2.1) #183677 CVE-2006-2656 backport (libtiff) [since FEDORA-2006-592] CVE-2006-2629 ** kernel CVE-2006-2613 ignore (firefox) This isn't an issie on FC CVE-2006-2607 backport (vixie-cron) #177476 -CVE-2006-2493 ** freetype CVE-2006-2444 VULNERABLE (kernel, fixed 2.6.16.18) CVE-2006-2440 backport (ImageMagick) #192279 [since FEDORA-2006-588] CVE-2006-2414 ignore (dovecot, fixed 1.0.beta8) Not a security issue From fedora-extras-commits at redhat.com Tue May 30 21:05:57 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 30 May 2006 14:05:57 -0700 Subject: rpms/maxima/devel maxima.spec,1.26,1.27 Message-ID: <200605302105.k4UL5xWp021132@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115 Modified Files: maxima.spec Log Message: * Tue May 30 2006 Rex Dieter 5.9.3-4 - respin for sbcl-0.9.13 Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- maxima.spec 28 Apr 2006 15:20:59 -0000 1.26 +++ maxima.spec 30 May 2006 21:05:57 -0000 1.27 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -366,6 +366,9 @@ %changelog +* Tue May 30 2006 Rex Dieter 5.9.3-4 +- respin for sbcl-0.9.13 + * Mon Apr 28 2006 Rex Dieter 5.9.3-3 - respin, using new ppc bootstrap From fedora-extras-commits at redhat.com Tue May 30 21:25:10 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 14:25:10 -0700 Subject: rpms/poker-eval/FC-4 .cvsignore, 1.2, 1.3 poker-eval.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200605302125.k4ULPC5Y021323@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-eval/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21271/FC-4 Modified Files: .cvsignore poker-eval.spec sources Log Message: Upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Apr 2006 14:49:20 -0000 1.2 +++ .cvsignore 30 May 2006 21:25:10 -0000 1.3 @@ -1 +1 @@ -poker-eval-130.0.tar.gz +poker-eval-131.0.tar.gz Index: poker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-4/poker-eval.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- poker-eval.spec 23 Apr 2006 19:59:47 -0000 1.7 +++ poker-eval.spec 30 May 2006 21:25:10 -0000 1.8 @@ -1,11 +1,11 @@ Name: poker-eval -Version: 130.0 -Release: 5%{?dist} +Version: 131.0 +Release: 1%{?dist} Summary: Poker hand evaluator library Group: Development/Libraries License: GPL -URL: http://pokersource.org/poker-eval/ -Source0: http://download.gna.org/pokersource/%{name}-%{version}.tar.gz +URL: http://pokersource.org/poker-eval +Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,9 +24,6 @@ %prep %setup -q -# rpmlint fix -chmod -x examples/five_card_hands.c - # use examples/ directory for devel package %doc section mkdir -p tmp/examples && cp examples/*.c tmp/examples rm -f tmp/examples/getopt_w32.c @@ -62,6 +59,10 @@ %exclude %{_libdir}/*.la %changelog +* Sat May 13 2006 Christopher Stone 131.0-1 +- upstream sync +- Remove rpmlint fix since it's no longer needed + * Sun Apr 23 2006 Christopher Stone 130.0-5 - Update URL to new permanent URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2006 14:49:20 -0000 1.2 +++ sources 30 May 2006 21:25:10 -0000 1.3 @@ -1 +1 @@ -b6feea367ba1c49d85fb04cf5913e2d9 poker-eval-130.0.tar.gz +001cf7f9dfea57a5d8479ceb5342736a poker-eval-131.0.tar.gz From fedora-extras-commits at redhat.com Tue May 30 21:25:11 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 14:25:11 -0700 Subject: rpms/poker-eval/FC-5 .cvsignore, 1.2, 1.3 poker-eval.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200605302125.k4ULPDgv021329@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-eval/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21271/FC-5 Modified Files: .cvsignore poker-eval.spec sources Log Message: Upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Apr 2006 14:49:20 -0000 1.2 +++ .cvsignore 30 May 2006 21:25:11 -0000 1.3 @@ -1 +1 @@ -poker-eval-130.0.tar.gz +poker-eval-131.0.tar.gz Index: poker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-5/poker-eval.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- poker-eval.spec 23 Apr 2006 19:59:48 -0000 1.7 +++ poker-eval.spec 30 May 2006 21:25:11 -0000 1.8 @@ -1,11 +1,11 @@ Name: poker-eval -Version: 130.0 -Release: 5%{?dist} +Version: 131.0 +Release: 1%{?dist} Summary: Poker hand evaluator library Group: Development/Libraries License: GPL -URL: http://pokersource.org/poker-eval/ -Source0: http://download.gna.org/pokersource/%{name}-%{version}.tar.gz +URL: http://pokersource.org/poker-eval +Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -24,9 +24,6 @@ %prep %setup -q -# rpmlint fix -chmod -x examples/five_card_hands.c - # use examples/ directory for devel package %doc section mkdir -p tmp/examples && cp examples/*.c tmp/examples rm -f tmp/examples/getopt_w32.c @@ -62,6 +59,10 @@ %exclude %{_libdir}/*.la %changelog +* Sat May 13 2006 Christopher Stone 131.0-1 +- upstream sync +- Remove rpmlint fix since it's no longer needed + * Sun Apr 23 2006 Christopher Stone 130.0-5 - Update URL to new permanent URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-eval/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2006 14:49:20 -0000 1.2 +++ sources 30 May 2006 21:25:11 -0000 1.3 @@ -1 +1 @@ -b6feea367ba1c49d85fb04cf5913e2d9 poker-eval-130.0.tar.gz +001cf7f9dfea57a5d8479ceb5342736a poker-eval-131.0.tar.gz From fedora-extras-commits at redhat.com Tue May 30 21:25:11 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 14:25:11 -0700 Subject: rpms/poker-eval/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200605302125.k4ULPDok021334@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21271/devel Modified Files: .cvsignore sources Log Message: Upstream sync Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-eval/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Apr 2006 14:49:20 -0000 1.2 +++ .cvsignore 30 May 2006 21:25:11 -0000 1.3 @@ -1 +1 @@ -poker-eval-130.0.tar.gz +poker-eval-131.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-eval/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Apr 2006 14:49:20 -0000 1.2 +++ sources 30 May 2006 21:25:11 -0000 1.3 @@ -1 +1 @@ -b6feea367ba1c49d85fb04cf5913e2d9 poker-eval-130.0.tar.gz +001cf7f9dfea57a5d8479ceb5342736a poker-eval-131.0.tar.gz From fedora-extras-commits at redhat.com Tue May 30 22:15:01 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Tue, 30 May 2006 15:15:01 -0700 Subject: rpms/rapidsvn/devel rapidsvn-0.9.2-gcc41.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rapidsvn.spec, 1.1, 1.2 sources, 1.2, 1.3 rapidsvn-0.9.1-gcc41.patch, 1.1, NONE Message-ID: <200605302215.k4UMF3xA023961@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23935 Modified Files: .cvsignore rapidsvn.spec sources Added Files: rapidsvn-0.9.2-gcc41.patch Removed Files: rapidsvn-0.9.1-gcc41.patch Log Message: Check in rapidsvn 0.9.2 rapidsvn-0.9.2-gcc41.patch: --- NEW FILE rapidsvn-0.9.2-gcc41.patch --- diff -ur rapidsvn-0.9.2.orig/src/action.hpp rapidsvn-0.9.2/src/action.hpp --- rapidsvn-0.9.2.orig/src/action.hpp 2006-04-04 10:53:17.000000000 +0100 +++ rapidsvn-0.9.2/src/action.hpp 2006-05-30 18:12:59.000000000 +0100 @@ -299,7 +299,7 @@ * @return temporary filename */ svn::Path - Action::GetPathAsTempFile ( + GetPathAsTempFile ( const svn::Path & path, const svn::Revision & revision = svn::Revision::HEAD); Only in rapidsvn-0.9.2/src: action.hpp.orig diff -ur rapidsvn-0.9.2.orig/src/preferences_dlg.cpp rapidsvn-0.9.2/src/preferences_dlg.cpp --- rapidsvn-0.9.2.orig/src/preferences_dlg.cpp 2006-05-10 14:52:36.000000000 +0100 +++ rapidsvn-0.9.2/src/preferences_dlg.cpp 2006-05-30 18:13:17.000000000 +0100 @@ -94,7 +94,7 @@ class ProgramsPanel : public wxPanel { public: - ProgramsPanel::ProgramsPanel (wxWindow* parent, Preferences * prefs) + ProgramsPanel (wxWindow* parent, Preferences * prefs) : wxPanel (parent), m_prefs (prefs) { InitializeData (); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 May 2006 21:48:05 -0000 1.2 +++ .cvsignore 30 May 2006 22:15:01 -0000 1.3 @@ -1 +1 @@ -rapidsvn-0.9.1.tar.gz +rapidsvn-0.9.2.tar.gz Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/rapidsvn.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rapidsvn.spec 4 May 2006 21:48:05 -0000 1.1 +++ rapidsvn.spec 30 May 2006 22:15:01 -0000 1.2 @@ -1,15 +1,20 @@ Name: rapidsvn -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools License: GPL URL: http://www.rapidsvn.org/ Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz -Patch0: rapidsvn-0.9.1-gcc41.patch +Patch0: rapidsvn-0.9.2-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Has to be a manual requirement, because the library version appears to not +# be being bumped upstream on API changes - well, at least RapidSVN 0.9.2 +# has unresolved symbols if run against svncpp from the 0.9.1 distribution +Requires: svncpp = %{version} + BuildRequires: apr-devel, apr-util-devel, neon-devel BuildRequires: libtool >= 1.4.2 @@ -136,6 +141,10 @@ %{_libdir}/libsvncpp.so %changelog +* Tue May 30 2006 Tim Jackson 0.9.2-1 +- Update to 0.9.2 +- Add explicit dep on svn-cpp = [rapidsvn ver] + * Wed May 03 2006 Tim Jackson 0.9.1-3 - libtool hack to fix RPATH issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 May 2006 21:48:05 -0000 1.2 +++ sources 30 May 2006 22:15:01 -0000 1.3 @@ -1 +1 @@ -ba03034db35912c7b51b146cc7e6090e rapidsvn-0.9.1.tar.gz +f52e7cdb233abf8c56ff21ee0cf268c4 rapidsvn-0.9.2.tar.gz --- rapidsvn-0.9.1-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Tue May 30 23:10:12 2006 From: fedora-extras-commits at redhat.com (Tim Jackson (timj)) Date: Tue, 30 May 2006 16:10:12 -0700 Subject: rpms/rapidsvn/FC-5 rapidsvn-0.9.2-gcc41.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rapidsvn.spec, 1.1, 1.2 sources, 1.2, 1.3 rapidsvn-0.9.1-gcc41.patch, 1.1, NONE Message-ID: <200605302310.k4UNAEOs026560@cvs-int.fedora.redhat.com> Author: timj Update of /cvs/extras/rpms/rapidsvn/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26536 Modified Files: .cvsignore rapidsvn.spec sources Added Files: rapidsvn-0.9.2-gcc41.patch Removed Files: rapidsvn-0.9.1-gcc41.patch Log Message: Check in rapidsvn-0.9.2 rapidsvn-0.9.2-gcc41.patch: --- NEW FILE rapidsvn-0.9.2-gcc41.patch --- diff -ur rapidsvn-0.9.2.orig/src/action.hpp rapidsvn-0.9.2/src/action.hpp --- rapidsvn-0.9.2.orig/src/action.hpp 2006-04-04 10:53:17.000000000 +0100 +++ rapidsvn-0.9.2/src/action.hpp 2006-05-30 18:12:59.000000000 +0100 @@ -299,7 +299,7 @@ * @return temporary filename */ svn::Path - Action::GetPathAsTempFile ( + GetPathAsTempFile ( const svn::Path & path, const svn::Revision & revision = svn::Revision::HEAD); Only in rapidsvn-0.9.2/src: action.hpp.orig diff -ur rapidsvn-0.9.2.orig/src/preferences_dlg.cpp rapidsvn-0.9.2/src/preferences_dlg.cpp --- rapidsvn-0.9.2.orig/src/preferences_dlg.cpp 2006-05-10 14:52:36.000000000 +0100 +++ rapidsvn-0.9.2/src/preferences_dlg.cpp 2006-05-30 18:13:17.000000000 +0100 @@ -94,7 +94,7 @@ class ProgramsPanel : public wxPanel { public: - ProgramsPanel::ProgramsPanel (wxWindow* parent, Preferences * prefs) + ProgramsPanel (wxWindow* parent, Preferences * prefs) : wxPanel (parent), m_prefs (prefs) { InitializeData (); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 May 2006 21:48:05 -0000 1.2 +++ .cvsignore 30 May 2006 23:10:12 -0000 1.3 @@ -1 +1 @@ -rapidsvn-0.9.1.tar.gz +rapidsvn-0.9.2.tar.gz Index: rapidsvn.spec =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/FC-5/rapidsvn.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rapidsvn.spec 4 May 2006 21:48:05 -0000 1.1 +++ rapidsvn.spec 30 May 2006 23:10:12 -0000 1.2 @@ -1,15 +1,20 @@ Name: rapidsvn -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Graphical interface for the Subversion revision control system Group: Development/Tools License: GPL URL: http://www.rapidsvn.org/ Source0: http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz -Patch0: rapidsvn-0.9.1-gcc41.patch +Patch0: rapidsvn-0.9.2-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Has to be a manual requirement, because the library version appears to not +# be being bumped upstream on API changes - well, at least RapidSVN 0.9.2 +# has unresolved symbols if run against svncpp from the 0.9.1 distribution +Requires: svncpp = %{version} + BuildRequires: apr-devel, apr-util-devel, neon-devel BuildRequires: libtool >= 1.4.2 @@ -136,6 +141,10 @@ %{_libdir}/libsvncpp.so %changelog +* Tue May 30 2006 Tim Jackson 0.9.2-1 +- Update to 0.9.2 +- Add explicit dep on svn-cpp = [rapidsvn ver] + * Wed May 03 2006 Tim Jackson 0.9.1-3 - libtool hack to fix RPATH issue Index: sources =================================================================== RCS file: /cvs/extras/rpms/rapidsvn/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 May 2006 21:48:05 -0000 1.2 +++ sources 30 May 2006 23:10:12 -0000 1.3 @@ -1 +1 @@ -ba03034db35912c7b51b146cc7e6090e rapidsvn-0.9.1.tar.gz +f52e7cdb233abf8c56ff21ee0cf268c4 rapidsvn-0.9.2.tar.gz --- rapidsvn-0.9.1-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 00:08:55 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 30 May 2006 17:08:55 -0700 Subject: rpms/gobby/FC-5 .cvsignore, 1.4, 1.5 gobby.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200605310008.k4V08vJP029149@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/gobby/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29128 Modified Files: .cvsignore gobby.spec sources Log Message: 0.3.1 bugfix release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gobby/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Dec 2005 09:13:30 -0000 1.4 +++ .cvsignore 31 May 2006 00:08:55 -0000 1.5 @@ -1 +1 @@ -gobby-0.3.0.tar.gz +gobby-0.3.1.tar.gz Index: gobby.spec =================================================================== RCS file: /cvs/extras/rpms/gobby/FC-5/gobby.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gobby.spec 15 Feb 2006 22:09:21 -0000 1.7 +++ gobby.spec 31 May 2006 00:08:55 -0000 1.8 @@ -1,6 +1,6 @@ Name: gobby -Version: 0.3.0 -Release: 4%{?dist} +Version: 0.3.1 +Release: 1%{?dist} Summary: Free collaborative editor Group: Applications/Internet @@ -66,6 +66,9 @@ %changelog +* Tue May 30 2006 Luke Macken - 0.3.1-1 +- 0.3.1 bugfix release + * Wed Feb 15 2006 Luke Macken - 0.3.0-4 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gobby/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Dec 2005 09:13:30 -0000 1.4 +++ sources 31 May 2006 00:08:55 -0000 1.5 @@ -1 +1 @@ -1b674f42654cc1960d37e0a6a2fcff1f gobby-0.3.0.tar.gz +157f20caeb4c875712f405bec1ec4699 gobby-0.3.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 03:23:33 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:23:33 -0700 Subject: rpms/poker-engine - New directory Message-ID: <200605310323.k4V3NZRK004188@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/poker-engine Log Message: Directory /cvs/extras/rpms/poker-engine added to the repository From fedora-extras-commits at redhat.com Wed May 31 03:23:33 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:23:33 -0700 Subject: rpms/poker-engine/devel - New directory Message-ID: <200605310323.k4V3NZPd004191@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/poker-engine/devel Log Message: Directory /cvs/extras/rpms/poker-engine/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 03:23:50 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:23:50 -0700 Subject: rpms/poker-engine Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605310323.k4V3Nqcx004246@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4213 Added Files: Makefile import.log Log Message: Setup of module poker-engine --- NEW FILE Makefile --- # Top level Makefile for module poker-engine all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 03:23:51 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:23:51 -0700 Subject: rpms/poker-engine/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605310323.k4V3NrbP004249@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4213/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module poker-engine --- NEW 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 May 31 03:24:15 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:24:15 -0700 Subject: rpms/poker-engine import.log,1.1,1.2 Message-ID: <200605310324.k4V3OloV004311@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4277 Modified Files: import.log Log Message: auto-import poker-engine-1.0.15-1 on branch devel from poker-engine-1.0.15-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/poker-engine/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 03:23:50 -0000 1.1 +++ import.log 31 May 2006 03:24:15 -0000 1.2 @@ -0,0 +1 @@ +poker-engine-1_0_15-1:HEAD:poker-engine-1.0.15-1.src.rpm:1149045848 From fedora-extras-commits at redhat.com Wed May 31 03:24:15 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:24:15 -0700 Subject: rpms/poker-engine/devel poker-engine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605310324.k4V3OldO004315@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/poker-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4277/devel Modified Files: .cvsignore sources Added Files: poker-engine.spec Log Message: auto-import poker-engine-1.0.15-1 on branch devel from poker-engine-1.0.15-1.src.rpm --- NEW FILE poker-engine.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: poker-engine Version: 1.0.15 Release: 1%{?dist} Summary: Python library that implements poker rules Group: Development/Libraries License: GPL URL: http://pokersource.org/poker-engine Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: pypoker-eval-devel >= 128.0 BuildRequires: rsync libxml2-python libxslt-python Requires: pypoker-eval >= 128.0 Requires: rsync %description This is a python library that implements poker rules according to variants and betting structures specified in configuration files. It designed to be used by a multiplayer poker server, a poker AI or a poker client. %package devel Summary: Poker rule implementation library development files Group: Development/Libraries Requires: pypoker-eval-devel Requires: %{name} = %{version}-%{release} %description devel This package contains files required to build applications that use poker-engine. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %check # upstream is aware of some check failures make %{?_smp_mflags} check %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %doc %{_mandir}/man8/*.8.gz %{_sbindir}/pokerconfigupgrade %{_datadir}/%{name}/conf/*.xml %{python_sitelib}/pokerengine/*.py %{python_sitelib}/pokerengine/*.pyc %ghost %{python_sitelib}/pokerengine/*.pyo %config(noreplace) %{_sysconfdir}/%{name}/* %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %changelog * Tue May 30 2006 Christopher Stone - 1.0.15-1 - Upstream sync - Add rsync to Requires - Remove patches and autoreconf since these have been fixed in new release * Mon May 15 2006 Christopher Stone - 1.0.14-3 - Add Requires pypoker-eval-devel to devel package * Sun May 14 2006 Christopher Stone - 1.0.14-2 - Add patch for noarch configuration - Readded BuildArch of noarch - Removed python-abi Requires - Added %%check section - Updated Source0 location - Add patch to place python files in sitelib - Replace %%{python_sitearch} with %%{python_sitelib} - Removed unnecessary Requires - Removed examples from -devel since this is no longer maintained by upstream * Thu Mar 30 2006 Loic Dachary - 1.0.14-1 - upstream sync * Sun Mar 26 2006 Christopher Stone 1.0.13-2 - Fix BuildRequires * Sat Mar 25 2006 Loic Dachary 1.0.13-1 - upstream sync * Fri Mar 17 2006 Christopher Stone 1.0.12-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/poker-engine/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 03:23:51 -0000 1.1 +++ .cvsignore 31 May 2006 03:24:15 -0000 1.2 @@ -0,0 +1 @@ +poker-engine-1.0.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/poker-engine/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 03:23:51 -0000 1.1 +++ sources 31 May 2006 03:24:15 -0000 1.2 @@ -0,0 +1 @@ +5b51616881d0ee10354b0f5f573a52d1 poker-engine-1.0.15.tar.gz From fedora-extras-commits at redhat.com Wed May 31 03:26:49 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:26:49 -0700 Subject: owners owners.list,1.1076,1.1077 Message-ID: <200605310326.k4V3QpK8004370@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4353 Modified Files: owners.list Log Message: Add poker-engine Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1076 retrieving revision 1.1077 diff -u -r1.1076 -r1.1077 --- owners.list 30 May 2006 14:50:52 -0000 1.1076 +++ owners.list 31 May 2006 03:26:48 -0000 1.1077 @@ -1323,6 +1323,7 @@ Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|poker-engine|Python library that implements poker rules|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|poker-eval|Poker hand evaluator library|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|polyxmass-bin|The GNU polyxmass software suite|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|polyxmass-common|Contains all textual/graphical data required for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 03:30:44 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:30:44 -0700 Subject: rpms/nucleo - New directory Message-ID: <200605310330.k4V3Uk24004458@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4437/nucleo Log Message: Directory /cvs/extras/rpms/nucleo added to the repository From fedora-extras-commits at redhat.com Wed May 31 03:30:45 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:30:45 -0700 Subject: rpms/nucleo/devel - New directory Message-ID: <200605310330.k4V3UlGF004461@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4437/nucleo/devel Log Message: Directory /cvs/extras/rpms/nucleo/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 03:30:59 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:30:59 -0700 Subject: rpms/nucleo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605310331.k4V3V1LZ004515@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4482 Added Files: Makefile import.log Log Message: Setup of module nucleo --- NEW FILE Makefile --- # Top level Makefile for module nucleo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 03:31:00 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:31:00 -0700 Subject: rpms/nucleo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605310331.k4V3V29s004516@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4482/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nucleo --- NEW 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 May 31 03:31:44 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:31:44 -0700 Subject: rpms/nucleo/devel nucleo-0.5-64bit.patch, NONE, 1.1 nucleo-0.5-gcc.patch, NONE, 1.1 nucleo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605310331.k4V3VkMc004601@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557/devel Modified Files: .cvsignore sources Added Files: nucleo-0.5-64bit.patch nucleo-0.5-gcc.patch nucleo.spec Log Message: auto-import nucleo-0.5-2 on branch devel from nucleo-0.5-2.src.rpm nucleo-0.5-64bit.patch: --- NEW FILE nucleo-0.5-64bit.patch --- --- nucleo/image/Image.cxx.orig 2006-05-20 12:38:57.000000000 -0700 +++ nucleo/image/Image.cxx 2006-05-20 12:39:07.000000000 -0700 @@ -240,7 +240,7 @@ out << getWidth() << "x" << getHeight() << " " << std::flush ; out << getEncodingName(_encoding) ; out << " (" << _size ; - out << " " << std::hex << "0x" << (int)_data << std::dec ; + out << " " << std::hex << "0x" << (intptr_t)_data << std::dec ; out << " " << getFreeMethodName(_fmethod) ; out << ")" << std::flush ; } --- nucleo/gl/scenegraph/sgNode.cxx.orig 2006-05-20 12:39:46.000000000 -0700 +++ nucleo/gl/scenegraph/sgNode.cxx 2006-05-20 12:40:00.000000000 -0700 @@ -283,7 +283,7 @@ sgNode::selectGraph(void) { // if (debugMode) std::cout << "select '" << _name << "' (" << this << ")" << std::endl ; if (_hidden) return; - glPushName((GLuint)this) ; + glPushName((intptr_t)this) ; glPushMatrix() ; glMultMatrixf((const GLfloat *)_transformations) ; select() ; nucleo-0.5-gcc.patch: --- NEW FILE nucleo-0.5-gcc.patch --- --- nucleo/utils/StringUtils.cxx.orig 2006-05-20 12:37:48.000000000 -0700 +++ nucleo/utils/StringUtils.cxx 2006-05-20 12:37:58.000000000 -0700 @@ -17,10 +17,6 @@ namespace nucleo { -#if defined(__GNUC__) - template class std::basic_string ; -#endif - void trimString(std::string &s, std::string badboys) { std::string::size_type end = s.find_last_not_of(badboys) ; --- NEW FILE nucleo.spec --- Name: nucleo Version: 0.5 Release: 2%{?dist} Summary: Toolkit for exploring new uses of video Group: Development/Tools License: LGPL URL: http://insitu.lri.fr/~roussel/projects/nucleo Source0: http://insitu.lri.fr/~chapuis/software/metisse/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-gcc.patch Patch1: %{name}-%{version}-64bit.patch BuildRequires: libGL-devel libGLU-devel BuildRequires: libjpeg-devel libpng-devel libexif-devel freetype-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Nucleo is a toolkit for exploring new uses of video and new human-computer interaction techniques. %package devel Summary: Files necessary for developing with %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains files required to build applications that make use of %{name}. %prep %setup -q %patch0 -p0 -b .gcc %patch1 -p0 -b .64bit %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LESSER INSTALL LICENSE NEWS README %{_bindir}/nBundle %{_bindir}/nTest %{_bindir}/videoClient %{_bindir}/videoServer %{_libdir}/libNucleo.so.* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %files devel %defattr(-,root,root,-) %{_bindir}/%{name}-config %dir %{_includedir}/%{name} %{_includedir}/%{name}/* %{_libdir}/libNucleo.so %{_libdir}/pkgconfig/%{name}.pc %exclude %{_libdir}/*.la %changelog * Sun May 21 2006 Christopher Stone 0.5-2 - Add optional BuildRequires * Sat May 20 2006 Christopher Stone 0.5-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nucleo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 03:31:00 -0000 1.1 +++ .cvsignore 31 May 2006 03:31:44 -0000 1.2 @@ -0,0 +1 @@ +nucleo-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nucleo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 03:31:00 -0000 1.1 +++ sources 31 May 2006 03:31:44 -0000 1.2 @@ -0,0 +1 @@ +e968b0ce94a69119a11d113f973aa616 nucleo-0.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 03:31:44 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:31:44 -0700 Subject: rpms/nucleo import.log,1.1,1.2 Message-ID: <200605310331.k4V3VkeK004592@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/nucleo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557 Modified Files: import.log Log Message: auto-import nucleo-0.5-2 on branch devel from nucleo-0.5-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nucleo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 03:30:59 -0000 1.1 +++ import.log 31 May 2006 03:31:44 -0000 1.2 @@ -0,0 +1 @@ +nucleo-0_5-2:HEAD:nucleo-0.5-2.src.rpm:1149046298 From fedora-extras-commits at redhat.com Wed May 31 03:33:20 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 30 May 2006 20:33:20 -0700 Subject: owners owners.list,1.1077,1.1078 Message-ID: <200605310333.k4V3XM7Z004650@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4633 Modified Files: owners.list Log Message: Add nucleo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1077 retrieving revision 1.1078 diff -u -r1.1077 -r1.1078 --- owners.list 31 May 2006 03:26:48 -0000 1.1077 +++ owners.list 31 May 2006 03:33:20 -0000 1.1078 @@ -871,6 +871,7 @@ Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|nsd|NSD is a complete implementation of an authoritative DNS name server|paul at xtdnet.nl|extras-qa at fedoraproject.org| Fedora Extras|ntl|High-performance algorithms for vectors, matrices, and polynomials|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|nucleo|Toolkit for exploring new uses of video|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|numpy|A fast multidimensional array facility for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|nuttcp|A network performance measurement tool intended for use by network and system managers|rvokal at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 04:23:56 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 21:23:56 -0700 Subject: rpms/texmaker/FC-4 texmaker.spec,1.3,1.4 Message-ID: <200605310423.k4V4Nww6007134@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7117 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- texmaker.spec 25 May 2006 19:04:38 -0000 1.3 +++ texmaker.spec 31 May 2006 04:23:56 -0000 1.4 @@ -1,13 +1,14 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -83,6 +84,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-2 +- This should have been a noarch package (#193601) + * Thu May 25 2006 Deji Akingunola - 1.3-1 - Updated to 1.3 - had to add epoch to facilitate an upgrade - New version depends on qt4 From fedora-extras-commits at redhat.com Wed May 31 04:38:55 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 21:38:55 -0700 Subject: rpms/texmaker/FC-5 texmaker.spec,1.4,1.5 Message-ID: <200605310438.k4V4cvW5007224@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7207 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- texmaker.spec 25 May 2006 19:03:48 -0000 1.4 +++ texmaker.spec 31 May 2006 04:38:55 -0000 1.5 @@ -1,13 +1,14 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -83,6 +84,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-2 +- This should have been a noarch package (#193601) + * Thu May 25 2006 Deji Akingunola - 1.3-1 - Updated to 1.3 - had to add epoch to facilitate an upgrade - New version depends on qt4 From fedora-extras-commits at redhat.com Wed May 31 04:39:25 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 30 May 2006 21:39:25 -0700 Subject: rpms/texmaker/devel texmaker.spec,1.4,1.5 Message-ID: <200605310439.k4V4dRHw007285@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7268 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- texmaker.spec 25 May 2006 18:51:05 -0000 1.4 +++ texmaker.spec 31 May 2006 04:39:25 -0000 1.5 @@ -1,13 +1,14 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -83,6 +84,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-2 +- This should have been a noarch package (#193601) + * Thu May 25 2006 Deji Akingunola - 1.3-1 - Updated to 1.3 - had to add epoch to facilitate an upgrade - New version depends on qt4 From fedora-extras-commits at redhat.com Wed May 31 04:39:49 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 30 May 2006 21:39:49 -0700 Subject: rpms/Coin2/FC-3 .cvsignore, 1.6, 1.7 Coin2.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200605310439.k4V4dpW3007350@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7329 Modified Files: .cvsignore Coin2.spec sources Log Message: * Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 - Upstream update. - Drop gcc-4.1 patch. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Aug 2005 08:46:48 -0000 1.6 +++ .cvsignore 31 May 2006 04:39:49 -0000 1.7 @@ -1,3 +1 @@ -Coin-2.4.3-libtool.diff.bz2 -Coin-2.4.3-simacros.diff.bz2 -Coin-2.4.3.tar.gz +Coin-2.4.5.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-3/Coin2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Coin2.spec 1 Aug 2005 08:46:48 -0000 1.9 +++ Coin2.spec 31 May 2006 04:39:49 -0000 1.10 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany. +# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -9,11 +9,10 @@ %define libopenal_SONAME libopenal.so.0 %define libsimage_SONAME libsimage.so.20 -%define libfreetype_SONAME libfreetype.so.6 Summary: High-level 3D visualization library Name: Coin2 -Version: 2.4.3 +Version: 2.4.5 Release: 1%{?dist} License: GPL @@ -24,16 +23,17 @@ Patch0: coin-2.3.0-simage-soname.diff Patch1: coin-2.3.0-openal-soname.diff -Patch2: coin-2.3.0-freetype-soname.diff -Patch3: Coin-2.4.3-simacros.diff.bz2 -Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU BuildRequires: xorg-x11-devel -BuildRequires: zlib-devel bzip2-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel BuildRequires: doxygen +BuildRequires: /usr/bin/rename BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -56,13 +56,8 @@ %setup -q -n Coin-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 -sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ - src/glue/freetype.c sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \ src/glue/simage_wrapper.c sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \ @@ -76,18 +71,23 @@ --disable-dl-libbzip2 \ --disable-dl-glu \ --disable-dl-zlib \ + --disable-dl-freetype \ + --disable-dl-fontconfig \ + --disable-spidermonkey \ --enable-man \ --enable-html \ --enable-3ds-import \ - htmldir=%{coin_htmldir}/Coin + htmldir=%{coin_htmldir}/Coin \ + CPPFLAGS=$(pkg-config --cflags freetype2) make %{?_smp_mflags} %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +/usr/bin/rename .3 .3sim $RPM_BUILD_ROOT%{_mandir}/man3/* %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -114,43 +114,28 @@ %doc %{coin_htmldir} %changelog +* Tue May 30 2006 Ralf Cors??pius - 2.4.5-1 +- Upstream update. +- Drop gcc-4.1 patch. +- Spec file cleanup. + +* Wed Feb 22 2006 Ralf Cors??pius - 2.4.4-3.2 +- Rename man3 manpages to .3sim (PR 182212). + +* Thu Sep 22 2005 Ralf Cors??pius - 2.4.4-3.1 +- Add Coin-2.4.4-gcc-4.1.diff. +- Remove ancient changelog entries from spec file. + +* Thu Sep 22 2005 Ralf Corsepius - 2.4.4-3 +- Remove simacros patch. +- Remove libtool patch. +- Link against freetype2. + +* Tue Sep 20 2005 Ralf Corsepius - 2.4.4-1 +- Upstream update. + * Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 - Upstream update. * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. - -* Tue May 10 2005 Ralf Corsepius - 0:2.3.0-9 -- Introduce %%{coin_includedir} %%{coin_htmldir}. -- Misc. spec cleanup. - -* Fri May 06 2005 Ralf Corsepius - 0:2.3.0-8 -- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead - SONAME handling. - -* Tue May 03 2005 Ralf Corsepius - 0:2.3.0-7 -- Minor spec changes. - -* Tue Feb 22 2005 Ralf Corsepius - 0:2.3.0-5 -- Include simacros. -- Regenerate configure from simacros and FC3 libtool for x86_64. -- Don't install bogusly generated manpages for dirs. - -* Sun Jul 4 2004 Ralf Corsepius - 0:2.3.0-0.fdr.4 -- Let Coin-devel Require: bzip2-devel, zlib-devel. -- Use @XX@ patterns in soname sed calls. -- Remove Mesa from BuildRequires. - -* Sat Jul 3 2004 Ralf Corsepius - 0:2.3.0-0.fdr.3 -- Disable run-time linkage for GLU, bzip2, zlib. -- Add SONAME-hacks to simage, openal, freetype. -- Enable static libs. - -* Fri Jun 25 2004 Ralf Corsepius - 0:2.3.0-0.fdr.2 -- Fix package description. -- Initial submission to Fedora Extra. - -* Thu Jun 24 2004 Ralf Corsepius - 0:2.3.0-0.fdr.1 -- Update to 2.3.0 -- Install html docs to default installation dir (%%{_datadir}/html). -- Remove dependency to simage. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Aug 2005 08:46:48 -0000 1.6 +++ sources 31 May 2006 04:39:49 -0000 1.7 @@ -1,3 +1 @@ -e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 -4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 -57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz +99b83c5189c3755fd5f08fcad0994a7b Coin-2.4.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 07:22:42 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 31 May 2006 00:22:42 -0700 Subject: rpms/SoQt/devel SoQt.spec,1.15,1.16 Message-ID: <200605310722.k4V7MiY7014881@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14864 Modified Files: SoQt.spec Log Message: * Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 - Rebuild against Coin-2.4.5. - Spec file cleanup. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- SoQt.spec 20 Feb 2006 03:48:32 -0000 1.15 +++ SoQt.spec 31 May 2006 07:22:42 -0000 1.16 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -86,38 +86,13 @@ %{_mandir}/man?/*.?.gz %changelog +* Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 +- Rebuild against Coin-2.4.5. +- Spec file cleanup. + * Mon Feb 20 2006 Ralf Cors??pius - 0:1.3.0-2 - Rebuild for FC5. * Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 - Update to 1.3.0 - Build w/o simacros. - -* Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 -- Rebuild against Coin-2.4.3. -- Let devel provide Coin2-SoQt-devel. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 -- Rebuild against Coin-2.4.1. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-5 -- Add *-man3.diff. Prevent bogus manpages. -- Mark html as %doc. -- Install html docs into %%{_datadir}/Coin2/SoQt. - -* Mon May 09 2005 Ralf Corsepius - 0:1.2.0-4 -- Add Provides:Coin2-SoQt*. - -* Tue Apr 12 2005 Ralf Corsepius - 0:1.2.0-3 -- Include simacros. -- Work-around issues with RH's libtool. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Aug 27 2004 Ralf Corsepius - 0:1.2.0-0.fdr.1 -- Update. -- Minor cleanups to the spec. - -* Sun Jul 4 2004 Ralf Corsepius - 0:1.0.2-0.fdr.1 -- Initial Fedora Extras RPM. From fedora-extras-commits at redhat.com Wed May 31 07:35:58 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 31 May 2006 00:35:58 -0700 Subject: rpms/SoQt/FC-5 SoQt.spec,1.15,1.16 Message-ID: <200605310736.k4V7a0c7014966@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14949 Modified Files: SoQt.spec Log Message: * Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 - Rebuild against Coin-2.4.5. - Spec file cleanup. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-5/SoQt.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- SoQt.spec 20 Feb 2006 03:48:32 -0000 1.15 +++ SoQt.spec 31 May 2006 07:35:58 -0000 1.16 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -86,38 +86,13 @@ %{_mandir}/man?/*.?.gz %changelog +* Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 +- Rebuild against Coin-2.4.5. +- Spec file cleanup. + * Mon Feb 20 2006 Ralf Cors??pius - 0:1.3.0-2 - Rebuild for FC5. * Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 - Update to 1.3.0 - Build w/o simacros. - -* Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 -- Rebuild against Coin-2.4.3. -- Let devel provide Coin2-SoQt-devel. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 -- Rebuild against Coin-2.4.1. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-5 -- Add *-man3.diff. Prevent bogus manpages. -- Mark html as %doc. -- Install html docs into %%{_datadir}/Coin2/SoQt. - -* Mon May 09 2005 Ralf Corsepius - 0:1.2.0-4 -- Add Provides:Coin2-SoQt*. - -* Tue Apr 12 2005 Ralf Corsepius - 0:1.2.0-3 -- Include simacros. -- Work-around issues with RH's libtool. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Aug 27 2004 Ralf Corsepius - 0:1.2.0-0.fdr.1 -- Update. -- Minor cleanups to the spec. - -* Sun Jul 4 2004 Ralf Corsepius - 0:1.0.2-0.fdr.1 -- Initial Fedora Extras RPM. From fedora-extras-commits at redhat.com Wed May 31 07:37:47 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 31 May 2006 00:37:47 -0700 Subject: rpms/SoQt/FC-4 SoQt.spec,1.10,1.11 Message-ID: <200605310737.k4V7bnxg015027@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15010 Modified Files: SoQt.spec Log Message: * Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 - Rebuild against Coin-2.4.5. - Spec file cleanup. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/SoQt.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SoQt.spec 23 Sep 2005 13:20:55 -0000 1.10 +++ SoQt.spec 31 May 2006 07:37:47 -0000 1.11 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.3.0 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -86,35 +86,13 @@ %{_mandir}/man?/*.?.gz %changelog +* Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 +- Rebuild against Coin-2.4.5. +- Spec file cleanup. + +* Mon Feb 20 2006 Ralf Cors??pius - 0:1.3.0-2 +- Rebuild for FC5. + * Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 - Update to 1.3.0 - Build w/o simacros. - -* Wed Jul 13 2005 Ralf Corsepius - 0:1.2.0-7 -- Rebuild against Coin-2.4.3. -- Let devel provide Coin2-SoQt-devel. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 -- Rebuild against Coin-2.4.1. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-5 -- Add *-man3.diff. Prevent bogus manpages. -- Mark html as %doc. -- Install html docs into %%{_datadir}/Coin2/SoQt. - -* Mon May 09 2005 Ralf Corsepius - 0:1.2.0-4 -- Add Provides:Coin2-SoQt*. - -* Tue Apr 12 2005 Ralf Corsepius - 0:1.2.0-3 -- Include simacros. -- Work-around issues with RH's libtool. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Aug 27 2004 Ralf Corsepius - 0:1.2.0-0.fdr.1 -- Update. -- Minor cleanups to the spec. - -* Sun Jul 4 2004 Ralf Corsepius - 0:1.0.2-0.fdr.1 -- Initial Fedora Extras RPM. From fedora-extras-commits at redhat.com Wed May 31 07:42:46 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 31 May 2006 00:42:46 -0700 Subject: rpms/scim-qtimm/FC-4 scim-qtimm.spec,1.2,1.3 Message-ID: <200605310742.k4V7gmbA015107@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-qtimm/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15090 Modified Files: scim-qtimm.spec Log Message: bump release (#193625) Index: scim-qtimm.spec =================================================================== RCS file: /cvs/extras/rpms/scim-qtimm/FC-4/scim-qtimm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-qtimm.spec 23 Aug 2005 07:12:47 -0000 1.2 +++ scim-qtimm.spec 31 May 2006 07:42:46 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-qtimm Version: 0.9.4 -Release: 0%{?dist} +Release: 1%{?dist} Summary: SCIM input method module for Qt License: GPL @@ -47,6 +47,9 @@ %changelog +* Wed Aug 24 2005 Jens Petersen - 0.9.4-1.fc4 +- bump release (#193625) + * Wed Aug 17 2005 Jens Petersen - 0.9.4-0 - update to 0.9.4 From fedora-extras-commits at redhat.com Wed May 31 07:44:39 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 31 May 2006 00:44:39 -0700 Subject: fedora-security/audit fc4,1.272,1.273 fc5,1.185,1.186 Message-ID: <200605310744.k4V7id3M015171@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15151/audit Modified Files: fc4 fc5 Log Message: Update CVE-2006-1343 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- fc4 30 May 2006 20:45:57 -0000 1.272 +++ fc4 31 May 2006 07:44:37 -0000 1.273 @@ -147,7 +147,7 @@ CVE-2006-1490 VULNERABLE (php, fixed 5.1.4) CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245] CVE-2006-1354 VULNERABLE (freeradius) #186084 -CVE-2006-1343 VULNERABLE (kernel) +CVE-2006-1343 VULNERABLE (kernel, fixed 2.6.16.19) CVE-2006-1342 version (kernel, not 2.6) not vulnerable CVE-2006-1273 ignore (firefox) This is an IE only issue CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- fc5 30 May 2006 20:45:57 -0000 1.185 +++ fc5 31 May 2006 07:44:37 -0000 1.186 @@ -145,7 +145,7 @@ CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289] CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233] CVE-2006-1354 VULNERABLE (freeradius) bz#186084 -CVE-2006-1343 VULNERABLE (kernel) +CVE-2006-1343 VULNERABLE (kernel, fixed 2.6.16.19) CVE-2006-1342 version (kernel, not 2.6) not vulnerable CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 version (beagle, fixed 0.2.4) bz#185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188 From fedora-extras-commits at redhat.com Wed May 31 08:03:38 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:03:38 -0700 Subject: rpms/openalpp - New directory Message-ID: <200605310803.k4V83epc017632@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611/openalpp Log Message: Directory /cvs/extras/rpms/openalpp added to the repository From fedora-extras-commits at redhat.com Wed May 31 08:03:38 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:03:38 -0700 Subject: rpms/openalpp/devel - New directory Message-ID: <200605310803.k4V83euv017635@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17611/openalpp/devel Log Message: Directory /cvs/extras/rpms/openalpp/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 08:03:52 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:03:52 -0700 Subject: rpms/openalpp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605310803.k4V83sD5017689@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17656 Added Files: Makefile import.log Log Message: Setup of module openalpp --- NEW FILE Makefile --- # Top level Makefile for module openalpp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 08:03:53 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:03:53 -0700 Subject: rpms/openalpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605310803.k4V83thx017692@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17656/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module openalpp --- NEW 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 May 31 08:04:44 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:04:44 -0700 Subject: rpms/openalpp import.log,1.1,1.2 Message-ID: <200605310804.k4V84k5d017759@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17725 Modified Files: import.log Log Message: auto-import openalpp-20060405-3 on branch devel from openalpp-20060405-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/openalpp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 08:03:52 -0000 1.1 +++ import.log 31 May 2006 08:04:44 -0000 1.2 @@ -0,0 +1 @@ +openalpp-20060405-3:HEAD:openalpp-20060405-3.src.rpm:1149062678 From fedora-extras-commits at redhat.com Wed May 31 08:04:45 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:04:45 -0700 Subject: rpms/openalpp/devel openalpp-cvs-debian-01.dpatch, NONE, 1.1 openalpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605310804.k4V84l3p017764@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/openalpp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17725/devel Modified Files: .cvsignore sources Added Files: openalpp-cvs-debian-01.dpatch openalpp.spec Log Message: auto-import openalpp-20060405-3 on branch devel from openalpp-20060405-3.src.rpm --- NEW FILE openalpp-cvs-debian-01.dpatch --- #! /bin/sh /usr/share/dpatch/dpatch-run @DPATCH@ Index: configure.in =================================================================== RCS file: /cvs/underware/openalpp/configure.in,v retrieving revision 1.11 diff -b -B -u -u -r1.11 configure.in --- openalpp/configure.in 7 Apr 2006 17:16:29 -0000 1.11 +++ openalpp/configure.in 7 May 2006 19:31:53 -0000 @@ -70,6 +70,11 @@ AC_CHECK_LIB(openal,main) AC_CHECK_LIB(alut,main) +if test "$ac_cv_lib_alut_main" = "yes" ; then + ALUT_LIB=-lalut +fi +AC_SUBST(ALUT_LIB) + # # Was introduced sometime in 2005, does not show pre-2005 # #define ALC_STEREO_SOURCES 0x1011 Index: openalpp.pc.in =================================================================== RCS file: /cvs/underware/openalpp/openalpp.pc.in,v retrieving revision 1.3 diff -b -B -u -u -r1.3 openalpp.pc.in --- openalpp/openalpp.pc.in 28 Oct 2004 15:20:15 -0000 1.3 +++ openalpp/openalpp.pc.in 7 May 2006 19:31:53 -0000 @@ -7,5 +7,5 @@ Description: OpenAL C++ Abstraction Layer Version: @VERSION@ Requires: openthreads, vorbis, vorbisfile -Libs: -L${libdir} -lopenalpp -lopenal +Libs: -L${libdir} -lopenalpp -lopenal @ALUT_LIB@ Cflags: -I${includedir} Index: src/sourcebase.cpp =================================================================== RCS file: /cvs/underware/openalpp/src/sourcebase.cpp,v retrieving revision 1.1.1.3 diff -b -B -u -u -r1.1.1.3 sourcebase.cpp --- openalpp/src/sourcebase.cpp 7 Sep 2005 12:21:42 -0000 1.1.1.3 +++ openalpp/src/sourcebase.cpp 7 May 2006 19:31:53 -0000 @@ -168,7 +168,7 @@ ALint state; alGetSourceiv(sourcename_,AL_SOURCE_STATE,&state); - if (ALenum errorCode = alGetError() != AL_FALSE) + if (alGetError() != AL_FALSE) { /** error occurs here when switching files fprintf(stderr, "SourceBase::getState() - Warning - Error getting state (%d)\n", --- NEW FILE openalpp.spec --- Name: openalpp Version: 20060405 Release: 3%{?dist} Summary: Object Oriented version of OpenAL Group: System Environment/Libraries License: LGPL URL: http://alpp.sourceforge.net Patch0: openalpp-cvs-debian-01.dpatch Source0: http://download.gna.org/underware/sources/%{name}-cvs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openal-devel freealut-devel libvorbis-devel OpenThreads-devel %description Written in C++, makes OpenAL so much more accessible. Compare openalpp to a scenegraph for OpenGL. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains headers and libraries required to build applications that use %{name}. %prep %setup -q -n %{name}-cvs-%{version} %patch0 -p1 autoreconf --force --install %build %configure --disable-static %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %makeinstall %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/*.so.* %files devel %{_includedir}/openalpp %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/*.so %exclude %{_libdir}/*.la %changelog * Tue May 30 2006 Christopher Stone 20060405-3 - Fix Group - Fix patch number * Sun May 21 2006 Christopher Stone 20060405-2 - Remove unneeded Requires - Remove portaudio from BuildRequires - Add autoreconf to %%prep * Mon Apr 10 2006 Loic Dachary 20060405-1 - upstream sync * Sun Mar 26 2006 Christopher Stone 20060321-2 - Remove docs package - Fix BuildRequires and Requires - Remove unneeded autoconf * Wed Mar 22 2006 Loic Dachary 20060321-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openalpp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 08:03:53 -0000 1.1 +++ .cvsignore 31 May 2006 08:04:45 -0000 1.2 @@ -0,0 +1 @@ +openalpp-cvs-20060405.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/openalpp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 08:03:53 -0000 1.1 +++ sources 31 May 2006 08:04:45 -0000 1.2 @@ -0,0 +1 @@ +f3e8fe435495e9f373c561f93a87e30e openalpp-cvs-20060405.tar.gz From fedora-extras-commits at redhat.com Wed May 31 08:06:15 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 01:06:15 -0700 Subject: owners owners.list,1.1078,1.1079 Message-ID: <200605310806.k4V86Hkc017823@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17806 Modified Files: owners.list Log Message: Add openalpp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1078 retrieving revision 1.1079 diff -u -r1.1078 -r1.1079 --- owners.list 31 May 2006 03:33:20 -0000 1.1078 +++ owners.list 31 May 2006 08:06:15 -0000 1.1079 @@ -884,6 +884,7 @@ Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|openalpp|Object Oriented version of OpenAL|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org Fedora Extras|openbox|Openbox window manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 08:06:36 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 31 May 2006 01:06:36 -0700 Subject: rpms/SoQt/FC-3 .cvsignore, 1.3, 1.4 SoQt.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200605310806.k4V86cVk017852@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17831 Modified Files: .cvsignore SoQt.spec sources Log Message: * Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 - Rebuild against Coin-2.4.5. - Spec file cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Apr 2005 15:32:46 -0000 1.3 +++ .cvsignore 31 May 2006 08:06:36 -0000 1.4 @@ -1,3 +1 @@ -SoQt-1.2.0.tar.gz -SoQt-1.2.0-config.diff.bz2 -SoQt-1.2.0-simacros.diff.bz2 +SoQt-1.3.0.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/SoQt.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SoQt.spec 20 May 2005 14:09:48 -0000 1.7 +++ SoQt.spec 31 May 2006 08:06:36 -0000 1.8 @@ -3,8 +3,8 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.2.0 -Release: 6%{?dist} +Version: 1.3.0 +Release: 3%{?dist} License: GPL Group: System Environment/Libraries @@ -12,14 +12,6 @@ Source: ftp://ftp.coin3d.org/pub/coin/src/SoQt-%{version}.tar.gz -# Needed to rebuild patch1 -Patch0: SoQt-1.2.0-simacros.diff.bz2 - -# Work-around to issues with RH's libtool on ix86_64 -# libtoolize -f -c -# aclocal-1.7 -I cfg/m4 -# autoconf -Patch1: SoQt-1.2.0-config.diff.bz2 Patch2: SoQt-1.2.0-man3.diff BuildRequires: doxygen @@ -40,9 +32,9 @@ %package devel Summary: Development files for SoQt Requires: %{name} = %{version}-%{release} -Requires: autoconf +Requires: %{_datadir}/aclocal Requires: Coin2-devel qt-devel -Provides: Coin2-SoQt = %{version}-%{release} +Provides: Coin2-SoQt-devel = %{version}-%{release} Group: Development/Libraries %description devel @@ -50,8 +42,6 @@ %prep %setup -%patch0 -p1 -%patch1 -p1 %patch2 -p1 %build @@ -66,11 +56,11 @@ make %install - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -96,27 +86,13 @@ %{_mandir}/man?/*.?.gz %changelog -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-6 -- Rebuild against Coin-2.4.1. - -* Mon May 10 2005 Ralf Corsepius - 0:1.2.0-5 -- Add *-man3.diff. Prevent bogus manpages. -- Mark html as %doc. -- Install html docs into %%{_datadir}/Coin2/SoQt. - -* Mon May 09 2005 Ralf Corsepius - 0:1.2.0-4 -- Add Provides:Coin2-SoQt*. - -* Tue Apr 12 2005 Ralf Corsepius - 0:1.2.0-3 -- Include simacros. -- Work-around issues with RH's libtool. - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Aug 27 2004 Ralf Corsepius - 0:1.2.0-0.fdr.1 -- Update. -- Minor cleanups to the spec. - -* Sun Jul 4 2004 Ralf Corsepius - 0:1.0.2-0.fdr.1 -- Initial Fedora Extras RPM. +* Wed May 31 2006 Ralf Cors??pius - 0:1.3.0-3 +- Rebuild against Coin-2.4.5. +- Spec file cleanup. + +* Mon Feb 20 2006 Ralf Cors??pius - 0:1.3.0-2 +- Rebuild for FC5. + +* Fri Sep 23 2005 Ralf Corsepius - 0:1.3.0-1 +- Update to 1.3.0 +- Build w/o simacros. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Apr 2005 15:32:46 -0000 1.3 +++ sources 31 May 2006 08:06:36 -0000 1.4 @@ -1,3 +1 @@ -4a20e834ace358f3e81fd43b38a69efb SoQt-1.2.0.tar.gz -22454ea02257dbff7304da6e9e12dc63 SoQt-1.2.0-config.diff.bz2 -99db70be7488e3b15a164ece03492db6 SoQt-1.2.0-simacros.diff.bz2 +85d6b2b1a78eacd38f1c7219f4a745e3 SoQt-1.3.0.tar.gz From fedora-extras-commits at redhat.com Wed May 31 08:14:13 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Wed, 31 May 2006 01:14:13 -0700 Subject: rpms/qemu/devel .cvsignore, 1.4, 1.5 qemu-0.7.0-build.patch, 1.4, 1.5 qemu.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200605310814.k4V8EFNq017923@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17897 Modified Files: .cvsignore qemu-0.7.0-build.patch qemu.spec sources Log Message: 0.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Mar 2006 00:34:39 -0000 1.4 +++ .cvsignore 31 May 2006 08:14:13 -0000 1.5 @@ -1 +1,2 @@ qemu-0.8.0.tar.gz +qemu-0.8.1.tar.gz qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu-0.7.0-build.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qemu-0.7.0-build.patch 21 Mar 2006 17:28:20 -0000 1.4 +++ qemu-0.7.0-build.patch 31 May 2006 08:14:13 -0000 1.5 @@ -4,8 +4,8 @@ install: all ifneq ($(PROGS),) -- install -m 755 -s $(PROGS) "$(bindir)" -+ install -m 755 $(PROGS) "$(bindir)" +- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" endif ifneq ($(wildcard .depend),) Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qemu.spec 21 Mar 2006 17:28:20 -0000 1.10 +++ qemu.spec 31 May 2006 08:14:13 -0000 1.11 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.8.0 -Release: 6%{?dist} +Version: 0.8.1 +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools @@ -80,6 +80,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Tue May 30 2006 David Woodhouse 0.8.1-1 +- Update to 0.8.1 + * Sat Mar 18 2006 David Woodhouse 0.8.0-6 - Update linker script for PPC Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Mar 2006 00:34:39 -0000 1.4 +++ sources 31 May 2006 08:14:13 -0000 1.5 @@ -1 +1,2 @@ eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz +67d924324a5ab79d017bd97a1e767285 qemu-0.8.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 08:43:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 01:43:14 -0700 Subject: rpms/gcl/FC-4 gcl.spec,1.16,1.17 Message-ID: <200605310843.k4V8hGES018101@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18084 Modified Files: gcl.spec Log Message: Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/FC-4/gcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcl.spec 9 Sep 2005 20:34:17 -0000 1.16 +++ gcl.spec 31 May 2006 08:43:14 -0000 1.17 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 4%{?dist} +Release: 6%{?dist} Summary: GNU Common Lisp Group: Development/Languages From fedora-extras-commits at redhat.com Wed May 31 09:54:01 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 31 May 2006 02:54:01 -0700 Subject: rpms/xfce4-taskmanager/FC-4 xfce4-taskmanager.spec,1.1,1.2 Message-ID: <200605310954.k4V9s3Vj020628@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-taskmanager/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20611 Modified Files: xfce4-taskmanager.spec Log Message: Bump release to fix upgrade path (#193629) Index: xfce4-taskmanager.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-taskmanager/FC-4/xfce4-taskmanager.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-taskmanager.spec 21 Jan 2006 20:17:12 -0000 1.1 +++ xfce4-taskmanager.spec 31 May 2006 09:54:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: xfce4-taskmanager Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Taskmanager for the Xfce desktop environment Group: User Interface/Desktops @@ -46,6 +46,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed May 31 2006 Christoph Wickert - 0.3.1-3 +- Bump release to fix upgrade path (#193629). + * Thu Dec 15 2005 Christoph Wickert - 0.3.1-2 - Initial Fedora Extras version. - Add xfce4-taskmanager.desktop. From fedora-extras-commits at redhat.com Wed May 31 10:00:31 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Wed, 31 May 2006 03:00:31 -0700 Subject: rpms/xfce4-weather-plugin/FC-4 xfce4-weather-plugin.spec,1.2,1.3 Message-ID: <200605311000.k4VA0X9F020710@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-weather-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20693 Modified Files: xfce4-weather-plugin.spec Log Message: Bump release to fix upgrade path (#193630) Index: xfce4-weather-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-weather-plugin/FC-4/xfce4-weather-plugin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xfce4-weather-plugin.spec 11 Apr 2006 11:47:34 -0000 1.2 +++ xfce4-weather-plugin.spec 31 May 2006 10:00:31 -0000 1.3 @@ -41,6 +41,7 @@ %changelog * Tue Apr 11 2006 Christoph Wickert - 0.4.9-5 - Require xfce4-panel. +- Bump release to fix upgrade path (#193630). * Thu Dec 01 2005 Christoph Wickert - 0.4.9-4 - Add libxfcegui4-devel BuildReqs. From fedora-extras-commits at redhat.com Wed May 31 10:14:36 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 31 May 2006 03:14:36 -0700 Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605311014.k4VAEcR6023109@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Math-Pari/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23088 Modified Files: perl-Math-Pari.spec sources .cvsignore Log Message: Update to 2.010705 Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Math-Pari.spec 18 Apr 2006 18:33:50 -0000 1.1 +++ perl-Math-Pari.spec 31 May 2006 10:14:36 -0000 1.2 @@ -9,12 +9,12 @@ Summary: Perl interface to PARI Name: perl-Math-Pari -Version: 2.010704 +Version: 2.010705 # You'll need to replace pariversion with a hardcoded version number if you're # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 2%{?dist} +Release: 1%{?dist} License: Artistic or GPL Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -73,6 +73,9 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Wed May 31 2006 Paul Howarth 2.010705-1 +- Update to 2.010705 + * Tue Apr 18 2006 Paul Howarth 2.010704-2 - Omit dumb docs (#175198) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Apr 2006 18:33:50 -0000 1.2 +++ sources 31 May 2006 10:14:36 -0000 1.3 @@ -1,2 +1,2 @@ -0397da31fbe4f5485c4e7094c3661c5a Math-Pari-2.010704.tar.gz +87afce649551dd906ff7a648e00f5c34 Math-Pari-2.010705.tar.gz 357b7a42e89e2761a5367bbcbfcca5f2 pari-2.1.7.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Apr 2006 18:33:50 -0000 1.2 +++ .cvsignore 31 May 2006 10:14:36 -0000 1.3 @@ -1,2 +1,2 @@ -Math-Pari-2.010704.tar.gz +Math-Pari-2.010705.tar.gz pari-2.1.7.tgz From fedora-extras-commits at redhat.com Wed May 31 10:16:14 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 31 May 2006 03:16:14 -0700 Subject: rpms/perl-Math-Pari/FC-5 perl-Math-Pari.spec, 1.2, 1.3 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605311016.k4VAGGeB023185@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Math-Pari/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23164 Modified Files: perl-Math-Pari.spec sources .cvsignore Log Message: resync with devel Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/perl-Math-Pari.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Math-Pari.spec 20 Apr 2006 07:17:20 -0000 1.2 +++ perl-Math-Pari.spec 31 May 2006 10:16:14 -0000 1.3 @@ -9,12 +9,12 @@ Summary: Perl interface to PARI Name: perl-Math-Pari -Version: 2.010704 +Version: 2.010705 # You'll need to replace pariversion with a hardcoded version number if you're # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 2%{?dist}.1 +Release: 1%{?dist} License: Artistic or GPL Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -73,8 +73,8 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog -* Thu Apr 20 2006 Paul Howarth 2.010704-2.1 -- Bump for tag issue. Won't import mock-built SRPMs again! +* Wed May 31 2006 Paul Howarth 2.010705-1 +- Update to 2.010705 * Tue Apr 18 2006 Paul Howarth 2.010704-2 - Omit dumb docs (#175198) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Apr 2006 18:33:50 -0000 1.2 +++ sources 31 May 2006 10:16:14 -0000 1.3 @@ -1,2 +1,2 @@ -0397da31fbe4f5485c4e7094c3661c5a Math-Pari-2.010704.tar.gz +87afce649551dd906ff7a648e00f5c34 Math-Pari-2.010705.tar.gz 357b7a42e89e2761a5367bbcbfcca5f2 pari-2.1.7.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Apr 2006 18:33:50 -0000 1.2 +++ .cvsignore 31 May 2006 10:16:14 -0000 1.3 @@ -1,2 +1,2 @@ -Math-Pari-2.010704.tar.gz +Math-Pari-2.010705.tar.gz pari-2.1.7.tgz From fedora-extras-commits at redhat.com Wed May 31 10:17:38 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 31 May 2006 03:17:38 -0700 Subject: rpms/perl-Math-Pari/FC-4 perl-Math-Pari.spec, 1.1, 1.2 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 Message-ID: <200605311017.k4VAHeYM023257@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Math-Pari/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23236 Modified Files: perl-Math-Pari.spec sources .cvsignore Log Message: resync with devel Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/perl-Math-Pari.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Math-Pari.spec 18 Apr 2006 18:33:50 -0000 1.1 +++ perl-Math-Pari.spec 31 May 2006 10:17:38 -0000 1.2 @@ -9,12 +9,12 @@ Summary: Perl interface to PARI Name: perl-Math-Pari -Version: 2.010704 +Version: 2.010705 # You'll need to replace pariversion with a hardcoded version number if you're # testing with a development version of PARI, as this expression evaluates # the latest version of GP/PARI the perl module was tested with. %define pariversion %(echo %{version} | %{__perl} -pi -e 's/(\\d+)\\.(\\d\\d)(\\d\\d).*/sprintf("%d.%d.%d",$1,$2,$3)/e') -Release: 2%{?dist} +Release: 1%{?dist} License: Artistic or GPL Group: Development/Libraries Url: http://search.cpan.org/dist/Math-Pari/ @@ -73,6 +73,9 @@ %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Wed May 31 2006 Paul Howarth 2.010705-1 +- Update to 2.010705 + * Tue Apr 18 2006 Paul Howarth 2.010704-2 - Omit dumb docs (#175198) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Apr 2006 18:33:50 -0000 1.2 +++ sources 31 May 2006 10:17:38 -0000 1.3 @@ -1,2 +1,2 @@ -0397da31fbe4f5485c4e7094c3661c5a Math-Pari-2.010704.tar.gz +87afce649551dd906ff7a648e00f5c34 Math-Pari-2.010705.tar.gz 357b7a42e89e2761a5367bbcbfcca5f2 pari-2.1.7.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Apr 2006 18:33:50 -0000 1.2 +++ .cvsignore 31 May 2006 10:17:38 -0000 1.3 @@ -1,2 +1,2 @@ -Math-Pari-2.010704.tar.gz +Math-Pari-2.010705.tar.gz pari-2.1.7.tgz From fedora-extras-commits at redhat.com Wed May 31 10:57:53 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 31 May 2006 03:57:53 -0700 Subject: rpms/showimg/devel showimg.spec,1.9,1.10 Message-ID: <200605311057.k4VAvtZx023438@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/showimg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23391/devel Modified Files: showimg.spec Log Message: rebuild for new libpqxx Index: showimg.spec =================================================================== RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- showimg.spec 21 Feb 2006 19:02:00 -0000 1.9 +++ showimg.spec 31 May 2006 10:57:53 -0000 1.10 @@ -1,6 +1,6 @@ Name: showimg Version: 0.9.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Feature-rich image viewer for KDE Group: Applications/Multimedia @@ -122,8 +122,11 @@ %changelog +* Wed May 31 2006 Aurelien Bompard 0.9.5-6 +- rebuild for new libpqxx + * Tue Feb 21 2006 Aurelien Bompard 0.9.5-5 -- rebuild for FC5 +- rebuild * Sun Jan 22 2006 Aurelien Bompard 0.9.5-4 - fix pqxx detection on x86_64 From fedora-extras-commits at redhat.com Wed May 31 10:57:47 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 31 May 2006 03:57:47 -0700 Subject: rpms/showimg/FC-4 showimg.spec,1.8,1.9 Message-ID: <200605311058.k4VAwJUl023441@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/showimg/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23391/FC-4 Modified Files: showimg.spec Log Message: rebuild for new libpqxx Index: showimg.spec =================================================================== RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- showimg.spec 22 Jan 2006 09:37:49 -0000 1.8 +++ showimg.spec 31 May 2006 10:57:47 -0000 1.9 @@ -1,6 +1,6 @@ Name: showimg Version: 0.9.5 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Feature-rich image viewer for KDE Group: Applications/Multimedia @@ -122,6 +122,12 @@ %changelog +* Wed May 31 2006 Aurelien Bompard 0.9.5-6 +- rebuild for new libpqxx + +* Tue Feb 21 2006 Aurelien Bompard 0.9.5-5 +- rebuild + * Sun Jan 22 2006 Aurelien Bompard 0.9.5-4 - fix pqxx detection on x86_64 From fedora-extras-commits at redhat.com Wed May 31 10:57:48 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 31 May 2006 03:57:48 -0700 Subject: rpms/showimg/FC-5 showimg.spec,1.9,1.10 Message-ID: <200605311058.k4VAwKkn023444@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/showimg/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23391/FC-5 Modified Files: showimg.spec Log Message: rebuild for new libpqxx Index: showimg.spec =================================================================== RCS file: /cvs/extras/rpms/showimg/FC-5/showimg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- showimg.spec 21 Feb 2006 19:02:00 -0000 1.9 +++ showimg.spec 31 May 2006 10:57:47 -0000 1.10 @@ -1,6 +1,6 @@ Name: showimg Version: 0.9.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Feature-rich image viewer for KDE Group: Applications/Multimedia @@ -122,8 +122,11 @@ %changelog +* Wed May 31 2006 Aurelien Bompard 0.9.5-6 +- rebuild for new libpqxx + * Tue Feb 21 2006 Aurelien Bompard 0.9.5-5 -- rebuild for FC5 +- rebuild * Sun Jan 22 2006 Aurelien Bompard 0.9.5-4 - fix pqxx detection on x86_64 From fedora-extras-commits at redhat.com Wed May 31 12:19:55 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Wed, 31 May 2006 05:19:55 -0700 Subject: rpms/mod_cband/FC-5 .cvsignore, 1.3, 1.4 mod_cband.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605311219.k4VCJvr0029000@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28979 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 29 2006 Michael Fleming 0.9.7.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 09:36:58 -0000 1.3 +++ .cvsignore 31 May 2006 12:19:54 -0000 1.4 @@ -1 +1 @@ -mod-cband-0.9.7.3.tgz +mod-cband-0.9.7.4.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/mod_cband.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_cband.spec 1 May 2006 10:14:33 -0000 1.3 +++ mod_cband.spec 31 May 2006 12:19:54 -0000 1.4 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.3 -Release: 2%{?dist} +Version: 0.9.7.4 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 29 2006 Michael Fleming 0.9.7.4-1 +- New upstream release + * Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 May 2006 10:14:33 -0000 1.4 +++ sources 31 May 2006 12:19:54 -0000 1.5 @@ -1 +1 @@ -958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz +ff635d7b55bf7ca648d319247dfb45e3 mod-cband-0.9.7.4.tgz From fedora-extras-commits at redhat.com Wed May 31 12:27:49 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Wed, 31 May 2006 05:27:49 -0700 Subject: rpms/mod_cband/FC-4 .cvsignore, 1.3, 1.4 mod_cband.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200605311227.k4VCRpAA029091@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29070 Modified Files: .cvsignore mod_cband.spec sources Log Message: * Mon May 29 2006 Michael Fleming 0.9.7.4-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 May 2006 09:42:57 -0000 1.3 +++ .cvsignore 31 May 2006 12:27:49 -0000 1.4 @@ -1 +1 @@ -mod-cband-0.9.7.3.tgz +mod-cband-0.9.7.4.tgz Index: mod_cband.spec =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/mod_cband.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_cband.spec 1 May 2006 10:16:00 -0000 1.3 +++ mod_cband.spec 31 May 2006 12:27:49 -0000 1.4 @@ -1,6 +1,6 @@ Name: mod_cband -Version: 0.9.7.3 -Release: 2%{?dist} +Version: 0.9.7.4 +Release: 1%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL @@ -42,6 +42,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog +* Mon May 29 2006 Michael Fleming 0.9.7.4-1 +- New upstream release + * Mon May 1 2006 Michael Fleming 0.9.7.3-2 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 May 2006 10:16:00 -0000 1.4 +++ sources 31 May 2006 12:27:49 -0000 1.5 @@ -1 +1 @@ -958bf51924462563f8fce20408fa5da4 mod-cband-0.9.7.3.tgz +ff635d7b55bf7ca648d319247dfb45e3 mod-cband-0.9.7.4.tgz From fedora-extras-commits at redhat.com Wed May 31 14:13:44 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 31 May 2006 07:13:44 -0700 Subject: rpms/xscreensaver/devel xscreensaver-5.00-browser-setting.patch, NONE, 1.1 xscreensaver-5.00-change-defaults.patch, NONE, 1.1 xscreensaver-5.00-locale-decimal.patch, NONE, 1.1 xscreensaver-5.00-rootpasswd.patch, NONE, 1.1 xscreensaver.spec, 1.1, 1.2 Message-ID: <200605311413.k4VEDkn9001615@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586 Modified Files: xscreensaver.spec Added Files: xscreensaver-5.00-browser-setting.patch xscreensaver-5.00-change-defaults.patch xscreensaver-5.00-locale-decimal.patch xscreensaver-5.00-rootpasswd.patch Log Message: * Wed May 31 2006 Mamoru Tasaka - 1:5.00-2 - Change the default text. - Rewrite root passwd patch. - Add browser option to configure. - Fix requirement about desktop-backgrounds-basic - Fix decimal separator problem reported by upstream. xscreensaver-5.00-browser-setting.patch: --- NEW FILE xscreensaver-5.00-browser-setting.patch --- --- xscreensaver-5.00/configure.in.browser-setting 2006-05-24 07:07:00.000000000 +0900 +++ xscreensaver-5.00/configure.in 2006-05-31 03:42:39.000000000 +0900 @@ -1793,6 +1793,40 @@ ############################################################################### # +# Whether to allow root password to unblank. +# +############################################################################### +AC_ARG_ENABLE(root-passwd, [ + --enable-root-passwd Allow root passwd to unlock screen. + --disable-root-passwd Do not allow that.], + [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) +if test "$enable_root_passwd" = yes; then + AC_DEFINE(ALLOW_ROOT_PASSWD) + true +elif test "$enable_root_passwd" != no; then + echo "error: something wrong with root-passwd option. Check configure.in ." + exit 1 +fi + +############################################################################### +# +# Whether to allow root password to unblank. +# +############################################################################### +AC_ARG_ENABLE(root-passwd, [ + --enable-root-passwd Allow root passwd to unlock screen. + --disable-root-passwd Do not allow that.], + [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) +if test "$enable_root_passwd" = yes; then + AC_DEFINE(ALLOW_ROOT_PASSWD) + true +elif test "$enable_root_passwd" != no; then + echo "error: something wrong with root-passwd option. Check configure.in ." + exit 1 +fi + +############################################################################### +# # Check for PAM. # ############################################################################### @@ -2430,6 +2464,7 @@ # Check for the various Gnome help and URL loading programs. # +WITH_BROWSER=gnome-open if test "$have_gtk" = yes; then AC_CHECK_PROGS(gnome_open_program, gnome-open) AC_CHECK_PROGS(gnome_url_show_program, gnome-url-show) @@ -3359,6 +3394,45 @@ ############################################################################### # +# Check the browser to see help URL +# +############################################################################### + +have_browser=no +with_browser_req=unspecified + +AC_ARG_WITH(browser, +[ --with-browser=BROWSER Specify the browser to show help URL.], + [with_browser="$withval"; with_browser_req="$withval"], + [with_browser=no ]) +# no HANDLE_X_PATH_ARG for this one + +case "$with_browser" in + no ) + ;; + * ) + WITH_BROWSER=$with_browser + gnome_open_program=$with_browser + AC_MSG_CHECKING([for browser $with_browser]) + with_browser_fullpath=`which $with_browser 2>/dev/null` + case $with_browser_fullpath in + /* ) + AC_MSG_RESULT(yes) + have_browser=yes + ;; + * ) + AC_MSG_RESULT(no) +# Only warning: we don't want to install all packages for the +# dependency of the browser in building stage... + echo "WARNING: browser not found: --with-browser=$with_browser" + ;; + esac + ;; +esac +ac_cv_browser="$with_browser" + +############################################################################### +# # Check whether it's ok to install some hacks as setuid (e.g., "sonar") # This should be safe, but let's give people the option. # @@ -3579,6 +3653,7 @@ AC_SUBST(DEFAULT_IMAGES_P) AC_SUBST(DEFAULT_IMAGE_DIRECTORY) AC_SUBST(DEFAULT_TEXT_FILE) +AC_SUBST(WITH_BROWSER) AC_SUBST(OBJCC) AC_SUBST(EXES_OSX) --- xscreensaver-5.00/driver/XScreenSaver.ad.in.browser-setting 2006-05-24 08:01:34.000000000 +0900 +++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-05-31 03:44:31.000000000 +0900 @@ -93,7 +93,7 @@ ! ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3) ! - at GNOME24@*loadURL: gnome-open '%s' + at GNOME24@*loadURL: @WITH_BROWSER@ '%s' @GNOME24@*manualCommand: gnome-terminal --title '%s manual' \ @GNOME24@ --command '/bin/sh -c "man %s; read foo"' ! xscreensaver-5.00-change-defaults.patch: --- NEW FILE xscreensaver-5.00-change-defaults.patch --- --- xscreensaver-5.00/driver/XScreenSaver.ad.in.change-defaults 2006-05-31 02:38:54.000000000 +0900 +++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-05-31 03:08:33.000000000 +0900 @@ -37,24 +37,24 @@ *dpmsStandby: 2:00:00 *dpmsSuspend: 2:00:00 *dpmsOff: 4:00:00 -*grabDesktopImages: True +*grabDesktopImages: False *grabVideoFrames: False *chooseRandomImages: @DEFAULT_IMAGES_P@ *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ *nice: 10 *memoryLimit: 0 -*lock: False +*lock: True *verbose: False *timestamp: True *fade: True *unfade: False *fadeSeconds: 0:00:03 *fadeTicks: 20 -*splash: True +*splash: False *splashDuration: 0:00:05 *visualID: default *captureStderr: True -*ignoreUninstalledPrograms: False +*ignoreUninstalledPrograms: True *textMode: file *textLiteral: XScreenSaver @@ -229,7 +229,7 @@ epicycle -root \n\ interference -root \n\ truchet -root \n\ - bsod -root \n\ +- bsod -root \n\ crystal -root \n\ discrete -root \n\ kumppa -root \n\ xscreensaver-5.00-locale-decimal.patch: --- NEW FILE xscreensaver-5.00-locale-decimal.patch --- --- xscreensaver-5.00/utils/resources.c.localefix 2006-02-11 13:25:37.000000000 +0900 +++ xscreensaver-5.00/utils/resources.c 2006-05-31 18:27:51.000000000 +0900 @@ -12,6 +12,9 @@ #include "utils.h" #include "resources.h" +#ifdef HAVE_SETLOCALE +#include +#endif extern char *progname; @@ -124,15 +127,32 @@ { double val; char c, *s = get_string_resource (dpy, res_name, res_class); + +#ifdef HAVE_SETLOCALE + const char *current_locale; +#endif + if (! s) return 0.0; + +#ifdef HAVE_SETLOCALE + current_locale = setlocale(LC_ALL, NULL); + (void) setlocale(LC_ALL, "C"); +#endif + if (1 == sscanf (s, " %lf %c", &val, &c)) { free (s); +#ifdef HAVE_SETLOCALE + (void) setlocale(LC_ALL, current_locale); +#endif return val; } fprintf (stderr, "%s: %s must be a float, not %s.\n", progname, res_name, s); free (s); +#ifdef HAVE_SETLOCALE + (void) setlocale(LC_ALL, current_locale); +#endif return 0.0; } xscreensaver-5.00-rootpasswd.patch: --- NEW FILE xscreensaver-5.00-rootpasswd.patch --- --- xscreensaver-5.00/config.h.in.rootpasswd 2006-05-18 08:36:52.000000000 +0900 +++ xscreensaver-5.00/config.h.in 2006-05-31 00:09:40.000000000 +0900 @@ -398,6 +398,11 @@ /* Define this to remove the option of locking the screen at all. */ #undef NO_LOCKING +/* Define this if allowing root passwd to unlock screen + Default is YES!! +*/ +#undef ALLOW_ROOT_PASSWD + /* This is the same as GETTEXT_PACKAGE, but for the glade generated code. */ #undef PACKAGE --- xscreensaver-5.00/configure.in.rootpasswd 2006-05-24 07:07:00.000000000 +0900 +++ xscreensaver-5.00/configure.in 2006-05-31 00:31:29.000000000 +0900 @@ -1793,6 +1793,23 @@ ############################################################################### # +# Whether to allow root password to unblank. +# +############################################################################### +AC_ARG_ENABLE(root-passwd, [ + --enable-root-passwd Allow root passwd to unlock screen. + --disable-root-passwd Do not allow that.], + [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) +if test "$enable_root_passwd" = yes; then + AC_DEFINE(ALLOW_ROOT_PASSWD) + true +elif test "$enable_root_passwd" != no; then + echo "error: something wrong with root-passwd option. Check configure.in ." + exit 1 +fi + +############################################################################### +# # Check for PAM. # ############################################################################### --- xscreensaver-5.00/driver/passwd-pam.c.rootpasswd 2006-05-17 11:14:58.000000000 +0900 +++ xscreensaver-5.00/driver/passwd-pam.c 2006-05-31 00:09:40.000000000 +0900 @@ -288,6 +288,7 @@ goto DONE; } +#ifdef ALLOW_ROOT_PASSWD /* If that didn't work, set the user to root, and try to authenticate again. */ if (user) free (user); @@ -300,6 +301,7 @@ if (status != PAM_SUCCESS) goto DONE; PAM_NO_DELAY(pamh); +#endif set = block_sigchld(); status = pam_authenticate (pamh, 0); Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xscreensaver.spec 26 May 2006 18:20:03 -0000 1.1 +++ xscreensaver.spec 31 May 2006 14:13:44 -0000 1.2 @@ -1,9 +1,10 @@ %define name xscreensaver %define version 5.00 -%define fedora_rel 1 +%define fedora_rel 2 -%define default_text %{_datadir}/doc/fedora-release-5.89/RELEASE-NOTES +%define fedora_ver 5.89 +%define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,12 +17,15 @@ Group: Amusements/Graphics URL: http://www.jwz.org/xscreensaver/ Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz -Patch0: xscreensaver-5.00b5-change-defaults.patch +Patch0: xscreensaver-5.00-browser-setting.patch Patch1: xscreensaver-5.00b5-sanitize-hacks.patch -Patch5: xscreensaver-5.00b5-dont-allow-root.patch +Patch5: xscreensaver-5.00-rootpasswd.patch Patch8: xscreensaver-5.00b5-include-directory.patch Patch101: xscreensaver-5.00-locale-safety.patch Patch102: xscreensaver-5.00-matherr-utils.patch +Patch103: xscreensaver-5.00-change-defaults.patch +Patch104: xscreensaver-5.00-locale-decimal.patch + # find_lang BuildRequires: gettext @@ -44,13 +48,16 @@ BuildRequires: libXxf86vm-devel BuildRequires: libjpeg-devel BuildRequires: gtk2-devel libglade2-devel -Requires: /etc/pam.d/system-auth, htmlview, desktop-backgrounds-basic +Requires: /etc/pam.d/system-auth, htmlview Provides: xscreensaver = %{epoch}:%{version}-%{release} Obsoletes: xscreensaver %package extras Summary: An enhanced set of screensavers Group: Amusements/Graphics +# Switch desktop-backgrounds-basic from Requires to BuildRequires as +# configure needs it but xscreensaver can get along with no images. +BuildRequires: desktop-backgrounds-basic %package gl-extras Summary: An enhanced set of screensavers that require OpenGL @@ -84,12 +91,14 @@ %prep %setup -q -%patch0 -p1 -b .change-defaults +%patch0 -p1 -b .browser-setting %patch1 -p1 -b .sanitize-hacks -%patch5 -p1 -b .dont-allow-root +%patch5 -p1 -b .rootpasswd %patch8 -p1 -b .include-dir %patch101 -p1 -b .locale-safety %patch102 -p1 -b .matherr2 +%patch103 -p1 -b .change-defaults +%patch104 -p1 -b .locale-decimal sed -i -e 's|version [45].[0-9a-z][0-9a-z]*|version %{version}|' \ driver/XScreenSaver.ad.in @@ -133,6 +142,8 @@ CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks" CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}" CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults" +CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd" +CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview" # This is flaky: # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager" @@ -226,6 +237,13 @@ %defattr(-,root,root) %changelog +* Wed May 31 2006 Mamoru Tasaka - 1:5.00-2 +- Change the default text. +- Rewrite root passwd patch. +- Add browser option to configure. +- Fix requirement about desktop-backgrounds-basic +- Fix decimal separator problem reported by upstream. + * Fri May 26 2006 Mamoru Tasaka - 1:5.00-1 - Update to 5.00 - Switch to extras, don't remove anything. From fedora-extras-commits at redhat.com Wed May 31 14:18:39 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 31 May 2006 07:18:39 -0700 Subject: rpms/texmaker/FC-4 texmaker.spec,1.4,1.5 Message-ID: <200605311418.k4VEIfun001683@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1666 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-3 - Revert bad change Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- texmaker.spec 31 May 2006 04:23:56 -0000 1.4 +++ texmaker.spec 31 May 2006 14:18:39 -0000 1.5 @@ -1,14 +1,13 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -84,6 +83,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-3 +- Revert bad change + * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) From fedora-extras-commits at redhat.com Wed May 31 14:19:52 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 31 May 2006 07:19:52 -0700 Subject: rpms/texmaker/FC-5 texmaker.spec,1.5,1.6 Message-ID: <200605311419.k4VEJs0W001744@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1727 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-3 - Revert bad change Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- texmaker.spec 31 May 2006 04:38:55 -0000 1.5 +++ texmaker.spec 31 May 2006 14:19:51 -0000 1.6 @@ -1,14 +1,13 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -84,6 +83,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-3 +- Revert bad change + * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) From fedora-extras-commits at redhat.com Wed May 31 14:20:24 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 31 May 2006 07:20:24 -0700 Subject: rpms/texmaker/devel texmaker.spec,1.5,1.6 Message-ID: <200605311420.k4VEKQY5001807@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/texmaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1790 Modified Files: texmaker.spec Log Message: * Wed May 31 2006 Deji Akingunola - 1.3-3 - Revert bad change Index: texmaker.spec =================================================================== RCS file: /cvs/extras/rpms/texmaker/devel/texmaker.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- texmaker.spec 31 May 2006 04:39:25 -0000 1.5 +++ texmaker.spec 31 May 2006 14:20:24 -0000 1.6 @@ -1,14 +1,13 @@ Summary: LaTeX editor Name: texmaker Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: qt4-devel BuildRequires: desktop-file-utils Requires: tetex-latex, tetex-dvipost @@ -84,6 +83,9 @@ %{_datadir}/icons/hicolor/*/apps/texmaker.png %changelog +* Wed May 31 2006 Deji Akingunola - 1.3-3 +- Revert bad change + * Wed May 31 2006 Deji Akingunola - 1.3-2 - This should have been a noarch package (#193601) From fedora-extras-commits at redhat.com Wed May 31 14:21:47 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 31 May 2006 07:21:47 -0700 Subject: rpms/gparted/devel gparted.spec,1.10,1.11 Message-ID: <200605311421.k4VELnJZ001868@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1851 Modified Files: gparted.spec Log Message: * Mon May 22 2006 Deji Akingunola - 0.2.5-2 - Rebuild Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gparted.spec 22 May 2006 18:20:31 -0000 1.10 +++ gparted.spec 31 May 2006 14:21:47 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Gnome Partition Editor Name: gparted Version: 0.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System License: GPL URL: http://gparted.sourceforge.net @@ -77,6 +77,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Mon May 22 2006 Deji Akingunola - 0.2.5-2 +- Rebuild + * Mon May 22 2006 Deji Akingunola - 0.2.5-1 - Update to version 0.2.5 From fedora-extras-commits at redhat.com Wed May 31 14:31:22 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:31:22 -0700 Subject: rpms/xgalaxy - New directory Message-ID: <200605311431.k4VEVO4c002026@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/xgalaxy Log Message: Directory /cvs/extras/rpms/xgalaxy added to the repository From fedora-extras-commits at redhat.com Wed May 31 14:31:22 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:31:22 -0700 Subject: rpms/xgalaxy/devel - New directory Message-ID: <200605311431.k4VEVOcW002029@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/xgalaxy/devel Log Message: Directory /cvs/extras/rpms/xgalaxy/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 14:31:36 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:31:36 -0700 Subject: rpms/xgalaxy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605311431.k4VEVcxh002078@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xgalaxy --- NEW 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 May 31 14:31:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:31:35 -0700 Subject: rpms/xgalaxy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605311431.k4VEVb4L002075@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045 Added Files: Makefile import.log Log Message: Setup of module xgalaxy --- NEW FILE Makefile --- # Top level Makefile for module xgalaxy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 14:32:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:32:28 -0700 Subject: rpms/xgalaxy import.log,1.1,1.2 Message-ID: <200605311432.k4VEWUWv002187@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2148 Modified Files: import.log Log Message: auto-import xgalaxy-2.0.34-2 on branch devel from xgalaxy-2.0.34-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 14:31:35 -0000 1.1 +++ import.log 31 May 2006 14:32:28 -0000 1.2 @@ -0,0 +1 @@ +xgalaxy-2_0_34-2:HEAD:xgalaxy-2.0.34-2.src.rpm:1149085971 From fedora-extras-commits at redhat.com Wed May 31 14:32:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 07:32:29 -0700 Subject: rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen.patch, NONE, 1.1 xgalaxy-2.0.34-warn.patch, NONE, 1.1 xgalaxy-2.0.34-xgalaxy.patch, NONE, 1.1 xgalaxy-hyperspace.desktop, NONE, 1.1 xgalaxy.desktop, NONE, 1.1 xgalaxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605311432.k4VEWVXx002198@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2148/devel Modified Files: .cvsignore sources Added Files: xgalaxy-2.0.34-fullscreen.patch xgalaxy-2.0.34-warn.patch xgalaxy-2.0.34-xgalaxy.patch xgalaxy-hyperspace.desktop xgalaxy.desktop xgalaxy.spec Log Message: auto-import xgalaxy-2.0.34-2 on branch devel from xgalaxy-2.0.34-2.src.rpm xgalaxy-2.0.34-fullscreen.patch: --- NEW FILE xgalaxy-2.0.34-fullscreen.patch --- --- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200 +++ xgalaga-2.0.34/libsprite/struct.h 2006-05-22 11:45:35.000000000 +0200 @@ -55,6 +55,8 @@ W_Callback handle_button; W_Callback handle_expose; #endif /* 0 */ + W_Window wm_window; + Window fs_window; }; struct stringList { --- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-22 11:45:35.000000000 +0200 +++ xgalaga-2.0.34/libsprite/data.c 2006-05-22 11:45:35.000000000 +0200 @@ -158,3 +158,6 @@ int useBuffered = 1; +#ifdef XF86VIDMODE +struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 }; +#endif --- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-22 11:45:35.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; extern unsigned long w_socket; + +/* For XF86VIDMODE Support */ +#ifdef XF86VIDMODE +#include +#include + +struct xf86vidmode_data { + int vidmode_available; + XF86VidModeModeInfo orig_mode; + int orig_viewport_x; + int orig_viewport_y; +}; + +extern struct xf86vidmode_data XF86VidModeData; +#endif + #endif /* AMIGA */ #if 0 --- xgalaga-2.0.34/libsprite/mapwindow.c.fs 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-22 11:45:35.000000000 +0200 @@ -13,6 +13,8 @@ if(win->type != WIN_BORDER && win->borderwin) { W_MapWindow(win->borderwin); } + if (win->wm_window) + W_MapWindow(win->wm_window); if (win->mapped) return; win->mapped = 1; @@ -36,6 +38,8 @@ if(win->type != WIN_BORDER && win->borderwin) { W_UnmapWindow(win->borderwin); } + if (win->wm_window) + W_UnmapWindow(win->wm_window); } int @@ -75,17 +79,25 @@ W_Window window; { struct window *win; - + W_Window wm_window; #ifdef DEBUG printf("Destroying %d\n", window); #endif win = W_Void2Window(window); + wm_window = win->wm_window; + + if(win->fs_window != None) + W_ToggleFullscreen(window); + deleteWindow(win); XDestroyWindow(W_Display, win->window); if(win->buffer) XFreePixmap(W_Display, win->buffer); if(win->type != WIN_BORDER && win->borderwin) W_DestroyWindow(win->borderwin); free((char *) win); + + if (wm_window) + W_DestroyWindow(wm_window); } void --- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-22 11:45:35.000000000 +0200 +++ xgalaga-2.0.34/libsprite/init.c 2006-05-22 11:45:35.000000000 +0200 @@ -356,6 +356,31 @@ XFreeModifiermap(m); } +#ifdef XF86VIDMODE +static void +xf86_vidmode_init ( void ) +{ + int i,j; + XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) + &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); + + if (!XF86VidModeQueryVersion(W_Display, &i, &j)) + XF86VidModeData.vidmode_available = 0; + else if (!XF86VidModeQueryExtension(W_Display, &i, &j)) + XF86VidModeData.vidmode_available = 0; + else if (!XF86VidModeGetModeLine(W_Display, W_Screen, + (int *)&XF86VidModeData.orig_mode.dotclock, l)) + XF86VidModeData.vidmode_available = 0; + else if (!XF86VidModeGetViewPort(W_Display, W_Screen, + &XF86VidModeData.orig_viewport_x, + &XF86VidModeData.orig_viewport_y)) + XF86VidModeData.vidmode_available = 0; + + if (!XF86VidModeData.vidmode_available) + fprintf(stderr, "Warning: XF86VidMode not available\n"); +} +#endif + void W_Initialize(str) char *str; @@ -395,5 +420,9 @@ GetAltMask(); backColor = W_Black; + +#ifdef XF86VIDMODE + xf86_vidmode_init(); +#endif } --- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-22 11:45:35.000000000 +0200 +++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-22 11:45:35.000000000 +0200 @@ -236,6 +236,10 @@ neww->type = type; neww->mapped = 0; neww->insensitive = 0; +#ifdef XF86VIDMODE + neww->wm_window = NULL; + neww->fs_window = None; +#endif addToHash(neww); return (neww); } @@ -454,6 +458,22 @@ int border; W_Color color; { + /* When creating a toplevel window create a real toplevel + window and a child window of the same dimensions. Then when switching + fullscreen we can create a fullscreen window and reparent the child + window to the fullscreen window and back again when switching to + windowed mode again. */ + if(parent == NULL) + { + W_Window wm_window = w_MakeWindow(name, x, y, width, height, 0, + cursname, border, color, WIN_GRAPH); + struct window *child_window = (struct window *)w_MakeWindow( + name, x, y, width, height, + wm_window, cursname, border, color, + WIN_GRAPH); + child_window->wm_window = wm_window; + return (W_Window)child_window; + } return w_MakeWindow(name, x, y, width, height, parent, cursname, border, color, WIN_GRAPH); } @@ -498,5 +518,208 @@ XSetWMHints(W_Display, W_Void2Window(win)->window, &hints); } +#ifdef XF86VIDMODE +/* qsort comparison function for sorting the modes */ +static int cmpmodes(const void *va, const void *vb) +{ + const XF86VidModeModeInfo *a = *(const XF86VidModeModeInfo **)va; + const XF86VidModeModeInfo *b = *(const XF86VidModeModeInfo **)vb; + if ( a->hdisplay == b->hdisplay ) + return b->vdisplay - a->vdisplay; + else + return b->hdisplay - a->hdisplay; +} +#endif + +void W_ToggleFullscreen(_win) + W_Window _win; +{ +#ifdef XF86VIDMODE + int i; + XF86VidModeModeLine mode = { .hdisplay = 0, .privsize = 0 }; + XF86VidModeModeInfo **modes; + int mode_count; +#endif + struct window *win = (struct window *)_win; + static int mouse_grabbed = 0; + static int keyboard_grabbed = 0; + + /* Check we get a nested toplevel WIN_GRAPH window passed */ + if (win->wm_window == NULL) + return; + + /* If there is no fullscreen window enter fullscreen mode, otherwise exit + fullscreen mode */ + if (win->fs_window == None) + { + XEvent event; + XSetWindowAttributes setattr; + /* local width and height vars used for fullscreen window size and for + storing the video_mode size which is then used to center the window */ + int fs_width = DisplayWidth(W_Display, W_Screen); + int fs_height = DisplayHeight(W_Display, W_Screen); + + /* Create the fullscreen window */ + setattr.override_redirect = True; + setattr.background_pixel = XBlackPixel(W_Display, W_Screen); + setattr.border_pixel = XBlackPixel(W_Display, W_Screen); + setattr.event_mask = StructureNotifyMask; + setattr.colormap = W_Colormap; + win->fs_window = XCreateWindow(W_Display, W_Root, + 0, 0, fs_width, fs_height, 0, + CopyFromParent, InputOutput, + CopyFromParent, CWOverrideRedirect | + CWBackPixel | CWColormap | CWBorderPixel | + CWEventMask, &setattr); + + /* Map the fullscreen window */ + XMapRaised(W_Display, win->fs_window); + /* wait until we are mapped. (shamelessly borrowed from SDL) */ + do { + XMaskEvent(W_Display, StructureNotifyMask, &event); + } while ( (event.type != MapNotify) || + (event.xmap.event != win->fs_window) ); + /* Make sure we got to the top of the window stack */ + XRaiseWindow(W_Display, win->fs_window); + + /* Reparent the real window */ + XReparentWindow(W_Display, win->window, win->fs_window, 0, 0); + + /* Grab the keyboard and mouse. */ + if (XGrabKeyboard(W_Display, win->window, False, GrabModeAsync, + GrabModeAsync, CurrentTime) != GrabSuccess) + fprintf(stderr, "Warning can not grab keyboard\n"); + else + keyboard_grabbed = 1; + + if (XGrabPointer(W_Display, win->window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, win->window, None, + CurrentTime) != GrabSuccess) + fprintf(stderr, "Warning can not grab mouse\n"); + else + mouse_grabbed = 1; + +#ifdef XF86VIDMODE + /* Try to switch video mode. This must be done after the pointer is + grabbed, because otherwise it can be outside the window negating the + XF86VidModeSetViewPort. */ + if (XF86VidModeGetModeLine(W_Display, W_Screen, &i, &mode)) + { + fs_width = mode.hdisplay; + fs_height = mode.vdisplay; + } + + /* Get list of modelines. */ + if (!XF86VidModeGetAllModeLines(W_Display, W_Screen, &mode_count, &modes)) + mode_count = 0; + + /* Search for an exact matching video mode. */ + for (i = 0; i < mode_count; i++) { + if ((modes[i]->hdisplay == win->width) && + (modes[i]->vdisplay == win->height)) + break; + } + + /* Search for a non exact match (smallest bigger res). */ + if (i == mode_count) { + int best_width = 0, best_height = 0; + qsort(modes, mode_count, sizeof(void *), cmpmodes); + for (i = mode_count-1; i > 0; i--) { + if ( ! best_width ) { + if ( (modes[i]->hdisplay >= win->width) && + (modes[i]->vdisplay >= win->height) ) { + best_width = modes[i]->hdisplay; + best_height = modes[i]->vdisplay; + } + } else { + if ( (modes[i]->hdisplay != best_width) || + (modes[i]->vdisplay != best_height) ) { + i++; + break; + } + } + } + } + + /* Switch video mode. */ + if ((i >= 0) && + ((modes[i]->hdisplay != mode.hdisplay) || + (modes[i]->vdisplay != mode.vdisplay)) && + XF86VidModeSwitchToMode(W_Display, W_Screen, modes[i])) + { + fs_width = modes[i]->hdisplay; + fs_height = modes[i]->vdisplay; + } + + /* Lock mode switching. */ + XF86VidModeLockModeSwitch(W_Display, W_Screen, True); + + /* Set viewport. */ + XF86VidModeSetViewPort(W_Display, W_Screen, 0, 0); + + /* clean up */ + if (mode.privsize) + XFree(mode.private); + if (mode_count) + { + for (i = 0; i < mode_count; i++) + if (modes[i]->privsize) + XFree(modes[i]->private); + XFree(modes); + } +#endif + + /* Center the window (if nescesarry) */ + if ((fs_width != win->width) || (fs_height != win->height)) + XMoveWindow(W_Display, win->window, (fs_width - win->width) / 2, + (fs_height - win->height) / 2); + + /* And last blank the cursor */ + W_BlankCursor(_win); + } + else + { + struct window *wm_window = (struct window *)win->wm_window; + + if (mouse_grabbed) { + XUngrabPointer(W_Display, CurrentTime); + mouse_grabbed = 0; + } + if (keyboard_grabbed) { + XUngrabKeyboard(W_Display, CurrentTime); + keyboard_grabbed = 0; + } +#ifdef XF86VIDMODE + /* Unlock mode switching. */ + XF86VidModeLockModeSwitch(W_Display, W_Screen, False); + + if (!XF86VidModeGetModeLine(W_Display, W_Screen, &i, &mode) || + (mode.hdisplay != XF86VidModeData.orig_mode.hdisplay) || + (mode.vdisplay != XF86VidModeData.orig_mode.vdisplay)) + { + if (!XF86VidModeSwitchToMode(W_Display, W_Screen, + &XF86VidModeData.orig_mode)) + fprintf(stderr, "XF86VidMode couldnot restore original resolution\n"); + } + if (XF86VidModeData.orig_viewport_x || XF86VidModeData.orig_viewport_y) + { + if (!XF86VidModeSetViewPort(W_Display, W_Screen, + XF86VidModeData.orig_viewport_x, + XF86VidModeData.orig_viewport_y)) + fprintf(stderr, "XF86VidMode couldnot restore original viewport\n"); + } + XSync(W_Display, False); +#endif + /* Reparent the real window! */ + XReparentWindow(W_Display, win->window, wm_window->window, 0, 0); + XUnmapWindow(W_Display, win->fs_window); + XDestroyWindow(W_Display, win->fs_window); + win->fs_window = None; + + /* And last unblank the cursor */ + W_RevertCursor(_win); + } +} --- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-22 11:45:35.000000000 +0200 @@ -63,6 +63,7 @@ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); void W_SetIconWindow(W_Window win, W_Window icon); +void W_ToggleFullscreen(W_Window win); /* point.c */ void W_DrawPoint(W_Window window, int x, int y, W_Color color); void FlushPointCache(Window win, int color); --- xgalaga-2.0.34/defs.h.fs 2006-05-22 11:45:35.000000000 +0200 +++ xgalaga-2.0.34/defs.h 2006-05-22 11:45:35.000000000 +0200 @@ -26,8 +26,9 @@ #define TORPDELAY 5 -#define WINWIDTH 400 -#define WINHEIGHT 500 +/* Modified slightly to better fit on 800x600 in fullscreen mode */ +#define WINWIDTH 464 /* was 400 */ +#define WINHEIGHT 580 /* was 500 */ #define NUMSTARS 30 --- xgalaga-2.0.34/Wlib.h.fs 1998-04-12 08:03:20.000000000 +0200 +++ xgalaga-2.0.34/Wlib.h 2006-05-22 11:45:35.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; extern unsigned long w_socket; + +/* For XF86VIDMODE Support */ +#ifdef XF86VIDMODE +#include +#include + +struct xf86vidmode_data { + int vidmode_available; + XF86VidModeModeInfo orig_mode; + int orig_viewport_x; + int orig_viewport_y; +}; + +extern struct xf86vidmode_data XF86VidModeData; +#endif + #endif /* AMIGA */ #if 0 --- xgalaga-2.0.34/main.c.fs 2006-05-22 11:45:36.000000000 +0200 +++ xgalaga-2.0.34/main.c 2006-05-22 11:45:35.000000000 +0200 @@ -32,6 +32,7 @@ static int attacking = 0, maxattacking, entering=0; static int maxetorps = 5, numetorps=0; static int plflash = 50; +static int fullscreen = 0; #ifndef ORIGINAL_XGALAGA static int shots = 0; static int hits = 0; @@ -63,10 +64,14 @@ xgal_exit(int v) { /* W_AutoRepeatOn();*/ + /* Destroy our main window so the fullscreen mode gets unset if we're + running fullscreen. (We should really clean up much more here!) */ + W_DestroyWindow(shellWin); #ifdef SOUND kill_sound(); #endif /* sleep(1);*/ /* Without this, the auto-repeat request fails on my machine... */ + /* Note if we ever need this autorepeat thingie again, the sleep can and should be replaced by a call to XSync() */ exit(v); } @@ -89,6 +94,7 @@ -mouse Use mouse control (same as 'm' at the title screen)\n\ -keyboard Use keyboard control (same as 'k')\n%s\ -level Choose starting level (>= 1)\n\ +-window Start in windowed mode instead of fullscreen\n\ -b turn buffered mode off, use this if it runs\n\ too slowly. Will cause flicker, maybe lots,\n\ maybe only a little.\n\ @@ -105,7 +111,8 @@ p - pauses\n\ q - end this game\n\ b - Toggle buffering (flicker vs. speed.)\n\ -o - Toggle OR mode. Don't use this, it sucks.\n", VERSION, +o - Toggle OR mode. Don't use this, it sucks.\n\ +alt + enter - Toggle fullscreen - window\n", VERSION, PRINT_SOUND ); } @@ -844,6 +851,14 @@ case 'm': mouseControl = 2; break; + case '\r'+256: + W_ToggleFullscreen(shellWin); + fullscreen = !fullscreen; + if (fullscreen) + W_BlankCursor(baseWin); + else + W_RevertCursor(baseWin); + break; default: break; } @@ -997,6 +1012,14 @@ maxtorps = MINTORPS; break; #endif /* IM_A_BIG_FAT_CHEATER */ + case '\r'+256: + W_ToggleFullscreen(shellWin); + fullscreen = !fullscreen; + if (fullscreen) + W_BlankCursor(baseWin); + else + W_RevertCursor(baseWin); + break; default: break; } @@ -1214,6 +1237,7 @@ int ac; char *dpyname = 0; int mx, my, but; + int start_fullscreen = 1; for(ac = 1; ac < argc; ac++) { if(*argv[ac] == '-') { @@ -1245,6 +1269,8 @@ useOR = 0; } else if (strcmp(argv[ac], "-noclipmask") == 0) { useClipMask = 0; + } else if (strcmp(argv[ac], "-window") == 0) { + start_fullscreen = 0; } else { print_usage(); exit(0); @@ -1263,6 +1289,12 @@ W_Buffer(shellWin, 0); W_MapWindow(shellWin); W_MapWindow(baseWin); + if (start_fullscreen) + { + W_ToggleFullscreen(shellWin); + W_BlankCursor(baseWin); + fullscreen = 1; + } /* W_AutoRepeatOff();*/ --- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200 +++ xgalaga-2.0.34/Wproto.h 2006-05-22 11:45:35.000000000 +0200 @@ -63,6 +63,7 @@ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); void W_SetIconWindow(W_Window win, W_Window icon); +void W_ToggleFullscreen(W_Window win); /* point.c */ void W_DrawPoint(W_Window window, int x, int y, W_Color color); void FlushPointCache(Window win, int color); xgalaxy-2.0.34-warn.patch: --- NEW FILE xgalaxy-2.0.34-warn.patch --- --- xgalaga-2.0.34/libsprite/image.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/libsprite/image.c 2006-05-11 22:28:08.000000000 +0200 @@ -210,7 +210,7 @@ if(image->compiled_in) { if(image->xbmdata) { image->clipmask = XCreateBitmapFromData(W_Display, W_Root, - image->xbmdata, image->width, image->height); + (char *)image->xbmdata, image->width, image->height); ErrorStatus = BitmapSuccess; } else { ErrorStatus = !BitmapSuccess; --- xgalaga-2.0.34/libsprite/line.c.warn 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/line.c 2006-05-11 22:28:08.000000000 +0200 @@ -37,7 +37,7 @@ W_Window window; { Window win = W_Void2Window(window)->drawable; - register i; + int i; for (i = 0; i < NCOLORS; i++) { if (_lcache_index[i]) FlushLineCache(win, i); --- xgalaga-2.0.34/libsprite/makewindow.c.warn 1998-04-12 08:03:22.000000000 +0200 +++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-11 22:28:08.000000000 +0200 @@ -4,20 +4,20 @@ #define tiny_height 3 #define tiny_x_hot 1 #define tiny_y_hot 1 -static unsigned char tiny_bits[] = { +static char tiny_bits[] = { 0x05, 0x02, 0x05, }; -static unsigned char tinymask_bits[] = { +static char tinymask_bits[] = { 0x05, 0x02, 0x05, }; #define cross_width 16 #define cross_height 16 #define cross_x_hot 7 #define cross_y_hot 7 -static unsigned char cross_bits[] = { +static char cross_bits[] = { 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0xc0, 0x01, 0x80, 0x00, 0x10, 0x04, 0x3f, 0x7e, 0x10, 0x04, 0x80, 0x00, 0xc0, 0x01, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00}; -static unsigned char crossmask_bits[] = { +static char crossmask_bits[] = { 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xe0, 0x03, 0xd0, 0x05, 0xbf, 0x7e, 0x7f, 0x7f, 0xbf, 0x7e, 0xd0, 0x05, 0xe0, 0x03, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00}; --- xgalaga-2.0.34/libsprite/point.c.warn 1998-04-12 08:03:23.000000000 +0200 +++ xgalaga-2.0.34/libsprite/point.c 2006-05-11 22:28:08.000000000 +0200 @@ -49,7 +49,7 @@ W_Window window; { Window win = W_Void2Window(window)->drawable; - register i; + int i; for (i = 0; i < NCOLORS; i++) { if (_pcache_index[i]) FlushPointCache(win, i); --- xgalaga-2.0.34/libsprite/scroll.c.warn 1998-04-12 08:03:23.000000000 +0200 +++ xgalaga-2.0.34/libsprite/scroll.c 2006-05-11 22:28:08.000000000 +0200 @@ -9,12 +9,11 @@ char *str; int len; { - struct stringList **strings; char *newstring; - int count; + char **p = & (win->data); + struct stringList **strings = (struct stringList **)p ; + int count = 0; - strings = (struct stringList **) & (win->data); - count = 0; while ((*strings) != NULL) { count++; strings = &((*strings)->next); --- xgalaga-2.0.34/frate.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/frate.c 2006-05-11 22:28:08.000000000 +0200 @@ -4,6 +4,7 @@ #include #include +#include #ifdef HAVE_SYS_TIME_H # include #endif --- xgalaga-2.0.34/highscore.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/highscore.c 2006-05-11 22:28:08.000000000 +0200 @@ -191,13 +191,15 @@ if(write(hsf, &x, sizeof(long)) < sizeof(long)) goto error2; } + close(hsf); } - close(hsf); return; +#ifndef NO_GLOBAL_SCORES error: printf("Error saving high scores file %s\n", SCOREFILE); return; +#endif error2: printf("Error saving high scores file %s\n", my_file_name); return; @@ -457,10 +459,10 @@ } } return; +#ifndef NO_GLOBAL_SCORES error: if(i>0) printf("Error reading high scores file '%s'\n", SCOREFILE); -#ifndef NO_GLOBAL_SCORES for(i=0;i0) printf("Error reading high scores file '%s'\n", my_file_name); --- xgalaga-2.0.34/main.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/main.c 2006-05-11 22:30:11.000000000 +0200 @@ -32,29 +32,31 @@ static int attacking = 0, maxattacking, entering=0; static int maxetorps = 5, numetorps=0; static int plflash = 50; +#ifndef ORIGINAL_XGALAGA static int shots = 0; static int hits = 0; +#endif #define convoy_x_pos(i) (convoyx+(20 * (i - 10 * (i/10)))) #define convoy_y_pos(i) (20 + (20*(i/10))) static int moves[16][2] = { - 0,-4, - 1,-4, - 3,-3, - 4,-1, - 4,0, - 4,1, - 3,3, - 1,4, - 0,4, - -1,4, - -3,3, - -4,1, - -4,0, - -4,-1, - -3,-3, - -1,-4 + {0,-4}, + {1,-4}, + {3,-3}, + {4,-1}, + {4,0}, + {4,1}, + {3,3}, + {1,4}, + {0,4}, + {-1,4}, + {-3,3}, + {-4,1}, + {-4,0}, + {-4,-1}, + {-3,-3}, + {-1,-4} }; void @@ -817,7 +819,9 @@ int mx, my, but; { static int torpok; - static int shotside = 0, shotsidedirection = 1; +#ifdef ENABLE_MACHINE_GUN + static int shotside = 0; +#endif W_Event wev; static int keys = 0; @@ -1209,7 +1213,6 @@ { int ac; char *dpyname = 0; - long ut; int mx, my, but; for(ac = 1; ac < argc; ac++) { --- xgalaga-2.0.34/paths.c.warn 1998-04-30 07:11:57.000000000 +0200 +++ xgalaga-2.0.34/paths.c 2006-05-11 22:28:08.000000000 +0200 @@ -1197,8 +1197,6 @@ void new_alien(int level, int anum, struct alien *al) { - int l = (level-1) % NUMLEVELS; - if(get_shape(anum) >= 0) { al->alive = 1; al->dying = 0; --- xgalaga-2.0.34/proto.h.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/proto.h 2006-05-11 22:28:08.000000000 +0200 @@ -1,3 +1,5 @@ +#include + /* main.c */ void xgal_exit(int v); int main(int argc, char **argv); @@ -58,3 +60,9 @@ int get_duration(int, int); int get_shape(int); int read_level(int); +/* frate.c */ +void init_framerate(void); +void do_framerate(void); +/* linux-joystick.c */ +void init_joystick(void); +void do_joystick(int* x, int* y, int* but); --- xgalaga-2.0.34/sound.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/sound.c 2006-05-11 22:28:08.000000000 +0200 @@ -54,7 +54,10 @@ /* Create a pipe, set the write end to close when we exec the sound server, and set both (is the write end necessary?) ends to non-blocking */ - pipe(fd); + if (pipe(fd)) { + audioOK = 0; + return; + } soundfd=fd[1]; if( !(child=fork()) ) { @@ -88,7 +91,9 @@ char c; c = k; - if ((playSounds) && (audioOK)) write (soundfd, &c, sizeof (c)); + if ((playSounds) && (audioOK)) + if(write (soundfd, &c, sizeof (c)) != sizeof (c)) + audioOK = 0; } @@ -103,7 +108,9 @@ sound_flags[k] |= 1; c = (unsigned char)(k); - if ((playSounds) && (audioOK)) write (soundfd, &c, sizeof (c)); + if ((playSounds) && (audioOK)) + if(write (soundfd, &c, sizeof (c)) != sizeof (c)) + audioOK = 0; } @@ -121,7 +128,9 @@ char c; c = -1; - if ((playSounds) && (audioOK)) write (soundfd, &c, sizeof (c)); + if ((playSounds) && (audioOK)) + if(write (soundfd, &c, sizeof (c)) != sizeof (c)) + audioOK = 0; } #endif /* SOUND */ --- xgalaga-2.0.34/xgal.sndsrv.linux.c.warn 2006-05-11 22:28:08.000000000 +0200 +++ xgalaga-2.0.34/xgal.sndsrv.linux.c 2006-05-11 22:28:08.000000000 +0200 @@ -17,7 +17,7 @@ #include #include #include -/*#include "linux_pcsp.h" /* /usr/include/linux/pcsp.h */ +/*#include "linux_pcsp.h" /usr/include/linux/pcsp.h */ #include #include #include @@ -39,7 +39,7 @@ #define NUM_SOUNDS (sizeof(FILENAME)/sizeof(char*)) -signed char *sound_buffer[NUM_SOUNDS]; +char *sound_buffer[NUM_SOUNDS]; int sound_size[NUM_SOUNDS]; int fragsize; @@ -161,10 +161,12 @@ return(0); }; lseek(fd,0,SEEK_SET); - read(fd,sound_buffer[k],size); + size = read(fd,sound_buffer[k],size); close(fd); - for(i=0;i print usage and version. Basic instructions: - It's Galaga, you know how to play Galaga, stop bothering me. - (Ship follows the mouse, button fires. Auto-fire by holding it - down, so no-one accuses me of breaking their mouse!) + It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, + stop bothering me. (Ship follows the mouse, button fires. Auto-fire by + holding it down, so no-one accuses me of breaking their mouse!) Keyboard commands: @@ -73,7 +73,7 @@ games written quickly and painlessly. Credits: - Galaga code: + XGalaxy code: Joe Rumsey (mrogre at mediaone.net) X interface: Bill Dyess(dyessww at eng.auburn.edu), --- xgalaga-2.0.34/xgal.6x.xgalaxy 2006-05-22 15:30:59.000000000 +0200 +++ xgalaga-2.0.34/xgal.6x 2006-05-22 15:30:59.000000000 +0200 @@ -1,6 +1,6 @@ -.TH XGALAGA 6x "23 April 2003" "2.0.34" +.TH XGALAXY 6 "23 April 2003" "2.0.34" .SH NAME -xgalaga \- X11 version of the famous Galaga game +xgalaga \- X11 Galaga like game .SH SYNOPSIS .B xgalaxy [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] @@ -11,9 +11,9 @@ [-noclipmask] [-nouseor] [-nostars] .SH INSTRUCTIONS .LP -It's Galaga, you know how to play Galaga, stop bothering me. -(Ship follows the mouse, button fires. Auto-fire by holding it -down, so no-one accuses me of breaking their mouse!) +It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, +stop bothering me. (Ship follows the mouse, button fires. Auto-fire by +holding it down, so no-one accuses me of breaking their mouse!) .P The xgalaxy-hyperspace version features some new weapons and different gameplay. @@ -69,7 +69,7 @@ .TP 8 x - use your shields (xgalaxy-hyperspace only) .SH "SEE ALSO" -Xgalaga home page +XGalaxy home page .RI < http://rumsey.org/xgal.html > .SH AUTHORS Joe Rumsey, <\fIjoe at rumsey.org\fP> (Original author) --- xgalaga-2.0.34/images.c.xgalaxy 2006-05-22 15:31:13.000000000 +0200 +++ xgalaga-2.0.34/images.c 2006-05-22 16:14:13.000000000 +0200 @@ -6786,54 +6786,108 @@ /* XPM */ static char * title_xpm[] = { /* width height ncolors chars_per_pixel */ -"126 37 7 1", +"136 37 62 1", /* colors */ -"` c None", -"a c #606000", -"b c #909000", -"c c #C0B000", -"d c #F0E000", -"e c #404040", -"f c #303030", +" c None", +". c #303030", +"+ c #606000", +"@ c #909000", +"# c #C0B000", +"$ c #F0E000", +"% c #404040", +"& c #6E6C00", +"* c #9A9300", +"= c #DECE00", +"- c #AFA600", +"; c #A29A00", +"> c #C2B200", +", c #B7B000", +"' c #C8BD00", +") c #DDCD01", +"! c #DBCD05", +"~ c #A5A100", +"{ c #C8B800", +"] c #E3D300", +"^ c #C2BA00", +"/ c #9C9400", +"( c #C4B400", +"_ c #C3B300", +": c #B8B100", +"< c #D3C600", +"[ c #B4AA04", +"} c #9F940E", +"| c #32322F", +"1 c #A09D00", +"2 c #34342E", +"3 c #A69D03", +"4 c #C7B700", +"5 c #949300", +"6 c #C1B100", +"7 c #CCC200", +"8 c #9B9314", +"9 c #C5B500", +"0 c #ACA600", +"a c #EADB00", +"b c #BFB307", +"c c #35352E", +"d c #6A6900", +"e c #979100", +"f c #EADA00", +"g c #989100", +"h c #B6AE00", +"i c #A19D00", +"j c #E9D900", +"k c #D9CB00", +"l c #B1AB00", +"m c #ADA10E", +"n c #656121", +"o c #BCB500", +"p c #7A7800", +"q c #C0B800", +"r c #42412B", +"s c #676600", +"t c #38372D", +"u c #8D8700", +"v c #AAA300", +"w c #666500", /* pixels */ -"`````````````````faf`````````````````````````````````````````````````faf``````````````````````````````````````````````````````", -"````fabf````````fccbf`````````fabbbf````````````````````````````````fccbf`````````````````````````````````````````````````````", -"```fccdbf``````acddda```````fbccdddbbf`````````````````````````````acddda`````````````````````````````````````````````````````", -"``abcddda`````aabddda``````fccdbaaccdbf```````````````````````````acdddda`````````````````````````````````````````````````````", -"`accdddbf````aaacddbf`````acdbaaababddbf`````````````````````````abcdbcda`````````````````````````````````````````````````````", -"`cccddda`````fabcdda`````acddaffbaaabddbf```````````````````````accdbbcda`````````````````````````````````````````````````````", -"`ccabdda`````abcddbf````abcdbf``fbaaabdda```````````````````````cbcdabcbf`````````````````````````````````````````````````````", -"`caacddcf````bbcdbf````abcdbf````fbaacddcf``````````````````````bbcdaaca``````````````````````````````````````````````````````", -"`fbcabdda```abcdda`````acdbf``````fbccddda`````````````````````accddabca``````````````````````````````````````````````````````", -"``caacddcf``bbcdbf````abcda````````ccabdbf`````````````````````cccdbacbf``````````````````````````````````````````````````````", -"``fbcabdda`abcdbf````accdda````````caaaae``````````````````````cccdaaca``````````````````````````````fabbf````````````````````", -"```caacddcfacdda`````cbcdbf````````fbaaf```````````````````````cccdccbf`````````````````````````````fccdda````````````````````", -"```fbcabddbcddbf`````bbcda``````````ff```````````````fabbf`````cbcddda````````````````fabbf````````acdddbf```````````fabbf````", -"````caaabddddbf`````accdda`````````````````````````fbccdbf`````bbcddbf``````````````fbccdbf```````acdddbf``````````fbccdbf````", -"````fbaaabddbf``````cccdda```````````````````````fbccbaae`````accddda`````````````fbccbaae```````abcdbae`````````fbccbaae`````", -"`````fbaacdda```````cbcdda``````````````````````fccbaaafaf````cccddbf````````````fccbaaafaf`````abcdbaf`````````fccbaaafaf````", -"``````facdddcf``````bbcdda````````````````````fbcdbafffcca````cccdda```````````fbcdbafffcca`````bbcbf`````````fbcdbafffcca````", -"``````acdbcdda`````accddda```````````fabf````fccdbf``acdda````cbcddcf`````````fccdbf``acdda````abcda`````````fccdbf``acdda````", -"`````abcbbabdcf````cccddda``````````fbcda```acddbf``acddda````acdddda````````acddbf``acddda````acdbf````````acddbf``acddda````", -"````abcdaaaabcbf```ccabddcf````````aacdda``acddbf``abcddbf```acbcddda```````acddbf``abcddbf```acdda```````fbcddbf``abcddbf````", -"````acdbebaacdda```caacddda````````acddda`abcdbf``abcbcda```acbbcddda`````fbcddbf``abcbcda```aaacdcf`````fccddbf``abcbcda```ff", -"```abcbf`fbcabdcf``fbccdddcf``````acdddbfacabda``fbcbbcda``acbbcabddcf```fcbacda``fbcbbcda``acaacdda````acbacda``fbcbbcda``fba", -"``abcbf```caaabcbf``ccabdddbf````acdddda`caacdcbbccdabcdcbbcbfcaacdddbbbbcbaacdcbbccdabcdcbbcbaccddcf``acbaacdcbbccdabcdcbbcbf", -"``acbf````fbaaabcbf`caaabdddbbbbbcbcddda`fabcdddddbaacabcddbf`fbcabddddddbfabcdddddbaacabcddbfccabddbbbcbfabcdddddbaacabcddbf`", -"`abca``````fbaaaaba`fbaaaacdddddbabcddda`acabddddbafcaaaaaae```caaabdddbaeacabddddbafcaaaaaae`caaabddddbfacabddddbafcaaaaaae``", -"acaaf```````fbaaaa```fbaabaaaaaaaaccddda`caaaaaaae``fbaaaaf````fbaaaaaaaf`caaaaaaae``fbaaaaf``fbaaabddda`caaaaaaae``fbaaaaf```", -"caaf`````````ffbe`````ffbaaaaaaf`cccddbf`fbaaaaaf````ffff```````fbaaaaf```fbaaaaaf````ffff`````fbaacdddcffbaaaaaf````ffff`````", -"ff`````````````f````````ffffff```cccdda```fffff``````````````````ffff``````fffff````````````````facbaaccbffffff```````````````", -"`````````````````````````````````cccdda`````````````````````````````````````````````````````````acbaabcdda````````````````````", -"`````````````````````````````````cccdda````````````````````````````````````````````````````````acbffbcabda````````````````````", -"`````````````````````````````````cccdda```````````````````````````````````````````````````````abbf``caacda````````````````````", -"`````````````````````````````````cccdda``````````````````````````````````````````````````````accbf``fabcda````````````````````", -"`````````````````````````````````cccdda``````````````````````````````````````````````````````cbabbbbbccdbf````````````````````", -"`````````````````````````````````cccdbf``````````````````````````````````````````````````````caaabcdddbae`````````````````````", -"`````````````````````````````````ccaae```````````````````````````````````````````````````````fbaaaaaaaaf``````````````````````", -"`````````````````````````````````caaf`````````````````````````````````````````````````````````fbaaaaaf````````````````````````", -"`````````````````````````````````ff````````````````````````````````````````````````````````````fffff``````````````````````````" -}; +" .+. .+. ", +" .+ at . .##@. .+@@@. .##@. ", +" .##$@. +#$$$+ .@##$$$@@. +#$$$+ ", +" +@#$$$+ ++@$$$+ .##$@++##$@. +#$$$$+ ", +" +##$$$@. +++#$$@. +#$@+++ at +@$$@. +@#$@#$+ ", +" ###$$$+ .+@#$$+ +#$$+.. at +++@$$@. +##$@@#$+ ", +" ##+@$$+ +@#$$@. +@#$@. . at +++@$$+ #@#$+@#@. ", +" #++#$$#. @@#$@. +@#$@. . at ++#$$#. @@#$++#+ ", +" .@#+@$$+ +@#$$+ +#$@. .@##$$$+ +##$$+@#+ ", +" #++#$$#. @@#$@. +@#$+ ##+@$@. ###$@+#@. ", +" .@#+@$$+ +@#$@. +##$$+ #++++% ###$++#+ .+ .+@@. ", +" #++#$$#.+#$$+ #@#$@. . at ++. ###$##@. .#$. +$$+ .##$$+ ", +" .@#+@$$@#$$@. @@#$+ .. .+@@. #@#$$$+ .+@@. +@$$+ ++$$+ +#$$$@. .+@@.", +" #+++@$$$$@. +##$$+ .@##$@. @@#$$@. .@##$@. ##$$ +@$$ +#$$$@. .@##$@.", +" . at +++@$$@. ###$$+ .@##@++% +##$$$+ .@##@++% ++$$. @#@. +@#$@+% .@##@++% ", +" . at ++#$$+ #@#$$+ .##@+++.+. ###$$@. .##@+++.+. @#@$+ +#$+ +@#$@+. .##@+++. ", +" .+#$$$#. @@#$$+ .@#$@+...##+ ###$$+ .@#$@+...##+ . at +@$++@$@ @@#@. .@#$@+... ", +" +#$@#$$+ +##$$$+ .+ at . .##$@. +#$$+ #@#$$#. .##$@. +#$$+ #+#$#+#$+ +@#$+ .##$@. ", +" +@#@@+@$#. ###$$$+ .@#$+ +#$$@. +#$$$+ +#$$$$+ +#$$@. +#$$$+ ++@$$$. +#$@. +#$$@. ", +" +@#$++++@#@. ##+@$$#. ++#$$+ +#$$@. +@#$$@. +#@#$$$+ +#$$@. +@#$$@. @++@$@ +#$$+ .@#$$@. ", +" +#$@%@++#$$+ #++#$$$+ +#$$$+ +@#$@. +@#@#$+ +#@@#$$$+ .@#$$@. +@#@#$+ .#$$# +&*#$#. .##$$@. ", +" +@#@. .@#+@$#. .@##$$$#. +#$$$@.+#+@$+ .@#@@#$+ +#@@#+@$$#. .#@+#$+ .@#@@#$+ +$@$$ +=-;#$$+ +>,')!+ ", +" +@#@. #+++@#@. ##+@$$$@. +#$$$$+ #++#$#@@##$+@#$#@@#@.#++#$$$@@@@#@++#$#@@##$+@#$#@ ~{+++@@. @]^/(#$$#. +_:<[}| ", +" +#@. . at +++@#@. #+++@$$$@@@@@#@#$$$+ .+@#$$$$$@++#+@#$$@. .@#+@$$$$$$@.+@#$$$$$@++#+@#$$12 345 .#+$6$$78##+@$$@@@90abc ", +" +@#+ . at ++++@+ . at ++++#$$$$$@+@#$$$+ +#+@$$$$@+.#++++++% #+++@$$$@+%+#+@$$$$@+.#++++def$ghi. ++@]jk% #+++@$$$$lmn ", +"+#++. . at ++++ . at ++@++++++++##$$$+ #+++++++% . at ++++. . at +++++++. #+++++++% . at ++++.$$o_ . at +pqr . at +++@$$$s t ", +"#++. ..@% .. at ++++++. ###$$@. . at +++++. .... . at ++++. . at +++++. .... uvw .+++ . at ++#$$$#.. ", +".. . ...... ###$$+ ..... .... ..... . . .+#@++##@. ", +" ###$$+ +#@++@#$$+ ", +" ###$$+ +#@..@#+@$+ ", +" ###$$+ +@@. #++#$+ ", +" ###$$+ +##@. .+@#$+ ", +" ###$$+ #@+@@@@@##$@. ", +" ###$@. #+++@#$$$@+% ", +" ##++% . at ++++++++. ", +" #++. . at +++++. ", +" .. ..... "}; /* keep sorted (for bsearch) [BDyess] */ static W_Image imagearray[] = { --- NEW FILE xgalaxy-hyperspace.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XGalaxy-Hyperspace Comment=Modified version of XGalaxy Exec=xgalaxy-hyperspace Icon=xgalaxy.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; --- NEW FILE xgalaxy.desktop --- [Desktop Entry] Encoding=UTF-8 Name=XGalaxy Comment=Galaxian / Galaga like game with powerups Exec=xgalaxy Icon=xgalaxy.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; --- NEW FILE xgalaxy.spec --- Name: xgalaxy Version: 2.0.34 Release: 2%{?dist} Summary: Galaxian / Galaga like game with powerups Group: Amusements/Games License: GPL URL: http://sourceforge.net/projects/xgalaga/ Source0: http://download.sourceforge.net/xgalaga/xgalaga_%{version}.orig.tar.gz Source1: %{name}.desktop Source2: %{name}-hyperspace.desktop Patch0: http://ftp.debian.org/debian/pool/main/x/xgalaga/xgalaga_2.0.34-34.diff.gz Patch1: %{name}-2.0.34-warn.patch Patch2: %{name}-2.0.34-fullscreen.patch Patch3: %{name}-2.0.34-%{name}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libXt-devel libXpm-devel libXmu-devel libXxf86vm-devel BuildRequires: desktop-file-utils ImageMagick %description Arcade game for the X Window System inspired by the classic game Galaga. Xgalaxy is a Galaxian like game with additional features to produce a more interesting game. %prep %setup -q -n xgalaga-%{version} # many thanks to Debian for all their excellent work on xgalala %patch0 -p1 -z .deb %patch1 -p1 -z .warn %patch2 -p1 -z .fs %patch3 -p1 -z .%{name} sed -e 's/Debian/Fedora/g' debian/README.Debian > README.fedora cat >> README.fedora << EOF The latest Fedora %{name} package also includes fullscreen support, start %{name} with -window to get the old windowed behavior. You can switch on the fly between window and fullscreen mode with alt+enter. EOF # Change the name everywhere as upstreams name has already been used for a game # much like this one in the past, upstreams use of this is a legal gray area. sed -i 's/xgalaga/xgalaxy/g' `grep -rls xgalaga .` sed -i 's/XGalaga/XGalaxy/g' `grep -rls XGalaga .` %build export CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DXF86VIDMODE" export LDFLAGS=-lXxf86vm ./configure --libdir=%{_libdir} --exec-prefix=%{_bindir} \ --prefix=%{_datadir}/%{name} make %{?_smp_mflags} convert images/player3.xpm %{name}.png %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # move the sound-server binary out of %{_datadir} mv $RPM_BUILD_ROOT%{_datadir}/%{name}/xgal.sndsrv.linux \ $RPM_BUILD_ROOT%{_bindir} ln -s ../../bin/xgal.sndsrv.linux \ $RPM_BUILD_ROOT%{_datadir}/%{name}/xgal.sndsrv.linux # fix useless exec bit chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/*/* # make install doesn't install the manpage mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 install -m 644 xgal.6x $RPM_BUILD_ROOT%{_mandir}/man6/%{name}.6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps install -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES COPYING README README.fedora %{_bindir}/%{name}* %{_bindir}/xgal.sndsrv.linux %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.gz %{_datadir}/applications/fedora-%{name}*.desktop %{_datadir}/icons/hicolor/22x22/apps/%{name}.png %changelog * Mon May 22 2006 Hans de Goede 2.0.34-2 - Change name to xgalaxy because??upstreams name has already been used for a game much like this one in the past, upstreams use of this name thus legally is a bit dodgy. - Add missing BR: libXxf86vm-devel - Stop using %%{__sed} just use sed, to be consistent with the way make, rm, etc. are called. - Package the included manpage. * Thu May 11 2006 Hans de Goede 2.0.34-1 - Initial packaging based on spec file by Michael A. Peters Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 14:31:36 -0000 1.1 +++ .cvsignore 31 May 2006 14:32:28 -0000 1.2 @@ -0,0 +1,2 @@ +xgalaga_2.0.34-34.diff.gz +xgalaga_2.0.34.orig.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 14:31:36 -0000 1.1 +++ sources 31 May 2006 14:32:28 -0000 1.2 @@ -0,0 +1,2 @@ +6543cc0b309402109c85fb43ac69423f xgalaga_2.0.34-34.diff.gz +9f7ee685e9c4741b5f0edc3f91df9510 xgalaga_2.0.34.orig.tar.gz From fedora-extras-commits at redhat.com Wed May 31 15:13:48 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 31 May 2006 08:13:48 -0700 Subject: rpms/workrave/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 workrave.spec, 1.5, 1.6 workrave-1.8.2-cpp-fix.patch, 1.1, NONE Message-ID: <200605311513.k4VFDojl004757@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4736 Modified Files: .cvsignore sources workrave.spec Removed Files: workrave-1.8.2-cpp-fix.patch Log Message: * Wed May 31 2006 Tomas Mraz - 1.8.3-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 10:56:09 -0000 1.3 +++ .cvsignore 31 May 2006 15:13:48 -0000 1.4 @@ -1 +1 @@ -workrave-1.8.2.tar.gz +workrave-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 10:56:09 -0000 1.3 +++ sources 31 May 2006 15:13:48 -0000 1.4 @@ -1 +1 @@ -0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz +e1fe49f6fdf9d725bd21d50e2e0dc20d workrave-1.8.3.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/devel/workrave.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- workrave.spec 15 Feb 2006 11:52:40 -0000 1.5 +++ workrave.spec 31 May 2006 15:13:48 -0000 1.6 @@ -1,6 +1,6 @@ Name: workrave -Version: 1.8.2 -Release: 2%{?dist} +Version: 1.8.3 +Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL @@ -8,7 +8,6 @@ URL: http://workrave.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz Source1: workrave.desktop -Patch1: workrave-1.8.2-cpp-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -27,8 +26,6 @@ %prep %setup -q -%patch1 -p1 -b .cpp-fix - %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -67,6 +64,9 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + * Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 - Rebuilt with updated gcc --- workrave-1.8.2-cpp-fix.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 15:16:14 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 31 May 2006 08:16:14 -0700 Subject: rpms/workrave/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 workrave.spec, 1.5, 1.6 Message-ID: <200605311516.k4VFGGNd004825@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4803 Modified Files: .cvsignore sources workrave.spec Log Message: * Wed May 31 2006 Tomas Mraz - 1.8.3-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 10:56:09 -0000 1.3 +++ .cvsignore 31 May 2006 15:16:14 -0000 1.4 @@ -1 +1 @@ -workrave-1.8.2.tar.gz +workrave-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 10:56:09 -0000 1.3 +++ sources 31 May 2006 15:16:14 -0000 1.4 @@ -1 +1 @@ -0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz +e1fe49f6fdf9d725bd21d50e2e0dc20d workrave-1.8.3.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-5/workrave.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- workrave.spec 15 Feb 2006 11:52:40 -0000 1.5 +++ workrave.spec 31 May 2006 15:16:14 -0000 1.6 @@ -1,6 +1,6 @@ Name: workrave -Version: 1.8.2 -Release: 2%{?dist} +Version: 1.8.3 +Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL @@ -8,7 +8,6 @@ URL: http://workrave.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz Source1: workrave.desktop -Patch1: workrave-1.8.2-cpp-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -27,8 +26,6 @@ %prep %setup -q -%patch1 -p1 -b .cpp-fix - %build if [ ! -x configure ]; then ### Needed for snapshot releases. @@ -67,6 +64,9 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + * Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 - Rebuilt with updated gcc From fedora-extras-commits at redhat.com Wed May 31 15:16:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 08:16:41 -0700 Subject: rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen.patch, 1.1, 1.2 xgalaxy-2.0.34-xgalaxy.patch, 1.1, 1.2 xgalaxy.spec, 1.1, 1.2 Message-ID: <200605311516.k4VFGhZq004894@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4865 Modified Files: xgalaxy-2.0.34-fullscreen.patch xgalaxy-2.0.34-xgalaxy.patch xgalaxy.spec Log Message: xgalaxy-2.0.34-3 wip xgalaxy-2.0.34-fullscreen.patch: Index: xgalaxy-2.0.34-fullscreen.patch =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-fullscreen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xgalaxy-2.0.34-fullscreen.patch 31 May 2006 14:32:28 -0000 1.1 +++ xgalaxy-2.0.34-fullscreen.patch 31 May 2006 15:16:41 -0000 1.2 @@ -1,5 +1,5 @@ --- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/struct.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/struct.h 2006-05-31 16:56:50.000000000 +0200 @@ -55,6 +55,8 @@ W_Callback handle_button; W_Callback handle_expose; @@ -9,8 +9,8 @@ }; struct stringList { ---- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-22 11:45:35.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/data.c 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/data.c 2006-05-31 16:56:50.000000000 +0200 @@ -158,3 +158,6 @@ int useBuffered = 1; @@ -19,7 +19,7 @@ +struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 }; +#endif --- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-31 16:56:50.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; @@ -44,7 +44,7 @@ #if 0 --- xgalaga-2.0.34/libsprite/mapwindow.c.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-31 16:56:50.000000000 +0200 @@ -13,6 +13,8 @@ if(win->type != WIN_BORDER && win->borderwin) { W_MapWindow(win->borderwin); @@ -90,8 +90,8 @@ } void ---- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-22 11:45:35.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/init.c 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/init.c 2006-05-31 16:56:50.000000000 +0200 @@ -356,6 +356,31 @@ XFreeModifiermap(m); } @@ -134,8 +134,8 @@ +#endif } ---- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-22 11:45:35.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-31 16:56:50.000000000 +0200 @@ -236,6 +236,10 @@ neww->type = type; neww->mapped = 0; @@ -380,7 +380,7 @@ + } +} --- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-31 16:56:50.000000000 +0200 @@ -63,6 +63,7 @@ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); @@ -389,8 +389,8 @@ /* point.c */ void W_DrawPoint(W_Window window, int x, int y, W_Color color); void FlushPointCache(Window win, int color); ---- xgalaga-2.0.34/defs.h.fs 2006-05-22 11:45:35.000000000 +0200 -+++ xgalaga-2.0.34/defs.h 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/defs.h.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/defs.h 2006-05-31 16:56:50.000000000 +0200 @@ -26,8 +26,9 @@ #define TORPDELAY 5 @@ -404,7 +404,7 @@ #define NUMSTARS 30 --- xgalaga-2.0.34/Wlib.h.fs 1998-04-12 08:03:20.000000000 +0200 -+++ xgalaga-2.0.34/Wlib.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/Wlib.h 2006-05-31 16:56:50.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; @@ -428,8 +428,8 @@ #endif /* AMIGA */ #if 0 ---- xgalaga-2.0.34/main.c.fs 2006-05-22 11:45:36.000000000 +0200 -+++ xgalaga-2.0.34/main.c 2006-05-22 11:45:35.000000000 +0200 +--- xgalaga-2.0.34/main.c.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/main.c 2006-05-31 16:56:50.000000000 +0200 @@ -32,6 +32,7 @@ static int attacking = 0, maxattacking, entering=0; static int maxetorps = 5, numetorps=0; @@ -532,7 +532,7 @@ /* W_AutoRepeatOff();*/ --- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200 -+++ xgalaga-2.0.34/Wproto.h 2006-05-22 11:45:35.000000000 +0200 ++++ xgalaga-2.0.34/Wproto.h 2006-05-31 16:56:50.000000000 +0200 @@ -63,6 +63,7 @@ W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); @@ -541,3 +541,51 @@ /* point.c */ void W_DrawPoint(W_Window window, int x, int y, W_Color color); void FlushPointCache(Window win, int color); +--- xgalaga-2.0.34/xgal.6x.fs 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/xgal.6x 2006-05-31 16:56:50.000000000 +0200 +@@ -4,11 +4,11 @@ + .SH SYNOPSIS + .B xgalaga + [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] +-[-noclipmask] [-nouseor] [-nostars] ++[-noclipmask] [-nouseor] [-nostars] [-window] + .P + .B xgalaga-hyperspace + [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] +-[-noclipmask] [-nouseor] [-nostars] ++[-noclipmask] [-nouseor] [-nostars] [-window] + .SH INSTRUCTIONS + .LP + It's Galaga, you know how to play Galaga, stop bothering me. +@@ -35,6 +35,9 @@ + .B \-nosound + Turn sound OFF + .TP 8 ++.B \-window ++Run in a window, not full screen. Full screen is the default. ++.TP 8 + .B \-b + Turn buffered mode off, use this if it runs too slowly. Will cause + flicker, maybe lots, maybe only a little. +@@ -68,6 +71,8 @@ + k - Use keyboard control + .TP 8 + x - use your shields (xgalaga-hyperspace only) ++.TP 8 ++alt-enter - Toggle full screen node. + .SH "SEE ALSO" + Xgalaga home page + .RI < http://rumsey.org/xgal.html > +--- xgalaga-2.0.34/pathfile.c.fs 2006-05-31 17:08:48.000000000 +0200 ++++ xgalaga-2.0.34/pathfile.c 2006-05-31 17:09:37.000000000 +0200 +@@ -387,8 +387,8 @@ + + void get_xy(int anum, int* x, int* y) + { +- *x = pathinfo[al_paths[anum]].startx; +- *y = pathinfo[al_paths[anum]].starty; ++ *x = (WINWIDTH * pathinfo[al_paths[anum]].startx) / 400; ++ *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500; + } + + int get_delay(int anum) xgalaxy-2.0.34-xgalaxy.patch: Index: xgalaxy-2.0.34-xgalaxy.patch =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-xgalaxy.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 14:32:28 -0000 1.1 +++ xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 15:16:41 -0000 1.2 @@ -34,7 +34,7 @@ .B xgalaxy [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] @@ -11,9 +11,9 @@ - [-noclipmask] [-nouseor] [-nostars] + [-noclipmask] [-nouseor] [-nostars] [-window] .SH INSTRUCTIONS .LP -It's Galaga, you know how to play Galaga, stop bothering me. @@ -46,9 +46,9 @@ .P The xgalaxy-hyperspace version features some new weapons and different gameplay. -@@ -69,7 +69,7 @@ +@@ -71,7 +71,7 @@ .TP 8 - x - use your shields (xgalaxy-hyperspace only) + alt-enter - Toggle full screen node. .SH "SEE ALSO" -Xgalaga home page +XGalaxy home page Index: xgalaxy.spec =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xgalaxy.spec 31 May 2006 14:32:28 -0000 1.1 +++ xgalaxy.spec 31 May 2006 15:16:41 -0000 1.2 @@ -1,6 +1,6 @@ Name: xgalaxy Version: 2.0.34 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Galaxian / Galaga like game with powerups Group: Amusements/Games License: GPL @@ -97,6 +97,9 @@ %changelog +* Mon May 22 2006 Hans de Goede 2.0.34-3 +- Documented the new -window switch in the manpage. + * Mon May 22 2006 Hans de Goede 2.0.34-2 - Change name to xgalaxy because??upstreams name has already been used for a game much like this one in the past, upstreams use of this name thus legally From fedora-extras-commits at redhat.com Wed May 31 15:21:51 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 31 May 2006 08:21:51 -0700 Subject: rpms/workrave/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 workrave.spec, 1.2, 1.3 Message-ID: <200605311521.k4VFLrS7004969@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4947 Modified Files: .cvsignore sources workrave.spec Log Message: * Wed May 31 2006 Tomas Mraz - 1.8.3-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 11:11:58 -0000 1.3 +++ .cvsignore 31 May 2006 15:21:51 -0000 1.4 @@ -1 +1 @@ -workrave-1.8.2.tar.gz +workrave-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 11:11:58 -0000 1.3 +++ sources 31 May 2006 15:21:51 -0000 1.4 @@ -1 +1 @@ -0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz +e1fe49f6fdf9d725bd21d50e2e0dc20d workrave-1.8.3.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-3/workrave.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workrave.spec 2 Feb 2006 11:11:58 -0000 1.2 +++ workrave.spec 31 May 2006 15:21:51 -0000 1.3 @@ -1,5 +1,5 @@ Name: workrave -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -8,12 +8,14 @@ URL: http://workrave.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz Source1: workrave.desktop + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: gnet2-devel BuildRequires: libgnomeuimm26-devel BuildRequires: gnome-panel-devel BuildRequires: desktop-file-utils +BuildRequires: xorg-x11-devel %description Workrave is a program that assists in the recovery and prevention of @@ -61,8 +63,16 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + +* Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 +- Rebuilt with updated gcc + * Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 - Updated version, dropped obsolete patch +- Added missing buildrequires for modular X +- Fixed compilation on gcc-4.1 * Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 - Added a desktop file From fedora-extras-commits at redhat.com Wed May 31 15:22:28 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 31 May 2006 08:22:28 -0700 Subject: rpms/workrave/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 workrave.spec, 1.2, 1.3 Message-ID: <200605311522.k4VFMUVm005040@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/workrave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5019 Modified Files: .cvsignore sources workrave.spec Log Message: * Wed May 31 2006 Tomas Mraz - 1.8.3-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Feb 2006 11:28:26 -0000 1.3 +++ .cvsignore 31 May 2006 15:22:28 -0000 1.4 @@ -1 +1 @@ -workrave-1.8.2.tar.gz +workrave-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2006 11:28:26 -0000 1.3 +++ sources 31 May 2006 15:22:28 -0000 1.4 @@ -1 +1 @@ -0d4799ed3a250b1990e1ba0225348e8d workrave-1.8.2.tar.gz +e1fe49f6fdf9d725bd21d50e2e0dc20d workrave-1.8.3.tar.gz Index: workrave.spec =================================================================== RCS file: /cvs/extras/rpms/workrave/FC-4/workrave.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workrave.spec 2 Feb 2006 11:28:26 -0000 1.2 +++ workrave.spec 31 May 2006 15:22:28 -0000 1.3 @@ -1,5 +1,5 @@ Name: workrave -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: Program that assists in the recovery and prevention of RSI # Based on older packages by Dag Wieers and Steve Ratcliffe @@ -8,12 +8,14 @@ URL: http://workrave.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz Source1: workrave.desktop + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: gnet2-devel BuildRequires: libgnomeuimm26-devel BuildRequires: gnome-panel-devel BuildRequires: desktop-file-utils +BuildRequires: xorg-x11-devel %description Workrave is a program that assists in the recovery and prevention of @@ -61,8 +63,16 @@ %{_datadir}/applications/fedora-workrave.desktop %changelog +* Wed May 31 2006 Tomas Mraz - 1.8.3-1 +- New upstream version + +* Wed Feb 15 2006 Tomas Mraz - 1.8.2-2 +- Rebuilt with updated gcc + * Thu Feb 2 2006 Tomas Mraz - 1.8.2-1 - Updated version, dropped obsolete patch +- Added missing buildrequires for modular X +- Fixed compilation on gcc-4.1 * Sat Oct 22 2005 Tomas Mraz - 1.8.1-4 - Added a desktop file From fedora-extras-commits at redhat.com Wed May 31 15:38:38 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 08:38:38 -0700 Subject: rpms/paraview/FC-4 paraview.spec,1.2,1.3 Message-ID: <200605311538.k4VFceaQ005188@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/paraview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5169 Modified Files: paraview.spec Log Message: Use VTK_OPENGL_HAS_OSMESA on FC4 Index: paraview.spec =================================================================== RCS file: /cvs/extras/rpms/paraview/FC-4/paraview.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- paraview.spec 17 Apr 2006 20:43:43 -0000 1.2 +++ paraview.spec 31 May 2006 15:38:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: paraview Version: 2.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -118,7 +118,7 @@ -DTCL_LIBRARY:PATH=tcl \ -DTK_LIBRARY:PATH=tk \ -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ - -DVTK_USE_MAGLED_MESA:BOOL=ON \ + -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -153,7 +153,7 @@ -DVTK_USE_MPI:BOOL=ON \ -DMPI_INCLUDE_PATH:PATH=%{_includedir}/lam \ -DMPI_LIBRARY:STRING="-L%{_libdir}/lam -llammpio -llammpi++ -llamf77mpi -lmpi -llam -laio -lutil -ldl" \ - -DVTK_USE_MAGLED_MESA:BOOL=ON \ + -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -308,6 +308,9 @@ %changelog +* Tue May 30 2006 - Orion Poplawski - 2.4.3-6 +- Use VTK_OPENGL_HAS_OSMESA on FC4 + * Wed Apr 12 2006 - Orion Poplawski - 2.4.3-5 - Cleanup permissions From fedora-extras-commits at redhat.com Wed May 31 15:41:54 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 31 May 2006 08:41:54 -0700 Subject: rpms/xscreensaver/devel xscreensaver-5.00-browser-setting.patch, 1.1, 1.2 xscreensaver.spec, 1.2, 1.3 Message-ID: <200605311541.k4VFfu8R005266@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/xscreensaver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5244 Modified Files: xscreensaver-5.00-browser-setting.patch xscreensaver.spec Log Message: * Wed May 31 2006 Mamoru Tasaka - 1:5.00-3 - Fix browser option patch. xscreensaver-5.00-browser-setting.patch: Index: xscreensaver-5.00-browser-setting.patch =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.00-browser-setting.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xscreensaver-5.00-browser-setting.patch 31 May 2006 14:13:44 -0000 1.1 +++ xscreensaver-5.00-browser-setting.patch 31 May 2006 15:41:54 -0000 1.2 @@ -1,47 +1,6 @@ --- xscreensaver-5.00/configure.in.browser-setting 2006-05-24 07:07:00.000000000 +0900 -+++ xscreensaver-5.00/configure.in 2006-05-31 03:42:39.000000000 +0900 -@@ -1793,6 +1793,40 @@ - - ############################################################################### - # -+# Whether to allow root password to unblank. -+# -+############################################################################### -+AC_ARG_ENABLE(root-passwd, [ -+ --enable-root-passwd Allow root passwd to unlock screen. -+ --disable-root-passwd Do not allow that.], -+ [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) -+if test "$enable_root_passwd" = yes; then -+ AC_DEFINE(ALLOW_ROOT_PASSWD) -+ true -+elif test "$enable_root_passwd" != no; then -+ echo "error: something wrong with root-passwd option. Check configure.in ." -+ exit 1 -+fi -+ -+############################################################################### -+# -+# Whether to allow root password to unblank. -+# -+############################################################################### -+AC_ARG_ENABLE(root-passwd, [ -+ --enable-root-passwd Allow root passwd to unlock screen. -+ --disable-root-passwd Do not allow that.], -+ [enable_root_passwd="$enableval"],[enable_root_passwd=yes]) -+if test "$enable_root_passwd" = yes; then -+ AC_DEFINE(ALLOW_ROOT_PASSWD) -+ true -+elif test "$enable_root_passwd" != no; then -+ echo "error: something wrong with root-passwd option. Check configure.in ." -+ exit 1 -+fi -+ -+############################################################################### -+# - # Check for PAM. - # - ############################################################################### -@@ -2430,6 +2464,7 @@ ++++ xscreensaver-5.00/configure.in 2006-06-01 00:25:45.000000000 +0900 +@@ -2430,6 +2430,7 @@ # Check for the various Gnome help and URL loading programs. # @@ -49,7 +8,7 @@ if test "$have_gtk" = yes; then AC_CHECK_PROGS(gnome_open_program, gnome-open) AC_CHECK_PROGS(gnome_url_show_program, gnome-url-show) -@@ -3359,6 +3394,45 @@ +@@ -3359,6 +3360,45 @@ ############################################################################### # @@ -95,7 +54,7 @@ # Check whether it's ok to install some hacks as setuid (e.g., "sonar") # This should be safe, but let's give people the option. # -@@ -3579,6 +3653,7 @@ +@@ -3579,6 +3619,7 @@ AC_SUBST(DEFAULT_IMAGES_P) AC_SUBST(DEFAULT_IMAGE_DIRECTORY) AC_SUBST(DEFAULT_TEXT_FILE) @@ -104,7 +63,7 @@ AC_SUBST(OBJCC) AC_SUBST(EXES_OSX) --- xscreensaver-5.00/driver/XScreenSaver.ad.in.browser-setting 2006-05-24 08:01:34.000000000 +0900 -+++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-05-31 03:44:31.000000000 +0900 ++++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-06-01 00:24:49.000000000 +0900 @@ -93,7 +93,7 @@ ! ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3) Index: xscreensaver.spec =================================================================== RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xscreensaver.spec 31 May 2006 14:13:44 -0000 1.2 +++ xscreensaver.spec 31 May 2006 15:41:54 -0000 1.3 @@ -1,7 +1,7 @@ %define name xscreensaver %define version 5.00 -%define fedora_rel 2 +%define fedora_rel 3 %define fedora_ver 5.89 %define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt @@ -237,6 +237,9 @@ %defattr(-,root,root) %changelog +* Wed May 31 2006 Mamoru Tasaka - 1:5.00-3 +- Fix browser option patch. + * Wed May 31 2006 Mamoru Tasaka - 1:5.00-2 - Change the default text. - Rewrite root passwd patch. From fedora-extras-commits at redhat.com Wed May 31 16:08:56 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 31 May 2006 09:08:56 -0700 Subject: rpms/bsd-games/devel bsd-games.spec,1.4,1.5 Message-ID: <200605311608.k4VG8wwf007770@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7751 Modified Files: bsd-games.spec Log Message: Added missing BR: flex Index: bsd-games.spec =================================================================== RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bsd-games.spec 2 May 2006 00:00:30 -0000 1.4 +++ bsd-games.spec 31 May 2006 16:08:56 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Collection of text-based games Name: bsd-games Version: 2.17 -Release: 10%{?dist} +Release: 12%{?dist} License: BSD Group: Amusements/Games URL: ftp://metalab.unc.edu/pub/Linux/games/ @@ -18,14 +18,16 @@ Patch5: bsd-games-2.17-tetrisgid.patch Patch6: bsd-games-2.17-hackgid.patch Patch7: bsd-games-2.17-phantasiagid.patch +# Add patch for monop->mpoly man page +Patch8: bsd-games-2.17-monop-rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel libtermcap-devel words +BuildRequires: ncurses-devel libtermcap-devel words flex Requires(Pre): /usr/sbin/groupadd %description Bsd-games includes adventure, arithmetic, atc, backgammon, battlestar, bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku, -hunt, mille, monop, morse, number, phantasia, pig, pom, ppt, primes, +hunt, mille, mpoly, morse, number, phantasia, pig, pom, ppt, primes, quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon, tetris-bsd, trek, wargames, worm, worms and wump. @@ -40,6 +42,7 @@ %patch5 -p1 -b .tetrisgid %patch6 -p1 -b .hackgid %patch7 -p1 -b .phantasiagid +%patch8 -p1 -b .monop.rename %build # We include a templatized configuration settings file to set @@ -71,6 +74,7 @@ # Change the binary name for monop to prevent a conflict with the mono-devel # package mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly +mv $RPM_BUILD_ROOT/%{_mandir}/man6/monop.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/mpoly.6.gz # Remove this doc file. We're copying it to a different location for Fedora. rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me @@ -149,6 +153,12 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me %changelog +* Wed May 31 2006 Wart 2.17-12 +- Added missing BR: flex + +* Tue May 2 2006 Wart 2.17-11 +- Rename monop man page to match the renamed executable. + * Mon May 1 2006 Wart 2.17-10 - Remove banner (conflict with a similar package in FE) From fedora-extras-commits at redhat.com Wed May 31 16:09:16 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 09:09:16 -0700 Subject: rpms/fillets-ng/devel fillets-ng-0.7.3-lua-pkgconfig.patch, NONE, 1.1 fillets-ng.spec, 1.6, 1.7 Message-ID: <200605311609.k4VG9IXK007826@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/fillets-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7753 Modified Files: fillets-ng.spec Added Files: fillets-ng-0.7.3-lua-pkgconfig.patch Log Message: Patch build to use pkgconfig for lua detection instead of the no longer provided lua-config script. fillets-ng-0.7.3-lua-pkgconfig.patch: --- NEW FILE fillets-ng-0.7.3-lua-pkgconfig.patch --- diff -Naupr fillets-ng-0.7.3.orig/configure.in fillets-ng-0.7.3/configure.in --- fillets-ng-0.7.3.orig/configure.in 2005-10-04 20:11:00.000000000 +0200 +++ fillets-ng-0.7.3/configure.in 2006-05-31 17:49:58.000000000 +0200 @@ -22,41 +22,9 @@ AC_CHECK_LIB(m, sin, LIBS="$LIBS -lm") ################################################### # Check for lua and define LUA_CFLAGS and LUA_LIBS - -dnl ---- lua check ------------- (stolen from Stratagus) -AC_ARG_WITH(lua, [ --with-lua=PFX Prefix where Lua is installed], - LUAPFX="$withval", LUAPFX="") -if test "x$LUAPFX" != x ; then - LUA_CFLAGS="-I$LUAPFX" - LUA_LIBS="-L$LUAPFX -llua -llualib" -else -dnl Debian, and possibly other systems, include this script... - AC_CHECK_PROGS(LUACONFIG, [lua-config lua-config50 lua-config5.0], "") - if test "x$LUACONFIG" != x; then - LUA_CFLAGS="`[$LUACONFIG --include]`" - LUA_LIBS="`[$LUACONFIG --static]`" - else dnl ...otherwise, attempt to guess - LUA_CFLAGS="" - LUA_LIBS="" - AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua", - [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50", - [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0", - [AC_MSG_ERROR([*** Lua5 is required. - Try --with-lua=PREFIX - You can download lua from http://www.lua.org])], - $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS) - - AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib", - [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib50", - [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib5.0", - [AC_MSG_ERROR([*** Lualib5 is required. - You can download lua from http://www.lua.org])], - $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS) - fi -fi +PKG_CHECK_MODULES(LUA, lua, [have_lua="yes"], [have_lua="no"]) AC_SUBST(LUA_CFLAGS) AC_SUBST(LUA_LIBS) -dnl ---- end of lua check ------ ################################################### Index: fillets-ng.spec =================================================================== RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fillets-ng.spec 6 Mar 2006 15:41:33 -0000 1.6 +++ fillets-ng.spec 31 May 2006 16:09:16 -0000 1.7 @@ -1,17 +1,20 @@ Summary: Fish Fillets Next Generation, a puzzle game with 70 levels Name: fillets-ng Version: 0.7.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games URL: http://fillets.sourceforge.net/ Source0: http://dl.sf.net/fillets/fillets-ng-%{version}.tar.gz Source1: fillets.desktop Source2: fillets.png +Patch0: fillets-ng-0.7.3-lua-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: fillets-ng-data >= 0.7.1 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel BuildRequires: lua-devel, fribidi-devel, desktop-file-utils +# Required for autoreconf +BuildRequires: autoconf, automake, libtool %description Fish Fillets is strictly a puzzle game. The goal in every of the @@ -24,6 +27,8 @@ %prep %setup -q +%patch0 -p1 -b .lua-pkgconfig +autoreconf --install --force %build @@ -66,6 +71,10 @@ %changelog +* Wed May 31 2006 Matthias Saou 0.7.3-4 +- Add patch to change lua detection from lua-config to pkgconfig since the + latest lua packages no longer provide the config script. + * Mon Mar 6 2006 Matthias Saou 0.7.3-3 - FC5 rebuild. From fedora-extras-commits at redhat.com Wed May 31 16:11:12 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 31 May 2006 09:11:12 -0700 Subject: rpms/bsd-games/devel bsd-games-2.17-monop-rename.patch,NONE,1.1 Message-ID: <200605311611.k4VGBE6H007904@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/bsd-games/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7886 Added Files: bsd-games-2.17-monop-rename.patch Log Message: Added missing patch bsd-games-2.17-monop-rename.patch: --- NEW FILE bsd-games-2.17-monop-rename.patch --- --- bsd-games-2.17.new/monop/monop.6.in 2003-12-16 18:47:37.000000000 -0800 +++ bsd-games-2.17.new/monop/monop.6.in.new 2006-05-03 07:33:20.000000000 -0700 @@ -30,10 +30,10 @@ .\" @(#)monop.6 6.5 (Berkeley) 3/25/93 .\" .Dd March 25, 1993 -.Dt MONOP 6 +.Dt MPOLY 6 .Os .Sh NAME -.Nm monop +.Nm mpoly .Nd Monopoly game .Sh SYNOPSIS .Nm From fedora-extras-commits at redhat.com Wed May 31 17:14:15 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:14:15 -0700 Subject: rpms/AGReader - New directory Message-ID: <200605311714.k4VHEH0c010477@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10456/AGReader Log Message: Directory /cvs/extras/rpms/AGReader added to the repository From fedora-extras-commits at redhat.com Wed May 31 17:14:15 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:14:15 -0700 Subject: rpms/AGReader/devel - New directory Message-ID: <200605311714.k4VHEHhq010480@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10456/AGReader/devel Log Message: Directory /cvs/extras/rpms/AGReader/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 17:14:35 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:14:35 -0700 Subject: rpms/AGReader Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605311714.k4VHEbio010534@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501 Added Files: Makefile import.log Log Message: Setup of module AGReader --- NEW FILE Makefile --- # Top level Makefile for module AGReader all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 17:14:35 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:14:35 -0700 Subject: rpms/AGReader/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605311714.k4VHEbVq010537@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10501/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module AGReader --- NEW 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 May 31 17:15:21 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:15:21 -0700 Subject: rpms/AGReader import.log,1.1,1.2 Message-ID: <200605311715.k4VHFNnm010613@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10578 Modified Files: import.log Log Message: auto-import AGReader-1.1-9 on branch devel from AGReader-1.1-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/AGReader/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 17:14:34 -0000 1.1 +++ import.log 31 May 2006 17:15:20 -0000 1.2 @@ -0,0 +1 @@ +AGReader-1_1-9:HEAD:AGReader-1.1-9.src.rpm:1149095666 From fedora-extras-commits at redhat.com Wed May 31 17:15:21 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:15:21 -0700 Subject: rpms/AGReader/devel AGReader-1.1-gcc41.patch, NONE, 1.1 AGReader-1.1-keys.patch, NONE, 1.1 AGReader.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605311715.k4VHFNm3010622@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/AGReader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10578/devel Modified Files: .cvsignore sources Added Files: AGReader-1.1-gcc41.patch AGReader-1.1-keys.patch AGReader.spec Log Message: auto-import AGReader-1.1-9 on branch devel from AGReader-1.1-9.src.rpm AGReader-1.1-gcc41.patch: --- NEW FILE AGReader-1.1-gcc41.patch --- --- AGReader/Sources/Text.h.gcc41 2001-12-05 21:42:45.000000000 +0100 +++ AGReader/Sources/Text.h 2006-05-27 10:48:23.000000000 +0200 @@ -21,4 +21,6 @@ /** Create a AGFile directly from a char stream **/ AGFile CreateTextFromStream(char *stream, char *title); +void AdjustColors(AGNode node); + #endif --- AGReader/Sources/Text.c.gcc41 2001-12-05 22:10:33.000000000 +0100 +++ AGReader/Sources/Text.c 2006-05-27 10:53:25.000000000 +0200 @@ -8,6 +8,7 @@ #include "AGNodes.h" #include "AGObj.h" #include "Text.h" +#include "Input.h" /** Redefines only functions that differs from AG_lib.c **/ @@ -15,11 +16,11 @@ AGFile CreateTextNodes(char *filename) { AGFile new; - if( new = CreateFile( filename ) ) + if( (new = CreateFile( filename )) ) { AGNode node; /* Only one node is defined for text file */ - if( (AGNode) new->Content = node = (AGNode) malloc(sizeof(*node)) ) + if( (new->Content = (AGList)(node = (AGNode) malloc(sizeof(*node)))) ) { memset(node, 0, sizeof(*node)); node->name = "MAIN"; @@ -45,7 +46,7 @@ { AGFile new; - if( new = CreateTextNodes( NULL ) ) + if( (new = CreateTextNodes( NULL )) ) { AGNode node = (AGNode) new->Content; node->start = new->Buffer = stream; @@ -102,7 +103,6 @@ static AGPara par; static AGWord new; char *buf, *p; - long nb; InitContext(&AGC, JM_NORMAL); /* Alloc a first paragraph */ --- /dev/null 2006-05-27 07:46:48.810857750 +0200 +++ AGReader/Sources/Input.h 2006-05-27 10:48:23.000000000 +0200 @@ -0,0 +1,11 @@ +#ifndef INPUT_H +#define INPUT_H + +#include "AGNodes.h" + +void Prompt( char *str ); +void SetTopLine( AGNode node ); +void ThrowError(char *msg, char *param); +void ProcessKeys( void ); + +#endif --- AGReader/Sources/AGNodes.h.gcc41 2001-12-05 21:48:46.000000000 +0100 +++ AGReader/Sources/AGNodes.h 2006-05-27 10:48:23.000000000 +0200 @@ -124,8 +124,10 @@ char tabstop(short pos); /* Amount of spaces to add to reach tabstop */ void RenderAGNode(AGPara, short nbl, short left, short wid, char mode); +void RenderLine(AGPara para, short start, short max, char ins_mode); void ScrollDisplay(struct scrpos *, short pos); void AGFileInfo(AGFile, char *obj, char *objs); +char *FindAGLinkInfo(AGLink link, char *format); /*** Special character may trashed the display ***/ AGWord DisableSpecialChar(AGPara par,AGWord old, unsigned char); --- AGReader/Sources/Input.c.gcc41 2001-07-14 15:13:34.000000000 +0200 +++ AGReader/Sources/Input.c 2006-05-27 10:48:23.000000000 +0200 @@ -3,11 +3,13 @@ ** by T.Pierron, 11/9/2000, free software ** ****************************************************/ +#include #include "AGReader.h" #include "AGNodes.h" #include "Navig.h" #include "IO_tty.h" #include "Help.h" +#include "Text.h" static char InfDisp = 0; /* 1 if information screen is displayed */ static char TmpBuf[80]; /* Buffer used for various output */ @@ -32,7 +34,7 @@ printf("[%d;H%4d%%%*s[%d;6H", terminfo.height,(node && node->maxlines > terminfo.height ? - (100 * node->line) / (node->maxlines-terminfo.height+1) : 100), + (100 * node->line) / ((int)node->maxlines-terminfo.height+1) : 100), terminfo.width-5,str,terminfo.height ); if( svg[0] ) memcpy(str + plen, svg, 2); @@ -81,6 +83,7 @@ void ThrowError(char *msg, char *param) { char *d, *s; + int i; /* silence warnings */ /* Frequently error message encountered */ if(msg == ERROR_NO_FREE_STORE) msg = "Not enough memory!"; @@ -95,7 +98,7 @@ /* If GUI isn't already set, display on stderr */ if( is_rawmode() ) *d='\0',Prompt(TmpBuf); else /* fputs doesn't write any \n */ - *d++='\n',write(2,TmpBuf,d-TmpBuf); + *d++='\n',i=write(2,TmpBuf,d-TmpBuf); } /*** Toggle display between node and information ***/ @@ -106,7 +109,7 @@ if( InfDisp ) inf->node = old; else /* The node may not yet exists */ - if(strinfo = (AGList) FindAGNode(inf->file, STR_INFONAME)) + if( (strinfo = (AGList) FindAGNode(inf->file, STR_INFONAME)) ) old = inf->node, inf->node = strinfo; else return; @@ -266,7 +269,7 @@ case '=': /* Display line statistics */ sprintf(TmpBuf,"line %d of %d ",AGNODE(&terminfo)->line+1, - AGNODE(&terminfo)->maxlines); + (int)AGNODE(&terminfo)->maxlines); Prompt(TmpBuf); break; case 'b': case 'B': --- AGReader/Sources/Navig.h.gcc41 2001-10-15 12:47:01.000000000 +0200 +++ AGReader/Sources/Navig.h 2006-05-27 10:48:23.000000000 +0200 @@ -30,6 +30,8 @@ /** Search for node/file pointed by link and display it **/ int Navigate( char *GuideName, AGLink ); +void SetActiveLine( AGNode node ); + /** Function use to create file / node **/ typedef AGFile (*pfnCreateNodes)( char *path ); typedef char (*pfnCreateWords)( AGNode node ); --- AGReader/Sources/AGReader.h.gcc41 2001-03-21 11:28:39.000000000 +0100 +++ AGReader/Sources/AGReader.h 2006-05-27 10:48:23.000000000 +0200 @@ -60,5 +60,7 @@ #define QUIT_OK 0 #define QUIT_ERROR 1 +void quit(char *msg, int status); + #endif --- AGReader/Sources/main.c.gcc41 2001-12-05 21:03:14.000000000 +0100 +++ AGReader/Sources/main.c 2006-05-27 10:48:23.000000000 +0200 @@ -10,6 +10,7 @@ #include "AGNodes.h" #include "IO_tty.h" #include "Navig.h" +#include "Input.h" struct scrpos terminfo; /* Information about visited node & screen */ @@ -96,5 +97,7 @@ } else /* Errors will be displayed in Navigate() */ quit(NULL,QUIT_ERROR); + + return 0; } --- AGReader/Sources/Navigate.c.gcc41 2001-10-16 15:24:18.000000000 +0200 +++ AGReader/Sources/Navigate.c 2006-05-27 10:56:17.000000000 +0200 @@ -12,6 +12,8 @@ #include "AGObj.h" #include "Navig.h" #include "Text.h" +#include "Input.h" +#include "IO_tty.h" extern char buffer[ 512 ]; extern short *tabs; @@ -25,15 +27,15 @@ /*** System-specific execute command ***/ int myExecute( char *fmt, char *arg ) { - char *space, *drive, *dest; + char *space, *drive, *dest = NULL; int pid; /* Command comes from AmigaOS, try to convert to Unix */ if( strncasecmp(fmt, "Run ", 4) == 0 ) fmt += 4; /* Get command name */ - if( space = strchr(fmt, ' ') ) *space = 0; + if( (space = strchr(fmt, ' ')) ) *space = 0; /* Get device specifier */ - if( drive = strchr(fmt, ':') ) { + if( (drive = strchr(fmt, ':')) ) { *drive = 0; if(NULL != (dest = getenv( fmt )) || NULL != (dest = getenv( AGR_PATH_ENV_NAME ))) @@ -229,7 +231,7 @@ /*** Try to locate a file, depending where program runs ***/ char *LocateFile( char *guidename, char *filename ) { - char *p, *path, isdev=0; + char *p = NULL, *path, isdev=0; int fd; /* Retrieve directory where remains the document */ @@ -289,7 +291,7 @@ if( (*path = LocateFile( GuideName, link->file )) != NULL ) { extern char AGHeader[]; - unsigned char *p; + char *p; /* Read a few bytes from this file */ if( (fd = open(*path,O_RDONLY)) == -1 ) @@ -317,9 +319,10 @@ /* Check for a few bytes, whether it's ASCII text */ for(p=buffer+len-1; (char *)p>=buffer; p--) { + unsigned char u = *p; /* Non-ISO-8859-1 characters */ - if( *p>126 && *p<160 ) break; - if( *p<32 && *p!='\r' && *p!='\n' && *p!='\t' && *p!=27) break; + if( u>126 && u<160 ) break; + if( u<32 && u!='\r' && u!='\n' && u!='\t' && u!=27) break; } if((char *)pprev ) { @@ -417,8 +419,11 @@ SetActiveLine(node); /* Set the first displayed line */ FindNth(node, link->line, &terminfo); - if(node != AGNODE(&terminfo)); - PushAGNode(terminfo.file, AGNODE(&terminfo) = node, 0); + if(node != (AGNode)terminfo.node) { + terminfo.node = node; + PushAGNode(terminfo.file, + terminfo.node, 0); + } if( is_rawmode() ) ReRenderAGNode(); } else ThrowError("Can't find node `%s'.", link->node); return 1; --- AGReader/Sources/IO_tty.c.gcc41 2001-12-05 20:59:30.000000000 +0100 +++ AGReader/Sources/IO_tty.c 2006-05-27 10:48:23.000000000 +0200 @@ -4,6 +4,7 @@ ***** but greatly simplified by T.Pierron **** ****************************************************************/ +#include #include #include #include @@ -44,6 +45,7 @@ { static struct termios save_term; struct termios s; + int i; /* silence warnings */ /* Do not set twice the same mode!! */ if (old_st == on) return; old_st = on; @@ -121,12 +123,12 @@ s.c_cc[VTIME] = 0; /* let's enter in private mode */ - write(1,SET_PRIV,sizeof(SET_PRIV)-1); + i = write(1,SET_PRIV,sizeof(SET_PRIV)-1); } else { /* Restore saved modes */ s = save_term; /* and old display mode */ - write(1,SET_PUB,sizeof(SET_PUB)-1); + i = write(1,SET_PUB,sizeof(SET_PUB)-1); } tcsetattr(2, TCSADRAIN, &s); } @@ -185,7 +187,8 @@ char getchr(void) { char c; - read(tty, &c, sizeof(c)); + if (read(tty, &c, sizeof(c)) != sizeof(c)) + return 0; return c; } --- AGReader/Sources/Makefile.gcc41 2001-07-10 12:41:17.000000000 +0200 +++ AGReader/Sources/Makefile 2006-05-27 10:48:23.000000000 +0200 @@ -21,7 +21,7 @@ $(CC) $(OBJECTS) -o $(EXE) $(LIBS) -g final: $(OBJECTS) - $(CC) $(OBJECTS) -o $(EXE) $(LIBS) -s + $(CC) $(OBJECTS) -o $(EXE) $(LIBS) install: cp $(EXE) $(HOME)/bin -f --- AGReader/Sources/AGObj.c.gcc41 2001-05-10 23:01:03.000000000 +0200 +++ AGReader/Sources/AGObj.c 2006-05-27 10:48:23.000000000 +0200 @@ -5,6 +5,8 @@ ** Started on 13/2/2001, free software under GNU PL ** ********************************************************/ +#include +#include #include "AGReader.h" #include "AGNodes.h" #include "AGObj.h" @@ -51,7 +53,7 @@ /* Makes them appear like web-page anchor */ new->style = DEF_LINKSTYLE; - new->fgpen = LinkColor[ new->link->type ]; + new->fgpen = LinkColor[ (int)new->link->type ]; /* Search content of command/node */ if( new->link->type != UNKNOWN_TYPE ) FindAGLinkInfo(new->link, p+strlen(LinkTokens[new->link->type-1])); --- AGReader/Sources/AGObj.h.gcc41 2001-05-10 22:43:29.000000000 +0200 +++ AGReader/Sources/AGObj.h 2006-05-27 10:48:23.000000000 +0200 @@ -69,6 +69,8 @@ /*** Object containing series of tab stops in spaces ***/ AGWord NewTabs(AGPara par, AGWord old, char *fmt); +void InsertAGWord(AGPara par, AGWord new, AGWord ins); + /** pfnInit parameter for NewObject ***/ void WrapOFF(AGObj, ObjPara *); void ClearTabs(AGObj, ObjPara *); --- AGReader/Sources/AG_lib.c.gcc41 2001-12-05 22:00:24.000000000 +0100 +++ AGReader/Sources/AG_lib.c 2006-05-27 10:51:25.000000000 +0200 @@ -7,11 +7,13 @@ #include #include +#include #include "AGReader.h" #include "AGNodes.h" #include "AGObj.h" #include "IO_tty.h" #include "Version.h" +#include "Input.h" /** Global buffer used to render one line of text **/ char buffer[512], ts, bgpen; @@ -350,7 +352,7 @@ *buf = '\0'; if(p < buf) new = NewWord(par,new,p,&AGC); p = ++buf; - } else if(*buf == '@') /* Start of an AmigaGuide style modifier */ + } else if(*buf == '@') { /* Start of an AmigaGuide style modifier */ if( buf[1] == '{' ) { char **token; *buf='\0'; @@ -426,9 +428,8 @@ ** already processed in CreateAGNodes(), so just skip them. */ while(*buf != '\n') buf++; *buf='\0'; p = buf+1; - } + } } } - eof: for(; PREV(par); par = PREV(par)); node->AGContent = node->Shown = par; node->column = node->line = 0; @@ -441,7 +442,7 @@ if(len > width) len = width; switch( (unsigned char)par->align & ~JMF_PREVIOUS ) { - case JMF_CENTER: par->spaces = (width - len + indent >> 1); break; + case JMF_CENTER: par->spaces = (width - len + indent) >> 1; break; case JMF_RIGHT: par->spaces = width - len; break; default: par->spaces = indent + par->alinea; } @@ -453,7 +454,7 @@ { AGPara new, next = NEXT(par); AGWord wrd; - if( new = NewPara(par, NULL) ) + if( (new = NewPara(par, NULL)) ) { if(next) PREV(next) = new, NEXT(new) = next; /* Paragraph's indenting properties equal previous */ @@ -469,7 +470,7 @@ } else /* Split the whole word */ { - if(wrd = PREV(cut)) NEXT(wrd) = NULL; + if( (wrd = PREV(cut)) ) NEXT(wrd) = NULL; new->line = cut; PREV(cut) = NULL; } } @@ -485,8 +486,8 @@ if( wrd->style & FSF_SPLITTED ) wrd = FreeSplit(wrd); else if(isspace( wrd->data[-1] )) wrd->data--; for(ins=((AGPara)PREV(par))->line; NEXT(ins); ins=NEXT(ins)); - if( NEXT(ins) = wrd ) PREV(wrd) = ins; - if( NEXT((AGPara)PREV(par)) = next ) + if( (NEXT(ins) = wrd) ) PREV(wrd) = ins; + if( (NEXT((AGPara)PREV(par)) = next) ) PREV(next) = PREV(par); free(par); return ins; @@ -496,14 +497,14 @@ char FormatPara( AGNode node, short width ) { AGPara par; AGWord word; ObjPara op; - short len, lg, spc, indent; + short len, lg, spc = 0, indent; ts = node->tabsize; tabs = NULL; node->width = ((op.limit = node->wordwrap) ? width : 0x7fff); op.nidt = indent = 0; for(par=node->AGContent; par; indent=op.nidt, par=NEXT(par)) { - char *p, *q, nbwrd; + char *p = NULL, *q, nbwrd; redo:for(len=indent+par->alinea, nbwrd=1, word=par->line; word; word=NEXT(word)) { @@ -536,7 +537,7 @@ if( tmp && (tmp->align & JMF_PREVIOUS) && p) { /* This reduce a lot of computing with opaque resizing */ - if(word = tmp->line) + if( (word = tmp->line) ) for(t=word->data,spc=0; *t && !isspace(*t); t++, spc++); if(len+spc <= width) { AGReader-1.1-keys.patch: --- NEW FILE AGReader-1.1-keys.patch --- --- AGReader/Sources/Input.c.keys 2006-05-27 12:01:05.000000000 +0200 +++ AGReader/Sources/Input.c 2006-05-28 12:02:06.000000000 +0200 @@ -163,7 +163,11 @@ { static char *Keys[] = { "OA", "OB", "OC","OD", /* Cursor keys */ - "[5~","[6~","[H","[F",NULL /* PgDown, PgUp, End, Home */ + "[5~","[6~","[H","[F", /* PgDown, PgUp, End, Home */ + "[1~","[4~","OH","OF", /* 2x Alternative End, Home */ + "[11~","[12~", "[13~", /* F1, F2, F3 */ + "OP" ,"OQ", "OR", /* Alternative F1, F2, F3 */ + "[[A","[[B","[[C", NULL /* Linux console F1, F2, F3 */ }; static char *StrNode[] = { "help", "index", "table of content" @@ -178,7 +182,9 @@ /* Get a single char from stdin */ *p = getchr(); /* A escape char indicates beginning of command */ - if(*p == '\033') *(p=buffer) = '\033'; *++p = 0; + if(*p == '\033') *(p=buffer) = '\033'; + + *++p = 0; /* Special sequence ? */ if( buffer[0]=='\033' ) @@ -202,6 +208,19 @@ case 5: scroll_vert(&terminfo, terminfo.height-2); break; case 6: scroll_vert(&terminfo, -0x7fff); break; case 7: scroll_vert(&terminfo, 0x7fff); break; + case 8: scroll_vert(&terminfo, -0x7fff); break; + case 9: scroll_vert(&terminfo, 0x7fff); break; + case 10: scroll_vert(&terminfo, -0x7fff); break; + case 11: scroll_vert(&terminfo, 0x7fff); break; + case 12: p[-1] = '1'; goto singleton; + case 13: p[-1] = '2'; goto singleton; + case 14: p[-1] = '3'; goto singleton; + case 15: p[-1] = '1'; goto singleton; + case 16: p[-1] = '2'; goto singleton; + case 17: p[-1] = '3'; goto singleton; + case 18: p[-1] = '1'; goto singleton; + case 19: p[-1] = '2'; goto singleton; + case 20: p[-1] = '3'; goto singleton; } p=buffer; } else goto singleton; --- NEW FILE AGReader.spec --- Name: AGReader Version: 1.1 Release: 9%{?dist} Summary: Console reader for viewing AmigaGuide files Group: Applications/Text License: GPL URL: http://wuarchive.wustl.edu/aminet/misc/unix Source0: http://wuarchive.wustl.edu/aminet/misc/unix/%{name}.tgz Patch0: AGReader-1.1-gcc41.patch Patch1: AGReader-1.1-keys.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: agreader = %{version}-%{release} %description A viewer for the UNIX console which can read and display AmigaGuide files. It supports all of the v39 AmigaGuide specification possible and supports a large subset of the v40 specifications. %prep %setup -q -n %{name} %patch0 -p1 %patch1 -p1 %build cd Sources make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf %{buildroot} cd Sources mkdir -p %{buildroot}%{_bindir} install -m0755 agr %{buildroot}%{_bindir} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/agr %doc Docs/agr.guide Docs/test.guide Docs/agr.html README %changelog * Sun May 28 2006 Ian Chapman 1.1-9%{?dist} - Updated keys patch which fixes the keys under BOTH the console and an xterm, courtesy of Hans de Goede - Added provides to offer lower case alias in preparation for probable policy change * Sat May 27 2006 Ian Chapman 1.1-8.iss - Added patch to fix compilation with gcc41 courtesy of Hans de Goede - Added patch to fix Home, End, F1, F2, F3 keys courtesy of Hans de Goede - Added rpmoptflags to make line - Removed compat-gcc-32 buildrequires - obsoleted by gcc41 patch. - Use %%{?dist} for most recent changelog entry - avoids incoherent changelog versions if %%{?dist} macro is missing or different. * Sat May 13 2006 Ian Chapman 1.1-7.iss - Removed gcc32 patch. It's now specified on the make command line - Replaced %{__rm} in clean section with rm * Mon May 01 2006 Ian Chapman 1.1-6.iss - Altered spec file to more closely follow Fedora build guidelines * Tue Oct 25 2004 Ian Chapman 1.1-5.iss - Fixes for deprecated fields with the latest version of rpmbuild * Thu Dec 04 2003 Ian Chapman 1.1-4 - Minor fixes to changelog - Fixed permissions on documentation directory - Changed group to Applications/Text * Sun Oct 05 2003 Ian Chapman 1.1-3 - Minor fixes to prep and clean * Fri Jul 18 2003 Ian Chapman 1.1-2 - Fixed few harmless bugs in SPEC file. Improved use of Macros. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/AGReader/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 17:14:35 -0000 1.1 +++ .cvsignore 31 May 2006 17:15:21 -0000 1.2 @@ -0,0 +1 @@ +AGReader.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/AGReader/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 17:14:35 -0000 1.1 +++ sources 31 May 2006 17:15:21 -0000 1.2 @@ -0,0 +1 @@ +07eae411edf5e580773331a696e8f890 AGReader.tgz From fedora-extras-commits at redhat.com Wed May 31 17:28:00 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 10:28:00 -0700 Subject: owners owners.list,1.1079,1.1080 Message-ID: <200605311728.k4VHS2Pb010710@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10693 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1079 retrieving revision 1.1080 diff -u -r1.1079 -r1.1080 --- owners.list 31 May 2006 08:06:15 -0000 1.1079 +++ owners.list 31 May 2006 17:28:00 -0000 1.1080 @@ -22,6 +22,7 @@ Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|adplug|AdLib OPL sound emulation library|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|AGReader|Console reader for viewing AmigaGuide files|packages at amiga-hardware.com|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 17:51:12 2006 From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann)) Date: Wed, 31 May 2006 10:51:12 -0700 Subject: fedora-security/audit fc4,1.273,1.274 fc5,1.186,1.187 Message-ID: <200605311751.k4VHpCVn010816@cvs-int.fedora.redhat.com> Author: holtmann Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10791/audit Modified Files: fc4 fc5 Log Message: Add CVE-2004-0138 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- fc4 31 May 2006 07:44:37 -0000 1.273 +++ fc4 31 May 2006 17:51:09 -0000 1.274 @@ -1337,6 +1337,7 @@ CVE-2004-0155 version (racoon) CVE-2004-0154 version (nfs-utils, fixed 1.0.6) CVE-2004-0150 version (python, fixed 2.2.2) +CVE-2004-0138 version (kernel, fixed 2.6.0) CVE-2004-0133 version (kernel, 2.6.4) CVE-2004-0113 version (httpd, fixed 2.0.49) CVE-2004-0112 version (openssl, fixed 0.9.7d) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- fc5 31 May 2006 07:44:37 -0000 1.186 +++ fc5 31 May 2006 17:51:09 -0000 1.187 @@ -1334,6 +1334,7 @@ CVE-2004-0155 version (racoon) CVE-2004-0154 version (nfs-utils, fixed 1.0.6) CVE-2004-0150 version (python, fixed 2.2.2) +CVE-2004-0138 version (kernel, fixed 2.6.0) CVE-2004-0133 version (kernel, 2.6.4) CVE-2004-0113 version (httpd, fixed 2.0.49) CVE-2004-0112 version (openssl, not 0.9.8) From fedora-extras-commits at redhat.com Wed May 31 17:54:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 10:54:15 -0700 Subject: rpms/perl-IO-Tty/FC-4 .cvsignore, 1.3, 1.4 perl-IO-Tty.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200605311754.k4VHsHJY010896@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10843/FC-4 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 May 2006 18:42:31 -0000 1.3 +++ .cvsignore 31 May 2006 17:54:15 -0000 1.4 @@ -1 +1 @@ -IO-Tty-1.03.tar.gz +IO-Tty-1.04.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/perl-IO-Tty.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-IO-Tty.spec 9 May 2006 18:42:31 -0000 1.8 +++ perl-IO-Tty.spec 31 May 2006 17:54:15 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-IO-Tty -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl interface to pseudo tty's @@ -51,6 +51,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + * Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. - Taking maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 May 2006 18:42:31 -0000 1.3 +++ sources 31 May 2006 17:54:15 -0000 1.4 @@ -1 +1 @@ -785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz +301cea1bbc2eefc28f49b08b74bfca78 IO-Tty-1.04.tar.gz From fedora-extras-commits at redhat.com Wed May 31 17:54:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 10:54:16 -0700 Subject: rpms/perl-IO-Tty/FC-5 .cvsignore, 1.3, 1.4 perl-IO-Tty.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200605311754.k4VHsIwW010902@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10843/FC-5 Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 May 2006 18:39:25 -0000 1.3 +++ .cvsignore 31 May 2006 17:54:16 -0000 1.4 @@ -1 +1 @@ -IO-Tty-1.03.tar.gz +IO-Tty-1.04.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/perl-IO-Tty.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-IO-Tty.spec 9 May 2006 18:39:25 -0000 1.10 +++ perl-IO-Tty.spec 31 May 2006 17:54:16 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-IO-Tty -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl interface to pseudo tty's @@ -51,6 +51,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + * Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. - Taking maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 May 2006 18:39:25 -0000 1.3 +++ sources 31 May 2006 17:54:16 -0000 1.4 @@ -1 +1 @@ -785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz +301cea1bbc2eefc28f49b08b74bfca78 IO-Tty-1.04.tar.gz From fedora-extras-commits at redhat.com Wed May 31 17:54:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 10:54:17 -0700 Subject: rpms/perl-IO-Tty/devel .cvsignore, 1.3, 1.4 perl-IO-Tty.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200605311754.k4VHsJxv010906@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-IO-Tty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10843/devel Modified Files: .cvsignore perl-IO-Tty.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 May 2006 18:03:42 -0000 1.3 +++ .cvsignore 31 May 2006 17:54:17 -0000 1.4 @@ -1 +1 @@ -IO-Tty-1.03.tar.gz +IO-Tty-1.04.tar.gz Index: perl-IO-Tty.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-IO-Tty.spec 9 May 2006 18:03:42 -0000 1.10 +++ perl-IO-Tty.spec 31 May 2006 17:54:17 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-IO-Tty -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl interface to pseudo tty's @@ -51,6 +51,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + * Tue May 9 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. - Taking maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 May 2006 18:03:42 -0000 1.3 +++ sources 31 May 2006 17:54:17 -0000 1.4 @@ -1 +1 @@ -785dbdb44432a2ac190de59a58f5d34b IO-Tty-1.03.tar.gz +301cea1bbc2eefc28f49b08b74bfca78 IO-Tty-1.04.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:29:11 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:29:11 -0700 Subject: rpms/DevIL - New directory Message-ID: <200605311829.k4VITD05013545@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13519/DevIL Log Message: Directory /cvs/extras/rpms/DevIL added to the repository From fedora-extras-commits at redhat.com Wed May 31 18:29:12 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:29:12 -0700 Subject: rpms/DevIL/devel - New directory Message-ID: <200605311829.k4VITECT013548@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13519/DevIL/devel Log Message: Directory /cvs/extras/rpms/DevIL/devel added to the repository From fedora-extras-commits at redhat.com Wed May 31 18:29:32 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:29:32 -0700 Subject: rpms/DevIL/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200605311829.k4VITYrH013602@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13564/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module DevIL --- NEW 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 May 31 18:29:31 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:29:31 -0700 Subject: rpms/DevIL Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200605311829.k4VITXd0013599@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13564 Added Files: Makefile import.log Log Message: Setup of module DevIL --- NEW FILE Makefile --- # Top level Makefile for module DevIL all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 May 31 18:30:43 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:30:43 -0700 Subject: rpms/DevIL import.log,1.1,1.2 Message-ID: <200605311831.k4VIVFRX013709@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13662 Modified Files: import.log Log Message: auto-import DevIL-1.6.8-0.7.rc1 on branch devel from DevIL-1.6.8-0.7.rc1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/DevIL/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 May 2006 18:29:31 -0000 1.1 +++ import.log 31 May 2006 18:30:43 -0000 1.2 @@ -0,0 +1 @@ +DevIL-1_6_8-0_7_rc1:HEAD:DevIL-1.6.8-0.7.rc1.src.rpm:1149100235 From fedora-extras-commits at redhat.com Wed May 31 18:30:44 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:30:44 -0700 Subject: rpms/DevIL/devel DevIL-1.6.8-rc1-allegropicfix.patch, NONE, 1.1 DevIL-1.6.8-rc1-headerfix.patch, NONE, 1.1 DevIL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200605311831.k4VIVGqO013713@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/DevIL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13662/devel Modified Files: .cvsignore sources Added Files: DevIL-1.6.8-rc1-allegropicfix.patch DevIL-1.6.8-rc1-headerfix.patch DevIL.spec Log Message: auto-import DevIL-1.6.8-0.7.rc1 on branch devel from DevIL-1.6.8-0.7.rc1.src.rpm DevIL-1.6.8-rc1-allegropicfix.patch: --- NEW FILE DevIL-1.6.8-rc1-allegropicfix.patch --- --- configure.orig 2006-04-15 15:21:01.000000000 +0100 +++ configure 2006-05-27 15:20:19.000000000 +0100 @@ -23727,7 +23727,7 @@ LIBALLEGRO="" HALLEGRO="" else - LIBALLEGRO=`allegro-config --libs` + LIBALLEGRO=`allegro-config --libs | sed 's/-lalleg_unsharable//'` HALLEGRO=`allegro-config --cflags` fi fi DevIL-1.6.8-rc1-headerfix.patch: --- NEW FILE DevIL-1.6.8-rc1-headerfix.patch --- --- DevIL-1.6.8-RC1/include/IL/il_wrap.h.orig 2002-01-26 01:15:36.000000000 +0000 +++ DevIL-1.6.8-RC1/include/IL/il_wrap.h 2006-05-29 02:23:58.000000000 +0100 @@ -3,7 +3,7 @@ /*#include #include */ -#include // Probably only have to #include this one +#include // Probably only have to #include this one #ifdef _MSC_VER #ifndef _IL_WRAP_BUILD_LIB @@ -202,4 +202,4 @@ }; -#endif//WRAPPER_H \ No newline at end of file +#endif//WRAPPER_H --- DevIL-1.6.8-RC1/include/IL/ilu_region.h.orig 2004-07-08 20:13:03.000000000 +0100 +++ DevIL-1.6.8-RC1/include/IL/ilu_region.h 2006-05-29 02:24:54.000000000 +0100 @@ -13,7 +13,7 @@ #ifndef ILU_REGION_H #define ILU_REGION_H -#include "ilu_internal.h" +#include typedef struct Edge --- DevIL-1.6.8-RC1/src-ILU/src/ilu_region.c.orig 2003-04-06 12:44:30.000000000 +0100 +++ DevIL-1.6.8-RC1/src-ILU/src/ilu_region.c 2006-05-29 02:25:45.000000000 +0100 @@ -12,7 +12,7 @@ #include "ilu_region.h" - +#include "ilu_internal.h" ILpointi *RegionPointsi = NULL; ILpointf *RegionPointsf = NULL; --- NEW FILE DevIL.spec --- Name: DevIL Version: 1.6.8 Release: 0.7.rc1%{?dist} Summary: A cross-platform image library Group: System Environment/Libraries License: LGPL URL: http://openil.sourceforge.net/ Source0: http://download.sourceforge.net/openil/%{name}-%{version}-RC1-src.tar.gz Patch0: DevIL-1.6.8-rc1-allegropicfix.patch Patch1: DevIL-1.6.8-rc1-headerfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: lcms-devel BuildRequires: libmng-devel BuildRequires: SDL-devel => 1.2.5 BuildRequires: allegro-devel BuildRequires: libtool BuildRequires: libGLU-devel Provides: openil = %{version}-%{release} Provides: devil = %{version}-%{release} %description Developer's Image Library (DevIL) is a programmer's library to develop applications with very powerful image loading capabilities, yet is easy for a developer to learn and use. Ultimate control of images is left to the developer, so unnecessary conversions, etc. are not performed. DevIL utilizes a simple, yet powerful, syntax. DevIL can load, save, convert, manipulate, filter and display a wide variety of image formats. %package devel Summary: Development files for DevIL Group: Development/Libraries Requires: DevIL = %{version}-%{release} Requires: allegro-devel Requires: libGLU-devel Provides: openil-devel = %{version}-%{release} Provides: devil-devel = %{version}-%{release} %description devel Development files for DevIL %prep %setup -q -n %{name}-%{version}-RC1 %patch0 -p0 %patch1 -p1 %build %configure make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.a #Replace autoconf generated config.h to avoid potential define collisions cat >%{buildroot}%{_includedir}/IL/config.h < 1.6.8-0.7.rc1%{?dist} - Added libGLU-devel to buildrequires - Dropped libGL-devel from requires for devel package * Sun May 28 2006 Ian Chapman 1.6.8-0.6.rc1.iss - Dropped xorg-x11-devel as a buildrequire - Dropped zlib-devel as a buildrequire - Dropped xorg-x11-devel as a require for the devel package - Added libGL-devel and libGLU-devel as requires for devel package - Dropped superfluous documentation from devel package - Added provides to offer lower case alias in preparation for probable policy change - Replace autoconf generated config.h in devel package to avoid potential define collisions - Replace source URL with primary sf site, rather than a mirror - Fix ilu_region.h to use IL\il.h and not ilu_internal.h and roll into a single patch incorporating previous header fixes. * Sat May 27 2006 Ian Chapman 1.6.8-0.5.rc1.iss - Added patch to stop linking against alleg_unsharable, otherwise non PIC code is included in the library - Use %%{?dist} for most recent changelog entry - avoids incoherent changelog versions if %%{?dist} macro is missing or different. * Fri May 26 2006 Ian Chapman 1.6.8-0.4.rc1.iss - Made zlib-devel and xorg-x11-devel explicit buildrequires - Corrected release name format to 0.%%{X}.%%{alphatag} from 0.%%{alphatag}.%%{X} - Added -q to %%setup - Added %%{version}-%%{release} to provides field * Sun May 21 2006 Ian Chapman 1.6.8-0.RC1.3.iss - Use Fedora's libtool, seems to fix rpaths problem on x86_64. * Sun May 14 2006 Ian Chapman 1.6.8-0.RC1.2.iss - Now compiled against allegro * Sat May 13 2006 Ian Chapman 1.6.8-0.RC1.1.iss - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/DevIL/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 May 2006 18:29:31 -0000 1.1 +++ .cvsignore 31 May 2006 18:30:44 -0000 1.2 @@ -0,0 +1 @@ +DevIL-1.6.8-RC1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/DevIL/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 May 2006 18:29:31 -0000 1.1 +++ sources 31 May 2006 18:30:44 -0000 1.2 @@ -0,0 +1 @@ +1a850a979057174e01ae87ed6405dd61 DevIL-1.6.8-RC1-src.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:34:38 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 31 May 2006 11:34:38 -0700 Subject: owners owners.list,1.1080,1.1081 Message-ID: <200605311834.k4VIYeMS013816@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13792 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1080 retrieving revision 1.1081 diff -u -r1.1080 -r1.1081 --- owners.list 31 May 2006 17:28:00 -0000 1.1080 +++ owners.list 31 May 2006 18:34:38 -0000 1.1081 @@ -209,6 +209,7 @@ 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|deutex|Doom wad manipulation tool|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|DevIL|A cross-platform image library|packages at amiga-hardware.com|extras-qa at fedoraproject.org| Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|dia|A diagram drawing program|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed May 31 18:34:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 11:34:47 -0700 Subject: rpms/perl-Expect/FC-5 .cvsignore, 1.2, 1.3 perl-Expect.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311834.k4VIYnJ3013861@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13824/FC-5 Modified Files: .cvsignore perl-Expect.spec sources Log Message: Update to 1.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 18:55:21 -0000 1.2 +++ .cvsignore 31 May 2006 18:34:47 -0000 1.3 @@ -1 +1 @@ -Expect-1.16.tar.gz +Expect-1.17.tar.gz Index: perl-Expect.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/FC-5/perl-Expect.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Expect.spec 16 May 2006 18:55:21 -0000 1.1 +++ perl-Expect.spec 31 May 2006 18:34:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Expect -Version: 1.16 -Release: 2%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Expect for Perl Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.17-1 +- Update to 1.17. + * Tue May 16 2006 Jose Pedro Oliveira - 1.16-2 - Description improved as suggested in #191622. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 18:55:21 -0000 1.2 +++ sources 31 May 2006 18:34:47 -0000 1.3 @@ -1 +1 @@ -f5f0ea179c6f19d9f08e22c6a0072292 Expect-1.16.tar.gz +081c253a1ca20ad693a3665c68fcdc33 Expect-1.17.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:34:47 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 31 May 2006 11:34:47 -0700 Subject: rpms/perl-Expect/devel .cvsignore, 1.2, 1.3 perl-Expect.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311834.k4VIYnwH013867@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Expect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13824/devel Modified Files: .cvsignore perl-Expect.spec sources Log Message: Update to 1.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 18:55:21 -0000 1.2 +++ .cvsignore 31 May 2006 18:34:47 -0000 1.3 @@ -1 +1 @@ -Expect-1.16.tar.gz +Expect-1.17.tar.gz Index: perl-Expect.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/perl-Expect.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Expect.spec 16 May 2006 18:55:21 -0000 1.1 +++ perl-Expect.spec 31 May 2006 18:34:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Expect -Version: 1.16 -Release: 2%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Expect for Perl Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed May 31 2006 Jose Pedro Oliveira - 1.17-1 +- Update to 1.17. + * Tue May 16 2006 Jose Pedro Oliveira - 1.16-2 - Description improved as suggested in #191622. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Expect/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 18:55:21 -0000 1.2 +++ sources 31 May 2006 18:34:47 -0000 1.3 @@ -1 +1 @@ -f5f0ea179c6f19d9f08e22c6a0072292 Expect-1.16.tar.gz +081c253a1ca20ad693a3665c68fcdc33 Expect-1.17.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:41:38 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:41:38 -0700 Subject: rpms/xmms-arts/FC-5 xmms-arts.spec,1.2,1.3 Message-ID: <200605311841.k4VIfedx014040@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-arts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14008/FC-5 Modified Files: xmms-arts.spec Log Message: Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, don't own the Output/ directory and exclude the .la file. Index: xmms-arts.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-arts/FC-5/xmms-arts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xmms-arts.spec 13 Feb 2006 12:53:38 -0000 1.2 +++ xmms-arts.spec 31 May 2006 18:41:37 -0000 1.3 @@ -1,13 +1,14 @@ Summary: X MultiMedia System output plugin for the aRts sound system Name: xmms-arts Version: 0.7.1 -Release: 2 +Release: 3 License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: http://havardk.xmms.org/plugins/arts_output/arts_output-%{version}.tar.gz Patch: arts_output-0.6.0-buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xmms-libs BuildRequires: xmms-devel, arts-devel > 1.2.0-1.5 Conflicts: arts < 1.2.0-1.5 Conflicts: xmms < 1:1.2.10-15 @@ -41,10 +42,15 @@ %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/xmms-arts-helper -%{_libdir}/xmms/Output/ +%exclude %{_libdir}/xmms/Output/libarts.la +%{_libdir}/xmms/Output/libarts.so %changelog +* Wed May 31 2006 Matthias Saou 0.7.1-3 +- Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, + don't own the Output/ directory and exclude the .la file. + * Mon Feb 13 2006 Matthias Saou 0.7.1-2 - Add missing make call in %%build. From fedora-extras-commits at redhat.com Wed May 31 18:41:38 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:41:38 -0700 Subject: rpms/xmms-arts/devel xmms-arts.spec,1.2,1.3 Message-ID: <200605311841.k4VIfeOd014044@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-arts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14008/devel Modified Files: xmms-arts.spec Log Message: Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, don't own the Output/ directory and exclude the .la file. Index: xmms-arts.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-arts/devel/xmms-arts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xmms-arts.spec 13 Feb 2006 12:53:38 -0000 1.2 +++ xmms-arts.spec 31 May 2006 18:41:38 -0000 1.3 @@ -1,13 +1,14 @@ Summary: X MultiMedia System output plugin for the aRts sound system Name: xmms-arts Version: 0.7.1 -Release: 2 +Release: 3 License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: http://havardk.xmms.org/plugins/arts_output/arts_output-%{version}.tar.gz Patch: arts_output-0.6.0-buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xmms-libs BuildRequires: xmms-devel, arts-devel > 1.2.0-1.5 Conflicts: arts < 1.2.0-1.5 Conflicts: xmms < 1:1.2.10-15 @@ -41,10 +42,15 @@ %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/xmms-arts-helper -%{_libdir}/xmms/Output/ +%exclude %{_libdir}/xmms/Output/libarts.la +%{_libdir}/xmms/Output/libarts.so %changelog +* Wed May 31 2006 Matthias Saou 0.7.1-3 +- Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, + don't own the Output/ directory and exclude the .la file. + * Mon Feb 13 2006 Matthias Saou 0.7.1-2 - Add missing make call in %%build. From fedora-extras-commits at redhat.com Wed May 31 18:44:25 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:44:25 -0700 Subject: rpms/xmms-arts/devel xmms-arts.spec,1.3,1.4 Message-ID: <200605311844.k4VIiROj014161@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-arts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14142 Modified Files: xmms-arts.spec Log Message: Add dist tag to the release. Index: xmms-arts.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-arts/devel/xmms-arts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmms-arts.spec 31 May 2006 18:41:38 -0000 1.3 +++ xmms-arts.spec 31 May 2006 18:44:25 -0000 1.4 @@ -1,7 +1,7 @@ Summary: X MultiMedia System output plugin for the aRts sound system Name: xmms-arts Version: 0.7.1 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ @@ -50,6 +50,7 @@ * Wed May 31 2006 Matthias Saou 0.7.1-3 - Fix problems reported by Ville in #193600 : Require explicitly xmms-libs, don't own the Output/ directory and exclude the .la file. +- Add dist tag to the release. * Mon Feb 13 2006 Matthias Saou 0.7.1-2 - Add missing make call in %%build. From fedora-extras-commits at redhat.com Wed May 31 18:47:03 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:47:03 -0700 Subject: rpms/xmms-lirc/FC-5 xmms-lirc.spec,1.8,1.9 Message-ID: <200605311847.k4VIl5R7014258@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-lirc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14227/FC-5 Modified Files: xmms-lirc.spec Log Message: Add explicit xmms requirement (#193599). Index: xmms-lirc.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-lirc/FC-5/xmms-lirc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmms-lirc.spec 13 Feb 2006 14:12:01 -0000 1.8 +++ xmms-lirc.spec 31 May 2006 18:47:03 -0000 1.9 @@ -3,12 +3,13 @@ Summary: X MultiMedia System control plugin to use infrared devices Name: xmms-lirc Version: 1.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.lirc.org/ Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xmms BuildRequires: xmms-devel, lirc-devel @@ -42,6 +43,9 @@ %changelog +* Wed May 31 2006 Matthias Saou 1.4-8 +- Add explicit xmms requirement (#193599). + * Mon Feb 13 2006 Matthias Saou 1.4-7 - Rebuild for new gcc/glibc. - Spec file cleanup. From fedora-extras-commits at redhat.com Wed May 31 18:47:04 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 31 May 2006 11:47:04 -0700 Subject: rpms/xmms-lirc/devel xmms-lirc.spec,1.8,1.9 Message-ID: <200605311847.k4VIl6S1014262@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms-lirc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14227/devel Modified Files: xmms-lirc.spec Log Message: Add explicit xmms requirement (#193599). Index: xmms-lirc.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-lirc/devel/xmms-lirc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmms-lirc.spec 13 Feb 2006 14:12:01 -0000 1.8 +++ xmms-lirc.spec 31 May 2006 18:47:04 -0000 1.9 @@ -3,12 +3,13 @@ Summary: X MultiMedia System control plugin to use infrared devices Name: xmms-lirc Version: 1.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.lirc.org/ Source: http://dl.sf.net/lirc/lirc-xmms-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: xmms BuildRequires: xmms-devel, lirc-devel @@ -42,6 +43,9 @@ %changelog +* Wed May 31 2006 Matthias Saou 1.4-8 +- Add explicit xmms requirement (#193599). + * Mon Feb 13 2006 Matthias Saou 1.4-7 - Rebuild for new gcc/glibc. - Spec file cleanup. From fedora-extras-commits at redhat.com Wed May 31 18:48:52 2006 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Wed, 31 May 2006 11:48:52 -0700 Subject: rpms/splint/devel splint.spec,1.6,1.7 Message-ID: <200605311848.k4VImslo014373@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/splint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14356 Modified Files: splint.spec Log Message: fix br Index: splint.spec =================================================================== RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- splint.spec 21 Apr 2006 14:52:22 -0000 1.6 +++ splint.spec 31 May 2006 18:48:52 -0000 1.7 @@ -1,6 +1,6 @@ Name: splint Version: 3.1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: An implementation of the lint program Group: Development/Tools @@ -8,6 +8,7 @@ URL: http://www.splint.org/ Source0: http://www.splint.org/downloads/%{name}-%{version}.src.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: flex Obsoletes: lclint @@ -45,6 +46,9 @@ %changelog +* Wed May 31 2006 Paul Nasrat - 3.1.1-14 +- Add flex br + * Thu Apr 20 2006 Jose Pedro Oliveira - 3.1.1-13 - Manual.pdf - file permissions corrected. - Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc). From fedora-extras-commits at redhat.com Wed May 31 18:56:33 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 11:56:33 -0700 Subject: rpms/gnomad2/devel .cvsignore, 1.5, 1.6 gnomad2.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605311856.k4VIuZFN014472@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14451 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Mar 2006 21:17:54 -0000 1.5 +++ .cvsignore 31 May 2006 18:56:33 -0000 1.6 @@ -1 +1 @@ -gnomad2-2.8.3.tar.gz +gnomad2-2.8.5.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnomad2.spec 22 Mar 2006 21:17:54 -0000 1.6 +++ gnomad2.spec 31 May 2006 18:56:33 -0000 1.7 @@ -9,7 +9,7 @@ # Name: gnomad2 -Version: 2.8.3 +Version: 2.8.5 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Wed May 31 2006 Linus Walleij 2.8.5-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.3-1 - New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 21:17:54 -0000 1.5 +++ sources 31 May 2006 18:56:33 -0000 1.6 @@ -1 +1 @@ -cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz +00b737b87a71ebde142b6032b623b65e gnomad2-2.8.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 18:58:08 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 11:58:08 -0700 Subject: rpms/gnomad2/FC-5 .cvsignore, 1.5, 1.6 gnomad2.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200605311858.k4VIwAtk014543@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14522 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Mar 2006 21:20:06 -0000 1.5 +++ .cvsignore 31 May 2006 18:58:08 -0000 1.6 @@ -1 +1 @@ -gnomad2-2.8.3.tar.gz +gnomad2-2.8.5.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/gnomad2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnomad2.spec 22 Mar 2006 21:20:06 -0000 1.6 +++ gnomad2.spec 31 May 2006 18:58:08 -0000 1.7 @@ -9,7 +9,7 @@ # Name: gnomad2 -Version: 2.8.3 +Version: 2.8.5 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Wed May 31 2006 Linus Walleij 2.8.5-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.3-1 - New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 21:20:06 -0000 1.5 +++ sources 31 May 2006 18:58:08 -0000 1.6 @@ -1 +1 @@ -cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz +00b737b87a71ebde142b6032b623b65e gnomad2-2.8.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:00:05 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 12:00:05 -0700 Subject: rpms/gnomad2/FC-4 .cvsignore, 1.5, 1.6 gnomad2.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200605311900.k4VJ07tE014635@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14606 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Mar 2006 21:22:35 -0000 1.5 +++ .cvsignore 31 May 2006 19:00:05 -0000 1.6 @@ -1 +1 @@ -gnomad2-2.8.3.tar.gz +gnomad2-2.8.5.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/gnomad2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnomad2.spec 22 Mar 2006 21:22:35 -0000 1.5 +++ gnomad2.spec 31 May 2006 19:00:05 -0000 1.6 @@ -9,7 +9,7 @@ # Name: gnomad2 -Version: 2.8.3 +Version: 2.8.5 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Wed May 31 2006 Linus Walleij 2.8.5-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.3-1 - New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 21:22:35 -0000 1.5 +++ sources 31 May 2006 19:00:05 -0000 1.6 @@ -1 +1 @@ -cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz +00b737b87a71ebde142b6032b623b65e gnomad2-2.8.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:01:22 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 12:01:22 -0700 Subject: rpms/gnomad2/FC-3 gnomad2.spec,1.5,1.6 Message-ID: <200605311901.k4VJ1uEH016983@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16927 Modified Files: gnomad2.spec Log Message: New upstream version. Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/gnomad2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnomad2.spec 22 Mar 2006 21:24:25 -0000 1.5 +++ gnomad2.spec 31 May 2006 19:01:22 -0000 1.6 @@ -9,7 +9,7 @@ # Name: gnomad2 -Version: 2.8.3 +Version: 2.8.5 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Wed May 31 2006 Linus Walleij 2.8.5-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.3-1 - New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 From fedora-extras-commits at redhat.com Wed May 31 19:02:56 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 31 May 2006 12:02:56 -0700 Subject: rpms/gnomad2/FC-3 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200605311903.k4VJ3Ubi017048@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16995 Modified Files: .cvsignore sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Mar 2006 21:24:25 -0000 1.5 +++ .cvsignore 31 May 2006 19:02:56 -0000 1.6 @@ -1 +1 @@ -gnomad2-2.8.3.tar.gz +gnomad2-2.8.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Mar 2006 21:24:25 -0000 1.5 +++ sources 31 May 2006 19:02:56 -0000 1.6 @@ -1 +1 @@ -cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz +00b737b87a71ebde142b6032b623b65e gnomad2-2.8.5.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:14:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:14:39 -0700 Subject: rpms/lirc-kmod/devel lirc-kmod.spec,1.9,1.10 Message-ID: <200605311914.k4VJEfA5017206@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159/lirc-kmod/devel Modified Files: lirc-kmod.spec Log Message: * Wed May 31 2006 Ville Skytt?? - Fix setting kversion (Matthias Saou). Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lirc-kmod.spec 28 May 2006 16:21:45 -0000 1.9 +++ lirc-kmod.spec 31 May 2006 19:14:39 -0000 1.10 @@ -5,7 +5,7 @@ %define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2122_FC5} +%{!?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 8.%(echo %{kverrel} | tr - _) +Release: 9.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,9 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 0.8.0-9 +- Fix setting kversion (Matthias Saou). + * Sun May 28 2006 Ville Skytt?? - 0.8.0-8 - Update kmodtool to 0.10.10, invoke it with bash instead of sh. From fedora-extras-commits at redhat.com Wed May 31 19:14:33 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:14:33 -0700 Subject: rpms/thinkpad-kmod/FC-5 thinkpad-kmod.spec,1.10,1.11 Message-ID: <200605311915.k4VJF5np017211@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159/thinkpad-kmod/FC-5 Modified Files: thinkpad-kmod.spec Log Message: * Wed May 31 2006 Ville Skytt?? - Fix setting kversion (Matthias Saou). Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- thinkpad-kmod.spec 28 May 2006 16:21:44 -0000 1.10 +++ thinkpad-kmod.spec 31 May 2006 19:14:33 -0000 1.11 @@ -3,7 +3,7 @@ %define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2122_FC5} +%{!?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -19,7 +19,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 7.%(echo %{kverrel} | tr - _) +Release: 8.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -65,6 +65,9 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 5.9-8 +- Fix setting kversion (Matthias Saou). + * Sun May 28 2006 Ville Skytt?? - 5.9-7 - Update kmodtool to 0.10.10, invoke it with bash instead of sh. From fedora-extras-commits at redhat.com Wed May 31 19:14:34 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:14:34 -0700 Subject: rpms/lirc-kmod/FC-5 lirc-kmod.spec,1.9,1.10 Message-ID: <200605311915.k4VJF6ti017214@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159/lirc-kmod/FC-5 Modified Files: lirc-kmod.spec Log Message: * Wed May 31 2006 Ville Skytt?? - Fix setting kversion (Matthias Saou). Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lirc-kmod.spec 28 May 2006 16:21:45 -0000 1.9 +++ lirc-kmod.spec 31 May 2006 19:14:34 -0000 1.10 @@ -5,7 +5,7 @@ %define kmodtool bash %{SOURCE10} # end stuff to be ... -%{?kversion: %define kversion 2.6.16-1.2122_FC5} +%{!?kversion: %define kversion 2.6.16-1.2122_FC5} %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null) @@ -23,7 +23,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 8.%(echo %{kverrel} | tr - _) +Release: 9.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -107,6 +107,9 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 0.8.0-9 +- Fix setting kversion (Matthias Saou). + * Sun May 28 2006 Ville Skytt?? - 0.8.0-8 - Update kmodtool to 0.10.10, invoke it with bash instead of sh. From fedora-extras-commits at redhat.com Wed May 31 19:18:55 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 12:18:55 -0700 Subject: rpms/pypoker-eval/FC-4 pypoker-eval.spec,1.1,1.2 Message-ID: <200605311918.k4VJIvkg017271@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17226/FC-4 Modified Files: pypoker-eval.spec Log Message: Add new required BR and add some macros Index: pypoker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/FC-4/pypoker-eval.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypoker-eval.spec 12 May 2006 15:42:46 -0000 1.1 +++ pypoker-eval.spec 31 May 2006 19:18:55 -0000 1.2 @@ -2,13 +2,13 @@ Name: pypoker-eval Version: 131.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python interface to poker-eval Group: Development/Libraries License: GPL URL: http://pokersource.org/pypoker-eval Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz -BuildRequires: python-devel +BuildRequires: python-devel pkgconfig BuildRequires: poker-eval-devel >= 124.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,21 +29,21 @@ %setup -q # make examples directory for devel %doc -mkdir -p tmp/examples && cp test.py tmp/examples +%{__mkdir} -p tmp/examples && %{__cp} test.py tmp/examples %build %configure --disable-static -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%{__rm} -rf %{buildroot} +%makeinstall %check %{__python} test.py %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -64,6 +64,10 @@ %exclude %{python_sitearch}/*.la %changelog +* Wed May 31 2006 Christopher Stone 131.0-4 +- Add missing Build Requires +- Use macros for system commands + * Fri May 12 2006 Christopher Stone 131.0-3 - Place unversioned .so link in -devel package From fedora-extras-commits at redhat.com Wed May 31 19:18:55 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 12:18:55 -0700 Subject: rpms/pypoker-eval/FC-5 pypoker-eval.spec,1.1,1.2 Message-ID: <200605311918.k4VJIvKP017276@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17226/FC-5 Modified Files: pypoker-eval.spec Log Message: Add new required BR and add some macros Index: pypoker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/FC-5/pypoker-eval.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypoker-eval.spec 12 May 2006 15:42:46 -0000 1.1 +++ pypoker-eval.spec 31 May 2006 19:18:55 -0000 1.2 @@ -2,13 +2,13 @@ Name: pypoker-eval Version: 131.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python interface to poker-eval Group: Development/Libraries License: GPL URL: http://pokersource.org/pypoker-eval Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz -BuildRequires: python-devel +BuildRequires: python-devel pkgconfig BuildRequires: poker-eval-devel >= 124.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,21 +29,21 @@ %setup -q # make examples directory for devel %doc -mkdir -p tmp/examples && cp test.py tmp/examples +%{__mkdir} -p tmp/examples && %{__cp} test.py tmp/examples %build %configure --disable-static -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%{__rm} -rf %{buildroot} +%makeinstall %check %{__python} test.py %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -64,6 +64,10 @@ %exclude %{python_sitearch}/*.la %changelog +* Wed May 31 2006 Christopher Stone 131.0-4 +- Add missing Build Requires +- Use macros for system commands + * Fri May 12 2006 Christopher Stone 131.0-3 - Place unversioned .so link in -devel package From fedora-extras-commits at redhat.com Wed May 31 19:18:56 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Wed, 31 May 2006 12:18:56 -0700 Subject: rpms/pypoker-eval/devel pypoker-eval.spec,1.1,1.2 Message-ID: <200605311918.k4VJIwNp017280@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/pypoker-eval/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17226/devel Modified Files: pypoker-eval.spec Log Message: Add new required BR and add some macros Index: pypoker-eval.spec =================================================================== RCS file: /cvs/extras/rpms/pypoker-eval/devel/pypoker-eval.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypoker-eval.spec 12 May 2006 15:42:46 -0000 1.1 +++ pypoker-eval.spec 31 May 2006 19:18:56 -0000 1.2 @@ -2,13 +2,13 @@ Name: pypoker-eval Version: 131.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python interface to poker-eval Group: Development/Libraries License: GPL URL: http://pokersource.org/pypoker-eval Source0: http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz -BuildRequires: python-devel +BuildRequires: python-devel pkgconfig BuildRequires: poker-eval-devel >= 124.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,21 +29,21 @@ %setup -q # make examples directory for devel %doc -mkdir -p tmp/examples && cp test.py tmp/examples +%{__mkdir} -p tmp/examples && %{__cp} test.py tmp/examples %build %configure --disable-static -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%{__rm} -rf %{buildroot} +%makeinstall %check %{__python} test.py %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -64,6 +64,10 @@ %exclude %{python_sitearch}/*.la %changelog +* Wed May 31 2006 Christopher Stone 131.0-4 +- Add missing Build Requires +- Use macros for system commands + * Fri May 12 2006 Christopher Stone 131.0-3 - Place unversioned .so link in -devel package From fedora-extras-commits at redhat.com Wed May 31 19:24:08 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:24:08 -0700 Subject: rpms/openct/devel openct.spec,1.13,1.14 Message-ID: <200605311924.k4VJOAt8017367@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17350 Modified Files: openct.spec Log Message: * Thu May 25 2006 Ville Skytt?? - 0.6.7-3 - Make installation more multilib friendly. Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- openct.spec 7 May 2006 13:47:25 -0000 1.13 +++ openct.spec 31 May 2006 19:24:08 -0000 1.14 @@ -2,7 +2,7 @@ Name: openct Version: 0.6.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries @@ -57,7 +57,7 @@ %setup -q sh bootstrap # avoid standard rpaths on lib64 archs sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in -sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \ +sed -i -e 's|/etc/hotplug/usb/openct|%{_datadir}/openct/hotplug|' \ etc/openct.udev @@ -78,7 +78,7 @@ install -Dpm 644 etc/openct.udev \ $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules -install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug +install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_datadir}/openct/hotplug install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf @@ -132,7 +132,8 @@ %doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css %config(noreplace) %{_sysconfdir}/openct.conf %config(noreplace) %{_sysconfdir}/sysconfig/openct -%config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules +# Temporarily not noreplace, 0.6.7-2 -> 0.6.7-3 +%config %{_sysconfdir}/udev/rules.d/*openct.rules %{_initrddir}/openct %{_bindir}/openct-tool %{_sbindir}/ifdhandler @@ -140,7 +141,7 @@ %{_sbindir}/openct-control %{_libdir}/ctapi/libopenctapi.so %{_libdir}/libopenct.so.* -%{_libdir}/openct/ +%{_datadir}/openct/ %dir %{_localstatedir}/run/openct/ %ghost %{_localstatedir}/run/openct/status %{_mandir}/man1/openct-tool.1* @@ -159,6 +160,9 @@ %changelog +* Thu May 25 2006 Ville Skytt?? - 0.6.7-3 +- Make installation more multilib friendly. + * Sat May 6 2006 Ville Skytt?? - 0.6.7-2 - Install CT-API module into %%{_libdir}/ctapi, add dependency on it (#190903). - Update URL. From fedora-extras-commits at redhat.com Wed May 31 19:33:19 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 31 May 2006 12:33:19 -0700 Subject: rpms/python-sqlalchemy/FC-5 .cvsignore, 1.2, 1.3 python-sqlalchemy.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311933.k4VJXLaB017560@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17503/FC-5 Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: update to new upstream version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 May 2006 14:57:51 -0000 1.2 +++ .cvsignore 31 May 2006 19:33:18 -0000 1.3 @@ -1 +1 @@ -SQLAlchemy-0.1.7.tar.gz +SQLAlchemy-0.2.1.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-5/python-sqlalchemy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-sqlalchemy.spec 23 May 2006 14:57:51 -0000 1.1 +++ python-sqlalchemy.spec 31 May 2006 19:33:18 -0000 1.2 @@ -5,7 +5,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.1.7 +Version: 0.2.1 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc README LICENSE PKG-INFO doc examples +%doc README LICENSE PKG-INFO CHANGES doc examples %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info %dir %{python_sitelib}/sqlalchemy %{python_sitelib}/sqlalchemy/*.py @@ -62,16 +62,23 @@ %{python_sitelib}/sqlalchemy/ext/*.py %{python_sitelib}/sqlalchemy/ext/*.pyc %ghost %{python_sitelib}/sqlalchemy/ext/*.pyo -%dir %{python_sitelib}/sqlalchemy/mapping -%{python_sitelib}/sqlalchemy/mapping/*.py -%{python_sitelib}/sqlalchemy/mapping/*.pyc -%ghost %{python_sitelib}/sqlalchemy/mapping/*.pyo %dir %{python_sitelib}/sqlalchemy/mods %{python_sitelib}/sqlalchemy/mods/*.py %{python_sitelib}/sqlalchemy/mods/*.pyc %ghost %{python_sitelib}/sqlalchemy/mods/*.pyo +%dir %{python_sitelib}/sqlalchemy/engine +%{python_sitelib}/sqlalchemy/engine/*.py +%{python_sitelib}/sqlalchemy/engine/*.pyc +%ghost %{python_sitelib}/sqlalchemy/engine/*.pyo +%dir %{python_sitelib}/sqlalchemy/orm +%{python_sitelib}/sqlalchemy/orm/*.py +%{python_sitelib}/sqlalchemy/orm/*.pyc +%ghost %{python_sitelib}/sqlalchemy/orm/*.pyo %changelog +* Wed May 31 2006 Shahms E. King 0.2.1-1 +- Update to new upstream version + * Tue May 16 2006 Shahms E. King 0.1.7-1 - Update to new upstream version - Point URL to direct link, not sourceforge redirect Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 May 2006 14:57:51 -0000 1.2 +++ sources 31 May 2006 19:33:18 -0000 1.3 @@ -1 +1 @@ -1c9c0124ad057c9fbcf8c4e16ecae960 SQLAlchemy-0.1.7.tar.gz +2756451f806c33bb83f301b1df1199f4 SQLAlchemy-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:33:18 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 31 May 2006 12:33:18 -0700 Subject: rpms/python-sqlalchemy/FC-4 .cvsignore, 1.2, 1.3 python-sqlalchemy.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311933.k4VJXKd7017556@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17503/FC-4 Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: update to new upstream version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 May 2006 14:57:51 -0000 1.2 +++ .cvsignore 31 May 2006 19:33:18 -0000 1.3 @@ -1 +1 @@ -SQLAlchemy-0.1.7.tar.gz +SQLAlchemy-0.2.1.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-4/python-sqlalchemy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-sqlalchemy.spec 23 May 2006 14:57:51 -0000 1.1 +++ python-sqlalchemy.spec 31 May 2006 19:33:18 -0000 1.2 @@ -5,7 +5,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.1.7 +Version: 0.2.1 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc README LICENSE PKG-INFO doc examples +%doc README LICENSE PKG-INFO CHANGES doc examples %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info %dir %{python_sitelib}/sqlalchemy %{python_sitelib}/sqlalchemy/*.py @@ -62,16 +62,23 @@ %{python_sitelib}/sqlalchemy/ext/*.py %{python_sitelib}/sqlalchemy/ext/*.pyc %ghost %{python_sitelib}/sqlalchemy/ext/*.pyo -%dir %{python_sitelib}/sqlalchemy/mapping -%{python_sitelib}/sqlalchemy/mapping/*.py -%{python_sitelib}/sqlalchemy/mapping/*.pyc -%ghost %{python_sitelib}/sqlalchemy/mapping/*.pyo %dir %{python_sitelib}/sqlalchemy/mods %{python_sitelib}/sqlalchemy/mods/*.py %{python_sitelib}/sqlalchemy/mods/*.pyc %ghost %{python_sitelib}/sqlalchemy/mods/*.pyo +%dir %{python_sitelib}/sqlalchemy/engine +%{python_sitelib}/sqlalchemy/engine/*.py +%{python_sitelib}/sqlalchemy/engine/*.pyc +%ghost %{python_sitelib}/sqlalchemy/engine/*.pyo +%dir %{python_sitelib}/sqlalchemy/orm +%{python_sitelib}/sqlalchemy/orm/*.py +%{python_sitelib}/sqlalchemy/orm/*.pyc +%ghost %{python_sitelib}/sqlalchemy/orm/*.pyo %changelog +* Wed May 31 2006 Shahms E. King 0.2.1-1 +- Update to new upstream version + * Tue May 16 2006 Shahms E. King 0.1.7-1 - Update to new upstream version - Point URL to direct link, not sourceforge redirect Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 May 2006 14:57:51 -0000 1.2 +++ sources 31 May 2006 19:33:18 -0000 1.3 @@ -1 +1 @@ -1c9c0124ad057c9fbcf8c4e16ecae960 SQLAlchemy-0.1.7.tar.gz +2756451f806c33bb83f301b1df1199f4 SQLAlchemy-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:33:19 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Wed, 31 May 2006 12:33:19 -0700 Subject: rpms/python-sqlalchemy/devel .cvsignore, 1.2, 1.3 python-sqlalchemy.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605311933.k4VJXLTE017566@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-sqlalchemy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17503/devel Modified Files: .cvsignore python-sqlalchemy.spec sources Log Message: update to new upstream version 0.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 May 2006 14:57:51 -0000 1.2 +++ .cvsignore 31 May 2006 19:33:19 -0000 1.3 @@ -1 +1 @@ -SQLAlchemy-0.1.7.tar.gz +SQLAlchemy-0.2.1.tar.gz Index: python-sqlalchemy.spec =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-sqlalchemy.spec 23 May 2006 14:57:51 -0000 1.1 +++ python-sqlalchemy.spec 31 May 2006 19:33:19 -0000 1.2 @@ -5,7 +5,7 @@ %define srcname SQLAlchemy Name: python-sqlalchemy -Version: 0.1.7 +Version: 0.2.1 Release: 1%{?dist} Summary: Modular and flexible ORM library for python @@ -48,7 +48,7 @@ %files %defattr(-,root,root,-) -%doc README LICENSE PKG-INFO doc examples +%doc README LICENSE PKG-INFO CHANGES doc examples %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info %dir %{python_sitelib}/sqlalchemy %{python_sitelib}/sqlalchemy/*.py @@ -62,16 +62,23 @@ %{python_sitelib}/sqlalchemy/ext/*.py %{python_sitelib}/sqlalchemy/ext/*.pyc %ghost %{python_sitelib}/sqlalchemy/ext/*.pyo -%dir %{python_sitelib}/sqlalchemy/mapping -%{python_sitelib}/sqlalchemy/mapping/*.py -%{python_sitelib}/sqlalchemy/mapping/*.pyc -%ghost %{python_sitelib}/sqlalchemy/mapping/*.pyo %dir %{python_sitelib}/sqlalchemy/mods %{python_sitelib}/sqlalchemy/mods/*.py %{python_sitelib}/sqlalchemy/mods/*.pyc %ghost %{python_sitelib}/sqlalchemy/mods/*.pyo +%dir %{python_sitelib}/sqlalchemy/engine +%{python_sitelib}/sqlalchemy/engine/*.py +%{python_sitelib}/sqlalchemy/engine/*.pyc +%ghost %{python_sitelib}/sqlalchemy/engine/*.pyo +%dir %{python_sitelib}/sqlalchemy/orm +%{python_sitelib}/sqlalchemy/orm/*.py +%{python_sitelib}/sqlalchemy/orm/*.pyc +%ghost %{python_sitelib}/sqlalchemy/orm/*.pyo %changelog +* Wed May 31 2006 Shahms E. King 0.2.1-1 +- Update to new upstream version + * Tue May 16 2006 Shahms E. King 0.1.7-1 - Update to new upstream version - Point URL to direct link, not sourceforge redirect Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-sqlalchemy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 May 2006 14:57:51 -0000 1.2 +++ sources 31 May 2006 19:33:19 -0000 1.3 @@ -1 +1 @@ -1c9c0124ad057c9fbcf8c4e16ecae960 SQLAlchemy-0.1.7.tar.gz +2756451f806c33bb83f301b1df1199f4 SQLAlchemy-0.2.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:42:31 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:42:31 -0700 Subject: rpms/opensc/FC-5 .cvsignore, 1.6, 1.7 opensc.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200605311942.k4VJgXgC017744@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17706/FC-5 Modified Files: .cvsignore opensc.spec sources Log Message: * Wed May 31 2006 Ville Skytt?? - 0.11.1-1 - 0.11.1. - Avoid some multilib conflicts. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 May 2006 13:51:19 -0000 1.6 +++ .cvsignore 31 May 2006 19:42:31 -0000 1.7 @@ -1 +1 @@ -opensc-0.11.0.tar.gz +opensc-0.11.1.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/opensc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- opensc.spec 7 May 2006 13:51:19 -0000 1.11 +++ opensc.spec 31 May 2006 19:42:31 -0000 1.12 @@ -1,14 +1,15 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.11.0 -Release: 2%{?dist} +Version: 0.11.1 +Release: 1%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL URL: http://www.opensc-project.org/opensc/ Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz +Patch0: %{name}-0.11.1-develconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -51,10 +52,12 @@ %prep %setup -q +%patch0 -p1 sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . -sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in +# No %{_libdir} here to avoid multilib conflicts; it's just an example +sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in %build @@ -137,6 +140,10 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 0.11.1-1 +- 0.11.1. +- Avoid some multilib conflicts. + * Sun May 7 2006 Ville Skytt?? - 0.11.0-2 - Sync example paths in openct.conf with ctapi-common. - Update URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 May 2006 13:51:19 -0000 1.6 +++ sources 31 May 2006 19:42:31 -0000 1.7 @@ -1 +1 @@ -be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz +94ce00a6bda38fac10ab06f5d5d1a8c3 opensc-0.11.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:42:32 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:42:32 -0700 Subject: rpms/opensc/devel opensc-0.11.1-develconfig.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 opensc.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <200605311942.k4VJgYhO017752@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17706/devel Modified Files: .cvsignore opensc.spec sources Added Files: opensc-0.11.1-develconfig.patch Log Message: * Wed May 31 2006 Ville Skytt?? - 0.11.1-1 - 0.11.1. - Avoid some multilib conflicts. opensc-0.11.1-develconfig.patch: --- NEW FILE opensc-0.11.1-develconfig.patch --- --- opensc-0.11.1/src/libopensc/opensc-config.in~ 2005-12-29 14:36:30.000000000 +0200 +++ opensc-0.11.1/src/libopensc/opensc-config.in 2006-05-31 22:26:57.000000000 +0300 @@ -14,8 +14,8 @@ exec_prefix=@exec_prefix@ exec_prefix_set=no -opensc_libs="@OPENSC_LIBS@" -opensc_cflags="@OPENSC_CFLAGS@" +opensc_libs="`pkg-config libopensc --libs`" +opensc_cflags="`pkg-config libopensc --cflags`" usage() --- opensc-0.11.1/src/libopensc/libopensc.pc.in~ 2005-12-29 14:36:30.000000000 +0200 +++ opensc-0.11.1/src/libopensc/libopensc.pc.in 2006-05-31 22:26:54.000000000 +0300 @@ -6,6 +6,6 @@ Name: libopensc Description: libopensc Version: @VERSION@ -Libs: -L${libdir} -lopensc -lscconf +Libs: -L${libdir} -lopensc Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 4 May 2006 17:05:31 -0000 1.8 +++ .cvsignore 31 May 2006 19:42:32 -0000 1.9 @@ -1 +1 @@ -opensc-0.11.0.tar.gz +opensc-0.11.1.tar.gz Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- opensc.spec 7 May 2006 13:49:24 -0000 1.14 +++ opensc.spec 31 May 2006 19:42:32 -0000 1.15 @@ -1,14 +1,15 @@ %define plugindir %{_libdir}/mozilla/plugins Name: opensc -Version: 0.11.0 -Release: 2%{?dist} +Version: 0.11.1 +Release: 1%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries License: LGPL URL: http://www.opensc-project.org/opensc/ Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz +Patch0: %{name}-0.11.1-develconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel >= 1.1.1 @@ -51,10 +52,12 @@ %prep %setup -q +%patch0 -p1 sh bootstrap # avoid standard rpaths on lib64 archs cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf . -sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in +# No %{_libdir} here to avoid multilib conflicts; it's just an example +sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in %build @@ -137,6 +140,10 @@ %changelog +* Wed May 31 2006 Ville Skytt?? - 0.11.1-1 +- 0.11.1. +- Avoid some multilib conflicts. + * Sun May 7 2006 Ville Skytt?? - 0.11.0-2 - Sync example paths in openct.conf with ctapi-common. - Update URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 4 May 2006 17:05:31 -0000 1.8 +++ sources 31 May 2006 19:42:32 -0000 1.9 @@ -1 +1 @@ -be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz +94ce00a6bda38fac10ab06f5d5d1a8c3 opensc-0.11.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:43:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 31 May 2006 12:43:38 -0700 Subject: rpms/opensc/FC-5 opensc-0.11.1-develconfig.patch,NONE,1.1 Message-ID: <200605311943.k4VJheJ7017824@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17806 Added Files: opensc-0.11.1-develconfig.patch Log Message: Add forgotten patch. opensc-0.11.1-develconfig.patch: --- NEW FILE opensc-0.11.1-develconfig.patch --- --- opensc-0.11.1/src/libopensc/opensc-config.in~ 2005-12-29 14:36:30.000000000 +0200 +++ opensc-0.11.1/src/libopensc/opensc-config.in 2006-05-31 22:26:57.000000000 +0300 @@ -14,8 +14,8 @@ exec_prefix=@exec_prefix@ exec_prefix_set=no -opensc_libs="@OPENSC_LIBS@" -opensc_cflags="@OPENSC_CFLAGS@" +opensc_libs="`pkg-config libopensc --libs`" +opensc_cflags="`pkg-config libopensc --cflags`" usage() --- opensc-0.11.1/src/libopensc/libopensc.pc.in~ 2005-12-29 14:36:30.000000000 +0200 +++ opensc-0.11.1/src/libopensc/libopensc.pc.in 2006-05-31 22:26:54.000000000 +0300 @@ -6,6 +6,6 @@ Name: libopensc Description: libopensc Version: @VERSION@ -Libs: -L${libdir} -lopensc -lscconf +Libs: -L${libdir} -lopensc Cflags: -I${includedir} From fedora-extras-commits at redhat.com Wed May 31 19:45:44 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 12:45:44 -0700 Subject: rpms/plplot/FC-5 .cvsignore, 1.6, 1.7 plplot.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200605311945.k4VJjkAx017900@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17879 Modified Files: .cvsignore plplot.spec sources Log Message: - Update to 5.6.1 - Enable f95 bindings - Remove patches applied upstream - Now include pkgconfig files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 May 2006 15:40:10 -0000 1.6 +++ .cvsignore 31 May 2006 19:45:44 -0000 1.7 @@ -1 +1 @@ -plplot-5.6.0.tar.gz +plplot-5.6.1.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plplot.spec 9 May 2006 15:40:10 -0000 1.10 +++ plplot.spec 31 May 2006 19:45:44 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.6.0 +Version: 5.6.1 Release: 1%{?dist} Summary: Library of functions for making scientific plots @@ -10,8 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch1: plplot-5.5.3-tk.patch -Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -139,14 +137,12 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch1 -p1 -b .orig -%patch3 -p1 -b .orig %patch4 -p1 -b .orig %patch6 -p1 -b .orig %build -%configure --disable-static --without-rpath --with-pthreads \ +%configure --enable-f95 --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ @@ -209,6 +205,8 @@ %{_libdir}/libplplotd.so.* %{_libdir}/libplplotf77cd.so.* %{_libdir}/libplplotf77d.so.* +%{_libdir}/libplplotf95cd.so.* +%{_libdir}/libplplotf95d.so.* %dir %{_libdir}/plplot%{version} %dir %{_libdir}/plplot%{version}/driversd %{_libdir}/plplot%{version}/driversd/gd.rc @@ -273,13 +271,22 @@ %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so +%{_libdir}/libplplotf95cd.so +%{_libdir}/libplplotf95d.so +%{_libdir}/fortran/ +%{_libdir}/pkgconfig/plplotd.pc +%{_libdir}/pkgconfig/plplotd-c++.pc +%{_libdir}/pkgconfig/plplotd-f77.pc +%{_libdir}/pkgconfig/plplotd-f95.pc %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ +%{_datadir}/plplot%{version}/examples/f95/ %{_datadir}/plplot%{version}/examples/Makefile %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_datadir}/plplot%{version}/examples/test_f95.sh %{_mandir}/man3/pl*.3* %files gnome @@ -287,6 +294,7 @@ %{_libdir}/libplplotgnome2d.so.* %{_libdir}/plplot%{version}/driversd/gcw.rc %{_libdir}/plplot%{version}/driversd/gcw.so +%{_libdir}/pkgconfig/plplotd-gnome2.pc %{python_sitelib}/gcwmodule.so %{python_sitelib}/cplplotcanvasmodule.so @@ -322,6 +330,7 @@ %{_libdir}/plplot%{version}/driversd/tk.so %{_libdir}/plplot%{version}/driversd/tkwin.rc %{_libdir}/plplot%{version}/driversd/tkwin.so +%{_libdir}/pkgconfig/plplotd-tcl.pc %{_mandir}/man1/plserver.1.gz %{_mandir}/man1/pltcl.1.gz @@ -339,6 +348,12 @@ %changelog +* Mon May 22 2006 - Orion Poplawski - 5.6.1-1 +- Update to 5.6.1 +- Enable f95 bindings +- Remove patches applied upstream +- Now include pkgconfig files + * Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver - Add wxGTK support Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 May 2006 15:40:10 -0000 1.6 +++ sources 31 May 2006 19:45:44 -0000 1.7 @@ -1 +1 @@ -0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz +51029b256f3333449de9bcd3e00c088f plplot-5.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:47:20 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 12:47:20 -0700 Subject: rpms/plplot/FC-5 plplot.spec,1.11,1.12 Message-ID: <200605311947.k4VJlMCH017923@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17906 Modified Files: plplot.spec Log Message: Fixup .pc files and add BR pkgconfig Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- plplot.spec 31 May 2006 19:45:44 -0000 1.11 +++ plplot.spec 31 May 2006 19:47:20 -0000 1.12 @@ -54,6 +54,7 @@ Summary: Development headers and libraries for PLplot Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel %{summary} @@ -73,6 +74,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} +Requires: pkgconfig %description gnome-devel %{summary} @@ -120,6 +122,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} +Requires: pkgconfig %description tk-devel %{summary} @@ -294,13 +297,13 @@ %{_libdir}/libplplotgnome2d.so.* %{_libdir}/plplot%{version}/driversd/gcw.rc %{_libdir}/plplot%{version}/driversd/gcw.so -%{_libdir}/pkgconfig/plplotd-gnome2.pc %{python_sitelib}/gcwmodule.so %{python_sitelib}/cplplotcanvasmodule.so %files gnome-devel %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so +%{_libdir}/pkgconfig/plplotd-gnome2.pc %files java %defattr(-,root,root,-) @@ -330,7 +333,6 @@ %{_libdir}/plplot%{version}/driversd/tk.so %{_libdir}/plplot%{version}/driversd/tkwin.rc %{_libdir}/plplot%{version}/driversd/tkwin.so -%{_libdir}/pkgconfig/plplotd-tcl.pc %{_mandir}/man1/plserver.1.gz %{_mandir}/man1/pltcl.1.gz @@ -338,6 +340,7 @@ %defattr(-,root,root,-) %{_libdir}/libplplottcltkd.so %{_libdir}/libtclmatrixd.so +%{_libdir}/pkgconfig/plplotd-tcl.pc %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ From fedora-extras-commits at redhat.com Wed May 31 19:48:32 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 12:48:32 -0700 Subject: rpms/plplot/devel .cvsignore, 1.6, 1.7 plplot.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200605311948.k4VJmYIY017995@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17974 Modified Files: .cvsignore plplot.spec sources Log Message: - Update to 5.6.1 - Enable f95 bindings - Remove patches applied upstream - Now include pkgconfig files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 May 2006 19:24:40 -0000 1.6 +++ .cvsignore 31 May 2006 19:48:32 -0000 1.7 @@ -1 +1 @@ -plplot-5.6.0.tar.gz +plplot-5.6.1.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plplot.spec 8 May 2006 18:26:41 -0000 1.10 +++ plplot.spec 31 May 2006 19:48:32 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.6.0 +Version: 5.6.1 Release: 1%{?dist} Summary: Library of functions for making scientific plots @@ -10,8 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch1: plplot-5.5.3-tk.patch -Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +54,7 @@ Summary: Development headers and libraries for PLplot Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel %{summary} @@ -75,6 +74,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} +Requires: pkgconfig %description gnome-devel %{summary} @@ -122,6 +122,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} +Requires: pkgconfig %description tk-devel %{summary} @@ -139,14 +140,12 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch1 -p1 -b .orig -%patch3 -p1 -b .orig %patch4 -p1 -b .orig %patch6 -p1 -b .orig %build -%configure --disable-static --without-rpath --with-pthreads \ +%configure --enable-f95 --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ @@ -209,6 +208,8 @@ %{_libdir}/libplplotd.so.* %{_libdir}/libplplotf77cd.so.* %{_libdir}/libplplotf77d.so.* +%{_libdir}/libplplotf95cd.so.* +%{_libdir}/libplplotf95d.so.* %dir %{_libdir}/plplot%{version} %dir %{_libdir}/plplot%{version}/driversd %{_libdir}/plplot%{version}/driversd/gd.rc @@ -273,13 +274,22 @@ %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so +%{_libdir}/libplplotf95cd.so +%{_libdir}/libplplotf95d.so +%{_libdir}/fortran/ +%{_libdir}/pkgconfig/plplotd.pc +%{_libdir}/pkgconfig/plplotd-c++.pc +%{_libdir}/pkgconfig/plplotd-f77.pc +%{_libdir}/pkgconfig/plplotd-f95.pc %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ +%{_datadir}/plplot%{version}/examples/f95/ %{_datadir}/plplot%{version}/examples/Makefile %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh +%{_datadir}/plplot%{version}/examples/test_f95.sh %{_mandir}/man3/pl*.3* %files gnome @@ -293,6 +303,7 @@ %files gnome-devel %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so +%{_libdir}/pkgconfig/plplotd-gnome2.pc %files java %defattr(-,root,root,-) @@ -329,6 +340,7 @@ %defattr(-,root,root,-) %{_libdir}/libplplottcltkd.so %{_libdir}/libtclmatrixd.so +%{_libdir}/pkgconfig/plplotd-tcl.pc %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ @@ -339,6 +351,12 @@ %changelog +* Mon May 22 2006 - Orion Poplawski - 5.6.1-1 +- Update to 5.6.1 +- Enable f95 bindings +- Remove patches applied upstream +- Now include pkgconfig files + * Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver - Add wxGTK support Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 May 2006 19:24:40 -0000 1.6 +++ sources 31 May 2006 19:48:32 -0000 1.7 @@ -1 +1 @@ -0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz +51029b256f3333449de9bcd3e00c088f plplot-5.6.1.tar.gz From fedora-extras-commits at redhat.com Wed May 31 19:52:26 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 31 May 2006 12:52:26 -0700 Subject: rpms/stellarium/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 stellarium.spec, 1.19, 1.20 Message-ID: <200605311952.k4VJqS86018028@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18007 Modified Files: .cvsignore sources stellarium.spec Log Message: User guide updated Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 8 May 2006 16:59:39 -0000 1.8 +++ .cvsignore 31 May 2006 19:52:26 -0000 1.9 @@ -1,2 +1,3 @@ stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf +stellarium_user_guide-0.8.0-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 8 May 2006 16:59:39 -0000 1.8 +++ sources 31 May 2006 19:52:26 -0000 1.9 @@ -1,2 +1,2 @@ 2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz -9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf +2fd23dd0300af03cabc9ba5564cc919d stellarium_user_guide-0.8.0-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- stellarium.spec 8 May 2006 18:09:16 -0000 1.19 +++ stellarium.spec 31 May 2006 19:52:26 -0000 1.20 @@ -1,14 +1,14 @@ Name: stellarium Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-%{version}.tar.gz +Source0: http://prdownloads.sf.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop -Source2: http://dl.sf.net/stellarum/stellarium_user_guide-0.7.1-1.pdf +Source2: http://prdownloads.sf.net/stellarum/stellarium_user_guide-0.8.0-1.pdf Patch1: stellarium-0.8.0-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,9 +81,13 @@ %files doc -%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf +%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.8.0-1.pdf %changelog +* Wed May 31 2006 Jochen Schmitt 0.8.0-4 +- Update user guide +- change dl.sf.net to prdownloads.sf.net + * Sun May 7 2006 Jochen Schmitt 0.8.0-3 - New upstream release From fedora-extras-commits at redhat.com Wed May 31 19:53:30 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 31 May 2006 12:53:30 -0700 Subject: rpms/stellarium/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 stellarium.spec, 1.18, 1.19 Message-ID: <200605311953.k4VJrW3L018129@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18108 Modified Files: .cvsignore sources stellarium.spec Log Message: User guide updated Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 8 May 2006 17:06:01 -0000 1.8 +++ .cvsignore 31 May 2006 19:53:30 -0000 1.9 @@ -1,2 +1,3 @@ stellarium-0.8.0.tar.gz stellarium_user_guide-0.7.1-1.pdf +stellarium_user_guide-0.8.0-1.pdf Index: sources =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 8 May 2006 17:06:01 -0000 1.8 +++ sources 31 May 2006 19:53:30 -0000 1.9 @@ -1,2 +1,2 @@ 2834cd59c8c0aa8dc65faefcf848129d stellarium-0.8.0.tar.gz -9b021bafcc4bd3d47f14c5052a8f4790 stellarium_user_guide-0.7.1-1.pdf +2fd23dd0300af03cabc9ba5564cc919d stellarium_user_guide-0.8.0-1.pdf Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- stellarium.spec 8 May 2006 17:43:17 -0000 1.18 +++ stellarium.spec 31 May 2006 19:53:30 -0000 1.19 @@ -1,14 +1,14 @@ Name: stellarium Version: 0.8.0 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics License: GPL URL: http://stellarium.free.fr/ -Source0: http://dl.sf.net/stellarium/stellarium-%{version}.tar.gz +Source0: http://prdownloads.sf.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop -Source2: http://dl.sf.net/stellarum/stellarium_user_guide-0.7.1-1.pdf +Source2: http://prdownloads.sf.net/stellarum/stellarium_user_guide-0.8.0-1.pdf Patch1: stellarium-0.8.0-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,10 +81,14 @@ %files doc -%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf +%attr(0644,root,root) %doc COPYING stellarium_user_guide-0.8.0-1.pdf %changelog -* Sun May 7 2006 Jochen Schmitt 0.8.0-2 +* Wed May 31 2006 Jochen Schmitt 0.8.0-4 +- Update user guide +- change dl.sf.net to prdownloads.sf.net + +* Sun May 7 2006 Jochen Schmitt 0.8.0-3 - New upstream release * Tue Feb 14 2006 Jochen Schmitt 0.7.1-7 From fedora-extras-commits at redhat.com Wed May 31 20:02:28 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Wed, 31 May 2006 13:02:28 -0700 Subject: rpms/lua/FC-4 lua.spec,1.14,1.15 Message-ID: <200605312003.k4VK31iT020532@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481/FC-4 Modified Files: lua.spec Log Message: added requires for pkgconfig Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-4/lua.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lua.spec 29 May 2006 07:15:30 -0000 1.14 +++ lua.spec 31 May 2006 20:02:28 -0000 1.15 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -10,6 +10,7 @@ Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: pkgconfig BuildRequires: readline-devel, ncurses-devel Provides: %{name}-devel = %{version}-%{release} @@ -58,6 +59,9 @@ %changelog +* Thu Jun 01 2006 Michael J. Knox - 5.1-4 +- added Requires for pkgconfig BZ#193674 + * Mon May 29 2006 Michael J. Knox - 5.1-3 - added autotools patch from Petri Lehtinen, http://lua-users.org From fedora-extras-commits at redhat.com Wed May 31 20:02:34 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Wed, 31 May 2006 13:02:34 -0700 Subject: rpms/lua/FC-5 lua.spec,1.14,1.15 Message-ID: <200605312003.k4VK38FL020536@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481/FC-5 Modified Files: lua.spec Log Message: added requires for pkgconfig Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lua.spec 29 May 2006 07:15:31 -0000 1.14 +++ lua.spec 31 May 2006 20:02:34 -0000 1.15 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -10,6 +10,7 @@ Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: pkgconfig BuildRequires: readline-devel, ncurses-devel Provides: %{name}-devel = %{version}-%{release} @@ -58,6 +59,9 @@ %changelog +* Thu Jun 01 2006 Michael J. Knox - 5.1-4 +- added Requires for pkgconfig BZ#193674 + * Mon May 29 2006 Michael J. Knox - 5.1-3 - added autotools patch from Petri Lehtinen, http://lua-users.org From fedora-extras-commits at redhat.com Wed May 31 20:03:08 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:03:08 -0700 Subject: rpms/plplot/FC-5 plplot.spec,1.12,1.13 Message-ID: <200605312003.k4VK3Anv020557@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20531 Modified Files: plplot.spec Log Message: Remove octave patch applied upstream Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- plplot.spec 31 May 2006 19:47:20 -0000 1.12 +++ plplot.spec 31 May 2006 20:03:08 -0000 1.13 @@ -10,7 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch4: plplot-5.5.3-octave.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,7 +139,6 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch4 -p1 -b .orig %patch6 -p1 -b .orig From fedora-extras-commits at redhat.com Wed May 31 20:02:47 2006 From: fedora-extras-commits at redhat.com (Michael J Knox (mjk)) Date: Wed, 31 May 2006 13:02:47 -0700 Subject: rpms/lua/devel lua.spec,1.14,1.15 Message-ID: <200605312003.k4VK3Jp3020560@cvs-int.fedora.redhat.com> Author: mjk Update of /cvs/extras/rpms/lua/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20481/devel Modified Files: lua.spec Log Message: added requires for pkgconfig Index: lua.spec =================================================================== RCS file: /cvs/extras/rpms/lua/devel/lua.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lua.spec 29 May 2006 07:01:54 -0000 1.14 +++ lua.spec 31 May 2006 20:02:47 -0000 1.15 @@ -1,6 +1,6 @@ Name: lua Version: 5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages @@ -10,6 +10,7 @@ Patch0: lua-5.1-autotoolize-r1.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: pkgconfig BuildRequires: readline-devel, ncurses-devel Provides: %{name}-devel = %{version}-%{release} @@ -58,6 +59,9 @@ %changelog +* Thu Jun 01 2006 Michael J. Knox - 5.1-4 +- added Requires for pkgconfig BZ#193674 + * Mon May 29 2006 Michael J. Knox - 5.1-3 - added autotools patch from Petri Lehtinen, http://lua-users.org From fedora-extras-commits at redhat.com Wed May 31 20:04:13 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:04:13 -0700 Subject: rpms/plplot/FC-5 plplot-5.5.3-octave.patch, 1.1, NONE plplot-5.5.3-tk.patch, 1.2, NONE plplot-5.5.3-x86_64.patch, 1.1, NONE Message-ID: <200605312004.k4VK4FhL020693@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20674 Removed Files: plplot-5.5.3-octave.patch plplot-5.5.3-tk.patch plplot-5.5.3-x86_64.patch Log Message: Remove old patches --- plplot-5.5.3-octave.patch DELETED --- --- plplot-5.5.3-tk.patch DELETED --- --- plplot-5.5.3-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 20:07:16 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:07:16 -0700 Subject: rpms/plplot/devel plplot.spec, 1.11, 1.12 plplot-5.5.3-octave.patch, 1.1, NONE plplot-5.5.3-tk.patch, 1.2, NONE plplot-5.5.3-x86_64.patch, 1.1, NONE Message-ID: <200605312007.k4VK7I6T020802@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20785 Modified Files: plplot.spec Removed Files: plplot-5.5.3-octave.patch plplot-5.5.3-tk.patch plplot-5.5.3-x86_64.patch Log Message: Remove upstream applied patches Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- plplot.spec 31 May 2006 19:48:32 -0000 1.11 +++ plplot.spec 31 May 2006 20:07:16 -0000 1.12 @@ -10,7 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch4: plplot-5.5.3-octave.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,7 +139,6 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch4 -p1 -b .orig %patch6 -p1 -b .orig --- plplot-5.5.3-octave.patch DELETED --- --- plplot-5.5.3-tk.patch DELETED --- --- plplot-5.5.3-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 20:10:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:10:19 -0700 Subject: rpms/plplot/devel plplot.spec,1.12,1.13 Message-ID: <200605312010.k4VKALOH020845@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20812/devel Modified Files: plplot.spec Log Message: Add . to descriptions Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- plplot.spec 31 May 2006 20:07:16 -0000 1.12 +++ plplot.spec 31 May 2006 20:10:18 -0000 1.13 @@ -56,7 +56,7 @@ Requires: pkgconfig %description devel -%{summary} +%{summary}. %package gnome @@ -65,7 +65,7 @@ Requires: %{name} = %{version}-%{release} %description gnome -%{summary} +%{summary}. %package gnome-devel Summary: Development files for using PLplot GNOME @@ -76,7 +76,7 @@ Requires: pkgconfig %description gnome-devel -%{summary} +%{summary}. %package java @@ -85,7 +85,7 @@ Requires: %{name} = %{version}-%{release} %description java -%{summary} +%{summary}. %package java-devel Summary: Development files for using PLplot GNOME @@ -95,7 +95,7 @@ Requires: %{name}-java = %{version}-%{release} %description java-devel -%{summary} +%{summary}. %package octave @@ -104,7 +104,7 @@ Requires: %{name} = %{version}-%{release}, octave %description octave -%{summary} +%{summary}. %package tk @@ -113,7 +113,7 @@ Requires: %{name} = %{version}-%{release} %description tk -%{summary} +%{summary}. %package tk-devel Summary: Development files for using PLplot with Tk @@ -124,7 +124,7 @@ Requires: pkgconfig %description tk-devel -%{summary} +%{summary}. %package wxGTK @@ -133,7 +133,7 @@ Requires: %{name} = %{version}-%{release} %description wxGTK -%{summary} +%{summary}. %prep From fedora-extras-commits at redhat.com Wed May 31 20:10:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:10:19 -0700 Subject: rpms/plplot/FC-5 plplot.spec,1.13,1.14 Message-ID: <200605312010.k4VKALbC020849@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20812/FC-5 Modified Files: plplot.spec Log Message: Add . to descriptions Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- plplot.spec 31 May 2006 20:03:08 -0000 1.13 +++ plplot.spec 31 May 2006 20:10:19 -0000 1.14 @@ -56,7 +56,7 @@ Requires: pkgconfig %description devel -%{summary} +%{summary}. %package gnome @@ -65,7 +65,7 @@ Requires: %{name} = %{version}-%{release} %description gnome -%{summary} +%{summary}. %package gnome-devel Summary: Development files for using PLplot GNOME @@ -76,7 +76,7 @@ Requires: pkgconfig %description gnome-devel -%{summary} +%{summary}. %package java @@ -85,7 +85,7 @@ Requires: %{name} = %{version}-%{release} %description java -%{summary} +%{summary}. %package java-devel Summary: Development files for using PLplot GNOME @@ -95,7 +95,7 @@ Requires: %{name}-java = %{version}-%{release} %description java-devel -%{summary} +%{summary}. %package octave @@ -104,7 +104,7 @@ Requires: %{name} = %{version}-%{release}, octave %description octave -%{summary} +%{summary}. %package tk @@ -113,7 +113,7 @@ Requires: %{name} = %{version}-%{release} %description tk -%{summary} +%{summary}. %package tk-devel Summary: Development files for using PLplot with Tk @@ -124,7 +124,7 @@ Requires: pkgconfig %description tk-devel -%{summary} +%{summary}. %package wxGTK @@ -133,7 +133,7 @@ Requires: %{name} = %{version}-%{release} %description wxGTK -%{summary} +%{summary}. %prep From fedora-extras-commits at redhat.com Wed May 31 20:16:46 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:16:46 -0700 Subject: rpms/plplot/FC-4 .cvsignore, 1.5, 1.6 plplot.spec, 1.4, 1.5 sources, 1.5, 1.6 plplot-5.5.3-octave.patch, 1.1, NONE plplot-5.5.3-tk.patch, 1.1, NONE plplot-5.5.3-x86_64.patch, 1.1, NONE Message-ID: <200605312016.k4VKGmXq020901@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20880 Modified Files: .cvsignore plplot.spec sources Removed Files: plplot-5.5.3-octave.patch plplot-5.5.3-tk.patch plplot-5.5.3-x86_64.patch Log Message: - Update to 5.6.1 - Remove patches applied upstream - Now include pkgconfig files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 May 2006 17:57:10 -0000 1.5 +++ .cvsignore 31 May 2006 20:16:46 -0000 1.6 @@ -1 +1 @@ -plplot-5.6.0.tar.gz +plplot-5.6.1.tar.gz Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plplot.spec 9 May 2006 17:57:10 -0000 1.4 +++ plplot.spec 31 May 2006 20:16:46 -0000 1.5 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot -Version: 5.6.0 +Version: 5.6.1 Release: 1%{?dist} Summary: Library of functions for making scientific plots @@ -10,9 +10,6 @@ URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch -Patch1: plplot-5.5.3-tk.patch -Patch3: plplot-5.5.3-x86_64.patch -Patch4: plplot-5.5.3-octave.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel @@ -60,6 +57,7 @@ Summary: Development headers and libraries for PLplot Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel %{summary}. @@ -79,6 +77,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} +Requires: pkgconfig %description gnome-devel %{summary}. @@ -128,6 +127,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} +Requires: pkgconfig %description tk-devel %{summary}. @@ -145,9 +145,6 @@ %prep %setup -q %patch0 -p1 -b .orig -%patch1 -p1 -b .orig -%patch3 -p1 -b .orig -%patch4 -p1 -b .orig %build @@ -272,6 +269,10 @@ %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so +%{_libdir}/pkgconfig/plplotd.pc +%{_libdir}/pkgconfig/plplotd-c++.pc +%{_libdir}/pkgconfig/plplotd-f77.pc +%{_libdir}/pkgconfig/plplotd-f95.pc %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ @@ -292,6 +293,7 @@ %files gnome-devel %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so +%{_libdir}/pkgconfig/plplotd-gnome2.pc %ifarch %{ix86} x86_64 %files java @@ -330,6 +332,7 @@ %defattr(-,root,root,-) %{_libdir}/libplplottcltkd.so %{_libdir}/libtclmatrixd.so +%{_libdir}/pkgconfig/plplotd-tcl.pc %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ @@ -340,6 +343,11 @@ %changelog +* Wed May 31 2006 - Orion Poplawski - 5.6.1-1 +- Update to 5.6.1 +- Remove patches applied upstream +- Now include pkgconfig files + * Tue May 9 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver - Add wxGTK support Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 May 2006 17:57:10 -0000 1.5 +++ sources 31 May 2006 20:16:46 -0000 1.6 @@ -1 +1 @@ -0f23cc477f0611adcfdd8ba39caf4213 plplot-5.6.0.tar.gz +51029b256f3333449de9bcd3e00c088f plplot-5.6.1.tar.gz --- plplot-5.5.3-octave.patch DELETED --- --- plplot-5.5.3-tk.patch DELETED --- --- plplot-5.5.3-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed May 31 20:23:04 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:23:04 -0700 Subject: rpms/plplot/devel plplot.spec,1.13,1.14 Message-ID: <200605312023.k4VKN6s2020988@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943/devel Modified Files: plplot.spec Log Message: pstex driver no longer shipped Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- plplot.spec 31 May 2006 20:10:18 -0000 1.13 +++ plplot.spec 31 May 2006 20:23:03 -0000 1.14 @@ -224,8 +224,6 @@ %{_libdir}/plplot%{version}/driversd/plmeta.so %{_libdir}/plplot%{version}/driversd/ps.rc %{_libdir}/plplot%{version}/driversd/ps.so -%{_libdir}/plplot%{version}/driversd/pstex.rc -%{_libdir}/plplot%{version}/driversd/pstex.so %{_libdir}/plplot%{version}/driversd/psttf.rc %{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc @@ -354,6 +352,7 @@ - Enable f95 bindings - Remove patches applied upstream - Now include pkgconfig files +- pstex driver no longer shipped * Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver From fedora-extras-commits at redhat.com Wed May 31 20:23:04 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:23:04 -0700 Subject: rpms/plplot/FC-4 plplot.spec,1.5,1.6 Message-ID: <200605312023.k4VKN6cY020992@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943/FC-4 Modified Files: plplot.spec Log Message: pstex driver no longer shipped Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plplot.spec 31 May 2006 20:16:46 -0000 1.5 +++ plplot.spec 31 May 2006 20:23:04 -0000 1.6 @@ -227,8 +227,6 @@ %{_libdir}/plplot%{version}/driversd/plmeta.so %{_libdir}/plplot%{version}/driversd/ps.rc %{_libdir}/plplot%{version}/driversd/ps.so -%{_libdir}/plplot%{version}/driversd/pstex.rc -%{_libdir}/plplot%{version}/driversd/pstex.so %{_libdir}/plplot%{version}/driversd/psttf.rc %{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc @@ -347,6 +345,7 @@ - Update to 5.6.1 - Remove patches applied upstream - Now include pkgconfig files +- pstex driver no longer shipped * Tue May 9 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver From fedora-extras-commits at redhat.com Wed May 31 20:23:05 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:23:05 -0700 Subject: rpms/plplot/FC-5 plplot.spec,1.14,1.15 Message-ID: <200605312023.k4VKN7kE020996@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943/FC-5 Modified Files: plplot.spec Log Message: pstex driver no longer shipped Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- plplot.spec 31 May 2006 20:10:19 -0000 1.14 +++ plplot.spec 31 May 2006 20:23:05 -0000 1.15 @@ -224,8 +224,6 @@ %{_libdir}/plplot%{version}/driversd/plmeta.so %{_libdir}/plplot%{version}/driversd/ps.rc %{_libdir}/plplot%{version}/driversd/ps.so -%{_libdir}/plplot%{version}/driversd/pstex.rc -%{_libdir}/plplot%{version}/driversd/pstex.so %{_libdir}/plplot%{version}/driversd/psttf.rc %{_libdir}/plplot%{version}/driversd/psttf.so %{_libdir}/plplot%{version}/driversd/xfig.rc @@ -354,6 +352,7 @@ - Enable f95 bindings - Remove patches applied upstream - Now include pkgconfig files +- pstex driver no longer shipped * Mon Apr 24 2006 - Orion Poplawski - 5.6.0-1 - Update to 5.6.0 with new psttf driver From fedora-extras-commits at redhat.com Wed May 31 20:42:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 31 May 2006 13:42:33 -0700 Subject: rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen.patch, 1.2, 1.3 xgalaxy-2.0.34-xgalaxy.patch, 1.2, 1.3 xgalaxy.spec, 1.2, 1.3 Message-ID: <200605312042.k4VKgZ1Z021230@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/xgalaxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21202 Modified Files: xgalaxy-2.0.34-fullscreen.patch xgalaxy-2.0.34-xgalaxy.patch xgalaxy.spec Log Message: * Mon May 22 2006 Hans de Goede 2.0.34-3 - Fixed ships not being centered when flying in in level 1 - Fixed artifacts (ships not yet on screen showing) in level 2 - Added -winsize widthxheight option, which can be used to specify an alternative window size - Documented the -level, -window, -winsize switch in the manpage. xgalaxy-2.0.34-fullscreen.patch: Index: xgalaxy-2.0.34-fullscreen.patch =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-fullscreen.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xgalaxy-2.0.34-fullscreen.patch 31 May 2006 15:16:41 -0000 1.2 +++ xgalaxy-2.0.34-fullscreen.patch 31 May 2006 20:42:33 -0000 1.3 @@ -1,50 +1,199 @@ ---- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/struct.h 2006-05-31 16:56:50.000000000 +0200 -@@ -55,6 +55,8 @@ - W_Callback handle_button; - W_Callback handle_expose; - #endif /* 0 */ -+ W_Window wm_window; -+ Window fs_window; - }; +--- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200 ++++ xgalaga-2.0.34/Wproto.h 2006-05-31 22:28:06.000000000 +0200 +@@ -63,6 +63,7 @@ + W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); + W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); + void W_SetIconWindow(W_Window win, W_Window icon); ++void W_ToggleFullscreen(W_Window win); + /* point.c */ + void W_DrawPoint(W_Window window, int x, int y, W_Color color); + void FlushPointCache(Window win, int color); +--- xgalaga-2.0.34/data.h.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/data.h 2006-05-31 22:28:06.000000000 +0200 +@@ -35,6 +35,9 @@ + extern int mouseControl; + extern int wantStars; - struct stringList { ---- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/data.c 2006-05-31 16:56:50.000000000 +0200 -@@ -158,3 +158,6 @@ ++extern int winwidth; ++extern int winheight; ++ + extern int alien_shape[]; - int useBuffered = 1; + extern int weapon; +--- xgalaga-2.0.34/main.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/main.c 2006-05-31 22:28:06.000000000 +0200 +@@ -32,6 +32,7 @@ + static int attacking = 0, maxattacking, entering=0; + static int maxetorps = 5, numetorps=0; + static int plflash = 50; ++static int fullscreen = 0; + #ifndef ORIGINAL_XGALAGA + static int shots = 0; + static int hits = 0; +@@ -63,10 +64,14 @@ + xgal_exit(int v) + { + /* W_AutoRepeatOn();*/ ++ /* Destroy our main window so the fullscreen mode gets unset if we're ++ running fullscreen. (We should really clean up much more here!) */ ++ W_DestroyWindow(shellWin); + #ifdef SOUND + kill_sound(); + #endif + /* sleep(1);*/ /* Without this, the auto-repeat request fails on my machine... */ ++ /* Note if we ever need this autorepeat thingie again, the sleep can and should be replaced by a call to XSync() */ + exit(v); + } -+#ifdef XF86VIDMODE -+struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 }; -+#endif ---- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-31 16:56:50.000000000 +0200 -@@ -91,6 +91,22 @@ +@@ -89,6 +94,8 @@ + -mouse Use mouse control (same as 'm' at the title screen)\n\ + -keyboard Use keyboard control (same as 'k')\n%s\ + -level Choose starting level (>= 1)\n\ ++-window Start in windowed mode instead of fullscreen\n\ ++-winsize Window size (default 468 x 596)\n\ + -b turn buffered mode off, use this if it runs\n\ + too slowly. Will cause flicker, maybe lots,\n\ + maybe only a little.\n\ +@@ -100,7 +107,8 @@ + p - pauses\n\ + q - end this game\n\ + b - Toggle buffering (flicker vs. speed.)\n\ +-o - Toggle OR mode. Don't use this, it sucks.\n", VERSION, ++o - Toggle OR mode. Don't use this, it sucks.\n\ ++alt + enter - Toggle fullscreen - window\n", VERSION, + PRINT_SOUND + ); + } +@@ -470,8 +478,8 @@ + if(convoyx <= 0) { + convoyx=0; + convoymove = -convoymove; +- } else if(convoyx >= WINWIDTH/2) { +- convoyx = WINWIDTH/2; ++ } else if(convoyx >= (WINWIDTH-180)) { ++ convoyx = WINWIDTH - 180; + convoymove = -convoymove; + } + } +@@ -844,6 +852,14 @@ + case 'm': + mouseControl = 2; + break; ++ case '\r'+256: ++ W_ToggleFullscreen(shellWin); ++ fullscreen = !fullscreen; ++ if (fullscreen) ++ W_BlankCursor(baseWin); ++ else ++ W_RevertCursor(baseWin); ++ break; + default: + break; + } +@@ -997,6 +1013,14 @@ + maxtorps = MINTORPS; + break; + #endif /* IM_A_BIG_FAT_CHEATER */ ++ case '\r'+256: ++ W_ToggleFullscreen(shellWin); ++ fullscreen = !fullscreen; ++ if (fullscreen) ++ W_BlankCursor(baseWin); ++ else ++ W_RevertCursor(baseWin); ++ break; + default: + break; + } +@@ -1214,9 +1238,11 @@ + int ac; + char *dpyname = 0; + int mx, my, but; ++ int start_fullscreen = 1; + + for(ac = 1; ac < argc; ac++) { + if(*argv[ac] == '-') { ++ int w, h; + if(strcmp(argv[ac], "-scores") == 0) { + print_scores(); + exit(0); +@@ -1245,6 +1271,12 @@ + useOR = 0; + } else if (strcmp(argv[ac], "-noclipmask") == 0) { + useClipMask = 0; ++ } else if (strcmp(argv[ac], "-window") == 0) { ++ start_fullscreen = 0; ++ } else if ((strcmp(argv[ac], "-winsize") == 0) && (++ac < argc) && ++ (sscanf(argv[ac], "%dx%d", &w, &h) == 2)) { ++ WINWIDTH = w; ++ WINHEIGHT = h; + } else { + print_usage(); + exit(0); +@@ -1258,11 +1290,18 @@ + W_Initialize(dpyname); - extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; - extern unsigned long w_socket; -+ -+/* For XF86VIDMODE Support */ -+#ifdef XF86VIDMODE -+#include -+#include -+ -+struct xf86vidmode_data { -+ int vidmode_available; -+ XF86VidModeModeInfo orig_mode; -+ int orig_viewport_x; -+ int orig_viewport_y; -+}; -+ -+extern struct xf86vidmode_data XF86VidModeData; -+#endif + backColor = W_Black; ++ WINHEIGHT -= (W_Textheight+1); + shellWin = W_MakeWindow("XGalaga", 0, 0, WINWIDTH, WINHEIGHT + W_Textheight+1, 0, "tiny", 0, W_White); + baseWin = W_MakeWindow("", 0, W_Textheight+1, WINWIDTH, WINHEIGHT, shellWin, "tiny", 0, W_White); + W_Buffer(shellWin, 0); + W_MapWindow(shellWin); + W_MapWindow(baseWin); ++ if (start_fullscreen) ++ { ++ W_ToggleFullscreen(shellWin); ++ W_BlankCursor(baseWin); ++ fullscreen = 1; ++ } + + /* W_AutoRepeatOff();*/ + +--- xgalaga-2.0.34/paths.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/paths.c 2006-05-31 22:30:58.000000000 +0200 +@@ -159,6 +159,8 @@ + { 6,80, -1,-1, }, + }; + ++/* These aren't used anymore! (see filepath.c) Maybe we should nuke them? */ ++#if 0 + /* enter_paths are for new ships. consists of starting co-ordinates, number of frames + to wait at the start (presumably offscreen) and a path to follow. + path -1 means this ship is not used on this level +@@ -1159,6 +1161,8 @@ + }, + }; + ++#endif /* This isn't used anymore! Maybe we should nuke it */ + - #endif /* AMIGA */ + void path_dir(int path, int pos, int *dir, int *steer) + { + *dir = paths[path][pos][0]; +--- xgalaga-2.0.34/pathfile.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/pathfile.c 2006-05-31 22:28:06.000000000 +0200 +@@ -387,8 +387,8 @@ - #if 0 + void get_xy(int anum, int* x, int* y) + { +- *x = pathinfo[al_paths[anum]].startx; +- *y = pathinfo[al_paths[anum]].starty; ++ *x = (WINWIDTH * pathinfo[al_paths[anum]].startx) / 400; ++ *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500; + } + + int get_delay(int anum) +--- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-31 22:28:06.000000000 +0200 +@@ -63,6 +63,7 @@ + W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); + W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); + void W_SetIconWindow(W_Window win, W_Window icon); ++void W_ToggleFullscreen(W_Window win); + /* point.c */ + void W_DrawPoint(W_Window window, int x, int y, W_Color color); + void FlushPointCache(Window win, int color); --- xgalaga-2.0.34/libsprite/mapwindow.c.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/mapwindow.c 2006-05-31 22:28:06.000000000 +0200 @@ -13,6 +13,8 @@ if(win->type != WIN_BORDER && win->borderwin) { W_MapWindow(win->borderwin); @@ -90,52 +239,53 @@ } void ---- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/init.c 2006-05-31 16:56:50.000000000 +0200 -@@ -356,6 +356,31 @@ - XFreeModifiermap(m); - } +--- xgalaga-2.0.34/libsprite/struct.h.fs 1998-04-12 08:03:23.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/struct.h 2006-05-31 22:28:06.000000000 +0200 +@@ -55,6 +55,8 @@ + W_Callback handle_button; + W_Callback handle_expose; + #endif /* 0 */ ++ W_Window wm_window; ++ Window fs_window; + }; + + struct stringList { +--- xgalaga-2.0.34/libsprite/Wlib.h.fs 1998-04-12 08:03:22.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/Wlib.h 2006-05-31 22:28:06.000000000 +0200 +@@ -91,6 +91,22 @@ + extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; + extern unsigned long w_socket; ++ ++/* For XF86VIDMODE Support */ +#ifdef XF86VIDMODE -+static void -+xf86_vidmode_init ( void ) -+{ -+ int i,j; -+ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) -+ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); -+ -+ if (!XF86VidModeQueryVersion(W_Display, &i, &j)) -+ XF86VidModeData.vidmode_available = 0; -+ else if (!XF86VidModeQueryExtension(W_Display, &i, &j)) -+ XF86VidModeData.vidmode_available = 0; -+ else if (!XF86VidModeGetModeLine(W_Display, W_Screen, -+ (int *)&XF86VidModeData.orig_mode.dotclock, l)) -+ XF86VidModeData.vidmode_available = 0; -+ else if (!XF86VidModeGetViewPort(W_Display, W_Screen, -+ &XF86VidModeData.orig_viewport_x, -+ &XF86VidModeData.orig_viewport_y)) -+ XF86VidModeData.vidmode_available = 0; -+ -+ if (!XF86VidModeData.vidmode_available) -+ fprintf(stderr, "Warning: XF86VidMode not available\n"); -+} ++#include ++#include ++ ++struct xf86vidmode_data { ++ int vidmode_available; ++ XF86VidModeModeInfo orig_mode; ++ int orig_viewport_x; ++ int orig_viewport_y; ++}; ++ ++extern struct xf86vidmode_data XF86VidModeData; +#endif + - void - W_Initialize(str) - char *str; -@@ -395,5 +420,9 @@ - GetAltMask(); + #endif /* AMIGA */ + + #if 0 +--- xgalaga-2.0.34/libsprite/data.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/data.c 2006-05-31 22:28:06.000000000 +0200 +@@ -158,3 +158,6 @@ + + int useBuffered = 1; - backColor = W_Black; -+ +#ifdef XF86VIDMODE -+ xf86_vidmode_init(); ++struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 }; +#endif - } - ---- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-31 16:56:50.000000000 +0200 +--- xgalaga-2.0.34/libsprite/makewindow.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/makewindow.c 2006-05-31 22:28:06.000000000 +0200 @@ -236,6 +236,10 @@ neww->type = type; neww->mapped = 0; @@ -379,32 +529,52 @@ + W_RevertCursor(_win); + } +} ---- xgalaga-2.0.34/libsprite/Wproto.h.fs 1998-04-12 08:03:22.000000000 +0200 -+++ xgalaga-2.0.34/libsprite/Wproto.h 2006-05-31 16:56:50.000000000 +0200 -@@ -63,6 +63,7 @@ - W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); - W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); - void W_SetIconWindow(W_Window win, W_Window icon); -+void W_ToggleFullscreen(W_Window win); - /* point.c */ - void W_DrawPoint(W_Window window, int x, int y, W_Color color); - void FlushPointCache(Window win, int color); ---- xgalaga-2.0.34/defs.h.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/defs.h 2006-05-31 16:56:50.000000000 +0200 -@@ -26,8 +26,9 @@ - - #define TORPDELAY 5 +--- xgalaga-2.0.34/libsprite/init.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/libsprite/init.c 2006-05-31 22:28:06.000000000 +0200 +@@ -356,6 +356,31 @@ + XFreeModifiermap(m); + } --#define WINWIDTH 400 --#define WINHEIGHT 500 -+/* Modified slightly to better fit on 800x600 in fullscreen mode */ -+#define WINWIDTH 464 /* was 400 */ -+#define WINHEIGHT 580 /* was 500 */ ++#ifdef XF86VIDMODE ++static void ++xf86_vidmode_init ( void ) ++{ ++ int i,j; ++ XF86VidModeModeLine *l = (XF86VidModeModeLine *)((char *) ++ &XF86VidModeData.orig_mode + sizeof XF86VidModeData.orig_mode.dotclock); ++ ++ if (!XF86VidModeQueryVersion(W_Display, &i, &j)) ++ XF86VidModeData.vidmode_available = 0; ++ else if (!XF86VidModeQueryExtension(W_Display, &i, &j)) ++ XF86VidModeData.vidmode_available = 0; ++ else if (!XF86VidModeGetModeLine(W_Display, W_Screen, ++ (int *)&XF86VidModeData.orig_mode.dotclock, l)) ++ XF86VidModeData.vidmode_available = 0; ++ else if (!XF86VidModeGetViewPort(W_Display, W_Screen, ++ &XF86VidModeData.orig_viewport_x, ++ &XF86VidModeData.orig_viewport_y)) ++ XF86VidModeData.vidmode_available = 0; ++ ++ if (!XF86VidModeData.vidmode_available) ++ fprintf(stderr, "Warning: XF86VidMode not available\n"); ++} ++#endif ++ + void + W_Initialize(str) + char *str; +@@ -395,5 +420,9 @@ + GetAltMask(); - #define NUMSTARS 30 + backColor = W_Black; ++ ++#ifdef XF86VIDMODE ++ xf86_vidmode_init(); ++#endif + } --- xgalaga-2.0.34/Wlib.h.fs 1998-04-12 08:03:20.000000000 +0200 -+++ xgalaga-2.0.34/Wlib.h 2006-05-31 16:56:50.000000000 +0200 ++++ xgalaga-2.0.34/Wlib.h 2006-05-31 22:28:06.000000000 +0200 @@ -91,6 +91,22 @@ extern int autoPoint, W_KeyDepth, animPointers, useWorkbench; @@ -428,146 +598,68 @@ #endif /* AMIGA */ #if 0 ---- xgalaga-2.0.34/main.c.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/main.c 2006-05-31 16:56:50.000000000 +0200 -@@ -32,6 +32,7 @@ - static int attacking = 0, maxattacking, entering=0; - static int maxetorps = 5, numetorps=0; - static int plflash = 50; -+static int fullscreen = 0; - #ifndef ORIGINAL_XGALAGA - static int shots = 0; - static int hits = 0; -@@ -63,10 +64,14 @@ - xgal_exit(int v) - { - /* W_AutoRepeatOn();*/ -+ /* Destroy our main window so the fullscreen mode gets unset if we're -+ running fullscreen. (We should really clean up much more here!) */ -+ W_DestroyWindow(shellWin); - #ifdef SOUND - kill_sound(); - #endif - /* sleep(1);*/ /* Without this, the auto-repeat request fails on my machine... */ -+ /* Note if we ever need this autorepeat thingie again, the sleep can and should be replaced by a call to XSync() */ - exit(v); - } +--- xgalaga-2.0.34/data.c.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/data.c 2006-05-31 22:28:06.000000000 +0200 +@@ -32,6 +32,10 @@ + int mouseControl = 0; + int wantStars = 1; -@@ -89,6 +94,7 @@ - -mouse Use mouse control (same as 'm' at the title screen)\n\ - -keyboard Use keyboard control (same as 'k')\n%s\ - -level Choose starting level (>= 1)\n\ -+-window Start in windowed mode instead of fullscreen\n\ - -b turn buffered mode off, use this if it runs\n\ - too slowly. Will cause flicker, maybe lots,\n\ - maybe only a little.\n\ -@@ -105,7 +111,8 @@ - p - pauses\n\ - q - end this game\n\ - b - Toggle buffering (flicker vs. speed.)\n\ --o - Toggle OR mode. Don't use this, it sucks.\n", VERSION, -+o - Toggle OR mode. Don't use this, it sucks.\n\ -+alt + enter - Toggle fullscreen - window\n", VERSION, - PRINT_SOUND - ); - } -@@ -844,6 +851,14 @@ - case 'm': - mouseControl = 2; - break; -+ case '\r'+256: -+ W_ToggleFullscreen(shellWin); -+ fullscreen = !fullscreen; -+ if (fullscreen) -+ W_BlankCursor(baseWin); -+ else -+ W_RevertCursor(baseWin); -+ break; - default: - break; - } -@@ -997,6 +1012,14 @@ - maxtorps = MINTORPS; - break; - #endif /* IM_A_BIG_FAT_CHEATER */ -+ case '\r'+256: -+ W_ToggleFullscreen(shellWin); -+ fullscreen = !fullscreen; -+ if (fullscreen) -+ W_BlankCursor(baseWin); -+ else -+ W_RevertCursor(baseWin); -+ break; - default: - break; - } -@@ -1214,6 +1237,7 @@ - int ac; - char *dpyname = 0; - int mx, my, but; -+ int start_fullscreen = 1; - - for(ac = 1; ac < argc; ac++) { - if(*argv[ac] == '-') { -@@ -1245,6 +1269,8 @@ - useOR = 0; - } else if (strcmp(argv[ac], "-noclipmask") == 0) { - useClipMask = 0; -+ } else if (strcmp(argv[ac], "-window") == 0) { -+ start_fullscreen = 0; - } else { - print_usage(); - exit(0); -@@ -1263,6 +1289,12 @@ - W_Buffer(shellWin, 0); - W_MapWindow(shellWin); - W_MapWindow(baseWin); -+ if (start_fullscreen) -+ { -+ W_ToggleFullscreen(shellWin); -+ W_BlankCursor(baseWin); -+ fullscreen = 1; -+ } ++/* Modified slightly to better fit on 800x600 in fullscreen mode */ ++int winwidth = 468; /* was 400 */ ++int winheight = 596; /* was 511 */ ++ + int alien_shape[ALIENSHAPES] = { + I_ALIEN1, + I_ALIEN2, +--- xgalaga-2.0.34/defs.h.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/defs.h 2006-05-31 22:28:06.000000000 +0200 +@@ -26,8 +26,8 @@ - /* W_AutoRepeatOff();*/ + #define TORPDELAY 5 ---- xgalaga-2.0.34/Wproto.h.fs 1998-04-12 08:03:20.000000000 +0200 -+++ xgalaga-2.0.34/Wproto.h 2006-05-31 16:56:50.000000000 +0200 -@@ -63,6 +63,7 @@ - W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); - W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border); - void W_SetIconWindow(W_Window win, W_Window icon); -+void W_ToggleFullscreen(W_Window win); - /* point.c */ - void W_DrawPoint(W_Window window, int x, int y, W_Color color); - void FlushPointCache(Window win, int color); ---- xgalaga-2.0.34/xgal.6x.fs 2006-05-31 16:56:50.000000000 +0200 -+++ xgalaga-2.0.34/xgal.6x 2006-05-31 16:56:50.000000000 +0200 -@@ -4,11 +4,11 @@ +-#define WINWIDTH 400 +-#define WINHEIGHT 500 ++#define WINWIDTH winwidth /* was 400 */ ++#define WINHEIGHT winheight /* was 500 */ + + #define NUMSTARS 30 + +--- xgalaga-2.0.34/xgal.6x.fs 2006-05-31 22:28:06.000000000 +0200 ++++ xgalaga-2.0.34/xgal.6x 2006-05-31 22:31:02.000000000 +0200 +@@ -3,12 +3,12 @@ + xgalaga \- X11 version of the famous Galaga game .SH SYNOPSIS .B xgalaga - [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] +-[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] -[-noclipmask] [-nouseor] [-nostars] -+[-noclipmask] [-nouseor] [-nostars] [-window] ++[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl] ++[-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars] .P .B xgalaga-hyperspace - [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] +-[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] -[-noclipmask] [-nouseor] [-nostars] -+[-noclipmask] [-nouseor] [-nostars] [-window] ++[-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl] ++[-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars] .SH INSTRUCTIONS .LP It's Galaga, you know how to play Galaga, stop bothering me. -@@ -35,6 +35,9 @@ +@@ -35,6 +35,15 @@ .B \-nosound Turn sound OFF .TP 8 ++.B \-level \fIlvl\fP ++Choose starting level (>= 1) ++.TP 8 +.B \-window +Run in a window, not full screen. Full screen is the default. +.TP 8 ++.B \-winsize \fIwidthxheight\fP ++Set windowsize, default 468x596. ++.TP 8 .B \-b Turn buffered mode off, use this if it runs too slowly. Will cause flicker, maybe lots, maybe only a little. -@@ -68,6 +71,8 @@ +@@ -68,6 +77,8 @@ k - Use keyboard control .TP 8 x - use your shields (xgalaga-hyperspace only) @@ -576,16 +668,3 @@ .SH "SEE ALSO" Xgalaga home page .RI < http://rumsey.org/xgal.html > ---- xgalaga-2.0.34/pathfile.c.fs 2006-05-31 17:08:48.000000000 +0200 -+++ xgalaga-2.0.34/pathfile.c 2006-05-31 17:09:37.000000000 +0200 -@@ -387,8 +387,8 @@ - - void get_xy(int anum, int* x, int* y) - { -- *x = pathinfo[al_paths[anum]].startx; -- *y = pathinfo[al_paths[anum]].starty; -+ *x = (WINWIDTH * pathinfo[al_paths[anum]].startx) / 400; -+ *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500; - } - - int get_delay(int anum) xgalaxy-2.0.34-xgalaxy.patch: Index: xgalaxy-2.0.34-xgalaxy.patch =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-xgalaxy.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 15:16:41 -0000 1.2 +++ xgalaxy-2.0.34-xgalaxy.patch 31 May 2006 20:42:33 -0000 1.3 @@ -1,62 +1,5 @@ ---- xgalaga-2.0.34/README.xgalaxy 2006-05-22 15:31:00.000000000 +0200 -+++ xgalaga-2.0.34/README 2006-05-22 15:30:59.000000000 +0200 -@@ -44,9 +44,9 @@ - print usage and version. - - Basic instructions: -- It's Galaga, you know how to play Galaga, stop bothering me. -- (Ship follows the mouse, button fires. Auto-fire by holding it -- down, so no-one accuses me of breaking their mouse!) -+ It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, -+ stop bothering me. (Ship follows the mouse, button fires. Auto-fire by -+ holding it down, so no-one accuses me of breaking their mouse!) - - Keyboard commands: - -@@ -73,7 +73,7 @@ - games written quickly and painlessly. - - Credits: -- Galaga code: -+ XGalaxy code: - Joe Rumsey (mrogre at mediaone.net) - X interface: - Bill Dyess(dyessww at eng.auburn.edu), ---- xgalaga-2.0.34/xgal.6x.xgalaxy 2006-05-22 15:30:59.000000000 +0200 -+++ xgalaga-2.0.34/xgal.6x 2006-05-22 15:30:59.000000000 +0200 -@@ -1,6 +1,6 @@ --.TH XGALAGA 6x "23 April 2003" "2.0.34" -+.TH XGALAXY 6 "23 April 2003" "2.0.34" - .SH NAME --xgalaga \- X11 version of the famous Galaga game -+xgalaga \- X11 Galaga like game - .SH SYNOPSIS - .B xgalaxy - [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b] -@@ -11,9 +11,9 @@ - [-noclipmask] [-nouseor] [-nostars] [-window] - .SH INSTRUCTIONS - .LP --It's Galaga, you know how to play Galaga, stop bothering me. --(Ship follows the mouse, button fires. Auto-fire by holding it --down, so no-one accuses me of breaking their mouse!) -+It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, -+stop bothering me. (Ship follows the mouse, button fires. Auto-fire by -+holding it down, so no-one accuses me of breaking their mouse!) - .P - The xgalaxy-hyperspace version features some new weapons and different - gameplay. -@@ -71,7 +71,7 @@ - .TP 8 - alt-enter - Toggle full screen node. - .SH "SEE ALSO" --Xgalaga home page -+XGalaxy home page - .RI < http://rumsey.org/xgal.html > - .SH AUTHORS - Joe Rumsey, <\fIjoe at rumsey.org\fP> (Original author) ---- xgalaga-2.0.34/images.c.xgalaxy 2006-05-22 15:31:13.000000000 +0200 -+++ xgalaga-2.0.34/images.c 2006-05-22 16:14:13.000000000 +0200 +--- xgalaga-2.0.34/images.c.xgalaxy 2006-05-31 22:24:50.000000000 +0200 ++++ xgalaga-2.0.34/images.c 2006-05-31 22:24:50.000000000 +0200 @@ -6786,54 +6786,108 @@ /* XPM */ static char * title_xpm[] = { @@ -212,3 +155,83 @@ /* keep sorted (for bsearch) [BDyess] */ static W_Image imagearray[] = { +--- xgalaga-2.0.34/README.xgalaxy 2006-05-31 22:24:51.000000000 +0200 ++++ xgalaga-2.0.34/README 2006-05-31 22:24:51.000000000 +0200 +@@ -44,9 +44,9 @@ + print usage and version. + + Basic instructions: +- It's Galaga, you know how to play Galaga, stop bothering me. +- (Ship follows the mouse, button fires. Auto-fire by holding it +- down, so no-one accuses me of breaking their mouse!) ++ It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, ++ stop bothering me. (Ship follows the mouse, button fires. Auto-fire by ++ holding it down, so no-one accuses me of breaking their mouse!) + + Keyboard commands: + +@@ -73,7 +73,7 @@ + games written quickly and painlessly. + + Credits: +- Galaga code: ++ XGalaxy code: + Joe Rumsey (mrogre at mediaone.net) + X interface: + Bill Dyess(dyessww at eng.auburn.edu), +--- xgalaga-2.0.34/main.c.xgalaxy 2006-05-31 22:25:01.000000000 +0200 ++++ xgalaga-2.0.34/main.c 2006-05-31 22:26:42.000000000 +0200 +@@ -97,15 +97,15 @@ + -window Start in windowed mode instead of fullscreen\n\ + -winsize Window size (default 468 x 596)\n\ + -b turn buffered mode off, use this if it runs\n\ +-too slowly. Will cause flicker, maybe lots,\n\ +-maybe only a little.\n\ ++ too slowly. Will cause flicker, maybe lots,\n\ ++ maybe only a little.\n\ + \n\ + This game is now free software, under the GPL\n\ + \n\ + Basic instructions:\n\ +-It's Galaga, you know how to play Galaga, stop bothering me.\n\ +-(Ship follows the mouse, button fires. Auto-fire by holding it\n\ +-down, so no-one accuses me of breaking their mouse!)\n\ ++It's just like Galaxian / Galaga, you know how to play Galaxian / Galaga,\n\ ++stop bothering me. (Ship follows the mouse, button fires. Auto-fire by\n\ ++holding it down, so no-one accuses me of breaking their mouse!)\n\ + \n\ + Keyboard commands:\n\ + \n\ +--- xgalaga-2.0.34/xgal.6x.xgalaxy 2006-05-31 22:24:51.000000000 +0200 ++++ xgalaga-2.0.34/xgal.6x 2006-05-31 22:24:51.000000000 +0200 +@@ -1,6 +1,6 @@ +-.TH XGALAGA 6x "23 April 2003" "2.0.34" ++.TH XGALAXY 6 "23 April 2003" "2.0.34" + .SH NAME +-xgalaga \- X11 version of the famous Galaga game ++xgalaga \- X11 Galaga like game + .SH SYNOPSIS + .B xgalaga + [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-level lvl] +@@ -11,9 +11,9 @@ + [-window] [-winsize widthxheight] [-b] [-noclipmask] [-nouseor] [-nostars] + .SH INSTRUCTIONS + .LP +-It's Galaga, you know how to play Galaga, stop bothering me. +-(Ship follows the mouse, button fires. Auto-fire by holding it +-down, so no-one accuses me of breaking their mouse!) ++It's just like Galaxian / Galaga, you know how to play Galaxian/ Galaga, ++stop bothering me. (Ship follows the mouse, button fires. Auto-fire by ++holding it down, so no-one accuses me of breaking their mouse!) + .P + The xgalaga-hyperspace version features some new weapons and different + gameplay. +@@ -80,7 +80,7 @@ + .TP 8 + alt-enter - Toggle full screen node. + .SH "SEE ALSO" +-Xgalaga home page ++XGalaxy home page + .RI < http://rumsey.org/xgal.html > + .SH AUTHORS + Joe Rumsey, <\fIjoe at rumsey.org\fP> (Original author) Index: xgalaxy.spec =================================================================== RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xgalaxy.spec 31 May 2006 15:16:41 -0000 1.2 +++ xgalaxy.spec 31 May 2006 20:42:33 -0000 1.3 @@ -98,7 +98,11 @@ %changelog * Mon May 22 2006 Hans de Goede 2.0.34-3 -- Documented the new -window switch in the manpage. +- Fixed ships not being centered when flying in in level 1 +- Fixed artifacts (ships not yet on screen showing) in level 2 +- Added -winsize widthxheight option, which can be used to specify an + alternative window size +- Documented the -level, -window, -winsize switch in the manpage. * Mon May 22 2006 Hans de Goede 2.0.34-2 - Change name to xgalaxy because??upstreams name has already been used for a From fedora-extras-commits at redhat.com Wed May 31 20:52:54 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 31 May 2006 13:52:54 -0700 Subject: rpms/plplot/FC-4 plplot.spec,1.6,1.7 Message-ID: <200605312052.k4VKqubO021310@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21293 Modified Files: plplot.spec Log Message: Remove f95 file that snuck in Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plplot.spec 31 May 2006 20:23:04 -0000 1.6 +++ plplot.spec 31 May 2006 20:52:54 -0000 1.7 @@ -270,7 +270,6 @@ %{_libdir}/pkgconfig/plplotd.pc %{_libdir}/pkgconfig/plplotd-c++.pc %{_libdir}/pkgconfig/plplotd-f77.pc -%{_libdir}/pkgconfig/plplotd-f95.pc %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ From fedora-extras-commits at redhat.com Wed May 31 21:29:43 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 14:29:43 -0700 Subject: rpms/gtklp/devel .cvsignore, 1.2, 1.3 gtklp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605312129.k4VLTklF023938@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/devel Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 16:16:12 -0000 1.2 +++ .cvsignore 31 May 2006 21:29:43 -0000 1.3 @@ -1 +1 @@ -gtklp-1.2.1.src.tar.gz +gtklp-1.2.2.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/gtklp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtklp.spec 16 May 2006 16:16:12 -0000 1.1 +++ gtklp.spec 31 May 2006 21:29:43 -0000 1.2 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.1.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Wed May 31 2006 Gerard Milmeister - 1.2.2-1 +- new version 1.2.2 + * Sun May 7 2006 Gerard Milmeister - 1.2.1-2 - cleaned up buildrequires - added %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 16:16:12 -0000 1.2 +++ sources 31 May 2006 21:29:43 -0000 1.3 @@ -1 +1 @@ -374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz +f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz From fedora-extras-commits at redhat.com Wed May 31 21:29:43 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 14:29:43 -0700 Subject: rpms/gtklp/FC-5 .cvsignore, 1.2, 1.3 gtklp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605312129.k4VLTjXB023932@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/FC-5 Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 16:16:12 -0000 1.2 +++ .cvsignore 31 May 2006 21:29:42 -0000 1.3 @@ -1 +1 @@ -gtklp-1.2.1.src.tar.gz +gtklp-1.2.2.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/gtklp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtklp.spec 16 May 2006 16:16:12 -0000 1.1 +++ gtklp.spec 31 May 2006 21:29:42 -0000 1.2 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.1.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Wed May 31 2006 Gerard Milmeister - 1.2.2-1 +- new version 1.2.2 + * Sun May 7 2006 Gerard Milmeister - 1.2.1-2 - cleaned up buildrequires - added %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 16:16:12 -0000 1.2 +++ sources 31 May 2006 21:29:42 -0000 1.3 @@ -1 +1 @@ -374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz +f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz From fedora-extras-commits at redhat.com Wed May 31 21:29:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 14:29:42 -0700 Subject: rpms/gtklp/FC-4 .cvsignore, 1.2, 1.3 gtklp.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200605312130.k4VLUEpW023948@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gtklp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/FC-4 Modified Files: .cvsignore gtklp.spec sources Log Message: new version 1.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 May 2006 16:16:12 -0000 1.2 +++ .cvsignore 31 May 2006 21:29:42 -0000 1.3 @@ -1 +1 @@ -gtklp-1.2.1.src.tar.gz +gtklp-1.2.2.src.tar.gz Index: gtklp.spec =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-4/gtklp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtklp.spec 16 May 2006 16:16:12 -0000 1.1 +++ gtklp.spec 31 May 2006 21:29:42 -0000 1.2 @@ -1,12 +1,12 @@ Name: gtklp -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: A GTK frontend to CUPS Group: Applications/System License: GPL URL: http://gtklp.sourceforge.net -Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.1.src.tar.gz +Source: http://switch.dl.sourceforge.net/sourceforge/gtklp/gtklp-1.2.2.src.tar.gz Source1: gtklp.png Source2: gtklpq.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -106,6 +106,9 @@ %changelog +* Wed May 31 2006 Gerard Milmeister - 1.2.2-1 +- new version 1.2.2 + * Sun May 7 2006 Gerard Milmeister - 1.2.1-2 - cleaned up buildrequires - added %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtklp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 May 2006 16:16:12 -0000 1.2 +++ sources 31 May 2006 21:29:42 -0000 1.3 @@ -1 +1 @@ -374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz +f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz From fedora-extras-commits at redhat.com Wed May 31 21:33:35 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 31 May 2006 14:33:35 -0700 Subject: comps comps-fe5.xml.in,1.53,1.54 comps-fe6.xml.in,1.17,1.18 Message-ID: <200605312133.k4VLXbu7024119@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24100 Modified Files: comps-fe5.xml.in comps-fe6.xml.in Log Message: added gtklp Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- comps-fe5.xml.in 21 May 2006 13:31:30 -0000 1.53 +++ comps-fe5.xml.in 31 May 2006 21:33:35 -0000 1.54 @@ -480,6 +480,7 @@ fwbuilder ghasher ghex + gtklp hercules ibmonitor inadyn Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- comps-fe6.xml.in 18 May 2006 15:11:17 -0000 1.17 +++ comps-fe6.xml.in 31 May 2006 21:33:35 -0000 1.18 @@ -481,6 +481,7 @@ fwbuilder ghasher ghex + gtklp hercules ibmonitor inadyn From fedora-extras-commits at redhat.com Wed May 31 22:00:44 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 31 May 2006 15:00:44 -0700 Subject: rpms/libapreq2/devel libapreq2.spec,1.12,1.13 Message-ID: <200605312200.k4VM0kcI024339@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24316 Modified Files: libapreq2.spec Log Message: Add -fno-strict-aliasing to CFLAGS (prevent infinite loop). Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libapreq2.spec 23 May 2006 04:37:23 -0000 1.12 +++ libapreq2.spec 31 May 2006 22:00:44 -0000 1.13 @@ -2,7 +2,7 @@ Name: libapreq2 Version: 2.08 -Release: 0.rc2.1%{?dist} +Release: 0.rc2.2%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries @@ -88,6 +88,7 @@ %build +CFLAGS="-fno-strict-aliasing" \ %configure \ --disable-dependency-tracking \ --disable-static \ @@ -152,6 +153,9 @@ %changelog +* Thu Jun 01 2006 Bojan Smojver - 2.08-0.rc2.2 +- add -fno-strict-aliasing to CFLAGS (prevent endless loop) + * Tue May 23 2006 Bojan Smojver - 2.08-0.rc2.1 - bump up to 2.08-RC2 for Rawhide - revert back some changes to spec file made for 2.08-RC1 From fedora-extras-commits at redhat.com Wed May 31 22:02:12 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 15:02:12 -0700 Subject: rpms/anjuta-gdl/devel anjuta-gdl.spec,1.2,1.3 Message-ID: <200605312202.k4VM2iED026727@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta-gdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26694/devel Modified Files: anjuta-gdl.spec Log Message: auto-import anjuta-gdl-0.6.1-2 on branch devel from anjuta-gdl-0.6.1-2.src.rpm Index: anjuta-gdl.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/devel/anjuta-gdl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- anjuta-gdl.spec 30 May 2006 08:59:41 -0000 1.2 +++ anjuta-gdl.spec 31 May 2006 22:02:12 -0000 1.3 @@ -1,13 +1,13 @@ Name: anjuta-gdl Summary: Components and library for GNOME development tools Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/gdl/0.6/gdl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org -BuildRequires: gtk2-devel, libgnomeui-devel, libbonoboui-devel, libxml2-devel, librsvg2-devel +BuildRequires: gtk2-devel, libgnomeui-devel, libbonoboui-devel, libxml2-devel, librsvg2-devel, intltool, gettext %description This package contains components and libraries that are intended to be @@ -59,8 +59,11 @@ %{_libdir}/pkgconfig/gdl-1.0.pc %changelog -* Tue May 30 2006 Radek Vokal 0.6.1-1 -- update to 0.6.1 +* Wed May 31 2006 Paul F. Johnson 0.6.1-2 +- Added addition buildreqs + +* Tue May 23 2006 Paul F. Johnson 0.6.1-1 +- bump to new version * Sun Apr 23 2006 Paul F. Johnson 0.6.0-5 - added --disable-static and removed the .a delete line From fedora-extras-commits at redhat.com Wed May 31 22:02:07 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 15:02:07 -0700 Subject: rpms/anjuta-gdl import.log,1.2,1.3 Message-ID: <200605312202.k4VM2f5c026726@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta-gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26694 Modified Files: import.log Log Message: auto-import anjuta-gdl-0.6.1-2 on branch devel from anjuta-gdl-0.6.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 23 Apr 2006 22:35:29 -0000 1.2 +++ import.log 31 May 2006 22:02:06 -0000 1.3 @@ -1 +1,2 @@ anjuta-gdl-0_6_0-5:HEAD:anjuta-gdl-0.6.0-5.src.rpm:1145831749 +anjuta-gdl-0_6_1-2:HEAD:anjuta-gdl-0.6.1-2.src.rpm:1149112710 From fedora-extras-commits at redhat.com Wed May 31 22:15:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 31 May 2006 15:15:39 -0700 Subject: rpms/perl-HTML-Mason/devel .cvsignore, 1.3, 1.4 perl-HTML-Mason.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200605312215.k4VMFfKZ026990@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTML-Mason/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26969 Modified Files: .cvsignore perl-HTML-Mason.spec sources Log Message: Update to 1.33. Switch to Module::Build-based build. Add various bindir mason scripts. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 01:00:28 -0000 1.3 +++ .cvsignore 31 May 2006 22:15:39 -0000 1.4 @@ -1 +1 @@ -HTML-Mason-1.32.tar.gz +HTML-Mason-1.33.tar.gz Index: perl-HTML-Mason.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-HTML-Mason.spec 19 Jan 2006 18:28:12 -0000 1.4 +++ perl-HTML-Mason.spec 31 May 2006 22:15:39 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-HTML-Mason -Version: 1.32 -Release: 2%{?dist} +Version: 1.33 +Release: 1%{?dist} Epoch: 1 Summary: Powerful Perl-based web site development and delivery engine License: GPL or Artistic @@ -22,8 +22,8 @@ BuildRequires: perl(Cache::Cache) >= 1 BuildRequires: perl(Class::Container) >= 0.07 BuildRequires: perl(Exception::Class) >= 1.15 -BuildRequires: perl(Module::Build::Compat) >= 0.02 BuildRequires: perl(Params::Validate) >= 0.7 +BuildRequires: perl(Module::Build) BuildRequires: perl(mod_perl2) Requires: perl(Cache::Cache) >= 1 Requires: perl(Class::Container) >= 0.07 @@ -44,20 +44,23 @@ %setup -q -n HTML-Mason-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %install rm -rf $RPM_BUILD_ROOT -# make: *** No rule to make target `pure_install'. Stop. -make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +rm -f $RPM_BUILD_ROOT%{_bindir}/*.README +for file in $RPM_BUILD_ROOT%{_bindir}/convert*.pl ; do + mv -f $file $( echo $file | sed 's,/\(convert.*\)\.pl$,/mason_\1,' ) +done +mv -f $RPM_BUILD_ROOT%{_bindir}/mason.pl $RPM_BUILD_ROOT%{_bindir}/mason + mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/ @@ -65,7 +68,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mason %check -make test +./Build test %clean rm -rf $RPM_BUILD_ROOT @@ -74,6 +77,7 @@ %defattr(-,root,root,-) %doc CREDITS Changes LICENSE README UPGRADE %doc htdocs/ eg/ samples/ +%{_bindir}/mason* %{perl_vendorlib}/* %{_mandir}/man3/* %config(noreplace) %{_sysconfdir}/httpd/conf.d/perl-HTML-Mason.conf @@ -81,6 +85,11 @@ %dir %{_localstatedir}/www/mason %changelog +* Mon May 29 2006 Steven Pritchard 1:1.33-1 +- Update to 1.33 +- Switch to Module::Build-based build +- Add various bindir mason scripts + * Thu Jan 19 2006 Steven Pritchard 1:1.32-2 - Epoch bump to resolve rpm thinking 1.3101 > 1.32 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 01:00:28 -0000 1.3 +++ sources 31 May 2006 22:15:39 -0000 1.4 @@ -1 +1 @@ -b0abfdd869d828a0ebbf2f64cfb9d094 HTML-Mason-1.32.tar.gz +22c2cd76ed068630708175d570f97277 HTML-Mason-1.33.tar.gz From fedora-extras-commits at redhat.com Wed May 31 22:23:50 2006 From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan)) Date: Wed, 31 May 2006 15:23:50 -0700 Subject: rpms/libapreq2/devel libapreq2.spec,1.13,1.14 Message-ID: <200605312223.k4VMNq13027031@cvs-int.fedora.redhat.com> Author: bojan Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27010 Modified Files: libapreq2.spec Log Message: Include default RPM build flags too. Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libapreq2.spec 31 May 2006 22:00:44 -0000 1.13 +++ libapreq2.spec 31 May 2006 22:23:50 -0000 1.14 @@ -2,7 +2,7 @@ Name: libapreq2 Version: 2.08 -Release: 0.rc2.2%{?dist} +Release: 0.rc2.3%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries @@ -88,7 +88,7 @@ %build -CFLAGS="-fno-strict-aliasing" \ +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ %configure \ --disable-dependency-tracking \ --disable-static \ @@ -153,6 +153,9 @@ %changelog +* Thu Jun 01 2006 Bojan Smojver - 2.08-0.rc2.3 +- include exisiting CFLAGS too + * Thu Jun 01 2006 Bojan Smojver - 2.08-0.rc2.2 - add -fno-strict-aliasing to CFLAGS (prevent endless loop) From fedora-extras-commits at redhat.com Wed May 31 23:15:14 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 16:15:14 -0700 Subject: rpms/ikvm import.log,1.4,1.5 Message-ID: <200605312315.k4VNFGf3029572@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29539 Modified Files: import.log Log Message: auto-import ikvm-0.22-7 on branch devel from ikvm-0.22-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ikvm/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 18 Apr 2006 22:27:01 -0000 1.4 +++ import.log 31 May 2006 23:15:14 -0000 1.5 @@ -1,3 +1,4 @@ ikvm-0_22-4:HEAD:ikvm-0.22-4.src.rpm:1141834969 ikvm-0_22-5:HEAD:ikvm-0.22-5.src.rpm:1145399070 ikvm-0_22-5:FC-5:ikvm-0.22-5.src.rpm:1145399164 +ikvm-0_22-7:HEAD:ikvm-0.22-7.src.rpm:1149117129 From fedora-extras-commits at redhat.com Wed May 31 23:15:15 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 16:15:15 -0700 Subject: rpms/ikvm/devel ikvm.spec,1.2,1.3 Message-ID: <200605312315.k4VNFHMC029576@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29539/devel Modified Files: ikvm.spec Log Message: auto-import ikvm-0.22-7 on branch devel from ikvm-0.22-7.src.rpm Index: ikvm.spec =================================================================== RCS file: /cvs/extras/rpms/ikvm/devel/ikvm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ikvm.spec 18 Apr 2006 22:24:43 -0000 1.2 +++ ikvm.spec 31 May 2006 23:15:15 -0000 1.3 @@ -1,9 +1,9 @@ -%define _libdir /usr/lib +%define _libdir %{_exec_prefix}/lib Summary: An implementation of Java for Mono Name: ikvm Version: 0.22 -Release: 5%{?dist} +Release: 7%{?dist} License: BSD Group: Development/Languages Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz @@ -12,6 +12,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, dos2unix Requires: mono-core +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 %description This package provides IKVM.NET, an open source Java compatibility @@ -19,30 +20,53 @@ and various class libraries for Java, as well as tools for Java and Mono interoperability. +%package devel +Summary: Development files for ikvm +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for ikvm + %prep rm -rf %{RPM_BUILD_ROOT} %setup -q %patch0 -p1 -b .patch0 %build +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure -make +make %{?_smp_mflags} dos2unix LICENSE %install +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install %files +%defattr (-,root,root,-) %doc LICENSE COPYING %{_bindir}/* %{_libdir}/ikvm/ + +%files devel +%defattr(-,root,root,-) %{_libdir}/pkgconfig/ikvm.pc %clean %{__rm} -rf %{buildroot} %changelog +* Wed May 31 2006 Paul F. Johnson 0.22-7 +- Added devel package +- Added 64 bit fix + +* Sun Apr 23 2006 Paul F. Johnson 0.22-6 +- static libdir removed +- added %%defattr +- added archs mono is currently on + * Tue Apr 18 2006 Paul F. Johnson 0.22-5 - libdir is now usr-lib irrespective of architecture built on - removed devel as there is no point of a devel for one file From fedora-extras-commits at redhat.com Wed May 31 23:19:49 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 16:19:49 -0700 Subject: rpms/ikvm import.log,1.5,1.6 Message-ID: <200605312320.k4VNKLhC029737@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29703 Modified Files: import.log Log Message: auto-import ikvm-0.22-7 on branch FC-5 from ikvm-0.22-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ikvm/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 31 May 2006 23:15:14 -0000 1.5 +++ import.log 31 May 2006 23:19:49 -0000 1.6 @@ -2,3 +2,4 @@ ikvm-0_22-5:HEAD:ikvm-0.22-5.src.rpm:1145399070 ikvm-0_22-5:FC-5:ikvm-0.22-5.src.rpm:1145399164 ikvm-0_22-7:HEAD:ikvm-0.22-7.src.rpm:1149117129 +ikvm-0_22-7:FC-5:ikvm-0.22-7.src.rpm:1149117388 From fedora-extras-commits at redhat.com Wed May 31 23:19:49 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 31 May 2006 16:19:49 -0700 Subject: rpms/ikvm/FC-5 ikvm.spec,1.2,1.3 Message-ID: <200605312320.k4VNKMI5029740@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29703/FC-5 Modified Files: ikvm.spec Log Message: auto-import ikvm-0.22-7 on branch FC-5 from ikvm-0.22-7.src.rpm Index: ikvm.spec =================================================================== RCS file: /cvs/extras/rpms/ikvm/FC-5/ikvm.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ikvm.spec 18 Apr 2006 22:27:01 -0000 1.2 +++ ikvm.spec 31 May 2006 23:19:49 -0000 1.3 @@ -1,9 +1,9 @@ -%define _libdir /usr/lib +%define _libdir %{_exec_prefix}/lib Summary: An implementation of Java for Mono Name: ikvm Version: 0.22 -Release: 5%{?dist} +Release: 7%{?dist} License: BSD Group: Development/Languages Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz @@ -12,6 +12,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, dos2unix Requires: mono-core +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 %description This package provides IKVM.NET, an open source Java compatibility @@ -19,30 +20,53 @@ and various class libraries for Java, as well as tools for Java and Mono interoperability. +%package devel +Summary: Development files for ikvm +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for ikvm + %prep rm -rf %{RPM_BUILD_ROOT} %setup -q %patch0 -p1 -b .patch0 %build +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure -make +make %{?_smp_mflags} dos2unix LICENSE %install +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %{__rm} -rf %{buildroot} make DESTDIR=%{buildroot} install %files +%defattr (-,root,root,-) %doc LICENSE COPYING %{_bindir}/* %{_libdir}/ikvm/ + +%files devel +%defattr(-,root,root,-) %{_libdir}/pkgconfig/ikvm.pc %clean %{__rm} -rf %{buildroot} %changelog +* Wed May 31 2006 Paul F. Johnson 0.22-7 +- Added devel package +- Added 64 bit fix + +* Sun Apr 23 2006 Paul F. Johnson 0.22-6 +- static libdir removed +- added %%defattr +- added archs mono is currently on + * Tue Apr 18 2006 Paul F. Johnson 0.22-5 - libdir is now usr-lib irrespective of architecture built on - removed devel as there is no point of a devel for one file From fedora-extras-commits at redhat.com Wed May 31 23:36:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 31 May 2006 16:36:53 -0700 Subject: rpms/sylpheed/devel .cvsignore,1.18,1.19 sources,1.18,1.19 Message-ID: <200605312336.k4VNatfx029933@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29913 Modified Files: .cvsignore sources Log Message: Add the GPG sig which Hiroyuki has published later. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 30 May 2006 10:14:48 -0000 1.18 +++ .cvsignore 31 May 2006 23:36:53 -0000 1.19 @@ -1 +1,2 @@ sylpheed-2.2.5.tar.bz2 +sylpheed-2.2.5.tar.bz2.asc Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 30 May 2006 10:14:48 -0000 1.18 +++ sources 31 May 2006 23:36:53 -0000 1.19 @@ -1 +1,2 @@ 6e20522180ba0346d3f85de160076560 sylpheed-2.2.5.tar.bz2 +512571513d7d3fdfa23a9c857e594568 sylpheed-2.2.5.tar.bz2.asc From fedora-extras-commits at redhat.com Wed May 31 23:37:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 31 May 2006 16:37:31 -0700 Subject: rpms/sylpheed/FC-5 .cvsignore,1.16,1.17 sources,1.16,1.17 Message-ID: <200605312337.k4VNbXKi029984@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29965 Modified Files: .cvsignore sources Log Message: Add the GPG sig which Hiroyuki has published later. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 30 May 2006 10:15:57 -0000 1.16 +++ .cvsignore 31 May 2006 23:37:30 -0000 1.17 @@ -1 +1,2 @@ sylpheed-2.2.5.tar.bz2 +sylpheed-2.2.5.tar.bz2.asc Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/FC-5/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 30 May 2006 10:15:57 -0000 1.16 +++ sources 31 May 2006 23:37:30 -0000 1.17 @@ -1 +1,2 @@ 6e20522180ba0346d3f85de160076560 sylpheed-2.2.5.tar.bz2 +512571513d7d3fdfa23a9c857e594568 sylpheed-2.2.5.tar.bz2.asc